diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
index 794b38c6c1c..9541c4c7017 100644
--- a/.github/workflows/build_cmake.yml
+++ b/.github/workflows/build_cmake.yml
@@ -7,9 +7,9 @@ on:
       - 'doc/**'
 
 env:
-  QT_VERSION: 6.6.2
+  QT_VERSION: 6.7.1
   MACOS_DEPLOYMENT_TARGET: 11.0
-  CLANG_VERSION: 17.0.1
+  CLANG_VERSION: 18.1.7
   ELFUTILS_VERSION: 0.175
   CMAKE_VERSION: 3.21.1
   NINJA_VERSION: 1.10.2
@@ -49,13 +49,12 @@ jobs:
           }
         - {
             name: "macOS Latest Clang", artifact: "macos-universal",
-            # TODO: move back to macos-latest when macos-latest is 13 or higher
-            os: macos-13,
+            os: macos-latest,
             cc: "clang", cxx: "clang++"
           }
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Checkout submodules
       id: git
       shell: cmake -P {0}
@@ -63,10 +62,10 @@ jobs:
         execute_process(COMMAND git submodule set-url -- perfparser https://code.qt.io/qt-creator/perfparser.git)
         execute_process(COMMAND git submodule update --init --recursive)
         file(MAKE_DIRECTORY release)
-        if (${{github.ref}} MATCHES "tags/v([0-9.]+)")
+        if (${{github.ref}} MATCHES "tags/v(([0-9.]+).*)")
             file(APPEND "$ENV{GITHUB_OUTPUT}" "tag=${CMAKE_MATCH_1}\n")
-            if (EXISTS "dist/changelog/changes-${CMAKE_MATCH_1}.md")
-                file(READ "dist/changelog/changes-${CMAKE_MATCH_1}.md" changelog_md)
+            if (EXISTS "dist/changelog/changes-${CMAKE_MATCH_2}.md")
+                file(READ "dist/changelog/changes-${CMAKE_MATCH_2}.md" changelog_md)
             endif()
             file(WRITE "release/changelog.md" "These packages are not officially supported, for official packages please check out https://download.qt.io/official_releases/qtcreator\n\n")
             file(APPEND "release/changelog.md" "${changelog_md}")
@@ -200,7 +199,7 @@ jobs:
           endif()
         elseif ("${{ runner.os }}" STREQUAL "Linux")
           set(url_os "linux_x64")
-          set(qt_package_arch_suffix "gcc_64")
+          set(qt_package_arch_suffix "linux_gcc_64")
           set(qt_dir_prefix "${qt_version}/gcc_64")
           set(qt_package_suffix "-Linux-RHEL_8_8-GCC-Linux-RHEL_8_8-X86_64")
         elseif ("${{ runner.os }}" STREQUAL "macOS")
@@ -267,10 +266,10 @@ jobs:
           )
         endforeach()
 
-        # uic depends on libicu56.so
+        # uic, qmake depend on libicu*.so libraries
         if ("${{ runner.os }}" STREQUAL "Linux")
           downloadAndExtract(
-            "${qt_base_url}/qt.qt6.${qt_version_dotless}.${qt_package_arch_suffix}/${qt_package_version}icu-linux-Rhel7.2-x64.7z"
+            "${qt_base_url}/qt.qt6.${qt_version_dotless}.${qt_package_arch_suffix}/${qt_package_version}icu-linux-Rhel8.6-x86_64.7z"
             icu.7z
           )
         endif()
@@ -695,41 +694,41 @@ jobs:
         endif()
 
     - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/qtcreator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.7z
         name: qtcreator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.7z
 
     - name: Upload Devel
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/qtcreator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}_dev.7z
         name: qtcreator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}_dev.7z
 
     - name: Upload wininterrupt
       if: runner.os == 'Windows'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/wininterrupt-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.7z
         name: wininterrupt-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.7z
 
     - name: Upload qtcreatorcdbext
       if: runner.os == 'Windows' && matrix.config.is_msvc
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/qtcreatorcdbext-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.7z
         name: qtcreatorcdbext-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.7z
 
     - name: Upload Debian package
       if: runner.os == 'Linux'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/build/qtcreator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.deb
         name: qtcreator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.deb
 
     - name: Upload disk image
       if: runner.os == 'macOS' && contains(github.ref, 'tags/v')
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/qt-creator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.dmg
         name: qt-creator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.dmg
@@ -739,14 +738,14 @@ jobs:
       run: cmake -E tar cf ../${{ steps.ccache.outputs.archive_name }}.tar .
 
     - name: Upload ccache archive
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: ./${{ steps.ccache.outputs.archive_name }}.tar
         name: ${{ steps.ccache.outputs.archive_name }}
 
     - name: Upload Release Changelog
-      if: contains(github.ref, 'tags/v')
-      uses: actions/upload-artifact@v3
+      if: runner.os == 'macOS' && contains(github.ref, 'tags/v')
+      uses: actions/upload-artifact@v4
       with:
         path: ./release/changelog.md
         name: changelog.md
@@ -758,7 +757,7 @@ jobs:
 
     steps:
     - name: Download artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         path: release-with-dirs
 
@@ -770,7 +769,7 @@ jobs:
 
     - name: Create Release
       id: create_release
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
diff --git a/.luarc.json b/.luarc.json
new file mode 100644
index 00000000000..0d86a5b80cb
--- /dev/null
+++ b/.luarc.json
@@ -0,0 +1,9 @@
+{
+    "workspace.library": [
+        "src/plugins/lua/meta"
+    ],
+    "hint.paramName": "Literal",
+    "hint.enable": true,
+    "hint.await": true,
+    "hint.arrayIndex": "Disable"
+}
diff --git a/README.md b/README.md
index 9f4b6f1457d..274c5094868 100644
--- a/README.md
+++ b/README.md
@@ -38,12 +38,12 @@ https://doc.qt.io/qtcreator-extending/coding-style.html
 
 Prerequisites:
 
-* Qt 6.2 or later. The Qt version that you use to build Qt Creator defines the
+* Qt 6.4.3 or later. The Qt version that you use to build Qt Creator defines the
   minimum platform versions that the result supports
-  (Windows 10, RHEL/CentOS 8.4, Ubuntu 20.04, macOS 10.15 for Qt 6.2).
+  (Windows 10, RHEL/CentOS 8.4, Ubuntu 20.04, macOS 10.15 for Qt 6.4.3).
 * Qt WebEngine module for QtWebEngine based help viewer
 * On Windows:
-    * MinGW with GCC 9 or Visual Studio 2019 or later
+    * MinGW with GCC 11.2 or Visual Studio 2019 or later
     * Python 3.8 or later (optional, needed for the python enabled debug helper)
     * Debugging Tools for Windows (optional, for MSVC debugging support with CDB)
 * On Mac OS X: latest Xcode
@@ -96,7 +96,7 @@ include the version number and compiler ABI. The path to the online installer
 content is not enough.
 
 Note that `/path/to/Qt` doesn't imply the full path depth like:
-`$USER/Qt/6.2.4/gcc_64/lib/cmake/Qt6`, but only `$USER/Qt/6.2.4/gcc_64`.
+`$USER/Qt/6.4.3/gcc_64/lib/cmake/Qt6`, but only `$USER/Qt/6.4.3/gcc_64`.
 
 See [instructions](#getting-llvmclang-for-the-clang-code-model) on how to
 get LLVM.
@@ -107,6 +107,33 @@ get LLVM.
     cmake -DCMAKE_BUILD_TYPE=Debug -G Ninja "-DCMAKE_PREFIX_PATH=/path/to/Qt;/path/to/llvm" /path/to/qtcreator_sources
     cmake --build .
 
+#### Troubleshooting: libxcb plugin not found while using Qt libraries built locally from source
+
+Ensure all prerequisites for building Qt are installed:
+https://doc.qt.io/qt-6/linux.html
+https://doc.qt.io/qt-6/linux-requirements.html
+
+If they were installed before building Qt and xcb plugin is missing try reinstall them with
+
+```sh
+    sudo apt-get --reinstall <package_name>
+```
+
+Reset building configuration for Qt libraries at '/path/to/qt_sources'
+
+```sh
+    cmake --build . --target=clean
+```
+
+and remove CMakeCache.txt
+
+```sh
+    rm CMakeCache.txt
+```
+
+Try building Qt source again.
+
+
 ### Windows
 
 These instructions assume that Ninja is installed and in the `PATH`, Qt Creator
@@ -118,7 +145,7 @@ include the version number and compiler ABI. The path to the online installer
 content is not enough.
 
 Note that `\path\to\Qt` doesn't imply the full path depth like:
-`c:\Qt\6.2.4\msvc2019_64\lib\cmake\Qt6`, but only `c:/Qt/6.2.4/msvc2019_64`.
+`c:\Qt\6.4.3\msvc2019_64\lib\cmake\Qt6`, but only `c:/Qt/6.4.3/msvc2019_64`.
 The usage of slashes `/` is intentional, since CMake has issues with backslashes `\`
 in `CMAKE_PREFX_PATH`, they are interpreted as escape codes.
 
@@ -198,7 +225,7 @@ CLion...etc) locally:
       "cacheVariables": {
         "CMAKE_CXX_COMPILER": "cl.exe",
         "CMAKE_C_COMPILER": "cl.exe",
-        "CMAKE_PREFIX_PATH": "c:/Qt/6.2.4/msvc2019_64"
+        "CMAKE_PREFIX_PATH": "c:/Qt/6.4.3/msvc2019_64"
       }
     }
   ]
@@ -286,7 +313,7 @@ http://llvm.org/docs/GettingStarted.html#git-mirror:
 
    1. Clone LLVM/Clang and checkout a suitable branch
 
-          git clone -b release_130-based --recursive https://code.qt.io/clang/llvm-project.git
+          git clone -b release_17.0.6-based --recursive https://code.qt.io/clang/llvm-project.git
 
    2. Build and install LLVM/Clang
 
@@ -314,16 +341,6 @@ http://llvm.org/docs/GettingStarted.html#git-mirror:
             ..\llvm-project\llvm
           cmake --build . --target install
 
-### Clang-Format
-
-The ClangFormat plugin depends on the additional patch
-
-    https://code.qt.io/cgit/clang/llvm-project.git/commit/?h=release_130-based&id=42879d1f355fde391ef46b96a659afeb4ad7814a
-
-While the plugin builds without it, it might not be fully functional.
-
-Note that the plugin is disabled by default.
-
 # Licenses and Attributions
 
 Qt Creator is available under commercial licenses from The Qt Company,
diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake
index 954f24ecefd..5d39157b020 100644
--- a/cmake/QtCreatorAPI.cmake
+++ b/cmake/QtCreatorAPI.cmake
@@ -3,7 +3,7 @@ if(QT_CREATOR_API_DEFINED)
 endif()
 set(QT_CREATOR_API_DEFINED TRUE)
 
-set(IDE_QT_VERSION_MIN "6.2.0")
+set(IDE_QT_VERSION_MIN "6.4.3")
 
 include(${CMAKE_CURRENT_LIST_DIR}/QtCreatorAPIInternal.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/QtcSeparateDebugInfo.cmake)
diff --git a/cmake/QtCreatorAPIInternal.cmake b/cmake/QtCreatorAPIInternal.cmake
index bf9ee0132ac..06d53a992c8 100644
--- a/cmake/QtCreatorAPIInternal.cmake
+++ b/cmake/QtCreatorAPIInternal.cmake
@@ -23,6 +23,7 @@ list(APPEND DEFAULT_DEFINES
   QT_NO_JAVA_STYLE_ITERATORS
   QT_NO_CAST_TO_ASCII QT_RESTRICTED_CAST_FROM_ASCII QT_NO_FOREACH
   QT_DISABLE_DEPRECATED_BEFORE=0x050900
+  QT_WARN_DEPRECATED_BEFORE=0x060400
   QT_USE_QSTRINGBUILDER
 )
 
diff --git a/cmake/QtCreatorDocumentation.cmake b/cmake/QtCreatorDocumentation.cmake
index 9587a77e0b1..bf679d2188f 100644
--- a/cmake/QtCreatorDocumentation.cmake
+++ b/cmake/QtCreatorDocumentation.cmake
@@ -5,6 +5,18 @@ add_feature_info("Build documentation" WITH_DOCS "")
 option(WITH_ONLINE_DOCS "Build online documentation" OFF)
 add_feature_info("Build online documentation" WITH_ONLINE_DOCS "")
 
+option(BUILD_DOCS_BY_DEFAULT "Build documentation by default" OFF)
+add_feature_info("Build documentation by default" BUILD_DOCS_BY_DEFAULT "")
+
+
+if (BUILD_DOCS_BY_DEFAULT)
+set(EXCLUDE_DOCS_FROM_ALL "")
+set(INCLUDE_DOCS_INTO_ALL "ALL")
+else()
+set(EXCLUDE_DOCS_FROM_ALL "EXCLUDE_FROM_ALL")
+set(INCLUDE_DOCS_INTO_ALL "")
+endif()
+
 # Get information on directories from qmake
 # as this is not yet exported by cmake.
 # Used for QT_INSTALL_DOCS
@@ -46,13 +58,13 @@ endfunction()
 function(_setup_doc_targets)
   # Set up important targets:
   if (NOT TARGET html_docs)
-    add_custom_target(html_docs COMMENT "Build HTML documentation")
+    add_custom_target(html_docs ${INCLUDE_DOCS_INTO_ALL} COMMENT "Build HTML documentation")
   endif()
   if (NOT TARGET qch_docs)
-    add_custom_target(qch_docs COMMENT "Build QCH documentation")
+    add_custom_target(qch_docs ${INCLUDE_DOCS_INTO_ALL} COMMENT "Build QCH documentation")
   endif()
   if (NOT TARGET docs)
-    add_custom_target(docs COMMENT "Build documentation")
+    add_custom_target(docs ${INCLUDE_DOCS_INTO_ALL} COMMENT "Build documentation")
     add_dependencies(docs html_docs qch_docs)
   endif()
 endfunction()
@@ -114,6 +126,7 @@ function(_setup_qdoc_targets _qdocconf_file _retval)
 
   set(_html_target "html_docs_${_target}")
   add_custom_target("${_html_target}"
+      ${INCLUDE_DOCS_INTO_ALL}
       ${_full_qdoc_command} -outputdir "${_html_outputdir}" "${_qdocconf_file}"
       ${_qdoc_index_args} ${_qdoc_include_args}
     COMMENT "Build HTML documentation from ${_qdocconf_file}"
@@ -126,7 +139,7 @@ function(_setup_qdoc_targets _qdocconf_file _retval)
 
   # Install HTML files as a special component
   install(DIRECTORY "${_html_outputdir}" DESTINATION "${_arg_INSTALL_DIR}"
-    COMPONENT html_docs EXCLUDE_FROM_ALL)
+    COMPONENT html_docs ${EXCLUDE_DOCS_FROM_ALL})
 
   set("${_retval}" "${_html_outputdir}" PARENT_SCOPE)
 endfunction()
@@ -154,6 +167,7 @@ function(_setup_qhelpgenerator_targets _qdocconf_file _html_outputdir)
   set(_qch_target "qch_docs_${_target}")
   set(_html_target "html_docs_${_target}")
   add_custom_target("${_qch_target}"
+    ${INCLUDE_DOCS_INTO_ALL}
     Qt::qhelpgenerator "${_html_outputdir}/${_target}.qhp" -o "${_qch_outputdir}/${_target}.qch"
     COMMENT "Build QCH documentation from ${_qdocconf_file}"
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
@@ -163,7 +177,7 @@ function(_setup_qhelpgenerator_targets _qdocconf_file _html_outputdir)
   add_dependencies(qch_docs "${_qch_target}")
 
   install(FILES "${_qch_outputdir}/${_target}.qch" DESTINATION "${_arg_INSTALL_DIR}"
-    COMPONENT qch_docs EXCLUDE_FROM_ALL)
+    COMPONENT qch_docs ${EXCLUDE_DOCS_FROM_ALL})
 endfunction()
 
 # Helper functions:
@@ -283,6 +297,7 @@ function(add_qtc_doc_attribution target attribution_file output_file qdocconf_fi
   file(MAKE_DIRECTORY ${output_dir})
   # add target
   add_custom_target(${target}
+      ${INCLUDE_DOCS_INTO_ALL}
       Qt6::qtattributionsscanner -o "${output_file}" --basedir "${PROJECT_SOURCE_DIR}" ${attribution_file}
     COMMENT "Create attributions ${output_file} from ${attribution_file}"
     DEPENDS "${attribution_file}"
diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake
index 8cab51c3c29..ebe11aa4efc 100644
--- a/cmake/QtCreatorIDEBranding.cmake
+++ b/cmake/QtCreatorIDEBranding.cmake
@@ -1,6 +1,6 @@
-set(IDE_VERSION "13.0.2")                             # The IDE version.
-set(IDE_VERSION_COMPAT "13.0.0")                      # The IDE Compatibility version.
-set(IDE_VERSION_DISPLAY "13.0.2")                     # The IDE display version.
+set(IDE_VERSION "13.0.84")                            # The IDE version.
+set(IDE_VERSION_COMPAT "13.0.84")                     # The IDE Compatibility version.
+set(IDE_VERSION_DISPLAY "14.0.0-rc1")               # The IDE display version.
 set(IDE_COPYRIGHT_YEAR "2024")                        # The IDE current copyright year.
 
 set(IDE_SETTINGSVARIANT "QtProject")                  # The IDE settings variation.
diff --git a/coin/instructions/build.yaml b/coin/instructions/build.yaml
index 6ec0fcf1711..b98cfbafbcc 100644
--- a/coin/instructions/build.yaml
+++ b/coin/instructions/build.yaml
@@ -20,29 +20,29 @@ instructions:
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to download elfutils package, check logs."
       - type: ExecuteCommand
-        command: "/usr/bin/7z x -y {{.AgentWorkingDir}}/build/qt_temp/elfutils-release_0.175qt-linux-x86_64.7z -o{{.AgentWorkingDir}}/build/qt_temp/elfutils"
+        command: "7z x -y {{.AgentWorkingDir}}/build/qt_temp/elfutils-release_0.175qt-linux-x86_64.7z -o{{.AgentWorkingDir}}/build/qt_temp/elfutils"
         maxTimeInSeconds: 3600
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to extract elfutils package, check logs."
       - type: ExecuteCommand
-        command: "curl --fail -L --retry 5 --retry-delay 5 -o {{.AgentWorkingDir}}/build/qt_temp/libclang.7z {{.Env.LLVM_BASE_URL}}-linux-Rhel8.4-gcc10.3-x86_64.7z"
+        command: "curl --fail -L --retry 5 --retry-delay 5 -o {{.AgentWorkingDir}}/build/qt_temp/libclang.7z {{.Env.LLVM_BASE_URL}}-linux-Rhel8.6-gcc10.3-x86_64.7z"
         maxTimeInSeconds: 3600
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to download LLVM package, check logs."
       - type: ExecuteCommand
-        command: "/usr/bin/7z x -y {{.AgentWorkingDir}}/build/qt_temp/libclang.7z -o{{.AgentWorkingDir}}/build/qt_temp/"
+        command: "7z x -y {{.AgentWorkingDir}}/build/qt_temp/libclang.7z -o{{.AgentWorkingDir}}/build/qt_temp/"
         maxTimeInSeconds: 3600
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to extract LLVM package, check logs."
       - type: ExecuteCommand
-        command: "python3 -u {{.AgentWorkingDir}}/qt-creator/qt-creator/scripts/build.py --build-type {{.Env.QTC_BUILD_TYPE}} --src {{.AgentWorkingDir}}/qt-creator/qt-creator --build {{.AgentWorkingDir}}/qt-creator/qt-creator_build --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --elfutils-path {{.AgentWorkingDir}}/build/qt_temp/elfutils --llvm-path {{.AgentWorkingDir}}/build/qt_temp/libclang {{.Env.QTC_TEST_OPTION}} --no-zip --add-config=-DCMAKE_C_COMPILER_LAUNCHER=sccache --add-config=-DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
+        command: "python3 -u {{.AgentWorkingDir}}/qt-creator/qt-creator/scripts/build.py --build-type {{.Env.QTC_BUILD_TYPE}} --src {{.AgentWorkingDir}}/qt-creator/qt-creator --build {{.AgentWorkingDir}}/qt-creator/qt-creator_build --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --elfutils-path {{.AgentWorkingDir}}/build/qt_temp/elfutils --llvm-path {{.AgentWorkingDir}}/build/qt_temp/libclang {{.Env.QTC_TEST_OPTION}} --no-zip {{.Env.QTC_SCCACHE_C_OPTION}} {{.Env.QTC_SCCACHE_CXX_OPTION}} {{.Env.QTC_SCCACHE_ENABLE_OPTION}}"
         maxTimeInSeconds: 36000
         maxTimeBetweenOutput: 3600
         userMessageOnFailure: "Failed to run build.py, check logs."
       - type: ChangeDirectory
         directory: "{{.AgentWorkingDir}}/build/tqtc-qtsdk/packaging_tools"
       - type: ExecuteCommand
-        command: "python3 -m pipenv run python -u bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}/build/sdktool/qt --src {{.AgentWorkingDir}}/qt-creator/qt-creator/src/tools/sdktool --build {{.AgentWorkingDir}}/build/sdktool/build --install {{.AgentWorkingDir}}/build/sdktool/install --make-command make"
+        command: "python3 -m pipenv run python -u bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}/build/sdktool/qt --src {{.AgentWorkingDir}}/qt-creator/qt-creator/src/tools/sdktool --build {{.AgentWorkingDir}}/build/sdktool/build --install {{.AgentWorkingDir}}/build/sdktool/install --make-command ninja"
         maxTimeInSeconds: 36000
         maxTimeBetweenOutput: 3600
         userMessageOnFailure: "Failed to build sdktool, check logs."
@@ -64,12 +64,12 @@ instructions:
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to download LLVM package, check logs."
       - type: ExecuteCommand
-        command: "/usr/local/bin/7z x -y {{.AgentWorkingDir}}/build/qt_temp/libclang.7z -o{{.AgentWorkingDir}}/build/qt_temp/"
+        command: "7z x -y {{.AgentWorkingDir}}/build/qt_temp/libclang.7z -o{{.AgentWorkingDir}}/build/qt_temp/"
         maxTimeInSeconds: 3600
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to extract LLVM package, check logs."
       - type: ExecuteCommand
-        command: "python3 -u {{.AgentWorkingDir}}/qt-creator/qt-creator/scripts/build.py --build-type {{.Env.QTC_BUILD_TYPE}} --src {{.AgentWorkingDir}}/qt-creator/qt-creator --build {{.AgentWorkingDir}}/qt-creator/qt-creator_build --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --llvm-path {{.AgentWorkingDir}}/build/qt_temp/libclang --keychain-unlock-script /Users/qt/unlock-keychain.sh {{.Env.QTC_TEST_OPTION}} --no-zip --add-config=-DCMAKE_C_COMPILER_LAUNCHER=sccache --add-config=-DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
+        command: "python3 -u {{.AgentWorkingDir}}/qt-creator/qt-creator/scripts/build.py --build-type {{.Env.QTC_BUILD_TYPE}} --src {{.AgentWorkingDir}}/qt-creator/qt-creator --build {{.AgentWorkingDir}}/qt-creator/qt-creator_build --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --llvm-path {{.AgentWorkingDir}}/build/qt_temp/libclang --keychain-unlock-script /Users/qt/unlock-keychain.sh {{.Env.QTC_TEST_OPTION}} --no-zip {{.Env.QTC_SCCACHE_C_OPTION}} {{.Env.QTC_SCCACHE_CXX_OPTION}} {{.Env.QTC_SCCACHE_ENABLE_OPTION}}"
         maxTimeInSeconds: 36000
         maxTimeBetweenOutput: 3600
         userMessageOnFailure: "Failed to run build.py, check logs."
@@ -79,7 +79,7 @@ instructions:
         variableName: MACOSX_DEPLOYMENT_TARGET
         variableValue: "{{.Env.SDKTOOL_MACOSX_DEPLOYMENT_TARGET}}"
       - type: ExecuteCommand
-        command: "python3 -m pipenv run python -u bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}/build/sdktool/qt --src {{.AgentWorkingDir}}/qt-creator/qt-creator/src/tools/sdktool --build {{.AgentWorkingDir}}/build/sdktool/build --install {{.AgentWorkingDir}}/build/sdktool/install --make-command make"
+        command: "python3 -m pipenv run python -u bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}/build/sdktool/qt --src {{.AgentWorkingDir}}/qt-creator/qt-creator/src/tools/sdktool --build {{.AgentWorkingDir}}/build/sdktool/build --install {{.AgentWorkingDir}}/build/sdktool/install --make-command ninja --universal"
         maxTimeInSeconds: 36000
         maxTimeBetweenOutput: 3600
         userMessageOnFailure: "Failed to build sdktool, check logs."
@@ -96,7 +96,7 @@ instructions:
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to download elfutils package, check logs."
       - type: ExecuteCommand
-        command: "C:\\Utils\\sevenzip\\7z.exe x -y {{.AgentWorkingDir}}\\build\\qt_temp\\elfutils-release_0.175qt-windows-x86_64.7z -o{{.AgentWorkingDir}}\\build\\qt_temp\\elfutils"
+        command: "7z.exe x -y {{.AgentWorkingDir}}\\build\\qt_temp\\elfutils-release_0.175qt-windows-x86_64.7z -o{{.AgentWorkingDir}}\\build\\qt_temp\\elfutils"
         maxTimeInSeconds: 3600
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to extract elfutils package, check logs."
@@ -106,7 +106,7 @@ instructions:
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to download python package, check logs."
       - type: ExecuteCommand
-        command: "C:\\Utils\\sevenzip\\7z.exe x -y {{.AgentWorkingDir}}\\build\\qt_temp\\Python38-win-x64.7z -o{{.AgentWorkingDir}}\\build\\qt_temp\\python"
+        command: "7z.exe x -y {{.AgentWorkingDir}}\\build\\qt_temp\\Python38-win-x64.7z -o{{.AgentWorkingDir}}\\build\\qt_temp\\python"
         maxTimeInSeconds: 3600
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to extract python package, check logs."
@@ -116,19 +116,19 @@ instructions:
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to download LLVM package, check logs."
       - type: ExecuteCommand
-        command: "C:\\Utils\\sevenzip\\7z.exe x -y {{.AgentWorkingDir}}\\build\\qt_temp\\libclang.7z -o{{.AgentWorkingDir}}\\build\\qt_temp\\"
+        command: "7z.exe x -y {{.AgentWorkingDir}}\\build\\qt_temp\\libclang.7z -o{{.AgentWorkingDir}}\\build\\qt_temp\\"
         maxTimeInSeconds: 3600
         maxTimeBetweenOutput: 360
         userMessageOnFailure: "Failed to extract LLVM package, check logs."
       - type: ExecuteCommand
-        command: "python -u {{.AgentWorkingDir}}\\qt-creator\\qt-creator\\scripts\\build.py --build-type {{.Env.QTC_BUILD_TYPE}} --src {{.AgentWorkingDir}}\\qt-creator\\qt-creator --build {{.AgentWorkingDir}}\\qt-creator\\qt-creator_build --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --python-path {{.AgentWorkingDir}}\\build\\qt_temp\\python --elfutils-path {{.AgentWorkingDir}}\\buid\\qt_temp\\elfutils --llvm-path {{.AgentWorkingDir}}\\build\\qt_temp\\libclang {{.Env.QTC_TEST_OPTION}} --no-zip --add-config=-DCMAKE_C_COMPILER_LAUNCHER=sccache --add-config=-DCMAKE_CXX_COMPILER_LAUNCHER=sccache --add-config=-DWITH_SCCACHE_SUPPORT=ON"
+        command: "python -u {{.AgentWorkingDir}}\\qt-creator\\qt-creator\\scripts\\build.py --build-type {{.Env.QTC_BUILD_TYPE}} --src {{.AgentWorkingDir}}\\qt-creator\\qt-creator --build {{.AgentWorkingDir}}\\qt-creator\\qt-creator_build --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --python-path {{.AgentWorkingDir}}\\build\\qt_temp\\python --elfutils-path {{.AgentWorkingDir}}\\buid\\qt_temp\\elfutils --llvm-path {{.AgentWorkingDir}}\\build\\qt_temp\\libclang {{.Env.QTC_TEST_OPTION}} --no-zip {{.Env.QTC_SCCACHE_C_OPTION}} {{.Env.QTC_SCCACHE_CXX_OPTION}} {{.Env.QTC_SCCACHE_ENABLE_OPTION}}"
         maxTimeInSeconds: 36000
         maxTimeBetweenOutput: 3600
         userMessageOnFailure: "Failed to run build.py, check logs."
       - type: ChangeDirectory
         directory: "{{.AgentWorkingDir}}\\build\\tqtc-qtsdk\\packaging_tools"
       - type: ExecuteCommand
-        command: "python -m pipenv run python -u bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}\\build\\sdktool\\qt --src {{.AgentWorkingDir}}\\qt-creator\\qt-creator\\src\\tools\\sdktool --build {{.AgentWorkingDir}}\\build\\sdktool\\build --install {{.AgentWorkingDir}}\\build\\sdktool\\install --make-command nmake"
+        command: "python -m pipenv run python -u bld_sdktool.py --qt-url {{.Env.QTC_SDKTOOL_QT_BASE_URL}}{{.Env.QTC_SDKTOOL_QT_EXT}} --qt-build {{.AgentWorkingDir}}\\build\\sdktool\\qt --src {{.AgentWorkingDir}}\\qt-creator\\qt-creator\\src\\tools\\sdktool --build {{.AgentWorkingDir}}\\build\\sdktool\\build --install {{.AgentWorkingDir}}\\build\\sdktool\\install --make-command ninja"
         maxTimeInSeconds: 36000
         maxTimeBetweenOutput: 3600
         userMessageOnFailure: "Failed to build sdktool, check logs."
@@ -142,38 +142,6 @@ instructions:
           property: target.arch
           equals_value: X86_64
 
-  - type: Group
-    instructions:
-      - type: MakeDirectory
-        directory: "{{.AgentWorkingDir}}/build/qt_temp"
-        maxTimeInSeconds: 3600
-        maxTimeBetweenOutput: 360
-        userMessageOnFailure: "Failed to create folder qt_temp, check logs."
-      - type: ExecuteCommand
-        command: "curl --fail -L --retry 5 --retry-delay 5 -o {{.AgentWorkingDir}}\\build\\qt_temp\\Python38-win-x86.7z https://master.qt.io/development_releases/prebuilt/python/Python38-win-x86.7z"
-        maxTimeInSeconds: 3600
-        maxTimeBetweenOutput: 360
-        userMessageOnFailure: "Failed to download python package, check logs."
-      - type: ExecuteCommand
-        command: "C:\\Utils\\sevenzip\\7z.exe x -y {{.AgentWorkingDir}}\\build\\qt_temp\\Python38-win-x86.7z -o{{.AgentWorkingDir}}\\build\\qt_temp\\python"
-        maxTimeInSeconds: 3600
-        maxTimeBetweenOutput: 360
-        userMessageOnFailure: "Failed to extract python package, check logs."
-      - type: ExecuteCommand
-        command: "python -u {{.AgentWorkingDir}}\\qt-creator\\qt-creator\\scripts\\build.py --build-type {{.Env.QTC_BUILD_TYPE}} --src {{.AgentWorkingDir}}\\qt-creator\\qt-creator --build {{.AgentWorkingDir}}\\qt-creator\\qt-creator_build --python-path {{.AgentWorkingDir}}\\buid\\qt_temp\\python --no-qtcreator --no-zip"
-        maxTimeInSeconds: 36000
-        maxTimeBetweenOutput: 3600
-        userMessageOnFailure: "Failed to run build.py, check logs."
-    enable_if:
-      condition: and
-      conditions:
-        - condition: property
-          property: target.compiler
-          in_values: [MSVC2013, MSVC2015, MSVC2017, MSVC2019]
-        - condition: property
-          property: target.arch
-          equals_value: X86
-
   - type: UploadArtifact
     archiveDirectory: "{{.AgentWorkingDir}}/qt-creator/qt-creator_build/build"
     transferType: UploadModuleBuildArtifact
diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml
index e2d11901180..22d53d03e2a 100644
--- a/coin/instructions/common_environment.yaml
+++ b/coin/instructions/common_environment.yaml
@@ -7,10 +7,10 @@ instructions:
         variableValue: "RelWithDebInfo"
       - type: EnvironmentVariable
         variableName: LLVM_BASE_URL
-        variableValue: https://ci-files02-hki.ci.qt.io/packages/jenkins/qtcreator_libclang/libclang-release_17.0.1-based
+        variableValue: https://ci-files02-hki.ci.qt.io/packages/jenkins/qtcreator_libclang/libclang-release_18.1.7-based
       - type: EnvironmentVariable
         variableName: QTC_QT_BASE_URL
-        variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.6/6.6.2-released/Qt"
+        variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.7/6.7.1-released/Qt"
       - type: EnvironmentVariable
         variableName: QTC_QT_MODULES
         variableValue: "qt5compat qtbase qtdeclarative qtimageformats qtquick3d qtquicktimeline qtserialport qtshadertools qtsvg qttools qttranslations qtwebengine"
@@ -19,10 +19,10 @@ instructions:
         variableValue: 11.0
       - type: EnvironmentVariable
         variableName: SDKTOOL_MACOSX_DEPLOYMENT_TARGET
-        variableValue: 10.14
+        variableValue: 11.0
       - type: EnvironmentVariable
         variableName: QTC_SDKTOOL_QT_BASE_URL
-        variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/5.15/5.15.2-final-released/latest/src/submodules/qtbase-everywhere-src-5.15.2"
+        variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.6/6.6.0-released/Qt/src/submodules/qtbase-everywhere-src-6.6.0"
       - type: Group
         instructions:
           - type: EnvironmentVariable
@@ -59,6 +59,21 @@ instructions:
           condition: property
           property: target.os
           equals_value: MacOS
+      - type: Group
+        instructions:
+          - type: EnvironmentVariable
+            variableName: QTC_SCCACHE_C_OPTION
+            variableValue: --add-config=-DCMAKE_C_COMPILER_LAUNCHER=sccache
+          - type: EnvironmentVariable
+            variableName: QTC_SCCACHE_CXX_OPTION
+            variableValue: --add-config=-DCMAKE_CXX_COMPILER_LAUNCHER=sccache
+          - type: EnvironmentVariable
+            variableName: QTC_SCCACHE_ENABLE_OPTION
+            variableValue: --add-config=-DWITH_SCCACHE_SUPPORT=ON
+        enable_if:
+          condition: property
+          property: features
+          contains_value: Sccache
 
   - type: Group
     instructions:
diff --git a/coin/instructions/provision.yaml b/coin/instructions/provision.yaml
index 7b84c6e3baa..a5dad3955c6 100644
--- a/coin/instructions/provision.yaml
+++ b/coin/instructions/provision.yaml
@@ -20,7 +20,7 @@ instructions:
     maxTimeInSeconds: 600
     maxTimeBetweenOutput: 600
     project: qtsdk/tqtc-qtsdk
-    ref: master
+    ref: production
     directory: "build/tqtc-qtsdk"
     userMessageOnFailure: "Failed to install tqtc-qtsdk, check logs"
   - type: Group
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 96428853f26..ecef22e379c 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -16,6 +16,9 @@ accept_configuration:
         - condition: property
           property: target.compiler
           equals_value: MSVC2019
+        - condition: property
+          property: target.arch
+          not_equals_value: X86
     - condition: and
       conditions:
         - condition: property
diff --git a/coin/product_dependencies.yaml b/coin/product_dependencies.yaml
index a658f8103be..9a7e164d2b3 100644
--- a/coin/product_dependencies.yaml
+++ b/coin/product_dependencies.yaml
@@ -1,4 +1,4 @@
 dependencies:
   ../../qt/qt5.git:
-    ref: "6.6"
+    ref: "6.7"
 
diff --git a/dist/changelog/changes-13.0.2.md b/dist/changelog/changes-13.0.2.md
new file mode 100644
index 00000000000..629efc3d1b0
--- /dev/null
+++ b/dist/changelog/changes-13.0.2.md
@@ -0,0 +1,94 @@
+Qt Creator 13.0.2
+=================
+
+Qt Creator version 13.0.2 contains bug fixes.
+
+The most important changes are listed in this document. For a complete list of
+changes, see the Git log for the Qt Creator sources that you can check out from
+the public Git repository. For example:
+
+    git clone git://code.qt.io/qt-creator/qt-creator.git
+    git log --cherry-pick --pretty=oneline v13.0.1..v13.0.2
+
+General
+-------
+
+* Fixed that the `-client` option could start a new Qt Creator instance instead
+  of using a running one (which affects for example version control operations)
+  ([QTCREATORBUG-30624](https://bugreports.qt.io/browse/QTCREATORBUG-30624))
+
+Editing
+-------
+
+* Fixed that closing files with the tool button didn't add an entry to the
+  navigation history
+
+### Widget Designer
+
+* Fixed that `Use Qt module name in #include-directive` used Qt 4 module names
+  ([QTCREATORBUG-30751](https://bugreports.qt.io/browse/QTCREATORBUG-30751))
+
+### Copilot
+
+* Adapted to changes in the Copilot neovim plugin
+
+Projects
+--------
+
+### CMake
+
+* Fixed the environment macro expansion for Presets
+
+### Meson
+
+* Fixed a crash when selecting kits
+  ([QTCREATORBUG-30698](https://bugreports.qt.io/browse/QTCREATORBUG-30698))
+
+Terminal
+--------
+
+* Fixed the handling of environment variables with an equal sign `=` in the
+  value
+  ([QTCREATORBUG-30844](https://bugreports.qt.io/browse/QTCREATORBUG-30844))
+
+Version Control Systems
+-----------------------
+
+### Git
+
+* Fixed a crash in `Instant Blame` when reloading externally modified files
+  ([QTCREATORBUG-30824](https://bugreports.qt.io/browse/QTCREATORBUG-30824))
+
+Platforms
+---------
+
+### Windows
+
+* Fixed missing paths with `Add build library search path to PATH` for CMake
+  projects
+  ([QTCREATORBUG-30556](https://bugreports.qt.io/browse/QTCREATORBUG-30556),
+   [QTCREATORBUG-30827](https://bugreports.qt.io/browse/QTCREATORBUG-30827),
+   [QTCREATORBUG-30932](https://bugreports.qt.io/browse/QTCREATORBUG-30932))
+
+### Android
+
+* Fixed a crash when re-connecting devices
+  ([QTCREATORBUG-30645](https://bugreports.qt.io/browse/QTCREATORBUG-30645),
+   [QTCREATORBUG-30770](https://bugreports.qt.io/browse/QTCREATORBUG-30770))
+
+### Remote Linux
+
+* Fixed passing more than one argument to `rsync`
+  ([QTCREATORBUG-30795](https://bugreports.qt.io/browse/QTCREATORBUG-30795))
+
+Credits for these changes go to:
+--------------------------------
+Alessandro Portale  
+Christian Kandeler  
+Christian Stenger  
+Cristian Adam  
+David Schulz  
+Eike Ziller  
+Leena Miettinen  
+Marcus Tillmanns  
+Robert Löhning  
diff --git a/dist/changelog/changes-14.0.0.md b/dist/changelog/changes-14.0.0.md
new file mode 100644
index 00000000000..3625940c757
--- /dev/null
+++ b/dist/changelog/changes-14.0.0.md
@@ -0,0 +1,379 @@
+Qt Creator 14
+=============
+
+Qt Creator version 14 contains bug fixes and new features.
+
+The most important changes are listed in this document. For a complete list of
+changes, see the Git log for the Qt Creator sources that you can check out from
+the public Git repository or view online at
+
+<https://code.qt.io/cgit/qt-creator/qt-creator.git/log/?id=13.0..v14.0.0>
+
+General
+-------
+
+* Started work on supporting Lua based plugins (registering language servers,
+  actions, preferences, and wizards)
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-extending/lua-extensions.html))
+* Added a mode for managing extensions
+* Added `Clear` and `Save Contents` to context menus of all output views
+* Locator
+    * Added the option to show results relative to project root
+      ([QTCREATORBUG-29462](https://bugreports.qt.io/browse/QTCREATORBUG-29462))
+
+Editing
+-------
+
+* Changed the default behavior when files change on disk to
+  `Reload All Unchanged Editors`
+* Made the search options session-specific
+  ([QTCREATORBUG-793](https://bugreports.qt.io/browse/QTCREATORBUG-793))
+* Added menus with the navigation history to the back and forward buttons
+  ([QTCREATORBUG-347](https://bugreports.qt.io/browse/QTCREATORBUG-347))
+* Added a highlight for the current view in case of multiple views
+  ([QTCREATORBUG-23654](https://bugreports.qt.io/browse/QTCREATORBUG-23654))
+* Added `Window > Reopen Last Closed Document`
+* Added the option to open files in a text editor that were detected as binary
+  ([QTCREATORBUG-31116](https://bugreports.qt.io/browse/QTCREATORBUG-31116))
+* Fixed that changing a document's MIME type by renaming did not re-open it in
+  the new editor type when needed
+  ([QTCREATORBUG-30317](https://bugreports.qt.io/browse/QTCREATORBUG-30317))
+* Fixed that after hiding the editor in `Debug` mode, `Edit` mode always opened
+  when opening documents, even if an external editor window was available
+  ([QTCREATORBUG-30408](https://bugreports.qt.io/browse/QTCREATORBUG-30408))
+* Fixed that it wasn't possible to open a file in the text editor if it was
+  classified as a binary file format by the MIME database
+  ([QTCREATORBUG-31116](https://bugreports.qt.io/browse/QTCREATORBUG-31116))
+* Fixed the unindenting with backspace when multiple cursors are active
+  ([QTCREATORBUG-31158](https://bugreports.qt.io/browse/QTCREATORBUG-31158))
+
+### C++
+
+* Made C++ code model settings configurable per project
+* Added a setting for the naming of include guards
+  ([QTCREATORBUG-25117](https://bugreports.qt.io/browse/QTCREATORBUG-25117))
+* Fixed indentation after function calls with subscript operator
+  ([QTCREATORBUG-29225](https://bugreports.qt.io/browse/QTCREATORBUG-29225))
+* Refactoring
+    * Added `Convert Function Call to Qt Meta-Method Invocation`
+      ([QTCREATORBUG-15972](https://bugreports.qt.io/browse/QTCREATORBUG-15972))
+    * Added `Move Class to a Dedicated Set of Source Files`
+      ([QTCREATORBUG-12190](https://bugreports.qt.io/browse/QTCREATORBUG-12190))
+    * Added `Re-order Member Function Definitions According to Declaration Order`
+      ([QTCREATORBUG-6199](https://bugreports.qt.io/browse/QTCREATORBUG-6199))
+    * Added `Add Curly Braces` for do, while, and for loops
+    * Fixed issues with macros
+      ([QTCREATORBUG-10279](https://bugreports.qt.io/browse/QTCREATORBUG-10279))
+
+    [Documentation](https://doc.qt.io/qtcreator/creator-reference-cpp-quick-fixes.html)
+
+* Clangd
+    * Updated the prebuilt binaries to LLVM 18.1.7
+    * Increased the minimum version to LLVM 17
+    * Added the `Per-project index location` and `Per-session index location`
+      options in `Preferences` > `C++` > `Clangd` for setting the index location
+      for a project or session
+      ([QTCREATORBUG-27346](https://bugreports.qt.io/browse/QTCREATORBUG-27346))
+    * Added the `Update dependent sources` option to make re-parsing source files
+      while editing header files optional
+      ([QTCREATORBUG-29943](https://bugreports.qt.io/browse/QTCREATORBUG-29943))
+    * Fixed the handling of system headers
+      ([QTCREATORBUG-30474](https://bugreports.qt.io/browse/QTCREATORBUG-30474))
+* Built-in
+    * Added the `Enable indexing` option in `Preferences` > `C++` > `Code Model`
+      to turn off the built-in indexer
+      ([QTCREATORBUG-29147](https://bugreports.qt.io/browse/QTCREATORBUG-29147))
+    * Added the `Statement Macros` field in `Preferences` > `C++` > `Code Style`
+      for macros that the indenter interprets as complete statements that don't
+      require a semicolon at the end
+      ([QTCREATORBUG-13640](https://bugreports.qt.io/browse/QTCREATORBUG-13640),
+       [QTCREATORBUG-15069](https://bugreports.qt.io/browse/QTCREATORBUG-15069),
+       [QTCREATORBUG-18789](https://bugreports.qt.io/browse/QTCREATORBUG-18789))
+      ([Clang Format Documentation](https://clang.llvm.org/docs/ClangFormatStyleOptions.html#statementmacros))
+    * Added indentation support for `try-catch` statements
+      ([QTCREATORBUG-29452](https://bugreports.qt.io/browse/QTCREATORBUG-29452))
+
+### QML
+
+* Improved support for enums
+  ([QTCREATORBUG-19226](https://bugreports.qt.io/browse/QTCREATORBUG-19226))
+* Added `Qt Design Studio` to `Open With` for `.ui.qml` files
+  ([Documentation](https://doc.qt.io/qtcreator/creator-quick-ui-forms.html))
+* Fixed that the color preview did not work on named colors
+  ([QTCREATORBUG-30594](https://bugreports.qt.io/browse/QTCREATORBUG-30594))
+* Language Server
+    * Switched on by default for Qt 6.8 and later
+    * Added an option for generating `qmlls.ini` files for CMake projects in
+      `Preferences` > `Qt Quick`> `QML/JS Editing`
+      ([QTCREATORBUG-30394](https://bugreports.qt.io/browse/QTCREATORBUG-30394))
+      ([Qt Documentation](https://doc.qt.io/qt-6/cmake-variable-qt-qml-generate-qmlls-ini.html))
+    * Fixed that tool tips from the built-in model were shown instead of tool tips
+      from the server
+
+      [Documentation](https://doc.qt.io/qtcreator/creator-how-to-use-qml-language-server.html)
+
+### Python
+
+* Added options for updating Python Language Server
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-14.0/creator-language-servers.html))
+
+### Language Server Protocol
+
+* Added support for `SymbolTag`
+  ([Protocol Documentation](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#symbolTag))
+* Added support for type hierarchy
+  ([QTCREATORBUG-28116](https://bugreports.qt.io/browse/QTCREATORBUG-28116))
+
+### Compiler Explorer
+
+* Added a wizard template for code that uses Qt to `File`> `New File`>
+  `Compiler Explorer`
+  [Documentation](https://doc.qt.io/qtcreator/creator-how-to-create-compiler-explorer-sessions.html)
+
+### Markdown
+
+* Fixed the navigation history
+
+### Models
+
+* Added more visual attributes for relations
+* Added support for linked files in model element properties
+* Added support for custom images in model element properties
+
+([Documentation](https://doc-snapshots.qt.io/qtcreator-14.0/creator-how-to-create-models.html))
+
+### SCXML
+
+* Added visualization of conditions on transitions by using square brackets: `[]`
+  ([QTCREATORBUG-21946](https://bugreports.qt.io/browse/QTCREATORBUG-21946))
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-14.0/creator-scxml.html))
+
+Projects
+--------
+
+* Added the `Hide Inactive Kits`/`Show All Kits` button to hide inactive kits
+  from the list in the `Projects` mode
+* Added support for user comments in the environment editor
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-14.0/creator-how-to-edit-environment-settings.html))
+* Added the setting `Time to wait before force-stopping applications`
+  ([QTCREATORBUG-31025](https://bugreports.qt.io/browse/QTCREATORBUG-31025))
+* Fixed the parsing of file links when color was used for the output
+  ([QTCREATORBUG-30774](https://bugreports.qt.io/browse/QTCREATORBUG-30774))
+* Fixed that the column information was not used when opening files from links
+  in issues
+* Fixed changing the case of file names on case-insensitive file systems
+  ([QTCREATORBUG-30846](https://bugreports.qt.io/browse/QTCREATORBUG-30846))
+* Fixed that Qt Creator variables were not expanded for the `Copy File`
+  deploy step
+  ([QTCREATORBUG-30821](https://bugreports.qt.io/browse/QTCREATORBUG-30821))
+* Fixed duplicate entries in the variable chooser for the build directory
+  ([QTCREATORBUG-31183](https://bugreports.qt.io/browse/QTCREATORBUG-31183))
+
+### CMake
+
+* Made CMake settings configurable per project
+* Implemented `Open Online Documentation` for CMake documentation
+* Added `Clear CMake Configuration` to the context menu in the `Projects` view
+  ([QTCREATORBUG-24658](https://bugreports.qt.io/browse/QTCREATORBUG-24658))
+* Added support for the `CROSSCOMPILING_EMULATOR` target property
+  ([QTCREATORBUG-29880](https://bugreports.qt.io/browse/QTCREATORBUG-29880))
+  ([CMake Documentation](https://cmake.org/cmake/help/latest/prop_tgt/CROSSCOMPILING_EMULATOR.html#crosscompiling-emulator))
+* Fixed that the package manager auto-setup files were not removed with
+  `Clear CMake Configuration`
+  ([QTCREATORBUG-30771](https://bugreports.qt.io/browse/QTCREATORBUG-30771))
+* Fixed that files generated by the Qt QML CMake API were not filtered as
+  generated files
+  ([QTCREATORBUG-29631](https://bugreports.qt.io/browse/QTCREATORBUG-29631))
+* Fixed a crash when triggering `Follow Symbol` in a CMake file that does not
+  belong to a project
+  ([QTCREATORBUG-31077](https://bugreports.qt.io/browse/QTCREATORBUG-31077))
+* Fixed that multiple build configurations of the same type used the same
+  build directory
+  ([QTCREATORBUG-26066](https://bugreports.qt.io/browse/QTCREATORBUG-26066))
+* Fixed an issue with adding new files when file globs are used in the CMake
+  files
+  ([QTCREATORBUG-30445](https://bugreports.qt.io/browse/QTCREATORBUG-30445))
+* Fixed the default CMake generator for kits if Ninja is not installed
+  ([QTCREATORBUG-31129](https://bugreports.qt.io/browse/QTCREATORBUG-31129))
+* Fixed that duplicate `CMAKE_CXX_COMPILER` entries could be used
+  ([QTCREATORBUG-27005](https://bugreports.qt.io/browse/QTCREATORBUG-27005))
+* Presets
+    * Made CMake settings configurable
+      ([QTCREATORBUG-25972](https://bugreports.qt.io/browse/QTCREATORBUG-25972),
+       [QTCREATORBUG-29559](https://bugreports.qt.io/browse/QTCREATORBUG-29559),
+       [QTCREATORBUG-30385](https://bugreports.qt.io/browse/QTCREATORBUG-30385))
+    * Made it possible to register debuggers
+      ([QTCREATORBUG-30836](https://bugreports.qt.io/browse/QTCREATORBUG-30836))
+    * Added support for custom build types
+      ([QTCREATORBUG-30014](https://bugreports.qt.io/browse/QTCREATORBUG-30014))
+
+    ([Documentation](https://doc-snapshots.qt.io/qtcreator-14.0/creator-build-settings-cmake-presets.html))
+
+### Workspace
+
+* Added `File > Open Workspace` for opening a directory as a project. A project
+  file `.qtcreator/project.json` in the directory is used to set a name and
+  file exclusion filters.
+
+Debugging
+---------
+
+### C++
+
+* Improved performance
+* GDB
+    * Added a setting for `debuginfod`
+      ([QTCREATORBUG-28868](https://bugreports.qt.io/browse/QTCREATORBUG-28868))
+* CDB
+    * Fixed the display type of `HRESULT`
+      ([QTCREATORBUG-30574](https://bugreports.qt.io/browse/QTCREATORBUG-30574))
+
+Analyzer
+--------
+
+### Clang
+
+* Added the option to `Suppress Diagnostics Inline`
+  ([QTCREATORBUG-24847](https://bugreports.qt.io/browse/QTCREATORBUG-24847))
+  ([Clazy Documentation](https://github.com/KDE/clazy?tab=readme-ov-file#reducing-warning-noise))
+  ([clang-tidy Documentation](https://clang.llvm.org/extra/clang-tidy/#suppressing-undesired-diagnostics))
+
+### Axivion
+
+* Added the `Add` and `Remove` buttons to `Preferences` > `Axivion` for
+  registering multiple servers
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-14.0/creator-preferences-axivion.html))
+
+### Cppcheck
+
+* Fixed that Cppcheck was not working until selecting `Apply` in the settings
+  ([QTCREATORBUG-28951](https://bugreports.qt.io/browse/QTCREATORBUG-28951),
+   [QTCREATORBUG-30615](https://bugreports.qt.io/browse/QTCREATORBUG-30615))
+
+Terminal
+--------
+
+* Fixed resizing on Windows
+  ([QTCREATORBUG-30558](https://bugreports.qt.io/browse/QTCREATORBUG-30558))
+
+Version Control Systems
+-----------------------
+
+### Git
+
+* Fixed that email and author mapping was not used for logs and showing changes
+
+Test Integration
+----------------
+
+* Made the test timeout optional in `Preferences` > `Testing` > `General`
+  ([QTCREATORBUG-30668](https://bugreports.qt.io/browse/QTCREATORBUG-30668))
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-14.0/creator-preferences-testing.html))
+* Added the project specific `Limit Files to Path Patterns` option in `Projects` >
+  `Project Settings` > `Testing` for restricting the search for tests
+  ([Documentation](https://doc-snapshots.qt.io/qtcreator-14.0/creator-how-to-limit-files-to-path-patterns.html))
+
+### Qt Test
+
+* Fixed the order of test execution
+  ([QTCREATORBUG-30670](https://bugreports.qt.io/browse/QTCREATORBUG-30670))
+
+Platforms
+---------
+
+### Linux
+
+* Adapted the default theme to the system theme
+* Fixed issues with light themes on dark system themes
+  ([QTCREATORBUG-18281](https://bugreports.qt.io/browse/QTCREATORBUG-18281),
+   [QTCREATORBUG-20889](https://bugreports.qt.io/browse/QTCREATORBUG-20889),
+   [QTCREATORBUG-26817](https://bugreports.qt.io/browse/QTCREATORBUG-26817),
+   [QTCREATORBUG-28589](https://bugreports.qt.io/browse/QTCREATORBUG-28589),
+   [QTCREATORBUG-30138](https://bugreports.qt.io/browse/QTCREATORBUG-30138))
+* Fixed that recent projects on unavailable remote devices regularly
+  froze Qt Creator
+  ([QTCREATORBUG-30681](https://bugreports.qt.io/browse/QTCREATORBUG-30681))
+
+### Android
+
+* Added support for creating `android-desktop` devices in `Preferences` >
+  `Devices` > `Add` > `Android Device` > `Device definition`
+* Added support for `namespace` in `build.gradle`
+  ([QTBUG-106907](https://bugreports.qt.io/browse/QTBUG-106907))
+* Fixed that errors when creating AVDs were not visible to the user
+  ([QTCREATORBUG-30852](https://bugreports.qt.io/browse/QTCREATORBUG-30852))
+
+### iOS
+
+* Removed Simulator management from the preferences. Use the
+  `Devices and Simulators` window in Xcode instead.
+* Fixed that starting the debugger could be slow for iOS < 17
+  ([QTCREATORBUG-31044](https://bugreports.qt.io/browse/QTCREATORBUG-31044))
+
+### Remote Linux
+
+* Added the `Use SSH port forwarding for debugging` option in `Preferences` >
+  `Devices` for a `Remote Linux Device`
+* Improved the performance of the generic deployment method
+* Fixed that the file size check that is performed before parsing C++ files
+  could freeze Qt Creator until finished for remote projects
+
+### Qt Application Manager
+
+* Added support for the `perf` profiler
+
+### Bare Metal
+
+* Fixed issues with Qbs and the IAR toolchain
+  ([QTCREATORBUG-24040](https://bugreports.qt.io/browse/QTCREATORBUG-24040))
+
+Credits for these changes go to:
+--------------------------------
+Ahmad Samir  
+Aleksei German  
+Alessandro Portale  
+Alexander Drozdov  
+Ali Kianian  
+Andre Hartmann  
+André Pönitz  
+Artem Sokolovskii  
+Assam Boudjelthia  
+BogDan Vatra  
+Brook Cronin  
+Burak Hancerli  
+Christian Kandeler  
+Christian Stenger  
+Cristian Adam  
+David Schulz  
+Dominik Holland  
+Eike Ziller  
+Esa Törmänen  
+Henning Gruendl  
+Jaroslaw Kobus  
+Jiajie Chen  
+Jochen Becher  
+Johanna Vanhatapio  
+Jussi Witick  
+Knud Dollereder  
+Leena Miettinen  
+Mahmoud Badri  
+Marco Bubke  
+Marcus Tillmanns  
+Mathias Hasselmann  
+Mats Honkamaa  
+Michael Weghorn  
+Miikka Heikkinen  
+Orgad Shaneh  
+Pranta Dastider  
+Ralf Habacker  
+Robert Löhning  
+Sami Shalayel  
+Semih Yavuz  
+Sergey Silin  
+Shrief Gabr  
+Teea Poldsam  
+Thiago Macieira  
+Thomas Hartmann  
+Tim Jenßen  
+Vikas Pachdha  
+Xavier Besson  
diff --git a/dist/changelog/template.md b/dist/changelog/template.md
new file mode 100644
index 00000000000..66e94906aea
--- /dev/null
+++ b/dist/changelog/template.md
@@ -0,0 +1,135 @@
+Qt Creator 13
+=============
+
+Qt Creator version 13 contains bug fixes and new features.
+
+The most important changes are listed in this document. For a complete list of
+changes, see the Git log for the Qt Creator sources that you can check out from
+the public Git repository. For example:
+
+    git clone git://code.qt.io/qt-creator/qt-creator.git
+    git log --cherry-pick --pretty=oneline origin/12.0..v13.0.0
+
+New plugins
+-----------
+
+General
+-------
+
+Help
+----
+
+Editing
+-------
+
+### C++
+
+### QML
+
+### Python
+
+### Language Server Protocol
+
+### Widget Designer
+
+### Copilot
+
+### Compiler Explorer
+
+### TODO
+
+### Markdown
+
+### Images
+
+### Models
+
+### SCXML
+
+### Binary Files
+
+Projects
+--------
+
+### CMake
+
+### qmake
+
+### Qbs
+
+### Python
+
+### Workspace
+
+### vcpkg
+
+### Qt Safe Renderer
+
+Debugging
+---------
+
+### C++
+
+### QML
+
+### Debug Adapter Protocol
+
+Analyzer
+--------
+
+### Clang
+
+### Axivion
+
+### CTF Visualizer
+
+### Cppcheck
+
+Terminal
+--------
+
+Version Control Systems
+-----------------------
+
+### Git
+
+### CVS
+
+Test Integration
+----------------
+
+### Qt Test
+
+### Catch2
+
+### CTest
+
+Platforms
+---------
+
+### Windows
+
+### Linux
+
+### macOS
+
+### Android
+
+### iOS
+
+### Remote Linux
+
+### Docker
+
+### Boot to Qt
+
+### MCU
+
+### Qt Application Manager
+
+### QNX
+
+### Bare Metal
+
+Credits for these changes go to:
+--------------------------------
diff --git a/dist/copyright_template.txt b/dist/copyright_template.txt
index 974656016df..efdc4bcbe8d 100644
--- a/dist/copyright_template.txt
+++ b/dist/copyright_template.txt
@@ -1,3 +1,3 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) %{CurrentDate:yyyy} The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index f78240e4fb0..1100fc0733a 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -25,11 +25,19 @@ function(_find_all_includes _ret_includes _ret_framework_paths)
 
   # framework path
   if (APPLE)
-    # version-less target Qt::Core is an interface library that links to QtX::Core
-    get_target_property(_qt_core Qt::Core INTERFACE_LINK_LIBRARIES)
-    get_target_property(_qt_target ${_qt_core} LOCATION) # <fw_path>/QtCore.framework/QtCore
-    get_filename_component(_qt_loc "${_qt_target}" DIRECTORY)
-    set("${_ret_framework_paths}" "${_qt_loc}/.." PARENT_SCOPE)
+    get_target_property(_qt_type Qt::Core TYPE)
+    if ("${_qt_type}" STREQUAL "INTERFACE_LIBRARY")
+        # version-less target Qt::Core is an interface library that links to QtX::Core
+        get_target_property(_qt_core Qt::Core INTERFACE_LINK_LIBRARIES)
+    else()
+        set(_qt_core "Qt::Core")
+    endif()
+    get_target_property(_qt_target ${_qt_core} LOCATION)
+    # eg <fw_path>/QtCore.framework/QtCore
+    # or <fw_path>/QtCore.framework/Versions/A/QtCore
+    # cut off /QtCore.framework/*
+    string(REGEX REPLACE "/QtCore.framework/.*" "" _qt_loc "${_qt_target}")
+    set("${_ret_framework_paths}" "${_qt_loc}" PARENT_SCOPE)
   endif()
 endfunction()
 
@@ -67,8 +75,14 @@ if(WITH_ONLINE_DOCS)
   _add_doc(${IDE_DOC_FILE_ONLINE} "qtcreatordev/qtcreator-dev-online.qdocconf")
 endif()
 
+if (BUILD_DOCS_BY_DEFAULT)
+set(EXCLUDE_DOCS_FROM_ALL "")
+else()
+set(EXCLUDE_DOCS_FROM_ALL "EXCLUDE_FROM_ALL")
+endif()
+
 install(DIRECTORY config
   DESTINATION ${IDE_HEADER_INSTALL_PATH}/doc
   COMPONENT Devel
-  EXCLUDE_FROM_ALL
+  ${EXCLUDE_DOCS_FROM_ALL}
 )
diff --git a/doc/config/macros.qdocconf b/doc/config/macros.qdocconf
index 46e4e0b20c2..751bc80ab71 100644
--- a/doc/config/macros.qdocconf
+++ b/doc/config/macros.qdocconf
@@ -16,6 +16,7 @@ macro.macos             = "macOS"
 macro.note              = "\\b{Note:}"
 macro.oslash.HTML       = "&oslash;"
 macro.ouml.HTML         = "&ouml;"
+macro.B2Q               = "Boot to Qt"
 macro.Q3DS              = "Qt 3D Studio"
 macro.QA                = "Qt Assistant"
 macro.QAC               = "Qt Academy"
@@ -26,7 +27,7 @@ macro.QBSK              = "Qt Bridge for Sketch"
 macro.QBF               = "Qt Bridge for Figma"
 macro.QC                = "$IDE_DISPLAY_NAME"
 macro.QCE               = "$IDE_DISPLAY_NAME Enterprise"
-macro.QD                = "Qt Designer"
+macro.QD                = "Qt Widgets Designer"
 macro.QDS               = "Qt Design Studio"
 macro.QQEM              = "Qt Quick Effect Maker"
 macro.QDV               = "Qt Design Viewer"
diff --git a/doc/qtcreator/config/qtcreator-project.qdocconf b/doc/qtcreator/config/qtcreator-project.qdocconf
index fd5afe4e314..5e36e0cfc05 100644
--- a/doc/qtcreator/config/qtcreator-project.qdocconf
+++ b/doc/qtcreator/config/qtcreator-project.qdocconf
@@ -1,5 +1,5 @@
 project     = qtcreator
-description = "$IDE_DISPLAY_NAME Manual"
+description = "$IDE_DISPLAY_NAME Documentation"
 url         = http://doc.qt.io/$IDE_ID
 
 #Words to ignore for auto-linking
@@ -57,14 +57,14 @@ qhp.projects            = QtCreator
 qhp.QtCreator.file             = qtcreator.qhp
 qhp.QtCreator.namespace        = org.qt-project.qtcreator.$QTC_VERSION_TAG
 qhp.QtCreator.virtualFolder    = doc
-qhp.QtCreator.indexTitle       = $IDE_DISPLAY_NAME Manual $QTC_VERSION
+qhp.QtCreator.indexTitle       = $IDE_DISPLAY_NAME Documentation $QTC_VERSION
 qhp.QtCreator.filterAttributes = $IDE_ID $QTC_VERSION
 qhp.QtCreator.customFilters.QtCreator.name = $IDE_DISPLAY_NAME $QTC_VERSION
 qhp.QtCreator.customFilters.QtCreator.filterAttributes = $IDE_ID $QTC_VERSION
 qhp.QtCreator.indexRoot        =
 
 qhp.QtCreator.subprojects = manual
-qhp.QtCreator.subprojects.manual.title = $IDE_DISPLAY_NAME Manual
+qhp.QtCreator.subprojects.manual.title = $IDE_DISPLAY_NAME Documentation
 qhp.QtCreator.subprojects.manual.indexTitle = All Topics
 qhp.QtCreator.subprojects.manual.type = manual
 
@@ -73,10 +73,10 @@ qhp.QtCreator.subprojects.manual.type = manual
 macro.see                       = "\\sa"
 macro.function                  = "\\fn"
 
-navigation.landingpage = "$IDE_DISPLAY_NAME Manual"
+navigation.landingpage = "$IDE_DISPLAY_NAME Documentation"
 
 # Auto-generate navigation linking based on "All Topics":
 navigation.toctitles = "All Topics"
 navigation.toctitles.inclusive = false
 
-buildversion = "$IDE_DISPLAY_NAME Manual $QTC_VERSION"
+buildversion = "$IDE_DISPLAY_NAME $QTC_VERSION"
diff --git a/doc/qtcreator/config/style/qt5-sidebar.html b/doc/qtcreator/config/style/qt5-sidebar.html
index cf020e31ca0..340da73317c 100644
--- a/doc/qtcreator/config/style/qt5-sidebar.html
+++ b/doc/qtcreator/config/style/qt5-sidebar.html
@@ -1,24 +1,26 @@
 <div class="sectionlist normallist">
     <ul>
-            <li><a href="qtcreator-toc.html">Click Here for a List of All Topics</a></li>
+            <li><a href="qtcreator-toc.html">ALL TOPICS</a></li>
+    </ul>
+</div>
+<div class="sectionlist normallist">
+    <ul>
+            <li><a href="creator-how-to-install.html">Installation</a></li>
     </ul>
 </div>
 <div class="sectionlist normallist">
     <div class="heading">
-        <h2>Developing with Qt Creator</h2>
+        <h2>Getting Started</h2>
     </div>
     <div class="indexboxcont indexboxbar">
         <ul>
             <li><a href="creator-overview.html">Overview</a></li>
-            <li><a href="creator-getting-started.html">Getting Started</a></li>
+            <li><a href="creator-quick-tour.html">User Interface</a></li>
+            <li><a href="creator-configuring.html">Configuring Qt Creator</a></li>
             <li><a href="creator-project-creating.html">Creating Projects</a></li>
             <li><a href="creator-configuring-projects.html">Configuring Projects</a></li>
-            <li><a href="creator-live-preview.html">Validating with Target Hardware</a></li>
-            <li><a href="creator-connecting-mobile.html">Connecting Devices</a></li>
-            <li><a href="creator-deployment.html">Deploying to Devices</a></li>
             <li><a href="creator-debugging.html">Debugging</a></li>
             <li><a href="creator-analyze-mode.html">Analyzing Code</a></li>
-            <li><a href="creator-squish.html">Using Squish</a></li>
         </ul>
     </div>
 </div>
@@ -77,12 +79,12 @@
         <li><a href="technical-support.html">Technical Support</a></li>
         <li><a href="creator-version-control.html">Version Control Systems</a></li>
         <li><a href="creator-reference.html#analyzers">Analyzers</a></li>
-        <li><a href="creator-reference.html#build-configurations">Build Configurations</a></li>
         <li><a href="creator-reference.html#build-systems">Build Systems</a></li>
+        <li><a href="creator-reference.html#debuggers">Debuggers</a></li>
+        <li><a href="creator-reference.html#devices">Devices</a></li>
         <li><a href="creator-reference.html#editors">Editors</a></li>
         <li><a href="creator-reference.html#platforms">Platforms</a></li>
         <li><a href="creator-reference.html#preferences">Preferences</a></li>
-        <li><a href="creator-reference.html#run-configurations">Run Configurations</a></li>
         <li><a href="creator-reference.html#ui-design">UI Design</a></li>
         <li><a href="creator-reference.html#views">Views</a></li>
         <li><a href="creator-reference.html">See All</a></li>
diff --git a/doc/qtcreator/examples/textfinder/CMakeLists.txt b/doc/qtcreator/examples/textfinder/CMakeLists.txt
index a00ccd856b4..d0e3130d2f7 100644
--- a/doc/qtcreator/examples/textfinder/CMakeLists.txt
+++ b/doc/qtcreator/examples/textfinder/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 
 project(TextFinder VERSION 0.1 LANGUAGES CXX)
 
diff --git a/doc/qtcreator/images/front-advanced.png b/doc/qtcreator/images/front-advanced.png
deleted file mode 100644
index 99422ed74f0..00000000000
Binary files a/doc/qtcreator/images/front-advanced.png and /dev/null differ
diff --git a/doc/qtcreator/images/front-coding.png b/doc/qtcreator/images/front-coding.png
deleted file mode 100644
index b39a8c33db0..00000000000
Binary files a/doc/qtcreator/images/front-coding.png and /dev/null differ
diff --git a/doc/qtcreator/images/front-gs.png b/doc/qtcreator/images/front-gs.png
deleted file mode 100644
index b529411a7df..00000000000
Binary files a/doc/qtcreator/images/front-gs.png and /dev/null differ
diff --git a/doc/qtcreator/images/front-help.png b/doc/qtcreator/images/front-help.png
deleted file mode 100644
index f9640f48634..00000000000
Binary files a/doc/qtcreator/images/front-help.png and /dev/null differ
diff --git a/doc/qtcreator/images/front-preview.png b/doc/qtcreator/images/front-preview.png
deleted file mode 100644
index 9cb894c183e..00000000000
Binary files a/doc/qtcreator/images/front-preview.png and /dev/null differ
diff --git a/doc/qtcreator/images/front-ui.png b/doc/qtcreator/images/front-ui.png
deleted file mode 100644
index ee966bffc11..00000000000
Binary files a/doc/qtcreator/images/front-ui.png and /dev/null differ
diff --git a/doc/qtcreator/images/icons/api-reference.png b/doc/qtcreator/images/icons/api-reference.png
new file mode 100644
index 00000000000..543d7d1fa3e
Binary files /dev/null and b/doc/qtcreator/images/icons/api-reference.png differ
diff --git a/doc/qtcreator/images/icons/app-development.png b/doc/qtcreator/images/icons/app-development.png
new file mode 100644
index 00000000000..b3333b87c18
Binary files /dev/null and b/doc/qtcreator/images/icons/app-development.png differ
diff --git a/doc/qtcreator/images/icons/build-32x32.png b/doc/qtcreator/images/icons/build-32x32.png
new file mode 100644
index 00000000000..d6e045b7765
Binary files /dev/null and b/doc/qtcreator/images/icons/build-32x32.png differ
diff --git a/doc/qtcreator/images/icons/demo-32x32.png b/doc/qtcreator/images/icons/demo-32x32.png
new file mode 100644
index 00000000000..5c42b6f6c3a
Binary files /dev/null and b/doc/qtcreator/images/icons/demo-32x32.png differ
diff --git a/doc/qtcreator/images/icons/getting-started.png b/doc/qtcreator/images/icons/getting-started.png
new file mode 100644
index 00000000000..36b37d47404
Binary files /dev/null and b/doc/qtcreator/images/icons/getting-started.png differ
diff --git a/doc/qtcreator/images/icons/ide.png b/doc/qtcreator/images/icons/ide.png
new file mode 100644
index 00000000000..dbdb0ef7e0e
Binary files /dev/null and b/doc/qtcreator/images/icons/ide.png differ
diff --git a/doc/qtcreator/images/icons/installation.png b/doc/qtcreator/images/icons/installation.png
new file mode 100644
index 00000000000..6dc6a8e697b
Binary files /dev/null and b/doc/qtcreator/images/icons/installation.png differ
diff --git a/doc/qtcreator/images/icons/platform-and-toolchain.png b/doc/qtcreator/images/icons/platform-and-toolchain.png
new file mode 100644
index 00000000000..7f8a6be7f22
Binary files /dev/null and b/doc/qtcreator/images/icons/platform-and-toolchain.png differ
diff --git a/doc/qtcreator/images/icons/settings-32x32.png b/doc/qtcreator/images/icons/settings-32x32.png
new file mode 100644
index 00000000000..5c7202a30a6
Binary files /dev/null and b/doc/qtcreator/images/icons/settings-32x32.png differ
diff --git a/doc/qtcreator/images/icons/tutorials.png b/doc/qtcreator/images/icons/tutorials.png
new file mode 100644
index 00000000000..7044a2625a1
Binary files /dev/null and b/doc/qtcreator/images/icons/tutorials.png differ
diff --git a/doc/qtcreator/images/numbers/01.png b/doc/qtcreator/images/numbers/01.png
index 4c8b10b26c5..1190a99cc6d 100644
Binary files a/doc/qtcreator/images/numbers/01.png and b/doc/qtcreator/images/numbers/01.png differ
diff --git a/doc/qtcreator/images/numbers/02.png b/doc/qtcreator/images/numbers/02.png
index df24ef459e6..9ae3bae02cd 100644
Binary files a/doc/qtcreator/images/numbers/02.png and b/doc/qtcreator/images/numbers/02.png differ
diff --git a/doc/qtcreator/images/numbers/03.png b/doc/qtcreator/images/numbers/03.png
index 525bd926990..9d29cb93fff 100644
Binary files a/doc/qtcreator/images/numbers/03.png and b/doc/qtcreator/images/numbers/03.png differ
diff --git a/doc/qtcreator/images/numbers/04.png b/doc/qtcreator/images/numbers/04.png
index 6c6b489d5c9..206e9294629 100644
Binary files a/doc/qtcreator/images/numbers/04.png and b/doc/qtcreator/images/numbers/04.png differ
diff --git a/doc/qtcreator/images/numbers/05.png b/doc/qtcreator/images/numbers/05.png
index 6d831b204de..6baa13123d7 100644
Binary files a/doc/qtcreator/images/numbers/05.png and b/doc/qtcreator/images/numbers/05.png differ
diff --git a/doc/qtcreator/images/numbers/06.png b/doc/qtcreator/images/numbers/06.png
index b7adb30f960..4f398dc2633 100644
Binary files a/doc/qtcreator/images/numbers/06.png and b/doc/qtcreator/images/numbers/06.png differ
diff --git a/doc/qtcreator/images/numbers/07.png b/doc/qtcreator/images/numbers/07.png
index a160038f0eb..c71842702f9 100644
Binary files a/doc/qtcreator/images/numbers/07.png and b/doc/qtcreator/images/numbers/07.png differ
diff --git a/doc/qtcreator/images/numbers/08.png b/doc/qtcreator/images/numbers/08.png
index 6ccf88b7eb8..f0d894c106d 100644
Binary files a/doc/qtcreator/images/numbers/08.png and b/doc/qtcreator/images/numbers/08.png differ
diff --git a/doc/qtcreator/images/numbers/09.png b/doc/qtcreator/images/numbers/09.png
index 0ed195b154a..0bf3bc7fb16 100644
Binary files a/doc/qtcreator/images/numbers/09.png and b/doc/qtcreator/images/numbers/09.png differ
diff --git a/doc/qtcreator/images/numbers/10.png b/doc/qtcreator/images/numbers/10.png
index 8c468d99989..bec47399a82 100644
Binary files a/doc/qtcreator/images/numbers/10.png and b/doc/qtcreator/images/numbers/10.png differ
diff --git a/doc/qtcreator/images/qtcreator-breakdown.png b/doc/qtcreator/images/qtcreator-breakdown.png
deleted file mode 100644
index a226f9f2542..00000000000
Binary files a/doc/qtcreator/images/qtcreator-breakdown.png and /dev/null differ
diff --git a/doc/qtcreator/images/qtcreator-build-environment.webp b/doc/qtcreator/images/qtcreator-build-environment.webp
index 48bf4753d24..9cc53e85148 100644
Binary files a/doc/qtcreator/images/qtcreator-build-environment.webp and b/doc/qtcreator/images/qtcreator-build-environment.webp differ
diff --git a/doc/qtcreator/images/qtcreator-clang-tidy-view.webp b/doc/qtcreator/images/qtcreator-clang-tidy-view.webp
index 1a914a683a8..46be17b10ea 100644
Binary files a/doc/qtcreator/images/qtcreator-clang-tidy-view.webp and b/doc/qtcreator/images/qtcreator-clang-tidy-view.webp differ
diff --git a/doc/qtcreator/images/qtcreator-clang-tools-filter-diagnostics.webp b/doc/qtcreator/images/qtcreator-clang-tools-filter-diagnostics.webp
new file mode 100644
index 00000000000..bfb3b7001fa
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-clang-tools-filter-diagnostics.webp differ
diff --git a/doc/qtcreator/images/qtcreator-code-style-built-in-indenter.webp b/doc/qtcreator/images/qtcreator-code-style-built-in-indenter.webp
index f8eaa1dac52..eb85b20033f 100644
Binary files a/doc/qtcreator/images/qtcreator-code-style-built-in-indenter.webp and b/doc/qtcreator/images/qtcreator-code-style-built-in-indenter.webp differ
diff --git a/doc/qtcreator/images/qtcreator-context-sensitive-help.png b/doc/qtcreator/images/qtcreator-context-sensitive-help.png
deleted file mode 100644
index b6c7679164b..00000000000
Binary files a/doc/qtcreator/images/qtcreator-context-sensitive-help.png and /dev/null differ
diff --git a/doc/qtcreator/images/qtcreator-context-sensitive-help.webp b/doc/qtcreator/images/qtcreator-context-sensitive-help.webp
new file mode 100644
index 00000000000..81822ab856f
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-context-sensitive-help.webp differ
diff --git a/doc/qtcreator/images/qtcreator-custom-wizard.webp b/doc/qtcreator/images/qtcreator-custom-wizard.webp
index 6e0f5ddc71d..6a9d75073a0 100644
Binary files a/doc/qtcreator/images/qtcreator-custom-wizard.webp and b/doc/qtcreator/images/qtcreator-custom-wizard.webp differ
diff --git a/doc/qtcreator/images/qtcreator-devices-qnx.webp b/doc/qtcreator/images/qtcreator-devices-qnx.webp
new file mode 100644
index 00000000000..a431e883b27
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-devices-qnx.webp differ
diff --git a/doc/qtcreator/images/qtcreator-edit-cmake-configuration-self-built-qt.webp b/doc/qtcreator/images/qtcreator-edit-cmake-configuration-self-built-qt.webp
new file mode 100644
index 00000000000..820461039e9
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-edit-cmake-configuration-self-built-qt.webp differ
diff --git a/doc/qtcreator/images/qtcreator-edit-environment.webp b/doc/qtcreator/images/qtcreator-edit-environment.webp
index f68eb52540e..55e04cc70c1 100644
Binary files a/doc/qtcreator/images/qtcreator-edit-environment.webp and b/doc/qtcreator/images/qtcreator-edit-environment.webp differ
diff --git a/doc/qtcreator/images/qtcreator-extension-mode.webp b/doc/qtcreator/images/qtcreator-extension-mode.webp
new file mode 100644
index 00000000000..8a880f3c444
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-extension-mode.webp differ
diff --git a/doc/qtcreator/images/qtcreator-heob-in-terminal.webp b/doc/qtcreator/images/qtcreator-heob-in-terminal.webp
new file mode 100644
index 00000000000..f36ac701442
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-heob-in-terminal.webp differ
diff --git a/doc/qtcreator/images/qtcreator-heob.png b/doc/qtcreator/images/qtcreator-heob.png
deleted file mode 100644
index c3b75ec8479..00000000000
Binary files a/doc/qtcreator/images/qtcreator-heob.png and /dev/null differ
diff --git a/doc/qtcreator/images/qtcreator-ios-preferences.png b/doc/qtcreator/images/qtcreator-ios-preferences.png
deleted file mode 100644
index 935a528d6cb..00000000000
Binary files a/doc/qtcreator/images/qtcreator-ios-preferences.png and /dev/null differ
diff --git a/doc/qtcreator/images/qtcreator-kit-selector-devices.webp b/doc/qtcreator/images/qtcreator-kit-selector-devices.webp
index 7cb2b74e82d..b3a7afa7a55 100644
Binary files a/doc/qtcreator/images/qtcreator-kit-selector-devices.webp and b/doc/qtcreator/images/qtcreator-kit-selector-devices.webp differ
diff --git a/doc/qtcreator/images/qtcreator-locator-customize.webp b/doc/qtcreator/images/qtcreator-locator-customize.webp
index 5a6d4e90d34..34b96a8d6fb 100644
Binary files a/doc/qtcreator/images/qtcreator-locator-customize.webp and b/doc/qtcreator/images/qtcreator-locator-customize.webp differ
diff --git a/doc/qtcreator/images/qtcreator-mode-selector.png b/doc/qtcreator/images/qtcreator-mode-selector.png
deleted file mode 100644
index e82047cf859..00000000000
Binary files a/doc/qtcreator/images/qtcreator-mode-selector.png and /dev/null differ
diff --git a/doc/qtcreator/images/qtcreator-mode-selector.webp b/doc/qtcreator/images/qtcreator-mode-selector.webp
new file mode 100644
index 00000000000..54075491e3a
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-mode-selector.webp differ
diff --git a/doc/qtcreator/images/qtcreator-model-editor-component-diagram.webp b/doc/qtcreator/images/qtcreator-model-editor-component-diagram.webp
index e28a94e0a2a..ecd5a013df1 100644
Binary files a/doc/qtcreator/images/qtcreator-model-editor-component-diagram.webp and b/doc/qtcreator/images/qtcreator-model-editor-component-diagram.webp differ
diff --git a/doc/qtcreator/images/qtcreator-modeleditor-classes.png b/doc/qtcreator/images/qtcreator-modeleditor-classes.png
deleted file mode 100644
index c5747416db2..00000000000
Binary files a/doc/qtcreator/images/qtcreator-modeleditor-classes.png and /dev/null differ
diff --git a/doc/qtcreator/images/qtcreator-modeleditor-classes.webp b/doc/qtcreator/images/qtcreator-modeleditor-classes.webp
new file mode 100644
index 00000000000..fcdec4f6452
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-modeleditor-classes.webp differ
diff --git a/doc/qtcreator/images/qtcreator-modeleditor-packages.png b/doc/qtcreator/images/qtcreator-modeleditor-packages.png
deleted file mode 100644
index 3884886e19f..00000000000
Binary files a/doc/qtcreator/images/qtcreator-modeleditor-packages.png and /dev/null differ
diff --git a/doc/qtcreator/images/qtcreator-modeleditor-packages.webp b/doc/qtcreator/images/qtcreator-modeleditor-packages.webp
new file mode 100644
index 00000000000..c9e676207ed
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-modeleditor-packages.webp differ
diff --git a/doc/qtcreator/images/qtcreator-modeleditor.png b/doc/qtcreator/images/qtcreator-modeleditor.png
deleted file mode 100644
index 9f46b26ac62..00000000000
Binary files a/doc/qtcreator/images/qtcreator-modeleditor.png and /dev/null differ
diff --git a/doc/qtcreator/images/qtcreator-modeleditor.webp b/doc/qtcreator/images/qtcreator-modeleditor.webp
new file mode 100644
index 00000000000..aeaccae16b6
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-modeleditor.webp differ
diff --git a/doc/qtcreator/images/qtcreator-move-class-to-separate-files.webp b/doc/qtcreator/images/qtcreator-move-class-to-separate-files.webp
new file mode 100644
index 00000000000..5a9540c25e9
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-move-class-to-separate-files.webp differ
diff --git a/doc/qtcreator/images/qtcreator-new-project-compiler-explorer.webp b/doc/qtcreator/images/qtcreator-new-project-compiler-explorer.webp
new file mode 100644
index 00000000000..3744f4100fa
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-new-project-compiler-explorer.webp differ
diff --git a/doc/qtcreator/images/qtcreator-options-android-main.png b/doc/qtcreator/images/qtcreator-options-android-main.png
deleted file mode 100644
index 5ecea57d998..00000000000
Binary files a/doc/qtcreator/images/qtcreator-options-android-main.png and /dev/null differ
diff --git a/doc/qtcreator/images/qtcreator-options-android-sdk-tools.png b/doc/qtcreator/images/qtcreator-options-android-sdk-tools.png
deleted file mode 100644
index f3057ce0bca..00000000000
Binary files a/doc/qtcreator/images/qtcreator-options-android-sdk-tools.png and /dev/null differ
diff --git a/doc/qtcreator/images/qtcreator-output-panes-taskbar.webp b/doc/qtcreator/images/qtcreator-output-panes-taskbar.webp
index 7801e26ff8f..a53aebdb02b 100644
Binary files a/doc/qtcreator/images/qtcreator-output-panes-taskbar.webp and b/doc/qtcreator/images/qtcreator-output-panes-taskbar.webp differ
diff --git a/doc/qtcreator/images/qtcreator-preferences-android.webp b/doc/qtcreator/images/qtcreator-preferences-android.webp
new file mode 100644
index 00000000000..3c6e909df2e
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-preferences-android.webp differ
diff --git a/doc/qtcreator/images/qtcreator-preferences-axivion.webp b/doc/qtcreator/images/qtcreator-preferences-axivion.webp
index a6b69dd1ff5..6d3ebc35ec4 100644
Binary files a/doc/qtcreator/images/qtcreator-preferences-axivion.webp and b/doc/qtcreator/images/qtcreator-preferences-axivion.webp differ
diff --git a/doc/qtcreator/images/qtcreator-preferences-build-run-general.webp b/doc/qtcreator/images/qtcreator-preferences-build-run-general.webp
index 4826e22fc62..6a0bf6f4811 100644
Binary files a/doc/qtcreator/images/qtcreator-preferences-build-run-general.webp and b/doc/qtcreator/images/qtcreator-preferences-build-run-general.webp differ
diff --git a/doc/qtcreator/images/qtcreator-preferences-clangd.webp b/doc/qtcreator/images/qtcreator-preferences-clangd.webp
index 6d363c02f93..26a205ae505 100644
Binary files a/doc/qtcreator/images/qtcreator-preferences-clangd.webp and b/doc/qtcreator/images/qtcreator-preferences-clangd.webp differ
diff --git a/doc/qtcreator/images/qtcreator-preferences-code-model.webp b/doc/qtcreator/images/qtcreator-preferences-code-model.webp
index 9cd9458fe57..2fa62d4fb6d 100644
Binary files a/doc/qtcreator/images/qtcreator-preferences-code-model.webp and b/doc/qtcreator/images/qtcreator-preferences-code-model.webp differ
diff --git a/doc/qtcreator/images/qtcreator-preferences-debugger-gdb.webp b/doc/qtcreator/images/qtcreator-preferences-debugger-gdb.webp
index 9ac81bce223..c3c4798c553 100644
Binary files a/doc/qtcreator/images/qtcreator-preferences-debugger-gdb.webp and b/doc/qtcreator/images/qtcreator-preferences-debugger-gdb.webp differ
diff --git a/doc/qtcreator/images/qtcreator-preferences-devices-remote-linux.webp b/doc/qtcreator/images/qtcreator-preferences-devices-remote-linux.webp
index 4b97b88b7a2..565d63ad6df 100644
Binary files a/doc/qtcreator/images/qtcreator-preferences-devices-remote-linux.webp and b/doc/qtcreator/images/qtcreator-preferences-devices-remote-linux.webp differ
diff --git a/doc/qtcreator/images/qtcreator-preferences-extensions.webp b/doc/qtcreator/images/qtcreator-preferences-extensions.webp
new file mode 100644
index 00000000000..ba94c46dca4
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-preferences-extensions.webp differ
diff --git a/doc/qtcreator/images/qtcreator-preferences-qnx.webp b/doc/qtcreator/images/qtcreator-preferences-qnx.webp
new file mode 100644
index 00000000000..435ce04034e
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-preferences-qnx.webp differ
diff --git a/doc/qtcreator/images/qtcreator-preferences-testing-general.webp b/doc/qtcreator/images/qtcreator-preferences-testing-general.webp
index 8fb41b64f7d..f82694ccc91 100644
Binary files a/doc/qtcreator/images/qtcreator-preferences-testing-general.webp and b/doc/qtcreator/images/qtcreator-preferences-testing-general.webp differ
diff --git a/doc/qtcreator/images/qtcreator-project-qt-quick.webp b/doc/qtcreator/images/qtcreator-project-qt-quick.webp
index ac329a5c430..f4587391bbe 100644
Binary files a/doc/qtcreator/images/qtcreator-project-qt-quick.webp and b/doc/qtcreator/images/qtcreator-project-qt-quick.webp differ
diff --git a/doc/qtcreator/images/qtcreator-project-settings-cmake.webp b/doc/qtcreator/images/qtcreator-project-settings-cmake.webp
new file mode 100644
index 00000000000..f37c521a866
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-project-settings-cmake.webp differ
diff --git a/doc/qtcreator/images/qtcreator-projects-cpp-code-model.webp b/doc/qtcreator/images/qtcreator-projects-cpp-code-model.webp
new file mode 100644
index 00000000000..259d8092f30
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-projects-cpp-code-model.webp differ
diff --git a/doc/qtcreator/images/qtcreator-projects-environment.webp b/doc/qtcreator/images/qtcreator-projects-environment.webp
index eeaed5eaa00..6b33d698522 100644
Binary files a/doc/qtcreator/images/qtcreator-projects-environment.webp and b/doc/qtcreator/images/qtcreator-projects-environment.webp differ
diff --git a/doc/qtcreator/images/qtcreator-projects-kits.webp b/doc/qtcreator/images/qtcreator-projects-kits.webp
index 827037b0223..38c542c9d14 100644
Binary files a/doc/qtcreator/images/qtcreator-projects-kits.webp and b/doc/qtcreator/images/qtcreator-projects-kits.webp differ
diff --git a/doc/qtcreator/images/qtcreator-projects-settings-clangd.webp b/doc/qtcreator/images/qtcreator-projects-settings-clangd.webp
index d49b9403e01..2590e9c4e9d 100644
Binary files a/doc/qtcreator/images/qtcreator-projects-settings-clangd.webp and b/doc/qtcreator/images/qtcreator-projects-settings-clangd.webp differ
diff --git a/doc/qtcreator/images/qtcreator-projects-settings-testing.webp b/doc/qtcreator/images/qtcreator-projects-settings-testing.webp
index 6f8fe53a22f..7af2455f68f 100644
Binary files a/doc/qtcreator/images/qtcreator-projects-settings-testing.webp and b/doc/qtcreator/images/qtcreator-projects-settings-testing.webp differ
diff --git a/doc/qtcreator/images/qtcreator-python-update-language-server.webp b/doc/qtcreator/images/qtcreator-python-update-language-server.webp
new file mode 100644
index 00000000000..99b9ad2b92e
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-python-update-language-server.webp differ
diff --git a/doc/qtcreator/images/qtcreator-qml-js-editing.webp b/doc/qtcreator/images/qtcreator-qml-js-editing.webp
index c0b56264dd1..f9475414f54 100644
Binary files a/doc/qtcreator/images/qtcreator-qml-js-editing.webp and b/doc/qtcreator/images/qtcreator-qml-js-editing.webp differ
diff --git a/doc/qtcreator/images/qtcreator-qml-profiler-toolbar.webp b/doc/qtcreator/images/qtcreator-qml-profiler-toolbar.webp
new file mode 100644
index 00000000000..b0b7ba4d7cc
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-qml-profiler-toolbar.webp differ
diff --git a/doc/qtcreator/images/qtcreator-run-environment.webp b/doc/qtcreator/images/qtcreator-run-environment.webp
index 3a0313f994d..7bdd69ebab8 100644
Binary files a/doc/qtcreator/images/qtcreator-run-environment.webp and b/doc/qtcreator/images/qtcreator-run-environment.webp differ
diff --git a/doc/qtcreator/images/qtcreator-valgrind-memcheck.png b/doc/qtcreator/images/qtcreator-valgrind-memcheck.png
deleted file mode 100644
index 8131846ef53..00000000000
Binary files a/doc/qtcreator/images/qtcreator-valgrind-memcheck.png and /dev/null differ
diff --git a/doc/qtcreator/images/qtcreator-valgrind-memcheck.webp b/doc/qtcreator/images/qtcreator-valgrind-memcheck.webp
new file mode 100644
index 00000000000..c60fdbb72d4
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-valgrind-memcheck.webp differ
diff --git a/doc/qtcreator/images/qtcreator-welcome.webp b/doc/qtcreator/images/qtcreator-welcome.webp
new file mode 100644
index 00000000000..a9fe3a047d3
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-welcome.webp differ
diff --git a/doc/qtcreator/images/qtcreator-without-menubar.webp b/doc/qtcreator/images/qtcreator-without-menubar.webp
index 0201ea89321..1bad87a9d09 100644
Binary files a/doc/qtcreator/images/qtcreator-without-menubar.webp and b/doc/qtcreator/images/qtcreator-without-menubar.webp differ
diff --git a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
index 1341ee95a1c..d267eaf8f60 100644
--- a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
+++ b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 // **********************************************************************
@@ -8,136 +8,151 @@
 // **********************************************************************
 
 /*!
-    \previouspage creator-heob.html
-    \page creator-cpu-usage-analyzer.html
-    \nextpage creator-cppcheck.html
+    \page creator-how-to-analyze-cpu-usage.html
+    \previouspage creator-how-tos.html
 
-    \title Analyzing CPU Usage
+    \ingroup creator-how-to-analyze
 
-    \QC is integrated with the Linux Perf tool that can be
-    used to analyze the CPU and memory usage of an application on embedded
-    devices and, to a limited extent, on Linux desktop platforms. The
-    Performance Analyzer uses the Perf tool bundled with the Linux kernel to
-    take periodic snapshots of the call chain of an application and visualizes
-    them in a timeline view or as a flame graph.
+    \title Analyze CPU usage
 
-    \section1 Using the Performance Analyzer
+    With Perf, you can analyze the CPU and memory usage of an application
+    on Linux desktop and embedded devices. \l{Performance Analyzer} uses the
+    Perf tool bundled with the Linux kernel to take periodic snapshots of
+    the call chain of an application and visualizes them in a timeline view
+    or as a flame graph.
 
-    The Performance Analyzer usually needs to be able to locate debug symbols for
-    the binaries involved.
+    Usually, Performance Analyzer needs debug symbols for the profiled
+    binaries. Profile builds produce optimized binaries with separate debug
+    symbols, so use them for profiling.
 
-    Profile builds produce optimized binaries with separate debug symbols and
-    should generally be used for profiling.
+    \section1 Collect data
 
-    To manually set up a build configuration that generates separate debug
-    symbols, edit the project build settings:
-
-    \list 1
-        \li To generate debug symbols also for applications compiled in release
-            mode, select \uicontrol {Projects}, and then select
-            \uicontrol Enable in the \uicontrol {Separate debug info} field.
-
-        \li Select \uicontrol Yes to recompile the project.
-
-    \endlist
-
-    You can start the Performance Analyzer in the following ways:
+    Start Performance Analyzer in the following ways to collect data:
 
     \list
-        \li Select \uicontrol Analyze > \uicontrol {Performance Analyzer} to
+        \li Go to \uicontrol Analyze > \uicontrol {Performance Analyzer} to
             profile the current application.
 
-        \li Select the
-            \inlineimage icons/qtcreator-analyze-start-button.png
-            (\uicontrol Start) button to start the application from the
+        \li Select \inlineimage icons/qtcreator-analyze-start-button.png
+            (\uicontrol Start) to start the application from the
             \uicontrol {Performance Analyzer}.
 
             \image qtcreator-performance-analyzer-toolbar.png {Performance Analyzer toolbar}
 
     \endlist
 
-    \note If data collection does not start automatically, select the
+    \note If data collection does not start automatically, select
     \inlineimage icons/recordfill.png
-    (\uicontrol {Collect profile data}) button.
+    (\uicontrol {Collect profile data}).
 
     When you start analyzing an application, the application is launched, and
-    the Performance Analyzer immediately begins to collect data. This is indicated
-    by the time running in the \uicontrol Recorded field. However, as the data
+    Performance Analyzer immediately begins to collect data. This is indicated
+    by the time running in \uicontrol Recorded. However, as the data
     is passed through the Perf tool and an extra helper program bundled with
     \QC, and both buffer and process it on the fly, data may arrive in \QC
-    several seconds after it was generated. An estimate for this delay is given
-    in the \uicontrol {Processing delay} field.
+    several seconds after it was generated. \uicontrol {Processing delay} shows
+    an estimate of the delay.
 
-    Data is collected until you select the
-    \uicontrol {Stop collecting profile data} button or terminate the
-    application.
+    Data is collected until you select \inlineimage icons/recordfill.png
+    (\uicontrol {Stop collecting profile data}) or close the application.
 
-    Select the \uicontrol {Stop collecting profile data} button to disable the
+    Select \uicontrol {Stop collecting profile data} to turn off the
     automatic start of the data collection when an application is launched.
-    Profile data will still be generated, but \QC will discard it until you
+    Profile data is still generated, but \QC discards it until you
     select the button again.
 
-    \section1 Profiling Memory Usage on Devices
+    \section1 Profile memory usage on devices
 
-    To create trace points for profiling memory usage on a target device, select
-    \uicontrol Analyze > \uicontrol {Performance Analyzer Options} >
-    \uicontrol {Create Memory Trace Points} or select
-    \inlineimage icons/create-tracepoint.png
-    on the \uicontrol {Performance Analyzer} toolbar.
+    To create trace points for profiling memory usage on a target device:
 
-    In the \uicontrol {Create Memory Trace Points} dialog, you can modify the
+    \list
+        \li Go to \uicontrol Analyze > \uicontrol {Performance Analyzer Options}
+            > \uicontrol {Create Memory Trace Points}.
+        \li Select \inlineimage icons/create-tracepoint.png
+            on the \uicontrol {Performance Analyzer} toolbar.
+    \endlist
+
+    In the \uicontrol {Create Memory Trace Points} dialog, modify the
     script to run.
 
-    \image qtcreator-performance-analyzer-create-memory-trace-points.png "Create Memory Trace Points dialog"
+    \image qtcreator-performance-analyzer-create-memory-trace-points.png {Create Memory Trace Points dialog}
 
     If you need root privileges to run scripts as root, select the privileges to
-    use in the \uicontrol {Elevate privileges using} field.
+    use in \uicontrol {Elevate privileges using}.
 
     Select \uicontrol OK to run the script.
 
     To add events for the trace points, see \l{Choosing Event Types}.
 
-    You can record a memory trace to view usage graphs in the samples rows of
+    Record a memory trace to view usage graphs in the samples rows of
     the timeline and to view memory allocations, peaks, and releases in the
     flame graph.
 
-    \section1 Specifying Performance Analyzer Settings
+    \section1 Generate separate debug info for qmake projects
 
-    To specify global settings for the Performance Analyzer, select
-    \preferences > \uicontrol Analyzer >
-    \uicontrol {CPU Usage}. For each run configuration, you can also
-    use specialized settings. Select \uicontrol Projects > \uicontrol Run, and
-    then select \uicontrol Details next to
-    \uicontrol {Performance Analyzer Settings}.
+    To manually set up a build configuration that generates debug symbols also
+    for applications compiled for release, edit the build settings of a qmake
+    project:
 
-    \image qtcreator-performance-analyzer-settings.png
+    \list 1
+        \li Go to \uicontrol {Projects} > \uicontrol {Build Settings}.
+        \li In \uicontrol {Separate debug info}, select \uicontrol Enable.
+        \li Select \uicontrol Yes to recompile the project.
+    \endlist
 
-    To edit the settings for the current run configuration, you can also select
-    the dropdown menu next to the \uicontrol {Collect profile data} button.
+    \sa {Analyze}{How To: Analyze}, {Analyzers}, {Performance Analyzer},
+    {Analyzing Code}
+*/
 
-    \section2 Choosing Event Types
+/*!
+    \page creator-cpu-usage-analyzer.html
+    \previouspage creator-reference.html
 
-    In the \uicontrol Events table, you can specify which events should trigger
-    the Performance Analyzer to take a sample. The most common way of analyzing
+    \ingroup creator-reference-analyzer
+
+    \title Performance Analyzer
+
+    \brief Analyze the CPU and memory usage of an application on Linux desktop
+    and embedded devices.
+
+    To set global preferences for Performance Analyzer, go to \preferences >
+    \uicontrol Analyzer > \uicontrol {CPU Usage}.
+
+    To set preferences for a particular run configuration, go to
+    \uicontrol Projects > \uicontrol Run, and then select \uicontrol Details
+    next to \uicontrol {Performance Analyzer Settings}.
+
+    \image qtcreator-performance-analyzer-settings.png {Performance Analyzer Settings}
+
+    To edit the settings for the current run configuration, select the
+    drop down menu next to \inlineimage icons/recordfill.png on the
+    Performance Analyzer toolbar.
+
+    \image qtcreator-performance-analyzer-toolbar.png {Performance Analyzer toolbar}
+
+    \section1 Choosing Event Types
+
+    The events table lists the events that trigger Performance Analyzer to take
+    a sample. The most common way of analyzing
     CPU usage involves periodic sampling, driven by hardware performance
     counters that react to the number of instructions or CPU cycles executed.
-    Alternatively, a software counter that uses the CPU clock can be chosen.
+    You can also select a software counter that uses the CPU clock.
 
     Select \uicontrol {Add Event} to add events to the table.
-    In the \uicontrol {Event Type} column, you can choose the general type of
+    In \uicontrol {Event Type}, select the general type of
     event to be sampled, most commonly \uicontrol {hardware} or
-    \uicontrol {software}. In the \uicontrol {Counter} column, you can choose
-    which specific counter should be used for the sampling. For example,
+    \uicontrol {software}. In \uicontrol {Counter}, select the counter
+    for the sampling. For example,
     \uicontrol {instructions} in the \uicontrol {hardware} group or
     \uicontrol {cpu-clock} in the \uicontrol {software} group.
 
     More specialized sampling, for example by cache misses or cache hits, is
-    possible. However, support for it depends on specific features of the CPU
-    involved. For those specialized events, you can give more detailed sampling
-    instructions in the \uicontrol {Operation} and \uicontrol {Result} columns.
-    For example, you can choose a \uicontrol {cache} event for
+    possible. However, support for it depends on specific features of the CPU.
+    For those specialized events, give more detailed sampling
+    instructions in \uicontrol {Operation} and \uicontrol {Result}.
+    For example, select a \uicontrol {cache} event for
     \uicontrol {L1-dcache} on the \uicontrol {load} operation with a result
-    of \uicontrol {misses}. That would sample L1-dcache misses on reading.
+    of \uicontrol {misses} to sample L1-dcache misses on reading.
 
     Select \uicontrol {Remove Event} to remove the selected event from the
     table.
@@ -145,29 +160,28 @@
     Select \uicontrol {Use Trace Points} to replace the current selection of
     events with trace points defined on the target device and set the
     \uicontrol {Sample mode} to \uicontrol {event count} and the
-    \uicontrol {Sample period} to \c {1}. If the trace points on the target
-    were defined using the \uicontrol {Create Trace Points} option, the
-    Performance Analyzer will automatically use them to profile memory usage.
+    \uicontrol {Sample period} to \c {1}. If \uicontrol {Create Trace Points}
+    defines the trace points on the target, Performance Analyzer automatically
+    uses them to profile memory usage.
 
-    Select \uicontrol {Reset} to revert the selection of events, as well as the
+    Select \uicontrol {Reset} to revert the selection of events, as well as
     \uicontrol {Sample mode} and \uicontrol {Sample period} to the default
     values.
 
-    \section2 Choosing a Sampling Mode and Period
+    \section1 Choosing a Sampling Mode and Period
 
-    In the \uicontrol {Sample mode} and \uicontrol {Sample period} fields, you
-    can specify how samples are triggered:
+    In \uicontrol {Sample mode} and \uicontrol {Sample period}, specify how
+    samples are triggered:
 
     \list
 
         \li Sampling by \uicontrol {event count} instructs the kernel to take
             a sample every \c n times one of the chosen events has occurred,
-            where \c n is specified in the \uicontrol {Sample period} field.
+            where \c n is set in \uicontrol {Sample period}.
 
         \li Sampling by \uicontrol {frequency (Hz)} instructs the kernel to try and
             take a sample \c n times per second, by automatically adjusting the
-            sampling period. Specify \c n in the \uicontrol {Sample period}
-            field.
+            sampling period. Set \c n in \uicontrol {Sample period}.
 
     \endlist
 
@@ -178,15 +192,15 @@
     There may be a significant difference between the sampling period you
     request and the actual result.
 
-    In general, if you configure the Performance Analyzer to collect more data
+    In general, if you configure Performance Analyzer to collect more data
     than it can transmit over the connection between the target and the host
     device, the application may get blocked while Perf is trying to send the
     data, and the processing delay may grow excessively. You should then change
-    the \uicontrol {Sample period} or the \uicontrol {Stack snapshot size}.
+    the value of \uicontrol {Sample period} or \uicontrol {Stack snapshot size}.
 
-    \section2 Selecting Call Graph Mode
+    \section1 Selecting Call Graph Mode
 
-    In the \uicontrol {Call graph mode} field, you can specify how the
+    In \uicontrol {Call graph mode}, you can specify how
     Performance Analyzer recovers call chains from your application:
 
     \list
@@ -210,32 +224,32 @@
     Qt and most system libraries are compiled without frame pointers by
     default, so the frame pointer mode is only useful with customized systems.
 
-    \section2 Setting Stack Snapshot Size
+    \section1 Setting Stack Snapshot Size
 
-    The Performance Analyzer will analyze and \e unwind the stack snapshots
-    generated by Perf in dwarf mode. Set the size of the stack snapshots in the
-    \uicontrol {Stack snapshot size} field. Large stack snapshots result in a
+    Performance Analyzer analyzes and \e unwinds the stack snapshots
+    generated by Perf in dwarf mode. Set the size of the stack snapshots in
+    \uicontrol {Stack snapshot size}. Large stack snapshots result in a
     larger volume of data to be transferred and processed. Small stack
     snapshots may fail to capture call chains of highly recursive applications
     or other intense stack usage.
 
-    \section2 Adding Command-Line Options for Perf
+    \section1 Adding Command-Line Options for Perf
 
-    You can specify additional command-line options to be passed to Perf when
-    recording data in the \uicontrol {Additional arguments} field. You may want
-    to specify \c{--no-delay} or \c{--no-buffering} to reduce the processing
+    Set additional command-line options to pass to Perf when
+    recording data in \uicontrol {Additional arguments}. Set \c{--no-delay}
+    or \c{--no-buffering} to reduce the processing
     delay. However, those options are not supported by all versions of Perf and
     Perf may not start if an unsupported option is given.
 
-    \section2 Resolving Names for JIT-compiled JavaScript Functions
+    \section1 Resolving Names for JIT-compiled JavaScript Functions
 
     Since version 5.6.0, Qt can generate perf.map files with information about
-    JavaScript functions. The Performance Analyzer will read them and show the
+    JavaScript functions. Performance Analyzer will read them and show the
     function names in the \uicontrol Timeline, \uicontrol Statistics, and
     \uicontrol {Flame Graph} views. This only works if the process being
     profiled is running on the host computer, not on the target device. To
     switch on the generation of perf.map files, add the environment variable
-    \c QV4_PROFILE_WRITE_PERF_MAP to the \uicontrol {Run Environment} and set
+    \c QV4_PROFILE_WRITE_PERF_MAP to \uicontrol {Run Environment} and set
     its value to \c 1.
 
     \section1 Analyzing Collected Data
@@ -243,36 +257,35 @@
     The \uicontrol Timeline view displays a graphical representation of CPU
     usage per thread and a condensed view of all recorded events.
 
-    \image qtcreator-performance-analyzer-timeline.png "Performance Analyzer"
+    \image qtcreator-performance-analyzer-timeline.png {Performance Analyzer}
 
     Each category in the timeline describes a thread in the application. Move
     the cursor on an event (5) on a row to see how long it takes and which
     function in the source it represents. To display the information only when
-    an event is selected, disable the
-    \uicontrol {View Event Information on Mouseover} button (4).
+    an event is selected, turn off
+     \uicontrol {View Event Information on Mouseover} (4).
 
     The outline (9) summarizes the period for which data was collected. Drag
     the zoom range (7) or click the outline to move on the outline. You can
-    also move between events by selecting the
-    \uicontrol {Jump to Previous Event} and \uicontrol {Jump to Next Event}
-    buttons (1).
+    also move between events by selecting \uicontrol {Jump to Previous Event}
+    and \uicontrol {Jump to Next Event} (1).
 
-    Select the \uicontrol {Show Zoom Slider} button (2) to open a slider that
-    you can use to set the zoom level. You can also drag the zoom handles (8).
+    Select \uicontrol {Show Zoom Slider} button (2) to open a slider that
+    sets the zoom level. You can also drag the zoom handles (8).
     To reset the default zoom level, right-click the timeline to open the
     context menu, and select \uicontrol {Reset Zoom}.
 
     \section2 Selecting Event Ranges
 
-    You can select an event range (6) to view the time it represents or to zoom
-    into a specific region of the trace. Select the \uicontrol {Select Range}
-    button (3) to activate the selection tool. Then click in the timeline to
+    Select an event range (6) to view the time it represents or to zoom
+    into a specific region of the trace. Select \uicontrol {Select Range}
+    (3) to activate the selection tool. Then click in the timeline to
     specify the beginning of the event range. Drag the selection handle to
     define the end of the range.
 
-    You can use event ranges also to measure delays between two subsequent
+    Use event ranges also to measure delays between two subsequent
     events. Place a range between the end of the first event and the beginning
-    of the second event. The \uicontrol Duration field displays the delay
+    of the second event. \uicontrol Duration shows the delay
     between the events in milliseconds.
 
     To zoom into an event range, double-click it.
@@ -294,10 +307,10 @@
     events to move the cursor in the code editor to the part of the code the
     event is associated with.
 
-    As the Perf tool only collects periodic samples, the Performance Analyzer
+    As the Perf tool only collects periodic samples, Performance Analyzer
     cannot determine the exact time when a function was called or when it
     returned. You can, however, see exactly when a sample was taken in the
-    second row of each thread. The Performance Analyzer assumes that if the same
+    second row of each thread. Performance Analyzer assumes that if the same
     function is present at the same place in the call chain in multiple
     consecutive samples, then this represents a single call to the respective
     function. This is, of course, a simplification. Also, there may be other
@@ -369,7 +382,7 @@
     taken for a certain function, relative to the same aspect of all samples
     together. The nesting shows which functions were called by which other ones.
 
-    The \uicontrol {Visualize} button lets you choose what aspect to show in the
+    The \uicontrol {Visualize} button lets you select what aspect to show in the
     \uicontrol {Flame Graph}.
 
     \list
@@ -396,7 +409,7 @@
     \uicontrol {Releases} modes will only show any data if samples from memory
     trace points have been recorded.
 
-    \section2 Interaction between the views
+    \section2 Interaction between the Views
 
     When you select a stack frame in either of the \uicontrol {Timeline},
     \uicontrol {Flame Graph}, or \uicontrol {Statistics} views, information
@@ -415,7 +428,7 @@
 
     \image qtcreator-cpu-usage-analyzer-load-perf-trace.png
 
-    The Performance Analyzer needs to know the context in which the
+    Performance Analyzer needs to know the context in which the
     data was recorded to find the debug symbols. Therefore, you have to specify
     the kit that the application was built with and the folder where the
     application executable is located.
@@ -423,11 +436,11 @@
     The Perf data files are generated by calling \c {perf record}. Make sure to
     generate call graphs when recording data by starting Perf with the
     \c {--call-graph} option. Also check that the necessary debug symbols are
-    available to the Performance Analyzer, either at a standard location
+    available to Performance Analyzer, either at a standard location
     (\c /usr/lib/debug or next to the binaries), or as part of the Qt package
     you are using.
 
-    The Performance Analyzer can read Perf data files generated in either frame
+    Performance Analyzer can read Perf data files generated in either frame
     pointer or dwarf mode. However, to generate the files correctly, numerous
     preconditions have to be met. All system images for the
     \l{Support Levels for Target Hardware}{supported embedded platforms}
@@ -443,15 +456,16 @@
     \uicontrol {Performance Analyzer Options}. This format is self-contained, and
     therefore loading it does not require you to specify the recording
     environment. You can transfer such trace files to a different computer
-    without any tool chain or debug symbols and analyze them there.
+    without any toolchain or debug symbols and analyze them there.
 
     \section1 Troubleshooting
 
-    The Performance Analyzer might fail to record data for the following reasons:
+    Performance Analyzer might fail to record data for the following reasons:
 
     \list
         \li Perf events may be globally disabled on your system.
-            The preconfigured \l Boot2Qt images come with perf events enabled.
+            The preconfigured \l{\B2Q: Documentation}{\B2Q} images come with Perf
+            events enabled.
             For a custom configuration you need to make sure that the file
             \c {/proc/sys/kernel/perf_event_paranoid} contains a value smaller
             than \c {2}. For maximum flexibility in recording traces you can
@@ -471,16 +485,16 @@
             the values of the \uicontrol {Stack snapshot size} or
             \uicontrol {Sample period} settings.
         \li Perf may be buffering the data forever, never sending it. Add
-            \c {--no-delay} or \c {--no-buffering} to the
-            \uicontrol {Additional arguments} field.
+            \c {--no-delay} or \c {--no-buffering} to
+            \uicontrol {Additional arguments}.
         \li Some versions of Perf will not start recording unless given a
-            certain minimum sampling frequency. Try with a
-            \uicontrol {Sample period} value of 1000.
+            certain minimum sampling frequency. Try setting
+            \uicontrol {Sample period} to 1000.
         \li On some devices, in particular various i.MX6 Boards, the hardware
             performance counters are dysfunctional and the Linux kernel may
             randomly fail to record data after some time. Perf can use different
             types of events to trigger samples. You can get a list of available
-            event types by running \c {perf list} on the device and then choose
+            event types by running \c {perf list} on the device and then select
             the respective event types in the settings. The choice of event type
             affects the performance and stability of the sampling. The
             \c {cpu-clock} \c {software} event is a safe but relatively slow
@@ -489,8 +503,7 @@
             reboot the device. The kernel may have disabled important parts of
             the performance counters system.
         \li Perf might not be installed. The way to install it depends on your
-            Linux distribution. For example, you might try the following
-            commands:
+            Linux distribution. For example, try the following commands:
 
             \list
                 \li On Ubuntu 22.04:
@@ -506,5 +519,5 @@
     The \l {Application Output} view shows some information even if the
     Performance Analyzer displays error messages.
 
-    \sa {Profiling Function Execution}
+    \sa {Analyze}{How To: Analyze}, {Analyzers}, {Analyzing Code}, {Kits}
 */
diff --git a/doc/qtcreator/src/analyze/creator-analyze.qdoc b/doc/qtcreator/src/analyze/creator-analyze.qdoc
index f57d97b8c02..982d4219923 100644
--- a/doc/qtcreator/src/analyze/creator-analyze.qdoc
+++ b/doc/qtcreator/src/analyze/creator-analyze.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 // **********************************************************************
@@ -17,70 +17,139 @@
     To use a code analysis tool, select it in the \uicontrol {Analyze Menu} or
     in the pull-down menu of the \inlineimage icons/qtcreator-debug-button.png
     (\uicontrol {Start Debugging of Startup Project}) button.
-    When you are in the \uicontrol Debug mode, you can switch between tools by
-    selecting them in the menu on the debugger toolbar.
+    In the \uicontrol Debug mode, switch between tools by selecting them in the
+    menu on the debugger toolbar.
 
-    You can drag and drop the views in the \uicontrol Debug mode to new
+    \image qtcreator-performance-analyzer-toolbar.png {Performance Analyzer in Debug mode}
+
+    Drag the views in the \uicontrol Debug mode to new
     positions on the screen. The size and position of views are saved for future
     sessions. Select \uicontrol View > \uicontrol Views >
     \uicontrol {Reset to Default Layout} to reset the views to their original
     sizes and positions.
 
-    You can use the following code analysis tools in the \uicontrol Debug
-    mode:
+    \section1 Improving QML Performance
+
+    \QC comes with the \l{Profiling QML Applications}{QML Profiler} for
+    inspecting binding evaluations and signal handling when running QML code.
+    This is useful for identifying potential bottlenecks, especially in the
+    evaluation of bindings.
+
+    \section1 Finding Issues in QML Code
+
+    Run \l{JavaScript and QML Checks}{static checks} on the QML and JavaScript
+    code in your project to find common problems, similarly to using
+    \l{http://www.jslint.com}{JSLint}.
+
+    \section1 Finding Issues in C++ Code with Clang Tools
+
+    \QC comes with the following Clang tools for finding problems in C, C++, and
+    Objective-C source code by using static analysis:
 
     \list
-
-        \li \l{Profiling QML Applications}{QML Profiler}
-
-            Inspect binding evaluations, signal handling, and
-            painting operations when running QML code. This is useful for
-            identifying potential bottlenecks, especially in the evaluation
-            of bindings.
-
-        \li \l{Checking Code Coverage}{Coco}
-
-            Analyze the way an application runs as part of a test suite, for
-            example, and use the results to make the tests more efficient and
-            complete.
-
-        \li \l{Prevent code erosion}{Axivion}
-
-            Do static code analysis and architecture analysis to detect and
-            eliminate unnecessary complexity of code.
-
-        \li \l{Using Valgrind Code Analysis Tools}{Valgrind Code Analysis Tools}
-
-            Detect problems in memory management by using the Memcheck
-            tool and find cache misses in the code by using the Callgrind tool.
-
-        \li \l{Clang Tools}
-
-            Detect problems in C, C++, and Objective-C programs by
-            using Clang-Tidy and Clazy.
-
-        \li \l{Detecting Memory Leaks with Heob}{Heob}
-
-            Use the Heob heap observer on Windows to detect buffer
-            overruns and memory leaks.
-
-        \li \l{Analyzing CPU Usage}{Performance Analyzer}
-
-            Analyze the CPU usage of embedded applications and Linux
-            desktop applications with the Performance Analyzer that integrates
-            the Linux Perf tool.
-
-        \li \l{Analyzing Code with Cppcheck}{Cppcheck}
-
-            Use the experimental Cppcheck plugin to detect undefined
-            behavior and dangerous coding constructs.
-
-        \li \l{Visualizing Chrome Trace Events}{Chrome Trace Format Visualizer}
-
-            Use the Chrome Trace Format (CTF) Visualizer to view
-            Chrome trace events. This is especially useful when viewing
-            large trace files that are difficult to visualize using the
-            built-in trace-viewer (\c{chrome://tracing}).
+        \li \l{https://clang.llvm.org/extra/clang-tidy/}{Clang-Tidy}, which
+            has diagnostics and fixes for typical programming errors,
+            such as style violations or interface misuse.
+        \li \l{https://github.com/KDE/clazy/blob/master/README.md}{Clazy}, which
+            helps Clang understand Qt semantics. It displays Qt-related compiler
+            warnings, ranging from unnecessary memory allocation to misuse of
+            API and has refactoring actions for fixing some of the issues.
     \endlist
 
+    \section1 Finding Issues in C++ Code with Cppcheck
+
+    Install the \l{http://cppcheck.sourceforge.net/}{Cppcheck} static analysis
+    tool to detect undefined behavior and dangerous coding constructs in
+    C++ code. Cppcheck analyzes the source code without actually running the
+    application.
+
+    \section1 Checking Code Coverage
+
+    Install the \l{https://doc.qt.io/coco/}{Coco} code coverage toolchain for
+    Tcl, QML, C# and C/C++ programs on \macOS, Linux, or Windows to analyze the
+    way an application runs as part of a test suite, for example. Use the
+    results to make the tests more efficient and complete.
+
+    You can:
+
+    \list
+        \li Find untested code sections.
+        \li Find redundant tests which can then be eliminated. Coco can
+            identify portions of the source code that are covered by a test. It
+            can detect whether a new test covers lines in the source code that
+            the existing tests do not cover.
+        \li Find dead code by displaying code that is never executed.
+        \li Calculate the optimum test execution order so as to maximize
+            test coverage for each run. This is particularly useful for manual
+            testing.
+        \li Analyze two separate versions of an application and compare the
+            differences. This makes it possible to see which tests are affected
+            by source code modifications and also to get some measure of the
+            test coverage of a patch or hot fix.
+        \li Measure the execution time of applications and tests.
+    \endlist
+
+    \section1 Preventing Code Erosion
+
+    Install \l{https://www.axivion.com/en/products/axivion-suite/}{Axivion Suite}
+    to protect software from erosion. With static code analysis,
+    architecture analysis, and code-smells-detection, you can:
+
+    \list
+        \li Check the source code for potential runtime errors.
+        \li Use metrics to generate quantitative information about the
+            internal quality of the source code.
+        \li Run style checks to achieve compliance with coding guidelines.
+        \li Detect both duplicates and similar pieces of code in the source code.
+        \li Recognize cyclical dependencies at different levels.
+        \li Detect unreachable code.
+    \endlist
+
+    \section1 Profiling with Valgrind Tools
+
+    Install Memcheck and Callgrind from \l{Valgrind's Tool Suite} to detect
+    memory leaks and profile function execution.
+
+    You can run the Valgrind tools either \e locally on the development host or
+    \e remotely on another host. You can use them to analyze both applications
+    for which you set up a project in \QC and applications for which you do not
+    have a project.
+
+    Valgrind tools are supported locally only on Linux and \macos. However,
+    according to Valgrind.org, support on \macos 10.8 and 10.9 is experimental and
+    mostly broken. You can run the tools on a remote Linux machine or device
+    from any development host.
+
+    To run the Valgrind tools to analyze an application for which you have a
+    project, open the project in \QC and select the kit to run the project. The
+    kit specifies whether the Valgrind tools are run locally or remotely.
+
+    For more information about analyzing applications for which you do not have
+    a project, see \l{Run Valgrind tools on external applications}.
+
+    To set preferences for the Valgrind tools, select \preferences >
+    \uicontrol Analyzer. You can override the general
+    settings for each project in the \uicontrol {Run Settings} for the project.
+
+    \section1 Detecting Memory Leaks with Heob
+
+    On Windows, install the \l{https://github.com/ssbssa/heob}{Heob}
+    heap observer to detect buffer overruns and memory leaks.
+
+    \section1 Analyzing CPU Usage
+
+    On Linux, use Perf to analyze the CPU and memory usage of an application
+    on Linux desktop and embedded devices.
+
+    \l{Performance Analyzer} uses the Perf tool bundled with the Linux kernel to
+    take periodic snapshots of the call chain of an application and visualizes
+    them in a timeline view or as a flame graph.
+
+    \section1 Visualizing Chrome Trace Events
+
+    Use the \l{Chrome Trace Format Visualizer} to view Chrome trace events. This
+    is especially useful when viewing large trace files that are difficult to
+    visualize using the built-in trace-viewer (\c{chrome://tracing}).
+
+    \sa {Activate kits for a project}, {Analyze}{How To: Analyze}, {Analyzers}
 */
diff --git a/doc/qtcreator/src/analyze/creator-axivion.qdoc b/doc/qtcreator/src/analyze/creator-axivion.qdoc
index ddfbcdf288f..53735a9c31a 100644
--- a/doc/qtcreator/src/analyze/creator-axivion.qdoc
+++ b/doc/qtcreator/src/analyze/creator-axivion.qdoc
@@ -9,20 +9,6 @@
 
     \title Prevent code erosion
 
-    \l{https://www.axivion.com/en/products/axivion-suite/}{Axivion Suite} is
-    a tool suite for protecting software from erosion. With static code analysis,
-    architecture analysis, and code-smells-detection, you can:
-
-    \list
-        \li Check the source code for potential runtime errors.
-        \li Use metrics to generate quantitative information about the
-            internal quality of the source code.
-        \li Run style checks to achieve compliance with coding guidelines.
-        \li Detect both duplicates and similar pieces of code in the source code.
-        \li Recognize cyclical dependencies at different levels.
-        \li Detect unreachable code.
-    \endlist
-
     Connect to an Axivion dashboard server from \QC to view results of code
     analysis.
 
@@ -132,8 +118,9 @@
     select the link in the details or in the \uicontrol {Right Path}
     or \uicontrol {Target Path} column.
 
-    \sa {Enable and disable plugins}, {Link projects to Axivion dashboards},
-    {Axivion}
+    \sa {Enable and disable plugins}, {Analyze}{How To: Analyze},
+    {Link projects to Axivion dashboards}, {Analyzers}, {Axivion},
+    {Analyzing Code}
 */
 
 /*!
@@ -153,12 +140,18 @@
 
     To connect to an Axivion dashboard server:
 
-    \list 1
-        \li Select \uicontrol Edit to create a connection to the Axivion
+    \list
+        \li Select \uicontrol Add to add a new connection to an Axivion
             dashboard server.
+        \li Select \uicontrol Edit to modify an existing connection to
+            an Axivion dashboard server.
             \image qtcreator-edit-dashboard-configuration.webp {Edit Dashboard Configuration dialog}
-        \li In \uicontrol {Dashboard URL}, enter the URL of the server.
-        \li In \uicontrol Username, enter the username to access the server.
+            \list
+                \li In \uicontrol {Dashboard URL}, enter the URL of the server.
+                \li In \uicontrol Username, enter the username to access the server.
+            \endlist
+        \li Select \uicontrol Remove to remove the current selected connection
+            to an Axivion dashboard server.
     \endlist
 
     The first time you access the server, you must enter the password that
@@ -186,6 +179,8 @@
         \li Go to \uicontrol Projects > \uicontrol {Project Settings} >
             \uicontrol Axivion.
             \image qtcreator-preferences-axivion-project.webp {Axivion settings in Project Settings}
+        \li From \uicontrol {Dashboard} select one of the configured Axivion
+            dashboard configurations.
         \li Select \uicontrol {Fetch Projects} to list projects from Axivion.
         \li Select a project, and then select \uicontrol {Link Project} to link
             to it.
diff --git a/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc b/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc
index c85fd7356de..061feff3c56 100644
--- a/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc
+++ b/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc
@@ -15,22 +15,6 @@
 
     \title Analyze code with Clang-Tidy and Clazy
 
-    \QC comes with the following Clang tools for finding problems in C, C++, and
-    Objective-C source code by using static analysis:
-
-    \list
-
-        \li \l{https://clang.llvm.org/extra/clang-tidy/}{Clang-Tidy}, which
-            has diagnostics and fixes for typical programming errors,
-            such as style violations or interface misuse.
-
-        \li \l{https://github.com/KDE/clazy/blob/master/README.md}{Clazy}, which
-            helps Clang understand Qt semantics. It displays Qt related compiler
-            warnings, ranging from unnecessary memory allocation to misuse of
-            API and has refactoring actions for fixing some of the issues.
-
-    \endlist
-
     \note The Clang static analyzer checks are a part of Clang-Tidy. To use
     the checks, you must create a custom configuration for the Clang tools and
     enable them for Clang-Tidy.
@@ -93,6 +77,37 @@
     Select the \inlineimage icons/settings.png
     button to customize diagnostics for the current project.
 
+    \section2 Filter dianostics
+
+    To filter diagnostics:
+
+    \list 1
+        \li Select \inlineimage icons/filtericon.png to open the
+            \uicontrol {Filter Diagnostics} dialog.
+            \image qtcreator-clang-tools-filter-diagnostics.webp {Filter Diagnostics dialog}
+        \li Select the diagnostics to view.
+        \li Select \uicontrol OK.
+    \endlist
+
+    To view all diagnostics, select \uicontrol {Select All}. To view diagnostics
+    that have fixits, select \uicontrol {Select All with Fixits}.
+
+    To hide all diagnostics, select \uicontrol {Clear Selection}.
+
+    To view diagnostics of a particular kind, right-click an entry in
+    \uicontrol Diagnostics and select \uicontrol {Filter for This Diagnostic Kind}
+    in the context menu. To hide diagnostics of that kind, select
+    \uicontrol {Filter out This Diagnostic Kind}.
+
+    \section2 Suppress diagnostics
+
+    To suppress diagnostics, select \uicontrol {Suppress This Diagnostic} or
+    \uicontrol {Suppress This Diagnostic Inline} in the context menu.
+
+    To view the suppression list for a project and to remove
+    diagnostics from it, select \uicontrol Projects >
+    \uicontrol {Project Settings} > \uicontrol {Clang Tools}.
+
     \section1 Disable checks
 
     To disable checks of a particular type either globally or for a
@@ -107,7 +122,8 @@
     using the \c {-export fixes} option.
 
     \sa {Check code syntax}, {Configure Clang Diagnostics},
-    {Specify Clang tools settings}, {Clang Tools}
+    {Analyze}{How To: Analyze}, {Specify Clang tools settings}, {Analyzers},
+    {Clang Tools}
 */
 
 /*!
@@ -271,13 +287,6 @@
 
     \endlist
 
-    \section2 Suppressing Diagnostics
-
-    To suppress diagnostics, select \uicontrol {Suppress This Diagnostic} in the
-    context menu. To view the suppression list for a project and to remove
-    diagnostics from it, select \uicontrol Projects >
-    \uicontrol {Project Settings} > \uicontrol {Clang Tools}.
-
     \section2 Selecting Clazy Check Levels
 
     The Clazy checks are divided into levels from 0 to 3. The checks at level 0
diff --git a/doc/qtcreator/src/analyze/creator-coco.qdoc b/doc/qtcreator/src/analyze/creator-coco.qdoc
index 341db9fc096..4b1337e1238 100644
--- a/doc/qtcreator/src/analyze/creator-coco.qdoc
+++ b/doc/qtcreator/src/analyze/creator-coco.qdoc
@@ -2,72 +2,46 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \previouspage creator-qml-performance-monitor.html
     \page creator-coco.html
-    \nextpage creator-axivion.html
+    \previouspage creator-how-tos.html
 
-    \title Checking Code Coverage
+    \ingroup creator-how-to-analyze
 
-    \l{https://doc.qt.io/coco/}{Coco} is a complete code coverage tool chain for
-    Tcl, QML, C# and C/C++ programs, which runs on \macOS, Linux, and Windows.
+    \title Check code coverage
 
-    Coco analyzes the way an application runs, as part of a test suite,
-    for example. The results enable you to make the tests more efficient and
-    complete.
-
-    You can:
-
-    \list
-        \li Find untested code sections.
-        \li Find redundant tests which can then be eliminated. Coco can
-            identify portions of the source code that are covered by a test. It
-            can detect whether a new test covers lines in the source code that
-            the existing tests do not cover.
-        \li Find dead code by displaying code that is never executed.
-        \li Calculate the optimum test execution order so as to maximize
-            test coverage for each run. This is particularly useful for manual
-            testing.
-        \li Analyze two separate versions of an application and compare the
-            differences. This makes it possible to see which tests are affected
-            by source code modifications and also to get some measure of the
-            test coverage of a patch or hot fix.
-        \li Measure the execution time of applications and tests.
-    \endlist
-
-    The experimental Coco plugin integrates Coco CoverageBrowser into \QC.
-    It enables you to analyze the test coverage by loading an instrumentation
-    database (a .csmes file), which was generated by Coco CoverageScanner.
-    It is currently supported only on Windows, with Coco version 6.0,
-    or later.
+    With Coco CoverageBrowser, you can analyze the test coverage by loading an
+    instrumentation database (a .csmes file), which was generated by Coco
+    CoverageScanner. The experimental Coco plugin is currently supported only on
+    Windows, with Coco version 6.0, or later.
 
     To use the plugin, you must download and install Coco.
 
     \note Enable the Coco plugin to use it.
 
-    \section1 Configuring Coco
+    \section1 Configure Coco
 
     \list 1
-        \li Select \uicontrol Analyze > \uicontrol {Squish Coco}.
-            \image qtcreator-coco.png "Coco CoverageBrowser and CSMes file"
+        \li Go to \uicontrol Analyze > \uicontrol {Squish Coco}.
+            \image qtcreator-coco.png {Coco CoverageBrowser and CSMes file}
         \li In \uicontrol {CoverageBrowser}, enter the path to the Coco
             coverage browser to use for analyzing a .csmes file.
         \li In \uicontrol CSMes, select the instrumentation database to load.
         \li Select \uicontrol Open to start CoverageBrowser.
-        \li In CoverageBrowser, select \uicontrol File >
+        \li In CoverageBrowser, go to \uicontrol File >
             \uicontrol {Load Execution Report} and select the .csexe for the
             coverage scan.
-            \image coco-coveragebrowser-load-execution-report.png "Load Execution Report dialog"
-        \li If you want to reuse the execution report, deselect the
-            \uicontrol {Delete execution report after loading} check box.
+            \image coco-coveragebrowser-load-execution-report.png {Load Execution Report dialog}
+        \li To keep the execution report, clear
+            \uicontrol {Delete execution report after loading}.
     \endlist
 
-    Open the analyzed files in \QC. The results of the analysis are displayed
+    Open the analyzed files in \QC. You can see the results of the analysis
     after the code in \uicontrol Edit mode. You can change the fonts and colors
     used for different types of results.
 
     \section1 Changing Fonts and Colors
 
-    To change the default fonts and colors, select \preferences >
+    To change the default fonts and colors, go to \preferences >
     \uicontrol {Text Editor} > \uicontrol {Font & Colors}.
     Create your own color scheme and select new fonts and colors for the
     following results:
@@ -85,5 +59,6 @@
         \li Implicit Manual Coverage Validation
     \endlist
 
-    \sa {Enable and disable plugins}, {Font & Colors}
+    \sa {Enable and disable plugins}, {Analyze}{How To: Analyze}, {Analyzers},
+    {Font & Colors}, {Analyzing Code}
 */
diff --git a/doc/qtcreator/src/analyze/creator-cppcheck.qdoc b/doc/qtcreator/src/analyze/creator-cppcheck.qdoc
index e3cc393d705..6f34cd5180a 100644
--- a/doc/qtcreator/src/analyze/creator-cppcheck.qdoc
+++ b/doc/qtcreator/src/analyze/creator-cppcheck.qdoc
@@ -1,58 +1,51 @@
-// Copyright (C) 2020 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \previouspage creator-cpu-usage-analyzer.html
     \page creator-cppcheck.html
-    \nextpage creator-ctf-visualizer.html
+    \previouspage creator-how-tos.html
 
-    \title Analyzing Code with Cppcheck
+    \ingroup creator-how-to-analyze
 
-    \l{http://cppcheck.sourceforge.net/}{Cppcheck} is a static analysis tool
-    that detects errors in C++ code. Static analysis is performed on the source
-    code without actually executing the application.
+    \title Detect errors in C++ code with Cppcheck
 
-    The experimental Cppcheck Diagnostics plugin integrates diagnostics
-    that are generated by the Cppcheck tool into the C++ editor.
-
-    \note Enable the Cppcheck plugin to use it.
+    Enable the experimental Cppcheck plugin to view diagnostics that are
+    generated by the Cppcheck tool in the C++ editor.
 
     Cppcheck is automatically run on open files. To select the files to
-    check in the currently active project, select \uicontrol Analyze >
+    check in the currently active project, go to \uicontrol Analyze >
     \uicontrol Cppcheck.
 
-
-    \section1 Running Cppcheck on Selected Files
+    \section1 Analyze selected files
 
     \list 1
-        \li Select \uicontrol Analyze > \uicontrol Cppcheck.
-            \image qtcreator-cppcheck-run-configuration.png "Cppcheck run configuration"
-        \li In the \uicontrol Binary field, enter the path to the Cppcheck
-            executable file.
-        \li In the \uicontrol Checks group, select the checks to perform.
+        \li Go to \uicontrol Analyze > \uicontrol Cppcheck.
+            \image qtcreator-cppcheck-run-configuration.png {Cppcheck run configuration}
+        \li In uicontrol Binary, enter the path to the Cppcheck executable file.
+        \li In \uicontrol Checks, select the checks to perform.
             \note By default, Cppcheck uses multiple threads to perform checks.
-            Selecting the \uicontrol {Unused functions} option disables the
-            default behavior.
-        \li In the \uicontrol {Custom arguments} field, enter additional
+            Select \uicontrol {Unused functions} to turn off the default
+            behavior.
+        \li In \uicontrol {Custom arguments}, enter additional
             arguments for running Cppcheck. The arguments might be shadowed
             by automatically generated ones. To avoid possible conflicts in
-            configuration, select the \uicontrol {Show raw output} check box
-            to see the final arguments.
-        \li In the \uicontrol {Ignored file patterns} field, enter a filter
+            configuration, select \uicontrol {Show raw output} and check the
+            final arguments.
+        \li In \uicontrol {Ignored file patterns}, enter a filter
             for ignoring files that match the pattern (wildcard). You can enter
             multiple patterns separated by commas. Even though Cppcheck is not
             run on files that match the patterns, they might be
             implicitly checked if other files include them.
-        \li Select the \uicontrol {Inconclusive errors} check box to also
-            mark possible false positives.
-        \li Select the \uicontrol {Check all define combinations} check box to
-            check all define combinations. Enabling this option can significantly
+        \li Select \uicontrol {Inconclusive errors} to also mark possible false
+            positives.
+        \li Select \uicontrol {Check all define combinations} to
+            check all define combinations. This can significantly
             slow down analysis, but might help to find more issues.
-        \li Select the \uicontrol {Add include paths} check box to pass the
-            current project's include paths to Cppcheck. Enabling this option
+        \li Select \uicontrol {Add include paths} to pass the
+            current project's include paths to Cppcheck. This
             slows down checks on big projects, but can help Cppcheck to find
             missing includes.
-        \li Select the \uicontrol {Calculate additional arguments} check box to
+        \li Select \uicontrol {Calculate additional arguments} to
             calculate additional arguments based on current project's settings
             (such as the language used and standard version) and pass them to
             Cppcheck.
@@ -64,8 +57,9 @@
     marks or annotations.
 
     To specify the settings above for the automatically run checks,
-    select \preferences > \uicontrol Analyzer
+    go to \preferences > \uicontrol Analyzer
     > \uicontrol Cppcheck.
 
-    \sa {Enable and disable plugins}
+    \sa {Enable and disable plugins}, {Analyze}{How To: Analyze},
+    {Analyzing Code}, {Analyzers}
 */
diff --git a/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc b/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc
index a2bf118f3fb..8f02ee0607e 100644
--- a/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc
+++ b/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc
@@ -8,11 +8,14 @@
 // **********************************************************************
 
 /*!
-    \previouspage creator-cppcheck.html
     \page creator-ctf-visualizer.html
-    \nextpage creator-autotest.html
+    \previouspage creator-reference.html
 
-    \title Visualizing Chrome Trace Events
+    \ingroup creator-reference-analyzer
+
+    \title Chrome Trace Format Visualizer
+
+    \brief Visualize Chrome trace events generated in Chrome Trace Format (CTF).
 
     You can use \e {full stack tracing} to trace from the top level QML or
     JavaScript down to the C++ and all the way to the kernel space. This
@@ -110,7 +113,7 @@
     LTTng is a tracing toolkit for Linux that you can apply on embedded Linux
     systems to find out how to optimize the startup time of an application.
 
-    Since Qt 5.13, Qt has a set of kernel trace points and a tracing
+    Qt has a set of kernel trace points and a tracing
     subsystem for custom user space trace points.
 
     \section2 Configuring the Kernel
@@ -218,4 +221,6 @@
     \code
     ctf2ctf -o trace.json path/to/lttng trace/
     \endcode
+
+    \sa {Analyze}{How To: Analyze}, {Analyzers}, {Analyzing Code}
 */
diff --git a/doc/qtcreator/src/analyze/creator-heob.qdoc b/doc/qtcreator/src/analyze/creator-heob.qdoc
index 449d3cc86ab..33d9568c07b 100644
--- a/doc/qtcreator/src/analyze/creator-heob.qdoc
+++ b/doc/qtcreator/src/analyze/creator-heob.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2020 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 // **********************************************************************
@@ -8,17 +8,15 @@
 // **********************************************************************
 
 /*!
-    \previouspage creator-clang-tools.html
-    \page creator-heob.html
-    \nextpage creator-cpu-usage-analyzer.html
+    \page creator-how-to-use-heob.html
+    \previouspage creator-how-tos.html
 
-    \title Detecting Memory Leaks with Heob
+    \ingroup creator-how-to-analyze
 
-    \QC integrates the \l{https://github.com/ssbssa/heob}{Heob} heap observer
-    for detecting buffer overruns and memory leaks. You must download and
-    install Heob to run it from \QC.
+    \title Detect memory leaks with Heob
 
-    \image qtcreator-heob-settings.png
+    On Windows, use the Heob heap observer to detect buffer overruns and memory
+    leaks.
 
     To run Heob on the currently open project:
 
@@ -26,35 +24,48 @@
 
         \li Select \uicontrol Analyze > \uicontrol Heob.
 
+            \image qtcreator-heob-settings.png {Heob settings}
+
         \li Select the Heob settings profile to use, or select \uicontrol New
             to create a new profile.
 
-        \li In the \uicontrol {Heob path} field, enter the path to the Heob
+        \li In \uicontrol {Heob path}, enter the path to the Heob
             executable.
 
-        \li Specify additional settings for running the checks. For more
-            information about the available options, see
-            \l{Specifying Heob Settings}.
+        \li Specify \l{Heob}{settings} for running the checks.
 
         \li Select \uicontrol OK to run Heob.
 
     \endlist
 
-    \QC runs the application, and then it runs Heob in a console window.
+    \QC runs the application, and then it runs Heob in a terminal.
 
-    \image qtcreator-heob.png
+    \image qtcreator-heob-in-terminal.webp {Heob running in a terminal}
 
     Heob raises an access violation on buffer overruns and records stack traces
-    of the offending instruction and buffer allocation. The results are
-    displayed when Heob exits normally.
+    of the offending instruction and buffer allocation. You can see the results
+    in the \uicontrol Memcheck view after Heob exits normally.
 
-    \image qtcreator-heob-output.png
+    \image qtcreator-heob-output.png {Results from Heob in the Memcheck view}
 
-    \section1 Specifying Heob Settings
+    \sa {Analyze}{How To: Analyze}, {Analyzers}, {Heob}, {Analyzing Code}
+*/
 
-    To specify settings for Heob, select \uicontrol Analyze > \uicontrol Heob.
+/*!
+    \page creator-heob.html
+    \previouspage creator-reference.html
 
-    In the \uicontrol {Extra arguments} field, enter additional arguments for
+    \ingroup creator-reference-analyzer
+
+    \title Heob
+
+    \brief Detect memory leaks with Heob.
+
+    To specify settings for Heob, go to \uicontrol Analyze > \uicontrol Heob.
+
+    \image qtcreator-heob-settings.png {Heob settings}
+
+    In \uicontrol {Extra arguments}, enter additional arguments for
     running Heob. To list the available arguments in the Heob console, enter
     \c -H in this field and press \key Enter.
 
@@ -63,19 +74,19 @@
     leaks visually in the file and the \c -L1024 option to record leak contents
     up to 1024 bytes in the file. For example, \c {-oleaks.html -g2 -L1024}
 
-    To save the settings profile, select \uicontrol Save.
+    To save your changes as default settings, select
+    \inlineimage icons/savefile.png.
 
     To remove a customized settings profile, select the profile, and then
     select \uicontrol Delete.
 
     The following sections describe the available options in more detail.
 
-    \section2 Recording Results
+    \section1 Recording Results
 
     The results of the checks are displayed in the \uicontrol Memcheck view and
-    recorded in a file. You can specify the file name in the
-    \uicontrol {XML output file} field. Heob creates the file in the project
-    directory.
+    recorded in a file. Specify the file name in \uicontrol {XML output file}.
+    Heob creates the file in the project directory.
 
     You can use the process identifier (PID) as a variable in the file name.
     For example,  \c leaks-%p.xml. This injects Heob into the child processes,
@@ -87,9 +98,9 @@
     If you use variables, \QC cannot open the file automatically, but you can
     open it from the project directory.
 
-    \section2 Handling Exceptions
+    \section1 Handling Exceptions
 
-    In the \uicontrol {Handle exceptions} list, select \uicontrol Off to use the
+    In \uicontrol {Handle exceptions}, select \uicontrol Off to use the
     standard exception handler and have the debugger automatically attached if
     the application crashes. This works only if you register \QC is as a
     post-mortem debugger by selecting \preferences >
@@ -105,7 +116,7 @@
     crash is displayed. Therefore, this option is mostly useful when using Heob
     on the console or running it for child processes, as well.
 
-    \section2 Raising Exceptions on Errors
+    \section1 Raising Exceptions on Errors
 
     Select the \uicontrol {Raise breakpoint exception on error} check
     box to display errors when the application runs.
@@ -119,9 +130,9 @@
     This is mostly useful when used with the \uicontrol {Run with debugger}
     option, which runs Heob under the debugger.
 
-    \section2 Protecting Pages
+    \section1 Protecting Pages
 
-    In the \uicontrol {Page protection} list, select \uicontrol Off to use
+    In \uicontrol {Page protection}, select \uicontrol Off to use
     standard memory allocation functions and enable only memory leak detection.
 
     Select \uicontrol After to place a protected page at the end of each
@@ -135,9 +146,9 @@
     useful for \e use-after-free and \e double-free detection. However, the
     available memory address space can run out fast for 32-bit programs.
 
-    \section2 Handling Leak Data
+    \section1 Handling Leak Data
 
-    In the \uicontrol {Leak details} list, determine how to handle the
+    In \uicontrol {Leak details}, determine how to handle the
     collected leak data when the process exits. Selecting \uicontrol None means
     that no leak data is collected. If you activate leak type detection, Heob
     might need more time to collect the data when the process exits.
@@ -163,10 +174,10 @@
     block. Select \uicontrol {Detect Leak Types (Show Reachable)} to also
     record the reachable blocks in the results file.
 
-    In the \uicontrol {Minimum leak size} list, select the size of
+    In \uicontrol {Minimum leak size}, select the size of
     leaks to detect in bytes.
 
-    In the \uicontrol {Control leak recording} list, select \uicontrol Off to
+    In \uicontrol {Control leak recording}, select \uicontrol Off to
     record all leaks. You cannot change leak recording while it is running.
 
     To start Heob without starting leak recording, select
@@ -177,4 +188,7 @@
 
     To start leak recording when Heob starts and still have the option to
     control the recording, select \uicontrol {On (Start Enabled)}.
+
+    \sa {Detect memory leaks with Heob}, {Analyze}{How To: Analyze}, {Analyzers},
+     {Analyzing Code}
 */
diff --git a/doc/qtcreator/src/analyze/creator-valgrind-overview.qdoc b/doc/qtcreator/src/analyze/creator-valgrind-overview.qdoc
deleted file mode 100644
index 61aca06cfd2..00000000000
--- a/doc/qtcreator/src/analyze/creator-valgrind-overview.qdoc
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (C) 2018 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-// **********************************************************************
-// NOTE: the sections are not ordered by their logical order to avoid
-// reshuffling the file each time the index order changes (i.e., often).
-// Run the fixnavi.pl script to adjust the links to the index order.
-// **********************************************************************
-
-/*!
-    \previouspage creator-axivion.html
-    \page creator-valgrind-overview.html
-    \nextpage creator-analyzer.html
-
-    \title Using Valgrind Code Analysis Tools
-
-    \QC integrates \l{http://valgrind.org/info/tools.html}{Valgrind code
-    analysis tools} for detecting memory leaks and
-    profiling function execution. You must download and install them separately
-    to use them from \QC.
-
-    You can run the Valgrind tools either \e locally on the development host or
-    \e remotely on another host. You can use them to analyze both applications
-    for which you set up a project in \QC and applications for which you do not
-    have a project.
-
-    Valgrind tools are supported locally only on Linux and \macos. However,
-    according to Valgrind.org, support on \macos 10.8 and 10.9 is experimental and
-    mostly broken. You can run the tools on a remote Linux machine or device
-    from any development host.
-
-    To run the Valgrind tools to analyze an application for which you have a
-    project, open the project in \QC and select the kit to run the project. The
-    kit specifies whether the Valgrind tools are run locally or remotely.
-
-    For more information about analyzing applications for which you do not have
-    a project, see \l{Running Valgrind Tools on External Applications}.
-
-    To set preferences for the Valgrind tools, select \preferences >
-    \uicontrol Analyzer. You can override the general
-    settings for each project in the \uicontrol {Run Settings} for the project.
-
-    The following sections describe how to use the Valgrind tools:
-
-    \list
-
-        \li \l{Detecting Memory Leaks with Memcheck}
-
-        \li \l{Profiling Function Execution}
-
-    \endlist
-
-    \sa {Specify Valgrind settings for a project}
-*/
diff --git a/doc/qtcreator/src/analyze/creator-valgrind.qdoc b/doc/qtcreator/src/analyze/creator-valgrind.qdoc
index 47d4b8c1d6c..dfc43effb49 100644
--- a/doc/qtcreator/src/analyze/creator-valgrind.qdoc
+++ b/doc/qtcreator/src/analyze/creator-valgrind.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 // **********************************************************************
@@ -8,92 +8,116 @@
 // **********************************************************************
 
 /*!
-    \previouspage creator-valgrind-overview.html
-    \page creator-analyzer.html
-    \nextpage creator-cache-profiler.html
+    \page creator-how-to-memcheck.html
+    \previouspage creator-how-tos.html
 
-    \title Detecting Memory Leaks with Memcheck
+    \ingroup creator-how-to-analyze
 
-    You can use the Memcheck tool included in the Valgrind tool suite to detect
-    problems that are related to memory management in applications. You can use
+    \title Detect memory leaks with Memcheck
+
+    With the Memcheck tool in \l{Valgrind's Tool Suite}, you can detect
+    problems that are related to memory management in applications. Use
     the tool together with the GDB debugger. When a problem is detected, the
     application is interrupted and you can debug it.
 
     \note You can install and run Memcheck locally on Linux. You can run
-    it on a remote host or device from any development machine. On Windows,
+    it on a remote host or device from any computer. On Windows,
     you can use the \l{Detecting Memory Leaks with Heob}{Heob} heap observer to
     receive similar results.
 
     After you download and install Valgrind tools, you can use Memcheck from
     \QC.
 
-    To analyze applications:
+    To detect memory leaks in applications:
 
     \list 1
 
-        \li In the \uicontrol Projects mode, select a debug build configuration.
+        \li Go to the \uicontrol Projects mode, and select a debug build
+            configuration.
 
-        \li Select \uicontrol Debug to open the \uicontrol Debug mode, and then
-            select \uicontrol Memcheck on the toolbar.
+        \li In the mode selector, select \uicontrol Debug > \uicontrol Memcheck.
 
-        \li Select the
-            \inlineimage icons/qtcreator-analyze-start-button.png "Start button"
-            button to start the application.
+            \image qtcreator-valgrind-memcheck.webp {Memcheck view}
+
+        \li Select \inlineimage icons/qtcreator-analyze-start-button.png
+            to start the application.
 
         \li Use the application to analyze it.
 
-        \li Select the \inlineimage icons/stop_small.png "Stop button"
-            button to view the results of the analysis in the
-            \uicontrol {Analysis} view.
+        \li Select \inlineimage icons/stop_small.png to view the results of the
+            analysis in \uicontrol {Memory Issues}.
 
     \endlist
 
-    While the application is running, Memcheck checks all reads and writes of
-    memory and intercepts calls that allocate or free memory or create or
-    delete memory blocks. The results are displayed when you stop Memcheck.
-    Click a line to view where a memory leak
-    occurred and a stack trace that shows what caused it.
+    \section1 View memory issues
 
-    As an alternative to collecting data, you can select \inlineimage icons/open.png
+    While the application is running, Memcheck does the following:
+
+    \list
+        \li Checks all reads and writes of memory.
+        \li Intercepts calls that allocate or free memory or create or
+            delete memory blocks.
+    \endlist
+
+    You can see the results when you stop Memcheck.
+
+    Select a line to see the place where a memory leak occurred and a stack trace
+    that shows what caused it.
+
+    As an alternative to collecting data, select \inlineimage icons/open.png
     to load an external log file in XML format into the \uicontrol Memcheck
     view.
 
-    \image qtcreator-valgrind-memcheck.png "Memcheck view"
-
     Move the mouse on a row to view more information about the function.
 
     To move between rows, select \inlineimage icons/prev.png
-    or \inlineimage icons/next.png
-    .
+    or \inlineimage icons/next.png.
 
-    To filter the results, select \inlineimage icons/filtericon.png
-    , and then select the types of issues to display in the view. You
+    To filter the results, select \inlineimage icons/filtericon.png, and
+    then select the types of issues to display in the view. You
     can view and hide definite and possible memory leaks, uninitialized
     values, invalid calls to \c free(), and external errors.
 
     For more information about using Memcheck, see
-    \l{http://valgrind.org/docs/manual/quick-start.html#quick-start.mcrun}
-    {Interpreting Memcheck's Output} in the Valgrind documentation.
+    \l{Interpreting Memcheck's Output} in the Valgrind documentation.
 
-    \section1 Selecting Options for Memory Analysis
+    \sa {Analyze}{How To: Analyze}, {Profile function execution},
+    {Run Valgrind tools on external applications},
+    {Specify Valgrind settings for a project}, {Analyzers}, {Valgrind Callgrind},
+    {Valgrind Memcheck}, {Analyzing Code}
+*/
 
-    You can specify analyzer settings either globally for all projects or
-    separately for each project in the \l{Specifying Run Settings}{run settings}
-    of the project.
+/*!
+    \page creator-preferences-memcheck.html
+    \previouspage creator-reference.html
 
-    To specify global settings for Valgrind, select \preferences >
-    \uicontrol Analyzer. The \uicontrol {Memcheck Memory Analysis Options}
-    group has Memcheck options.
+    \ingroup creator-reference-preferences-analyzer
+
+    \title Valgrind Memcheck
+
+    \brief Set preferences for Valgrind Memcheck.
+
+    Set \l{Valgrind's Tool Suite}{Valgrind} preferences either globally for all
+    projects or separately for each project in the \l{Specifying Run Settings}
+    {run settings} of the project.
+
+    To set global preferences for Valgrind, select \preferences >
+    \uicontrol Analyzer. Set Memcheck preferences in
+    \uicontrol {Memcheck Memory Analysis Options}.
+
+    \image qtcreator-valgrind-memcheck-options.png {Memory Analysis options}
 
     In \uicontrol {Extra Memcheck arguments}, specify additional arguments
     for launching the executable.
 
+    \section1 Setting Stack Trace Length
+
     Stack traces can get quite large and confusing, and therefore, reading them
     from the bottom up can help. If the stack trace is not big enough or it is
     too big, select \preferences > \uicontrol Analyzer and define the length of
     the stack trace in the \uicontrol {Backtrace frame count} field.
 
-    \image qtcreator-valgrind-memcheck-options.png "Memory Analysis options"
+    \section1 Tracking Origins of Uninitialized Memory
 
     Memcheck also reports uses of uninitialised values, most commonly with the
     message \uicontrol {Conditional jump or move depends on uninitialised value(s).}
@@ -101,12 +125,14 @@
     uninitialized memory} check box is selected by default. You can deselect it
     to make Memcheck run faster.
 
+    \section1 Viewing a Summary
+
     Memcheck searches for memory leaks when the client application finishes. To
     view the amount of leaks that occurred, select \uicontrol {Summary Only} in the
     \uicontrol {Check for leaks on finish} field. To also view details of each leak,
     select \uicontrol Full.
 
-    \section2 Showing Reachable and Indirectly Lost Blocks
+    \section1 Showing Reachable and Indirectly Lost Blocks
 
     \e Reachable blocks are blocks that are pointed at by a pointer or chain
     of pointers and that might have been freed before the application exited.
@@ -118,7 +144,7 @@
     To have them reported, select the \uicontrol {Show reachable and indirectly lost
     blocks}.
 
-    \section2 Suppressing Errors
+    \section1 Suppressing Errors
 
     Memcheck detects numerous problems in the system libraries, such as the C
     library, which come pre-installed with your OS. As you cannot easily fix
@@ -127,37 +153,40 @@
     when the system is built.
 
     You can write your own suppression files if parts of your project have
-    errors you cannot fix and you do not want to be reminded of them. Click
+    errors you cannot fix and you do not want to be reminded of them. Select
     \uicontrol Add in the \uicontrol {MemCheck Memory Analysis} dialog to add
     the suppression files.
-    For more information about writing suppression files, see
-    \l{http://valgrind.org/docs/manual/manual-core.html#manual-core.suppress}
-    {Suppressing Errors} in the Valgrind documentation.
 
+    For more information about writing suppression files, see
+    \l{Suppressing Errors} in the Valgrind documentation.
+
+    \sa {Detect memory leaks with Memcheck}, {Profile function execution},
+    {Run Valgrind tools on external applications},
+    {Specify Valgrind settings for a project}, {Valgrind Callgrind}
 */
 
 /*!
-    \previouspage creator-analyzer.html
     \page creator-cache-profiler.html
-    \nextpage creator-running-valgrind-remotely.html
+    \previouspage creator-how-tos.html
 
-    \title Profiling Function Execution
+    \ingroup creator-how-to-analyze
 
-    You can use the Callgrind tool included in the
-    \l{http://valgrind.org/info/tools.html}{Valgrind tool suite} to detect
-    problems that are related to executing functions. In addition, you
-    can load the data files generated by Callgrind into the
-    \l{https://kcachegrind.github.io/html/Home.html}{KCachegrind}
-    profile data visualization tool for browsing the performance results.
+    \title Profile function execution
+
+    With the Callgrind tool in \l{Valgrind's Tool Suite}, you can detect problems
+    that are related to executing functions. Load the data files generated by
+    Callgrind into the \l{https://kcachegrind.github.io/html/Home.html}
+    {KCachegrind} profile data visualization tool to browse the performance
+    results.
 
     After you download and install Valgrind tools and KCachegrind, you can use
     Callgrind and KCachegrind from \QC.
 
     \note You can install and run Callgrind and KCachegrind locally on Linux.
     You can run Callgrind on a remote Linux machine or device from any
-    development machine.
+    computer.
 
-    \section1 Building Apps for Profiling
+    \section1 Build apps for profiling
 
     Callgrind records the call history of functions that are executed when the
     application is run. It collects the number of instructions that are
@@ -181,28 +210,26 @@
     options for GCC are: \c{-g -O2}. It is
     advisable to use such a setup for Callgrind profiling.
 
-    \section1 Collecting Data
+    \section1 Collect data
 
     To analyze applications:
 
     \list 1
 
-        \li In the \uicontrol Projects mode, select a release build configuration.
+        \li Go to the \uicontrol Projects mode, and select a release build
+            configuration.
 
-        \li Select \uicontrol Debug to open the \uicontrol Debug mode, and then
-            select \uicontrol Callgrind on the toolbar.
+        \li In the mode selector, select \uicontrol Debug > \uicontrol Callgrind.
 
-            \image qtcreator-valgrind-callgrind-toolbar.png "Callgrind view toolbar"
+            \image qtcreator-valgrind-callgrind-toolbar.png {Callgrind view toolbar}
 
-        \li Select the
-            \inlineimage icons/qtcreator-analyze-start-button.png "Start button"
-            button to start the application.
+        \li Select \inlineimage icons/qtcreator-analyze-start-button.png
+            to start the application.
 
         \li Use the application to analyze it.
 
-        \li Select the \inlineimage icons/stop_small.png "Stop button"
-            button to view the results of the analysis in the
-            \uicontrol Functions view.
+        \li Select \inlineimage icons/stop_small.png to view the results of the
+            analysis in the \uicontrol Functions view.
 
     \endlist
 
@@ -220,7 +247,7 @@
     to view the data in KCachegrind. \QC launches KCachegrind
     and loads the data into it for visualization.
 
-    \section1 Viewing Collected Data
+    \section1 View collected data
 
     The results of the analysis are displayed in the \uicontrol Callgrind views.
     You can detach views and move them around. To revert the changes, select
@@ -261,17 +288,31 @@
     To remove template parameter lists when displaying function names, select
     \uicontrol <>.
 
-    \section1 Selecting Profiling Options
+    \sa {Detect memory leaks with Memcheck}, {Profile function execution},
+    {Run Valgrind tools on external applications},
+    {Specify Valgrind settings for a project}, {Valgrind Callgrind},
+    {Valgrind Memcheck}
+*/
 
-    You can specify analyzer settings either globally for all projects or
-    separately for each project in the \l{Specifying Run Settings}{run settings}
-    of the project.
+/*!
+    \page creator-preferences-callgrind.html
+    \previouspage creator-reference.html
 
-    To specify global settings for Valgrind, select \preferences >
-    \uicontrol Analyzer. The \uicontrol {Callgrind Profiling Options}
-    group has Callgrind options.
+    \ingroup creator-reference-preferences-analyzer
 
-    \image qtcreator-valgrind-callgrind-options.png "Valgrind options"
+    \title Valgrind Callgrind
+
+    \brief Set preferences for Valgrind Callgrind.
+
+    Set \l{Valgrind's Tool Suite}{Valgrind} preferences either globally for all
+    projects or separately for each project in the \l{Specifying Run Settings}
+    {run settings} of the project.
+
+    To set global preferences for Valgrind, select \preferences >
+    \uicontrol Analyzer. Set Callgrind preferences in
+    \uicontrol {Callgrind Profiling Options}.
+
+    \image qtcreator-valgrind-callgrind-options.png {Callgrind Profiling Options}
 
     In the \uicontrol {KCachegrind executable} field, enter the path to the
     KCachegrind executable to launch.
@@ -292,7 +333,7 @@
     global bus events of the event type \c Ge that are executed,
     select \uicontrol {Collect global bus events}.
 
-    \section2 Enabling Full Cache Simulation
+    \section1 Enabling Full Cache Simulation
 
     By default, only instruction read accesses (Ir) are counted. To fully
     simulate the cache, select the \uicontrol {Enable cache simulation} check box.
@@ -308,7 +349,7 @@
 
     \endlist
 
-    \section2 Enabling Branch Prediction Simulation
+    \section1 Enabling Branch Prediction Simulation
 
     To enable the following additional event counters, select the
     \uicontrol {Enable branch prediction simulation} check box:
@@ -323,32 +364,39 @@
 
     \endlist
 
-    \sa {Analyzing CPU Usage}, {Detach views}
+    \sa {Analyzing CPU Usage}, {Detect memory leaks with Memcheck},
+    {Detach views}, {Run Valgrind tools on external applications},
+    {Specify Valgrind settings for a project},
+    {Valgrind Memcheck}
 */
 
 /*!
-    \previouspage creator-cache-profiler.html
     \page creator-running-valgrind-remotely.html
-    \nextpage creator-clang-tools.html
+    \previouspage creator-how-tos.html
 
-    \title Running Valgrind Tools on External Applications
+    \ingroup creator-how-to-analyze
 
-    \QC integrates Valgrind code analysis tools for detecting memory
-    leaks and profiling function execution.
+    \title Run Valgrind tools on external applications
+
+    With \l{Valgrind's Tool Suite}, you can detect memory leaks and profile
+    function execution.
 
     To run the Valgrind tools to analyze external applications for which
     you do not have a \QC project:
 
     \list 1
 
-        \li Select \uicontrol Analyze > \uicontrol {Valgrind Memory Analyzer (External
+        \li Go to \uicontrol Analyze > \uicontrol {Valgrind Memory Analyzer (External
             Application)} or \uicontrol {Valgrind Function Profiler (External Application)}.
 
-            \image qtcreator-valgrind-remote-settings.png "Start Remote Analysis dialog"
+            \image qtcreator-valgrind-remote-settings.png {Start Remote Analysis dialog}
 
-        \li Specify the application to run and analyze, and the \l{glossary-buildandrun-kit}{kit}
-            to use.
+        \li Select the application to run and analyze, as well as the
+            \l{Kits}{kit} to use.
 
     \endlist
 
+    \sa {Detect memory leaks with Memcheck}, {Profile function execution},
+    {Kits}, {Specify Valgrind settings for a project}, {Valgrind Callgrind},
+    {Valgrind Memcheck}
 */
diff --git a/doc/qtcreator/src/android/androiddev.qdoc b/doc/qtcreator/src/android/androiddev.qdoc
index 61fbfb5cf75..e2b064d5b50 100644
--- a/doc/qtcreator/src/android/androiddev.qdoc
+++ b/doc/qtcreator/src/android/androiddev.qdoc
@@ -3,31 +3,30 @@
 
     /*!
     \page creator-developing-android.html
-    \previouspage creator-connecting-mobile.html
-    \nextpage creator-developing-baremetal.html
+    \previouspage creator-reference.html
 
-    \title Connecting Android Devices
+    \ingroup creator-reference-devices
 
-    You can connect Android devices to the development PC using USB cables to
-    build, run, debug, and analyze applications from \QC.
+    \title Developing for Android
 
-    \note \QC only detects a device and connects to it after you
-    \l{Debugging on Android Devices}{enable USB debugging on it}.
+    \brief Set up the toolchain for building applications for Android devices.
 
-    To develop for Android, you must install a tool chain for building
-    applications for Android devices on the development PC. \QC can automatically
-    download and install the tool chain and create a suitable build and run
-    \l{glossary-buildandrun-kit}{kit} that has the tool chain and the Qt
-    version for Android for the device's architecture.
+    Install a Qt version targeting Android and the Android SDK and NDK to develop
+    Qt applications for Android devices. To check the Android version supported
+    by each Qt version, see the \l {Qt for Android} documentation for the Qt
+    version.
 
-    To enable helpful code editing features for Java, such as code completion,
+    To get helpful code editing features for Java, such as code completion,
     highlighting, function tooltips, and navigating in code, add a
     \l{Add a Java language server}{Java language server}.
 
     \QC integrates the Android Debug Bridge (\c adb) command-line tool for
     deploying applications to Android devices, running them, and reading their
     logs. The \c adb tool includes a client and server that run on
-    the development host and a daemon that runs on the emulator or device.
+    the computer and a daemon that runs on the Android emulator or device.
+
+    \note \QC only detects a device and connects to it after you
+    \l{Debug on Android Devices}{enable USB debugging on it}.
 
     The following video shows the whole process from installing Qt for Android
     to debugging an application on an Android device:
@@ -36,18 +35,30 @@
 
     \section1 Requirements
 
-    To use \QC to develop Qt applications for Android, you need
-    \l {Qt for Android} and a tool chain that \QC can automatically
-    download, install, and configure for you. For more information
-    about the requirements for developing with a particular Qt version,
-    see the documentation for that Qt version. The links in this manual
-    lead to the latest released Qt reference documentation.
+    To use \QC to develop Qt applications for Android, you need:
 
-    \section1 Specifying Android Device Settings
+    \list
+        \li \l {Qt for Android}
+        \li \l {Android Development Prerequisites}{Android tools} that \QC can
+            automatically download, install, and configure for you.
+    \endlist
+
+    \sa {Android}{How To: Develop for Android}
+*/
+
+/*!
+    \page creator-how-to-set-android-preferences.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-android
+
+    \title Set up Android development environment
 
     \QC offers to automatically install all the necessary packages and tools and
-    to set up your development environment by creating debuggers, tool chains,
-    and kits. You can use \QC to:
+    to set up your \l{Qt for Android} development environment by creating
+    debuggers, toolchains, and kits.
+
+    Use \QC to:
 
     \list
         \li Download and extract the Android SDK Command-line Tools.
@@ -58,12 +69,12 @@
     To set up the development environment for Android:
 
     \list 1
-        \li Select \preferences > \uicontrol Devices > \uicontrol Android.
-            \image qtcreator-options-android-main.png {Android preferences}
-        \li In the \uicontrol {JDK location} field, set the path to the JDK.
+        \li Go to \preferences > \uicontrol Devices > \uicontrol Android.
+            \image qtcreator-preferences-android.webp {Android preferences}
+        \li In \uicontrol {JDK location}, set the path to the JDK.
             \QC checks the JDK installation and reports errors.
 
-            By default, \QC tries to find a supported \l{AdoptOpenJDK} or
+            By default, \QC tries to find a supported \l{Adoptium OpenJDK} or
             \l{OpenJDK} installation. If it cannot find one, you must set the
             path manually. If you have not installed a supported JDK, select
             \inlineimage icons/online.png
@@ -71,46 +82,42 @@
 
             \note Use a 64-bit JDK because the 32-bit one might cause issues with
             \c cmdline-tools, and some packages might not appear in the list.
-        \li In the \uicontrol {Android SDK location} field, set the path to the
+        \li In \uicontrol {Android SDK location}, set the path to the
             folder to install the \l{Android SDK Command-line Tools}.
         \li Select \uicontrol {Set Up SDK} to automatically download and extract
             the Android SDK Command-line Tools to the selected path.
 
-            The SDK Manager checks that you have the necessary tools. If you need
-            more packages or updates, the SDK Manager offers to add or remove
+            SDK Manager checks that you have the necessary tools. If you need
+            more packages or updates, SDK Manager offers to add or remove
             the appropriate packages. Before taking action, it prompts you to
             accept the changes. In addition, it prompts you to accept Google
             licenses, as necessary.
-        \li The \uicontrol {Android NDK list} lists the installed NDK versions.
-            The SDK Manager installed the locked items. You can modify them only
+        \li \uicontrol {Android NDK list} lists the installed NDK versions.
+            SDK Manager installed the locked items. You can modify them only
             from the \uicontrol {Android SDK Manager} dialog. For more
-            information, see \l{Managing Android NDK Packages}.
-        \li Select the \uicontrol {Automatically create kits for Android tool chains}
-            check box to allow \QC to create the kits for you. \QC displays a
+            information, see \l{Manage Android NDK Packages}.
+        \li Select \uicontrol {Automatically create kits for Android tool chains}
+            to automatically create the necessary kits. \QC displays a
             warning if it cannot find a suitable Qt version.
-        \li Optionally, in the \uicontrol {Android OpenSSL Settings} group, set
+        \li Optionally, in \uicontrol {Android OpenSSL Settings} group, set
             the path to the prebuilt OpenSSL libraries.
 
-            For Qt applications that require OpenSSL support, you can
-            quickly add the \l {Android OpenSSL support} to your project.
-            For more information, see \l{Adding External Libraries}.
+            For Qt applications that require OpenSSL support, add
+            \l {Android OpenSSL support} to your project, as instructed in
+            \l{Adding External Libraries}.
         \li Select \uicontrol {Download OpenSSL} to download the OpenSSL
             repository to the selected path. If the automatic download fails,
             the download web page opens for manual download.
     \endlist
 
-    \section2 Manual Setup
+    \section1 Manual setup
 
-    \note Use the latest Android SDK Command-Line Tools. \QC does not support
-    Android SDK Tools version 25.2.5 or earlier because it cannot fully
-    integrate them.
-
-    However, if the automatic setup does not meet your needs, you can download
+    If the automatic setup does not meet your needs, download
     and install Android SDK Command-line Tools, and then install or update the
     necessary NDKs, tools, and packages. For more information, see
     \l{Getting Started with Qt for Android}.
 
-    \section2 Viewing Android Tool Chain Settings
+    \section1 View Android toolchain settings
 
     A JSON configuration file defines the Android SDK Command-Line Tools download
     URL, the essential packages list, and the appropriate NDK for each Qt version.
@@ -124,45 +131,72 @@
     C:\Users\Username\AppData\Local\QtProject\qtcreator\android\sdk_definitions.json
     \endcode
 
-    For example, the SDK configuration file sets the NDK version 19.2.5345600
-    for use with Qt 5.12.0 to 5.12.5 and Qt 5.13.0 to 5.13.1:
+    For example, the SDK configuration file sets the NDK version 22.1.7171670
+    for use with Qt 6.3, Qt 6.2, and Qt 5.15.9 to 5.15.20:
 
     \badcode
     "specific_qt_versions": [
-        {
-            "versions": ["5.12.[0-5]", "5.13.[0-1]"],
-            "sdk_essential_packages": ["build-tools;28.0.2", "ndk;19.2.5345600"],
-            "ndk_path": "ndk/19.2.5345600"
-        }
+    {       "versions": ["6.3", "6.2", "5.15.[9-20]"],
+            "sdk_essential_packages": ["build-tools;31.0.0", "ndk;22.1.7171670"]
+        },
     ]
     \endcode
 
     You can view the latest version of the configuration file that is up-to-date
     with the Android SDK and NDK changes, \l{sdk_definitions.json}, in Git.
 
-    \section2 Managing Android NDK Packages
+    \note For Qt 6.5 or later, \QC reads the NDK version that was used for
+    building Qt from \c modules/Core.json and uses it instead of the version
+    in \c sdk_definitions.json.
 
-    To view the installed \l{Android NDK} versions, select \preferences >
+    \sa {Android}{How To: Develop for Android}, {Developing for Android}, {Kits}
+*/
+
+/*!
+    \page creator-how-to-manage-android-ndk.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-android
+
+    \title Manage Android NDK packages
+
+    To view the \l{Android NDK} versions that \QC installed, go to \preferences >
     \uicontrol Devices > \uicontrol Android.
 
-    \image qtcreator-options-android-sdk-tools.png {Android NDK and SDK checks}
+    \image qtcreator-preferences-android.webp {Android preferences}
 
-    The SDK Manager installed the locked items. You can modify them only
+    SDK Manager installed the locked items. You can modify them only
     in the \uicontrol {Android SDK Manager} dialog.
-    For more information, see \l{Managing Android SDK Packages}.
+    For more information, see \l{Manage Android SDK packages}.
 
-    To manually download NDKs, select \inlineimage icons/online.png
-    .
+    \section1 Download Android NDKs
+
+    To manually download NDKs, select \inlineimage icons/online.png.
+
+    \section1 Set default NDK
 
     To use the selected NDK version for all Qt versions by default, select
     \uicontrol {Make Default}.
 
-    To add custom NDK paths manually to the global list of NDKs, select
-    \uicontrol Add. This creates custom tool chains and debuggers associated
-    to that NDK. However, you have to manually create a kit that uses the
-    custom NDK. For more information, see \l{Add kits}.
+    \section1 Add NDK paths
 
-    \section2 Managing Android SDK Packages
+    To add custom NDK paths manually to the global list of NDKs, select
+    \uicontrol Add. This creates custom toolchains and debuggers associated
+    to that NDK.
+
+    You have to manually create a kit that uses the custom NDK.
+
+    \sa {Add kits}, {Android}{How To: Develop for Android},
+    {Developing for Android}
+*/
+
+/*!
+    \page creator-how-to-manage-android-sdk.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-android
+
+    \title Manage Android SDK packages
 
     Since Android SDK Tools version 25.3.0, Android has only a command-line
     tool, \l {sdkmanager}, for SDK package management. To make SDK management
@@ -175,83 +209,152 @@
 
     \image qtcreator-android-sdk-manager.webp {Android SDK Manager}
 
-    You can show packages for the release channel you select in
-    \uicontrol {Show Packages} > \uicontrol Channel. Common channel IDs include
-    \uicontrol Stable, \uicontrol Beta, \uicontrol Dev, and \uicontrol Canary.
+    \section1 Show SDK packages
+
+    To show packages for a release channel in \uicontrol Package, select the
+    channel in \uicontrol {Show Packages} > \uicontrol Channel. Common channel
+    IDs include \uicontrol Stable, \uicontrol Beta, \uicontrol Dev, and
+    \uicontrol Canary.
+
     To show and update also obsolete packages, select
-    \uicontrol {Include obsolete}. To filter packages, select
-    \uicontrol Available, \uicontrol Installed, or \uicontrol All.
+    \uicontrol {Include obsolete}.
 
-    To update the installed Android SDK packages, select
-    \uicontrol {Update Installed}. Select the packages to update, and then
-    select \uicontrol Apply.
+    To filter packages, select \uicontrol Available, \uicontrol Installed, or
+    \uicontrol All.
 
-    To specify advanced \c sdkmanager settings, select
-    \uicontrol {Advanced Options} and enter arguments in the
-    \uicontrol {SDK Manager arguments} field. \uicontrol {Available arguments}
-    lists the arguments with descriptions.
+    \section1 Update SDK packages
 
+    To update the installed Android SDK packages:
+
+    \list 1
+        \li Select \uicontrol {Update Installed}.
+        \li Select the packages to update.
+        \li Select \uicontrol Apply.
+    \endlist
+
+    \section1 Set sdkmanager options
+
+    To set advanced \c sdkmanager options:
+
+    \list 1
+        \li Select \uicontrol {Advanced Options}.
+        \li In \uicontrol {SDK Manager arguments}, enter sdkmanager options from
+            \uicontrol {Available arguments}.
     \image qtcreator-android-sdk-manager-arguments.png {Android SDK Manager Arguments dialog}
+    \endlist
 
-    \section1 Managing Android Virtual Devices (AVD)
+    \sa {Android}{How To: Develop for Android}, {Developing for Android}
+*/
 
-    To view the available AVDs, select \preferences > \uicontrol Devices.
-    You can add more AVDs.
+/*!
+    \page creator-how-to-manage-avd.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-android
+
+    \title Manage AVDs
+
+    To view and add Android Virtual Devices (AVD), go to \preferences >
+    \uicontrol Devices.
 
     \image qtcreator-android-avd-manager.webp {Android device in Devices}
 
-    You can see the status of the selected device in \uicontrol {Current state}.
+    Select an AVD in \uicontrol Device to see its status in
+    \uicontrol {Current state}.
+
     To update the status information, select \uicontrol Refresh.
 
-    To start an AVD, select \uicontrol {Start AVD}. Usually, you don't need to
-    start AVDs separately because \QC starts them when you
-    select them in the \l{Build for many platforms}{kit selector} to
-    \l{Deploying to Android}{deploy applications} to them.
+    \section1 Start AVDs
+
+    To start an AVD, select \uicontrol {Start AVD}. Usually, \QC starts an AVD
+    when you select it in the \l{Build for many platforms}{kit selector} to
+    \l{Android Deploy Configuration}{deploy applications} to it.
+
+    \section1 Set prefrences for starting AVDs
+
+    To set preferences for starting an AVD, select \uicontrol {AVD Arguments}.
+
+    \image qtcreator-android-avd-arguments.png {Startup options for AVDs}
+
+    Set the preferences in \uicontrol {Emulator command-line startup options}.
+    For available options, see \l{Start the emulator from the command line}.
+
+    To start the emulator manually from the terminal, enter:
+
+    \badcode
+    cd <ANDROID_SDK_ROOT>/emulator
+    ./emulator -avd <AVD_NAME>
+    \endcode
+
+    \section1 Remove AVDs
 
     To remove an AVD from the list and the kit selector, select
     \uicontrol {Erase AVD}.
 
-    To specify options for starting an AVD, select \uicontrol {AVD Arguments}.
+    \sa {Android}{How To: Develop for Android}, {Developing for Android}
+*/
 
-    \image qtcreator-android-avd-arguments.png {Startup options for AVDs}
+/*!
+    \page creator-how-to-create-avd.html
+    \previouspage creator-how-tos.html
 
-    Specify the options in \uicontrol {Emulator command-line startup options}.
-    For available options, see \l{Start the emulator from the command line}.
+    \ingroup creator-how-to-android
 
-    \note The Android Emulator has a bug that prevents it from starting on some
-    systems. If an AVD does not start, you can try starting it manually by
-    running the following commands:
+    \title Create an Android Virtual Device (AVD)
 
-    \badcode
-    cd <ANDROID_SDK>/emulator
-    ./emulator -avd <AVD_NAME>
-    \endcode
+    You can create AVDs for:
 
-    \section2 Creating a New AVD
+    \list
+        \li Automotive
+        \li Desktop
+        \li Phone
+        \li Tablet
+        \li TV
+        \li Wear
+    \endlist
 
-    To create new virtual devices:
+    To create a new AVD:
 
     \list 1
-        \li Select \preferences > \uicontrol Devices >
-            \uicontrol Add > \uicontrol {Android Device} to open the
-            \uicontrol {Create New AVD} dialog.
+        \li Go to \preferences > \uicontrol Devices.
+        \li Select \uicontrol Add > \uicontrol {Android Device} >
+            \uicontrol {Start Wizard}.
             \image qtcreator-android-create-avd.png {Create New AVD dialog}
-        \li Set the name, definition, architecture, target API level, and
-            SD card size of the device.
+        \li In \uicontrol Name, give the AVD a name.
+        \li In \uicontrol {Device definition}, select the AVD type, and then
+            select one of the predefined AVDs or \uicontrol Custom for a custom
+            AVD.
+        \li In \uicontrol {Architecture (ABI)}, select an Android system image
+            that you installed on the computer.
+        \li In \uicontrol {Target API level}, select the \l{What is API Level?}
+            {API level} to use for building the application.
+        \li In \uicontrol {SD card size}, set the size of the SD card for the
+            AVD.
+        \li Select \uicontrol {Override existing AVD name} to overwrite an
+            existing AVD with a new AVD using the same name (\c avdmanager \c -f
+            option).
         \li Select \uicontrol OK to create the AVD.
     \endlist
 
     For more advanced options for creating a new AVD, use the command-line tool
     \l{avdmanager} or the Android Studio's native AVD Manager UI.
 
-    \section1 Debugging on Android Devices
+    \sa {Android}{How To: Develop for Android}, {Android Deploy Configuration},
+    {Developing for Android}
+*/
+
+/*!
+    \page creator-how-to-debug-android.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-android
+
+    \title Debug on Android devices
 
     You enable debugging in different ways on different Android devices.
-    Look for \uicontrol {USB Debugging} under \uicontrol {Developer Options}. On
-    some devices, \uicontrol {Developer Options} is hidden and becomes visible
-    only when you tap the \uicontrol {Build number} field in \uicontrol Settings
-    > \uicontrol About several times. For more information, see
-    \l {Configure on-device developer options}.
+    Look for \uicontrol {USB Debugging} under \uicontrol {Developer Options}.
+    Tap \uicontrol {Build number} in \uicontrol Settings > \uicontrol About
+    several times to show \uicontrol {Developer Options}.
 
     Select a \l{glossary-build-config}{debug build configuration} to build
     the application for debugging.
@@ -263,4 +366,7 @@
     \badcode
     Ignoring second debugger -accepting and dropping.
     \endcode
+
+    \sa {Android}{How To: Develop for Android}, {Developing for Android},
+    {Configure on-device developer options}
 */
diff --git a/doc/qtcreator/src/android/creator-projects-settings-run-android.qdoc b/doc/qtcreator/src/android/creator-projects-settings-run-android.qdoc
index 8904f697850..2d264f0e57d 100644
--- a/doc/qtcreator/src/android/creator-projects-settings-run-android.qdoc
+++ b/doc/qtcreator/src/android/creator-projects-settings-run-android.qdoc
@@ -11,13 +11,13 @@
 
     \brief Settings for running applications on Android devices.
 
-    Specify settings for running applications on the \l {kits-tab}{Run device} that
+    Specify settings for running applications on the \l {Kits}{Run device} that
     you select for a kit in \uicontrol Projects > \uicontrol {Build & Run} >
     \uicontrol Run > \uicontrol {Run Settings}.
 
     To run and debug an application on an Android device, you must create
     connections from the development host to the device, as instructed in
-    \l {Connecting Android Devices}.
+    \l {Developing for Android}.
 
     \section1 am Start Options
 
@@ -66,5 +66,5 @@
     \endcode
 
     \sa {Activate kits for a project}, {Configure projects for running},
-    {Connecting Android Devices}
+    {Android}{How To: Develop for Android}, {Kits}
 */
diff --git a/doc/qtcreator/src/android/deploying-android.qdoc b/doc/qtcreator/src/android/deploying-android.qdoc
index 2b3441290f3..75f497cc6d7 100644
--- a/doc/qtcreator/src/android/deploying-android.qdoc
+++ b/doc/qtcreator/src/android/deploying-android.qdoc
@@ -2,11 +2,15 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
     /*!
-    \previouspage creator-deployment.html
     \page creator-deploying-android.html
-    \nextpage creator-deployment-b2qt.html
+    \previouspage creator-reference.html
 
-    \title Deploying to Android
+    \ingroup creator-reference-deploy-configurations
+
+    \title Android Deploy Configuration
+
+    \brief Create Application Packages (APK) or Android App Bundles (AAB) to
+    install and run on devices or to upload to the Google Play store.
 
     Android applications are packaged as ZIP files called Application Packages
     (APK) or Android App Bundles (AAB). You can install and run APK files on a
@@ -26,7 +30,7 @@
 
             All Qt versions do not support AABs. Qt 6.3.0 and later support
             multi-abi builds for applications that you build with CMake. For
-            more information, see \l{Qt for Android - Building User Projects}.
+            more information, see \l{Deploying an Application on Android}.
     \endlist
 
     \note Since \QC 4.12, Ministro is not supported.
@@ -204,7 +208,8 @@
 
     To add OpenSSL libraries, select \uicontrol {Include prebuilt OpenSSL libraries}
     in the \uicontrol {Additional Libraries} group. This will add the OpenSSL
-    include project defined in \l{Specifying Android Device Settings}{device settings}
+    include project defined in \l{Set up Android development environment}
+    {device settings}
     in \uicontrol {Android OpenSSL} group. This can be used for qmake and CMake
     projects.
 
@@ -492,5 +497,8 @@
     \c {android.permission.ACCESS_BACKGROUND_LOCATION} for \l{Qt Positioning}.
 
     To add a permission, select it from the list, and then click \uicontrol Add.
+
+    \sa {Build and Run}{How To: Build and Run},
+    {Android}{How To: Develop for Android}, {Android Run Settings}, {Kits}
 */
 
diff --git a/doc/qtcreator/src/appman/creator-appman-how-to-run.qdoc b/doc/qtcreator/src/appman/creator-appman-how-to-run.qdoc
index a6319a7f2ad..e43e3320656 100644
--- a/doc/qtcreator/src/appman/creator-appman-how-to-run.qdoc
+++ b/doc/qtcreator/src/appman/creator-appman-how-to-run.qdoc
@@ -11,7 +11,7 @@
 
     If you have set up \l{Qt Application Manager}, you can deploy, run, and
     debug applications on the desktop, remote generic SSH Linux targets, or
-    \l{Boot2Qt}{Boot2Qt devices}. The applications can be either
+    \B2Q devices. The applications can be either
     \e {built-in applications} or \e {third-party applications}. The former
     are part of the System UI or the base installation, while the latter
     are dynamically installed, updated, and uninstalled.
@@ -118,7 +118,7 @@
         \li The path to the controller that installs the application package into
             the target system.
 
-            When you run applications on a Boot2Qt device, you can see the device
+            When you run applications on a \B2Q device, you can see the device
             ID here.
     \row
         \li \uicontrol {Application ID}
@@ -141,14 +141,20 @@
         \li Always communicates with the default instance.
     \endtable
 
-    \section1 Profile Qt Quick applications
+    \section1 Analyze the applications
 
-    You can use the \l{Profiling QML Applications}{QML Profiler} to find causes
-    for typical performance problems in your Qt Quick applications, such as
+    Use the \l{Profiling QML Applications}{QML Profiler} to find causes
+    for typical performance problems in Qt Quick applications, such as
     slowness and unresponsive, stuttering user interfaces. You cannot profile an
     in-process runtime as an individual process.
 
-    \sa {Activate kits for a project}, {Connecting Boot2Qt Devices},
-    {Connecting Remote Linux Devices}, {Enable and disable plugins},
-    {Run on many platforms}, {Debugging}, {Profiling QML Applications}
+    Use the \l{Performance Analyzer} to analyze the CPU and memory usage of an
+    application.
+
+    \sa {Activate kits for a project}, {Enable and disable plugins},
+    {\B2Q}{How To: Develop for \B2Q},
+    {Remote Linux}{How To: Develop for remote Linux},
+    {Run on many platforms}, {Debugging}, {Debuggers}, {Debugger},
+    {Developing for \B2Q Devices}, {Developing for Remote Linux Devices},
+    {Profiling QML Applications}, {Kits}
 */
diff --git a/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc b/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc
index 96fabb36244..67b73cf9822 100644
--- a/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc
+++ b/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc
@@ -1,24 +1,33 @@
-// Copyright (C) 2020 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
     /*!
-    \previouspage creator-developing-android.html
     \page creator-developing-baremetal.html
-    \nextpage creator-developing-b2qt.html
+    \previouspage creator-reference.html
 
-    \title Connecting Bare Metal Devices
+    \ingroup creator-reference-devices
 
-    You can configure build and run kits to use Bare Metal tool chains installed
-    on the development host to build applications for Bare Metal devices. You
-    can connect the devices to the development host to run and debug
-    applications on them from \QC using GDB or a hardware debugger. This enables
-    you to debug on small devices that are not supported by the generic remote
-    Linux device plugin.
+    \title Developing for Bare Metal Devices
+
+    \brief Create kits to use Bare Metal toolchains installed on the computer
+    to build applications for and run and debug them on connected Bare Metal
+    devices.
+
+    Run and debug applications on small devices that are not supported
+    by the remote Linux device plugin by using GDB or a hardware debugger.
+
+    \note Enable the Bare Metal plugin to use it.
+
+    Install Bare Metal toolchains on the computer to build applications for
+    Bare Metal devices. Connect the devices to the computer to run and debug
+    applications on them.
 
     \note If you use qmake to build the project and the device does not have
-    Qt libraries, you need a fake Qt installation.
+    Qt libraries, you need a Qt installation that meets the requirements in
+    \l{Self-built Qt versions}. In addition, the \c mkspecs directory needs
+    to be complete enough to parse .pro files.
 
-    The following tool chains are supported for building applications:
+    The following toolchains are supported for building applications:
 
     \list
         \li GCC: Microchip Technology (AVR, AVR32, PIC16, PIC32),
@@ -42,227 +51,286 @@
     the device preferences. You can specify the commands to execute when connecting
     using a particular debug server provider.
 
+    \section1 Debug Server Providers
+
     The following debug server providers are supported when using GDB:
 
     \list
-        \li \l EBlink
-        \li \l J-Link
-        \li \l OpenOCD
-        \li \l ST-Link
+        \li \l {Set up EBlink}{EBlink}
+        \li \l {Set up J-Link}{J-Link}
+        \li \l {Set up OpenOCD}{OpenOCD}
+        \li \l {Set up ST-Link}{ST-Link}
     \endlist
 
     ST-Link and J-Link debug server providers can be used together with
-    the \l {uVision IDE}.
-
-    \note Enable the Bare Metal plugin to use it.
-
-    \section1 Specifying Settings for Debug Server Providers
+    the \l {Set up the uVision IDE}{uVision IDE}.
 
     To create connections to bare metal devices using a debug server provider,
-    select \preferences > \uicontrol Devices > \uicontrol {Bare Metal} >
+    go to \preferences > \uicontrol Devices > \uicontrol {Bare Metal} and select
     \uicontrol Add.
 
     The available settings depend on the debug server provider.
 
-    \section2 EBlink
+    \sa {Add kits}, {Enable and disable plugins},
+    {Bare Metal}{How To: Develop for Bare Metal}
+*/
+
+/*!
+    \page creator-how-to-eblink.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-bare-metal
+
+    \title Set up EBlink
 
     \l{https://github.com/EmBitz/EBlink}{EBlink} is an ARM Cortex-M debug tool
     that supports squirrel scripting, live variables, and hot-plugging.
 
     \image qtcreator-baremetal-eblink.webp {Bare metal device preferences for EBlink}
 
-    To specify settings for \EBlink:
+    To set preferences for \EBlink:
 
     \list 1
 
-        \include creator-baremetal-settings.qdocinc baremetal-common
+        \include creator-baremetal-settings.qdocinc {baremetal-common} {EBlink}
 
-        \li In the \uicontrol {Script file} field, enter the path
+        \li In \uicontrol {Script file}, enter the path
             to a device script file.
 
-        \li In the \uicontrol {Verbosity level} field, enter the level of
+        \li In \uicontrol {Verbosity level}, enter the level of
             verbose logging.
 
-        \li Select the \uicontrol {Connect under reset} check box to use
-            the ST-Link interface. Deselect the check box for hot-plugging.
+        \li Select \uicontrol {Connect under reset} to use
+            the ST-Link interface. Clear it for hot-plugging.
 
-        \li In the \uicontrol Type field, select the interface type.
+        \li In \uicontrol Type, select the interface type.
 
-        \li In the \uicontrol Speed field, enter the interface speed between
+        \li In \uicontrol Speed, enter the interface speed between
             120 and 8000 kilohertz (kHz).
 
-        \li Select the \uicontrol {Disable cache} check box to disable the
+        \li Select \uicontrol {Disable cache} to disable the
             \EBlink flash cache.
 
-        \li Select the \uicontrol {Auto shutdown} check box to automatically
+        \li Select \uicontrol {Auto shutdown} to automatically
             shut down the \EBlink server after disconnecting.
 
         \include creator-baremetal-settings.qdocinc baremetal-init-reset
 
     \endlist
 
-    \section2 J-Link
+    \sa {Bare Metal}{How To: Develop for Bare Metal},
+    {Developing for Bare Metal Devices}
+*/
+
+/*!
+    \page creator-how-to-jlink.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-bare-metal
+
+    \title Set up J-Link
 
     \l{https://www.segger.com/products/debug-probes/j-link/}{J-Link} is a line
     of debug probes by Segger.
 
-    \image qtcreator-baremetal-jlink.webp "Bare metal device preferences for J-Link"
+    \image qtcreator-baremetal-jlink.webp {Bare metal device preferences for J-Link}
 
-    To specify settings for J-Link debug probes:
+    To set preferences for J-Link debug probes:
 
     \list 1
 
-        \include creator-baremetal-settings.qdocinc baremetal-common
+        \include creator-baremetal-settings.qdocinc {baremetal-common} {J-Link}
 
-        \li In the \uicontrol {Host interface} field, select the connection
+        \li In \uicontrol {Host interface}, select the connection
             type, IP or USB, or use the default connection.
 
-        \li In the \uicontrol {Target interface} field, select the target
-            interface type.
+        \li In \uicontrol {Target interface}, select the target interface type.
 
-        \li In the \uicontrol Speed field, enter the interface speed in kHz.
+        \li In \uicontrol Speed, enter the interface speed in kHz.
 
-        \li In the \uicontrol Device field, select the device to connect to.
+        \li In \uicontrol Device, select the device to connect to.
 
-        \li In the \uicontrol {Additional arguments} field, enter
-            arguments for the commands.
+        \li In \uicontrol {Additional arguments}, enter arguments for the
+            commands.
 
         \include creator-baremetal-settings.qdocinc baremetal-init-reset
 
     \endlist
 
-    \section2 OpenOCD
+    \sa {Bare Metal}{How To: Develop for Bare Metal},
+    {Developing for Bare Metal Devices}
+*/
+
+/*!
+    \page creator-how-to-openocd.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-bare-metal
+
+    \title Set up OpenOCD
 
     \l{http://openocd.org}{OpenOCD} (Open On-Chip Debugger) is an on-chip debug
     solution for targets based on the ARM7 and ARM9 family with Embedded-ICE
     (JTAG) facility. It enables source level debugging with the GDB compiled
     for the ARM architecture.
 
-    \image qtcreator-baremetal-openocd.webp "Bare metal device preferences for OpenOCD"
+    \image qtcreator-baremetal-openocd.webp {Bare metal device preferences for OpenOCD}
 
-    To specify settings for \OpenOCD:
+    To set preferences for \OpenOCD:
 
     \list 1
 
-        \include creator-baremetal-settings.qdocinc baremetal-common
+        \include creator-baremetal-settings.qdocinc {baremetal-common} {OpenOCD}
 
-        \li In the \uicontrol {Root scripts directory} field, enter the
+        \li In \uicontrol {Root scripts directory}, enter the
             path to the directory that has configuration scripts.
 
-        \li In the \uicontrol {Configuration file} field, enter the path
+        \li In \uicontrol {Configuration file}, enter the path
             to the device configuration file.
 
-        \li In the \uicontrol {Additional arguments} field, enter
+        \li In \uicontrol {Additional arguments}, enter
             arguments for the commands.
 
         \include creator-baremetal-settings.qdocinc baremetal-init-reset
 
     \endlist
 
-    \section2 St-Link
+    \sa {Bare Metal}{How To: Develop for Bare Metal},
+    {Developing for Bare Metal Devices}
+*/
+
+/*!
+    \page creator-how-to-stlink.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-bare-metal
+
+    \title Set up St-Link
 
     \l{https://www.st.com/en/development-tools/stm32-programmers.html#products}
     {ST-LINK Utility} is used for programming STM32 microcontrollers.
 
-    \image qtcreator-baremetal-stlink.webp "Bare metal device preferences for St-Link"
+    \image qtcreator-baremetal-stlink.webp {Bare metal device preferences for St-Link}
 
-    To specify settings for St-Link:
+    To set preferences for St-Link:
 
     \list 1
 
-        \include creator-baremetal-settings.qdocinc baremetal-common
+        \include creator-baremetal-settings.qdocinc {baremetal-common} {St-Link}
 
-        \li In the \uicontrol {Verbosity level} field, enter the level of
+        \li In \uicontrol {Verbosity level}, enter the level of
             verbose logging.
 
-        \li Select the \uicontrol {Extended mode} check box to continue
+        \li Select \uicontrol {Extended mode} to continue
             listening for connection requests after the connection is closed.
 
-        \li Select the \uicontrol {Reset on connection} check box to
+        \li Select \uicontrol {Reset on connection} to
             reset the board when the connection is created.
 
-        \li In the \uicontrol Version field, select the transport
+        \li In \uicontrol Version, select the transport
             layer type supported by the device.
 
         \include creator-baremetal-settings.qdocinc baremetal-init-reset
 
     \endlist
 
-    \section2 uVision IDE
+    \sa {Bare Metal}{How To: Develop for Bare Metal},
+    {Developing for Bare Metal Devices}
+*/
+
+/*!
+    \page creator-how-to-uvision.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-bare-metal
+
+    \title Set up the uVision IDE
 
     \l{http://www.keil.com/support/man/docs/uv4/uv4_overview.htm}{uVision} is
-    an IDE for developing applications for embedded devices. Applications can
-    be debugged by using uVision Simulator or directly on hardware by using
+    an IDE for developing applications for embedded devices. To debug
+    applications, use uVision Simulator, or debug directly on hardware by using
     St-Link and J-Link.
 
-    You can view the current state of peripheral registers in the
-    \uicontrol {Peripheral Registers} view in Debug mode. The view
-    is hidden by default.
+    The \uicontrol {Peripheral Registers} view in Debug mode shows the current
+    state of peripheral registers. The view is hidden by default.
 
-    \section3 uVision Simulator
+    \section1 uVision Simulator
 
-    \image qtcreator-baremetal-uvision-simulator.png "Bare metal device preferences for uVision Simulator"
+    \image qtcreator-baremetal-uvision-simulator.png {Bare metal device preferences for uVision Simulator}
 
-    To specify settings for uVision Simulator:
+    To set preferences for uVision Simulator:
 
     \list 1
 
-        \include creator-baremetal-settings.qdocinc uvision-common
+        \include creator-baremetal-settings.qdocinc {uvision-common} {uVision Simulator}
 
-        \li Select the \uicontrol {Limit speed to real-time} check box to limit
+        \li Select \uicontrol {Limit speed to real-time} to limit
             the connection speed.
 
         \li Select \uicontrol Apply to add the debug server provider.
 
        \endlist
 
-    \section3 uVision St-Link or JLink Debugger
+    \section1 uVision St-Link or JLink Debugger
 
-    \image qtcreator-baremetal-uvision-st-link.png "Bare metal device preferences for uVision St-Link"
+    \image qtcreator-baremetal-uvision-st-link.png {Bare metal device preferences for uVision St-Link}
 
-    To specify settings for uVision St-Link or JLink Debugger:
+    To set preferences for uVision St-Link or JLink Debugger:
 
     \list 1
 
-        \include creator-baremetal-settings.qdocinc uvision-common
+        \include creator-baremetal-settings.qdocinc {uvision-common} {uVision St-Link or uVision JLink}
 
-        \li In the \uicontrol {Adapter options} field specify the adapter
+        \li In \uicontrol {Adapter options} specify the adapter
             interface type and speed in MHz.
 
         \li Select \uicontrol Apply to add the debug server provider.
 
     \endlist
 
-    \section1 Adding Bare Metal Devices
+    \sa {Bare Metal}{How To: Develop for Bare Metal},
+    {Developing for Bare Metal Devices}
+*/
 
-    \image qtcreator-baremetal-devices.png "Bare Metal device preferences"
+/*!
+    \page creator-how-to-add-bare-metal-devices.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-bare-metal
+    \ingroup creator-how-to-manage-kits
+
+    \title Add Bare Metal devices
+
+    Run and debug applications on small devices that are not supported
+    by the remote Linux device plugin by using GDB or a hardware debugger.
 
     To add a bare metal device:
 
         \list 1
 
-           \li Select \preferences > \uicontrol Devices
-                > \uicontrol Add > \uicontrol {Bare Metal Device} >
+           \li Go to \preferences > \uicontrol Devices.
+               \image qtcreator-baremetal-devices.png {Bare Metal device preferences}
+           \li Select \uicontrol Add > \uicontrol {Bare Metal Device} >
                 \uicontrol {Start Wizard}.
 
-           \li In the \uicontrol {Debug server provider} field, select a debug
+           \li In \uicontrol {Debug server provider}, select a debug
                server provider.
 
             \li Select \uicontrol Apply to add the device.
 
         \endlist
 
-    \section1 Building for and Running on Bare Metal Devices
+    \section1 Add the device to a kit
 
     To add a kit for building applications and running them on bare metal
-    devices, select \preferences > \uicontrol Kits
-    > \uicontrol Add. For more information, see \l{Add kits}.
+    devices, go to \preferences > \uicontrol Kits and select \uicontrol Add.
 
-    \image qtcreator-baremetal-kit.png "Kit preferences for Bare Metal"
+    \image qtcreator-baremetal-kit.png {Kit preferences for Bare Metal}
 
-    You can build applications for and run them on bare metal devices
-    in the same way as for and on the desktop. For more information, see
-    \l{Build for many platforms} and \l{Run on many platforms}.
+    Build applications for and run them on bare metal devices
+    in same way as for and on the desktop.
 
-    \sa {Enable and disable plugins}
+    \sa {Add kits}, {Build for many platforms},
+    {Bare Metal}{How To: Develop for Bare Metal}, {Run on many platforms},
+    {Developing for Bare Metal Devices}
 */
diff --git a/doc/qtcreator/src/baremetal/creator-baremetal-settings.qdocinc b/doc/qtcreator/src/baremetal/creator-baremetal-settings.qdocinc
index ea35fe9855b..a6688da00b7 100644
--- a/doc/qtcreator/src/baremetal/creator-baremetal-settings.qdocinc
+++ b/doc/qtcreator/src/baremetal/creator-baremetal-settings.qdocinc
@@ -1,16 +1,19 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 //! [baremetal-common]
 
-    \li In the \uicontrol Name field, enter a name for the connection.
-    \li In the \uicontrol {Startup mode} field, select the mode to start
+    \li Go to \preferences > \uicontrol Devices > \uicontrol {Bare Metal}.
+    \li Select \uicontrol Add.
+    \li Select \uicontrol {\1}.
+    \li In \uicontrol Name, enter a name for the connection.
+    \li In \uicontrol {Startup mode}, select the mode to start
         the debug server provider in.
-    \li In the \uicontrol {Peripheral description file} field, specify a path to
+    \li In \uicontrol {Peripheral description file}, specify a path to
         a file that describes the peripherals on the device.
-    \li In the \uicontrol Host field, select the host name and port number
+    \li In \uicontrol Host, select the host name and port number
         to connect to the debug server provider.
-    \li In the \uicontrol {Executable file} field, enter the path to the
+    \li In \uicontrol {Executable file}, enter the path to the
         debug server provider executable.
 
 //! [baremetal-common]
@@ -18,10 +21,10 @@
 
 //! [baremetal-init-reset]
 
-    \li In the \uicontrol {Init commands} field, enter the commands
-        to  execute when initializing the connection.
-    \li In the \uicontrol {Reset commands} field, enter the commands
-        to  execute when resetting the connection.
+    \li In \uicontrol {Init commands}, enter the commands
+        to execute when initializing the connection.
+    \li In \uicontrol {Reset commands}, enter the commands
+        to execute when resetting the connection.
     \li Select \uicontrol Apply to add the debug server provider.
 
 //! [baremetal-init-reset]
@@ -29,14 +32,16 @@
 
 //! [uvision-common]
 
-    \li In the \uicontrol Name field, enter a name for the connection.
-    \li In the \uicontrol Host field, select the host name and port
+    \li Go to \preferences > \uicontrol Devices > \uicontrol {Bare Metal}.
+    \li Select \uicontrol Add.
+    \li Select \uicontrol {\1}.
+    \li In \uicontrol Name, enter a name for the connection.
+    \li In \uicontrol Host, select the host name and port
         number to connect to the debug server provider.
-    \li In the \uicontrol {Tools file path} field, enter the path to
+    \li In \uicontrol {Tools file path}, enter the path to
         the Keil toolset configuration file.
-    \li In the \uicontrol {Target device} field, select the device to
-        debug.
-    \li In the \uicontrol {Target driver} field, select the driver for
+    \li In \uicontrol {Target device}, select the device to debug.
+    \li In \uicontrol {Target driver}, select the driver for
         connecting to the target device.
 
 //! [uvision-common]
diff --git a/doc/qtcreator/src/cmake/creator-how-to-debug-cmake-files.qdoc b/doc/qtcreator/src/cmake/creator-how-to-debug-cmake-files.qdoc
index ac3ffb12a90..538bd7cd9a0 100644
--- a/doc/qtcreator/src/cmake/creator-how-to-debug-cmake-files.qdoc
+++ b/doc/qtcreator/src/cmake/creator-how-to-debug-cmake-files.qdoc
@@ -20,7 +20,7 @@
 
     \list 1
         \li In the \uicontrol Edit mode, set breakpoints in a CMake file.
-        \li Select \uicontrol Debug > \uicontrol {Start Debugging} >
+        \li Go to \uicontrol Debug > \uicontrol {Start Debugging} >
             \uicontrol {Start CMake Debugging}.
             \image qtcreator-debugger-cmake.webp {DAP CMake Preset view in the Debug mode}
     \endlist
@@ -28,6 +28,5 @@
     When the application stops at a breakpoint, you can examine data in the
     \uicontrol Debug mode views.
 
-    \sa {Debugging},{Examining Data},{Debug Mode Views},{Setting Breakpoints},
-    {CMake}
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}, {CMake}
 */
diff --git a/doc/qtcreator/src/cmake/creator-how-to-profile-cmake-code.qdoc b/doc/qtcreator/src/cmake/creator-how-to-profile-cmake-code.qdoc
index fc8cdd122cd..a0f7b06c250 100644
--- a/doc/qtcreator/src/cmake/creator-how-to-profile-cmake-code.qdoc
+++ b/doc/qtcreator/src/cmake/creator-how-to-profile-cmake-code.qdoc
@@ -19,5 +19,5 @@
 
     \image qtcreator-cmake-profiler.webp {CMake profiling information in Chrome Trace Format Visualizer}
 
-    \sa {CMake}, {Visualizing Chrome Trace Events}
+    \sa {CMake}, {Chrome Trace Format Visualizer}
 */
diff --git a/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc b/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
index aac591854cd..c3b9692c5ae 100644
--- a/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
+++ b/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
@@ -11,15 +11,15 @@
 
     \brief Settings for building applications with CMake.
 
-    Specify build settings for the selected \l{glossary-buildandrun-kit}{kit} in
+    Specify build settings for the selected \l{Kits}{kit} in
     \uicontrol Projects > \uicontrol {Build & Run} > \uicontrol Build >
     \uicontrol {Build Settings}.
 
     Configuring medium-sized to large CMake projects in \QC can be a
     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 \uicontrol {Initial Configuration} in
+    \QC creates an initial configuration for you based on the \l{Kits}
+    {kit preferences} and displays it in \uicontrol {Initial Configuration} in
     the \uicontrol {Build Settings} of the project.
     Or, you can use CMake presets to configure CMake.
 
diff --git a/doc/qtcreator/src/cmake/creator-projects-cmake-presets.qdoc b/doc/qtcreator/src/cmake/creator-projects-cmake-presets.qdoc
index 050b0b1f8c7..4e0160ba9eb 100644
--- a/doc/qtcreator/src/cmake/creator-projects-cmake-presets.qdoc
+++ b/doc/qtcreator/src/cmake/creator-projects-cmake-presets.qdoc
@@ -15,13 +15,14 @@
     \c CMakeUserPresets.json has options for your local builds.
 
     Create the presets files in the format described in
-    \l{https://cmake.org/cmake/help/latest/manual/cmake-presets.7.html}
+    \l{https://cmake.org/cmake/help/v3.24/manual/cmake-presets.7.html}
     {cmake-presets(7)} and store them in the project's root directory.
     You can then see them in the \l {Projects} view.
 
-    \QC supports presets up to version 3 (introduced in CMake 3.21), but does not
-    enforce version checking. It reads and uses all the fields from version 3 if
-    present. It does not support test presets.
+    \QC supports \e configure and \e build presets up to version 5
+    (introduced in CMake 3.24), but does not enforce version checking.
+    It reads and uses all the fields from version 5 if present.
+    It does not support \e test presets.
 
     You can import the presets the first time you \l {Open projects}
     {open a project}, when no \c CMakeLists.txt.user file exists or you have
@@ -44,7 +45,7 @@
     \c NOT_COMMON_VALUE is displayed in \uicontrol {Initial Parameters}
     and \c AN_ENVIRONMENT_FLAG in the environment configuration field.
 
-    \badcode
+    \code
     {
       "version": 1,
       "configurePresets": [
@@ -57,12 +58,26 @@
             },
           "environment": {
             "AN_ENVIRONMENT_FLAG": "1"
+            }
+          },
+          "vendor": {
+            "qt.io/QtCreator/1.0": {
+               "AskBeforePresetsReload": false,
+               "AskReConfigureInitialParams": false,
+               "AutorunCMake": false,
+               "PackageManagerAutoSetup": false,
+               "ShowAdvancedOptionsByDefault": true,
+               "ShowSourceSubFolders": false,
+               "UseJunctionsForSourceAndBuildDirectories": true
+               }
           }
-        }
       ]
     }
     \endcode
 
+    For more information about the CMake project settings in the \c vendor
+    section, see \l {Override CMake settings for a project}.
+
     \section1 MinGW Example
 
     The following example configures a Qt project with:
@@ -74,9 +89,10 @@
         \li generator – MinGW Makefiles
         \li path to a CMake executable
         \li path to the Qt installation via \c CMAKE_PREFIX_PATH
+        \li GNU gdb 11.2.0 for MinGW 11.2.0 64-bit debugger
     \endlist
 
-    \badcode
+    \code
     {
       "version": 1,
       "configurePresets": [
@@ -92,8 +108,17 @@
           },
           "environment": {
             "PATH": "C:/Qt/Tools/mingw1120_64/bin;$penv{PATH}"
-          }
-        }
+          },
+          "vendor": {
+            "qt.io/QtCreator/1.0": {
+              "debugger": {
+                "DisplayName": "GNU gdb 11.2.0 for MinGW 11.2.0 64-bit",
+                "Abis": ["x86-windows-msys-pe-64bit"],
+                "Binary": "C:/Qt/Tools/mingw1120_64/bin/gdb.exe",
+                "EngineType": 1,
+                "Version": "11.2.0"
+              }
+            }
       ]
     }
     \endcode
@@ -107,7 +132,7 @@
     generator, add \c Debug and \c Release build steps, and specify the path
     to \c ninja.exe as a value of the \c CMAKE_MAKE_PROGRAM variable:
 
-    \badcode
+    \code
     {
       "version": 2,
       "configurePresets": [
@@ -156,7 +181,7 @@
 
     For example:
 
-    \badcode
+    \code
     "generator": "Ninja Multi-Config",
     "toolset": {
       "value": "v142,host=x64",
@@ -172,7 +197,7 @@
     in the \c PATH, you might also have to specify the compiler to use in
     \c cacheVariables or \c environmentVariables:
 
-    \badcode
+    \code
     "generator": "Ninja Multi-Config",
     "toolset": {
       "value": "v142,host=x64",
@@ -188,13 +213,57 @@
     }
     \endcode
 
+    \section1 Cross-Compilation Example
+
+    The following example configures a Qt project for cross-compilation on \macos
+    for Windows and running with the \c wine emulator on \macos:
+
+    \list
+        \li generator – Ninja
+        \li build directory – \c <sourceDir>/build-release
+        \li LLVM/MinGW toolchain
+        \li configuration type – \c CMAKE_BUILD_TYPE as \c Release
+        \li LLDB 18.1.6 debugger
+        \li \c wine emulator
+    \endlist
+
+    \code
+    {
+      "version": 4,
+      "configurePresets": [
+        {
+          "name": "llvm-mingw",
+          "displayName": "LLVM-MinGW 18.1.6",
+          "generator": "Ninja",
+          "binaryDir": "${sourceDir}/build-release",
+          "toolchainFile": "llvm-mingw.cmake",
+          "cacheVariables": {
+            "CMAKE_BUILD_TYPE": "Release",
+            "CMAKE_CROSSCOMPILING_EMULATOR": "/opt/homebrew/bin/wine"
+          },
+          "vendor": {
+            "qt.io/QtCreator/1.0": {
+              "debugger": {
+                "DisplayName": "LLDB 18.1.6 (CMake Preset)",
+                "Abis": ["x86-darwin-generic-mach_o-64bit", "arm-darwin-generic-mach_o-64bit"],
+                "Binary": "/Users/jdoe/llvm-mingw/bin/lldb",
+                "EngineType": 256,
+                "Version": "18.1.6"
+              }
+            }
+          }
+        }
+      ]
+    }
+    \endcode
+
     \section1 Using Conditions
 
     The following configure presets are used if they match \c condition. That is,
     if the \c hostSystemName equals \c Linux, the \c linux presets are used and
     if it equals \c Windows, the \c windows presets are used.
 
-    \badcode
+    \code
     {
       "version": 3,
       "configurePresets": [
diff --git a/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc b/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
index 6c4b7d8ef09..524163a2894 100644
--- a/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
+++ b/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
@@ -49,7 +49,7 @@
 
     \sa {Configure projects for building}, {Configure projects for running},
     {Build with CMake}{How To: Build with CMake}, {CMake Build Configuration},
-    {Debug CMake project files}, {Deploying to Remote Linux}, {Open projects},
+    {Debug CMake project files}, {Remote Linux Deploy Configuration}, {Open projects},
     {Use compilation databases}
 */
 
@@ -65,8 +65,7 @@
     a tree and lists all files that are part of the project.
     \QC automatically runs CMake to refresh project information in the
     view when you edit a \c CMakeLists.txt configuration file
-    in a project. Project information is also automatically refreshed when
-    you build the project.
+    in a project. Also, refreshes project information when you build the project.
 
     \image qtcreator-projects-view-edit.png {CMake project in Projects view}
 
@@ -121,11 +120,14 @@
             tooltips
         \li Selecting any of the above elements and pressing \key F1 to show
             its documentation
-        \li Switching to the Help mode
+        \li Switching to the \uicontrol Help mode
     \endlist
 
-    \sa {Build with CMake}{How To: Build with CMake}, {CMake},
-    {Read Documentation}{How To: Read Documentation}
+    To view the documentation online, open it in the \uicontrol Help mode and
+    select \inlineimage icons/online.png (\uicontrol {Open Online Documentation}).
+
+    \sa {Build with CMake}{How To: Build with CMake},
+    {Read Documentation}{How To: Read Documentation}, {CMake}
 */
 
 /*!
@@ -133,12 +135,13 @@
     \previouspage creator-how-tos.html
 
     \ingroup creator-how-to-build-with-cmake
+    \ingroup creator-how-to-manage-kits
 
     \title Add CMake tools
 
     \QC automatically detects the CMake executable that you specify in the
     \c PATH. You can add paths to other CMake executables and use them in
-    different build and run \l{glossary-buildandrun-kit}{kits}.
+    different build and run \l{Kits}{kits}.
 
     To see the CMake installations that \QC automatically detects:
 
@@ -183,8 +186,8 @@
 
     \image qtcreator-kits-cmake.png {Kits preferences}
 
-    \sa {Build with CMake}{How To: Build with CMake}, {CMake}, {Add kits},
-    {kits-tab}{Kits}
+    \sa {Build with CMake}{How To: Build with CMake},
+    {Manage Kits}{How To: Manage Kits}, {CMake}, {Kits}
 */
 
 /*!
diff --git a/doc/qtcreator/src/cmake/creator-projects-settings-cmake.qdoc b/doc/qtcreator/src/cmake/creator-projects-settings-cmake.qdoc
new file mode 100644
index 00000000000..24f65674e30
--- /dev/null
+++ b/doc/qtcreator/src/cmake/creator-projects-settings-cmake.qdoc
@@ -0,0 +1,75 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+    \page creator-how-to-configure-cmake-for-project.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-projects-configure
+    \ingroup creator-how-to-build-with-cmake
+
+    \title Override CMake settings for a project
+
+    To override CMake settings for the current project:
+
+    \list 1
+        \li Go to \uicontrol Projects > \uicontrol {Project Settings} >
+            \uicontrol CMake.
+            \image qtcreator-project-settings-cmake.webp {CMake settings for a project}
+        \li Clear \uicontrol {Use global settings}.
+        \li Configure CMake for the project.
+    \endlist
+
+    Your choices override the values you set in \preferences > \uicontrol CMake >
+    \uicontrol General.
+
+    \table
+    \header
+        \li Setting
+        \li Value
+        \li Read More
+    \row
+        \li Autorun CMake
+        \li Runs CMake to refresh project information when you edit
+            a \c CMakeLists.txt configuration file in a project. Also,
+            refreshes project information when you build the project.
+        \li \l{View CMake project contents}
+    \row
+        \li Package manager auto setup
+        \li Sets up the \l {Conan Package Manager}{Conan} or
+            \l {vcpkg Package Manager}{vcpkg} package manager for use with CMake.
+        \li \l{Using CMake with Package Managers}
+    \row
+        \li Ask before re-configuring with initial parameters
+        \li Asks before acting when you select
+            \uicontrol {Re-configure with Initial Variables}.
+        \li \l{Re-configuring with Initial Variables}
+    \row
+        \li Ask before reloading CMake presets
+        \li Asks before acting when you select \uicontrol Build >
+            \uicontrol {Reload CMake Presets}.
+        \li \l{CMake Presets}
+    \row
+        \li Show subfolders inside source group folders
+        \li Hides subfolder names and arranges the files according to their
+            source group in the \uicontrol Projects view.
+        \li \l{Hide subfolder names in Projects view}
+    \row
+        \li Show advanced options by default
+        \li Shows all CMake variables by default in
+            \uicontrol {Initial Configuration} and
+            \uicontrol {Current Configuration}.
+        \li \l{Viewing Advanced Variables}
+    \row
+        \li Use junctions for CMake configuration and build operations
+        \li On Windows, uses junction points for CMake configure, build, and
+            install operations.
+        \li \l{Using Junction Points on Windows}
+    \endtable
+
+    You can set these preferences as \l{Configure Presets}{CMake presets} or in
+    a \l{Share project settings}{CMakeLists.txt.shared} file.
+
+    \sa {Build with CMake}{How To: Build with CMake}, {CMake},
+    {Configuring Projects}
+*/
diff --git a/doc/qtcreator/src/conan/creator-projects-conan-building.qdoc b/doc/qtcreator/src/conan/creator-projects-conan-building.qdoc
index 55f71c40d05..81ecd115756 100644
--- a/doc/qtcreator/src/conan/creator-projects-conan-building.qdoc
+++ b/doc/qtcreator/src/conan/creator-projects-conan-building.qdoc
@@ -11,7 +11,7 @@
 
     \brief Settings for building applications with the Conan package manager.
 
-    Specify build settings for the selected \l{glossary-buildandrun-kit}{kit} in
+    Specify build settings for the selected \l{Kits}{kit} in
     \uicontrol Projects > \uicontrol {Build & Run} > \uicontrol Build >
     \uicontrol {Build Settings}.
 
@@ -30,5 +30,5 @@
     Select \uicontrol {Build missing} to build packages from source if binary
     packages are not found.
 
-    \sa {Conan Package Manager}
+    \sa {Activate kits for a project}, {Conan Package Manager}
 */
diff --git a/doc/qtcreator/src/conan/creator-projects-conan.qdoc b/doc/qtcreator/src/conan/creator-projects-conan.qdoc
index 0e7229ba7c3..67cdd9141ae 100644
--- a/doc/qtcreator/src/conan/creator-projects-conan.qdoc
+++ b/doc/qtcreator/src/conan/creator-projects-conan.qdoc
@@ -44,9 +44,16 @@
     Then, you must edit the build settings of the project to specify the
     location of the file and the contents of the Conan install command.
 
-    Alternatively, you can automatically set up the Conan package manager for
-    use with CMake.
+    \section1 Automatic Package Manager Setup
+
+    To automatically set up the Conan package manager for use with CMake,
+    go to \uicontrol Projects > \uicontrol {Project Settings} > \uicontrol CMake,
+    and select \uicontrol {Package manager auto setup}.
+
+    To turn off the automatic package manager setup, set
+    \c PackageManagerAutoSetup to \c false in \l{Configure Presets}
+    {CMake presets} or a \l{Share project settings}{CMakeLists.txt.shared} file.
 
     \sa {Conan Build Configuration}, {Enable and disable plugins},
-    {Using CMake with Package Managers}
+    {Override CMake settings for a project}, {Using CMake with Package Managers}
 */
diff --git a/doc/qtcreator/src/debugger/creator-debug-views.qdoc b/doc/qtcreator/src/debugger/creator-debug-views.qdoc
index 149ac127a8c..8880b64218b 100644
--- a/doc/qtcreator/src/debugger/creator-debug-views.qdoc
+++ b/doc/qtcreator/src/debugger/creator-debug-views.qdoc
@@ -6,12 +6,17 @@
     \if defined(qtdesignstudio)
     \previouspage creator-debugging-qml.html
     \else
-    \previouspage creator-debug-mode.html
+    \previouspage creator-reference.html
     \endif
-    \nextpage creator-breakpoints-view.html
+
+    \ingroup creator-reference-debugger-views
+    \ingroup studio-debugger-views
 
     \title Viewing Call Stack Trace
 
+    \brief View the nested function calls leading to the current position as a
+    call stack trace.
+
     When the application being debugged is interrupted, \QC displays the nested
     function calls leading to the current position as a call stack trace. This
     stack trace is built up from call stack frames, each representing a
@@ -40,19 +45,27 @@
     from the stopped executable and prepends the frames to the C++ frames,
     should it find any. You can click a frame in the QML stack to open the QML
     file in the editor.
+
+    \if defined(qtcreator)
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+    \endif
 */
 
 /*!
     \page creator-breakpoints-view.html
-    \previouspage creator-stack-view.html
     \if defined(qtdesignstudio)
-    \nextpage creator-locals-view.html
+    \previouspage creator-debugging-qml.html
     \else
-    \nextpage creator-threads-view.html
+    \previouspage creator-reference.html
     \endif
 
+    \ingroup creator-reference-debugger-views
+    \ingroup studio-debugger-views
+
     \title Setting Breakpoints
 
+    \brief Set breakpoints to interrupt the application.
+
     You can associate breakpoints with:
 
     \list
@@ -128,7 +141,27 @@
 
     \image qtcreator-debug-breakpoints.webp {Breakpoints view}
 
-    \section1 Adding Breakpoints
+    \if defined(qtdesignstudio)
+    For more information, see:
+
+    \generatelist studio-how-to-debug
+    \else
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+    \endif
+*/
+
+/*!
+    \page creator-how-to-add-breakpoints.html
+    \if defined(qtdesignstudio)
+    \previouspage creator-breakpoints-view.html
+    \else
+    \previouspage creator-how-tos.html
+    \endif
+
+    \ingroup creator-how-to-debug
+    \ingroup studio-how-to-debug
+
+    \title Add breakpoints
 
     To add breakpoints:
 
@@ -139,7 +172,7 @@
             \list
 
                 \li In the code editor, click the left margin or press \key F9
-                    (\key F8 on \macos) on a particular line you want the
+                    (\key F8 on \macos) on a particular line where you want the
                     application to stop.
 
                 \li In the \uicontrol {Breakpoint Preset} view or the
@@ -152,13 +185,13 @@
                     \endlist
             \endlist
 
-        \li In the \uicontrol {Breakpoint type} field, select the location in the
+        \li In \uicontrol {Breakpoint type}, select the location in the
             application code where you want the application to stop.
 
             \image qtcreator-add-breakpoint.webp {Add Breakpoints} dialog
     \endlist
 
-    Deselect the \uicontrol Enabled check box to make the breakpoint temporarily
+    Clear \uicontrol Enabled to make the breakpoint temporarily
     inoperative as if you had deleted it, but keep the information about the
     breakpoint, so that you can enable it again later.
 
@@ -216,59 +249,37 @@
     \endtable
 
     \if defined(qtcreator)
-    \section1 Specifying Breakpoint Settings
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+    \endif
+*/
 
-    You can specify settings for breakpoints in \preferences >
-    \uicontrol Debugger. For more information, see \l{Debugger Preferences}.
-
-    \image qtcreator-debugger-general-options.png {General tab in Debugger preferences}
-
-    To use a full absolute path in breakpoints, select the
-    \uicontrol {Set breakpoints using a full absolute path} check box.
-
-    GDB and CDB enable setting breakpoints on source lines for which no code
-    was generated. In such situations, the breakpoint is shifted to the next
-    source code line for which the code was actually generated. To reflect
-    such temporary changes by moving the breakpoint markers in the source code
-    editor, select \uicontrol GDB > \uicontrol {Adjust breakpoint locations}
-    or \uicontrol CDB > \uicontrol {Correct breakpoint location}.
-
-    When using GDB as backend, you can extend the ordinary GDB
-    breakpoint class by using Python. Select \uicontrol GDB >
-    \uicontrol {Use pseudo message tracepoints}.
-
-    When using CDB as backend, you can specify that the debugger should break on
-    specific events, such as C++ exceptions, thread creation or exit, loading or
-    unloading \l{Viewing Modules}{application modules}, or particular output.
-    Select the appropriate check boxes in the \uicontrol CDB >
-    \uicontrol {Break on} group. To disable first-chance break on access
-    violation exceptions, select the \uicontrol {Ignore first chance access
-    violations} check box. The second occurrence of an access violation will
-    break into the debugger.
-
-    You can automatically add breakpoints on some functions to catch error
-    and warning messages. For more information, see \l{Specifying CDB Settings}
-    and \l{Specifying GDB Settings}.
-
-    For more information on breakpoints, see
-    \l{http://sourceware.org/gdb/onlinedocs/gdb/Breakpoints.html#Breakpoints}
-    {Breakpoints, Watchpoints, and Catchpoints} in GDB documentation.
+/*!
+    \page creator-how-to-manage-breakpoints.html
+    \if defined(qtdesignstudio)
+    \previouspage creator-breakpoints-view.html
+    \else
+    \previouspage creator-how-tos.html
     \endif
 
-    \section1 Moving Breakpoints
+    \ingroup creator-how-to-debug
+    \ingroup studio-how-to-debug
+
+    \title Manage breakpoints
+
+    \section1 Move breakpoints
 
     To move a breakpoint:
 
     \list
-        \li Drag and drop a breakpoint marker to another line
+        \li Drag a breakpoint marker to another line
             in the text editor.
         \li In the \uicontrol {Breakpoint Preset} view or the
              \uicontrol Breakpoints view, select
              \uicontrol {Edit Selected Breakpoints}, and set the
-             line number in the \uicontrol {Line number} field.
+             line number in \uicontrol {Line number}.
     \endlist
 
-    \section1 Deleting Breakpoints
+    \section1 Delete breakpoints
 
     To delete breakpoints:
 
@@ -288,9 +299,9 @@
 
     \endlist
 
-    \section1 Enabling and Disabling Breakpoints
+    \section1 Turn breakpoints on and off
 
-    To temporarily disable a breakpoint without deleting it and losing associated
+    To temporarily turn off a breakpoint without deleting it and losing associated
     data like conditions and commands:
 
     \list
@@ -316,7 +327,23 @@
     Other than data breakpoints retain their enabled or disabled state when the
     debugged application is restarted.
 
-    \section1 Setting Data Breakpoints
+    \if defined(qtcreator)
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+    \endif
+*/
+
+/*!
+    \page creator-how-to-set-data-breakpoints.html
+    \if defined(qtdesignstudio)
+    \previouspage creator-breakpoints-view.html
+    \else
+    \previouspage creator-how-tos.html
+    \endif
+
+    \ingroup creator-how-to-debug
+    \ingroup studio-how-to-debug
+
+    \title Set data breakpoints
 
     A \e {data breakpoint} stops the application when data is read or written at the
     specified address.
@@ -328,11 +355,10 @@
         \li In the \uicontrol {Breakpoint Preset} or \uicontrol Breakpoints
             view, select \uicontrol {Add Breakpoint} in the context menu.
 
-        \li In the \uicontrol {Breakpoint type} field, select
+        \li In \uicontrol {Breakpoint type}, select
             \uicontrol {Break on data access at fixed address}.
 
-        \li In the \uicontrol Address field, specify the address of the memory
-            block.
+        \li In \uicontrol Address, specify the address of the memory block.
 
         \li Select \uicontrol OK.
 
@@ -349,21 +375,25 @@
     it manually.
 
     \if defined(qtcreator)
-    \sa {Debug CMake project files}
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
     \endif
 */
 
 /*!
     \page creator-locals-view.html
     \if defined(qtdesignstudio)
-    \previouspage creator-breakpoints-view.html
+    \previouspage creator-debugging-qml.html
     \else
-    \previouspage creator-source-files-view.html
+    \previouspage creator-reference.html
     \endif
-    \nextpage creator-expressions-view.html
+
+    \ingroup creator-reference-debugger-views
+    \ingroup studio-debugger-views
 
     \title Local Variables and Function Parameters
 
+    \brief Inspect local variables and function parameters.
+
     The \uicontrol {Locals} view consists of the \uicontrol Locals pane and the
     \uicontrol {Return Value} pane (hidden when empty).
 
@@ -388,18 +418,18 @@
     //! [0]
     \list
         \li Add and remove expression evaluators
-        \li Change \l{Changing Value Display format}{value display format}
+        \li \l{Change value display format}
         \li Expand and collapse view contents
         \li Copy view contents or expression values to the clipboard
         \li Open view contents in an editor
         \li Open memory editor
         \li Set data breakpoints
-        \li Use \l{Using Debugging Helpers}{debugging helpers}
+        \li Use \l{Debugging Helpers}{debugging helpers}
         \li Show and hide tooltips in the view when debugging
         \li Dereference pointers automatically
         \li Sort members of classes and structs alphabetically
         \li Use dynamic object type for display
-        \li Set \l{Debugger Preferences}{debugger preferences}
+        \li Set debugger preferences
     \endlist
     //! [0]
     \endif
@@ -410,19 +440,27 @@
     objects will be displayed. Select \uicontrol {Use dynamic object type for
     display} in the context menu. Keep in mind that choosing the dynamic type
     might be slower.
+
+    \if defined(qtcreator)
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+    \endif
 */
 
 /*!
     \page creator-expressions-view.html
-    \previouspage creator-locals-view.html
     \if defined(qtdesignstudio)
-    \nextpage creator-qml-debugging-example.html
+    \previouspage creator-debugging-qml.html
     \else
-    \nextpage creator-registers-view.html
+    \previouspage creator-reference.html
     \endif
 
+    \ingroup creator-reference-debugger-views
+    \ingroup studio-debugger-views
+
     \title Evaluating Expressions
 
+    \brief Compute values of arithmetic expressions or function calls.
+
     To compute values of arithmetic expressions or function calls, use
     expression evaluators in the \uicontrol Expressions view.
 
@@ -515,5 +553,7 @@
     appears uninitialized, its value is reported as
     \uicontrol {not in scope}. Not all uninitialized objects,
     however, can be recognized as such.
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
     \endif
 */
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc
index ccc9e82fd1b..964bbaf5e1b 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc
@@ -95,5 +95,5 @@
     (\uicontrol {Step Into}), and \inlineimage icons/debugger_stepout_small.png
     (\uicontrol {Step Out}).
 
-    \sa {Creating a Qt Widget Based Application}, {Debugging}
+    \sa {Creating a Qt Widget Based Application}, {Debugging}, {Debuggers}, {Debugger}
 */
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdoc
index 4583460cb42..b3fef5c0e32 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdoc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdoc
@@ -3,20 +3,22 @@
 
 /*!
     \page creator-debugger-preferences.html
-    \previouspage creator-remote-debugging.html
-    \nextpage creator-debugging-helpers.html
+    \previouspage creator-reference.html
 
-    \title Debugger Preferences
+    \ingroup creator-reference-preferences-debugger
 
-    To specify settings for managing debugger processes, select \preferences >
-    \uicontrol Debugger. In the \uicontrol General tab,you can specify settings
+    \title General
+
+    \brief Customize debug views and map source paths.
+
+    To specify settings for managing debugger processes, go to \preferences >
+    \uicontrol Debugger. In the \uicontrol General tab, you can specify settings
     that are common to all debuggers.
 
     \image qtcreator-debugger-general-options.png "Debugger General preferences"
 
-    You can customize the appearance and behavior of the debug views,
-    \l{Specifying Breakpoint Settings}{specify settings for breakpoints},
-    and map source paths to target paths.
+    You can customize the appearance and behavior of the debug views and
+    setting breakpoints, as well as map source paths to target paths.
 
     You can view debug output in the \l {Debugger Log} view.
     However, in some Linux distributions, such as Arch Linux, debug
@@ -26,7 +28,39 @@
     application, which effectively prevents storing debug output in
     system logs.
 
-    \section1 Mapping Source Paths
+    \section1 Breakpoints
+
+    To use a full absolute path in breakpoints, select the
+    \uicontrol {Set breakpoints using a full absolute path} check box.
+
+    GDB and CDB enable setting breakpoints on source lines for which no code
+    was generated. In such situations, the breakpoint is shifted to the next
+    source code line for which the code was actually generated. To reflect
+    such temporary changes by moving the breakpoint markers in the source code
+    editor, select \uicontrol GDB > \uicontrol {Adjust breakpoint locations}
+    or \uicontrol CDB > \uicontrol {Correct breakpoint location}.
+
+    When using GDB as backend, you can extend the ordinary GDB
+    breakpoint class by using Python. Select \uicontrol GDB >
+    \uicontrol {Use pseudo message tracepoints}.
+
+    When using CDB as backend, you can specify that the debugger should break on
+    specific events, such as C++ exceptions, thread creation or exit, loading or
+    unloading \l{Viewing Modules}{application modules}, or particular output.
+    Select the appropriate check boxes in the \uicontrol CDB >
+    \uicontrol {Break on} group. To disable first-chance break on access
+    violation exceptions, select the \uicontrol {Ignore first chance access
+    violations} check box. The second occurrence of an access violation will
+    break into the debugger.
+
+    You can automatically add breakpoints on some functions to catch error
+    and warning messages. For more information, see \l{CDB} and \l{GDB}.
+
+    For more information on breakpoints, see
+    \l{http://sourceware.org/gdb/onlinedocs/gdb/Breakpoints.html#Breakpoints}
+    {Breakpoints, Watchpoints, and Catchpoints} in GDB documentation.
+
+    \section1 Source Paths Mapping
 
     To enable the debugger to step into the code and display the source code
     when using a copy of the source tree at a location different from the one
@@ -48,52 +82,79 @@
             of the source tree on the local machine.
     \endlist
 
-    \section1 Specifying GDB Settings
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+*/
 
-    To specify settings for managing the GDB process, select \preferences >
+/*!
+    \page creator-preferences-debugger-gdb.html
+    \previouspage creator-reference.html
+
+    \ingroup creator-reference-preferences-debugger
+
+    \title GDB
+
+    \brief Manage the GDB process.
+
+    To specify settings for managing the GDB process, go to \preferences >
     \uicontrol Debugger > \uicontrol GDB.
 
     \image qtcreator-preferences-debugger-gdb.webp {GDB preferences}
 
-    To specify a timeout for terminating non-responsive GDB processes, set the
-    number of seconds to wait in the \uicontrol {GDB timeout} field. The default
-    value of 20 seconds should be sufficient for most applications, but if
-    loading big libraries or listing source files takes much longer than
-    that on slow machines, you should increase the value.
+    The following table summarizes the preferences.
 
-    To compress several steps into one step for less noisy debugging when
-    stepping into code, select the \uicontrol {Skip known frames when stepping}
-    check box. For example, the atomic reference counting code is skipped, and
-    a single \e {Step Into} for a signal emission ends up directly in the slot
-    connected to it.
+    \table
+    \header
+        \li Setting
+        \li Value
+    \row
+        \li \uicontrol {GDB timeout}
+        \li The timeout for terminating non-responsive GDB processes in seconds
+            The default value of 40 seconds should be sufficient for most
+            applications, but if loading big libraries or listing source files
+            takes much longer than that on slow machines, increase the value.
+    \row
+        \li \uicontrol {Skip known frames when stepping}
+        \li Compresses several steps into one step for less noisy debugging when
+            stepping into code. For example, the atomic reference counting code
+            is skipped, and a single \e {Step Into} for a signal emission ends up
+            directly in the slot connected to it.
+    \row
+        \li \uicontrol {Show a message box when receiving a signal}
+        \li Shows a message box as soon as your application receives a signal,
+            such as SIGSEGV, during debugging.
+    \row
+        \li \uicontrol {Adjust breakpoint locations}
+        \li GDB allows setting breakpoints on source lines for which no code was
+            generated. In such situations, the breakpoint is shifted to the next
+            source code line for which the code was actually generated. To reflect
+            such temporary changes by moving the breakpoint markers in the source
+            code editor, select this checkbox.
+    \row
+        \li \uicontrol {Use dynamic object type for display}
+        \li Whether the dynamic or the static type of objects will be
+            displayed. Choosing the dynamic type might make debugging slower.
+    \row
+        \li \uicontrol {Load .gdbinit file on startup}
+        \li Reads the user's default .gdbinit file on debugger startup.
+    \row
+        \li \uicontrol {Load system GDB pretty printers}
+        \li Uses the default GDB pretty printers installed on the computer
+            or linked to the libraries your application uses.
+    \row
+        \li \uicontrol {Use Intel style disassembly}
+        \li Switches from the default AT&T style disassembly to the Intel style.
+    \row
+        \li \uicontrol {Use automatic symbol cache}
+        \li Automatically saves a copy of the GDB symbol index in a cache on disk
+            and retrieves it from there when loading the same binary in the
+            future.
+    \row
+        \li \uicontrol {Use debug info daemon}
+        \li Tries to automatically retrieve debug information for system
+            packages.
+    \endtable
 
-    To display a message box as soon as your application receives a signal, such
-    as SIGSEGV, during debugging, select the \uicontrol {Show a message box when
-    receiving a signal} check box.
-
-    GDB allows setting breakpoints on source lines for which no code was
-    generated. In such situations, the breakpoint is shifted to the next
-    source code line for which the code was actually generated. To reflect
-    such temporary changes by moving the breakpoint markers in the source
-    code editor, select the \uicontrol {Adjust breakpoint locations} check box.
-
-    To specify whether the dynamic or the static type of objects will be
-    displayed, select the \uicontrol {Use dynamic object type for display}
-    check box. Keep in mind that choosing the dynamic type might be slower.
-
-    To allow reading the user's default .gdbinit file on debugger startup,
-    select the \uicontrol {Load .gdbinit file on startup} check box.
-
-    To use the default GDB pretty printers installed in your system
-    or linked to the libraries your application uses, select the
-    \uicontrol {Load system GDB pretty printers} check box.
-
-    By default, GDB shows AT&T style disassembly. To switch to the Intel style,
-    select the \uicontrol {Use Intel style disassembly} check box.
-
-    To have GDB automatically save a copy of its symbol index in a cache
-    on disk and retrieve it from there when loading the same binary in the
-    future, select the \uicontrol {Use automatic symbol cache} check box.
+    \section1 Executing Additional Commands
 
     To execute GDB commands after GDB has been started, but before the debugged
     application is started or attached, and before the debugging helpers are
@@ -111,85 +172,134 @@
     To execute arbitrary Python scripts, use
     \c {python execfile('/path/to/script.py')}.
 
-    \section2 Extended GDB Settings
+    \section1 Extended GDB Settings
 
     The settings in the \uicontrol Extended group give access to advanced
     or experimental functions of GDB.
     Enabling them may negatively impact your debugging experience, so use
     them with care.
 
-    To use asynchronous mode to control the inferior, select the
-    respective check box.
+    \table
+    \header
+        \li Setting
+        \li Value
+    \row
+        \li \uicontrol {Use asynchronous mode to control the inferior}
+        \li Execute commands in the background (asynchronous) mode.
+            GDB immediately opens a command prompt where you can issue
+            other commands while your program runs.
+    \row
+        \li \uicontrol {Use common locations for debug information}
+        \li Adds common paths to locations of debug information, such as
+            \c {/usr/src/debug}, when starting GDB.
+    \row
+        \li \uicontrol {Stop when qWarning() is called}
+        \li Adds a breakpoint on each \c qWarning() function.
+    \row
+        \li \uicontrol {Stop when qFatal() is called}
+        \li Adds a breakpoint on each \c qFatal() function.
+    \row
+        \li \uicontrol {Stop when abort() is called}
+        \li Adds a breakpoint on each \c abort() function.
+    \row
+        \li \uicontrol {Enable reverse debugging}
+        \li Enables stepping backwards. This feature is very slow and unstable
+            on the GDB side. It exhibits unpredictable behavior when steapping
+            backwards over system calls and is very likely to destroy your
+            debugging session.
+    \row
+        \li\uicontrol {Debug all child processes}
+        \li Keeps debugging all children after a fork.
+    \endtable
 
-    To add common paths to locations of debug information, such as
-    \c {/usr/src/debug}, when starting GDB, select the
-    \uicontrol {Use common locations for debug information} check box.
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+*/
 
-    To stop when \c qWarning, \c qFatal, or \c abort is called, select the
-    respective check box.
+/*!
+    \page creator-preferences-debugger-cdb.html
+    \previouspage creator-reference.html
 
-    To enable stepping backwards, select the \uicontrol {Enable reverse
-    debugging} check box. This feature is very slow and unstable on the
-    GDB side. It exhibits unpredictable behavior when going backwards over
-    system calls and is very likely to destroy your debugging session.
+    \ingroup creator-reference-preferences-debugger
 
-    To keep debugging all children after a fork, select the
-    \uicontrol {Debug all child processes} check box.
+    \title CDB
 
-    \section1 Specifying CDB Settings
+    \brief Manage the CDB process.
 
-    To specify settings for managing the CDB process, select \preferences >
+    To specify settings for managing the CDB process, go to \preferences >
     \uicontrol Debugger > \uicontrol CDB.
 
     \image qtcreator-cdb-options.png "CDB preferences"
 
-    You can specify additional arguments for starting CDB in the
-    \uicontrol {Additional arguments} field.
+    The following table summarizes the preferences.
 
-    If a console application does not start up properly in the configured
-    console and the subsequent attach fails, you can diagnose the issue by
-    using CDB's native console. Select the \uicontrol {Use CDB console}
-    check box to override the console set in the Windows system
-    environment variables. Note that the native console does not
-    prompt on application exit.
+    \table
+    \header
+        \li Setting
+        \li Value
+    \row
+        \li \uicontrol {Additional arguments}
+        \li Additional arguments for starting CDB.
+    \row
+        \li \uicontrol {Use CDB console}
+        \li If a console application does not start up properly in the configured
+            console and the subsequent attach fails, diagnose the issue by
+            using CDB's native console. Select this checkbox to override the
+            console set in the Windows system environment variables. Note that
+            the native console does not prompt on application exit.
+    \row
+        \li \uicontrol {Ignore first chance access violations}
+        \li Disables first-chance break on access violation exceptions.
+            The second occurrence of an access violation will break into the
+            debugger.
+    \row
+        \li \uicontrol {Stop when CrtDbgReport() is called}
+        \li Automatically adds a breakpoint on the \c CrtDbgReport() function to
+            catch runtime error messages caused by \c assert(), for example.
+    \row
+        \li \uicontrol {Correct breakpoint location}
+        \li CDB enables setting breakpoints in comments or on source lines for
+            which no code was generated. In such situations, the breakpoint is
+            shifted to the next source code line for which the code was actually
+            generated. To reflect such temporary changes by moving the breakpoint
+            markers in the source code editor, select this checkbox. For more
+            information, see \l{Setting Breakpoints}.
+    \row
+        \li \uicontrol {Use Python dumper}
+        \li Uses the abstraction layer of Python Dumper classes to create a
+            description of data items in the \uicontrol Locals and
+            \uicontrol Expressions views.
+            For more information, see \l{Debugging Helper Implementation}.
+    \row
+        \li \uicontrol {Break on}
+        \li Whether the debugger should break on C++ exceptions, on thread
+            creation or exit, on loading or unloading the specified
+            \l{Viewing Modules}{application modules}, or on the specified output.
+    \row
+        \li \uicontrol {Add Exceptions to Issues View}
+        \li Shows information about first-chance and second-chance exceptions
+            in \l Issues.
+    \endtable
 
-    To automatically add a breakpoint on the \c CrtCbgReport() function,
-    select the \uicontrol {Stop when CrtCbgReport() is called} check box.
-    This catches runtime error messages caused by \c assert(), for example.
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+*/
 
-    In the \uicontrol {Break on} group, specify whether the debugger should
-    break on C++ exceptions, on thread creation or exit, on loading or
-    unloading the specified \l{Viewing Modules}{application modules}, or on
-    the specified output.
+/*!
+    \page creator-preferences-debugger-cdb-paths.html
+    \previouspage creator-reference.html
 
-    To disable first-chance break on access violation exceptions, select the
-    \uicontrol {Ignore first chance access violations} check box.
-    The second occurrence of an access violation will break into the debugger.
+    \ingroup creator-reference-preferences-debugger
 
-    CDB enables setting breakpoints in comments or on source lines for which
-    no code was generated. In such situations, the breakpoint is shifted to
-    the next source code line for which the code was actually generated. To
-    reflect such temporary changes by moving the breakpoint markers in the
-    source code editor, select the \uicontrol {Correct breakpoint location}
-    check box. For more information, see \l{Setting Breakpoints}.
+    \title CDB Paths
 
-    To use the abstraction layer of Python Dumper classes to create a description
-    of data items in the \uicontrol Locals and \uicontrol Expressions
-    views, select the \uicontrol {Use Python dumper} check box.
-    For more information, see \l{Debugging Helper Implementation}.
-
-    To display information about first-chance and second-chance exceptions
-    in \l Issues, select the check boxes
-    in the \uicontrol {Add Exceptions to Issues View} group.
-
-    \section1 Setting CDB Paths on Windows
+    \brief Add the Microsoft Symbol Server to the symbol search path of the
+    debugger.
 
     To obtain debugging information for the operating system libraries for
     debugging Windows applications, add the Microsoft Symbol Server
     to the symbol search path of the debugger:
 
     \list 1
-        \li Select \preferences > \uicontrol Debugger > \uicontrol {CDB Paths}.
+        \li Go to \preferences > \uicontrol Debugger > \uicontrol {CDB Paths}.
             \image qtcreator-debugger-cdb-paths.png
         \li In the \uicontrol {Symbol Paths} group, select \uicontrol Insert.
         \li Select the directory where you want to store the cached information.
@@ -204,4 +314,6 @@
     To use the Source Server infrastructure for fetching missing source files
     directly from version control or the web, enter the following string in
     the \uicontrol {Source Paths} field: \c srv*.
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc
index 66386d72c0a..a6bc84a87b0 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc
@@ -9,61 +9,22 @@
 
 
 /*!
-    \previouspage creator-debugging.html
     \page creator-debugger-engines.html
-    \nextpage creator-debugger-operating-modes.html
+    \previouspage creator-reference.html
 
-    \title Setting Up Debugger
+    \ingroup creator-reference-debugger
 
-    The main debugger preferences are associated with the
-    \l{kits-tab}{kit} you build and run your project with. To
-    specify the debugger and compiler to use for each kit, select
-    \preferences > \uicontrol Kits.
+    \title Supported Debuggers
 
-    \image qtcreator-kits.png {Kits preferences}
+    \brief Summary of supported debugger versions.
 
-    You need to set up the debugger only if the automatic setup fails because
-    the native debugger is missing (for example, you must install the CDB
-    debugger on Windows yourself) or because \QC does not support the installed
-    version. For example, when your system does not have GDB
-    installed or the installed version is outdated, and you want to use a locally
-    installed replacement instead.
-
-    To change the debugger in an automatically detected kit, select
-    \preferences > \uicontrol Kits >
-    \uicontrol Clone to create a copy of the kit, and change the
-    parameters in the cloned kit. Make sure to enable the cloned kit
-    for your project.
-
-    If the debugger you want to use is not automatically detected, select
-    \preferences > \uicontrol Kits >
-    \uicontrol Debuggers > \uicontrol Add to add it.
-
-    \image qtcreator-preferences-kits-debuggers.webp {Debuggers tab in Kits preferences}
-
-    To use the debugging tools for Windows, you must install them.
-    Optionally, you can set up the Microsoft Symbol Server if you need
-    symbol information from Microsoft modules that is not found locally.
-    For more information, see \l{Setting CDB Paths on Windows}.
-
-    To use the Free Software Foundation (FSF) version of GDB on \macos, you
-    must sign it and modify your kit preferences.
-
-    This section describes the options you have for debugging C++ and Python code
-    and installing the supported native debuggers. It also
-    applies to code in other compiled languages such as C, FORTRAN, and Ada.
-
-    For more information about launching the debugger in different modes, see
-    \l{Debugger Operating Modes}.
-
-    \section1 Supported Native Debugger Versions
-
-    \QC supports native debuggers for debugging compiled code.
+    You can use \QC to debug compiled code.
     On most supported platforms, you can use the GNU Symbolic Debugger (GDB).
-    On Microsoft Windows, when using the Microsoft tool chain, you need the
+    On Microsoft Windows, when using the Microsoft toolchain, you need the
     Microsoft Console Debugger (CDB). On \macos and Linux, you can use the LLDB
-    debugger. On all supported platforms, you can use PDB to debug Python source
-    code.
+    debugger.
+
+    On all supported platforms, you can use PDB to debug Python source code.
 
     \note You need a debugger version built with Python scripting support.
 
@@ -73,7 +34,7 @@
         \header
             \li Platform
             \li Compiler
-            \li Native Debugger
+            \li Debugger
         \row
             \li Linux
             \li GCC, ICC
@@ -85,7 +46,7 @@
         \row
             \li \macos
             \li GCC, Clang
-            \li LLDB, FSF GDB (experimental)
+            \li LLDB
         \row
             \li Windows/\MinGW
             \li GCC
@@ -96,7 +57,12 @@
             \li Debugging Tools for Windows/CDB
     \endtable
 
-    \section2 Supported GDB Versions
+    \QC automatically selects a suitable debugger for
+    each \l{Kits}{kit} from the ones found on the computer. The automatic
+    setup fails if the debugger is not installed on the computer or
+    if \QC does not support the installed version.
+
+    \section1 GDB Versions
 
     Use GDB 7.5, or later, with the Python scripting extension and Python version
     3.5, or later.
@@ -104,49 +70,6 @@
     For remote debugging using GDB and GDB server, the minimum supported version
     of GDB server on the target \l{glossary-device}{device} is 7.0.
 
-    \section2 Supported CDB Versions
-
-    \QC supports all versions of CDB targeting platforms that Qt supports.
-
-    \section2 Supported LLDB Versions
-
-    The LLDB native debugger has similar functionality to the GDB debugger. LLDB
-    is the default debugger in Xcode on \macos for C++ on the desktop.
-    LLDB is typically used with the Clang compiler (even though you can use it
-    with GCC, too).
-
-    On \macos you can use the LLDB version delivered with Xcode or build from source.
-    The minimum supported version is LLDB 320.4. You need a LLDB version built
-    with Python support.
-
-    On Linux, the minimum supported version is LLDB 3.8.
-
-    \section2 GDB Run Modes
-
-    The GDB native debugger used internally by the debugger plugin runs in
-    different modes to cope with the variety of supported platforms and
-    environments:
-
-    \list
-
-        \li Plain mode debugs locally started processes that do not need console input.
-
-        \li Terminal mode debugs locally started processes that need a console.
-
-        \li Attach mode debugs local processes started outside \QC.
-
-        \li Core mode debugs core files generated from crashes.
-
-        \li Remote mode interacts with the GDB server running on Linux.
-
-    \endlist
-
-    \section1 Installing Native Debuggers
-
-    The following sections describe installing native debuggers.
-
-    \section2 GDB
-
     On Windows, use the Python-enabled GDB version that is bundled
     with the Qt package or comes with recent versions of \MinGW. On
     most Linux distributions, the GDB builds shipped with the system
@@ -157,7 +80,9 @@
 
     Builds of GDB shipped with Xcode on \macos are no longer supported.
 
-    \section2 Debugging Tools for Windows
+    \section1 Debugging Tools for Windows
+
+    \QC supports all versions of CDB targeting platforms that Qt supports.
 
     To use the CDB debugger, install the \e {Debugging Tools for Windows} when
     you install \QC either by using \QOI (in \uicontrol Qt
@@ -180,12 +105,12 @@
     the required files in
     \c{"%ProgramFiles%\Debugging Tools for Windows"}.
 
-    \section2 Debugging Tools for \macos
+    \section1 Debugging Tools for \macos
 
     The Qt binary distribution has both debug and release
     variants of the libraries. However, you have to explicitly tell the
     runtime linker that you want to use the debug libraries even if
-    your application is compiled as debug, as release is the default
+    your application is compiled as \e debug because \e release is the default
     library.
 
     If you use a qmake based project in \QC, you can set a flag in
@@ -196,88 +121,32 @@
     For more detailed information about debugging on \macos,
     see: \l{http://developer.apple.com/library/mac/#technotes/tn2124/_index.html#//apple_ref/doc/uid/DTS10003391}
     {Mac OS X Debugging Magic}.
+    \section1 LLDB Versions
 
-    \section2 LLDB
+    The LLDB debugger has similar functionality to the GDB debugger. LLDB
+    is the default debugger in Xcode on \macos for C++ on the desktop.
+    LLDB is typically used with the Clang compiler (even though you can use it
+    with GCC, too).
+
+    On \macos you can use the LLDB version delivered with Xcode or build from source.
+    The minimum supported version is LLDB 320.4. You need a LLDB version built
+    with Python support.
 
     We recommend using the LLDB version that is delivered with the latest Xcode.
 
-    \section2 PDB
+    On Linux, the minimum supported version is LLDB 3.8.
+
+    \section1 PDB Versions
 
     \l{https://docs.python.org/3/library/pdb.html}{PDB} is a source code debugger
     for Python applications. You can use it to debug projects that have a
     \l {Creating a Qt for Python Application with Qt Widgets}{.pyproject}
     configuration file.
 
-    You must install Python and set the interpreter to use in \uicontrol Projects
-    > \uicontrol Run:
+    Install Python and set the interpreter to use in \uicontrol Projects
+    > \uicontrol Run.
 
     \image qtcreator-run-settings-python.webp {Run settings for a Python project}
 
-    Start debugging the \c main.py file. If you encounter problems, check the
-    active build target in the kit selector.
-
-    \QC does not support mixed-mode debugging, but you can attach GDB to the
-    Python interpreter to debug the C++ implementation of the corresponding
-    Python code. For more information, see
-    \l{https://doc.qt.io/qtforpython-6/tutorials/debugging/qtcreator/qtcreator.html}
-    {Debugging PySide with Qt Creator (Linux)}.
-
-    \section1 Setting up FSF GDB for \macos
-
-    To use FSF GDB on \macos, you must sign it and add it to the \QC
-    \l{glossary-buildandrun-kit}{kits}.
-
-    \list 1
-
-        \li To create a key for signing FSF GDB, select
-            \uicontrol {Keychain Access} > \uicontrol {Certificate Assistant} >
-            \uicontrol {Create a Certificate}:
-
-        \list 1
-
-            \li In the \uicontrol Name field, input \uicontrol fsfgdb to
-                replace the existing content.
-
-            \li In the \uicontrol {Certificate Type} field, select
-                \uicontrol {Code Signing}.
-
-            \li Select the \uicontrol {Let me override defaults} check box.
-
-            \li Select \uicontrol Continue, and follow the instructions of the
-                wizard (use the default settings), until the
-                \uicontrol {Specify a Location For The Certificate} dialog
-                opens.
-
-            \li In the \uicontrol Keychain field, select \uicontrol System.
-
-            \li Select \uicontrol {Keychain Access} > \uicontrol System, and
-                locate the certificate.
-
-            \li Double click the certificate to view certificate information.
-
-            \li In the \uicontrol Trust section, select
-                \uicontrol {Always Trust} in the
-                \uicontrol {When using this certificate} field, and then close
-                the dialog.
-
-        \endlist
-
-        \li To sign the binary, enter the following command in the terminal:
-
-            \code
-            codesign -f -s "fsfgdb" $INSTALL_LOCATION/fsfgdb
-            \endcode
-
-        \li In \QC, select \uicontrol {\QC} > \uicontrol Preferences >
-            \uicontrol Kits > \uicontrol Add to
-            create a kit that uses FSF GDB.
-
-            \li In the \uicontrol Debugger field, specify the path to FSF GDB
-                (\c $HOME/gdb72/bin/fsfgdb, but with an explicit value for
-                \c $HOME).
-
-        \li To use the debugger, enable the kit in the \uicontrol {Build Settings}
-            of the project.
-
-    \endlist
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}, {Kits}
 */
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
index d3441ab0630..6880c27b5a2 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
@@ -14,8 +14,7 @@
 
     \title Debugging
 
-    The \QC debugger plugin acts as an interface between the \QC
-    core and external native debuggers that you can use to:
+    You can use debuggers to:
 
     \list
         \li Debug executable binary files - GNU Symbolic Debugger (GDB),
@@ -26,94 +25,201 @@
         \li Debug Python source code - PDB.
     \endlist
 
-    The following sections describe how to set up, launch, and interact with the
-    debugger:
+    \section1 Setting Up the Debugger
+
+    \QC automatically selects a suitable debugger for
+    each \l{Kits}{kit} from the ones found on your system. You can select
+    another kit. To specify the debugger and compiler to use for each kit, go to
+    \preferences > \uicontrol Kits.
+
+    \image qtcreator-kits.png {Kits preferences}
+
+    You need to set up the debugger only if the automatic setup fails because
+    the debugger is missing (for example, you must install the CDB
+    debugger on Windows yourself) or because \QC does not support the installed
+    version. For example, when your system does not have GDB
+    installed or the installed version is outdated, and you want to use a locally
+    installed replacement instead.
+
+    To change the debugger in an automatically detected kit, go to
+    \preferences > \uicontrol Kits >
+    \uicontrol Clone to create a copy of the kit, and change the
+    parameters in the cloned kit. Make sure to enable the cloned kit
+    for your project.
+
+    If the debugger you want to use is not automatically detected, go to
+    \preferences > \uicontrol Kits >
+    \uicontrol Debuggers > \uicontrol Add to add it.
+
+    \image qtcreator-preferences-kits-debuggers.webp {Debuggers tab in Kits preferences}
+
+    To use the debugging tools for Windows, you must install them.
+    Optionally, you can set up the Microsoft Symbol Server if you need
+    symbol information from Microsoft modules that is not found locally.
+
+    For more information, see \l{Supported Debuggers} and \l{CDB Paths}.
+
+    \section1 Launching the Debugger
+
+    The debuggers run in various operating modes
+    depending on where and how you start and run the debugged process. Some of
+    the modes are only available for a particular operating system or platform:
+
+    \list
+       \li \e{Start internal} to debug applications developed inside \QC, such as
+            a Qt Widgets-based application. This is the default start mode for
+            most projects, including all projects using a desktop Qt version and
+            plain C++ projects.
+       \li \e{Start external} to start and debug processes without a proper \QC
+            project setup, either locally or on a remote machine.
+       \li \e{Attach} to debug processes already started and running outside
+            \QC, either locally or on a remote machine.
+       \li \e{Core} to debug crashed processes on Unix.
+       \li \e{Post-mortem} to debug crashed processes on Windows.
+    \endlist
+
+    In general, \key F5 and the \uicontrol {Start Debugging of Startup Project}
+    button start the operating mode that fits the context. So, for a C++
+    application that uses the \MinGW toolchain targeting desktop Windows, the GDB
+    engine starts in \e {start internal} mode. For a QML application that uses C++
+    plugins, a \e mixed QML/C++ engine starts, with the C++ parts being
+    handled by GDB and GDB server remote debugging.
+
+    Change the run configuration parameters (such as
+    \uicontrol {Run in Terminal}) in the run settings of the project, or select
+    options from the \uicontrol Debug > \uicontrol {Start Debugging} menu to
+    select other modes of operation.
+
+    \section2 GDB Run Modes
+
+    The GDB debugger runs in different modes to cope with the variety of
+    supported platforms and environments:
+
+    \list
+        \li \e{Plain mode} debugs locally started processes that do not need
+            console input.
+        \li \e{Terminal mode} debugs locally started processes that need a
+            console.
+        \li \e{Attach mode} debugs local processes started outside \QC.
+        \li \e{Core mode} debugs core files generated from crashes.
+        \li \e{Remote mode} interacts with the GDB server running on Linux.
+    \endlist
+
+    \section1 Stopping Applications
+
+    You can interrupt a running application before it terminates
+    or to find out why the application does not work correctly.
+    Set breakpoints to stop the application for examining and changing
+    variables, setting new breakpoints or removing old ones, and then
+    continue running the application.
+
+    Once the application starts running under the control of the debugger, it
+    behaves and performs as usual.
+
+    To interrupt a running C++ application, go to \uicontrol Debug >
+    \uicontrol Interrupt. The debugger automatically interrupts
+    the application when it hits a \l {Setting Breakpoints}{breakpoint}.
+
+    Once the application stops, \QC:
 
     \list
 
-        \li \l{Setting Up Debugger}
+        \li Retrieves data representing the \l{Viewing Call Stack Trace}
+            {call stack} at the application's current position.
 
-            The debugger plugin automatically selects a suitable
-            native debugger for each \l{glossary-buildandrun-kit}{kit} from the
-            ones found on your system. You can edit the kits to override this
-            choice.
+        \li Retrieves the contents of \l{Local Variables and Function Parameters}
+            {local variables}.
 
-        \li \l{Launching the Debugger}
+        \li Examines \l{Evaluating Expressions}{expressions}.
 
-            To start an application from an open project under the control
-            of a debugger, select the \inlineimage icons/qtcreator-debug-button.png
-            (\uicontrol {Start Debugging of Startup Project}) button or press
-            \key F5. Other, less common start options are available in the
-            \uicontrol Debug > \uicontrol {Start Debugging} menu.
+        \li Updates the \l{Viewing and Editing Register State}{Registers},
+            \l{Viewing Modules}{Modules}, and \l{Viewing Disassembled Code}
+            {Disassembler} views if you are debugging C++ based applications.
 
-        \li \l{Debug Mode Views}
-
-            Use the views in the \uicontrol Debug mode to inspect the
-            state of your application while debugging.
-
-        \li \l{Stopping Applications}
-
-            You can interrupt a running application before it terminates
-            or to find out why the application does not work correctly.
-            Set breakpoints to stop the application for examining and changing
-            variables, setting new breakpoints or removing old ones, and then
-            continue running the application.
-
-        \li \l{Examining Data}
-
-            You can examine variable values and data structures in detail.
-
-        \li \l{Remote Debugging}
-
-            You can debug an application that runs on a remote target with the
-            necessary helper processes also running.
-
-        \li \l{Debugger Preferences}
-
-            Specify preferences for managing debugger processes. You can specify
-            preferences that are common to all debuggers, or the native debugger
-            that you use, GDB or CDB.
-
-        \li \l{Using Debugging Helpers}
-
-            \QC is able to show complex data types in a customized,
-            user-extensible manner. For this purpose, it takes advantage of
-            two technologies, collectively referred to as \e {debugging
-            helpers}.
-
-        \li \l{Debugging Qt Quick Projects}
-
-            When debugging a Qt Quick application, you can inspect the state of
-            the application while debugging JavaScript functions. You can set
-            breakpoints, view call stack trace, and examine locals and
-            expressions. While the application is running, you can inspect QML
-            objects and user interfaces, as well as execute JavaScript
-            expressions.
-
-        \li \l{Debugging a C++ Application}
-
-            Illustrates how to debug C++ applications in \QC.
-
-        \li \l{Debugging a Qt Quick Application}
-
-            Illustrates how to debug Qt Quick applications in \QC.
-
-        \li \l{Troubleshooting Debugger}
-
-            If you encounter problems while debugging, check for possible
-            solutions to them.
     \endlist
 
-    \sa {Debug CMake project files}
+    You can examine and change variables, set or remove breakpoints, and then
+    continue running the application.
+
+    \section1 Examining Data
+
+    When the application stops, you can examine certain data in the debugger. The
+    availability of data depends on the compiler settings when compiling the
+    application and the exact location where the application stops.
+
+    Unexpected events are called \e exceptions and the debugger can stop
+    the application when they occur. Going to the location in the code where
+    the exception occurred helps you investigate the problem and find ways to
+    fix it.
+
+    If you have a variable that shows text, but the application does not display
+    it correctly, for example, your data might be incorrect or the code that sets
+    the display text might do something wrong. You can step through the code and
+    examine changes to the variable to find out where the error occurs.
+
+    The following video shows how to examine variable values:
+
+    \youtube EhJ1eV_6RH8
+
+    \section1 Remote Debugging
+
+    \QC makes remote debugging easy. In general, the remote debugging setup
+    consist of a probe running on the remote computer and a counterpart running
+    on the host. The probe is either integrated into the running
+    process (for example, for QML debugging) or runs a separate process
+    (for example, when using GDB server on embedded Linux). The host
+    side typically consists of \QC itself, often with the help of an external
+    process, such as GDB or CDB.
+
+    While this setup might look daunting, it is mostly invisible to the user of
+    \QC. To start debugging on a remote target with the necessary helper
+    processes running, activate the corresponding \l{Activate kits for a project}
+    {kit} in \uicontrol Projects > \uicontrol {Build & Run}, and then select a
+    function to start remote debugging in the \uicontrol Debug >
+    \uicontrol {Start Debugging} menu.
+
+    Special use cases, such as attaching to a running process on the target,
+    might still require manual setup. You can debug an application that runs on
+    a remote target with the necessary helper processes also running.
+
+    For more information, see \l{Debug remotely with GDB} and
+    \l{Debug remotely with CDB}.
+
+    \section1 Using Debugging Helpers
+
+    To show complex structures, such as \c QObjects or associative containers,
+    in a clear and concise manner, \QC uses Python scripts that are called
+    \l{Debugging Helpers}{debugging helpers}.
+
+    \QC ships with debugging helpers for more than 200 of the most popular Qt
+    classes, standard C++ containers, and smart pointers, covering the usual
+    needs of a C++ application developer out-of-the-box.
+
+    You can customize and add debugging helpers.
+
+    \section1 QML and Qt Quick
+
+    When debugging a Qt Quick application, you can inspect the state of
+    the application while debugging JavaScript functions. You can set
+    breakpoints, view call stack trace, and examine locals and
+    expressions. While the application is running, you can inspect QML
+    objects and user interfaces, as well as execute JavaScript
+    expressions.
+
+    For more information, see \l{Debugging Qt Quick Projects} and
+    \l{Debugging a Qt Quick Application}.
+
+    \sa {Debugging a C++ Application}, {Debug}{How To: Debug}, {Debuggers},
+    {Debugger}, {Kits}
 */
 
-
 /*!
-    \previouspage creator-debugger-engines.html
-    \page creator-debugger-operating-modes.html
-    \nextpage creator-debug-mode.html
+    \page creator-how-to-start-debugging.html
+    \previouspage creator-how-tos.html
 
-    \title Launching the Debugger
+    \ingroup creator-how-to-debug
+
+    \title Start debugging
 
     You can start an application from an open project under the control of a
     debugger in the following ways:
@@ -128,75 +234,46 @@
     \endlist
 
     \QC checks whether the compiled application is up-to-date, and rebuilds and
-    deploys it if you set the \uicontrol {Build before deploying} field to
-    build the whole project or the application to run and select the
-    \uicontrol {Always deploy before running} check box in \preferences >
+    deploys it if you set \uicontrol {Build before deploying} to
+    build the whole project or the application to run and select
+    \uicontrol {Always deploy before running} in \preferences >
     \uicontrol {Build & Run} > \uicontrol General. To debug the application
-    without deploying it, select \uicontrol Debug > \uicontrol {Start Debugging}
+    without deploying it, go to \uicontrol Debug > \uicontrol {Start Debugging}
     > \uicontrol {Start Debugging Without Deployment}.
 
     The debugger then takes over and starts the application with suitable
     parameters.
 
+    You can specify breakpoints before or after launching the debugger.
+    For more information, see \l{Setting Breakpoints}.
+
+    \section1 Execute GDB or CDB commands
+
     When using GDB or CDB as debug backend, you can specify additional commands
     to execute before and after the backend and debugged application are started or
     attached in \preferences > \uicontrol Debugger >
-    \uicontrol GDB and \uicontrol CDB. For more information, see
-    \l{Debugger Preferences}.
+    \l GDB and \l CDB.
 
     To let the debugger read the user's default .gdbinit file when it starts,
-    select the \uicontrol {Load .gdbinit file on startup} check box in
-    GDB settings. For more information, see \l{Specifying GDB Settings}.
+    select \uicontrol {Load .gdbinit file on startup} in GDB settings.
 
     \note Starting a C++ application under the control of the debugger can take
     a long time. Typically, in the range of several seconds to minutes if you use
     complex features.
 
+    \section1 Debug Python projects
+
     For \l {Creating a Qt for Python Application with Qt Widgets}{Python} projects,
     start debugging the \c main.py file. If you encounter problems, check the
     active build target in the \l{Build for many platforms}{kit selector}.
 
-    \section1 Debugger Operating Modes
+    \QC does not support mixed-mode debugging, but you can attach GDB to the
+    Python interpreter to debug the C++ implementation of the corresponding
+    Python code. For more information, see
+    \l{https://doc.qt.io/qtforpython-6/tutorials/debugging/qtcreator/qtcreator.html}
+    {Debugging PySide with Qt Creator (Linux)}.
 
-    The debugger plugin can run the native debuggers in various operating modes
-    depending on where and how you start and run the debugged process. Some of
-    the modes are only available for a particular operating system or platform.
-
-    In general, \key F5 and the \uicontrol {Start Debugging of Startup Project}
-    button start the operating mode that fits the context. So, for a C++
-    application that uses the \MinGW toolchain targeting desktop Windows, the GDB
-    engine starts in \e {start internal} mode. For a QML application that uses C++
-    plugins, a \e mixed QML/C++ engine starts, with the C++ parts being
-    handled by GDB and GDB server remote debugging.
-
-    Change the run configuration parameters (such as
-    \uicontrol {Run in Terminal}) in the run settings of the project, or select
-    options from the \uicontrol Debug > \uicontrol {Start Debugging} menu to
-    select other modes of operation.
-
-    The debugger can run in the following modes:
-
-    \list
-
-       \li \e{Start internal} to debug applications developed inside \QC, such as
-            a Qt Widgets-based application.
-
-       \li \e{Start external} to start and debug processes without a proper \QC
-            project setup, either locally or on a remote machine.
-
-       \li \e{Attach} to debug processes already started and running outside
-            \QC, either locally or on a remote machine.
-
-       \li \e{Core} to debug crashed processes on Unix.
-
-       \li \e{Post-mortem} to debug crashed processes on Windows.
-
-    \endlist
-
-    \section2 Start Internal
-
-    Start internal mode is the default start mode for most projects, including
-    all projects using a desktop Qt version and plain C++ projects.
+    \section1 Debug console applications
 
     If you need a console window to operate your application, for example
     because it accepts console input from the user, go to \uicontrol Projects >
@@ -205,46 +282,49 @@
 
     If a console application does not start up properly in the configured
     console and the subsequent attach fails, you can diagnose the issue by
-    using CDB's native console. Select \preferences >
+    using CDB's native console. Go to \preferences >
     \uicontrol Debugger > \uicontrol CDB > \uicontrol {Use CDB console} to
     override the console set in the Windows system environment variables.
     Note that the native console does not prompt on application exit.
 
-    To launch the debugger in start internal mode, click the
-    \uicontrol {Start Debugging} button for the active project.
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+*/
 
-    You can specify breakpoints before or after launching the debugger.
-    For more information, see \l{Setting Breakpoints}.
+/*!
+    \page creator-how-to-debug-external-apps.html
+    \previouspage creator-how-tos.html
 
-    \section2 Start External
+    \ingroup creator-how-to-debug
 
-    You can debug any executable on your local or on a remote
-    machine without using a project. You specify a build and run kit that
+    \title Start and debug an external application
+
+    To debug any executable on your local or on a remote
+    machine without using a project, specify a build and run \l{Kits}{kit} that
     identifies the device to debug the application on.
 
-    While this mode does not strictly require a project to be open in \QC,
-    opening it makes setting breakpoints and stepping through the code easier.
+    While the \e{start external} debugger mode does not strictly require a
+    project to be open in \QC, opening it makes setting breakpoints and
+    stepping through the code easier.
 
     To start and debug an external application:
 
     \list 1
-        \li Select \uicontrol Debug > \uicontrol {Start Debugging} >
+        \li Go to \uicontrol Debug > \uicontrol {Start Debugging} >
             \uicontrol {Start and Debug External Application}.
         \image qtcreator-debugger-start-external.png
-        \li In the \uicontrol Kit field, select the build and run kit to
+        \li In \uicontrol Kit, select the build and run kit to
             use for building the project.
-        \li In the \uicontrol {Local executable} field, specify the path to the
+        \li In \uicontrol {Local executable}, specify the path to the
             application executable on the local machine.
-        \li In the \uicontrol {Command line arguments} field, specify command
+        \li In \uicontrol {Command line arguments}, specify command
             line arguments to be passed to the executable.
-        \li In the \uicontrol {Working directory} field, specify the working
+        \li In \uicontrol {Working directory}, specify the working
             directory. It defaults to the directory of the build result.
-        \li Select the \uicontrol{Run in terminal} check box for console
-            applications.
-        \li Select the \uicontrol {Break at "main"} check box to stop the
-            debugger at the main function.
-        \li Select the \uicontrol {Use target extended-remote to connect}
-            check box to create the connection in the
+        \li Select \uicontrol{Run in terminal} for console applications.
+        \li Select \uicontrol {Break at "main"} to stop the debugger at
+            the main function.
+        \li Select \uicontrol {Use target extended-remote to connect}
+            to create the connection in the
             \c {target extended-remote mode}. In this mode, when the debugged
             application exits or you detach from it, the debugger remains
             connected to the target. You can rerun the application, attach
@@ -252,29 +332,34 @@
             target. For example, GDB does not exit unless it was invoked using
             the \c {--once} option, but you can make it exit by using the
             \c {monitor exit} command.
-        \li In the \uicontrol {Override SysRoot} field, specify the path to
+        \li In \uicontrol {Override SysRoot}, specify the path to
             the \c sysroot to use instead of the default \c sysroot.
-        \li In the \uicontrol {Debug information} field, specify the location
+        \li In \uicontrol {Debug information}, specify the location
             for storing debug information. You cannot use an empty path.
-        \li In the \uicontrol Recent field, you can select a recent
+        \li In \uicontrol Recent, you can select a recent
             configuration to use.
     \endlist
 
-    \section2 Attach
+    \sa {Activate kits for a project}, {Debug}{How To: Debug}, {Debugging},
+    {Debuggers}, {Debugger}
+*/
 
-    You can attach the debugger to applications that are already running or
-    instruct the debugger to attach to an application when it starts.
+/*!
+    \page creator-how-to-attach-debugger-to-running-apps.html
+    \previouspage creator-how-tos.html
 
-    \section3 Attaching to Running Applications
+    \ingroup creator-how-to-debug
+
+    \title Attach the debugger to running applications
 
     To attach the debugger to an application already running on your local or on
     a remote machine:
 
     \list 1
-        \li Select \uicontrol Debug > \uicontrol {Start Debugging} >
+        \li Go to \uicontrol Debug > \uicontrol {Start Debugging} >
             \uicontrol {Attach to Running Application}.
             \image qtcreator-debugger-attach-to-running.png
-        \li In the \uicontrol Filter field, enter a string to filter processes
+        \li In \uicontrol Filter, enter a string to filter processes
             by their process ID or name.
         \li Select a process in the list, and then select
             \uicontrol {Attach to Process} to start debugging.
@@ -290,28 +375,47 @@
     You can specify breakpoints before or after attaching the debugger to the
     application. For more information, see \l{Setting Breakpoints}.
 
-    \section3 Attaching to Processes when They Start
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+*/
+
+/*!
+    \page creator-how-to-attach-debugger-to-starting-processes.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-debug
+
+    \title Attach the debugger to starting processes
 
     To instruct the debugger to watch an application process and to attach
     to it when it starts:
 
     \list 1
-        \li Select \uicontrol Debug > \uicontrol {Start Debugging} >
+        \li Go to \uicontrol Debug > \uicontrol {Start Debugging} >
             \uicontrol {Attach to Unstarted Application}.
             \image qtcreator-debugger-attach-to-process-not-yet-started.png
-        \li In the \uicontrol Kit field, select the build and run kit to
+        \li In \uicontrol Kit, select the build and run kit to
             use for building the project.
-        \li In the \uicontrol Executable field, specify the path to the
+        \li In \uicontrol Executable, specify the path to the
             application executable.
-        \li Select the \uicontrol {Reopen dialog when application finishes}
-            check box to return to this dialog when the application is closed.
-        \li Select the \uicontrol {Continue on attach} check box to instruct
+        \li Select \uicontrol {Reopen dialog when application finishes}
+            to return to this dialog when the application is closed.
+        \li Select \uicontrol {Continue on attach} to instruct
             the debugger to keep the application running after attaching to it.
         \li Select \uicontrol {Start Watching} to wait for the application
             process to start.
     \endlist
 
-    \section2 Core
+    \sa {Activate kits for a project}, {Debug}{How To: Debug}, {Debugging},
+    {Debuggers}, {Debugger}
+*/
+
+/*!
+    \page creator-how-to-load-core-files-to-debugger.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-debug
+
+    \title Load core files to the debugger
 
     Use the core mode to inspect \e {core} files (crash dumps) that are
     generated from crashed processes on Linux and Unix systems if the system is
@@ -327,38 +431,46 @@
     To launch the debugger in the core mode:
 
     \list 1
-        \li Select \uicontrol Debug > \uicontrol {Start Debugging} >
+        \li Go to \uicontrol Debug > \uicontrol {Start Debugging} >
             \uicontrol {Load Core File}.
             \image qtcreator-debugger-load-core-file.png
-        \li In the \uicontrol Kit field, select a build and run kit that was
+        \li In \uicontrol Kit, select a build and run kit that was
             used for building the binary for which the core file was created.
             If the core file stems from a binary not built by \QC or a process
             not initiated by \QC, select a kit that matches the setup used as
-            closely as possible, in respect to the specified device, tool chain,
+            closely as possible, in respect to the specified device, toolchain,
             debugger, and sysroot.
-        \li In the \uicontrol {Core file} field, specify the core file to
-            inspect.
-        \li In the \uicontrol {Executable of symbol file} field, specify
+        \li In \uicontrol {Core file}, specify the core file to inspect.
+        \li In \uicontrol {Executable of symbol file}, specify
             a file that has debug information corresponding to the
             core file. Typically, this is the executable file or a \c {.debug}
             file if the debug information is stored separately from the
             executable.
-        \li In the \uicontrol {Override start script} field, specify a
+        \li In \uicontrol {Override start script}, specify a
             script file to run instead of the default start script.
-        \li In the \uicontrol {Override SysRoot} field, specify the path to
+        \li In \uicontrol {Override SysRoot}, specify the path to
             the \c sysroot to use instead of the default \c sysroot.
     \endlist
 
     Even though using a properly configured project that has the sources of the
     crashed application is not strictly necessary, it is helpful.
 
-    \section2 Post-Mortem
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}, {Kits}
+*/
 
-    The post-mortem mode is available only on Windows, if you installed the
-    debugging tools for Windows.
+/*!
+    \page creator-how-to-debug-post-mortem.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-debug
+
+    \title Debug crashed processes on Windows
+
+    The \e{post-mortem} debugger operating mode is available only on Windows,
+    if you installed the debugging tools for Windows.
 
     The \QC installation program asks you whether you want to register \QC as a
-    post-mortem debugger. To change the setting, select
+    post-mortem debugger. To change the setting, go to
     \preferences > \uicontrol Debugger >
     \uicontrol General > \uicontrol {Use \QC for post-mortem debugging}.
 
@@ -366,7 +478,16 @@
     crashes on Windows. Click the \uicontrol {Debug in \QC} button in the error
     message from the Windows operating system.
 
-    \section1 Starting the Debugger from the Command Line
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+*/
+
+/*!
+    \page creator-how-to-start-debugger-from-cli.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-debug
+
+    \title Start debugging from the command line
 
     You can use the \QC debugger interface from the command line. To attach it
     to a running process, specify the process ID as a parameter for the
@@ -386,35 +507,17 @@
 
     \endlist
 
-    For more information, see \l{Command-Line Options}.
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger},
+    {Command-Line Options}
 */
 
 /*!
-    \page creator-remote-debugging.html
-    \previouspage creator-debugger-examining-data.html
-    \nextpage creator-debugger-preferences.html
+    \page creator-how-to-debug-remotely-gdb.html
+    \previouspage creator-how-tos.html
 
-    \title Remote Debugging
+    \ingroup creator-how-to-debug
 
-    \QC makes remote debugging easy.
-    In general, the remote debugging setup consist of a probe running on the
-    remote machine and a counterpart running on the host side. The probe is
-    either integrated into the running process (e.g. for QML debugging) or runs
-    a separate process (e.g. when using GDB server on embedded Linux). The host
-    side typically consists of \QC itself, often with the help of an external
-    process, such as GDB or CDB.
-
-    While this setup might look daunting, it is mostly invisible to the user of
-    \QC. To start debugging on a remote target with the necessary helper
-    processes running, select the corresponding
-    \l{glossary-buildandrun-kit}{kit} in \uicontrol Projects >
-    \uicontrol {Build & Run}, and then select a function to start remote
-    debugging in the \uicontrol Debug > \uicontrol {Start Debugging} menu.
-
-    Special use cases, such as attaching to a running process on the target,
-    might still require manual setup.
-
-    \section1 Using GDB
+    \title Debug remotely with GDB
 
     When debugging on a target supported by GDB server, a local GDB process
     talks to a GDB server running on the remote machine that controls the
@@ -437,25 +540,24 @@
 
     \list 1
 
-        \li Select \uicontrol Debug > \uicontrol {Start Debugging} >
+        \li Go to \uicontrol Debug > \uicontrol {Start Debugging} >
             \uicontrol {Attach to Running Debug Server}.
             \image qtcreator-debugger-attach-to-running-debug-server.png
-        \li In the \uicontrol Kit field, select the build and run kit to
+        \li In \uicontrol Kit, select the build and run kit to
             use for building the project.
-        \li In the \uicontrol {Server port} field, enter the name of the remote
+        \li In \uicontrol {Server port}, enter the name of the remote
             machine and the port number to use.
-        \li In the \uicontrol {Local executable} field, specify the path to the
+        \li In \uicontrol {Local executable}, specify the path to the
             application executable on the local machine.
-        \li In the \uicontrol {Command line arguments} field, specify command
+        \li In \uicontrol {Command line arguments}, specify command
             line arguments to be passed to the executable.
-        \li In the \uicontrol {Working directory} field, specify the working
+        \li In \uicontrol {Working directory}, specify the working
             directory. It defaults to the directory of the build result.
-        \li Select the \uicontrol{Run in terminal} check box for console
-            applications.
-        \li Select the \uicontrol {Break at "main"} check box to stop the
+        \li Select \uicontrol{Run in terminal} for console applications.
+        \li Select \uicontrol {Break at "main"} to stop the
             debugger at the main function.
-        \li Select the \uicontrol {Use target extended-remote to connect}
-            check box to create the connection in the
+        \li Select \uicontrol {Use target extended-remote to connect}
+            to create the connection in the
             \c {target extended-remote mode}. In this mode, when the debugged
             application exits or you detach from it, the debugger remains
             connected to the target. You can rerun the application, attach
@@ -463,34 +565,57 @@
             target. For example, GDB does not exit unless it was invoked using
             the \c {--once} option, but you can make it exit by using the
             \c {monitor exit} command.
-        \li In the \uicontrol {Override SysRoot} field, specify the path to
+        \li In \uicontrol {Override SysRoot}, specify the path to
             the \c sysroot to use instead of the default \c sysroot.
-        \li In the \uicontrol {Init commands} field, enter the commands
+        \li In \uicontrol {Init commands}, enter the commands
             to execute immediately after the connection to a target has
             been established.
-        \li In the \uicontrol {Reset commands} field, enter the commands
+        \li In \uicontrol {Reset commands}, enter the commands
             to execute when resetting the connection to a target.
-        \li In the \uicontrol {Debug information} field, specify the location
+        \li In \uicontrol {Debug information}, specify the location
             for storing debug information. You cannot use an empty path.
-        \li In the \uicontrol {Override server channel} field, specify a
+        \li In \uicontrol {Override server channel}, specify a
             communication channel to use, such as a serial line or custom port.
-        \li In the \uicontrol Recent field, you can select a recent
-            configuration to use.
+        \li In \uicontrol Recent, select a recent configuration to use.
         \li Select \uicontrol OK to start debugging.
 
     \endlist
 
-    By default, a non-responsive GDB process is terminated after 20 seconds.
-    To increase the timeout in the \uicontrol {GDB timeout} field, select
-    \preferences > \uicontrol Debugger >
-    \uicontrol GDB. For more information about settings that you can specify
-    to manage the GDB process, see \l{Specifying GDB Settings}.
+    By default, a non-responsive GDB process is terminated after 40 seconds.
+    To increase the timeout in \uicontrol {GDB timeout}, go to \preferences >
+    \uicontrol Debugger > \uicontrol GDB.
 
     For more information about connecting with \c {target extended-remote} mode
     in GDB, see \l{https://sourceware.org/gdb/onlinedocs/gdb/Connecting.html}
     {Debugging with GDB: Connecting to a Remote Target}.
 
-    \section1 Using CDB
+    \section1 Use SSH port forwarding
+
+    To enable debugging on remote targets that cannot expose GDB server ports,
+    map the remote ports to local ports using SSH tunneling. \QC automatically
+    detects the local and remote ports.
+
+    To turn on SSH port forwarding:
+
+    \list 1
+        \li Go to \preferences > \uicontrol Devices.
+            \image qtcreator-preferences-devices-remote-linux.webp {Remote Linux device preferences}
+        \li In \uicontrol Device, select \uicontrol {Remote Linux Device}.
+        \li Select \uicontrol {Use SSH port forwarding for debugging}.
+        \li Select \uicontrol OK.
+    \endlist
+
+    \sa {Debug}{How To: Debug}, {Remote Linux}{How To: Develop for remote Linux},
+    {GDB}, {Debugging}, {Debuggers}, {Debugger}, {Kits}
+*/
+
+/*!
+    \page creator-how-to-debug-remotely-cdb.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-debug
+
+    \title Debug remotely with CDB
 
     In remote mode, the local CDB process talks to a CDB process that runs on
     the remote machine. The process is started with special command-line options
@@ -555,23 +680,23 @@
 
     \endlist
 
-    To specify settings for managing the CDB process, select \preferences >
-    \uicontrol Debugger > \uicontrol CDB. For more information, see
-    \l{Specifying CDB Settings}.
+    To specify settings for managing the CDB process, go to \preferences >
+    \uicontrol Debugger > \uicontrol CDB.
+
+    \sa {Debug}{How To: Debug}, {CDB}, {Debugging}, {Debuggers}, {Debugger}
 */
 
 
 /*!
     \page creator-debug-mode.html
-    \if defined(qtdesignstudio)
-    \previouspage studio-debugging.html
-    \else
-    \previouspage creator-debugger-operating-modes.html
-    \endif
-    \nextpage creator-stack-view.html
+    \previouspage creator-reference.html
+
+    \ingroup creator-reference-debugger-views
 
     \title Debug Mode Views
 
+    \brief Inspect the state of your application while debugging.
+
     In the \uicontrol Debug mode, you can inspect the state of your
     application while debugging.
 
@@ -659,7 +784,7 @@
 
             The log view acts as a console, so you can send the contents
             of the line under the text cursor in the log directly to the
-            native debugger.
+            debugger.
         \li \l{Troubleshooting Debugger}
 
             \l {Debugger Log}
@@ -685,7 +810,7 @@
 
     During debugging, the mode shows the views that you usually need to
     debug C++ or QML applications. To show other views or to hide views,
-    select \uicontrol Views.
+    go to \uicontrol Views.
 
     You can drag the views in \QC to new positions on the screen. \QC saves the
     size and position of views as a perspective for future sessions. Select
@@ -714,70 +839,17 @@
             interrupted.
     \endlist
 
-    For more information, see \l{Debugger Preferences}.
-*/
-
-/*!
-    \page creator-debugger-stopping.html
-    \previouspage creator-disassembler-view.html
-    \nextpage creator-debugger-examining-data.html
-
-    \title Stopping Applications
-
-    Once the application starts running under the control of the debugger, it
-    behaves and performs as usual.
-
-    To interrupt a running C++ application, select \uicontrol Debug >
-    \uicontrol Interrupt. The debugger automatically interrupts
-    the application when it hits a \l {Setting Breakpoints}{breakpoint}.
-
-    Once the application stops, \QC:
-
-    \list
-
-        \li Retrieves data representing the \l{Viewing Call Stack Trace}
-            {call stack} at the application's current position.
-
-        \li Retrieves the contents of \l{Local Variables and Function Parameters}
-            {local variables}.
-
-        \li Examines \l{Evaluating Expressions}{expressions}.
-
-        \li Updates the \l{Viewing and Editing Register State}{Registers},
-            \l{Viewing Modules}{Modules}, and \l{Viewing Disassembled Code}
-            {Disassembler} views if you are debugging C++ based applications.
-
-    \endlist
-    You can \l{Examining Data}{Examine} and change variables, set or remove
-    breakpoints, and then continue running the application.
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger},
+    {Debugger Views}
 */
 
 /*!
     \page creator-debugger-examining-data.html
-    \previouspage creator-debugger-stopping.html
-    \nextpage creator-remote-debugging.html
+    \previouspage creator-how-tos.html
 
-    \title Examining Data
+    \ingroup creator-how-to-debug
 
-    When the application stops, you can examine certain data in the debugger. The
-    availability of data depends on the compiler settings when compiling the
-    application and the exact location where the application stops.
-
-    Unexpected events are called \e exceptions and the debugger can stop
-    the application when they occur. Going to the location in the code where
-    the exception occurred helps you investigate the problem and find ways to
-    fix it.
-
-    If you have a variable that shows text, but the application does not display
-    it correctly, for example, your data might be incorrect or the code that sets
-    the display text might do something wrong. You can step through the code and
-    examine changes to the variable to find out where the error occurs.
-
-    The following video shows how to examine variable values:
-
-    \youtube EhJ1eV_6RH8
-
-    \section1 Showing Tooltips for Simple Values
+    \title Show tooltips for simple values
 
     To display the value of a simple variable, hover the mouse pointer over its
     name in the code editor.
@@ -791,15 +863,25 @@
     select \uicontrol {Close Editor Tooltips} in the context menu in the
     \uicontrol Locals or \uicontrol Expressions view.
 
-    To disable tooltips for performance reasons, select \preferences >
+    To disable tooltips for performance reasons, go to \preferences >
     \uicontrol Debugger > \uicontrol General >
     \uicontrol {Use tooltips in main editor when debugging}.
 
-    \section1 Examining Complex Values in Debug Views
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger},
+    {Debugger Views}
+*/
 
-    \QC displays the raw information from the native debuggers in a clear and
+/*!
+    \page creator-how-to-examine-complex-values.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-debug
+
+    \title Examine complex values in Debug views
+
+    \QC displays the raw information from the debuggers in a clear and
     concise manner to simplify the debugging process without losing the power
-    of the native debuggers.
+    of the debuggers.
 
     \image qtcreator-locals.png {Locals view}
 
@@ -826,7 +908,7 @@
 
     To show complex structures, such as \c QObjects or associative containers,
     in a clear and concise manner, \QC uses Python scripts that are called
-    \l{Using Debugging Helpers}{debugging helpers}.
+    \l{Debugging Helpers}{debugging helpers}.
 
     In addition to the generic IDE functionality of the
     \l {Viewing Call Stack Trace}{Stack}, \uicontrol {Locals},
@@ -839,10 +921,21 @@
     classes in a useful way.
 
     To change the number of array elements that are
-    requested when expanding entries, select \preferences > \uicontrol {Debugger}
+    requested when expanding entries, go to \preferences > \uicontrol {Debugging}
     > \uicontrol {Locals & Expressions} > \uicontrol {Default array size}.
 
-    \section1 Stepping Through Code
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger},
+    {Debugger Views}
+*/
+
+/*!
+    \page creator-how-to-step-through-code.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-debug
+
+    \title Step through code
 
     The following table summarizes the functions that you can use to step through
     the code and examine the changes in variables.
@@ -900,17 +993,17 @@
                 stopped.
     \endtable
 
-    \section2 Compressing Steps in GDB
+    \section1 Compress steps in GDB
 
     When using GDB as the debugging backend, you can compress several steps
     into one step for less noisy debugging. For more information, see
-    \l{Specifying GDB Settings}.
+    \l{GDB}.
 
     The extended GDB settings have the option to step backwards in code,
     but this option should be used with care, as it is slow and unstable on the
-    GDB side. For more information, see \l{Specifying GDB Settings}.
+    GDB side. For more information, see \l{GDB}.
 
-    \section2 Stepping into Frameworks in \macos
+    \section1 Step into Frameworks in \macos
 
     In \macos, external libraries are usually built into so-called Frameworks,
     which may have both release and debug versions of the library. When you
@@ -919,7 +1012,17 @@
     \uicontrol {Use debug versions of Frameworks} option in the project run
     settings.
 
-    \section1 Inspecting Basic Qt Objects
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger},
+    {Debugger Views}
+*/
+
+/*!
+    \page creator-how-to-inspect-basic-qt-objects.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-debug
+
+    \title Inspect basic Qt objects
 
     The most powerful feature of the debugger is that the \uicontrol {Locals}
     and \uicontrol {Expressions} views show the data that belongs to
@@ -931,16 +1034,16 @@
     displays the contents of a QHash or QMap in an orderly manner. Also, the
     debugger shows access data for QFileInfo and the \e real contents of QVariant.
 
-    \section2 Changing Value Display format
+    \section1 Change value display format
 
     In the \uicontrol {Locals} or the \uicontrol {Expressions} view, select
     \uicontrol {Change Value Display Format} in the context menu to change the
     value display format. The available options depend on the type of the
-    current items, and are provided by the debugging helpers.
+    current items, and are provided by \l{Debugging Helpers}{debugging helpers}.
 
-    To force a plain C-like display of structures, select \preferences >
-    \uicontrol Debugger > \uicontrol {Locals & Expressions}, and then deselect the
-    \uicontrol {Use Debugging Helpers} check box. This still uses the
+    To force a plain C-like display of structures, go to \preferences >
+    \uicontrol Debugger > \uicontrol {Locals & Expressions}, and then clear
+    \uicontrol {Use Debugging Helpers}. This still uses the
     Python scripts, but generates more basic output. To force the plain display
     for a single object or for all objects of a given type, select
     \uicontrol {Change Value Display Format} > \uicontrol Raw in the context
@@ -961,7 +1064,7 @@
     instead of a single line item in the view. For QPixmap, you can see
     the pixmap being created pixel-by-pixel when stepping through the code.
 
-    \section2 Changing Variable Values
+    \section1 Change variable values
 
     You can use the \uicontrol {Locals} and \uicontrol {Expressions} view to change
     the contents of variables of simple data types, for example, \c int, \c float,
@@ -975,11 +1078,11 @@
     applies the changes only if the new content fits into the old memory and if
     the debugger supports changing values.
 
-    \section2 Signal-Slot Connections
+    \section1 Signal-slot connections
 
     If an instance of a class is derived from QObject, you can find all other
     objects connected to this object's slots with Qt's signals and slots
-    mechanism. Select \preferences > \uicontrol {Debugger} >
+    mechanism. Go to \preferences > \uicontrol {Debugging} >
     \uicontrol {Locals & Expressions} > \uicontrol {Use Debugging Helpers}.
 
     \image qtcreator-debugging-helper-options.webp {Locals & Expressions preferences}
@@ -988,7 +1091,7 @@
     in the \e slots subitem. The view shows the objects connected to this slot
     as children of the slot. Similarly, you can show the children of signals.
 
-    \section2 Low-level Data
+    \section1 Low-level data
 
     If you cannot debug Qt objects because their data is corrupted, you can
     switch off the debugging helpers to make low-level structures visible.
@@ -998,7 +1101,7 @@
     \uicontrol Debugger > \uicontrol {Locals & Expressions}.
 
     \omit
-    \section2 Creating Snapshots
+    \section1 Create snapshots
 
     A snapshot has the complete state of the debugged application at a time,
     including the full memory contents.
@@ -1015,15 +1118,20 @@
     \l{https://sourceware.org/gdb/onlinedocs/gdb/Core-File-Generation.html}.
 
     \endomit
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
 
 /*!
     \page creator-threads-view.html
-    \previouspage creator-breakpoints-view.html
-    \nextpage creator-modules-view.html
+    \previouspage creator-debug-mode.html
+
+    \ingroup creator-reference-debugger-views
 
     \title Viewing Threads
 
+    \brief View the threads currently active in a multi-threaded application.
+
     An application can have more than one thread of execution that share one
     address space, which means that they can examine and change the same
     variables. However, each thread has its own registers, execution stack,
@@ -1042,17 +1150,22 @@
 
     The \l {Viewing Call Stack Trace}{Stack} view adjusts its contents
     accordingly.
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
 
 /*!
     \page creator-modules-view.html
-    \previouspage creator-threads-view.html
-    \nextpage creator-source-files-view.html
+    \previouspage creator-debug-mode.html
+
+    \ingroup creator-reference-debugger-views
 
     \title Viewing Modules
 
-    The \uicontrol Modules view displays information that the debugger plugin
-    has about modules included in the application that is being debugged.
+    \brief View information about the modules included in a debugged application.
+
+    The \uicontrol Modules view displays information about modules included in
+    the application that is being debugged.
 
     A module is:
 
@@ -1088,7 +1201,7 @@
 
         \li Show sections in modules
 
-        \li Set \l{Debugger Preferences}{debugger preferences}
+        \li Set \l{Debugger}{debugger preferences}
 
     \endlist
 
@@ -1099,21 +1212,26 @@
 
     When using CDB as debug backend, you can specify that the debugger should
     break when application modules are loaded or unloaded. To enable breaking
-    for the specified modules, select \preferences > \uicontrol Debugger >
+    for the specified modules, go to \preferences > \uicontrol Debugger >
     \uicontrol CDB.
 
     \image qtcreator-cdb-options.png {CDB tab in Debugger preferences}
 
-    For more information, see \l{Specifying CDB Settings}.
+    For more information, see \l{CDB}.
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
 
 /*!
     \page creator-source-files-view.html
-    \previouspage creator-modules-view.html
-    \nextpage creator-locals-view.html
+    \previouspage creator-debug-mode.html
+
+    \ingroup creator-reference-debugger-views
 
     \title Viewing Source Files
 
+    \brief View source files included in a debugged project.
+
     The \uicontrol {Source Files} view lists all the source files included in
     the project. If you cannot step into an instruction, you can check whether
     the source file is actually part of the project, or whether it was compiled
@@ -1126,7 +1244,7 @@
     \list
         \li Reload data
         \li Open the selected file
-        \li Set \l{Debugger Preferences}{debugger preferences}
+        \li Set \l{Debugger}{debugger preferences}
     \endlist
 
     By default, the \uicontrol {Source Files} view is hidden. To show it, select
@@ -1137,20 +1255,26 @@
     To enable the debugger to step into the code and display the source code
     when using a copy of the source tree at a location different from the one
     at which the libraries were built, you can map source paths to target
-    paths in \preferences > \uicontrol Debugger > \uicontrol General:
+    paths in \preferences > \uicontrol Debugger > \uicontrol General.
 
     \image qtcreator-debugger-general-options.png {General tab in Debugger preferences}
 
-    For more information, see \l{Mapping Source Paths}.
+    For more information, see \l{Source Paths Mapping}.
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
 
 /*!
     \page creator-registers-view.html
-    \previouspage creator-expressions-view.html
-    \nextpage creator-peripheral-registers-view.html
+    \previouspage creator-debug-mode.html
+
+    \ingroup creator-reference-debugger-views
 
     \title Viewing and Editing Register State
 
+    \brief View the current state of general-purpose and special-purpose CPU
+    registers.
+
     \e {Machine code} consists of machine language instructions that make the CPU
     perform tasks, such as load or store, on units of data in the CPU's registers
     or memory.
@@ -1177,7 +1301,7 @@
         \li Open \l {Examining Memory}{Memory Editor} at the selected value.
         \li Open the \l {Viewing Disassembled Code}{Disassembler} view.
         \li Display a value in hexadecimal, decimal, octal, or binary format.
-        \li Set \l{Debugger Preferences}{debugger preferences}.
+        \li Set \l{Debugger}{debugger preferences}.
     \endlist
 
     By default, the \uicontrol Registers view is hidden. To show it, select it in
@@ -1203,15 +1327,21 @@
         \li Set a data breakpoint on the selection.
         \li Jump to the selected address in the current data view or a new one.
     \endlist
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
 
 /*!
     \page creator-peripheral-registers-view.html
-    \previouspage creator-registers-view.html
-    \nextpage creator-debugger-log-view.html
+    \previouspage creator-debug-mode.html
+
+    \ingroup creator-reference-debugger-views
 
     \title Peripheral Registers
 
+    \brief View the current state of peripheral devices, such as a mouse,
+    keyboard, display, printer, or USB drive.
+
     The \uicontrol {Peripheral Registers} view displays the current state of
     peripheral devices, such as a mouse, keyboard, display, printer, or USB
     drive. Applications write registers to send information to the device and
@@ -1231,28 +1361,33 @@
 
     \list
         \li View register groups.
-        \li Set \l{Debugger Preferences}{debugger preferences}.
+        \li Set \l{Debugger}{debugger preferences}.
     \endlist
 
     By default, the \uicontrol {Peripheral Registers} view is hidden. To show it,
     select it in \uicontrol Views on the debugger toolbar.
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
 
 /*!
     \page creator-debugger-log-view.html
-    \previouspage creator-peripheral-registers-view.html
-    \nextpage creator-disassembler-view.html
+    \previouspage creator-debug-mode.html
+
+    \ingroup creator-reference-debugger-views
 
     \title Debugger Log
 
+    \brief Troubleshoot the debugger.
+
     You can view debug output in the \uicontrol {Debugger Log} view to
     \l {Debugger Does Not Work}{troubleshoot the debugger}.
 
     \image qtcreator-debugger-log-view.webp {Debugger Log view}
 
-    If debug output is sent to the system log, select \preferences >
-    \uicontrol Debugger > \uicontrol General >
-    \uicontrol {Force logging to console} check box.
+    If debug output is sent to the system log, go to \preferences >
+    \uicontrol Debugger > \uicontrol General and select
+    \uicontrol {Force logging to console}.
 
     Right-click the view to select the following actions:
 
@@ -1265,16 +1400,16 @@
         \li Log time stamps.
         \li Reload debugging helpers after \l{Adding Custom Debugging Helpers}
             {adding custom debugging helpers}.
-        \li Set \l{Debugger Preferences}{debugger preferences}.
+        \li Set \l{Debugger}{debugger preferences}.
     \endlist
 
-    \section1 Directly Interacting with Native Debuggers
+    \section1 Directly Interacting with Debuggers
 
     You can use the left pane of the \uicontrol {Debugger Log} view to directly
-    interact with the command line of the native debugger.
+    interact with the command line of the debugger.
 
     Press \key {Ctrl+Enter} to send the contents of the line under the
-    text cursor to the native debugger. Or, enter the command in the
+    text cursor to the debugger. Or, enter the command in the
     \uicontrol Command field. The right side pane of the
     \uicontrol {Debugger Log} view shows the command output.
 
@@ -1282,15 +1417,20 @@
     handle the task. For example, instead of using the GDB
     \c print command from the command line, you can evaluate an expression in
     the \l {Evaluating Expressions}{Expressions} view.
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
 
 /*!
     \page creator-disassembler-view.html
-    \previouspage creator-debugger-log-view.html
-    \nextpage creator-debugger-stopping.html
+    \previouspage creator-debug-mode.html
+
+    \ingroup creator-reference-debugger-views
 
     \title Viewing Disassembled Code
 
+    \brief View disassembled code for the current function.
+
     A \e disassembler translates machine language into assembly language for
     human-readability.
 
@@ -1301,13 +1441,13 @@
     \image qtcreator-debugger-disassembler-view.webp {Disassembler view}
 
     By default, GDB shows AT&T style disassembly. To switch to the Intel style,
-    select \preferences > \uicontrol Debugger >
+    go to \preferences > \uicontrol Debugger >
     \uicontrol GDB > \uicontrol {Use Intel style disassembly}.
 
     To open the \uicontrol Disassembler view:
 
     \list
-        \li Select \uicontrol Debug > \uicontrol {Operate by Instruction} while
+        \li Go to \uicontrol Debug > \uicontrol {Operate by Instruction} while
             the debugger is running.
         \li Select the \inlineimage icons/debugger_singleinstructionmode.png
             (\uicontrol {Operate by Instruction}) tool button on the debugger
@@ -1323,27 +1463,22 @@
     \uicontrol {Open Disassembler} and  set the disassembler address:
 
     \image qcreator-debugger-select-start-address.webp {Select Start Address dialog}
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
 
 /*!
-    \previouspage creator-debugger-preferences.html
     \page creator-debugging-helpers.html
-    \nextpage creator-debugging-qml.html
+    \previouspage creator-debug-mode.html
 
-    \title Using Debugging Helpers
+    \ingroup creator-reference-debugger
 
-    To show complex structures, such as \c QObjects or associative containers,
-    in a clear and concise manner, \QC uses Python scripts that are called
-    \e {debugging helpers}.
+    \title Debugging Helpers
 
-    \QC ships with debugging helpers for more than 200 of the most popular Qt
-    classes, standard C++ containers, and smart pointers, covering the usual
-    needs of a C++ application developer out-of-the-box.
-
-    \section1 Extending Debugging Helpers
+    \brief Load, customize, and add debugging helpers.
 
     \QC uses Python scripts to translate raw memory contents and type information
-    data from native debugger backends (GDB, LLDB, and CDB are currently supported)
+    data from debugger backends (GDB, LLDB, and CDB are currently supported)
     into the form presented to the user in the
     \l {Local Variables and Function Parameters}{Locals}
     and \l {Evaluating Expressions}{Expressions} views.
@@ -1357,17 +1492,17 @@
     least one of the three supported backends is available.
 
     To use the default GDB pretty printers installed in your system or linked
-    to the libraries your application uses, select \preferences >
+    to the libraries your application uses, go to \preferences >
     \uicontrol Debugger > \uicontrol GDB > \uicontrol {Load system GDB pretty
-    printers}. For more information, see \l{Specifying GDB Settings}.
+    printers}. For more information, see \l{GDB}.
 
     \image qtcreator-preferences-debugger-gdb.webp {GDB preferences}
 
-    \section2 Customizing Built-In Debugging Helpers
+    \section1 Customizing Built-In Debugging Helpers
 
     You can have commands executed after built-in debugging helpers have
     been loaded and fully initialized. To load additional debugging helpers or
-    modify existing ones, select \preferences > \uicontrol Debugger >
+    modify existing ones, go to \preferences > \uicontrol Debugger >
     \uicontrol {Locals & Expressions}, and enter the commands in the
     \uicontrol {Debugging Helper Customization} field.
 
@@ -1389,17 +1524,17 @@
     \endcode
 
     To display a message box as soon as your application receives a signal
-    during debugging, select \preferences > \uicontrol Debugger > \uicontrol GDB >
+    during debugging, go to \preferences > \uicontrol Debugger > \uicontrol GDB >
     \uicontrol {Show a message box when receiving a signal}.
 
-    \section2 Adding Custom Debugging Helpers
+    \section1 Adding Custom Debugging Helpers
 
     To add debugging helpers for your own types, no compilation is required,
     just adding a few lines of Python. The scripts can address multiple versions
     of Qt, or of your own library, at the same time.
 
     To add debugging helpers for custom types, add debugging helper
-    implementations to the startup file of the native debuggers (for example,
+    implementations to the startup file of the debuggers (for example,
     \c{~/.gdbinit} or \c{~/.lldbinit}) or specify them directly in the
     \uicontrol {Additional Startup Commands} in \preferences >
     \uicontrol Debugger > \uicontrol GDB.
@@ -1444,7 +1579,7 @@
     \uicontrol {Reload Debugging Helpers} from the context menu of the
     \l {Debugger Log} view.
 
-    \section2 Debugging Helper Overview
+    \section1 Debugging Helper Overview
 
     The implementation of a debugging helper typically consists of a single
     Python function, which needs to be named \c{qdump__NS__Foo}, where
@@ -1532,7 +1667,7 @@
         d.putArrayData(base, size, typeobj)
     \endcode
 
-    \section2 Debugging Helper Implementation
+    \section1 Debugging Helper Implementation
 
     A debugging helper creates a description of the displayed data item
     in a format that is similar to GDB/MI and JSON.
@@ -1586,7 +1721,7 @@
     members specified in \c qtcreator\share\qtcreator\debugger\dumper.py.
 
 
-    \section3 Dumper Class
+    \section2 Dumper Class
 
     The \c Dumper class has generic bookkeeping, low-level, and convenience
     functions:
@@ -1612,7 +1747,7 @@
             \endcode
 
         \li \c{putCallItem(self, name, rettype, value, func, *args)} - Uses the
-            native debugger backend to place the function call \c func returning
+            debugger backend to place the function call \c func returning
             \c rettype  on the value specified by \a {value} and to output the
             resulting item.
 
@@ -1752,14 +1887,14 @@
 
     \endlist
 
-    \section3 Dumper.Type Class
+    \section2 Dumper.Type Class
 
     The \c{Dumper.Type} class describes the type of a piece of data, typically
     a C++ class or struct, a pointer to a struct, or a primitive type, such as
     an integral or floating point type.
 
     Type objects, that is, instances of the \c{Dumper.Type} class, can be
-    created by native debugger backends, usually by evaluating Debug Information
+    created by debugger backends, usually by evaluating Debug Information
     built into or shipped alongside the debugged binary, or created on-the-fly
     by the debugging helper.
 
@@ -1807,7 +1942,7 @@
     \endlist
 
 
-    \section3 Dumper.Field Class
+    \section2 Dumper.Field Class
 
     The \c{Dumper.Field} class describes a base class or a data member of a type
     object:
@@ -1830,7 +1965,7 @@
     \endlist
 
 
-    \section3 Dumper.Value Class
+    \section2 Dumper.Value Class
 
     The \c{Dumper.Value} class describes a piece of data, such as instances of
     C++ classes or primitive data types. It can also be used to describe
@@ -1892,7 +2027,7 @@
 
     \endlist
 
-    \section3 Children and SubItem Class
+    \section2 Children and SubItem Class
 
     The attempt to create child items might lead to errors if data is
     uninitialized or corrupted. To gracefully recover in such situations, use
@@ -1931,16 +2066,21 @@
             d.putSubItem("key", key)
             d.putSubItem("value", value)
     \endcode
+
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
 
 
 /*!
-    \previouspage creator-qml-debugging-example.html
     \page creator-troubleshooting-debugging.html
-    \nextpage creator-analyze-mode.html
+    \previouspage creator-reference.html
+
+    \ingroup creator-reference-debugger
 
     \title Troubleshooting Debugger
 
+    \brief Solve problems that you might encounter while debugging.
+
     This section lists some typical problems that you might encounter while
     debugging and solutions to them.
 
@@ -1984,9 +2124,9 @@
             \l {Run on many platforms}{build and run kit selector}
             picked a runnable target and you can run the application.
 
-        \li Make sure the debugger is \l{Setting Up Debugger}{set up properly}.
+        \li Make sure the debugger is \l{Supported Debuggers}{set up properly}.
 
-        \li In the \uicontrol Debug mode, select \uicontrol View >
+        \li In the \uicontrol Debug mode, go to \uicontrol View >
             \uicontrol Views > \uicontrol {Debugger Log} to open the
             \l {Debugger Log} view. Browse the contents of the pane on
             the right hand side to find out what went wrong. Always attach the
@@ -2026,7 +2166,7 @@
 
     When using GDB as backend, you can automatically save a copy of
     its symbol index in a cache on disk and retrieve it from there
-    when loading the same binary in the future. Select \preferences >
+    when loading the same binary in the future. Go to \preferences >
     \uicontrol Debugger > \uicontrol GDB > \uicontrol {Use automatic symbol cache}.
 
     \image qtcreator-preferences-debugger-gdb.webp {GDB preferences}
@@ -2082,4 +2222,5 @@
     calls \c{prctl(0x59616d61, getppid(), 0, 0, 0);}, such as the one in
     \c{$QTCREATORDIR/lib/libptracepreload.so} to the LD_PRELOAD environment.
 
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
 */
diff --git a/doc/qtcreator/src/debugger/qtquick-debugging.qdoc b/doc/qtcreator/src/debugger/qtquick-debugging.qdoc
index a4150ab4137..e44a2f93fc9 100644
--- a/doc/qtcreator/src/debugger/qtquick-debugging.qdoc
+++ b/doc/qtcreator/src/debugger/qtquick-debugging.qdoc
@@ -13,15 +13,17 @@
     \previouspage studio-debugging.html
     \nextpage creator-stack-view.html
     \else
-    \previouspage creator-debugging-helpers.html
-    \nextpage creator-debugging-example.html
+    \previouspage creator-reference.html
     \endif
 
+    \ingroup creator-reference-debugger
+    \ingroup studio-debugger
+
     \title Debugging Qt Quick Projects
 
-    \if defined(qtcreator)
-    \note You need Qt 5.0 or later to debug Qt Quick projects.
-    \endif
+    \brief Debug JavaScript functions, execute JavaScript expressions to get
+    information about the state of the UI, and inspect QML properties and
+    JavaScript variables, as well as change their values temporarily at runtime.
 
     For an example of how to debug Qt Quick Projects, see
     \l{Debugging a Qt Quick Application}.
@@ -56,8 +58,9 @@
         \list 1
 
         \li To create a build configuration that supports QML debugging,
-            select \uicontrol {Projects} > \uicontrol {Build} >
-            \uicontrol {QML debugging and profiling} > \uicontrol Enable.
+            go to \uicontrol {Projects} > \uicontrol {Build}.
+
+        \li In \uicontrol {QML debugging and profiling}, select \uicontrol Enable.
 
             \image qtcreator-build-settings-cmake-configure.webp {Build settings for a CMake project}
 
@@ -79,7 +82,7 @@
             rebuild the project.
 
         \li To debug applications on \l{glossary-device}{devices}, check that
-            Qt 5.0, or later, libraries are installed on the device and
+            Qt libraries are installed on the device and
             \l{Run on many platforms}{select the corresponding kit for the device}
             before you start debugging.
 
@@ -179,7 +182,7 @@
 
             \note Setting breakpoints is only possible if the application is started with block mode.
 
-        \li Select \uicontrol Debug > \uicontrol {Start Debugging} >
+        \li Go to \uicontrol Debug > \uicontrol {Start Debugging} >
             \uicontrol {Attach to QML Port}.
 
             Choose the kit configured for the device where the application to
@@ -225,7 +228,7 @@
 
         \li Select the item in the code editor.
 
-        \li Select \uicontrol Debug > \uicontrol Select to activate selection
+        \li Go to \uicontrol Debug > \uicontrol Select to activate selection
             mode and then click an item in the running application.
 
     \endlist
@@ -243,12 +246,6 @@
     application to jump to their definitions in the code. The properties of the
     selected item are displayed in the \uicontrol {Locals} view.
 
-    \if defined(qtcreator)
-    The \uicontrol Select tool will be enabled either if your application is
-    using Qt 5.7 or later, or if your application is using an earlier version
-    of Qt and is based on the \c QQuickView class.
-    \endif
-
     You can also view the item hierarchy in the running application:
 
     Double-click an item in the running application to cycle through the item
@@ -282,4 +279,8 @@
     When you change property values in the \uicontrol {QML Debugger Console} or
     in the \uicontrol Locals or \uicontrol Expression view, they are immediately
     updated in the running application, but not in the source code.
+
+    \if defined(qtcreator)
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}, {Kits}
+    \endif
 */
diff --git a/doc/qtcreator/src/docker/creator-docker.qdoc b/doc/qtcreator/src/docker/creator-docker.qdoc
index c63ab4b3b59..4f1167b359a 100644
--- a/doc/qtcreator/src/docker/creator-docker.qdoc
+++ b/doc/qtcreator/src/docker/creator-docker.qdoc
@@ -3,12 +3,13 @@
 
     /*!
     \page creator-adding-docker-devices.html
-    \previouspage creator-developing-b2qt.html
-    \nextpage creator-developing-ios.html
+    \previouspage creator-how-tos.html
 
-    \title Adding Docker Devices
+    \ingroup creator-how-to-docker
 
-    Create Docker devices from \l{ https://docs.docker.com/get-started/overview/}
+    \title Add Docker devices
+
+    Create Docker devices from \l{https://docs.docker.com/get-started/overview/}
     {Docker images} and use them to build, run, and debug applications. A Docker
     container operates like a virtual machine but uses less system resources at
     the cost of being less flexible.
@@ -16,7 +17,7 @@
     While Linux, \macos, and Windows hosts are supported in principle, Linux is
     the recommended platform.
 
-    To build, run, and debug applications on Docker devices, you must install and
+    To build, run, and debug applications on Docker devices, install and
     configure \c docker-cli on the development host. \QC automatically detects
     \l{kits-tab}{build and run kit} items, such \l{Add debuggers}
     {debuggers} and \l{Add Qt versions}{Qt versions}, in the Docker container
@@ -24,29 +25,70 @@
 
     You are advised to use CMake to build applications in the Docker container.
 
+    \note Enable the Docker plugin to use it.
+
     To pull images from Docker hub or other registries, use the
     \l{https://docs.docker.com/engine/reference/commandline/pull/}{docker pull}
     command.
 
-    \section1 Adding Docker Images as Devices
+    \section1 Add Docker images as devices
 
     To add a Docker image as a device:
 
     \list 1
-        \li Select \preferences > \uicontrol Devices
-            > \uicontrol Docker and enter the path to the Docker CLI in
-            the \uicontrol Command field.
-            \image qtcreator-preferences-devices-docker.webp "Docker tab in Devices preferences"
-        \li Select \uicontrol Devices > \uicontrol Add >
-            \uicontrol {Docker Device} > \uicontrol {Start Wizard}
-            to search for images in your local Docker installation.
-        \li Select the Docker image to use, and then select \uicontrol OK.
+        \li Go to \preferences > \uicontrol Devices > \uicontrol Docker.
+        \li In \uicontrol Command, enter the path to the Docker CLI.
+            \image qtcreator-preferences-devices-docker.webp {Docker tab in Devices preferences}
+        \li Go to \uicontrol Devices.
+        \li Select \uicontrol Add > \uicontrol {Docker Device} >
+            \uicontrol {Start Wizard} to search for images in your
+            local Docker installation.
+        \li Select a Docker image, and then select \uicontrol OK.
         \li In \uicontrol Devices, check and change Docker device preferences.
-            \image qtcreator-preferences-devices-docker-device.png "Docker device preferences"
+            \image qtcreator-preferences-devices-docker-device.png {Docker device preferences}
         \li Select \uicontrol Apply to save your changes.
     \endlist
 
-    The following table summarizes the options you can set.
+    \section2 Select Docker images
+
+    The \uicontrol {Docker Image Selection} dialog displays a list of Docker
+    images in your local Docker installation. You can sort the images according
+    to the repository name or tag or the image ID or size.
+
+    \image qtcreator-docker-image-selection.webp {Docker Image Selection dialog}
+
+    Select \uicontrol {Show unnamed images} to show images that are not tagged.
+
+    Double-click an image to select it.
+
+    \section1 Edit Docker device kits
+
+    Go to \preferences > \uicontrol Kits to check
+    that the automatically generated kits point to the appropriate kit items.
+
+    \sa {Enable and disable plugins}, {Docker}{How To: Develop for Docker},
+    {Manage Kits}{How To: Manage Kits}
+*/
+
+/*!
+    \page creator-preferences-docker.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-docker
+
+    \title Set preferences for Docker devices
+
+    \note Enable the Docker plugin to use it.
+
+    To set preferences for Docker devices:
+
+    \list 1
+        \li Go to \preferences > \uicontrol Devices > \uicontrol Devices.
+        \li In \uicontrol Device, select a Docker device.
+            \image qtcreator-preferences-devices-docker-device.png {Docker device preferences}
+    \endlist
+
+    The following table summarizes the preferences you can set.
 
     \table
     \header
@@ -59,7 +101,7 @@
             on Windows.
     \row
         \li \uicontrol {Do not modify entry point}
-        \li Stops \QC from modifying the \l {Modifying Entry Points}{entry point}
+        \li Stops \QC from modifying the \l {Modify entry points}{entry point}
             of the image. Make sure that the entry point starts a shell.
     \row
         \li \uicontrol {Enable flags needed for LLDB}
@@ -69,33 +111,18 @@
             \endcode
     \row
         \li \uicontrol {Clangd executable}
-        \li The path to a remote Clangd executable to use for a remote code
-            model.
+        \li The path to a remote Clangd executable for a remote code model.
     \row
         \li \uicontrol {Paths to mount}
-        \li Host directories to \l{Specifying Paths to Mount}{mount} into the
+        \li Host directories to \l{Specify paths to mount}{mount} into the
             container, such as the project directory.
     \row
         \li \uicontrol {Search locations}
-        \li Where to \l{Auto-detecting Kit Items}{automatically detect} kit
+        \li Where to \l{Auto-detect kit items}{automatically detect} kit
             items.
     \endtable
 
-    The following sections describe the Docker device preferences in more detail.
-
-    \section2 Selecting Docker Images
-
-    The \uicontrol {Docker Image Selection} dialog displays a list of Docker
-    images in your local Docker installation. You can sort the images according
-    to the repository name or tag or the image ID or size.
-
-    \image qtcreator-docker-image-selection.webp "Docker Image Selection dialog"
-
-    Select \uicontrol {Show unnamed images} to show images that are not tagged.
-
-    Double-click an image to select it.
-
-    \section2 Modifying Entry Points
+    \section1 Modify entry points
 
     The entry point of a Docker container is specified in the container settings
     and started as the main process when starting the container. The entry point
@@ -107,9 +134,9 @@
     \uicontrol {Do not modify entry point}. However, if the entry
     point you specify is not a shell, \QC cannot start the container.
 
-    \section2 Specifying Paths to Mount
+    \section1 Specify paths to mount
 
-    You can either copy your project files into the Docker container or specify
+    Copy your project files into the Docker container or specify
     paths to them in \uicontrol {Paths to mount}. Shared mounts are restricted
     to locations in the host system that can end up in the same absolute location
     in the Docker container. On Windows, network mounts cannot be used as shared
@@ -120,7 +147,7 @@
     \uicontrol {Delete Line} to delete the selected path or \uicontrol Clear
     to delete all paths.
 
-    \section2 Auto-detecting Kit Items
+    \section1 Auto-detect kit items
 
     Select \uicontrol {Auto-detect Kit Items} to find kit items and create kits
     for the Docker device. You can search for kit items in the device's PATH or
@@ -143,20 +170,32 @@
     \uicontrol {List Auto-Detected Kit Items}. To remove
     them, select \uicontrol {Remove Auto-Detected Kit Items}.
 
-    \section1 Editing Docker Device Kits
+    \sa {Enable and disable plugins}, {Docker}{How To: Develop for Docker},
+    {Manage Kits}{How To: Manage Kits}
+*/
 
-    Select \preferences > \uicontrol Kits to check
-    that the automatically generated kits point to the appropriate kit items.
+/*!
+    \page creator-how-to-build-run-docker.html
+    \previouspage creator-how-tos.html
 
-    To specify build settings:
+    \ingroup creator-how-to-docker
+
+    \title Build for and run on Docker devices
+
+    \note Enable the Docker plugin to use it.
+
+    To specify build settings for Docker images:
 
         \list 1
             \li Open a project for an application you want to develop for the
                 device.
-            \li Select \uicontrol Projects > \uicontrol {Build & Run} to enable
-                the kit that you specified above.
+            \li Go to \uicontrol Projects > \uicontrol {Build & Run}, and
+                activate the kit for Docker devices.
         \endlist
 
     Select \uicontrol Run to specify run settings. Usually, you can use
     the default settings.
+
+    \sa {Enable and disable plugins}, {Docker}{How To: Develop for Docker},
+    {Manage Kits}{How To: Manage Kits}
 */
diff --git a/doc/qtcreator/src/editors/creator-code-syntax.qdoc b/doc/qtcreator/src/editors/creator-code-syntax.qdoc
index 5a383f9df8d..f59ba0fd941 100644
--- a/doc/qtcreator/src/editors/creator-code-syntax.qdoc
+++ b/doc/qtcreator/src/editors/creator-code-syntax.qdoc
@@ -9,7 +9,7 @@
     \previouspage creator-how-tos.html
     \endif
 
-    \ingroup creator-how-to-edit
+    \ingroup creator-how-to-analyze
     \ingroup studio-how-to-code
 
     \title Check code syntax
@@ -68,7 +68,7 @@
 
     To specify the position where the annotations are displayed, go to
     \preferences > \uicontrol {Text Editor} >
-    \uicontrol Display > \uicontrol {Line annotations}, and then select
+    \uicontrol Display > \uicontrol {Line Annotations}, and then select
     whether to display the annotations directly next to the code, aligned
     to the right of the code, or in the right margin. Showing annotations
     between lines can be useful if there is usually not enough space to
@@ -79,11 +79,11 @@
     If you hide the annotations, you can move the mouse pointer over an icon to
     view them.
 
-    \if defined(qtcreator)
-    \sa {Analyze code with Clang-Tidy and Clazy}
-    \endif
-
     \sa {JavaScript and QML Checks}
+
+    \if defined(qtcreator)
+    \sa {Analyze}{How To: Analyze}, {Analyzers}, {Analyzing Code}
+    \endif
 */
 
 /*!
@@ -766,6 +766,10 @@
     \uicontrol {Reset Code Model}.
 
     \sa {Check code syntax}, {Using QML Modules with Plugins}
+
+    \if defined(qtcreator)
+    \sa {Analyzing Code}
+    \endif
 */
 
 /*!
diff --git a/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc b/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc
index bdf06e24eb4..ae81bdc3abd 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc
@@ -124,8 +124,34 @@
     The document outline in the \l{Outline} view is backed by clangd's document
     symbol support, which makes the results more reliable than before.
 
-    \sa {Code Model}, {Clangd}, {Specify clangd settings},
-    {Specify Clang tools settings}, {Use compilation databases}
+    \sa {Configure C++ code model}, {Specify clangd settings},
+    {Specify Clang tools settings}, {Use compilation databases},
+    {Code Model}, {Clangd}
+*/
+
+/*!
+    \page creator-how-to-cpp-code-model.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-configure-editors
+    \ingroup creator-how-to-projects-configure
+
+    \title Configure C++ code model
+
+    The code model offers services such as code completion, syntactic and
+    semantic highlighting, and diagnostics.
+
+    To configure the C++ code model for a project:
+
+    \list 1
+        \li Go to \uicontrol Projects > \uicontrol {Project Settings} >
+            \uicontrol {C++ Code Model}.
+            \image qtcreator-projects-cpp-code-model.webp {C++ Code Model settings}
+        \li Clear \uicontrol {Use global settings}.
+        \li Set \uicontrol {C++ Code Model} settings for the project.
+    \endlist
+
+    \sa {Code Model}
 */
 
 /*!
@@ -136,42 +162,49 @@
 
     \title Code Model
 
-    \brief Sets global preferences for the code model.
+    \brief Sets global preferences for the C++ code model.
 
-    The Clang code model offers services such as code completion, syntactic and
+    The code model offers services such as code completion, syntactic and
     semantic highlighting, and diagnostics.
 
-    To configure the Clang code model globally:
+    To configure the C++ code model globally, go to \preferences >
+    \uicontrol C++ > \uicontrol {Code Model}.
 
-    \list 1
+    \image qtcreator-preferences-code-model.webp {C++ Code Model preferences}
 
-        \li Select \preferences > \uicontrol C++ >
-            \uicontrol {Code Model}.
-
-            \image qtcreator-preferences-code-model.webp {C++ Code Model preferences}
-
-        \li To instruct the code model to interpret ambiguous header files as C
-            language files if you develop mainly using C, select the
-            \uicontrol {Interpret ambiguous headers as C headers} check box.
-
-        \li To process precompiled headers, deselect the
-            \uicontrol {Ignore precompiled headers} check box.
-
-        \li To use the built-in preprocessor to show the
-            pre-processed source file in the editor, select
-            \uicontrol {Use built-in preprocessor to show pre-processed files}.
+    The following table summarizes the preferences.
 
+    \table
+    \header
+        \li Setting
+        \li Value
+    \row
+        \li \uicontrol {Interpret ambiguous headers as C headers}
+        \li Instructs the code model to interpret ambiguous header files as C
+            language files. Select this checkbox if you develop mainly using C.
+    \row
+        \li \uicontrol {Ignore precompiled headers}
+        \li Clear this checkbox to process precompiled headers.
+    \row
+        \li \uicontrol {Use built-in preprocessor to show pre-processed files}
+        \li Uses the built-in preprocessor to show the
+            pre-processed source file in the editor.
+    \row
+        \li \uicontrol {Enable indexing}
+        \li Turns on the built-in indexer. Clearing this checkbox severely limits
+            the capabilities of the code model.
+    \row
+        \li \uicontrol {Do not index files greater than}
         \li To avoid out-of-memory crashes caused by indexing huge source files
             that are typically auto-generated by scripts or code, the size of
-            files to index is limited to 5MB by default. To adjust the limit,
-            edit the value for the \uicontrol {Do not index files greater than}
-            check box. To index all files, deselect the check box.
+            files to index is limited to 5MB by default.
 
-        \li To ignore files that match wildcard patterns, select the
-            \uicontrol {Ignore files} check box and enter each wildcard pattern
-            on a separate line in the field.
-
-    \endlist
+            To index all files, clear the checkbox.
+    \row
+        \li \uicontrol {Ignore files}
+        \li To ignore files that match wildcard patterns, enter each wildcard
+            pattern on a separate line in the field.
+    \endtable
 
     \section1 Inspect preprocessed C++ code
 
@@ -186,7 +219,8 @@
     this action also expands all \c {"#include <foo.h>"} statements to their
     actual contents.
 
-    \sa {Specify clangd settings}, {Clang Code Model}, {Clangd}
+    \sa {Configure C++ code model}, {Specify clangd settings},
+    {Clang Code Model}, {Clangd}
 */
 
 /*!
@@ -213,9 +247,14 @@
             version 14, or later.
         \li In the \uicontrol {Background indexing} field, select \uicontrol Off
             to use a faster, but less accurate built-in indexer than the one used
-            by default. You can set the indexing priority depending on whether
+            by default. Set the indexing priority depending on whether
             the accuracy of results or speed is more important to you during
             global symbol searches.
+        \li In \uicontrol {Per-project index location}, select the folder to
+            store the index files for each project. The \c {compile-commands.json}
+            file is also stored in this folder.
+        \li In \uicontrol {Per-session index location}, select the folder to
+            store the index files for each session.
         \li In \uicontrol {Header/source switch mode}, select the C/C++
             backend for switching between header and source files. While the
             clangd implementation has more capabilities than the built-in
@@ -224,6 +263,13 @@
         \li By default, clangd attempts to use all unused cores. You can set a
             fixed number of cores to use in \uicontrol {Worker thread count}.
             Background indexing also uses this many worker threads.
+        \li Select \uicontrol {Insert header files on completion} to insert
+            header files when completing symbols.
+        \li Select \uicontrol {Update dependent sources} to re-parse all source
+            files that include a header file when editing the header file. This
+            can cause a heavy CPU load if the header file is included in many
+            source files. Clear this option to only re-parse the source files
+            when saving the header file.
         \li Set the number of \uicontrol {Completion results} if you regularly
             miss important results during code completion. Set it to 0 to remove
             the limit on the number of completion results. Setting this to 0 or a
diff --git a/doc/qtcreator/src/editors/creator-only/creator-coding-edit-mode.qdoc b/doc/qtcreator/src/editors/creator-only/creator-coding-edit-mode.qdoc
index dbf8b219ed0..9bbfe729d93 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-coding-edit-mode.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-coding-edit-mode.qdoc
@@ -111,7 +111,7 @@
     \row
         \li \inlineimage icons/live-preview.png
         \li Preview changes to QML code live in your application.
-        \li \l {Previewing on Desktop}
+        \li \l {Preview a QML file on desktop}
     \row
         \li \inlineimage icons/debugger_singleinstructionmode.png
         \li Run Clang-Tidy or Clazy to analyze the currently open file.
@@ -417,18 +417,18 @@
 
     \image qtcreator-options-texteditor-behavior-file-encodings.png {File encoding preferences}
 
-    Qt 5 and Qt 6 require UTF-8 encoded source files, and therefore the default
+    Qt requires UTF-8 encoded source files, and therefore the default
     encoding is set to \uicontrol UTF-8.
-    Detecting the correct encoding is tricky, so \QC will not try to do so.
-    Instead, it displays the following error message when you try to edit a file
-    that is not UTF-8 encoded: \uicontrol {Error: Could not decode "filename" with
+
+    If you try to edit a file that is not UTF-8 encoded, you see the following
+    error message: \uicontrol {Error: Could not decode "filename" with
     "UTF-8"-encoding. Editing not possible.}
 
     To resolve the issue, use a file conversion tool to convert the file
-    encoding to UTF-8 when developing Qt 5 applications. Otherwise, conversion
-    of string constants to QString might not work as expected.
+    encoding to UTF-8. Otherwise, conversion of string constants to
+    QString might not work as expected.
 
-    If you develop only Qt 4 applications or other than Qt applications, you
+    If you do not develop Qt applications, you
     can set other encoding options as the default encoding. Select the
     \uicontrol System option to use the file encoding used by your system.
 
diff --git a/doc/qtcreator/src/editors/creator-only/creator-cpp-quick-fixes.qdoc b/doc/qtcreator/src/editors/creator-only/creator-cpp-quick-fixes.qdoc
index b3bab5c7feb..ad5577b7a9b 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-cpp-quick-fixes.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-cpp-quick-fixes.qdoc
@@ -103,23 +103,192 @@
         \li Create function declarations and definitions
    \endlist
 
-    The following table summarizes the quick fixes for C++ code. The
-    fix is available when the cursor is in the position described in the
-    Activation column.
+    The following tables summarize the quick fixes available for C++ code,
+    according to the cursor position.
+
+    \section1 Block of Code Selected
+
+    \table
+        \header
+            \li Quick Fix
+            \li Description
+        \row
+            \li Assign to Local Variable
+            \li Adds a local variable which stores the return value of a
+                function call or a new expression. For example, rewrites
+
+    \code
+    QString s;
+    s.toLatin1();
+    \endcode
+
+                as
+
+    \code
+    QString s;
+    QByteArray latin1 = s.toLatin1();
+    \endcode
+
+                and
+
+    \code
+    new Foo;
+    \endcode
+
+                as
+
+    \code
+    Foo * localFoo = new Foo;
+    \endcode
+
+                By default, \QC uses the \c auto variable type when creating the
+                variable. To label the variable with its actual type, select
+                \preferences > \uicontrol C++ > \uicontrol {Quick Fixes} and
+                clear \uicontrol {Use type "auto" when creating new variables}.
+
+                Also available for a function call.
+        \row
+            \li Extract Function
+            \li Moves the selected code to a new function and replaces the block
+                of code with a call to the new function. Enter a name for the
+                function in the \uicontrol {Extract Function Refactoring}
+                dialog.
+        \row
+            \li Extract Constant as Function Parameter
+            \li Replaces the selected literal and all its occurrences with the
+                function parameter \c{newParameter}, which has the original
+                literal as the default value.
+    \endtable
+
+    \section1 Class
+
+    The following quick fixes are available when the cursor is on the definition
+    of a class.
+
+    \table
+        \header
+            \li Quick Fix
+            \li Description
+        \row
+            \li Create Implementations for Member Functions
+            \li Creates implementations for all member functions in one go.
+                In the \uicontrol {Member Function Implementations} dialog,
+                specify whether the member functions are generated
+                inline or outside the class.
+        \row
+            \li Generate Constructor
+            \li Creates a constructor for a class.
+        \row
+            \li Generate Missing Q_PROPERTY Members
+            \li Adds missing members to a \c Q_PROPERTY:
+            \list
+                \li \c read function
+                \li \c write function, if there is a WRITE
+                \li \c {onChanged} signal, if there is a NOTIFY
+                \li data member with the name \c {m_<propertyName>}
+            \endlist
+        \row
+            \li Insert Virtual Functions of Base Classes
+            \li Inserts declarations and the corresponding definitions inside or
+                outside the class or in an implementation file (if it exists).
+                For more information, see \l{Insert virtual functions}.
+        \row
+            \li Move All Function Definitions
+            \li Moves all function definitions to the implementation file or
+                outside the class. For example, rewrites
+    \code
+    class Foo
+    {
+      void bar()
+      {
+          // do stuff here
+      }
+      void baz()
+      {
+          // do stuff here
+      }
+    };
+    \endcode
+
+                as
+
+    \code
+    class Foo
+    {
+      void bar();
+      void baz();
+    };
+
+    void Foo::bar() {
+        // do stuff here
+    }
+
+    void Foo::baz() {
+        // do stuff here
+    }
+    \endcode
+    \row
+        \li Move Class to a Dedicated Set of Source Files
+        \li Moves a class to separate header and source files. For more
+            information, see \l{Move classes to separate files}.
+    \row
+        \li Re-order Member Function Definitions According to Declaration Order
+        \li Re-orders method definitions in a .cpp file to follow the order of
+            method declarations in the corresponding .h file.
+    \endtable
+
+    \section1 Class Member
+
+    The following quick fixes are available when the cursor is on a member
+    variable in a class definition.
+
+    \table
+        \header
+            \li Quick Fix
+            \li Description
+        \row
+            \li Generate Constant Q_PROPERTY and Missing Members
+            \li Generates a constant Q_PROPERTY and adds missing members
+                to it.
+        \row
+            \li Generate Getter
+            \li Creates a getter member function for a member variable.
+        \row
+            \li Generate Getter and Setter
+            \li Creates getter and setter member functions for a member
+                variable.
+        \row
+            \li Create Getter and Setter Member Functions
+            \li Creates either both getter and setter member functions for
+                member variables or only a getter or setter.
+        \row
+            \li Generate Q_PROPERTY and Missing Members
+            \li Generates a Q_PROPERTY and adds missing members to it.
+        \row
+            \li Generate Q_PROPERTY and Missing Members with Reset Function
+            \li Generates a Q_PROPERTY and adds missing members to it, with an
+                additional \c reset function.
+        \row
+            \li Generate Setter
+            \li Creates a setter member function for a member variable.
+    \endtable
+
+    \section1 Control Statement
 
     \table
         \header
             \li Quick Fix
             \li Description
-            \li Activation
         \row
             \li Add Curly Braces
-            \li Adds curly braces to an if statement that does not have a
-                compound statement. For example, rewrites
+            \li Adds curly braces to an if clause or to a do, while, or for
+                loop. For example, rewrites an if clause
 
     \code
     if (a)
         b;
+    else
+        c;
     \endcode
 
                 as
@@ -127,9 +296,60 @@
     \code
     if (a) {
         b;
+    } else {
+        c;
     }
     \endcode
-            \li \c if
+
+    Rewrites a do loop
+
+    \code
+    do
+        ++i;
+    while (i < 10);
+    \endcode
+
+                as
+
+    \code
+    do {
+        ++i;
+    } while (i < 10);
+    \endcode
+
+    Rewrites a while loop
+
+    \code
+    while (i > 0)
+        --i;
+    \endcode
+
+            as
+
+    \code
+    while (i > 0) {
+        --i;
+    }
+    \endcode
+
+    Rewrites a for loop
+
+    \code
+    for (int i = 0; i < 10; ++i)
+        func(i);
+    \endcode
+
+            as
+
+    \code
+    for (int i = 0; i < 10; ++i) {
+         func(i);
+    }
+    \endcode
+        \row
+            \li Complete Switch Statement
+            \li Adds all possible cases to a switch statement of the type
+                \c enum.
         \row
             \li Move Declaration out of Condition
             \li Moves a declaration out of an if or while condition to simplify
@@ -145,219 +365,33 @@
     Type name = foo;
     if (name) {}
     \endcode
-            \li Name of the introduced variable
         \row
-            \li Rewrite Condition Using ||
-            \li Rewrites the expression according to De Morgan's laws. For
-                example, rewrites:
+            \li Optimize for-Loop
+            \li Rewrites post-increment operators as pre-increment operators and
+                post-decrement operators as pre-decrement operators. It also
+                moves other than string or numeric literals and id expressions
+                from the condition of a for loop to its initializer. For
+                example, rewrites
+
     \code
-    !a && !b
+    for (int i = 0; i < 3 * 2; i++)
     \endcode
 
                 as
 
     \code
-    !(a || b)
+    for (int i = 0, total = 3 * 2; i < total; ++i)
     \endcode
-            \li \c &&
+    \endtable
+
+    \section1 Function Declaration or Definition
+
+    \table
+        \header
+            \li Quick Fix
+            \li Description
         \row
-            \li Rewrite Using \e operator
-            \li Rewrites an expression negating it and using the inverse
-                operator. For example, rewrites:
-
-            \list
-
-    \li    \code
-    a op b
-    \endcode
-
-                as
-
-    \code
-    !(a invop b)
-    \endcode
-
-    \li    \code
-    (a op b)
-    \endcode
-
-                as
-
-    \code
-    !(a invop b)
-    \endcode
-
-    \li   \code
-    !(a op b)
-    \endcode
-
-                as
-
-    \code
-    (a invob b)
-    \endcode
-
-    \endlist
-
-            \li \c {<=}, \c {<}, \c {>}, \c {>=}, \c {==} or \c {!=}
-        \row
-            \li Split Declaration
-            \li Splits a simple declaration into several declarations. For
-                example, rewrites:
-    \code
-    int *a, b;
-    \endcode
-
-                as
-
-    \code
-    int *a;
-    int b;
-    \endcode
-            \li Type name or variable name
-        \row
-            \li Split if Statement
-            \li Splits an if statement into several statements. For example,
-                rewrites:
-
-    \code
-    if (something && something_else) {
-    }
-    \endcode
-
-                as
-
-    \code
-    if (something) {
-       if (something_else) {
-       }
-    }
-    \endcode
-
-                and
-
-    \code
-    if (something || something_else)
-        x;
-    \endcode
-
-                with
-
-    \code
-    if (something)
-        x;
-    else if (something_else)
-        x;
-    \endcode
-
-            \li \c && or \c ||
-        \row
-            \li Swap Operands
-            \li Rewrites an expression in the inverse order using the inverse
-                operator. For example, rewrites:
-    \code
-    a op b
-    \endcode
-
-                as
-    \code
-    b flipop a
-    \endcode
-            \li \c {<=}, \c {<}, \c {>},  \c {>=}, \c {==}, \c {!=}, \c {&&}
-                or \c {||}
-        \row
-            \li Convert to Decimal
-            \li Converts an integer literal to decimal representation
-            \li Numeric literal
-        \row
-            \li Convert to Hexadecimal
-            \li Converts an integer literal to hexadecimal representation
-            \li Numeric literal
-        \row
-            \li Convert to Octal
-            \li Converts an integer literal to octal representation
-            \li Numeric literal
-        \row
-            \li Convert to Objective-C String Literal
-            \li Converts a string literal to an Objective-C string literal if
-                the file type is Objective-C(++). For example, rewrites the
-                following strings
-
-    \code
-    "abcd"
-    QLatin1String("abcd")
-    QLatin1Literal("abcd")
-    \endcode
-
-                as
-
-    \code
-    @"abcd"
-    \endcode
-            \li String literal
-        \row
-            \li Enclose in QLatin1Char()
-            \li Sets the encoding for a character to Latin-1, unless the
-                character is already enclosed in QLatin1Char, QT_TRANSLATE_NOOP,
-                tr, trUtf8, QLatin1Literal, or QLatin1String. For example,
-                rewrites
-
-    \code
-    'a'
-    \endcode
-
-                as
-
-    \code
-    QLatin1Char('a')
-    \endcode
-            \li String literal
-        \row
-            \li Enclose in QLatin1String()
-            \li Sets the encoding for a string to Latin-1, unless the string is
-                already enclosed in QLatin1Char, QT_TRANSLATE_NOOP, tr, trUtf8,
-                QLatin1Literal, or QLatin1String. For example, rewrites
-    \code
-    "abcd"
-    \endcode
-
-                as
-
-    \code
-    QLatin1String("abcd")
-    \endcode
-
-            \li String literal
-        \row
-            \li Enclose in QByteArrayLiteral()
-            \li Converts a string to a byte array. For example, rewrites
-    \code
-    "abcd"
-    \endcode
-
-                as
-
-    \code
-    QByteArrayLiteral("abcd")
-    \endcode
-
-            \li String literal
-        \row
-            \li Mark as Translatable
-            \li Marks a string translatable. For example, rewrites \c "abcd"
-                with one of the following options, depending on which of them is
-                available:
-
-    \code
-    tr("abcd")
-    QCoreApplication::translate("CONTEXT", "abcd")
-    QT_TRANSLATE_NOOP("GLOBAL", "abcd")
-    \endcode
-
-            \li String literal
-
-        \row
-            \li Add Definition in ...
+            \li Add Definition ...
             \li Inserts a definition stub for a function declaration either in
                 the header file (inside or outside the class) or in the
                 implementation file. For free functions, inserts the definition
@@ -410,47 +444,381 @@
 
     }
     \endcode
-
-            \li Function name
         \row
             \li Add \c Function Declaration
             \li Inserts the member function declaration that matches the member
                 function definition into the class declaration. The function can
                 be \c {public}, \c {protected}, \c {private}, \c {public slot},
                 \c {protected slot}, or \c {private slot}.
-            \li Function name
+       \row
+            \li Apply Changes
+            \li Keeps function declarations and definitions synchronized by
+                checking for the matching declaration or definition when you
+                edit a function signature and by applying the changes to the
+                matching code.
+
+                When this fix is available, a light bulb icon appears:
+                \inlineimage icons/refactormarker.png
+        \row
+            \li Convert Function Call to Qt Meta-Method Invocation
+            \li Converts an invokable function call into a meta method
+                invocation. This applies to signals and slots in general,
+                as well as functions explicitly marked with \c Q_INVOKABLE.
+                For example, for the following class:
+    \code
+    class Foo : public QObject
+    {
+        Q_OBJECT
+    public:
+        explicit Foo(QObject *parent = nullptr);
+
+        Q_SLOT void pubBar(int i);
+
+    private:
+        Q_INVOKABLE void bar(int i, const QString &c);
+    };
+    \endcode
+
+                rewrites
+
+    \code
+    Foo::Foo(QObject *parent)
+        : QObject{parent}
+    {
+        this->bar(42, QString("answer"));
+    }
+    \endcode
+
+                as
+
+    \code
+    Foo::Foo(QObject *parent)
+        : QObject{parent}
+    {
+        QMetaObject::invokeMethod(this, "bar", Q_ARG(int, 42), Q_ARG(QString, QString("answer")));
+    }
+    \endcode
+
+    The quick fix also works on invokable methods outside the class that are
+    visible from the location where they are called from. For example, it
+    rewrites
+
+    \code
+    Foo f;
+    f.pubBar(123);
+    \endcode
+
+    as
+
+    \code
+    Foo f;
+    QMetaObject::invokeMethod(&f, "pubBar", Q_ARG(int, 123));
+    \endcode
+        \row
+            \li Move Definition Here
+            \li Moves an existing function definition to its declaration.
+        \row
+            \li Move Function Definition
+            \li Moves a function definition to the implementation file, outside
+                the class or back to its declaration. For example, rewrites
+    \code
+    class Foo
+    {
+      void bar()
+      {
+          // do stuff here
+      }
+    };
+    \endcode
+
+                as
+    \code
+    class Foo
+    {
+      void bar();
+    };
+
+    void Foo::bar() {
+        // do stuff here
+    }
+    \endcode
+        \row
+            \li Move Function Documentation to Declaration/Definition
+            \li Moves the documentation comment for a function between its
+                declaration and definition.
+    \endtable
+
+    \section1 Identifier
+
+    \table
+        \header
+            \li Quick Fix
+            \li Description
+        \row
+            \li Add #include for undeclared or forward declared identifier
+            \li Adds an \c {#include} directive to the current file to make the
+                definition of a symbol available.
         \row
             \li Add Class Member
             \li Adds a member declaration for the class member being
                 initialized if it is not yet declared. If \QC cannot
                 automatically detect the data type of the member, you
                 must add it.
-            \li Identifier
         \row
-            \li Create Implementations for Member Functions
-            \li Creates implementations for all member functions in one go.
-                In the \uicontrol {Member Function Implementations} dialog,
-                specify whether the member functions are generated
-                inline or outside the class.
-            \li Function name
+            \li Add Forward Declaration
+            \li Adds a forward declaration for an undeclared identifier
+                operation.
         \row
-            \li Switch with Next/Previous Parameter
-            \li Moves a parameter down or up one position in a parameter list.
-            \li Parameter in the declaration or definition of a function
+            \li Convert to Camel Case
+            \li Converts a symbol name to camel case, where elements of the name
+                are joined without delimiter characters and the initial
+                character of each element is capitalized. For example, rewrites
+                \c an_example_symbol as \c anExampleSymbol and
+                \c AN_EXAMPLE_SYMBOL as \c AnExampleSymbol
+    \endtable
+
+    \section1 Numeric Literal
+
+    \table
+        \header
+            \li Quick Fix
+            \li Description
         \row
-            \li Extract Function
-            \li Moves the selected code to a new function and replaces the block
-                of code with a call to the new function. Enter a name for the
-                function in the \uicontrol {Extract Function Refactoring}
-                dialog.
-            \li Block of code selected
+            \li Convert to Decimal
+            \li Converts an integer literal to decimal representation
         \row
-            \li Extract Constant as Function Parameter
-            \li Replaces the selected literal and all its occurrences with the
-                function parameter \c{newParameter}. The parameter
-                \c{newParameter} will have the original literal as the default
-                value.
-            \li Block of code selected
+            \li Convert to Hexadecimal
+            \li Converts an integer literal to hexadecimal representation
+        \row
+            \li Convert to Octal
+            \li Converts an integer literal to octal representation
+    \endtable
+
+    \section1 Operator
+
+    \table
+        \header
+            \li Quick Fix
+            \li Description
+            \li Operator
+
+        \row
+            \li Rewrite Condition Using ||
+            \li Rewrites the expression according to De Morgan's laws. For
+                example, rewrites
+    \code
+    !a && !b
+    \endcode
+
+                as
+
+    \code
+    !(a || b)
+    \endcode
+            \li \c &&
+        \row
+            \li Rewrite Using \e operator
+            \li Rewrites an expression negating it and using the inverse
+                operator. For example, rewrites
+
+            \list
+
+    \li    \code
+    a op b
+    \endcode
+
+                as
+
+    \code
+    !(a invop b)
+    \endcode
+
+    \li    \code
+    (a op b)
+    \endcode
+
+                as
+
+    \code
+    !(a invop b)
+    \endcode
+
+    \li   \code
+    !(a op b)
+    \endcode
+
+                as
+
+    \code
+    (a invob b)
+    \endcode
+
+    \endlist
+
+            \li \c {<=}, \c {<}, \c {>}, \c {>=}, \c {==} or \c {!=}
+        \row
+            \li Split if Statement
+            \li Splits an if statement into several statements. For example,
+                rewrites
+
+    \code
+    if (something && something_else) {
+    }
+    \endcode
+
+                as
+
+    \code
+    if (something) {
+       if (something_else) {
+       }
+    }
+    \endcode
+
+                and
+
+    \code
+    if (something || something_else)
+        x;
+    \endcode
+
+                with
+
+    \code
+    if (something)
+        x;
+    else if (something_else)
+        x;
+    \endcode
+
+            \li \c && or \c ||
+        \row
+            \li Swap Operands
+            \li Rewrites an expression in the inverse order using the inverse
+                operator. For example, rewrites
+    \code
+    a op b
+    \endcode
+
+                as
+    \code
+    b flipop a
+    \endcode
+            \li \c {<=}, \c {<}, \c {>},  \c {>=}, \c {==}, \c {!=}, \c {&&}
+                or \c {||}
+    \endtable
+
+    \section1 String Literal
+
+    \table
+        \header
+            \li Quick Fix
+            \li Description
+        \row
+            \li Convert to Objective-C String Literal
+            \li Converts a string literal to an Objective-C string literal if
+                the file type is Objective-C(++). For example, rewrites the
+                following strings
+
+    \code
+    "abcd"
+    QLatin1String("abcd")
+    QLatin1Literal("abcd")
+    \endcode
+
+                as
+
+    \code
+    @"abcd"
+    \endcode
+        \row
+            \li Enclose in QByteArrayLiteral()
+            \li Converts a string to a byte array. For example, rewrites
+    \code
+    "abcd"
+    \endcode
+
+                as
+
+    \code
+    QByteArrayLiteral("abcd")
+    \endcode
+        \row
+            \li Enclose in QLatin1Char()
+            \li Sets the encoding for a character to Latin-1, unless the
+                character is already enclosed in QLatin1Char, QT_TRANSLATE_NOOP,
+                tr, trUtf8, QLatin1Literal, or QLatin1String. For example,
+                rewrites
+
+    \code
+    'a'
+    \endcode
+
+                as
+
+    \code
+    QLatin1Char('a')
+    \endcode
+        \row
+            \li Enclose in QLatin1String()
+            \li Sets the encoding for a string to Latin-1, unless the string is
+                already enclosed in QLatin1Char, QT_TRANSLATE_NOOP, tr, trUtf8,
+                QLatin1Literal, or QLatin1String. For example, rewrites
+    \code
+    "abcd"
+    \endcode
+
+                as
+
+    \code
+    QLatin1String("abcd")
+    \endcode
+        \row
+            \li Escape String Literal as UTF-8
+            \li Escapes non-ASCII characters in a string literal to hexadecimal
+                escape sequences. String Literals are handled as UTF-8.
+        \row
+            \li Mark as Translatable
+            \li Marks a string translatable. For example, rewrites \c "abcd"
+                with one of the following options, depending on which of them is
+                available:
+
+    \code
+    tr("abcd")
+    QCoreApplication::translate("CONTEXT", "abcd")
+    QT_TRANSLATE_NOOP("GLOBAL", "abcd")
+    \endcode
+        \row
+            \li Unescape String Literal as UTF-8
+            \li Unescapes octal or hexadecimal escape sequences in a string
+                literal. String Literals are handled as UTF-8.
+    \endtable
+
+    \section1 \c using directive
+
+    \table
+        \header
+            \li Quick Fix
+            \li Description
+       \row
+            \li Remove All Occurrences of \c {using namespace} in Global Scope
+                and Adjust Type Names Accordingly
+            \li Remove all occurrences of \c {using namespace} in the global
+                scope and adjust type names accordingly.
+        \row
+            \li Remove \c {using namespace} and Adjust Type Names Accordingly
+            \li Remove occurrences of \c {using namespace} in the local scope
+                and adjust type names accordingly.
+    \endtable
+
+
+    \section1 Miscellaneous
+
+    \table
+        \header
+            \li Quick Fix
+            \li Description
+            \li Activation
         \row
             \li Add Local Declaration
             \li Adds the type of an assignee, if the type of the right-hand
@@ -469,277 +837,21 @@
                 where Type is the return type of \c {foo()}
 
             \li Assignee
-
         \row
-            \li Convert to Camel Case
-            \li Converts a symbol name to camel case, where elements of the name
-                are joined without delimiter characters and the initial
-                character of each element is capitalized. For example, rewrites
-                \c an_example_symbol as \c anExampleSymbol and
-                \c AN_EXAMPLE_SYMBOL as \c AnExampleSymbol
-            \li Identifier
+            \li Convert connect() to Qt 5 Style
+            \li Converts a Qt 4 QObject::connect() to Qt 5 style.
+            \li QObject::connect() (Qt 4 style)
         \row
-            \li Complete Switch Statement
-            \li Adds all possible cases to a switch statement of the type
-                \c enum
-            \li \c switch
-        \row
-            \li Generate Missing Q_PROPERTY Members
-            \li Adds missing members to a \c Q_PROPERTY:
-            \list
-                \li \c read function
-                \li \c write function, if there is a WRITE
-                \li \c {onChanged} signal, if there is a NOTIFY
-                \li data member with the name \c {m_<propertyName>}
-            \endlist
-            \li \c Q_PROPERTY
-        \row
-            \li Generate Q_PROPERTY and Missing Members
-            \li Generates a Q_PROPERTY and adds missing members to it, as
-                described above.
-            \li Class member
-        \row
-            \li Generate Constant Q_PROPERTY and Missing Members
-            \li Generates a constant Q_PROPERTY and adds missing members
-                to it, as described above.
-            \li Class member
-        \row
-            \li Generate Q_PROPERTY and Missing Members with Reset Function
-            \li Generates a Q_PROPERTY and adds missing members to it, as
-                described above, but with an additional \c reset function.
-            \li Class member
-       \row
-            \li Apply Changes
-            \li Keeps function declarations and definitions synchronized by
-                checking for the matching declaration or definition when you
-                edit a function signature and by applying the changes to the
-                matching code.
-            \li Function signature. When this fix is available, a light bulb
-                icon appears: \inlineimage icons/refactormarker.png
-        \row
-            \li Add #include for undeclared or forward declared identifier
-            \li Adds an \c {#include} directive to the current file to make the
-                definition of a symbol available.
-            \li Undeclared identifier
-        \row
-            \li Add Forward Declaration
-            \li Adds a forward declaration for an undeclared identifier
-                operation.
-            \li Undeclared identifier
-        \row
-            \li Reformat Pointers or References
-            \li Reformats declarations with pointers or references according
-                to the code style settings for the current project. In case no
-                project is open, the current global code style settings are
-                used.
-
-                For example, rewrites:
-
-    \code
-    char*s;
-    \endcode
-
-                as
-
-    \code
-    char *s;
-    \endcode
-
-                When applied to selections, all suitable declarations in the
-                selection are rewritten.
-
-            \li Declarations with pointers or references and selections
-                that have such declarations
-        \row
-            \li Create Getter and Setter Member Functions
-            \li Creates either both getter and setter member functions for
-                member variables or only a getter or setter.
-            \li Member variable in class definition
-        \row
-            \li Generate Getter and Setter
-            \li Creates getter and setter member functions for a member
-                variable.
-            \li Member variable in class definition
-        \row
-            \li Generate Getter
-            \li Creates a getter member function for a member variable.
-            \li Member variable in class definition
-        \row
-            \li Generate Setter
-            \li Creates a setter member function for a member variable.
-            \li Member variable in class definition
-        \row
-            \li Generate Constructor
-            \li Creates a constructor for a class.
-            \li Class definition
-        \row
-            \li Move Function Definition
-            \li Moves a function definition to the implementation file, outside
-                the class or back to its declaration. For example, rewrites:
-    \code
-    class Foo
-    {
-      void bar()
-      {
-          // do stuff here
-      }
-    };
-    \endcode
-
-                as
-    \code
-    class Foo
-    {
-      void bar();
-    };
-
-    void Foo::bar() {
-        // do stuff here
-    }
-    \endcode
-
-            \li Function signature
-        \row
-            \li Move All Function Definitions
-            \li Moves all function definitions to the implementation file or
-                outside the class. For example, rewrites:
-    \code
-    class Foo
-    {
-      void bar()
-      {
-          // do stuff here
-      }
-      void baz()
-      {
-          // do stuff here
-      }
-    };
-    \endcode
-
-                as
-
-    \code
-    class Foo
-    {
-      void bar();
-      void baz();
-    };
-
-    void Foo::bar() {
-        // do stuff here
-    }
-
-    void Foo::baz() {
-        // do stuff here
-    }
-    \endcode
-
-            \li Class name
-        \row
-            \li Move Definition Here
-            \li Moves an existing function definition to its declaration.
-            \li Function declaration
-        \row
-            \li Assign to Local Variable
-            \li Adds a local variable which stores the return value of a
-                function call or a new expression. For example, rewrites:
-
-    \code
-    QString s;
-    s.toLatin1();
-    \endcode
-
-                as
-
-    \code
-    QString s;
-    QByteArray latin1 = s.toLatin1();
-    \endcode
-
-                and
-
-    \code
-    new Foo;
-    \endcode
-
-                as
-
-    \code
-    Foo * localFoo = new Foo;
-    \endcode
-
-                By default, \QC uses the \c auto variable type when creating the
-                variable. To label the variable with its actual type, select
-                \preferences > \uicontrol C++ >
-                \uicontrol {Quick Fixes}, and then deselect the
-                \uicontrol {Use type "auto" when creating new variables} check
-                box.
-
-            \li Function call or class name
-        \row
-            \li Insert Virtual Functions of Base Classes
-            \li Inserts declarations and the corresponding definitions inside or
-                outside the class or in an implementation file (if it exists).
-                For more information, see \l{Insert virtual functions}.
-            \li Class or base class name
-        \row
-            \li Optimize for-Loop
-            \li Rewrites post increment operators as pre increment operators and
-                post decrement operators as pre decrement operators. It also
-                moves other than string or numeric literals and id expressions
-                from the condition of a for loop to its initializer. For
-                example, rewrites:
-
-    \code
-    for (int i = 0; i < 3 * 2; i++)
-    \endcode
-
-                as
-
-    \code
-    for (int i = 0, total = 3 * 2; i < total; ++i)
-    \endcode
-            \li \c for
-
-        \row
-            \li Escape String Literal as UTF-8
-            \li Escapes non-ASCII characters in a string literal to hexadecimal
-                escape sequences. String Literals are handled as UTF-8.
-            \li String literal
-
-        \row
-            \li Unescape String Literal as UTF-8
-            \li Unescapes octal or hexadecimal escape sequences in a string
-                literal. String Literals are handled as UTF-8.
-            \li String literal
-
-        \row
-            \li Convert to Stack Variable
-            \li Converts the selected pointer to a stack variable. For example,
-                rewrites:
-
-    \code
-    QByteArray *foo = new QByteArray("foo");
-    foo->append("bar");
-    \endcode
-
-                as
-
-    \code
-    QByteArray foo("foo");
-    foo.append("bar");
-    \endcode
-
-                This operation is limited to work only within function scope.
-                Also, the coding style for pointers and references is not
-                respected yet.
-            \li Pointer Variable
-
+            \li Convert Comment to C/C++ Style
+            \li Converts C-style comments into C++-style comments, and vice
+                versa. Tries to preserve \e pretty layout and takes Doxygen and
+                qdoc formatting into consideration, but you might need to clean
+                up the results.
+            \li Code comment
         \row
             \li Convert to Pointer
             \li Converts the selected stack variable to a pointer. For example,
-                rewrites:
+                rewrites
 
     \code
     QByteArray foo = "foo";
@@ -758,32 +870,69 @@
                 respected yet.
             \li Stack Variable
         \row
-            \li Remove \c {using namespace} and Adjust Type Names Accordingly
-            \li Remove occurrences of \c {using namespace} in the local scope
-                and adjust type names accordingly.
-            \li \c using directive
-       \row
-            \li Remove All Occurrences of \c {using namespace} in Global Scope
-                and Adjust Type Names Accordingly
-            \li Remove all occurrences of \c {using namespace} in the global
-                scope and adjust type names accordingly.
-            \li \c using directive
+            \li Convert to Stack Variable
+            \li Converts the selected pointer to a stack variable. For example,
+                rewrites
+
+    \code
+    QByteArray *foo = new QByteArray("foo");
+    foo->append("bar");
+    \endcode
+
+                as
+
+    \code
+    QByteArray foo("foo");
+    foo.append("bar");
+    \endcode
+
+                This operation is limited to work only within function scope.
+                Also, the coding style for pointers and references is not
+                respected yet.
+            \li Pointer Variable
         \row
-            \li Convert connect() to Qt 5 Style
-            \li Converts a Qt 4 QObject::connect() to Qt 5 style.
-            \li QObject::connect() (Qt 4 style)
+            \li Reformat Pointers or References
+            \li Reformats declarations with pointers or references according
+                to the code style settings for the current project. In case no
+                project is open, the current global code style settings are
+                used.
+
+                For example, rewrites
+
+    \code
+    char*s;
+    \endcode
+
+                as
+
+    \code
+    char *s;
+    \endcode
+
+                When applied to selections, all suitable declarations in the
+                selection are rewritten.
+
+            \li Declarations with pointers or references and selections
+                that have such declarations
         \row
-            \li Convert Comment to C/C++ Style
-            \li Converts C-style comments into C++-style comments, and vice
-                versa. Tries to preserve \e pretty layout and takes Doxygen and
-                qdoc formatting into consideration, but you might need to clean
-                up the results.
-            \li Code comment
+            \li Split Declaration
+            \li Splits a simple declaration into several declarations. For
+                example, rewrites
+    \code
+    int *a, b;
+    \endcode
+
+                as
+
+    \code
+    int *a;
+    int b;
+    \endcode
+            \li Type name or variable name
         \row
-            \li Move Function Documentation to Declaration/Definition
-            \li Moves the documentation comment for a function between its
-                declaration and definition.
-            \li Documentation comment for a function
+            \li Switch with Next/Previous Parameter
+            \li Moves a parameter down or up one position in a parameter list.
+            \li Parameter in the declaration or definition of a function
     \endtable
 
     \sa {Apply quick fixes}, {Find symbols}, {Rename symbols},
diff --git a/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc b/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc
index aff9f9f357f..7fc22f4b0e8 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc
@@ -36,6 +36,7 @@
             \l{Outline} view or in the \uicontrol Symbols list on the
             \l{Edit Mode}{editor toolbar}
         \li \l{Call Hierarchy}{Viewing the callers and callees of a function}
+        \li \l{Type Hierarchy}{Viewing the base classes and derived classes of a class}
         \li \l{Find references to a symbol}{Finding references to symbols}
         \li \l{Rename symbols}{Renaming the symbol under the cursor}
         \li Code actions
@@ -72,7 +73,7 @@
 
     \image qtcreator-language-server-json.webp {Prompt to install JSON language server}
 
-    \l{Add a Java language server} for \l{Connecting Android Devices}
+    \l{Add a Java language server} for  \l{Developing for Android}
     {Android development}. For other languages,
     \l{Add generic language servers}{add generic stdIO language servers}.
 
@@ -84,12 +85,24 @@
     To enable a language server, select the checkbox next to the language
     server name and set server preferences.
 
-    To turn on \l{Turn on \QMLLS}{\QMLLS}, go to
-    \preferences > \uicontrol {Qt Quick} > \uicontrol {QML/JS Editing} and
-    select \uicontrol {Enable \QMLLS}.
+    To configure \l{Configure \QMLLS}{\QMLLS}, go to
+    \preferences > \uicontrol {Qt Quick} > \uicontrol {QML/JS Editing}.
 
     To remove language servers from the list, select \uicontrol Delete.
 
+    \section1 Updating Python Language Server
+
+    \QC offers to update the Python language server when you open a Python
+    file in the editor.
+
+    \image qtcreator-python-update-language-server.webp {Message about updating Python Language Server}
+
+    To update the language server, select \uicontrol Update. To save your choice,
+    select \uicontrol {Always Update}.
+
+    To skip updating and hide the message for future updates, select
+    \uicontrol Never.
+
     \section1 Supported Locator Filters
 
     The locator enables you to browse not only files, but any items defined by
@@ -223,32 +236,33 @@
 
     \ingroup creator-how-to-lsp
 
-    \title Turn on \QMLLS
+    \title Configure \QMLLS
 
-    Since Qt 6.4, \QMLLS offers code completion and
-    issues warnings for QML. To use it, go to \preferences >
-    \uicontrol {Qt Quick} > \uicontrol {QML/JS Editing} and select
-    \uicontrol {Enable \QMLLS}.
+    Since Qt 6.4, \QMLLS offers code completion and issues warnings for QML.
 
-    By default, enabling \QMLLS will only enable warning messages
-    and code completion, while advanced features such as renaming and finding usages
-    will be handled by the embedded code model.
-    To disable the embedded code model and use \QMLLS for everything,
-    select \uicontrol {Use \QMLLS advanced features}.
+    To turn off \QMLLS, go to \preferences > \uicontrol {Qt Quick} >
+    \uicontrol {QML/JS Editing} and clear \uicontrol {Turn on}.
 
-    Also, \QC tries to use \QMLLS shipped with
-    the Qt version in your current kit. To override that behavior and always use
+    By default, \QMLLS issues warning messages and provides code completion,
+    while the embedded code model handles advanced features, such as renaming
+    symbols and finding usages. To disable the embedded code model and use
+    \QMLLS for everything, select \uicontrol {Use advanced features}.
+
+    Also, \QC tries to use \QMLLS shipped with the Qt version in your current
+    \l{Kits}{kit}. To override that behavior and always use
     \QMLLS of the highest registered Qt version, select
-    \uicontrol {Use \QMLLS from latest Qt version}.
+    \uicontrol {Use from latest Qt version}.
+
+    To use older \QMLLS versions, select
+    \uicontrol{Allow versions below Qt 6.8}.
 
     \image qtcreator-qml-js-editing.webp {QML/JS Editing preferences}
 
-    When using \c qmlls from Qt 6.7 or later, set \l{QT_QML_GENERATE_QMLLS_INI}
-    to \c{ON} in \uicontrol Projects > \uicontrol {Build Settings}
-    > \uicontrol {Initial Configuration}.
+    To automatically configure new CMake projects, select
+    \uicontrol {Create .qmlls.ini files for new projects}.
 
     \sa {Manage Language Servers}{How To: Manage Language Servers},
-    {Enabling and Disabling Messages}, {CMake Build Configuration},
+    {Enabling and Disabling Messages}, {CMake Build Configuration}, {Kits},
     {Language Servers}
 */
 
diff --git a/doc/qtcreator/src/editors/creator-only/creator-locator.qdoc b/doc/qtcreator/src/editors/creator-only/creator-locator.qdoc
index eab661647fd..d739bd3445f 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-locator.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-locator.qdoc
@@ -261,6 +261,16 @@
 
     \endlist
 
+    \section1 Hiding Long Paths
+
+    To hide the common part of absolute paths in the locator:
+
+    \list 1
+        \li Go to \preferences > \uicontrol Environment > \uicontrol Locator.
+        \li Select \uicontrol {Show Paths in Relation to Active Project} to
+            show relative paths.
+    \endlist
+
     \sa {Navigate with locator}, {Search}{How To: Search}, {Perform calculations},
     {Locator}
 */
diff --git a/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc b/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc
index 426cc25d67c..0b20f36c335 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc
@@ -30,15 +30,15 @@
     You can create the following types of structural diagrams:
 
     \list
-        \li Package diagrams, which consist of packages and their relationships,
+        \li Package diagrams, which consist of packages and their relationships
             and visualize how the system is packaged.
         \li Class diagrams, which consists of classes, dependencies,
             inheritance, associations, aggregation, and composition, and
             show a system in an object-oriented way.
         \li Component diagrams, which represent a set of components and their
-            relationships, and show the implementation of a system.
+            relationships and show the implementation of a system.
         \li Deployment diagrams, which represent a set of software and hardware
-            components and their relationships, and visualize the deployment
+            components and their relationships and visualize the deployment
             of a system.
     \endlist
 
@@ -55,19 +55,17 @@
 
     \section1 Editing Models
 
-    You can create models that have several different structural or
-    behavioral diagrams.
-    You can add elements to the diagrams and specify properties for them. You
-    can either use standard model elements or add your own elements with custom
-    icons.
+    You can create models that have several different structural or behavioral
+    diagrams. Add elements to the diagrams and specify properties for them. Use
+    standard model elements or add your own elements with custom icons.
 
-    \image qtcreator-modeleditor.png {Class diagram in the model editor}
+    \image qtcreator-modeleditor.webp {Class diagram in the model editor}
     \caption A class diagram in the model editor.
 
-    You can add model elements to diagrams in the following ways:
+    Add elements to diagrams in the following ways:
 
     \list
-        \li Drag model elements from the element tool bar (1) to the
+        \li Drag elements from the element tool bar (1) to the
             editor (2).
         \li Select tool bar buttons (3) to add elements to the element tree (4).
         \li Drag elements from the element tree to the editor to add them and
@@ -79,22 +77,26 @@
 
     \section2 Grouping Elements
 
-    You can group elements by surrounding them with a boundary. When you move
-    the boundary, all elements within it are moved together. Similarly, drag
-    a swimlane to the diagram. When you move the swimlane, all elements right
-    to the swimlane (for vertical swimlanes) or below it (for horizontal swimlanes)
-    will be moved together. A vertical swimlane is created when you drop the
-    swimlane icon on the top border of the diagram and a horizontal swimlane
-    is created when you drop the icon near the left border.
+    To group elements, surround them with a \e boundary. When you move
+    the boundary, all elements within it move together.
 
-    Classes or other objects that you lay on packages are moved with the packages.
-    You can move individual elements and modify their properties (5) by selecting
-    them. You can also use \e multiselection to group elements temporarily.
+    Similarly, drag a \e swimlane to the diagram. When you move the swimlane, all
+    elements right to the swimlane (for vertical swimlanes) or below it (for
+    horizontal swimlanes) move together.
+
+    To create a vertical swimlane, drop the swimlane icon on the top border of
+    the diagram. To create a horizontal swimlane, drop the icon near the left
+    border.
+
+    Classes or other objects that you lay on packages move with the packages.
+    To move individual elements and modify their properties (5), select them.
+
+    Use \e multiselection to group elements temporarily.
 
     \section2 Aligning Elements
 
     To align elements in the editor, select several elements and right-click to
-    open a context menu. Select actions in the \uicontrol {Align Objects} menu
+    open a context menu. Select actions in \uicontrol {Align Objects} menu
     to align elements horizontally or vertically or to adjust their width and
     height.
 
@@ -111,20 +113,42 @@
     then select \uicontrol {Add Related Elements} in the context menu.
 
     By default, when you select an element in a diagram, it is highlighted also
-    in the \uicontrol Structure view. To change this behavior so that selecting
-    an element in the \uicontrol Structure makes it highlighted also in the
-    diagram, click and hold the \inlineimage icons/linkicon.png
-    button, and then select \uicontrol {Synchronize Diagram with Structure}.
-    To keep the selections in the diagram and the \uicontrol Structure view
+    in \uicontrol Structure view. To change this behavior so that selecting
+    an element in \uicontrol Structure makes it highlighted also in the
+    diagram, select \inlineimage icons/linkicon.png and then select
+    \uicontrol {Synchronize Diagram with Structure}.
+    To keep the selections in the diagram and \uicontrol Structure view
     synchronized, select \uicontrol {Keep Synchronized}.
 
+    \section2 Linking from Element Names to Files
+
+    To link to a file from the name of an element, select the file in
+    \uicontrol {Linked file}.
+
     \section2 Zooming into Diagrams
 
-    To zoom into diagrams, select the \uicontrol {Zoom In} toolbar button,
-    press \key Ctrl++, or press \key Ctrl and roll the mouse wheel up. To zoom
-    out of diagrams, select \uicontrol {Zoom Out}, press \key Ctrl+-, or press
-    \key Ctrl and roll the mouse wheel down. To reset the diagram size to 100%,
-    select \uicontrol {Reset Zoom} or press \key Ctrl+0.
+    To zoom into diagrams:
+
+    \list
+        \li Select \uicontrol {Zoom In} toolbar button.
+        \li Press \key Ctrl++.
+        \li Press \key Ctrl and roll the mouse wheel up.
+    \endlist
+
+    To zoom out of diagrams:
+
+    \list
+        \li Select \uicontrol {Zoom Out}.
+        \li Press \key Ctrl+-.
+        \li Press \key Ctrl and roll the mouse wheel down.
+    \endlist
+
+    To reset the diagram size to 100%:
+
+    \list
+        \li Select \uicontrol {Reset Zoom}.
+        \li Press \key Ctrl+0.
+    \endlist
 
     \section2 Printing Diagrams
 
@@ -137,15 +161,27 @@
 
     \section2 Exporting Diagrams as Images
 
-    To save diagrams as images, select \uicontrol File >
+    To save diagrams as images, go to \uicontrol File, and then select
     \uicontrol {Export Diagram}. To save only the selected parts of a diagram,
     select \uicontrol {Export Selected Elements}.
 
     \section1 Adding Custom Elements
 
     The model editor has the following built-in element types: package,
-    component, class, and item. For package, component, and class elements, you
-    can specify custom icons. The color, size, and form of the icon are
+    component, class, and item.
+
+    To use custom icons for the built-in elements, select an image file in
+    \uicontrol {Image} in element properties.
+
+    \image qtcreator-model-editor-component-diagram.webp {Component properties}
+    \caption The Image field in Component properties.
+
+    \section2 Using Definition Files
+
+    For package, component, and class elements, you can use definition files to
+    specify custom icons.
+
+    The color, size, and form of the icon are
     determined by a stereotype. If you attach the stereotype to an element, the
     element icon is replaced by the custom icon. For example, you can attach the
     entity and interface stereotypes to classes and the database stereotype to
@@ -185,7 +221,7 @@
     and templates for existing types (such as a composition relation that
     can be drawn between classes).
 
-    You can add your own definition file and save it with the file extension
+    Add your own definition file and save it with the file extension
     \e .def to add custom colors and icons for stereotypes, elements, or tool
     bars. Either store this file in the same directory as the
     \e standard.def file or select the root element of a model and apply your
@@ -203,47 +239,52 @@
 
     \title Create UML-style models
 
-    You can use wizards to create UML-style models and \e {scratch models}.
+    Use wizards to create UML-style models and \e {scratch models}.
 
     To create models and edit them in the model editor:
 
     \list 1
 
-        \li Select \uicontrol File > \uicontrol {New File} > \uicontrol Modeling
-            > \uicontrol Model > \uicontrol Choose.
+        \li Go to \uicontrol File > \uicontrol {New File} > \uicontrol Modeling
+            > \uicontrol Model, and then select \uicontrol Choose.
 
             The model file opens in the model editor.
 
         \li Drag model elements to the editor and select them to
             specify properties for them:
 
-            \image qtcreator-modeleditor-packages.png {Package diagram in the model editor}
+            \image qtcreator-modeleditor-packages.webp {Package diagram in the model editor}
             \caption A package diagram in the model editor.
 
         \list 1
 
-            \li In the \uicontrol Stereotypes field, enter the stereotype to
-                apply to the model element or select a predefined stereotype
+            \li In \uicontrol Stereotypes, enter the stereotype to
+                apply to the element or select a predefined stereotype
                 from the list.
 
-            \li In the \uicontrol Name field, give a name to the model element.
+            \li In \uicontrol Name, give a name to the element.
 
-            \li Select the \uicontrol {Auto sized} check box to reset the
-                element to its default size after you have changed the element
+            \li In \uicontrol {Linked file}, select a file to create a link to
+                it from the element name.
+
+            \li In \uicontrol Image, select an image to use as a custom icon for
+                the element.
+
+            \li Select \uicontrol {Auto sized} to reset the
+                element to its default size after you changed the element
                 size by dragging its borders.
 
-            \li In the \uicontrol Color field, select the color of the model
-                element.
+            \li In \uicontrol Color, select the color of the element.
 
-            \li In the \uicontrol Role field, select a \e role to make the model
+            \li In \uicontrol Role, select a \e role to make the model
                 element color lighter, darker, or softer. You can also remove
                 color and draw the element outline or flatten the element by
                 removing gradients.
 
-            \li Select the \uicontrol Emphasized check box to draw the model
+            \li Select \uicontrol Emphasized to draw the model
                 element with a thicker line.
 
-            \li In the \uicontrol {Stereotype display} field, select:
+            \li In \uicontrol {Stereotype display}, select:
 
                 \list
 
@@ -283,12 +324,12 @@
 
         \list 1
 
-            \li In the \uicontrol Stereotypes field, select the
+            \li In \uicontrol Stereotypes, select the
                 \e stereotype to apply to the relation.
 
-            \li In the \uicontrol Name field, give a name to the relation.
+            \li In \uicontrol Name, give a name to the relation.
 
-            \li In the \uicontrol Direction field, you can change the direction
+            \li In \uicontrol Direction, change the direction
                 of the connection or make it bidirectional.
 
         \endlist
@@ -321,11 +362,12 @@
     Therefore, you can assign a \l{Keyboard Shortcuts}{keyboard shortcut} to the
     wizard and use it to create and open models with empty diagrams.
 
-    To create a scratch model, select \uicontrol File > \uicontrol {New File} >
-    \uicontrol Modeling > \uicontrol {Scratch Model} > \uicontrol Choose.
+    To create a scratch model, go to \uicontrol File > \uicontrol {New File} >
+    \uicontrol Modeling > \uicontrol {Scratch Model}, and then select
+    \uicontrol Choose.
 
-    \sa {Create class diagrams}, {Create component diagrams},
-    {Create package diagrams}, {Model Editor}
+    \sa {Create Models and Diagrams}{How To: Create Models and Diagrams},
+    {Model Editor}
 */
 
 /*!
@@ -336,27 +378,27 @@
 
     \title Create package diagrams
 
-    You can create UML-style models that contain \e {package diagrams}.
+    Create UML-style models that contain \e {package diagrams}.
     They show packages and their relationships to visualize how the
     system is packaged.
 
-    You can add nested package elements to a package diagram. The depth of the
+    Add nested package elements to a package diagram. The depth of the
     elements in the diagram corresponds to the depth of the structured model.
     Elements stacked on other elements of the same type are automatically drawn
     in a darker shade of the selected color.
 
-    \image qtcreator-modeleditor-packages.png {Package diagram in the model editor}
+    \image qtcreator-modeleditor-packages.webp {Package diagram in the model editor}
     \caption A package diagram in the model editor.
 
-    Right-click a package to open a context menu, where you can select
+    Right-click a package to open a context menu, and select
     \uicontrol {Create Diagram} to create a new package diagram within the
-    model. You can drag items from the element tree to the diagram.
+    model. Drag items from the element tree to the diagram.
 
     To update the include dependencies of the package, select
     \uicontrol {Update Include Dependencies}.
 
-    \sa {Create class diagrams},{Create component diagrams},
-    {Create UML-style models}, {Model Editor}
+    \sa {Create Models and Diagrams}{How To: Create Models and Diagrams},
+    {Model Editor}
 */
 
 /*!
@@ -367,11 +409,11 @@
 
     \title Create class diagrams
 
-    You can create UML-style models that contain \e {class diagrams}. They show
+    Create UML-style models that contain \e {class diagrams}. They show
     classes, dependencies, inheritance, associations, aggregation, and
     composition to visualize a system in an object-oriented way.
 
-    \image qtcreator-modeleditor-classes.png {Class diagram in the model editor}
+    \image qtcreator-modeleditor-classes.webp {Class diagram in the model editor}
     \caption A class diagram in the model editor.
 
     To create class diagrams:
@@ -387,10 +429,10 @@
 
             \list
 
-                \li In the \uicontrol Template field, specify the template to
+                \li In \uicontrol Template, specify the template to
                     use.
 
-                \li In the \uicontrol {Template display} field, select the
+                \li In \uicontrol {Template display}, select the
                     display format for the template:
 
                     \list
@@ -409,15 +451,15 @@
 
                     \endlist
 
-                \li In the \uicontrol Members field, specify members for the
+                \li In \uicontrol Members, specify members for the
                     class, as described in \l {Specify members}.
 
                 \li Select \uicontrol {Clean Up} to format the contents of
-                    the \uicontrol Members field depending on their visibility
+                    \uicontrol Members depending on their visibility
                     (private, protected, public) and following the rules set for
                     whitespace, line breaks, and so on.
 
-                \li Select the \uicontrol {Show members} check box to show
+                \li Select \uicontrol {Show members} to show
                     the members in the diagram.
 
             \endlist
@@ -431,17 +473,36 @@
     \section1 Add relations
 
     Elements in class diagrams can have the following types of relations:
-    inheritance, association, and dependency. The end points of association
-    relations can have the following properties: role, cardinality, navigable,
-    and relationship.
+
+    \list
+        \li Aggregation
+        \li Association
+        \li Composition
+        \li Dependency
+        \li Inheritance
+    \endlist
+
+    The end points of association relations can have the following properties:
+
+    \list
+        \li Cardinality
+        \li Navigable
+        \li Role
+        \li Relationship
+    \endlist
+
+    \section2 Create self-relations
 
     To create self-relations, start creating a new association and press
     \key Shift to create a new \e {sampling point} while dragging the
     association. Create another sampling point and drag the association
     to the same class.
 
-    To add more points, press \key Shift and click a relation. To delete a
-    point, press \key Ctrl and click a point.
+    \section2 Add and delete points
+
+    To add more points, press \key Shift and click a relation.
+
+    To delete a point, press \key Ctrl and click a point.
 
     \section2 Specify members
 
@@ -490,8 +551,8 @@
 
     \endlist
 
-    \sa {Create component diagrams}, {Create package diagrams},
-    {Create UML-style models}, {Model Editor}
+    \sa {Create Models and Diagrams}{How To: Create Models and Diagrams},
+    {Model Editor}
 */
 
 /*!
@@ -502,14 +563,19 @@
 
     \title Create component diagrams
 
-    You can create UML-style models that contain \e {component diagrams}.
-    They epresent a set of components and their relationships, and show the
+    Create UML-style models that contain \e {component diagrams}.
+    They represent a set of components and their relationships, and show the
     implementation of a system.
 
-    You can add source code components, such as libraries, databases, programs,
-    and architectural layers to a component diagram. To add components to
-    component diagrams, drag source code from \uicontrol Projects to
-    the editor, and select \uicontrol {Add Component}.
+    Add source code components, such as libraries, databases, programs,
+    and architectural layers to a component diagram.
+
+    To add components to component diagrams:
+
+    \list 1
+        \li Drag source code from \uicontrol Projects to the editor.
+        \li Select \uicontrol {Add Component}.
+    \endlist
 
     \image qtcreator-model-editor-component-diagram.webp {Component diagram in the model editor}
     \caption A component diagram in the model editor.
@@ -518,6 +584,6 @@
     the component in the editor or select \uicontrol {Show Definition} in the
     context menu.
 
-    \sa {Create class diagrams}, {Create package diagrams},
-    {Create UML-style models}, {Model Editor}
+    \sa {Create Models and Diagrams}{How To: Create Models and Diagrams},
+    {Model Editor}
 */
diff --git a/doc/qtcreator/src/editors/creator-only/creator-preferences-cpp-code-style.qdoc b/doc/qtcreator/src/editors/creator-only/creator-preferences-cpp-code-style.qdoc
index 56e413b7e93..024b731d3ca 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-preferences-cpp-code-style.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-preferences-cpp-code-style.qdoc
@@ -54,6 +54,8 @@
 
     \list
         \li Interpret the \key Tab and \key Backspace key presses.
+        \li Add macros that the indenter interprets as complete statements that
+            don't require a semicolon at the end.
         \li Indent the contents of classes, functions, blocks, and namespaces.
         \li Indent braces in classes, namespaces, enums, functions, and blocks.
         \li Control switch statements and their contents.
diff --git a/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc b/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc
index 80ffbe8ab2b..1600c557a95 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc
@@ -233,6 +233,9 @@
     The editor center-aligns transition labels, but you can drag them to
     other positions.
 
+    Conditions on transitions appear below the transition lines within square
+    brackets ([]).
+
     To add edge points to transitions, select a transition line. You can add
     only two edge points for each line. The editor automatically removes
     unnecessary edge points. To remove the selected edge point, select
diff --git a/doc/qtcreator/src/editors/creator-quick-fixes.qdoc b/doc/qtcreator/src/editors/creator-quick-fixes.qdoc
index 7e02f60c650..6ef8f778737 100644
--- a/doc/qtcreator/src/editors/creator-quick-fixes.qdoc
+++ b/doc/qtcreator/src/editors/creator-quick-fixes.qdoc
@@ -38,7 +38,7 @@
 
     By default, the refactored files are saved automatically. To turn off
     this feature, go to \preferences > \uicontrol Environment >
-    \uicontrol System and select \uicontrol {Auto-save files after refactoring}.
+    \uicontrol System and clear \uicontrol {Auto-save files after refactoring}.
 
     \if defined(qtcreator)
     \section1 Create functions
@@ -94,6 +94,17 @@
     {C++ Quick Fixes}
     \endif
 
+    \section1 Move classes to separate files
+
+    Apply the \uicontrol {Move Class to a Dedicated Set of Source Files} quick
+    fix to move a class to a separate set of header and implementation files.
+
+    \image qtcreator-move-class-to-separate-files.webp {Give names to header and implementation files}
+
+    Specify paths and file names for the header and implementation file.
+
+    To omit the implementation file, select \uicontrol {Header file only}.
+
     \sa {Rename symbols}, {QML Quick Fixes}
 */
 
diff --git a/doc/qtcreator/src/external-resources/external-resources.qdoc b/doc/qtcreator/src/external-resources/external-resources.qdoc
index 0fa7ca60dff..bc9ee595a80 100644
--- a/doc/qtcreator/src/external-resources/external-resources.qdoc
+++ b/doc/qtcreator/src/external-resources/external-resources.qdoc
@@ -1,17 +1,29 @@
 // Copyright (C) 2022 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
+/*!
+    \externalpage https://doc.qt.io/index.html
+    \title Qt Documentation
+*/
 /*!
     \externalpage https://www.perforce.com/manuals/cmdref/Content/CmdRef/P4CONFIG.html
     \title Perforce: P4CONFIG
 */
+/*!
+    \externalpage https://doc.qt.io/qt-6/qtdesigner-manual.html
+    \title Qt Widgets Designer Manual
+*/
+/*!
+    \externalpage https://doc.qt.io/qt-6/designer-using-custom-widgets.html
+    \title Using Custom Widgets with Qt Widgets Designer
+*/
 /*!
     \externalpage https://doc.qt.io/Boot2Qt/index.html
-    \title Boot2Qt: Documentation
+    \title \B2Q: Documentation
 */
 /*!
     \externalpage https://doc.qt.io/Boot2Qt/b2qt-requirements-x11.html#setting-up-usb-access-to-embedded-devices
-    \title Boot2Qt: Setting Up USB Access to Embedded Devices
+    \title \B2Q: Setting Up USB Access to Embedded Devices
 */
 /*!
     \externalpage https://doc.qt.io/qt/qtqml-index.html
@@ -54,8 +66,8 @@
     \title Getting Started on Windows
 */
 /*!
-    \externalpage https://adoptopenjdk.net/
-    \title AdoptOpenJDK
+    \externalpage https://adoptium.net/
+    \title Adoptium OpenJDK
 */
 /*!
     \externalpage http://openjdk.java.net
@@ -205,3 +217,19 @@
     \externalpage https://doc-snapshots.qt.io/applicationmanager-dev/cmake-qt6-am-create-installable-package.html
     \title qt6_am_create_installable_package
 */
+/*!
+    \externalpage https://valgrind.org/info/tools.html
+    \title Valgrind's Tool Suite
+*/
+/*!
+    \externalpage https://valgrind.org/docs/manual/quick-start.html#quick-start.interpret
+    \title Interpreting Memcheck's Output
+*/
+/*!
+    \externalpage https://valgrind.org/docs/manual/manual-core.html#manual-core.suppress
+    \title Suppressing Errors
+*/
+/*!
+    \externalpage https://www.openssh.com/
+    \title OpenSSH
+*/
diff --git a/doc/qtcreator/src/howto/creator-external-tools.qdoc b/doc/qtcreator/src/howto/creator-external-tools.qdoc
index 13927f3d677..fa58a1e80a2 100644
--- a/doc/qtcreator/src/howto/creator-external-tools.qdoc
+++ b/doc/qtcreator/src/howto/creator-external-tools.qdoc
@@ -77,7 +77,7 @@
             {build environment} or \l {Specify the run environment}
             {run environment} of the active project. Select the build or run
             environment if the system environment does not have the necessary
-            PATH settings to find the tool chain, for example.
+            PATH settings to find the toolchain, for example.
         \else
         \li In the \uicontrol {Base environment} field, use the default settings.
         \endif
@@ -209,6 +209,10 @@
     \uicontrol External > \uicontrol {Qt Quick} > \uicontrol {QML Runtime}.
 
     \sa {Use external tools}
+
+    \if defined(qtcreator)
+    \sa {Design UIs}{How To: Design UIs}, {UI Design}
+    \endif
 */
 
 /*!
diff --git a/doc/qtcreator/src/howto/creator-help.qdoc b/doc/qtcreator/src/howto/creator-help.qdoc
index 434ee6fe9b2..fa770177839 100644
--- a/doc/qtcreator/src/howto/creator-help.qdoc
+++ b/doc/qtcreator/src/howto/creator-help.qdoc
@@ -23,26 +23,26 @@
 
         \li To view context sensitive help on a Qt class or function as a
             tooltip, move the mouse cursor over the class or function. If help
-            is not available, the tooltip displays type information for the
+            is not available, the tooltip shows type information for the
             symbol.
 
-        \li To display tooltips for function signatures regardless of the
+        \li To show tooltips for function signatures regardless of the
             cursor position in the function call, press \key {Ctrl+Shift+D}.
 
-        \li To display the full help on a Qt class or function, press \key F1 or
+        \li To show the full help on a Qt class or function, press \key F1 or
             select \uicontrol {Context Help} in the context menu.
-            The documentation is displayed in a
+            The documentation is shown in a
             view next to the code editor, or, if there is not enough vertical
             space, in the fullscreen \uicontrol Help mode.
 
-        \li To select and configure how the documentation is displayed in the
-            \uicontrol Help mode, select \preferences > \uicontrol Help.
+        \li To change how the documentation is shown in the
+            \uicontrol Help mode, go to \preferences > \uicontrol Help.
     \endlist
 
-    The following image displays the context sensitive help in the \uicontrol Edit
+    The following image shows the context sensitive help in the \uicontrol Edit
     mode.
 
-    \image qtcreator-context-sensitive-help.png {Context-sensitive help in Edit mode}
+    \image qtcreator-context-sensitive-help.webp {Context-sensitive help in Edit mode}
 
     \section1 Change the font
 
@@ -52,43 +52,43 @@
 
     \image qtcreator-preferences-help-general.webp {General tab in Help preferences}
 
-    You can set the default zoom level in the \uicontrol Zoom field. When
-    viewing help pages, you can use the mouse scroll wheel to zoom them. To
-    disable this feature, deselect the \uicontrol {Enable scroll wheel zooming}
-    check box.
+    Set the default zoom level in \uicontrol Zoom. When viewing help pages, use
+    the mouse scroll wheel to zoom them. To turn off this feature, clear
+    \uicontrol {Enable scroll wheel zooming}.
 
-    To disable antialiasing, deselect the \uicontrol Antialiasing check box.
+    To turn off antialiasing, clear \uicontrol Antialias.
 
     \section1 Return to the editor
 
     To switch to the editor context when you close the last help page, select
-    the \uicontrol {Return to editor on closing the last page} check box.
+    \uicontrol {Return to editor on closing the last page}.
 
     \section1 Select help viewer backend
 
-    The help viewer backend determines the style sheet that is used to display
+    The help viewer backend determines the style sheet that is used to show
     the help files. The default help viewer backend that is based on litehtml
     is recommended for viewing Qt documentation. You can choose another help
-    viewer backend in the \uicontrol {Viewer backend} field. To take the new
+    viewer backend in the \uicontrol {Viewer backend}. To take the new
     backend to use, reload the help page.
 
     \section1 View function tooltips
 
-    To hide function tooltips by default, select \preferences >
-    \uicontrol {Text Editor} > \uicontrol Behavior >
-    \uicontrol {Show help tooltips using the mouse} >
-    \uicontrol {On Shift+Mouseover}. You can still view the tooltips by pressing
-    and holding down the \key Shift key.
+    To hide function tooltips by default:
+
+    \list 1
+        \li Go to \preferences > \uicontrol {Text Editor} > \uicontrol Behavior.
+        \image qtcreator-preferences-texteditor-behavior.webp {Text Editor Behavior preferences}
+        \li In \uicontrol {Show help tooltips using the mouse}, select
+            \uicontrol {On Shift+Mouseover}.
+    \endlist
+
+    You can still view the tooltips by pressing and holding down the \key Shift
+    key.
 
     To use a keyboard shortcut for viewing help tooltips, select
     \uicontrol {Show help tooltips using keyboard shortcut (Alt)}.
 
-    \sa {Find information in Qt documentation}, {Filter documentation},
-    {Search from documentation}
-
-    \sa {Add external documentation}, {Detach the help window},
-    {Filter documentation}, {Find information in Qt documentation},
-    {Select the help start page}
+    \sa {Read Documentation}{How To: Read Documentation}
 */
 
 /*!
@@ -103,15 +103,18 @@
 
     \title Find information in Qt documentation
 
-    \QC, \QSDK and other Qt deliverables have documentation
-    as .qch files. All the documentation is accessible in the \uicontrol Help mode.
+    \QC installer, \QOI, and other Qt deliverables install documentation as .qch
+    files. View the documentation in the \uicontrol Help mode. To view the
+    currently open document online, select \inlineimage icons/online.png
+    (\uicontrol {Open Online Documentation}).
 
     By default, \QC registers only the latest available version of the
     documentation for each installed Qt module. To register all installed
-    documentation, select \preferences > \uicontrol Kits >
-    \uicontrol {Qt Versions} > \uicontrol {Register documentation}.
+    documentation, go to \preferences > \uicontrol Kits >
+    \uicontrol {Qt Versions} and select an option in
+    \uicontrol {Register documentation}.
 
-    \image qtcreator-qt-versions.png {Register documentation field in Qt Versions tab in Kit Preferences}
+    \image qtcreator-qt-versions.png {Register documentation in Qt Versions preferences}
 
     \section1 Help mode sidebar views
 
@@ -137,7 +140,7 @@
 
     \endlist
 
-    \sa {Add bookmarks to help pages}, {Search from documentation}
+    \sa {Read Documentation}{How To: Read Documentation}
 */
 
 /*!
@@ -152,8 +155,8 @@
 
     \title Add bookmarks to help pages
 
-    You can add bookmarks to useful help pages to easily find them later
-    in the \uicontrol Bookmarks view. You can either use the page title as the
+    Add bookmarks to useful help pages to easily find them later
+    in the \uicontrol Bookmarks view. Either use the page title as the
     bookmark or change it to any text. You can organize the bookmarks in
     folders in the view.
 
@@ -163,21 +166,21 @@
 
     \list 1
 
-        \li Click the \inlineimage icons/bookmark.png
-            (\uicontrol {Add Bookmark}) button on the toolbar.
+        \li Select \inlineimage icons/bookmark.png (\uicontrol {Add Bookmark})
+            on the toolbar.
 
-        \li In the \uicontrol {Add Bookmark} dialog, click \uicontrol OK to save the
+        \li In the \uicontrol {Add Bookmark} dialog, select \uicontrol OK to save the
             page title as a bookmark in the selected folder.
 
     \endlist
 
     \section1 Import and export bookmarks
 
-    To import and export bookmarks, select \preferences >
-    \uicontrol Help > \uicontrol General > \uicontrol {Import Bookmarks} or
+    To import and export bookmarks, go to \preferences > \uicontrol Help >
+    \uicontrol General and select \uicontrol {Import Bookmarks} or
     \uicontrol {Export Bookmarks}.
 
-    \sa {Find information in Qt documentation}
+    \sa {Read Documentation}{How To: Read Documentation}
 */
 
 /*!
@@ -192,10 +195,10 @@
 
     \title Search from documentation
 
-    In the \uicontrol Help mode \uicontrol Search pane, you can use full-text
+    In the \uicontrol Help mode \uicontrol Search pane, use full-text
     search for finding a
     particular word in all the installed documents. Enter the term you are
-    looking for, and select the \uicontrol Search button. All documents that
+    looking for, and select \uicontrol Search. All documents that
     have the specified term are listed. The list is sorted by document
     version (if you have installed several Qt versions, for example) and
     the number of search hits that the documents have. Select a document in
@@ -225,16 +228,15 @@
     time when you open the \uicontrol Search pane. If you add or remove documents,
     \QC recreates the index.
 
-    If you cannot find words that you know are there, indexing might not have
-    been completed for some reason. To regenerate the index, click
-    \inlineimage icons/reload_gray.png
+    If you cannot find words that you know are there, the index might not be
+    complete. To recreate it, select \inlineimage icons/reload_gray.png
     (\uicontrol {Regenerate Index}).
 
     Punctuation is not included in indexed terms. To find terms that have
     punctuation, such as domain names, use the asterisk as a wild card. For
     example, to find \c {Pastebin.Com}, enter the search term \c {Pastebin*}.
 
-    \sa {Find information in Qt documentation}
+    \sa {Read Documentation}{How To: Read Documentation}
 */
 
 /*!
@@ -249,7 +251,7 @@
 
     \title Add external documentation
 
-    You can display external documentation in the \uicontrol Help mode.
+    You can view external documentation in the \uicontrol Help mode.
     To add documentation or replace the documentation that ships with \QC and Qt:
 
     \list 1
@@ -259,14 +261,14 @@
             For information on how to prepare your documentation and create a
             .qch file, see \l{The Qt Help Framework}.
 
-        \li To add the .qch file to \QC, select \preferences >
+        \li To add the .qch file to \QC, go to \preferences >
             \uicontrol Help > \uicontrol Documentation > \uicontrol Add.
 
             \image qtcreator-preferences-help-documentation.webp {Documentation tab in Help Preferences}
 
     \endlist
 
-    \sa {Get help}
+    \sa {Read Documentation}{How To: Read Documentation}
 */
 
 /*!
@@ -281,26 +283,24 @@
 
     \title Detach the help window
 
-    By default, context-sensitive help is opened in a window next to the
+    By default, context-sensitive help opens in a window next to the
     code editor when you press \key F1. If there is not enough vertical
     space, the help opens in the full-screen help mode.
 
-    \image qtcreator-context-sensitive-help.png {Context-sensitive help in Edit mode}
+    \image qtcreator-context-sensitive-help.webp {Context-sensitive help in Edit mode}
 
-    To specify that the help always opens in full-screen mode or
-    is detached to an external window, select \preferences > \uicontrol Help >
-    \uicontrol General.
+    To specify that the help always opens in full-screen mode or in an external
+    window, go to \preferences > \uicontrol Help > \uicontrol General.
 
     \image qtcreator-preferences-help-general.webp {General tab in Help preferences}
 
-    Set preferences for displaying context-sensitive help
-    in the \uicontrol {On context help} field. To detach the help window, select
+    Set preferences for viewing context-sensitive help
+    in \uicontrol {On context help}. To detach the help window, select
     \uicontrol {Always Show in External Window}.
 
-    To change this setting in a help view, select the \inlineimage icons/linkicon.png
-    toolbar button.
+    To change this setting in a help view, select \inlineimage icons/linkicon.png.
 
-    \sa {Get help}
+    \sa {Read Documentation}{How To: Read Documentation}
 */
 
 /*!
@@ -315,27 +315,27 @@
 
     \title Select the help start page
 
-    You can select the page to display when you open the \uicontrol Help mode in the
-    \preferences > \uicontrol Help > \uicontrol General >
-    \uicontrol {On help start} field.
+    To set the page to show when you open the \uicontrol Help mode, go to
+    \preferences > \uicontrol Help > \uicontrol General and select
+    \uicontrol {On help start}.
 
     \image qtcreator-preferences-help-general.webp {General tab in Help preferences}
 
     \list
-        \li To display the page and help views that were open when you exited the mode,
+        \li To show the page and help views that were open when you exited the mode,
             select the \uicontrol {Show My Tabs from Last Session} option. However, Web pages
             are not opened because loading them would slow down opening the \uicontrol Help
             mode.
 
-        \li To display a particular page, select \uicontrol {Show My Home Page}, and specify
-            the page in the \uicontrol {Home Page} field.
+        \li To show a particular page, select \uicontrol {Show My Home Page}, and specify
+            the page in \uicontrol {Home Page}.
 
-        \li To display a blank page, select the \uicontrol {Show a Blank Page} option. You can
-            also select the \uicontrol {Use Blank Page} button to set a blank page as your
+        \li To show a blank page, select the \uicontrol {Show a Blank Page} option.
+            Select \uicontrol {Use Blank Page} to set a blank page as your
             home page.
     \endlist
 
-    \sa {Get help}
+    \sa {Read Documentation}{How To: Read Documentation}
 */
 
 /*!
@@ -350,40 +350,40 @@
 
     \title Filter documentation
 
-    You can filter the documents displayed in the \uicontrol Help mode to find
+    Filter the documents in the \uicontrol Help mode to find
     relevant information faster. Select a filter from a list of filters. The
     contents of the \uicontrol Index and \uicontrol Contents
     view in the sidebar change accordingly.
 
-    \image qtcreator-help-filters.png {Filters field on the Help mode toolbar}
+    \image qtcreator-help-filters.png {Filters on the Help mode toolbar}
 
     \section1 Add filters
 
-    You can define your own filters to display documentation for a set of
+    Define your own filters to show documentation for a set of
     Qt modules and versions.
 
     To add filters:
 
     \list 1
 
-        \li Select \preferences > \uicontrol Help > \uicontrol Filters.
+        \li Go to \preferences > \uicontrol Help > \uicontrol Filters.
 
             \image qtcreator-help-filter-attributes.png {Filters tab in Help preferences}
 
         \li Select \inlineimage icons/plus.png
             to add a new filter in the \uicontrol {Add Filter} dialog.
 
-        \li In the \uicontrol {Filter name} field, enter a name for the filter,
+        \li In \uicontrol {Filter name}, enter a name for the filter,
             and then select \uicontrol {OK} to return to the \uicontrol Filters
             tab.
 
-        \li In the \uicontrol Components field, select the Qt modules to include
+        \li In \uicontrol Components, select the Qt modules to include
             in the filter.
 
-        \li In the \uicontrol Versions field, select the Qt versions to include
+        \li In \uicontrol Versions, select the Qt versions to include
             in the filter.
 
-        \li Click \uicontrol OK.
+        \li Select \uicontrol OK.
 
         \li In the \uicontrol Help mode, select the filter in the list of
             filters to see the filtered documentation in the sidebar.
@@ -392,15 +392,14 @@
 
     \section1 Change filters
 
-    To modify the selected filter, add and remove Qt modules and versions, and
+    To modify the selected filter, add and remove Qt modules and versions and
     then select \uicontrol Apply.
 
     To rename the selected filter, select \uicontrol Rename.
 
     \section1 Remove filters
 
-    To remove the selected filter select \inlineimage icons/minus.png
-    .
+    To remove the selected filter, select \inlineimage icons/minus.png.
 
-    \sa {Get help}
+    \sa {Read Documentation}{How To: Read Documentation}
 */
diff --git a/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc b/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc
index c5cf673347a..17d660c4d69 100644
--- a/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc
+++ b/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc
@@ -43,6 +43,10 @@
     Select \uicontrol {Set as Default} to use the current settings for the
     background and outline modes and fitting images to screen as default
     values for the image viewer.
+
+    \if defined(qtcreator)
+    \sa {Design UIs}{How To: Design UIs}, {UI Design}
+    \endif
 */
 
 /*!
@@ -67,4 +71,8 @@
 
     You can then use QIcon::addPixmap() to add the pixmaps to icons in
     different modes and states.
+
+    \if defined(qtcreator)
+    \sa {Design UIs}{How To: Design UIs}, {UI Design}
+    \endif
 */
diff --git a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc
index f05c16181a6..0c3ff91b303 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc
@@ -359,10 +359,6 @@
             found by the code based test frameworks and are registered as test
             with the build system.
 
-    If a test takes more than a minute to execute, the default timeout might
-    stop the test execution. To increase the timeout, go to \preferences >
-    \uicontrol {Testing} > \uicontrol General.
-
     \section1 Select tests to run
 
     The \uicontrol Tests view shows all the tests found for the currently active
@@ -501,7 +497,7 @@
             the current project.
     \row
         \li \uicontrol {Timeout}
-        \li The maximum time in seconds to execute a test case.
+        \li Set a maximum time in seconds to execute a test case.
      \row
         \li \uicontrol {Reset Cached Choices}
         \li Sometimes, \QC cannot deduce which executable or run configuration to
@@ -519,7 +515,7 @@
             By default, \QC groups tests that are in the same directory.
     \endtable
 
-    To select the testing framework for the current project, go to
+    To override some preferences for the current project, go to
     \uicontrol Projects > \uicontrol {Project Settings} > \uicontrol {Testing}.
 
     \section1 Qt Tests
@@ -719,7 +715,7 @@
         \li Disable statistical analysis and bootstrapping.
     \endtable
 
-    \section2 Specifying Settings for Running CTest-Based Tests
+    \section1 CTest-Based Tests
 
     To specify settings for running CTest-based tests, go to \preferences >
     \uicontrol {Testing} > \uicontrol {CTest}.
@@ -751,7 +747,7 @@
         \li Re-run tests, as determined by \uicontrol {Repetition mode}. Set the
             maximum number of times for repeating a test in \uicontrol {Count}.
     \row
-        \li \uicontrol {Run in parallel}
+        \li \uicontrol {Run in Parallel}
         \li Run the tests in parallel using the specified number of
             \uicontrol {Jobs}. In \uicontrol {Test load}, limit the parallel
             execution. CTest will not start a new test if it would cause the
@@ -853,8 +849,7 @@
 
     \section1 Blacklisting Tests
 
-    Since Qt 5.4, you can add a BLACKLIST file for tests. It is mainly used
-    internally by the Qt CI system.
+    A BLACKLIST file for tests is mainly used internally by the Qt CI system.
 
     \table
         \header
diff --git a/doc/qtcreator/src/howto/creator-only/creator-cli.qdoc b/doc/qtcreator/src/howto/creator-only/creator-cli.qdoc
index fbc885df055..a0e9129c6b9 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-cli.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-cli.qdoc
@@ -93,7 +93,7 @@
         \row
             \li -installsettingspath <path>
             \li Override the default path from where user-independent settings are read
-                (for example written by the installer).
+                (for example, those written by the installer).
 
         \row
             \li -temporarycleansettings, -tcs
@@ -104,6 +104,10 @@
             \li -language <locale>
             \li Set the UI language.
 
+                Use a lowercase, two-letter
+                \l {https://www.iso.org/iso-639-language-codes.html}
+                {ISO 639 language code}, such as \e de, \e en, or \e fr.
+
        \row
             \li -test <plugin>[,testfunction[:testdata]] ...
             \li For \QC plugin developers: run the plugin's tests using a
diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-to-find-settings-files.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-to-find-settings-files.qdoc
index 8bfb773a402..81bc78e3077 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-how-to-find-settings-files.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-how-to-find-settings-files.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -7,9 +7,9 @@
 
     \ingroup creator-how-to-use
 
-    \title Find settings files
+    \title Reset \QC settings
 
-    \QC creates the following files and directories:
+    To reset all \QC settings, remove the settings files that it creates:
 
     \list
         \li QtCreator.db
@@ -29,4 +29,32 @@
         \li On Windows, look in
             \c {%appdata%\QtProject} and \c {%localappdata%\QtProject}.
     \endlist
+
+    To check whether the settings are causing a problem before resetting them,
+    start \QC from the command line with options.
+
+    \section1 Override the default settings path
+
+    To override the default path where user settings are stored, enter:
+
+    \badcode
+    qtcreator -settingspath <path>
+    \endcode
+
+    To override the default path from where user-independent settings are read
+    (for example, those written by the installer), enter:
+
+    \badcode
+    qtcreator -installsettingspath <path>
+    \endcode
+
+    \section1 Start \QC with temporary clean settings
+
+    To use clean settings that are deleted when you quit \QC, enter:
+
+    \badcode
+    qtcreator -tcs
+    \endcode
+
+    \sa {Run Qt Creator from the command line}
 */
diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-to-install-extensions.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-to-install-extensions.qdoc
new file mode 100644
index 00000000000..13ebc406b25
--- /dev/null
+++ b/doc/qtcreator/src/howto/creator-only/creator-how-to-install-extensions.qdoc
@@ -0,0 +1,39 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+    \page creator-how-to-load-extensions.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-use
+
+    \title Load extensions
+
+    In the experimental \uicontrol Extensions mode, you can load and unload
+    extensions from the computer or the web.
+
+    To load extensions when you start \QC:
+
+    \list 1
+        \li Go to \uicontrol Extensions.
+            \image qtcreator-extension-mode.webp {Extensions mode}
+        \li Select an extension.
+        \li Select \uicontrol {Load on start}.
+    \endlist
+
+    \section1 Load extensions from the web
+
+    By default, the \uicontrol Extensions mode lists extensions installed on the
+    computer. You can also list extensions from external repositories in the web.
+
+    To load extensions from the web:
+
+    \list 1
+        \li Go to \preferences > \uicontrol Environment > \uicontrol Extensions.
+            \image qtcreator-preferences-extensions.webp {Extensions in Preferences}
+        \li Select \uicontrol {Use external repository}.
+        \li Select \uicontrol OK.
+    \endlist
+
+    \sa {Enable and disable plugins}, {Install plugins}
+*/
diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-to-install.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-to-install.qdoc
index d19c3e9d8fb..f64c870cfe0 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-how-to-install.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-how-to-install.qdoc
@@ -3,14 +3,13 @@
 
 /*!
     \page creator-how-to-install.html
-    \previouspage creator-how-tos.html
+    \previouspage index.html
+    \nextpage creator-getting-started.html
 
-    \ingroup creator-how-to-use
-
-    \title Install \QC
+    \title Installation
 
     You can install either a \e commercial or \e {open source} version of \QC in
-    many ways:
+    the following ways:
 
     \list
         \li As a part of a Qt installation with \l{Get and Install Qt}{\QOI}.
@@ -41,13 +40,13 @@
     instructions to install \QC.
 
     To develop with Qt, you also need a Qt version. You can register Qt versions
-    in the stand-alone \QC to use them in \l{kits-tab}{kits}.
+    in the stand-alone \QC to use them in \l{Kits}{kits}.
 
-    \section2 Use package managers
+    \section2 Using Package Managers
 
     The \QC packages that package managers offer are not
     officially supported. For links to official releases, see
-    \l {Download installation packages}.
+    \l {Downloading Installation Packages}.
 
     On Windows you can use \c chocolatey, and on \macos you can use \c brew.
     These package managers install the latest \QC releases available online.
@@ -68,7 +67,7 @@
     \note Linux distributions might have old \QC versions, so you might want to
     download and install the latest version.
 
-    \section2 Download installation packages
+    \section2 Downloading Installation Packages
 
     You can download \QC installation packages from:
 
@@ -81,7 +80,7 @@
         \li \l{https://github.com/qt-creator/qt-creator/releases}{GitHub}
     \endlist
 
-    \section2 Build from sources
+    \section2 Building from Sources
 
     To test the very latest \QC version, maybe with your own changes,
     you can build it from sources. For more information, see
@@ -89,5 +88,5 @@
     {Compiling \QC} and \l{https://wiki.qt.io/Building_Qt_Creator_from_Git}
     {Building Qt Creator from Git}.
 
-    \sa {Register installed Qt versions}
+    \sa {Manage Kits}{How To: Manage Kits}, {Register installed Qt versions}
 */
diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc
index 307c436d224..d31fe7a97bd 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc
@@ -66,8 +66,7 @@
 
     \section1 Debug
 
-    Use native debuggers to inspect the state of your application while
-    debugging.
+    Use debuggers to inspect the state of your application while it is running.
 
     \generatelist creator-how-to-debug
 
@@ -86,15 +85,69 @@
     embedded or mobile platform on the computer, and use \QOI to
     install Qt libraries that are built for the platform. Then add a
     kit with the toolchain and the Qt version for the device's architecture.
-    When possible, \QOI creates suitable kits for you.
+    When possible, \QOI creates suitable kits for you. Connect the devices
+    to the computer to run, debug, and analyze applications on them.
+
+    \section2 Android
+
+    Install \l {Qt for Android} and Android tools, and connect Android devices to
+    the computer.
+
+    \generatelist creator-how-to-android
+
+    \section2 Bare Metal
+
+    Run and debug applications on small Linux devices that are not supported
+    by the remote Linux device plugin by using GDB or a hardware debugger.
+
+    \generatelist creator-how-to-bare-metal
+
+    \section2 \B2Q
+
+    Run, debug, and analyze applications on \l{\B2Q: Documentation}{\B2Q}
+    devices.
+
+    \generatelist creator-how-to-b2qt
+
+    \section2 Docker
+
+    Create \e {Docker devices} from \e {Docker images} and use them to build,
+    run, and debug applications.
+
+    \generatelist creator-how-to-docker
+
+    \section2 iOS
+
+    Install \l {Qt for iOS} and Xcode, and connect iOS devices to the computer.
+
+    \generatelist creator-how-to-ios
 
     \section2 MCUs
 
-    Install \l {Qt for MCUs} and connect devices to the computer to run and
-    debug applications on them.
+    Install \l {Qt for MCUs}, and connect microcontrollers to the computer.
 
     \generatelist creator-how-to-mcu
 
+    \section2 QNX Neutrino
+
+    Install \l {Qt for QNX}, and connect QNX Neutrino devices to the computer.
+
+    \generatelist creator-how-to-qnx
+
+    \section2 Remote Linux
+
+    Add kits for toolchains for building applications for generic Linux
+    devices, and connect the devices to the computer.
+
+    \generatelist creator-how-to-remote-linux
+
+    \section2 WebAssembly
+
+    Install \l{Qt for WebAssembly} to build applications for the web and run them
+    in a web browser.
+
+    \generatelist creator-how-to-webassembly
+
     \section1 Edit Code
 
     The code editor offers useful features for editing C++ and QML code, such
@@ -130,7 +183,7 @@
 
     \QC groups build and run specific settings as kits to make cross-platform
     development easier. Each kit consists of a set of values that define one
-    environment, such as a device, tool chain, Qt version, and debugger command
+    environment, such as a device, toolchain, Qt version, and debugger command
     to use.
 
     \generatelist creator-how-to-manage-kits
diff --git a/doc/qtcreator/src/howto/creator-only/creator-squish.qdoc b/doc/qtcreator/src/howto/creator-only/creator-squish.qdoc
index 4284085e721..9aaf0506f22 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-squish.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-squish.qdoc
@@ -2,82 +2,66 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \previouspage creator-autotest.html
-    \page creator-squish.html
-    \nextpage creator-advanced.html
+    \page creator-how-to-connect-squish-server.html
+    \previouspage creator-how-tos.html
 
-    \title Using Squish
+    \ingroup creator-how-to-test
 
-    \l{https://www.qt.io/product/quality-assurance/squish}{Squish} is an automated GUI
-    testing framework for testing Android, iOS, Java, \macos, Qt, Tk, Windows, and
-    XView applications, as well as HTML-based web applications running in
-    browsers, such as Apple Safari, Mozilla Firefox, Google Chrome, and
-    Microsoft Internet Explorer and Edge.
+    \title Connect to Squish Server
 
-    The experimental Squish plugin integrates Squish into \QC. You can:
-
-    \list
-        \li Open existing Squish test suites.
-        \li Create new test suites and test cases.
-        \li Record test cases (in a very limited way compared to what you can do
-            inside the Squish IDE).
-        \li Use Squish Runner and Server to run test suites or cases and view
-            the results in the \uicontrol Squish \l{View output}{output}.
-        \li Set breakpoints before running tests to stop at certain locations and
-            inspect the local variables, similarly to when debugging a test.
-    \endlist
-
-    When running test suites or cases, the Squish Runner instructs the Squish
-    Server to start the application under test (AUT). The server can be running
-    on multiple machines, and the AUT can be located on a different path on each
-    of them. Therefore, you must either map AUTs to their corresponding paths or
-    specify AUT paths to search from in the server settings.
-
-    In addition, you can test an already running application by attaching to it.
-    This enables you to test your application using a Squish Server running on
-    another machine. However, you can have only one server attached to your
-    application at a time. Also, the attached application is not closed when the
-    test case is completed.
-
-    To use the plugin, you must download and install Squish, create a connection
-    to the Squish Server, and specify AUTs to run.
-
-    \note Enable the Squish plugin to use it.
-
-    \section1 Specifying a Squish Server
-
-    To specify a Squish Server to run:
+    To create a connection to Squish Server:
 
     \list 1
         \li Select \preferences > \uicontrol Squish.
-            \image qtcreator-squish-preferences.png "Squish general preferences"
-        \li In the \uicontrol {Squish path} field, specify the path to the Squish
+            \image qtcreator-squish-preferences.png {Squish general preferences}
+        \li In \uicontrol {Squish path}, specify the path to the Squish
             installation directory.
-        \li In the \uicontrol {License path} field, specify the path to your
+        \li In \uicontrol {License path}, specify the path to your
             Squish license file if it is not located in your home folder. For
             example, if you have a global installation with several users, where
             the license key is installed in the global folder.
-        \li Select the \uicontrol {Local server} check box to use a locally
-            installed \c {squishserver.exe}. To use a server running in another
-            machine, deselect the check box and specify the server address in the
-            \uicontrol {Server host} field and the port number in the
-            \uicontrol {Server port} field. If no port is specified, \QC starts
+        \li Select \uicontrol {Local server} to use a locally
+            installed \c {squishserver.exe}. To use a server running on another
+            computer, clear the checkbox and specify the server address in the
+            \uicontrol {Server host} and the port number in the
+            \uicontrol {Server port}. If no port is specified, \QC starts
             \c squishserver in a way that enables it to automatically select an
             open port.
-        \li Select the \uicontrol {Verbose log} check box to include additional
+        \li Select \uicontrol {Verbose log} to include additional
             logging levels in the log output.
-        \li Select the \uicontrol {Minimize IDE} check box to automatically
+        \li Select \uicontrol {Minimize IDE} to automatically
             minimize \QC when running or recording test cases.
     \endlist
 
-    \section1 Specifying AUTs
+    \sa {Create Squish test suites}, {Enable and disable plugins},
+    {Manage Squish test suites and cases}, {Select Squish AUTs}, {Squish}
+*/
 
-    To specify applications to test using Squish, select \uicontrol {Tools} >
+/*!
+    \page creator-how-to-select-squish-auts.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-test
+
+    \title Select Squish AUTs
+
+    To select applications to test using Squish, go to \uicontrol {Tools} >
     \uicontrol {Squish} > \uicontrol {Server Settings}.
 
-    \image qtcreator-squish-server-settings.png "Squish Server Settings"
+    \image qtcreator-squish-server-settings.png {Squish Server Settings}
 
-    \section2 Mapping AUTs
+    When running test suites or cases, the Squish Runner instructs the Squish
+    Server to start the application under test (AUT). The server can be running
+    on multiple computers, and the AUT can be located on a different path on each
+    of them. Therefore, you must either map AUTs to their corresponding paths or
+    specify AUT paths to search from in the server settings.
+
+    To test an already running application using a Squish Server running on
+    another computer, attach to the application. You can attach only one server
+    to your application at a time. The attached application is not closed when
+    the test case is completed.
+
+    \section1 Map AUTs
 
     To specify the path to an AUT to run, select \uicontrol {Mapped AUTs} >
     \uicontrol Add and locate the AUT.
@@ -88,13 +72,13 @@
 
     Mapping AUTs prevents the server from accidentally executing the wrong AUT
     if two different executables have the same name, as the server executes the
-    first matching AUT it finds in the \uicontrol {AUT Paths} list.
+    first matching AUT it finds in \uicontrol {AUT Paths}.
 
     To change the path to the selected AUT, select \uicontrol {Edit}.
 
     To remove the mapping to the selected AUT, select \uicontrol {Remove}.
 
-    \section2 Specifying AUT Paths
+    \section1 Specify AUT paths
 
     To specify a path to search AUTs from, select \uicontrol {AUT Paths} >
     \uicontrol Add.
@@ -107,32 +91,60 @@
 
     To remove the selected AUT path, select \uicontrol {Remove}.
 
-    \section2 Adding Attachable AUTs
+    \section1 Add attachable AUTs
 
     To specify the path to a running AUT, select \uicontrol {Attachable AUTs} >
     \uicontrol Add. In the \uicontrol {Add Attachable AUT} dialog, specify a
     connection to a running application to register an attachable AUT.
 
-    \image qtcreator-squish-server-settings-add-attachable-aut.png "Add Attachable AUT dialog"
+    \image qtcreator-squish-server-settings-add-attachable-aut.png {Add Attachable AUT dialog}
 
     To change the connection to the selected AUT, select \uicontrol {Edit}.
 
     To remove the connection to the selected AUT, select \uicontrol {Remove}.
 
-    \section1 Managing Test Suites and Cases
+    \section1 Specify settings for running tests
 
-    You can manage Squish test suites and cases in the \uicontrol Squish
-    \l {Show and hide sidebars}{view}.
+    To specify settings for running tests:
 
-    \image qtcreator-squish-view.png "Squish sidebar view"
+    \list
+        \li In \uicontrol {Maximum startup time}, set the maximum time
+            to wait for the AUT to start before throwing an error.
+        \li In \uicontrol {Maximum response time}, set the maximum time
+            to wait for the AUT to respond before throwing an error.
+        \li In \uicontrol {Maximum post-mortem wait time}, set the
+            maximum time to wait after the main AUT has exited. This is useful
+            for AUTs invoked through launcher applications, such as shell scripts
+            or batch files.
+        \li Select \uicontrol {Animate mouse cursor} to animate
+            the mouse cursor when playing back a test.
+    \endlist
+
+    \sa {Connect to Squish Server}, {Create Squish test suites},
+    {Enable and disable plugins}, {Manage Squish test suites and cases},
+    {Squish}
+*/
+
+/*!
+    \page creator-how-to-manage-squish-test-suites.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-test
+
+    \title Manage Squish test suites and cases
+
+    Manage Squish test suites and cases in the \uicontrol Squish
+    \l {Show and hide sidebars}{sidebar view}.
+
+    \image qtcreator-squish-view.png {Squish sidebar view}
 
     To show existing test suites in \uicontrol {Test Suites}, select
     \uicontrol {Open Squish Suites} in the context menu.
 
-    \image qtcreator-squish-view-open-squish-suites.png "Open Squish Test Suites dialog"
+    \image qtcreator-squish-view-open-squish-suites.png {Open Squish Test Suites dialog}
 
-    You can open the \uicontrol {Squish Test Suite} wizard for creating a new
-    test suite by selecting \uicontrol {Create New Test Suite} in the context
+    To open the \uicontrol {Squish Test Suite} wizard for creating a new
+    test suite, select \uicontrol {Create New Test Suite} in the context
     menu.
 
     To add a test case to a test suite, select it and then select
@@ -148,73 +160,40 @@
     Double-click a test suite in \uicontrol {Test Suites} to open the
     \c {suite.conf} configuration file for editing.
 
-    \section2 Creating Test Suites
-
-    To create a new test suite:
-
-    \list 1
-        \li Select \uicontrol File > \uicontrol {New Project}
-            > \uicontrol {Squish} > \uicontrol {Squish Test Suite} >
-            \uicontrol Choose.
-            \image qtcreator-squish-create-test-suite.png "Create Squish Test Suite wizard"
-        \li On the \uicontrol {Location} page, in \uicontrol {Test Suite Name},
-            enter a name for the test suite.
-            \image qtcreator-squish-create-test-suite-location.png "Location page"
-        \li In \uicontrol {Test Suite folder's parent folder}, enter the path to
-            the folder to create the test suite folder, and then select
-            \uicontrol Next.
-        \li On the \uicontrol Setup page, select the GUI toolkit used by the AUT,
-            and then select \uicontrol Next.
-            \image qtcreator-squish-create-test-suite-setup.png "Setup page"
-            Currently, only desktop GUI toolkits are supported.
-        \li On the \uicontrol {Script Language} page, select the scripting
-            language to use for the test suite's test script, and then select
-            \uicontrol Next.
-            \image qtcreator-squish-create-test-suite-language.png "Languages page"
-        \li On the \uicontrol {AUT} page, select the AUT to test, and then select
-            \uicontrol Next.
-            \image qtcreator-squish-create-test-suite-aut.png "AUT page"
-        \li On the \uicontrol {Summary} page review the test suite settings, and
-            then select \uicontrol Finish to create the test suite.
-    \endlist
-
-    The test suite is listed in \uicontrol {Test Suites} in the \uicontrol Squish
-    sidebar view.
-
-    \section2 Recording Test Cases
+    \section1 Record test cases
 
     Squish records tests using the scripting language that you specified for the
     test suite. Recordings are made into existing test cases.
 
     In \uicontrol {Test Suites}, select the \inlineimage icons/recordfill.png
-    (\uicontrol {Record Test Case}) button next to the test case name. The AUT
-    that you selected for the test suite is displayed and you can start recording
-    the test case.
+    (\uicontrol {Record Test Case}) button next to the test case name. The
+    application under test (AUT) that you selected for the test suite is
+    displayed and you can start recording the test case.
 
-    \image qtcreator-squish-control-bar-record-test-case.png "Squish control bar for recording test cases"
+    \image qtcreator-squish-control-bar-record-test-case.png {Squish control bar for recording test cases}
 
     When you are done, select the \inlineimage icons/stop_small.png
     (\uicontrol {Stop}) button in the \uicontrol {Control Bar}.
 
-    You can edit recorded test scripts or copy parts of them into manually
+    Edit recorded test scripts or copy parts of them into manually
     created test scripts.
 
-    \image qtcreator-squish-test-script-edit.png "A test script open in the editor"
+    \image qtcreator-squish-test-script-edit.png {A test script open in the editor}
 
-    \section2 Running Test Suites
+    \section1 Run test suites
 
-    You can run a recorded test case to have Squish repeat all the actions that
+    Run a recorded test case to have Squish repeat all the actions that
     you applied when recording the test, but without the pauses that humans are
     prone to but which computers don't need.
     To run a test case, select the \inlineimage icons/run_small.png
     (\uicontrol {Run}) button next to the test case in \uicontrol {Test Suites}.
 
-    \image qtcreator-squish-control-bar-run-test-case.png "Squish control bar for running test cases"
+    \image qtcreator-squish-control-bar-run-test-case.png {Squish control bar for running test cases}
 
     While the test is running, you can view test results as well as interrupt and
     stop tests in the \uicontrol {Control Bar}.
 
-    \section2 Mapping Symbolic Names
+    \section1 Map symbolic names
 
     When Squish records a test, it uses \e {symbolic names} to identify the UI
     elements. Symbolic names are stored in an object map that can be either
@@ -237,7 +216,7 @@
     (\uicontrol {Object Map}) button next to the test
     suite in \uicontrol {Test Suites}.
 
-    \image qtcreator-squish-symbolic-names.png "Symbolic Names view"
+    \image qtcreator-squish-symbolic-names.png {Symbolic Names view}
 
     You can filter the symbolic names in the \uicontrol {Symbolic Names} view.
     To edit a symbolic name or the names or values of its properties,
@@ -253,49 +232,87 @@
     property, select  \inlineimage icons/jumpto.png
     .
 
-    \section2 Inspecting Local Variables
+    \section1 Inspect local variables
 
     If you set breakpoints in the test code before running the test, the test
     execution is automatically interrupted when a breakpoint is hit. You can
     inspect the contents of local variables in the \uicontrol {Squish Locals}
     view.
 
-    \image qtcreator-squish-locals.png "Squish Locals view"
+    \image qtcreator-squish-locals.png {Squish Locals view}
 
     Use the \uicontrol {Step Into}, \uicontrol {Step Over}, and
     \uicontrol {Step Out} buttons in the \uicontrol Squish debugging
     view to step through the code.
 
-    \image qtcreator-squish-debugging-view.png "Squish debugging view"
+    \image qtcreator-squish-debugging-view.png {Squish debugging view}
 
-    \section2 Specifying Settings for Running Tests
+    \sa {Connect to Squish Server}, {Create Squish test suites},
+    {Enable and disable plugins}, {Select Squish AUTs}, {Squish}
+*/
 
-    To specify settings for running tests, select \uicontrol Tools >
-    \uicontrol Squish > \uicontrol {Server Settings}:
+/*!
+    \page creator-how-to-create-squish-test-suites.html
+    \previouspage creator-how-tos.html
 
-    \list
-        \li In the \uicontrol {Maximum startup time} field, set the maximum time
-            to wait for the AUT to start before throwing an error.
-        \li In the \uicontrol {Maximum response time} field, set the maximum time
-            to wait for the AUT to respond before throwing an error.
-        \li In the \uicontrol {Maximum post-mortem wait time} field, set the
-            maximum time to wait after the main AUT has exited. This is useful
-            for AUTs invoked through launcher applications, such as shell scripts
-            or batch files.
-        \li Select the \uicontrol {Animate mouse cursor} check box to animate
-            the mouse cursor when playing back a test.
+    \ingroup creator-how-to-test
+
+    \title Create Squish test suites
+
+    To create a new test suite:
+
+    \list 1
+        \li Go to \uicontrol File > \uicontrol {New Project}.
+        \li Select \uicontrol {Squish} > \uicontrol {Squish Test Suite} >
+            \uicontrol Choose.
+            \image qtcreator-squish-create-test-suite.png {Create Squish Test Suite wizard}
+        \li On the \uicontrol {Location} page, in \uicontrol {Test Suite Name},
+            enter a name for the test suite.
+            \image qtcreator-squish-create-test-suite-location.png {Location page}
+        \li In \uicontrol {Test Suite folder's parent folder}, enter the path to
+            the folder to create the test suite folder, and then select
+            \uicontrol Next.
+        \li On the \uicontrol Setup page, select the GUI toolkit used by the
+            application under test (AUT), and then select \uicontrol Next.
+            \image qtcreator-squish-create-test-suite-setup.png {Setup page}
+            Currently, only desktop GUI toolkits are supported.
+        \li On the \uicontrol {Script Language} page, select the scripting
+            language to use for the test suite's test scripts, and then select
+            \uicontrol Next.
+            \image qtcreator-squish-create-test-suite-language.png {Languages page}
+        \li On the \uicontrol {AUT} page, select the AUT to test, and then select
+            \uicontrol Next.
+            \image qtcreator-squish-create-test-suite-aut.png {AUT page}
+        \li On the \uicontrol {Summary} page, review the test suite settings, and
+            then select \uicontrol Finish to create the test suite.
     \endlist
 
-    \section1 Viewing Test Results
+    The test suite is listed in \uicontrol {Test Suites} in the \uicontrol Squish
+    sidebar view.
+
+    \sa {Connect to Squish Server}, {Manage Squish test suites and cases}, {Enable and disable plugins},
+    {Select Squish AUTs}, {Squish}
+*/
+
+/*!
+    \page creator-reference-squish-output.html
+    \previouspage creator-reference.html
+
+    \ingroup creator-reference-output-views
+
+    \title Squish
+
+    \brief View Squish test, runner, and server logs.
 
     Squish uses compare, verify, and exception functions to record the results of
-    tests applied to a running AUT in the test log as \e {passes} or \e {fails}.
-    In addition, any kind of test results can be recorded in the test log.
+    tests applied to a running application under test (AUT) in the test log as
+    \e {passes} or \e {fails}. In addition, any kind of test results can be
+    recorded in the test log.
 
-    You can view the test log in the \uicontrol Squish output,
+    To view the test log, go to the \uicontrol Squish output,
     \uicontrol {Test Results} tab.
 
-    \image qtcreator-squish-output-test-results.png "Test Results output"
+    \image qtcreator-squish-output-test-results.png {Test Results output}
 
     The \uicontrol Result column displays the time when each test run started
     and finished, log information and warnings, and test result status:
@@ -314,12 +331,14 @@
     the type of the operation that was performed: comparison, verification, or
     exception.
 
-    \section1 Viewing Squish Runner and Server Logs
+    \section1 View Squish runner and server logs
 
-    You can view the Squish Runner and Server logs in the \uicontrol Squish
+    To view the Squish Runner and Server logs, go to the \uicontrol Squish
     output, \uicontrol {Runner/Server Log} tab.
 
-    \image qtcreator-squish-output-runner-server-log.png "Runner and Server Log output"
+    \image qtcreator-squish-output-runner-server-log.png {Runner and Server Log output}
 
-    \sa {Enable and disable plugins}
+    \sa {Connect to Squish Server}, {Create Squish test suites},
+    {Enable and disable plugins}, {Manage Squish test suites and cases},
+    {Select Squish AUTs}, {View output}
 */
diff --git a/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc b/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc
index beadc0eb86a..a67a8fb7657 100644
--- a/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc
@@ -18,14 +18,6 @@
 
     \section1 General Questions
 
-
-    \b {How do I reset all \QC settings?}
-
-    Remove the settings files created by \QC.
-
-    For more information about where the files are located on each supported
-    platform, see \l {Find settings files}.
-
     \b {\QC comes with \MinGW, should I use this version with Qt?}
 
     Use the version that was built against the Qt version.
@@ -41,15 +33,6 @@
     This is especially relevant for the \macos where \c {/usr/local/bin} might
     not be in the path when \QC is started.
 
-    \b {How do I change the interface language for \QC?}
-
-    \QC has been localized into several languages. If the system
-    language is one of the supported languages, it is automatically selected.
-    To change the language, select \preferences >
-    \uicontrol Environment and select a language in the \uicontrol Language
-    field. Select \uicontrol {Restart Now} to restart \QC and have the change
-    take effect.
-
     \b {Has a reported issue been addressed?}
 
     You can look up any issue in the
@@ -70,8 +53,8 @@
     This also enables code completion of QML code and removes error messages.
 
     The following example illustrates how to specify the import path for qmake
-    projects so that it works when switching between build and run kits for
-    different target platforms:
+    projects so that it works when switching between build and run \l{Kits}{kits}
+    for different target platforms:
 
     \code
     TEMPNAME = $${QMAKE_QMAKE}
@@ -138,14 +121,10 @@
     \b {The Qt API Reference Documentation is missing and context help does
     not find topics. What can I do?}
 
-    \QC comes fully integrated with Qt documentation and examples using
-    the Qt Help plugin. The integrated Qt Reference Documentation is available
-    for Qt 4.4 and later. \QC and other Qt deliverables have
-    documentation as .qch files. All the documentation is accessible in the
-    \uicontrol Help mode.
+    Install a Qt version and Qt documentation with \QOI.
 
-    To view the documentation that is available and to add documentation,
-    select \preferences > \uicontrol Help >
+    To view the installed documentation (.qch files) and to add documentation,
+    go to \preferences > \uicontrol Help >
     \uicontrol Documentation. For more information, see
     \l{Add external documentation}.
 
@@ -164,12 +143,12 @@
 
     You must use Python version 2.6 or 2.7.
 
-    For more information on setting up debugger, see \l{Setting Up Debugger}.
+    For more information, see \l{Supported Debuggers}.
 
     \b {How do I generate a core file in \QC?}
 
     To trigger the GDB command that generates a core file while debugging,
-    select \uicontrol View > \uicontrol Views > \l {Debugger Log}.
+    go to \uicontrol View > \uicontrol Views > \l {Debugger Log}.
     In the \uicontrol Command field, type \c gcore and press \key Enter. The
     core file is created in the current working directory. You can specify
     another location for the file, including a relative or absolute path, as an
diff --git a/doc/qtcreator/src/howto/creator-only/qtcreator-how-to-change-ui-language.qdoc b/doc/qtcreator/src/howto/creator-only/qtcreator-how-to-change-ui-language.qdoc
new file mode 100644
index 00000000000..913b1b6fa99
--- /dev/null
+++ b/doc/qtcreator/src/howto/creator-only/qtcreator-how-to-change-ui-language.qdoc
@@ -0,0 +1,38 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+    \page creator-how-to-change-ui-language.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-ui
+
+    \title Change the UI language
+
+    \QC has been localized into several languages. If the system
+    language is one of the supported languages, it is automatically selected.
+
+    To change the language:
+
+    \list 1
+        \li Go to \preferences > \uicontrol Environment.
+        \li In \uicontrol Language, select a language.
+        \li Select \uicontrol OK.
+        \li Select \uicontrol {Restart Now} to restart \QC and have the change
+            take effect.
+    \endlist
+
+    \section1 Set the language from the command line
+
+    To set the UI language when you start \QC from the command line, enter:
+
+    \badcode
+    qtcreator -language <locale>
+    \endcode
+
+    Use a lowercase, two-letter
+    \l {https://www.iso.org/iso-639-language-codes.html}
+    {ISO 639 language code}, such as \e de, \e en, or \e fr.
+
+    \sa {Run Qt Creator from the command line}
+*/
diff --git a/doc/qtcreator/src/incredibuild/creator-projects-incredibuild-building.qdoc b/doc/qtcreator/src/incredibuild/creator-projects-incredibuild-building.qdoc
index f872adc77e6..f3828018149 100644
--- a/doc/qtcreator/src/incredibuild/creator-projects-incredibuild-building.qdoc
+++ b/doc/qtcreator/src/incredibuild/creator-projects-incredibuild-building.qdoc
@@ -10,7 +10,7 @@
 
     \brief Build and clean steps for Incredibuild.
 
-    Specify build settings for the selected \l{glossary-buildandrun-kit}{kit} in
+    Specify build settings for the selected \l{Kits}{kit} in
     \uicontrol Projects > \uicontrol {Build & Run} > \uicontrol Build >
     \uicontrol {Build Settings}.
 
diff --git a/doc/qtcreator/src/ios/creator-ios-dev.qdoc b/doc/qtcreator/src/ios/creator-ios-dev.qdoc
index d1e15e58b55..b6c8d53cde9 100644
--- a/doc/qtcreator/src/ios/creator-ios-dev.qdoc
+++ b/doc/qtcreator/src/ios/creator-ios-dev.qdoc
@@ -2,23 +2,22 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \previouspage creator-adding-docker-devices.html
     \page creator-developing-ios.html
-    \nextpage creator-developing-mcu.html
+    \previouspage creator-reference.html
 
-    \title Connecting iOS Devices
+    \ingroup creator-reference-devices
 
-    You can connect iOS devices to your local machine with a USB cable to
-    run applications built for them from \QC.
+    \title Developing for iOS
 
-    To be able to use \QC on \macos, you must install Xcode, and therefore,
-    you already have the tool chain for building applications for iOS. \QC
-    automatically detects the tool chain and creates the necessary
-    \l{glossary-buildandrun-kit}{kits} to build applications for and run them on
+    \brief Connect iOS devices to your local machine with a USB cable to
+    run applications on them.
+
+    After you install Xcode, \QC automatically detects the toolchain and creates
+    the necessary \l{Kits}{kits} to build applications for and run them on
     configured iOS devices.
 
-    You only need Qt libraries that are built for iOS. You can install them as
-    part of Qt 5.2, or later.
+    You only need Qt libraries that are built for iOS. You can install Qt for iOS
+    with \QOI.
 
     \section1 iOS 17 Devices
 
@@ -29,95 +28,6 @@
     physical devices with iOS 17 or later because of limitations of the Apple tool for
     accessing these devices.
 
-    \section1 Configuring Devices
-
-    The connections between \QC and an iOS device are protected by using a
-    certificate that you receive from Apple when you
-    \l{https://developer.apple.com/programs/enroll/}
-    {enroll in the Apple Developer Program}. The certificate is copied to
-    the device when you configure the device.
-
-    The first time you connect the device to your local machine, you are asked to enable
-    developer mode on the device. The next time you connect the device, \QC
-    detects it automatically. To disable automatic connections to a device that
-    you do not use for development, select \uicontrol Preferences >
-    \uicontrol iOS, and deselect the \uicontrol {Ask about devices not in
-    developer mode} check box.
-
-    \note The process of configuring devices and the UI varies slightly
-    depending on the Xcode version that you use. We recommend that you use the
-    latest available Xcode version.
-
-    To configure connections between \QC and an iOS device:
-
-    \list 1
-
-        \li Make sure that you have Xcode and Qt for iOS installed.
-
-        \li Connect the device to your local machine with a USB cable.
-
-        \li Start Xcode to configure the device.
-
-            For example, in Xcode version 15, select \uicontrol Window >
-            \uicontrol Devices and Simulators > \uicontrol Devices >
-            \uicontrol + to add the connected device.
-
-        \li To specify build settings:
-
-        \list 1
-
-            \li Open a project for an application you want to develop for the
-                device.
-
-            \li Select \uicontrol Projects > \uicontrol {Build & Run} to select
-                the kit for building applications for and running them on iOS.
-
-                \image qtcreator-ios-add-kit.png "Build & Run Settings"
-
-            \li In \uicontrol {iOS Settings}, select the development team to use
-                for signing and provisioning applications. You must configure
-                development teams and provisioning profiles in Xcode using an
-                Apple developer account.
-
-                \image qtcreator-build-settings-ios.png "iOS build settings"
-
-            \li Select the \uicontrol {Automatically manage signing} check box
-                to automatically select the provisioning profile and signing
-                certificate on your local machine that matches the entitlements
-                and the bundle identifier of the iOS device.
-
-        \endlist
-
-        \li Select \uicontrol Run to specify run settings.
-
-            Usually, you can use the default settings.
-
-    When you run the project, \QC uses Xcode to deploy the application to the
-    device.
-
-    Your signing certificate is used to sign application packages for deployment
-    to the device.
-
-    \endlist
-
-    \note If you cannot deploy applications because a provisioning profile is
-    missing, check that provisioning profiles are listed in Xcode by selecting
-    \uicontrol Xcode > \uicontrol Preferences > \uicontrol Accounts. For more
-    information about how to acquire and install a provisioning profile, see
-    Apple documentation.
-
-    \section1 Viewing Device Connection Status
-
-    When you connect an iOS device to your local machine with USB, \QC
-    automatically detects the device if you have configured it by using Xcode.
-    To view information about the connected device, select \uicontrol Preferences >
-    \uicontrol Devices.
-
-    \image qtcreator-ios-device-configurations.png "Devices dialog"
-
-    If the current device state is \uicontrol Connected, (the traffic light icon is
-    orange), you need to configure the device using Xcode.
-
     \section1 Specifying Supported iOS Versions
 
     You can build applications for the latest iOS version and deploy them to
@@ -138,9 +48,116 @@
     actual build system code reflects the minimum iOS version that is actually
     required.
 
-    For more information, see \l{Expressing Supported iOS Versions}.
+    \sa {iOS}{How To: Develop for iOS}, {Expressing Supported iOS Versions}
+*/
 
-    \section1 Testing on Simulator
+/*!
+    \page creator-how-to-connect-ios-devices.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-ios
+
+    \title Connect iOS devices
+
+    The connections between \QC and an iOS device are protected by using a
+    certificate that you receive from Apple when you
+    \l{https://developer.apple.com/programs/enroll/}
+    {enroll in the Apple Developer Program}. The certificate is copied to
+    the device when you configure the device.
+
+    The first time you connect the device to your local machine, you are asked to enable
+    developer mode on the device. The next time you connect the device, \QC
+    detects it automatically. To disable automatic connections to a device that
+    you do not use for development, go to preferences > \uicontrol iOS
+    and clear \uicontrol {Ask about devices not in developer mode}.
+
+    \note The process of configuring devices and the UI varies slightly
+    depending on the Xcode version that you use. We recommend that you use the
+    latest available Xcode version.
+
+    \section1 Create a connection to an iOS device
+
+    To configure connections between \QC and an iOS device:
+
+    \list 1
+
+        \li Check that you installed Xcode and \l{Qt for iOS}.
+
+        \li Connect the device to your local machine with a USB cable.
+
+        \li Start Xcode to configure the device.
+
+            For example, in Xcode version 15, go to \uicontrol Window >
+            \uicontrol Devices and Simulators > \uicontrol Devices, and select
+            \uicontrol + to add the connected device.
+
+        \li To specify build settings:
+
+        \list 1
+
+            \li Open a project for an application you want to develop for the
+                device.
+
+            \li Go to \uicontrol Projects > \uicontrol {Build & Run} to select
+                the kit for building applications for and running them on iOS.
+
+                \image qtcreator-ios-add-kit.png "Build & Run Settings"
+
+            \li In \uicontrol {iOS Settings}, select the development team to use
+                for signing and provisioning applications. You must configure
+                development teams and provisioning profiles in Xcode using an
+                Apple developer account.
+
+                \image qtcreator-build-settings-ios.png "iOS build settings"
+
+            \li Select \uicontrol {Automatically manage signing}
+                to automatically select the provisioning profile and signing
+                certificate on your local machine that matches the entitlements
+                and the bundle identifier of the iOS device.
+
+        \endlist
+
+        \li Select \uicontrol Run to specify run settings.
+
+            Usually, you can use the default settings.
+
+    When you run the project, \QC uses Xcode to deploy the application to the
+    device.
+
+    Your signing certificate is used to sign application packages for deployment
+    to the device.
+
+    \endlist
+
+    \note If you cannot deploy applications because a provisioning profile is
+    missing, check that provisioning profiles are listed in Xcode by going to
+    \uicontrol Xcode > \uicontrol Preferences > \uicontrol Accounts. For more
+    information about how to acquire and install a provisioning profile, see
+    Apple documentation.
+
+    \section1 View device connection status
+
+    When you connect an iOS device to your local machine with USB, \QC
+    automatically detects the device if you have configured it by using Xcode.
+    To view information about the connected device, go to \uicontrol Preferences >
+    \uicontrol Devices.
+
+    \image qtcreator-ios-device-configurations.png {Devices dialog}
+
+    If the current device state is \uicontrol Connected, (the traffic light icon is
+    orange), you need to configure the device using Xcode.
+
+    \sa {Activate kits for a project}, {iOS}{How To: Develop for iOS},
+    {Developing for iOS}
+*/
+
+/*!
+    \page creator-how-to-test-on-ios-simulator.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-ios
+
+    \title Test on iOS Simulator
 
     If you do not have an iOS device or you do not want to create an account,
     you can test applications on
@@ -149,48 +166,19 @@
     simulates a predefined set of hardware devices and software versions.
 
     You can change the simulated hardware and software version in the run
-    settings for the project. Select \uicontrol Projects > \uicontrol Run, and then select
+    settings for the project. Go to \uicontrol Projects > \uicontrol Run, and then select
     the device to simulate in the \uicontrol {Device type} field.
 
     \image qtcreator-ios-simulator-deploy.png
 
-    The simulator is started automatically when you run the application.
-    To start the simulator manually, select \uicontrol Preferences >
-    \uicontrol Devices > \uicontrol iOS > \uicontrol Start.
+    The simulator starts automatically when you run the application.
+    To start the simulator manually, either start the Simulator application
+    directly with Spotlight, or go to \uicontrol Xcode > \uicontrol {Open Developer Tool}
+    in Xcode.
 
-    To take screenshots of the simulator, select \uicontrol Preferences >
-    \uicontrol Devices > \uicontrol iOS > \uicontrol Screenshot. The screenshots
-    are stored in the directory specified in the
-    \uicontrol {Screenshot directory} field.
-
-    \section2 Managing Simulators
-
-    The available simulators are listed in \uicontrol Preferences >
-    \uicontrol Devices > \uicontrol iOS.
-
-    \image qtcreator-ios-preferences.png
-
-    To create a new simulator instance:
-
-    \list
-
-        \li Select \uicontrol Create.
-
-        \li In the \uicontrol {Device type} field, select the device type from
-            a list of devices supported by the Xcode version set as current on
-            your local machine.
-
-        \li In the \uicontrol {OS version} field, select an OS version from a
-            list of OS versions supported by the selected device and the current
-            Xcode version.
-
-    \endlist
-
-    To rename the selected simulator, select \uicontrol Rename.
-
-    To reset the contents and settings of the selected simulators, select
-    \uicontrol Reset.
-
-    To delete the selected simulator, select \uicontrol Delete.
+    Manage the available simulator devices
+    \l{https://developer.apple.com/documentation/xcode/running-your-app-in-simulator-or-on-a-device/#Configure-the-list-of-simulated-devices}
+    {in Xcode}.
 
+    \sa {iOS}{How To: Develop for iOS}, {Developing for iOS}
 */
diff --git a/doc/qtcreator/src/linux-mobile/b2qtdev.qdoc b/doc/qtcreator/src/linux-mobile/b2qtdev.qdoc
index b8c2c6f9a47..04dceb49160 100644
--- a/doc/qtcreator/src/linux-mobile/b2qtdev.qdoc
+++ b/doc/qtcreator/src/linux-mobile/b2qtdev.qdoc
@@ -1,143 +1,79 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
     /*!
     \page creator-developing-b2qt.html
-    \previouspage creator-developing-baremetal.html
-    \nextpage creator-adding-docker-devices.html
+    \previouspage creator-reference.html
 
-    \title Connecting Boot2Qt Devices
+    \ingroup creator-reference-devices
 
-    You can connect \l{Boot2Qt} devices to the development PC to run, debug,
-    and analyze applications built for them from \QC. For this, you need the
-    appropriate \l{http://qt.io/licensing/}{Qt license}.
+    \title Developing for \B2Q Devices
 
-    If you have a tool chain for building applications for Boot2Qt devices
-    installed on the development PC, you can add it to \QC. You can then
-    select a \l{glossary-buildandrun-kit}{kit} with the \uicontrol Boot2Qt
-    device type to build applications for and run them on the devices.
+    \brief Connect \B2Q devices to the computer to run,
+    debug, and analyze applications built for them from \QC.
 
-    To be able to run and debug applications on Boot2Qt devices,
-    you must add devices and select them in the \QC
-    \l{kits-tab}{kit}.
+    The \l{\B2Q: Documentation}{\B2Q} stack runs on a variety of hardware.
+    \l{http://qt.io/licensing/}{Qt license} holders can customize the contents of
+    the stack and take it into production hardware.
 
-    \section1 Enabling the Boot2Qt Plugin
+    \note Enable the \B2Q plugin to use it.
 
-    To enable the Boot2Qt plugin:
-
-    \list 1
-        \li Select \uicontrol Help > \uicontrol {About Plugins} >
-            \uicontrol {Device Support} > \uicontrol Boot2Qt to
-            enable the plugin.
-        \li Select \uicontrol {Restart Now} to restart \QC and load the plugin.
-    \endlist
-
-    \section1 Adding Boot2Qt Devices
-
-    If \QC does not automatically detect a device you connected with USB, select
-    \preferences > \uicontrol Devices >
-    \uicontrol Devices > \uicontrol Add > \uicontrol {Boot2Qt Device} to create
-    either a network connection or a USB connection to it.
+    If you have a toolchain for building applications for \B2Q devices
+    installed on the computer, add it to a \l{Kits}{kit} with the
+    \uicontrol \B2Q device type to build applications for and run them on
+    the devices.
 
     \image qtcreator-boot2qt-device-configurations.webp {Devices tab in Preferences}
 
-    To add a device without using a wizard, select \uicontrol {Boot2Qt Device} in
-    the pull-down menu of the \uicontrol Add button.
+    \include linuxdev.qdoc openssh
 
-    \note On Ubuntu Linux, the development user account must have access to the
-    plugged-in devices. To grant them access to the device via USB, create a new
-    \c udev rule, as described in
-    \l{Boot2Qt: Setting Up USB Access to Embedded Devices}.
+    \sa {\B2Q}{How To: Develop for \B2Q},
+    {Manage Kits}{How To: Manage Kits}, {Run in Qt Application Manager},
+    {\B2Q Deploy Configuration}, {\B2Q Run Settings},
+    {\B2Q: Documentation}
+*/
 
-    You can edit the settings later in \preferences >
-    \uicontrol Devices > \uicontrol Devices.
+/*!
+    \page creator-how-to-connect-b2qt.html
+    \previouspage creator-how-tos.html
 
-    To reboot the selected device, select \uicontrol {Reboot Device}.
+    \ingroup creator-how-to-b2qt
 
-    To restore the default application to the device, select
-    \uicontrol {Restore Default App}.
+    \title Connect \B2Q devices
 
-    \section2 Protecting Connections
+    Create connections between \l{\B2Q: Documentation}{\B2Q} devices and
+    \QC to run, debug, and analyze applications on them.
 
-    You can protect the connections between \QC and a device by using an
-    \l{https://www.openssh.com/}{OpenSSH} connection. OpenSSH is a
-    connectivity tool for remote login using the SSH protocol. The OpenSSH
-    suite is not delivered with \QC, so you must download it and install it
-    on the development PC. Then, you must configure the paths to the tools in
-    \QC. For more information, see \l {Configuring SSH Connections}.
+    \note Enable the \B2Q plugin to use it.
 
-    You need either a password or an SSH public and private key pair for
-    authentication. If you do not have an SSH key, you can use the \c ssh-keygen
-    tool to create it in \QC. For more information, see \l {Generating SSH Keys}.
-
-    \QC does not store passwords. If you use password authentication, you may
-    need to enter the password upon every connection to the device, or if
-    caching is enabled, at every \QC restart. If you frequently run into the
-    timeout, consider using key-based authentication. On \macos and Linux, you
-    can also select \preferences > \uicontrol Devices > \uicontrol SSH
-    and increase the time (in minutes) to use the same SSH connection in the
-    \uicontrol {Connection sharing timeout} field. Windows does not support
-    shared connections.
-
-    \image qtcreator-ssh-options.png {SSH preferences}
-
-    \section1 Flashing Boot2Qt Devices
-
-    To flash the Boot2Qt image to an SD card with Flashing Wizard, select
-    \uicontrol Tools > \uicontrol {Flash Boot to Qt Device} and follow the
-    instructions of the wizard.
-
-    \image qtcreator-boot2qt-flashing-wizard.png {Boot2Qt Flashing Wizard}
-
-    \section1 Configuring Connections
-
-    To configure connections between \QC and a Boot2Qt device and to
-    specify build and run settings for the device:
+    To configure connections between \QC and a \B2Q device:
 
     \list 1
         \li Check that you can reach the IP address of the device, or use USB to
             connect it.
-        \li Select \preferences > \uicontrol Kits > \uicontrol {Qt Versions} >
-            \uicontrol Add to add the Qt version for Boot2Qt.
-        \li Select \preferences > \uicontrol Kits >
-            \uicontrol Compilers > \uicontrol Add to add the compiler for
-            building the applications.
-        \li Select \uicontrol Tools > \uicontrol {Flash Boot to Qt Device}
-            to flash the Boot2Qt image to an SD card with Flashing Wizard.
-        \li To deploy applications and run them remotely on devices, specify
-            parameters for connecting to the devices over the network (\QC
-            automatically detects devices connected with USB):
-            \list 1
-                \li Select \preferences > \uicontrol Devices >
-                    \uicontrol Devices > \uicontrol Add > \uicontrol Boot2Qt.
-                    \image qtcreator-devices-boot2qt.png {Boot2Qt Network Device Setup wizard}
-                \li In the \uicontrol {Device name} field, enter a name for
-                    the connection.
-                \li In the \uicontrol {Device address} field, enter the host
-                    name or IP address of the device. This value will be
-                    available in the \c %{Device:HostAddress} variable.
-                \li Click \uicontrol {Finish} to test the connection and
-                    add the device.
+        \li Go to \preferences > \uicontrol Kits > \uicontrol {Qt Versions}.
+        \li Select \uicontrol Add to add the Qt version for \B2Q.
+        \li Go to \preferences > \uicontrol Kits > \uicontrol Compilers.
+        \li Select \uicontrol Add to add the compiler for building the
+            applications.
+        \li Go to \uicontrol Tools > \uicontrol {Flash \B2Q}
+            to flash the \B2Q image to an SD card with \B2Q Flashing Wizard.
+            \image qtcreator-boot2qt-flashing-wizard.png {\B2Q Flashing Wizard}
+        \li Follow the instructions of the wizard to flash the image to the SD
+            card.
+        \li Go to \preferences > \uicontrol Devices > \uicontrol Devices.
+        \li Select \uicontrol Add to add a \B2Q device.
 
-                    You can edit the connection parameters in the
-                    \uicontrol Devices tab. The wizard does not show
-                    parameters that have sensible default values. One of
-                    these is the SSH port number, which is available in
-                    the variable \c %{Device:SshPort}.
-
-                    To add a device without using the wizard, select
-                    \uicontrol {Boot2Qt Device} in the pull-down menu of the
-                    \uicontrol Add button.
-            \endlist
-        \li Select \preferences > \uicontrol Kits >
-            \uicontrol Add to add a kit for building applications for the
-            device. Select the Qt version, compiler, and device that you
-            added above, and choose \uicontrol Boot2Qt as the device type.
+            \QC automatically detects devices connected with USB.
+        \li Go to \preferences > \uicontrol Kits.
+        \li Select \uicontrol Add to add a kit for building for the device.
+        \li Select the Qt version, compiler, and device that you added above.
+        \li In \uicontrol {Run device type}, select \uicontrol {Boot2Qt Device}.
         \li To specify build settings:
         \list 1
             \li Open a project for an application you want to develop for the
                 device.
-            \li Select \uicontrol Projects > \uicontrol {Build & Run} to enable
+            \li Go to \uicontrol Projects > \uicontrol {Build & Run} to activate
                 the kit that you specified above.
         \endlist
         \li Select \uicontrol Run to specify run settings. Usually, you can use
@@ -145,9 +81,66 @@
 
             When you run the project, \QC deploys the application as
             specified by the deploy steps. By default, \QC copies the
-            application files to the device. For more information, see
-            \l{Boot2Qt Run Settings}.
+            application files to the device.
     \endlist
 
-    \sa {Boot2Qt: Setting Up USB Access to Embedded Devices}
+    \sa {Configure SSH connections}, {Generate SSH keys},
+    {Enable and disable plugins}, {\B2Q}{How To: Develop for \B2Q},
+    {Manage Kits}{How To: Manage Kits}, {\B2Q Deploy Configuration},
+    {\B2Q Run Settings}, {Developing for \B2Q Devices}
+*/
+
+/*!
+    \page creator-how-to-add-b2qt.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-b2qt
+
+    \title Add \B2Q devices
+
+    \note Enable the \B2Q plugin to use it.
+
+    If \QC does not automatically detect a \B2Q device you connect with USB,
+    check that you followed the instructions in the \l{\B2Q: Documentation}
+    {Quick Start Guide} for the device.
+
+    If that does not help, but you can reach the IP address of the device,
+    create a network connection to it:
+
+    \list 1
+        \li Go to \preferences > \uicontrol Devices > \uicontrol Devices.
+            \image qtcreator-boot2qt-device-configurations.webp {Devices tab in Preferences}
+        \li Select \uicontrol Add > \uicontrol {Boot2Qt Device} to create
+            a network connection to the device.
+            \image qtcreator-devices-boot2qt.png {Boot to Qt Network Device Setup wizard}
+        \li In \uicontrol {Device name}, enter a name for the connection.
+        \li In \uicontrol {Device address}, enter the host
+            name or IP address of the device. This value becomes the value of the
+            \c %{Device:HostAddress} variable.
+        \li Select \uicontrol {Finish} to test the connection and add the device.
+    \endlist
+
+    The wizard does not show parameters that have sensible default values, such
+    as the SSH port number. It is available in the variable \c %{Device:SshPort}.
+
+    To add a device without using a wizard, select \uicontrol {Boot2Qt Device} in
+    the pull-down menu of the \uicontrol Add button.
+
+    \note On Ubuntu Linux, the development user account must have access to the
+    plugged-in devices. To grant them access to the device via USB, create a new
+    \c udev rule, as described in
+    \l{\B2Q: Setting Up USB Access to Embedded Devices}.
+
+    \section1 Reboot devices
+
+    To reboot the selected device, select \uicontrol {Reboot Device}.
+
+    \section1 Restore default applications
+
+    To restore the default application to the device, select
+    \uicontrol {Restore Default App}.
+
+    \sa {Enable and disable plugins}, {\B2Q}{How To: Develop for \B2Q},
+    {Developing for \B2Q Devices},
+    {\B2Q: Setting Up USB Access to Embedded Devices}
 */
diff --git a/doc/qtcreator/src/linux-mobile/creator-deployment-b2qt.qdoc b/doc/qtcreator/src/linux-mobile/creator-deployment-b2qt.qdoc
index 73301bb173b..298865d794c 100644
--- a/doc/qtcreator/src/linux-mobile/creator-deployment-b2qt.qdoc
+++ b/doc/qtcreator/src/linux-mobile/creator-deployment-b2qt.qdoc
@@ -1,25 +1,32 @@
-// Copyright (C) 2022 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
     \page creator-deployment-b2qt.html
-    \previouspage creator-deploying-android.html
-    \nextpage creator-deployment-qnx.html
+    \previouspage creator-reference.html
 
-    \title Deploying to Boot2Qt
+    \ingroup creator-reference-deploy-configurations
 
-    You can specify settings for deploying applications to \l{Boot2Qt} devices
-    in the project configuration file and in \uicontrol Projects >
-    \uicontrol {Run Settings} > \uicontrol Deployment.
+    \title \B2Q Deploy Configuration
 
-    \image qtcreator-boot2qt-deployment-steps.png "Boot2Qt deployment steps"
+    \brief Copy application files to \B2Q devices.
+
+    Specify settings for deploying applications to \l{\B2Q: Documentation}
+    {\B2Q} devices in the project configuration file and in \uicontrol Projects
+    > \uicontrol {Run Settings} > \uicontrol Deployment.
+
+    \image qtcreator-boot2qt-deployment-steps.png {Boot to Qt deployment steps}
 
     The deployment process is described in more detail in
-    \l{Deploying to Remote Linux}.
+    \l{Remote Linux Deploy Configuration}.
 
     \section1 Launching Applications on Boot
 
-    In addition, to have your application launch on boot, select
+    To have your application launch on boot, select
     \uicontrol {Add Deploy Step} > \uicontrol {Change default application}
     > \uicontrol {Set this application to start by default}.
+
+    \sa {Build and Run}{How To: Build and Run},
+    {\B2Q}{How To: Develop for \B2Q}, {\B2Q Run Settings},
+    {Developing for \B2Q Devices}
 */
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 38c6823fa30..87c54e26faa 100644
--- a/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc
+++ b/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 // **********************************************************************
@@ -9,14 +9,18 @@
 
 /*!
     \page creator-deployment-embedded-linux.html
-    \previouspage creator-deployment-qnx.html
-    \nextpage creator-connecting-mobile.html
+    \previouspage creator-reference.html
 
-    \title Deploying to Remote Linux
+    \ingroup creator-reference-deploy-configurations
 
-    You can specify settings for deploying applications to generic remote
-    Linux devices in the project configuration file and in the
-    \uicontrol Projects mode, in \uicontrol {Run Settings}.
+    \title Remote Linux Deploy Configuration
+
+    \brief Copy application files to generic remote Linux devices or create a
+    tarball.
+
+    Specify settings for deploying applications to generic remote
+    Linux devices in the project configuration file and in \uicontrol Projects >
+    \uicontrol {Run Settings} > \uicontrol Deployment.
 
     \image qtcreator-embedded-linux-deployment-details.png "Deploy to remote Linux devices"
 
@@ -107,4 +111,7 @@
 
     The \uicontrol {Deploy tarball via SFTP upload} step specifies that \QC
     uploads the tarball to the device and extracts it.
+
+    \sa {Build and Run}{How To: Build and Run},
+    {Remote Linux}{How To: Develop for remote Linux}, {Remote Linux Run Settings}
 */
diff --git a/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc b/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc
deleted file mode 100644
index a6ca31f33fe..00000000000
--- a/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-/*!
-    \page creator-embedded-platforms.html
-    \previouspage creator-reference.html
-
-    \ingroup creator-reference-platforms
-
-    \title Embedded Platforms
-
-    \brief Embedded platforms that you can develop applications for.
-
-    You can develop applications for the following embedded platforms:
-
-    \list
-        \li \l {Bare Metal}
-        \li \l {Boot2Qt}
-        \li \l {Remote Linux}
-        \li \l {Microcontroller Units (MCU)}
-        \li \l QNX
-    \endlist
-
-    You must install the tool chain for building applications for the targeted
-    embedded platform on the development PC and use \QMT to
-    install Qt libraries that are built for the platform. You can then add a
-    \l{glossary-buildandrun-kit}{kit} with the tool chain and the Qt version
-    for the device's architecture. When possible, \QMT creates
-    suitable kits for you.
-
-    You can connect embedded devices to the development PC to run, debug, and
-    analyze applications built for them from \QC.
-
-    \section1 Bare Metal
-
-    You can run and debug applications on small devices that are not supported
-    by the remote Linux device plugin by using GDB or a hardware
-    debugger.
-
-    For more information about developing applications for Bare Metal devices,
-    see \l{Connecting Bare Metal Devices}.
-
-    \section1 Boot2Qt
-
-    The Boot2Qt stack runs on a variety of hardware. License holders can use
-    tools to customize the contents of the stack and to take it into
-    production hardware.
-
-    The following topics have more information about developing applications
-    for Boot2Qt devices:
-
-    \list
-        \li \l{Boot2Qt: Documentation}
-        \li \l{Connecting Boot2Qt Devices}
-        \li \l{Boot2Qt Run Settings}
-        \li \l{Deploying to Boot2Qt}
-        \li \l{Run in Qt Application Manager}
-    \endlist
-
-    \section1 Remote Linux
-
-    You must have a tool chain for building applications for embedded Linux
-    devices installed on the development PC.
-
-    The following topics have more information about developing applications
-    for remote Linux devices:
-
-    \list
-        \li \l{Adding Docker Devices}
-        \li \l{Connecting Remote Linux Devices}
-        \li \l{Deploying to Remote Linux}
-        \li \l{Remote Linux Run Settings}
-        \li \l{Run on remote Linux devices}
-        \li \l{Run in Qt Application Manager}
-    \endlist
-
-    \section1 Microcontroller Units (MCU)
-
-    You need the GNU Arm Embedded GCC compiler, libraries, and other GNU tools
-    necessary for bare metal software development on devices based on the Arm
-    Cortex-M processors.
-
-    The following topics have more information about developing applications
-    for MCUs:
-
-    \list
-        \li \l{Connecting MCUs}
-        \li \l{MCUs}{How To: Develop for MCUs}
-        \li \l{https://doc.qt.io/QtForMCUs/index.html}{\QMCU}
-    \endlist
-
-    \section1 QNX
-
-    The QNX Neutrino RTOS has more command-line tools
-    and services, as described in \l {Qt for QNX}.
-
-    \note In Qt 6, \QC support for QNX is considered experimental.
-
-    The following topics have more information about developing applications
-    for QNX devices:
-
-    \list
-        \li \l{Connecting QNX Devices}
-        \li \l{Deploying to QNX Neutrino}
-        \li \l{QNX Run Settings}
-        \li \l{Run on QNX devices}
-        \li \l{Qt for QNX}
-    \endlist
-
-    \sa {Develop for Devices}{How To: Develop for Devices}, {Supported Platforms}
-*/
diff --git a/doc/qtcreator/src/linux-mobile/creator-projects-how-to-run-generic-linux.qdoc b/doc/qtcreator/src/linux-mobile/creator-projects-how-to-run-generic-linux.qdoc
index b78dcd5ca20..aeb17305cf8 100644
--- a/doc/qtcreator/src/linux-mobile/creator-projects-how-to-run-generic-linux.qdoc
+++ b/doc/qtcreator/src/linux-mobile/creator-projects-how-to-run-generic-linux.qdoc
@@ -5,7 +5,7 @@
     \page creator-how-to-run-on-remote-linux.html
     \previouspage creator-how-tos.html
 
-    \ingroup creator-how-to-run
+    \ingroup creator-how-to-remote-linux
 
     \title Run on remote Linux devices
 
@@ -19,7 +19,7 @@
 
         \endlist
 
-    \QC uses the compiler from the kit (tool chain) to build the application.
+    \QC uses the compiler from the kit (toolchain) to build the application.
 
     \QC copies the application files to the connected device and runs the
     application. The application views are
@@ -34,6 +34,7 @@
     Debugging works transparently if GDB server is installed on the device and
     it is compatible with the GDB on the host.
 
-    \sa {Connecting Remote Linux Devices}, {Run on many platforms}, {Compilers},
-    {Embedded Platforms}, {kit-preferences}{Kits}
+    \sa {Remote Linux}{How To: Develop for remote Linux},
+    {Debug remotely with GDB}, {Run on many platforms}, {Compilers},
+    {Embedded Platforms}, {Kits}
 */
diff --git a/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-b2qt.qdoc b/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-b2qt.qdoc
index 1391cfcfd48..01eb71f171f 100644
--- a/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-b2qt.qdoc
+++ b/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-b2qt.qdoc
@@ -1,30 +1,30 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \page creator-run-settings-boot2qt.html
+    \page creator-run-settings-\B2Q.html
     \previouspage creator-reference.html
 
     \ingroup creator-reference-run-configurations
 
-    \title Boot2Qt Run Settings
+    \title \B2Q Run Settings
 
-    \brief Settings for running applications on Boot2Qt devices.
+    \brief Settings for running applications on \B2Q devices.
 
-    Specify settings for running applications on the \l {kits-tab}{Run device} that
+    Specify settings for running applications on the \l {Kits}{Run device} that
     you select for a kit in \uicontrol Projects > \uicontrol {Build & Run} >
     \uicontrol Run > \uicontrol {Run Settings}.
 
-    To run and debug an application on a \l Boot2Qt device (commercial only), you
-    must create connections from the development host to the device and add the
-    device configurations to kits. Select \uicontrol {Manage Kits} to add devices
-    to kits. For more information, see
-    \l{http://doc.qt.io/Boot2Qt/b2qt-installation-guides.html}
-    {Boot2Qt: Installation Guide}.
+    To run and debug an application on a \l{\B2Q: Documentation}{\B2Q} device
+    (commercial only), create connections from the development host to the device
+    and add the device configurations to kits.
+
+    Select \uicontrol {Manage Kits} to add devices to kits.
 
     The run settings display the path to the executable file on the development
     host and on the device.
 
-    \sa {Activate kits for a project}, {Configure projects for running}, {kits-tab}{Kits},
-    {Deploying to Boot2Qt}
+    \sa {\B2Q}{How To: Develop for \B2Q}, {Manage Kits}{How To: Manage Kits},
+    {Configure projects for running}, {Kits},
+    {\B2Q Deploy Configuration}
 */
diff --git a/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdoc b/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdoc
index 4e2a08e1326..37954b8e89a 100644
--- a/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdoc
+++ b/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdoc
@@ -11,7 +11,7 @@
 
     \brief Settings for running applications on Linux-based devices.
 
-    Specify run settings for the selected \l{glossary-buildandrun-kit}{kit} in
+    Specify run settings for the selected \l{Kits}{kit} in
     \uicontrol Projects > \uicontrol {Build & Run} > \uicontrol Run >
     \uicontrol {Run Settings}.
 
@@ -19,7 +19,7 @@
     connections from the development host to the device and add the device
     configurations to kits. Select \uicontrol {Manage Kits} to add devices
     to kits. For more information, see
-    \l {Connecting Remote Linux Devices}.
+    \l {Remote Linux}{How To: Develop for remote Linux}.
 
     When you run the application, \QC copies the files to the connected device.
 
@@ -37,6 +37,6 @@
     Select the \uicontrol {Forward to local display} check box to show a remotely
     running X11 client on a local display.
 
-    \sa {Activate kits for a project}, {Configure projects for running}, {kits-tab}{Kits},
-    {Connecting Remote Linux Devices}
+    \sa {Activate kits for a project}, {Configure projects for running}, {Kits},
+    {Remote Linux}{How To: Develop for remote Linux}
 */
diff --git a/doc/qtcreator/src/linux-mobile/linuxdev-keys.qdoc b/doc/qtcreator/src/linux-mobile/linuxdev-keys.qdoc
new file mode 100644
index 00000000000..9af4de44ed7
--- /dev/null
+++ b/doc/qtcreator/src/linux-mobile/linuxdev-keys.qdoc
@@ -0,0 +1,82 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+    \page creator-how-to-configure-ssh.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-remote-linux
+
+    \title Configure SSH connections
+
+    To protect the connections between \QC and a device, install the \l{OpenSSH}
+    suite, which includes the \c ssh, \c sftp, and \c ssh-keygen tools on the
+    computer.
+
+    SSH connections are established via an OpenSSH client running in master
+    mode, if possible. By default, multiple sessions are shared over a single SSH
+    onnection. Establishing a connection once and then re-using it for subsequent
+    run and deploy procedures reduces connection setup overhead particularly
+    with embedded devices. Because connection sharing is not supported on
+    Windows, a new SSH connection is created for each deploy or run procedure.
+
+    To set the paths to the directories where the tools are installed:
+
+    \list 1
+        \li Go to \preferences > \uicontrol Devices > \uicontrol SSH.
+            \image qtcreator-ssh-options.png "SSH preferences"
+        \li Clear \uicontrol {Enable connection sharing} to
+            create a new SSH connection for each deploy and run procedure. This
+            option is grayed on Windows, where connection sharing is not
+            supported.
+        \li In \uicontrol {Connection sharing timeout}, specify the
+            timeout for reusing the SSH connection in minutes.
+        \li In \uicontrol {Path to ssh executable}, enter the path
+            to the directory where the OpenSSH executable is installed.
+        \li In \uicontrol {Path to sftp executable}, enter the path
+            to the directory where the SFTP executable is installed.
+        \li In \uicontrol {Path to ssh-askpass executable}, enter the
+            path to the directory where the ssh-askpass executable is installed.
+            Usually, you can use the default path that points to the
+            implementation of the tool delivered with \QC, qtc-askpass.
+        \li In \uicontrol {Path to ssh-keygen executable}, enter the
+            path to the directory where the ssh-keygen executable is installed.
+    \endlist
+
+    \sa {Remote Linux}{How To: Develop for remote Linux},
+    {Developing for Remote Linux Devices}
+*/
+
+/*!
+    \page creator-how-to-generate-ssh-keys.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-remote-linux
+
+    \title Generate SSH keys
+
+    To protect the connections between \QC and a device, use \l{OpenSSH}.
+
+    If you do not have an SSH public and private key pair, you can generate it
+    in \QC. The connection wizard can create the key pair for you, or you can
+    create it separately.
+
+    You can specify key length and the key algorithm, RSA or ECDSA.
+    If you only use the keys to protect connections to the emulator or
+    device, you can use the default values.
+
+    \list 1
+        \li Go to \preferences > \uicontrol Devices > \uicontrol Devices
+        \li Select \uicontrol {Create New}.
+            \image qtcreator-ssh-key-configuration.png {SSH Key Configuration dialog}
+        \li In \uicontrol {Private key file}, select the location to save
+            the private key.
+            \uicontrol {Public key file} displays the location to save the
+            corresponding public key.
+        \li Select \uicontrol {Generate And Save Key Pair} to generate and save the
+            keys at the specified locations.
+    \endlist
+
+    \sa {Remote Linux}{How To: Develop for remote Linux},
+    {Developing for remote Linux devices}
+*/
diff --git a/doc/qtcreator/src/linux-mobile/linuxdev-keys.qdocinc b/doc/qtcreator/src/linux-mobile/linuxdev-keys.qdocinc
deleted file mode 100644
index f3582f23736..00000000000
--- a/doc/qtcreator/src/linux-mobile/linuxdev-keys.qdocinc
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (C) 2019 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-/*!
-
-//! [configuring ssh]
-    \section2 Configuring SSH Connections
-
-    SSH connections are established via an OpenSSH client running in master
-    mode, if possible. Connection sharing is enabled by default to allow
-    sharing multiple sessions over a single SSH connection. This way, a
-    connection is only established once and then re-used by subsequent run
-    and deploy procedures, saving connection setup overhead particularly
-    with embedded devices. Because connection sharing is not supported on
-    Windows, a new SSH connection is created for each deploy or run procedure.
-
-    To create SSH connections, you must install the \l{https://www.openssh.com/}
-    {OpenSSH} suite, which includes the ssh, sftp, and ssh-keygen tools on the
-    development PC.
-
-    To tell \QC where it can find the tools, specify the paths to the
-    directories where the tools are installed in \preferences >
-    \uicontrol Devices > \uicontrol SSH:
-
-    \image qtcreator-ssh-options.png "SSH preferences"
-
-    \list
-        \li Deselect the \uicontrol {Enable connection sharing} check box to
-            create a new SSH connection for each deploy and run procedure. This
-            option is grayed on Windows, where connection sharing is not
-            supported.
-        \li In the \uicontrol {Connection sharing timeout} field, specify the
-            timeout for reusing the SSH connection in minutes.
-        \li In the \uicontrol {Path to ssh executable} field, enter the path
-            to the directory where the OpenSSH executable is installed.
-        \li In the \uicontrol {Path to sftp executable} field, enter the path
-            to the directory where the SFTP executable is installed.
-        \li In the \uicontrol {Path to ssh-askpass executable} field, enter the
-            path to the directory where the ssh-askpass executable is installed.
-            Usually, you can use the default path that points to the
-            implementation of the tool delivered with \QC, qtc-askpass.
-        \li In the \uicontrol {Path to ssh-keygen executable} field, enter the
-            path to the directory where the ssh-keygen executable is installed.
-    \endlist
-
-//! [configuring ssh]
-
-
-//! [generating ssh keys]
-
-    \section2 Generating SSH Keys
-
-    If you do not have an SSH public and private key pair, you can generate it
-    in \QC. The connection wizard can create the key pair for you, or you can
-    create it separately.
-
-    You can specify key length and the key algorithm, RSA or ECDSA.
-    If you only use the keys to protect connections to the emulator or
-    device, you can use the default values.
-
-    \list 1
-
-        \li Select \preferences > \uicontrol Devices
-            > \uicontrol Devices > \uicontrol {Create New}.
-
-            \image qtcreator-ssh-key-configuration.png "SSH Key Configuration dialog"
-
-        \li In the \uicontrol {Private key file} field, select the location to save
-            the private key.
-
-            The \uicontrol {Public key file} field displays the location to save the
-            corresponding public key.
-
-        \li Select \uicontrol {Generate And Save Key Pair} to generate and save the
-            keys at the specified locations.
-
-    \endlist
-
-//! [generating ssh keys]
-*/
diff --git a/doc/qtcreator/src/linux-mobile/linuxdev-processes.qdoc b/doc/qtcreator/src/linux-mobile/linuxdev-processes.qdoc
new file mode 100644
index 00000000000..db73410dcaf
--- /dev/null
+++ b/doc/qtcreator/src/linux-mobile/linuxdev-processes.qdoc
@@ -0,0 +1,26 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+    \page creator-how-to-manage-device-processes.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-remote-linux
+
+    \title Manage device processes
+
+    To view and end processes running on embedded platforms:
+
+    \list 1
+        \li Go to \preferences > \uicontrol Devices > \uicontrol Devices.
+        \li Select an embedded device.
+            \image qtcreator-preferences-devices-remote-linux.webp {Remote Linux Device in Devices}
+        \li Select \uicontrol {Show Running Processes}.
+        \li Filter the processes by name or ID.
+        \li To update the process list, select \uicontrol {Update List}.
+        \li To end a process, select it in the list, and then select
+            \uicontrol {Kill Process}.
+    \endlist
+
+    \sa {Develop for Devices}{How To: Develop for Devices}, {Devices}
+*/
diff --git a/doc/qtcreator/src/linux-mobile/linuxdev-processes.qdocinc b/doc/qtcreator/src/linux-mobile/linuxdev-processes.qdocinc
deleted file mode 100644
index 1c9c2d0a4ab..00000000000
--- a/doc/qtcreator/src/linux-mobile/linuxdev-processes.qdocinc
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (C) 2019 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-/*!
-//! [managing device processes]
-
-    \section2 Managing Device Processes
-
-    You can view processes running on devices and kill them. Select
-    \preferences > \uicontrol Devices >
-    \uicontrol Devices > \uicontrol {Show Running Processes}.
-
-    You can filter the processes by name or ID in the
-    \uicontrol {List of Processes} dialog.
-
-    To update the process list, select \uicontrol {Update List}.
-
-    To kill a process, select it in the list, and then select \uicontrol {Kill
-    Process}.
-
-//! [managing device processes]
-*/
diff --git a/doc/qtcreator/src/linux-mobile/linuxdev.qdoc b/doc/qtcreator/src/linux-mobile/linuxdev.qdoc
index 401fdbd8c1e..6691ca4b2c4 100644
--- a/doc/qtcreator/src/linux-mobile/linuxdev.qdoc
+++ b/doc/qtcreator/src/linux-mobile/linuxdev.qdoc
@@ -1,122 +1,99 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
     /*!
     \page creator-developing-generic-linux.html
-    \previouspage creator-developing-qnx.html
-    \nextpage creator-setup-webassembly.html
+    \previouspage creator-reference.html
 
-    \title Connecting Remote Linux Devices
+    \ingroup creator-reference-devices
 
-    You can connect generic Linux devices to the development PC to run,
+    \title Developing for Remote Linux Devices
+
+    \brief Connect generic Linux devices to the computer to run,
     debug, and analyze applications built for them from \QC.
 
-    If you have a tool chain for building applications for embedded Linux
-    devices installed on the development PC, you can add
-    it to \QC. You can then select a \l{glossary-buildandrun-kit}{kit}
+    If you have a toolchain for building applications for embedded Linux
+    devices installed on the computer, add it to a \l{Kits}{kit}
     with the device type \uicontrol {Remote Linux Device} to
     build applications for and run them on the devices.
 
-    To be able to run and debug applications on remote Linux devices,
-    you must add devices and select them in the \QC \l{glossary-buildandrun-kit}
-    {kit}.
+    Use a wizard to connect remote Linux devices to the computer. You can edit
+    the settings later in \preferences > \uicontrol Devices > \uicontrol Devices.
 
-    You use a wizard to create the connections. You can edit the settings later
-    in \preferences > \uicontrol Devices >
-    \uicontrol Devices.
+    \image qtcreator-preferences-devices-remote-linux.webp {Remote Linux Device in Devices}
 
-    \image qtcreator-preferences-devices-remote-linux.webp "Remote Linux Device in the Devices tab"
+    //! [openssh]
+    \section1 Protecting Device Connections
 
-    You can protect the connections between \QC and a device by using an
-    \l{https://www.openssh.com/}{OpenSSH} connection. OpenSSH is a
-    connectivity tool for remote login using the SSH protocol. The OpenSSH
-    suite is not delivered with \QC, so you must download it and install it
-    on the development PC. Then, you must configure the paths to the tools in
-    \QC. For more information, see \l {Configuring SSH Connections}.
+    To protect the connections between \QC and a device, use \l{OpenSSH} for
+    remote login over the SSH protocol. The OpenSSH suite is not delivered with
+    \QC, so download it and install it on the computer. Then, configure the paths
+    to the tools in \QC.
 
     You need either a password or an SSH public and private key pair for
-    authentication. If you do not have an SSH key, you can use the ssh-keygen
-    tool to create it in \QC. For more information, see \l {Generating SSH Keys}.
+    authentication. If you do not have an SSH key, use the \c ssh-keygen
+    tool to create it in \QC.
 
     \note \QC does not store passwords, so if you use password authentication,
     you may need to enter the password on every connection to the device,
     or, if caching is enabled, at every \QC restart.
 
-    To configure connections between \QC and a remote Linux device and to
-    specify build and run settings for the device:
+    If you frequently run into the timeout, consider using key-based
+    authentication. Create an SSH key in \QC with the \c ssh-keygen tool.
+
+    On \macos and Linux, go to \preferences > \uicontrol Devices > \uicontrol SSH
+    and increase the time (in minutes) for sharing an SSH connection in the
+    \uicontrol {Connection sharing timeout} field. Windows does not support
+    shared connections.
+
+    \image qtcreator-ssh-options.png {SSH preferences}
+    //! [openssh]
+
+    \sa {Add Docker devices}, {Remote Linux}{How To: Develop for remote Linux},
+    {Run in Qt Application Manager}, {Remote Linux Deploy Configuration},
+    {Remote Linux Run Settings}
+*/
+
+/*!
+    \page creator-how-to-connect-remote-linux.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-remote-linux
+
+    \title Connect remote Linux devices
+
+    Create connections between generic Linux devices and \QC to run, debug, and
+    analyze applications on them.
+
+    To configure connections between \QC and a remote Linux device:
 
     \list 1
 
         \li Make sure that your device can be reached via an IP address.
 
-        \li Select \preferences > \uicontrol Kits >
-            \uicontrol {Qt Versions} > \uicontrol Add to add the Qt version
-            for embedded Linux.
+        \li Go to \preferences > \uicontrol Kits > \uicontrol {Qt Versions}.
 
-        \li Select \preferences > \uicontrol Kits >
-            \uicontrol Compilers > \uicontrol Add to add the compiler for
-            building the applications.
+        \li Select \uicontrol Add to add the Qt version for embedded Linux.
 
-        \li To deploy applications and run them remotely on devices, specify
-            parameters for accessing the devices:
+        \li Go to \preferences > \uicontrol Kits > \uicontrol Compilers.
 
-            \list a
+        \li Select \uicontrol Add to add the compiler for building the
+            applications.
 
-                \li Select \preferences >
-                    \uicontrol Devices > \uicontrol Devices > \uicontrol Add >
-                    \uicontrol {Remote Linux Device}
-                    > \uicontrol {Start Wizard}.
+        \li Go to \preferences > \uicontrol Devices > \uicontrol Devices.
 
-                    \image qtcreator-preferences-devices-remote-linux-connection.webp "Connection Data wizard"
+        \li Select \uicontrol Add to add a remote Linux device.
 
-                \li In \uicontrol {The name to identify this configuration},
-                    enter a name for the connection.
+        \li Go to \preferences > \uicontrol Kits.
 
-                \li In \uicontrol {The device's host name or IP address},
-                    enter the host name or IP address of the device.
-                    This value will be available in the variable \c %{Device:HostAddress}.
+        \li Select \uicontrol Add to add a kit for building for the device.
 
-                \li In \uicontrol {The device's SSH port number}, enter the port
-                    number to use for SSH connections. This value will be
-                    available in the variable \c %{Device:SshPort}.
-                \li In \uicontrol {The username to log into the device},
-                    enter the username to log into the device and run the
-                    application as.
-                    This value will be available in the variable \c %{Device:UserName}.
+        \li Select the Qt version, compiler, and device that you added above.
 
-                \li Select \uicontrol {Next} to open the
-                    \uicontrol {Key Deployment} dialog.
+        \li In \uicontrol {Run device type}, select
+            \uicontrol {Remote Linux Device}.
 
-                    \image qtcreator-preferences-devices-remote-linux-key-deployment.webp "Key Deployment dialog"
-
-                \li In \uicontrol {Private key file}, select a private key file
-                    to use for authentication. This value will be available in
-                    the variable \c %{Device:PrivateKeyFile}.
-
-                \li If you do not have a public-private key pair, select
-                    \uicontrol {Create New Key Pair}. For more information,
-                    see \l{Generating SSH Keys}.
-
-                \li Select \uicontrol {Deploy Public Key} to copy the public
-                    key to the device.
-
-                \li  Select \uicontrol {Next} to create the connection.
-
-            \endlist
-
-            All of these parameters can be edited later, as well as additional ones that the
-            wizard does not show because there are sensible default values.
-
-           To add a device without using the wizard, select
-           \uicontrol {Add Remote Linux Device} in the pull-down
-           menu of the \uicontrol Add button.
-
-        \li Select \preferences > \uicontrol Kits >
-            \uicontrol Add to add a kit for building for the device. Select the
-            Qt version, compiler, and device that you added above, and select
-            \uicontrol {Remote Linux Device} in \uicontrol {Run device type}.
-
-            To build on the remote device, select \uicontrol {Remote Linux Device}
+        \li To build on the remote device, select \uicontrol {Remote Linux Device}
             also in \uicontrol {Build device}.
 
         \li To specify build settings:
@@ -134,13 +111,33 @@
         \li Select \uicontrol Run to specify run settings. Usually, you can use
             the default settings.
 
-    When you run the project, \QC deploys the application as specified by the
-    deploy steps. By default, \QC copies the application files to the device.
-    For more information, see \l{Deploying to Remote Linux}.
+            When you run the project, \QC deploys the application as specified by
+            the deploy steps.
 
     \endlist
 
-    \include linux-mobile/linuxdev-keys.qdocinc configuring ssh
-    \include linux-mobile/linuxdev-keys.qdocinc generating ssh keys
-    \include linux-mobile/linuxdev-processes.qdocinc managing device processes
+    \sa {Remote Linux}{How To: Develop for remote Linux},
+    {Manage Kits}{How To: Manage Kits}, {Developing for Remote Linux Devices},
+    {Remote Linux Deploy Configuration}, {Remote Linux Run Settings}
+*/
+
+/*!
+    \page creator-how-to-add-remote-linux.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-remote-linux
+
+    \title Add remote Linux devices
+
+    Create connections between generic Linux devices and \QC to run, debug, and
+    analyze applications on them.
+
+    \image qtcreator-preferences-devices-remote-linux.webp {Remote Linux Device in Devices}
+    \caption Remote Linux Device preferences
+
+    \include qtcreator-add-linux-device.qdocinc {add linux device} {Remote Linux Device}
+
+    \sa {Remote Linux}{How To: Develop for remote Linux},
+    {Debug remotely with GDB}, {Developing for Remote Linux Devices},
+    {Remote Linux Deploy Configuration}
 */
diff --git a/doc/qtcreator/src/linux-mobile/qtcreator-add-linux-device.qdocinc b/doc/qtcreator/src/linux-mobile/qtcreator-add-linux-device.qdocinc
new file mode 100644
index 00000000000..28fb4648331
--- /dev/null
+++ b/doc/qtcreator/src/linux-mobile/qtcreator-add-linux-device.qdocinc
@@ -0,0 +1,47 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+//! [add linux device]
+
+    \section1 Use a wizard to add a device
+
+    To use a wizard to add \uicontrol {\1}:
+
+     \list 1
+        \li Go to \preferences > \uicontrol Devices > \uicontrol Devices.
+        \li Select \uicontrol Add > \uicontrol {\1} > \uicontrol {Start Wizard}.
+            \image qtcreator-preferences-devices-remote-linux-connection.webp {Connection Data wizard}
+        \li In \uicontrol {The name to identify this configuration},
+            enter a name for the connection.
+        \li In \uicontrol {The device's host name or IP address},
+            enter the host name or IP address of the device.
+            This becomes the value of the \c %{Device:HostAddress} variable.
+        \li In \uicontrol {The device's SSH port number}, enter the port
+            number for SSH connections. This becomes the value of the
+            \c %{Device:SshPort} variable.
+        \li In \uicontrol {The username to log into the device}, enter the
+            username to log into the device and run the application. This
+            becomes the value of the \c %{Device:UserName} variable.
+        \li Select \uicontrol {Next} to open the \uicontrol {Key Deployment}
+            dialog.
+            \image qtcreator-preferences-devices-remote-linux-key-deployment.webp {Key Deployment dialog}
+        \li In \uicontrol {Private key file}, select a private key file
+            for authentication. This becomes the value of the
+            \c %{Device:PrivateKeyFile} variable.
+        \li If you don't have a public-private key pair, select
+            \uicontrol {Create New Key Pair}. For more information,
+            see \l{Generate SSH keys}.
+        \li Select \uicontrol {Deploy Public Key} to copy the public
+            key to the device.
+        \li Select \uicontrol {Next} to create the connection.
+     \endlist
+
+    To change device preferences, go to \preferences > \uicontrol Devices >
+    \uicontrol Devices and select a device in \uicontrol Device.
+
+    \section1 Manually add a device
+
+    To add a device without using the wizard, select \uicontrol {\1} in the
+    pull-down menu of the \uicontrol Add button.
+
+//! [add linux device]
diff --git a/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc b/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc
index 5d5dc8b956c..f49e375f617 100644
--- a/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc
+++ b/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc
@@ -91,7 +91,8 @@
         \li 1.0
     \endtable
 
-    \sa {Enable and disable plugins}, {MCUs}{How To: Develop for MCUs}
+    \sa {Enable and disable plugins}, {MCUs}{How To: Develop for MCUs},
+    {Developing for MCUs}, {\QMCU}
 */
 
 /*!
@@ -157,7 +158,7 @@
 
     \QC automatically adds a default MCU device when you select
     \uicontrol Apply in the \uicontrol MCU tab after configuring the
-    MCU tool chain.
+    MCU toolchain.
 
     \image qtcreator-mcu-device.png {MCU devices}
 
@@ -180,6 +181,7 @@
     \previouspage creator-how-tos.html
 
     \ingroup creator-how-to-mcu
+    \ingroup creator-how-to-manage-kits
 
     \title Manage MCU Kits
 
@@ -208,7 +210,7 @@
     software required for MCU development with the current kit.
 
     \sa {Enable and disable plugins}, {MCUs}{How To: Develop for MCUs},
-    {Developing for MCUs}
+    {Manage Kits}{How To: Manage Kits}, {Developing for MCUs}
 */
 
 /*!
diff --git a/doc/qtcreator/src/meson/creator-projects-meson-building.qdoc b/doc/qtcreator/src/meson/creator-projects-meson-building.qdoc
index d0ada5efced..5132adf9dc0 100644
--- a/doc/qtcreator/src/meson/creator-projects-meson-building.qdoc
+++ b/doc/qtcreator/src/meson/creator-projects-meson-building.qdoc
@@ -10,7 +10,7 @@
 
     \brief Settings for building applications with Meson.
 
-    Specify build settings for the selected \l{glossary-buildandrun-kit}{kit} in
+    Specify build settings for the selected \l{Kits}{kit} in
     \uicontrol Projects > \uicontrol {Build & Run} > \uicontrol Build >
     \uicontrol {Build Settings}.
 
diff --git a/doc/qtcreator/src/meson/creator-projects-meson.qdoc b/doc/qtcreator/src/meson/creator-projects-meson.qdoc
index a6418fcc663..4c71fc7e5e8 100644
--- a/doc/qtcreator/src/meson/creator-projects-meson.qdoc
+++ b/doc/qtcreator/src/meson/creator-projects-meson.qdoc
@@ -21,7 +21,7 @@
 
     \QC automatically detects the Meson and Ninja executables specified in the
     \c PATH. You can add paths to other Meson or Ninja executables and use them
-    in different build and run \l{glossary-buildandrun-kit}{kits}.
+    in different build and run \l{Kits}{kits}.
 
     \note Enable the Meson plugin to use it.
 
@@ -54,7 +54,7 @@
 
     \image qtcreator-kits-meson.png "Setting Meson executable in Kit preferences"
 
-    For more information, see \l {kits-tab}{Kits}.
+    For more information, see \l {Kits}.
 
     \section1 Editing Meson Build Descriptions
 
diff --git a/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc b/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc
index 1a1c04edfe1..388801786f3 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc
@@ -20,12 +20,12 @@
     However, if you install the stand-alone \QC package, build \QC from sources,
     or install several Qt versions, you may need to tell \QC where to find the
     Qt versions and compilers by adding the paths to them and by creating
-    \l{glossary-buildandrun-kit}{kits} that use them.
+    \l{Kits}{kits} that use them.
 
-    To make \QC behave more like your favorite code editor or IDE, you can
-    change the settings for keyboard shortcuts, color schemes, generic
-    highlighting, code snippets, and version control systems. In addition,
-    you can enable and disable \QC features by managing plugins.
+    To make \QC behave more like your favorite code editor or IDE,
+    change the preferences for keyboard shortcuts, color schemes, generic
+    highlighting, code snippets, and version control systems. Manage plugins
+    to turn on and off \QC features.
 
     The following sections summarize the options that you have and point you to
     detailed information to help you specify any required settings and to make
@@ -33,8 +33,8 @@
 
     \section1 Checking Build and Run Settings
 
-    \QC is an integrated development environment (IDE) that you can use to
-    develop Qt applications. While you can use \QOI to install \QC,
+    \QC is an integrated development environment (IDE) for creating
+    applications. While you can use \QOI to install \QC,
     the stand-alone \QC installer never installs Qt or any Qt tools, such as
     qmake. To use \QC for Qt development, you also need to install a Qt version
     and a compiler. If you update the compiler version later, you
@@ -45,9 +45,7 @@
     available in \QC. If it does not, you must add the kits yourself to tell
     \QC where everything is.
 
-    To add kits, select \preferences > \uicontrol Kits > \uicontrol Add.
-
-    For more information, see \l{Add kits}.
+    To add kits, go to \preferences > \uicontrol Kits and select \uicontrol Add.
 
     Each kit consists of a set of values that define one environment, such as a
     \l{glossary-device}{device}, compiler, and Qt version. If \preferences >
@@ -57,48 +55,41 @@
     If \uicontrol Auto-detected still does not show the Qt version, select
     \uicontrol {Add} to add it manually.
 
-    For more information, see \l{Add Qt versions}.
-
     Also check that \preferences > \uicontrol Kits >
     \uicontrol {Compilers} shows your compiler.
 
-    For more information, see \l{Add compilers}.
+    Connect devices to the computer via USB to run, debug, and analyze
+    applications on them. You can connect Linux-based devices also
+    over a WLAN. Configure a connection between \QC and the computer, and
+    select the device in a kit.
 
-    You can connect devices to the development PC to run, debug, and
-    analyze applications on them from \QC. You can connect the device to the
-    development PC via USB. Additionally, you can connect Linux-based devices
-    over a WLAN. You must also configure a connection between \QC and the
-    development PC and specify the device in a kit.
+    To add devices, go to \preferences > \uicontrol Devices >
+    \uicontrol Devices and select \uicontrol Add.
 
-    To add devices, select \preferences > \uicontrol Devices >
-    \uicontrol Devices > \uicontrol Add.
-
-    For more information, see \l{Connecting Devices}.
+    For more information, see \l{Manage Kits}{How To: Manage Kits} and
+    \l{Develop for Devices}{How To: Develop for Devices}.
 
     \section1 Changing Keyboard Shortcuts
 
     You can use \QC with your favorite keyboard shortcuts.
 
-    To view and edit all keyboard shortcuts defined in \QC, select
-    \preferences >
-    \uicontrol Environment >
-    \uicontrol Keyboard. For more information, see \l{Keyboard Shortcuts}.
+    To view and edit all keyboard shortcuts defined in \QC, go to \preferences >
+    \uicontrol Environment > \uicontrol Keyboard. For more information, see
+    \l{Keyboard Shortcuts}.
 
     \section1 Changing Color Schemes
 
-    Themes enable you to customize the appearance of the \QC UI: widgets,
-    colors, and icons.
+    Themes set the appearance of the \QC UI: widgets, colors, and icons.
 
-    To switch themes, select \preferences > \uicontrol Environment >
-    \uicontrol Interface, and then select a theme in the \uicontrol Theme field.
+    To switch themes, go to \preferences > \uicontrol Environment >
+    \uicontrol Interface and select a theme in \uicontrol Theme.
 
-    You can use the \QC text and code editors with your favorite color scheme
-    that defines how to highlight code elements and which background color to
-    use. You can select one of the predefined color schemes or create custom
-    ones. The color schemes apply to highlighting C++ files, QML files, and
-    generic files.
+    Use the \QC text and code editors with your favorite color scheme that sets
+    highlighting of code elements and the background color. Select one of the
+    predefined color schemes or create custom ones. The color schemes apply to
+    highlighting C++ files, QML files, and generic files.
 
-    To change the color scheme, select \preferences >
+    To change the color scheme, go to \preferences >
     \uicontrol {Text Editor} > \uicontrol {Font & Colors}.
 
     For more information, see \l{Change editor colors}.
@@ -108,7 +99,7 @@
     highlighting engine for Kate syntax definitions. \QC comes with most of
     the commonly used syntax files, and you can download additional files.
 
-    To download and use highlight definition files, select \preferences >
+    To download and use highlight definition files, go to \preferences >
     \uicontrol {Text Editor} > \uicontrol {Generic Highlighter}.
 
     For more information, see \l{Download highlight definitions}.
@@ -117,10 +108,10 @@
 
     As you write code, \QC suggests properties, IDs, and code snippets to
     complete the code. It lists context-sensitive suggestions for
-    the statement currently under your cursor. You can add, modify, and remove
+    the statement currently under your cursor. Add, modify, and remove
     snippets in the snippet editor.
 
-    To open the snippet editor, select \preferences >
+    To open the snippet editor, go to \preferences >
     \uicontrol {Text Editor} > \uicontrol Snippets.
 
     For more information, see \l{Snippets}.
@@ -131,8 +122,7 @@
     to configure the version control in any special way to make it work with
     \QC.
 
-    However, some configuration options are available and you can set them in
-    \preferences >
+    However, you can set some configuration options in \preferences >
     \uicontrol {Version Control} > \uicontrol General.
 
     For more information about the supported functions, see
@@ -144,13 +134,15 @@
     You can \l{Enable and disable plugins}{enable} disabled plugins if you
     need them and disable plugins you don't need.
 
-    You can \l{Install plugins}{download and install} more plugins from
+    \l{Install plugins}{Download and install} more plugins from
     \l{https://marketplace.qt.io/}{Qt Marketplace} or some
     other source, such as \l{https://github.com/}{GitHub}.
 
-    To enable and disable plugins, select \uicontrol Help >
+    To enable and disable plugins, go to \uicontrol Help >
     \uicontrol {About Plugins}.
 
-    To install plugins, select \uicontrol Help > \uicontrol {About Plugins} >
-    \uicontrol {Install Plugins}.
+    To install plugins, go to \uicontrol Help > \uicontrol {About Plugins} and
+    select \uicontrol {Install Plugins}.
+
+    \sa {Installation}, {Reset \QC settings}, {Preferences}
 */
diff --git a/doc/qtcreator/src/overview/creator-only/creator-deployment-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-deployment-overview.qdoc
deleted file mode 100644
index 000017249ac..00000000000
--- a/doc/qtcreator/src/overview/creator-only/creator-deployment-overview.qdoc
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (C) 2020 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-// **********************************************************************
-// NOTE: the sections are not ordered by their logical order to avoid
-// reshuffling the file each time the index order changes (i.e., often).
-// Run the fixnavi.pl script to adjust the links to the index order.
-// **********************************************************************
-
-/*!
-    \previouspage creator-running-targets.html
-    \page creator-deployment.html
-    \nextpage creator-deploying-android.html
-
-    \title Deploying to Devices
-
-    Deploy configurations in the \uicontrol Projects mode
-    \uicontrol {Run Settings} handle the packaging of the application as an
-    executable and copying it to a location you want to run the executable at.
-    The files can be copied to a location in the file system of the development
-    PC or a \l{glossary-device}{device}.
-
-    \list
-
-        \li \l{Deploying to Android}
-
-            When you deploy the application to an Android device, \QC copies
-            the application files to the device. In addition, you can determine
-            the Qt libraries to use.
-
-        \li \l {Deploying to Boot2Qt}
-
-            When you deploy the application to a Boot2Qt device, \QC copies
-            the application files to the connected device. You can then test
-            and debug the application on the device with \QC.
-
-        \li  \l{Deploying to QNX Neutrino}
-
-            When you deploy the application to a QNX Neutrino device, \QC copies
-            the application files to the connected device. You can then test and
-            debug the application on the device with \QC.
-
-        \li \l{Deploying to Remote Linux}
-
-            When you deploy the application to a generic Linux-based device, \QC
-            copies the application files to the connected device. You can then
-            test and debug the application on the device with \QC.
-    \endlist
-*/
diff --git a/doc/qtcreator/src/overview/creator-only/creator-desktop-platforms.qdoc b/doc/qtcreator/src/overview/creator-only/creator-desktop-platforms.qdoc
index 67605429f86..6a2602b34d0 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-desktop-platforms.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-desktop-platforms.qdoc
@@ -45,8 +45,7 @@
         \li libxft-dev
         \li libxi-dev
         \li libxrandr-dev
-        \li libgl-dev and libglu-dev if you use Qt OpenGL (deprecated
-            in Qt 5) or Qt GUI OpenGL functions
+        \li libgl-dev and libglu-dev if you use Qt GUI OpenGL functions
     \endlist
 
     \section1 macOS
diff --git a/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc b/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc
index e735c95adf0..f41033c3e0d 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc
@@ -1,14 +1,8 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
-// **********************************************************************
-// NOTE: the sections are not ordered by their logical order to avoid
-// reshuffling the file each time the index order changes (i.e., often).
-// Run the fixnavi.pl script to adjust the links to the index order.
-// **********************************************************************
-
 /*!
-    \previouspage index.html
+    \previouspage creator-how-to-install.html
     \page creator-getting-started.html
     \nextpage creator-overview.html
 
@@ -18,19 +12,17 @@
     \l{https://www.qt.io/academy/course-catalog#getting-started-with-qt-creator}
     {Getting Started with Qt Creator} course in Qt Academy.
 
-    For more information about installing \QC, see \l{Install \QC}.
-
-    \table
+    \table borderless
         \row
-            \li \inlineimage front-gs.png
-            \li \inlineimage front-ui.png
-            \li \inlineimage front-advanced.png
+            \li \inlineimage icons/app-development.png
+            \li \inlineimage icons/ide.png
+            \li \inlineimage icons/getting-started.png
         \row
-            \li \b {\l{Developing with \QC}}
+            \li \b {\l{Overview}}
 
                 If you have not used an integrated development environment (IDE)
                 before, or want to know what kind of IDE \QC is, go to
-                \l{Developing with \QC}.
+                \l{Overview}.
             \li \b {\l{User Interface}}
 
                 If you have not used \QC before, and want to become familiar
@@ -43,14 +35,14 @@
                 control systems. For an overview of the options you have, go to
                 \l{Configuring Qt Creator}.
         \row
-            \li \inlineimage front-preview.png
-            \li \inlineimage front-help.png
-            \li
+            \li \inlineimage icons/platform-and-toolchain.png
+            \li \inlineimage icons/tutorials.png
+            \li \inlineimage icons/api-reference.png
         \row
             \li \b {\l{Building and Running an Example}}
 
                 To check that \l{https://www.qt.io/download-qt-installer}
-                {\QOI} created \l{glossary-buildandrun-kit}
+                {\QOI} created \l{Kits}
                 {build and run kits}, open an example application and run it.
                 If you have not done so before, go to
                 \l{Building and Running an Example}.
@@ -59,7 +51,11 @@
                 Now you are ready to start developing your own applications.
                 Pick a tutorial to follow in \l{Tutorials}. To start developing
                 for mobile devices, select \l{Creating a Mobile Application}.
-            \li
+            \li \b{\l {Qt Documentation}}
+
+                For more examples, as well as the details about using Qt tools
+                and APIs to develop Qt applications, go to \l {Qt Documentation}.
     \endtable
 
+    \sa {Installation}
 */
diff --git a/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc b/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc
index ac5e1cae6b4..2cbac901aaf 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc
@@ -77,7 +77,7 @@
             \li \QC groups build and run specific settings as kits to make
                 cross-platform development easier. Each kit consists of a set
                 of values that define one environment, such as a \e {device},
-                tool chain, Qt version, and debugger command to use. Configure kits at
+                toolchain, Qt version, and debugger command to use. Configure kits at
                 \preferences > \uicontrol Kits.
 
         \row
diff --git a/doc/qtcreator/src/overview/creator-only/creator-issues.qdoc b/doc/qtcreator/src/overview/creator-only/creator-issues.qdoc
index de7c8b45d3d..8d310983323 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-issues.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-issues.qdoc
@@ -41,7 +41,7 @@
             settings are stored locally.
 
         \li  The Okteta KDE custom widget plugin might be installed as part of
-            some Linux distributions. It can cause Qt Designer to crash. For
+            some Linux distributions. It can cause \QD to crash. For
             more information, see:
 
             \list
diff --git a/doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc b/doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc
index c7a29a2c456..d15fc43003c 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc
@@ -28,15 +28,15 @@
     If several functions are available for the same shortcut in the current context,
     \QC will not execute any function due to the conflict.
 
-    A keyboard shortcut might also conflict with a shortcut that a window
-    manager uses for its own purposes. In that case, \QC shortcuts do not work.
+    A keyboard shortcut might also conflict with a shortcut that your window
+    manager uses for its own purposes. If the window manager consumes the key event,
+    the \QC shortcut will not be activated.
     Typically, you can configure the shortcuts in the window manager, but if
     that is not allowed, you can change the \QC shortcuts.
 
-    For example, Unity on
-    Ubuntu 11.10 uses \key F10 in its window manager, and therefore the default
-    \QC keyboard shortcut \key F10 (Step Over) does not work on that system.
-
+    For example, Unity on Ubuntu 11.10 by default uses \key F10 in its window manager,
+    and therefore the default \QC keyboard shortcut \key F10 (Step Over) will not work on
+    that system.
 
     To override the platform default value that determines whether
     keyboard shortcuts are shown in the labels of context menu items,
@@ -141,8 +141,11 @@
             \li  Switch to \uicontrol Projects mode
             \li  Ctrl+5
         \row
-            \li  Switch to \uicontrol Help mode
+            \li  Switch to \uicontrol Extensions mode
             \li  Ctrl+6
+        \row
+            \li  Switch to \uicontrol Help mode
+            \li  Ctrl+7
         \row
             \li  Toggle \uicontrol{Issues}
             \li  Alt+1 (Cmd+1 on \macos)
@@ -570,7 +573,7 @@
             \li  Open project
             \li  Ctrl+Shift+O
         \row
-            \li  Select the \l{glossary-buildandrun-kit}{kit} to build and run your project with
+            \li  Select the \l{Kits}{kit} to build and run your project with
             \li  Ctrl+T
         \row
             \li  Run
diff --git a/doc/qtcreator/src/overview/creator-only/creator-mobile-platforms.qdoc b/doc/qtcreator/src/overview/creator-only/creator-mobile-platforms.qdoc
deleted file mode 100644
index fef448c3f15..00000000000
--- a/doc/qtcreator/src/overview/creator-only/creator-mobile-platforms.qdoc
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-/*!
-    \page creator-mobile-platforms.html
-    \previouspage creator-reference.html
-
-    \ingroup creator-reference-platforms
-
-    \title Mobile Platforms
-
-    \brief Mobile platforms that you can develop applications for.
-
-    You can develop applications for the following mobile platforms:
-
-    \list
-        \li \l Android
-        \li \l iOS
-    \endlist
-
-    You must install the tool chain for building applications for the targeted
-    mobile platform on the development PC and use \QMT to
-    install Qt libraries that are built for the platform. You can then add a
-    \l{glossary-buildandrun-kit}{kit} with the tool chain and the Qt version
-    for the device's architecture. When possible, \QMT creates
-    suitable kits for you.
-
-    You can connect mobile devices to the development PC and select the
-    appropriate kit to build, run, debug, and analyze applications from \QC.
-
-    Before starting application development, analyze and define the requirements,
-    scope, and functionality of the application to ensure efficient functionality
-    and a smooth user experience on mobile devices.
-
-    \section1 Android
-
-    Starting from Qt 5.14.0, the Qt for Android package has all the
-    architectures (ABIs) installed as one. You can let \QC automatically
-    create kits for installed Qt version and tool chains.
-
-    The following topics have more information about developing applications
-    for Android devices:
-
-    \list
-        \li \l{Connecting Android Devices}
-        \li \l{Deploying to Android}
-        \li \l{Run on many platforms}
-        \li \l{Creating a Mobile Application}
-        \li \l{Debugging on Android Devices}
-        \li \l{Qt for Android}
-    \endlist
-
-    \section1 iOS
-
-    \note Deployment, running, and debugging on iOS 17 devices are not supported.
-
-    To be able to use \QC on \macos, you must install Xcode, and therefore
-    you should already have the tool chain for building applications for
-    iOS. \QC automatically detects the tool chain and creates the necessary
-    kits to build applications for and run them on configured iOS devices.
-
-    The following topics have more information about developing applications
-    for iOS devices:
-
-    \list
-        \li \l{Connecting iOS Devices}
-        \li \l{Run on many platforms}
-        \li \l{Creating a Mobile Application}
-        \li \l{Qt for iOS}
-    \endlist
-
-    \sa {Optimizing Applications for Mobile Devices}, {Supported Platforms}
-*/
diff --git a/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc b/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc
deleted file mode 100644
index 395a5ba4589..00000000000
--- a/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-// **********************************************************************
-// NOTE: the sections are not ordered by their logical order to avoid
-// reshuffling the file each time the index order changes (i.e., often).
-// Run the fixnavi.pl script to adjust the links to the index order.
-// **********************************************************************
-
-/*!
-    \page creator-connecting-mobile.html
-    \previouspage creator-deployment-embedded-linux.html
-    \nextpage creator-developing-android.html
-
-    \title Connecting Devices
-
-    You can connect \l{glossary-device}{devices} to the development PC to run, debug,
-    and analyze applications built for them from \QC. When you install Qt for a
-    target platform, such as Android or QNX,
-    the build and run settings for the development targets might be set up
-    automatically in \QC.
-
-    You can connect the device to the development PC using a USB connection.
-    Additionally, you can connect Linux-based devices by using a WLAN
-    connection.
-
-    The experimental WebAssembly plugin enables you to build your applications
-    in WebAssembly format, to deploy them, and to run them in a web browser.
-
-    \list
-
-        \li \l{Connecting Android Devices}
-
-            Qt applications for Android are compiled as \c {shared objects} that
-            are loaded by a Java launcher that is part of Qt.
-            This is totally transparent to users. As Qt is composed of libraries
-            referencing each other, Qt 5 applications are only supported on
-            Android version 4.1 (API level 16), or later, and Qt 6 applications
-            on Android version 6.0 (API level 23), or later. You must install a
-            Qt version targeting Android and the Android SDK and NDK to develop
-            for Android devices.
-
-        \li \l{Connecting Bare Metal Devices}
-
-            You can connect bare metal devices to the development PC and use \QC
-            to debug applications on them with GDB or a hardware debugger.
-
-        \li \l{Connecting Boot2Qt Devices}
-
-            You can connect \l{Boot2Qt} devices to the development PC to run,
-            debug, and analyze applications built for them from \QC.
-
-        \li \l {Adding Docker Devices}
-
-            Create Docker devices from Docker images and use them to build, run,
-            and debug applications from \QC.
-
-        \li \l{Connecting iOS Devices}
-
-            You use the tools delivered with Xcode to connect devices to \QC.
-            \QC detects the tools and configured devices automatically and uses
-            the tools to build, deploy, and run applications.
-
-        \li \l{Developing for MCUs}
-
-            You can connect MCU boards to a development host to deploy, run, and
-            debug applications on them from \QC.
-
-        \li \l{Connecting QNX Devices}
-
-            You can connect QNX devices to the development PC to deploy, run and
-            debug applications on them from within \QC. This is currently only
-            supported for QNX Neutrino devices, and requires the QNX SDK to be
-            installed on the development PC.
-
-        \li \l{Connecting Remote Linux Devices}
-
-            If you have a tool chain for building applications for embedded
-            Linux devices installed on the development
-            PC, you can add it and the device to \QC.
-
-    \endlist
-
-    \sa {Building Applications for the Web}, {Run in Qt Application Manager}
-*/
diff --git a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc
index b164224e848..9ab035a23e1 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc
@@ -8,11 +8,11 @@
 // **********************************************************************
 
 /*!
-    \previouspage index.html
+    \previouspage creator-getting-started.html
     \page creator-overview.html
-    \nextpage creator-getting-started.html
+    \nextpage creator-quick-tour.html
 
-    \title Developing with \QC
+    \title Overview
 
     \QC is a cross-platform, complete integrated development environment
     (IDE) that you can use to create applications for desktop, embedded,
@@ -94,6 +94,11 @@
             Load C++ plugins for QML to simulate data.
     \endlist
 
+    Use the QML live preview to preview a QML file or an entire Qt Quick
+    application on the desktop, as well as on Android and embedded Linux
+    devices. The changes you make to the UI are instantly visible to you
+    in the preview.
+
     If you need a traditional user interface that has a clear structure and
     enforces a platform look and feel, use \l{Qt Widgets} and the integrated
     \l{\QD}.
@@ -176,7 +181,7 @@
 
     Run and deploy Qt applications that you build for different target
     platforms or with different compilers, debuggers, or Qt versions.
-    \l{glossary-buildandrun-kit}{Kits} define the tools, \l{glossary-device}
+    \l{Kits} define the tools, \l{glossary-device}
     {device} type and other settings to use when building and running your
     project.
 
@@ -186,35 +191,66 @@
     build the project.
 
     Build applications for, deploy them to, and run them on the desktop
-    environment or a device. With kits, as well as build, run, and deployment
+    environment or a device. With kits, as well as build, deploy, and run
     configurations, you can quickly switch between different setups and
     target platforms.
 
     For more information, see \l{Build and Run}{How To: Build and Run},
     \l{Build Systems}, \l{Build Configurations}, and \l{Run Configurations}.
 
-    \section2 On Devices
+    \section2 Embedded Platforms
 
-    When you install tool chains for device types as part of a Qt distribution,
-    the build and run configurations for the devices might be set up
-    automatically. However, you might need to install and configure some
-    additional software on the devices to be able to connect to them
-    from the computer.
+    You can develop applications for the following embedded platforms:
 
-    Deployment configurations handle the packaging and copying of the necessary
+    \list
+        \li \l {Bare Metal}
+        \li \l {\B2Q}
+        \li \l {MCUs}
+        \li \l {QNX Neutrino}
+        \li \l {Remote Linux}
+    \endlist
+
+    Install the toolchain for building applications for the targeted
+    embedded platform on the computer, and then use \QOI to install Qt
+    libraries that are built for the platform. Add a kit with the toolchain and
+    the Qt version for the device's architecture. When possible, \QOI creates
+    suitable kits for you.
+
+    You can connect embedded devices to the computer and select the appropriate
+    kit to run, debug, and analyze applications built for them from \QC.
+
+    \e {Deploy configurations} handle the packaging and copying of the necessary
     files to a location you want to run the executable at, such as the file
     system of a device.
 
-    For more information, see \l{Connecting Devices} and \l{Deploying to Devices}.
+    For more information, see \l{Develop for Devices}{How To: Develop for Devices}
+    and \l{Devices}.
 
-    \section2 Previewing QML
+    \section2 Mobile Platforms
 
-    Use the QML live preview to preview a QML file or an entire Qt Quick
-    application on the desktop, as well as on Android and embedded Linux
-    devices. The changes you make to the UI are instantly visible to you
-    in the preview.
+    You can develop applications for the following mobile platforms:
 
-    For more information, see \l{Validating with Target Hardware}.
+    \list
+        \li \l Android
+        \li \l iOS
+    \endlist
+
+    Install the toolchain for building applications for the targeted mobile
+    platform on the computer, and then use \QOI to install Qt libraries that are
+    built for the platform. Add a kit with the toolchain and the Qt version for
+    the device's architecture. When possible, \QOI creates suitable kits for you.
+
+    You can connect mobile devices to the computer and select the
+    appropriate kit to build, run, debug, and analyze applications from \QC.
+
+    Before starting application development, analyze and define the requirements,
+    scope, and functionality of the application to ensure efficient functionality
+    and a smooth user experience on mobile devices.
+
+    For more information, see
+    \l{Develop for Devices}{How To: Develop for Devices},
+    \l{Optimizing Applications for Mobile Devices}, \l {Supported Platforms}, and
+    \l{Deploy Configurations}.
 
     \section1 Debugging Applications
 
@@ -230,10 +266,10 @@
             to find the next one.
     \endlist
 
-    \QC integrates several external native debuggers for inspecting the state of
-    your application while debugging. The debugger plugin automatically selects
-    a suitable native debugger for each kit from the ones it finds on the
-    computer. Edit the kits to override this choice.
+    \QC integrates several debuggers for inspecting the state of your
+    application. It automatically selects a suitable debugger for each
+    kit from the ones it finds on the computer. Edit the kits to override
+    this choice.
 
     If you install \QC with \QOI, the GNU Symbolic Debugger is installed
     automatically and you should be ready to start debugging after you create
@@ -242,20 +278,20 @@
 
     Connect devices to your computer to debug processes running on the devices.
 
-    For more information, see \l{Debugging}.
+    For more information, see \l{Debugging} and \l{Debug}{How To: Debug}.
 
-    \section1 Analyzing Source Code
+    \section1 Finding Issues in Source Code
 
     Devices have limited memory and CPU power, so you should use them carefully.
     \QC integrates code analysis tools for detecting memory leaks, profiling
     function execution, analyzing CPU use, and eliminating unnecessary complexity
     of code. Other tools provide code coverage and visualize trace events.
 
-    Install and configure the tools on your system to use them from \QC.
-    However, the QML Profiler is installed as part of \QC for profiling
-    Qt Quick applications.
+    Some tools, such as QML Profiler and Clang Tools, are installed with
+    \QC. Install and configure the other supported tools on the computer to use
+    them from \QC.
 
-    For more information, see \l{Analyzing Code}.
+    For more information, see \l{Analyzing Code} and \l{Analyze}{How To: Analyze}.
 
     \section1 Running Tests
 
@@ -287,10 +323,32 @@
 
     \image qtcreator-autotests.png
 
-    Map AUTs (Application Under Test) to \QC and run Squish test suites
-    and cases from it.
+    \section2 Using Squish
 
-    For more information, see \l{Test}{How To: Test} and \l{Using Squish}.
+    \brief The experimental Squish plugin integrates Squish into \QC.
+
+    \l{https://www.qt.io/product/quality-assurance/squish}{Squish} is an
+    automated GUI testing framework for testing Android, iOS, Java, \macos,
+    Qt, Tk, Windows, and XView applications, as well as HTML-based web
+    applications running in browsers.
+
+    In \QC, you can:
+
+    \list
+        \li Open existing Squish test suites.
+        \li Create new test suites and test cases.
+        \li Record test cases (in a very limited way compared to what you can do
+            inside the Squish IDE).
+        \li Use Squish Runner and Server to run test suites or cases and view
+            the results in the \uicontrol Squish \l{View output}{output}.
+        \li Set breakpoints before running tests to stop at certain locations and
+            inspect the local variables, similarly to when debugging a test.
+    \endlist
+
+    To use the plugin, you must download and install Squish, create a connection
+    to the Squish Server, and specify the application under test (AUT) to run.
+
+    For more information, see \l{Test}{How To: Test}.
 
     \section1 Publishing Applications
 
diff --git a/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc b/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc
index 86450b31b13..03e81452f75 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc
@@ -28,7 +28,7 @@
 
     \annotatedlist creator-reference-build-systems
 
-    \section1 Build Configurations
+    \section2 Build Configurations
 
     Build configurations have everything you need to compile the sources into
     binaries. Build configurations use the tools and settings defined in their
@@ -36,6 +36,20 @@
 
     \annotatedlist creator-reference-build-configurations
 
+    \section1 Debuggers
+
+    Set up and use debuggers to debug executable binary files, as well as
+    QML, Java, and Python source code.
+
+    \annotatedlist creator-reference-debugger
+
+    \section2 Debugger Views
+
+    Inspect the state of your application while debugging in the
+    \uicontrol Debug mode.
+
+    \annotatedlist creator-reference-debugger-views
+
     \section1 Devices
 
     Connect devices to the computer to run, debug, and analyze applications
@@ -45,6 +59,26 @@
 
     \annotatedlist creator-reference-devices
 
+    \section2 Deploy Configurations
+
+    Deploy configurations handle the packaging of the application as an
+    executable and copying it to a location you want to run the executable at.
+    The files can be copied to a location in the file system of the computer
+    or a device.
+
+    \annotatedlist creator-reference-deploy-configurations
+
+    \section2 Run Configurations
+
+    Run configurations start the application in the location where the
+    deploy configuration copied it. By default, when you select
+    \uicontrol Run, \QC builds the project, deploys it to the device
+    defined in the kit, and runs it there. If you did not make changes
+    to the project since you last built and deployed it, \QC simply runs
+    it again.
+
+    \annotatedlist creator-reference-run-configurations
+
     \section1 Editors
 
     When you open files, \QC chooses a suitable editor according to the file
@@ -78,6 +112,10 @@
 
     \annotatedlist creator-reference-preferences-cpp
 
+    \section2 Debugger
+
+    \annotatedlist creator-reference-preferences-debugger
+
     \section2 Kits
 
     Preferences for build and run kits.
@@ -90,17 +128,6 @@
 
     \annotatedlist creator-reference-preferences-text-editor
 
-    \section1 Run Configurations
-
-    Run configurations start the application in the location where the
-    \e {deploy configuration} copied it. By default, when you select
-    \uicontrol Run, \QC builds the project, deploys it to the device
-    defined in the kit, and runs it there. If you did not make changes
-    to the project since you last built and deployed it, \QC simply runs
-    it again.
-
-    \annotatedlist creator-reference-run-configurations
-
     \section1 UI Design
 
     You can use a visual editor, \QD, for designing widget-based UIs
diff --git a/doc/qtcreator/src/overview/creator-only/creator-supported-platforms.qdoc b/doc/qtcreator/src/overview/creator-only/creator-supported-platforms.qdoc
index 9481519eb77..43c60144c41 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-supported-platforms.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-supported-platforms.qdoc
@@ -38,12 +38,7 @@
             \li \image ok.png
             \li \image ok.png
         \row
-            \li \l Boot2Qt
-            \li \image ok.png
-            \li \image ok.png
-            \li \image ok.png
-        \row
-            \li \l{Remote Linux}
+            \li \l {\B2Q}
             \li \image ok.png
             \li \image ok.png
             \li \image ok.png
@@ -53,7 +48,7 @@
             \li \image ok.png
             \li
         \row
-            \li \l{Microcontroller Units (MCU)}{MCUs}
+            \li \l{MCUs}
             \li \image ok.png
             \li
             \li \image ok.png
@@ -63,7 +58,12 @@
             \li \image ok.png
             \li \inlineimage ok.png
         \row
-            \li \l{Building Applications for the Web}{WebAssembly}
+            \li \l{Remote Linux}
+            \li \image ok.png
+            \li \image ok.png
+            \li \image ok.png
+        \row
+            \li \l{Build applications for the web}{WebAssembly}
             \li \image ok.png
             \li \image ok.png
             \li \image ok.png
@@ -74,5 +74,6 @@
     \QC automatically runs scheduled checks for updates based on the settings
     specified in \preferences > \uicontrol Environment > \uicontrol Update.
 
-    \sa {Desktop Platforms}, {Embedded Platforms}, {Mobile Platforms}
+    \sa {Develop for Devices}{How To: Develop for Devices}, {Desktop Platforms},
+    {Devices}
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-build-settings-qmake.qdoc b/doc/qtcreator/src/projects/creator-only/creator-build-settings-qmake.qdoc
index 3f24273f09c..814189ee7b6 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-build-settings-qmake.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-build-settings-qmake.qdoc
@@ -11,7 +11,7 @@
 
     \brief Settings for building applications with qmake.
 
-    Specify build settings for the selected \l{glossary-buildandrun-kit}{kit}
+    Specify build settings for the selected \l{Kits}{kit}
     in \uicontrol Projects > \uicontrol {Build & Run}
     > \uicontrol Build > \uicontrol {Build Settings}.
 
@@ -51,7 +51,7 @@
     If debug info is being generated, you can have it placed into separate
     files, rather than embedded into the binary, by selecting
     \uicontrol Enable in the \uicontrol {Separate debug info} field. For
-    more information, see \l{Using the Performance Analyzer}. To use default
+    more information, see \l{Analyze CPU usage}. To use default
     settings, select \uicontrol {Leave at Default}.
 
     \section1 Compiling QML
diff --git a/doc/qtcreator/src/projects/creator-only/creator-how-to-add-wizards.qdoc b/doc/qtcreator/src/projects/creator-only/creator-how-to-add-wizards.qdoc
index fa7663f02d7..e6cb582b9bc 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-how-to-add-wizards.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-how-to-add-wizards.qdoc
@@ -44,5 +44,5 @@
             to specify the position of the wizard. For example, \c B.MyClass.
     \endlist
 
-\sa {Custom Wizards}, {Find settings files}
+    \sa {Run Qt Creator from the command line}, {Custom Wizards}
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-how-to-create-compiler-explorer-setup.qdoc b/doc/qtcreator/src/projects/creator-only/creator-how-to-create-compiler-explorer-setup.qdoc
index b35df2e6707..a8bc0f11d4b 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-how-to-create-compiler-explorer-setup.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-how-to-create-compiler-explorer-setup.qdoc
@@ -9,19 +9,27 @@
 
     \title Create compiler explorer sessions
 
-    To create a compiler explorer session for a C++ or Python project:
+    \note Enable the Compiler Explorer plugin to use it.
+
+    To create a compiler explorer session for a Qt and C++, C++, or Python
+    project:
 
     \list 1
         \li Go to \uicontrol File > \uicontrol {New File}.
-        \li Select \uicontrol {Compiler Explorer} > \uicontrol C++ or
-            \uicontrol Python > \uicontrol Choose.
+        \li Select \uicontrol {Compiler Explorer}, and then select one of the
+            following:
+            \list
+                \li \uicontrol {Compiler Explorer C++ Source}
+                \li \uicontrol {Compiler Explorer Python Source}
+                \li \uicontrol {Compiler Explorer Qt & C++ Source}
+            \endlist
+            \image qtcreator-new-project-compiler-explorer.webp {New File dialog}
+        \li Select \uicontrol Choose.
         \li Follow the instructions of the wizard to create an example
             compiler explorer session as a JSON-based \c .qtce file and to open
             it.
     \endlist
 
-    \note Enable the Compiler Explorer plugin to use it.
-
     \sa {Create files}, {Enable and disable plugins}, {Explore compiler code}
 */
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-how-to-edit-qbs-profiles.qdoc b/doc/qtcreator/src/projects/creator-only/creator-how-to-edit-qbs-profiles.qdoc
index 60f0d3bb0b1..a5037be5b91 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-how-to-edit-qbs-profiles.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-how-to-edit-qbs-profiles.qdoc
@@ -39,5 +39,5 @@
 
     To remove the selected property, select \uicontrol Remove.
 
-    \sa {Activate kits for a project}, {Add kits}, {kits-tab}{Kits}
+    \sa {Activate kits for a project}, {Add kits}, {Kits}
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc
index c6ce34ca69f..eb8e2a14ee1 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc
@@ -23,12 +23,12 @@
 
     To run an example application on an Android or iOS device, you must set up
     the development environment for Android or iOS. For more information, see
-    \l{Connecting Android Devices} and \l{Connecting iOS Devices}.
+    \l{Developing for Android} and \l{Developing for iOS}.
 
-    To run an example application on a Boot2Qt device, you must set up
-    Boot2Qt on the development host and create connections
+    To run an example application on a \B2Q device, you must set up
+    \B2Q on the development host and create connections
     between the host and devices. For more information, see
-    \l{Boot2Qt: Documentation}.
+    \l{\B2Q: Documentation}.
 
     If you have \l{Qt Design Studio Manual}{\QDS} installed, you can open
     \QDS examples from \QC in \QDS.
@@ -47,11 +47,11 @@
         \li Select an example in the list of examples.
 
             You can also use tags (3) to filter examples. For instance, enter
-            the \uicontrol Boot2Qt tag (commercial only) in the search field
-            (4) to list examples that you can run on Boot2Qt devices.
+            the \uicontrol \B2Q tag (commercial only) in the search field
+            (4) to list examples that you can run on \B2Q devices.
 
         \li In \uicontrol {Configure Project}, select
-            \l{glossary-buildandrun-kit}{kits} for building the example for the
+            \l{Kits}{kits} for building the example for the
             target platforms.
 
             \image qtcreator-configure-project.webp {Configure Project view}
@@ -86,6 +86,6 @@
     \endlist
 
     \sa {Manage Kits}{How To: Manage Kits}, {Open projects},
-    {Connecting Android Devices}, {Connecting iOS Devices},
-    {Compile Output}, {Boot2Qt: Documentation}, {Qt Design Studio Manual}
+    {Developing for Android}, {Developing for iOS},
+    {Compile Output}, {\B2Q: Documentation}, {Qt Design Studio Manual}
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc
deleted file mode 100644
index bd4743a437b..00000000000
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (C) 2019 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-// **********************************************************************
-// NOTE: the sections are not ordered by their logical order to avoid
-// reshuffling the file each time the index order changes (i.e., often).
-// Run the fixnavi.pl script to adjust the links to the index order.
-// **********************************************************************
-
-/*!
-    \previouspage creator-scxml.html
-    \page creator-building-running.html
-    \nextpage creator-live-preview.html
-
-    \title Running on Devices
-
-    \QC supports running and deploying Qt applications that you build
-    for different target platforms or with different compilers, debuggers, or
-    Qt versions. \l{glossary-buildandrun-kit}{Kits} define the tools,
-    \l{glossary-device}{device} type and other settings to use when building and
-    running your project.
-
-    \list
-
-        \li \l {Validating with Target Hardware}
-
-            You can use the QML live preview to preview a QML file or an
-            entire Qt Quick application on the desktop, as well as on
-            Android and embedded Linux devices. The changes you make to
-            the UI are instantly visible to you in the preview.
-
-        \li \l{Deploying to Devices}
-
-            \e {Deploy configurations} handle the packaging and copying of
-            the necessary files to a location you want to run the executable
-            at. The files can be copied to a location in the file system of
-            the development PC or a device.
-
-        \li \l{Connecting Devices}
-
-            When you install tool chains for device types as part of a Qt distribution,
-            the build and run settings for the devices might be set up
-            automatically. However, you might need to install and configure some
-            additional software on the devices to be able to connect to them
-            from the development PC.
-
-    \endlist
-
-    \sa {Build and Run}{How To: Build and Run}
-*/
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc
index d42df965a7e..a0189b216ab 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc
@@ -16,7 +16,7 @@
     \title Build for many platforms
 
     You can build applications for many target platforms, or using different
-    compilers, debuggers or Qt versions. \l{glossary-buildandrun-kit}{Kits}
+    compilers, debuggers or Qt versions. \l{Kits}
     define the tools, \l{glossary-device}{device} type, and other settings to use.
 
     By default, when you run the application, you
@@ -34,9 +34,8 @@
     \list 1
 
         \li  Select the \uicontrol {Build and Run Kit Selector} icon or go to
-             \uicontrol Build > \uicontrol {Open Build and Run Kit Selector} to select the
-             build and run \l{glossary-buildandrun-kit}{kit} or an
-             \l{Managing Android Virtual Devices (AVD)}{Android device}.
+             \uicontrol Build > \uicontrol {Open Build and Run Kit Selector} to
+             select the build and run kit or an \l{Manage AVDs}{Android device}.
 
             \image qtcreator-kit-selector.webp {Kit selector}
 
@@ -105,7 +104,7 @@
     \uicontrol Projects view.
 
     \sa {Configure projects for building}, {Build and Run}{How To: Build and Run},
-    {Adding Docker Devices}, {Specifying Build Settings}
+    {Add Docker devices}, {Specifying Build Settings}
 */
 
 /*!
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc
index d92e8c90a47..e068ec86d4f 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc
@@ -18,7 +18,7 @@
     You can develop Qt applications on several 32-bit and 64-bit platforms.
     Usually, you can build Qt applications on each platform with GCC, a
     vendor-supplied compiler, or a third party compiler. In \QC, a
-    \l{glossary-buildandrun-kit}{kit} specifies the compiler and other
+    \l{Kits}{kit} specifies the compiler and other
     necessary tools for building an application for and running it on a
     particular platform.
 
@@ -103,8 +103,8 @@
         \li Other than the listed compilers and remote compilers.
     \endtable
 
-    The emscripten compiler is tool chain for compiling to
-    \l{Building Applications for the Web}{WebAssembly}.
+    The emscripten compiler is toolchain for compiling to
+    \l{Build applications for the web}{WebAssembly}.
 
     \section2 Bare-metal compilers
 
@@ -145,10 +145,10 @@
     \endcode
 
     If these commands show paths, they have been added to the global PATH
-    variable during the installation of a tool chain based on Cygwin or \MinGW,
+    variable during the installation of a toolchain based on Cygwin or \MinGW,
     even though this is against Windows conventions.
 
-    To keep working with the third-party tool chain, create a new shell link
+    To keep working with the third-party toolchain, create a new shell link
     that adds the required paths (as Visual Studio and Qt do). The shell link
     must point to cmd.exe:
 
@@ -157,19 +157,19 @@
     where the /K parameter carries out the command specified in the bat file.
 
     Create the myenv.bat file at \e path_to, which should be in a convenient
-    location. In the file, specify the paths to the tool chains. For example,
+    location. In the file, specify the paths to the toolchains. For example,
 
     \c  {set PATH=C:\path1;C:\path2;%PATH%}
 
-    where \e path1 and \e path2 are paths to the tool chains.
+    where \e path1 and \e path2 are paths to the toolchains.
 
     Finally, remove the paths from the global PATH, reboot the computer, and
     run the \c where commands again to verify that the global PATH is now clean.
 
-    You can use the shell link to run the tools in the third-party tool chains.
+    You can use the shell link to run the tools in the third-party toolchains.
 
     \sa {Compilers}, {Add Nim compilers}, {Add custom compilers},
-    {Connecting Bare Metal Devices}, {Supported Platforms}
+    {Developing for Bare Metal Devices}, {Supported Platforms}
 */
 
 /*!
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
index 93fc8fc3987..92858ff6078 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
@@ -63,10 +63,10 @@
 
     To test applications on \l{glossary-device}{devices}, you can install
     toolchains for mobile and embedded development as part of Qt distributions.
-    The installers create \l{glossary-buildandrun-kit}{kits} and specify build
+    The installers create \l{Kits}{kits} and specify build
     and run settings for the installed device types. However, you might need to
     install and configure some additional software on the devices to be able to
-    \l{Connecting Devices}{connect} to them from the development PC.
+    \l{Develop for Devices}{connect} to them from the computer.
 
     \sa {Manage Projects}{How To: Manage Projects}, {Custom Wizards}
 */
@@ -81,7 +81,7 @@
 
     To create a new project, select \uicontrol File > \uicontrol{New Project} and
     select the type of your project. The contents of the wizard dialogs depend
-    on the project type and the \l{glossary-buildandrun-kit}{kits} that you
+    on the project type and the \l{Kits}{kits} that you
     select in the \uicontrol {Kit Selection} dialog. Follow the instructions of
     the wizard.
 
@@ -146,7 +146,7 @@
                 launcher for debugging and analysis tools.
         \row
             \li Squish
-            \li Create new \l {Using Squish}{Squish test suites}.
+            \li Create new Squish test suites.
 
     \endtable
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc
index c2d2fe9e2dd..f2d8d254249 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc
@@ -238,7 +238,7 @@
                     { "key": "CN", "value": "%{JS: Cpp.className(value('Class'))}" },
                     { "key": "Base", "value": "%{JS: value('BaseCB') === '' ? value('BaseEdit') : value('BaseCB')}" },
                     { "key": "isQObject", "value": "%{JS: (value('Base') === 'QObject' || value('Base') === 'QWidget' || value('Base') === 'QMainWindow' || value('Base') === 'QQuickItem' ) ? 'true' : 'false'}" },
-                    { "key": "GUARD", "value": "%{JS: Cpp.classToHeaderGuard(value('Class'), Util.suffix(value('HdrFileName'))}" },
+                    { "key": "GUARD", "value": "%{JS: Cpp.headerGuard(value('HdrFileName'))}" },
                     { "key": "SharedDataInit", "value": "%{JS: value('IncludeQSharedData') ? 'data(new %{CN}Data)' : '' }" }
                 ],
                 \endcode
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc
index 8762a9e97b1..8720339ca6a 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc
@@ -15,13 +15,12 @@
 
     \title Add debuggers
 
-    The \QC debugger plugin acts as an interface between the \QC core and
-    external native debuggers such as the GNU Symbolic Debugger (GDB),
+    You can use debuggers, such as the GNU Symbolic Debugger (GDB),
     the Microsoft Console Debugger (CDB), a QML/JavaScript debugger, and the
     debugger of the low level virtual machine (LLVM) project, LLDB.
 
-    The debugger plugin automatically selects a suitable native debugger for
-    each \l{glossary-buildandrun-kit}{kit} from the ones found on your system.
+    \QC automatically selects a suitable debugger for
+    each \l{Kits}{kit} from the ones found on your system.
     To override this choice, select \preferences > \uicontrol Kits.
 
     To add debuggers:
@@ -75,5 +74,6 @@
     The debugger disappears from the list when you select \uicontrol Apply.
     Until then, you can cancel the deletion by clicking \uicontrol Restore.
 
-    \sa {Debugging}, {Setting Up Debugger}, {Troubleshooting Debugger}
+    \sa {Debugging}, {Debuggers}, {Debugger}, {Supported Debuggers},
+    {Troubleshooting Debugger}
 */
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 e4e682d2a6f..2a57fcfaac6 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc
@@ -125,7 +125,7 @@
     you first need to deploy your executable and possibly other files.
     \QC does that for you automatically if you enter the necessary
     information. This works the same way as explained for CMake in
-    \l {Deploying to Remote Linux},
+    \l {Remote Linux Deploy Configuration},
     except that you also need to include your application binary in the list.
 
     \section1 Create a run configuration
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-kits.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-kits.qdoc
index 4654c4326fd..1237c748443 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-kits.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-kits.qdoc
@@ -25,16 +25,16 @@
     You can add kits for the desktop and for the following types of devices:
 
     \list
-        \li \l{Connecting Android Devices}{Android}
-        \li \l{Connecting Bare Metal Devices}{Bare Metal}
-        \li \l{Boot2Qt: Documentation}{Boot2Q} (commercial only)
-        \li \l{Adding Docker Devices}{Docker} (experimental)
-        \li \l{Connecting iOS Devices}{iOS}
+        \li \l{Developing for Android}{Android}
+        \li \l{Developing for Bare Metal Devices}{Bare Metal}
+        \li \l{\B2Q: Documentation}{\B2Q} (commercial only)
+        \li \l{Add Docker devices}{Docker} (experimental)
+        \li \l{Developing for iOS}{iOS}
         \li iOS Simulator
-        \li \l{Connecting MCUs}{MCU} (commercial only)
-        \li \l{Connecting QNX Devices}{QNX}
-        \li \l{Connecting Remote Linux Devices}{Remote Linux}
-        \li \l{Building Applications for the Web}{WebAssembly Runtime}
+        \li \l{Developing for MCUs}{MCU} (commercial only)
+        \li \l{Add a QNX Neutrino device}{QNX}
+        \li \l{Developing for Remote Linux Devices}{Remote Linux}
+        \li \l{Build applications for the web}{WebAssembly Runtime}
     \endlist
 
     To add kits:
@@ -45,7 +45,7 @@
         \li Select \uicontrol Add to start from an empty kit or \uicontrol Clone
             to clone the selected kit and edit its preferences.
             \image qtcreator-kits.png
-        \li Set \l{kits-tab}{kit preferences} according to the build system and
+        \li Set \l{Kits}{kit preferences} according to the build system and
             device type.
 
         \li Select \uicontrol OK to create the kit.
@@ -58,8 +58,7 @@
     choose the kit to use. To set the selected kit as the default kit,
     select \uicontrol {Make Default}.
 
-    \sa {Activate kits for a project}, {Add debuggers}, {Add Qt versions},
-    {Open projects}, {Compilers}, {kits-tab}{Kits}
+    \sa {Manage Kits}{How To: Manage Kits}, {Compilers}, {Kits}
 */
 
 /*!
@@ -72,7 +71,7 @@
     \title Kits
 
     \brief Set kit preferences. A kit consists of a set of values that define
-    one environment, such as a \e {device}, tool chain, Qt version, and debugger
+    one environment, such as a \e {device}, toolchain, Qt version, and debugger
     command to use.
 
     Typically, only a subset of the kit preferences is relevant for a particular
@@ -134,7 +133,7 @@
             cross-compiling, leave this field empty.
     \row
         \li \uicontrol {Emulator skin}
-        \li Skin to use for the \l {Emulator}{Boot2Qt Emulator Device}.
+        \li Skin to use for the \l {Emulator}{\B2Q Emulator Device}.
     \row
         \li \uicontrol {Compiler}
         \li C or C++ compiler that you use to build the project. You can add
@@ -214,7 +213,6 @@
             \uicontrol Manage to add installed Ninja tools to the list.
     \endtable
 
-    \sa {Activate kits for a project}, {Open projects}, {Add CMake Tools},
-    {Add compilers}, {Add debuggers}, {Add kits}, {Add Qt versions},
+    \sa {Manage Kits}{How To: Manage Kits}, {Add CMake Tools},
     {Edit Qbs profiles}
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc
index c4f8d905a33..fc66a62e8a7 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc
@@ -91,7 +91,7 @@
     For more information about the project file settings, see
     \l{Declaring Other Libraries}{qmake Manual: Declaring Other Libraries}.
 
-    \sa {Adding an Internal Library to a qmake Project}{Tutorial: Adding an Internal Library to a qmake Project},
+    \sa {Using an Internal Library in a qmake Project}{Tutorial: Using an Internal Library in a qmake Project},
     {Add subprojects to projects}, {Add libraries to CMake projects},
     {Use project wizards}, {Creating Projects}
 */
@@ -103,7 +103,7 @@
 
     \ingroup creator-tutorials
 
-    \title Adding an Internal Library to a qmake Project
+    \title Using an Internal Library in a qmake Project
 
     \brief How to create your own library and link your application against it
     when using qmake as the build system.
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc
index c85da814661..a01c06b6559 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc
@@ -20,7 +20,7 @@
     \note Enable the Nim plugin to use Nimble and Nim.
 
     In addition, you have to download and install Nim and set up a
-    \l {glossary-buildandrun-kit}{kit} that contains the Nim compiler.
+    \l {Kits}{kit} that contains the Nim compiler.
 
     You can use wizards to create Nim and Nimble projects.
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc
index 66b69a573fe..b71064f96e0 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc
@@ -13,6 +13,8 @@
     \previouspage creator-how-tos.html
 
     \ingroup creator-how-to-projects-configure
+    \ingroup creator-how-to-manage-kits
+    \ingroup creator-how-to-projects
 
     \title Open projects
 
@@ -48,6 +50,15 @@
             \endlist
     \endlist
 
+    \section1 Open directories as projects
+
+    To open a directory as a project, go to \uicontrol File >
+    \uicontrol {Open Workspace}.
+
+    \QC generates the \e .qtcreator/project.json project file in the directory
+    for setting a project name and file exclusion filters. You can open either
+    the JSON file or the workspace to open the project the next time.
+
     \section1 Re-configure projects
 
     \QC stores information that it needs to build projects in a .user file. If
@@ -64,7 +75,7 @@
 
     \list 1
         \li In \uicontrol {Configure Project}, select
-            \l{glossary-buildandrun-kit}{kits} for building
+            \l{Kits}{kits} for building
             and running your project.
             \image qtcreator-configure-project.webp {Configure Project view}
         \li Select \uicontrol {Configure Project}.
@@ -112,5 +123,5 @@
     later. Select the \inlineimage icons/pin.png
     (\uicontrol Pin) button to pin the progress bar back to the toggle button.
 
-    \sa {Activate kits for a project}, {Add kits}, {kits-tab}{Kits},
+    \sa {Manage Kits}{How To: Manage Kits}, {Kits},
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc
index 0b06e1d84c1..48958f8846e 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc
@@ -108,28 +108,45 @@
 
     To verify the installation of a particular Qt version, \QC
     calls \c {qmake -query} and checks that the directories referenced in the
-    output exist. When \QC complains about the installation of a self-built Qt
-    version, try running \c {make install} in the build directory to actually
-    install Qt into the configured location. If you installed Qt using the Qt
-    Installer, run \QMT to check for updates or to reinstall
-    the Qt version.
+    output exist. If you installed Qt using \QOI, run
+    \QMT to check for updates or to reinstall the Qt version.
 
-    \section1 Minimum requirements
-    If your build of Qt is incomplete but you still want to use qmake as build
-    system, you need to ensure the following minimum requirements to use that
-    setup with \QC.
+    \section2 Self-built Qt versions
 
-    \list 1
+    To build projects with a self-built Qt version, add it as described in
+    \l{Set up new Qt versions}.
+
+    Your Qt has to meet the following minimum requirements:
+
+    \list
         \li qmake is an executable that understands the \c -query command-line
             argument.
         \li The \c bin and \c include directories have to exist. \QC fetches
             these directories by running \c{qmake -query}.
-        \li The \c mkspecs directory should be complete enough to parse .pro
-            files.
     \endlist
 
-    If your Qt version has no \c libQtCore.so, \QC cannot detect the ABI.
+    Add a kit for the Qt version and configure it for CMake.
 
-    \sa {kits-tab}{Kits}
+    \QC issues warnings if:
+
+    \list
+        \li \c libQtCore.so is missing, so \QC cannot detect the ABI.
+        \li \c toolchain.cmake is missing. For example, you built Qt with the
+            \c -static option for an x86 platform.
+    \endlist
+
+    Try the following:
+
+    \list
+        \li Run \c {make install} in the build directory to install Qt into the
+            configured location.
+        \li Set the value of the \c CMAKE_PREFIX_PATH variable in \preferences >
+            \uicontrol Kits > \uicontrol Kits > \uicontrol {CMake Configuration}
+            to the location where you installed Qt.
+    \endlist
+
+    \image qtcreator-edit-cmake-configuration-self-built-qt.webp {Setting the path to a self-built Qt}
+
+    \sa {Manage Kits}{How To: Manage Kits}, {kits-tab}{Kits}
 */
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdoc
index f1b08ac048a..0c33472862d 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdoc
@@ -11,7 +11,7 @@
 
     \brief Settings for building applications with Qbs.
 
-    Specify build settings for the selected \l{glossary-buildandrun-kit}{kit} in
+    Specify build settings for the selected \l{Kits}{kit} in
     \uicontrol Projects > \uicontrol {Build & Run} > \uicontrol Build >
     \uicontrol {Build Settings}.
 
@@ -30,7 +30,7 @@
     If debug info is being generated, you can have it placed into separate
     files, rather than embedded into the binary, by selecting
     \uicontrol Enable in the \uicontrol {Separate debug info} field. For
-    more information, see \l{Using the Performance Analyzer}. To use default
+    more information, see \l{Analyze CPU usage}. To use default
     settings, select \uicontrol {Leave at Default}.
 
     For more information about the QML debugging options, see
@@ -59,7 +59,7 @@
             \endlist
 
         \li In the \uicontrol ABIs field, select the ABIs for
-            the \l{Connecting Android Devices}{Android} device
+            the \l{Developing for Android}{Android} device
             architectures to build the project for.
 
         \li In the \uicontrol {Parallel jobs} field, specify the number of
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 31bc8204d4a..644b30ac3b1 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
@@ -16,7 +16,7 @@
 
     \title Configure projects for building
 
-    Specify build settings for the selected \l{glossary-buildandrun-kit}{kit} in
+    Specify build settings for the selected \l{Kits}{kit} in
     \uicontrol Projects > \uicontrol {Build & Run} > \uicontrol Build >
     \uicontrol {Build Settings}.
 
@@ -56,8 +56,8 @@
 
     \section1 Build on remote devices
 
-    You can build applications on \l{Connecting Remote Linux Devices}
-    {remote Linux} or \l{Adding Docker Devices}{Docker} devices if you
+    You can build applications on \l{Developing for Remote Linux Devices}
+    {remote Linux} or \l{Add Docker devices}{Docker} devices if you
     have kits that specify the devices and toolchains to use. When the
     build device of the kit is a remote device, such as a remote Linux or
     Docker device, the \uicontrol Browse button next to the
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-environment.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-environment.qdoc
index ce809fc536d..db6aefeb64c 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-environment.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-environment.qdoc
@@ -141,6 +141,10 @@
 
     Use the following syntax to enter environment variable names and values:
     \c {<VARIABLE>=<VALUE>}.
+    To temporarily disable a variable, add a hash character (#) to the beginning
+    of the line.
+    \note Using this approach for a different statement (append, prepend, unset)
+    may result in unexpected changes of the environment.
 
     To remove a variable value from the environment, enter the variable name.
     For example, \c TEST sets the value of the \c TEST variable empty when
@@ -160,8 +164,8 @@
     following lines. However, you can remove a value after you have referred to
     it on an earlier line.
 
-    To temporarily disable a variable, add a hash character (#) to the beginning
-    of the line.
+    To add a comment or disable any of the above actions, prefix it with two hash
+    characters (##).
 
     \sa {Specify the environment for projects}, {Configure projects for building},
     {Configure projects for running}, {Use Qt Creator variables}
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc
index 4ba2e5b393e..2a032dabf75 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc
@@ -16,7 +16,7 @@
 
     When you install Qt for a development or target platform, such as Linux,
     \macos, Windows, Android or QNX, \l{https://www.qt.io/download-qt-installer}
-    {\QOI} creates \l{glossary-buildandrun-kit}{kits} for the development targets.
+    {\QOI} creates \l{Kits}{kits} for the development targets.
 
     Select the kits to use for a project in the \uicontrol {Configure Projects}
     view when you open the project for the first time. At least one kit must be
@@ -65,7 +65,7 @@
     \section1 Specifying Run Settings
 
     The run settings to specify depend on the type of the project and on the
-    \l{kits-tab}{Run device} that you select for the kit.
+    \l{Kits}{Run device} that you select for the kit.
 
     \QC automatically creates deploy and run configurations for your project.
 
@@ -84,7 +84,9 @@
                 \li \l{Link projects to Axivion dashboards}{Axivion}
                 \li \l{Specify clangd settings}{Clangd}
                 \li \l{Specify Clang tools settings}{Clang Tools}
+                \li \l{Override CMake settings for a project}{CMake}
                 \li \l{Set Copilot preferences}{Copilot}
+                \li \l{Configure C++ code model}{C++ Code Model}
                 \li \l{Specify code style}{C++ Code Style}
                 \li \l{Set C++ file naming preferences}{C++ File Naming}
                 \li \l{Specify dependencies}{Dependencies}
@@ -94,7 +96,7 @@
                 \li \l{Link projects with GitLab}{GitLab}
                 \li \l{Configure language server workspace}{Language Server}
                 \li \l{Specify settings for quick fixes}{Quick Fixes}
-                \li \l{Testing}
+                \li \l{Apply filters before scanning for tests}{Testing}
                 \li \l{Exclude files from to-do lists}{To-Do} (experimental)
             \endlist
 
@@ -111,6 +113,7 @@
     \previouspage creator-how-tos.html
 
     \ingroup creator-how-to-projects-configure
+    \ingroup creator-how-to-manage-kits
 
     \title Activate kits for a project
 
@@ -125,6 +128,9 @@
     is not suitable for the project type. To view the warning and error messages,
     move the mouse pointer over the kit name.
 
+    To hide inactive kits from the list, select \uicontrol {Hide Inactive Kits}.
+    To show them again, select \uicontrol {Show All Kits}.
+
     \section1 Manage kits
 
     To modify kit configuration or to \l{Add kits}{add kits} to the list or to
@@ -132,7 +138,7 @@
 
     Each kit consists of a set of values that define one environment, such as a
     \l{glossary-device}{device}, \l{Add compilers}{compiler},
-    \l{Add debuggers}{debugger}, and \l{Add Qt versions}{Qt version}, as well
+    \l{Add debuggers}{Debugging}, and \l{Add Qt versions}{Qt version}, as well
     as steps for building, deploying, and running applications.
 
     To copy the build, deploy, and run steps from another kit, select
@@ -174,5 +180,5 @@
     might still see them listed for existing projects. You can copy the build,
     deploy, and run steps from them to other kits.
 
-    \sa {Add kits}, {Configuring Projects}, {kits-tab}{Kits}
+    \sa {Manage Kits}{How To: Manage Kits}, {Configuring Projects}, {Kits}
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-analyze.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-analyze.qdoc
index 34233c90d83..9c1463f2d9b 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-analyze.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-analyze.qdoc
@@ -9,12 +9,12 @@
 
     \title Specify Valgrind settings for a project
 
-    Specify settings for running applications on the \l {kits-tab}{Run device} that
+    Specify settings for running applications on the \l {Kits}{Run device} that
     you select for a kit in \uicontrol Projects > \uicontrol {Build & Run} >
     \uicontrol Run > \uicontrol {Run Settings}.
 
-    \QC integrates \l{Analyzing Code}{Valgrind code analysis tools} for
-    detecting memory leaks and profiling function execution.
+    With \l{Valgrind's Tool Suite}, you can detect memory leaks and profile
+    function execution.
 
     To specify Valgrind settings for the current project:
 
@@ -38,11 +38,12 @@
 
     \endlist
 
-    Click \uicontrol {Restore Global} to revert to the global settings.
+    Select \uicontrol {Restore Global} to revert to the global settings.
 
     To specify global Valgrind settings, select \preferences >
     \uicontrol Analyzer.
 
-    \sa {Configuring Projects}, {Selecting Options for Memory Analysis},
-    {Selecting Profiling Options}, {Using Valgrind Code Analysis Tools}
+    \sa {Detect memory leaks with Memcheck}, {Profile function execution},
+    {Run Valgrind tools on external applications}, {Configuring Projects},
+    {Valgrind Callgrind}, {Valgrind Memcheck}
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-debug.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-debug.qdoc
index 770478d5b66..486b8b8c4c5 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-debug.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-debug.qdoc
@@ -10,7 +10,7 @@
 
     \title Enable debugging
 
-    Specify settings for running applications on the \l {kits-tab}{Run device} that
+    Specify settings for running applications on the \l {Kits}{Run device} that
     you select for a kit in \uicontrol Projects > \uicontrol {Build & Run} >
     \uicontrol Run > \uicontrol {Run Settings}.
 
@@ -30,7 +30,7 @@
 
     \list
         \li \l{Adding Custom Debugging Helpers}{Custom debugging helpers}
-        \li \l{Specifying GDB Settings}{GDB commands} to execute after GDB
+        \li \l{GDB}{GDB commands} to execute after GDB
             has started, but before the debugged program is started or
             attached, and before the debugging helpers are initialized
     \endlist
@@ -42,5 +42,5 @@
     {enable QML debugging} either globally or in the \uicontrol {Build Settings}
     of the project.
 
-    \sa {Configuring Projects}, {Debugging}
+    \sa {Configuring Projects}, {Debugging}, {Debuggers}, {Debugger}
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-desktop.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-desktop.qdoc
index 72085701e16..35188f5ce94 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-desktop.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-desktop.qdoc
@@ -11,7 +11,7 @@
 
     \brief Settings for running applications on desktop device types.
 
-    Specify settings for running applications on the \l {kits-tab}{Run device} that
+    Specify settings for running applications on the \l {Kits}{Run device} that
     you select for a kit in \uicontrol Projects > \uicontrol {Build & Run} >
     \uicontrol Run > \uicontrol {Run Settings}.
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc
index 7f8ba6894b8..f989924d560 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc
@@ -16,7 +16,7 @@
 
     \title Configure projects for running
 
-    Specify settings for running applications on the \l {kits-tab}{Run device} that
+    Specify settings for running applications on the \l {Kits}{Run device} that
     you select for a kit in \uicontrol Projects > \uicontrol {Build & Run} >
     \uicontrol Run > \uicontrol {Run Settings}.
 
@@ -27,7 +27,7 @@
 
     \list
         \li \l {Android Run Settings}{Android}
-        \li \l {Boot2Qt Run Settings}{Boot2Qt}
+        \li \l {\B2Q Run Settings}{\B2Q}
         \li \l {Desktop Device Run Settings}{Desktop}
         \li \l {Python Run Settings}{Python}
         \li \l {QNX Run Settings}{QNX}
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-sharing.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-sharing.qdoc
index 3e48923ad36..09898e8f56e 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-sharing.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-sharing.qdoc
@@ -20,7 +20,8 @@
     has the same XML structure as a \e {.user} file, but only has the
     settings to share.
 
-    \note Use \l{CMake Presets} to share CMake project settings.
+    To share CMake project settings, use \l{CMake Presets} or a
+    \c {CMakeLists.txt.shared} file.
 
     \section1 Create a shared settings file
 
@@ -72,5 +73,38 @@
     a permanent sticky setting that was created just because you wanted to try
     something out.
 
+    \section1 Share CMake project settings
+
+    The following is an example of a \c {CMakeLists.txt.shared} file:
+
+    \badcode
+    <?xml version="1.0" encoding="UTF-8"?>
+    <!DOCTYPE QtCreatorProject>
+    <qtcreator>
+      <data>
+      <variable>ProjectExplorer.Project.PluginSettings</variable>
+       <valuemap type="QVariantMap">
+        <valuemap type="QVariantMap" key="CMakeSpecificSettings">
+          <value type="bool" key="AskBeforePresetsReload">false</value>
+          <value type="bool" key="AskReConfigureInitialParams">false</value>
+          <value type="bool" key="AutorunCMake">false</value>
+          <value type="bool" key="PackageManagerAutoSetup">false</value>
+          <value type="bool" key="ShowAdvancedOptionsByDefault">true</value>
+          <value type="bool" key="ShowSourceSubFolders">false</value>
+          <value type="bool" key="UseGlobalSettings">false</value>
+          <value type="bool" key="UseJunctionsForSourceAndBuildDirectories">true</value>
+        </valuemap>
+      </valuemap>
+     </data>
+     <data>
+      <variable>Version</variable>
+      <value type="int">22</value>
+     </data>
+    </qtcreator>
+    \endcode
+
+    For more information about the settings, see
+    \l {Override CMake settings for a project}.
+
     \sa {Configuring Projects}, {CMake Presets}
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-testing-how-to-limit-files-to-path-patterns.qdoc b/doc/qtcreator/src/projects/creator-only/creator-testing-how-to-limit-files-to-path-patterns.qdoc
new file mode 100644
index 00000000000..32d58d028dd
--- /dev/null
+++ b/doc/qtcreator/src/projects/creator-only/creator-testing-how-to-limit-files-to-path-patterns.qdoc
@@ -0,0 +1,32 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+    \page creator-how-to-limit-files-to-path-patterns.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-test
+    \ingroup creator-how-to-projects-configure
+
+    \title Apply filters before scanning for tests
+
+    To override testing preferences for the current project:
+
+    \list 1
+        \li Go to \uicontrol Projects > \uicontrol {Project Settings} >
+            \uicontrol {Testing}.
+            \image qtcreator-projects-settings-testing.webp {Testing settings in Projects mode}
+        \li Clear \uicontrol {Use global settings} to select the tests to handle
+            for the project.
+        \li To automatically run all or selected tests after successfully
+            building the current project, select \uicontrol All or
+            \uicontrol Selected in \uicontrol {Automatically run tests after build}.
+        \li To apply path filters before scanning for tests, select
+            \uicontrol {Limit Files to Path Patterns}.
+        \li Select \uicontrol Add to add the filters as wildcard expressions.
+    \endlist
+
+    To remove the selected filter, select \uicontrol Remove.
+
+    \sa {Test}{How To: Test}, {Test Results}, {Testing}
+*/
diff --git a/doc/qtcreator/src/projects/creator-projects-running.qdoc b/doc/qtcreator/src/projects/creator-projects-running.qdoc
index 0b39d0d7077..f83a9c00ba7 100644
--- a/doc/qtcreator/src/projects/creator-projects-running.qdoc
+++ b/doc/qtcreator/src/projects/creator-projects-running.qdoc
@@ -28,7 +28,7 @@
 
         \li Select the \uicontrol {Build and Run Kit Selector} icon or go to
             \uicontrol Build > \uicontrol {Open Build and Run Kit Selector} to select the
-            build and run \l{glossary-buildandrun-kit}{kit}.
+            build and run \l{Kits}{kit}.
 
             \image qtcreator-kit-selector.webp {Kit selector}
 
@@ -40,7 +40,7 @@
 
     If you have connected \l{Mobile Platforms}{mobile devices} or
     \l{Embedded Platforms}{embedded devices} to the computer
-    or added virtual devices, such as \l{Managing Android Virtual Devices (AVD)}
+    or added virtual devices, such as \l{Manage AVDs}
     {Android Virtual Devices (AVD)}, you can select them in the kit selector.
 
     Select \uicontrol Manage to manage device settings. For example, you can add
diff --git a/doc/qtcreator/src/python/creator-python-development.qdoc b/doc/qtcreator/src/python/creator-python-development.qdoc
index d5cd5fe31c9..10f054dcdab 100644
--- a/doc/qtcreator/src/python/creator-python-development.qdoc
+++ b/doc/qtcreator/src/python/creator-python-development.qdoc
@@ -25,8 +25,8 @@
         \li \l{Configure Python language servers}
         \li \l{Run Python applications}
         \li \l{Python Run Settings}
-        \li \l{PDB}
-        \li \l{Launching the Debugger}
+        \li \l{PDB versions}
+        \li \l{Supported Debuggers}
     \endlist
 
     For more information about developing with Qt for Python, including
@@ -74,7 +74,7 @@
 
     \section1 Select the Python version
 
-    The \l{kits-tab}{kits} you select for the project in \uicontrol Projects >
+    The \l{Kits}{kits} you select for the project in \uicontrol Projects >
     \uicontrol {Build & Run} set the Python version to use.
 
     The \l {Edit Mode}{Edit mode} toolbar shows the current Python version.
diff --git a/doc/qtcreator/src/python/creator-python-run-settings.qdoc b/doc/qtcreator/src/python/creator-python-run-settings.qdoc
index 6c6c3b4fe2b..07cf625450d 100644
--- a/doc/qtcreator/src/python/creator-python-run-settings.qdoc
+++ b/doc/qtcreator/src/python/creator-python-run-settings.qdoc
@@ -31,7 +31,7 @@
 
     \brief Settings for running Qt for Python applications.
 
-    Specify settings for running applications on the \l {kits-tab}{Run device} that
+    Specify settings for running applications on the \l {Kits}{Run device} that
     you select for a kit in \uicontrol Projects > \uicontrol {Build & Run} >
     \uicontrol Run > \uicontrol {Run Settings}.
 
diff --git a/doc/qtcreator/src/python/creator-tutorial-python-application-qt-widgets.qdoc b/doc/qtcreator/src/python/creator-tutorial-python-application-qt-widgets.qdoc
index 765ff75c2a2..13b1f216380 100644
--- a/doc/qtcreator/src/python/creator-tutorial-python-application-qt-widgets.qdoc
+++ b/doc/qtcreator/src/python/creator-tutorial-python-application-qt-widgets.qdoc
@@ -54,8 +54,10 @@
         \li Select \uicontrol{Next} or \uicontrol Continue to open the
             \uicontrol {Kit Selection} dialog.
             \image qtcreator-new-project-qt-for-python-kit-selection.webp {Selecting a kit for a Python project}
-        \li Select Qt for Python kits for building, deploying, and running the
-            project.
+        \li Select Python kits for building, deploying, and running the
+            project. By default, this creates a virtual environment for the project inside
+            the source directory. To use the global interpreter, select the build configuration
+            with the same name as the Python of the kit in \uicontrol{Details}.
         \li Select \uicontrol{Next} or \uicontrol Continue.
         \li Review the project settings, and select \uicontrol {Finish} (on
             Windows and Linux) or \uicontrol Done (on \macos) to create the
@@ -69,7 +71,8 @@
             project.
         \li \c {mywidget.py}, which has some boilerplate code for a class.
         \li \c {reguirements.txt}, which stores the PySide version of the
-            generated code.
+            generated code. You can use this file to install the required PySide version
+            using pip.
     \endlist
 
     \section1 Adding Qt Widgets Imports
diff --git a/doc/qtcreator/src/python/creator-tutorial-python-application-qtquick.qdoc b/doc/qtcreator/src/python/creator-tutorial-python-application-qtquick.qdoc
index c6ecaace78e..f8570d1bbad 100644
--- a/doc/qtcreator/src/python/creator-tutorial-python-application-qtquick.qdoc
+++ b/doc/qtcreator/src/python/creator-tutorial-python-application-qtquick.qdoc
@@ -44,8 +44,10 @@
         \li Select \uicontrol{Next} or \uicontrol Continue to open the
             \uicontrol {Kit Selection} dialog.
             \image qtcreator-new-project-qt-for-python-kit-selection.webp {Selecting a kit for a Python project}
-        \li Select Qt for Python kits for building, deploying, and running the
-            project.
+        \li Select Python kits for building, deploying, and running the
+            project. By default, this creates a virtual environment for the project inside
+            the source directory. To use the global interpreter, select the build configuration
+            with the same name as the Python of the kit in \uicontrol{Details}.
         \li Review the project settings, and select \uicontrol {Finish} (on
             Windows and Linux) or \uicontrol Done (on \macos) to create the
             project.
@@ -59,7 +61,8 @@
         \li \c {main.py}, which has some boilerplate code.
         \li \c {main.qml}, which imports Qt Quick controls.
         \li \c {reguirements.txt}, which stores the PySide version of the
-            generated code.
+            generated code. You can use this file to install the required PySide version
+            using pip.
     \endlist
 
     \section1 Adding Qt Quick Imports
diff --git a/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc b/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc
index 06fcb20abd5..eb68e9e0f82 100644
--- a/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc
+++ b/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc
@@ -9,22 +9,30 @@
 // **********************************************************************
 
 /*!
-    \previouspage creator-deployment-b2qt.html
     \page creator-deployment-qnx.html
-    \nextpage creator-deployment-embedded-linux.html
-    \title Deploying to QNX Neutrino
+    \previouspage creator-reference.html
 
-    You can specify settings for deploying applications to QNX Neutrino
+    \ingroup creator-reference-deploy-configurations
+
+    \title QNX Neutrino Deploy Configuration
+
+    \brief Copy application files to QNX Neutrino devices.
+
+    Specify settings for deploying applications to QNX Neutrino
     devices in the project configuration file and in \uicontrol Projects
     > \uicontrol {Run Settings} > \uicontrol Deployment.
 
     \image qtcreator-qnx-deployment.png "Deploy to device"
 
     The deployment process is described in more detail in
-    \l{Deploying to Remote Linux}.
+    \l{Remote Linux Deploy Configuration}.
 
     \section1 Finding Configured Devices
 
     The \uicontrol {Check for a configured device} deployment step looks for a
     device that is ready for deployment.
+
+    \sa {Build and Run}{How To: Build and Run}, {QNX Neutrino}{How To: Develop for QNX},
+    {QNX Run Settings}, {Remote Linux Deploy Configuration},
+    {Remote Linux Run Settings}
 */
diff --git a/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc b/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc
index d7ec1e64177..f6990187c3d 100644
--- a/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc
+++ b/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc
@@ -1,32 +1,51 @@
 // Copyright (C) 2018 Blackberry
-// Copyright (C) 2022 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \previouspage creator-developing-mcu.html
     \page creator-developing-qnx.html
-    \nextpage creator-developing-generic-linux.html
+    \previouspage creator-how-tos.html
 
-    \title Connecting QNX Devices
+    \ingroup creator-how-to-qnx
 
-    You can connect QNX devices to the development PC to deploy, run and debug
-    applications on them from within \QC. The QNX Neutrino RTOS has additional
+    \title Add a QNX Neutrino device
+
+    Create a connection between \QC and a QNX Neutrino device to run, debug, and
+    analyze applications on the device. The QNX Neutrino RTOS has additional
     command-line tools and services, as described in \l {Qt for QNX}.
 
-    \note In Qt 6, \QC support for QNX is considered experimental.
+    \image qtcreator-devices-qnx.webp {QNX device preferences}
+    \caption QNX device preferences
 
-    \section1 Adding a QNX Neutrino Device in \QC
+    \include qtcreator-add-linux-device.qdocinc {add linux device} {QNX Device}
 
-    Adding a QNX Neutrino device is very similar to
-    \l{Connecting Remote Linux Devices}, except that
-    you need to select \uicontrol {QNX Device} in the
-    \uicontrol {Device Configuration} wizard.
-
-    \section1 Add kits for QNX Devices
-
-    To view QNX device settings, select \preferences >
-    \uicontrol Devices > \uicontrol QNX. Select the \uicontrol {Generate kits}
-    check box to allow \QC to generate kits for QNX development.
-
-    \sa {Add kits}
+    \sa {QNX Neutrino}{How To: Develop for QNX},
+    {Remote Linux}{How To: Develop for remote Linux},
+    {Manage Kits}{How To: Manage Kits}
+*/
+
+/*!
+    \page creator-how-to-create-qnx-kits.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-qnx
+
+    \title Create kits for QNX Neutrino devices
+
+    To generate a build and run \l {Kits}{kit} for QNX Neutrino devices:
+
+    \list 1
+        \li Go to \preferences > \uicontrol Devices > \uicontrol Devices.
+        \li Select \uicontrol Add > \uicontrol {QNX Device} >
+            \uicontrol {Start Wizard} to add a QNX Neutrino device.
+        \li Select \uicontrol Apply to fetch the information needed for
+            creating kits.
+        \li Go to \preferences > \uicontrol Devices > \uicontrol QNX.
+        \li Select \uicontrol {Create Kit} to create a kit for a particular
+            platform.
+            \image qtcreator-preferences-qnx.webp {QNX Preferences}
+        \li Activate the kit for your project.
+    \endlist
+
+    \sa {QNX Neutrino}{How To: Develop for QNX}, {Activate kits for a project}
 */
diff --git a/doc/qtcreator/src/qnx/creator-projects-how-to-run-qnx.qdoc b/doc/qtcreator/src/qnx/creator-projects-how-to-run-qnx.qdoc
index 364ee316bcc..13fc502533e 100644
--- a/doc/qtcreator/src/qnx/creator-projects-how-to-run-qnx.qdoc
+++ b/doc/qtcreator/src/qnx/creator-projects-how-to-run-qnx.qdoc
@@ -5,20 +5,22 @@
     \page creator-how-to-run-on-qnx.html
     \previouspage creator-how-tos.html
 
-    \ingroup creator-how-to-run
+    \ingroup creator-how-to-qnx
 
     \title Run on QNX devices
 
     To build an application and run it on a device:
 
     \list 1
-        \li Connect the device to the computer or to the Wi-Fi network.
-        \li Configure the device and specify a connection to it.
+        \li Connect the device to the computer or to a network.
+        \li Go to \preferences > \uicontrol Devices > \uicontrol Devices,
+            and add a QNX device.
+            \image qtcreator-devices-qnx.webp {QNX device preferences}
         \li Make sure that your kit has your QNX device set.
         \li Select \inlineimage icons/run_small.png (\uicontrol Run).
     \endlist
 
-    \QC uses the compiler specified in the QNX tool chain to build the
+    \QC uses the compiler specified in the QNX toolchain to build the
     application.
 
     \note Debugging is currently only fully supported on Linux and \macos.
@@ -32,7 +34,7 @@
 
     \section2 Debug output cannot be shown
 
-    For the command-line output to show up in the \uicontrol{Application Output},
+    For the command-line output to show up in \l {Application Output},
     \QC has to create an SSH connection to the device.
     This is only possible if QNX Momentics is not running, and the SSH key
     configured for the device is a 4096-bit key.
@@ -48,6 +50,6 @@
     \c printf, \c ps, \c read, \c sed, \c sleep, \c uname, \c slog2info, and
     \c cat.
 
-    \sa {Connecting QNX Devices}, {Run on many platforms}, {Compilers},
-    {Embedded Platforms}, {kit-preferences}{Kits}
+    \sa {QNX Neutrino}{How To: Develop for QNX}, {Run on many platforms},
+    {Compilers}, {kit-preferences}{Kits}
 */
diff --git a/doc/qtcreator/src/qnx/creator-projects-settings-run-qnx.qdoc b/doc/qtcreator/src/qnx/creator-projects-settings-run-qnx.qdoc
index c3fd8861c07..edd78c0a193 100644
--- a/doc/qtcreator/src/qnx/creator-projects-settings-run-qnx.qdoc
+++ b/doc/qtcreator/src/qnx/creator-projects-settings-run-qnx.qdoc
@@ -11,17 +11,18 @@
 
     \brief Settings for running applications on Linux-based devices.
 
-    Specify settings for running applications on the \l {kits-tab}{Run device} that
+    Specify settings for running applications on the \l {Kits}{Run device} that
     you select for a kit in \uicontrol Projects > \uicontrol {Build & Run} >
     \uicontrol Run > \uicontrol {Run Settings}.
 
-    To run and debug an application on a QNX device, you must
-    create connections from the development PC to the device. Select
-    \uicontrol {Manage device configurations} to create a connection.
+    To run and debug an application on a QNX device, select
+    \uicontrol {Manage device configurations} to create a
+    connection between \QC and the device.
 
     Settings for QNX Neutrino devices are very similar to those for remote linux
     devices.
 
-    \sa {Remote Linux Run Settings}, {Activate kits for a project},
-    {Configure projects for running}, {kits-tab}{Kits}, {Connecting QNX Devices}
+    \sa {QNX Neutrino}{How To: Develop for QNX}, {Manage Kits}{How To: Manage Kits},
+    {Remote Linux Run Settings}, {Configure projects for running},
+    {kits-tab}{Kits}
 */
diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc
index 4c6f0c4cb57..5235ec0217b 100644
--- a/doc/qtcreator/src/qtcreator-toc.qdoc
+++ b/doc/qtcreator/src/qtcreator-toc.qdoc
@@ -13,81 +13,17 @@
     {Qt documentation} portal or in the \l {Get help}{Help} mode.
 
     \list
-        \li \l{Developing with \QC}
-        \list
-            \li \l{Getting Started}
-                \list
-                    \li \l{User Interface}
-                    \li \l{Configuring Qt Creator}
-                \endlist
-            \li \l{Creating Projects}
-            \li \l{Configuring Projects}
-            \li \l{Validating with Target Hardware}
+        \li \l{Installation}
+        \li \l{Getting Started}
             \list
-                \li \l{Previewing on Desktop}
-                \li \l{Previewing on Devices}
-                \li \l{Previewing in Browsers}
+                \li \l{Overview}
+                \li \l{User Interface}
+                \li \l{Configuring Qt Creator}
             \endlist
-            \li \l{Deploying to Devices}
-            \list
-                \li \l{Deploying to Android}
-                \li \l{Deploying to Boot2Qt}
-                \li \l{Deploying to QNX Neutrino}
-                \li \l{Deploying to Remote Linux}
-            \endlist
-            \li \l{Connecting Devices}
-            \list
-                \li \l{Connecting Android Devices}
-                \li \l{Connecting Bare Metal Devices}
-                \li \l{Connecting Boot2Qt Devices}
-                \li \l{Adding Docker Devices}
-                \li \l{Connecting iOS Devices}
-                \li \l{Connecting QNX Devices}
-                \li \l{Connecting Remote Linux Devices}
-                \li \l{Building Applications for the Web}
-            \endlist
-            \li \l{Debugging}
-            \list
-                \li \l{Setting Up Debugger}
-                \li \l{Launching the Debugger}
-                \li \l{Debug Mode Views}
-                    \list
-                        \li \l{Viewing Call Stack Trace}
-                        \li \l{Setting Breakpoints}
-                        \li \l{Viewing Threads}
-                        \li \l{Viewing Modules}
-                        \li \l{Viewing Source Files}
-                        \li \l{Local Variables and Function Parameters}
-                        \li \l{Evaluating Expressions}
-                        \li \l{Viewing and Editing Register State}
-                        \li \l{Debugger Log}
-                        \li \l{Viewing Disassembled Code}
-                    \endlist
-                \li \l{Stopping Applications}
-                \li \l{Examining Data}
-                \li \l{Remote Debugging}
-                \li \l{Debugger Preferences}
-                \li \l{Using Debugging Helpers}
-                \li \l{Debugging Qt Quick Projects}
-                \li \l{Troubleshooting Debugger}
-            \endlist
-            \li \l{Analyzing Code}
-            \list
-                \li \l{Profiling QML Applications}
-                \li \l{Checking Code Coverage}
-                \li \l{Using Valgrind Code Analysis Tools}
-                \list
-                    \li \l{Detecting Memory Leaks with Memcheck}
-                    \li \l{Profiling Function Execution}
-                    \li \l{Running Valgrind Tools on External Applications}
-                \endlist
-                \li \l{Detecting Memory Leaks with Heob}
-                \li \l{Analyzing CPU Usage}
-                \li \l{Analyzing Code with Cppcheck}
-                \li \l{Visualizing Chrome Trace Events}
-            \endlist
-            \li \l{Using Squish}
-        \endlist
+        \li \l{Creating Projects}
+        \li \l{Configuring Projects}
+        \li \l{Debugging}
+        \li \l{Analyzing Code}
         \li \l{Tutorials}
             \generatelist creator-tutorials
         \li \l{How To}
@@ -110,8 +46,24 @@
                 \generatelist creator-how-to-design
             \li Develop for Devices
                 \list
+                    \li Android
+                        \generatelist creator-how-to-android
+                    \li Bare Metal
+                        \generatelist creator-how-to-bare-metal
+                    \li \B2Q
+                        \generatelist creator-how-to-b2qt
+                    \li Docker
+                        \generatelist creator-how-to-docker
+                    \li iOS
+                        \generatelist creator-how-to-ios
                     \li MCUs
                         \generatelist creator-how-to-mcu
+                    \li QNX Neutrino
+                        \generatelist creator-how-to-qnx
+                    \li Remote Linux
+                        \generatelist creator-how-to-remote-linux
+                    \li WebAssembly
+                        \generatelist creator-how-to-webassembly
                 \endlist
             \li Edit Code
                 \generatelist creator-how-to-edit
@@ -147,6 +99,8 @@
             \li \l{Reference}
                 \generatelist creator-reference
                 \list
+                    \li Analyzers
+                        \generatelist creator-reference-analyzer
                     \li Build Systems
                         \generatelist creator-reference-build-systems
                         \list
@@ -156,9 +110,17 @@
                     \li Devices
                         \generatelist creator-reference-devices
                         \list
+                            \li Deploy Configurations
+                                \generatelist creator-reference-deploy-configurations
                             \li Run Configurations
                                 \generatelist creator-reference-run-configurations
                         \endlist
+                    \li Debugger
+                        \generatelist creator-reference-debugger
+                        \list
+                            \li Debugger Views
+                                \generatelist creator-reference-debugger-views
+                        \endlist
                     \li Editors
                         \generatelist creator-reference-editors
                     \li Platforms
diff --git a/doc/qtcreator/src/qtcreator.qdoc b/doc/qtcreator/src/qtcreator.qdoc
index cc3352dd108..47623561e52 100644
--- a/doc/qtcreator/src/qtcreator.qdoc
+++ b/doc/qtcreator/src/qtcreator.qdoc
@@ -1,77 +1,95 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
-// **********************************************************************
-// NOTE: the sections are not ordered by their logical order to avoid
-// reshuffling the file each time the index order changes (i.e., often).
-// Run the fixnavi.pl script to adjust the links to the index order.
-// **********************************************************************
-
 /*!
     \page index.html
-    \nextpage creator-overview.html
+    \nextpage creator-how-to-install.html
 
-    \title Qt Creator Manual
+    \keyword {Qt Creator Manual}
+    \title Qt Creator Documentation
 
-    \QC is a cross-platform, complete integrated development environment
-    (IDE) that you can use to create applications for
-    \l{Desktop Platforms}{desktop}, \l {Embedded Platforms}{embedded}, and
-    \l{Mobile Platforms}{mobile device} platforms, such as \l Android and
-    \l iOS. It is available for \l Linux, \l \macos and \l Windows
-    operating systems. For more information, see \l{Supported Platforms}.
+    \raw HTML
+    <style>
+    .main-navigation table { table-layout: fixed; }
+    .main-navigation table tr:first-child { text-align: center; background: none; }
+    </style>
+    \endraw
 
-    In addition, you can use the experimental
-    \l{Building Applications for the Web}{WebAssembly plugin}
-    to build applications in web format and run them in web
-    browsers.
-
-    \table
+    \div {class="main-navigation"}
+    \table borderless 100%
         \row
-            \li {4,1} \b {\l{All Topics}}
+            \li \inlineimage icons/installation.png
+            \li \inlineimage icons/getting-started.png
+            \li \inlineimage icons/tutorials.png
         \row
-            \li \inlineimage front-gs.png
-            \li \inlineimage front-coding.png
-            \li \inlineimage front-help.png
-            \li \inlineimage front-advanced.png
-        \row
-            \li \b {\l{Developing with \QC}}
-                \list
-                    \li \l{Getting Started}
-                    \li \l{Creating Projects}
-                    \li \l{Configuring Projects}
-                    \li \l{Validating with Target Hardware}
-                    \li \l{Connecting Devices}
-                    \li \l{Deploying to Devices}
-                    \li \l{Debugging}
-                    \li \l{Analyzing Code}
-                    \li \l{Using Squish}
-                \endlist
-            \li \b {\l{Tutorials}}
-                \generatelist creator-tutorials
-            \li \b {\l{How To}}
-                \list
-                    \li \l{Analyze}
-                    \li \l{Build and Run}
-                    \li \l{Debug}
-                    \li \l{Design UIs}
-                    \li \l{Edit Code}
-                    \li \l{Manage Projects}
-                    \li \l{Read Documentation}
-                    \li \l{Test}
-                    \li \l{Use \QC}
-                    \li \l{Use the UI}
-                \endlist
-            \li \b {\l{Reference}}
-                \list
-                    \li \l {Acknowledgements}
-                    \li \l {Build Systems}
-                    \li \l {Command-Line Options}
-                    \li \l {Custom Wizards}
-                    \li \l {Keyboard Shortcuts}
-                    \li \l {Preferences}
-                    \li \l {Supported Platforms}
-                    \li \l {Version Control Systems}
-                    \li \l {Views}
-                \endlist
+            \li \b {INSTALLATION}
+
+                Install either a \e commercial or \e {open source} version of \QC
+                with \QOI or as a stand-alone tool on Linux, \macos, or Windows.
+
+                \l {Installation}
+            \li \b {GETTING STARTED}
+
+                Learn about the \QC features and UI, as well as how you can make
+                \QC behave more like your favorite code editor or IDE.
+
+                \l{Getting Started}
+            \li \b {TUTORIALS}
+
+                Follow the tutorials to create basic Qt applications for the
+                desktop and mobile devices by using Qt Widgets and Qt Quick.
+
+                \l{Tutorials}
     \endtable
+    \enddiv
+
+    \section1 About
+
+    Use the \QC cross-platform, complete integrated development environment
+    (IDE) to create applications for \l{Desktop Platforms}{desktop},
+    \l {Embedded Platforms}{embedded}, and \l{Mobile Platforms}{mobile device}
+    platforms, such as \l Android and \l iOS. Also, you can build applications
+    in web format and run them in web browsers with
+    \l{Build applications for the web}{Qt for WebAssembly}.
+
+    \b {HOW TO}
+
+    \raw HTML
+    <style>
+    .link-list table { table-layout: fixed; }
+    .link-list table, .link-list table tr:first-child { background: none; border: none; }
+    </style>
+    \endraw
+
+    \div {class="link-list"}
+    \table 100%
+        \row
+            \li \inlineimage icons/demo-32x32.png
+            \li \inlineimage icons/build-32x32.png
+            \li \inlineimage icons/settings-32x32.png
+        \row
+                \li Work with Code
+                    \list
+                        \li \l{Edit Code}
+                        \li \l{Debug}
+                        \li \l{Analyze}
+                        \li \l{Test}
+                    \endlist
+                \li Build and Run Applications
+                    \list
+                        \li \l{Manage Projects}
+                        \li \l{Manage Kits}
+                        \li \l{Build and Run}
+                        \li \l{Develop for Devices}
+                    \endlist
+                \li Use Tools and Extensions
+                    \list
+                        \li \l{Use \QC}
+                        \li \l{Use the UI}
+                        \li \l{Design UIs}
+                        \li \l{Create Models and Diagrams}
+                        \li \l{Read Documentation}
+                    \endlist
+    \endtable
+    \enddiv
 */
diff --git a/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc b/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc
index f06917784bc..b6f01f38a59 100644
--- a/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc
@@ -32,12 +32,12 @@
 
     To develop for Android devices, you must install \l{Qt for Android}
     and set up the development environment, as instructed in
-    \l{Connecting Android Devices}.
+    \l{Developing for Android}.
 
     To develop for iOS devices, you must install Xcode and use it to configure
     a device. For this, you need an Apple developer account and iOS Developer
     Program certificate that you receive from Apple. For more information, see
-    \l{Connecting iOS Devices}.
+    \l{Developing for iOS}.
 
     \include qtquick-tutorial-create-empty-project.qdocinc qtquick empty application
 
diff --git a/doc/qtcreator/src/qtquick/creator-only/creator-projects-settings-run-qtquick.qdoc b/doc/qtcreator/src/qtquick/creator-only/creator-projects-settings-run-qtquick.qdoc
index 3f2ee989012..1d7be468c7b 100644
--- a/doc/qtcreator/src/qtquick/creator-only/creator-projects-settings-run-qtquick.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/creator-projects-settings-run-qtquick.qdoc
@@ -11,11 +11,11 @@
 
     \brief Settings for running Qt Quick UI Prototype projects (.qmlproject).
 
-    Specify settings for running applications on the \l {kits-tab}{Run device} that
+    Specify settings for running applications on the \l {Kits}{Run device} that
     you select for a kit in \uicontrol Projects > \uicontrol {Build & Run} >
     \uicontrol Run > \uicontrol {Run Settings}.
 
-    \note Select the \uicontrol Desktop device type for the \l{kits-tab}{Run device}
+    \note Select the \uicontrol Desktop device type for the \l{Kits}{Run device}
     in the kit.
 
     \image qtquick-ui-prototype-run-settings.webp {Run Settings for a Qt Quick UI Prototype project}
@@ -42,5 +42,5 @@
     \endtable
 
     \sa {Create Qt Quick UI Prototypes}, {Activate kits for a project},
-    {Configure projects for running}, {kits-tab}{Kits}
+    {Configure projects for running}, {Kits}
 */
diff --git a/doc/qtcreator/src/qtquick/creator-only/qt-design-viewer.qdoc b/doc/qtcreator/src/qtquick/creator-only/qt-design-viewer.qdoc
index 8ff40ec941f..58e3e900ba9 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qt-design-viewer.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/qt-design-viewer.qdoc
@@ -1,27 +1,25 @@
-// Copyright (C) 2019 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
     \page qt-design-viewer.html
-    \previouspage creator-live-preview-devices.html
-    \nextpage creator-building-targets.html
+    \previouspage creator-how-tos.html
 
-    \title Previewing in Browsers
+    \ingroup creator-how-to-design
+
+    \title Preview UI prototypes in browsers
 
     \image qt-design-viewer.png
 
-    \QDV is a QML viewer that runs in your web browser. This means that you can
-    run applications in most widely-used web browsers, such as Apple Safari,
-    Google Chrome, Microsoft Edge, and Mozilla Firefox, on the desktop and on
-    mobile devices.
+    Run Qt Quick UI Prototype projects in web browsers, such as Apple Safari,
+    Google Chrome, Microsoft Edge, and Mozilla Firefox, with \QDV.
 
     The startup and compilation time depend on your browser and configuration.
-    However, the actual performance of the application once started is
-    indistinguishable from the same application running on the desktop.
+    Once started, the application performs the same as when running on the
+    desktop.
 
-    You can run Qt Quick UI Prototype projects, which
-    have a .qmlproject file that defines the main QML file and the import paths.
-    Compress the project folder into a ZIP file that you upload to \QDV.
+    The .qmlproject configuration file defines the main QML file and the import
+    paths. Compress the project folder into a ZIP file that you upload to \QDV.
 
     The loaded applications remain locally in your browser. No data is uploaded
     into the cloud.
@@ -30,11 +28,12 @@
 
     \list 1
         \li In the browser, open \l{ https://designviewer.qt.io/}{\QDV}.
-        \li Drag and drop your application package to \QDV, or click the load
+        \li Drag your application package to \QDV, or select the load
             icon to browse for your file.
     \endlist
 
     Your application is compiled and run on \QDV.
 
-    \sa {Create Qt Quick UI Prototypes}
+    \sa {Create Qt Quick UI Prototypes}, {Design UIs}{How To: Design UIs},
+    {UI Design}
 */
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc
index 0ff290f0d0d..f7181c59cf1 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc
@@ -76,12 +76,12 @@
         \li Select \uicontrol Next to open the \uicontrol {Kit Selection}
             dialog.
 
-        \li Select \l{glossary-buildandrun-kit}{kits} for the platforms that
+        \li Select \l{Kits}{kits} for the platforms that
             you want to build the application for.
 
             \note Kits are listed if they have been specified in \preferences >
             \uicontrol Kits.
-            For more information, see \l {Add kits} and \l {kits-tab}{Kits}.
+            For more information, see \l {Add kits} and \l {Kits}.
 
         \li Select \uicontrol Next to open the \uicontrol {Project Management}
             dialog.
@@ -149,8 +149,7 @@
             imports that are used in the QML files.
 
             You can add imports later to combine Qt Quick basic types with
-            Qt Quick Controls, Qt Quick Dialogs, and Qt Quick Layouts (available
-            since Qt 5.1).
+            Qt Quick Controls, Qt Quick Dialogs, and Qt Quick Layouts.
 
         \li Select the \uicontrol {Use Qt Virtual Keyboard} check box to add
             support for \l{Qt Virtual Keyboard} to the application.
@@ -162,12 +161,11 @@
         \li Select \uicontrol Next to open the \uicontrol {Kit Selection}
             dialog.
 
-        \li Select \l{glossary-buildandrun-kit}{kits} for the platforms that
+        \li Select \l{Kits}{kits} for the platforms that
             you want to build the application for.
 
             \note Kits are listed if they have been specified in \preferences >
             \uicontrol Kits.
-            For more information, see \l {Add kits} and \l {kits-tab}{Kits}.
 
         \li Select \uicontrol Next to open the \uicontrol {Project Management}
             dialog.
@@ -198,5 +196,6 @@
     To use JavaScript and image files in the application, copy them to the
     project folder.
 
-    \sa {Create Qt Quick Applications}, {Creating Projects}
+    \sa {Create Qt Quick Applications}, {Manage Kits}{How To: Manage Kits},
+    {Creating Projects}
 */
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-live-preview-desktop.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-live-preview-desktop.qdoc
new file mode 100644
index 00000000000..75a64831c0e
--- /dev/null
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-live-preview-desktop.qdoc
@@ -0,0 +1,22 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+    \page creator-live-preview-desktop.html
+    \previouspage creator-how-tos.html
+
+    \ingroup creator-how-to-design
+
+    \title Preview a QML file on desktop
+
+    To preview the currently active QML file on the desktop:
+
+    \list
+        \li Select \inlineimage icons/live-preview.png (\uicontrol {Live Preview})
+            on the \l{Edit Mode}{editor} toolbar.
+            \image qtcreator-live-preview.webp {Application running on top of the editor view}
+        \li Go to \uicontrol Build > \uicontrol {QML Preview}.
+    \endlist
+
+    \sa {Design UIs}{How To: Design UIs}, {UI Design}
+*/
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-states-scxml.qdocinc b/doc/qtcreator/src/qtquick/creator-only/qtquick-states-scxml.qdocinc
deleted file mode 100644
index 1f0fd5a8e01..00000000000
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-states-scxml.qdocinc
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (C) 2020 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-/*!
-//! [scxml state machines]
-
-    \section1 Using SCXML State Machines
-
-    To use QML together with an SCXML state machine, add states and
-    bind them to the state machine in \l {Connection View} >
-    \uicontrol Backends, as described in \l {Managing C++ Backend Objects}.
-
-    In the \uicontrol States view, you can select \uicontrol Actions >
-    \uicontrol {Set when Condition} to edit the \c when condition of states
-    to map QML states to the states of the SCXML state machine. For an example,
-    see \l {Qt SCXML Traffic Light QML Example (Dynamic)}.
-
-    \image qmldesigner-states-when-condition.png
-
-    If you add animation to the states, you can
-    \l{Validating with Target Hardware}{preview}
-    or \l{Run on many platforms}{run}
-    the application to test the animation.
-
-//! [scxml state machines]
-*/
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc b/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc
index be0c55516a9..22d887c161c 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc
@@ -37,14 +37,14 @@
 
         \li Select \uicontrol Next to open the \uicontrol {Kit Selection} dialog.
 
-        \li Select Qt 6.4 or later \l{glossary-buildandrun-kit}{kits} for the
+        \li Select Qt 6.4 or later \l{Kits}{kits} for the
             platforms that you want to build the application for. To build
             applications for mobile devices, select kits also for Android and
             iOS.
 
             \note The list shows kits that you specify in \preferences >
             \uicontrol Kits.
-            For more information, see \l {Add kits} and \l {kits-tab}{Kits}.
+            For more information, see \l {Add kits} and \l {Kits}.
 
         \li Select \uicontrol Next to open the \uicontrol {Project Management}
             dialog.
diff --git a/doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc b/doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
index 8dcc8c26413..87142f4a511 100644
--- a/doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
@@ -1,20 +1,30 @@
-// Copyright (C) 2020 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \previouspage creator-live-preview-desktop.html
     \page creator-live-preview-devices.html
+    \if defined (qtdesignstudio)
+    \previouspage studio-live-preview-desktop.html
     \nextpage qt-design-viewer.html
 
     \title Previewing on Devices
 
-    To preview UIs on Android devices, enable USB debugging on them
-    and connect them to your system with a USB cable.
+    \else
+    \previouspage creator-how-tos.html
 
-    To preview UIs on Boot2Qt devices, connect the devices to your
-    system with a USB cable, or a wired or wireless connection, depending on
-    the device, and configure connections to them. The necessary kits have been
-    predefined and you only need to enable them for your current project.
+    \ingroup creator-how-to-design
+
+    \title Preview Qt Quick UIs on devices
+    \endif
+
+    To preview a UI on an Android device, turn on USB debugging on the device
+    and connect it to the computer with a USB cable.
+
+    To preview a UI on a \B2Q device, connect the device to the computer
+    with a USB cable, or a wired or wireless connection, depending on
+    the device, and configure a connection to it. The necessary kits have been
+    predefined, but you need to select the one appropriate for your current
+    project.
 
     \e {Deploy configurations} handle the packaging and copying of the
     necessary files to a location in a device where you want to run the
@@ -27,8 +37,8 @@
 
     \list 1
         \if defined(qtcreator)
-        \li In \uicontrol Projects > \uicontrol {Build & Run}, enable the kit
-            predefined for the device type (1).
+        \li Go to \uicontrol Projects > \uicontrol {Build & Run}.
+        \li Activate the kit predefined for the device type (1).
         \li Select the kit for the device in the kit selector (2).
             \image qtcreator-kit-selector-devices.webp {Kit selector}
         \else
@@ -42,36 +52,36 @@
             press \key {Alt+P}.
     \endlist
 
-    \section2 Previewing on Android Devices
+    \section2 On Android
 
     \if defined(qtcreator)
-    The USB debugging feature on Android devices enables creating connections
-    to the devices from \QDS and running the preview utility on them.
+    Use the USB debugging feature on an Android device to create a connection
+    to the device from \QC and run the preview utility on it.
 
     Debugging is turned on in different ways on different Android devices.
     Look for \uicontrol {USB Debugging} under \uicontrol {Developer Options}.
-    On some devices, \uicontrol {Developer Options} is hidden and becomes visible
-    when you tap the \uicontrol {Build number} field in \uicontrol Settings >
-    \uicontrol About several times.
+    Tap \uicontrol {Build number} in \uicontrol Settings > \uicontrol About
+    several times to show \uicontrol {Developer Options}.
 
     After you turn on debugging, connect the Android device to the system
     with a USB cable.
 
-    The first time you preview a UI on devices, the preview utility
-    is copied to them. This might take some time. Thereafter, previewing will
-    get faster because only the UI files need to be copied to the
-    device.
+    The first time you preview a UI on a device, the preview utility
+    is copied to it, which might take some time. Thereafter, previewing
+    gets faster because only the UI files need to be copied to the device.
     \else
-    Preview your \QDS projects with \QUV. It is an application
-    that runs on your Android device.
+    Preview \QDS projects with \QUV on an Android device.
     Learn more about \l{Viewing Applications on Android}.
     \endif
 
+    \section2 On \B2Q
 
-    \section2 Previewing on Boot2Qt Devices
+    Preview a UI on a supported \B2Q device that you configure as
+    instructed in the \B2Q documentation.
 
-    You can preview UIs on supported Boot2Qt devices that you configure as
-    instructed in the Boot2Qt documentation.
+    \sa {\B2Q: Documentation}, {Support Levels for Target Hardware}
 
-    \sa {Boot2Qt: Documentation}, {Support Levels for Target Hardware}
+    \if defined(qtcreator)
+    \sa {Design UIs}{How To: Design UIs}, {UI Design}
+    \endif
 */
diff --git a/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc b/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc
deleted file mode 100644
index 2d2ac0b36b6..00000000000
--- a/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (C) 2024 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-/*!
-    \page creator-live-preview.html
-    \if defined(qtdesignstudio)
-    \previouspage quick-states.html
-    \else
-    \previouspage creator-building-running.html
-    \endif
-    \nextpage creator-live-preview-desktop.html
-
-    \title Validating with Target Hardware
-
-    Preview a UI file or the entire UI on the desktop, as well as on embedded
-    Linux devices to instantly view the changes you make to the UI. On Android
-    devices, the preview shows the snapshot of your project from the moment
-    you start the preview on the device, not your changes.
-
-    \if defined(qtcreator)
-    \image qtcreator-live-preview.webp {Application running on top of the editor}
-    \else
-    \image studio-live-preview.webp
-    \endif
-
-    Or, use \QDV to run
-    \if defined(qtcreator)
-    \l{Create Qt Quick UI Prototypes}{Qt Quick UI projects}
-    \else
-    applications
-    \endif
-    in most widely-used web browsers on the desktop and in mobile devices and
-    share your designs with reviewers who don't have \QC.
-
-    \list
-        \li \l{Previewing on Desktop}
-
-            Preview individual QML files or the whole UI.
-        \li \l{Previewing on Devices}
-
-            \if defined(qtcreator)
-            Preview Qt Quick applications on devices that you
-            connect to the development PC. For more information, see
-            \l {Connecting Devices}.
-            \else
-            When you install \QDS, everything you need for previewing on
-            devices is set up automatically. You only need to connect your
-            devices to your system.
-            \endif
-
-        \if defined(qtdesignstudio)
-        \li \l{Sharing Applications Online}
-
-            Share applications online and view them in a web browser.
-
-        \li \l{Viewing Applications on Android}
-
-           Preview your \QDS projects with \QUV. It is an application
-           that runs on your Android device.
-        \else
-        \li \l{Previewing in Browsers}
-
-            Open \l{https://designviewer.qt.io/}{\QDV}
-            in a browser and load applications to it.
-        \endif
-    \endlist
-*/
diff --git a/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc b/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
index 9c74f946f38..eb74c5b547d 100644
--- a/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 // **********************************************************************
@@ -7,31 +7,175 @@
 // Run the fixnavi.pl script to adjust the links to the index order.
 // **********************************************************************
 
+/*!
+    \page creator-how-to-profile-qml.html
+    \if defined(qtdesignstudio)
+    \previouspage creator-qml-performance-monitor.html
+    \nextpage studio-advanced.html
+    \else
+    \previouspage creator-how-tos.html
+    \endif
+
+    \ingroup creator-how-to-analyze
+
+    \title Profile QML applications
+
+    With QML Profiler, you can find causes for typical performance problems
+    in your applications, such as slowness and unresponsive, stuttering user
+    interfaces.
+
+    \if defined(qtdesignstudio)
+    \note In this section, you are using advanced menu items. These are not
+    visible by default. To toggle the visibility of advanced menu items, see
+    \l{Customizing the Menu Bar}.
+    \endif
+
+
+    To collect data about a QML application:
+
+    \list 1
+        \li Set up QML debugging for the project. For more information, see
+            \l{Setting Up QML Debugging}.
+        \if defined(qtcreator)
+        \li In the \uicontrol Projects mode, select a \l{Kits}
+            {kit} with Qt version 4.7.4 or later.
+       \endif
+            \note To profile applications on \l{glossary-device}{devices}, you
+            must install Qt libraries on them.
+        \li Go to \uicontrol Analyze > \uicontrol {QML Profiler} to profile the
+            current application.
+            \image qtcreator-qml-profiler-toolbar.webp {QML Profiler}
+        \li Select \inlineimage icons/qtcreator-analyze-start-button.png
+            (\uicontrol Start) to start the application from QML Profiler.
+    \endlist
+
+    QML Profiler immediately begins to collect data, as indicated by
+    the time running in the \uicontrol Elapsed field.
+
+    \note If data collection does not start automatically, select
+    \inlineimage icons/recordfill.png (\uicontrol {Enable Profiling}).
+
+    Data is collected until you select \inlineimage icons/recordfill.png again.
+    Data collection takes time, so expect a delay before seeing data.
+
+    Do not use application commands to exit the application because data is
+    sent to QML Profiler when you select \inlineimage icons/recordfill.png.
+    The application stops in seconds. If you exit the application, the data is
+    not sent.
+
+    Select \uicontrol {Disable Profiling} to disable the automatic start of the
+    data collection when an application is launched. Data collection starts when
+    you select the button again.
+
+    To save all the collected data, select \uicontrol Analyze >
+    \uicontrol {QML Profiler Options} > \uicontrol {Save QML Trace}. To view the saved
+    data, select \uicontrol {Load QML Trace}. You can also deliver the saved data to
+    others for examination or load data saved by them.
+
+    \section1 Flush data while profiling
+
+    Set data flushing preferences either globally for all projects or separately
+    for each project.
+
+    To set global preferences, go to \preferences >
+    \uicontrol Analyzer > \uicontrol {QML Profiler}.
+
+    To specify custom QML Profiler settings for a particular project:
+
+    \list 1
+        \li Go to \uicontrol Projects > \uicontrol Run.
+        \li In \uicontrol {QML Profiler Settings}, select \uicontrol Custom.
+            \image qml-profiler-settings.png {QML Profiler Settings}
+    \endlist
+
+    You can set the following preferences:
+
+    \table
+    \header
+        \li Setting
+        \li Value
+    \row
+        \li \uicontrol {Flush data while profiling}
+        \li Flush the data periodically instead of flushing all data when
+            profiling stops. This saves memory on the target device and shortens
+            the wait between the profiling being stopped and the data
+            being displayed.
+    \row
+        \li \uicontrol {Flush interval}
+        \li Set the flush interval in
+            milliseconds. The shorter the interval, the more often the
+            data is flushed. The longer the interval, the more data has
+            to be buffered in the target application, potentially wasting
+            memory. However, the flushing itself takes time, which can
+            distort the profiling results.
+    \row
+        \li \uicontrol {Process data only when process ends}
+        \li Aggregate data from many QML engines into one trace. Otherwise,
+            the profiling stops when one of the engines stops.
+    \endtable
+
+    To restore the global settings for the project, select
+    \uicontrol {Restore Global}.
+
+    \section1 Attach to a running Qt Quick application
+
+    You can profile a Qt Quick application that you do not run from \QC.
+    However, you must enable QML debugging and profiling for the application
+    in the project build settings. For more information, see
+    \l{Setting Up QML Debugging}.
+
+    To attach to a waiting application:
+
+    \list 1
+        \li Go to \uicontrol Analyze >
+            \uicontrol {QML Profiler (Attach to Waiting Application)}.
+            \image qml-profiler-start-dialog.png {Start QML Profiler dialog}
+         \li In \uicontrol Kit, select the kit used to build the application.
+         \li In \uicontrol Port, specify the port to listen to.
+         \li Select \uicontrol OK.
+    \endlist
+
+    \sa {Profiling QML applications}
+
+    \if defined(qtcreator)
+    \sa {Analyze}{How To: Analyze}, {Analyzers}, {Analyzing Code}
+    \endif
+*/
+
 /*!
     \page creator-qml-performance-monitor.html
     \if defined(qtdesignstudio)
     \previouspage creator-qml-debugging-example.html
-    \nextpage studio-advanced.html
+    \nextpage creator-how-to-profile-qml.html
     \else
-    \previouspage creator-analyze-mode.html
-    \nextpage creator-coco.html
+    \previouspage creator-reference.html
     \endif
 
+    \ingroup creator-reference-analyzer
+
     \title Profiling QML Applications
 
-    You can use the QML Profiler to find causes for typical performance problems
+    \brief Improve the performance of QML applications.
+
+    \if defined(qtdesignstudio)
+    \note In this section, you are using advanced menu items. These are not
+    visible by default. To toggle the visibility of advanced menu items, see
+    \l{Customizing the Menu}.
+    \endif
+
+    With QML Profiler, you can find causes for typical performance problems
     in your applications, such as slowness and unresponsive, stuttering user
     interfaces. Typical causes include executing too much JavaScript in too few
     frames. All JavaScript must return before the GUI thread can proceed, and
     frames are delayed or dropped if the GUI thread is not ready.
 
-    Another typical cause for similar performance problems is creating,
-    painting, or updating invisible items, which takes time in the GUI thread.
+    Another typical cause for similar performance problems is creating or
+    updating invisible items, which takes time in the GUI thread.
 
     \if defined(qtcreator)
     Triggering long-running C++ functions, such as paint methods and signal
     handlers, also takes time in the GUI thread, but is more difficult to see in
-    the QML Profiler because it does not profile C++ code.
+    QML Profiler because it does not profile C++ code.
     \endif
 
     To find excessive use of JavaScript, check the frame rate in animations and
@@ -49,124 +193,15 @@
     \if defined(qtcreator)
     If frames get dropped even though JavaScript is not being run, and there are
     large, unexplained gaps in the timeline, check your custom QQuickItem
-    implementations. You can use \l{Using Valgrind Code Analysis Tools}
-    {Valgrind} or other general purpose profilers to analyze C++ code.
+    implementations. You can use \l{Profile function execution}
+    {Valgrind Callgrind} or other general purpose profilers to analyze C++ code.
 
     You can use \e {full stack tracing} to trace from the top level QML or
     JavaScript down to the C++ and all the way to the kernel space. You can
-    view the collected data in the \l{Visualizing Chrome Trace Events}
+    view the collected data in the \l{Chrome Trace Format Visualizer}
     {Chrome Trace Format Viewer}.
     \endif
 
-    \if defined(qtdesignstudio)
-    \note In this section, you are using advanced menu items. These are not
-    visible by default. To toggle the visibility of advanced menu items, see
-    \l{Customizing the Menu Bar}.
-    \endif
-
-    \section1 Using QML Profiler
-
-    To monitor the performance of an application in the QML Profiler:
-
-    \list 1
-
-        \li To be able to profile an application, you must set up QML debugging
-            for the project. For more information, see
-            \l{Setting Up QML Debugging}.
-
-        \if defined(qtcreator)
-        \li In the \uicontrol Projects mode, select a \l{glossary-buildandrun-kit}
-            {kit} with Qt version 4.7.4 or later.
-       \endif
-
-            \note To profile applications on \l{glossary-device}{devices}, you
-            must install Qt libraries on them.
-
-        \li Select \uicontrol Analyze > \uicontrol {QML Profiler} to profile the
-            current application.
-
-        \li Select the
-            \inlineimage icons/qtcreator-analyze-start-button.png
-            (\uicontrol Start) button to start the application from the
-            QML Profiler.
-
-            \note If data collection does not start automatically, select the
-            \inlineimage icons/recordfill.png
-            (\uicontrol {Enable Profiling}) button.
-
-    \endlist
-
-    When you start analyzing an application, the application is launched, and
-    the QML Profiler immediately begins to collect data. This is indicated by
-    the time running in the \uicontrol Elapsed field.
-
-    Data is collected until you select the \uicontrol {Enable Profiling} button. Data
-    collection
-    takes time, and therefore, there might be a delay
-    before the data is displayed.
-
-    Do not use application commands to exit the application because data is
-    sent to the QML Profiler when you select the \uicontrol {Enable Profiling} button.
-    The application continues to run for some seconds, after which it is stopped
-    automatically. If you exit the application, the data is not sent.
-
-    Select the \uicontrol {Disable Profiling} button to disable the automatic
-    start of the data collection when an
-    application is launched. Data collection starts when you select the button
-    again.
-
-    To save all the collected data, select \uicontrol Analyze >
-    \uicontrol {QML Profiler Options} > \uicontrol {Save QML Trace}. To view the saved
-    data, select \uicontrol {Load QML Trace}. You can also deliver the saved data to
-    others for examination or load data saved by them.
-
-    \section1 Specifying Flushing Settings
-
-    You can specify flushing settings for the QML Profiler either globally for
-    all projects or separately for each project. To specify global settings,
-    select \preferences > \uicontrol Analyzer.
-
-    To specify custom QML Profiler settings for a particular project, select
-    \uicontrol Projects > \uicontrol Run and then select \uicontrol Custom in
-    \uicontrol {QML Profiler Settings}. To restore the global settings for the
-    project, select \uicontrol {Restore Global}.
-
-    \image qml-profiler-settings.png "QML Profiler Settings"
-
-    Select the \uicontrol {Flush data while profiling} check box to flush the
-    data periodically instead of flushing all data when profiling stops. This
-    saves memory on the target device and shortens the wait between the
-    profiling being stopped and the data being displayed.
-
-    In the \uicontrol {Flush interval} field, set the flush interval in
-    milliseconds. The shorter the interval, the more often the data is flushed.
-    The longer the interval, the more data has to be buffered in the target
-    application, potentially wasting memory. However, the flushing itself takes
-    time, which can distort the profiling results.
-
-    If you have multiple QML engines and you want to aggregate the data produced
-    by all of them into one trace, select the \uicontrol {Process data only when
-    process ends} check box. Otherwise, the profiling stops when one of the
-    engines stops.
-
-    \section1 Attaching to Running Qt Quick Applications
-
-    You can profile Qt Quick applications that are not launched by \QC.
-    However, you must enable QML debugging and profiling for the application
-    in the project build settings. For more information, see
-    \l{Setting Up QML Debugging}.
-
-    To attach to waiting applications:
-
-    \list 1
-        \li Select \uicontrol Analyze >
-            \uicontrol {QML Profiler (Attach to Waiting Application)}.
-            \image qml-profiler-start-dialog.png "Start QML Profiler dialog"
-         \li In \uicontrol Kit, select the kit used to build the application.
-         \li In \uicontrol Port, specify the port to listen to.
-         \li Select \uicontrol OK.
-    \endlist
-
     \section1 Analyzing Collected Data
 
     The \uicontrol Timeline view displays graphical representations of QML and
@@ -177,16 +212,16 @@
     Each row in the timeline (6) describes a type of QML events that were
     recorded. Move the cursor on an event on a row to see how long it takes and
     where in the source it is being called. To display the information only when
-    an event is selected, disable the \uicontrol {View Event Information on Mouseover}
-    button (4).
+    an event is selected, turn off \uicontrol {View Event Information on Mouseover}
+    (4).
 
     The outline (10) summarizes the period for which data was collected. Drag
     the zoom range (8) or click the outline to move on the outline. You can
-    also move between events by selecting the \uicontrol {Jump to Previous Event}
-    and \uicontrol {Jump to Next Event} buttons (1).
+    also move between events by selecting \uicontrol {Jump to Previous Event}
+    and \uicontrol {Jump to Next Event} (1).
 
-    Select the \uicontrol {Show Zoom Slider} button (2) to open a slider that you can
-    use to set the zoom level. You can also drag the zoom handles (9). To reset
+    Select \uicontrol {Show Zoom Slider} (2) to open a slider that sets the zoom
+    level. You can also drag the zoom handles (9). To reset
     the default zoom level, right-click the timeline to open the context menu,
     and select \uicontrol {Reset Zoom}.
 
@@ -194,16 +229,16 @@
 
     \section2 Selecting Event Ranges
 
-    You can select an event range (7) to view the frame rate of events and to
-    compare it with the frame rate of similar events. Select the
-    \uicontrol {Select Range} button (3) to activate the selection tool. Then click in
+    Select an event range (7) to view the frame rate of events and to
+    compare it with the frame rate of similar events. Select
+    \uicontrol {Select Range} (3) to activate the selection tool. Then click in
     the timeline to specify the beginning of the event range. Drag the selection
     handle to define the end of the range. The length of the range indicates the
     frame rate of the event.
 
-    You can use event ranges also to measure delays between two subsequent
-    events. Place a range between the end of the first event and the beginning
-    of the second event. The \uicontrol Duration field displays the delay between the
+    To measure delays between two subsequent events, place an event range between
+    the end of the first event and the beginning of the second event. The
+    \uicontrol Duration field displays the delay between the
     events in milliseconds.
 
     To zoom into an event range, double-click it.
@@ -222,37 +257,28 @@
     they include location in source code, duration and some relevant parts of
     the source code itself.
 
-    You can click on an event to move the cursor in the code editor to the part
+    Select an event to move the cursor in the code editor to the part
     of the code the event is associated with.
 
     The following types of events are displayed in the timeline view on one or
-    several rows. The availability of event types depends on the version of Qt
-    the application was compiled with and the version of Qt Quick it is using.
+    several rows.
 
     \table
 
     \header
         \li Event Category
         \li Description
-        \li Minimum Qt Version
-        \li Qt Quick Version
-
     \row
         \li \uicontrol {Pixmap Cache}
         \li Displays the general amount of pixmap data cached, in pixels. In
             addition, displays a separate event for each picture being loaded,
             with specifics about its file name and size.
-        \li Qt 5.1
-        \li Qt Quick 2
 
     \row
         \li \uicontrol {Scene Graph}
         \li Displays the time when scene graph frames are rendered and some
             additional timing information for the various stages executed to do
             so.
-        \li Qt 5.1
-        \li Qt Quick 2
-
     \row
         \li \uicontrol {Memory Usage}
         \li Displays block allocations of the JavaScript memory manager.
@@ -265,98 +291,64 @@
             The second row displays the actual usage of the allocated memory.
             This is the amount of JavaScript heap the application has actually
             requested.
-        \li Qt 5.4
-        \li Qt Quick 2
-
     \row
         \li \uicontrol {Input Events}
         \li Displays mouse and keyboard events.
-        \li Qt 4.7.4
-        \li Qt Quick 1 or Qt Quick 2
-
     \row
         \li \uicontrol Painting
-        \li Displays the time spent painting the scene for each frame.
-        \li Qt 4.7.4
-        \li Qt Quick 1
-
+        \li Not used.
     \row
         \li \uicontrol Animations
         \li Displays the amount of animations that are active and the frame
             rate that they are running at.
-            Information about render thread animations is displayed for
-            applications that are built with Qt 5.3 or later. Render thread
-            animations are shown in a separate row then.
-        \li Qt 5.0 (Qt 5.3)
-        \li Qt Quick 2
-
+            Render thread animations are shown on a separate row.
     \row
         \li \uicontrol Compiling
         \li Displays the time spent compiling the QML files.
-        \li Qt 4.7.4
-        \li Qt Quick 1 or Qt Quick 2
-
     \row
         \li \uicontrol Creating
-        \li Displays the time spent creating the elements in the scene. In Qt
-            Quick 2, creation of elements takes place in two stages. The first
+        \li Displays the time spent creating the elements in the scene.
+            The creation of elements takes place in two stages. The first
             stage is for the creation of the data structures, including child
             elements. The second stage represents the completion callbacks. Not
             all elements trigger completion callbacks, though. The stages are
             shown as separate events in the timeline.
-            For Qt Quick 2 applications compiled with versions of Qt before
-            5.2.1 only the creation of top-level elements is shown, as single
-            events.
-        \li Qt 4.7.4 (Qt 5.2.1)
-        \li Qt Quick 1 or Qt Quick 2
-
     \row
         \li \uicontrol Binding
         \li Displays the time when a binding is evaluated and how long the
             evaluation takes.
-        \li Qt 4.7.4
-        \li Qt Quick 1 or Qt Quick 2
-
     \row
         \li \uicontrol {Handling Signal}
         \li Displays the time when a signal is handled and how long the
             handling takes.
-        \li Qt 4.7.4
-        \li Qt Quick 1 or Qt Quick 2
-
     \row
         \li \uicontrol JavaScript
         \li Displays the time spent executing the actual JavaScript behind
             bindings and signal handlers. It lists all the JavaScript functions
             you may be using to evaluate bindings or handle signals.
-        \li Qt 5.3
-        \li Qt Quick 2
-
     \row
         \li \uicontrol Quick3D
         \li Displays the time spent rendering Qt Quick 3D frames, timing information
             for frame preparation and synchronization, particle system update times
             and particle update count, as well as texture and mesh memory allocations
             and memory consumption.
-        \li Qt 6.3
-        \li Qt Quick 3D
 
+            This event type is available since Qt 6.3.
     \endtable
 
     \section2 Analyzing Scene Graph Events
 
-    In order to understand the scene graph category, it's important to
-    understand how the Qt Quick scene graph works. See
-    \l {Qt Quick Scene Graph} and \l {Qt Quick Scene Graph Default Renderer}
-    for a detailed description. The following events are reported in the
+    To understand the scene graph category, read more about how
+    Qt Quick scene graph works in \l {Qt Quick Scene Graph} and
+    \l {Qt Quick Scene Graph Default Renderer}. The following events are reported in the
     \uicontrol {Scene Graph} category. Not all events are generated by all render
     loops. In the Windows and Basic render loops everything runs in the same
     thread and the distinction between GUI thread and render thread is
     meaningless.
 
-    If you set the environment variable QSG_RENDER_TIMING, you get a textual
+    Set the environment variable QSG_RENDER_TIMING, to get a textual
     output of similar, but slightly different timings from the application
-    being profiled. For easier orientation, the differences are listed below.
+    being profiled. The differences are listed below.
 
     \table
     \header
@@ -365,7 +357,6 @@
         \li Render Loop Types
         \li Label in output of QSG_RENDER_TIMING
         \li Description
-        \li Caveats
     \row
         \li \uicontrol {Polish}
         \li GUI
@@ -373,8 +364,6 @@
         \li polish
         \li Final touch-up of items before they are rendered using
             QQuickItem::updatePolish().
-        \li Versions of Qt prior to Qt 5.4 record no polish times for the basic
-            render loop and incorrect ones for the windows render loop.
     \row
         \li \uicontrol {GUI Thread Wait}
         \li GUI
@@ -385,14 +374,12 @@
             the same mutex at \uicontrol {GUI Thread Sync}. If this starts long
             before \uicontrol {Render Thread Sync}, there is \e free  time in the GUI
             thread you could be using for running additional QML or JavaScript.
-        \li None
     \row
         \li \uicontrol {GUI Thread Sync}
         \li GUI
         \li Threaded
         \li blockedForSync
         \li The time the GUI thread is blocked, waiting for the render thread.
-        \li None
     \row
         \li \uicontrol {Animations}
         \li GUI
@@ -403,7 +390,6 @@
             animation events will be shown when using the basic render loop.
             Watch the \uicontrol {Animations} category to see animation timing in
             this case.
-        \li None
     \row
         \li \uicontrol {Render Thread Sync}
         \li Render
@@ -411,7 +397,6 @@
         \li Frame rendered ... sync
         \li Synchronizing the QML state into the scene graph using
             QQuickItem::updatePaintNode().
-        \li None
     \row
         \li \uicontrol {Render}
         \li Render
@@ -421,20 +406,12 @@
             uploading all the necessary data to the GPU. This is the \e gross
             render time. Do not confuse it with the \e net \uicontrol{Render Render}
             time below.
-        \li With versions of Qt prior to Qt 5.5, the gross render time and the
-            below breakup of render times may be misaligned by some
-            microseconds due to different, unsynchronized timers being used to
-            measure them. For example \uicontrol {Render Preprocess} might seem to
-            start before \uicontrol {Render Thread Sync} is finished.
     \row
         \li \uicontrol {Swap}
         \li Render
         \li Threaded, Basic, Windows
         \li Frame rendered ... swap
         \li Swapping frames after rendering.
-        \li The output of swap times triggered by setting QSG_RENDER_TIMING is
-            incorrect for the basic render loop and versions of Qt prior to
-            Qt 5.4. The QML profiler shows the correct swap times.
     \row
         \li \uicontrol {Render Preprocess}
         \li Render
@@ -442,8 +419,6 @@
         \li time in renderer ... preprocess
         \li Calling QSGNode::preprocess() on all nodes that need to be
             preprocessed. This is part of the gross \uicontrol {Render} step.
-        \li May not be properly aligned with \uicontrol {Render} with versions of Qt
-            prior to Qt 5.5.
     \row
         \li \uicontrol {Render Update}
         \li Render
@@ -455,8 +430,6 @@
             with state from the GUI thread. In \uicontrol {Render Update}, all the
             nodes are combined to create the final scene. This is part of the
             gross \uicontrol {Render} step.
-        \li May not be properly aligned with \uicontrol {Render} with versions of Qt
-            prior to Qt 5.5.
     \row
         \li \uicontrol {Render Bind}
         \li Render
@@ -464,8 +437,6 @@
         \li time in renderer ... binding
         \li Binding the correct framebuffer for OpenGL rendering. This is part
             of the gross \uicontrol {Render} step.
-        \li May not be properly aligned with \uicontrol {Render} with versions of Qt
-            prior to Qt 5.5.
     \row
         \li \uicontrol {Render Render}
         \li Render
@@ -473,38 +444,30 @@
         \li time in renderer ... rendering
         \li The actual process of sending all the data to the GPU via OpenGL.
             This is part of the gross \uicontrol {Render} step.
-        \li May not be properly aligned with \uicontrol {Render} with versions of Qt
-            prior to Qt 5.5.
     \row
         \li \uicontrol {Material Compile}
         \li Render
         \li Threaded, Basic, Windows
         \li shader compiled
         \li Compiling GLSL shader programs.
-        \li None
     \row
         \li \uicontrol {Glyph Render}
         \li Render
         \li Threaded, Basic, Windows
         \li glyphs ... rendering
         \li Rendering of font glyphs into textures.
-        \li Versions of Qt prior to Qt 5.4 report incorrect times for these
-            events.
     \row
         \li \uicontrol {Glyph Upload}
         \li Render
         \li Threaded, Basic, Windows
         \li glyphs ... upload
         \li Uploading of glyph textures to the GPU.
-        \li Versions of Qt prior to Qt 5.4 report incorrect times for these
-            events.
     \row
         \li \uicontrol {Texture Bind}
         \li Render
         \li Threaded, Basic, Windows
         \li plain texture ... bind
         \li Binding a texture in the OpenGL context using glBindTextures.
-        \li None
     \row
         \li \uicontrol {Texture Convert}
         \li Render
@@ -512,35 +475,30 @@
         \li plain texture ... convert
         \li Converting the format and downscaling an image to make it suitable
             for usage as a texture.
-        \li None
     \row
         \li \uicontrol {Texture Swizzle}
         \li Render
         \li Threaded, Basic, Windows
         \li plain texture ... swizzle
         \li Swizzling the texture data on the CPU if necessary.
-        \li None
     \row
         \li \uicontrol {Texture Upload}
         \li Render
         \li Threaded, Basic, Windows
         \li plain texture ... upload / atlastexture uploaded
         \li Uploading the texture data to the GPU.
-        \li None
     \row
         \li \uicontrol {Texture Mipmap}
         \li Render
         \li Threaded, Basic, Windows
         \li plain texture ... mipmap
         \li Mipmapping a texture on the GPU.
-        \li None
     \row
         \li \uicontrol {Texture Delete}
         \li Render
         \li Threaded, Basic, Windows
         \li plain texture deleted
         \li Deleting a texture from the GPU that became unnecessary.
-        \li None
     \endtable
 
     \section2 Analyzing Qt Quick 3D Events
@@ -550,7 +508,7 @@
     Synchronize happens in scene graph synchronizing phase, while prepare and
     render happen in scene graph rendering phase.
 
-    Setting the environment variable \c QSG_RENDERER_DEBUG=render will also give
+    Set the environment variable \c QSG_RENDERER_DEBUG=render to get
     additional textual output of render call counts of different rendering passes.
     These call counts are summed up in the Render Frame event.
 
@@ -616,24 +574,24 @@
 
     The \uicontrol Statistics view displays the number of times each binding, create,
     compile, JavaScript, or signal event is triggered and the average time it
-    takes. This allows you to examine which events you need to optimize. A high
+    takes. Examine the statistics to learn which events to optimize. A high
     number of occurrences might indicate that an event is triggered
     unnecessarily. To view the median, longest, and shortest time for the
     occurrences, select \uicontrol {Extended Event Statistics} in the context menu.
 
-    Click on an event to move to it in the source code
+    Select an event to move to it in the source code
     in the code editor.
 
     \image qml-profiler-statistics.png "Statistics view"
 
-    The \uicontrol Callers and \uicontrol Callees panes show dependencies between events.
+    \uicontrol Callers and \uicontrol Callees show dependencies between events.
     They allow you to examine the internal functions of the application.
-    The \uicontrol Callers pane summarizes the QML events that trigger a binding.
+    \uicontrol Callers summarizes the QML events that trigger a binding.
     This tells you what caused a change in a binding.
-    The \uicontrol Callees pane summarizes the QML events that a binding triggers.
+    \uicontrol Callees summarizes the QML events that a binding triggers.
     This tells you which QML events are affected if you change a binding.
 
-    Click on an event to move to it in the source code in the code editor.
+    Select an event to move to it in the source code in the code editor.
 
     When you select an event in the \uicontrol Timeline view, information about
     it is displayed in the \uicontrol Statistics and \uicontrol {Flame Graph}
@@ -642,9 +600,6 @@
     To copy the contents of one view or row to the clipboard, select
     \uicontrol {Copy Table} or \uicontrol {Copy Row} in the context menu.
 
-    JavaScript events are shown in the \uicontrol Statistics view only for applications
-    that use Qt Quick 2 and are compiled with Qt 5.3 or later.
-
     \section2 Visualizing Statistics as Flame Graphs
 
     The \uicontrol {Flame Graph} view shows a more concise statistical overview
@@ -671,4 +626,9 @@
     suitable for analyzing per frame execution times. However, it is very easy
     to see the total impact of the various QML and JavaScript events there.
 
+    \sa {Profile QML applications}
+
+    \if defined(qtcreator)
+    \sa {Analyze}{How To: Analyze}, {Analyzers}, {Analyzing Code}
+    \endif
 */
diff --git a/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc b/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc
index 1cfa1505441..7ff6d416d02 100644
--- a/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc
@@ -23,14 +23,18 @@
     \brief Limitations of \QDS UI files (.ui.qml).
 
     \if defined(qtdesignstudio)
-    You can use \QDS wizards to create UI files that have the filename
-    extension \e .ui.qml. The UI files can be edited in the \l {2D} view.
-    If you use the \l {Code} view to add code that is not supported
-    by the \uicontrol {2D} view, \QDS displays error messages.
+    \QDS wizards create UI files that have the filename extension \e .ui.qml.
+    Edit the UI files in the \l {2D} view.
+
+    If you use the \l {Code} view to add code that the \uicontrol {2D} view does
+    not support, \QDS displays error messages.
     \else
     If you switch between \QC and \QDS or cooperate with designers on
     a project, you might encounter UI files (.ui.qml). They are intended to
     be edited in \QDS only.
+
+    To open UI files with \QDS, select \uicontrol {Open With} >
+    \uicontrol {\QDS} in the context menu for the file.
     \endif
 
 
diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-how-to-switch-between-modes.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-how-to-switch-between-modes.qdoc
index a53506eba84..fe498aca9f7 100644
--- a/doc/qtcreator/src/user-interface/creator-only/creator-how-to-switch-between-modes.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-only/creator-how-to-switch-between-modes.qdoc
@@ -27,7 +27,7 @@
         \li Purpose
         \li Read More
     \row
-        \li {1,7} \inlineimage qtcreator-mode-selector.png
+        \li {1,8} \inlineimage qtcreator-mode-selector.webp {Mode selector}
     \row
         \li \uicontrol Welcome
         \li \key Ctrl+1
@@ -57,8 +57,13 @@
             This mode is available when a project is open.
         \li \l{Configuring Projects}
     \row
-        \li \uicontrol Help
+        \li \uicontrol Extensions
         \li \key Ctrl+6
+        \li Load \QC extensions from the computer or the web.
+        \li \l{Load extensions}
+    \row
+        \li \uicontrol Help
+        \li \key Ctrl+7
         \li Read documentation.
         \li \l{Get help}
     \endtable
diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc
index 5d78d8345cf..61613519c3d 100644
--- a/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc
@@ -63,7 +63,7 @@
 
         \li To determine whether the keywords in the whole project, in the
             current file, or in a subproject are displayed by default, select
-            the appropriate option in the \uicontrol {Scanning scope} group.
+            the appropriate option in the \uicontrol {Scanning Scope} group.
 
     \endlist
 
diff --git a/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc b/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc
index 0381320085f..5116000256c 100644
--- a/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc
@@ -294,6 +294,6 @@
 
     \sa {View output}
     \if defined(qtcreator)
-    \sa {Add custom output parsers}
+    \sa {Add custom output parsers}, {Kits}
     \endif
 */
diff --git a/doc/qtcreator/src/user-interface/creator-ui.qdoc b/doc/qtcreator/src/user-interface/creator-ui.qdoc
index 9794667f5b3..90ef03431ac 100644
--- a/doc/qtcreator/src/user-interface/creator-ui.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-ui.qdoc
@@ -16,7 +16,7 @@
     \if defined(qtcreator)
     When you start \QC, it opens to the \uicontrol Welcome mode.
 
-    \image qtcreator-breakdown.png {Welcome mode}
+    \image qtcreator-welcome.webp {Welcome mode}
 
     \table
     \header
@@ -33,7 +33,7 @@
     \row
         \li \inlineimage numbers/02.png
         \li Kit selector
-        \li Select the appropriate \l{glossary-buildandrun-kit}{kit} for building
+        \li Select the appropriate \l{Kits}{kit} for building
             the project and running it on particular hardware.
         \li \l{Activate kits for a project}
     \row
diff --git a/doc/qtcreator/src/webassembly/creator-webassembly.qdoc b/doc/qtcreator/src/webassembly/creator-webassembly.qdoc
index 4a459e8cdd6..ab757d7add0 100644
--- a/doc/qtcreator/src/webassembly/creator-webassembly.qdoc
+++ b/doc/qtcreator/src/webassembly/creator-webassembly.qdoc
@@ -1,116 +1,71 @@
-// Copyright (C) 2021 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
     /*!
-    \previouspage creator-developing-generic-linux.html
     \page creator-setup-webassembly.html
-    \nextpage creator-build-process-customizing.html
+    \previouspage creator-how-tos.html
 
-    \title Building Applications for the Web
+    \ingroup creator-how-to-webassembly
+
+    \title Build applications for the Web
 
     WebAssembly is a binary format that allows sand-boxed executable code in
-    web pages. This format is nearly as fast as native machine code, and is
-    now supported by all major web browsers.
+    web pages. This format is nearly as fast as native machine code. It is
+    supported by all major web browsers.
 
-    \l {Qt for WebAssembly} enables building Qt applications so that they can be
-    integrated into web pages. It doesn't require any client-side installations
-    and reduces the use of server-side resources.
-
-    The experimental WebAssembly plugin enables you to build your applications
-    in WebAssembly format and deploy and run them in the local web browser.
-    You can change the web browser in the project's \l{Specifying Run Settings}
-    {run settings}.
+    Use \l {Qt for WebAssembly} to build your applications in WebAssembly format
+    and deploy and run them on the local web browser. Change the web browser in
+    the project's \l{Run applications in a web browser}{run settings}.
 
     \note Enable the WebAssembly plugin to use it.
 
-    To build applications for the web and run them in a web browser, you need to
-    install Qt for WebAssembly and the tool chain for compiling to WebAssembly.
+    To build applications for the web and run them in a web browser, install
+    Qt for WebAssembly with \QOI. It automatically adds a build and run kit
+    to \QC.
 
-    \section1 Requirements
+    \section1 Set up WebAssembly development environment
 
-    You need the following software to build Qt applications for the web and run
-    them in a browser:
-
-    \list
-        \li Qt for WebAssembly 5.15, or later
-        \li On Windows: \l{http://wiki.qt.io/MinGW}{\MinGW} 7.3.0, or later
-        \li \l{https://emscripten.org/docs/introducing_emscripten/index.html}
-            {emscripten} tool chain for compiling to WebAssembly
-    \endlist
-
-    \section1 Setting Up the Development Environment
-
-    You need to install and configure Qt for WebAssembly and the tool chain for
-    compiling to WebAssembly. \QOI automatically adds a build and
-    run kit to \QC.
-
-    \section2 Setting Up Qt for WebAssembly
-
-    To set up Qt for WebAssembly:
-
-        \list 1
-        \li Use \QMT to install Qt for WebAssembly and, on
-            Windows, \MinGW (found in \uicontrol {Developer and Designer Tools}).
-        \li Check out a known-good Emscripten version supported by the Qt for
-            WebAssembly version that you installed, and install and activate
-            \c emscripten, as instructed in
-            \l {https://doc.qt.io/qt-5/wasm.html#install-emscripten}
-            {Install Emscripten}.
-        \endlist
-
-    \section2 Specifying WebAssembly Settings
-
-    To configure \QC for building Qt apps for the web:
+    To set up the development environment for WebAssembly:
 
     \list 1
-        \li Select \preferences > \uicontrol Devices > \uicontrol WebAssembly.
-        \li In the \uicontrol {Emscripten SDK path} field, enter the root
-            directory where \c emsdk is installed.
+        \li Go to \preferences > \uicontrol Devices > \uicontrol WebAssembly.
+        \li In \uicontrol {Emscripten SDK path}, enter the root directory where
+            you installed \c emsdk.
         \li \QC configures the \uicontrol {Emscripten SDK environment} for you
-            if the \c emsdk is supported by the Qt for WebAssembly version that
-            you will use for developing the application.
-            \image qtcreator-webassembly-options.png "Qt for WebAssembly device preferences"
-        \li Select \preferences > \uicontrol Kits.
-            \image qtcreator-kit-webassembly.png "Qt for WebAssembly kit"
-        \li In the \uicontrol Compiler group, \uicontrol {Emscripten Compiler}
-            should have been automatically detected for both C++ and C. If not,
-            check that emscripten is set up correctly.
+            if your Qt for WebAssembly version supports the \c emsdk.
+            \image qtcreator-webassembly-options.png {Qt for WebAssembly device preferences}
+        \li Go to \preferences > \uicontrol Kits.
+            \image qtcreator-kit-webassembly.png {Qt for WebAssembly kit}
+        \li If \uicontrol {Emscripten Compiler} was not automatically set
+            for both C++ and C, check that emscripten is set up correctly.
     \endlist
 
-    \section2 Adding WebAssembly Kits
+    \sa {Run applications in a web browser}
+*/
 
-    The Qt for Web Assembly installation automatically adds build and run kits
-    to \QC. To add kits:
+/*!
+    \page creator-how-to-run-webassembly.html
+    \previouspage creator-how-tos.html
 
-    \list 1
-        \li Select \preferences > \uicontrol Kits > \uicontrol Add.
-        \li In the \uicontrol Name field, specify a name for the kit.
-        \li In the \uicontrol {Run device type} field, select
-            \uicontrol {WebAssembly Runtime}.
-            The value of the \uicontrol Device field is automatically
-            set to \uicontrol {Web Browser}.
-        \li In the \uicontrol Compiler field, select
-            \uicontrol {Emscripten Compiler} for both C and C++.
-        \li Select \uicontrol Apply to add the kit.
-    \endlist
+    \ingroup creator-how-to-webassembly
 
-    \section1 Running Applications in a Web Browser
+    \title Run applications in a web browser
 
-    To run a project:
+    To build Qt applications in \l{Qt for WebAssembly}{WebAssembly} format and
+    run them in a web browser:
 
     \list 1
         \li Open a project for an application you want to run in a web browser.
-        \li Select \uicontrol Projects > \uicontrol {Build & Run}, and then
+        \li Go to \uicontrol Projects > \uicontrol {Build & Run}, and then
             select the WebAssembly kit as the build and run kit for the project.
         \li Select \uicontrol Run to specify run settings.
-        \li In the \uicontrol {Web browser} field, select the browser to run
-            the application in.
-            \image qtcreator-settings-run-webassembly.png "Selecting the browser to run in"
+        \li In \uicontrol {Web browser}, select a browser.
+            \image qtcreator-settings-run-webassembly.png {Selecting the browser to run in}
     \endlist
 
-    You can now build Qt applications in WebAssembly format and run them in
+    Build Qt applications in WebAssembly format and run them in
     a web browser as described in \l {Build for many platforms} and
     \l{Run on many platforms}.
 
-    \sa {Enable and disable plugins}
+    \sa {Build applications for the Web}, {Enable and disable plugins}
 */
diff --git a/doc/qtcreator/src/widgets/creator-faq-qtdesigner.qdocinc b/doc/qtcreator/src/widgets/creator-faq-qtdesigner.qdocinc
index 93ed060e4ad..eb93c69a8c7 100644
--- a/doc/qtcreator/src/widgets/creator-faq-qtdesigner.qdocinc
+++ b/doc/qtcreator/src/widgets/creator-faq-qtdesigner.qdocinc
@@ -4,7 +4,7 @@
 /*!
 //! [qt designer faq]
 
-    \section1 Qt Designer Integration Questions
+    \section1 \QD Integration Questions
 
     \b {Why are custom widgets not loaded in the \uicontrol Design mode even though
      it works in standalone \QD?}
@@ -13,7 +13,7 @@
     that match its build key. The locations are different for standalone and
     integrated \QD.
 
-    For more information, see \l{Adding Qt Designer Plugins}.
+    For more information, see \l{Adding \QD Plugins}.
 
 //! [qt designer faq]
 */
diff --git a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc
index f3717ee0491..4596d46da2e 100644
--- a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc
+++ b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc
@@ -76,7 +76,7 @@
 
             \image qtcreator-new-project-qt-versions-qt-gui.png {Kit Selection dialog}
 
-        \li Select build and run \l{glossary-buildandrun-kit}{kits} for your
+        \li Select build and run \l{Kits}{kits} for your
             project.
 
         \li Select \uicontrol Next or \uicontrol Continue to open the
@@ -197,7 +197,7 @@
     \endlist
 
     For more information about designing forms with \QD, see the
-    \l{Qt Designer Manual}.
+    \l{\QD Manual}.
 
     \section2 Completing the Header File
 
diff --git a/doc/qtcreator/src/widgets/qtdesigner-overview.qdoc b/doc/qtcreator/src/widgets/qtdesigner-overview.qdoc
index b2357514fac..29d2c7d34b1 100644
--- a/doc/qtcreator/src/widgets/qtdesigner-overview.qdoc
+++ b/doc/qtcreator/src/widgets/qtdesigner-overview.qdoc
@@ -29,7 +29,7 @@
     Furthermore, features such as widget promotion and custom plugins
     allow you to use your own widgets with \QD.
 
-    For more information about \QD, see the \l{Qt Designer Manual}.
+    For more information about \QD, see the \l{\QD Manual}.
 
     Generally, the integrated \QD has the same functions as the standalone
     \QD. The following sections describe the differences.
@@ -62,7 +62,7 @@
     \uicontrol {Follow Symbol Under Cursor} in the context menu
     or press \key F2 when the cursor is over a string literal.
 
-    \section1 Specifying Settings for Qt Designer
+    \section1 Specifying Settings for \QD
 
     You can drag and drop the views in \QD to new positions on the screen.
 
@@ -102,7 +102,7 @@
     \list 1
 
         \li \preferences > \uicontrol Designer.
-            \image qtdesigner-embedded-design.png "Qt Designer Embedded Design preferences"
+            \image qtdesigner-embedded-design.png "Qt Widgets Designer Embedded Design preferences"
         \li In \uicontrol {Embedded Design}, select \inlineimage icons/plus.png
             to open the \uicontrol {Add Profile} dialog.
             \image qtdesigner-add-profile.png "Add Profile dialog"
@@ -119,5 +119,5 @@
     To import device profiles from .qdp files, select \uicontrol Open. To save
     them as .qdp files, select \uicontrol Save.
 
-    \sa {Creating a Qt Widget Based Application}, {Adding Qt Designer Plugins}
+    \sa {Creating a Qt Widget Based Application}, {Adding \QD Plugins}
 */
diff --git a/doc/qtcreator/src/widgets/qtdesigner-plugins.qdoc b/doc/qtcreator/src/widgets/qtdesigner-plugins.qdoc
index 00f61ab051e..3ce3dc02f7c 100644
--- a/doc/qtcreator/src/widgets/qtdesigner-plugins.qdoc
+++ b/doc/qtcreator/src/widgets/qtdesigner-plugins.qdoc
@@ -26,7 +26,7 @@
     and to change the default plugin path, see \l{How to Create Qt Plugins}.
 
     For more information about how to create plugins for \QD, see
-    \l{Using Custom Widgets with Qt Designer}.
+    \l{Using Custom Widgets with \QD}.
 
     \section1 Locating \QD Plugins
 
@@ -42,7 +42,7 @@
 
     To check which plugins were loaded successfully and which failed, choose
     \uicontrol Tools > \uicontrol {Form Editor} >
-    \uicontrol {About Qt Designer Plugins}.
+    \uicontrol {About \QD Plugins}.
 
     The standalone \QD is part of the Qt library used for building projects,
     located in \c {<Qt_version>\<compiler>\bin} in the Qt installation
diff --git a/doc/qtcreatordev/examples/exampleplugin/CMakeLists.txt b/doc/qtcreatordev/examples/exampleplugin/CMakeLists.txt
index 65fba000893..d2c47e4dd8c 100644
--- a/doc/qtcreatordev/examples/exampleplugin/CMakeLists.txt
+++ b/doc/qtcreatordev/examples/exampleplugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.16)
 
 #! [1]
 # Remove when sharing with others.
diff --git a/doc/qtcreatordev/examples/exampleplugin/Example.json.in b/doc/qtcreatordev/examples/exampleplugin/Example.json.in
index c5faf0a2559..b6867bb5167 100644
--- a/doc/qtcreatordev/examples/exampleplugin/Example.json.in
+++ b/doc/qtcreatordev/examples/exampleplugin/Example.json.in
@@ -8,7 +8,7 @@
     "Vendor" : "MyCompany",
     "Copyright" : "(C) MyCompany",
     "License" : "Put short license information here",
-    "Description" : "Put a short description of your plugin here",
+    "Description" : "Put a short description of your plugin here.",
     "Url" : "https://www.mycompany.com",
 //! [2]
 //! [3]
diff --git a/doc/qtcreatordev/src/coding-style.qdoc b/doc/qtcreatordev/src/coding-style.qdoc
index 49e99a8e8bc..33a2189aaf6 100644
--- a/doc/qtcreatordev/src/coding-style.qdoc
+++ b/doc/qtcreatordev/src/coding-style.qdoc
@@ -637,8 +637,8 @@
         \li Use Utils::FilePath for any QString that semantically is a file or directory,
             see also \l{Passing File Names}.
         \li Prefer using Utils::FilePath over any use of QDir and QFileInfo.
-        \li Prefer using Utils::QtcProcess over QProcess.
-        \li If Utils::FilePath or Utils::QtcProcess functionality is not sufficient
+        \li Prefer using Utils::Process over QProcess.
+        \li If Utils::FilePath or Utils::Process functionality is not sufficient
             for your purpose, prefer enhancing them over falling back to QString
             or QProcess.
         \li Avoid platform #ifdefs unless they are absolutely needed for locally
diff --git a/doc/qtcreatordev/src/lua-extensions.qdoc b/doc/qtcreatordev/src/lua-extensions.qdoc
new file mode 100644
index 00000000000..581db2e3922
--- /dev/null
+++ b/doc/qtcreatordev/src/lua-extensions.qdoc
@@ -0,0 +1,275 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+/*!
+    \page lua-extensions.html
+    \title Extending \QC with Lua
+
+    \QC can be extended with Lua scripts. The included Lua engine is based on Lua 5.4.6.
+
+    \section1 Writing Lua Extensions
+
+    To create a new Lua extension, choose \uicontrol {File} > \uicontrol {New Project} >
+    \uicontrol {Library} > \uicontrol {\QC Lua Plugin}.
+
+    To test your new extension, start your project. Your \uicontrol {Application Output}
+    should show \e {Hello from Lua!}.
+
+    \section1 Lua Extension Specification
+
+    A Lua extension consists of a Lua script with the same name as the folder it is in.
+    This is necessary for the extension to be loaded.
+
+    This script defines the specification of the extension, such as its display name, vendor, copyright.
+
+    \code
+        --- MyExtension.lua
+        return {
+            Name = "MyExtension",
+            Version = "1.0.0",
+            CompatVersion = "1.0.0",
+            Vendor = "My Company",
+            Category = "Tests",
+            Description = "Describe what your extension does in a sentence.",
+            LongDescription = [[
+                Tell users more about your extension.
+            ]],
+            Dependencies = {
+                { Name = "Core", Version = "13.0.82", Required = true },
+                { Name = "Lua",  Version = "13.0.82", Required = true }
+            },
+            setup = function() print("Hello from Lua!") end,
+            printToOutputPane = true,
+        } --[[@as QtcPlugin]]
+    \endcode
+
+    \section1 The Setup Function
+
+    The setup function is called when the extension is loaded. This is where you can set up the
+    functionality of your extension. Since the specification file is parsed with very limited
+    permissions, you need to require a module where you implement the actual functionality.
+
+    \code
+        --- MyExtension.lua
+        return {
+            Name = "MyExtension",
+            Version = "1.0.0",
+            ...,
+            --- This is the setup function that is called when the extension is loaded.
+            --- It requires the 'init' module and calls the setup function from the returned table.
+            setup = function() require 'init'.setup() end,
+        }
+    \endcode
+
+    \code
+        --- init.lua
+        function setup()
+            print("Hello from Lua!")
+        end
+
+        -- Returns a table with a single field 'setup' that points to the setup function.
+        return {
+            setup = setup
+        }
+    \endcode
+
+
+    \section1 Asynchronous Operations
+
+    Some of the built-in operations work asynchronously. To handle this, use the Async module.
+
+    \code
+        local a = require 'async'
+        local u = require 'Utils'
+
+        a.sync(function()
+            print("Lets wait for 5 seconds ...")
+            a.wait(u.waitms(5000))
+            print("... done!")
+        end)
+    \endcode
+
+    \section1 Interactive Help
+
+    When you open a .lua file in the editor the first time, you are asked to download the Lua
+    Language Server. This is extremely useful as it gives you context sensitive help and
+    auto-completion.
+
+    \section1 \QC API
+
+    The \QC API is available to Lua extensions via a number of modules that you can import
+    using the \c {require} function. C++ extensions may provide additional modules. One example of that
+    is the LanguageServer Extension that provides a module for creating Language Server clients.
+
+    You can find the API documentation files for the Lua modules in your \QC installation.
+    On \macos you can find them in \c{Qt Creator.app/Contents/Resources/lua/meta}.
+
+    \annotatedlist lua-modules
+
+    \section1 Extending the Lua API with C++
+
+    To add functionality to the Lua Interface, you need to register a new module with the Lua Engine.
+
+    \code
+    #include <lua/luaengine.h>
+
+    class MyCppExtension final : public ExtensionSystem::IPlugin
+    {
+        Q_OBJECT
+        Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "MyCppExtension.json")
+
+    public:
+        MyCppExtension() {}
+
+    private:
+        void initialize() final {
+            // The registered function will be called when the Lua module 'MyCppExtension' is required.
+            // The returned table will be returned from the require call in Lua.
+            ::Lua::LuaEngine::registerProvider("MyCppExtension", [](sol::state_view lua) -> sol::object {
+                sol::table result = lua.create_table();
+                result["myFunction"] = [](int a, int b) { return a + b; };
+                return result;
+            });
+         }
+    };
+    \endcode
+
+    You can then access \c{MyCppExtension.myFunction} from your Lua scripts like this:
+
+    \code
+    local MyCppExtension = require 'MyCppExtension'
+    --- MyCppExtension is now a table with a single field 'myFunction', as it is returned from the
+    --- C++ function registered via 'LuaEngine::registerProvider(...)'.
+    print(MyCppExtension.myFunction(1, 2))
+    \endcode
+
+    For more information on how to register C++ functionality, see
+    \l {https://sol2.readthedocs.io/en/latest/index.html} {sol2}.
+
+    \section1 Examples
+
+    \section2 Language Server
+
+    The \QC LuaLanguageClient Plugin provides support for registering your own Language Server
+    clients. You can find an example of how to use this in the \QC Extension "Lua Language Server"
+    and "Rust Language Server".
+*/
+
+/*!
+    \page lua-extension-meta-core
+    \ingroup lua-modules
+    \title Core.lua
+    \brief Access and interact with the core functionality of \QC.
+
+    \quotefile ../../../src/plugins/lua/meta/core.lua
+*/
+
+/*!
+    \page lua-extension-meta-action
+    \ingroup lua-modules
+    \title action.lua
+    \brief Create user interface actions in \QC.
+
+    \quotefile ../../../src/plugins/lua/meta/action.lua
+*/
+
+/*!
+    \page lua-extension-meta-async
+    \ingroup lua-modules
+    \title async.lua
+    \brief Handle asynchronouse operations with the async/await Lua API.
+
+    \quotefile ../../../src/plugins/lua/meta/async.lua
+*/
+
+/*!
+    \page lua-extension-meta-fetch
+    \ingroup lua-modules
+    \title fetch.lua
+    \brief Fetch data from the internet.
+
+    \quotefile ../../../src/plugins/lua/meta/fetch.lua
+*/
+
+/*!
+    \page lua-extension-meta-gui
+    \ingroup lua-modules
+    \title gui.lua
+    \brief Create user interfaces.
+
+    \quotefile ../../../src/plugins/lua/meta/gui.lua
+*/
+
+/*!
+    \page lua-extension-meta-lsp
+    \ingroup lua-modules
+    \title lsp.lua
+    \brief Register Language Server clients.
+
+    \quotefile ../../../src/plugins/lua/meta/lsp.lua
+*/
+
+/*!
+    \page lua-extension-meta-messagemanager
+    \ingroup lua-modules
+    \title messagemanager.lua
+    \brief Display messages to the user.
+
+    \quotefile ../../../src/plugins/lua/meta/messagemanager.lua
+*/
+
+/*!
+    \page lua-extension-meta-process
+    \ingroup lua-modules
+    \title process.lua
+    \brief Run external processes.
+
+    \quotefile ../../../src/plugins/lua/meta/process.lua
+*/
+
+/*!
+    \page lua-extension-meta-qt
+    \ingroup lua-modules
+    \title qt.lua
+    \brief Access Qt functionality.
+
+    \quotefile ../../../src/plugins/lua/meta/qt.lua
+*/
+
+/*!
+    \page lua-extension-meta-qtc
+    \ingroup lua-modules
+    \title qtc.lua
+    \brief Access and extend \QC.
+
+    \quotefile ../../../src/plugins/lua/meta/qtc.lua
+*/
+
+/*!
+    \page lua-extension-meta-settings
+    \ingroup lua-modules
+    \title settings.lua
+    \brief Read and write settings.
+
+    \quotefile ../../../src/plugins/lua/meta/settings.lua
+*/
+
+/*!
+    \page lua-extension-meta-simpletypes
+    \ingroup lua-modules
+    \title simpletypes.lua
+    \brief Access simple types.
+
+    \quotefile ../../../src/plugins/lua/meta/simpletypes.lua
+*/
+
+/*!
+    \page lua-extension-meta-utils
+    \ingroup lua-modules
+    \title utils.lua
+    \brief Common utility functions and classes.
+
+    \quotefile ../../../src/plugins/lua/meta/utils.lua
+*/
+
+
diff --git a/doc/qtcreatordev/src/plugin-metadata.qdoc b/doc/qtcreatordev/src/plugin-metadata.qdoc
index b233ef60bc6..20d4073fd14 100644
--- a/doc/qtcreatordev/src/plugin-metadata.qdoc
+++ b/doc/qtcreatordev/src/plugin-metadata.qdoc
@@ -323,6 +323,27 @@
     }
     \endcode
 
+    \section2 Other Meta Data
+
+    \table
+        \header
+            \li Key
+            \li Value Type
+            \li Meaning
+        \row
+            \li Mimetypes
+            \li String or array of strings
+            \li Possibly multiple lines of
+                \l{https://www.freedesktop.org/wiki/Specifications/shared-mime-info-spec/}{XML MIME-info}
+                used for registering additional or adapting built-in MIME types.
+        \row
+            \li JsonWizardPaths
+            \li Array of strings
+            \li A list of paths relative to the plugin location or paths to the
+                \l{The Qt Resource System}{Qt resource system} that are searched for
+                \l{http://doc.qt.io/qtcreator/creator-project-wizards.html}{template-based wizards}.
+    \endtable
+
     \section2 A Note on Plugin Versions
 
     Plugin versions are in the form \c{x.y.z_n} where, \c x, \c y, \c z and \c n are
diff --git a/doc/qtcreatordev/src/qtcreator-dev.qdoc b/doc/qtcreatordev/src/qtcreator-dev.qdoc
index 368298b31f0..998f040ebf7 100644
--- a/doc/qtcreatordev/src/qtcreator-dev.qdoc
+++ b/doc/qtcreatordev/src/qtcreator-dev.qdoc
@@ -138,7 +138,7 @@
 
     Most software projects and development processes require various external
     tools. Several external tools, such as popular version control systems and
-    build tool chains are integrated into \QC. However, it is impossible for a
+    build toolchains are integrated into \QC. However, it is impossible for a
     single tool to cover all the use cases, and therefore you can integrate
     additional tools to \QC.
 
@@ -214,7 +214,16 @@
         \li \l{Options Pages}
         \li \l{Editors}
         \endomit
-        \endlist
+    \endlist
+
+    \section1 Lua Extensions
+
+    If you have more specific needs that are not covered by the above methods but don't need
+    a full-blown plugin, you can extend \QC with Lua Extensions.
+
+    \list
+        \li \l{Extending \QC with Lua}
+    \endlist
 
     \section1 All Topics
 
diff --git a/doc/qtcreatordev/src/qtcreator-module.qdoc b/doc/qtcreatordev/src/qtcreator-module.qdoc
index 83d0b3fe157..652f715133a 100644
--- a/doc/qtcreatordev/src/qtcreator-module.qdoc
+++ b/doc/qtcreatordev/src/qtcreator-module.qdoc
@@ -92,7 +92,7 @@
                 handling.
 
         \row
-            \li \l{Debugger}
+            \li \l{Debugging}
             \li Debugging functionality.
 
         \row
diff --git a/doc/qtcreatordev/src/qtcreator-ui-text.qdoc b/doc/qtcreatordev/src/qtcreator-ui-text.qdoc
index f42c80671af..e76ad238e23 100644
--- a/doc/qtcreatordev/src/qtcreator-ui-text.qdoc
+++ b/doc/qtcreatordev/src/qtcreator-ui-text.qdoc
@@ -158,11 +158,11 @@
 
     \section3 Writing Tooltips in Design Mode
 
-    In Qt Designer, use plain text for tooltips. For extra formatting, write
+    In \QD, use plain text for tooltips. For extra formatting, write
     short, canonical HTML in the source tab of the rich text editor:
     \c {<html><head/><body><b>Note:</b> text.}
 
-    Qt Designer has a feature that simplifies the rich text (on by default),
+    \QD has a feature that simplifies the rich text (on by default),
     but still, you should verify by looking at the \uicontrol Source tab.
 
     \section2 Writing Messages
@@ -273,8 +273,36 @@
 
     \section2 Marking UI Text for Translation
 
-    Make sure the text strings presented to the user are easy to translate.
-    The user interface text strings are enclosed in \c tr() calls and
+    \section3 Translation Context
+
+    Avoid creating many different translation contexts. By default, \c tr()
+    uses the context of the class, which means that translations break when
+    code is refactored and UI text is moved to a different class.
+
+    Create a single translation context for each plugin instead. Create a header
+    \c myplugintr.h
+
+    \code
+    #pragma once
+
+    #include <QCoreApplication>
+
+    namespace MyPlugin {
+
+    struct Tr
+    {
+        Q_DECLARE_TR_FUNCTIONS(QtC::MyPlugin)
+    };
+
+    } // namespace MyPlugin
+    \endcode
+
+    and use that struct as the translation context for UI text by calling
+    \c {Tr::tr()}. Use disambiguation strings in cases that need it.
+
+    \section3 Translator Comments
+
+    The user interface text strings are enclosed in \c {Tr::tr()} calls and
     extracted from the source code during the translation process. Therefore,
     the translator might not know the source code context of the messages.
 
@@ -286,26 +314,24 @@
     return tr("Add");
     \endcode
 
-    If the class is not Q_OBJECT, use \c {QCoreApplication::translate("class
-    context", "message")} or consider using Q_DECLARE_TR_FUNCTIONS. Do not use
-    \c {QObject::tr()}, which is confusing because the messages appear grouped
-    by class context in Qt Linguist and messages tied to QObject do not have a
-    class context.
+    \section3 File Paths
 
-    Use \c{QDir::toNativeSeparators()} for file and directory names that you
-    pass to \c{tr().arg()}.
+    Use \c{FilePath::toUserOutput()} from the \c Utils library for file and directory
+    names that you pass to \c{Tr::tr().arg()}.
 
-    Do not use markup that spans the whole string because that can be confusing
+    \section3 Markup
+
+    Avoid including markup within the translated text itself because that can be confusing
     for translators. For example, instead of:
 
     \code
-    tr("<html><head/><body><span>UI Text</span></body></html>")
+    Tr::tr("<html><head/><body><span>UI Text</span></body></html>")
     \endcode
 
     use
 
     \code
-    QLatin1String("<html><head/><body><span>") + tr("UI Text") + QLatin1String("/span></body></html>")
+    "<html><head/><body><span>" + Tr::tr("UI Text") + "</span></body></html>"
     \endcode
 
     \section2 Features of Languages or Writing Systems
diff --git a/doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc b/doc/qtdesignstudio/src/how-to/qtdesignstudio-live-preview-desktop.qdoc
similarity index 75%
rename from doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc
rename to doc/qtdesignstudio/src/how-to/qtdesignstudio-live-preview-desktop.qdoc
index 7c43a918e73..b047265f09e 100644
--- a/doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc
+++ b/doc/qtdesignstudio/src/how-to/qtdesignstudio-live-preview-desktop.qdoc
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-    \previouspage creator-live-preview.html
-    \page creator-live-preview-desktop.html
+    \page studio-live-preview-desktop.html
+    \previouspage studio-live-preview.html
     \nextpage creator-live-preview-devices.html
 
     \title Previewing on Desktop
@@ -11,16 +11,9 @@
     To preview the currently active QML file on the desktop:
 
     \list
-        \if defined(qtcreator)
-        \li Select \inlineimage icons/live-preview.png (\uicontrol {Live Preview})
-            on the \l{Edit Mode}{editor} toolbar.
-            \image qtcreator-live-preview.webp {Application running on top of the editor view}
-        \li Select \uicontrol Build > \uicontrol {QML Preview}.
-    \endlist
-        \else
         \li Select the \uicontrol {Live Preview} button on the top toolbar.
         \li Press \key {Alt+P}.
-        \image studio-live-preview.webp
+            \image studio-live-preview.webp
     \endlist
 
     To preview any QML file in the project:
diff --git a/doc/qtdesignstudio/src/overviews/qtquick-live-preview.qdoc b/doc/qtdesignstudio/src/overviews/qtquick-live-preview.qdoc
new file mode 100644
index 00000000000..d286c41c7a1
--- /dev/null
+++ b/doc/qtdesignstudio/src/overviews/qtquick-live-preview.qdoc
@@ -0,0 +1,38 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+    \page studio-live-preview.html
+    \previouspage quick-states.html
+    \nextpage studio-live-preview-desktop.html
+
+    \title Validating with Target Hardware
+
+    Preview a UI file or the entire UI on the desktop, as well as on embedded
+    Linux devices to instantly view the changes you make to the UI. On Android
+    devices, the preview shows the snapshot of your project from the moment
+    you start the preview on the device, not your changes.
+
+    \image studio-live-preview.webp
+
+    Or, use \QDV to run applications in most widely-used web browsers on the
+    desktop and in mobile devices and share your designs with reviewers who
+    don't have \QC.
+
+    \list
+        \li \l{Previewing on Desktop}
+
+            Preview individual QML files or the whole UI.
+        \li \l{Previewing on Devices}
+
+            Connect your devices to your computer.
+
+        \li \l{Sharing Applications Online}
+
+            Share applications online and view them in a web browser.
+
+        \li \l{Viewing Applications on Android}
+
+           Preview \QDS projects with \QUV on an Android device.
+    \endlist
+*/
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-debugging.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-debugging.qdoc
index 9d1fa446aec..09cd1d0f584 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-debugging.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-debugging.qdoc
@@ -22,8 +22,10 @@
             \uicontrol Debug mode.
         \li \l{Profiling QML Applications}
 
-            You can use the QML Profiler to find causes for typical performance
+            You can use QML Profiler to find causes for typical performance
             problems in your UIs, such as slowness, freezing, and stuttering.
-            The QML Profiler is installed and configured as part of \QDS.
+            QML Profiler is installed and configured as part of \QDS.
     \endlist
+
+    \sa {Profile QML applications}
 */
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-implementing-applications.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-implementing-applications.qdoc
index 1f0aa086290..d19ede682f7 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-implementing-applications.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-implementing-applications.qdoc
@@ -41,7 +41,7 @@
             you can inspect the state of your UI while debugging.
 
             The memory and CPU power available on devices are limited and
-            you should use them carefully. The QML Profiler enables you to
-            profile Qt Quick UIs.
+            you should use them carefully. With QML Profiler, you can find
+            problems in QML code.
     \endlist
 */
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
index f116ab37d97..2584279e540 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
@@ -218,6 +218,9 @@
                             \endlist
                         \li \l{Debugging a Qt Quick Application}
                         \li \l{Profiling QML Applications}
+                            \list
+                                \li \l{Profile QML applications}
+                            \endlist
                     \endlist
             \endlist
         \li \l{Advanced Designer Topics}
diff --git a/doc/qtdesignstudio/src/views/qtquick-states.qdoc b/doc/qtdesignstudio/src/views/qtquick-states.qdoc
index 9f91c52f46f..ab31c93f464 100644
--- a/doc/qtdesignstudio/src/views/qtquick-states.qdoc
+++ b/doc/qtdesignstudio/src/views/qtquick-states.qdoc
@@ -4,7 +4,7 @@
 /*!
     \page quick-states.html
     \previouspage quick-json-data-properties.html
-    \nextpage creator-live-preview.html
+    \nextpage studio-live-preview.html
 
     \title Working with States
 
diff --git a/qbs/imports/QtcDocumentation.qbs b/qbs/imports/QtcDocumentation.qbs
index 3017114c8c4..c5ddf497206 100644
--- a/qbs/imports/QtcDocumentation.qbs
+++ b/qbs/imports/QtcDocumentation.qbs
@@ -12,6 +12,7 @@ Product {
     property string versionTag: qtc.qtcreator_version.replace(/\.|-/g, "")
 
     Qt.core.qdocEnvironment: [
+        "GENERATED_ATTRIBUTIONS_DIR=" + product.buildDirectory,
         "IDE_DISPLAY_NAME=" + qtc.ide_display_name,
         "IDE_CASED_ID=" + qtc.ide_cased_id,
         "IDE_ID=" + qtc.ide_id,
diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs
index d06f99385e4..f4ee221695f 100644
--- a/qbs/imports/QtcPlugin.qbs
+++ b/qbs/imports/QtcPlugin.qbs
@@ -46,6 +46,6 @@ QtcProduct {
     Export {
         Depends { name: "cpp" }
         Depends { name: "ExtensionSystem" }
-        cpp.includePaths: ".."
+        cpp.includePaths: exportingProduct.sourceDirectory + "/.."
     }
 }
diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js
index 0d3c5afb87a..a3c0198bda1 100644
--- a/qbs/modules/libclang/functions.js
+++ b/qbs/modules/libclang/functions.js
@@ -178,6 +178,7 @@ function toolingParameters(llvmConfig)
         "-Wno-unknown-warning",
         "-Wno-unused-command-line-argument",
         "-fPIC",
+        "-fno-rtti",
         "-pedantic",
         "-Wstring-conversion",
         "-gsplit-dwarf"
diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs
index 83ef2f88dfc..04016cbb25e 100644
--- a/qbs/modules/qtc/qtc.qbs
+++ b/qbs/modules/qtc/qtc.qbs
@@ -4,16 +4,16 @@ import qbs.FileInfo
 import qbs.Utilities
 
 Module {
-    property string qtcreator_display_version: '13.0.2'
+    property string qtcreator_display_version: '14.0.0-rc1'
     property string ide_version_major: '13'
     property string ide_version_minor: '0'
-    property string ide_version_release: '2'
+    property string ide_version_release: '84'
     property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.'
                                        + ide_version_release
 
     property string ide_compat_version_major: '13'
     property string ide_compat_version_minor: '0'
-    property string ide_compat_version_release: '0'
+    property string ide_compat_version_release: '84'
     property string qtcreator_compat_version: ide_compat_version_major + '.'
             + ide_compat_version_minor + '.' + ide_compat_version_release
 
diff --git a/qt_attributions.json b/qt_attributions.json
index 525338f20b8..4d5980f646d 100644
--- a/qt_attributions.json
+++ b/qt_attributions.json
@@ -181,7 +181,7 @@
         "Homepage": "https://invent.kde.org/frameworks/syntax-highlighting/-/tree/master/data/syntax",
         "License": "GNU General Public License v2.0 OR BSD 2-Clause \"Simplified\" License",
         "LicenseFile": "doc/qtcreator/src/overview/license-BSD-2-clause.txt",
-        "Copyright": "Copyright 2008 Darrin Yeager. http://www.dyeager.org/ Dual-Licensed under both GPL and BSD licenses. Extended 2009 Claes Holmerson. http://github.com/claes/kate-markdown/ Extended 2019 Nibaldo González S. <nibgonz@gmail.com> (changes under MIT license)."
+        "Copyright": "Copyright 2008 Darrin Yeager. http://www.dyeager.org/ Dual-Licensed under both GPL and BSD licenses. Extended 2009 Claes Holmerson. http://github.com/claes/kate-markdown/ Extended 2019 Nibaldo Gonz�lez S. <nibgonz@gmail.com> (changes under MIT license)."
     },
     {
         "Id": "ksyntaxhighlighting-modelines",
@@ -259,7 +259,7 @@
         "Homepage": "https://invent.kde.org/frameworks/syntax-highlighting/-/tree/master/data/syntax",
         "License": "GNU Lesser General Public License v2.0 or later",
         "LicenseFile": "doc/qtcreator/src/overview/license-LGPLv2.0.txt",
-        "Copyright": "Copyright (C) 2004 by Sebastian Vuorinen (sebastian dot vuorinen at helsinki dot fi). Copyright (C) 2004 by Stefan Lang (langstefan@gmx.at). Copyright (C) 2008 by Robin Pedersen (robinpeder@gmail.com). Copyright (C) 2011 by Miquel Sabaté (mikisabate@gmail.com)."
+        "Copyright": "Copyright (C) 2004 by Sebastian Vuorinen (sebastian dot vuorinen at helsinki dot fi). Copyright (C) 2004 by Stefan Lang (langstefan@gmx.at). Copyright (C) 2008 by Robin Pedersen (robinpeder@gmail.com). Copyright (C) 2011 by Miquel Sabat� (mikisabate@gmail.com)."
     },
     {
         "Id": "ksyntaxhighlighting-toml",
@@ -311,7 +311,7 @@
         "Homepage": "https://invent.kde.org/frameworks/syntax-highlighting/-/tree/master/data/syntax",
         "License": "GNU Lesser General Public License v2.1",
         "LicenseFile": "doc/qtcreator/src/overview/license-LGPLv2.1.txt",
-        "Copyright": "Copyright (C) 2004, Jan Villat <jan.villat@net2000.ch>. Changes by: 2018 Nibaldo González <nibgonz@gmail.com>, 2007 Sebastian Pipping <webmaster@hartwork.org>."
+        "Copyright": "Copyright (C) 2004, Jan Villat <jan.villat@net2000.ch>. Changes by: 2018 Nibaldo Gonz�lez <nibgonz@gmail.com>, 2007 Sebastian Pipping <webmaster@hartwork.org>."
     },
     {
         "Id": "ksyntaxhighlighting-yaml",
@@ -324,7 +324,7 @@
         "Homepage": "https://invent.kde.org/frameworks/syntax-highlighting/-/tree/master/data/syntax",
         "License": "GNU Lesser General Public License v2.1",
         "LicenseFile": "doc/qtcreator/src/overview/license-LGPLv2.1.txt",
-        "Copyright": "Copyright (C) Dr Orlovsky MA (dr.orlovsky@gmail.com), Nibaldo González (nibgonz@gmail.com)"
+        "Copyright": "Copyright (C) Dr Orlovsky MA (dr.orlovsky@gmail.com), Nibaldo Gonz�lez (nibgonz@gmail.com)"
     },
     {
         "Id": "std-span-martinmoene",
@@ -436,6 +436,7 @@
         "Path": "src/libs/3rdparty/winpty",
         "Description": "winpty is a Windows software package providing an interface similar to a Unix pty-master for communicating with Windows console programs.",
         "Homepage": "https://github.com/rprichard/winpty",
+        "Version": "7e59fe2d09",
         "License": "MIT License",
         "LicenseFile": "src/libs/3rdparty/winpty/LICENSE",
         "Copyright": "Copyright (c) 2011-2016 Ryan Prichard"
@@ -449,10 +450,25 @@
         "Path": "src/libs/3rdparty/libptyqt",
         "Description": "Pty-Qt is small library for access to console applications by pseudo-terminal interface on Mac, Linux and Windows.",
         "Homepage": "https://github.com/kafeg/ptyqt",
+        "Version" : "045ca5f09f",
         "License": "MIT License",
         "LicenseFile": "src/libs/3rdparty/libptyqt/LICENSE",
         "Copyright": "Copyright (c) 2019 Vitaly Petrov"
     },
+    {
+        "Id": "ptyqt-conpty",
+        "Name": "Pty-Qt/ConPty",
+        "QDocModule": "qtcreator",
+        "QtParts": ["tools"],
+        "QtUsage": "Used for the integrated terminal.",
+        "Path": "src/libs/3rdparty/libptyqt",
+        "Description": "Major parts of src/winconpty/ have been ported from microsofts terminal source code and integrated into ptyqt's conptyprocess.cpp.",
+        "Homepage": "https://github.com/microsoft/terminal",
+        "Version" : "a38388615e",
+        "License": "MIT License",
+        "LicenseFile": "src/libs/3rdparty/libptyqt/LICENSE-CONPTY",
+        "Copyright": "Copyright (c) Microsoft Corporation"
+    },
     {
         "Id": "libvterm",
         "Name": "libvterm",
@@ -462,6 +478,7 @@
         "Path": "src/libs/3rdparty/libvterm",
         "Description": "An abstract C99 library which implements a VT220 or xterm-like terminal emulator.",
         "Homepage": "https://www.leonerd.org.uk/code/libvterm",
+        "Version" : "0.3.3",
         "License": "MIT License",
         "LicenseFile": "src/libs/3rdparty/libvterm/LICENSE",
         "Copyright": "Copyright (c) 2008 Paul Evans"
@@ -475,6 +492,7 @@
         "Path": "src/plugins/terminal/shellintegrations",
         "Description": "Scripts for integrating with various shells.",
         "Homepage": "https://github.com/microsoft/vscode/tree/main/src/vs/workbench/contrib/terminal/browser/media",
+        "Version" : "463d9933a4",
         "License": "MIT License",
         "LicenseFile": "src/plugins/terminal/shellintegrations/LICENSE.vscode",
         "Copyright": "Copyright (c) 2015 - present Microsoft Corporation"
@@ -488,6 +506,7 @@
         "Path": "src/plugins/terminal/shellintegrations",
         "Description": "A library of Lua scripts for use with Clink.",
         "Homepage": "https://github.com/chrisant996/clink-gizmos",
+        "Version" : "680716f3d9",
         "License": "MIT License",
         "LicenseFile": "src/plugins/terminal/shellintegrations/LICENSE.clink",
         "Copyright": "Copyright (c) 2022 Chris Antos"
@@ -544,6 +563,74 @@
         "LicenseFile": "src/libs/3rdparty/qtkeychain/COPYING",
         "Copyright": "Copyright (C) 2011-2015 Frank Osterfeld, Copyright (C) 2016 Mathias Hasselmann"
     },
+    {
+        "Id": "pyprof2calltree",
+        "Name": "pyprof2calltree",
+        "QDocModule": "qtcreator",
+        "QtParts": ["tools"],
+        "QtUsage": "Used for converting profile data of debugger dumper execution to kcachegrind-compatible input in visualize.py",
+        "Path": "share/qtcreator/debugger",
+        "Description": "Creates python profiling output which is readable by kcachegrind",
+        "Homepage": "https://github.com/pwaller/pyprof2calltree",
+        "License": "MIT License",
+        "LicenseId": "MIT",
+        "LicenseFile": "share/qtcreator/debugger/LICENSE.MIT",
+        "Copyright": "Copyright(C) 2006-2008, David Allouche, Jp Calderone, Itamar Shtull-Trauring, Copyright(C) 2006-2017, Johan Dahlin, Copyright(C) 2008, Olivier Grisel <olivier.grisel@ensta.org>, Copyright(C) 2008, David Glick, Copyright(C) 2013, Steven Maude, Copyright(C) 2013-2018, Peter Waller <p@pwaller.net>, Copyright(C) 2013, Lukas Graf <lukas.graf@4teamwork.ch>, Copyright(C) 2013, Jamie Wong <http://jamie-wong.com>, Copyright(C) 2013, Yury V. Zaytsev <yury@shurup.com>, Copyright(C) 2014, Michael Droettboom <mdroe@stsci.edu>, Copyright(C) 2015, Zev Benjamin <zev@mit.edu>, Copyright(C) 2018, Jon Dufresne <jon.dufresne@gmail.com>"
+    },
+    {
+        "Id": "lua",
+        "Name": "Lua",
+        "QDocModule": "qtcreator",
+        "QtParts": ["tools"],
+        "QtUsage": "Used for scripting plugins.",
+        "Path": "src/libs/3rdparty/lua",
+        "Description": "Lua is a powerful, efficient, lightweight, embeddable scripting language.",
+        "Homepage": "https://www.lua.org/",
+        "License": "MIT License",
+        "LicenseFile": "src/libs/3rdparty/lua/LICENSE",
+        "Copyright": "Copyright � 1994-2023 Lua.org, PUC-Rio.",
+        "Version": "5.4.6"
+    },
+    {
+        "Id": "sol2",
+        "Name": "sol2",
+        "QDocModule": "qtcreator",
+        "QtParts": ["tools"],
+        "QtUsage": "Used for binding C++ and Lua.",
+        "Path": "src/libs/3rdparty/sol2",
+        "Description": "sol2 is a C++ library binding to Lua.",
+        "Homepage": "https://github.com/ThePhD/sol2",
+        "License": "MIT License",
+        "LicenseFile": "src/libs/3rdparty/sol2/LICENSE.txt",
+        "Copyright": "Copyright (c) 2008 Paul Evans",
+        "Version": "3.3.1 (revision 9c882a28)"
+    },
+    {
+        "Id": "ms-jpq-lua-async-await",
+        "Name": "ms-jpq/lua-async-await",
+        "QDocModule": "qtcreator",
+        "QtParts": ["tools"],
+        "QtUsage": "Used for async/await support in Lua modules.",
+        "Path": "src/plugins/lua/bindings",
+        "Description": "lua-async-await implements the async/await pattern in Lua.",
+        "Homepage": "https://github.com/ms-jpq/lua-async-await",
+        "License": "MIT License",
+        "LicenseFile": "src/plugins/lua/bindings/ASYNC-LICENSE.txt",
+        "Copyright": "Copyright (c) 2008 Paul Evans"
+    },
+    {
+        "Id": "kikito/inspect.lua",
+        "Name": "kikito/inspect.lua",
+        "QDocModule": "qtcreator",
+        "QtParts": ["tools"],
+        "QtUsage": "Used for pretty printing from Lua scripts.",
+        "Path": "share/qtcreator/lua-plugins/luatests",
+        "Description": "inspect.lua is a library for pretty printing complex objects in Lua.",
+        "Homepage": "https://github.com/kikito/inspect.lua",
+        "License": "MIT License",
+        "LicenseFile": "share/qtcreator/lua-plugins/luatests/INSPECT-LICENSE.txt",
+        "Copyright": "Copyright (c) 2022 Enrique Garc�a Cota"
+    },
     {
         "Id": "zlib",
         "Name": "ZLib",
@@ -559,3 +646,4 @@
         "Copyright": "Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler"
     }
 ]
+
diff --git a/scripts/build.py b/scripts/build.py
index 66d5d25d43a..094cc9d6c4b 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (C) 2020 The Qt Company Ltd.
+# Copyright (C) 2024 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 # import the print function which is used in python 3.x
@@ -295,12 +295,15 @@ def package_qtcreator(args, paths):
                                          '*'],
                                         paths.debug_install)
         if common.is_windows_platform():
-            common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads,
+            # use -mf=off to avoid usage of the ARM executable compression filter,
+            # which cannot be extracted by the p7zip version on the machine doing
+            # the repository builds
+            common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads, '-mf=off',
                                      os.path.join(paths.result, 'wininterrupt' + args.zip_infix + '.7z'),
                                      '*'],
                                     paths.wininterrupt_install)
             if not args.no_cdb:
-                common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads,
+                common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads, '-mf=off',
                                          os.path.join(paths.result, 'qtcreatorcdbext' + args.zip_infix + '.7z'),
                                          '*'],
                                         paths.qtcreatorcdbext_install)
diff --git a/share/metainfo/org.qt-project.qtcreator.appdata.xml.cmakein b/share/metainfo/org.qt-project.qtcreator.appdata.xml.cmakein
index 4d8aabf31cf..3de14afcf39 100644
--- a/share/metainfo/org.qt-project.qtcreator.appdata.xml.cmakein
+++ b/share/metainfo/org.qt-project.qtcreator.appdata.xml.cmakein
@@ -3,7 +3,10 @@
 <component type="desktop">
  <id>org.qt-project.qtcreator</id>
  <name>Qt Creator</name>
- <summary>Provides a cross-platform, complete integrated development environment (IDE) for application developers to create applications for multiple platforms and devices</summary>
+ <developer id="org.qt-project">
+   <name>Qt Project</name>
+ </developer>
+ <summary>Cross-platform integrated development environment (IDE)</summary>
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-3.0</project_license>
  <description>
@@ -23,16 +26,27 @@
    newcomers to Qt.
   </p>
  </description>
+ <launchable type="desktop-id">org.qt-project.qtcreator.desktop</launchable>
 
  <url type="homepage">https://www.qt.io/product/development-tools</url>
  <project_group>Qt</project_group>
  <content_rating type="oars-1.1" />
  <screenshots>
+  <screenshot type="default">
+   <caption>Application development life-cycle</caption>
+   <image>https://doc.qt.io/qtcreator/images/qt-app-dev-flow.webp</image>
+  </screenshot>
   <screenshot>
+   <caption>Overview</caption>
    <image>https://doc.qt.io/qtcreator/images/qtcreator-breakdown.png</image>
   </screenshot>
   <screenshot>
-   <image>https://doc.qt.io/qtcreator/images/qtcreator-gs-build-example-open.png</image>
+   <caption>Examples</caption>
+   <image>https://doc.qt.io/qtcreator/images/qtcreator-examples-open.webp</image>
+  </screenshot>
+  <screenshot>
+   <caption>Code editor</caption>
+   <image>https://doc.qt.io/qtcreator/images/qtcreator-spliteditorview.png</image>
   </screenshot>
  </screenshots>
  <releases>
@@ -40,6 +54,7 @@
    <description>
     <p>Qt Creator v${IDE_VERSION_DISPLAY}</p>
    </description>
+   <url>https://github.com/qt-creator/qt-creator/releases/tag/v${IDE_VERSION_DISPLAY}</url>
   </release>
  </releases>
 </component>
diff --git a/share/qtcreator/CMakeLists.txt b/share/qtcreator/CMakeLists.txt
index f8be01a7a7b..6a18147f9fd 100644
--- a/share/qtcreator/CMakeLists.txt
+++ b/share/qtcreator/CMakeLists.txt
@@ -3,6 +3,8 @@ set(resource_directories
   cplusplus
   glsl
   indexer_preincludes
+  jsonschemas
+  lua-plugins
   modeleditor
   qmldesigner
   qmlicons
@@ -18,6 +20,7 @@ set(resource_files
   debugger/.pylintrc
   debugger/boosttypes.py
   debugger/cdbbridge.py
+  debugger/cdbext.pyi
   debugger/creatortypes.py
   debugger/dumper.py
   debugger/gdbbridge.py
diff --git a/share/qtcreator/cplusplus/examples/CMakeLists.txt b/share/qtcreator/cplusplus/examples/CMakeLists.txt
index 7d14eba5b98..5eafcab4e0b 100644
--- a/share/qtcreator/cplusplus/examples/CMakeLists.txt
+++ b/share/qtcreator/cplusplus/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 
 project(examples LANGUAGES CXX)
 
diff --git a/share/qtcreator/debugger/python2/README.txt b/share/qtcreator/debugger-with-python2/README.txt
similarity index 100%
rename from share/qtcreator/debugger/python2/README.txt
rename to share/qtcreator/debugger-with-python2/README.txt
diff --git a/share/qtcreator/debugger/python2/android_stdtypes.py b/share/qtcreator/debugger-with-python2/android_stdtypes.py
similarity index 100%
rename from share/qtcreator/debugger/python2/android_stdtypes.py
rename to share/qtcreator/debugger-with-python2/android_stdtypes.py
diff --git a/share/qtcreator/debugger/python2/boosttypes.py b/share/qtcreator/debugger-with-python2/boosttypes.py
similarity index 100%
rename from share/qtcreator/debugger/python2/boosttypes.py
rename to share/qtcreator/debugger-with-python2/boosttypes.py
diff --git a/share/qtcreator/debugger/python2/cdbbridge.py b/share/qtcreator/debugger-with-python2/cdbbridge.py
similarity index 100%
rename from share/qtcreator/debugger/python2/cdbbridge.py
rename to share/qtcreator/debugger-with-python2/cdbbridge.py
diff --git a/share/qtcreator/debugger/python2/creatortypes.py b/share/qtcreator/debugger-with-python2/creatortypes.py
similarity index 100%
rename from share/qtcreator/debugger/python2/creatortypes.py
rename to share/qtcreator/debugger-with-python2/creatortypes.py
diff --git a/share/qtcreator/debugger/python2/dumper.py b/share/qtcreator/debugger-with-python2/dumper.py
similarity index 100%
rename from share/qtcreator/debugger/python2/dumper.py
rename to share/qtcreator/debugger-with-python2/dumper.py
diff --git a/share/qtcreator/debugger/python2/gdbbridge.py b/share/qtcreator/debugger-with-python2/gdbbridge.py
similarity index 99%
rename from share/qtcreator/debugger/python2/gdbbridge.py
rename to share/qtcreator/debugger-with-python2/gdbbridge.py
index d61160eed3b..9699e518fe3 100644
--- a/share/qtcreator/debugger/python2/gdbbridge.py
+++ b/share/qtcreator/debugger-with-python2/gdbbridge.py
@@ -772,7 +772,7 @@ class Dumper(DumperBase):
 
     def makeStdString(init):
         # Works only for small allocators, but they are usually empty.
-        gdb.execute('set $d=(std::string*)calloc(sizeof(std::string), 2)')
+        gdb.execute('set $d=(std::string*)calloc(2, sizeof(std::string))')
         gdb.execute('call($d->basic_string("' + init +
                     '",*(std::allocator<char>*)(1+$d)))')
         value = gdb.parse_and_eval('$d').dereference()
@@ -787,7 +787,7 @@ class Dumper(DumperBase):
         h = self.hexencode(data)
         #DumperBase.warn('DATA: %s' % h)
         string = ''.join('\\x' + h[2 * i:2 * i + 2] for i in range(size))
-        exp = '(%s*)memcpy(calloc(%d, 1), "%s", %d)' \
+        exp = '(%s*)memcpy(calloc(1, %d), "%s", %d)' \
             % (value.type.name, size, string, size)
         #DumperBase.warn('EXP: %s' % exp)
         res = gdb.parse_and_eval(exp)
diff --git a/share/qtcreator/debugger/python2/gdbtracepoint.py b/share/qtcreator/debugger-with-python2/gdbtracepoint.py
similarity index 100%
rename from share/qtcreator/debugger/python2/gdbtracepoint.py
rename to share/qtcreator/debugger-with-python2/gdbtracepoint.py
diff --git a/share/qtcreator/debugger/python2/libcpp_stdtypes.py b/share/qtcreator/debugger-with-python2/libcpp_stdtypes.py
similarity index 100%
rename from share/qtcreator/debugger/python2/libcpp_stdtypes.py
rename to share/qtcreator/debugger-with-python2/libcpp_stdtypes.py
diff --git a/share/qtcreator/debugger/python2/lldbbridge.py b/share/qtcreator/debugger-with-python2/lldbbridge.py
similarity index 100%
rename from share/qtcreator/debugger/python2/lldbbridge.py
rename to share/qtcreator/debugger-with-python2/lldbbridge.py
diff --git a/share/qtcreator/debugger/python2/misctypes.py b/share/qtcreator/debugger-with-python2/misctypes.py
similarity index 100%
rename from share/qtcreator/debugger/python2/misctypes.py
rename to share/qtcreator/debugger-with-python2/misctypes.py
diff --git a/share/qtcreator/debugger/python2/opencvtypes.py b/share/qtcreator/debugger-with-python2/opencvtypes.py
similarity index 100%
rename from share/qtcreator/debugger/python2/opencvtypes.py
rename to share/qtcreator/debugger-with-python2/opencvtypes.py
diff --git a/share/qtcreator/debugger/python2/pdbbridge.py b/share/qtcreator/debugger-with-python2/pdbbridge.py
similarity index 100%
rename from share/qtcreator/debugger/python2/pdbbridge.py
rename to share/qtcreator/debugger-with-python2/pdbbridge.py
diff --git a/share/qtcreator/debugger/python2/personaltypes.py b/share/qtcreator/debugger-with-python2/personaltypes.py
similarity index 100%
rename from share/qtcreator/debugger/python2/personaltypes.py
rename to share/qtcreator/debugger-with-python2/personaltypes.py
diff --git a/share/qtcreator/debugger/python2/qttypes.py b/share/qtcreator/debugger-with-python2/qttypes.py
similarity index 100%
rename from share/qtcreator/debugger/python2/qttypes.py
rename to share/qtcreator/debugger-with-python2/qttypes.py
diff --git a/share/qtcreator/debugger/python2/stdtypes.py b/share/qtcreator/debugger-with-python2/stdtypes.py
similarity index 99%
rename from share/qtcreator/debugger/python2/stdtypes.py
rename to share/qtcreator/debugger-with-python2/stdtypes.py
index c14812dee1d..8bc86671c69 100644
--- a/share/qtcreator/debugger/python2/stdtypes.py
+++ b/share/qtcreator/debugger-with-python2/stdtypes.py
@@ -850,7 +850,7 @@ def qedit__std__vector(d, value, data):
     values = data.split(',')
     n = len(values)
     innerType = value.type[0].name
-    cmd = "set $d = (%s*)calloc(sizeof(%s)*%s,1)" % (innerType, innerType, n)
+    cmd = "set $d = (%s*)calloc(%s,sizeof(%s))" % (innerType, n, innerType)
     gdb.execute(cmd)
     cmd = "set {void*[3]}%s = {$d, $d+%s, $d+%s}" % (value.address(), n, n)
     gdb.execute(cmd)
diff --git a/share/qtcreator/debugger/python2/utils.py b/share/qtcreator/debugger-with-python2/utils.py
similarity index 100%
rename from share/qtcreator/debugger/python2/utils.py
rename to share/qtcreator/debugger-with-python2/utils.py
diff --git a/share/qtcreator/debugger/LICENSE.MIT b/share/qtcreator/debugger/LICENSE.MIT
new file mode 100644
index 00000000000..6dee3d0a7f9
--- /dev/null
+++ b/share/qtcreator/debugger/LICENSE.MIT
@@ -0,0 +1,20 @@
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff --git a/share/qtcreator/debugger/cdbbridge.py b/share/qtcreator/debugger/cdbbridge.py
index b5fc683cbae..afb757ff421 100644
--- a/share/qtcreator/debugger/cdbbridge.py
+++ b/share/qtcreator/debugger/cdbbridge.py
@@ -7,6 +7,7 @@ import sys
 import cdbext
 import re
 import threading
+import time
 from utils import TypeCode
 
 sys.path.insert(1, os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))
@@ -75,12 +76,21 @@ class Dumper(DumperBase):
         self.outputLock = threading.Lock()
         self.isCdb = True
 
-    def enumValue(self, nativeValue):
+    #FIXME
+    def register_known_qt_types(self):
+        DumperBase.register_known_qt_types(self)
+        typeid = self.typeid_for_string('@QVariantMap')
+        del self.type_code_cache[typeid]
+        del self.type_target_cache[typeid]
+        del self.type_size_cache[typeid]
+        del self.type_alignment_cache[typeid]
+
+    def enumValue(self, nativeValue: cdbext.Value) -> str:
         val = nativeValue.nativeDebuggerValue()
         # remove '0n' decimal prefix of the native cdb value output
         return val.replace('(0n', '(')
 
-    def fromNativeValue(self, nativeValue):
+    def fromNativeValue(self, nativeValue: cdbext.Value) -> DumperBase.Value:
         self.check(isinstance(nativeValue, cdbext.Value))
         val = self.Value(self)
         val.name = nativeValue.name()
@@ -114,15 +124,16 @@ class Dumper(DumperBase):
                     pass
         if nativeValue.type().code() == TypeCode.Enum:
             val.ldisplay = self.enumValue(nativeValue)
-        elif not nativeValue.type().resolved and nativeValue.type().code() == TypeCode.Struct and not nativeValue.hasChildren():
+        elif not nativeValue.type().resolved() and nativeValue.type().code() == TypeCode.Struct and not nativeValue.hasChildren():
             val.ldisplay = self.enumValue(nativeValue)
         val.isBaseClass = val.name == nativeValue.type().name()
+        val.typeid = self.from_native_type(nativeValue.type())
         val.nativeValue = nativeValue
         val.laddress = nativeValue.address()
         val.lbitsize = nativeValue.bitsize()
         return val
 
-    def nativeTypeId(self, nativeType):
+    def nativeTypeId(self, nativeType: cdbext.Type) -> str:
         self.check(isinstance(nativeType, cdbext.Type))
         name = nativeType.name()
         if name is None or len(name) == 0:
@@ -137,14 +148,10 @@ class Dumper(DumperBase):
                               for f in nativeType.fields()])
         return typeId
 
-    def nativeValueType(self, nativeValue):
-        return self.fromNativeType(nativeValue.type())
-
-    def fromNativeType(self, nativeType):
+    def from_native_type(self, nativeType: cdbext.Type) -> str:
         self.check(isinstance(nativeType, cdbext.Type))
-        typeId = self.nativeTypeId(nativeType)
-        if self.typeData.get(typeId, None) is not None:
-            return self.Type(self, typeId)
+        typeid = self.typeid_for_string(self.nativeTypeId(nativeType))
+        self.type_nativetype_cache[typeid] = nativeType
 
         if nativeType.name().startswith('void'):
             nativeType = FakeVoidType(nativeType.name(), self)
@@ -154,83 +161,76 @@ class Dumper(DumperBase):
             if nativeType.name().startswith('<function>'):
                 code = TypeCode.Function
             elif nativeType.targetName() != nativeType.name():
-                return self.createPointerType(nativeType.targetName())
+                return self.create_pointer_typeid(self.typeid_for_string(nativeType.targetName()))
 
         if code == TypeCode.Array:
             # cdb reports virtual function tables as arrays those ar handled separetly by
             # the DumperBase. Declare those types as structs prevents a lookup to a
             # none existing type
             if not nativeType.name().startswith('__fptr()') and not nativeType.name().startswith('<gentype '):
-                targetName = nativeType.targetName()
-                count = nativeType.arrayElements()
-                if targetName.endswith(']'):
-                    (prefix, suffix, inner_count) = self.splitArrayType(targetName)
-                    type_name = '%s[%d][%d]%s' % (prefix, count, inner_count, suffix)
-                else:
-                    type_name = '%s[%d]' % (targetName, count)
-                tdata = self.TypeData(self, typeId)
-                tdata.name = type_name
-                tdata.code = TypeCode.Array
-                tdata.ltarget = targetName
-                tdata.lbitsize = lambda: nativeType.bitsize()
-                return self.Type(self, typeId)
+                targetName = nativeType.targetName().strip()
+                self.type_name_cache[typeid] = nativeType.name()
+                self.type_code_cache[typeid] = code
+                self.type_target_cache[typeid] = self.typeid_for_string(targetName)
+                if nativeType.resolved():
+                    self.type_size_cache[typeid] = nativeType.bitsize() // 8
+                return typeid
 
             code = TypeCode.Struct
 
-        tdata = self.TypeData(self, typeId)
-        tdata.name = nativeType.name()
-        tdata.lbitsize = lambda: nativeType.bitsize()
-        tdata.code = code
-        tdata.moduleName = lambda: nativeType.module()
-        if code == TypeCode.Struct:
-            tdata.lfields = lambda value: \
-                self.listFields(nativeType, value)
-            tdata.lalignment = lambda: \
-                self.nativeStructAlignment(nativeType)
-        tdata.enumDisplay = lambda intval, addr, form: \
+        self.type_name_cache[typeid] = nativeType.name()
+        if nativeType.resolved():
+            self.type_size_cache[typeid] = nativeType.bitsize() // 8
+            self.type_modulename_cache[typeid] = nativeType.module()
+        self.type_code_cache[typeid] = code
+        self.type_enum_display_cache[typeid] = lambda intval, addr, form: \
             self.nativeTypeEnumDisplay(nativeType, intval, form)
-        tdata.templateArguments = lambda: \
-            self.listTemplateParameters(nativeType.name())
-        return self.Type(self, typeId)
+        return typeid
 
-    def listNativeValueChildren(self, nativeValue):
+    def listNativeValueChildren(self, nativeValue: cdbext.Value, include_bases: bool):
+        fields = []
         index = 0
         nativeMember = nativeValue.childFromIndex(index)
         while nativeMember:
+            # Why this restriction to things with address? Can't nativeValue
+            # be e.g. located in registers, without address?
             if nativeMember.address() != 0:
-                yield self.fromNativeValue(nativeMember)
+                if include_bases or nativeMember.name() != nativeMember.type().name():
+                    field = self.fromNativeValue(nativeMember)
+                    fields.append(field)
             index += 1
             nativeMember = nativeValue.childFromIndex(index)
+        return fields
 
-    def listValueChildren(self, value):
+    def listValueChildren(self, value: DumperBase.Value, include_bases=True):
         nativeValue = value.nativeValue
         if nativeValue is None:
             nativeValue = cdbext.createValue(value.address(), self.lookupNativeType(value.type.name, 0))
-        return self.listNativeValueChildren(nativeValue)
+        return self.listNativeValueChildren(nativeValue, include_bases)
 
-    def listFields(self, nativeType, value):
+    def nativeListMembers(self, value: DumperBase.Value, native_type: cdbext.Type, include_bases: bool):
         nativeValue = value.nativeValue
         if nativeValue is None:
-            nativeValue = cdbext.createValue(value.address(), nativeType)
-        return self.listNativeValueChildren(nativeValue)
+            nativeValue = cdbext.createValue(value.address(), native_type)
+        return self.listNativeValueChildren(nativeValue, include_bases)
 
-    def nativeStructAlignment(self, nativeType):
+    def nativeStructAlignment(self, nativeType: cdbext.Type) -> int:
         #DumperBase.warn("NATIVE ALIGN FOR %s" % nativeType.name)
         def handleItem(nativeFieldType, align):
-            a = self.fromNativeType(nativeFieldType).alignment()
+            a = self.type_alignment(self.from_native_type(nativeFieldType))
             return a if a > align else align
         align = 1
         for f in nativeType.fields():
             align = handleItem(f.type(), align)
         return align
 
-    def nativeTypeEnumDisplay(self, nativeType, intval, form):
+    def nativeTypeEnumDisplay(self, nativeType: cdbext.Type, intval: int, form) -> str:
         value = self.nativeParseAndEvaluate('(%s)%d' % (nativeType.name(), intval))
         if value is None:
             return ''
         return self.enumValue(value)
 
-    def enumExpression(self, enumType, enumValue):
+    def enumExpression(self, enumType: str, enumValue: str) -> str:
         ns = self.qtNamespace()
         return ns + "Qt::" + enumType + "(" \
             + ns + "Qt::" + enumType + "::" + enumValue + ")"
@@ -238,25 +238,25 @@ class Dumper(DumperBase):
     def pokeValue(self, typeName, *args):
         return None
 
-    def parseAndEvaluate(self, exp):
+    def parseAndEvaluate(self, exp: str) -> DumperBase.Value:
         return self.fromNativeValue(self.nativeParseAndEvaluate(exp))
 
-    def nativeParseAndEvaluate(self, exp):
+    def nativeParseAndEvaluate(self, exp: str) -> cdbext.Value:
         return cdbext.parseAndEvaluate(exp)
 
-    def isWindowsTarget(self):
+    def isWindowsTarget(self) -> bool:
         return True
 
-    def isQnxTarget(self):
+    def isQnxTarget(self) -> bool:
         return False
 
-    def isArmArchitecture(self):
+    def isArmArchitecture(self) -> bool:
         return False
 
-    def isMsvcTarget(self):
+    def isMsvcTarget(self) -> bool:
         return True
 
-    def qtCoreModuleName(self):
+    def qtCoreModuleName(self) -> str:
         modules = cdbext.listOfModules()
         # first check for an exact module name match
         for coreName in ['Qt6Core', 'Qt6Cored', 'Qt5Cored', 'Qt5Core', 'QtCored4', 'QtCore4']:
@@ -272,7 +272,7 @@ class Dumper(DumperBase):
                 return coreName
         return None
 
-    def qtDeclarativeModuleName(self):
+    def qtDeclarativeModuleName(self) -> str:
         modules = cdbext.listOfModules()
         for declarativeModuleName in ['Qt6Qmld', 'Qt6Qml', 'Qt5Qmld', 'Qt5Qml']:
             if declarativeModuleName in modules:
@@ -285,7 +285,7 @@ class Dumper(DumperBase):
             return declarativeModuleName
         return None
 
-    def qtHookDataSymbolName(self):
+    def qtHookDataSymbolName(self) -> str:
         hookSymbolName = 'qtHookData'
         coreModuleName = self.qtCoreModuleName()
         if coreModuleName is not None:
@@ -299,7 +299,7 @@ class Dumper(DumperBase):
         self.qtHookDataSymbolName = lambda: hookSymbolName
         return hookSymbolName
 
-    def qtDeclarativeHookDataSymbolName(self):
+    def qtDeclarativeHookDataSymbolName(self) -> str:
         hookSymbolName = 'qtDeclarativeHookData'
         declarativeModuleName = self.qtDeclarativeModuleName()
         if declarativeModuleName is not None:
@@ -314,27 +314,7 @@ class Dumper(DumperBase):
         self.qtDeclarativeHookDataSymbolName = lambda: hookSymbolName
         return hookSymbolName
 
-    def qtNamespace(self):
-        namespace = ''
-        qstrdupSymbolName = '*qstrdup'
-        coreModuleName = self.qtCoreModuleName()
-        if coreModuleName is not None:
-            qstrdupSymbolName = '%s!%s' % (coreModuleName, qstrdupSymbolName)
-            resolved = cdbext.resolveSymbol(qstrdupSymbolName)
-            if resolved:
-                name = resolved[0].split('!')[1]
-                namespaceIndex = name.find('::')
-                if namespaceIndex > 0:
-                    namespace = name[:namespaceIndex + 2]
-            self.qtNamespace = lambda: namespace
-            self.qtCustomEventFunc = self.parseAndEvaluate(
-                '%s!%sQObject::customEvent' %
-                (self.qtCoreModuleName(), namespace)).address()
-        self.qtNamespace = lambda: namespace
-        return namespace
-
-    def qtVersion(self):
-        qtVersion = None
+    def extractQtVersion(self) -> int:
         try:
             qtVersion = self.parseAndEvaluate(
                 '((void**)&%s)[2]' % self.qtHookDataSymbolName()).integer()
@@ -346,13 +326,10 @@ class Dumper(DumperBase):
                     (major, minor, patch) = version.decode('latin1').split('.')
                     qtVersion = 0x10000 * int(major) + 0x100 * int(minor) + int(patch)
                 except:
-                    pass
-        if qtVersion is None:
-            qtVersion = self.fallbackQtVersion
-        self.qtVersion = lambda: qtVersion
+                    return None
         return qtVersion
 
-    def putVtableItem(self, address):
+    def putVtableItem(self, address: int):
         funcName = cdbext.getNameByAddress(address)
         if funcName is None:
             self.putItem(self.createPointerValue(address, 'void'))
@@ -361,7 +338,7 @@ class Dumper(DumperBase):
             self.putType('void*')
             self.putAddress(address)
 
-    def putVTableChildren(self, item, itemCount):
+    def putVTableChildren(self, item: DumperBase.Value, itemCount: int) -> int:
         p = item.address()
         for i in range(itemCount):
             deref = self.extractPointer(p)
@@ -373,12 +350,12 @@ class Dumper(DumperBase):
                 p += self.ptrSize()
         return itemCount
 
-    def ptrSize(self):
+    def ptrSize(self) -> int:
         size = cdbext.pointerSize()
         self.ptrSize = lambda: size
         return size
 
-    def stripQintTypedefs(self, typeName):
+    def stripQintTypedefs(self, typeName: str) -> str:
         if typeName.startswith('qint'):
             prefix = ''
             size = typeName[4:]
@@ -398,21 +375,7 @@ class Dumper(DumperBase):
         else:
             return typeName
 
-    def lookupType(self, typeNameIn, module=0):
-        if len(typeNameIn) == 0:
-            return None
-        typeName = self.stripQintTypedefs(typeNameIn)
-        if self.typeData.get(typeName, None) is None:
-            nativeType = self.lookupNativeType(typeName, module)
-            if nativeType is None:
-                return None
-            _type = self.fromNativeType(nativeType)
-            if _type.typeId != typeName:
-                self.registerTypeAlias(_type.typeId, typeName)
-            return _type
-        return self.Type(self, typeName)
-
-    def lookupNativeType(self, name, module=0):
+    def lookupNativeType(self, name: str, module=0) -> cdbext.Type:
         if name.startswith('void'):
             return FakeVoidType(name, self)
         return cdbext.lookupType(name, module)
@@ -420,13 +383,13 @@ class Dumper(DumperBase):
     def reportResult(self, result, args):
         cdbext.reportResult('result={%s}' % result)
 
-    def readRawMemory(self, address, size):
+    def readRawMemory(self, address: int, size: int) -> int:
         mem = cdbext.readRawMemory(address, size)
         if len(mem) != size:
             raise Exception("Invalid memory request: %d bytes from 0x%x" % (size, address))
         return mem
 
-    def findStaticMetaObject(self, type):
+    def findStaticMetaObject(self, type: DumperBase.Type) -> int:
         ptr = 0
         if type.moduleName is not None:
             # Try to find the static meta object in the same module as the type definition. This is
@@ -439,10 +402,8 @@ class Dumper(DumperBase):
             ptr = cdbext.getAddressByName(type.name + '::staticMetaObject')
         return ptr
 
-    def warn(self, msg):
-        self.put('{name="%s",value="",type="",numchild="0"},' % msg)
-
     def fetchVariables(self, args):
+        start_time = time.perf_counter()
         self.resetStats()
         (ok, res) = self.tryFetchInterpreterVariables(args)
         if ok:
@@ -458,13 +419,17 @@ class Dumper(DumperBase):
         self.anonNumber = 0
 
         variables = []
-        for val in cdbext.listOfLocals(self.partialVariable):
-            dumperVal = self.fromNativeValue(val)
-            dumperVal.lIsInScope = dumperVal.name not in self.uninitialized
-            variables.append(dumperVal)
+        try:
+            for val in cdbext.listOfLocals(self.partialVariable):
+                dumperVal = self.fromNativeValue(val)
+                dumperVal.lIsInScope = dumperVal.name not in self.uninitialized
+                variables.append(dumperVal)
 
-        self.handleLocals(variables)
-        self.handleWatches(args)
+            self.handleLocals(variables)
+            self.handleWatches(args)
+        except Exception:
+            t,v,tb = sys.exc_info()
+            self.showException("FETCH VARIABLES", t, v, tb)
 
         self.put('],partial="%d"' % (len(self.partialVariable) > 0))
         self.put(',timings=%s' % self.timings)
@@ -476,22 +441,18 @@ class Dumper(DumperBase):
             self.put(',qtnamespace="%s"' % self.qtNamespaceToReport)
             self.qtNamespaceToReport = None
 
+        runtime = time.perf_counter() - start_time
+        self.put(',runtime="%s"' % runtime)
         self.reportResult(''.join(self.output), args)
         self.output = []
 
     def report(self, stuff):
         sys.stdout.write(stuff + "\n")
 
-    def findValueByExpression(self, exp):
-        return cdbext.parseAndEvaluate(exp)
-
-    def nativeDynamicTypeName(self, address, baseType):
-        return None  # Does not work with cdb
-
-    def nativeValueDereferenceReference(self, value):
+    def nativeValueDereferenceReference(self, value: DumperBase.Value) -> DumperBase.Value:
         return self.nativeValueDereferencePointer(value)
 
-    def nativeValueDereferencePointer(self, value):
+    def nativeValueDereferencePointer(self, value: DumperBase.Value) -> DumperBase.Value:
         def nativeVtCastValue(nativeValue):
             # If we have a pointer to a derived instance of the pointer type cdb adds a
             # synthetic '__vtcast_<derived type name>' member as the first child
@@ -518,7 +479,7 @@ class Dumper(DumperBase):
         else:
             val = self.Value(self)
             val.laddress = value.pointer()
-            val._type = DumperBase.Type(self, value.type.targetName)
+            val.typeid = self.type_target(value.typeid)
             val.nativeValue = value.nativeValue
 
         return val
@@ -526,7 +487,7 @@ class Dumper(DumperBase):
     def callHelper(self, rettype, value, function, args):
         raise Exception("cdb does not support calling functions")
 
-    def nameForCoreId(self, id):
+    def nameForCoreId(self, id: int) -> DumperBase.Value:
         for dll in ['Utilsd', 'Utils']:
             idName = cdbext.call('%s!Utils::nameForId(%d)' % (dll, id))
             if idName is not None:
@@ -536,427 +497,18 @@ class Dumper(DumperBase):
     def putCallItem(self, name, rettype, value, func, *args):
         return
 
-    def symbolAddress(self, symbolName):
+    def symbolAddress(self, symbolName: str) -> int:
         res = self.nativeParseAndEvaluate(symbolName)
         return None if res is None else res.address()
 
-    def putItemX(self, value):
-        #DumperBase.warn('PUT ITEM: %s' % value.stringify())
+    def wantQObjectNames(self):
+        return self.showQObjectNames and self.qtCoreModuleName() is not None
 
-        typeobj = value.type  # unqualified()
-        typeName = typeobj.name
-
-        self.addToCache(typeobj)  # Fill type cache
-
-        if not value.lIsInScope:
-            self.putSpecialValue('optimizedout')
-            #self.putType(typeobj)
-            #self.putSpecialValue('outofscope')
-            self.putNumChild(0)
-            return
-
-        if not isinstance(value, self.Value):
-            raise RuntimeError('WRONG TYPE IN putItem: %s' % type(self.Value))
-
-        # Try on possibly typedefed type first.
-        if self.tryPutPrettyItem(typeName, value):
-            if typeobj.code == TypeCode.Pointer:
-                self.putOriginalAddress(value.address())
-            else:
-                self.putAddress(value.address())
-            return
-
-        if typeobj.code == TypeCode.Pointer:
-            self.putFormattedPointer(value)
-            return
-
-        self.putAddress(value.address())
-        if value.lbitsize is not None:
-            self.putField('size', value.lbitsize // 8)
-
-        if typeobj.code == TypeCode.Function:
-            #DumperBase.warn('FUNCTION VALUE: %s' % value)
-            self.putType(typeobj)
-            self.putSymbolValue(value.pointer())
-            self.putNumChild(0)
-            return
-
-        if typeobj.code == TypeCode.Enum:
-            #DumperBase.warn('ENUM VALUE: %s' % value.stringify())
-            self.putType(typeobj.name)
-            self.putValue(value.display())
-            self.putNumChild(0)
-            return
-
-        if typeobj.code == TypeCode.Array:
-            #DumperBase.warn('ARRAY VALUE: %s' % value)
-            self.putCStyleArray(value)
-            return
-
-        if typeobj.code == TypeCode.Integral:
-            #DumperBase.warn('INTEGER: %s %s' % (value.name, value))
-            val = value.value()
-            self.putNumChild(0)
-            self.putValue(val)
-            self.putType(typeName)
-            return
-
-        if typeobj.code == TypeCode.Float:
-            #DumperBase.warn('FLOAT VALUE: %s' % value)
-            self.putValue(value.value())
-            self.putNumChild(0)
-            self.putType(typeobj.name)
-            return
-
-        if typeobj.code in (TypeCode.Reference, TypeCode.RValueReference):
-            #DumperBase.warn('REFERENCE VALUE: %s' % value)
-            val = value.dereference()
-            if val.laddress != 0:
-                self.putItem(val)
-            else:
-                self.putSpecialValue('nullreference')
-            self.putBetterType(typeName)
-            return
-
-        if typeobj.code == TypeCode.Complex:
-            self.putType(typeobj)
-            self.putValue(value.display())
-            self.putNumChild(0)
-            return
-
-        self.putType(typeName)
-
-        if value.summary is not None and self.useFancy:
-            self.putValue(self.hexencode(value.summary), 'utf8:1:0')
-            self.putNumChild(0)
-            return
-
-        self.putExpandable()
-        self.putEmptyValue()
-        #DumperBase.warn('STRUCT GUTS: %s  ADDRESS: 0x%x ' % (value.name, value.address()))
-        if self.showQObjectNames:
-            #with self.timer(self.currentIName):
-            self.putQObjectNameValue(value)
-        if self.isExpanded():
-            self.putField('sortable', 1)
-            with Children(self):
-                baseIndex = 0
-                for item in self.listValueChildren(value):
-                    if item.name.startswith('__vfptr'):
-                        with SubItem(self, '[vptr]'):
-                            # int (**)(void)
-                            self.putType(' ')
-                            self.putSortGroup(20)
-                            self.putValue(item.name)
-                            n = 100
-                            if self.isExpanded():
-                                with Children(self):
-                                    n = self.putVTableChildren(item, n)
-                            self.putNumChild(n)
-                        continue
-
-                    if item.isBaseClass:
-                        baseIndex += 1
-                        # We cannot use nativeField.name as part of the iname as
-                        # it might contain spaces and other strange characters.
-                        with UnnamedSubItem(self, "@%d" % baseIndex):
-                            self.putField('iname', self.currentIName)
-                            self.putField('name', '[%s]' % item.name)
-                            self.putSortGroup(1000 - baseIndex)
-                            self.putAddress(item.address())
-                            self.putItem(item)
-                        continue
-
-
-                    with SubItem(self, item.name):
-                        self.putItem(item)
-                if self.showQObjectNames:
-                    self.tryPutQObjectGuts(value)
-
-
-    def putFormattedPointerX(self, value: DumperBase.Value):
-        self.putOriginalAddress(value.address())
-        pointer = value.pointer()
-        self.putAddress(pointer)
-        if pointer == 0:
-            self.putType(value.type)
-            self.putValue('0x0')
-            return
-
-        typeName = value.type.name
-
-        try:
-            self.readRawMemory(pointer, 1)
-        except:
-            # Failure to dereference a pointer should at least
-            # show the value of a pointer.
-            #DumperBase.warn('BAD POINTER: %s' % value)
-            self.putValue('0x%x' % pointer)
-            self.putType(typeName)
-            return
-
-        if self.currentIName.endswith('.this'):
-            self.putDerefedPointer(value)
-            return
-
-        displayFormat = self.currentItemFormat(value.type.name)
-
-        if value.type.targetName == 'void':
-            #DumperBase.warn('VOID POINTER: %s' % displayFormat)
-            self.putType(typeName)
-            self.putSymbolValue(pointer)
-            return
-
-        if displayFormat == DisplayFormat.Raw:
-            # Explicitly requested bald pointer.
-            #DumperBase.warn('RAW')
-            self.putType(typeName)
-            self.putValue('0x%x' % pointer)
-            self.putExpandable()
-            if self.currentIName in self.expandedINames:
-                with Children(self):
-                    with SubItem(self, '*'):
-                        self.putItem(value.dereference())
-            return
-
-        limit = self.displayStringLimit
-        if displayFormat in (DisplayFormat.SeparateLatin1String, DisplayFormat.SeparateUtf8String):
-            limit = 1000000
-        if self.tryPutSimpleFormattedPointer(pointer, typeName,
-                                             value.type.targetName, displayFormat, limit):
-            self.putExpandable()
-            return
-
-        if DisplayFormat.Array10 <= displayFormat and displayFormat <= DisplayFormat.Array10000:
-            n = (10, 100, 1000, 10000)[displayFormat - DisplayFormat.Array10]
-            self.putType(typeName)
-            self.putItemCount(n)
-            self.putArrayData(value.pointer(), n, value.type.targetName)
-            return
-
-        #DumperBase.warn('AUTODEREF: %s' % self.autoDerefPointers)
-        #DumperBase.warn('INAME: %s' % self.currentIName)
-        if self.autoDerefPointers:
-            # Generic pointer type with AutomaticFormat, but never dereference char types:
-            if value.type.targetName not in (
-                'char',
-                'signed char',
-                'int8_t',
-                'qint8',
-                'unsigned char',
-                'uint8_t',
-                'quint8',
-                'wchar_t',
-                'CHAR',
-                'WCHAR',
-                'char8_t',
-                'char16_t',
-                'char32_t'
-            ):
-                self.putDerefedPointer(value)
-                return
-
-        #DumperBase.warn('GENERIC PLAIN POINTER: %s' % value.type)
-        #DumperBase.warn('ADDR PLAIN POINTER: 0x%x' % value.laddress)
-        self.putType(typeName)
-        self.putSymbolValue(pointer)
-        self.putExpandable()
-        if self.currentIName in self.expandedINames:
-            with Children(self):
-                with SubItem(self, '*'):
-                    self.putItem(value.dereference())
-
-
-    def putCStyleArray(self, value):
-        arrayType = value.type
-        innerType = arrayType.ltarget
-        address = value.address()
-        if address:
-            self.putValue('@0x%x' % address, priority=-1)
-        else:
-            self.putEmptyValue()
-        self.putType(arrayType)
-
-        displayFormat = self.currentItemFormat()
-        arrayByteSize = arrayType.size()
-        n = self.arrayItemCountFromTypeName(value.type.name, 100)
-
-        p = value.address()
-        if displayFormat != DisplayFormat.Raw and p:
-            if innerType.name in (
-                'char',
-                'int8_t',
-                'qint8',
-                'wchar_t',
-                'unsigned char',
-                'uint8_t',
-                'quint8',
-                'signed char',
-                'CHAR',
-                'WCHAR',
-                'char8_t',
-                'char16_t',
-                'char32_t'
-            ):
-                self.putCharArrayHelper(p, n, innerType, self.currentItemFormat(),
-                                        makeExpandable=False)
-            else:
-                self.tryPutSimpleFormattedPointer(p, arrayType, innerType,
-                                                  displayFormat, arrayByteSize)
-        self.putNumChild(n)
-
-        if self.isExpanded():
-            if n > 100:
-                addrStep = innerType.size()
-                with Children(self, n, innerType, addrBase=address, addrStep=addrStep):
-                    for i in self.childRange():
-                        self.putSubItem(i, self.createValue(address + i * addrStep, innerType))
-            else:
-                with Children(self):
-                    n = 0
-                    for item in self.listValueChildren(value):
-                        with SubItem(self, n):
-                            n += 1
-                            self.putItem(item)
-
-
-    def putArrayData(self, base, n, innerType, childNumChild=None):
-        self.checkIntType(base)
-        self.checkIntType(n)
-        addrBase = base
-        innerType = self.createType(innerType)
-        innerSize = innerType.size()
-        self.putNumChild(n)
-        #DumperBase.warn('ADDRESS: 0x%x INNERSIZE: %s INNERTYPE: %s' % (addrBase, innerSize, innerType))
-        enc = innerType.simpleEncoding()
-        maxNumChild = self.maxArrayCount()
-        if enc:
-            self.put('childtype="%s",' % innerType.name)
-            self.put('addrbase="0x%x",' % addrBase)
-            self.put('addrstep="0x%x",' % innerSize)
-            self.put('arrayencoding="%s",' % enc)
-            self.put('endian="%s",' % self.packCode)
-            if n > maxNumChild:
-                self.put('childrenelided="%s",' % n)
-                n = maxNumChild
-            self.put('arraydata="')
-            self.put(self.readMemory(addrBase, n * innerSize))
-            self.put('",')
-        else:
-            with Children(self, n, innerType, childNumChild, maxNumChild,
-                          addrBase=addrBase, addrStep=innerSize):
-                for i in self.childRange():
-                    self.putSubItem(i, self.createValue(addrBase + i * innerSize, innerType))
-
-    def tryPutSimpleFormattedPointer(self, ptr, typeName, innerType, displayFormat, limit):
-        if isinstance(innerType, self.Type):
-            innerType = innerType.name
-        if displayFormat == DisplayFormat.Automatic:
-            if innerType in ('char', 'signed char', 'unsigned char', 'uint8_t', 'CHAR'):
-                # Use UTF-8 as default for char *.
-                self.putType(typeName)
-                (length, shown, data) = self.readToFirstZero(ptr, 1, limit)
-                self.putValue(data, 'utf8', length=length)
-                if self.isExpanded():
-                    self.putArrayData(ptr, shown, innerType)
-                return True
-
-            if innerType in ('wchar_t', 'WCHAR'):
-                self.putType(typeName)
-                charSize = self.lookupType('wchar_t').size()
-                (length, data) = self.encodeCArray(ptr, charSize, limit)
-                if charSize == 2:
-                    self.putValue(data, 'utf16', length=length)
-                else:
-                    self.putValue(data, 'ucs4', length=length)
-                return True
-
-        if displayFormat == DisplayFormat.Latin1String:
-            self.putType(typeName)
-            (length, data) = self.encodeCArray(ptr, 1, limit)
-            self.putValue(data, 'latin1', length=length)
-            return True
-
-        if displayFormat == DisplayFormat.SeparateLatin1String:
-            self.putType(typeName)
-            (length, data) = self.encodeCArray(ptr, 1, limit)
-            self.putValue(data, 'latin1', length=length)
-            self.putDisplay('latin1:separate', data)
-            return True
-
-        if displayFormat == DisplayFormat.Utf8String:
-            self.putType(typeName)
-            (length, data) = self.encodeCArray(ptr, 1, limit)
-            self.putValue(data, 'utf8', length=length)
-            return True
-
-        if displayFormat == DisplayFormat.SeparateUtf8String:
-            self.putType(typeName)
-            (length, data) = self.encodeCArray(ptr, 1, limit)
-            self.putValue(data, 'utf8', length=length)
-            self.putDisplay('utf8:separate', data)
-            return True
-
-        if displayFormat == DisplayFormat.Local8BitString:
-            self.putType(typeName)
-            (length, data) = self.encodeCArray(ptr, 1, limit)
-            self.putValue(data, 'local8bit', length=length)
-            return True
-
-        if displayFormat == DisplayFormat.Utf16String:
-            self.putType(typeName)
-            (length, data) = self.encodeCArray(ptr, 2, limit)
-            self.putValue(data, 'utf16', length=length)
-            return True
-
-        if displayFormat == DisplayFormat.Ucs4String:
-            self.putType(typeName)
-            (length, data) = self.encodeCArray(ptr, 4, limit)
-            self.putValue(data, 'ucs4', length=length)
-            return True
-
-        return False
-
-    def putDerefedPointer(self, value):
-        derefValue = value.dereference()
-        savedCurrentChildType = self.currentChildType
-        self.currentChildType = value.type.targetName
-        self.putType(value.type.targetName)
-        derefValue.name = '*'
-        derefValue.autoDerefCount = value.autoDerefCount + 1
-
-        if derefValue.type.code == TypeCode.Pointer:
-            self.putField('autoderefcount', '{}'.format(derefValue.autoDerefCount))
-
-        self.putItem(derefValue)
-        self.currentChildType = savedCurrentChildType
-
-    def extractPointer(self, value):
-        code = 'I' if self.ptrSize() == 4 else 'Q'
-        return self.extractSomething(value, code, 8 * self.ptrSize())
-
-    def createValue(self, datish, typish):
-        if self.isInt(datish):  # Used as address.
-            return self.createValueFromAddressAndType(datish, typish)
-        if isinstance(datish, bytes):
-            val = self.Value(self)
-            if isinstance(typish, self.Type):
-                val._type = typish
-            else:
-                val._type = self.Type(self, typish)
-            #DumperBase.warn('CREATING %s WITH DATA %s' % (val.type.name, self.hexencode(datish)))
-            val.ldata = datish
-            val.check()
-            return val
-        raise RuntimeError('EXPECTING ADDRESS OR BYTES, GOT %s' % type(datish))
-
-    def createValueFromAddressAndType(self, address, typish):
-        val = self.Value(self)
-        if isinstance(typish, self.Type):
-            val._type = typish
-        else:
-            val._type = self.Type(self, typish)
-        val.laddress = address
-        if self.useDynamicType:
-            val._type = val.type.dynamicType(address)
-        return val
+    def fetchInternalFunctions(self):
+        coreModuleName = self.qtCoreModuleName()
+        ns = self.qtNamespace()
+        if coreModuleName is not None:
+            self.qtCustomEventFunc = self.parseAndEvaluate(
+                '%s!%sQObject::customEvent' %
+                (self.qtCoreModuleName(), ns)).address()
+        self.fetchInternalFunctions = lambda: None
diff --git a/share/qtcreator/debugger/cdbext.pyi b/share/qtcreator/debugger/cdbext.pyi
new file mode 100644
index 00000000000..27a3538cfe9
--- /dev/null
+++ b/share/qtcreator/debugger/cdbext.pyi
@@ -0,0 +1,51 @@
+class Type: ...
+
+class Field:
+    def name(self) -> str : ...
+    def isBaseClass(self) -> bool : ...
+    def type(self) -> Type : ...
+    def parentType(self) -> Type : ...
+    def bitsize(self) -> int : ...
+    def bitpos(self) -> int : ...
+
+class Type:
+    def name(self) -> str: ...
+    def bitsize(self) -> int : ...
+    def code(self) -> int : ...
+    def unqualified(self) -> bool : ...
+    def target(self) -> Type : ...
+    def targetName(self) -> str : ...
+    def stripTypedef(self) -> Type : ...
+    def fields(self) -> Field : ...
+    def module(self) -> str : ...
+    def moduleId(self) -> int : ...
+    def arrayElements(self) -> int : ...
+    def templateArguments(self) -> list[int | str] : ...
+    def resolved(self) -> bool : ...
+
+class Value: ...
+class Value:
+    def name(self) -> str : ...
+    def type(self) -> Type : ...
+    def bitsize(self) -> int : ...
+    def asBytes(self) -> bytes : ...
+    def address(self) -> int : ...
+    def hasChildren(self) -> bool : ...
+    def expand(self) -> bool : ...
+    def nativeDebuggerValue(self) -> str : ...
+    def childFromName(self) -> Value : ...
+    def childFromField(self) -> Value : ...
+    def childFromIndex(self) -> Value : ...
+
+def parseAndEvaluate() -> Value : ...
+def resolveSymbol() -> list[str] : ...
+def getNameByAddress() -> str : ...
+def getAddressByName() -> int : ...
+def lookupType() -> Type | None : ...
+def listOfLocals() -> list[Value] : ...
+def listOfModules() -> list[str] : ...
+def pointerSize() -> int : ...
+def readRawMemory() -> bytes : ...
+def createValue() -> Value | None : ...
+def call() -> Value | None : ...
+def reportResult() -> None : ...
diff --git a/share/qtcreator/debugger/creatortypes.py b/share/qtcreator/debugger/creatortypes.py
index ba5b53450b0..9c2933ba06b 100644
--- a/share/qtcreator/debugger/creatortypes.py
+++ b/share/qtcreator/debugger/creatortypes.py
@@ -53,7 +53,7 @@ def readTemplateName(d, value):
 def readLiteral(d, value):
     if not value.integer():
         return "<null>"
-    type = typeTarget(value.type.unqualified())
+    type = typeTarget(value.type)
     if type and (type.name == "CPlusPlus::TemplateNameId"):
         return readTemplateName(d, value)
     elif type and (type.name == "CPlusPlus::QualifiedNameId"):
diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py
index 059bf7b23e7..29fa29e0eb0 100644
--- a/share/qtcreator/debugger/dumper.py
+++ b/share/qtcreator/debugger/dumper.py
@@ -3,7 +3,7 @@
 
 import os
 import codecs
-import collections
+import functools
 import glob
 import struct
 import sys
@@ -31,11 +31,7 @@ except:
     def hexencode_(s):
         return ''.join(["%x" % c for c in s])
 
-if sys.version_info[0] >= 3:
-    toInteger = int
-else:
-    toInteger = long
-
+toInteger = int
 
 class ReportItem():
     """
@@ -55,19 +51,6 @@ class ReportItem():
             % (self.value, self.encoding, self.priority, self.length)
 
 
-class Timer():
-    def __init__(self, d, desc):
-        self.d = d
-        self.desc = desc + '-' + d.currentIName
-
-    def __enter__(self):
-        self.starttime = time.time()
-
-    def __exit__(self, exType, exValue, exTraceBack):
-        elapsed = int(1000 * (time.time() - self.starttime))
-        self.d.timings.append([self.desc, elapsed])
-
-
 class Children():
     def __init__(self, d, numChild=1, childType=None, childNumChild=None,
                  maxNumChild=None, addrBase=None, addrStep=None):
@@ -147,20 +130,28 @@ class UnnamedSubItem(SubItem):
 class DumperBase():
     @staticmethod
     def warn(message):
-        print('bridgemessage={msg="%s"},' % message.replace('"', '$').encode('latin1'))
+        print('bridgemessage={msg="%s"}' % message.replace('"', "'").replace('\\', '\\\\'))
 
-    @staticmethod
-    def showException(msg, exType, exValue, exTraceback):
-        DumperBase.warn('**** CAUGHT EXCEPTION: %s ****' % msg)
+    #@staticmethod
+    def showException(self, msg, exType, exValue, exTraceback):
+        self.warn('**** CAUGHT EXCEPTION: %s ****' % msg)
         try:
             import traceback
-            for line in traceback.format_exception(exType, exValue, exTraceback):
-                DumperBase.warn('%s' % line)
+            for frame_desc in traceback.format_exception(exType, exValue, exTraceback):
+                for line in frame_desc.split('\n'):
+                    self.warn(line)
         except:
             pass
 
-    def timer(self, desc):
-        return Timer(self, desc)
+    def dump_location(self):
+        import traceback
+        from io import StringIO
+        io = StringIO()
+        traceback.print_stack(file=io)
+        data = io.getvalue()
+        self.warn('LOCATION:')
+        for line in data.split('\n')[:-3]:
+            self.warn(line)
 
     def __init__(self):
         self.isCdb = False
@@ -181,11 +172,10 @@ class DumperBase():
         self.qtCustomEventFunc = 0
         self.qtCustomEventPltFunc = 0
         self.qtPropertyFunc = 0
-        self.fallbackQtVersion = 0x60200
         self.passExceptions = False
         self.isTesting = False
+        self.qtLoaded = False
 
-        self.typeData = {}
         self.isBigEndian = False
         self.packCode = '<'
 
@@ -197,6 +187,13 @@ class DumperBase():
 
         self.dumpermodules = []
 
+        # These are sticky for the session
+        self.qtversion = None
+        self.qtversionAtLeast6 = None
+        self.qtnamespace = None
+
+        self.init_type_cache()
+
         try:
             # Fails in the piping case
             self.dumpermodules = [
@@ -217,9 +214,10 @@ class DumperBase():
         self.currentPrintsAddress = True
         self.currentChildType = None
         self.currentChildNumChild = None
-        self.registerKnownTypes()
+        self.register_known_simple_types()
 
     def setVariableFetchingOptions(self, args):
+        self.last_args = args
         self.resultVarName = args.get('resultvarname', '')
         self.expandedINames = args.get('expanded', {})
         self.stringCutOff = int(args.get('stringcutoff', 10000))
@@ -238,15 +236,80 @@ class DumperBase():
         self.useTimeStamps = int(args.get('timestamps', '0'))
         self.partialVariable = args.get('partialvar', '')
         self.uninitialized = args.get('uninitialized', [])
-        self.uninitialized = list(map(lambda x: self.hexdecode(x), self.uninitialized))
-        self.partialUpdate = int(args.get('partial', '0'))
-        #DumperBase.warn('NAMESPACE: "%s"' % self.qtNamespace())
-        #DumperBase.warn('EXPANDED INAMES: %s' % self.expandedINames)
-        #DumperBase.warn('WATCHERS: %s' % self.watchers)
 
-    def setFallbackQtVersion(self, args):
-        version = int(args.get('version', self.fallbackQtVersion))
-        self.fallbackQtVersion = version
+        self.uninitialized = list(map(lambda x: self.hexdecode(x), self.uninitialized))
+
+        if self.qtversion is None:
+            self.qtversion = args.get('qtversion', None)
+            if self.qtversion == 0:
+                self.qtversion = None
+        if self.qtnamespace is None:
+            self.qtnamespace = args.get('qtnamespace', None)
+
+        #self.warn('NAMESPACE: "%s"' % self.qtNamespace())
+        #self.warn('EXPANDED INAMES: %s' % self.expandedINames)
+        #self.warn('WATCHERS: %s' % self.watchers)
+
+    # Call this with 'py theDumper.profile1() from Creator
+    def profile(self):
+        '''Internal profiling'''
+        import cProfile
+        import visualize
+        profiler = cProfile.Profile()
+        profiler.enable()
+        self.profiled_command()
+        profiler.disable()
+        visualize.profile_visualize(profiler.getstats())
+
+    def profiled_command(self):
+        args = self.last_args
+        args['partialvar'] = ''
+        self.fetchVariables(args)
+
+    def extractQtVersion(self):
+        # can be overridden in bridges
+        pass
+
+    def qtVersion(self):
+        if self.qtversion:
+            return self.qtversion
+
+        #self.warn("ACCESSING UNKNOWN QT VERSION")
+        self.qtversion = self.extractQtVersion()
+        if self.qtversion:
+            return self.qtversion
+
+        #self.warn("EXTRACTING QT VERSION FAILED. GUESSING NOW.")
+        if self.qtversionAtLeast6 is None or self.qtversionAtLeast6 is True:
+            return 0x060602
+        return 0x050f00
+
+    def qtVersionAtLeast(self, version):
+        # A hack to cover most of the changes from Qt 5 to 6
+        if version == 0x60000 and self.qtversionAtLeast6 is not None:
+            return self.qtversionAtLeast6
+        if version == 0x50000: # FIXME: This drops unknown 4.x for now
+            return True
+        return self.qtVersion() >= version
+
+    def qtVersionPing(self, typeid, size_for_qt5=-1):
+        # To be called from places where the type size is sufficient
+        # to distinguish Qt 5.x and 6.x
+        if size_for_qt5 == -1:
+           size_for_qt5 = self.ptrSize()
+        test_size = self.type_size(typeid)
+        self.setQtVersionAtLeast6(test_size > size_for_qt5)
+
+    def setQtVersionAtLeast6(self, is6):
+        if self.qtversionAtLeast6 is None:
+            #self.warn("SETTING Qt VERSION AT LEAST 6 TO %s" % is6)
+            self.qtversionAtLeast6 = is6
+            self.register_known_qt_types()
+        #else:
+        #   self.warn("QT VERSION ALREADY KNOWN")
+
+    def qtNamespace(self):
+        return '' if self.qtnamespace is None else self.qtnamespace
 
     def resetPerStepCaches(self):
         self.perStepCache = {}
@@ -279,7 +342,6 @@ class DumperBase():
         self.generalCache = {}
 
         self.counts = {}
-        self.structPatternCache = {}
         self.timings = []
         self.expandableINames = set({})
 
@@ -331,7 +393,7 @@ class DumperBase():
         self.currentType = ReportItem()
 
     def exitSubItem(self, item, exType, exValue, exTraceBack):
-        #DumperBase.warn('CURRENT VALUE: %s: %s %s' %
+        #self.warn('CURRENT VALUE: %s: %s %s' %
         # (self.currentIName, self.currentValue, self.currentType))
         if exType is not None:
             if self.passExceptions:
@@ -341,9 +403,9 @@ class DumperBase():
         if not self.isCli:
             try:
                 if self.currentType.value:
-                    typeName = self.currentType.value
-                    if len(typeName) > 0 and typeName != self.currentChildType:
-                        self.putField('type', typeName)
+                    typename = self.currentType.value
+                    if len(typename) > 0 and typename != self.currentChildType:
+                        self.putField('type', typename)
                 if self.currentValue.value is None:
                     self.put('value="",encoding="notaccessible",numchild="0",')
                 else:
@@ -361,8 +423,8 @@ class DumperBase():
             self.indent -= 1
             try:
                 if self.currentType.value:
-                    typeName = self.currentType.value
-                    self.put('<%s> = {' % typeName)
+                    typename = self.currentType.value
+                    self.put('<%s> = {' % typename)
 
                 if self.currentValue.value is None:
                     self.put('<not accessible>')
@@ -388,14 +450,14 @@ class DumperBase():
         self.currentType = item.savedType
         return True
 
-    def stripForFormat(self, typeName):
-        if not isinstance(typeName, str):
-            raise RuntimeError('Expected string in stripForFormat(), got %s' % type(typeName))
-        if typeName in self.cachedFormats:
-            return self.cachedFormats[typeName]
+    def stripForFormat(self, typename):
+        if not isinstance(typename, str):
+            raise RuntimeError('Expected string in stripForFormat(), got %s' % type(typename))
+        if typename in self.cachedFormats:
+            return self.cachedFormats[typename]
         stripped = ''
         inArray = 0
-        for c in typeName:
+        for c in typename:
             if c == '<':
                 break
             if c == ' ':
@@ -407,59 +469,200 @@ class DumperBase():
             if inArray and ord(c) >= 48 and ord(c) <= 57:
                 continue
             stripped += c
-        self.cachedFormats[typeName] = stripped
+        self.cachedFormats[typename] = stripped
         return stripped
 
-    def templateArgument(self, typeobj, position):
-        return typeobj.templateArgument(position)
+    def templateArgument(self, typeobj, index):
+        return self.type_template_argument(typeobj.typeid, index)
 
     def intType(self):
-        result = self.lookupType('int')
-        self.intType = lambda: result
-        return result
+        return self.type_for_int
 
     def charType(self):
-        result = self.lookupType('char')
-        self.charType = lambda: result
-        return result
+        return self.type_for_char
 
     def ptrSize(self):
         result = self.lookupType('void*').size()
         self.ptrSize = lambda: result
         return result
 
-    def lookupType(self, typeName):
-        nativeType = self.lookupNativeType(typeName)
-        return None if nativeType is None else self.fromNativeType(nativeType)
+    def lookupType(self, typename):
+        if not isinstance(typename, str):
+            raise RuntimeError('ARG ERROR FOR lookupType, got %s' % type(typename))
 
-    def registerKnownTypes(self):
-        tdata = self.TypeData(self, 'unsigned short')
-        tdata.lbitsize = 16
-        tdata.lalignment = 2
-        tdata.code = TypeCode.Integral
+        typeid = self.typeid_for_string(typename)
+        native_type = self.type_nativetype_cache.get(typeid)
+        if native_type is None:
+            native_type = self.lookupNativeType(typename)
+            if native_type is None:
+                #sCANNOT DETERMINE SIZE FOR TYelf.dump_location()
+                self.dump_location()
+                self.warn("TYPEIDS: %s" % self.typeid_cache)
+                self.warn("COULD NOT FIND TYPE '%s'" % typename)
+                return None
 
-        tdata = self.TypeData(self, 'QChar')
-        tdata.lbitsize = 16
-        tdata.lalignment = 2
-        tdata.code = TypeCode.Struct
-        tdata.lfields = [self.Field(dumper=self, name='ucs',
-                                    type='unsigned short', bitsize=16, bitpos=0)]
-        tdata.templateArguments = lambda: []
+        self.type_nativetype_cache[typeid] = native_type
+        typeid = self.from_native_type(native_type)
+        if typeid == 0:
+            return None
+        return self.Type(self, typeid)
+
+    def register_type(self, name, code, size, enc=None):
+        typeid = self.typeid_for_string(name)
+        self.type_code_cache[typeid] = code
+        self.type_size_cache[typeid] = size
+        self.type_alignment_cache[typeid] = size
+        if enc is not None:
+            self.type_encoding_cache[typeid] = enc
+        return typeid
+
+    def register_int(self, name, size, enc=None):
+        typeid = self.typeid_for_string(name)
+        self.type_code_cache[typeid] = TypeCode.Integral
+        self.type_size_cache[typeid] = size
+        self.type_alignment_cache[typeid] = size
+        if enc is not None:
+            self.type_encoding_cache[typeid] = enc
+        return typeid
+
+    def register_enum(self, name, size):
+        typeid = self.typeid_for_string(name)
+        self.type_code_cache[typeid] = TypeCode.Enum
+        self.type_size_cache[typeid] = size
+        self.type_alignment_cache[typeid] = size
+        return typeid
+
+    def register_typedef(self, name, target_typeid):
+        typeid = self.typeid_for_string(name)
+        self.type_code_cache[typeid] = TypeCode.Typedef
+        self.type_target_cache[typeid] = target_typeid
+        self.type_size_cache[typeid] = self.type_size_cache[target_typeid]
+        self.type_alignment_cache[typeid] = self.type_alignment_cache[target_typeid]
+        return typeid
+
+    def register_struct(self, name, p5=0, p6=0, s=0, qobject_based=False):
+        # p5 = n  -> n * ptrsize for Qt 5
+        # p6 = n  -> n * ptrsize for Qt 6
+        if self.qtversionAtLeast6 is None:
+            self.warn("TOO EARLY TO GUESS QT VERSION")
+            size = 8 * p6 + s
+        elif self.qtversionAtLeast6 is True:
+            size = 8 * p6 + s
+        else:
+            size = 8 * p5 + s
+        typeid = self.typeid_for_string(name)
+        self.type_code_cache[typeid] = TypeCode.Struct
+        self.type_size_cache[typeid] = size
+        self.type_qobject_based_cache[typeid] = qobject_based
+        self.type_alignment_cache[typeid] = 8
+        return typeid
+
+    def register_known_simple_types(self):
+        typeid = 0
+        self.typeid_cache[''] = typeid
+        self.type_code_cache[typeid] = TypeCode.Void
+        self.type_name_cache[typeid] = '<Error>'
+        self.type_size_cache[typeid] = 1
+
+        typeid_char = self.register_int('char', 1, 'uint:1')
+        self.type_for_char = self.Type(self, typeid_char)
+        self.register_int('signed char', 1, 'int:1')
+        self.register_int('unsigned char', 1, 'uint:1')
+        self.register_int('bool', 1, 'uint:1')
+        self.register_int('char8_t', 1, 'uint:1')
+        self.register_int('int8_t', 1, 'int:1')
+        self.register_int('uint8_t', 1, 'uint:1')
+        self.register_int('qint8', 1, 'int:1')
+        self.register_int('quint8', 1, 'uint:1')
+
+        self.register_int('short', 2, 'int:2')
+        self.register_int('short int', 2, 'int:2')
+        self.register_int('signed short', 2, 'int:2')
+        self.register_int('signed short int', 2, 'int:2')
+        typeid_unsigned_short = \
+        self.register_int('unsigned short', 2, 'uint:2')
+        self.register_int('unsigned short int', 2, 'uint:2')
+        self.register_int('char16_t', 2, 'uint:2')
+        self.register_int('int16_t', 2, 'int:2')
+        self.register_int('uint16_t', 2, 'uint:2')
+        self.register_int('qint16', 2, 'int:2')
+        self.register_int('quint16', 2, 'uint:2')
+
+        typeid_int = self.register_type('int', 4, 'int:4')
+        self.type_for_int = self.Type(self, typeid_int)
+        self.register_int('int', 4, 'int:4')
+        self.register_int('signed int', 4, 'int:4')
+        self.register_int('unsigned int', 4, 'uint:4')
+        self.register_int('char32_t', 4, 'int:4')
+        self.register_int('int32_t', 4, 'int:4')
+        self.register_int('uint32_t', 4, 'uint:4')
+        self.register_int('qint32', 4, 'int:4')
+        self.register_int('quint32', 4, 'uint:4')
+
+        self.register_int('long long', 8, 'int:8')
+        self.register_int('signed long long', 8, 'int:8')
+        self.register_int('unsigned long long', 8, 'uint:8')
+        self.register_int('int64_t', 8, 'int:8')
+        self.register_int('uint64_t', 8, 'uint:8')
+        self.register_int('qint64', 8, 'int:8')
+        self.register_int('quint64', 8, 'uint:8')
+
+        self.register_type('float', TypeCode.Float, 4, 'float:4')
+        typeid_double = self.register_type('double', TypeCode.Float, 8, 'float:8')
+        self.register_typedef('qreal', typeid_double)
+
+        typeid_qchar = self.register_type('@QChar', TypeCode.Struct, 2, 'uint:2')
+        #self.type_fields_cache[typeid_qchar] = [
+        #    self.Field(name='ucs', typeid=typeid_unsigned_short, bitsize=16, bitpos=0)]
+
+        self.register_enum('@Qt::ItemDataRole', 4)
+
+    def register_known_qt_types(self):
+        #self.warn("REGISTERING KNOWN QT TYPES NOW")
+        self.register_struct('@QObject', p5=2, p6=2, qobject_based=True)
+        self.register_struct('@QObjectPrivate', p5=10, p6=10) # FIXME: Not exact
+
+        self.register_struct('@QByteArray', p5=1, p6=3)
+        self.register_struct('@QString', p5=1, p6=3)
+        self.register_struct('@QStandardItemData', p5=3, p6=5)
+        self.register_struct('@QVariant', p5=2, p6=4)
+        self.register_struct('@QXmlAttributes::Attribute', p5=4, p6=12)
+
+        self.register_struct('@QList<@QObject*>', p5=1, p6=3)
+        self.register_struct('@QList<@QStandardItemData>', p5=1, p6=3)
+        self.register_struct('@QList<@QRect>', p5=1, p6=3)
+
+        typeid_var_list = self.register_struct('@QList<@QVariant>', p5=1, p6=3)
+        self.register_typedef('@QVariantList', typeid_var_list)
+
+        typeid_var_map = self.register_struct('@QMap<@QString, @QVariant>', p5=1, p6=1)
+        self.register_typedef('@QVariantMap', typeid_var_map)
+
+        typeid_var_hash = self.register_struct('@QHash<@QString, @QVariant>', p5=1, p6=1)
+        self.register_typedef('@QVariantHash', typeid_var_hash)
+
+        self.register_struct('@QPoint', s=8)
+        self.register_struct('@QPointF', s=16)
+        self.register_struct('@QLine', s=16)
+        self.register_struct('@QLineF', s=32)
+
+        # FIXME: Comment out for production, see [MARK_A]
+        name1 = 'std::__cxx11::basic_string<char,std::char_traits<char>,std::allocator<char>>'
+        self.register_struct(name1, p6=4)
 
     def nativeDynamicType(self, address, baseType):
         return baseType  # Override in backends.
 
-    def listTemplateParameters(self, typename):
-        return self.listTemplateParametersManually(typename)
-
-    def listTemplateParametersManually(self, typename):
+    def fill_template_parameters_manually(self, typeid):
+        typename = self.type_name(typeid)
         # Undo id mangling for template typedefs. Relevant for QPair.
         if typename.endswith('}'):
             typename = typename[typename.find('{') + 1 : -1]
 
-        targs = []
         if not typename.endswith('>'):
-            return targs
+            return
+
+        targs = []
 
         def push(inner):
             # Handle local struct definitions like QList<main(int, char**)::SomeStruct>
@@ -471,14 +674,14 @@ class DumperBase():
                 inner = inner[6:].strip()
             if inner.endswith(' const'):
                 inner = inner[:-6].strip()
-            #DumperBase.warn("FOUND: %s" % inner)
+            #self.warn("FOUND: %s" % inner)
             targs.append(inner)
 
-        #DumperBase.warn("SPLITTING %s" % typename)
+        #self.warn("SPLITTING %s" % typename)
         level = 0
         inner = ''
         for c in typename[::-1]:  # Reversed...
-            #DumperBase.warn("C: %s" % c)
+            #self.warn("C: %s" % c)
             if c == '>':
                 if level > 0:
                     inner += c
@@ -492,7 +695,7 @@ class DumperBase():
                     inner = ''
                     break
             elif c == ',':
-                #DumperBase.warn('c: %s level: %s' % (c, level))
+                #self.warn('c: %s level: %s' % (c, level))
                 if level == 1:
                     push(inner)
                     inner = ''
@@ -501,35 +704,38 @@ class DumperBase():
             else:
                 inner += c
 
-        #DumperBase.warn("TARGS: %s %s" % (typename, targs))
-        res = []
+        #self.warn("TARGS: %s %s" % (typename, targs))
+        idx = 0
         for item in targs[::-1]:
             if len(item) == 0:
                 continue
-            c = ord(item[0])
-            if c in (45, 46) or (c >= 48 and c < 58):  # '-', '.' or digit.
-                if item.find('.') > -1:
-                    res.append(float(item))
-                else:
-                    if item.endswith('l'):
-                        item = item[:-1]
-                    if item.endswith('u'):
-                        item = item[:-1]
-                    val = toInteger(item)
-                    if val > 0x80000000:
-                        val -= 0x100000000
-                    res.append(val)
+            if item == "false": # Triggered in StdTuple dumper
+                self.type_template_arguments_cache[(typeid, idx)] = False
+            elif item == "true":
+                self.type_template_arguments_cache[(typeid, idx)] = True
             else:
-                res.append(self.Type(self, item))
-        #DumperBase.warn("RES: %s %s" % (typename, [(None if t is None else t.name) for t in res]))
-        return res
+                c = ord(item[0])
+                if c in (45, 46) or (c >= 48 and c < 58):  # '-', '.' or digit.
+                    if '.' in item:
+                        self.type_template_arguments_cache[(typeid, idx)] = float(item)
+                    else:
+                        if item.endswith('l'):
+                            item = item[:-1]
+                        if item.endswith('u'):
+                            item = item[:-1]
+                        val = int(item)
+                        if val > 0x80000000:
+                            val -= 0x100000000
+                        self.type_template_arguments_cache[(typeid, idx)] = val
+                else:
+                    targ = self.Type(self, self.create_typeid_from_name(item))
+                    self.type_template_arguments_cache[(typeid, idx)] = targ
+            idx += 1
+            #self.warn('MANUAL: %s %s' % (type_name, targs))
 
     # Hex decoding operating on str, return str.
     @staticmethod
     def hexdecode(s, encoding='utf8'):
-        if sys.version_info[0] == 2:
-            # For python2 we need an extra str() call to return str instead of unicode
-            return str(s.decode('hex').decode(encoding))
         return bytes.fromhex(s).decode(encoding)
 
     # Hex encoding operating on str or bytes, return str.
@@ -537,10 +743,6 @@ class DumperBase():
     def hexencode(s):
         if s is None:
             s = ''
-        if sys.version_info[0] == 2:
-            if isinstance(s, buffer):
-                return bytes(s).encode('hex')
-            return s.encode('hex')
         if isinstance(s, str):
             s = s.encode('utf8')
         return hexencode_(s)
@@ -558,9 +760,9 @@ class DumperBase():
         return limit
 
     def vectorData(self, value):
-        if self.qtVersion() >= 0x060000:
+        if self.qtVersionAtLeast(0x060000):
             data, length, alloc = self.qArrayData(value)
-        elif self.qtVersion() >= 0x050000:
+        elif self.qtVersionAtLeast(0x050000):
             vector_data_ptr = self.extractPointer(value)
             if self.ptrSize() == 4:
                 (ref, length, alloc, offset) = self.split('IIIp', vector_data_ptr)
@@ -576,7 +778,7 @@ class DumperBase():
         return data, length
 
     def qArrayData(self, value):
-        if self.qtVersion() >= 0x60000:
+        if self.qtVersionAtLeast(0x60000):
             dd, data, length = self.split('ppp', value)
             if dd:
                 _, _, alloc = self.split('iip', dd)
@@ -587,7 +789,7 @@ class DumperBase():
 
     def qArrayDataHelper(self, array_data_ptr):
         # array_data_ptr is what is e.g. stored in a QByteArray's d_ptr.
-        if self.qtVersion() >= 0x050000:
+        if self.qtVersionAtLeast(0x050000):
             # QTypedArray:
             # - QtPrivate::RefCount ref
             # - int length
@@ -600,7 +802,7 @@ class DumperBase():
                 data = data & 0xffffffff
             else:
                 data = data & 0xffffffffffffffff
-        elif self.qtVersion() >= 0x040000:
+        elif self.qtVersionAtLeast(0x040000):
             # Data:
             # - QBasicAtomicInt ref;
             # - int alloc, length;
@@ -619,7 +821,7 @@ class DumperBase():
             (dummy, dummy, dummy, length) = self.split('IIIp', array_data_ptr)
             length = self.extractInt(array_data_ptr + 3 * self.ptrSize()) & 0x3ffffff
             alloc = length  # pretend.
-            data = self.extractPointer(array_data_ptr + self.ptrSize())
+            data = self.extract_pointer_at_address(array_data_ptr + self.ptrSize())
         return data, length, alloc
 
     def encodeStringHelper(self, value, limit):
@@ -666,14 +868,14 @@ class DumperBase():
                            displayFormat=DisplayFormat.Automatic,
                            makeExpandable=True):
         charSize = charType.size()
-        self.putCharArrayValue(data, size, charSize, displayFormat=displayFormat)
+        self.putCharArrayValue(data, size, charSize, displayFormat)
 
         if makeExpandable:
             self.putNumChild(size)
             if self.isExpanded():
                 with Children(self):
                     for i in range(size):
-                        self.putSubItem(size, self.createValue(data + i * charSize, charType))
+                        self.putSubItem(size, self.createValueFromAddress(data + i * charSize, charType))
 
     def readMemory(self, addr, size):
         return self.hexencode(bytes(self.readRawMemory(addr, size)))
@@ -699,39 +901,6 @@ class DumperBase():
     def stringData(self, value): # -> (data, size, alloc)
         return self.qArrayData(value)
 
-    def extractTemplateArgument(self, typename, position):
-        level = 0
-        skipSpace = False
-        inner = ''
-        for c in typename[typename.find('<') + 1: -1]:
-            if c == '<':
-                inner += c
-                level += 1
-            elif c == '>':
-                level -= 1
-                inner += c
-            elif c == ',':
-                if level == 0:
-                    if position == 0:
-                        return inner.strip()
-                    position -= 1
-                    inner = ''
-                else:
-                    inner += c
-                    skipSpace = True
-            else:
-                if skipSpace and c == ' ':
-                    pass
-                else:
-                    inner += c
-                    skipSpace = False
-        # Handle local struct definitions like QList<main(int, char**)::SomeStruct>
-        inner = inner.strip()
-        p = inner.find(')::')
-        if p > -1:
-            inner = inner[p + 3:]
-        return inner
-
     def putStringValue(self, value):
         length, data = self.encodeStringHelper(value, self.displayStringLimit)
         self.putValue(data, 'utf16', length=length)
@@ -750,10 +919,9 @@ class DumperBase():
             self.putType('int')
 
     def putEnumItem(self, name, ival, typish):
-        buf = bytearray(struct.pack('i', ival))
         val = self.Value(self)
-        val.ldata = bytes(buf)
-        val._type = self.createType(typish)
+        val.ldata = ival
+        val.typeid = self.create_typeid(typish)
         with SubItem(self, name):
             self.putItem(val)
 
@@ -826,15 +994,19 @@ class DumperBase():
     def putSymbolValue(self, address):
         self.putValue(self.prettySymbolByAddress(address))
 
-    def putVTableChildren(self, item, itemCount):
-        p = item.pointer()
+    def putVTableChildren(self, value, itemCount):
+        p = self.value_as_address(value)
+        entry_typeid = self.create_pointer_typeid(self.create_typeid('void'))
         for i in range(itemCount):
-            deref = self.extractPointer(p)
+            deref = self.extract_pointer_at_address(p)
             if deref == 0:
                 itemCount = i
                 break
             with SubItem(self, i):
-                self.putItem(self.createPointerValue(deref, 'void'))
+                val = self.Value(self)
+                val.ldata = deref
+                val.typeid = entry_typeid
+                self.putItem(val)
                 p += self.ptrSize()
         return itemCount
 
@@ -842,7 +1014,9 @@ class DumperBase():
         baseIndex = 0
         for item in value.members(True):
             if item.name is not None:
-                if item.name.startswith('_vptr.') or item.name.startswith('__vfptr'):
+                if (item.name.startswith('_vptr.')
+                        or item.name.startswith('_vptr$')
+                        or item.name.startswith('__vfptr')):
                     with SubItem(self, '[vptr]'):
                         # int (**)(void)
                         self.putType(' ')
@@ -892,15 +1066,21 @@ class DumperBase():
 
     def check(self, exp):
         if not exp:
+            self.warn('Check failed: %s' % exp)
+            self.dump_location()
             raise RuntimeError('Check failed: %s' % exp)
 
+    def check_typeid(self, typeid):
+        if not isinstance(typeid, int):
+            raise RuntimeError('WRONG TYPE FOR TYPEID: %s %s' % (str(typeid), type(typeid)))
+
     def checkRef(self, ref):
         # Assume there aren't a million references to any object.
         self.check(ref >= -1)
         self.check(ref < 1000000)
 
     def checkIntType(self, thing):
-        if not self.isInt(thing):
+        if not isinstance(thing, int):
             raise RuntimeError('Expected an integral value, got %s' % type(thing))
 
     def readToFirstZero(self, base, typesize, maximum):
@@ -919,7 +1099,7 @@ class DumperBase():
                 maximum = int(maximum / 2)
                 self.warn('REDUCING READING MAXIMUM TO %s' % maximum)
 
-        #DumperBase.warn('BASE: 0x%x TSIZE: %s MAX: %s' % (base, typesize, maximum))
+        #self.warn('BASE: 0x%x TSIZE: %s MAX: %s' % (base, typesize, maximum))
         for i in range(0, maximum, typesize):
             t = struct.unpack_from(code, blob, i)[0]
             if t == 0:
@@ -1039,11 +1219,14 @@ class DumperBase():
     def putType(self, typish, priority=0):
         # Higher priority values override lower ones.
         if priority >= self.currentType.priority:
-            types = (str) if sys.version_info[0] >= 3 else (str, unicode)
-            if isinstance(typish, types):
+            if isinstance(typish, str):
                 self.currentType.value = typish
-            else:
+            elif isinstance(typish, int):
+                self.currentType.value = self.type_name(typish)
+            elif isinstance(typish, self.Type):
                 self.currentType.value = typish.name
+            else:
+                self.currentType.value = str(type(typish))
             self.currentType.priority = priority
 
     def putValue(self, value, encoding=None, priority=0, length=None):
@@ -1095,23 +1278,24 @@ class DumperBase():
             self.putItem(value)
 
     def isExpanded(self):
-        #DumperBase.warn('IS EXPANDED: %s in %s: %s' % (self.currentIName,
+        #self.warn('IS EXPANDED: %s in %s: %s' % (self.currentIName,
         #    self.expandedINames, self.currentIName in self.expandedINames))
         return self.currentIName in self.expandedINames
 
-    def mangleName(self, typeName):
+    def mangleName(self, typename):
         return '_ZN%sE' % ''.join(map(lambda x: '%d%s' % (len(x), x),
-                                      typeName.split('::')))
+                                      typename.split('::')))
 
-    def arrayItemCountFromTypeName(self, typeName, fallbackMax=1):
-        itemCount = typeName[typeName.find('[') + 1:typeName.find(']')]
+    def arrayItemCountFromTypeName(self, typename, fallbackMax=1):
+        itemCount = typename[typename.find('[') + 1:typename.find(']')]
         return int(itemCount) if itemCount else fallbackMax
 
     def putCStyleArray(self, value):
-        arrayType = value.type.unqualified()
-        innerType = arrayType.ltarget
-        if innerType is None:
-            innerType = value.type.target().unqualified()
+        arrayType = value.type
+        innerType = arrayType.target()
+        #self.warn("ARRAY TYPE: %s" % arrayType)
+        #self.warn("INNER TYPE: %s" % innerType)
+
         address = value.address()
         if address:
             self.putValue('@0x%x' % address, priority=-1)
@@ -1121,14 +1305,17 @@ class DumperBase():
 
         displayFormat = self.currentItemFormat()
         arrayByteSize = arrayType.size()
+        n = self.arrayItemCountFromTypeName(value.type.name, 100)
         if arrayByteSize == 0:
             # This should not happen. But it does, see QTCREATORBUG-14755.
             # GDB/GCC produce sizeof == 0 for QProcess arr[3]
             # And in the Nim string dumper.
-            itemCount = self.arrayItemCountFromTypeName(value.type.name, 100)
-            arrayByteSize = int(itemCount) * innerType.size()
+            arrayByteSize = n * innerType.size()
+        elif not self.isCdb:
+            # Do not check the inner type size for cdb since this requires a potentially expensive
+            # type lookup
+            n = arrayByteSize // innerType.size()
 
-        n = arrayByteSize // innerType.size()
         p = value.address()
         if displayFormat != DisplayFormat.Raw and p:
             if innerType.name in (
@@ -1161,19 +1348,19 @@ class DumperBase():
     def cleanAddress(self, addr):
         if addr is None:
             return '<no address>'
-        return '0x%x' % toInteger(hex(addr), 16)
+        return '0x%x' % int(hex(addr), 16)
 
-    def stripNamespaceFromType(self, typeName):
+    def stripNamespaceFromType(self, typename):
         ns = self.qtNamespace()
-        if len(ns) > 0 and typeName.startswith(ns):
-            typeName = typeName[len(ns):]
-        # DumperBase.warn( 'stripping %s' % typeName )
+        if len(ns) > 0 and typename.startswith(ns):
+            typename = typename[len(ns):]
+        # self.warn( 'stripping %s' % typename )
         lvl = 0
         pos = None
         stripChunks = []
-        sz = len(typeName)
+        sz = len(typename)
         for index in range(0, sz):
-            s = typeName[index]
+            s = typename[index]
             if s == '<':
                 lvl += 1
                 if lvl == 1:
@@ -1188,22 +1375,22 @@ class DumperBase():
         if lvl != 0:
             raise RuntimeError("unbalanced at end of type name")
         for (f, l) in reversed(stripChunks):
-            typeName = typeName[:f] + typeName[l:]
-        return typeName
+            typename = typename[:f] + typename[l:]
+        return typename
 
-    def tryPutPrettyItem(self, typeName, value):
+    def tryPutPrettyItem(self, typename, value):
         value.check()
         if self.useFancy and self.currentItemFormat() != DisplayFormat.Raw:
-            self.putType(typeName)
+            self.putType(typename)
 
-            nsStrippedType = self.stripNamespaceFromType(typeName)\
+            nsStrippedType = self.stripNamespaceFromType(typename)\
                 .replace('::', '__')
 
             # Strip leading 'struct' for C structs
             if nsStrippedType.startswith('struct '):
                 nsStrippedType = nsStrippedType[7:]
 
-            #DumperBase.warn('STRIPPED: %s' % nsStrippedType)
+            #self.warn('STRIPPED: %s' % nsStrippedType)
             # The following block is only needed for D.
             if nsStrippedType.startswith('_A'):
                 # DMD v2.058 encodes string[] as _Array_uns long long.
@@ -1216,7 +1403,7 @@ class DumperBase():
                     return True
 
             dumper = self.qqDumpers.get(nsStrippedType)
-            #DumperBase.warn('DUMPER: %s' % dumper)
+            #self.warn('DUMPER: %s' % dumper)
             if dumper is not None:
                 dumper(self, value)
                 return True
@@ -1242,15 +1429,16 @@ class DumperBase():
         self.putField('editvalue', value)
 
     # This is shared by pointer and array formatting.
-    def tryPutSimpleFormattedPointer(self, ptr, typeName, innerType, displayFormat, limit):
+    def tryPutSimpleFormattedPointer(self, ptr, typename, innerType, displayFormat, limit):
         if displayFormat == DisplayFormat.Automatic:
-            targetType = innerType
-            if innerType.code == TypeCode.Typedef:
-                targetType = innerType.ltarget
+            if self.isCdb or innerType.code is not TypeCode.Typedef:
+                targetType = innerType
+            else:
+                targetType = innerType.target()
 
             if targetType.name in ('char', 'signed char', 'unsigned char', 'uint8_t', 'CHAR'):
                 # Use UTF-8 as default for char *.
-                self.putType(typeName)
+                self.putType(typename)
                 (length, shown, data) = self.readToFirstZero(ptr, 1, limit)
                 self.putValue(data, 'utf8', length=length)
                 if self.isExpanded():
@@ -1258,7 +1446,7 @@ class DumperBase():
                 return True
 
             if targetType.name in ('wchar_t', 'WCHAR'):
-                self.putType(typeName)
+                self.putType(typename)
                 charSize = self.lookupType('wchar_t').size()
                 (length, data) = self.encodeCArray(ptr, charSize, limit)
                 if charSize == 2:
@@ -1268,58 +1456,54 @@ class DumperBase():
                 return True
 
         if displayFormat == DisplayFormat.Latin1String:
-            self.putType(typeName)
+            self.putType(typename)
             (length, data) = self.encodeCArray(ptr, 1, limit)
             self.putValue(data, 'latin1', length=length)
             return True
 
         if displayFormat == DisplayFormat.SeparateLatin1String:
-            self.putType(typeName)
+            self.putType(typename)
             (length, data) = self.encodeCArray(ptr, 1, limit)
             self.putValue(data, 'latin1', length=length)
             self.putDisplay('latin1:separate', data)
             return True
 
         if displayFormat == DisplayFormat.Utf8String:
-            self.putType(typeName)
+            self.putType(typename)
             (length, data) = self.encodeCArray(ptr, 1, limit)
             self.putValue(data, 'utf8', length=length)
             return True
 
         if displayFormat == DisplayFormat.SeparateUtf8String:
-            self.putType(typeName)
+            self.putType(typename)
             (length, data) = self.encodeCArray(ptr, 1, limit)
             self.putValue(data, 'utf8', length=length)
             self.putDisplay('utf8:separate', data)
             return True
 
         if displayFormat == DisplayFormat.Local8BitString:
-            self.putType(typeName)
+            self.putType(typename)
             (length, data) = self.encodeCArray(ptr, 1, limit)
             self.putValue(data, 'local8bit', length=length)
             return True
 
         if displayFormat == DisplayFormat.Utf16String:
-            self.putType(typeName)
+            self.putType(typename)
             (length, data) = self.encodeCArray(ptr, 2, limit)
             self.putValue(data, 'utf16', length=length)
             return True
 
         if displayFormat == DisplayFormat.Ucs4String:
-            self.putType(typeName)
+            self.putType(typename)
             (length, data) = self.encodeCArray(ptr, 4, limit)
             self.putValue(data, 'ucs4', length=length)
             return True
 
         return False
 
-    def putFormattedPointer(self, value):
-        #with self.timer('formattedPointer'):
-        self.putFormattedPointerX(value)
-
     def putDerefedPointer(self, value):
-        derefValue = value.dereference()
-        innerType = value.type.target()  # .unqualified()
+        derefValue = self.value_dereference(value)
+        innerType = value.type.target()
         self.putType(innerType)
         savedCurrentChildType = self.currentChildType
         self.currentChildType = innerType.name
@@ -1332,47 +1516,47 @@ class DumperBase():
         self.putItem(derefValue)
         self.currentChildType = savedCurrentChildType
 
-    def putFormattedPointerX(self, value):
+    def putFormattedPointer(self, value):
         self.putOriginalAddress(value.address())
-        #DumperBase.warn("PUT FORMATTED: %s" % value)
-        pointer = value.pointer()
+        #self.warn("PUT FORMATTED: %s" % value)
+        pointer = self.value_as_address(value)
         self.putAddress(pointer)
-        #DumperBase.warn('POINTER: 0x%x' % pointer)
+        #self.warn('POINTER: 0x%x' % pointer)
         if pointer == 0:
-            #DumperBase.warn('NULL POINTER')
-            self.putType(value.type)
+            #self.warn('NULL POINTER')
+            self.putType(value.typeid)
             self.putValue('0x0')
             return
 
-        typeName = value.type.name
+        typename = self.type_name(value.typeid)
 
         try:
             self.readRawMemory(pointer, 1)
         except:
             # Failure to dereference a pointer should at least
             # show the value of a pointer.
-            #DumperBase.warn('BAD POINTER: %s' % value)
+            #self.warn('BAD POINTER: %s' % value)
             self.putValue('0x%x' % pointer)
-            self.putType(typeName)
+            self.putType(typename)
             return
 
         if self.currentIName.endswith('.this'):
             self.putDerefedPointer(value)
             return
 
-        displayFormat = self.currentItemFormat(value.type.name)
-        innerType = value.type.target()  # .unqualified()
+        displayFormat = self.currentItemFormat(typename)
+        innerType = value.type.target()
 
         if innerType.name == 'void':
-            #DumperBase.warn('VOID POINTER: %s' % displayFormat)
-            self.putType(typeName)
+            #self.warn('VOID POINTER: %s' % displayFormat)
+            self.putType(typename)
             self.putSymbolValue(pointer)
             return
 
         if displayFormat == DisplayFormat.Raw:
             # Explicitly requested bald pointer.
-            #DumperBase.warn('RAW')
-            self.putType(typeName)
+            #self.warn('RAW')
+            self.putType(typename)
             self.putValue('0x%x' % pointer)
             self.putExpandable()
             if self.currentIName in self.expandedINames:
@@ -1384,27 +1568,27 @@ class DumperBase():
         limit = self.displayStringLimit
         if displayFormat in (DisplayFormat.SeparateLatin1String, DisplayFormat.SeparateUtf8String):
             limit = 1000000
-        if self.tryPutSimpleFormattedPointer(pointer, typeName,
+        if self.tryPutSimpleFormattedPointer(pointer, typename,
                                              innerType, displayFormat, limit):
             self.putExpandable()
             return
 
         if DisplayFormat.Array10 <= displayFormat and displayFormat <= DisplayFormat.Array10000:
             n = (10, 100, 1000, 10000)[displayFormat - DisplayFormat.Array10]
-            self.putType(typeName)
+            self.putType(typename)
             self.putItemCount(n)
-            self.putArrayData(value.pointer(), n, innerType)
+            self.putArrayData(self.value_as_address(value), n, innerType)
             return
 
         if innerType.code == TypeCode.Function:
             # A function pointer.
             self.putSymbolValue(pointer)
-            self.putType(typeName)
+            self.putType(typename)
             return
 
-        #DumperBase.warn('AUTODEREF: %s' % self.autoDerefPointers)
-        #DumperBase.warn('INAME: %s' % self.currentIName)
-        #DumperBase.warn('INNER: %s' % innerType.name)
+        #self.warn('AUTODEREF: %s' % self.autoDerefPointers)
+        #self.warn('INAME: %s' % self.currentIName)
+        #self.warn('INNER: %s' % innerType.name)
         if self.autoDerefPointers:
             # Generic pointer type with AutomaticFormat, but never dereference char types:
             if innerType.name not in (
@@ -1425,9 +1609,9 @@ class DumperBase():
                 self.putDerefedPointer(value)
                 return
 
-        #DumperBase.warn('GENERIC PLAIN POINTER: %s' % value.type)
-        #DumperBase.warn('ADDR PLAIN POINTER: 0x%x' % value.laddress)
-        self.putType(typeName)
+        #self.warn('GENERIC PLAIN POINTER: %s' % value.type)
+        #self.warn('ADDR PLAIN POINTER: 0x%x' % value.laddress)
+        self.putType(typename)
         self.putSymbolValue(pointer)
         self.putExpandable()
         if self.currentIName in self.expandedINames:
@@ -1439,7 +1623,22 @@ class DumperBase():
         if address is not None:
             self.put('origaddr="0x%x",' % address)
 
+    def wantQObjectNames(self):
+        return self.showQObjectNames and self.qtLoaded
+
+    def fetchInternalFunctions(self):
+        # Overrridden
+        pass
+
     def putQObjectNameValue(self, value):
+        is_qobject_based = self.type_qobject_based_cache.get(value.typeid, None)
+        if is_qobject_based == False:
+            #self.warn("SKIP TEST OBJNAME: %s" % self.type_name(value.typeid))
+            return
+
+        #self.warn("TEST OBJNAME: %s" % self.type_name(value.typeid))
+        self.fetchInternalFunctions()
+
         try:
             # dd = value['d_ptr']['d'] is just behind the vtable.
             (vtable, dd) = self.split('pp', value)
@@ -1448,7 +1647,7 @@ class DumperBase():
 
             intSize = 4
             ptrSize = self.ptrSize()
-            if self.qtVersion() >= 0x060000:
+            if self.qtVersionAtLeast(0x060000):
                 # Size of QObjectData: 9 pointer + 2 int
                 #   - vtable
                 #   - QObject *q_ptr;
@@ -1458,7 +1657,7 @@ class DumperBase():
                 #   - int postedEvents;
                 #   - QDynamicMetaObjectData *metaObject;
                 #   - QBindingStorage bindingStorage;
-                extra = self.extractPointer(dd + 9 * ptrSize + 2 * intSize)
+                extra = self.extract_pointer_at_address(dd + 9 * ptrSize + 2 * intSize)
                 if extra == 0:
                     return False
 
@@ -1469,7 +1668,7 @@ class DumperBase():
                 #   - QList<QPointer<QObject> > eventFilters;
                 #   - QString objectName
                 objectNameAddress = extra + 12 * ptrSize
-            elif self.qtVersion() >= 0x050000:
+            elif self.qtVersionAtLeast(0x050000):
                 # Size of QObjectData: 5 pointer + 2 int
                 #   - vtable
                 #   - QObject *q_ptr;
@@ -1478,7 +1677,7 @@ class DumperBase():
                 #   - uint isWidget : 1; etc...
                 #   - int postedEvents;
                 #   - QDynamicMetaObjectData *metaObject;
-                extra = self.extractPointer(dd + 5 * ptrSize + 2 * intSize)
+                extra = self.extract_pointer_at_address(dd + 5 * ptrSize + 2 * intSize)
                 if extra == 0:
                     return False
 
@@ -1582,7 +1781,7 @@ class DumperBase():
 
         try:
             customEventOffset = 8 if self.isMsvcTarget() else 9
-            customEventFunc = self.extractPointer(vtablePtr + customEventOffset * self.ptrSize())
+            customEventFunc = self.extract_pointer_at_address(vtablePtr + customEventOffset * self.ptrSize())
         except:
             self.bump('nostruct-3')
             return False
@@ -1594,7 +1793,7 @@ class DumperBase():
             customEventFunc = getJumpAddress_x86(self, customEventFunc)
             if customEventFunc in (self.qtCustomEventFunc, self.qtCustomEventPltFunc):
                 return True
-            customEventFunc = self.extractPointer(customEventFunc)
+            customEventFunc = self.extract_pointer_at_address(customEventFunc)
             if customEventFunc in (self.qtCustomEventFunc, self.qtCustomEventPltFunc):
                 return True
             # If the object is defined in another module there may be another level of indirection
@@ -1603,18 +1802,18 @@ class DumperBase():
         return customEventFunc in (self.qtCustomEventFunc, self.qtCustomEventPltFunc)
 
 #    def extractQObjectProperty(objectPtr):
-#        vtablePtr = self.extractPointer(objectPtr)
-#        metaObjectFunc = self.extractPointer(vtablePtr)
+#        vtablePtr = self.extract_pointer_at_address(objectPtr)
+#        metaObjectFunc = self.extract_pointer_at_address(vtablePtr)
 #        cmd = '((void*(*)(void*))0x%x)((void*)0x%x)' % (metaObjectFunc, objectPtr)
 #        try:
-#            #DumperBase.warn('MO CMD: %s' % cmd)
+#            #self.warn('MO CMD: %s' % cmd)
 #            res = self.parseAndEvaluate(cmd)
-#            #DumperBase.warn('MO RES: %s' % res)
+#            #self.warn('MO RES: %s' % res)
 #            self.bump('successfulMetaObjectCall')
-#            return res.pointer()
+#            return self.value_as_address(res)
 #        except:
 #            self.bump('failedMetaObjectCall')
-#            #DumperBase.warn('COULD NOT EXECUTE: %s' % cmd)
+#            #self.warn('COULD NOT EXECUTE: %s' % cmd)
 #        return 0
 
     def extractMetaObjectPtr(self, objectPtr, typeobj):
@@ -1631,29 +1830,29 @@ class DumperBase():
             # contents 'vanishes' as the reported size of the string
             # gets zeroed out(?).
             # Try vtable, metaObject() is the first entry.
-            vtablePtr = self.extractPointer(objectPtr)
-            metaObjectFunc = self.extractPointer(vtablePtr)
+            vtablePtr = self.extract_pointer_at_address(objectPtr)
+            metaObjectFunc = self.extract_pointer_at_address(vtablePtr)
             cmd = '((void*(*)(void*))0x%x)((void*)0x%x)' % (metaObjectFunc, objectPtr)
             try:
-                #DumperBase.warn('MO CMD: %s' % cmd)
+                #self.warn('MO CMD: %s' % cmd)
                 res = self.parseAndEvaluate(cmd)
-                #DumperBase.warn('MO RES: %s' % res)
+                #self.warn('MO RES: %s' % res)
                 self.bump('successfulMetaObjectCall')
-                return res.pointer()
+                return self.value_as_address(res)
             except:
                 self.bump('failedMetaObjectCall')
-                #DumperBase.warn('COULD NOT EXECUTE: %s' % cmd)
+                #self.warn('COULD NOT EXECUTE: %s' % cmd)
             return 0
 
         def extractStaticMetaObjectFromTypeHelper(someTypeObj):
             if someTypeObj.isSimpleType():
                 return 0
 
-            typeName = someTypeObj.name
-            isQObjectProper = typeName == self.qtNamespace() + 'QObject'
+            typename = someTypeObj.name
+            isQObjectProper = typename == self.qtNamespace() + 'QObject'
 
             # No templates for now.
-            if typeName.find('<') >= 0:
+            if typename.find('<') >= 0:
                 return 0
 
             result = self.findStaticMetaObject(someTypeObj)
@@ -1662,7 +1861,7 @@ class DumperBase():
             # a Q_OBJECT SMO has a non-null superdata (unless it's QObject itself),
             # a Q_GADGET SMO has a null superdata (hopefully)
             if result and not isQObjectProper:
-                if self.qtVersion() >= 0x60000 and self.isWindowsTarget():
+                if self.qtVersionAtLeast(0x60000) and self.isWindowsTarget():
                     (direct, indirect) = self.split('pp', result)
                     # since Qt 6 there is an additional indirect super data getter on windows
                     if direct == 0 and indirect == 0:
@@ -1706,16 +1905,16 @@ class DumperBase():
 
         ptrSize = self.ptrSize()
 
-        typeName = typeobj.name
-        result = self.knownStaticMetaObjects.get(typeName, None)
+        typename = typeobj.name
+        result = self.knownStaticMetaObjects.get(typename, None)
         if result is not None:  # Is 0 or the static metaobject.
             self.bump('typecached')
-            #DumperBase.warn('CACHED RESULT: %s %s 0x%x' % (self.currentIName, typeName, result))
+            #self.warn('CACHED RESULT: %s %s 0x%x' % (self.currentIName, typename, result))
             return result
 
         if not self.couldBeQObjectPointer(objectPtr):
             self.bump('cannotBeQObject')
-            #DumperBase.warn('DOES NOT LOOK LIKE A QOBJECT: %s' % self.currentIName)
+            #self.warn('DOES NOT LOOK LIKE A QOBJECT: %s' % self.currentIName)
             return 0
 
         metaObjectPtr = 0
@@ -1731,38 +1930,29 @@ class DumperBase():
 
         #if metaObjectPtr:
         #    self.bump('foundMetaObject')
-        #    self.knownStaticMetaObjects[typeName] = metaObjectPtr
+        #    self.8;
 
         return metaObjectPtr
 
-    def split(self, pattern, value):
-        if isinstance(value, self.Value):
-            return value.split(pattern)
-        if self.isInt(value):
-            val = self.Value(self)
-            val.laddress = value
-            return val.split(pattern)
-        raise RuntimeError('CANNOT EXTRACT STRUCT FROM %s' % type(value))
-
     def extractCString(self, addr):
         result = bytearray()
         while True:
-            d = self.extractByte(addr)
-            if d == 0:
+            d = bytes(self.readRawMemory(addr, 1))
+            if d[0] == 0:
                 break
-            result.append(d)
+            result += d
             addr += 1
         return result
 
     def listData(self, value, check=True):
-        if self.qtVersion() >= 0x60000:
+        if self.qtVersionAtLeast(0x60000):
             dd, data, size = self.split('ppi', value)
             return data, size
 
         base = self.extractPointer(value)
         (ref, alloc, begin, end) = self.split('IIII', base)
         array = base + 16
-        if self.qtVersion() < 0x50000:
+        if not self.qtVersionAtLeast(0x50000):
             array += self.ptrSize()
         size = end - begin
 
@@ -1775,21 +1965,21 @@ class DumperBase():
         data = array + begin * stepSize
         return data, size
 
-    def putTypedPointer(self, name, addr, typeName):
+    def putTypedPointer(self, name, addr, typename):
         """ Prints a typed pointer, expandable if the type can be resolved,
             and without children otherwise """
         with SubItem(self, name):
             self.putAddress(addr)
             self.putValue('@0x%x' % addr)
-            typeObj = self.lookupType(typeName)
+            typeObj = self.lookupType(typename)
             if typeObj:
                 self.putType(typeObj)
                 self.putExpandable()
                 if self.isExpanded():
                     with Children(self):
-                        self.putFields(self.createValue(addr, typeObj))
+                        self.putFields(self.createValueFromAddress(addr, typeObj))
             else:
-                self.putType(typeName)
+                self.putType(typename)
 
     # This is called is when a QObject derived class is expanded
     def tryPutQObjectGuts(self, value):
@@ -1801,26 +1991,26 @@ class DumperBase():
     def metaString(self, metaObjectPtr, index, revision):
         ptrSize = self.ptrSize()
         stringdataOffset = ptrSize
-        if self.isWindowsTarget() and self.qtVersion() >= 0x060000:
+        if self.isWindowsTarget() and self.qtVersionAtLeast(0x060000):
             stringdataOffset += ptrSize # indirect super data member
-        stringdata = self.extractPointer(toInteger(metaObjectPtr) + stringdataOffset)
+        stringdata = self.extract_pointer_at_address(int(metaObjectPtr) + stringdataOffset)
 
-        def unpackString(base, size):
+        def unpack_string(base, size):
             try:
                 s = struct.unpack_from('%ds' % size, self.readRawMemory(base, size))[0]
-                return s if sys.version_info[0] == 2 else s.decode('utf8')
+                return s.decode('utf8')
             except:
                 return '<not available>'
 
         if revision >= 9:  # Qt 6.
             pos, size = self.split('II', stringdata + 8 * index)
-            return unpackString(stringdata + pos, size)
+            return unpack_string(stringdata + pos, size)
 
         if revision >= 7:  # Qt 5.
             byteArrayDataSize = 24 if ptrSize == 8 else 16
-            literal = stringdata + toInteger(index) * byteArrayDataSize
+            literal = stringdata + int(index) * byteArrayDataSize
             base, size, _ = self.qArrayDataHelper(literal)
-            return unpackString(base, size)
+            return unpack_string(base, size)
 
         ldata = stringdata + index
         return self.extractCString(ldata).decode('utf8')
@@ -1830,25 +2020,25 @@ class DumperBase():
             self.putField('sortgroup', sortorder)
 
     def putQMetaStuff(self, value, origType):
-        if self.qtVersion() >= 0x060000:
+        if self.qtVersionAtLeast(0x060000):
             metaObjectPtr, handle = value.split('pp')
         else:
             metaObjectPtr, handle = value.split('pI')
         if metaObjectPtr != 0:
-            if self.qtVersion() >= 0x060000:
+            if self.qtVersionAtLeast(0x060000):
                 if handle == 0:
                     self.putEmptyValue()
                     return
                 revision = 9
                 name, alias, flags, keyCount, data = self.split('IIIII', handle)
                 index = name
-            elif self.qtVersion() >= 0x050000:
+            elif self.qtVersionAtLeast(0x050000):
                 revision = 7
-                dataPtr = self.extractPointer(metaObjectPtr + 2 * self.ptrSize())
+                dataPtr = self.extract_pointer_at_address(metaObjectPtr + 2 * self.ptrSize())
                 index = self.extractInt(dataPtr + 4 * handle)
             else:
                 revision = 6
-                dataPtr = self.extractPointer(metaObjectPtr + 2 * self.ptrSize())
+                dataPtr = self.extract_pointer_at_address(metaObjectPtr + 2 * self.ptrSize())
                 index = self.extractInt(dataPtr + 4 * handle)
             #self.putValue("index: %s rev: %s" % (index, revision))
             name = self.metaString(metaObjectPtr, index, revision)
@@ -1873,29 +2063,29 @@ class DumperBase():
     def putQObjectGutsHelper(self, qobject, qobjectPtr, handle, metaObjectPtr, origType):
         ptrSize = self.ptrSize()
 
-        def putt(name, value, typeName=' '):
+        def putt(name, value, typename=' '):
             with SubItem(self, name):
                 self.putValue(value)
-                self.putType(typeName)
+                self.putType(typename)
 
         def extractSuperDataPtr(someMetaObjectPtr):
             #return someMetaObjectPtr['d']['superdata']
-            return self.extractPointer(someMetaObjectPtr)
+            return self.extract_pointer_at_address(someMetaObjectPtr)
 
         def extractDataPtr(someMetaObjectPtr):
             # dataPtr = metaObjectPtr['d']['data']
-            if self.qtVersion() >= 0x60000 and self.isWindowsTarget():
+            if self.qtVersionAtLeast(0x60000) and self.isWindowsTarget():
                 offset = 3
             else:
                 offset = 2
-            return self.extractPointer(someMetaObjectPtr + offset * ptrSize)
+            return self.extract_pointer_at_address(someMetaObjectPtr + offset * ptrSize)
 
         isQMetaObject = origType == 'QMetaObject'
         isQObject = origType == 'QObject'
 
-        #DumperBase.warn('OBJECT GUTS: %s 0x%x ' % (self.currentIName, metaObjectPtr))
+        #self.warn('OBJECT GUTS: %s 0x%x ' % (self.currentIName, metaObjectPtr))
         dataPtr = extractDataPtr(metaObjectPtr)
-        #DumperBase.warn('DATA PTRS: %s 0x%x ' % (self.currentIName, dataPtr))
+        #self.warn('DATA PTRS: %s 0x%x ' % (self.currentIName, dataPtr))
         (revision, classname,
             classinfo, classinfo2,
             methodCount, methods,
@@ -1913,14 +2103,14 @@ class DumperBase():
         ns = self.qtNamespace()
         extraData = 0
         if qobjectPtr:
-            dd = self.extractPointer(qobjectPtr + ptrSize)
-            if self.qtVersion() >= 0x60000:
+            dd = self.extract_pointer_at_address(qobjectPtr + ptrSize)
+            if self.qtVersionAtLeast(0x60000):
                 (dvtablePtr, qptr, parent, children, bindingStorageData, bindingStatus,
                     flags, postedEvents, dynMetaObjectPtr, # Up to here QObjectData.
                     extraData, threadDataPtr, connectionListsPtr,
                     sendersPtr, currentSenderPtr) \
                     = self.split('pp{@QObject*}{@QList<@QObject *>}ppIIp' + 'ppppp', dd)
-            elif self.qtVersion() >= 0x50000:
+            elif self.qtVersionAtLeast(0x50000):
                 (dvtablePtr, qptr, parent, children, flags, postedEvents,
                     dynMetaObjectPtr,  # Up to here QObjectData.
                     extraData, threadDataPtr, connectionListsPtr,
@@ -1942,7 +2132,7 @@ class DumperBase():
                 if not self.isCli:
                     self.putSortGroup(8)
 
-                dvtablePtr, qptr, parentPtr, children = self.split('ppp{QList<QObject *>}', dd)
+                dvtablePtr, qptr, parentPtr, children = self.split('ppp{@QList<@QObject *>}', dd)
                 self.putItem(children)
 
         if isQMetaObject:
@@ -2003,8 +2193,9 @@ class DumperBase():
                         if False:
                             with SubItem(self, '[connections]'):
                                 if connectionListsPtr:
-                                    typeName = '@QObjectConnectionListVector'
-                                    self.putItem(self.createValue(connectionListsPtr, typeName))
+                                    typename = '@QObjectConnectionListVector'
+                                    self.putItem(self.createValueFromAddress(connectionListsPtr,
+typename))
                                 else:
                                     self.putItemCount(0)
 
@@ -2045,7 +2236,7 @@ class DumperBase():
                     with Children(self):
                         # Static properties.
                         for i in range(propertyCount):
-                            if self.qtVersion() >= 0x60000:
+                            if self.qtVersionAtLeast(0x60000):
                                 t = self.split('IIIII', dataPtr + properties * 4 + 20 * i)
                             else:
                                 t = self.split('III', dataPtr + properties * 4 + 12 * i)
@@ -2053,19 +2244,19 @@ class DumperBase():
                             if qobject and self.qtPropertyFunc:
                                     # LLDB doesn't like calling it on a derived class, possibly
                                     # due to type information living in a different shared object.
-                                    #base = self.createValue(qobjectPtr, '@QObject')
-                                    #DumperBase.warn("CALL FUNC: 0x%x" % self.qtPropertyFunc)
+                                    #base = self.createValueFromAddress(qobjectPtr, '@QObject')
+                                    #self.warn("CALL FUNC: 0x%x" % self.qtPropertyFunc)
                                 cmd = '((QVariant(*)(void*,char*))0x%x)((void*)0x%x,"%s")' \
                                     % (self.qtPropertyFunc, qobjectPtr, name)
                                 try:
-                                        #DumperBase.warn('PROP CMD: %s' % cmd)
+                                        #self.warn('PROP CMD: %s' % cmd)
                                     res = self.parseAndEvaluate(cmd)
-                                    #DumperBase.warn('PROP RES: %s' % res)
+                                    #self.warn('PROP RES: %s' % res)
                                 except:
                                     self.bump('failedMetaObjectCall')
                                     putt(name, ' ')
                                     continue
-                                    #DumperBase.warn('COULD NOT EXECUTE: %s' % cmd)
+                                    #self.warn('COULD NOT EXECUTE: %s' % cmd)
                                 #self.putCallItem(name, '@QVariant', base, 'property', '"' + name + '"')
                                 if res is None:
                                     self.bump('failedMetaObjectCall2')
@@ -2077,37 +2268,42 @@ class DumperBase():
 
                         # Dynamic properties.
                         if extraData:
-                            def list6Generator(addr, innerType):
+                            def list6Generator(addr, inner_typeid):
+                                data, size = self.listData(addr)
+                                inner_size = self.type_size(inner_typeid)
+                                for i in range(size):
+                                    yield self.createValueFromAddress(data, inner_typeid)
+                                    data += inner_size
+
+                            def list5Generator(addr, inner_typeid):
                                 data, size = self.listData(addr)
                                 for i in range(size):
-                                    yield self.createValue(data + i * innerType.size(), innerType)
+                                    yield self.createValueFromAddress(data, inner_typeid)
+                                    data += ptrSize
 
-                            def list5Generator(addr, innerType):
-                                data, size = self.listData(addr)
-                                for i in range(size):
-                                    yield self.createValue(data + i * ptrSize, innerType)
-
-                            def vectorGenerator(addr, innerType):
+                            def vectorGenerator(addr, inner_typeid):
                                 data, size = self.vectorData(addr)
+                                inner_size = self.type_size(inner_typeid)
                                 for i in range(size):
-                                    yield self.createValue(data + i * innerType.size(), innerType)
+                                    yield self.createValueFromAddress(data, inner_typeid)
+                                    data += inner_size
 
-                            byteArrayType = self.createType('@QByteArray')
-                            variantType = self.createType('@QVariant')
-                            if self.qtVersion() >= 0x60000:
-                                values = vectorGenerator(extraData + 3 * ptrSize, variantType)
-                            elif self.qtVersion() >= 0x50600:
-                                values = vectorGenerator(extraData + 2 * ptrSize, variantType)
-                            elif self.qtVersion() >= 0x50000:
-                                values = list5Generator(extraData + 2 * ptrSize, variantType)
+                            variant_typeid = self.cheap_typeid_from_name('@QVariant')
+                            if self.qtVersionAtLeast(0x60000):
+                                values = vectorGenerator(extraData + 3 * ptrSize, variant_typeid)
+                            elif self.qtVersionAtLeast(0x50600):
+                                values = vectorGenerator(extraData + 2 * ptrSize, variant_typeid)
+                            elif self.qtVersionAtLeast(0x50000):
+                                values = list5Generator(extraData + 2 * ptrSize, variant_typeid)
                             else:
-                                values = list5Generator(extraData + 2 * ptrSize,
-                                                        variantType.pointer())
+                                variantptr_typeid = self.cheap_typeid_from_name('@QVariant')
+                                values = list5Generator(extraData + 2 * ptrSize, variantptr_typeid)
 
-                            if self.qtVersion() >= 0x60000:
-                                names = list6Generator(extraData, byteArrayType)
+                            bytearray_typeid = self.cheap_typeid_from_name('@QByteArray')
+                            if self.qtVersionAtLeast(0x60000):
+                                names = list6Generator(extraData, bytearray_typeid)
                             else:
-                                names = list5Generator(extraData + ptrSize, byteArrayType)
+                                names = list5Generator(extraData + ptrSize, bytearray_typeid)
 
                             for (k, v) in zip(names, values):
                                 with SubItem(self, propertyCount + dynamicPropertyCount):
@@ -2169,7 +2365,7 @@ class DumperBase():
 
         if isQObject:
             with SubItem(self, '[d]'):
-                self.putItem(self.createValue(dd, '@QObjectPrivate'))
+                self.putItem(self.createValueFromAddress(dd, '@QObjectPrivate'))
                 self.putSortGroup(15)
 
         if isQMetaObject:
@@ -2199,10 +2395,10 @@ class DumperBase():
         with SubItem(self, '[connections]'):
             ptrSize = self.ptrSize()
             self.putNoType()
-            privateType = self.createType('@QObjectPrivate')
+            privateType = self.create_typeid_from_name('@QObjectPrivate')
             d_ptr = dd.cast(privateType.pointer()).dereference()
             connections = d_ptr['connectionLists']
-            if self.connections.integer() == 0:
+            if self.value_as_integer(connections) == 0:
                 self.putItemCount(0)
             else:
                 connections = connections.dereference()
@@ -2215,72 +2411,74 @@ class DumperBase():
                     innerType = connections.type[0]
                     # Should check:  innerType == ns::QObjectPrivate::ConnectionList
                     data, size = self.vectorData(connections)
-                    connectionType = self.createType('@QObjectPrivate::Connection')
+                    connection_typeid = self.create_typeid_from_name('@QObjectPrivate::Connection')
+                    connection_ptr_typeid = self.create_pointer_typeid(connection_typeid)
                     for i in range(size):
-                        first = self.extractPointer(data + i * 2 * ptrSize)
+                        first = self.extract_pointer_at_address(data + i * 2 * ptrSize)
                         while first:
-                            self.putSubItem('%s' % pp,
-                                            self.createPointerValue(first, connectionType))
-                            first = self.extractPointer(first + 3 * ptrSize)
+                            val = self.Value(self)
+                            val.ldata = first
+                            val.typeid = connection_typeid
+                            self.putSubItem('%s' % pp, val)
+                            first = self.extract_pointer_at_address(first + 3 * ptrSize)
                             # We need to enforce some upper limit.
                             pp += 1
                             if pp > 1000:
                                 break
 
-    def currentItemFormat(self, typeName=None):
+    def currentItemFormat(self, typename=None):
         displayFormat = self.formats.get(self.currentIName, DisplayFormat.Automatic)
         if displayFormat == DisplayFormat.Automatic:
-            if typeName is None:
-                typeName = self.currentType.value
-            needle = None if typeName is None else self.stripForFormat(typeName)
+            if typename is None:
+                typename = self.currentType.value
+            needle = None if typename is None else self.stripForFormat(typename)
             displayFormat = self.typeformats.get(needle, DisplayFormat.Automatic)
         return displayFormat
 
     def putSubItem(self, component, value):  # -> ReportItem
         if not isinstance(value, self.Value):
             raise RuntimeError('WRONG VALUE TYPE IN putSubItem: %s' % type(value))
-        if not isinstance(value.type, self.Type):
-            raise RuntimeError('WRONG TYPE TYPE IN putSubItem: %s' % type(value.type))
         res = None
         with SubItem(self, component):
             self.putItem(value)
             res = self.currentValue
         return res  # The 'short' display.
 
-    def putArrayData(self, base, n, innerType, childNumChild=None):
+    def putArrayData(self, base, n, inner_typish, childNumChild=None):
         self.checkIntType(base)
         self.checkIntType(n)
-        addrBase = base
-        innerSize = innerType.size()
+        inner_typeid = self.typeid_for_typish(inner_typish)
+        inner_size = self.type_size(inner_typeid)
         self.putNumChild(n)
-        #DumperBase.warn('ADDRESS: 0x%x INNERSIZE: %s INNERTYPE: %s' % (addrBase, innerSize, innerType))
-        enc = innerType.simpleEncoding()
+        #self.warn('ADDRESS: 0x%x INNERSIZE: %s INNERTYPE: %s' % (base, inner_size, inner_typeid))
+        enc = self.type_encoding_cache.get(inner_typeid, None)
         maxNumChild = self.maxArrayCount()
         if enc:
-            self.put('childtype="%s",' % innerType.name)
-            self.put('addrbase="0x%x",' % addrBase)
-            self.put('addrstep="0x%x",' % innerSize)
+            self.put('childtype="%s",' % self.type_name(inner_typeid))
+            self.put('addrbase="0x%x",' % base)
+            self.put('addrstep="0x%x",' % inner_size)
             self.put('arrayencoding="%s",' % enc)
             self.put('endian="%s",' % self.packCode)
             if n > maxNumChild:
                 self.put('childrenelided="%s",' % n)
                 n = maxNumChild
             self.put('arraydata="')
-            self.put(self.readMemory(addrBase, n * innerSize))
+            self.put(self.readMemory(base, n * inner_size))
             self.put('",')
         else:
+            innerType = self.Type(self, inner_typeid)
             with Children(self, n, innerType, childNumChild, maxNumChild,
-                          addrBase=addrBase, addrStep=innerSize):
+                          addrBase=base, addrStep=inner_size):
                 for i in self.childRange():
-                    self.putSubItem(i, self.createValue(addrBase + i * innerSize, innerType))
+                    self.putSubItem(i, self.createValueFromAddress(base + i * inner_size, innerType))
 
-    def putArrayItem(self, name, addr, n, typeName):
+    def putArrayItem(self, name, addr, n, typename):
         self.checkIntType(addr)
         self.checkIntType(n)
         with SubItem(self, name):
             self.putEmptyValue()
-            self.putType('%s [%d]' % (typeName, n))
-            self.putArrayData(addr, n, self.lookupType(typeName))
+            self.putType('%s [%d]' % (typename, n))
+            self.putArrayData(addr, n, self.lookupType(typename))
             self.putAddress(addr)
 
     def putPlotDataHelper(self, base, n, innerType, maxNumChild=1000 * 1000):
@@ -2303,13 +2501,15 @@ class DumperBase():
         """
         Special handling for char** argv.
         """
+        ptr_size = self.ptrSize()
         n = 0
-        p = value
-        # p is 0 for "optimized out" cases. Or contains rubbish.
+        argv = self.value_as_address(value)
+        # argv is 0 for "optimized out" cases. Or contains rubbish.
         try:
-            if value.integer():
-                while p.dereference().integer() and n <= 100:
-                    p += 1
+            if argv:
+                p = argv
+                while self.extract_pointer_at_address(p) and n <= 100:
+                    p += ptr_size
                     n += 1
         except:
             pass
@@ -2325,44 +2525,54 @@ class DumperBase():
                         self.putSubItem(i, p.dereference())
                         p += 1
 
+    def extract_pointer_at_address(self, address):
+        blob = self.value_data_from_address(address, self.ptrSize())
+        return int.from_bytes(blob, byteorder='little')
+
+    def value_extract_integer(self, value, size, signed):
+        if isinstance(value.lvalue, int):
+            return value.lvalue
+        if isinstance(value.ldata, int):
+            return value.ldata
+        #with self.dumper.timer('extractInt'):
+        value.check()
+        blob = self.value_data(value, size)
+        return int.from_bytes(blob, byteorder='little', signed=signed)
+
+    def value_extract_something(self, valuish, size, signed=False):
+        if isinstance(valuish, int):
+            blob = self.value_data_from_address(valuish, size)
+        elif isinstance(valuish, self.Value):
+            blob = self.value_data(valuish, size)
+        else:
+            raise RuntimeError('CANT EXTRACT FROM %s' % type(valuish))
+        res = int.from_bytes(blob, byteorder='little', signed=signed)
+        #self.warn("EXTRACTED %s SIZE %s FROM %s" % (res, size, blob))
+        return res
+
     def extractPointer(self, value):
-        try:
-            if value.type.code == TypeCode.Array:
-                return value.address()
-        except:
-            pass
-        code = 'I' if self.ptrSize() == 4 else 'Q'
-        return self.extractSomething(value, code, 8 * self.ptrSize())
+        return self.value_extract_something(value, self.ptrSize())
 
     def extractInt64(self, value):
-        return self.extractSomething(value, 'q', 64)
+        return self.value_extract_something(value, 8, True)
 
     def extractUInt64(self, value):
-        return self.extractSomething(value, 'Q', 64)
+        return self.value_extract_something(value, 8)
 
     def extractInt(self, value):
-        return self.extractSomething(value, 'i', 32)
+        return self.value_extract_something(value, 4, True)
 
     def extractUInt(self, value):
-        return self.extractSomething(value, 'I', 32)
+        return self.value_extract_something(value, 4)
 
     def extractShort(self, value):
-        return self.extractSomething(value, 'h', 16)
+        return self.value_extract_something(value, 2, True)
 
     def extractUShort(self, value):
-        return self.extractSomething(value, 'H', 16)
+        return self.value_extract_something(value, 2)
 
     def extractByte(self, value):
-        return self.extractSomething(value, 'b', 8)
-
-    def extractSomething(self, value, pattern, bitsize):
-        if self.isInt(value):
-            val = self.Value(self)
-            val.laddress = value
-            return val.extractSomething(pattern, bitsize)
-        if isinstance(value, self.Value):
-            return value.extractSomething(pattern, bitsize)
-        raise RuntimeError('CANT EXTRACT FROM %s' % type(value))
+        return self.value_extract_something(value, 1)
 
     # Parses a..b and  a.(s).b
     def parseRange(self, exp):
@@ -2405,9 +2615,9 @@ class DumperBase():
 
             try:
                 # Allow integral expressions.
-                ss = self.parseAndEvaluate(s[1:len(s) - 1]).integer() if s else 1
-                aa = self.parseAndEvaluate(a).integer()
-                bb = self.parseAndEvaluate(b).integer()
+                ss = self.value_as_integer(self.parseAndEvaluate(s[1:len(s) - 1])) if s else 1
+                aa = self.value_as_integer(self.parseAndEvaluate(a))
+                bb = self.value_as_integer(self.parseAndEvaluate(b))
                 if aa < bb and ss > 0:
                     return True, aa, ss, bb + 1, template
             except:
@@ -2419,14 +2629,14 @@ class DumperBase():
             self.putField('numchild', numchild)
 
     def handleLocals(self, variables):
-        #DumperBase.warn('VARIABLES: %s' % variables)
-        #with self.timer('locals'):
+        #self.warn('VARIABLES: %s' % variables)
         shadowed = {}
         for value in variables:
             if value.name == 'argv':
                 if value.type.code == TypeCode.Pointer:
-                    if value.type.ltarget.code == TypeCode.Pointer:
-                        if value.type.ltarget.ltarget.name == 'char':
+                    target = value.type.target()
+                    if target.code == TypeCode.Pointer:
+                        if target.target().name == 'char':
                             self.putSpecialArgv(value)
                             continue
 
@@ -2455,7 +2665,7 @@ class DumperBase():
     def handleWatch(self, origexp, exp, iname):
         exp = str(exp).strip()
         escapedExp = self.hexencode(exp)
-        #DumperBase.warn('HANDLING WATCH %s -> %s, INAME: "%s"' % (origexp, exp, iname))
+        #self.warn('HANDLING WATCH %s -> %s, INAME: "%s"' % (origexp, exp, iname))
 
         # Grouped items separated by semicolon.
         if exp.find(';') >= 0:
@@ -2475,7 +2685,7 @@ class DumperBase():
         # Special array index: e.g a[1..199] or a[1.(3).199] for stride 3.
         isRange, begin, step, end, template = self.parseRange(exp)
         if isRange:
-            #DumperBase.warn('RANGE: %s %s %s in %s' % (begin, step, end, template))
+            #self.warn('RANGE: %s %s %s in %s' % (begin, step, end, template))
             r = range(begin, end, step)
             n = len(r)
             with TopLevelItem(self, iname):
@@ -2511,10 +2721,7 @@ class DumperBase():
         try:
             if funcname.startswith('qdump__'):
                 typename = funcname[7:]
-                if sys.version_info > (3,):
-                    spec = inspect.getfullargspec(function)
-                else:
-                    spec = inspect.getargspec(function)
+                spec = inspect.getfullargspec(function)
                 if len(spec.args) == 2:
                     self.qqDumpers[typename] = function
                 elif len(spec.args) == 3 and len(spec.defaults) == 1:
@@ -2561,11 +2768,8 @@ class DumperBase():
     def reloadDumpers(self, args):
         for mod in self.dumpermodules:
             m = sys.modules[mod]
-            if sys.version_info[0] >= 3:
-                import importlib
-                importlib.reload(m)
-            else:
-                reload(m)
+            import importlib
+            importlib.reload(m)
         self.setupDumpers(args)
 
     def loadDumpers(self, args):
@@ -2714,7 +2918,7 @@ class DumperBase():
         self.doContinue()
 
     def doInsertInterpreterBreakpoint(self, args, wasPending):
-        #DumperBase.warn('DO INSERT INTERPRETER BREAKPOINT, WAS PENDING: %s' % wasPending)
+        #self.warn('DO INSERT INTERPRETER BREAKPOINT, WAS PENDING: %s' % wasPending)
         # Will fail if the service is not yet up and running.
         response = self.sendInterpreterRequest('setbreakpoint', args)
         bp = None if response is None else response.get('breakpoint', None)
@@ -2749,14 +2953,6 @@ class DumperBase():
     def extractInterpreterStack(self):
         return self.sendInterpreterRequest('backtrace', {'limit': 10})
 
-    def isInt(self, thing):
-        if isinstance(thing, int):
-            return True
-        if sys.version_info[0] == 2:
-            if isinstance(thing, long):
-                return True
-        return False
-
     def putItems(self, count, generator, maxNumChild=10000):
         self.putItemCount(count)
         if self.isExpanded():
@@ -2765,131 +2961,124 @@ class DumperBase():
                     self.putSubItem(i, val)
 
     def putItem(self, value):
-        #with self.timer('putItem'):
-        self.putItemX(value)
-
-    def putItemX(self, value):
-        #DumperBase.warn('PUT ITEM: %s' % value.stringify())
-
-        typeobj = value.type  # unqualified()
-        typeName = typeobj.name
-
-        self.addToCache(typeobj)  # Fill type cache
+        #self.warn('PUT ITEM: %s' % value.stringify())
+        #self.dump_location()
+        #self.addToCache(typeobj)  # Fill type cache
 
         if not value.lIsInScope:
             self.putSpecialValue('optimizedout')
-            #self.putType(typeobj)
-            #self.putSpecialValue('outofscope')
             self.putNumChild(0)
             return
 
         if not isinstance(value, self.Value):
             raise RuntimeError('WRONG TYPE IN putItem: %s' % type(self.Value))
 
+        typeid = value.typeid
+        typecode = self.type_code(typeid)
+        typename = self.type_name(typeid)
+
         # Try on possibly typedefed type first.
-        if self.tryPutPrettyItem(typeName, value):
-            if typeobj.code == TypeCode.Pointer:
+        if self.tryPutPrettyItem(typename, value):
+            if typecode == TypeCode.Pointer:
                 self.putOriginalAddress(value.address())
             else:
                 self.putAddress(value.address())
             return
 
-        if typeobj.code == TypeCode.Typedef:
-            #DumperBase.warn('TYPEDEF VALUE: %s' % value.stringify())
+        if typecode == TypeCode.Typedef:
+            #self.warn('TYPEDEF VALUE: %s' % value.stringify())
             self.putItem(value.detypedef())
-            self.putBetterType(typeName)
+            self.putBetterType(typename)
             return
 
-        if typeobj.code == TypeCode.Pointer:
+        if typecode == TypeCode.Pointer:
             self.putFormattedPointer(value)
             if value.summary and self.useFancy:
                 self.putValue(self.hexencode(value.summary), 'utf8:1:0')
             return
 
         self.putAddress(value.address())
-        if value.lbitsize is not None:
-            self.putField('size', value.lbitsize // 8)
 
-        if typeobj.code == TypeCode.Function:
-            #DumperBase.warn('FUNCTION VALUE: %s' % value)
-            self.putType(typeobj)
-            self.putSymbolValue(value.pointer())
+        if typecode == TypeCode.Function:
+            #self.warn('FUNCTION VALUE: %s' % value)
+            self.putType(typeid)
+            self.putSymbolValue(self.value_as_address(value))
             self.putNumChild(0)
             return
 
-        if typeobj.code == TypeCode.Enum:
-            #DumperBase.warn('ENUM VALUE: %s' % value.stringify())
-            self.putType(typeobj.name)
+        if typecode == TypeCode.Enum:
+            #self.warn('ENUM VALUE: %s' % value.stringify())
+            self.putType(typename)
             self.putValue(value.display())
             self.putNumChild(0)
             return
 
-        if typeobj.code == TypeCode.Array:
-            #DumperBase.warn('ARRAY VALUE: %s' % value)
+        if typecode == TypeCode.Array:
+            #self.warn('ARRAY VALUE: %s' % value)
             self.putCStyleArray(value)
             return
 
-        if typeobj.code == TypeCode.Bitfield:
-            #DumperBase.warn('BITFIELD VALUE: %s %d %s' % (value.name, value.lvalue, typeName))
+        if typecode == TypeCode.Bitfield:
+            #self.warn('BITFIELD VALUE: %s %d %s' % (value.name, value.lvalue, typename))
             self.putNumChild(0)
-            dd = typeobj.ltarget.tdata.enumDisplay
-            self.putValue(str(value.lvalue) if dd is None else dd(
-                value.lvalue, value.laddress, '%d'))
-            self.putType(typeName)
+            #dd = typeobj.target().enumDisplay
+            #self.putValue(str(value.lvalue) if dd is None else dd(
+            #    value.lvalue, value.laddress, '%d'))
+            self.putValue(self.value_as_integer(value))
+            self.putType(typename)
             return
 
-        if typeobj.code == TypeCode.Integral:
-            #DumperBase.warn('INTEGER: %s %s' % (value.name, value))
-            val = value.value()
+        if typecode == TypeCode.Integral:
+            #self.warn('INTEGER: %s %s' % (value.name, value))
             self.putNumChild(0)
-            self.putValue(val)
-            self.putType(typeName)
+            self.putValue(self.value_as_integer(value))
+            self.putType(typename)
             return
 
-        if typeobj.code == TypeCode.Float:
-            #DumperBase.warn('FLOAT VALUE: %s' % value)
+        if typecode == TypeCode.Float:
+            #self.warn('FLOAT VALUE: %s' % value)
             self.putValue(value.value())
             self.putNumChild(0)
-            self.putType(typeobj.name)
+            self.putType(typename)
             return
 
-        if typeobj.code in (TypeCode.Reference, TypeCode.RValueReference):
-            #DumperBase.warn('REFERENCE VALUE: %s' % value)
+        if typecode in (TypeCode.Reference, TypeCode.RValueReference):
+            #self.warn('REFERENCE VALUE: %s' % value)
             val = value.dereference()
             if val.laddress != 0:
                 self.putItem(val)
             else:
                 self.putSpecialValue('nullreference')
-            self.putBetterType(typeName)
+            self.putBetterType(typename)
             return
 
-        if typeobj.code == TypeCode.Complex:
-            self.putType(typeobj)
+        if typecode == TypeCode.Complex:
+            self.putType(typeid)
             self.putValue(value.display())
             self.putNumChild(0)
             return
 
-        if typeobj.code == TypeCode.FortranString:
+        if typecode == TypeCode.FortranString:
             self.putValue(self.hexencode(value.data()), 'latin1')
             self.putNumChild(0)
-            self.putType(typeobj)
+            self.putType(typeid)
 
-        if typeName.endswith('[]'):
+        if typename.endswith('[]'):
             # D arrays, gdc compiled.
             n = value['length']
             base = value['ptr']
-            self.putType(typeName)
+            self.putType(typename)
             self.putItemCount(n)
             if self.isExpanded():
-                self.putArrayData(base.pointer(), n, base.type.target())
+                self.putArrayData(self.value_as_address(base), n, base.type.target())
             return
 
-        #DumperBase.warn('SOME VALUE: %s' % value)
-        #DumperBase.warn('GENERIC STRUCT: %s' % typeobj)
-        #DumperBase.warn('INAME: %s ' % self.currentIName)
-        #DumperBase.warn('INAMES: %s ' % self.expandedINames)
-        #DumperBase.warn('EXPANDED: %s ' % (self.currentIName in self.expandedINames))
-        self.putType(typeName)
+        #self.warn('SOME VALUE: %s' % value)
+        #self.warn('GENERIC STRUCT: %s' % typeid)
+        #self.warn('INAME: %s ' % self.currentIName)
+        #self.warn('INAMES: %s ' % self.expandedINames)
+        #self.warn('EXPANDED: %s ' % (self.currentIName in self.expandedINames))
+        self.putType(typename)
 
         if value.summary is not None and self.useFancy:
             self.putValue(self.hexencode(value.summary), 'utf8:1:0')
@@ -2898,8 +3087,8 @@ class DumperBase():
 
         self.putExpandable()
         self.putEmptyValue()
-        #DumperBase.warn('STRUCT GUTS: %s  ADDRESS: 0x%x ' % (value.name, value.address()))
-        if self.showQObjectNames:
+        #self.warn('STRUCT GUTS: %s  ADDRESS: 0x%x ' % (value.name, value.address()))
+        if self.wantQObjectNames():
             #with self.timer(self.currentIName):
             self.putQObjectNameValue(value)
         if self.isExpanded():
@@ -2907,12 +3096,12 @@ class DumperBase():
                 self.putField('sortable', 1)
             with Children(self, 1, childType=None):
                 self.putFields(value)
-                if self.showQObjectNames:
+                if self.wantQObjectNames():
                     self.tryPutQObjectGuts(value)
 
     def symbolAddress(self, symbolName):
-        res = self.parseAndEvaluate('(size_t)&' + symbolName)
-        return None if res is None else res.pointer()
+        res = self.parseAndEvaluate('(void *)&' + symbolName)
+        return None if res is None else self.value_as_address(res)
 
     def qtHookDataSymbolName(self):
         return 'qtHookData'
@@ -2922,7 +3111,7 @@ class DumperBase():
         if addr:
             # Only available with Qt 5.3+
             (hookVersion, x, x, x, x, x, tiVersion) = self.split('ppppppp', addr)
-            #DumperBase.warn('HOOK: %s TI: %s' % (hookVersion, tiVersion))
+            #self.warn('HOOK: %s TI: %s' % (hookVersion, tiVersion))
             if hookVersion >= 3:
                 self.qtTypeInfoVersion = lambda: tiVersion
                 return tiVersion
@@ -2954,16 +3143,15 @@ class DumperBase():
             #self._stack = inspect.stack()
             self.dumper = dumper
             self.name = None
-            self._type = None
+            self.typeid = None
+            self.code = None
+            self.size = None
             self.ldata = None        # Target address in case of references and pointers.
             self.laddress = None     # Own address.
             self.lvalue = None
             self.lIsInScope = True
             self.ldisplay = None
             self.summary = None      # Always hexencoded UTF-8.
-            self.lbitpos = None
-            self.lbitsize = None
-            self.targetValue = None  # For references.
             self.isBaseClass = None
             self.nativeValue = None
             self.autoDerefCount = 0
@@ -2972,49 +3160,47 @@ class DumperBase():
             val = self.dumper.Value(self.dumper)
             val.dumper = self.dumper
             val.name = self.name
-            val._type = self._type
+            val.typeid = self.typeid
+            val.code = self.code = None
+            val.size = self.size
             val.ldata = self.ldata
             val.laddress = self.laddress
+            val.lvalue = self.lvalue
             val.lIsInScope = self.lIsInScope
             val.ldisplay = self.ldisplay
             val.summary = self.summary
-            val.lbitpos = self.lbitpos
-            val.lbitsize = self.lbitsize
-            val.targetValue = self.targetValue
             val.nativeValue = self.nativeValue
             return val
 
         @property
         def type(self):
-            if self._type is None and self.nativeValue is not None:
-                self._type = self.dumper.nativeValueType(self.nativeValue)
-            return self._type
+            return self.dumper.Type(self.dumper, self.typeid)
 
         def check(self):
-            if self.laddress is not None and not self.dumper.isInt(self.laddress):
-                raise RuntimeError('INCONSISTENT ADDRESS: %s' % type(self.laddress))
-            if self.type is not None and not isinstance(self.type, self.dumper.Type):
-                raise RuntimeError('INCONSISTENT TYPE: %s' % type(self.type))
+            #if self.typeid is not None and not isinstance(self.typeid, int):
+            #    raise RuntimeError('INCONSISTENT TYPE: %s' % type(self.typeid))
+            #if self.laddress is not None and not isinstance(self.laddress, int):
+            #    raise RuntimeError('INCONSISTENT ADDRESS: %s' % type(self.laddress))
+            pass
 
         def __str__(self):
             #raise RuntimeError('Not implemented')
             return self.stringify()
 
         def __int__(self):
-            return self.integer()
+            return self.dumper.value_as_integer(self)
 
         def stringify(self):
             addr = 'None' if self.laddress is None else ('0x%x' % self.laddress)
-            return "Value(name='%s',type=%s,bsize=%s,bpos=%s,data=%s,address=%s)" \
-                % (self.name, self.type.name, self.lbitsize, self.lbitpos,
-                   self.dumper.hexencode(self.ldata), addr)
+            if isinstance(self.ldata, int):
+                data = str(self.ldata)
+            else:
+                data = self.dumper.hexencode(self.ldata)
+            return "Value(name='%s',typeid=%s, type=%s,data=%s,address=%s)" \
+                % (self.name, self.typeid, self.type.name, data, addr)
 
         def displayEnum(self, form='%d', bitsize=None):
-            intval = self.integer(bitsize)
-            dd = self.type.tdata.enumDisplay
-            if dd is None:
-                return str(intval)
-            return dd(intval, self.laddress, form)
+            return self.dumper.value_display_enum(self, form, bitsize)
 
         def display(self):
             if self.ldisplay is not None:
@@ -3023,451 +3209,70 @@ class DumperBase():
             if simple is not None:
                 return str(simple)
             #if self.ldata is not None:
-            #    if sys.version_info[0] == 2 and isinstance(self.ldata, buffer):
-            #        return bytes(self.ldata).encode('hex')
             #    return self.ldata.encode('hex')
             if self.laddress is not None:
                 return 'value of type %s at address 0x%x' % (self.type.name, self.laddress)
             return '<unknown data>'
 
         def pointer(self):
-            if self.type.code == TypeCode.Typedef:
-                return self.detypedef().pointer()
-            return self.extractInteger(self.dumper.ptrSize() * 8, True)
+            return self.dumper.value_as_address(self)
 
-        def integer(self, bitsize=None):
-            if self.type.code == TypeCode.Typedef:
-                return self.detypedef().integer()
-            elif isinstance(self.lvalue, int):
-                return self.lvalue
-            # Could be something like 'short unsigned int'
-            unsigned = self.type.name == 'unsigned' \
-                or self.type.name.startswith('unsigned ') \
-                or self.type.name.find(' unsigned ') != -1
-            if bitsize is None:
-                bitsize = self.type.lbitsize
-            return self.extractInteger(bitsize, unsigned)
+        def as_address(self):
+            return self.dumper.value_as_address(self)
+
+        def integer(self):
+            return self.dumper.value_as_integer(self)
 
         def floatingPoint(self):
-            if self.nativeValue is not None and not self.dumper.isCdb:
-                return str(self.nativeValue)
-            if self.type.code == TypeCode.Typedef:
-                return self.detypedef().floatingPoint()
-            if self.type.size() == 8:
-                return self.extractSomething('d', 64)
-            if self.type.size() == 4:
-                return self.extractSomething('f', 32)
-            # Fall back in case we don't have a nativeValue at hand.
-            # FIXME: This assumes Intel's 80bit extended floats. Which might
-            # be wrong.
-            l, h = self.split('QQ')
-            if True:  # 80 bit floats
-                sign = (h >> 15) & 1
-                exp = (h & 0x7fff)
-                fraction = l
-                bit63 = (l >> 63) & 1
-                #DumperBase.warn("SIGN: %s  EXP: %s  H: 0x%x L: 0x%x" % (sign, exp, h, l))
-                if exp == 0:
-                    if bit63 == 0:
-                        if l == 0:
-                            res = '-0' if sign else '0'
-                        else:
-                            res = (-1)**sign * l * 2**(-16382)  # subnormal
-                    else:
-                        res = 'pseudodenormal'
-                elif exp == 0x7fff:
-                    res = 'special'
-                else:
-                    res = (-1)**sign * l * 2**(exp - 16383 - 63)
-            else:  # 128 bits
-                sign = h >> 63
-                exp = (h >> 48) & 0x7fff
-                fraction = h & (2**48 - 1)
-                #DumperBase.warn("SIGN: %s  EXP: %s  FRAC: %s  H: 0x%x L: 0x%x" % (sign, exp, fraction, h, l))
-                if exp == 0:
-                    if fraction == 0:
-                        res = -0.0 if sign else 0.0
-                    else:
-                        res = (-1)**sign * fraction / 2**48 * 2**(-62)  # subnormal
-                elif exp == 0x7fff:
-                    res = ('-inf' if sign else 'inf') if fraction == 0 else 'nan'
-                else:
-                    res = (-1)**sign * (1 + fraction / 2**48) * 2**(exp - 63)
-            return res
+            return self.dumper.value_as_floating_point(self)
 
         def value(self):
-            if self.type is not None:
-                if self.type.code == TypeCode.Enum:
-                    return self.displayEnum()
-                if self.type.code == TypeCode.Typedef:
-                    return self.detypedef().value()
-                if self.type.code == TypeCode.Integral:
-                    return self.integer()
-                if self.type.code == TypeCode.Bitfield:
-                    return self.integer()
-                if self.type.code == TypeCode.Float:
-                    return self.floatingPoint()
-                if self.type.code == TypeCode.Pointer:
-                    return self.pointer()
-            return None
+            return self.dumper.value_display(self)
 
         def extractPointer(self):
-            return self.split('p')[0]
+            return self.dumper.value_extract_something(self, self.dumper.ptrSize())
 
         def hasMember(self, name):
-            return self.findMemberByName(name) is not None
+            return self.dumper.value_member_by_name(self, name) is not None
 
-        def findMemberByName(self, name):
-            self.check()
-            if self.type.code == TypeCode.Typedef:
-                return self.findMemberByName(self.detypedef())
-            if self.type.code in (
-                    TypeCode.Pointer,
-                    TypeCode.Reference,
-                    TypeCode.RValueReference):
-                res = self.dereference().findMemberByName(name)
-                if res is not None:
-                    return res
-            if self.type.code == TypeCode.Struct:
-                #DumperBase.warn('SEARCHING FOR MEMBER: %s IN %s' % (name, self.type.name))
-                members = self.members(True)
-                #DumperBase.warn('MEMBERS: %s' % members)
-                for member in members:
-                    #DumperBase.warn('CHECKING FIELD %s' % member.name)
-                    if member.type.code == TypeCode.Typedef:
-                        member = member.detypedef()
-                    if member.name == name:
-                        return member
-                for member in members:
-                    if member.type.code == TypeCode.Typedef:
-                        member = member.detypedef()
-                    if member.name == name:  # Could be base class.
-                        return member
-                    if member.type.code == TypeCode.Struct:
-                        res = member.findMemberByName(name)
-                        if res is not None:
-                            return res
-            return None
+        def __getitem__(self, indexish):
+            return self.dumper.value_member_by_indexish(self, indexish)
 
-        def __getitem__(self, index):
-            #DumperBase.warn('GET ITEM %s %s' % (self, index))
-            self.check()
-            if self.type.code == TypeCode.Typedef:
-                #DumperBase.warn('GET ITEM STRIP TYPEDEFS TO %s' % self.type.ltarget)
-                return self.cast(self.type.ltarget).__getitem__(index)
-            if isinstance(index, str):
-                if self.type.code == TypeCode.Pointer:
-                    #DumperBase.warn('GET ITEM %s DEREFERENCE TO %s' % (self, self.dereference()))
-                    return self.dereference().__getitem__(index)
-                res = self.findMemberByName(index)
-                if res is None:
-                    raise RuntimeError('No member named %s in type %s'
-                                       % (index, self.type.name))
-                return res
-            elif isinstance(index, self.dumper.Field):
-                field = index
-            elif self.dumper.isInt(index):
-                if self.type.code == TypeCode.Array:
-                    addr = self.laddress + int(index) * self.type.ltarget.size()
-                    return self.dumper.createValue(addr, self.type.ltarget)
-                if self.type.code == TypeCode.Pointer:
-                    addr = self.pointer() + int(index) * self.type.ltarget.size()
-                    return self.dumper.createValue(addr, self.type.ltarget)
-                return self.members(False)[index]
-            else:
-                raise RuntimeError('BAD INDEX TYPE %s' % type(index))
-            field.check()
-
-            #DumperBase.warn('EXTRACT FIELD: %s, BASE 0x%x' % (field, self.address()))
-            if self.type.code == TypeCode.Pointer:
-                #DumperBase.warn('IS TYPEDEFED POINTER!')
-                res = self.dereference()
-                #DumperBase.warn('WAS POINTER: %s' % res)
-
-            return field.extract(self)
-
-        def extractField(self, field):
-            if not isinstance(field, self.dumper.Field):
-                raise RuntimeError('BAD INDEX TYPE %s' % type(field))
-
-            if field.extractor is not None:
-                val = field.extractor(self)
-                if val is not None:
-                    #DumperBase.warn('EXTRACTOR SUCCEEDED: %s ' % val)
-                    return val
-
-            if self.type.code == TypeCode.Typedef:
-                return self.cast(self.type.ltarget).extractField(field)
-            if self.type.code in (TypeCode.Reference, TypeCode.RValueReference):
-                return self.dereference().extractField(field)
-            #DumperBase.warn('FIELD: %s ' % (field,))
-            val = self.dumper.Value(self.dumper)
-            val.name = field.name
-            val.isBaseClass = field.isBase
-            val._type = field.fieldType()
-
-            if field.isArtificial:
-                if self.laddress is not None:
-                    val.laddress = self.laddress
-                if self.ldata is not None:
-                    val.ldata = self.ldata
-                return val
-
-            fieldBitsize = field.bitsize
-            fieldSize = (fieldBitsize + 7) // 8
-            fieldBitpos = field.bitpos
-            fieldOffset = fieldBitpos // 8
-            fieldType = field.fieldType()
-
-            if fieldType.code == TypeCode.Bitfield:
-                fieldBitpos -= fieldOffset * 8
-                ldata = self.data()
-                data = 0
-                for i in range(fieldSize):
-                    data = data << 8
-                    if self.dumper.isBigEndian:
-                        lbyte = ldata[i]
-                    else:
-                        lbyte = ldata[fieldOffset + fieldSize - 1 - i]
-                    if isinstance(lbyte, (str, bytes)):
-                        data += ord(lbyte)
-                    else:
-                        data += lbyte
-                data = data >> fieldBitpos
-                data = data & ((1 << fieldBitsize) - 1)
-                val.lvalue = data
-                val.laddress = None
-                return val
-
-            if self.laddress is not None:
-                val.laddress = self.laddress + fieldOffset
-            elif self.ldata is not None:
-                val.ldata = self.ldata[fieldOffset:fieldOffset + fieldSize]
-            else:
-                self.dumper.check(False)
-
-            if fieldType.code in (TypeCode.Reference, TypeCode.RValueReference):
-                if val.laddress is not None:
-                    val = self.dumper.createReferenceValue(val.laddress, fieldType.ltarget)
-                    val.name = field.name
-
-            #DumperBase.warn('GOT VAL %s FOR FIELD %s' % (val, field))
-            val.lbitsize = fieldBitsize
-            val.check()
-            return val
-
-        # This is the generic version for synthetic values.
-        # The native backends replace it in their fromNativeValue()
-        # implementations.
-        def members(self, includeBases):
-            #DumperBase.warn("LISTING MEMBERS OF %s" % self)
-            if self.type.code == TypeCode.Typedef:
-                return self.detypedef().members(includeBases)
-
-            tdata = self.type.tdata
-            #if isinstance(tdata.lfields, list):
-            #    return tdata.lfields
-
-            fields = []
-            if tdata.lfields is not None:
-                if isinstance(tdata.lfields, list):
-                    fields = tdata.lfields
-                else:
-                    fields = list(tdata.lfields(self))
-
-            #DumperBase.warn("FIELDS: %s" % fields)
-            res = []
-            for field in fields:
-                if isinstance(field, self.dumper.Value):
-                    #DumperBase.warn("USING VALUE DIRECTLY %s" % field.name)
-                    res.append(field)
-                    continue
-                if field.isBase and not includeBases:
-                    #DumperBase.warn("DROPPING BASE %s" % field.name)
-                    continue
-                res.append(self.extractField(field))
-            #DumperBase.warn("GOT MEMBERS: %s" % res)
-            return res
+        def members(self, include_bases):
+            return self.dumper.value_members(self, include_bases)
 
         def __add__(self, other):
-            self.check()
-            if self.dumper.isInt(other):
-                stripped = self.type.stripTypedefs()
-                if stripped.code == TypeCode.Pointer:
-                    address = self.pointer() + stripped.dereference().size() * other
-                    val = self.dumper.Value(self.dumper)
-                    val.laddress = None
-                    val.ldata = bytes(struct.pack(self.dumper.packCode + 'Q', address))
-                    val._type = self._type
-                    return val
-            raise RuntimeError('BAD DATA TO ADD TO: %s %s' % (self.type, other))
+            return self.dumper.value_plus_something(self, other)
 
         def __sub__(self, other):
-            self.check()
-            if self.type.name == other.type.name:
-                stripped = self.type.stripTypedefs()
-                if stripped.code == TypeCode.Pointer:
-                    return (self.pointer() - other.pointer()) // stripped.dereference().size()
-            raise RuntimeError('BAD DATA TO SUB TO: %s %s' % (self.type, other))
+            return self.dumper.value_minus_something(self, other)
 
         def dereference(self):
-            self.check()
-            if self.type.code == TypeCode.Typedef:
-                return self.detypedef().dereference()
-            val = self.dumper.Value(self.dumper)
-            if self.type.code in (TypeCode.Reference, TypeCode.RValueReference):
-                val.summary = self.summary
-                if self.nativeValue is None:
-                    val.laddress = self.pointer()
-                    if val.laddress is None and self.laddress is not None:
-                        val.laddress = self.laddress
-                    val._type = self.type.dereference()
-                    if self.dumper.useDynamicType:
-                        val._type = self.dumper.nativeDynamicType(val.laddress, val.type)
-                else:
-                    val = self.dumper.nativeValueDereferenceReference(self)
-            elif self.type.code == TypeCode.Pointer:
-                try:
-                    val = self.dumper.nativeValueDereferencePointer(self)
-                except:
-                    val.laddress = self.pointer()
-                    val._type = self.type.dereference()
-                    if self.dumper.useDynamicType:
-                        val._type = self.dumper.nativeDynamicType(val.laddress, val.type)
-            else:
-                raise RuntimeError("WRONG: %s" % self.type.code)
-            #DumperBase.warn("DEREFERENCING FROM: %s" % self)
-            #DumperBase.warn("DEREFERENCING TO: %s" % val)
-            #dynTypeName = val.type.dynamicTypeName(val.laddress)
-            #if dynTypeName is not None:
-            #    val._type = self.dumper.createType(dynTypeName)
-            return val
+            return self.dumper.value_dereference(self)
 
         def detypedef(self):
-            self.check()
-            if self.type.code != TypeCode.Typedef:
-                raise RuntimeError("WRONG")
-            val = self.copy()
-            val._type = self.type.ltarget
-            #DumperBase.warn("DETYPEDEF FROM: %s" % self)
-            #DumperBase.warn("DETYPEDEF TO: %s" % val)
-            return val
-
-        def extend(self, size):
-            if self.type.size() < size:
-                val = self.dumper.Value(self.dumper)
-                val.laddress = None
-                val.ldata = self.zeroExtend(self.ldata)
-                return val
-            if self.type.size() == size:
-                return self
-            raise RuntimeError('NOT IMPLEMENTED')
-
-        def zeroExtend(self, data, size):
-            ext = '\0' * (size - len(data))
-            if sys.version_info[0] == 3:
-                pad = bytes(ext, encoding='latin1')
-            else:
-                pad = bytes(ext)
-            return pad + data if self.dumper.isBigEndian else data + pad
+            return self.dumper.value_detypedef(self)
 
         def cast(self, typish):
-            self.check()
-            val = self.dumper.Value(self.dumper)
-            val.laddress = self.laddress
-            val.lbitsize = self.lbitsize
-            val.ldata = self.ldata
-            val._type = self.dumper.createType(typish)
-            return val
+            return self.dumper.value_cast(self, typish)
 
         def address(self):
             self.check()
             return self.laddress
 
-        def data(self, size=None):
-            self.check()
-            if self.ldata is not None:
-                if len(self.ldata) > 0:
-                    if size is None:
-                        return self.ldata
-                    if size == len(self.ldata):
-                        return self.ldata
-                    if size < len(self.ldata):
-                        return self.ldata[:size]
-                    #raise RuntimeError('ZERO-EXTENDING  DATA TO %s BYTES: %s' % (size, self))
-                    return self.zeroExtend(self.ldata, size)
-            if self.laddress is not None:
-                if size is None:
-                    size = self.type.size()
-                res = self.dumper.readRawMemory(self.laddress, size)
-                if len(res) > 0:
-                    return res
-                raise RuntimeError('CANNOT CONVERT ADDRESS TO BYTES: %s' % self)
-            raise RuntimeError('CANNOT CONVERT TO BYTES: %s' % self)
-
-        def extractInteger(self, bitsize, unsigned):
-            #with self.dumper.timer('extractInt'):
-            self.check()
-            if bitsize > 32:
-                size = 8
-                code = 'Q' if unsigned else 'q'
-            elif bitsize > 16:
-                size = 4
-                code = 'I' if unsigned else 'i'
-            elif bitsize > 8:
-                size = 2
-                code = 'H' if unsigned else 'h'
-            else:
-                size = 1
-                code = 'B' if unsigned else 'b'
-            rawBytes = self.data(size)
-            res = struct.unpack_from(self.dumper.packCode + code, rawBytes, 0)[0]
-            #DumperBase.warn('Extract: Code: %s Bytes: %s Bitsize: %s Size: %s'
-            #    % (self.dumper.packCode + code, self.dumper.hexencode(rawBytes), bitsize, size))
-            return res
-
-        def extractSomething(self, code, bitsize):
-            #with self.dumper.timer('extractSomething'):
-            self.check()
-            size = (bitsize + 7) >> 3
-            rawBytes = self.data(size)
-            res = struct.unpack_from(self.dumper.packCode + code, rawBytes, 0)[0]
-            return res
+        def data(self):
+            return self.dumper.value_data(self, self.dumper.type_size(self.typeid))
 
         def to(self, pattern):
             return self.split(pattern)[0]
 
         def split(self, pattern):
-            #with self.dumper.timer('split'):
-            #DumperBase.warn('EXTRACT STRUCT FROM: %s' % self.type)
-            (pp, size, fields) = self.dumper.describeStruct(pattern)
-            #DumperBase.warn('SIZE: %s ' % size)
-            result = struct.unpack_from(self.dumper.packCode + pp, self.data(size))
-
-            def structFixer(field, thing):
-                #DumperBase.warn('STRUCT MEMBER: %s' % type(thing))
-                if field.isStruct:
-                    #if field.type != field.fieldType():
-                    #    raise RuntimeError('DO NOT SIMPLIFY')
-                    #DumperBase.warn('FIELD POS: %s' % field.type.stringify())
-                    #DumperBase.warn('FIELD TYE: %s' % field.fieldType().stringify())
-                    res = self.dumper.createValue(thing, field.fieldType())
-                    #DumperBase.warn('RES TYPE: %s' % res.type)
-                    if self.laddress is not None:
-                        res.laddress = self.laddress + field.offset()
-                    return res
-                return thing
-            if len(fields) != len(result):
-                raise RuntimeError('STRUCT ERROR: %s %s' % (fields, result))
-            return tuple(map(structFixer, fields, result))
+            return self.dumper.value_split(self, pattern)
 
     def checkPointer(self, p, align=1):
-        ptr = p if self.isInt(p) else p.pointer()
+        ptr = p if isinstance(p, int) else p.pointer()
         self.readRawMemory(ptr, 1)
 
-    def type(self, typeId):
-        return self.typeData.get(typeId)
-
     def splitArrayType(self, type_name):
         #  "foo[2][3][4]" ->  ("foo", "[3][4]", 2)
         pos1 = len(type_name)
@@ -3481,249 +3286,165 @@ class DumperBase():
         item_count = type_name[pos1 + 1:pos2]
         return (type_name[0:pos1].strip(), type_name[pos2 + 1:].strip(), int(item_count))
 
-    def registerTypeAlias(self, existingTypeId, aliasId):
-        #DumperBase.warn('REGISTER ALIAS %s FOR %s' % (aliasId, existingTypeId))
-        self.typeData[aliasId] = self.typeData[existingTypeId]
+    def registerTypeAlias(self, existing_type_id, alias_id):
+        #self.warn('REGISTER ALIAS %s FOR %s' % (aliasId, existingTypeId))
+        self.type_alias[alias_id] = existing_type_id
 
-    class TypeData():
-        def __init__(self, dumper, type_id):
-            self.dumper = dumper
-            self.lfields = None  # None or Value -> list of member Values
-            self.lalignment = None  # Function returning alignment of this struct
-            self.lbitsize = None
-            self.ltarget = None  # Inner type for arrays
-            self.templateArguments = None
-            self.code = None
-            self.name = type_id
-            self.typeId = type_id
-            self.enumDisplay = None
-            self.moduleName = None
-            #DumperBase.warn('REGISTER TYPE: %s' % type_id)
-            dumper.typeData[type_id] = self
+    def init_type_cache(self):
+        self.type_name_cache = {}
+        self.type_fields_cache = {}
+        self.type_alignment_cache = {}
+        self.type_bitsize_cache = {}
+        self.type_size_cache = {}
+        self.type_target_cache = {}
+        self.type_template_arguments_cache = {}
+        self.type_code_cache = {}
+        self.type_enum_display_cache = {}
+        self.type_module_name_cache = {}
+        self.type_nativetype_cache = {}
+        self.type_modulename_cache = {}
+        self.type_encoding_cache = {}
+        self.type_qobject_based_cache = {}
+        self.typeid_cache = {}   # internal typename -> id
+        self.typeid_current = 100
+        self.typeid_from_typekey = {}   # typename -> id
 
-        def copy(self):
-            tdata = self.dumper.TypeData(self.dumper, self.typeId)
-            tdata.dumper = self.dumper
-            tdata.lfields = self.lfields
-            tdata.lalignment = self.lalignment
-            tdata.lbitsize = self.lbitsize
-            tdata.ltarget = self.ltarget
-            tdata.templateArguments = self.templateArguments
-            tdata.code = self.code
-            tdata.name = self.name
-            tdata.typeId = self.typeId
-            tdata.enumDisplay = self.enumDisplay
-            tdata.moduleName = self.moduleName
-            return tdata
+    def dump_type_cache(self):
+        self.warn('NAME: %s' % self.type_name_cache)
+        self.warn('CODE: %s' % self.type_code_cache)
+        #self.warn('FIELDS: %s' % self.type_fields_cache)
+        self.warn('SIZE: %s' % self.type_size_cache)
+        self.warn('TARGS: %s' % self.type_template_arguments_cache)
+        self.warn('BITSIZE: %s' % self.type_bitsize_cache)
+        self.warn('TARGET: %s' % self.type_target_cache)
+        #self.warn('NATIVETYPE: %s' % self.type_nativetype_cache)
 
-        @property
-        def bitsize(self):
-            if callable(self.lbitsize):
-                self.lbitsize = self.lbitsize()
-            return self.lbitsize
+    def dump_typeid(self, typeid):
+        self.warn('  NAME: %s' % self.type_name_cache.get(typeid, None))
+        self.warn('  CODE: %s' % self.type_code_cache.get(typeid, None))
+        #self.warn('  FIELDS: %s' % self.type_fields_cache.get(typeid, None))
+        self.warn('  SIZE: %s' % self.type_size_cache.get(typeid, None))
+        self.warn('  TARGS: %s' % self.type_template_arguments_cache.get(typeid, None))
+        self.warn('  BITSIZE: %s' % self.type_bitsize_cache.get(typeid, None))
+        self.warn('  TARGET: %s' % self.type_target_cache.get(typeid, None))
+        #self.warn('  NATIVETYPE: %s' % self.type_nativetype_cache.get(typeid, None))
+
+    def typeid_for_typish(self, typish):
+        if isinstance(typish, int):
+            return typish
+        if isinstance(typish, str):
+            return self.typeid_for_string(typish)
+        if isinstance(typish, self.Type):
+            return typish.typeid
+        self.warn('NO TYPE FOR TYPISH: %s' % str(typish))
+        return 0
+
+    def sanitize_type_name(self, typeid_str):
+        if not ' ' in  typeid_str:
+            # FIXME: This uses self.qtNamespace() too early.
+            #typeid_arr.append(self.qtNamespace())
+            return typeid_str.replace('@', '')
+        typeid_arr = []
+        last_char_was_space = False
+        for c in typeid_str:
+            if c == '@' in typeid_str:
+                # FIXME: This uses self.qtNamespace() too early.
+                #typeid_arr.append(self.qtNamespace())
+                pass
+            elif c == ' ':
+                last_char_was_space = True
+            elif c in '&*<>,':
+                last_char_was_space = False
+                typeid_arr.append(c)
+            else:
+                if last_char_was_space:
+                    typeid_arr.append(' ')
+                    last_char_was_space = False
+                typeid_arr.append(c)
+        #self.warn("SANITIZE: '%s' TO '%s'" % (typeid_str, ''.join(typeid_arr)))
+        return ''.join(typeid_arr)
+
+    def typeid_for_string(self, typeid_str, type_name=None):
+        #typeid = self.typeid_cache.get(typeid_str, None)
+        #if typeid is not None:
+        #    return typeid
+        sane_typeid_str = self.sanitize_type_name(typeid_str)
+        typeid = self.typeid_cache.get(sane_typeid_str, None)
+        if typeid is not None:
+            return typeid
+
+        self.typeid_current += 1
+        if type_name is None:
+            type_name = sane_typeid_str
+        typeid = self.typeid_current
+        self.typeid_cache[typeid_str] = typeid
+        self.typeid_cache[sane_typeid_str] = typeid
+        self.type_name_cache[typeid] = type_name
+        #if typeid == 103:
+        #self.warn("CREATED TYPE: %d %s" % (typeid, sane_typeid_str))
+        #if typeid == 135: self.dump_location()
+        return typeid
 
     class Type():
-        def __init__(self, dumper, typeId):
-            self.typeId = typeId.replace('@', dumper.qtNamespace())
+        __slots__ = ['dumper', 'typeid']
+        def __init__(self, dumper, typeid):
             self.dumper = dumper
-            self.initialized = False
+            self.typeid = typeid
 
         def __str__(self):
-            #return self.typeId
-            return self.stringify()
-
-        @property
-        def tdata(self):
-            if not self.initialized:
-                self.initialized = True
-                self.data = self.dumper.typeData.get(self.typeId, None)
-                if self.data is None:
-                    #DumperBase.warn('USING : %s' % self.typeId)
-                    self.dumper.lookupType(self.typeId)
-                    self.data = self.dumper.typeData.get(self.typeId)
-            return self.data
-
-        def setTdata(self, tdata):
-            self.initialized = True
-            self.data = tdata
+            return self.dumper.type_stringify(self.typeid)
 
         @property
         def name(self):
-            return self.typeId if self.tdata is None else self.tdata.name
+            return self.dumper.type_name(self.typeid)
 
         @property
         def code(self):
-            return self.tdata.code
+            return self.dumper.type_code(self.typeid)
 
-        @property
-        def lbitsize(self):
-            return self.tdata.bitsize
+        def bitsize(self):
+            return self.dumper.type_bitsize(self.typeid)
 
-        @property
-        def lbitpos(self):
-            return self.tdata.lbitpos
+        def size(self):
+            return self.dumper.type_size(self.typeid)
 
-        @property
-        def ltarget(self):
-            if isinstance(self.tdata.ltarget, str):
-                self.tdata.ltarget = self.dumper.createType(self.tdata.ltarget)
-            return self.tdata.ltarget
-
-        @property
-        def targetName(self):
-            if self.tdata.ltarget is None:
-                return ''
-            return self.tdata.ltarget if isinstance(self.tdata.ltarget, str) else self.tdata.ltarget.name
+        def target(self):
+            return self.dumper.Type(self.dumper, self.dumper.type_target(self.typeid))
 
         @property
         def moduleName(self):
-            if callable(self.tdata.moduleName):
-                self.tdata.moduleName = self.tdata.moduleName()
-            return self.tdata.moduleName
-
-        def stringify(self):
-            return 'Type(name="%s",bsize=%s,code=%s)' \
-                % (self.tdata.name, self.lbitsize, self.tdata.code)
+            return self.dumper.type_modulename_cache.get(self.typeid, None)
 
         def __getitem__(self, index):
-            if self.dumper.isInt(index):
-                return self.templateArgument(index)
+            if isinstance(index, int):
+                return self.dumper.type_template_argument(self.typeid, index)
             raise RuntimeError('CANNOT INDEX TYPE')
 
-        def dynamicTypeName(self, address):
-            if self.tdata.code != TypeCode.Struct:
-                return None
-            try:
-                vtbl = self.dumper.extractPointer(address)
-            except:
-                return None
-            #DumperBase.warn('VTBL: 0x%x' % vtbl)
-            if not self.dumper.couldBePointer(vtbl):
-                return None
-            return self.dumper.nativeDynamicTypeName(address, self)
-
-        def dynamicType(self, address):
-            # FIXME: That buys some performance at the cost of a fail
-            # of Gdb13393 dumper test.
-            #return self
-            #with self.dumper.timer('dynamicType %s 0x%s' % (self.name, address)):
-            dynTypeName = self.dynamicTypeName(address)
-            if dynTypeName is not None:
-                return self.dumper.createType(dynTypeName)
-            return self
-
         def check(self):
-            if self.tdata.name is None:
-                raise RuntimeError('TYPE WITHOUT NAME: %s' % self.typeId)
+            #if self.tdata.name is None:
+            #    raise RuntimeError('TYPE WITHOUT NAME: %s' % self.typeid)
+            pass
 
         def dereference(self):
-            if self.code == TypeCode.Typedef:
-                return self.ltarget.dereference()
-            self.check()
-            return self.ltarget
-
-        def unqualified(self):
-            return self
+            return self.dumper.Type(self.dumper, self.dumper.type_dereference(self.typeid))
 
         def templateArguments(self):
-            if self.tdata is None:
-                return self.dumper.listTemplateParameters(self.typeId)
-            return self.tdata.templateArguments()
+            return self.dumper.type_template_arguments(self.typeid)
 
-        def templateArgument(self, position):
-            #DumperBase.warn('TDATA: %s' % self.tdata)
-            #DumperBase.warn('ID: %s' % self.typeId)
-            if self.tdata is None or self.tdata.templateArguments is None:
-                # Native lookups didn't help. Happens for 'wrong' placement of 'const'
-                # etc. with LLDB. But not all is lost:
-                ta = self.dumper.listTemplateParameters(self.typeId)
-                #DumperBase.warn('MANUAL: %s' % ta)
-                res = ta[position]
-                #DumperBase.warn('RES: %s' % res.typeId)
-                return res
-            #DumperBase.warn('TA: %s %s' % (position, self.typeId))
-            #DumperBase.warn('ARGS: %s' % self.tdata.templateArguments())
-            return self.tdata.templateArguments()[position]
-
-        def simpleEncoding(self):
-            res = {
-                'bool': 'int:1',
-                'char': 'int:1',
-                'int8_t': 'int:1',
-                'qint8': 'int:1',
-                'signed char': 'int:1',
-                'char8_t': 'uint:1',
-                'unsigned char': 'uint:1',
-                'uint8_t': 'uint:1',
-                'quint8': 'uint:1',
-                'short': 'int:2',
-                'int16_t': 'int:2',
-                'qint16': 'int:2',
-                'unsigned short': 'uint:2',
-                'char16_t': 'uint:2',
-                'uint16_t': 'uint:2',
-                'quint16': 'uint:2',
-                'int': 'int:4',
-                'int32_t': 'int:4',
-                'qint32': 'int:4',
-                'unsigned int': 'uint:4',
-                'char32_t': 'uint:4',
-                'uint32_t': 'uint:4',
-                'quint32': 'uint:4',
-                'long long': 'int:8',
-                'int64_t': 'int:8',
-                'qint64': 'int:8',
-                'unsigned long long': 'uint:8',
-                'uint64_t': 'uint:8',
-                'quint64': 'uint:8',
-                'float': 'float:4',
-                'double': 'float:8',
-                'QChar': 'uint:2'
-            }.get(self.name, None)
-            return res
+        def templateArgument(self, index):
+            return self.dumper.type_template_argument(self.typeid, index)
 
         def isSimpleType(self):
             return self.code in (TypeCode.Integral, TypeCode.Float, TypeCode.Enum)
 
         def alignment(self):
-            if self.tdata.code == TypeCode.Typedef:
-                return self.ltarget.alignment()
-            if self.tdata.code in (TypeCode.Integral, TypeCode.Float, TypeCode.Enum):
-                if self.tdata.name in ('double', 'long long', 'unsigned long long'):
-                    # Crude approximation.
-                    return 8 if self.dumper.isWindowsTarget() else self.dumper.ptrSize()
-                return self.size()
-            if self.tdata.code in (TypeCode.Pointer, TypeCode.Reference, TypeCode.RValueReference):
-                return self.dumper.ptrSize()
-            if self.tdata.lalignment is not None:
-                #if isinstance(self.tdata.lalignment, function): # Does not work that way.
-                if hasattr(self.tdata.lalignment, '__call__'):
-                    return self.tdata.lalignment()
-                return self.tdata.lalignment
-            return 1
+            return self.dumper.type_alignment(self.typeid)
 
         def pointer(self):
-            return self.dumper.createPointerType(self)
-
-        def target(self):
-            return self.ltarget
+            return self.dumper.Type(self.dumper, self.dumper.create_pointer_typeid(self.typeid))
 
         def stripTypedefs(self):
-            if isinstance(self, self.dumper.Type) and self.code != TypeCode.Typedef:
-                #DumperBase.warn('NO TYPEDEF: %s' % self)
-                return self
-            return self.ltarget
-
-        def size(self):
-            bs = self.lbitsize
-            if bs % 8 != 0:
-                DumperBase.warn('ODD SIZE: %s' % self)
-            return (7 + bs) >> 3
-
-        def bitsize(self):
-            if self.lbitsize is not None:
-                return self.lbitsize
-            raise RuntimeError('DONT KNOW SIZE: %s' % self)
+            return self.dumper.Type(self.dumper, self.dumper.type_target(self.typeid))
 
         def isMovableType(self):
             if self.code in (TypeCode.Pointer, TypeCode.Integral, TypeCode.Float):
@@ -3743,269 +3464,202 @@ class DumperBase():
             ):
                 return True
             if strippedName == 'QStringList':
-                return self.dumper.qtVersion() >= 0x050000
+                return self.dumper.qtVersionAtLeast(0x050000)
             if strippedName == 'QList':
-                return self.dumper.qtVersion() >= 0x050600
+                return self.dumper.qtVersionAtLeast(0x050600)
             return False
 
-    class Field(collections.namedtuple('Field',
-                                       ['dumper', 'name', 'type', 'bitsize', 'bitpos',
-                                        'extractor', 'isBase', 'isStruct', 'isArtificial'])):
+    class Field:
+        __slots__ = ['name', 'typeid', 'bitsize', 'bitpos', 'is_struct', 'is_artificial', 'is_base_class']
 
-        def __new__(cls, dumper, name=None, type=None, bitsize=None, bitpos=None,
-                    extractor=None, isBase=False, isStruct=False, isArtificial=False):
-            return super(DumperBase.Field, cls).__new__(
-                cls, dumper, name, type, bitsize, bitpos,
-                extractor, isBase, isStruct, isArtificial)
+        def __init__(self, name=None, typeid=None, bitsize=None, bitpos=None,
+                    extractor=None, is_struct=False, is_artificial=False, is_base_class=False):
+            self.name = name
+            self.typeid = typeid
+            self.bitsize = bitsize
+            self.bitpos = bitpos
+            self.is_struct = is_struct
+            self.is_base_class = is_base_class
 
-        __slots__ = ()
-
-        def __str__(self):
-            return self.stringify()
-
-        def stringify(self):
-            #return 'Field(name="%s")' % self.name
-            typename = None if self.type is None else self.type.stringify()
-            return 'Field(name="%s",type=%s,bitpos=%s,bitsize=%s)' \
-                % (self.name, typename, self.bitpos, self.bitsize)
-
-        def check(self):
-            pass
-
-        def size(self):
-            return self.bitsize() // 8
-
-        def offset(self):
-            return self.bitpos // 8
-
-        def fieldType(self):
-            if self.type is not None:
-                return self.type
-            raise RuntimeError('CANT GET FIELD TYPE FOR %s' % self)
-            return None
 
     def ptrCode(self):
         return 'I' if self.ptrSize() == 4 else 'Q'
 
-    def toPointerData(self, address):
-        if not self.isInt(address):
-            raise RuntimeError('wrong')
-        return bytes(struct.pack(self.packCode + self.ptrCode(), address))
-
     def fromPointerData(self, bytes_value):
         return struct.unpack(self.packCode + self.ptrCode(), bytes_value)
 
-    def createPointerValue(self, targetAddress, targetTypish):
-        if not isinstance(targetTypish, self.Type) and not isinstance(targetTypish, str):
-            raise RuntimeError('Expected type in createPointerValue(), got %s'
-                               % type(targetTypish))
-        if not self.isInt(targetAddress):
+    def createPointerValue(self, target_address, target_typish):
+        if not isinstance(target_address, int):
             raise RuntimeError('Expected integral address value in createPointerValue(), got %s'
-                               % type(targetTypish))
+                               % type(target_typish))
         val = self.Value(self)
-        val.ldata = self.toPointerData(targetAddress)
-        targetType = self.createType(targetTypish)
-        if self.useDynamicType:
-            targetType = targetType.dynamicType(targetAddress)
-        val._type = self.createPointerType(targetType)
+        val.ldata = target_address
+        val.typeid = self.create_pointer_typeid(self.create_typeid(target_typish))
         return val
+        #target_typeid = self.create_typeid(target_typish)
+        #if self.useDynamicType:
+        #    target_typeid = self.dynamic_typeid_at_address(target_typeid, target_address)
+        #val.typeid = self.create_pointer_typeid(target_typeid)
+        #return val
 
-    def createReferenceValue(self, targetAddress, targetType):
-        if not isinstance(targetType, self.Type):
-            raise RuntimeError('Expected type in createReferenceValue(), got %s'
-                               % type(targetType))
-        if not self.isInt(targetAddress):
-            raise RuntimeError('Expected integral address value in createReferenceValue(), got %s'
-                               % type(targetType))
-        val = self.Value(self)
-        val.ldata = self.toPointerData(targetAddress)
-        if self.useDynamicType:
-            targetType = targetType.dynamicType(targetAddress)
-        val._type = self.createReferenceType(targetType)
-        return val
+    def createPointerType(self, target_typish):
+        typeid = self.create_pointer_typeid(self.typeid_for_typish(target_typish))
+        return self.Type(self, typeid)
 
-    def createPointerType(self, targetType):
-        if not isinstance(targetType, (str, self.Type)):
-            raise RuntimeError('Expected type or str in createPointerType(), got %s'
-                               % type(targetType))
-        typeId = (targetType if isinstance(targetType, str) else targetType.typeId) + ' *'
-        tdata = self.TypeData(self, typeId)
-        tdata.name = (targetType if isinstance(targetType, str) else targetType.name) + '*'
-        tdata.lbitsize = 8 * self.ptrSize()
-        tdata.code = TypeCode.Pointer
-        tdata.ltarget = targetType
-        return self.Type(self, typeId)
+    def create_pointer_typeid(self, target_typeid):
+        name = self.type_name(target_typeid) + ' *'
+        typeid = self.typeid_for_string(name)
+        self.type_size_cache[typeid] = self.ptrSize()
+        self.type_alignment_cache[typeid] = self.ptrSize()
+        self.type_code_cache[typeid] = TypeCode.Pointer
+        self.type_target_cache[typeid] = target_typeid
+        return typeid
 
-    def createReferenceType(self, targetType):
-        if not isinstance(targetType, self.Type):
-            raise RuntimeError('Expected type in createReferenceType(), got %s'
-                               % type(targetType))
-        typeId = targetType.typeId + ' &'
-        tdata = self.TypeData(self, typeId)
-        tdata.name = targetType.name + ' &'
-        tdata.code = TypeCode.Reference
-        tdata.ltarget = targetType
-        tdata.lbitsize = 8 * self.ptrSize()  # Needed for Gdb13393 test.
-        #tdata.lbitsize = None
-        return self.Type(self, typeId)
+    def create_reference_typeid(self, target_typeid):
+        type_name = self.type_name_cache[target_typeid] + ' &'
+        typeid = self.typeid_for_string(type_name)
+        self.type_code_cache[typeid] = TypeCode.Reference
+        self.type_target_cache[typeid] = target_typeid
+        #self.type_size_cache[typeid] = self.ptrSize()  # Needed for Gdb13393 test.
+        return typeid
 
-    def createRValueReferenceType(self, targetType):
-        if not isinstance(targetType, self.Type):
-            raise RuntimeError('Expected type in createRValueReferenceType(), got %s'
-                               % type(targetType))
-        typeId = targetType.typeId + ' &&'
-        tdata = self.TypeData(self, typeId)
-        tdata.name = targetType.name + ' &&'
-        tdata.code = TypeCode.RValueReference
-        tdata.ltarget = targetType
-        tdata.lbitsize = None
-        return self.Type(self, typeId)
+    def create_rvalue_reference_typeid(self, target_typeid):
+        type_name = self.type_name_cache[target_typeid] + ' &&'
+        typeid = self.typeid_for_string(type_name)
+        self.type_code_cache[typeid] = TypeCode.RValueReference
+        self.type_target_cache[typeid] = target_typeid
+        return typeid
 
-    def createArrayType(self, targetType, count):
-        if not isinstance(targetType, self.Type):
-            raise RuntimeError('Expected type in createArrayType(), got %s'
-                               % type(targetType))
-        targetTypeId = targetType.typeId
-
-        if targetTypeId.endswith(']'):
-            (prefix, suffix, inner_count) = self.splitArrayType(targetTypeId)
-            type_id = '%s[%d][%d]%s' % (prefix, count, inner_count, suffix)
-            type_name = type_id
+    def create_array_typeid(self, target_typeid, count):
+        target_type_name = self.type_name(target_typeid)
+        if target_type_name.endswith(']'):
+            (prefix, suffix, inner_count) = self.splitArrayType(target_type_name)
+            type_name = '%s[%d][%d]%s' % (prefix, count, inner_count, suffix)
         else:
-            type_id = '%s[%d]' % (targetTypeId, count)
-            type_name = '%s[%d]' % (targetType.name, count)
+            type_name = '%s[%d]' % (target_type_name, count)
+        typeid = self.typeid_for_string(type_name)
+        self.type_code_cache[typeid] = TypeCode.Array
+        self.type_target_cache[typeid] = target_typeid
+        self.type_size_cache[typeid] = self.type_size(target_typeid) * count
+        self.type_alignment_cache[typeid] = self.type_alignment_cache.get(target_typeid, None)
+        return typeid
 
-        tdata = self.TypeData(self, type_id)
-        tdata.name = type_name
-        tdata.code = TypeCode.Array
-        tdata.ltarget = targetType
-        tdata.lbitsize = targetType.lbitsize * count
-        return self.Type(self, type_id)
+    def create_bitfield_typeid(self, target_typeid, bitsize):
+        target_typename = self.type_name(target_typeid)
+        typeid = self.typeid_for_string('%s:%d' % (target_typename, bitsize))
+        self.type_name_cache[typeid] = '%s : %d' % (target_typename, bitsize)
+        self.type_code_cache[typeid] = TypeCode.Bitfield
+        self.type_target_cache[typeid] = target_typeid
+        self.type_bitsize_cache[typeid] = bitsize
+        return typeid
 
-    def createBitfieldType(self, targetType, bitsize):
-        if not isinstance(targetType, self.Type):
-            raise RuntimeError('Expected type in createBitfieldType(), got %s'
-                               % type(targetType))
-        typeId = '%s:%d' % (targetType.typeId, bitsize)
-        tdata = self.TypeData(self, typeId)
-        tdata.name = '%s : %d' % (targetType.typeId, bitsize)
-        tdata.code = TypeCode.Bitfield
-        tdata.ltarget = targetType
-        tdata.lbitsize = bitsize
-        return self.Type(self, typeId)
-
-    def createTypedefedType(self, targetType, typeName, typeId=None):
-        if typeId is None:
-            typeId = typeName
-        if not isinstance(targetType, self.Type):
-            raise RuntimeError('Expected type in createTypedefType(), got %s'
-                               % type(targetType))
+    def create_typedefed_typeid(self, target_typeid, type_name, type_key):
+        typeid = self.typeid_for_string(type_key, type_name)
         # Happens for C-style struct in GDB: typedef { int x; } struct S1;
-        if targetType.typeId == typeId:
-            return targetType
-        tdata = self.TypeData(self, typeId)
-        tdata.name = typeName
-        tdata.code = TypeCode.Typedef
-        tdata.ltarget = targetType
-        tdata.lbitsize = targetType.lbitsize
-        #tdata.lfields = targetType.lfields
-        tdata.lbitsize = targetType.lbitsize
-        return self.Type(self, typeId)
-
-    def knownArrayTypeSize(self):
-        return 3 * self.ptrSize() if self.qtVersion() >= 0x060000 else self.ptrSize()
-
-    def knownTypeSize(self, typish):
-        if typish[0] == 'Q':
-            if typish.startswith('QList<') or typish.startswith('QVector<'):
-                return self.knownArrayTypeSize()
-            if typish == 'QObject':
-                return 2 * self.ptrSize()
-            if typish == 'QStandardItemData':
-                return 4 * self.ptrSize() if self.qtVersion() >= 0x060000 else 2 * self.ptrSize()
-            if typish == 'Qt::ItemDataRole':
-                return 4
-            if typish == 'QChar':
-                return 2
-        if typish in ('quint32', 'qint32'):
-            return 4
-        return None
+        if target_typeid == typeid:
+            return target_typeid
+        self.type_code_cache[typeid] = TypeCode.Typedef
+        self.type_target_cache[typeid] = target_typeid
+        size = self.type_size_cache.get(target_typeid, None)
+        if size is not None:
+            self.type_size_cache[typeid] = size
+        return typeid
 
     def createType(self, typish, size=None):
+        return self.Type(self, self.create_typeid(typish, size))
+
+    def create_typeid(self, typish, size=None):
+        if isinstance(typish, int):
+            return typish
         if isinstance(typish, self.Type):
-            #typish.check()
-            if hasattr(typish, 'lbitsize') and typish.lbitsize is not None and typish.lbitsize > 0:
-                return typish
-            # Size 0 is sometimes reported by GDB but doesn't help at all.
-            # Force using the fallback:
-            typish = typish.name
-
+            return typish.typeid
         if isinstance(typish, str):
-            ns = self.qtNamespace()
-            typish = typish.replace('@', ns)
-            if typish.startswith(ns):
-                if size is None:
-                    size = self.knownTypeSize(typish[len(ns):])
-            else:
-                if size is None:
-                    size = self.knownTypeSize(typish)
-                if size is not None:
-                    typish = ns + typish
-
-            tdata = self.typeData.get(typish, None)
-            if tdata is not None:
-                if tdata.lbitsize is not None:
-                    if callable(tdata.lbitsize) or tdata.lbitsize > 0:
-                        return self.Type(self, typish)
-
-            knownType = self.lookupType(typish)
-            #DumperBase.warn('KNOWN: %s' % knownType)
-            if knownType is not None:
-                #DumperBase.warn('USE FROM NATIVE')
-                return knownType
-
-            #DumperBase.warn('FAKING: %s SIZE: %s' % (typish, size))
-            tdata = self.TypeData(self, typish)
-            tdata.templateArguments = lambda: self.listTemplateParameters(typish)
-            if size is not None:
-                tdata.lbitsize = 8 * size
-            if typish.endswith('*'):
-                tdata.code = TypeCode.Pointer
-                tdata.lbitsize = 8 * self.ptrSize()
-                tdata.ltarget = typish[:-1].strip()
-
-            typeobj = self.Type(self, tdata.typeId)
-            #DumperBase.warn('CREATE TYPE: %s' % typeobj.stringify())
-            typeobj.check()
-            return typeobj
+            return self.create_typeid_from_name(typish)
         raise RuntimeError('NEED TYPE, NOT %s' % type(typish))
 
-    def createValueFromAddressAndType(self, address, typish):
+    def cheap_typeid_from_name(self, typename_):
+        ns = self.qtNamespace()
+        typename = typename_.replace('@', ns)
+        return self.cheap_typeid_from_name_nons(typename)
+
+    def cheap_typeid_from_name_nons(self, typename):
+        if typename in self.typeid_cache:
+            return self.typeid_for_string(typename)
+
+        if typename.startswith('QList<') or typename.startswith('QVector<'):
+            typeid = self.typeid_for_string(typename)
+            if typeid:
+                size = 3 * self.ptrSize() if self.qtVersionAtLeast(0x060000) else self.ptrSize()
+                self.type_code_cache[typeid] = TypeCode.Struct
+                self.type_size_cache[typeid] = size
+                return typeid
+
+        if typename.endswith('*'):
+            inner_typeid = self.cheap_typeid_from_name_nons(typename[0:-1])
+            if inner_typeid != 0:
+                return self.create_pointer_typeid(inner_typeid)
+
+        return 0
+
+    def create_typeid_from_name(self, typename_, size=None):
+        ns = self.qtNamespace()
+        typename = typename_.replace('@', ns)
+
+        if typename in self.typeid_cache:
+            return self.typeid_for_string(typename)
+
+        # This triggers for boost::variant<int, std::string> due to the mis-encoding
+        # of the second template parameter.   [MARK_A]
+        knownType = self.lookupType(typename)
+        #self.warn('KNOWN: %s FOR %s' % (knownType, typename))
+        if knownType is not None:
+            #self.warn('USE FROM NATIVE')
+            #self.dump_location()
+            return knownType.typeid
+
+        #self.warn('FAKING: %s SIZE: %s' % (typename, size))
+        typeid = self.typeid_for_string(typename)
+        if size is not None:
+            self.type_size_cache[typeid] = size
+            self.type_code_cache[typeid] = TypeCode.Struct
+        if typename.endswith('*'):
+            self.type_code_cache[typeid] = TypeCode.Pointer
+            self.type_size_cache[typeid] = self.ptrSize()
+            self.type_target_cache[typeid] = self.typeid_for_string(typename[:-1].strip())
+
+        #self.dump_location()
+        #self.warn('CREATED TYPE: %s' % typeid)
+        return typeid
+
+    def createValueFromAddress(self, address, typish):
         val = self.Value(self)
-        val._type = self.createType(typish)
-        #DumperBase.warn('CREATING %s AT 0x%x' % (val.type.name, datish))
+        val.typeid = self.create_typeid(typish)
+        #self.warn('CREATING %s AT 0x%x' % (val.type.name, address))
         val.laddress = address
         if self.useDynamicType:
-            val._type = val.type.dynamicType(address)
+            val.typeid = self.dynamic_typeid_at_address(val.typeid, address)
+        return val
+
+    def createValueFromData(self, data, typish):
+        val = self.Value(self)
+        val.typeid = self.create_typeid(typish)
+        #self.warn('CREATING %s WITH DATA %s' % (val.type.name, self.hexencode(data)))
+        val.ldata = data
+        val.check()
         return val
 
     def createValue(self, datish, typish):
-        if self.isInt(datish):  # Used as address.
-            return self.createValueFromAddressAndType(datish, typish)
+        if isinstance(datish, int):  # Used as address.
+            return self.createValueFromAddress(datish, typish)
         if isinstance(datish, bytes):
-            val = self.Value(self)
-            val._type = self.createType(typish)
-            #DumperBase.warn('CREATING %s WITH DATA %s' % (val.type.name, self.hexencode(datish)))
-            val.ldata = datish
-            val.check()
-            return val
+            return self.createValueFromData(datish, typish)
         raise RuntimeError('EXPECTING ADDRESS OR BYTES, GOT %s' % type(datish))
 
     def createProxyValue(self, proxy_data, type_name):
-        tdata = self.TypeData(self, type_name)
-        tdata.code = TypeCode.Struct
+        typeid = self.typeid_for_string(type_name)
+        self.type_code_cache[typeid] = TypeCode.Struct
         val = self.Value(self)
-        val._type = self.Type(self, type_name)
+        val.typeid = typeid
         val.ldata = proxy_data
         return val
 
@@ -4013,109 +3667,669 @@ class DumperBase():
         def __init__(self, dumper):
             self.dumper = dumper
             self.pattern = ''
-            self.currentBitsize = 0
+            self.current_size = 0
             self.fields = []
             self.autoPadNext = False
             self.maxAlign = 1
 
-        def addField(self, fieldSize, fieldCode=None, fieldIsStruct=False,
-                     fieldName=None, fieldType=None, fieldAlign=1):
+        def add_field(self, field_size, field_code=None, field_is_struct=False,
+                      field_name=None, field_typeid=0, field_align=1):
 
-            if fieldType is not None:
-                fieldType = self.dumper.createType(fieldType)
-            if fieldSize is None and fieldType is not None:
-                fieldSize = fieldType.size()
-            if fieldCode is None:
-                fieldCode = '%ss' % fieldSize
+            if field_code is None:
+                field_code = '%ss' % field_size
+
+            #self.dumper.warn("FIELD SIZE: %s %s %s " % (field_name, field_size, str(field_align)))
 
             if self.autoPadNext:
-                self.currentBitsize = 8 * ((self.currentBitsize + 7) >> 3)  # Fill up byte.
-                padding = (fieldAlign - (self.currentBitsize >> 3)) % fieldAlign
-                #DumperBase.warn('AUTO PADDING AT %s BITS BY %s BYTES' % (self.currentBitsize, padding))
-                field = self.dumper.Field(self.dumper, bitpos=self.currentBitsize,
+                padding = (field_align - self.current_size) % field_align
+                #self.warn('AUTO PADDING AT %s BITS BY %s BYTES' % (self.current_size, padding))
+                field = self.dumper.Field(self.dumper, bitpos=self.current_size * 8,
                                           bitsize=padding * 8)
                 self.pattern += '%ds' % padding
-                self.currentBitsize += padding * 8
+                self.current_size += padding
                 self.fields.append(field)
                 self.autoPadNext = False
 
-            if fieldAlign > self.maxAlign:
-                self.maxAlign = fieldAlign
-            #DumperBase.warn("MAX ALIGN: %s" % self.maxAlign)
+            if field_align > self.maxAlign:
+                self.maxAlign = field_align
 
-            field = self.dumper.Field(dumper=self.dumper, name=fieldName, type=fieldType,
-                                      isStruct=fieldIsStruct, bitpos=self.currentBitsize,
-                                      bitsize=fieldSize * 8)
+            #self.warn("MAX ALIGN: %s" % self.maxAlign)
 
-            self.pattern += fieldCode
-            self.currentBitsize += fieldSize * 8
+            field = self.dumper.Field(name=field_name, typeid=field_typeid,
+                                      is_struct=field_is_struct, bitpos=self.current_size *8,
+                                      bitsize=field_size * 8)
+
+            self.pattern += field_code
+            self.current_size += field_size
             self.fields.append(field)
 
+    def describe_struct_member(self, typename):
+        typename = typename.replace('@', self.qtNamespace())
+
+        typeid = self.cheap_typeid_from_name_nons(typename)
+        if typeid:
+            size = self.type_size(typeid)
+            if size is not None:
+                return size, typeid
+
+        typeobj = self.lookupType(typename)
+        self.warn("LOOKUP FIELD TYPE: %s TYPEOBJ: %s" % (typename, typeobj))
+        if typeobj is not None:
+            typeid = typeobj.typeid
+            size = self.type_size(typeid)
+            if size is not None:
+                return size, typeid
+
+        self.warn("UNKNOWN EMBEDDED TYPE: %s" % typename)
+        return 0, 0
+
+    @functools.lru_cache(maxsize = None)
     def describeStruct(self, pattern):
-        if pattern in self.structPatternCache:
-            return self.structPatternCache[pattern]
         ptrSize = self.ptrSize()
         builder = self.StructBuilder(self)
         n = None
-        typeName = ''
+        typename = ''
         readingTypeName = False
+        #self.warn("PATTERN: %s" % pattern)
         for c in pattern:
+            #self.warn("PAT CODE: %s %s" % (c, str(n)))
             if readingTypeName:
                 if c == '}':
                     readingTypeName = False
-                    fieldType = self.createType(typeName)
-                    fieldAlign = fieldType.alignment()
-                    builder.addField(n, fieldIsStruct=True,
-                                     fieldType=fieldType, fieldAlign=fieldAlign)
-                    typeName = None
+                    n, field_typeid = self.describe_struct_member(typename)
+
+                    field_align = self.type_alignment(field_typeid)
+                    builder.add_field(n,
+                                      field_is_struct=True,
+                                      field_typeid=field_typeid,
+                                      field_align=field_align)
+                    typename = None
                     n = None
                 else:
-                    typeName += c
+                    typename += c
             elif c == 't':  # size_t
-                builder.addField(ptrSize, self.ptrCode(), fieldAlign=ptrSize)
+                builder.add_field(ptrSize, self.ptrCode(), field_align=ptrSize)
             elif c == 'p':  # Pointer as int
-                builder.addField(ptrSize, self.ptrCode(), fieldAlign=ptrSize)
+                builder.add_field(ptrSize, self.ptrCode(), field_align=ptrSize)
             elif c == 'P':  # Pointer as Value
-                builder.addField(ptrSize, '%ss' % ptrSize, fieldAlign=ptrSize)
+                builder.add_field(ptrSize, '%ss' % ptrSize, field_align=ptrSize)
             elif c in ('d'):
-                builder.addField(8, c, fieldAlign=ptrSize)  # fieldType = 'double' ?
+                builder.add_field(8, c, field_align=ptrSize)  # field_type = 'double' ?
             elif c in ('q', 'Q'):
-                builder.addField(8, c, fieldAlign=ptrSize)
+                builder.add_field(8, c, field_align=ptrSize)
             elif c in ('i', 'I', 'f'):
-                builder.addField(4, c, fieldAlign=4)
+                builder.add_field(4, c, field_align=4)
             elif c in ('h', 'H'):
-                builder.addField(2, c, fieldAlign=2)
+                builder.add_field(2, c, field_align=2)
             elif c in ('b', 'B', 'c'):
-                builder.addField(1, c, fieldAlign=1)
+                builder.add_field(1, c, field_align=1)
             elif c >= '0' and c <= '9':
                 if n is None:
                     n = ''
                 n += c
             elif c == 's':
-                builder.addField(int(n), fieldAlign=1)
+                builder.add_field(int(n), field_align=1)
                 n = None
             elif c == '{':
                 readingTypeName = True
-                typeName = ''
+                typename = ''
             elif c == '@':
                 if n is None:
                     # Automatic padding depending on next item
                     builder.autoPadNext = True
                 else:
                     # Explicit padding.
-                    builder.currentBitsize = 8 * ((builder.currentBitsize + 7) >> 3)
-                    padding = (int(n) - (builder.currentBitsize >> 3)) % int(n)
+                    padding = (int(n) - builder.current_size) % int(n)
                     field = self.Field(self)
                     builder.pattern += '%ds' % padding
-                    builder.currentBitsize += padding * 8
+                    builder.current_size += padding
                     builder.fields.append(field)
                     n = None
             else:
                 raise RuntimeError('UNKNOWN STRUCT CODE: %s' % c)
         pp = builder.pattern
-        size = (builder.currentBitsize + 7) >> 3
+        size = builder.current_size
         fields = builder.fields
         tailPad = (builder.maxAlign - size) % builder.maxAlign
         size += tailPad
-        self.structPatternCache[pattern] = (pp, size, fields)
+        #self.warn("FIELDS: %s" % ((pp, size, fields),))
         return (pp, size, fields)
+
+    def type_stringify(self, typeid):
+        return 'Type(id="%s",name="%s",bsize=%s,code=%s)'% (
+            str(typeid),
+            self.type_name_cache.get(typeid, '?'),
+            self.type_bitsize_cache.get(typeid, '?'),
+            self.type_code_cache.get(typeid, '?'))
+
+    def type_name(self, typeid):
+        name = self.type_name_cache.get(typeid, None)
+        if name is None:
+            self.dump_type_cache()
+            self.check_typeid(typeid)
+            raise RuntimeError('UNNAMED TYPE: %d' % typeid)
+        return name
+
+    def type_code(self, typeid):
+        # This does not seem to be needed for GDB and LLDB
+        if not typeid in self.type_code_cache:
+            typename = self.type_name_cache.get(typeid, None)
+            if typename is None:
+                raise RuntimeError('NAME/ID ERROR FOR %s' % typeid)
+            #self.warn("EMERGENCY LOOKUP: %s "  % typename)
+            typeobj = self.lookupType(typename)
+            if typeobj is None:
+                #self.warn("EMERGENCY LOOKUP FAILED: %s "  % typeid)
+                #self.dump_type_cache()
+                return TypeCode.Struct
+            #self.warn("EMERGENCY LOOKUP SUCCEEDED: %s "  % typeid)
+            typeid = typeobj.typeid
+        return self.type_code_cache[typeid]
+
+    def type_bitpos(self, typeid):
+        return self.type_bitpos_cache[typeid]
+
+    def type_target(self, typeid):
+        return self.type_target_cache.get(typeid, None)
+        targetid = self.type_target_cache.get(typeid, None)
+        if not targetid in self.type_code_cache:
+            typename = self.type_name_cache.get(targetid, None)
+            if typename is None:
+                raise RuntimeError('NAME/ID ERROR FOR TARGET %s' % targetid)
+            typeobj = self.lookupType(typename)
+            if typeobj is None:
+                #self.warn("EMERGENCY LOOKUP FAILED FOR %s %s "  % (typename, typeid))
+                #self.dump_type_cache()
+                return 0 # Void type id
+        return targetid
+
+    def type_template_arguments(self, typeid):
+        targs = []
+        #self.dump_type_cache()
+        #self.warn('TRY TEMPLATE ARGS FOR %s' % typeid)
+        for index in range(0, 100):
+            targ = self.type_template_argument(typeid, index)
+            #self.warn('INDEX %s %s' % (index, targ))
+            if targ is None:
+                break
+            targs.append(targ)
+        #self.warn('TARGS %s' % targs)
+        return targs
+
+    def nativeTemplateParameter(self, typeid, index, nativeType):
+        return None
+
+    def type_template_argument(self, typeid, index):
+        targ = self.type_template_arguments_cache.get((typeid, index), None)
+        if targ is not None:
+            return targ
+
+        native_type = self.type_nativetype_cache.get(typeid, None)
+        if native_type is not None:
+            targ = self.nativeTemplateParameter(typeid, index, native_type)
+            if targ is not None:
+                self.type_template_arguments_cache[(typeid, index)] = targ
+                return targ
+
+        # FIXME: The block below is apparently not needed anymore in the GDB
+        # and LLDB cases, so removing also doesn't bring performance. But it
+        # is at least potentially one source of type lookups.
+        #typename = self.type_name(typeid)
+        #self.dump_type_cache()
+        #self.warn('TEMPLATE ARGS FOR %s %s' % (typeid, typename))
+        #typeobj = self.lookupType(typename)
+        #if typeobj is not None:
+        #    #self.warn('  FOUNT NATIVE %s %s, %s' % (typeid, typeobj, native_type))
+        #    native_type = self.type_nativetype_cache.get(typeobj.typeid, None)
+        #    #targ = self.type_template_argument(typeobj.typeid, index)
+        #    targ = self.nativeTemplateParameter(typeobj.typeid, index, native_type)
+        #    if targ is not None:
+        #        self.type_template_arguments_cache[(typeid, index)] = targ
+        #        return targ
+
+        # Native lookups didn't help. Happens for 'wrong' placement of 'const'
+        # etc. with LLDB or template parameter packs with gcc in boost::variant
+        # 13.2.0. But not all is lost:
+        self.fill_template_parameters_manually(typeid)
+        targ = self.type_template_arguments_cache.get((typeid, index), None)
+        return targ
+
+    def type_alignment(self, typeid):
+        alignment = self.type_alignment_cache.get(typeid, None)
+        if alignment is not None:
+            return alignment
+
+        code = self.type_code_cache.get(typeid, None)
+        if code in (TypeCode.Typedef, TypeCode.Array):
+            alignment = self.type_alignment(self.type_target_cache[typeid])
+        elif code in (TypeCode.Integral, TypeCode.Float, TypeCode.Enum):
+            name = self.type_name(typeid)
+            if name in ('double', 'long long', 'unsigned long long'):
+                # Crude approximation.
+                alignment =  8 if self.isWindowsTarget() else self.ptrSize()
+            else:
+                alignment = self.type_size(typeid)
+        elif code in (TypeCode.Pointer, TypeCode.Reference, TypeCode.RValueReference):
+            alignment = self.ptrSize()
+        elif self.isCdb:
+            alignment = self.nativeStructAlignment(self.type_nativetype(typeid))
+        else:
+            size = self.type_size(typeid)
+            if size is None:
+                self.dump_type_cache()
+                self.warn("NO ALIGNMENT FOUND FOR SIZE OF TYPE %s" % str(typeid))
+                return 1
+            if size >= self.ptrSize():
+                alignment = self.ptrSize()
+            else:
+                alignment = size
+            #self.warn("GUESSING ALIGNMENT %s FOR TYPEID %s" % (alignment, typeid))
+        self.type_alignment_cache[typeid] = alignment
+        return alignment
+
+
+    def type_nativetype(self, typeid):
+        native_type = self.type_nativetype_cache.get(typeid, None)
+        if native_type is not None:
+            return native_type
+
+        typename = self.type_name(typeid)
+        native_type = self.lookupNativeType(typename)
+        # Also cache unsuccessful attempts
+        self.type_nativetype_cache[typeid] = native_type
+
+        return native_type
+
+
+    def type_size(self, typeid):
+        self.check_typeid(typeid)
+        size = self.type_size_cache.get(typeid, None)
+        if size is not None:
+            return size
+
+        nativeType = self.type_nativetype(typeid)
+        if self.isCdb:
+            size = nativeType.bitsize() // 8
+        else:
+            if not self.type_size_cache.get(typeid):
+                self.from_native_type(nativeType)
+            size = self.type_size_cache.get(typeid, None)
+
+        if size is not None:
+            self.type_size_cache[typeid] = size
+        else:
+            self.dump_type_cache()
+            self.warn("CANNOT DETERMINE SIZE FOR TYPE %s" % str(typeid))
+
+        return size
+
+    def type_bitsize(self, typeid):
+        bitsize = self.type_bitsize_cache.get(typeid, None)
+        if bitsize is None:
+            bitsize = 8 * self.type_size(typeid)
+            self.type_bitsize_cache[typeid] = bitsize
+        return bitsize
+
+    def dynamic_typeid_at_address(self, base_typeid, address):
+        #with self.dumper.timer('dynamic_typeid_at_address %s 0x%s' % (self.name, address)):
+        type_code = self.type_code_cache.get(base_typeid, None)
+        if type_code != TypeCode.Struct:
+           #self.dump_type_cache()
+           #self.warn('SHORT CUT FOR BASE ID: %d TC: %s' % (base_typeid, type_code))
+           return base_typeid
+
+        # This turned out to be expensive.
+        #try:
+        #    vtbl = self.extract_pointer_at_address(address)
+        #except:
+        #    return base_typeid
+        ##self.warn('VTBL: 0x%x' % vtbl)
+        #if not self.couldBePointer(vtbl):
+        #    return base_typeid
+        #self.warn("DYN TYPE FOR %s %s" % (base_typeid, self.type_name(base_typeid)))
+
+        return self.nativeDynamicType(address, base_typeid)
+
+    # This is the generic version for synthetic values.
+    # The native backends replace it in their fromNativeValue()
+    # implementations.
+    def value_members(self, value, include_bases):
+        #self.warn("LISTING MEMBERS OF %s" % value)
+        #self.warn("LISTING MEMBERS OF TYPE %s %s" % (value.typeid, self.type_name(value.typeid)))
+        typeid = value.typeid
+
+        members = self.type_fields_cache.get(typeid, None)
+        if members is not None:
+            return members
+
+        members = []
+        native_type = self.type_nativetype_cache.get(typeid, None)
+        if native_type is None:
+            native_type = self.lookupNativeType(self.type_name(typeid))
+        if not native_type is None:
+            members = self.nativeListMembers(value, native_type, include_bases)
+            #self.warn("FIELDS 2: %s" % ', '.join(str(f) for f in members))
+        else:
+            self.warn("NO NATIVE TYPE FIELDS FOR: %s" % typeid)
+
+        #self.warn("GOT MEMBERS: %s" % ', '.join(str(f.name) for f in members))
+        return members
+
+    def value_member_by_field(self, value, field):
+        #self.warn("EXTRACTING MEMBER '%s' OF %s AT OFFSET %s" % (field.name, field.typeid, field.bitpos))
+        val = self.Value(self)
+        val.typeid = field.typeid
+        val.name = field.name
+        val.isBaseClass = field.is_base_class
+        #self.warn('CREATING %s WITH DATA %s' % (val.type.name, self.hexencode(data)))
+        field_offset = field.bitpos // 8
+        if value.laddress is not None:
+            val.laddress = value.laddress + field_offset
+        field_size = (field.bitsize + 7) // 8
+        blob = self.value_data(value, field_offset + field_size)
+        val.ldata = blob[field_offset:field_offset + field_size]
+        #self.dump_location()
+        return val
+
+    def value_member_by_name(self, value, name):
+        #field = self.type_fields_cache.get((value.typeid, name), None)
+        #if field is not None:
+        #    return self.value_member_by_field(value, field)
+
+        #self.dump_location()
+        #self.warn("WANT MEMBER  '%s' OF  '%s'" % (name, value))
+        #value.check()
+        value_typecode = self.type_code(value.typeid)
+        if value_typecode == TypeCode.Typedef:
+            return self.value_member_by_name(self.value_detypedef(value), name)
+        if value_typecode in (TypeCode.Pointer, TypeCode.Reference, TypeCode.RValueReference):
+            res = self.value_member_by_name(self.value_dereference(value), name)
+            if res is not None:
+                return res
+        if value_typecode == TypeCode.Struct:
+            #self.warn('SEARCHING FOR MEMBER: %s IN %s' % (name, value.type.name))
+            members = self.value_members(value, True)
+            #self.warn('MEMBERS: %s' % ', '.join(str(m.name) for m in members))
+            base = None
+            for member in members:
+                #self.warn('CHECKING FIELD %s' % member.name)
+                if member.type.code == TypeCode.Typedef:
+                    member = member.detypedef()
+                if member.name == name:
+                    #self.warn('FOUND MEMBER 1: %s IN %s' % (name, value.type.name))
+                    return member
+                if member.isBaseClass:
+                    base = member
+            if self.isCdb:
+                if base is not None:
+                    # self.warn("CHECKING BASE CLASS '%s' for '%s'" % (base.type.name, name))
+                    res = self.value_member_by_name(base, name)
+                    if res is not None:
+                        # self.warn('FOUND MEMBER 2: %s IN %s' % (name, value.type.name))
+                        return res
+            else:
+                for member in members:
+                    if member.type.code == TypeCode.Typedef:
+                        member = member.detypedef()
+                    if member.name == name:  # Could be base class.
+                        return member
+                    if member.type.code == TypeCode.Struct:
+                        res = self.value_member_by_name(member, name)
+                        if res is not None:
+                            #self.warn('FOUND MEMBER 2: %s IN %s' % (name, value.type.name))
+                            return res
+
+            #self.warn('DID NOT FIND MEMBER: %s IN %s' % (name, value.type.name))
+            #self.dump_location()
+        return None
+
+    def value_member_by_indexish(self, value, indexish):
+        #self.warn('GET ITEM %s %s' % (self, indexish))
+        #value.check()
+        value_typecode = self.type_code(value.typeid)
+        if isinstance(indexish, str):
+            if value_typecode == TypeCode.Pointer:
+                #self.warn('GET ITEM %s DEREFERENCE TO %s' % (value, value.dereference()))
+                return value.dereference().__getitem__(indexish)
+            res = self.value_member_by_name(value, indexish)
+            if res is None:
+                raise RuntimeError('No member named %s in type %s'
+                                   % (indexish, value.type.name))
+            return res
+        if isinstance(indexish, int):
+            if value_typecode == TypeCode.Array:
+                addr = value.laddress + int(indexish) * value.type.target().size()
+                return self.createValueFromAddress(addr, value.type.target())
+            if value_typecode == TypeCode.Pointer:
+                addr = value.pointer() + int(indexish) * value.type.target().size()
+                return self.createValueFromAddress(addr, value.type.target())
+            return self.value_members(value, False)[indexish]
+        raise RuntimeError('BAD INDEX TYPE %s' % type(indexish))
+
+    def value_extract_bits(self, value, bitpos, bitsize):
+        value_size = self.type_size(value.typeid)
+        ldata = bytes(self.value_data(value, value_size))
+        bdata = ''.join([format(x, '0>8b')[::-1] for x in ldata])
+        fdata = bdata[bitpos : bitpos + bitsize]
+        fdata = fdata[::-1]
+        return int(fdata, 2)
+
+    def value_display_enum(self, value, form='%d', bitsize=None):
+        size = value.type.size()
+        intval = self.value_extract_integer(value, size, False)
+        dd = self.type_enum_display_cache.get(value.typeid, None)
+        if dd is None:
+            return str(intval)
+        return dd(intval, value.laddress, form)
+
+    def value_as_address(self, value):
+        return self.value_extract_integer(value, self.ptrSize(), False)
+
+    def value_as_integer(self, value):
+        if isinstance(value.ldata, int):
+            return value.ldata
+        type_name = self.type_name(value.typeid)
+        signed = type_name != 'unsigned' \
+            and not type_name.startswith('unsigned ') \
+            and  type_name.find(' unsigned ') == -1
+        size = value.type.size()
+        return self.value_extract_integer(value, size, signed)
+
+    def value_as_floating_point(self, value):
+        if value.nativeValue is not None and not self.isCdb:
+            return str(value.nativeValue)
+        if self.type_code(value.typeid) == TypeCode.Typedef:
+            return self.value_as_floating_point(self.value_detypedef(value))
+        if value.type.size() == 8:
+            blob = self.value_data(value, 8)
+            return struct.unpack_from(self.packCode + 'd', blob, 0)[0]
+        if value.type.size() == 4:
+            blob = self.value_data(value, 4)
+            return struct.unpack_from(self.packCode + 'f', blob, 0)[0]
+        # Fall back in case we don't have a nativeValue at hand.
+        # FIXME: This assumes Intel's 80bit extended floats. Which might
+        # be wrong.
+        l, h = value.split('QQ')
+        if True:  # 80 bit floats
+            sign = (h >> 15) & 1
+            exp = (h & 0x7fff)
+            fraction = l
+            bit63 = (l >> 63) & 1
+            #self.warn("SIGN: %s  EXP: %s  H: 0x%x L: 0x%x" % (sign, exp, h, l))
+            if exp == 0:
+                if bit63 == 0:
+                    if l == 0:
+                        res = '-0' if sign else '0'
+                    else:
+                        res = (-1)**sign * l * 2**(-16382)  # subnormal
+                else:
+                    res = 'pseudodenormal'
+            elif exp == 0x7fff:
+                res = 'special'
+            else:
+                res = (-1)**sign * l * 2**(exp - 16383 - 63)
+        else:  # 128 bits
+            sign = h >> 63
+            exp = (h >> 48) & 0x7fff
+            fraction = h & (2**48 - 1)
+            #self.warn("SIGN: %s  EXP: %s  FRAC: %s  H: 0x%x L: 0x%x" % (sign, exp, fraction, h, l))
+            if exp == 0:
+                if fraction == 0:
+                    res = -0.0 if sign else 0.0
+                else:
+                    res = (-1)**sign * fraction / 2**48 * 2**(-62)  # subnormal
+            elif exp == 0x7fff:
+                res = ('-inf' if sign else 'inf') if fraction == 0 else 'nan'
+            else:
+                res = (-1)**sign * (1 + fraction / 2**48) * 2**(exp - 63)
+        return res
+
+    def value_data(self, value, size):
+        if value.ldata is not None:
+            return value.ldata[:size]
+        if value.laddress is not None:
+            return self.value_data_from_address(value.laddress, size)
+        raise RuntimeError('CANNOT CONVERT TO BYTES: %s' % value)
+
+    def value_data_from_address(self, address, size):
+        if not isinstance(address, int):
+            raise RuntimeError('ADDRESS WRONG TYPE: %s' % type(address))
+        if not isinstance(size, int):
+            raise RuntimeError('SIZE WRONG TYPE: %s' % type(size))
+        if size <= 0:
+            raise RuntimeError('SIZE WRONG VALUE: %s' % size)
+        res = self.readRawMemory(address, size)
+        if len(res) > 0:
+            return res
+        raise RuntimeError('CANNOT READ %d BYTES FROM ADDRESS: %s' % (size, address))
+
+    def value_display(self, value):
+        type_code = self.type_code(value.typeid)
+        if type_code == TypeCode.Enum:
+            return self.value_display_enum(value)
+        if type_code == TypeCode.Typedef:
+            return self.value_display(self.value_detypedef(value))
+        if type_code == TypeCode.Integral:
+            return self.value_as_integer(value)
+        if type_code == TypeCode.Bitfield:
+            return self.value_as_integer(value)
+        if type_code == TypeCode.Float:
+            return self.value_as_floating_point(value)
+        if type_code == TypeCode.Pointer:
+            return self.value_as_address(value)
+        return None
+
+    def value_detypedef(self, value):
+        #value.check()
+        #if value.type.code != TypeCode.Typedef:
+        #    raise RuntimeError("WRONG")
+        val = value.copy()
+        val.typeid = self.type_target(value.typeid)
+        #self.warn("DETYPEDEF FROM: %s" % self)
+        #self.warn("DETYPEDEF TO: %s" % val)
+        return val
+
+    def split(self, pattern, value_or_address):
+        if isinstance(value_or_address, self.Value):
+            return self.value_split(value_or_address, pattern)
+        if isinstance(value_or_address, int):
+            val = self.Value(self)
+            val.laddress = value_or_address
+            return self.value_split(val, pattern)
+        raise RuntimeError('CANNOT EXTRACT STRUCT FROM %s' % type(value_or_address))
+
+    def value_split(self, value, pattern):
+        #self.warn('EXTRACT STRUCT FROM: %s' % self.type)
+        (pp, size, fields) = self.describeStruct(pattern)
+        #self.warn('SIZE: %s ' % size)
+
+        blob = self.value_data(value, size)
+        address = value.laddress
+
+        parts = struct.unpack_from(self.packCode + pp, blob)
+
+        def fix_struct(field, part):
+            #self.warn('STRUCT MEMBER: %s' % type(part))
+            if field.is_struct:
+                res = self.Value(self)
+                res.typeid = field.typeid
+                res.ldata = part
+                if address is not None:
+                    res.laddress = address + field.bitpos // 8
+                return res
+            return part
+
+        if len(fields) != len(parts):
+            raise RuntimeError('STRUCT ERROR: %s %s' % (fields, parts))
+        return tuple(map(fix_struct, fields, parts))
+
+    def type_dereference(self, typeid):
+        if self.type_code(typeid) == TypeCode.Typedef:
+            return self.type_dereference(self.type_target(typeid))
+        return self.type_target(typeid)
+
+    def type_strip_typedefs(self, typeid):
+        if self.type_code(typeid) == TypeCode.Typedef:
+            return self.type_strip_typedefs(self.type_target(typeid))
+        return typeid
+
+    def value_dereference(self, value):
+        value.check()
+        #if value.type.code == TypeCode.Typedef:
+        #    return self.value_dereference(self.value_detypedef(value))
+        val = self.Value(self)
+        if value.type.code in (TypeCode.Reference, TypeCode.RValueReference):
+            val.summary = value.summary
+            if value.nativeValue is None:
+                val.laddress = value.pointer()
+                if val.laddress is None and value.laddress is not None:
+                    val.laddress = value.laddress
+                val.typeid = self.type_dereference(value.typeid)
+                if self.useDynamicType:
+                    val.typeid = self.nativeDynamicType(val.laddress, val.typeid)
+            else:
+                val = self.nativeValueDereferenceReference(value)
+        elif value.type.code == TypeCode.Pointer:
+            try:
+                val = self.nativeValueDereferencePointer(value)
+            except:
+                val.laddress = value.pointer()
+                val.typeid = self.type_dereference(value.typeid)
+                if self.useDynamicType:
+                    val.typeid = self.nativeDynamicType(val.laddress, val.typeid)
+        else:
+            raise RuntimeError("WRONG: %s" % value.type.code)
+
+        return val
+
+    def value_cast(self, value, typish):
+        value.check()
+        val = self.Value(self)
+        val.laddress = value.laddress
+        val.ldata = value.ldata
+        val.typeid = self.create_typeid(typish)
+        return val
+
+    def value_plus_something(self, value, other):
+        value.check()
+        if isinstance(other, int):
+            stripped = self.type_strip_typedefs(value.typeid)
+            if self.type_code(stripped) == TypeCode.Pointer:
+                item_size = self.type_size(self.type_dereference(stripped))
+                address = self.value_as_address(value) + item_size * other
+                val = self.Value(self)
+                val.laddress = None
+                val.ldata = address
+                val.typeid = value.typeid
+                return val
+        raise RuntimeError('BAD DATA TO ADD TO: %s %s' % (value.type, other))
+
+    def value_minus_something(self, value, other):
+        value.check()
+        if other.type.name == value.type.name:
+            stripped = self.type_strip_typedefs(value.typeid)
+            if self.type_code(stripped.code) == TypeCode.Pointer:
+                item_size = self.type_size(self.type_dereference(stripped))
+                return (value.pointer() - other.pointer()) // item_size
+        raise RuntimeError('BAD DATA TO SUB TO: %s %s' % (value.type, other))
+
diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py
index d61160eed3b..ee25520bced 100644
--- a/share/qtcreator/debugger/gdbbridge.py
+++ b/share/qtcreator/debugger/gdbbridge.py
@@ -10,11 +10,10 @@ import gdb
 import os
 import os.path
 import re
-import sys
 import struct
 import tempfile
 
-from dumper import DumperBase, Children, toInteger, TopLevelItem
+from dumper import DumperBase, Children, TopLevelItem
 from utils import TypeCode
 from gdbtracepoint import *
 
@@ -119,7 +118,6 @@ ScanStackCommand()
 class PlainDumper():
     def __init__(self, printer):
         self.printer = printer
-        self.typeCache = {}
 
     def __call__(self, d, value):
         if value.nativeValue is None:
@@ -137,8 +135,6 @@ class PlainDumper():
         if isinstance(val, str):
             # encode and avoid extra quotes ('"') at beginning and end
             d.putValue(d.hexencode(val), 'utf8:1:0')
-        elif sys.version_info[0] <= 2 and isinstance(val, unicode):
-            d.putValue(val)
         elif val is not None:  # Assuming LazyString
             d.putCharArrayValue(val.address, val.length,
                                 val.type.target().sizeof)
@@ -166,7 +162,7 @@ def importPlainDumpers(args):
             gdb.execute('disable pretty-printer .* .*')
         except:
             # Might occur in non-ASCII directories
-            DumperBase.warn('COULD NOT DISABLE PRETTY PRINTERS')
+            theDumper.warn('COULD NOT DISABLE PRETTY PRINTERS')
     else:
         theDumper.usePlainDumpers = True
         theDumper.importPlainDumpers()
@@ -192,15 +188,17 @@ class Dumper(DumperBase):
 
         # These values will be kept between calls to 'fetchVariables'.
         self.isGdb = True
-        self.typeCache = {}
         self.interpreterBreakpointResolvers = []
 
+    def warn(self, message):
+        print('bridgemessage={msg="%s"},' % message.replace('"', '$').encode('latin1'))
+
     def prepare(self, args):
         self.output = []
         self.setVariableFetchingOptions(args)
 
     def fromFrameValue(self, nativeValue):
-        #DumperBase.warn('FROM FRAME VALUE: %s' % nativeValue.address)
+        #self.warn('FROM FRAME VALUE: %s' % nativeValue.address)
         val = nativeValue
         if self.useDynamicType:
             try:
@@ -209,71 +207,43 @@ class Dumper(DumperBase):
                 pass
         return self.fromNativeValue(val)
 
-    def nativeValueType(self, nativeValue):
-        return self.fromNativeType(nativeValue.type)
-
     def fromNativeValue(self, nativeValue):
-        #DumperBase.warn('FROM NATIVE VALUE: %s' % nativeValue)
+        #self.warn('FROM NATIVE VALUE: %s' % nativeValue)
         self.check(isinstance(nativeValue, gdb.Value))
         nativeType = nativeValue.type
         code = nativeType.code
-        if code == gdb.TYPE_CODE_REF:
-            targetType = self.fromNativeType(nativeType.target().unqualified())
-            val = self.createReferenceValue(toInteger(nativeValue.address), targetType)
-            val.nativeValue = nativeValue
-            #DumperBase.warn('CREATED REF: %s' % val)
-            return val
-        if code == gdb.TYPE_CODE_PTR:
-            try:
-                nativeTargetValue = nativeValue.dereference()
-            except:
-                nativeTargetValue = None
-            targetType = self.fromNativeType(nativeType.target().unqualified())
-            val = self.createPointerValue(toInteger(nativeValue), targetType)
-            # The nativeValue is needed in case of multiple inheritance, see
-            # QTCREATORBUG-17823. Using it triggers nativeValueDereferencePointer()
-            # later which
-            # is surprisingly expensive.
-            val.nativeValue = nativeValue
-            #DumperBase.warn('CREATED PTR 1: %s' % val)
-            if nativeValue.address is not None:
-                val.laddress = toInteger(nativeValue.address)
-            #DumperBase.warn('CREATED PTR 2: %s' % val)
-            return val
-        if code == gdb.TYPE_CODE_TYPEDEF:
-            targetType = nativeType.strip_typedefs().unqualified()
-            #DumperBase.warn('TARGET TYPE: %s' % targetType)
-            if targetType.code == gdb.TYPE_CODE_ARRAY:
-                val = self.Value(self)
-            else:
-                try:
-                    # Cast may fail for arrays, for typedefs to __uint128_t with
-                    # gdb.error: That operation is not available on integers
-                    # of more than 8 bytes.
-                    # See test for Bug5799, QTCREATORBUG-18450.
-                    val = self.fromNativeValue(nativeValue.cast(targetType))
-                except:
-                    val = self.Value(self)
-            #DumperBase.warn('CREATED TYPEDEF: %s' % val)
-        else:
-            val = self.Value(self)
 
+        val = self.Value(self)
         val.nativeValue = nativeValue
-        if nativeValue.address is not None:
-            val.laddress = toInteger(nativeValue.address)
-        else:
-            size = nativeType.sizeof
-            chars = self.lookupNativeType('unsigned char')
-            y = nativeValue.cast(chars.array(0, int(nativeType.sizeof - 1)))
-            buf = bytearray(struct.pack('x' * size))
-            for i in range(size):
-                try:
-                    buf[i] = int(y[i])
-                except:
-                    pass
-            val.ldata = bytes(buf)
 
-        val._type = self.fromNativeType(nativeType)
+        if code == gdb.TYPE_CODE_REF:
+            target_typeid = self.from_native_type(nativeType.target().unqualified())
+            val.ldata = int(nativeValue.address)
+            if self.useDynamicType:  # needed for Gdb13393
+                target_typeid = self.dynamic_typeid_at_address(target_typeid, val.ldata)
+            val.typeid = self.create_reference_typeid(target_typeid)
+            #self.warn('CREATED REF: %s' % val)
+            return val
+
+        if code == gdb.TYPE_CODE_PTR:
+            target_typeid = self.from_native_type(nativeType.target().unqualified())
+            val.ldata = int(nativeValue)
+            val.typeid = self.create_pointer_typeid(target_typeid)
+            #self.warn('CREATED PTR 1: %s' % val)
+            if nativeValue.address is not None:
+                val.laddress = int(nativeValue.address)
+            #self.warn('CREATED PTR 2: %s' % val)
+            return val
+
+        if nativeValue.address is not None:
+            val.laddress = int(nativeValue.address)
+        elif code == gdb.TYPE_CODE_STRUCT:
+            try:
+                val.ldata = nativeValue.bytes # GDB 15 only
+            except:
+                val.ldata = self.nativeDataFromValueFallback(nativeValue, nativeValue.type.sizeof)
+
+        val.typeid = self.from_native_type(nativeType)
         val.lIsInScope = not nativeValue.is_optimized_out
         code = nativeType.code
         if code == gdb.TYPE_CODE_ENUM:
@@ -283,76 +253,103 @@ class Dumper(DumperBase):
                 val.ldisplay += ' (%s)' % intval
         elif code == gdb.TYPE_CODE_COMPLEX:
             val.ldisplay = str(nativeValue)
-        elif code in [gdb.TYPE_CODE_BOOL, gdb.TYPE_CODE_INT]:
+        elif code == gdb.TYPE_CODE_BOOL:
+            # FIXME: why?
+            # Using ldata breaks StdVariant test, not setting lvalue breaks the Bitfield[s2] test.
+            val.lvalue = int(nativeValue)
+            val.ldata = None
+        elif code == gdb.TYPE_CODE_INT:
             try:
                 # extract int presentation from native value and remember it
-                val.lvalue = int(nativeValue)
+                val.ldata = int(nativeValue)
             except:
                 # GDB only support converting integers of max. 64 bits to Python int as of now
                 pass
+        elif code == gdb.TYPE_CODE_TYPEDEF:
+            targetType = nativeType.strip_typedefs().unqualified()
+            if targetType.code in [gdb.TYPE_CODE_BOOL, gdb.TYPE_CODE_INT]:
+                typeid = val.typeid
+                val = self.fromNativeValue(nativeValue.cast(targetType))
+                val.typeid = typeid
         #elif code == gdb.TYPE_CODE_ARRAY:
         #    val.type.ltarget = nativeValue[0].type.unqualified()
         return val
 
+    def nativeDataFromValueFallback(self, nativeValue, size):
+        chars = self.lookupNativeType('unsigned char')
+        try:
+            y = nativeValue.cast(chars.array(0, int(size - 1)))
+            buf = bytearray(struct.pack('x' * size))
+            for i in range(size):
+                try:
+                    buf[i] = int(y[i])
+                except:
+                    pass
+            return bytes(buf)
+        except:
+            self.warn('VALUE EXTRACTION FAILED: VALUE: %s SIZE: %s' % (nativeValue, size))
+        return None
+
     def ptrSize(self):
         result = gdb.lookup_type('void').pointer().sizeof
         self.ptrSize = lambda: result
         return result
 
-    def fromNativeType(self, nativeType):
+    def from_native_type(self, nativeType):
         self.check(isinstance(nativeType, gdb.Type))
-        code = nativeType.code
-        #DumperBase.warn('FROM NATIVE TYPE: %s' % nativeType)
+
+        #self.warn('FROM NATIVE TYPE: %s' % nativeType)
         nativeType = nativeType.unqualified()
 
+        typeid_str = self.native_type_key(nativeType)
+        known_typeid = self.typeid_from_typekey.get(typeid_str, None)
+        if known_typeid is not None:
+            return known_typeid
+
+        code = nativeType.code
+
         if code == gdb.TYPE_CODE_PTR:
-            #DumperBase.warn('PTR')
-            targetType = self.fromNativeType(nativeType.target().unqualified())
-            return self.createPointerType(targetType)
+            #self.warn('PTR')
+            target_typeid = self.from_native_type(nativeType.target().unqualified())
+            typeid = self.create_pointer_typeid(target_typeid)
 
-        if code == gdb.TYPE_CODE_REF:
-            #DumperBase.warn('REF')
-            targetType = self.fromNativeType(nativeType.target().unqualified())
-            return self.createReferenceType(targetType)
+        elif code == gdb.TYPE_CODE_REF:
+            #self.warn('REF')
+            target_typeid = self.from_native_type(nativeType.target().unqualified())
+            typeid = self.create_reference_typeid(target_typeid)
 
-        if hasattr(gdb, "TYPE_CODE_RVALUE_REF"):
-            if code == gdb.TYPE_CODE_RVALUE_REF:
-                #DumperBase.warn('RVALUEREF')
-                targetType = self.fromNativeType(nativeType.target())
-                return self.createRValueReferenceType(targetType)
+        elif code == gdb.TYPE_CODE_RVALUE_REF and hasattr(gdb, "TYPE_CODE_RVALUE_REF"):
+            #self.warn('RVALUEREF')
+            target_typeid = self.from_native_type(nativeType.target())
+            typeid = self.create_rvalue_reference_typeid(target_typeid)
 
-        if code == gdb.TYPE_CODE_ARRAY:
-            #DumperBase.warn('ARRAY')
+        elif code == gdb.TYPE_CODE_ARRAY:
+            #self.warn('ARRAY')
             nativeTargetType = nativeType.target().unqualified()
-            targetType = self.fromNativeType(nativeTargetType)
+            target_typeid = self.from_native_type(nativeTargetType)
             if nativeType.sizeof == 0:
                 # QTCREATORBUG-23998, note that nativeType.name == None here,
                 # whereas str(nativeType) returns sth like 'QObject [5]'
                 count = self.arrayItemCountFromTypeName(str(nativeType), 1)
             else:
                 count = nativeType.sizeof // nativeTargetType.sizeof
-            return self.createArrayType(targetType, count)
+            typeid = self.create_array_typeid(target_typeid, count)
 
-        if code == gdb.TYPE_CODE_TYPEDEF:
-            #DumperBase.warn('TYPEDEF')
+        elif code == gdb.TYPE_CODE_TYPEDEF:
+            #self.warn('TYPEDEF')
             nativeTargetType = nativeType.unqualified()
             while nativeTargetType.code == gdb.TYPE_CODE_TYPEDEF:
                 nativeTargetType = nativeTargetType.strip_typedefs().unqualified()
-            targetType = self.fromNativeType(nativeTargetType)
-            return self.createTypedefedType(targetType, str(nativeType),
-                                            self.nativeTypeId(nativeType))
+            target_typeid = self.from_native_type(nativeTargetType)
+            typeid = self.create_typedefed_typeid(target_typeid, str(nativeType), typeid_str)
 
-        if code == gdb.TYPE_CODE_ERROR:
+        elif code == gdb.TYPE_CODE_ERROR:
             self.warn('Type error: %s' % nativeType)
-            return self.Type(self, '')
+            typeid = 0 # the invalid id
 
-        typeId = self.nativeTypeId(nativeType)
-        res = self.typeData.get(typeId, None)
-        if res is None:
-            tdata = self.TypeData(self, typeId)
-            tdata.name = str(nativeType)
-            tdata.lbitsize = nativeType.sizeof * 8
-            tdata.code = {
+        else:
+            typeid = self.typeid_for_string(typeid_str)
+            type_code = {
                 #gdb.TYPE_CODE_TYPEDEF : TypeCode.Typedef, # Handled above.
                 gdb.TYPE_CODE_METHOD: TypeCode.Function,
                 gdb.TYPE_CODE_VOID: TypeCode.Void,
@@ -372,38 +369,82 @@ class Dumper(DumperBase):
                 gdb.TYPE_CODE_COMPLEX: TypeCode.Complex,
                 gdb.TYPE_CODE_STRING: TypeCode.FortranString,
             }[code]
-            if tdata.code == TypeCode.Enum:
-                tdata.enumDisplay = lambda intval, addr, form: \
-                    self.nativeTypeEnumDisplay(nativeType, intval, form)
-            if tdata.code == TypeCode.Struct:
-                tdata.lalignment = lambda: \
-                    self.nativeStructAlignment(nativeType)
-                tdata.lfields = lambda value: \
-                    self.listMembers(value, nativeType)
-            tdata.templateArguments = lambda: \
-                    self.listTemplateParameters(nativeType)
-        #    warn('CREATE TYPE: %s' % typeId)
-        #else:
-        #    warn('REUSE TYPE: %s' % typeId)
-        return self.Type(self, typeId)
+            self.type_name_cache[typeid] = str(nativeType)
+            self.type_size_cache[typeid] = nativeType.sizeof
+            self.type_code_cache[typeid] = type_code
+            self.type_nativetype_cache[typeid] = nativeType
 
-    def listTemplateParameters(self, nativeType):
-        targs = []
-        pos = 0
-        while True:
-            try:
-                targ = nativeType.template_argument(pos)
-            except:
-                break
-            if isinstance(targ, gdb.Type):
-                targs.append(self.fromNativeType(targ.unqualified()))
-            elif isinstance(targ, gdb.Value):
-                targs.append(self.fromNativeValue(targ).value())
-            else:
-                raise RuntimeError('UNKNOWN TEMPLATE PARAMETER')
-            pos += 1
-        targs2 = self.listTemplateParametersManually(str(nativeType))
-        return targs if len(targs) >= len(targs2) else targs2
+            if type_code == TypeCode.Enum:
+                self.type_enum_display_cache[typeid] = lambda intval, addr, form: \
+                    self.nativeTypeEnumDisplay(nativeType, intval, form)
+
+        self.type_nativetype_cache[typeid] = nativeType
+
+        if code == gdb.TYPE_CODE_STRUCT:
+            self.type_qobject_based_cache[typeid] = self.is_qobject_based(nativeType)
+            #res = self.is_qobject_based(nativeType)
+            #if res == False:
+            #    self.warn("RECOGNIZED AS NON-QOBJECT: %s" % nativeType)
+            #elif res == True:
+            #    self.warn("RECOGNIZED AS   QOBJECT: %s" % nativeType)
+            #else:
+            #    self.warn("UNRECOGNIZED: %s" % nativeType)
+        elif code != gdb.TYPE_CODE_TYPEDEF:
+            self.type_qobject_based_cache[typeid] = False
+
+# FIXME: Field offset caching (or later extraction?) broken
+#       if code == gdb.TYPE_CODE_STRUCT:
+#           field_type_name = self.type_name_cache.get(typeid, '')
+#           #self.warn("CACHING FIELDS OF %s '%s'" % (typeid, field_type_name))
+#           try:
+#               fields = nativeType.fields()
+#               #self.warn("FOUND FIELDS %s" % fields)
+#           except:
+#               #self.warn("NO FIELDS IN %s '%s'" % (typeid, field_type_name))
+#               fields = []
+#           for nativeField in fields:
+#               field_name = nativeField.name
+#               if field_name.startswith('std::allocator'):
+#                   continue
+#               field_bitpos = nativeField.bitpos
+#               field_typeid = self.typeid_for_string(str(nativeType))
+#               field_size = nativeField.type.sizeof
+#               #self.warn("CACHING '%s' OF %s AT BITPOS %s SIZE %s" %
+#               #    (field_name, typeid, field_bitpos, field_size))
+#               self.type_fields_cache[(typeid, field_name)] = self.Field(
+#                   name=field_name,
+#                   typeid=field_typeid,
+#                   bitpos=field_bitpos,
+#                   bitsize=field_size * 8
+#               )
+#               pass
+
+
+        #self.warn("FROM NATIVE TYPE: %s %s %s" % (typeid, id(nativeType), nativeType))
+        self.typeid_from_typekey[str(nativeType)] = typeid
+
+        return typeid
+
+    def is_qobject_based(self, nativeType):
+        if str(nativeType) == self.qtNamespace() + 'QObject':
+            return True
+        fields = nativeType.fields()
+        if len(fields) == 0:
+            return None  # No info, can't drill deeper
+        if not fields[0].is_base_class:
+            return False
+        return self.is_qobject_based(fields[0].type)
+
+    def nativeTemplateParameter(self, typeid, index, nativeType):
+        try:
+            targ = nativeType.template_argument(index)
+        except:
+            return None
+        if isinstance(targ, gdb.Type):
+            return self.Type(self, self.from_native_type(targ.unqualified()))
+        if isinstance(targ, gdb.Value):
+            return self.fromNativeValue(targ).value()
+        raise RuntimeError('UNKNOWN TEMPLATE PARAMETER')
 
     def nativeTypeEnumDisplay(self, nativeType, intval, form):
         try:
@@ -432,7 +473,7 @@ class Dumper(DumperBase):
             pass
         return form % intval
 
-    def nativeTypeId(self, nativeType):
+    def native_type_key(self, nativeType):
         if nativeType and (nativeType.code == gdb.TYPE_CODE_TYPEDEF):
             return '%s{%s}' % (nativeType, nativeType.strip_typedefs())
         name = str(nativeType)
@@ -444,133 +485,106 @@ class Dumper(DumperBase):
             c = 's'
         else:
             return name
-        typeId = c + ''.join(['{%s:%s}' % (f.name, self.nativeTypeId(f.type))
-                              for f in nativeType.fields()])
-        return typeId
+        id_str = c + ''.join(['{%s:%s}' %
+            (f.name, self.typeid_for_string(self.native_type_key(f.type)))
+                for f in nativeType.fields()])
+        #self.warn("NATIVE TYPE KEY: %s" % id_str)
+        return id_str
 
-    def nativeStructAlignment(self, nativeType):
-        #DumperBase.warn('NATIVE ALIGN FOR %s' % nativeType.name)
-        def handleItem(nativeFieldType, align):
-            a = self.fromNativeType(nativeFieldType).alignment()
-            return a if a > align else align
-        align = 1
-        for f in nativeType.fields():
-            align = handleItem(f.type, align)
-        return align
-
-        #except:
-        #    # Happens in the BoostList dumper for a 'const bool'
-        #    # item named 'constant_time_size'. There isn't anything we can do
-        #    # in this case.
-        #   pass
-
-        #yield value.extractField(field)
-
-    def memberFromNativeFieldAndValue(self, nativeField, nativeValue, fieldName, value):
-        nativeMember = self.nativeMemberFromField(nativeValue, nativeField)
-        if nativeMember is None:
-            val = self.Value(self)
-            val.name = fieldName
-            val._type = self.fromNativeType(nativeField.type)
-            val.lIsInScope = False
-            return val
-        val = self.fromNativeValue(nativeMember)
-        nativeFieldType = nativeField.type.unqualified()
-        if nativeField.bitsize:
-            val.lvalue = int(nativeMember)
-            val.laddress = None
-            fieldType = self.fromNativeType(nativeFieldType)
-            val._type = self.createBitfieldType(fieldType, nativeField.bitsize)
-        val.isBaseClass = nativeField.is_base_class
-        val.name = fieldName
-        return val
-
-    def nativeMemberFromField(self, nativeValue, nativeField):
-        if nativeField.is_base_class:
-            return nativeValue.cast(nativeField.type)
-        try:
-            return nativeValue[nativeField]
-        except:
-            pass
-        try:
-            return nativeValue[nativeField.name]
-        except:
-            pass
-        return None
-
-    def listMembers(self, value, nativeType):
+    def nativeListMembers(self, value, nativeType, include_base):
         nativeValue = value.nativeValue
+        value_size = self.type_size(value.typeid)
+        ldata = bytes(self.value_data(value, value_size))
+        laddress = value.laddress
 
         anonNumber = 0
 
-        #DumperBase.warn('LISTING FIELDS FOR %s' % nativeType)
+        fields = []
+        #self.warn('LISTING FIELDS FOR %s' % nativeType)
         for nativeField in nativeType.fields():
-            fieldName = nativeField.name
+            if not include_base and nativeField.is_base_class:
+                continue
+
+            field_name = nativeField.name
             # Something without a name.
             # Anonymous union? We need a dummy name to distinguish
             # multiple anonymous unions in the struct.
             # Since GDB commit b5b08fb4 anonymous structs get also reported
             # with a 'None' name.
-            if fieldName is None or len(fieldName) == 0:
-                # Something without a name.
-                # Anonymous union? We need a dummy name to distinguish
-                # multiple anonymous unions in the struct.
+            if field_name is None or len(field_name) == 0:
                 anonNumber += 1
-                fieldName = '#%s' % anonNumber
-            #DumperBase.warn('FIELD: %s' % fieldName)
+                field_name = '#%s' % anonNumber
+            #self.warn('FIELD: %s' % field_name)
+
+            nativeFieldType = nativeField.type.unqualified()
+            field_typeid = self.from_native_type(nativeFieldType)
+            #self.warn('  TYPE: %s' % nativeFieldType)
+            #self.warn('  TYPE KEY: %s' % self.native_type_key(nativeFieldType))
+
+            if nativeValue is not None:
+                try:
+                    native_member = nativeValue[nativeField]
+                except:
+                    self.warn('  COULD NOT ACCESS FIELD: %s' % nativeFieldType)
+                    continue
+
+                val = self.fromNativeValue(native_member)
+                if nativeField.bitsize:
+                    val.lvalue = None
+                    val.ldata = int(native_member)
+                    val.laddress = None
+                    val.typeid = self.create_bitfield_typeid(field_typeid, nativeField.bitsize)
+                val.isBaseClass = nativeField.is_base_class
+                val.name = field_name
+                fields.append(val)
+                continue
+
             # hasattr(nativeField, 'bitpos') == False indicates a static field,
-            # but if we have access to a nativeValue .fromNativeField will
+            # but if we have access to a nativeValue, so fromNativeField will
             # also succeed. We essentially skip only static members from
             # artificial values, like array members constructed from address.
-            if hasattr(nativeField, 'bitpos') or nativeValue is not None:
-                yield self.fromNativeField(nativeField, nativeValue, fieldName)
+            if not hasattr(nativeField, 'bitpos'):
+                continue
 
-    def fromNativeField(self, nativeField, nativeValue, fieldName):
-        nativeFieldType = nativeField.type.unqualified()
-        #DumperBase.warn('  TYPE: %s' % nativeFieldType)
-        #DumperBase.warn('  TYPEID: %s' % self.nativeTypeId(nativeFieldType))
-
-        if hasattr(nativeField, 'bitpos'):
             bitpos = nativeField.bitpos
-        else:
-            bitpos = 0
 
-        if hasattr(nativeField, 'bitsize') and nativeField.bitsize != 0:
-            bitsize = nativeField.bitsize
-        else:
-            bitsize = 8 * nativeFieldType.sizeof
+            if hasattr(nativeField, 'bitsize') and nativeField.bitsize != 0:
+                bitsize = nativeField.bitsize
+            else:
+                bitsize = 8 * nativeFieldType.sizeof
 
-        fieldType = self.fromNativeType(nativeFieldType)
-        if bitsize != nativeFieldType.sizeof * 8:
-            fieldType = self.createBitfieldType(fieldType, bitsize)
-        else:
-            fieldType = fieldType
+            field_typeid = self.from_native_type(nativeFieldType)
+            is_bitfield = bitsize != nativeFieldType.sizeof * 8
 
-        if nativeValue is None:
-            extractor = None
-        else:
-            extractor = lambda value, \
-                capturedNativeField = nativeField, \
-                capturedNativeValue = nativeValue, \
-                capturedFieldName = fieldName: \
-                self.memberFromNativeFieldAndValue(capturedNativeField,
-                                                   capturedNativeValue,
-                                                   capturedFieldName,
-                                                   value)
+            val = self.Value(self)
+            val.name = field_name
+            val.isBaseClass = nativeField.is_base_class
+
+            if is_bitfield:
+                val.typeid = self.create_bitfield_typeid(field_typeid, bitsize)
+                val.ldata = self.value_extract_bits(value, bitpos, bitsize)
+            else:
+                val.typeid = field_typeid
+                field_offset = bitpos // 8
+                if laddress is not None:
+                    val.laddress = laddress + field_offset
+                field_size = (bitsize + 7) // 8
+                val.ldata = ldata[field_offset:field_offset + field_size]
+
+            #self.warn('GOT VAL %s FOR FIELD %s' % (val, nativeField))
+            fields.append(val)
+
+        return fields
 
-        #DumperBase.warn("FOUND NATIVE FIELD: %s bitpos: %s" % (fieldName, bitpos))
-        return self.Field(dumper=self, name=fieldName, isBase=nativeField.is_base_class,
-                          bitsize=bitsize, bitpos=bitpos, type=fieldType,
-                          extractor=extractor)
 
     def listLocals(self, partialVar):
         frame = gdb.selected_frame()
 
         try:
             block = frame.block()
-            #DumperBase.warn('BLOCK: %s ' % block)
+            #self.warn('BLOCK: %s ' % block)
         except RuntimeError as error:
-            #DumperBase.warn('BLOCK IN FRAME NOT ACCESSIBLE: %s' % error)
+            #self.warn('BLOCK IN FRAME NOT ACCESSIBLE: %s' % error)
             return []
         except:
             self.warn('BLOCK NOT ACCESSIBLE FOR UNKNOWN REASONS')
@@ -594,14 +608,12 @@ class Dumper(DumperBase):
                     if partialVar is not None and partialVar != name:
                         continue
 
-                    # 'NotImplementedError: Symbol type not yet supported in
-                    # Python scripts.'
-                    #DumperBase.warn('SYMBOL %s  (%s, %s)): ' % (symbol, name, symbol.name))
+                    #self.warn('SYMBOL %s  (%s, %s)): ' % (symbol, name, symbol.name))
                     if self.passExceptions and not self.isTesting:
                         nativeValue = frame.read_var(name, block)
                         value = self.fromFrameValue(nativeValue)
                         value.name = name
-                        #DumperBase.warn('READ 0: %s' % value.stringify())
+                        #self.warn('READ 0: %s' % value.stringify())
                         items.append(value)
                         continue
 
@@ -610,14 +622,14 @@ class Dumper(DumperBase):
                         nativeValue = frame.read_var(name, block)
                         value = self.fromFrameValue(nativeValue)
                         value.name = name
-                        #DumperBase.warn('READ 1: %s' % value.stringify())
+                        #self.warn('READ 1: %s' % value.stringify())
                         items.append(value)
                         continue
                     except:
                         pass
 
                     try:
-                        #DumperBase.warn('READ 2: %s' % item.value)
+                        #self.warn('READ 2: %s' % item.value)
                         value = self.fromFrameValue(frame.read_var(name))
                         value.name = name
                         items.append(value)
@@ -631,8 +643,8 @@ class Dumper(DumperBase):
                         pass
 
                     try:
-                        #DumperBase.warn('READ 3: %s %s' % (name, item.value))
-                        #DumperBase.warn('ITEM 3: %s' % item.value)
+                        #self.warn('READ 3: %s %s' % (name, item.value))
+                        #self.warn('ITEM 3: %s' % item.value)
                         value = self.fromFrameValue(gdb.parse_and_eval(name))
                         value.name = name
                         items.append(value)
@@ -661,16 +673,17 @@ class Dumper(DumperBase):
         return self.ptrSize() == 8
 
     def fetchVariables(self, args):
+        start_time = time.perf_counter()
         self.resetStats()
         self.prepare(args)
 
         self.isBigEndian = gdb.execute('show endian', to_string=True).find('big endian') > 0
         self.packCode = '>' if self.isBigEndian else '<'
 
-        (ok, res) = self.tryFetchInterpreterVariables(args)
-        if ok:
-            safePrint(res)
-            return
+        #(ok, res) = self.tryFetchInterpreterVariables(args)
+        #if ok:
+        #    safePrint(res)
+        #    return
 
         self.put('data=[')
 
@@ -679,7 +692,7 @@ class Dumper(DumperBase):
         partialName = partialVar.split('.')[1].split('@')[0] if isPartial else None
 
         variables = self.listLocals(partialName)
-        #DumperBase.warn('VARIABLES: %s' % variables)
+        #self.warn('VARIABLES: %s' % variables)
 
         # Take care of the return value of the last function call.
         if len(self.resultVarName) > 0:
@@ -711,9 +724,12 @@ class Dumper(DumperBase):
             self.put(',qtnamespace="%s"' % self.qtNamespaceToReport)
             self.qtNamespaceToReport = None
 
+        run_time = time.perf_counter() - start_time
+        #self.warn("PTIME: %s" % run_time)
         self.put(',partial="%d"' % isPartial)
+        self.put(',runtime="%s"' % run_time)
         self.put(',counts=%s' % self.counts)
-        self.put(',timings=%s' % self.timings)
+        #self.put(',timings=%s' % self.timings)
         self.reportResult(''.join(self.output), args)
 
     def parseAndEvaluate(self, exp):
@@ -721,7 +737,7 @@ class Dumper(DumperBase):
         return None if val is None else self.fromNativeValue(val)
 
     def nativeParseAndEvaluate(self, exp):
-        #DumperBase.warn('EVALUATE "%s"' % exp)
+        #self.warn('EVALUATE "%s"' % exp)
         try:
             val = gdb.parse_and_eval(exp)
             return val
@@ -744,20 +760,20 @@ class Dumper(DumperBase):
             else:
                 arg += a
 
-        #DumperBase.warn('CALL: %s -> %s(%s)' % (value, function, arg))
-        typeName = value.type.name
-        if typeName.find(':') >= 0:
-            typeName = "'" + typeName + "'"
+        #self.warn('CALL: %s -> %s(%s)' % (value, function, arg))
+        type_name = value.type.name
+        if type_name.find(':') >= 0:
+            type_name = "'" + type_name + "'"
         # 'class' is needed, see http://sourceware.org/bugzilla/show_bug.cgi?id=11912
-        #exp = '((class %s*)%s)->%s(%s)' % (typeName, value.laddress, function, arg)
+        #exp = '((class %s*)%s)->%s(%s)' % (type_name, value.laddress, function, arg)
         addr = value.address()
         if addr is None:
             addr = self.pokeValue(value)
-        #DumperBase.warn('PTR: %s -> %s(%s)' % (value, function, addr))
-        exp = '((%s*)0x%x)->%s(%s)' % (typeName, addr, function, arg)
-        #DumperBase.warn('CALL: %s' % exp)
+        #self.warn('PTR: %s -> %s(%s)' % (value, function, addr))
+        exp = '((%s*)0x%x)->%s(%s)' % (type_name, addr, function, arg)
+        #self.warn('CALL: %s' % exp)
         result = gdb.parse_and_eval(exp)
-        #DumperBase.warn('  -> %s' % result)
+        #self.warn('  -> %s' % result)
         res = self.fromNativeValue(result)
         if value.address() is None:
             self.releaseValue(addr)
@@ -765,14 +781,14 @@ class Dumper(DumperBase):
 
     def makeExpression(self, value):
         typename = '::' + value.type.name
-        #DumperBase.warn('  TYPE: %s' % typename)
+        #self.warn('  TYPE: %s' % typename)
         exp = '(*(%s*)(0x%x))' % (typename, value.address())
-        #DumperBase.warn('  EXP: %s' % exp)
+        #self.warn('  EXP: %s' % exp)
         return exp
 
     def makeStdString(init):
         # Works only for small allocators, but they are usually empty.
-        gdb.execute('set $d=(std::string*)calloc(sizeof(std::string), 2)')
+        gdb.execute('set $d=(std::string*)calloc(2, sizeof(std::string))')
         gdb.execute('call($d->basic_string("' + init +
                     '",*(std::allocator<char>*)(1+$d)))')
         value = gdb.parse_and_eval('$d').dereference()
@@ -785,14 +801,14 @@ class Dumper(DumperBase):
         size = value.type.size()
         data = value.data()
         h = self.hexencode(data)
-        #DumperBase.warn('DATA: %s' % h)
+        #self.warn('DATA: %s' % h)
         string = ''.join('\\x' + h[2 * i:2 * i + 2] for i in range(size))
-        exp = '(%s*)memcpy(calloc(%d, 1), "%s", %d)' \
+        exp = '(%s*)memcpy(calloc(1, %d), "%s", %d)' \
             % (value.type.name, size, string, size)
-        #DumperBase.warn('EXP: %s' % exp)
+        #self.warn('EXP: %s' % exp)
         res = gdb.parse_and_eval(exp)
-        #DumperBase.warn('RES: %s' % res)
-        return toInteger(res)
+        #self.warn('RES: %s' % res)
+        return int(res)
 
     def releaseValue(self, address):
         gdb.parse_and_eval('free(0x%x)' % address)
@@ -819,7 +835,7 @@ class Dumper(DumperBase):
         return self.cachedInferior
 
     def readRawMemory(self, address, size):
-        #DumperBase.warn('READ: %s FROM 0x%x' % (size, address))
+        #self.warn('READ: %s FROM 0x%x' % (size, address))
         if address == 0 or size == 0:
             return bytes()
         res = self.selectedInferior().read_memory(address, size)
@@ -832,7 +848,7 @@ class Dumper(DumperBase):
             return 0
         try:
             # Older GDB ~7.4 don't have gdb.Symbol.value()
-            return toInteger(symbol.value().address)
+            return int(symbol.value().address)
         except:
             pass
 
@@ -870,12 +886,10 @@ class Dumper(DumperBase):
             pass
         return None
 
-    def qtVersion(self):
+    def extractQtVersion(self):
         try:
             # Only available with Qt 5.3+
-            qtversion = int(str(gdb.parse_and_eval('((void**)&qtHookData)[2]')), 16)
-            self.qtVersion = lambda: qtversion
-            return qtversion
+            return int(str(gdb.parse_and_eval('((void**)&qtHookData)[2]')), 16)
         except:
             pass
 
@@ -887,7 +901,8 @@ class Dumper(DumperBase):
             return qtversion
         except:
             # Use fallback until we have a better answer.
-            return self.fallbackQtVersion
+            return None
+
 
     def createSpecialBreakpoints(self, args):
         self.specialBreakpoints = []
@@ -1014,13 +1029,9 @@ class Dumper(DumperBase):
         for obj in gdb.objfiles():
             self.importPlainDumpersForObj(obj)
 
-    def qtNamespace(self):
-        # This function is replaced by handleQtCoreLoaded()
-        return ''
-
     def findSymbol(self, symbolName):
         try:
-            return toInteger(gdb.parse_and_eval("(size_t)&'%s'" % symbolName))
+            return int(gdb.parse_and_eval("(size_t)&'%s'" % symbolName))
         except:
             return 0
 
@@ -1050,47 +1061,38 @@ class Dumper(DumperBase):
             pass
 
     def handleQtCoreLoaded(self, objfile):
-        fd, tmppath = tempfile.mkstemp()
-        os.close(fd)
-        try:
-            cmd = 'maint print msymbols -objfile "%s" -- %s' % (objfile.filename, tmppath)
-            symbols = gdb.execute(cmd, to_string=True)
-        except:
-            try:
-                # command syntax depends on gdb version - below is gdb < 8
-                cmd = 'maint print msymbols %s "%s"' % (tmppath, objfile.filename)
-                symbols = gdb.execute(cmd, to_string=True)
-            except:
-                pass
-        ns = ''
-        with open(tmppath) as f:
-            for line in f:
-                if line.find('msgHandlerGrabbed ') >= 0:
-                    # [11] b 0x7ffff683c000 _ZN4MynsL17msgHandlerGrabbedE
-                    # section .tbss Myns::msgHandlerGrabbed  qlogging.cpp
-                    ns = re.split(r'_ZN?(\d*)(\w*)L17msgHandlerGrabbedE? ', line)[2]
-                    if len(ns):
-                        ns += '::'
-                    break
-                if line.find('currentThreadData ') >= 0:
-                    # [ 0] b 0x7ffff67d3000 _ZN2UUL17currentThreadDataE
-                    # section .tbss  UU::currentThreadData qthread_unix.cpp\\n
-                    ns = re.split(r'_ZN?(\d*)(\w*)L17currentThreadDataE? ', line)[2]
-                    if len(ns):
-                        ns += '::'
-                    break
-        os.remove(tmppath)
+        self.qtLoaded = True
+        # FIXME: Namespace auto-detection. Is it worth the price?
+        #       fd, tmppath = tempfile.mkstemp()
+        #       os.close(fd)
+        #       cmd = 'maint print msymbols -objfile "%s" -- %s' % (objfile.filename, tmppath)
+        #       symbols = gdb.execute(cmd, to_string=True)
+        #       ns = ''
+        #       with open(tmppath) as f:
+        #           ns1re = re.compile(r'_ZN?(\d*)(\w*)L17msgHandlerGrabbedE? ')
+        #           ns2re = re.compile(r'_ZN?(\d*)(\w*)L17currentThreadDataE? ')
+        #           for line in f:
+        #               if 'msgHandlerGrabbed ' in line:
+        #                   # [11] b 0x7ffff683c000 _ZN4MynsL17msgHandlerGrabbedE
+        #                   # section .tbss Myns::msgHandlerGrabbed  qlogging.cpp
+        #                   ns = ns1re.split(line)[2]
+        #                   if len(ns):
+        #                       ns += '::'
+        #                   break
+        #               if 'currentThreadData ' in line:
+        #                   # [ 0] b 0x7ffff67d3000 _ZN2UUL17currentThreadDataE
+        #                   # section .tbss  UU::currentThreadData qthread_unix.cpp\\n
+        #                   ns = ns2re.split(line)[2]
+        #                   if len(ns):
+        #                       ns += '::'
+        #                   break
+        #       os.remove(tmppath)
 
+    def fetchInternalFunctions(self):
+        ns = self.qtNamespace()
         lenns = len(ns)
         strns = ('%d%s' % (lenns - 2, ns[:lenns - 2])) if lenns else ''
-
         if lenns:
-            # This might be wrong, but we can't do better: We found
-            # a libQt5Core and could not extract a namespace.
-            # The best guess is that there isn't any.
-            self.qtNamespaceToReport = ns
-            self.qtNamespace = lambda: ns
-
             sym = '_ZN%s7QObject11customEventEPNS_6QEventE' % strns
         else:
             sym = '_ZN7QObject11customEventEP6QEvent'
@@ -1103,22 +1105,24 @@ class Dumper(DumperBase):
         if not self.isWindowsTarget(): # prevent calling the property function on windows
             self.qtPropertyFunc = self.findSymbol(sym)
 
+        self.fetchInternalFunctions = lambda: None
+
     def assignValue(self, args):
-        typeName = self.hexdecode(args['type'])
+        type_name = self.hexdecode(args['type'])
         expr = self.hexdecode(args['expr'])
         value = self.hexdecode(args['value'])
         simpleType = int(args['simpleType'])
         ns = self.qtNamespace()
-        if typeName.startswith(ns):
-            typeName = typeName[len(ns):]
-        typeName = typeName.replace('::', '__')
-        pos = typeName.find('<')
+        if type_name.startswith(ns):
+            type_name = type_name[len(ns):]
+        type_name = type_name.replace('::', '__')
+        pos = type_name.find('<')
         if pos != -1:
-            typeName = typeName[0:pos]
-        if typeName in self.qqEditable and not simpleType:
-            #self.qqEditable[typeName](self, expr, value)
+            type_name = type_name[0:pos]
+        if type_name in self.qqEditable and not simpleType:
+            #self.qqEditable[type_name](self, expr, value)
             expr = self.parseAndEvaluate(expr)
-            self.qqEditable[typeName](self, expr, value)
+            self.qqEditable[type_name](self, expr, value)
         else:
             cmd = 'set variable (%s)=%s' % (expr, value)
             gdb.execute(cmd)
@@ -1152,63 +1156,28 @@ class Dumper(DumperBase):
         nativeValue = value.nativeValue
         return self.fromNativeValue(nativeValue.cast(nativeValue.type.target()))
 
-    def nativeDynamicTypeName(self, address, baseType):
+    def nativeDynamicType(self, address, base_typeid):
         # Needed for Gdb13393 test.
-        nativeType = self.lookupNativeType(baseType.name)
+        nativeType = self.type_nativetype_cache.get(base_typeid, None)
         if nativeType is None:
-            return None
+            return base_typeid
         nativeTypePointer = nativeType.pointer()
         nativeValue = gdb.Value(address).cast(nativeTypePointer).dereference()
-        val = nativeValue.cast(nativeValue.dynamic_type)
-        return str(val.type)
-        #try:
-        #    vtbl = gdb.execute('info symbol {%s*}0x%x' % (baseType.name, address), to_string = True)
-        #except:
-        #    return None
-        #pos1 = vtbl.find('vtable ')
-        #if pos1 == -1:
-        #    return None
-        #pos1 += 11
-        #pos2 = vtbl.find(' +', pos1)
-        #if pos2 == -1:
-        #    return None
-        #return vtbl[pos1 : pos2]
-
-    def nativeDynamicType(self, address, baseType):
-        # Needed for Gdb13393 test.
-        nativeType = self.lookupNativeType(baseType.name)
-        if nativeType is None:
-            return baseType
-        nativeTypePointer = nativeType.pointer()
-        nativeValue = gdb.Value(address).cast(nativeTypePointer).dereference()
-        return self.fromNativeType(nativeValue.dynamic_type)
+        return self.from_native_type(nativeValue.dynamic_type)
 
     def enumExpression(self, enumType, enumValue):
         return self.qtNamespace() + 'Qt::' + enumValue
 
-    def lookupNativeType(self, typeName):
-        nativeType = self.lookupNativeTypeHelper(typeName)
-        if nativeType is not None:
-            self.check(isinstance(nativeType, gdb.Type))
-        return nativeType
-
-    def lookupNativeTypeHelper(self, typeName):
-        typeobj = self.typeCache.get(typeName)
-        #DumperBase.warn('LOOKUP 1: %s -> %s' % (typeName, typeobj))
-        if typeobj is not None:
-            return typeobj
-
-        if typeName == 'void':
-            typeobj = gdb.lookup_type(typeName)
-            self.typeCache[typeName] = typeobj
-            self.typesToReport[typeName] = typeobj
+    def lookupNativeType(self, type_name):
+        if type_name == 'void':
+            typeobj = gdb.lookup_type(type_name)
+            self.typesToReport[type_name] = typeobj
             return typeobj
 
         #try:
-        #    typeobj = gdb.parse_and_eval('{%s}&main' % typeName).typeobj
+        #    typeobj = gdb.parse_and_eval('{%s}&main' % type_name).typeobj
         #    if not typeobj is None:
-        #        self.typeCache[typeName] = typeobj
-        #        self.typesToReport[typeName] = typeobj
+        #        self.typesToReport[type_name] = typeobj
         #        return typeobj
         #except:
         #    pass
@@ -1217,22 +1186,21 @@ class Dumper(DumperBase):
         # gcc produces '{anonymous}', gdb '(anonymous namespace)'
         # '<unnamed>' has been seen too. The only thing gdb
         # understands when reading things back is '(anonymous namespace)'
-        if typeName.find('{anonymous}') != -1:
-            ts = typeName
+        if type_name.find('{anonymous}') != -1:
+            ts = type_name
             ts = ts.replace('{anonymous}', '(anonymous namespace)')
             typeobj = self.lookupNativeType(ts)
             if typeobj is not None:
-                self.typeCache[typeName] = typeobj
-                self.typesToReport[typeName] = typeobj
+                self.typesToReport[type_name] = typeobj
                 return typeobj
 
-        #DumperBase.warn(" RESULT FOR 7.2: '%s': %s" % (typeName, typeobj))
+        #self.warn(" RESULT FOR 7.2: '%s': %s" % (type_name, typeobj))
 
         # This part should only trigger for
         # gdb 7.1 for types with namespace separators.
         # And anonymous namespaces.
 
-        ts = typeName
+        ts = type_name
         while True:
             if ts.startswith('class '):
                 ts = ts[6:]
@@ -1259,36 +1227,32 @@ class Dumper(DumperBase):
             typeobj = self.lookupNativeType(ts[0:-1])
             if typeobj is not None:
                 typeobj = typeobj.pointer()
-                self.typeCache[typeName] = typeobj
-                self.typesToReport[typeName] = typeobj
+                self.typesToReport[type_name] = typeobj
                 return typeobj
 
         try:
-            #DumperBase.warn("LOOKING UP 1 '%s'" % ts)
+            #self.warn("LOOKING UP 1 '%s'" % ts)
             typeobj = gdb.lookup_type(ts)
         except RuntimeError as error:
-            #DumperBase.warn("LOOKING UP 2 '%s' ERROR %s" % (ts, error))
+            #self.warn("LOOKING UP '%s' FAILED" % ts)
+            pass
+            #self.warn("LOOKING UP 2 '%s' ERROR %s" % (ts, error))
             # See http://sourceware.org/bugzilla/show_bug.cgi?id=11912
             exp = "(class '%s'*)0" % ts
             try:
                 typeobj = self.parse_and_eval(exp).type.target()
-                #DumperBase.warn("LOOKING UP 3 '%s'" % typeobj)
+                #self.warn("LOOKING UP 3 '%s'" % typeobj)
             except:
                 # Can throw 'RuntimeError: No type named class Foo.'
                 pass
-        except:
-            #DumperBase.warn("LOOKING UP '%s' FAILED" % ts)
-            pass
 
         if typeobj is not None:
-            #DumperBase.warn('CACHING: %s' % typeobj)
-            self.typeCache[typeName] = typeobj
-            self.typesToReport[typeName] = typeobj
+            #self.warn('CACHING: %s' % typeobj)
+            self.typesToReport[type_name] = typeobj
 
         # This could still be None as gdb.lookup_type('char[3]') generates
         # 'RuntimeError: No type named char[3]'
-        #self.typeCache[typeName] = typeobj
-        #self.typesToReport[typeName] = typeobj
+        #self.typesToReport[type_name] = typeobj
         return typeobj
 
     def doContinue(self):
@@ -1332,7 +1296,7 @@ class Dumper(DumperBase):
                             if typeobj.code == gdb.TYPE_CODE_PTR:
                                 dereftype = typeobj.target().unqualified()
                                 if dereftype.name == needle:
-                                    addr = toInteger(value)
+                                    addr = int(value)
                                     res = None
                                     for pat in pats:
                                         try:
@@ -1442,14 +1406,6 @@ class Dumper(DumperBase):
     def reportResult(self, result, args):
         print('result={token="%s",%s}' % (args.get("token", 0), result))
 
-    def profile1(self, args):
-        '''Internal profiling'''
-        import cProfile
-        tempDir = tempfile.gettempdir() + '/bbprof'
-        cProfile.run('theDumper.fetchVariables(%s)' % args, tempDir)
-        import pstats
-        pstats.Stats(tempDir).sort_stats('time').print_stats()
-
     def profile2(self, args):
         import timeit
         print(timeit.repeat('theDumper.fetchVariables(%s)' % args,
diff --git a/share/qtcreator/debugger/libcpp_stdtypes.py b/share/qtcreator/debugger/libcpp_stdtypes.py
index 44b3a235ffd..2db83521013 100644
--- a/share/qtcreator/debugger/libcpp_stdtypes.py
+++ b/share/qtcreator/debugger/libcpp_stdtypes.py
@@ -5,6 +5,7 @@ from stdtypes import qdump__std__array, qdump__std__complex, qdump__std__once_fl
 from utils import DisplayFormat
 from dumper import Children, DumperBase
 
+import struct
 
 def qform__std____1__array():
     return [DisplayFormat.ArrayPlot]
@@ -163,231 +164,114 @@ def qdump__std____1__stack(d, value):
     d.putBetterType(value.type)
 
 
-def GetChildMemberWithName(value, name):
-    members = value.members(True)
 
-    for member in members:
-        if member.name == name:
-            return member
-    return None
-
-
-def GetIndexOfChildWithName(value, name):
-    members = value.members(True)
-
-    for i, member in enumerate(members):
-        if member.name == name:
-            return i
-    return None
-
-
-class StringLayout:
-    CSD = 0
-    DSC = 1
-
-
-def std_1_string_dumper_v2(d, value):
-    charType = value['__l']['__data_'].dereference().type
-
-    R = GetChildMemberWithName(value, "__r_")
-    if not R:
-        raise Exception("Could not find __r_")
-
-    # __r_ is a compressed_pair of the actual data and the allocator. The data we
-    # want is in the first base class.
-    R_Base_SP = R[0]
-
-    if not R_Base_SP:
-        raise Exception("Could not find R_Base_SP")
-
-    Rep_Sp = GetChildMemberWithName(R_Base_SP, "__value_")
-
-    if not Rep_Sp:
-        raise Exception("Could not find __value_")
-
-    # Our layout seems a little different
-    Rep_Sp = Rep_Sp[0]
-
-    if not Rep_Sp:
-        raise Exception("Could not find Rep_Sp")
-
-    L = GetChildMemberWithName(Rep_Sp, "__l")
-
-    if not L:
-        raise Exception("Could not find __l")
-
-    layout = StringLayout.CSD
-    if GetIndexOfChildWithName(L, "__data_") == 0:
-        layout = StringLayout.DSC
-
-    short_mode = False
-    using_bitmasks = True
-    size = 0
-    size_mode_value = 0
-
-    Short_Sp = GetChildMemberWithName(Rep_Sp, "__s")
-    if not Short_Sp:
-        raise Exception("Could not find __s")
-
-    Is_Long = GetChildMemberWithName(Short_Sp, "__is_long_")
-    Size_Sp = GetChildMemberWithName(Short_Sp, "__size_")
-    if not Size_Sp:
-        raise Exception("Could not find __size_")
-
-    if Is_Long:
-        using_bitmasks = False
-        short_mode = Is_Long.integer() == 0
-        size = Size_Sp.integer()
-    else:
-        size_mode_value = Size_Sp.integer()
-        mode_mask = 1
-        if layout == StringLayout.DSC:
-            mode_mask = 0x80
-        short_mode = (size_mode_value & mode_mask) == 0
-
-    if short_mode:
-        Location_Sp = GetChildMemberWithName(Short_Sp, "__data_")
-
-        if using_bitmasks:
-            size = ((size_mode_value >> 1) % 256)
-            if layout == StringLayout.DSC:
-                size = size_mode_value
-
-        # The string is most likely not initialized yet
-        if size > 100 or not Location_Sp:
-            raise Exception("Probably not initialized yet")
-
-        d.putCharArrayHelper(d.extractPointer(Location_Sp), size,
-                             charType, d.currentItemFormat())
-        return
-
-    Location_Sp = GetChildMemberWithName(L, "__data_")
-    Size_Vo = GetChildMemberWithName(L, "__size_")
-    Capacity_Vo = GetChildMemberWithName(L, "__cap_")
-
-    if not Location_Sp or not Size_Vo or not Capacity_Vo:
-        raise Exception("Could not find Location_Sp, Size_Vo or Capacity_Vo")
-
-    size = Size_Vo.integer()
-    capacity = Capacity_Vo.integer()
-    if not using_bitmasks and layout == StringLayout.CSD:
-        capacity *= 2
-    if capacity < size:
-        raise Exception("Capacity is less than size")
-
-    d.putCharArrayHelper(d.extractPointer(Location_Sp), size,
-                         charType, d.currentItemFormat())
-
-
-def std_1_string_dumper_v1(d, value):
-    charType = value['__l']['__data_'].dereference().type
-    D = None
-
-    if d.isLldb:
-        D = value[0][0][0][0]
-    elif d.isGdb:
-        D = value["__r_"].members(True)[0][0][0]
-    else:
-        raise Exception("Unknown debugger (neither gdb nor lldb)")
-
-    layoutDecider = D[0][0]
-    if not layoutDecider:
-        raise Exception("Could not find layoutDecider")
-
-    size = 0
-    size_mode_value = 0
-    short_mode = False
-    libcxx_version = 14
-
-    layoutModeIsDSC = layoutDecider.name == '__data_'
-    if (layoutModeIsDSC):
-        size_mode = D[1][1][0]
-        if not size_mode:
-            raise Exception("Could not find size_mode")
-        if not size_mode.name == '__size_':
-            size_mode = D[1][1][1]
-            if not size_mode:
-                raise Exception("Could not find size_mode")
-
-        size_mode_value = size_mode.integer()
-        short_mode = ((size_mode_value & 0x80) == 0)
-    else:
-        size_mode = D[1][0][0]
-        if not size_mode:
-            raise Exception("Could not find size_mode")
-
-        if size_mode.name == '__is_long_':
-            libcxx_version = 15
-            short_mode = (size_mode.integer() == 0)
-
-            size_mode = D[1][0][1]
-            size_mode_value = size_mode.integer()
-        else:
-            size_mode_value = size_mode.integer()
-            short_mode = ((size_mode_value & 1) == 0)
-
-    if short_mode:
-        s = D[1]
-
-        if not s:
-            raise Exception("Could not find s")
-
-        if libcxx_version == 14:
-            location_sp = s[0] if layoutModeIsDSC else s[1]
-            size = size_mode_value if layoutModeIsDSC else ((size_mode_value >> 1) % 256)
-        elif libcxx_version == 15:
-            location_sp = s[0] if layoutModeIsDSC else s[2]
-            size = size_mode_value
-
-    else:
-        l = D[0]
-        if not l:
-            raise Exception("Could not find l")
-
-        # we can use the layout_decider object as the data pointer
-        location_sp = layoutDecider if layoutModeIsDSC else l[2]
-        size_vo = l[1]
-        if not size_vo or not location_sp:
-            raise Exception("Could not find size_vo or location_sp")
-        size = size_vo.integer()
-
-    if short_mode and location_sp:
-        d.putCharArrayHelper(d.extractPointer(location_sp), size,
-                             charType, d.currentItemFormat())
-    else:
-        d.putCharArrayHelper(location_sp.integer(),
-                             size, charType, d.currentItemFormat())
-
-    return
+# Examples for std::__1::string layouts for libcxx version 16
+#
+#   std::string b = "asd"
+#
+#   b = {
+#       static __endian_factor = 2,
+#       __r_ = {
+#           <std::__1::__compressed_pair_elem<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >::__rep, 0, false>> = {
+#               __value_ = {{
+#                   __l = {
+#                       {__is_long_ = 0, __cap_ = 842641539},
+#                       __size_ = 140737353746888,
+#                       __data_ = 0x7ffff7fa0a20 <std::__1::codecvt<wchar_t, char, __mbstate_t>::id> \"\\377\\377\\377\\377\\377\\377\\377\\377\\006\"
+#                   },
+#                   __s = {
+#                       {__is_long_ = 0 '\\000', __size_ = 3 '\\003'},
+#                       __padding_ = 0x7fffffffd859 \"asd\",
+#                       __data_ = \"asd\\000\\000\\000\\000\\310\\t\\372\\367\\377\\177\\000\\000 \\n\\372\\367\\377\\177\\000\"
+#                   },
+#                   __r = {
+#                       __words = {1685283078, 140737353746888, 140737353746976}
+#                   }
+#               }}
+#           },
+#           <std::__1::__compressed_pair_elem<std::__1::allocator<char>, 1, true>> = {
+#               <std::__1::allocator<char>> = {
+#                   <std::__1::__non_trivial_if<true, std::__1::allocator<char> >> = {
+#                       <No data fields>
+#                   },
+#                   <No data fields>
+#               },
+#               <No data fields>
+#           },
+#           <No data fields>
+#       },
+#       static npos = 18446744073709551615
+#   }
+#
+#
+#   std::string c = "asdlonasdlongstringasdlongstringasdlongstringasdlongstringgstring"
+#
+#   c = {
+#       static __endian_factor = 2,
+#       __r_ = {
+#           <std::__1::__compressed_pair_elem<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >::__rep, 0, false>> = {
+#               __value_ = {{
+#                   __l = {
+#                       {__is_long_ = 1, __cap_ = 40},   #  size_type: __cap_
+#                       __size_ = 65,
+#                       __data_ = 0x5555555592a0 \"asdlonasdlongstringasdlongstringasdlongstringasdlongstringgstring\"
+#                   },
+#                   __s = {
+#                       {__is_long_ = 1 '\\001', __size_ = 40 '('},
+#                       __padding_ = 0x7fffffffd831 \"\", __data_ = \"\\000\\000\\000\\000\\000\\000\\000A\\000\\000\\000\\000\\000\\000\\000\\240\\222UUUU\\000\"
+#                   },
+#                   __r = {
+#                       __words = {81, 65, 93824992252576}
+#                   }
+#               }}
+#           },
+#           <std::__1::__compressed_pair_elem<std::__1::allocator<char>, 1, true>> = {
+#               <std::__1::allocator<char>> = {
+#                   <std::__1::__non_trivial_if<true, std::__1::allocator<char> >> = {
+#                       <No data fields>
+#                   },
+#                   <No data fields>
+#               },
+#               <No data fields
+#           >},
+#           <No data fields>
+#       },
+#       static npos = 18446744073709551615
+#   }"
 
 def qdump__std____1__string(d, value):
-    try:
-        std_1_string_dumper_v2(d, value)
-    except Exception as eV2:
-        try:
-            std_1_string_dumper_v1(d, value)
-        except Exception as eV1:
-            d.putValue("Could not parse: %s, %s" % (eV1, eV2))
-
-
-def qdump__std____1__wstring(d, value):
-    try:
-        std_1_string_dumper_v2(d, value)
-    except Exception as eV2:
-        try:
-            std_1_string_dumper_v1(d, value)
-        except Exception as eV1:
-            d.putValue("Could not parse: %s, %s" % (eV1, eV2))
-
-
-def qdump__std____1__basic_string(d, value):
-    innerType = value.type[0].name
-    if innerType in ("char", "char8_t", "char16_t"):
-        qdump__std____1__string(d, value)
-    elif innerType in ("wchar_t", "char32_t"):
-        qdump__std____1__wstring(d, value)
+    charType = value.type[0]
+    blob = bytes(value.data())
+    r0, r1, r2 = struct.unpack(d.packCode + 'QQQ', blob)
+    if d.isLldb and d.isArmMac:
+        is_long = r2 >> 63
+        if is_long:
+            # [---------------- data ptr ---------------]  63:0
+            # [------------------ size  ----------------]
+            # [?----------------  alloc ----------------]
+            data = r0
+            size = r1
+        else:
+            # [------------------- data ----------------]  63:0
+            # [------------------- data ----------------]
+            # [?ssss-------------- data ----------------]
+            data = value.laddress
+            size = (r2 >> 56) &  255
     else:
-        d.warn("UNKNOWN INNER TYPE %s" % innerType)
+        is_long = r0 & 1
+        if is_long:
+            # [------------------ alloc ---------------?]  63:0
+            # [------------------- size ----------------]
+            # [----------------- data ptr --------------]
+            data = r2
+            size = r1
+        else:
+            # [------------------- data ----------sssss?]  63:0
+            # [------------------- data ----------------]
+            # [------------------- data ----------------]
+            data = value.laddress + charType.size()
+            size = (r0 & 255) // 2
+    d.putCharArrayHelper(data, size, charType)
 
 
 def qdump__std____1__shared_ptr(d, value):
diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py
index f2387ac913c..3f7ec792a61 100644
--- a/share/qtcreator/debugger/lldbbridge.py
+++ b/share/qtcreator/debugger/lldbbridge.py
@@ -18,11 +18,7 @@ sys.path.insert(1, os.path.dirname(os.path.abspath(inspect.getfile(inspect.curre
 
 # Simplify development of this module by reloading deps
 if 'dumper' in sys.modules:
-    if sys.version_info[0] >= 3:
-        if sys.version_info[1] > 3:
-            from importlib import reload
-        else:
-            def reload(m): print('Unsupported Python version - not reloading %s' % str(m))
+    from importlib import reload
     reload(sys.modules['dumper'])
 
 from dumper import DumperBase, SubItem, Children, TopLevelItem
@@ -34,16 +30,10 @@ from dumper import DumperBase, SubItem, Children, TopLevelItem
 #######################################################################
 
 qqWatchpointOffset = 10000
-_c_str_trans = None
-
-if sys.version_info[0] >= 3:
-    _c_str_trans = str.maketrans({"\n": "\\n", '"':'\\"', "\\":"\\\\"})
+_c_str_trans = str.maketrans({"\n": "\\n", '"':'\\"', "\\":"\\\\"})
 
 def toCString(s):
-    if _c_str_trans is not None:
-        return str(s).translate(_c_str_trans)
-    else:
-        return str(s).replace('\\', '\\\\').replace('\n', '\\n').replace('"', '\\"')
+    return str(s).translate(_c_str_trans)
 
 def fileNameAsString(file):
     return toCString(file) if file.IsValid() else ''
@@ -116,33 +106,29 @@ class Dumper(DumperBase):
         self.isInterrupting_ = False
         self.interpreterBreakpointResolvers = []
 
-        DumperBase.warn = Dumper.warn_impl
         self.report('lldbversion=\"%s\"' % lldb.SBDebugger.GetVersionString())
 
-    @staticmethod
-    def warn_impl(message):
-        if message[-1:] == '\n':
-            message += '\n'
+    def warn(self, msg):
+        #self.put('{name="%s",value="",type="",numchild="0"},' % toCString(msg))
+        if msg[-1:] == '\n':
+            msg += '\n'
         print('@\nbridgemessage={msg="%s",channel="%s"}\n@'
-                % (message.replace('"', '$'), LogChannel.AppError))
-
-    def fromNativeFrameValue(self, nativeValue):
-        return self.fromNativeValue(nativeValue)
+                % (msg.replace('"', '$'), LogChannel.AppError))
 
     def fromNativeValue(self, nativeValue):
         self.check(isinstance(nativeValue, lldb.SBValue))
         nativeType = nativeValue.GetType()
-        typeName = nativeType.GetName()
+        type_name = nativeType.GetName()
         code = nativeType.GetTypeClass()
 
         # Display the result of GetSummary() for Core Foundation string
         # and string-like types.
         summary = None
         if self.useFancy:
-            if (typeName.startswith('CF')
-                    or typeName.startswith('__CF')
-                    or typeName.startswith('NS')
-                    or typeName.startswith('__NSCF')):
+            if (type_name.startswith('CF')
+                    or type_name.startswith('__CF')
+                    or type_name.startswith('NS')
+                    or type_name.startswith('__NSCF')):
                 if code == lldb.eTypeClassPointer:
                     summary = nativeValue.Dereference().GetSummary()
                 elif code == lldb.eTypeClassReference:
@@ -156,26 +142,26 @@ class Dumper(DumperBase):
             nativeTargetType = nativeType.GetDereferencedType()
             if not nativeTargetType.IsPointerType():
                 nativeTargetType = nativeTargetType.GetUnqualifiedType()
-            targetType = self.fromNativeType(nativeTargetType)
-            val = self.createReferenceValue(nativeValue.GetValueAsUnsigned(), targetType)
+            target_typeid = self.from_native_type(nativeTargetType)
+            target_address = nativeValue.GetValueAsUnsigned()
+            val = self.Value(self)
+            val.ldata = target_address.to_bytes(self.ptrSize(), 'little')
+            if self.useDynamicType:
+                target_typeid = self.dynamic_typeid_at_address(target_typeid, target_address)
+            val.typeid = self.create_reference_typeid(target_typeid)
             val.laddress = nativeValue.AddressOf().GetValueAsUnsigned()
-            #DumperBase.warn('CREATED REF: %s' % val)
+            #self.warn('CREATED REF: %s' % val)
+
         elif code == lldb.eTypeClassPointer:
             nativeTargetType = nativeType.GetPointeeType()
             if not nativeTargetType.IsPointerType():
                 nativeTargetType = nativeTargetType.GetUnqualifiedType()
-            targetType = self.fromNativeType(nativeTargetType)
-            val = self.createPointerValue(nativeValue.GetValueAsUnsigned(), targetType)
-            #DumperBase.warn('CREATED PTR 1: %s' % val)
+            target_typeid = self.from_native_type(nativeTargetType)
+            val = self.Value(self)
+            val.ldata = nativeValue.GetValueAsUnsigned()
+            val.typeid = self.create_pointer_typeid(target_typeid)
             val.laddress = nativeValue.AddressOf().GetValueAsUnsigned()
-            #DumperBase.warn('CREATED PTR 2: %s' % val)
-        elif code == lldb.eTypeClassTypedef:
-            nativeTargetType = nativeType.GetUnqualifiedType()
-            if hasattr(nativeTargetType, 'GetCanonicalType'):
-                nativeTargetType = nativeTargetType.GetCanonicalType()
-            val = self.fromNativeValue(nativeValue.Cast(nativeTargetType))
-            val._type = self.fromNativeType(nativeType)
-            #DumperBase.warn('CREATED TYPEDEF: %s' % val)
+
         else:
             val = self.Value(self)
             address = nativeValue.GetLoadAddress()
@@ -193,7 +179,7 @@ class Dumper(DumperBase):
                     except:
                         pass
 
-            val._type = self.fromNativeType(nativeType)
+            val.typeid = self.from_native_type(nativeType)
 
             if code == lldb.eTypeClassEnumeration:
                 intval = nativeValue.GetValueAsSigned()
@@ -209,43 +195,32 @@ class Dumper(DumperBase):
                 val.ldisplay = str(nativeValue.GetValue())
             #elif code == lldb.eTypeClassArray:
             #    if hasattr(nativeType, 'GetArrayElementType'): # New in 3.8(?) / 350.x
-            #        val.type.ltarget = self.fromNativeType(nativeType.GetArrayElementType())
+            #        val.type.ltarget = self.from_native_type(nativeType.GetArrayElementType())
             #    else:
             #        fields = nativeType.get_fields_array()
             #        if len(fields):
-            #            val.type.ltarget = self.fromNativeType(fields[0])
+            #            val.type.ltarget = self.from_native_type(fields[0])
             #elif code == lldb.eTypeClassVector:
-            #    val.type.ltarget = self.fromNativeType(nativeType.GetVectorElementType())
+            #    val.type.ltarget = self.from_native_type(nativeType.GetVectorElementType())
 
         val.summary = summary
         val.lIsInScope = nativeValue.IsInScope()
         val.name = nativeValue.GetName()
         return val
 
-    def nativeStructAlignment(self, nativeType):
-        def handleItem(nativeFieldType, align):
-            a = self.fromNativeType(nativeFieldType).alignment()
-            return a if a > align else align
-        align = 1
-        for i in range(nativeType.GetNumberOfDirectBaseClasses()):
-            base = nativeType.GetDirectBaseClassAtIndex(i)
-            align = handleItem(base.GetType(), align)
-        for i in range(nativeType.GetNumberOfFields()):
-            child = nativeType.GetFieldAtIndex(i)
-            align = handleItem(child.GetType(), align)
-        return align
+    def nativeListMembers(self, value, nativeType, include_base):
+        #self.warn("ADDR: 0x%x" % self.fakeAddress_)
+        nativeValue = value.nativeValue
+        if nativeValue is None:
+            if value.laddress:
+                fakeAddress = lldb.SBAddress(value.laddress, self.target)
+                fakeLAddress = value.laddress
+            else:
+                fakeAddress = self.fakeAddress_
+                fakeLAddress = self.fakeLAddress_
+            nativeValue = self.target.CreateValueFromAddress('x', fakeAddress, nativeType)
 
-    def listMembers(self, value, nativeType):
-        #DumperBase.warn("ADDR: 0x%x" % self.fakeAddress_)
-        if value.laddress:
-            fakeAddress = lldb.SBAddress(value.laddress, self.target)
-            fakeLAddress = value.laddress
-        else:
-            fakeAddress = self.fakeAddress_
-            fakeLAddress = self.fakeLAddress_
-
-        fakeValue = self.target.CreateValueFromAddress('x', fakeAddress, nativeType)
-        fakeValue.SetPreferSyntheticValue(False)
+        nativeValue.SetPreferSyntheticValue(False)
 
         baseNames = {}
         for i in range(nativeType.GetNumberOfDirectBaseClasses()):
@@ -262,86 +237,108 @@ class Dumper(DumperBase):
 
         # Normal members and non-empty base classes.
         anonNumber = 0
-        for i in range(fakeValue.GetNumChildren()):
-            nativeField = fakeValue.GetChildAtIndex(i)
+
+        fields = []
+        for i in range(nativeValue.GetNumChildren()):
+            nativeField = nativeValue.GetChildAtIndex(i)
             nativeField.SetPreferSyntheticValue(False)
 
             fieldName = nativeField.GetName()
             nativeFieldType = nativeField.GetType()
 
             if fieldName in fieldBits:
-                (fieldBitsize, fieldBitpos, isBitfield) = fieldBits[fieldName]
+                (bitsize, bitpos, isBitfield) = fieldBits[fieldName]
             else:
-                fieldBitsize = nativeFieldType.GetByteSize() * 8
-                fieldBitpos = None
+                bitsize = nativeFieldType.GetByteSize() * 8
+                bitpos = None
                 isBitfield = False
 
             if isBitfield:  # Bit fields
-                fieldType = self.createBitfieldType(
-                    self.createType(self.typeName(nativeFieldType)), fieldBitsize)
-                yield self.Field(self, name=fieldName, type=fieldType,
-                                 bitsize=fieldBitsize, bitpos=fieldBitpos)
+                field_typeid = self.create_bitfield_typeid(
+                    self.create_typeid(nativeFieldType.GetName()), bitsize)
+                val = self.Value(self)
+                val.name = fieldName
+                val.isBaseClass = False
+                val.typeid = field_typeid
+                val.ldata = self.value_extract_bits(value, bitpos, bitsize)
+                val.laddress = None
+                fields.append(val)
 
             elif fieldName is None:  # Anon members
                 anonNumber += 1
                 fieldName = '#%s' % anonNumber
-                fakeMember = fakeValue.GetChildAtIndex(i)
+                fakeMember = nativeValue.GetChildAtIndex(i)
                 fakeMemberAddress = fakeMember.GetLoadAddress()
-                offset = fakeMemberAddress - fakeLAddress
-                yield self.Field(self, name=fieldName, type=self.fromNativeType(nativeFieldType),
-                                 bitsize=fieldBitsize, bitpos=8 * offset)
+                val = self.Value(self)
+                val.name = fieldName
+                val.isBaseClass = False
+                val.typeid = typeid=self.from_native_type(nativeFieldType)
+                field_offset = fakeMemberAddress - fakeLAddress
+                if value.laddress is not None:
+                    val.laddress = value.laddress + field_offset
+                if value.ldata is not None:
+                    field_size = (bitsize + 7) // 8
+                    val.ldata = value.ldata[field_offset:field_offset + field_size]
+                fields.append(val)
 
             elif fieldName in baseNames:  # Simple bases
-                member = self.fromNativeValue(fakeValue.GetChildAtIndex(i))
+                member = self.fromNativeValue(nativeValue.GetChildAtIndex(i))
                 member.isBaseClass = True
-                yield member
+                fields.append(member)
 
             else:  # Normal named members
-                member = self.fromNativeValue(fakeValue.GetChildAtIndex(i))
+                member = self.fromNativeValue(nativeValue.GetChildAtIndex(i))
                 member.name = nativeField.GetName()
-                yield member
+                fields.append(member)
 
-        # Empty bases are not covered above.
-        for i in range(nativeType.GetNumberOfDirectBaseClasses()):
-            fieldObj = nativeType.GetDirectBaseClassAtIndex(i)
-            fieldType = fieldObj.GetType()
-            if fieldType.GetNumberOfFields() == 0:
-                if fieldType.GetNumberOfDirectBaseClasses() == 0:
-                    member = self.Value(self)
-                    fieldName = fieldObj.GetName()
-                    member._type = self.fromNativeType(fieldType)
-                    member.name = fieldName
-                    member.fields = []
-                    if False:
-                        # This would be correct if we came here only for
-                        # truly empty base classes. Alas, we don't, see below.
-                        member.ldata = bytes()
-                        member.lbitsize = fieldType.GetByteSize() * 8
-                    else:
-                        # This is a hack. LLDB 3.8 reports declared but not defined
-                        # types as having no fields and(!) size == 1. At least
-                        # for the common case of a single base class we can
-                        # fake the contents by using the whole derived object's
-                        # data as base class data.
-                        data = fakeValue.GetData()
-                        size = nativeType.GetByteSize()
-                        member.lbitsize = size * 8
-                        error = lldb.SBError()
-                        member.laddress = value.laddress
-                        member.ldata = data.ReadRawData(error, 0, size)
-                    member.isBaseClass = True
-                    member.ltype = self.fromNativeType(fieldType)
-                    member.name = fieldName
-                    yield member
+
+        if include_base:
+            # Empty bases are not covered above.
+            for i in range(nativeType.GetNumberOfDirectBaseClasses()):
+                fieldObj = nativeType.GetDirectBaseClassAtIndex(i)
+                fieldType = fieldObj.GetType()
+                if fieldType.GetNumberOfFields() == 0:
+                    if fieldType.GetNumberOfDirectBaseClasses() == 0:
+                        member = self.Value(self)
+                        fieldName = fieldObj.GetName()
+                        member.typeid = self.from_native_type(fieldType)
+                        member.name = fieldName
+                        member.fields = []
+                        if False:
+                            # This would be correct if we came here only for
+                            # truly empty base classes. Alas, we don't, see below.
+                            member.ldata = bytes()
+                        else:
+                            # This is a hack. LLDB 3.8 reports declared but not defined
+                            # types as having no fields and(!) size == 1. At least
+                            # for the common case of a single base class we can
+                            # fake the contents by using the whole derived object's
+                            # data as base class data.
+                            data = nativeValue.GetData()
+                            size = nativeType.GetByteSize()
+                            error = lldb.SBError()
+                            member.laddress = value.laddress
+                            member.ldata = data.ReadRawData(error, 0, size)
+                        member.isBaseClass = True
+                        fields.append(member)
+        return fields
 
     def ptrSize(self):
         result = self.target.GetAddressByteSize()
         self.ptrSize = lambda: result
         return result
 
-    def fromNativeType(self, nativeType):
+    def is_qobject_based(self, nativeType):
+        if nativeType.GetName() == self.qtNamespace() + 'QObject':
+            return True
+        if nativeType.GetNumberOfDirectBaseClasses() > 0:
+            return self.is_qobject_based(nativeType.GetDirectBaseClassAtIndex(0).GetType())
+        if nativeType.GetNumberOfFields() > 0:
+            return False
+        return None  # No info, can't drill deeper
+
+    def from_native_type(self, nativeType):
         self.check(isinstance(nativeType, lldb.SBType))
-        code = nativeType.GetTypeClass()
 
         # eTypeClassInvalid           = (0u),
         # eTypeClassArray             = (1u << 0),
@@ -367,43 +364,41 @@ class Dumper(DumperBase):
         # // Define a mask that can be used for any type when finding types
         # eTypeClassAny               = (0xffffffffu)
 
-        #DumperBase.warn('CURRENT: %s' % self.typeData.keys())
-        #DumperBase.warn('FROM NATIVE TYPE: %s' % nativeType.GetName())
+        #self.warn('CURRENT: %s' % self.typeData.keys())
+        #self.warn('FROM NATIVE TYPE: %s' % nativeType.GetName())
+
+        typeid_str = self.native_type_key(nativeType)
+        known_typeid = self.typeid_from_typekey.get(typeid_str, None)
+        if known_typeid is not None:
+            return known_typeid
+
+        code = nativeType.GetTypeClass()
+
         if code == lldb.eTypeClassInvalid:
-            return None
+            typeid = 0
 
-        if code == lldb.eTypeClassBuiltin:
-            nativeType = nativeType.GetUnqualifiedType()
+        elif code == lldb.eTypeClassPointer:
+            #self.warn('PTR: %s' % nativeTargetType.name)
+            target_typeid  = self.from_native_type(nativeType.GetPointeeType())
+            typeid = self.create_pointer_typeid(target_typeid)
 
-        if code == lldb.eTypeClassPointer:
-            #DumperBase.warn('PTR')
-            nativeTargetType = nativeType.GetPointeeType()
-            if not nativeTargetType.IsPointerType():
-                nativeTargetType = nativeTargetType.GetUnqualifiedType()
-            #DumperBase.warn('PTR: %s' % nativeTargetType.name)
-            return self.createPointerType(self.fromNativeType(nativeTargetType))
-
-        if code == lldb.eTypeClassReference:
+        elif code == lldb.eTypeClassReference:
             #DumperBase.warn('REF')
-            nativeTargetType = nativeType.GetDereferencedType()
-            if not nativeTargetType.IsPointerType():
-                nativeTargetType = nativeTargetType.GetUnqualifiedType()
-            #DumperBase.warn('REF: %s' % nativeTargetType.name)
-            return self.createReferenceType(self.fromNativeType(nativeTargetType))
+            target_typeid = self.from_native_type(nativeType.GetDereferencedType())
+            typeid = self.create_reference_typeid(target_typeid)
 
-        if code == lldb.eTypeClassTypedef:
+        elif code == lldb.eTypeClassTypedef:
             #DumperBase.warn('TYPEDEF')
             nativeTargetType = nativeType.GetUnqualifiedType()
             if hasattr(nativeTargetType, 'GetCanonicalType'):
                 nativeTargetType = nativeTargetType.GetCanonicalType()
-            targetType = self.fromNativeType(nativeTargetType)
-            return self.createTypedefedType(targetType, nativeType.GetName(),
-                                            self.nativeTypeId(nativeType))
+            target_typeid = self.from_native_type(nativeTargetType)
+            typeid = self.create_typedefed_typeid(target_typeid, nativeType.GetName(),
+                                                typeid_str)
 
-        nativeType = nativeType.GetUnqualifiedType()
-        typeName = self.typeName(nativeType)
-
-        if code in (lldb.eTypeClassArray, lldb.eTypeClassVector):
+        elif code in (lldb.eTypeClassArray, lldb.eTypeClassVector):
+            nativeType = nativeType.GetUnqualifiedType()
+            type_name = nativeType.GetName()
             #DumperBase.warn('ARRAY: %s' % nativeType.GetName())
             if hasattr(nativeType, 'GetArrayElementType'):  # New in 3.8(?) / 350.x
                 nativeTargetType = nativeType.GetArrayElementType()
@@ -412,141 +407,143 @@ class Dumper(DumperBase):
                         #DumperBase.warn('BAD: %s ' % nativeTargetType.get_fields_array())
                         nativeTargetType = nativeType.GetVectorElementType()
                 count = nativeType.GetByteSize() // nativeTargetType.GetByteSize()
-                targetTypeName = nativeTargetType.GetName()
-                if targetTypeName.startswith('(anon'):
-                    typeName = nativeType.GetName()
-                    pos1 = typeName.rfind('[')
-                    targetTypeName = typeName[0:pos1].strip()
-                #DumperBase.warn("TARGET TYPENAME: %s" % targetTypeName)
-                targetType = self.fromNativeType(nativeTargetType)
-                targetType.setTdata(targetType.tdata.copy())
-                targetType.tdata.name = targetTypeName
-                return self.createArrayType(targetType, count)
-            if hasattr(nativeType, 'GetVectorElementType'):  # New in 3.8(?) / 350.x
+                target_typename = nativeTargetType.GetName()
+                if target_typename.startswith('(anon'):
+                    type_name = nativeType.GetName()
+                    pos1 = type_name.rfind('[')
+                    target_typename = type_name[0:pos1].strip()
+                #DumperBase.warn("TARGET TYPENAME: %s" % target_typename)
+                target_typeid = self.from_native_type(nativeTargetType)
+                #target_typeid.setTdata(target_typeid.tdata.copy())
+                #target_typeid.tdata.name = target_typename
+                typeid = self.create_array_typeid(target_typeid, count)
+            elif hasattr(nativeType, 'GetVectorElementType'):  # New in 3.8(?) / 350.x
                 nativeTargetType = nativeType.GetVectorElementType()
                 count = nativeType.GetByteSize() // nativeTargetType.GetByteSize()
-                targetType = self.fromNativeType(nativeTargetType)
-                return self.createArrayType(targetType, count)
-            return self.createType(nativeType.GetName())
+                target_typeid = self.from_native_type(nativeTargetType)
+                typeid = self.create_array_typeid(target_typeid, count)
+            else:
+                typeid = self.create_type(nativeType.GetName())
 
-        typeId = self.nativeTypeId(nativeType)
-        res = self.typeData.get(typeId, None)
-        if res is None:
+        else:
+            nativeType = nativeType.GetUnqualifiedType()
+            type_name = nativeType.GetName()
+
+            typeid = self.typeid_for_string(typeid_str)
+            #if not typeid in self.typeid_cache:
             #  # This strips typedefs for pointers. We don't want that.
             #  typeobj.nativeType = nativeType.GetUnqualifiedType()
-            tdata = self.TypeData(self, typeId)
-            tdata.name = typeName
-            tdata.lbitsize = nativeType.GetByteSize() * 8
+            self.type_name_cache[typeid] = type_name
+            self.type_size_cache[typeid] = nativeType.GetByteSize()
+            type_code = None
             if code == lldb.eTypeClassBuiltin:
-                if utils.isFloatingPointTypeName(typeName):
-                    tdata.code = TypeCode.Float
-                elif utils.isIntegralTypeName(typeName):
-                    tdata.code = TypeCode.Integral
-                elif typeName in ('__int128', 'unsigned __int128'):
-                    tdata.code = TypeCode.Integral
-                elif typeName == 'void':
-                    tdata.code = TypeCode.Void
-                elif typeName == 'wchar_t':
-                    tdata.code = TypeCode.Integral
-                elif typeName in ("char16_t", "char32_t", "char8_t"):
-                    tdata.code = TypeCode.Integral
+                if utils.isFloatingPointTypeName(type_name):
+                    type_code = TypeCode.Float
+                elif utils.isIntegralTypeName(type_name):
+                    type_code = TypeCode.Integral
+                elif type_name in ('__int128', 'unsigned __int128'):
+                    type_code = TypeCode.Integral
+                elif type_name == 'void':
+                    type_code = TypeCode.Void
+                elif type_name == 'wchar_t':
+                    type_code = TypeCode.Integral
+                elif type_name in ("char16_t", "char32_t", "char8_t"):
+                    type_code = TypeCode.Integral
                 else:
-                    self.warn('UNKNOWN TYPE KEY: %s: %s' % (typeName, code))
+                    self.warn('UNKNOWN TYPE KEY: %s: %s' % (type_name, code))
             elif code == lldb.eTypeClassEnumeration:
-                tdata.code = TypeCode.Enum
-                tdata.enumDisplay = lambda intval, addr, form: \
+                type_code = TypeCode.Enum
+                self.type_enum_display_cache[typeid] = lambda intval, addr, form: \
                     self.nativeTypeEnumDisplay(nativeType, intval, form)
             elif code in (lldb.eTypeClassComplexInteger, lldb.eTypeClassComplexFloat):
-                tdata.code = TypeCode.Complex
-            elif code in (lldb.eTypeClassClass, lldb.eTypeClassStruct, lldb.eTypeClassUnion):
-                tdata.code = TypeCode.Struct
-                tdata.lalignment = lambda: \
-                    self.nativeStructAlignment(nativeType)
-                tdata.lfields = lambda value: \
-                    self.listMembers(value, nativeType)
-                tdata.templateArguments = lambda: \
-                    self.listTemplateParametersHelper(nativeType)
+                type_code = TypeCode.Complex
+            elif code in (lldb.eTypeClassClass, lldb.eTypeClassStruct):
+                type_code = TypeCode.Struct
+                self.type_qobject_based_cache[typeid] = self.is_qobject_based(nativeType)
+            elif code == lldb.eTypeClassUnion:
+                type_code = TypeCode.Struct
+                self.type_qobject_based_cache[typeid] = False
             elif code == lldb.eTypeClassFunction:
-                tdata.code = TypeCode.Function
+                type_code = TypeCode.Function
             elif code == lldb.eTypeClassMemberPointer:
-                tdata.code = TypeCode.MemberPointer
-        #    warn('CREATE TYPE: %s' % typeId)
+                type_code = TypeCode.MemberPointer
+
+            if code is not None:
+                self.type_code_cache[typeid] = type_code
+
+        self.type_nativetype_cache[typeid] = nativeType
+        self.typeid_from_typekey[typeid_str] = typeid
+
+        # self.warn('REUSE TYPE: %s' % typeid)
+        return typeid
+
+    def nativeTemplateParameter(self, typeid, index, nativeType):
+        #n = nativeType.GetNumberOfTemplateArguments()
+        #if n != len(stringArgs):
+        #    # Something wrong in the debug info.
+        #    # Should work in theory, doesn't work in practice.
+        #    # Items like std::allocator<std::pair<unsigned int const, float> report 0
+        #    # for nativeType.GetNumberOfTemplateArguments() with LLDB 3.8
+        #    return stringArgs
+
+        kind = nativeType.GetTemplateArgumentKind(index)
+        # eTemplateArgumentKindNull = 0,
+        # eTemplateArgumentKindType,
+        # eTemplateArgumentKindDeclaration,
+        # eTemplateArgumentKindIntegral,
+        # eTemplateArgumentKindTemplate,
+        # eTemplateArgumentKindTemplateExpansion,
+        # eTemplateArgumentKindExpression,
+        # eTemplateArgumentKindPack
+        if kind == lldb.eTemplateArgumentKindType:
+            innerType = nativeType.GetTemplateArgumentType(index) \
+                .GetUnqualifiedType().GetCanonicalType()
+            return self.Type(self, self.from_native_type(innerType))
+        #elif kind == lldb.eTemplateArgumentKindIntegral:
+        #   innerType = nativeType.GetTemplateArgumentType(i).GetUnqualifiedType().GetCanonicalType()
+        #   #DumperBase.warn('INNER TYP: %s' % innerType)
+        #   basicType = innerType.GetBasicType()
+        #   #DumperBase.warn('IBASIC TYP: %s' % basicType)
+        #   inner = self.extractTemplateArgument(nativeType.GetName(), i)
+        #   exp = '(%s)%s' % (innerType.GetName(), inner)
+        #   #DumperBase.warn('EXP : %s' % exp)
+        #   val = self.nativeParseAndEvaluate('(%s)%s' % (innerType.GetName(), inner))
+        #   # Clang writes 'int' and '0xfffffff' into the debug info
+        #   # LLDB manages to read a value of 0xfffffff...
+        #   #if basicType == lldb.eBasicTypeInt:
+        #   value = val.GetValueAsUnsigned()
+        #   if value >= 0x8000000:
+        #       value -= 0x100000000
+        #   #DumperBase.warn('KIND: %s' % kind)
+        #   targs.append(value)
         #else:
-        #    warn('REUSE TYPE: %s' % typeId)
-        return self.Type(self, typeId)
-
-    def listTemplateParametersHelper(self, nativeType):
-        stringArgs = self.listTemplateParameters(nativeType.GetName())
-        n = nativeType.GetNumberOfTemplateArguments()
-        if n != len(stringArgs):
-            # Something wrong in the debug info.
-            # Should work in theory, doesn't work in practice.
-            # Items like std::allocator<std::pair<unsigned int const, float> report 0
-            # for nativeType.GetNumberOfTemplateArguments() with LLDB 3.8
-            return stringArgs
-
-        targs = []
-        for i in range(nativeType.GetNumberOfTemplateArguments()):
-            kind = nativeType.GetTemplateArgumentKind(i)
-            # eTemplateArgumentKindNull = 0,
-            # eTemplateArgumentKindType,
-            # eTemplateArgumentKindDeclaration,
-            # eTemplateArgumentKindIntegral,
-            # eTemplateArgumentKindTemplate,
-            # eTemplateArgumentKindTemplateExpansion,
-            # eTemplateArgumentKindExpression,
-            # eTemplateArgumentKindPack
-            if kind == lldb.eTemplateArgumentKindType:
-                innerType = nativeType.GetTemplateArgumentType(
-                    i).GetUnqualifiedType().GetCanonicalType()
-                targs.append(self.fromNativeType(innerType))
-            #elif kind == lldb.eTemplateArgumentKindIntegral:
-            #   innerType = nativeType.GetTemplateArgumentType(i).GetUnqualifiedType().GetCanonicalType()
-            #   #DumperBase.warn('INNER TYP: %s' % innerType)
-            #   basicType = innerType.GetBasicType()
-            #   #DumperBase.warn('IBASIC TYP: %s' % basicType)
-            #   inner = self.extractTemplateArgument(nativeType.GetName(), i)
-            #   exp = '(%s)%s' % (innerType.GetName(), inner)
-            #   #DumperBase.warn('EXP : %s' % exp)
-            #   val = self.nativeParseAndEvaluate('(%s)%s' % (innerType.GetName(), inner))
-            #   # Clang writes 'int' and '0xfffffff' into the debug info
-            #   # LLDB manages to read a value of 0xfffffff...
-            #   #if basicType == lldb.eBasicTypeInt:
-            #   value = val.GetValueAsUnsigned()
-            #   if value >= 0x8000000:
-            #       value -= 0x100000000
-            #   #DumperBase.warn('KIND: %s' % kind)
-            #   targs.append(value)
-            else:
-                #DumperBase.warn('UNHANDLED TEMPLATE TYPE : %s' % kind)
-                targs.append(stringArgs[i])  # Best we can do.
+        #    #DumperBase.warn('UNHANDLED TEMPLATE TYPE : %s' % kind)
+        #    targs.append(stringArgs[i])  # Best we can do.
         #DumperBase.warn('TARGS: %s %s' % (nativeType.GetName(), [str(x) for x in  targs]))
-        return targs
+        #return targs
+        return None
 
-    def typeName(self, nativeType):
-        # Don't use GetDisplayTypeName since LLDB removed the inline namespace __1
-        # https://reviews.llvm.org/D74478
-        return nativeType.GetName()
-
-    def nativeTypeId(self, nativeType):
-        if nativeType and (nativeType.GetTypeClass() == lldb.eTypeClassTypedef):
+    def native_type_key(self, nativeType):
+        code = nativeType.GetTypeClass()
+        if nativeType and code == lldb.eTypeClassTypedef:
             nativeTargetType = nativeType.GetUnqualifiedType()
             if hasattr(nativeTargetType, 'GetCanonicalType'):
                 nativeTargetType = nativeTargetType.GetCanonicalType()
             return '%s{%s}' % (nativeType.name, nativeTargetType.name)
-        name = self.typeName(nativeType)
+        # Don't use GetDisplayTypeName since LLDB removed the inline namespace __1
+        # https://reviews.llvm.org/D74478
+        name = nativeType.GetName()
         if name is None or len(name) == 0:
             c = '0'
-        elif name == '(anonymous struct)' and nativeType.GetTypeClass() == lldb.eTypeClassStruct:
-            c = 's'
-        elif name == '(anonymous struct)' and nativeType.GetTypeClass() == lldb.eTypeClassUnion:
-            c = 'u'
+        elif name == '(anonymous struct)':
+            c = 's' if code == lldb.eTypeClassStruct else 'u'
         else:
             return name
         fields = nativeType.get_fields_array()
-        typeId = c + ''.join(['{%s:%s}' % (f.name, self.nativeTypeId(f.GetType())) for f in fields])
-        #DumperBase.warn('NATIVE TYPE ID FOR %s IS %s' % (name, typeId))
-        return typeId
+        id_str = c + ''.join(['{%s:%s}' %
+            (f.name, self.typeid_for_string(self.native_type_key(f.GetType())))
+                for f in fields])
+        return id_str
 
     def nativeTypeEnumDisplay(self, nativeType, intval, form):
         if hasattr(nativeType, 'get_enum_members_array'):
@@ -575,12 +572,82 @@ class Dumper(DumperBase):
             return '(' + ' | '.join(flags) + ') (' + (form % intval) + ')'
         return form % intval
 
-    def nativeDynamicTypeName(self, address, baseType):
-        return None  # FIXME: Seems sufficient, no idea why.
-        addr = self.target.ResolveLoadAddress(address)
-        ctx = self.target.ResolveSymbolContextForAddress(addr, 0)
-        sym = ctx.GetSymbol()
-        return sym.GetName()
+    def nativeDynamicType(self, address, base_typeid):
+        return self.nativeDynamicType_2(address, base_typeid)
+
+    def nativeDynamicType_1(self, address, base_typeid):
+        # Solutions 1: Breaks StdUniquePtr and QVariant1 test
+        return base_typeid
+
+    def nativeDynamicType_2(self, address, base_typeid):
+        # Solution 2: ~10% slower in total than Solution 1
+        typename = self.type_name(base_typeid)
+        #self.warn("LOOKING FOR DYN TYPE: 0x%x %s" % (address, typename))
+        #self.warn(" PRETTY: 0x%x %s" % (address, self.prettySymbolByAddress(address)))
+
+        expr = '(void*)%s' % address
+        value = self.target.EvaluateExpression(expr)
+
+        #self.warn("VALUE: %s" % value)
+        if value.GetType().GetName() == "void *":
+            #self.warn("NO DYN TYPE: %s" % value)
+            return base_typeid
+
+        dvalue = value.Dereference()
+        #self.warn("DVALUE: %s" % value)
+        sbtype = dvalue.GetType()
+        #self.warn("TYPE: %s" % sbtype)
+
+        #self.warn("OUTPUT: %s" % output)
+        #self.warn("DYNTYPE: %s" % dyn_typename)
+        return self.from_native_type(sbtype)
+
+    def nativeDynamicType_3(self, address, base_typeid):
+        # Solution 3: Doesn't improve over 1
+        typename = self.type_name(base_typeid)
+        self.warn("LOOKING FOR DYN TYPE: 0x%x %s" % (address, typename))
+        #self.warn(" PRETTY: 0x%x %s" % (address, self.prettySymbolByAddress(address)))
+        nativeType = self.type_nativetype_cache.get(base_typeid, None)
+        #self.warn(" NATIVE BASE %s" % nativeType)
+        if nativeType is None:
+            return base_typeid
+        #versionValue = self.target.EvaluateExpression('qtHookData[2]').GetNonSyntheticValue()
+        addr = lldb.SBAddress(address, self.target)
+        value = self.target.CreateValueFromAddress('x', addr, nativeType)
+        self.warn(" VALUE %s" % value)
+        return base_typeid
+
+    def nativeDynamicType_4(self, address, base_typeid):
+        #self.warn("RESULT: %s" % result)
+        #self.warn("ADDRESS: 0x%x" % address)
+
+        #thread = self.currentThread()
+        #frame = thread.GetFrameAtIndex(0)
+        #expr = '(void*)%s' % address
+        #value = self.target.EvaluateExpression(expr)
+        #sbtype = self.lookupNativeType(typename)
+        #addr = self.target.ResolveLoadAddress(address)
+        #addr = lldb.SBAddress(address, self.target)
+        #value = self.target.CreateValueFromAddress('x', addr, sbtype)
+        #x = lldb::DynamicValueType()
+        #lldb.eNoDynamicValues
+        #lldb.eDynamicCanRunTarget
+        #lldb.eDynamicDontRunTarget
+        #dyn_value = value.GetDynamicValue(lldb.eDynamicDontRunTarget)
+        #typ = dyn_value.GetType()
+        self.warn("GOT DYN VALUE: %s" % dyn_value)
+        #self.warn("GOT TYPE: %s FOR OBJECT AT 0x%x" % (typ, address))
+        return self.from_native_type(typ)
+
+        #result = lldb.SBCommandReturnObject()
+        #cmd = 'p (void*)%s' % address
+        #self.debugger.GetCommandInterpreter().HandleCommand(cmd, result)
+        #if not result.Succeeded():
+        #    return self.Type(self, typeid)
+        #output = result.GetOutput().strip()
+        #dyn_typename = output[1:output.find('$') - 4]
+        #sbtype = self.lookupNativeType(dyn_typename)
+
 
     def stateName(self, s):
         try:
@@ -638,11 +705,11 @@ class Dumper(DumperBase):
         #DumperBase.warn('  -> %s' % result)
         return self.fromNativeValue(result)
 
-    def pokeValue(self, typeName, *args):
+    def pokeValue(self, type_name, *args):
         thread = self.currentThread()
         frame = thread.GetFrameAtIndex(0)
         inner = ','.join(args)
-        value = frame.EvaluateExpression(typeName + '{' + inner + '}')
+        value = frame.EvaluateExpression(type_name + '{' + inner + '}')
         #DumperBase.warn('  TYPE: %s' % value.type)
         #DumperBase.warn('  ADDR: 0x%x' % value.address)
         #DumperBase.warn('  VALUE: %s' % value)
@@ -704,7 +771,9 @@ class Dumper(DumperBase):
             symbol = funcs[0].GetSymbol()
             self.qtPropertyFunc = symbol.GetStartAddress().GetLoadAddress(self.target)
 
-    def fetchQtVersionAndNamespace(self):
+        self.fetchInternalFunctions = lambda: None
+
+    def extractQtVersion(self):
         for func in self.target.FindFunctions('qVersion'):
             name = func.GetSymbol().GetName()
             if name == None:
@@ -714,8 +783,8 @@ class Dumper(DumperBase):
             if name.count(':') > 2:
                 continue
 
-            qtNamespace = name[:name.find('qVersion')]
-            self.qtNamespace = lambda: qtNamespace
+            #qtNamespace = name[:name.find('qVersion')]
+            #self.qtNamespace = lambda: qtNamespace
 
             options = lldb.SBExpressionOptions()
             res = self.target.EvaluateExpression(name + '()', options)
@@ -740,44 +809,17 @@ class Dumper(DumperBase):
 
             (major, minor, patch) = version.split('.')
             qtVersion = 0x10000 * int(major) + 0x100 * int(minor) + int(patch)
-            self.qtVersion = lambda: qtVersion
-
-            return (qtNamespace, qtVersion)
+            return qtVersion
 
         try:
             versionValue = self.target.EvaluateExpression('qtHookData[2]').GetNonSyntheticValue()
             if versionValue.IsValid():
-                return ('', versionValue.unsigned)
+                return versionValue.unsigned
         except:
             pass
 
-        return ('', self.fallbackQtVersion)
+        return None
 
-    def qtVersionAndNamespace(self):
-        qtVersionAndNamespace = None
-        try:
-            qtVersionAndNamespace = self.fetchQtVersionAndNamespace()
-            self.report("Detected Qt Version: 0x%0x (namespace='%s')" %
-                        (qtVersionAndNamespace[1], qtVersionAndNamespace[0] or "no namespace"))
-        except Exception as e:
-            DumperBase.warn('[lldb] Error detecting Qt version: %s' % e)
-
-        try:
-            self.fetchInternalFunctions()
-            self.report('Found function QObject::property: 0x%0x' % self.qtPropertyFunc)
-            self.report('Found function QObject::customEvent: 0x%0x' % self.qtCustomEventFunc)
-        except Exception as e:
-            DumperBase.warn('[lldb] Error fetching internal Qt functions: %s' % e)
-
-        # Cache version information by overriding this function.
-        self.qtVersionAndNamespace = lambda: qtVersionAndNamespace
-        return qtVersionAndNamespace
-
-    def qtNamespace(self):
-        return self.qtVersionAndNamespace()[0]
-
-    def qtVersion(self):
-        return self.qtVersionAndNamespace()[1]
 
     def handleCommand(self, command):
         result = lldb.SBCommandReturnObject()
@@ -830,8 +872,6 @@ class Dumper(DumperBase):
             #DumperBase.warn('RECURSE PTR')
             typeobj = self.lookupNativeType(name[:-1].strip())
             if typeobj is not None:
-                #DumperBase.warn('RECURSE RESULT X: %s' % typeobj)
-                self.fromNativeType(typeobj.GetPointerType())
                 #DumperBase.warn('RECURSE RESULT: %s' % typeobj.GetPointerType())
                 return typeobj.GetPointerType()
 
@@ -1289,17 +1329,18 @@ class Dumper(DumperBase):
     def findSymbol(self, symbolName):
         return self.target.FindFirstGlobalVariable(symbolName)
 
-    def warn(self, msg):
-        self.put('{name="%s",value="",type="",numchild="0"},' % toCString(msg))
-
     def fetchVariables(self, args):
-        (ok, res) = self.tryFetchInterpreterVariables(args)
-        if ok:
-            self.reportResult(res, args)
-            return
+        start_time = time.perf_counter()
+        #(ok, res) = self.tryFetchInterpreterVariables(args)
+        #if ok:
+        #    self.reportResult(res, args)
+        #    return
 
         self.setVariableFetchingOptions(args)
 
+        self.qtLoaded = True # FIXME: Do that elsewhere
+
+
         # Reset certain caches whenever a step over / into / continue
         # happens.
         # FIXME: Caches are currently also cleared if currently
@@ -1312,6 +1353,8 @@ class Dumper(DumperBase):
             self.reportResult('error="No frame"', args)
             return
 
+        self.isArmMac = frame.module.triple.startswith('arm64-apple')
+
         self.output = []
         isPartial = len(self.partialVariable) > 0
 
@@ -1358,13 +1401,15 @@ class Dumper(DumperBase):
                 # This can happen for unnamed function parameters with
                 # default values:  void foo(int = 0)
                 continue
-            value = self.fromNativeFrameValue(val)
+            value = self.fromNativeValue(val)
             variables.append(value)
 
         self.handleLocals(variables)
         self.handleWatches(args)
 
-        self.put('],partial="%d"' % isPartial)
+        run_time = time.perf_counter() - start_time
+
+        self.put('],partial="%d",runtime="%s"' % (isPartial, run_time))
         self.reportResult(self.takeOutput(), args)
 
 
@@ -1985,14 +2030,14 @@ class Dumper(DumperBase):
         value = self.hexdecode(args['value'])
         simpleType = int(args['simpleType'])
         lhs = self.findValueByExpression(expr)
-        typeName = lhs.GetType().GetName()
-        typeName = typeName.replace('::', '__')
-        pos = typeName.find('<')
+        type_name = lhs.GetType().GetName()
+        type_name = type_name.replace('::', '__')
+        pos = type_name.find('<')
         if pos != -1:
-            typeName = typeName[0:pos]
-        if typeName in self.qqEditable and not simpleType:
+            type_name = type_name[0:pos]
+        if type_name in self.qqEditable and not simpleType:
             expr = self.parseAndEvaluate(expr)
-            self.qqEditable[typeName](self, expr, value)
+            self.qqEditable[type_name](self, expr, value)
         else:
             self.parseAndEvaluate(expr + '=' + value)
         self.reportResult(self.describeError(error), args)
@@ -2096,10 +2141,10 @@ class Tester(Dumper):
 
 if 'QT_CREATOR_LLDB_PROCESS' in os.environ:
     # Initialize Qt Creator dumper
-    try:
+    #try:
         theDumper = Dumper()
-    except Exception as error:
-        print('@\nstate="enginesetupfailed",error="{}"@\n'.format(error))
+    #except Exception as error:
+    #    print('@\nstate="enginesetupfailed",error="{}"@\n'.format(error))
 
 # ------------------------------ For use in LLDB ------------------------------
 
@@ -2305,9 +2350,6 @@ class SummaryProvider(LogMixin):
             if encoding in text_encodings:
                 try:
                     decodedValue = Dumper.hexdecode(summaryValue, encoding)
-                    # LLDB expects UTF-8 for python 2
-                    if sys.version_info[0] < 3:
-                        return "\"%s\"" % (decodedValue.encode('utf8'))
                     return '"' + decodedValue + '"'
                 except:
                     return "<failed to decode '%s' as '%s': %s>" % (summaryValue, encoding, sys.exc_info()[1])
diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py
index 06e7d473254..9f2f1354ce2 100644
--- a/share/qtcreator/debugger/qttypes.py
+++ b/share/qtcreator/debugger/qttypes.py
@@ -33,7 +33,8 @@ def qedit__QByteArray(d, value, data):
 
 
 def qdump__QByteArray(d, value):
-    if d.qtVersion() >= 0x60000:
+    d.qtVersionPing(value.typeid)
+    if d.qtVersionAtLeast(0x060000):
         dd, data, length = value.split('ppi')
         if dd:
             _, _, alloc = d.split('iii', dd)
@@ -76,7 +77,8 @@ def qdump__QByteArray(d, value):
 
 
 def qdump__QBitArray(d, value):
-    if d.qtVersion() >= 0x60000:
+    d.qtVersionPing(value.typeid)
+    if d.qtVersionAtLeast(0x060000):
         _, data, basize = value.split('ppi')
     else:
         data, basize, _ = d.qArrayData(value['d'])
@@ -221,24 +223,39 @@ def qdump__Qt__ItemDataRole(d, value):
 
 
 def qdump__QStandardItemData(d, value):
-    d.createType('@Qt::ItemDataRole') # warm up cache
+    #d.createType('@Qt::ItemDataRole') # warm up cache
     role, pad, val = value.split('{@Qt::ItemDataRole}@{@QVariant}')
     d.putPairContents(role.value(), (role, val), 'role', 'value')
 
 
 def qdump__QStandardItem(d, value):
-    d.createType('@QStandardItemData') # warm up cache
-    d.createType('@QStandardItem')
-    d.createType('@QStandardItem*')
+    #d.createType('@QStandardItemData') # warm up cache
+    #d.createType('@QStandardItem')
+    #d.createType('@QStandardItem*')
 
     vtable, dptr = value.split('pp')
-    if d.qtVersion() >= 0x060000:
-        model, parent, values, children, rows, cols, item = \
-            d.split('pp{@QList<@QStandardItemData>}{@QList<@QStandardItem *>}IIp', dptr)
+    if d.qtVersionAtLeast(0x060000):
+        if d.isCdb:
+            if d.isDebugBuild is None:
+                try:
+                    value["d_ptr"]
+                    d.isDebugBuild = True
+                except Exception:
+                    d.isDebugBuild = False
+            if d.isDebugBuild:
+                model = value["d_ptr"]["d"]["model"]
+                values = value["d_ptr"]["d"]["values"]
+                children = value["d_ptr"]["d"]["children"]
+            else:
+                model, parent, values, children, rows, cols, item = \
+                    d.split('pp{@QList<@QStandardItemData>}{@QList<@QStandardItem *>}IIp', dptr)
+        else:
+            model, parent, values, children, rows, cols, item = \
+                d.split('pp{@QList<@QStandardItemData>}{@QList<@QStandardItem *>}IIp', dptr)
     else:
         # There used to be a virtual destructor that got removed in
         # 88b6abcebf29b455438 on Apr 18 17:01:22 2017
-        if d.qtVersion() < 0x050900 and not d.isMsvcTarget():
+        if not d.qtVersionAtLeast(0x050900) and not d.isMsvcTarget():
             dptr += d.ptrSize();
         model, parent, values, children, rows, cols, item = \
             d.split('pp{@QVector<@QStandardItemData>}{@QVector<@QStandardItem *>}IIp', dptr)
@@ -247,7 +264,9 @@ def qdump__QStandardItem(d, value):
     d.putExpandable()
     if d.isExpanded():
         with Children(d):
-            d.putSubItem('[model]', d.createValue(model, '@QStandardItemModel'))
+            if isinstance(model, int):  # Used as address.
+                model = d.createValue(model, '@QStandardItemModel')
+            d.putSubItem('[model]', model)
             d.putSubItem('[values]', values)
             d.putSubItem('[children]', children)
 
@@ -266,7 +285,7 @@ def qdump__QDate(d, value):
                               d.enumExpression('DateFormat', 'TextDate'))
                 d.putCallItem('(ISO)', '@QString', value, 'toString',
                               d.enumExpression('DateFormat', 'ISODate'))
-                if d.qtVersion() < 0x060000:
+                if not d.qtVersionAtLeast(0x060000):
                     d.putCallItem('(SystemLocale)', '@QString', value, 'toString',
                                   d.enumExpression('DateFormat', 'SystemLocaleDate'))
                     d.putCallItem('(Locale)', '@QString', value, 'toString',
@@ -286,7 +305,7 @@ def qdump__QTime(d, value):
                           d.enumExpression('DateFormat', 'TextDate'))
             d.putCallItem('(ISO)', '@QString', value, 'toString',
                           d.enumExpression('DateFormat', 'ISODate'))
-            if d.canCallLocale() and d.qtVersion() < 0x060000:
+            if d.canCallLocale() and not d.qtVersionAtLeast(0x060000):
                 d.putCallItem('(SystemLocale)', '@QString', value, 'toString',
                               d.enumExpression('DateFormat', 'SystemLocaleDate'))
                 d.putCallItem('(Locale)', '@QString', value, 'toString',
@@ -305,13 +324,12 @@ def qdump__QTimeZone(d, value):
 
 
 def qdump__QDateTime(d, value):
-    qtVersion = d.qtVersion()
     isValid = False
     # This relies on the Qt4/Qt5 internal structure layout:
     # {sharedref(4), ...
     base = d.extractPointer(value)
     is32bit = d.ptrSize() == 4
-    if qtVersion >= 0x050200:
+    if d.qtVersionAtLeast(0x050200):
         tiVersion = d.qtTypeInfoVersion()
         #DumperBase.warn('TI VERSION: %s' % tiVersion)
         if tiVersion is None:
@@ -384,9 +402,9 @@ def qdump__QDateTime(d, value):
         # -     [QTime time;]
         # -      -  uint mds;
         # -  Spec spec;
-        dateSize = 8 if qtVersion >= 0x050000 else 4  # Qt5: qint64, Qt4 uint
+        dateSize = 8 if d.qtVersionAtLeast(0x050000) else 4  # Qt5: qint64, Qt4 uint
         # 4 byte padding after 4 byte QAtomicInt if we are on 64 bit and QDate is 64 bit
-        refPlusPadding = 8 if qtVersion >= 0x050000 and d.ptrSize() == 8 else 4
+        refPlusPadding = 8 if d.qtVersionAtLeast(0x050000) and d.ptrSize() == 8 else 4
         dateBase = base + refPlusPadding
         timeBase = dateBase + dateSize
         mds = d.extractInt(timeBase)
@@ -410,7 +428,7 @@ def qdump__QDateTime(d, value):
                               d.enumExpression('DateFormat', 'ISODate'))
                 d.putCallItem('toUTC', '@QDateTime', value, 'toTimeSpec',
                               d.enumExpression('TimeSpec', 'UTC'))
-                if d.qtVersion() < 0x060000:
+                if not d.qtVersionAtLeast(0x060000):
                     d.putCallItem('(SystemLocale)', '@QString', value, 'toString',
                                   d.enumExpression('DateFormat', 'SystemLocaleDate'))
                     d.putCallItem('(Locale)', '@QString', value, 'toString',
@@ -549,14 +567,11 @@ def qdump__QDir(d, value):
                 #d.putCallItem('absolutePath', '@QString', value, 'absolutePath')
                 #d.putCallItem('canonicalPath', '@QString', value, 'canonicalPath')
                 with SubItem(d, 'absolutePath'):
-                    typ = d.lookupType(ns + 'QString')
-                    d.putItem(d.createValue(privAddress + absoluteDirEntryOffset, typ))
+                    d.putItem(d.createValue(privAddress + absoluteDirEntryOffset, '@QString'))
                 with SubItem(d, 'entryInfoList'):
-                    typ = d.lookupType(ns + 'QFileInfo')
-                    qdumpHelper_QList(d, privAddress + fileInfosOffset, typ)
+                    qdumpHelper_QList(d, d.createValue(privAddress + fileInfosOffset, '@QList<@QFileInfo>'), '@QFileInfo')
                 with SubItem(d, 'entryList'):
-                    typ = d.lookupType(ns + 'QStringList')
-                    d.putItem(d.createValue(privAddress + filesOffset, typ))
+                    d.putItem(d.createValue(privAddress + filesOffset, '@QStringList'))
             d.putFields(value)
 
 
@@ -759,7 +774,6 @@ def qdump__QFile(d, value):
 def qdump__QFileInfo(d, value):
     privAddress = d.extractPointer(value)
     #bit32 = d.ptrSize() == 4
-    #qt5 = d.qtVersion() >= 0x050000
     #try:
     #    d.putStringValue(value['d_ptr']['d'].dereference()['fileNames'][3])
     #except:
@@ -879,7 +893,7 @@ def qdump__QVariantHash(d, value):
 
 
 def qdumpHelper_QHash(d, value, keyType, valueType):
-    if d.qtVersion() >= 0x60000:
+    if d.qtVersionAtLeast(0x060000):
         qdumpHelper_QHash_6(d, value, keyType, valueType)
     else:
         qdumpHelper_QHash_5(d, value, keyType, valueType)
@@ -921,7 +935,7 @@ def qdumpHelper_QHash_5(d, value, keyType, valueType):
 
     d.putItemCount(size)
     if d.isExpanded():
-        isShort = d.qtVersion() < 0x050000 and keyType.name == 'int'
+        isShort = not d.qtVersionAtLeast(0x050000) and keyType.name == 'int'
         with Children(d, size):
             node = hashDataFirstNode()
             for i in d.childRange():
@@ -997,7 +1011,7 @@ def qHashIteratorHelper(d, value):
     if d.isExpanded():
         with Children(d):
             node = d.extractPointer(value)
-            isShort = d.qtVersion() < 0x050000 and keyType.name == 'int'
+            isShort = not d.qtVersionAtLeast(0x050000) and keyType.name == 'int'
             if isShort:
                 typeCode = 'P{%s}@{%s}' % (keyType.name, valueType.name)
                 (pnext, key, padding2, val) = d.split(typeCode, node)
@@ -1018,9 +1032,8 @@ def qdump__QHash__iterator(d, value):
 
 def qdump__QHostAddress(d, value):
     dd = d.extractPointer(value)
-    qtVersion = d.qtVersion()
     tiVersion = d.qtTypeInfoVersion()
-    #DumperBase.warn('QT: %x, TI: %s' % (qtVersion, tiVersion))
+    #DumperBase.warn('QT: %x, TI: %s' % (d.qtVersion(), tiVersion))
     mayNeedParse = True
     if tiVersion is not None:
         if tiVersion >= 16:
@@ -1035,14 +1048,14 @@ def qdump__QHostAddress(d, value):
         else:
             (ipString, scopeId, a4, pad, a6, protocol, isParsed) \
                 = d.split('{@QString}{@QString}{@quint32}I16sI{bool}', dd)
-    elif qtVersion >= 0x050600:  # 5.6.0 at f3aabb42
+    elif d.qtVersionAtLeast(0x050600):  # 5.6.0 at f3aabb42
         if d.ptrSize() == 8 or d.isWindowsTarget():
             (ipString, scopeId, a4, pad, a6, protocol, isParsed) \
                 = d.split('{@QString}{@QString}{@quint32}I16sI{bool}', dd)
         else:
             (ipString, scopeId, a4, a6, protocol, isParsed) \
                 = d.split('{@QString}{@QString}{@quint32}16sI{bool}', dd)
-    elif qtVersion >= 0x050000:  # 5.2.0 at 62feb088
+    elif d.qtVersionAtLeast(0x050000):  # 5.2.0 at 62feb088
         (ipString, scopeId, a4, a6, protocol, isParsed) \
             = d.split('{@QString}{@QString}{@quint32}16sI{bool}', dd)
     else:  # 4.8.7 at b05d05f
@@ -1095,18 +1108,20 @@ def qform__QList():
 
 
 def qdump__QList(d, value):
-    return qdumpHelper_QList(d, value, d.createType(value.type[0]))
+    return qdumpHelper_QList(d, value, value.type[0])
 
 
 def qdump__QVariantList(d, value):
-    qdumpHelper_QList(d, value, d.createType('@QVariant'))
+    qdumpHelper_QList(d, value, '@QVariant')
 
 
-def qdumpHelper_QList(d, value, innerType):
+def qdumpHelper_QList(d, value, inner_typish):
+    innerType = d.createType(inner_typish)
     data, size = d.listData(value, check=True)
     d.putItemCount(size)
 
-    if d.qtVersion() >= 0x60000:
+    d.qtVersionPing(value.typeid)
+    if d.qtVersionAtLeast(0x060000):
         d.putPlotData(data, size, innerType)
         return
 
@@ -1147,9 +1162,9 @@ def qform__QImage():
 
 
 def qdump__QImage(d, value):
-    if d.qtVersion() >= 0x060000:
+    if d.qtVersionAtLeast(0x060000):
         vtbl, painters, image_data = value.split('ppp')
-    elif d.qtVersion() >= 0x050000:
+    elif d.qtVersionAtLeast(0x050000):
         vtbl, painters, reserved, image_data = value.split('pppp')
     else:
         vtbl, painters, image_data = value.split('ppp')
@@ -1163,12 +1178,12 @@ def qdump__QImage(d, value):
 
     d.putExpandable()
     if d.isExpanded():
-        if d.qtVersion() < 0x060000:
-            (ref, width, height, depth, nbytes, pad, devicePixelRatio, colorTable,
-                bits, iformat) = d.split('iiiii@dppi', image_data)
-        else:
+        if d.qtVersionAtLeast(0x060000):
             (ref, width, height, depth, nbytes, pad, devicePixelRatio, _, _, _,
                 bits, iformat) = d.split('iiiii@dppppi', image_data)
+        else:
+            (ref, width, height, depth, nbytes, pad, devicePixelRatio, colorTable,
+                bits, iformat) = d.split('iiiii@dppi', image_data)
         with Children(d):
             d.putIntItem('width', width)
             d.putIntItem('height', height)
@@ -1224,7 +1239,7 @@ def qdump__QLocale(d, value):
     #        index = int(value['d']['d']['m_data']...)
     #d.check(index >= 0)
     #d.check(index <= qqLocalesCount)
-    if d.qtVersion() < 0x50000:
+    if not d.qtVersionAtLeast(0x50000):
         d.putStringValue(d.call('const char *', value, 'name'))
         d.putPlainChildren(value)
         return
@@ -1238,14 +1253,20 @@ def qdump__QLocale(d, value):
         = d.split('2s{short}2s'
                   + '{@QChar}{@QChar}{short}{@QChar}{@QChar}'
                   + '{@QChar}{@QChar}{@QChar}', data)
+
+    prefix = ns + 'QLocale::'
     try:
-        d.putStringValue(d.call('const char *', value, 'name'))
+        if d.qtVersionAtLeast(0x060700):
+            res = d.call('const char *', value, 'name', prefix + 'TagSeparator::Underscore')
+        else:
+            res = d.call('const char *', value, 'name')
+        d.putStringValue(res)
     except:
         pass
+
     d.putExpandable()
     if d.isExpanded():
         with Children(d):
-            prefix = ns + 'QLocale::'
             d.putSubItem('country', d.createValue(countryId, prefix + 'Country'))
             d.putSubItem('language', d.createValue(languageId, prefix + 'Language'))
             d.putSubItem('numberOptions', d.createValue(numberOptions, prefix + 'NumberOptions'))
@@ -1342,9 +1363,9 @@ def qdump__QMap(d, value):
 
 
 def qdumpHelper_QMap(d, value, keyType, valueType):
-    if d.qtVersion() >= 0x60000:
+    if d.qtVersionAtLeast(0x060000):
         qdumpHelper_Qt6_QMap(d, value, keyType, valueType)
-    elif d.qtVersion() >= 0x50000:
+    elif d.qtVersionAtLeast(0x50000):
         qdumpHelper_Qt5_QMap(d, value, keyType, valueType)
     else:
         qdumpHelper_Qt4_QMap(d, value, keyType, valueType)
@@ -1364,7 +1385,7 @@ def qdumpHelper_Qt6_QMultiMap(d, value, keyType, valueType):
     d.putBetterType('@QMultiMap<%s, %s>' % (keyType.name, valueType.name))
 
 def qdump__QMultiMap(d, value):
-    if d.qtVersion() >= 0x60000:
+    if d.qtVersionAtLeast(0x060000):
         qdumpHelper_Qt6_QMultiMap(d, value, value.type[0], value.type[1])
     else:
         qdump__QMap(d, value)
@@ -1425,7 +1446,9 @@ if False:
             d.putSpecialValue('minimumitemcount', 0)
 
 
-def qdump__QPair(d, value):
+# FIXME: Qt 5
+# remvign the _xxxx makes GDB work with Qt 5 but breaks LLDB
+def qdump__QPair_xxxx(d, value):
     typeCode = '{%s}@{%s}' % (value.type[0].name, value.type[1].name)
     first, pad, second = value.split(typeCode)
     with Children(d):
@@ -1442,9 +1465,9 @@ def qdump__QProcEnvKey(d, value):
 
 
 def qdump__QPixmap(d, value):
-    if d.qtVersion() >= 0x060000:
+    if d.qtVersionAtLeast(0x060000):
         vtbl, painters, data = value.split('ppp')
-    elif d.qtVersion() >= 0x050000:
+    elif d.qtVersionAtLeast(0x050000):
         vtbl, painters, reserved, data = s = d.split('pppp', value)
     else:
         vtbl, painters, data = value.split('ppp')
@@ -1511,15 +1534,15 @@ def qdump__QRegion(d, value):
     if d_ptr == 0:
         d.putSpecialValue('empty')
     else:
-        if d.qtVersion() >= 0x060000:
+        if d.qtVersionAtLeast(0x060000):
             ref, _, rgn = d.split('i@p', d_ptr)
             numRects, innerArea, rects, extents, innerRect = \
                 d.split('ii{@QList<@QRect>}{@QRect}{@QRect}', rgn)
-        elif d.qtVersion() >= 0x050400:  # Padding removed in ee324e4ed
+        elif d.qtVersionAtLeast(0x050400):  # Padding removed in ee324e4ed
             ref, _, rgn = d.split('i@p', d_ptr)
             numRects, innerArea, rects, extents, innerRect = \
                 d.split('ii{@QVector<@QRect>}{@QRect}{@QRect}', rgn)
-        elif d.qtVersion() >= 0x050000:
+        elif d.qtVersionAtLeast(0x050000):
             ref, _, rgn = d.split('i@p', d_ptr)
             numRects, _, rects, extents, innerRect, innerArea = \
                 d.split('i@{@QVector<@QRect>}{@QRect}{@QRect}i', rgn)
@@ -1557,7 +1580,7 @@ def qdump__QScopedPointer(d, value):
 
 
 def qdump__QSet(d, value):
-    if d.qtVersion() >= 0x060000:
+    if d.qtVersionAtLeast(0x060000):
         qdumpHelper_QSet6(d, value)
     else:
         qdumpHelper_QSet45(d, value)
@@ -1630,7 +1653,7 @@ def qdumpHelper_QSet45(d, value):
     d.putItemCount(length)
     if d.isExpanded():
         keyType = value.type[0]
-        isShort = d.qtVersion() < 0x050000 and keyType.name == 'int'
+        isShort = not d.qtVersionAtLeast(0x050000) and keyType.name == 'int'
         with Children(d, length, childType=keyType):
             node = hashDataFirstNode()
             for i in d.childRange():
@@ -1707,7 +1730,7 @@ def qform__QStack():
 
 
 def qdump__QStack(d, value):
-    if d.qtVersion() >= 0x60000:
+    if d.qtVersionAtLeast(0x060000):
         qdump__QList(d, value)
     else:
         qdump__QVector(d, value)
@@ -1727,7 +1750,7 @@ def qdump__QPolygon(d, value):
 
 def qdump__QGraphicsPolygonItem(d, value):
     (vtbl, dptr) = value.split('pp')
-    if d.qtVersion() >= 0x060000:
+    if d.qtVersionAtLeast(0x060000):
         if d.ptrSize() == 8:
             offset = 424 # sizeof(QGraphicsPolygonItemPrivate), the base
         else:
@@ -1757,6 +1780,7 @@ def qform__QString():
 
 
 def qdump__QString(d, value):
+    d.qtVersionPing(value.typeid)
     d.putStringValue(value)
     data, length, _ = d.stringData(value)
     displayFormat = d.currentItemFormat()
@@ -1857,7 +1881,7 @@ def qdump__QStringRef(d, value):
 
 
 def qdump__QStringList(d, value):
-    qdumpHelper_QList(d, value, d.createType('@QString'))
+    qdumpHelper_QList(d, value, '@QString')
     d.putBetterType(value.type)
 
 
@@ -1917,7 +1941,7 @@ def qdump__QUrl(d, value):
         d.putValue('<invalid>')
         return
 
-    if d.qtVersion() < 0x050000:
+    if not d.qtVersionAtLeast(0x050000):
         d.call('void', value, 'port')  # Warm up internal cache.
         d.call('void', value, 'path')
         st = '{@QString}'
@@ -2147,7 +2171,8 @@ qdumpHelper_QVariants_F = [
 
 
 def qdump__QVariant(d, value):
-    if d.qtVersion() >= 0x060000:
+    d.qtVersionPing(value.typeid, 2 * d.ptrSize())
+    if d.qtVersionAtLeast(0x060000):
         qdumpHelper__QVariant6(d, value)
     else:
         qdumpHelper__QVariant45(d, value)
@@ -2201,12 +2226,12 @@ def qdumpHelper__QVariant45(d, value):
         return None
 
     # Extended Core type (Qt 5)
-    if variantType >= 31 and variantType <= 38 and d.qtVersion() >= 0x050000:
+    if variantType >= 31 and variantType <= 38 and d.qtVersionAtLeast(0x050000):
         qdumpHelper_QVariants_D[variantType - 31](d, value)
         return None
 
     # Extended Core type (Qt 4)
-    if variantType >= 128 and variantType <= 135 and d.qtVersion() < 0x050000:
+    if variantType >= 128 and variantType <= 135 and not d.qtVersionAtLeast(0x050000):
         if variantType == 128:
             d.putBetterType('@QVariant (void *)')
             d.putValue('0x%x' % value.extractPointer())
@@ -2227,7 +2252,7 @@ def qdumpHelper__QVariant45(d, value):
             innert = qdumpHelper_QVariants_B[variantType - 7]
         elif variantType <= 74:
             innert = qdumpHelper_QVariants_E[variantType - 64]
-        elif d.qtVersion() < 0x050000:
+        elif not d.qtVersionAtLeast(0x050000):
             innert = qdumpHelper_QVariants_F[variantType - 76]
         else:
             innert = qdumpHelper_QVariants_F[variantType - 75]
@@ -2301,29 +2326,30 @@ def qform__QVector():
 
 
 def qdump__QVector(d, value):
-    if d.qtVersion() >= 0x060000:
+    d.qtVersionPing(value.typeid)
+    if d.qtVersionAtLeast(0x060000):
         data, length = d.listData(value)
         d.putItemCount(length)
-        d.putPlotData(data, length, d.createType(value.type.ltarget[0]))
+        d.putPlotData(data, length, value.type.target()[0])
         # g++ 9.3 does not add the template parameter list to the debug info.
         # Fake it for the common case:
         if value.type.name == d.qtNamespace() + "QVector":
-            d.putBetterType(value.type.name + '<' + value.type.ltarget[0].name + '>')
+            d.putBetterType(value.type.name + '<' + value.type.target()[0].name + '>')
     else:
         data, length = d.vectorData(value)
         d.putItemCount(length)
-        d.putPlotData(data, length, d.createType(value.type[0]))
+        d.putPlotData(data, length, value.type[0])
 
 
 if False:
     def qdump__QObjectConnectionList(d, value):
         data, length = d.vectorData(value)
         d.putItemCount(length)
-        d.putPlotData(data, length, d.createType('@QObjectPrivate::ConnectionList'))
+        d.putPlotData(data, length, '@QObjectPrivate::ConnectionList')
 
 
 def qdump__QVarLengthArray(d, value):
-    if d.qtVersion() >= 0x060000:
+    if d.qtVersionAtLeast(0x060000):
         cap, length, data = value.split('QQp')
     else:
         cap, length, data = value.split('iip')
@@ -2359,7 +2385,7 @@ def qdump_QWeakPointerHelper(d, value, isWeak, innerType=None):
         d.putValue('<invalid>')
         return
 
-    if d.qtVersion() >= 0x050000:
+    if d.qtVersionAtLeast(0x050000):
         (weakref, strongref) = d.split('ii', d_ptr)
     else:
         (vptr, weakref, strongref) = d.split('pii', d_ptr)
@@ -2865,7 +2891,7 @@ def qdump__QJSValue(d, value):
     if d.ptrSize() == 4:
         qdump_32__QJSValue(d, value)
     else:
-        if d.qtVersion() >= 0x60000:
+        if d.qtVersionAtLeast(0x060000):
             qdump_64__QJSValue_6(d, value)
         else:
             qdump_64__QJSValue_5(d, value)
@@ -2899,7 +2925,7 @@ def qdump_64__QJSValue_6(d, value):
     if dd == 0:
         d.putValue('(undefined)')
         d.putType(value.type.name + ' (undefined)')
-    if d.qtVersion() < 0x60500:
+    if not d.qtVersionAtLeast(0x60500):
         typ = dd >> 47
         if typ == 5:
             d.putValue('(null)')
@@ -2913,15 +2939,13 @@ def qdump_64__QJSValue_6(d, value):
         elif typ > 7:
             val = d.Value(d)
             val.ldata = struct.pack('q', dd ^ 0xfffc000000000000)
-            val._type = d.createType('double')
-            d.putItem(val)
+            d.putItem(val.cast('double'))
             d.putType(value.type.name + ' (double)')
         elif typ <= 3: # Heap
             if dd & 1: # String
                 val = d.Value(d)
                 val.ldata = struct.pack('q', dd & ~1)
-                val._type = d.createType('@QString*')
-                d.putItem(val)
+                d.putItem(val.cast('@QString*'))
                 d.putType(value.type.name + ' (QString)')
             else:
                 # FIXME: Arrays, Objects missing.
@@ -2955,16 +2979,13 @@ def qdump_64__QJSValue_6(d, value):
             val = d.Value(d)
             val.ldata = struct.pack('q', pointer)
             if typ == 1:
-                val._type = d.createType('double*')
-                d.putItem(val)
+                d.putItem(val.cast('double*'))
                 d.putType(value.type.name + ' (double)')
             elif typ == 3:
-                val._type = d.createType('@QV4::Value*')
-                d.putItem(val)
+                d.putItem(val.cast('@QV4::Value*'))
                 d.putType(value.type.name + ' (QV4::Value)')
             elif typ == 5:
-                val._type = d.createType('@QString*')
-                d.putItem(val)
+                d.putItem(val.cast('@QString*'))
                 d.putType(value.type.name + ' (QString)')
 
         else:
@@ -3324,7 +3345,7 @@ def qdumpHelper_QJsonObject(d, data, obj):
 def qdump__QJsonValue(d, value):
     (data, dd, t) = value.split('QpI')
 
-    if d.qtVersion() >= 0x050f00:
+    if d.qtVersionAtLeast(0x050f00):
         value = d.createProxyValue((data, dd, t, False), 'QCborValue_proxy')
         d.putItem(value)
         return
@@ -3359,13 +3380,13 @@ def qdump__QJsonValue(d, value):
 
 
 def qdump__QJsonArray(d, value):
-    if d.qtVersion() >= 0x060000:
+    if d.qtVersionAtLeast(0x060000):
         dptr = d.extractPointer(value)
         if not dptr:
             d.putItemCount(0)
         else:
             qdumpHelper_QCbor_array(d, dptr, False)
-    elif d.qtVersion() >= 0x050f00:
+    elif d.qtVersionAtLeast(0x050f00):
         _, container_ptr = value.split('pp')
         qdumpHelper_QCbor_array(d, container_ptr, False)
     else:
@@ -3373,13 +3394,13 @@ def qdump__QJsonArray(d, value):
 
 
 def qdump__QJsonObject(d, value):
-    if d.qtVersion() >= 0x060000:
+    if d.qtVersionAtLeast(0x060000):
         dptr = d.extractPointer(value)
         if not dptr:
             d.putItemCount(0)
         else:
             qdumpHelper_QCbor_map(d, dptr, False)
-    elif d.qtVersion() >= 0x050f00:
+    elif d.qtVersionAtLeast(0x050f00):
         _, container_ptr = value.split('pp')
         qdumpHelper_QCbor_map(d, container_ptr, False)
     else:
@@ -3454,15 +3475,15 @@ def qdump__qfloat16(d, value):
 def qdumpHelper_QCbor_string(d, container_ptr, element_index, is_bytes):
     # d.split('i@{@QByteArray::size_type}pp', container_ptr) doesn't work with CDB,
     # so be explicit:
-    data_pos = container_ptr + (2 * d.ptrSize() if d.qtVersion() >= 0x060000 else 8)
-    elements_pos = data_pos + (3 * d.ptrSize() if d.qtVersion() >= 0x060000 else d.ptrSize())
+    data_pos = container_ptr + (2 * d.ptrSize() if d.qtVersionAtLeast(0x060000) else 8)
+    elements_pos = data_pos + (3 * d.ptrSize() if d.qtVersionAtLeast(0x060000) else d.ptrSize())
     elements_data_ptr, elements_size = d.vectorData(elements_pos)
     element_at_n_addr = elements_data_ptr + element_index * 16 # sizeof(QtCbor::Element) == 16
     element_value, _, element_flags = d.split('qII', element_at_n_addr)
     enc = 'latin1' if is_bytes or (element_flags & 8) else 'utf16'
     bytedata, _, _ = d.qArrayData(data_pos)
     bytedata += element_value
-    if d.qtVersion() >= 0x060000:
+    if d.qtVersionAtLeast(0x060000):
         bytedata_len = d.extractInt64(bytedata)
         bytedata_data = bytedata + 8
     else:
@@ -3491,8 +3512,8 @@ def qdumpHelper_QCbor_array(d, container_ptr, is_cbor):
         return
     # d.split('i@{@QByteArray::size_type}pp', container_ptr) doesn't work with CDB,
     # so be explicit:
-    data_pos = container_ptr + (2 * d.ptrSize() if d.qtVersion() >= 0x060000 else 8)
-    elements_pos = data_pos + (3 * d.ptrSize() if d.qtVersion() >= 0x060000 else d.ptrSize())
+    data_pos = container_ptr + (2 * d.ptrSize() if d.qtVersionAtLeast(0x060000) else 8)
+    elements_pos = data_pos + (3 * d.ptrSize() if d.qtVersionAtLeast(0x060000) else d.ptrSize())
     elements_data_ptr, elements_size = d.vectorData(elements_pos)
     d.putItemCount(elements_size)
     if d.isExpanded():
@@ -3513,8 +3534,8 @@ def qdumpHelper_QCbor_map(d, container_ptr, is_cbor):
         return
     # d.split('i@{@QByteArray::size_type}pp', container_ptr) doesn't work with CDB,
     # so be explicit:
-    data_pos = container_ptr + (2 * d.ptrSize() if d.qtVersion() >= 0x060000 else 8)
-    elements_pos = data_pos + (3 * d.ptrSize() if d.qtVersion() >= 0x060000 else d.ptrSize())
+    data_pos = container_ptr + (2 * d.ptrSize() if d.qtVersionAtLeast(0x060000) else 8)
+    elements_pos = data_pos + (3 * d.ptrSize() if d.qtVersionAtLeast(0x060000) else d.ptrSize())
     elements_data_ptr, elements_size = d.vectorData(elements_pos)
     elements_size = int(elements_size / 2)
     d.putItemCount(elements_size)
@@ -3538,7 +3559,7 @@ def qdump__QCborValue(d, value):
     d.putPlainChildren(value)
 
 def qdump__QCborValue_proxy(d, value):
-    item_data, container_ptr, item_type, is_cbor = value.data()
+    item_data, container_ptr, item_type, is_cbor = value.ldata
 
     def typename(key, is_cbor):
         if is_cbor:
diff --git a/share/qtcreator/debugger/stdtypes.py b/share/qtcreator/debugger/stdtypes.py
index bc4bb84dcbb..dbe663ef631 100644
--- a/share/qtcreator/debugger/stdtypes.py
+++ b/share/qtcreator/debugger/stdtypes.py
@@ -909,7 +909,7 @@ def qedit__std__vector(d, value, data):
     values = data.split(',')
     n = len(values)
     innerType = value.type[0].name
-    cmd = "set $d = (%s*)calloc(sizeof(%s)*%s,1)" % (innerType, innerType, n)
+    cmd = "set $d = (%s*)calloc(%s,sizeof(%s))" % (innerType, n, innerType)
     gdb.execute(cmd)
     cmd = "set {void*[3]}%s = {$d, $d+%s, $d+%s}" % (value.address(), n, n)
     gdb.execute(cmd)
diff --git a/share/qtcreator/debugger/visualize.py b/share/qtcreator/debugger/visualize.py
new file mode 100644
index 00000000000..578d3bb7050
--- /dev/null
+++ b/share/qtcreator/debugger/visualize.py
@@ -0,0 +1,86 @@
+# Copyright(C) 2006-2008, David Allouche, Jp Calderone, Itamar Shtull-Trauring
+# Copyright(C) 2006-2017, Johan Dahlin
+# Copyright(C) 2008, Olivier Grisel <olivier.grisel@ensta.org>
+# Copyright(C) 2008, David Glick
+# Copyright(C) 2013, Steven Maude
+# Copyright(C) 2013-2018, Peter Waller <p@pwaller.net>
+# Copyright(C) 2013, Lukas Graf <lukas.graf@4teamwork.ch>
+# Copyright(C) 2013, Jamie Wong <http://jamie-wong.com>
+# Copyright(C) 2013, Yury V. Zaytsev <yury@shurup.com>
+# Copyright(C) 2014, Michael Droettboom <mdroe@stsci.edu>
+# Copyright(C) 2015, Zev Benjamin <zev@mit.edu>
+# Copyright(C) 2018, Jon Dufresne <jon.dufresne@gmail.com>
+#
+# All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+""" This is a stripped down and modified version of pyprof2calltree """
+
+def profile_visualize(entries):
+    import cProfile
+    import io
+    import subprocess
+    import tempfile
+    from collections import defaultdict
+
+    def add_code_by_position(code):
+        filename, _, name = cProfile.label(code)
+        code_by_position[(filename, name)].add(code)
+
+    def munged_function_name(code):
+        filename, firstlineno, name = cProfile.label(code)
+        if len(code_by_position[(filename, name)]) == 1:
+            return name
+        return "%s:%d" % (name, firstlineno)
+
+    code_by_position = defaultdict(set)
+    for entry in entries:
+        add_code_by_position(entry.code)
+        if entry.calls:
+            for subentry in entry.calls:
+                add_code_by_position(subentry.code)
+
+    fd, outfile = tempfile.mkstemp("-qtc-debugger-profile.txt")
+    with io.open(fd, "w") as out:
+        scale = 1e9
+
+        out.write('event: ns : Nanoseconds\n')
+        out.write('events: ns\n')
+
+        for entry in entries:
+            code = entry.code
+
+            filename, firstlineno, name = cProfile.label(code)
+            munged_name = munged_function_name(code)
+
+            out.write('fl=%s\nfn=%s\n' % (filename, munged_name))
+            out.write('%d %d\n' % (firstlineno, int(entry.inlinetime * scale)))
+
+            if entry.calls:
+                for subentry in entry.calls:
+                    filename, firstlineno, name = cProfile.label(subentry.code)
+                    munged_name = munged_function_name(subentry.code)
+                    out.write('cfl=%s\ncfn=%s\n' % (filename, munged_name))
+                    out.write('calls=%d %d\n' % (subentry.callcount, firstlineno))
+                    out.write('%d %d\n' % (firstlineno, int(subentry.totaltime * scale)))
+            out.write('\n')
+
+    subprocess.Popen(["kcachegrind", outfile])
+
diff --git a/share/qtcreator/jsonschemas/project.json b/share/qtcreator/jsonschemas/project.json
new file mode 100644
index 00000000000..df55dbd693a
--- /dev/null
+++ b/share/qtcreator/jsonschemas/project.json
@@ -0,0 +1,57 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "title": "Qt Creator workspace project definition",
+    "description": "A Qt Creator workspace project definition",
+    "type": "object",
+    "properties": {
+        "project.name": {
+            "type": "string",
+            "description": "The name of the project"
+        },
+        "files.exclude": {
+            "type": "array",
+            "items": [
+                {
+                    "type": "string"
+                }
+            ],
+            "description": "Files to exclude from the project"
+        },
+        "targets": {
+            "type": "array",
+            "description": "A list of targets",
+            "items": [
+                {
+                    "type": "object",
+                    "properties": {
+                        "arguments": {
+                            "type": "array",
+                            "items": [
+                                {
+                                    "type": "string"
+                                }
+                            ],
+                            "description": "Arguments to pass to the executable"
+                        },
+                        "executable": {
+                            "type": "string",
+                            "description": "The executable to run"
+                        },
+                        "name": {
+                            "type": "string",
+                            "description": "The name of the target"
+                        },
+                        "workingDirectory": {
+                            "type": "string",
+                            "description": "The working directory to run the executable in"
+                        }
+                    },
+                    "required": [
+                        "executable",
+                        "name"
+                    ]
+                }
+            ]
+        }
+    }
+}
diff --git a/share/qtcreator/lua-plugins/luals/init.lua b/share/qtcreator/lua-plugins/luals/init.lua
new file mode 100644
index 00000000000..e7bc13629cc
--- /dev/null
+++ b/share/qtcreator/lua-plugins/luals/init.lua
@@ -0,0 +1,235 @@
+-- Copyright (C) 2024 The Qt Company Ltd.
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+local LSP = require('LSP')
+local mm = require('MessageManager')
+local Utils = require('Utils')
+local S = require('Settings')
+local Gui = require('Gui')
+local a = require('async')
+local fetch = require('Fetch').fetch
+local Install = require('Install')
+
+Settings = {}
+
+local function createCommand()
+  local cmd = { Settings.binary.expandedValue:nativePath() }
+  if Settings.showNode.value then
+    table.insert(cmd, '--shownode=true')
+  end
+  if Settings.showSource.value then
+    table.insert(cmd, '--showsource=true')
+  end
+  if Settings.developMode.value then
+    table.insert(cmd, '--develop=true')
+  end
+
+  return cmd
+end
+local function filter(tbl, callback)
+  for i = #tbl, 1, -1 do
+    if not callback(tbl[i]) then
+      table.remove(tbl, i)
+    end
+  end
+end
+
+local function installOrUpdateServer()
+  local data = a.wait(fetch({
+    url = "https://qtccache.qt.io/LuaLanguageServer/LatestRelease",
+    convertToTable = true
+  }))
+
+  if type(data) == "table" and #data > 0 then
+    local r = data[1]
+    local lspPkgInfo = Install.packageInfo("lua-language-server")
+    if not lspPkgInfo or lspPkgInfo.version ~= r.tag_name then
+      local osTr = { mac = "darwin", windows = "win32", linux = "linux" }
+      local archTr = { unknown = "", x86 = "ia32", x86_64 = "x64", itanium = "", arm = "", arm64 = "arm64" }
+      local os = osTr[Utils.HostOsInfo.os]
+      local arch = archTr[Utils.HostOsInfo.architecture]
+
+      local expectedFileName = "lua-language-server-" .. r.tag_name .. "-" .. os .. "-" .. arch
+
+      filter(r.assets, function(asset)
+        return string.find(asset.name, expectedFileName, 1, true) == 1
+      end)
+
+      if #r.assets == 0 then
+        print("No assets found for this platform")
+        return
+      end
+      local res, err = a.wait(Install.install(
+        "Do you want to install the lua-language-server?", {
+        name = "lua-language-server",
+        url = r.assets[1].browser_download_url,
+        version = r.tag_name
+      }))
+
+      if not res then
+        mm.writeFlashing("Failed to install lua-language-server: " .. err)
+        return
+      end
+
+      lspPkgInfo = Install.packageInfo("lua-language-server")
+      print("Installed:", lspPkgInfo.name, "version:", lspPkgInfo.version, "at", lspPkgInfo.path)
+    end
+
+    local binary = "bin/lua-language-server"
+    if Utils.HostOsInfo.isWindowsHost() then
+      binary = "bin/lua-language-server.exe"
+    end
+
+    Settings.binary:setValue(lspPkgInfo.path:resolvePath(binary))
+    Settings:apply()
+    return
+  end
+
+  if type(data) == "string" then
+    print("Failed to fetch:", data)
+  else
+    print("No lua-language-server release found.")
+  end
+end
+IsTryingToInstall = false
+
+local function setupClient()
+  Client = LSP.Client.create({
+    name = 'Lua Language Server',
+    cmd = createCommand,
+    transport = 'stdio',
+    languageFilter = {
+      patterns = { '*.lua' },
+      mimeTypes = { 'text/x-lua' }
+    },
+    settings = Settings,
+    startBehavior = "RequiresFile",
+    onStartFailed = function()
+      a.sync(function()
+        if IsTryingToInstall == true then
+          mm.writeFlashing("RECURSION!");
+          return
+        end
+        IsTryingToInstall = true
+        installOrUpdateServer()
+        IsTryingToInstall = false
+      end)()
+    end
+  })
+
+  Client.on_instance_start = function()
+    print("Instance has started")
+  end
+
+  Client:registerMessage("$/status/report", function(params)
+    mm.writeFlashing(params.params.text .. ": " .. params.params.tooltip);
+  end)
+end
+
+local function using(tbl)
+  local result = _G
+  for k, v in pairs(tbl) do result[k] = v end
+  return result
+end
+local function layoutSettings()
+  --- "using namespace Gui"
+  local _ENV = using(Gui)
+
+  local layout = Form {
+    Settings.binary, br,
+    Settings.developMode, br,
+    Settings.showSource, br,
+    Settings.showNode, br,
+      Row {
+        PushButton {
+        text = "Update Lua Language Server",
+          onClicked = function() a.sync(installOrUpdateServer)() end,
+        },
+        st
+    }
+  }
+  return layout
+end
+
+local function binaryFromPkg()
+  local lspPkgInfo = Install.packageInfo("lua-language-server")
+  if lspPkgInfo then
+    local binary = "bin/lua-language-server"
+    if Utils.HostOsInfo.isWindowsHost() then
+      binary = "bin/lua-language-server.exe"
+    end
+    local binaryPath = lspPkgInfo.path:resolvePath(binary)
+    if binaryPath:isExecutableFile() == true then
+      return binaryPath
+    end
+  end
+
+  return nil
+end
+
+local function findBinary()
+  local binary = binaryFromPkg()
+  if binary then
+    return binary
+  end
+
+  -- Search for the binary in the PATH
+  local serverPath = Utils.FilePath.fromUserInput("lua-language-server")
+  local absolute = a.wait(serverPath:searchInPath()):resolveSymlinks()
+  if absolute:isExecutableFile() == true then
+    return absolute
+  end
+  return serverPath
+end
+
+local function setupAspect()
+  ---@class Settings: AspectContainer
+  Settings = S.AspectContainer.create({
+    autoApply = false,
+    layouter = layoutSettings,
+  });
+
+  Settings.binary = S.FilePathAspect.create({
+    settingsKey = "LuaCopilot.Binary",
+    displayName = "Binary",
+    labelText = "Binary:",
+    toolTip = "The path to the lua-language-server binary.",
+    expectedKind = S.Kind.ExistingCommand,
+    defaultPath = findBinary(),
+  })
+
+  Settings.developMode = S.BoolAspect.create({
+    settingsKey = "LuaCopilot.DevelopMode",
+    displayName = "Enable Develop Mode",
+    labelText = "Enable Develop Mode:",
+    toolTip = "Turns on the develop mode of the language server.",
+    defaultValue = false,
+    labelPlacement = S.LabelPlacement.InExtraLabel,
+  })
+
+  Settings.showSource = S.BoolAspect.create({
+    settingsKey = "LuaCopilot.ShowSource",
+    displayName = "Show Source",
+    labelText = "Show Source:",
+    toolTip = "Display the internal data of the hovering token.",
+    defaultValue = false,
+    labelPlacement = S.LabelPlacement.InExtraLabel,
+  })
+
+  Settings.showNode = S.BoolAspect.create({
+    settingsKey = "LuaCopilot.ShowNode",
+    displayName = "Show Node",
+    labelText = "Show Node:",
+    toolTip = "Display the internal data of the hovering token.",
+    defaultValue = false,
+    labelPlacement = S.LabelPlacement.InExtraLabel,
+  })
+  return Settings
+end
+local function setup(parameters)
+  setupAspect()
+  setupClient()
+end
+
+return {
+  setup = function() a.sync(setup)() end,
+}
diff --git a/share/qtcreator/lua-plugins/luals/luals.lua b/share/qtcreator/lua-plugins/luals/luals.lua
new file mode 100644
index 00000000000..5a68388dd06
--- /dev/null
+++ b/share/qtcreator/lua-plugins/luals/luals.lua
@@ -0,0 +1,23 @@
+-- Copyright (C) 2024 The Qt Company Ltd.
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+return {
+    Name = "LuaLanguageServer",
+    Version = "1.0.0",
+    CompatVersion = "1.0.0",
+    Vendor = "The Qt Company",
+    Category = "Language Client",
+    Description = "The Lua Language Server",
+    Experimental = false,
+    DisabledByDefault = false,
+    LongDescription = [[
+This plugin provides the Lua Language Server.
+It will try to install it if it is not found.
+    ]],
+    Dependencies = {
+        { Name = "Lua",               Version = "14.0.0" },
+        { Name = "LuaLanguageClient", Version = "14.0.0" }
+    },
+    setup = function()
+        require 'init'.setup()
+    end,
+} --[[@as QtcPlugin]]
diff --git a/share/qtcreator/lua-plugins/luatests/INSPECT-LICENSE.txt b/share/qtcreator/lua-plugins/luatests/INSPECT-LICENSE.txt
new file mode 100644
index 00000000000..6149bd7823f
--- /dev/null
+++ b/share/qtcreator/lua-plugins/luatests/INSPECT-LICENSE.txt
@@ -0,0 +1,22 @@
+MIT LICENSE
+
+Copyright (c) 2022 Enrique García Cota
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/share/qtcreator/lua-plugins/luatests/guidemo.lua b/share/qtcreator/lua-plugins/luatests/guidemo.lua
new file mode 100644
index 00000000000..2771529f87a
--- /dev/null
+++ b/share/qtcreator/lua-plugins/luatests/guidemo.lua
@@ -0,0 +1,23 @@
+-- Copyright (C) 2024 The Qt Company Ltd.
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+local Utils = require("Utils")
+local Gui = require("Gui")
+
+local function using(tbl)
+    local result = _G
+    for k, v in pairs(tbl) do result[k] = v end
+    return result
+end
+
+local function show()
+    --- "using namespace Gui"
+    local _ENV = using(Gui)
+
+    Widget {
+        size = { 400, 300 },
+        Row { "Hello World!" },
+    }:show()
+end
+
+return show
diff --git a/share/qtcreator/lua-plugins/luatests/inspect.lua b/share/qtcreator/lua-plugins/luatests/inspect.lua
new file mode 100644
index 00000000000..9900a0b81b9
--- /dev/null
+++ b/share/qtcreator/lua-plugins/luatests/inspect.lua
@@ -0,0 +1,371 @@
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local math = _tl_compat and _tl_compat.math or math; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table
+local inspect = {Options = {}, }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+inspect._VERSION = 'inspect.lua 3.1.0'
+inspect._URL = 'http://github.com/kikito/inspect.lua'
+inspect._DESCRIPTION = 'human-readable representations of tables'
+inspect._LICENSE = [[
+  MIT LICENSE
+
+  Copyright (c) 2022 Enrique García Cota
+
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+]]
+inspect.KEY = setmetatable({}, { __tostring = function() return 'inspect.KEY' end })
+inspect.METATABLE = setmetatable({}, { __tostring = function() return 'inspect.METATABLE' end })
+
+local tostring = tostring
+local rep = string.rep
+local match = string.match
+local char = string.char
+local gsub = string.gsub
+local fmt = string.format
+
+local _rawget
+if rawget then
+   _rawget = rawget
+else
+   _rawget = function(t, k) return t[k] end
+end
+
+local function rawpairs(t)
+   return next, t, nil
+end
+
+
+
+local function smartQuote(str)
+   if match(str, '"') and not match(str, "'") then
+      return "'" .. str .. "'"
+   end
+   return '"' .. gsub(str, '"', '\\"') .. '"'
+end
+
+
+local shortControlCharEscapes = {
+   ["\a"] = "\\a", ["\b"] = "\\b", ["\f"] = "\\f", ["\n"] = "\\n",
+   ["\r"] = "\\r", ["\t"] = "\\t", ["\v"] = "\\v", ["\127"] = "\\127",
+}
+local longControlCharEscapes = { ["\127"] = "\127" }
+for i = 0, 31 do
+   local ch = char(i)
+   if not shortControlCharEscapes[ch] then
+      shortControlCharEscapes[ch] = "\\" .. i
+      longControlCharEscapes[ch] = fmt("\\%03d", i)
+   end
+end
+
+local function escape(str)
+   return (gsub(gsub(gsub(str, "\\", "\\\\"),
+   "(%c)%f[0-9]", longControlCharEscapes),
+   "%c", shortControlCharEscapes))
+end
+
+local luaKeywords = {
+   ['and'] = true,
+   ['break'] = true,
+   ['do'] = true,
+   ['else'] = true,
+   ['elseif'] = true,
+   ['end'] = true,
+   ['false'] = true,
+   ['for'] = true,
+   ['function'] = true,
+   ['goto'] = true,
+   ['if'] = true,
+   ['in'] = true,
+   ['local'] = true,
+   ['nil'] = true,
+   ['not'] = true,
+   ['or'] = true,
+   ['repeat'] = true,
+   ['return'] = true,
+   ['then'] = true,
+   ['true'] = true,
+   ['until'] = true,
+   ['while'] = true,
+}
+
+local function isIdentifier(str)
+   return type(str) == "string" and
+   not not str:match("^[_%a][_%a%d]*$") and
+   not luaKeywords[str]
+end
+
+local flr = math.floor
+local function isSequenceKey(k, sequenceLength)
+   return type(k) == "number" and
+   flr(k) == k and
+   1 <= (k) and
+   k <= sequenceLength
+end
+
+local defaultTypeOrders = {
+   ['number'] = 1, ['boolean'] = 2, ['string'] = 3, ['table'] = 4,
+   ['function'] = 5, ['userdata'] = 6, ['thread'] = 7,
+}
+
+local function sortKeys(a, b)
+   local ta, tb = type(a), type(b)
+
+
+   if ta == tb and (ta == 'string' or ta == 'number') then
+      return (a) < (b)
+   end
+
+   local dta = defaultTypeOrders[ta] or 100
+   local dtb = defaultTypeOrders[tb] or 100
+
+
+   return dta == dtb and ta < tb or dta < dtb
+end
+
+local function getKeys(t)
+
+   local seqLen = 1
+   while _rawget(t, seqLen) ~= nil do
+      seqLen = seqLen + 1
+   end
+   seqLen = seqLen - 1
+
+   local keys, keysLen = {}, 0
+   for k in rawpairs(t) do
+      if not isSequenceKey(k, seqLen) then
+         keysLen = keysLen + 1
+         keys[keysLen] = k
+      end
+   end
+   table.sort(keys, sortKeys)
+   return keys, keysLen, seqLen
+end
+
+local function countCycles(x, cycles)
+   if type(x) == "table" then
+      if cycles[x] then
+         cycles[x] = cycles[x] + 1
+      else
+         cycles[x] = 1
+         for k, v in rawpairs(x) do
+            countCycles(k, cycles)
+            countCycles(v, cycles)
+         end
+         countCycles(getmetatable(x), cycles)
+      end
+   end
+end
+
+local function makePath(path, a, b)
+   local newPath = {}
+   local len = #path
+   for i = 1, len do newPath[i] = path[i] end
+
+   newPath[len + 1] = a
+   newPath[len + 2] = b
+
+   return newPath
+end
+
+
+local function processRecursive(process,
+   item,
+   path,
+   visited)
+   if item == nil then return nil end
+   if visited[item] then return visited[item] end
+
+   local processed = process(item, path)
+   if type(processed) == "table" then
+      local processedCopy = {}
+      visited[item] = processedCopy
+      local processedKey
+
+      for k, v in rawpairs(processed) do
+         processedKey = processRecursive(process, k, makePath(path, k, inspect.KEY), visited)
+         if processedKey ~= nil then
+            processedCopy[processedKey] = processRecursive(process, v, makePath(path, processedKey), visited)
+         end
+      end
+
+      local mt = processRecursive(process, getmetatable(processed), makePath(path, inspect.METATABLE), visited)
+      if type(mt) ~= 'table' then mt = nil end
+      setmetatable(processedCopy, mt)
+      processed = processedCopy
+   end
+   return processed
+end
+
+local function puts(buf, str)
+   buf.n = buf.n + 1
+   buf[buf.n] = str
+end
+
+
+
+local Inspector = {}
+
+
+
+
+
+
+
+
+
+
+local Inspector_mt = { __index = Inspector }
+
+local function tabify(inspector)
+   puts(inspector.buf, inspector.newline .. rep(inspector.indent, inspector.level))
+end
+
+function Inspector:getId(v)
+   local id = self.ids[v]
+   local ids = self.ids
+   if not id then
+      local tv = type(v)
+      id = (ids[tv] or 0) + 1
+      ids[v], ids[tv] = id, id
+   end
+   return tostring(id)
+end
+
+function Inspector:putValue(v)
+   local buf = self.buf
+   local tv = type(v)
+   if tv == 'string' then
+      puts(buf, smartQuote(escape(v)))
+   elseif tv == 'number' or tv == 'boolean' or tv == 'nil' or
+      tv == 'cdata' or tv == 'ctype' then
+      puts(buf, tostring(v))
+   elseif tv == 'table' and not self.ids[v] then
+      local t = v
+
+      if t == inspect.KEY or t == inspect.METATABLE then
+         puts(buf, tostring(t))
+      elseif self.level >= self.depth then
+         puts(buf, '{...}')
+      else
+         if self.cycles[t] > 1 then puts(buf, fmt('<%d>', self:getId(t))) end
+
+         local keys, keysLen, seqLen = getKeys(t)
+
+         puts(buf, '{')
+         self.level = self.level + 1
+
+         for i = 1, seqLen + keysLen do
+            if i > 1 then puts(buf, ',') end
+            if i <= seqLen then
+               puts(buf, ' ')
+               self:putValue(t[i])
+            else
+               local k = keys[i - seqLen]
+               tabify(self)
+               if isIdentifier(k) then
+                  puts(buf, k)
+               else
+                  puts(buf, "[")
+                  self:putValue(k)
+                  puts(buf, "]")
+               end
+               puts(buf, ' = ')
+               self:putValue(t[k])
+            end
+         end
+
+         local mt = getmetatable(t)
+         if type(mt) == 'table' then
+            if seqLen + keysLen > 0 then puts(buf, ',') end
+            tabify(self)
+            puts(buf, '<metatable> = ')
+            self:putValue(mt)
+         end
+
+         self.level = self.level - 1
+
+         if keysLen > 0 or type(mt) == 'table' then
+            tabify(self)
+         elseif seqLen > 0 then
+            puts(buf, ' ')
+         end
+
+         puts(buf, '}')
+      end
+
+   else
+      puts(buf, fmt('<%s %d>', tv, self:getId(v)))
+   end
+end
+
+
+
+
+function inspect.inspect(root, options)
+   options = options or {}
+
+   local depth = options.depth or (math.huge)
+   local newline = options.newline or '\n'
+   local indent = options.indent or '  '
+   local process = options.process
+
+   if process then
+      root = processRecursive(process, root, {}, {})
+   end
+
+   local cycles = {}
+   countCycles(root, cycles)
+
+   local inspector = setmetatable({
+      buf = { n = 0 },
+      ids = {},
+      cycles = cycles,
+      depth = depth,
+      level = 0,
+      newline = newline,
+      indent = indent,
+   }, Inspector_mt)
+
+   inspector:putValue(root)
+
+   return table.concat(inspector.buf)
+end
+
+setmetatable(inspect, {
+   __call = function(_, root, options)
+      return inspect.inspect(root, options)
+   end,
+})
+
+return inspect
diff --git a/share/qtcreator/lua-plugins/luatests/luatests.lua b/share/qtcreator/lua-plugins/luatests/luatests.lua
new file mode 100644
index 00000000000..e85f0d95278
--- /dev/null
+++ b/share/qtcreator/lua-plugins/luatests/luatests.lua
@@ -0,0 +1,20 @@
+-- Copyright (C) 2024 The Qt Company Ltd.
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+return {
+    Name = "LuaTests",
+    Version = "1.0.0",
+    CompatVersion = "1.0.0",
+    Vendor = "The Qt Company",
+    Category = "Tests",
+    DisabledByDefault = true,
+    Experimental = true,
+    Description = "This plugin tests the Lua API.",
+    LongDescription = [[
+        It has tests for (almost) all functionality exposed by the API.
+    ]],
+    Dependencies = {
+        { Name = "Lua",  Version = "14.0.0" }
+    },
+    setup = function() require 'tests'.setup() end,
+    printToOutputPane = true,
+} --[[@as QtcPlugin]]
diff --git a/share/qtcreator/lua-plugins/luatests/qtctest.lua b/share/qtcreator/lua-plugins/luatests/qtctest.lua
new file mode 100644
index 00000000000..3914979d554
--- /dev/null
+++ b/share/qtcreator/lua-plugins/luatests/qtctest.lua
@@ -0,0 +1,32 @@
+-- Copyright (C) 2024 The Qt Company Ltd.
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+local inspect = require('inspect')
+
+local function traceback()
+    local result = ""
+    local level = 1
+    while true do
+        local info = debug.getinfo(level, "Sl")
+        if not info then break end
+        if info.what ~= "C" then
+            ---Get the last part of the path in info.source
+            local fileName = info.source:match("^.+/(.+)$")
+            result = result .. (string.format("  %s:%d\n", fileName, info.currentline))
+        end
+        level = level + 1
+    end
+    return result
+end
+
+local function compare(actual, expected)
+    if (actual == expected) then
+        return true
+    end
+
+    error("Compared values were not the same.\n  Actual: " ..
+        inspect(actual) .. "\n  Expected: " .. inspect(expected) .. "\nTrace:\n" .. traceback())
+end
+
+return {
+    compare = compare,
+}
diff --git a/share/qtcreator/lua-plugins/luatests/tests.lua b/share/qtcreator/lua-plugins/luatests/tests.lua
new file mode 100644
index 00000000000..213aff47ebf
--- /dev/null
+++ b/share/qtcreator/lua-plugins/luatests/tests.lua
@@ -0,0 +1,82 @@
+-- Copyright (C) 2024 The Qt Company Ltd.
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+local Utils = require("Utils")
+local Action = require("Action")
+local a = require("async")
+
+
+local function script_path()
+    local str = debug.getinfo(2, "S").source:sub(2)
+    return str
+end
+
+local function printResults(results)
+    print("Passed:", results.passed)
+    print("Failed:", results.failed)
+    for index, value in ipairs(results.failedTests) do
+        print("Failed test:", value.name, value.error)
+    end
+end
+
+local function runTest(testFile, results)
+    local testScript, err = loadfile(testFile:nativePath())
+    if not testScript then
+        print("Failed to load test:", testFile, err)
+        return
+    end
+
+    local ok, testFunctions = pcall(testScript)
+    if not ok then
+        print("Failed to run test:", testFile, testFunctions)
+        return
+    end
+
+    for k, v in pairs(testFunctions) do
+        print("* " .. testFile:fileName() .. " : " .. k)
+        local ok, res_or_error = pcall(v)
+
+        if ok then
+            results.passed = results.passed + 1
+        else
+            results.failed = results.failed + 1
+            table.insert(results.failedTests, { name = testFile:fileName() .. ":" .. k, error = res_or_error })
+        end
+    end
+end
+
+local function runTests()
+    local results = {
+        passed = 0,
+        failed = 0,
+        failedTests = {}
+    }
+
+    local testDir = Utils.FilePath.fromUserInput(script_path()):parentDir()
+    local tests = a.wait(testDir:dirEntries({ nameFilters = { "tst_*.lua" } }))
+    for _, testFile in ipairs(tests) do
+        runTest(testFile, results)
+    end
+    printResults(results)
+end
+
+local function setup()
+    Action.create("LuaTests.run", {
+        text = "Run lua tests",
+        onTrigger = function() a.sync(runTests)() end,
+    })
+    Action.create("LuaTests.layoutDemo", {
+        text = "Lua Layout Demo",
+        onTrigger = function()
+            local script, err = loadfile(Utils.FilePath.fromUserInput(script_path()):parentDir():resolvePath(
+            "guidemo.lua"):nativePath())
+            if not script then
+                print("Failed to load demo:", err)
+                return
+            end
+
+            script()()
+        end,
+    })
+end
+
+return { setup = setup }
diff --git a/share/qtcreator/lua-plugins/luatests/tst_aspectcontainer.lua b/share/qtcreator/lua-plugins/luatests/tst_aspectcontainer.lua
new file mode 100644
index 00000000000..f948583e1c1
--- /dev/null
+++ b/share/qtcreator/lua-plugins/luatests/tst_aspectcontainer.lua
@@ -0,0 +1,32 @@
+-- Copyright (C) 2024 The Qt Company Ltd.
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+T = require("qtctest")
+local S = require('Settings')
+
+local function testAutoApply()
+    local container = S.AspectContainer.create({ autoApply = true })
+
+    container.test = S.BoolAspect.create({ defaultValue = true })
+    T.compare(container.test.value, true)
+    container.test.volatileValue = false
+    T.compare(container.test.volatileValue, false)
+    T.compare(container.test.value, false)
+end
+
+local function testNoAutoApply()
+    local container = S.AspectContainer.create({ autoApply = false })
+
+    container.test = S.BoolAspect.create({ defaultValue = true })
+    T.compare(container.test.value, true)
+    container.test.volatileValue = false
+    T.compare(container.test.volatileValue, false)
+    T.compare(container.test.value, true)
+    container:apply()
+    T.compare(container.test.volatileValue, false)
+    T.compare(container.test.value, false)
+end
+
+return {
+    testAutoApply = testAutoApply,
+    testNoAutoApply = testNoAutoApply,
+}
diff --git a/share/qtcreator/lua-plugins/luatests/tst_fetch.lua b/share/qtcreator/lua-plugins/luatests/tst_fetch.lua
new file mode 100644
index 00000000000..55a8d1773b4
--- /dev/null
+++ b/share/qtcreator/lua-plugins/luatests/tst_fetch.lua
@@ -0,0 +1,38 @@
+-- Copyright (C) 2024 The Qt Company Ltd.
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+local T = require("qtctest")
+local fetch = require("Fetch").fetch
+local inspect = require('inspect')
+local a = require("async")
+local string = require("string")
+
+local function testFetch()
+    local r = a.wait(fetch({ url = "https://dummyjson.com/products", convertToTable = true }))
+    local y = a.wait(fetch({ url = "https://dummyjson.com/products", convertToTable = true }))
+    T.compare(type(r), "table")
+    T.compare(type(y), "table")
+end
+
+local function testGoogle()
+    local r = a.wait(fetch({ url = "https://www.google.com" }))
+    T.compare(r.error, 0)
+    print(r)
+end
+
+local function fetchTwo()
+    local r = a.wait_all {
+        fetch({ url = "https://dummyjson.com/products", convertToTable = true }),
+        fetch({ url = "https://www.google.com" }),
+    }
+
+    T.compare(type(r), "table")
+    T.compare(#r, 2)
+    T.compare(type(r[1]), "table")
+    T.compare(r[2].error, 0)
+end
+
+return {
+    testFetch = testFetch,
+    testGoogle = testGoogle,
+    testFetchTwo = fetchTwo
+}
diff --git a/share/qtcreator/lua-plugins/luatests/tst_utils.lua b/share/qtcreator/lua-plugins/luatests/tst_utils.lua
new file mode 100644
index 00000000000..940f6ff7e97
--- /dev/null
+++ b/share/qtcreator/lua-plugins/luatests/tst_utils.lua
@@ -0,0 +1,34 @@
+-- Copyright (C) 2024 The Qt Company Ltd.
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+local T = require("qtctest")
+local a = require('async')
+local Utils = require('Utils')
+local Qt = require('Qt')
+
+local function testDirEntries()
+    local u = require("Utils")
+    local d = u.FilePath.currentWorkingPath()
+    print("CWD:", d)
+    local result = a.wait(d:dirEntries({}))
+    print("RESULT:", result, #result)
+end
+
+local function testSearchInPath()
+    local u = require("Utils")
+    local d = u.FilePath.fromUserInput('hostname')
+    local result = a.wait(d:searchInPath())
+    print("Hostname found at:", result)
+end
+
+local function testWaitMs()
+    local u = require("Utils")
+    print("Starting to wait ...")
+    a.wait(u.waitms(1000))
+    print("About a second should have elapsed now.")
+end
+
+return {
+    testDirEntries = testDirEntries,
+    testSearchInPath = testSearchInPath,
+    testWaitMs = testWaitMs,
+}
diff --git a/share/qtcreator/lua-plugins/rustls/init.lua b/share/qtcreator/lua-plugins/rustls/init.lua
new file mode 100644
index 00000000000..fcfd4954fef
--- /dev/null
+++ b/share/qtcreator/lua-plugins/rustls/init.lua
@@ -0,0 +1,196 @@
+-- Copyright (C) 2024 The Qt Company Ltd.
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+local LSP = require('LSP')
+local mm = require('MessageManager')
+local Utils = require('Utils')
+local Process = require('Process')
+local S = require('Settings')
+local Gui = require('Gui')
+local a = require('async')
+local fetch = require('Fetch').fetch
+local Install = require('Install')
+
+Settings = {}
+
+local function createCommand()
+  local cmd = { Settings.binary.expandedValue:nativePath() }
+  return cmd
+end
+
+local function filter(tbl, callback)
+  for i = #tbl, 1, -1 do
+    if not callback(tbl[i]) then
+      table.remove(tbl, i)
+    end
+  end
+end
+
+local function installOrUpdateServer()
+  local data = a.wait(fetch({
+    url = "https://qtccache.qt.io/RustLanguageServer/LatestReleases",
+    convertToTable = true,
+  }))
+
+  if type(data) == "table" and #data > 1 then
+    local r = data[1]
+    if r.prerelease then
+      r = data[2]
+    end
+    local lspPkgInfo = Install.packageInfo("rust-analyzer")
+    if not lspPkgInfo or lspPkgInfo.version ~= r.tag_name then
+      local osTr = { mac = "apple-darwin", windows = "pc-windows-msvc", linux = "unknown-linux-gnu" }
+      local archTr = { unknown = "", x86 = "", x86_64 = "x86_64", itanium = "", arm = "", arm64 = "aarch64" }
+      local extTr = { mac = "gz", windows = "zip", linux = "gz" }
+      local os = osTr[Utils.HostOsInfo.os]
+      local arch = archTr[Utils.HostOsInfo.architecture]
+      local ext = extTr[Utils.HostOsInfo.os]
+
+      local expectedFileName = "rust-analyzer-" .. arch .. "-" .. os .. "." .. ext
+
+      filter(r.assets, function(asset)
+        return string.find(asset.name, expectedFileName, 1, true) == 1
+      end)
+
+      if #r.assets == 0 then
+        print("No assets found for this platform")
+        return
+      end
+      local res, err = a.wait(Install.install(
+        "Do you want to install the rust-analyzer?", {
+        name = "rust-analyzer",
+        url = r.assets[1].browser_download_url,
+        version = r.tag_name
+      }))
+
+      if not res then
+        mm.writeFlashing("Failed to install rust-analyzer: " .. err)
+        return
+      end
+
+      lspPkgInfo = Install.packageInfo("rust-analyzer")
+      print("Installed:", lspPkgInfo.name, "version:", lspPkgInfo.version, "at", lspPkgInfo.path)
+    end
+
+    local binary = "rust-analyzer"
+    if Utils.HostOsInfo.isWindowsHost() then
+      binary = "rust-analyzer.exe"
+    end
+
+    Settings.binary:setValue(lspPkgInfo.path:resolvePath(binary))
+    Settings:apply()
+    return
+  end
+
+  if type(data) == "string" then
+    print("Failed to fetch:", data)
+  else
+    print("No rust-analyzer release found.")
+  end
+end
+IsTryingToInstall = false
+
+local function setupClient()
+  Client = LSP.Client.create({
+    name = 'Rust Language Server',
+    cmd = createCommand,
+    transport = 'stdio',
+    languageFilter = {
+      patterns = { '*.rs' },
+      mimeTypes = { 'text/rust' }
+    },
+    settings = Settings,
+    startBehavior = "RequiresProject",
+    onStartFailed = function()
+      a.sync(function()
+        if IsTryingToInstall == true then
+          return
+        end
+        IsTryingToInstall = true
+        installOrUpdateServer()
+        IsTryingToInstall = false
+      end)()
+    end
+  })
+end
+
+local function using(tbl)
+  local result = _G
+  for k, v in pairs(tbl) do result[k] = v end
+  return result
+end
+local function layoutSettings()
+  --- "using namespace Gui"
+  local _ENV = using(Gui)
+
+  local layout = Form {
+    Settings.binary, br,
+    Row {
+      PushButton {
+        text = "Try to install Rust language server",
+        onClicked = function() a.sync(installOrUpdateServer)() end,
+        br,
+      },
+      st
+    }
+  }
+
+  return layout
+end
+
+local function binaryFromPkg()
+  local lspPkgInfo = Install.packageInfo("rust-analyzer")
+  if lspPkgInfo then
+    local binary = "rust-analyzer"
+    if Utils.HostOsInfo.isWindowsHost() then
+      binary = "rust-analyzer.exe"
+    end
+    local binaryPath = lspPkgInfo.path:resolvePath(binary)
+    if binaryPath:isExecutableFile() == true then
+      return binaryPath
+    end
+  end
+
+  return nil
+end
+
+local function findBinary()
+  local binary = binaryFromPkg()
+  if binary then
+    return binary
+  end
+
+  -- Search for the binary in the PATH
+  local serverPath = Utils.FilePath.fromUserInput("rust-analyzer")
+  local absolute = a.wait(serverPath:searchInPath()):resolveSymlinks()
+  if absolute:isExecutableFile() == true then
+    return absolute
+  end
+  return serverPath
+end
+local function setupAspect()
+  ---@class Settings: AspectContainer
+  Settings = S.AspectContainer.create({
+    autoApply = false,
+    layouter = layoutSettings,
+  });
+
+  Settings.binary = S.FilePathAspect.create({
+    settingsKey = "Rustls.Binary",
+    displayName = "Binary",
+    labelText = "Binary:",
+    toolTip = "The path to the rust analyzer binary.",
+    expectedKind = S.Kind.ExistingCommand,
+    defaultPath = findBinary(),
+  })
+
+  return Settings
+end
+
+local function setup(parameters)
+  setupAspect()
+  setupClient()
+end
+
+return {
+  setup = function() a.sync(setup)() end,
+}
diff --git a/share/qtcreator/lua-plugins/rustls/rustls.lua b/share/qtcreator/lua-plugins/rustls/rustls.lua
new file mode 100644
index 00000000000..7e0056de25f
--- /dev/null
+++ b/share/qtcreator/lua-plugins/rustls/rustls.lua
@@ -0,0 +1,23 @@
+-- Copyright (C) 2024 The Qt Company Ltd.
+-- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+return {
+    Name = "RustLanguageServer",
+    Version = "1.0.0",
+    CompatVersion = "1.0.0",
+    Vendor = "The Qt Company",
+    Category = "Language Client",
+    Description = "The Rust Language Server",
+    Experimental = false,
+    DisabledByDefault = false,
+    LongDescription = [[
+This plugin provides the Rust Language Server.
+It will try to install it if it is not found.
+    ]],
+    Dependencies = {
+        { Name = "Lua",               Version = "14.0.0" },
+        { Name = "LuaLanguageClient", Version = "14.0.0" }
+    },
+    setup = function()
+        require 'init'.setup()
+    end,
+} --[[@as QtcPlugin]]
diff --git a/share/qtcreator/lua-plugins/tellajoke/tellajoke.lua b/share/qtcreator/lua-plugins/tellajoke/tellajoke.lua
new file mode 100644
index 00000000000..58d07e0b178
--- /dev/null
+++ b/share/qtcreator/lua-plugins/tellajoke/tellajoke.lua
@@ -0,0 +1,56 @@
+--- Copyright (C) 2024 The Qt Company Ltd.
+--- SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+local function fetchJoke()
+    print("Fetching ...")
+
+    local a = require("async")
+    local fetch = require("Fetch").fetch
+    local utils = require("Utils")
+    local mm = require("MessageManager")
+
+    local r = a.wait(fetch({ url = "https://official-joke-api.appspot.com/random_joke", convertToTable = true }))
+    if (type(r) == "table") then
+        mm.writeDisrupting(r.setup)
+        a.wait(utils.waitms(1000))
+        mm.writeSilently(".")
+        a.wait(utils.waitms(1000))
+        mm.writeSilently(".")
+        a.wait(utils.waitms(1000))
+        mm.writeSilently(".")
+        a.wait(utils.waitms(1000))
+        mm.writeDisrupting(r.punchline)
+    else
+        print("echo Error fetching: " .. r)
+    end
+end
+
+local function fetchJokeSafe()
+    local ok, err = pcall(fetchJoke)
+    if not ok then
+        print("echo Error fetching: " .. err)
+    end
+end
+
+local function setup()
+    local a = require("async")
+    Action = require("Action")
+    Action.create("Simple.joke", {
+        text = "Tell a joke",
+        onTrigger = function() a.sync(fetchJokeSafe)() end,
+        defaultKeySequences = { "Meta+Ctrl+Shift+J", "Ctrl+Shift+Alt+J" },
+    })
+end
+
+return {
+    Name = "Tell A Joke",
+    Version = "1.0.0",
+    CompatVersion = "1.0.0",
+    Vendor = "The Qt Company",
+    Category = "Fun",
+    Description = "This plugin adds an action that tells a joke.",
+    Dependencies = {
+        { Name = "Lua", Version = "14.0.0" },
+    },
+    setup = setup,
+} --[[@as QtcPlugin]]
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml
index f88defbff56..1b626623ead 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml
@@ -33,7 +33,7 @@ Section {
 
         PropertyLabel {
             text: qsTr("Smooth")
-            tooltip: qsTr("Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items. ")
+            tooltip: qsTr("Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items.")
             blockedByTemplate: !backendValues.smooth.isAvailable
         }
 
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/qmldir b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/qmldir
old mode 100755
new mode 100644
diff --git a/share/qtcreator/templates/wizards/autotest/files/tst.txt b/share/qtcreator/templates/wizards/autotest/files/tst.txt
index f0eeb813392..18653bdc32c 100644
--- a/share/qtcreator/templates/wizards/autotest/files/tst.txt
+++ b/share/qtcreator/templates/wizards/autotest/files/tst.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 
 project(%{TestCaseName} LANGUAGES CXX)
 
diff --git a/share/qtcreator/templates/wizards/codesnippet/CMakeLists.txt b/share/qtcreator/templates/wizards/codesnippet/CMakeLists.txt
index 0e923c87945..b411048ef28 100644
--- a/share/qtcreator/templates/wizards/codesnippet/CMakeLists.txt
+++ b/share/qtcreator/templates/wizards/codesnippet/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 
 project(%{ProjectName} VERSION 0.1 LANGUAGES CXX)
 
diff --git a/share/qtcreator/templates/wizards/files/form/wizard.json b/share/qtcreator/templates/wizards/files/form/wizard.json
index ec5fd422a36..d0d826b6c6d 100644
--- a/share/qtcreator/templates/wizards/files/form/wizard.json
+++ b/share/qtcreator/templates/wizards/files/form/wizard.json
@@ -3,8 +3,8 @@
     "supportedProjectTypes": [ ],
     "id": "D.Form",
     "category": "R.Qt",
-    "trDescription": "Creates a Qt Designer form that you can add to a Qt Widget Project. This is useful if you already have an existing class for the UI business logic.",
-    "trDisplayName": "Qt Designer Form",
+    "trDescription": "Creates a Qt Widgets Designer form that you can add to a Qt Widget Project. This is useful if you already have an existing class for the UI business logic.",
+    "trDisplayName": "Qt Widgets Designer Form",
     "trDisplayCategory": "Qt",
     "iconText": "ui",
     "enabled": "%{JS: value('Plugins').indexOf('Designer') >= 0}",
diff --git a/share/qtcreator/templates/wizards/projects/consoleapp/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/consoleapp/CMakeLists.txt
index a6f956127dd..d548d199a3c 100644
--- a/share/qtcreator/templates/wizards/projects/consoleapp/CMakeLists.txt
+++ b/share/qtcreator/templates/wizards/projects/consoleapp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.16)
 
 project(%{ProjectName} LANGUAGES CXX)
 
diff --git a/share/qtcreator/templates/wizards/projects/consoleapp/main.cpp b/share/qtcreator/templates/wizards/projects/consoleapp/main.cpp
index 3609b36c4e1..356f567b8c3 100644
--- a/share/qtcreator/templates/wizards/projects/consoleapp/main.cpp
+++ b/share/qtcreator/templates/wizards/projects/consoleapp/main.cpp
@@ -22,5 +22,16 @@ int main(int argc, char *argv[])
     }
 @endif
 
+    // Set up code that uses the Qt event loop here.
+    // Call a.quit() or a.exit() to quit the application.
+    // A not very useful example would be including
+    // #include <QTimer>
+    // near the top of the file and calling
+    // QTimer::singleShot(5000, &a, &QCoreApplication::quit);
+    // which quits the application after 5 seconds.
+
+    // If you do not need a running Qt event loop, remove the call
+    // to a.exec() or use the Non-Qt Plain C++ Application template.
+
     return a.exec();
 }
diff --git a/share/qtcreator/templates/wizards/projects/cpplibrary/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/cpplibrary/CMakeLists.txt
index 4391af9678c..ef67bd5f7ad 100644
--- a/share/qtcreator/templates/wizards/projects/cpplibrary/CMakeLists.txt
+++ b/share/qtcreator/templates/wizards/projects/cpplibrary/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.16)
 
 project(%{ProjectName} LANGUAGES CXX)
 
diff --git a/share/qtcreator/templates/wizards/projects/plainc/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/plainc/CMakeLists.txt
index 1a0a570e66f..bc89ded9d0b 100644
--- a/share/qtcreator/templates/wizards/projects/plainc/CMakeLists.txt
+++ b/share/qtcreator/templates/wizards/projects/plainc/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 
 project(%{ProjectName} LANGUAGES C)
 
diff --git a/share/qtcreator/templates/wizards/projects/plaincpp/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/plaincpp/CMakeLists.txt
index df5ef8a5cce..e8ba55ff43d 100644
--- a/share/qtcreator/templates/wizards/projects/plaincpp/CMakeLists.txt
+++ b/share/qtcreator/templates/wizards/projects/plaincpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 
 project(%{ProjectName} LANGUAGES CXX)
 
diff --git a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/widget/wizard.json b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/widget/wizard.json
index c52c05c12cb..6d3f968c1bf 100644
--- a/share/qtcreator/templates/wizards/projects/qtforpythonapplication/widget/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtforpythonapplication/widget/wizard.json
@@ -3,7 +3,7 @@
     "supportedProjectTypes": [ "PythonProject" ],
     "id": "F.QtForPythonApplicationWindowWidget",
     "category": "F.ApplicationPySide",
-    "trDescription": "Creates a Qt for Python application that includes a Qt Designer-based widget (ui file). Requires .ui to Python conversion.",
+    "trDescription": "Creates a Qt for Python application that includes a Qt Widgets Designer-based widget (ui file). Requires .ui to Python conversion.",
     "trDisplayName": "Window UI",
     "trDisplayCategory": "Application (Qt for Python)",
     "icon": "../icons/icon.png",
diff --git a/share/qtcreator/templates/wizards/projects/qtquick2-extension/wizard.json b/share/qtcreator/templates/wizards/projects/qtquick2-extension/wizard.json
index 0164a9f3d57..d12edc4576d 100644
--- a/share/qtcreator/templates/wizards/projects/qtquick2-extension/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquick2-extension/wizard.json
@@ -23,8 +23,8 @@
         { "key": "ObjectHdr", "value": "%{JS: Cpp.classToFileName(value('ObjectName'), Util.preferredSuffix('text/x-c++hdr'))}" },
         { "key": "ObjectQml", "value": "%{JS: Util.fileName(value('ObjectName') + 'Controls', 'qml')}" },
         { "key": "PluginName", "value": "%{JS: value('ProjectName').charAt(0).toUpperCase() + value('ProjectName').slice(1) + 'Plugin' }" },
-        { "key": "PLUGINGUARD", "value": "%{JS: Cpp.classToHeaderGuard(value('PluginBaseFileName'), Util.preferredSuffix('text/x-c++hdr'))}" },
-        { "key": "OBJECTGUARD", "value": "%{JS: Cpp.classToHeaderGuard(value('ObjectName'), Util.preferredSuffix('text/x-c++hdr'))}" },
+        { "key": "PLUGINGUARD", "value": "%{JS: Cpp.headerGuard(value('PluginHdr'))}" },
+        { "key": "OBJECTGUARD", "value": "%{JS: Cpp.headerGuard(value('ObjectHdr'))}" },
         { "key": "IsQt6", "value": "%{JS: value('QtVersion').IsQt6}" },
         { "key": "QtQuickVersion", "value": "%{JS: value('QtVersion').QtQuickVersion}" },
         { "key": "QtQuickFeature", "value": "%{JS: (value('QtQuickVersion')=='') ? 'QtSupport.Wizards.FeatureQt.6.2' : 'QtSupport.Wizards.FeatureQtQuick.%{QtQuickVersion}'}" },
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json
index 2e885c2bb63..a41ee12e516 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json
@@ -87,7 +87,7 @@
                             { "trKey": "Qt 6.4", "value": "6.4" },
                             { "trKey": "Qt 6.5", "value": "6.5" }
                         ],
-                        "index": 1
+                        "index": 2
                     }
                 }
             ]
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication_compat/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/qtquickapplication_compat/CMakeLists.txt
index b7afb831a77..de5e6850c23 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication_compat/CMakeLists.txt
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication_compat/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.16)
 
 project(%{ProjectName} VERSION 0.1 LANGUAGES CXX)
 
diff --git a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt
index 9d854899c36..d2ca81d463b 100644
--- a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt
+++ b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 
 project(%{ProjectName} VERSION 0.1 LANGUAGES CXX)
 
diff --git a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/wizard.json
index 098cb4f0ec0..48791e4fd87 100644
--- a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/wizard.json
@@ -3,7 +3,7 @@
     "supportedProjectTypes": [ "MesonProjectManager.MesonProject","CMakeProjectManager.CMakeProject", "Qt4ProjectManager.Qt4Project", "Qbs.QbsProject" ],
     "id": "C.QtWidgets",
     "category": "D.ApplicationQt",
-    "trDescription": "Creates a widget-based Qt application that contains a Qt Designer-based main window and C++ source and header files to implement the application logic.\n\nPreselects a desktop Qt for building the application if available.",
+    "trDescription": "Creates a widget-based Qt application that contains a Qt Widgets Designer-based main window and C++ source and header files to implement the application logic.\n\nPreselects a desktop Qt for building the application if available.",
     "trDisplayName": "Qt Widgets Application",
     "trDisplayCategory": "Application (Qt)",
     "icon": "../../global/guiapplication.png",
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/CMakeLists.txt b/share/qtcreator/templates/wizards/qtcreatorplugin/CMakeLists.txt
index be6f16a3fb6..283ebad166a 100644
--- a/share/qtcreator/templates/wizards/qtcreatorplugin/CMakeLists.txt
+++ b/share/qtcreator/templates/wizards/qtcreatorplugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.16)
 
 # Remove when sharing with others.
 @if %{JS: Util.isDirectory('%{QtCreatorBuild}/Qt Creator.app/Contents/Resources')}
@@ -16,11 +16,12 @@ project(%{PluginName})
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 find_package(QtCreator REQUIRED COMPONENTS Core)
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
-set(QtX Qt${QT_VERSION_MAJOR})
+find_package(Qt6 COMPONENTS Widgets REQUIRED)
 
 # Add a CMake option that enables building your plugin with tests.
 # You don't want your released plugin binaries to contain tests,
@@ -30,7 +31,7 @@ option(WITH_TESTS "Builds with tests" NO)
 
 if(WITH_TESTS)
   # Look for QtTest
-  find_package(${QtX} REQUIRED COMPONENTS Test)
+  find_package(Qt6 REQUIRED COMPONENTS Test)
 
   # Tell CMake functions like add_qtc_plugin about the QtTest component.
   set(IMPLICIT_DEPENDS Qt::Test)
@@ -43,7 +44,7 @@ add_qtc_plugin(%{PluginName}
   PLUGIN_DEPENDS
     QtCreator::Core
   DEPENDS
-    ${QtX}::Widgets
+    Qt::Widgets
     QtCreator::ExtensionSystem
     QtCreator::Utils
   SOURCES
@@ -51,8 +52,6 @@ add_qtc_plugin(%{PluginName}
     .github/workflows/README.md
     README.md
     %{SrcFileName}
-    %{HdrFileName}
-    %{GlobalHdrFileName}
     %{ConstantsHdrFileName}
     %{TrHdrFileName}
 )
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflows_build_cmake.yml b/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflows_build_cmake.yml
index d69cbfae59a..d5e53f033b5 100644
--- a/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflows_build_cmake.yml
+++ b/share/qtcreator/templates/wizards/qtcreatorplugin/github_workflows_build_cmake.yml
@@ -7,13 +7,16 @@ env:
   QT_VERSION: %{JS: Util.qtVersion()}
   QT_CREATOR_VERSION: %{JS: Util.qtCreatorVersion()}
   QT_CREATOR_SNAPSHOT: NO
-  CMAKE_VERSION: 3.21.1
-  NINJA_VERSION: 1.10.1
+  MACOS_DEPLOYMENT_TARGET: "11.0"
+  CMAKE_VERSION: "3.29.6"
+  NINJA_VERSION: "1.12.1"
 
 jobs:
   build:
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}
+    outputs:
+        tag: ${{ steps.git.outputs.tag }}
     strategy:
       matrix:
         config:
@@ -29,13 +32,22 @@ jobs:
             cc: "gcc", cxx: "g++"
           }
         - {
-            name: "macOS Latest Clang", artifact: "macOS-x64",
+            name: "macOS Latest Clang", artifact: "macOS-universal",
             os: macos-latest,
             cc: "clang", cxx: "clang++"
           }
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+    - name: Checkout submodules
+      id: git
+      shell: cmake -P {0}
+      run: |
+        if (${{github.ref}} MATCHES "tags/v(.*)")
+            file(APPEND "$ENV{GITHUB_OUTPUT}" "tag=${CMAKE_MATCH_1}\\n")
+        else()
+            file(APPEND "$ENV{GITHUB_OUTPUT}" "tag=${{github.run_id}}\\n")
+        endif()
 
     - name: Download Ninja and CMake
       shell: cmake -P {0}
@@ -107,17 +119,21 @@ jobs:
           set(url_os "windows_x86")
           set(qt_package_arch_suffix "win64_msvc2019_64")
           set(qt_dir_prefix "${qt_version}/msvc2019_64")
-          set(qt_package_suffix "-Windows-Windows_10_21H2-MSVC2019-Windows-Windows_10_21H2-X86_64")
+          set(qt_package_suffix "-Windows-Windows_10_22H2-MSVC2019-Windows-Windows_10_22H2-X86_64")
         elseif ("${{ runner.os }}" STREQUAL "Linux")
           set(url_os "linux_x64")
-          set(qt_package_arch_suffix "gcc_64")
+          if (qt_version VERSION_LESS "6.7.0")
+            set(qt_package_arch_suffix "gcc_64")
+          else()
+            set(qt_package_arch_suffix "linux_gcc_64")
+          endif()
           set(qt_dir_prefix "${qt_version}/gcc_64")
-          set(qt_package_suffix "-Linux-RHEL_8_4-GCC-Linux-RHEL_8_4-X86_64")
+          set(qt_package_suffix "-Linux-RHEL_8_8-GCC-Linux-RHEL_8_8-X86_64")
         elseif ("${{ runner.os }}" STREQUAL "macOS")
           set(url_os "mac_x64")
           set(qt_package_arch_suffix "clang_64")
           set(qt_dir_prefix "${qt_version}/macos")
-          set(qt_package_suffix "-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64")
+          set(qt_package_suffix "-MacOS-MacOS_13-Clang-MacOS-MacOS_13-X86_64-ARM64")
         endif()
 
         set(qt_base_url "https://download.qt.io/online/qtsdkrepository/${url_os}/desktop/qt6_${qt_version_dotless}")
@@ -154,10 +170,15 @@ jobs:
           )
         endforeach()
 
-        # uic depends on libicu56.so
+        # uic depends on libicu*.so
         if ("${{ runner.os }}" STREQUAL "Linux")
+          if (qt_version VERSION_LESS "6.7.0")
+            set(uic_suffix "Rhel7.2-x64")
+          else()
+            set(uic_suffix "Rhel8.6-x86_64")
+          endif()
           downloadAndExtract(
-            "${qt_base_url}/qt.qt6.${qt_version_dotless}.${qt_package_arch_suffix}/${qt_package_version}icu-linux-Rhel7.2-x64.7z"
+            "${qt_base_url}/qt.qt6.${qt_version_dotless}.${qt_package_arch_suffix}/${qt_package_version}icu-linux-${uic_suffix}.7z"
             icu.7z
           )
         endif()
@@ -202,7 +223,7 @@ jobs:
       run: |
         set(ENV{CC} ${{ matrix.config.cc }})
         set(ENV{CXX} ${{ matrix.config.cxx }})
-        set(ENV{MACOSX_DEPLOYMENT_TARGET} "10.13")
+        set(ENV{MACOSX_DEPLOYMENT_TARGET} "${{ env.MACOS_DEPLOYMENT_TARGET }}")
 
         if ("${{ runner.os }}" STREQUAL "Windows" AND NOT "x${{ matrix.config.environment_script }}" STREQUAL "x")
           execute_process(
@@ -218,6 +239,9 @@ jobs:
         endif()
 
         set(ENV{NINJA_STATUS} "[%f/%t %o/sec] ")
+        if ("${{ runner.os }}" STREQUAL "macOS")
+            set(ENV{CMAKE_OSX_ARCHITECTURES} "x86_64;arm64")
+        endif()
 
         set(build_plugin_py "scripts/build_plugin.py")
         foreach(dir "share/qtcreator/scripts" "Qt Creator.app/Contents/Resources/scripts" "Contents/Resources/scripts")
@@ -246,8 +270,8 @@ jobs:
           message(FATAL_ERROR "Build failed")
         endif()
 
-    - uses: actions/upload-artifact@v3
-      id: upload_artifact
+    - name: Upload
+      uses: actions/upload-artifact@v4
       with:
         path: ./${{ env.PLUGIN_NAME }}-${{ env.QT_CREATOR_VERSION }}-${{ matrix.config.artifact }}.7z
         name: ${{ env.PLUGIN_NAME}}-${{ env.QT_CREATOR_VERSION }}-${{ matrix.config.artifact }}.7z
@@ -258,72 +282,23 @@ jobs:
     needs: build
 
     steps:
+    - name: Download artifacts
+      uses: actions/download-artifact@v4
+      with:
+        path: release-with-dirs
+
+    - name: Fixup artifacts
+      run: |
+        mkdir release
+        mv release-with-dirs/*/* release/
+
     - name: Create Release
       id: create_release
-      uses: actions/create-release@v1
+      uses: softprops/action-gh-release@v2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        tag_name: ${{ github.ref }}
-        release_name: Release ${{ github.ref }}
+        tag_name: v${{ needs.build.outputs.tag }}
+        files: release/*
         draft: false
         prerelease: false
-
-    - name: Store Release url
-      run: |
-        echo "${{ steps.create_release.outputs.upload_url }}" > ./upload_url
-
-    - uses: actions/upload-artifact@v3
-      with:
-        path: ./upload_url
-        name: upload_url
-
-  publish:
-    if: contains(github.ref, 'tags/v')
-
-    name: ${{ matrix.config.name }}
-    runs-on: ${{ matrix.config.os }}
-    strategy:
-      matrix:
-        config:
-        - {
-            name: "Windows Latest x64", artifact: "Windows-x64.7z",
-            os: ubuntu-latest
-          }
-        - {
-            name: "Linux Latest x64", artifact: "Linux-x64.7z",
-            os: ubuntu-latest
-          }
-        - {
-            name: "macOS Latest x64", artifact: "macOS-x64.7z",
-            os: macos-latest
-          }
-    needs: release
-
-    steps:
-    - name: Download artifact
-      uses: actions/download-artifact@v3
-      with:
-        name: ${{ env.PLUGIN_NAME }}-${{ env.QT_CREATOR_VERSION }}-${{ matrix.config.artifact }}
-        path: ./
-
-    - name: Download URL
-      uses: actions/download-artifact@v3
-      with:
-        name: upload_url
-        path: ./
-    - id: set_upload_url
-      run: |
-        upload_url=`cat ./upload_url`
-        echo upload_url=$upload_url >> $GITHUB_OUTPUT
-
-    - name: Upload to Release
-      id: upload_to_release
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.set_upload_url.outputs.upload_url }}
-        asset_path: ./${{ env.PLUGIN_NAME }}-${{ env.QT_CREATOR_VERSION }}-${{ matrix.config.artifact }}
-        asset_name: ${{ env.PLUGIN_NAME }}-${{ env.QT_CREATOR_VERSION }}-${{ matrix.config.artifact }}
-        asset_content_type: application/x-7z-compressed
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp
index c6724f1b0a8..d045fd19bb1 100644
--- a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp
+++ b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp
@@ -1,78 +1,89 @@
 %{Cpp:LicenseTemplate}\
-#include "%{HdrFileName}"
 #include "%{ConstantsHdrFileName}"
 #include "%{TrHdrFileName}"
 
-#include <coreplugin/icore.h>
-#include <coreplugin/icontext.h>
+#include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
-#include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/icontext.h>
+#include <coreplugin/icore.h>
+
+#include <extensionsystem/iplugin.h>
 
 #include <QAction>
-#include <QMessageBox>
 #include <QMainWindow>
 #include <QMenu>
+#include <QMessageBox>
 
 namespace %{PluginName}::Internal {
 
-%{CN}::%{CN}()
+class %{CN} : public ExtensionSystem::IPlugin
 {
-    // Create your members
-}
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "%{PluginName}.json")
 
-%{CN}::~%{CN}()
-{
-    // Unregister objects from the plugin manager's object pool
-    // Delete members
-}
+public:
+    %{CN}()
+    {
+        // Create your members
+    }
 
-void %{CN}::initialize()
-{
-    // Register objects in the plugin manager's object pool
-    // Load settings
-    // Add actions to menus
-    // Connect to other plugins' signals
-    // In the initialize function, a plugin can be sure that the plugins it
-    // depends on have initialized their members.
+    ~%{CN}() final
+    {
+        // Unregister objects from the plugin manager's object pool
+        // Delete members
+    }
 
-    // If you need access to command line arguments or to report errors, use the
-    //    bool IPlugin::initialize(const QStringList &arguments, QString *errorString)
-    // overload.
+    void initialize() final
+    {
+        // Register objects in the plugin manager's object pool
+        // Load settings
+        // Add actions to menus
+        // Connect to other plugins' signals
+        // In the initialize function, a plugin can be sure that the plugins it
+        // depends on have initialized their members.
 
-    auto action = new QAction(Tr::tr("%{PluginName} Action"), this);
-    Core::Command *cmd = Core::ActionManager::registerAction(action, Constants::ACTION_ID,
-                         Core::Context(Core::Constants::C_GLOBAL));
-    cmd->setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Alt+Meta+A")));
-    connect(action, &QAction::triggered, this, &%{CN}::triggerAction);
+        // If you need access to command line arguments or to report errors, use the
+        //    bool IPlugin::initialize(const QStringList &arguments, QString *errorString)
+        // overload.
 
-    Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::MENU_ID);
-    menu->menu()->setTitle(Tr::tr("%{PluginName}"));
-    menu->addAction(cmd);
-    Core::ActionManager::actionContainer(Core::Constants::M_TOOLS)->addMenu(menu);
-}
+        auto action = new QAction(Tr::tr("%{PluginName} Action"), this);
+        Core::Command *cmd = Core::ActionManager::registerAction(
+            action, Constants::ACTION_ID, Core::Context(Core::Constants::C_GLOBAL));
+        cmd->setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Alt+Meta+A")));
+        connect(action, &QAction::triggered, this, &%{CN}::triggerAction);
 
-void %{CN}::extensionsInitialized()
-{
-    // Retrieve objects from the plugin manager's object pool
-    // In the extensionsInitialized function, a plugin can be sure that all
-    // plugins that depend on it are completely initialized.
-}
+        Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::MENU_ID);
+        menu->menu()->setTitle(Tr::tr("%{PluginName}"));
+        menu->addAction(cmd);
+        Core::ActionManager::actionContainer(Core::Constants::M_TOOLS)->addMenu(menu);
+    }
 
-ExtensionSystem::IPlugin::ShutdownFlag %{CN}::aboutToShutdown()
-{
-    // Save settings
-    // Disconnect from signals that are not needed during shutdown
-    // Hide UI (if you add UI that is not in the main window directly)
-    return SynchronousShutdown;
-}
+    void extensionsInitialized() final
+    {
+        // Retrieve objects from the plugin manager's object pool
+        // In the extensionsInitialized function, a plugin can be sure that all
+        // plugins that depend on it are completely initialized.
+    }
 
-void %{CN}::triggerAction()
-{
-    QMessageBox::information(Core::ICore::mainWindow(),
-                             Tr::tr("Action Triggered"),
-                             Tr::tr("This is an action from %{PluginName}."));
-}
+    ShutdownFlag aboutToShutdown() final
+    {
+        // Save settings
+        // Disconnect from signals that are not needed during shutdown
+        // Hide UI (if you add UI that is not in the main window directly)
+        return SynchronousShutdown;
+    }
+
+private:
+    void triggerAction()
+    {
+        QMessageBox::information(Core::ICore::mainWindow(),
+                                 Tr::tr("Action Triggered"),
+                                 Tr::tr("This is an action from %{PluginName}."));
+    }
+};
 
 } // namespace %{PluginName}::Internal
+
+#include <%{MocFileName}>
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.h b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.h
deleted file mode 100644
index 6e1fad933c0..00000000000
--- a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.h
+++ /dev/null
@@ -1,27 +0,0 @@
-%{Cpp:LicenseTemplate}\
-#pragma once
-
-#include "%{GlobalHdrFileName}"
-
-#include <extensionsystem/iplugin.h>
-
-namespace %{PluginName}::Internal {
-
-class %{CN} : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "%{PluginName}.json")
-
-public:
-    %{CN}();
-    ~%{CN}() override;
-
-    void initialize() override;
-    void extensionsInitialized() override;
-    ShutdownFlag aboutToShutdown() override;
-
-private:
-    void triggerAction();
-};
-
-} // namespace %{PluginName}::Internal
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin_global.h b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin_global.h
deleted file mode 100644
index a81c8fcee0d..00000000000
--- a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin_global.h
+++ /dev/null
@@ -1,10 +0,0 @@
-%{Cpp:LicenseTemplate}\
-#pragma once
-
-#include <qglobal.h>
-
-#if defined(%{LibraryDefine})
-#  define %{LibraryExport} Q_DECL_EXPORT
-#else
-#  define %{LibraryExport} Q_DECL_IMPORT
-#endif
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.json b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.json
index e1feaa53bbb..0ac4d29ae23 100644
--- a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.json
+++ b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.json
@@ -19,8 +19,7 @@
         { "key": "LibraryDefine", "value": "%{JS: Cpp.headerGuard(value('PluginName')) + '_LIBRARY'}" },
         { "key": "LibraryExport", "value": "%{JS: Cpp.headerGuard(value('PluginName')) + '_EXPORT'}" },
         { "key": "SrcFileName", "value": "%{JS: Util.fileName(value('PluginNameLower'), Util.preferredSuffix('text/x-c++src'))}" },
-        { "key": "HdrFileName", "value": "%{JS: Util.fileName(value('PluginNameLower'), Util.preferredSuffix('text/x-c++hdr'))}" },
-        { "key": "GlobalHdrFileName", "value": "%{JS: Util.fileName(value('PluginNameLower') + '_global', Util.preferredSuffix('text/x-c++hdr'))}" },
+        { "key": "MocFileName", "value": "%{JS: Util.fileName(value('PluginNameLower'), 'moc')}" },
         { "key": "ConstantsHdrFileName", "value": "%{JS: Util.fileName(value('PluginNameLower') + 'constants', Util.preferredSuffix('text/x-c++hdr'))}" },
         { "key": "TrHdrFileName", "value": "%{JS: Util.fileName(value('PluginNameLower') + 'tr', Util.preferredSuffix('text/x-c++hdr'))}" },
         { "key": "CN", "value": "%{JS: Cpp.className(value('PluginName') + 'Plugin')}" },
@@ -170,14 +169,6 @@
                     "source": "myplugin.cpp",
                     "target": "%{SrcFileName}"
                 },
-                {
-                    "source": "myplugin.h",
-                    "target": "%{HdrFileName}"
-                },
-                {
-                    "source": "myplugin_global.h",
-                    "target": "%{GlobalHdrFileName}"
-                },
                 {
                     "source": "mypluginconstants.h",
                     "target": "%{ConstantsHdrFileName}"
diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme
index c2846fa0940..463204fd513 100644
--- a/share/qtcreator/themes/dark.creatortheme
+++ b/share/qtcreator/themes/dark.creatortheme
@@ -502,7 +502,6 @@ DrawSearchResultWidgetFrame=false
 DrawTargetSelectorBottom=false
 DrawToolBarHighlights=true
 DrawToolBarBorders=false
-ApplyThemePaletteGlobally=true
 FlatToolBars=true
 FlatSideBarIcons=true
 FlatProjectsMode=true
diff --git a/share/qtcreator/themes/dark.figmatokens b/share/qtcreator/themes/dark.figmatokens
index 194ce7fab25..d65ae21fa3f 100644
--- a/share/qtcreator/themes/dark.figmatokens
+++ b/share/qtcreator/themes/dark.figmatokens
@@ -36,3 +36,8 @@ Token_Notification_Alert=ffc98014
 Token_Notification_Success=ff1f9b5d
 Token_Notification_Neutral=ff016876
 Token_Notification_Danger=ffb22245
+
+Token_Gradient01_Start=ff016876
+Token_Gradient01_End=ff1F9B5D
+Token_Gradient02_Start=ff3A3A3A
+Token_Gradient02_End=ff838383
diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme
index f2c4c7f7a43..e6cdab1bc30 100644
--- a/share/qtcreator/themes/default.creatortheme
+++ b/share/qtcreator/themes/default.creatortheme
@@ -1,5 +1,5 @@
 [General]
-Includes=light.figmatokens
+Includes=light.figmatokens, light-palette.inc
 ThemeName=Classic
 PreferredStyles=
 
@@ -465,13 +465,12 @@ TerminalAnsi15=e5e5e6
 
 [Flags]
 ComboBoxDrawTextShadow=true
-DerivePaletteFromTheme=false
+DerivePaletteFromThemeIfNeeded=true
 DrawIndicatorBranch=false
 DrawSearchResultWidgetFrame=true
 DrawTargetSelectorBottom=true
 DrawToolBarHighlights=true
 DrawToolBarBorders=false
-ApplyThemePaletteGlobally=false
 FlatToolBars=false
 FlatSideBarIcons=false
 FlatProjectsMode=false
diff --git a/share/qtcreator/themes/design-light.creatortheme b/share/qtcreator/themes/design-light.creatortheme
index 41a9f07ba84..5271d5fc57a 100644
--- a/share/qtcreator/themes/design-light.creatortheme
+++ b/share/qtcreator/themes/design-light.creatortheme
@@ -513,7 +513,6 @@ DrawSearchResultWidgetFrame=false
 DrawTargetSelectorBottom=false
 DrawToolBarHighlights=false
 DrawToolBarBorders=true
-ApplyThemePaletteGlobally=true
 FlatToolBars=true
 FlatSideBarIcons=true
 FlatProjectsMode=false
diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme
index 11022bd7e5d..874c5116e03 100644
--- a/share/qtcreator/themes/design.creatortheme
+++ b/share/qtcreator/themes/design.creatortheme
@@ -562,7 +562,6 @@ DrawSearchResultWidgetFrame=false
 DrawTargetSelectorBottom=false
 DrawToolBarHighlights=false
 DrawToolBarBorders=false
-ApplyThemePaletteGlobally=true
 FlatToolBars=true
 FlatSideBarIcons=true
 FlatProjectsMode=true
diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme
index 9737e9cd53e..bdf46614b05 100644
--- a/share/qtcreator/themes/flat-dark.creatortheme
+++ b/share/qtcreator/themes/flat-dark.creatortheme
@@ -506,7 +506,6 @@ DrawSearchResultWidgetFrame=false
 DrawTargetSelectorBottom=false
 DrawToolBarHighlights=false
 DrawToolBarBorders=false
-ApplyThemePaletteGlobally=true
 FlatToolBars=true
 FlatSideBarIcons=true
 FlatProjectsMode=true
diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme
index 1ff8a7a3ff4..a85d3654d88 100644
--- a/share/qtcreator/themes/flat-light.creatortheme
+++ b/share/qtcreator/themes/flat-light.creatortheme
@@ -1,25 +1,28 @@
 [General]
-Includes=light.figmatokens
+Includes=light.figmatokens, light-palette.inc
 ThemeName=Flat Light
 PreferredStyles=
 
 [Palette]
-shadowBackground=ffe4e4e4
-text=ff000000
-textDisabled=55000000
+shadowBackground=PaletteDark
+text=PaletteWindowText
+textDisabled=PaletteTextDisabled
 toolBarItem=a0010508
 toolBarItemDisabled=38000000
 fancyBarsNormalTextColor=ff000000
 fancyBarsBoldTextColor=a0010508
 hoverBackground=1a000000
 selectedBackground=a8ffffff
-normalBackground=ffffffff
-alternateBackground=ff515151
+normalBackground=PaletteWindow
+alternateBackground=PaletteAlternateBase
 stop_error=ffec7373
 run_success=ff52c23b
 splitter=ffbdbebf
 error=ffdf4f4f
 warning=ffecbc1c
+textColorLink=PaletteLink
+textColorLinkVisited=PaletteLinkVisited
+backgroundColorDisabled=PaletteWindowDisabled
 qmlDesignerButtonColor=fff8f8f8
 
 ;DS Theme Palette START
@@ -474,13 +477,12 @@ TerminalAnsi15=e5e5e6
 
 [Flags]
 ComboBoxDrawTextShadow=false
-DerivePaletteFromTheme=false
+DerivePaletteFromThemeIfNeeded=true
 DrawIndicatorBranch=true
 DrawSearchResultWidgetFrame=false
 DrawTargetSelectorBottom=false
 DrawToolBarHighlights=false
 DrawToolBarBorders=true
-ApplyThemePaletteGlobally=false
 FlatToolBars=true
 FlatSideBarIcons=true
 FlatProjectsMode=false
diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme
index f479077889e..7fd222e168a 100644
--- a/share/qtcreator/themes/flat.creatortheme
+++ b/share/qtcreator/themes/flat.creatortheme
@@ -1,23 +1,26 @@
 [General]
-Includes=light.figmatokens
+Includes=light.figmatokens, light-palette.inc
 ThemeName=Flat
 PreferredStyles=
 
 [Palette]
 shadowBackground=ff404142
-text=ff000000
-textDisabled=55000000
+text=PaletteWindowText
+textDisabled=PaletteTextDisabled
 toolBarItem=bcfbfdff
 toolBarItemDisabled=56a5a6a7
 fancyBarsNormalTextColor=ffffffff
 fancyBarsBoldTextColor=b6fbfdff
 hoverBackground=28ffffff
 selectedBackground=7a000000
-normalBackground=ffffffff
-alternateBackground=ff515151
+normalBackground=PaletteWindow
+alternateBackground=PaletteAlternateBase
 error=ffdf4f4f
 warning=ffecbc1c
 splitter=ff313131
+textColorLink=PaletteLink
+textColorLinkVisited=PaletteLinkVisited
+backgroundColorDisabled=PaletteWindowDisabled
 qmlDesignerButtonColor=ff4c4e50
 
 ;DS Theme Palette START
@@ -472,13 +475,12 @@ TerminalAnsi15=e5e5e6
 
 [Flags]
 ComboBoxDrawTextShadow=false
-DerivePaletteFromTheme=false
+DerivePaletteFromThemeIfNeeded=true
 DrawIndicatorBranch=true
 DrawSearchResultWidgetFrame=false
 DrawTargetSelectorBottom=false
 DrawToolBarHighlights=false
 DrawToolBarBorders=false
-ApplyThemePaletteGlobally=false
 FlatToolBars=true
 FlatSideBarIcons=true
 FlatProjectsMode=false
diff --git a/share/qtcreator/themes/light-palette.inc b/share/qtcreator/themes/light-palette.inc
new file mode 100644
index 00000000000..99fe763a8bd
--- /dev/null
+++ b/share/qtcreator/themes/light-palette.inc
@@ -0,0 +1,41 @@
+[Palette]
+PaletteWindow=ffffffff
+PaletteWindowDisabled=ffececec
+PaletteWindowText=ff000000
+PaletteWindowTextDisabled=PaletteTextDisabled
+PaletteBase=PaletteWindow
+PaletteBaseDisabled=PaletteWindowDisabled
+PaletteAlternateBase=ff515151
+;PaletteAlternateBaseDisabled
+PaletteToolTipBase=PaletteDark
+;PaletteToolTipBaseDisabled
+PaletteToolTipText=PaletteWindowText
+;PaletteToolTipTextDisabled
+PaletteText=PaletteWindowText
+PaletteTextDisabled=55000000
+PaletteButton=PaletteDark
+;PaletteButtonDisabled
+PaletteButtonText=PaletteWindowText
+PaletteButtonTextDisabled=PaletteTextDisabled
+PaletteBrightText=ffffffff
+;PaletteBrightTextDisabled
+PaletteHighlight=ffa5cdff
+;PaletteHighlightDisabled
+PaletteHighlightedText=ff000000
+;PaletteHighlightedTextDisabled
+PaletteLink=ff0000ff
+;PaletteLinkDisabled
+PaletteLinkVisited=ff800080
+;PaletteLinkVisitedDisabled
+;PaletteLight
+;PaletteLightDisabled
+;PaletteMidlight
+;PaletteMidlightDisabled
+PaletteDark=ffe4e4e4
+;PaletteDarkDisabled
+PaletteMid=ffa9a9a9
+;PaletteMidDisabled
+;PaletteShadow
+;PaletteShadowDisabled
+PalettePlaceholderText=3f000000
+;PalettePlaceholderTextDisabled
diff --git a/share/qtcreator/themes/light.figmatokens b/share/qtcreator/themes/light.figmatokens
index 138ad74afdf..8bbe56319d3 100644
--- a/share/qtcreator/themes/light.figmatokens
+++ b/share/qtcreator/themes/light.figmatokens
@@ -35,3 +35,8 @@ Token_Notification_Alert=ffeb991f
 Token_Notification_Success=ff23b26a
 Token_Notification_Neutral=ff0e7887
 Token_Notification_Danger=ffdc1343
+
+Token_Gradient01_Start=ff23B26A
+Token_Gradient01_End=ff0E7887
+Token_Gradient02_Start=ff949494
+Token_Gradient02_End=ff474747
diff --git a/share/qtcreator/translations/README.md b/share/qtcreator/translations/README.md
index ff9caddf2a6..7261305a4b7 100644
--- a/share/qtcreator/translations/README.md
+++ b/share/qtcreator/translations/README.md
@@ -80,9 +80,9 @@ How To add translations to Qt Creator
 *Note:* `.qm` files are generated as part of the regular build. They are not
 submitted to the repository.
 
-*Note:* QmlDesigner contains code from the Gradient Editor of Qt Designer. If an
-official translation of Qt for your language exists, you can re-use the
-translation of those messages by merging Qt Creator's and Qt Designer's
+*Note:* QmlDesigner contains code from the Gradient Editor of Qt Widgets Designer.
+If an official translation of Qt for your language exists, you can re-use the
+translation of those messages by merging Qt Creator's and Qt Widgets Designer's
 translation using `lconvert`:
 
     lconvert qtcreator_<LANG>.ts $QTDIR/translations/designer_<LANG>.ts > temp.ts
@@ -91,6 +91,6 @@ Move the temporary file back to `qtcreator_<LANG>.ts`, complete the Gradient
 Editor's translations and update the file, passing the additional option
 `-noobsolete` to `lupdate` (by temporarily modifying
 `<qtcreator>/cmake/QtCreatorTranslations.cmake`). This will remove the now
-redundant messages originating from Qt Designer.
+redundant messages originating from Qt Widgets Designer.
 
 [1]: https://lists.qt-project.org/listinfo/localization
diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts
index 94bbf49d0b3..23d62545e10 100644
--- a/share/qtcreator/translations/qtcreator_cs.ts
+++ b/share/qtcreator/translations/qtcreator_cs.ts
@@ -764,7 +764,7 @@
         <translation type="obsolete">Automaticky vkládat středníky a uzavírající závorky, kulaté závorky, složené závorky a uvozovky, když je to vhodné.</translation>
     </message>
     <message>
-        <source>&amp;Automatically insert matching characters</source>
+        <source>&amp;Automatically Insert Matching Characters</source>
         <translation type="obsolete">&amp;Automaticky vložit odpovídající znaky</translation>
     </message>
     <message>
@@ -2008,7 +2008,7 @@ Chcete je nechat přepsat?</translation>
         <translation>Když je to vhodné, automaticky vkládat středníky a uzavírající závorky, kulaté závorky, složené závorky a uvozovky.</translation>
     </message>
     <message>
-        <source>&amp;Automatically insert matching characters</source>
+        <source>&amp;Automatically Insert Matching Characters</source>
         <translation>&amp;Automaticky vložit odpovídající znaky</translation>
     </message>
     <message>
@@ -4278,8 +4278,8 @@ Rebuilding the project might help.</source>
 Zkuste projekt vytvořit znovu.</translation>
     </message>
     <message>
-        <source>Qt Designer Form Class</source>
-        <translation>Třída formuláře programu Qt Designer</translation>
+        <source>Qt Widgets Designer Form Class</source>
+        <translation>Třída formuláře programu Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Form Template</source>
@@ -4326,8 +4326,8 @@ Zkuste projekt vytvořit znovu.</translation>
         <translation>Shift+F4</translation>
     </message>
     <message>
-        <source>Qt Designer Form</source>
-        <translation>Formulář programu Qt Designer</translation>
+        <source>Qt Widgets Designer Form</source>
+        <translation>Formulář programu Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Creates a Qt Designer form that you can add to a Qt Widget Project. This is useful if you already have an existing class for the UI business logic.</source>
@@ -4458,8 +4458,8 @@ Zkuste projekt vytvořit znovu.</translation>
         <translation>Alt+Shift+R</translation>
     </message>
     <message>
-        <source>About Qt Designer Plugins...</source>
-        <translation>O přídavných modulech programu Qt Designer...</translation>
+        <source>About Qt Widgets Designer Plugins...</source>
+        <translation>O přídavných modulech programu Qt Widgets Designer...</translation>
     </message>
     <message>
         <source>Views</source>
@@ -10752,8 +10752,8 @@ Vybere pro sestavení programu verzi Qt pro stolní počítač, je-li dostupná.
         <translation>Tento průvodce vytvoří projekt konzolové aplikace v Qt4. Aplikace je odvozena z QCoreApplication a nemá žádné uživatelské rozhraní.</translation>
     </message>
     <message>
-        <source>Qt Designer is not responding (%1).</source>
-        <translation>Qt Designer neodpovídá (%1).</translation>
+        <source>Qt Widgets Designer is not responding (%1).</source>
+        <translation>Qt Widgets Designer neodpovídá (%1).</translation>
     </message>
     <message>
         <source>Unable to create server socket: %1</source>
@@ -16025,8 +16025,8 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás
         <translation type="obsolete">Editor .qmlproject</translation>
     </message>
     <message>
-        <source>Qt Designer</source>
-        <translation>Qt Designer</translation>
+        <source>Qt Widgets Designer</source>
+        <translation>Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Qt Linguist</source>
@@ -17504,7 +17504,7 @@ Důvod: %2</translation>
     </message>
     <message>
         <source>Qt Custom Designer Widget</source>
-        <translation>Uživatelsky stanovený prvek pro Qt Designer</translation>
+        <translation>Uživatelsky stanovený prvek pro Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Creates a Qt Custom Designer Widget or a Custom Widget Collection.</source>
@@ -40550,7 +40550,7 @@ Určuje chování odsazení se zřetelem k navazujícím řádkům.
         <translation>Nastavit znovu</translation>
     </message>
     <message>
-        <source>Scanning scope</source>
+        <source>Scanning Scope</source>
         <translation>Oblast prohledávání</translation>
     </message>
     <message>
diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts
index 43f21468465..53c0246ee3c 100644
--- a/share/qtcreator/translations/qtcreator_da.ts
+++ b/share/qtcreator/translations/qtcreator_da.ts
@@ -338,12 +338,12 @@ Minimum API-niveauet krævet af kittet er %1.</translation>
 </translation>
     </message>
     <message>
-        <source>
-Uninstalling the installed package may solve the issue.
-Do you want to uninstall the existing package?</source>
-        <translation>
-Afinstallation af den installerede pakke løser måske problemstillingen.
-Vil du afinstallere den eksisterende pakke?</translation>
+        <source>Uninstalling the installed package may solve the issue.</source>
+        <translation>Afinstallation af den installerede pakke løser måske problemstillingen.</translation>
+    </message>
+    <message>
+        <source>Do you want to uninstall the existing package?</source>
+        <translation>Vil du afinstallere den eksisterende pakke?</translation>
     </message>
     <message>
         <source>Install failed</source>
@@ -13547,8 +13547,8 @@ Det hjælper måske at genbygge projektet.</translation>
         <translation>Designer</translation>
     </message>
     <message>
-        <source>Qt Designer Form Class</source>
-        <translation>Qt Designer-udformningsklasse</translation>
+        <source>Qt Widgets Designer Form Class</source>
+        <translation>Qt Widgets Designer-udformningsklasse</translation>
     </message>
     <message>
         <source>Choose a Class Name</source>
@@ -13571,8 +13571,8 @@ Det hjælper måske at genbygge projektet.</translation>
         <translation>Skift kilde/udformning</translation>
     </message>
     <message>
-        <source>Creates a Qt Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project.</source>
-        <translation>Opretter en Qt Designer-udformning sammen med en matchende klasse (C++-header og kildefil) til implementeringsformål. Du kan tilføje udformningen og klassen til et eksisterende Qt widget-projekt.</translation>
+        <source>Creates a Qt Widgets Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project.</source>
+        <translation>Opretter en Qt Widgets Designer-udformning sammen med en matchende klasse (C++-header og kildefil) til implementeringsformål. Du kan tilføje udformningen og klassen til et eksisterende Qt widget-projekt.</translation>
     </message>
     <message>
         <source>For&amp;m Editor</source>
@@ -14990,8 +14990,8 @@ når de ikke kræves, hvilket i de fleste tilfælde vil forbedre ydelsen.</trans
         <translation>Alt+Skift+R</translation>
     </message>
     <message>
-        <source>About Qt Designer Plugins...</source>
-        <translation>Om Qt Designer-plugins...</translation>
+        <source>About Qt Widgets Designer Plugins...</source>
+        <translation>Om Qt Widgets Designer-plugins...</translation>
     </message>
     <message>
         <source>Preview in</source>
@@ -19970,8 +19970,8 @@ Fejl: %5</translation>
         <translation>Python-redigering</translation>
     </message>
     <message>
-        <source>Qt Designer</source>
-        <translation>Qt Designer</translation>
+        <source>Qt Widgets Designer</source>
+        <translation>Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Qt Linguist</source>
@@ -23386,12 +23386,12 @@ til projektet &quot;%2&quot;.</translation>
         <translation>Udformningsskabelon</translation>
     </message>
     <message>
-        <source>Creates a Qt Designer form that you can add to a Qt Widget Project. This is useful if you already have an existing class for the UI business logic.</source>
-        <translation>Opretter en Qt Designer-udformning som du kan tilføje til et Qt widget-projekt. Dette er nyttigt hvis du allerede har en eksisterende klasse til brugerflade travlhedslogik.</translation>
+        <source>Creates a Qt Widgets Designer form that you can add to a Qt Widget Project. This is useful if you already have an existing class for the UI business logic.</source>
+        <translation>Opretter en Qt Widgets Designer-udformning som du kan tilføje til et Qt widget-projekt. Dette er nyttigt hvis du allerede har en eksisterende klasse til brugerflade travlhedslogik.</translation>
     </message>
     <message>
-        <source>Qt Designer Form</source>
-        <translation>Qt Designer-udformning</translation>
+        <source>Qt Widgets Designer Form</source>
+        <translation>Qt Widgets Designer-udformning</translation>
     </message>
     <message>
         <source>Creates a Java file with boilerplate code.</source>
@@ -24002,52 +24002,36 @@ Brug det kun hvis du prototyper. Du kan ikke oprette et fuldt program med dette.
         <translation>Page med typeId&apos;et &quot;%1&quot; har ugyldigt &quot;index&quot;.</translation>
     </message>
     <message>
-        <source>Path &quot;%1&quot; does not exist when checking Json wizard search paths.
-</source>
-        <translation>Stien &quot;%1&quot; findes ikke under tjek af Json-assistentens søgestier.
-</translation>
+        <source>Path &quot;%1&quot; does not exist when checking JSON wizard search paths.</source>
+        <translation>Stien &quot;%1&quot; findes ikke under tjek af JSON-assistentens søgestier.</translation>
     </message>
     <message>
-        <source>Checking &quot;%1&quot; for %2.
-</source>
-        <translation>Tjekker &quot;%1&quot; for %2.
-</translation>
+        <source>Checking &quot;%1&quot; for %2.</source>
+        <translation>Tjekker &quot;%1&quot; for %2.</translation>
     </message>
     <message>
-        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4
-</source>
-        <translation>* Kunne ikke parse &quot;%1&quot;:%2:%3: %4
-</translation>
+        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4</source>
+        <translation>* Kunne ikke parse &quot;%1&quot;:%2:%3: %4</translation>
     </message>
     <message>
-        <source>* Did not find a JSON object in &quot;%1&quot;.
-</source>
-        <translation>* Fandt ikke et JSON-objekt i &quot;%1&quot;.
-</translation>
+        <source>* Did not find a JSON object in &quot;%1&quot;.</source>
+        <translation>* Fandt ikke et JSON-objekt i &quot;%1&quot;.</translation>
     </message>
     <message>
-        <source>* Configuration found and parsed.
-</source>
-        <translation>* Konfiguration fundet og parset.
-</translation>
+        <source>* Configuration found and parsed.</source>
+        <translation>* Konfiguration fundet og parset.</translation>
     </message>
     <message>
-        <source>* Version %1 not supported.
-</source>
-        <translation>* Version %1 understøttes ikke.
-</translation>
+        <source>* Version %1 not supported.</source>
+        <translation>* Version %1 understøttes ikke.</translation>
     </message>
     <message>
-        <source>* Failed to create: %1
-</source>
-        <translation>* Kunne ikke oprette: %1
-</translation>
+        <source>* Failed to create: %1</source>
+        <translation>* Kunne ikke oprette: %1</translation>
     </message>
     <message>
-        <source>JsonWizard: &quot;%1&quot; not found
-</source>
-        <translation>JsonWizard: &quot;%1&quot; ikke fundet
-</translation>
+        <source>JsonWizard: &quot;%1&quot; not found.</source>
+        <translation>JsonWizard: &quot;%1&quot; ikke fundet.</translation>
     </message>
     <message>
         <source>key not found.</source>
@@ -26282,12 +26266,12 @@ Opdater venligst dit kit eller vælg en mkspec for qmake som matcher dit mål-mi
         <translation>Opretter et Qt brugerdefineret Designer-widget eller en brugerdefineret widget-samling.</translation>
     </message>
     <message>
-        <source>This wizard generates a Qt Designer Custom Widget or a Qt Designer Custom Widget Collection project.</source>
-        <translation>Denne assistent genererer en Qt Designer brugerdefineret widget eller et Qt Designer brugerdefineret widget-samling-projekt.</translation>
+        <source>This wizard generates a Qt Widgets Designer Custom Widget or a Qt Widgets Designer Custom Widget Collection project.</source>
+        <translation>Denne assistent genererer en Qt Widgets Designer brugerdefineret widget eller et Qt Widgets Designer brugerdefineret widget-samling-projekt.</translation>
     </message>
     <message>
-        <source>Qt Designer is not responding (%1).</source>
-        <translation>Qt Designer svarer ikke (%1).</translation>
+        <source>Qt Widgets Designer is not responding (%1).</source>
+        <translation>Qt Widgets Designer svarer ikke (%1).</translation>
     </message>
     <message>
         <source>Unable to create server socket: %1</source>
@@ -26358,10 +26342,10 @@ Opdater venligst dit kit eller vælg en mkspec for qmake som matcher dit mål-mi
         <translation>Qt widgets-program</translation>
     </message>
     <message>
-        <source>Creates a Qt application for the desktop. Includes a Qt Designer-based main window.
+        <source>Creates a Qt application for the desktop. Includes a Qt Widgets Designer-based main window.
 
 Preselects a desktop Qt for building the application if available.</source>
-        <translation>Opretter et Qt-program til desktop. Inkluderer et Qt Designer-baseret hovedvindue.
+        <translation>Opretter et Qt-program til desktop. Inkluderer et Qt Widgets Designer-baseret hovedvindue.
 
 Prævælger en desktop Qt til bygning af programmet, hvis tilgængeligt.</translation>
     </message>
@@ -33820,7 +33804,7 @@ Derudover indsætter Skift+Enter et undvigetegn ved markørens placering og flyt
         <translation>Opdel strenge automatisk</translation>
     </message>
     <message>
-        <source>&amp;Automatically insert matching characters</source>
+        <source>&amp;Automatically Insert Matching Characters</source>
         <translation>&amp;Indsæt automatisk matchende tegn</translation>
     </message>
     <message>
@@ -34000,7 +33984,7 @@ Derudover indsætter Skift+Enter et undvigetegn ved markørens placering og flyt
         <translation>Justeret til højre side</translation>
     </message>
     <message>
-        <source>Line annotations</source>
+        <source>Line Annotations</source>
         <translation>Linjeannotationer</translation>
     </message>
     <message>
@@ -35607,7 +35591,7 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation>
         <translation>Nulstil</translation>
     </message>
     <message>
-        <source>Scanning scope</source>
+        <source>Scanning Scope</source>
         <translation>Skanningsområde</translation>
     </message>
     <message>
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 28c3e2c44ce..e21c369fd18 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -110,7 +110,7 @@
     </message>
     <message>
         <source>Frequently used signals</source>
-        <translation>Häufig benutzte Signale</translation>
+        <translation>Häufig verwendete Signale</translation>
     </message>
     <message>
         <source>Property changes</source>
@@ -140,7 +140,7 @@
         <translation>Erweitert</translation>
     </message>
     <message>
-        <source>Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items. </source>
+        <source>Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -795,6 +795,10 @@ Bind to AmbientSound.Infinite to loop the current sound forever.</source>
         <source>New Effect</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add to Content Library</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AudioEngineSection</name>
@@ -1374,6 +1378,36 @@ It should be a relative path.</source>
         <translation>URL der Bildquelle.</translation>
     </message>
 </context>
+<context>
+    <name>CameraSpeedConfigAction</name>
+    <message>
+        <source>Open camera speed configuration dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CameraSpeedConfigurationDialog</name>
+    <message>
+        <source>Camera Speed Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The speed camera moves when controlled by keyboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiplier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The value multiplier for the speed slider.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished">Zurücksetzen</translation>
+    </message>
+</context>
 <context>
     <name>CameraToggleAction</name>
     <message>
@@ -1568,168 +1602,6 @@ It should be a relative path.</source>
         <translation type="unfinished">Anwenden</translation>
     </message>
 </context>
-<context>
-    <name>CollectionDetailsToolbar</name>
-    <message>
-        <source>Add property left</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add property right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete selected property</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert row below</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert row above</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete selected row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save changes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export model</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Column name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The model already contains &quot;%1&quot;!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation type="unfinished">Typ:</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished">Hinzufügen</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
-    </message>
-</context>
-<context>
-    <name>CollectionDetailsView</name>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort Ascending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort Descending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add row above</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add row below</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete this row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a model to continue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure that you want to delete column &quot;%1&quot;?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
-    </message>
-</context>
-<context>
-    <name>CollectionItem</name>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished">Umbenennen</translation>
-    </message>
-    <message>
-        <source>Assign to the selected node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deleting the model</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure that you want to delete model &quot;%1&quot;?
-The model will be deleted permanently.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure that you want to delete model &quot;%1&quot;?
-The model will be removed from the project but the file will not be deleted.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename model</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
-    </message>
-    <message>
-        <source>New name:</source>
-        <translation type="unfinished">Neuer Name:</translation>
-    </message>
-</context>
-<context>
-    <name>CollectionView</name>
-    <message>
-        <source>Data Models</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import a model</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add a new model</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>ColorAnimationSpecifics</name>
     <message>
@@ -1869,10 +1741,26 @@ The model will be removed from the project but the file will not be deleted.</so
         <source>Column spacing</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sets the space between the items in pixels in the &lt;b&gt;Column Layout&lt;/b&gt;.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Layout direction</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sets the direction of the item flow in the &lt;b&gt;Column Layout&lt;/b&gt;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Uniform cell size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggles all cells to have a uniform size.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ColumnSpecifics</name>
@@ -2025,6 +1913,27 @@ The model will be removed from the project but the file will not be deleted.</so
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ConfirmClearAllDialog</name>
+    <message>
+        <source>Confirm clear list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are about to clear the list of effect nodes.
+
+This can not be undone.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished">Löschen</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+</context>
 <context>
     <name>ConfirmDeleteFilesDialog</name>
     <message>
@@ -2236,11 +2145,8 @@ The model will be removed from the project but the file will not be deleted.</so
         <source>Effects</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ContentLibraryEffect</name>
     <message>
-        <source>Effect is imported to project</source>
+        <source>User Assets</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2283,22 +2189,14 @@ The model will be removed from the project but the file will not be deleted.</so
     </message>
 </context>
 <context>
-    <name>ContentLibraryMaterial</name>
+    <name>ContentLibraryItem</name>
     <message>
-        <source>Material is imported to project</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add an instance to project</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to download material</source>
+        <source>Item is imported to the project</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ContentLibraryMaterialContextMenu</name>
+    <name>ContentLibraryItemContextMenu</name>
     <message>
         <source>Apply to selected (replace)</source>
         <translation type="unfinished"></translation>
@@ -2315,6 +2213,25 @@ The model will be removed from the project but the file will not be deleted.</so
         <source>Remove from project</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Remove from Content Library</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ContentLibraryMaterial</name>
+    <message>
+        <source>Material is imported to project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add an instance to project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to download material</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContentLibraryMaterialsView</name>
@@ -2407,6 +2324,10 @@ The model will be removed from the project but the file will not be deleted.</so
         <source>Add light probe</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Remove from Content Library</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContentLibraryTexturesView</name>
@@ -2419,6 +2340,25 @@ The model will be removed from the project but the file will not be deleted.</so
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ContentLibraryUserView</name>
+    <message>
+        <source>No match found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Content Library&lt;/b&gt; is not supported in Qt5 projects.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To use &lt;b&gt;Content Library&lt;/b&gt;, first add the QtQuick3D module in the &lt;b&gt;Components&lt;/b&gt; view.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Content Library&lt;/b&gt; is disabled inside a non-visual component.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ContextMenu</name>
     <message>
@@ -2516,6 +2456,25 @@ The model will be removed from the project but the file will not be deleted.</so
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>DeleteBundleItemDialog</name>
+    <message>
+        <source>Remove bundle %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you? The action cannot be undone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+</context>
 <context>
     <name>DesignerActionManager</name>
     <message>
@@ -2608,6 +2567,22 @@ The model will be removed from the project but the file will not be deleted.</so
         <source>Sets the number by which the dial value changes.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the starting angle of the dial in degrees.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End angle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the ending angle of the dial in degrees.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Sets how the dial&apos;s handle snaps to the steps
 defined in &lt;b&gt;Step size&lt;/b&gt;.</source>
@@ -2767,33 +2742,6 @@ defined in &lt;b&gt;Step size&lt;/b&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>EditPropertyDialog</name>
-    <message>
-        <source>Edit Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished">Name</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="unfinished">Typ</translation>
-    </message>
-    <message>
-        <source>Conversion from %1 to %2 may lead to data loss</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Apply</source>
-        <translation type="unfinished">Anwenden</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
-    </message>
-</context>
 <context>
     <name>EffectComposer</name>
     <message>
@@ -2813,6 +2761,49 @@ defined in &lt;b&gt;Step size&lt;/b&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>EffectComposer::EffectComposerModel</name>
+    <message>
+        <source>Animation</source>
+        <translation type="unfinished">Animation</translation>
+    </message>
+    <message>
+        <source>Running</source>
+        <translation type="unfinished">Läuft</translation>
+    </message>
+    <message>
+        <source>Set this property to animate the effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished">Zeit</translation>
+    </message>
+    <message>
+        <source>This property allows explicit control of current animation time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Frame</source>
+        <translation type="unfinished">Frame</translation>
+    </message>
+    <message>
+        <source>This property allows explicit control of current animation frame.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished">Allgemein</translation>
+    </message>
+    <message>
+        <source>Extra Margin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This property specifies how much of extra space is reserved for the effect outside the parent geometry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>EffectComposer::EffectComposerView</name>
     <message>
@@ -2828,6 +2819,25 @@ defined in &lt;b&gt;Step size&lt;/b&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>EffectComposer::Uniform</name>
+    <message>
+        <source>X</source>
+        <translation type="unfinished">X</translation>
+    </message>
+    <message>
+        <source>Y</source>
+        <translation type="unfinished">Y</translation>
+    </message>
+    <message>
+        <source>Z</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>W</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>EffectComposerPreview</name>
     <message>
@@ -2839,8 +2849,8 @@ defined in &lt;b&gt;Step size&lt;/b&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Zoom Fit</source>
-        <translation type="unfinished"></translation>
+        <source>Reset View</source>
+        <translation type="unfinished">Ansicht zurücksetzen</translation>
     </message>
     <message>
         <source>Restart Animation</source>
@@ -2879,7 +2889,7 @@ defined in &lt;b&gt;Step size&lt;/b&gt;.</source>
 2. Adjust the effect nodes properties
 3. Change the order of the effects, if you like
 4. See the preview
-5. Save in the library, if you wish to reuse the effect later</source>
+5. Save in the assets library, if you wish to reuse the effect later</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2894,6 +2904,13 @@ defined in &lt;b&gt;Step size&lt;/b&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>EffectCompositionNodeUniform</name>
+    <message>
+        <source>Reset value</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>EffectNode</name>
     <message>
@@ -2908,6 +2925,138 @@ defined in &lt;b&gt;Step size&lt;/b&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>EffectsSection</name>
+    <message>
+        <source>Effects &lt;a style=&quot;color:%1;&quot;&gt;[beta]&lt;/a&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Effects</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Effects</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Adds visual effects on the component.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Visible</source>
+        <translation type="unfinished">Sichtbar</translation>
+    </message>
+    <message>
+        <source>Toggles the visibility of visual effects on the component.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layer Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggles the visibility of the &lt;b&gt;Layer Blur&lt;/b&gt; on the component.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the intensity of the &lt;b&gt;Layer Blur&lt;/b&gt; on the component.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Background Blur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggles the visibility of blur on the selected background component.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the intensity of blur on the selected background component.
+The foreground component should be transparent, and the background component should be opaque.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Background</source>
+        <translation type="unfinished">Hintergrund</translation>
+    </message>
+    <message>
+        <source>Sets a component as the background of a transparent component.The &lt;b&gt;Background Blur&lt;/b&gt; works only on this component. The component should be solid.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Inner Shadow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggles the visibility of the component shadow.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the softness of the component shadow. A larger value causes the edges of the shadow to appear more blurry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resizes the base shadow of the component by pixels.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only supported for Rectangles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Color</source>
+        <translation type="unfinished">Farbe</translation>
+    </message>
+    <message>
+        <source>Sets the color of the shadow.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Offset</source>
+        <translation type="unfinished">Abstand</translation>
+    </message>
+    <message>
+        <source>Moves the shadow with respect to the component in X and Y coordinates by pixels.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X-coordinate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y-coordinate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show behind</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggles the visibility of the shadow behind a transparent component.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Shadow Effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Adds &lt;b&gt;Drop Shadow&lt;/b&gt; or &lt;b&gt;Inner Shadow&lt;/b&gt; effects to a component.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>EmptyMaterialEditorPane</name>
     <message>
@@ -3025,6 +3174,25 @@ defined in &lt;b&gt;Step size&lt;/b&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>FlagsComboBox</name>
+    <message>
+        <source>empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 items selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FlickableGeometrySection</name>
     <message>
@@ -3542,18 +3710,50 @@ defined in &lt;b&gt;Step size&lt;/b&gt;.</source>
         <source>Columns &amp; Rows</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sets the number of columns and rows in the &lt;b&gt;Grid Layout&lt;/b&gt;.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Spacing</source>
         <translation type="unfinished">Abstand</translation>
     </message>
+    <message>
+        <source>Sets the space between the items in pixels in the rows and columns in the &lt;b&gt;Grid Layout&lt;/b&gt;.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Flow</source>
         <translation>Anordnung</translation>
     </message>
+    <message>
+        <source>Set the direction of dynamic items to flow in rows or columns in the &lt;b&gt;Grid Layout&lt;/b&gt;.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Layout direction</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sets the direction of the dynamic items left to right or right to left in the &lt;b&gt;Grid Layout&lt;/b&gt;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Uniform cell sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggles all cells to have a uniform height or width.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Heights</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Widths</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GridSpecifics</name>
@@ -3918,57 +4118,6 @@ a highlight component.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ImportDialog</name>
-    <message>
-        <source>Import a model</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Model path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a model file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="unfinished">Öffnen</translation>
-    </message>
-    <message>
-        <source>Could not load the file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>An error occurred while trying to load the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The model name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File name can not be empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The model name can not be empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
-    </message>
-</context>
 <context>
     <name>InsetSection</name>
     <message>
@@ -4670,6 +4819,14 @@ a highlight component.</source>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Share your project online.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sharing your project online is disabled in the Community Version.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>More Items</source>
         <translation type="unfinished"></translation>
@@ -4896,6 +5053,10 @@ a highlight component.</source>
         <source>Create New Material</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add to Content Library</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MaterialEditorToolBar</name>
@@ -5006,13 +5167,6 @@ a highlight component.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Message</name>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished">Schließen</translation>
-    </message>
-</context>
 <context>
     <name>ModelNodeOperations</name>
     <message>
@@ -5208,37 +5362,6 @@ Error:
         <translation>Das Verschieben der Komponente %1 an diese Stelle bewirkt das Löschen der Komponente %2. Möchten Sie den Vorgang fortsetzen?</translation>
     </message>
 </context>
-<context>
-    <name>NewCollectionDialog</name>
-    <message>
-        <source>Add a new Model</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Model</source>
-        <translation type="unfinished">Modell</translation>
-    </message>
-    <message>
-        <source>The model name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The model name can not be empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The model name already exists %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
-    </message>
-</context>
 <context>
     <name>NewEffectDialog</name>
     <message>
@@ -6632,147 +6755,6 @@ Exporting assets: %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QmlDesigner::CollectionSourceModel</name>
-    <message>
-        <source>Node is not indexed in the models.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Node should be a JSON model.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A model with the identical name already exists.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selected node must have a valid source file address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t read or write &quot;%1&quot;.
-%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;%1&quot; is corrupted.
-%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t clean &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t write to &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No model is available for the JSON model group.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>JSON document type should be an object containing models.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename Model</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t rename the node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid node type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The model group doesn&apos;t contain the old model name (%1).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The model name &quot;%1&quot; already exists in the model group.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Model</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The selected node has an invalid source address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The model group doesn&apos;t contain the model name (%1).</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QmlDesigner::CollectionView</name>
-    <message>
-        <source>Model Editor</source>
-        <translation type="unfinished">Model-Editor</translation>
-    </message>
-    <message>
-        <source>Model Editor view</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QmlDesigner::CollectionWidget</name>
-    <message>
-        <source>Model Editor</source>
-        <comment>Title of model editor widget</comment>
-        <translation type="unfinished">Model-Editor</translation>
-    </message>
-    <message>
-        <source>Cannot Create QtQuick View</source>
-        <translation type="unfinished">QtQuick View konnte nicht erzeugt werden</translation>
-    </message>
-    <message>
-        <source>StatesEditorWidget: %1 cannot be created.%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can not open the file to write.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can not add a model to the JSON file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The imported model is empty or is not supported.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can not import to the main model</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The data store is not available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The default model node is not available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to add a model to the default model group</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>QmlDesigner::ColorTool</name>
     <message>
@@ -6873,12 +6855,35 @@ Exporting assets: %2</source>
         <translation type="unfinished">Verbindungen</translation>
     </message>
 </context>
+<context>
+    <name>QmlDesigner::ContentLibraryUserModel</name>
+    <message>
+        <source>Materials</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Textures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3D</source>
+        <translation type="unfinished">3D</translation>
+    </message>
+</context>
 <context>
     <name>QmlDesigner::ContentLibraryView</name>
     <message>
         <source>Content Library</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>3D Item Exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A 3D item with the same name &apos;%1&apos; already exists in the Content Library, are you sure you want to overwrite it?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QmlDesigner::ContentLibraryWidget</name>
@@ -7027,10 +7032,6 @@ Exporting assets: %2</source>
 </context>
 <context>
     <name>QmlDesigner::DocumentWarningWidget</name>
-    <message>
-        <source>Always ignore these warnings about features not supported by Qt Quick Designer.</source>
-        <translation>Diese Warnungen über in Qt Quick Designer nicht unterstütze Features immer ignorieren.</translation>
-    </message>
     <message>
         <source>Cannot open this QML document because of an error in the QML file:</source>
         <translation>Dieses QML-Dokument kann wegen eines Fehlers in der QML-Datei nicht geöffnet werden:</translation>
@@ -7040,8 +7041,12 @@ Exporting assets: %2</source>
         <translation>OK</translation>
     </message>
     <message>
-        <source>This QML file contains features which are not supported by Qt Quick Designer at:</source>
-        <translation>Diese QML-Datei enthält Features, die von Qt Quick Designer nicht unterstützt werden:</translation>
+        <source>Turn off warnings about unsupported Qt Design Studio features.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This QML file contains features which are not supported by Qt Design Studio at:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ignore</source>
@@ -7264,6 +7269,10 @@ Exporting assets: %2</source>
         <source>Reset all shading options for all viewports.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add to Content Library</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>3D view is not supported in MCU projects.</source>
         <translation type="unfinished"></translation>
@@ -7458,6 +7467,33 @@ Exporting assets: %2</source>
         <source>QML Resource File (*.qrc)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Successfully generated QRC resource file
+ %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generating deployable package. Please wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to generate deployable package!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <source>Failed to generate deployable package!
+
+Please check the output pane for more information.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Successfully generated deployable package</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Unable to generate resource file: %1</source>
         <translation type="unfinished"></translation>
@@ -7486,23 +7522,10 @@ Exporting assets: %2</source>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Successfully generated deployable package
- %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Save Project as Resource</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>QML Resource File (*.qmlrc);;Resource File (*.rcc)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Generate a resource file out of project %1 to %2</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QmlDesigner::GlobalAnnotationDialog</name>
@@ -7770,13 +7793,9 @@ Exporting assets: %2</source>
         <source>Reset Style</source>
         <translation>Stil zurücksetzen</translation>
     </message>
-    <message>
-        <source>If you select this radio button, Qt Quick Designer always uses the QML emulation layer (QML Puppet) located at the following path.</source>
-        <translation>Wenn Sie diesen Radiobutton auswählen, benutzt der Qt Quick Designer immer die QML-Emulationsschicht (QML Puppet) im folgenden Pfad.</translation>
-    </message>
     <message>
         <source>Use fallback QML emulation layer</source>
-        <translation>Fallback QML-Emulationsschicht benutzen</translation>
+        <translation>Fallback QML-Emulationsschicht verwenden</translation>
     </message>
     <message>
         <source>Path:</source>
@@ -7790,10 +7809,6 @@ Exporting assets: %2</source>
         <source>Top level build path:</source>
         <translation>Oberstes Build-Verzeichnis:</translation>
     </message>
-    <message>
-        <source>Warns about QML features that are not properly supported by the Qt Quick Designer.</source>
-        <translation>Zeigt eine Warnung bei QML-Features an, die vom Qt Quick Designer nicht vollständig unterstützt werden.</translation>
-    </message>
     <message>
         <source>Also warns in the code editor about QML features that are not properly supported by the Qt Quick Designer.</source>
         <translation>Zeigt auch im Code-Editor eine Warnung bei QML-Features an, die vom Qt Quick Designer nicht vollständig unterstützt werden.</translation>
@@ -7806,6 +7821,14 @@ Exporting assets: %2</source>
         <source>qsTr()</source>
         <translation>qsTr()</translation>
     </message>
+    <message>
+        <source>If you select this radio button, Qt Design Studio always uses the QML emulation layer (QML Puppet) located at the following path.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warns about QML features that are not properly supported by the Qt Design Studio.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>qsTrId()</source>
         <translation>qsTrId()</translation>
@@ -7840,7 +7863,7 @@ Exporting assets: %2</source>
     </message>
     <message>
         <source>Warn about using .qml files instead of .ui.qml files</source>
-        <translation>Bei der Benutzung von .qml-Dateien statt .ui.qml-Dateien warnen</translation>
+        <translation>Bei der Verwendung von .qml-Dateien statt .ui.qml-Dateien warnen</translation>
     </message>
     <message>
         <source>Width:</source>
@@ -7856,7 +7879,7 @@ Exporting assets: %2</source>
     </message>
     <message>
         <source>Use QML emulation layer that is built with the selected Qt</source>
-        <translation>Mit dem gewählten Qt erstellte QML-Emulationsschicht benutzen</translation>
+        <translation>Mit dem gewählten Qt erstellte QML-Emulationsschicht verwenden</translation>
     </message>
     <message>
         <source>qsTranslate()</source>
@@ -7967,6 +7990,10 @@ Exporting assets: %2</source>
         <source>Select import options and press &quot;Import&quot; to import the following files:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Importing:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Locate 3D Asset &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
@@ -7987,6 +8014,18 @@ Exporting assets: %2</source>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import is ready for preview.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click &quot;Accept&quot; to finish the import or adjust options and click &quot;Import&quot; to import again.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Close</source>
         <translation>Schließen</translation>
@@ -8062,6 +8101,10 @@ Exporting assets: %2</source>
         <source>Could not access temporary asset directory: &quot;%1&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Attempted to reimport non-existing asset: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Failed to create qmldir file for asset: &quot;%1&quot;.</source>
         <translation type="unfinished"></translation>
@@ -8261,6 +8304,13 @@ Exporting assets: %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QmlDesigner::Model</name>
+    <message>
+        <source>Invalid Id</source>
+        <translation type="unfinished">Ungültige ID</translation>
+    </message>
+</context>
 <context>
     <name>QmlDesigner::NavigatorSearchWidget</name>
     <message>
@@ -8295,10 +8345,6 @@ Locked components cannot be modified or selected.</source>
         <source>Invalid Id</source>
         <translation>Ungültige ID</translation>
     </message>
-    <message>
-        <source>%1 is an invalid id.</source>
-        <translation>%1 ist keine gültige ID.</translation>
-    </message>
     <message>
         <source>%1 already exists.</source>
         <translation>%1 existiert bereits.</translation>
@@ -8393,7 +8439,7 @@ Locked components cannot be modified or selected.</source>
     </message>
     <message>
         <source>Do not show this dialog again</source>
-        <translation>Diesen Dialog nicht noch einmal anzeigen</translation>
+        <translation>Diesen Dialog nicht erneut anzeigen</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -8497,6 +8543,14 @@ Locked components cannot be modified or selected.</source>
         <source>The QML file is not currently opened in a QML Editor.</source>
         <translation>Die QML-Datei ist in keinem QML-Editor geöffnet.</translation>
     </message>
+    <message>
+        <source>Qml Designer Lite</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The Qml Designer Lite plugin is not enabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Give Feedback...</source>
         <translation type="unfinished"></translation>
@@ -8993,10 +9047,6 @@ Locked components cannot be modified or selected.</source>
         <source>The Design Mode requires a valid Qt kit.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Unsupported Qt Quick version.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>No import for Qt Quick found.</source>
         <translation>Es konnte kein Import für Qt Quick gefunden werden.</translation>
@@ -9039,10 +9089,6 @@ Locked components cannot be modified or selected.</source>
         <source>Invalid Id</source>
         <translation>Ungültige ID</translation>
     </message>
-    <message>
-        <source>%1 is an invalid id.</source>
-        <translation>%1 ist keine gültige ID.</translation>
-    </message>
     <message>
         <source>%1 already exists.</source>
         <translation>%1 existiert bereits.</translation>
@@ -9138,10 +9184,6 @@ Locked components cannot be modified or selected.</source>
         <source>Invalid Id</source>
         <translation>Ungültige ID</translation>
     </message>
-    <message>
-        <source>%1 is an invalid id.</source>
-        <translation>%1 ist keine gültige ID.</translation>
-    </message>
     <message>
         <source>%1 already exists.</source>
         <translation>%1 existiert bereits.</translation>
@@ -9465,10 +9507,6 @@ Locked components cannot be modified or selected.</source>
         <source>Invalid ID</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>%1 is an invalid ID.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>%1 already exists.</source>
         <translation>%1 existiert bereits.</translation>
@@ -9501,6 +9539,13 @@ Locked components cannot be modified or selected.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QmlDesigner::View3DTool</name>
+    <message>
+        <source>View3D Tool</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>QmlDesignerAddResources</name>
     <message>
@@ -9544,7 +9589,7 @@ Locked components cannot be modified or selected.</source>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Editieren</translation>
+        <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>Anchors</source>
@@ -9690,6 +9735,10 @@ Locked components cannot be modified or selected.</source>
         <source>Edit Annotations</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit in 3D View</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Fill Parent</source>
         <translation type="unfinished"></translation>
@@ -10360,7 +10409,7 @@ Locked components cannot be modified or selected.</source>
     </message>
     <message>
         <source>Retype password:</source>
-        <translation>Passwort noch einmal eingeben:</translation>
+        <translation>Passwort erneut eingeben:</translation>
     </message>
     <message>
         <source>Show password</source>
@@ -10495,7 +10544,7 @@ Locked components cannot be modified or selected.</source>
         <translation>Pfad des JDK existiert und ist schreibbar.</translation>
     </message>
     <message>
-        <source>Android OpenSSL settings (Optional)</source>
+        <source>Android OpenSSL Settings (Optional)</source>
         <translation>OpenSSL-Einstellungen für Android (optional)</translation>
     </message>
     <message>
@@ -10714,6 +10763,10 @@ Locked components cannot be modified or selected.</source>
         <source>Verifying the integrity of the downloaded file has failed.</source>
         <translation>Das Prüfen der Integrität der heruntergeladenen Datei ist fehlgeschlagen.</translation>
     </message>
+    <message>
+        <source>Verifying package integrity...</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Unarchiving error.</source>
         <translation>Fehler beim Entpacken.</translation>
@@ -10763,7 +10816,7 @@ in the system&apos;s browser for manual download.</source>
 Diese Bibliotheken können mit Ihrer Anwendung weitergegeben werden, falls
 diese SSL-Funktionen verwendet. Sie finden eine Checkbox unter &quot;Projekte &gt; Erstellen &gt;
 Schritte zum Erstellen &gt; Android-APK erstellen &gt; Zusätzliche Bibliotheken&quot;.
-Falls das automatische Herunterladen scheitert, wird Qt Creator vorschlagen, die URL zum
+Falls das automatische Herunterladen fehlschlägt, wird Qt Creator vorschlagen, die URL zum
 manuellen Herunterladen im Browser des System zu öffnen.</translation>
     </message>
     <message>
@@ -10908,6 +10961,10 @@ Dies kann nicht rückgängig gemacht werden.</translation>
         <source>Android Device</source>
         <translation>Android-Gerät</translation>
     </message>
+    <message>
+        <source>Android support is not yet configured.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>The device info returned from AvdDialog is invalid.</source>
         <translation>Die vom AvdDialog zurückgelieferte Geräteinformation ist ungültig.</translation>
@@ -11110,6 +11167,14 @@ Dies kann nicht rückgängig gemacht werden.</translation>
         <source>Cannot find the androiddeployqt tool.</source>
         <translation>Kann das androiddeployqt-Werkzeug nicht finden.</translation>
     </message>
+    <message>
+        <source>Cannot find the package name from AndroidManifest.xml nor build.gradle files at &quot;%1&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deployment failed with the following errors:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Install an APK File</source>
         <translation>Eine APK-Datei installieren</translation>
@@ -11148,11 +11213,11 @@ Dies kann nicht rückgängig gemacht werden.</translation>
     </message>
     <message>
         <source>Package deploy: Failed to pull &quot;%1&quot; to &quot;%2&quot;.</source>
-        <translation>Paket-Deployment: &quot;pull&quot; von &quot;%1&quot; nach &quot;%2&quot; scheiterte.</translation>
+        <translation>Paket-Deployment: &quot;pull&quot; von &quot;%1&quot; nach &quot;%2&quot; ist fehlgeschlagen.</translation>
     </message>
     <message>
         <source>Install failed</source>
-        <translation>Installation gescheitert</translation>
+        <translation>Installation fehlgeschlagen</translation>
     </message>
     <message>
         <source>Android package (*.apk)</source>
@@ -11216,10 +11281,6 @@ Das Kit unterstützt &quot;%2&quot;, aber das Gerät verwendet &quot;%3&quot;.</
         <source>Cannot find the androiddeployqt input JSON file.</source>
         <translation>Die JSON-Datei für androiddeployqt konnte nicht gefunden werden.</translation>
     </message>
-    <message>
-        <source>Cannot find the package name from the Android Manifest file &quot;%1&quot;.</source>
-        <translation>Der Paketname aus der Android-Manifest-Datei &quot;%1&quot; konnte nicht gefunden werden.</translation>
-    </message>
     <message>
         <source>Uninstalling the previous package &quot;%1&quot;.</source>
         <translation>Deinstalliere das vorherige Paket &quot;%1&quot;.</translation>
@@ -11237,20 +11298,12 @@ Das Kit unterstützt &quot;%2&quot;, aber das Gerät verwendet &quot;%3&quot;.</
         <translation>Die Installation der Anwendung ist mit einem unbekannten Fehler fehlgeschlagen.</translation>
     </message>
     <message>
-        <source>Deployment failed with the following errors:
-
-</source>
-        <translation>Das Deployment ist mit den folgenden Fehlern gescheitert:
-
-</translation>
+        <source>Uninstalling the installed package may solve the issue.</source>
+        <translation>Das installierte Paket zu deinstallieren könnte das Problem lösen.</translation>
     </message>
     <message>
-        <source>
-Uninstalling the installed package may solve the issue.
-Do you want to uninstall the existing package?</source>
-        <translation>
-Das installierte Paket zu deinstallieren könnte das Problem lösen.
-Möchten Sie das vorhandene Paket deinstallieren?</translation>
+        <source>Do you want to uninstall the existing package?</source>
+        <translation>Möchten Sie das vorhandene Paket deinstallieren?</translation>
     </message>
     <message>
         <source>The deployment AVD &quot;%1&quot; cannot be started.</source>
@@ -11272,14 +11325,6 @@ Möchten Sie das vorhandene Paket deinstallieren?</translation>
         <source>%1 needs additional settings to enable Android support. You can configure those settings in the Options dialog.</source>
         <translation>%1 benötigt zusätzliche Einstellungen, um die Android-Unterstützung zu aktivieren. Sie können diese im Einstellungsdialog konfigurieren.</translation>
     </message>
-    <message>
-        <source>Could not run: %1</source>
-        <translation>Keine Ausführung möglich: %1</translation>
-    </message>
-    <message>
-        <source>No devices found in output of: %1</source>
-        <translation>In der Ausgabe von %1 konnten keine Geräte festgestellt werden</translation>
-    </message>
     <message>
         <source>Configure Android...</source>
         <translation>Android konfigurieren...</translation>
@@ -11351,8 +11396,8 @@ Der vom Kit mindestens benötigte API-Level ist %1.</translation>
         <translation>Unbekannte Android-Version. API-Level: %1</translation>
     </message>
     <message>
-        <source>Error creating Android templates.</source>
-        <translation>Fehler beim Erstellen der Android-Vorlagendateien.</translation>
+        <source>Cannot open &quot;%1&quot;.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot parse &quot;%1&quot;.</source>
@@ -11365,21 +11410,13 @@ Der vom Kit mindestens benötigte API-Level ist %1.</translation>
     <message>
         <source>Android package installation failed.
 %1</source>
-        <translation>Android-Paketinstallation gescheitert.
+        <translation>Android-Paketinstallation fehlgeschlagen.
 %1</translation>
     </message>
     <message>
         <source>Cannot create AVD. Invalid input.</source>
         <translation>AVD kann nicht erstellt werden. Ungültige Eingabe.</translation>
     </message>
-    <message>
-        <source>Could not start process &quot;%1&quot;.</source>
-        <translation>Der Prozess &quot;%1&quot; konnte nicht gestartet werden.</translation>
-    </message>
-    <message>
-        <source>Cannot create AVD. Command timed out.</source>
-        <translation>AVD kann nicht erstellt werden. Zeitüberschreitung des Kommandos.</translation>
-    </message>
     <message>
         <source>Incorrect password.</source>
         <translation>Ungültiges Passwort.</translation>
@@ -11561,8 +11598,40 @@ Installieren Sie diese manuell, nachdem der aktuelle Vorgang abgeschlossen ist.
         <translation>Die Installation von Android-SDK-Paketen kann fehlschlagen, wenn die entsprechenden Lizenzen nicht akzeptiert werden.</translation>
     </message>
     <message>
-        <source>SDK Manager is busy.</source>
-        <translation>SDK-Manager arbeitet.</translation>
+        <source>Finished successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing / Uninstalling selected packages...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing the preferences dialog will cancel the running and scheduled SDK operations.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing the options dialog will cancel the running and scheduled SDK operations.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Uninstalling %1...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing %1...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Updating installed packages...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>[Packages to be uninstalled:]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>[Packages to be installed:]</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Android SDK Changes</source>
@@ -11575,100 +11644,10 @@ Installieren Sie diese manuell, nachdem der aktuelle Vorgang abgeschlossen ist.
             <numerusform>%n Android SDK-Pakete sollen aktualisiert werden.</numerusform>
         </translation>
     </message>
-    <message>
-        <source>[Packages to be uninstalled:]
-</source>
-        <translation>[Pakete, die deinstalliert werden sollen:]
-</translation>
-    </message>
-    <message>
-        <source>SDK Manager is busy. Operation cancelled.</source>
-        <translation>SDK-Manager arbeitet. Die Operation wurde abgebrochen.</translation>
-    </message>
-    <message>
-        <source>Installing/Uninstalling selected packages...
-</source>
-        <translation>Installiere/Deinstalliere ausgewählte Pakete...
-</translation>
-    </message>
-    <message>
-        <source>Closing the %1 dialog will cancel the running and scheduled SDK operations.
-</source>
-        <translation>Wenn Sie den %1-Dialog schließen, werden die laufenden und geplanten SDK-Operationen abgebrochen.
-</translation>
-    </message>
-    <message>
-        <source>preferences</source>
-        <translation>Einstellungen</translation>
-    </message>
-    <message>
-        <source>options</source>
-        <translation>Einstellungen</translation>
-    </message>
-    <message>
-        <source>Updating installed packages...
-</source>
-        <translation>Aktualisiere installierte Pakete...
-</translation>
-    </message>
-    <message>
-        <source>Android SDK operations finished.</source>
-        <translation>Android SDK-Operationen beendet.</translation>
-    </message>
-    <message>
-        <source>Operation cancelled.
-</source>
-        <translation>Operation abgebrochen.
-</translation>
-    </message>
-    <message>
-        <source>
-No pending operations to cancel...
-</source>
-        <translation>
-Keine ausstehenden Operationen sind abzubrechen...
-</translation>
-    </message>
-    <message>
-        <source>
-Cancelling pending operations...
-</source>
-        <translation>
-Breche ausstehende Operationen ab...
-</translation>
-    </message>
-    <message>
-        <source>The operation requires user interaction. Use the &quot;sdkmanager&quot; command-line tool.</source>
-        <translation>Die Operation benötigt Benutzereingaben. Benutzen Sie das Kommandozeilenwerkzeug &quot;sdkmanager&quot;.</translation>
-    </message>
-    <message>
-        <source>License command failed.</source>
-        <translation>Lizenzkommando fehlgeschlagen.</translation>
-    </message>
-    <message>
-        <source>Updating installed packages.</source>
-        <translation>Aktualisiere installierte Pakete.</translation>
-    </message>
     <message>
         <source>Failed.</source>
         <translation>Fehlgeschlagen.</translation>
     </message>
-    <message>
-        <source>Done</source>
-        <translation>Fertig</translation>
-    </message>
-    <message>
-        <source>Installing</source>
-        <translation>Installiere</translation>
-    </message>
-    <message>
-        <source>Uninstalling</source>
-        <translation>Deinstalliere</translation>
-    </message>
-    <message>
-        <source>Failed</source>
-        <translation>Fehlgeschlagen</translation>
-    </message>
     <message>
         <source>SDK Manager Arguments</source>
         <translation>SDK-Manager-Argumente</translation>
@@ -11739,6 +11718,10 @@ Breche ausstehende Operationen ab...
         <source>Install the missing emulator tool (%1) to the installed Android SDK.</source>
         <translation>Installieren Sie den fehlenden Emulator (%1) im installierten Android-SDK.</translation>
     </message>
+    <message>
+        <source>Failed to start AVD emulator for &quot;%1&quot; device.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Clean Environment</source>
         <translation>Saubere Umgebung</translation>
@@ -12131,7 +12114,7 @@ Rufen Sie QtAndroid::hideSplashScreen() auf, um einen Startbildschirm zu verstec
     </message>
     <message>
         <source>Select master image to use.</source>
-        <translation>Wählen Sie das zu benutzende Hauptbild aus.</translation>
+        <translation>Wählen Sie das zu verwendende Hauptbild aus.</translation>
     </message>
     <message>
         <source>Master image:</source>
@@ -12181,7 +12164,7 @@ Rufen Sie QtAndroid::hideSplashScreen() auf, um einen Startbildschirm zu verstec
         <source>An image is used for the splashscreen. Qt Creator manages
 splashscreen by using a different method which requires changing
 the manifest file by overriding your settings. Allow override?</source>
-        <translation>Für den Startbildschirm wird ein Bild benutzt. Qt Creator verwaltet
+        <translation>Für den Startbildschirm wird ein Bild verwendet. Qt Creator verwaltet
 Startbildschirme auf andere Weise, was eine Änderung der Manifest-Datei
 und das Überschreiben Ihrer Einstellungen erfordert. Das Überschreiben erlauben?</translation>
     </message>
@@ -12294,7 +12277,7 @@ und das Überschreiben Ihrer Einstellungen erfordert. Das Überschreiben erlaube
     </message>
     <message>
         <source>Using: %1.</source>
-        <translation>Benutze: %1.</translation>
+        <translation>Verwende: %1.</translation>
     </message>
     <message>
         <source>Cannot debug: Only QML and native applications are supported.</source>
@@ -12353,7 +12336,15 @@ und das Überschreiben Ihrer Einstellungen erfordert. Das Überschreiben erlaube
     </message>
     <message>
         <source>Number of worker threads used when scanning for tests.</source>
-        <translation>Anzahl der Threads, die zum Suchen nach Tests benutzt werden.</translation>
+        <translation>Anzahl der Threads, die zum Suchen nach Tests verwendet werden.</translation>
+    </message>
+    <message>
+        <source>Use a timeout while executing test cases.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Timeout used when executing test cases. This will apply for each test case on its own, not the whole project. Overrides test framework or build system defaults.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Omit run configuration warnings</source>
@@ -12365,7 +12356,7 @@ und das Überschreiben Ihrer Einstellungen erfordert. Das Überschreiben erlaube
     </message>
     <message>
         <source>Limit result description:</source>
-        <translation>Beschreibung der Resultate begrenzen:</translation>
+        <translation>Beschreibung der Ergebnisse begrenzen:</translation>
     </message>
     <message>
         <source>Limit number of lines shown in test result tooltip and description.</source>
@@ -12395,10 +12386,6 @@ und das Überschreiben Ihrer Einstellungen erfordert. Das Überschreiben erlaube
         <source>Automatically scroll results</source>
         <translation>Ergebnisse automatisch scrollen</translation>
     </message>
-    <message>
-        <source>Timeout used when executing each test case.</source>
-        <translation>Zeitlimit für jeden Testfall benutzen.</translation>
-    </message>
     <message>
         <source>Scan threads:</source>
         <translation>Such-Threads:</translation>
@@ -12419,10 +12406,6 @@ und das Überschreiben Ihrer Einstellungen erfordert. Das Überschreiben erlaube
         <source>Timeout:</source>
         <translation>Zeitlimit:</translation>
     </message>
-    <message>
-        <source>Timeout used when executing test cases. This will apply for each test case on its own, not the whole project.</source>
-        <translation>Das Zeitlimit wird für jeden einzelnen Testfall und nicht das ganze Projekt gesetzt.</translation>
-    </message>
     <message>
         <source> s</source>
         <translation> s</translation>
@@ -12483,7 +12466,7 @@ Warnung: Dies ist eine experimentelle Funktion und könnte dazu führen, dass di
     </message>
     <message>
         <source>Only for unsuccessful test runs</source>
-        <translation>Nur bei gescheiterten Tests</translation>
+        <translation>Nur bei fehlgeschlagenen Tests</translation>
     </message>
     <message>
         <source>Automatically run</source>
@@ -12493,10 +12476,6 @@ Warnung: Dies ist eine experimentelle Funktion und könnte dazu führen, dass di
         <source>Runs chosen tests automatically if a build succeeded.</source>
         <translation>Führt ausgewählte Tests automatisch aus, wenn ein Build erfolgreich endete.</translation>
     </message>
-    <message>
-        <source>Active frameworks:</source>
-        <translation>Aktive Frameworks:</translation>
-    </message>
     <message>
         <source>Automatically run tests after build</source>
         <translation>Tests automatisch nach dem Erstellen ausführen</translation>
@@ -12513,6 +12492,26 @@ Warnung: Dies ist eine experimentelle Funktion und könnte dazu führen, dass di
         <source>Selected</source>
         <translation>Ausgewählte</translation>
     </message>
+    <message>
+        <source>Apply path filters before scanning for tests.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wildcard expressions for filtering:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished">Hinzufügen</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit Files to Path Patterns</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Scanning for Tests</source>
         <translation>Suche nach Tests</translation>
@@ -12617,7 +12616,7 @@ Warnung: Dies ist eine experimentelle Funktion und könnte dazu führen, dass di
         <source>Running tests failed.
  %1
 Executable: %2</source>
-        <translation>Ausführung von Tests gescheitert.
+        <translation>Ausführung von Tests fehlgeschlagen.
  %1
 Ausführbare Datei: %2</translation>
     </message>
@@ -12659,7 +12658,7 @@ Ausführbare Datei: %2</translation>
     </message>
     <message>
         <source>Expected Fail</source>
-        <translation>Erwartetes Scheitern</translation>
+        <translation>Erwartetes Fehlschlagen</translation>
     </message>
     <message>
         <source>Unexpected Pass</source>
@@ -12873,7 +12872,7 @@ Dies könnte Probleme während der Ausführung verursachen.
     </message>
     <message>
         <source>Unable to display test results when using CDB.</source>
-        <translation>Wenn CDB benutzt wird, können keine Testergebnisse angezeigt werden.</translation>
+        <translation>Wenn CDB verwendet wird, können keine Testergebnisse angezeigt werden.</translation>
     </message>
     <message>
         <source>Build failed. Canceling test run.</source>
@@ -12929,11 +12928,11 @@ Dies könnte Probleme während der Ausführung verursachen.
     </message>
     <message>
         <source>Number of resamples used for statistical bootstrapping.</source>
-        <translation>Anzahl der für statistisches Bootstrapping benutzten Resamples.</translation>
+        <translation>Anzahl der für statistisches Bootstrapping verwendeten Resamples.</translation>
     </message>
     <message>
         <source>Confidence interval used for statistical bootstrapping.</source>
-        <translation>Für das statistische Bootstrapping benutzte Konfidenzinterval.</translation>
+        <translation>Konfidenzinterval, das für statistisches Bootstrapping verwendet wird.</translation>
     </message>
     <message>
         <source>Benchmark confidence interval</source>
@@ -13027,6 +13026,10 @@ Dies könnte Probleme während der Ausführung verursachen.
         <source>Repeats a test run (you might be required to increase the timeout to avoid canceling the tests).</source>
         <translation>Testlauf wiederholen (eine Erhöhung des Zeitlimits kann nötig sein, um einen Abbruch zu vermeiden).</translation>
     </message>
+    <message>
+        <source>Repeat Tests</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Output on failure</source>
         <translation>Ausgabe bei Fehlschlag</translation>
@@ -13108,7 +13111,7 @@ Dies könnte Probleme während der Ausführung verursachen.
         <translation>Tests wiederholen</translation>
     </message>
     <message>
-        <source>Run in parallel</source>
+        <source>Run in Parallel</source>
         <translation>Parallel ausführen</translation>
     </message>
     <message>
@@ -13125,7 +13128,7 @@ Dies könnte Probleme während der Ausführung verursachen.
     </message>
     <message>
         <source>A seed of 0 means no randomization. A value of 1 uses the current time, any other value is used as random seed generator.</source>
-        <translation>Ein Startwert von 0 bedeutet keine Randomisierung. Ein Wert von 1 benutzt die aktuelle Zeit, jeder andere Wert wird als Startwert für Zufallszahlen benutzt.</translation>
+        <translation>Ein Startwert von 0 bedeutet keine Randomisierung. Ein Wert von 1 verwendet die aktuelle Zeit, jeder andere Wert wird als Startwert für Zufallszahlen verwendet.</translation>
     </message>
     <message>
         <source>Randomize</source>
@@ -13247,7 +13250,7 @@ Weitere Informationen über GTest-Filter finden Sie in der Dokumenation von Goog
     </message>
     <message>
         <source>Uses tick counter when executing benchmarks.</source>
-        <translation>Den Tickzähler bei der Benchmarkausführung benutzen.</translation>
+        <translation>Den Tickzähler bei der Benchmarkausführung verwenden.</translation>
     </message>
     <message>
         <source>Tick counter</source>
@@ -13255,7 +13258,7 @@ Weitere Informationen über GTest-Filter finden Sie in der Dokumenation von Goog
     </message>
     <message>
         <source>Uses event counter when executing benchmarks.</source>
-        <translation>Ereigniszähler bei der Benchmarkausführung benutzen.</translation>
+        <translation>Ereigniszähler bei der Benchmarkausführung verwenden.</translation>
     </message>
     <message>
         <source>Event counter</source>
@@ -13263,7 +13266,7 @@ Weitere Informationen über GTest-Filter finden Sie in der Dokumenation von Goog
     </message>
     <message>
         <source>Uses Valgrind Callgrind when executing benchmarks (it must be installed).</source>
-        <translation>&quot;Valgrind Callgrind&quot; zur Benchmarkausführung benutzen (dazu muss es installiert sein).</translation>
+        <translation>&quot;Valgrind Callgrind&quot; zur Benchmarkausführung verwenden (dazu muss es installiert sein).</translation>
     </message>
     <message>
         <source>Find user-defined locations</source>
@@ -13271,7 +13274,7 @@ Weitere Informationen über GTest-Filter finden Sie in der Dokumenation von Goog
     </message>
     <message>
         <source>Parse messages for the following pattern and use it as location information:&lt;pre&gt;file://filepath:line&lt;/pre&gt;where &quot;:line&quot; is optional.&lt;p&gt;Warning: If the patterns are used in code, the location information for debug messages and other messages might improve,at the risk of some incorrect locations and lower performance.</source>
-        <translation>Wertet Nachrichten nach den folgenden Mustern aus und benutzt sie als Positionsinformation:&lt;pre&gt;file://dateipfad:zeile&lt;/pre&gt;wobei &quot;:zeile&quot; optional ist.&lt;p&gt;Achtung: Wenn diese Muster im Code benutzt werden, können sich die Positionsinformationen für Debug- und andere Nachrichten verbessern, es besteht aber die Gefahr falscher Positionen und verringerter Leistung.</translation>
+        <translation>Wertet Nachrichten nach den folgenden Mustern aus und verwendet sie als Positionsinformation:&lt;pre&gt;file://dateipfad:zeile&lt;/pre&gt;wobei &quot;:zeile&quot; optional ist.&lt;p&gt;Achtung: Wenn diese Muster im Code verwendet werden, können sich die Positionsinformationen für Debug- und andere Nachrichten verbessern, es besteht aber die Gefahr falscher Positionen und verringerter Leistung.</translation>
     </message>
     <message>
         <source>Callgrind</source>
@@ -13279,7 +13282,7 @@ Weitere Informationen über GTest-Filter finden Sie in der Dokumenation von Goog
     </message>
     <message>
         <source>Uses Perf when executing benchmarks (it must be installed).</source>
-        <translation>&quot;Perf&quot; zur Benchmarkausführung benutzen (dazu muss es installiert sein).</translation>
+        <translation>&quot;Perf&quot; zur Benchmarkausführung verwenden (dazu muss es installiert sein).</translation>
     </message>
     <message>
         <source>Perf</source>
@@ -13387,7 +13390,7 @@ Weitere Informationen über GTest-Filter finden Sie in der Dokumenation von Goog
     </message>
     <message>
         <source>Run Test Under Cursor</source>
-        <translation>Test unter Cursor ausführen</translation>
+        <translation>Test unter Einfügemarke ausführen</translation>
     </message>
     <message>
         <source>&amp;Run Test</source>
@@ -13723,6 +13726,10 @@ Siehe auch die Einstellungen für Google Test.</translation>
         <source>Total rows:</source>
         <translation>Gesamtzeilen:</translation>
     </message>
+    <message>
+        <source>No Data</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Axivion</source>
         <translation>Axivion</translation>
@@ -13735,6 +13742,18 @@ Siehe auch die Einstellungen für Google Test.</translation>
         <source>Search for issues</source>
         <translation>Probleme durchsuchen</translation>
     </message>
+    <message>
+        <source>Open Issue in Dashboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Table in Dashboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy Dashboard Link to Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Show rule details</source>
         <translation>Regeldetails anzeigen</translation>
@@ -13771,6 +13790,10 @@ Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe.</translation>
         <source>Key chain message: &quot;%1&quot;.</source>
         <translation>Meldung der Schlüsselverwaltung: &quot;%1&quot;.</translation>
     </message>
+    <message>
+        <source>Unauthenticated access failed (wrong user), using authenticated access...</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Enter the password for:
 Dashboard: %1
@@ -13805,6 +13828,10 @@ Wollen Sie &quot;%1&quot; mit der Standardanwendung öffnen?</translation>
         <source>Open External Links</source>
         <translation>Externe Links öffnen</translation>
     </message>
+    <message>
+        <source>Search for issues inside the Axivion dashboard or request issue details for Axivion inline annotations to see them here.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Fetch Projects</source>
         <translation>Projekte abrufen</translation>
@@ -13853,10 +13880,38 @@ Wollen Sie &quot;%1&quot; mit der Standardanwendung öffnen?</translation>
         <source>User name</source>
         <translation>Benutzername</translation>
     </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished">Hinzufügen...</translation>
+    </message>
     <message>
         <source>Edit...</source>
         <translation>Bearbeiten...</translation>
     </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default dashboard server:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>unset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Server Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove the server configuration &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Dashboard Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Edit Dashboard Configuration</source>
         <translation>Dashboard-Konfiguration bearbeiten</translation>
@@ -14038,7 +14093,7 @@ Wollen Sie &quot;%1&quot; mit der Standardanwendung öffnen?</translation>
     </message>
     <message>
         <source>Use GDB target extended-remote</source>
-        <translation>GDB &quot;target extended-remote&quot; benutzen</translation>
+        <translation>GDB &quot;target extended-remote&quot; verwenden</translation>
     </message>
     <message>
         <source>Extended mode:</source>
@@ -14101,13 +14156,13 @@ Wollen Sie &quot;%1&quot; mit der Standardanwendung öffnen?</translation>
         <source>GDB compatible provider engine
 (used together with the GDB debuggers).</source>
         <translation>GDB-kompatible Provider-Engine
-(wird zusammen mit GDB-Debuggern benutzt).</translation>
+(wird zusammen mit GDB-Debuggern verwendet).</translation>
     </message>
     <message>
         <source>UVSC compatible provider engine
 (used together with the KEIL uVision).</source>
         <translation>UVSC-kompatible Provider-Engine
-(wird zusammen mit KEIL uVision benutzt).</translation>
+(wird zusammen mit KEIL uVision verwendet).</translation>
     </message>
     <message>
         <source>Name</source>
@@ -14127,7 +14182,7 @@ Wollen Sie &quot;%1&quot; mit der Standardanwendung öffnen?</translation>
     </message>
     <message>
         <source>The following providers were already configured:&lt;br&gt;&amp;nbsp;%1&lt;br&gt;They were not configured again.</source>
-        <translation>Die folgenden Provider wurden bereits konfiguriert:&lt;br&gt;&amp;nbsp;%1&lt;br&gt;Sie wurden nicht noch einmal konfiguriert.</translation>
+        <translation>Die folgenden Provider wurden bereits konfiguriert:&lt;br&gt;&amp;nbsp;%1&lt;br&gt;Sie wurden nicht erneut konfiguriert.</translation>
     </message>
     <message>
         <source>Add</source>
@@ -14199,7 +14254,7 @@ Wollen Sie &quot;%1&quot; mit der Standardanwendung öffnen?</translation>
     </message>
     <message>
         <source>Do not use EBlink flash cache.</source>
-        <translation>EBlink-Flash-Cache nicht benutzen.</translation>
+        <translation>EBlink-Flash-Cache nicht verwenden.</translation>
     </message>
     <message>
         <source>Disable cache:</source>
@@ -14636,15 +14691,15 @@ Lokale Commits werden nicht zum Master-Branch gepusht, bis ein normaler Commit e
     </message>
     <message>
         <source>User</source>
-        <translation>Nutzer</translation>
+        <translation>Benutzer</translation>
     </message>
     <message>
         <source>Username to use by default on commit.</source>
-        <translation>Nutzername für Commit.</translation>
+        <translation>Benutzername für Commit.</translation>
     </message>
     <message>
         <source>Default username:</source>
-        <translation>Vorgabe für Nutzernamen:</translation>
+        <translation>Vorgabe für Benutzernamen:</translation>
     </message>
     <message>
         <source>Email to use by default on commit.</source>
@@ -15559,7 +15614,7 @@ Zum Beispiel bewirkt die Angabe &quot;Revision: 15&quot; dass der Branch auf Rev
     </message>
     <message>
         <source>Enter one CMake &lt;a href=&quot;variable&quot;&gt;variable&lt;/a&gt; per line.&lt;br/&gt;To set or change a variable, use -D&amp;lt;variable&amp;gt;:&amp;lt;type&amp;gt;=&amp;lt;value&amp;gt;.&lt;br/&gt;&amp;lt;type&amp;gt; can have one of the following values: FILEPATH, PATH, BOOL, INTERNAL, or STRING.&lt;br/&gt;To unset a variable, use -U&amp;lt;variable&amp;gt;.&lt;br/&gt;</source>
-        <translation>Geben Sie eine CMake-&lt;a href=&quot;variable&quot;&gt;Variable&lt;/a&gt; pro Zeile ein.&lt;br/&gt;Um eine Variable zu setzen oder zu ändern, benutzen Sie -D&amp;lt;Variable&amp;gt;:&amp;lt;Typ&amp;gt;=&amp;lt;Wert&amp;gt;.&lt;br/&gt;&amp;lt;Typ&amp;gt; kann einer der folgenden Werte sein: FILEPATH, PATH, BOOL, INTERNAL oder STRING.&lt;br/&gt;Um eine Variable zurückzusetzen, benutzen Sie -U&amp;lt;Variable&amp;gt;.&lt;br/&gt;</translation>
+        <translation>Geben Sie eine CMake-&lt;a href=&quot;variable&quot;&gt;Variable&lt;/a&gt; pro Zeile ein.&lt;br/&gt;Um eine Variable zu setzen oder zu ändern, verwenden Sie -D&amp;lt;Variable&amp;gt;:&amp;lt;Typ&amp;gt;=&amp;lt;Wert&amp;gt;.&lt;br/&gt;&amp;lt;Typ&amp;gt; kann einer der folgenden Werte sein: FILEPATH, PATH, BOOL, INTERNAL oder STRING.&lt;br/&gt;Um eine Variable zurückzusetzen, verwenden Sie -U&amp;lt;Variable&amp;gt;.&lt;br/&gt;</translation>
     </message>
     <message>
         <source>Re-configure with Initial Parameters</source>
@@ -15967,7 +16022,7 @@ Zum Beispiel bewirkt die Angabe &quot;Revision: 15&quot; dass der Branch auf Rev
     </message>
     <message>
         <source>Show subfolders inside source group folders</source>
-        <translation>Unterverzeichnisse in Sourcegruppen anzeigen</translation>
+        <translation>Unterverzeichnisse in Quelltext-Gruppenverzeichnissen anzeigen</translation>
     </message>
     <message>
         <source>Show advanced options by default</source>
@@ -15975,11 +16030,11 @@ Zum Beispiel bewirkt die Angabe &quot;Revision: 15&quot; dass der Branch auf Rev
     </message>
     <message>
         <source>Use junctions for CMake configuration and build operations</source>
-        <translation>Junctions für die CMake-Konfiguration und das Erstellen benutzen</translation>
+        <translation>Junctions für die CMake-Konfiguration und das Erstellen verwenden</translation>
     </message>
     <message>
         <source>Create and use junctions for the source and build directories to overcome issues with long paths on Windows.&lt;br&gt;&lt;br&gt;Junctions are stored under &lt;tt&gt;C:\ProgramData\QtCreator\Links&lt;/tt&gt; (overridable via the &lt;tt&gt;QTC_CMAKE_JUNCTIONS_DIR&lt;/tt&gt; environment variable).&lt;br&gt;&lt;br&gt;With &lt;tt&gt;QTC_CMAKE_JUNCTIONS_HASH_LENGTH&lt;/tt&gt;, you can shorten the MD5 hash key length to a value smaller than the default length value of 32.&lt;br&gt;&lt;br&gt;Junctions are used for CMake configure, build and install operations.</source>
-        <translation>Erstellt und benutzt Junctions für die Quell- und Build-Verzeichnisse, um Probleme mit langen Pfaden auf Windows zu umgehen.&lt;br&gt;&lt;br&gt;Junctions werden unter &lt;tt&gt;C:\ProgramData\QtCreator\Links&lt;/tt&gt; gespeichert (überschreibbar mit der Umgebungsvariable &lt;tt&gt;QTC_CMAKE_JUNCTIONS_DIR&lt;/tt&gt;).&lt;br&gt;&lt;br&gt;Sie können mit der Umgebungsvariable &lt;tt&gt;QTC_CMAKE_JUNCTIONS_HASH_LENGTH&lt;/tt&gt; die Länge des MD5-Hashschlüssels auf einen kleineren Wert als die Voreinstellung 32 verkürzen.&lt;br&gt;&lt;br&gt;Junctions werden für das Konfigurieren mit CMake, das Erstellen und die Installation benutzt.</translation>
+        <translation>Erstellt und verwendet Junctions für die Quell- und Build-Verzeichnisse, um Probleme mit langen Pfaden auf Windows zu umgehen.&lt;br&gt;&lt;br&gt;Junctions werden unter &lt;tt&gt;C:\ProgramData\QtCreator\Links&lt;/tt&gt; gespeichert (überschreibbar mit der Umgebungsvariable &lt;tt&gt;QTC_CMAKE_JUNCTIONS_DIR&lt;/tt&gt;).&lt;br&gt;&lt;br&gt;Sie können mit der Umgebungsvariable &lt;tt&gt;QTC_CMAKE_JUNCTIONS_HASH_LENGTH&lt;/tt&gt; die Länge des MD5-Hashschlüssels auf einen kleineren Wert als die Voreinstellung 32 verkürzen.&lt;br&gt;&lt;br&gt;Junctions werden für das Konfigurieren mit CMake, das Erstellen und die Installation verwendet.</translation>
     </message>
     <message>
         <source>General</source>
@@ -16119,7 +16174,7 @@ Zum Beispiel bewirkt die Angabe &quot;Revision: 15&quot; dass der Branch auf Rev
     </message>
     <message>
         <source>&lt;Use Default Generator&gt;</source>
-        <translation>&lt;Benutze Standardgenerator&gt;</translation>
+        <translation>&lt;Verwende Standardgenerator&gt;</translation>
     </message>
     <message>
         <source>Generator: %1&lt;br&gt;Extra generator: %2</source>
@@ -16147,7 +16202,7 @@ Zum Beispiel bewirkt die Angabe &quot;Revision: 15&quot; dass der Branch auf Rev
     </message>
     <message>
         <source>Enter one CMake &lt;a href=&quot;variable&quot;&gt;variable&lt;/a&gt; per line.&lt;br/&gt;To set a variable, use -D&amp;lt;variable&amp;gt;:&amp;lt;type&amp;gt;=&amp;lt;value&amp;gt;.&lt;br/&gt;&amp;lt;type&amp;gt; can have one of the following values: FILEPATH, PATH, BOOL, INTERNAL, or STRING.</source>
-        <translation>Geben Sie eine CMake-&lt;a href=&quot;variable&quot;&gt;Variable&lt;/a&gt; pro Zeile ein.&lt;br/&gt;Um eine Variable zu setzen, benutzen Sie -D&amp;lt;Variable&amp;gt;:&amp;lt;Typ&amp;gt;=&amp;lt;Wert&amp;gt;.&lt;br/&gt;&amp;lt;Typ&amp;gt; kann einer der folgenden Werte sein: FILEPATH, PATH, BOOL, INTERNAL oder STRING.</translation>
+        <translation>Geben Sie eine CMake-&lt;a href=&quot;variable&quot;&gt;Variable&lt;/a&gt; pro Zeile ein.&lt;br/&gt;Um eine Variable zu setzen, verwenden Sie -D&amp;lt;Variable&amp;gt;:&amp;lt;Typ&amp;gt;=&amp;lt;Wert&amp;gt;.&lt;br/&gt;&amp;lt;Typ&amp;gt; kann einer der folgenden Werte sein: FILEPATH, PATH, BOOL, INTERNAL oder STRING.</translation>
     </message>
     <message>
         <source>CMake Configuration</source>
@@ -16213,6 +16268,10 @@ Zum Beispiel bewirkt die Angabe &quot;Revision: 15&quot; dass der Branch auf Rev
         <source>Locates the definition of a target of any open CMake project.</source>
         <translation>Findet die Definition eines Ziels in allen geöffneten CMake-Projekten.</translation>
     </message>
+    <message>
+        <source>You may need to add the project directory to the list of directories that are mounted by the build device.</source>
+        <translation>Sie müssen das Projektverzeichnis möglicherweise zur Liste der vom Gerät eingehängten Pfade hinzufügen.</translation>
+    </message>
     <message>
         <source>The source directory %1 is not reachable by the CMake executable %2.</source>
         <translation>Das Quellverzeichnis %1 kann vom CMake-Werkzeug %2 nicht erreicht werden.</translation>
@@ -16249,6 +16308,10 @@ Zum Beispiel bewirkt die Angabe &quot;Revision: 15&quot; dass der Branch auf Rev
         <source>&lt;Generated Files&gt;</source>
         <translation>&lt;Generierte Dateien&gt;</translation>
     </message>
+    <message>
+        <source>CMake Preset (%1) %2 Debugger</source>
+        <translation>CMake-Preset (%1) %2 Debugger</translation>
+    </message>
     <message>
         <source>Unexpected source directory &quot;%1&quot;, expected &quot;%2&quot;. This can be correct in some situations, for example when importing a standalone Qt test, but usually this is an error. Import the build anyway?</source>
         <translation>Unerwartetes Quellverzeichnis &quot;%1&quot;, erwartet wurde &quot;%2&quot;. Dies kann in einigen Situationen korrekt sein, zum Beispiel beim Importieren eines eigenständigen Qt-Tests, aber normalerweise ist es ein Fehler. Soll der Build trotzdem importiert werden?</translation>
@@ -16370,8 +16433,9 @@ Zum Beispiel bewirkt die Angabe &quot;Revision: 15&quot; dass der Branch auf Rev
         <translation>CMake-Auswertung wurde abgebrochen.</translation>
     </message>
     <message>
-        <source>CMake project configuration failed. No CMake configuration for build type &quot;%1&quot; found.</source>
-        <translation>Die CMake-Konfiguration des Projekts ist fehlgeschlagen. Es wurde keine CMake-Konfiguration für den Build-Typ &quot;%1&quot; gefunden.</translation>
+        <source>CMake project configuration failed. No CMake configuration for build type &quot;%1&quot; found. Check General Messages for more information.</source>
+        <extracomment>General Messages refers to the output view</extracomment>
+        <translation>Die CMake-Konfiguration des Projekts ist fehlgeschlagen. Es wurde keine CMake-Konfiguration für den Build-Typ &quot;%1&quot; gefunden. Überprüfen Sie &quot;Allgemeine Ausgaben&quot; für weitere Informationen.</translation>
     </message>
     <message>
         <source>No &quot;%1&quot; CMake configuration found. Available configurations: &quot;%2&quot;.
@@ -16410,12 +16474,16 @@ Stellen Sie sicher, dass der Wert der CMAKE_BUILD_TYPE-Variable derselbe wie der
         <translation>Ungültige &quot;version&quot; in Datei &quot;%1&quot;.</translation>
     </message>
     <message>
-        <source>Invalid &quot;configurePresets&quot; section in %1 file</source>
-        <translation>Ungültiger Abschnitt &quot;configurePresets&quot; in Datei %1</translation>
+        <source>Invalid &quot;configurePresets&quot; section in file &quot;%1&quot;.</source>
+        <translation>Ungültiger Abschnitt &quot;configurePresets&quot; in Datei &quot;%1&quot;.</translation>
     </message>
     <message>
-        <source>Invalid &quot;buildPresets&quot; section in %1 file</source>
-        <translation>Ungültiger Abschnitt &quot;buildPresets&quot; in Datei %1</translation>
+        <source>Invalid &quot;buildPresets&quot; section in file &quot;%1&quot;.</source>
+        <translation>Ungültiger Abschnitt &quot;buildPresets&quot; in Datei &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <source>Invalid &quot;vendor&quot; section in file &quot;%1&quot;.</source>
+        <translation>Ungültiger Abschnitt &quot;vendor&quot; in Datei &quot;%1&quot;.</translation>
     </message>
     <message>
         <source>&lt;File System&gt;</source>
@@ -16801,6 +16869,10 @@ Stellen Sie sicher, dass der Wert der CMAKE_BUILD_TYPE-Variable derselbe wie der
         <source>Generate Compilation Database</source>
         <translation>Kompilierungsdatenbank erzeugen</translation>
     </message>
+    <message>
+        <source>Generating Clang compilation database canceled.</source>
+        <translation>Erzeugen der Clang-Kompilierungsdatenbank wurde abgebrochen.</translation>
+    </message>
     <message>
         <source>Generate Compilation Database for &quot;%1&quot;</source>
         <translation>Kompilierungsdatenbank für &quot;%1&quot; erzeugen</translation>
@@ -16899,6 +16971,10 @@ Stellen Sie sicher, dass der Wert der CMAKE_BUILD_TYPE-Variable derselbe wie der
         <source>Enable Anyway</source>
         <translation>Trotzdem aktivieren</translation>
     </message>
+    <message>
+        <source>Cannot use clangd: Generating compilation database canceled.</source>
+        <translation>Kann Clangd nicht nutzen: Erstellen der Kompilierungsdatenbank wurde abgebrochen.</translation>
+    </message>
     <message>
         <source>Cannot use clangd: Failed to generate compilation database:
 %1</source>
@@ -16930,6 +17006,10 @@ Stellen Sie sicher, dass der Wert der CMAKE_BUILD_TYPE-Variable derselbe wie der
         <source>Could not retrieve build directory.</source>
         <translation>Build-Verzeichnis konnte nicht abgefragt werden.</translation>
     </message>
+    <message>
+        <source>Could not retrieve project info.</source>
+        <translation>Projekt-Information konnte nicht abgefragt werden.</translation>
+    </message>
     <message>
         <source>Could not create &quot;%1&quot;: %2</source>
         <translation>Konnte &quot;%1&quot; nicht erzeugen: %2</translation>
@@ -16942,12 +17022,8 @@ Stellen Sie sicher, dass der Wert der CMAKE_BUILD_TYPE-Variable derselbe wie der
         <translation>Aktuelle ClangFormat-Version: %1.</translation>
     </message>
     <message>
-        <source>Warning: </source>
-        <translation>Warnung: </translation>
-    </message>
-    <message>
-        <source>The current ClangFormat (C++ &gt; Code Style &gt; ClangFormat) settings are not valid. Are you sure you want to apply them?</source>
-        <translation>Die aktuellen Einstellungen für ClangFormat (C++ &gt; Coding-Stil &gt; ClangFormat) sind ungültig. Sind Sie sicher, dass Sie diese anwenden wollen?</translation>
+        <source>Warning:</source>
+        <translation>Warnung:</translation>
     </message>
     <message>
         <source>Open Used .clang-format Configuration File</source>
@@ -16981,7 +17057,7 @@ Das integrierte Codemodell übernimmt das Einrücken.</translation>
     </message>
     <message>
         <source>Use built-in indenter</source>
-        <translation>Integriertes Codemodell für das Einrücken benutzen</translation>
+        <translation>Integriertes Codemodell für das Einrücken verwenden</translation>
     </message>
     <message>
         <source>Use global settings</source>
@@ -16989,11 +17065,11 @@ Das integrierte Codemodell übernimmt das Einrücken.</translation>
     </message>
     <message>
         <source>Please note that the current project includes a .clang-format file, which will be used for code indenting and formatting.</source>
-        <translation>Beachten Sie, dass das aktuelle Projekt eine .clang-format-Datei enthält, welche für das Einrücken und die Formatierung von Code benutzt werden wird.</translation>
+        <translation>Beachten Sie, dass das aktuelle Projekt eine .clang-format-Datei enthält, welche für das Einrücken und die Formatierung von Code verwendet werden wird.</translation>
     </message>
     <message>
-        <source>ClangFormat settings:</source>
-        <translation>Einstellungen für ClangFormat:</translation>
+        <source>ClangFormat Settings</source>
+        <translation>Einstellungen für ClangFormat</translation>
     </message>
     <message>
         <source>Indenting only</source>
@@ -17009,7 +17085,7 @@ Das integrierte Codemodell übernimmt das Einrücken.</translation>
     </message>
     <message>
         <source>When this option is enabled, ClangFormat will use a user-specified configuration from the widget below, instead of the project .clang-format file. You can customize the formatting options for your code by adjusting the settings in the widget. Note that any changes made there will only affect the current configuration, and will not modify the project .clang-format file.</source>
-        <translation>Wenn diese Einstellung aktiviert ist, wird statt der .clang-format-Datei des Projekts die benutzerdefinierte Einstellung unten benutzt. Beachten Sie, dass die unten durchgeführten Einstellungen nur die aktuelle Konfiguration beeinflussen und die .clang-format-Datei des Projekts nicht verändert wird.</translation>
+        <translation>Wenn diese Einstellung aktiviert ist, wird statt der .clang-format-Datei des Projekts die benutzerdefinierte Einstellung unten verwendet. Beachten Sie, dass die unten durchgeführten Einstellungen nur die aktuelle Konfiguration beeinflussen und die .clang-format-Datei des Projekts nicht verändert wird.</translation>
     </message>
     <message>
         <source>ClangFormat</source>
@@ -17116,6 +17192,14 @@ Ausgabe:
         <source>Suppress This Diagnostic</source>
         <translation>Diese Art von Meldungen nicht anzeigen</translation>
     </message>
+    <message>
+        <source>Suppress Selected Diagnostics Inline</source>
+        <translation>Inline-Anzeige der ausgewählten Meldungen unterdrücken</translation>
+    </message>
+    <message>
+        <source>Suppress This Diagnostic Inline</source>
+        <translation>Inline-Anzeige dieser Meldung unterdrücken</translation>
+    </message>
     <message>
         <source>Disable These Checks</source>
         <translation>Diese Checks deaktivieren</translation>
@@ -17266,7 +17350,7 @@ Setzen Sie erst eine gültige ausführbare Datei.</translation>
     </message>
     <message>
         <source>Clang-Tidy and Clazy use a customized Clang executable from the Clang project to search for diagnostics.</source>
-        <translation>Clang-Tidy und Clazy benutzen eine angepasste Version der Anwendung Clang vom Clang-Projekt, um nach Problemen zu suchen.</translation>
+        <translation>Clang-Tidy und Clazy verwenden eine angepasste Version der Anwendung Clang vom Clang-Projekt, um nach Problemen zu suchen.</translation>
     </message>
     <message>
         <source>Release</source>
@@ -17278,11 +17362,11 @@ Setzen Sie erst eine gültige ausführbare Datei.</translation>
     </message>
     <message>
         <source>You are trying to run the tool &quot;%1&quot; on an application in %2 mode. The tool is designed to be used in Debug mode since enabled assertions can reduce the number of false positives.</source>
-        <translation>Sie versuchen das Werkzeug &quot;%1&quot; auf eine Applikation im %2-Modus anzuwenden. Das Werkzeug sollte im Debug-Modus benutzt werden, da eingeschaltete Assertions die Zahl der False-Positives verringern können.</translation>
+        <translation>Sie versuchen das Werkzeug &quot;%1&quot; auf eine Applikation im %2-Modus anzuwenden. Das Werkzeug sollte im Debug-Modus verwendet werden, da eingeschaltete Assertions die Zahl der False-Positives verringern können.</translation>
     </message>
     <message>
         <source>Do you want to continue and run the tool in %1 mode?</source>
-        <translation>Wollen Sie fortfahren und das Werkzeug im %1-Modus benutzen?</translation>
+        <translation>Wollen Sie fortfahren und das Werkzeug im %1-Modus verwenden?</translation>
     </message>
     <message>
         <source>Analyze Project with %1...</source>
@@ -17338,7 +17422,7 @@ Setzen Sie erst eine gültige ausführbare Datei.</translation>
     </message>
     <message>
         <source>Failed to start the analyzer.</source>
-        <translation>Das Analyse-Werkzeug konnte nicht gestartet werden.</translation>
+        <translation>Das Analysewerkzeug konnte nicht gestartet werden.</translation>
     </message>
     <message>
         <source>All Files</source>
@@ -18261,11 +18345,11 @@ Setzen Sie erst eine gültige ausführbare Datei.</translation>
     </message>
     <message>
         <source>&amp;Username:</source>
-        <translation>&amp;Nutzername:</translation>
+        <translation>&amp;Benutzername:</translation>
     </message>
     <message>
         <source>&lt;Username&gt;</source>
-        <translation>&lt;Nutzername&gt;</translation>
+        <translation>&lt;Benutzername&gt;</translation>
     </message>
     <message>
         <source>&amp;Description:</source>
@@ -18293,7 +18377,7 @@ Setzen Sie erst eine gültige ausführbare Datei.</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation>Nutzername:</translation>
+        <translation>Benutzername:</translation>
     </message>
     <message>
         <source>Default protocol:</source>
@@ -18331,7 +18415,7 @@ Setzen Sie erst eine gültige ausführbare Datei.</translation>
     </message>
     <message>
         <source>Reset used libraries</source>
-        <translation>Benutzte Bibliotheken zurücksetzen</translation>
+        <translation>Verwendete Bibliotheken zurücksetzen</translation>
     </message>
     <message>
         <source>No libraries selected</source>
@@ -18371,7 +18455,7 @@ Setzen Sie erst eine gültige ausführbare Datei.</translation>
     </message>
     <message>
         <source>No source code added yet. Add some using the button below.</source>
-        <translation>Es wurde noch kein Quelltext hinzugefügt. Benutzen Sie die Schaltfläche unten, um einen Code-Editor hinzuzufügen.</translation>
+        <translation>Es wurde noch kein Quelltext hinzugefügt. Verwenden Sie die Schaltfläche unten, um einen Code-Editor hinzuzufügen.</translation>
     </message>
     <message>
         <source>Add Source</source>
@@ -18447,7 +18531,7 @@ Setzen Sie erst eine gültige ausführbare Datei.</translation>
     </message>
     <message>
         <source>URL of the Compiler Explorer instance to use.</source>
-        <translation>URL der zu benutzenden Compiler Explorer-Instanz.</translation>
+        <translation>URL der zu verwendenden Compiler Explorer-Instanz.</translation>
     </message>
 </context>
 <context>
@@ -18517,22 +18601,13 @@ Der Code wurde in die Zwischenablage kopiert.</translation>
         <source>Enabling %1 is subject to your agreement and abidance with your applicable %1 terms. It is your responsibility to know and accept the requirements and parameters of using tools like %1. This may include, but is not limited to, ensuring you have the rights to allow %1 access to your code, as well as understanding any implications of your use of %1 and suggestions produced (like copyright, accuracy, etc.).</source>
         <translation>Das Aktivieren von %1 unterliegt Ihrer Zustimmung und der Einhaltung der für Sie geltenden Bestimmungen für die Nutzung von %1. Es liegt in Ihrer Verantwortung, die Bedingungen und Parameter für die Nutzung von Werkzeugen wie %1 zu kennen und zu akzeptieren. Dies umfasst unter anderem, aber beschränkt sich nicht darauf, sicherzustellen, dass Sie das Recht haben, %1 Zugriff zu Ihrem Code zu geben, und dass Sie die Implikationen Ihrer Nutzung von %1 und der davon erstellten Vorschläge kennen (bzgl. Urheberrecht, Copyright, Genauigkeit, usw.).</translation>
     </message>
-    <message>
-        <source>The Copilot plugin requires node.js and the Copilot neovim plugin. If you install the neovim plugin as described in %1, the plugin will find the agent.js file automatically.
-
-Otherwise you need to specify the path to the %2 file from the Copilot neovim plugin.</source>
-        <comment>Markdown text for the copilot instruction label</comment>
-        <translation>Das Copilot-Plugin benötigt node.js und das Copilot-Plugin für Neovim. Wenn Sie das Neovim-Plugin wie in der %1 beschrieben installieren, findet das Plugin die Datei agent.js automatisch.
-
-Ansonsten müssen Sie den Pfad zur Datei %2 aus dem Copilot-Plugin für Neovim angeben.</translation>
-    </message>
     <message>
         <source>Request Copilot Suggestion</source>
         <translation>Vorschlag von Copilot anfordern</translation>
     </message>
     <message>
         <source>Request Copilot suggestion at the current editor&apos;s cursor position.</source>
-        <translation>Fordert Vorschläge für die Cursorposition des aktuellen Editors von Copilot an.</translation>
+        <translation>Fordert Vorschläge für die Einfügemarke des aktuellen Editors von Copilot an.</translation>
     </message>
     <message>
         <source>Show Next Copilot Suggestion</source>
@@ -18580,7 +18655,7 @@ Ansonsten müssen Sie den Pfad zur Datei %2 aus dem Copilot-Plugin für Neovim a
     </message>
     <message>
         <source>Do not ask again. This will disable Copilot for now.</source>
-        <translation>Nicht noch einmal nachfragen. Dies deaktiviert Copilot.</translation>
+        <translation>Nicht erneut nachfragen. Dies deaktiviert Copilot.</translation>
     </message>
     <message>
         <source>Enables the Copilot integration.</source>
@@ -18600,17 +18675,19 @@ Ansonsten müssen Sie den Pfad zur Datei %2 aus dem Copilot-Plugin für Neovim a
         <translation>Wählen Sie den Pfad zur ausführbaren node.js-Datei. Siehe auch %1 für eine Installationsanleitung.</translation>
     </message>
     <message>
-        <source>Path to agent.js:</source>
-        <translation>Pfad zu agent.js:</translation>
+        <source>Path to %1:</source>
+        <extracomment>%1 is the filename of the copilot language server</extracomment>
+        <translation>Pfad zu %1:</translation>
     </message>
     <message>
-        <source>Agent.js path</source>
-        <translation>Pfad zu agent.js</translation>
+        <source>%1 path</source>
+        <extracomment>%1 is the filename of the copilot language server</extracomment>
+        <translation>Pfad zu %1</translation>
     </message>
     <message>
-        <source>Select path to agent.js in Copilot Neovim plugin. See %1 for installation instructions.</source>
-        <extracomment>%1 is the URL to copilot.vim getting started</extracomment>
-        <translation>Wählen Sie den Pfad zur agent.js-Datei vom Copilot-Plugin für Neovim. Siehe auch %1 für eine Installationsanleitung.</translation>
+        <source>Select path to %2 in Copilot Neovim plugin. See %1 for installation instructions.</source>
+        <extracomment>%1 is the URL to copilot.vim getting started, %2 is the filename of the copilot language server</extracomment>
+        <translation>Wählen Sie den Pfad zu %2 im Copilot-Plugin für Neovim. Siehe auch %1 für eine Installationsanleitung.</translation>
     </message>
     <message>
         <source>Auto Request</source>
@@ -18704,13 +18781,22 @@ Ansonsten müssen Sie den Pfad zur Datei %2 aus dem Copilot-Plugin für Neovim a
         <source>Reject unauthorized certificates from the proxy server. Turning this off is a security risk.</source>
         <translation>Lehnt nicht-authorisierte Zertifikate vom Proxy-Server ab. Dies abzustellen ist ein Sicherheitsrisiko.</translation>
     </message>
+    <message>
+        <source>The Copilot plugin requires node.js and the Copilot neovim plugin. If you install the neovim plugin as described in %1, the plugin will find the %3 file automatically.
+
+Otherwise you need to specify the path to the %2 file from the Copilot neovim plugin.</source>
+        <comment>Markdown text for the copilot instruction label</comment>
+        <translation>Das Copilot-Plugin benötigt node.js und das Copilot-Plugin für Neovim. Wenn Sie das Neovim-Plugin wie in der %1 beschrieben installieren, findet das Plugin die Datei %3 automatisch.
+
+Ansonsten müssen Sie den Pfad zur Datei %2 aus dem Copilot-Plugin für Neovim angeben.</translation>
+    </message>
     <message>
         <source>Note</source>
         <translation>Hinweis</translation>
     </message>
     <message>
         <source>Automatically request suggestions for the current text cursor position after changes to the document.</source>
-        <translation>Fordert Vorschläge für die aktuelle Cursorposition nach Änderungen am Dokument automatisch an.</translation>
+        <translation>Fordert Vorschläge für die aktuelle Einfügemarke nach Änderungen am Dokument automatisch an.</translation>
     </message>
 </context>
 <context>
@@ -18845,7 +18931,7 @@ Trotzdem fortfahren?</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Editieren</translation>
+        <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>&lt;System Language&gt;</source>
@@ -18866,8 +18952,8 @@ Trotzdem fortfahren?</translation>
     <message>
         <source>Provide cursors for resizing views.
 If the system cursors for resizing views are not displayed properly, you can use the cursors provided by %1.</source>
-        <translation>Benutzt separate Mauszeiger für das Verändern der Größe von Ansichten.
-Wenn die Systemzeiger für das Verändern der Größe von Ansichten nicht korrekt dargestellt werden, können von %1 bereitgestellte Zeiger benutzt werden.</translation>
+        <translation>Verwendet separate Mauszeiger für das Verändern der Größe von Ansichten.
+Wenn die Systemzeiger für das Verändern der Größe von Ansichten nicht korrekt dargestellt werden, können von %1 bereitgestellte Zeiger verwendet werden.</translation>
     </message>
     <message>
         <source>Toolbar style:</source>
@@ -18909,10 +18995,6 @@ Wenn die Systemzeiger für das Verändern der Größe von Ansichten nicht korrek
         <source>Text codec for tools:</source>
         <translation>Zeichenkodierung für Werkzeuge:</translation>
     </message>
-    <message>
-        <source>The cursors for resizing views will change after restart.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>The language change will take effect after restart.</source>
         <translation>Die Änderung der Sprache wird nach einem Neustart wirksam.</translation>
@@ -18961,7 +19043,7 @@ Wenn die Systemzeiger für das Verändern der Größe von Ansichten nicht korrek
     </message>
     <message>
         <source>Re-enable warnings that were suppressed by selecting &quot;Do Not Show Again&quot; (for example, missing highlighter).</source>
-        <translation>Alle Warnungen wieder aktivieren, die durch &quot;Nicht noch einmal anzeigen&quot; unterdrückt wurden (zum Beispiel fehlende Syntaxhervorhebung).</translation>
+        <translation>Alle Warnungen wieder aktivieren, die durch &quot;Nicht erneut anzeigen&quot; unterdrückt wurden (zum Beispiel fehlende Syntaxhervorhebung).</translation>
     </message>
     <message>
         <source>Theme:</source>
@@ -19125,7 +19207,7 @@ Wenn die Systemzeiger für das Verändern der Größe von Ansichten nicht korrek
     </message>
     <message>
         <source>&lt;p&gt;Qt Creator developers can be reached at the Qt Creator mailing list:&lt;/p&gt;%1&lt;p&gt;or the #qt-creator channel on Libera.Chat IRC:&lt;/p&gt;%2&lt;p&gt;Our bug tracker is located at %3.&lt;/p&gt;&lt;p&gt;Please use %4 for bigger chunks of text.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Sie können die Qt Creator-Entwickler auf dem E-Mail-Verteiler&lt;/p&gt;%1&lt;p&gt;oder dem IRC Kanal #qt-creator auf Libera.Chat&lt;/p&gt;%2&lt;p&gt;erreichen. Unseren Bugtracker finden Sie unter %3.&lt;/p&gt;&lt;p&gt;Bitte benutzen Sie %4 für längere Texte.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Sie können die Qt Creator-Entwickler auf dem E-Mail-Verteiler&lt;/p&gt;%1&lt;p&gt;oder dem IRC Kanal #qt-creator auf Libera.Chat&lt;/p&gt;%2&lt;p&gt;erreichen. Unseren Bugtracker finden Sie unter %3.&lt;/p&gt;&lt;p&gt;Bitte verwenden Sie %4 für längere Texte.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Minimize</source>
@@ -19523,8 +19605,8 @@ Wenn die Systemzeiger für das Verändern der Größe von Ansichten nicht korrek
         <translation>QMLJS-Editor</translation>
     </message>
     <message>
-        <source>Qt Designer</source>
-        <translation>Qt Designer</translation>
+        <source>Qt Widgets Designer</source>
+        <translation>Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Qt Linguist</source>
@@ -20064,6 +20146,15 @@ konnte nicht unter Versionsverwaltung (%2) gestellt werden
         <source>MIME Types</source>
         <translation>MIME-Typen</translation>
     </message>
+    <message>
+        <source>output.txt</source>
+        <extracomment>default file name suggested for saving text from output views</extracomment>
+        <translation>ausgabe.txt</translation>
+    </message>
+    <message>
+        <source>Save Contents...</source>
+        <translation>Inhalt speichern...</translation>
+    </message>
     <message numerus="yes">
         <source>Elided %n characters due to Application Output settings</source>
         <translation>
@@ -20161,14 +20252,6 @@ konnte nicht unter Versionsverwaltung (%2) gestellt werden
 
 %2</translation>
     </message>
-    <message>
-        <source>Launching Windows Explorer Failed</source>
-        <translation>Das Starten des Windows-Explorers schlug fehl</translation>
-    </message>
-    <message>
-        <source>Could not find explorer.exe in path to launch Windows Explorer.</source>
-        <translation>Windows Explorer konnte nicht gestartet werden, da die Datei explorer.exe nicht im Pfad gefunden werden konnte.</translation>
-    </message>
     <message>
         <source>The command for file browser is not set.</source>
         <translation>Das Kommando für den Datei-Browser ist nicht konfiguriert.</translation>
@@ -20261,7 +20344,7 @@ konnte nicht unter Versionsverwaltung (%2) gestellt werden
     </message>
     <message>
         <source>Locates files from a custom set of directories. Append &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the given line number. Append another &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the column number as well.</source>
-        <translation>Findet Dateien aus vom Benutzer gewählten Pfaden. Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
+        <translation>Findet Dateien aus vom Benutzer gewählten Pfaden. Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie erneut &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
     </message>
     <message>
         <source>Add...</source>
@@ -20350,7 +20433,7 @@ konnte nicht unter Versionsverwaltung (%2) gestellt werden
     </message>
     <message>
         <source>Use re&amp;gular expressions</source>
-        <translation>Benutze &amp;reguläre Ausdrücke</translation>
+        <translation>Verwende &amp;reguläre Ausdrücke</translation>
     </message>
     <message>
         <source>Sco&amp;pe:</source>
@@ -20434,6 +20517,10 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeiche
         <source> min</source>
         <translation> Minuten</translation>
     </message>
+    <message>
+        <source>Locator filters show relative paths to the active project when possible.</source>
+        <translation>Locator-Filter zeigen relative Pfade zum aktiven Projekt an, wenn möglich.</translation>
+    </message>
     <message>
         <source>Files in Directories</source>
         <translation>Dateien in Verzeichnissen</translation>
@@ -20588,7 +20675,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeiche
     </message>
     <message>
         <source>&amp;Search Again</source>
-        <translation>Noch einmal &amp;suchen</translation>
+        <translation>Erneut &amp;suchen</translation>
     </message>
     <message>
         <source>Repla&amp;ce with:</source>
@@ -20654,7 +20741,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeiche
     </message>
     <message>
         <source>Filter Results</source>
-        <translation>Resultate filtern</translation>
+        <translation>Ergebnisse filtern</translation>
     </message>
     <message>
         <source>%1 %2</source>
@@ -20736,7 +20823,7 @@ Möchten Sie es beenden?</translation>
     </message>
     <message>
         <source>Include the filter when not using a prefix for searches.</source>
-        <translation>Diesen Filter einschließen, wenn kein Präfix benutzt wird.</translation>
+        <translation>Diesen Filter einschließen, wenn kein Präfix verwendet wird.</translation>
     </message>
     <message>
         <source>Prefix:</source>
@@ -20838,7 +20925,7 @@ Möchten Sie es beenden?</translation>
     </message>
     <message>
         <source>Do not ask again.</source>
-        <translation>Nicht noch einmal nachfragen.</translation>
+        <translation>Nicht erneut nachfragen.</translation>
     </message>
     <message>
         <source>No themes found in installation.</source>
@@ -20900,10 +20987,18 @@ Möchten Sie es beenden?</translation>
         <source>The platform executable suffix.</source>
         <translation>Die plattformspezifische Dateinamenserweiterung für ausführbare Dateien.</translation>
     </message>
+    <message>
+        <source>The path to the running %1 itself.</source>
+        <translation>Der Pfad zum laufenden %1 selbst.</translation>
+    </message>
     <message>
         <source>The directory where %1 finds its pre-installed resources.</source>
         <translation>Das Verzeichnis, in dem %1 seine vorinstallierten Ressourcen findet.</translation>
     </message>
+    <message>
+        <source>The directory where %1 puts custom user data.</source>
+        <translation>Das Verzeichnis, in dem %1 Benutzerdaten speichert.</translation>
+    </message>
     <message>
         <source>The current date (QDate formatstring).</source>
         <translation>Das aktuelle Datum (QDate Formatstring).</translation>
@@ -20970,7 +21065,7 @@ Sie werden wahrscheinlich auf weitere Probleme mit dieser Instanz von %3 stoßen
     </message>
     <message>
         <source>%1 uses Google Crashpad for collecting crashes and sending them to our backend for processing. Crashpad may capture arbitrary contents from crashed process’ memory, including user sensitive information, URLs, and whatever other content users have trusted %1 with. The collected crash reports are however only used for the sole purpose of fixing bugs.</source>
-        <translation>%1 nutzt Google Crashpad, um Absturzberichte zu sammeln und diese zur Verarbeitung an unsere Server zu senden. Crashpad kann beliebige Inhalte des Speichers des abgestürzten Prozesses erfassen. Dies beinhaltet persönliche Daten, URLs und welche Inhalte auch immer der Nutzer %1 anvertraut hat. Die gesammelten Absturzberichte werden allerdings nur zum Zweck der Fehlerbehebung genutzt.</translation>
+        <translation>%1 nutzt Google Crashpad, um Absturzberichte zu sammeln und diese zur Verarbeitung an unsere Server zu senden. Crashpad kann beliebige Inhalte des Speichers des abgestürzten Prozesses erfassen. Dies beinhaltet persönliche Daten, URLs und welche Inhalte auch immer der Benutzer %1 anvertraut hat. Die gesammelten Absturzberichte werden allerdings nur zum Zweck der Fehlerbehebung genutzt.</translation>
     </message>
     <message>
         <source>More information:</source>
@@ -21140,6 +21235,10 @@ Möchten Sie sie jetzt auschecken?</translation>
         <source>Alt+Right</source>
         <translation>Alt+Right</translation>
     </message>
+    <message>
+        <source>Reopen Last Closed Document</source>
+        <translation>Zuletzt geschlossenes Dokument erneut öffnen</translation>
+    </message>
     <message>
         <source>Meta+E,2</source>
         <translation>Meta+E,2</translation>
@@ -21462,10 +21561,6 @@ provided they were unmodified before the refactoring.</source>
         <source>Crash Reporting</source>
         <translation>Absturzberichte</translation>
     </message>
-    <message>
-        <source>The change will take effect after restart.</source>
-        <translation>Die Änderung wird nach einem Neustart wirksam.</translation>
-    </message>
     <message>
         <source>Case Sensitive (Default)</source>
         <translation>Groß-/Kleinschreibung beachten (Vorgabe)</translation>
@@ -21599,7 +21694,7 @@ provided they were unmodified before the refactoring.</source>
     </message>
     <message>
         <source>Locates files from a global file system index (Spotlight, Locate, Everything). Append &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the given line number. Append another &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the column number as well.</source>
-        <translation>Findet Dateien aus einem globalen Dateisystemindex (Spotlight, Locate, Everything). Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
+        <translation>Findet Dateien aus einem globalen Dateisystemindex (Spotlight, Locate, Everything). Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie erneut &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
     </message>
     <message>
         <source>Sort results</source>
@@ -21756,11 +21851,11 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.</translation>
     </message>
     <message>
         <source>Use &quot;Cmd&quot;, &quot;Opt&quot;, &quot;Ctrl&quot;, and &quot;Shift&quot; for modifier keys. Use &quot;Escape&quot;, &quot;Backspace&quot;, &quot;Delete&quot;, &quot;Insert&quot;, &quot;Home&quot;, and so on, for special keys. Combine individual keys with &quot;+&quot;, and combine multiple shortcuts to a shortcut sequence with &quot;,&quot;. For example, if the user must hold the Ctrl and Shift modifier keys while pressing Escape, and then release and press A, enter &quot;Ctrl+Shift+Escape,A&quot;.</source>
-        <translation>Benutzen Sie &quot;Cmd&quot;, &quot;Opt&quot;, &quot;Ctrl&quot;, und &quot;Shift&quot; für Hilfstasten. Benutzen Sie &quot;Escape&quot;, &quot;Backspace&quot;, &quot;Delete&quot;, &quot;Insert&quot;, &quot;Home&quot; und so weiter für Sondertasten. Kombinieren Sie einzelne Tasten mit &quot;+&quot; und kombinieren Sie mehrere Tastenkombinationen mit &quot;,&quot; zu einer Tastenfolge. Wenn der Benutzer etwa die Strg- und Umschalttasten gedrückt halten muss, während er Escape drückt, um danach alle Tasten zu lösen und A zu drücken, geben Sie &quot;Ctrl+Shift+Escape,A&quot; ein.</translation>
+        <translation>Verwenden Sie &quot;Cmd&quot;, &quot;Opt&quot;, &quot;Ctrl&quot;, und &quot;Shift&quot; für Hilfstasten. Verwenden Sie &quot;Escape&quot;, &quot;Backspace&quot;, &quot;Delete&quot;, &quot;Insert&quot;, &quot;Home&quot; und so weiter für Sondertasten. Kombinieren Sie einzelne Tasten mit &quot;+&quot; und kombinieren Sie mehrere Tastenkombinationen mit &quot;,&quot; zu einer Tastenfolge. Wenn der Benutzer etwa die Strg- und Umschalttasten gedrückt halten muss, während er Escape drückt, um danach alle Tasten zu lösen und A zu drücken, geben Sie &quot;Ctrl+Shift+Escape,A&quot; ein.</translation>
     </message>
     <message>
         <source>Use &quot;Ctrl&quot;, &quot;Alt&quot;, &quot;Meta&quot;, and &quot;Shift&quot; for modifier keys. Use &quot;Escape&quot;, &quot;Backspace&quot;, &quot;Delete&quot;, &quot;Insert&quot;, &quot;Home&quot;, and so on, for special keys. Combine individual keys with &quot;+&quot;, and combine multiple shortcuts to a shortcut sequence with &quot;,&quot;. For example, if the user must hold the Ctrl and Shift modifier keys while pressing Escape, and then release and press A, enter &quot;Ctrl+Shift+Escape,A&quot;.</source>
-        <translation>Benutzen Sie &quot;Ctrl&quot;, &quot;Alt&quot;, &quot;Meta&quot;, und &quot;Shift&quot; für Hilfstasten. Benutzen Sie &quot;Escape&quot;, &quot;Backspace&quot;, &quot;Delete&quot;, &quot;Insert&quot;, &quot;Home&quot; und so weiter für Sondertasten. Kombinieren Sie einzelne Tasten mit &quot;+&quot; und kombinieren Sie mehrere Tastenkombinationen mit &quot;,&quot; zu einer Tastenfolge. Wenn der Benutzer etwa die Strg- und Umschalttasten gedrückt halten muss, während er Escape drückt, um danach alle Tasten zu lösen und A zu drücken, geben Sie &quot;Ctrl+Shift+Escape,A&quot; ein.</translation>
+        <translation>Verwenden Sie &quot;Ctrl&quot;, &quot;Alt&quot;, &quot;Meta&quot;, und &quot;Shift&quot; für Hilfstasten. Verwenden Sie &quot;Escape&quot;, &quot;Backspace&quot;, &quot;Delete&quot;, &quot;Insert&quot;, &quot;Home&quot; und so weiter für Sondertasten. Kombinieren Sie einzelne Tasten mit &quot;+&quot; und kombinieren Sie mehrere Tastenkombinationen mit &quot;,&quot; zu einer Tastenfolge. Wenn der Benutzer etwa die Strg- und Umschalttasten gedrückt halten muss, während er Escape drückt, um danach alle Tasten zu lösen und A zu drücken, geben Sie &quot;Ctrl+Shift+Escape,A&quot; ein.</translation>
     </message>
     <message>
         <source>Enter key sequence as text</source>
@@ -21824,7 +21919,7 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.</translation>
     </message>
     <message>
         <source>The plugin will be available to all compatible %1 installations, but only for the current user.</source>
-        <translation>Das Plugin wird für alle kompatiblen Installationen von %1 verfügbar sein, aber nur für den aktuellen Nutzer.</translation>
+        <translation>Das Plugin wird für alle kompatiblen Installationen von %1 verfügbar sein, aber nur für den aktuellen Benutzer.</translation>
     </message>
     <message>
         <source>%1 installation</source>
@@ -21832,7 +21927,7 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.</translation>
     </message>
     <message>
         <source>The plugin will be available only to this %1 installation, but for all users that can access it.</source>
-        <translation>Das Plugin wird nur für diese Installation von %1 verfügbar sein, aber für alle Nutzer, die diese Ausführen können.</translation>
+        <translation>Das Plugin wird nur für diese Installation von %1 verfügbar sein, aber für alle Benutzer, die diese Ausführen können.</translation>
     </message>
     <message>
         <source>Summary</source>
@@ -21936,8 +22031,14 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.</translation>
     </message>
     <message>
         <source>Executable:</source>
+        <comment>adjective</comment>
         <translation>Ausführbar:</translation>
     </message>
+    <message>
+        <source>Executable:</source>
+        <comment>noun</comment>
+        <translation>Ausführbare Datei:</translation>
+    </message>
     <message>
         <source>Symbolic link:</source>
         <translation>Symbolischer Link:</translation>
@@ -22262,10 +22363,6 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.</translation>
         <source>Evaluating type hierarchy...</source>
         <translation>Werte Typ-Hierarchie aus...</translation>
     </message>
-    <message>
-        <source>Type Hierarchy</source>
-        <translation>Klassenhierarchie</translation>
-    </message>
     <message>
         <source>Add Definition in %1</source>
         <translation>Definition in %1 hinzufügen</translation>
@@ -22427,7 +22524,7 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.</translation>
         <translation>#include %1 hinzufügen</translation>
     </message>
     <message>
-        <source>Add forward declaration for %1</source>
+        <source>Add Forward Declaration for %1</source>
         <translation>Vorwärtsdeklaration für %1 hinzufügen</translation>
     </message>
     <message>
@@ -22638,14 +22735,6 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.</translation>
         <source>Open Type Hierarchy</source>
         <translation>Klassenhierarchie öffnen</translation>
     </message>
-    <message>
-        <source>Meta+Shift+T</source>
-        <translation>Meta+Shift+T</translation>
-    </message>
-    <message>
-        <source>Ctrl+Shift+T</source>
-        <translation>Ctrl+Shift+T</translation>
-    </message>
     <message>
         <source>Open Include Hierarchy</source>
         <translation>Include-Hierarchie öffnen</translation>
@@ -22828,7 +22917,7 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.</translation>
     </message>
     <message>
         <source>Convert to Stack Variable</source>
-        <translation>In Stack-Variable umwandeln</translation>
+        <translation>In Stackvariable umwandeln</translation>
     </message>
     <message>
         <source>Convert to Pointer</source>
@@ -22896,6 +22985,14 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.</translation>
         <translation>Deklarationen in
 Namensraum-Definition</translation>
     </message>
+    <message>
+        <source>Macros that can be used as statements without a trailing semicolon.</source>
+        <translation>Makros, die ohne abschließendes Semikolon benutzt werden können.</translation>
+    </message>
+    <message>
+        <source>Statement Macros</source>
+        <translation>Anweisungs-Makros</translation>
+    </message>
     <message>
         <source>Braces</source>
         <translation>Klammern</translation>
@@ -23054,7 +23151,7 @@ ausgerichtet werden würden</translation>
    int (*pa)[2] = ...;
 
 &lt;/pre&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;Dies bezieht sich nicht auf die Stern- und Referenzsymbole in Zeigern auf / Referenzen zu Funktionen und Feldern, zum Beispiel:
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;Dies bezieht sich nicht auf die Stern- und Referenzsymbole in Zeigern auf / Referenzen zu Funktionen und Arrays, zum Beispiel:
 &lt;pre&gt;   int (&amp;rf)() = ...;
    int (*pf)() = ...;
 
@@ -23115,18 +23212,10 @@ These prefixes are used in addition to current file name on Switch Header/Source
 
 Diese Präfixe werden zusätzlich zum Dateinamen beim Wechseln zwischen Header- und Quelldatei verwendet.</translation>
     </message>
-    <message>
-        <source>Include guards</source>
-        <translation>Include-Guards</translation>
-    </message>
     <message>
         <source>Uses &quot;#pragma once&quot; instead of &quot;#ifndef&quot; include guards.</source>
         <translation>Verwendet &quot;#pragma once&quot; statt Include-Guards mit &quot;#ifndef&quot;.</translation>
     </message>
-    <message>
-        <source>Use &quot;#pragma once&quot; instead of &quot;#ifndef&quot; guards</source>
-        <translation>&quot;#pragma once&quot; statt Include-Guards mit &quot;#ifndef&quot; verwenden</translation>
-    </message>
     <message>
         <source>Headers</source>
         <translation>Header-Dateien</translation>
@@ -23167,10 +23256,26 @@ These prefixes are used in addition to current file name on Switch Header/Source
 
 Diese Präfixe werden zusätzlich zum Dateinamen beim Wechseln zwischen Header- und Quelldatei verwendet.</translation>
     </message>
+    <message>
+        <source>Header File Variables</source>
+        <translation>Variablen für Header-Dateien</translation>
+    </message>
+    <message>
+        <source>Header file</source>
+        <translation>Header-Datei</translation>
+    </message>
+    <message>
+        <source>Use &quot;#pragma once&quot; instead</source>
+        <translation>Stattdessen &quot;#pragma once&quot; benutzen</translation>
+    </message>
     <message>
         <source>&amp;Lower case file names</source>
         <translation>&amp;Kleinbuchstaben für Dateinamen verwenden</translation>
     </message>
+    <message>
+        <source>Include guard template:</source>
+        <translation>Vorlage für Include-Guards:</translation>
+    </message>
     <message>
         <source>License &amp;template:</source>
         <translation>Lizenz&amp;vorlage:</translation>
@@ -23297,7 +23402,7 @@ Diese Präfixe werden zusätzlich zum Dateinamen beim Wechseln zwischen Header-
     </message>
     <message>
         <source>Use type &quot;auto&quot; when creating new variables</source>
-        <translation>Typ &quot;auto&quot; beim Erstellen von neuen Variablen benutzen</translation>
+        <translation>Typ &quot;auto&quot; beim Erstellen von neuen Variablen verwenden</translation>
     </message>
     <message>
         <source>Custom Getter Setter Templates</source>
@@ -23349,9 +23454,9 @@ Diese Präfixe werden zusätzlich zum Dateinamen beim Wechseln zwischen Header-
         <translation>Normalerweise werden Argumente als konstante Referenz übergeben. Das Argument wird als Wert übergeben, wenn der Typ einer der folgenden ist. Namensräume und Vorlagenargumente werden entfernt. Der wirkliche Typ muss den angegebenen Typ enthalten. Zum Beispiel passt &quot;int&quot; zu &quot;int32_t&quot;, aber nicht zu &quot;vector&lt;int&gt;&quot;. &quot;vector&quot; passt zu &quot;std::pmr::vector&lt;int&gt;&quot;, aber nicht zu &quot;std::optional&lt;vector&lt;int&gt;&gt;&quot;</translation>
     </message>
     <message>
-        <source>Value types:</source>
+        <source>Value Types</source>
         <translatorcomment>https://learn.microsoft.com/de-de/cpp/cpp/value-types-modern-cpp</translatorcomment>
-        <translation>Werttypen:</translation>
+        <translation>Werttypen</translation>
     </message>
     <message>
         <source>Return non-value types by const reference</source>
@@ -23582,11 +23687,11 @@ z.B. name = &quot;m_test_foo_&quot;:
     </message>
     <message>
         <source>Use Built-in Only</source>
-        <translation>Nur integriertes Backend benutzen</translation>
+        <translation>Nur integriertes Backend verwenden</translation>
     </message>
     <message>
         <source>Use Clangd Only</source>
-        <translation>Nur Clangd benutzen</translation>
+        <translation>Nur Clangd verwenden</translation>
     </message>
     <message>
         <source>Try Both</source>
@@ -23604,6 +23709,14 @@ z.B. name = &quot;m_test_foo_&quot;:
         <source>Interpret ambiguous headers as C headers</source>
         <translation>Mehrdeutige Header als C-Header behandeln</translation>
     </message>
+    <message>
+        <source>Enable indexing</source>
+        <translation>Indizieren aktivieren</translation>
+    </message>
+    <message>
+        <source>Indexing should almost always be kept enabled, as disabling it will severely limit the capabilities of the code model.</source>
+        <translation>Das Indizieren sollte nahezu immer aktiviert bleiben, da das Deaktivieren die Fähigkeiten des Codemodells erheblich einschränkt.</translation>
+    </message>
     <message>
         <source>Do not index files greater than</source>
         <translation>Dateien nicht indizieren, wenn sie größer sind als</translation>
@@ -23630,11 +23743,11 @@ z.B. name = &quot;m_test_foo_&quot;:
     </message>
     <message>
         <source>Use built-in preprocessor to show pre-processed files</source>
-        <translation>Den integrierten Präprozessor zum Anzeigen von vorverarbeiteten Dateien benutzen</translation>
+        <translation>Den integrierten Präprozessor zum Anzeigen von vorverarbeiteten Dateien verwenden</translation>
     </message>
     <message>
         <source>Uncheck this to invoke the actual compiler to show a pre-processed source file in the editor.</source>
-        <translation>Wählen Sie dies ab, um den Compiler zum Anzeigen von vorverarbeiteten Dateien zu benutzen.</translation>
+        <translation>Wählen Sie dies ab, um den Compiler zum Anzeigen von vorverarbeiteten Dateien zu verwenden.</translation>
     </message>
     <message>
         <source>Code Model</source>
@@ -23642,29 +23755,41 @@ z.B. name = &quot;m_test_foo_&quot;:
     </message>
     <message>
         <source>&lt;p&gt;If background indexing is enabled, global symbol searches will yield more accurate results, at the cost of additional CPU load when the project is first opened. The indexing result is persisted in the project&apos;s build directory. If you disable background indexing, a faster, but less accurate, built-in indexer is used instead. The thread priority for building the background index can be adjusted since clangd 15.&lt;/p&gt;&lt;p&gt;Background Priority: Minimum priority, runs on idle CPUs. May leave &apos;performance&apos; cores unused.&lt;/p&gt;&lt;p&gt;Normal Priority: Reduced priority compared to interactive work.&lt;/p&gt;&lt;p&gt;Low Priority: Same priority as other clangd work.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Wenn sie das globale Indizieren aktivieren, liefert die globale Symbolsuche genauere Resultate, es erhöht aber die CPU-Last beim ersten Öffnen von Projekten. Das Resultat der Indizierung wird im Build-Verzeichnis des Projekts gespeichert. Wenn sie das globale Indizieren deaktivieren, wird stattdessen ein schnellerer, aber weniger genauer, integrierter Indexer benutzt. Seit Clangd 15 können Sie die Priorität für die Indizierungs-Threads anpassen.&lt;/p&gt;&lt;p&gt;Hintergrund-Priorität: Niedrigste Priorität, läuft nur auf leerlaufenden CPUs. Kann &quot;Performance&quot;-Kerne ungenutzt lassen.&lt;/p&gt;&lt;p&gt;Normale Priorität: Geringere Priorität im Vergleich zu interaktiven Aktivitäten.&lt;/p&gt;&lt;p&gt;Niedrige Priorität: Dieselbe Priorität wie andere Clangd-Aktivitäten.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Wenn Sie das globale Indizieren aktivieren, liefert die globale Symbolsuche genauere Ergebnisse, es erhöht aber die CPU-Last beim ersten Öffnen von Projekten. Das Ergebnis der Indizierung wird im Build-Verzeichnis des Projekts gespeichert. Wenn Sie das globale Indizieren deaktivieren, wird stattdessen ein schnellerer, aber weniger genauer, integrierter Indexer verwendet. Seit Clangd 15 können Sie die Priorität für die Indizierungs-Threads anpassen.&lt;/p&gt;&lt;p&gt;Hintergrund-Priorität: Niedrigste Priorität, läuft nur auf leerlaufenden CPUs. Kann &quot;Performance&quot;-Kerne ungenutzt lassen.&lt;/p&gt;&lt;p&gt;Normale Priorität: Geringere Priorität im Vergleich zu interaktiven Aktivitäten.&lt;/p&gt;&lt;p&gt;Niedrige Priorität: Dieselbe Priorität wie andere Clangd-Aktivitäten.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>The location of the per-project clangd index.&lt;p&gt;This is also where the compile_commands.json file will go.</source>
+        <translation>Der Pfad zum Clangd-Index pro Projekt.&lt;p&gt;Dies ist auch der Ort, an dem die compile_commands.json-Datei gespeichert wird.</translation>
+    </message>
+    <message>
+        <source>The location of the per-session clangd index.&lt;p&gt;This is also where the compile_commands.json file will go.</source>
+        <translation>Der Pfad zum Clangd-Index pro Sitzung.&lt;p&gt;Dies ist auch der Ort, an dem die compile_commands.json-Datei gespeichert wird.</translation>
     </message>
     <message>
         <source>&lt;p&gt;The C/C++ backend to use for switching between header and source files.&lt;/p&gt;&lt;p&gt;While the clangd implementation has more capabilities than the built-in code model, it tends to find false positives.&lt;/p&gt;&lt;p&gt;When &quot;Try Both&quot; is selected, clangd is used only if the built-in variant does not find anything.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Bestimmt, welches C/C++-Backend zum Wechseln zwischen Header- und Quelldatei benutzt wird.&lt;/p&gt;&lt;p&gt;Die Clangd-Implementation hat mehr Fähigkeiten, aber auch einige Fehler, die nicht in der integrierten Variante vorhanden sind.&lt;/p&gt;&lt;p&gt;Wenn &quot;Beide versuchen&quot; ausgewählt ist, wird Clangd nur benutzt, wenn die integrierte Variant nichts findet.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Bestimmt, welches C/C++-Backend zum Wechseln zwischen Header- und Quelldatei verwendet wird.&lt;/p&gt;&lt;p&gt;Die Clangd-Implementation hat mehr Fähigkeiten, aber auch einige Fehler, die nicht in der integrierten Variante vorhanden sind.&lt;/p&gt;&lt;p&gt;Wenn &quot;Beide versuchen&quot; ausgewählt ist, wird Clangd nur verwendet, wenn die integrierte Variant nichts findet.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Which model clangd should use to rank possible completions.&lt;/p&gt;&lt;p&gt;This determines the order of candidates in the combo box when doing code completion.&lt;/p&gt;&lt;p&gt;The &quot;%1&quot; model used by default results from (pre-trained) machine learning and provides superior results on average.&lt;/p&gt;&lt;p&gt;If you feel that its suggestions stray too much from your expectations for your code base, you can try switching to the hand-crafted &quot;%2&quot; model.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Das Modell, das Clangd für die Rangfolge der möglichen Vervollständigungen benutzen soll.&lt;/p&gt;&lt;p&gt;Dies bestimmt die Reihenfolge der Kandidaten im Drop-Down-Menü der Code-Vervollständigung.&lt;/p&gt;&lt;p&gt;Das voreingestellte Modell &quot;%1&quot; wurde durch maschinelles Lernen trainiert und bietet im Schnitt die besten Ergebnisse.&lt;/p&gt;&lt;p&gt;Falls dies für Ihren Code zu sehr von Ihren Erwartungen abweicht, können Sie auf das manuell erstellte Modell &quot;%2&quot; umstellen.&lt;p&gt;</translation>
+        <translation>&lt;p&gt;Das Modell, das Clangd für die Rangfolge der möglichen Vervollständigungen verwenden soll.&lt;/p&gt;&lt;p&gt;Dies bestimmt die Reihenfolge der Kandidaten im Drop-Down-Menü der Code-Vervollständigung.&lt;/p&gt;&lt;p&gt;Das voreingestellte Modell &quot;%1&quot; wurde durch maschinelles Lernen trainiert und bietet im Schnitt die besten Ergebnisse.&lt;/p&gt;&lt;p&gt;Falls dies für Ihren Code zu sehr von Ihren Erwartungen abweicht, können Sie auf das manuell erstellte Modell &quot;%2&quot; umstellen.&lt;p&gt;</translation>
     </message>
     <message>
         <source>Number of worker threads used by clangd. Background indexing also uses this many worker threads.</source>
-        <translation>Anzahl der Threads, die von Clangd benutzt werden. Die globale Indizierung nutzt auch diese Anzahl Threads.</translation>
+        <translation>Anzahl der Threads, die von Clangd verwendet werden. Die globale Indizierung nutzt auch diese Anzahl Threads.</translation>
     </message>
     <message>
         <source>Controls whether clangd may insert header files as part of symbol completion.</source>
         <translation>Bestimmt, ob Clangd beim Vervollständigen von Symbolen Header-Dateien einfügen darf.</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;Controls whether when editing a header file, clangd should re-parse all source files including that header.&lt;/p&gt;&lt;p&gt;Note that enabling this option can cause considerable CPU load when editing widely included headers.&lt;/p&gt;&lt;p&gt;If this option is disabled, the dependent source files are only re-parsed when the header file is saved.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Bestimmt, ob Clangd beim Bearbeiten einer Header-Datei alle Quelldateien, die diesen Header benutzen, neu auswerten soll.&lt;/p&gt;&lt;p&gt;Beachten Sie, dass das Aktivieren dieser Einstellung erhebliche Prozessorauslastung beim Bearbeiten weitgenutzter Header-Dateien zur Folge haben kann.&lt;/p&gt;&lt;p&gt;Wenn diese Einstellung deaktiviert ist, werden abhängige Quelldateien erst erneut ausgewertet, wenn die Header-Datei gespeichert wird.&lt;/p&gt;</translation>
+    </message>
     <message>
         <source>Defines the amount of time %1 waits before sending document changes to the server.
 If the document changes again while waiting, this timeout resets.</source>
         <translation>Bestimmt die Zeit, die %1 vor dem Senden von Dokumentänderungen an den Server wartet.
-Falls sich das Dokument innerhalb dieser Zeit wieder ändert, wird erneut die volle Zeit gewartet.</translation>
+Falls sich das Dokument innerhalb dieser Zeit erneut ändert, wird nochmal die volle Zeit gewartet.</translation>
     </message>
     <message>
         <source>Files greater than this will not be opened as documents in clangd.
@@ -23674,16 +23799,20 @@ Das integrierte Codemodell übernimmt Syntaxhervorhebung, Code-Vervollständigun
     </message>
     <message>
         <source>The maximum number of completion results returned by clangd.</source>
-        <translation>Die maximale Anzahl Resultate die von Clangd für die Code-Vervollständigung zurück gegeben werden.</translation>
+        <translation>Die maximale Anzahl Ergebnisse, die von Clangd für die Code-Vervollständigung zurückgegeben werden.</translation>
     </message>
     <message>
         <source>Use clangd</source>
-        <translation>Clangd benutzen</translation>
+        <translation>Clangd verwenden</translation>
     </message>
     <message>
         <source>Insert header files on completion</source>
         <translation>Bei Code-Vervollständigung Header-Dateien hinzufügen</translation>
     </message>
+    <message>
+        <source>Update dependent sources</source>
+        <translation>Abhängige Quellen aktualisieren</translation>
+    </message>
     <message>
         <source>Automatic</source>
         <translation>Automatisch</translation>
@@ -23694,7 +23823,7 @@ Das integrierte Codemodell übernimmt Syntaxhervorhebung, Code-Vervollständigun
     </message>
     <message>
         <source>Completion results:</source>
-        <translation>Anzahl der Resultate der Code-Vervollständigung:</translation>
+        <translation>Anzahl der Ergebnisse der Code-Vervollständigung:</translation>
     </message>
     <message>
         <source>No limit</source>
@@ -23708,6 +23837,14 @@ Das integrierte Codemodell übernimmt Syntaxhervorhebung, Code-Vervollständigun
         <source>Background indexing:</source>
         <translation>Indizierung:</translation>
     </message>
+    <message>
+        <source>Per-project index location:</source>
+        <translation>Pfad des Index pro Projekt:</translation>
+    </message>
+    <message>
+        <source>Per-session index location:</source>
+        <translation>Pfad des Index pro Sitzung:</translation>
+    </message>
     <message>
         <source>Header/source switch mode:</source>
         <translation>Modus für das Wechseln zwischen Header- und Quelldatei:</translation>
@@ -23725,7 +23862,7 @@ Das integrierte Codemodell übernimmt Syntaxhervorhebung, Code-Vervollständigun
         <translation>Zeitabstand für das Aktualisieren von Dokumenten:</translation>
     </message>
     <message>
-        <source>Sessions with a single clangd instance</source>
+        <source>Sessions with a Single Clangd Instance</source>
         <translation>Sitzungen mit einer einzigen Clangd-Instanz</translation>
     </message>
     <message>
@@ -23973,7 +24110,7 @@ Ziehen Sie Eintrage mit der Maus, um die Reihenfolge der Parameter zu ändern.</
     </message>
     <message>
         <source>Quick Fix settings are saved in a file. Existing settings file &quot;%1&quot; found. Should this file be used or a new one be created?</source>
-        <translation>Einstellungen für Quick Fixes werden in einer Datei gespeichert. Es wurde eine existierende Einstellungs-Datei &quot;%1&quot; gefunden. Soll diese Datei benutzt, oder eine neue Datei erstellt werden?</translation>
+        <translation>Einstellungen für Quick Fixes werden in einer Datei gespeichert. Es wurde eine existierende Einstellungs-Datei &quot;%1&quot; gefunden. Soll diese Datei verwendet oder eine neue Datei erstellt werden?</translation>
     </message>
     <message>
         <source>Switch Back to Global Settings</source>
@@ -23981,7 +24118,7 @@ Ziehen Sie Eintrage mit der Maus, um die Reihenfolge der Parameter zu ändern.</
     </message>
     <message>
         <source>Use Existing</source>
-        <translation>Existierende benutzen</translation>
+        <translation>Existierende verwenden</translation>
     </message>
     <message>
         <source>Create New</source>
@@ -23989,7 +24126,7 @@ Ziehen Sie Eintrage mit der Maus, um die Reihenfolge der Parameter zu ändern.</
     </message>
     <message>
         <source>Custom settings are saved in a file. If you use the global settings, you can delete that file.</source>
-        <translation>Benutzerdefinierte Einstellungen werden in einer Datei gespeichert. Wenn Sie die globalen Einstellungen benutzen, können Sie diese Datei löschen.</translation>
+        <translation>Benutzerdefinierte Einstellungen werden in einer Datei gespeichert. Wenn Sie die globalen Einstellungen verwenden, können Sie diese Datei löschen.</translation>
     </message>
     <message>
         <source>Delete Custom Settings File</source>
@@ -24066,12 +24203,50 @@ Flags: %3</translation>
     </message>
     <message>
         <source>Locates files that are included by C++ files of any open project. Append &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the given line number. Append another &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the column number as well.</source>
-        <translation>Findet alle Dateien die von allen C++-Dateien aller Projekte eingebunden werden. Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
+        <translation>Findet alle Dateien die von allen C++-Dateien aller Projekte eingebunden werden. Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie erneut &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
     </message>
     <message>
         <source>collecting overrides...</source>
         <translation>Suche überschriebene Methoden...</translation>
     </message>
+    <message>
+        <source>Convert Function Call to Qt Meta-Method Invocation</source>
+        <translation>Funktionsaufruf in Qt Meta-Methodenaufruf umwandeln</translation>
+    </message>
+    <message>
+        <source>Move Class to a Dedicated Set of Source Files</source>
+        <translation>Klasse in dedizierten Satz Quelldateien verschieben</translation>
+    </message>
+    <message>
+        <source>Header file only</source>
+        <translation>Nur Header-Datei</translation>
+    </message>
+    <message>
+        <source>Project:</source>
+        <translation>Projekt:</translation>
+    </message>
+    <message>
+        <source>Header file:</source>
+        <translation>Header-Datei:</translation>
+    </message>
+    <message>
+        <source>Implementation file:</source>
+        <translation>Implementationsdatei:</translation>
+    </message>
+    <message>
+        <source>Refusing to overwrite the following files: %1
+</source>
+        <translation>Folgende Dateien existieren und werden nicht überschrieben: %1
+</translation>
+    </message>
+    <message>
+        <source>Failed to add to project file &quot;%1&quot;: %2</source>
+        <translation>Hinzufügen zur Projektdatei &quot;%1&quot; fehlgeschlagen: %2</translation>
+    </message>
+    <message>
+        <source>Re-order Member Function Definitions According to Declaration Order</source>
+        <translation>Definitionen der Memberfunktionen entsprechend der Deklarationsreihenfolge anordnen</translation>
+    </message>
 </context>
 <context>
     <name>QtC::Cppcheck</name>
@@ -24145,7 +24320,7 @@ Flags: %3</translation>
     </message>
     <message>
         <source>Can find missing includes but makes checking slower. Use only when needed.</source>
-        <translation>Kann fehlende Includes finden, verlangsamt aber die Prüfung. Benutzen Sie dies nur, wenn es nötig ist.</translation>
+        <translation>Kann fehlende Includes finden, verlangsamt aber die Prüfung. Verwenden Sie dies nur, wenn es nötig ist.</translation>
     </message>
     <message>
         <source>Like C++ standard and language.</source>
@@ -24232,7 +24407,7 @@ Flags: %3</translation>
     </message>
     <message>
         <source>Stack Level %1</source>
-        <translation>Stack-Level %1</translation>
+        <translation>Stacklevel %1</translation>
     </message>
     <message>
         <source>Value</source>
@@ -24353,7 +24528,7 @@ Flags: %3</translation>
     <message>
         <source>The trace contains threads with stack depth &gt; 512.
 Do you want to display them anyway?</source>
-        <translation>Die Trace-Daten enthalten Threads mit einer Stack-Tiefe größer als 512.
+        <translation>Die Trace-Daten enthalten Threads mit einer Stacktiefe größer als 512.
 Möchten Sie die Daten trotzdem anzeigen?</translation>
     </message>
     <message>
@@ -24722,6 +24897,14 @@ Möchten Sie die Daten trotzdem anzeigen?</translation>
         <source>&amp;Condition:</source>
         <translation>&amp;Bedingung:</translation>
     </message>
+    <message>
+        <source>Disable All Breakpoints</source>
+        <translation>Alle Haltepunkte deaktivieren</translation>
+    </message>
+    <message>
+        <source>Enable All Breakpoints</source>
+        <translation>Alle Haltepunkte aktivieren</translation>
+    </message>
     <message>
         <source>Disable Selected Locations</source>
         <translation>Ausgewählte Adressen deaktivieren</translation>
@@ -24920,7 +25103,7 @@ Möchten Sie die Daten trotzdem anzeigen?</translation>
     </message>
     <message>
         <source>Configure Symbol paths that are used to locate debug symbol files.</source>
-        <translation>Symbolpfade konfigurieren, die benutzt werden, um Debug-Symboldateien zu finden.</translation>
+        <translation>Symbolpfade konfigurieren, die verwendet werden, um Debug-Symboldateien zu finden.</translation>
     </message>
     <message>
         <source>Log Time Stamps</source>
@@ -24980,7 +25163,7 @@ Möchten Sie die Daten trotzdem anzeigen?</translation>
     </message>
     <message>
         <source>Displays the objectName property of QObject based items. Note that this can negatively impact debugger performance even if no QObjects are present.</source>
-        <translation>Zeigt die objectName-Eigenschaft von QObject basierten Elementen an. Dies kann die Debugger-Geschwindigkeit verschlechtern, selbst wenn keine QObjects benutzt werden.</translation>
+        <translation>Zeigt die objectName-Eigenschaft von QObject basierten Elementen an. Dies kann die Debugger-Geschwindigkeit verschlechtern, selbst wenn keine QObjects verwendet werden.</translation>
     </message>
     <message>
         <source>Sort Members of Classes and Structs Alphabetically</source>
@@ -24992,7 +25175,7 @@ Möchten Sie die Daten trotzdem anzeigen?</translation>
     </message>
     <message>
         <source>Use Debugging Helpers</source>
-        <translation>Ausgabe-Hilfsbibliothek benutzen</translation>
+        <translation>Ausgabe-Hilfsbibliothek verwenden</translation>
     </message>
     <message>
         <source>Use code model</source>
@@ -25000,7 +25183,7 @@ Möchten Sie die Daten trotzdem anzeigen?</translation>
     </message>
     <message>
         <source>Selecting this causes the C++ Code Model being asked for variable scope information. This might result in slightly faster debugger operation but may fail for optimized code.</source>
-        <translation>Benutzt das Codemodell, um Informationen bezüglich des Gültigkeitsbereiches von Variablen zu erhalten. Dies kann eine etwas schnellere Anzeige der Werte bewirken, aber bei optimiertem Code auch fehlschlagen.</translation>
+        <translation>Verwendet das Codemodell, um Informationen bezüglich des Gültigkeitsbereiches von Variablen zu erhalten. Dies kann eine etwas schnellere Anzeige der Werte bewirken, aber bei optimiertem Code auch fehlschlagen.</translation>
     </message>
     <message>
         <source>Displays names of QThread based threads.</source>
@@ -25060,7 +25243,7 @@ Möchten Sie die Daten trotzdem anzeigen?</translation>
     </message>
     <message>
         <source>Use Tooltips in Stack View when Debugging</source>
-        <translation>Tooltips für Stack-Anzeige beim Debuggen</translation>
+        <translation>Tooltips für Stackanzeige beim Debuggen</translation>
     </message>
     <message>
         <source>Skip Known Frames</source>
@@ -25084,7 +25267,7 @@ Möchten Sie die Daten trotzdem anzeigen?</translation>
     </message>
     <message>
         <source>Use tooltips in main editor when debugging</source>
-        <translation>Tooltips im Haupt-Editor beim Debuggen benutzen</translation>
+        <translation>Tooltips im Haupt-Editor beim Debuggen verwenden</translation>
     </message>
     <message>
         <source>Configure Debugger...</source>
@@ -25198,7 +25381,7 @@ Sie haben die Wahl zu warten oder das Debuggen abzubrechen.</numerusform>
     </message>
     <message>
         <source>Retrieving data for stack view thread %1...</source>
-        <translation>Daten der Stack-Anzeige für Thread %1 werden empfangen...</translation>
+        <translation>Daten der Stackanzeige für Thread %1 werden empfangen...</translation>
     </message>
     <message>
         <source>Application started.</source>
@@ -25298,7 +25481,7 @@ Sie haben die Wahl zu warten oder das Debuggen abzubrechen.</numerusform>
     </message>
     <message>
         <source>Retrieving data for stack view...</source>
-        <translation>Daten der Stack-Anzeige werden empfangen...</translation>
+        <translation>Daten der Stackanzeige werden empfangen...</translation>
     </message>
     <message>
         <source>The gdb process failed to start.</source>
@@ -25524,12 +25707,12 @@ was generated. In such situations the breakpoint is shifted to the
 next source code line for which code was actually generated.
 This option reflects such temporary change by moving the breakpoint
 markers in the source code editor.</source>
-        <translation>Nicht alle Quellcode-Zeilen bewirken die Erzeugung von ausführbarem Code. Wenn man dort einen Haltepunkt setzt, verhält er sich so, als ob er auf die nächste Zeile gesetzt worden wäre. Das Aktivieren der Einstellung &apos;Positionen der Haltepunkte korrigieren&apos; bewirkt, dass der Haltepunkt-Marker in so einem Fall auf die Stelle des resultierenden Haltepunkts verschoben wird.</translation>
+        <translation>Nicht alle Quelltext-Zeilen bewirken die Erzeugung von ausführbarem Code. Wenn man dort einen Haltepunkt setzt, verhält er sich so, als ob er auf die nächste Zeile gesetzt worden wäre. Das Aktivieren der Einstellung &apos;Positionen der Haltepunkte korrigieren&apos; bewirkt, dass der Haltepunkt-Marker in so einem Fall auf die Stelle des resultierenden Haltepunkts verschoben wird.</translation>
     </message>
     <message>
         <source>Allows or inhibits reading the user&apos;s default
 .gdbinit file on debugger startup.</source>
-        <translation>Gestattet oder unterdrückt das Lesen der Vorgabe-.gdbinit-Datei des Nutzers beim Starten des Debuggers.</translation>
+        <translation>Gestattet oder unterdrückt das Lesen der Vorgabe-.gdbinit-Datei des Benutzers beim Starten des Debuggers.</translation>
     </message>
     <message>
         <source>Load system GDB pretty printers</source>
@@ -25547,6 +25730,18 @@ markers in the source code editor.</source>
         <source>Use common locations for debug information</source>
         <translation>Verwende Standardpfade zu Debug-Information</translation>
     </message>
+    <message>
+        <source>Use debug info daemon</source>
+        <translation>Debuginfo-Daemon benutzen</translation>
+    </message>
+    <message>
+        <source>Use system settings</source>
+        <translation>Systemeinstellungen benutzen</translation>
+    </message>
+    <message>
+        <source>Lets GDB attempt to automatically retrieve debug information for system packages.</source>
+        <translation>Lässt GDB versuchen, die Debuginformation für Systempakete automatisch abzurufen.</translation>
+    </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables stepping backwards.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This feature is very slow and unstable on the GDB side. It exhibits unpredictable behavior when going backwards over system calls and is very likely to destroy your debugging session.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Rückwärts-Debuggen aktivieren.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Hinweis:&lt;/b&gt; Diese Funktionalität ist sehr langsam und instabil innerhalb von GDB. Es kann unvorhergesehenes Verhalten auftreten, wenn man rückwärts über einen Systemaufruf springt, und die Debugger-Sitzung kann leicht zerstört werden.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
@@ -25561,7 +25756,7 @@ markers in the source code editor.</source>
     </message>
     <message>
         <source>Uses the default GDB pretty printers installed in your system or linked to the libraries your application uses.</source>
-        <translation>Verwendet die GDB-Pretty-Printers, die im System installiert sind oder gegen die Bibliotheken gelinkt sind, die die Anwendung benutzt.</translation>
+        <translation>Verwendet die GDB-Pretty-Printers, die im System installiert sind oder gegen die Bibliotheken gelinkt sind, die die Anwendung verwendet.</translation>
     </message>
     <message>
         <source>The options below give access to advanced&lt;br&gt;or experimental functions of GDB.&lt;p&gt;Enabling them may negatively impact&lt;br&gt;your debugging experience.</source>
@@ -25765,11 +25960,11 @@ markers in the source code editor.</source>
     </message>
     <message>
         <source>Memory at Frame #%1 (%2) 0x%3</source>
-        <translation>Speicher bei Stack-Frame #%1 (%2) 0x%3</translation>
+        <translation>Speicher bei Stackframe #%1 (%2) 0x%3</translation>
     </message>
     <message>
         <source>Frame #%1 (%2)</source>
-        <translation>Stack-Frame #%1 (%2)</translation>
+        <translation>Stackframe #%1 (%2)</translation>
     </message>
     <message>
         <source>Open Disassembler at 0x%1</source>
@@ -25833,15 +26028,15 @@ markers in the source code editor.</source>
     </message>
     <message>
         <source>Sources for this frame are available.&lt;br&gt;Double-click on the file name to open an editor.</source>
-        <translation>Für diesen Stack-Frame ist Quellcode vorhanden&lt;br&gt;Doppelklicken Sie auf den Dateinamen, um einen Editor zu öffnen.</translation>
+        <translation>Für diesen Stackframe ist Quelltext vorhanden&lt;br&gt;Doppelklicken Sie auf den Dateinamen, um einen Editor zu öffnen.</translation>
     </message>
     <message>
         <source>Binary debug information is not accessible for this frame. This either means the core was not compiled with debug information, or the debug information is not accessible.</source>
-        <translation>Für diesen Stack-Frame ist keine binäre Debuginformation verfügbar. Entweder stammt die Core-Datei von einer ohne Debuginformation erstellten Anwendung oder es kann nicht auf die Debuginformation zugegriffen werden.</translation>
+        <translation>Für diesen Stackframe ist keine binäre Debuginformation verfügbar. Entweder stammt die Core-Datei von einer ohne Debuginformation erstellten Anwendung oder es kann nicht auf die Debuginformation zugegriffen werden.</translation>
     </message>
     <message>
         <source>Binary debug information is accessible for this frame. However, matching sources have not been found.</source>
-        <translation>Für diesen Stack-Frame ist binäre Debuginformation verfügbar. Es konnte aber kein passender Quellcode gefunden werden.</translation>
+        <translation>Für diesen Stackframe ist binäre Debuginformation verfügbar. Es konnte aber kein passender Quelltext gefunden werden.</translation>
     </message>
     <message>
         <source>Note that most distributions ship debug information in separate packages.</source>
@@ -26076,7 +26271,7 @@ markers in the source code editor.</source>
     </message>
     <message>
         <source>Cannot Display Stack Layout</source>
-        <translation>Das Stack-Layout kann nicht angezeigt werden</translation>
+        <translation>Das Stacklayout kann nicht angezeigt werden</translation>
     </message>
     <message>
         <source>Could not determine a suitable address range.</source>
@@ -26204,7 +26399,7 @@ markers in the source code editor.</source>
     </message>
     <message>
         <source>Open Memory View Showing Stack Layout</source>
-        <translation>Speicheranzeige an Adresse des Stack-Frames öffnen</translation>
+        <translation>Speicheranzeige an Adresse des Stackframes öffnen</translation>
     </message>
     <message>
         <source>Open Memory Editor at Object&apos;s Address (0x%1)</source>
@@ -26224,7 +26419,7 @@ markers in the source code editor.</source>
     </message>
     <message>
         <source>Open Memory Editor Showing Stack Layout</source>
-        <translation>Speichereditor an Adresse des Stack-Frames öffnen</translation>
+        <translation>Speichereditor an Adresse des Stackframes öffnen</translation>
     </message>
     <message>
         <source>Open Memory Editor...</source>
@@ -26240,6 +26435,7 @@ markers in the source code editor.</source>
     </message>
     <message>
         <source>%1 of length %2</source>
+        <extracomment>&lt;type&gt; of length &lt;number&gt;, e.g. for strings and byte arrays</extracomment>
         <translation>%1 der Länge %2</translation>
     </message>
     <message>
@@ -26381,8 +26577,8 @@ markers in the source code editor.</source>
     <message numerus="yes">
         <source>Array of %n items</source>
         <translation>
-            <numerusform>Feld aus einem Element</numerusform>
-            <numerusform>Feld aus %n Elementen</numerusform>
+            <numerusform>Array aus einem Element</numerusform>
+            <numerusform>Array aus %n Elementen</numerusform>
         </translation>
     </message>
     <message>
@@ -26413,6 +26609,10 @@ markers in the source code editor.</source>
         <source>DAP I/O Error</source>
         <translation>DAP Ein/Ausgabefehler</translation>
     </message>
+    <message>
+        <source>&quot;%1&quot; could not be started. Error message: %2</source>
+        <translation>&quot;%1&quot; konnte nicht gestartet werden. Fehlermeldung: %2</translation>
+    </message>
     <message>
         <source>Python Error</source>
         <translation>Python-Fehler</translation>
@@ -26471,7 +26671,7 @@ If you have updated %2 via Maintenance Tool, you may need to rerun the Tool and
 If you build %2 from sources and want to use a CDB executable with another bitness than your %2 build, you will need to build a separate CDB extension with the same bitness as the CDB you want to use.</source>
         <translation>Interner Fehler: Die Erweiterung %1 wurde nicht gefunden.
 Wenn Sie %2 mit dem Maintenance Tool aktualisiert haben, müssen Sie dieses vielleicht erneut ausführen, &quot;Komponenten hinzufügen oder entfernen&quot; auswählen und die Komponente Qt &gt; Tools &gt; Qt Creator CDB Debugger Support auswählen.
-Wenn Sie %2 aus den Quelltexten erstellen und eine ausführbare CDB-Datei mit einer anderen Architektur (32 Bit, 64 Bit) verwenden wollen als %2, müssen Sie eine separate CDB-Erweiterung mit der gleichen Architektur wie diese CDB-Datei erstellen.</translation>
+Wenn Sie %2 aus dem Quelltext erstellen und eine ausführbare CDB-Datei mit einer anderen Architektur (32 Bit, 64 Bit) verwenden wollen als %2, müssen Sie eine separate CDB-Erweiterung mit der gleichen Architektur wie diese CDB-Datei erstellen.</translation>
     </message>
     <message>
         <source>Trace point %1 in thread %2 triggered.</source>
@@ -26588,14 +26788,14 @@ Installieren Sie das Paket &quot;Qt Debug Information Files&quot; für diese Qt-
 You may be asked to share the contents of this log when reporting bugs related to debugger operation. In this case, make sure your submission does not contain data you do not want to or you are not allowed to share.
 
 </source>
-        <translation>Hinweis: Dieses Log enhält möglicherweise vertrauliche Informationen über Ihren Computer, Umgebungsvariablen, Speicherinhalte der untersuchten Prozesse oder weiteres. Es wird von %1 nie über das Internet übertragen und nur auf der Festplatte gespeichert, wenn Sie die entsprechende Option aus dem Kontextmenü aufrufen, oder durch Abläufe, die das Debugger-Plugin von %1 nicht beeinflussen kann, bespielsweise Auslagerungsdateien or andere Plugins, die Sie vielleicht benutzen.
+        <translation>Hinweis: Dieses Log enhält möglicherweise vertrauliche Informationen über Ihren Computer, Umgebungsvariablen, Speicherinhalte der untersuchten Prozesse oder weiteres. Es wird von %1 nie über das Internet übertragen und nur auf der Festplatte gespeichert, wenn Sie die entsprechende Option aus dem Kontextmenü aufrufen, oder durch Abläufe, die das Debugger-Plugin von %1 nicht beeinflussen kann, bespielsweise Auslagerungsdateien or andere Plugins, die Sie vielleicht verwenden.
 Sie werden möglicherweise gebeten, den Inhalt dieses Logs mitzuteilen, wenn Sie über Fehlfunktionen des Debugger berichten. In diesem Fall achten Sie darauf, dass Ihre Einsendung nur Daten enthält, die Sie weitergeben wollen und dürfen.
 
 </translation>
     </message>
     <message>
         <source>User commands are not accepted in the current state.</source>
-        <translation>Die Eingabe von Nutzerkommandos ist in diesem Zustand nicht möglich.</translation>
+        <translation>Die Eingabe von Benutzerkommandos ist in diesem Zustand nicht möglich.</translation>
     </message>
     <message>
         <source>Log File</source>
@@ -26935,6 +27135,10 @@ Sie werden möglicherweise gebeten, den Inhalt dieses Logs mitzuteilen, wenn Sie
         <source>GDB Preset</source>
         <translation>GDB-Voreinstellung</translation>
     </message>
+    <message>
+        <source>LLDB Preset</source>
+        <translation>LLDB Voreinstellung</translation>
+    </message>
     <message>
         <source>Python Preset</source>
         <translation>Python-Voreinstellung</translation>
@@ -27011,7 +27215,7 @@ Sie werden möglicherweise gebeten, den Inhalt dieses Logs mitzuteilen, wenn Sie
         <source>Could not connect to the in-process QML debugger.
 Do you want to retry?</source>
         <translation>Konnte keine Verbindung zur Debuggerkomponente im Prozess herstellen.
-Soll es noch einmal versucht werden?</translation>
+Soll es erneut versucht werden?</translation>
     </message>
     <message>
         <source>Starting %1</source>
@@ -27019,7 +27223,7 @@ Soll es noch einmal versucht werden?</translation>
     </message>
     <message>
         <source>Cannot evaluate %1 in current stack frame.</source>
-        <translation>%1 kann im aktuellen Stack-Frame nicht ausgewertet werden.</translation>
+        <translation>%1 kann im aktuellen Stackframe nicht ausgewertet werden.</translation>
     </message>
     <message>
         <source>Context:</source>
@@ -27031,7 +27235,7 @@ Soll es noch einmal versucht werden?</translation>
     </message>
     <message>
         <source>QML Debugger: Connection failed.</source>
-        <translation>QML-Debugger: Verbindung gescheitert.</translation>
+        <translation>QML-Debugger: Verbindung fehlgeschlagen.</translation>
     </message>
     <message>
         <source>JS Source for %1</source>
@@ -27083,7 +27287,7 @@ Soll es noch einmal versucht werden?</translation>
     </message>
     <message>
         <source>&lt;p&gt;Add a mapping for Qt&apos;s source folders when using an unpatched version of Qt.</source>
-        <translation>&lt;p&gt;Fügt eine Umsetzung für die Qt-Quellen hinzu, wenn eine nicht gepatchte Version von Qt benutzt wird.</translation>
+        <translation>&lt;p&gt;Fügt eine Umsetzung für die Qt-Quellen hinzu, wenn eine nicht gepatchte Version von Qt verwendet wird.</translation>
     </message>
     <message>
         <source>&lt;p&gt;The source path contained in the debug information of the executable as reported by the debugger</source>
@@ -27099,7 +27303,7 @@ Soll es noch einmal versucht werden?</translation>
     </message>
     <message>
         <source>&lt;p&gt;Mappings of source file folders to be used in the debugger can be entered here.&lt;/p&gt;&lt;p&gt;This is useful when using a copy of the source tree at a location different from the one at which the modules where built, for example, while doing remote debugging.&lt;/p&gt;&lt;p&gt;If source is specified as a regular expression by starting it with an open parenthesis, the paths in the ELF are matched with the regular expression to automatically determine the source path.&lt;/p&gt;&lt;p&gt;Example: &lt;b&gt;(/home/.*/Project)/KnownSubDir -&gt; D:\Project&lt;/b&gt; will substitute ELF built by any user to your local project directory.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Hier können Zuordnungen für die beim Debuggen benutzten Quelldateien festgelegt werden.&lt;/p&gt;&lt;p&gt;Das ist nützlich, wenn eine lokale Kopie des Quelldateibaums verwendet wird, der sich von der beim Erstellen der Module verwendeten unterscheidet, zum Beispiel beim Remote-Debuggen.&lt;/p&gt;&lt;p&gt;Wenn die Zuordnung durch eine öffnende Klammer am Anfang als regulärer Ausdruck angegeben wird, werden die passenden Pfade im ELF verwendet um den Quellpfad automatisch zu bestimmen.&lt;/p&gt;&lt;p&gt;Beispiel: &lt;b&gt;(/home/.*/Projekt)/BekanntesUnterverzeichnis -&gt; D:\Projekt&lt;/b&gt; wird ein von einem beliebigen Benutzer erstelltes ELF in Ihr lokales Projektverzeichnis umleiten.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Hier können Zuordnungen für die beim Debuggen verwendeten Quelldateien festgelegt werden.&lt;/p&gt;&lt;p&gt;Das ist nützlich, wenn eine lokale Kopie des Quelldateibaums verwendet wird, der sich von der beim Erstellen der Module verwendeten unterscheidet, zum Beispiel beim Remote-Debuggen.&lt;/p&gt;&lt;p&gt;Wenn die Zuordnung durch eine öffnende Klammer am Anfang als regulärer Ausdruck angegeben wird, werden die passenden Pfade im ELF verwendet um den Quellpfad automatisch zu bestimmen.&lt;/p&gt;&lt;p&gt;Beispiel: &lt;b&gt;(/home/.*/Projekt)/BekanntesUnterverzeichnis -&gt; D:\Projekt&lt;/b&gt; wird ein von einem beliebigen Benutzer erstelltes ELF in Ihr lokales Projektverzeichnis umleiten.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&amp;Target path:</source>
@@ -27151,7 +27355,7 @@ Soll es noch einmal versucht werden?</translation>
     </message>
     <message>
         <source>&amp;Username:</source>
-        <translation>&amp;Nutzername:</translation>
+        <translation>&amp;Benutzername:</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
@@ -27392,7 +27596,7 @@ Einzelschritte in das Modul und das Setzen von Haltepunkten nach Datei und Zeile
     </message>
     <message>
         <source>Base path for external debug information and debug sources. If empty, $SYSROOT/usr/lib/debug will be chosen.</source>
-        <translation>Basispfad für Debuginformationen und Quellen. Als Vorgabe wird $SYSROOT/usr/lib/debug benutzt.</translation>
+        <translation>Basispfad für Debuginformationen und Quellen. Als Vorgabe wird $SYSROOT/usr/lib/debug verwendet.</translation>
     </message>
     <message>
         <source>&amp;Kit:</source>
@@ -27450,14 +27654,17 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve
     </message>
     <message>
         <source>Enable %1 debugger.</source>
+        <extracomment>%1 is C++, QML, or Python</extracomment>
         <translation>%1-Debugger aktivieren.</translation>
     </message>
     <message>
         <source>Disable %1 debugger.</source>
+        <extracomment>%1 is C++, QML, or Python</extracomment>
         <translation>%1-Debugger deaktivieren.</translation>
     </message>
     <message>
         <source>Try to determine need for %1 debugger.</source>
+        <extracomment>%1 is C++, QML, or Python</extracomment>
         <translation>Versuche, die Notwendigkeit für den %1-Debugger zu ermitteln.</translation>
     </message>
     <message>
@@ -27466,7 +27673,7 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve
     </message>
     <message>
         <source>Use additional startup commands.</source>
-        <translation>Benutze zusätzliche Kommandos beim Start.</translation>
+        <translation>Verwende zusätzliche Kommandos beim Start.</translation>
     </message>
     <message>
         <source>C++ debugger:</source>
@@ -27538,7 +27745,7 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The debugger is not configured to use the public Microsoft Symbol Server.&lt;br/&gt;This is recommended for retrieval of the symbols of the operating system libraries.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Note:&lt;/span&gt; It is recommended, that if you use the Microsoft Symbol Server, to also use a local symbol cache.&lt;br/&gt;A fast internet connection is required for this to work smoothly,&lt;br/&gt;and a delay might occur when connecting for the first time and caching the symbols.&lt;/p&gt;&lt;p&gt;What would you like to set up?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Der Debugger ist nicht zur Benutzung des öffentlichen Microsoft Symbol Servers eingerichtet.&lt;br/&gt;Dies wird zur Anzeige der Symbole der Betriebssystem-Bibliotheken empfohlen.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Hinweis:&lt;/span&gt; Bei der Verwendung des Microsoft Symbol Servers wird zusätzlich die Benutzung eines lokalen Zwischenspeichers für Symbole empfohlen.&lt;br/&gt;Allerdings ist dabei eine schnelle Internetverbindung für flüssiges Arbeiten erforderlich&lt;br/&gt;und bei der ersten Verbindung zum Zwischenspeichern der Symbole können Verzögerungen auftreten.&lt;/p&gt;&lt;p&gt;Was möchten Sie einrichten?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Der Debugger ist nicht zur Verwendung des öffentlichen Microsoft Symbol Servers eingerichtet.&lt;br/&gt;Dies wird zur Anzeige der Symbole der Betriebssystem-Bibliotheken empfohlen.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Hinweis:&lt;/span&gt; Bei der Verwendung des Microsoft Symbol Servers wird zusätzlich der Einsatz eines lokalen Zwischenspeichers für Symbole empfohlen.&lt;br/&gt;Allerdings ist dabei eine schnelle Internetverbindung für flüssiges Arbeiten erforderlich&lt;br/&gt;und bei der ersten Verbindung zum Zwischenspeichern der Symbole können Verzögerungen auftreten.&lt;/p&gt;&lt;p&gt;Was möchten Sie einrichten?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Set up Symbol Paths</source>
@@ -27664,11 +27871,11 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve
     </message>
     <message>
         <source>Reopen dialog when application finishes</source>
-        <translation>Dialog nach Beendigung der Anwendung wieder öffnen</translation>
+        <translation>Dialog nach Beendigung der Anwendung erneut öffnen</translation>
     </message>
     <message>
         <source>Reopens this dialog when application finishes.</source>
-        <translation>Öffnet den Dialog nach Beendigung der Anwendung wieder.</translation>
+        <translation>Öffnet den Dialog nach Beendigung der Anwendung erneut.</translation>
     </message>
     <message>
         <source>Continue on attach</source>
@@ -27712,7 +27919,7 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve
     </message>
     <message>
         <source>The debugging helpers are used to produce a nice display of objects of certain types like QString or std::map in the &amp;quot;Locals&amp;quot; and &amp;quot;Expressions&amp;quot; views.</source>
-        <translation>Die Ausgabe-Hilfsbibliothek wird benutzt um bestimmte Datentypen wie QString oder std::map in &amp;quot;Lokale Variablen&amp;quot; und &amp;quot;Ausdrücke&amp;quot; ansprechend anzuzeigen.</translation>
+        <translation>Die Ausgabe-Hilfsbibliothek wird verwendet um bestimmte Datentypen wie QString oder std::map in &amp;quot;Lokale Variablen&amp;quot; und &amp;quot;Ausdrücke&amp;quot; ansprechend anzuzeigen.</translation>
     </message>
     <message>
         <source>Extra Debugging Helper</source>
@@ -27726,6 +27933,10 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve
         <source>Python commands entered here will be executed after built-in debugging helpers have been loaded and fully initialized. You can load additional debugging helpers or modify existing ones here.</source>
         <translation>Hier angegebene Python-Kommandos werden ausgeführt, nachdem die integrierte Ausgabe-Hilfsbibliothek geladen und vollständig initialisiert wurde. Sie können hier weitere Ausgabehelfer laden oder bereits existierende Ausgabehelfer ändern.</translation>
     </message>
+    <message>
+        <source>Behavior</source>
+        <translation>Verhalten</translation>
+    </message>
     <message>
         <source>Extra Debugging Helpers</source>
         <translation>Zusätzliche Ausgabe-Hilfsbibliotheken</translation>
@@ -27996,6 +28207,10 @@ Bitte wählen Sie einen 64-bit-Debugger in den Kit-Einstellungen für dieses Kit
         <source>Enable or Disable Breakpoint</source>
         <translation>Haltepunkt aktivieren oder deaktivieren</translation>
     </message>
+    <message>
+        <source>Launching %1 Debugger</source>
+        <translation>Starte Debugger %1</translation>
+    </message>
     <message>
         <source>Loading finished.</source>
         <translation>Laden beendet.</translation>
@@ -28034,7 +28249,7 @@ Bitte wählen Sie einen 64-bit-Debugger in den Kit-Einstellungen für dieses Kit
     </message>
     <message>
         <source>Reverse-execution history exhausted. Going forward again.</source>
-        <translation>Keine weiteren rückwärts ausführbaren Schritte vorhanden. Führe sie wieder vorwärts aus.</translation>
+        <translation>Keine weiteren rückwärts ausführbaren Schritte vorhanden. Führe sie erneut vorwärts aus.</translation>
     </message>
     <message>
         <source>Attempting to interrupt.</source>
@@ -28051,7 +28266,7 @@ Bitte wählen Sie einen 64-bit-Debugger in den Kit-Einstellungen für dieses Kit
     </message>
     <message>
         <source>This debugger cannot handle user input.</source>
-        <translation>Dieser Debugger kann keine Nutzereingaben verarbeiten.</translation>
+        <translation>Dieser Debugger kann keine Benutzereingaben verarbeiten.</translation>
     </message>
     <message>
         <source>Stopped: &quot;%1&quot;.</source>
@@ -28181,7 +28396,7 @@ Für dieses Binärformat wären GDB oder LLDB besser als Debugger geeignet.</tra
     </message>
     <message>
         <source>Reverse-execution recording failed.</source>
-        <translation>Aufzeichnung für Rückwärtsausführung gescheitert.</translation>
+        <translation>Aufzeichnung für Rückwärtsausführung fehlgeschlagen.</translation>
     </message>
     <message>
         <source>Found.</source>
@@ -28484,7 +28699,7 @@ Das Setzen von Haltepunkten anhand von Dateinamen und Zeilennummern könnte fehl
     </message>
     <message>
         <source>Use alternating row colors in debug views</source>
-        <translation>Alternierende Farben für Zeilen in Debug-Ansichten benutzen</translation>
+        <translation>Alternierende Farben für Zeilen in Debug-Ansichten verwenden</translation>
     </message>
     <message>
         <source>Changes the font size in the debugger views when the font size in the main editor changes.</source>
@@ -28496,7 +28711,7 @@ Das Setzen von Haltepunkten anhand von Dateinamen und Zeilennummern könnte fehl
     </message>
     <message>
         <source>Not all source code lines generate executable code. Putting a breakpoint on such a line acts as if the breakpoint was set on the next line that generated code. Selecting &apos;Adjust Breakpoint Locations&apos; shifts the red breakpoint markers in such cases to the location of the true breakpoint.</source>
-        <translation>Nicht aus allen Quellcode-Zeilen wird ausführbarer Code erzeugt. Wenn man dort einen Haltepunkt setzt, verhält er sich so, als ob er auf die nächste Zeile gesetzt worden wäre, aus der Maschinencode erzeugt wurde. Das Aktivieren der Einstellung &apos;Positionen der Haltepunkte korrigieren&apos; bewirkt, dass der Haltepunkt-Marker in so einem Fall an die Stelle des resultierenden Haltepunkts verschoben wird.</translation>
+        <translation>Nicht aus allen Quelltext-Zeilen wird ausführbarer Code erzeugt. Wenn man dort einen Haltepunkt setzt, verhält er sich so, als ob er auf die nächste Zeile gesetzt worden wäre, aus der Maschinencode erzeugt wurde. Das Aktivieren der Einstellung &apos;Positionen der Haltepunkte korrigieren&apos; bewirkt, dass der Haltepunkt-Marker in so einem Fall an die Stelle des resultierenden Haltepunkts verschoben wird.</translation>
     </message>
     <message>
         <source>Stopping and stepping in the debugger will automatically open views associated with the current location.</source>
@@ -28532,7 +28747,7 @@ Das Setzen von Haltepunkten anhand von Dateinamen und Zeilennummern könnte fehl
     </message>
     <message>
         <source>Use annotations in main editor when debugging</source>
-        <translation>Annotationen im Haupt-Editor beim Debuggen benutzen</translation>
+        <translation>Annotationen im Haupt-Editor beim Debuggen verwenden</translation>
     </message>
     <message>
         <source>Shows simple variable values as annotations in the main editor during debugging.</source>
@@ -28620,7 +28835,7 @@ Das Setzen von Haltepunkten anhand von Dateinamen und Zeilennummern könnte fehl
     </message>
     <message>
         <source>Maximum stack depth:</source>
-        <translation>Maximale Stack-Tiefe:</translation>
+        <translation>Maximale Stacktiefe:</translation>
     </message>
     <message>
         <source>&lt;unlimited&gt;</source>
@@ -28977,8 +29192,8 @@ Rebuilding the project might help.</source>
 Versuchen Sie, das Projekt neu zu erstellen.</translation>
     </message>
     <message>
-        <source>Qt Designer Form Class</source>
-        <translation>Qt-Designer-Formularklasse</translation>
+        <source>Qt Widgets Designer Form Class</source>
+        <translation>Qt-Widgets-Designer-Formularklasse</translation>
     </message>
     <message>
         <source>Class Details</source>
@@ -29009,8 +29224,8 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
         <translation>Shift+F4</translation>
     </message>
     <message>
-        <source>Creates a Qt Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project.</source>
-        <translation>Erstellt ein Qt-Designer-Formular mit zugehörigem Klassenrumpf (bestehend aus C++-Header- und -Quelldatei) für Implementierungszwecke. Sie können Formular und Klasse zu einem existierenden Qt-Widget-Projekt hinzufügen.</translation>
+        <source>Creates a Qt Widgets Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project.</source>
+        <translation>Erstellt ein Qt-Widgets-Designer-Formular mit zugehörigem Klassenrumpf (bestehend aus C++-Header- und -Quelldatei) für Implementierungszwecke. Sie können Formular und Klasse zu einem existierenden Qt-Widget-Projekt hinzufügen.</translation>
     </message>
     <message>
         <source>Choose a Form Template</source>
@@ -29161,8 +29376,8 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
         <translation>Alt+Shift+R</translation>
     </message>
     <message>
-        <source>About Qt Designer Plugins...</source>
-        <translation>Über Qt Designer-Plugins...</translation>
+        <source>About Qt Widgets Designer Plugins...</source>
+        <translation>Über Qt Widgets Designer-Plugins...</translation>
     </message>
     <message>
         <source>Preview in</source>
@@ -29486,10 +29701,6 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
         <source>Failed to create container shell (Out of memory).</source>
         <translation>Container-Shell konnte nicht erstellt werden (nicht genügend Speicherplatz).</translation>
     </message>
-    <message>
-        <source>Cannot start docker device from non-main thread</source>
-        <translation>Docker-Gerät kann nur vom Haupt-Thread gestartet werden</translation>
-    </message>
     <message>
         <source>Device is shut down</source>
         <translation>Das Gerät ist heruntergefahren</translation>
@@ -29731,7 +29942,7 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
     </message>
     <message>
         <source>Exchange Cursor and Mark</source>
-        <translation>Textmarke und Markierung austauschen</translation>
+        <translation>Einfügemarke und Markierung austauschen</translation>
     </message>
     <message>
         <source>Copy</source>
@@ -29758,79 +29969,102 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
     <name>QtC::ExtensionManager</name>
     <message>
         <source>Extensions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Get started</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install the extension from above. Installation starts automatically. You can always uninstall the extension afterwards.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erweiterungen</translation>
     </message>
     <message>
         <source>More information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Online Documentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tutorials</source>
-        <translation type="unfinished">Anleitungen</translation>
-    </message>
-    <message>
-        <source>Examples</source>
-        <translation type="unfinished">Beispiele</translation>
-    </message>
-    <message>
-        <source>Extension library details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished">Größe</translation>
-    </message>
-    <message>
-        <source>Version</source>
-        <translation type="unfinished">Version</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
+        <translation>Mehr Informationen</translation>
     </message>
     <message>
         <source>Extension details</source>
-        <translation type="unfinished"></translation>
+        <translation>Erweiterungsdetails</translation>
+    </message>
+    <message numerus="yes">
+        <source>Pack contains %n plugins.</source>
+        <translation>
+            <numerusform>Paket enthält ein Plugin.</numerusform>
+            <numerusform>Paket enthält %n Plugins.</numerusform>
+        </translation>
     </message>
     <message>
-        <source>Released</source>
-        <translation type="unfinished"></translation>
+        <source>Load on start</source>
+        <translation>Beim Start laden</translation>
     </message>
     <message>
-        <source>Related tags</source>
-        <translation type="unfinished"></translation>
+        <source>Restart Now</source>
+        <translation>Jetzt neu starten</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Fehler</translation>
+    </message>
+    <message>
+        <source>Loaded</source>
+        <translation>Geladen</translation>
+    </message>
+    <message>
+        <source>Not loaded</source>
+        <translation>Nicht geladen</translation>
+    </message>
+    <message>
+        <source>Tags</source>
+        <translation>Tags</translation>
     </message>
     <message>
         <source>Platforms</source>
-        <translation type="unfinished"></translation>
+        <translation>Plattformen</translation>
     </message>
     <message>
         <source>Dependencies</source>
-        <translation type="unfinished">Abhängigkeiten</translation>
+        <translation>Abhängigkeiten</translation>
     </message>
     <message>
         <source>Extensions in pack</source>
-        <translation type="unfinished"></translation>
+        <translation>Erweiterungen im Paket</translation>
+    </message>
+    <message>
+        <source>Downloading...</source>
+        <translation>Lade herunter...</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <source>Download Extension</source>
+        <translation>Erweiterung herunterladen</translation>
+    </message>
+    <message>
+        <source>Download Error</source>
+        <translation>Ladefehler</translation>
+    </message>
+    <message>
+        <source>Cannot download extension</source>
+        <translation>Erweiterung kann nicht heruntergeladen werden</translation>
+    </message>
+    <message>
+        <source>Code: %1.</source>
+        <translation>Code: %1.</translation>
     </message>
     <message>
         <source>Manage Extensions</source>
-        <translation type="unfinished"></translation>
+        <translation>Erweiterungen verwalten</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Suche</translation>
     </message>
     <message>
         <source>Install...</source>
-        <translation type="unfinished"></translation>
+        <translation>Installieren...</translation>
+    </message>
+    <message>
+        <source>Use external repository</source>
+        <translation>Externes Repository benutzen</translation>
+    </message>
+    <message>
+        <source>Repository: %1</source>
+        <translation>Repository: %1</translation>
     </message>
 </context>
 <context>
@@ -29867,6 +30101,10 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
         <source>Dependencies:</source>
         <translation>Abhängigkeiten:</translation>
     </message>
+    <message>
+        <source>Loadable without restart:</source>
+        <translation>Kann ohne Neustart geladen werden:</translation>
+    </message>
     <message>
         <source>Plugin Details of %1</source>
         <translation>Beschreibung zu %1</translation>
@@ -30031,6 +30269,10 @@ Grund: %3</translation>
         <source>The option %1 requires an argument.</source>
         <translation>Das Kommandozeilenargument %1 erfordert ein Argument.</translation>
     </message>
+    <message>
+        <source>Cannot open file</source>
+        <translation>Datei kann nicht geöffnet werden</translation>
+    </message>
     <message>
         <source>&quot;%1&quot; is missing</source>
         <translation>&quot;%1&quot; fehlt</translation>
@@ -30045,16 +30287,24 @@ Grund: %3</translation>
     </message>
     <message>
         <source>Value for key &quot;%1&quot; is not an array of objects</source>
-        <translation>Wert des Schlüssels &quot;%1&quot; ist kein Feld von Objekten</translation>
+        <translation>Wert des Schlüssels &quot;%1&quot; ist kein Array von Objekten</translation>
     </message>
     <message>
         <source>Value for key &quot;%1&quot; is not a string and not an array of strings</source>
-        <translation>Wert des Schlüssels &quot;%1&quot; ist keine Zeichenkette und auch kein Feld von Zeichenketten</translation>
+        <translation>Wert des Schlüssels &quot;%1&quot; ist keine Zeichenkette und auch kein Array von Zeichenketten</translation>
     </message>
     <message>
         <source>Value &quot;%2&quot; for key &quot;%1&quot; has invalid format</source>
         <translation>Wert &quot;%2&quot; des Schlüssels &quot;%1&quot; ist in ungültigem Format</translation>
     </message>
+    <message>
+        <source>No IID found</source>
+        <translation>Keine IID gefunden</translation>
+    </message>
+    <message>
+        <source>Expected IID &quot;%1&quot;, but found &quot;%2&quot;</source>
+        <translation>IID &quot;%1&quot; erwartet, aber &quot;%2&quot; gefunden</translation>
+    </message>
     <message>
         <source>Resolving dependencies failed because state != Read</source>
         <translation>Das Bestimmen der Abhängigkeiten schlug fehl, weil der Status != Gelesen ist</translation>
@@ -30125,7 +30375,7 @@ Grund: %3</translation>
     </message>
     <message>
         <source>Load on Startup</source>
-        <translation>Beim Start Laden</translation>
+        <translation>Beim Start laden</translation>
     </message>
     <message>
         <source>Utilities</source>
@@ -30179,7 +30429,7 @@ Plugin durch ein Kommandozeilenargument deaktiviert.</translation>
     </message>
     <message>
         <source>Load on startup</source>
-        <translation>Beim Start Laden</translation>
+        <translation>Beim Start laden</translation>
     </message>
     <message>
         <source>Enabling Plugins</source>
@@ -30260,7 +30510,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
     <name>QtC::FakeVim</name>
     <message>
         <source>Use FakeVim</source>
-        <translation>FakeVim benutzen</translation>
+        <translation>FakeVim verwenden</translation>
     </message>
     <message>
         <source>Read .vimrc from location:</source>
@@ -30348,7 +30598,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
     </message>
     <message>
         <source>Use system encoding for :source</source>
-        <translation>System-Zeichenkodierung für :source benutzen</translation>
+        <translation>System-Zeichenkodierung für :source verwenden</translation>
     </message>
     <message>
         <source>Scroll offset:</source>
@@ -30388,7 +30638,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
     </message>
     <message>
         <source>Use Vim-style Editing</source>
-        <translation>Vim benutzen</translation>
+        <translation>Vim verwenden</translation>
     </message>
     <message>
         <source>Mark &quot;%1&quot; not set.</source>
@@ -30413,11 +30663,11 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
     <message>
         <source>Type Control-Shift-Y, Control-Shift-Y to quit FakeVim mode.</source>
         <translatorcomment>These are the names of the actual keys on my german Apple keyboard https://support.apple.com/de-de/HT201236</translatorcomment>
-        <translation>Benutzen sie Control-Umschalt-Y, Control-Umschalt-Y, um den FakeVim-Modus zu verlassen.</translation>
+        <translation>Verwenden sie Control-Umschalt-Y, Control-Umschalt-Y, um den FakeVim-Modus zu verlassen.</translation>
     </message>
     <message>
         <source>Type Alt-Y, Alt-Y to quit FakeVim mode.</source>
-        <translation>Benutzen Sie Alt-Y, Alt-Y, um den FakeVim-Modus zu verlassen.</translation>
+        <translation>Verwenden Sie Alt-Y, Alt-Y, um den FakeVim-Modus zu verlassen.</translation>
     </message>
     <message>
         <source>Unknown option:</source>
@@ -30675,7 +30925,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
     </message>
     <message>
         <source>SSL/TLS client identity key to use if requested by the server.</source>
-        <translation>SSL/TLS Client Identity Key, der benutzt werden soll, wenn der Server diesen anfordert.</translation>
+        <translation>Der SSL/TLS Client Identity Key, der auf Anforderung des Servers verwendet werden soll.</translation>
     </message>
     <message>
         <source>Disable auto-sync</source>
@@ -30691,7 +30941,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
     </message>
     <message>
         <source>User:</source>
-        <translation>Nutzer:</translation>
+        <translation>Benutzer:</translation>
     </message>
     <message>
         <source>Repository Settings</source>
@@ -31103,7 +31353,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
     </message>
     <message>
         <source>User</source>
-        <translation>Nutzer</translation>
+        <translation>Benutzer</translation>
     </message>
     <message>
         <source>Miscellaneous</source>
@@ -31162,7 +31412,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins:
     </message>
     <message>
         <source>Imports existing projects that do not use qmake, CMake, Qbs, Meson, or Autotools. This allows you to use %1 as a code editor.</source>
-        <translation>Importiert bereits existierende Projekte, die weder qmake, CMake, Qbs, Meson oder Autotools verwenden. Dadurch kann %1 als Code-Editor benutzt werden.</translation>
+        <translation>Importiert bereits existierende Projekte, die weder qmake, CMake, Qbs, Meson oder Autotools verwenden. Dadurch kann %1 als Code-Editor verwendet werden.</translation>
     </message>
     <message>
         <source>Project Name and Location</source>
@@ -31341,7 +31591,7 @@ Jetzt Commit ausführen?</translation>
     </message>
     <message>
         <source>Rebase, merge or am is in progress. Finish or abort it and then try again.</source>
-        <translation>Es ist eine Rebase-, Merge- oder am-Operation aktiv. Bitte beenden oder brechen Sie sie ab und versuchen Sie es noch einmal.</translation>
+        <translation>Es ist eine Rebase-, Merge- oder am-Operation aktiv. Bitte beenden oder brechen Sie sie ab und versuchen Sie es erneut.</translation>
     </message>
     <message>
         <source>Stash local changes and pop when %1 finishes.</source>
@@ -32360,7 +32610,7 @@ Möchten Sie ihn beenden?</translation>
     </message>
     <message>
         <source>&amp;User:</source>
-        <translation>&amp;Nutzer:</translation>
+        <translation>&amp;Benutzer:</translation>
     </message>
     <message>
         <source>&amp;ssh:</source>
@@ -32404,7 +32654,7 @@ nicht konfiguriert ist.</translation>
     </message>
     <message>
         <source>Invalid Gerrit configuration. Host, user and ssh binary are mandatory.</source>
-        <translation>Ungültige Gerrit-Konfiguration. Host, Nutzer und ausführbare SSH-Datei müssen angegeben werden.</translation>
+        <translation>Ungültige Gerrit-Konfiguration. Host, Benutzer und ausführbare SSH-Datei müssen angegeben werden.</translation>
     </message>
     <message>
         <source>Git is not available.</source>
@@ -32790,8 +33040,8 @@ Leer lassen, um das Dateisystem zu durchsuchen.</translation>
     <message numerus="yes">
         <source>Include branches and tags that have not been active for %n days.</source>
         <translation>
-            <numerusform>Branches und Tags einschließen, die seit einem Tag nicht benutzt wurden.</numerusform>
-            <numerusform>Branches und Tags einschließen, die seit %n Tagen nicht benutzt wurden.</numerusform>
+            <numerusform>Branches und Tags einschließen, die seit einem Tag nicht verwendet wurden.</numerusform>
+            <numerusform>Branches und Tags einschließen, die seit %n Tagen nicht verwendet wurden.</numerusform>
         </translation>
     </message>
     <message>
@@ -33502,7 +33752,7 @@ Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe.</translation>
     </message>
     <message>
         <source>Using project access token.</source>
-        <translation>Benutze das Zugriffstoken des Projekts.</translation>
+        <translation>Verwende das Zugriffstoken des Projekts.</translation>
     </message>
     <message>
         <source>Logged in as %1</source>
@@ -34090,7 +34340,7 @@ Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe.</translation>
     </message>
     <message>
         <source>Open in Edit Mode</source>
-        <translation>Im Editieren-Modus öffnen</translation>
+        <translation>Im Bearbeiten-Modus öffnen</translation>
     </message>
     <message>
         <source>Open in New Page</source>
@@ -34486,8 +34736,8 @@ Möchten Sie sie überschreiben?</translation>
         <translation>Geben Sie die entsprechenden Argumente für das Erstellkommando ein.</translation>
     </message>
     <message>
-        <source>Make sure the build command&apos;s multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools)</source>
-        <translation>Stellen Sie sicher, dass der Wert für die Anzahl paralleler Jobs im Erstellkommando groß genug ist (wie zum Beispiel -j200 für JOM oder Make)</translation>
+        <source>Make sure the build command&apos;s multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools).</source>
+        <translation>Stellen Sie sicher, dass der Wert für die Anzahl paralleler Jobs im Erstellkommando groß genug ist (wie zum Beispiel -j200 für JOM oder Make).</translation>
     </message>
     <message>
         <source>Keep original jobs number:</source>
@@ -34507,7 +34757,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Defines how Automatic Interception Interface should handle the various processes involved in a distributed job. It is not necessary for &quot;Visual Studio&quot; or &quot;Make and Build tools&quot; builds, but can be used to provide configuration options if those builds use additional processes that are not included in those packages. It is required to configure distributable processes in &quot;Dev Tools&quot; builds.</source>
-        <translation>Bestimmt, wie das Automatic Interception Interface die in einem verteilten Job involvierten Prozesse behandelt. Benötigt, um verteilte Prozesse in Kompilierungen mit &quot;Dev Tools&quot; zu konfigurieren. Nicht für Kompilierungen mit &quot;Visual Studio&quot; oder &quot;Make and Build tools&quot; benötigt, kann aber zur Konfiguration zusätzlicher Prozesse benutzt werden, die nicht in diesen Paketen enthalten sind.</translation>
+        <translation>Bestimmt, wie das Automatic Interception Interface die in einem verteilten Job involvierten Prozesse behandelt. Benötigt, um verteilte Prozesse in Kompilierungen mit &quot;Dev Tools&quot; zu konfigurieren. Nicht für Kompilierungen mit &quot;Visual Studio&quot; oder &quot;Make and Build tools&quot; benötigt, kann aber zur Konfiguration zusätzlicher Prozesse verwendet werden, die nicht in diesen Paketen enthalten sind.</translation>
     </message>
     <message>
         <source>Avoid local task execution:</source>
@@ -34519,7 +34769,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Determines the maximum number of CPU cores that can be used in a build, regardless of the number of available Agents. It takes into account both local and remote cores, even if the Avoid Task Execution on Local Machine option is selected.</source>
-        <translation>Bestimmt unabhängig von der Anzahl verfügbarer Agents die maximale Anzahl CPU-Kerne, die beim Erstellen benutzt werden. Berücksichtigt sowohl lokale als auch entfernte Kerne, auch wenn die Option &quot;Lokales Ausführen von Aufgaben vermeiden&quot; ausgewählt ist.</translation>
+        <translation>Bestimmt unabhängig von der Anzahl verfügbarer Agents die maximale Anzahl CPU-Kerne, die beim Erstellen verwendet werden. Berücksichtigt sowohl lokale als auch entfernte Kerne, auch wenn die Option &quot;Lokales Ausführen von Aufgaben vermeiden&quot; ausgewählt ist.</translation>
     </message>
     <message>
         <source>Maximum CPUs to utilize in the build:</source>
@@ -34551,7 +34801,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Specifies a custom header line which will be displayed in the beginning of the build output text. This title will also be used for the Build History and Build Monitor displays.</source>
-        <translation>Gibt eine benutzerdefinierte Kopfzeile an, die vor der Ausgabe der Kompilierung angezeigt wird. Dieser Titel wird auch für die Anzeigen &quot;Build History&quot; und &quot;Build Monitor&quot; benutzt.</translation>
+        <translation>Gibt eine benutzerdefinierte Kopfzeile an, die vor der Ausgabe der Kompilierung angezeigt wird. Dieser Titel wird auch für die Anzeigen &quot;Build History&quot; und &quot;Build Monitor&quot; verwendet.</translation>
     </message>
     <message>
         <source>Save IncrediBuild monitor file:</source>
@@ -34559,7 +34809,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Writes a copy of the build progress file (.ib_mon) to the specified location. If only a folder name is given, a generated GUID will serve as the file name. The full path of the saved Build Monitor will be written to the end of the build output.</source>
-        <translation>Schreibt eine Kopie der Monitor-Datei (.ib_mon) an den angegebenen Ort. Wenn nur ein Verzeichnisname angegeben ist, wird eine generierte GUID als Dateiname benutzt. Der vollständige Pfad der gespeicherten Monitor-Datei wird am Ende der Ausgabe der Kompilierung angezeigt.</translation>
+        <translation>Schreibt eine Kopie der Monitor-Datei (.ib_mon) an den angegebenen Ort. Wenn nur ein Verzeichnisname angegeben ist, wird eine generierte GUID als Dateiname verwendet. Der vollständige Pfad der gespeicherten Monitor-Datei wird am Ende der Ausgabe der Kompilierung angezeigt.</translation>
     </message>
     <message>
         <source>Suppress STDOUT:</source>
@@ -34583,7 +34833,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Shows, for each file built, the command-line used by IncrediBuild to build the file.</source>
-        <translation>Zeigt für jede Datei die Kommandozeile, die von IncrediBuild zum Erstellen der Datei benutzt wird.</translation>
+        <translation>Zeigt für jede Datei die Kommandozeile, die von IncrediBuild zum Erstellen der Datei verwendet wird.</translation>
     </message>
     <message>
         <source>Show Agents in output:</source>
@@ -34591,7 +34841,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Shows the Agent used to build each file.</source>
-        <translation>Zeigt für jede Datei den Agent, der zum Erstellen der Datei benutzt wird.</translation>
+        <translation>Zeigt für jede Datei den Agent, der zum Erstellen der Datei verwendet wird.</translation>
     </message>
     <message>
         <source>Show Time in output:</source>
@@ -34606,16 +34856,16 @@ Möchten Sie sie überschreiben?</translation>
         <translation>IncrediBuilds Kopfzeile in der Ausgabe verstecken:</translation>
     </message>
     <message>
-        <source>Suppresses IncrediBuild&apos;s header in the build output</source>
-        <translation>Unterdrückt die Kopfzeile von IncrediBuild in der Ausgabe der Kompilierung</translation>
+        <source>Suppresses IncrediBuild&apos;s header in the build output.</source>
+        <translation>Unterdrückt die Kopfzeile von IncrediBuild in der Ausgabe der Kompilierung.</translation>
     </message>
     <message>
         <source>Internal IncrediBuild logging level:</source>
         <translation>Stufe der internen IncrediBuild-Protokollierung:</translation>
     </message>
     <message>
-        <source>Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support</source>
-        <translation>Überschreibt die Stufe der internen Protokollierung von IncrediBuild für diese Kompilierung. Beeinflusst weder die Ausgabe noch die dem Benutzer zugängliche Protokollierung. Wird hauptsächlich zur Fehlerbehebung mit Hilfe des Supports von IncrediBuild benutzt</translation>
+        <source>Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support.</source>
+        <translation>Überschreibt die Stufe der internen Protokollierung von IncrediBuild für diese Kompilierung. Beeinflusst weder die Ausgabe noch die dem Benutzer zugängliche Protokollierung. Wird hauptsächlich zur Fehlerbehebung mit Hilfe des Supports von IncrediBuild verwendet.</translation>
     </message>
     <message>
         <source>Miscellaneous</source>
@@ -34634,16 +34884,16 @@ Möchten Sie sie überschreiben?</translation>
         <translation>Bei Fehler anhalten:</translation>
     </message>
     <message>
-        <source>When specified, the execution will stop as soon as an error is encountered. This is the default behavior in &quot;Visual Studio&quot; builds, but not the default for &quot;Make and Build tools&quot; or &quot;Dev Tools&quot; builds</source>
-        <translation>Wenn angegeben, wird die Ausführung angehalten sobald ein Fehler auftritt. Dies ist das voreingestellte Verhalten bei Kompilierungen mit &quot;Visual Studio&quot;, aber nicht für Kompilierungen mit &quot;Make and Build tools&quot; oder &quot;Dev Tools&quot;</translation>
+        <source>When specified, the execution will stop as soon as an error is encountered. This is the default behavior in &quot;Visual Studio&quot; builds, but not the default for &quot;Make and Build tools&quot; or &quot;Dev Tools&quot; builds.</source>
+        <translation>Wenn angegeben, wird die Ausführung angehalten sobald ein Fehler auftritt. Dies ist das voreingestellte Verhalten bei Kompilierungen mit &quot;Visual Studio&quot;, aber nicht für Kompilierungen mit &quot;Make and Build tools&quot; oder &quot;Dev Tools&quot;.</translation>
     </message>
     <message>
         <source>Additional Arguments:</source>
         <translation>Zusätzliche Argumente:</translation>
     </message>
     <message>
-        <source>Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line</source>
-        <translation>Fügt zusätzliche Argumente für buildconsole manuell hinzu. Der Inhalt dieses Eingabefelds wird an die finale Kommandozeile für buildconsole angefügt</translation>
+        <source>Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line.</source>
+        <translation>Fügt zusätzliche Argumente für buildconsole manuell hinzu. Der Inhalt dieses Eingabefelds wird an die finale Kommandozeile für buildconsole angefügt.</translation>
     </message>
     <message>
         <source>Open Build Monitor:</source>
@@ -34667,11 +34917,11 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Force remote:</source>
-        <translation>&quot;--force-remote&quot; benutzen:</translation>
+        <translation>&quot;--force-remote&quot; verwenden:</translation>
     </message>
     <message>
         <source>Alternate tasks preference:</source>
-        <translation>&quot;--alternate&quot; benutzen:</translation>
+        <translation>&quot;--alternate&quot; verwenden:</translation>
     </message>
     <message>
         <source>CMake</source>
@@ -34783,7 +35033,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>The provisioning profile &quot;%1&quot; (%2) used to sign the application does not cover the device %3 (%4). Deployment to it will fail.</source>
-        <translation>Das zum Signieren der Anwendung verwendete Provisioning-Profil &quot;%1&quot; (%2) deckt das Gerät %3 (%4) nicht ab. Deployment auf dieses wird scheitern.</translation>
+        <translation>Das zum Signieren der Anwendung verwendete Provisioning-Profil &quot;%1&quot; (%2) deckt das Gerät %3 (%4) nicht ab. Deployment auf dieses wird fehlschlagen.</translation>
     </message>
     <message>
         <source>Deploy to iOS device</source>
@@ -34809,6 +35059,10 @@ Möchten Sie sie überschreiben?</translation>
         <source>CPU Architecture:</source>
         <translation>CPU-Architektur:</translation>
     </message>
+    <message>
+        <source>Product type:</source>
+        <translation>Produkttyp:</translation>
+    </message>
     <message>
         <source>Device name</source>
         <translation>Gerätename</translation>
@@ -34838,6 +35092,10 @@ Möchten Sie sie überschreiben?</translation>
         <source>OS version</source>
         <translation>Betriebssystem-Version</translation>
     </message>
+    <message>
+        <source>Product type</source>
+        <translation>Produkttyp</translation>
+    </message>
     <message>
         <source>An iOS device in user mode has been detected.</source>
         <translation>Es wurde ein iOS-Gerät im Benutzermodus gefunden.</translation>
@@ -34881,7 +35139,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>To use this device you need to enable developer mode on it.</source>
-        <translation>Um dieses Gerät zu benutzen, müssen Sie darauf den Entwicklungsmodus aktivieren.</translation>
+        <translation>Um dieses Gerät zu verwenden, müssen Sie darauf den Entwicklungsmodus aktivieren.</translation>
     </message>
     <message>
         <source>%1 is not connected. Select %2?</source>
@@ -34903,6 +35161,10 @@ Möchten Sie sie überschreiben?</translation>
         <source>Device type:</source>
         <translation>Gerätetyp:</translation>
     </message>
+    <message>
+        <source>Update</source>
+        <translation>Aktualisieren</translation>
+    </message>
     <message>
         <source>iOS Simulator</source>
         <translation>iOS-Simulator</translation>
@@ -34913,11 +35175,11 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Application install on simulator failed. Simulator not running.</source>
-        <translation>Die Installation der Anwendung im Simulator ist gescheitert. Der Simulator läuft nicht.</translation>
+        <translation>Die Installation der Anwendung im Simulator ist fehlgeschlagen. Der Simulator läuft nicht.</translation>
     </message>
     <message>
         <source>Application launch on simulator failed. Invalid bundle path %1</source>
-        <translation>Der Start der Anwendung im Simulator ist gescheitert. Der Bundle-Pfad %1 ist ungültig</translation>
+        <translation>Der Start der Anwendung im Simulator ist fehlgeschlagen. Der Bundle-Pfad %1 ist ungültig</translation>
     </message>
     <message>
         <source>Application launch on simulator failed. Simulator not running. %1</source>
@@ -34925,7 +35187,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Application install on simulator failed. %1</source>
-        <translation>Die Installation der Anwendung im Simulator ist gescheitert. %1</translation>
+        <translation>Die Installation der Anwendung im Simulator ist fehlgeschlagen. %1</translation>
     </message>
     <message>
         <source>Cannot capture console output from %1. Error redirecting output to %2.*</source>
@@ -34937,7 +35199,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
     <message>
         <source>Application launch on simulator failed. %1</source>
-        <translation>Der Start der Anwendung im Simulator ist gescheitert. %1</translation>
+        <translation>Der Start der Anwendung im Simulator ist fehlgeschlagen. %1</translation>
     </message>
     <message>
         <source>Invalid simulator response. Device Id mismatch. Device Id = %1 Response Id = %2</source>
@@ -34991,22 +35253,14 @@ Möchten Sie sie überschreiben?</translation>
         <source>Run ended with error.</source>
         <translation>Ausführung mit Fehler beendet.</translation>
     </message>
-    <message>
-        <source>Create Simulator</source>
-        <translation>Simulator erstellen</translation>
-    </message>
-    <message>
-        <source>Simulator name:</source>
-        <translation>Name des Simulators:</translation>
-    </message>
-    <message>
-        <source>OS version:</source>
-        <translation>Betriebssystemversion:</translation>
-    </message>
     <message>
         <source>iOS Configuration</source>
         <translation>iOS-Konfiguration</translation>
     </message>
+    <message>
+        <source>Configure available simulator devices in &lt;a href=&quot;%1&quot;&gt;Xcode&lt;/a&gt;.</source>
+        <translation>Konfigurieren Sie verfügbare Simulator-Geräte in &lt;a href=&quot;%1&quot;&gt;Xcode&lt;/a&gt;.</translation>
+    </message>
     <message>
         <source>Devices</source>
         <translation>Geräte</translation>
@@ -35019,184 +35273,6 @@ Möchten Sie sie überschreiben?</translation>
         <source>Simulator</source>
         <translation>Simulator</translation>
     </message>
-    <message>
-        <source>Rename a simulator device.</source>
-        <translation>Ein Simulator-Gerät umbenennen.</translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation>Umbenennen</translation>
-    </message>
-    <message>
-        <source>Delete simulator devices.</source>
-        <translation>Simulator-Geräte entfernen.</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Entfernen</translation>
-    </message>
-    <message>
-        <source>Reset contents and settings of simulator devices.</source>
-        <translation>Inhalte und Einstellungen von Simulator-Geräten zurücksetzen.</translation>
-    </message>
-    <message>
-        <source>Screenshot directory:</source>
-        <translation>Screenshot-Verzeichnis:</translation>
-    </message>
-    <message>
-        <source>Create a new simulator device.</source>
-        <translation>Ein neues Simulator-Gerät erstellen.</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation>Erstellen</translation>
-    </message>
-    <message>
-        <source>Start simulator devices.</source>
-        <translation>Simulator-Geräte starten.</translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation>Starten</translation>
-    </message>
-    <message>
-        <source>Screenshot</source>
-        <translation>Screenshot</translation>
-    </message>
-    <message numerus="yes">
-        <source>You are trying to launch %n simulators simultaneously. This will take significant system resources. Do you really want to continue?</source>
-        <translation>
-            <numerusform>Sie versuchen einen Simulator zu starten. Dies benötigt erhebliche Systemressourcen. Wollen Sie fortfahren?</numerusform>
-            <numerusform>Sie versuchen %n Simulatoren gleichzeitig zu starten. Dies benötigt erhebliche Systemressourcen. Wollen Sie fortfahren?</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>Simulator Start</source>
-        <translation>Simulator starten</translation>
-    </message>
-    <message>
-        <source>Cannot start simulator (%1, %2) in current state: %3.</source>
-        <translation>Der Simulator (%1, %2) kann im momentanen Zustand (%3) nicht gestartet werden.</translation>
-    </message>
-    <message>
-        <source>simulator start</source>
-        <translation>Simulator starten</translation>
-    </message>
-    <message>
-        <source>Creating simulator device...</source>
-        <translation>Simulator-Gerät erstellen...</translation>
-    </message>
-    <message>
-        <source>Simulator device (%1) created.
-UDID: %2</source>
-        <translation>Das Simulator-Gerät (%1) wurde erstellt.
-UDID: %2</translation>
-    </message>
-    <message>
-        <source>Simulator device (%1) creation failed.
-Error: %2</source>
-        <translation>Das Simulator-Gerät (%1) konnte nicht erstellt werden.
-Fehler: %2</translation>
-    </message>
-    <message numerus="yes">
-        <source>Starting %n simulator device(s)...</source>
-        <translation>
-            <numerusform>Starte Simulator-Gerät...</numerusform>
-            <numerusform>Starte %n Simulator-Geräte...</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>Do you really want to reset the contents and settings of the %n selected device(s)?</source>
-        <translation>
-            <numerusform>Wollen Sie die Inhalte und Einstellungen des ausgewählten Geräts zurücksetzen?</numerusform>
-            <numerusform>Wollen Sie die Inhalte und Einstellungen der %n ausgewählten Geräte zurücksetzen?</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>Resetting contents and settings...</source>
-        <translation>Setze Inhalte und Einstellungen zurück...</translation>
-    </message>
-    <message>
-        <source>simulator reset</source>
-        <translation>Simulator zurücksetzen</translation>
-    </message>
-    <message>
-        <source>Rename %1</source>
-        <translation>%1 umbenennen</translation>
-    </message>
-    <message>
-        <source>Enter new name:</source>
-        <translation>Geben Sie einen neuen Namen ein:</translation>
-    </message>
-    <message>
-        <source>Renaming simulator device...</source>
-        <translation>Benenne Simulator-Gerät um...</translation>
-    </message>
-    <message>
-        <source>simulator rename</source>
-        <translation>Simulator umbenennen</translation>
-    </message>
-    <message>
-        <source>Delete Device</source>
-        <translation>Gerät entfernen</translation>
-    </message>
-    <message numerus="yes">
-        <source>Do you really want to delete the %n selected device(s)?</source>
-        <translation>
-            <numerusform>Wollen Sie das ausgewählte Gerät entfernen?</numerusform>
-            <numerusform>Wollen Sie die %n ausgewählten Geräte entfernen?</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>Deleting %n simulator device(s)...</source>
-        <translation>
-            <numerusform>Entferne Simulator-Gerät...</numerusform>
-            <numerusform>Entferne %n Simulator-Geräte...</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>Capturing screenshots from %n device(s)...</source>
-        <translation>
-            <numerusform>Nehme Screenshot vom Gerät auf...</numerusform>
-            <numerusform>Nehme Screenshots von %n Geräten auf...</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>simulator delete</source>
-        <translation>Simulator entfernen</translation>
-    </message>
-    <message>
-        <source>simulator screenshot</source>
-        <translation>Simulator Screenshot</translation>
-    </message>
-    <message>
-        <source>Simulator Operation Status</source>
-        <translation>Simulator-Betriebszustand</translation>
-    </message>
-    <message>
-        <source>%1, %2
-Operation %3 completed successfully.</source>
-        <translation>%1, %2
-Operation %3 erfolgreich abgeschlossen.</translation>
-    </message>
-    <message>
-        <source>%1, %2
-Operation %3 failed.
-UDID: %4
-Error: %5</source>
-        <translation>%1, %2
-Operation %3 fehlgeschlagen.
-UDID: %4
-Fehler: %5</translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation>Unbekannt</translation>
-    </message>
-    <message>
-        <source>Done.</source>
-        <translation>Fertig.</translation>
-    </message>
     <message>
         <source>%1 - Free Provisioning Team : %2</source>
         <translation>%1 - Free Provisioning-Team : %2</translation>
@@ -35225,22 +35301,6 @@ Ablaufdatum: %3</translation>
         <source>Could not get necessary ports for the profiler connection.</source>
         <translation>Auf die für die Profiler-Verbindung notwendigen Ports konnte nicht zugegriffen werden.</translation>
     </message>
-    <message>
-        <source>UDID: %1</source>
-        <translation>UDID: %1</translation>
-    </message>
-    <message>
-        <source>Simulator Name</source>
-        <translation>Name des Simulators</translation>
-    </message>
-    <message>
-        <source>Runtime</source>
-        <translation>Runtime</translation>
-    </message>
-    <message>
-        <source>Current State</source>
-        <translation>Status</translation>
-    </message>
     <message>
         <source>Deploy on iOS</source>
         <translation>Deployment auf iOS</translation>
@@ -35283,7 +35343,7 @@ Ablaufdatum: %3</translation>
     </message>
     <message>
         <source>Using default development team and provisioning profile.</source>
-        <translation>Die Vorgaben für Entwicklerteam und Provisioning-Profil werden benutzt.</translation>
+        <translation>Die Vorgaben für Entwicklerteam und Provisioning-Profil werden verwendet.</translation>
     </message>
     <message>
         <source>Development team: %1 (%2)</source>
@@ -35295,7 +35355,7 @@ Ablaufdatum: %3</translation>
     </message>
     <message>
         <source>%1 not configured. Use Xcode and Apple developer account to configure the provisioning profiles and teams.</source>
-        <translation>%1 sind nicht konfiguriert. Benutzen Sie Xcode und Ihr Apple-Entwicklerkonto, um die Provisioning-Profile und Teams zu konfigurieren.</translation>
+        <translation>%1 sind nicht konfiguriert. Verwenden Sie Xcode und Ihr Apple-Entwicklerkonto, um die Provisioning-Profile und Teams zu konfigurieren.</translation>
     </message>
     <message>
         <source>Development teams</source>
@@ -35546,6 +35606,10 @@ Beispiel: *.cpp%1*.h</translation>
         <source>Language server-specific JSON to pass via &quot;initializationOptions&quot; field of &quot;initialize&quot; request.</source>
         <translation>Language Server-abhängiges JSON, das über das &quot;initializationOptions&quot;-Feld der &quot;initialize&quot;-Anfrage übergeben werden soll.</translation>
     </message>
+    <message>
+        <source>File pattern:</source>
+        <translation>Suchmuster für Dateinamen:</translation>
+    </message>
     <message>
         <source>Executable:</source>
         <translation>Ausführbare Datei:</translation>
@@ -35566,7 +35630,7 @@ Beispiel: *.cpp%1*.h</translation>
         <source>Additional JSON configuration sent to all running language servers for this project.
 See the documentation of the specific language server for valid settings.</source>
         <translation>Zusätzliche JSON-Konfiguration, die an alle laufenden Language Server für dieses Projekt gesendet wird.
-Für gültige Einstellungen schauen Sie in die Dokumentation des benutzten Language Servers.</translation>
+Für gültige Einstellungen schauen Sie in die Dokumentation des verwendeten Language Servers.</translation>
     </message>
     <message>
         <source>&amp;Add</source>
@@ -35686,6 +35750,14 @@ Für gültige Einstellungen schauen Sie in die Dokumentation des benutzten Langu
         <source>Inspect Language Clients...</source>
         <translation>Language Clients inspizieren...</translation>
     </message>
+    <message>
+        <source>Language Server Diagnostics</source>
+        <translation>Language Server-Meldungen</translation>
+    </message>
+    <message>
+        <source>Issues provided by the Language Server in the current document.</source>
+        <translation>Probleme, die der Language Server im aktuellen Dokument gefunden hat.</translation>
+    </message>
     <message>
         <source>Always On</source>
         <translation>Immer an</translation>
@@ -35791,6 +35863,10 @@ Für gültige Einstellungen schauen Sie in die Dokumentation des benutzten Langu
         <source>Clear</source>
         <translation>Löschen</translation>
     </message>
+    <message>
+        <source>Deprecated</source>
+        <translation>Veraltet</translation>
+    </message>
     <message>
         <source>Incoming</source>
         <translation>Eingehend</translation>
@@ -35799,6 +35875,14 @@ Für gültige Einstellungen schauen Sie in die Dokumentation des benutzten Langu
         <source>Outgoing</source>
         <translation>Ausgehend</translation>
     </message>
+    <message>
+        <source>Bases</source>
+        <translation>Basistypen</translation>
+    </message>
+    <message>
+        <source>Derived</source>
+        <translation>Abgeleitet</translation>
+    </message>
     <message>
         <source>Call Hierarchy</source>
         <translation>Aufrufhierarchie</translation>
@@ -35847,6 +35931,140 @@ Für gültige Einstellungen schauen Sie in die Dokumentation des benutzten Langu
         <translation>%1 löschen</translation>
     </message>
 </context>
+<context>
+    <name>QtC::Lua</name>
+    <message>
+        <source>Network Access</source>
+        <translation>Netzwerkzugriff</translation>
+    </message>
+    <message>
+        <source>Allow Internet Access</source>
+        <translation>Internetzugriff erlauben</translation>
+    </message>
+    <message>
+        <source>Allow the extension &quot;%1&quot; to fetch from the following URL:
+%2</source>
+        <translation>Der Erweiterung &quot;%1&quot; erlauben, auf folgende URL zuzugreifen:
+%2</translation>
+    </message>
+    <message>
+        <source>Remember choice</source>
+        <translation>Auswahl speichern</translation>
+    </message>
+    <message>
+        <source>Allow the extension &quot;%1&quot; to fetch data from the internet?</source>
+        <translation>Der Erweiterung &quot;%1&quot; erlauben, Daten aus dem Internet zu laden?</translation>
+    </message>
+    <message>
+        <source>Allow the extension &quot;%1&quot; to fetch datafrom the following URL:
+
+</source>
+        <translation>Der Erweiterung &quot;%1&quot; erlauben, Daten von der folgenden URL zu laden:
+
+</translation>
+    </message>
+    <message>
+        <source>Always Allow</source>
+        <translation>Immer erlauben</translation>
+    </message>
+    <message>
+        <source>Allow Once</source>
+        <translation>Einmal erlauben</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Verbieten</translation>
+    </message>
+    <message>
+        <source>Fetching is not allowed for the extension &quot;%1&quot;. (You can edit permissions in Preferences &gt; Lua.)</source>
+        <translation>Das Laden von Daten ist der Erweiterung &quot;%1&quot; nicht erlaubt. (Sie können die Rechte in Einstellungen &gt; Lua ändern.)</translation>
+    </message>
+    <message>
+        <source>Package info is not an object.</source>
+        <translation>Paketinformation ist kein Objekt.</translation>
+    </message>
+    <message>
+        <source>Installed package info is not an object.</source>
+        <translation>Installierte Paketinformation ist kein Objekt.</translation>
+    </message>
+    <message>
+        <source>Cannot create app data directory.</source>
+        <translation>Das Verzeichnis für Anwendungsdaten konnte nicht angelegt werden.</translation>
+    </message>
+    <message>
+        <source>Cannot write to package info: %1</source>
+        <translation>Paketinformation konnte nicht geschrieben werden: %1</translation>
+    </message>
+    <message>
+        <source>Cannot write to temporary file.</source>
+        <translation>Temporäre Datei konnte nicht geschrieben werden.</translation>
+    </message>
+    <message>
+        <source>Unarchiving failed.</source>
+        <translation>Entpacken fehlgeschlagen.</translation>
+    </message>
+    <message>
+        <source>Cannot open temporary file.</source>
+        <translation>Temporäre Datei konnte nicht geöffnet werden.</translation>
+    </message>
+    <message>
+        <source>Installing package(s) %1</source>
+        <translation>Installiere Paket(e) %1</translation>
+    </message>
+    <message>
+        <source>Install Package</source>
+        <translation>Installiere Paket</translation>
+    </message>
+    <message>
+        <source>The extension &quot;%1&quot; wants to install the following package(s):
+
+</source>
+        <translation>Die Erweiterung &quot;%1&quot; möchte folgende Pakete installieren:
+
+</translation>
+    </message>
+    <message>
+        <source>Install</source>
+        <translation>Installieren</translation>
+    </message>
+    <message>
+        <source>* %1 - %2 (from: [%3](%3))</source>
+        <extracomment>Markdown list item: %1 = package name, %2 = version, %3 = URL</extracomment>
+        <translation>* %1 - %2 (von: [%3](%3))</translation>
+    </message>
+    <message>
+        <source>Failed to run script %1: %2</source>
+        <translation>Das Ausführen des Skripts %1 ist fehlgeschlagen: %2</translation>
+    </message>
+    <message>
+        <source>No hook with the name &quot;%1&quot; found.</source>
+        <translation>Kein Einsprungpunkt mit dem Namen &quot;%1&quot; gefunden.</translation>
+    </message>
+    <message>
+        <source>Script did not return a table.</source>
+        <translation>Das Skript hat keine Tabelle zurückgeliefert.</translation>
+    </message>
+    <message>
+        <source>Extension info table did not contain a setup function.</source>
+        <translation>Informationstabelle der Erweiterung enthält keine Setup-Funktion.</translation>
+    </message>
+    <message>
+        <source>Failed to load plugin %1: %2</source>
+        <translation>Laden des Plugins %1 ist fehlgeschlagen: %2</translation>
+    </message>
+    <message>
+        <source>Cannot prepare extension setup: %1</source>
+        <translation>Setup der Erweiterung kann nicht vorbereitet werden: %1</translation>
+    </message>
+    <message>
+        <source>Extension setup function returned false.</source>
+        <translation>Die Setup-Funktion der Erweiterung hat &quot;false&quot; zurückgeliefert.</translation>
+    </message>
+    <message>
+        <source>Extension setup function returned error: %1</source>
+        <translation>Die Setup-Funktion der Erweiterung hat einen Fehler zurückgeliefert: %1</translation>
+    </message>
+</context>
 <context>
     <name>QtC::Macros</name>
     <message>
@@ -36043,10 +36261,6 @@ Für gültige Einstellungen schauen Sie in die Dokumentation des benutzten Langu
         <source>Status</source>
         <translation type="unfinished">Status</translation>
     </message>
-    <message>
-        <source>Unable to apply changes in Devices &gt; MCU.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>No target selected.</source>
         <translation type="unfinished"></translation>
@@ -36392,6 +36606,10 @@ Für gültige Einstellungen schauen Sie in die Dokumentation des benutzten Langu
         <source>No CMake tool was detected. Add a CMake tool in the &lt;a href=&quot;cmake&quot;&gt;CMake options&lt;/a&gt; and select Apply.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Cannot apply changes in Devices &gt; MCU.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>MCU</source>
         <translation type="unfinished"></translation>
@@ -36492,15 +36710,15 @@ Für gültige Einstellungen schauen Sie in die Dokumentation des benutzten Langu
     </message>
     <message>
         <source>User</source>
-        <translation>Nutzer</translation>
+        <translation>Benutzer</translation>
     </message>
     <message>
         <source>Username to use by default on commit.</source>
-        <translation>Nutzername für Commit.</translation>
+        <translation>Benutzername für Commit.</translation>
     </message>
     <message>
         <source>Default username:</source>
-        <translation>Vorgabe für Nutzernamen:</translation>
+        <translation>Vorgabe für Benutzernamen:</translation>
     </message>
     <message>
         <source>Email to use by default on commit.</source>
@@ -36540,7 +36758,7 @@ Für gültige Einstellungen schauen Sie in die Dokumentation des benutzten Langu
     </message>
     <message>
         <source>Prompt for credentials</source>
-        <translation>Nutzerdaten abfragen</translation>
+        <translation>Benutzerdaten abfragen</translation>
     </message>
     <message>
         <source>For example: &quot;https://[user[:pass]@]host[:port]/[path]&quot;.</source>
@@ -37024,6 +37242,14 @@ Dies ist hilfreich, wenn das Build-Verzeichnis beschädigt ist oder das Projekt
         <source>Add Canvas Diagram</source>
         <translation>Canvasdiagramm hinzufügen</translation>
     </message>
+    <message>
+        <source>Toggle View and Filter Settings</source>
+        <translation>Einstellungen für Ansicht und Filter umschalten</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+L</source>
+        <translation>Ctrl+Shift+L</translation>
+    </message>
     <message>
         <source>Synchronize Browser and Diagram</source>
         <translation>Browser und Diagramm synchronisieren</translation>
@@ -37034,7 +37260,7 @@ Dies ist hilfreich, wenn das Build-Verzeichnis beschädigt ist oder das Projekt
     </message>
     <message>
         <source>Edit Element Properties</source>
-        <translation>Elementeigenschaften editieren</translation>
+        <translation>Elementeigenschaften bearbeiten</translation>
     </message>
     <message>
         <source>Shift+Return</source>
@@ -37042,7 +37268,7 @@ Dies ist hilfreich, wenn das Build-Verzeichnis beschädigt ist oder das Projekt
     </message>
     <message>
         <source>Edit Item on Diagram</source>
-        <translation>Element auf Diagramm editieren</translation>
+        <translation>Element auf Diagramm bearbeiten</translation>
     </message>
     <message>
         <source>Return</source>
@@ -37165,6 +37391,18 @@ Dies ist hilfreich, wenn das Build-Verzeichnis beschädigt ist oder das Projekt
         <source>Add Class %1</source>
         <translation>Klasse %1 hinzufügen</translation>
     </message>
+    <message>
+        <source>Add Package Link to %1</source>
+        <translation>Paket-Link zu %1 hinzufügen</translation>
+    </message>
+    <message>
+        <source>Add Diagram Link to %1</source>
+        <translation>Diagramm-Link zu %1 hinzufügen</translation>
+    </message>
+    <message>
+        <source>Add Document Link to %1</source>
+        <translation>Dokument-Link zu %1 hinzufügen</translation>
+    </message>
     <message>
         <source>Add Package %1</source>
         <translation>Paket %1 hinzufügen</translation>
@@ -37193,14 +37431,50 @@ Dies ist hilfreich, wenn das Build-Verzeichnis beschädigt ist oder das Projekt
         <source>Config path:</source>
         <translation>Konfigurationspfad:</translation>
     </message>
+    <message>
+        <source>Select File Target</source>
+        <translation>Zieldatei auswählen</translation>
+    </message>
+    <message>
+        <source>Linked file:</source>
+        <translation>Verlinkte Datei:</translation>
+    </message>
+    <message>
+        <source>Select Image File</source>
+        <translation>Bilddatei auswählen</translation>
+    </message>
+    <message>
+        <source>Image:</source>
+        <translation>Bild:</translation>
+    </message>
     <message>
         <source>&lt;font color=red&gt;Model file must be reloaded.&lt;/font&gt;</source>
         <translation>&lt;font color=red&gt;Modell muss neu geladen werden.&lt;/font&gt;</translation>
     </message>
+    <message>
+        <source>Selecting Image</source>
+        <translation>Bild auswählen</translation>
+    </message>
+    <message>
+        <source>Unable to read image file &quot;%1&quot;.</source>
+        <translation>Bilddatei &quot;%1&quot; konnte nicht gelesen werden.</translation>
+    </message>
     <message>
         <source>Zoom: %1%</source>
         <translation>Vergrößerung: %1%</translation>
     </message>
+    <message>
+        <source>Opening File</source>
+        <translation>Öffne Datei</translation>
+    </message>
+    <message>
+        <source>File &quot;%1&quot; does not exist.</source>
+        <translation>Datei &quot;%1&quot; existiert nicht.</translation>
+    </message>
+    <message>
+        <source>Add Related Elements...</source>
+        <translation>Zugehörige Elemente hinzufügen...</translation>
+    </message>
     <message>
         <source>Update Include Dependencies</source>
         <translation>Include-Abhängigkeiten aktualisieren</translation>
@@ -37347,7 +37621,7 @@ Dies ist hilfreich, wenn das Build-Verzeichnis beschädigt ist oder das Projekt
     <name>QtC::PerfProfiler</name>
     <message>
         <source>Stack snapshot size (kB):</source>
-        <translation>Größe des Stack-Abbilds (kB):</translation>
+        <translation>Größe des Stackabbilds (kB):</translation>
     </message>
     <message>
         <source>Call graph mode:</source>
@@ -37964,7 +38238,7 @@ Weitere Erklärungen sind möglicherweise in &quot;Ausgabe der Anwendung&quot; z
     </message>
     <message>
         <source>Edit File</source>
-        <translation>Datei zum Editieren anfordern</translation>
+        <translation>Datei zum Bearbeiten anfordern</translation>
     </message>
     <message>
         <source>Add</source>
@@ -38316,15 +38590,15 @@ Weitere Erklärungen sind möglicherweise in &quot;Ausgabe der Anwendung&quot; z
     </message>
     <message>
         <source>P4 client:</source>
-        <translation>P4 Client:</translation>
+        <translation>P4-Client:</translation>
     </message>
     <message>
         <source>P4 user:</source>
-        <translation>P4 Nutzer:</translation>
+        <translation>P4-Benutzer:</translation>
     </message>
     <message>
         <source>P4 port:</source>
-        <translation>P4 Port-Nummer:</translation>
+        <translation>P4-Port:</translation>
     </message>
     <message>
         <source>Environment Variables</source>
@@ -38344,7 +38618,7 @@ Weitere Erklärungen sind möglicherweise in &quot;Ausgabe der Anwendung&quot; z
     </message>
     <message>
         <source>User:</source>
-        <translation>Nutzer:</translation>
+        <translation>Benutzer:</translation>
     </message>
     <message>
         <source>No executable specified</source>
@@ -38601,7 +38875,7 @@ Weitere Erklärungen sind möglicherweise in &quot;Ausgabe der Anwendung&quot; z
     </message>
     <message>
         <source>Locates files of all open projects. Append &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the given line number. Append another &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the column number as well.</source>
-        <translation>Findet Dateien in allen geöffneten Projekten. Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
+        <translation>Findet Dateien in allen geöffneten Projekten. Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie erneut &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
     </message>
     <message>
         <source>All Projects</source>
@@ -38683,6 +38957,11 @@ Außer: %2
         <source>Compile Output</source>
         <translation>Kompilierung</translation>
     </message>
+    <message>
+        <source>compile-output.txt</source>
+        <extracomment>file name suggested for saving compile output</extracomment>
+        <translation>kompilierungsausgabe.txt</translation>
+    </message>
     <message>
         <source>Show Compile &amp;Output</source>
         <translation>Ausgabe der &amp;Kompilierung zeigen</translation>
@@ -38701,7 +38980,7 @@ Außer: %2
     </message>
     <message>
         <source>Locates files from the current document&apos;s project. Append &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the given line number. Append another &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the column number as well.</source>
-        <translation>Findet Dateien im Projekt des aktuellen Dokuments. Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
+        <translation>Findet Dateien im Projekt des aktuellen Dokuments. Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie erneut &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
     </message>
     <message>
         <source>Project &quot;%1&quot;</source>
@@ -38764,7 +39043,7 @@ konnte dem Projekt &quot;%2&quot; nicht hinzugefügt werden.</translation>
     </message>
     <message>
         <source>Hide Source and Header Groups</source>
-        <translation>Source- und Headergruppen ausblenden</translation>
+        <translation>Quelltext- und Header-Gruppenverzeichnisse ausblenden</translation>
     </message>
     <message>
         <source>Synchronize with Editor</source>
@@ -39039,6 +39318,10 @@ Title of a the cloned RunConfiguration window, text of the window</extracomment>
         <source>Ctrl+Shift+O</source>
         <translation>Ctrl+Shift+O</translation>
     </message>
+    <message>
+        <source>Open Workspace...</source>
+        <translation>Workspace öffnen...</translation>
+    </message>
     <message>
         <source>Open File</source>
         <translation>Datei öffnen</translation>
@@ -39361,6 +39644,10 @@ Bitte versuchen Sie es erneut.</translation>
         <source>Load Project</source>
         <translation>Projekt laden</translation>
     </message>
+    <message>
+        <source>Open Workspace</source>
+        <translation>Workspace öffnen</translation>
+    </message>
     <message>
         <source>Sanitizer</source>
         <comment>Category for sanitizer issues listed under &apos;Issues&apos;</comment>
@@ -39387,10 +39674,6 @@ Bitte versuchen Sie es erneut.</translation>
         <source>&lt;h3&gt;Project already open&lt;/h3&gt;</source>
         <translation>&lt;h3&gt;Projekt bereits geöffnet&lt;/h3&gt;</translation>
     </message>
-    <message>
-        <source>Failed opening project &quot;%1&quot;: Project is not a file.</source>
-        <translation>Das Projekt &quot;%1&quot; konnte nicht geöffnet werden: Die angegebene Projektdatei ist keine Datei.</translation>
-    </message>
     <message>
         <source>Open Project in &quot;%1&quot;</source>
         <translation>Projekt in &quot;%1&quot; öffnen</translation>
@@ -39451,7 +39734,7 @@ Bitte versuchen Sie es erneut.</translation>
     </message>
     <message>
         <source>Locates files from all project directories. Append &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the given line number. Append another &quot;+&lt;number&gt;&quot; or &quot;:&lt;number&gt;&quot; to jump to the column number as well.</source>
-        <translation>Findet Dateien in allen Projektverzeichnissen. Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie noch einmal &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
+        <translation>Findet Dateien in allen Projektverzeichnissen. Fügen Sie &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um zur angegebenen Zeile zu springen. Fügen Sie erneut &quot;+&lt;Zahl&gt;&quot; oder &quot;:&lt;Zahl&gt;&quot; an, um auch zur angegebenen Spalte zu springen.</translation>
     </message>
     <message>
         <source>Run Run Configuration</source>
@@ -40019,6 +40302,22 @@ Rename %2 to %3 anyway?</source>
         <source>The project was not parsed successfully.</source>
         <translation>Das Projekt konnte nicht erfolgreich ausgewertet werden.</translation>
     </message>
+    <message>
+        <source>No build device is set for the kit &quot;%1&quot;.</source>
+        <translation>Es ist kein Gerät (Erstellung) für das Kit &quot;%1&quot; eingerichtet.</translation>
+    </message>
+    <message>
+        <source>You can try mounting the folder in your device settings.</source>
+        <translation>Sie können in den Geräteeinstellungen versuchen, das Verzeichnis einzuhängen.</translation>
+    </message>
+    <message>
+        <source>The build device &quot;%1&quot; cannot reach the project directory.</source>
+        <translation>Das Gerät &quot;%1&quot; für das Erstellen kann das Projektverzeichnis nicht erreichen.</translation>
+    </message>
+    <message>
+        <source>The build device &quot;%1&quot; cannot reach the build directory.</source>
+        <translation>Das Gerät &quot;%1&quot; für das Erstellen kann das Build-Verzeichnis nicht erreichen.</translation>
+    </message>
     <message>
         <source>Default</source>
         <extracomment>The name of the build configuration created by default for a autotools project.
@@ -40249,11 +40548,11 @@ Aktivieren Sie dies, wenn Sie 32bit-x86-Binärdateien erstellen wollen, ohne ein
     </message>
     <message>
         <source>The following compiler was already configured:&lt;br&gt;&amp;nbsp;%1&lt;br&gt;It was not configured again.</source>
-        <translation>Der folgende Compiler ist bereits konfiguriert:&lt;br&gt;&amp;nbsp;%1&lt;br&gt;Er wurde nicht noch einmal konfiguriert.</translation>
+        <translation>Der folgende Compiler ist bereits konfiguriert:&lt;br&gt;&amp;nbsp;%1&lt;br&gt;Er wurde nicht erneut konfiguriert.</translation>
     </message>
     <message>
         <source>The following compilers were already configured:&lt;br&gt;&amp;nbsp;%1&lt;br&gt;They were not configured again.</source>
-        <translation>Die folgenden Compiler wurden bereits konfiguriert:&lt;br&gt;&amp;nbsp;%1&lt;br&gt;Sie wurden nicht noch einmal konfiguriert.</translation>
+        <translation>Die folgenden Compiler wurden bereits konfiguriert:&lt;br&gt;&amp;nbsp;%1&lt;br&gt;Sie wurden nicht erneut konfiguriert.</translation>
     </message>
     <message>
         <source>Clone of %1</source>
@@ -40307,6 +40606,11 @@ Aktivieren Sie dies, wenn Sie 32bit-x86-Binärdateien erstellen wollen, ohne ein
         <source>Stop running program.</source>
         <translation>Laufendes Programm anhalten.</translation>
     </message>
+    <message>
+        <source>application-output-%1.txt</source>
+        <extracomment>file name suggested for saving application output, %1 = run configuration display name</extracomment>
+        <translation>anwendungsausgabe-%1.txt</translation>
+    </message>
     <message>
         <source>Application Output</source>
         <translation>Ausgabe der Anwendung</translation>
@@ -40588,7 +40892,7 @@ Aktivieren Sie dies, wenn Sie 32bit-x86-Binärdateien erstellen wollen, ohne ein
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The name of the kit suitable for generating directory names. This value is used for the variable &lt;i&gt;%1&lt;/i&gt;, which for example determines the name of the shadow build directory.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Der Name des Kits, der zum Erzeugen von Verzeichnisnamen geeignet ist. Dieser Wert wird für die Variable &lt;i&gt;%1&lt;/i&gt; benutzt, die zum Beispiel den Namen des Shadow-Build-Verzeichnisses bestimmt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Der Name des Kits, der zum Erzeugen von Verzeichnisnamen geeignet ist. Dieser Wert wird für die Variable &lt;i&gt;%1&lt;/i&gt; verwendet, die zum Beispiel den Namen des Shadow-Build-Verzeichnisses bestimmt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>File system name:</source>
@@ -40872,7 +41176,7 @@ Aktivieren Sie dies, wenn Sie 32bit-x86-Binärdateien erstellen wollen, ohne ein
     <message>
         <source>The process cannot access the file because it is being used by another process.
 Please close all running instances of your application before starting a build.</source>
-        <translation>Der Prozess kann nicht auf die Datei zugreifen, da sie von einem anderen Prozess benutzt wird.
+        <translation>Der Prozess kann nicht auf die Datei zugreifen, da sie von einem anderen Prozess verwendet wird.
 Bitte schließen Sie alle laufenden Instanzen Ihrer Anwendung vor dem Erstellen.</translation>
     </message>
     <message>
@@ -40891,10 +41195,6 @@ Bitte schließen Sie alle laufenden Instanzen Ihrer Anwendung vor dem Erstellen.
         <source>DebugBreakProcess failed:</source>
         <translation>DebugBreakProcess schlug fehl:</translation>
     </message>
-    <message>
-        <source>could not break the process.</source>
-        <translation>konnte den Prozess nicht anhalten.</translation>
-    </message>
     <message>
         <source>Cannot kill process with pid %1: %2</source>
         <translation>Der Prozess mit der PID %1 konnte nicht beendet werden: %2</translation>
@@ -40903,14 +41203,6 @@ Bitte schließen Sie alle laufenden Instanzen Ihrer Anwendung vor dem Erstellen.
         <source>Cannot interrupt process with pid %1: %2</source>
         <translation>Der Prozess mit der PID %1 konnte nicht unterbrochen werden: %2</translation>
     </message>
-    <message>
-        <source>%1 does not exist. If you built %2 yourself, check out https://code.qt.io/cgit/qt-creator/binary-artifacts.git/.</source>
-        <translation>%1 existiert nicht. Wenn Sie %2 selbst erstellt haben, checken Sie bitte auch https://code.qt.io/cgit/qt-creator/binary-artifacts.git/ aus.</translation>
-    </message>
-    <message>
-        <source>Cannot start %1. Check src\tools\win64interrupt\win64interrupt.c for more information.</source>
-        <translation>%1 konnte nicht gestartet werden. Für weiterführende Informationen siehe auch src\tools\win64interrupt\win64interrupt.c.</translation>
-    </message>
     <message>
         <source>Import Build From...</source>
         <translation>Build importieren von...</translation>
@@ -41052,11 +41344,11 @@ Bitte schließen Sie alle laufenden Instanzen Ihrer Anwendung vor dem Erstellen.
     </message>
     <message>
         <source>File Generation Failed</source>
-        <translation>Dateierzeugung gescheitert</translation>
+        <translation>Dateierzeugung fehlgeschlagen</translation>
     </message>
     <message>
         <source>The wizard failed to generate files.&lt;br&gt;The error message was: &quot;%1&quot;.</source>
-        <translation>Der Wizard scheiterte beim Erzeugen von Dateien.&lt;br&gt;Die Fehlermeldung war: &quot;%1&quot;.</translation>
+        <translation>Der Wizard konnte Dateien nicht erzeugen.&lt;br&gt;Die Fehlermeldung war: &quot;%1&quot;.</translation>
     </message>
     <message>
         <source>Failed to Overwrite Files</source>
@@ -41076,7 +41368,7 @@ Bitte schließen Sie alle laufenden Instanzen Ihrer Anwendung vor dem Erstellen.
     </message>
     <message>
         <source>Failed to Polish Files</source>
-        <translation>&quot;Polish&quot; von Dateien gescheitert</translation>
+        <translation>&quot;Polish&quot; von Dateien fehlgeschlagen</translation>
     </message>
     <message>
         <source>Failed to Open Files</source>
@@ -41285,10 +41577,10 @@ Bitte schließen Sie alle laufenden Instanzen Ihrer Anwendung vor dem Erstellen.
         <translation>Pfad</translation>
     </message>
     <message>
-        <source>Creates a widget-based Qt application that contains a Qt Designer-based main window and C++ source and header files to implement the application logic.
+        <source>Creates a widget-based Qt application that contains a Qt Widgets Designer-based main window and C++ source and header files to implement the application logic.
 
 Preselects a desktop Qt for building the application if available.</source>
-        <translation>Erstellt eine Widget-basierte Qt-Anwendung mit einem Qt Designer-basierten Hauptfenster und C++-Quell- und Headerdateien zur Implementierung der Applikationslogik.
+        <translation>Erstellt eine Widget-basierte Qt-Anwendung mit einem Qt Widgets Designer-basierten Hauptfenster und C++-Quell- und Headerdateien zur Implementierung der Applikationslogik.
 
 Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern verfügbar.</translation>
     </message>
@@ -41318,7 +41610,7 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern verfügbar
 Use this &quot;compat&quot; version if you want to use other build systems than CMake or Qt versions lower than 6.</source>
         <translation>Erstellt eine Qt Quick-Anwendung, die ein leeres Fenster enthält.
 
-Nutzen Sie diese &quot;Kompatibilitätsversion&quot;, falls Sie andere Buildsysteme als CMake oder frühere Qt-Versionen als Qt 6 benutzen wollen.</translation>
+Nutzen Sie diese &quot;Kompatibilitätsversion&quot;, falls Sie andere Buildsysteme als CMake oder frühere Qt-Versionen als Qt 6 verwenden wollen.</translation>
     </message>
     <message>
         <source>Qt Quick Application (compat)</source>
@@ -41381,11 +41673,11 @@ Wahlweise können Sie ein Projekt erstellen, das in Qt Design Studio geöffnet w
         <translation>Formularvorlage</translation>
     </message>
     <message>
-        <source>Creates a Qt Designer form that you can add to a Qt Widget Project. This is useful if you already have an existing class for the UI business logic.</source>
-        <translation>Erstellt ein Qt-Designer-Formular, das Sie zu einem Qt Widget-Projekt hinzufügen können. Dies ist nützlich, wenn Sie bereits eine Klasse für die Anwendungslogik haben.</translation>
+        <source>Creates a Qt Widgets Designer form that you can add to a Qt Widget Project. This is useful if you already have an existing class for the UI business logic.</source>
+        <translation>Erstellt ein Qt-Widgets-Designer-Formular, das Sie zu einem Qt Widget-Projekt hinzufügen können. Dies ist nützlich, wenn Sie bereits eine Klasse für die Anwendungslogik haben.</translation>
     </message>
     <message>
-        <source>Qt Designer Form</source>
+        <source>Qt Widgets Designer Form</source>
         <translation>Qt-Designer-Formular</translation>
     </message>
     <message>
@@ -41452,7 +41744,7 @@ Wahlweise können Sie ein Projekt erstellen, das in Qt Design Studio geöffnet w
         <source>You must tell Qt Creator which test framework is used inside the project.
 
 You should not mix multiple test frameworks in a project.</source>
-        <translation>Sie müssen Qt Creator mitteilen, welches Test-Framework im Projekt benutzt wird.
+        <translation>Sie müssen Qt Creator mitteilen, welches Test-Framework im Projekt verwendet wird.
 
 Sie sollten nicht mehrere Test-Frameworks im selben Projekt mischen.</translation>
     </message>
@@ -41824,7 +42116,7 @@ Sie sollten nicht mehrere Test-Frameworks im selben Projekt mischen.</translatio
     </message>
     <message>
         <source>Specify basic information about the classes for which you want to generate skeleton source code files.</source>
-        <translation>Geben Sie Informationen bezüglich der Klassen ein, für die Sie Quelltexte generieren wollen.</translation>
+        <translation>Geben Sie Informationen bezüglich der Klassen ein, für die Sie Quelltext generieren wollen.</translation>
     </message>
     <message>
         <source>Fully qualified name, including namespaces</source>
@@ -41899,8 +42191,8 @@ Sie sollten nicht mehrere Test-Frameworks im selben Projekt mischen.</translatio
         <translation>Leeres Fenster</translation>
     </message>
     <message>
-        <source>Creates a Qt for Python application that includes a Qt Designer-based widget (ui file). Requires .ui to Python conversion.</source>
-        <translation>Erstellt eine Qt for Python-Anwendung, die ein Qt Designer-basiertes Widget (ui-Datei) enthält. Erfordert Umwandlung von .ui nach Python.</translation>
+        <source>Creates a Qt for Python application that includes a Qt Widgets Designer-based widget (ui file). Requires .ui to Python conversion.</source>
+        <translation>Erstellt eine Qt for Python-Anwendung, die ein Qt Widgets Designer-basiertes Widget (ui-Datei) enthält. Erfordert Umwandlung von .ui nach Python.</translation>
     </message>
     <message>
         <source>Window UI</source>
@@ -42048,7 +42340,7 @@ Sie sollten nicht mehrere Test-Frameworks im selben Projekt mischen.</translatio
     </message>
     <message>
         <source>The minimum version of Qt you want to build the application for</source>
-        <translation>Die niedrigste Qt-Version, die Sie zum Bauen der Anwendung benutzen wollen</translation>
+        <translation>Die niedrigste Qt-Version, die Sie zum Bauen der Anwendung verwenden wollen</translation>
     </message>
     <message>
         <source>This wizard creates a simple unit test project using Boost.</source>
@@ -42651,46 +42943,38 @@ Sie sollten nicht mehrere Test-Frameworks im selben Projekt mischen.</translatio
         <translation>Page mit typeId &quot;%1&quot; hat ungültigen &quot;index&quot;.</translation>
     </message>
     <message>
-        <source>Path &quot;%1&quot; does not exist when checking Json wizard search paths.
-</source>
-        <translation>Pfad &quot;%1&quot; existiert nicht in Json-Wizard Suchpfaden.
-</translation>
+        <source>Path &quot;%1&quot; does not exist when checking JSON wizard search paths.</source>
+        <translation>Pfad &quot;%1&quot; existiert nicht in JSON-Wizard Suchpfaden.</translation>
     </message>
     <message>
-        <source>Checking &quot;%1&quot; for %2.
-</source>
-        <translation>Prüfe &quot;%1&quot; für %2.
-</translation>
+        <source>Checking &quot;%1&quot; for %2.</source>
+        <translation>Prüfe &quot;%1&quot; für %2.</translation>
     </message>
     <message>
-        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4
-</source>
-        <translation>* Konnte &quot;%1&quot; nicht auswerten: %2:%3: %4
-</translation>
+        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4</source>
+        <translation>* Konnte &quot;%1&quot; nicht auswerten: %2:%3: %4</translation>
+    </message>
+    <message>
+        <source>* Did not find a JSON object in &quot;%1&quot;.</source>
+        <translation>* Kein JSON-Objekt in &quot;%1&quot; gefunden.</translation>
+    </message>
+    <message>
+        <source>* Configuration found and parsed.</source>
+        <translation>* Konfiguration gefunden und ausgewertet.</translation>
     </message>
     <message>
         <source>* Did not find a JSON object in &quot;%1&quot;.
 </source>
-        <translation>* Kein JSON-Objekt in &quot;%1&quot; gefunden.
+        <translation>* Konnte kein JSON-Objekt in &quot;%1&quot; finden.
 </translation>
     </message>
     <message>
-        <source>* Configuration found and parsed.
-</source>
-        <translation>* Konfiguration gefunden und ausgewertet.
-</translation>
+        <source>* Version %1 not supported.</source>
+        <translation>* Version %1 nicht unterstützt.</translation>
     </message>
     <message>
-        <source>* Version %1 not supported.
-</source>
-        <translation>* Version %1 nicht unterstützt.
-</translation>
-    </message>
-    <message>
-        <source>* Failed to create: %1
-</source>
-        <translation>* Erstellen fehlgeschlagen: %1
-</translation>
+        <source>* Failed to create: %1</source>
+        <translation>* Erstellen fehlgeschlagen: %1</translation>
     </message>
     <message>
         <source>The platform selected for the wizard.</source>
@@ -42721,10 +43005,8 @@ Sie sollten nicht mehrere Test-Frameworks im selben Projekt mischen.</translatio
         <translation>Bilddatei &quot;%1&quot; nicht gefunden.</translation>
     </message>
     <message>
-        <source>JsonWizard: &quot;%1&quot; not found
-</source>
-        <translation>JsonWizard: &quot;%1&quot; nicht gefunden
-</translation>
+        <source>JsonWizard: &quot;%1&quot; not found.</source>
+        <translation>JsonWizard: &quot;%1&quot; nicht gefunden.</translation>
     </message>
     <message>
         <source>key not found.</source>
@@ -42838,6 +43120,11 @@ Sie sollten nicht mehrere Test-Frameworks im selben Projekt mischen.</translatio
         <extracomment>%1 is something like &quot;Active project&quot;</extracomment>
         <translation>%1: Vollständiger Pfad zur Hauptdatei.</translation>
     </message>
+    <message>
+        <source>%1: Full path to Project Directory.</source>
+        <extracomment>%1 is something like &quot;Active project&quot;</extracomment>
+        <translation>%1: Vollständiger Pfad zum Projektverzeichnis.</translation>
+    </message>
     <message>
         <source>%1: The name of the active kit.</source>
         <extracomment>%1 is something like &quot;Active project&quot;</extracomment>
@@ -43189,6 +43476,14 @@ Sie werden erhalten.</numerusform>
         <source>&amp;Configure Project</source>
         <translation>Projekt &amp;konfigurieren</translation>
     </message>
+    <message>
+        <source>Show All Kits</source>
+        <translation>Alle Kits anzeigen</translation>
+    </message>
+    <message>
+        <source>Hide Inactive Kits</source>
+        <translation>Inaktive Kits verbergen</translation>
+    </message>
     <message>
         <source>Enable Kit for Project &quot;%1&quot;</source>
         <translation>Kit für das Projekt &quot;%1&quot; aktivieren</translation>
@@ -43340,7 +43635,7 @@ Was soll %1 tun?</translation>
     </message>
     <message>
         <source>A version control operation failed for the following files. Please check your repository.</source>
-        <translation>Für die folgenden Dateien ist eine Versionskontroll-Operation gescheitert. Bitte prüfen Sie Ihr Repository.</translation>
+        <translation>Für die folgenden Dateien ist eine Versionskontroll-Operation fehlgeschlagen. Bitte prüfen Sie Ihr Repository.</translation>
     </message>
     <message>
         <source>Failure Updating Project</source>
@@ -43382,6 +43677,14 @@ Was soll %1 tun?</translation>
         <source>Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)</source>
         <translation>Debug-Version von Frameworks verwenden (DYLD_IMAGE_SUFFIX=_debug)</translation>
     </message>
+    <message>
+        <source>Emulator</source>
+        <translation>Emulator</translation>
+    </message>
+    <message>
+        <source>Launcher:</source>
+        <translation>Startprogramm:</translation>
+    </message>
     <message>
         <source>X11 Forwarding:</source>
         <translation>X11-Weiterleitung:</translation>
@@ -43565,8 +43868,8 @@ Was soll %1 tun?</translation>
         <translation>Das Build-Verzeichnis enthält das möglicherweise problematische Zeichen &quot;%1&quot;.</translation>
     </message>
     <message>
-        <source> This warning can be suppressed &lt;a href=&quot;dummy&quot;&gt;here&lt;/a&gt;.</source>
-        <translation> Diese Warnung kann &lt;a href=&quot;dummy&quot;&gt;hier&lt;/a&gt; unterdrückt werden.</translation>
+        <source>This warning can be suppressed &lt;a href=&quot;dummy&quot;&gt;here&lt;/a&gt;.</source>
+        <translation>Diese Warnung kann &lt;a href=&quot;dummy&quot;&gt;hier&lt;/a&gt; unterdrückt werden.</translation>
     </message>
     <message>
         <source>The project is currently being parsed.</source>
@@ -43742,11 +44045,11 @@ Was soll %1 tun?</translation>
     </message>
     <message>
         <source>Either switches MSVC to English or keeps the language and just forces UTF-8 output (may vary depending on the used MSVC compiler).</source>
-        <translation>Stellt MSVC entweder auf Englisch um oder behält die Sprache bei und erzwingt UTF-8-Ausgabe (abhängig vom benutzen MSVC-Compiler).</translation>
+        <translation>Stellt MSVC entweder auf Englisch um oder behält die Sprache bei und erzwingt UTF-8-Ausgabe (abhängig vom verwendeten MSVC-Compiler).</translation>
     </message>
     <message>
         <source>Additional build environment settings when using this kit.</source>
-        <translation>Zusätzliche Build-Umgebungseinstellungen bei Benutzung dieses Kits.</translation>
+        <translation>Zusätzliche Build-Umgebungseinstellungen bei Verwendung dieses Kits.</translation>
     </message>
     <message>
         <source>The environment setting value is invalid.</source>
@@ -43806,7 +44109,7 @@ Was soll %1 tun?</translation>
     </message>
     <message>
         <source>Use parsers from kit:</source>
-        <translation>Parser vom Kit benutzen:</translation>
+        <translation>Parser vom Kit verwenden:</translation>
     </message>
     <message>
         <source>Cannot Parse</source>
@@ -43833,6 +44136,15 @@ Was soll %1 tun?</translation>
         <source>Building &quot;%1&quot; is disabled: %2&lt;br&gt;</source>
         <translation>Das Erstellen von &quot;%1&quot; ist deaktiviert: %2&lt;br&gt;</translation>
     </message>
+    <message>
+        <source>s</source>
+        <extracomment>Suffix for &quot;seconds&quot;</extracomment>
+        <translation>s</translation>
+    </message>
+    <message>
+        <source>The amount of seconds to wait between a &quot;soft kill&quot; and a &quot;hard kill&quot; of a running application.</source>
+        <translation>Die Zeit in Sekunden, die zwischen einem &quot;soft kill&quot; und einem &quot;hard kill&quot; einer laufenden Anwendung gewartet werden soll.</translation>
+    </message>
     <message>
         <source>Current directory</source>
         <translation>Arbeitsverzeichnis</translation>
@@ -43929,6 +44241,14 @@ Was soll %1 tun?</translation>
         <source>Use jom instead of nmake</source>
         <translation>jom statt nmake verwenden</translation>
     </message>
+    <message>
+        <source>Show all kits in &quot;Build &amp; Run&quot; in &quot;Projects&quot; mode</source>
+        <translation>Alle Kits in &quot;Erstellung und Ausführung&quot; im Modus &quot;Projekte&quot; anzeigen</translation>
+    </message>
+    <message>
+        <source>Show also inactive kits in &quot;Build &amp; Run&quot; in &quot;Projects&quot; mode.</source>
+        <translation>Zeige auch inaktive Kits in &quot;Erstellung und Ausführung&quot; im Modus &quot;Projekte&quot;.</translation>
+    </message>
     <message>
         <source>Environment changes to apply to run configurations, but not build configurations.</source>
         <translation>Änderungen der Umgebung, die auf Ausführungskonfigurationen, aber nicht auf Build-Konfigurationen angewendet werden sollen.</translation>
@@ -43961,6 +44281,10 @@ Was soll %1 tun?</translation>
         <source>Default for &quot;Run in terminal&quot;:</source>
         <translation>Vorgabe für &quot;Im Terminal ausführen&quot;:</translation>
     </message>
+    <message>
+        <source>Time to wait before force-stopping applications:</source>
+        <translation>Zu wartende Zeit vor dem erzwungenen Beenden von Anwendungen:</translation>
+    </message>
     <message>
         <source>Files</source>
         <translation>Dateien</translation>
@@ -44051,19 +44375,23 @@ Was soll %1 tun?</translation>
     </message>
     <message>
         <source>Use Project Default</source>
-        <translation>Projekt-Vorgabe benutzen</translation>
+        <translation>Projekt-Vorgabe verwenden</translation>
     </message>
     <message>
         <source>Default build directory:</source>
         <translation>Vorgabe-Build-Verzeichnis:</translation>
     </message>
+    <message>
+        <source>Template used to construct the default build directory.&lt;br&gt;&lt;br&gt;The default value can be set using the environment variable &lt;tt&gt;%1&lt;/tt&gt;.</source>
+        <translation>Vorlage für das Standard-Build-Verzeichnis.&lt;br&gt;&lt;br&gt;Der Standardwert kann über die Umgebungsvariable &lt;tt&gt;%1&lt;/tt&gt; gesetzt werden.</translation>
+    </message>
     <message>
         <source>QML debugging:</source>
         <translation>QML-Debuggen:</translation>
     </message>
     <message>
         <source>Use qmlcachegen:</source>
-        <translation>qmlcachegen benutzen:</translation>
+        <translation>qmlcachegen verwenden:</translation>
     </message>
     <message>
         <source>Default Build Properties</source>
@@ -44130,7 +44458,7 @@ Was soll %1 tun?</translation>
     </message>
     <message>
         <source>If available, use a different margin. For example, the ColumnLimit from the ClangFormat plugin.</source>
-        <translation>Benutzt unterschiedlichen Rand abhängig vom Kontext, falls verfügbar. Zum Beispiel das ColumnLimit vom ClangFormat Plugin.</translation>
+        <translation>Verwendet unterschiedlichen Rand abhängig vom Kontext, falls verfügbar. Zum Beispiel das ColumnLimit vom ClangFormat Plugin.</translation>
     </message>
     <message>
         <source>Files in All Project Directories</source>
@@ -44195,7 +44523,7 @@ fails because Clang does not understand the target architecture.</source>
     </message>
     <message>
         <source>User requested stop. Shutting down...</source>
-        <translation>Abbruch auf Nutzeranforderung...</translation>
+        <translation>Abbruch auf Benutzeranforderung...</translation>
     </message>
     <message>
         <source>Cannot run: No command given.</source>
@@ -44219,7 +44547,7 @@ fails because Clang does not understand the target architecture.</source>
     </message>
     <message>
         <source>Imports existing projects that do not use qmake, CMake, Qbs, Meson, or Autotools.&lt;p&gt;This creates a project file that allows you to use %1 as a code editor and as a launcher for debugging and analyzing tools. If you want to build the project, you might need to edit the generated project file.</source>
-        <translation>Importiert ein existierendes Projekt, dass nicht qmake, CMake, Qbs, Meson oder Autotools benutzt.&lt;p&gt;Dies erstellt eine Projektdatei, die Ihnen erlaubt, %1 als Code-Editor und zum Starten des Debuggers und von Analysewerkzeugen zu benutzen. Wenn Sie das Projekt bauen wollen, müssen Sie die generierte Datei möglicherweise anpassen.</translation>
+        <translation>Importiert ein existierendes Projekt, dass nicht qmake, CMake, Qbs, Meson oder Autotools verwendet.&lt;p&gt;Dies erstellt eine Projektdatei, die Ihnen erlaubt, %1 als Code-Editor und zum Starten des Debuggers und von Analysewerkzeugen zu verwenden. Wenn Sie das Projekt bauen wollen, müssen Sie die generierte Datei möglicherweise anpassen.</translation>
     </message>
     <message>
         <source>Unknown build system &quot;%1&quot;</source>
@@ -44276,6 +44604,18 @@ fails because Clang does not understand the target architecture.</source>
         <source>unavailable</source>
         <translation>nicht verfügbar</translation>
     </message>
+    <message>
+        <source>You can edit this configuration inside the .qtcreator/project.json file.</source>
+        <translation>Sie können diese Konfiguration über die Datei &quot;.qtcreator/project.json&quot; bearbeiten.</translation>
+    </message>
+    <message>
+        <source>Exclude from Project</source>
+        <translation>Vom Projekt ausschließen</translation>
+    </message>
+    <message>
+        <source>Rescan Workspace</source>
+        <translation>Workspace erneut durchsuchen</translation>
+    </message>
 </context>
 <context>
     <name>QtC::Python</name>
@@ -44361,7 +44701,7 @@ fails because Clang does not understand the target architecture.</source>
     </message>
     <message>
         <source>Use Python Language Server</source>
-        <translation>Python Language Server benutzen</translation>
+        <translation>Python Language Server verwenden</translation>
     </message>
     <message>
         <source>For a complete list of available options, consult the [Python LSP Server configuration documentation](%1).</source>
@@ -44409,7 +44749,7 @@ fails because Clang does not understand the target architecture.</source>
     </message>
     <message>
         <source>You can install PySide from PyPi (Community OSS version) or from your Qt installation location, if you are using the Qt Installer and have a commercial license.</source>
-        <translation>Sie können PySide von PyPI (Community OSS-Version) oder, falls Sie den Qt-Installer benutzen und eine kommerzielle Lizenz besitzen, von Ihrer Qt-Installation installieren.</translation>
+        <translation>Sie können PySide von PyPI (Community OSS-Version) oder, falls Sie den Qt-Installer verwenden und eine kommerzielle Lizenz besitzen, von Ihrer Qt-Installation installieren.</translation>
     </message>
     <message>
         <source>Select which version to install:</source>
@@ -44436,8 +44776,29 @@ fails because Clang does not understand the target architecture.</source>
         <translation>Installieren</translation>
     </message>
     <message>
-        <source>Install Python Packages</source>
-        <translation>Python-Pakete installieren</translation>
+        <source>Update Requirements</source>
+        <translation>Requirements aktualisieren</translation>
+    </message>
+    <message>
+        <source>Install Requirements</source>
+        <translation>Requirements installieren</translation>
+    </message>
+    <message>
+        <source>Update %1</source>
+        <extracomment>%1 = package name</extracomment>
+        <translation>%1 aktualisieren</translation>
+    </message>
+    <message>
+        <source>Install %1</source>
+        <translation>%1 installieren</translation>
+    </message>
+    <message>
+        <source>Update Packages</source>
+        <translation>Pakete aktualisieren</translation>
+    </message>
+    <message>
+        <source>Install Packages</source>
+        <translation>Pakete installieren</translation>
     </message>
     <message>
         <source>Running &quot;%1&quot; to install %2.</source>
@@ -44540,6 +44901,22 @@ fails because Clang does not understand the target architecture.</source>
         <source>Install Python language server (PyLS) for %1 (%2). The language server provides Python specific completion and annotation.</source>
         <translation>Python Language Server (PyLS) für %1 (%2) installieren. Der Language Server stellt Code-Vervollständigung und Annotationen für Python zur Verfügung.</translation>
     </message>
+    <message>
+        <source>Update Python language server (PyLS) for %1 (%2).</source>
+        <translation>Python Language Server (PyLS) für %1 (%2) aktualisieren.</translation>
+    </message>
+    <message>
+        <source>Always Update</source>
+        <translation>Immer aktualisieren</translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation>Aktualisieren</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Niemals</translation>
+    </message>
     <message>
         <source>Searching Python binaries...</source>
         <translation>Suche ausführbare Python-Dateien...</translation>
@@ -44558,7 +44935,7 @@ fails because Clang does not understand the target architecture.</source>
     </message>
     <message>
         <source>An item of Python wizard page data expects a &quot;trKey&quot; field containing the UI visible string for that Python version and a &quot;value&quot; field containing an object with a &quot;PySideVersion&quot; field used for import statements in the Python files.</source>
-        <translation>Ein Eintrag in den &quot;items&quot; im Feld &quot;data&quot; einer Python-Assistenzseite erwartet ein Feld &quot;trKey&quot;, das den Anzeigenamen für diese Python-Version enthält, und ein Feld &quot;value&quot;, das ein Objekt mit einem Feld &quot;PySideVersion&quot; enthält, das für import-Anweisungen in den Python-Dateien benutzt wird.</translation>
+        <translation>Ein Eintrag in den &quot;items&quot; im Feld &quot;data&quot; einer Python-Assistenzseite erwartet ein Feld &quot;trKey&quot;, das den Anzeigenamen für diese Python-Version enthält, und ein Feld &quot;value&quot;, das ein Objekt mit einem Feld &quot;PySideVersion&quot; enthält, das für import-Anweisungen in den Python-Dateien verwendet wird.</translation>
     </message>
     <message>
         <source>PySide version:</source>
@@ -44574,7 +44951,7 @@ fails because Clang does not understand the target architecture.</source>
     </message>
     <message>
         <source>The interpreter used for Python based projects.</source>
-        <translation>Der für Python-basierte Projekte benutzte Interpreter.</translation>
+        <translation>Der für Python-basierte Projekte verwendete Interpreter.</translation>
     </message>
     <message>
         <source>No Python setup.</source>
@@ -44590,7 +44967,7 @@ fails because Clang does not understand the target architecture.</source>
     </message>
     <message>
         <source>Python &quot;%1&quot; does not contain a usable pip. pip is needed to install Python packages from the Python Package Index, like PySide and the Python language server. To use any of that functionality ensure that pip is installed for that Python.</source>
-        <translation>Python &quot;%1&quot; enthält kein verwendbares pip. pip wird für das Installieren von Python-Paketen wie PySide und dem Python Language Server vom Python Package Index benötigt. Um diese Funktionen benutzen zu können, stellen Sie sicher, dass pip für dieses Python installiert ist.</translation>
+        <translation>Python &quot;%1&quot; enthält kein verwendbares pip. pip wird für das Installieren von Python-Paketen wie PySide und dem Python Language Server vom Python Package Index benötigt. Um diese Funktionen verwenden zu können, stellen Sie sicher, dass pip für dieses Python installiert ist.</translation>
     </message>
     <message>
         <source>Python &quot;%1&quot; does not contain a usable venv. venv is the recommended way to isolate a development environment for a project from the globally installed Python.</source>
@@ -44605,8 +44982,8 @@ fails because Clang does not understand the target architecture.</source>
         <translation>Pfad zum Python-Interpreter</translation>
     </message>
     <message>
-        <source>No Python interpreter set for kit &quot;%1&quot;</source>
-        <translation>Kein Python-Interpreter für das Kit &quot;%1&quot; eingerichtet</translation>
+        <source>No Python interpreter set for kit &quot;%1&quot;.</source>
+        <translation>Kein Python-Interpreter für das Kit &quot;%1&quot; eingerichtet.</translation>
     </message>
 </context>
 <context>
@@ -44900,7 +45277,7 @@ fails because Clang does not understand the target architecture.</source>
     <message>
         <source>Use %1 settings directory for Qbs</source>
         <extracomment>%1 == &quot;Qt Creator&quot; or &quot;Qt Design Studio&quot;</extracomment>
-        <translation>Das Verzeichnis für Einstellungen von %1 auch für Qbs benutzen</translation>
+        <translation>Das Verzeichnis für Einstellungen von %1 auch für Qbs verwenden</translation>
     </message>
     <message>
         <source>Path to qbs executable:</source>
@@ -44994,20 +45371,20 @@ Die betroffenen Dateien sind:
         <source>Command failed on device &quot;%1&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>stdout was: &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>stderr was: &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Commands on device &quot;%1&quot; finished successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Boot2Qt Device</source>
+        <source>stdout was: &quot;%1&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>stderr was: &quot;%1&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Boot to Qt Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -45043,7 +45420,7 @@ Die betroffenen Dateien sind:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Boot2Qt Network Device Setup</source>
+        <source>Boot to Qt Network Device Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -45066,6 +45443,10 @@ Die betroffenen Dateien sind:
         <source>Executable on device:</source>
         <translation>Ausführbare Datei auf Mobilgerät:</translation>
     </message>
+    <message>
+        <source>Run on Boot to Qt Device</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Remote path not set</source>
         <translation>Der entfernte Pfad ist nicht gesetzt</translation>
@@ -45075,11 +45456,7 @@ Die betroffenen Dateien sind:
         <translation>Ausführbare Datei auf Hostrechner:</translation>
     </message>
     <message>
-        <source>Run on Boot2Qt Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The remote executable must be set in order to run on a Boot2Qt device.</source>
+        <source>The remote executable must be set to run on a Boot to Qt device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -45087,7 +45464,7 @@ Die betroffenen Dateien sind:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Qt Debug Bridge device %1</source>
+        <source>Boot to Qt device %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -45134,10 +45511,6 @@ Die betroffenen Dateien sind:
         <source>Starting QDB host server.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Deploy to Boot2Qt target</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Set this application to start by default</source>
         <translation type="unfinished"></translation>
@@ -45162,6 +45535,10 @@ Die betroffenen Dateien sind:
         <source>Flash Boot to Qt Device</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Deploy to Boot to Qt target</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Could not check and possibly stop running application.</source>
         <translation type="unfinished"></translation>
@@ -45183,7 +45560,7 @@ Die betroffenen Dateien sind:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Boot2Qt: %1</source>
+        <source>Boot to Qt: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -45542,24 +45919,20 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
     </message>
     <message>
         <source>Qt Custom Designer Widget</source>
-        <translation>Benutzerdefiniertes Widget für Qt Designer</translation>
+        <translation>Benutzerdefiniertes Widget für Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Creates a Qt Custom Designer Widget or a Custom Widget Collection.</source>
-        <translation>Erstellt ein oder mehrere benutzerdefinierte Widgets für Qt Designer.</translation>
+        <translation>Erstellt ein oder mehrere benutzerdefinierte Widgets für Qt Widgets Designer.</translation>
     </message>
     <message>
-        <source>This wizard generates a Qt Designer Custom Widget or a Qt Designer Custom Widget Collection project.</source>
-        <translation>Dieser Assistent erstellt ein Projekt mit einem oder mehreren benutzerdefinierten Widgets für Qt Designer.</translation>
+        <source>This wizard generates a Qt Widgets Designer Custom Widget or a Qt Widgets Designer Custom Widget Collection project.</source>
+        <translation>Dieser Assistent erstellt ein Projekt mit einem oder mehreren benutzerdefinierten Widgets für Qt Widgets Designer.</translation>
     </message>
     <message>
         <source>Creating multiple widget libraries (%1, %2) in one project (%3) is not supported.</source>
         <translation>Die Erzeugung von mehreren Bibliotheken (%1, %2) in einem Projekt (%3) wird nicht unterstützt.</translation>
     </message>
-    <message>
-        <source>Unable to start &quot;%1&quot;</source>
-        <translation>&quot;%1&quot; kann nicht gestartet werden</translation>
-    </message>
     <message>
         <source>Could not load kits in a reasonable amount of time.</source>
         <translation>Kits konnten nicht in angemessener Zeit geladen werden.</translation>
@@ -45569,8 +45942,12 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
         <translation>Die Anwendung &quot;%1&quot; konnte nicht gefunden werden.</translation>
     </message>
     <message>
-        <source>Qt Designer is not responding (%1).</source>
-        <translation>Qt Designer antwortet nicht (%1).</translation>
+        <source>Unable to start &quot;%1&quot;.</source>
+        <translation>&quot;%1&quot; kann nicht gestartet werden.</translation>
+    </message>
+    <message>
+        <source>Qt Widgets Designer is not responding (%1).</source>
+        <translation>Qt Widgets Designer antwortet nicht (%1).</translation>
     </message>
     <message>
         <source>Unable to create server socket: %1</source>
@@ -45976,7 +46353,7 @@ Bitte aktualisieren Sie Ihr Kit (%3) oder wählen Sie eine mkspec für qmake, di
     </message>
     <message>
         <source>Checking this option avoids unwanted side effects, but may result in inexact parsing results.</source>
-        <translation>Diese Einstellung verhindert ungewollte Nebeneffekte, kann aber zu ungenauen Resultaten beim Auswerten führen.</translation>
+        <translation>Diese Einstellung verhindert ungewollte Nebeneffekte, kann aber zu ungenauen Ergebnissen beim Auswerten führen.</translation>
     </message>
     <message>
         <source>Qmake</source>
@@ -46025,7 +46402,7 @@ Bitte aktualisieren Sie Ihr Kit (%3) oder wählen Sie eine mkspec für qmake, di
     </message>
     <message>
         <source>Debug connection failed.</source>
-        <translation>Debug-Verbindung gescheitert.</translation>
+        <translation>Debug-Verbindung fehlgeschlagen.</translation>
     </message>
 </context>
 <context>
@@ -46261,9 +46638,9 @@ For qmlRegister... calls, make sure that you define the Module URI as a string l
 Import-Verzeichnisse:
 %2
 
-Für qmake-Projekte benutzen Sie die Variable QML_IMPORT_PATH, um Importpfade hinzuzufügen.
+Für qmake-Projekte verwenden Sie die Variable QML_IMPORT_PATH, um Importpfade hinzuzufügen.
 Für Qbs-Projekte geben Sie eine qmlImportPaths-Eigenschaft in Ihrem Produkt an, um Importpfade hinzuzufügen.
-Für qmlproject-Projekte benutzen Sie die importPaths-Eigenschaft, um Importpfade hinzuzufügen.
+Für qmlproject-Projekte verwenden Sie die importPaths-Eigenschaft, um Importpfade hinzuzufügen.
 Für CMake-Projekte stellen Sie sicher, dass die Variable QML_IMPORT_PATH in CMakeCache.txt steht.
 Für qmlRegister...-Aufrufe stellen Sie sicher, dass Sie den Modul-URI als Zeichenkettenliteral definieren.
 </translation>
@@ -46288,9 +46665,9 @@ For CMake projects, make sure QML_IMPORT_PATH variable is in CMakeCache.txt.
 Importpfade:
 %3
 
-Für qmake-Projekte benutzen Sie die Variable QML_IMPORT_PATH, um Importpfade hinzuzufügen.
+Für qmake-Projekte verwenden Sie die Variable QML_IMPORT_PATH, um Importpfade hinzuzufügen.
 Für Qbs-Projekte geben Sie eine qmlImportPaths-Eigenschaft in Ihrem Produkt an, um Importpfade hinzuzufügen.
-Für qmlproject-Projekte benutzen Sie die Eigenschaft importPaths, um Importpfade hinzuzufügen.
+Für qmlproject-Projekte verwenden Sie die Eigenschaft importPaths, um Importpfade hinzuzufügen.
 Für CMake-Projekte stellen Sie sicher, dass die Variable QML_IMPORT_PATH in CMakeCache.txt steht.
 </translation>
     </message>
@@ -46388,11 +46765,11 @@ Für CMake-Projekte stellen Sie sicher, dass die Variable QML_IMPORT_PATH in CMa
     </message>
     <message>
         <source>Expected array of strings after colon.</source>
-        <translation>Nach dem Doppelpunkt wird ein Feld von Zeichenketten erwartet.</translation>
+        <translation>Nach dem Doppelpunkt wird ein Array von Zeichenketten erwartet.</translation>
     </message>
     <message>
         <source>Expected array literal with only string literal members.</source>
-        <translation>Es wird ein nur aus Zeichenketten bestehendes Feldliteral erwartet.</translation>
+        <translation>Es wird ein nur aus Zeichenketten bestehendes Arrayliteral erwartet.</translation>
     </message>
     <message>
         <source>Expected string literal to contain &apos;Package/Name major.minor&apos; or &apos;Name major.minor&apos;.</source>
@@ -46400,11 +46777,11 @@ Für CMake-Projekte stellen Sie sicher, dass die Variable QML_IMPORT_PATH in CMa
     </message>
     <message>
         <source>Expected array of numbers after colon.</source>
-        <translation>Nach dem Doppelpunkt wird ein aus Zahlen bestehendes Feld erwartet.</translation>
+        <translation>Nach dem Doppelpunkt wird ein aus Zahlen bestehendes Array erwartet.</translation>
     </message>
     <message>
         <source>Expected array literal with only number literal members.</source>
-        <translation>Es wird ein nur aus Zahlenliteralen bestehendes Feldliteral erwartet.</translation>
+        <translation>Es wird ein nur aus Zahlenliteralen bestehendes Arrayliteral erwartet.</translation>
     </message>
     <message>
         <source>Meta object revision without matching export.</source>
@@ -46602,10 +46979,6 @@ Weitere Informationen finden Sie auf der Dokumentationsseite &quot;Checking Code
         <source>Use %1 instead of &apos;var&apos; or &apos;variant&apos; to improve performance.</source>
         <translation>Zur Steigerung der Ausführungsgeschwindigkeit sollte %1 statt &apos;var&apos; oder &apos;variant&apos; verwendet werden.</translation>
     </message>
-    <message>
-        <source>Imperative code is not supported in Qt Design Studio.</source>
-        <translation>Imperativer Code wird von Qt Design Studio nicht unterstützt.</translation>
-    </message>
     <message>
         <source>This type (%1) is not supported in Qt Design Studio.</source>
         <translation>Dieser Typ (%1) wird von Qt Design Studio nicht unterstützt.</translation>
@@ -46686,6 +47059,10 @@ Weitere Informationen finden Sie auf der Dokumentationsseite &quot;Checking Code
         <source>A State cannot have a child item (%1).</source>
         <translation>Ein State kann kein Kind-Item haben (%1).</translation>
     </message>
+    <message>
+        <source>JavaScript can break the visual tooling in Qt Design Studio.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Duplicate import (%1).</source>
         <translation>Doppelter Import (%1).</translation>
@@ -46716,7 +47093,7 @@ Weitere Informationen finden Sie auf der Dokumentationsseite &quot;Checking Code
     </message>
     <message>
         <source>var &quot;%1&quot; is used before its declaration.</source>
-        <translation>Variable &quot;%1&quot; wird vor Deklaration benutzt.</translation>
+        <translation>Variable &quot;%1&quot; wird vor Deklaration verwendet.</translation>
     </message>
     <message>
         <source>&quot;%1&quot; already is a var.</source>
@@ -46728,7 +47105,7 @@ Weitere Informationen finden Sie auf der Dokumentationsseite &quot;Checking Code
     </message>
     <message>
         <source>Function &quot;%1&quot; is used before its declaration.</source>
-        <translation>Funktion &quot;%1&quot; wird vor ihrer Deklaration benutzt.</translation>
+        <translation>Funktion &quot;%1&quot; wird vor ihrer Deklaration verwendet.</translation>
     </message>
     <message>
         <source>Could not resolve the prototype &quot;%1&quot; of &quot;%2&quot;.</source>
@@ -46756,7 +47133,7 @@ Weitere Informationen finden Sie auf der Dokumentationsseite &quot;Checking Code
     </message>
     <message>
         <source>Array value expected.</source>
-        <translation>Feld erwartet.</translation>
+        <translation>Array erwartet.</translation>
     </message>
     <message>
         <source>%1 value expected.</source>
@@ -46792,7 +47169,7 @@ Weitere Informationen finden Sie auf der Dokumentationsseite &quot;Checking Code
     </message>
     <message>
         <source>%1 elements expected in array value.</source>
-        <translation>Das Feld benötigt %1 Werte.</translation>
+        <translation>Das Array benötigt %1 Werte.</translation>
     </message>
     <message>
         <source>Parsing QML Files</source>
@@ -47041,7 +47418,7 @@ Sie können eine Annotation &quot;// @uri My.Module.Uri&quot; hinzufügen, um de
     </message>
     <message>
         <source>Use custom command instead of built-in formatter</source>
-        <translation>Benutzerdefiniertes Kommando anstatt des integrierten Formatierers benutzen</translation>
+        <translation>Benutzerdefiniertes Kommando anstatt des integrierten Formatierers verwenden</translation>
     </message>
     <message>
         <source>Command:</source>
@@ -47067,13 +47444,33 @@ Sie können eine Annotation &quot;// @uri My.Module.Uri&quot; hinzufügen, um de
         <source>Qt Creator</source>
         <translation>Qt Creator</translation>
     </message>
+    <message>
+        <source>Turn on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow versions below Qt %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use advanced features (renaming, find usages, and so on) (experimental)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use from latest Qt version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create .qmlls.ini files for new projects</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>QML Language Server</source>
         <translation>QML Language Server</translation>
     </message>
     <message>
         <source>Use customized static analyzer</source>
-        <translation>Angepasste statische Analyse benutzen</translation>
+        <translation>Angepasste statische Analyse verwenden</translation>
     </message>
     <message>
         <source>Enabled</source>
@@ -47115,18 +47512,6 @@ Sie können eine Annotation &quot;// @uri My.Module.Uri&quot; hinzufügen, um de
         <source>Restrict to files contained in the current project</source>
         <translation>Auf Dateien des aktuellen Projekts beschränken</translation>
     </message>
-    <message>
-        <source>Enable QML Language Server (EXPERIMENTAL!)</source>
-        <translation>QML Language Server aktivieren (EXPERIMENTELL!)</translation>
-    </message>
-    <message>
-        <source>Use QML Language Server advanced features (renaming, find usages and co.) (EXPERIMENTAL!)</source>
-        <translation>Fortgeschrittene Funktionen vom QML Language Server benutzen (umbenennen, Verweise finden und weiteres) (EXPERIMENTELL!)</translation>
-    </message>
-    <message>
-        <source>Use QML Language Server from latest Qt version</source>
-        <translation>QML Language Server der neuesten Qt-Version benutzen</translation>
-    </message>
     <message>
         <source>Features</source>
         <translation>Zusatzfunktionen</translation>
@@ -47313,7 +47698,7 @@ Sie können eine Annotation &quot;// @uri My.Module.Uri&quot; hinzufügen, um de
         <source>Could not connect to the in-process QML profiler within %1 s.
 Do you want to retry and wait %2 s?</source>
         <translation>Innerhalb von %1 s konnte keine Verbindung zum QML-Profiler im Prozess hergestellt werden.
-Wollen Sie es noch einmal versuchen und %2 s warten?</translation>
+Wollen Sie es erneut versuchen und %2 s warten?</translation>
     </message>
     <message>
         <source>%1 s</source>
@@ -48291,125 +48676,12 @@ Speichern fehlgeschlagen.</translation>
         <source>Remember my choice</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Select Files to Generate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start CMakeFiles.txt generation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced Options</source>
-        <translation type="unfinished">Erweiterte Optionen</translation>
-    </message>
-    <message>
-        <source>File %1 will be created.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File %1 will be overwritten.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File %1 contains invalid characters and will be skipped.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This file already exists and will be overwritten.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This file or folder will be created.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Generate CMake Build Files...</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Export Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The project is not properly structured for automatically generating CMake files.
-
-Aborting process.
-
-The following files or directories are missing:
-
-%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot Generate CMake Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export as Latest Project Format...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creating Project</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creating project failed.
-%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creating project succeeded.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to write to directory
-%1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This process creates a copy of the existing project. The new project&apos;s folder structure is adjusted for CMake build process and necessary related new files are generated.
-
-The new project can be opened in Qt Creator using the main CMakeLists.txt file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished">Name:</translation>
-    </message>
-    <message>
-        <source>Create in:</source>
-        <translation type="unfinished">Erzeugen in:</translation>
-    </message>
-    <message>
-        <source>Name is empty.</source>
-        <translation type="unfinished">Der Name ist leer.</translation>
-    </message>
-    <message>
-        <source>Name must not start with &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name must begin with a capital letter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name must contain only letters, numbers or characters - _.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Target is not a directory.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot write to target directory.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Project directory already exists.</source>
+        <source>Enable Automatic CMake Generation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -48474,11 +48746,11 @@ Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to find valid build system</source>
+        <source>Cannot find a valid build system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to create valid build directory</source>
+        <source>Cannot create a valid build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -48502,7 +48774,7 @@ Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to find valid Qt for MCUs kit</source>
+        <source>Cannot find a valid Qt for MCUs kit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -49299,7 +49571,7 @@ wirklich löschen?</translation>
     </message>
     <message>
         <source>The Qt library to use for all projects using this kit.&lt;br&gt;A Qt version is required for qmake-based projects and optional when using other build systems.</source>
-        <translation>Die für alle Projekte, die dieses Kit verwenden, zu benutzende Qt-Bibliothek.&lt;br&gt;Für qmake-basierende Projekte ist diese Angabe erforderlich, für andere Build-Systeme optional.</translation>
+        <translation>Die zu verwendende Qt-Bibliothek für alle Projekte, die dieses Kit verwenden.&lt;br&gt;Für qmake-basierende Projekte ist diese Angabe erforderlich, für andere Build-Systeme optional.</translation>
     </message>
     <message>
         <source>None</source>
@@ -49578,10 +49850,8 @@ Zusätzlich wird die Verbindung zum Gerät getestet.</translation>
         <translation>Verbinde zu Gerät...</translation>
     </message>
     <message>
-        <source>Connected. Now doing extended checks.
-</source>
-        <translation>Verbunden. Führe erweiterte Überprüfungen aus.
-</translation>
+        <source>Connected. Now doing extended checks.</source>
+        <translation>Verbunden. Führe erweiterte Überprüfungen aus.</translation>
     </message>
     <message>
         <source>Basic connectivity test failed, device is considered unusable.</source>
@@ -49625,7 +49895,7 @@ Zusätzlich wird die Verbindung zum Gerät getestet.</translation>
     </message>
     <message>
         <source>&quot;%1&quot; will be used for deployment, because &quot;%2&quot; and &quot;%3&quot; are not available.</source>
-        <translation>&quot;%1&quot; wird für das Deployment benutzt, da &quot;%2&quot; und &quot;%3&quot; nicht verfügbar sind.</translation>
+        <translation>&quot;%1&quot; wird für das Deployment verwendet, da &quot;%2&quot; und &quot;%3&quot; nicht verfügbar sind.</translation>
     </message>
     <message>
         <source>Checking if required commands are available...</source>
@@ -49769,7 +50039,7 @@ Zusätzlich wird die Verbindung zum Gerät getestet.</translation>
     </message>
     <message>
         <source>The username to log into the device:</source>
-        <translation>Nutzername für Geräte-Login:</translation>
+        <translation>Benutzername für Geräte-Login:</translation>
     </message>
     <message>
         <source>Authentication type:</source>
@@ -49808,9 +50078,19 @@ Zusätzlich wird die Verbindung zum Gerät getestet.</translation>
         <source>Direct</source>
         <translation>Direkt</translation>
     </message>
+    <message>
+        <source>Use SSH port forwarding for debugging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable debugging on remote targes which cannot expose gdbserver ports.
+The ssh tunneling is used to map the remote gdbserver port to localhost.
+The local and remote ports are determined automatically.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>&amp;Username:</source>
-        <translation>&amp;Nutzername:</translation>
+        <translation>&amp;Benutzername:</translation>
     </message>
     <message>
         <source>QML runtime executable:</source>
@@ -49907,6 +50187,10 @@ Der Steuerprozess konnte nicht gestartet werden.</translation>
         <source>Can&apos;t send control signal to the %1 device. The device might have been disconnected.</source>
         <translation>Senden des Steuersignals zum Gerät %1 ist fehlgeschlagen. Das Gerät ist möglicherweise nicht verbunden.</translation>
     </message>
+    <message>
+        <source>Device &quot;%1&quot; is disconnected.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Remote Linux</source>
         <translation>Entferntes Linuxgerät</translation>
@@ -49928,8 +50212,19 @@ Der Steuerprozess konnte nicht gestartet werden.</translation>
         <translation>Das Gerät war bei einem vorherigen Verbindungsversuch nicht erreichbar.&lt;br&gt;Es werden keine weiteren Verbindungsversuche unternommen, bis das Gerät manuell über einen erfolgreichen Verbindungstest in den &lt;a href=&quot;dummy&quot;&gt;Einstellungen&lt;/a&gt; zurückgesetzt wurde.</translation>
     </message>
     <message>
-        <source>Failed: %1</source>
-        <translation>Fehlgeschlagen: %1</translation>
+        <source>Created directory: &quot;%1&quot;.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copied %1/%2: &quot;%3&quot; -&gt; &quot;%4&quot;.
+</source>
+        <extracomment>%1/%2 = progress in the form 4/15, %3 and %4 = source and target file paths</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to deploy files.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device is considered unconnected. Re-run device test to reset state.</source>
@@ -49947,22 +50242,6 @@ Der Steuerprozess konnte nicht gestartet werden.</translation>
         <source>&quot;sftp&quot; binary &quot;%1&quot; does not exist.</source>
         <translation>Ausführbare &quot;sftp&quot;-Datei &quot;%1&quot; existiert nicht.</translation>
     </message>
-    <message>
-        <source>Creating directory: %1
-</source>
-        <translation>Erstelle Verzeichnis: %1
-</translation>
-    </message>
-    <message>
-        <source>Failed.</source>
-        <translation>Fehlgeschlagen.</translation>
-    </message>
-    <message>
-        <source>Copying %1/%2: %3 -&gt; %4
-</source>
-        <translation>Kopiere %1/%2: %3 -&gt; %4
-</translation>
-    </message>
     <message>
         <source>Clean Environment</source>
         <translation>Saubere Umgebung</translation>
@@ -50071,31 +50350,31 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
     </message>
     <message>
         <source>Use sftp if available. Otherwise use default transfer.</source>
-        <translation>Benutze SFTP, sofern verfügbar. Sonst verwende Standardmethode.</translation>
+        <translation>Verwende SFTP, sofern verfügbar. Sonst verwende Standardmethode.</translation>
     </message>
     <message>
         <source>Use default transfer. This might be slow.</source>
-        <translation>Benutze Standardmethode. Dies könnte langsam sein.</translation>
+        <translation>Verwende Standardmethode. Dies könnte langsam sein.</translation>
     </message>
     <message>
-        <source>Unknown error occurred while trying to create remote directories</source>
-        <translation>Beim Erstellen von entfernten Verzeichnissen ist ein unbekannter Fehler aufgetreten</translation>
+        <source>Unknown error occurred while trying to create remote directories.</source>
+        <translation>Beim Erstellen von entfernten Verzeichnissen ist ein unbekannter Fehler aufgetreten.</translation>
     </message>
     <message>
         <source>Transfer method was downgraded from &quot;%1&quot; to &quot;%2&quot;. If this is unexpected, please re-test device &quot;%3&quot;.</source>
         <translation>Die Übertragungsmethode wurde von &quot;%1&quot; auf &quot;%2&quot; zurückgestuft. Falls dies unerwartet auftritt, führen Sie bitte die Gerätetests für &quot;%3&quot; erneut aus.</translation>
     </message>
     <message>
-        <source>rsync failed to start: %1</source>
-        <translation>rsync konnte nicht gestartet werden: %1</translation>
+        <source>%1 failed to start: %2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>rsync crashed.</source>
-        <translation>rsync ist abgestürzt.</translation>
+        <source>%1 crashed.</source>
+        <translation type="unfinished">%1 ist abgestürzt.</translation>
     </message>
     <message>
-        <source>rsync failed with exit code %1.</source>
-        <translation>rsync scheiterte mit dem Rückgabewert %1.</translation>
+        <source>%1 failed with exit code %2.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deploy files</source>
@@ -50107,7 +50386,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
     </message>
     <message>
         <source>Use rsync or sftp if available, but prefer rsync. Otherwise use default transfer.</source>
-        <translation>Benutze rsync oder sftp, sofern verfügbar, bevorzuge aber rsync. Sonst verwende Standardmethode.</translation>
+        <translation>Verwende rsync oder sftp, sofern verfügbar, bevorzuge aber rsync. Sonst verwende Standardmethode.</translation>
     </message>
     <message>
         <source>rsync is only supported for transfers between different devices.</source>
@@ -50471,6 +50750,10 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
         <source>Crop and Trim</source>
         <translation>Zuschneiden und trimmen</translation>
     </message>
+    <message>
+        <source>Cropping</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Crop and Trim...</source>
         <translation>Zuschneiden und trimmen...</translation>
@@ -50636,7 +50919,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
     </message>
     <message>
         <source>Last used colors</source>
-        <translation>Zuletzt benutzte Farben</translation>
+        <translation>Zuletzt verwendete Farben</translation>
     </message>
     <message>
         <source>Create New Color Theme</source>
@@ -50720,7 +51003,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
     </message>
     <message>
         <source>SCXML Generation Failed</source>
-        <translation>SCXML-Erzeugung gescheitert</translation>
+        <translation>SCXML-Erzeugung fehlgeschlagen</translation>
     </message>
     <message>
         <source>Loading document...</source>
@@ -50764,7 +51047,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
     </message>
     <message>
         <source>Export Failed</source>
-        <translation>Export gescheitert</translation>
+        <translation>Export fehlgeschlagen</translation>
     </message>
     <message>
         <source>Could not export to image.</source>
@@ -50776,7 +51059,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
     </message>
     <message>
         <source>Saving Failed</source>
-        <translation>Speichern gescheitert</translation>
+        <translation>Speichern fehlgeschlagen</translation>
     </message>
     <message>
         <source>Could not save the screenshot.</source>
@@ -51413,7 +51696,7 @@ Zeile: %4, Spalte: %5
     </message>
     <message>
         <source>The Symbolic Name &lt;span style=&apos;white-space: nowrap&apos;&gt;&quot;%1&quot;&lt;/span&gt; you want to remove is used in Multi Property Names. Select the action to apply to references in these Multi Property Names.</source>
-        <translation>Der symbolische Name &lt;span style=&apos;white-space: nowrap&apos;&gt;&quot;%1&quot;&lt;/span&gt;, den Sie entfernen wollen, wird in Multi-Property-Namen benutzt. Wählen Sie die Aktion, die Sie auf Referenzen in diesen Multi-Property-Namen anwenden wollen.</translation>
+        <translation>Der symbolische Name &lt;span style=&apos;white-space: nowrap&apos;&gt;&quot;%1&quot;&lt;/span&gt;, den Sie entfernen wollen, wird in Multi-Property-Namen verwendet. Wählen Sie die Aktion, die Sie auf Referenzen in diesen Multi-Property-Namen anwenden wollen.</translation>
     </message>
     <message>
         <source>Failed to write &quot;%1&quot;</source>
@@ -51477,7 +51760,7 @@ Zeile: %4, Spalte: %5
     </message>
     <message>
         <source>The properties of the Multi Property Name associated with the selected Symbolic Name. (use \\ for a literal \ in the value)</source>
-        <translation>Die Eigenschaften des Multi-Property-Namens, der mit dem ausgewählten symbolischen Namen assoziiert ist. (Benutzen Sie \\ für ein \-Literal im Wert)</translation>
+        <translation>Die Eigenschaften des Multi-Property-Namens, der mit dem ausgewählten symbolischen Namen assoziiert ist. (Verwenden Sie \\ für ein \-Literal im Wert)</translation>
     </message>
     <message>
         <source>The Hierarchical Name associated with the selected Symbolic Name.</source>
@@ -52142,7 +52425,7 @@ Warten Sie, bis er beendet ist, und versuchen Sie es dann erneut.</translation>
     </message>
     <message>
         <source>Invalid Squish settings. Configure Squish installation path inside Preferences... &gt; Squish &gt; General to use this wizard.</source>
-        <translation>Ungültige Squish-Einstellungen. Stellen Sie in Einstellungen... &gt; Squish &gt; Allgemein den Squish-Installationspfad ein, um diesen Assistenten zu benutzen.</translation>
+        <translation>Ungültige Squish-Einstellungen. Stellen Sie in Einstellungen... &gt; Squish &gt; Allgemein den Squish-Installationspfad ein, um diesen Assistenten zu verwenden.</translation>
     </message>
     <message>
         <source>Available languages:</source>
@@ -52496,7 +52779,7 @@ Die Datei &quot;%1&quot; konnte nicht geöffnet werden.</translation>
     </message>
     <message>
         <source>The color used for %1.</source>
-        <translation>Die für &quot;%1&quot; benutzte Farbe.</translation>
+        <translation>Die für &quot;%1&quot; verwendete Farbe.</translation>
     </message>
     <message>
         <source>Failed to open file.</source>
@@ -52520,11 +52803,11 @@ Die Datei &quot;%1&quot; konnte nicht geöffnet werden.</translation>
     </message>
     <message>
         <source>Use internal terminal</source>
-        <translation>Integriertes Terminal benutzen</translation>
+        <translation>Integriertes Terminal verwenden</translation>
     </message>
     <message>
         <source>Uses the internal terminal when &quot;Run In Terminal&quot; is enabled and for &quot;Open Terminal here&quot;.</source>
-        <translation>Benutzt das integrierte Terminal, wenn &quot;Im Terminal ausführen&quot; aktiviert ist und für &quot;Terminalfenster hier öffnen&quot;.</translation>
+        <translation>Verwendet das integrierte Terminal, wenn &quot;Im Terminal ausführen&quot; aktiviert ist und für &quot;Terminalfenster hier öffnen&quot;.</translation>
     </message>
     <message>
         <source>Family:</source>
@@ -52532,7 +52815,7 @@ Die Datei &quot;%1&quot; konnte nicht geöffnet werden.</translation>
     </message>
     <message>
         <source>The font family used in the terminal.</source>
-        <translation>Der Name der Zeichensatz-Familie, die im Terminal benutzt wird.</translation>
+        <translation>Der Name der Zeichensatz-Familie, die im Terminal verwendet wird.</translation>
     </message>
     <message>
         <source>Size:</source>
@@ -52540,15 +52823,15 @@ Die Datei &quot;%1&quot; konnte nicht geöffnet werden.</translation>
     </message>
     <message>
         <source>The font size used in the terminal (in points).</source>
-        <translation>Die Größe des Zeichensatzes, der im Terminal benutzt wird (in Punkten).</translation>
+        <translation>Die Größe des Zeichensatzes, der im Terminal verwendet wird (in Punkten).</translation>
     </message>
     <message>
         <source>Allow blinking cursor</source>
-        <translation>Blinkenden Cursor erlauben</translation>
+        <translation>Blinkende Einfügemarke erlauben</translation>
     </message>
     <message>
         <source>Allow the cursor to blink.</source>
-        <translation>Erlaubt dem Cursor zu blinken.</translation>
+        <translation>Erlaubt der Einfügemarke zu blinken.</translation>
     </message>
     <message>
         <source>Shell path:</source>
@@ -52659,12 +52942,12 @@ Die Datei &quot;%1&quot; konnte nicht geöffnet werden.</translation>
         <translation>&quot;%1&quot; ist nicht ausführbar.</translation>
     </message>
     <message>
-        <source>Terminal process exited with code %1</source>
-        <translation>Der Terminalprozess wurde mit dem Rückgabewert %1 beendet</translation>
+        <source>Terminal process exited with code %1.</source>
+        <translation>Der Terminalprozess wurde mit dem Rückgabewert %1 beendet.</translation>
     </message>
     <message>
-        <source>Process exited with code: %1</source>
-        <translation>Prozess wurde mit dem Rückgabewert %1 beendet</translation>
+        <source>Process exited with code: %1.</source>
+        <translation>Prozess wurde mit dem Rückgabewert %1 beendet.</translation>
     </message>
     <message>
         <source>Copy</source>
@@ -52688,11 +52971,11 @@ Die Datei &quot;%1&quot; konnte nicht geöffnet werden.</translation>
     </message>
     <message>
         <source>Move Cursor Word Left</source>
-        <translation>Cursor ein Wort nach links bewegen</translation>
+        <translation>Einfügemarke ein Wort nach links bewegen</translation>
     </message>
     <message>
         <source>Move Cursor Word Right</source>
-        <translation>Cursor ein Wort nach rechts bewegen</translation>
+        <translation>Einfügemarke ein Wort nach rechts bewegen</translation>
     </message>
     <message>
         <source>Close Terminal</source>
@@ -53170,11 +53453,11 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun
     </message>
     <message>
         <source>Line number of the text cursor position in current document (starts with 1).</source>
-        <translation>Zeilennummer der Cursorposition des aktuellen Dokuments (beginnend bei 1).</translation>
+        <translation>Zeilennummer der Einfügemarke des aktuellen Dokuments (beginnend bei 1).</translation>
     </message>
     <message>
         <source>Column number of the text cursor position in current document (starts with 0).</source>
-        <translation>Spaltennummer der Cursorposition des aktuellen Dokuments (beginnend bei 0).</translation>
+        <translation>Spaltennummer der Einfügemarke des aktuellen Dokuments (beginnend bei 0).</translation>
     </message>
     <message>
         <source>Number of lines visible in current document.</source>
@@ -53247,7 +53530,7 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun
     </message>
     <message>
         <source>Cannot create user snippet directory %1</source>
-        <translation>Das Snippet-Verzeichnis des Nutzers konnte nicht erstellt werden: %1</translation>
+        <translation>Das Snippet-Verzeichnis des Benutzers konnte nicht erstellt werden: %1</translation>
     </message>
     <message>
         <source>Remove</source>
@@ -53648,7 +53931,7 @@ Gibt an, wie sich die Rücktaste bezüglich Einrückung verhält.
     </message>
     <message>
         <source>Center &amp;cursor on scroll</source>
-        <translation>Cursor beim Scrollen in der &amp;Mitte halten</translation>
+        <translation>Einfügemarke beim Scrollen in der &amp;Mitte halten</translation>
     </message>
     <message>
         <source>Enable text &amp;wrapping</source>
@@ -53692,7 +53975,7 @@ Gibt an, wie sich die Rücktaste bezüglich Einrückung verhält.
     </message>
     <message>
         <source>If available, use a different margin. For example, the ColumnLimit from the ClangFormat plugin.</source>
-        <translation>Benutzt einen anderen Rand, falls verfügbar. Zum Beispiel das ColumnLimit vom ClangFormat Plugin.</translation>
+        <translation>Verwendet einen anderen Rand, falls verfügbar. Zum Beispiel das ColumnLimit vom ClangFormat Plugin.</translation>
     </message>
     <message>
         <source>Animate navigation within file</source>
@@ -53727,7 +54010,7 @@ Gibt an, wie sich die Rücktaste bezüglich Einrückung verhält.
         <translation>Rechtsbündig</translation>
     </message>
     <message>
-        <source>Line annotations</source>
+        <source>Line Annotations</source>
         <translation>Zeilenannotationen</translation>
     </message>
     <message>
@@ -53894,7 +54177,7 @@ Bestimmt das Verhalten bezüglich der Einrückung von Fortsetzungszeilen.
 &lt;/pre&gt;
 &lt;/li&gt;
 
-&lt;li&gt;Normale Einrückung: Benutze Tabulatoren oder Leerzeichen entsprechend obiger Konfiguration.
+&lt;li&gt;Normale Einrückung: Verwende Tabulatoren oder Leerzeichen entsprechend obiger Konfiguration.
 &lt;pre&gt;
 (tab)int i = foo(a, b
 (tab)(tab)(tab)  c, d);
@@ -53912,7 +54195,7 @@ Bestimmt das Verhalten bezüglich der Einrückung von Fortsetzungszeilen.
     </message>
     <message>
         <source>With Regular Indent</source>
-        <translation>Benutze normale Einrückung</translation>
+        <translation>Verwende normale Einrückung</translation>
     </message>
     <message>
         <source>The text editor indentation setting is used for non-code files only. See the C++ and Qt Quick coding style settings to configure indentation for code files.</source>
@@ -54052,14 +54335,6 @@ Bestimmt das Verhalten bezüglich der Einrückung von Fortsetzungszeilen.
         <source>Line: %1, Col: %2</source>
         <translation>Zeile: %1, Spalte: %2</translation>
     </message>
-    <message>
-        <source>&amp;Undo</source>
-        <translation>&amp;Rückgängig</translation>
-    </message>
-    <message>
-        <source>&amp;Redo</source>
-        <translation>&amp;Wiederholen</translation>
-    </message>
     <message>
         <source>Delete &amp;Line</source>
         <translation>&amp;Zeile löschen</translation>
@@ -54240,6 +54515,18 @@ Bestimmt das Verhalten bezüglich der Einrückung von Fortsetzungszeilen.
         <source>Open Call Hierarchy</source>
         <translation>Aufrufhierarchie öffnen</translation>
     </message>
+    <message>
+        <source>Open Type Hierarchy</source>
+        <translation type="unfinished">Klassenhierarchie öffnen</translation>
+    </message>
+    <message>
+        <source>Meta+Shift+T</source>
+        <translation type="unfinished">Meta+Shift+T</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+T</source>
+        <translation type="unfinished">Ctrl+Shift+T</translation>
+    </message>
     <message>
         <source>Move the View a Page Up and Keep the Cursor Position</source>
         <translation>Ansicht eine Bildschirmseite nach oben bewegen, ohne die Einfügemarke zu verändern</translation>
@@ -54425,8 +54712,24 @@ Bestimmt das Verhalten bezüglich der Einrückung von Fortsetzungszeilen.
         <translation>Alt+U</translation>
     </message>
     <message>
-        <source>&amp;Sort Lines</source>
-        <translation>Zeilen &amp;sortieren</translation>
+        <source>Sort Lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go to Previous Word (Camel Case)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go to Next Word (Camel Case)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go to Previous Word (Camel Case) with Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go to Next Word (Camel Case) with Selection</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meta+Shift+S</source>
@@ -54476,10 +54779,6 @@ Bestimmt das Verhalten bezüglich der Einrückung von Fortsetzungszeilen.
         <source>Reset Font Size</source>
         <translation>Schriftgröße zurücksetzen</translation>
     </message>
-    <message>
-        <source>Meta+0</source>
-        <translation>Meta+0</translation>
-    </message>
     <message>
         <source>Ctrl+0</source>
         <translation>Ctrl+0</translation>
@@ -54560,14 +54859,6 @@ Bestimmt das Verhalten bezüglich der Einrückung von Fortsetzungszeilen.
         <source>Go to Next Word</source>
         <translation>Zum nächsten Wort springen</translation>
     </message>
-    <message>
-        <source>Go to Previous Word Camel Case</source>
-        <translation>Zum vorhergehenden Wort springen (Camel Case)</translation>
-    </message>
-    <message>
-        <source>Go to Next Word Camel Case</source>
-        <translation>Zum nächsten Wort springen (Camel Case)</translation>
-    </message>
     <message>
         <source>Go to Line Start with Selection</source>
         <translation>Bis Zeilenanfang markieren</translation>
@@ -54600,14 +54891,6 @@ Bestimmt das Verhalten bezüglich der Einrückung von Fortsetzungszeilen.
         <source>Go to Next Word with Selection</source>
         <translation>Nächstes Wort markieren</translation>
     </message>
-    <message>
-        <source>Go to Previous Word Camel Case with Selection</source>
-        <translation>Vorhergehendes Wort markieren (Camel Case)</translation>
-    </message>
-    <message>
-        <source>Go to Next Word Camel Case with Selection</source>
-        <translation>Nächstes Wort markieren (Camel Case)</translation>
-    </message>
     <message>
         <source>Activate completion:</source>
         <translation>Code-Vervollständigung aktivieren:</translation>
@@ -54661,7 +54944,7 @@ Drücken Sie zusätzlich die Umschalttaste, wird ein Escape-Zeichen an der aktue
         <translation>Zeichenketten automatisch teilen</translation>
     </message>
     <message>
-        <source>&amp;Automatically insert matching characters</source>
+        <source>&amp;Automatically Insert Matching Characters</source>
         <translation>&amp;Passende Zeichen automatisch einfügen</translation>
     </message>
     <message>
@@ -54743,10 +55026,10 @@ Drücken Sie zusätzlich die Umschalttaste, wird ein Escape-Zeichen an der aktue
     <message>
         <source>Doxygen allows &quot;@&quot; and &quot;\&quot; to start commands.
 By default, &quot;@&quot; is used if the surrounding comment starts with &quot;/**&quot; or &quot;///&quot;, and &quot;\&quot; is used
-if the comment starts with &quot;/*!&quot; or &quot;//!</source>
+if the comment starts with &quot;/*!&quot; or &quot;//!&quot;.</source>
         <translation>Doxygen erlaubt es, Befehle mit &quot;@&quot; und &quot;\&quot; zu beginnen.
 Die Vorgabe ist, mit &quot;@&quot; zu beginnen, wenn der umgebende Kommentar mit &quot;/**&quot; oder &quot;///&quot; anfängt,
-und &quot;\&quot; zu benutzen, wenn der Kommentar mit &quot;/*!&quot; oder &quot;//!&quot;.</translation>
+und &quot;\&quot; zu verwenden, wenn der Kommentar mit &quot;/*!&quot; oder &quot;//!&quot;.</translation>
     </message>
     <message>
         <source>Generate brief description</source>
@@ -54822,7 +55105,7 @@ Wird auf Zeichen angewendet, sofern keine andere Regel zutrifft.</translation>
         <source>Highlighted search results inside the editor.
 Used to mark read accesses to C++ symbols.</source>
         <translation>Hervorgehobene Suchergebnisse im Editor.
-Wird benutzt, um Lesezugriffe eines C++-Symbols zu markieren.</translation>
+Wird verwendet, um Lesezugriffe eines C++-Symbols zu markieren.</translation>
     </message>
     <message>
         <source>Search Result (Alternative 2)</source>
@@ -54832,7 +55115,7 @@ Wird benutzt, um Lesezugriffe eines C++-Symbols zu markieren.</translation>
         <source>Highlighted search results inside the editor.
 Used to mark write accesses to C++ symbols.</source>
         <translation>Hervorgehobene Suchergebnisse im Editor.
-Wird benutzt, um Schreibzugriffe eines C++-Symbols zu markieren.</translation>
+Wird verwendet, um Schreibzugriffe eines C++-Symbols zu markieren.</translation>
     </message>
     <message>
         <source>Search Result Containing function</source>
@@ -54842,7 +55125,7 @@ Wird benutzt, um Schreibzugriffe eines C++-Symbols zu markieren.</translation>
         <source>Highlighted search results inside the editor.
 Used to mark containing function of the symbol usage.</source>
         <translation>Hervorgehobene Suchergebnisse im Editor.
-Wird benutzt um die Funktion zu markieren, die ein gesuchtes Symbol benutzt.</translation>
+Wird verwendet um die Funktion zu markieren, die ein gesuchtes Symbol verwendet.</translation>
     </message>
     <message>
         <source>Search Scope</source>
@@ -54900,7 +55183,7 @@ Wird benutzt um die Funktion zu markieren, die ein gesuchtes Symbol benutzt.</tr
         <source>Occurrences of the symbol under the cursor.
 (Only the background will be applied.)</source>
         <translation>Vorkommen des unter der Einfügemarke befindlichen Symbols.
-(Nur der Hintergrund wird benutzt.)</translation>
+(Nur der Hintergrund wird verwendet.)</translation>
     </message>
     <message>
         <source>Unused Occurrence</source>
@@ -55142,7 +55425,7 @@ Wird benutzt um die Funktion zu markieren, die ein gesuchtes Symbol benutzt.</tr
         <source>Non user-defined language operators.
 To style user-defined operators, use Overloaded Operator.</source>
         <translation>Nicht benutzerdefinierte Sprachoperatoren.
-Um den Stil von benutzerdefinierten Operatoren festzulegen, benutzen Sie &quot;Überladene Operatoren&quot;.</translation>
+Um den Stil von benutzerdefinierten Operatoren festzulegen, verwenden Sie &quot;Überladene Operatoren&quot;.</translation>
     </message>
     <message>
         <source>Preprocessor</source>
@@ -55684,6 +55967,18 @@ Außer Leerzeichen innerhalb von Kommentaren und Zeichenketten.</translation>
         <source>JSON Editor</source>
         <translation>JSON-Editor</translation>
     </message>
+    <message>
+        <source>Type Hierarchy</source>
+        <translation type="unfinished">Klassenhierarchie</translation>
+    </message>
+    <message>
+        <source>No type hierarchy available</source>
+        <translation type="unfinished">Keine Klassenhierarchie verfügbar</translation>
+    </message>
+    <message>
+        <source>Reloads the type hierarchy for the symbol under the cursor.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QtC::Todo</name>
@@ -55700,7 +55995,7 @@ Außer Leerzeichen innerhalb von Kommentaren und Zeichenketten.</translation>
         <translation>Zurücksetzen</translation>
     </message>
     <message>
-        <source>Scanning scope</source>
+        <source>Scanning Scope</source>
         <translation>Suchbereich</translation>
     </message>
     <message>
@@ -56033,11 +56328,11 @@ Die Trace-Daten sind verloren.</translation>
     <name>QtC::Utils</name>
     <message>
         <source>Do not &amp;ask again</source>
-        <translation>Nicht noch einmal nach&amp;fragen</translation>
+        <translation>Nicht erneut nach&amp;fragen</translation>
     </message>
     <message>
         <source>Do not &amp;show again</source>
-        <translation>Nicht noch einmal an&amp;zeigen</translation>
+        <translation>Nicht erneut an&amp;zeigen</translation>
     </message>
     <message>
         <source>The class name must not contain namespace delimiters.</source>
@@ -56438,6 +56733,10 @@ Die Trace-Daten sind verloren.</translation>
         <source>createTempFile is not implemented for &quot;%1&quot;.</source>
         <translation>createTempFile ist für &quot;%1&quot; nicht implementiert.</translation>
     </message>
+    <message>
+        <source>watch is not implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Refusing to remove the standard directory &quot;%1&quot;.</source>
         <translation>Das Standardverzeichnis &quot;%1&quot; kann nicht entfernt werden.</translation>
@@ -56448,7 +56747,7 @@ Die Trace-Daten sind verloren.</translation>
     </message>
     <message>
         <source>Refusing to remove your home directory.</source>
-        <translation>Das Nutzerverzeichnis (Home) kann nicht entfernt werden.</translation>
+        <translation>Das Benutzerverzeichnis (Home) kann nicht entfernt werden.</translation>
     </message>
     <message>
         <source>Failed to remove directory &quot;%1&quot;.</source>
@@ -56724,7 +57023,7 @@ Die Trace-Daten sind verloren.</translation>
     </message>
     <message>
         <source>&lt;p&gt;No valid settings file could be found.&lt;/p&gt;&lt;p&gt;All settings files found in directory &quot;%1&quot; were unsuitable for the current version of %2, for instance because they were written by an incompatible version of %2, or because a different settings path was used.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Es konnte keine gültige Einstellungsdatei gefunden werden.&lt;/p&gt;&lt;p&gt;Alle im Verzeichnis &quot;%1&quot; gefundenen Einstellungsdateien sind für die aktuelle Version von %2 ungeeignet, zum Beispiel weil sie von einer inkompatiblen Version von %2 geschrieben wurden oder weil ein anderes Einstellungsverzeichnis benutzt wurde.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Es konnte keine gültige Einstellungsdatei gefunden werden.&lt;/p&gt;&lt;p&gt;Alle im Verzeichnis &quot;%1&quot; gefundenen Einstellungsdateien sind für die aktuelle Version von %2 ungeeignet, zum Beispiel weil sie von einer inkompatiblen Version von %2 geschrieben wurden oder weil ein anderes Einstellungsverzeichnis verwendet wurde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;No valid settings file could be found.&lt;/p&gt;&lt;p&gt;All settings files found in directory &quot;%1&quot; were either too new or too old to be read.&lt;/p&gt;</source>
@@ -56790,22 +57089,6 @@ Die Trace-Daten sind verloren.</translation>
         <source>Edit Environment</source>
         <translation>Umgebung bearbeiten</translation>
     </message>
-    <message>
-        <source>Enter one environment variable per line.
-To set or change a variable, use VARIABLE=VALUE.
-To append to a variable, use VARIABLE+=VALUE.
-To prepend to a variable, use VARIABLE=+VALUE.
-Existing variables can be referenced in a VALUE with ${OTHER}.
-To clear a variable, put its name on a line with nothing else on it.
-To disable a variable, prefix the line with &quot;#&quot;.</source>
-        <translation>Geben Sie eine Umgebungsvariable pro Zeile ein.
-Um eine Variable zu setzen oder zu ändern, benutzen Sie VARIABLE=WERT.
-Um einen Wert an eine Variable anzufügen, benutzen Sie VARIABLE+=WERT.
-Um einen Wert einer Variable voranzustellen, benutzen Sie VARIABLE=+WERT.
-Existierende Variablen können in einem WERT mit ${ANDERE} verwendet werden.
-Um eine Variable zu leeren, schreiben Sie nichts als ihren Namen in eine Zeile.
-Um eine Variable zu deaktivieren, stellen Sie der Zeile &quot;#&quot; voran.</translation>
-    </message>
     <message>
         <source>Remove File</source>
         <translation>Datei entfernen</translation>
@@ -56899,7 +57182,7 @@ Um eine Variable zu deaktivieren, stellen Sie der Zeile &quot;#&quot; voran.</tr
     </message>
     <message>
         <source>Do Not Show Again</source>
-        <translation>Nicht noch einmal anzeigen</translation>
+        <translation>Nicht erneut anzeigen</translation>
     </message>
     <message>
         <source>Close</source>
@@ -56921,6 +57204,14 @@ Um eine Variable zu deaktivieren, stellen Sie der Zeile &quot;#&quot; voran.</tr
         <source>No destination directory set.</source>
         <translation>Kein Zielverzeichnis gesetzt.</translation>
     </message>
+    <message>
+        <source>Failed to open output file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write output file.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Command failed.</source>
         <translation>Das Kommando schlug fehl.</translation>
@@ -56949,8 +57240,8 @@ in &quot;%2&quot; aus.
         <translation>Deaktivieren</translation>
     </message>
     <message>
-        <source>Leave at Default</source>
-        <translation>Vorgabe beibehalten</translation>
+        <source>Default</source>
+        <translation type="unfinished">Vorgabe</translation>
     </message>
     <message>
         <source>Show %1 Column</source>
@@ -57018,6 +57309,17 @@ in &quot;%2&quot; aus.
         <source>Minimize</source>
         <translation>Minimieren</translation>
     </message>
+    <message>
+        <source>Enter one environment variable per line.
+To set or change a variable, use VARIABLE=VALUE.
+To disable a variable, prefix this line with &quot;#&quot;.
+To append to a variable, use VARIABLE+=VALUE.
+To prepend to a variable, use VARIABLE=+VALUE.
+Existing variables can be referenced in a VALUE with ${OTHER}.
+To clear a variable, put its name on a line with nothing else on it.
+Lines starting with &quot;##&quot; will be treated as comments.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
@@ -57122,7 +57424,7 @@ in &quot;%2&quot; aus.
     </message>
     <message>
         <source>User:</source>
-        <translation>Nutzer:</translation>
+        <translation>Benutzer:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -57132,6 +57434,10 @@ in &quot;%2&quot; aus.
         <source>Could not find any shell.</source>
         <translation>Es konnte keine Shell gefunden werden.</translation>
     </message>
+    <message>
+        <source>No Lua interface set</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QtC::Valgrind</name>
@@ -57285,7 +57591,7 @@ in &quot;%2&quot; aus.
     </message>
     <message>
         <source>Backtrace frame count:</source>
-        <translation>Stack-Frames:</translation>
+        <translation>Stackframes:</translation>
     </message>
     <message>
         <source>Suppression files:</source>
@@ -57573,7 +57879,7 @@ Mit Cache-Simulation werden weitere Ereigniszähler aktiviert:
     </message>
     <message>
         <source>Use of Uninitialized Memory</source>
-        <translation>Benutzung von nicht initialisiertem Speicher</translation>
+        <translation>Verwendung von nicht initialisiertem Speicher</translation>
     </message>
     <message>
         <source>Show issues originating outside currently opened projects.</source>
@@ -57617,7 +57923,7 @@ Mit Cache-Simulation werden weitere Ereigniszähler aktiviert:
     </message>
     <message>
         <source>Valgrind Analyze Memory uses the Memcheck tool to find memory leaks.</source>
-        <translation>Die Speicheranalyse von Valgrind benutzt das Programm &quot;memcheck&quot;, um Speicherlecks zu finden.</translation>
+        <translation>Die Speicheranalyse von Valgrind verwendet das Programm &quot;memcheck&quot;, um Speicherlecks zu finden.</translation>
     </message>
     <message>
         <source>Valgrind Memory Analyzer</source>
@@ -57630,7 +57936,7 @@ Mit Cache-Simulation werden weitere Ereigniszähler aktiviert:
     <message>
         <source>Valgrind Analyze Memory with GDB uses the Memcheck tool to find memory leaks.
 When a problem is detected, the application is interrupted and can be debugged.</source>
-        <translation>Die Speicheranalyse mit Valgrind und GDB benutzt das Programm &quot;memcheck&quot;, um Speicherlecks zu finden.
+        <translation>Die Speicheranalyse mit Valgrind und GDB verwendet das Programm &quot;memcheck&quot;, um Speicherlecks zu finden.
 Wird ein Problem gefunden, dann wird die Anwendung angehalten und kann untersucht werden.</translation>
     </message>
     <message>
@@ -57842,7 +58148,7 @@ Wird ein Problem gefunden, dann wird die Anwendung angehalten und kann untersuch
     </message>
     <message>
         <source>Go back one step in history. This will select the previously selected item.</source>
-        <translation>Gehe einen Schritt im Verlauf zurück. Das vorher ausgewählte Element wird wieder ausgewählt.</translation>
+        <translation>Gehe einen Schritt im Verlauf zurück. Das vorher ausgewählte Element wird erneut ausgewählt.</translation>
     </message>
     <message>
         <source>Go forward one step in history.</source>
@@ -58643,10 +58949,6 @@ Check settings or ensure Valgrind is installed and available in PATH.</source>
         <source>Open &quot;%1&quot;</source>
         <translation>&quot;%1&quot; öffnen</translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Löschen</translation>
-    </message>
     <message>
         <source>Running: %1</source>
         <translation>Führe aus: %1</translation>
@@ -58807,17 +59109,17 @@ Check settings or ensure Valgrind is installed and available in PATH.</source>
     </message>
     <message>
         <source>User/&amp;alias configuration file:</source>
-        <translation>Nutzer/&amp;Alias-Konfigurationsdatei:</translation>
+        <translation>Benutzer/&amp;Alias-Konfigurationsdatei:</translation>
     </message>
     <message>
         <source>A file listing nicknames in a 4-column mailmap format:
 &apos;name &lt;email&gt; alias &lt;email&gt;&apos;.</source>
-        <translation>Eine Datei, die Nutzernamen in einem vierspaltigen Format (mailmap) enthält:
+        <translation>Eine Datei, die Benutzernamen in einem vierspaltigen Format (mailmap) enthält:
 &apos;Name &lt;E-Mail&gt; Alias &lt;E-Mail&gt;&apos;.</translation>
     </message>
     <message>
         <source>User &amp;fields configuration file:</source>
-        <translation>Nutzer&amp;feld-Konfigurationsdatei:</translation>
+        <translation>Benutzer&amp;feld-Konfigurationsdatei:</translation>
     </message>
     <message>
         <source>A simple file containing lines with field names like &quot;Reviewed-By:&quot; which will be added below the submit editor.</source>
@@ -58933,7 +59235,7 @@ should a repository require SSH-authentication (see documentation on SSH and the
     <message>
         <source>The activated version %1 is not supported by %2. Activate version %3 or higher.</source>
         <translatorcomment>%1=sdkVersion, %2=QtC-Version, %3=minVersion</translatorcomment>
-        <translation>Die aktivierte Version %1 wird von %2 nicht unterstützt. Benutzen Sie Version %3 oder höher.</translation>
+        <translation>Die aktivierte Version %1 wird von %2 nicht unterstützt. Verwenden Sie Version %3 oder höher.</translation>
     </message>
     <message>
         <source>Activated version: %1</source>
@@ -59034,7 +59336,7 @@ should a repository require SSH-authentication (see documentation on SSH and the
     </message>
     <message>
         <source>Would you like to take a quick UI tour? This tour highlights important user interface elements and shows how they are used. To take the tour later, select Help &gt; UI Tour.</source>
-        <translation>Wollen Sie sich kurz die Oberfläche vorführen lassen? Dabei wird gezeigt, wo die wichtigsten Bedienelemente sind und wie man sie benutzt. Sie können die Vorführung auch später über &quot;Hilfe&quot; &gt; &quot;Oberfläche vorführen&quot; starten.</translation>
+        <translation>Wollen Sie sich kurz die Oberfläche vorführen lassen? Dabei wird gezeigt, wo die wichtigsten Bedienelemente sind und wie man sie verwendet. Sie können die Vorführung auch später über &quot;Hilfe&quot; &gt; &quot;Oberfläche vorführen&quot; starten.</translation>
     </message>
     <message>
         <source>Take UI Tour</source>
@@ -59050,7 +59352,7 @@ should a repository require SSH-authentication (see documentation on SSH and the
     </message>
     <message>
         <source>&lt;p style=&quot;margin-top: 30px&quot;&gt;&lt;table&gt;&lt;tr&gt;&lt;td style=&quot;padding-right: 20px&quot;&gt;Welcome:&lt;/td&gt;&lt;td&gt;Open examples, tutorials, and recent sessions and projects.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Edit:&lt;/td&gt;&lt;td&gt;Work with code and navigate your project.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Design:&lt;/td&gt;&lt;td&gt;Visually edit Widget-based user interfaces, state charts and UML models.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Debug:&lt;/td&gt;&lt;td&gt;Analyze your application with a debugger or other analyzers.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Projects:&lt;/td&gt;&lt;td&gt;Manage project settings.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Help:&lt;/td&gt;&lt;td&gt;Browse the help database.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;</source>
-        <translation>&lt;p style=&quot;margin-top: 30px&quot;&gt;&lt;table&gt;&lt;tr&gt;&lt;td style=&quot;padding-right: 20px&quot;&gt;Willkommen:&lt;/td&gt;&lt;td&gt;Öffnen Sie Beispiele, Anleitungen, sowie kürzlich verwendete Sitzungen und Projekte.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Editieren:&lt;/td&gt;&lt;td&gt;Arbeiten Sie am Quelltext und navigieren Sie im Projekt.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Design:&lt;/td&gt;&lt;td&gt;Bearbeiten Sie Oberflächendesigns für Qt Widgets, State Charts und UML-Modelle.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Debug:&lt;/td&gt;&lt;td&gt;Analysieren Sie Ihre Anwendung mit einem Debugger oder anderen Werkzeugen.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Projekte:&lt;/td&gt;&lt;td&gt;Verwalten Sie Projekteinstellungen.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Hilfe:&lt;/td&gt;&lt;td&gt;Durchsuchen Sie die Hilfedatenbank.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;</translation>
+        <translation>&lt;p style=&quot;margin-top: 30px&quot;&gt;&lt;table&gt;&lt;tr&gt;&lt;td style=&quot;padding-right: 20px&quot;&gt;Willkommen:&lt;/td&gt;&lt;td&gt;Öffnen Sie Beispiele, Anleitungen, sowie kürzlich verwendete Sitzungen und Projekte.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Bearbeiten:&lt;/td&gt;&lt;td&gt;Arbeiten Sie am Quelltext und navigieren Sie im Projekt.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Design:&lt;/td&gt;&lt;td&gt;Bearbeiten Sie Oberflächendesigns für Qt Widgets, State Charts und UML-Modelle.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Debug:&lt;/td&gt;&lt;td&gt;Analysieren Sie Ihre Anwendung mit einem Debugger oder anderen Werkzeugen.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Projekte:&lt;/td&gt;&lt;td&gt;Verwalten Sie Projekteinstellungen.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Hilfe:&lt;/td&gt;&lt;td&gt;Durchsuchen Sie die Hilfedatenbank.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Kit Selector</source>
@@ -59227,6 +59529,34 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Association</source>
         <translation>Assoziation</translation>
     </message>
+    <message>
+        <source>Reset</source>
+        <translation>Zurücksetzen</translation>
+    </message>
+    <message>
+        <source>Relations</source>
+        <translation>Beziehungen</translation>
+    </message>
+    <message>
+        <source>Diagram Elements</source>
+        <translation>Diagrammelemente</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Löschen</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Ansicht</translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation>Filter</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation>Typ:</translation>
+    </message>
     <message>
         <source>Stereotypes:</source>
         <translation>Stereotypen:</translation>
@@ -59495,6 +59825,14 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Shape:</source>
         <translation>Form:</translation>
     </message>
+    <message>
+        <source>Warning</source>
+        <translation>Warnung</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Fehler</translation>
+    </message>
     <message>
         <source>Intermediate points:</source>
         <translation>Dazwischen liegende Punkte:</translation>
@@ -59623,6 +59961,10 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Center Horizontally</source>
         <translation>Horizontal zentrieren</translation>
     </message>
+    <message>
+        <source>Open Linked File</source>
+        <translation>Verlinkte Datei öffnen</translation>
+    </message>
     <message>
         <source>Align Bottom</source>
         <translation>Unten ausrichten</translation>
@@ -59659,10 +60001,6 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Equal Vertical Space</source>
         <translation>Gleicher vertikaler Zwischenraum</translation>
     </message>
-    <message>
-        <source>Add Related Elements</source>
-        <translation>Zugehörige Elemente hinzufügen</translation>
-    </message>
     <message>
         <source>Unacceptable null object.</source>
         <translation>Unzulässiges Null-Objekt.</translation>
@@ -59691,6 +60029,30 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>Unable to handle file version %1.</source>
         <translation>Dateiversion %1 ist nicht nutzbar.</translation>
     </message>
+    <message>
+        <source>Relation Attributes</source>
+        <translation>Beziehungsattribute</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <translation>Richtung</translation>
+    </message>
+    <message>
+        <source>Stereotypes</source>
+        <translation>Stereotype</translation>
+    </message>
+    <message>
+        <source>Other Element Attributes</source>
+        <translation>Andere Elementattribute</translation>
+    </message>
+    <message>
+        <source>Number of matching elements: </source>
+        <translation>Anzahl der übereinstimmenden Elemente: </translation>
+    </message>
 </context>
 <context>
     <name>RadioButtonSpecifics</name>
@@ -59959,10 +60321,26 @@ defined in step size.</source>
         <source>Row spacing</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sets the space between the items in pixels in the &lt;b&gt;Row Layout&lt;/b&gt;.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Layout direction</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sets the direction of the item flow in the &lt;b&gt;Row Layout&lt;/b&gt;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Uniform cell size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggles all cells to have a uniform size.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RowSpecifics</name>
@@ -60002,15 +60380,19 @@ defined in step size.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name must start with a capital letter</source>
+        <source>Name must start with a capital letter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name must have at least 3 characters</source>
+        <source>Name must have at least 3 characters.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name cannot contain white space</source>
+        <source>Name cannot contain white space.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name is already taken.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -60172,6 +60554,17 @@ This is used for calculating the total implicit size.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ShowLookAtAction</name>
+    <message>
+        <source>Show Look-at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle the visibility of the edit camera look-at indicator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ShowParticleEmitterAction</name>
     <message>
@@ -60603,6 +60996,10 @@ it reaches the start or end.</source>
         <source>Current index</source>
         <translation type="unfinished">Aktueller Index</translation>
     </message>
+    <message>
+        <source>Sets the index of the child item currently visible in the &lt;b&gt;Stack Layout&lt;/b&gt;.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>StackViewSpecifics</name>
@@ -61158,7 +61555,7 @@ This is used for calculating the total implicit size.</source>
     </message>
     <message>
         <source></source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Basic</source>
@@ -61498,7 +61895,7 @@ This is used for calculating the total implicit size.</source>
     </message>
     <message>
         <source>Auto scroll</source>
-        <translation>Automatisch rollen</translation>
+        <translation>Automatisch scrollen</translation>
     </message>
     <message>
         <source>Toggles if the text scrolls when it exceeds its boundary.</source>
@@ -61874,15 +62271,15 @@ top or bottom.</source>
     </message>
 </context>
 <context>
-    <name>UnimportBundleMaterialDialog</name>
+    <name>UnimportBundleItemDialog</name>
     <message>
-        <source>Bundle material might be in use</source>
+        <source>Bundle %1 might be in use</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If the %1 you are removing is in use, it might cause the project to malfunction.
 
-Are you sure you want to remove the %1?</source>
+Are you sure you want to remove it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts
index 623ffc7e0ae..d9de9393a9b 100644
--- a/share/qtcreator/translations/qtcreator_es.ts
+++ b/share/qtcreator/translations/qtcreator_es.ts
@@ -3777,8 +3777,8 @@ Es recomendado usar gdb 6.7 o posterior.</translation>
         <translation type="obsolete">Editor de signals/slots</translation>
     </message>
     <message>
-        <source>Qt Designer Form Class</source>
-        <translation>Clase del formulario Qt Designer</translation>
+        <source>Qt Widgets Designer Form Class</source>
+        <translation>Clase del formulario Qt Widgets Designer</translation>
     </message>
     <message>
         <source>%1 - Error</source>
@@ -3825,20 +3825,20 @@ Es recomendado usar gdb 6.7 o posterior.</translation>
         <translation></translation>
     </message>
     <message>
-        <source>Qt Designer Form</source>
+        <source>Qt Widgets Designer Form</source>
         <translation>Diseñador de formularios de Qt</translation>
     </message>
     <message>
-        <source>Creates a Qt Designer form file (.ui).</source>
-        <translation>Crea un archivo de formulario de Qt Designer (.ui).</translation>
+        <source>Creates a Qt Widgets Designer form file (.ui).</source>
+        <translation>Crea un archivo de formulario de Qt Widgets Designer (.ui).</translation>
     </message>
     <message>
-        <source>Creates a Qt Designer form file (.ui) with a matching class.</source>
-        <translation>Crea un archivo de formulario de Qt Designer (.ui) para una clase.</translation>
+        <source>Creates a Qt Widgets Designer form file (.ui) with a matching class.</source>
+        <translation>Crea un archivo de formulario de Qt Widgets Designer (.ui) para una clase.</translation>
     </message>
     <message>
-        <source>Qt Designer Form Class</source>
-        <translation>Clase del formulario de Qt Designer</translation>
+        <source>Qt Widgets Designer Form Class</source>
+        <translation>Clase del formulario de Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Object inspector</source>
@@ -3953,8 +3953,8 @@ Es recomendado usar gdb 6.7 o posterior.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About Qt Designer plugins....</source>
-        <translation>Acerca de los plugins de Qt Designer...</translation>
+        <source>About Qt Widgets Designer plugins....</source>
+        <translation>Acerca de los plugins de Qt Widgets Designer...</translation>
     </message>
     <message>
         <source>Preview in</source>
@@ -3989,8 +3989,8 @@ Es recomendado usar gdb 6.7 o posterior.</translation>
         <translation>Imposible escribir a %1: %2</translation>
     </message>
     <message>
-        <source>Qt Designer Form</source>
-        <translation>Formulario de Qt Designer</translation>
+        <source>Qt Widgets Designer Form</source>
+        <translation>Formulario de Qt Widgets Designer</translation>
     </message>
     <message>
         <source>The class definition of &apos;%1&apos; could not be found in %2.</source>
@@ -7459,8 +7459,8 @@ al control de versiones (%2)?</translation>
         <translation>Este asistente genera un proyecto de aplicación Qt4 para consola. La aplicación es derivada de QCoreApplication y no provee interfaz gráfica de usuario.</translation>
     </message>
     <message>
-        <source>Qt Designer is not responding (%1).</source>
-        <translation>Qt Designer no está respondiendo (%1).</translation>
+        <source>Qt Widgets Designer is not responding (%1).</source>
+        <translation>Qt Widgets Designer no está respondiendo (%1).</translation>
     </message>
     <message>
         <source>Unable to create server socket: %1</source>
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index 8e802d897c6..ff5318759a9 100644
--- a/share/qtcreator/translations/qtcreator_fr.ts
+++ b/share/qtcreator/translations/qtcreator_fr.ts
@@ -152,8 +152,8 @@
         <translation>Lissage</translation>
     </message>
     <message>
-        <source>Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items. </source>
-        <translation>Active/désactive l&apos;utilisation de l&apos;interpolation linéaire pour le lissage. Lorsque décoché, la méthode du plus proche voisin sera utilisée. Cela s&apos;applique principalement aux éléments images. </translation>
+        <source>Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items.</source>
+        <translation>Active/désactive l&apos;utilisation de l&apos;interpolation linéaire pour le lissage. Lorsque décoché, la méthode du plus proche voisin sera utilisée. Cela s&apos;applique principalement aux éléments images.</translation>
     </message>
     <message>
         <source>Antialiasing</source>
@@ -10730,7 +10730,7 @@ dans le navigateur système pour un téléchargement manuel.</translation>
         <translation>Liste des NDK Android&#xa0;:</translation>
     </message>
     <message>
-        <source>Android OpenSSL settings (Optional)</source>
+        <source>Android OpenSSL Settings (Optional)</source>
         <translation>Paramètres Android d&apos;OpenSSL (optionnel)</translation>
     </message>
     <message>
@@ -11066,12 +11066,12 @@ Le kit supporte «&#xa0;%2&#xa0;», mais le périphérique utilise «&#xa0;%3&#x
 </translation>
     </message>
     <message>
-        <source>
-Uninstalling the installed package may solve the issue.
-Do you want to uninstall the existing package?</source>
-        <translation>
-La désinstallation du paquet installé peut résoudre le problème.
-Voulez-vous désinstaller le paquet existant&#xa0;?</translation>
+        <source>Uninstalling the installed package may solve the issue.</source>
+        <translation>La désinstallation du paquet installé peut résoudre le problème.</translation>
+    </message>
+    <message>
+        <source>Do you want to uninstall the existing package?</source>
+        <translation>Voulez-vous désinstaller le paquet existant&#xa0;?</translation>
     </message>
     <message>
         <source>Install failed</source>
@@ -12712,7 +12712,7 @@ Exécutable&#xa0;: %2</translation>
         <translation>Répétition des tests</translation>
     </message>
     <message>
-        <source>Run in parallel</source>
+        <source>Run in Parallel</source>
         <translation>Exécuter en parallèle</translation>
     </message>
     <message>
@@ -20440,8 +20440,8 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
         <translation>Éditeur QMLJS</translation>
     </message>
     <message>
-        <source>Qt Designer</source>
-        <translation>Qt Designer</translation>
+        <source>Qt Widgets Designer</source>
+        <translation>Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Qt Linguist</source>
@@ -22228,7 +22228,7 @@ Le modèle de code intégré gèrera le surlignage, la complétion, etc.</transl
         <translation>Seuil de mise à jour du document :</translation>
     </message>
     <message>
-        <source>Sessions with a single clangd instance</source>
+        <source>Sessions with a Single Clangd Instance</source>
         <translation>Sessions avec une seule instance de clangd</translation>
     </message>
     <message>
@@ -22450,7 +22450,7 @@ devraient être gérés par le même processus clangd, ajoutez-les ici.</transla
         <translation>Convertir en Camel Case</translation>
     </message>
     <message>
-        <source>Add forward declaration for %1</source>
+        <source>Add Forward Declaration for %1</source>
         <translation>Ajouter la déclaration préalable pour %1</translation>
     </message>
     <message>
@@ -22982,8 +22982,8 @@ p.ex. nom = «&#xa0;m_test_toto_&#xa0;» :
         <translation>Modèles de getters et setters personnalisés</translation>
     </message>
     <message>
-        <source>Value types:</source>
-        <translation>Types de valeur :</translation>
+        <source>Value Types</source>
+        <translation>Types de valeur</translation>
     </message>
     <message>
         <source>Projects only</source>
@@ -28811,8 +28811,8 @@ L’accès au module ou la mise en place de points d’arrêt par fichier et par
         <translation>Éditeur d’interface graphique</translation>
     </message>
     <message>
-        <source>Qt Designer Form Class</source>
-        <translation>Classe d’interface graphique Qt Designer</translation>
+        <source>Qt Widgets Designer Form Class</source>
+        <translation>Classe d’interface graphique Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Form Template</source>
@@ -28835,12 +28835,12 @@ L’accès au module ou la mise en place de points d’arrêt par fichier et par
         <translation>Sélectionner un nom de classe</translation>
     </message>
     <message>
-        <source>Creates a Qt Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project.</source>
-        <translation>Crée un formulaire Qt Designer avec une classe correspondante (en-tête C++ et fichier source) pour implémentation. Vous pouvez ajouter le formulaire et la classe à un projet Qt Widget existant.</translation>
+        <source>Creates a Qt Widgets Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project.</source>
+        <translation>Crée un formulaire Qt Widgets Designer avec une classe correspondante (en-tête C++ et fichier source) pour implémentation. Vous pouvez ajouter le formulaire et la classe à un projet Qt Widget existant.</translation>
     </message>
     <message>
         <source>Widget Box</source>
-        <translatorcomment>this translation must coherent with the translation of Qt Designer</translatorcomment>
+        <translatorcomment>this translation must coherent with the translation of Qt Widgets Designer</translatorcomment>
         <translation>Boite de widget</translation>
     </message>
     <message>
@@ -28937,8 +28937,8 @@ L’accès au module ou la mise en place de points d’arrêt par fichier et par
         <translation>Maj+F4</translation>
     </message>
     <message>
-        <source>About Qt Designer Plugins...</source>
-        <translation>À propos des greffons de Qt Designer…</translation>
+        <source>About Qt Widgets Designer Plugins...</source>
+        <translation>À propos des greffons de Qt Widgets Designer…</translation>
     </message>
     <message>
         <source>Signals &amp;&amp; Slots Editor</source>
@@ -34341,8 +34341,8 @@ Souhaitez-vous les écraser&#xa0;?</translation>
         <translation>Entrez les arguments appropriés pour votre commande de construction.</translation>
     </message>
     <message>
-        <source>Make sure the build command&apos;s multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools)</source>
-        <translation>Assurez vous que le paramètre multi-job de la commande de construction est assez grande (telle que -j200  pour les outils de compilation comme JOM ou Make)</translation>
+        <source>Make sure the build command&apos;s multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools).</source>
+        <translation>Assurez vous que le paramètre multi-job de la commande de construction est assez grande (telle que -j200  pour les outils de compilation comme JOM ou Make).</translation>
     </message>
     <message>
         <source>Keep original jobs number:</source>
@@ -34461,16 +34461,16 @@ Souhaitez-vous les écraser&#xa0;?</translation>
         <translation>Cacher l&apos;entête IncrediBuild dans la sortie&#xa0;:</translation>
     </message>
     <message>
-        <source>Suppresses IncrediBuild&apos;s header in the build output</source>
-        <translation>Supprimer l&apos;entête d&apos;IncrediBuild de la sortie de construction</translation>
+        <source>Suppresses IncrediBuild&apos;s header in the build output.</source>
+        <translation>Supprimer l&apos;entête d&apos;IncrediBuild de la sortie de construction.</translation>
     </message>
     <message>
         <source>Internal IncrediBuild logging level:</source>
         <translation>Niveau de journalisation interne d&apos;IncrediBuild&#xa0;:</translation>
     </message>
     <message>
-        <source>Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support</source>
-        <translation>Écrase le niveau interne de journalisation d&apos;IncrediBuild pour cette construction. N&apos;affecte pas la sortie ou un quelconque journal accessible par l&apos;utilisateur. Utilisé principalement pour comprendre les problèmes avec l&apos;aide du support d&apos;IncrediBuild</translation>
+        <source>Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support.</source>
+        <translation>Écrase le niveau interne de journalisation d&apos;IncrediBuild pour cette construction. N&apos;affecte pas la sortie ou un quelconque journal accessible par l&apos;utilisateur. Utilisé principalement pour comprendre les problèmes avec l&apos;aide du support d&apos;IncrediBuild.</translation>
     </message>
     <message>
         <source>Miscellaneous</source>
@@ -34489,16 +34489,16 @@ Souhaitez-vous les écraser&#xa0;?</translation>
         <translation>Arrêter en cas d&apos;erreur&#xa0;:</translation>
     </message>
     <message>
-        <source>When specified, the execution will stop as soon as an error is encountered. This is the default behavior in &quot;Visual Studio&quot; builds, but not the default for &quot;Make and Build tools&quot; or &quot;Dev Tools&quot; builds</source>
-        <translation>Lorsque spécifié, l&apos;exécution s&apos;arrête dès qu&apos;une erreur est rencontrée. C&apos;est le comportement par défaut dans les constructions «&#xa0;Visual Studio&#xa0;», mais ce n&apos;est pas le cas pour les constructions avec «&#xa0;Make et les outils de compilation&#xa0;» ou les «&#xa0;outils de développeur&#xa0;»</translation>
+        <source>When specified, the execution will stop as soon as an error is encountered. This is the default behavior in &quot;Visual Studio&quot; builds, but not the default for &quot;Make and Build tools&quot; or &quot;Dev Tools&quot; builds.</source>
+        <translation>Lorsque spécifié, l&apos;exécution s&apos;arrête dès qu&apos;une erreur est rencontrée. C&apos;est le comportement par défaut dans les constructions «&#xa0;Visual Studio&#xa0;», mais ce n&apos;est pas le cas pour les constructions avec «&#xa0;Make et les outils de compilation&#xa0;» ou les «&#xa0;outils de développeur&#xa0;».</translation>
     </message>
     <message>
         <source>Additional Arguments:</source>
         <translation>Arguments supplémentaires&#xa0;:</translation>
     </message>
     <message>
-        <source>Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line</source>
-        <translation>Ajouter manuellement des arguments pour buildconsole. La valeur de ce champ est concaténé à la ligne de commande finale de buildconsole</translation>
+        <source>Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line.</source>
+        <translation>Ajouter manuellement des arguments pour buildconsole. La valeur de ce champ est concaténé à la ligne de commande finale de buildconsole.</translation>
     </message>
     <message>
         <source>Open Build Monitor:</source>
@@ -40386,8 +40386,8 @@ Présélectionne un Qt optimisé pour le bureau pour compiler l&apos;application
         <translation>Définir l&apos;interpréteur Python</translation>
     </message>
     <message>
-        <source>Creates a Qt for Python application that includes a Qt Designer-based widget (ui file). Requires .ui to Python conversion.</source>
-        <translation>Génère une application Qt pour Python qui inclût un widget basé sur Qt Designer (fichier ui). Nécessite une conversion de .ui vers Python.</translation>
+        <source>Creates a Qt for Python application that includes a Qt Widgets Designer-based widget (ui file). Requires .ui to Python conversion.</source>
+        <translation>Génère une application Qt pour Python qui inclût un widget basé sur Qt Widgets Designer (fichier ui). Nécessite une conversion de .ui vers Python.</translation>
     </message>
     <message>
         <source>Creates a Qt Quick UI project for previewing and prototyping designs.
@@ -40910,10 +40910,10 @@ Utilisez cette version «&#xa0;de compatibilité&#xa0;» si vous souhaitez utili
         <translation>Application Qt Quick (compatibilité)</translation>
     </message>
     <message>
-        <source>Creates a widget-based Qt application that contains a Qt Designer-based main window and C++ source and header files to implement the application logic.
+        <source>Creates a widget-based Qt application that contains a Qt Widgets Designer-based main window and C++ source and header files to implement the application logic.
 
 Preselects a desktop Qt for building the application if available.</source>
-        <translation>Génère une application basée sur les widgets qui contient une fenêtre principale basée sur Qt Designer et un ensemble de fichiers d&apos;entêtes et de sources C++ pour implémenter la logique de l&apos;application.
+        <translation>Génère une application basée sur les widgets qui contient une fenêtre principale basée sur Qt Widgets Designer et un ensemble de fichiers d&apos;entêtes et de sources C++ pour implémenter la logique de l&apos;application.
 
 Sélectionne un Qt optimisé pour bureaux pour compiler l&apos;application, si disponible.</translation>
     </message>
@@ -41254,12 +41254,12 @@ Sélectionne un Qt optimisé pour bureaux pour compiler l&apos;application, si d
         <translation>Modèle d’interface graphique</translation>
     </message>
     <message>
-        <source>Creates a Qt Designer form that you can add to a Qt Widget Project. This is useful if you already have an existing class for the UI business logic.</source>
-        <translation>Crée un formulaire Qt Designer que l’on peut ajouter à un projet Qt Widget. Ceci est utile si vous utilisez déjà une classe pour la logique métier de l’interface.</translation>
+        <source>Creates a Qt Widgets Designer form that you can add to a Qt Widget Project. This is useful if you already have an existing class for the UI business logic.</source>
+        <translation>Crée un formulaire Qt Widgets Designer que l’on peut ajouter à un projet Qt Widget. Ceci est utile si vous utilisez déjà une classe pour la logique métier de l’interface.</translation>
     </message>
     <message>
-        <source>Qt Designer Form</source>
-        <translation>Interface graphique Qt Designer</translation>
+        <source>Qt Widgets Designer Form</source>
+        <translation>Interface graphique Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Creates a source file that you can add to a C/C++ project.</source>
@@ -43130,8 +43130,8 @@ Activez cette option si vous envisagez de créer des binaires x86 32 bits sans u
         <translation>Le répertoire de compilation contient des caractères potentiellement problématiques «&#xa0;%1&#xa0;».</translation>
     </message>
     <message>
-        <source> This warning can be suppressed &lt;a href=&quot;dummy&quot;&gt;here&lt;/a&gt;.</source>
-        <translation> Cet avertissement peut être supprimé &lt;a href=&quot;dummy&quot;&gt;ici&lt;/a&gt;.</translation>
+        <source>This warning can be suppressed &lt;a href=&quot;dummy&quot;&gt;here&lt;/a&gt;.</source>
+        <translation>Cet avertissement peut être supprimé &lt;a href=&quot;dummy&quot;&gt;ici&lt;/a&gt;.</translation>
     </message>
     <message>
         <source>Separate debug info:</source>
@@ -43548,39 +43548,28 @@ au projet «&#xa0;%2&#xa0;».</translation>
         <translation>Le typeId «&#xa0;%1&#xa0;» du générateur est inconnu. Les typesIds pris en charge sont : «&#xa0;%2&#xa0;».</translation>
     </message>
     <message>
-        <source>Path &quot;%1&quot; does not exist when checking Json wizard search paths.
-</source>
-        <translation>Le chemin «&#xa0;%1&#xa0;» n’existe pas lors de la vérification des chemins de recherche de l’assistant Json.</translation>
+        <source>Path &quot;%1&quot; does not exist when checking JSON wizard search paths.</source>
+        <translation>Le chemin «&#xa0;%1&#xa0;» n’existe pas lors de la vérification des chemins de recherche de l’assistant JSON.</translation>
     </message>
     <message>
-        <source>Checking &quot;%1&quot; for %2.
-</source>
-        <translation>Vérification de «&#xa0;%1&#xa0;» pour %2.
-</translation>
+        <source>Checking &quot;%1&quot; for %2.</source>
+        <translation>Vérification de «&#xa0;%1&#xa0;» pour %2.</translation>
     </message>
     <message>
-        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4
-</source>
-        <translation>* Échec de l’analyse de «&#xa0;%1&#xa0;»:%2:%3 : %4
-</translation>
+        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4</source>
+        <translation>* Échec de l’analyse de «&#xa0;%1&#xa0;»:%2:%3 : %4</translation>
     </message>
     <message>
-        <source>* Did not find a JSON object in &quot;%1&quot;.
-</source>
-        <translation>* N’a pas trouvé d’objet JSON dans «&#xa0;%1&#xa0;».
-</translation>
+        <source>* Did not find a JSON object in &quot;%1&quot;.</source>
+        <translation>* N’a pas trouvé d’objet JSON dans «&#xa0;%1&#xa0;».</translation>
     </message>
     <message>
-        <source>* Configuration found and parsed.
-</source>
-        <translation>* La configuration a été trouvée et analysée.
-</translation>
+        <source>* Configuration found and parsed.</source>
+        <translation>* La configuration a été trouvée et analysée.</translation>
     </message>
     <message>
-        <source>JsonWizard: &quot;%1&quot; not found
-</source>
-        <translation>Assistant Json : «&#xa0;%1&#xa0;» introuvable
-</translation>
+        <source>JsonWizard: &quot;%1&quot; not found</source>
+        <translation>Assistant Json : «&#xa0;%1&#xa0;» introuvable.</translation>
     </message>
     <message>
         <source>Page is not an object.</source>
@@ -43599,16 +43588,12 @@ au projet «&#xa0;%2&#xa0;».</translation>
         <translation>La page avec le typeId «&#xa0;%1&#xa0;» a un «&#xa0;index&#xa0;» invalide.</translation>
     </message>
     <message>
-        <source>* Version %1 not supported.
-</source>
-        <translation>* La version %1 n’est pas prise en charge.
-</translation>
+        <source>* Version %1 not supported.</source>
+        <translation>* La version %1 n’est pas prise en charge.</translation>
     </message>
     <message>
-        <source>* Failed to create: %1
-</source>
-        <translation>* Impossible de créer&#xa0;: %1
-</translation>
+        <source>* Failed to create: %1</source>
+        <translation>* Impossible de créer&#xa0;: %1</translation>
     </message>
     <message>
         <source>key not found.</source>
@@ -44461,8 +44446,8 @@ Ces fichiers sont préservés.</numerusform>
         <translation>Chemin de l&apos;interpréteur Python</translation>
     </message>
     <message>
-        <source>No Python interpreter set for kit &quot;%1&quot;</source>
-        <translation>Aucun interpréteur Python n&apos;est défini pour le kit «&#xa0;%1&#xa0;»</translation>
+        <source>No Python interpreter set for kit &quot;%1&quot;.</source>
+        <translation>Aucun interpréteur Python n&apos;est défini pour le kit «&#xa0;%1&#xa0;».</translation>
     </message>
 </context>
 <context>
@@ -45047,8 +45032,8 @@ Les fichiers affectés sont :
 <context>
     <name>QtC::QmakeProjectManager</name>
     <message>
-        <source>Qt Designer is not responding (%1).</source>
-        <translation>Qt Designer ne répond pas (%1).</translation>
+        <source>Qt Widgets Designer is not responding (%1).</source>
+        <translation>Qt Widgets Designer ne répond pas (%1).</translation>
     </message>
     <message>
         <source>Unable to create server socket: %1</source>
@@ -45419,9 +45404,9 @@ Les fichiers affectés sont :
         <translation>Crée un widget personnalisé ou une collection de widgets personnalisés pour Qt4 Designer.</translation>
     </message>
     <message>
-        <source>This wizard generates a Qt Designer Custom Widget or a Qt Designer Custom Widget Collection project.</source>
-        <translatorcomment>lourd ? &quot;contenant un widget ou une collection de widgets, personnalisé pour Qt Designer&quot; ?</translatorcomment>
-        <translation>Cet assistant génère un projet contenant un widget ou une collection de widgets personnalisés pour Qt Designer.</translation>
+        <source>This wizard generates a Qt Widgets Designer Custom Widget or a Qt Widgets Designer Custom Widget Collection project.</source>
+        <translatorcomment>lourd ? &quot;contenant un widget ou une collection de widgets, personnalisé pour Qt Widgets Designer&quot; ?</translatorcomment>
+        <translation>Cet assistant génère un projet contenant un widget ou une collection de widgets personnalisés pour Qt Widgets Designer.</translation>
     </message>
     <message>
         <source>Custom Widgets</source>
@@ -49563,10 +49548,8 @@ Le processus de contrôle n&apos;a pas pu démarrer.</translation>
         <translation>Connexion au périphérique…</translation>
     </message>
     <message>
-        <source>Connected. Now doing extended checks.
-</source>
-        <translation>Connecté. Exécution des tests étendus.
-</translation>
+        <source>Connected. Now doing extended checks.</source>
+        <translation>Connecté. Exécution des tests étendus.</translation>
     </message>
     <message>
         <source>Basic connectivity test failed, device is considered unusable.</source>
@@ -49893,8 +49876,8 @@ Le processus de contrôle n&apos;a pas pu démarrer.</translation>
         <translation>Utiliser le transfert par défaut. Cela peut être lent.</translation>
     </message>
     <message>
-        <source>Unknown error occurred while trying to create remote directories</source>
-        <translation>Une erreur inconnue s&apos;est produite lors de la création des répertoires distants</translation>
+        <source>Unknown error occurred while trying to create remote directories.</source>
+        <translation>Une erreur inconnue s&apos;est produite lors de la création des répertoires distants.</translation>
     </message>
     <message>
         <source>Transfer method was downgraded from &quot;%1&quot; to &quot;%2&quot;. If this is unexpected, please re-test device &quot;%3&quot;.</source>
@@ -52415,12 +52398,12 @@ Impossible d&apos;ouvrir le fichier «&#xa0;%1&#xa0;».</translation>
         <translation>«&#xa0;%1&#xa0;» n&apos;est pas un exécutable.</translation>
     </message>
     <message>
-        <source>Terminal process exited with code %1</source>
-        <translation>Le processus du terminal s&apos;est terminé avec le code %1</translation>
+        <source>Terminal process exited with code %1.</source>
+        <translation>Le processus du terminal s&apos;est terminé avec le code %1.</translation>
     </message>
     <message>
-        <source>Process exited with code: %1</source>
-        <translation>Le processus s&apos;est terminé avec le code&#xa0;: %1</translation>
+        <source>Process exited with code: %1.</source>
+        <translation>Le processus s&apos;est terminé avec le code&#xa0;: %1.</translation>
     </message>
     <message>
         <source>Copy</source>
@@ -52708,10 +52691,10 @@ En outre, Maj+Entrée insère un caractère d’échappement à la position du c
     <message>
         <source>Doxygen allows &quot;@&quot; and &quot;\&quot; to start commands.
 By default, &quot;@&quot; is used if the surrounding comment starts with &quot;/**&quot; or &quot;///&quot;, and &quot;\&quot; is used
-if the comment starts with &quot;/*!&quot; or &quot;//!</source>
+if the comment starts with &quot;/*!&quot; or &quot;//!&quot;.</source>
         <translation>Doxygen permet d&apos;utiliser «&#xa0;@&#xa0;» et «&#xa0;\&#xa0;» pour démarrer une commande.
 Par défaut, «&#xa0;@&#xa0;» est utilisé si le commentaire l&apos;englobant commence avec «&#xa0;/**&#xa0;» ou «&#xa0;///&#xa0;» et «&#xa0;\&#xa0;» est utilisé
-si le commentaire débute avec «&#xa0;/*!&#xa0;» ou «&#xa0;//!&#xa0;»</translation>
+si le commentaire débute avec «&#xa0;/*!&#xa0;» ou «&#xa0;//!&#xa0;».</translation>
     </message>
     <message>
         <source>Documentation Comments</source>
@@ -52734,7 +52717,7 @@ si le commentaire débute avec «&#xa0;/*!&#xa0;» ou «&#xa0;//!&#xa0;»</trans
         <translation>À la demande</translation>
     </message>
     <message>
-        <source>&amp;Automatically insert matching characters</source>
+        <source>&amp;Automatically Insert Matching Characters</source>
         <translation>Insérer &amp;automatiquement les caractères correspondants</translation>
     </message>
     <message>
@@ -54991,7 +54974,7 @@ francis : en effet, une erreur de ma part --&gt; validé.</translatorcomment>
         <translation>Entre les lignes</translation>
     </message>
     <message>
-        <source>Line annotations</source>
+        <source>Line Annotations</source>
         <translation>Annotations de ligne</translation>
     </message>
     <message>
@@ -55434,7 +55417,7 @@ Influence l’indentation des lignes de continuation.
         <translation>Scanner le sous-projet actuel</translation>
     </message>
     <message>
-        <source>Scanning scope</source>
+        <source>Scanning Scope</source>
         <translation>Portée de la recherche</translation>
     </message>
     <message>
diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts
index 6d69f112adb..93848c19411 100644
--- a/share/qtcreator/translations/qtcreator_hr.ts
+++ b/share/qtcreator/translations/qtcreator_hr.ts
@@ -2133,8 +2133,14 @@ Međutim, korištenje opuštenih i proširenih pravila također znači da nije m
     </message>
     <message>
         <source>Executable:</source>
+        <comment>adjective</comment>
         <translation>Izvršavajuća:</translation>
     </message>
+    <message>
+        <source>Executable:</source>
+        <comment>noun</comment>
+        <translation>Izvršna datoteka:</translation>
+    </message>
     <message>
         <source>Symbolic link:</source>
         <translation>Simbolička poveznica:</translation>
@@ -8025,7 +8031,7 @@ In addition, Shift+Enter inserts an escape character at the cursor position and
         <translation>Automatski rastavi znakovne nizove</translation>
     </message>
     <message>
-        <source>&amp;Automatically insert matching characters</source>
+        <source>&amp;Automatically Insert Matching Characters</source>
         <translation>&amp;Automatski umetni poklapajuće znakove</translation>
     </message>
     <message>
@@ -8193,7 +8199,7 @@ In addition, Shift+Enter inserts an escape character at the cursor position and
         <translation>Označi promjene u &amp;tekstu</translation>
     </message>
     <message>
-        <source>Line annotations</source>
+        <source>Line Annotations</source>
         <translation>Napomene za retke</translation>
     </message>
     <message>
@@ -8443,7 +8449,7 @@ Utječe na uvlačenje neprekinutih redaka.
         <translation>Resetiraj</translation>
     </message>
     <message>
-        <source>Scanning scope</source>
+        <source>Scanning Scope</source>
         <translation>Raspon pretrage</translation>
     </message>
     <message>
@@ -13221,9 +13227,11 @@ The minimum API level required by the kit is %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>
-Uninstalling the installed package may solve the issue.
-Do you want to uninstall the existing package?</source>
+        <source>Uninstalling the installed package may solve the issue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to uninstall the existing package?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -15304,8 +15312,8 @@ Check the test environment.</source>
         <translation>Python uređivač</translation>
     </message>
     <message>
-        <source>Qt Designer</source>
-        <translation>Qt Designer</translation>
+        <source>Qt Widgets Designer</source>
+        <translation>Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Qt Linguist</source>
@@ -20900,8 +20908,8 @@ Rebuilding the project might help.</source>
         <translation>Alt+Shift+R</translation>
     </message>
     <message>
-        <source>About Qt Designer Plugins...</source>
-        <translation>O Qt Designer dodacima …</translation>
+        <source>About Qt Widgets Designer Plugins...</source>
+        <translation>O Qt Widgets Designer dodacima …</translation>
     </message>
     <message>
         <source>Preview in</source>
@@ -27563,43 +27571,35 @@ to project &quot;%2&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path &quot;%1&quot; does not exist when checking Json wizard search paths.
-</source>
+        <source>Path &quot;%1&quot; does not exist when checking JSON wizard search paths.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Checking &quot;%1&quot; for %2.
-</source>
+        <source>Checking &quot;%1&quot; for %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4
-</source>
+        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>* Did not find a JSON object in &quot;%1&quot;.
-</source>
+        <source>* Did not find a JSON object in &quot;%1&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>* Configuration found and parsed.
-</source>
+        <source>* Configuration found and parsed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>* Version %1 not supported.
-</source>
+        <source>* Version %1 not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>* Failed to create: %1
-</source>
+        <source>* Failed to create: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>JsonWizard: &quot;%1&quot; not found
-</source>
+        <source>JsonWizard: &quot;%1&quot; not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/share/qtcreator/translations/qtcreator_hu.ts b/share/qtcreator/translations/qtcreator_hu.ts
index 9f29949c84d..23c59c4d416 100644
--- a/share/qtcreator/translations/qtcreator_hu.ts
+++ b/share/qtcreator/translations/qtcreator_hu.ts
@@ -5235,8 +5235,8 @@ A projekt újraépítése talán segít.</translation>
         <translation>Qt modulnevek használata az #include irányelvekben</translation>
     </message>
     <message>
-        <source>Qt Designer Form Class</source>
-        <translation>Qt Designer forma osztály</translation>
+        <source>Qt Widgets Designer Form Class</source>
+        <translation>Qt Widgets Designer forma osztály</translation>
     </message>
     <message>
         <source>Choose a class name</source>
@@ -5259,16 +5259,16 @@ A projekt újraépítése talán segít.</translation>
         <translation>Qt</translation>
     </message>
     <message>
-        <source>Qt Designer Form</source>
-        <translation>Qt Designer forma</translation>
+        <source>Qt Widgets Designer Form</source>
+        <translation>Qt Widgets Designer forma</translation>
     </message>
     <message>
-        <source>Creates a Qt Designer form file (.ui).</source>
-        <translation>Qt Designer forma fájl (.ui) létrehozása.</translation>
+        <source>Creates a Qt Widgets Designer form file (.ui).</source>
+        <translation>Qt Widgets Designer forma fájl (.ui) létrehozása.</translation>
     </message>
     <message>
-        <source>Creates a Qt Designer form file (.ui) with a matching class.</source>
-        <translation>Qt Designer forma fájl(.ui) létrehozása illeszkedő osztályokkal.</translation>
+        <source>Creates a Qt Widgets Designer form file (.ui) with a matching class.</source>
+        <translation>Qt Widgets Designer forma fájl(.ui) létrehozása illeszkedő osztályokkal.</translation>
     </message>
     <message>
         <source>Widget Box</source>
@@ -5371,8 +5371,8 @@ A projekt újraépítése talán segít.</translation>
         <translation>Ctrl+Alt+R</translation>
     </message>
     <message>
-        <source>About Qt Designer plugins....</source>
-        <translation>Névjegy a Qt Designer beépülő moduljairól...</translation>
+        <source>About Qt Widgets Designer plugins....</source>
+        <translation>Névjegy a Qt Widgets Designer beépülő moduljairól...</translation>
     </message>
     <message>
         <source>Preview in</source>
@@ -8651,8 +8651,8 @@ SOURCES *= .../ide/main/bin/dumper/dumper.cpp(new line)
         <translation>CVS feltöltési sablon</translation>
     </message>
     <message>
-        <source>Qt Designer file</source>
-        <translation>Qt Designer fájl</translation>
+        <source>Qt Widgets Designer file</source>
+        <translation>Qt Widgets Designer fájl</translation>
     </message>
     <message>
         <source>Generic Qt Creator Project file</source>
@@ -12834,8 +12834,8 @@ p, li { white-space: pre-wrap; }
         <translation>Ez a varázsló egy Qt4 Designer szokásos Widget-t vagy Qt4 Designer szokásos Widget gyűjtemény projektet generál.</translation>
     </message>
     <message>
-        <source>Qt Designer is not responding (%1).</source>
-        <translation>A Qt Designer nem válaszol (%1).</translation>
+        <source>Qt Widgets Designer is not responding (%1).</source>
+        <translation>A Qt Widgets Designer nem válaszol (%1).</translation>
     </message>
     <message>
         <source>Unable to create server socket: %1</source>
diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts
index 549bf8f77b7..211f4099556 100644
--- a/share/qtcreator/translations/qtcreator_it.ts
+++ b/share/qtcreator/translations/qtcreator_it.ts
@@ -3652,8 +3652,8 @@ L&apos;utilizzo di gdb 6.7 o successivi è fortemente consigliato.</translation>
         <translation type="obsolete">Editor di segnali e slot</translation>
     </message>
     <message>
-        <source>Qt Designer Form Class</source>
-        <translation>Classe Form di Qt Designer</translation>
+        <source>Qt Widgets Designer Form Class</source>
+        <translation>Classe Form di Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Choose a class name</source>
@@ -3700,16 +3700,16 @@ L&apos;utilizzo di gdb 6.7 o successivi è fortemente consigliato.</translation>
         <translation>Qt</translation>
     </message>
     <message>
-        <source>Qt Designer Form</source>
-        <translation>Form di Qt Designer</translation>
+        <source>Qt Widgets Designer Form</source>
+        <translation>Form di Qt Widgets Designer</translation>
     </message>
     <message>
-        <source>Creates a Qt Designer form file (.ui).</source>
-        <translation>Crea un file form Qt Designer (.ui).</translation>
+        <source>Creates a Qt Widgets Designer form file (.ui).</source>
+        <translation>Crea un file form Qt Widgets Designer (.ui).</translation>
     </message>
     <message>
-        <source>Creates a Qt Designer form file (.ui) with a matching class.</source>
-        <translation>Crea un file form Qt Designer (.ui) e la relativa classe.</translation>
+        <source>Creates a Qt Widgets Designer form file (.ui) with a matching class.</source>
+        <translation>Crea un file form Qt Widgets Designer (.ui) e la relativa classe.</translation>
     </message>
     <message>
         <source>Designer widgetbox</source>
@@ -3824,8 +3824,8 @@ L&apos;utilizzo di gdb 6.7 o successivi è fortemente consigliato.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About Qt Designer plugins....</source>
-        <translation>Informazioni sui plugin Qt Designer...</translation>
+        <source>About Qt Widgets Designer plugins....</source>
+        <translation>Informazioni sui plugin Qt Widgets Designer...</translation>
     </message>
     <message>
         <source>Preview in</source>
@@ -7309,8 +7309,8 @@ al VCS (%2)?</translation>
         <translation>Questa procedura guidata genera un progetto per applicazione console Qt4. L&apos;applicazione deriva da QCoreApplication e non include una GUI.</translation>
     </message>
     <message>
-        <source>Qt Designer is not responding (%1).</source>
-        <translation>Qt Designer non risponde (%1).</translation>
+        <source>Qt Widgets Designer is not responding (%1).</source>
+        <translation>Qt Widgets Designer non risponde (%1).</translation>
     </message>
     <message>
         <source>Unable to create server socket: %1</source>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index 71665c23d51..22f040580f6 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -785,7 +785,7 @@
         <translation>SDK のセットアップ</translation>
     </message>
     <message>
-        <source>Android OpenSSL settings (Optional)</source>
+        <source>Android OpenSSL Settings (Optional)</source>
         <translation>Android OpenSSL の設定 (オプション)</translation>
     </message>
     <message>
@@ -1895,7 +1895,7 @@ In addition, Shift+Enter inserts an escape character at the cursor position and
         <translation>文字列を自動的に分割する</translation>
     </message>
     <message>
-        <source>&amp;Automatically insert matching characters</source>
+        <source>&amp;Automatically Insert Matching Characters</source>
         <translation>マッチング文字を自動的に挿入する(&amp;A)</translation>
     </message>
     <message>
@@ -6322,7 +6322,7 @@ Backspace キーが押された時のインデントの動作を指定します
         <translation>ファイル内のナビゲーションをアニメーション化する</translation>
     </message>
     <message>
-        <source>Line annotations</source>
+        <source>Line Annotations</source>
         <translation>ラインアノテーション</translation>
     </message>
     <message>
@@ -6678,7 +6678,7 @@ Influences the indentation of continuation lines.
         <translation>リセット</translation>
     </message>
     <message>
-        <source>Scanning scope</source>
+        <source>Scanning Scope</source>
         <translation>スキャンする範囲</translation>
     </message>
     <message>
@@ -10949,12 +10949,12 @@ with a password, which you can enter below.</source>
 </translation>
     </message>
     <message>
-        <source>
-Uninstalling the installed package may solve the issue.
-Do you want to uninstall the existing package?</source>
-        <translation>
-インストールされているパッケージをアンインストールすると、問題が解決する場合があります。
-既存のパッケージをアンインストールしますか？</translation>
+        <source>Uninstalling the installed package may solve the issue.</source>
+        <translation>インストールされているパッケージをアンインストールすると、問題が解決する場合があります。</translation>
+    </message>
+    <message>
+        <source>Do you want to uninstall the existing package?</source>
+        <translation>既存のパッケージをアンインストールしますか？</translation>
     </message>
     <message>
         <source>Package deploy: Running command &quot;%1&quot;.</source>
@@ -12152,8 +12152,8 @@ in the system&apos;s browser for manual download.</source>
         <translation>Python エディタ</translation>
     </message>
     <message>
-        <source>Qt Designer</source>
-        <translation>Qt Designer</translation>
+        <source>Qt Widgets Designer</source>
+        <translation>Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Qt Linguist</source>
@@ -14319,7 +14319,7 @@ to version control (%2)
         <translation>#include %1 を追加</translation>
     </message>
     <message>
-        <source>Add forward declaration for %1</source>
+        <source>Add Forward Declaration for %1</source>
         <translation>%1 の前方宣言を追加する</translation>
     </message>
     <message>
@@ -18978,8 +18978,8 @@ Rebuilding the project might help.</source>
 プロジェクトのリビルドをお奨めします。</translation>
     </message>
     <message>
-        <source>Qt Designer Form Class</source>
-        <translation>Qt Designer フォームクラス</translation>
+        <source>Qt Widgets Designer Form Class</source>
+        <translation>Qt Widgets Designer フォームクラス</translation>
     </message>
     <message>
         <source>Switch Source/Form</source>
@@ -18994,8 +18994,8 @@ Rebuilding the project might help.</source>
         <translation>Shift+F4</translation>
     </message>
     <message>
-        <source>Creates a Qt Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project.</source>
-        <translation>既存の Qt ウィジェットプロジェクトに追加可能な Qt Designer フォームとそれに対応したクラス (C++ ヘッダとソースファイル) を作成します。</translation>
+        <source>Creates a Qt Widgets Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project.</source>
+        <translation>既存の Qt ウィジェットプロジェクトに追加可能な Qt Widgets Designer フォームとそれに対応したクラス (C++ ヘッダとソースファイル) を作成します。</translation>
     </message>
     <message>
         <source>Choose a Form Template</source>
@@ -25088,8 +25088,8 @@ Neither the path to the library nor the path to its includes is added to the .pr
         <translation>Qt カスタム Designer ウィジェットかカスタムウィジェットコレクションを作成します。</translation>
     </message>
     <message>
-        <source>This wizard generates a Qt Designer Custom Widget or a Qt Designer Custom Widget Collection project.</source>
-        <translation>このウィザードは Qt Designer カスタムウィジェットあるいは Qt Designer カスタムウィジェットコレクションプロジェクトを生成します。</translation>
+        <source>This wizard generates a Qt Widgets Designer Custom Widget or a Qt Widgets Designer Custom Widget Collection project.</source>
+        <translation>このウィザードは Qt Widgets Designer カスタムウィジェットあるいは Qt Widgets Designer カスタムウィジェットコレクションプロジェクトを生成します。</translation>
     </message>
     <message>
         <source>Creating multiple widget libraries (%1, %2) in one project (%3) is not supported.</source>
@@ -25140,8 +25140,8 @@ Neither the path to the library nor the path to its includes is added to the .pr
         <translation>アプリケーション &quot;%1&quot; が見つかりませんでした。</translation>
     </message>
     <message>
-        <source>Qt Designer is not responding (%1).</source>
-        <translation>Qt Designer が無応答です(%1)。</translation>
+        <source>Qt Widgets Designer is not responding (%1).</source>
+        <translation>Qt Widgets Designer が無応答です(%1)。</translation>
     </message>
     <message>
         <source>Unable to create server socket: %1</source>
@@ -25612,10 +25612,10 @@ Neither the path to the library nor the path to its includes is added to the .pr
         <translation>Qt ウィジェットアプリケーション</translation>
     </message>
     <message>
-        <source>Creates a Qt application for the desktop. Includes a Qt Designer-based main window.
+        <source>Creates a Qt application for the desktop. Includes a Qt Widgets Designer-based main window.
 
 Preselects a desktop Qt for building the application if available.</source>
-        <translation>Qt Designer ベースのメインウィンドウを持つデスクトップ用 Qt アプリケーションを作成します。
+        <translation>Qt Widgets Designer ベースのメインウィンドウを持つデスクトップ用 Qt アプリケーションを作成します。
 
 デスクトップ用 Qt が存在する場合、アプリケーションのビルド用に選択します。</translation>
     </message>
@@ -37181,8 +37181,8 @@ Affected are breakpoints %1</source>
         <translation>Alt+Shift+R</translation>
     </message>
     <message>
-        <source>About Qt Designer Plugins...</source>
-        <translation>Qt Designer プラグインについて...</translation>
+        <source>About Qt Widgets Designer Plugins...</source>
+        <translation>Qt Widgets Designer プラグインについて...</translation>
     </message>
     <message>
         <source>Preview in</source>
@@ -37506,12 +37506,12 @@ Affected are breakpoints %1</source>
         <translation>フォームテンプレート</translation>
     </message>
     <message>
-        <source>Creates a Qt Designer form that you can add to a Qt Widget Project. This is useful if you already have an existing class for the UI business logic.</source>
-        <translation>Qt ウィジェットプロジェクトに追加可能な Qt Designer フォームを作成します。これは既に UI ビジネスロジックを実装したクラスを持っている場合に役立ちます。</translation>
+        <source>Creates a Qt Widgets Designer form that you can add to a Qt Widget Project. This is useful if you already have an existing class for the UI business logic.</source>
+        <translation>Qt ウィジェットプロジェクトに追加可能な Qt Widgets Designer フォームを作成します。これは既に UI ビジネスロジックを実装したクラスを持っている場合に役立ちます。</translation>
     </message>
     <message>
-        <source>Qt Designer Form</source>
-        <translation>Qt Designer フォーム</translation>
+        <source>Qt Widgets Designer Form</source>
+        <translation>Qt Widgets Designer フォーム</translation>
     </message>
     <message>
         <source>Creates a Java file with boilerplate code.</source>
@@ -39137,40 +39137,28 @@ Would you like to overwrite it?</source>
         <translation>typeId が &quot;%1&quot; のページの &quot;index&quot; が無効です。</translation>
     </message>
     <message>
-        <source>Path &quot;%1&quot; does not exist when checking Json wizard search paths.
-</source>
-        <translation>Json ウィザードの検索パスを確認しましたが、パス &quot;%1&quot; は存在しません。
-</translation>
+        <source>Path &quot;%1&quot; does not exist when checking JSON wizard search paths.</source>
+        <translation>JSON ウィザードの検索パスを確認しましたが、パス &quot;%1&quot; は存在しません。</translation>
     </message>
     <message>
-        <source>Checking &quot;%1&quot; for %2.
-</source>
-        <translation>%2 向けに &quot;%1&quot; を確認しています。
-</translation>
+        <source>Checking &quot;%1&quot; for %2.</source>
+        <translation>%2 向けに &quot;%1&quot; を確認しています。</translation>
     </message>
     <message>
-        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4
-</source>
-        <translation>・&quot;%1&quot; の解析に失敗しました:%2:%3: %4
-</translation>
+        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4</source>
+        <translation>・&quot;%1&quot; の解析に失敗しました:%2:%3: %4</translation>
     </message>
     <message>
-        <source>* Did not find a JSON object in &quot;%1&quot;.
-</source>
-        <translation>・&quot;%1&quot; に JSON オブジェクトが見つかりませんでした。
-</translation>
+        <source>* Did not find a JSON object in &quot;%1&quot;.</source>
+        <translation>・&quot;%1&quot; に JSON オブジェクトが見つかりませんでした。</translation>
     </message>
     <message>
-        <source>* Configuration found and parsed.
-</source>
-        <translation>・設定が見つかり、解析しました。
-</translation>
+        <source>* Configuration found and parsed.</source>
+        <translation>・設定が見つかり、解析しました。</translation>
     </message>
     <message>
-        <source>* Version %1 not supported.
-</source>
-        <translation>・バージョン %1 には未対応です。
-</translation>
+        <source>* Version %1 not supported.</source>
+        <translation>・バージョン %1 には未対応です。</translation>
     </message>
     <message>
         <source>The platform selected for the wizard.</source>
@@ -39201,16 +39189,12 @@ Would you like to overwrite it?</source>
         <translation>画像ファイル &quot;%1&quot; が見つかりません。</translation>
     </message>
     <message>
-        <source>* Failed to create: %1
-</source>
-        <translation>・作成に失敗しました: %1
-</translation>
+        <source>* Failed to create: %1</source>
+        <translation>・作成に失敗しました: %1</translation>
     </message>
     <message>
-        <source>JsonWizard: &quot;%1&quot; not found
-</source>
-        <translation>JsonWizard: &quot;%1&quot; が見つかりません
-</translation>
+        <source>JsonWizard: &quot;%1&quot; not found.</source>
+        <translation>JsonWizard: &quot;%1&quot; が見つかりません。</translation>
     </message>
     <message>
         <source>key not found.</source>
diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
index a59ebcb424c..00278fb998f 100644
--- a/share/qtcreator/translations/qtcreator_pl.ts
+++ b/share/qtcreator/translations/qtcreator_pl.ts
@@ -151,7 +151,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items. </source>
+        <source>Toggles if the smoothing is performed using linear interpolation method. Keeping it unchecked would follow non-smooth method using nearest neighbor. It is mostly applicable on image based items.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9917,7 +9917,7 @@ in the system&apos;s browser for manual download.</source>
         <translation>Lista Android NDK:</translation>
     </message>
     <message>
-        <source>Android OpenSSL settings (Optional)</source>
+        <source>Android OpenSSL Settings (Optional)</source>
         <translation>Ustawienia Android OpenSSL (opcjonalne)</translation>
     </message>
     <message>
@@ -10692,12 +10692,12 @@ The kit supports &quot;%2&quot;, but the device uses &quot;%3&quot;.</source>
         <translation>Błąd instalacji, przyczyna nieznana.</translation>
     </message>
     <message>
-        <source>
-Uninstalling the installed package may solve the issue.
-Do you want to uninstall the existing package?</source>
-        <translation>
-Deinstalacja uprzednio zainstalowanego pakietu może rozwiązać problem.
-Czy zdeinstalować istniejący pakiet?</translation>
+        <source>Uninstalling the installed package may solve the issue.</source>
+        <translation>Deinstalacja uprzednio zainstalowanego pakietu może rozwiązać problem.</translation>
+    </message>
+    <message>
+        <source>Do you want to uninstall the existing package?</source>
+        <translation>Czy zdeinstalować istniejący pakiet?</translation>
     </message>
     <message>
         <source>The deployment AVD &quot;%1&quot; cannot be started.</source>
@@ -12496,7 +12496,7 @@ See also Google Test settings.</source>
         <translation>Powtarzanie testów</translation>
     </message>
     <message>
-        <source>Run in parallel</source>
+        <source>Run in Parallel</source>
         <translation>Uruchomianie równoległe</translation>
     </message>
     <message>
@@ -15958,8 +15958,8 @@ tylko przez wbudowane narzędzie.</translation>
         <translation>Użyj globalnych ustawień</translation>
     </message>
     <message>
-        <source>ClangFormat settings:</source>
-        <translation>Ustawienia ClangFormat:</translation>
+        <source>ClangFormat Settings</source>
+        <translation>Ustawienia ClangFormat</translation>
     </message>
     <message>
         <source>Indenting only</source>
@@ -17866,8 +17866,8 @@ Otherwise you need to specify the path to the %2 file from the Copilot neovim pl
         <translation>Edytor QMLJS</translation>
     </message>
     <message>
-        <source>Qt Designer</source>
-        <translation>Qt Designer</translation>
+        <source>Qt Widgets Designer</source>
+        <translation>Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Qt Linguist</source>
@@ -21384,7 +21384,7 @@ The built-in code model will handle highlighting, completion and so on.</source>
         <translation>Próg uaktualniania dokumentu:</translation>
     </message>
     <message>
-        <source>Sessions with a single clangd instance</source>
+        <source>Sessions with a Single Clangd Instance</source>
         <translation>Sesje z pojedynczą instancją clangd</translation>
     </message>
     <message>
@@ -21537,7 +21537,7 @@ managed by the same clangd process, add them here.</source>
         <translation>Skonwertuj do pliku binarnego</translation>
     </message>
     <message>
-        <source>Add forward declaration for %1</source>
+        <source>Add Forward Declaration for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -22069,8 +22069,8 @@ e.g. name = &quot;m_test_foo_&quot;:
         <translation>Własne szablony pobieraczy i ustawiaczy</translation>
     </message>
     <message>
-        <source>Value types:</source>
-        <translation>Typy wartości:</translation>
+        <source>Value Types</source>
+        <translation>Typy wartości</translation>
     </message>
     <message>
         <source>Projects only</source>
@@ -27865,8 +27865,8 @@ Please select a 64 bit Debugger in the kit settings for this kit.</source>
         <translation>Podaj nazwę klasy</translation>
     </message>
     <message>
-        <source>Qt Designer Form Class</source>
-        <translation>Klasa formularza Qt Designer</translation>
+        <source>Qt Widgets Designer Form Class</source>
+        <translation>Klasa formularza Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Designer</source>
@@ -27901,8 +27901,8 @@ Spróbuj ponownie przebudować projekt.</translation>
         <translation>Shift+F4</translation>
     </message>
     <message>
-        <source>Creates a Qt Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project.</source>
-        <translation>Tworzy formularz Qt Designera wraz z klasą implementującą (plik nagłówkowy i źródłowy C++). Utworzony formularz i klasę można dodać do istniejącego projektu Qt Widget.</translation>
+        <source>Creates a Qt Widgets Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project.</source>
+        <translation>Tworzy formularz Qt Widgets Designera wraz z klasą implementującą (plik nagłówkowy i źródłowy C++). Utworzony formularz i klasę można dodać do istniejącego projektu Qt Widget.</translation>
     </message>
     <message>
         <source>Choose a Form Template</source>
@@ -28053,8 +28053,8 @@ Przebudowanie projektu może pomóc w ich odnalezieniu.</translation>
         <translation>Alt+Shift+R</translation>
     </message>
     <message>
-        <source>About Qt Designer Plugins...</source>
-        <translation>Informacje o wtyczkach Qt Designera...</translation>
+        <source>About Qt Widgets Designer Plugins...</source>
+        <translation>Informacje o wtyczkach Qt Widgets Designera...</translation>
     </message>
     <message>
         <source>Preview in</source>
@@ -33297,7 +33297,7 @@ Czy nadpisać je?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Make sure the build command&apos;s multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools)</source>
+        <source>Make sure the build command&apos;s multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33425,7 +33425,7 @@ Czy nadpisać je?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suppresses IncrediBuild&apos;s header in the build output</source>
+        <source>Suppresses IncrediBuild&apos;s header in the build output.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33433,7 +33433,7 @@ Czy nadpisać je?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support</source>
+        <source>Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33449,7 +33449,7 @@ Czy nadpisać je?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When specified, the execution will stop as soon as an error is encountered. This is the default behavior in &quot;Visual Studio&quot; builds, but not the default for &quot;Make and Build tools&quot; or &quot;Dev Tools&quot; builds</source>
+        <source>When specified, the execution will stop as soon as an error is encountered. This is the default behavior in &quot;Visual Studio&quot; builds, but not the default for &quot;Make and Build tools&quot; or &quot;Dev Tools&quot; builds.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33457,7 +33457,7 @@ Czy nadpisać je?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line</source>
+        <source>Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -40741,10 +40741,10 @@ You can select an option to create a project that you can open in Qt Design Stud
         <translation>Informacje o klasie</translation>
     </message>
     <message>
-        <source>Creates a widget-based Qt application that contains a Qt Designer-based main window and C++ source and header files to implement the application logic.
+        <source>Creates a widget-based Qt application that contains a Qt Widgets Designer-based main window and C++ source and header files to implement the application logic.
 
 Preselects a desktop Qt for building the application if available.</source>
-        <translation>Tworzy aplikację Qt bazującą na widżetach, zawierającą główne okno do edycji w Qt Designerze wraz z plikami: źródłowym oraz nagłówkowym C++, przeznaczonymi do zaimplementowania logiki aplikacji.
+        <translation>Tworzy aplikację Qt bazującą na widżetach, zawierającą główne okno do edycji w Qt Widgets Designerze wraz z plikami: źródłowym oraz nagłówkowym C++, przeznaczonymi do zaimplementowania logiki aplikacji.
 
 Wstępnie wybiera platformę desktopową Qt do budowania aplikacji, jeśli jest ona dostępna.</translation>
     </message>
@@ -41115,12 +41115,12 @@ You should not mix multiple test frameworks in a project.</source>
         <translation>Szablon formularza</translation>
     </message>
     <message>
-        <source>Creates a Qt Designer form that you can add to a Qt Widget Project. This is useful if you already have an existing class for the UI business logic.</source>
-        <translation>Tworzy formularz Qt Designer, który można dodać do projektu typu Qt Widget. Jest to przydatne w sytuacji, kiedy istnieje już klasa zarządzająca logiką UI.</translation>
+        <source>Creates a Qt Widgets Designer form that you can add to a Qt Widget Project. This is useful if you already have an existing class for the UI business logic.</source>
+        <translation>Tworzy formularz Qt Widgets Designer, który można dodać do projektu typu Qt Widget. Jest to przydatne w sytuacji, kiedy istnieje już klasa zarządzająca logiką UI.</translation>
     </message>
     <message>
-        <source>Qt Designer Form</source>
-        <translation>Formularz Qt Designer</translation>
+        <source>Qt Widgets Designer Form</source>
+        <translation>Formularz Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Creates a Java file with boilerplate code.</source>
@@ -41748,40 +41748,28 @@ To develop a full application, create a Qt Quick Application project instead.</s
         <translation>Strona z typeid &quot;%1&quot; posiada niepoprawny &quot;index&quot;.</translation>
     </message>
     <message>
-        <source>Path &quot;%1&quot; does not exist when checking Json wizard search paths.
-</source>
-        <translation>Ścieżka &quot;%1&quot; nie istnieje podczas sprawdzania ścieżek poszukiwań kreatora Json.
-</translation>
+        <source>Path &quot;%1&quot; does not exist when checking JSON wizard search paths.</source>
+        <translation>Ścieżka &quot;%1&quot; nie istnieje podczas sprawdzania ścieżek poszukiwań kreatora JSON.</translation>
     </message>
     <message>
-        <source>Checking &quot;%1&quot; for %2.
-</source>
-        <translation>Sprawdzanie &quot;%1&quot; dla &quot;%2&quot;.
-</translation>
+        <source>Checking &quot;%1&quot; for %2.</source>
+        <translation>Sprawdzanie &quot;%1&quot; dla &quot;%2&quot;.</translation>
     </message>
     <message>
-        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4
-</source>
-        <translation>* Nie można sparsować &quot;%1&quot;:%2:%3: %4
-</translation>
+        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4</source>
+        <translation>* Nie można sparsować &quot;%1&quot;:%2:%3: %4</translation>
     </message>
     <message>
-        <source>* Did not find a JSON object in &quot;%1&quot;.
-</source>
-        <translation>* Nie odnaleziono obiektu JSON w &quot;%1&quot;.
-</translation>
+        <source>* Did not find a JSON object in &quot;%1&quot;.</source>
+        <translation>* Nie odnaleziono obiektu JSON w &quot;%1&quot;.</translation>
     </message>
     <message>
-        <source>* Configuration found and parsed.
-</source>
-        <translation>* Konfiguracja odnaleziona i przeparsowana.
-</translation>
+        <source>* Configuration found and parsed.</source>
+        <translation>* Konfiguracja odnaleziona i przeparsowana.</translation>
     </message>
     <message>
-        <source>* Version %1 not supported.
-</source>
-        <translation>* Wersja %1 nieobsługiwana.
-</translation>
+        <source>* Version %1 not supported.</source>
+        <translation>* Wersja %1 nieobsługiwana.</translation>
     </message>
     <message>
         <source>The platform selected for the wizard.</source>
@@ -41812,10 +41800,8 @@ To develop a full application, create a Qt Quick Application project instead.</s
         <translation>Brak pliku graficznego &quot;%1&quot;.</translation>
     </message>
     <message>
-        <source>JsonWizard: &quot;%1&quot; not found
-</source>
-        <translation>JsonWizard: Nie znaleziono &quot;%1&quot;
-</translation>
+        <source>JsonWizard: &quot;%1&quot; not found.</source>
+        <translation>JsonWizard: Nie znaleziono &quot;%1&quot;.</translation>
     </message>
     <message>
         <source>key not found.</source>
@@ -43972,15 +43958,15 @@ The affected files are:
     </message>
     <message>
         <source>Qt Custom Designer Widget</source>
-        <translation>Własny widżet Qt Designera</translation>
+        <translation>Własny widżet Qt Widgets Designera</translation>
     </message>
     <message>
         <source>Creates a Qt Custom Designer Widget or a Custom Widget Collection.</source>
-        <translation>Tworzy własny widżet Qt Designera lub kolekcję własnych widżetów.</translation>
+        <translation>Tworzy własny widżet Qt Widgets Designera lub kolekcję własnych widżetów.</translation>
     </message>
     <message>
-        <source>This wizard generates a Qt Designer Custom Widget or a Qt Designer Custom Widget Collection project.</source>
-        <translation>Ten kreator generuje projekt własnego widżetu Qt Designera lub projekt kolekcji własnych widżetów Qt4 Designera.</translation>
+        <source>This wizard generates a Qt Widgets Designer Custom Widget or a Qt Widgets Designer Custom Widget Collection project.</source>
+        <translation>Ten kreator generuje projekt własnego widżetu Qt Widgets Designera lub projekt kolekcji własnych widżetów Qt4 Widget Designera.</translation>
     </message>
     <message>
         <source>Creating multiple widget libraries (%1, %2) in one project (%3) is not supported.</source>
@@ -43999,8 +43985,8 @@ The affected files are:
         <translation>Nie można odnaleźć aplikacji &quot;%1&quot;.</translation>
     </message>
     <message>
-        <source>Qt Designer is not responding (%1).</source>
-        <translation>Qt Designer nie odpowiada (%1).</translation>
+        <source>Qt Widgets Designer is not responding (%1).</source>
+        <translation>Qt Widgets Designer nie odpowiada (%1).</translation>
     </message>
     <message>
         <source>Unable to create server socket: %1</source>
@@ -48594,7 +48580,7 @@ Błąd uruchamiania procesu kontrolnego.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unknown error occurred while trying to create remote directories</source>
+        <source>Unknown error occurred while trying to create remote directories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -51127,11 +51113,11 @@ Nie można otworzyć pliku &quot;%1&quot;.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Terminal process exited with code %1</source>
+        <source>Terminal process exited with code %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Process exited with code: %1</source>
+        <source>Process exited with code: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -52785,7 +52771,7 @@ Ustala, jak klawisz &quot;Backspace&quot; reaguje na wcięcia.
         <translation>Pomiędzy liniami</translation>
     </message>
     <message>
-        <source>Line annotations</source>
+        <source>Line Annotations</source>
         <translation>Adnotacje linii</translation>
     </message>
     <message>
@@ -53763,7 +53749,7 @@ po naciśnięciu klawisza Enter</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Automatically insert matching characters</source>
+        <source>&amp;Automatically Insert Matching Characters</source>
         <translation>&amp;Automatyczne wstawianie znaków</translation>
     </message>
     <message>
@@ -53843,7 +53829,7 @@ po naciśnięciu klawisza backspace</translation>
     <message>
         <source>Doxygen allows &quot;@&quot; and &quot;\&quot; to start commands.
 By default, &quot;@&quot; is used if the surrounding comment starts with &quot;/**&quot; or &quot;///&quot;, and &quot;\&quot; is used
-if the comment starts with &quot;/*!&quot; or &quot;//!</source>
+if the comment starts with &quot;/*!&quot; or &quot;//!&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -54158,7 +54144,7 @@ if the comment starts with &quot;/*!&quot; or &quot;//!</source>
         <translation>Zresetuj</translation>
     </message>
     <message>
-        <source>Scanning scope</source>
+        <source>Scanning Scope</source>
         <translation>Zakres skanowania</translation>
     </message>
     <message>
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index ac9a564f8b3..44f5dfa5823 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -933,12 +933,12 @@ The files in the Android package source directory are copied to the build direct
 </translation>
     </message>
     <message>
-        <source>
-Uninstalling the installed package may solve the issue.
-Do you want to uninstall the existing package?</source>
-        <translation>
-Удаление установленного пакета может решить проблему.
-Желаете его удалить?</translation>
+        <source>Uninstalling the installed package may solve the issue.</source>
+        <translation>Удаление установленного пакета может решить проблему.</translation>
+    </message>
+    <message>
+        <source>Do you want to uninstall the existing package?</source>
+        <translation>Желаете его удалить?</translation>
     </message>
     <message>
         <source>Pulling files necessary for debugging.</source>
@@ -2169,7 +2169,7 @@ To hide a sticky splash screen, invoke QtAndroid::hideSplashScreen().</source>
         <translation>Настроить SDK</translation>
     </message>
     <message>
-        <source>Android OpenSSL settings (Optional)</source>
+        <source>Android OpenSSL Settings (Optional)</source>
         <translation>Настройки Android OpenSSL (опционально)</translation>
     </message>
     <message>
@@ -11815,7 +11815,7 @@ Flags: %3</source>
         <translation>Добавить #include %1</translation>
     </message>
     <message>
-        <source>Add forward declaration for %1</source>
+        <source>Add Forward Declaration for %1</source>
         <translation>Добавление предъобъявления %1</translation>
     </message>
     <message>
@@ -16950,8 +16950,8 @@ Rebuilding the project might help.</source>
 Пересборка проекта может помочь.</translation>
     </message>
     <message>
-        <source>Qt Designer Form Class</source>
-        <translation>Класс формы Qt Designer</translation>
+        <source>Qt Widgets Designer Form Class</source>
+        <translation>Класс формы Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Class Details</source>
@@ -16982,7 +16982,7 @@ Rebuilding the project might help.</source>
         <translation>Shift+F4</translation>
     </message>
     <message>
-        <source>Creates a Qt Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project.</source>
+        <source>Creates a Qt Widgets Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project.</source>
         <translation>Создание формы дизайнера Qt и соответствующего класса (исходный и заголовочный файлы C++) для реализации. Их можно будет добавить к существующему проекту Qt Widget.</translation>
     </message>
     <message>
@@ -18313,8 +18313,14 @@ will also disable the following plugins:
     </message>
     <message>
         <source>Executable:</source>
+        <comment>adjective</comment>
         <translation>Можно запускать:</translation>
     </message>
+    <message>
+        <source>Executable:</source>
+        <comment>noun</comment>
+        <translation>Программа:</translation>
+    </message>
     <message>
         <source>Symbolic link:</source>
         <translation>Символьная ссылка:</translation>
@@ -18681,8 +18687,8 @@ when they are not required, which will improve performance in most cases.</sourc
         <translation>Alt+Shift+R</translation>
     </message>
     <message>
-        <source>About Qt Designer Plugins...</source>
-        <translation>О модулях Qt Designer...</translation>
+        <source>About Qt Widgets Designer Plugins...</source>
+        <translation>О модулях Qt Widgets Designer...</translation>
     </message>
     <message>
         <source>Preview in</source>
@@ -22415,8 +22421,8 @@ Would you like to overwrite them?</source>
         <translation>Максимальное количество ЦП для сборки:</translation>
     </message>
     <message>
-        <source>When specified, the execution will stop as soon as an error is encountered.  This is the default behavior in &apos;Visual Studio&apos; builds, but not the default for &apos;Make and Build tools&apos; or &apos;Dev Tools&apos; builds</source>
-        <translation>Включение остановки выполнения при возникновении ошибки. Это поведение по умолчанию в сборках «Visual Studio», но не по умолчанию для сборок «Make and Build tools» или «Dev Tools»</translation>
+        <source>When specified, the execution will stop as soon as an error is encountered.  This is the default behavior in &apos;Visual Studio&apos; builds, but not the default for &apos;Make and Build tools&apos; or &apos;Dev Tools&apos; builds.</source>
+        <translation>Включение остановки выполнения при возникновении ошибки. Это поведение по умолчанию в сборках «Visual Studio», но не по умолчанию для сборок «Make and Build tools» или «Dev Tools».</translation>
     </message>
     <message>
         <source>Stop On Errors</source>
@@ -22467,7 +22473,7 @@ Would you like to overwrite them?</source>
         <translation type="unfinished">Помощник запуска:</translation>
     </message>
     <message>
-        <source>Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line</source>
+        <source>Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line.</source>
         <translation>Дополнительные параметры buildconsole. Значение поля будет добавлено к итоговой командной строке buildconsole.</translation>
     </message>
     <message>
@@ -22495,7 +22501,7 @@ Would you like to overwrite them?</source>
         <translation>Исходное число задач</translation>
     </message>
     <message>
-        <source>Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support</source>
+        <source>Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support.</source>
         <translation>Меняет для этой сборки уровень ведения внутреннего журнала Incredibuild. Не влияет на вывод или любые доступные пользователю журналы. В основном используется для устранения проблем через службу поддержки IncrediBuild.</translation>
     </message>
     <message>
@@ -25534,8 +25540,8 @@ If set to false, the target will be moved straight to the current mouse position
         <translation>Редактор QMLJS</translation>
     </message>
     <message>
-        <source>Qt Designer</source>
-        <translation>Qt Designer</translation>
+        <source>Qt Widgets Designer</source>
+        <translation>Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Qt Linguist</source>
@@ -29867,12 +29873,12 @@ Enable this if you plan to create 32-bit x86 binaries without using a dedicated
         <translation>Шаблон формы</translation>
     </message>
     <message>
-        <source>Creates a Qt Designer form that you can add to a Qt Widget Project. This is useful if you already have an existing class for the UI business logic.</source>
-        <translation>Создание формы Qt Designer, которую можно добавить в проект Qt Widget. Имеет смысл, если у вас уже есть класс с бизнес-логикой.</translation>
+        <source>Creates a Qt Widgets Designer form that you can add to a Qt Widget Project. This is useful if you already have an existing class for the UI business logic.</source>
+        <translation>Создание формы Qt Widgets Designer, которую можно добавить в проект Qt Widget. Имеет смысл, если у вас уже есть класс с бизнес-логикой.</translation>
     </message>
     <message>
-        <source>Qt Designer Form</source>
-        <translation>Форма Qt Designer</translation>
+        <source>Qt Widgets Designer Form</source>
+        <translation>Форма Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Creates a Java file with boilerplate code.</source>
@@ -30627,7 +30633,7 @@ Use this only if you are prototyping. You cannot create a full application with
         <translation>Информация о классе</translation>
     </message>
     <message>
-        <source>Creates a Qt application for the desktop. Includes a Qt Designer-based main window.
+        <source>Creates a Qt application for the desktop. Includes a Qt Widgets Designer-based main window.
 
 Preselects a desktop Qt for building the application if available.</source>
         <translation>Создание приложения Qt для настольных компьютеров. Включает основное окно в виде формы дизайнера Qt.
@@ -30707,8 +30713,8 @@ Preselects a desktop Qt for building the application if available.</source>
         <translation>Qt для Python - Приложение Qt Quick - Пустое</translation>
     </message>
     <message>
-        <source>Creates a Qt for Python application that includes a Qt Designer-based widget (ui file)</source>
-        <translation>Создание приложения на Qt для Python, включающее виджет Qt Designer (файл ui)</translation>
+        <source>Creates a Qt for Python application that includes a Qt Widgets Designer-based widget (ui file)</source>
+        <translation>Создание приложения на Qt для Python, включающее виджет Qt Widgets Designer (файл ui)</translation>
     </message>
     <message>
         <source>Qt for Python - Window (UI file)</source>
@@ -30999,40 +31005,28 @@ Preselects a desktop Qt for building the application if available.</source>
         <translation>У страницы с typeId «%1» неверный «index».</translation>
     </message>
     <message>
-        <source>Path &quot;%1&quot; does not exist when checking Json wizard search paths.
-</source>
-        <translation>При проверке путей мастера Json: путь «%1» не существует.
-</translation>
+        <source>Path &quot;%1&quot; does not exist when checking JSON wizard search paths.</source>
+        <translation>При проверке путей мастера JSON: путь «%1» не существует.</translation>
     </message>
     <message>
-        <source>Checking &quot;%1&quot; for %2.
-</source>
-        <translation>Проверяется «%1» у %2.
-</translation>
+        <source>Checking &quot;%1&quot; for %2.</source>
+        <translation>Проверяется «%1» у %2.</translation>
     </message>
     <message>
-        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4
-</source>
-        <translation>* Не удалось разобрать «%1»:%2:%3: %4
-</translation>
+        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4</source>
+        <translation>* Не удалось разобрать «%1»:%2:%3: %4</translation>
     </message>
     <message>
-        <source>* Did not find a JSON object in &quot;%1&quot;.
-</source>
-        <translation>* Объект JSON не был найден в «%1».
-</translation>
+        <source>* Did not find a JSON object in &quot;%1&quot;.</source>
+        <translation>* Объект JSON не был найден в «%1».</translation>
     </message>
     <message>
-        <source>* Configuration found and parsed.
-</source>
-        <translation>* Конфигурация обнаружена и разобрана.
-</translation>
+        <source>* Configuration found and parsed.</source>
+        <translation>* Конфигурация обнаружена и разобрана.</translation>
     </message>
     <message>
-        <source>* Version %1 not supported.
-</source>
-        <translation>* Версия %1 не поддерживается.
-</translation>
+        <source>* Version %1 not supported.</source>
+        <translation>* Версия %1 не поддерживается.</translation>
     </message>
     <message>
         <source>The platform selected for the wizard.</source>
@@ -31063,16 +31057,12 @@ Preselects a desktop Qt for building the application if available.</source>
         <translation>Файл изображения «%1» не найден.</translation>
     </message>
     <message>
-        <source>* Failed to create: %1
-</source>
-        <translation>* Не удалось создать: %1
-</translation>
+        <source>* Failed to create: %1</source>
+        <translation>* Не удалось создать: %1</translation>
     </message>
     <message>
-        <source>JsonWizard: &quot;%1&quot; not found
-</source>
-        <translation>JsonWizard: «%1» не найден
-</translation>
+        <source>JsonWizard: &quot;%1&quot; not found.</source>
+        <translation>JsonWizard: «%1» не найден.</translation>
     </message>
     <message>
         <source>key not found.</source>
@@ -33673,19 +33663,19 @@ Please update your kit (%3) or choose a mkspec for qmake that matches your targe
     </message>
     <message>
         <source>Qt Custom Designer Widget</source>
-        <translation>Пользовательский виджет Qt Designer</translation>
+        <translation>Пользовательский виджет Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Creates a Qt Custom Designer Widget or a Custom Widget Collection.</source>
-        <translation>Создание пользовательского виджета Qt Designer или набора пользовательских виджетов.</translation>
+        <translation>Создание пользовательского виджета Qt Widgets Designer или набора пользовательских виджетов.</translation>
     </message>
     <message>
-        <source>This wizard generates a Qt Designer Custom Widget or a Qt Designer Custom Widget Collection project.</source>
-        <translation>Этот мастер создаст пользовательский виджет или набор пользовательских виджетов для Qt Designer.</translation>
+        <source>This wizard generates a Qt Widgets Designer Custom Widget or a Qt Widgets Designer Custom Widget Collection project.</source>
+        <translation>Этот мастер создаст пользовательский виджет или набор пользовательских виджетов для Qt Widgets Designer.</translation>
     </message>
     <message>
-        <source>Qt Designer is not responding (%1).</source>
-        <translation>Qt Designer не отвечает (%1).</translation>
+        <source>Qt Widgets Designer is not responding (%1).</source>
+        <translation>Qt Widgets Designer не отвечает (%1).</translation>
     </message>
     <message>
         <source>Unable to create server socket: %1</source>
@@ -35227,7 +35217,7 @@ Neither the path to the library nor the path to its includes is added to the .pr
     </message>
     <message>
         <source>Warn about unsupported features of Qt Quick Designer in the code editor</source>
-        <translation>Предупреждать о неподдерживаемых особенностях Qt Designer в редакторе кода</translation>
+        <translation>Предупреждать о неподдерживаемых особенностях Qt Quick Designer в редакторе кода</translation>
     </message>
     <message>
         <source>Debugging</source>
@@ -43141,7 +43131,7 @@ In addition, Shift+Enter inserts an escape character at the cursor position and
         <translation>Автоматически разделять строки</translation>
     </message>
     <message>
-        <source>&amp;Automatically insert matching characters</source>
+        <source>&amp;Automatically Insert Matching Characters</source>
         <translation>&amp;Автоматически вставлять парные символы</translation>
     </message>
     <message>
@@ -43325,7 +43315,7 @@ In addition, Shift+Enter inserts an escape character at the cursor position and
         <translation>Прижать к правому краю</translation>
     </message>
     <message>
-        <source>Line annotations</source>
+        <source>Line Annotations</source>
         <translation>Построчная аннотация</translation>
     </message>
     <message>
@@ -45147,7 +45137,7 @@ The trace data is lost.</source>
         <translation>Сбросить</translation>
     </message>
     <message>
-        <source>Scanning scope</source>
+        <source>Scanning Scope</source>
         <translation>Область поиска</translation>
     </message>
     <message>
diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts
index e5b3b87b02b..837f8267ded 100644
--- a/share/qtcreator/translations/qtcreator_sl.ts
+++ b/share/qtcreator/translations/qtcreator_sl.ts
@@ -3532,8 +3532,8 @@ Morda lahko pomaga ponovna gradnja projekta.</translation>
         <translation type="obsolete">Urejevalnik XML</translation>
     </message>
     <message>
-        <source>Qt Designer Form Class</source>
-        <translation>Razred obrazca Qt Designer</translation>
+        <source>Qt Widgets Designer Form Class</source>
+        <translation>Razred obrazca Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Form Template</source>
@@ -3560,8 +3560,8 @@ Morda lahko pomaga ponovna gradnja projekta.</translation>
         <translation type="obsolete">Nastavitve …</translation>
     </message>
     <message>
-        <source>Qt Designer Form</source>
-        <translation>Obrazec Qt Designer</translation>
+        <source>Qt Widgets Designer Form</source>
+        <translation>Obrazec Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Creates a Qt Designer form that you can add to a Qt Widget Project. This is useful if you already have an existing class for the UI business logic.</source>
@@ -3676,8 +3676,8 @@ Morda lahko pomaga ponovna gradnja projekta.</translation>
         <translation>Urejevalnik signalov in rež</translation>
     </message>
     <message>
-        <source>About Qt Designer plugins....</source>
-        <translation>O vstavkih za Qt Designer …</translation>
+        <source>About Qt Widgets Designer plugins....</source>
+        <translation>O vstavkih za Qt Widgets Designer …</translation>
     </message>
     <message>
         <source>Preview in</source>
@@ -7756,14 +7756,6 @@ Preselects a desktop Qt for building the application if available.</source>
         <source>problemLabel</source>
         <translation>oznakaTežave</translation>
     </message>
-    <message>
-        <source>Error: </source>
-        <translation type="obsolete">Napaka: </translation>
-    </message>
-    <message>
-        <source>Warning: </source>
-        <translation type="obsolete">Opozorilo: </translation>
-    </message>
     <message>
         <source>Configuration name:</source>
         <translation type="obsolete">Ime nastavitev:</translation>
@@ -10733,8 +10725,8 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan
         <translation>Urejevalniku QMLJS</translation>
     </message>
     <message>
-        <source>Qt Designer</source>
-        <translation>Qt Designerju</translation>
+        <source>Qt Widgets Designer</source>
+        <translation>Qt Widgets Designerju</translation>
     </message>
     <message>
         <source>Qt Linguist</source>
@@ -11579,15 +11571,15 @@ Razlog: %2</translation>
     </message>
     <message>
         <source>Qt Custom Designer Widget</source>
-        <translation>Gradnik za Qt Designer po meri</translation>
+        <translation>Gradnik za Qt Widgets Designer po meri</translation>
     </message>
     <message>
         <source>Creates a Qt Custom Designer Widget or a Custom Widget Collection.</source>
-        <translation>Ustvari gradnik za Qt Designer po meri ali pa zbirko gradnikov po meri</translation>
+        <translation>Ustvari gradnik za Qt Widgets Designer po meri ali pa zbirko gradnikov po meri</translation>
     </message>
     <message>
         <source>This wizard generates a Qt4 Designer Custom Widget or a Qt4 Designer Custom Widget Collection project.</source>
-        <translation>Ta čarovnik ustvari projekt gradnika po meri za Qt Designer ali pa projekt zbirke gradnikov po meri za Qt Designer.</translation>
+        <translation>Ta čarovnik ustvari projekt gradnika po meri za Qt Widgets Designer ali pa projekt zbirke gradnikov po meri za Qt Widgets Designer.</translation>
     </message>
     <message>
         <source>Custom Widgets</source>
@@ -11618,8 +11610,8 @@ Razlog: %2</translation>
         <translation>Programa »%1« ni bilo moč najti.</translation>
     </message>
     <message>
-        <source>Qt Designer is not responding (%1).</source>
-        <translation>Qt Designer se ne odziva (%1).</translation>
+        <source>Qt Widgets Designer is not responding (%1).</source>
+        <translation>Qt Widgets Designer se ne odziva (%1).</translation>
     </message>
     <message>
         <source>Unable to create server socket: %1</source>
@@ -16012,8 +16004,8 @@ Projekte programov QML izvede pregledovalnik QML in jih ni potrebno zgraditi.</t
         <translation>Predloga pošiljanja za CVS</translation>
     </message>
     <message>
-        <source>Qt Designer file</source>
-        <translation>Datoteka za Qt Designer</translation>
+        <source>Qt Widgets Designer file</source>
+        <translation>Datoteka za Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Generic Qt Creator Project file</source>
diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts
index 432f5ab3a24..d3da748f62e 100644
--- a/share/qtcreator/translations/qtcreator_uk.ts
+++ b/share/qtcreator/translations/qtcreator_uk.ts
@@ -3153,7 +3153,7 @@ to version control (%2)
         <translation type="vanished">Автоматично вставляти крапки з комами, закриваючі квадратні, круглі, фігурні дужки та лапки, коли необхідно.</translation>
     </message>
     <message>
-        <source>&amp;Automatically insert matching characters</source>
+        <source>&amp;Automatically Insert Matching Characters</source>
         <translation>&amp;Автоматично вставляти парні символи</translation>
     </message>
     <message>
@@ -6843,8 +6843,8 @@ Rebuilding the project might help.</source>
         <translation type="vanished">Додавати версію Qt в #ifdef для імен модулів</translation>
     </message>
     <message>
-        <source>Qt Designer Form Class</source>
-        <translation>Клас форми Qt Designer</translation>
+        <source>Qt Widgets Designer Form Class</source>
+        <translation>Клас форми Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Choose a Class Name</source>
@@ -6883,8 +6883,8 @@ Rebuilding the project might help.</source>
         <translation type="vanished">Створює форму Qt Designer, яку ви можете додати до проекту Qt Widget. Це корисно, якщо ви вже маєте існуючий клас для бізнес-логіки UI.</translation>
     </message>
     <message>
-        <source>Creates a Qt Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project.</source>
-        <translation>Створює форму Qt Designer разом з відповідним класом (файли заголовку та коду C++) з метою реалізації.. Ви можете додати форму та клас до існуючого проекту Qt Widget.</translation>
+        <source>Creates a Qt Widgets Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project.</source>
+        <translation>Створює форму Qt Widgets Designer разом з відповідним класом (файли заголовку та коду C++) з метою реалізації.. Ви можете додати форму та клас до існуючого проекту Qt Widget.</translation>
     </message>
     <message>
         <source>Location</source>
@@ -11142,8 +11142,8 @@ Ids must begin with a lowercase letter.</source>
         <translation>Редактор QMLJS</translation>
     </message>
     <message>
-        <source>Qt Designer</source>
-        <translation>Qt Designer</translation>
+        <source>Qt Widgets Designer</source>
+        <translation>Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Qt Linguist</source>
@@ -15626,19 +15626,19 @@ Preselects a desktop Qt for building the application if available.</source>
     </message>
     <message>
         <source>Qt Custom Designer Widget</source>
-        <translation>Користувацький віджет Qt Designer</translation>
+        <translation>Користувацький віджет Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Creates a Qt Custom Designer Widget or a Custom Widget Collection.</source>
-        <translation>Створює користувацький віджет Qt Designer або колекцію користувацьких віджетів.</translation>
+        <translation>Створює користувацький віджет Qt Widgets Designer або колекцію користувацьких віджетів.</translation>
     </message>
     <message>
-        <source>This wizard generates a Qt Designer Custom Widget or a Qt Designer Custom Widget Collection project.</source>
-        <translation>Цей майстер генерує проект користувацького віджета Qt Designer або колекції користувацьких віджетів Qt Designer.</translation>
+        <source>This wizard generates a Qt Widgets Designer Custom Widget or a Qt Widgets Designer Custom Widget Collection project.</source>
+        <translation>Цей майстер генерує проект користувацького віджета Qt Widgets Designer або колекції користувацьких віджетів Qt Widgets Designer.</translation>
     </message>
     <message>
-        <source>Qt Designer is not responding (%1).</source>
-        <translation>Qt Designer не відповідає (%1).</translation>
+        <source>Qt Widgets Designer is not responding (%1).</source>
+        <translation>Qt Widgets Designer не відповідає (%1).</translation>
     </message>
     <message>
         <source>Unable to create server socket: %1</source>
@@ -15717,10 +15717,10 @@ Preselects a desktop Qt for building the application if available.</source>
         <translation>Програма Qt Widgets</translation>
     </message>
     <message>
-        <source>Creates a Qt application for the desktop. Includes a Qt Designer-based main window.
+        <source>Creates a Qt application for the desktop. Includes a Qt Widgets Designer-based main window.
 
 Preselects a desktop Qt for building the application if available.</source>
-        <translation>Створює програму Qt для стаціонарного комп&apos;ютера. Включає головне вікно на основі Qt Designer.
+        <translation>Створює програму Qt для стаціонарного комп&apos;ютера. Включає головне вікно на основі Qt Widgets Designer.
 
 Обирає Qt для стільниці для збірки програми, якщо доступно.</translation>
     </message>
@@ -21894,7 +21894,7 @@ Influences the indentation of continuation lines.
         <translation>Скинути</translation>
     </message>
     <message>
-        <source>Scanning scope</source>
+        <source>Scanning Scope</source>
         <translation>Область пошуку</translation>
     </message>
     <message>
@@ -37378,8 +37378,8 @@ The statements may not contain &apos;{&apos; nor &apos;}&apos; characters.</sour
         <translation>Alt+Shift+R</translation>
     </message>
     <message>
-        <source>About Qt Designer Plugins...</source>
-        <translation>Про додатки Qt Designer....</translation>
+        <source>About Qt Widgets Designer Plugins...</source>
+        <translation>Про додатки Qt Widgets Designer....</translation>
     </message>
     <message>
         <source>Preview in</source>
@@ -37719,12 +37719,12 @@ The statements may not contain &apos;{&apos; nor &apos;}&apos; characters.</sour
         <translation>Шаблон форми</translation>
     </message>
     <message>
-        <source>Creates a Qt Designer form that you can add to a Qt Widget Project. This is useful if you already have an existing class for the UI business logic.</source>
-        <translation>Створює форму Qt Designer, яку ви можете додати до проекту Qt Widget. Це корисно, якщо ви вже маєте існуючий клас для бізнес-логіки UI.</translation>
+        <source>Creates a Qt Widgets Designer form that you can add to a Qt Widget Project. This is useful if you already have an existing class for the UI business logic.</source>
+        <translation>Створює форму Qt Widgets Designer, яку ви можете додати до проекту Qt Widget. Це корисно, якщо ви вже маєте існуючий клас для бізнес-логіки UI.</translation>
     </message>
     <message>
-        <source>Qt Designer Form</source>
-        <translation>Форма Qt Designer</translation>
+        <source>Qt Widgets Designer Form</source>
+        <translation>Форма Qt Widgets Designer</translation>
     </message>
     <message>
         <source>Creates a Java file with boilerplate code.</source>
@@ -38747,40 +38747,28 @@ Preselects a desktop Qt for building the application if available.</source>
         <translation>Сторінка з &quot;%1&quot; має неправильний &quot;index&quot;.</translation>
     </message>
     <message>
-        <source>Path &quot;%1&quot; does not exist when checking Json wizard search paths.
-</source>
-        <translation>Перевірка шляхів пошуків майстра Json: шлях &quot;%1&quot; не існує.
-</translation>
+        <source>Path &quot;%1&quot; does not exist when checking JSON wizard search paths.</source>
+        <translation>Перевірка шляхів пошуків майстра JSON: шлях &quot;%1&quot; не існує.</translation>
     </message>
     <message>
-        <source>Checking &quot;%1&quot; for %2.
-</source>
-        <translation>Перевірка &quot;%1&quot; для %2.
-</translation>
+        <source>Checking &quot;%1&quot; for %2.</source>
+        <translation>Перевірка &quot;%1&quot; для %2.</translation>
     </message>
     <message>
-        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4
-</source>
-        <translation>* Збій розбору &quot;%1&quot;:%2:%3: %4
-</translation>
+        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4</source>
+        <translation>* Збій розбору &quot;%1&quot;:%2:%3: %4</translation>
     </message>
     <message>
-        <source>* Did not find a JSON object in &quot;%1&quot;.
-</source>
-        <translation>* Не знайдено об&apos;єкт JSON в &quot;%1&quot;.
-</translation>
+        <source>* Did not find a JSON object in &quot;%1&quot;.</source>
+        <translation>* Не знайдено об&apos;єкт JSON в &quot;%1&quot;.</translation>
     </message>
     <message>
-        <source>* Configuration found and parsed.
-</source>
-        <translation>* Конфігурацію знайдено та розібрано.
-</translation>
+        <source>* Configuration found and parsed.</source>
+        <translation>* Конфігурацію знайдено та розібрано.</translation>
     </message>
     <message>
-        <source>* Version %1 not supported.
-</source>
-        <translation>* Версія %1 не підтримується.
-</translation>
+        <source>* Version %1 not supported.</source>
+        <translation>* Версія %1 не підтримується.</translation>
     </message>
     <message>
         <source>The platform selected for the wizard.</source>
@@ -38817,16 +38805,12 @@ Preselects a desktop Qt for building the application if available.</source>
 </translation>
     </message>
     <message>
-        <source>* Failed to create: %1
-</source>
-        <translation>* Збій створення: %1
-</translation>
+        <source>* Failed to create: %1</source>
+        <translation>* Збій створення: %1</translation>
     </message>
     <message>
-        <source>JsonWizard: &quot;%1&quot; not found
-</source>
-        <translation>JsonWizard: &quot;%1&quot; не знайдено
-</translation>
+        <source>JsonWizard: &quot;%1&quot; not found.</source>
+        <translation>JsonWizard: &quot;%1&quot; не знайдено.</translation>
     </message>
     <message>
         <source>key not found.</source>
diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts
index 7526f78c968..66a622a4259 100644
--- a/share/qtcreator/translations/qtcreator_zh_CN.ts
+++ b/share/qtcreator/translations/qtcreator_zh_CN.ts
@@ -787,12 +787,12 @@ The kit supports &quot;%2&quot;, but the device uses &quot;%3&quot;.</source>
 </translation>
     </message>
     <message>
-        <source>
-Uninstalling the installed package may solve the issue.
-Do you want to uninstall the existing package?</source>
-        <translation>
-卸载已安装的包可能解决这个问题。
-你想卸载已经存在的包吗？</translation>
+        <source>Uninstalling the installed package may solve the issue.</source>
+        <translation>卸载已安装的包可能解决这个问题。</translation>
+    </message>
+    <message>
+        <source>Do you want to uninstall the existing package?</source>
+        <translation>你想卸载已经存在的包吗？</translation>
     </message>
     <message>
         <source>Install failed</source>
@@ -1900,7 +1900,7 @@ in the system&apos;s browser for manual download.</source>
         <translation>安卓 NDK 列表：</translation>
     </message>
     <message>
-        <source>Android OpenSSL settings (Optional)</source>
+        <source>Android OpenSSL Settings (Optional)</source>
         <translation>安卓 OpenSSL 设置（可选）</translation>
     </message>
     <message>
@@ -2714,7 +2714,7 @@ Executable: %2</source>
         <translation>重复测试</translation>
     </message>
     <message>
-        <source>Run in parallel</source>
+        <source>Run in Parallel</source>
         <translation>并行运行</translation>
     </message>
     <message>
@@ -11600,7 +11600,7 @@ The built-in code model will handle highlighting, completion and so on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sessions with a single clangd instance</source>
+        <source>Sessions with a Single Clangd Instance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12511,7 +12511,7 @@ Flags: %3</source>
         <translation type="unfinished">添加#include %1</translation>
     </message>
     <message>
-        <source>Add forward declaration for %1</source>
+        <source>Add Forward Declaration for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12767,7 +12767,7 @@ Flags: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Value types:</source>
+        <source>Value Types:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -22584,7 +22584,7 @@ Would you like to overwrite them?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Make sure the build command&apos;s multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools)</source>
+        <source>Make sure the build command&apos;s multi-job parameter value is large enough (such as -j200 for the JOM or Make build tools).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -22704,7 +22704,7 @@ Would you like to overwrite them?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suppresses IncrediBuild&apos;s header in the build output</source>
+        <source>Suppresses IncrediBuild&apos;s header in the build output.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -22712,7 +22712,7 @@ Would you like to overwrite them?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support</source>
+        <source>Overrides the internal Incredibuild logging level for this build. Does not affect output or any user accessible logging. Used mainly to troubleshoot issues with the help of IncrediBuild support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -22732,7 +22732,7 @@ Would you like to overwrite them?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When specified, the execution will stop as soon as an error is encountered. This is the default behavior in &quot;Visual Studio&quot; builds, but not the default for &quot;Make and Build tools&quot; or &quot;Dev Tools&quot; builds</source>
+        <source>When specified, the execution will stop as soon as an error is encountered. This is the default behavior in &quot;Visual Studio&quot; builds, but not the default for &quot;Make and Build tools&quot; or &quot;Dev Tools&quot; builds.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -22740,7 +22740,7 @@ Would you like to overwrite them?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line</source>
+        <source>Add additional buildconsole arguments manually. The value of this field will be concatenated to the final buildconsole command line.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -28771,33 +28771,27 @@ Enable this if you plan to create 32-bit x86 binaries without using a dedicated
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path &quot;%1&quot; does not exist when checking Json wizard search paths.
-</source>
+        <source>Path &quot;%1&quot; does not exist when checking JSON wizard search paths.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Checking &quot;%1&quot; for %2.
-</source>
+        <source>Checking &quot;%1&quot; for %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4
-</source>
+        <source>* Failed to parse &quot;%1&quot;:%2:%3: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>* Did not find a JSON object in &quot;%1&quot;.
-</source>
+        <source>* Did not find a JSON object in &quot;%1&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>* Configuration found and parsed.
-</source>
+        <source>* Configuration found and parsed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>JsonWizard: &quot;%1&quot; not found
-</source>
+        <source>JsonWizard: &quot;%1&quot; not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -28817,8 +28811,7 @@ Enable this if you plan to create 32-bit x86 binaries without using a dedicated
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>* Version %1 not supported.
-</source>
+        <source>* Version %1 not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -42598,7 +42591,7 @@ Specifies how backspace interacts with indentation.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Line annotations</source>
+        <source>Line Annotations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -42985,7 +42978,7 @@ In addition, Shift+Enter inserts an escape character at the cursor position and
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Automatically insert matching characters</source>
+        <source>&amp;Automatically Insert Matching Characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -44781,7 +44774,7 @@ Will not be applied to whitespace in comments and strings.</source>
         <translation>重置</translation>
     </message>
     <message>
-        <source>Scanning scope</source>
+        <source>Scanning Scope</source>
         <translation>扫描范围</translation>
     </message>
     <message>
diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts
index d21d4d9bca2..7b5f5cfba84 100644
--- a/share/qtcreator/translations/qtcreator_zh_TW.ts
+++ b/share/qtcreator/translations/qtcreator_zh_TW.ts
@@ -1715,7 +1715,7 @@
         <translation>在適當的時候自動插入分號、結束的括號、大括號與引號等等。</translation>
     </message>
     <message>
-        <source>&amp;Automatically insert matching characters</source>
+        <source>&amp;Automatically Insert Matching Characters</source>
         <translation>自動插入對應的字元(&amp;A)</translation>
     </message>
     <message>
@@ -25376,7 +25376,7 @@ Influences the indentation of continuation lines.
         <translation>重置</translation>
     </message>
     <message>
-        <source>Scanning scope</source>
+        <source>Scanning Scope</source>
         <translation>掃描範圍</translation>
     </message>
     <message>
diff --git a/share/share.qbs b/share/share.qbs
index a2114dad2d2..745a8131a94 100644
--- a/share/share.qbs
+++ b/share/share.qbs
@@ -16,6 +16,8 @@ Product {
             "debugger/**/*",
             "designer/**/*",
             "glsl/**/*",
+            "jsonschemas/**/*",
+            "lua-plugins/**/*",
             "modeleditor/**/*",
             "qml/**/*",
             "qmldesigner/**/*",
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 792b3012f27..f537d8b9c4f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -36,6 +36,10 @@ install(EXPORT QtCreator
 )
 
 file(WRITE ${CMAKE_BINARY_DIR}/cmake/QtCreatorConfig.cmake "
+\# Qt version used for building
+\# A compatible Qt version should be used by externally built plugins
+set(QTC_QT_VERSION ${QT_VERSION})
+
 \# force plugins to same path naming conventions as Qt Creator
 \# otherwise plugins will not be found
 if(UNIX AND NOT APPLE)
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 42cb4f6a65e..ba15eef6856 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -91,8 +91,6 @@ const char PLUGINPATH_OPTION[] = "-pluginpath";
 const char LANGUAGE_OPTION[] = "-language";
 const char USER_LIBRARY_PATH_OPTION[] = "-user-library-path"; // hidden option for qtcreator.sh
 
-using PluginSpecSet = QVector<PluginSpec *>;
-
 // Helpers for displaying messages. Note that there is no console on Windows.
 
 // Format as <pre> HTML
@@ -179,8 +177,11 @@ static inline int askMsgSendFailed()
 
 static inline QStringList getPluginPaths()
 {
-    QStringList rc(QDir::cleanPath(QApplication::applicationDirPath()
-                                   + '/' + RELATIVE_PLUGIN_PATH));
+    QStringList rc;
+    rc << (QDir::cleanPath(QApplication::applicationDirPath()
+                                   + '/' + RELATIVE_PLUGIN_PATH))
+       << (QDir::cleanPath(QApplication::applicationDirPath()
+                           + '/' + RELATIVE_DATA_PATH + "/lua-plugins"));
     // Local plugin path: <localappdata>/plugins/<ideversion>
     //    where <localappdata> is e.g.
     //    "%LOCALAPPDATA%\QtProject\qtcreator" on Windows Vista and later
@@ -583,11 +584,6 @@ int main(int argc, char **argv)
         QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
     }
 
-    if (Utils::HostOsInfo::isLinuxHost() && !qEnvironmentVariableIsSet("GTK_THEME"))
-        // Work around QTCREATORBUG-28497:
-        // Prevent Qt's GTK3 platform theme plugin from enforcing a dark palette
-        qputenv("GTK_THEME", ":light");
-
 #if defined(QTC_FORCE_XCB)
     if (Utils::HostOsInfo::isLinuxHost() && !qEnvironmentVariableIsSet("QT_QPA_PLATFORM")) {
         // Enforce XCB on Linux/Gnome, if the user didn't override via QT_QPA_PLATFORM
@@ -684,10 +680,19 @@ int main(int argc, char **argv)
     setPixmapCacheLimit();
     loadFonts();
 
-    if (Utils::HostOsInfo::isWindowsHost() && !qFuzzyCompare(qApp->devicePixelRatio(), 1.0)
-        && !hasStyleOption) {
-        QApplication::setStyle(QLatin1String("fusion"));
+    if (Utils::HostOsInfo::isWindowsHost() && !hasStyleOption) {
+        // The Windows 11 default style (Qt 6.7) has major issues, therefore
+        // set the previous default style: "windowsvista"
+        // FIXME: check newer Qt Versions
+        QApplication::setStyle(QLatin1String("windowsvista"));
+
+        // On scaling different than 100% or 200% use the "fusion" style
+        qreal tmp;
+        const bool fractionalDpi = !qFuzzyIsNull(std::modf(qApp->devicePixelRatio(), &tmp));
+        if (fractionalDpi)
+            QApplication::setStyle(QLatin1String("fusion"));
     }
+
     const int threadCount = QThreadPool::globalInstance()->maxThreadCount();
     QThreadPool::globalInstance()->setMaxThreadCount(qMax(4, 2 * threadCount));
 
@@ -768,7 +773,7 @@ int main(int argc, char **argv)
     // Load
     const QStringList pluginPaths = getPluginPaths() + installPluginPaths
                                     + options.customPluginPaths;
-    PluginManager::setPluginPaths(pluginPaths);
+    PluginManager::setPluginPaths(Utils::transform(pluginPaths, &Utils::FilePath::fromUserInput));
     QMap<QString, QString> foundAppOptions;
     if (pluginArguments.size() > 1) {
         QMap<QString, bool> appOptions;
@@ -798,7 +803,7 @@ int main(int argc, char **argv)
             settingspath};
     PluginManager::setCreatorProcessData(processData);
 
-    const PluginSpecSet plugins = PluginManager::plugins();
+    const PluginSpecs plugins = PluginManager::plugins();
     PluginSpec *coreplugin = nullptr;
     for (PluginSpec *spec : plugins) {
         if (spec->name() == QLatin1String(corePluginNameC)) {
diff --git a/src/libs/3rdparty/CMakeLists.txt b/src/libs/3rdparty/CMakeLists.txt
index 8445a0d01b1..364c9a425eb 100644
--- a/src/libs/3rdparty/CMakeLists.txt
+++ b/src/libs/3rdparty/CMakeLists.txt
@@ -4,6 +4,8 @@ add_subdirectory(libvterm)
 add_subdirectory(libptyqt)
 add_subdirectory(qrcodegen)
 add_subdirectory(qtkeychain)
+add_subdirectory(lua)
+add_subdirectory(sol2)
 
 if(WIN32)
     add_subdirectory(winpty)
diff --git a/src/libs/3rdparty/cplusplus/AST.h b/src/libs/3rdparty/cplusplus/AST.h
index 3f48e192b93..085fff92bdb 100644
--- a/src/libs/3rdparty/cplusplus/AST.h
+++ b/src/libs/3rdparty/cplusplus/AST.h
@@ -99,8 +99,8 @@ public:
                 iter = iter->next;
             return *this;
         }
-        bool operator==(const ListIterator &other) { return iter == other.iter; }
-        bool operator!=(const ListIterator &other) { return iter != other.iter; }
+        bool operator==(const ListIterator &other) const { return iter == other.iter; }
+        bool operator!=(const ListIterator &other) const { return iter != other.iter; }
     };
     ListIterator begin() { return {this}; }
     ListIterator end() { return {nullptr}; }
diff --git a/src/libs/3rdparty/cplusplus/TranslationUnit.cpp b/src/libs/3rdparty/cplusplus/TranslationUnit.cpp
index e680ee2660e..3e51352b147 100644
--- a/src/libs/3rdparty/cplusplus/TranslationUnit.cpp
+++ b/src/libs/3rdparty/cplusplus/TranslationUnit.cpp
@@ -27,7 +27,7 @@
 #include "Literals.h"
 #include "DiagnosticClient.h"
 
-#include "cppassert.h"
+#include <utils/qtcassert.h>
 #include <utils/textutils.h>
 
 #include <stack>
@@ -88,7 +88,7 @@ int TranslationUnit::sourceLength() const
 
 void TranslationUnit::setSource(const char *source, int size)
 {
-    CPP_CHECK(source);
+    QTC_ASSERT(source, return);
     _firstSourceChar = source;
     _lastSourceChar = source + size;
 }
@@ -191,6 +191,8 @@ void TranslationUnit::tokenize()
     int lineColumnIdx = 0;
 
     Token tk;
+    int macroOffset = -1;
+    int macroLength = -1;
     do {
         lex(&tk);
 
@@ -209,17 +211,12 @@ recognize:
                         lex(&tk);
 
                         // Gather where the expansion happens and its length.
-                        //int macroOffset = static_cast<int>(strtoul(tk.spell(), 0, 0));
+                        macroOffset = static_cast<int>(strtoul(tk.spell(), 0, 0));
                         lex(&tk);
                         lex(&tk); // Skip the separating comma
-                        //int macroLength = static_cast<int>(strtoul(tk.spell(), 0, 0));
+                        macroLength = static_cast<int>(strtoul(tk.spell(), 0, 0));
                         lex(&tk);
 
-                        // NOTE: We are currently not using the macro offset and length. They
-                        // are kept here for now because of future use.
-                        //Q_UNUSED(macroOffset)
-                        //Q_UNUSED(macroLength)
-
                         // Now we need to gather the real line and columns from the upcoming
                         // tokens. But notice this is only relevant for tokens which are expanded
                         // but not generated.
@@ -307,6 +304,11 @@ recognize:
         tk.f.generated = currentGenerated;
 
         _tokens->push_back(tk);
+
+        if (currentExpanded) {
+            QTC_ASSERT(macroOffset != -1 && macroLength != -1, continue);
+            _expansionPositions[int(_tokens->size()) - 1] = std::make_pair(macroOffset, macroLength);
+        }
     } while (tk.kind());
 
     for (; ! braces.empty(); braces.pop()) {
@@ -462,6 +464,14 @@ int TranslationUnit::getTokenEndPositionInDocument(const Token &token,
     return Utils::Text::positionInText(doc, line, column);
 }
 
+std::pair<int, int> TranslationUnit::getExpansionPosition(int tokenIndex) const
+{
+    QTC_ASSERT(tokenIndex < int(_tokens->size()) && tokenAt(tokenIndex).generated(), return {});
+    const auto it = _expansionPositions.find(tokenIndex);
+    QTC_ASSERT(it != _expansionPositions.end(), return {});
+    return it->second;
+}
+
 void TranslationUnit::getPosition(int utf16charOffset,
                                   int *line,
                                   int *column,
diff --git a/src/libs/3rdparty/cplusplus/TranslationUnit.h b/src/libs/3rdparty/cplusplus/TranslationUnit.h
index 40f79d0091d..1332549ffde 100644
--- a/src/libs/3rdparty/cplusplus/TranslationUnit.h
+++ b/src/libs/3rdparty/cplusplus/TranslationUnit.h
@@ -133,6 +133,7 @@ public:
                              const StringLiteral **fileName = nullptr) const;
     int getTokenPositionInDocument(const Token token, const QTextDocument *doc) const;
     int getTokenEndPositionInDocument(const Token &token, const QTextDocument *doc) const;
+    std::pair<int, int> getExpansionPosition(int tokenIndex) const;
 
     void pushLineOffset(int offset);
     void pushPreprocessorLine(int utf16charOffset,
@@ -183,6 +184,11 @@ private:
     std::vector<Token> *_comments;
     std::vector<int> _lineOffsets;
     std::vector<PPLine> _ppLines;
+
+    // Offset and length. Note that in contrast to token offsets, this is a raw file offset
+    // with no preprocessor prefix.
+    std::unordered_map<int, std::pair<int, int>> _expansionPositions;
+
     typedef std::unordered_map<unsigned, std::pair<int, int> > TokenLineColumn;
     TokenLineColumn _expandedLineColumn;
     MemoryPool *_pool;
diff --git a/src/libs/3rdparty/libptyqt/LICENSE-CONPTY b/src/libs/3rdparty/libptyqt/LICENSE-CONPTY
new file mode 100644
index 00000000000..8cb179cdb69
--- /dev/null
+++ b/src/libs/3rdparty/libptyqt/LICENSE-CONPTY
@@ -0,0 +1,21 @@
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/src/libs/3rdparty/libptyqt/conptyprocess.cpp b/src/libs/3rdparty/libptyqt/conptyprocess.cpp
index 6464dbeb347..c957e0bdd9e 100644
--- a/src/libs/3rdparty/libptyqt/conptyprocess.cpp
+++ b/src/libs/3rdparty/libptyqt/conptyprocess.cpp
@@ -10,8 +10,740 @@
 
 #include <qt_windows.h>
 
+#ifdef QTCREATOR_PCH_H
+#ifndef IN
+#define IN
+#endif
+#ifndef OUT
+#define OUT
+#endif
+#endif
+
+#include <winternl.h>
+
 #define READ_INTERVAL_MSEC 500
 
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#define FILE_SYNCHRONOUS_IO_NONALERT 0x00000020
+
+////////////////////////////////////////////////////////////////////////////////////////
+/// Ported from wil/result_macros.h
+
+#define FAILED_NTSTATUS(status) (((NTSTATUS)(status)) < 0)
+#define SUCCEEDED_NTSTATUS(status) (((NTSTATUS)(status)) >= 0)
+
+#define RETURN_IF_NTSTATUS_FAILED(call) if(FAILED_NTSTATUS(call)) return E_FAIL;
+#define RETURN_IF_WIN32_BOOL_FALSE(call) if((call) == FALSE) return E_FAIL;
+#define RETURN_IF_NULL_ALLOC(call) if((call) == nullptr) return E_OUTOFMEMORY;
+#define RETURN_IF_FAILED(call) {HRESULT hr = (call); if(hr != S_OK)return hr; }
+
+//! Set zero or more bitflags specified by `flags` in the variable `var`.
+#define WI_SetAllFlags(var, flags) ((var) |= (flags))
+//! Set a single compile-time constant `flag` in the variable `var`.
+#define WI_SetFlag(var, flag) WI_SetAllFlags(var,flag)
+
+////////////////////////////////////////////////////////////////////////////////////////
+/// Ported from wil
+class unique_hmodule : public std::unique_ptr<std::remove_pointer_t<HMODULE>, decltype(&FreeLibrary)>
+{
+public:
+  unique_hmodule() : std::unique_ptr<std::remove_pointer_t<HMODULE>, decltype(&FreeLibrary)>(nullptr, FreeLibrary) {}
+  unique_hmodule(HMODULE module) : std::unique_ptr<std::remove_pointer_t<HMODULE>, decltype(&FreeLibrary)>(module, FreeLibrary) {}
+};
+
+class unique_handle : public std::unique_ptr<std::remove_pointer_t<HANDLE>, decltype(&CloseHandle)>
+{
+public:
+  unique_handle() : std::unique_ptr<std::remove_pointer_t<HANDLE>, decltype(&CloseHandle)>(nullptr, CloseHandle) {}
+  unique_handle(HANDLE module) : std::unique_ptr<std::remove_pointer_t<HANDLE>, decltype(&CloseHandle)>(module, CloseHandle) {}
+
+
+  class AddressOf {
+  public:
+    AddressOf(unique_handle &h) : m_h(h) {}
+    ~AddressOf() {
+      m_h.reset(m_dest);
+    }
+
+    operator PHANDLE() {return &m_dest;}
+
+    HANDLE m_dest{INVALID_HANDLE_VALUE};
+    unique_handle &m_h;
+  };
+
+  AddressOf addressof() {
+    return AddressOf(*this);
+  }
+};
+
+class unique_process_information : public PROCESS_INFORMATION
+{
+public:
+  unique_process_information() {
+   hProcess = 0;
+   hThread = 0;
+   dwProcessId = 0;
+   dwThreadId = 0;
+  }
+  ~unique_process_information() {
+    if (hProcess)
+    {
+        CloseHandle(hProcess);
+    }
+
+    if (hThread)
+    {
+        CloseHandle(hThread);
+    }
+  }
+
+  PROCESS_INFORMATION* addressof() {
+    return this;
+  }
+};
+
+template <typename TLambda>
+class on_scope_exit {
+public:
+  TLambda m_func;
+  bool m_call{true};
+  on_scope_exit(TLambda &&func) : m_func(std::move(func)) {}
+  ~on_scope_exit() {if(m_call)m_func();}
+
+  void release() {m_call = false;}
+};
+
+template <typename TLambda>
+[[nodiscard]] inline auto scope_exit(TLambda&& lambda) noexcept
+{
+    return on_scope_exit<TLambda>(std::forward<TLambda>(lambda));
+}
+
+////////////////////////////////////////////////////////////////////////////////////////
+
+
+
+class WinNTControl
+{
+public:
+    [[nodiscard]] static NTSTATUS NtOpenFile(_Out_ PHANDLE FileHandle,
+                                             _In_ ACCESS_MASK DesiredAccess,
+                                             _In_ POBJECT_ATTRIBUTES ObjectAttributes,
+                                             _Out_ PIO_STATUS_BLOCK IoStatusBlock,
+                                             _In_ ULONG ShareAccess,
+                                             _In_ ULONG OpenOptions);
+
+private:
+    WinNTControl();
+
+    WinNTControl(WinNTControl const&) = delete;
+    void operator=(WinNTControl const&) = delete;
+
+    static WinNTControl& GetInstance();
+
+    unique_hmodule const _NtDllDll;
+
+    typedef NTSTATUS(NTAPI* PfnNtOpenFile)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, PIO_STATUS_BLOCK, ULONG, ULONG);
+    PfnNtOpenFile const _NtOpenFile;
+};
+
+WinNTControl::WinNTControl() :
+    // NOTE: Use LoadLibraryExW with LOAD_LIBRARY_SEARCH_SYSTEM32 flag below to avoid unneeded directory traversal.
+    //       This has triggered CPG boot IO warnings in the past.
+    _NtDllDll(/*THROW_LAST_ERROR_IF_NULL*/(LoadLibraryExW(L"ntdll.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32))),
+    _NtOpenFile(reinterpret_cast<PfnNtOpenFile>(/*THROW_LAST_ERROR_IF_NULL*/(GetProcAddress(_NtDllDll.get(), "NtOpenFile"))))
+{
+}
+
+// Routine Description:
+// - Provides the singleton pattern for WinNT control. Stores the single instance and returns it.
+// Arguments:
+// - <none>
+// Return Value:
+// - Reference to the single instance of NTDLL.dll wrapped methods.
+WinNTControl& WinNTControl::GetInstance()
+{
+    static WinNTControl Instance;
+    return Instance;
+}
+
+// Routine Description:
+// - Provides access to the NtOpenFile method documented at:
+//   https://msdn.microsoft.com/en-us/library/bb432381(v=vs.85).aspx
+// Arguments:
+// - See definitions at MSDN
+// Return Value:
+// - See definitions at MSDN
+[[nodiscard]] NTSTATUS WinNTControl::NtOpenFile(_Out_ PHANDLE FileHandle,
+                                                _In_ ACCESS_MASK DesiredAccess,
+                                                _In_ POBJECT_ATTRIBUTES ObjectAttributes,
+                                                _Out_ PIO_STATUS_BLOCK IoStatusBlock,
+                                                _In_ ULONG ShareAccess,
+                                                _In_ ULONG OpenOptions)
+{
+  return GetInstance()._NtOpenFile(FileHandle, DesiredAccess, ObjectAttributes, IoStatusBlock, ShareAccess, OpenOptions);
+}
+
+namespace DeviceHandle {
+
+/*++
+Routine Description:
+- This routine opens a handle to the console driver.
+
+Arguments:
+- Handle - Receives the handle.
+- DeviceName - Supplies the name to be used to open the console driver.
+- DesiredAccess - Supplies the desired access mask.
+- Parent - Optionally supplies the parent object.
+- Inheritable - Supplies a boolean indicating if the new handle is to be made inheritable.
+- OpenOptions - Supplies the open options to be passed to NtOpenFile. A common
+                option for clients is FILE_SYNCHRONOUS_IO_NONALERT, to make the handle
+                synchronous.
+
+Return Value:
+- NTSTATUS indicating if the handle was successfully created.
+--*/
+[[nodiscard]] NTSTATUS
+_CreateHandle(
+    _Out_ PHANDLE Handle,
+    _In_ PCWSTR DeviceName,
+    _In_ ACCESS_MASK DesiredAccess,
+    _In_opt_ HANDLE Parent,
+    _In_ BOOLEAN Inheritable,
+    _In_ ULONG OpenOptions)
+
+{
+    ULONG Flags = OBJ_CASE_INSENSITIVE;
+
+    if (Inheritable)
+    {
+        WI_SetFlag(Flags, OBJ_INHERIT);
+    }
+
+    UNICODE_STRING Name;
+#pragma warning(suppress : 26492) // const_cast is prohibited, but we can't avoid it for filling UNICODE_STRING.
+    Name.Buffer = const_cast<wchar_t*>(DeviceName);
+    //Name.Length = gsl::narrow_cast<USHORT>((wcslen(DeviceName) * sizeof(wchar_t)));
+    Name.Length = static_cast<unsigned short>((wcslen(DeviceName) * sizeof(wchar_t)));
+    Name.MaximumLength = Name.Length + sizeof(wchar_t);
+
+    OBJECT_ATTRIBUTES ObjectAttributes;
+#pragma warning(suppress : 26477) // The QOS part of this macro in the define is 0. Can't fix that.
+    InitializeObjectAttributes(&ObjectAttributes,
+                               &Name,
+                               Flags,
+                               Parent,
+                               nullptr);
+
+    IO_STATUS_BLOCK IoStatus;
+    return WinNTControl::NtOpenFile(Handle,
+                                    DesiredAccess,
+                                    &ObjectAttributes,
+                                    &IoStatus,
+                                    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+                                    OpenOptions);
+}
+
+/*++
+Routine Description:
+- This routine creates a handle to an input or output client of the given
+  server. No control io is sent to the server as this request must be coming
+  from the server itself.
+
+Arguments:
+- Handle - Receives a handle to the new client.
+- ServerHandle - Supplies a handle to the server to which to attach the
+                 newly created client.
+- Name - Supplies the name of the client object.
+- Inheritable - Supplies a flag indicating if the handle must be inheritable.
+
+Return Value:
+- NTSTATUS indicating if the client was successfully created.
+--*/
+[[nodiscard]] NTSTATUS
+CreateClientHandle(
+    _Out_ PHANDLE Handle,
+    _In_ HANDLE ServerHandle,
+    _In_ PCWSTR Name,
+    _In_ BOOLEAN Inheritable)
+{
+    return _CreateHandle(Handle,
+                         Name,
+                         GENERIC_WRITE | GENERIC_READ | SYNCHRONIZE,
+                         ServerHandle,
+                         Inheritable,
+                         FILE_SYNCHRONOUS_IO_NONALERT);
+}
+
+/*++
+Routine Description:
+- This routine creates a new server on the driver and returns a handle to it.
+
+Arguments:
+- Handle - Receives a handle to the new server.
+- Inheritable - Supplies a flag indicating if the handle must be inheritable.
+
+Return Value:
+- NTSTATUS indicating if the console was successfully created.
+--*/
+[[nodiscard]] NTSTATUS
+CreateServerHandle(
+    _Out_ PHANDLE Handle,
+    _In_ BOOLEAN Inheritable)
+{
+    return _CreateHandle(Handle,
+                         L"\\Device\\ConDrv\\Server",
+                         GENERIC_ALL,
+                         nullptr,
+                         Inheritable,
+                         0);
+}
+
+
+} // namespace DeviceHandle
+
+[[nodiscard]] static inline NTSTATUS CreateClientHandle(PHANDLE Handle, HANDLE ServerHandle, PCWSTR Name, BOOLEAN Inheritable)
+{
+    return DeviceHandle::CreateClientHandle(Handle, ServerHandle, Name, Inheritable);
+}
+
+[[nodiscard]] static inline NTSTATUS CreateServerHandle(PHANDLE Handle, BOOLEAN Inheritable)
+{
+    return DeviceHandle::CreateServerHandle(Handle, Inheritable);
+}
+
+typedef struct _PseudoConsole
+{
+    HANDLE hSignal;
+    HANDLE hPtyReference;
+    HANDLE hConPtyProcess;
+} PseudoConsole;
+
+// Signals
+// These are not defined publicly, but are used for controlling the conpty via
+//      the signal pipe.
+#define PTY_SIGNAL_CLEAR_WINDOW (2u)
+#define PTY_SIGNAL_RESIZE_WINDOW (8u)
+
+// CreatePseudoConsole Flags
+// The other flag (PSEUDOCONSOLE_INHERIT_CURSOR) is actually defined in consoleapi.h in the OS repo
+#ifndef PSEUDOCONSOLE_INHERIT_CURSOR
+#define PSEUDOCONSOLE_INHERIT_CURSOR (0x1)
+#endif
+#define PSEUDOCONSOLE_RESIZE_QUIRK (0x2)
+#define PSEUDOCONSOLE_WIN32_INPUT_MODE (0x4)
+
+static QString qSystemDirectory()
+{
+    static const QString result = []() -> QString {
+        QVarLengthArray<wchar_t, MAX_PATH> fullPath = {};
+        UINT retLen = ::GetSystemDirectoryW(fullPath.data(), MAX_PATH);
+        if (retLen > MAX_PATH) {
+            fullPath.resize(retLen);
+            retLen = ::GetSystemDirectoryW(fullPath.data(), retLen);
+        }
+        // in some rare cases retLen might be 0
+        return QString::fromWCharArray(fullPath.constData(), int(retLen));
+    }();
+    return result;
+}
+
+// Function Description:
+// - Returns the path to conhost.exe as a process heap string.
+static QString _InboxConsoleHostPath()
+{
+    return QString("\\\\?\\%1\\conhost.exe").arg(qSystemDirectory());
+}
+
+// Function Description:
+// - Returns the path to either conhost.exe or the side-by-side OpenConsole, depending on whether this
+//   module is building with Windows and OpenConsole could be found.
+// Return Value:
+// - A pointer to permanent storage containing the path to the console host.
+static const wchar_t* _ConsoleHostPath()
+{
+    // Use the magic of magic statics to only calculate this once.
+    static QString consoleHostPath = _InboxConsoleHostPath();
+    return reinterpret_cast<const wchar_t*>(consoleHostPath.utf16());
+}
+
+static bool _HandleIsValid(HANDLE h) noexcept
+{
+    return (h != INVALID_HANDLE_VALUE) && (h != nullptr);
+}
+
+
+
+HRESULT _CreatePseudoConsole(const HANDLE hToken,
+                             const COORD size,
+                             const HANDLE hInput,
+                             const HANDLE hOutput,
+                             const DWORD dwFlags,
+                             _Inout_ PseudoConsole* pPty)
+{
+    if (pPty == nullptr)
+    {
+        return E_INVALIDARG;
+    }
+    if (size.X == 0 || size.Y == 0)
+    {
+        return E_INVALIDARG;
+    }
+
+    unique_handle serverHandle;
+    RETURN_IF_NTSTATUS_FAILED(CreateServerHandle(serverHandle.addressof(), TRUE));
+
+    unique_handle signalPipeConhostSide;
+    unique_handle signalPipeOurSide;
+
+    SECURITY_ATTRIBUTES sa;
+    sa.nLength = sizeof(sa);
+    // Mark inheritable for signal handle when creating. It'll have the same value on the other side.
+    sa.bInheritHandle = FALSE;
+    sa.lpSecurityDescriptor = nullptr;
+
+    RETURN_IF_WIN32_BOOL_FALSE(CreatePipe(signalPipeConhostSide.addressof(), signalPipeOurSide.addressof(), &sa, 0));
+    RETURN_IF_WIN32_BOOL_FALSE(SetHandleInformation(signalPipeConhostSide.get(), HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT));
+
+    // GH4061: Ensure that the path to executable in the format is escaped so C:\Program.exe cannot collide with C:\Program Files
+    const wchar_t* pwszFormat = L"\"%s\" --headless %s%s%s--width %hu --height %hu --signal 0x%x --server 0x%x";
+    // This is plenty of space to hold the formatted string
+    wchar_t cmd[MAX_PATH]{};
+    const BOOL bInheritCursor = (dwFlags & PSEUDOCONSOLE_INHERIT_CURSOR) == PSEUDOCONSOLE_INHERIT_CURSOR;
+    const BOOL bResizeQuirk = (dwFlags & PSEUDOCONSOLE_RESIZE_QUIRK) == PSEUDOCONSOLE_RESIZE_QUIRK;
+    const BOOL bWin32InputMode = (dwFlags & PSEUDOCONSOLE_WIN32_INPUT_MODE) == PSEUDOCONSOLE_WIN32_INPUT_MODE;
+    swprintf_s(cmd,
+               MAX_PATH,
+               pwszFormat,
+               _ConsoleHostPath(),
+               bInheritCursor ? L"--inheritcursor " : L"",
+               bWin32InputMode ? L"--win32input " : L"",
+               bResizeQuirk ? L"--resizeQuirk " : L"",
+               size.X,
+               size.Y,
+               signalPipeConhostSide.get(),
+               serverHandle.get());
+
+    STARTUPINFOEXW siEx{ 0 };
+    siEx.StartupInfo.cb = sizeof(STARTUPINFOEXW);
+    siEx.StartupInfo.hStdInput = hInput;
+    siEx.StartupInfo.hStdOutput = hOutput;
+    siEx.StartupInfo.hStdError = hOutput;
+    siEx.StartupInfo.dwFlags |= STARTF_USESTDHANDLES;
+
+    // Only pass the handles we actually want the conhost to know about to it:
+    const size_t INHERITED_HANDLES_COUNT = 4;
+    HANDLE inheritedHandles[INHERITED_HANDLES_COUNT];
+    inheritedHandles[0] = serverHandle.get();
+    inheritedHandles[1] = hInput;
+    inheritedHandles[2] = hOutput;
+    inheritedHandles[3] = signalPipeConhostSide.get();
+
+    // Get the size of the attribute list. We need one attribute, the handle list.
+    SIZE_T listSize = 0;
+    InitializeProcThreadAttributeList(nullptr, 1, 0, &listSize);
+
+    // I have to use a HeapAlloc here because kernelbase can't link new[] or delete[]
+    PPROC_THREAD_ATTRIBUTE_LIST attrList = static_cast<PPROC_THREAD_ATTRIBUTE_LIST>(HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, listSize));
+    RETURN_IF_NULL_ALLOC(attrList);
+    auto attrListDelete = scope_exit([&]() noexcept {
+        HeapFree(GetProcessHeap(), 0, attrList);
+    });
+
+    siEx.lpAttributeList = attrList;
+    RETURN_IF_WIN32_BOOL_FALSE(InitializeProcThreadAttributeList(siEx.lpAttributeList, 1, 0, &listSize));
+    // Set cleanup data for ProcThreadAttributeList when successful.
+    auto cleanupProcThreadAttribute = scope_exit([&]() noexcept {
+        DeleteProcThreadAttributeList(siEx.lpAttributeList);
+    });
+    RETURN_IF_WIN32_BOOL_FALSE(UpdateProcThreadAttribute(siEx.lpAttributeList,
+                                                         0,
+                                                         PROC_THREAD_ATTRIBUTE_HANDLE_LIST,
+                                                         inheritedHandles,
+                                                         (INHERITED_HANDLES_COUNT * sizeof(HANDLE)),
+                                                         nullptr,
+                                                         nullptr));
+    unique_process_information pi;
+    { // wow64 disabled filesystem redirection scope
+        if (hToken == INVALID_HANDLE_VALUE || hToken == nullptr)
+        {
+            // Call create process
+            RETURN_IF_WIN32_BOOL_FALSE(CreateProcessW(_ConsoleHostPath(),
+                                                      cmd,
+                                                      nullptr,
+                                                      nullptr,
+                                                      TRUE,
+                                                      EXTENDED_STARTUPINFO_PRESENT,
+                                                      nullptr,
+                                                      nullptr,
+                                                      &siEx.StartupInfo,
+                                                      pi.addressof()));
+        }
+        else
+        {
+            // Call create process
+            RETURN_IF_WIN32_BOOL_FALSE(CreateProcessAsUserW(hToken,
+                                                            _ConsoleHostPath(),
+                                                            cmd,
+                                                            nullptr,
+                                                            nullptr,
+                                                            TRUE,
+                                                            EXTENDED_STARTUPINFO_PRESENT,
+                                                            nullptr,
+                                                            nullptr,
+                                                            &siEx.StartupInfo,
+                                                            pi.addressof()));
+        }
+    }
+
+    // Move the process handle out of the PROCESS_INFORMATION into out Pseudoconsole
+    pPty->hConPtyProcess = pi.hProcess;
+    pi.hProcess = nullptr;
+
+    RETURN_IF_NTSTATUS_FAILED(CreateClientHandle(&pPty->hPtyReference,
+                                                 serverHandle.get(),
+                                                 L"\\Reference",
+                                                 FALSE));
+
+    pPty->hSignal = signalPipeOurSide.release();
+
+    return S_OK;
+}
+
+// Function Description:
+// - Resizes the conpty
+// Arguments:
+// - hSignal: A signal pipe as returned by CreateConPty.
+// - size: The new dimensions of the conpty, in characters.
+// Return Value:
+// - S_OK if the call succeeded, else an appropriate HRESULT for failing to
+//      write the resize message to the pty.
+HRESULT _ResizePseudoConsole(_In_ const PseudoConsole* const pPty, _In_ const COORD size)
+{
+    if (pPty == nullptr || size.X < 0 || size.Y < 0)
+    {
+        return E_INVALIDARG;
+    }
+
+    unsigned short signalPacket[3];
+    signalPacket[0] = PTY_SIGNAL_RESIZE_WINDOW;
+    signalPacket[1] = size.X;
+    signalPacket[2] = size.Y;
+
+    const BOOL fSuccess = WriteFile(pPty->hSignal, signalPacket, sizeof(signalPacket), nullptr, nullptr);
+    return fSuccess ? S_OK : HRESULT_FROM_WIN32(GetLastError());
+}
+
+// Function Description:
+// - Clears the conpty
+// Arguments:
+// - hSignal: A signal pipe as returned by CreateConPty.
+// Return Value:
+// - S_OK if the call succeeded, else an appropriate HRESULT for failing to
+//      write the clear message to the pty.
+HRESULT _ClearPseudoConsole(_In_ const PseudoConsole* const pPty)
+{
+    if (pPty == nullptr)
+    {
+        return E_INVALIDARG;
+    }
+
+    unsigned short signalPacket[1];
+    signalPacket[0] = PTY_SIGNAL_CLEAR_WINDOW;
+
+    const BOOL fSuccess = WriteFile(pPty->hSignal, signalPacket, sizeof(signalPacket), nullptr, nullptr);
+    return fSuccess ? S_OK : HRESULT_FROM_WIN32(GetLastError());
+}
+
+// Function Description:
+// - This closes each of the members of a PseudoConsole. It does not free the
+//      data associated with the PseudoConsole. This is helpful for testing,
+//      where we might stack allocate a PseudoConsole (instead of getting a
+//      HPCON via the API).
+// Arguments:
+// - pPty: A pointer to a PseudoConsole struct.
+// Return Value:
+// - <none>
+void _ClosePseudoConsoleMembers(_In_ PseudoConsole* pPty)
+{
+    if (pPty != nullptr)
+    {
+        // See MSFT:19918626
+        // First break the signal pipe - this will trigger conhost to tear itself down
+        if (_HandleIsValid(pPty->hSignal))
+        {
+            CloseHandle(pPty->hSignal);
+            pPty->hSignal = nullptr;
+        }
+        // Then, wait on the conhost process before killing it.
+        // We do this to make sure the conhost finishes flushing any output it
+        //      has yet to send before we hard kill it.
+        if (_HandleIsValid(pPty->hConPtyProcess))
+        {
+            // If the conhost is already dead, then that's fine. Presumably
+            //      it's finished flushing it's output already.
+            DWORD dwExit = 0;
+            // If GetExitCodeProcess failed, it's likely conhost is already dead
+            //      If so, skip waiting regardless of whatever error
+            //      GetExitCodeProcess returned.
+            //      We'll just go straight to killing conhost.
+            if (GetExitCodeProcess(pPty->hConPtyProcess, &dwExit) && dwExit == STILL_ACTIVE)
+            {
+                WaitForSingleObject(pPty->hConPtyProcess, INFINITE);
+            }
+
+            TerminateProcess(pPty->hConPtyProcess, 0);
+            CloseHandle(pPty->hConPtyProcess);
+            pPty->hConPtyProcess = nullptr;
+        }
+        // Then take care of the reference handle.
+        // TODO GH#1810: Closing the reference handle late leaves conhost thinking
+        // that we have an outstanding connected client.
+        if (_HandleIsValid(pPty->hPtyReference))
+        {
+            CloseHandle(pPty->hPtyReference);
+            pPty->hPtyReference = nullptr;
+        }
+    }
+}
+
+// Function Description:
+// - This closes each of the members of a PseudoConsole, and HeapFree's the
+//      memory allocated to it. This should be used to cleanup any
+//      PseudoConsoles that were created with CreatePseudoConsole.
+// Arguments:
+// - pPty: A pointer to a PseudoConsole struct.
+// Return Value:
+// - <none>
+VOID _ClosePseudoConsole(_In_ PseudoConsole* pPty)
+{
+    if (pPty != nullptr)
+    {
+        _ClosePseudoConsoleMembers(pPty);
+        HeapFree(GetProcessHeap(), 0, pPty);
+    }
+}
+
+extern "C" HRESULT ConptyCreatePseudoConsoleAsUser(_In_ HANDLE hToken,
+                                                   _In_ COORD size,
+                                                   _In_ HANDLE hInput,
+                                                   _In_ HANDLE hOutput,
+                                                   _In_ DWORD dwFlags,
+                                                   _Out_ HPCON* phPC)
+{
+    if (phPC == nullptr)
+    {
+        return E_INVALIDARG;
+    }
+    *phPC = nullptr;
+    if ((!_HandleIsValid(hInput)) && (!_HandleIsValid(hOutput)))
+    {
+        return E_INVALIDARG;
+    }
+
+    PseudoConsole* pPty = (PseudoConsole*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PseudoConsole));
+    RETURN_IF_NULL_ALLOC(pPty);
+    auto cleanupPty = scope_exit([&]() noexcept {
+        _ClosePseudoConsole(pPty);
+    });
+
+    unique_handle duplicatedInput;
+    unique_handle duplicatedOutput;
+    RETURN_IF_WIN32_BOOL_FALSE(DuplicateHandle(GetCurrentProcess(), hInput, GetCurrentProcess(), duplicatedInput.addressof(), 0, TRUE, DUPLICATE_SAME_ACCESS));
+    RETURN_IF_WIN32_BOOL_FALSE(DuplicateHandle(GetCurrentProcess(), hOutput, GetCurrentProcess(), duplicatedOutput.addressof(), 0, TRUE, DUPLICATE_SAME_ACCESS));
+
+    RETURN_IF_FAILED(_CreatePseudoConsole(hToken, size, duplicatedInput.get(), duplicatedOutput.get(), dwFlags, pPty));
+
+    *phPC = (HPCON)pPty;
+    cleanupPty.release();
+
+    return S_OK;
+}
+
+// These functions are defined in the console l1 apiset, which is generated from
+//      the consoleapi.apx file in minkernel\apiset\libs\Console.
+
+// Function Description:
+// Creates a "Pseudo-console" (conpty) with dimensions (in characters)
+//      provided by the `size` parameter. The caller should provide two handles:
+// - `hInput` is used for writing input to the pty, encoded as UTF-8 and VT sequences.
+// - `hOutput` is used for reading the output of the pty, encoded as UTF-8 and VT sequences.
+// Once the call completes, `phPty` will receive a token value to identify this
+//      conpty object. This value should be used in conjunction with the other
+//      Pseudoconsole API's.
+// `dwFlags` is used to specify optional behavior to the created pseudoconsole.
+// The flags can be combinations of the following values:
+//  INHERIT_CURSOR: This will cause the created conpty to attempt to inherit the
+//      cursor position of the parent terminal application. This can be useful
+//      for applications like `ssh`, where ssh (currently running in a terminal)
+//      might want to create a pseudoterminal session for an child application
+//      and the child inherit the cursor position of ssh.
+//      The created conpty will immediately emit a "Device Status Request" VT
+//      sequence to hOutput, that should be replied to on hInput in the format
+//      "\x1b[<r>;<c>R", where `<r>` is the row and `<c>` is the column of the
+//      cursor position.
+//      This requires a cooperating terminal application - if a caller does not
+//      reply to this message, the conpty will not process any input until it
+//      does. Most *nix terminals and the Windows Console (after Windows 10
+//      Anniversary Update) will be able to handle such a message.
+
+extern "C" HRESULT WINAPI ConptyCreatePseudoConsole(_In_ COORD size,
+                                                    _In_ HANDLE hInput,
+                                                    _In_ HANDLE hOutput,
+                                                    _In_ DWORD dwFlags,
+                                                    _Out_ HPCON* phPC)
+{
+    return ConptyCreatePseudoConsoleAsUser(INVALID_HANDLE_VALUE, size, hInput, hOutput, dwFlags, phPC);
+}
+
+// Function Description:
+// Resizes the given conpty to the specified size, in characters.
+extern "C" HRESULT WINAPI ConptyResizePseudoConsole(_In_ HPCON hPC, _In_ COORD size)
+{
+    const PseudoConsole* const pPty = (PseudoConsole*)hPC;
+    HRESULT hr = pPty == nullptr ? E_INVALIDARG : S_OK;
+    if (SUCCEEDED(hr))
+    {
+        hr = _ResizePseudoConsole(pPty, size);
+    }
+    return hr;
+}
+
+// Function Description:
+// - Clear the contents of the conpty buffer, leaving the cursor row at the top
+//   of the viewport.
+// - This is used exclusively by ConPTY to support GH#1193, GH#1882. This allows
+//   a terminal to clear the contents of the ConPTY buffer, which is important
+//   if the user would like to be able to clear the terminal-side buffer.
+extern "C" HRESULT WINAPI ConptyClearPseudoConsole(_In_ HPCON hPC)
+{
+    const PseudoConsole* const pPty = (PseudoConsole*)hPC;
+    HRESULT hr = pPty == nullptr ? E_INVALIDARG : S_OK;
+    if (SUCCEEDED(hr))
+    {
+        hr = _ClearPseudoConsole(pPty);
+    }
+    return hr;
+}
+
+// Function Description:
+// Closes the conpty and all associated state.
+// Client applications attached to the conpty will also behave as though the
+//      console window they were running in was closed.
+// This can fail if the conhost hosting the pseudoconsole failed to be
+//      terminated, or if the pseudoconsole was already terminated.
+extern "C" VOID WINAPI ConptyClosePseudoConsole(_In_ HPCON hPC)
+{
+    PseudoConsole* const pPty = (PseudoConsole*)hPC;
+    if (pPty != nullptr)
+    {
+        _ClosePseudoConsole(pPty);
+    }
+}
+
+
 //ConPTY is available only on Windows 10 released after 1903 (19H1) Windows release
 class WindowsContext
 {
@@ -38,30 +770,9 @@ public:
 
     bool init()
     {
-        //already initialized
-        if (createPseudoConsole)
-            return true;
-
-        //try to load symbols from library
-        //if it fails -> we can't use ConPty API
-        HANDLE kernel32Handle = LoadLibraryExW(L"kernel32.dll", 0, 0);
-
-        if (kernel32Handle != nullptr)
-        {
-            createPseudoConsole = (CreatePseudoConsolePtr)GetProcAddress((HMODULE)kernel32Handle, "CreatePseudoConsole");
-            resizePseudoConsole = (ResizePseudoConsolePtr)GetProcAddress((HMODULE)kernel32Handle, "ResizePseudoConsole");
-            closePseudoConsole = (ClosePseudoConsolePtr)GetProcAddress((HMODULE)kernel32Handle, "ClosePseudoConsole");
-            if (createPseudoConsole == NULL || resizePseudoConsole == NULL || closePseudoConsole == NULL)
-            {
-                m_lastError = QString("WindowsContext/ConPty error: %1").arg("Invalid on load API functions");
-                return false;
-            }
-        }
-        else
-        {
-            m_lastError = QString("WindowsContext/ConPty error: %1").arg("Unable to load kernel32");
-            return false;
-        }
+        createPseudoConsole = (CreatePseudoConsolePtr)ConptyCreatePseudoConsole;
+        resizePseudoConsole = (ResizePseudoConsolePtr)ConptyResizePseudoConsole;
+        closePseudoConsole = (ClosePseudoConsolePtr)ConptyClosePseudoConsole;
 
         return true;
     }
@@ -81,6 +792,30 @@ private:
     QString m_lastError;
 };
 
+static bool checkConHostHasResizeQuirkOption()
+{
+  static bool hasResizeQuirk = std::invoke([](){
+    QFile f(_InboxConsoleHostPath());
+    if (!f.open(QIODevice::ReadOnly)) {
+      qWarning() << "couldn't open conhost.exe, assuming no resizeQuirk.";
+      return false;
+    }
+    // Conhost.exe should be around 1 MB
+    if (f.size() > 5 * 1024 * 1024) {
+      qWarning() << "conhost.exe is > 5MB, assuming no resizeQuirk.";
+      return false;
+    }
+    QByteArray content = f.readAll();
+    QString searchString("--resizeQuirk");
+    QByteArrayView v((const char*)searchString.data(), searchString.length()*2);
+    bool result = content.contains(v);
+    if (!result)
+      qDebug() << "No resizeQuirk option found in conhost.";
+    return result;
+  });
+
+  return hasResizeQuirk;
+}
 
 HRESULT ConPtyProcess::createPseudoConsoleAndPipes(HPCON* phPC, HANDLE* phPipeIn, HANDLE* phPipeOut, qint16 cols, qint16 rows)
 {
@@ -93,7 +828,7 @@ HRESULT ConPtyProcess::createPseudoConsoleAndPipes(HPCON* phPC, HANDLE* phPipeIn
             CreatePipe(phPipeIn, &hPipePTYOut, NULL, 0))
     {
         // Create the Pseudo Console of the required size, attached to the PTY-end of the pipes
-        hr = WindowsContext::instance().createPseudoConsole({cols, rows}, hPipePTYIn, hPipePTYOut, 0, phPC);
+        hr = WindowsContext::instance().createPseudoConsole({cols, rows}, hPipePTYIn, hPipePTYOut, checkConHostHasResizeQuirkOption() ? PSEUDOCONSOLE_RESIZE_QUIRK : 0, phPC);
 
         // Note: We can close the handles to the PTY-end of the pipes here
         // because the handles are dup'ed into the ConHost and will be released
@@ -397,10 +1132,6 @@ qint64 ConPtyProcess::write(const QByteArray &byteArray)
 
 bool ConPtyProcess::isAvailable()
 {
-#ifdef TOO_OLD_WINSDK
-    return false; //very importnant! ConPty can be built, but it doesn't work if built with old sdk and Win10 < 1903
-#endif
-
     qint32 buildNumber = QSysInfo::kernelVersion().split(".").last().toInt();
     if (buildNumber < CONPTY_MINIMAL_WINDOWS_VERSION)
         return false;
diff --git a/src/libs/3rdparty/libptyqt/conptyprocess.h b/src/libs/3rdparty/libptyqt/conptyprocess.h
index aaf56fe76f1..0f30288dab9 100644
--- a/src/libs/3rdparty/libptyqt/conptyprocess.h
+++ b/src/libs/3rdparty/libptyqt/conptyprocess.h
@@ -20,7 +20,6 @@
 
 typedef VOID* HPCON;
 
-#define TOO_OLD_WINSDK
 #endif
 
 class QWinEventNotifier;
diff --git a/src/libs/3rdparty/libvterm/vterm.qbs b/src/libs/3rdparty/libvterm/vterm.qbs
index e35658908da..4c3a08e519e 100644
--- a/src/libs/3rdparty/libvterm/vterm.qbs
+++ b/src/libs/3rdparty/libvterm/vterm.qbs
@@ -30,6 +30,6 @@ QtcLibrary {
 
     Export {
         Depends { name: "cpp" }
-        cpp.includePaths: "include"
+        cpp.includePaths: exportingProduct.sourceDirectory + "/include"
     }
 }
diff --git a/src/libs/3rdparty/lua/CMakeLists.txt b/src/libs/3rdparty/lua/CMakeLists.txt
new file mode 100644
index 00000000000..4501f540c89
--- /dev/null
+++ b/src/libs/3rdparty/lua/CMakeLists.txt
@@ -0,0 +1,75 @@
+
+add_qtc_library(lua546
+  PROPERTIES QT_COMPILE_OPTIONS_DISABLE_WARNINGS ON
+  PUBLIC_INCLUDES src
+  STATIC
+  SOURCES
+    src/lapi.c
+    src/lapi.h
+    src/lauxlib.c
+    src/lauxlib.h
+    src/lbaselib.c
+    src/lcode.c
+    src/lcode.h
+    src/lcorolib.c
+    src/lctype.c
+    src/lctype.h
+    src/ldblib.c
+    src/ldebug.c
+    src/ldebug.h
+    src/ldo.c
+    src/ldo.h
+    src/ldump.c
+    src/lfunc.c
+    src/lfunc.h
+    src/lgc.c
+    src/lgc.h
+    src/linit.c
+    src/liolib.c
+    src/llex.c
+    src/llex.h
+    src/lmathlib.c
+    src/lmem.c
+    src/lmem.h
+    src/loadlib.c
+    src/lobject.c
+    src/lobject.h
+    src/lopcodes.c
+    src/lopcodes.h
+    src/loslib.c
+    src/lparser.c
+    src/lparser.h
+    src/lstate.c
+    src/lstate.h
+    src/lstring.c
+    src/lstring.h
+    src/lstrlib.c
+    src/ltable.c
+    src/ltable.h
+    src/ltablib.c
+    src/ltm.c
+    src/ltm.h
+    src/lua.c
+    src/lua.h
+    src/luaconf.h
+    src/lundump.c
+    src/lundump.h
+    src/lutf8lib.c
+    src/lvm.c
+    src/lvm.h
+    src/lzio.c
+    src/lzio.h
+)
+
+extend_qtc_library(lua546
+  CONDITION LINUX
+  PUBLIC_DEFINES LUA_USE_LINUX
+)
+extend_qtc_library(lua546
+  CONDITION WIN32
+  PUBLIC_DEFINES LUA_USE_WINDOWS
+)
+extend_qtc_library(lua546
+  CONDITION APPLE
+  PUBLIC_DEFINES LUA_USE_MACOSX
+)
diff --git a/src/libs/3rdparty/lua/LICENSE b/src/libs/3rdparty/lua/LICENSE
new file mode 100644
index 00000000000..441cc1981c0
--- /dev/null
+++ b/src/libs/3rdparty/lua/LICENSE
@@ -0,0 +1,16 @@
+Copyright © 1994–2023 Lua.org, PUC-Rio.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/src/libs/3rdparty/lua/README b/src/libs/3rdparty/lua/README
new file mode 100644
index 00000000000..1ae97165bab
--- /dev/null
+++ b/src/libs/3rdparty/lua/README
@@ -0,0 +1,6 @@
+
+This is Lua 5.4.6, released on 02 May 2023.
+
+For installation instructions, license details, and
+further information about Lua, see doc/readme.html.
+
diff --git a/src/libs/3rdparty/lua/doc/contents.html b/src/libs/3rdparty/lua/doc/contents.html
new file mode 100644
index 00000000000..1231e6d2481
--- /dev/null
+++ b/src/libs/3rdparty/lua/doc/contents.html
@@ -0,0 +1,678 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML>
+<HEAD>
+<TITLE>Lua 5.4 Reference Manual - contents</TITLE>
+<LINK REL="stylesheet" TYPE="text/css" HREF="lua.css">
+<LINK REL="stylesheet" TYPE="text/css" HREF="index.css">
+<META HTTP-EQUIV="content-type" CONTENT="text/html; charset=iso-8859-1">
+</HEAD>
+
+<BODY>
+
+<H1>
+<A HREF="http://www.lua.org/"><IMG SRC="logo.gif" ALT="Lua"></A>
+Lua 5.4 Reference Manual
+</H1>
+
+<P>
+The reference manual is the official definition of the Lua language.
+<BR>
+For a complete introduction to Lua programming, see the book
+<A HREF="http://www.lua.org/pil/">Programming in Lua</A>.
+
+<DIV CLASS="menubar">
+<A HREF="manual.html">start</A>
+&middot;
+<A HREF="#contents">contents</A>
+&middot;
+<A HREF="#index">index</A>
+&middot;
+<A HREF="http://www.lua.org/manual/">other versions</A>
+</DIV>
+
+<P>
+<SMALL>
+Copyright &copy; 2020&ndash;2023 Lua.org, PUC-Rio.
+Freely available under the terms of the
+<A HREF="http://www.lua.org/license.html">Lua license</A>.
+</SMALL>
+
+<H2><A NAME="contents">Contents</A></H2>
+<UL CLASS="contents menubar">
+<LI><A HREF="manual.html">1 &ndash; Introduction</A>
+<P>
+<LI><A HREF="manual.html#2">2 &ndash; Basic Concepts</A>
+<UL>
+<LI><A HREF="manual.html#2.1">2.1 &ndash; Values and Types</A>
+<LI><A HREF="manual.html#2.2">2.2 &ndash; Environments and the Global Environment</A>
+<LI><A HREF="manual.html#2.3">2.3 &ndash; Error Handling</A>
+<LI><A HREF="manual.html#2.4">2.4 &ndash; Metatables and Metamethods</A>
+<LI><A HREF="manual.html#2.5">2.5 &ndash; Garbage Collection</A>
+<UL>
+<LI><A HREF="manual.html#2.5.1">2.5.1 &ndash; Incremental Garbage Collection</A>
+<LI><A HREF="manual.html#2.5.2">2.5.2 &ndash; Generational Garbage Collection</A>
+<LI><A HREF="manual.html#2.5.3">2.5.3 &ndash; Garbage-Collection Metamethods</A>
+<LI><A HREF="manual.html#2.5.4">2.5.4 &ndash; Weak Tables</A>
+</UL>
+<LI><A HREF="manual.html#2.6">2.6 &ndash; Coroutines</A>
+</UL>
+<P>
+<LI><A HREF="manual.html#3">3 &ndash; The Language</A>
+<UL>
+<LI><A HREF="manual.html#3.1">3.1 &ndash; Lexical Conventions</A>
+<LI><A HREF="manual.html#3.2">3.2 &ndash; Variables</A>
+<LI><A HREF="manual.html#3.3">3.3 &ndash; Statements</A>
+<UL>
+<LI><A HREF="manual.html#3.3.1">3.3.1 &ndash; Blocks</A>
+<LI><A HREF="manual.html#3.3.2">3.3.2 &ndash; Chunks</A>
+<LI><A HREF="manual.html#3.3.3">3.3.3 &ndash; Assignment</A>
+<LI><A HREF="manual.html#3.3.4">3.3.4 &ndash; Control Structures</A>
+<LI><A HREF="manual.html#3.3.5">3.3.5 &ndash; For Statement</A>
+<LI><A HREF="manual.html#3.3.6">3.3.6 &ndash; Function Calls as Statements</A>
+<LI><A HREF="manual.html#3.3.7">3.3.7 &ndash; Local Declarations</A>
+<LI><A HREF="manual.html#3.3.8">3.3.8 &ndash; To-be-closed Variables</A>
+</UL>
+<LI><A HREF="manual.html#3.4">3.4 &ndash; Expressions</A>
+<UL>
+<LI><A HREF="manual.html#3.4.1">3.4.1 &ndash; Arithmetic Operators</A>
+<LI><A HREF="manual.html#3.4.2">3.4.2 &ndash; Bitwise Operators</A>
+<LI><A HREF="manual.html#3.4.3">3.4.3 &ndash; Coercions and Conversions</A>
+<LI><A HREF="manual.html#3.4.4">3.4.4 &ndash; Relational Operators</A>
+<LI><A HREF="manual.html#3.4.5">3.4.5 &ndash; Logical Operators</A>
+<LI><A HREF="manual.html#3.4.6">3.4.6 &ndash; Concatenation</A>
+<LI><A HREF="manual.html#3.4.7">3.4.7 &ndash; The Length Operator</A>
+<LI><A HREF="manual.html#3.4.8">3.4.8 &ndash; Precedence</A>
+<LI><A HREF="manual.html#3.4.9">3.4.9 &ndash; Table Constructors</A>
+<LI><A HREF="manual.html#3.4.10">3.4.10 &ndash; Function Calls</A>
+<LI><A HREF="manual.html#3.4.11">3.4.11 &ndash; Function Definitions</A>
+<LI><A HREF="manual.html#3.4.12">3.4.12 &ndash; Lists of expressions, multiple results, and adjustment<A>
+
+</UL>
+<LI><A HREF="manual.html#3.5">3.5 &ndash; Visibility Rules</A>
+</UL>
+<P>
+<LI><A HREF="manual.html#4">4 &ndash; The Application Program Interface</A>
+<UL>
+<LI><A HREF="manual.html#4.1">4.1 &ndash; The Stack</A>
+<UL>
+<LI><A HREF="manual.html#4.1.1">4.1.1 &ndash; Stack Size</A>
+<LI><A HREF="manual.html#4.1.2">4.1.2 &ndash; Valid and Acceptable Indices</A>
+<LI><A HREF="manual.html#4.1.3">4.1.3 &ndash; Pointers to strings</A>
+</UL>
+<LI><A HREF="manual.html#4.2">4.2 &ndash; C Closures</A>
+<LI><A HREF="manual.html#4.3">4.3 &ndash; Registry</A>
+<LI><A HREF="manual.html#4.4">4.4 &ndash; Error Handling in C</A>
+<UL>
+<LI><A HREF="manual.html#4.4.1">4.4.1 &ndash; Status Codes</A>
+</UL>
+<LI><A HREF="manual.html#4.5">4.5 &ndash; Handling Yields in C</A>
+<LI><A HREF="manual.html#4.6">4.6 &ndash; Functions and Types</A>
+<LI><A HREF="manual.html#4.7">4.7 &ndash; The Debug Interface</A>
+</UL>
+<P>
+<LI><A HREF="manual.html#5">5 &ndash; The Auxiliary Library</A>
+<UL>
+<LI><A HREF="manual.html#5.1">5.1 &ndash; Functions and Types</A>
+</UL>
+<P>
+<LI><A HREF="manual.html#6">6 &ndash; The Standard Libraries</A>
+<UL>
+<LI><A HREF="manual.html#6.1">6.1 &ndash; Basic Functions</A>
+<LI><A HREF="manual.html#6.2">6.2 &ndash; Coroutine Manipulation</A>
+<LI><A HREF="manual.html#6.3">6.3 &ndash; Modules</A>
+<LI><A HREF="manual.html#6.4">6.4 &ndash; String Manipulation</A>
+<UL>
+<LI><A HREF="manual.html#6.4.1">6.4.1 &ndash; Patterns</A>
+<LI><A HREF="manual.html#6.4.2">6.4.2 &ndash; Format Strings for Pack and Unpack</A>
+</UL>
+<LI><A HREF="manual.html#6.5">6.5 &ndash; UTF-8 Support</A>
+<LI><A HREF="manual.html#6.6">6.6 &ndash; Table Manipulation</A>
+<LI><A HREF="manual.html#6.7">6.7 &ndash; Mathematical Functions</A>
+<LI><A HREF="manual.html#6.8">6.8 &ndash; Input and Output Facilities</A>
+<LI><A HREF="manual.html#6.9">6.9 &ndash; Operating System Facilities</A>
+<LI><A HREF="manual.html#6.10">6.10 &ndash; The Debug Library</A>
+</UL>
+<P>
+<LI><A HREF="manual.html#7">7 &ndash; Lua Standalone</A>
+<P>
+<LI><A HREF="manual.html#8">8 &ndash; Incompatibilities with the Previous Version</A>
+<UL>
+<LI><A HREF="manual.html#8.1">8.1 &ndash; Incompatibilities in the Language</A>
+<LI><A HREF="manual.html#8.2">8.2 &ndash; Incompatibilities in the Libraries</A>
+<LI><A HREF="manual.html#8.3">8.3 &ndash; Incompatibilities in the API</A>
+</UL>
+<P>
+<LI><A HREF="manual.html#9">9 &ndash; The Complete Syntax of Lua</A>
+</UL>
+
+<H2><A NAME="index">Index</A></H2>
+<TABLE CLASS="menubar" WIDTH="100%">
+<TR>
+<TD>
+<H3><A NAME="functions">Lua functions</A></H3>
+<P>
+<A HREF="manual.html#6.1">basic</A><BR>
+<A HREF="manual.html#pdf-_G">_G</A><BR>
+<A HREF="manual.html#pdf-_VERSION">_VERSION</A><BR>
+<A HREF="manual.html#pdf-assert">assert</A><BR>
+<A HREF="manual.html#pdf-collectgarbage">collectgarbage</A><BR>
+<A HREF="manual.html#pdf-dofile">dofile</A><BR>
+<A HREF="manual.html#pdf-error">error</A><BR>
+<A HREF="manual.html#pdf-getmetatable">getmetatable</A><BR>
+<A HREF="manual.html#pdf-ipairs">ipairs</A><BR>
+<A HREF="manual.html#pdf-load">load</A><BR>
+<A HREF="manual.html#pdf-loadfile">loadfile</A><BR>
+<A HREF="manual.html#pdf-next">next</A><BR>
+<A HREF="manual.html#pdf-pairs">pairs</A><BR>
+<A HREF="manual.html#pdf-pcall">pcall</A><BR>
+<A HREF="manual.html#pdf-print">print</A><BR>
+<A HREF="manual.html#pdf-rawequal">rawequal</A><BR>
+<A HREF="manual.html#pdf-rawget">rawget</A><BR>
+<A HREF="manual.html#pdf-rawlen">rawlen</A><BR>
+<A HREF="manual.html#pdf-rawset">rawset</A><BR>
+<A HREF="manual.html#pdf-require">require</A><BR>
+<A HREF="manual.html#pdf-select">select</A><BR>
+<A HREF="manual.html#pdf-setmetatable">setmetatable</A><BR>
+<A HREF="manual.html#pdf-tonumber">tonumber</A><BR>
+<A HREF="manual.html#pdf-tostring">tostring</A><BR>
+<A HREF="manual.html#pdf-type">type</A><BR>
+<A HREF="manual.html#pdf-warn">warn</A><BR>
+<A HREF="manual.html#pdf-xpcall">xpcall</A><BR>
+
+<P>
+<A HREF="manual.html#6.2">coroutine</A><BR>
+<A HREF="manual.html#pdf-coroutine.close">coroutine.close</A><BR>
+<A HREF="manual.html#pdf-coroutine.create">coroutine.create</A><BR>
+<A HREF="manual.html#pdf-coroutine.isyieldable">coroutine.isyieldable</A><BR>
+<A HREF="manual.html#pdf-coroutine.resume">coroutine.resume</A><BR>
+<A HREF="manual.html#pdf-coroutine.running">coroutine.running</A><BR>
+<A HREF="manual.html#pdf-coroutine.status">coroutine.status</A><BR>
+<A HREF="manual.html#pdf-coroutine.wrap">coroutine.wrap</A><BR>
+<A HREF="manual.html#pdf-coroutine.yield">coroutine.yield</A><BR>
+
+<P>
+<A HREF="manual.html#6.10">debug</A><BR>
+<A HREF="manual.html#pdf-debug.debug">debug.debug</A><BR>
+<A HREF="manual.html#pdf-debug.gethook">debug.gethook</A><BR>
+<A HREF="manual.html#pdf-debug.getinfo">debug.getinfo</A><BR>
+<A HREF="manual.html#pdf-debug.getlocal">debug.getlocal</A><BR>
+<A HREF="manual.html#pdf-debug.getmetatable">debug.getmetatable</A><BR>
+<A HREF="manual.html#pdf-debug.getregistry">debug.getregistry</A><BR>
+<A HREF="manual.html#pdf-debug.getupvalue">debug.getupvalue</A><BR>
+<A HREF="manual.html#pdf-debug.getuservalue">debug.getuservalue</A><BR>
+<A HREF="manual.html#pdf-debug.sethook">debug.sethook</A><BR>
+<A HREF="manual.html#pdf-debug.setlocal">debug.setlocal</A><BR>
+<A HREF="manual.html#pdf-debug.setmetatable">debug.setmetatable</A><BR>
+<A HREF="manual.html#pdf-debug.setupvalue">debug.setupvalue</A><BR>
+<A HREF="manual.html#pdf-debug.setuservalue">debug.setuservalue</A><BR>
+<A HREF="manual.html#pdf-debug.traceback">debug.traceback</A><BR>
+<A HREF="manual.html#pdf-debug.upvalueid">debug.upvalueid</A><BR>
+<A HREF="manual.html#pdf-debug.upvaluejoin">debug.upvaluejoin</A><BR>
+
+<P>
+<A HREF="manual.html#6.8">io</A><BR>
+<A HREF="manual.html#pdf-io.close">io.close</A><BR>
+<A HREF="manual.html#pdf-io.flush">io.flush</A><BR>
+<A HREF="manual.html#pdf-io.input">io.input</A><BR>
+<A HREF="manual.html#pdf-io.lines">io.lines</A><BR>
+<A HREF="manual.html#pdf-io.open">io.open</A><BR>
+<A HREF="manual.html#pdf-io.output">io.output</A><BR>
+<A HREF="manual.html#pdf-io.popen">io.popen</A><BR>
+<A HREF="manual.html#pdf-io.read">io.read</A><BR>
+<A HREF="manual.html#pdf-io.stderr">io.stderr</A><BR>
+<A HREF="manual.html#pdf-io.stdin">io.stdin</A><BR>
+<A HREF="manual.html#pdf-io.stdout">io.stdout</A><BR>
+<A HREF="manual.html#pdf-io.tmpfile">io.tmpfile</A><BR>
+<A HREF="manual.html#pdf-io.type">io.type</A><BR>
+<A HREF="manual.html#pdf-io.write">io.write</A><BR>
+
+<A HREF="manual.html#pdf-file:close">file:close</A><BR>
+<A HREF="manual.html#pdf-file:flush">file:flush</A><BR>
+<A HREF="manual.html#pdf-file:lines">file:lines</A><BR>
+<A HREF="manual.html#pdf-file:read">file:read</A><BR>
+<A HREF="manual.html#pdf-file:seek">file:seek</A><BR>
+<A HREF="manual.html#pdf-file:setvbuf">file:setvbuf</A><BR>
+<A HREF="manual.html#pdf-file:write">file:write</A><BR>
+
+</TD>
+<TD>
+<H3>&nbsp;</H3>
+<P>
+<A HREF="manual.html#6.7">math</A><BR>
+<A HREF="manual.html#pdf-math.abs">math.abs</A><BR>
+<A HREF="manual.html#pdf-math.acos">math.acos</A><BR>
+<A HREF="manual.html#pdf-math.asin">math.asin</A><BR>
+<A HREF="manual.html#pdf-math.atan">math.atan</A><BR>
+<A HREF="manual.html#pdf-math.ceil">math.ceil</A><BR>
+<A HREF="manual.html#pdf-math.cos">math.cos</A><BR>
+<A HREF="manual.html#pdf-math.deg">math.deg</A><BR>
+<A HREF="manual.html#pdf-math.exp">math.exp</A><BR>
+<A HREF="manual.html#pdf-math.floor">math.floor</A><BR>
+<A HREF="manual.html#pdf-math.fmod">math.fmod</A><BR>
+<A HREF="manual.html#pdf-math.huge">math.huge</A><BR>
+<A HREF="manual.html#pdf-math.log">math.log</A><BR>
+<A HREF="manual.html#pdf-math.max">math.max</A><BR>
+<A HREF="manual.html#pdf-math.maxinteger">math.maxinteger</A><BR>
+<A HREF="manual.html#pdf-math.min">math.min</A><BR>
+<A HREF="manual.html#pdf-math.mininteger">math.mininteger</A><BR>
+<A HREF="manual.html#pdf-math.modf">math.modf</A><BR>
+<A HREF="manual.html#pdf-math.pi">math.pi</A><BR>
+<A HREF="manual.html#pdf-math.rad">math.rad</A><BR>
+<A HREF="manual.html#pdf-math.random">math.random</A><BR>
+<A HREF="manual.html#pdf-math.randomseed">math.randomseed</A><BR>
+<A HREF="manual.html#pdf-math.sin">math.sin</A><BR>
+<A HREF="manual.html#pdf-math.sqrt">math.sqrt</A><BR>
+<A HREF="manual.html#pdf-math.tan">math.tan</A><BR>
+<A HREF="manual.html#pdf-math.tointeger">math.tointeger</A><BR>
+<A HREF="manual.html#pdf-math.type">math.type</A><BR>
+<A HREF="manual.html#pdf-math.ult">math.ult</A><BR>
+
+<P>
+<A HREF="manual.html#6.9">os</A><BR>
+<A HREF="manual.html#pdf-os.clock">os.clock</A><BR>
+<A HREF="manual.html#pdf-os.date">os.date</A><BR>
+<A HREF="manual.html#pdf-os.difftime">os.difftime</A><BR>
+<A HREF="manual.html#pdf-os.execute">os.execute</A><BR>
+<A HREF="manual.html#pdf-os.exit">os.exit</A><BR>
+<A HREF="manual.html#pdf-os.getenv">os.getenv</A><BR>
+<A HREF="manual.html#pdf-os.remove">os.remove</A><BR>
+<A HREF="manual.html#pdf-os.rename">os.rename</A><BR>
+<A HREF="manual.html#pdf-os.setlocale">os.setlocale</A><BR>
+<A HREF="manual.html#pdf-os.time">os.time</A><BR>
+<A HREF="manual.html#pdf-os.tmpname">os.tmpname</A><BR>
+
+<P>
+<A HREF="manual.html#6.3">package</A><BR>
+<A HREF="manual.html#pdf-package.config">package.config</A><BR>
+<A HREF="manual.html#pdf-package.cpath">package.cpath</A><BR>
+<A HREF="manual.html#pdf-package.loaded">package.loaded</A><BR>
+<A HREF="manual.html#pdf-package.loadlib">package.loadlib</A><BR>
+<A HREF="manual.html#pdf-package.path">package.path</A><BR>
+<A HREF="manual.html#pdf-package.preload">package.preload</A><BR>
+<A HREF="manual.html#pdf-package.searchers">package.searchers</A><BR>
+<A HREF="manual.html#pdf-package.searchpath">package.searchpath</A><BR>
+
+<P>
+<A HREF="manual.html#6.4">string</A><BR>
+<A HREF="manual.html#pdf-string.byte">string.byte</A><BR>
+<A HREF="manual.html#pdf-string.char">string.char</A><BR>
+<A HREF="manual.html#pdf-string.dump">string.dump</A><BR>
+<A HREF="manual.html#pdf-string.find">string.find</A><BR>
+<A HREF="manual.html#pdf-string.format">string.format</A><BR>
+<A HREF="manual.html#pdf-string.gmatch">string.gmatch</A><BR>
+<A HREF="manual.html#pdf-string.gsub">string.gsub</A><BR>
+<A HREF="manual.html#pdf-string.len">string.len</A><BR>
+<A HREF="manual.html#pdf-string.lower">string.lower</A><BR>
+<A HREF="manual.html#pdf-string.match">string.match</A><BR>
+<A HREF="manual.html#pdf-string.pack">string.pack</A><BR>
+<A HREF="manual.html#pdf-string.packsize">string.packsize</A><BR>
+<A HREF="manual.html#pdf-string.rep">string.rep</A><BR>
+<A HREF="manual.html#pdf-string.reverse">string.reverse</A><BR>
+<A HREF="manual.html#pdf-string.sub">string.sub</A><BR>
+<A HREF="manual.html#pdf-string.unpack">string.unpack</A><BR>
+<A HREF="manual.html#pdf-string.upper">string.upper</A><BR>
+
+<P>
+<A HREF="manual.html#6.6">table</A><BR>
+<A HREF="manual.html#pdf-table.concat">table.concat</A><BR>
+<A HREF="manual.html#pdf-table.insert">table.insert</A><BR>
+<A HREF="manual.html#pdf-table.move">table.move</A><BR>
+<A HREF="manual.html#pdf-table.pack">table.pack</A><BR>
+<A HREF="manual.html#pdf-table.remove">table.remove</A><BR>
+<A HREF="manual.html#pdf-table.sort">table.sort</A><BR>
+<A HREF="manual.html#pdf-table.unpack">table.unpack</A><BR>
+
+<P>
+<A HREF="manual.html#6.5">utf8</A><BR>
+<A HREF="manual.html#pdf-utf8.char">utf8.char</A><BR>
+<A HREF="manual.html#pdf-utf8.charpattern">utf8.charpattern</A><BR>
+<A HREF="manual.html#pdf-utf8.codepoint">utf8.codepoint</A><BR>
+<A HREF="manual.html#pdf-utf8.codes">utf8.codes</A><BR>
+<A HREF="manual.html#pdf-utf8.len">utf8.len</A><BR>
+<A HREF="manual.html#pdf-utf8.offset">utf8.offset</A><BR>
+
+<H3><A NAME="metamethods">metamethods</A></H3>
+<P>
+<A HREF="manual.html#2.4">__add</A><BR>
+<A HREF="manual.html#2.4">__band</A><BR>
+<A HREF="manual.html#2.4">__bnot</A><BR>
+<A HREF="manual.html#2.4">__bor</A><BR>
+<A HREF="manual.html#2.4">__bxor</A><BR>
+<A HREF="manual.html#2.4">__call</A><BR>
+<A HREF="manual.html#3.3.8">__close</A><BR>
+<A HREF="manual.html#2.4">__concat</A><BR>
+<A HREF="manual.html#2.4">__div</A><BR>
+<A HREF="manual.html#2.4">__eq</A><BR>
+<A HREF="manual.html#2.5.3">__gc</A><BR>
+<A HREF="manual.html#2.4">__idiv</A><BR>
+<A HREF="manual.html#2.4">__index</A><BR>
+<A HREF="manual.html#2.4">__le</A><BR>
+<A HREF="manual.html#2.4">__len</A><BR>
+<A HREF="manual.html#2.4">__lt</A><BR>
+<A HREF="manual.html#pdf-getmetatable">__metatable</A><BR>
+<A HREF="manual.html#2.4">__mod</A><BR>
+<A HREF="manual.html#2.5.4">__mode</A><BR>
+<A HREF="manual.html#2.4">__mul</A><BR>
+<A HREF="manual.html#luaL_newmetatable">__name</A><BR>
+<A HREF="manual.html#2.4">__newindex</A><BR>
+<A HREF="manual.html#pdf-pairs">__pairs</A><BR>
+<A HREF="manual.html#2.4">__pow</A><BR>
+<A HREF="manual.html#2.4">__shl</A><BR>
+<A HREF="manual.html#2.4">__shr</A><BR>
+<A HREF="manual.html#2.4">__sub</A><BR>
+<A HREF="manual.html#pdf-tostring">__tostring</A><BR>
+<A HREF="manual.html#2.4">__unm</A><BR>
+
+<H3><A NAME="env">environment<BR>variables</A></H3>
+<P>
+<A HREF="manual.html#pdf-LUA_CPATH">LUA_CPATH</A><BR>
+<A HREF="manual.html#pdf-LUA_CPATH_5_4">LUA_CPATH_5_4</A><BR>
+<A HREF="manual.html#pdf-LUA_INIT">LUA_INIT</A><BR>
+<A HREF="manual.html#pdf-LUA_INIT_5_4">LUA_INIT_5_4</A><BR>
+<A HREF="manual.html#pdf-LUA_PATH">LUA_PATH</A><BR>
+<A HREF="manual.html#pdf-LUA_PATH_5_4">LUA_PATH_5_4</A><BR>
+
+</TD>
+<TD>
+<H3><A NAME="api">C API</A></H3>
+<P>
+<A HREF="manual.html#lua_Alloc">lua_Alloc</A><BR>
+<A HREF="manual.html#lua_CFunction">lua_CFunction</A><BR>
+<A HREF="manual.html#lua_Debug">lua_Debug</A><BR>
+<A HREF="manual.html#lua_Hook">lua_Hook</A><BR>
+<A HREF="manual.html#lua_Integer">lua_Integer</A><BR>
+<A HREF="manual.html#lua_KContext">lua_KContext</A><BR>
+<A HREF="manual.html#lua_KFunction">lua_KFunction</A><BR>
+<A HREF="manual.html#lua_Number">lua_Number</A><BR>
+<A HREF="manual.html#lua_Reader">lua_Reader</A><BR>
+<A HREF="manual.html#lua_State">lua_State</A><BR>
+<A HREF="manual.html#lua_Unsigned">lua_Unsigned</A><BR>
+<A HREF="manual.html#lua_WarnFunction">lua_WarnFunction</A><BR>
+<A HREF="manual.html#lua_Writer">lua_Writer</A><BR>
+
+<P>
+<A HREF="manual.html#lua_absindex">lua_absindex</A><BR>
+<A HREF="manual.html#lua_arith">lua_arith</A><BR>
+<A HREF="manual.html#lua_atpanic">lua_atpanic</A><BR>
+<A HREF="manual.html#lua_call">lua_call</A><BR>
+<A HREF="manual.html#lua_callk">lua_callk</A><BR>
+<A HREF="manual.html#lua_checkstack">lua_checkstack</A><BR>
+<A HREF="manual.html#lua_close">lua_close</A><BR>
+<A HREF="manual.html#lua_closeslot">lua_closeslot</A><BR>
+<A HREF="manual.html#lua_compare">lua_compare</A><BR>
+<A HREF="manual.html#lua_concat">lua_concat</A><BR>
+<A HREF="manual.html#lua_copy">lua_copy</A><BR>
+<A HREF="manual.html#lua_createtable">lua_createtable</A><BR>
+<A HREF="manual.html#lua_dump">lua_dump</A><BR>
+<A HREF="manual.html#lua_error">lua_error</A><BR>
+<A HREF="manual.html#lua_gc">lua_gc</A><BR>
+<A HREF="manual.html#lua_getallocf">lua_getallocf</A><BR>
+<A HREF="manual.html#lua_getextraspace">lua_getextraspace</A><BR>
+<A HREF="manual.html#lua_getfield">lua_getfield</A><BR>
+<A HREF="manual.html#lua_getglobal">lua_getglobal</A><BR>
+<A HREF="manual.html#lua_gethook">lua_gethook</A><BR>
+<A HREF="manual.html#lua_gethookcount">lua_gethookcount</A><BR>
+<A HREF="manual.html#lua_gethookmask">lua_gethookmask</A><BR>
+<A HREF="manual.html#lua_geti">lua_geti</A><BR>
+<A HREF="manual.html#lua_getinfo">lua_getinfo</A><BR>
+<A HREF="manual.html#lua_getiuservalue">lua_getiuservalue</A><BR>
+<A HREF="manual.html#lua_getlocal">lua_getlocal</A><BR>
+<A HREF="manual.html#lua_getmetatable">lua_getmetatable</A><BR>
+<A HREF="manual.html#lua_getstack">lua_getstack</A><BR>
+<A HREF="manual.html#lua_gettable">lua_gettable</A><BR>
+<A HREF="manual.html#lua_gettop">lua_gettop</A><BR>
+<A HREF="manual.html#lua_getupvalue">lua_getupvalue</A><BR>
+<A HREF="manual.html#lua_insert">lua_insert</A><BR>
+<A HREF="manual.html#lua_isboolean">lua_isboolean</A><BR>
+<A HREF="manual.html#lua_iscfunction">lua_iscfunction</A><BR>
+<A HREF="manual.html#lua_isfunction">lua_isfunction</A><BR>
+<A HREF="manual.html#lua_isinteger">lua_isinteger</A><BR>
+<A HREF="manual.html#lua_islightuserdata">lua_islightuserdata</A><BR>
+<A HREF="manual.html#lua_isnil">lua_isnil</A><BR>
+<A HREF="manual.html#lua_isnone">lua_isnone</A><BR>
+<A HREF="manual.html#lua_isnoneornil">lua_isnoneornil</A><BR>
+<A HREF="manual.html#lua_isnumber">lua_isnumber</A><BR>
+<A HREF="manual.html#lua_isstring">lua_isstring</A><BR>
+<A HREF="manual.html#lua_istable">lua_istable</A><BR>
+<A HREF="manual.html#lua_isthread">lua_isthread</A><BR>
+<A HREF="manual.html#lua_isuserdata">lua_isuserdata</A><BR>
+<A HREF="manual.html#lua_isyieldable">lua_isyieldable</A><BR>
+<A HREF="manual.html#lua_len">lua_len</A><BR>
+<A HREF="manual.html#lua_load">lua_load</A><BR>
+<A HREF="manual.html#lua_newstate">lua_newstate</A><BR>
+<A HREF="manual.html#lua_newtable">lua_newtable</A><BR>
+<A HREF="manual.html#lua_newthread">lua_newthread</A><BR>
+<A HREF="manual.html#lua_newuserdatauv">lua_newuserdatauv</A><BR>
+<A HREF="manual.html#lua_next">lua_next</A><BR>
+<A HREF="manual.html#lua_numbertointeger">lua_numbertointeger</A><BR>
+<A HREF="manual.html#lua_pcall">lua_pcall</A><BR>
+<A HREF="manual.html#lua_pcallk">lua_pcallk</A><BR>
+<A HREF="manual.html#lua_pop">lua_pop</A><BR>
+<A HREF="manual.html#lua_pushboolean">lua_pushboolean</A><BR>
+<A HREF="manual.html#lua_pushcclosure">lua_pushcclosure</A><BR>
+<A HREF="manual.html#lua_pushcfunction">lua_pushcfunction</A><BR>
+<A HREF="manual.html#lua_pushfstring">lua_pushfstring</A><BR>
+<A HREF="manual.html#lua_pushglobaltable">lua_pushglobaltable</A><BR>
+<A HREF="manual.html#lua_pushinteger">lua_pushinteger</A><BR>
+<A HREF="manual.html#lua_pushlightuserdata">lua_pushlightuserdata</A><BR>
+<A HREF="manual.html#lua_pushliteral">lua_pushliteral</A><BR>
+<A HREF="manual.html#lua_pushlstring">lua_pushlstring</A><BR>
+<A HREF="manual.html#lua_pushnil">lua_pushnil</A><BR>
+<A HREF="manual.html#lua_pushnumber">lua_pushnumber</A><BR>
+<A HREF="manual.html#lua_pushstring">lua_pushstring</A><BR>
+<A HREF="manual.html#lua_pushthread">lua_pushthread</A><BR>
+<A HREF="manual.html#lua_pushvalue">lua_pushvalue</A><BR>
+<A HREF="manual.html#lua_pushvfstring">lua_pushvfstring</A><BR>
+<A HREF="manual.html#lua_rawequal">lua_rawequal</A><BR>
+<A HREF="manual.html#lua_rawget">lua_rawget</A><BR>
+<A HREF="manual.html#lua_rawgeti">lua_rawgeti</A><BR>
+<A HREF="manual.html#lua_rawgetp">lua_rawgetp</A><BR>
+<A HREF="manual.html#lua_rawlen">lua_rawlen</A><BR>
+<A HREF="manual.html#lua_rawset">lua_rawset</A><BR>
+<A HREF="manual.html#lua_rawseti">lua_rawseti</A><BR>
+<A HREF="manual.html#lua_rawsetp">lua_rawsetp</A><BR>
+<A HREF="manual.html#lua_register">lua_register</A><BR>
+<A HREF="manual.html#lua_remove">lua_remove</A><BR>
+<A HREF="manual.html#lua_replace">lua_replace</A><BR>
+<A HREF="manual.html#lua_resetthread">lua_resetthread</A><BR>
+<A HREF="manual.html#lua_resume">lua_resume</A><BR>
+<A HREF="manual.html#lua_rotate">lua_rotate</A><BR>
+<A HREF="manual.html#lua_setallocf">lua_setallocf</A><BR>
+<A HREF="manual.html#lua_setfield">lua_setfield</A><BR>
+<A HREF="manual.html#lua_setglobal">lua_setglobal</A><BR>
+<A HREF="manual.html#lua_sethook">lua_sethook</A><BR>
+<A HREF="manual.html#lua_seti">lua_seti</A><BR>
+<A HREF="manual.html#lua_setiuservalue">lua_setiuservalue</A><BR>
+<A HREF="manual.html#lua_setlocal">lua_setlocal</A><BR>
+<A HREF="manual.html#lua_setmetatable">lua_setmetatable</A><BR>
+<A HREF="manual.html#lua_settable">lua_settable</A><BR>
+<A HREF="manual.html#lua_settop">lua_settop</A><BR>
+<A HREF="manual.html#lua_setupvalue">lua_setupvalue</A><BR>
+<A HREF="manual.html#lua_setwarnf">lua_setwarnf</A><BR>
+<A HREF="manual.html#lua_status">lua_status</A><BR>
+<A HREF="manual.html#lua_stringtonumber">lua_stringtonumber</A><BR>
+<A HREF="manual.html#lua_toboolean">lua_toboolean</A><BR>
+<A HREF="manual.html#lua_tocfunction">lua_tocfunction</A><BR>
+<A HREF="manual.html#lua_toclose">lua_toclose</A><BR>
+<A HREF="manual.html#lua_tointeger">lua_tointeger</A><BR>
+<A HREF="manual.html#lua_tointegerx">lua_tointegerx</A><BR>
+<A HREF="manual.html#lua_tolstring">lua_tolstring</A><BR>
+<A HREF="manual.html#lua_tonumber">lua_tonumber</A><BR>
+<A HREF="manual.html#lua_tonumberx">lua_tonumberx</A><BR>
+<A HREF="manual.html#lua_topointer">lua_topointer</A><BR>
+<A HREF="manual.html#lua_tostring">lua_tostring</A><BR>
+<A HREF="manual.html#lua_tothread">lua_tothread</A><BR>
+<A HREF="manual.html#lua_touserdata">lua_touserdata</A><BR>
+<A HREF="manual.html#lua_type">lua_type</A><BR>
+<A HREF="manual.html#lua_typename">lua_typename</A><BR>
+<A HREF="manual.html#lua_upvalueid">lua_upvalueid</A><BR>
+<A HREF="manual.html#lua_upvalueindex">lua_upvalueindex</A><BR>
+<A HREF="manual.html#lua_upvaluejoin">lua_upvaluejoin</A><BR>
+<A HREF="manual.html#lua_version">lua_version</A><BR>
+<A HREF="manual.html#lua_warning">lua_warning</A><BR>
+<A HREF="manual.html#lua_xmove">lua_xmove</A><BR>
+<A HREF="manual.html#lua_yield">lua_yield</A><BR>
+<A HREF="manual.html#lua_yieldk">lua_yieldk</A><BR>
+
+</TD>
+<TD>
+<H3><A NAME="auxlib">auxiliary library</A></H3>
+<P>
+<A HREF="manual.html#luaL_Buffer">luaL_Buffer</A><BR>
+<A HREF="manual.html#luaL_Reg">luaL_Reg</A><BR>
+<A HREF="manual.html#luaL_Stream">luaL_Stream</A><BR>
+
+<P>
+<A HREF="manual.html#luaL_addchar">luaL_addchar</A><BR>
+<A HREF="manual.html#luaL_addgsub">luaL_addgsub</A><BR>
+<A HREF="manual.html#luaL_addlstring">luaL_addlstring</A><BR>
+<A HREF="manual.html#luaL_addsize">luaL_addsize</A><BR>
+<A HREF="manual.html#luaL_addstring">luaL_addstring</A><BR>
+<A HREF="manual.html#luaL_addvalue">luaL_addvalue</A><BR>
+<A HREF="manual.html#luaL_argcheck">luaL_argcheck</A><BR>
+<A HREF="manual.html#luaL_argerror">luaL_argerror</A><BR>
+<A HREF="manual.html#luaL_argexpected">luaL_argexpected</A><BR>
+<A HREF="manual.html#luaL_buffaddr">luaL_buffaddr</A><BR>
+<A HREF="manual.html#luaL_buffinit">luaL_buffinit</A><BR>
+<A HREF="manual.html#luaL_buffinitsize">luaL_buffinitsize</A><BR>
+<A HREF="manual.html#luaL_bufflen">luaL_bufflen</A><BR>
+<A HREF="manual.html#luaL_buffsub">luaL_buffsub</A><BR>
+<A HREF="manual.html#luaL_callmeta">luaL_callmeta</A><BR>
+<A HREF="manual.html#luaL_checkany">luaL_checkany</A><BR>
+<A HREF="manual.html#luaL_checkinteger">luaL_checkinteger</A><BR>
+<A HREF="manual.html#luaL_checklstring">luaL_checklstring</A><BR>
+<A HREF="manual.html#luaL_checknumber">luaL_checknumber</A><BR>
+<A HREF="manual.html#luaL_checkoption">luaL_checkoption</A><BR>
+<A HREF="manual.html#luaL_checkstack">luaL_checkstack</A><BR>
+<A HREF="manual.html#luaL_checkstring">luaL_checkstring</A><BR>
+<A HREF="manual.html#luaL_checktype">luaL_checktype</A><BR>
+<A HREF="manual.html#luaL_checkudata">luaL_checkudata</A><BR>
+<A HREF="manual.html#luaL_checkversion">luaL_checkversion</A><BR>
+<A HREF="manual.html#luaL_dofile">luaL_dofile</A><BR>
+<A HREF="manual.html#luaL_dostring">luaL_dostring</A><BR>
+<A HREF="manual.html#luaL_error">luaL_error</A><BR>
+<A HREF="manual.html#luaL_execresult">luaL_execresult</A><BR>
+<A HREF="manual.html#luaL_fileresult">luaL_fileresult</A><BR>
+<A HREF="manual.html#luaL_getmetafield">luaL_getmetafield</A><BR>
+<A HREF="manual.html#luaL_getmetatable">luaL_getmetatable</A><BR>
+<A HREF="manual.html#luaL_getsubtable">luaL_getsubtable</A><BR>
+<A HREF="manual.html#luaL_gsub">luaL_gsub</A><BR>
+<A HREF="manual.html#luaL_len">luaL_len</A><BR>
+<A HREF="manual.html#luaL_loadbuffer">luaL_loadbuffer</A><BR>
+<A HREF="manual.html#luaL_loadbufferx">luaL_loadbufferx</A><BR>
+<A HREF="manual.html#luaL_loadfile">luaL_loadfile</A><BR>
+<A HREF="manual.html#luaL_loadfilex">luaL_loadfilex</A><BR>
+<A HREF="manual.html#luaL_loadstring">luaL_loadstring</A><BR>
+<A HREF="manual.html#luaL_newlib">luaL_newlib</A><BR>
+<A HREF="manual.html#luaL_newlibtable">luaL_newlibtable</A><BR>
+<A HREF="manual.html#luaL_newmetatable">luaL_newmetatable</A><BR>
+<A HREF="manual.html#luaL_newstate">luaL_newstate</A><BR>
+<A HREF="manual.html#luaL_openlibs">luaL_openlibs</A><BR>
+<A HREF="manual.html#luaL_opt">luaL_opt</A><BR>
+<A HREF="manual.html#luaL_optinteger">luaL_optinteger</A><BR>
+<A HREF="manual.html#luaL_optlstring">luaL_optlstring</A><BR>
+<A HREF="manual.html#luaL_optnumber">luaL_optnumber</A><BR>
+<A HREF="manual.html#luaL_optstring">luaL_optstring</A><BR>
+<A HREF="manual.html#luaL_prepbuffer">luaL_prepbuffer</A><BR>
+<A HREF="manual.html#luaL_prepbuffsize">luaL_prepbuffsize</A><BR>
+<A HREF="manual.html#luaL_pushfail">luaL_pushfail</A><BR>
+<A HREF="manual.html#luaL_pushresult">luaL_pushresult</A><BR>
+<A HREF="manual.html#luaL_pushresultsize">luaL_pushresultsize</A><BR>
+<A HREF="manual.html#luaL_ref">luaL_ref</A><BR>
+<A HREF="manual.html#luaL_requiref">luaL_requiref</A><BR>
+<A HREF="manual.html#luaL_setfuncs">luaL_setfuncs</A><BR>
+<A HREF="manual.html#luaL_setmetatable">luaL_setmetatable</A><BR>
+<A HREF="manual.html#luaL_testudata">luaL_testudata</A><BR>
+<A HREF="manual.html#luaL_tolstring">luaL_tolstring</A><BR>
+<A HREF="manual.html#luaL_traceback">luaL_traceback</A><BR>
+<A HREF="manual.html#luaL_typeerror">luaL_typeerror</A><BR>
+<A HREF="manual.html#luaL_typename">luaL_typename</A><BR>
+<A HREF="manual.html#luaL_unref">luaL_unref</A><BR>
+<A HREF="manual.html#luaL_where">luaL_where</A><BR>
+
+<H3><A NAME="library">standard library</A></H3>
+<P>
+<A HREF="manual.html#pdf-luaopen_base">luaopen_base</A><BR>
+<A HREF="manual.html#pdf-luaopen_coroutine">luaopen_coroutine</A><BR>
+<A HREF="manual.html#pdf-luaopen_debug">luaopen_debug</A><BR>
+<A HREF="manual.html#pdf-luaopen_io">luaopen_io</A><BR>
+<A HREF="manual.html#pdf-luaopen_math">luaopen_math</A><BR>
+<A HREF="manual.html#pdf-luaopen_os">luaopen_os</A><BR>
+<A HREF="manual.html#pdf-luaopen_package">luaopen_package</A><BR>
+<A HREF="manual.html#pdf-luaopen_string">luaopen_string</A><BR>
+<A HREF="manual.html#pdf-luaopen_table">luaopen_table</A><BR>
+<A HREF="manual.html#pdf-luaopen_utf8">luaopen_utf8</A><BR>
+
+<H3><A NAME="constants">constants</A></H3>
+<P>
+<A HREF="manual.html#pdf-LUA_ERRERR">LUA_ERRERR</A><BR>
+<A HREF="manual.html#pdf-LUA_ERRFILE">LUA_ERRFILE</A><BR>
+<A HREF="manual.html#pdf-LUA_ERRMEM">LUA_ERRMEM</A><BR>
+<A HREF="manual.html#pdf-LUA_ERRRUN">LUA_ERRRUN</A><BR>
+<A HREF="manual.html#pdf-LUA_ERRSYNTAX">LUA_ERRSYNTAX</A><BR>
+<A HREF="manual.html#pdf-LUA_HOOKCALL">LUA_HOOKCALL</A><BR>
+<A HREF="manual.html#pdf-LUA_HOOKCOUNT">LUA_HOOKCOUNT</A><BR>
+<A HREF="manual.html#pdf-LUA_HOOKLINE">LUA_HOOKLINE</A><BR>
+<A HREF="manual.html#pdf-LUA_HOOKRET">LUA_HOOKRET</A><BR>
+<A HREF="manual.html#pdf-LUA_HOOKTAILCALL">LUA_HOOKTAILCALL</A><BR>
+<A HREF="manual.html#pdf-LUA_LOADED_TABLE">LUA_LOADED_TABLE</A><BR>
+<A HREF="manual.html#pdf-LUA_MASKCALL">LUA_MASKCALL</A><BR>
+<A HREF="manual.html#pdf-LUA_MASKCOUNT">LUA_MASKCOUNT</A><BR>
+<A HREF="manual.html#pdf-LUA_MASKLINE">LUA_MASKLINE</A><BR>
+<A HREF="manual.html#pdf-LUA_MASKRET">LUA_MASKRET</A><BR>
+<A HREF="manual.html#pdf-LUA_MAXINTEGER">LUA_MAXINTEGER</A><BR>
+<A HREF="manual.html#pdf-LUA_MININTEGER">LUA_MININTEGER</A><BR>
+<A HREF="manual.html#pdf-LUA_MINSTACK">LUA_MINSTACK</A><BR>
+<A HREF="manual.html#pdf-LUA_MULTRET">LUA_MULTRET</A><BR>
+<A HREF="manual.html#pdf-LUA_NOREF">LUA_NOREF</A><BR>
+<A HREF="manual.html#pdf-LUA_OK">LUA_OK</A><BR>
+<A HREF="manual.html#pdf-LUA_OPADD">LUA_OPADD</A><BR>
+<A HREF="manual.html#pdf-LUA_OPBAND">LUA_OPBAND</A><BR>
+<A HREF="manual.html#pdf-LUA_OPBNOT">LUA_OPBNOT</A><BR>
+<A HREF="manual.html#pdf-LUA_OPBOR">LUA_OPBOR</A><BR>
+<A HREF="manual.html#pdf-LUA_OPBXOR">LUA_OPBXOR</A><BR>
+<A HREF="manual.html#pdf-LUA_OPDIV">LUA_OPDIV</A><BR>
+<A HREF="manual.html#pdf-LUA_OPEQ">LUA_OPEQ</A><BR>
+<A HREF="manual.html#pdf-LUA_OPIDIV">LUA_OPIDIV</A><BR>
+<A HREF="manual.html#pdf-LUA_OPLE">LUA_OPLE</A><BR>
+<A HREF="manual.html#pdf-LUA_OPLT">LUA_OPLT</A><BR>
+<A HREF="manual.html#pdf-LUA_OPMOD">LUA_OPMOD</A><BR>
+<A HREF="manual.html#pdf-LUA_OPMUL">LUA_OPMUL</A><BR>
+<A HREF="manual.html#pdf-LUA_OPPOW">LUA_OPPOW</A><BR>
+<A HREF="manual.html#pdf-LUA_OPSHL">LUA_OPSHL</A><BR>
+<A HREF="manual.html#pdf-LUA_OPSHR">LUA_OPSHR</A><BR>
+<A HREF="manual.html#pdf-LUA_OPSUB">LUA_OPSUB</A><BR>
+<A HREF="manual.html#pdf-LUA_OPUNM">LUA_OPUNM</A><BR>
+<A HREF="manual.html#pdf-LUA_PRELOAD_TABLE">LUA_PRELOAD_TABLE</A><BR>
+<A HREF="manual.html#pdf-LUA_REFNIL">LUA_REFNIL</A><BR>
+<A HREF="manual.html#pdf-LUA_REGISTRYINDEX">LUA_REGISTRYINDEX</A><BR>
+<A HREF="manual.html#pdf-LUA_RIDX_GLOBALS">LUA_RIDX_GLOBALS</A><BR>
+<A HREF="manual.html#pdf-LUA_RIDX_MAINTHREAD">LUA_RIDX_MAINTHREAD</A><BR>
+<A HREF="manual.html#pdf-LUA_TBOOLEAN">LUA_TBOOLEAN</A><BR>
+<A HREF="manual.html#pdf-LUA_TFUNCTION">LUA_TFUNCTION</A><BR>
+<A HREF="manual.html#pdf-LUA_TLIGHTUSERDATA">LUA_TLIGHTUSERDATA</A><BR>
+<A HREF="manual.html#pdf-LUA_TNIL">LUA_TNIL</A><BR>
+<A HREF="manual.html#pdf-LUA_TNONE">LUA_TNONE</A><BR>
+<A HREF="manual.html#pdf-LUA_TNUMBER">LUA_TNUMBER</A><BR>
+<A HREF="manual.html#pdf-LUA_TSTRING">LUA_TSTRING</A><BR>
+<A HREF="manual.html#pdf-LUA_TTABLE">LUA_TTABLE</A><BR>
+<A HREF="manual.html#pdf-LUA_TTHREAD">LUA_TTHREAD</A><BR>
+<A HREF="manual.html#pdf-LUA_TUSERDATA">LUA_TUSERDATA</A><BR>
+<A HREF="manual.html#pdf-LUA_USE_APICHECK">LUA_USE_APICHECK</A><BR>
+<A HREF="manual.html#pdf-LUA_YIELD">LUA_YIELD</A><BR>
+<A HREF="manual.html#pdf-LUAL_BUFFERSIZE">LUAL_BUFFERSIZE</A><BR>
+
+</TD>
+</TR>
+</TABLE>
+
+<P CLASS="footer">
+Last update:
+Sat Apr  1 17:57:05 UTC 2023
+</P>
+<!--
+Last change: revised for Lua 5.4.5
+-->
+
+</BODY>
+</HTML>
diff --git a/src/libs/3rdparty/lua/doc/index.css b/src/libs/3rdparty/lua/doc/index.css
new file mode 100644
index 00000000000..c9618357319
--- /dev/null
+++ b/src/libs/3rdparty/lua/doc/index.css
@@ -0,0 +1,21 @@
+ul {
+	list-style-type: none ;
+}
+
+ul.contents {
+	padding: 0 ;
+}
+
+table {
+	border: none ;
+	border-spacing: 0 ;
+	border-collapse: collapse ;
+}
+
+td {
+	vertical-align: top ;
+	padding: 0 ;
+	text-align: left ;
+	line-height: 1.25 ;
+	width: 15% ;
+}
diff --git a/src/libs/3rdparty/lua/doc/logo.gif b/src/libs/3rdparty/lua/doc/logo.gif
new file mode 100644
index 00000000000..5c77eacc3b8
Binary files /dev/null and b/src/libs/3rdparty/lua/doc/logo.gif differ
diff --git a/src/libs/3rdparty/lua/doc/lua.1 b/src/libs/3rdparty/lua/doc/lua.1
new file mode 100644
index 00000000000..3f472fd81f6
--- /dev/null
+++ b/src/libs/3rdparty/lua/doc/lua.1
@@ -0,0 +1,155 @@
+.\" $Id: lua.man,v 1.14 2022/09/23 09:06:36 lhf Exp $
+.TH LUA 1 "$Date: 2022/09/23 09:06:36 $"
+.SH NAME
+lua \- Lua interpreter
+.SH SYNOPSIS
+.B lua
+[
+.I options
+]
+[
+.I script
+[
+.I args
+]
+]
+.SH DESCRIPTION
+.B lua
+is the standalone Lua interpreter.
+It loads and executes Lua programs,
+either in textual source form or
+in precompiled binary form.
+(Precompiled binaries are output by
+.BR luac ,
+the Lua compiler.)
+.B lua
+can be used as a batch interpreter and also interactively.
+.LP
+After handling the
+.IR options ,
+the Lua program in file
+.I script
+is loaded and executed.
+The
+.I args
+are available to
+.I script
+as strings in a global table named
+.B arg
+and also as arguments to its main function.
+When called without arguments,
+.B lua
+behaves as
+.B "lua \-v \-i"
+if the standard input is a terminal,
+and as
+.B "lua \-"
+otherwise.
+.LP
+In interactive mode,
+.B lua
+prompts the user,
+reads lines from the standard input,
+and executes them as they are read.
+If the line contains an expression,
+then the line is evaluated and the result is printed.
+If a line does not contain a complete statement,
+then a secondary prompt is displayed and
+lines are read until a complete statement is formed or
+a syntax error is found.
+.LP
+Before handling command line options and scripts,
+.B lua
+checks the contents of the environment variables
+.B LUA_INIT_5_4
+and
+.BR LUA_INIT ,
+in that order.
+If the contents are of the form
+.RI '@ filename ',
+then
+.I filename
+is executed.
+Otherwise, the contents are assumed to be a Lua statement and is executed.
+When
+.B LUA_INIT_5_4
+is defined,
+.B LUA_INIT
+is ignored.
+.SH OPTIONS
+.TP
+.BI \-e " stat"
+execute statement
+.IR stat .
+.TP
+.B \-i
+enter interactive mode after executing
+.IR script .
+.TP
+.BI \-l " mod"
+require library
+.I mod
+into global
+.IR mod .
+.TP
+.BI \-l " g=mod"
+require library
+.I mod
+into global
+.IR g .
+.TP
+.B \-v
+show version information.
+.TP
+.B \-E
+ignore environment variables.
+.TP
+.B \-W
+turn warnings on.
+.TP
+.B \-\-
+stop handling options.
+.TP
+.B \-
+stop handling options and execute the standard input as a file.
+.SH ENVIRONMENT VARIABLES
+The following environment variables affect the execution of
+.BR lua .
+When defined,
+the version-specific variants take priority
+and the version-neutral variants are ignored.
+.TP
+.B LUA_INIT, LUA_INIT_5_4
+Code to be executed before command line options and scripts.
+.TP
+.B LUA_PATH, LUA_PATH_5_4
+Initial value of package.cpath,
+the path used by require to search for Lua loaders.
+.TP
+.B LUA_CPATH, LUA_CPATH_5_4
+Initial value of package.cpath,
+the path used by require to search for C loaders.
+.SH EXIT STATUS
+If a script calls os.exit,
+then
+.B lua
+exits with the given exit status.
+Otherwise,
+.B lua
+exits
+with EXIT_SUCCESS (0 on POSIX systems) if there were no errors
+and
+with EXIT_FAILURE (1 on POSIX systems) if there were errors.
+Errors raised in interactive mode do not cause exits.
+.SH DIAGNOSTICS
+Error messages should be self explanatory.
+.SH "SEE ALSO"
+.BR luac (1)
+.br
+The documentation at lua.org,
+especially section 7 of the reference manual.
+.SH AUTHORS
+R. Ierusalimschy,
+L. H. de Figueiredo,
+W. Celes
+.\" EOF
diff --git a/src/libs/3rdparty/lua/doc/lua.css b/src/libs/3rdparty/lua/doc/lua.css
new file mode 100644
index 00000000000..cbd0799d152
--- /dev/null
+++ b/src/libs/3rdparty/lua/doc/lua.css
@@ -0,0 +1,161 @@
+html {
+	background-color: #F8F8F8 ;
+}
+
+body {
+	background-color: #FFFFFF ;
+	color: #000000 ;
+	font-family: Helvetica, Arial, sans-serif ;
+	text-align: justify ;
+	line-height: 1.25 ;
+	margin: 16px auto ;
+	padding: 32px ;
+	border: solid #ccc 1px ;
+	border-radius: 20px ;
+	max-width: 70em ;
+	width: 90% ;
+}
+
+h1, h2, h3, h4 {
+	color: #000080 ;
+	font-family: Verdana, Geneva, sans-serif ;
+	font-weight: normal ;
+	font-style: normal ;
+	text-align: left ;
+}
+
+h1 {
+	font-size: 28pt ;
+}
+
+h1 img {
+	vertical-align: text-bottom ;
+}
+
+h2:before {
+	content: "\2756" ;
+	padding-right: 0.5em ;
+}
+
+a {
+	text-decoration: none ;
+}
+
+a:link {
+	color: #000080 ;
+}
+
+a:link:hover, a:visited:hover {
+	background-color: #D0D0FF ;
+	color: #000080 ;
+	border-radius: 4px ;
+}
+
+a:link:active, a:visited:active {
+	color: #FF0000 ;
+}
+
+div.menubar {
+	padding-bottom: 0.5em ;
+}
+
+p.menubar {
+	margin-left: 2.5em ;
+}
+
+.menubar a:hover  {
+	margin: -3px -3px -3px -3px ;
+	padding: 3px  3px  3px  3px ;
+	border-radius: 4px ;
+}
+
+:target {
+	background-color: #F0F0F0 ;
+	margin: -8px ;
+	padding: 8px ;
+	border-radius: 8px ;
+	outline: none ;
+}
+
+hr {
+	display: none ;
+}
+
+table hr {
+	background-color: #a0a0a0 ;
+	color: #a0a0a0 ;
+	border: 0 ;
+	height: 1px ;
+	display: block ;
+}
+
+.footer {
+	color: gray ;
+	font-size: x-small ;
+	text-transform: lowercase ;
+}
+
+input[type=text] {
+	border: solid #a0a0a0 2px ;
+	border-radius: 2em ;
+	background-image: url('images/search.png') ;
+	background-repeat: no-repeat ;
+	background-position: 4px center ;
+	padding-left: 20px ;
+	height: 2em ;
+}
+
+pre.session {
+	background-color: #F8F8F8 ;
+	padding: 1em ;
+	border-radius: 8px ;
+}
+
+table {
+	border: none ;
+	border-spacing: 0 ;
+	border-collapse: collapse ;
+}
+
+td {
+	padding: 0 ;
+	margin: 0 ;
+}
+
+td.gutter {
+	width: 4% ;
+}
+
+table.columns td {
+	vertical-align: top ;
+	padding-bottom: 1em ;
+	text-align: justify ;
+	line-height: 1.25 ;
+}
+
+table.book td {
+	vertical-align: top ;
+}
+
+table.book td.cover {
+	padding-right: 1em ;
+}
+
+table.book img {
+	border: solid #000080 1px ;
+}
+
+table.book span {
+	font-size: small ;
+	text-align: left ;
+	display: block ;
+	margin-top: 0.25em ;
+}
+
+p.logos a:link:hover, p.logos a:visited:hover {
+	background-color: inherit ;
+}
+
+img {
+	background-color: white ;
+}
diff --git a/src/libs/3rdparty/lua/doc/luac.1 b/src/libs/3rdparty/lua/doc/luac.1
new file mode 100644
index 00000000000..33a4ed00ace
--- /dev/null
+++ b/src/libs/3rdparty/lua/doc/luac.1
@@ -0,0 +1,118 @@
+.\" $Id: luac.man,v 1.29 2011/11/16 13:53:40 lhf Exp $
+.TH LUAC 1 "$Date: 2011/11/16 13:53:40 $"
+.SH NAME
+luac \- Lua compiler
+.SH SYNOPSIS
+.B luac
+[
+.I options
+] [
+.I filenames
+]
+.SH DESCRIPTION
+.B luac
+is the Lua compiler.
+It translates programs written in the Lua programming language
+into binary files containing precompiled chunks
+that can be later loaded and executed.
+.LP
+The main advantages of precompiling chunks are:
+faster loading,
+protecting source code from accidental user changes,
+and
+off-line syntax checking.
+Precompiling does not imply faster execution
+because in Lua chunks are always compiled into bytecodes before being executed.
+.B luac
+simply allows those bytecodes to be saved in a file for later execution.
+Precompiled chunks are not necessarily smaller than the corresponding source.
+The main goal in precompiling is faster loading.
+.LP
+In the command line,
+you can mix
+text files containing Lua source and
+binary files containing precompiled chunks.
+.B luac
+produces a single output file containing the combined bytecodes
+for all files given.
+Executing the combined file is equivalent to executing the given files.
+By default,
+the output file is named
+.BR luac.out ,
+but you can change this with the
+.B \-o
+option.
+.LP
+Precompiled chunks are
+.I not
+portable across different architectures.
+Moreover,
+the internal format of precompiled chunks
+is likely to change when a new version of Lua is released.
+Make sure you save the source files of all Lua programs that you precompile.
+.LP
+.SH OPTIONS
+.TP
+.B \-l
+produce a listing of the compiled bytecode for Lua's virtual machine.
+Listing bytecodes is useful to learn about Lua's virtual machine.
+If no files are given, then
+.B luac
+loads
+.B luac.out
+and lists its contents.
+Use
+.B \-l \-l
+for a full listing.
+.TP
+.BI \-o " file"
+output to
+.IR file ,
+instead of the default
+.BR luac.out .
+(You can use
+.B "'\-'"
+for standard output,
+but not on platforms that open standard output in text mode.)
+The output file may be one of the given files because
+all files are loaded before the output file is written.
+Be careful not to overwrite precious files.
+.TP
+.B \-p
+load files but do not generate any output file.
+Used mainly for syntax checking and for testing precompiled chunks:
+corrupted files will probably generate errors when loaded.
+If no files are given, then
+.B luac
+loads
+.B luac.out
+and tests its contents.
+No messages are displayed if the file loads without errors.
+.TP
+.B \-s
+strip debug information before writing the output file.
+This saves some space in very large chunks,
+but if errors occur when running a stripped chunk,
+then the error messages may not contain the full information they usually do.
+In particular,
+line numbers and names of local variables are lost.
+.TP
+.B \-v
+show version information.
+.TP
+.B \-\-
+stop handling options.
+.TP
+.B \-
+stop handling options and process standard input.
+.SH "SEE ALSO"
+.BR lua (1)
+.br
+The documentation at lua.org.
+.SH DIAGNOSTICS
+Error messages should be self explanatory.
+.SH AUTHORS
+R. Ierusalimschy,
+L. H. de Figueiredo,
+W. Celes
+.\" EOF
diff --git a/src/libs/3rdparty/lua/doc/manual.css b/src/libs/3rdparty/lua/doc/manual.css
new file mode 100644
index 00000000000..aa0e677dd52
--- /dev/null
+++ b/src/libs/3rdparty/lua/doc/manual.css
@@ -0,0 +1,21 @@
+h3 code {
+	font-family: inherit ;
+	font-size: inherit ;
+}
+
+pre, code {
+	font-size: 12pt ;
+}
+
+span.apii {
+	color: gray ;
+	float: right ;
+	font-family: inherit ;
+	font-style: normal ;
+	font-size: small ;
+}
+
+h2:before {
+	content: "" ;
+	padding-right: 0em ;
+}
diff --git a/src/libs/3rdparty/lua/doc/manual.html b/src/libs/3rdparty/lua/doc/manual.html
new file mode 100644
index 00000000000..0af688b343c
--- /dev/null
+++ b/src/libs/3rdparty/lua/doc/manual.html
@@ -0,0 +1,12046 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML>
+<HEAD>
+<TITLE>Lua 5.4 Reference Manual</TITLE>
+<LINK REL="stylesheet" TYPE="text/css" HREF="lua.css">
+<LINK REL="stylesheet" TYPE="text/css" HREF="manual.css">
+<META HTTP-EQUIV="content-type" CONTENT="text/html; charset=iso-8859-1">
+</HEAD>
+
+<BODY>
+
+<H1>
+<A HREF="http://www.lua.org/"><IMG SRC="logo.gif" ALT="Lua"></A>
+Lua 5.4 Reference Manual
+</H1>
+
+<P>
+by Roberto Ierusalimschy, Luiz Henrique de Figueiredo, Waldemar Celes
+
+<P>
+<SMALL>
+Copyright &copy; 2020&ndash;2023 Lua.org, PUC-Rio.
+Freely available under the terms of the
+<a href="http://www.lua.org/license.html">Lua license</a>.
+</SMALL>
+
+<DIV CLASS="menubar">
+<A HREF="contents.html#contents">contents</A>
+&middot;
+<A HREF="contents.html#index">index</A>
+&middot;
+<A HREF="http://www.lua.org/manual/">other versions</A>
+</DIV>
+
+<!-- ====================================================================== -->
+<p>
+
+<!-- $Id: manual.of $ -->
+
+
+
+
+<h1>1 &ndash; <a name="1">Introduction</a></h1>
+
+<p>
+Lua is a powerful, efficient, lightweight, embeddable scripting language.
+It supports procedural programming,
+object-oriented programming, functional programming,
+data-driven programming, and data description.
+
+
+<p>
+Lua combines simple procedural syntax with powerful data description
+constructs based on associative arrays and extensible semantics.
+Lua is dynamically typed,
+runs by interpreting bytecode with a register-based
+virtual machine,
+and has automatic memory management with
+a generational garbage collection,
+making it ideal for configuration, scripting,
+and rapid prototyping.
+
+
+<p>
+Lua is implemented as a library, written in <em>clean C</em>,
+the common subset of standard&nbsp;C and C++.
+The Lua distribution includes a host program called <code>lua</code>,
+which uses the Lua library to offer a complete,
+standalone Lua interpreter,
+for interactive or batch use.
+Lua is intended to be used both as a powerful, lightweight,
+embeddable scripting language for any program that needs one,
+and as a powerful but lightweight and efficient stand-alone language.
+
+
+<p>
+As an extension language, Lua has no notion of a "main" program:
+it works <em>embedded</em> in a host client,
+called the <em>embedding program</em> or simply the <em>host</em>.
+(Frequently, this host is the stand-alone <code>lua</code> program.)
+The host program can invoke functions to execute a piece of Lua code,
+can write and read Lua variables,
+and can register C&nbsp;functions to be called by Lua code.
+Through the use of C&nbsp;functions, Lua can be augmented to cope with
+a wide range of different domains,
+thus creating customized programming languages sharing a syntactical framework.
+
+
+<p>
+Lua is free software,
+and is provided as usual with no guarantees,
+as stated in its license.
+The implementation described in this manual is available
+at Lua's official web site, <code>www.lua.org</code>.
+
+
+<p>
+Like any other reference manual,
+this document is dry in places.
+For a discussion of the decisions behind the design of Lua,
+see the technical papers available at Lua's web site.
+For a detailed introduction to programming in Lua,
+see Roberto's book, <em>Programming in Lua</em>.
+
+
+
+<h1>2 &ndash; <a name="2">Basic Concepts</a></h1>
+
+
+
+<p>
+This section describes the basic concepts of the language.
+
+
+
+
+
+<h2>2.1 &ndash; <a name="2.1">Values and Types</a></h2>
+
+<p>
+Lua is a dynamically typed language.
+This means that
+variables do not have types; only values do.
+There are no type definitions in the language.
+All values carry their own type.
+
+
+<p>
+All values in Lua are first-class values.
+This means that all values can be stored in variables,
+passed as arguments to other functions, and returned as results.
+
+
+<p>
+There are eight basic types in Lua:
+<em>nil</em>, <em>boolean</em>, <em>number</em>,
+<em>string</em>, <em>function</em>, <em>userdata</em>,
+<em>thread</em>, and <em>table</em>.
+The type <em>nil</em> has one single value, <b>nil</b>,
+whose main property is to be different from any other value;
+it often represents the absence of a useful value.
+The type <em>boolean</em> has two values, <b>false</b> and <b>true</b>.
+Both <b>nil</b> and <b>false</b> make a condition false;
+they are collectively called <em>false values</em>.
+Any other value makes a condition true.
+Despite its name,
+<b>false</b> is frequently used as an alternative to <b>nil</b>,
+with the key difference that <b>false</b> behaves
+like a regular value in a table,
+while a <b>nil</b> in a table represents an absent key.
+
+
+<p>
+The type <em>number</em> represents both
+integer numbers and real (floating-point) numbers,
+using two subtypes: <em>integer</em> and <em>float</em>.
+Standard Lua uses 64-bit integers and double-precision (64-bit) floats,
+but you can also compile Lua so that it
+uses 32-bit integers and/or single-precision (32-bit) floats.
+The option with 32 bits for both integers and floats
+is particularly attractive
+for small machines and embedded systems.
+(See macro <code>LUA_32BITS</code> in file <code>luaconf.h</code>.)
+
+
+<p>
+Unless stated otherwise,
+any overflow when manipulating integer values <em>wrap around</em>,
+according to the usual rules of two-complement arithmetic.
+(In other words,
+the actual result is the unique representable integer
+that is equal modulo <em>2<sup>n</sup></em> to the mathematical result,
+where <em>n</em> is the number of bits of the integer type.)
+
+
+<p>
+Lua has explicit rules about when each subtype is used,
+but it also converts between them automatically as needed (see <a href="#3.4.3">&sect;3.4.3</a>).
+Therefore,
+the programmer may choose to mostly ignore the difference
+between integers and floats
+or to assume complete control over the representation of each number.
+
+
+<p>
+The type <em>string</em> represents immutable sequences of bytes.
+
+Lua is 8-bit clean:
+strings can contain any 8-bit value,
+including embedded zeros ('<code>\0</code>').
+Lua is also encoding-agnostic;
+it makes no assumptions about the contents of a string.
+The length of any string in Lua must fit in a Lua integer.
+
+
+<p>
+Lua can call (and manipulate) functions written in Lua and
+functions written in C (see <a href="#3.4.10">&sect;3.4.10</a>).
+Both are represented by the type <em>function</em>.
+
+
+<p>
+The type <em>userdata</em> is provided to allow arbitrary C&nbsp;data to
+be stored in Lua variables.
+A userdata value represents a block of raw memory.
+There are two kinds of userdata:
+<em>full userdata</em>,
+which is an object with a block of memory managed by Lua,
+and <em>light userdata</em>,
+which is simply a C&nbsp;pointer value.
+Userdata has no predefined operations in Lua,
+except assignment and identity test.
+By using <em>metatables</em>,
+the programmer can define operations for full userdata values
+(see <a href="#2.4">&sect;2.4</a>).
+Userdata values cannot be created or modified in Lua,
+only through the C&nbsp;API.
+This guarantees the integrity of data owned by
+the host program and C&nbsp;libraries.
+
+
+<p>
+The type <em>thread</em> represents independent threads of execution
+and it is used to implement coroutines (see <a href="#2.6">&sect;2.6</a>).
+Lua threads are not related to operating-system threads.
+Lua supports coroutines on all systems,
+even those that do not support threads natively.
+
+
+<p>
+The type <em>table</em> implements associative arrays,
+that is, arrays that can have as indices not only numbers,
+but any Lua value except <b>nil</b> and NaN.
+(<em>Not a Number</em> is a special floating-point value
+used by the IEEE 754 standard to represent
+undefined numerical results, such as <code>0/0</code>.)
+Tables can be <em>heterogeneous</em>;
+that is, they can contain values of all types (except <b>nil</b>).
+Any key associated to the value <b>nil</b> is not considered part of the table.
+Conversely, any key that is not part of a table has
+an associated value <b>nil</b>.
+
+
+<p>
+Tables are the sole data-structuring mechanism in Lua;
+they can be used to represent ordinary arrays, lists,
+symbol tables, sets, records, graphs, trees, etc.
+To represent records, Lua uses the field name as an index.
+The language supports this representation by
+providing <code>a.name</code> as syntactic sugar for <code>a["name"]</code>.
+There are several convenient ways to create tables in Lua
+(see <a href="#3.4.9">&sect;3.4.9</a>).
+
+
+<p>
+Like indices,
+the values of table fields can be of any type.
+In particular,
+because functions are first-class values,
+table fields can contain functions.
+Thus tables can also carry <em>methods</em> (see <a href="#3.4.11">&sect;3.4.11</a>).
+
+
+<p>
+The indexing of tables follows
+the definition of raw equality in the language.
+The expressions <code>a[i]</code> and <code>a[j]</code>
+denote the same table element
+if and only if <code>i</code> and <code>j</code> are raw equal
+(that is, equal without metamethods).
+In particular, floats with integral values
+are equal to their respective integers
+(e.g., <code>1.0 == 1</code>).
+To avoid ambiguities,
+any float used as a key that is equal to an integer
+is converted to that integer.
+For instance, if you write <code>a[2.0] = true</code>,
+the actual key inserted into the table will be the integer <code>2</code>.
+
+
+<p>
+Tables, functions, threads, and (full) userdata values are <em>objects</em>:
+variables do not actually <em>contain</em> these values,
+only <em>references</em> to them.
+Assignment, parameter passing, and function returns
+always manipulate references to such values;
+these operations do not imply any kind of copy.
+
+
+<p>
+The library function <a href="#pdf-type"><code>type</code></a> returns a string describing the type
+of a given value (see <a href="#pdf-type"><code>type</code></a>).
+
+
+
+
+
+<h2>2.2 &ndash; <a name="2.2">Environments and the Global Environment</a></h2>
+
+<p>
+As we will discuss further in <a href="#3.2">&sect;3.2</a> and <a href="#3.3.3">&sect;3.3.3</a>,
+any reference to a free name
+(that is, a name not bound to any declaration) <code>var</code>
+is syntactically translated to <code>_ENV.var</code>.
+Moreover, every chunk is compiled in the scope of
+an external local variable named <code>_ENV</code> (see <a href="#3.3.2">&sect;3.3.2</a>),
+so <code>_ENV</code> itself is never a free name in a chunk.
+
+
+<p>
+Despite the existence of this external <code>_ENV</code> variable and
+the translation of free names,
+<code>_ENV</code> is a completely regular name.
+In particular,
+you can define new variables and parameters with that name.
+Each reference to a free name uses the <code>_ENV</code> that is
+visible at that point in the program,
+following the usual visibility rules of Lua (see <a href="#3.5">&sect;3.5</a>).
+
+
+<p>
+Any table used as the value of <code>_ENV</code> is called an <em>environment</em>.
+
+
+<p>
+Lua keeps a distinguished environment called the <em>global environment</em>.
+This value is kept at a special index in the C registry (see <a href="#4.3">&sect;4.3</a>).
+In Lua, the global variable <a href="#pdf-_G"><code>_G</code></a> is initialized with this same value.
+(<a href="#pdf-_G"><code>_G</code></a> is never used internally,
+so changing its value will affect only your own code.)
+
+
+<p>
+When Lua loads a chunk,
+the default value for its <code>_ENV</code> variable
+is the global environment (see <a href="#pdf-load"><code>load</code></a>).
+Therefore, by default,
+free names in Lua code refer to entries in the global environment
+and, therefore, they are also called <em>global variables</em>.
+Moreover, all standard libraries are loaded in the global environment
+and some functions there operate on that environment.
+You can use <a href="#pdf-load"><code>load</code></a> (or <a href="#pdf-loadfile"><code>loadfile</code></a>)
+to load a chunk with a different environment.
+(In C, you have to load the chunk and then change the value
+of its first upvalue; see <a href="#lua_setupvalue"><code>lua_setupvalue</code></a>.)
+
+
+
+
+
+<h2>2.3 &ndash; <a name="2.3">Error Handling</a></h2>
+
+<p>
+Several operations in Lua can <em>raise</em> an error.
+An error interrupts the normal flow of the program,
+which can continue by <em>catching</em> the error.
+
+
+<p>
+Lua code can explicitly raise an error by calling the
+<a href="#pdf-error"><code>error</code></a> function.
+(This function never returns.)
+
+
+<p>
+To catch errors in Lua,
+you can do a <em>protected call</em>,
+using <a href="#pdf-pcall"><code>pcall</code></a> (or <a href="#pdf-xpcall"><code>xpcall</code></a>).
+The function <a href="#pdf-pcall"><code>pcall</code></a> calls a given function in <em>protected mode</em>.
+Any error while running the function stops its execution,
+and control returns immediately to <code>pcall</code>,
+which returns a status code.
+
+
+<p>
+Because Lua is an embedded extension language,
+Lua code starts running by a call
+from C&nbsp;code in the host program.
+(When you use Lua standalone,
+the <code>lua</code> application is the host program.)
+Usually, this call is protected;
+so, when an otherwise unprotected error occurs during
+the compilation or execution of a Lua chunk,
+control returns to the host,
+which can take appropriate measures,
+such as printing an error message.
+
+
+<p>
+Whenever there is an error,
+an <em>error object</em>
+is propagated with information about the error.
+Lua itself only generates errors whose error object is a string,
+but programs may generate errors with
+any value as the error object.
+It is up to the Lua program or its host to handle such error objects.
+For historical reasons,
+an error object is often called an <em>error message</em>,
+even though it does not have to be a string.
+
+
+<p>
+When you use <a href="#pdf-xpcall"><code>xpcall</code></a> (or <a href="#lua_pcall"><code>lua_pcall</code></a>, in C)
+you may give a <em>message handler</em>
+to be called in case of errors.
+This function is called with the original error object
+and returns a new error object.
+It is called before the error unwinds the stack,
+so that it can gather more information about the error,
+for instance by inspecting the stack and creating a stack traceback.
+This message handler is still protected by the protected call;
+so, an error inside the message handler
+will call the message handler again.
+If this loop goes on for too long,
+Lua breaks it and returns an appropriate message.
+The message handler is called only for regular runtime errors.
+It is not called for memory-allocation errors
+nor for errors while running finalizers or other message handlers.
+
+
+<p>
+Lua also offers a system of <em>warnings</em> (see <a href="#pdf-warn"><code>warn</code></a>).
+Unlike errors, warnings do not interfere
+in any way with program execution.
+They typically only generate a message to the user,
+although this behavior can be adapted from C (see <a href="#lua_setwarnf"><code>lua_setwarnf</code></a>).
+
+
+
+
+
+<h2>2.4 &ndash; <a name="2.4">Metatables and Metamethods</a></h2>
+
+<p>
+Every value in Lua can have a <em>metatable</em>.
+This <em>metatable</em> is an ordinary Lua table
+that defines the behavior of the original value
+under certain events.
+You can change several aspects of the behavior
+of a value by setting specific fields in its metatable.
+For instance, when a non-numeric value is the operand of an addition,
+Lua checks for a function in the field <code>__add</code> of the value's metatable.
+If it finds one,
+Lua calls this function to perform the addition.
+
+
+<p>
+The key for each event in a metatable is a string
+with the event name prefixed by two underscores;
+the corresponding value is called a <em>metavalue</em>.
+For most events, the metavalue must be a function,
+which is then called a <em>metamethod</em>.
+In the previous example, the key is the string "<code>__add</code>"
+and the metamethod is the function that performs the addition.
+Unless stated otherwise,
+a metamethod may in fact be any callable value,
+which is either a function or a value with a <code>__call</code> metamethod.
+
+
+<p>
+You can query the metatable of any value
+using the <a href="#pdf-getmetatable"><code>getmetatable</code></a> function.
+Lua queries metamethods in metatables using a raw access (see <a href="#pdf-rawget"><code>rawget</code></a>).
+
+
+<p>
+You can replace the metatable of tables
+using the <a href="#pdf-setmetatable"><code>setmetatable</code></a> function.
+You cannot change the metatable of other types from Lua code,
+except by using the debug library (<a href="#6.10">&sect;6.10</a>).
+
+
+<p>
+Tables and full userdata have individual metatables,
+although multiple tables and userdata can share their metatables.
+Values of all other types share one single metatable per type;
+that is, there is one single metatable for all numbers,
+one for all strings, etc.
+By default, a value has no metatable,
+but the string library sets a metatable for the string type (see <a href="#6.4">&sect;6.4</a>).
+
+
+<p>
+A detailed list of operations controlled by metatables is given next.
+Each event is identified by its corresponding key.
+By convention, all metatable keys used by Lua are composed by
+two underscores followed by lowercase Latin letters.
+
+
+
+<ul>
+
+<li><b><code>__add</code>: </b>
+the addition (<code>+</code>) operation.
+If any operand for an addition is not a number,
+Lua will try to call a metamethod.
+It starts by checking the first operand (even if it is a number);
+if that operand does not define a metamethod for <code>__add</code>,
+then Lua will check the second operand.
+If Lua can find a metamethod,
+it calls the metamethod with the two operands as arguments,
+and the result of the call
+(adjusted to one value)
+is the result of the operation.
+Otherwise, if no metamethod is found,
+Lua raises an error.
+</li>
+
+<li><b><code>__sub</code>: </b>
+the subtraction (<code>-</code>) operation.
+Behavior similar to the addition operation.
+</li>
+
+<li><b><code>__mul</code>: </b>
+the multiplication (<code>*</code>) operation.
+Behavior similar to the addition operation.
+</li>
+
+<li><b><code>__div</code>: </b>
+the division (<code>/</code>) operation.
+Behavior similar to the addition operation.
+</li>
+
+<li><b><code>__mod</code>: </b>
+the modulo (<code>%</code>) operation.
+Behavior similar to the addition operation.
+</li>
+
+<li><b><code>__pow</code>: </b>
+the exponentiation (<code>^</code>) operation.
+Behavior similar to the addition operation.
+</li>
+
+<li><b><code>__unm</code>: </b>
+the negation (unary <code>-</code>) operation.
+Behavior similar to the addition operation.
+</li>
+
+<li><b><code>__idiv</code>: </b>
+the floor division (<code>//</code>) operation.
+Behavior similar to the addition operation.
+</li>
+
+<li><b><code>__band</code>: </b>
+the bitwise AND (<code>&amp;</code>) operation.
+Behavior similar to the addition operation,
+except that Lua will try a metamethod
+if any operand is neither an integer
+nor a float coercible to an integer (see <a href="#3.4.3">&sect;3.4.3</a>).
+</li>
+
+<li><b><code>__bor</code>: </b>
+the bitwise OR (<code>|</code>) operation.
+Behavior similar to the bitwise AND operation.
+</li>
+
+<li><b><code>__bxor</code>: </b>
+the bitwise exclusive OR (binary <code>~</code>) operation.
+Behavior similar to the bitwise AND operation.
+</li>
+
+<li><b><code>__bnot</code>: </b>
+the bitwise NOT (unary <code>~</code>) operation.
+Behavior similar to the bitwise AND operation.
+</li>
+
+<li><b><code>__shl</code>: </b>
+the bitwise left shift (<code>&lt;&lt;</code>) operation.
+Behavior similar to the bitwise AND operation.
+</li>
+
+<li><b><code>__shr</code>: </b>
+the bitwise right shift (<code>&gt;&gt;</code>) operation.
+Behavior similar to the bitwise AND operation.
+</li>
+
+<li><b><code>__concat</code>: </b>
+the concatenation (<code>..</code>) operation.
+Behavior similar to the addition operation,
+except that Lua will try a metamethod
+if any operand is neither a string nor a number
+(which is always coercible to a string).
+</li>
+
+<li><b><code>__len</code>: </b>
+the length (<code>#</code>) operation.
+If the object is not a string,
+Lua will try its metamethod.
+If there is a metamethod,
+Lua calls it with the object as argument,
+and the result of the call
+(always adjusted to one value)
+is the result of the operation.
+If there is no metamethod but the object is a table,
+then Lua uses the table length operation (see <a href="#3.4.7">&sect;3.4.7</a>).
+Otherwise, Lua raises an error.
+</li>
+
+<li><b><code>__eq</code>: </b>
+the equal (<code>==</code>) operation.
+Behavior similar to the addition operation,
+except that Lua will try a metamethod only when the values
+being compared are either both tables or both full userdata
+and they are not primitively equal.
+The result of the call is always converted to a boolean.
+</li>
+
+<li><b><code>__lt</code>: </b>
+the less than (<code>&lt;</code>) operation.
+Behavior similar to the addition operation,
+except that Lua will try a metamethod only when the values
+being compared are neither both numbers nor both strings.
+Moreover, the result of the call is always converted to a boolean.
+</li>
+
+<li><b><code>__le</code>: </b>
+the less equal (<code>&lt;=</code>) operation.
+Behavior similar to the less than operation.
+</li>
+
+<li><b><code>__index</code>: </b>
+The indexing access operation <code>table[key]</code>.
+This event happens when <code>table</code> is not a table or
+when <code>key</code> is not present in <code>table</code>.
+The metavalue is looked up in the metatable of <code>table</code>.
+
+
+<p>
+The metavalue for this event can be either a function, a table,
+or any value with an <code>__index</code> metavalue.
+If it is a function,
+it is called with <code>table</code> and <code>key</code> as arguments,
+and the result of the call
+(adjusted to one value)
+is the result of the operation.
+Otherwise,
+the final result is the result of indexing this metavalue with <code>key</code>.
+This indexing is regular, not raw,
+and therefore can trigger another <code>__index</code> metavalue.
+</li>
+
+<li><b><code>__newindex</code>: </b>
+The indexing assignment <code>table[key] = value</code>.
+Like the index event,
+this event happens when <code>table</code> is not a table or
+when <code>key</code> is not present in <code>table</code>.
+The metavalue is looked up in the metatable of <code>table</code>.
+
+
+<p>
+Like with indexing,
+the metavalue for this event can be either a function, a table,
+or any value with an <code>__newindex</code> metavalue.
+If it is a function,
+it is called with <code>table</code>, <code>key</code>, and <code>value</code> as arguments.
+Otherwise,
+Lua repeats the indexing assignment over this metavalue
+with the same key and value.
+This assignment is regular, not raw,
+and therefore can trigger another <code>__newindex</code> metavalue.
+
+
+<p>
+Whenever a <code>__newindex</code> metavalue is invoked,
+Lua does not perform the primitive assignment.
+If needed,
+the metamethod itself can call <a href="#pdf-rawset"><code>rawset</code></a>
+to do the assignment.
+</li>
+
+<li><b><code>__call</code>: </b>
+The call operation <code>func(args)</code>.
+This event happens when Lua tries to call a non-function value
+(that is, <code>func</code> is not a function).
+The metamethod is looked up in <code>func</code>.
+If present,
+the metamethod is called with <code>func</code> as its first argument,
+followed by the arguments of the original call (<code>args</code>).
+All results of the call
+are the results of the operation.
+This is the only metamethod that allows multiple results.
+</li>
+
+</ul>
+
+<p>
+In addition to the previous list,
+the interpreter also respects the following keys in metatables:
+<code>__gc</code> (see <a href="#2.5.3">&sect;2.5.3</a>),
+<code>__close</code> (see <a href="#3.3.8">&sect;3.3.8</a>),
+<code>__mode</code> (see <a href="#2.5.4">&sect;2.5.4</a>),
+and <code>__name</code>.
+(The entry <code>__name</code>,
+when it contains a string,
+may be used by <a href="#pdf-tostring"><code>tostring</code></a> and in error messages.)
+
+
+<p>
+For the unary operators (negation, length, and bitwise NOT),
+the metamethod is computed and called with a dummy second operand,
+equal to the first one.
+This extra operand is only to simplify Lua's internals
+(by making these operators behave like a binary operation)
+and may be removed in future versions.
+For most uses this extra operand is irrelevant.
+
+
+<p>
+Because metatables are regular tables,
+they can contain arbitrary fields,
+not only the event names defined above.
+Some functions in the standard library
+(e.g., <a href="#pdf-tostring"><code>tostring</code></a>)
+use other fields in metatables for their own purposes.
+
+
+<p>
+It is a good practice to add all needed metamethods to a table
+before setting it as a metatable of some object.
+In particular, the <code>__gc</code> metamethod works only when this order
+is followed (see <a href="#2.5.3">&sect;2.5.3</a>).
+It is also a good practice to set the metatable of an object
+right after its creation.
+
+
+
+
+
+<h2>2.5 &ndash; <a name="2.5">Garbage Collection</a></h2>
+
+
+
+<p>
+Lua performs automatic memory management.
+This means that
+you do not have to worry about allocating memory for new objects
+or freeing it when the objects are no longer needed.
+Lua manages memory automatically by running
+a <em>garbage collector</em> to collect all <em>dead</em> objects.
+All memory used by Lua is subject to automatic management:
+strings, tables, userdata, functions, threads, internal structures, etc.
+
+
+<p>
+An object is considered <em>dead</em>
+as soon as the collector can be sure the object
+will not be accessed again in the normal execution of the program.
+("Normal execution" here excludes finalizers,
+which can resurrect dead objects (see <a href="#2.5.3">&sect;2.5.3</a>),
+and excludes also operations using the debug library.)
+Note that the time when the collector can be sure that an object
+is dead may not coincide with the programmer's expectations.
+The only guarantees are that Lua will not collect an object
+that may still be accessed in the normal execution of the program,
+and it will eventually collect an object
+that is inaccessible from Lua.
+(Here,
+<em>inaccessible from Lua</em> means that neither a variable nor
+another live object refer to the object.)
+Because Lua has no knowledge about C&nbsp;code,
+it never collects objects accessible through the registry (see <a href="#4.3">&sect;4.3</a>),
+which includes the global environment (see <a href="#2.2">&sect;2.2</a>).
+
+
+<p>
+The garbage collector (GC) in Lua can work in two modes:
+incremental and generational.
+
+
+<p>
+The default GC mode with the default parameters
+are adequate for most uses.
+However, programs that waste a large proportion of their time
+allocating and freeing memory can benefit from other settings.
+Keep in mind that the GC behavior is non-portable
+both across platforms and across different Lua releases;
+therefore, optimal settings are also non-portable.
+
+
+<p>
+You can change the GC mode and parameters by calling
+<a href="#lua_gc"><code>lua_gc</code></a> in&nbsp;C
+or <a href="#pdf-collectgarbage"><code>collectgarbage</code></a> in Lua.
+You can also use these functions to control
+the collector directly (e.g., to stop and restart it).
+
+
+
+
+
+<h3>2.5.1 &ndash; <a name="2.5.1">Incremental Garbage Collection</a></h3>
+
+<p>
+In incremental mode,
+each GC cycle performs a mark-and-sweep collection in small steps
+interleaved with the program's execution.
+In this mode,
+the collector uses three numbers to control its garbage-collection cycles:
+the <em>garbage-collector pause</em>,
+the <em>garbage-collector step multiplier</em>,
+and the <em>garbage-collector step size</em>.
+
+
+<p>
+The garbage-collector pause
+controls how long the collector waits before starting a new cycle.
+The collector starts a new cycle when the use of memory
+hits <em>n%</em> of the use after the previous collection.
+Larger values make the collector less aggressive.
+Values equal to or less than 100 mean the collector will not wait to
+start a new cycle.
+A value of 200 means that the collector waits for the total memory in use
+to double before starting a new cycle.
+The default value is 200; the maximum value is 1000.
+
+
+<p>
+The garbage-collector step multiplier
+controls the speed of the collector relative to
+memory allocation,
+that is,
+how many elements it marks or sweeps for each
+kilobyte of memory allocated.
+Larger values make the collector more aggressive but also increase
+the size of each incremental step.
+You should not use values less than 100,
+because they make the collector too slow and
+can result in the collector never finishing a cycle.
+The default value is 100;  the maximum value is 1000.
+
+
+<p>
+The garbage-collector step size controls the
+size of each incremental step,
+specifically how many bytes the interpreter allocates
+before performing a step.
+This parameter is logarithmic:
+A value of <em>n</em> means the interpreter will allocate <em>2<sup>n</sup></em>
+bytes between steps and perform equivalent work during the step.
+A large value (e.g., 60) makes the collector a stop-the-world
+(non-incremental) collector.
+The default value is 13,
+which means steps of approximately 8&nbsp;Kbytes.
+
+
+
+
+
+<h3>2.5.2 &ndash; <a name="2.5.2">Generational Garbage Collection</a></h3>
+
+<p>
+In generational mode,
+the collector does frequent <em>minor</em> collections,
+which traverses only objects recently created.
+If after a minor collection the use of memory is still above a limit,
+the collector does a stop-the-world <em>major</em> collection,
+which traverses all objects.
+The generational mode uses two parameters:
+the <em>minor multiplier</em> and the <em>the major multiplier</em>.
+
+
+<p>
+The minor multiplier controls the frequency of minor collections.
+For a minor multiplier <em>x</em>,
+a new minor collection will be done when memory
+grows <em>x%</em> larger than the memory in use after the previous major
+collection.
+For instance, for a multiplier of 20,
+the collector will do a minor collection when the use of memory
+gets 20% larger than the use after the previous major collection.
+The default value is 20; the maximum value is 200.
+
+
+<p>
+The major multiplier controls the frequency of major collections.
+For a major multiplier <em>x</em>,
+a new major collection will be done when memory
+grows <em>x%</em> larger than the memory in use after the previous major
+collection.
+For instance, for a multiplier of 100,
+the collector will do a major collection when the use of memory
+gets larger than twice the use after the previous collection.
+The default value is 100; the maximum value is 1000.
+
+
+
+
+
+<h3>2.5.3 &ndash; <a name="2.5.3">Garbage-Collection Metamethods</a></h3>
+
+<p>
+You can set garbage-collector metamethods for tables
+and, using the C&nbsp;API,
+for full userdata (see <a href="#2.4">&sect;2.4</a>).
+These metamethods, called <em>finalizers</em>,
+are called when the garbage collector detects that the
+corresponding table or userdata is dead.
+Finalizers allow you to coordinate Lua's garbage collection
+with external resource management such as closing files,
+network or database connections,
+or freeing your own memory.
+
+
+<p>
+For an object (table or userdata) to be finalized when collected,
+you must <em>mark</em> it for finalization.
+
+You mark an object for finalization when you set its metatable
+and the metatable has a <code>__gc</code> metamethod.
+Note that if you set a metatable without a <code>__gc</code> field
+and later create that field in the metatable,
+the object will not be marked for finalization.
+
+
+<p>
+When a marked object becomes dead,
+it is not collected immediately by the garbage collector.
+Instead, Lua puts it in a list.
+After the collection,
+Lua goes through that list.
+For each object in the list,
+it checks the object's <code>__gc</code> metamethod:
+If it is present,
+Lua calls it with the object as its single argument.
+
+
+<p>
+At the end of each garbage-collection cycle,
+the finalizers are called in
+the reverse order that the objects were marked for finalization,
+among those collected in that cycle;
+that is, the first finalizer to be called is the one associated
+with the object marked last in the program.
+The execution of each finalizer may occur at any point during
+the execution of the regular code.
+
+
+<p>
+Because the object being collected must still be used by the finalizer,
+that object (and other objects accessible only through it)
+must be <em>resurrected</em> by Lua.
+Usually, this resurrection is transient,
+and the object memory is freed in the next garbage-collection cycle.
+However, if the finalizer stores the object in some global place
+(e.g., a global variable),
+then the resurrection is permanent.
+Moreover, if the finalizer marks a finalizing object for finalization again,
+its finalizer will be called again in the next cycle where the
+object is dead.
+In any case,
+the object memory is freed only in a GC cycle where
+the object is dead and not marked for finalization.
+
+
+<p>
+When you close a state (see <a href="#lua_close"><code>lua_close</code></a>),
+Lua calls the finalizers of all objects marked for finalization,
+following the reverse order that they were marked.
+If any finalizer marks objects for collection during that phase,
+these marks have no effect.
+
+
+<p>
+Finalizers cannot yield nor run the garbage collector.
+Because they can run in unpredictable times,
+it is good practice to restrict each finalizer
+to the minimum necessary to properly release
+its associated resource.
+
+
+<p>
+Any error while running a finalizer generates a warning;
+the error is not propagated.
+
+
+
+
+
+<h3>2.5.4 &ndash; <a name="2.5.4">Weak Tables</a></h3>
+
+<p>
+A <em>weak table</em> is a table whose elements are
+<em>weak references</em>.
+A weak reference is ignored by the garbage collector.
+In other words,
+if the only references to an object are weak references,
+then the garbage collector will collect that object.
+
+
+<p>
+A weak table can have weak keys, weak values, or both.
+A table with weak values allows the collection of its values,
+but prevents the collection of its keys.
+A table with both weak keys and weak values allows the collection of
+both keys and values.
+In any case, if either the key or the value is collected,
+the whole pair is removed from the table.
+The weakness of a table is controlled by the
+<code>__mode</code> field of its metatable.
+This metavalue, if present, must be one of the following strings:
+"<code>k</code>", for a table with weak keys;
+"<code>v</code>", for a table with weak values;
+or "<code>kv</code>", for a table with both weak keys and values.
+
+
+<p>
+A table with weak keys and strong values
+is also called an <em>ephemeron table</em>.
+In an ephemeron table,
+a value is considered reachable only if its key is reachable.
+In particular,
+if the only reference to a key comes through its value,
+the pair is removed.
+
+
+<p>
+Any change in the weakness of a table may take effect only
+at the next collect cycle.
+In particular, if you change the weakness to a stronger mode,
+Lua may still collect some items from that table
+before the change takes effect.
+
+
+<p>
+Only objects that have an explicit construction
+are removed from weak tables.
+Values, such as numbers and light C&nbsp;functions,
+are not subject to garbage collection,
+and therefore are not removed from weak tables
+(unless their associated values are collected).
+Although strings are subject to garbage collection,
+they do not have an explicit construction and
+their equality is by value;
+they behave more like values than like objects.
+Therefore, they are not removed from weak tables.
+
+
+<p>
+Resurrected objects
+(that is, objects being finalized
+and objects accessible only through objects being finalized)
+have a special behavior in weak tables.
+They are removed from weak values before running their finalizers,
+but are removed from weak keys only in the next collection
+after running their finalizers, when such objects are actually freed.
+This behavior allows the finalizer to access properties
+associated with the object through weak tables.
+
+
+<p>
+If a weak table is among the resurrected objects in a collection cycle,
+it may not be properly cleared until the next cycle.
+
+
+
+
+
+
+
+<h2>2.6 &ndash; <a name="2.6">Coroutines</a></h2>
+
+<p>
+Lua supports coroutines,
+also called <em>collaborative multithreading</em>.
+A coroutine in Lua represents an independent thread of execution.
+Unlike threads in multithread systems, however,
+a coroutine only suspends its execution by explicitly calling
+a yield function.
+
+
+<p>
+You create a coroutine by calling <a href="#pdf-coroutine.create"><code>coroutine.create</code></a>.
+Its sole argument is a function
+that is the main function of the coroutine.
+The <code>create</code> function only creates a new coroutine and
+returns a handle to it (an object of type <em>thread</em>);
+it does not start the coroutine.
+
+
+<p>
+You execute a coroutine by calling <a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a>.
+When you first call <a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a>,
+passing as its first argument
+a thread returned by <a href="#pdf-coroutine.create"><code>coroutine.create</code></a>,
+the coroutine starts its execution by
+calling its main function.
+Extra arguments passed to <a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a> are passed
+as arguments to that function.
+After the coroutine starts running,
+it runs until it terminates or <em>yields</em>.
+
+
+<p>
+A coroutine can terminate its execution in two ways:
+normally, when its main function returns
+(explicitly or implicitly, after the last instruction);
+and abnormally, if there is an unprotected error.
+In case of normal termination,
+<a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a> returns <b>true</b>,
+plus any values returned by the coroutine main function.
+In case of errors, <a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a> returns <b>false</b>
+plus the error object.
+In this case, the coroutine does not unwind its stack,
+so that it is possible to inspect it after the error
+with the debug API.
+
+
+<p>
+A coroutine yields by calling <a href="#pdf-coroutine.yield"><code>coroutine.yield</code></a>.
+When a coroutine yields,
+the corresponding <a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a> returns immediately,
+even if the yield happens inside nested function calls
+(that is, not in the main function,
+but in a function directly or indirectly called by the main function).
+In the case of a yield, <a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a> also returns <b>true</b>,
+plus any values passed to <a href="#pdf-coroutine.yield"><code>coroutine.yield</code></a>.
+The next time you resume the same coroutine,
+it continues its execution from the point where it yielded,
+with the call to <a href="#pdf-coroutine.yield"><code>coroutine.yield</code></a> returning any extra
+arguments passed to <a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a>.
+
+
+<p>
+Like <a href="#pdf-coroutine.create"><code>coroutine.create</code></a>,
+the <a href="#pdf-coroutine.wrap"><code>coroutine.wrap</code></a> function also creates a coroutine,
+but instead of returning the coroutine itself,
+it returns a function that, when called, resumes the coroutine.
+Any arguments passed to this function
+go as extra arguments to <a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a>.
+<a href="#pdf-coroutine.wrap"><code>coroutine.wrap</code></a> returns all the values returned by <a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a>,
+except the first one (the boolean error code).
+Unlike <a href="#pdf-coroutine.resume"><code>coroutine.resume</code></a>,
+the function created by <a href="#pdf-coroutine.wrap"><code>coroutine.wrap</code></a>
+propagates any error to the caller.
+In this case,
+the function also closes the coroutine (see <a href="#pdf-coroutine.close"><code>coroutine.close</code></a>).
+
+
+<p>
+As an example of how coroutines work,
+consider the following code:
+
+<pre>
+     function foo (a)
+       print("foo", a)
+       return coroutine.yield(2*a)
+     end
+     
+     co = coroutine.create(function (a,b)
+           print("co-body", a, b)
+           local r = foo(a+1)
+           print("co-body", r)
+           local r, s = coroutine.yield(a+b, a-b)
+           print("co-body", r, s)
+           return b, "end"
+     end)
+     
+     print("main", coroutine.resume(co, 1, 10))
+     print("main", coroutine.resume(co, "r"))
+     print("main", coroutine.resume(co, "x", "y"))
+     print("main", coroutine.resume(co, "x", "y"))
+</pre><p>
+When you run it, it produces the following output:
+
+<pre>
+     co-body 1       10
+     foo     2
+     main    true    4
+     co-body r
+     main    true    11      -9
+     co-body x       y
+     main    true    10      end
+     main    false   cannot resume dead coroutine
+</pre>
+
+<p>
+You can also create and manipulate coroutines through the C API:
+see functions <a href="#lua_newthread"><code>lua_newthread</code></a>, <a href="#lua_resume"><code>lua_resume</code></a>,
+and <a href="#lua_yield"><code>lua_yield</code></a>.
+
+
+
+
+
+<h1>3 &ndash; <a name="3">The Language</a></h1>
+
+
+
+<p>
+This section describes the lexis, the syntax, and the semantics of Lua.
+In other words,
+this section describes
+which tokens are valid,
+how they can be combined,
+and what their combinations mean.
+
+
+<p>
+Language constructs will be explained using the usual extended BNF notation,
+in which
+{<em>a</em>}&nbsp;means&nbsp;0 or more <em>a</em>'s, and
+[<em>a</em>]&nbsp;means an optional <em>a</em>.
+Non-terminals are shown like non-terminal,
+keywords are shown like <b>kword</b>,
+and other terminal symbols are shown like &lsquo;<b>=</b>&rsquo;.
+The complete syntax of Lua can be found in <a href="#9">&sect;9</a>
+at the end of this manual.
+
+
+
+
+
+<h2>3.1 &ndash; <a name="3.1">Lexical Conventions</a></h2>
+
+<p>
+Lua is a free-form language.
+It ignores spaces and comments between lexical elements (tokens),
+except as delimiters between two tokens.
+In source code,
+Lua recognizes as spaces the standard ASCII whitespace
+characters space, form feed, newline,
+carriage return, horizontal tab, and vertical tab.
+
+
+<p>
+<em>Names</em>
+(also called <em>identifiers</em>)
+in Lua can be any string of Latin letters,
+Arabic-Indic digits, and underscores,
+not beginning with a digit and
+not being a reserved word.
+Identifiers are used to name variables, table fields, and labels.
+
+
+<p>
+The following <em>keywords</em> are reserved
+and cannot be used as names:
+
+
+<pre>
+     and       break     do        else      elseif    end
+     false     for       function  goto      if        in
+     local     nil       not       or        repeat    return
+     then      true      until     while
+</pre>
+
+<p>
+Lua is a case-sensitive language:
+<code>and</code> is a reserved word, but <code>And</code> and <code>AND</code>
+are two different, valid names.
+As a convention,
+programs should avoid creating
+names that start with an underscore followed by
+one or more uppercase letters (such as <a href="#pdf-_VERSION"><code>_VERSION</code></a>).
+
+
+<p>
+The following strings denote other tokens:
+
+<pre>
+     +     -     *     /     %     ^     #
+     &amp;     ~     |     &lt;&lt;    &gt;&gt;    //
+     ==    ~=    &lt;=    &gt;=    &lt;     &gt;     =
+     (     )     {     }     [     ]     ::
+     ;     :     ,     .     ..    ...
+</pre>
+
+<p>
+A <em>short literal string</em>
+can be delimited by matching single or double quotes,
+and can contain the following C-like escape sequences:
+'<code>\a</code>' (bell),
+'<code>\b</code>' (backspace),
+'<code>\f</code>' (form feed),
+'<code>\n</code>' (newline),
+'<code>\r</code>' (carriage return),
+'<code>\t</code>' (horizontal tab),
+'<code>\v</code>' (vertical tab),
+'<code>\\</code>' (backslash),
+'<code>\"</code>' (quotation mark [double quote]),
+and '<code>\'</code>' (apostrophe [single quote]).
+A backslash followed by a line break
+results in a newline in the string.
+The escape sequence '<code>\z</code>' skips the following span
+of whitespace characters,
+including line breaks;
+it is particularly useful to break and indent a long literal string
+into multiple lines without adding the newlines and spaces
+into the string contents.
+A short literal string cannot contain unescaped line breaks
+nor escapes not forming a valid escape sequence.
+
+
+<p>
+We can specify any byte in a short literal string,
+including embedded zeros,
+by its numeric value.
+This can be done
+with the escape sequence <code>\x<em>XX</em></code>,
+where <em>XX</em> is a sequence of exactly two hexadecimal digits,
+or with the escape sequence <code>\<em>ddd</em></code>,
+where <em>ddd</em> is a sequence of up to three decimal digits.
+(Note that if a decimal escape sequence is to be followed by a digit,
+it must be expressed using exactly three digits.)
+
+
+<p>
+The UTF-8 encoding of a Unicode character
+can be inserted in a literal string with
+the escape sequence <code>\u{<em>XXX</em>}</code>
+(with mandatory enclosing braces),
+where <em>XXX</em> is a sequence of one or more hexadecimal digits
+representing the character code point.
+This code point can be any value less than <em>2<sup>31</sup></em>.
+(Lua uses the original UTF-8 specification here,
+which is not restricted to valid Unicode code points.)
+
+
+<p>
+Literal strings can also be defined using a long format
+enclosed by <em>long brackets</em>.
+We define an <em>opening long bracket of level <em>n</em></em> as an opening
+square bracket followed by <em>n</em> equal signs followed by another
+opening square bracket.
+So, an opening long bracket of level&nbsp;0 is written as <code>[[</code>, 
+an opening long bracket of level&nbsp;1 is written as <code>[=[</code>, 
+and so on.
+A <em>closing long bracket</em> is defined similarly;
+for instance,
+a closing long bracket of level&nbsp;4 is written as  <code>]====]</code>.
+A <em>long literal</em> starts with an opening long bracket of any level and
+ends at the first closing long bracket of the same level.
+It can contain any text except a closing bracket of the same level.
+Literals in this bracketed form can run for several lines,
+do not interpret any escape sequences,
+and ignore long brackets of any other level.
+Any kind of end-of-line sequence
+(carriage return, newline, carriage return followed by newline,
+or newline followed by carriage return)
+is converted to a simple newline.
+When the opening long bracket is immediately followed by a newline,
+the newline is not included in the string.
+
+
+<p>
+As an example, in a system using ASCII
+(in which '<code>a</code>' is coded as&nbsp;97,
+newline is coded as&nbsp;10, and '<code>1</code>' is coded as&nbsp;49),
+the five literal strings below denote the same string:
+
+<pre>
+     a = 'alo\n123"'
+     a = "alo\n123\""
+     a = '\97lo\10\04923"'
+     a = [[alo
+     123"]]
+     a = [==[
+     alo
+     123"]==]
+</pre>
+
+<p>
+Any byte in a literal string not
+explicitly affected by the previous rules represents itself.
+However, Lua opens files for parsing in text mode,
+and the system's file functions may have problems with
+some control characters.
+So, it is safer to represent
+binary data as a quoted literal with
+explicit escape sequences for the non-text characters.
+
+
+<p>
+A <em>numeric constant</em> (or <em>numeral</em>)
+can be written with an optional fractional part
+and an optional decimal exponent,
+marked by a letter '<code>e</code>' or '<code>E</code>'.
+Lua also accepts hexadecimal constants,
+which start with <code>0x</code> or <code>0X</code>.
+Hexadecimal constants also accept an optional fractional part
+plus an optional binary exponent,
+marked by a letter '<code>p</code>' or '<code>P</code>' and written in decimal.
+(For instance, <code>0x1.fp10</code> denotes 1984,
+which is <em>0x1f / 16</em> multiplied by <em>2<sup>10</sup></em>.)
+
+
+<p>
+A numeric constant with a radix point or an exponent
+denotes a float;
+otherwise,
+if its value fits in an integer or it is a hexadecimal constant,
+it denotes an integer;
+otherwise (that is, a decimal integer numeral that overflows),
+it denotes a float.
+Hexadecimal numerals with neither a radix point nor an exponent
+always denote an integer value;
+if the value overflows, it <em>wraps around</em>
+to fit into a valid integer.
+
+
+<p>
+Examples of valid integer constants are
+
+<pre>
+     3   345   0xff   0xBEBADA
+</pre><p>
+Examples of valid float constants are
+
+<pre>
+     3.0     3.1416     314.16e-2     0.31416E1     34e1
+     0x0.1E  0xA23p-4   0X1.921FB54442D18P+1
+</pre>
+
+<p>
+A <em>comment</em> starts with a double hyphen (<code>--</code>)
+anywhere outside a string.
+If the text immediately after <code>--</code> is not an opening long bracket,
+the comment is a <em>short comment</em>,
+which runs until the end of the line.
+Otherwise, it is a <em>long comment</em>,
+which runs until the corresponding closing long bracket.
+
+
+
+
+
+<h2>3.2 &ndash; <a name="3.2">Variables</a></h2>
+
+<p>
+Variables are places that store values.
+There are three kinds of variables in Lua:
+global variables, local variables, and table fields.
+
+
+<p>
+A single name can denote a global variable or a local variable
+(or a function's formal parameter,
+which is a particular kind of local variable):
+
+<pre>
+	var ::= Name
+</pre><p>
+Name denotes identifiers (see <a href="#3.1">&sect;3.1</a>).
+
+
+<p>
+Any variable name is assumed to be global unless explicitly declared
+as a local (see <a href="#3.3.7">&sect;3.3.7</a>).
+Local variables are <em>lexically scoped</em>:
+local variables can be freely accessed by functions
+defined inside their scope (see <a href="#3.5">&sect;3.5</a>).
+
+
+<p>
+Before the first assignment to a variable, its value is <b>nil</b>.
+
+
+<p>
+Square brackets are used to index a table:
+
+<pre>
+	var ::= prefixexp &lsquo;<b>[</b>&rsquo; exp &lsquo;<b>]</b>&rsquo;
+</pre><p>
+The meaning of accesses to table fields can be changed via metatables
+(see <a href="#2.4">&sect;2.4</a>).
+
+
+<p>
+The syntax <code>var.Name</code> is just syntactic sugar for
+<code>var["Name"]</code>:
+
+<pre>
+	var ::= prefixexp &lsquo;<b>.</b>&rsquo; Name
+</pre>
+
+<p>
+An access to a global variable <code>x</code>
+is equivalent to <code>_ENV.x</code>.
+Due to the way that chunks are compiled,
+the variable <code>_ENV</code> itself is never global (see <a href="#2.2">&sect;2.2</a>).
+
+
+
+
+
+<h2>3.3 &ndash; <a name="3.3">Statements</a></h2>
+
+
+
+<p>
+Lua supports an almost conventional set of statements,
+similar to those in other conventional languages.
+This set includes
+blocks, assignments, control structures, function calls,
+and variable declarations.
+
+
+
+
+
+<h3>3.3.1 &ndash; <a name="3.3.1">Blocks</a></h3>
+
+<p>
+A block is a list of statements,
+which are executed sequentially:
+
+<pre>
+	block ::= {stat}
+</pre><p>
+Lua has <em>empty statements</em>
+that allow you to separate statements with semicolons,
+start a block with a semicolon
+or write two semicolons in sequence:
+
+<pre>
+	stat ::= &lsquo;<b>;</b>&rsquo;
+</pre>
+
+<p>
+Both function calls and assignments
+can start with an open parenthesis.
+This possibility leads to an ambiguity in Lua's grammar.
+Consider the following fragment:
+
+<pre>
+     a = b + c
+     (print or io.write)('done')
+</pre><p>
+The grammar could see this fragment in two ways:
+
+<pre>
+     a = b + c(print or io.write)('done')
+     
+     a = b + c; (print or io.write)('done')
+</pre><p>
+The current parser always sees such constructions
+in the first way,
+interpreting the open parenthesis
+as the start of the arguments to a call.
+To avoid this ambiguity,
+it is a good practice to always precede with a semicolon
+statements that start with a parenthesis:
+
+<pre>
+     ;(print or io.write)('done')
+</pre>
+
+<p>
+A block can be explicitly delimited to produce a single statement:
+
+<pre>
+	stat ::= <b>do</b> block <b>end</b>
+</pre><p>
+Explicit blocks are useful
+to control the scope of variable declarations.
+Explicit blocks are also sometimes used to
+add a <b>return</b> statement in the middle
+of another block (see <a href="#3.3.4">&sect;3.3.4</a>).
+
+
+
+
+
+<h3>3.3.2 &ndash; <a name="3.3.2">Chunks</a></h3>
+
+<p>
+The unit of compilation of Lua is called a <em>chunk</em>.
+Syntactically,
+a chunk is simply a block:
+
+<pre>
+	chunk ::= block
+</pre>
+
+<p>
+Lua handles a chunk as the body of an anonymous function
+with a variable number of arguments
+(see <a href="#3.4.11">&sect;3.4.11</a>).
+As such, chunks can define local variables,
+receive arguments, and return values.
+Moreover, such anonymous function is compiled as in the
+scope of an external local variable called <code>_ENV</code> (see <a href="#2.2">&sect;2.2</a>).
+The resulting function always has <code>_ENV</code> as its only external variable,
+even if it does not use that variable.
+
+
+<p>
+A chunk can be stored in a file or in a string inside the host program.
+To execute a chunk,
+Lua first <em>loads</em> it,
+precompiling the chunk's code into instructions for a virtual machine,
+and then Lua executes the compiled code
+with an interpreter for the virtual machine.
+
+
+<p>
+Chunks can also be precompiled into binary form;
+see the program <code>luac</code> and the function <a href="#pdf-string.dump"><code>string.dump</code></a> for details.
+Programs in source and compiled forms are interchangeable;
+Lua automatically detects the file type and acts accordingly (see <a href="#pdf-load"><code>load</code></a>).
+
+
+
+
+
+<h3>3.3.3 &ndash; <a name="3.3.3">Assignment</a></h3>
+
+<p>
+Lua allows multiple assignments.
+Therefore, the syntax for assignment
+defines a list of variables on the left side
+and a list of expressions on the right side.
+The elements in both lists are separated by commas:
+
+<pre>
+	stat ::= varlist &lsquo;<b>=</b>&rsquo; explist
+	varlist ::= var {&lsquo;<b>,</b>&rsquo; var}
+	explist ::= exp {&lsquo;<b>,</b>&rsquo; exp}
+</pre><p>
+Expressions are discussed in <a href="#3.4">&sect;3.4</a>.
+
+
+<p>
+Before the assignment,
+the list of values is <em>adjusted</em> to the length of
+the list of variables (see <a href="#3.4.12">&sect;3.4.12</a>).
+
+
+<p>
+If a variable is both assigned and read
+inside a multiple assignment,
+Lua ensures that all reads get the value of the variable
+before the assignment.
+Thus the code
+
+<pre>
+     i = 3
+     i, a[i] = i+1, 20
+</pre><p>
+sets <code>a[3]</code> to 20, without affecting <code>a[4]</code>
+because the <code>i</code> in <code>a[i]</code> is evaluated (to 3)
+before it is assigned&nbsp;4.
+Similarly, the line
+
+<pre>
+     x, y = y, x
+</pre><p>
+exchanges the values of <code>x</code> and <code>y</code>,
+and
+
+<pre>
+     x, y, z = y, z, x
+</pre><p>
+cyclically permutes the values of <code>x</code>, <code>y</code>, and <code>z</code>.
+
+
+<p>
+Note that this guarantee covers only accesses
+syntactically inside the assignment statement.
+If a function or a metamethod called during the assignment
+changes the value of a variable,
+Lua gives no guarantees about the order of that access.
+
+
+<p>
+An assignment to a global name <code>x = val</code>
+is equivalent to the assignment
+<code>_ENV.x = val</code> (see <a href="#2.2">&sect;2.2</a>).
+
+
+<p>
+The meaning of assignments to table fields and
+global variables (which are actually table fields, too)
+can be changed via metatables (see <a href="#2.4">&sect;2.4</a>).
+
+
+
+
+
+<h3>3.3.4 &ndash; <a name="3.3.4">Control Structures</a></h3><p>
+The control structures
+<b>if</b>, <b>while</b>, and <b>repeat</b> have the usual meaning and
+familiar syntax:
+
+
+
+
+<pre>
+	stat ::= <b>while</b> exp <b>do</b> block <b>end</b>
+	stat ::= <b>repeat</b> block <b>until</b> exp
+	stat ::= <b>if</b> exp <b>then</b> block {<b>elseif</b> exp <b>then</b> block} [<b>else</b> block] <b>end</b>
+</pre><p>
+Lua also has a <b>for</b> statement, in two flavors (see <a href="#3.3.5">&sect;3.3.5</a>).
+
+
+<p>
+The condition expression of a
+control structure can return any value.
+Both <b>false</b> and <b>nil</b> test false.
+All values different from <b>nil</b> and <b>false</b> test true.
+In particular, the number 0 and the empty string also test true.
+
+
+<p>
+In the <b>repeat</b>&ndash;<b>until</b> loop,
+the inner block does not end at the <b>until</b> keyword,
+but only after the condition.
+So, the condition can refer to local variables
+declared inside the loop block.
+
+
+<p>
+The <b>goto</b> statement transfers the program control to a label.
+For syntactical reasons,
+labels in Lua are considered statements too:
+
+
+
+<pre>
+	stat ::= <b>goto</b> Name
+	stat ::= label
+	label ::= &lsquo;<b>::</b>&rsquo; Name &lsquo;<b>::</b>&rsquo;
+</pre>
+
+<p>
+A label is visible in the entire block where it is defined,
+except inside nested functions.
+A goto may jump to any visible label as long as it does not
+enter into the scope of a local variable.
+A label should not be declared
+where a label with the same name is visible,
+even if this other label has been declared in an enclosing block.
+
+
+<p>
+The <b>break</b> statement terminates the execution of a
+<b>while</b>, <b>repeat</b>, or <b>for</b> loop,
+skipping to the next statement after the loop:
+
+
+<pre>
+	stat ::= <b>break</b>
+</pre><p>
+A <b>break</b> ends the innermost enclosing loop.
+
+
+<p>
+The <b>return</b> statement is used to return values
+from a function or a chunk
+(which is handled as an anonymous function).
+
+Functions can return more than one value,
+so the syntax for the <b>return</b> statement is
+
+<pre>
+	stat ::= <b>return</b> [explist] [&lsquo;<b>;</b>&rsquo;]
+</pre>
+
+<p>
+The <b>return</b> statement can only be written
+as the last statement of a block.
+If it is necessary to <b>return</b> in the middle of a block,
+then an explicit inner block can be used,
+as in the idiom <code>do return end</code>,
+because now <b>return</b> is the last statement in its (inner) block.
+
+
+
+
+
+<h3>3.3.5 &ndash; <a name="3.3.5">For Statement</a></h3>
+
+<p>
+
+The <b>for</b> statement has two forms:
+one numerical and one generic.
+
+
+
+<h4>The numerical <b>for</b> loop</h4>
+
+<p>
+The numerical <b>for</b> loop repeats a block of code while a
+control variable goes through an arithmetic progression.
+It has the following syntax:
+
+<pre>
+	stat ::= <b>for</b> Name &lsquo;<b>=</b>&rsquo; exp &lsquo;<b>,</b>&rsquo; exp [&lsquo;<b>,</b>&rsquo; exp] <b>do</b> block <b>end</b>
+</pre><p>
+The given identifier (Name) defines the control variable,
+which is a new variable local to the loop body (<em>block</em>).
+
+
+<p>
+The loop starts by evaluating once the three control expressions.
+Their values are called respectively
+the <em>initial value</em>, the <em>limit</em>, and the <em>step</em>.
+If the step is absent, it defaults to&nbsp;1.
+
+
+<p>
+If both the initial value and the step are integers,
+the loop is done with integers;
+note that the limit may not be an integer.
+Otherwise, the three values are converted to
+floats and the loop is done with floats.
+Beware of floating-point accuracy in this case.
+
+
+<p>
+After that initialization,
+the loop body is repeated with the value of the control variable
+going through an arithmetic progression,
+starting at the initial value,
+with a common difference given by the step.
+A negative step makes a decreasing sequence;
+a step equal to zero raises an error.
+The loop continues while the value is less than
+or equal to the limit
+(greater than or equal to for a negative step).
+If the initial value is already greater than the limit
+(or less than, if the step is negative),
+the body is not executed.
+
+
+<p>
+For integer loops,
+the control variable never wraps around;
+instead, the loop ends in case of an overflow.
+
+
+<p>
+You should not change the value of the control variable
+during the loop.
+If you need its value after the loop,
+assign it to another variable before exiting the loop.
+
+
+
+
+
+<h4>The generic <b>for</b> loop</h4>
+
+<p>
+The generic <b>for</b> statement works over functions,
+called <em>iterators</em>.
+On each iteration, the iterator function is called to produce a new value,
+stopping when this new value is <b>nil</b>.
+The generic <b>for</b> loop has the following syntax:
+
+<pre>
+	stat ::= <b>for</b> namelist <b>in</b> explist <b>do</b> block <b>end</b>
+	namelist ::= Name {&lsquo;<b>,</b>&rsquo; Name}
+</pre><p>
+A <b>for</b> statement like
+
+<pre>
+     for <em>var_1</em>, &middot;&middot;&middot;, <em>var_n</em> in <em>explist</em> do <em>body</em> end
+</pre><p>
+works as follows.
+
+
+<p>
+The names <em>var_i</em> declare loop variables local to the loop body.
+The first of these variables is the <em>control variable</em>.
+
+
+<p>
+The loop starts by evaluating <em>explist</em>
+to produce four values:
+an <em>iterator function</em>,
+a <em>state</em>,
+an initial value for the control variable,
+and a <em>closing value</em>.
+
+
+<p>
+Then, at each iteration,
+Lua calls the iterator function with two arguments:
+the state and the control variable.
+The results from this call are then assigned to the loop variables,
+following the rules of multiple assignments (see <a href="#3.3.3">&sect;3.3.3</a>).
+If the control variable becomes <b>nil</b>,
+the loop terminates.
+Otherwise, the body is executed and the loop goes
+to the next iteration.
+
+
+<p>
+The closing value behaves like a
+to-be-closed variable (see <a href="#3.3.8">&sect;3.3.8</a>),
+which can be used to release resources when the loop ends.
+Otherwise, it does not interfere with the loop.
+
+
+<p>
+You should not change the value of the control variable
+during the loop.
+
+
+
+
+
+
+
+<h3>3.3.6 &ndash; <a name="3.3.6">Function Calls as Statements</a></h3><p>
+To allow possible side-effects,
+function calls can be executed as statements:
+
+<pre>
+	stat ::= functioncall
+</pre><p>
+In this case, all returned values are thrown away.
+Function calls are explained in <a href="#3.4.10">&sect;3.4.10</a>.
+
+
+
+
+
+<h3>3.3.7 &ndash; <a name="3.3.7">Local Declarations</a></h3><p>
+Local variables can be declared anywhere inside a block.
+The declaration can include an initialization:
+
+<pre>
+	stat ::= <b>local</b> attnamelist [&lsquo;<b>=</b>&rsquo; explist]
+	attnamelist ::=  Name attrib {&lsquo;<b>,</b>&rsquo; Name attrib}
+</pre><p>
+If present, an initial assignment has the same semantics
+of a multiple assignment (see <a href="#3.3.3">&sect;3.3.3</a>).
+Otherwise, all variables are initialized with <b>nil</b>.
+
+
+<p>
+Each variable name may be postfixed by an attribute
+(a name between angle brackets):
+
+<pre>
+	attrib ::= [&lsquo;<b>&lt;</b>&rsquo; Name &lsquo;<b>&gt;</b>&rsquo;]
+</pre><p>
+There are two possible attributes:
+<code>const</code>, which declares a constant variable,
+that is, a variable that cannot be assigned to
+after its initialization;
+and <code>close</code>, which declares a to-be-closed variable (see <a href="#3.3.8">&sect;3.3.8</a>).
+A list of variables can contain at most one to-be-closed variable.
+
+
+<p>
+A chunk is also a block (see <a href="#3.3.2">&sect;3.3.2</a>),
+and so local variables can be declared in a chunk outside any explicit block.
+
+
+<p>
+The visibility rules for local variables are explained in <a href="#3.5">&sect;3.5</a>.
+
+
+
+
+
+<h3>3.3.8 &ndash; <a name="3.3.8">To-be-closed Variables</a></h3>
+
+<p>
+A to-be-closed variable behaves like a constant local variable,
+except that its value is <em>closed</em> whenever the variable
+goes out of scope, including normal block termination,
+exiting its block by <b>break</b>/<b>goto</b>/<b>return</b>,
+or exiting by an error.
+
+
+<p>
+Here, to <em>close</em> a value means
+to call its <code>__close</code> metamethod.
+When calling the metamethod,
+the value itself is passed as the first argument
+and the error object that caused the exit (if any)
+is passed as a second argument;
+if there was no error, the second argument is <b>nil</b>.
+
+
+<p>
+The value assigned to a to-be-closed variable
+must have a <code>__close</code> metamethod
+or be a false value.
+(<b>nil</b> and <b>false</b> are ignored as to-be-closed values.)
+
+
+<p>
+If several to-be-closed variables go out of scope at the same event,
+they are closed in the reverse order that they were declared.
+
+
+<p>
+If there is any error while running a closing method,
+that error is handled like an error in the regular code
+where the variable was defined.
+After an error,
+the other pending closing methods will still be called.
+
+
+<p>
+If a coroutine yields and is never resumed again,
+some variables may never go out of scope,
+and therefore they will never be closed.
+(These variables are the ones created inside the coroutine
+and in scope at the point where the coroutine yielded.)
+Similarly, if a coroutine ends with an error,
+it does not unwind its stack,
+so it does not close any variable.
+In both cases,
+you can either use finalizers
+or call <a href="#pdf-coroutine.close"><code>coroutine.close</code></a> to close the variables.
+However, if the coroutine was created
+through <a href="#pdf-coroutine.wrap"><code>coroutine.wrap</code></a>,
+then its corresponding function will close the coroutine
+in case of errors.
+
+
+
+
+
+
+
+<h2>3.4 &ndash; <a name="3.4">Expressions</a></h2>
+
+
+
+<p>
+The basic expressions in Lua are the following:
+
+<pre>
+	exp ::= prefixexp
+	exp ::= <b>nil</b> | <b>false</b> | <b>true</b>
+	exp ::= Numeral
+	exp ::= LiteralString
+	exp ::= functiondef
+	exp ::= tableconstructor
+	exp ::= &lsquo;<b>...</b>&rsquo;
+	exp ::= exp binop exp
+	exp ::= unop exp
+	prefixexp ::= var | functioncall | &lsquo;<b>(</b>&rsquo; exp &lsquo;<b>)</b>&rsquo;
+</pre>
+
+<p>
+Numerals and literal strings are explained in <a href="#3.1">&sect;3.1</a>;
+variables are explained in <a href="#3.2">&sect;3.2</a>;
+function definitions are explained in <a href="#3.4.11">&sect;3.4.11</a>;
+function calls are explained in <a href="#3.4.10">&sect;3.4.10</a>;
+table constructors are explained in <a href="#3.4.9">&sect;3.4.9</a>.
+Vararg expressions,
+denoted by three dots ('<code>...</code>'), can only be used when
+directly inside a variadic function;
+they are explained in <a href="#3.4.11">&sect;3.4.11</a>.
+
+
+<p>
+Binary operators comprise arithmetic operators (see <a href="#3.4.1">&sect;3.4.1</a>),
+bitwise operators (see <a href="#3.4.2">&sect;3.4.2</a>),
+relational operators (see <a href="#3.4.4">&sect;3.4.4</a>), logical operators (see <a href="#3.4.5">&sect;3.4.5</a>),
+and the concatenation operator (see <a href="#3.4.6">&sect;3.4.6</a>).
+Unary operators comprise the unary minus (see <a href="#3.4.1">&sect;3.4.1</a>),
+the unary bitwise NOT (see <a href="#3.4.2">&sect;3.4.2</a>),
+the unary logical <b>not</b> (see <a href="#3.4.5">&sect;3.4.5</a>),
+and the unary <em>length operator</em> (see <a href="#3.4.7">&sect;3.4.7</a>).
+
+
+
+
+
+<h3>3.4.1 &ndash; <a name="3.4.1">Arithmetic Operators</a></h3><p>
+Lua supports the following arithmetic operators:
+
+<ul>
+<li><b><code>+</code>: </b>addition</li>
+<li><b><code>-</code>: </b>subtraction</li>
+<li><b><code>*</code>: </b>multiplication</li>
+<li><b><code>/</code>: </b>float division</li>
+<li><b><code>//</code>: </b>floor division</li>
+<li><b><code>%</code>: </b>modulo</li>
+<li><b><code>^</code>: </b>exponentiation</li>
+<li><b><code>-</code>: </b>unary minus</li>
+</ul>
+
+<p>
+With the exception of exponentiation and float division,
+the arithmetic operators work as follows:
+If both operands are integers,
+the operation is performed over integers and the result is an integer.
+Otherwise, if both operands are numbers,
+then they are converted to floats,
+the operation is performed following the machine's rules
+for floating-point arithmetic
+(usually the IEEE 754 standard),
+and the result is a float.
+(The string library coerces strings to numbers in
+arithmetic operations; see <a href="#3.4.3">&sect;3.4.3</a> for details.)
+
+
+<p>
+Exponentiation and float division (<code>/</code>)
+always convert their operands to floats
+and the result is always a float.
+Exponentiation uses the ISO&nbsp;C function <code>pow</code>,
+so that it works for non-integer exponents too.
+
+
+<p>
+Floor division (<code>//</code>) is a division
+that rounds the quotient towards minus infinity,
+resulting in the floor of the division of its operands.
+
+
+<p>
+Modulo is defined as the remainder of a division
+that rounds the quotient towards minus infinity (floor division).
+
+
+<p>
+In case of overflows in integer arithmetic,
+all operations <em>wrap around</em>.
+
+
+
+<h3>3.4.2 &ndash; <a name="3.4.2">Bitwise Operators</a></h3><p>
+Lua supports the following bitwise operators:
+
+<ul>
+<li><b><code>&amp;</code>: </b>bitwise AND</li>
+<li><b><code>&#124;</code>: </b>bitwise OR</li>
+<li><b><code>~</code>: </b>bitwise exclusive OR</li>
+<li><b><code>&gt;&gt;</code>: </b>right shift</li>
+<li><b><code>&lt;&lt;</code>: </b>left shift</li>
+<li><b><code>~</code>: </b>unary bitwise NOT</li>
+</ul>
+
+<p>
+All bitwise operations convert its operands to integers
+(see <a href="#3.4.3">&sect;3.4.3</a>),
+operate on all bits of those integers,
+and result in an integer.
+
+
+<p>
+Both right and left shifts fill the vacant bits with zeros.
+Negative displacements shift to the other direction;
+displacements with absolute values equal to or higher than
+the number of bits in an integer
+result in zero (as all bits are shifted out).
+
+
+
+
+
+<h3>3.4.3 &ndash; <a name="3.4.3">Coercions and Conversions</a></h3><p>
+Lua provides some automatic conversions between some
+types and representations at run time.
+Bitwise operators always convert float operands to integers.
+Exponentiation and float division
+always convert integer operands to floats.
+All other arithmetic operations applied to mixed numbers
+(integers and floats) convert the integer operand to a float.
+The C API also converts both integers to floats and
+floats to integers, as needed.
+Moreover, string concatenation accepts numbers as arguments,
+besides strings.
+
+
+<p>
+In a conversion from integer to float,
+if the integer value has an exact representation as a float,
+that is the result.
+Otherwise,
+the conversion gets the nearest higher or
+the nearest lower representable value.
+This kind of conversion never fails.
+
+
+<p>
+The conversion from float to integer
+checks whether the float has an exact representation as an integer
+(that is, the float has an integral value and
+it is in the range of integer representation).
+If it does, that representation is the result.
+Otherwise, the conversion fails.
+
+
+<p>
+Several places in Lua coerce strings to numbers when necessary.
+In particular,
+the string library sets metamethods that try to coerce
+strings to numbers in all arithmetic operations.
+If the conversion fails,
+the library calls the metamethod of the other operand
+(if present) or it raises an error.
+Note that bitwise operators do not do this coercion.
+
+
+<p>
+It is always a good practice not to rely on the
+implicit coercions from strings to numbers,
+as they are not always applied;
+in particular, <code>"1"==1</code> is false and <code>"1"&lt;1</code> raises an error
+(see <a href="#3.4.4">&sect;3.4.4</a>).
+These coercions exist mainly for compatibility and may be removed
+in future versions of the language.
+
+
+<p>
+A string is converted to an integer or a float
+following its syntax and the rules of the Lua lexer.
+The string may have also leading and trailing whitespaces and a sign.
+All conversions from strings to numbers
+accept both a dot and the current locale mark
+as the radix character.
+(The Lua lexer, however, accepts only a dot.)
+If the string is not a valid numeral,
+the conversion fails.
+If necessary, the result of this first step is then converted
+to a specific number subtype following the previous rules
+for conversions between floats and integers.
+
+
+<p>
+The conversion from numbers to strings uses a
+non-specified human-readable format.
+To convert numbers to strings in any specific way,
+use the function <a href="#pdf-string.format"><code>string.format</code></a>.
+
+
+
+
+
+<h3>3.4.4 &ndash; <a name="3.4.4">Relational Operators</a></h3><p>
+Lua supports the following relational operators:
+
+<ul>
+<li><b><code>==</code>: </b>equality</li>
+<li><b><code>~=</code>: </b>inequality</li>
+<li><b><code>&lt;</code>: </b>less than</li>
+<li><b><code>&gt;</code>: </b>greater than</li>
+<li><b><code>&lt;=</code>: </b>less or equal</li>
+<li><b><code>&gt;=</code>: </b>greater or equal</li>
+</ul><p>
+These operators always result in <b>false</b> or <b>true</b>.
+
+
+<p>
+Equality (<code>==</code>) first compares the type of its operands.
+If the types are different, then the result is <b>false</b>.
+Otherwise, the values of the operands are compared.
+Strings are equal if they have the same byte content.
+Numbers are equal if they denote the same mathematical value.
+
+
+<p>
+Tables, userdata, and threads
+are compared by reference:
+two objects are considered equal only if they are the same object.
+Every time you create a new object
+(a table, a userdata, or a thread),
+this new object is different from any previously existing object.
+A function is always equal to itself.
+Functions with any detectable difference
+(different behavior, different definition) are always different.
+Functions created at different times but with no detectable differences
+may be classified as equal or not
+(depending on internal caching details).
+
+
+<p>
+You can change the way that Lua compares tables and userdata
+by using the <code>__eq</code> metamethod (see <a href="#2.4">&sect;2.4</a>).
+
+
+<p>
+Equality comparisons do not convert strings to numbers
+or vice versa.
+Thus, <code>"0"==0</code> evaluates to <b>false</b>,
+and <code>t[0]</code> and <code>t["0"]</code> denote different
+entries in a table.
+
+
+<p>
+The operator <code>~=</code> is exactly the negation of equality (<code>==</code>).
+
+
+<p>
+The order operators work as follows.
+If both arguments are numbers,
+then they are compared according to their mathematical values,
+regardless of their subtypes.
+Otherwise, if both arguments are strings,
+then their values are compared according to the current locale.
+Otherwise, Lua tries to call the <code>__lt</code> or the <code>__le</code>
+metamethod (see <a href="#2.4">&sect;2.4</a>).
+A comparison <code>a &gt; b</code> is translated to <code>b &lt; a</code>
+and <code>a &gt;= b</code> is translated to <code>b &lt;= a</code>.
+
+
+<p>
+Following the IEEE 754 standard,
+the special value NaN is considered neither less than,
+nor equal to, nor greater than any value, including itself.
+
+
+
+
+
+<h3>3.4.5 &ndash; <a name="3.4.5">Logical Operators</a></h3><p>
+The logical operators in Lua are
+<b>and</b>, <b>or</b>, and <b>not</b>.
+Like the control structures (see <a href="#3.3.4">&sect;3.3.4</a>),
+all logical operators consider both <b>false</b> and <b>nil</b> as false
+and anything else as true.
+
+
+<p>
+The negation operator <b>not</b> always returns <b>false</b> or <b>true</b>.
+The conjunction operator <b>and</b> returns its first argument
+if this value is <b>false</b> or <b>nil</b>;
+otherwise, <b>and</b> returns its second argument.
+The disjunction operator <b>or</b> returns its first argument
+if this value is different from <b>nil</b> and <b>false</b>;
+otherwise, <b>or</b> returns its second argument.
+Both <b>and</b> and <b>or</b> use short-circuit evaluation;
+that is,
+the second operand is evaluated only if necessary.
+Here are some examples:
+
+<pre>
+     10 or 20            --&gt; 10
+     10 or error()       --&gt; 10
+     nil or "a"          --&gt; "a"
+     nil and 10          --&gt; nil
+     false and error()   --&gt; false
+     false and nil       --&gt; false
+     false or nil        --&gt; nil
+     10 and 20           --&gt; 20
+</pre>
+
+
+
+
+<h3>3.4.6 &ndash; <a name="3.4.6">Concatenation</a></h3><p>
+The string concatenation operator in Lua is
+denoted by two dots ('<code>..</code>').
+If both operands are strings or numbers,
+then the numbers are converted to strings
+in a non-specified format (see <a href="#3.4.3">&sect;3.4.3</a>).
+Otherwise, the <code>__concat</code> metamethod is called (see <a href="#2.4">&sect;2.4</a>).
+
+
+
+
+
+<h3>3.4.7 &ndash; <a name="3.4.7">The Length Operator</a></h3>
+
+<p>
+The length operator is denoted by the unary prefix operator <code>#</code>.
+
+
+<p>
+The length of a string is its number of bytes.
+(That is the usual meaning of string length when each
+character is one byte.)
+
+
+<p>
+The length operator applied on a table
+returns a border in that table.
+A <em>border</em> in a table <code>t</code> is any non-negative integer
+that satisfies the following condition:
+
+<pre>
+     (border == 0 or t[border] ~= nil) and
+     (t[border + 1] == nil or border == math.maxinteger)
+</pre><p>
+In words,
+a border is any positive integer index present in the table
+that is followed by an absent index,
+plus two limit cases:
+zero, when index 1 is absent;
+and the maximum value for an integer, when that index is present.
+Note that keys that are not positive integers
+do not interfere with borders.
+
+
+<p>
+A table with exactly one border is called a <em>sequence</em>.
+For instance, the table <code>{10, 20, 30, 40, 50}</code> is a sequence,
+as it has only one border (5).
+The table <code>{10, 20, 30, nil, 50}</code> has two borders (3 and 5),
+and therefore it is not a sequence.
+(The <b>nil</b> at index 4 is called a <em>hole</em>.)
+The table <code>{nil, 20, 30, nil, nil, 60, nil}</code>
+has three borders (0, 3, and 6),
+so it is not a sequence, too.
+The table <code>{}</code> is a sequence with border 0.
+
+
+<p>
+When <code>t</code> is a sequence,
+<code>#t</code> returns its only border,
+which corresponds to the intuitive notion of the length of the sequence.
+When <code>t</code> is not a sequence,
+<code>#t</code> can return any of its borders.
+(The exact one depends on details of
+the internal representation of the table,
+which in turn can depend on how the table was populated and
+the memory addresses of its non-numeric keys.)
+
+
+<p>
+The computation of the length of a table
+has a guaranteed worst time of <em>O(log n)</em>,
+where <em>n</em> is the largest integer key in the table.
+
+
+<p>
+A program can modify the behavior of the length operator for
+any value but strings through the <code>__len</code> metamethod (see <a href="#2.4">&sect;2.4</a>).
+
+
+
+
+
+<h3>3.4.8 &ndash; <a name="3.4.8">Precedence</a></h3><p>
+Operator precedence in Lua follows the table below,
+from lower to higher priority:
+
+<pre>
+     or
+     and
+     &lt;     &gt;     &lt;=    &gt;=    ~=    ==
+     |
+     ~
+     &amp;
+     &lt;&lt;    &gt;&gt;
+     ..
+     +     -
+     *     /     //    %
+     unary operators (not   #     -     ~)
+     ^
+</pre><p>
+As usual,
+you can use parentheses to change the precedences of an expression.
+The concatenation ('<code>..</code>') and exponentiation ('<code>^</code>')
+operators are right associative.
+All other binary operators are left associative.
+
+
+
+
+
+<h3>3.4.9 &ndash; <a name="3.4.9">Table Constructors</a></h3><p>
+Table constructors are expressions that create tables.
+Every time a constructor is evaluated, a new table is created.
+A constructor can be used to create an empty table
+or to create a table and initialize some of its fields.
+The general syntax for constructors is
+
+<pre>
+	tableconstructor ::= &lsquo;<b>{</b>&rsquo; [fieldlist] &lsquo;<b>}</b>&rsquo;
+	fieldlist ::= field {fieldsep field} [fieldsep]
+	field ::= &lsquo;<b>[</b>&rsquo; exp &lsquo;<b>]</b>&rsquo; &lsquo;<b>=</b>&rsquo; exp | Name &lsquo;<b>=</b>&rsquo; exp | exp
+	fieldsep ::= &lsquo;<b>,</b>&rsquo; | &lsquo;<b>;</b>&rsquo;
+</pre>
+
+<p>
+Each field of the form <code>[exp1] = exp2</code> adds to the new table an entry
+with key <code>exp1</code> and value <code>exp2</code>.
+A field of the form <code>name = exp</code> is equivalent to
+<code>["name"] = exp</code>.
+Fields of the form <code>exp</code> are equivalent to
+<code>[i] = exp</code>, where <code>i</code> are consecutive integers
+starting with 1;
+fields in the other formats do not affect this counting.
+For example,
+
+<pre>
+     a = { [f(1)] = g; "x", "y"; x = 1, f(x), [30] = 23; 45 }
+</pre><p>
+is equivalent to
+
+<pre>
+     do
+       local t = {}
+       t[f(1)] = g
+       t[1] = "x"         -- 1st exp
+       t[2] = "y"         -- 2nd exp
+       t.x = 1            -- t["x"] = 1
+       t[3] = f(x)        -- 3rd exp
+       t[30] = 23
+       t[4] = 45          -- 4th exp
+       a = t
+     end
+</pre>
+
+<p>
+The order of the assignments in a constructor is undefined.
+(This order would be relevant only when there are repeated keys.)
+
+
+<p>
+If the last field in the list has the form <code>exp</code>
+and the expression is a multires expression,
+then all values returned by this expression enter the list consecutively
+(see <a href="#3.4.12">&sect;3.4.12</a>).
+
+
+<p>
+The field list can have an optional trailing separator,
+as a convenience for machine-generated code.
+
+
+
+
+
+<h3>3.4.10 &ndash; <a name="3.4.10">Function Calls</a></h3><p>
+A function call in Lua has the following syntax:
+
+<pre>
+	functioncall ::= prefixexp args
+</pre><p>
+In a function call,
+first prefixexp and args are evaluated.
+If the value of prefixexp has type <em>function</em>,
+then this function is called
+with the given arguments.
+Otherwise, if present,
+the prefixexp <code>__call</code> metamethod is called:
+its first argument is the value of prefixexp,
+followed by the original call arguments
+(see <a href="#2.4">&sect;2.4</a>).
+
+
+<p>
+The form
+
+<pre>
+	functioncall ::= prefixexp &lsquo;<b>:</b>&rsquo; Name args
+</pre><p>
+can be used to emulate methods.
+A call <code>v:name(<em>args</em>)</code>
+is syntactic sugar for <code>v.name(v,<em>args</em>)</code>,
+except that <code>v</code> is evaluated only once.
+
+
+<p>
+Arguments have the following syntax:
+
+<pre>
+	args ::= &lsquo;<b>(</b>&rsquo; [explist] &lsquo;<b>)</b>&rsquo;
+	args ::= tableconstructor
+	args ::= LiteralString
+</pre><p>
+All argument expressions are evaluated before the call.
+A call of the form <code>f{<em>fields</em>}</code> is
+syntactic sugar for <code>f({<em>fields</em>})</code>;
+that is, the argument list is a single new table.
+A call of the form <code>f'<em>string</em>'</code>
+(or <code>f"<em>string</em>"</code> or <code>f[[<em>string</em>]]</code>)
+is syntactic sugar for <code>f('<em>string</em>')</code>;
+that is, the argument list is a single literal string.
+
+
+<p>
+A call of the form <code>return <em>functioncall</em></code> not in the
+scope of a to-be-closed variable is called a <em>tail call</em>.
+Lua implements <em>proper tail calls</em>
+(or <em>proper tail recursion</em>):
+In a tail call,
+the called function reuses the stack entry of the calling function.
+Therefore, there is no limit on the number of nested tail calls that
+a program can execute.
+However, a tail call erases any debug information about the
+calling function.
+Note that a tail call only happens with a particular syntax,
+where the <b>return</b> has one single function call as argument,
+and it is outside the scope of any to-be-closed variable.
+This syntax makes the calling function return exactly
+the returns of the called function,
+without any intervening action.
+So, none of the following examples are tail calls:
+
+<pre>
+     return (f(x))        -- results adjusted to 1
+     return 2 * f(x)      -- result multiplied by 2
+     return x, f(x)       -- additional results
+     f(x); return         -- results discarded
+     return x or f(x)     -- results adjusted to 1
+</pre>
+
+
+
+
+<h3>3.4.11 &ndash; <a name="3.4.11">Function Definitions</a></h3>
+
+<p>
+The syntax for function definition is
+
+<pre>
+	functiondef ::= <b>function</b> funcbody
+	funcbody ::= &lsquo;<b>(</b>&rsquo; [parlist] &lsquo;<b>)</b>&rsquo; block <b>end</b>
+</pre>
+
+<p>
+The following syntactic sugar simplifies function definitions:
+
+<pre>
+	stat ::= <b>function</b> funcname funcbody
+	stat ::= <b>local</b> <b>function</b> Name funcbody
+	funcname ::= Name {&lsquo;<b>.</b>&rsquo; Name} [&lsquo;<b>:</b>&rsquo; Name]
+</pre><p>
+The statement
+
+<pre>
+     function f () <em>body</em> end
+</pre><p>
+translates to
+
+<pre>
+     f = function () <em>body</em> end
+</pre><p>
+The statement
+
+<pre>
+     function t.a.b.c.f () <em>body</em> end
+</pre><p>
+translates to
+
+<pre>
+     t.a.b.c.f = function () <em>body</em> end
+</pre><p>
+The statement
+
+<pre>
+     local function f () <em>body</em> end
+</pre><p>
+translates to
+
+<pre>
+     local f; f = function () <em>body</em> end
+</pre><p>
+not to
+
+<pre>
+     local f = function () <em>body</em> end
+</pre><p>
+(This only makes a difference when the body of the function
+contains references to <code>f</code>.)
+
+
+<p>
+A function definition is an executable expression,
+whose value has type <em>function</em>.
+When Lua precompiles a chunk,
+all its function bodies are precompiled too,
+but they are not created yet.
+Then, whenever Lua executes the function definition,
+the function is <em>instantiated</em> (or <em>closed</em>).
+This function instance, or <em>closure</em>,
+is the final value of the expression.
+
+
+<p>
+Parameters act as local variables that are
+initialized with the argument values:
+
+<pre>
+	parlist ::= namelist [&lsquo;<b>,</b>&rsquo; &lsquo;<b>...</b>&rsquo;] | &lsquo;<b>...</b>&rsquo;
+</pre><p>
+When a Lua function is called,
+it adjusts its list of arguments to
+the length of its list of parameters (see <a href="#3.4.12">&sect;3.4.12</a>),
+unless the function is a <em>variadic function</em>,
+which is indicated by three dots ('<code>...</code>')
+at the end of its parameter list.
+A variadic function does not adjust its argument list;
+instead, it collects all extra arguments and supplies them
+to the function through a <em>vararg expression</em>,
+which is also written as three dots.
+The value of this expression is a list of all actual extra arguments,
+similar to a function with multiple results (see <a href="#3.4.12">&sect;3.4.12</a>).
+
+
+<p>
+As an example, consider the following definitions:
+
+<pre>
+     function f(a, b) end
+     function g(a, b, ...) end
+     function r() return 1,2,3 end
+</pre><p>
+Then, we have the following mapping from arguments to parameters and
+to the vararg expression:
+
+<pre>
+     CALL             PARAMETERS
+     
+     f(3)             a=3, b=nil
+     f(3, 4)          a=3, b=4
+     f(3, 4, 5)       a=3, b=4
+     f(r(), 10)       a=1, b=10
+     f(r())           a=1, b=2
+     
+     g(3)             a=3, b=nil, ... --&gt;  (nothing)
+     g(3, 4)          a=3, b=4,   ... --&gt;  (nothing)
+     g(3, 4, 5, 8)    a=3, b=4,   ... --&gt;  5  8
+     g(5, r())        a=5, b=1,   ... --&gt;  2  3
+</pre>
+
+<p>
+Results are returned using the <b>return</b> statement (see <a href="#3.3.4">&sect;3.3.4</a>).
+If control reaches the end of a function
+without encountering a <b>return</b> statement,
+then the function returns with no results.
+
+
+<p>
+
+There is a system-dependent limit on the number of values
+that a function may return.
+This limit is guaranteed to be greater than 1000.
+
+
+<p>
+The <em>colon</em> syntax
+is used to emulate <em>methods</em>,
+adding an implicit extra parameter <code>self</code> to the function.
+Thus, the statement
+
+<pre>
+     function t.a.b.c:f (<em>params</em>) <em>body</em> end
+</pre><p>
+is syntactic sugar for
+
+<pre>
+     t.a.b.c.f = function (self, <em>params</em>) <em>body</em> end
+</pre>
+
+
+
+
+<h3>3.4.12 &ndash; <a name="3.4.12">Lists of expressions, multiple results,
+and adjustment</a></h3>
+
+<p>
+Both function calls and vararg expressions can result in multiple values.
+These expressions are called <em>multires expressions</em>.
+
+
+<p>
+When a multires expression is used as the last element
+of a list of expressions,
+all results from the expression are added to the
+list of values produced by the list of expressions.
+Note that a single expression
+in a place that expects a list of expressions
+is the last expression in that (singleton) list.
+
+
+<p>
+These are the places where Lua expects a list of expressions:
+
+<ul>
+
+<li>A <b>return</b> statement,
+for instance <code>return e1, e2, e3</code> (see <a href="#3.3.4">&sect;3.3.4</a>).</li>
+
+<li>A table constructor,
+for instance <code>{e1, e2, e3}</code> (see <a href="#3.4.9">&sect;3.4.9</a>).</li>
+
+<li>The arguments of a function call,
+for instance <code>foo(e1, e2, e3)</code> (see <a href="#3.4.10">&sect;3.4.10</a>).</li>
+
+<li>A multiple assignment,
+for instance <code>a , b, c = e1, e2, e3</code> (see <a href="#3.3.3">&sect;3.3.3</a>).</li>
+
+<li>A local declaration,
+for instance <code>local a , b, c = e1, e2, e3</code> (see <a href="#3.3.7">&sect;3.3.7</a>).</li>
+
+<li>The initial values in a generic <b>for</b> loop,
+for instance <code>for k in e1, e2, e3 do ... end</code> (see <a href="#3.3.5">&sect;3.3.5</a>).</li>
+
+</ul><p>
+In the last four cases,
+the list of values from the list of expressions
+must be <em>adjusted</em> to a specific length:
+the number of parameters in a call to a non-variadic function
+(see <a href="#3.4.11">&sect;3.4.11</a>),
+the number of variables in a multiple assignment or
+a local declaration,
+and exactly four values for a generic <b>for</b> loop.
+The <em>adjustment</em> follows these rules:
+If there are more values than needed,
+the extra values are thrown away;
+if there are fewer values than needed,
+the list is extended with <b>nil</b>'s.
+When the list of expressions ends with a multires expression,
+all results from that expression enter the list of values
+before the adjustment.
+
+
+<p>
+When a multires expression is used
+in a list of expressions without being the last element,
+or in a place where the syntax expects a single expression,
+Lua adjusts the result list of that expression to one element.
+As a particular case,
+the syntax expects a single expression inside a parenthesized expression;
+therefore, adding parentheses around a multires expression
+forces it to produce exactly one result.
+
+
+<p>
+We seldom need to use a vararg expression in a place
+where the syntax expects a single expression.
+(Usually it is simpler to add a regular parameter before
+the variadic part and use that parameter.)
+When there is such a need,
+we recommend assigning the vararg expression
+to a single variable and using that variable
+in its place.
+
+
+<p>
+Here are some examples of uses of mutlres expressions.
+In all cases, when the construction needs
+"the n-th result" and there is no such result,
+it uses a <b>nil</b>.
+
+<pre>
+     print(x, f())      -- prints x and all results from f().
+     print(x, (f()))    -- prints x and the first result from f().
+     print(f(), x)      -- prints the first result from f() and x.
+     print(1 + f())     -- prints 1 added to the first result from f().
+     local x = ...      -- x gets the first vararg argument.
+     x,y = ...          -- x gets the first vararg argument,
+                        -- y gets the second vararg argument.
+     x,y,z = w, f()     -- x gets w, y gets the first result from f(),
+                        -- z gets the second result from f().
+     x,y,z = f()        -- x gets the first result from f(),
+                        -- y gets the second result from f(),
+                        -- z gets the third result from f().
+     x,y,z = f(), g()   -- x gets the first result from f(),
+                        -- y gets the first result from g(),
+                        -- z gets the second result from g().
+     x,y,z = (f())      -- x gets the first result from f(), y and z get nil.
+     return f()         -- returns all results from f().
+     return x, ...      -- returns x and all received vararg arguments.
+     return x,y,f()     -- returns x, y, and all results from f().
+     {f()}              -- creates a list with all results from f().
+     {...}              -- creates a list with all vararg arguments.
+     {f(), 5}           -- creates a list with the first result from f() and 5.
+</pre>
+
+
+
+
+
+
+<h2>3.5 &ndash; <a name="3.5">Visibility Rules</a></h2>
+
+<p>
+
+Lua is a lexically scoped language.
+The scope of a local variable begins at the first statement after
+its declaration and lasts until the last non-void statement
+of the innermost block that includes the declaration.
+(<em>Void statements</em> are labels and empty statements.)
+Consider the following example:
+
+<pre>
+     x = 10                -- global variable
+     do                    -- new block
+       local x = x         -- new 'x', with value 10
+       print(x)            --&gt; 10
+       x = x+1
+       do                  -- another block
+         local x = x+1     -- another 'x'
+         print(x)          --&gt; 12
+       end
+       print(x)            --&gt; 11
+     end
+     print(x)              --&gt; 10  (the global one)
+</pre>
+
+<p>
+Notice that, in a declaration like <code>local x = x</code>,
+the new <code>x</code> being declared is not in scope yet,
+and so the second <code>x</code> refers to the outside variable.
+
+
+<p>
+Because of the lexical scoping rules,
+local variables can be freely accessed by functions
+defined inside their scope.
+A local variable used by an inner function is called an <em>upvalue</em>
+(or <em>external local variable</em>, or simply <em>external variable</em>)
+inside the inner function.
+
+
+<p>
+Notice that each execution of a <b>local</b> statement
+defines new local variables.
+Consider the following example:
+
+<pre>
+     a = {}
+     local x = 20
+     for i = 1, 10 do
+       local y = 0
+       a[i] = function () y = y + 1; return x + y end
+     end
+</pre><p>
+The loop creates ten closures
+(that is, ten instances of the anonymous function).
+Each of these closures uses a different <code>y</code> variable,
+while all of them share the same <code>x</code>.
+
+
+
+
+
+<h1>4 &ndash; <a name="4">The Application Program Interface</a></h1>
+
+
+
+<p>
+
+This section describes the C&nbsp;API for Lua, that is,
+the set of C&nbsp;functions available to the host program to communicate
+with Lua.
+All API functions and related types and constants
+are declared in the header file <a name="pdf-lua.h"><code>lua.h</code></a>.
+
+
+<p>
+Even when we use the term "function",
+any facility in the API may be provided as a macro instead.
+Except where stated otherwise,
+all such macros use each of their arguments exactly once
+(except for the first argument, which is always a Lua state),
+and so do not generate any hidden side-effects.
+
+
+<p>
+As in most C&nbsp;libraries,
+the Lua API functions do not check their arguments
+for validity or consistency.
+However, you can change this behavior by compiling Lua
+with the macro <a name="pdf-LUA_USE_APICHECK"><code>LUA_USE_APICHECK</code></a> defined.
+
+
+<p>
+The Lua library is fully reentrant:
+it has no global variables.
+It keeps all information it needs in a dynamic structure,
+called the <em>Lua state</em>.
+
+
+<p>
+Each Lua state has one or more threads,
+which correspond to independent, cooperative lines of execution.
+The type <a href="#lua_State"><code>lua_State</code></a> (despite its name) refers to a thread.
+(Indirectly, through the thread, it also refers to the
+Lua state associated to the thread.)
+
+
+<p>
+A pointer to a thread must be passed as the first argument to
+every function in the library, except to <a href="#lua_newstate"><code>lua_newstate</code></a>,
+which creates a Lua state from scratch and returns a pointer
+to the <em>main thread</em> in the new state.
+
+
+
+
+
+<h2>4.1 &ndash; <a name="4.1">The Stack</a></h2>
+
+
+
+<p>
+Lua uses a <em>virtual stack</em> to pass values to and from C.
+Each element in this stack represents a Lua value
+(<b>nil</b>, number, string, etc.).
+Functions in the API can access this stack through the
+Lua state parameter that they receive.
+
+
+<p>
+Whenever Lua calls C, the called function gets a new stack,
+which is independent of previous stacks and of stacks of
+C&nbsp;functions that are still active.
+This stack initially contains any arguments to the C&nbsp;function
+and it is where the C&nbsp;function can store temporary
+Lua values and must push its results
+to be returned to the caller (see <a href="#lua_CFunction"><code>lua_CFunction</code></a>).
+
+
+<p>
+For convenience,
+most query operations in the API do not follow a strict stack discipline.
+Instead, they can refer to any element in the stack
+by using an <em>index</em>:
+A positive index represents an absolute stack position,
+starting at&nbsp;1 as the bottom of the stack;
+a negative index represents an offset relative to the top of the stack.
+More specifically, if the stack has <em>n</em> elements,
+then index&nbsp;1 represents the first element
+(that is, the element that was pushed onto the stack first)
+and
+index&nbsp;<em>n</em> represents the last element;
+index&nbsp;-1 also represents the last element
+(that is, the element at the&nbsp;top)
+and index <em>-n</em> represents the first element.
+
+
+
+
+
+<h3>4.1.1 &ndash; <a name="4.1.1">Stack Size</a></h3>
+
+<p>
+When you interact with the Lua API,
+you are responsible for ensuring consistency.
+In particular,
+<em>you are responsible for controlling stack overflow</em>.
+When you call any API function,
+you must ensure the stack has enough room to accommodate the results.
+
+
+<p>
+There is one exception to the above rule:
+When you call a Lua function
+without a fixed number of results (see <a href="#lua_call"><code>lua_call</code></a>),
+Lua ensures that the stack has enough space for all results.
+However, it does not ensure any extra space.
+So, before pushing anything on the stack after such a call
+you should use <a href="#lua_checkstack"><code>lua_checkstack</code></a>.
+
+
+<p>
+Whenever Lua calls C,
+it ensures that the stack has space for
+at least <a name="pdf-LUA_MINSTACK"><code>LUA_MINSTACK</code></a> extra elements;
+that is, you can safely push up to <code>LUA_MINSTACK</code> values into it.
+<code>LUA_MINSTACK</code> is defined as 20,
+so that usually you do not have to worry about stack space
+unless your code has loops pushing elements onto the stack.
+Whenever necessary,
+you can use the function <a href="#lua_checkstack"><code>lua_checkstack</code></a>
+to ensure that the stack has enough space for pushing new elements.
+
+
+
+
+
+<h3>4.1.2 &ndash; <a name="4.1.2">Valid and Acceptable Indices</a></h3>
+
+<p>
+Any function in the API that receives stack indices
+works only with <em>valid indices</em> or <em>acceptable indices</em>.
+
+
+<p>
+A <em>valid index</em> is an index that refers to a
+position that stores a modifiable Lua value.
+It comprises stack indices between&nbsp;1 and the stack top
+(<code>1 &le; abs(index) &le; top</code>)
+
+plus <em>pseudo-indices</em>,
+which represent some positions that are accessible to C&nbsp;code
+but that are not in the stack.
+Pseudo-indices are used to access the registry (see <a href="#4.3">&sect;4.3</a>)
+and the upvalues of a C&nbsp;function (see <a href="#4.2">&sect;4.2</a>).
+
+
+<p>
+Functions that do not need a specific mutable position,
+but only a value (e.g., query functions),
+can be called with acceptable indices.
+An <em>acceptable index</em> can be any valid index,
+but it also can be any positive index after the stack top
+within the space allocated for the stack,
+that is, indices up to the stack size.
+(Note that 0 is never an acceptable index.)
+Indices to upvalues (see <a href="#4.2">&sect;4.2</a>) greater than the real number
+of upvalues in the current C&nbsp;function are also acceptable (but invalid).
+Except when noted otherwise,
+functions in the API work with acceptable indices.
+
+
+<p>
+Acceptable indices serve to avoid extra tests
+against the stack top when querying the stack.
+For instance, a C&nbsp;function can query its third argument
+without the need to check whether there is a third argument,
+that is, without the need to check whether 3 is a valid index.
+
+
+<p>
+For functions that can be called with acceptable indices,
+any non-valid index is treated as if it
+contains a value of a virtual type <a name="pdf-LUA_TNONE"><code>LUA_TNONE</code></a>,
+which behaves like a nil value.
+
+
+
+
+
+<h3>4.1.3 &ndash; <a name="4.1.3">Pointers to strings</a></h3>
+
+<p>
+Several functions in the API return pointers (<code>const char*</code>)
+to Lua strings in the stack.
+(See <a href="#lua_pushfstring"><code>lua_pushfstring</code></a>, <a href="#lua_pushlstring"><code>lua_pushlstring</code></a>,
+<a href="#lua_pushstring"><code>lua_pushstring</code></a>, and <a href="#lua_tolstring"><code>lua_tolstring</code></a>.
+See also <a href="#luaL_checklstring"><code>luaL_checklstring</code></a>, <a href="#luaL_checkstring"><code>luaL_checkstring</code></a>,
+and <a href="#luaL_tolstring"><code>luaL_tolstring</code></a> in the auxiliary library.)
+
+
+<p>
+In general,
+Lua's garbage collection can free or move internal memory
+and then invalidate pointers to internal strings.
+To allow a safe use of these pointers,
+the API guarantees that any pointer to a string in a stack index
+is valid while the string value at that index is not removed from the stack.
+(It can be moved to another index, though.)
+When the index is a pseudo-index (referring to an upvalue),
+the pointer is valid while the corresponding call is active and
+the corresponding upvalue is not modified.
+
+
+<p>
+Some functions in the debug interface
+also return pointers to strings,
+namely <a href="#lua_getlocal"><code>lua_getlocal</code></a>, <a href="#lua_getupvalue"><code>lua_getupvalue</code></a>,
+<a href="#lua_setlocal"><code>lua_setlocal</code></a>, and <a href="#lua_setupvalue"><code>lua_setupvalue</code></a>.
+For these functions, the pointer is guaranteed to
+be valid while the caller function is active and
+the given closure (if one was given) is in the stack.
+
+
+<p>
+Except for these guarantees,
+the garbage collector is free to invalidate
+any pointer to internal strings.
+
+
+
+
+
+
+
+<h2>4.2 &ndash; <a name="4.2">C Closures</a></h2>
+
+<p>
+When a C&nbsp;function is created,
+it is possible to associate some values with it,
+thus creating a <em>C&nbsp;closure</em>
+(see <a href="#lua_pushcclosure"><code>lua_pushcclosure</code></a>);
+these values are called <em>upvalues</em> and are
+accessible to the function whenever it is called.
+
+
+<p>
+Whenever a C&nbsp;function is called,
+its upvalues are located at specific pseudo-indices.
+These pseudo-indices are produced by the macro
+<a href="#lua_upvalueindex"><code>lua_upvalueindex</code></a>.
+The first upvalue associated with a function is at index
+<code>lua_upvalueindex(1)</code>, and so on.
+Any access to <code>lua_upvalueindex(<em>n</em>)</code>,
+where <em>n</em> is greater than the number of upvalues of the
+current function
+(but not greater than 256,
+which is one plus the maximum number of upvalues in a closure),
+produces an acceptable but invalid index.
+
+
+<p>
+A C&nbsp;closure can also change the values
+of its corresponding upvalues.
+
+
+
+
+
+<h2>4.3 &ndash; <a name="4.3">Registry</a></h2>
+
+<p>
+Lua provides a <em>registry</em>,
+a predefined table that can be used by any C&nbsp;code to
+store whatever Lua values it needs to store.
+The registry table is always accessible at pseudo-index
+<a name="pdf-LUA_REGISTRYINDEX"><code>LUA_REGISTRYINDEX</code></a>.
+Any C&nbsp;library can store data into this table,
+but it must take care to choose keys
+that are different from those used
+by other libraries, to avoid collisions.
+Typically, you should use as key a string containing your library name,
+or a light userdata with the address of a C&nbsp;object in your code,
+or any Lua object created by your code.
+As with variable names,
+string keys starting with an underscore followed by
+uppercase letters are reserved for Lua.
+
+
+<p>
+The integer keys in the registry are used
+by the reference mechanism (see <a href="#luaL_ref"><code>luaL_ref</code></a>)
+and by some predefined values.
+Therefore, integer keys in the registry
+must not be used for other purposes.
+
+
+<p>
+When you create a new Lua state,
+its registry comes with some predefined values.
+These predefined values are indexed with integer keys
+defined as constants in <code>lua.h</code>.
+The following constants are defined:
+
+<ul>
+<li><b><a name="pdf-LUA_RIDX_MAINTHREAD"><code>LUA_RIDX_MAINTHREAD</code></a>: </b> At this index the registry has
+the main thread of the state.
+(The main thread is the one created together with the state.)
+</li>
+
+<li><b><a name="pdf-LUA_RIDX_GLOBALS"><code>LUA_RIDX_GLOBALS</code></a>: </b> At this index the registry has
+the global environment.
+</li>
+</ul>
+
+
+
+
+<h2>4.4 &ndash; <a name="4.4">Error Handling in C</a></h2>
+
+
+
+<p>
+Internally, Lua uses the C <code>longjmp</code> facility to handle errors.
+(Lua will use exceptions if you compile it as C++;
+search for <code>LUAI_THROW</code> in the source code for details.)
+When Lua faces any error,
+such as a memory allocation error or a type error,
+it <em>raises</em> an error;
+that is, it does a long jump.
+A <em>protected environment</em> uses <code>setjmp</code>
+to set a recovery point;
+any error jumps to the most recent active recovery point.
+
+
+<p>
+Inside a C&nbsp;function you can raise an error explicitly
+by calling <a href="#lua_error"><code>lua_error</code></a>.
+
+
+<p>
+Most functions in the API can raise an error,
+for instance due to a memory allocation error.
+The documentation for each function indicates whether
+it can raise errors.
+
+
+<p>
+If an error happens outside any protected environment,
+Lua calls a <em>panic function</em> (see <a href="#lua_atpanic"><code>lua_atpanic</code></a>)
+and then calls <code>abort</code>,
+thus exiting the host application.
+Your panic function can avoid this exit by
+never returning
+(e.g., doing a long jump to your own recovery point outside Lua).
+
+
+<p>
+The panic function,
+as its name implies,
+is a mechanism of last resort.
+Programs should avoid it.
+As a general rule,
+when a C&nbsp;function is called by Lua with a Lua state,
+it can do whatever it wants on that Lua state,
+as it should be already protected.
+However,
+when C code operates on other Lua states
+(e.g., a Lua-state argument to the function,
+a Lua state stored in the registry, or
+the result of <a href="#lua_newthread"><code>lua_newthread</code></a>),
+it should use them only in API calls that cannot raise errors.
+
+
+<p>
+The panic function runs as if it were a message handler (see <a href="#2.3">&sect;2.3</a>);
+in particular, the error object is on the top of the stack.
+However, there is no guarantee about stack space.
+To push anything on the stack,
+the panic function must first check the available space (see <a href="#4.1.1">&sect;4.1.1</a>).
+
+
+
+
+
+<h3>4.4.1 &ndash; <a name="4.4.1">Status Codes</a></h3>
+
+<p>
+Several functions that report errors in the API use the following
+status codes to indicate different kinds of errors or other conditions:
+
+<ul>
+
+<li><b><a name="pdf-LUA_OK"><code>LUA_OK</code></a> (0): </b> no errors.</li>
+
+<li><b><a name="pdf-LUA_ERRRUN"><code>LUA_ERRRUN</code></a>: </b> a runtime error.</li>
+
+<li><b><a name="pdf-LUA_ERRMEM"><code>LUA_ERRMEM</code></a>: </b>
+memory allocation error.
+For such errors, Lua does not call the message handler.
+</li>
+
+<li><b><a name="pdf-LUA_ERRERR"><code>LUA_ERRERR</code></a>: </b> error while running the message handler.</li>
+
+<li><b><a name="pdf-LUA_ERRSYNTAX"><code>LUA_ERRSYNTAX</code></a>: </b> syntax error during precompilation.</li>
+
+<li><b><a name="pdf-LUA_YIELD"><code>LUA_YIELD</code></a>: </b> the thread (coroutine) yields.</li>
+
+<li><b><a name="pdf-LUA_ERRFILE"><code>LUA_ERRFILE</code></a>: </b> a file-related error;
+e.g., it cannot open or read the file.</li>
+
+</ul><p>
+These constants are defined in the header file <code>lua.h</code>.
+
+
+
+
+
+
+
+<h2>4.5 &ndash; <a name="4.5">Handling Yields in C</a></h2>
+
+<p>
+Internally, Lua uses the C <code>longjmp</code> facility to yield a coroutine.
+Therefore, if a C&nbsp;function <code>foo</code> calls an API function
+and this API function yields
+(directly or indirectly by calling another function that yields),
+Lua cannot return to <code>foo</code> any more,
+because the <code>longjmp</code> removes its frame from the C&nbsp;stack.
+
+
+<p>
+To avoid this kind of problem,
+Lua raises an error whenever it tries to yield across an API call,
+except for three functions:
+<a href="#lua_yieldk"><code>lua_yieldk</code></a>, <a href="#lua_callk"><code>lua_callk</code></a>, and <a href="#lua_pcallk"><code>lua_pcallk</code></a>.
+All those functions receive a <em>continuation function</em>
+(as a parameter named <code>k</code>) to continue execution after a yield.
+
+
+<p>
+We need to set some terminology to explain continuations.
+We have a C&nbsp;function called from Lua which we will call
+the <em>original function</em>.
+This original function then calls one of those three functions in the C API,
+which we will call the <em>callee function</em>,
+that then yields the current thread.
+This can happen when the callee function is <a href="#lua_yieldk"><code>lua_yieldk</code></a>,
+or when the callee function is either <a href="#lua_callk"><code>lua_callk</code></a> or <a href="#lua_pcallk"><code>lua_pcallk</code></a>
+and the function called by them yields.
+
+
+<p>
+Suppose the running thread yields while executing the callee function.
+After the thread resumes,
+it eventually will finish running the callee function.
+However,
+the callee function cannot return to the original function,
+because its frame in the C&nbsp;stack was destroyed by the yield.
+Instead, Lua calls a <em>continuation function</em>,
+which was given as an argument to the callee function.
+As the name implies,
+the continuation function should continue the task
+of the original function.
+
+
+<p>
+As an illustration, consider the following function:
+
+<pre>
+     int original_function (lua_State *L) {
+       ...     /* code 1 */
+       status = lua_pcall(L, n, m, h);  /* calls Lua */
+       ...     /* code 2 */
+     }
+</pre><p>
+Now we want to allow
+the Lua code being run by <a href="#lua_pcall"><code>lua_pcall</code></a> to yield.
+First, we can rewrite our function like here:
+
+<pre>
+     int k (lua_State *L, int status, lua_KContext ctx) {
+       ...  /* code 2 */
+     }
+     
+     int original_function (lua_State *L) {
+       ...     /* code 1 */
+       return k(L, lua_pcall(L, n, m, h), ctx);
+     }
+</pre><p>
+In the above code,
+the new function <code>k</code> is a
+<em>continuation function</em> (with type <a href="#lua_KFunction"><code>lua_KFunction</code></a>),
+which should do all the work that the original function
+was doing after calling <a href="#lua_pcall"><code>lua_pcall</code></a>.
+Now, we must inform Lua that it must call <code>k</code> if the Lua code
+being executed by <a href="#lua_pcall"><code>lua_pcall</code></a> gets interrupted in some way
+(errors or yielding),
+so we rewrite the code as here,
+replacing <a href="#lua_pcall"><code>lua_pcall</code></a> by <a href="#lua_pcallk"><code>lua_pcallk</code></a>:
+
+<pre>
+     int original_function (lua_State *L) {
+       ...     /* code 1 */
+       return k(L, lua_pcallk(L, n, m, h, ctx2, k), ctx1);
+     }
+</pre><p>
+Note the external, explicit call to the continuation:
+Lua will call the continuation only if needed, that is,
+in case of errors or resuming after a yield.
+If the called function returns normally without ever yielding,
+<a href="#lua_pcallk"><code>lua_pcallk</code></a> (and <a href="#lua_callk"><code>lua_callk</code></a>) will also return normally.
+(Of course, instead of calling the continuation in that case,
+you can do the equivalent work directly inside the original function.)
+
+
+<p>
+Besides the Lua state,
+the continuation function has two other parameters:
+the final status of the call and the context value (<code>ctx</code>) that
+was passed originally to <a href="#lua_pcallk"><code>lua_pcallk</code></a>.
+Lua does not use this context value;
+it only passes this value from the original function to the
+continuation function.
+For <a href="#lua_pcallk"><code>lua_pcallk</code></a>,
+the status is the same value that would be returned by <a href="#lua_pcallk"><code>lua_pcallk</code></a>,
+except that it is <a href="#pdf-LUA_YIELD"><code>LUA_YIELD</code></a> when being executed after a yield
+(instead of <a href="#pdf-LUA_OK"><code>LUA_OK</code></a>).
+For <a href="#lua_yieldk"><code>lua_yieldk</code></a> and <a href="#lua_callk"><code>lua_callk</code></a>,
+the status is always <a href="#pdf-LUA_YIELD"><code>LUA_YIELD</code></a> when Lua calls the continuation.
+(For these two functions,
+Lua will not call the continuation in case of errors,
+because they do not handle errors.)
+Similarly, when using <a href="#lua_callk"><code>lua_callk</code></a>,
+you should call the continuation function
+with <a href="#pdf-LUA_OK"><code>LUA_OK</code></a> as the status.
+(For <a href="#lua_yieldk"><code>lua_yieldk</code></a>, there is not much point in calling
+directly the continuation function,
+because <a href="#lua_yieldk"><code>lua_yieldk</code></a> usually does not return.)
+
+
+<p>
+Lua treats the continuation function as if it were the original function.
+The continuation function receives the same Lua stack
+from the original function,
+in the same state it would be if the callee function had returned.
+(For instance,
+after a <a href="#lua_callk"><code>lua_callk</code></a> the function and its arguments are
+removed from the stack and replaced by the results from the call.)
+It also has the same upvalues.
+Whatever it returns is handled by Lua as if it were the return
+of the original function.
+
+
+
+
+
+<h2>4.6 &ndash; <a name="4.6">Functions and Types</a></h2>
+
+<p>
+Here we list all functions and types from the C&nbsp;API in
+alphabetical order.
+Each function has an indicator like this:
+<span class="apii">[-o, +p, <em>x</em>]</span>
+
+
+<p>
+The first field, <code>o</code>,
+is how many elements the function pops from the stack.
+The second field, <code>p</code>,
+is how many elements the function pushes onto the stack.
+(Any function always pushes its results after popping its arguments.)
+A field in the form <code>x|y</code> means the function can push (or pop)
+<code>x</code> or <code>y</code> elements,
+depending on the situation;
+an interrogation mark '<code>?</code>' means that
+we cannot know how many elements the function pops/pushes
+by looking only at its arguments.
+(For instance, they may depend on what is in the stack.)
+The third field, <code>x</code>,
+tells whether the function may raise errors:
+'<code>-</code>' means the function never raises any error;
+'<code>m</code>' means the function may raise only out-of-memory errors;
+'<code>v</code>' means the function may raise the errors explained in the text;
+'<code>e</code>' means the function can run arbitrary Lua code,
+either directly or through metamethods,
+and therefore may raise any errors.
+
+
+
+<hr><h3><a name="lua_absindex"><code>lua_absindex</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_absindex (lua_State *L, int idx);</pre>
+
+<p>
+Converts the acceptable index <code>idx</code>
+into an equivalent absolute index
+(that is, one that does not depend on the stack size).
+
+
+
+
+
+<hr><h3><a name="lua_Alloc"><code>lua_Alloc</code></a></h3>
+<pre>typedef void * (*lua_Alloc) (void *ud,
+                             void *ptr,
+                             size_t osize,
+                             size_t nsize);</pre>
+
+<p>
+The type of the memory-allocation function used by Lua states.
+The allocator function must provide a
+functionality similar to <code>realloc</code>,
+but not exactly the same.
+Its arguments are
+<code>ud</code>, an opaque pointer passed to <a href="#lua_newstate"><code>lua_newstate</code></a>;
+<code>ptr</code>, a pointer to the block being allocated/reallocated/freed;
+<code>osize</code>, the original size of the block or some code about what
+is being allocated;
+and <code>nsize</code>, the new size of the block.
+
+
+<p>
+When <code>ptr</code> is not <code>NULL</code>,
+<code>osize</code> is the size of the block pointed by <code>ptr</code>,
+that is, the size given when it was allocated or reallocated.
+
+
+<p>
+When <code>ptr</code> is <code>NULL</code>,
+<code>osize</code> encodes the kind of object that Lua is allocating.
+<code>osize</code> is any of
+<a href="#pdf-LUA_TSTRING"><code>LUA_TSTRING</code></a>, <a href="#pdf-LUA_TTABLE"><code>LUA_TTABLE</code></a>, <a href="#pdf-LUA_TFUNCTION"><code>LUA_TFUNCTION</code></a>,
+<a href="#pdf-LUA_TUSERDATA"><code>LUA_TUSERDATA</code></a>, or <a href="#pdf-LUA_TTHREAD"><code>LUA_TTHREAD</code></a> when (and only when)
+Lua is creating a new object of that type.
+When <code>osize</code> is some other value,
+Lua is allocating memory for something else.
+
+
+<p>
+Lua assumes the following behavior from the allocator function:
+
+
+<p>
+When <code>nsize</code> is zero,
+the allocator must behave like <code>free</code>
+and then return <code>NULL</code>.
+
+
+<p>
+When <code>nsize</code> is not zero,
+the allocator must behave like <code>realloc</code>.
+In particular, the allocator returns <code>NULL</code>
+if and only if it cannot fulfill the request.
+
+
+<p>
+Here is a simple implementation for the allocator function.
+It is used in the auxiliary library by <a href="#luaL_newstate"><code>luaL_newstate</code></a>.
+
+<pre>
+     static void *l_alloc (void *ud, void *ptr, size_t osize,
+                                                size_t nsize) {
+       (void)ud;  (void)osize;  /* not used */
+       if (nsize == 0) {
+         free(ptr);
+         return NULL;
+       }
+       else
+         return realloc(ptr, nsize);
+     }
+</pre><p>
+Note that ISO&nbsp;C ensures
+that <code>free(NULL)</code> has no effect and that
+<code>realloc(NULL,size)</code> is equivalent to <code>malloc(size)</code>.
+
+
+
+
+
+<hr><h3><a name="lua_arith"><code>lua_arith</code></a></h3><p>
+<span class="apii">[-(2|1), +1, <em>e</em>]</span>
+<pre>void lua_arith (lua_State *L, int op);</pre>
+
+<p>
+Performs an arithmetic or bitwise operation over the two values
+(or one, in the case of negations)
+at the top of the stack,
+with the value on the top being the second operand,
+pops these values, and pushes the result of the operation.
+The function follows the semantics of the corresponding Lua operator
+(that is, it may call metamethods).
+
+
+<p>
+The value of <code>op</code> must be one of the following constants:
+
+<ul>
+
+<li><b><a name="pdf-LUA_OPADD"><code>LUA_OPADD</code></a>: </b> performs addition (<code>+</code>)</li>
+<li><b><a name="pdf-LUA_OPSUB"><code>LUA_OPSUB</code></a>: </b> performs subtraction (<code>-</code>)</li>
+<li><b><a name="pdf-LUA_OPMUL"><code>LUA_OPMUL</code></a>: </b> performs multiplication (<code>*</code>)</li>
+<li><b><a name="pdf-LUA_OPDIV"><code>LUA_OPDIV</code></a>: </b> performs float division (<code>/</code>)</li>
+<li><b><a name="pdf-LUA_OPIDIV"><code>LUA_OPIDIV</code></a>: </b> performs floor division (<code>//</code>)</li>
+<li><b><a name="pdf-LUA_OPMOD"><code>LUA_OPMOD</code></a>: </b> performs modulo (<code>%</code>)</li>
+<li><b><a name="pdf-LUA_OPPOW"><code>LUA_OPPOW</code></a>: </b> performs exponentiation (<code>^</code>)</li>
+<li><b><a name="pdf-LUA_OPUNM"><code>LUA_OPUNM</code></a>: </b> performs mathematical negation (unary <code>-</code>)</li>
+<li><b><a name="pdf-LUA_OPBNOT"><code>LUA_OPBNOT</code></a>: </b> performs bitwise NOT (<code>~</code>)</li>
+<li><b><a name="pdf-LUA_OPBAND"><code>LUA_OPBAND</code></a>: </b> performs bitwise AND (<code>&amp;</code>)</li>
+<li><b><a name="pdf-LUA_OPBOR"><code>LUA_OPBOR</code></a>: </b> performs bitwise OR (<code>|</code>)</li>
+<li><b><a name="pdf-LUA_OPBXOR"><code>LUA_OPBXOR</code></a>: </b> performs bitwise exclusive OR (<code>~</code>)</li>
+<li><b><a name="pdf-LUA_OPSHL"><code>LUA_OPSHL</code></a>: </b> performs left shift (<code>&lt;&lt;</code>)</li>
+<li><b><a name="pdf-LUA_OPSHR"><code>LUA_OPSHR</code></a>: </b> performs right shift (<code>&gt;&gt;</code>)</li>
+
+</ul>
+
+
+
+
+<hr><h3><a name="lua_atpanic"><code>lua_atpanic</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_CFunction lua_atpanic (lua_State *L, lua_CFunction panicf);</pre>
+
+<p>
+Sets a new panic function and returns the old one (see <a href="#4.4">&sect;4.4</a>).
+
+
+
+
+
+<hr><h3><a name="lua_call"><code>lua_call</code></a></h3><p>
+<span class="apii">[-(nargs+1), +nresults, <em>e</em>]</span>
+<pre>void lua_call (lua_State *L, int nargs, int nresults);</pre>
+
+<p>
+Calls a function.
+Like regular Lua calls,
+<code>lua_call</code> respects the <code>__call</code> metamethod.
+So, here the word "function"
+means any callable value.
+
+
+<p>
+To do a call you must use the following protocol:
+first, the function to be called is pushed onto the stack;
+then, the arguments to the call are pushed
+in direct order;
+that is, the first argument is pushed first.
+Finally you call <a href="#lua_call"><code>lua_call</code></a>;
+<code>nargs</code> is the number of arguments that you pushed onto the stack.
+When the function returns,
+all arguments and the function value are popped
+and the call results are pushed onto the stack.
+The number of results is adjusted to <code>nresults</code>,
+unless <code>nresults</code> is <a name="pdf-LUA_MULTRET"><code>LUA_MULTRET</code></a>.
+In this case, all results from the function are pushed;
+Lua takes care that the returned values fit into the stack space,
+but it does not ensure any extra space in the stack.
+The function results are pushed onto the stack in direct order
+(the first result is pushed first),
+so that after the call the last result is on the top of the stack.
+
+
+<p>
+Any error while calling and running the function is propagated upwards
+(with a <code>longjmp</code>).
+
+
+<p>
+The following example shows how the host program can do the
+equivalent to this Lua code:
+
+<pre>
+     a = f("how", t.x, 14)
+</pre><p>
+Here it is in&nbsp;C:
+
+<pre>
+     lua_getglobal(L, "f");                  /* function to be called */
+     lua_pushliteral(L, "how");                       /* 1st argument */
+     lua_getglobal(L, "t");                    /* table to be indexed */
+     lua_getfield(L, -1, "x");        /* push result of t.x (2nd arg) */
+     lua_remove(L, -2);                  /* remove 't' from the stack */
+     lua_pushinteger(L, 14);                          /* 3rd argument */
+     lua_call(L, 3, 1);     /* call 'f' with 3 arguments and 1 result */
+     lua_setglobal(L, "a");                         /* set global 'a' */
+</pre><p>
+Note that the code above is <em>balanced</em>:
+at its end, the stack is back to its original configuration.
+This is considered good programming practice.
+
+
+
+
+
+<hr><h3><a name="lua_callk"><code>lua_callk</code></a></h3><p>
+<span class="apii">[-(nargs + 1), +nresults, <em>e</em>]</span>
+<pre>void lua_callk (lua_State *L,
+                int nargs,
+                int nresults,
+                lua_KContext ctx,
+                lua_KFunction k);</pre>
+
+<p>
+This function behaves exactly like <a href="#lua_call"><code>lua_call</code></a>,
+but allows the called function to yield (see <a href="#4.5">&sect;4.5</a>).
+
+
+
+
+
+<hr><h3><a name="lua_CFunction"><code>lua_CFunction</code></a></h3>
+<pre>typedef int (*lua_CFunction) (lua_State *L);</pre>
+
+<p>
+Type for C&nbsp;functions.
+
+
+<p>
+In order to communicate properly with Lua,
+a C&nbsp;function must use the following protocol,
+which defines the way parameters and results are passed:
+a C&nbsp;function receives its arguments from Lua in its stack
+in direct order (the first argument is pushed first).
+So, when the function starts,
+<code>lua_gettop(L)</code> returns the number of arguments received by the function.
+The first argument (if any) is at index 1
+and its last argument is at index <code>lua_gettop(L)</code>.
+To return values to Lua, a C&nbsp;function just pushes them onto the stack,
+in direct order (the first result is pushed first),
+and returns in C the number of results.
+Any other value in the stack below the results will be properly
+discarded by Lua.
+Like a Lua function, a C&nbsp;function called by Lua can also return
+many results.
+
+
+<p>
+As an example, the following function receives a variable number
+of numeric arguments and returns their average and their sum:
+
+<pre>
+     static int foo (lua_State *L) {
+       int n = lua_gettop(L);    /* number of arguments */
+       lua_Number sum = 0.0;
+       int i;
+       for (i = 1; i &lt;= n; i++) {
+         if (!lua_isnumber(L, i)) {
+           lua_pushliteral(L, "incorrect argument");
+           lua_error(L);
+         }
+         sum += lua_tonumber(L, i);
+       }
+       lua_pushnumber(L, sum/n);        /* first result */
+       lua_pushnumber(L, sum);         /* second result */
+       return 2;                   /* number of results */
+     }
+</pre>
+
+
+
+
+<hr><h3><a name="lua_checkstack"><code>lua_checkstack</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_checkstack (lua_State *L, int n);</pre>
+
+<p>
+Ensures that the stack has space for at least <code>n</code> extra elements,
+that is, that you can safely push up to <code>n</code> values into it.
+It returns false if it cannot fulfill the request,
+either because it would cause the stack
+to be greater than a fixed maximum size
+(typically at least several thousand elements) or
+because it cannot allocate memory for the extra space.
+This function never shrinks the stack;
+if the stack already has space for the extra elements,
+it is left unchanged.
+
+
+
+
+
+<hr><h3><a name="lua_close"><code>lua_close</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void lua_close (lua_State *L);</pre>
+
+<p>
+Close all active to-be-closed variables in the main thread,
+release all objects in the given Lua state
+(calling the corresponding garbage-collection metamethods, if any),
+and frees all dynamic memory used by this state.
+
+
+<p>
+On several platforms, you may not need to call this function,
+because all resources are naturally released when the host program ends.
+On the other hand, long-running programs that create multiple states,
+such as daemons or web servers,
+will probably need to close states as soon as they are not needed.
+
+
+
+
+
+<hr><h3><a name="lua_closeslot"><code>lua_closeslot</code></a></h3><p>
+<span class="apii">[-0, +0, <em>e</em>]</span>
+<pre>void lua_closeslot (lua_State *L, int index);</pre>
+
+<p>
+Close the to-be-closed slot at the given index and set its value to <b>nil</b>.
+The index must be the last index previously marked to be closed
+(see <a href="#lua_toclose"><code>lua_toclose</code></a>) that is still active (that is, not closed yet).
+
+
+<p>
+A <code>__close</code> metamethod cannot yield
+when called through this function.
+
+
+<p>
+(This function was introduced in release&nbsp;5.4.3.)
+
+
+
+
+
+<hr><h3><a name="lua_closethread"><code>lua_closethread</code></a></h3><p>
+<span class="apii">[-0, +?, &ndash;]</span>
+<pre>int lua_closethread (lua_State *L, lua_State *from);</pre>
+
+<p>
+Resets a thread, cleaning its call stack and closing all pending
+to-be-closed variables.
+Returns a status code:
+<a href="#pdf-LUA_OK"><code>LUA_OK</code></a> for no errors in the thread
+(either the original error that stopped the thread or
+errors in closing methods),
+or an error status otherwise.
+In case of error,
+leaves the error object on the top of the stack.
+
+
+<p>
+The parameter <code>from</code> represents the coroutine that is resetting <code>L</code>.
+If there is no such coroutine,
+this parameter can be <code>NULL</code>.
+
+
+<p>
+(This function was introduced in release&nbsp;5.4.6.)
+
+
+
+
+
+<hr><h3><a name="lua_compare"><code>lua_compare</code></a></h3><p>
+<span class="apii">[-0, +0, <em>e</em>]</span>
+<pre>int lua_compare (lua_State *L, int index1, int index2, int op);</pre>
+
+<p>
+Compares two Lua values.
+Returns 1 if the value at index <code>index1</code> satisfies <code>op</code>
+when compared with the value at index <code>index2</code>,
+following the semantics of the corresponding Lua operator
+(that is, it may call metamethods).
+Otherwise returns&nbsp;0.
+Also returns&nbsp;0 if any of the indices is not valid.
+
+
+<p>
+The value of <code>op</code> must be one of the following constants:
+
+<ul>
+
+<li><b><a name="pdf-LUA_OPEQ"><code>LUA_OPEQ</code></a>: </b> compares for equality (<code>==</code>)</li>
+<li><b><a name="pdf-LUA_OPLT"><code>LUA_OPLT</code></a>: </b> compares for less than (<code>&lt;</code>)</li>
+<li><b><a name="pdf-LUA_OPLE"><code>LUA_OPLE</code></a>: </b> compares for less or equal (<code>&lt;=</code>)</li>
+
+</ul>
+
+
+
+
+<hr><h3><a name="lua_concat"><code>lua_concat</code></a></h3><p>
+<span class="apii">[-n, +1, <em>e</em>]</span>
+<pre>void lua_concat (lua_State *L, int n);</pre>
+
+<p>
+Concatenates the <code>n</code> values at the top of the stack,
+pops them, and leaves the result on the top.
+If <code>n</code>&nbsp;is&nbsp;1, the result is the single value on the stack
+(that is, the function does nothing);
+if <code>n</code> is 0, the result is the empty string.
+Concatenation is performed following the usual semantics of Lua
+(see <a href="#3.4.6">&sect;3.4.6</a>).
+
+
+
+
+
+<hr><h3><a name="lua_copy"><code>lua_copy</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void lua_copy (lua_State *L, int fromidx, int toidx);</pre>
+
+<p>
+Copies the element at index <code>fromidx</code>
+into the valid index <code>toidx</code>,
+replacing the value at that position.
+Values at other positions are not affected.
+
+
+
+
+
+<hr><h3><a name="lua_createtable"><code>lua_createtable</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>void lua_createtable (lua_State *L, int narr, int nrec);</pre>
+
+<p>
+Creates a new empty table and pushes it onto the stack.
+Parameter <code>narr</code> is a hint for how many elements the table
+will have as a sequence;
+parameter <code>nrec</code> is a hint for how many other elements
+the table will have.
+Lua may use these hints to preallocate memory for the new table.
+This preallocation may help performance when you know in advance
+how many elements the table will have.
+Otherwise you can use the function <a href="#lua_newtable"><code>lua_newtable</code></a>.
+
+
+
+
+
+<hr><h3><a name="lua_dump"><code>lua_dump</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_dump (lua_State *L,
+                        lua_Writer writer,
+                        void *data,
+                        int strip);</pre>
+
+<p>
+Dumps a function as a binary chunk.
+Receives a Lua function on the top of the stack
+and produces a binary chunk that,
+if loaded again,
+results in a function equivalent to the one dumped.
+As it produces parts of the chunk,
+<a href="#lua_dump"><code>lua_dump</code></a> calls function <code>writer</code> (see <a href="#lua_Writer"><code>lua_Writer</code></a>)
+with the given <code>data</code>
+to write them.
+
+
+<p>
+If <code>strip</code> is true,
+the binary representation may not include all debug information
+about the function,
+to save space.
+
+
+<p>
+The value returned is the error code returned by the last
+call to the writer;
+0&nbsp;means no errors.
+
+
+<p>
+This function does not pop the Lua function from the stack.
+
+
+
+
+
+<hr><h3><a name="lua_error"><code>lua_error</code></a></h3><p>
+<span class="apii">[-1, +0, <em>v</em>]</span>
+<pre>int lua_error (lua_State *L);</pre>
+
+<p>
+Raises a Lua error,
+using the value on the top of the stack as the error object.
+This function does a long jump,
+and therefore never returns
+(see <a href="#luaL_error"><code>luaL_error</code></a>).
+
+
+
+
+
+<hr><h3><a name="lua_gc"><code>lua_gc</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_gc (lua_State *L, int what, ...);</pre>
+
+<p>
+Controls the garbage collector.
+
+
+<p>
+This function performs several tasks,
+according to the value of the parameter <code>what</code>.
+For options that need extra arguments,
+they are listed after the option.
+
+<ul>
+
+<li><b><code>LUA_GCCOLLECT</code>: </b>
+Performs a full garbage-collection cycle.
+</li>
+
+<li><b><code>LUA_GCSTOP</code>: </b>
+Stops the garbage collector.
+</li>
+
+<li><b><code>LUA_GCRESTART</code>: </b>
+Restarts the garbage collector.
+</li>
+
+<li><b><code>LUA_GCCOUNT</code>: </b>
+Returns the current amount of memory (in Kbytes) in use by Lua.
+</li>
+
+<li><b><code>LUA_GCCOUNTB</code>: </b>
+Returns the remainder of dividing the current amount of bytes of
+memory in use by Lua by 1024.
+</li>
+
+<li><b><code>LUA_GCSTEP</code> <code>(int stepsize)</code>: </b>
+Performs an incremental step of garbage collection,
+corresponding to the allocation of <code>stepsize</code> Kbytes.
+</li>
+
+<li><b><code>LUA_GCISRUNNING</code>: </b>
+Returns a boolean that tells whether the collector is running
+(i.e., not stopped).
+</li>
+
+<li><b><code>LUA_GCINC</code> (int pause, int stepmul, stepsize): </b>
+Changes the collector to incremental mode
+with the given parameters (see <a href="#2.5.1">&sect;2.5.1</a>).
+Returns the previous mode (<code>LUA_GCGEN</code> or <code>LUA_GCINC</code>).
+</li>
+
+<li><b><code>LUA_GCGEN</code> (int minormul, int majormul): </b>
+Changes the collector to generational mode
+with the given parameters (see <a href="#2.5.2">&sect;2.5.2</a>).
+Returns the previous mode (<code>LUA_GCGEN</code> or <code>LUA_GCINC</code>).
+</li>
+
+</ul><p>
+For more details about these options,
+see <a href="#pdf-collectgarbage"><code>collectgarbage</code></a>.
+
+
+<p>
+This function should not be called by a finalizer.
+
+
+
+
+
+<hr><h3><a name="lua_getallocf"><code>lua_getallocf</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_Alloc lua_getallocf (lua_State *L, void **ud);</pre>
+
+<p>
+Returns the memory-allocation function of a given state.
+If <code>ud</code> is not <code>NULL</code>, Lua stores in <code>*ud</code> the
+opaque pointer given when the memory-allocator function was set.
+
+
+
+
+
+<hr><h3><a name="lua_getfield"><code>lua_getfield</code></a></h3><p>
+<span class="apii">[-0, +1, <em>e</em>]</span>
+<pre>int lua_getfield (lua_State *L, int index, const char *k);</pre>
+
+<p>
+Pushes onto the stack the value <code>t[k]</code>,
+where <code>t</code> is the value at the given index.
+As in Lua, this function may trigger a metamethod
+for the "index" event (see <a href="#2.4">&sect;2.4</a>).
+
+
+<p>
+Returns the type of the pushed value.
+
+
+
+
+
+<hr><h3><a name="lua_getextraspace"><code>lua_getextraspace</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void *lua_getextraspace (lua_State *L);</pre>
+
+<p>
+Returns a pointer to a raw memory area associated with the
+given Lua state.
+The application can use this area for any purpose;
+Lua does not use it for anything.
+
+
+<p>
+Each new thread has this area initialized with a copy
+of the area of the main thread.
+
+
+<p>
+By default, this area has the size of a pointer to void,
+but you can recompile Lua with a different size for this area.
+(See <code>LUA_EXTRASPACE</code> in <code>luaconf.h</code>.)
+
+
+
+
+
+<hr><h3><a name="lua_getglobal"><code>lua_getglobal</code></a></h3><p>
+<span class="apii">[-0, +1, <em>e</em>]</span>
+<pre>int lua_getglobal (lua_State *L, const char *name);</pre>
+
+<p>
+Pushes onto the stack the value of the global <code>name</code>.
+Returns the type of that value.
+
+
+
+
+
+<hr><h3><a name="lua_geti"><code>lua_geti</code></a></h3><p>
+<span class="apii">[-0, +1, <em>e</em>]</span>
+<pre>int lua_geti (lua_State *L, int index, lua_Integer i);</pre>
+
+<p>
+Pushes onto the stack the value <code>t[i]</code>,
+where <code>t</code> is the value at the given index.
+As in Lua, this function may trigger a metamethod
+for the "index" event (see <a href="#2.4">&sect;2.4</a>).
+
+
+<p>
+Returns the type of the pushed value.
+
+
+
+
+
+<hr><h3><a name="lua_getmetatable"><code>lua_getmetatable</code></a></h3><p>
+<span class="apii">[-0, +(0|1), &ndash;]</span>
+<pre>int lua_getmetatable (lua_State *L, int index);</pre>
+
+<p>
+If the value at the given index has a metatable,
+the function pushes that metatable onto the stack and returns&nbsp;1.
+Otherwise,
+the function returns&nbsp;0 and pushes nothing on the stack.
+
+
+
+
+
+<hr><h3><a name="lua_gettable"><code>lua_gettable</code></a></h3><p>
+<span class="apii">[-1, +1, <em>e</em>]</span>
+<pre>int lua_gettable (lua_State *L, int index);</pre>
+
+<p>
+Pushes onto the stack the value <code>t[k]</code>,
+where <code>t</code> is the value at the given index
+and <code>k</code> is the value on the top of the stack.
+
+
+<p>
+This function pops the key from the stack,
+pushing the resulting value in its place.
+As in Lua, this function may trigger a metamethod
+for the "index" event (see <a href="#2.4">&sect;2.4</a>).
+
+
+<p>
+Returns the type of the pushed value.
+
+
+
+
+
+<hr><h3><a name="lua_gettop"><code>lua_gettop</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_gettop (lua_State *L);</pre>
+
+<p>
+Returns the index of the top element in the stack.
+Because indices start at&nbsp;1,
+this result is equal to the number of elements in the stack;
+in particular, 0&nbsp;means an empty stack.
+
+
+
+
+
+<hr><h3><a name="lua_getiuservalue"><code>lua_getiuservalue</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>int lua_getiuservalue (lua_State *L, int index, int n);</pre>
+
+<p>
+Pushes onto the stack the <code>n</code>-th user value associated with the
+full userdata at the given index and
+returns the type of the pushed value.
+
+
+<p>
+If the userdata does not have that value,
+pushes <b>nil</b> and returns <a href="#pdf-LUA_TNONE"><code>LUA_TNONE</code></a>.
+
+
+
+
+
+<hr><h3><a name="lua_insert"><code>lua_insert</code></a></h3><p>
+<span class="apii">[-1, +1, &ndash;]</span>
+<pre>void lua_insert (lua_State *L, int index);</pre>
+
+<p>
+Moves the top element into the given valid index,
+shifting up the elements above this index to open space.
+This function cannot be called with a pseudo-index,
+because a pseudo-index is not an actual stack position.
+
+
+
+
+
+<hr><h3><a name="lua_Integer"><code>lua_Integer</code></a></h3>
+<pre>typedef ... lua_Integer;</pre>
+
+<p>
+The type of integers in Lua.
+
+
+<p>
+By default this type is <code>long long</code>,
+(usually a 64-bit two-complement integer),
+but that can be changed to <code>long</code> or <code>int</code>
+(usually a 32-bit two-complement integer).
+(See <code>LUA_INT_TYPE</code> in <code>luaconf.h</code>.)
+
+
+<p>
+Lua also defines the constants
+<a name="pdf-LUA_MININTEGER"><code>LUA_MININTEGER</code></a> and <a name="pdf-LUA_MAXINTEGER"><code>LUA_MAXINTEGER</code></a>,
+with the minimum and the maximum values that fit in this type.
+
+
+
+
+
+<hr><h3><a name="lua_isboolean"><code>lua_isboolean</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isboolean (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is a boolean,
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_iscfunction"><code>lua_iscfunction</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_iscfunction (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is a C&nbsp;function,
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_isfunction"><code>lua_isfunction</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isfunction (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is a function
+(either C or Lua), and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_isinteger"><code>lua_isinteger</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isinteger (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is an integer
+(that is, the value is a number and is represented as an integer),
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_islightuserdata"><code>lua_islightuserdata</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_islightuserdata (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is a light userdata,
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_isnil"><code>lua_isnil</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isnil (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is <b>nil</b>,
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_isnone"><code>lua_isnone</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isnone (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the given index is not valid,
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_isnoneornil"><code>lua_isnoneornil</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isnoneornil (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the given index is not valid
+or if the value at this index is <b>nil</b>,
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_isnumber"><code>lua_isnumber</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isnumber (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is a number
+or a string convertible to a number,
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_isstring"><code>lua_isstring</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isstring (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is a string
+or a number (which is always convertible to a string),
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_istable"><code>lua_istable</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_istable (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is a table,
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_isthread"><code>lua_isthread</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isthread (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is a thread,
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_isuserdata"><code>lua_isuserdata</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isuserdata (lua_State *L, int index);</pre>
+
+<p>
+Returns 1 if the value at the given index is a userdata
+(either full or light), and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_isyieldable"><code>lua_isyieldable</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_isyieldable (lua_State *L);</pre>
+
+<p>
+Returns 1 if the given coroutine can yield,
+and 0&nbsp;otherwise.
+
+
+
+
+
+<hr><h3><a name="lua_KContext"><code>lua_KContext</code></a></h3>
+<pre>typedef ... lua_KContext;</pre>
+
+<p>
+The type for continuation-function contexts.
+It must be a numeric type.
+This type is defined as <code>intptr_t</code>
+when <code>intptr_t</code> is available,
+so that it can store pointers too.
+Otherwise, it is defined as <code>ptrdiff_t</code>.
+
+
+
+
+
+<hr><h3><a name="lua_KFunction"><code>lua_KFunction</code></a></h3>
+<pre>typedef int (*lua_KFunction) (lua_State *L, int status, lua_KContext ctx);</pre>
+
+<p>
+Type for continuation functions (see <a href="#4.5">&sect;4.5</a>).
+
+
+
+
+
+<hr><h3><a name="lua_len"><code>lua_len</code></a></h3><p>
+<span class="apii">[-0, +1, <em>e</em>]</span>
+<pre>void lua_len (lua_State *L, int index);</pre>
+
+<p>
+Returns the length of the value at the given index.
+It is equivalent to the '<code>#</code>' operator in Lua (see <a href="#3.4.7">&sect;3.4.7</a>) and
+may trigger a metamethod for the "length" event (see <a href="#2.4">&sect;2.4</a>).
+The result is pushed on the stack.
+
+
+
+
+
+<hr><h3><a name="lua_load"><code>lua_load</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>int lua_load (lua_State *L,
+              lua_Reader reader,
+              void *data,
+              const char *chunkname,
+              const char *mode);</pre>
+
+<p>
+Loads a Lua chunk without running it.
+If there are no errors,
+<code>lua_load</code> pushes the compiled chunk as a Lua
+function on top of the stack.
+Otherwise, it pushes an error message.
+
+
+<p>
+The <code>lua_load</code> function uses a user-supplied <code>reader</code> function
+to read the chunk (see <a href="#lua_Reader"><code>lua_Reader</code></a>).
+The <code>data</code> argument is an opaque value passed to the reader function.
+
+
+<p>
+The <code>chunkname</code> argument gives a name to the chunk,
+which is used for error messages and in debug information (see <a href="#4.7">&sect;4.7</a>).
+
+
+<p>
+<code>lua_load</code> automatically detects whether the chunk is text or binary
+and loads it accordingly (see program <code>luac</code>).
+The string <code>mode</code> works as in function <a href="#pdf-load"><code>load</code></a>,
+with the addition that
+a <code>NULL</code> value is equivalent to the string "<code>bt</code>".
+
+
+<p>
+<code>lua_load</code> uses the stack internally,
+so the reader function must always leave the stack
+unmodified when returning.
+
+
+<p>
+<code>lua_load</code> can return
+<a href="#pdf-LUA_OK"><code>LUA_OK</code></a>, <a href="#pdf-LUA_ERRSYNTAX"><code>LUA_ERRSYNTAX</code></a>, or <a href="#pdf-LUA_ERRMEM"><code>LUA_ERRMEM</code></a>.
+The function may also return other values corresponding to
+errors raised by the read function (see <a href="#4.4.1">&sect;4.4.1</a>).
+
+
+<p>
+If the resulting function has upvalues,
+its first upvalue is set to the value of the global environment
+stored at index <code>LUA_RIDX_GLOBALS</code> in the registry (see <a href="#4.3">&sect;4.3</a>).
+When loading main chunks,
+this upvalue will be the <code>_ENV</code> variable (see <a href="#2.2">&sect;2.2</a>).
+Other upvalues are initialized with <b>nil</b>.
+
+
+
+
+
+<hr><h3><a name="lua_newstate"><code>lua_newstate</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_State *lua_newstate (lua_Alloc f, void *ud);</pre>
+
+<p>
+Creates a new independent state and returns its main thread.
+Returns <code>NULL</code> if it cannot create the state
+(due to lack of memory).
+The argument <code>f</code> is the allocator function;
+Lua will do all memory allocation for this state
+through this function (see <a href="#lua_Alloc"><code>lua_Alloc</code></a>).
+The second argument, <code>ud</code>, is an opaque pointer that Lua
+passes to the allocator in every call.
+
+
+
+
+
+<hr><h3><a name="lua_newtable"><code>lua_newtable</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>void lua_newtable (lua_State *L);</pre>
+
+<p>
+Creates a new empty table and pushes it onto the stack.
+It is equivalent to <code>lua_createtable(L, 0, 0)</code>.
+
+
+
+
+
+<hr><h3><a name="lua_newthread"><code>lua_newthread</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>lua_State *lua_newthread (lua_State *L);</pre>
+
+<p>
+Creates a new thread, pushes it on the stack,
+and returns a pointer to a <a href="#lua_State"><code>lua_State</code></a> that represents this new thread.
+The new thread returned by this function shares with the original thread
+its global environment,
+but has an independent execution stack.
+
+
+<p>
+Threads are subject to garbage collection,
+like any Lua object.
+
+
+
+
+
+<hr><h3><a name="lua_newuserdatauv"><code>lua_newuserdatauv</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>void *lua_newuserdatauv (lua_State *L, size_t size, int nuvalue);</pre>
+
+<p>
+This function creates and pushes on the stack a new full userdata,
+with <code>nuvalue</code> associated Lua values, called <code>user values</code>,
+plus an associated block of raw memory with <code>size</code> bytes.
+(The user values can be set and read with the functions
+<a href="#lua_setiuservalue"><code>lua_setiuservalue</code></a> and <a href="#lua_getiuservalue"><code>lua_getiuservalue</code></a>.)
+
+
+<p>
+The function returns the address of the block of memory.
+Lua ensures that this address is valid as long as
+the corresponding userdata is alive (see <a href="#2.5">&sect;2.5</a>).
+Moreover, if the userdata is marked for finalization (see <a href="#2.5.3">&sect;2.5.3</a>),
+its address is valid at least until the call to its finalizer.
+
+
+
+
+
+<hr><h3><a name="lua_next"><code>lua_next</code></a></h3><p>
+<span class="apii">[-1, +(2|0), <em>v</em>]</span>
+<pre>int lua_next (lua_State *L, int index);</pre>
+
+<p>
+Pops a key from the stack,
+and pushes a key&ndash;value pair from the table at the given index,
+the "next" pair after the given key.
+If there are no more elements in the table,
+then <a href="#lua_next"><code>lua_next</code></a> returns&nbsp;0 and pushes nothing.
+
+
+<p>
+A typical table traversal looks like this:
+
+<pre>
+     /* table is in the stack at index 't' */
+     lua_pushnil(L);  /* first key */
+     while (lua_next(L, t) != 0) {
+       /* uses 'key' (at index -2) and 'value' (at index -1) */
+       printf("%s - %s\n",
+              lua_typename(L, lua_type(L, -2)),
+              lua_typename(L, lua_type(L, -1)));
+       /* removes 'value'; keeps 'key' for next iteration */
+       lua_pop(L, 1);
+     }
+</pre>
+
+<p>
+While traversing a table,
+avoid calling <a href="#lua_tolstring"><code>lua_tolstring</code></a> directly on a key,
+unless you know that the key is actually a string.
+Recall that <a href="#lua_tolstring"><code>lua_tolstring</code></a> may change
+the value at the given index;
+this confuses the next call to <a href="#lua_next"><code>lua_next</code></a>.
+
+
+<p>
+This function may raise an error if the given key
+is neither <b>nil</b> nor present in the table.
+See function <a href="#pdf-next"><code>next</code></a> for the caveats of modifying
+the table during its traversal.
+
+
+
+
+
+<hr><h3><a name="lua_Number"><code>lua_Number</code></a></h3>
+<pre>typedef ... lua_Number;</pre>
+
+<p>
+The type of floats in Lua.
+
+
+<p>
+By default this type is double,
+but that can be changed to a single float or a long double.
+(See <code>LUA_FLOAT_TYPE</code> in <code>luaconf.h</code>.)
+
+
+
+
+
+<hr><h3><a name="lua_numbertointeger"><code>lua_numbertointeger</code></a></h3>
+<pre>int lua_numbertointeger (lua_Number n, lua_Integer *p);</pre>
+
+<p>
+Tries to convert a Lua float to a Lua integer;
+the float <code>n</code> must have an integral value.
+If that value is within the range of Lua integers,
+it is converted to an integer and assigned to <code>*p</code>.
+The macro results in a boolean indicating whether the
+conversion was successful.
+(Note that this range test can be tricky to do
+correctly without this macro, due to rounding.)
+
+
+<p>
+This macro may evaluate its arguments more than once.
+
+
+
+
+
+<hr><h3><a name="lua_pcall"><code>lua_pcall</code></a></h3><p>
+<span class="apii">[-(nargs + 1), +(nresults|1), &ndash;]</span>
+<pre>int lua_pcall (lua_State *L, int nargs, int nresults, int msgh);</pre>
+
+<p>
+Calls a function (or a callable object) in protected mode.
+
+
+<p>
+Both <code>nargs</code> and <code>nresults</code> have the same meaning as
+in <a href="#lua_call"><code>lua_call</code></a>.
+If there are no errors during the call,
+<a href="#lua_pcall"><code>lua_pcall</code></a> behaves exactly like <a href="#lua_call"><code>lua_call</code></a>.
+However, if there is any error,
+<a href="#lua_pcall"><code>lua_pcall</code></a> catches it,
+pushes a single value on the stack (the error object),
+and returns an error code.
+Like <a href="#lua_call"><code>lua_call</code></a>,
+<a href="#lua_pcall"><code>lua_pcall</code></a> always removes the function
+and its arguments from the stack.
+
+
+<p>
+If <code>msgh</code> is 0,
+then the error object returned on the stack
+is exactly the original error object.
+Otherwise, <code>msgh</code> is the stack index of a
+<em>message handler</em>.
+(This index cannot be a pseudo-index.)
+In case of runtime errors,
+this handler will be called with the error object
+and its return value will be the object
+returned on the stack by <a href="#lua_pcall"><code>lua_pcall</code></a>.
+
+
+<p>
+Typically, the message handler is used to add more debug
+information to the error object, such as a stack traceback.
+Such information cannot be gathered after the return of <a href="#lua_pcall"><code>lua_pcall</code></a>,
+since by then the stack has unwound.
+
+
+<p>
+The <a href="#lua_pcall"><code>lua_pcall</code></a> function returns one of the following status codes:
+<a href="#pdf-LUA_OK"><code>LUA_OK</code></a>, <a href="#pdf-LUA_ERRRUN"><code>LUA_ERRRUN</code></a>, <a href="#pdf-LUA_ERRMEM"><code>LUA_ERRMEM</code></a>, or <a href="#pdf-LUA_ERRERR"><code>LUA_ERRERR</code></a>.
+
+
+
+
+
+<hr><h3><a name="lua_pcallk"><code>lua_pcallk</code></a></h3><p>
+<span class="apii">[-(nargs + 1), +(nresults|1), &ndash;]</span>
+<pre>int lua_pcallk (lua_State *L,
+                int nargs,
+                int nresults,
+                int msgh,
+                lua_KContext ctx,
+                lua_KFunction k);</pre>
+
+<p>
+This function behaves exactly like <a href="#lua_pcall"><code>lua_pcall</code></a>,
+except that it allows the called function to yield (see <a href="#4.5">&sect;4.5</a>).
+
+
+
+
+
+<hr><h3><a name="lua_pop"><code>lua_pop</code></a></h3><p>
+<span class="apii">[-n, +0, <em>e</em>]</span>
+<pre>void lua_pop (lua_State *L, int n);</pre>
+
+<p>
+Pops <code>n</code> elements from the stack.
+It is implemented as a macro over <a href="#lua_settop"><code>lua_settop</code></a>.
+
+
+
+
+
+<hr><h3><a name="lua_pushboolean"><code>lua_pushboolean</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>void lua_pushboolean (lua_State *L, int b);</pre>
+
+<p>
+Pushes a boolean value with value <code>b</code> onto the stack.
+
+
+
+
+
+<hr><h3><a name="lua_pushcclosure"><code>lua_pushcclosure</code></a></h3><p>
+<span class="apii">[-n, +1, <em>m</em>]</span>
+<pre>void lua_pushcclosure (lua_State *L, lua_CFunction fn, int n);</pre>
+
+<p>
+Pushes a new C&nbsp;closure onto the stack.
+This function receives a pointer to a C&nbsp;function
+and pushes onto the stack a Lua value of type <code>function</code> that,
+when called, invokes the corresponding C&nbsp;function.
+The parameter <code>n</code> tells how many upvalues this function will have
+(see <a href="#4.2">&sect;4.2</a>).
+
+
+<p>
+Any function to be callable by Lua must
+follow the correct protocol to receive its parameters
+and return its results (see <a href="#lua_CFunction"><code>lua_CFunction</code></a>).
+
+
+<p>
+When a C&nbsp;function is created,
+it is possible to associate some values with it,
+the so called upvalues;
+these upvalues are then accessible to the function whenever it is called.
+This association is called a C&nbsp;closure (see <a href="#4.2">&sect;4.2</a>).
+To create a C&nbsp;closure,
+first the initial values for its upvalues must be pushed onto the stack.
+(When there are multiple upvalues, the first value is pushed first.)
+Then <a href="#lua_pushcclosure"><code>lua_pushcclosure</code></a>
+is called to create and push the C&nbsp;function onto the stack,
+with the argument <code>n</code> telling how many values will be
+associated with the function.
+<a href="#lua_pushcclosure"><code>lua_pushcclosure</code></a> also pops these values from the stack.
+
+
+<p>
+The maximum value for <code>n</code> is 255.
+
+
+<p>
+When <code>n</code> is zero,
+this function creates a <em>light C&nbsp;function</em>,
+which is just a pointer to the C&nbsp;function.
+In that case, it never raises a memory error.
+
+
+
+
+
+<hr><h3><a name="lua_pushcfunction"><code>lua_pushcfunction</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>void lua_pushcfunction (lua_State *L, lua_CFunction f);</pre>
+
+<p>
+Pushes a C&nbsp;function onto the stack.
+This function is equivalent to <a href="#lua_pushcclosure"><code>lua_pushcclosure</code></a> with no upvalues.
+
+
+
+
+
+<hr><h3><a name="lua_pushfstring"><code>lua_pushfstring</code></a></h3><p>
+<span class="apii">[-0, +1, <em>v</em>]</span>
+<pre>const char *lua_pushfstring (lua_State *L, const char *fmt, ...);</pre>
+
+<p>
+Pushes onto the stack a formatted string
+and returns a pointer to this string (see <a href="#4.1.3">&sect;4.1.3</a>).
+It is similar to the ISO&nbsp;C function <code>sprintf</code>,
+but has two important differences.
+First,
+you do not have to allocate space for the result;
+the result is a Lua string and Lua takes care of memory allocation
+(and deallocation, through garbage collection).
+Second,
+the conversion specifiers are quite restricted.
+There are no flags, widths, or precisions.
+The conversion specifiers can only be
+'<code>%%</code>' (inserts the character '<code>%</code>'),
+'<code>%s</code>' (inserts a zero-terminated string, with no size restrictions),
+'<code>%f</code>' (inserts a <a href="#lua_Number"><code>lua_Number</code></a>),
+'<code>%I</code>' (inserts a <a href="#lua_Integer"><code>lua_Integer</code></a>),
+'<code>%p</code>' (inserts a pointer),
+'<code>%d</code>' (inserts an <code>int</code>),
+'<code>%c</code>' (inserts an <code>int</code> as a one-byte character), and
+'<code>%U</code>' (inserts a <code>long int</code> as a UTF-8 byte sequence).
+
+
+<p>
+This function may raise errors due to memory overflow
+or an invalid conversion specifier.
+
+
+
+
+
+<hr><h3><a name="lua_pushglobaltable"><code>lua_pushglobaltable</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>void lua_pushglobaltable (lua_State *L);</pre>
+
+<p>
+Pushes the global environment onto the stack.
+
+
+
+
+
+<hr><h3><a name="lua_pushinteger"><code>lua_pushinteger</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>void lua_pushinteger (lua_State *L, lua_Integer n);</pre>
+
+<p>
+Pushes an integer with value <code>n</code> onto the stack.
+
+
+
+
+
+<hr><h3><a name="lua_pushlightuserdata"><code>lua_pushlightuserdata</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>void lua_pushlightuserdata (lua_State *L, void *p);</pre>
+
+<p>
+Pushes a light userdata onto the stack.
+
+
+<p>
+Userdata represent C&nbsp;values in Lua.
+A <em>light userdata</em> represents a pointer, a <code>void*</code>.
+It is a value (like a number):
+you do not create it, it has no individual metatable,
+and it is not collected (as it was never created).
+A light userdata is equal to "any"
+light userdata with the same C&nbsp;address.
+
+
+
+
+
+<hr><h3><a name="lua_pushliteral"><code>lua_pushliteral</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>const char *lua_pushliteral (lua_State *L, const char *s);</pre>
+
+<p>
+This macro is equivalent to <a href="#lua_pushstring"><code>lua_pushstring</code></a>,
+but should be used only when <code>s</code> is a literal string.
+(Lua may optimize this case.)
+
+
+
+
+
+<hr><h3><a name="lua_pushlstring"><code>lua_pushlstring</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>const char *lua_pushlstring (lua_State *L, const char *s, size_t len);</pre>
+
+<p>
+Pushes the string pointed to by <code>s</code> with size <code>len</code>
+onto the stack.
+Lua will make or reuse an internal copy of the given string,
+so the memory at <code>s</code> can be freed or reused immediately after
+the function returns.
+The string can contain any binary data,
+including embedded zeros.
+
+
+<p>
+Returns a pointer to the internal copy of the string (see <a href="#4.1.3">&sect;4.1.3</a>).
+
+
+
+
+
+<hr><h3><a name="lua_pushnil"><code>lua_pushnil</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>void lua_pushnil (lua_State *L);</pre>
+
+<p>
+Pushes a nil value onto the stack.
+
+
+
+
+
+<hr><h3><a name="lua_pushnumber"><code>lua_pushnumber</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>void lua_pushnumber (lua_State *L, lua_Number n);</pre>
+
+<p>
+Pushes a float with value <code>n</code> onto the stack.
+
+
+
+
+
+<hr><h3><a name="lua_pushstring"><code>lua_pushstring</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>const char *lua_pushstring (lua_State *L, const char *s);</pre>
+
+<p>
+Pushes the zero-terminated string pointed to by <code>s</code>
+onto the stack.
+Lua will make or reuse an internal copy of the given string,
+so the memory at <code>s</code> can be freed or reused immediately after
+the function returns.
+
+
+<p>
+Returns a pointer to the internal copy of the string (see <a href="#4.1.3">&sect;4.1.3</a>).
+
+
+<p>
+If <code>s</code> is <code>NULL</code>, pushes <b>nil</b> and returns <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="lua_pushthread"><code>lua_pushthread</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>int lua_pushthread (lua_State *L);</pre>
+
+<p>
+Pushes the thread represented by <code>L</code> onto the stack.
+Returns 1 if this thread is the main thread of its state.
+
+
+
+
+
+<hr><h3><a name="lua_pushvalue"><code>lua_pushvalue</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>void lua_pushvalue (lua_State *L, int index);</pre>
+
+<p>
+Pushes a copy of the element at the given index
+onto the stack.
+
+
+
+
+
+<hr><h3><a name="lua_pushvfstring"><code>lua_pushvfstring</code></a></h3><p>
+<span class="apii">[-0, +1, <em>v</em>]</span>
+<pre>const char *lua_pushvfstring (lua_State *L,
+                              const char *fmt,
+                              va_list argp);</pre>
+
+<p>
+Equivalent to <a href="#lua_pushfstring"><code>lua_pushfstring</code></a>, except that it receives a <code>va_list</code>
+instead of a variable number of arguments.
+
+
+
+
+
+<hr><h3><a name="lua_rawequal"><code>lua_rawequal</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_rawequal (lua_State *L, int index1, int index2);</pre>
+
+<p>
+Returns 1 if the two values in indices <code>index1</code> and
+<code>index2</code> are primitively equal
+(that is, equal without calling the <code>__eq</code> metamethod).
+Otherwise returns&nbsp;0.
+Also returns&nbsp;0 if any of the indices are not valid.
+
+
+
+
+
+<hr><h3><a name="lua_rawget"><code>lua_rawget</code></a></h3><p>
+<span class="apii">[-1, +1, &ndash;]</span>
+<pre>int lua_rawget (lua_State *L, int index);</pre>
+
+<p>
+Similar to <a href="#lua_gettable"><code>lua_gettable</code></a>, but does a raw access
+(i.e., without metamethods).
+The value at <code>index</code> must be a table.
+
+
+
+
+
+<hr><h3><a name="lua_rawgeti"><code>lua_rawgeti</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>int lua_rawgeti (lua_State *L, int index, lua_Integer n);</pre>
+
+<p>
+Pushes onto the stack the value <code>t[n]</code>,
+where <code>t</code> is the table at the given index.
+The access is raw,
+that is, it does not use the <code>__index</code> metavalue.
+
+
+<p>
+Returns the type of the pushed value.
+
+
+
+
+
+<hr><h3><a name="lua_rawgetp"><code>lua_rawgetp</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>int lua_rawgetp (lua_State *L, int index, const void *p);</pre>
+
+<p>
+Pushes onto the stack the value <code>t[k]</code>,
+where <code>t</code> is the table at the given index and
+<code>k</code> is the pointer <code>p</code> represented as a light userdata.
+The access is raw;
+that is, it does not use the <code>__index</code> metavalue.
+
+
+<p>
+Returns the type of the pushed value.
+
+
+
+
+
+<hr><h3><a name="lua_rawlen"><code>lua_rawlen</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_Unsigned lua_rawlen (lua_State *L, int index);</pre>
+
+<p>
+Returns the raw "length" of the value at the given index:
+for strings, this is the string length;
+for tables, this is the result of the length operator ('<code>#</code>')
+with no metamethods;
+for userdata, this is the size of the block of memory allocated
+for the userdata.
+For other values, this call returns&nbsp;0.
+
+
+
+
+
+<hr><h3><a name="lua_rawset"><code>lua_rawset</code></a></h3><p>
+<span class="apii">[-2, +0, <em>m</em>]</span>
+<pre>void lua_rawset (lua_State *L, int index);</pre>
+
+<p>
+Similar to <a href="#lua_settable"><code>lua_settable</code></a>, but does a raw assignment
+(i.e., without metamethods).
+The value at <code>index</code> must be a table.
+
+
+
+
+
+<hr><h3><a name="lua_rawseti"><code>lua_rawseti</code></a></h3><p>
+<span class="apii">[-1, +0, <em>m</em>]</span>
+<pre>void lua_rawseti (lua_State *L, int index, lua_Integer i);</pre>
+
+<p>
+Does the equivalent of <code>t[i] = v</code>,
+where <code>t</code> is the table at the given index
+and <code>v</code> is the value on the top of the stack.
+
+
+<p>
+This function pops the value from the stack.
+The assignment is raw,
+that is, it does not use the <code>__newindex</code> metavalue.
+
+
+
+
+
+<hr><h3><a name="lua_rawsetp"><code>lua_rawsetp</code></a></h3><p>
+<span class="apii">[-1, +0, <em>m</em>]</span>
+<pre>void lua_rawsetp (lua_State *L, int index, const void *p);</pre>
+
+<p>
+Does the equivalent of <code>t[p] = v</code>,
+where <code>t</code> is the table at the given index,
+<code>p</code> is encoded as a light userdata,
+and <code>v</code> is the value on the top of the stack.
+
+
+<p>
+This function pops the value from the stack.
+The assignment is raw,
+that is, it does not use the <code>__newindex</code> metavalue.
+
+
+
+
+
+<hr><h3><a name="lua_Reader"><code>lua_Reader</code></a></h3>
+<pre>typedef const char * (*lua_Reader) (lua_State *L,
+                                    void *data,
+                                    size_t *size);</pre>
+
+<p>
+The reader function used by <a href="#lua_load"><code>lua_load</code></a>.
+Every time <a href="#lua_load"><code>lua_load</code></a> needs another piece of the chunk,
+it calls the reader,
+passing along its <code>data</code> parameter.
+The reader must return a pointer to a block of memory
+with a new piece of the chunk
+and set <code>size</code> to the block size.
+The block must exist until the reader function is called again.
+To signal the end of the chunk,
+the reader must return <code>NULL</code> or set <code>size</code> to zero.
+The reader function may return pieces of any size greater than zero.
+
+
+
+
+
+<hr><h3><a name="lua_register"><code>lua_register</code></a></h3><p>
+<span class="apii">[-0, +0, <em>e</em>]</span>
+<pre>void lua_register (lua_State *L, const char *name, lua_CFunction f);</pre>
+
+<p>
+Sets the C&nbsp;function <code>f</code> as the new value of global <code>name</code>.
+It is defined as a macro:
+
+<pre>
+     #define lua_register(L,n,f) \
+            (lua_pushcfunction(L, f), lua_setglobal(L, n))
+</pre>
+
+
+
+
+<hr><h3><a name="lua_remove"><code>lua_remove</code></a></h3><p>
+<span class="apii">[-1, +0, &ndash;]</span>
+<pre>void lua_remove (lua_State *L, int index);</pre>
+
+<p>
+Removes the element at the given valid index,
+shifting down the elements above this index to fill the gap.
+This function cannot be called with a pseudo-index,
+because a pseudo-index is not an actual stack position.
+
+
+
+
+
+<hr><h3><a name="lua_replace"><code>lua_replace</code></a></h3><p>
+<span class="apii">[-1, +0, &ndash;]</span>
+<pre>void lua_replace (lua_State *L, int index);</pre>
+
+<p>
+Moves the top element into the given valid index
+without shifting any element
+(therefore replacing the value at that given index),
+and then pops the top element.
+
+
+
+
+
+<hr><h3><a name="lua_resetthread"><code>lua_resetthread</code></a></h3><p>
+<span class="apii">[-0, +?, &ndash;]</span>
+<pre>int lua_resetthread (lua_State *L);</pre>
+
+<p>
+This function is deprecated;
+it is equivalent to <a href="#lua_closethread"><code>lua_closethread</code></a> with
+<code>from</code> being <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="lua_resume"><code>lua_resume</code></a></h3><p>
+<span class="apii">[-?, +?, &ndash;]</span>
+<pre>int lua_resume (lua_State *L, lua_State *from, int nargs,
+                          int *nresults);</pre>
+
+<p>
+Starts and resumes a coroutine in the given thread <code>L</code>.
+
+
+<p>
+To start a coroutine,
+you push the main function plus any arguments
+onto the empty stack of the thread.
+then you call <a href="#lua_resume"><code>lua_resume</code></a>,
+with <code>nargs</code> being the number of arguments.
+This call returns when the coroutine suspends or finishes its execution.
+When it returns,
+<code>*nresults</code> is updated and
+the top of the stack contains
+the <code>*nresults</code> values passed to <a href="#lua_yield"><code>lua_yield</code></a>
+or returned by the body function.
+<a href="#lua_resume"><code>lua_resume</code></a> returns
+<a href="#pdf-LUA_YIELD"><code>LUA_YIELD</code></a> if the coroutine yields,
+<a href="#pdf-LUA_OK"><code>LUA_OK</code></a> if the coroutine finishes its execution
+without errors,
+or an error code in case of errors (see <a href="#4.4.1">&sect;4.4.1</a>).
+In case of errors,
+the error object is on the top of the stack.
+
+
+<p>
+To resume a coroutine,
+you remove the <code>*nresults</code> yielded values from its stack,
+push the values to be passed as results from <code>yield</code>,
+and then call <a href="#lua_resume"><code>lua_resume</code></a>.
+
+
+<p>
+The parameter <code>from</code> represents the coroutine that is resuming <code>L</code>.
+If there is no such coroutine,
+this parameter can be <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="lua_rotate"><code>lua_rotate</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void lua_rotate (lua_State *L, int idx, int n);</pre>
+
+<p>
+Rotates the stack elements between the valid index <code>idx</code>
+and the top of the stack.
+The elements are rotated <code>n</code> positions in the direction of the top,
+for a positive <code>n</code>,
+or <code>-n</code> positions in the direction of the bottom,
+for a negative <code>n</code>.
+The absolute value of <code>n</code> must not be greater than the size
+of the slice being rotated.
+This function cannot be called with a pseudo-index,
+because a pseudo-index is not an actual stack position.
+
+
+
+
+
+<hr><h3><a name="lua_setallocf"><code>lua_setallocf</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void lua_setallocf (lua_State *L, lua_Alloc f, void *ud);</pre>
+
+<p>
+Changes the allocator function of a given state to <code>f</code>
+with user data <code>ud</code>.
+
+
+
+
+
+<hr><h3><a name="lua_setfield"><code>lua_setfield</code></a></h3><p>
+<span class="apii">[-1, +0, <em>e</em>]</span>
+<pre>void lua_setfield (lua_State *L, int index, const char *k);</pre>
+
+<p>
+Does the equivalent to <code>t[k] = v</code>,
+where <code>t</code> is the value at the given index
+and <code>v</code> is the value on the top of the stack.
+
+
+<p>
+This function pops the value from the stack.
+As in Lua, this function may trigger a metamethod
+for the "newindex" event (see <a href="#2.4">&sect;2.4</a>).
+
+
+
+
+
+<hr><h3><a name="lua_setglobal"><code>lua_setglobal</code></a></h3><p>
+<span class="apii">[-1, +0, <em>e</em>]</span>
+<pre>void lua_setglobal (lua_State *L, const char *name);</pre>
+
+<p>
+Pops a value from the stack and
+sets it as the new value of global <code>name</code>.
+
+
+
+
+
+<hr><h3><a name="lua_seti"><code>lua_seti</code></a></h3><p>
+<span class="apii">[-1, +0, <em>e</em>]</span>
+<pre>void lua_seti (lua_State *L, int index, lua_Integer n);</pre>
+
+<p>
+Does the equivalent to <code>t[n] = v</code>,
+where <code>t</code> is the value at the given index
+and <code>v</code> is the value on the top of the stack.
+
+
+<p>
+This function pops the value from the stack.
+As in Lua, this function may trigger a metamethod
+for the "newindex" event (see <a href="#2.4">&sect;2.4</a>).
+
+
+
+
+
+<hr><h3><a name="lua_setiuservalue"><code>lua_setiuservalue</code></a></h3><p>
+<span class="apii">[-1, +0, &ndash;]</span>
+<pre>int lua_setiuservalue (lua_State *L, int index, int n);</pre>
+
+<p>
+Pops a value from the stack and sets it as
+the new <code>n</code>-th user value associated to the
+full userdata at the given index.
+Returns 0 if the userdata does not have that value.
+
+
+
+
+
+<hr><h3><a name="lua_setmetatable"><code>lua_setmetatable</code></a></h3><p>
+<span class="apii">[-1, +0, &ndash;]</span>
+<pre>int lua_setmetatable (lua_State *L, int index);</pre>
+
+<p>
+Pops a table or <b>nil</b> from the stack and
+sets that value as the new metatable for the value at the given index.
+(<b>nil</b> means no metatable.)
+
+
+<p>
+(For historical reasons, this function returns an <code>int</code>,
+which now is always 1.)
+
+
+
+
+
+<hr><h3><a name="lua_settable"><code>lua_settable</code></a></h3><p>
+<span class="apii">[-2, +0, <em>e</em>]</span>
+<pre>void lua_settable (lua_State *L, int index);</pre>
+
+<p>
+Does the equivalent to <code>t[k] = v</code>,
+where <code>t</code> is the value at the given index,
+<code>v</code> is the value on the top of the stack,
+and <code>k</code> is the value just below the top.
+
+
+<p>
+This function pops both the key and the value from the stack.
+As in Lua, this function may trigger a metamethod
+for the "newindex" event (see <a href="#2.4">&sect;2.4</a>).
+
+
+
+
+
+<hr><h3><a name="lua_settop"><code>lua_settop</code></a></h3><p>
+<span class="apii">[-?, +?, <em>e</em>]</span>
+<pre>void lua_settop (lua_State *L, int index);</pre>
+
+<p>
+Accepts any index, or&nbsp;0,
+and sets the stack top to this index.
+If the new top is greater than the old one,
+then the new elements are filled with <b>nil</b>.
+If <code>index</code> is&nbsp;0, then all stack elements are removed.
+
+
+<p>
+This function can run arbitrary code when removing an index
+marked as to-be-closed from the stack.
+
+
+
+
+
+<hr><h3><a name="lua_setwarnf"><code>lua_setwarnf</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void lua_setwarnf (lua_State *L, lua_WarnFunction f, void *ud);</pre>
+
+<p>
+Sets the warning function to be used by Lua to emit warnings
+(see <a href="#lua_WarnFunction"><code>lua_WarnFunction</code></a>).
+The <code>ud</code> parameter sets the value <code>ud</code> passed to
+the warning function.
+
+
+
+
+
+<hr><h3><a name="lua_State"><code>lua_State</code></a></h3>
+<pre>typedef struct lua_State lua_State;</pre>
+
+<p>
+An opaque structure that points to a thread and indirectly
+(through the thread) to the whole state of a Lua interpreter.
+The Lua library is fully reentrant:
+it has no global variables.
+All information about a state is accessible through this structure.
+
+
+<p>
+A pointer to this structure must be passed as the first argument to
+every function in the library, except to <a href="#lua_newstate"><code>lua_newstate</code></a>,
+which creates a Lua state from scratch.
+
+
+
+
+
+<hr><h3><a name="lua_status"><code>lua_status</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_status (lua_State *L);</pre>
+
+<p>
+Returns the status of the thread <code>L</code>.
+
+
+<p>
+The status can be <a href="#pdf-LUA_OK"><code>LUA_OK</code></a> for a normal thread,
+an error code if the thread finished the execution
+of a <a href="#lua_resume"><code>lua_resume</code></a> with an error,
+or <a href="#pdf-LUA_YIELD"><code>LUA_YIELD</code></a> if the thread is suspended.
+
+
+<p>
+You can call functions only in threads with status <a href="#pdf-LUA_OK"><code>LUA_OK</code></a>.
+You can resume threads with status <a href="#pdf-LUA_OK"><code>LUA_OK</code></a>
+(to start a new coroutine) or <a href="#pdf-LUA_YIELD"><code>LUA_YIELD</code></a>
+(to resume a coroutine).
+
+
+
+
+
+<hr><h3><a name="lua_stringtonumber"><code>lua_stringtonumber</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>size_t lua_stringtonumber (lua_State *L, const char *s);</pre>
+
+<p>
+Converts the zero-terminated string <code>s</code> to a number,
+pushes that number into the stack,
+and returns the total size of the string,
+that is, its length plus one.
+The conversion can result in an integer or a float,
+according to the lexical conventions of Lua (see <a href="#3.1">&sect;3.1</a>).
+The string may have leading and trailing whitespaces and a sign.
+If the string is not a valid numeral,
+returns 0 and pushes nothing.
+(Note that the result can be used as a boolean,
+true if the conversion succeeds.)
+
+
+
+
+
+<hr><h3><a name="lua_toboolean"><code>lua_toboolean</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_toboolean (lua_State *L, int index);</pre>
+
+<p>
+Converts the Lua value at the given index to a C&nbsp;boolean
+value (0&nbsp;or&nbsp;1).
+Like all tests in Lua,
+<a href="#lua_toboolean"><code>lua_toboolean</code></a> returns true for any Lua value
+different from <b>false</b> and <b>nil</b>;
+otherwise it returns false.
+(If you want to accept only actual boolean values,
+use <a href="#lua_isboolean"><code>lua_isboolean</code></a> to test the value's type.)
+
+
+
+
+
+<hr><h3><a name="lua_tocfunction"><code>lua_tocfunction</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_CFunction lua_tocfunction (lua_State *L, int index);</pre>
+
+<p>
+Converts a value at the given index to a C&nbsp;function.
+That value must be a C&nbsp;function;
+otherwise, returns <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="lua_toclose"><code>lua_toclose</code></a></h3><p>
+<span class="apii">[-0, +0, <em>m</em>]</span>
+<pre>void lua_toclose (lua_State *L, int index);</pre>
+
+<p>
+Marks the given index in the stack as a
+to-be-closed slot (see <a href="#3.3.8">&sect;3.3.8</a>).
+Like a to-be-closed variable in Lua,
+the value at that slot in the stack will be closed
+when it goes out of scope.
+Here, in the context of a C function,
+to go out of scope means that the running function returns to Lua,
+or there is an error,
+or the slot is removed from the stack through
+<a href="#lua_settop"><code>lua_settop</code></a> or <a href="#lua_pop"><code>lua_pop</code></a>,
+or there is a call to <a href="#lua_closeslot"><code>lua_closeslot</code></a>.
+A slot marked as to-be-closed should not be removed from the stack
+by any other function in the API except <a href="#lua_settop"><code>lua_settop</code></a> or <a href="#lua_pop"><code>lua_pop</code></a>,
+unless previously deactivated by <a href="#lua_closeslot"><code>lua_closeslot</code></a>.
+
+
+<p>
+This function should not be called for an index
+that is equal to or below an active to-be-closed slot.
+
+
+<p>
+Note that, both in case of errors and of a regular return,
+by the time the <code>__close</code> metamethod runs,
+the C&nbsp;stack was already unwound,
+so that any automatic C&nbsp;variable declared in the calling function
+(e.g., a buffer) will be out of scope.
+
+
+
+
+
+<hr><h3><a name="lua_tointeger"><code>lua_tointeger</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_Integer lua_tointeger (lua_State *L, int index);</pre>
+
+<p>
+Equivalent to <a href="#lua_tointegerx"><code>lua_tointegerx</code></a> with <code>isnum</code> equal to <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="lua_tointegerx"><code>lua_tointegerx</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_Integer lua_tointegerx (lua_State *L, int index, int *isnum);</pre>
+
+<p>
+Converts the Lua value at the given index
+to the signed integral type <a href="#lua_Integer"><code>lua_Integer</code></a>.
+The Lua value must be an integer,
+or a number or string convertible to an integer (see <a href="#3.4.3">&sect;3.4.3</a>);
+otherwise, <code>lua_tointegerx</code> returns&nbsp;0.
+
+
+<p>
+If <code>isnum</code> is not <code>NULL</code>,
+its referent is assigned a boolean value that
+indicates whether the operation succeeded.
+
+
+
+
+
+<hr><h3><a name="lua_tolstring"><code>lua_tolstring</code></a></h3><p>
+<span class="apii">[-0, +0, <em>m</em>]</span>
+<pre>const char *lua_tolstring (lua_State *L, int index, size_t *len);</pre>
+
+<p>
+Converts the Lua value at the given index to a C&nbsp;string.
+If <code>len</code> is not <code>NULL</code>,
+it sets <code>*len</code> with the string length.
+The Lua value must be a string or a number;
+otherwise, the function returns <code>NULL</code>.
+If the value is a number,
+then <code>lua_tolstring</code> also
+<em>changes the actual value in the stack to a string</em>.
+(This change confuses <a href="#lua_next"><code>lua_next</code></a>
+when <code>lua_tolstring</code> is applied to keys during a table traversal.)
+
+
+<p>
+<code>lua_tolstring</code> returns a pointer
+to a string inside the Lua state (see <a href="#4.1.3">&sect;4.1.3</a>).
+This string always has a zero ('<code>\0</code>')
+after its last character (as in&nbsp;C),
+but can contain other zeros in its body.
+
+
+
+
+
+<hr><h3><a name="lua_tonumber"><code>lua_tonumber</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_Number lua_tonumber (lua_State *L, int index);</pre>
+
+<p>
+Equivalent to <a href="#lua_tonumberx"><code>lua_tonumberx</code></a> with <code>isnum</code> equal to <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="lua_tonumberx"><code>lua_tonumberx</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_Number lua_tonumberx (lua_State *L, int index, int *isnum);</pre>
+
+<p>
+Converts the Lua value at the given index
+to the C&nbsp;type <a href="#lua_Number"><code>lua_Number</code></a> (see <a href="#lua_Number"><code>lua_Number</code></a>).
+The Lua value must be a number or a string convertible to a number
+(see <a href="#3.4.3">&sect;3.4.3</a>);
+otherwise, <a href="#lua_tonumberx"><code>lua_tonumberx</code></a> returns&nbsp;0.
+
+
+<p>
+If <code>isnum</code> is not <code>NULL</code>,
+its referent is assigned a boolean value that
+indicates whether the operation succeeded.
+
+
+
+
+
+<hr><h3><a name="lua_topointer"><code>lua_topointer</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>const void *lua_topointer (lua_State *L, int index);</pre>
+
+<p>
+Converts the value at the given index to a generic
+C&nbsp;pointer (<code>void*</code>).
+The value can be a userdata, a table, a thread, a string, or a function;
+otherwise, <code>lua_topointer</code> returns <code>NULL</code>.
+Different objects will give different pointers.
+There is no way to convert the pointer back to its original value.
+
+
+<p>
+Typically this function is used only for hashing and debug information.
+
+
+
+
+
+<hr><h3><a name="lua_tostring"><code>lua_tostring</code></a></h3><p>
+<span class="apii">[-0, +0, <em>m</em>]</span>
+<pre>const char *lua_tostring (lua_State *L, int index);</pre>
+
+<p>
+Equivalent to <a href="#lua_tolstring"><code>lua_tolstring</code></a> with <code>len</code> equal to <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="lua_tothread"><code>lua_tothread</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_State *lua_tothread (lua_State *L, int index);</pre>
+
+<p>
+Converts the value at the given index to a Lua thread
+(represented as <code>lua_State*</code>).
+This value must be a thread;
+otherwise, the function returns <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="lua_touserdata"><code>lua_touserdata</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void *lua_touserdata (lua_State *L, int index);</pre>
+
+<p>
+If the value at the given index is a full userdata,
+returns its memory-block address.
+If the value is a light userdata,
+returns its value (a pointer).
+Otherwise, returns <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="lua_type"><code>lua_type</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_type (lua_State *L, int index);</pre>
+
+<p>
+Returns the type of the value in the given valid index,
+or <code>LUA_TNONE</code> for a non-valid but acceptable index.
+The types returned by <a href="#lua_type"><code>lua_type</code></a> are coded by the following constants
+defined in <code>lua.h</code>:
+<a name="pdf-LUA_TNIL"><code>LUA_TNIL</code></a>,
+<a name="pdf-LUA_TNUMBER"><code>LUA_TNUMBER</code></a>,
+<a name="pdf-LUA_TBOOLEAN"><code>LUA_TBOOLEAN</code></a>,
+<a name="pdf-LUA_TSTRING"><code>LUA_TSTRING</code></a>,
+<a name="pdf-LUA_TTABLE"><code>LUA_TTABLE</code></a>,
+<a name="pdf-LUA_TFUNCTION"><code>LUA_TFUNCTION</code></a>,
+<a name="pdf-LUA_TUSERDATA"><code>LUA_TUSERDATA</code></a>,
+<a name="pdf-LUA_TTHREAD"><code>LUA_TTHREAD</code></a>,
+and
+<a name="pdf-LUA_TLIGHTUSERDATA"><code>LUA_TLIGHTUSERDATA</code></a>.
+
+
+
+
+
+<hr><h3><a name="lua_typename"><code>lua_typename</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>const char *lua_typename (lua_State *L, int tp);</pre>
+
+<p>
+Returns the name of the type encoded by the value <code>tp</code>,
+which must be one the values returned by <a href="#lua_type"><code>lua_type</code></a>.
+
+
+
+
+
+<hr><h3><a name="lua_Unsigned"><code>lua_Unsigned</code></a></h3>
+<pre>typedef ... lua_Unsigned;</pre>
+
+<p>
+The unsigned version of <a href="#lua_Integer"><code>lua_Integer</code></a>.
+
+
+
+
+
+<hr><h3><a name="lua_upvalueindex"><code>lua_upvalueindex</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_upvalueindex (int i);</pre>
+
+<p>
+Returns the pseudo-index that represents the <code>i</code>-th upvalue of
+the running function (see <a href="#4.2">&sect;4.2</a>).
+<code>i</code> must be in the range <em>[1,256]</em>.
+
+
+
+
+
+<hr><h3><a name="lua_version"><code>lua_version</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_Number lua_version (lua_State *L);</pre>
+
+<p>
+Returns the version number of this core.
+
+
+
+
+
+<hr><h3><a name="lua_WarnFunction"><code>lua_WarnFunction</code></a></h3>
+<pre>typedef void (*lua_WarnFunction) (void *ud, const char *msg, int tocont);</pre>
+
+<p>
+The type of warning functions, called by Lua to emit warnings.
+The first parameter is an opaque pointer
+set by <a href="#lua_setwarnf"><code>lua_setwarnf</code></a>.
+The second parameter is the warning message.
+The third parameter is a boolean that
+indicates whether the message is
+to be continued by the message in the next call.
+
+
+<p>
+See <a href="#pdf-warn"><code>warn</code></a> for more details about warnings.
+
+
+
+
+
+<hr><h3><a name="lua_warning"><code>lua_warning</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void lua_warning (lua_State *L, const char *msg, int tocont);</pre>
+
+<p>
+Emits a warning with the given message.
+A message in a call with <code>tocont</code> true should be
+continued in another call to this function.
+
+
+<p>
+See <a href="#pdf-warn"><code>warn</code></a> for more details about warnings.
+
+
+
+
+
+<hr><h3><a name="lua_Writer"><code>lua_Writer</code></a></h3>
+<pre>typedef int (*lua_Writer) (lua_State *L,
+                           const void* p,
+                           size_t sz,
+                           void* ud);</pre>
+
+<p>
+The type of the writer function used by <a href="#lua_dump"><code>lua_dump</code></a>.
+Every time <a href="#lua_dump"><code>lua_dump</code></a> produces another piece of chunk,
+it calls the writer,
+passing along the buffer to be written (<code>p</code>),
+its size (<code>sz</code>),
+and the <code>ud</code> parameter supplied to <a href="#lua_dump"><code>lua_dump</code></a>.
+
+
+<p>
+The writer returns an error code:
+0&nbsp;means no errors;
+any other value means an error and stops <a href="#lua_dump"><code>lua_dump</code></a> from
+calling the writer again.
+
+
+
+
+
+<hr><h3><a name="lua_xmove"><code>lua_xmove</code></a></h3><p>
+<span class="apii">[-?, +?, &ndash;]</span>
+<pre>void lua_xmove (lua_State *from, lua_State *to, int n);</pre>
+
+<p>
+Exchange values between different threads of the same state.
+
+
+<p>
+This function pops <code>n</code> values from the stack <code>from</code>,
+and pushes them onto the stack <code>to</code>.
+
+
+
+
+
+<hr><h3><a name="lua_yield"><code>lua_yield</code></a></h3><p>
+<span class="apii">[-?, +?, <em>v</em>]</span>
+<pre>int lua_yield (lua_State *L, int nresults);</pre>
+
+<p>
+This function is equivalent to <a href="#lua_yieldk"><code>lua_yieldk</code></a>,
+but it has no continuation (see <a href="#4.5">&sect;4.5</a>).
+Therefore, when the thread resumes,
+it continues the function that called
+the function calling <code>lua_yield</code>.
+To avoid surprises,
+this function should be called only in a tail call.
+
+
+
+
+
+<hr><h3><a name="lua_yieldk"><code>lua_yieldk</code></a></h3><p>
+<span class="apii">[-?, +?, <em>v</em>]</span>
+<pre>int lua_yieldk (lua_State *L,
+                int nresults,
+                lua_KContext ctx,
+                lua_KFunction k);</pre>
+
+<p>
+Yields a coroutine (thread).
+
+
+<p>
+When a C&nbsp;function calls <a href="#lua_yieldk"><code>lua_yieldk</code></a>,
+the running coroutine suspends its execution,
+and the call to <a href="#lua_resume"><code>lua_resume</code></a> that started this coroutine returns.
+The parameter <code>nresults</code> is the number of values from the stack
+that will be passed as results to <a href="#lua_resume"><code>lua_resume</code></a>.
+
+
+<p>
+When the coroutine is resumed again,
+Lua calls the given continuation function <code>k</code> to continue
+the execution of the C&nbsp;function that yielded (see <a href="#4.5">&sect;4.5</a>).
+This continuation function receives the same stack
+from the previous function,
+with the <code>n</code> results removed and
+replaced by the arguments passed to <a href="#lua_resume"><code>lua_resume</code></a>.
+Moreover,
+the continuation function receives the value <code>ctx</code>
+that was passed to <a href="#lua_yieldk"><code>lua_yieldk</code></a>.
+
+
+<p>
+Usually, this function does not return;
+when the coroutine eventually resumes,
+it continues executing the continuation function.
+However, there is one special case,
+which is when this function is called
+from inside a line or a count hook (see <a href="#4.7">&sect;4.7</a>).
+In that case, <code>lua_yieldk</code> should be called with no continuation
+(probably in the form of <a href="#lua_yield"><code>lua_yield</code></a>) and no results,
+and the hook should return immediately after the call.
+Lua will yield and,
+when the coroutine resumes again,
+it will continue the normal execution
+of the (Lua) function that triggered the hook.
+
+
+<p>
+This function can raise an error if it is called from a thread
+with a pending C call with no continuation function
+(what is called a <em>C-call boundary</em>),
+or it is called from a thread that is not running inside a resume
+(typically the main thread).
+
+
+
+
+
+
+
+<h2>4.7 &ndash; <a name="4.7">The Debug Interface</a></h2>
+
+<p>
+Lua has no built-in debugging facilities.
+Instead, it offers a special interface
+by means of functions and <em>hooks</em>.
+This interface allows the construction of different
+kinds of debuggers, profilers, and other tools
+that need "inside information" from the interpreter.
+
+
+
+<hr><h3><a name="lua_Debug"><code>lua_Debug</code></a></h3>
+<pre>typedef struct lua_Debug {
+  int event;
+  const char *name;           /* (n) */
+  const char *namewhat;       /* (n) */
+  const char *what;           /* (S) */
+  const char *source;         /* (S) */
+  size_t srclen;              /* (S) */
+  int currentline;            /* (l) */
+  int linedefined;            /* (S) */
+  int lastlinedefined;        /* (S) */
+  unsigned char nups;         /* (u) number of upvalues */
+  unsigned char nparams;      /* (u) number of parameters */
+  char isvararg;              /* (u) */
+  char istailcall;            /* (t) */
+  unsigned short ftransfer;   /* (r) index of first value transferred */
+  unsigned short ntransfer;   /* (r) number of transferred values */
+  char short_src[LUA_IDSIZE]; /* (S) */
+  /* private part */
+  <em>other fields</em>
+} lua_Debug;</pre>
+
+<p>
+A structure used to carry different pieces of
+information about a function or an activation record.
+<a href="#lua_getstack"><code>lua_getstack</code></a> fills only the private part
+of this structure, for later use.
+To fill the other fields of <a href="#lua_Debug"><code>lua_Debug</code></a> with useful information,
+you must call <a href="#lua_getinfo"><code>lua_getinfo</code></a> with an appropriate parameter.
+(Specifically, to get a field,
+you must add the letter between parentheses in the field's comment
+to the parameter <code>what</code> of <a href="#lua_getinfo"><code>lua_getinfo</code></a>.)
+
+
+<p>
+The fields of <a href="#lua_Debug"><code>lua_Debug</code></a> have the following meaning:
+
+<ul>
+
+<li><b><code>source</code>: </b>
+the source of the chunk that created the function.
+If <code>source</code> starts with a '<code>@</code>',
+it means that the function was defined in a file where
+the file name follows the '<code>@</code>'.
+If <code>source</code> starts with a '<code>=</code>',
+the remainder of its contents describes the source in a user-dependent manner.
+Otherwise,
+the function was defined in a string where
+<code>source</code> is that string.
+</li>
+
+<li><b><code>srclen</code>: </b>
+The length of the string <code>source</code>.
+</li>
+
+<li><b><code>short_src</code>: </b>
+a "printable" version of <code>source</code>, to be used in error messages.
+</li>
+
+<li><b><code>linedefined</code>: </b>
+the line number where the definition of the function starts.
+</li>
+
+<li><b><code>lastlinedefined</code>: </b>
+the line number where the definition of the function ends.
+</li>
+
+<li><b><code>what</code>: </b>
+the string <code>"Lua"</code> if the function is a Lua function,
+<code>"C"</code> if it is a C&nbsp;function,
+<code>"main"</code> if it is the main part of a chunk.
+</li>
+
+<li><b><code>currentline</code>: </b>
+the current line where the given function is executing.
+When no line information is available,
+<code>currentline</code> is set to -1.
+</li>
+
+<li><b><code>name</code>: </b>
+a reasonable name for the given function.
+Because functions in Lua are first-class values,
+they do not have a fixed name:
+some functions can be the value of multiple global variables,
+while others can be stored only in a table field.
+The <code>lua_getinfo</code> function checks how the function was
+called to find a suitable name.
+If it cannot find a name,
+then <code>name</code> is set to <code>NULL</code>.
+</li>
+
+<li><b><code>namewhat</code>: </b>
+explains the <code>name</code> field.
+The value of <code>namewhat</code> can be
+<code>"global"</code>, <code>"local"</code>, <code>"method"</code>,
+<code>"field"</code>, <code>"upvalue"</code>, or <code>""</code> (the empty string),
+according to how the function was called.
+(Lua uses the empty string when no other option seems to apply.)
+</li>
+
+<li><b><code>istailcall</code>: </b>
+true if this function invocation was called by a tail call.
+In this case, the caller of this level is not in the stack.
+</li>
+
+<li><b><code>nups</code>: </b>
+the number of upvalues of the function.
+</li>
+
+<li><b><code>nparams</code>: </b>
+the number of parameters of the function
+(always 0&nbsp;for C&nbsp;functions).
+</li>
+
+<li><b><code>isvararg</code>: </b>
+true if the function is a variadic function
+(always true for C&nbsp;functions).
+</li>
+
+<li><b><code>ftransfer</code>: </b>
+the index in the stack of the first value being "transferred",
+that is, parameters in a call or return values in a return.
+(The other values are in consecutive indices.)
+Using this index, you can access and modify these values
+through <a href="#lua_getlocal"><code>lua_getlocal</code></a> and <a href="#lua_setlocal"><code>lua_setlocal</code></a>.
+This field is only meaningful during a
+call hook, denoting the first parameter,
+or a return hook, denoting the first value being returned.
+(For call hooks, this value is always 1.)
+</li>
+
+<li><b><code>ntransfer</code>: </b>
+The number of values being transferred (see previous item).
+(For calls of Lua functions,
+this value is always equal to <code>nparams</code>.)
+</li>
+
+</ul>
+
+
+
+
+<hr><h3><a name="lua_gethook"><code>lua_gethook</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_Hook lua_gethook (lua_State *L);</pre>
+
+<p>
+Returns the current hook function.
+
+
+
+
+
+<hr><h3><a name="lua_gethookcount"><code>lua_gethookcount</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_gethookcount (lua_State *L);</pre>
+
+<p>
+Returns the current hook count.
+
+
+
+
+
+<hr><h3><a name="lua_gethookmask"><code>lua_gethookmask</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_gethookmask (lua_State *L);</pre>
+
+<p>
+Returns the current hook mask.
+
+
+
+
+
+<hr><h3><a name="lua_getinfo"><code>lua_getinfo</code></a></h3><p>
+<span class="apii">[-(0|1), +(0|1|2), <em>m</em>]</span>
+<pre>int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar);</pre>
+
+<p>
+Gets information about a specific function or function invocation.
+
+
+<p>
+To get information about a function invocation,
+the parameter <code>ar</code> must be a valid activation record that was
+filled by a previous call to <a href="#lua_getstack"><code>lua_getstack</code></a> or
+given as argument to a hook (see <a href="#lua_Hook"><code>lua_Hook</code></a>).
+
+
+<p>
+To get information about a function, you push it onto the stack
+and start the <code>what</code> string with the character '<code>&gt;</code>'.
+(In that case,
+<code>lua_getinfo</code> pops the function from the top of the stack.)
+For instance, to know in which line a function <code>f</code> was defined,
+you can write the following code:
+
+<pre>
+     lua_Debug ar;
+     lua_getglobal(L, "f");  /* get global 'f' */
+     lua_getinfo(L, "&gt;S", &amp;ar);
+     printf("%d\n", ar.linedefined);
+</pre>
+
+<p>
+Each character in the string <code>what</code>
+selects some fields of the structure <code>ar</code> to be filled or
+a value to be pushed on the stack.
+(These characters are also documented in the declaration of
+the structure <a href="#lua_Debug"><code>lua_Debug</code></a>,
+between parentheses in the comments following each field.)
+
+<ul>
+
+<li><b>'<code>f</code>': </b>
+pushes onto the stack the function that is
+running at the given level;
+</li>
+
+<li><b>'<code>l</code>': </b> fills in the field <code>currentline</code>;
+</li>
+
+<li><b>'<code>n</code>': </b> fills in the fields <code>name</code> and <code>namewhat</code>;
+</li>
+
+<li><b>'<code>r</code>': </b> fills in the fields <code>ftransfer</code> and <code>ntransfer</code>;
+</li>
+
+<li><b>'<code>S</code>': </b>
+fills in the fields <code>source</code>, <code>short_src</code>,
+<code>linedefined</code>, <code>lastlinedefined</code>, and <code>what</code>;
+</li>
+
+<li><b>'<code>t</code>': </b> fills in the field <code>istailcall</code>;
+</li>
+
+<li><b>'<code>u</code>': </b> fills in the fields
+<code>nups</code>, <code>nparams</code>, and <code>isvararg</code>;
+</li>
+
+<li><b>'<code>L</code>': </b>
+pushes onto the stack a table whose indices are
+the lines on the function with some associated code,
+that is, the lines where you can put a break point.
+(Lines with no code include empty lines and comments.)
+If this option is given together with option '<code>f</code>',
+its table is pushed after the function.
+This is the only option that can raise a memory error.
+</li>
+
+</ul>
+
+<p>
+This function returns 0 to signal an invalid option in <code>what</code>;
+even then the valid options are handled correctly.
+
+
+
+
+
+<hr><h3><a name="lua_getlocal"><code>lua_getlocal</code></a></h3><p>
+<span class="apii">[-0, +(0|1), &ndash;]</span>
+<pre>const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n);</pre>
+
+<p>
+Gets information about a local variable or a temporary value
+of a given activation record or a given function.
+
+
+<p>
+In the first case,
+the parameter <code>ar</code> must be a valid activation record that was
+filled by a previous call to <a href="#lua_getstack"><code>lua_getstack</code></a> or
+given as argument to a hook (see <a href="#lua_Hook"><code>lua_Hook</code></a>).
+The index <code>n</code> selects which local variable to inspect;
+see <a href="#pdf-debug.getlocal"><code>debug.getlocal</code></a> for details about variable indices
+and names.
+
+
+<p>
+<a href="#lua_getlocal"><code>lua_getlocal</code></a> pushes the variable's value onto the stack
+and returns its name.
+
+
+<p>
+In the second case, <code>ar</code> must be <code>NULL</code> and the function
+to be inspected must be on the top of the stack.
+In this case, only parameters of Lua functions are visible
+(as there is no information about what variables are active)
+and no values are pushed onto the stack.
+
+
+<p>
+Returns <code>NULL</code> (and pushes nothing)
+when the index is greater than
+the number of active local variables.
+
+
+
+
+
+<hr><h3><a name="lua_getstack"><code>lua_getstack</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>int lua_getstack (lua_State *L, int level, lua_Debug *ar);</pre>
+
+<p>
+Gets information about the interpreter runtime stack.
+
+
+<p>
+This function fills parts of a <a href="#lua_Debug"><code>lua_Debug</code></a> structure with
+an identification of the <em>activation record</em>
+of the function executing at a given level.
+Level&nbsp;0 is the current running function,
+whereas level <em>n+1</em> is the function that has called level <em>n</em>
+(except for tail calls, which do not count in the stack).
+When called with a level greater than the stack depth,
+<a href="#lua_getstack"><code>lua_getstack</code></a> returns 0;
+otherwise it returns 1.
+
+
+
+
+
+<hr><h3><a name="lua_getupvalue"><code>lua_getupvalue</code></a></h3><p>
+<span class="apii">[-0, +(0|1), &ndash;]</span>
+<pre>const char *lua_getupvalue (lua_State *L, int funcindex, int n);</pre>
+
+<p>
+Gets information about the <code>n</code>-th upvalue
+of the closure at index <code>funcindex</code>.
+It pushes the upvalue's value onto the stack
+and returns its name.
+Returns <code>NULL</code> (and pushes nothing)
+when the index <code>n</code> is greater than the number of upvalues.
+
+
+<p>
+See <a href="#pdf-debug.getupvalue"><code>debug.getupvalue</code></a> for more information about upvalues.
+
+
+
+
+
+<hr><h3><a name="lua_Hook"><code>lua_Hook</code></a></h3>
+<pre>typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);</pre>
+
+<p>
+Type for debugging hook functions.
+
+
+<p>
+Whenever a hook is called, its <code>ar</code> argument has its field
+<code>event</code> set to the specific event that triggered the hook.
+Lua identifies these events with the following constants:
+<a name="pdf-LUA_HOOKCALL"><code>LUA_HOOKCALL</code></a>, <a name="pdf-LUA_HOOKRET"><code>LUA_HOOKRET</code></a>,
+<a name="pdf-LUA_HOOKTAILCALL"><code>LUA_HOOKTAILCALL</code></a>, <a name="pdf-LUA_HOOKLINE"><code>LUA_HOOKLINE</code></a>,
+and <a name="pdf-LUA_HOOKCOUNT"><code>LUA_HOOKCOUNT</code></a>.
+Moreover, for line events, the field <code>currentline</code> is also set.
+To get the value of any other field in <code>ar</code>,
+the hook must call <a href="#lua_getinfo"><code>lua_getinfo</code></a>.
+
+
+<p>
+For call events, <code>event</code> can be <code>LUA_HOOKCALL</code>,
+the normal value, or <code>LUA_HOOKTAILCALL</code>, for a tail call;
+in this case, there will be no corresponding return event.
+
+
+<p>
+While Lua is running a hook, it disables other calls to hooks.
+Therefore, if a hook calls back Lua to execute a function or a chunk,
+this execution occurs without any calls to hooks.
+
+
+<p>
+Hook functions cannot have continuations,
+that is, they cannot call <a href="#lua_yieldk"><code>lua_yieldk</code></a>,
+<a href="#lua_pcallk"><code>lua_pcallk</code></a>, or <a href="#lua_callk"><code>lua_callk</code></a> with a non-null <code>k</code>.
+
+
+<p>
+Hook functions can yield under the following conditions:
+Only count and line events can yield;
+to yield, a hook function must finish its execution
+calling <a href="#lua_yield"><code>lua_yield</code></a> with <code>nresults</code> equal to zero
+(that is, with no values).
+
+
+
+
+
+<hr><h3><a name="lua_sethook"><code>lua_sethook</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void lua_sethook (lua_State *L, lua_Hook f, int mask, int count);</pre>
+
+<p>
+Sets the debugging hook function.
+
+
+<p>
+Argument <code>f</code> is the hook function.
+<code>mask</code> specifies on which events the hook will be called:
+it is formed by a bitwise OR of the constants
+<a name="pdf-LUA_MASKCALL"><code>LUA_MASKCALL</code></a>,
+<a name="pdf-LUA_MASKRET"><code>LUA_MASKRET</code></a>,
+<a name="pdf-LUA_MASKLINE"><code>LUA_MASKLINE</code></a>,
+and <a name="pdf-LUA_MASKCOUNT"><code>LUA_MASKCOUNT</code></a>.
+The <code>count</code> argument is only meaningful when the mask
+includes <code>LUA_MASKCOUNT</code>.
+For each event, the hook is called as explained below:
+
+<ul>
+
+<li><b>The call hook: </b> is called when the interpreter calls a function.
+The hook is called just after Lua enters the new function.
+</li>
+
+<li><b>The return hook: </b> is called when the interpreter returns from a function.
+The hook is called just before Lua leaves the function.
+</li>
+
+<li><b>The line hook: </b> is called when the interpreter is about to
+start the execution of a new line of code,
+or when it jumps back in the code (even to the same line).
+This event only happens while Lua is executing a Lua function.
+</li>
+
+<li><b>The count hook: </b> is called after the interpreter executes every
+<code>count</code> instructions.
+This event only happens while Lua is executing a Lua function.
+</li>
+
+</ul>
+
+<p>
+Hooks are disabled by setting <code>mask</code> to zero.
+
+
+
+
+
+<hr><h3><a name="lua_setlocal"><code>lua_setlocal</code></a></h3><p>
+<span class="apii">[-(0|1), +0, &ndash;]</span>
+<pre>const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n);</pre>
+
+<p>
+Sets the value of a local variable of a given activation record.
+It assigns the value on the top of the stack
+to the variable and returns its name.
+It also pops the value from the stack.
+
+
+<p>
+Returns <code>NULL</code> (and pops nothing)
+when the index is greater than
+the number of active local variables.
+
+
+<p>
+Parameters <code>ar</code> and <code>n</code> are as in the function <a href="#lua_getlocal"><code>lua_getlocal</code></a>.
+
+
+
+
+
+<hr><h3><a name="lua_setupvalue"><code>lua_setupvalue</code></a></h3><p>
+<span class="apii">[-(0|1), +0, &ndash;]</span>
+<pre>const char *lua_setupvalue (lua_State *L, int funcindex, int n);</pre>
+
+<p>
+Sets the value of a closure's upvalue.
+It assigns the value on the top of the stack
+to the upvalue and returns its name.
+It also pops the value from the stack.
+
+
+<p>
+Returns <code>NULL</code> (and pops nothing)
+when the index <code>n</code> is greater than the number of upvalues.
+
+
+<p>
+Parameters <code>funcindex</code> and <code>n</code> are as in
+the function <a href="#lua_getupvalue"><code>lua_getupvalue</code></a>.
+
+
+
+
+
+<hr><h3><a name="lua_upvalueid"><code>lua_upvalueid</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void *lua_upvalueid (lua_State *L, int funcindex, int n);</pre>
+
+<p>
+Returns a unique identifier for the upvalue numbered <code>n</code>
+from the closure at index <code>funcindex</code>.
+
+
+<p>
+These unique identifiers allow a program to check whether different
+closures share upvalues.
+Lua closures that share an upvalue
+(that is, that access a same external local variable)
+will return identical ids for those upvalue indices.
+
+
+<p>
+Parameters <code>funcindex</code> and <code>n</code> are as in
+the function <a href="#lua_getupvalue"><code>lua_getupvalue</code></a>,
+but <code>n</code> cannot be greater than the number of upvalues.
+
+
+
+
+
+<hr><h3><a name="lua_upvaluejoin"><code>lua_upvaluejoin</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void lua_upvaluejoin (lua_State *L, int funcindex1, int n1,
+                                    int funcindex2, int n2);</pre>
+
+<p>
+Make the <code>n1</code>-th upvalue of the Lua closure at index <code>funcindex1</code>
+refer to the <code>n2</code>-th upvalue of the Lua closure at index <code>funcindex2</code>.
+
+
+
+
+
+
+
+<h1>5 &ndash; <a name="5">The Auxiliary Library</a></h1>
+
+
+
+<p>
+
+The <em>auxiliary library</em> provides several convenient functions
+to interface C with Lua.
+While the basic API provides the primitive functions for all
+interactions between C and Lua,
+the auxiliary library provides higher-level functions for some
+common tasks.
+
+
+<p>
+All functions and types from the auxiliary library
+are defined in header file <code>lauxlib.h</code> and
+have a prefix <code>luaL_</code>.
+
+
+<p>
+All functions in the auxiliary library are built on
+top of the basic API,
+and so they provide nothing that cannot be done with that API.
+Nevertheless, the use of the auxiliary library ensures
+more consistency to your code.
+
+
+<p>
+Several functions in the auxiliary library use internally some
+extra stack slots.
+When a function in the auxiliary library uses less than five slots,
+it does not check the stack size;
+it simply assumes that there are enough slots.
+
+
+<p>
+Several functions in the auxiliary library are used to
+check C&nbsp;function arguments.
+Because the error message is formatted for arguments
+(e.g., "<code>bad argument #1</code>"),
+you should not use these functions for other stack values.
+
+
+<p>
+Functions called <code>luaL_check*</code>
+always raise an error if the check is not satisfied.
+
+
+
+
+
+<h2>5.1 &ndash; <a name="5.1">Functions and Types</a></h2>
+
+<p>
+Here we list all functions and types from the auxiliary library
+in alphabetical order.
+
+
+
+<hr><h3><a name="luaL_addchar"><code>luaL_addchar</code></a></h3><p>
+<span class="apii">[-?, +?, <em>m</em>]</span>
+<pre>void luaL_addchar (luaL_Buffer *B, char c);</pre>
+
+<p>
+Adds the byte <code>c</code> to the buffer <code>B</code>
+(see <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>).
+
+
+
+
+
+<hr><h3><a name="luaL_addgsub"><code>luaL_addgsub</code></a></h3><p>
+<span class="apii">[-?, +?, <em>m</em>]</span>
+<pre>const void luaL_addgsub (luaL_Buffer *B, const char *s,
+                         const char *p, const char *r);</pre>
+
+<p>
+Adds a copy of the string <code>s</code> to the buffer <code>B</code> (see <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>),
+replacing any occurrence of the string <code>p</code>
+with the string <code>r</code>.
+
+
+
+
+
+<hr><h3><a name="luaL_addlstring"><code>luaL_addlstring</code></a></h3><p>
+<span class="apii">[-?, +?, <em>m</em>]</span>
+<pre>void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l);</pre>
+
+<p>
+Adds the string pointed to by <code>s</code> with length <code>l</code> to
+the buffer <code>B</code>
+(see <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>).
+The string can contain embedded zeros.
+
+
+
+
+
+<hr><h3><a name="luaL_addsize"><code>luaL_addsize</code></a></h3><p>
+<span class="apii">[-?, +?, &ndash;]</span>
+<pre>void luaL_addsize (luaL_Buffer *B, size_t n);</pre>
+
+<p>
+Adds to the buffer <code>B</code>
+a string of length <code>n</code> previously copied to the
+buffer area (see <a href="#luaL_prepbuffer"><code>luaL_prepbuffer</code></a>).
+
+
+
+
+
+<hr><h3><a name="luaL_addstring"><code>luaL_addstring</code></a></h3><p>
+<span class="apii">[-?, +?, <em>m</em>]</span>
+<pre>void luaL_addstring (luaL_Buffer *B, const char *s);</pre>
+
+<p>
+Adds the zero-terminated string pointed to by <code>s</code>
+to the buffer <code>B</code>
+(see <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>).
+
+
+
+
+
+<hr><h3><a name="luaL_addvalue"><code>luaL_addvalue</code></a></h3><p>
+<span class="apii">[-?, +?, <em>m</em>]</span>
+<pre>void luaL_addvalue (luaL_Buffer *B);</pre>
+
+<p>
+Adds the value on the top of the stack
+to the buffer <code>B</code>
+(see <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>).
+Pops the value.
+
+
+<p>
+This is the only function on string buffers that can (and must)
+be called with an extra element on the stack,
+which is the value to be added to the buffer.
+
+
+
+
+
+<hr><h3><a name="luaL_argcheck"><code>luaL_argcheck</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>void luaL_argcheck (lua_State *L,
+                    int cond,
+                    int arg,
+                    const char *extramsg);</pre>
+
+<p>
+Checks whether <code>cond</code> is true.
+If it is not, raises an error with a standard message (see <a href="#luaL_argerror"><code>luaL_argerror</code></a>).
+
+
+
+
+
+<hr><h3><a name="luaL_argerror"><code>luaL_argerror</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>int luaL_argerror (lua_State *L, int arg, const char *extramsg);</pre>
+
+<p>
+Raises an error reporting a problem with argument <code>arg</code>
+of the C&nbsp;function that called it,
+using a standard message
+that includes <code>extramsg</code> as a comment:
+
+<pre>
+     bad argument #<em>arg</em> to '<em>funcname</em>' (<em>extramsg</em>)
+</pre><p>
+This function never returns.
+
+
+
+
+
+<hr><h3><a name="luaL_argexpected"><code>luaL_argexpected</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>void luaL_argexpected (lua_State *L,
+                       int cond,
+                       int arg,
+                       const char *tname);</pre>
+
+<p>
+Checks whether <code>cond</code> is true.
+If it is not, raises an error about the type of the argument <code>arg</code>
+with a standard message (see <a href="#luaL_typeerror"><code>luaL_typeerror</code></a>).
+
+
+
+
+
+<hr><h3><a name="luaL_Buffer"><code>luaL_Buffer</code></a></h3>
+<pre>typedef struct luaL_Buffer luaL_Buffer;</pre>
+
+<p>
+Type for a <em>string buffer</em>.
+
+
+<p>
+A string buffer allows C&nbsp;code to build Lua strings piecemeal.
+Its pattern of use is as follows:
+
+<ul>
+
+<li>First declare a variable <code>b</code> of type <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>.</li>
+
+<li>Then initialize it with a call <code>luaL_buffinit(L, &amp;b)</code>.</li>
+
+<li>
+Then add string pieces to the buffer calling any of
+the <code>luaL_add*</code> functions.
+</li>
+
+<li>
+Finish by calling <code>luaL_pushresult(&amp;b)</code>.
+This call leaves the final string on the top of the stack.
+</li>
+
+</ul>
+
+<p>
+If you know beforehand the maximum size of the resulting string,
+you can use the buffer like this:
+
+<ul>
+
+<li>First declare a variable <code>b</code> of type <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>.</li>
+
+<li>Then initialize it and preallocate a space of
+size <code>sz</code> with a call <code>luaL_buffinitsize(L, &amp;b, sz)</code>.</li>
+
+<li>Then produce the string into that space.</li>
+
+<li>
+Finish by calling <code>luaL_pushresultsize(&amp;b, sz)</code>,
+where <code>sz</code> is the total size of the resulting string
+copied into that space (which may be less than or
+equal to the preallocated size).
+</li>
+
+</ul>
+
+<p>
+During its normal operation,
+a string buffer uses a variable number of stack slots.
+So, while using a buffer, you cannot assume that you know where
+the top of the stack is.
+You can use the stack between successive calls to buffer operations
+as long as that use is balanced;
+that is,
+when you call a buffer operation,
+the stack is at the same level
+it was immediately after the previous buffer operation.
+(The only exception to this rule is <a href="#luaL_addvalue"><code>luaL_addvalue</code></a>.)
+After calling <a href="#luaL_pushresult"><code>luaL_pushresult</code></a>,
+the stack is back to its level when the buffer was initialized,
+plus the final string on its top.
+
+
+
+
+
+<hr><h3><a name="luaL_buffaddr"><code>luaL_buffaddr</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>char *luaL_buffaddr (luaL_Buffer *B);</pre>
+
+<p>
+Returns the address of the current content of buffer <code>B</code>
+(see <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>).
+Note that any addition to the buffer may invalidate this address.
+
+
+
+
+
+<hr><h3><a name="luaL_buffinit"><code>luaL_buffinit</code></a></h3><p>
+<span class="apii">[-0, +?, &ndash;]</span>
+<pre>void luaL_buffinit (lua_State *L, luaL_Buffer *B);</pre>
+
+<p>
+Initializes a buffer <code>B</code>
+(see <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>).
+This function does not allocate any space;
+the buffer must be declared as a variable.
+
+
+
+
+
+<hr><h3><a name="luaL_bufflen"><code>luaL_bufflen</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>size_t luaL_bufflen (luaL_Buffer *B);</pre>
+
+<p>
+Returns the length of the current content of buffer <code>B</code>
+(see <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>).
+
+
+
+
+
+<hr><h3><a name="luaL_buffinitsize"><code>luaL_buffinitsize</code></a></h3><p>
+<span class="apii">[-?, +?, <em>m</em>]</span>
+<pre>char *luaL_buffinitsize (lua_State *L, luaL_Buffer *B, size_t sz);</pre>
+
+<p>
+Equivalent to the sequence
+<a href="#luaL_buffinit"><code>luaL_buffinit</code></a>, <a href="#luaL_prepbuffsize"><code>luaL_prepbuffsize</code></a>.
+
+
+
+
+
+<hr><h3><a name="luaL_buffsub"><code>luaL_buffsub</code></a></h3><p>
+<span class="apii">[-?, +?, &ndash;]</span>
+<pre>void luaL_buffsub (luaL_Buffer *B, int n);</pre>
+
+<p>
+Removes <code>n</code> bytes from the buffer <code>B</code>
+(see <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>).
+The buffer must have at least that many bytes.
+
+
+
+
+
+<hr><h3><a name="luaL_callmeta"><code>luaL_callmeta</code></a></h3><p>
+<span class="apii">[-0, +(0|1), <em>e</em>]</span>
+<pre>int luaL_callmeta (lua_State *L, int obj, const char *e);</pre>
+
+<p>
+Calls a metamethod.
+
+
+<p>
+If the object at index <code>obj</code> has a metatable and this
+metatable has a field <code>e</code>,
+this function calls this field passing the object as its only argument.
+In this case this function returns true and pushes onto the
+stack the value returned by the call.
+If there is no metatable or no metamethod,
+this function returns false without pushing any value on the stack.
+
+
+
+
+
+<hr><h3><a name="luaL_checkany"><code>luaL_checkany</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>void luaL_checkany (lua_State *L, int arg);</pre>
+
+<p>
+Checks whether the function has an argument
+of any type (including <b>nil</b>) at position <code>arg</code>.
+
+
+
+
+
+<hr><h3><a name="luaL_checkinteger"><code>luaL_checkinteger</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>lua_Integer luaL_checkinteger (lua_State *L, int arg);</pre>
+
+<p>
+Checks whether the function argument <code>arg</code> is an integer
+(or can be converted to an integer)
+and returns this integer.
+
+
+
+
+
+<hr><h3><a name="luaL_checklstring"><code>luaL_checklstring</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>const char *luaL_checklstring (lua_State *L, int arg, size_t *l);</pre>
+
+<p>
+Checks whether the function argument <code>arg</code> is a string
+and returns this string;
+if <code>l</code> is not <code>NULL</code> fills its referent
+with the string's length.
+
+
+<p>
+This function uses <a href="#lua_tolstring"><code>lua_tolstring</code></a> to get its result,
+so all conversions and caveats of that function apply here.
+
+
+
+
+
+<hr><h3><a name="luaL_checknumber"><code>luaL_checknumber</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>lua_Number luaL_checknumber (lua_State *L, int arg);</pre>
+
+<p>
+Checks whether the function argument <code>arg</code> is a number
+and returns this number converted to a <code>lua_Number</code>.
+
+
+
+
+
+<hr><h3><a name="luaL_checkoption"><code>luaL_checkoption</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>int luaL_checkoption (lua_State *L,
+                      int arg,
+                      const char *def,
+                      const char *const lst[]);</pre>
+
+<p>
+Checks whether the function argument <code>arg</code> is a string and
+searches for this string in the array <code>lst</code>
+(which must be NULL-terminated).
+Returns the index in the array where the string was found.
+Raises an error if the argument is not a string or
+if the string cannot be found.
+
+
+<p>
+If <code>def</code> is not <code>NULL</code>,
+the function uses <code>def</code> as a default value when
+there is no argument <code>arg</code> or when this argument is <b>nil</b>.
+
+
+<p>
+This is a useful function for mapping strings to C&nbsp;enums.
+(The usual convention in Lua libraries is
+to use strings instead of numbers to select options.)
+
+
+
+
+
+<hr><h3><a name="luaL_checkstack"><code>luaL_checkstack</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>void luaL_checkstack (lua_State *L, int sz, const char *msg);</pre>
+
+<p>
+Grows the stack size to <code>top + sz</code> elements,
+raising an error if the stack cannot grow to that size.
+<code>msg</code> is an additional text to go into the error message
+(or <code>NULL</code> for no additional text).
+
+
+
+
+
+<hr><h3><a name="luaL_checkstring"><code>luaL_checkstring</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>const char *luaL_checkstring (lua_State *L, int arg);</pre>
+
+<p>
+Checks whether the function argument <code>arg</code> is a string
+and returns this string.
+
+
+<p>
+This function uses <a href="#lua_tolstring"><code>lua_tolstring</code></a> to get its result,
+so all conversions and caveats of that function apply here.
+
+
+
+
+
+<hr><h3><a name="luaL_checktype"><code>luaL_checktype</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>void luaL_checktype (lua_State *L, int arg, int t);</pre>
+
+<p>
+Checks whether the function argument <code>arg</code> has type <code>t</code>.
+See <a href="#lua_type"><code>lua_type</code></a> for the encoding of types for <code>t</code>.
+
+
+
+
+
+<hr><h3><a name="luaL_checkudata"><code>luaL_checkudata</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>void *luaL_checkudata (lua_State *L, int arg, const char *tname);</pre>
+
+<p>
+Checks whether the function argument <code>arg</code> is a userdata
+of the type <code>tname</code> (see <a href="#luaL_newmetatable"><code>luaL_newmetatable</code></a>) and
+returns the userdata's memory-block address (see <a href="#lua_touserdata"><code>lua_touserdata</code></a>).
+
+
+
+
+
+<hr><h3><a name="luaL_checkversion"><code>luaL_checkversion</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>void luaL_checkversion (lua_State *L);</pre>
+
+<p>
+Checks whether the code making the call and the Lua library being called
+are using the same version of Lua and the same numeric types.
+
+
+
+
+
+<hr><h3><a name="luaL_dofile"><code>luaL_dofile</code></a></h3><p>
+<span class="apii">[-0, +?, <em>m</em>]</span>
+<pre>int luaL_dofile (lua_State *L, const char *filename);</pre>
+
+<p>
+Loads and runs the given file.
+It is defined as the following macro:
+
+<pre>
+     (luaL_loadfile(L, filename) || lua_pcall(L, 0, LUA_MULTRET, 0))
+</pre><p>
+It returns&nbsp;0 (<a href="#pdf-LUA_OK"><code>LUA_OK</code></a>) if there are no errors,
+or 1 in case of errors.
+
+
+
+
+
+<hr><h3><a name="luaL_dostring"><code>luaL_dostring</code></a></h3><p>
+<span class="apii">[-0, +?, &ndash;]</span>
+<pre>int luaL_dostring (lua_State *L, const char *str);</pre>
+
+<p>
+Loads and runs the given string.
+It is defined as the following macro:
+
+<pre>
+     (luaL_loadstring(L, str) || lua_pcall(L, 0, LUA_MULTRET, 0))
+</pre><p>
+It returns&nbsp;0 (<a href="#pdf-LUA_OK"><code>LUA_OK</code></a>) if there are no errors,
+or 1 in case of errors.
+
+
+
+
+
+<hr><h3><a name="luaL_error"><code>luaL_error</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>int luaL_error (lua_State *L, const char *fmt, ...);</pre>
+
+<p>
+Raises an error.
+The error message format is given by <code>fmt</code>
+plus any extra arguments,
+following the same rules of <a href="#lua_pushfstring"><code>lua_pushfstring</code></a>.
+It also adds at the beginning of the message the file name and
+the line number where the error occurred,
+if this information is available.
+
+
+<p>
+This function never returns,
+but it is an idiom to use it in C&nbsp;functions
+as <code>return luaL_error(<em>args</em>)</code>.
+
+
+
+
+
+<hr><h3><a name="luaL_execresult"><code>luaL_execresult</code></a></h3><p>
+<span class="apii">[-0, +3, <em>m</em>]</span>
+<pre>int luaL_execresult (lua_State *L, int stat);</pre>
+
+<p>
+This function produces the return values for
+process-related functions in the standard library
+(<a href="#pdf-os.execute"><code>os.execute</code></a> and <a href="#pdf-io.close"><code>io.close</code></a>).
+
+
+
+
+
+<hr><h3><a name="luaL_fileresult"><code>luaL_fileresult</code></a></h3><p>
+<span class="apii">[-0, +(1|3), <em>m</em>]</span>
+<pre>int luaL_fileresult (lua_State *L, int stat, const char *fname);</pre>
+
+<p>
+This function produces the return values for
+file-related functions in the standard library
+(<a href="#pdf-io.open"><code>io.open</code></a>, <a href="#pdf-os.rename"><code>os.rename</code></a>, <a href="#pdf-file:seek"><code>file:seek</code></a>, etc.).
+
+
+
+
+
+<hr><h3><a name="luaL_getmetafield"><code>luaL_getmetafield</code></a></h3><p>
+<span class="apii">[-0, +(0|1), <em>m</em>]</span>
+<pre>int luaL_getmetafield (lua_State *L, int obj, const char *e);</pre>
+
+<p>
+Pushes onto the stack the field <code>e</code> from the metatable
+of the object at index <code>obj</code> and returns the type of the pushed value.
+If the object does not have a metatable,
+or if the metatable does not have this field,
+pushes nothing and returns <code>LUA_TNIL</code>.
+
+
+
+
+
+<hr><h3><a name="luaL_getmetatable"><code>luaL_getmetatable</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>int luaL_getmetatable (lua_State *L, const char *tname);</pre>
+
+<p>
+Pushes onto the stack the metatable associated with the name <code>tname</code>
+in the registry (see <a href="#luaL_newmetatable"><code>luaL_newmetatable</code></a>),
+or <b>nil</b> if there is no metatable associated with that name.
+Returns the type of the pushed value.
+
+
+
+
+
+<hr><h3><a name="luaL_getsubtable"><code>luaL_getsubtable</code></a></h3><p>
+<span class="apii">[-0, +1, <em>e</em>]</span>
+<pre>int luaL_getsubtable (lua_State *L, int idx, const char *fname);</pre>
+
+<p>
+Ensures that the value <code>t[fname]</code>,
+where <code>t</code> is the value at index <code>idx</code>,
+is a table,
+and pushes that table onto the stack.
+Returns true if it finds a previous table there
+and false if it creates a new table.
+
+
+
+
+
+<hr><h3><a name="luaL_gsub"><code>luaL_gsub</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>const char *luaL_gsub (lua_State *L,
+                       const char *s,
+                       const char *p,
+                       const char *r);</pre>
+
+<p>
+Creates a copy of string <code>s</code>,
+replacing any occurrence of the string <code>p</code>
+with the string <code>r</code>.
+Pushes the resulting string on the stack and returns it.
+
+
+
+
+
+<hr><h3><a name="luaL_len"><code>luaL_len</code></a></h3><p>
+<span class="apii">[-0, +0, <em>e</em>]</span>
+<pre>lua_Integer luaL_len (lua_State *L, int index);</pre>
+
+<p>
+Returns the "length" of the value at the given index
+as a number;
+it is equivalent to the '<code>#</code>' operator in Lua (see <a href="#3.4.7">&sect;3.4.7</a>).
+Raises an error if the result of the operation is not an integer.
+(This case can only happen through metamethods.)
+
+
+
+
+
+<hr><h3><a name="luaL_loadbuffer"><code>luaL_loadbuffer</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>int luaL_loadbuffer (lua_State *L,
+                     const char *buff,
+                     size_t sz,
+                     const char *name);</pre>
+
+<p>
+Equivalent to <a href="#luaL_loadbufferx"><code>luaL_loadbufferx</code></a> with <code>mode</code> equal to <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="luaL_loadbufferx"><code>luaL_loadbufferx</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>int luaL_loadbufferx (lua_State *L,
+                      const char *buff,
+                      size_t sz,
+                      const char *name,
+                      const char *mode);</pre>
+
+<p>
+Loads a buffer as a Lua chunk.
+This function uses <a href="#lua_load"><code>lua_load</code></a> to load the chunk in the
+buffer pointed to by <code>buff</code> with size <code>sz</code>.
+
+
+<p>
+This function returns the same results as <a href="#lua_load"><code>lua_load</code></a>.
+<code>name</code> is the chunk name,
+used for debug information and error messages.
+The string <code>mode</code> works as in the function <a href="#lua_load"><code>lua_load</code></a>.
+
+
+
+
+
+<hr><h3><a name="luaL_loadfile"><code>luaL_loadfile</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>int luaL_loadfile (lua_State *L, const char *filename);</pre>
+
+<p>
+Equivalent to <a href="#luaL_loadfilex"><code>luaL_loadfilex</code></a> with <code>mode</code> equal to <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="luaL_loadfilex"><code>luaL_loadfilex</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>int luaL_loadfilex (lua_State *L, const char *filename,
+                                            const char *mode);</pre>
+
+<p>
+Loads a file as a Lua chunk.
+This function uses <a href="#lua_load"><code>lua_load</code></a> to load the chunk in the file
+named <code>filename</code>.
+If <code>filename</code> is <code>NULL</code>,
+then it loads from the standard input.
+The first line in the file is ignored if it starts with a <code>#</code>.
+
+
+<p>
+The string <code>mode</code> works as in the function <a href="#lua_load"><code>lua_load</code></a>.
+
+
+<p>
+This function returns the same results as <a href="#lua_load"><code>lua_load</code></a>
+or <a href="#pdf-LUA_ERRFILE"><code>LUA_ERRFILE</code></a> for file-related errors.
+
+
+<p>
+As <a href="#lua_load"><code>lua_load</code></a>, this function only loads the chunk;
+it does not run it.
+
+
+
+
+
+<hr><h3><a name="luaL_loadstring"><code>luaL_loadstring</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>int luaL_loadstring (lua_State *L, const char *s);</pre>
+
+<p>
+Loads a string as a Lua chunk.
+This function uses <a href="#lua_load"><code>lua_load</code></a> to load the chunk in
+the zero-terminated string <code>s</code>.
+
+
+<p>
+This function returns the same results as <a href="#lua_load"><code>lua_load</code></a>.
+
+
+<p>
+Also as <a href="#lua_load"><code>lua_load</code></a>, this function only loads the chunk;
+it does not run it.
+
+
+
+
+
+<hr><h3><a name="luaL_newlib"><code>luaL_newlib</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>void luaL_newlib (lua_State *L, const luaL_Reg l[]);</pre>
+
+<p>
+Creates a new table and registers there
+the functions in the list <code>l</code>.
+
+
+<p>
+It is implemented as the following macro:
+
+<pre>
+     (luaL_newlibtable(L,l), luaL_setfuncs(L,l,0))
+</pre><p>
+The array <code>l</code> must be the actual array,
+not a pointer to it.
+
+
+
+
+
+<hr><h3><a name="luaL_newlibtable"><code>luaL_newlibtable</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>void luaL_newlibtable (lua_State *L, const luaL_Reg l[]);</pre>
+
+<p>
+Creates a new table with a size optimized
+to store all entries in the array <code>l</code>
+(but does not actually store them).
+It is intended to be used in conjunction with <a href="#luaL_setfuncs"><code>luaL_setfuncs</code></a>
+(see <a href="#luaL_newlib"><code>luaL_newlib</code></a>).
+
+
+<p>
+It is implemented as a macro.
+The array <code>l</code> must be the actual array,
+not a pointer to it.
+
+
+
+
+
+<hr><h3><a name="luaL_newmetatable"><code>luaL_newmetatable</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>int luaL_newmetatable (lua_State *L, const char *tname);</pre>
+
+<p>
+If the registry already has the key <code>tname</code>,
+returns 0.
+Otherwise,
+creates a new table to be used as a metatable for userdata,
+adds to this new table the pair <code>__name = tname</code>,
+adds to the registry the pair <code>[tname] = new table</code>,
+and returns 1.
+
+
+<p>
+In both cases,
+the function pushes onto the stack the final value associated
+with <code>tname</code> in the registry.
+
+
+
+
+
+<hr><h3><a name="luaL_newstate"><code>luaL_newstate</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>lua_State *luaL_newstate (void);</pre>
+
+<p>
+Creates a new Lua state.
+It calls <a href="#lua_newstate"><code>lua_newstate</code></a> with an
+allocator based on the ISO&nbsp;C allocation functions
+and then sets a warning function and a panic function (see <a href="#4.4">&sect;4.4</a>)
+that print messages to the standard error output.
+
+
+<p>
+Returns the new state,
+or <code>NULL</code> if there is a memory allocation error.
+
+
+
+
+
+<hr><h3><a name="luaL_openlibs"><code>luaL_openlibs</code></a></h3><p>
+<span class="apii">[-0, +0, <em>e</em>]</span>
+<pre>void luaL_openlibs (lua_State *L);</pre>
+
+<p>
+Opens all standard Lua libraries into the given state.
+
+
+
+
+
+<hr><h3><a name="luaL_opt"><code>luaL_opt</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>T luaL_opt (L, func, arg, dflt);</pre>
+
+<p>
+This macro is defined as follows:
+
+<pre>
+     (lua_isnoneornil(L,(arg)) ? (dflt) : func(L,(arg)))
+</pre><p>
+In words, if the argument <code>arg</code> is nil or absent,
+the macro results in the default <code>dflt</code>.
+Otherwise, it results in the result of calling <code>func</code>
+with the state <code>L</code> and the argument index <code>arg</code> as
+arguments.
+Note that it evaluates the expression <code>dflt</code> only if needed.
+
+
+
+
+
+<hr><h3><a name="luaL_optinteger"><code>luaL_optinteger</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>lua_Integer luaL_optinteger (lua_State *L,
+                             int arg,
+                             lua_Integer d);</pre>
+
+<p>
+If the function argument <code>arg</code> is an integer
+(or it is convertible to an integer),
+returns this integer.
+If this argument is absent or is <b>nil</b>,
+returns <code>d</code>.
+Otherwise, raises an error.
+
+
+
+
+
+<hr><h3><a name="luaL_optlstring"><code>luaL_optlstring</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>const char *luaL_optlstring (lua_State *L,
+                             int arg,
+                             const char *d,
+                             size_t *l);</pre>
+
+<p>
+If the function argument <code>arg</code> is a string,
+returns this string.
+If this argument is absent or is <b>nil</b>,
+returns <code>d</code>.
+Otherwise, raises an error.
+
+
+<p>
+If <code>l</code> is not <code>NULL</code>,
+fills its referent with the result's length.
+If the result is <code>NULL</code>
+(only possible when returning <code>d</code> and <code>d == NULL</code>),
+its length is considered zero.
+
+
+<p>
+This function uses <a href="#lua_tolstring"><code>lua_tolstring</code></a> to get its result,
+so all conversions and caveats of that function apply here.
+
+
+
+
+
+<hr><h3><a name="luaL_optnumber"><code>luaL_optnumber</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>lua_Number luaL_optnumber (lua_State *L, int arg, lua_Number d);</pre>
+
+<p>
+If the function argument <code>arg</code> is a number,
+returns this number as a <code>lua_Number</code>.
+If this argument is absent or is <b>nil</b>,
+returns <code>d</code>.
+Otherwise, raises an error.
+
+
+
+
+
+<hr><h3><a name="luaL_optstring"><code>luaL_optstring</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>const char *luaL_optstring (lua_State *L,
+                            int arg,
+                            const char *d);</pre>
+
+<p>
+If the function argument <code>arg</code> is a string,
+returns this string.
+If this argument is absent or is <b>nil</b>,
+returns <code>d</code>.
+Otherwise, raises an error.
+
+
+
+
+
+<hr><h3><a name="luaL_prepbuffer"><code>luaL_prepbuffer</code></a></h3><p>
+<span class="apii">[-?, +?, <em>m</em>]</span>
+<pre>char *luaL_prepbuffer (luaL_Buffer *B);</pre>
+
+<p>
+Equivalent to <a href="#luaL_prepbuffsize"><code>luaL_prepbuffsize</code></a>
+with the predefined size <a name="pdf-LUAL_BUFFERSIZE"><code>LUAL_BUFFERSIZE</code></a>.
+
+
+
+
+
+<hr><h3><a name="luaL_prepbuffsize"><code>luaL_prepbuffsize</code></a></h3><p>
+<span class="apii">[-?, +?, <em>m</em>]</span>
+<pre>char *luaL_prepbuffsize (luaL_Buffer *B, size_t sz);</pre>
+
+<p>
+Returns an address to a space of size <code>sz</code>
+where you can copy a string to be added to buffer <code>B</code>
+(see <a href="#luaL_Buffer"><code>luaL_Buffer</code></a>).
+After copying the string into this space you must call
+<a href="#luaL_addsize"><code>luaL_addsize</code></a> with the size of the string to actually add
+it to the buffer.
+
+
+
+
+
+<hr><h3><a name="luaL_pushfail"><code>luaL_pushfail</code></a></h3><p>
+<span class="apii">[-0, +1, &ndash;]</span>
+<pre>void luaL_pushfail (lua_State *L);</pre>
+
+<p>
+Pushes the <b>fail</b> value onto the stack (see <a href="#6">&sect;6</a>).
+
+
+
+
+
+<hr><h3><a name="luaL_pushresult"><code>luaL_pushresult</code></a></h3><p>
+<span class="apii">[-?, +1, <em>m</em>]</span>
+<pre>void luaL_pushresult (luaL_Buffer *B);</pre>
+
+<p>
+Finishes the use of buffer <code>B</code> leaving the final string on
+the top of the stack.
+
+
+
+
+
+<hr><h3><a name="luaL_pushresultsize"><code>luaL_pushresultsize</code></a></h3><p>
+<span class="apii">[-?, +1, <em>m</em>]</span>
+<pre>void luaL_pushresultsize (luaL_Buffer *B, size_t sz);</pre>
+
+<p>
+Equivalent to the sequence <a href="#luaL_addsize"><code>luaL_addsize</code></a>, <a href="#luaL_pushresult"><code>luaL_pushresult</code></a>.
+
+
+
+
+
+<hr><h3><a name="luaL_ref"><code>luaL_ref</code></a></h3><p>
+<span class="apii">[-1, +0, <em>m</em>]</span>
+<pre>int luaL_ref (lua_State *L, int t);</pre>
+
+<p>
+Creates and returns a <em>reference</em>,
+in the table at index <code>t</code>,
+for the object on the top of the stack (and pops the object).
+
+
+<p>
+A reference is a unique integer key.
+As long as you do not manually add integer keys into the table <code>t</code>,
+<a href="#luaL_ref"><code>luaL_ref</code></a> ensures the uniqueness of the key it returns.
+You can retrieve an object referred by the reference <code>r</code>
+by calling <code>lua_rawgeti(L, t, r)</code>.
+The function <a href="#luaL_unref"><code>luaL_unref</code></a> frees a reference.
+
+
+<p>
+If the object on the top of the stack is <b>nil</b>,
+<a href="#luaL_ref"><code>luaL_ref</code></a> returns the constant <a name="pdf-LUA_REFNIL"><code>LUA_REFNIL</code></a>.
+The constant <a name="pdf-LUA_NOREF"><code>LUA_NOREF</code></a> is guaranteed to be different
+from any reference returned by <a href="#luaL_ref"><code>luaL_ref</code></a>.
+
+
+
+
+
+<hr><h3><a name="luaL_Reg"><code>luaL_Reg</code></a></h3>
+<pre>typedef struct luaL_Reg {
+  const char *name;
+  lua_CFunction func;
+} luaL_Reg;</pre>
+
+<p>
+Type for arrays of functions to be registered by
+<a href="#luaL_setfuncs"><code>luaL_setfuncs</code></a>.
+<code>name</code> is the function name and <code>func</code> is a pointer to
+the function.
+Any array of <a href="#luaL_Reg"><code>luaL_Reg</code></a> must end with a sentinel entry
+in which both <code>name</code> and <code>func</code> are <code>NULL</code>.
+
+
+
+
+
+<hr><h3><a name="luaL_requiref"><code>luaL_requiref</code></a></h3><p>
+<span class="apii">[-0, +1, <em>e</em>]</span>
+<pre>void luaL_requiref (lua_State *L, const char *modname,
+                    lua_CFunction openf, int glb);</pre>
+
+<p>
+If <code>package.loaded[modname]</code> is not true,
+calls the function <code>openf</code> with the string <code>modname</code> as an argument
+and sets the call result to <code>package.loaded[modname]</code>,
+as if that function has been called through <a href="#pdf-require"><code>require</code></a>.
+
+
+<p>
+If <code>glb</code> is true,
+also stores the module into the global <code>modname</code>.
+
+
+<p>
+Leaves a copy of the module on the stack.
+
+
+
+
+
+<hr><h3><a name="luaL_setfuncs"><code>luaL_setfuncs</code></a></h3><p>
+<span class="apii">[-nup, +0, <em>m</em>]</span>
+<pre>void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup);</pre>
+
+<p>
+Registers all functions in the array <code>l</code>
+(see <a href="#luaL_Reg"><code>luaL_Reg</code></a>) into the table on the top of the stack
+(below optional upvalues, see next).
+
+
+<p>
+When <code>nup</code> is not zero,
+all functions are created with <code>nup</code> upvalues,
+initialized with copies of the <code>nup</code> values
+previously pushed on the stack
+on top of the library table.
+These values are popped from the stack after the registration.
+
+
+<p>
+A function with a <code>NULL</code> value represents a placeholder,
+which is filled with <b>false</b>.
+
+
+
+
+
+<hr><h3><a name="luaL_setmetatable"><code>luaL_setmetatable</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void luaL_setmetatable (lua_State *L, const char *tname);</pre>
+
+<p>
+Sets the metatable of the object on the top of the stack
+as the metatable associated with name <code>tname</code>
+in the registry (see <a href="#luaL_newmetatable"><code>luaL_newmetatable</code></a>).
+
+
+
+
+
+<hr><h3><a name="luaL_Stream"><code>luaL_Stream</code></a></h3>
+<pre>typedef struct luaL_Stream {
+  FILE *f;
+  lua_CFunction closef;
+} luaL_Stream;</pre>
+
+<p>
+The standard representation for file handles
+used by the standard I/O library.
+
+
+<p>
+A file handle is implemented as a full userdata,
+with a metatable called <code>LUA_FILEHANDLE</code>
+(where <code>LUA_FILEHANDLE</code> is a macro with the actual metatable's name).
+The metatable is created by the I/O library
+(see <a href="#luaL_newmetatable"><code>luaL_newmetatable</code></a>).
+
+
+<p>
+This userdata must start with the structure <code>luaL_Stream</code>;
+it can contain other data after this initial structure.
+The field <code>f</code> points to the corresponding C stream
+(or it can be <code>NULL</code> to indicate an incompletely created handle).
+The field <code>closef</code> points to a Lua function
+that will be called to close the stream
+when the handle is closed or collected;
+this function receives the file handle as its sole argument and
+must return either a true value, in case of success,
+or a false value plus an error message, in case of error.
+Once Lua calls this field,
+it changes the field value to <code>NULL</code>
+to signal that the handle is closed.
+
+
+
+
+
+<hr><h3><a name="luaL_testudata"><code>luaL_testudata</code></a></h3><p>
+<span class="apii">[-0, +0, <em>m</em>]</span>
+<pre>void *luaL_testudata (lua_State *L, int arg, const char *tname);</pre>
+
+<p>
+This function works like <a href="#luaL_checkudata"><code>luaL_checkudata</code></a>,
+except that, when the test fails,
+it returns <code>NULL</code> instead of raising an error.
+
+
+
+
+
+<hr><h3><a name="luaL_tolstring"><code>luaL_tolstring</code></a></h3><p>
+<span class="apii">[-0, +1, <em>e</em>]</span>
+<pre>const char *luaL_tolstring (lua_State *L, int idx, size_t *len);</pre>
+
+<p>
+Converts any Lua value at the given index to a C&nbsp;string
+in a reasonable format.
+The resulting string is pushed onto the stack and also
+returned by the function (see <a href="#4.1.3">&sect;4.1.3</a>).
+If <code>len</code> is not <code>NULL</code>,
+the function also sets <code>*len</code> with the string length.
+
+
+<p>
+If the value has a metatable with a <code>__tostring</code> field,
+then <code>luaL_tolstring</code> calls the corresponding metamethod
+with the value as argument,
+and uses the result of the call as its result.
+
+
+
+
+
+<hr><h3><a name="luaL_traceback"><code>luaL_traceback</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>void luaL_traceback (lua_State *L, lua_State *L1, const char *msg,
+                     int level);</pre>
+
+<p>
+Creates and pushes a traceback of the stack <code>L1</code>.
+If <code>msg</code> is not <code>NULL</code>, it is appended
+at the beginning of the traceback.
+The <code>level</code> parameter tells at which level
+to start the traceback.
+
+
+
+
+
+<hr><h3><a name="luaL_typeerror"><code>luaL_typeerror</code></a></h3><p>
+<span class="apii">[-0, +0, <em>v</em>]</span>
+<pre>int luaL_typeerror (lua_State *L, int arg, const char *tname);</pre>
+
+<p>
+Raises a type error for the argument <code>arg</code>
+of the C&nbsp;function that called it,
+using a standard message;
+<code>tname</code> is a "name" for the expected type.
+This function never returns.
+
+
+
+
+
+<hr><h3><a name="luaL_typename"><code>luaL_typename</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>const char *luaL_typename (lua_State *L, int index);</pre>
+
+<p>
+Returns the name of the type of the value at the given index.
+
+
+
+
+
+<hr><h3><a name="luaL_unref"><code>luaL_unref</code></a></h3><p>
+<span class="apii">[-0, +0, &ndash;]</span>
+<pre>void luaL_unref (lua_State *L, int t, int ref);</pre>
+
+<p>
+Releases the reference <code>ref</code> from the table at index <code>t</code>
+(see <a href="#luaL_ref"><code>luaL_ref</code></a>).
+The entry is removed from the table,
+so that the referred object can be collected.
+The reference <code>ref</code> is also freed to be used again.
+
+
+<p>
+If <code>ref</code> is <a href="#pdf-LUA_NOREF"><code>LUA_NOREF</code></a> or <a href="#pdf-LUA_REFNIL"><code>LUA_REFNIL</code></a>,
+<a href="#luaL_unref"><code>luaL_unref</code></a> does nothing.
+
+
+
+
+
+<hr><h3><a name="luaL_where"><code>luaL_where</code></a></h3><p>
+<span class="apii">[-0, +1, <em>m</em>]</span>
+<pre>void luaL_where (lua_State *L, int lvl);</pre>
+
+<p>
+Pushes onto the stack a string identifying the current position
+of the control at level <code>lvl</code> in the call stack.
+Typically this string has the following format:
+
+<pre>
+     <em>chunkname</em>:<em>currentline</em>:
+</pre><p>
+Level&nbsp;0 is the running function,
+level&nbsp;1 is the function that called the running function,
+etc.
+
+
+<p>
+This function is used to build a prefix for error messages.
+
+
+
+
+
+
+
+<h1>6 &ndash; <a name="6">The Standard Libraries</a></h1>
+
+
+
+<p>
+The standard Lua libraries provide useful functions
+that are implemented in&nbsp;C through the C&nbsp;API.
+Some of these functions provide essential services to the language
+(e.g., <a href="#pdf-type"><code>type</code></a> and <a href="#pdf-getmetatable"><code>getmetatable</code></a>);
+others provide access to outside services (e.g., I/O);
+and others could be implemented in Lua itself,
+but that for different reasons
+deserve an implementation in C (e.g., <a href="#pdf-table.sort"><code>table.sort</code></a>).
+
+
+<p>
+All libraries are implemented through the official C&nbsp;API
+and are provided as separate C&nbsp;modules.
+Unless otherwise noted,
+these library functions do not adjust its number of arguments
+to its expected parameters.
+For instance, a function documented as <code>foo(arg)</code>
+should not be called without an argument.
+
+
+<p>
+The notation <b>fail</b> means a false value representing
+some kind of failure.
+(Currently, <b>fail</b> is equal to <b>nil</b>,
+but that may change in future versions.
+The recommendation is to always test the success of these functions
+with <code>(not status)</code>, instead of <code>(status == nil)</code>.)
+
+
+<p>
+Currently, Lua has the following standard libraries:
+
+<ul>
+
+<li>basic library (<a href="#6.1">&sect;6.1</a>);</li>
+
+<li>coroutine library (<a href="#6.2">&sect;6.2</a>);</li>
+
+<li>package library (<a href="#6.3">&sect;6.3</a>);</li>
+
+<li>string manipulation (<a href="#6.4">&sect;6.4</a>);</li>
+
+<li>basic UTF-8 support (<a href="#6.5">&sect;6.5</a>);</li>
+
+<li>table manipulation (<a href="#6.6">&sect;6.6</a>);</li>
+
+<li>mathematical functions (<a href="#6.7">&sect;6.7</a>) (sin, log, etc.);</li>
+
+<li>input and output (<a href="#6.8">&sect;6.8</a>);</li>
+
+<li>operating system facilities (<a href="#6.9">&sect;6.9</a>);</li>
+
+<li>debug facilities (<a href="#6.10">&sect;6.10</a>).</li>
+
+</ul><p>
+Except for the basic and the package libraries,
+each library provides all its functions as fields of a global table
+or as methods of its objects.
+
+
+<p>
+To have access to these libraries,
+the C&nbsp;host program should call the <a href="#luaL_openlibs"><code>luaL_openlibs</code></a> function,
+which opens all standard libraries.
+Alternatively,
+the host program can open them individually by using
+<a href="#luaL_requiref"><code>luaL_requiref</code></a> to call
+<a name="pdf-luaopen_base"><code>luaopen_base</code></a> (for the basic library),
+<a name="pdf-luaopen_package"><code>luaopen_package</code></a> (for the package library),
+<a name="pdf-luaopen_coroutine"><code>luaopen_coroutine</code></a> (for the coroutine library),
+<a name="pdf-luaopen_string"><code>luaopen_string</code></a> (for the string library),
+<a name="pdf-luaopen_utf8"><code>luaopen_utf8</code></a> (for the UTF-8 library),
+<a name="pdf-luaopen_table"><code>luaopen_table</code></a> (for the table library),
+<a name="pdf-luaopen_math"><code>luaopen_math</code></a> (for the mathematical library),
+<a name="pdf-luaopen_io"><code>luaopen_io</code></a> (for the I/O library),
+<a name="pdf-luaopen_os"><code>luaopen_os</code></a> (for the operating system library),
+and <a name="pdf-luaopen_debug"><code>luaopen_debug</code></a> (for the debug library).
+These functions are declared in <a name="pdf-lualib.h"><code>lualib.h</code></a>.
+
+
+
+
+
+<h2>6.1 &ndash; <a name="6.1">Basic Functions</a></h2>
+
+<p>
+The basic library provides core functions to Lua.
+If you do not include this library in your application,
+you should check carefully whether you need to provide
+implementations for some of its facilities.
+
+
+<p>
+<hr><h3><a name="pdf-assert"><code>assert (v [, message])</code></a></h3>
+
+
+<p>
+Raises an error if
+the value of its argument <code>v</code> is false (i.e., <b>nil</b> or <b>false</b>);
+otherwise, returns all its arguments.
+In case of error,
+<code>message</code> is the error object;
+when absent, it defaults to "<code>assertion failed!</code>"
+
+
+
+
+<p>
+<hr><h3><a name="pdf-collectgarbage"><code>collectgarbage ([opt [, arg]])</code></a></h3>
+
+
+<p>
+This function is a generic interface to the garbage collector.
+It performs different functions according to its first argument, <code>opt</code>:
+
+<ul>
+
+<li><b>"<code>collect</code>": </b>
+Performs a full garbage-collection cycle.
+This is the default option.
+</li>
+
+<li><b>"<code>stop</code>": </b>
+Stops automatic execution of the garbage collector.
+The collector will run only when explicitly invoked,
+until a call to restart it.
+</li>
+
+<li><b>"<code>restart</code>": </b>
+Restarts automatic execution of the garbage collector.
+</li>
+
+<li><b>"<code>count</code>": </b>
+Returns the total memory in use by Lua in Kbytes.
+The value has a fractional part,
+so that it multiplied by 1024
+gives the exact number of bytes in use by Lua.
+</li>
+
+<li><b>"<code>step</code>": </b>
+Performs a garbage-collection step.
+The step "size" is controlled by <code>arg</code>.
+With a zero value,
+the collector will perform one basic (indivisible) step.
+For non-zero values,
+the collector will perform as if that amount of memory
+(in Kbytes) had been allocated by Lua.
+Returns <b>true</b> if the step finished a collection cycle.
+</li>
+
+<li><b>"<code>isrunning</code>": </b>
+Returns a boolean that tells whether the collector is running
+(i.e., not stopped).
+</li>
+
+<li><b>"<code>incremental</code>": </b>
+Change the collector mode to incremental.
+This option can be followed by three numbers:
+the garbage-collector pause,
+the step multiplier,
+and the step size (see <a href="#2.5.1">&sect;2.5.1</a>).
+A zero means to not change that value.
+</li>
+
+<li><b>"<code>generational</code>": </b>
+Change the collector mode to generational.
+This option can be followed by two numbers:
+the garbage-collector minor multiplier
+and the major multiplier (see <a href="#2.5.2">&sect;2.5.2</a>).
+A zero means to not change that value.
+</li>
+
+</ul><p>
+See <a href="#2.5">&sect;2.5</a> for more details about garbage collection
+and some of these options.
+
+
+<p>
+This function should not be called by a finalizer.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-dofile"><code>dofile ([filename])</code></a></h3>
+Opens the named file and executes its content as a Lua chunk.
+When called without arguments,
+<code>dofile</code> executes the content of the standard input (<code>stdin</code>).
+Returns all values returned by the chunk.
+In case of errors, <code>dofile</code> propagates the error
+to its caller.
+(That is, <code>dofile</code> does not run in protected mode.)
+
+
+
+
+<p>
+<hr><h3><a name="pdf-error"><code>error (message [, level])</code></a></h3>
+Raises an error (see <a href="#2.3">&sect;2.3</a>) with <code>message</code> as the error object.
+This function never returns.
+
+
+<p>
+Usually, <code>error</code> adds some information about the error position
+at the beginning of the message, if the message is a string.
+The <code>level</code> argument specifies how to get the error position.
+With level&nbsp;1 (the default), the error position is where the
+<code>error</code> function was called.
+Level&nbsp;2 points the error to where the function
+that called <code>error</code> was called; and so on.
+Passing a level&nbsp;0 avoids the addition of error position information
+to the message.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-_G"><code>_G</code></a></h3>
+A global variable (not a function) that
+holds the global environment (see <a href="#2.2">&sect;2.2</a>).
+Lua itself does not use this variable;
+changing its value does not affect any environment,
+nor vice versa.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-getmetatable"><code>getmetatable (object)</code></a></h3>
+
+
+<p>
+If <code>object</code> does not have a metatable, returns <b>nil</b>.
+Otherwise,
+if the object's metatable has a <code>__metatable</code> field,
+returns the associated value.
+Otherwise, returns the metatable of the given object.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-ipairs"><code>ipairs (t)</code></a></h3>
+
+
+<p>
+Returns three values (an iterator function, the table <code>t</code>, and 0)
+so that the construction
+
+<pre>
+     for i,v in ipairs(t) do <em>body</em> end
+</pre><p>
+will iterate over the key&ndash;value pairs
+(<code>1,t[1]</code>), (<code>2,t[2]</code>), ...,
+up to the first absent index.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-load"><code>load (chunk [, chunkname [, mode [, env]]])</code></a></h3>
+
+
+<p>
+Loads a chunk.
+
+
+<p>
+If <code>chunk</code> is a string, the chunk is this string.
+If <code>chunk</code> is a function,
+<code>load</code> calls it repeatedly to get the chunk pieces.
+Each call to <code>chunk</code> must return a string that concatenates
+with previous results.
+A return of an empty string, <b>nil</b>, or no value signals the end of the chunk.
+
+
+<p>
+If there are no syntactic errors,
+<code>load</code> returns the compiled chunk as a function;
+otherwise, it returns <b>fail</b> plus the error message.
+
+
+<p>
+When you load a main chunk,
+the resulting function will always have exactly one upvalue,
+the <code>_ENV</code> variable (see <a href="#2.2">&sect;2.2</a>).
+However,
+when you load a binary chunk created from a function (see <a href="#pdf-string.dump"><code>string.dump</code></a>),
+the resulting function can have an arbitrary number of upvalues,
+and there is no guarantee that its first upvalue will be
+the <code>_ENV</code> variable.
+(A non-main function may not even have an <code>_ENV</code> upvalue.)
+
+
+<p>
+Regardless, if the resulting function has any upvalues,
+its first upvalue is set to the value of <code>env</code>,
+if that parameter is given,
+or to the value of the global environment.
+Other upvalues are initialized with <b>nil</b>.
+All upvalues are fresh, that is,
+they are not shared with any other function.
+
+
+<p>
+<code>chunkname</code> is used as the name of the chunk for error messages
+and debug information (see <a href="#4.7">&sect;4.7</a>).
+When absent,
+it defaults to <code>chunk</code>, if <code>chunk</code> is a string,
+or to "<code>=(load)</code>" otherwise.
+
+
+<p>
+The string <code>mode</code> controls whether the chunk can be text or binary
+(that is, a precompiled chunk).
+It may be the string "<code>b</code>" (only binary chunks),
+"<code>t</code>" (only text chunks),
+or "<code>bt</code>" (both binary and text).
+The default is "<code>bt</code>".
+
+
+<p>
+It is safe to load malformed binary chunks;
+<code>load</code> signals an appropriate error.
+However,
+Lua does not check the consistency of the code inside binary chunks;
+running maliciously crafted bytecode can crash the interpreter.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-loadfile"><code>loadfile ([filename [, mode [, env]]])</code></a></h3>
+
+
+<p>
+Similar to <a href="#pdf-load"><code>load</code></a>,
+but gets the chunk from file <code>filename</code>
+or from the standard input,
+if no file name is given.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-next"><code>next (table [, index])</code></a></h3>
+
+
+<p>
+Allows a program to traverse all fields of a table.
+Its first argument is a table and its second argument
+is an index in this table.
+A call to <code>next</code> returns the next index of the table
+and its associated value.
+When called with <b>nil</b> as its second argument,
+<code>next</code> returns an initial index
+and its associated value.
+When called with the last index,
+or with <b>nil</b> in an empty table,
+<code>next</code> returns <b>nil</b>.
+If the second argument is absent, then it is interpreted as <b>nil</b>.
+In particular,
+you can use <code>next(t)</code> to check whether a table is empty.
+
+
+<p>
+The order in which the indices are enumerated is not specified,
+<em>even for numeric indices</em>.
+(To traverse a table in numerical order,
+use a numerical <b>for</b>.)
+
+
+<p>
+You should not assign any value to a non-existent field in a table
+during its traversal.
+You may however modify existing fields.
+In particular, you may set existing fields to nil.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-pairs"><code>pairs (t)</code></a></h3>
+
+
+<p>
+If <code>t</code> has a metamethod <code>__pairs</code>,
+calls it with <code>t</code> as argument and returns the first three
+results from the call.
+
+
+<p>
+Otherwise,
+returns three values: the <a href="#pdf-next"><code>next</code></a> function, the table <code>t</code>, and <b>nil</b>,
+so that the construction
+
+<pre>
+     for k,v in pairs(t) do <em>body</em> end
+</pre><p>
+will iterate over all key&ndash;value pairs of table <code>t</code>.
+
+
+<p>
+See function <a href="#pdf-next"><code>next</code></a> for the caveats of modifying
+the table during its traversal.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-pcall"><code>pcall (f [, arg1, &middot;&middot;&middot;])</code></a></h3>
+
+
+<p>
+Calls the function <code>f</code> with
+the given arguments in <em>protected mode</em>.
+This means that any error inside&nbsp;<code>f</code> is not propagated;
+instead, <code>pcall</code> catches the error
+and returns a status code.
+Its first result is the status code (a boolean),
+which is <b>true</b> if the call succeeds without errors.
+In such case, <code>pcall</code> also returns all results from the call,
+after this first result.
+In case of any error, <code>pcall</code> returns <b>false</b> plus the error object.
+Note that errors caught by <code>pcall</code> do not call a message handler.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-print"><code>print (&middot;&middot;&middot;)</code></a></h3>
+Receives any number of arguments
+and prints their values to <code>stdout</code>,
+converting each argument to a string
+following the same rules of <a href="#pdf-tostring"><code>tostring</code></a>.
+
+
+<p>
+The function <code>print</code> is not intended for formatted output,
+but only as a quick way to show a value,
+for instance for debugging.
+For complete control over the output,
+use <a href="#pdf-string.format"><code>string.format</code></a> and <a href="#pdf-io.write"><code>io.write</code></a>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-rawequal"><code>rawequal (v1, v2)</code></a></h3>
+Checks whether <code>v1</code> is equal to <code>v2</code>,
+without invoking the <code>__eq</code> metamethod.
+Returns a boolean.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-rawget"><code>rawget (table, index)</code></a></h3>
+Gets the real value of <code>table[index]</code>,
+without using the <code>__index</code> metavalue.
+<code>table</code> must be a table;
+<code>index</code> may be any value.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-rawlen"><code>rawlen (v)</code></a></h3>
+Returns the length of the object <code>v</code>,
+which must be a table or a string,
+without invoking the <code>__len</code> metamethod.
+Returns an integer.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-rawset"><code>rawset (table, index, value)</code></a></h3>
+Sets the real value of <code>table[index]</code> to <code>value</code>,
+without using the <code>__newindex</code> metavalue.
+<code>table</code> must be a table,
+<code>index</code> any value different from <b>nil</b> and NaN,
+and <code>value</code> any Lua value.
+
+
+<p>
+This function returns <code>table</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-select"><code>select (index, &middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+If <code>index</code> is a number,
+returns all arguments after argument number <code>index</code>;
+a negative number indexes from the end (-1 is the last argument).
+Otherwise, <code>index</code> must be the string <code>"#"</code>,
+and <code>select</code> returns the total number of extra arguments it received.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-setmetatable"><code>setmetatable (table, metatable)</code></a></h3>
+
+
+<p>
+Sets the metatable for the given table.
+If <code>metatable</code> is <b>nil</b>,
+removes the metatable of the given table.
+If the original metatable has a <code>__metatable</code> field,
+raises an error.
+
+
+<p>
+This function returns <code>table</code>.
+
+
+<p>
+To change the metatable of other types from Lua code,
+you must use the debug library (<a href="#6.10">&sect;6.10</a>).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-tonumber"><code>tonumber (e [, base])</code></a></h3>
+
+
+<p>
+When called with no <code>base</code>,
+<code>tonumber</code> tries to convert its argument to a number.
+If the argument is already a number or
+a string convertible to a number,
+then <code>tonumber</code> returns this number;
+otherwise, it returns <b>fail</b>.
+
+
+<p>
+The conversion of strings can result in integers or floats,
+according to the lexical conventions of Lua (see <a href="#3.1">&sect;3.1</a>).
+The string may have leading and trailing spaces and a sign.
+
+
+<p>
+When called with <code>base</code>,
+then <code>e</code> must be a string to be interpreted as
+an integer numeral in that base.
+The base may be any integer between 2 and 36, inclusive.
+In bases above&nbsp;10, the letter '<code>A</code>' (in either upper or lower case)
+represents&nbsp;10, '<code>B</code>' represents&nbsp;11, and so forth,
+with '<code>Z</code>' representing 35.
+If the string <code>e</code> is not a valid numeral in the given base,
+the function returns <b>fail</b>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-tostring"><code>tostring (v)</code></a></h3>
+
+
+<p>
+Receives a value of any type and
+converts it to a string in a human-readable format.
+
+
+<p>
+If the metatable of <code>v</code> has a <code>__tostring</code> field,
+then <code>tostring</code> calls the corresponding value
+with <code>v</code> as argument,
+and uses the result of the call as its result.
+Otherwise, if the metatable of <code>v</code> has a <code>__name</code> field
+with a string value,
+<code>tostring</code> may use that string in its final result.
+
+
+<p>
+For complete control of how numbers are converted,
+use <a href="#pdf-string.format"><code>string.format</code></a>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-type"><code>type (v)</code></a></h3>
+
+
+<p>
+Returns the type of its only argument, coded as a string.
+The possible results of this function are
+"<code>nil</code>" (a string, not the value <b>nil</b>),
+"<code>number</code>",
+"<code>string</code>",
+"<code>boolean</code>",
+"<code>table</code>",
+"<code>function</code>",
+"<code>thread</code>",
+and "<code>userdata</code>".
+
+
+
+
+<p>
+<hr><h3><a name="pdf-_VERSION"><code>_VERSION</code></a></h3>
+
+
+<p>
+A global variable (not a function) that
+holds a string containing the running Lua version.
+The current value of this variable is "<code>Lua 5.4</code>".
+
+
+
+
+<p>
+<hr><h3><a name="pdf-warn"><code>warn (msg1, &middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Emits a warning with a message composed by the concatenation
+of all its arguments (which should be strings).
+
+
+<p>
+By convention,
+a one-piece message starting with '<code>@</code>'
+is intended to be a <em>control message</em>,
+which is a message to the warning system itself.
+In particular, the standard warning function in Lua
+recognizes the control messages "<code>@off</code>",
+to stop the emission of warnings,
+and "<code>@on</code>", to (re)start the emission;
+it ignores unknown control messages.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-xpcall"><code>xpcall (f, msgh [, arg1, &middot;&middot;&middot;])</code></a></h3>
+
+
+<p>
+This function is similar to <a href="#pdf-pcall"><code>pcall</code></a>,
+except that it sets a new message handler <code>msgh</code>.
+
+
+
+
+
+
+
+<h2>6.2 &ndash; <a name="6.2">Coroutine Manipulation</a></h2>
+
+<p>
+This library comprises the operations to manipulate coroutines,
+which come inside the table <a name="pdf-coroutine"><code>coroutine</code></a>.
+See <a href="#2.6">&sect;2.6</a> for a general description of coroutines.
+
+
+<p>
+<hr><h3><a name="pdf-coroutine.close"><code>coroutine.close (co)</code></a></h3>
+
+
+<p>
+Closes coroutine <code>co</code>,
+that is,
+closes all its pending to-be-closed variables
+and puts the coroutine in a dead state.
+The given coroutine must be dead or suspended.
+In case of error
+(either the original error that stopped the coroutine or
+errors in closing methods),
+returns <b>false</b> plus the error object;
+otherwise returns <b>true</b>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-coroutine.create"><code>coroutine.create (f)</code></a></h3>
+
+
+<p>
+Creates a new coroutine, with body <code>f</code>.
+<code>f</code> must be a function.
+Returns this new coroutine,
+an object with type <code>"thread"</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-coroutine.isyieldable"><code>coroutine.isyieldable ([co])</code></a></h3>
+
+
+<p>
+Returns <b>true</b> when the coroutine <code>co</code> can yield.
+The default for <code>co</code> is the running coroutine.
+
+
+<p>
+A coroutine is yieldable if it is not the main thread and
+it is not inside a non-yieldable C&nbsp;function.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-coroutine.resume"><code>coroutine.resume (co [, val1, &middot;&middot;&middot;])</code></a></h3>
+
+
+<p>
+Starts or continues the execution of coroutine <code>co</code>.
+The first time you resume a coroutine,
+it starts running its body.
+The values <code>val1</code>, ... are passed
+as the arguments to the body function.
+If the coroutine has yielded,
+<code>resume</code> restarts it;
+the values <code>val1</code>, ... are passed
+as the results from the yield.
+
+
+<p>
+If the coroutine runs without any errors,
+<code>resume</code> returns <b>true</b> plus any values passed to <code>yield</code>
+(when the coroutine yields) or any values returned by the body function
+(when the coroutine terminates).
+If there is any error,
+<code>resume</code> returns <b>false</b> plus the error message.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-coroutine.running"><code>coroutine.running ()</code></a></h3>
+
+
+<p>
+Returns the running coroutine plus a boolean,
+<b>true</b> when the running coroutine is the main one.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-coroutine.status"><code>coroutine.status (co)</code></a></h3>
+
+
+<p>
+Returns the status of the coroutine <code>co</code>, as a string:
+<code>"running"</code>,
+if the coroutine is running
+(that is, it is the one that called <code>status</code>);
+<code>"suspended"</code>, if the coroutine is suspended in a call to <code>yield</code>,
+or if it has not started running yet;
+<code>"normal"</code> if the coroutine is active but not running
+(that is, it has resumed another coroutine);
+and <code>"dead"</code> if the coroutine has finished its body function,
+or if it has stopped with an error.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-coroutine.wrap"><code>coroutine.wrap (f)</code></a></h3>
+
+
+<p>
+Creates a new coroutine, with body <code>f</code>;
+<code>f</code> must be a function.
+Returns a function that resumes the coroutine each time it is called.
+Any arguments passed to this function behave as the
+extra arguments to <code>resume</code>.
+The function returns the same values returned by <code>resume</code>,
+except the first boolean.
+In case of error,
+the function closes the coroutine and propagates the error.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-coroutine.yield"><code>coroutine.yield (&middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Suspends the execution of the calling coroutine.
+Any arguments to <code>yield</code> are passed as extra results to <code>resume</code>.
+
+
+
+
+
+
+
+<h2>6.3 &ndash; <a name="6.3">Modules</a></h2>
+
+<p>
+The package library provides basic
+facilities for loading modules in Lua.
+It exports one function directly in the global environment:
+<a href="#pdf-require"><code>require</code></a>.
+Everything else is exported in the table <a name="pdf-package"><code>package</code></a>.
+
+
+<p>
+<hr><h3><a name="pdf-require"><code>require (modname)</code></a></h3>
+
+
+<p>
+Loads the given module.
+The function starts by looking into the <a href="#pdf-package.loaded"><code>package.loaded</code></a> table
+to determine whether <code>modname</code> is already loaded.
+If it is, then <code>require</code> returns the value stored
+at <code>package.loaded[modname]</code>.
+(The absence of a second result in this case
+signals that this call did not have to load the module.)
+Otherwise, it tries to find a <em>loader</em> for the module.
+
+
+<p>
+To find a loader,
+<code>require</code> is guided by the table <a href="#pdf-package.searchers"><code>package.searchers</code></a>.
+Each item in this table is a search function,
+that searches for the module in a particular way.
+By changing this table,
+we can change how <code>require</code> looks for a module.
+The following explanation is based on the default configuration
+for <a href="#pdf-package.searchers"><code>package.searchers</code></a>.
+
+
+<p>
+First <code>require</code> queries <code>package.preload[modname]</code>.
+If it has a value,
+this value (which must be a function) is the loader.
+Otherwise <code>require</code> searches for a Lua loader using the
+path stored in <a href="#pdf-package.path"><code>package.path</code></a>.
+If that also fails, it searches for a C&nbsp;loader using the
+path stored in <a href="#pdf-package.cpath"><code>package.cpath</code></a>.
+If that also fails,
+it tries an <em>all-in-one</em> loader (see <a href="#pdf-package.searchers"><code>package.searchers</code></a>).
+
+
+<p>
+Once a loader is found,
+<code>require</code> calls the loader with two arguments:
+<code>modname</code> and an extra value,
+a <em>loader data</em>,
+also returned by the searcher.
+The loader data can be any value useful to the module;
+for the default searchers,
+it indicates where the loader was found.
+(For instance, if the loader came from a file,
+this extra value is the file path.)
+If the loader returns any non-nil value,
+<code>require</code> assigns the returned value to <code>package.loaded[modname]</code>.
+If the loader does not return a non-nil value and
+has not assigned any value to <code>package.loaded[modname]</code>,
+then <code>require</code> assigns <b>true</b> to this entry.
+In any case, <code>require</code> returns the
+final value of <code>package.loaded[modname]</code>.
+Besides that value, <code>require</code> also returns as a second result
+the loader data returned by the searcher,
+which indicates how <code>require</code> found the module.
+
+
+<p>
+If there is any error loading or running the module,
+or if it cannot find any loader for the module,
+then <code>require</code> raises an error.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-package.config"><code>package.config</code></a></h3>
+
+
+<p>
+A string describing some compile-time configurations for packages.
+This string is a sequence of lines:
+
+<ul>
+
+<li>The first line is the directory separator string.
+Default is '<code>\</code>' for Windows and '<code>/</code>' for all other systems.</li>
+
+<li>The second line is the character that separates templates in a path.
+Default is '<code>;</code>'.</li>
+
+<li>The third line is the string that marks the
+substitution points in a template.
+Default is '<code>?</code>'.</li>
+
+<li>The fourth line is a string that, in a path in Windows,
+is replaced by the executable's directory.
+Default is '<code>!</code>'.</li>
+
+<li>The fifth line is a mark to ignore all text after it
+when building the <code>luaopen_</code> function name.
+Default is '<code>-</code>'.</li>
+
+</ul>
+
+
+
+<p>
+<hr><h3><a name="pdf-package.cpath"><code>package.cpath</code></a></h3>
+
+
+<p>
+A string with the path used by <a href="#pdf-require"><code>require</code></a>
+to search for a C&nbsp;loader.
+
+
+<p>
+Lua initializes the C&nbsp;path <a href="#pdf-package.cpath"><code>package.cpath</code></a> in the same way
+it initializes the Lua path <a href="#pdf-package.path"><code>package.path</code></a>,
+using the environment variable <a name="pdf-LUA_CPATH_5_4"><code>LUA_CPATH_5_4</code></a>,
+or the environment variable <a name="pdf-LUA_CPATH"><code>LUA_CPATH</code></a>,
+or a default path defined in <code>luaconf.h</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-package.loaded"><code>package.loaded</code></a></h3>
+
+
+<p>
+A table used by <a href="#pdf-require"><code>require</code></a> to control which
+modules are already loaded.
+When you require a module <code>modname</code> and
+<code>package.loaded[modname]</code> is not false,
+<a href="#pdf-require"><code>require</code></a> simply returns the value stored there.
+
+
+<p>
+This variable is only a reference to the real table;
+assignments to this variable do not change the
+table used by <a href="#pdf-require"><code>require</code></a>.
+The real table is stored in the C registry (see <a href="#4.3">&sect;4.3</a>),
+indexed by the key <a name="pdf-LUA_LOADED_TABLE"><code>LUA_LOADED_TABLE</code></a>, a string.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-package.loadlib"><code>package.loadlib (libname, funcname)</code></a></h3>
+
+
+<p>
+Dynamically links the host program with the C&nbsp;library <code>libname</code>.
+
+
+<p>
+If <code>funcname</code> is "<code>*</code>",
+then it only links with the library,
+making the symbols exported by the library
+available to other dynamically linked libraries.
+Otherwise,
+it looks for a function <code>funcname</code> inside the library
+and returns this function as a C&nbsp;function.
+So, <code>funcname</code> must follow the <a href="#lua_CFunction"><code>lua_CFunction</code></a> prototype
+(see <a href="#lua_CFunction"><code>lua_CFunction</code></a>).
+
+
+<p>
+This is a low-level function.
+It completely bypasses the package and module system.
+Unlike <a href="#pdf-require"><code>require</code></a>,
+it does not perform any path searching and
+does not automatically adds extensions.
+<code>libname</code> must be the complete file name of the C&nbsp;library,
+including if necessary a path and an extension.
+<code>funcname</code> must be the exact name exported by the C&nbsp;library
+(which may depend on the C&nbsp;compiler and linker used).
+
+
+<p>
+This functionality is not supported by ISO&nbsp;C.
+As such, it is only available on some platforms
+(Windows, Linux, Mac OS X, Solaris, BSD,
+plus other Unix systems that support the <code>dlfcn</code> standard).
+
+
+<p>
+This function is inherently insecure,
+as it allows Lua to call any function in any readable dynamic
+library in the system.
+(Lua calls any function assuming the function
+has a proper prototype and respects a proper protocol
+(see <a href="#lua_CFunction"><code>lua_CFunction</code></a>).
+Therefore,
+calling an arbitrary function in an arbitrary dynamic library
+more often than not results in an access violation.)
+
+
+
+
+<p>
+<hr><h3><a name="pdf-package.path"><code>package.path</code></a></h3>
+
+
+<p>
+A string with the path used by <a href="#pdf-require"><code>require</code></a>
+to search for a Lua loader.
+
+
+<p>
+At start-up, Lua initializes this variable with
+the value of the environment variable <a name="pdf-LUA_PATH_5_4"><code>LUA_PATH_5_4</code></a> or
+the environment variable <a name="pdf-LUA_PATH"><code>LUA_PATH</code></a> or
+with a default path defined in <code>luaconf.h</code>,
+if those environment variables are not defined.
+A "<code>;;</code>" in the value of the environment variable
+is replaced by the default path.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-package.preload"><code>package.preload</code></a></h3>
+
+
+<p>
+A table to store loaders for specific modules
+(see <a href="#pdf-require"><code>require</code></a>).
+
+
+<p>
+This variable is only a reference to the real table;
+assignments to this variable do not change the
+table used by <a href="#pdf-require"><code>require</code></a>.
+The real table is stored in the C registry (see <a href="#4.3">&sect;4.3</a>),
+indexed by the key <a name="pdf-LUA_PRELOAD_TABLE"><code>LUA_PRELOAD_TABLE</code></a>, a string.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-package.searchers"><code>package.searchers</code></a></h3>
+
+
+<p>
+A table used by <a href="#pdf-require"><code>require</code></a> to control how to find modules.
+
+
+<p>
+Each entry in this table is a <em>searcher function</em>.
+When looking for a module,
+<a href="#pdf-require"><code>require</code></a> calls each of these searchers in ascending order,
+with the module name (the argument given to <a href="#pdf-require"><code>require</code></a>) as its
+sole argument.
+If the searcher finds the module,
+it returns another function, the module <em>loader</em>,
+plus an extra value, a <em>loader data</em>,
+that will be passed to that loader and
+returned as a second result by <a href="#pdf-require"><code>require</code></a>.
+If it cannot find the module,
+it returns a string explaining why
+(or <b>nil</b> if it has nothing to say).
+
+
+<p>
+Lua initializes this table with four searcher functions.
+
+
+<p>
+The first searcher simply looks for a loader in the
+<a href="#pdf-package.preload"><code>package.preload</code></a> table.
+
+
+<p>
+The second searcher looks for a loader as a Lua library,
+using the path stored at <a href="#pdf-package.path"><code>package.path</code></a>.
+The search is done as described in function <a href="#pdf-package.searchpath"><code>package.searchpath</code></a>.
+
+
+<p>
+The third searcher looks for a loader as a C&nbsp;library,
+using the path given by the variable <a href="#pdf-package.cpath"><code>package.cpath</code></a>.
+Again,
+the search is done as described in function <a href="#pdf-package.searchpath"><code>package.searchpath</code></a>.
+For instance,
+if the C&nbsp;path is the string
+
+<pre>
+     "./?.so;./?.dll;/usr/local/?/init.so"
+</pre><p>
+the searcher for module <code>foo</code>
+will try to open the files <code>./foo.so</code>, <code>./foo.dll</code>,
+and <code>/usr/local/foo/init.so</code>, in that order.
+Once it finds a C&nbsp;library,
+this searcher first uses a dynamic link facility to link the
+application with the library.
+Then it tries to find a C&nbsp;function inside the library to
+be used as the loader.
+The name of this C&nbsp;function is the string "<code>luaopen_</code>"
+concatenated with a copy of the module name where each dot
+is replaced by an underscore.
+Moreover, if the module name has a hyphen,
+its suffix after (and including) the first hyphen is removed.
+For instance, if the module name is <code>a.b.c-v2.1</code>,
+the function name will be <code>luaopen_a_b_c</code>.
+
+
+<p>
+The fourth searcher tries an <em>all-in-one loader</em>.
+It searches the C&nbsp;path for a library for
+the root name of the given module.
+For instance, when requiring <code>a.b.c</code>,
+it will search for a C&nbsp;library for <code>a</code>.
+If found, it looks into it for an open function for
+the submodule;
+in our example, that would be <code>luaopen_a_b_c</code>.
+With this facility, a package can pack several C&nbsp;submodules
+into one single library,
+with each submodule keeping its original open function.
+
+
+<p>
+All searchers except the first one (preload) return as the extra value
+the file path where the module was found,
+as returned by <a href="#pdf-package.searchpath"><code>package.searchpath</code></a>.
+The first searcher always returns the string "<code>:preload:</code>".
+
+
+<p>
+Searchers should raise no errors and have no side effects in Lua.
+(They may have side effects in C,
+for instance by linking the application with a library.)
+
+
+
+
+<p>
+<hr><h3><a name="pdf-package.searchpath"><code>package.searchpath (name, path [, sep [, rep]])</code></a></h3>
+
+
+<p>
+Searches for the given <code>name</code> in the given <code>path</code>.
+
+
+<p>
+A path is a string containing a sequence of
+<em>templates</em> separated by semicolons.
+For each template,
+the function replaces each interrogation mark (if any)
+in the template with a copy of <code>name</code>
+wherein all occurrences of <code>sep</code>
+(a dot, by default)
+were replaced by <code>rep</code>
+(the system's directory separator, by default),
+and then tries to open the resulting file name.
+
+
+<p>
+For instance, if the path is the string
+
+<pre>
+     "./?.lua;./?.lc;/usr/local/?/init.lua"
+</pre><p>
+the search for the name <code>foo.a</code>
+will try to open the files
+<code>./foo/a.lua</code>, <code>./foo/a.lc</code>, and
+<code>/usr/local/foo/a/init.lua</code>, in that order.
+
+
+<p>
+Returns the resulting name of the first file that it can
+open in read mode (after closing the file),
+or <b>fail</b> plus an error message if none succeeds.
+(This error message lists all file names it tried to open.)
+
+
+
+
+
+
+
+<h2>6.4 &ndash; <a name="6.4">String Manipulation</a></h2>
+
+
+
+<p>
+This library provides generic functions for string manipulation,
+such as finding and extracting substrings, and pattern matching.
+When indexing a string in Lua, the first character is at position&nbsp;1
+(not at&nbsp;0, as in C).
+Indices are allowed to be negative and are interpreted as indexing backwards,
+from the end of the string.
+Thus, the last character is at position -1, and so on.
+
+
+<p>
+The string library provides all its functions inside the table
+<a name="pdf-string"><code>string</code></a>.
+It also sets a metatable for strings
+where the <code>__index</code> field points to the <code>string</code> table.
+Therefore, you can use the string functions in object-oriented style.
+For instance, <code>string.byte(s,i)</code>
+can be written as <code>s:byte(i)</code>.
+
+
+<p>
+The string library assumes one-byte character encodings.
+
+
+<p>
+<hr><h3><a name="pdf-string.byte"><code>string.byte (s [, i [, j]])</code></a></h3>
+Returns the internal numeric codes of the characters <code>s[i]</code>,
+<code>s[i+1]</code>, ..., <code>s[j]</code>.
+The default value for <code>i</code> is&nbsp;1;
+the default value for <code>j</code> is&nbsp;<code>i</code>.
+These indices are corrected
+following the same rules of function <a href="#pdf-string.sub"><code>string.sub</code></a>.
+
+
+<p>
+Numeric codes are not necessarily portable across platforms.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.char"><code>string.char (&middot;&middot;&middot;)</code></a></h3>
+Receives zero or more integers.
+Returns a string with length equal to the number of arguments,
+in which each character has the internal numeric code equal
+to its corresponding argument.
+
+
+<p>
+Numeric codes are not necessarily portable across platforms.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.dump"><code>string.dump (function [, strip])</code></a></h3>
+
+
+<p>
+Returns a string containing a binary representation
+(a <em>binary chunk</em>)
+of the given function,
+so that a later <a href="#pdf-load"><code>load</code></a> on this string returns
+a copy of the function (but with new upvalues).
+If <code>strip</code> is a true value,
+the binary representation may not include all debug information
+about the function,
+to save space.
+
+
+<p>
+Functions with upvalues have only their number of upvalues saved.
+When (re)loaded,
+those upvalues receive fresh instances.
+(See the <a href="#pdf-load"><code>load</code></a> function for details about
+how these upvalues are initialized.
+You can use the debug library to serialize
+and reload the upvalues of a function
+in a way adequate to your needs.)
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.find"><code>string.find (s, pattern [, init [, plain]])</code></a></h3>
+
+
+<p>
+Looks for the first match of
+<code>pattern</code> (see <a href="#6.4.1">&sect;6.4.1</a>) in the string <code>s</code>.
+If it finds a match, then <code>find</code> returns the indices of&nbsp;<code>s</code>
+where this occurrence starts and ends;
+otherwise, it returns <b>fail</b>.
+A third, optional numeric argument <code>init</code> specifies
+where to start the search;
+its default value is&nbsp;1 and can be negative.
+A <b>true</b> as a fourth, optional argument <code>plain</code>
+turns off the pattern matching facilities,
+so the function does a plain "find substring" operation,
+with no characters in <code>pattern</code> being considered magic.
+
+
+<p>
+If the pattern has captures,
+then in a successful match
+the captured values are also returned,
+after the two indices.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.format"><code>string.format (formatstring, &middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Returns a formatted version of its variable number of arguments
+following the description given in its first argument,
+which must be a string.
+The format string follows the same rules as the ISO&nbsp;C function <code>sprintf</code>.
+The only differences are that the conversion specifiers and modifiers
+<code>F</code>, <code>n</code>, <code>*</code>, <code>h</code>, <code>L</code>, and <code>l</code> are not supported
+and that there is an extra specifier, <code>q</code>.
+Both width and precision, when present,
+are limited to two digits.
+
+
+<p>
+The specifier <code>q</code> formats booleans, nil, numbers, and strings
+in a way that the result is a valid constant in Lua source code.
+Booleans and nil are written in the obvious way
+(<code>true</code>, <code>false</code>, <code>nil</code>).
+Floats are written in hexadecimal,
+to preserve full precision.
+A string is written between double quotes,
+using escape sequences when necessary to ensure that
+it can safely be read back by the Lua interpreter.
+For instance, the call
+
+<pre>
+     string.format('%q', 'a string with "quotes" and \n new line')
+</pre><p>
+may produce the string:
+
+<pre>
+     "a string with \"quotes\" and \
+      new line"
+</pre><p>
+This specifier does not support modifiers (flags, width, precision).
+
+
+<p>
+The conversion specifiers
+<code>A</code>, <code>a</code>, <code>E</code>, <code>e</code>, <code>f</code>,
+<code>G</code>, and <code>g</code> all expect a number as argument.
+The specifiers <code>c</code>, <code>d</code>,
+<code>i</code>, <code>o</code>, <code>u</code>, <code>X</code>, and <code>x</code>
+expect an integer.
+When Lua is compiled with a C89 compiler,
+the specifiers <code>A</code> and <code>a</code> (hexadecimal floats)
+do not support modifiers.
+
+
+<p>
+The specifier <code>s</code> expects a string;
+if its argument is not a string,
+it is converted to one following the same rules of <a href="#pdf-tostring"><code>tostring</code></a>.
+If the specifier has any modifier,
+the corresponding string argument should not contain embedded zeros.
+
+
+<p>
+The specifier <code>p</code> formats the pointer
+returned by <a href="#lua_topointer"><code>lua_topointer</code></a>.
+That gives a unique string identifier for tables, userdata,
+threads, strings, and functions.
+For other values (numbers, nil, booleans),
+this specifier results in a string representing
+the pointer <code>NULL</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.gmatch"><code>string.gmatch (s, pattern [, init])</code></a></h3>
+Returns an iterator function that,
+each time it is called,
+returns the next captures from <code>pattern</code> (see <a href="#6.4.1">&sect;6.4.1</a>)
+over the string <code>s</code>.
+If <code>pattern</code> specifies no captures,
+then the whole match is produced in each call.
+A third, optional numeric argument <code>init</code> specifies
+where to start the search;
+its default value is&nbsp;1 and can be negative.
+
+
+<p>
+As an example, the following loop
+will iterate over all the words from string <code>s</code>,
+printing one per line:
+
+<pre>
+     s = "hello world from Lua"
+     for w in string.gmatch(s, "%a+") do
+       print(w)
+     end
+</pre><p>
+The next example collects all pairs <code>key=value</code> from the
+given string into a table:
+
+<pre>
+     t = {}
+     s = "from=world, to=Lua"
+     for k, v in string.gmatch(s, "(%w+)=(%w+)") do
+       t[k] = v
+     end
+</pre>
+
+<p>
+For this function, a caret '<code>^</code>' at the start of a pattern does not
+work as an anchor, as this would prevent the iteration.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.gsub"><code>string.gsub (s, pattern, repl [, n])</code></a></h3>
+Returns a copy of <code>s</code>
+in which all (or the first <code>n</code>, if given)
+occurrences of the <code>pattern</code> (see <a href="#6.4.1">&sect;6.4.1</a>) have been
+replaced by a replacement string specified by <code>repl</code>,
+which can be a string, a table, or a function.
+<code>gsub</code> also returns, as its second value,
+the total number of matches that occurred.
+The name <code>gsub</code> comes from <em>Global SUBstitution</em>.
+
+
+<p>
+If <code>repl</code> is a string, then its value is used for replacement.
+The character&nbsp;<code>%</code> works as an escape character:
+any sequence in <code>repl</code> of the form <code>%<em>d</em></code>,
+with <em>d</em> between 1 and 9,
+stands for the value of the <em>d</em>-th captured substring;
+the sequence <code>%0</code> stands for the whole match;
+the sequence <code>%%</code> stands for a single&nbsp;<code>%</code>.
+
+
+<p>
+If <code>repl</code> is a table, then the table is queried for every match,
+using the first capture as the key.
+
+
+<p>
+If <code>repl</code> is a function, then this function is called every time a
+match occurs, with all captured substrings passed as arguments,
+in order.
+
+
+<p>
+In any case,
+if the pattern specifies no captures,
+then it behaves as if the whole pattern was inside a capture.
+
+
+<p>
+If the value returned by the table query or by the function call
+is a string or a number,
+then it is used as the replacement string;
+otherwise, if it is <b>false</b> or <b>nil</b>,
+then there is no replacement
+(that is, the original match is kept in the string).
+
+
+<p>
+Here are some examples:
+
+<pre>
+     x = string.gsub("hello world", "(%w+)", "%1 %1")
+     --&gt; x="hello hello world world"
+     
+     x = string.gsub("hello world", "%w+", "%0 %0", 1)
+     --&gt; x="hello hello world"
+     
+     x = string.gsub("hello world from Lua", "(%w+)%s*(%w+)", "%2 %1")
+     --&gt; x="world hello Lua from"
+     
+     x = string.gsub("home = $HOME, user = $USER", "%$(%w+)", os.getenv)
+     --&gt; x="home = /home/roberto, user = roberto"
+     
+     x = string.gsub("4+5 = $return 4+5$", "%$(.-)%$", function (s)
+           return load(s)()
+         end)
+     --&gt; x="4+5 = 9"
+     
+     local t = {name="lua", version="5.4"}
+     x = string.gsub("$name-$version.tar.gz", "%$(%w+)", t)
+     --&gt; x="lua-5.4.tar.gz"
+</pre>
+
+
+
+<p>
+<hr><h3><a name="pdf-string.len"><code>string.len (s)</code></a></h3>
+
+
+<p>
+Receives a string and returns its length.
+The empty string <code>""</code> has length 0.
+Embedded zeros are counted,
+so <code>"a\000bc\000"</code> has length 5.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.lower"><code>string.lower (s)</code></a></h3>
+
+
+<p>
+Receives a string and returns a copy of this string with all
+uppercase letters changed to lowercase.
+All other characters are left unchanged.
+The definition of what an uppercase letter is depends on the current locale.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.match"><code>string.match (s, pattern [, init])</code></a></h3>
+
+
+<p>
+Looks for the first <em>match</em> of
+the <code>pattern</code> (see <a href="#6.4.1">&sect;6.4.1</a>) in the string <code>s</code>.
+If it finds one, then <code>match</code> returns
+the captures from the pattern;
+otherwise it returns <b>fail</b>.
+If <code>pattern</code> specifies no captures,
+then the whole match is returned.
+A third, optional numeric argument <code>init</code> specifies
+where to start the search;
+its default value is&nbsp;1 and can be negative.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.pack"><code>string.pack (fmt, v1, v2, &middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Returns a binary string containing the values <code>v1</code>, <code>v2</code>, etc.
+serialized in binary form (packed)
+according to the format string <code>fmt</code> (see <a href="#6.4.2">&sect;6.4.2</a>).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.packsize"><code>string.packsize (fmt)</code></a></h3>
+
+
+<p>
+Returns the length of a string resulting from <a href="#pdf-string.pack"><code>string.pack</code></a>
+with the given format.
+The format string cannot have the variable-length options
+'<code>s</code>' or '<code>z</code>' (see <a href="#6.4.2">&sect;6.4.2</a>).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.rep"><code>string.rep (s, n [, sep])</code></a></h3>
+
+
+<p>
+Returns a string that is the concatenation of <code>n</code> copies of
+the string <code>s</code> separated by the string <code>sep</code>.
+The default value for <code>sep</code> is the empty string
+(that is, no separator).
+Returns the empty string if <code>n</code> is not positive.
+
+
+<p>
+(Note that it is very easy to exhaust the memory of your machine
+with a single call to this function.)
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.reverse"><code>string.reverse (s)</code></a></h3>
+
+
+<p>
+Returns a string that is the string <code>s</code> reversed.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.sub"><code>string.sub (s, i [, j])</code></a></h3>
+
+
+<p>
+Returns the substring of <code>s</code> that
+starts at <code>i</code>  and continues until <code>j</code>;
+<code>i</code> and <code>j</code> can be negative.
+If <code>j</code> is absent, then it is assumed to be equal to -1
+(which is the same as the string length).
+In particular,
+the call <code>string.sub(s,1,j)</code> returns a prefix of <code>s</code>
+with length <code>j</code>,
+and <code>string.sub(s, -i)</code> (for a positive <code>i</code>)
+returns a suffix of <code>s</code>
+with length <code>i</code>.
+
+
+<p>
+If, after the translation of negative indices,
+<code>i</code> is less than 1,
+it is corrected to 1.
+If <code>j</code> is greater than the string length,
+it is corrected to that length.
+If, after these corrections,
+<code>i</code> is greater than <code>j</code>,
+the function returns the empty string.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.unpack"><code>string.unpack (fmt, s [, pos])</code></a></h3>
+
+
+<p>
+Returns the values packed in string <code>s</code> (see <a href="#pdf-string.pack"><code>string.pack</code></a>)
+according to the format string <code>fmt</code> (see <a href="#6.4.2">&sect;6.4.2</a>).
+An optional <code>pos</code> marks where
+to start reading in <code>s</code> (default is 1).
+After the read values,
+this function also returns the index of the first unread byte in <code>s</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-string.upper"><code>string.upper (s)</code></a></h3>
+
+
+<p>
+Receives a string and returns a copy of this string with all
+lowercase letters changed to uppercase.
+All other characters are left unchanged.
+The definition of what a lowercase letter is depends on the current locale.
+
+
+
+
+
+
+
+<h3>6.4.1 &ndash; <a name="6.4.1">Patterns</a></h3>
+
+
+
+<p>
+Patterns in Lua are described by regular strings,
+which are interpreted as patterns by the pattern-matching functions
+<a href="#pdf-string.find"><code>string.find</code></a>,
+<a href="#pdf-string.gmatch"><code>string.gmatch</code></a>,
+<a href="#pdf-string.gsub"><code>string.gsub</code></a>,
+and <a href="#pdf-string.match"><code>string.match</code></a>.
+This section describes the syntax and the meaning
+(that is, what they match) of these strings.
+
+
+
+
+
+<h4>Character Class:</h4><p>
+A <em>character class</em> is used to represent a set of characters.
+The following combinations are allowed in describing a character class:
+
+<ul>
+
+<li><b><em>x</em>: </b>
+(where <em>x</em> is not one of the <em>magic characters</em>
+<code>^$()%.[]*+-?</code>)
+represents the character <em>x</em> itself.
+</li>
+
+<li><b><code>.</code>: </b> (a dot) represents all characters.</li>
+
+<li><b><code>%a</code>: </b> represents all letters.</li>
+
+<li><b><code>%c</code>: </b> represents all control characters.</li>
+
+<li><b><code>%d</code>: </b> represents all digits.</li>
+
+<li><b><code>%g</code>: </b> represents all printable characters except space.</li>
+
+<li><b><code>%l</code>: </b> represents all lowercase letters.</li>
+
+<li><b><code>%p</code>: </b> represents all punctuation characters.</li>
+
+<li><b><code>%s</code>: </b> represents all space characters.</li>
+
+<li><b><code>%u</code>: </b> represents all uppercase letters.</li>
+
+<li><b><code>%w</code>: </b> represents all alphanumeric characters.</li>
+
+<li><b><code>%x</code>: </b> represents all hexadecimal digits.</li>
+
+<li><b><code>%<em>x</em></code>: </b> (where <em>x</em> is any non-alphanumeric character)
+represents the character <em>x</em>.
+This is the standard way to escape the magic characters.
+Any non-alphanumeric character
+(including all punctuation characters, even the non-magical)
+can be preceded by a '<code>%</code>' to represent itself in a pattern.
+</li>
+
+<li><b><code>[<em>set</em>]</code>: </b>
+represents the class which is the union of all
+characters in <em>set</em>.
+A range of characters can be specified by
+separating the end characters of the range,
+in ascending order, with a '<code>-</code>'.
+All classes <code>%</code><em>x</em> described above can also be used as
+components in <em>set</em>.
+All other characters in <em>set</em> represent themselves.
+For example, <code>[%w_]</code> (or <code>[_%w]</code>)
+represents all alphanumeric characters plus the underscore,
+<code>[0-7]</code> represents the octal digits,
+and <code>[0-7%l%-]</code> represents the octal digits plus
+the lowercase letters plus the '<code>-</code>' character.
+
+
+<p>
+You can put a closing square bracket in a set
+by positioning it as the first character in the set.
+You can put a hyphen in a set
+by positioning it as the first or the last character in the set.
+(You can also use an escape for both cases.)
+
+
+<p>
+The interaction between ranges and classes is not defined.
+Therefore, patterns like <code>[%a-z]</code> or <code>[a-%%]</code>
+have no meaning.
+</li>
+
+<li><b><code>[^<em>set</em>]</code>: </b>
+represents the complement of <em>set</em>,
+where <em>set</em> is interpreted as above.
+</li>
+
+</ul><p>
+For all classes represented by single letters (<code>%a</code>, <code>%c</code>, etc.),
+the corresponding uppercase letter represents the complement of the class.
+For instance, <code>%S</code> represents all non-space characters.
+
+
+<p>
+The definitions of letter, space, and other character groups
+depend on the current locale.
+In particular, the class <code>[a-z]</code> may not be equivalent to <code>%l</code>.
+
+
+
+
+
+<h4>Pattern Item:</h4><p>
+A <em>pattern item</em> can be
+
+<ul>
+
+<li>
+a single character class,
+which matches any single character in the class;
+</li>
+
+<li>
+a single character class followed by '<code>*</code>',
+which matches sequences of zero or more characters in the class.
+These repetition items will always match the longest possible sequence;
+</li>
+
+<li>
+a single character class followed by '<code>+</code>',
+which matches sequences of one or more characters in the class.
+These repetition items will always match the longest possible sequence;
+</li>
+
+<li>
+a single character class followed by '<code>-</code>',
+which also matches sequences of zero or more characters in the class.
+Unlike '<code>*</code>',
+these repetition items will always match the shortest possible sequence;
+</li>
+
+<li>
+a single character class followed by '<code>?</code>',
+which matches zero or one occurrence of a character in the class.
+It always matches one occurrence if possible;
+</li>
+
+<li>
+<code>%<em>n</em></code>, for <em>n</em> between 1 and 9;
+such item matches a substring equal to the <em>n</em>-th captured string
+(see below);
+</li>
+
+<li>
+<code>%b<em>xy</em></code>, where <em>x</em> and <em>y</em> are two distinct characters;
+such item matches strings that start with&nbsp;<em>x</em>, end with&nbsp;<em>y</em>,
+and where the <em>x</em> and <em>y</em> are <em>balanced</em>.
+This means that, if one reads the string from left to right,
+counting <em>+1</em> for an <em>x</em> and <em>-1</em> for a <em>y</em>,
+the ending <em>y</em> is the first <em>y</em> where the count reaches 0.
+For instance, the item <code>%b()</code> matches expressions with
+balanced parentheses.
+</li>
+
+<li>
+<code>%f[<em>set</em>]</code>, a <em>frontier pattern</em>;
+such item matches an empty string at any position such that
+the next character belongs to <em>set</em>
+and the previous character does not belong to <em>set</em>.
+The set <em>set</em> is interpreted as previously described.
+The beginning and the end of the subject are handled as if
+they were the character '<code>\0</code>'.
+</li>
+
+</ul>
+
+
+
+
+<h4>Pattern:</h4><p>
+A <em>pattern</em> is a sequence of pattern items.
+A caret '<code>^</code>' at the beginning of a pattern anchors the match at the
+beginning of the subject string.
+A '<code>$</code>' at the end of a pattern anchors the match at the
+end of the subject string.
+At other positions,
+'<code>^</code>' and '<code>$</code>' have no special meaning and represent themselves.
+
+
+
+
+
+<h4>Captures:</h4><p>
+A pattern can contain sub-patterns enclosed in parentheses;
+they describe <em>captures</em>.
+When a match succeeds, the substrings of the subject string
+that match captures are stored (<em>captured</em>) for future use.
+Captures are numbered according to their left parentheses.
+For instance, in the pattern <code>"(a*(.)%w(%s*))"</code>,
+the part of the string matching <code>"a*(.)%w(%s*)"</code> is
+stored as the first capture, and therefore has number&nbsp;1;
+the character matching "<code>.</code>" is captured with number&nbsp;2,
+and the part matching "<code>%s*</code>" has number&nbsp;3.
+
+
+<p>
+As a special case, the capture <code>()</code> captures
+the current string position (a number).
+For instance, if we apply the pattern <code>"()aa()"</code> on the
+string <code>"flaaap"</code>, there will be two captures: 3&nbsp;and&nbsp;5.
+
+
+
+
+
+<h4>Multiple matches:</h4><p>
+The function <a href="#pdf-string.gsub"><code>string.gsub</code></a> and the iterator <a href="#pdf-string.gmatch"><code>string.gmatch</code></a>
+match multiple occurrences of the given pattern in the subject.
+For these functions,
+a new match is considered valid only
+if it ends at least one byte after the end of the previous match.
+In other words, the pattern machine never accepts the
+empty string as a match immediately after another match.
+As an example,
+consider the results of the following code:
+
+<pre>
+     &gt; string.gsub("abc", "()a*()", print);
+     --&gt; 1   2
+     --&gt; 3   3
+     --&gt; 4   4
+</pre><p>
+The second and third results come from Lua matching an empty
+string after '<code>b</code>' and another one after '<code>c</code>'.
+Lua does not match an empty string after '<code>a</code>',
+because it would end at the same position of the previous match.
+
+
+
+
+
+
+
+<h3>6.4.2 &ndash; <a name="6.4.2">Format Strings for Pack and Unpack</a></h3>
+
+<p>
+The first argument to <a href="#pdf-string.pack"><code>string.pack</code></a>,
+<a href="#pdf-string.packsize"><code>string.packsize</code></a>, and <a href="#pdf-string.unpack"><code>string.unpack</code></a>
+is a format string,
+which describes the layout of the structure being created or read.
+
+
+<p>
+A format string is a sequence of conversion options.
+The conversion options are as follows:
+
+<ul>
+<li><b><code>&lt;</code>: </b>sets little endian</li>
+<li><b><code>&gt;</code>: </b>sets big endian</li>
+<li><b><code>=</code>: </b>sets native endian</li>
+<li><b><code>![<em>n</em>]</code>: </b>sets maximum alignment to <code>n</code>
+(default is native alignment)</li>
+<li><b><code>b</code>: </b>a signed byte (<code>char</code>)</li>
+<li><b><code>B</code>: </b>an unsigned byte (<code>char</code>)</li>
+<li><b><code>h</code>: </b>a signed <code>short</code> (native size)</li>
+<li><b><code>H</code>: </b>an unsigned <code>short</code> (native size)</li>
+<li><b><code>l</code>: </b>a signed <code>long</code> (native size)</li>
+<li><b><code>L</code>: </b>an unsigned <code>long</code> (native size)</li>
+<li><b><code>j</code>: </b>a <code>lua_Integer</code></li>
+<li><b><code>J</code>: </b>a <code>lua_Unsigned</code></li>
+<li><b><code>T</code>: </b>a <code>size_t</code> (native size)</li>
+<li><b><code>i[<em>n</em>]</code>: </b>a signed <code>int</code> with <code>n</code> bytes
+(default is native size)</li>
+<li><b><code>I[<em>n</em>]</code>: </b>an unsigned <code>int</code> with <code>n</code> bytes
+(default is native size)</li>
+<li><b><code>f</code>: </b>a <code>float</code> (native size)</li>
+<li><b><code>d</code>: </b>a <code>double</code> (native size)</li>
+<li><b><code>n</code>: </b>a <code>lua_Number</code></li>
+<li><b><code>c<em>n</em></code>: </b>a fixed-sized string with <code>n</code> bytes</li>
+<li><b><code>z</code>: </b>a zero-terminated string</li>
+<li><b><code>s[<em>n</em>]</code>: </b>a string preceded by its length
+coded as an unsigned integer with <code>n</code> bytes
+(default is a <code>size_t</code>)</li>
+<li><b><code>x</code>: </b>one byte of padding</li>
+<li><b><code>X<em>op</em></code>: </b>an empty item that aligns
+according to option <code>op</code>
+(which is otherwise ignored)</li>
+<li><b>'<code> </code>': </b>(space) ignored</li>
+</ul><p>
+(A "<code>[<em>n</em>]</code>" means an optional integral numeral.)
+Except for padding, spaces, and configurations
+(options "<code>xX &lt;=&gt;!</code>"),
+each option corresponds to an argument in <a href="#pdf-string.pack"><code>string.pack</code></a>
+or a result in <a href="#pdf-string.unpack"><code>string.unpack</code></a>.
+
+
+<p>
+For options "<code>!<em>n</em></code>", "<code>s<em>n</em></code>", "<code>i<em>n</em></code>", and "<code>I<em>n</em></code>",
+<code>n</code> can be any integer between 1 and 16.
+All integral options check overflows;
+<a href="#pdf-string.pack"><code>string.pack</code></a> checks whether the given value fits in the given size;
+<a href="#pdf-string.unpack"><code>string.unpack</code></a> checks whether the read value fits in a Lua integer.
+For the unsigned options,
+Lua integers are treated as unsigned values too.
+
+
+<p>
+Any format string starts as if prefixed by "<code>!1=</code>",
+that is,
+with maximum alignment of 1 (no alignment)
+and native endianness.
+
+
+<p>
+Native endianness assumes that the whole system is
+either big or little endian.
+The packing functions will not emulate correctly the behavior
+of mixed-endian formats.
+
+
+<p>
+Alignment works as follows:
+For each option,
+the format gets extra padding until the data starts
+at an offset that is a multiple of the minimum between the
+option size and the maximum alignment;
+this minimum must be a power of 2.
+Options "<code>c</code>" and "<code>z</code>" are not aligned;
+option "<code>s</code>" follows the alignment of its starting integer.
+
+
+<p>
+All padding is filled with zeros by <a href="#pdf-string.pack"><code>string.pack</code></a>
+and ignored by <a href="#pdf-string.unpack"><code>string.unpack</code></a>.
+
+
+
+
+
+
+
+<h2>6.5 &ndash; <a name="6.5">UTF-8 Support</a></h2>
+
+<p>
+This library provides basic support for UTF-8 encoding.
+It provides all its functions inside the table <a name="pdf-utf8"><code>utf8</code></a>.
+This library does not provide any support for Unicode other
+than the handling of the encoding.
+Any operation that needs the meaning of a character,
+such as character classification, is outside its scope.
+
+
+<p>
+Unless stated otherwise,
+all functions that expect a byte position as a parameter
+assume that the given position is either the start of a byte sequence
+or one plus the length of the subject string.
+As in the string library,
+negative indices count from the end of the string.
+
+
+<p>
+Functions that create byte sequences
+accept all values up to <code>0x7FFFFFFF</code>,
+as defined in the original UTF-8 specification;
+that implies byte sequences of up to six bytes.
+
+
+<p>
+Functions that interpret byte sequences only accept
+valid sequences (well formed and not overlong).
+By default, they only accept byte sequences
+that result in valid Unicode code points,
+rejecting values greater than <code>10FFFF</code> and surrogates.
+A boolean argument <code>lax</code>, when available,
+lifts these checks,
+so that all values up to <code>0x7FFFFFFF</code> are accepted.
+(Not well formed and overlong sequences are still rejected.)
+
+
+<p>
+<hr><h3><a name="pdf-utf8.char"><code>utf8.char (&middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Receives zero or more integers,
+converts each one to its corresponding UTF-8 byte sequence
+and returns a string with the concatenation of all these sequences.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-utf8.charpattern"><code>utf8.charpattern</code></a></h3>
+
+
+<p>
+The pattern (a string, not a function) "<code>[\0-\x7F\xC2-\xFD][\x80-\xBF]*</code>"
+(see <a href="#6.4.1">&sect;6.4.1</a>),
+which matches exactly one UTF-8 byte sequence,
+assuming that the subject is a valid UTF-8 string.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-utf8.codes"><code>utf8.codes (s [, lax])</code></a></h3>
+
+
+<p>
+Returns values so that the construction
+
+<pre>
+     for p, c in utf8.codes(s) do <em>body</em> end
+</pre><p>
+will iterate over all UTF-8 characters in string <code>s</code>,
+with <code>p</code> being the position (in bytes) and <code>c</code> the code point
+of each character.
+It raises an error if it meets any invalid byte sequence.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-utf8.codepoint"><code>utf8.codepoint (s [, i [, j [, lax]]])</code></a></h3>
+
+
+<p>
+Returns the code points (as integers) from all characters in <code>s</code>
+that start between byte position <code>i</code> and <code>j</code> (both included).
+The default for <code>i</code> is 1 and for <code>j</code> is <code>i</code>.
+It raises an error if it meets any invalid byte sequence.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-utf8.len"><code>utf8.len (s [, i [, j [, lax]]])</code></a></h3>
+
+
+<p>
+Returns the number of UTF-8 characters in string <code>s</code>
+that start between positions <code>i</code> and <code>j</code> (both inclusive).
+The default for <code>i</code> is 1 and for <code>j</code> is -1.
+If it finds any invalid byte sequence,
+returns <b>fail</b> plus the position of the first invalid byte.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-utf8.offset"><code>utf8.offset (s, n [, i])</code></a></h3>
+
+
+<p>
+Returns the position (in bytes) where the encoding of the
+<code>n</code>-th character of <code>s</code>
+(counting from position <code>i</code>) starts.
+A negative <code>n</code> gets characters before position <code>i</code>.
+The default for <code>i</code> is 1 when <code>n</code> is non-negative
+and <code>#s + 1</code> otherwise,
+so that <code>utf8.offset(s, -n)</code> gets the offset of the
+<code>n</code>-th character from the end of the string.
+If the specified character is neither in the subject
+nor right after its end,
+the function returns <b>fail</b>.
+
+
+<p>
+As a special case,
+when <code>n</code> is 0 the function returns the start of the encoding
+of the character that contains the <code>i</code>-th byte of <code>s</code>.
+
+
+<p>
+This function assumes that <code>s</code> is a valid UTF-8 string.
+
+
+
+
+
+
+
+<h2>6.6 &ndash; <a name="6.6">Table Manipulation</a></h2>
+
+<p>
+This library provides generic functions for table manipulation.
+It provides all its functions inside the table <a name="pdf-table"><code>table</code></a>.
+
+
+<p>
+Remember that, whenever an operation needs the length of a table,
+all caveats about the length operator apply (see <a href="#3.4.7">&sect;3.4.7</a>).
+All functions ignore non-numeric keys
+in the tables given as arguments.
+
+
+<p>
+<hr><h3><a name="pdf-table.concat"><code>table.concat (list [, sep [, i [, j]]])</code></a></h3>
+
+
+<p>
+Given a list where all elements are strings or numbers,
+returns the string <code>list[i]..sep..list[i+1] &middot;&middot;&middot; sep..list[j]</code>.
+The default value for <code>sep</code> is the empty string,
+the default for <code>i</code> is 1,
+and the default for <code>j</code> is <code>#list</code>.
+If <code>i</code> is greater than <code>j</code>, returns the empty string.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-table.insert"><code>table.insert (list, [pos,] value)</code></a></h3>
+
+
+<p>
+Inserts element <code>value</code> at position <code>pos</code> in <code>list</code>,
+shifting up the elements
+<code>list[pos], list[pos+1], &middot;&middot;&middot;, list[#list]</code>.
+The default value for <code>pos</code> is <code>#list+1</code>,
+so that a call <code>table.insert(t,x)</code> inserts <code>x</code> at the end
+of the list <code>t</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-table.move"><code>table.move (a1, f, e, t [,a2])</code></a></h3>
+
+
+<p>
+Moves elements from the table <code>a1</code> to the table <code>a2</code>,
+performing the equivalent to the following
+multiple assignment:
+<code>a2[t],&middot;&middot;&middot; = a1[f],&middot;&middot;&middot;,a1[e]</code>.
+The default for <code>a2</code> is <code>a1</code>.
+The destination range can overlap with the source range.
+The number of elements to be moved must fit in a Lua integer.
+
+
+<p>
+Returns the destination table <code>a2</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-table.pack"><code>table.pack (&middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Returns a new table with all arguments stored into keys 1, 2, etc.
+and with a field "<code>n</code>" with the total number of arguments.
+Note that the resulting table may not be a sequence,
+if some arguments are <b>nil</b>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-table.remove"><code>table.remove (list [, pos])</code></a></h3>
+
+
+<p>
+Removes from <code>list</code> the element at position <code>pos</code>,
+returning the value of the removed element.
+When <code>pos</code> is an integer between 1 and <code>#list</code>,
+it shifts down the elements
+<code>list[pos+1], list[pos+2], &middot;&middot;&middot;, list[#list]</code>
+and erases element <code>list[#list]</code>;
+The index <code>pos</code> can also be 0 when <code>#list</code> is 0,
+or <code>#list + 1</code>.
+
+
+<p>
+The default value for <code>pos</code> is <code>#list</code>,
+so that a call <code>table.remove(l)</code> removes the last element
+of the list <code>l</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-table.sort"><code>table.sort (list [, comp])</code></a></h3>
+
+
+<p>
+Sorts the list elements in a given order, <em>in-place</em>,
+from <code>list[1]</code> to <code>list[#list]</code>.
+If <code>comp</code> is given,
+then it must be a function that receives two list elements
+and returns true when the first element must come
+before the second in the final order,
+so that, after the sort,
+<code>i &lt;= j</code> implies <code>not comp(list[j],list[i])</code>.
+If <code>comp</code> is not given,
+then the standard Lua operator <code>&lt;</code> is used instead.
+
+
+<p>
+The <code>comp</code> function must define a consistent order;
+more formally, the function must define a strict weak order.
+(A weak order is similar to a total order,
+but it can equate different elements for comparison purposes.)
+
+
+<p>
+The sort algorithm is not stable:
+Different elements considered equal by the given order
+may have their relative positions changed by the sort.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-table.unpack"><code>table.unpack (list [, i [, j]])</code></a></h3>
+
+
+<p>
+Returns the elements from the given list.
+This function is equivalent to
+
+<pre>
+     return list[i], list[i+1], &middot;&middot;&middot;, list[j]
+</pre><p>
+By default, <code>i</code> is&nbsp;1 and <code>j</code> is <code>#list</code>.
+
+
+
+
+
+
+
+<h2>6.7 &ndash; <a name="6.7">Mathematical Functions</a></h2>
+
+<p>
+This library provides basic mathematical functions.
+It provides all its functions and constants inside the table <a name="pdf-math"><code>math</code></a>.
+Functions with the annotation "<code>integer/float</code>" give
+integer results for integer arguments
+and float results for non-integer arguments.
+The rounding functions
+<a href="#pdf-math.ceil"><code>math.ceil</code></a>, <a href="#pdf-math.floor"><code>math.floor</code></a>, and <a href="#pdf-math.modf"><code>math.modf</code></a>
+return an integer when the result fits in the range of an integer,
+or a float otherwise.
+
+
+<p>
+<hr><h3><a name="pdf-math.abs"><code>math.abs (x)</code></a></h3>
+
+
+<p>
+Returns the maximum value between <code>x</code> and <code>-x</code>. (integer/float)
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.acos"><code>math.acos (x)</code></a></h3>
+
+
+<p>
+Returns the arc cosine of <code>x</code> (in radians).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.asin"><code>math.asin (x)</code></a></h3>
+
+
+<p>
+Returns the arc sine of <code>x</code> (in radians).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.atan"><code>math.atan (y [, x])</code></a></h3>
+
+
+<p>
+ 
+Returns the arc tangent of <code>y/x</code> (in radians),
+using the signs of both arguments to find the
+quadrant of the result.
+It also handles correctly the case of <code>x</code> being zero.
+
+
+<p>
+The default value for <code>x</code> is 1,
+so that the call <code>math.atan(y)</code>
+returns the arc tangent of <code>y</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.ceil"><code>math.ceil (x)</code></a></h3>
+
+
+<p>
+Returns the smallest integral value greater than or equal to <code>x</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.cos"><code>math.cos (x)</code></a></h3>
+
+
+<p>
+Returns the cosine of <code>x</code> (assumed to be in radians).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.deg"><code>math.deg (x)</code></a></h3>
+
+
+<p>
+Converts the angle <code>x</code> from radians to degrees.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.exp"><code>math.exp (x)</code></a></h3>
+
+
+<p>
+Returns the value <em>e<sup>x</sup></em>
+(where <code>e</code> is the base of natural logarithms).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.floor"><code>math.floor (x)</code></a></h3>
+
+
+<p>
+Returns the largest integral value less than or equal to <code>x</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.fmod"><code>math.fmod (x, y)</code></a></h3>
+
+
+<p>
+Returns the remainder of the division of <code>x</code> by <code>y</code>
+that rounds the quotient towards zero. (integer/float)
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.huge"><code>math.huge</code></a></h3>
+
+
+<p>
+The float value <code>HUGE_VAL</code>,
+a value greater than any other numeric value.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.log"><code>math.log (x [, base])</code></a></h3>
+
+
+<p>
+Returns the logarithm of <code>x</code> in the given base.
+The default for <code>base</code> is <em>e</em>
+(so that the function returns the natural logarithm of <code>x</code>).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.max"><code>math.max (x, &middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Returns the argument with the maximum value,
+according to the Lua operator <code>&lt;</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.maxinteger"><code>math.maxinteger</code></a></h3>
+An integer with the maximum value for an integer.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.min"><code>math.min (x, &middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Returns the argument with the minimum value,
+according to the Lua operator <code>&lt;</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.mininteger"><code>math.mininteger</code></a></h3>
+An integer with the minimum value for an integer.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.modf"><code>math.modf (x)</code></a></h3>
+
+
+<p>
+Returns the integral part of <code>x</code> and the fractional part of <code>x</code>.
+Its second result is always a float.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.pi"><code>math.pi</code></a></h3>
+
+
+<p>
+The value of <em>&pi;</em>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.rad"><code>math.rad (x)</code></a></h3>
+
+
+<p>
+Converts the angle <code>x</code> from degrees to radians.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.random"><code>math.random ([m [, n]])</code></a></h3>
+
+
+<p>
+When called without arguments,
+returns a pseudo-random float with uniform distribution
+in the range  <em>[0,1)</em>.  
+When called with two integers <code>m</code> and <code>n</code>,
+<code>math.random</code> returns a pseudo-random integer
+with uniform distribution in the range <em>[m, n]</em>.
+The call <code>math.random(n)</code>, for a positive <code>n</code>,
+is equivalent to <code>math.random(1,n)</code>.
+The call <code>math.random(0)</code> produces an integer with
+all bits (pseudo)random.
+
+
+<p>
+This function uses the <code>xoshiro256**</code> algorithm to produce
+pseudo-random 64-bit integers,
+which are the results of calls with argument&nbsp;0.
+Other results (ranges and floats)
+are unbiased extracted from these integers.
+
+
+<p>
+Lua initializes its pseudo-random generator with the equivalent of
+a call to <a href="#pdf-math.randomseed"><code>math.randomseed</code></a> with no arguments,
+so that <code>math.random</code> should generate
+different sequences of results each time the program runs.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.randomseed"><code>math.randomseed ([x [, y]])</code></a></h3>
+
+
+<p>
+When called with at least one argument,
+the integer parameters <code>x</code> and <code>y</code> are
+joined into a 128-bit <em>seed</em> that
+is used to reinitialize the pseudo-random generator;
+equal seeds produce equal sequences of numbers.
+The default for <code>y</code> is zero.
+
+
+<p>
+When called with no arguments,
+Lua generates a seed with
+a weak attempt for randomness.
+
+
+<p>
+This function returns the two seed components
+that were effectively used,
+so that setting them again repeats the sequence.
+
+
+<p>
+To ensure a required level of randomness to the initial state
+(or contrarily, to have a deterministic sequence,
+for instance when debugging a program),
+you should call <a href="#pdf-math.randomseed"><code>math.randomseed</code></a> with explicit arguments.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.sin"><code>math.sin (x)</code></a></h3>
+
+
+<p>
+Returns the sine of <code>x</code> (assumed to be in radians).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.sqrt"><code>math.sqrt (x)</code></a></h3>
+
+
+<p>
+Returns the square root of <code>x</code>.
+(You can also use the expression <code>x^0.5</code> to compute this value.)
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.tan"><code>math.tan (x)</code></a></h3>
+
+
+<p>
+Returns the tangent of <code>x</code> (assumed to be in radians).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.tointeger"><code>math.tointeger (x)</code></a></h3>
+
+
+<p>
+If the value <code>x</code> is convertible to an integer,
+returns that integer.
+Otherwise, returns <b>fail</b>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.type"><code>math.type (x)</code></a></h3>
+
+
+<p>
+Returns "<code>integer</code>" if <code>x</code> is an integer,
+"<code>float</code>" if it is a float,
+or <b>fail</b> if <code>x</code> is not a number.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-math.ult"><code>math.ult (m, n)</code></a></h3>
+
+
+<p>
+Returns a boolean,
+<b>true</b> if and only if integer <code>m</code> is below integer <code>n</code> when
+they are compared as unsigned integers.
+
+
+
+
+
+
+
+<h2>6.8 &ndash; <a name="6.8">Input and Output Facilities</a></h2>
+
+<p>
+The I/O library provides two different styles for file manipulation.
+The first one uses implicit file handles;
+that is, there are operations to set a default input file and a
+default output file,
+and all input/output operations are done over these default files.
+The second style uses explicit file handles.
+
+
+<p>
+When using implicit file handles,
+all operations are supplied by table <a name="pdf-io"><code>io</code></a>.
+When using explicit file handles,
+the operation <a href="#pdf-io.open"><code>io.open</code></a> returns a file handle
+and then all operations are supplied as methods of the file handle.
+
+
+<p>
+The metatable for file handles provides metamethods
+for <code>__gc</code> and <code>__close</code> that try
+to close the file when called.
+
+
+<p>
+The table <code>io</code> also provides
+three predefined file handles with their usual meanings from C:
+<a name="pdf-io.stdin"><code>io.stdin</code></a>, <a name="pdf-io.stdout"><code>io.stdout</code></a>, and <a name="pdf-io.stderr"><code>io.stderr</code></a>.
+The I/O library never closes these files.
+
+
+<p>
+Unless otherwise stated,
+all I/O functions return <b>fail</b> on failure,
+plus an error message as a second result and
+a system-dependent error code as a third result,
+and some non-false value on success.
+On non-POSIX systems,
+the computation of the error message and error code
+in case of errors
+may be not thread safe,
+because they rely on the global C variable <code>errno</code>.
+
+
+<p>
+<hr><h3><a name="pdf-io.close"><code>io.close ([file])</code></a></h3>
+
+
+<p>
+Equivalent to <code>file:close()</code>.
+Without a <code>file</code>, closes the default output file.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-io.flush"><code>io.flush ()</code></a></h3>
+
+
+<p>
+Equivalent to <code>io.output():flush()</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-io.input"><code>io.input ([file])</code></a></h3>
+
+
+<p>
+When called with a file name, it opens the named file (in text mode),
+and sets its handle as the default input file.
+When called with a file handle,
+it simply sets this file handle as the default input file.
+When called without arguments,
+it returns the current default input file.
+
+
+<p>
+In case of errors this function raises the error,
+instead of returning an error code.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-io.lines"><code>io.lines ([filename, &middot;&middot;&middot;])</code></a></h3>
+
+
+<p>
+Opens the given file name in read mode
+and returns an iterator function that
+works like <code>file:lines(&middot;&middot;&middot;)</code> over the opened file.
+When the iterator function fails to read any value,
+it automatically closes the file.
+Besides the iterator function,
+<code>io.lines</code> returns three other values:
+two <b>nil</b> values as placeholders,
+plus the created file handle.
+Therefore, when used in a generic <b>for</b> loop,
+the file is closed also if the loop is interrupted by an
+error or a <b>break</b>.
+
+
+<p>
+The call <code>io.lines()</code> (with no file name) is equivalent
+to <code>io.input():lines("l")</code>;
+that is, it iterates over the lines of the default input file.
+In this case, the iterator does not close the file when the loop ends.
+
+
+<p>
+In case of errors opening the file,
+this function raises the error,
+instead of returning an error code.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-io.open"><code>io.open (filename [, mode])</code></a></h3>
+
+
+<p>
+This function opens a file,
+in the mode specified in the string <code>mode</code>.
+In case of success,
+it returns a new file handle.
+
+
+<p>
+The <code>mode</code> string can be any of the following:
+
+<ul>
+<li><b>"<code>r</code>": </b> read mode (the default);</li>
+<li><b>"<code>w</code>": </b> write mode;</li>
+<li><b>"<code>a</code>": </b> append mode;</li>
+<li><b>"<code>r+</code>": </b> update mode, all previous data is preserved;</li>
+<li><b>"<code>w+</code>": </b> update mode, all previous data is erased;</li>
+<li><b>"<code>a+</code>": </b> append update mode, previous data is preserved,
+  writing is only allowed at the end of file.</li>
+</ul><p>
+The <code>mode</code> string can also have a '<code>b</code>' at the end,
+which is needed in some systems to open the file in binary mode.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-io.output"><code>io.output ([file])</code></a></h3>
+
+
+<p>
+Similar to <a href="#pdf-io.input"><code>io.input</code></a>, but operates over the default output file.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-io.popen"><code>io.popen (prog [, mode])</code></a></h3>
+
+
+<p>
+This function is system dependent and is not available
+on all platforms.
+
+
+<p>
+Starts the program <code>prog</code> in a separated process and returns
+a file handle that you can use to read data from this program
+(if <code>mode</code> is <code>"r"</code>, the default)
+or to write data to this program
+(if <code>mode</code> is <code>"w"</code>).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-io.read"><code>io.read (&middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Equivalent to <code>io.input():read(&middot;&middot;&middot;)</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-io.tmpfile"><code>io.tmpfile ()</code></a></h3>
+
+
+<p>
+In case of success,
+returns a handle for a temporary file.
+This file is opened in update mode
+and it is automatically removed when the program ends.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-io.type"><code>io.type (obj)</code></a></h3>
+
+
+<p>
+Checks whether <code>obj</code> is a valid file handle.
+Returns the string <code>"file"</code> if <code>obj</code> is an open file handle,
+<code>"closed file"</code> if <code>obj</code> is a closed file handle,
+or <b>fail</b> if <code>obj</code> is not a file handle.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-io.write"><code>io.write (&middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Equivalent to <code>io.output():write(&middot;&middot;&middot;)</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-file:close"><code>file:close ()</code></a></h3>
+
+
+<p>
+Closes <code>file</code>.
+Note that files are automatically closed when
+their handles are garbage collected,
+but that takes an unpredictable amount of time to happen.
+
+
+<p>
+When closing a file handle created with <a href="#pdf-io.popen"><code>io.popen</code></a>,
+<a href="#pdf-file:close"><code>file:close</code></a> returns the same values
+returned by <a href="#pdf-os.execute"><code>os.execute</code></a>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-file:flush"><code>file:flush ()</code></a></h3>
+
+
+<p>
+Saves any written data to <code>file</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-file:lines"><code>file:lines (&middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Returns an iterator function that,
+each time it is called,
+reads the file according to the given formats.
+When no format is given,
+uses "<code>l</code>" as a default.
+As an example, the construction
+
+<pre>
+     for c in file:lines(1) do <em>body</em> end
+</pre><p>
+will iterate over all characters of the file,
+starting at the current position.
+Unlike <a href="#pdf-io.lines"><code>io.lines</code></a>, this function does not close the file
+when the loop ends.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-file:read"><code>file:read (&middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Reads the file <code>file</code>,
+according to the given formats, which specify what to read.
+For each format,
+the function returns a string or a number with the characters read,
+or <b>fail</b> if it cannot read data with the specified format.
+(In this latter case,
+the function does not read subsequent formats.)
+When called without arguments,
+it uses a default format that reads the next line
+(see below).
+
+
+<p>
+The available formats are
+
+<ul>
+
+<li><b>"<code>n</code>": </b>
+reads a numeral and returns it as a float or an integer,
+following the lexical conventions of Lua.
+(The numeral may have leading whitespaces and a sign.)
+This format always reads the longest input sequence that
+is a valid prefix for a numeral;
+if that prefix does not form a valid numeral
+(e.g., an empty string, "<code>0x</code>", or "<code>3.4e-</code>")
+or it is too long (more than 200 characters),
+it is discarded and the format returns <b>fail</b>.
+</li>
+
+<li><b>"<code>a</code>": </b>
+reads the whole file, starting at the current position.
+On end of file, it returns the empty string;
+this format never fails.
+</li>
+
+<li><b>"<code>l</code>": </b>
+reads the next line skipping the end of line,
+returning <b>fail</b> on end of file.
+This is the default format.
+</li>
+
+<li><b>"<code>L</code>": </b>
+reads the next line keeping the end-of-line character (if present),
+returning <b>fail</b> on end of file.
+</li>
+
+<li><b><em>number</em>: </b>
+reads a string with up to this number of bytes,
+returning <b>fail</b> on end of file.
+If <code>number</code> is zero,
+it reads nothing and returns an empty string,
+or <b>fail</b> on end of file.
+</li>
+
+</ul><p>
+The formats "<code>l</code>" and "<code>L</code>" should be used only for text files.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-file:seek"><code>file:seek ([whence [, offset]])</code></a></h3>
+
+
+<p>
+Sets and gets the file position,
+measured from the beginning of the file,
+to the position given by <code>offset</code> plus a base
+specified by the string <code>whence</code>, as follows:
+
+<ul>
+<li><b>"<code>set</code>": </b> base is position 0 (beginning of the file);</li>
+<li><b>"<code>cur</code>": </b> base is current position;</li>
+<li><b>"<code>end</code>": </b> base is end of file;</li>
+</ul><p>
+In case of success, <code>seek</code> returns the final file position,
+measured in bytes from the beginning of the file.
+If <code>seek</code> fails, it returns <b>fail</b>,
+plus a string describing the error.
+
+
+<p>
+The default value for <code>whence</code> is <code>"cur"</code>,
+and for <code>offset</code> is 0.
+Therefore, the call <code>file:seek()</code> returns the current
+file position, without changing it;
+the call <code>file:seek("set")</code> sets the position to the
+beginning of the file (and returns 0);
+and the call <code>file:seek("end")</code> sets the position to the
+end of the file, and returns its size.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-file:setvbuf"><code>file:setvbuf (mode [, size])</code></a></h3>
+
+
+<p>
+Sets the buffering mode for a file.
+There are three available modes:
+
+<ul>
+<li><b>"<code>no</code>": </b> no buffering.</li>
+<li><b>"<code>full</code>": </b> full buffering.</li>
+<li><b>"<code>line</code>": </b> line buffering.</li>
+</ul>
+
+<p>
+For the last two cases,
+<code>size</code> is a hint for the size of the buffer, in bytes.
+The default is an appropriate size.
+
+
+<p>
+The specific behavior of each mode is non portable;
+check the underlying ISO&nbsp;C function <code>setvbuf</code> in your platform for
+more details.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-file:write"><code>file:write (&middot;&middot;&middot;)</code></a></h3>
+
+
+<p>
+Writes the value of each of its arguments to <code>file</code>.
+The arguments must be strings or numbers.
+
+
+<p>
+In case of success, this function returns <code>file</code>.
+
+
+
+
+
+
+
+<h2>6.9 &ndash; <a name="6.9">Operating System Facilities</a></h2>
+
+<p>
+This library is implemented through table <a name="pdf-os"><code>os</code></a>.
+
+
+<p>
+<hr><h3><a name="pdf-os.clock"><code>os.clock ()</code></a></h3>
+
+
+<p>
+Returns an approximation of the amount in seconds of CPU time
+used by the program,
+as returned by the underlying ISO&nbsp;C function <code>clock</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-os.date"><code>os.date ([format [, time]])</code></a></h3>
+
+
+<p>
+Returns a string or a table containing date and time,
+formatted according to the given string <code>format</code>.
+
+
+<p>
+If the <code>time</code> argument is present,
+this is the time to be formatted
+(see the <a href="#pdf-os.time"><code>os.time</code></a> function for a description of this value).
+Otherwise, <code>date</code> formats the current time.
+
+
+<p>
+If <code>format</code> starts with '<code>!</code>',
+then the date is formatted in Coordinated Universal Time.
+After this optional character,
+if <code>format</code> is the string "<code>*t</code>",
+then <code>date</code> returns a table with the following fields:
+<code>year</code>, <code>month</code> (1&ndash;12), <code>day</code> (1&ndash;31),
+<code>hour</code> (0&ndash;23), <code>min</code> (0&ndash;59),
+<code>sec</code> (0&ndash;61, due to leap seconds),
+<code>wday</code> (weekday, 1&ndash;7, Sunday is&nbsp;1),
+<code>yday</code> (day of the year, 1&ndash;366),
+and <code>isdst</code> (daylight saving flag, a boolean).
+This last field may be absent
+if the information is not available.
+
+
+<p>
+If <code>format</code> is not "<code>*t</code>",
+then <code>date</code> returns the date as a string,
+formatted according to the same rules as the ISO&nbsp;C function <code>strftime</code>.
+
+
+<p>
+If <code>format</code> is absent, it defaults to "<code>%c</code>",
+which gives a human-readable date and time representation
+using the current locale.
+
+
+<p>
+On non-POSIX systems,
+this function may be not thread safe
+because of its reliance on C&nbsp;function <code>gmtime</code> and C&nbsp;function <code>localtime</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-os.difftime"><code>os.difftime (t2, t1)</code></a></h3>
+
+
+<p>
+Returns the difference, in seconds,
+from time <code>t1</code> to time <code>t2</code>
+(where the times are values returned by <a href="#pdf-os.time"><code>os.time</code></a>).
+In POSIX, Windows, and some other systems,
+this value is exactly <code>t2</code><em>-</em><code>t1</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-os.execute"><code>os.execute ([command])</code></a></h3>
+
+
+<p>
+This function is equivalent to the ISO&nbsp;C function <code>system</code>.
+It passes <code>command</code> to be executed by an operating system shell.
+Its first result is <b>true</b>
+if the command terminated successfully,
+or <b>fail</b> otherwise.
+After this first result
+the function returns a string plus a number,
+as follows:
+
+<ul>
+
+<li><b>"<code>exit</code>": </b>
+the command terminated normally;
+the following number is the exit status of the command.
+</li>
+
+<li><b>"<code>signal</code>": </b>
+the command was terminated by a signal;
+the following number is the signal that terminated the command.
+</li>
+
+</ul>
+
+<p>
+When called without a <code>command</code>,
+<code>os.execute</code> returns a boolean that is true if a shell is available.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-os.exit"><code>os.exit ([code [, close]])</code></a></h3>
+
+
+<p>
+Calls the ISO&nbsp;C function <code>exit</code> to terminate the host program.
+If <code>code</code> is <b>true</b>,
+the returned status is <code>EXIT_SUCCESS</code>;
+if <code>code</code> is <b>false</b>,
+the returned status is <code>EXIT_FAILURE</code>;
+if <code>code</code> is a number,
+the returned status is this number.
+The default value for <code>code</code> is <b>true</b>.
+
+
+<p>
+If the optional second argument <code>close</code> is true,
+the function closes the Lua state before exiting (see <a href="#lua_close"><code>lua_close</code></a>).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-os.getenv"><code>os.getenv (varname)</code></a></h3>
+
+
+<p>
+Returns the value of the process environment variable <code>varname</code>
+or <b>fail</b> if the variable is not defined.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-os.remove"><code>os.remove (filename)</code></a></h3>
+
+
+<p>
+Deletes the file (or empty directory, on POSIX systems)
+with the given name.
+If this function fails, it returns <b>fail</b>
+plus a string describing the error and the error code.
+Otherwise, it returns true.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-os.rename"><code>os.rename (oldname, newname)</code></a></h3>
+
+
+<p>
+Renames the file or directory named <code>oldname</code> to <code>newname</code>.
+If this function fails, it returns <b>fail</b>,
+plus a string describing the error and the error code.
+Otherwise, it returns true.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-os.setlocale"><code>os.setlocale (locale [, category])</code></a></h3>
+
+
+<p>
+Sets the current locale of the program.
+<code>locale</code> is a system-dependent string specifying a locale;
+<code>category</code> is an optional string describing which category to change:
+<code>"all"</code>, <code>"collate"</code>, <code>"ctype"</code>,
+<code>"monetary"</code>, <code>"numeric"</code>, or <code>"time"</code>;
+the default category is <code>"all"</code>.
+The function returns the name of the new locale,
+or <b>fail</b> if the request cannot be honored.
+
+
+<p>
+If <code>locale</code> is the empty string,
+the current locale is set to an implementation-defined native locale.
+If <code>locale</code> is the string "<code>C</code>",
+the current locale is set to the standard C locale.
+
+
+<p>
+When called with <b>nil</b> as the first argument,
+this function only returns the name of the current locale
+for the given category.
+
+
+<p>
+This function may be not thread safe
+because of its reliance on C&nbsp;function <code>setlocale</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-os.time"><code>os.time ([table])</code></a></h3>
+
+
+<p>
+Returns the current time when called without arguments,
+or a time representing the local date and time specified by the given table.
+This table must have fields <code>year</code>, <code>month</code>, and <code>day</code>,
+and may have fields
+<code>hour</code> (default is 12),
+<code>min</code> (default is 0),
+<code>sec</code> (default is 0),
+and <code>isdst</code> (default is <b>nil</b>).
+Other fields are ignored.
+For a description of these fields, see the <a href="#pdf-os.date"><code>os.date</code></a> function.
+
+
+<p>
+When the function is called,
+the values in these fields do not need to be inside their valid ranges.
+For instance, if <code>sec</code> is -10,
+it means 10 seconds before the time specified by the other fields;
+if <code>hour</code> is 1000,
+it means 1000 hours after the time specified by the other fields.
+
+
+<p>
+The returned value is a number, whose meaning depends on your system.
+In POSIX, Windows, and some other systems,
+this number counts the number
+of seconds since some given start time (the "epoch").
+In other systems, the meaning is not specified,
+and the number returned by <code>time</code> can be used only as an argument to
+<a href="#pdf-os.date"><code>os.date</code></a> and <a href="#pdf-os.difftime"><code>os.difftime</code></a>.
+
+
+<p>
+When called with a table,
+<code>os.time</code> also normalizes all the fields
+documented in the <a href="#pdf-os.date"><code>os.date</code></a> function,
+so that they represent the same time as before the call
+but with values inside their valid ranges.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-os.tmpname"><code>os.tmpname ()</code></a></h3>
+
+
+<p>
+Returns a string with a file name that can
+be used for a temporary file.
+The file must be explicitly opened before its use
+and explicitly removed when no longer needed.
+
+
+<p>
+In POSIX systems,
+this function also creates a file with that name,
+to avoid security risks.
+(Someone else might create the file with wrong permissions
+in the time between getting the name and creating the file.)
+You still have to open the file to use it
+and to remove it (even if you do not use it).
+
+
+<p>
+When possible,
+you may prefer to use <a href="#pdf-io.tmpfile"><code>io.tmpfile</code></a>,
+which automatically removes the file when the program ends.
+
+
+
+
+
+
+
+<h2>6.10 &ndash; <a name="6.10">The Debug Library</a></h2>
+
+<p>
+This library provides
+the functionality of the debug interface (<a href="#4.7">&sect;4.7</a>) to Lua programs.
+You should exert care when using this library.
+Several of its functions
+violate basic assumptions about Lua code
+(e.g., that variables local to a function
+cannot be accessed from outside;
+that userdata metatables cannot be changed by Lua code;
+that Lua programs do not crash)
+and therefore can compromise otherwise secure code.
+Moreover, some functions in this library may be slow.
+
+
+<p>
+All functions in this library are provided
+inside the <a name="pdf-debug"><code>debug</code></a> table.
+All functions that operate over a thread
+have an optional first argument which is the
+thread to operate over.
+The default is always the current thread.
+
+
+<p>
+<hr><h3><a name="pdf-debug.debug"><code>debug.debug ()</code></a></h3>
+
+
+<p>
+Enters an interactive mode with the user,
+running each string that the user enters.
+Using simple commands and other debug facilities,
+the user can inspect global and local variables,
+change their values, evaluate expressions, and so on.
+A line containing only the word <code>cont</code> finishes this function,
+so that the caller continues its execution.
+
+
+<p>
+Note that commands for <code>debug.debug</code> are not lexically nested
+within any function and so have no direct access to local variables.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.gethook"><code>debug.gethook ([thread])</code></a></h3>
+
+
+<p>
+Returns the current hook settings of the thread, as three values:
+the current hook function, the current hook mask,
+and the current hook count,
+as set by the <a href="#pdf-debug.sethook"><code>debug.sethook</code></a> function.
+
+
+<p>
+Returns <b>fail</b> if there is no active hook.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.getinfo"><code>debug.getinfo ([thread,] f [, what])</code></a></h3>
+
+
+<p>
+Returns a table with information about a function.
+You can give the function directly
+or you can give a number as the value of <code>f</code>,
+which means the function running at level <code>f</code> of the call stack
+of the given thread:
+level&nbsp;0 is the current function (<code>getinfo</code> itself);
+level&nbsp;1 is the function that called <code>getinfo</code>
+(except for tail calls, which do not count in the stack);
+and so on.
+If <code>f</code> is a number greater than the number of active functions,
+then <code>getinfo</code> returns <b>fail</b>.
+
+
+<p>
+The returned table can contain all the fields returned by <a href="#lua_getinfo"><code>lua_getinfo</code></a>,
+with the string <code>what</code> describing which fields to fill in.
+The default for <code>what</code> is to get all information available,
+except the table of valid lines.
+If present,
+the option '<code>f</code>'
+adds a field named <code>func</code> with the function itself.
+If present,
+the option '<code>L</code>'
+adds a field named <code>activelines</code> with the table of
+valid lines.
+
+
+<p>
+For instance, the expression <code>debug.getinfo(1,"n").name</code> returns
+a name for the current function,
+if a reasonable name can be found,
+and the expression <code>debug.getinfo(print)</code>
+returns a table with all available information
+about the <a href="#pdf-print"><code>print</code></a> function.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.getlocal"><code>debug.getlocal ([thread,] f, local)</code></a></h3>
+
+
+<p>
+This function returns the name and the value of the local variable
+with index <code>local</code> of the function at level <code>f</code> of the stack.
+This function accesses not only explicit local variables,
+but also parameters and temporary values.
+
+
+<p>
+The first parameter or local variable has index&nbsp;1, and so on,
+following the order that they are declared in the code,
+counting only the variables that are active
+in the current scope of the function.
+Compile-time constants may not appear in this listing,
+if they were optimized away by the compiler.
+Negative indices refer to vararg arguments;
+-1 is the first vararg argument.
+The function returns <b>fail</b>
+if there is no variable with the given index,
+and raises an error when called with a level out of range.
+(You can call <a href="#pdf-debug.getinfo"><code>debug.getinfo</code></a> to check whether the level is valid.)
+
+
+<p>
+Variable names starting with '<code>(</code>' (open parenthesis) 
+represent variables with no known names
+(internal variables such as loop control variables,
+and variables from chunks saved without debug information).
+
+
+<p>
+The parameter <code>f</code> may also be a function.
+In that case, <code>getlocal</code> returns only the name of function parameters.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.getmetatable"><code>debug.getmetatable (value)</code></a></h3>
+
+
+<p>
+Returns the metatable of the given <code>value</code>
+or <b>nil</b> if it does not have a metatable.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.getregistry"><code>debug.getregistry ()</code></a></h3>
+
+
+<p>
+Returns the registry table (see <a href="#4.3">&sect;4.3</a>).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.getupvalue"><code>debug.getupvalue (f, up)</code></a></h3>
+
+
+<p>
+This function returns the name and the value of the upvalue
+with index <code>up</code> of the function <code>f</code>.
+The function returns <b>fail</b>
+if there is no upvalue with the given index.
+
+
+<p>
+(For Lua functions,
+upvalues are the external local variables that the function uses,
+and that are consequently included in its closure.)
+
+
+<p>
+For C&nbsp;functions, this function uses the empty string <code>""</code>
+as a name for all upvalues.
+
+
+<p>
+Variable name '<code>?</code>' (interrogation mark)
+represents variables with no known names
+(variables from chunks saved without debug information).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.getuservalue"><code>debug.getuservalue (u, n)</code></a></h3>
+
+
+<p>
+Returns the <code>n</code>-th user value associated
+to the userdata <code>u</code> plus a boolean,
+<b>false</b> if the userdata does not have that value.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.sethook"><code>debug.sethook ([thread,] hook, mask [, count])</code></a></h3>
+
+
+<p>
+Sets the given function as the debug hook.
+The string <code>mask</code> and the number <code>count</code> describe
+when the hook will be called.
+The string mask may have any combination of the following characters,
+with the given meaning:
+
+<ul>
+<li><b>'<code>c</code>': </b> the hook is called every time Lua calls a function;</li>
+<li><b>'<code>r</code>': </b> the hook is called every time Lua returns from a function;</li>
+<li><b>'<code>l</code>': </b> the hook is called every time Lua enters a new line of code.</li>
+</ul><p>
+Moreover,
+with a <code>count</code> different from zero,
+the hook is called also after every <code>count</code> instructions.
+
+
+<p>
+When called without arguments,
+<a href="#pdf-debug.sethook"><code>debug.sethook</code></a> turns off the hook.
+
+
+<p>
+When the hook is called, its first parameter is a string
+describing the event that has triggered its call:
+<code>"call"</code>, <code>"tail call"</code>, <code>"return"</code>,
+<code>"line"</code>, and <code>"count"</code>.
+For line events,
+the hook also gets the new line number as its second parameter.
+Inside a hook,
+you can call <code>getinfo</code> with level&nbsp;2 to get more information about
+the running function.
+(Level&nbsp;0 is the <code>getinfo</code> function,
+and level&nbsp;1 is the hook function.)
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.setlocal"><code>debug.setlocal ([thread,] level, local, value)</code></a></h3>
+
+
+<p>
+This function assigns the value <code>value</code> to the local variable
+with index <code>local</code> of the function at level <code>level</code> of the stack.
+The function returns <b>fail</b> if there is no local
+variable with the given index,
+and raises an error when called with a <code>level</code> out of range.
+(You can call <code>getinfo</code> to check whether the level is valid.)
+Otherwise, it returns the name of the local variable.
+
+
+<p>
+See <a href="#pdf-debug.getlocal"><code>debug.getlocal</code></a> for more information about
+variable indices and names.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.setmetatable"><code>debug.setmetatable (value, table)</code></a></h3>
+
+
+<p>
+Sets the metatable for the given <code>value</code> to the given <code>table</code>
+(which can be <b>nil</b>).
+Returns <code>value</code>.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.setupvalue"><code>debug.setupvalue (f, up, value)</code></a></h3>
+
+
+<p>
+This function assigns the value <code>value</code> to the upvalue
+with index <code>up</code> of the function <code>f</code>.
+The function returns <b>fail</b> if there is no upvalue
+with the given index.
+Otherwise, it returns the name of the upvalue.
+
+
+<p>
+See <a href="#pdf-debug.getupvalue"><code>debug.getupvalue</code></a> for more information about upvalues.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.setuservalue"><code>debug.setuservalue (udata, value, n)</code></a></h3>
+
+
+<p>
+Sets the given <code>value</code> as
+the <code>n</code>-th user value associated to the given <code>udata</code>.
+<code>udata</code> must be a full userdata.
+
+
+<p>
+Returns <code>udata</code>,
+or <b>fail</b> if the userdata does not have that value.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.traceback"><code>debug.traceback ([thread,] [message [, level]])</code></a></h3>
+
+
+<p>
+If <code>message</code> is present but is neither a string nor <b>nil</b>,
+this function returns <code>message</code> without further processing.
+Otherwise,
+it returns a string with a traceback of the call stack.
+The optional <code>message</code> string is appended
+at the beginning of the traceback.
+An optional <code>level</code> number tells at which level
+to start the traceback
+(default is 1, the function calling <code>traceback</code>).
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.upvalueid"><code>debug.upvalueid (f, n)</code></a></h3>
+
+
+<p>
+Returns a unique identifier (as a light userdata)
+for the upvalue numbered <code>n</code>
+from the given function.
+
+
+<p>
+These unique identifiers allow a program to check whether different
+closures share upvalues.
+Lua closures that share an upvalue
+(that is, that access a same external local variable)
+will return identical ids for those upvalue indices.
+
+
+
+
+<p>
+<hr><h3><a name="pdf-debug.upvaluejoin"><code>debug.upvaluejoin (f1, n1, f2, n2)</code></a></h3>
+
+
+<p>
+Make the <code>n1</code>-th upvalue of the Lua closure <code>f1</code>
+refer to the <code>n2</code>-th upvalue of the Lua closure <code>f2</code>.
+
+
+
+
+
+
+
+<h1>7 &ndash; <a name="7">Lua Standalone</a></h1>
+
+<p>
+Although Lua has been designed as an extension language,
+to be embedded in a host C&nbsp;program,
+it is also frequently used as a standalone language.
+An interpreter for Lua as a standalone language,
+called simply <code>lua</code>,
+is provided with the standard distribution.
+The standalone interpreter includes
+all standard libraries.
+Its usage is:
+
+<pre>
+     lua [options] [script [args]]
+</pre><p>
+The options are:
+
+<ul>
+<li><b><code>-e <em>stat</em></code>: </b> execute string <em>stat</em>;</li>
+<li><b><code>-i</code>: </b> enter interactive mode after running <em>script</em>;</li>
+<li><b><code>-l <em>mod</em></code>: </b> "require" <em>mod</em> and assign the
+  result to global <em>mod</em>;</li>
+<li><b><code>-l <em>g=mod</em></code>: </b> "require" <em>mod</em> and assign the
+  result to global <em>g</em>;</li>
+<li><b><code>-v</code>: </b> print version information;</li>
+<li><b><code>-E</code>: </b> ignore environment variables;</li>
+<li><b><code>-W</code>: </b> turn warnings on;</li>
+<li><b><code>--</code>: </b> stop handling options;</li>
+<li><b><code>-</code>: </b> execute <code>stdin</code> as a file and stop handling options.</li>
+</ul><p>
+(The form <code>-l <em>g=mod</em></code> was introduced in release&nbsp;5.4.4.)
+
+
+<p>
+After handling its options, <code>lua</code> runs the given <em>script</em>.
+When called without arguments,
+<code>lua</code> behaves as <code>lua -v -i</code>
+when the standard input (<code>stdin</code>) is a terminal,
+and as <code>lua -</code> otherwise.
+
+
+<p>
+When called without the option <code>-E</code>,
+the interpreter checks for an environment variable <a name="pdf-LUA_INIT_5_4"><code>LUA_INIT_5_4</code></a>
+(or <a name="pdf-LUA_INIT"><code>LUA_INIT</code></a> if the versioned name is not defined)
+before running any argument.
+If the variable content has the format <code>@<em>filename</em></code>,
+then <code>lua</code> executes the file.
+Otherwise, <code>lua</code> executes the string itself.
+
+
+<p>
+When called with the option <code>-E</code>,
+Lua does not consult any environment variables.
+In particular,
+the values of <a href="#pdf-package.path"><code>package.path</code></a> and <a href="#pdf-package.cpath"><code>package.cpath</code></a>
+are set with the default paths defined in <code>luaconf.h</code>.
+
+
+<p>
+The options <code>-e</code>, <code>-l</code>, and <code>-W</code> are handled in
+the order they appear.
+For instance, an invocation like
+
+<pre>
+     $ lua -e 'a=1' -llib1 script.lua
+</pre><p>
+will first set <code>a</code> to 1, then require the library <code>lib1</code>,
+and finally run the file <code>script.lua</code> with no arguments.
+(Here <code>$</code> is the shell prompt. Your prompt may be different.)
+
+
+<p>
+Before running any code,
+<code>lua</code> collects all command-line arguments
+in a global table called <code>arg</code>.
+The script name goes to index 0,
+the first argument after the script name goes to index 1,
+and so on.
+Any arguments before the script name
+(that is, the interpreter name plus its options)
+go to negative indices.
+For instance, in the call
+
+<pre>
+     $ lua -la b.lua t1 t2
+</pre><p>
+the table is like this:
+
+<pre>
+     arg = { [-2] = "lua", [-1] = "-la",
+             [0] = "b.lua",
+             [1] = "t1", [2] = "t2" }
+</pre><p>
+If there is no script in the call,
+the interpreter name goes to index 0,
+followed by the other arguments.
+For instance, the call
+
+<pre>
+     $ lua -e "print(arg[1])"
+</pre><p>
+will print "<code>-e</code>".
+If there is a script,
+the script is called with arguments
+<code>arg[1]</code>, &middot;&middot;&middot;, <code>arg[#arg]</code>.
+Like all chunks in Lua,
+the script is compiled as a variadic function.
+
+
+<p>
+In interactive mode,
+Lua repeatedly prompts and waits for a line.
+After reading a line,
+Lua first try to interpret the line as an expression.
+If it succeeds, it prints its value.
+Otherwise, it interprets the line as a statement.
+If you write an incomplete statement,
+the interpreter waits for its completion
+by issuing a different prompt.
+
+
+<p>
+If the global variable <a name="pdf-_PROMPT"><code>_PROMPT</code></a> contains a string,
+then its value is used as the prompt.
+Similarly, if the global variable <a name="pdf-_PROMPT2"><code>_PROMPT2</code></a> contains a string,
+its value is used as the secondary prompt
+(issued during incomplete statements).
+
+
+<p>
+In case of unprotected errors in the script,
+the interpreter reports the error to the standard error stream.
+If the error object is not a string but
+has a metamethod <code>__tostring</code>,
+the interpreter calls this metamethod to produce the final message.
+Otherwise, the interpreter converts the error object to a string
+and adds a stack traceback to it.
+When warnings are on,
+they are simply printed in the standard error output.
+
+
+<p>
+When finishing normally,
+the interpreter closes its main Lua state
+(see <a href="#lua_close"><code>lua_close</code></a>).
+The script can avoid this step by
+calling <a href="#pdf-os.exit"><code>os.exit</code></a> to terminate.
+
+
+<p>
+To allow the use of Lua as a
+script interpreter in Unix systems,
+Lua skips the first line of a file chunk if it starts with <code>#</code>.
+Therefore, Lua scripts can be made into executable programs
+by using <code>chmod +x</code> and the&nbsp;<code>#!</code> form,
+as in
+
+<pre>
+     #!/usr/local/bin/lua
+</pre><p>
+Of course,
+the location of the Lua interpreter may be different in your machine.
+If <code>lua</code> is in your <code>PATH</code>,
+then
+
+<pre>
+     #!/usr/bin/env lua
+</pre><p>
+is a more portable solution.
+
+
+
+<h1>8 &ndash; <a name="8">Incompatibilities with the Previous Version</a></h1>
+
+
+
+<p>
+Here we list the incompatibilities that you may find when moving a program
+from Lua&nbsp;5.3 to Lua&nbsp;5.4.
+
+
+<p>
+You can avoid some incompatibilities by compiling Lua with
+appropriate options (see file <code>luaconf.h</code>).
+However,
+all these compatibility options will be removed in the future.
+More often than not,
+compatibility issues arise when these compatibility options
+are removed.
+So, whenever you have the chance,
+you should try to test your code with a version of Lua compiled
+with all compatibility options turned off.
+That will ease transitions to newer versions of Lua.
+
+
+<p>
+Lua versions can always change the C API in ways that
+do not imply source-code changes in a program,
+such as the numeric values for constants
+or the implementation of functions as macros.
+Therefore,
+you should never assume that binaries are compatible between
+different Lua versions.
+Always recompile clients of the Lua API when
+using a new version.
+
+
+<p>
+Similarly, Lua versions can always change the internal representation
+of precompiled chunks;
+precompiled chunks are not compatible between different Lua versions.
+
+
+<p>
+The standard paths in the official distribution may
+change between versions.
+
+
+
+
+
+<h2>8.1 &ndash; <a name="8.1">Incompatibilities in the Language</a></h2>
+<ul>
+
+<li>
+The coercion of strings to numbers in
+arithmetic and bitwise operations
+has been removed from the core language.
+The string library does a similar job
+for arithmetic (but not for bitwise) operations
+using the string metamethods.
+However, unlike in previous versions,
+the new implementation preserves the implicit type of the numeral
+in the string.
+For instance, the result of <code>"1" + "2"</code> now is an integer,
+not a float.
+</li>
+
+<li>
+Literal decimal integer constants that overflow are read as floats,
+instead of wrapping around.
+You can use hexadecimal notation for such constants if you
+want the old behavior
+(reading them as integers with wrap around).
+</li>
+
+<li>
+The use of the <code>__lt</code> metamethod to emulate <code>__le</code>
+has been removed.
+When needed, this metamethod must be explicitly defined.
+</li>
+
+<li>
+The semantics of the numerical <b>for</b> loop
+over integers changed in some details.
+In particular, the control variable never wraps around.
+</li>
+
+<li>
+A label for a <b>goto</b> cannot be declared where a label with the same
+name is visible, even if this other label is declared in an enclosing
+block.
+</li>
+
+<li>
+When finalizing an object,
+Lua does not ignore <code>__gc</code> metamethods that are not functions.
+Any value will be called, if present.
+(Non-callable values will generate a warning,
+like any other error when calling a finalizer.)
+</li>
+
+</ul>
+
+
+
+
+<h2>8.2 &ndash; <a name="8.2">Incompatibilities in the Libraries</a></h2>
+<ul>
+
+<li>
+The function <a href="#pdf-print"><code>print</code></a> does not call <a href="#pdf-tostring"><code>tostring</code></a>
+to format its arguments;
+instead, it has this functionality hardwired.
+You should use <code>__tostring</code> to modify how values are printed.
+</li>
+
+<li>
+The pseudo-random number generator used by the function <a href="#pdf-math.random"><code>math.random</code></a>
+now starts with a somewhat random seed.
+Moreover, it uses a different algorithm.
+</li>
+
+<li>
+By default, the decoding functions in the <a href="#pdf-utf8"><code>utf8</code></a> library
+do not accept surrogates as valid code points.
+An extra parameter in these functions makes them more permissive.
+</li>
+
+<li>
+The options "<code>setpause</code>" and "<code>setstepmul</code>"
+of the function <a href="#pdf-collectgarbage"><code>collectgarbage</code></a> are deprecated.
+You should use the new option "<code>incremental</code>" to set them.
+</li>
+
+<li>
+The function <a href="#pdf-io.lines"><code>io.lines</code></a> now returns four values,
+instead of just one.
+That can be a problem when it is used as the sole
+argument to another function that has optional parameters,
+such as in <code>load(io.lines(filename, "L"))</code>.
+To fix that issue,
+you can wrap the call into parentheses,
+to adjust its number of results to one.
+</li>
+
+</ul>
+
+
+
+
+<h2>8.3 &ndash; <a name="8.3">Incompatibilities in the API</a></h2>
+
+
+<ul>
+
+<li>
+Full userdata now has an arbitrary number of associated user values.
+Therefore, the functions <code>lua_newuserdata</code>,
+<code>lua_setuservalue</code>, and <code>lua_getuservalue</code> were
+replaced by <a href="#lua_newuserdatauv"><code>lua_newuserdatauv</code></a>,
+<a href="#lua_setiuservalue"><code>lua_setiuservalue</code></a>, and <a href="#lua_getiuservalue"><code>lua_getiuservalue</code></a>,
+which have an extra argument.
+
+
+<p>
+For compatibility, the old names still work as macros assuming
+one single user value.
+Note, however, that userdata with zero user values
+are more efficient memory-wise.
+</li>
+
+<li>
+The function <a href="#lua_resume"><code>lua_resume</code></a> has an extra parameter.
+This out parameter returns the number of values on
+the top of the stack that were yielded or returned by the coroutine.
+(In previous versions,
+those values were the entire stack.)
+</li>
+
+<li>
+The function <a href="#lua_version"><code>lua_version</code></a> returns the version number,
+instead of an address of the version number.
+The Lua core should work correctly with libraries using their
+own static copies of the same core,
+so there is no need to check whether they are using the same
+address space.
+</li>
+
+<li>
+The constant <code>LUA_ERRGCMM</code> was removed.
+Errors in finalizers are never propagated;
+instead, they generate a warning.
+</li>
+
+<li>
+The options <code>LUA_GCSETPAUSE</code> and <code>LUA_GCSETSTEPMUL</code>
+of the function <a href="#lua_gc"><code>lua_gc</code></a> are deprecated.
+You should use the new option <code>LUA_GCINC</code> to set them.
+</li>
+
+</ul>
+
+
+
+
+<h1>9 &ndash; <a name="9">The Complete Syntax of Lua</a></h1>
+
+<p>
+Here is the complete syntax of Lua in extended BNF.
+As usual in extended BNF,
+{A} means 0 or more As,
+and [A] means an optional A.
+(For operator precedences, see <a href="#3.4.8">&sect;3.4.8</a>;
+for a description of the terminals
+Name, Numeral,
+and LiteralString, see <a href="#3.1">&sect;3.1</a>.)
+
+
+
+
+<pre>
+
+	chunk ::= block
+
+	block ::= {stat} [retstat]
+
+	stat ::=  &lsquo;<b>;</b>&rsquo; | 
+		 varlist &lsquo;<b>=</b>&rsquo; explist | 
+		 functioncall | 
+		 label | 
+		 <b>break</b> | 
+		 <b>goto</b> Name | 
+		 <b>do</b> block <b>end</b> | 
+		 <b>while</b> exp <b>do</b> block <b>end</b> | 
+		 <b>repeat</b> block <b>until</b> exp | 
+		 <b>if</b> exp <b>then</b> block {<b>elseif</b> exp <b>then</b> block} [<b>else</b> block] <b>end</b> | 
+		 <b>for</b> Name &lsquo;<b>=</b>&rsquo; exp &lsquo;<b>,</b>&rsquo; exp [&lsquo;<b>,</b>&rsquo; exp] <b>do</b> block <b>end</b> | 
+		 <b>for</b> namelist <b>in</b> explist <b>do</b> block <b>end</b> | 
+		 <b>function</b> funcname funcbody | 
+		 <b>local</b> <b>function</b> Name funcbody | 
+		 <b>local</b> attnamelist [&lsquo;<b>=</b>&rsquo; explist] 
+
+	attnamelist ::=  Name attrib {&lsquo;<b>,</b>&rsquo; Name attrib}
+
+	attrib ::= [&lsquo;<b>&lt;</b>&rsquo; Name &lsquo;<b>&gt;</b>&rsquo;]
+
+	retstat ::= <b>return</b> [explist] [&lsquo;<b>;</b>&rsquo;]
+
+	label ::= &lsquo;<b>::</b>&rsquo; Name &lsquo;<b>::</b>&rsquo;
+
+	funcname ::= Name {&lsquo;<b>.</b>&rsquo; Name} [&lsquo;<b>:</b>&rsquo; Name]
+
+	varlist ::= var {&lsquo;<b>,</b>&rsquo; var}
+
+	var ::=  Name | prefixexp &lsquo;<b>[</b>&rsquo; exp &lsquo;<b>]</b>&rsquo; | prefixexp &lsquo;<b>.</b>&rsquo; Name 
+
+	namelist ::= Name {&lsquo;<b>,</b>&rsquo; Name}
+
+	explist ::= exp {&lsquo;<b>,</b>&rsquo; exp}
+
+	exp ::=  <b>nil</b> | <b>false</b> | <b>true</b> | Numeral | LiteralString | &lsquo;<b>...</b>&rsquo; | functiondef | 
+		 prefixexp | tableconstructor | exp binop exp | unop exp 
+
+	prefixexp ::= var | functioncall | &lsquo;<b>(</b>&rsquo; exp &lsquo;<b>)</b>&rsquo;
+
+	functioncall ::=  prefixexp args | prefixexp &lsquo;<b>:</b>&rsquo; Name args 
+
+	args ::=  &lsquo;<b>(</b>&rsquo; [explist] &lsquo;<b>)</b>&rsquo; | tableconstructor | LiteralString 
+
+	functiondef ::= <b>function</b> funcbody
+
+	funcbody ::= &lsquo;<b>(</b>&rsquo; [parlist] &lsquo;<b>)</b>&rsquo; block <b>end</b>
+
+	parlist ::= namelist [&lsquo;<b>,</b>&rsquo; &lsquo;<b>...</b>&rsquo;] | &lsquo;<b>...</b>&rsquo;
+
+	tableconstructor ::= &lsquo;<b>{</b>&rsquo; [fieldlist] &lsquo;<b>}</b>&rsquo;
+
+	fieldlist ::= field {fieldsep field} [fieldsep]
+
+	field ::= &lsquo;<b>[</b>&rsquo; exp &lsquo;<b>]</b>&rsquo; &lsquo;<b>=</b>&rsquo; exp | Name &lsquo;<b>=</b>&rsquo; exp | exp
+
+	fieldsep ::= &lsquo;<b>,</b>&rsquo; | &lsquo;<b>;</b>&rsquo;
+
+	binop ::=  &lsquo;<b>+</b>&rsquo; | &lsquo;<b>-</b>&rsquo; | &lsquo;<b>*</b>&rsquo; | &lsquo;<b>/</b>&rsquo; | &lsquo;<b>//</b>&rsquo; | &lsquo;<b>^</b>&rsquo; | &lsquo;<b>%</b>&rsquo; | 
+		 &lsquo;<b>&amp;</b>&rsquo; | &lsquo;<b>~</b>&rsquo; | &lsquo;<b>|</b>&rsquo; | &lsquo;<b>&gt;&gt;</b>&rsquo; | &lsquo;<b>&lt;&lt;</b>&rsquo; | &lsquo;<b>..</b>&rsquo; | 
+		 &lsquo;<b>&lt;</b>&rsquo; | &lsquo;<b>&lt;=</b>&rsquo; | &lsquo;<b>&gt;</b>&rsquo; | &lsquo;<b>&gt;=</b>&rsquo; | &lsquo;<b>==</b>&rsquo; | &lsquo;<b>~=</b>&rsquo; | 
+		 <b>and</b> | <b>or</b>
+
+	unop ::= &lsquo;<b>-</b>&rsquo; | <b>not</b> | &lsquo;<b>#</b>&rsquo; | &lsquo;<b>~</b>&rsquo;
+
+</pre>
+
+<p>
+
+
+
+
+
+
+
+<P CLASS="footer">
+Last update:
+Tue May  2 20:09:38 UTC 2023
+</P>
+<!--
+Last change: revised for Lua 5.4.6
+-->
+
+</body></html>
+
diff --git a/src/libs/3rdparty/lua/doc/osi-certified-72x60.png b/src/libs/3rdparty/lua/doc/osi-certified-72x60.png
new file mode 100644
index 00000000000..07df5f6ee7a
Binary files /dev/null and b/src/libs/3rdparty/lua/doc/osi-certified-72x60.png differ
diff --git a/src/libs/3rdparty/lua/doc/readme.html b/src/libs/3rdparty/lua/doc/readme.html
new file mode 100644
index 00000000000..918ec8ed937
--- /dev/null
+++ b/src/libs/3rdparty/lua/doc/readme.html
@@ -0,0 +1,337 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML>
+<HEAD>
+<TITLE>Lua 5.4 readme</TITLE>
+<LINK REL="stylesheet" TYPE="text/css" HREF="lua.css">
+<META HTTP-EQUIV="content-type" CONTENT="text/html; charset=iso-8859-1">
+<STYLE TYPE="text/css">
+blockquote, .display {
+	border: solid #a0a0a0 2px ;
+	border-radius: 8px ;
+	padding: 1em ;
+	margin: 0px ;
+}
+
+.display {
+	word-spacing: 0.25em ;
+}
+
+dl.display dd {
+	padding-bottom: 0.2em ;
+}
+
+tt, kbd, code {
+	font-size: 12pt ;
+}
+</STYLE>
+</HEAD>
+
+<BODY>
+
+<H1>
+<A HREF="http://www.lua.org/"><IMG SRC="logo.gif" ALT="Lua"></A>
+Welcome to Lua 5.4
+</H1>
+
+<DIV CLASS="menubar">
+<A HREF="#about">about</A>
+&middot;
+<A HREF="#install">installation</A>
+&middot;
+<A HREF="#changes">changes</A>
+&middot;
+<A HREF="#license">license</A>
+&middot;
+<A HREF="contents.html">reference manual</A>
+</DIV>
+
+<H2><A NAME="about">About Lua</A></H2>
+<P>
+Lua is a powerful, efficient, lightweight, embeddable scripting language
+developed by a
+<A HREF="http://www.lua.org/authors.html">team</A>
+at
+<A HREF="http://www.puc-rio.br/">PUC-Rio</A>,
+the Pontifical Catholic University of Rio de Janeiro in Brazil.
+Lua is
+<A HREF="#license">free software</A>
+used in
+<A HREF="http://www.lua.org/uses.html">many products and projects</A>
+around the world.
+
+<P>
+Lua's
+<A HREF="http://www.lua.org/">official web site</A>
+provides complete information
+about Lua,
+including
+an
+<A HREF="http://www.lua.org/about.html">executive summary</A>
+and
+updated
+<A HREF="http://www.lua.org/docs.html">documentation</A>,
+especially the
+<A HREF="http://www.lua.org/manual/5.4/">reference manual</A>,
+which may differ slightly from the
+<A HREF="contents.html">local copy</A>
+distributed in this package.
+
+<H2><A NAME="install">Installing Lua</A></H2>
+<P>
+Lua is distributed in
+<A HREF="http://www.lua.org/ftp/">source</A>
+form.
+You need to build it before using it.
+Building Lua should be straightforward
+because
+Lua is implemented in pure ANSI C and compiles unmodified in all known
+platforms that have an ANSI C compiler.
+Lua also compiles unmodified as C++.
+The instructions given below for building Lua are for Unix-like platforms,
+such as Linux and Mac OS X.
+See also
+<A HREF="#other">instructions for other systems</A>
+and
+<A HREF="#customization">customization options</A>.
+
+<P>
+If you don't have the time or the inclination to compile Lua yourself,
+get a binary from
+<A HREF="http://lua-users.org/wiki/LuaBinaries">LuaBinaries</A>.
+
+<H3>Building Lua</H3>
+<P>
+In most common Unix-like platforms, simply do "<KBD>make</KBD>".
+Here are the details.
+
+<OL>
+<LI>
+Open a terminal window and move to
+the top-level directory, which is named <TT>lua-5.4.6</TT>.
+The <TT>Makefile</TT> there controls both the build process and the installation process.
+<P>
+<LI>
+  Do "<KBD>make</KBD>". The <TT>Makefile</TT> will guess your platform and build Lua for it.
+<P>
+<LI>
+  If the guess failed, do "<KBD>make help</KBD>" and see if your platform is listed.
+  The platforms currently supported are:
+<P>
+<P CLASS="display">
+   guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris
+</P>
+<P>
+  If your platform is listed, just do "<KBD>make xxx</KBD>", where xxx
+  is your platform name.
+<P>
+  If your platform is not listed, try the closest one or posix, generic,
+  c89, in this order.
+<P>
+<LI>
+The compilation takes only a few moments
+and produces three files in the <TT>src</TT> directory:
+lua (the interpreter),
+luac (the compiler),
+and liblua.a (the library).
+<P>
+<LI>
+  To check that Lua has been built correctly, do "<KBD>make test</KBD>"
+  after building Lua. This will run the interpreter and print its version.
+</OL>
+<P>
+If you're running Linux, try "<KBD>make linux-readline</KBD>" to build the interactive Lua interpreter with handy line-editing and history capabilities.
+If you get compilation errors,
+make sure you have installed the <TT>readline</TT> development package
+(which is probably named <TT>libreadline-dev</TT> or <TT>readline-devel</TT>).
+If you get link errors after that,
+then try "<KBD>make linux-readline MYLIBS=-ltermcap</KBD>".
+
+<H3>Installing Lua</H3>
+<P>
+  Once you have built Lua, you may want to install it in an official
+  place in your system. In this case, do "<KBD>make install</KBD>". The official
+  place and the way to install files are defined in the <TT>Makefile</TT>. You'll
+  probably need the right permissions to install files, and so may need to do "<KBD>sudo make install</KBD>".
+
+<P>
+  To build and install Lua in one step, do "<KBD>make all install</KBD>",
+  or "<KBD>make xxx install</KBD>",
+  where xxx is your platform name.
+
+<P>
+  To install Lua locally after building it, do "<KBD>make local</KBD>".
+  This will create a directory <TT>install</TT> with subdirectories
+  <TT>bin</TT>, <TT>include</TT>, <TT>lib</TT>, <TT>man</TT>, <TT>share</TT>,
+  and install Lua as listed below.
+
+  To install Lua locally, but in some other directory, do
+  "<KBD>make install INSTALL_TOP=xxx</KBD>", where xxx is your chosen directory.
+  The installation starts in the <TT>src</TT> and <TT>doc</TT> directories,
+  so take care if <TT>INSTALL_TOP</TT> is not an absolute path.
+
+<DL CLASS="display">
+<DT>
+    bin:
+<DD>
+    lua luac
+<DT>
+    include:
+<DD>
+    lua.h luaconf.h lualib.h lauxlib.h lua.hpp
+<DT>
+    lib:
+<DD>
+    liblua.a
+<DT>
+    man/man1:
+<DD>
+    lua.1 luac.1
+</DL>
+
+<P>
+  These are the only directories you need for development.
+  If you only want to run Lua programs,
+  you only need the files in <TT>bin</TT> and <TT>man</TT>.
+  The files in <TT>include</TT> and <TT>lib</TT> are needed for
+  embedding Lua in C or C++ programs.
+
+<H3><A NAME="customization">Customization</A></H3>
+<P>
+  Three kinds of things can be customized by editing a file:
+<UL>
+    <LI> Where and how to install Lua &mdash; edit <TT>Makefile</TT>.
+    <LI> How to build Lua &mdash; edit <TT>src/Makefile</TT>.
+    <LI> Lua features &mdash; edit <TT>src/luaconf.h</TT>.
+</UL>
+
+<P>
+  You don't actually need to edit the Makefiles because you may set the
+  relevant variables in the command line when invoking make.
+  Nevertheless, it's probably best to edit and save the Makefiles to
+  record the changes you've made.
+
+<P>
+  On the other hand, if you need to customize some Lua features, you'll need
+  to edit <TT>src/luaconf.h</TT> before building and installing Lua.
+  The edited file will be the one installed, and
+  it will be used by any Lua clients that you build, to ensure consistency.
+  Further customization is available to experts by editing the Lua sources.
+
+<H3><A NAME="other">Building Lua on other systems</A></H3>
+<P>
+  If you're not using the usual Unix tools, then the instructions for
+  building Lua depend on the compiler you use. You'll need to create
+  projects (or whatever your compiler uses) for building the library,
+  the interpreter, and the compiler, as follows:
+
+<DL CLASS="display">
+<DT>
+library:
+<DD>
+lapi.c lcode.c lctype.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c lmem.c lobject.c lopcodes.c lparser.c lstate.c lstring.c ltable.c ltm.c lundump.c lvm.c lzio.c
+lauxlib.c lbaselib.c lcorolib.c ldblib.c liolib.c lmathlib.c loadlib.c loslib.c lstrlib.c ltablib.c lutf8lib.c linit.c
+<DT>
+interpreter:
+<DD>
+  library, lua.c
+<DT>
+compiler:
+<DD>
+  library, luac.c
+</DL>
+
+<P>
+  To use Lua as a library in your own programs, you'll need to know how to
+  create and use libraries with your compiler. Moreover, to dynamically load
+  C libraries for Lua, you'll need to know how to create dynamic libraries
+  and you'll need to make sure that the Lua API functions are accessible to
+  those dynamic libraries &mdash; but <EM>don't</EM> link the Lua library
+  into each dynamic library. For Unix, we recommend that the Lua library
+  be linked statically into the host program and its symbols exported for
+  dynamic linking; <TT>src/Makefile</TT> does this for the Lua interpreter.
+  For Windows, we recommend that the Lua library be a DLL.
+  In all cases, the compiler luac should be linked statically.
+
+<P>
+  As mentioned above, you may edit <TT>src/luaconf.h</TT> to customize
+  some features before building Lua.
+
+<H2><A NAME="changes">Changes since Lua 5.3</A></H2>
+<P>
+Here are the main changes introduced in Lua 5.4.
+The
+<A HREF="contents.html">reference manual</A>
+lists the
+<A HREF="manual.html#8">incompatibilities</A> that had to be introduced.
+
+<H3>Main changes</H3>
+<UL>
+<LI> new generational mode for garbage collection
+<LI> to-be-closed variables
+<LI> const variables
+<LI> userdata can have multiple user values
+<LI> new implementation for math.random
+<LI> warning system
+<LI> debug information about function arguments and returns
+<LI> new semantics for the integer 'for' loop
+<LI> optional 'init' argument to 'string.gmatch'
+<LI> new functions 'lua_resetthread' and 'coroutine.close'
+<LI> string-to-number coercions moved to the string library
+<LI> allocation function allowed to fail when shrinking a memory block
+<LI> new format '%p' in 'string.format'
+<LI> utf8 library accepts codepoints up to 2^31
+</UL>
+
+<H2><A NAME="license">License</A></H2>
+<P>
+<A HREF="http://www.opensource.org/docs/definition.php">
+<IMG SRC="osi-certified-72x60.png" ALIGN="right" ALT="[osi certified]" STYLE="padding-left: 30px ;">
+</A>
+Lua is free software distributed under the terms of the
+<A HREF="http://www.opensource.org/licenses/mit-license.html">MIT license</A>
+reproduced below;
+it may be used for any purpose, including commercial purposes,
+at absolutely no cost without having to ask us.
+
+The only requirement is that if you do use Lua,
+then you should give us credit by including the appropriate copyright notice somewhere in your product or its documentation.
+
+For details, see
+<A HREF="http://www.lua.org/license.html">this</A>.
+
+<BLOCKQUOTE STYLE="padding-bottom: 0em">
+Copyright &copy; 1994&ndash;2023 Lua.org, PUC-Rio.
+
+<P>
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+<P>
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+<P>
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</BLOCKQUOTE>
+<P>
+
+<P CLASS="footer">
+Last update:
+Tue May  2 20:08:55 UTC 2023
+</P>
+<!--
+Last change: revised for Lua 5.4.6
+-->
+
+</BODY>
+</HTML>
diff --git a/src/libs/3rdparty/lua/lua.qbs b/src/libs/3rdparty/lua/lua.qbs
new file mode 100644
index 00000000000..73d61b039cf
--- /dev/null
+++ b/src/libs/3rdparty/lua/lua.qbs
@@ -0,0 +1,81 @@
+QtcLibrary {
+    name: "lua546"
+    type: "staticlibrary"
+
+    cpp.defines: {
+        var defines = base;
+        if (qbs.targetOS.contains("windows"))
+            defines.push("LUA_USE_WINDOWS");
+        else if (qbs.targetOS.contains("macos"))
+            defines.push("LUA_USE_MACOSX");
+        else if (qbs.targetOS.contains("linux"))
+            defines.push("LUA_USE_LINUX");
+        return defines;
+    }
+
+    Group {
+        name: "Sources"
+        prefix: "src/"
+
+        files: [
+            "lapi.c",
+            "lapi.h",
+            "lauxlib.c",
+            "lauxlib.h",
+            "lbaselib.c",
+            "lcode.c",
+            "lcode.h",
+            "lcorolib.c",
+            "lctype.c",
+            "lctype.h",
+            "ldblib.c",
+            "ldebug.c",
+            "ldebug.h",
+            "ldo.c",
+            "ldo.h",
+            "ldump.c",
+            "lfunc.c",
+            "lfunc.h",
+            "lgc.c",
+            "lgc.h",
+            "linit.c",
+            "liolib.c",
+            "llex.c",
+            "llex.h",
+            "lmathlib.c",
+            "lmem.c",
+            "lmem.h",
+            "loadlib.c",
+            "lobject.c",
+            "lobject.h",
+            "lopcodes.c",
+            "lopcodes.h",
+            "loslib.c",
+            "lparser.c",
+            "lparser.h",
+            "lstate.c",
+            "lstate.h",
+            "lstring.c",
+            "lstring.h",
+            "lstrlib.c",
+            "ltable.c",
+            "ltable.h",
+            "ltablib.c",
+            "ltm.c",
+            "ltm.h",
+            "lua.c",
+            "lua.h",
+            "lundump.c",
+            "lundump.h",
+            "lutf8lib.c",
+            "lvm.c",
+            "lvm.h",
+            "lzio.c",
+            "lzio.h",
+        ]
+    }
+
+    Export {
+        cpp.includePaths: project.ide_source_tree + "/src/libs/3rdparty/lua/src"
+    }
+}
diff --git a/src/libs/3rdparty/lua/src/lapi.c b/src/libs/3rdparty/lua/src/lapi.c
new file mode 100644
index 00000000000..34e64af1428
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lapi.c
@@ -0,0 +1,1463 @@
+/*
+** $Id: lapi.c $
+** Lua API
+** See Copyright Notice in lua.h
+*/
+
+#define lapi_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <limits.h>
+#include <stdarg.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lapi.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+#include "lundump.h"
+#include "lvm.h"
+
+
+
+const char lua_ident[] =
+  "$LuaVersion: " LUA_COPYRIGHT " $"
+  "$LuaAuthors: " LUA_AUTHORS " $";
+
+
+
+/*
+** Test for a valid index (one that is not the 'nilvalue').
+** '!ttisnil(o)' implies 'o != &G(L)->nilvalue', so it is not needed.
+** However, it covers the most common cases in a faster way.
+*/
+#define isvalid(L, o)	(!ttisnil(o) || o != &G(L)->nilvalue)
+
+
+/* test for pseudo index */
+#define ispseudo(i)		((i) <= LUA_REGISTRYINDEX)
+
+/* test for upvalue */
+#define isupvalue(i)		((i) < LUA_REGISTRYINDEX)
+
+
+/*
+** Convert an acceptable index to a pointer to its respective value.
+** Non-valid indices return the special nil value 'G(L)->nilvalue'.
+*/
+static TValue *index2value (lua_State *L, int idx) {
+  CallInfo *ci = L->ci;
+  if (idx > 0) {
+    StkId o = ci->func.p + idx;
+    api_check(L, idx <= ci->top.p - (ci->func.p + 1), "unacceptable index");
+    if (o >= L->top.p) return &G(L)->nilvalue;
+    else return s2v(o);
+  }
+  else if (!ispseudo(idx)) {  /* negative index */
+    api_check(L, idx != 0 && -idx <= L->top.p - (ci->func.p + 1),
+                 "invalid index");
+    return s2v(L->top.p + idx);
+  }
+  else if (idx == LUA_REGISTRYINDEX)
+    return &G(L)->l_registry;
+  else {  /* upvalues */
+    idx = LUA_REGISTRYINDEX - idx;
+    api_check(L, idx <= MAXUPVAL + 1, "upvalue index too large");
+    if (ttisCclosure(s2v(ci->func.p))) {  /* C closure? */
+      CClosure *func = clCvalue(s2v(ci->func.p));
+      return (idx <= func->nupvalues) ? &func->upvalue[idx-1]
+                                      : &G(L)->nilvalue;
+    }
+    else {  /* light C function or Lua function (through a hook)?) */
+      api_check(L, ttislcf(s2v(ci->func.p)), "caller not a C function");
+      return &G(L)->nilvalue;  /* no upvalues */
+    }
+  }
+}
+
+
+
+/*
+** Convert a valid actual index (not a pseudo-index) to its address.
+*/
+l_sinline StkId index2stack (lua_State *L, int idx) {
+  CallInfo *ci = L->ci;
+  if (idx > 0) {
+    StkId o = ci->func.p + idx;
+    api_check(L, o < L->top.p, "invalid index");
+    return o;
+  }
+  else {    /* non-positive index */
+    api_check(L, idx != 0 && -idx <= L->top.p - (ci->func.p + 1),
+                 "invalid index");
+    api_check(L, !ispseudo(idx), "invalid index");
+    return L->top.p + idx;
+  }
+}
+
+
+LUA_API int lua_checkstack (lua_State *L, int n) {
+  int res;
+  CallInfo *ci;
+  lua_lock(L);
+  ci = L->ci;
+  api_check(L, n >= 0, "negative 'n'");
+  if (L->stack_last.p - L->top.p > n)  /* stack large enough? */
+    res = 1;  /* yes; check is OK */
+  else  /* need to grow stack */
+    res = luaD_growstack(L, n, 0);
+  if (res && ci->top.p < L->top.p + n)
+    ci->top.p = L->top.p + n;  /* adjust frame top */
+  lua_unlock(L);
+  return res;
+}
+
+
+LUA_API void lua_xmove (lua_State *from, lua_State *to, int n) {
+  int i;
+  if (from == to) return;
+  lua_lock(to);
+  api_checknelems(from, n);
+  api_check(from, G(from) == G(to), "moving among independent states");
+  api_check(from, to->ci->top.p - to->top.p >= n, "stack overflow");
+  from->top.p -= n;
+  for (i = 0; i < n; i++) {
+    setobjs2s(to, to->top.p, from->top.p + i);
+    to->top.p++;  /* stack already checked by previous 'api_check' */
+  }
+  lua_unlock(to);
+}
+
+
+LUA_API lua_CFunction lua_atpanic (lua_State *L, lua_CFunction panicf) {
+  lua_CFunction old;
+  lua_lock(L);
+  old = G(L)->panic;
+  G(L)->panic = panicf;
+  lua_unlock(L);
+  return old;
+}
+
+
+LUA_API lua_Number lua_version (lua_State *L) {
+  UNUSED(L);
+  return LUA_VERSION_NUM;
+}
+
+
+
+/*
+** basic stack manipulation
+*/
+
+
+/*
+** convert an acceptable stack index into an absolute index
+*/
+LUA_API int lua_absindex (lua_State *L, int idx) {
+  return (idx > 0 || ispseudo(idx))
+         ? idx
+         : cast_int(L->top.p - L->ci->func.p) + idx;
+}
+
+
+LUA_API int lua_gettop (lua_State *L) {
+  return cast_int(L->top.p - (L->ci->func.p + 1));
+}
+
+
+LUA_API void lua_settop (lua_State *L, int idx) {
+  CallInfo *ci;
+  StkId func, newtop;
+  ptrdiff_t diff;  /* difference for new top */
+  lua_lock(L);
+  ci = L->ci;
+  func = ci->func.p;
+  if (idx >= 0) {
+    api_check(L, idx <= ci->top.p - (func + 1), "new top too large");
+    diff = ((func + 1) + idx) - L->top.p;
+    for (; diff > 0; diff--)
+      setnilvalue(s2v(L->top.p++));  /* clear new slots */
+  }
+  else {
+    api_check(L, -(idx+1) <= (L->top.p - (func + 1)), "invalid new top");
+    diff = idx + 1;  /* will "subtract" index (as it is negative) */
+  }
+  api_check(L, L->tbclist.p < L->top.p, "previous pop of an unclosed slot");
+  newtop = L->top.p + diff;
+  if (diff < 0 && L->tbclist.p >= newtop) {
+    lua_assert(hastocloseCfunc(ci->nresults));
+    newtop = luaF_close(L, newtop, CLOSEKTOP, 0);
+  }
+  L->top.p = newtop;  /* correct top only after closing any upvalue */
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_closeslot (lua_State *L, int idx) {
+  StkId level;
+  lua_lock(L);
+  level = index2stack(L, idx);
+  api_check(L, hastocloseCfunc(L->ci->nresults) && L->tbclist.p == level,
+     "no variable to close at given level");
+  level = luaF_close(L, level, CLOSEKTOP, 0);
+  setnilvalue(s2v(level));
+  lua_unlock(L);
+}
+
+
+/*
+** Reverse the stack segment from 'from' to 'to'
+** (auxiliary to 'lua_rotate')
+** Note that we move(copy) only the value inside the stack.
+** (We do not move additional fields that may exist.)
+*/
+l_sinline void reverse (lua_State *L, StkId from, StkId to) {
+  for (; from < to; from++, to--) {
+    TValue temp;
+    setobj(L, &temp, s2v(from));
+    setobjs2s(L, from, to);
+    setobj2s(L, to, &temp);
+  }
+}
+
+
+/*
+** Let x = AB, where A is a prefix of length 'n'. Then,
+** rotate x n == BA. But BA == (A^r . B^r)^r.
+*/
+LUA_API void lua_rotate (lua_State *L, int idx, int n) {
+  StkId p, t, m;
+  lua_lock(L);
+  t = L->top.p - 1;  /* end of stack segment being rotated */
+  p = index2stack(L, idx);  /* start of segment */
+  api_check(L, (n >= 0 ? n : -n) <= (t - p + 1), "invalid 'n'");
+  m = (n >= 0 ? t - n : p - n - 1);  /* end of prefix */
+  reverse(L, p, m);  /* reverse the prefix with length 'n' */
+  reverse(L, m + 1, t);  /* reverse the suffix */
+  reverse(L, p, t);  /* reverse the entire segment */
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_copy (lua_State *L, int fromidx, int toidx) {
+  TValue *fr, *to;
+  lua_lock(L);
+  fr = index2value(L, fromidx);
+  to = index2value(L, toidx);
+  api_check(L, isvalid(L, to), "invalid index");
+  setobj(L, to, fr);
+  if (isupvalue(toidx))  /* function upvalue? */
+    luaC_barrier(L, clCvalue(s2v(L->ci->func.p)), fr);
+  /* LUA_REGISTRYINDEX does not need gc barrier
+     (collector revisits it before finishing collection) */
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushvalue (lua_State *L, int idx) {
+  lua_lock(L);
+  setobj2s(L, L->top.p, index2value(L, idx));
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+
+/*
+** access functions (stack -> C)
+*/
+
+
+LUA_API int lua_type (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  return (isvalid(L, o) ? ttype(o) : LUA_TNONE);
+}
+
+
+LUA_API const char *lua_typename (lua_State *L, int t) {
+  UNUSED(L);
+  api_check(L, LUA_TNONE <= t && t < LUA_NUMTYPES, "invalid type");
+  return ttypename(t);
+}
+
+
+LUA_API int lua_iscfunction (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  return (ttislcf(o) || (ttisCclosure(o)));
+}
+
+
+LUA_API int lua_isinteger (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  return ttisinteger(o);
+}
+
+
+LUA_API int lua_isnumber (lua_State *L, int idx) {
+  lua_Number n;
+  const TValue *o = index2value(L, idx);
+  return tonumber(o, &n);
+}
+
+
+LUA_API int lua_isstring (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  return (ttisstring(o) || cvt2str(o));
+}
+
+
+LUA_API int lua_isuserdata (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  return (ttisfulluserdata(o) || ttislightuserdata(o));
+}
+
+
+LUA_API int lua_rawequal (lua_State *L, int index1, int index2) {
+  const TValue *o1 = index2value(L, index1);
+  const TValue *o2 = index2value(L, index2);
+  return (isvalid(L, o1) && isvalid(L, o2)) ? luaV_rawequalobj(o1, o2) : 0;
+}
+
+
+LUA_API void lua_arith (lua_State *L, int op) {
+  lua_lock(L);
+  if (op != LUA_OPUNM && op != LUA_OPBNOT)
+    api_checknelems(L, 2);  /* all other operations expect two operands */
+  else {  /* for unary operations, add fake 2nd operand */
+    api_checknelems(L, 1);
+    setobjs2s(L, L->top.p, L->top.p - 1);
+    api_incr_top(L);
+  }
+  /* first operand at top - 2, second at top - 1; result go to top - 2 */
+  luaO_arith(L, op, s2v(L->top.p - 2), s2v(L->top.p - 1), L->top.p - 2);
+  L->top.p--;  /* remove second operand */
+  lua_unlock(L);
+}
+
+
+LUA_API int lua_compare (lua_State *L, int index1, int index2, int op) {
+  const TValue *o1;
+  const TValue *o2;
+  int i = 0;
+  lua_lock(L);  /* may call tag method */
+  o1 = index2value(L, index1);
+  o2 = index2value(L, index2);
+  if (isvalid(L, o1) && isvalid(L, o2)) {
+    switch (op) {
+      case LUA_OPEQ: i = luaV_equalobj(L, o1, o2); break;
+      case LUA_OPLT: i = luaV_lessthan(L, o1, o2); break;
+      case LUA_OPLE: i = luaV_lessequal(L, o1, o2); break;
+      default: api_check(L, 0, "invalid option");
+    }
+  }
+  lua_unlock(L);
+  return i;
+}
+
+
+LUA_API size_t lua_stringtonumber (lua_State *L, const char *s) {
+  size_t sz = luaO_str2num(s, s2v(L->top.p));
+  if (sz != 0)
+    api_incr_top(L);
+  return sz;
+}
+
+
+LUA_API lua_Number lua_tonumberx (lua_State *L, int idx, int *pisnum) {
+  lua_Number n = 0;
+  const TValue *o = index2value(L, idx);
+  int isnum = tonumber(o, &n);
+  if (pisnum)
+    *pisnum = isnum;
+  return n;
+}
+
+
+LUA_API lua_Integer lua_tointegerx (lua_State *L, int idx, int *pisnum) {
+  lua_Integer res = 0;
+  const TValue *o = index2value(L, idx);
+  int isnum = tointeger(o, &res);
+  if (pisnum)
+    *pisnum = isnum;
+  return res;
+}
+
+
+LUA_API int lua_toboolean (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  return !l_isfalse(o);
+}
+
+
+LUA_API const char *lua_tolstring (lua_State *L, int idx, size_t *len) {
+  TValue *o;
+  lua_lock(L);
+  o = index2value(L, idx);
+  if (!ttisstring(o)) {
+    if (!cvt2str(o)) {  /* not convertible? */
+      if (len != NULL) *len = 0;
+      lua_unlock(L);
+      return NULL;
+    }
+    luaO_tostring(L, o);
+    luaC_checkGC(L);
+    o = index2value(L, idx);  /* previous call may reallocate the stack */
+  }
+  if (len != NULL)
+    *len = vslen(o);
+  lua_unlock(L);
+  return svalue(o);
+}
+
+
+LUA_API lua_Unsigned lua_rawlen (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  switch (ttypetag(o)) {
+    case LUA_VSHRSTR: return tsvalue(o)->shrlen;
+    case LUA_VLNGSTR: return tsvalue(o)->u.lnglen;
+    case LUA_VUSERDATA: return uvalue(o)->len;
+    case LUA_VTABLE: return luaH_getn(hvalue(o));
+    default: return 0;
+  }
+}
+
+
+LUA_API lua_CFunction lua_tocfunction (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  if (ttislcf(o)) return fvalue(o);
+  else if (ttisCclosure(o))
+    return clCvalue(o)->f;
+  else return NULL;  /* not a C function */
+}
+
+
+l_sinline void *touserdata (const TValue *o) {
+  switch (ttype(o)) {
+    case LUA_TUSERDATA: return getudatamem(uvalue(o));
+    case LUA_TLIGHTUSERDATA: return pvalue(o);
+    default: return NULL;
+  }
+}
+
+
+LUA_API void *lua_touserdata (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  return touserdata(o);
+}
+
+
+LUA_API lua_State *lua_tothread (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  return (!ttisthread(o)) ? NULL : thvalue(o);
+}
+
+
+/*
+** Returns a pointer to the internal representation of an object.
+** Note that ANSI C does not allow the conversion of a pointer to
+** function to a 'void*', so the conversion here goes through
+** a 'size_t'. (As the returned pointer is only informative, this
+** conversion should not be a problem.)
+*/
+LUA_API const void *lua_topointer (lua_State *L, int idx) {
+  const TValue *o = index2value(L, idx);
+  switch (ttypetag(o)) {
+    case LUA_VLCF: return cast_voidp(cast_sizet(fvalue(o)));
+    case LUA_VUSERDATA: case LUA_VLIGHTUSERDATA:
+      return touserdata(o);
+    default: {
+      if (iscollectable(o))
+        return gcvalue(o);
+      else
+        return NULL;
+    }
+  }
+}
+
+
+
+/*
+** push functions (C -> stack)
+*/
+
+
+LUA_API void lua_pushnil (lua_State *L) {
+  lua_lock(L);
+  setnilvalue(s2v(L->top.p));
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushnumber (lua_State *L, lua_Number n) {
+  lua_lock(L);
+  setfltvalue(s2v(L->top.p), n);
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushinteger (lua_State *L, lua_Integer n) {
+  lua_lock(L);
+  setivalue(s2v(L->top.p), n);
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+/*
+** Pushes on the stack a string with given length. Avoid using 's' when
+** 'len' == 0 (as 's' can be NULL in that case), due to later use of
+** 'memcmp' and 'memcpy'.
+*/
+LUA_API const char *lua_pushlstring (lua_State *L, const char *s, size_t len) {
+  TString *ts;
+  lua_lock(L);
+  ts = (len == 0) ? luaS_new(L, "") : luaS_newlstr(L, s, len);
+  setsvalue2s(L, L->top.p, ts);
+  api_incr_top(L);
+  luaC_checkGC(L);
+  lua_unlock(L);
+  return getstr(ts);
+}
+
+
+LUA_API const char *lua_pushstring (lua_State *L, const char *s) {
+  lua_lock(L);
+  if (s == NULL)
+    setnilvalue(s2v(L->top.p));
+  else {
+    TString *ts;
+    ts = luaS_new(L, s);
+    setsvalue2s(L, L->top.p, ts);
+    s = getstr(ts);  /* internal copy's address */
+  }
+  api_incr_top(L);
+  luaC_checkGC(L);
+  lua_unlock(L);
+  return s;
+}
+
+
+LUA_API const char *lua_pushvfstring (lua_State *L, const char *fmt,
+                                      va_list argp) {
+  const char *ret;
+  lua_lock(L);
+  ret = luaO_pushvfstring(L, fmt, argp);
+  luaC_checkGC(L);
+  lua_unlock(L);
+  return ret;
+}
+
+
+LUA_API const char *lua_pushfstring (lua_State *L, const char *fmt, ...) {
+  const char *ret;
+  va_list argp;
+  lua_lock(L);
+  va_start(argp, fmt);
+  ret = luaO_pushvfstring(L, fmt, argp);
+  va_end(argp);
+  luaC_checkGC(L);
+  lua_unlock(L);
+  return ret;
+}
+
+
+LUA_API void lua_pushcclosure (lua_State *L, lua_CFunction fn, int n) {
+  lua_lock(L);
+  if (n == 0) {
+    setfvalue(s2v(L->top.p), fn);
+    api_incr_top(L);
+  }
+  else {
+    CClosure *cl;
+    api_checknelems(L, n);
+    api_check(L, n <= MAXUPVAL, "upvalue index too large");
+    cl = luaF_newCclosure(L, n);
+    cl->f = fn;
+    L->top.p -= n;
+    while (n--) {
+      setobj2n(L, &cl->upvalue[n], s2v(L->top.p + n));
+      /* does not need barrier because closure is white */
+      lua_assert(iswhite(cl));
+    }
+    setclCvalue(L, s2v(L->top.p), cl);
+    api_incr_top(L);
+    luaC_checkGC(L);
+  }
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushboolean (lua_State *L, int b) {
+  lua_lock(L);
+  if (b)
+    setbtvalue(s2v(L->top.p));
+  else
+    setbfvalue(s2v(L->top.p));
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushlightuserdata (lua_State *L, void *p) {
+  lua_lock(L);
+  setpvalue(s2v(L->top.p), p);
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API int lua_pushthread (lua_State *L) {
+  lua_lock(L);
+  setthvalue(L, s2v(L->top.p), L);
+  api_incr_top(L);
+  lua_unlock(L);
+  return (G(L)->mainthread == L);
+}
+
+
+
+/*
+** get functions (Lua -> stack)
+*/
+
+
+l_sinline int auxgetstr (lua_State *L, const TValue *t, const char *k) {
+  const TValue *slot;
+  TString *str = luaS_new(L, k);
+  if (luaV_fastget(L, t, str, slot, luaH_getstr)) {
+    setobj2s(L, L->top.p, slot);
+    api_incr_top(L);
+  }
+  else {
+    setsvalue2s(L, L->top.p, str);
+    api_incr_top(L);
+    luaV_finishget(L, t, s2v(L->top.p - 1), L->top.p - 1, slot);
+  }
+  lua_unlock(L);
+  return ttype(s2v(L->top.p - 1));
+}
+
+
+/*
+** Get the global table in the registry. Since all predefined
+** indices in the registry were inserted right when the registry
+** was created and never removed, they must always be in the array
+** part of the registry.
+*/
+#define getGtable(L)  \
+	(&hvalue(&G(L)->l_registry)->array[LUA_RIDX_GLOBALS - 1])
+
+
+LUA_API int lua_getglobal (lua_State *L, const char *name) {
+  const TValue *G;
+  lua_lock(L);
+  G = getGtable(L);
+  return auxgetstr(L, G, name);
+}
+
+
+LUA_API int lua_gettable (lua_State *L, int idx) {
+  const TValue *slot;
+  TValue *t;
+  lua_lock(L);
+  t = index2value(L, idx);
+  if (luaV_fastget(L, t, s2v(L->top.p - 1), slot, luaH_get)) {
+    setobj2s(L, L->top.p - 1, slot);
+  }
+  else
+    luaV_finishget(L, t, s2v(L->top.p - 1), L->top.p - 1, slot);
+  lua_unlock(L);
+  return ttype(s2v(L->top.p - 1));
+}
+
+
+LUA_API int lua_getfield (lua_State *L, int idx, const char *k) {
+  lua_lock(L);
+  return auxgetstr(L, index2value(L, idx), k);
+}
+
+
+LUA_API int lua_geti (lua_State *L, int idx, lua_Integer n) {
+  TValue *t;
+  const TValue *slot;
+  lua_lock(L);
+  t = index2value(L, idx);
+  if (luaV_fastgeti(L, t, n, slot)) {
+    setobj2s(L, L->top.p, slot);
+  }
+  else {
+    TValue aux;
+    setivalue(&aux, n);
+    luaV_finishget(L, t, &aux, L->top.p, slot);
+  }
+  api_incr_top(L);
+  lua_unlock(L);
+  return ttype(s2v(L->top.p - 1));
+}
+
+
+l_sinline int finishrawget (lua_State *L, const TValue *val) {
+  if (isempty(val))  /* avoid copying empty items to the stack */
+    setnilvalue(s2v(L->top.p));
+  else
+    setobj2s(L, L->top.p, val);
+  api_incr_top(L);
+  lua_unlock(L);
+  return ttype(s2v(L->top.p - 1));
+}
+
+
+static Table *gettable (lua_State *L, int idx) {
+  TValue *t = index2value(L, idx);
+  api_check(L, ttistable(t), "table expected");
+  return hvalue(t);
+}
+
+
+LUA_API int lua_rawget (lua_State *L, int idx) {
+  Table *t;
+  const TValue *val;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  t = gettable(L, idx);
+  val = luaH_get(t, s2v(L->top.p - 1));
+  L->top.p--;  /* remove key */
+  return finishrawget(L, val);
+}
+
+
+LUA_API int lua_rawgeti (lua_State *L, int idx, lua_Integer n) {
+  Table *t;
+  lua_lock(L);
+  t = gettable(L, idx);
+  return finishrawget(L, luaH_getint(t, n));
+}
+
+
+LUA_API int lua_rawgetp (lua_State *L, int idx, const void *p) {
+  Table *t;
+  TValue k;
+  lua_lock(L);
+  t = gettable(L, idx);
+  setpvalue(&k, cast_voidp(p));
+  return finishrawget(L, luaH_get(t, &k));
+}
+
+
+LUA_API void lua_createtable (lua_State *L, int narray, int nrec) {
+  Table *t;
+  lua_lock(L);
+  t = luaH_new(L);
+  sethvalue2s(L, L->top.p, t);
+  api_incr_top(L);
+  if (narray > 0 || nrec > 0)
+    luaH_resize(L, t, narray, nrec);
+  luaC_checkGC(L);
+  lua_unlock(L);
+}
+
+
+LUA_API int lua_getmetatable (lua_State *L, int objindex) {
+  const TValue *obj;
+  Table *mt;
+  int res = 0;
+  lua_lock(L);
+  obj = index2value(L, objindex);
+  switch (ttype(obj)) {
+    case LUA_TTABLE:
+      mt = hvalue(obj)->metatable;
+      break;
+    case LUA_TUSERDATA:
+      mt = uvalue(obj)->metatable;
+      break;
+    default:
+      mt = G(L)->mt[ttype(obj)];
+      break;
+  }
+  if (mt != NULL) {
+    sethvalue2s(L, L->top.p, mt);
+    api_incr_top(L);
+    res = 1;
+  }
+  lua_unlock(L);
+  return res;
+}
+
+
+LUA_API int lua_getiuservalue (lua_State *L, int idx, int n) {
+  TValue *o;
+  int t;
+  lua_lock(L);
+  o = index2value(L, idx);
+  api_check(L, ttisfulluserdata(o), "full userdata expected");
+  if (n <= 0 || n > uvalue(o)->nuvalue) {
+    setnilvalue(s2v(L->top.p));
+    t = LUA_TNONE;
+  }
+  else {
+    setobj2s(L, L->top.p, &uvalue(o)->uv[n - 1].uv);
+    t = ttype(s2v(L->top.p));
+  }
+  api_incr_top(L);
+  lua_unlock(L);
+  return t;
+}
+
+
+/*
+** set functions (stack -> Lua)
+*/
+
+/*
+** t[k] = value at the top of the stack (where 'k' is a string)
+*/
+static void auxsetstr (lua_State *L, const TValue *t, const char *k) {
+  const TValue *slot;
+  TString *str = luaS_new(L, k);
+  api_checknelems(L, 1);
+  if (luaV_fastget(L, t, str, slot, luaH_getstr)) {
+    luaV_finishfastset(L, t, slot, s2v(L->top.p - 1));
+    L->top.p--;  /* pop value */
+  }
+  else {
+    setsvalue2s(L, L->top.p, str);  /* push 'str' (to make it a TValue) */
+    api_incr_top(L);
+    luaV_finishset(L, t, s2v(L->top.p - 1), s2v(L->top.p - 2), slot);
+    L->top.p -= 2;  /* pop value and key */
+  }
+  lua_unlock(L);  /* lock done by caller */
+}
+
+
+LUA_API void lua_setglobal (lua_State *L, const char *name) {
+  const TValue *G;
+  lua_lock(L);  /* unlock done in 'auxsetstr' */
+  G = getGtable(L);
+  auxsetstr(L, G, name);
+}
+
+
+LUA_API void lua_settable (lua_State *L, int idx) {
+  TValue *t;
+  const TValue *slot;
+  lua_lock(L);
+  api_checknelems(L, 2);
+  t = index2value(L, idx);
+  if (luaV_fastget(L, t, s2v(L->top.p - 2), slot, luaH_get)) {
+    luaV_finishfastset(L, t, slot, s2v(L->top.p - 1));
+  }
+  else
+    luaV_finishset(L, t, s2v(L->top.p - 2), s2v(L->top.p - 1), slot);
+  L->top.p -= 2;  /* pop index and value */
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_setfield (lua_State *L, int idx, const char *k) {
+  lua_lock(L);  /* unlock done in 'auxsetstr' */
+  auxsetstr(L, index2value(L, idx), k);
+}
+
+
+LUA_API void lua_seti (lua_State *L, int idx, lua_Integer n) {
+  TValue *t;
+  const TValue *slot;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  t = index2value(L, idx);
+  if (luaV_fastgeti(L, t, n, slot)) {
+    luaV_finishfastset(L, t, slot, s2v(L->top.p - 1));
+  }
+  else {
+    TValue aux;
+    setivalue(&aux, n);
+    luaV_finishset(L, t, &aux, s2v(L->top.p - 1), slot);
+  }
+  L->top.p--;  /* pop value */
+  lua_unlock(L);
+}
+
+
+static void aux_rawset (lua_State *L, int idx, TValue *key, int n) {
+  Table *t;
+  lua_lock(L);
+  api_checknelems(L, n);
+  t = gettable(L, idx);
+  luaH_set(L, t, key, s2v(L->top.p - 1));
+  invalidateTMcache(t);
+  luaC_barrierback(L, obj2gco(t), s2v(L->top.p - 1));
+  L->top.p -= n;
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_rawset (lua_State *L, int idx) {
+  aux_rawset(L, idx, s2v(L->top.p - 2), 2);
+}
+
+
+LUA_API void lua_rawsetp (lua_State *L, int idx, const void *p) {
+  TValue k;
+  setpvalue(&k, cast_voidp(p));
+  aux_rawset(L, idx, &k, 1);
+}
+
+
+LUA_API void lua_rawseti (lua_State *L, int idx, lua_Integer n) {
+  Table *t;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  t = gettable(L, idx);
+  luaH_setint(L, t, n, s2v(L->top.p - 1));
+  luaC_barrierback(L, obj2gco(t), s2v(L->top.p - 1));
+  L->top.p--;
+  lua_unlock(L);
+}
+
+
+LUA_API int lua_setmetatable (lua_State *L, int objindex) {
+  TValue *obj;
+  Table *mt;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  obj = index2value(L, objindex);
+  if (ttisnil(s2v(L->top.p - 1)))
+    mt = NULL;
+  else {
+    api_check(L, ttistable(s2v(L->top.p - 1)), "table expected");
+    mt = hvalue(s2v(L->top.p - 1));
+  }
+  switch (ttype(obj)) {
+    case LUA_TTABLE: {
+      hvalue(obj)->metatable = mt;
+      if (mt) {
+        luaC_objbarrier(L, gcvalue(obj), mt);
+        luaC_checkfinalizer(L, gcvalue(obj), mt);
+      }
+      break;
+    }
+    case LUA_TUSERDATA: {
+      uvalue(obj)->metatable = mt;
+      if (mt) {
+        luaC_objbarrier(L, uvalue(obj), mt);
+        luaC_checkfinalizer(L, gcvalue(obj), mt);
+      }
+      break;
+    }
+    default: {
+      G(L)->mt[ttype(obj)] = mt;
+      break;
+    }
+  }
+  L->top.p--;
+  lua_unlock(L);
+  return 1;
+}
+
+
+LUA_API int lua_setiuservalue (lua_State *L, int idx, int n) {
+  TValue *o;
+  int res;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  o = index2value(L, idx);
+  api_check(L, ttisfulluserdata(o), "full userdata expected");
+  if (!(cast_uint(n) - 1u < cast_uint(uvalue(o)->nuvalue)))
+    res = 0;  /* 'n' not in [1, uvalue(o)->nuvalue] */
+  else {
+    setobj(L, &uvalue(o)->uv[n - 1].uv, s2v(L->top.p - 1));
+    luaC_barrierback(L, gcvalue(o), s2v(L->top.p - 1));
+    res = 1;
+  }
+  L->top.p--;
+  lua_unlock(L);
+  return res;
+}
+
+
+/*
+** 'load' and 'call' functions (run Lua code)
+*/
+
+
+#define checkresults(L,na,nr) \
+     api_check(L, (nr) == LUA_MULTRET \
+               || (L->ci->top.p - L->top.p >= (nr) - (na)), \
+	"results from function overflow current stack size")
+
+
+LUA_API void lua_callk (lua_State *L, int nargs, int nresults,
+                        lua_KContext ctx, lua_KFunction k) {
+  StkId func;
+  lua_lock(L);
+  api_check(L, k == NULL || !isLua(L->ci),
+    "cannot use continuations inside hooks");
+  api_checknelems(L, nargs+1);
+  api_check(L, L->status == LUA_OK, "cannot do calls on non-normal thread");
+  checkresults(L, nargs, nresults);
+  func = L->top.p - (nargs+1);
+  if (k != NULL && yieldable(L)) {  /* need to prepare continuation? */
+    L->ci->u.c.k = k;  /* save continuation */
+    L->ci->u.c.ctx = ctx;  /* save context */
+    luaD_call(L, func, nresults);  /* do the call */
+  }
+  else  /* no continuation or no yieldable */
+    luaD_callnoyield(L, func, nresults);  /* just do the call */
+  adjustresults(L, nresults);
+  lua_unlock(L);
+}
+
+
+
+/*
+** Execute a protected call.
+*/
+struct CallS {  /* data to 'f_call' */
+  StkId func;
+  int nresults;
+};
+
+
+static void f_call (lua_State *L, void *ud) {
+  struct CallS *c = cast(struct CallS *, ud);
+  luaD_callnoyield(L, c->func, c->nresults);
+}
+
+
+
+LUA_API int lua_pcallk (lua_State *L, int nargs, int nresults, int errfunc,
+                        lua_KContext ctx, lua_KFunction k) {
+  struct CallS c;
+  int status;
+  ptrdiff_t func;
+  lua_lock(L);
+  api_check(L, k == NULL || !isLua(L->ci),
+    "cannot use continuations inside hooks");
+  api_checknelems(L, nargs+1);
+  api_check(L, L->status == LUA_OK, "cannot do calls on non-normal thread");
+  checkresults(L, nargs, nresults);
+  if (errfunc == 0)
+    func = 0;
+  else {
+    StkId o = index2stack(L, errfunc);
+    api_check(L, ttisfunction(s2v(o)), "error handler must be a function");
+    func = savestack(L, o);
+  }
+  c.func = L->top.p - (nargs+1);  /* function to be called */
+  if (k == NULL || !yieldable(L)) {  /* no continuation or no yieldable? */
+    c.nresults = nresults;  /* do a 'conventional' protected call */
+    status = luaD_pcall(L, f_call, &c, savestack(L, c.func), func);
+  }
+  else {  /* prepare continuation (call is already protected by 'resume') */
+    CallInfo *ci = L->ci;
+    ci->u.c.k = k;  /* save continuation */
+    ci->u.c.ctx = ctx;  /* save context */
+    /* save information for error recovery */
+    ci->u2.funcidx = cast_int(savestack(L, c.func));
+    ci->u.c.old_errfunc = L->errfunc;
+    L->errfunc = func;
+    setoah(ci->callstatus, L->allowhook);  /* save value of 'allowhook' */
+    ci->callstatus |= CIST_YPCALL;  /* function can do error recovery */
+    luaD_call(L, c.func, nresults);  /* do the call */
+    ci->callstatus &= ~CIST_YPCALL;
+    L->errfunc = ci->u.c.old_errfunc;
+    status = LUA_OK;  /* if it is here, there were no errors */
+  }
+  adjustresults(L, nresults);
+  lua_unlock(L);
+  return status;
+}
+
+
+LUA_API int lua_load (lua_State *L, lua_Reader reader, void *data,
+                      const char *chunkname, const char *mode) {
+  ZIO z;
+  int status;
+  lua_lock(L);
+  if (!chunkname) chunkname = "?";
+  luaZ_init(L, &z, reader, data);
+  status = luaD_protectedparser(L, &z, chunkname, mode);
+  if (status == LUA_OK) {  /* no errors? */
+    LClosure *f = clLvalue(s2v(L->top.p - 1));  /* get new function */
+    if (f->nupvalues >= 1) {  /* does it have an upvalue? */
+      /* get global table from registry */
+      const TValue *gt = getGtable(L);
+      /* set global table as 1st upvalue of 'f' (may be LUA_ENV) */
+      setobj(L, f->upvals[0]->v.p, gt);
+      luaC_barrier(L, f->upvals[0], gt);
+    }
+  }
+  lua_unlock(L);
+  return status;
+}
+
+
+LUA_API int lua_dump (lua_State *L, lua_Writer writer, void *data, int strip) {
+  int status;
+  TValue *o;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  o = s2v(L->top.p - 1);
+  if (isLfunction(o))
+    status = luaU_dump(L, getproto(o), writer, data, strip);
+  else
+    status = 1;
+  lua_unlock(L);
+  return status;
+}
+
+
+LUA_API int lua_status (lua_State *L) {
+  return L->status;
+}
+
+
+/*
+** Garbage-collection function
+*/
+LUA_API int lua_gc (lua_State *L, int what, ...) {
+  va_list argp;
+  int res = 0;
+  global_State *g = G(L);
+  if (g->gcstp & GCSTPGC)  /* internal stop? */
+    return -1;  /* all options are invalid when stopped */
+  lua_lock(L);
+  va_start(argp, what);
+  switch (what) {
+    case LUA_GCSTOP: {
+      g->gcstp = GCSTPUSR;  /* stopped by the user */
+      break;
+    }
+    case LUA_GCRESTART: {
+      luaE_setdebt(g, 0);
+      g->gcstp = 0;  /* (GCSTPGC must be already zero here) */
+      break;
+    }
+    case LUA_GCCOLLECT: {
+      luaC_fullgc(L, 0);
+      break;
+    }
+    case LUA_GCCOUNT: {
+      /* GC values are expressed in Kbytes: #bytes/2^10 */
+      res = cast_int(gettotalbytes(g) >> 10);
+      break;
+    }
+    case LUA_GCCOUNTB: {
+      res = cast_int(gettotalbytes(g) & 0x3ff);
+      break;
+    }
+    case LUA_GCSTEP: {
+      int data = va_arg(argp, int);
+      l_mem debt = 1;  /* =1 to signal that it did an actual step */
+      lu_byte oldstp = g->gcstp;
+      g->gcstp = 0;  /* allow GC to run (GCSTPGC must be zero here) */
+      if (data == 0) {
+        luaE_setdebt(g, 0);  /* do a basic step */
+        luaC_step(L);
+      }
+      else {  /* add 'data' to total debt */
+        debt = cast(l_mem, data) * 1024 + g->GCdebt;
+        luaE_setdebt(g, debt);
+        luaC_checkGC(L);
+      }
+      g->gcstp = oldstp;  /* restore previous state */
+      if (debt > 0 && g->gcstate == GCSpause)  /* end of cycle? */
+        res = 1;  /* signal it */
+      break;
+    }
+    case LUA_GCSETPAUSE: {
+      int data = va_arg(argp, int);
+      res = getgcparam(g->gcpause);
+      setgcparam(g->gcpause, data);
+      break;
+    }
+    case LUA_GCSETSTEPMUL: {
+      int data = va_arg(argp, int);
+      res = getgcparam(g->gcstepmul);
+      setgcparam(g->gcstepmul, data);
+      break;
+    }
+    case LUA_GCISRUNNING: {
+      res = gcrunning(g);
+      break;
+    }
+    case LUA_GCGEN: {
+      int minormul = va_arg(argp, int);
+      int majormul = va_arg(argp, int);
+      res = isdecGCmodegen(g) ? LUA_GCGEN : LUA_GCINC;
+      if (minormul != 0)
+        g->genminormul = minormul;
+      if (majormul != 0)
+        setgcparam(g->genmajormul, majormul);
+      luaC_changemode(L, KGC_GEN);
+      break;
+    }
+    case LUA_GCINC: {
+      int pause = va_arg(argp, int);
+      int stepmul = va_arg(argp, int);
+      int stepsize = va_arg(argp, int);
+      res = isdecGCmodegen(g) ? LUA_GCGEN : LUA_GCINC;
+      if (pause != 0)
+        setgcparam(g->gcpause, pause);
+      if (stepmul != 0)
+        setgcparam(g->gcstepmul, stepmul);
+      if (stepsize != 0)
+        g->gcstepsize = stepsize;
+      luaC_changemode(L, KGC_INC);
+      break;
+    }
+    default: res = -1;  /* invalid option */
+  }
+  va_end(argp);
+  lua_unlock(L);
+  return res;
+}
+
+
+
+/*
+** miscellaneous functions
+*/
+
+
+LUA_API int lua_error (lua_State *L) {
+  TValue *errobj;
+  lua_lock(L);
+  errobj = s2v(L->top.p - 1);
+  api_checknelems(L, 1);
+  /* error object is the memory error message? */
+  if (ttisshrstring(errobj) && eqshrstr(tsvalue(errobj), G(L)->memerrmsg))
+    luaM_error(L);  /* raise a memory error */
+  else
+    luaG_errormsg(L);  /* raise a regular error */
+  /* code unreachable; will unlock when control actually leaves the kernel */
+  return 0;  /* to avoid warnings */
+}
+
+
+LUA_API int lua_next (lua_State *L, int idx) {
+  Table *t;
+  int more;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  t = gettable(L, idx);
+  more = luaH_next(L, t, L->top.p - 1);
+  if (more) {
+    api_incr_top(L);
+  }
+  else  /* no more elements */
+    L->top.p -= 1;  /* remove key */
+  lua_unlock(L);
+  return more;
+}
+
+
+LUA_API void lua_toclose (lua_State *L, int idx) {
+  int nresults;
+  StkId o;
+  lua_lock(L);
+  o = index2stack(L, idx);
+  nresults = L->ci->nresults;
+  api_check(L, L->tbclist.p < o, "given index below or equal a marked one");
+  luaF_newtbcupval(L, o);  /* create new to-be-closed upvalue */
+  if (!hastocloseCfunc(nresults))  /* function not marked yet? */
+    L->ci->nresults = codeNresults(nresults);  /* mark it */
+  lua_assert(hastocloseCfunc(L->ci->nresults));
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_concat (lua_State *L, int n) {
+  lua_lock(L);
+  api_checknelems(L, n);
+  if (n > 0)
+    luaV_concat(L, n);
+  else {  /* nothing to concatenate */
+    setsvalue2s(L, L->top.p, luaS_newlstr(L, "", 0));  /* push empty string */
+    api_incr_top(L);
+  }
+  luaC_checkGC(L);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_len (lua_State *L, int idx) {
+  TValue *t;
+  lua_lock(L);
+  t = index2value(L, idx);
+  luaV_objlen(L, L->top.p, t);
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API lua_Alloc lua_getallocf (lua_State *L, void **ud) {
+  lua_Alloc f;
+  lua_lock(L);
+  if (ud) *ud = G(L)->ud;
+  f = G(L)->frealloc;
+  lua_unlock(L);
+  return f;
+}
+
+
+LUA_API void lua_setallocf (lua_State *L, lua_Alloc f, void *ud) {
+  lua_lock(L);
+  G(L)->ud = ud;
+  G(L)->frealloc = f;
+  lua_unlock(L);
+}
+
+
+void lua_setwarnf (lua_State *L, lua_WarnFunction f, void *ud) {
+  lua_lock(L);
+  G(L)->ud_warn = ud;
+  G(L)->warnf = f;
+  lua_unlock(L);
+}
+
+
+void lua_warning (lua_State *L, const char *msg, int tocont) {
+  lua_lock(L);
+  luaE_warning(L, msg, tocont);
+  lua_unlock(L);
+}
+
+
+
+LUA_API void *lua_newuserdatauv (lua_State *L, size_t size, int nuvalue) {
+  Udata *u;
+  lua_lock(L);
+  api_check(L, 0 <= nuvalue && nuvalue < USHRT_MAX, "invalid value");
+  u = luaS_newudata(L, size, nuvalue);
+  setuvalue(L, s2v(L->top.p), u);
+  api_incr_top(L);
+  luaC_checkGC(L);
+  lua_unlock(L);
+  return getudatamem(u);
+}
+
+
+
+static const char *aux_upvalue (TValue *fi, int n, TValue **val,
+                                GCObject **owner) {
+  switch (ttypetag(fi)) {
+    case LUA_VCCL: {  /* C closure */
+      CClosure *f = clCvalue(fi);
+      if (!(cast_uint(n) - 1u < cast_uint(f->nupvalues)))
+        return NULL;  /* 'n' not in [1, f->nupvalues] */
+      *val = &f->upvalue[n-1];
+      if (owner) *owner = obj2gco(f);
+      return "";
+    }
+    case LUA_VLCL: {  /* Lua closure */
+      LClosure *f = clLvalue(fi);
+      TString *name;
+      Proto *p = f->p;
+      if (!(cast_uint(n) - 1u  < cast_uint(p->sizeupvalues)))
+        return NULL;  /* 'n' not in [1, p->sizeupvalues] */
+      *val = f->upvals[n-1]->v.p;
+      if (owner) *owner = obj2gco(f->upvals[n - 1]);
+      name = p->upvalues[n-1].name;
+      return (name == NULL) ? "(no name)" : getstr(name);
+    }
+    default: return NULL;  /* not a closure */
+  }
+}
+
+
+LUA_API const char *lua_getupvalue (lua_State *L, int funcindex, int n) {
+  const char *name;
+  TValue *val = NULL;  /* to avoid warnings */
+  lua_lock(L);
+  name = aux_upvalue(index2value(L, funcindex), n, &val, NULL);
+  if (name) {
+    setobj2s(L, L->top.p, val);
+    api_incr_top(L);
+  }
+  lua_unlock(L);
+  return name;
+}
+
+
+LUA_API const char *lua_setupvalue (lua_State *L, int funcindex, int n) {
+  const char *name;
+  TValue *val = NULL;  /* to avoid warnings */
+  GCObject *owner = NULL;  /* to avoid warnings */
+  TValue *fi;
+  lua_lock(L);
+  fi = index2value(L, funcindex);
+  api_checknelems(L, 1);
+  name = aux_upvalue(fi, n, &val, &owner);
+  if (name) {
+    L->top.p--;
+    setobj(L, val, s2v(L->top.p));
+    luaC_barrier(L, owner, val);
+  }
+  lua_unlock(L);
+  return name;
+}
+
+
+static UpVal **getupvalref (lua_State *L, int fidx, int n, LClosure **pf) {
+  static const UpVal *const nullup = NULL;
+  LClosure *f;
+  TValue *fi = index2value(L, fidx);
+  api_check(L, ttisLclosure(fi), "Lua function expected");
+  f = clLvalue(fi);
+  if (pf) *pf = f;
+  if (1 <= n && n <= f->p->sizeupvalues)
+    return &f->upvals[n - 1];  /* get its upvalue pointer */
+  else
+    return (UpVal**)&nullup;
+}
+
+
+LUA_API void *lua_upvalueid (lua_State *L, int fidx, int n) {
+  TValue *fi = index2value(L, fidx);
+  switch (ttypetag(fi)) {
+    case LUA_VLCL: {  /* lua closure */
+      return *getupvalref(L, fidx, n, NULL);
+    }
+    case LUA_VCCL: {  /* C closure */
+      CClosure *f = clCvalue(fi);
+      if (1 <= n && n <= f->nupvalues)
+        return &f->upvalue[n - 1];
+      /* else */
+    }  /* FALLTHROUGH */
+    case LUA_VLCF:
+      return NULL;  /* light C functions have no upvalues */
+    default: {
+      api_check(L, 0, "function expected");
+      return NULL;
+    }
+  }
+}
+
+
+LUA_API void lua_upvaluejoin (lua_State *L, int fidx1, int n1,
+                                            int fidx2, int n2) {
+  LClosure *f1;
+  UpVal **up1 = getupvalref(L, fidx1, n1, &f1);
+  UpVal **up2 = getupvalref(L, fidx2, n2, NULL);
+  api_check(L, *up1 != NULL && *up2 != NULL, "invalid upvalue index");
+  *up1 = *up2;
+  luaC_objbarrier(L, f1, *up1);
+}
+
+
diff --git a/src/libs/3rdparty/lua/src/lapi.h b/src/libs/3rdparty/lua/src/lapi.h
new file mode 100644
index 00000000000..a742427cdc7
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lapi.h
@@ -0,0 +1,52 @@
+/*
+** $Id: lapi.h $
+** Auxiliary functions from Lua API
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lapi_h
+#define lapi_h
+
+
+#include "llimits.h"
+#include "lstate.h"
+
+
+/* Increments 'L->top.p', checking for stack overflows */
+#define api_incr_top(L)	{L->top.p++; \
+			 api_check(L, L->top.p <= L->ci->top.p, \
+					"stack overflow");}
+
+
+/*
+** If a call returns too many multiple returns, the callee may not have
+** stack space to accommodate all results. In this case, this macro
+** increases its stack space ('L->ci->top.p').
+*/
+#define adjustresults(L,nres) \
+    { if ((nres) <= LUA_MULTRET && L->ci->top.p < L->top.p) \
+	L->ci->top.p = L->top.p; }
+
+
+/* Ensure the stack has at least 'n' elements */
+#define api_checknelems(L,n) \
+	api_check(L, (n) < (L->top.p - L->ci->func.p), \
+			  "not enough elements in the stack")
+
+
+/*
+** To reduce the overhead of returning from C functions, the presence of
+** to-be-closed variables in these functions is coded in the CallInfo's
+** field 'nresults', in a way that functions with no to-be-closed variables
+** with zero, one, or "all" wanted results have no overhead. Functions
+** with other number of wanted results, as well as functions with
+** variables to be closed, have an extra check.
+*/
+
+#define hastocloseCfunc(n)	((n) < LUA_MULTRET)
+
+/* Map [-1, inf) (range of 'nresults') into (-inf, -2] */
+#define codeNresults(n)		(-(n) - 3)
+#define decodeNresults(n)	(-(n) - 3)
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lauxlib.c b/src/libs/3rdparty/lua/src/lauxlib.c
new file mode 100644
index 00000000000..4ca6c654889
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lauxlib.c
@@ -0,0 +1,1112 @@
+/*
+** $Id: lauxlib.c $
+** Auxiliary functions for building Lua libraries
+** See Copyright Notice in lua.h
+*/
+
+#define lauxlib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+/*
+** This file uses only the official API of Lua.
+** Any function declared here could be written as an application function.
+*/
+
+#include "lua.h"
+
+#include "lauxlib.h"
+
+
+#if !defined(MAX_SIZET)
+/* maximum value for size_t */
+#define MAX_SIZET	((size_t)(~(size_t)0))
+#endif
+
+
+/*
+** {======================================================
+** Traceback
+** =======================================================
+*/
+
+
+#define LEVELS1	10	/* size of the first part of the stack */
+#define LEVELS2	11	/* size of the second part of the stack */
+
+
+
+/*
+** Search for 'objidx' in table at index -1. ('objidx' must be an
+** absolute index.) Return 1 + string at top if it found a good name.
+*/
+static int findfield (lua_State *L, int objidx, int level) {
+  if (level == 0 || !lua_istable(L, -1))
+    return 0;  /* not found */
+  lua_pushnil(L);  /* start 'next' loop */
+  while (lua_next(L, -2)) {  /* for each pair in table */
+    if (lua_type(L, -2) == LUA_TSTRING) {  /* ignore non-string keys */
+      if (lua_rawequal(L, objidx, -1)) {  /* found object? */
+        lua_pop(L, 1);  /* remove value (but keep name) */
+        return 1;
+      }
+      else if (findfield(L, objidx, level - 1)) {  /* try recursively */
+        /* stack: lib_name, lib_table, field_name (top) */
+        lua_pushliteral(L, ".");  /* place '.' between the two names */
+        lua_replace(L, -3);  /* (in the slot occupied by table) */
+        lua_concat(L, 3);  /* lib_name.field_name */
+        return 1;
+      }
+    }
+    lua_pop(L, 1);  /* remove value */
+  }
+  return 0;  /* not found */
+}
+
+
+/*
+** Search for a name for a function in all loaded modules
+*/
+static int pushglobalfuncname (lua_State *L, lua_Debug *ar) {
+  int top = lua_gettop(L);
+  lua_getinfo(L, "f", ar);  /* push function */
+  lua_getfield(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
+  if (findfield(L, top + 1, 2)) {
+    const char *name = lua_tostring(L, -1);
+    if (strncmp(name, LUA_GNAME ".", 3) == 0) {  /* name start with '_G.'? */
+      lua_pushstring(L, name + 3);  /* push name without prefix */
+      lua_remove(L, -2);  /* remove original name */
+    }
+    lua_copy(L, -1, top + 1);  /* copy name to proper place */
+    lua_settop(L, top + 1);  /* remove table "loaded" and name copy */
+    return 1;
+  }
+  else {
+    lua_settop(L, top);  /* remove function and global table */
+    return 0;
+  }
+}
+
+
+static void pushfuncname (lua_State *L, lua_Debug *ar) {
+  if (pushglobalfuncname(L, ar)) {  /* try first a global name */
+    lua_pushfstring(L, "function '%s'", lua_tostring(L, -1));
+    lua_remove(L, -2);  /* remove name */
+  }
+  else if (*ar->namewhat != '\0')  /* is there a name from code? */
+    lua_pushfstring(L, "%s '%s'", ar->namewhat, ar->name);  /* use it */
+  else if (*ar->what == 'm')  /* main? */
+      lua_pushliteral(L, "main chunk");
+  else if (*ar->what != 'C')  /* for Lua functions, use <file:line> */
+    lua_pushfstring(L, "function <%s:%d>", ar->short_src, ar->linedefined);
+  else  /* nothing left... */
+    lua_pushliteral(L, "?");
+}
+
+
+static int lastlevel (lua_State *L) {
+  lua_Debug ar;
+  int li = 1, le = 1;
+  /* find an upper bound */
+  while (lua_getstack(L, le, &ar)) { li = le; le *= 2; }
+  /* do a binary search */
+  while (li < le) {
+    int m = (li + le)/2;
+    if (lua_getstack(L, m, &ar)) li = m + 1;
+    else le = m;
+  }
+  return le - 1;
+}
+
+
+LUALIB_API void luaL_traceback (lua_State *L, lua_State *L1,
+                                const char *msg, int level) {
+  luaL_Buffer b;
+  lua_Debug ar;
+  int last = lastlevel(L1);
+  int limit2show = (last - level > LEVELS1 + LEVELS2) ? LEVELS1 : -1;
+  luaL_buffinit(L, &b);
+  if (msg) {
+    luaL_addstring(&b, msg);
+    luaL_addchar(&b, '\n');
+  }
+  luaL_addstring(&b, "stack traceback:");
+  while (lua_getstack(L1, level++, &ar)) {
+    if (limit2show-- == 0) {  /* too many levels? */
+      int n = last - level - LEVELS2 + 1;  /* number of levels to skip */
+      lua_pushfstring(L, "\n\t...\t(skipping %d levels)", n);
+      luaL_addvalue(&b);  /* add warning about skip */
+      level += n;  /* and skip to last levels */
+    }
+    else {
+      lua_getinfo(L1, "Slnt", &ar);
+      if (ar.currentline <= 0)
+        lua_pushfstring(L, "\n\t%s: in ", ar.short_src);
+      else
+        lua_pushfstring(L, "\n\t%s:%d: in ", ar.short_src, ar.currentline);
+      luaL_addvalue(&b);
+      pushfuncname(L, &ar);
+      luaL_addvalue(&b);
+      if (ar.istailcall)
+        luaL_addstring(&b, "\n\t(...tail calls...)");
+    }
+  }
+  luaL_pushresult(&b);
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Error-report functions
+** =======================================================
+*/
+
+LUALIB_API int luaL_argerror (lua_State *L, int arg, const char *extramsg) {
+  lua_Debug ar;
+  if (!lua_getstack(L, 0, &ar))  /* no stack frame? */
+    return luaL_error(L, "bad argument #%d (%s)", arg, extramsg);
+  lua_getinfo(L, "n", &ar);
+  if (strcmp(ar.namewhat, "method") == 0) {
+    arg--;  /* do not count 'self' */
+    if (arg == 0)  /* error is in the self argument itself? */
+      return luaL_error(L, "calling '%s' on bad self (%s)",
+                           ar.name, extramsg);
+  }
+  if (ar.name == NULL)
+    ar.name = (pushglobalfuncname(L, &ar)) ? lua_tostring(L, -1) : "?";
+  return luaL_error(L, "bad argument #%d to '%s' (%s)",
+                        arg, ar.name, extramsg);
+}
+
+
+LUALIB_API int luaL_typeerror (lua_State *L, int arg, const char *tname) {
+  const char *msg;
+  const char *typearg;  /* name for the type of the actual argument */
+  if (luaL_getmetafield(L, arg, "__name") == LUA_TSTRING)
+    typearg = lua_tostring(L, -1);  /* use the given type name */
+  else if (lua_type(L, arg) == LUA_TLIGHTUSERDATA)
+    typearg = "light userdata";  /* special name for messages */
+  else
+    typearg = luaL_typename(L, arg);  /* standard name */
+  msg = lua_pushfstring(L, "%s expected, got %s", tname, typearg);
+  return luaL_argerror(L, arg, msg);
+}
+
+
+static void tag_error (lua_State *L, int arg, int tag) {
+  luaL_typeerror(L, arg, lua_typename(L, tag));
+}
+
+
+/*
+** The use of 'lua_pushfstring' ensures this function does not
+** need reserved stack space when called.
+*/
+LUALIB_API void luaL_where (lua_State *L, int level) {
+  lua_Debug ar;
+  if (lua_getstack(L, level, &ar)) {  /* check function at level */
+    lua_getinfo(L, "Sl", &ar);  /* get info about it */
+    if (ar.currentline > 0) {  /* is there info? */
+      lua_pushfstring(L, "%s:%d: ", ar.short_src, ar.currentline);
+      return;
+    }
+  }
+  lua_pushfstring(L, "");  /* else, no information available... */
+}
+
+
+/*
+** Again, the use of 'lua_pushvfstring' ensures this function does
+** not need reserved stack space when called. (At worst, it generates
+** an error with "stack overflow" instead of the given message.)
+*/
+LUALIB_API int luaL_error (lua_State *L, const char *fmt, ...) {
+  va_list argp;
+  va_start(argp, fmt);
+  luaL_where(L, 1);
+  lua_pushvfstring(L, fmt, argp);
+  va_end(argp);
+  lua_concat(L, 2);
+  return lua_error(L);
+}
+
+
+LUALIB_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
+  int en = errno;  /* calls to Lua API may change this value */
+  if (stat) {
+    lua_pushboolean(L, 1);
+    return 1;
+  }
+  else {
+    luaL_pushfail(L);
+    if (fname)
+      lua_pushfstring(L, "%s: %s", fname, strerror(en));
+    else
+      lua_pushstring(L, strerror(en));
+    lua_pushinteger(L, en);
+    return 3;
+  }
+}
+
+
+#if !defined(l_inspectstat)	/* { */
+
+#if defined(LUA_USE_POSIX)
+
+#include <sys/wait.h>
+
+/*
+** use appropriate macros to interpret 'pclose' return status
+*/
+#define l_inspectstat(stat,what)  \
+   if (WIFEXITED(stat)) { stat = WEXITSTATUS(stat); } \
+   else if (WIFSIGNALED(stat)) { stat = WTERMSIG(stat); what = "signal"; }
+
+#else
+
+#define l_inspectstat(stat,what)  /* no op */
+
+#endif
+
+#endif				/* } */
+
+
+LUALIB_API int luaL_execresult (lua_State *L, int stat) {
+  if (stat != 0 && errno != 0)  /* error with an 'errno'? */
+    return luaL_fileresult(L, 0, NULL);
+  else {
+    const char *what = "exit";  /* type of termination */
+    l_inspectstat(stat, what);  /* interpret result */
+    if (*what == 'e' && stat == 0)  /* successful termination? */
+      lua_pushboolean(L, 1);
+    else
+      luaL_pushfail(L);
+    lua_pushstring(L, what);
+    lua_pushinteger(L, stat);
+    return 3;  /* return true/fail,what,code */
+  }
+}
+
+/* }====================================================== */
+
+
+
+/*
+** {======================================================
+** Userdata's metatable manipulation
+** =======================================================
+*/
+
+LUALIB_API int luaL_newmetatable (lua_State *L, const char *tname) {
+  if (luaL_getmetatable(L, tname) != LUA_TNIL)  /* name already in use? */
+    return 0;  /* leave previous value on top, but return 0 */
+  lua_pop(L, 1);
+  lua_createtable(L, 0, 2);  /* create metatable */
+  lua_pushstring(L, tname);
+  lua_setfield(L, -2, "__name");  /* metatable.__name = tname */
+  lua_pushvalue(L, -1);
+  lua_setfield(L, LUA_REGISTRYINDEX, tname);  /* registry.name = metatable */
+  return 1;
+}
+
+
+LUALIB_API void luaL_setmetatable (lua_State *L, const char *tname) {
+  luaL_getmetatable(L, tname);
+  lua_setmetatable(L, -2);
+}
+
+
+LUALIB_API void *luaL_testudata (lua_State *L, int ud, const char *tname) {
+  void *p = lua_touserdata(L, ud);
+  if (p != NULL) {  /* value is a userdata? */
+    if (lua_getmetatable(L, ud)) {  /* does it have a metatable? */
+      luaL_getmetatable(L, tname);  /* get correct metatable */
+      if (!lua_rawequal(L, -1, -2))  /* not the same? */
+        p = NULL;  /* value is a userdata with wrong metatable */
+      lua_pop(L, 2);  /* remove both metatables */
+      return p;
+    }
+  }
+  return NULL;  /* value is not a userdata with a metatable */
+}
+
+
+LUALIB_API void *luaL_checkudata (lua_State *L, int ud, const char *tname) {
+  void *p = luaL_testudata(L, ud, tname);
+  luaL_argexpected(L, p != NULL, ud, tname);
+  return p;
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Argument check functions
+** =======================================================
+*/
+
+LUALIB_API int luaL_checkoption (lua_State *L, int arg, const char *def,
+                                 const char *const lst[]) {
+  const char *name = (def) ? luaL_optstring(L, arg, def) :
+                             luaL_checkstring(L, arg);
+  int i;
+  for (i=0; lst[i]; i++)
+    if (strcmp(lst[i], name) == 0)
+      return i;
+  return luaL_argerror(L, arg,
+                       lua_pushfstring(L, "invalid option '%s'", name));
+}
+
+
+/*
+** Ensures the stack has at least 'space' extra slots, raising an error
+** if it cannot fulfill the request. (The error handling needs a few
+** extra slots to format the error message. In case of an error without
+** this extra space, Lua will generate the same 'stack overflow' error,
+** but without 'msg'.)
+*/
+LUALIB_API void luaL_checkstack (lua_State *L, int space, const char *msg) {
+  if (l_unlikely(!lua_checkstack(L, space))) {
+    if (msg)
+      luaL_error(L, "stack overflow (%s)", msg);
+    else
+      luaL_error(L, "stack overflow");
+  }
+}
+
+
+LUALIB_API void luaL_checktype (lua_State *L, int arg, int t) {
+  if (l_unlikely(lua_type(L, arg) != t))
+    tag_error(L, arg, t);
+}
+
+
+LUALIB_API void luaL_checkany (lua_State *L, int arg) {
+  if (l_unlikely(lua_type(L, arg) == LUA_TNONE))
+    luaL_argerror(L, arg, "value expected");
+}
+
+
+LUALIB_API const char *luaL_checklstring (lua_State *L, int arg, size_t *len) {
+  const char *s = lua_tolstring(L, arg, len);
+  if (l_unlikely(!s)) tag_error(L, arg, LUA_TSTRING);
+  return s;
+}
+
+
+LUALIB_API const char *luaL_optlstring (lua_State *L, int arg,
+                                        const char *def, size_t *len) {
+  if (lua_isnoneornil(L, arg)) {
+    if (len)
+      *len = (def ? strlen(def) : 0);
+    return def;
+  }
+  else return luaL_checklstring(L, arg, len);
+}
+
+
+LUALIB_API lua_Number luaL_checknumber (lua_State *L, int arg) {
+  int isnum;
+  lua_Number d = lua_tonumberx(L, arg, &isnum);
+  if (l_unlikely(!isnum))
+    tag_error(L, arg, LUA_TNUMBER);
+  return d;
+}
+
+
+LUALIB_API lua_Number luaL_optnumber (lua_State *L, int arg, lua_Number def) {
+  return luaL_opt(L, luaL_checknumber, arg, def);
+}
+
+
+static void interror (lua_State *L, int arg) {
+  if (lua_isnumber(L, arg))
+    luaL_argerror(L, arg, "number has no integer representation");
+  else
+    tag_error(L, arg, LUA_TNUMBER);
+}
+
+
+LUALIB_API lua_Integer luaL_checkinteger (lua_State *L, int arg) {
+  int isnum;
+  lua_Integer d = lua_tointegerx(L, arg, &isnum);
+  if (l_unlikely(!isnum)) {
+    interror(L, arg);
+  }
+  return d;
+}
+
+
+LUALIB_API lua_Integer luaL_optinteger (lua_State *L, int arg,
+                                                      lua_Integer def) {
+  return luaL_opt(L, luaL_checkinteger, arg, def);
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Generic Buffer manipulation
+** =======================================================
+*/
+
+/* userdata to box arbitrary data */
+typedef struct UBox {
+  void *box;
+  size_t bsize;
+} UBox;
+
+
+static void *resizebox (lua_State *L, int idx, size_t newsize) {
+  void *ud;
+  lua_Alloc allocf = lua_getallocf(L, &ud);
+  UBox *box = (UBox *)lua_touserdata(L, idx);
+  void *temp = allocf(ud, box->box, box->bsize, newsize);
+  if (l_unlikely(temp == NULL && newsize > 0)) {  /* allocation error? */
+    lua_pushliteral(L, "not enough memory");
+    lua_error(L);  /* raise a memory error */
+  }
+  box->box = temp;
+  box->bsize = newsize;
+  return temp;
+}
+
+
+static int boxgc (lua_State *L) {
+  resizebox(L, 1, 0);
+  return 0;
+}
+
+
+static const luaL_Reg boxmt[] = {  /* box metamethods */
+  {"__gc", boxgc},
+  {"__close", boxgc},
+  {NULL, NULL}
+};
+
+
+static void newbox (lua_State *L) {
+  UBox *box = (UBox *)lua_newuserdatauv(L, sizeof(UBox), 0);
+  box->box = NULL;
+  box->bsize = 0;
+  if (luaL_newmetatable(L, "_UBOX*"))  /* creating metatable? */
+    luaL_setfuncs(L, boxmt, 0);  /* set its metamethods */
+  lua_setmetatable(L, -2);
+}
+
+
+/*
+** check whether buffer is using a userdata on the stack as a temporary
+** buffer
+*/
+#define buffonstack(B)	((B)->b != (B)->init.b)
+
+
+/*
+** Whenever buffer is accessed, slot 'idx' must either be a box (which
+** cannot be NULL) or it is a placeholder for the buffer.
+*/
+#define checkbufferlevel(B,idx)  \
+  lua_assert(buffonstack(B) ? lua_touserdata(B->L, idx) != NULL  \
+                            : lua_touserdata(B->L, idx) == (void*)B)
+
+
+/*
+** Compute new size for buffer 'B', enough to accommodate extra 'sz'
+** bytes. (The test for "not big enough" also gets the case when the
+** computation of 'newsize' overflows.)
+*/
+static size_t newbuffsize (luaL_Buffer *B, size_t sz) {
+  size_t newsize = (B->size / 2) * 3;  /* buffer size * 1.5 */
+  if (l_unlikely(MAX_SIZET - sz < B->n))  /* overflow in (B->n + sz)? */
+    return luaL_error(B->L, "buffer too large");
+  if (newsize < B->n + sz)  /* not big enough? */
+    newsize = B->n + sz;
+  return newsize;
+}
+
+
+/*
+** Returns a pointer to a free area with at least 'sz' bytes in buffer
+** 'B'. 'boxidx' is the relative position in the stack where is the
+** buffer's box or its placeholder.
+*/
+static char *prepbuffsize (luaL_Buffer *B, size_t sz, int boxidx) {
+  checkbufferlevel(B, boxidx);
+  if (B->size - B->n >= sz)  /* enough space? */
+    return B->b + B->n;
+  else {
+    lua_State *L = B->L;
+    char *newbuff;
+    size_t newsize = newbuffsize(B, sz);
+    /* create larger buffer */
+    if (buffonstack(B))  /* buffer already has a box? */
+      newbuff = (char *)resizebox(L, boxidx, newsize);  /* resize it */
+    else {  /* no box yet */
+      lua_remove(L, boxidx);  /* remove placeholder */
+      newbox(L);  /* create a new box */
+      lua_insert(L, boxidx);  /* move box to its intended position */
+      lua_toclose(L, boxidx);
+      newbuff = (char *)resizebox(L, boxidx, newsize);
+      memcpy(newbuff, B->b, B->n * sizeof(char));  /* copy original content */
+    }
+    B->b = newbuff;
+    B->size = newsize;
+    return newbuff + B->n;
+  }
+}
+
+/*
+** returns a pointer to a free area with at least 'sz' bytes
+*/
+LUALIB_API char *luaL_prepbuffsize (luaL_Buffer *B, size_t sz) {
+  return prepbuffsize(B, sz, -1);
+}
+
+
+LUALIB_API void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l) {
+  if (l > 0) {  /* avoid 'memcpy' when 's' can be NULL */
+    char *b = prepbuffsize(B, l, -1);
+    memcpy(b, s, l * sizeof(char));
+    luaL_addsize(B, l);
+  }
+}
+
+
+LUALIB_API void luaL_addstring (luaL_Buffer *B, const char *s) {
+  luaL_addlstring(B, s, strlen(s));
+}
+
+
+LUALIB_API void luaL_pushresult (luaL_Buffer *B) {
+  lua_State *L = B->L;
+  checkbufferlevel(B, -1);
+  lua_pushlstring(L, B->b, B->n);
+  if (buffonstack(B))
+    lua_closeslot(L, -2);  /* close the box */
+  lua_remove(L, -2);  /* remove box or placeholder from the stack */
+}
+
+
+LUALIB_API void luaL_pushresultsize (luaL_Buffer *B, size_t sz) {
+  luaL_addsize(B, sz);
+  luaL_pushresult(B);
+}
+
+
+/*
+** 'luaL_addvalue' is the only function in the Buffer system where the
+** box (if existent) is not on the top of the stack. So, instead of
+** calling 'luaL_addlstring', it replicates the code using -2 as the
+** last argument to 'prepbuffsize', signaling that the box is (or will
+** be) below the string being added to the buffer. (Box creation can
+** trigger an emergency GC, so we should not remove the string from the
+** stack before we have the space guaranteed.)
+*/
+LUALIB_API void luaL_addvalue (luaL_Buffer *B) {
+  lua_State *L = B->L;
+  size_t len;
+  const char *s = lua_tolstring(L, -1, &len);
+  char *b = prepbuffsize(B, len, -2);
+  memcpy(b, s, len * sizeof(char));
+  luaL_addsize(B, len);
+  lua_pop(L, 1);  /* pop string */
+}
+
+
+LUALIB_API void luaL_buffinit (lua_State *L, luaL_Buffer *B) {
+  B->L = L;
+  B->b = B->init.b;
+  B->n = 0;
+  B->size = LUAL_BUFFERSIZE;
+  lua_pushlightuserdata(L, (void*)B);  /* push placeholder */
+}
+
+
+LUALIB_API char *luaL_buffinitsize (lua_State *L, luaL_Buffer *B, size_t sz) {
+  luaL_buffinit(L, B);
+  return prepbuffsize(B, sz, -1);
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Reference system
+** =======================================================
+*/
+
+/* index of free-list header (after the predefined values) */
+#define freelist	(LUA_RIDX_LAST + 1)
+
+/*
+** The previously freed references form a linked list:
+** t[freelist] is the index of a first free index, or zero if list is
+** empty; t[t[freelist]] is the index of the second element; etc.
+*/
+LUALIB_API int luaL_ref (lua_State *L, int t) {
+  int ref;
+  if (lua_isnil(L, -1)) {
+    lua_pop(L, 1);  /* remove from stack */
+    return LUA_REFNIL;  /* 'nil' has a unique fixed reference */
+  }
+  t = lua_absindex(L, t);
+  if (lua_rawgeti(L, t, freelist) == LUA_TNIL) {  /* first access? */
+    ref = 0;  /* list is empty */
+    lua_pushinteger(L, 0);  /* initialize as an empty list */
+    lua_rawseti(L, t, freelist);  /* ref = t[freelist] = 0 */
+  }
+  else {  /* already initialized */
+    lua_assert(lua_isinteger(L, -1));
+    ref = (int)lua_tointeger(L, -1);  /* ref = t[freelist] */
+  }
+  lua_pop(L, 1);  /* remove element from stack */
+  if (ref != 0) {  /* any free element? */
+    lua_rawgeti(L, t, ref);  /* remove it from list */
+    lua_rawseti(L, t, freelist);  /* (t[freelist] = t[ref]) */
+  }
+  else  /* no free elements */
+    ref = (int)lua_rawlen(L, t) + 1;  /* get a new reference */
+  lua_rawseti(L, t, ref);
+  return ref;
+}
+
+
+LUALIB_API void luaL_unref (lua_State *L, int t, int ref) {
+  if (ref >= 0) {
+    t = lua_absindex(L, t);
+    lua_rawgeti(L, t, freelist);
+    lua_assert(lua_isinteger(L, -1));
+    lua_rawseti(L, t, ref);  /* t[ref] = t[freelist] */
+    lua_pushinteger(L, ref);
+    lua_rawseti(L, t, freelist);  /* t[freelist] = ref */
+  }
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Load functions
+** =======================================================
+*/
+
+typedef struct LoadF {
+  int n;  /* number of pre-read characters */
+  FILE *f;  /* file being read */
+  char buff[BUFSIZ];  /* area for reading file */
+} LoadF;
+
+
+static const char *getF (lua_State *L, void *ud, size_t *size) {
+  LoadF *lf = (LoadF *)ud;
+  (void)L;  /* not used */
+  if (lf->n > 0) {  /* are there pre-read characters to be read? */
+    *size = lf->n;  /* return them (chars already in buffer) */
+    lf->n = 0;  /* no more pre-read characters */
+  }
+  else {  /* read a block from file */
+    /* 'fread' can return > 0 *and* set the EOF flag. If next call to
+       'getF' called 'fread', it might still wait for user input.
+       The next check avoids this problem. */
+    if (feof(lf->f)) return NULL;
+    *size = fread(lf->buff, 1, sizeof(lf->buff), lf->f);  /* read block */
+  }
+  return lf->buff;
+}
+
+
+static int errfile (lua_State *L, const char *what, int fnameindex) {
+  const char *serr = strerror(errno);
+  const char *filename = lua_tostring(L, fnameindex) + 1;
+  lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr);
+  lua_remove(L, fnameindex);
+  return LUA_ERRFILE;
+}
+
+
+/*
+** Skip an optional BOM at the start of a stream. If there is an
+** incomplete BOM (the first character is correct but the rest is
+** not), returns the first character anyway to force an error
+** (as no chunk can start with 0xEF).
+*/
+static int skipBOM (FILE *f) {
+  int c = getc(f);  /* read first character */
+  if (c == 0xEF && getc(f) == 0xBB && getc(f) == 0xBF)  /* correct BOM? */
+    return getc(f);  /* ignore BOM and return next char */
+  else  /* no (valid) BOM */
+    return c;  /* return first character */
+}
+
+
+/*
+** reads the first character of file 'f' and skips an optional BOM mark
+** in its beginning plus its first line if it starts with '#'. Returns
+** true if it skipped the first line.  In any case, '*cp' has the
+** first "valid" character of the file (after the optional BOM and
+** a first-line comment).
+*/
+static int skipcomment (FILE *f, int *cp) {
+  int c = *cp = skipBOM(f);
+  if (c == '#') {  /* first line is a comment (Unix exec. file)? */
+    do {  /* skip first line */
+      c = getc(f);
+    } while (c != EOF && c != '\n');
+    *cp = getc(f);  /* next character after comment, if present */
+    return 1;  /* there was a comment */
+  }
+  else return 0;  /* no comment */
+}
+
+
+LUALIB_API int luaL_loadfilex (lua_State *L, const char *filename,
+                                             const char *mode) {
+  LoadF lf;
+  int status, readstatus;
+  int c;
+  int fnameindex = lua_gettop(L) + 1;  /* index of filename on the stack */
+  if (filename == NULL) {
+    lua_pushliteral(L, "=stdin");
+    lf.f = stdin;
+  }
+  else {
+    lua_pushfstring(L, "@%s", filename);
+    lf.f = fopen(filename, "r");
+    if (lf.f == NULL) return errfile(L, "open", fnameindex);
+  }
+  lf.n = 0;
+  if (skipcomment(lf.f, &c))  /* read initial portion */
+    lf.buff[lf.n++] = '\n';  /* add newline to correct line numbers */
+  if (c == LUA_SIGNATURE[0]) {  /* binary file? */
+    lf.n = 0;  /* remove possible newline */
+    if (filename) {  /* "real" file? */
+      lf.f = freopen(filename, "rb", lf.f);  /* reopen in binary mode */
+      if (lf.f == NULL) return errfile(L, "reopen", fnameindex);
+      skipcomment(lf.f, &c);  /* re-read initial portion */
+    }
+  }
+  if (c != EOF)
+    lf.buff[lf.n++] = c;  /* 'c' is the first character of the stream */
+  status = lua_load(L, getF, &lf, lua_tostring(L, -1), mode);
+  readstatus = ferror(lf.f);
+  if (filename) fclose(lf.f);  /* close file (even in case of errors) */
+  if (readstatus) {
+    lua_settop(L, fnameindex);  /* ignore results from 'lua_load' */
+    return errfile(L, "read", fnameindex);
+  }
+  lua_remove(L, fnameindex);
+  return status;
+}
+
+
+typedef struct LoadS {
+  const char *s;
+  size_t size;
+} LoadS;
+
+
+static const char *getS (lua_State *L, void *ud, size_t *size) {
+  LoadS *ls = (LoadS *)ud;
+  (void)L;  /* not used */
+  if (ls->size == 0) return NULL;
+  *size = ls->size;
+  ls->size = 0;
+  return ls->s;
+}
+
+
+LUALIB_API int luaL_loadbufferx (lua_State *L, const char *buff, size_t size,
+                                 const char *name, const char *mode) {
+  LoadS ls;
+  ls.s = buff;
+  ls.size = size;
+  return lua_load(L, getS, &ls, name, mode);
+}
+
+
+LUALIB_API int luaL_loadstring (lua_State *L, const char *s) {
+  return luaL_loadbuffer(L, s, strlen(s), s);
+}
+
+/* }====================================================== */
+
+
+
+LUALIB_API int luaL_getmetafield (lua_State *L, int obj, const char *event) {
+  if (!lua_getmetatable(L, obj))  /* no metatable? */
+    return LUA_TNIL;
+  else {
+    int tt;
+    lua_pushstring(L, event);
+    tt = lua_rawget(L, -2);
+    if (tt == LUA_TNIL)  /* is metafield nil? */
+      lua_pop(L, 2);  /* remove metatable and metafield */
+    else
+      lua_remove(L, -2);  /* remove only metatable */
+    return tt;  /* return metafield type */
+  }
+}
+
+
+LUALIB_API int luaL_callmeta (lua_State *L, int obj, const char *event) {
+  obj = lua_absindex(L, obj);
+  if (luaL_getmetafield(L, obj, event) == LUA_TNIL)  /* no metafield? */
+    return 0;
+  lua_pushvalue(L, obj);
+  lua_call(L, 1, 1);
+  return 1;
+}
+
+
+LUALIB_API lua_Integer luaL_len (lua_State *L, int idx) {
+  lua_Integer l;
+  int isnum;
+  lua_len(L, idx);
+  l = lua_tointegerx(L, -1, &isnum);
+  if (l_unlikely(!isnum))
+    luaL_error(L, "object length is not an integer");
+  lua_pop(L, 1);  /* remove object */
+  return l;
+}
+
+
+LUALIB_API const char *luaL_tolstring (lua_State *L, int idx, size_t *len) {
+  idx = lua_absindex(L,idx);
+  if (luaL_callmeta(L, idx, "__tostring")) {  /* metafield? */
+    if (!lua_isstring(L, -1))
+      luaL_error(L, "'__tostring' must return a string");
+  }
+  else {
+    switch (lua_type(L, idx)) {
+      case LUA_TNUMBER: {
+        if (lua_isinteger(L, idx))
+          lua_pushfstring(L, "%I", (LUAI_UACINT)lua_tointeger(L, idx));
+        else
+          lua_pushfstring(L, "%f", (LUAI_UACNUMBER)lua_tonumber(L, idx));
+        break;
+      }
+      case LUA_TSTRING:
+        lua_pushvalue(L, idx);
+        break;
+      case LUA_TBOOLEAN:
+        lua_pushstring(L, (lua_toboolean(L, idx) ? "true" : "false"));
+        break;
+      case LUA_TNIL:
+        lua_pushliteral(L, "nil");
+        break;
+      default: {
+        int tt = luaL_getmetafield(L, idx, "__name");  /* try name */
+        const char *kind = (tt == LUA_TSTRING) ? lua_tostring(L, -1) :
+                                                 luaL_typename(L, idx);
+        lua_pushfstring(L, "%s: %p", kind, lua_topointer(L, idx));
+        if (tt != LUA_TNIL)
+          lua_remove(L, -2);  /* remove '__name' */
+        break;
+      }
+    }
+  }
+  return lua_tolstring(L, -1, len);
+}
+
+
+/*
+** set functions from list 'l' into table at top - 'nup'; each
+** function gets the 'nup' elements at the top as upvalues.
+** Returns with only the table at the stack.
+*/
+LUALIB_API void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
+  luaL_checkstack(L, nup, "too many upvalues");
+  for (; l->name != NULL; l++) {  /* fill the table with given functions */
+    if (l->func == NULL)  /* place holder? */
+      lua_pushboolean(L, 0);
+    else {
+      int i;
+      for (i = 0; i < nup; i++)  /* copy upvalues to the top */
+        lua_pushvalue(L, -nup);
+      lua_pushcclosure(L, l->func, nup);  /* closure with those upvalues */
+    }
+    lua_setfield(L, -(nup + 2), l->name);
+  }
+  lua_pop(L, nup);  /* remove upvalues */
+}
+
+
+/*
+** ensure that stack[idx][fname] has a table and push that table
+** into the stack
+*/
+LUALIB_API int luaL_getsubtable (lua_State *L, int idx, const char *fname) {
+  if (lua_getfield(L, idx, fname) == LUA_TTABLE)
+    return 1;  /* table already there */
+  else {
+    lua_pop(L, 1);  /* remove previous result */
+    idx = lua_absindex(L, idx);
+    lua_newtable(L);
+    lua_pushvalue(L, -1);  /* copy to be left at top */
+    lua_setfield(L, idx, fname);  /* assign new table to field */
+    return 0;  /* false, because did not find table there */
+  }
+}
+
+
+/*
+** Stripped-down 'require': After checking "loaded" table, calls 'openf'
+** to open a module, registers the result in 'package.loaded' table and,
+** if 'glb' is true, also registers the result in the global table.
+** Leaves resulting module on the top.
+*/
+LUALIB_API void luaL_requiref (lua_State *L, const char *modname,
+                               lua_CFunction openf, int glb) {
+  luaL_getsubtable(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
+  lua_getfield(L, -1, modname);  /* LOADED[modname] */
+  if (!lua_toboolean(L, -1)) {  /* package not already loaded? */
+    lua_pop(L, 1);  /* remove field */
+    lua_pushcfunction(L, openf);
+    lua_pushstring(L, modname);  /* argument to open function */
+    lua_call(L, 1, 1);  /* call 'openf' to open module */
+    lua_pushvalue(L, -1);  /* make copy of module (call result) */
+    lua_setfield(L, -3, modname);  /* LOADED[modname] = module */
+  }
+  lua_remove(L, -2);  /* remove LOADED table */
+  if (glb) {
+    lua_pushvalue(L, -1);  /* copy of module */
+    lua_setglobal(L, modname);  /* _G[modname] = module */
+  }
+}
+
+
+LUALIB_API void luaL_addgsub (luaL_Buffer *b, const char *s,
+                                     const char *p, const char *r) {
+  const char *wild;
+  size_t l = strlen(p);
+  while ((wild = strstr(s, p)) != NULL) {
+    luaL_addlstring(b, s, wild - s);  /* push prefix */
+    luaL_addstring(b, r);  /* push replacement in place of pattern */
+    s = wild + l;  /* continue after 'p' */
+  }
+  luaL_addstring(b, s);  /* push last suffix */
+}
+
+
+LUALIB_API const char *luaL_gsub (lua_State *L, const char *s,
+                                  const char *p, const char *r) {
+  luaL_Buffer b;
+  luaL_buffinit(L, &b);
+  luaL_addgsub(&b, s, p, r);
+  luaL_pushresult(&b);
+  return lua_tostring(L, -1);
+}
+
+
+static void *l_alloc (void *ud, void *ptr, size_t osize, size_t nsize) {
+  (void)ud; (void)osize;  /* not used */
+  if (nsize == 0) {
+    free(ptr);
+    return NULL;
+  }
+  else
+    return realloc(ptr, nsize);
+}
+
+
+static int panic (lua_State *L) {
+  const char *msg = lua_tostring(L, -1);
+  if (msg == NULL) msg = "error object is not a string";
+  lua_writestringerror("PANIC: unprotected error in call to Lua API (%s)\n",
+                        msg);
+  return 0;  /* return to Lua to abort */
+}
+
+
+/*
+** Warning functions:
+** warnfoff: warning system is off
+** warnfon: ready to start a new message
+** warnfcont: previous message is to be continued
+*/
+static void warnfoff (void *ud, const char *message, int tocont);
+static void warnfon (void *ud, const char *message, int tocont);
+static void warnfcont (void *ud, const char *message, int tocont);
+
+
+/*
+** Check whether message is a control message. If so, execute the
+** control or ignore it if unknown.
+*/
+static int checkcontrol (lua_State *L, const char *message, int tocont) {
+  if (tocont || *(message++) != '@')  /* not a control message? */
+    return 0;
+  else {
+    if (strcmp(message, "off") == 0)
+      lua_setwarnf(L, warnfoff, L);  /* turn warnings off */
+    else if (strcmp(message, "on") == 0)
+      lua_setwarnf(L, warnfon, L);   /* turn warnings on */
+    return 1;  /* it was a control message */
+  }
+}
+
+
+static void warnfoff (void *ud, const char *message, int tocont) {
+  checkcontrol((lua_State *)ud, message, tocont);
+}
+
+
+/*
+** Writes the message and handle 'tocont', finishing the message
+** if needed and setting the next warn function.
+*/
+static void warnfcont (void *ud, const char *message, int tocont) {
+  lua_State *L = (lua_State *)ud;
+  lua_writestringerror("%s", message);  /* write message */
+  if (tocont)  /* not the last part? */
+    lua_setwarnf(L, warnfcont, L);  /* to be continued */
+  else {  /* last part */
+    lua_writestringerror("%s", "\n");  /* finish message with end-of-line */
+    lua_setwarnf(L, warnfon, L);  /* next call is a new message */
+  }
+}
+
+
+static void warnfon (void *ud, const char *message, int tocont) {
+  if (checkcontrol((lua_State *)ud, message, tocont))  /* control message? */
+    return;  /* nothing else to be done */
+  lua_writestringerror("%s", "Lua warning: ");  /* start a new warning */
+  warnfcont(ud, message, tocont);  /* finish processing */
+}
+
+
+LUALIB_API lua_State *luaL_newstate (void) {
+  lua_State *L = lua_newstate(l_alloc, NULL);
+  if (l_likely(L)) {
+    lua_atpanic(L, &panic);
+    lua_setwarnf(L, warnfoff, L);  /* default is warnings off */
+  }
+  return L;
+}
+
+
+LUALIB_API void luaL_checkversion_ (lua_State *L, lua_Number ver, size_t sz) {
+  lua_Number v = lua_version(L);
+  if (sz != LUAL_NUMSIZES)  /* check numeric types */
+    luaL_error(L, "core and library have incompatible numeric types");
+  else if (v != ver)
+    luaL_error(L, "version mismatch: app. needs %f, Lua core provides %f",
+                  (LUAI_UACNUMBER)ver, (LUAI_UACNUMBER)v);
+}
+
diff --git a/src/libs/3rdparty/lua/src/lauxlib.h b/src/libs/3rdparty/lua/src/lauxlib.h
new file mode 100644
index 00000000000..5b977e2a39f
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lauxlib.h
@@ -0,0 +1,301 @@
+/*
+** $Id: lauxlib.h $
+** Auxiliary functions for building Lua libraries
+** See Copyright Notice in lua.h
+*/
+
+
+#ifndef lauxlib_h
+#define lauxlib_h
+
+
+#include <stddef.h>
+#include <stdio.h>
+
+#include "luaconf.h"
+#include "lua.h"
+
+
+/* global table */
+#define LUA_GNAME	"_G"
+
+
+typedef struct luaL_Buffer luaL_Buffer;
+
+
+/* extra error code for 'luaL_loadfilex' */
+#define LUA_ERRFILE     (LUA_ERRERR+1)
+
+
+/* key, in the registry, for table of loaded modules */
+#define LUA_LOADED_TABLE	"_LOADED"
+
+
+/* key, in the registry, for table of preloaded loaders */
+#define LUA_PRELOAD_TABLE	"_PRELOAD"
+
+
+typedef struct luaL_Reg {
+  const char *name;
+  lua_CFunction func;
+} luaL_Reg;
+
+
+#define LUAL_NUMSIZES	(sizeof(lua_Integer)*16 + sizeof(lua_Number))
+
+LUALIB_API void (luaL_checkversion_) (lua_State *L, lua_Number ver, size_t sz);
+#define luaL_checkversion(L)  \
+	  luaL_checkversion_(L, LUA_VERSION_NUM, LUAL_NUMSIZES)
+
+LUALIB_API int (luaL_getmetafield) (lua_State *L, int obj, const char *e);
+LUALIB_API int (luaL_callmeta) (lua_State *L, int obj, const char *e);
+LUALIB_API const char *(luaL_tolstring) (lua_State *L, int idx, size_t *len);
+LUALIB_API int (luaL_argerror) (lua_State *L, int arg, const char *extramsg);
+LUALIB_API int (luaL_typeerror) (lua_State *L, int arg, const char *tname);
+LUALIB_API const char *(luaL_checklstring) (lua_State *L, int arg,
+                                                          size_t *l);
+LUALIB_API const char *(luaL_optlstring) (lua_State *L, int arg,
+                                          const char *def, size_t *l);
+LUALIB_API lua_Number (luaL_checknumber) (lua_State *L, int arg);
+LUALIB_API lua_Number (luaL_optnumber) (lua_State *L, int arg, lua_Number def);
+
+LUALIB_API lua_Integer (luaL_checkinteger) (lua_State *L, int arg);
+LUALIB_API lua_Integer (luaL_optinteger) (lua_State *L, int arg,
+                                          lua_Integer def);
+
+LUALIB_API void (luaL_checkstack) (lua_State *L, int sz, const char *msg);
+LUALIB_API void (luaL_checktype) (lua_State *L, int arg, int t);
+LUALIB_API void (luaL_checkany) (lua_State *L, int arg);
+
+LUALIB_API int   (luaL_newmetatable) (lua_State *L, const char *tname);
+LUALIB_API void  (luaL_setmetatable) (lua_State *L, const char *tname);
+LUALIB_API void *(luaL_testudata) (lua_State *L, int ud, const char *tname);
+LUALIB_API void *(luaL_checkudata) (lua_State *L, int ud, const char *tname);
+
+LUALIB_API void (luaL_where) (lua_State *L, int lvl);
+LUALIB_API int (luaL_error) (lua_State *L, const char *fmt, ...);
+
+LUALIB_API int (luaL_checkoption) (lua_State *L, int arg, const char *def,
+                                   const char *const lst[]);
+
+LUALIB_API int (luaL_fileresult) (lua_State *L, int stat, const char *fname);
+LUALIB_API int (luaL_execresult) (lua_State *L, int stat);
+
+
+/* predefined references */
+#define LUA_NOREF       (-2)
+#define LUA_REFNIL      (-1)
+
+LUALIB_API int (luaL_ref) (lua_State *L, int t);
+LUALIB_API void (luaL_unref) (lua_State *L, int t, int ref);
+
+LUALIB_API int (luaL_loadfilex) (lua_State *L, const char *filename,
+                                               const char *mode);
+
+#define luaL_loadfile(L,f)	luaL_loadfilex(L,f,NULL)
+
+LUALIB_API int (luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz,
+                                   const char *name, const char *mode);
+LUALIB_API int (luaL_loadstring) (lua_State *L, const char *s);
+
+LUALIB_API lua_State *(luaL_newstate) (void);
+
+LUALIB_API lua_Integer (luaL_len) (lua_State *L, int idx);
+
+LUALIB_API void (luaL_addgsub) (luaL_Buffer *b, const char *s,
+                                     const char *p, const char *r);
+LUALIB_API const char *(luaL_gsub) (lua_State *L, const char *s,
+                                    const char *p, const char *r);
+
+LUALIB_API void (luaL_setfuncs) (lua_State *L, const luaL_Reg *l, int nup);
+
+LUALIB_API int (luaL_getsubtable) (lua_State *L, int idx, const char *fname);
+
+LUALIB_API void (luaL_traceback) (lua_State *L, lua_State *L1,
+                                  const char *msg, int level);
+
+LUALIB_API void (luaL_requiref) (lua_State *L, const char *modname,
+                                 lua_CFunction openf, int glb);
+
+/*
+** ===============================================================
+** some useful macros
+** ===============================================================
+*/
+
+
+#define luaL_newlibtable(L,l)	\
+  lua_createtable(L, 0, sizeof(l)/sizeof((l)[0]) - 1)
+
+#define luaL_newlib(L,l)  \
+  (luaL_checkversion(L), luaL_newlibtable(L,l), luaL_setfuncs(L,l,0))
+
+#define luaL_argcheck(L, cond,arg,extramsg)	\
+	((void)(luai_likely(cond) || luaL_argerror(L, (arg), (extramsg))))
+
+#define luaL_argexpected(L,cond,arg,tname)	\
+	((void)(luai_likely(cond) || luaL_typeerror(L, (arg), (tname))))
+
+#define luaL_checkstring(L,n)	(luaL_checklstring(L, (n), NULL))
+#define luaL_optstring(L,n,d)	(luaL_optlstring(L, (n), (d), NULL))
+
+#define luaL_typename(L,i)	lua_typename(L, lua_type(L,(i)))
+
+#define luaL_dofile(L, fn) \
+	(luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
+
+#define luaL_dostring(L, s) \
+	(luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
+
+#define luaL_getmetatable(L,n)	(lua_getfield(L, LUA_REGISTRYINDEX, (n)))
+
+#define luaL_opt(L,f,n,d)	(lua_isnoneornil(L,(n)) ? (d) : f(L,(n)))
+
+#define luaL_loadbuffer(L,s,sz,n)	luaL_loadbufferx(L,s,sz,n,NULL)
+
+
+/*
+** Perform arithmetic operations on lua_Integer values with wrap-around
+** semantics, as the Lua core does.
+*/
+#define luaL_intop(op,v1,v2)  \
+	((lua_Integer)((lua_Unsigned)(v1) op (lua_Unsigned)(v2)))
+
+
+/* push the value used to represent failure/error */
+#define luaL_pushfail(L)	lua_pushnil(L)
+
+
+/*
+** Internal assertions for in-house debugging
+*/
+#if !defined(lua_assert)
+
+#if defined LUAI_ASSERT
+  #include <assert.h>
+  #define lua_assert(c)		assert(c)
+#else
+  #define lua_assert(c)		((void)0)
+#endif
+
+#endif
+
+
+
+/*
+** {======================================================
+** Generic Buffer manipulation
+** =======================================================
+*/
+
+struct luaL_Buffer {
+  char *b;  /* buffer address */
+  size_t size;  /* buffer size */
+  size_t n;  /* number of characters in buffer */
+  lua_State *L;
+  union {
+    LUAI_MAXALIGN;  /* ensure maximum alignment for buffer */
+    char b[LUAL_BUFFERSIZE];  /* initial buffer */
+  } init;
+};
+
+
+#define luaL_bufflen(bf)	((bf)->n)
+#define luaL_buffaddr(bf)	((bf)->b)
+
+
+#define luaL_addchar(B,c) \
+  ((void)((B)->n < (B)->size || luaL_prepbuffsize((B), 1)), \
+   ((B)->b[(B)->n++] = (c)))
+
+#define luaL_addsize(B,s)	((B)->n += (s))
+
+#define luaL_buffsub(B,s)	((B)->n -= (s))
+
+LUALIB_API void (luaL_buffinit) (lua_State *L, luaL_Buffer *B);
+LUALIB_API char *(luaL_prepbuffsize) (luaL_Buffer *B, size_t sz);
+LUALIB_API void (luaL_addlstring) (luaL_Buffer *B, const char *s, size_t l);
+LUALIB_API void (luaL_addstring) (luaL_Buffer *B, const char *s);
+LUALIB_API void (luaL_addvalue) (luaL_Buffer *B);
+LUALIB_API void (luaL_pushresult) (luaL_Buffer *B);
+LUALIB_API void (luaL_pushresultsize) (luaL_Buffer *B, size_t sz);
+LUALIB_API char *(luaL_buffinitsize) (lua_State *L, luaL_Buffer *B, size_t sz);
+
+#define luaL_prepbuffer(B)	luaL_prepbuffsize(B, LUAL_BUFFERSIZE)
+
+/* }====================================================== */
+
+
+
+/*
+** {======================================================
+** File handles for IO library
+** =======================================================
+*/
+
+/*
+** A file handle is a userdata with metatable 'LUA_FILEHANDLE' and
+** initial structure 'luaL_Stream' (it may contain other fields
+** after that initial structure).
+*/
+
+#define LUA_FILEHANDLE          "FILE*"
+
+
+typedef struct luaL_Stream {
+  FILE *f;  /* stream (NULL for incompletely created streams) */
+  lua_CFunction closef;  /* to close stream (NULL for closed streams) */
+} luaL_Stream;
+
+/* }====================================================== */
+
+/*
+** {==================================================================
+** "Abstraction Layer" for basic report of messages and errors
+** ===================================================================
+*/
+
+/* print a string */
+#if !defined(lua_writestring)
+#define lua_writestring(s,l)   fwrite((s), sizeof(char), (l), stdout)
+#endif
+
+/* print a newline and flush the output */
+#if !defined(lua_writeline)
+#define lua_writeline()        (lua_writestring("\n", 1), fflush(stdout))
+#endif
+
+/* print an error message */
+#if !defined(lua_writestringerror)
+#define lua_writestringerror(s,p) \
+        (fprintf(stderr, (s), (p)), fflush(stderr))
+#endif
+
+/* }================================================================== */
+
+
+/*
+** {============================================================
+** Compatibility with deprecated conversions
+** =============================================================
+*/
+#if defined(LUA_COMPAT_APIINTCASTS)
+
+#define luaL_checkunsigned(L,a)	((lua_Unsigned)luaL_checkinteger(L,a))
+#define luaL_optunsigned(L,a,d)	\
+	((lua_Unsigned)luaL_optinteger(L,a,(lua_Integer)(d)))
+
+#define luaL_checkint(L,n)	((int)luaL_checkinteger(L, (n)))
+#define luaL_optint(L,n,d)	((int)luaL_optinteger(L, (n), (d)))
+
+#define luaL_checklong(L,n)	((long)luaL_checkinteger(L, (n)))
+#define luaL_optlong(L,n,d)	((long)luaL_optinteger(L, (n), (d)))
+
+#endif
+/* }============================================================ */
+
+
+
+#endif
+
+
diff --git a/src/libs/3rdparty/lua/src/lbaselib.c b/src/libs/3rdparty/lua/src/lbaselib.c
new file mode 100644
index 00000000000..1d60c9dede5
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lbaselib.c
@@ -0,0 +1,549 @@
+/*
+** $Id: lbaselib.c $
+** Basic library
+** See Copyright Notice in lua.h
+*/
+
+#define lbaselib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+static int luaB_print (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  int i;
+  for (i = 1; i <= n; i++) {  /* for each argument */
+    size_t l;
+    const char *s = luaL_tolstring(L, i, &l);  /* convert it to string */
+    if (i > 1)  /* not the first element? */
+      lua_writestring("\t", 1);  /* add a tab before it */
+    lua_writestring(s, l);  /* print it */
+    lua_pop(L, 1);  /* pop result */
+  }
+  lua_writeline();
+  return 0;
+}
+
+
+/*
+** Creates a warning with all given arguments.
+** Check first for errors; otherwise an error may interrupt
+** the composition of a warning, leaving it unfinished.
+*/
+static int luaB_warn (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  int i;
+  luaL_checkstring(L, 1);  /* at least one argument */
+  for (i = 2; i <= n; i++)
+    luaL_checkstring(L, i);  /* make sure all arguments are strings */
+  for (i = 1; i < n; i++)  /* compose warning */
+    lua_warning(L, lua_tostring(L, i), 1);
+  lua_warning(L, lua_tostring(L, n), 0);  /* close warning */
+  return 0;
+}
+
+
+#define SPACECHARS	" \f\n\r\t\v"
+
+static const char *b_str2int (const char *s, int base, lua_Integer *pn) {
+  lua_Unsigned n = 0;
+  int neg = 0;
+  s += strspn(s, SPACECHARS);  /* skip initial spaces */
+  if (*s == '-') { s++; neg = 1; }  /* handle sign */
+  else if (*s == '+') s++;
+  if (!isalnum((unsigned char)*s))  /* no digit? */
+    return NULL;
+  do {
+    int digit = (isdigit((unsigned char)*s)) ? *s - '0'
+                   : (toupper((unsigned char)*s) - 'A') + 10;
+    if (digit >= base) return NULL;  /* invalid numeral */
+    n = n * base + digit;
+    s++;
+  } while (isalnum((unsigned char)*s));
+  s += strspn(s, SPACECHARS);  /* skip trailing spaces */
+  *pn = (lua_Integer)((neg) ? (0u - n) : n);
+  return s;
+}
+
+
+static int luaB_tonumber (lua_State *L) {
+  if (lua_isnoneornil(L, 2)) {  /* standard conversion? */
+    if (lua_type(L, 1) == LUA_TNUMBER) {  /* already a number? */
+      lua_settop(L, 1);  /* yes; return it */
+      return 1;
+    }
+    else {
+      size_t l;
+      const char *s = lua_tolstring(L, 1, &l);
+      if (s != NULL && lua_stringtonumber(L, s) == l + 1)
+        return 1;  /* successful conversion to number */
+      /* else not a number */
+      luaL_checkany(L, 1);  /* (but there must be some parameter) */
+    }
+  }
+  else {
+    size_t l;
+    const char *s;
+    lua_Integer n = 0;  /* to avoid warnings */
+    lua_Integer base = luaL_checkinteger(L, 2);
+    luaL_checktype(L, 1, LUA_TSTRING);  /* no numbers as strings */
+    s = lua_tolstring(L, 1, &l);
+    luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range");
+    if (b_str2int(s, (int)base, &n) == s + l) {
+      lua_pushinteger(L, n);
+      return 1;
+    }  /* else not a number */
+  }  /* else not a number */
+  luaL_pushfail(L);  /* not a number */
+  return 1;
+}
+
+
+static int luaB_error (lua_State *L) {
+  int level = (int)luaL_optinteger(L, 2, 1);
+  lua_settop(L, 1);
+  if (lua_type(L, 1) == LUA_TSTRING && level > 0) {
+    luaL_where(L, level);   /* add extra information */
+    lua_pushvalue(L, 1);
+    lua_concat(L, 2);
+  }
+  return lua_error(L);
+}
+
+
+static int luaB_getmetatable (lua_State *L) {
+  luaL_checkany(L, 1);
+  if (!lua_getmetatable(L, 1)) {
+    lua_pushnil(L);
+    return 1;  /* no metatable */
+  }
+  luaL_getmetafield(L, 1, "__metatable");
+  return 1;  /* returns either __metatable field (if present) or metatable */
+}
+
+
+static int luaB_setmetatable (lua_State *L) {
+  int t = lua_type(L, 2);
+  luaL_checktype(L, 1, LUA_TTABLE);
+  luaL_argexpected(L, t == LUA_TNIL || t == LUA_TTABLE, 2, "nil or table");
+  if (l_unlikely(luaL_getmetafield(L, 1, "__metatable") != LUA_TNIL))
+    return luaL_error(L, "cannot change a protected metatable");
+  lua_settop(L, 2);
+  lua_setmetatable(L, 1);
+  return 1;
+}
+
+
+static int luaB_rawequal (lua_State *L) {
+  luaL_checkany(L, 1);
+  luaL_checkany(L, 2);
+  lua_pushboolean(L, lua_rawequal(L, 1, 2));
+  return 1;
+}
+
+
+static int luaB_rawlen (lua_State *L) {
+  int t = lua_type(L, 1);
+  luaL_argexpected(L, t == LUA_TTABLE || t == LUA_TSTRING, 1,
+                      "table or string");
+  lua_pushinteger(L, lua_rawlen(L, 1));
+  return 1;
+}
+
+
+static int luaB_rawget (lua_State *L) {
+  luaL_checktype(L, 1, LUA_TTABLE);
+  luaL_checkany(L, 2);
+  lua_settop(L, 2);
+  lua_rawget(L, 1);
+  return 1;
+}
+
+static int luaB_rawset (lua_State *L) {
+  luaL_checktype(L, 1, LUA_TTABLE);
+  luaL_checkany(L, 2);
+  luaL_checkany(L, 3);
+  lua_settop(L, 3);
+  lua_rawset(L, 1);
+  return 1;
+}
+
+
+static int pushmode (lua_State *L, int oldmode) {
+  if (oldmode == -1)
+    luaL_pushfail(L);  /* invalid call to 'lua_gc' */
+  else
+    lua_pushstring(L, (oldmode == LUA_GCINC) ? "incremental"
+                                             : "generational");
+  return 1;
+}
+
+
+/*
+** check whether call to 'lua_gc' was valid (not inside a finalizer)
+*/
+#define checkvalres(res) { if (res == -1) break; }
+
+static int luaB_collectgarbage (lua_State *L) {
+  static const char *const opts[] = {"stop", "restart", "collect",
+    "count", "step", "setpause", "setstepmul",
+    "isrunning", "generational", "incremental", NULL};
+  static const int optsnum[] = {LUA_GCSTOP, LUA_GCRESTART, LUA_GCCOLLECT,
+    LUA_GCCOUNT, LUA_GCSTEP, LUA_GCSETPAUSE, LUA_GCSETSTEPMUL,
+    LUA_GCISRUNNING, LUA_GCGEN, LUA_GCINC};
+  int o = optsnum[luaL_checkoption(L, 1, "collect", opts)];
+  switch (o) {
+    case LUA_GCCOUNT: {
+      int k = lua_gc(L, o);
+      int b = lua_gc(L, LUA_GCCOUNTB);
+      checkvalres(k);
+      lua_pushnumber(L, (lua_Number)k + ((lua_Number)b/1024));
+      return 1;
+    }
+    case LUA_GCSTEP: {
+      int step = (int)luaL_optinteger(L, 2, 0);
+      int res = lua_gc(L, o, step);
+      checkvalres(res);
+      lua_pushboolean(L, res);
+      return 1;
+    }
+    case LUA_GCSETPAUSE:
+    case LUA_GCSETSTEPMUL: {
+      int p = (int)luaL_optinteger(L, 2, 0);
+      int previous = lua_gc(L, o, p);
+      checkvalres(previous);
+      lua_pushinteger(L, previous);
+      return 1;
+    }
+    case LUA_GCISRUNNING: {
+      int res = lua_gc(L, o);
+      checkvalres(res);
+      lua_pushboolean(L, res);
+      return 1;
+    }
+    case LUA_GCGEN: {
+      int minormul = (int)luaL_optinteger(L, 2, 0);
+      int majormul = (int)luaL_optinteger(L, 3, 0);
+      return pushmode(L, lua_gc(L, o, minormul, majormul));
+    }
+    case LUA_GCINC: {
+      int pause = (int)luaL_optinteger(L, 2, 0);
+      int stepmul = (int)luaL_optinteger(L, 3, 0);
+      int stepsize = (int)luaL_optinteger(L, 4, 0);
+      return pushmode(L, lua_gc(L, o, pause, stepmul, stepsize));
+    }
+    default: {
+      int res = lua_gc(L, o);
+      checkvalres(res);
+      lua_pushinteger(L, res);
+      return 1;
+    }
+  }
+  luaL_pushfail(L);  /* invalid call (inside a finalizer) */
+  return 1;
+}
+
+
+static int luaB_type (lua_State *L) {
+  int t = lua_type(L, 1);
+  luaL_argcheck(L, t != LUA_TNONE, 1, "value expected");
+  lua_pushstring(L, lua_typename(L, t));
+  return 1;
+}
+
+
+static int luaB_next (lua_State *L) {
+  luaL_checktype(L, 1, LUA_TTABLE);
+  lua_settop(L, 2);  /* create a 2nd argument if there isn't one */
+  if (lua_next(L, 1))
+    return 2;
+  else {
+    lua_pushnil(L);
+    return 1;
+  }
+}
+
+
+static int pairscont (lua_State *L, int status, lua_KContext k) {
+  (void)L; (void)status; (void)k;  /* unused */
+  return 3;
+}
+
+static int luaB_pairs (lua_State *L) {
+  luaL_checkany(L, 1);
+  if (luaL_getmetafield(L, 1, "__pairs") == LUA_TNIL) {  /* no metamethod? */
+    lua_pushcfunction(L, luaB_next);  /* will return generator, */
+    lua_pushvalue(L, 1);  /* state, */
+    lua_pushnil(L);  /* and initial value */
+  }
+  else {
+    lua_pushvalue(L, 1);  /* argument 'self' to metamethod */
+    lua_callk(L, 1, 3, 0, pairscont);  /* get 3 values from metamethod */
+  }
+  return 3;
+}
+
+
+/*
+** Traversal function for 'ipairs'
+*/
+static int ipairsaux (lua_State *L) {
+  lua_Integer i = luaL_checkinteger(L, 2);
+  i = luaL_intop(+, i, 1);
+  lua_pushinteger(L, i);
+  return (lua_geti(L, 1, i) == LUA_TNIL) ? 1 : 2;
+}
+
+
+/*
+** 'ipairs' function. Returns 'ipairsaux', given "table", 0.
+** (The given "table" may not be a table.)
+*/
+static int luaB_ipairs (lua_State *L) {
+  luaL_checkany(L, 1);
+  lua_pushcfunction(L, ipairsaux);  /* iteration function */
+  lua_pushvalue(L, 1);  /* state */
+  lua_pushinteger(L, 0);  /* initial value */
+  return 3;
+}
+
+
+static int load_aux (lua_State *L, int status, int envidx) {
+  if (l_likely(status == LUA_OK)) {
+    if (envidx != 0) {  /* 'env' parameter? */
+      lua_pushvalue(L, envidx);  /* environment for loaded function */
+      if (!lua_setupvalue(L, -2, 1))  /* set it as 1st upvalue */
+        lua_pop(L, 1);  /* remove 'env' if not used by previous call */
+    }
+    return 1;
+  }
+  else {  /* error (message is on top of the stack) */
+    luaL_pushfail(L);
+    lua_insert(L, -2);  /* put before error message */
+    return 2;  /* return fail plus error message */
+  }
+}
+
+
+static int luaB_loadfile (lua_State *L) {
+  const char *fname = luaL_optstring(L, 1, NULL);
+  const char *mode = luaL_optstring(L, 2, NULL);
+  int env = (!lua_isnone(L, 3) ? 3 : 0);  /* 'env' index or 0 if no 'env' */
+  int status = luaL_loadfilex(L, fname, mode);
+  return load_aux(L, status, env);
+}
+
+
+/*
+** {======================================================
+** Generic Read function
+** =======================================================
+*/
+
+
+/*
+** reserved slot, above all arguments, to hold a copy of the returned
+** string to avoid it being collected while parsed. 'load' has four
+** optional arguments (chunk, source name, mode, and environment).
+*/
+#define RESERVEDSLOT	5
+
+
+/*
+** Reader for generic 'load' function: 'lua_load' uses the
+** stack for internal stuff, so the reader cannot change the
+** stack top. Instead, it keeps its resulting string in a
+** reserved slot inside the stack.
+*/
+static const char *generic_reader (lua_State *L, void *ud, size_t *size) {
+  (void)(ud);  /* not used */
+  luaL_checkstack(L, 2, "too many nested functions");
+  lua_pushvalue(L, 1);  /* get function */
+  lua_call(L, 0, 1);  /* call it */
+  if (lua_isnil(L, -1)) {
+    lua_pop(L, 1);  /* pop result */
+    *size = 0;
+    return NULL;
+  }
+  else if (l_unlikely(!lua_isstring(L, -1)))
+    luaL_error(L, "reader function must return a string");
+  lua_replace(L, RESERVEDSLOT);  /* save string in reserved slot */
+  return lua_tolstring(L, RESERVEDSLOT, size);
+}
+
+
+static int luaB_load (lua_State *L) {
+  int status;
+  size_t l;
+  const char *s = lua_tolstring(L, 1, &l);
+  const char *mode = luaL_optstring(L, 3, "bt");
+  int env = (!lua_isnone(L, 4) ? 4 : 0);  /* 'env' index or 0 if no 'env' */
+  if (s != NULL) {  /* loading a string? */
+    const char *chunkname = luaL_optstring(L, 2, s);
+    status = luaL_loadbufferx(L, s, l, chunkname, mode);
+  }
+  else {  /* loading from a reader function */
+    const char *chunkname = luaL_optstring(L, 2, "=(load)");
+    luaL_checktype(L, 1, LUA_TFUNCTION);
+    lua_settop(L, RESERVEDSLOT);  /* create reserved slot */
+    status = lua_load(L, generic_reader, NULL, chunkname, mode);
+  }
+  return load_aux(L, status, env);
+}
+
+/* }====================================================== */
+
+
+static int dofilecont (lua_State *L, int d1, lua_KContext d2) {
+  (void)d1;  (void)d2;  /* only to match 'lua_Kfunction' prototype */
+  return lua_gettop(L) - 1;
+}
+
+
+static int luaB_dofile (lua_State *L) {
+  const char *fname = luaL_optstring(L, 1, NULL);
+  lua_settop(L, 1);
+  if (l_unlikely(luaL_loadfile(L, fname) != LUA_OK))
+    return lua_error(L);
+  lua_callk(L, 0, LUA_MULTRET, 0, dofilecont);
+  return dofilecont(L, 0, 0);
+}
+
+
+static int luaB_assert (lua_State *L) {
+  if (l_likely(lua_toboolean(L, 1)))  /* condition is true? */
+    return lua_gettop(L);  /* return all arguments */
+  else {  /* error */
+    luaL_checkany(L, 1);  /* there must be a condition */
+    lua_remove(L, 1);  /* remove it */
+    lua_pushliteral(L, "assertion failed!");  /* default message */
+    lua_settop(L, 1);  /* leave only message (default if no other one) */
+    return luaB_error(L);  /* call 'error' */
+  }
+}
+
+
+static int luaB_select (lua_State *L) {
+  int n = lua_gettop(L);
+  if (lua_type(L, 1) == LUA_TSTRING && *lua_tostring(L, 1) == '#') {
+    lua_pushinteger(L, n-1);
+    return 1;
+  }
+  else {
+    lua_Integer i = luaL_checkinteger(L, 1);
+    if (i < 0) i = n + i;
+    else if (i > n) i = n;
+    luaL_argcheck(L, 1 <= i, 1, "index out of range");
+    return n - (int)i;
+  }
+}
+
+
+/*
+** Continuation function for 'pcall' and 'xpcall'. Both functions
+** already pushed a 'true' before doing the call, so in case of success
+** 'finishpcall' only has to return everything in the stack minus
+** 'extra' values (where 'extra' is exactly the number of items to be
+** ignored).
+*/
+static int finishpcall (lua_State *L, int status, lua_KContext extra) {
+  if (l_unlikely(status != LUA_OK && status != LUA_YIELD)) {  /* error? */
+    lua_pushboolean(L, 0);  /* first result (false) */
+    lua_pushvalue(L, -2);  /* error message */
+    return 2;  /* return false, msg */
+  }
+  else
+    return lua_gettop(L) - (int)extra;  /* return all results */
+}
+
+
+static int luaB_pcall (lua_State *L) {
+  int status;
+  luaL_checkany(L, 1);
+  lua_pushboolean(L, 1);  /* first result if no errors */
+  lua_insert(L, 1);  /* put it in place */
+  status = lua_pcallk(L, lua_gettop(L) - 2, LUA_MULTRET, 0, 0, finishpcall);
+  return finishpcall(L, status, 0);
+}
+
+
+/*
+** Do a protected call with error handling. After 'lua_rotate', the
+** stack will have <f, err, true, f, [args...]>; so, the function passes
+** 2 to 'finishpcall' to skip the 2 first values when returning results.
+*/
+static int luaB_xpcall (lua_State *L) {
+  int status;
+  int n = lua_gettop(L);
+  luaL_checktype(L, 2, LUA_TFUNCTION);  /* check error function */
+  lua_pushboolean(L, 1);  /* first result */
+  lua_pushvalue(L, 1);  /* function */
+  lua_rotate(L, 3, 2);  /* move them below function's arguments */
+  status = lua_pcallk(L, n - 2, LUA_MULTRET, 2, 2, finishpcall);
+  return finishpcall(L, status, 2);
+}
+
+
+static int luaB_tostring (lua_State *L) {
+  luaL_checkany(L, 1);
+  luaL_tolstring(L, 1, NULL);
+  return 1;
+}
+
+
+static const luaL_Reg base_funcs[] = {
+  {"assert", luaB_assert},
+  {"collectgarbage", luaB_collectgarbage},
+  {"dofile", luaB_dofile},
+  {"error", luaB_error},
+  {"getmetatable", luaB_getmetatable},
+  {"ipairs", luaB_ipairs},
+  {"loadfile", luaB_loadfile},
+  {"load", luaB_load},
+  {"next", luaB_next},
+  {"pairs", luaB_pairs},
+  {"pcall", luaB_pcall},
+  {"print", luaB_print},
+  {"warn", luaB_warn},
+  {"rawequal", luaB_rawequal},
+  {"rawlen", luaB_rawlen},
+  {"rawget", luaB_rawget},
+  {"rawset", luaB_rawset},
+  {"select", luaB_select},
+  {"setmetatable", luaB_setmetatable},
+  {"tonumber", luaB_tonumber},
+  {"tostring", luaB_tostring},
+  {"type", luaB_type},
+  {"xpcall", luaB_xpcall},
+  /* placeholders */
+  {LUA_GNAME, NULL},
+  {"_VERSION", NULL},
+  {NULL, NULL}
+};
+
+
+LUAMOD_API int luaopen_base (lua_State *L) {
+  /* open lib into global table */
+  lua_pushglobaltable(L);
+  luaL_setfuncs(L, base_funcs, 0);
+  /* set global _G */
+  lua_pushvalue(L, -1);
+  lua_setfield(L, -2, LUA_GNAME);
+  /* set global _VERSION */
+  lua_pushliteral(L, LUA_VERSION);
+  lua_setfield(L, -2, "_VERSION");
+  return 1;
+}
+
diff --git a/src/libs/3rdparty/lua/src/lcode.c b/src/libs/3rdparty/lua/src/lcode.c
new file mode 100644
index 00000000000..1a371ca943b
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lcode.c
@@ -0,0 +1,1871 @@
+/*
+** $Id: lcode.c $
+** Code generator for Lua
+** See Copyright Notice in lua.h
+*/
+
+#define lcode_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <float.h>
+#include <limits.h>
+#include <math.h>
+#include <stdlib.h>
+
+#include "lua.h"
+
+#include "lcode.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lgc.h"
+#include "llex.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lparser.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "lvm.h"
+
+
+/* Maximum number of registers in a Lua function (must fit in 8 bits) */
+#define MAXREGS		255
+
+
+#define hasjumps(e)	((e)->t != (e)->f)
+
+
+static int codesJ (FuncState *fs, OpCode o, int sj, int k);
+
+
+
+/* semantic error */
+l_noret luaK_semerror (LexState *ls, const char *msg) {
+  ls->t.token = 0;  /* remove "near <token>" from final message */
+  luaX_syntaxerror(ls, msg);
+}
+
+
+/*
+** If expression is a numeric constant, fills 'v' with its value
+** and returns 1. Otherwise, returns 0.
+*/
+static int tonumeral (const expdesc *e, TValue *v) {
+  if (hasjumps(e))
+    return 0;  /* not a numeral */
+  switch (e->k) {
+    case VKINT:
+      if (v) setivalue(v, e->u.ival);
+      return 1;
+    case VKFLT:
+      if (v) setfltvalue(v, e->u.nval);
+      return 1;
+    default: return 0;
+  }
+}
+
+
+/*
+** Get the constant value from a constant expression
+*/
+static TValue *const2val (FuncState *fs, const expdesc *e) {
+  lua_assert(e->k == VCONST);
+  return &fs->ls->dyd->actvar.arr[e->u.info].k;
+}
+
+
+/*
+** If expression is a constant, fills 'v' with its value
+** and returns 1. Otherwise, returns 0.
+*/
+int luaK_exp2const (FuncState *fs, const expdesc *e, TValue *v) {
+  if (hasjumps(e))
+    return 0;  /* not a constant */
+  switch (e->k) {
+    case VFALSE:
+      setbfvalue(v);
+      return 1;
+    case VTRUE:
+      setbtvalue(v);
+      return 1;
+    case VNIL:
+      setnilvalue(v);
+      return 1;
+    case VKSTR: {
+      setsvalue(fs->ls->L, v, e->u.strval);
+      return 1;
+    }
+    case VCONST: {
+      setobj(fs->ls->L, v, const2val(fs, e));
+      return 1;
+    }
+    default: return tonumeral(e, v);
+  }
+}
+
+
+/*
+** Return the previous instruction of the current code. If there
+** may be a jump target between the current instruction and the
+** previous one, return an invalid instruction (to avoid wrong
+** optimizations).
+*/
+static Instruction *previousinstruction (FuncState *fs) {
+  static const Instruction invalidinstruction = ~(Instruction)0;
+  if (fs->pc > fs->lasttarget)
+    return &fs->f->code[fs->pc - 1];  /* previous instruction */
+  else
+    return cast(Instruction*, &invalidinstruction);
+}
+
+
+/*
+** Create a OP_LOADNIL instruction, but try to optimize: if the previous
+** instruction is also OP_LOADNIL and ranges are compatible, adjust
+** range of previous instruction instead of emitting a new one. (For
+** instance, 'local a; local b' will generate a single opcode.)
+*/
+void luaK_nil (FuncState *fs, int from, int n) {
+  int l = from + n - 1;  /* last register to set nil */
+  Instruction *previous = previousinstruction(fs);
+  if (GET_OPCODE(*previous) == OP_LOADNIL) {  /* previous is LOADNIL? */
+    int pfrom = GETARG_A(*previous);  /* get previous range */
+    int pl = pfrom + GETARG_B(*previous);
+    if ((pfrom <= from && from <= pl + 1) ||
+        (from <= pfrom && pfrom <= l + 1)) {  /* can connect both? */
+      if (pfrom < from) from = pfrom;  /* from = min(from, pfrom) */
+      if (pl > l) l = pl;  /* l = max(l, pl) */
+      SETARG_A(*previous, from);
+      SETARG_B(*previous, l - from);
+      return;
+    }  /* else go through */
+  }
+  luaK_codeABC(fs, OP_LOADNIL, from, n - 1, 0);  /* else no optimization */
+}
+
+
+/*
+** Gets the destination address of a jump instruction. Used to traverse
+** a list of jumps.
+*/
+static int getjump (FuncState *fs, int pc) {
+  int offset = GETARG_sJ(fs->f->code[pc]);
+  if (offset == NO_JUMP)  /* point to itself represents end of list */
+    return NO_JUMP;  /* end of list */
+  else
+    return (pc+1)+offset;  /* turn offset into absolute position */
+}
+
+
+/*
+** Fix jump instruction at position 'pc' to jump to 'dest'.
+** (Jump addresses are relative in Lua)
+*/
+static void fixjump (FuncState *fs, int pc, int dest) {
+  Instruction *jmp = &fs->f->code[pc];
+  int offset = dest - (pc + 1);
+  lua_assert(dest != NO_JUMP);
+  if (!(-OFFSET_sJ <= offset && offset <= MAXARG_sJ - OFFSET_sJ))
+    luaX_syntaxerror(fs->ls, "control structure too long");
+  lua_assert(GET_OPCODE(*jmp) == OP_JMP);
+  SETARG_sJ(*jmp, offset);
+}
+
+
+/*
+** Concatenate jump-list 'l2' into jump-list 'l1'
+*/
+void luaK_concat (FuncState *fs, int *l1, int l2) {
+  if (l2 == NO_JUMP) return;  /* nothing to concatenate? */
+  else if (*l1 == NO_JUMP)  /* no original list? */
+    *l1 = l2;  /* 'l1' points to 'l2' */
+  else {
+    int list = *l1;
+    int next;
+    while ((next = getjump(fs, list)) != NO_JUMP)  /* find last element */
+      list = next;
+    fixjump(fs, list, l2);  /* last element links to 'l2' */
+  }
+}
+
+
+/*
+** Create a jump instruction and return its position, so its destination
+** can be fixed later (with 'fixjump').
+*/
+int luaK_jump (FuncState *fs) {
+  return codesJ(fs, OP_JMP, NO_JUMP, 0);
+}
+
+
+/*
+** Code a 'return' instruction
+*/
+void luaK_ret (FuncState *fs, int first, int nret) {
+  OpCode op;
+  switch (nret) {
+    case 0: op = OP_RETURN0; break;
+    case 1: op = OP_RETURN1; break;
+    default: op = OP_RETURN; break;
+  }
+  luaK_codeABC(fs, op, first, nret + 1, 0);
+}
+
+
+/*
+** Code a "conditional jump", that is, a test or comparison opcode
+** followed by a jump. Return jump position.
+*/
+static int condjump (FuncState *fs, OpCode op, int A, int B, int C, int k) {
+  luaK_codeABCk(fs, op, A, B, C, k);
+  return luaK_jump(fs);
+}
+
+
+/*
+** returns current 'pc' and marks it as a jump target (to avoid wrong
+** optimizations with consecutive instructions not in the same basic block).
+*/
+int luaK_getlabel (FuncState *fs) {
+  fs->lasttarget = fs->pc;
+  return fs->pc;
+}
+
+
+/*
+** Returns the position of the instruction "controlling" a given
+** jump (that is, its condition), or the jump itself if it is
+** unconditional.
+*/
+static Instruction *getjumpcontrol (FuncState *fs, int pc) {
+  Instruction *pi = &fs->f->code[pc];
+  if (pc >= 1 && testTMode(GET_OPCODE(*(pi-1))))
+    return pi-1;
+  else
+    return pi;
+}
+
+
+/*
+** Patch destination register for a TESTSET instruction.
+** If instruction in position 'node' is not a TESTSET, return 0 ("fails").
+** Otherwise, if 'reg' is not 'NO_REG', set it as the destination
+** register. Otherwise, change instruction to a simple 'TEST' (produces
+** no register value)
+*/
+static int patchtestreg (FuncState *fs, int node, int reg) {
+  Instruction *i = getjumpcontrol(fs, node);
+  if (GET_OPCODE(*i) != OP_TESTSET)
+    return 0;  /* cannot patch other instructions */
+  if (reg != NO_REG && reg != GETARG_B(*i))
+    SETARG_A(*i, reg);
+  else {
+     /* no register to put value or register already has the value;
+        change instruction to simple test */
+    *i = CREATE_ABCk(OP_TEST, GETARG_B(*i), 0, 0, GETARG_k(*i));
+  }
+  return 1;
+}
+
+
+/*
+** Traverse a list of tests ensuring no one produces a value
+*/
+static void removevalues (FuncState *fs, int list) {
+  for (; list != NO_JUMP; list = getjump(fs, list))
+      patchtestreg(fs, list, NO_REG);
+}
+
+
+/*
+** Traverse a list of tests, patching their destination address and
+** registers: tests producing values jump to 'vtarget' (and put their
+** values in 'reg'), other tests jump to 'dtarget'.
+*/
+static void patchlistaux (FuncState *fs, int list, int vtarget, int reg,
+                          int dtarget) {
+  while (list != NO_JUMP) {
+    int next = getjump(fs, list);
+    if (patchtestreg(fs, list, reg))
+      fixjump(fs, list, vtarget);
+    else
+      fixjump(fs, list, dtarget);  /* jump to default target */
+    list = next;
+  }
+}
+
+
+/*
+** Path all jumps in 'list' to jump to 'target'.
+** (The assert means that we cannot fix a jump to a forward address
+** because we only know addresses once code is generated.)
+*/
+void luaK_patchlist (FuncState *fs, int list, int target) {
+  lua_assert(target <= fs->pc);
+  patchlistaux(fs, list, target, NO_REG, target);
+}
+
+
+void luaK_patchtohere (FuncState *fs, int list) {
+  int hr = luaK_getlabel(fs);  /* mark "here" as a jump target */
+  luaK_patchlist(fs, list, hr);
+}
+
+
+/* limit for difference between lines in relative line info. */
+#define LIMLINEDIFF	0x80
+
+
+/*
+** Save line info for a new instruction. If difference from last line
+** does not fit in a byte, of after that many instructions, save a new
+** absolute line info; (in that case, the special value 'ABSLINEINFO'
+** in 'lineinfo' signals the existence of this absolute information.)
+** Otherwise, store the difference from last line in 'lineinfo'.
+*/
+static void savelineinfo (FuncState *fs, Proto *f, int line) {
+  int linedif = line - fs->previousline;
+  int pc = fs->pc - 1;  /* last instruction coded */
+  if (abs(linedif) >= LIMLINEDIFF || fs->iwthabs++ >= MAXIWTHABS) {
+    luaM_growvector(fs->ls->L, f->abslineinfo, fs->nabslineinfo,
+                    f->sizeabslineinfo, AbsLineInfo, MAX_INT, "lines");
+    f->abslineinfo[fs->nabslineinfo].pc = pc;
+    f->abslineinfo[fs->nabslineinfo++].line = line;
+    linedif = ABSLINEINFO;  /* signal that there is absolute information */
+    fs->iwthabs = 1;  /* restart counter */
+  }
+  luaM_growvector(fs->ls->L, f->lineinfo, pc, f->sizelineinfo, ls_byte,
+                  MAX_INT, "opcodes");
+  f->lineinfo[pc] = linedif;
+  fs->previousline = line;  /* last line saved */
+}
+
+
+/*
+** Remove line information from the last instruction.
+** If line information for that instruction is absolute, set 'iwthabs'
+** above its max to force the new (replacing) instruction to have
+** absolute line info, too.
+*/
+static void removelastlineinfo (FuncState *fs) {
+  Proto *f = fs->f;
+  int pc = fs->pc - 1;  /* last instruction coded */
+  if (f->lineinfo[pc] != ABSLINEINFO) {  /* relative line info? */
+    fs->previousline -= f->lineinfo[pc];  /* correct last line saved */
+    fs->iwthabs--;  /* undo previous increment */
+  }
+  else {  /* absolute line information */
+    lua_assert(f->abslineinfo[fs->nabslineinfo - 1].pc == pc);
+    fs->nabslineinfo--;  /* remove it */
+    fs->iwthabs = MAXIWTHABS + 1;  /* force next line info to be absolute */
+  }
+}
+
+
+/*
+** Remove the last instruction created, correcting line information
+** accordingly.
+*/
+static void removelastinstruction (FuncState *fs) {
+  removelastlineinfo(fs);
+  fs->pc--;
+}
+
+
+/*
+** Emit instruction 'i', checking for array sizes and saving also its
+** line information. Return 'i' position.
+*/
+int luaK_code (FuncState *fs, Instruction i) {
+  Proto *f = fs->f;
+  /* put new instruction in code array */
+  luaM_growvector(fs->ls->L, f->code, fs->pc, f->sizecode, Instruction,
+                  MAX_INT, "opcodes");
+  f->code[fs->pc++] = i;
+  savelineinfo(fs, f, fs->ls->lastline);
+  return fs->pc - 1;  /* index of new instruction */
+}
+
+
+/*
+** Format and emit an 'iABC' instruction. (Assertions check consistency
+** of parameters versus opcode.)
+*/
+int luaK_codeABCk (FuncState *fs, OpCode o, int a, int b, int c, int k) {
+  lua_assert(getOpMode(o) == iABC);
+  lua_assert(a <= MAXARG_A && b <= MAXARG_B &&
+             c <= MAXARG_C && (k & ~1) == 0);
+  return luaK_code(fs, CREATE_ABCk(o, a, b, c, k));
+}
+
+
+/*
+** Format and emit an 'iABx' instruction.
+*/
+int luaK_codeABx (FuncState *fs, OpCode o, int a, unsigned int bc) {
+  lua_assert(getOpMode(o) == iABx);
+  lua_assert(a <= MAXARG_A && bc <= MAXARG_Bx);
+  return luaK_code(fs, CREATE_ABx(o, a, bc));
+}
+
+
+/*
+** Format and emit an 'iAsBx' instruction.
+*/
+int luaK_codeAsBx (FuncState *fs, OpCode o, int a, int bc) {
+  unsigned int b = bc + OFFSET_sBx;
+  lua_assert(getOpMode(o) == iAsBx);
+  lua_assert(a <= MAXARG_A && b <= MAXARG_Bx);
+  return luaK_code(fs, CREATE_ABx(o, a, b));
+}
+
+
+/*
+** Format and emit an 'isJ' instruction.
+*/
+static int codesJ (FuncState *fs, OpCode o, int sj, int k) {
+  unsigned int j = sj + OFFSET_sJ;
+  lua_assert(getOpMode(o) == isJ);
+  lua_assert(j <= MAXARG_sJ && (k & ~1) == 0);
+  return luaK_code(fs, CREATE_sJ(o, j, k));
+}
+
+
+/*
+** Emit an "extra argument" instruction (format 'iAx')
+*/
+static int codeextraarg (FuncState *fs, int a) {
+  lua_assert(a <= MAXARG_Ax);
+  return luaK_code(fs, CREATE_Ax(OP_EXTRAARG, a));
+}
+
+
+/*
+** Emit a "load constant" instruction, using either 'OP_LOADK'
+** (if constant index 'k' fits in 18 bits) or an 'OP_LOADKX'
+** instruction with "extra argument".
+*/
+static int luaK_codek (FuncState *fs, int reg, int k) {
+  if (k <= MAXARG_Bx)
+    return luaK_codeABx(fs, OP_LOADK, reg, k);
+  else {
+    int p = luaK_codeABx(fs, OP_LOADKX, reg, 0);
+    codeextraarg(fs, k);
+    return p;
+  }
+}
+
+
+/*
+** Check register-stack level, keeping track of its maximum size
+** in field 'maxstacksize'
+*/
+void luaK_checkstack (FuncState *fs, int n) {
+  int newstack = fs->freereg + n;
+  if (newstack > fs->f->maxstacksize) {
+    if (newstack >= MAXREGS)
+      luaX_syntaxerror(fs->ls,
+        "function or expression needs too many registers");
+    fs->f->maxstacksize = cast_byte(newstack);
+  }
+}
+
+
+/*
+** Reserve 'n' registers in register stack
+*/
+void luaK_reserveregs (FuncState *fs, int n) {
+  luaK_checkstack(fs, n);
+  fs->freereg += n;
+}
+
+
+/*
+** Free register 'reg', if it is neither a constant index nor
+** a local variable.
+)
+*/
+static void freereg (FuncState *fs, int reg) {
+  if (reg >= luaY_nvarstack(fs)) {
+    fs->freereg--;
+    lua_assert(reg == fs->freereg);
+  }
+}
+
+
+/*
+** Free two registers in proper order
+*/
+static void freeregs (FuncState *fs, int r1, int r2) {
+  if (r1 > r2) {
+    freereg(fs, r1);
+    freereg(fs, r2);
+  }
+  else {
+    freereg(fs, r2);
+    freereg(fs, r1);
+  }
+}
+
+
+/*
+** Free register used by expression 'e' (if any)
+*/
+static void freeexp (FuncState *fs, expdesc *e) {
+  if (e->k == VNONRELOC)
+    freereg(fs, e->u.info);
+}
+
+
+/*
+** Free registers used by expressions 'e1' and 'e2' (if any) in proper
+** order.
+*/
+static void freeexps (FuncState *fs, expdesc *e1, expdesc *e2) {
+  int r1 = (e1->k == VNONRELOC) ? e1->u.info : -1;
+  int r2 = (e2->k == VNONRELOC) ? e2->u.info : -1;
+  freeregs(fs, r1, r2);
+}
+
+
+/*
+** Add constant 'v' to prototype's list of constants (field 'k').
+** Use scanner's table to cache position of constants in constant list
+** and try to reuse constants. Because some values should not be used
+** as keys (nil cannot be a key, integer keys can collapse with float
+** keys), the caller must provide a useful 'key' for indexing the cache.
+** Note that all functions share the same table, so entering or exiting
+** a function can make some indices wrong.
+*/
+static int addk (FuncState *fs, TValue *key, TValue *v) {
+  TValue val;
+  lua_State *L = fs->ls->L;
+  Proto *f = fs->f;
+  const TValue *idx = luaH_get(fs->ls->h, key);  /* query scanner table */
+  int k, oldsize;
+  if (ttisinteger(idx)) {  /* is there an index there? */
+    k = cast_int(ivalue(idx));
+    /* correct value? (warning: must distinguish floats from integers!) */
+    if (k < fs->nk && ttypetag(&f->k[k]) == ttypetag(v) &&
+                      luaV_rawequalobj(&f->k[k], v))
+      return k;  /* reuse index */
+  }
+  /* constant not found; create a new entry */
+  oldsize = f->sizek;
+  k = fs->nk;
+  /* numerical value does not need GC barrier;
+     table has no metatable, so it does not need to invalidate cache */
+  setivalue(&val, k);
+  luaH_finishset(L, fs->ls->h, key, idx, &val);
+  luaM_growvector(L, f->k, k, f->sizek, TValue, MAXARG_Ax, "constants");
+  while (oldsize < f->sizek) setnilvalue(&f->k[oldsize++]);
+  setobj(L, &f->k[k], v);
+  fs->nk++;
+  luaC_barrier(L, f, v);
+  return k;
+}
+
+
+/*
+** Add a string to list of constants and return its index.
+*/
+static int stringK (FuncState *fs, TString *s) {
+  TValue o;
+  setsvalue(fs->ls->L, &o, s);
+  return addk(fs, &o, &o);  /* use string itself as key */
+}
+
+
+/*
+** Add an integer to list of constants and return its index.
+*/
+static int luaK_intK (FuncState *fs, lua_Integer n) {
+  TValue o;
+  setivalue(&o, n);
+  return addk(fs, &o, &o);  /* use integer itself as key */
+}
+
+/*
+** Add a float to list of constants and return its index. Floats
+** with integral values need a different key, to avoid collision
+** with actual integers. To that, we add to the number its smaller
+** power-of-two fraction that is still significant in its scale.
+** For doubles, that would be 1/2^52.
+** (This method is not bulletproof: there may be another float
+** with that value, and for floats larger than 2^53 the result is
+** still an integer. At worst, this only wastes an entry with
+** a duplicate.)
+*/
+static int luaK_numberK (FuncState *fs, lua_Number r) {
+  TValue o;
+  lua_Integer ik;
+  setfltvalue(&o, r);
+  if (!luaV_flttointeger(r, &ik, F2Ieq))  /* not an integral value? */
+    return addk(fs, &o, &o);  /* use number itself as key */
+  else {  /* must build an alternative key */
+    const int nbm = l_floatatt(MANT_DIG);
+    const lua_Number q = l_mathop(ldexp)(l_mathop(1.0), -nbm + 1);
+    const lua_Number k = (ik == 0) ? q : r + r*q;  /* new key */
+    TValue kv;
+    setfltvalue(&kv, k);
+    /* result is not an integral value, unless value is too large */
+    lua_assert(!luaV_flttointeger(k, &ik, F2Ieq) ||
+                l_mathop(fabs)(r) >= l_mathop(1e6));
+    return addk(fs, &kv, &o);
+  }
+}
+
+
+/*
+** Add a false to list of constants and return its index.
+*/
+static int boolF (FuncState *fs) {
+  TValue o;
+  setbfvalue(&o);
+  return addk(fs, &o, &o);  /* use boolean itself as key */
+}
+
+
+/*
+** Add a true to list of constants and return its index.
+*/
+static int boolT (FuncState *fs) {
+  TValue o;
+  setbtvalue(&o);
+  return addk(fs, &o, &o);  /* use boolean itself as key */
+}
+
+
+/*
+** Add nil to list of constants and return its index.
+*/
+static int nilK (FuncState *fs) {
+  TValue k, v;
+  setnilvalue(&v);
+  /* cannot use nil as key; instead use table itself to represent nil */
+  sethvalue(fs->ls->L, &k, fs->ls->h);
+  return addk(fs, &k, &v);
+}
+
+
+/*
+** Check whether 'i' can be stored in an 'sC' operand. Equivalent to
+** (0 <= int2sC(i) && int2sC(i) <= MAXARG_C) but without risk of
+** overflows in the hidden addition inside 'int2sC'.
+*/
+static int fitsC (lua_Integer i) {
+  return (l_castS2U(i) + OFFSET_sC <= cast_uint(MAXARG_C));
+}
+
+
+/*
+** Check whether 'i' can be stored in an 'sBx' operand.
+*/
+static int fitsBx (lua_Integer i) {
+  return (-OFFSET_sBx <= i && i <= MAXARG_Bx - OFFSET_sBx);
+}
+
+
+void luaK_int (FuncState *fs, int reg, lua_Integer i) {
+  if (fitsBx(i))
+    luaK_codeAsBx(fs, OP_LOADI, reg, cast_int(i));
+  else
+    luaK_codek(fs, reg, luaK_intK(fs, i));
+}
+
+
+static void luaK_float (FuncState *fs, int reg, lua_Number f) {
+  lua_Integer fi;
+  if (luaV_flttointeger(f, &fi, F2Ieq) && fitsBx(fi))
+    luaK_codeAsBx(fs, OP_LOADF, reg, cast_int(fi));
+  else
+    luaK_codek(fs, reg, luaK_numberK(fs, f));
+}
+
+
+/*
+** Convert a constant in 'v' into an expression description 'e'
+*/
+static void const2exp (TValue *v, expdesc *e) {
+  switch (ttypetag(v)) {
+    case LUA_VNUMINT:
+      e->k = VKINT; e->u.ival = ivalue(v);
+      break;
+    case LUA_VNUMFLT:
+      e->k = VKFLT; e->u.nval = fltvalue(v);
+      break;
+    case LUA_VFALSE:
+      e->k = VFALSE;
+      break;
+    case LUA_VTRUE:
+      e->k = VTRUE;
+      break;
+    case LUA_VNIL:
+      e->k = VNIL;
+      break;
+    case LUA_VSHRSTR:  case LUA_VLNGSTR:
+      e->k = VKSTR; e->u.strval = tsvalue(v);
+      break;
+    default: lua_assert(0);
+  }
+}
+
+
+/*
+** Fix an expression to return the number of results 'nresults'.
+** 'e' must be a multi-ret expression (function call or vararg).
+*/
+void luaK_setreturns (FuncState *fs, expdesc *e, int nresults) {
+  Instruction *pc = &getinstruction(fs, e);
+  if (e->k == VCALL)  /* expression is an open function call? */
+    SETARG_C(*pc, nresults + 1);
+  else {
+    lua_assert(e->k == VVARARG);
+    SETARG_C(*pc, nresults + 1);
+    SETARG_A(*pc, fs->freereg);
+    luaK_reserveregs(fs, 1);
+  }
+}
+
+
+/*
+** Convert a VKSTR to a VK
+*/
+static void str2K (FuncState *fs, expdesc *e) {
+  lua_assert(e->k == VKSTR);
+  e->u.info = stringK(fs, e->u.strval);
+  e->k = VK;
+}
+
+
+/*
+** Fix an expression to return one result.
+** If expression is not a multi-ret expression (function call or
+** vararg), it already returns one result, so nothing needs to be done.
+** Function calls become VNONRELOC expressions (as its result comes
+** fixed in the base register of the call), while vararg expressions
+** become VRELOC (as OP_VARARG puts its results where it wants).
+** (Calls are created returning one result, so that does not need
+** to be fixed.)
+*/
+void luaK_setoneret (FuncState *fs, expdesc *e) {
+  if (e->k == VCALL) {  /* expression is an open function call? */
+    /* already returns 1 value */
+    lua_assert(GETARG_C(getinstruction(fs, e)) == 2);
+    e->k = VNONRELOC;  /* result has fixed position */
+    e->u.info = GETARG_A(getinstruction(fs, e));
+  }
+  else if (e->k == VVARARG) {
+    SETARG_C(getinstruction(fs, e), 2);
+    e->k = VRELOC;  /* can relocate its simple result */
+  }
+}
+
+
+/*
+** Ensure that expression 'e' is not a variable (nor a <const>).
+** (Expression still may have jump lists.)
+*/
+void luaK_dischargevars (FuncState *fs, expdesc *e) {
+  switch (e->k) {
+    case VCONST: {
+      const2exp(const2val(fs, e), e);
+      break;
+    }
+    case VLOCAL: {  /* already in a register */
+      e->u.info = e->u.var.ridx;
+      e->k = VNONRELOC;  /* becomes a non-relocatable value */
+      break;
+    }
+    case VUPVAL: {  /* move value to some (pending) register */
+      e->u.info = luaK_codeABC(fs, OP_GETUPVAL, 0, e->u.info, 0);
+      e->k = VRELOC;
+      break;
+    }
+    case VINDEXUP: {
+      e->u.info = luaK_codeABC(fs, OP_GETTABUP, 0, e->u.ind.t, e->u.ind.idx);
+      e->k = VRELOC;
+      break;
+    }
+    case VINDEXI: {
+      freereg(fs, e->u.ind.t);
+      e->u.info = luaK_codeABC(fs, OP_GETI, 0, e->u.ind.t, e->u.ind.idx);
+      e->k = VRELOC;
+      break;
+    }
+    case VINDEXSTR: {
+      freereg(fs, e->u.ind.t);
+      e->u.info = luaK_codeABC(fs, OP_GETFIELD, 0, e->u.ind.t, e->u.ind.idx);
+      e->k = VRELOC;
+      break;
+    }
+    case VINDEXED: {
+      freeregs(fs, e->u.ind.t, e->u.ind.idx);
+      e->u.info = luaK_codeABC(fs, OP_GETTABLE, 0, e->u.ind.t, e->u.ind.idx);
+      e->k = VRELOC;
+      break;
+    }
+    case VVARARG: case VCALL: {
+      luaK_setoneret(fs, e);
+      break;
+    }
+    default: break;  /* there is one value available (somewhere) */
+  }
+}
+
+
+/*
+** Ensure expression value is in register 'reg', making 'e' a
+** non-relocatable expression.
+** (Expression still may have jump lists.)
+*/
+static void discharge2reg (FuncState *fs, expdesc *e, int reg) {
+  luaK_dischargevars(fs, e);
+  switch (e->k) {
+    case VNIL: {
+      luaK_nil(fs, reg, 1);
+      break;
+    }
+    case VFALSE: {
+      luaK_codeABC(fs, OP_LOADFALSE, reg, 0, 0);
+      break;
+    }
+    case VTRUE: {
+      luaK_codeABC(fs, OP_LOADTRUE, reg, 0, 0);
+      break;
+    }
+    case VKSTR: {
+      str2K(fs, e);
+    }  /* FALLTHROUGH */
+    case VK: {
+      luaK_codek(fs, reg, e->u.info);
+      break;
+    }
+    case VKFLT: {
+      luaK_float(fs, reg, e->u.nval);
+      break;
+    }
+    case VKINT: {
+      luaK_int(fs, reg, e->u.ival);
+      break;
+    }
+    case VRELOC: {
+      Instruction *pc = &getinstruction(fs, e);
+      SETARG_A(*pc, reg);  /* instruction will put result in 'reg' */
+      break;
+    }
+    case VNONRELOC: {
+      if (reg != e->u.info)
+        luaK_codeABC(fs, OP_MOVE, reg, e->u.info, 0);
+      break;
+    }
+    default: {
+      lua_assert(e->k == VJMP);
+      return;  /* nothing to do... */
+    }
+  }
+  e->u.info = reg;
+  e->k = VNONRELOC;
+}
+
+
+/*
+** Ensure expression value is in a register, making 'e' a
+** non-relocatable expression.
+** (Expression still may have jump lists.)
+*/
+static void discharge2anyreg (FuncState *fs, expdesc *e) {
+  if (e->k != VNONRELOC) {  /* no fixed register yet? */
+    luaK_reserveregs(fs, 1);  /* get a register */
+    discharge2reg(fs, e, fs->freereg-1);  /* put value there */
+  }
+}
+
+
+static int code_loadbool (FuncState *fs, int A, OpCode op) {
+  luaK_getlabel(fs);  /* those instructions may be jump targets */
+  return luaK_codeABC(fs, op, A, 0, 0);
+}
+
+
+/*
+** check whether list has any jump that do not produce a value
+** or produce an inverted value
+*/
+static int need_value (FuncState *fs, int list) {
+  for (; list != NO_JUMP; list = getjump(fs, list)) {
+    Instruction i = *getjumpcontrol(fs, list);
+    if (GET_OPCODE(i) != OP_TESTSET) return 1;
+  }
+  return 0;  /* not found */
+}
+
+
+/*
+** Ensures final expression result (which includes results from its
+** jump lists) is in register 'reg'.
+** If expression has jumps, need to patch these jumps either to
+** its final position or to "load" instructions (for those tests
+** that do not produce values).
+*/
+static void exp2reg (FuncState *fs, expdesc *e, int reg) {
+  discharge2reg(fs, e, reg);
+  if (e->k == VJMP)  /* expression itself is a test? */
+    luaK_concat(fs, &e->t, e->u.info);  /* put this jump in 't' list */
+  if (hasjumps(e)) {
+    int final;  /* position after whole expression */
+    int p_f = NO_JUMP;  /* position of an eventual LOAD false */
+    int p_t = NO_JUMP;  /* position of an eventual LOAD true */
+    if (need_value(fs, e->t) || need_value(fs, e->f)) {
+      int fj = (e->k == VJMP) ? NO_JUMP : luaK_jump(fs);
+      p_f = code_loadbool(fs, reg, OP_LFALSESKIP);  /* skip next inst. */
+      p_t = code_loadbool(fs, reg, OP_LOADTRUE);
+      /* jump around these booleans if 'e' is not a test */
+      luaK_patchtohere(fs, fj);
+    }
+    final = luaK_getlabel(fs);
+    patchlistaux(fs, e->f, final, reg, p_f);
+    patchlistaux(fs, e->t, final, reg, p_t);
+  }
+  e->f = e->t = NO_JUMP;
+  e->u.info = reg;
+  e->k = VNONRELOC;
+}
+
+
+/*
+** Ensures final expression result is in next available register.
+*/
+void luaK_exp2nextreg (FuncState *fs, expdesc *e) {
+  luaK_dischargevars(fs, e);
+  freeexp(fs, e);
+  luaK_reserveregs(fs, 1);
+  exp2reg(fs, e, fs->freereg - 1);
+}
+
+
+/*
+** Ensures final expression result is in some (any) register
+** and return that register.
+*/
+int luaK_exp2anyreg (FuncState *fs, expdesc *e) {
+  luaK_dischargevars(fs, e);
+  if (e->k == VNONRELOC) {  /* expression already has a register? */
+    if (!hasjumps(e))  /* no jumps? */
+      return e->u.info;  /* result is already in a register */
+    if (e->u.info >= luaY_nvarstack(fs)) {  /* reg. is not a local? */
+      exp2reg(fs, e, e->u.info);  /* put final result in it */
+      return e->u.info;
+    }
+    /* else expression has jumps and cannot change its register
+       to hold the jump values, because it is a local variable.
+       Go through to the default case. */
+  }
+  luaK_exp2nextreg(fs, e);  /* default: use next available register */
+  return e->u.info;
+}
+
+
+/*
+** Ensures final expression result is either in a register
+** or in an upvalue.
+*/
+void luaK_exp2anyregup (FuncState *fs, expdesc *e) {
+  if (e->k != VUPVAL || hasjumps(e))
+    luaK_exp2anyreg(fs, e);
+}
+
+
+/*
+** Ensures final expression result is either in a register
+** or it is a constant.
+*/
+void luaK_exp2val (FuncState *fs, expdesc *e) {
+  if (hasjumps(e))
+    luaK_exp2anyreg(fs, e);
+  else
+    luaK_dischargevars(fs, e);
+}
+
+
+/*
+** Try to make 'e' a K expression with an index in the range of R/K
+** indices. Return true iff succeeded.
+*/
+static int luaK_exp2K (FuncState *fs, expdesc *e) {
+  if (!hasjumps(e)) {
+    int info;
+    switch (e->k) {  /* move constants to 'k' */
+      case VTRUE: info = boolT(fs); break;
+      case VFALSE: info = boolF(fs); break;
+      case VNIL: info = nilK(fs); break;
+      case VKINT: info = luaK_intK(fs, e->u.ival); break;
+      case VKFLT: info = luaK_numberK(fs, e->u.nval); break;
+      case VKSTR: info = stringK(fs, e->u.strval); break;
+      case VK: info = e->u.info; break;
+      default: return 0;  /* not a constant */
+    }
+    if (info <= MAXINDEXRK) {  /* does constant fit in 'argC'? */
+      e->k = VK;  /* make expression a 'K' expression */
+      e->u.info = info;
+      return 1;
+    }
+  }
+  /* else, expression doesn't fit; leave it unchanged */
+  return 0;
+}
+
+
+/*
+** Ensures final expression result is in a valid R/K index
+** (that is, it is either in a register or in 'k' with an index
+** in the range of R/K indices).
+** Returns 1 iff expression is K.
+*/
+int luaK_exp2RK (FuncState *fs, expdesc *e) {
+  if (luaK_exp2K(fs, e))
+    return 1;
+  else {  /* not a constant in the right range: put it in a register */
+    luaK_exp2anyreg(fs, e);
+    return 0;
+  }
+}
+
+
+static void codeABRK (FuncState *fs, OpCode o, int a, int b,
+                      expdesc *ec) {
+  int k = luaK_exp2RK(fs, ec);
+  luaK_codeABCk(fs, o, a, b, ec->u.info, k);
+}
+
+
+/*
+** Generate code to store result of expression 'ex' into variable 'var'.
+*/
+void luaK_storevar (FuncState *fs, expdesc *var, expdesc *ex) {
+  switch (var->k) {
+    case VLOCAL: {
+      freeexp(fs, ex);
+      exp2reg(fs, ex, var->u.var.ridx);  /* compute 'ex' into proper place */
+      return;
+    }
+    case VUPVAL: {
+      int e = luaK_exp2anyreg(fs, ex);
+      luaK_codeABC(fs, OP_SETUPVAL, e, var->u.info, 0);
+      break;
+    }
+    case VINDEXUP: {
+      codeABRK(fs, OP_SETTABUP, var->u.ind.t, var->u.ind.idx, ex);
+      break;
+    }
+    case VINDEXI: {
+      codeABRK(fs, OP_SETI, var->u.ind.t, var->u.ind.idx, ex);
+      break;
+    }
+    case VINDEXSTR: {
+      codeABRK(fs, OP_SETFIELD, var->u.ind.t, var->u.ind.idx, ex);
+      break;
+    }
+    case VINDEXED: {
+      codeABRK(fs, OP_SETTABLE, var->u.ind.t, var->u.ind.idx, ex);
+      break;
+    }
+    default: lua_assert(0);  /* invalid var kind to store */
+  }
+  freeexp(fs, ex);
+}
+
+
+/*
+** Emit SELF instruction (convert expression 'e' into 'e:key(e,').
+*/
+void luaK_self (FuncState *fs, expdesc *e, expdesc *key) {
+  int ereg;
+  luaK_exp2anyreg(fs, e);
+  ereg = e->u.info;  /* register where 'e' was placed */
+  freeexp(fs, e);
+  e->u.info = fs->freereg;  /* base register for op_self */
+  e->k = VNONRELOC;  /* self expression has a fixed register */
+  luaK_reserveregs(fs, 2);  /* function and 'self' produced by op_self */
+  codeABRK(fs, OP_SELF, e->u.info, ereg, key);
+  freeexp(fs, key);
+}
+
+
+/*
+** Negate condition 'e' (where 'e' is a comparison).
+*/
+static void negatecondition (FuncState *fs, expdesc *e) {
+  Instruction *pc = getjumpcontrol(fs, e->u.info);
+  lua_assert(testTMode(GET_OPCODE(*pc)) && GET_OPCODE(*pc) != OP_TESTSET &&
+                                           GET_OPCODE(*pc) != OP_TEST);
+  SETARG_k(*pc, (GETARG_k(*pc) ^ 1));
+}
+
+
+/*
+** Emit instruction to jump if 'e' is 'cond' (that is, if 'cond'
+** is true, code will jump if 'e' is true.) Return jump position.
+** Optimize when 'e' is 'not' something, inverting the condition
+** and removing the 'not'.
+*/
+static int jumponcond (FuncState *fs, expdesc *e, int cond) {
+  if (e->k == VRELOC) {
+    Instruction ie = getinstruction(fs, e);
+    if (GET_OPCODE(ie) == OP_NOT) {
+      removelastinstruction(fs);  /* remove previous OP_NOT */
+      return condjump(fs, OP_TEST, GETARG_B(ie), 0, 0, !cond);
+    }
+    /* else go through */
+  }
+  discharge2anyreg(fs, e);
+  freeexp(fs, e);
+  return condjump(fs, OP_TESTSET, NO_REG, e->u.info, 0, cond);
+}
+
+
+/*
+** Emit code to go through if 'e' is true, jump otherwise.
+*/
+void luaK_goiftrue (FuncState *fs, expdesc *e) {
+  int pc;  /* pc of new jump */
+  luaK_dischargevars(fs, e);
+  switch (e->k) {
+    case VJMP: {  /* condition? */
+      negatecondition(fs, e);  /* jump when it is false */
+      pc = e->u.info;  /* save jump position */
+      break;
+    }
+    case VK: case VKFLT: case VKINT: case VKSTR: case VTRUE: {
+      pc = NO_JUMP;  /* always true; do nothing */
+      break;
+    }
+    default: {
+      pc = jumponcond(fs, e, 0);  /* jump when false */
+      break;
+    }
+  }
+  luaK_concat(fs, &e->f, pc);  /* insert new jump in false list */
+  luaK_patchtohere(fs, e->t);  /* true list jumps to here (to go through) */
+  e->t = NO_JUMP;
+}
+
+
+/*
+** Emit code to go through if 'e' is false, jump otherwise.
+*/
+void luaK_goiffalse (FuncState *fs, expdesc *e) {
+  int pc;  /* pc of new jump */
+  luaK_dischargevars(fs, e);
+  switch (e->k) {
+    case VJMP: {
+      pc = e->u.info;  /* already jump if true */
+      break;
+    }
+    case VNIL: case VFALSE: {
+      pc = NO_JUMP;  /* always false; do nothing */
+      break;
+    }
+    default: {
+      pc = jumponcond(fs, e, 1);  /* jump if true */
+      break;
+    }
+  }
+  luaK_concat(fs, &e->t, pc);  /* insert new jump in 't' list */
+  luaK_patchtohere(fs, e->f);  /* false list jumps to here (to go through) */
+  e->f = NO_JUMP;
+}
+
+
+/*
+** Code 'not e', doing constant folding.
+*/
+static void codenot (FuncState *fs, expdesc *e) {
+  switch (e->k) {
+    case VNIL: case VFALSE: {
+      e->k = VTRUE;  /* true == not nil == not false */
+      break;
+    }
+    case VK: case VKFLT: case VKINT: case VKSTR: case VTRUE: {
+      e->k = VFALSE;  /* false == not "x" == not 0.5 == not 1 == not true */
+      break;
+    }
+    case VJMP: {
+      negatecondition(fs, e);
+      break;
+    }
+    case VRELOC:
+    case VNONRELOC: {
+      discharge2anyreg(fs, e);
+      freeexp(fs, e);
+      e->u.info = luaK_codeABC(fs, OP_NOT, 0, e->u.info, 0);
+      e->k = VRELOC;
+      break;
+    }
+    default: lua_assert(0);  /* cannot happen */
+  }
+  /* interchange true and false lists */
+  { int temp = e->f; e->f = e->t; e->t = temp; }
+  removevalues(fs, e->f);  /* values are useless when negated */
+  removevalues(fs, e->t);
+}
+
+
+/*
+** Check whether expression 'e' is a small literal string
+*/
+static int isKstr (FuncState *fs, expdesc *e) {
+  return (e->k == VK && !hasjumps(e) && e->u.info <= MAXARG_B &&
+          ttisshrstring(&fs->f->k[e->u.info]));
+}
+
+/*
+** Check whether expression 'e' is a literal integer.
+*/
+int luaK_isKint (expdesc *e) {
+  return (e->k == VKINT && !hasjumps(e));
+}
+
+
+/*
+** Check whether expression 'e' is a literal integer in
+** proper range to fit in register C
+*/
+static int isCint (expdesc *e) {
+  return luaK_isKint(e) && (l_castS2U(e->u.ival) <= l_castS2U(MAXARG_C));
+}
+
+
+/*
+** Check whether expression 'e' is a literal integer in
+** proper range to fit in register sC
+*/
+static int isSCint (expdesc *e) {
+  return luaK_isKint(e) && fitsC(e->u.ival);
+}
+
+
+/*
+** Check whether expression 'e' is a literal integer or float in
+** proper range to fit in a register (sB or sC).
+*/
+static int isSCnumber (expdesc *e, int *pi, int *isfloat) {
+  lua_Integer i;
+  if (e->k == VKINT)
+    i = e->u.ival;
+  else if (e->k == VKFLT && luaV_flttointeger(e->u.nval, &i, F2Ieq))
+    *isfloat = 1;
+  else
+    return 0;  /* not a number */
+  if (!hasjumps(e) && fitsC(i)) {
+    *pi = int2sC(cast_int(i));
+    return 1;
+  }
+  else
+    return 0;
+}
+
+
+/*
+** Create expression 't[k]'. 't' must have its final result already in a
+** register or upvalue. Upvalues can only be indexed by literal strings.
+** Keys can be literal strings in the constant table or arbitrary
+** values in registers.
+*/
+void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k) {
+  if (k->k == VKSTR)
+    str2K(fs, k);
+  lua_assert(!hasjumps(t) &&
+             (t->k == VLOCAL || t->k == VNONRELOC || t->k == VUPVAL));
+  if (t->k == VUPVAL && !isKstr(fs, k))  /* upvalue indexed by non 'Kstr'? */
+    luaK_exp2anyreg(fs, t);  /* put it in a register */
+  if (t->k == VUPVAL) {
+    t->u.ind.t = t->u.info;  /* upvalue index */
+    t->u.ind.idx = k->u.info;  /* literal string */
+    t->k = VINDEXUP;
+  }
+  else {
+    /* register index of the table */
+    t->u.ind.t = (t->k == VLOCAL) ? t->u.var.ridx: t->u.info;
+    if (isKstr(fs, k)) {
+      t->u.ind.idx = k->u.info;  /* literal string */
+      t->k = VINDEXSTR;
+    }
+    else if (isCint(k)) {
+      t->u.ind.idx = cast_int(k->u.ival);  /* int. constant in proper range */
+      t->k = VINDEXI;
+    }
+    else {
+      t->u.ind.idx = luaK_exp2anyreg(fs, k);  /* register */
+      t->k = VINDEXED;
+    }
+  }
+}
+
+
+/*
+** Return false if folding can raise an error.
+** Bitwise operations need operands convertible to integers; division
+** operations cannot have 0 as divisor.
+*/
+static int validop (int op, TValue *v1, TValue *v2) {
+  switch (op) {
+    case LUA_OPBAND: case LUA_OPBOR: case LUA_OPBXOR:
+    case LUA_OPSHL: case LUA_OPSHR: case LUA_OPBNOT: {  /* conversion errors */
+      lua_Integer i;
+      return (luaV_tointegerns(v1, &i, LUA_FLOORN2I) &&
+              luaV_tointegerns(v2, &i, LUA_FLOORN2I));
+    }
+    case LUA_OPDIV: case LUA_OPIDIV: case LUA_OPMOD:  /* division by 0 */
+      return (nvalue(v2) != 0);
+    default: return 1;  /* everything else is valid */
+  }
+}
+
+
+/*
+** Try to "constant-fold" an operation; return 1 iff successful.
+** (In this case, 'e1' has the final result.)
+*/
+static int constfolding (FuncState *fs, int op, expdesc *e1,
+                                        const expdesc *e2) {
+  TValue v1, v2, res;
+  if (!tonumeral(e1, &v1) || !tonumeral(e2, &v2) || !validop(op, &v1, &v2))
+    return 0;  /* non-numeric operands or not safe to fold */
+  luaO_rawarith(fs->ls->L, op, &v1, &v2, &res);  /* does operation */
+  if (ttisinteger(&res)) {
+    e1->k = VKINT;
+    e1->u.ival = ivalue(&res);
+  }
+  else {  /* folds neither NaN nor 0.0 (to avoid problems with -0.0) */
+    lua_Number n = fltvalue(&res);
+    if (luai_numisnan(n) || n == 0)
+      return 0;
+    e1->k = VKFLT;
+    e1->u.nval = n;
+  }
+  return 1;
+}
+
+
+/*
+** Convert a BinOpr to an OpCode  (ORDER OPR - ORDER OP)
+*/
+l_sinline OpCode binopr2op (BinOpr opr, BinOpr baser, OpCode base) {
+  lua_assert(baser <= opr &&
+            ((baser == OPR_ADD && opr <= OPR_SHR) ||
+             (baser == OPR_LT && opr <= OPR_LE)));
+  return cast(OpCode, (cast_int(opr) - cast_int(baser)) + cast_int(base));
+}
+
+
+/*
+** Convert a UnOpr to an OpCode  (ORDER OPR - ORDER OP)
+*/
+l_sinline OpCode unopr2op (UnOpr opr) {
+  return cast(OpCode, (cast_int(opr) - cast_int(OPR_MINUS)) +
+                                       cast_int(OP_UNM));
+}
+
+
+/*
+** Convert a BinOpr to a tag method  (ORDER OPR - ORDER TM)
+*/
+l_sinline TMS binopr2TM (BinOpr opr) {
+  lua_assert(OPR_ADD <= opr && opr <= OPR_SHR);
+  return cast(TMS, (cast_int(opr) - cast_int(OPR_ADD)) + cast_int(TM_ADD));
+}
+
+
+/*
+** Emit code for unary expressions that "produce values"
+** (everything but 'not').
+** Expression to produce final result will be encoded in 'e'.
+*/
+static void codeunexpval (FuncState *fs, OpCode op, expdesc *e, int line) {
+  int r = luaK_exp2anyreg(fs, e);  /* opcodes operate only on registers */
+  freeexp(fs, e);
+  e->u.info = luaK_codeABC(fs, op, 0, r, 0);  /* generate opcode */
+  e->k = VRELOC;  /* all those operations are relocatable */
+  luaK_fixline(fs, line);
+}
+
+
+/*
+** Emit code for binary expressions that "produce values"
+** (everything but logical operators 'and'/'or' and comparison
+** operators).
+** Expression to produce final result will be encoded in 'e1'.
+*/
+static void finishbinexpval (FuncState *fs, expdesc *e1, expdesc *e2,
+                             OpCode op, int v2, int flip, int line,
+                             OpCode mmop, TMS event) {
+  int v1 = luaK_exp2anyreg(fs, e1);
+  int pc = luaK_codeABCk(fs, op, 0, v1, v2, 0);
+  freeexps(fs, e1, e2);
+  e1->u.info = pc;
+  e1->k = VRELOC;  /* all those operations are relocatable */
+  luaK_fixline(fs, line);
+  luaK_codeABCk(fs, mmop, v1, v2, event, flip);  /* to call metamethod */
+  luaK_fixline(fs, line);
+}
+
+
+/*
+** Emit code for binary expressions that "produce values" over
+** two registers.
+*/
+static void codebinexpval (FuncState *fs, BinOpr opr,
+                           expdesc *e1, expdesc *e2, int line) {
+  OpCode op = binopr2op(opr, OPR_ADD, OP_ADD);
+  int v2 = luaK_exp2anyreg(fs, e2);  /* make sure 'e2' is in a register */
+  /* 'e1' must be already in a register or it is a constant */
+  lua_assert((VNIL <= e1->k && e1->k <= VKSTR) ||
+             e1->k == VNONRELOC || e1->k == VRELOC);
+  lua_assert(OP_ADD <= op && op <= OP_SHR);
+  finishbinexpval(fs, e1, e2, op, v2, 0, line, OP_MMBIN, binopr2TM(opr));
+}
+
+
+/*
+** Code binary operators with immediate operands.
+*/
+static void codebini (FuncState *fs, OpCode op,
+                       expdesc *e1, expdesc *e2, int flip, int line,
+                       TMS event) {
+  int v2 = int2sC(cast_int(e2->u.ival));  /* immediate operand */
+  lua_assert(e2->k == VKINT);
+  finishbinexpval(fs, e1, e2, op, v2, flip, line, OP_MMBINI, event);
+}
+
+
+/*
+** Code binary operators with K operand.
+*/
+static void codebinK (FuncState *fs, BinOpr opr,
+                      expdesc *e1, expdesc *e2, int flip, int line) {
+  TMS event = binopr2TM(opr);
+  int v2 = e2->u.info;  /* K index */
+  OpCode op = binopr2op(opr, OPR_ADD, OP_ADDK);
+  finishbinexpval(fs, e1, e2, op, v2, flip, line, OP_MMBINK, event);
+}
+
+
+/* Try to code a binary operator negating its second operand.
+** For the metamethod, 2nd operand must keep its original value.
+*/
+static int finishbinexpneg (FuncState *fs, expdesc *e1, expdesc *e2,
+                             OpCode op, int line, TMS event) {
+  if (!luaK_isKint(e2))
+    return 0;  /* not an integer constant */
+  else {
+    lua_Integer i2 = e2->u.ival;
+    if (!(fitsC(i2) && fitsC(-i2)))
+      return 0;  /* not in the proper range */
+    else {  /* operating a small integer constant */
+      int v2 = cast_int(i2);
+      finishbinexpval(fs, e1, e2, op, int2sC(-v2), 0, line, OP_MMBINI, event);
+      /* correct metamethod argument */
+      SETARG_B(fs->f->code[fs->pc - 1], int2sC(v2));
+      return 1;  /* successfully coded */
+    }
+  }
+}
+
+
+static void swapexps (expdesc *e1, expdesc *e2) {
+  expdesc temp = *e1; *e1 = *e2; *e2 = temp;  /* swap 'e1' and 'e2' */
+}
+
+
+/*
+** Code binary operators with no constant operand.
+*/
+static void codebinNoK (FuncState *fs, BinOpr opr,
+                        expdesc *e1, expdesc *e2, int flip, int line) {
+  if (flip)
+    swapexps(e1, e2);  /* back to original order */
+  codebinexpval(fs, opr, e1, e2, line);  /* use standard operators */
+}
+
+
+/*
+** Code arithmetic operators ('+', '-', ...). If second operand is a
+** constant in the proper range, use variant opcodes with K operands.
+*/
+static void codearith (FuncState *fs, BinOpr opr,
+                       expdesc *e1, expdesc *e2, int flip, int line) {
+  if (tonumeral(e2, NULL) && luaK_exp2K(fs, e2))  /* K operand? */
+    codebinK(fs, opr, e1, e2, flip, line);
+  else  /* 'e2' is neither an immediate nor a K operand */
+    codebinNoK(fs, opr, e1, e2, flip, line);
+}
+
+
+/*
+** Code commutative operators ('+', '*'). If first operand is a
+** numeric constant, change order of operands to try to use an
+** immediate or K operator.
+*/
+static void codecommutative (FuncState *fs, BinOpr op,
+                             expdesc *e1, expdesc *e2, int line) {
+  int flip = 0;
+  if (tonumeral(e1, NULL)) {  /* is first operand a numeric constant? */
+    swapexps(e1, e2);  /* change order */
+    flip = 1;
+  }
+  if (op == OPR_ADD && isSCint(e2))  /* immediate operand? */
+    codebini(fs, OP_ADDI, e1, e2, flip, line, TM_ADD);
+  else
+    codearith(fs, op, e1, e2, flip, line);
+}
+
+
+/*
+** Code bitwise operations; they are all commutative, so the function
+** tries to put an integer constant as the 2nd operand (a K operand).
+*/
+static void codebitwise (FuncState *fs, BinOpr opr,
+                         expdesc *e1, expdesc *e2, int line) {
+  int flip = 0;
+  if (e1->k == VKINT) {
+    swapexps(e1, e2);  /* 'e2' will be the constant operand */
+    flip = 1;
+  }
+  if (e2->k == VKINT && luaK_exp2K(fs, e2))  /* K operand? */
+    codebinK(fs, opr, e1, e2, flip, line);
+  else  /* no constants */
+    codebinNoK(fs, opr, e1, e2, flip, line);
+}
+
+
+/*
+** Emit code for order comparisons. When using an immediate operand,
+** 'isfloat' tells whether the original value was a float.
+*/
+static void codeorder (FuncState *fs, BinOpr opr, expdesc *e1, expdesc *e2) {
+  int r1, r2;
+  int im;
+  int isfloat = 0;
+  OpCode op;
+  if (isSCnumber(e2, &im, &isfloat)) {
+    /* use immediate operand */
+    r1 = luaK_exp2anyreg(fs, e1);
+    r2 = im;
+    op = binopr2op(opr, OPR_LT, OP_LTI);
+  }
+  else if (isSCnumber(e1, &im, &isfloat)) {
+    /* transform (A < B) to (B > A) and (A <= B) to (B >= A) */
+    r1 = luaK_exp2anyreg(fs, e2);
+    r2 = im;
+    op = binopr2op(opr, OPR_LT, OP_GTI);
+  }
+  else {  /* regular case, compare two registers */
+    r1 = luaK_exp2anyreg(fs, e1);
+    r2 = luaK_exp2anyreg(fs, e2);
+    op = binopr2op(opr, OPR_LT, OP_LT);
+  }
+  freeexps(fs, e1, e2);
+  e1->u.info = condjump(fs, op, r1, r2, isfloat, 1);
+  e1->k = VJMP;
+}
+
+
+/*
+** Emit code for equality comparisons ('==', '~=').
+** 'e1' was already put as RK by 'luaK_infix'.
+*/
+static void codeeq (FuncState *fs, BinOpr opr, expdesc *e1, expdesc *e2) {
+  int r1, r2;
+  int im;
+  int isfloat = 0;  /* not needed here, but kept for symmetry */
+  OpCode op;
+  if (e1->k != VNONRELOC) {
+    lua_assert(e1->k == VK || e1->k == VKINT || e1->k == VKFLT);
+    swapexps(e1, e2);
+  }
+  r1 = luaK_exp2anyreg(fs, e1);  /* 1st expression must be in register */
+  if (isSCnumber(e2, &im, &isfloat)) {
+    op = OP_EQI;
+    r2 = im;  /* immediate operand */
+  }
+  else if (luaK_exp2RK(fs, e2)) {  /* 2nd expression is constant? */
+    op = OP_EQK;
+    r2 = e2->u.info;  /* constant index */
+  }
+  else {
+    op = OP_EQ;  /* will compare two registers */
+    r2 = luaK_exp2anyreg(fs, e2);
+  }
+  freeexps(fs, e1, e2);
+  e1->u.info = condjump(fs, op, r1, r2, isfloat, (opr == OPR_EQ));
+  e1->k = VJMP;
+}
+
+
+/*
+** Apply prefix operation 'op' to expression 'e'.
+*/
+void luaK_prefix (FuncState *fs, UnOpr opr, expdesc *e, int line) {
+  static const expdesc ef = {VKINT, {0}, NO_JUMP, NO_JUMP};
+  luaK_dischargevars(fs, e);
+  switch (opr) {
+    case OPR_MINUS: case OPR_BNOT:  /* use 'ef' as fake 2nd operand */
+      if (constfolding(fs, opr + LUA_OPUNM, e, &ef))
+        break;
+      /* else */ /* FALLTHROUGH */
+    case OPR_LEN:
+      codeunexpval(fs, unopr2op(opr), e, line);
+      break;
+    case OPR_NOT: codenot(fs, e); break;
+    default: lua_assert(0);
+  }
+}
+
+
+/*
+** Process 1st operand 'v' of binary operation 'op' before reading
+** 2nd operand.
+*/
+void luaK_infix (FuncState *fs, BinOpr op, expdesc *v) {
+  luaK_dischargevars(fs, v);
+  switch (op) {
+    case OPR_AND: {
+      luaK_goiftrue(fs, v);  /* go ahead only if 'v' is true */
+      break;
+    }
+    case OPR_OR: {
+      luaK_goiffalse(fs, v);  /* go ahead only if 'v' is false */
+      break;
+    }
+    case OPR_CONCAT: {
+      luaK_exp2nextreg(fs, v);  /* operand must be on the stack */
+      break;
+    }
+    case OPR_ADD: case OPR_SUB:
+    case OPR_MUL: case OPR_DIV: case OPR_IDIV:
+    case OPR_MOD: case OPR_POW:
+    case OPR_BAND: case OPR_BOR: case OPR_BXOR:
+    case OPR_SHL: case OPR_SHR: {
+      if (!tonumeral(v, NULL))
+        luaK_exp2anyreg(fs, v);
+      /* else keep numeral, which may be folded or used as an immediate
+         operand */
+      break;
+    }
+    case OPR_EQ: case OPR_NE: {
+      if (!tonumeral(v, NULL))
+        luaK_exp2RK(fs, v);
+      /* else keep numeral, which may be an immediate operand */
+      break;
+    }
+    case OPR_LT: case OPR_LE:
+    case OPR_GT: case OPR_GE: {
+      int dummy, dummy2;
+      if (!isSCnumber(v, &dummy, &dummy2))
+        luaK_exp2anyreg(fs, v);
+      /* else keep numeral, which may be an immediate operand */
+      break;
+    }
+    default: lua_assert(0);
+  }
+}
+
+/*
+** Create code for '(e1 .. e2)'.
+** For '(e1 .. e2.1 .. e2.2)' (which is '(e1 .. (e2.1 .. e2.2))',
+** because concatenation is right associative), merge both CONCATs.
+*/
+static void codeconcat (FuncState *fs, expdesc *e1, expdesc *e2, int line) {
+  Instruction *ie2 = previousinstruction(fs);
+  if (GET_OPCODE(*ie2) == OP_CONCAT) {  /* is 'e2' a concatenation? */
+    int n = GETARG_B(*ie2);  /* # of elements concatenated in 'e2' */
+    lua_assert(e1->u.info + 1 == GETARG_A(*ie2));
+    freeexp(fs, e2);
+    SETARG_A(*ie2, e1->u.info);  /* correct first element ('e1') */
+    SETARG_B(*ie2, n + 1);  /* will concatenate one more element */
+  }
+  else {  /* 'e2' is not a concatenation */
+    luaK_codeABC(fs, OP_CONCAT, e1->u.info, 2, 0);  /* new concat opcode */
+    freeexp(fs, e2);
+    luaK_fixline(fs, line);
+  }
+}
+
+
+/*
+** Finalize code for binary operation, after reading 2nd operand.
+*/
+void luaK_posfix (FuncState *fs, BinOpr opr,
+                  expdesc *e1, expdesc *e2, int line) {
+  luaK_dischargevars(fs, e2);
+  if (foldbinop(opr) && constfolding(fs, opr + LUA_OPADD, e1, e2))
+    return;  /* done by folding */
+  switch (opr) {
+    case OPR_AND: {
+      lua_assert(e1->t == NO_JUMP);  /* list closed by 'luaK_infix' */
+      luaK_concat(fs, &e2->f, e1->f);
+      *e1 = *e2;
+      break;
+    }
+    case OPR_OR: {
+      lua_assert(e1->f == NO_JUMP);  /* list closed by 'luaK_infix' */
+      luaK_concat(fs, &e2->t, e1->t);
+      *e1 = *e2;
+      break;
+    }
+    case OPR_CONCAT: {  /* e1 .. e2 */
+      luaK_exp2nextreg(fs, e2);
+      codeconcat(fs, e1, e2, line);
+      break;
+    }
+    case OPR_ADD: case OPR_MUL: {
+      codecommutative(fs, opr, e1, e2, line);
+      break;
+    }
+    case OPR_SUB: {
+      if (finishbinexpneg(fs, e1, e2, OP_ADDI, line, TM_SUB))
+        break; /* coded as (r1 + -I) */
+      /* ELSE */
+    }  /* FALLTHROUGH */
+    case OPR_DIV: case OPR_IDIV: case OPR_MOD: case OPR_POW: {
+      codearith(fs, opr, e1, e2, 0, line);
+      break;
+    }
+    case OPR_BAND: case OPR_BOR: case OPR_BXOR: {
+      codebitwise(fs, opr, e1, e2, line);
+      break;
+    }
+    case OPR_SHL: {
+      if (isSCint(e1)) {
+        swapexps(e1, e2);
+        codebini(fs, OP_SHLI, e1, e2, 1, line, TM_SHL);  /* I << r2 */
+      }
+      else if (finishbinexpneg(fs, e1, e2, OP_SHRI, line, TM_SHL)) {
+        /* coded as (r1 >> -I) */;
+      }
+      else  /* regular case (two registers) */
+       codebinexpval(fs, opr, e1, e2, line);
+      break;
+    }
+    case OPR_SHR: {
+      if (isSCint(e2))
+        codebini(fs, OP_SHRI, e1, e2, 0, line, TM_SHR);  /* r1 >> I */
+      else  /* regular case (two registers) */
+        codebinexpval(fs, opr, e1, e2, line);
+      break;
+    }
+    case OPR_EQ: case OPR_NE: {
+      codeeq(fs, opr, e1, e2);
+      break;
+    }
+    case OPR_GT: case OPR_GE: {
+      /* '(a > b)' <=> '(b < a)';  '(a >= b)' <=> '(b <= a)' */
+      swapexps(e1, e2);
+      opr = cast(BinOpr, (opr - OPR_GT) + OPR_LT);
+    }  /* FALLTHROUGH */
+    case OPR_LT: case OPR_LE: {
+      codeorder(fs, opr, e1, e2);
+      break;
+    }
+    default: lua_assert(0);
+  }
+}
+
+
+/*
+** Change line information associated with current position, by removing
+** previous info and adding it again with new line.
+*/
+void luaK_fixline (FuncState *fs, int line) {
+  removelastlineinfo(fs);
+  savelineinfo(fs, fs->f, line);
+}
+
+
+void luaK_settablesize (FuncState *fs, int pc, int ra, int asize, int hsize) {
+  Instruction *inst = &fs->f->code[pc];
+  int rb = (hsize != 0) ? luaO_ceillog2(hsize) + 1 : 0;  /* hash size */
+  int extra = asize / (MAXARG_C + 1);  /* higher bits of array size */
+  int rc = asize % (MAXARG_C + 1);  /* lower bits of array size */
+  int k = (extra > 0);  /* true iff needs extra argument */
+  *inst = CREATE_ABCk(OP_NEWTABLE, ra, rb, rc, k);
+  *(inst + 1) = CREATE_Ax(OP_EXTRAARG, extra);
+}
+
+
+/*
+** Emit a SETLIST instruction.
+** 'base' is register that keeps table;
+** 'nelems' is #table plus those to be stored now;
+** 'tostore' is number of values (in registers 'base + 1',...) to add to
+** table (or LUA_MULTRET to add up to stack top).
+*/
+void luaK_setlist (FuncState *fs, int base, int nelems, int tostore) {
+  lua_assert(tostore != 0 && tostore <= LFIELDS_PER_FLUSH);
+  if (tostore == LUA_MULTRET)
+    tostore = 0;
+  if (nelems <= MAXARG_C)
+    luaK_codeABC(fs, OP_SETLIST, base, tostore, nelems);
+  else {
+    int extra = nelems / (MAXARG_C + 1);
+    nelems %= (MAXARG_C + 1);
+    luaK_codeABCk(fs, OP_SETLIST, base, tostore, nelems, 1);
+    codeextraarg(fs, extra);
+  }
+  fs->freereg = base + 1;  /* free registers with list values */
+}
+
+
+/*
+** return the final target of a jump (skipping jumps to jumps)
+*/
+static int finaltarget (Instruction *code, int i) {
+  int count;
+  for (count = 0; count < 100; count++) {  /* avoid infinite loops */
+    Instruction pc = code[i];
+    if (GET_OPCODE(pc) != OP_JMP)
+      break;
+     else
+       i += GETARG_sJ(pc) + 1;
+  }
+  return i;
+}
+
+
+/*
+** Do a final pass over the code of a function, doing small peephole
+** optimizations and adjustments.
+*/
+void luaK_finish (FuncState *fs) {
+  int i;
+  Proto *p = fs->f;
+  for (i = 0; i < fs->pc; i++) {
+    Instruction *pc = &p->code[i];
+    lua_assert(i == 0 || isOT(*(pc - 1)) == isIT(*pc));
+    switch (GET_OPCODE(*pc)) {
+      case OP_RETURN0: case OP_RETURN1: {
+        if (!(fs->needclose || p->is_vararg))
+          break;  /* no extra work */
+        /* else use OP_RETURN to do the extra work */
+        SET_OPCODE(*pc, OP_RETURN);
+      }  /* FALLTHROUGH */
+      case OP_RETURN: case OP_TAILCALL: {
+        if (fs->needclose)
+          SETARG_k(*pc, 1);  /* signal that it needs to close */
+        if (p->is_vararg)
+          SETARG_C(*pc, p->numparams + 1);  /* signal that it is vararg */
+        break;
+      }
+      case OP_JMP: {
+        int target = finaltarget(p->code, i);
+        fixjump(fs, i, target);
+        break;
+      }
+      default: break;
+    }
+  }
+}
diff --git a/src/libs/3rdparty/lua/src/lcode.h b/src/libs/3rdparty/lua/src/lcode.h
new file mode 100644
index 00000000000..32658244526
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lcode.h
@@ -0,0 +1,104 @@
+/*
+** $Id: lcode.h $
+** Code generator for Lua
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lcode_h
+#define lcode_h
+
+#include "llex.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lparser.h"
+
+
+/*
+** Marks the end of a patch list. It is an invalid value both as an absolute
+** address, and as a list link (would link an element to itself).
+*/
+#define NO_JUMP (-1)
+
+
+/*
+** grep "ORDER OPR" if you change these enums  (ORDER OP)
+*/
+typedef enum BinOpr {
+  /* arithmetic operators */
+  OPR_ADD, OPR_SUB, OPR_MUL, OPR_MOD, OPR_POW,
+  OPR_DIV, OPR_IDIV,
+  /* bitwise operators */
+  OPR_BAND, OPR_BOR, OPR_BXOR,
+  OPR_SHL, OPR_SHR,
+  /* string operator */
+  OPR_CONCAT,
+  /* comparison operators */
+  OPR_EQ, OPR_LT, OPR_LE,
+  OPR_NE, OPR_GT, OPR_GE,
+  /* logical operators */
+  OPR_AND, OPR_OR,
+  OPR_NOBINOPR
+} BinOpr;
+
+
+/* true if operation is foldable (that is, it is arithmetic or bitwise) */
+#define foldbinop(op)	((op) <= OPR_SHR)
+
+
+#define luaK_codeABC(fs,o,a,b,c)	luaK_codeABCk(fs,o,a,b,c,0)
+
+
+typedef enum UnOpr { OPR_MINUS, OPR_BNOT, OPR_NOT, OPR_LEN, OPR_NOUNOPR } UnOpr;
+
+
+/* get (pointer to) instruction of given 'expdesc' */
+#define getinstruction(fs,e)	((fs)->f->code[(e)->u.info])
+
+
+#define luaK_setmultret(fs,e)	luaK_setreturns(fs, e, LUA_MULTRET)
+
+#define luaK_jumpto(fs,t)	luaK_patchlist(fs, luaK_jump(fs), t)
+
+LUAI_FUNC int luaK_code (FuncState *fs, Instruction i);
+LUAI_FUNC int luaK_codeABx (FuncState *fs, OpCode o, int A, unsigned int Bx);
+LUAI_FUNC int luaK_codeAsBx (FuncState *fs, OpCode o, int A, int Bx);
+LUAI_FUNC int luaK_codeABCk (FuncState *fs, OpCode o, int A,
+                                            int B, int C, int k);
+LUAI_FUNC int luaK_isKint (expdesc *e);
+LUAI_FUNC int luaK_exp2const (FuncState *fs, const expdesc *e, TValue *v);
+LUAI_FUNC void luaK_fixline (FuncState *fs, int line);
+LUAI_FUNC void luaK_nil (FuncState *fs, int from, int n);
+LUAI_FUNC void luaK_reserveregs (FuncState *fs, int n);
+LUAI_FUNC void luaK_checkstack (FuncState *fs, int n);
+LUAI_FUNC void luaK_int (FuncState *fs, int reg, lua_Integer n);
+LUAI_FUNC void luaK_dischargevars (FuncState *fs, expdesc *e);
+LUAI_FUNC int luaK_exp2anyreg (FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_exp2anyregup (FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_exp2nextreg (FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_exp2val (FuncState *fs, expdesc *e);
+LUAI_FUNC int luaK_exp2RK (FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_self (FuncState *fs, expdesc *e, expdesc *key);
+LUAI_FUNC void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k);
+LUAI_FUNC void luaK_goiftrue (FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_goiffalse (FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_storevar (FuncState *fs, expdesc *var, expdesc *e);
+LUAI_FUNC void luaK_setreturns (FuncState *fs, expdesc *e, int nresults);
+LUAI_FUNC void luaK_setoneret (FuncState *fs, expdesc *e);
+LUAI_FUNC int luaK_jump (FuncState *fs);
+LUAI_FUNC void luaK_ret (FuncState *fs, int first, int nret);
+LUAI_FUNC void luaK_patchlist (FuncState *fs, int list, int target);
+LUAI_FUNC void luaK_patchtohere (FuncState *fs, int list);
+LUAI_FUNC void luaK_concat (FuncState *fs, int *l1, int l2);
+LUAI_FUNC int luaK_getlabel (FuncState *fs);
+LUAI_FUNC void luaK_prefix (FuncState *fs, UnOpr op, expdesc *v, int line);
+LUAI_FUNC void luaK_infix (FuncState *fs, BinOpr op, expdesc *v);
+LUAI_FUNC void luaK_posfix (FuncState *fs, BinOpr op, expdesc *v1,
+                            expdesc *v2, int line);
+LUAI_FUNC void luaK_settablesize (FuncState *fs, int pc,
+                                  int ra, int asize, int hsize);
+LUAI_FUNC void luaK_setlist (FuncState *fs, int base, int nelems, int tostore);
+LUAI_FUNC void luaK_finish (FuncState *fs);
+LUAI_FUNC l_noret luaK_semerror (LexState *ls, const char *msg);
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lcorolib.c b/src/libs/3rdparty/lua/src/lcorolib.c
new file mode 100644
index 00000000000..c64adf08a8e
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lcorolib.c
@@ -0,0 +1,210 @@
+/*
+** $Id: lcorolib.c $
+** Coroutine Library
+** See Copyright Notice in lua.h
+*/
+
+#define lcorolib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <stdlib.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+static lua_State *getco (lua_State *L) {
+  lua_State *co = lua_tothread(L, 1);
+  luaL_argexpected(L, co, 1, "thread");
+  return co;
+}
+
+
+/*
+** Resumes a coroutine. Returns the number of results for non-error
+** cases or -1 for errors.
+*/
+static int auxresume (lua_State *L, lua_State *co, int narg) {
+  int status, nres;
+  if (l_unlikely(!lua_checkstack(co, narg))) {
+    lua_pushliteral(L, "too many arguments to resume");
+    return -1;  /* error flag */
+  }
+  lua_xmove(L, co, narg);
+  status = lua_resume(co, L, narg, &nres);
+  if (l_likely(status == LUA_OK || status == LUA_YIELD)) {
+    if (l_unlikely(!lua_checkstack(L, nres + 1))) {
+      lua_pop(co, nres);  /* remove results anyway */
+      lua_pushliteral(L, "too many results to resume");
+      return -1;  /* error flag */
+    }
+    lua_xmove(co, L, nres);  /* move yielded values */
+    return nres;
+  }
+  else {
+    lua_xmove(co, L, 1);  /* move error message */
+    return -1;  /* error flag */
+  }
+}
+
+
+static int luaB_coresume (lua_State *L) {
+  lua_State *co = getco(L);
+  int r;
+  r = auxresume(L, co, lua_gettop(L) - 1);
+  if (l_unlikely(r < 0)) {
+    lua_pushboolean(L, 0);
+    lua_insert(L, -2);
+    return 2;  /* return false + error message */
+  }
+  else {
+    lua_pushboolean(L, 1);
+    lua_insert(L, -(r + 1));
+    return r + 1;  /* return true + 'resume' returns */
+  }
+}
+
+
+static int luaB_auxwrap (lua_State *L) {
+  lua_State *co = lua_tothread(L, lua_upvalueindex(1));
+  int r = auxresume(L, co, lua_gettop(L));
+  if (l_unlikely(r < 0)) {  /* error? */
+    int stat = lua_status(co);
+    if (stat != LUA_OK && stat != LUA_YIELD) {  /* error in the coroutine? */
+      stat = lua_closethread(co, L);  /* close its tbc variables */
+      lua_assert(stat != LUA_OK);
+      lua_xmove(co, L, 1);  /* move error message to the caller */
+    }
+    if (stat != LUA_ERRMEM &&  /* not a memory error and ... */
+        lua_type(L, -1) == LUA_TSTRING) {  /* ... error object is a string? */
+      luaL_where(L, 1);  /* add extra info, if available */
+      lua_insert(L, -2);
+      lua_concat(L, 2);
+    }
+    return lua_error(L);  /* propagate error */
+  }
+  return r;
+}
+
+
+static int luaB_cocreate (lua_State *L) {
+  lua_State *NL;
+  luaL_checktype(L, 1, LUA_TFUNCTION);
+  NL = lua_newthread(L);
+  lua_pushvalue(L, 1);  /* move function to top */
+  lua_xmove(L, NL, 1);  /* move function from L to NL */
+  return 1;
+}
+
+
+static int luaB_cowrap (lua_State *L) {
+  luaB_cocreate(L);
+  lua_pushcclosure(L, luaB_auxwrap, 1);
+  return 1;
+}
+
+
+static int luaB_yield (lua_State *L) {
+  return lua_yield(L, lua_gettop(L));
+}
+
+
+#define COS_RUN		0
+#define COS_DEAD	1
+#define COS_YIELD	2
+#define COS_NORM	3
+
+
+static const char *const statname[] =
+  {"running", "dead", "suspended", "normal"};
+
+
+static int auxstatus (lua_State *L, lua_State *co) {
+  if (L == co) return COS_RUN;
+  else {
+    switch (lua_status(co)) {
+      case LUA_YIELD:
+        return COS_YIELD;
+      case LUA_OK: {
+        lua_Debug ar;
+        if (lua_getstack(co, 0, &ar))  /* does it have frames? */
+          return COS_NORM;  /* it is running */
+        else if (lua_gettop(co) == 0)
+            return COS_DEAD;
+        else
+          return COS_YIELD;  /* initial state */
+      }
+      default:  /* some error occurred */
+        return COS_DEAD;
+    }
+  }
+}
+
+
+static int luaB_costatus (lua_State *L) {
+  lua_State *co = getco(L);
+  lua_pushstring(L, statname[auxstatus(L, co)]);
+  return 1;
+}
+
+
+static int luaB_yieldable (lua_State *L) {
+  lua_State *co = lua_isnone(L, 1) ? L : getco(L);
+  lua_pushboolean(L, lua_isyieldable(co));
+  return 1;
+}
+
+
+static int luaB_corunning (lua_State *L) {
+  int ismain = lua_pushthread(L);
+  lua_pushboolean(L, ismain);
+  return 2;
+}
+
+
+static int luaB_close (lua_State *L) {
+  lua_State *co = getco(L);
+  int status = auxstatus(L, co);
+  switch (status) {
+    case COS_DEAD: case COS_YIELD: {
+      status = lua_closethread(co, L);
+      if (status == LUA_OK) {
+        lua_pushboolean(L, 1);
+        return 1;
+      }
+      else {
+        lua_pushboolean(L, 0);
+        lua_xmove(co, L, 1);  /* move error message */
+        return 2;
+      }
+    }
+    default:  /* normal or running coroutine */
+      return luaL_error(L, "cannot close a %s coroutine", statname[status]);
+  }
+}
+
+
+static const luaL_Reg co_funcs[] = {
+  {"create", luaB_cocreate},
+  {"resume", luaB_coresume},
+  {"running", luaB_corunning},
+  {"status", luaB_costatus},
+  {"wrap", luaB_cowrap},
+  {"yield", luaB_yield},
+  {"isyieldable", luaB_yieldable},
+  {"close", luaB_close},
+  {NULL, NULL}
+};
+
+
+
+LUAMOD_API int luaopen_coroutine (lua_State *L) {
+  luaL_newlib(L, co_funcs);
+  return 1;
+}
+
diff --git a/src/libs/3rdparty/lua/src/lctype.c b/src/libs/3rdparty/lua/src/lctype.c
new file mode 100644
index 00000000000..95422809423
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lctype.c
@@ -0,0 +1,64 @@
+/*
+** $Id: lctype.c $
+** 'ctype' functions for Lua
+** See Copyright Notice in lua.h
+*/
+
+#define lctype_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include "lctype.h"
+
+#if !LUA_USE_CTYPE	/* { */
+
+#include <limits.h>
+
+
+#if defined (LUA_UCID)		/* accept UniCode IDentifiers? */
+/* consider all non-ascii codepoints to be alphabetic */
+#define NONA		0x01
+#else
+#define NONA		0x00	/* default */
+#endif
+
+
+LUAI_DDEF const lu_byte luai_ctype_[UCHAR_MAX + 2] = {
+  0x00,  /* EOZ */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* 0. */
+  0x00,  0x08,  0x08,  0x08,  0x08,  0x08,  0x00,  0x00,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* 1. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+  0x0c,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,	/* 2. */
+  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,
+  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,	/* 3. */
+  0x16,  0x16,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,
+  0x04,  0x15,  0x15,  0x15,  0x15,  0x15,  0x15,  0x05,	/* 4. */
+  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,
+  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,	/* 5. */
+  0x05,  0x05,  0x05,  0x04,  0x04,  0x04,  0x04,  0x05,
+  0x04,  0x15,  0x15,  0x15,  0x15,  0x15,  0x15,  0x05,	/* 6. */
+  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,
+  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,	/* 7. */
+  0x05,  0x05,  0x05,  0x04,  0x04,  0x04,  0x04,  0x00,
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* 8. */
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* 9. */
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* a. */
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* b. */
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
+  0x00,  0x00,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* c. */
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* d. */
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* e. */
+  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
+  NONA,  NONA,  NONA,  NONA,  NONA,  0x00,  0x00,  0x00,	/* f. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00
+};
+
+#endif			/* } */
diff --git a/src/libs/3rdparty/lua/src/lctype.h b/src/libs/3rdparty/lua/src/lctype.h
new file mode 100644
index 00000000000..864e1901885
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lctype.h
@@ -0,0 +1,101 @@
+/*
+** $Id: lctype.h $
+** 'ctype' functions for Lua
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lctype_h
+#define lctype_h
+
+#include "lua.h"
+
+
+/*
+** WARNING: the functions defined here do not necessarily correspond
+** to the similar functions in the standard C ctype.h. They are
+** optimized for the specific needs of Lua.
+*/
+
+#if !defined(LUA_USE_CTYPE)
+
+#if 'A' == 65 && '0' == 48
+/* ASCII case: can use its own tables; faster and fixed */
+#define LUA_USE_CTYPE	0
+#else
+/* must use standard C ctype */
+#define LUA_USE_CTYPE	1
+#endif
+
+#endif
+
+
+#if !LUA_USE_CTYPE	/* { */
+
+#include <limits.h>
+
+#include "llimits.h"
+
+
+#define ALPHABIT	0
+#define DIGITBIT	1
+#define PRINTBIT	2
+#define SPACEBIT	3
+#define XDIGITBIT	4
+
+
+#define MASK(B)		(1 << (B))
+
+
+/*
+** add 1 to char to allow index -1 (EOZ)
+*/
+#define testprop(c,p)	(luai_ctype_[(c)+1] & (p))
+
+/*
+** 'lalpha' (Lua alphabetic) and 'lalnum' (Lua alphanumeric) both include '_'
+*/
+#define lislalpha(c)	testprop(c, MASK(ALPHABIT))
+#define lislalnum(c)	testprop(c, (MASK(ALPHABIT) | MASK(DIGITBIT)))
+#define lisdigit(c)	testprop(c, MASK(DIGITBIT))
+#define lisspace(c)	testprop(c, MASK(SPACEBIT))
+#define lisprint(c)	testprop(c, MASK(PRINTBIT))
+#define lisxdigit(c)	testprop(c, MASK(XDIGITBIT))
+
+
+/*
+** In ASCII, this 'ltolower' is correct for alphabetic characters and
+** for '.'. That is enough for Lua needs. ('check_exp' ensures that
+** the character either is an upper-case letter or is unchanged by
+** the transformation, which holds for lower-case letters and '.'.)
+*/
+#define ltolower(c)  \
+  check_exp(('A' <= (c) && (c) <= 'Z') || (c) == ((c) | ('A' ^ 'a')),  \
+            (c) | ('A' ^ 'a'))
+
+
+/* one entry for each character and for -1 (EOZ) */
+LUAI_DDEC(const lu_byte luai_ctype_[UCHAR_MAX + 2];)
+
+
+#else			/* }{ */
+
+/*
+** use standard C ctypes
+*/
+
+#include <ctype.h>
+
+
+#define lislalpha(c)	(isalpha(c) || (c) == '_')
+#define lislalnum(c)	(isalnum(c) || (c) == '_')
+#define lisdigit(c)	(isdigit(c))
+#define lisspace(c)	(isspace(c))
+#define lisprint(c)	(isprint(c))
+#define lisxdigit(c)	(isxdigit(c))
+
+#define ltolower(c)	(tolower(c))
+
+#endif			/* } */
+
+#endif
+
diff --git a/src/libs/3rdparty/lua/src/ldblib.c b/src/libs/3rdparty/lua/src/ldblib.c
new file mode 100644
index 00000000000..6dcbaa9824b
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ldblib.c
@@ -0,0 +1,483 @@
+/*
+** $Id: ldblib.c $
+** Interface from Lua to its debug API
+** See Copyright Notice in lua.h
+*/
+
+#define ldblib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+/*
+** The hook table at registry[HOOKKEY] maps threads to their current
+** hook function.
+*/
+static const char *const HOOKKEY = "_HOOKKEY";
+
+
+/*
+** If L1 != L, L1 can be in any state, and therefore there are no
+** guarantees about its stack space; any push in L1 must be
+** checked.
+*/
+static void checkstack (lua_State *L, lua_State *L1, int n) {
+  if (l_unlikely(L != L1 && !lua_checkstack(L1, n)))
+    luaL_error(L, "stack overflow");
+}
+
+
+static int db_getregistry (lua_State *L) {
+  lua_pushvalue(L, LUA_REGISTRYINDEX);
+  return 1;
+}
+
+
+static int db_getmetatable (lua_State *L) {
+  luaL_checkany(L, 1);
+  if (!lua_getmetatable(L, 1)) {
+    lua_pushnil(L);  /* no metatable */
+  }
+  return 1;
+}
+
+
+static int db_setmetatable (lua_State *L) {
+  int t = lua_type(L, 2);
+  luaL_argexpected(L, t == LUA_TNIL || t == LUA_TTABLE, 2, "nil or table");
+  lua_settop(L, 2);
+  lua_setmetatable(L, 1);
+  return 1;  /* return 1st argument */
+}
+
+
+static int db_getuservalue (lua_State *L) {
+  int n = (int)luaL_optinteger(L, 2, 1);
+  if (lua_type(L, 1) != LUA_TUSERDATA)
+    luaL_pushfail(L);
+  else if (lua_getiuservalue(L, 1, n) != LUA_TNONE) {
+    lua_pushboolean(L, 1);
+    return 2;
+  }
+  return 1;
+}
+
+
+static int db_setuservalue (lua_State *L) {
+  int n = (int)luaL_optinteger(L, 3, 1);
+  luaL_checktype(L, 1, LUA_TUSERDATA);
+  luaL_checkany(L, 2);
+  lua_settop(L, 2);
+  if (!lua_setiuservalue(L, 1, n))
+    luaL_pushfail(L);
+  return 1;
+}
+
+
+/*
+** Auxiliary function used by several library functions: check for
+** an optional thread as function's first argument and set 'arg' with
+** 1 if this argument is present (so that functions can skip it to
+** access their other arguments)
+*/
+static lua_State *getthread (lua_State *L, int *arg) {
+  if (lua_isthread(L, 1)) {
+    *arg = 1;
+    return lua_tothread(L, 1);
+  }
+  else {
+    *arg = 0;
+    return L;  /* function will operate over current thread */
+  }
+}
+
+
+/*
+** Variations of 'lua_settable', used by 'db_getinfo' to put results
+** from 'lua_getinfo' into result table. Key is always a string;
+** value can be a string, an int, or a boolean.
+*/
+static void settabss (lua_State *L, const char *k, const char *v) {
+  lua_pushstring(L, v);
+  lua_setfield(L, -2, k);
+}
+
+static void settabsi (lua_State *L, const char *k, int v) {
+  lua_pushinteger(L, v);
+  lua_setfield(L, -2, k);
+}
+
+static void settabsb (lua_State *L, const char *k, int v) {
+  lua_pushboolean(L, v);
+  lua_setfield(L, -2, k);
+}
+
+
+/*
+** In function 'db_getinfo', the call to 'lua_getinfo' may push
+** results on the stack; later it creates the result table to put
+** these objects. Function 'treatstackoption' puts the result from
+** 'lua_getinfo' on top of the result table so that it can call
+** 'lua_setfield'.
+*/
+static void treatstackoption (lua_State *L, lua_State *L1, const char *fname) {
+  if (L == L1)
+    lua_rotate(L, -2, 1);  /* exchange object and table */
+  else
+    lua_xmove(L1, L, 1);  /* move object to the "main" stack */
+  lua_setfield(L, -2, fname);  /* put object into table */
+}
+
+
+/*
+** Calls 'lua_getinfo' and collects all results in a new table.
+** L1 needs stack space for an optional input (function) plus
+** two optional outputs (function and line table) from function
+** 'lua_getinfo'.
+*/
+static int db_getinfo (lua_State *L) {
+  lua_Debug ar;
+  int arg;
+  lua_State *L1 = getthread(L, &arg);
+  const char *options = luaL_optstring(L, arg+2, "flnSrtu");
+  checkstack(L, L1, 3);
+  luaL_argcheck(L, options[0] != '>', arg + 2, "invalid option '>'");
+  if (lua_isfunction(L, arg + 1)) {  /* info about a function? */
+    options = lua_pushfstring(L, ">%s", options);  /* add '>' to 'options' */
+    lua_pushvalue(L, arg + 1);  /* move function to 'L1' stack */
+    lua_xmove(L, L1, 1);
+  }
+  else {  /* stack level */
+    if (!lua_getstack(L1, (int)luaL_checkinteger(L, arg + 1), &ar)) {
+      luaL_pushfail(L);  /* level out of range */
+      return 1;
+    }
+  }
+  if (!lua_getinfo(L1, options, &ar))
+    return luaL_argerror(L, arg+2, "invalid option");
+  lua_newtable(L);  /* table to collect results */
+  if (strchr(options, 'S')) {
+    lua_pushlstring(L, ar.source, ar.srclen);
+    lua_setfield(L, -2, "source");
+    settabss(L, "short_src", ar.short_src);
+    settabsi(L, "linedefined", ar.linedefined);
+    settabsi(L, "lastlinedefined", ar.lastlinedefined);
+    settabss(L, "what", ar.what);
+  }
+  if (strchr(options, 'l'))
+    settabsi(L, "currentline", ar.currentline);
+  if (strchr(options, 'u')) {
+    settabsi(L, "nups", ar.nups);
+    settabsi(L, "nparams", ar.nparams);
+    settabsb(L, "isvararg", ar.isvararg);
+  }
+  if (strchr(options, 'n')) {
+    settabss(L, "name", ar.name);
+    settabss(L, "namewhat", ar.namewhat);
+  }
+  if (strchr(options, 'r')) {
+    settabsi(L, "ftransfer", ar.ftransfer);
+    settabsi(L, "ntransfer", ar.ntransfer);
+  }
+  if (strchr(options, 't'))
+    settabsb(L, "istailcall", ar.istailcall);
+  if (strchr(options, 'L'))
+    treatstackoption(L, L1, "activelines");
+  if (strchr(options, 'f'))
+    treatstackoption(L, L1, "func");
+  return 1;  /* return table */
+}
+
+
+static int db_getlocal (lua_State *L) {
+  int arg;
+  lua_State *L1 = getthread(L, &arg);
+  int nvar = (int)luaL_checkinteger(L, arg + 2);  /* local-variable index */
+  if (lua_isfunction(L, arg + 1)) {  /* function argument? */
+    lua_pushvalue(L, arg + 1);  /* push function */
+    lua_pushstring(L, lua_getlocal(L, NULL, nvar));  /* push local name */
+    return 1;  /* return only name (there is no value) */
+  }
+  else {  /* stack-level argument */
+    lua_Debug ar;
+    const char *name;
+    int level = (int)luaL_checkinteger(L, arg + 1);
+    if (l_unlikely(!lua_getstack(L1, level, &ar)))  /* out of range? */
+      return luaL_argerror(L, arg+1, "level out of range");
+    checkstack(L, L1, 1);
+    name = lua_getlocal(L1, &ar, nvar);
+    if (name) {
+      lua_xmove(L1, L, 1);  /* move local value */
+      lua_pushstring(L, name);  /* push name */
+      lua_rotate(L, -2, 1);  /* re-order */
+      return 2;
+    }
+    else {
+      luaL_pushfail(L);  /* no name (nor value) */
+      return 1;
+    }
+  }
+}
+
+
+static int db_setlocal (lua_State *L) {
+  int arg;
+  const char *name;
+  lua_State *L1 = getthread(L, &arg);
+  lua_Debug ar;
+  int level = (int)luaL_checkinteger(L, arg + 1);
+  int nvar = (int)luaL_checkinteger(L, arg + 2);
+  if (l_unlikely(!lua_getstack(L1, level, &ar)))  /* out of range? */
+    return luaL_argerror(L, arg+1, "level out of range");
+  luaL_checkany(L, arg+3);
+  lua_settop(L, arg+3);
+  checkstack(L, L1, 1);
+  lua_xmove(L, L1, 1);
+  name = lua_setlocal(L1, &ar, nvar);
+  if (name == NULL)
+    lua_pop(L1, 1);  /* pop value (if not popped by 'lua_setlocal') */
+  lua_pushstring(L, name);
+  return 1;
+}
+
+
+/*
+** get (if 'get' is true) or set an upvalue from a closure
+*/
+static int auxupvalue (lua_State *L, int get) {
+  const char *name;
+  int n = (int)luaL_checkinteger(L, 2);  /* upvalue index */
+  luaL_checktype(L, 1, LUA_TFUNCTION);  /* closure */
+  name = get ? lua_getupvalue(L, 1, n) : lua_setupvalue(L, 1, n);
+  if (name == NULL) return 0;
+  lua_pushstring(L, name);
+  lua_insert(L, -(get+1));  /* no-op if get is false */
+  return get + 1;
+}
+
+
+static int db_getupvalue (lua_State *L) {
+  return auxupvalue(L, 1);
+}
+
+
+static int db_setupvalue (lua_State *L) {
+  luaL_checkany(L, 3);
+  return auxupvalue(L, 0);
+}
+
+
+/*
+** Check whether a given upvalue from a given closure exists and
+** returns its index
+*/
+static void *checkupval (lua_State *L, int argf, int argnup, int *pnup) {
+  void *id;
+  int nup = (int)luaL_checkinteger(L, argnup);  /* upvalue index */
+  luaL_checktype(L, argf, LUA_TFUNCTION);  /* closure */
+  id = lua_upvalueid(L, argf, nup);
+  if (pnup) {
+    luaL_argcheck(L, id != NULL, argnup, "invalid upvalue index");
+    *pnup = nup;
+  }
+  return id;
+}
+
+
+static int db_upvalueid (lua_State *L) {
+  void *id = checkupval(L, 1, 2, NULL);
+  if (id != NULL)
+    lua_pushlightuserdata(L, id);
+  else
+    luaL_pushfail(L);
+  return 1;
+}
+
+
+static int db_upvaluejoin (lua_State *L) {
+  int n1, n2;
+  checkupval(L, 1, 2, &n1);
+  checkupval(L, 3, 4, &n2);
+  luaL_argcheck(L, !lua_iscfunction(L, 1), 1, "Lua function expected");
+  luaL_argcheck(L, !lua_iscfunction(L, 3), 3, "Lua function expected");
+  lua_upvaluejoin(L, 1, n1, 3, n2);
+  return 0;
+}
+
+
+/*
+** Call hook function registered at hook table for the current
+** thread (if there is one)
+*/
+static void hookf (lua_State *L, lua_Debug *ar) {
+  static const char *const hooknames[] =
+    {"call", "return", "line", "count", "tail call"};
+  lua_getfield(L, LUA_REGISTRYINDEX, HOOKKEY);
+  lua_pushthread(L);
+  if (lua_rawget(L, -2) == LUA_TFUNCTION) {  /* is there a hook function? */
+    lua_pushstring(L, hooknames[(int)ar->event]);  /* push event name */
+    if (ar->currentline >= 0)
+      lua_pushinteger(L, ar->currentline);  /* push current line */
+    else lua_pushnil(L);
+    lua_assert(lua_getinfo(L, "lS", ar));
+    lua_call(L, 2, 0);  /* call hook function */
+  }
+}
+
+
+/*
+** Convert a string mask (for 'sethook') into a bit mask
+*/
+static int makemask (const char *smask, int count) {
+  int mask = 0;
+  if (strchr(smask, 'c')) mask |= LUA_MASKCALL;
+  if (strchr(smask, 'r')) mask |= LUA_MASKRET;
+  if (strchr(smask, 'l')) mask |= LUA_MASKLINE;
+  if (count > 0) mask |= LUA_MASKCOUNT;
+  return mask;
+}
+
+
+/*
+** Convert a bit mask (for 'gethook') into a string mask
+*/
+static char *unmakemask (int mask, char *smask) {
+  int i = 0;
+  if (mask & LUA_MASKCALL) smask[i++] = 'c';
+  if (mask & LUA_MASKRET) smask[i++] = 'r';
+  if (mask & LUA_MASKLINE) smask[i++] = 'l';
+  smask[i] = '\0';
+  return smask;
+}
+
+
+static int db_sethook (lua_State *L) {
+  int arg, mask, count;
+  lua_Hook func;
+  lua_State *L1 = getthread(L, &arg);
+  if (lua_isnoneornil(L, arg+1)) {  /* no hook? */
+    lua_settop(L, arg+1);
+    func = NULL; mask = 0; count = 0;  /* turn off hooks */
+  }
+  else {
+    const char *smask = luaL_checkstring(L, arg+2);
+    luaL_checktype(L, arg+1, LUA_TFUNCTION);
+    count = (int)luaL_optinteger(L, arg + 3, 0);
+    func = hookf; mask = makemask(smask, count);
+  }
+  if (!luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY)) {
+    /* table just created; initialize it */
+    lua_pushliteral(L, "k");
+    lua_setfield(L, -2, "__mode");  /** hooktable.__mode = "k" */
+    lua_pushvalue(L, -1);
+    lua_setmetatable(L, -2);  /* metatable(hooktable) = hooktable */
+  }
+  checkstack(L, L1, 1);
+  lua_pushthread(L1); lua_xmove(L1, L, 1);  /* key (thread) */
+  lua_pushvalue(L, arg + 1);  /* value (hook function) */
+  lua_rawset(L, -3);  /* hooktable[L1] = new Lua hook */
+  lua_sethook(L1, func, mask, count);
+  return 0;
+}
+
+
+static int db_gethook (lua_State *L) {
+  int arg;
+  lua_State *L1 = getthread(L, &arg);
+  char buff[5];
+  int mask = lua_gethookmask(L1);
+  lua_Hook hook = lua_gethook(L1);
+  if (hook == NULL) {  /* no hook? */
+    luaL_pushfail(L);
+    return 1;
+  }
+  else if (hook != hookf)  /* external hook? */
+    lua_pushliteral(L, "external hook");
+  else {  /* hook table must exist */
+    lua_getfield(L, LUA_REGISTRYINDEX, HOOKKEY);
+    checkstack(L, L1, 1);
+    lua_pushthread(L1); lua_xmove(L1, L, 1);
+    lua_rawget(L, -2);   /* 1st result = hooktable[L1] */
+    lua_remove(L, -2);  /* remove hook table */
+  }
+  lua_pushstring(L, unmakemask(mask, buff));  /* 2nd result = mask */
+  lua_pushinteger(L, lua_gethookcount(L1));  /* 3rd result = count */
+  return 3;
+}
+
+
+static int db_debug (lua_State *L) {
+  for (;;) {
+    char buffer[250];
+    lua_writestringerror("%s", "lua_debug> ");
+    if (fgets(buffer, sizeof(buffer), stdin) == NULL ||
+        strcmp(buffer, "cont\n") == 0)
+      return 0;
+    if (luaL_loadbuffer(L, buffer, strlen(buffer), "=(debug command)") ||
+        lua_pcall(L, 0, 0, 0))
+      lua_writestringerror("%s\n", luaL_tolstring(L, -1, NULL));
+    lua_settop(L, 0);  /* remove eventual returns */
+  }
+}
+
+
+static int db_traceback (lua_State *L) {
+  int arg;
+  lua_State *L1 = getthread(L, &arg);
+  const char *msg = lua_tostring(L, arg + 1);
+  if (msg == NULL && !lua_isnoneornil(L, arg + 1))  /* non-string 'msg'? */
+    lua_pushvalue(L, arg + 1);  /* return it untouched */
+  else {
+    int level = (int)luaL_optinteger(L, arg + 2, (L == L1) ? 1 : 0);
+    luaL_traceback(L, L1, msg, level);
+  }
+  return 1;
+}
+
+
+static int db_setcstacklimit (lua_State *L) {
+  int limit = (int)luaL_checkinteger(L, 1);
+  int res = lua_setcstacklimit(L, limit);
+  lua_pushinteger(L, res);
+  return 1;
+}
+
+
+static const luaL_Reg dblib[] = {
+  {"debug", db_debug},
+  {"getuservalue", db_getuservalue},
+  {"gethook", db_gethook},
+  {"getinfo", db_getinfo},
+  {"getlocal", db_getlocal},
+  {"getregistry", db_getregistry},
+  {"getmetatable", db_getmetatable},
+  {"getupvalue", db_getupvalue},
+  {"upvaluejoin", db_upvaluejoin},
+  {"upvalueid", db_upvalueid},
+  {"setuservalue", db_setuservalue},
+  {"sethook", db_sethook},
+  {"setlocal", db_setlocal},
+  {"setmetatable", db_setmetatable},
+  {"setupvalue", db_setupvalue},
+  {"traceback", db_traceback},
+  {"setcstacklimit", db_setcstacklimit},
+  {NULL, NULL}
+};
+
+
+LUAMOD_API int luaopen_debug (lua_State *L) {
+  luaL_newlib(L, dblib);
+  return 1;
+}
+
diff --git a/src/libs/3rdparty/lua/src/ldebug.c b/src/libs/3rdparty/lua/src/ldebug.c
new file mode 100644
index 00000000000..28b1caabf77
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ldebug.c
@@ -0,0 +1,924 @@
+/*
+** $Id: ldebug.c $
+** Debug Interface
+** See Copyright Notice in lua.h
+*/
+
+#define ldebug_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lapi.h"
+#include "lcode.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+#include "lvm.h"
+
+
+
+#define noLuaClosure(f)		((f) == NULL || (f)->c.tt == LUA_VCCL)
+
+
+static const char *funcnamefromcall (lua_State *L, CallInfo *ci,
+                                                   const char **name);
+
+
+static int currentpc (CallInfo *ci) {
+  lua_assert(isLua(ci));
+  return pcRel(ci->u.l.savedpc, ci_func(ci)->p);
+}
+
+
+/*
+** Get a "base line" to find the line corresponding to an instruction.
+** Base lines are regularly placed at MAXIWTHABS intervals, so usually
+** an integer division gets the right place. When the source file has
+** large sequences of empty/comment lines, it may need extra entries,
+** so the original estimate needs a correction.
+** If the original estimate is -1, the initial 'if' ensures that the
+** 'while' will run at least once.
+** The assertion that the estimate is a lower bound for the correct base
+** is valid as long as the debug info has been generated with the same
+** value for MAXIWTHABS or smaller. (Previous releases use a little
+** smaller value.)
+*/
+static int getbaseline (const Proto *f, int pc, int *basepc) {
+  if (f->sizeabslineinfo == 0 || pc < f->abslineinfo[0].pc) {
+    *basepc = -1;  /* start from the beginning */
+    return f->linedefined;
+  }
+  else {
+    int i = cast_uint(pc) / MAXIWTHABS - 1;  /* get an estimate */
+    /* estimate must be a lower bound of the correct base */
+    lua_assert(i < 0 ||
+              (i < f->sizeabslineinfo && f->abslineinfo[i].pc <= pc));
+    while (i + 1 < f->sizeabslineinfo && pc >= f->abslineinfo[i + 1].pc)
+      i++;  /* low estimate; adjust it */
+    *basepc = f->abslineinfo[i].pc;
+    return f->abslineinfo[i].line;
+  }
+}
+
+
+/*
+** Get the line corresponding to instruction 'pc' in function 'f';
+** first gets a base line and from there does the increments until
+** the desired instruction.
+*/
+int luaG_getfuncline (const Proto *f, int pc) {
+  if (f->lineinfo == NULL)  /* no debug information? */
+    return -1;
+  else {
+    int basepc;
+    int baseline = getbaseline(f, pc, &basepc);
+    while (basepc++ < pc) {  /* walk until given instruction */
+      lua_assert(f->lineinfo[basepc] != ABSLINEINFO);
+      baseline += f->lineinfo[basepc];  /* correct line */
+    }
+    return baseline;
+  }
+}
+
+
+static int getcurrentline (CallInfo *ci) {
+  return luaG_getfuncline(ci_func(ci)->p, currentpc(ci));
+}
+
+
+/*
+** Set 'trap' for all active Lua frames.
+** This function can be called during a signal, under "reasonable"
+** assumptions. A new 'ci' is completely linked in the list before it
+** becomes part of the "active" list, and we assume that pointers are
+** atomic; see comment in next function.
+** (A compiler doing interprocedural optimizations could, theoretically,
+** reorder memory writes in such a way that the list could be
+** temporarily broken while inserting a new element. We simply assume it
+** has no good reasons to do that.)
+*/
+static void settraps (CallInfo *ci) {
+  for (; ci != NULL; ci = ci->previous)
+    if (isLua(ci))
+      ci->u.l.trap = 1;
+}
+
+
+/*
+** This function can be called during a signal, under "reasonable"
+** assumptions.
+** Fields 'basehookcount' and 'hookcount' (set by 'resethookcount')
+** are for debug only, and it is no problem if they get arbitrary
+** values (causes at most one wrong hook call). 'hookmask' is an atomic
+** value. We assume that pointers are atomic too (e.g., gcc ensures that
+** for all platforms where it runs). Moreover, 'hook' is always checked
+** before being called (see 'luaD_hook').
+*/
+LUA_API void lua_sethook (lua_State *L, lua_Hook func, int mask, int count) {
+  if (func == NULL || mask == 0) {  /* turn off hooks? */
+    mask = 0;
+    func = NULL;
+  }
+  L->hook = func;
+  L->basehookcount = count;
+  resethookcount(L);
+  L->hookmask = cast_byte(mask);
+  if (mask)
+    settraps(L->ci);  /* to trace inside 'luaV_execute' */
+}
+
+
+LUA_API lua_Hook lua_gethook (lua_State *L) {
+  return L->hook;
+}
+
+
+LUA_API int lua_gethookmask (lua_State *L) {
+  return L->hookmask;
+}
+
+
+LUA_API int lua_gethookcount (lua_State *L) {
+  return L->basehookcount;
+}
+
+
+LUA_API int lua_getstack (lua_State *L, int level, lua_Debug *ar) {
+  int status;
+  CallInfo *ci;
+  if (level < 0) return 0;  /* invalid (negative) level */
+  lua_lock(L);
+  for (ci = L->ci; level > 0 && ci != &L->base_ci; ci = ci->previous)
+    level--;
+  if (level == 0 && ci != &L->base_ci) {  /* level found? */
+    status = 1;
+    ar->i_ci = ci;
+  }
+  else status = 0;  /* no such level */
+  lua_unlock(L);
+  return status;
+}
+
+
+static const char *upvalname (const Proto *p, int uv) {
+  TString *s = check_exp(uv < p->sizeupvalues, p->upvalues[uv].name);
+  if (s == NULL) return "?";
+  else return getstr(s);
+}
+
+
+static const char *findvararg (CallInfo *ci, int n, StkId *pos) {
+  if (clLvalue(s2v(ci->func.p))->p->is_vararg) {
+    int nextra = ci->u.l.nextraargs;
+    if (n >= -nextra) {  /* 'n' is negative */
+      *pos = ci->func.p - nextra - (n + 1);
+      return "(vararg)";  /* generic name for any vararg */
+    }
+  }
+  return NULL;  /* no such vararg */
+}
+
+
+const char *luaG_findlocal (lua_State *L, CallInfo *ci, int n, StkId *pos) {
+  StkId base = ci->func.p + 1;
+  const char *name = NULL;
+  if (isLua(ci)) {
+    if (n < 0)  /* access to vararg values? */
+      return findvararg(ci, n, pos);
+    else
+      name = luaF_getlocalname(ci_func(ci)->p, n, currentpc(ci));
+  }
+  if (name == NULL) {  /* no 'standard' name? */
+    StkId limit = (ci == L->ci) ? L->top.p : ci->next->func.p;
+    if (limit - base >= n && n > 0) {  /* is 'n' inside 'ci' stack? */
+      /* generic name for any valid slot */
+      name = isLua(ci) ? "(temporary)" : "(C temporary)";
+    }
+    else
+      return NULL;  /* no name */
+  }
+  if (pos)
+    *pos = base + (n - 1);
+  return name;
+}
+
+
+LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n) {
+  const char *name;
+  lua_lock(L);
+  if (ar == NULL) {  /* information about non-active function? */
+    if (!isLfunction(s2v(L->top.p - 1)))  /* not a Lua function? */
+      name = NULL;
+    else  /* consider live variables at function start (parameters) */
+      name = luaF_getlocalname(clLvalue(s2v(L->top.p - 1))->p, n, 0);
+  }
+  else {  /* active function; get information through 'ar' */
+    StkId pos = NULL;  /* to avoid warnings */
+    name = luaG_findlocal(L, ar->i_ci, n, &pos);
+    if (name) {
+      setobjs2s(L, L->top.p, pos);
+      api_incr_top(L);
+    }
+  }
+  lua_unlock(L);
+  return name;
+}
+
+
+LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n) {
+  StkId pos = NULL;  /* to avoid warnings */
+  const char *name;
+  lua_lock(L);
+  name = luaG_findlocal(L, ar->i_ci, n, &pos);
+  if (name) {
+    setobjs2s(L, pos, L->top.p - 1);
+    L->top.p--;  /* pop value */
+  }
+  lua_unlock(L);
+  return name;
+}
+
+
+static void funcinfo (lua_Debug *ar, Closure *cl) {
+  if (noLuaClosure(cl)) {
+    ar->source = "=[C]";
+    ar->srclen = LL("=[C]");
+    ar->linedefined = -1;
+    ar->lastlinedefined = -1;
+    ar->what = "C";
+  }
+  else {
+    const Proto *p = cl->l.p;
+    if (p->source) {
+      ar->source = getstr(p->source);
+      ar->srclen = tsslen(p->source);
+    }
+    else {
+      ar->source = "=?";
+      ar->srclen = LL("=?");
+    }
+    ar->linedefined = p->linedefined;
+    ar->lastlinedefined = p->lastlinedefined;
+    ar->what = (ar->linedefined == 0) ? "main" : "Lua";
+  }
+  luaO_chunkid(ar->short_src, ar->source, ar->srclen);
+}
+
+
+static int nextline (const Proto *p, int currentline, int pc) {
+  if (p->lineinfo[pc] != ABSLINEINFO)
+    return currentline + p->lineinfo[pc];
+  else
+    return luaG_getfuncline(p, pc);
+}
+
+
+static void collectvalidlines (lua_State *L, Closure *f) {
+  if (noLuaClosure(f)) {
+    setnilvalue(s2v(L->top.p));
+    api_incr_top(L);
+  }
+  else {
+    int i;
+    TValue v;
+    const Proto *p = f->l.p;
+    int currentline = p->linedefined;
+    Table *t = luaH_new(L);  /* new table to store active lines */
+    sethvalue2s(L, L->top.p, t);  /* push it on stack */
+    api_incr_top(L);
+    setbtvalue(&v);  /* boolean 'true' to be the value of all indices */
+    if (!p->is_vararg)  /* regular function? */
+      i = 0;  /* consider all instructions */
+    else {  /* vararg function */
+      lua_assert(GET_OPCODE(p->code[0]) == OP_VARARGPREP);
+      currentline = nextline(p, currentline, 0);
+      i = 1;  /* skip first instruction (OP_VARARGPREP) */
+    }
+    for (; i < p->sizelineinfo; i++) {  /* for each instruction */
+      currentline = nextline(p, currentline, i);  /* get its line */
+      luaH_setint(L, t, currentline, &v);  /* table[line] = true */
+    }
+  }
+}
+
+
+static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name) {
+  /* calling function is a known function? */
+  if (ci != NULL && !(ci->callstatus & CIST_TAIL))
+    return funcnamefromcall(L, ci->previous, name);
+  else return NULL;  /* no way to find a name */
+}
+
+
+static int auxgetinfo (lua_State *L, const char *what, lua_Debug *ar,
+                       Closure *f, CallInfo *ci) {
+  int status = 1;
+  for (; *what; what++) {
+    switch (*what) {
+      case 'S': {
+        funcinfo(ar, f);
+        break;
+      }
+      case 'l': {
+        ar->currentline = (ci && isLua(ci)) ? getcurrentline(ci) : -1;
+        break;
+      }
+      case 'u': {
+        ar->nups = (f == NULL) ? 0 : f->c.nupvalues;
+        if (noLuaClosure(f)) {
+          ar->isvararg = 1;
+          ar->nparams = 0;
+        }
+        else {
+          ar->isvararg = f->l.p->is_vararg;
+          ar->nparams = f->l.p->numparams;
+        }
+        break;
+      }
+      case 't': {
+        ar->istailcall = (ci) ? ci->callstatus & CIST_TAIL : 0;
+        break;
+      }
+      case 'n': {
+        ar->namewhat = getfuncname(L, ci, &ar->name);
+        if (ar->namewhat == NULL) {
+          ar->namewhat = "";  /* not found */
+          ar->name = NULL;
+        }
+        break;
+      }
+      case 'r': {
+        if (ci == NULL || !(ci->callstatus & CIST_TRAN))
+          ar->ftransfer = ar->ntransfer = 0;
+        else {
+          ar->ftransfer = ci->u2.transferinfo.ftransfer;
+          ar->ntransfer = ci->u2.transferinfo.ntransfer;
+        }
+        break;
+      }
+      case 'L':
+      case 'f':  /* handled by lua_getinfo */
+        break;
+      default: status = 0;  /* invalid option */
+    }
+  }
+  return status;
+}
+
+
+LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar) {
+  int status;
+  Closure *cl;
+  CallInfo *ci;
+  TValue *func;
+  lua_lock(L);
+  if (*what == '>') {
+    ci = NULL;
+    func = s2v(L->top.p - 1);
+    api_check(L, ttisfunction(func), "function expected");
+    what++;  /* skip the '>' */
+    L->top.p--;  /* pop function */
+  }
+  else {
+    ci = ar->i_ci;
+    func = s2v(ci->func.p);
+    lua_assert(ttisfunction(func));
+  }
+  cl = ttisclosure(func) ? clvalue(func) : NULL;
+  status = auxgetinfo(L, what, ar, cl, ci);
+  if (strchr(what, 'f')) {
+    setobj2s(L, L->top.p, func);
+    api_incr_top(L);
+  }
+  if (strchr(what, 'L'))
+    collectvalidlines(L, cl);
+  lua_unlock(L);
+  return status;
+}
+
+
+/*
+** {======================================================
+** Symbolic Execution
+** =======================================================
+*/
+
+static const char *getobjname (const Proto *p, int lastpc, int reg,
+                               const char **name);
+
+
+/*
+** Find a "name" for the constant 'c'.
+*/
+static void kname (const Proto *p, int c, const char **name) {
+  TValue *kvalue = &p->k[c];
+  *name = (ttisstring(kvalue)) ? svalue(kvalue) : "?";
+}
+
+
+/*
+** Find a "name" for the register 'c'.
+*/
+static void rname (const Proto *p, int pc, int c, const char **name) {
+  const char *what = getobjname(p, pc, c, name); /* search for 'c' */
+  if (!(what && *what == 'c'))  /* did not find a constant name? */
+    *name = "?";
+}
+
+
+/*
+** Find a "name" for a 'C' value in an RK instruction.
+*/
+static void rkname (const Proto *p, int pc, Instruction i, const char **name) {
+  int c = GETARG_C(i);  /* key index */
+  if (GETARG_k(i))  /* is 'c' a constant? */
+    kname(p, c, name);
+  else  /* 'c' is a register */
+    rname(p, pc, c, name);
+}
+
+
+static int filterpc (int pc, int jmptarget) {
+  if (pc < jmptarget)  /* is code conditional (inside a jump)? */
+    return -1;  /* cannot know who sets that register */
+  else return pc;  /* current position sets that register */
+}
+
+
+/*
+** Try to find last instruction before 'lastpc' that modified register 'reg'.
+*/
+static int findsetreg (const Proto *p, int lastpc, int reg) {
+  int pc;
+  int setreg = -1;  /* keep last instruction that changed 'reg' */
+  int jmptarget = 0;  /* any code before this address is conditional */
+  if (testMMMode(GET_OPCODE(p->code[lastpc])))
+    lastpc--;  /* previous instruction was not actually executed */
+  for (pc = 0; pc < lastpc; pc++) {
+    Instruction i = p->code[pc];
+    OpCode op = GET_OPCODE(i);
+    int a = GETARG_A(i);
+    int change;  /* true if current instruction changed 'reg' */
+    switch (op) {
+      case OP_LOADNIL: {  /* set registers from 'a' to 'a+b' */
+        int b = GETARG_B(i);
+        change = (a <= reg && reg <= a + b);
+        break;
+      }
+      case OP_TFORCALL: {  /* affect all regs above its base */
+        change = (reg >= a + 2);
+        break;
+      }
+      case OP_CALL:
+      case OP_TAILCALL: {  /* affect all registers above base */
+        change = (reg >= a);
+        break;
+      }
+      case OP_JMP: {  /* doesn't change registers, but changes 'jmptarget' */
+        int b = GETARG_sJ(i);
+        int dest = pc + 1 + b;
+        /* jump does not skip 'lastpc' and is larger than current one? */
+        if (dest <= lastpc && dest > jmptarget)
+          jmptarget = dest;  /* update 'jmptarget' */
+        change = 0;
+        break;
+      }
+      default:  /* any instruction that sets A */
+        change = (testAMode(op) && reg == a);
+        break;
+    }
+    if (change)
+      setreg = filterpc(pc, jmptarget);
+  }
+  return setreg;
+}
+
+
+/*
+** Check whether table being indexed by instruction 'i' is the
+** environment '_ENV'
+*/
+static const char *gxf (const Proto *p, int pc, Instruction i, int isup) {
+  int t = GETARG_B(i);  /* table index */
+  const char *name;  /* name of indexed variable */
+  if (isup)  /* is an upvalue? */
+    name = upvalname(p, t);
+  else
+    getobjname(p, pc, t, &name);
+  return (name && strcmp(name, LUA_ENV) == 0) ? "global" : "field";
+}
+
+
+static const char *getobjname (const Proto *p, int lastpc, int reg,
+                               const char **name) {
+  int pc;
+  *name = luaF_getlocalname(p, reg + 1, lastpc);
+  if (*name)  /* is a local? */
+    return "local";
+  /* else try symbolic execution */
+  pc = findsetreg(p, lastpc, reg);
+  if (pc != -1) {  /* could find instruction? */
+    Instruction i = p->code[pc];
+    OpCode op = GET_OPCODE(i);
+    switch (op) {
+      case OP_MOVE: {
+        int b = GETARG_B(i);  /* move from 'b' to 'a' */
+        if (b < GETARG_A(i))
+          return getobjname(p, pc, b, name);  /* get name for 'b' */
+        break;
+      }
+      case OP_GETTABUP: {
+        int k = GETARG_C(i);  /* key index */
+        kname(p, k, name);
+        return gxf(p, pc, i, 1);
+      }
+      case OP_GETTABLE: {
+        int k = GETARG_C(i);  /* key index */
+        rname(p, pc, k, name);
+        return gxf(p, pc, i, 0);
+      }
+      case OP_GETI: {
+        *name = "integer index";
+        return "field";
+      }
+      case OP_GETFIELD: {
+        int k = GETARG_C(i);  /* key index */
+        kname(p, k, name);
+        return gxf(p, pc, i, 0);
+      }
+      case OP_GETUPVAL: {
+        *name = upvalname(p, GETARG_B(i));
+        return "upvalue";
+      }
+      case OP_LOADK:
+      case OP_LOADKX: {
+        int b = (op == OP_LOADK) ? GETARG_Bx(i)
+                                 : GETARG_Ax(p->code[pc + 1]);
+        if (ttisstring(&p->k[b])) {
+          *name = svalue(&p->k[b]);
+          return "constant";
+        }
+        break;
+      }
+      case OP_SELF: {
+        rkname(p, pc, i, name);
+        return "method";
+      }
+      default: break;  /* go through to return NULL */
+    }
+  }
+  return NULL;  /* could not find reasonable name */
+}
+
+
+/*
+** Try to find a name for a function based on the code that called it.
+** (Only works when function was called by a Lua function.)
+** Returns what the name is (e.g., "for iterator", "method",
+** "metamethod") and sets '*name' to point to the name.
+*/
+static const char *funcnamefromcode (lua_State *L, const Proto *p,
+                                     int pc, const char **name) {
+  TMS tm = (TMS)0;  /* (initial value avoids warnings) */
+  Instruction i = p->code[pc];  /* calling instruction */
+  switch (GET_OPCODE(i)) {
+    case OP_CALL:
+    case OP_TAILCALL:
+      return getobjname(p, pc, GETARG_A(i), name);  /* get function name */
+    case OP_TFORCALL: {  /* for iterator */
+      *name = "for iterator";
+       return "for iterator";
+    }
+    /* other instructions can do calls through metamethods */
+    case OP_SELF: case OP_GETTABUP: case OP_GETTABLE:
+    case OP_GETI: case OP_GETFIELD:
+      tm = TM_INDEX;
+      break;
+    case OP_SETTABUP: case OP_SETTABLE: case OP_SETI: case OP_SETFIELD:
+      tm = TM_NEWINDEX;
+      break;
+    case OP_MMBIN: case OP_MMBINI: case OP_MMBINK: {
+      tm = cast(TMS, GETARG_C(i));
+      break;
+    }
+    case OP_UNM: tm = TM_UNM; break;
+    case OP_BNOT: tm = TM_BNOT; break;
+    case OP_LEN: tm = TM_LEN; break;
+    case OP_CONCAT: tm = TM_CONCAT; break;
+    case OP_EQ: tm = TM_EQ; break;
+    /* no cases for OP_EQI and OP_EQK, as they don't call metamethods */
+    case OP_LT: case OP_LTI: case OP_GTI: tm = TM_LT; break;
+    case OP_LE: case OP_LEI: case OP_GEI: tm = TM_LE; break;
+    case OP_CLOSE: case OP_RETURN: tm = TM_CLOSE; break;
+    default:
+      return NULL;  /* cannot find a reasonable name */
+  }
+  *name = getstr(G(L)->tmname[tm]) + 2;
+  return "metamethod";
+}
+
+
+/*
+** Try to find a name for a function based on how it was called.
+*/
+static const char *funcnamefromcall (lua_State *L, CallInfo *ci,
+                                                   const char **name) {
+  if (ci->callstatus & CIST_HOOKED) {  /* was it called inside a hook? */
+    *name = "?";
+    return "hook";
+  }
+  else if (ci->callstatus & CIST_FIN) {  /* was it called as a finalizer? */
+    *name = "__gc";
+    return "metamethod";  /* report it as such */
+  }
+  else if (isLua(ci))
+    return funcnamefromcode(L, ci_func(ci)->p, currentpc(ci), name);
+  else
+    return NULL;
+}
+
+/* }====================================================== */
+
+
+
+/*
+** Check whether pointer 'o' points to some value in the stack frame of
+** the current function and, if so, returns its index.  Because 'o' may
+** not point to a value in this stack, we cannot compare it with the
+** region boundaries (undefined behavior in ISO C).
+*/
+static int instack (CallInfo *ci, const TValue *o) {
+  int pos;
+  StkId base = ci->func.p + 1;
+  for (pos = 0; base + pos < ci->top.p; pos++) {
+    if (o == s2v(base + pos))
+      return pos;
+  }
+  return -1;  /* not found */
+}
+
+
+/*
+** Checks whether value 'o' came from an upvalue. (That can only happen
+** with instructions OP_GETTABUP/OP_SETTABUP, which operate directly on
+** upvalues.)
+*/
+static const char *getupvalname (CallInfo *ci, const TValue *o,
+                                 const char **name) {
+  LClosure *c = ci_func(ci);
+  int i;
+  for (i = 0; i < c->nupvalues; i++) {
+    if (c->upvals[i]->v.p == o) {
+      *name = upvalname(c->p, i);
+      return "upvalue";
+    }
+  }
+  return NULL;
+}
+
+
+static const char *formatvarinfo (lua_State *L, const char *kind,
+                                                const char *name) {
+  if (kind == NULL)
+    return "";  /* no information */
+  else
+    return luaO_pushfstring(L, " (%s '%s')", kind, name);
+}
+
+/*
+** Build a string with a "description" for the value 'o', such as
+** "variable 'x'" or "upvalue 'y'".
+*/
+static const char *varinfo (lua_State *L, const TValue *o) {
+  CallInfo *ci = L->ci;
+  const char *name = NULL;  /* to avoid warnings */
+  const char *kind = NULL;
+  if (isLua(ci)) {
+    kind = getupvalname(ci, o, &name);  /* check whether 'o' is an upvalue */
+    if (!kind) {  /* not an upvalue? */
+      int reg = instack(ci, o);  /* try a register */
+      if (reg >= 0)  /* is 'o' a register? */
+        kind = getobjname(ci_func(ci)->p, currentpc(ci), reg, &name);
+    }
+  }
+  return formatvarinfo(L, kind, name);
+}
+
+
+/*
+** Raise a type error
+*/
+static l_noret typeerror (lua_State *L, const TValue *o, const char *op,
+                          const char *extra) {
+  const char *t = luaT_objtypename(L, o);
+  luaG_runerror(L, "attempt to %s a %s value%s", op, t, extra);
+}
+
+
+/*
+** Raise a type error with "standard" information about the faulty
+** object 'o' (using 'varinfo').
+*/
+l_noret luaG_typeerror (lua_State *L, const TValue *o, const char *op) {
+  typeerror(L, o, op, varinfo(L, o));
+}
+
+
+/*
+** Raise an error for calling a non-callable object. Try to find a name
+** for the object based on how it was called ('funcnamefromcall'); if it
+** cannot get a name there, try 'varinfo'.
+*/
+l_noret luaG_callerror (lua_State *L, const TValue *o) {
+  CallInfo *ci = L->ci;
+  const char *name = NULL;  /* to avoid warnings */
+  const char *kind = funcnamefromcall(L, ci, &name);
+  const char *extra = kind ? formatvarinfo(L, kind, name) : varinfo(L, o);
+  typeerror(L, o, "call", extra);
+}
+
+
+l_noret luaG_forerror (lua_State *L, const TValue *o, const char *what) {
+  luaG_runerror(L, "bad 'for' %s (number expected, got %s)",
+                   what, luaT_objtypename(L, o));
+}
+
+
+l_noret luaG_concaterror (lua_State *L, const TValue *p1, const TValue *p2) {
+  if (ttisstring(p1) || cvt2str(p1)) p1 = p2;
+  luaG_typeerror(L, p1, "concatenate");
+}
+
+
+l_noret luaG_opinterror (lua_State *L, const TValue *p1,
+                         const TValue *p2, const char *msg) {
+  if (!ttisnumber(p1))  /* first operand is wrong? */
+    p2 = p1;  /* now second is wrong */
+  luaG_typeerror(L, p2, msg);
+}
+
+
+/*
+** Error when both values are convertible to numbers, but not to integers
+*/
+l_noret luaG_tointerror (lua_State *L, const TValue *p1, const TValue *p2) {
+  lua_Integer temp;
+  if (!luaV_tointegerns(p1, &temp, LUA_FLOORN2I))
+    p2 = p1;
+  luaG_runerror(L, "number%s has no integer representation", varinfo(L, p2));
+}
+
+
+l_noret luaG_ordererror (lua_State *L, const TValue *p1, const TValue *p2) {
+  const char *t1 = luaT_objtypename(L, p1);
+  const char *t2 = luaT_objtypename(L, p2);
+  if (strcmp(t1, t2) == 0)
+    luaG_runerror(L, "attempt to compare two %s values", t1);
+  else
+    luaG_runerror(L, "attempt to compare %s with %s", t1, t2);
+}
+
+
+/* add src:line information to 'msg' */
+const char *luaG_addinfo (lua_State *L, const char *msg, TString *src,
+                                        int line) {
+  char buff[LUA_IDSIZE];
+  if (src)
+    luaO_chunkid(buff, getstr(src), tsslen(src));
+  else {  /* no source available; use "?" instead */
+    buff[0] = '?'; buff[1] = '\0';
+  }
+  return luaO_pushfstring(L, "%s:%d: %s", buff, line, msg);
+}
+
+
+l_noret luaG_errormsg (lua_State *L) {
+  if (L->errfunc != 0) {  /* is there an error handling function? */
+    StkId errfunc = restorestack(L, L->errfunc);
+    lua_assert(ttisfunction(s2v(errfunc)));
+    setobjs2s(L, L->top.p, L->top.p - 1);  /* move argument */
+    setobjs2s(L, L->top.p - 1, errfunc);  /* push function */
+    L->top.p++;  /* assume EXTRA_STACK */
+    luaD_callnoyield(L, L->top.p - 2, 1);  /* call it */
+  }
+  luaD_throw(L, LUA_ERRRUN);
+}
+
+
+l_noret luaG_runerror (lua_State *L, const char *fmt, ...) {
+  CallInfo *ci = L->ci;
+  const char *msg;
+  va_list argp;
+  luaC_checkGC(L);  /* error message uses memory */
+  va_start(argp, fmt);
+  msg = luaO_pushvfstring(L, fmt, argp);  /* format message */
+  va_end(argp);
+  if (isLua(ci)) {  /* if Lua function, add source:line information */
+    luaG_addinfo(L, msg, ci_func(ci)->p->source, getcurrentline(ci));
+    setobjs2s(L, L->top.p - 2, L->top.p - 1);  /* remove 'msg' */
+    L->top.p--;
+  }
+  luaG_errormsg(L);
+}
+
+
+/*
+** Check whether new instruction 'newpc' is in a different line from
+** previous instruction 'oldpc'. More often than not, 'newpc' is only
+** one or a few instructions after 'oldpc' (it must be after, see
+** caller), so try to avoid calling 'luaG_getfuncline'. If they are
+** too far apart, there is a good chance of a ABSLINEINFO in the way,
+** so it goes directly to 'luaG_getfuncline'.
+*/
+static int changedline (const Proto *p, int oldpc, int newpc) {
+  if (p->lineinfo == NULL)  /* no debug information? */
+    return 0;
+  if (newpc - oldpc < MAXIWTHABS / 2) {  /* not too far apart? */
+    int delta = 0;  /* line difference */
+    int pc = oldpc;
+    for (;;) {
+      int lineinfo = p->lineinfo[++pc];
+      if (lineinfo == ABSLINEINFO)
+        break;  /* cannot compute delta; fall through */
+      delta += lineinfo;
+      if (pc == newpc)
+        return (delta != 0);  /* delta computed successfully */
+    }
+  }
+  /* either instructions are too far apart or there is an absolute line
+     info in the way; compute line difference explicitly */
+  return (luaG_getfuncline(p, oldpc) != luaG_getfuncline(p, newpc));
+}
+
+
+/*
+** Traces the execution of a Lua function. Called before the execution
+** of each opcode, when debug is on. 'L->oldpc' stores the last
+** instruction traced, to detect line changes. When entering a new
+** function, 'npci' will be zero and will test as a new line whatever
+** the value of 'oldpc'.  Some exceptional conditions may return to
+** a function without setting 'oldpc'. In that case, 'oldpc' may be
+** invalid; if so, use zero as a valid value. (A wrong but valid 'oldpc'
+** at most causes an extra call to a line hook.)
+** This function is not "Protected" when called, so it should correct
+** 'L->top.p' before calling anything that can run the GC.
+*/
+int luaG_traceexec (lua_State *L, const Instruction *pc) {
+  CallInfo *ci = L->ci;
+  lu_byte mask = L->hookmask;
+  const Proto *p = ci_func(ci)->p;
+  int counthook;
+  if (!(mask & (LUA_MASKLINE | LUA_MASKCOUNT))) {  /* no hooks? */
+    ci->u.l.trap = 0;  /* don't need to stop again */
+    return 0;  /* turn off 'trap' */
+  }
+  pc++;  /* reference is always next instruction */
+  ci->u.l.savedpc = pc;  /* save 'pc' */
+  counthook = (--L->hookcount == 0 && (mask & LUA_MASKCOUNT));
+  if (counthook)
+    resethookcount(L);  /* reset count */
+  else if (!(mask & LUA_MASKLINE))
+    return 1;  /* no line hook and count != 0; nothing to be done now */
+  if (ci->callstatus & CIST_HOOKYIELD) {  /* called hook last time? */
+    ci->callstatus &= ~CIST_HOOKYIELD;  /* erase mark */
+    return 1;  /* do not call hook again (VM yielded, so it did not move) */
+  }
+  if (!isIT(*(ci->u.l.savedpc - 1)))  /* top not being used? */
+    L->top.p = ci->top.p;  /* correct top */
+  if (counthook)
+    luaD_hook(L, LUA_HOOKCOUNT, -1, 0, 0);  /* call count hook */
+  if (mask & LUA_MASKLINE) {
+    /* 'L->oldpc' may be invalid; use zero in this case */
+    int oldpc = (L->oldpc < p->sizecode) ? L->oldpc : 0;
+    int npci = pcRel(pc, p);
+    if (npci <= oldpc ||  /* call hook when jump back (loop), */
+        changedline(p, oldpc, npci)) {  /* or when enter new line */
+      int newline = luaG_getfuncline(p, npci);
+      luaD_hook(L, LUA_HOOKLINE, newline, 0, 0);  /* call line hook */
+    }
+    L->oldpc = npci;  /* 'pc' of last call to line hook */
+  }
+  if (L->status == LUA_YIELD) {  /* did hook yield? */
+    if (counthook)
+      L->hookcount = 1;  /* undo decrement to zero */
+    ci->u.l.savedpc--;  /* undo increment (resume will increment it again) */
+    ci->callstatus |= CIST_HOOKYIELD;  /* mark that it yielded */
+    luaD_throw(L, LUA_YIELD);
+  }
+  return 1;  /* keep 'trap' on */
+}
+
diff --git a/src/libs/3rdparty/lua/src/ldebug.h b/src/libs/3rdparty/lua/src/ldebug.h
new file mode 100644
index 00000000000..2c3074c61b6
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ldebug.h
@@ -0,0 +1,63 @@
+/*
+** $Id: ldebug.h $
+** Auxiliary functions from Debug Interface module
+** See Copyright Notice in lua.h
+*/
+
+#ifndef ldebug_h
+#define ldebug_h
+
+
+#include "lstate.h"
+
+
+#define pcRel(pc, p)	(cast_int((pc) - (p)->code) - 1)
+
+
+/* Active Lua function (given call info) */
+#define ci_func(ci)		(clLvalue(s2v((ci)->func.p)))
+
+
+#define resethookcount(L)	(L->hookcount = L->basehookcount)
+
+/*
+** mark for entries in 'lineinfo' array that has absolute information in
+** 'abslineinfo' array
+*/
+#define ABSLINEINFO	(-0x80)
+
+
+/*
+** MAXimum number of successive Instructions WiTHout ABSolute line
+** information. (A power of two allows fast divisions.)
+*/
+#if !defined(MAXIWTHABS)
+#define MAXIWTHABS	128
+#endif
+
+
+LUAI_FUNC int luaG_getfuncline (const Proto *f, int pc);
+LUAI_FUNC const char *luaG_findlocal (lua_State *L, CallInfo *ci, int n,
+                                                    StkId *pos);
+LUAI_FUNC l_noret luaG_typeerror (lua_State *L, const TValue *o,
+                                                const char *opname);
+LUAI_FUNC l_noret luaG_callerror (lua_State *L, const TValue *o);
+LUAI_FUNC l_noret luaG_forerror (lua_State *L, const TValue *o,
+                                               const char *what);
+LUAI_FUNC l_noret luaG_concaterror (lua_State *L, const TValue *p1,
+                                                  const TValue *p2);
+LUAI_FUNC l_noret luaG_opinterror (lua_State *L, const TValue *p1,
+                                                 const TValue *p2,
+                                                 const char *msg);
+LUAI_FUNC l_noret luaG_tointerror (lua_State *L, const TValue *p1,
+                                                 const TValue *p2);
+LUAI_FUNC l_noret luaG_ordererror (lua_State *L, const TValue *p1,
+                                                 const TValue *p2);
+LUAI_FUNC l_noret luaG_runerror (lua_State *L, const char *fmt, ...);
+LUAI_FUNC const char *luaG_addinfo (lua_State *L, const char *msg,
+                                                  TString *src, int line);
+LUAI_FUNC l_noret luaG_errormsg (lua_State *L);
+LUAI_FUNC int luaG_traceexec (lua_State *L, const Instruction *pc);
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/ldo.c b/src/libs/3rdparty/lua/src/ldo.c
new file mode 100644
index 00000000000..2a0017ca62a
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ldo.c
@@ -0,0 +1,1024 @@
+/*
+** $Id: ldo.c $
+** Stack and Call structure of Lua
+** See Copyright Notice in lua.h
+*/
+
+#define ldo_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <setjmp.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lapi.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lparser.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+#include "lundump.h"
+#include "lvm.h"
+#include "lzio.h"
+
+
+
+#define errorstatus(s)	((s) > LUA_YIELD)
+
+
+/*
+** {======================================================
+** Error-recovery functions
+** =======================================================
+*/
+
+/*
+** LUAI_THROW/LUAI_TRY define how Lua does exception handling. By
+** default, Lua handles errors with exceptions when compiling as
+** C++ code, with _longjmp/_setjmp when asked to use them, and with
+** longjmp/setjmp otherwise.
+*/
+#if !defined(LUAI_THROW)				/* { */
+
+#if defined(__cplusplus) && !defined(LUA_USE_LONGJMP)	/* { */
+
+/* C++ exceptions */
+#define LUAI_THROW(L,c)		throw(c)
+#define LUAI_TRY(L,c,a) \
+	try { a } catch(...) { if ((c)->status == 0) (c)->status = -1; }
+#define luai_jmpbuf		int  /* dummy variable */
+
+#elif defined(LUA_USE_POSIX)				/* }{ */
+
+/* in POSIX, try _longjmp/_setjmp (more efficient) */
+#define LUAI_THROW(L,c)		_longjmp((c)->b, 1)
+#define LUAI_TRY(L,c,a)		if (_setjmp((c)->b) == 0) { a }
+#define luai_jmpbuf		jmp_buf
+
+#else							/* }{ */
+
+/* ISO C handling with long jumps */
+#define LUAI_THROW(L,c)		longjmp((c)->b, 1)
+#define LUAI_TRY(L,c,a)		if (setjmp((c)->b) == 0) { a }
+#define luai_jmpbuf		jmp_buf
+
+#endif							/* } */
+
+#endif							/* } */
+
+
+
+/* chain list of long jump buffers */
+struct lua_longjmp {
+  struct lua_longjmp *previous;
+  luai_jmpbuf b;
+  volatile int status;  /* error code */
+};
+
+
+void luaD_seterrorobj (lua_State *L, int errcode, StkId oldtop) {
+  switch (errcode) {
+    case LUA_ERRMEM: {  /* memory error? */
+      setsvalue2s(L, oldtop, G(L)->memerrmsg); /* reuse preregistered msg. */
+      break;
+    }
+    case LUA_ERRERR: {
+      setsvalue2s(L, oldtop, luaS_newliteral(L, "error in error handling"));
+      break;
+    }
+    case LUA_OK: {  /* special case only for closing upvalues */
+      setnilvalue(s2v(oldtop));  /* no error message */
+      break;
+    }
+    default: {
+      lua_assert(errorstatus(errcode));  /* real error */
+      setobjs2s(L, oldtop, L->top.p - 1);  /* error message on current top */
+      break;
+    }
+  }
+  L->top.p = oldtop + 1;
+}
+
+
+l_noret luaD_throw (lua_State *L, int errcode) {
+  if (L->errorJmp) {  /* thread has an error handler? */
+    L->errorJmp->status = errcode;  /* set status */
+    LUAI_THROW(L, L->errorJmp);  /* jump to it */
+  }
+  else {  /* thread has no error handler */
+    global_State *g = G(L);
+    errcode = luaE_resetthread(L, errcode);  /* close all upvalues */
+    if (g->mainthread->errorJmp) {  /* main thread has a handler? */
+      setobjs2s(L, g->mainthread->top.p++, L->top.p - 1);  /* copy error obj. */
+      luaD_throw(g->mainthread, errcode);  /* re-throw in main thread */
+    }
+    else {  /* no handler at all; abort */
+      if (g->panic) {  /* panic function? */
+        lua_unlock(L);
+        g->panic(L);  /* call panic function (last chance to jump out) */
+      }
+      abort();
+    }
+  }
+}
+
+
+int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud) {
+  l_uint32 oldnCcalls = L->nCcalls;
+  struct lua_longjmp lj;
+  lj.status = LUA_OK;
+  lj.previous = L->errorJmp;  /* chain new error handler */
+  L->errorJmp = &lj;
+  LUAI_TRY(L, &lj,
+    (*f)(L, ud);
+  );
+  L->errorJmp = lj.previous;  /* restore old error handler */
+  L->nCcalls = oldnCcalls;
+  return lj.status;
+}
+
+/* }====================================================== */
+
+
+/*
+** {==================================================================
+** Stack reallocation
+** ===================================================================
+*/
+
+
+/*
+** Change all pointers to the stack into offsets.
+*/
+static void relstack (lua_State *L) {
+  CallInfo *ci;
+  UpVal *up;
+  L->top.offset = savestack(L, L->top.p);
+  L->tbclist.offset = savestack(L, L->tbclist.p);
+  for (up = L->openupval; up != NULL; up = up->u.open.next)
+    up->v.offset = savestack(L, uplevel(up));
+  for (ci = L->ci; ci != NULL; ci = ci->previous) {
+    ci->top.offset = savestack(L, ci->top.p);
+    ci->func.offset = savestack(L, ci->func.p);
+  }
+}
+
+
+/*
+** Change back all offsets into pointers.
+*/
+static void correctstack (lua_State *L) {
+  CallInfo *ci;
+  UpVal *up;
+  L->top.p = restorestack(L, L->top.offset);
+  L->tbclist.p = restorestack(L, L->tbclist.offset);
+  for (up = L->openupval; up != NULL; up = up->u.open.next)
+    up->v.p = s2v(restorestack(L, up->v.offset));
+  for (ci = L->ci; ci != NULL; ci = ci->previous) {
+    ci->top.p = restorestack(L, ci->top.offset);
+    ci->func.p = restorestack(L, ci->func.offset);
+    if (isLua(ci))
+      ci->u.l.trap = 1;  /* signal to update 'trap' in 'luaV_execute' */
+  }
+}
+
+
+/* some space for error handling */
+#define ERRORSTACKSIZE	(LUAI_MAXSTACK + 200)
+
+/*
+** Reallocate the stack to a new size, correcting all pointers into it.
+** In ISO C, any pointer use after the pointer has been deallocated is
+** undefined behavior. So, before the reallocation, all pointers are
+** changed to offsets, and after the reallocation they are changed back
+** to pointers. As during the reallocation the pointers are invalid, the
+** reallocation cannot run emergency collections.
+**
+** In case of allocation error, raise an error or return false according
+** to 'raiseerror'.
+*/
+int luaD_reallocstack (lua_State *L, int newsize, int raiseerror) {
+  int oldsize = stacksize(L);
+  int i;
+  StkId newstack;
+  int oldgcstop = G(L)->gcstopem;
+  lua_assert(newsize <= LUAI_MAXSTACK || newsize == ERRORSTACKSIZE);
+  relstack(L);  /* change pointers to offsets */
+  G(L)->gcstopem = 1;  /* stop emergency collection */
+  newstack = luaM_reallocvector(L, L->stack.p, oldsize + EXTRA_STACK,
+                                   newsize + EXTRA_STACK, StackValue);
+  G(L)->gcstopem = oldgcstop;  /* restore emergency collection */
+  if (l_unlikely(newstack == NULL)) {  /* reallocation failed? */
+    correctstack(L);  /* change offsets back to pointers */
+    if (raiseerror)
+      luaM_error(L);
+    else return 0;  /* do not raise an error */
+  }
+  L->stack.p = newstack;
+  correctstack(L);  /* change offsets back to pointers */
+  L->stack_last.p = L->stack.p + newsize;
+  for (i = oldsize + EXTRA_STACK; i < newsize + EXTRA_STACK; i++)
+    setnilvalue(s2v(newstack + i)); /* erase new segment */
+  return 1;
+}
+
+
+/*
+** Try to grow the stack by at least 'n' elements. When 'raiseerror'
+** is true, raises any error; otherwise, return 0 in case of errors.
+*/
+int luaD_growstack (lua_State *L, int n, int raiseerror) {
+  int size = stacksize(L);
+  if (l_unlikely(size > LUAI_MAXSTACK)) {
+    /* if stack is larger than maximum, thread is already using the
+       extra space reserved for errors, that is, thread is handling
+       a stack error; cannot grow further than that. */
+    lua_assert(stacksize(L) == ERRORSTACKSIZE);
+    if (raiseerror)
+      luaD_throw(L, LUA_ERRERR);  /* error inside message handler */
+    return 0;  /* if not 'raiseerror', just signal it */
+  }
+  else if (n < LUAI_MAXSTACK) {  /* avoids arithmetic overflows */
+    int newsize = 2 * size;  /* tentative new size */
+    int needed = cast_int(L->top.p - L->stack.p) + n;
+    if (newsize > LUAI_MAXSTACK)  /* cannot cross the limit */
+      newsize = LUAI_MAXSTACK;
+    if (newsize < needed)  /* but must respect what was asked for */
+      newsize = needed;
+    if (l_likely(newsize <= LUAI_MAXSTACK))
+      return luaD_reallocstack(L, newsize, raiseerror);
+  }
+  /* else stack overflow */
+  /* add extra size to be able to handle the error message */
+  luaD_reallocstack(L, ERRORSTACKSIZE, raiseerror);
+  if (raiseerror)
+    luaG_runerror(L, "stack overflow");
+  return 0;
+}
+
+
+/*
+** Compute how much of the stack is being used, by computing the
+** maximum top of all call frames in the stack and the current top.
+*/
+static int stackinuse (lua_State *L) {
+  CallInfo *ci;
+  int res;
+  StkId lim = L->top.p;
+  for (ci = L->ci; ci != NULL; ci = ci->previous) {
+    if (lim < ci->top.p) lim = ci->top.p;
+  }
+  lua_assert(lim <= L->stack_last.p + EXTRA_STACK);
+  res = cast_int(lim - L->stack.p) + 1;  /* part of stack in use */
+  if (res < LUA_MINSTACK)
+    res = LUA_MINSTACK;  /* ensure a minimum size */
+  return res;
+}
+
+
+/*
+** If stack size is more than 3 times the current use, reduce that size
+** to twice the current use. (So, the final stack size is at most 2/3 the
+** previous size, and half of its entries are empty.)
+** As a particular case, if stack was handling a stack overflow and now
+** it is not, 'max' (limited by LUAI_MAXSTACK) will be smaller than
+** stacksize (equal to ERRORSTACKSIZE in this case), and so the stack
+** will be reduced to a "regular" size.
+*/
+void luaD_shrinkstack (lua_State *L) {
+  int inuse = stackinuse(L);
+  int max = (inuse > LUAI_MAXSTACK / 3) ? LUAI_MAXSTACK : inuse * 3;
+  /* if thread is currently not handling a stack overflow and its
+     size is larger than maximum "reasonable" size, shrink it */
+  if (inuse <= LUAI_MAXSTACK && stacksize(L) > max) {
+    int nsize = (inuse > LUAI_MAXSTACK / 2) ? LUAI_MAXSTACK : inuse * 2;
+    luaD_reallocstack(L, nsize, 0);  /* ok if that fails */
+  }
+  else  /* don't change stack */
+    condmovestack(L,{},{});  /* (change only for debugging) */
+  luaE_shrinkCI(L);  /* shrink CI list */
+}
+
+
+void luaD_inctop (lua_State *L) {
+  luaD_checkstack(L, 1);
+  L->top.p++;
+}
+
+/* }================================================================== */
+
+
+/*
+** Call a hook for the given event. Make sure there is a hook to be
+** called. (Both 'L->hook' and 'L->hookmask', which trigger this
+** function, can be changed asynchronously by signals.)
+*/
+void luaD_hook (lua_State *L, int event, int line,
+                              int ftransfer, int ntransfer) {
+  lua_Hook hook = L->hook;
+  if (hook && L->allowhook) {  /* make sure there is a hook */
+    int mask = CIST_HOOKED;
+    CallInfo *ci = L->ci;
+    ptrdiff_t top = savestack(L, L->top.p);  /* preserve original 'top' */
+    ptrdiff_t ci_top = savestack(L, ci->top.p);  /* idem for 'ci->top' */
+    lua_Debug ar;
+    ar.event = event;
+    ar.currentline = line;
+    ar.i_ci = ci;
+    if (ntransfer != 0) {
+      mask |= CIST_TRAN;  /* 'ci' has transfer information */
+      ci->u2.transferinfo.ftransfer = ftransfer;
+      ci->u2.transferinfo.ntransfer = ntransfer;
+    }
+    if (isLua(ci) && L->top.p < ci->top.p)
+      L->top.p = ci->top.p;  /* protect entire activation register */
+    luaD_checkstack(L, LUA_MINSTACK);  /* ensure minimum stack size */
+    if (ci->top.p < L->top.p + LUA_MINSTACK)
+      ci->top.p = L->top.p + LUA_MINSTACK;
+    L->allowhook = 0;  /* cannot call hooks inside a hook */
+    ci->callstatus |= mask;
+    lua_unlock(L);
+    (*hook)(L, &ar);
+    lua_lock(L);
+    lua_assert(!L->allowhook);
+    L->allowhook = 1;
+    ci->top.p = restorestack(L, ci_top);
+    L->top.p = restorestack(L, top);
+    ci->callstatus &= ~mask;
+  }
+}
+
+
+/*
+** Executes a call hook for Lua functions. This function is called
+** whenever 'hookmask' is not zero, so it checks whether call hooks are
+** active.
+*/
+void luaD_hookcall (lua_State *L, CallInfo *ci) {
+  L->oldpc = 0;  /* set 'oldpc' for new function */
+  if (L->hookmask & LUA_MASKCALL) {  /* is call hook on? */
+    int event = (ci->callstatus & CIST_TAIL) ? LUA_HOOKTAILCALL
+                                             : LUA_HOOKCALL;
+    Proto *p = ci_func(ci)->p;
+    ci->u.l.savedpc++;  /* hooks assume 'pc' is already incremented */
+    luaD_hook(L, event, -1, 1, p->numparams);
+    ci->u.l.savedpc--;  /* correct 'pc' */
+  }
+}
+
+
+/*
+** Executes a return hook for Lua and C functions and sets/corrects
+** 'oldpc'. (Note that this correction is needed by the line hook, so it
+** is done even when return hooks are off.)
+*/
+static void rethook (lua_State *L, CallInfo *ci, int nres) {
+  if (L->hookmask & LUA_MASKRET) {  /* is return hook on? */
+    StkId firstres = L->top.p - nres;  /* index of first result */
+    int delta = 0;  /* correction for vararg functions */
+    int ftransfer;
+    if (isLua(ci)) {
+      Proto *p = ci_func(ci)->p;
+      if (p->is_vararg)
+        delta = ci->u.l.nextraargs + p->numparams + 1;
+    }
+    ci->func.p += delta;  /* if vararg, back to virtual 'func' */
+    ftransfer = cast(unsigned short, firstres - ci->func.p);
+    luaD_hook(L, LUA_HOOKRET, -1, ftransfer, nres);  /* call it */
+    ci->func.p -= delta;
+  }
+  if (isLua(ci = ci->previous))
+    L->oldpc = pcRel(ci->u.l.savedpc, ci_func(ci)->p);  /* set 'oldpc' */
+}
+
+
+/*
+** Check whether 'func' has a '__call' metafield. If so, put it in the
+** stack, below original 'func', so that 'luaD_precall' can call it. Raise
+** an error if there is no '__call' metafield.
+*/
+StkId luaD_tryfuncTM (lua_State *L, StkId func) {
+  const TValue *tm;
+  StkId p;
+  checkstackGCp(L, 1, func);  /* space for metamethod */
+  tm = luaT_gettmbyobj(L, s2v(func), TM_CALL);  /* (after previous GC) */
+  if (l_unlikely(ttisnil(tm)))
+    luaG_callerror(L, s2v(func));  /* nothing to call */
+  for (p = L->top.p; p > func; p--)  /* open space for metamethod */
+    setobjs2s(L, p, p-1);
+  L->top.p++;  /* stack space pre-allocated by the caller */
+  setobj2s(L, func, tm);  /* metamethod is the new function to be called */
+  return func;
+}
+
+
+/*
+** Given 'nres' results at 'firstResult', move 'wanted' of them to 'res'.
+** Handle most typical cases (zero results for commands, one result for
+** expressions, multiple results for tail calls/single parameters)
+** separated.
+*/
+l_sinline void moveresults (lua_State *L, StkId res, int nres, int wanted) {
+  StkId firstresult;
+  int i;
+  switch (wanted) {  /* handle typical cases separately */
+    case 0:  /* no values needed */
+      L->top.p = res;
+      return;
+    case 1:  /* one value needed */
+      if (nres == 0)   /* no results? */
+        setnilvalue(s2v(res));  /* adjust with nil */
+      else  /* at least one result */
+        setobjs2s(L, res, L->top.p - nres);  /* move it to proper place */
+      L->top.p = res + 1;
+      return;
+    case LUA_MULTRET:
+      wanted = nres;  /* we want all results */
+      break;
+    default:  /* two/more results and/or to-be-closed variables */
+      if (hastocloseCfunc(wanted)) {  /* to-be-closed variables? */
+        L->ci->callstatus |= CIST_CLSRET;  /* in case of yields */
+        L->ci->u2.nres = nres;
+        res = luaF_close(L, res, CLOSEKTOP, 1);
+        L->ci->callstatus &= ~CIST_CLSRET;
+        if (L->hookmask) {  /* if needed, call hook after '__close's */
+          ptrdiff_t savedres = savestack(L, res);
+          rethook(L, L->ci, nres);
+          res = restorestack(L, savedres);  /* hook can move stack */
+        }
+        wanted = decodeNresults(wanted);
+        if (wanted == LUA_MULTRET)
+          wanted = nres;  /* we want all results */
+      }
+      break;
+  }
+  /* generic case */
+  firstresult = L->top.p - nres;  /* index of first result */
+  if (nres > wanted)  /* extra results? */
+    nres = wanted;  /* don't need them */
+  for (i = 0; i < nres; i++)  /* move all results to correct place */
+    setobjs2s(L, res + i, firstresult + i);
+  for (; i < wanted; i++)  /* complete wanted number of results */
+    setnilvalue(s2v(res + i));
+  L->top.p = res + wanted;  /* top points after the last result */
+}
+
+
+/*
+** Finishes a function call: calls hook if necessary, moves current
+** number of results to proper place, and returns to previous call
+** info. If function has to close variables, hook must be called after
+** that.
+*/
+void luaD_poscall (lua_State *L, CallInfo *ci, int nres) {
+  int wanted = ci->nresults;
+  if (l_unlikely(L->hookmask && !hastocloseCfunc(wanted)))
+    rethook(L, ci, nres);
+  /* move results to proper place */
+  moveresults(L, ci->func.p, nres, wanted);
+  /* function cannot be in any of these cases when returning */
+  lua_assert(!(ci->callstatus &
+        (CIST_HOOKED | CIST_YPCALL | CIST_FIN | CIST_TRAN | CIST_CLSRET)));
+  L->ci = ci->previous;  /* back to caller (after closing variables) */
+}
+
+
+
+#define next_ci(L)  (L->ci->next ? L->ci->next : luaE_extendCI(L))
+
+
+l_sinline CallInfo *prepCallInfo (lua_State *L, StkId func, int nret,
+                                                int mask, StkId top) {
+  CallInfo *ci = L->ci = next_ci(L);  /* new frame */
+  ci->func.p = func;
+  ci->nresults = nret;
+  ci->callstatus = mask;
+  ci->top.p = top;
+  return ci;
+}
+
+
+/*
+** precall for C functions
+*/
+l_sinline int precallC (lua_State *L, StkId func, int nresults,
+                                            lua_CFunction f) {
+  int n;  /* number of returns */
+  CallInfo *ci;
+  checkstackGCp(L, LUA_MINSTACK, func);  /* ensure minimum stack size */
+  L->ci = ci = prepCallInfo(L, func, nresults, CIST_C,
+                               L->top.p + LUA_MINSTACK);
+  lua_assert(ci->top.p <= L->stack_last.p);
+  if (l_unlikely(L->hookmask & LUA_MASKCALL)) {
+    int narg = cast_int(L->top.p - func) - 1;
+    luaD_hook(L, LUA_HOOKCALL, -1, 1, narg);
+  }
+  lua_unlock(L);
+  n = (*f)(L);  /* do the actual call */
+  lua_lock(L);
+  api_checknelems(L, n);
+  luaD_poscall(L, ci, n);
+  return n;
+}
+
+
+/*
+** Prepare a function for a tail call, building its call info on top
+** of the current call info. 'narg1' is the number of arguments plus 1
+** (so that it includes the function itself). Return the number of
+** results, if it was a C function, or -1 for a Lua function.
+*/
+int luaD_pretailcall (lua_State *L, CallInfo *ci, StkId func,
+                                    int narg1, int delta) {
+ retry:
+  switch (ttypetag(s2v(func))) {
+    case LUA_VCCL:  /* C closure */
+      return precallC(L, func, LUA_MULTRET, clCvalue(s2v(func))->f);
+    case LUA_VLCF:  /* light C function */
+      return precallC(L, func, LUA_MULTRET, fvalue(s2v(func)));
+    case LUA_VLCL: {  /* Lua function */
+      Proto *p = clLvalue(s2v(func))->p;
+      int fsize = p->maxstacksize;  /* frame size */
+      int nfixparams = p->numparams;
+      int i;
+      checkstackGCp(L, fsize - delta, func);
+      ci->func.p -= delta;  /* restore 'func' (if vararg) */
+      for (i = 0; i < narg1; i++)  /* move down function and arguments */
+        setobjs2s(L, ci->func.p + i, func + i);
+      func = ci->func.p;  /* moved-down function */
+      for (; narg1 <= nfixparams; narg1++)
+        setnilvalue(s2v(func + narg1));  /* complete missing arguments */
+      ci->top.p = func + 1 + fsize;  /* top for new function */
+      lua_assert(ci->top.p <= L->stack_last.p);
+      ci->u.l.savedpc = p->code;  /* starting point */
+      ci->callstatus |= CIST_TAIL;
+      L->top.p = func + narg1;  /* set top */
+      return -1;
+    }
+    default: {  /* not a function */
+      func = luaD_tryfuncTM(L, func);  /* try to get '__call' metamethod */
+      /* return luaD_pretailcall(L, ci, func, narg1 + 1, delta); */
+      narg1++;
+      goto retry;  /* try again */
+    }
+  }
+}
+
+
+/*
+** Prepares the call to a function (C or Lua). For C functions, also do
+** the call. The function to be called is at '*func'.  The arguments
+** are on the stack, right after the function.  Returns the CallInfo
+** to be executed, if it was a Lua function. Otherwise (a C function)
+** returns NULL, with all the results on the stack, starting at the
+** original function position.
+*/
+CallInfo *luaD_precall (lua_State *L, StkId func, int nresults) {
+ retry:
+  switch (ttypetag(s2v(func))) {
+    case LUA_VCCL:  /* C closure */
+      precallC(L, func, nresults, clCvalue(s2v(func))->f);
+      return NULL;
+    case LUA_VLCF:  /* light C function */
+      precallC(L, func, nresults, fvalue(s2v(func)));
+      return NULL;
+    case LUA_VLCL: {  /* Lua function */
+      CallInfo *ci;
+      Proto *p = clLvalue(s2v(func))->p;
+      int narg = cast_int(L->top.p - func) - 1;  /* number of real arguments */
+      int nfixparams = p->numparams;
+      int fsize = p->maxstacksize;  /* frame size */
+      checkstackGCp(L, fsize, func);
+      L->ci = ci = prepCallInfo(L, func, nresults, 0, func + 1 + fsize);
+      ci->u.l.savedpc = p->code;  /* starting point */
+      for (; narg < nfixparams; narg++)
+        setnilvalue(s2v(L->top.p++));  /* complete missing arguments */
+      lua_assert(ci->top.p <= L->stack_last.p);
+      return ci;
+    }
+    default: {  /* not a function */
+      func = luaD_tryfuncTM(L, func);  /* try to get '__call' metamethod */
+      /* return luaD_precall(L, func, nresults); */
+      goto retry;  /* try again with metamethod */
+    }
+  }
+}
+
+
+/*
+** Call a function (C or Lua) through C. 'inc' can be 1 (increment
+** number of recursive invocations in the C stack) or nyci (the same
+** plus increment number of non-yieldable calls).
+** This function can be called with some use of EXTRA_STACK, so it should
+** check the stack before doing anything else. 'luaD_precall' already
+** does that.
+*/
+l_sinline void ccall (lua_State *L, StkId func, int nResults, l_uint32 inc) {
+  CallInfo *ci;
+  L->nCcalls += inc;
+  if (l_unlikely(getCcalls(L) >= LUAI_MAXCCALLS)) {
+    checkstackp(L, 0, func);  /* free any use of EXTRA_STACK */
+    luaE_checkcstack(L);
+  }
+  if ((ci = luaD_precall(L, func, nResults)) != NULL) {  /* Lua function? */
+    ci->callstatus = CIST_FRESH;  /* mark that it is a "fresh" execute */
+    luaV_execute(L, ci);  /* call it */
+  }
+  L->nCcalls -= inc;
+}
+
+
+/*
+** External interface for 'ccall'
+*/
+void luaD_call (lua_State *L, StkId func, int nResults) {
+  ccall(L, func, nResults, 1);
+}
+
+
+/*
+** Similar to 'luaD_call', but does not allow yields during the call.
+*/
+void luaD_callnoyield (lua_State *L, StkId func, int nResults) {
+  ccall(L, func, nResults, nyci);
+}
+
+
+/*
+** Finish the job of 'lua_pcallk' after it was interrupted by an yield.
+** (The caller, 'finishCcall', does the final call to 'adjustresults'.)
+** The main job is to complete the 'luaD_pcall' called by 'lua_pcallk'.
+** If a '__close' method yields here, eventually control will be back
+** to 'finishCcall' (when that '__close' method finally returns) and
+** 'finishpcallk' will run again and close any still pending '__close'
+** methods. Similarly, if a '__close' method errs, 'precover' calls
+** 'unroll' which calls ''finishCcall' and we are back here again, to
+** close any pending '__close' methods.
+** Note that, up to the call to 'luaF_close', the corresponding
+** 'CallInfo' is not modified, so that this repeated run works like the
+** first one (except that it has at least one less '__close' to do). In
+** particular, field CIST_RECST preserves the error status across these
+** multiple runs, changing only if there is a new error.
+*/
+static int finishpcallk (lua_State *L,  CallInfo *ci) {
+  int status = getcistrecst(ci);  /* get original status */
+  if (l_likely(status == LUA_OK))  /* no error? */
+    status = LUA_YIELD;  /* was interrupted by an yield */
+  else {  /* error */
+    StkId func = restorestack(L, ci->u2.funcidx);
+    L->allowhook = getoah(ci->callstatus);  /* restore 'allowhook' */
+    func = luaF_close(L, func, status, 1);  /* can yield or raise an error */
+    luaD_seterrorobj(L, status, func);
+    luaD_shrinkstack(L);   /* restore stack size in case of overflow */
+    setcistrecst(ci, LUA_OK);  /* clear original status */
+  }
+  ci->callstatus &= ~CIST_YPCALL;
+  L->errfunc = ci->u.c.old_errfunc;
+  /* if it is here, there were errors or yields; unlike 'lua_pcallk',
+     do not change status */
+  return status;
+}
+
+
+/*
+** Completes the execution of a C function interrupted by an yield.
+** The interruption must have happened while the function was either
+** closing its tbc variables in 'moveresults' or executing
+** 'lua_callk'/'lua_pcallk'. In the first case, it just redoes
+** 'luaD_poscall'. In the second case, the call to 'finishpcallk'
+** finishes the interrupted execution of 'lua_pcallk'.  After that, it
+** calls the continuation of the interrupted function and finally it
+** completes the job of the 'luaD_call' that called the function.  In
+** the call to 'adjustresults', we do not know the number of results
+** of the function called by 'lua_callk'/'lua_pcallk', so we are
+** conservative and use LUA_MULTRET (always adjust).
+*/
+static void finishCcall (lua_State *L, CallInfo *ci) {
+  int n;  /* actual number of results from C function */
+  if (ci->callstatus & CIST_CLSRET) {  /* was returning? */
+    lua_assert(hastocloseCfunc(ci->nresults));
+    n = ci->u2.nres;  /* just redo 'luaD_poscall' */
+    /* don't need to reset CIST_CLSRET, as it will be set again anyway */
+  }
+  else {
+    int status = LUA_YIELD;  /* default if there were no errors */
+    /* must have a continuation and must be able to call it */
+    lua_assert(ci->u.c.k != NULL && yieldable(L));
+    if (ci->callstatus & CIST_YPCALL)   /* was inside a 'lua_pcallk'? */
+      status = finishpcallk(L, ci);  /* finish it */
+    adjustresults(L, LUA_MULTRET);  /* finish 'lua_callk' */
+    lua_unlock(L);
+    n = (*ci->u.c.k)(L, status, ci->u.c.ctx);  /* call continuation */
+    lua_lock(L);
+    api_checknelems(L, n);
+  }
+  luaD_poscall(L, ci, n);  /* finish 'luaD_call' */
+}
+
+
+/*
+** Executes "full continuation" (everything in the stack) of a
+** previously interrupted coroutine until the stack is empty (or another
+** interruption long-jumps out of the loop).
+*/
+static void unroll (lua_State *L, void *ud) {
+  CallInfo *ci;
+  UNUSED(ud);
+  while ((ci = L->ci) != &L->base_ci) {  /* something in the stack */
+    if (!isLua(ci))  /* C function? */
+      finishCcall(L, ci);  /* complete its execution */
+    else {  /* Lua function */
+      luaV_finishOp(L);  /* finish interrupted instruction */
+      luaV_execute(L, ci);  /* execute down to higher C 'boundary' */
+    }
+  }
+}
+
+
+/*
+** Try to find a suspended protected call (a "recover point") for the
+** given thread.
+*/
+static CallInfo *findpcall (lua_State *L) {
+  CallInfo *ci;
+  for (ci = L->ci; ci != NULL; ci = ci->previous) {  /* search for a pcall */
+    if (ci->callstatus & CIST_YPCALL)
+      return ci;
+  }
+  return NULL;  /* no pending pcall */
+}
+
+
+/*
+** Signal an error in the call to 'lua_resume', not in the execution
+** of the coroutine itself. (Such errors should not be handled by any
+** coroutine error handler and should not kill the coroutine.)
+*/
+static int resume_error (lua_State *L, const char *msg, int narg) {
+  L->top.p -= narg;  /* remove args from the stack */
+  setsvalue2s(L, L->top.p, luaS_new(L, msg));  /* push error message */
+  api_incr_top(L);
+  lua_unlock(L);
+  return LUA_ERRRUN;
+}
+
+
+/*
+** Do the work for 'lua_resume' in protected mode. Most of the work
+** depends on the status of the coroutine: initial state, suspended
+** inside a hook, or regularly suspended (optionally with a continuation
+** function), plus erroneous cases: non-suspended coroutine or dead
+** coroutine.
+*/
+static void resume (lua_State *L, void *ud) {
+  int n = *(cast(int*, ud));  /* number of arguments */
+  StkId firstArg = L->top.p - n;  /* first argument */
+  CallInfo *ci = L->ci;
+  if (L->status == LUA_OK)  /* starting a coroutine? */
+    ccall(L, firstArg - 1, LUA_MULTRET, 0);  /* just call its body */
+  else {  /* resuming from previous yield */
+    lua_assert(L->status == LUA_YIELD);
+    L->status = LUA_OK;  /* mark that it is running (again) */
+    if (isLua(ci)) {  /* yielded inside a hook? */
+      L->top.p = firstArg;  /* discard arguments */
+      luaV_execute(L, ci);  /* just continue running Lua code */
+    }
+    else {  /* 'common' yield */
+      if (ci->u.c.k != NULL) {  /* does it have a continuation function? */
+        lua_unlock(L);
+        n = (*ci->u.c.k)(L, LUA_YIELD, ci->u.c.ctx); /* call continuation */
+        lua_lock(L);
+        api_checknelems(L, n);
+      }
+      luaD_poscall(L, ci, n);  /* finish 'luaD_call' */
+    }
+    unroll(L, NULL);  /* run continuation */
+  }
+}
+
+
+/*
+** Unrolls a coroutine in protected mode while there are recoverable
+** errors, that is, errors inside a protected call. (Any error
+** interrupts 'unroll', and this loop protects it again so it can
+** continue.) Stops with a normal end (status == LUA_OK), an yield
+** (status == LUA_YIELD), or an unprotected error ('findpcall' doesn't
+** find a recover point).
+*/
+static int precover (lua_State *L, int status) {
+  CallInfo *ci;
+  while (errorstatus(status) && (ci = findpcall(L)) != NULL) {
+    L->ci = ci;  /* go down to recovery functions */
+    setcistrecst(ci, status);  /* status to finish 'pcall' */
+    status = luaD_rawrunprotected(L, unroll, NULL);
+  }
+  return status;
+}
+
+
+LUA_API int lua_resume (lua_State *L, lua_State *from, int nargs,
+                                      int *nresults) {
+  int status;
+  lua_lock(L);
+  if (L->status == LUA_OK) {  /* may be starting a coroutine */
+    if (L->ci != &L->base_ci)  /* not in base level? */
+      return resume_error(L, "cannot resume non-suspended coroutine", nargs);
+    else if (L->top.p - (L->ci->func.p + 1) == nargs)  /* no function? */
+      return resume_error(L, "cannot resume dead coroutine", nargs);
+  }
+  else if (L->status != LUA_YIELD)  /* ended with errors? */
+    return resume_error(L, "cannot resume dead coroutine", nargs);
+  L->nCcalls = (from) ? getCcalls(from) : 0;
+  if (getCcalls(L) >= LUAI_MAXCCALLS)
+    return resume_error(L, "C stack overflow", nargs);
+  L->nCcalls++;
+  luai_userstateresume(L, nargs);
+  api_checknelems(L, (L->status == LUA_OK) ? nargs + 1 : nargs);
+  status = luaD_rawrunprotected(L, resume, &nargs);
+   /* continue running after recoverable errors */
+  status = precover(L, status);
+  if (l_likely(!errorstatus(status)))
+    lua_assert(status == L->status);  /* normal end or yield */
+  else {  /* unrecoverable error */
+    L->status = cast_byte(status);  /* mark thread as 'dead' */
+    luaD_seterrorobj(L, status, L->top.p);  /* push error message */
+    L->ci->top.p = L->top.p;
+  }
+  *nresults = (status == LUA_YIELD) ? L->ci->u2.nyield
+                                    : cast_int(L->top.p - (L->ci->func.p + 1));
+  lua_unlock(L);
+  return status;
+}
+
+
+LUA_API int lua_isyieldable (lua_State *L) {
+  return yieldable(L);
+}
+
+
+LUA_API int lua_yieldk (lua_State *L, int nresults, lua_KContext ctx,
+                        lua_KFunction k) {
+  CallInfo *ci;
+  luai_userstateyield(L, nresults);
+  lua_lock(L);
+  ci = L->ci;
+  api_checknelems(L, nresults);
+  if (l_unlikely(!yieldable(L))) {
+    if (L != G(L)->mainthread)
+      luaG_runerror(L, "attempt to yield across a C-call boundary");
+    else
+      luaG_runerror(L, "attempt to yield from outside a coroutine");
+  }
+  L->status = LUA_YIELD;
+  ci->u2.nyield = nresults;  /* save number of results */
+  if (isLua(ci)) {  /* inside a hook? */
+    lua_assert(!isLuacode(ci));
+    api_check(L, nresults == 0, "hooks cannot yield values");
+    api_check(L, k == NULL, "hooks cannot continue after yielding");
+  }
+  else {
+    if ((ci->u.c.k = k) != NULL)  /* is there a continuation? */
+      ci->u.c.ctx = ctx;  /* save context */
+    luaD_throw(L, LUA_YIELD);
+  }
+  lua_assert(ci->callstatus & CIST_HOOKED);  /* must be inside a hook */
+  lua_unlock(L);
+  return 0;  /* return to 'luaD_hook' */
+}
+
+
+/*
+** Auxiliary structure to call 'luaF_close' in protected mode.
+*/
+struct CloseP {
+  StkId level;
+  int status;
+};
+
+
+/*
+** Auxiliary function to call 'luaF_close' in protected mode.
+*/
+static void closepaux (lua_State *L, void *ud) {
+  struct CloseP *pcl = cast(struct CloseP *, ud);
+  luaF_close(L, pcl->level, pcl->status, 0);
+}
+
+
+/*
+** Calls 'luaF_close' in protected mode. Return the original status
+** or, in case of errors, the new status.
+*/
+int luaD_closeprotected (lua_State *L, ptrdiff_t level, int status) {
+  CallInfo *old_ci = L->ci;
+  lu_byte old_allowhooks = L->allowhook;
+  for (;;) {  /* keep closing upvalues until no more errors */
+    struct CloseP pcl;
+    pcl.level = restorestack(L, level); pcl.status = status;
+    status = luaD_rawrunprotected(L, &closepaux, &pcl);
+    if (l_likely(status == LUA_OK))  /* no more errors? */
+      return pcl.status;
+    else {  /* an error occurred; restore saved state and repeat */
+      L->ci = old_ci;
+      L->allowhook = old_allowhooks;
+    }
+  }
+}
+
+
+/*
+** Call the C function 'func' in protected mode, restoring basic
+** thread information ('allowhook', etc.) and in particular
+** its stack level in case of errors.
+*/
+int luaD_pcall (lua_State *L, Pfunc func, void *u,
+                ptrdiff_t old_top, ptrdiff_t ef) {
+  int status;
+  CallInfo *old_ci = L->ci;
+  lu_byte old_allowhooks = L->allowhook;
+  ptrdiff_t old_errfunc = L->errfunc;
+  L->errfunc = ef;
+  status = luaD_rawrunprotected(L, func, u);
+  if (l_unlikely(status != LUA_OK)) {  /* an error occurred? */
+    L->ci = old_ci;
+    L->allowhook = old_allowhooks;
+    status = luaD_closeprotected(L, old_top, status);
+    luaD_seterrorobj(L, status, restorestack(L, old_top));
+    luaD_shrinkstack(L);   /* restore stack size in case of overflow */
+  }
+  L->errfunc = old_errfunc;
+  return status;
+}
+
+
+
+/*
+** Execute a protected parser.
+*/
+struct SParser {  /* data to 'f_parser' */
+  ZIO *z;
+  Mbuffer buff;  /* dynamic structure used by the scanner */
+  Dyndata dyd;  /* dynamic structures used by the parser */
+  const char *mode;
+  const char *name;
+};
+
+
+static void checkmode (lua_State *L, const char *mode, const char *x) {
+  if (mode && strchr(mode, x[0]) == NULL) {
+    luaO_pushfstring(L,
+       "attempt to load a %s chunk (mode is '%s')", x, mode);
+    luaD_throw(L, LUA_ERRSYNTAX);
+  }
+}
+
+
+static void f_parser (lua_State *L, void *ud) {
+  LClosure *cl;
+  struct SParser *p = cast(struct SParser *, ud);
+  int c = zgetc(p->z);  /* read first character */
+  if (c == LUA_SIGNATURE[0]) {
+    checkmode(L, p->mode, "binary");
+    cl = luaU_undump(L, p->z, p->name);
+  }
+  else {
+    checkmode(L, p->mode, "text");
+    cl = luaY_parser(L, p->z, &p->buff, &p->dyd, p->name, c);
+  }
+  lua_assert(cl->nupvalues == cl->p->sizeupvalues);
+  luaF_initupvals(L, cl);
+}
+
+
+int luaD_protectedparser (lua_State *L, ZIO *z, const char *name,
+                                        const char *mode) {
+  struct SParser p;
+  int status;
+  incnny(L);  /* cannot yield during parsing */
+  p.z = z; p.name = name; p.mode = mode;
+  p.dyd.actvar.arr = NULL; p.dyd.actvar.size = 0;
+  p.dyd.gt.arr = NULL; p.dyd.gt.size = 0;
+  p.dyd.label.arr = NULL; p.dyd.label.size = 0;
+  luaZ_initbuffer(L, &p.buff);
+  status = luaD_pcall(L, f_parser, &p, savestack(L, L->top.p), L->errfunc);
+  luaZ_freebuffer(L, &p.buff);
+  luaM_freearray(L, p.dyd.actvar.arr, p.dyd.actvar.size);
+  luaM_freearray(L, p.dyd.gt.arr, p.dyd.gt.size);
+  luaM_freearray(L, p.dyd.label.arr, p.dyd.label.size);
+  decnny(L);
+  return status;
+}
+
+
diff --git a/src/libs/3rdparty/lua/src/ldo.h b/src/libs/3rdparty/lua/src/ldo.h
new file mode 100644
index 00000000000..1aa446ad09e
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ldo.h
@@ -0,0 +1,88 @@
+/*
+** $Id: ldo.h $
+** Stack and Call structure of Lua
+** See Copyright Notice in lua.h
+*/
+
+#ifndef ldo_h
+#define ldo_h
+
+
+#include "llimits.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lzio.h"
+
+
+/*
+** Macro to check stack size and grow stack if needed.  Parameters
+** 'pre'/'pos' allow the macro to preserve a pointer into the
+** stack across reallocations, doing the work only when needed.
+** It also allows the running of one GC step when the stack is
+** reallocated.
+** 'condmovestack' is used in heavy tests to force a stack reallocation
+** at every check.
+*/
+#define luaD_checkstackaux(L,n,pre,pos)  \
+	if (l_unlikely(L->stack_last.p - L->top.p <= (n))) \
+	  { pre; luaD_growstack(L, n, 1); pos; } \
+        else { condmovestack(L,pre,pos); }
+
+/* In general, 'pre'/'pos' are empty (nothing to save) */
+#define luaD_checkstack(L,n)	luaD_checkstackaux(L,n,(void)0,(void)0)
+
+
+
+#define savestack(L,pt)		(cast_charp(pt) - cast_charp(L->stack.p))
+#define restorestack(L,n)	cast(StkId, cast_charp(L->stack.p) + (n))
+
+
+/* macro to check stack size, preserving 'p' */
+#define checkstackp(L,n,p)  \
+  luaD_checkstackaux(L, n, \
+    ptrdiff_t t__ = savestack(L, p),  /* save 'p' */ \
+    p = restorestack(L, t__))  /* 'pos' part: restore 'p' */
+
+
+/* macro to check stack size and GC, preserving 'p' */
+#define checkstackGCp(L,n,p)  \
+  luaD_checkstackaux(L, n, \
+    ptrdiff_t t__ = savestack(L, p);  /* save 'p' */ \
+    luaC_checkGC(L),  /* stack grow uses memory */ \
+    p = restorestack(L, t__))  /* 'pos' part: restore 'p' */
+
+
+/* macro to check stack size and GC */
+#define checkstackGC(L,fsize)  \
+	luaD_checkstackaux(L, (fsize), luaC_checkGC(L), (void)0)
+
+
+/* type of protected functions, to be ran by 'runprotected' */
+typedef void (*Pfunc) (lua_State *L, void *ud);
+
+LUAI_FUNC void luaD_seterrorobj (lua_State *L, int errcode, StkId oldtop);
+LUAI_FUNC int luaD_protectedparser (lua_State *L, ZIO *z, const char *name,
+                                                  const char *mode);
+LUAI_FUNC void luaD_hook (lua_State *L, int event, int line,
+                                        int fTransfer, int nTransfer);
+LUAI_FUNC void luaD_hookcall (lua_State *L, CallInfo *ci);
+LUAI_FUNC int luaD_pretailcall (lua_State *L, CallInfo *ci, StkId func,
+                                              int narg1, int delta);
+LUAI_FUNC CallInfo *luaD_precall (lua_State *L, StkId func, int nResults);
+LUAI_FUNC void luaD_call (lua_State *L, StkId func, int nResults);
+LUAI_FUNC void luaD_callnoyield (lua_State *L, StkId func, int nResults);
+LUAI_FUNC StkId luaD_tryfuncTM (lua_State *L, StkId func);
+LUAI_FUNC int luaD_closeprotected (lua_State *L, ptrdiff_t level, int status);
+LUAI_FUNC int luaD_pcall (lua_State *L, Pfunc func, void *u,
+                                        ptrdiff_t oldtop, ptrdiff_t ef);
+LUAI_FUNC void luaD_poscall (lua_State *L, CallInfo *ci, int nres);
+LUAI_FUNC int luaD_reallocstack (lua_State *L, int newsize, int raiseerror);
+LUAI_FUNC int luaD_growstack (lua_State *L, int n, int raiseerror);
+LUAI_FUNC void luaD_shrinkstack (lua_State *L);
+LUAI_FUNC void luaD_inctop (lua_State *L);
+
+LUAI_FUNC l_noret luaD_throw (lua_State *L, int errcode);
+LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud);
+
+#endif
+
diff --git a/src/libs/3rdparty/lua/src/ldump.c b/src/libs/3rdparty/lua/src/ldump.c
new file mode 100644
index 00000000000..f231691b779
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ldump.c
@@ -0,0 +1,230 @@
+/*
+** $Id: ldump.c $
+** save precompiled Lua chunks
+** See Copyright Notice in lua.h
+*/
+
+#define ldump_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <limits.h>
+#include <stddef.h>
+
+#include "lua.h"
+
+#include "lobject.h"
+#include "lstate.h"
+#include "lundump.h"
+
+
+typedef struct {
+  lua_State *L;
+  lua_Writer writer;
+  void *data;
+  int strip;
+  int status;
+} DumpState;
+
+
+/*
+** All high-level dumps go through dumpVector; you can change it to
+** change the endianness of the result
+*/
+#define dumpVector(D,v,n)	dumpBlock(D,v,(n)*sizeof((v)[0]))
+
+#define dumpLiteral(D, s)	dumpBlock(D,s,sizeof(s) - sizeof(char))
+
+
+static void dumpBlock (DumpState *D, const void *b, size_t size) {
+  if (D->status == 0 && size > 0) {
+    lua_unlock(D->L);
+    D->status = (*D->writer)(D->L, b, size, D->data);
+    lua_lock(D->L);
+  }
+}
+
+
+#define dumpVar(D,x)		dumpVector(D,&x,1)
+
+
+static void dumpByte (DumpState *D, int y) {
+  lu_byte x = (lu_byte)y;
+  dumpVar(D, x);
+}
+
+
+/*
+** 'dumpSize' buffer size: each byte can store up to 7 bits. (The "+6"
+** rounds up the division.)
+*/
+#define DIBS    ((sizeof(size_t) * CHAR_BIT + 6) / 7)
+
+static void dumpSize (DumpState *D, size_t x) {
+  lu_byte buff[DIBS];
+  int n = 0;
+  do {
+    buff[DIBS - (++n)] = x & 0x7f;  /* fill buffer in reverse order */
+    x >>= 7;
+  } while (x != 0);
+  buff[DIBS - 1] |= 0x80;  /* mark last byte */
+  dumpVector(D, buff + DIBS - n, n);
+}
+
+
+static void dumpInt (DumpState *D, int x) {
+  dumpSize(D, x);
+}
+
+
+static void dumpNumber (DumpState *D, lua_Number x) {
+  dumpVar(D, x);
+}
+
+
+static void dumpInteger (DumpState *D, lua_Integer x) {
+  dumpVar(D, x);
+}
+
+
+static void dumpString (DumpState *D, const TString *s) {
+  if (s == NULL)
+    dumpSize(D, 0);
+  else {
+    size_t size = tsslen(s);
+    const char *str = getstr(s);
+    dumpSize(D, size + 1);
+    dumpVector(D, str, size);
+  }
+}
+
+
+static void dumpCode (DumpState *D, const Proto *f) {
+  dumpInt(D, f->sizecode);
+  dumpVector(D, f->code, f->sizecode);
+}
+
+
+static void dumpFunction(DumpState *D, const Proto *f, TString *psource);
+
+static void dumpConstants (DumpState *D, const Proto *f) {
+  int i;
+  int n = f->sizek;
+  dumpInt(D, n);
+  for (i = 0; i < n; i++) {
+    const TValue *o = &f->k[i];
+    int tt = ttypetag(o);
+    dumpByte(D, tt);
+    switch (tt) {
+      case LUA_VNUMFLT:
+        dumpNumber(D, fltvalue(o));
+        break;
+      case LUA_VNUMINT:
+        dumpInteger(D, ivalue(o));
+        break;
+      case LUA_VSHRSTR:
+      case LUA_VLNGSTR:
+        dumpString(D, tsvalue(o));
+        break;
+      default:
+        lua_assert(tt == LUA_VNIL || tt == LUA_VFALSE || tt == LUA_VTRUE);
+    }
+  }
+}
+
+
+static void dumpProtos (DumpState *D, const Proto *f) {
+  int i;
+  int n = f->sizep;
+  dumpInt(D, n);
+  for (i = 0; i < n; i++)
+    dumpFunction(D, f->p[i], f->source);
+}
+
+
+static void dumpUpvalues (DumpState *D, const Proto *f) {
+  int i, n = f->sizeupvalues;
+  dumpInt(D, n);
+  for (i = 0; i < n; i++) {
+    dumpByte(D, f->upvalues[i].instack);
+    dumpByte(D, f->upvalues[i].idx);
+    dumpByte(D, f->upvalues[i].kind);
+  }
+}
+
+
+static void dumpDebug (DumpState *D, const Proto *f) {
+  int i, n;
+  n = (D->strip) ? 0 : f->sizelineinfo;
+  dumpInt(D, n);
+  dumpVector(D, f->lineinfo, n);
+  n = (D->strip) ? 0 : f->sizeabslineinfo;
+  dumpInt(D, n);
+  for (i = 0; i < n; i++) {
+    dumpInt(D, f->abslineinfo[i].pc);
+    dumpInt(D, f->abslineinfo[i].line);
+  }
+  n = (D->strip) ? 0 : f->sizelocvars;
+  dumpInt(D, n);
+  for (i = 0; i < n; i++) {
+    dumpString(D, f->locvars[i].varname);
+    dumpInt(D, f->locvars[i].startpc);
+    dumpInt(D, f->locvars[i].endpc);
+  }
+  n = (D->strip) ? 0 : f->sizeupvalues;
+  dumpInt(D, n);
+  for (i = 0; i < n; i++)
+    dumpString(D, f->upvalues[i].name);
+}
+
+
+static void dumpFunction (DumpState *D, const Proto *f, TString *psource) {
+  if (D->strip || f->source == psource)
+    dumpString(D, NULL);  /* no debug info or same source as its parent */
+  else
+    dumpString(D, f->source);
+  dumpInt(D, f->linedefined);
+  dumpInt(D, f->lastlinedefined);
+  dumpByte(D, f->numparams);
+  dumpByte(D, f->is_vararg);
+  dumpByte(D, f->maxstacksize);
+  dumpCode(D, f);
+  dumpConstants(D, f);
+  dumpUpvalues(D, f);
+  dumpProtos(D, f);
+  dumpDebug(D, f);
+}
+
+
+static void dumpHeader (DumpState *D) {
+  dumpLiteral(D, LUA_SIGNATURE);
+  dumpByte(D, LUAC_VERSION);
+  dumpByte(D, LUAC_FORMAT);
+  dumpLiteral(D, LUAC_DATA);
+  dumpByte(D, sizeof(Instruction));
+  dumpByte(D, sizeof(lua_Integer));
+  dumpByte(D, sizeof(lua_Number));
+  dumpInteger(D, LUAC_INT);
+  dumpNumber(D, LUAC_NUM);
+}
+
+
+/*
+** dump Lua function as precompiled chunk
+*/
+int luaU_dump(lua_State *L, const Proto *f, lua_Writer w, void *data,
+              int strip) {
+  DumpState D;
+  D.L = L;
+  D.writer = w;
+  D.data = data;
+  D.strip = strip;
+  D.status = 0;
+  dumpHeader(&D);
+  dumpByte(&D, f->sizeupvalues);
+  dumpFunction(&D, f, NULL);
+  return D.status;
+}
+
diff --git a/src/libs/3rdparty/lua/src/lfunc.c b/src/libs/3rdparty/lua/src/lfunc.c
new file mode 100644
index 00000000000..0945f241de2
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lfunc.c
@@ -0,0 +1,294 @@
+/*
+** $Id: lfunc.c $
+** Auxiliary functions to manipulate prototypes and closures
+** See Copyright Notice in lua.h
+*/
+
+#define lfunc_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <stddef.h>
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+
+
+
+CClosure *luaF_newCclosure (lua_State *L, int nupvals) {
+  GCObject *o = luaC_newobj(L, LUA_VCCL, sizeCclosure(nupvals));
+  CClosure *c = gco2ccl(o);
+  c->nupvalues = cast_byte(nupvals);
+  return c;
+}
+
+
+LClosure *luaF_newLclosure (lua_State *L, int nupvals) {
+  GCObject *o = luaC_newobj(L, LUA_VLCL, sizeLclosure(nupvals));
+  LClosure *c = gco2lcl(o);
+  c->p = NULL;
+  c->nupvalues = cast_byte(nupvals);
+  while (nupvals--) c->upvals[nupvals] = NULL;
+  return c;
+}
+
+
+/*
+** fill a closure with new closed upvalues
+*/
+void luaF_initupvals (lua_State *L, LClosure *cl) {
+  int i;
+  for (i = 0; i < cl->nupvalues; i++) {
+    GCObject *o = luaC_newobj(L, LUA_VUPVAL, sizeof(UpVal));
+    UpVal *uv = gco2upv(o);
+    uv->v.p = &uv->u.value;  /* make it closed */
+    setnilvalue(uv->v.p);
+    cl->upvals[i] = uv;
+    luaC_objbarrier(L, cl, uv);
+  }
+}
+
+
+/*
+** Create a new upvalue at the given level, and link it to the list of
+** open upvalues of 'L' after entry 'prev'.
+**/
+static UpVal *newupval (lua_State *L, StkId level, UpVal **prev) {
+  GCObject *o = luaC_newobj(L, LUA_VUPVAL, sizeof(UpVal));
+  UpVal *uv = gco2upv(o);
+  UpVal *next = *prev;
+  uv->v.p = s2v(level);  /* current value lives in the stack */
+  uv->u.open.next = next;  /* link it to list of open upvalues */
+  uv->u.open.previous = prev;
+  if (next)
+    next->u.open.previous = &uv->u.open.next;
+  *prev = uv;
+  if (!isintwups(L)) {  /* thread not in list of threads with upvalues? */
+    L->twups = G(L)->twups;  /* link it to the list */
+    G(L)->twups = L;
+  }
+  return uv;
+}
+
+
+/*
+** Find and reuse, or create if it does not exist, an upvalue
+** at the given level.
+*/
+UpVal *luaF_findupval (lua_State *L, StkId level) {
+  UpVal **pp = &L->openupval;
+  UpVal *p;
+  lua_assert(isintwups(L) || L->openupval == NULL);
+  while ((p = *pp) != NULL && uplevel(p) >= level) {  /* search for it */
+    lua_assert(!isdead(G(L), p));
+    if (uplevel(p) == level)  /* corresponding upvalue? */
+      return p;  /* return it */
+    pp = &p->u.open.next;
+  }
+  /* not found: create a new upvalue after 'pp' */
+  return newupval(L, level, pp);
+}
+
+
+/*
+** Call closing method for object 'obj' with error message 'err'. The
+** boolean 'yy' controls whether the call is yieldable.
+** (This function assumes EXTRA_STACK.)
+*/
+static void callclosemethod (lua_State *L, TValue *obj, TValue *err, int yy) {
+  StkId top = L->top.p;
+  const TValue *tm = luaT_gettmbyobj(L, obj, TM_CLOSE);
+  setobj2s(L, top, tm);  /* will call metamethod... */
+  setobj2s(L, top + 1, obj);  /* with 'self' as the 1st argument */
+  setobj2s(L, top + 2, err);  /* and error msg. as 2nd argument */
+  L->top.p = top + 3;  /* add function and arguments */
+  if (yy)
+    luaD_call(L, top, 0);
+  else
+    luaD_callnoyield(L, top, 0);
+}
+
+
+/*
+** Check whether object at given level has a close metamethod and raise
+** an error if not.
+*/
+static void checkclosemth (lua_State *L, StkId level) {
+  const TValue *tm = luaT_gettmbyobj(L, s2v(level), TM_CLOSE);
+  if (ttisnil(tm)) {  /* no metamethod? */
+    int idx = cast_int(level - L->ci->func.p);  /* variable index */
+    const char *vname = luaG_findlocal(L, L->ci, idx, NULL);
+    if (vname == NULL) vname = "?";
+    luaG_runerror(L, "variable '%s' got a non-closable value", vname);
+  }
+}
+
+
+/*
+** Prepare and call a closing method.
+** If status is CLOSEKTOP, the call to the closing method will be pushed
+** at the top of the stack. Otherwise, values can be pushed right after
+** the 'level' of the upvalue being closed, as everything after that
+** won't be used again.
+*/
+static void prepcallclosemth (lua_State *L, StkId level, int status, int yy) {
+  TValue *uv = s2v(level);  /* value being closed */
+  TValue *errobj;
+  if (status == CLOSEKTOP)
+    errobj = &G(L)->nilvalue;  /* error object is nil */
+  else {  /* 'luaD_seterrorobj' will set top to level + 2 */
+    errobj = s2v(level + 1);  /* error object goes after 'uv' */
+    luaD_seterrorobj(L, status, level + 1);  /* set error object */
+  }
+  callclosemethod(L, uv, errobj, yy);
+}
+
+
+/*
+** Maximum value for deltas in 'tbclist', dependent on the type
+** of delta. (This macro assumes that an 'L' is in scope where it
+** is used.)
+*/
+#define MAXDELTA  \
+	((256ul << ((sizeof(L->stack.p->tbclist.delta) - 1) * 8)) - 1)
+
+
+/*
+** Insert a variable in the list of to-be-closed variables.
+*/
+void luaF_newtbcupval (lua_State *L, StkId level) {
+  lua_assert(level > L->tbclist.p);
+  if (l_isfalse(s2v(level)))
+    return;  /* false doesn't need to be closed */
+  checkclosemth(L, level);  /* value must have a close method */
+  while (cast_uint(level - L->tbclist.p) > MAXDELTA) {
+    L->tbclist.p += MAXDELTA;  /* create a dummy node at maximum delta */
+    L->tbclist.p->tbclist.delta = 0;
+  }
+  level->tbclist.delta = cast(unsigned short, level - L->tbclist.p);
+  L->tbclist.p = level;
+}
+
+
+void luaF_unlinkupval (UpVal *uv) {
+  lua_assert(upisopen(uv));
+  *uv->u.open.previous = uv->u.open.next;
+  if (uv->u.open.next)
+    uv->u.open.next->u.open.previous = uv->u.open.previous;
+}
+
+
+/*
+** Close all upvalues up to the given stack level.
+*/
+void luaF_closeupval (lua_State *L, StkId level) {
+  UpVal *uv;
+  StkId upl;  /* stack index pointed by 'uv' */
+  while ((uv = L->openupval) != NULL && (upl = uplevel(uv)) >= level) {
+    TValue *slot = &uv->u.value;  /* new position for value */
+    lua_assert(uplevel(uv) < L->top.p);
+    luaF_unlinkupval(uv);  /* remove upvalue from 'openupval' list */
+    setobj(L, slot, uv->v.p);  /* move value to upvalue slot */
+    uv->v.p = slot;  /* now current value lives here */
+    if (!iswhite(uv)) {  /* neither white nor dead? */
+      nw2black(uv);  /* closed upvalues cannot be gray */
+      luaC_barrier(L, uv, slot);
+    }
+  }
+}
+
+
+/*
+** Remove first element from the tbclist plus its dummy nodes.
+*/
+static void poptbclist (lua_State *L) {
+  StkId tbc = L->tbclist.p;
+  lua_assert(tbc->tbclist.delta > 0);  /* first element cannot be dummy */
+  tbc -= tbc->tbclist.delta;
+  while (tbc > L->stack.p && tbc->tbclist.delta == 0)
+    tbc -= MAXDELTA;  /* remove dummy nodes */
+  L->tbclist.p = tbc;
+}
+
+
+/*
+** Close all upvalues and to-be-closed variables up to the given stack
+** level. Return restored 'level'.
+*/
+StkId luaF_close (lua_State *L, StkId level, int status, int yy) {
+  ptrdiff_t levelrel = savestack(L, level);
+  luaF_closeupval(L, level);  /* first, close the upvalues */
+  while (L->tbclist.p >= level) {  /* traverse tbc's down to that level */
+    StkId tbc = L->tbclist.p;  /* get variable index */
+    poptbclist(L);  /* remove it from list */
+    prepcallclosemth(L, tbc, status, yy);  /* close variable */
+    level = restorestack(L, levelrel);
+  }
+  return level;
+}
+
+
+Proto *luaF_newproto (lua_State *L) {
+  GCObject *o = luaC_newobj(L, LUA_VPROTO, sizeof(Proto));
+  Proto *f = gco2p(o);
+  f->k = NULL;
+  f->sizek = 0;
+  f->p = NULL;
+  f->sizep = 0;
+  f->code = NULL;
+  f->sizecode = 0;
+  f->lineinfo = NULL;
+  f->sizelineinfo = 0;
+  f->abslineinfo = NULL;
+  f->sizeabslineinfo = 0;
+  f->upvalues = NULL;
+  f->sizeupvalues = 0;
+  f->numparams = 0;
+  f->is_vararg = 0;
+  f->maxstacksize = 0;
+  f->locvars = NULL;
+  f->sizelocvars = 0;
+  f->linedefined = 0;
+  f->lastlinedefined = 0;
+  f->source = NULL;
+  return f;
+}
+
+
+void luaF_freeproto (lua_State *L, Proto *f) {
+  luaM_freearray(L, f->code, f->sizecode);
+  luaM_freearray(L, f->p, f->sizep);
+  luaM_freearray(L, f->k, f->sizek);
+  luaM_freearray(L, f->lineinfo, f->sizelineinfo);
+  luaM_freearray(L, f->abslineinfo, f->sizeabslineinfo);
+  luaM_freearray(L, f->locvars, f->sizelocvars);
+  luaM_freearray(L, f->upvalues, f->sizeupvalues);
+  luaM_free(L, f);
+}
+
+
+/*
+** Look for n-th local variable at line 'line' in function 'func'.
+** Returns NULL if not found.
+*/
+const char *luaF_getlocalname (const Proto *f, int local_number, int pc) {
+  int i;
+  for (i = 0; i<f->sizelocvars && f->locvars[i].startpc <= pc; i++) {
+    if (pc < f->locvars[i].endpc) {  /* is variable active? */
+      local_number--;
+      if (local_number == 0)
+        return getstr(f->locvars[i].varname);
+    }
+  }
+  return NULL;  /* not found */
+}
+
diff --git a/src/libs/3rdparty/lua/src/lfunc.h b/src/libs/3rdparty/lua/src/lfunc.h
new file mode 100644
index 00000000000..3be265efb58
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lfunc.h
@@ -0,0 +1,64 @@
+/*
+** $Id: lfunc.h $
+** Auxiliary functions to manipulate prototypes and closures
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lfunc_h
+#define lfunc_h
+
+
+#include "lobject.h"
+
+
+#define sizeCclosure(n)	(cast_int(offsetof(CClosure, upvalue)) + \
+                         cast_int(sizeof(TValue)) * (n))
+
+#define sizeLclosure(n)	(cast_int(offsetof(LClosure, upvals)) + \
+                         cast_int(sizeof(TValue *)) * (n))
+
+
+/* test whether thread is in 'twups' list */
+#define isintwups(L)	(L->twups != L)
+
+
+/*
+** maximum number of upvalues in a closure (both C and Lua). (Value
+** must fit in a VM register.)
+*/
+#define MAXUPVAL	255
+
+
+#define upisopen(up)	((up)->v.p != &(up)->u.value)
+
+
+#define uplevel(up)	check_exp(upisopen(up), cast(StkId, (up)->v.p))
+
+
+/*
+** maximum number of misses before giving up the cache of closures
+** in prototypes
+*/
+#define MAXMISS		10
+
+
+
+/* special status to close upvalues preserving the top of the stack */
+#define CLOSEKTOP	(-1)
+
+
+LUAI_FUNC Proto *luaF_newproto (lua_State *L);
+LUAI_FUNC CClosure *luaF_newCclosure (lua_State *L, int nupvals);
+LUAI_FUNC LClosure *luaF_newLclosure (lua_State *L, int nupvals);
+LUAI_FUNC void luaF_initupvals (lua_State *L, LClosure *cl);
+LUAI_FUNC UpVal *luaF_findupval (lua_State *L, StkId level);
+LUAI_FUNC void luaF_newtbcupval (lua_State *L, StkId level);
+LUAI_FUNC void luaF_closeupval (lua_State *L, StkId level);
+LUAI_FUNC StkId luaF_close (lua_State *L, StkId level, int status, int yy);
+LUAI_FUNC void luaF_unlinkupval (UpVal *uv);
+LUAI_FUNC void luaF_freeproto (lua_State *L, Proto *f);
+LUAI_FUNC const char *luaF_getlocalname (const Proto *func, int local_number,
+                                         int pc);
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lgc.c b/src/libs/3rdparty/lua/src/lgc.c
new file mode 100644
index 00000000000..a3094ff5712
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lgc.c
@@ -0,0 +1,1739 @@
+/*
+** $Id: lgc.c $
+** Garbage Collector
+** See Copyright Notice in lua.h
+*/
+
+#define lgc_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+#include <stdio.h>
+#include <string.h>
+
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+
+
+/*
+** Maximum number of elements to sweep in each single step.
+** (Large enough to dissipate fixed overheads but small enough
+** to allow small steps for the collector.)
+*/
+#define GCSWEEPMAX	100
+
+/*
+** Maximum number of finalizers to call in each single step.
+*/
+#define GCFINMAX	10
+
+
+/*
+** Cost of calling one finalizer.
+*/
+#define GCFINALIZECOST	50
+
+
+/*
+** The equivalent, in bytes, of one unit of "work" (visiting a slot,
+** sweeping an object, etc.)
+*/
+#define WORK2MEM	sizeof(TValue)
+
+
+/*
+** macro to adjust 'pause': 'pause' is actually used like
+** 'pause / PAUSEADJ' (value chosen by tests)
+*/
+#define PAUSEADJ		100
+
+
+/* mask with all color bits */
+#define maskcolors	(bitmask(BLACKBIT) | WHITEBITS)
+
+/* mask with all GC bits */
+#define maskgcbits      (maskcolors | AGEBITS)
+
+
+/* macro to erase all color bits then set only the current white bit */
+#define makewhite(g,x)	\
+  (x->marked = cast_byte((x->marked & ~maskcolors) | luaC_white(g)))
+
+/* make an object gray (neither white nor black) */
+#define set2gray(x)	resetbits(x->marked, maskcolors)
+
+
+/* make an object black (coming from any color) */
+#define set2black(x)  \
+  (x->marked = cast_byte((x->marked & ~WHITEBITS) | bitmask(BLACKBIT)))
+
+
+#define valiswhite(x)   (iscollectable(x) && iswhite(gcvalue(x)))
+
+#define keyiswhite(n)   (keyiscollectable(n) && iswhite(gckey(n)))
+
+
+/*
+** Protected access to objects in values
+*/
+#define gcvalueN(o)     (iscollectable(o) ? gcvalue(o) : NULL)
+
+
+#define markvalue(g,o) { checkliveness(g->mainthread,o); \
+  if (valiswhite(o)) reallymarkobject(g,gcvalue(o)); }
+
+#define markkey(g, n)	{ if keyiswhite(n) reallymarkobject(g,gckey(n)); }
+
+#define markobject(g,t)	{ if (iswhite(t)) reallymarkobject(g, obj2gco(t)); }
+
+/*
+** mark an object that can be NULL (either because it is really optional,
+** or it was stripped as debug info, or inside an uncompleted structure)
+*/
+#define markobjectN(g,t)	{ if (t) markobject(g,t); }
+
+static void reallymarkobject (global_State *g, GCObject *o);
+static lu_mem atomic (lua_State *L);
+static void entersweep (lua_State *L);
+
+
+/*
+** {======================================================
+** Generic functions
+** =======================================================
+*/
+
+
+/*
+** one after last element in a hash array
+*/
+#define gnodelast(h)	gnode(h, cast_sizet(sizenode(h)))
+
+
+static GCObject **getgclist (GCObject *o) {
+  switch (o->tt) {
+    case LUA_VTABLE: return &gco2t(o)->gclist;
+    case LUA_VLCL: return &gco2lcl(o)->gclist;
+    case LUA_VCCL: return &gco2ccl(o)->gclist;
+    case LUA_VTHREAD: return &gco2th(o)->gclist;
+    case LUA_VPROTO: return &gco2p(o)->gclist;
+    case LUA_VUSERDATA: {
+      Udata *u = gco2u(o);
+      lua_assert(u->nuvalue > 0);
+      return &u->gclist;
+    }
+    default: lua_assert(0); return 0;
+  }
+}
+
+
+/*
+** Link a collectable object 'o' with a known type into the list 'p'.
+** (Must be a macro to access the 'gclist' field in different types.)
+*/
+#define linkgclist(o,p)	linkgclist_(obj2gco(o), &(o)->gclist, &(p))
+
+static void linkgclist_ (GCObject *o, GCObject **pnext, GCObject **list) {
+  lua_assert(!isgray(o));  /* cannot be in a gray list */
+  *pnext = *list;
+  *list = o;
+  set2gray(o);  /* now it is */
+}
+
+
+/*
+** Link a generic collectable object 'o' into the list 'p'.
+*/
+#define linkobjgclist(o,p) linkgclist_(obj2gco(o), getgclist(o), &(p))
+
+
+
+/*
+** Clear keys for empty entries in tables. If entry is empty, mark its
+** entry as dead. This allows the collection of the key, but keeps its
+** entry in the table: its removal could break a chain and could break
+** a table traversal.  Other places never manipulate dead keys, because
+** its associated empty value is enough to signal that the entry is
+** logically empty.
+*/
+static void clearkey (Node *n) {
+  lua_assert(isempty(gval(n)));
+  if (keyiscollectable(n))
+    setdeadkey(n);  /* unused key; remove it */
+}
+
+
+/*
+** tells whether a key or value can be cleared from a weak
+** table. Non-collectable objects are never removed from weak
+** tables. Strings behave as 'values', so are never removed too. for
+** other objects: if really collected, cannot keep them; for objects
+** being finalized, keep them in keys, but not in values
+*/
+static int iscleared (global_State *g, const GCObject *o) {
+  if (o == NULL) return 0;  /* non-collectable value */
+  else if (novariant(o->tt) == LUA_TSTRING) {
+    markobject(g, o);  /* strings are 'values', so are never weak */
+    return 0;
+  }
+  else return iswhite(o);
+}
+
+
+/*
+** Barrier that moves collector forward, that is, marks the white object
+** 'v' being pointed by the black object 'o'.  In the generational
+** mode, 'v' must also become old, if 'o' is old; however, it cannot
+** be changed directly to OLD, because it may still point to non-old
+** objects. So, it is marked as OLD0. In the next cycle it will become
+** OLD1, and in the next it will finally become OLD (regular old). By
+** then, any object it points to will also be old.  If called in the
+** incremental sweep phase, it clears the black object to white (sweep
+** it) to avoid other barrier calls for this same object. (That cannot
+** be done is generational mode, as its sweep does not distinguish
+** whites from deads.)
+*/
+void luaC_barrier_ (lua_State *L, GCObject *o, GCObject *v) {
+  global_State *g = G(L);
+  lua_assert(isblack(o) && iswhite(v) && !isdead(g, v) && !isdead(g, o));
+  if (keepinvariant(g)) {  /* must keep invariant? */
+    reallymarkobject(g, v);  /* restore invariant */
+    if (isold(o)) {
+      lua_assert(!isold(v));  /* white object could not be old */
+      setage(v, G_OLD0);  /* restore generational invariant */
+    }
+  }
+  else {  /* sweep phase */
+    lua_assert(issweepphase(g));
+    if (g->gckind == KGC_INC)  /* incremental mode? */
+      makewhite(g, o);  /* mark 'o' as white to avoid other barriers */
+  }
+}
+
+
+/*
+** barrier that moves collector backward, that is, mark the black object
+** pointing to a white object as gray again.
+*/
+void luaC_barrierback_ (lua_State *L, GCObject *o) {
+  global_State *g = G(L);
+  lua_assert(isblack(o) && !isdead(g, o));
+  lua_assert((g->gckind == KGC_GEN) == (isold(o) && getage(o) != G_TOUCHED1));
+  if (getage(o) == G_TOUCHED2)  /* already in gray list? */
+    set2gray(o);  /* make it gray to become touched1 */
+  else  /* link it in 'grayagain' and paint it gray */
+    linkobjgclist(o, g->grayagain);
+  if (isold(o))  /* generational mode? */
+    setage(o, G_TOUCHED1);  /* touched in current cycle */
+}
+
+
+void luaC_fix (lua_State *L, GCObject *o) {
+  global_State *g = G(L);
+  lua_assert(g->allgc == o);  /* object must be 1st in 'allgc' list! */
+  set2gray(o);  /* they will be gray forever */
+  setage(o, G_OLD);  /* and old forever */
+  g->allgc = o->next;  /* remove object from 'allgc' list */
+  o->next = g->fixedgc;  /* link it to 'fixedgc' list */
+  g->fixedgc = o;
+}
+
+
+/*
+** create a new collectable object (with given type, size, and offset)
+** and link it to 'allgc' list.
+*/
+GCObject *luaC_newobjdt (lua_State *L, int tt, size_t sz, size_t offset) {
+  global_State *g = G(L);
+  char *p = cast_charp(luaM_newobject(L, novariant(tt), sz));
+  GCObject *o = cast(GCObject *, p + offset);
+  o->marked = luaC_white(g);
+  o->tt = tt;
+  o->next = g->allgc;
+  g->allgc = o;
+  return o;
+}
+
+
+GCObject *luaC_newobj (lua_State *L, int tt, size_t sz) {
+  return luaC_newobjdt(L, tt, sz, 0);
+}
+
+/* }====================================================== */
+
+
+
+/*
+** {======================================================
+** Mark functions
+** =======================================================
+*/
+
+
+/*
+** Mark an object.  Userdata with no user values, strings, and closed
+** upvalues are visited and turned black here.  Open upvalues are
+** already indirectly linked through their respective threads in the
+** 'twups' list, so they don't go to the gray list; nevertheless, they
+** are kept gray to avoid barriers, as their values will be revisited
+** by the thread or by 'remarkupvals'.  Other objects are added to the
+** gray list to be visited (and turned black) later.  Both userdata and
+** upvalues can call this function recursively, but this recursion goes
+** for at most two levels: An upvalue cannot refer to another upvalue
+** (only closures can), and a userdata's metatable must be a table.
+*/
+static void reallymarkobject (global_State *g, GCObject *o) {
+  switch (o->tt) {
+    case LUA_VSHRSTR:
+    case LUA_VLNGSTR: {
+      set2black(o);  /* nothing to visit */
+      break;
+    }
+    case LUA_VUPVAL: {
+      UpVal *uv = gco2upv(o);
+      if (upisopen(uv))
+        set2gray(uv);  /* open upvalues are kept gray */
+      else
+        set2black(uv);  /* closed upvalues are visited here */
+      markvalue(g, uv->v.p);  /* mark its content */
+      break;
+    }
+    case LUA_VUSERDATA: {
+      Udata *u = gco2u(o);
+      if (u->nuvalue == 0) {  /* no user values? */
+        markobjectN(g, u->metatable);  /* mark its metatable */
+        set2black(u);  /* nothing else to mark */
+        break;
+      }
+      /* else... */
+    }  /* FALLTHROUGH */
+    case LUA_VLCL: case LUA_VCCL: case LUA_VTABLE:
+    case LUA_VTHREAD: case LUA_VPROTO: {
+      linkobjgclist(o, g->gray);  /* to be visited later */
+      break;
+    }
+    default: lua_assert(0); break;
+  }
+}
+
+
+/*
+** mark metamethods for basic types
+*/
+static void markmt (global_State *g) {
+  int i;
+  for (i=0; i < LUA_NUMTAGS; i++)
+    markobjectN(g, g->mt[i]);
+}
+
+
+/*
+** mark all objects in list of being-finalized
+*/
+static lu_mem markbeingfnz (global_State *g) {
+  GCObject *o;
+  lu_mem count = 0;
+  for (o = g->tobefnz; o != NULL; o = o->next) {
+    count++;
+    markobject(g, o);
+  }
+  return count;
+}
+
+
+/*
+** For each non-marked thread, simulates a barrier between each open
+** upvalue and its value. (If the thread is collected, the value will be
+** assigned to the upvalue, but then it can be too late for the barrier
+** to act. The "barrier" does not need to check colors: A non-marked
+** thread must be young; upvalues cannot be older than their threads; so
+** any visited upvalue must be young too.) Also removes the thread from
+** the list, as it was already visited. Removes also threads with no
+** upvalues, as they have nothing to be checked. (If the thread gets an
+** upvalue later, it will be linked in the list again.)
+*/
+static int remarkupvals (global_State *g) {
+  lua_State *thread;
+  lua_State **p = &g->twups;
+  int work = 0;  /* estimate of how much work was done here */
+  while ((thread = *p) != NULL) {
+    work++;
+    if (!iswhite(thread) && thread->openupval != NULL)
+      p = &thread->twups;  /* keep marked thread with upvalues in the list */
+    else {  /* thread is not marked or without upvalues */
+      UpVal *uv;
+      lua_assert(!isold(thread) || thread->openupval == NULL);
+      *p = thread->twups;  /* remove thread from the list */
+      thread->twups = thread;  /* mark that it is out of list */
+      for (uv = thread->openupval; uv != NULL; uv = uv->u.open.next) {
+        lua_assert(getage(uv) <= getage(thread));
+        work++;
+        if (!iswhite(uv)) {  /* upvalue already visited? */
+          lua_assert(upisopen(uv) && isgray(uv));
+          markvalue(g, uv->v.p);  /* mark its value */
+        }
+      }
+    }
+  }
+  return work;
+}
+
+
+static void cleargraylists (global_State *g) {
+  g->gray = g->grayagain = NULL;
+  g->weak = g->allweak = g->ephemeron = NULL;
+}
+
+
+/*
+** mark root set and reset all gray lists, to start a new collection
+*/
+static void restartcollection (global_State *g) {
+  cleargraylists(g);
+  markobject(g, g->mainthread);
+  markvalue(g, &g->l_registry);
+  markmt(g);
+  markbeingfnz(g);  /* mark any finalizing object left from previous cycle */
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Traverse functions
+** =======================================================
+*/
+
+
+/*
+** Check whether object 'o' should be kept in the 'grayagain' list for
+** post-processing by 'correctgraylist'. (It could put all old objects
+** in the list and leave all the work to 'correctgraylist', but it is
+** more efficient to avoid adding elements that will be removed.) Only
+** TOUCHED1 objects need to be in the list. TOUCHED2 doesn't need to go
+** back to a gray list, but then it must become OLD. (That is what
+** 'correctgraylist' does when it finds a TOUCHED2 object.)
+*/
+static void genlink (global_State *g, GCObject *o) {
+  lua_assert(isblack(o));
+  if (getage(o) == G_TOUCHED1) {  /* touched in this cycle? */
+    linkobjgclist(o, g->grayagain);  /* link it back in 'grayagain' */
+  }  /* everything else do not need to be linked back */
+  else if (getage(o) == G_TOUCHED2)
+    changeage(o, G_TOUCHED2, G_OLD);  /* advance age */
+}
+
+
+/*
+** Traverse a table with weak values and link it to proper list. During
+** propagate phase, keep it in 'grayagain' list, to be revisited in the
+** atomic phase. In the atomic phase, if table has any white value,
+** put it in 'weak' list, to be cleared.
+*/
+static void traverseweakvalue (global_State *g, Table *h) {
+  Node *n, *limit = gnodelast(h);
+  /* if there is array part, assume it may have white values (it is not
+     worth traversing it now just to check) */
+  int hasclears = (h->alimit > 0);
+  for (n = gnode(h, 0); n < limit; n++) {  /* traverse hash part */
+    if (isempty(gval(n)))  /* entry is empty? */
+      clearkey(n);  /* clear its key */
+    else {
+      lua_assert(!keyisnil(n));
+      markkey(g, n);
+      if (!hasclears && iscleared(g, gcvalueN(gval(n))))  /* a white value? */
+        hasclears = 1;  /* table will have to be cleared */
+    }
+  }
+  if (g->gcstate == GCSatomic && hasclears)
+    linkgclist(h, g->weak);  /* has to be cleared later */
+  else
+    linkgclist(h, g->grayagain);  /* must retraverse it in atomic phase */
+}
+
+
+/*
+** Traverse an ephemeron table and link it to proper list. Returns true
+** iff any object was marked during this traversal (which implies that
+** convergence has to continue). During propagation phase, keep table
+** in 'grayagain' list, to be visited again in the atomic phase. In
+** the atomic phase, if table has any white->white entry, it has to
+** be revisited during ephemeron convergence (as that key may turn
+** black). Otherwise, if it has any white key, table has to be cleared
+** (in the atomic phase). In generational mode, some tables
+** must be kept in some gray list for post-processing; this is done
+** by 'genlink'.
+*/
+static int traverseephemeron (global_State *g, Table *h, int inv) {
+  int marked = 0;  /* true if an object is marked in this traversal */
+  int hasclears = 0;  /* true if table has white keys */
+  int hasww = 0;  /* true if table has entry "white-key -> white-value" */
+  unsigned int i;
+  unsigned int asize = luaH_realasize(h);
+  unsigned int nsize = sizenode(h);
+  /* traverse array part */
+  for (i = 0; i < asize; i++) {
+    if (valiswhite(&h->array[i])) {
+      marked = 1;
+      reallymarkobject(g, gcvalue(&h->array[i]));
+    }
+  }
+  /* traverse hash part; if 'inv', traverse descending
+     (see 'convergeephemerons') */
+  for (i = 0; i < nsize; i++) {
+    Node *n = inv ? gnode(h, nsize - 1 - i) : gnode(h, i);
+    if (isempty(gval(n)))  /* entry is empty? */
+      clearkey(n);  /* clear its key */
+    else if (iscleared(g, gckeyN(n))) {  /* key is not marked (yet)? */
+      hasclears = 1;  /* table must be cleared */
+      if (valiswhite(gval(n)))  /* value not marked yet? */
+        hasww = 1;  /* white-white entry */
+    }
+    else if (valiswhite(gval(n))) {  /* value not marked yet? */
+      marked = 1;
+      reallymarkobject(g, gcvalue(gval(n)));  /* mark it now */
+    }
+  }
+  /* link table into proper list */
+  if (g->gcstate == GCSpropagate)
+    linkgclist(h, g->grayagain);  /* must retraverse it in atomic phase */
+  else if (hasww)  /* table has white->white entries? */
+    linkgclist(h, g->ephemeron);  /* have to propagate again */
+  else if (hasclears)  /* table has white keys? */
+    linkgclist(h, g->allweak);  /* may have to clean white keys */
+  else
+    genlink(g, obj2gco(h));  /* check whether collector still needs to see it */
+  return marked;
+}
+
+
+static void traversestrongtable (global_State *g, Table *h) {
+  Node *n, *limit = gnodelast(h);
+  unsigned int i;
+  unsigned int asize = luaH_realasize(h);
+  for (i = 0; i < asize; i++)  /* traverse array part */
+    markvalue(g, &h->array[i]);
+  for (n = gnode(h, 0); n < limit; n++) {  /* traverse hash part */
+    if (isempty(gval(n)))  /* entry is empty? */
+      clearkey(n);  /* clear its key */
+    else {
+      lua_assert(!keyisnil(n));
+      markkey(g, n);
+      markvalue(g, gval(n));
+    }
+  }
+  genlink(g, obj2gco(h));
+}
+
+
+static lu_mem traversetable (global_State *g, Table *h) {
+  const char *weakkey, *weakvalue;
+  const TValue *mode = gfasttm(g, h->metatable, TM_MODE);
+  markobjectN(g, h->metatable);
+  if (mode && ttisstring(mode) &&  /* is there a weak mode? */
+      (cast_void(weakkey = strchr(svalue(mode), 'k')),
+       cast_void(weakvalue = strchr(svalue(mode), 'v')),
+       (weakkey || weakvalue))) {  /* is really weak? */
+    if (!weakkey)  /* strong keys? */
+      traverseweakvalue(g, h);
+    else if (!weakvalue)  /* strong values? */
+      traverseephemeron(g, h, 0);
+    else  /* all weak */
+      linkgclist(h, g->allweak);  /* nothing to traverse now */
+  }
+  else  /* not weak */
+    traversestrongtable(g, h);
+  return 1 + h->alimit + 2 * allocsizenode(h);
+}
+
+
+static int traverseudata (global_State *g, Udata *u) {
+  int i;
+  markobjectN(g, u->metatable);  /* mark its metatable */
+  for (i = 0; i < u->nuvalue; i++)
+    markvalue(g, &u->uv[i].uv);
+  genlink(g, obj2gco(u));
+  return 1 + u->nuvalue;
+}
+
+
+/*
+** Traverse a prototype. (While a prototype is being build, its
+** arrays can be larger than needed; the extra slots are filled with
+** NULL, so the use of 'markobjectN')
+*/
+static int traverseproto (global_State *g, Proto *f) {
+  int i;
+  markobjectN(g, f->source);
+  for (i = 0; i < f->sizek; i++)  /* mark literals */
+    markvalue(g, &f->k[i]);
+  for (i = 0; i < f->sizeupvalues; i++)  /* mark upvalue names */
+    markobjectN(g, f->upvalues[i].name);
+  for (i = 0; i < f->sizep; i++)  /* mark nested protos */
+    markobjectN(g, f->p[i]);
+  for (i = 0; i < f->sizelocvars; i++)  /* mark local-variable names */
+    markobjectN(g, f->locvars[i].varname);
+  return 1 + f->sizek + f->sizeupvalues + f->sizep + f->sizelocvars;
+}
+
+
+static int traverseCclosure (global_State *g, CClosure *cl) {
+  int i;
+  for (i = 0; i < cl->nupvalues; i++)  /* mark its upvalues */
+    markvalue(g, &cl->upvalue[i]);
+  return 1 + cl->nupvalues;
+}
+
+/*
+** Traverse a Lua closure, marking its prototype and its upvalues.
+** (Both can be NULL while closure is being created.)
+*/
+static int traverseLclosure (global_State *g, LClosure *cl) {
+  int i;
+  markobjectN(g, cl->p);  /* mark its prototype */
+  for (i = 0; i < cl->nupvalues; i++) {  /* visit its upvalues */
+    UpVal *uv = cl->upvals[i];
+    markobjectN(g, uv);  /* mark upvalue */
+  }
+  return 1 + cl->nupvalues;
+}
+
+
+/*
+** Traverse a thread, marking the elements in the stack up to its top
+** and cleaning the rest of the stack in the final traversal. That
+** ensures that the entire stack have valid (non-dead) objects.
+** Threads have no barriers. In gen. mode, old threads must be visited
+** at every cycle, because they might point to young objects.  In inc.
+** mode, the thread can still be modified before the end of the cycle,
+** and therefore it must be visited again in the atomic phase. To ensure
+** these visits, threads must return to a gray list if they are not new
+** (which can only happen in generational mode) or if the traverse is in
+** the propagate phase (which can only happen in incremental mode).
+*/
+static int traversethread (global_State *g, lua_State *th) {
+  UpVal *uv;
+  StkId o = th->stack.p;
+  if (isold(th) || g->gcstate == GCSpropagate)
+    linkgclist(th, g->grayagain);  /* insert into 'grayagain' list */
+  if (o == NULL)
+    return 1;  /* stack not completely built yet */
+  lua_assert(g->gcstate == GCSatomic ||
+             th->openupval == NULL || isintwups(th));
+  for (; o < th->top.p; o++)  /* mark live elements in the stack */
+    markvalue(g, s2v(o));
+  for (uv = th->openupval; uv != NULL; uv = uv->u.open.next)
+    markobject(g, uv);  /* open upvalues cannot be collected */
+  if (g->gcstate == GCSatomic) {  /* final traversal? */
+    for (; o < th->stack_last.p + EXTRA_STACK; o++)
+      setnilvalue(s2v(o));  /* clear dead stack slice */
+    /* 'remarkupvals' may have removed thread from 'twups' list */
+    if (!isintwups(th) && th->openupval != NULL) {
+      th->twups = g->twups;  /* link it back to the list */
+      g->twups = th;
+    }
+  }
+  else if (!g->gcemergency)
+    luaD_shrinkstack(th); /* do not change stack in emergency cycle */
+  return 1 + stacksize(th);
+}
+
+
+/*
+** traverse one gray object, turning it to black.
+*/
+static lu_mem propagatemark (global_State *g) {
+  GCObject *o = g->gray;
+  nw2black(o);
+  g->gray = *getgclist(o);  /* remove from 'gray' list */
+  switch (o->tt) {
+    case LUA_VTABLE: return traversetable(g, gco2t(o));
+    case LUA_VUSERDATA: return traverseudata(g, gco2u(o));
+    case LUA_VLCL: return traverseLclosure(g, gco2lcl(o));
+    case LUA_VCCL: return traverseCclosure(g, gco2ccl(o));
+    case LUA_VPROTO: return traverseproto(g, gco2p(o));
+    case LUA_VTHREAD: return traversethread(g, gco2th(o));
+    default: lua_assert(0); return 0;
+  }
+}
+
+
+static lu_mem propagateall (global_State *g) {
+  lu_mem tot = 0;
+  while (g->gray)
+    tot += propagatemark(g);
+  return tot;
+}
+
+
+/*
+** Traverse all ephemeron tables propagating marks from keys to values.
+** Repeat until it converges, that is, nothing new is marked. 'dir'
+** inverts the direction of the traversals, trying to speed up
+** convergence on chains in the same table.
+**
+*/
+static void convergeephemerons (global_State *g) {
+  int changed;
+  int dir = 0;
+  do {
+    GCObject *w;
+    GCObject *next = g->ephemeron;  /* get ephemeron list */
+    g->ephemeron = NULL;  /* tables may return to this list when traversed */
+    changed = 0;
+    while ((w = next) != NULL) {  /* for each ephemeron table */
+      Table *h = gco2t(w);
+      next = h->gclist;  /* list is rebuilt during loop */
+      nw2black(h);  /* out of the list (for now) */
+      if (traverseephemeron(g, h, dir)) {  /* marked some value? */
+        propagateall(g);  /* propagate changes */
+        changed = 1;  /* will have to revisit all ephemeron tables */
+      }
+    }
+    dir = !dir;  /* invert direction next time */
+  } while (changed);  /* repeat until no more changes */
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Sweep Functions
+** =======================================================
+*/
+
+
+/*
+** clear entries with unmarked keys from all weaktables in list 'l'
+*/
+static void clearbykeys (global_State *g, GCObject *l) {
+  for (; l; l = gco2t(l)->gclist) {
+    Table *h = gco2t(l);
+    Node *limit = gnodelast(h);
+    Node *n;
+    for (n = gnode(h, 0); n < limit; n++) {
+      if (iscleared(g, gckeyN(n)))  /* unmarked key? */
+        setempty(gval(n));  /* remove entry */
+      if (isempty(gval(n)))  /* is entry empty? */
+        clearkey(n);  /* clear its key */
+    }
+  }
+}
+
+
+/*
+** clear entries with unmarked values from all weaktables in list 'l' up
+** to element 'f'
+*/
+static void clearbyvalues (global_State *g, GCObject *l, GCObject *f) {
+  for (; l != f; l = gco2t(l)->gclist) {
+    Table *h = gco2t(l);
+    Node *n, *limit = gnodelast(h);
+    unsigned int i;
+    unsigned int asize = luaH_realasize(h);
+    for (i = 0; i < asize; i++) {
+      TValue *o = &h->array[i];
+      if (iscleared(g, gcvalueN(o)))  /* value was collected? */
+        setempty(o);  /* remove entry */
+    }
+    for (n = gnode(h, 0); n < limit; n++) {
+      if (iscleared(g, gcvalueN(gval(n))))  /* unmarked value? */
+        setempty(gval(n));  /* remove entry */
+      if (isempty(gval(n)))  /* is entry empty? */
+        clearkey(n);  /* clear its key */
+    }
+  }
+}
+
+
+static void freeupval (lua_State *L, UpVal *uv) {
+  if (upisopen(uv))
+    luaF_unlinkupval(uv);
+  luaM_free(L, uv);
+}
+
+
+static void freeobj (lua_State *L, GCObject *o) {
+  switch (o->tt) {
+    case LUA_VPROTO:
+      luaF_freeproto(L, gco2p(o));
+      break;
+    case LUA_VUPVAL:
+      freeupval(L, gco2upv(o));
+      break;
+    case LUA_VLCL: {
+      LClosure *cl = gco2lcl(o);
+      luaM_freemem(L, cl, sizeLclosure(cl->nupvalues));
+      break;
+    }
+    case LUA_VCCL: {
+      CClosure *cl = gco2ccl(o);
+      luaM_freemem(L, cl, sizeCclosure(cl->nupvalues));
+      break;
+    }
+    case LUA_VTABLE:
+      luaH_free(L, gco2t(o));
+      break;
+    case LUA_VTHREAD:
+      luaE_freethread(L, gco2th(o));
+      break;
+    case LUA_VUSERDATA: {
+      Udata *u = gco2u(o);
+      luaM_freemem(L, o, sizeudata(u->nuvalue, u->len));
+      break;
+    }
+    case LUA_VSHRSTR: {
+      TString *ts = gco2ts(o);
+      luaS_remove(L, ts);  /* remove it from hash table */
+      luaM_freemem(L, ts, sizelstring(ts->shrlen));
+      break;
+    }
+    case LUA_VLNGSTR: {
+      TString *ts = gco2ts(o);
+      luaM_freemem(L, ts, sizelstring(ts->u.lnglen));
+      break;
+    }
+    default: lua_assert(0);
+  }
+}
+
+
+/*
+** sweep at most 'countin' elements from a list of GCObjects erasing dead
+** objects, where a dead object is one marked with the old (non current)
+** white; change all non-dead objects back to white, preparing for next
+** collection cycle. Return where to continue the traversal or NULL if
+** list is finished. ('*countout' gets the number of elements traversed.)
+*/
+static GCObject **sweeplist (lua_State *L, GCObject **p, int countin,
+                             int *countout) {
+  global_State *g = G(L);
+  int ow = otherwhite(g);
+  int i;
+  int white = luaC_white(g);  /* current white */
+  for (i = 0; *p != NULL && i < countin; i++) {
+    GCObject *curr = *p;
+    int marked = curr->marked;
+    if (isdeadm(ow, marked)) {  /* is 'curr' dead? */
+      *p = curr->next;  /* remove 'curr' from list */
+      freeobj(L, curr);  /* erase 'curr' */
+    }
+    else {  /* change mark to 'white' */
+      curr->marked = cast_byte((marked & ~maskgcbits) | white);
+      p = &curr->next;  /* go to next element */
+    }
+  }
+  if (countout)
+    *countout = i;  /* number of elements traversed */
+  return (*p == NULL) ? NULL : p;
+}
+
+
+/*
+** sweep a list until a live object (or end of list)
+*/
+static GCObject **sweeptolive (lua_State *L, GCObject **p) {
+  GCObject **old = p;
+  do {
+    p = sweeplist(L, p, 1, NULL);
+  } while (p == old);
+  return p;
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Finalization
+** =======================================================
+*/
+
+/*
+** If possible, shrink string table.
+*/
+static void checkSizes (lua_State *L, global_State *g) {
+  if (!g->gcemergency) {
+    if (g->strt.nuse < g->strt.size / 4) {  /* string table too big? */
+      l_mem olddebt = g->GCdebt;
+      luaS_resize(L, g->strt.size / 2);
+      g->GCestimate += g->GCdebt - olddebt;  /* correct estimate */
+    }
+  }
+}
+
+
+/*
+** Get the next udata to be finalized from the 'tobefnz' list, and
+** link it back into the 'allgc' list.
+*/
+static GCObject *udata2finalize (global_State *g) {
+  GCObject *o = g->tobefnz;  /* get first element */
+  lua_assert(tofinalize(o));
+  g->tobefnz = o->next;  /* remove it from 'tobefnz' list */
+  o->next = g->allgc;  /* return it to 'allgc' list */
+  g->allgc = o;
+  resetbit(o->marked, FINALIZEDBIT);  /* object is "normal" again */
+  if (issweepphase(g))
+    makewhite(g, o);  /* "sweep" object */
+  else if (getage(o) == G_OLD1)
+    g->firstold1 = o;  /* it is the first OLD1 object in the list */
+  return o;
+}
+
+
+static void dothecall (lua_State *L, void *ud) {
+  UNUSED(ud);
+  luaD_callnoyield(L, L->top.p - 2, 0);
+}
+
+
+static void GCTM (lua_State *L) {
+  global_State *g = G(L);
+  const TValue *tm;
+  TValue v;
+  lua_assert(!g->gcemergency);
+  setgcovalue(L, &v, udata2finalize(g));
+  tm = luaT_gettmbyobj(L, &v, TM_GC);
+  if (!notm(tm)) {  /* is there a finalizer? */
+    int status;
+    lu_byte oldah = L->allowhook;
+    int oldgcstp  = g->gcstp;
+    g->gcstp |= GCSTPGC;  /* avoid GC steps */
+    L->allowhook = 0;  /* stop debug hooks during GC metamethod */
+    setobj2s(L, L->top.p++, tm);  /* push finalizer... */
+    setobj2s(L, L->top.p++, &v);  /* ... and its argument */
+    L->ci->callstatus |= CIST_FIN;  /* will run a finalizer */
+    status = luaD_pcall(L, dothecall, NULL, savestack(L, L->top.p - 2), 0);
+    L->ci->callstatus &= ~CIST_FIN;  /* not running a finalizer anymore */
+    L->allowhook = oldah;  /* restore hooks */
+    g->gcstp = oldgcstp;  /* restore state */
+    if (l_unlikely(status != LUA_OK)) {  /* error while running __gc? */
+      luaE_warnerror(L, "__gc");
+      L->top.p--;  /* pops error object */
+    }
+  }
+}
+
+
+/*
+** Call a few finalizers
+*/
+static int runafewfinalizers (lua_State *L, int n) {
+  global_State *g = G(L);
+  int i;
+  for (i = 0; i < n && g->tobefnz; i++)
+    GCTM(L);  /* call one finalizer */
+  return i;
+}
+
+
+/*
+** call all pending finalizers
+*/
+static void callallpendingfinalizers (lua_State *L) {
+  global_State *g = G(L);
+  while (g->tobefnz)
+    GCTM(L);
+}
+
+
+/*
+** find last 'next' field in list 'p' list (to add elements in its end)
+*/
+static GCObject **findlast (GCObject **p) {
+  while (*p != NULL)
+    p = &(*p)->next;
+  return p;
+}
+
+
+/*
+** Move all unreachable objects (or 'all' objects) that need
+** finalization from list 'finobj' to list 'tobefnz' (to be finalized).
+** (Note that objects after 'finobjold1' cannot be white, so they
+** don't need to be traversed. In incremental mode, 'finobjold1' is NULL,
+** so the whole list is traversed.)
+*/
+static void separatetobefnz (global_State *g, int all) {
+  GCObject *curr;
+  GCObject **p = &g->finobj;
+  GCObject **lastnext = findlast(&g->tobefnz);
+  while ((curr = *p) != g->finobjold1) {  /* traverse all finalizable objects */
+    lua_assert(tofinalize(curr));
+    if (!(iswhite(curr) || all))  /* not being collected? */
+      p = &curr->next;  /* don't bother with it */
+    else {
+      if (curr == g->finobjsur)  /* removing 'finobjsur'? */
+        g->finobjsur = curr->next;  /* correct it */
+      *p = curr->next;  /* remove 'curr' from 'finobj' list */
+      curr->next = *lastnext;  /* link at the end of 'tobefnz' list */
+      *lastnext = curr;
+      lastnext = &curr->next;
+    }
+  }
+}
+
+
+/*
+** If pointer 'p' points to 'o', move it to the next element.
+*/
+static void checkpointer (GCObject **p, GCObject *o) {
+  if (o == *p)
+    *p = o->next;
+}
+
+
+/*
+** Correct pointers to objects inside 'allgc' list when
+** object 'o' is being removed from the list.
+*/
+static void correctpointers (global_State *g, GCObject *o) {
+  checkpointer(&g->survival, o);
+  checkpointer(&g->old1, o);
+  checkpointer(&g->reallyold, o);
+  checkpointer(&g->firstold1, o);
+}
+
+
+/*
+** if object 'o' has a finalizer, remove it from 'allgc' list (must
+** search the list to find it) and link it in 'finobj' list.
+*/
+void luaC_checkfinalizer (lua_State *L, GCObject *o, Table *mt) {
+  global_State *g = G(L);
+  if (tofinalize(o) ||                 /* obj. is already marked... */
+      gfasttm(g, mt, TM_GC) == NULL ||    /* or has no finalizer... */
+      (g->gcstp & GCSTPCLS))                   /* or closing state? */
+    return;  /* nothing to be done */
+  else {  /* move 'o' to 'finobj' list */
+    GCObject **p;
+    if (issweepphase(g)) {
+      makewhite(g, o);  /* "sweep" object 'o' */
+      if (g->sweepgc == &o->next)  /* should not remove 'sweepgc' object */
+        g->sweepgc = sweeptolive(L, g->sweepgc);  /* change 'sweepgc' */
+    }
+    else
+      correctpointers(g, o);
+    /* search for pointer pointing to 'o' */
+    for (p = &g->allgc; *p != o; p = &(*p)->next) { /* empty */ }
+    *p = o->next;  /* remove 'o' from 'allgc' list */
+    o->next = g->finobj;  /* link it in 'finobj' list */
+    g->finobj = o;
+    l_setbit(o->marked, FINALIZEDBIT);  /* mark it as such */
+  }
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Generational Collector
+** =======================================================
+*/
+
+
+/*
+** Set the "time" to wait before starting a new GC cycle; cycle will
+** start when memory use hits the threshold of ('estimate' * pause /
+** PAUSEADJ). (Division by 'estimate' should be OK: it cannot be zero,
+** because Lua cannot even start with less than PAUSEADJ bytes).
+*/
+static void setpause (global_State *g) {
+  l_mem threshold, debt;
+  int pause = getgcparam(g->gcpause);
+  l_mem estimate = g->GCestimate / PAUSEADJ;  /* adjust 'estimate' */
+  lua_assert(estimate > 0);
+  threshold = (pause < MAX_LMEM / estimate)  /* overflow? */
+            ? estimate * pause  /* no overflow */
+            : MAX_LMEM;  /* overflow; truncate to maximum */
+  debt = gettotalbytes(g) - threshold;
+  if (debt > 0) debt = 0;
+  luaE_setdebt(g, debt);
+}
+
+
+/*
+** Sweep a list of objects to enter generational mode.  Deletes dead
+** objects and turns the non dead to old. All non-dead threads---which
+** are now old---must be in a gray list. Everything else is not in a
+** gray list. Open upvalues are also kept gray.
+*/
+static void sweep2old (lua_State *L, GCObject **p) {
+  GCObject *curr;
+  global_State *g = G(L);
+  while ((curr = *p) != NULL) {
+    if (iswhite(curr)) {  /* is 'curr' dead? */
+      lua_assert(isdead(g, curr));
+      *p = curr->next;  /* remove 'curr' from list */
+      freeobj(L, curr);  /* erase 'curr' */
+    }
+    else {  /* all surviving objects become old */
+      setage(curr, G_OLD);
+      if (curr->tt == LUA_VTHREAD) {  /* threads must be watched */
+        lua_State *th = gco2th(curr);
+        linkgclist(th, g->grayagain);  /* insert into 'grayagain' list */
+      }
+      else if (curr->tt == LUA_VUPVAL && upisopen(gco2upv(curr)))
+        set2gray(curr);  /* open upvalues are always gray */
+      else  /* everything else is black */
+        nw2black(curr);
+      p = &curr->next;  /* go to next element */
+    }
+  }
+}
+
+
+/*
+** Sweep for generational mode. Delete dead objects. (Because the
+** collection is not incremental, there are no "new white" objects
+** during the sweep. So, any white object must be dead.) For
+** non-dead objects, advance their ages and clear the color of
+** new objects. (Old objects keep their colors.)
+** The ages of G_TOUCHED1 and G_TOUCHED2 objects cannot be advanced
+** here, because these old-generation objects are usually not swept
+** here.  They will all be advanced in 'correctgraylist'. That function
+** will also remove objects turned white here from any gray list.
+*/
+static GCObject **sweepgen (lua_State *L, global_State *g, GCObject **p,
+                            GCObject *limit, GCObject **pfirstold1) {
+  static const lu_byte nextage[] = {
+    G_SURVIVAL,  /* from G_NEW */
+    G_OLD1,      /* from G_SURVIVAL */
+    G_OLD1,      /* from G_OLD0 */
+    G_OLD,       /* from G_OLD1 */
+    G_OLD,       /* from G_OLD (do not change) */
+    G_TOUCHED1,  /* from G_TOUCHED1 (do not change) */
+    G_TOUCHED2   /* from G_TOUCHED2 (do not change) */
+  };
+  int white = luaC_white(g);
+  GCObject *curr;
+  while ((curr = *p) != limit) {
+    if (iswhite(curr)) {  /* is 'curr' dead? */
+      lua_assert(!isold(curr) && isdead(g, curr));
+      *p = curr->next;  /* remove 'curr' from list */
+      freeobj(L, curr);  /* erase 'curr' */
+    }
+    else {  /* correct mark and age */
+      if (getage(curr) == G_NEW) {  /* new objects go back to white */
+        int marked = curr->marked & ~maskgcbits;  /* erase GC bits */
+        curr->marked = cast_byte(marked | G_SURVIVAL | white);
+      }
+      else {  /* all other objects will be old, and so keep their color */
+        setage(curr, nextage[getage(curr)]);
+        if (getage(curr) == G_OLD1 && *pfirstold1 == NULL)
+          *pfirstold1 = curr;  /* first OLD1 object in the list */
+      }
+      p = &curr->next;  /* go to next element */
+    }
+  }
+  return p;
+}
+
+
+/*
+** Traverse a list making all its elements white and clearing their
+** age. In incremental mode, all objects are 'new' all the time,
+** except for fixed strings (which are always old).
+*/
+static void whitelist (global_State *g, GCObject *p) {
+  int white = luaC_white(g);
+  for (; p != NULL; p = p->next)
+    p->marked = cast_byte((p->marked & ~maskgcbits) | white);
+}
+
+
+/*
+** Correct a list of gray objects. Return pointer to where rest of the
+** list should be linked.
+** Because this correction is done after sweeping, young objects might
+** be turned white and still be in the list. They are only removed.
+** 'TOUCHED1' objects are advanced to 'TOUCHED2' and remain on the list;
+** Non-white threads also remain on the list; 'TOUCHED2' objects become
+** regular old; they and anything else are removed from the list.
+*/
+static GCObject **correctgraylist (GCObject **p) {
+  GCObject *curr;
+  while ((curr = *p) != NULL) {
+    GCObject **next = getgclist(curr);
+    if (iswhite(curr))
+      goto remove;  /* remove all white objects */
+    else if (getage(curr) == G_TOUCHED1) {  /* touched in this cycle? */
+      lua_assert(isgray(curr));
+      nw2black(curr);  /* make it black, for next barrier */
+      changeage(curr, G_TOUCHED1, G_TOUCHED2);
+      goto remain;  /* keep it in the list and go to next element */
+    }
+    else if (curr->tt == LUA_VTHREAD) {
+      lua_assert(isgray(curr));
+      goto remain;  /* keep non-white threads on the list */
+    }
+    else {  /* everything else is removed */
+      lua_assert(isold(curr));  /* young objects should be white here */
+      if (getage(curr) == G_TOUCHED2)  /* advance from TOUCHED2... */
+        changeage(curr, G_TOUCHED2, G_OLD);  /* ... to OLD */
+      nw2black(curr);  /* make object black (to be removed) */
+      goto remove;
+    }
+    remove: *p = *next; continue;
+    remain: p = next; continue;
+  }
+  return p;
+}
+
+
+/*
+** Correct all gray lists, coalescing them into 'grayagain'.
+*/
+static void correctgraylists (global_State *g) {
+  GCObject **list = correctgraylist(&g->grayagain);
+  *list = g->weak; g->weak = NULL;
+  list = correctgraylist(list);
+  *list = g->allweak; g->allweak = NULL;
+  list = correctgraylist(list);
+  *list = g->ephemeron; g->ephemeron = NULL;
+  correctgraylist(list);
+}
+
+
+/*
+** Mark black 'OLD1' objects when starting a new young collection.
+** Gray objects are already in some gray list, and so will be visited
+** in the atomic step.
+*/
+static void markold (global_State *g, GCObject *from, GCObject *to) {
+  GCObject *p;
+  for (p = from; p != to; p = p->next) {
+    if (getage(p) == G_OLD1) {
+      lua_assert(!iswhite(p));
+      changeage(p, G_OLD1, G_OLD);  /* now they are old */
+      if (isblack(p))
+        reallymarkobject(g, p);
+    }
+  }
+}
+
+
+/*
+** Finish a young-generation collection.
+*/
+static void finishgencycle (lua_State *L, global_State *g) {
+  correctgraylists(g);
+  checkSizes(L, g);
+  g->gcstate = GCSpropagate;  /* skip restart */
+  if (!g->gcemergency)
+    callallpendingfinalizers(L);
+}
+
+
+/*
+** Does a young collection. First, mark 'OLD1' objects. Then does the
+** atomic step. Then, sweep all lists and advance pointers. Finally,
+** finish the collection.
+*/
+static void youngcollection (lua_State *L, global_State *g) {
+  GCObject **psurvival;  /* to point to first non-dead survival object */
+  GCObject *dummy;  /* dummy out parameter to 'sweepgen' */
+  lua_assert(g->gcstate == GCSpropagate);
+  if (g->firstold1) {  /* are there regular OLD1 objects? */
+    markold(g, g->firstold1, g->reallyold);  /* mark them */
+    g->firstold1 = NULL;  /* no more OLD1 objects (for now) */
+  }
+  markold(g, g->finobj, g->finobjrold);
+  markold(g, g->tobefnz, NULL);
+  atomic(L);
+
+  /* sweep nursery and get a pointer to its last live element */
+  g->gcstate = GCSswpallgc;
+  psurvival = sweepgen(L, g, &g->allgc, g->survival, &g->firstold1);
+  /* sweep 'survival' */
+  sweepgen(L, g, psurvival, g->old1, &g->firstold1);
+  g->reallyold = g->old1;
+  g->old1 = *psurvival;  /* 'survival' survivals are old now */
+  g->survival = g->allgc;  /* all news are survivals */
+
+  /* repeat for 'finobj' lists */
+  dummy = NULL;  /* no 'firstold1' optimization for 'finobj' lists */
+  psurvival = sweepgen(L, g, &g->finobj, g->finobjsur, &dummy);
+  /* sweep 'survival' */
+  sweepgen(L, g, psurvival, g->finobjold1, &dummy);
+  g->finobjrold = g->finobjold1;
+  g->finobjold1 = *psurvival;  /* 'survival' survivals are old now */
+  g->finobjsur = g->finobj;  /* all news are survivals */
+
+  sweepgen(L, g, &g->tobefnz, NULL, &dummy);
+  finishgencycle(L, g);
+}
+
+
+/*
+** Clears all gray lists, sweeps objects, and prepare sublists to enter
+** generational mode. The sweeps remove dead objects and turn all
+** surviving objects to old. Threads go back to 'grayagain'; everything
+** else is turned black (not in any gray list).
+*/
+static void atomic2gen (lua_State *L, global_State *g) {
+  cleargraylists(g);
+  /* sweep all elements making them old */
+  g->gcstate = GCSswpallgc;
+  sweep2old(L, &g->allgc);
+  /* everything alive now is old */
+  g->reallyold = g->old1 = g->survival = g->allgc;
+  g->firstold1 = NULL;  /* there are no OLD1 objects anywhere */
+
+  /* repeat for 'finobj' lists */
+  sweep2old(L, &g->finobj);
+  g->finobjrold = g->finobjold1 = g->finobjsur = g->finobj;
+
+  sweep2old(L, &g->tobefnz);
+
+  g->gckind = KGC_GEN;
+  g->lastatomic = 0;
+  g->GCestimate = gettotalbytes(g);  /* base for memory control */
+  finishgencycle(L, g);
+}
+
+
+/*
+** Set debt for the next minor collection, which will happen when
+** memory grows 'genminormul'%.
+*/
+static void setminordebt (global_State *g) {
+  luaE_setdebt(g, -(cast(l_mem, (gettotalbytes(g) / 100)) * g->genminormul));
+}
+
+
+/*
+** Enter generational mode. Must go until the end of an atomic cycle
+** to ensure that all objects are correctly marked and weak tables
+** are cleared. Then, turn all objects into old and finishes the
+** collection.
+*/
+static lu_mem entergen (lua_State *L, global_State *g) {
+  lu_mem numobjs;
+  luaC_runtilstate(L, bitmask(GCSpause));  /* prepare to start a new cycle */
+  luaC_runtilstate(L, bitmask(GCSpropagate));  /* start new cycle */
+  numobjs = atomic(L);  /* propagates all and then do the atomic stuff */
+  atomic2gen(L, g);
+  setminordebt(g);  /* set debt assuming next cycle will be minor */
+  return numobjs;
+}
+
+
+/*
+** Enter incremental mode. Turn all objects white, make all
+** intermediate lists point to NULL (to avoid invalid pointers),
+** and go to the pause state.
+*/
+static void enterinc (global_State *g) {
+  whitelist(g, g->allgc);
+  g->reallyold = g->old1 = g->survival = NULL;
+  whitelist(g, g->finobj);
+  whitelist(g, g->tobefnz);
+  g->finobjrold = g->finobjold1 = g->finobjsur = NULL;
+  g->gcstate = GCSpause;
+  g->gckind = KGC_INC;
+  g->lastatomic = 0;
+}
+
+
+/*
+** Change collector mode to 'newmode'.
+*/
+void luaC_changemode (lua_State *L, int newmode) {
+  global_State *g = G(L);
+  if (newmode != g->gckind) {
+    if (newmode == KGC_GEN)  /* entering generational mode? */
+      entergen(L, g);
+    else
+      enterinc(g);  /* entering incremental mode */
+  }
+  g->lastatomic = 0;
+}
+
+
+/*
+** Does a full collection in generational mode.
+*/
+static lu_mem fullgen (lua_State *L, global_State *g) {
+  enterinc(g);
+  return entergen(L, g);
+}
+
+
+/*
+** Does a major collection after last collection was a "bad collection".
+**
+** When the program is building a big structure, it allocates lots of
+** memory but generates very little garbage. In those scenarios,
+** the generational mode just wastes time doing small collections, and
+** major collections are frequently what we call a "bad collection", a
+** collection that frees too few objects. To avoid the cost of switching
+** between generational mode and the incremental mode needed for full
+** (major) collections, the collector tries to stay in incremental mode
+** after a bad collection, and to switch back to generational mode only
+** after a "good" collection (one that traverses less than 9/8 objects
+** of the previous one).
+** The collector must choose whether to stay in incremental mode or to
+** switch back to generational mode before sweeping. At this point, it
+** does not know the real memory in use, so it cannot use memory to
+** decide whether to return to generational mode. Instead, it uses the
+** number of objects traversed (returned by 'atomic') as a proxy. The
+** field 'g->lastatomic' keeps this count from the last collection.
+** ('g->lastatomic != 0' also means that the last collection was bad.)
+*/
+static void stepgenfull (lua_State *L, global_State *g) {
+  lu_mem newatomic;  /* count of traversed objects */
+  lu_mem lastatomic = g->lastatomic;  /* count from last collection */
+  if (g->gckind == KGC_GEN)  /* still in generational mode? */
+    enterinc(g);  /* enter incremental mode */
+  luaC_runtilstate(L, bitmask(GCSpropagate));  /* start new cycle */
+  newatomic = atomic(L);  /* mark everybody */
+  if (newatomic < lastatomic + (lastatomic >> 3)) {  /* good collection? */
+    atomic2gen(L, g);  /* return to generational mode */
+    setminordebt(g);
+  }
+  else {  /* another bad collection; stay in incremental mode */
+    g->GCestimate = gettotalbytes(g);  /* first estimate */;
+    entersweep(L);
+    luaC_runtilstate(L, bitmask(GCSpause));  /* finish collection */
+    setpause(g);
+    g->lastatomic = newatomic;
+  }
+}
+
+
+/*
+** Does a generational "step".
+** Usually, this means doing a minor collection and setting the debt to
+** make another collection when memory grows 'genminormul'% larger.
+**
+** However, there are exceptions.  If memory grows 'genmajormul'%
+** larger than it was at the end of the last major collection (kept
+** in 'g->GCestimate'), the function does a major collection. At the
+** end, it checks whether the major collection was able to free a
+** decent amount of memory (at least half the growth in memory since
+** previous major collection). If so, the collector keeps its state,
+** and the next collection will probably be minor again. Otherwise,
+** we have what we call a "bad collection". In that case, set the field
+** 'g->lastatomic' to signal that fact, so that the next collection will
+** go to 'stepgenfull'.
+**
+** 'GCdebt <= 0' means an explicit call to GC step with "size" zero;
+** in that case, do a minor collection.
+*/
+static void genstep (lua_State *L, global_State *g) {
+  if (g->lastatomic != 0)  /* last collection was a bad one? */
+    stepgenfull(L, g);  /* do a full step */
+  else {
+    lu_mem majorbase = g->GCestimate;  /* memory after last major collection */
+    lu_mem majorinc = (majorbase / 100) * getgcparam(g->genmajormul);
+    if (g->GCdebt > 0 && gettotalbytes(g) > majorbase + majorinc) {
+      lu_mem numobjs = fullgen(L, g);  /* do a major collection */
+      if (gettotalbytes(g) < majorbase + (majorinc / 2)) {
+        /* collected at least half of memory growth since last major
+           collection; keep doing minor collections. */
+        lua_assert(g->lastatomic == 0);
+      }
+      else {  /* bad collection */
+        g->lastatomic = numobjs;  /* signal that last collection was bad */
+        setpause(g);  /* do a long wait for next (major) collection */
+      }
+    }
+    else {  /* regular case; do a minor collection */
+      youngcollection(L, g);
+      setminordebt(g);
+      g->GCestimate = majorbase;  /* preserve base value */
+    }
+  }
+  lua_assert(isdecGCmodegen(g));
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** GC control
+** =======================================================
+*/
+
+
+/*
+** Enter first sweep phase.
+** The call to 'sweeptolive' makes the pointer point to an object
+** inside the list (instead of to the header), so that the real sweep do
+** not need to skip objects created between "now" and the start of the
+** real sweep.
+*/
+static void entersweep (lua_State *L) {
+  global_State *g = G(L);
+  g->gcstate = GCSswpallgc;
+  lua_assert(g->sweepgc == NULL);
+  g->sweepgc = sweeptolive(L, &g->allgc);
+}
+
+
+/*
+** Delete all objects in list 'p' until (but not including) object
+** 'limit'.
+*/
+static void deletelist (lua_State *L, GCObject *p, GCObject *limit) {
+  while (p != limit) {
+    GCObject *next = p->next;
+    freeobj(L, p);
+    p = next;
+  }
+}
+
+
+/*
+** Call all finalizers of the objects in the given Lua state, and
+** then free all objects, except for the main thread.
+*/
+void luaC_freeallobjects (lua_State *L) {
+  global_State *g = G(L);
+  g->gcstp = GCSTPCLS;  /* no extra finalizers after here */
+  luaC_changemode(L, KGC_INC);
+  separatetobefnz(g, 1);  /* separate all objects with finalizers */
+  lua_assert(g->finobj == NULL);
+  callallpendingfinalizers(L);
+  deletelist(L, g->allgc, obj2gco(g->mainthread));
+  lua_assert(g->finobj == NULL);  /* no new finalizers */
+  deletelist(L, g->fixedgc, NULL);  /* collect fixed objects */
+  lua_assert(g->strt.nuse == 0);
+}
+
+
+static lu_mem atomic (lua_State *L) {
+  global_State *g = G(L);
+  lu_mem work = 0;
+  GCObject *origweak, *origall;
+  GCObject *grayagain = g->grayagain;  /* save original list */
+  g->grayagain = NULL;
+  lua_assert(g->ephemeron == NULL && g->weak == NULL);
+  lua_assert(!iswhite(g->mainthread));
+  g->gcstate = GCSatomic;
+  markobject(g, L);  /* mark running thread */
+  /* registry and global metatables may be changed by API */
+  markvalue(g, &g->l_registry);
+  markmt(g);  /* mark global metatables */
+  work += propagateall(g);  /* empties 'gray' list */
+  /* remark occasional upvalues of (maybe) dead threads */
+  work += remarkupvals(g);
+  work += propagateall(g);  /* propagate changes */
+  g->gray = grayagain;
+  work += propagateall(g);  /* traverse 'grayagain' list */
+  convergeephemerons(g);
+  /* at this point, all strongly accessible objects are marked. */
+  /* Clear values from weak tables, before checking finalizers */
+  clearbyvalues(g, g->weak, NULL);
+  clearbyvalues(g, g->allweak, NULL);
+  origweak = g->weak; origall = g->allweak;
+  separatetobefnz(g, 0);  /* separate objects to be finalized */
+  work += markbeingfnz(g);  /* mark objects that will be finalized */
+  work += propagateall(g);  /* remark, to propagate 'resurrection' */
+  convergeephemerons(g);
+  /* at this point, all resurrected objects are marked. */
+  /* remove dead objects from weak tables */
+  clearbykeys(g, g->ephemeron);  /* clear keys from all ephemeron tables */
+  clearbykeys(g, g->allweak);  /* clear keys from all 'allweak' tables */
+  /* clear values from resurrected weak tables */
+  clearbyvalues(g, g->weak, origweak);
+  clearbyvalues(g, g->allweak, origall);
+  luaS_clearcache(g);
+  g->currentwhite = cast_byte(otherwhite(g));  /* flip current white */
+  lua_assert(g->gray == NULL);
+  return work;  /* estimate of slots marked by 'atomic' */
+}
+
+
+static int sweepstep (lua_State *L, global_State *g,
+                      int nextstate, GCObject **nextlist) {
+  if (g->sweepgc) {
+    l_mem olddebt = g->GCdebt;
+    int count;
+    g->sweepgc = sweeplist(L, g->sweepgc, GCSWEEPMAX, &count);
+    g->GCestimate += g->GCdebt - olddebt;  /* update estimate */
+    return count;
+  }
+  else {  /* enter next state */
+    g->gcstate = nextstate;
+    g->sweepgc = nextlist;
+    return 0;  /* no work done */
+  }
+}
+
+
+static lu_mem singlestep (lua_State *L) {
+  global_State *g = G(L);
+  lu_mem work;
+  lua_assert(!g->gcstopem);  /* collector is not reentrant */
+  g->gcstopem = 1;  /* no emergency collections while collecting */
+  switch (g->gcstate) {
+    case GCSpause: {
+      restartcollection(g);
+      g->gcstate = GCSpropagate;
+      work = 1;
+      break;
+    }
+    case GCSpropagate: {
+      if (g->gray == NULL) {  /* no more gray objects? */
+        g->gcstate = GCSenteratomic;  /* finish propagate phase */
+        work = 0;
+      }
+      else
+        work = propagatemark(g);  /* traverse one gray object */
+      break;
+    }
+    case GCSenteratomic: {
+      work = atomic(L);  /* work is what was traversed by 'atomic' */
+      entersweep(L);
+      g->GCestimate = gettotalbytes(g);  /* first estimate */;
+      break;
+    }
+    case GCSswpallgc: {  /* sweep "regular" objects */
+      work = sweepstep(L, g, GCSswpfinobj, &g->finobj);
+      break;
+    }
+    case GCSswpfinobj: {  /* sweep objects with finalizers */
+      work = sweepstep(L, g, GCSswptobefnz, &g->tobefnz);
+      break;
+    }
+    case GCSswptobefnz: {  /* sweep objects to be finalized */
+      work = sweepstep(L, g, GCSswpend, NULL);
+      break;
+    }
+    case GCSswpend: {  /* finish sweeps */
+      checkSizes(L, g);
+      g->gcstate = GCScallfin;
+      work = 0;
+      break;
+    }
+    case GCScallfin: {  /* call remaining finalizers */
+      if (g->tobefnz && !g->gcemergency) {
+        g->gcstopem = 0;  /* ok collections during finalizers */
+        work = runafewfinalizers(L, GCFINMAX) * GCFINALIZECOST;
+      }
+      else {  /* emergency mode or no more finalizers */
+        g->gcstate = GCSpause;  /* finish collection */
+        work = 0;
+      }
+      break;
+    }
+    default: lua_assert(0); return 0;
+  }
+  g->gcstopem = 0;
+  return work;
+}
+
+
+/*
+** advances the garbage collector until it reaches a state allowed
+** by 'statemask'
+*/
+void luaC_runtilstate (lua_State *L, int statesmask) {
+  global_State *g = G(L);
+  while (!testbit(statesmask, g->gcstate))
+    singlestep(L);
+}
+
+
+
+/*
+** Performs a basic incremental step. The debt and step size are
+** converted from bytes to "units of work"; then the function loops
+** running single steps until adding that many units of work or
+** finishing a cycle (pause state). Finally, it sets the debt that
+** controls when next step will be performed.
+*/
+static void incstep (lua_State *L, global_State *g) {
+  int stepmul = (getgcparam(g->gcstepmul) | 1);  /* avoid division by 0 */
+  l_mem debt = (g->GCdebt / WORK2MEM) * stepmul;
+  l_mem stepsize = (g->gcstepsize <= log2maxs(l_mem))
+                 ? ((cast(l_mem, 1) << g->gcstepsize) / WORK2MEM) * stepmul
+                 : MAX_LMEM;  /* overflow; keep maximum value */
+  do {  /* repeat until pause or enough "credit" (negative debt) */
+    lu_mem work = singlestep(L);  /* perform one single step */
+    debt -= work;
+  } while (debt > -stepsize && g->gcstate != GCSpause);
+  if (g->gcstate == GCSpause)
+    setpause(g);  /* pause until next cycle */
+  else {
+    debt = (debt / stepmul) * WORK2MEM;  /* convert 'work units' to bytes */
+    luaE_setdebt(g, debt);
+  }
+}
+
+/*
+** Performs a basic GC step if collector is running. (If collector is
+** not running, set a reasonable debt to avoid it being called at
+** every single check.)
+*/
+void luaC_step (lua_State *L) {
+  global_State *g = G(L);
+  if (!gcrunning(g))  /* not running? */
+    luaE_setdebt(g, -2000);
+  else {
+    if(isdecGCmodegen(g))
+      genstep(L, g);
+    else
+      incstep(L, g);
+  }
+}
+
+
+/*
+** Perform a full collection in incremental mode.
+** Before running the collection, check 'keepinvariant'; if it is true,
+** there may be some objects marked as black, so the collector has
+** to sweep all objects to turn them back to white (as white has not
+** changed, nothing will be collected).
+*/
+static void fullinc (lua_State *L, global_State *g) {
+  if (keepinvariant(g))  /* black objects? */
+    entersweep(L); /* sweep everything to turn them back to white */
+  /* finish any pending sweep phase to start a new cycle */
+  luaC_runtilstate(L, bitmask(GCSpause));
+  luaC_runtilstate(L, bitmask(GCScallfin));  /* run up to finalizers */
+  /* estimate must be correct after a full GC cycle */
+  lua_assert(g->GCestimate == gettotalbytes(g));
+  luaC_runtilstate(L, bitmask(GCSpause));  /* finish collection */
+  setpause(g);
+}
+
+
+/*
+** Performs a full GC cycle; if 'isemergency', set a flag to avoid
+** some operations which could change the interpreter state in some
+** unexpected ways (running finalizers and shrinking some structures).
+*/
+void luaC_fullgc (lua_State *L, int isemergency) {
+  global_State *g = G(L);
+  lua_assert(!g->gcemergency);
+  g->gcemergency = isemergency;  /* set flag */
+  if (g->gckind == KGC_INC)
+    fullinc(L, g);
+  else
+    fullgen(L, g);
+  g->gcemergency = 0;
+}
+
+/* }====================================================== */
+
+
diff --git a/src/libs/3rdparty/lua/src/lgc.h b/src/libs/3rdparty/lua/src/lgc.h
new file mode 100644
index 00000000000..538f6edcccf
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lgc.h
@@ -0,0 +1,202 @@
+/*
+** $Id: lgc.h $
+** Garbage Collector
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lgc_h
+#define lgc_h
+
+
+#include "lobject.h"
+#include "lstate.h"
+
+/*
+** Collectable objects may have one of three colors: white, which means
+** the object is not marked; gray, which means the object is marked, but
+** its references may be not marked; and black, which means that the
+** object and all its references are marked.  The main invariant of the
+** garbage collector, while marking objects, is that a black object can
+** never point to a white one. Moreover, any gray object must be in a
+** "gray list" (gray, grayagain, weak, allweak, ephemeron) so that it
+** can be visited again before finishing the collection cycle. (Open
+** upvalues are an exception to this rule.)  These lists have no meaning
+** when the invariant is not being enforced (e.g., sweep phase).
+*/
+
+
+/*
+** Possible states of the Garbage Collector
+*/
+#define GCSpropagate	0
+#define GCSenteratomic	1
+#define GCSatomic	2
+#define GCSswpallgc	3
+#define GCSswpfinobj	4
+#define GCSswptobefnz	5
+#define GCSswpend	6
+#define GCScallfin	7
+#define GCSpause	8
+
+
+#define issweepphase(g)  \
+	(GCSswpallgc <= (g)->gcstate && (g)->gcstate <= GCSswpend)
+
+
+/*
+** macro to tell when main invariant (white objects cannot point to black
+** ones) must be kept. During a collection, the sweep
+** phase may break the invariant, as objects turned white may point to
+** still-black objects. The invariant is restored when sweep ends and
+** all objects are white again.
+*/
+
+#define keepinvariant(g)	((g)->gcstate <= GCSatomic)
+
+
+/*
+** some useful bit tricks
+*/
+#define resetbits(x,m)		((x) &= cast_byte(~(m)))
+#define setbits(x,m)		((x) |= (m))
+#define testbits(x,m)		((x) & (m))
+#define bitmask(b)		(1<<(b))
+#define bit2mask(b1,b2)		(bitmask(b1) | bitmask(b2))
+#define l_setbit(x,b)		setbits(x, bitmask(b))
+#define resetbit(x,b)		resetbits(x, bitmask(b))
+#define testbit(x,b)		testbits(x, bitmask(b))
+
+
+/*
+** Layout for bit use in 'marked' field. First three bits are
+** used for object "age" in generational mode. Last bit is used
+** by tests.
+*/
+#define WHITE0BIT	3  /* object is white (type 0) */
+#define WHITE1BIT	4  /* object is white (type 1) */
+#define BLACKBIT	5  /* object is black */
+#define FINALIZEDBIT	6  /* object has been marked for finalization */
+
+#define TESTBIT		7
+
+
+
+#define WHITEBITS	bit2mask(WHITE0BIT, WHITE1BIT)
+
+
+#define iswhite(x)      testbits((x)->marked, WHITEBITS)
+#define isblack(x)      testbit((x)->marked, BLACKBIT)
+#define isgray(x)  /* neither white nor black */  \
+	(!testbits((x)->marked, WHITEBITS | bitmask(BLACKBIT)))
+
+#define tofinalize(x)	testbit((x)->marked, FINALIZEDBIT)
+
+#define otherwhite(g)	((g)->currentwhite ^ WHITEBITS)
+#define isdeadm(ow,m)	((m) & (ow))
+#define isdead(g,v)	isdeadm(otherwhite(g), (v)->marked)
+
+#define changewhite(x)	((x)->marked ^= WHITEBITS)
+#define nw2black(x)  \
+	check_exp(!iswhite(x), l_setbit((x)->marked, BLACKBIT))
+
+#define luaC_white(g)	cast_byte((g)->currentwhite & WHITEBITS)
+
+
+/* object age in generational mode */
+#define G_NEW		0	/* created in current cycle */
+#define G_SURVIVAL	1	/* created in previous cycle */
+#define G_OLD0		2	/* marked old by frw. barrier in this cycle */
+#define G_OLD1		3	/* first full cycle as old */
+#define G_OLD		4	/* really old object (not to be visited) */
+#define G_TOUCHED1	5	/* old object touched this cycle */
+#define G_TOUCHED2	6	/* old object touched in previous cycle */
+
+#define AGEBITS		7  /* all age bits (111) */
+
+#define getage(o)	((o)->marked & AGEBITS)
+#define setage(o,a)  ((o)->marked = cast_byte(((o)->marked & (~AGEBITS)) | a))
+#define isold(o)	(getage(o) > G_SURVIVAL)
+
+#define changeage(o,f,t)  \
+	check_exp(getage(o) == (f), (o)->marked ^= ((f)^(t)))
+
+
+/* Default Values for GC parameters */
+#define LUAI_GENMAJORMUL         100
+#define LUAI_GENMINORMUL         20
+
+/* wait memory to double before starting new cycle */
+#define LUAI_GCPAUSE    200
+
+/*
+** some gc parameters are stored divided by 4 to allow a maximum value
+** up to 1023 in a 'lu_byte'.
+*/
+#define getgcparam(p)	((p) * 4)
+#define setgcparam(p,v)	((p) = (v) / 4)
+
+#define LUAI_GCMUL      100
+
+/* how much to allocate before next GC step (log2) */
+#define LUAI_GCSTEPSIZE 13      /* 8 KB */
+
+
+/*
+** Check whether the declared GC mode is generational. While in
+** generational mode, the collector can go temporarily to incremental
+** mode to improve performance. This is signaled by 'g->lastatomic != 0'.
+*/
+#define isdecGCmodegen(g)	(g->gckind == KGC_GEN || g->lastatomic != 0)
+
+
+/*
+** Control when GC is running:
+*/
+#define GCSTPUSR	1  /* bit true when GC stopped by user */
+#define GCSTPGC		2  /* bit true when GC stopped by itself */
+#define GCSTPCLS	4  /* bit true when closing Lua state */
+#define gcrunning(g)	((g)->gcstp == 0)
+
+
+/*
+** Does one step of collection when debt becomes positive. 'pre'/'pos'
+** allows some adjustments to be done only when needed. macro
+** 'condchangemem' is used only for heavy tests (forcing a full
+** GC cycle on every opportunity)
+*/
+#define luaC_condGC(L,pre,pos) \
+	{ if (G(L)->GCdebt > 0) { pre; luaC_step(L); pos;}; \
+	  condchangemem(L,pre,pos); }
+
+/* more often than not, 'pre'/'pos' are empty */
+#define luaC_checkGC(L)		luaC_condGC(L,(void)0,(void)0)
+
+
+#define luaC_objbarrier(L,p,o) (  \
+	(isblack(p) && iswhite(o)) ? \
+	luaC_barrier_(L,obj2gco(p),obj2gco(o)) : cast_void(0))
+
+#define luaC_barrier(L,p,v) (  \
+	iscollectable(v) ? luaC_objbarrier(L,p,gcvalue(v)) : cast_void(0))
+
+#define luaC_objbarrierback(L,p,o) (  \
+	(isblack(p) && iswhite(o)) ? luaC_barrierback_(L,p) : cast_void(0))
+
+#define luaC_barrierback(L,p,v) (  \
+	iscollectable(v) ? luaC_objbarrierback(L, p, gcvalue(v)) : cast_void(0))
+
+LUAI_FUNC void luaC_fix (lua_State *L, GCObject *o);
+LUAI_FUNC void luaC_freeallobjects (lua_State *L);
+LUAI_FUNC void luaC_step (lua_State *L);
+LUAI_FUNC void luaC_runtilstate (lua_State *L, int statesmask);
+LUAI_FUNC void luaC_fullgc (lua_State *L, int isemergency);
+LUAI_FUNC GCObject *luaC_newobj (lua_State *L, int tt, size_t sz);
+LUAI_FUNC GCObject *luaC_newobjdt (lua_State *L, int tt, size_t sz,
+                                                 size_t offset);
+LUAI_FUNC void luaC_barrier_ (lua_State *L, GCObject *o, GCObject *v);
+LUAI_FUNC void luaC_barrierback_ (lua_State *L, GCObject *o);
+LUAI_FUNC void luaC_checkfinalizer (lua_State *L, GCObject *o, Table *mt);
+LUAI_FUNC void luaC_changemode (lua_State *L, int newmode);
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/linit.c b/src/libs/3rdparty/lua/src/linit.c
new file mode 100644
index 00000000000..69808f84f48
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/linit.c
@@ -0,0 +1,65 @@
+/*
+** $Id: linit.c $
+** Initialization of libraries for lua.c and other clients
+** See Copyright Notice in lua.h
+*/
+
+
+#define linit_c
+#define LUA_LIB
+
+/*
+** If you embed Lua in your program and need to open the standard
+** libraries, call luaL_openlibs in your program. If you need a
+** different set of libraries, copy this file to your project and edit
+** it to suit your needs.
+**
+** You can also *preload* libraries, so that a later 'require' can
+** open the library, which is already linked to the application.
+** For that, do the following code:
+**
+**  luaL_getsubtable(L, LUA_REGISTRYINDEX, LUA_PRELOAD_TABLE);
+**  lua_pushcfunction(L, luaopen_modname);
+**  lua_setfield(L, -2, modname);
+**  lua_pop(L, 1);  // remove PRELOAD table
+*/
+
+#include "lprefix.h"
+
+
+#include <stddef.h>
+
+#include "lua.h"
+
+#include "lualib.h"
+#include "lauxlib.h"
+
+
+/*
+** these libs are loaded by lua.c and are readily available to any Lua
+** program
+*/
+static const luaL_Reg loadedlibs[] = {
+  {LUA_GNAME, luaopen_base},
+  {LUA_LOADLIBNAME, luaopen_package},
+  {LUA_COLIBNAME, luaopen_coroutine},
+  {LUA_TABLIBNAME, luaopen_table},
+  {LUA_IOLIBNAME, luaopen_io},
+  {LUA_OSLIBNAME, luaopen_os},
+  {LUA_STRLIBNAME, luaopen_string},
+  {LUA_MATHLIBNAME, luaopen_math},
+  {LUA_UTF8LIBNAME, luaopen_utf8},
+  {LUA_DBLIBNAME, luaopen_debug},
+  {NULL, NULL}
+};
+
+
+LUALIB_API void luaL_openlibs (lua_State *L) {
+  const luaL_Reg *lib;
+  /* "require" functions from 'loadedlibs' and set results to global table */
+  for (lib = loadedlibs; lib->func; lib++) {
+    luaL_requiref(L, lib->name, lib->func, 1);
+    lua_pop(L, 1);  /* remove lib */
+  }
+}
+
diff --git a/src/libs/3rdparty/lua/src/liolib.c b/src/libs/3rdparty/lua/src/liolib.c
new file mode 100644
index 00000000000..b08397da45d
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/liolib.c
@@ -0,0 +1,828 @@
+/*
+** $Id: liolib.c $
+** Standard I/O (and system) library
+** See Copyright Notice in lua.h
+*/
+
+#define liolib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <ctype.h>
+#include <errno.h>
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+
+
+/*
+** Change this macro to accept other modes for 'fopen' besides
+** the standard ones.
+*/
+#if !defined(l_checkmode)
+
+/* accepted extensions to 'mode' in 'fopen' */
+#if !defined(L_MODEEXT)
+#define L_MODEEXT	"b"
+#endif
+
+/* Check whether 'mode' matches '[rwa]%+?[L_MODEEXT]*' */
+static int l_checkmode (const char *mode) {
+  return (*mode != '\0' && strchr("rwa", *(mode++)) != NULL &&
+         (*mode != '+' || ((void)(++mode), 1)) &&  /* skip if char is '+' */
+         (strspn(mode, L_MODEEXT) == strlen(mode)));  /* check extensions */
+}
+
+#endif
+
+/*
+** {======================================================
+** l_popen spawns a new process connected to the current
+** one through the file streams.
+** =======================================================
+*/
+
+#if !defined(l_popen)		/* { */
+
+#if defined(LUA_USE_POSIX)	/* { */
+
+#define l_popen(L,c,m)		(fflush(NULL), popen(c,m))
+#define l_pclose(L,file)	(pclose(file))
+
+#elif defined(LUA_USE_WINDOWS)	/* }{ */
+
+#define l_popen(L,c,m)		(_popen(c,m))
+#define l_pclose(L,file)	(_pclose(file))
+
+#if !defined(l_checkmodep)
+/* Windows accepts "[rw][bt]?" as valid modes */
+#define l_checkmodep(m)	((m[0] == 'r' || m[0] == 'w') && \
+  (m[1] == '\0' || ((m[1] == 'b' || m[1] == 't') && m[2] == '\0')))
+#endif
+
+#else				/* }{ */
+
+/* ISO C definitions */
+#define l_popen(L,c,m)  \
+	  ((void)c, (void)m, \
+	  luaL_error(L, "'popen' not supported"), \
+	  (FILE*)0)
+#define l_pclose(L,file)		((void)L, (void)file, -1)
+
+#endif				/* } */
+
+#endif				/* } */
+
+
+#if !defined(l_checkmodep)
+/* By default, Lua accepts only "r" or "w" as valid modes */
+#define l_checkmodep(m)        ((m[0] == 'r' || m[0] == 'w') && m[1] == '\0')
+#endif
+
+/* }====================================================== */
+
+
+#if !defined(l_getc)		/* { */
+
+#if defined(LUA_USE_POSIX)
+#define l_getc(f)		getc_unlocked(f)
+#define l_lockfile(f)		flockfile(f)
+#define l_unlockfile(f)		funlockfile(f)
+#else
+#define l_getc(f)		getc(f)
+#define l_lockfile(f)		((void)0)
+#define l_unlockfile(f)		((void)0)
+#endif
+
+#endif				/* } */
+
+
+/*
+** {======================================================
+** l_fseek: configuration for longer offsets
+** =======================================================
+*/
+
+#if !defined(l_fseek)		/* { */
+
+#if defined(LUA_USE_POSIX)	/* { */
+
+#include <sys/types.h>
+
+#define l_fseek(f,o,w)		fseeko(f,o,w)
+#define l_ftell(f)		ftello(f)
+#define l_seeknum		off_t
+
+#elif defined(LUA_USE_WINDOWS) && !defined(_CRTIMP_TYPEINFO) \
+   && defined(_MSC_VER) && (_MSC_VER >= 1400)	/* }{ */
+
+/* Windows (but not DDK) and Visual C++ 2005 or higher */
+#define l_fseek(f,o,w)		_fseeki64(f,o,w)
+#define l_ftell(f)		_ftelli64(f)
+#define l_seeknum		__int64
+
+#else				/* }{ */
+
+/* ISO C definitions */
+#define l_fseek(f,o,w)		fseek(f,o,w)
+#define l_ftell(f)		ftell(f)
+#define l_seeknum		long
+
+#endif				/* } */
+
+#endif				/* } */
+
+/* }====================================================== */
+
+
+
+#define IO_PREFIX	"_IO_"
+#define IOPREF_LEN	(sizeof(IO_PREFIX)/sizeof(char) - 1)
+#define IO_INPUT	(IO_PREFIX "input")
+#define IO_OUTPUT	(IO_PREFIX "output")
+
+
+typedef luaL_Stream LStream;
+
+
+#define tolstream(L)	((LStream *)luaL_checkudata(L, 1, LUA_FILEHANDLE))
+
+#define isclosed(p)	((p)->closef == NULL)
+
+
+static int io_type (lua_State *L) {
+  LStream *p;
+  luaL_checkany(L, 1);
+  p = (LStream *)luaL_testudata(L, 1, LUA_FILEHANDLE);
+  if (p == NULL)
+    luaL_pushfail(L);  /* not a file */
+  else if (isclosed(p))
+    lua_pushliteral(L, "closed file");
+  else
+    lua_pushliteral(L, "file");
+  return 1;
+}
+
+
+static int f_tostring (lua_State *L) {
+  LStream *p = tolstream(L);
+  if (isclosed(p))
+    lua_pushliteral(L, "file (closed)");
+  else
+    lua_pushfstring(L, "file (%p)", p->f);
+  return 1;
+}
+
+
+static FILE *tofile (lua_State *L) {
+  LStream *p = tolstream(L);
+  if (l_unlikely(isclosed(p)))
+    luaL_error(L, "attempt to use a closed file");
+  lua_assert(p->f);
+  return p->f;
+}
+
+
+/*
+** When creating file handles, always creates a 'closed' file handle
+** before opening the actual file; so, if there is a memory error, the
+** handle is in a consistent state.
+*/
+static LStream *newprefile (lua_State *L) {
+  LStream *p = (LStream *)lua_newuserdatauv(L, sizeof(LStream), 0);
+  p->closef = NULL;  /* mark file handle as 'closed' */
+  luaL_setmetatable(L, LUA_FILEHANDLE);
+  return p;
+}
+
+
+/*
+** Calls the 'close' function from a file handle. The 'volatile' avoids
+** a bug in some versions of the Clang compiler (e.g., clang 3.0 for
+** 32 bits).
+*/
+static int aux_close (lua_State *L) {
+  LStream *p = tolstream(L);
+  volatile lua_CFunction cf = p->closef;
+  p->closef = NULL;  /* mark stream as closed */
+  return (*cf)(L);  /* close it */
+}
+
+
+static int f_close (lua_State *L) {
+  tofile(L);  /* make sure argument is an open stream */
+  return aux_close(L);
+}
+
+
+static int io_close (lua_State *L) {
+  if (lua_isnone(L, 1))  /* no argument? */
+    lua_getfield(L, LUA_REGISTRYINDEX, IO_OUTPUT);  /* use default output */
+  return f_close(L);
+}
+
+
+static int f_gc (lua_State *L) {
+  LStream *p = tolstream(L);
+  if (!isclosed(p) && p->f != NULL)
+    aux_close(L);  /* ignore closed and incompletely open files */
+  return 0;
+}
+
+
+/*
+** function to close regular files
+*/
+static int io_fclose (lua_State *L) {
+  LStream *p = tolstream(L);
+  int res = fclose(p->f);
+  return luaL_fileresult(L, (res == 0), NULL);
+}
+
+
+static LStream *newfile (lua_State *L) {
+  LStream *p = newprefile(L);
+  p->f = NULL;
+  p->closef = &io_fclose;
+  return p;
+}
+
+
+static void opencheck (lua_State *L, const char *fname, const char *mode) {
+  LStream *p = newfile(L);
+  p->f = fopen(fname, mode);
+  if (l_unlikely(p->f == NULL))
+    luaL_error(L, "cannot open file '%s' (%s)", fname, strerror(errno));
+}
+
+
+static int io_open (lua_State *L) {
+  const char *filename = luaL_checkstring(L, 1);
+  const char *mode = luaL_optstring(L, 2, "r");
+  LStream *p = newfile(L);
+  const char *md = mode;  /* to traverse/check mode */
+  luaL_argcheck(L, l_checkmode(md), 2, "invalid mode");
+  p->f = fopen(filename, mode);
+  return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;
+}
+
+
+/*
+** function to close 'popen' files
+*/
+static int io_pclose (lua_State *L) {
+  LStream *p = tolstream(L);
+  errno = 0;
+  return luaL_execresult(L, l_pclose(L, p->f));
+}
+
+
+static int io_popen (lua_State *L) {
+  const char *filename = luaL_checkstring(L, 1);
+  const char *mode = luaL_optstring(L, 2, "r");
+  LStream *p = newprefile(L);
+  luaL_argcheck(L, l_checkmodep(mode), 2, "invalid mode");
+  p->f = l_popen(L, filename, mode);
+  p->closef = &io_pclose;
+  return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;
+}
+
+
+static int io_tmpfile (lua_State *L) {
+  LStream *p = newfile(L);
+  p->f = tmpfile();
+  return (p->f == NULL) ? luaL_fileresult(L, 0, NULL) : 1;
+}
+
+
+static FILE *getiofile (lua_State *L, const char *findex) {
+  LStream *p;
+  lua_getfield(L, LUA_REGISTRYINDEX, findex);
+  p = (LStream *)lua_touserdata(L, -1);
+  if (l_unlikely(isclosed(p)))
+    luaL_error(L, "default %s file is closed", findex + IOPREF_LEN);
+  return p->f;
+}
+
+
+static int g_iofile (lua_State *L, const char *f, const char *mode) {
+  if (!lua_isnoneornil(L, 1)) {
+    const char *filename = lua_tostring(L, 1);
+    if (filename)
+      opencheck(L, filename, mode);
+    else {
+      tofile(L);  /* check that it's a valid file handle */
+      lua_pushvalue(L, 1);
+    }
+    lua_setfield(L, LUA_REGISTRYINDEX, f);
+  }
+  /* return current value */
+  lua_getfield(L, LUA_REGISTRYINDEX, f);
+  return 1;
+}
+
+
+static int io_input (lua_State *L) {
+  return g_iofile(L, IO_INPUT, "r");
+}
+
+
+static int io_output (lua_State *L) {
+  return g_iofile(L, IO_OUTPUT, "w");
+}
+
+
+static int io_readline (lua_State *L);
+
+
+/*
+** maximum number of arguments to 'f:lines'/'io.lines' (it + 3 must fit
+** in the limit for upvalues of a closure)
+*/
+#define MAXARGLINE	250
+
+/*
+** Auxiliary function to create the iteration function for 'lines'.
+** The iteration function is a closure over 'io_readline', with
+** the following upvalues:
+** 1) The file being read (first value in the stack)
+** 2) the number of arguments to read
+** 3) a boolean, true iff file has to be closed when finished ('toclose')
+** *) a variable number of format arguments (rest of the stack)
+*/
+static void aux_lines (lua_State *L, int toclose) {
+  int n = lua_gettop(L) - 1;  /* number of arguments to read */
+  luaL_argcheck(L, n <= MAXARGLINE, MAXARGLINE + 2, "too many arguments");
+  lua_pushvalue(L, 1);  /* file */
+  lua_pushinteger(L, n);  /* number of arguments to read */
+  lua_pushboolean(L, toclose);  /* close/not close file when finished */
+  lua_rotate(L, 2, 3);  /* move the three values to their positions */
+  lua_pushcclosure(L, io_readline, 3 + n);
+}
+
+
+static int f_lines (lua_State *L) {
+  tofile(L);  /* check that it's a valid file handle */
+  aux_lines(L, 0);
+  return 1;
+}
+
+
+/*
+** Return an iteration function for 'io.lines'. If file has to be
+** closed, also returns the file itself as a second result (to be
+** closed as the state at the exit of a generic for).
+*/
+static int io_lines (lua_State *L) {
+  int toclose;
+  if (lua_isnone(L, 1)) lua_pushnil(L);  /* at least one argument */
+  if (lua_isnil(L, 1)) {  /* no file name? */
+    lua_getfield(L, LUA_REGISTRYINDEX, IO_INPUT);  /* get default input */
+    lua_replace(L, 1);  /* put it at index 1 */
+    tofile(L);  /* check that it's a valid file handle */
+    toclose = 0;  /* do not close it after iteration */
+  }
+  else {  /* open a new file */
+    const char *filename = luaL_checkstring(L, 1);
+    opencheck(L, filename, "r");
+    lua_replace(L, 1);  /* put file at index 1 */
+    toclose = 1;  /* close it after iteration */
+  }
+  aux_lines(L, toclose);  /* push iteration function */
+  if (toclose) {
+    lua_pushnil(L);  /* state */
+    lua_pushnil(L);  /* control */
+    lua_pushvalue(L, 1);  /* file is the to-be-closed variable (4th result) */
+    return 4;
+  }
+  else
+    return 1;
+}
+
+
+/*
+** {======================================================
+** READ
+** =======================================================
+*/
+
+
+/* maximum length of a numeral */
+#if !defined (L_MAXLENNUM)
+#define L_MAXLENNUM     200
+#endif
+
+
+/* auxiliary structure used by 'read_number' */
+typedef struct {
+  FILE *f;  /* file being read */
+  int c;  /* current character (look ahead) */
+  int n;  /* number of elements in buffer 'buff' */
+  char buff[L_MAXLENNUM + 1];  /* +1 for ending '\0' */
+} RN;
+
+
+/*
+** Add current char to buffer (if not out of space) and read next one
+*/
+static int nextc (RN *rn) {
+  if (l_unlikely(rn->n >= L_MAXLENNUM)) {  /* buffer overflow? */
+    rn->buff[0] = '\0';  /* invalidate result */
+    return 0;  /* fail */
+  }
+  else {
+    rn->buff[rn->n++] = rn->c;  /* save current char */
+    rn->c = l_getc(rn->f);  /* read next one */
+    return 1;
+  }
+}
+
+
+/*
+** Accept current char if it is in 'set' (of size 2)
+*/
+static int test2 (RN *rn, const char *set) {
+  if (rn->c == set[0] || rn->c == set[1])
+    return nextc(rn);
+  else return 0;
+}
+
+
+/*
+** Read a sequence of (hex)digits
+*/
+static int readdigits (RN *rn, int hex) {
+  int count = 0;
+  while ((hex ? isxdigit(rn->c) : isdigit(rn->c)) && nextc(rn))
+    count++;
+  return count;
+}
+
+
+/*
+** Read a number: first reads a valid prefix of a numeral into a buffer.
+** Then it calls 'lua_stringtonumber' to check whether the format is
+** correct and to convert it to a Lua number.
+*/
+static int read_number (lua_State *L, FILE *f) {
+  RN rn;
+  int count = 0;
+  int hex = 0;
+  char decp[2];
+  rn.f = f; rn.n = 0;
+  decp[0] = lua_getlocaledecpoint();  /* get decimal point from locale */
+  decp[1] = '.';  /* always accept a dot */
+  l_lockfile(rn.f);
+  do { rn.c = l_getc(rn.f); } while (isspace(rn.c));  /* skip spaces */
+  test2(&rn, "-+");  /* optional sign */
+  if (test2(&rn, "00")) {
+    if (test2(&rn, "xX")) hex = 1;  /* numeral is hexadecimal */
+    else count = 1;  /* count initial '0' as a valid digit */
+  }
+  count += readdigits(&rn, hex);  /* integral part */
+  if (test2(&rn, decp))  /* decimal point? */
+    count += readdigits(&rn, hex);  /* fractional part */
+  if (count > 0 && test2(&rn, (hex ? "pP" : "eE"))) {  /* exponent mark? */
+    test2(&rn, "-+");  /* exponent sign */
+    readdigits(&rn, 0);  /* exponent digits */
+  }
+  ungetc(rn.c, rn.f);  /* unread look-ahead char */
+  l_unlockfile(rn.f);
+  rn.buff[rn.n] = '\0';  /* finish string */
+  if (l_likely(lua_stringtonumber(L, rn.buff)))
+    return 1;  /* ok, it is a valid number */
+  else {  /* invalid format */
+   lua_pushnil(L);  /* "result" to be removed */
+   return 0;  /* read fails */
+  }
+}
+
+
+static int test_eof (lua_State *L, FILE *f) {
+  int c = getc(f);
+  ungetc(c, f);  /* no-op when c == EOF */
+  lua_pushliteral(L, "");
+  return (c != EOF);
+}
+
+
+static int read_line (lua_State *L, FILE *f, int chop) {
+  luaL_Buffer b;
+  int c;
+  luaL_buffinit(L, &b);
+  do {  /* may need to read several chunks to get whole line */
+    char *buff = luaL_prepbuffer(&b);  /* preallocate buffer space */
+    int i = 0;
+    l_lockfile(f);  /* no memory errors can happen inside the lock */
+    while (i < LUAL_BUFFERSIZE && (c = l_getc(f)) != EOF && c != '\n')
+      buff[i++] = c;  /* read up to end of line or buffer limit */
+    l_unlockfile(f);
+    luaL_addsize(&b, i);
+  } while (c != EOF && c != '\n');  /* repeat until end of line */
+  if (!chop && c == '\n')  /* want a newline and have one? */
+    luaL_addchar(&b, c);  /* add ending newline to result */
+  luaL_pushresult(&b);  /* close buffer */
+  /* return ok if read something (either a newline or something else) */
+  return (c == '\n' || lua_rawlen(L, -1) > 0);
+}
+
+
+static void read_all (lua_State *L, FILE *f) {
+  size_t nr;
+  luaL_Buffer b;
+  luaL_buffinit(L, &b);
+  do {  /* read file in chunks of LUAL_BUFFERSIZE bytes */
+    char *p = luaL_prepbuffer(&b);
+    nr = fread(p, sizeof(char), LUAL_BUFFERSIZE, f);
+    luaL_addsize(&b, nr);
+  } while (nr == LUAL_BUFFERSIZE);
+  luaL_pushresult(&b);  /* close buffer */
+}
+
+
+static int read_chars (lua_State *L, FILE *f, size_t n) {
+  size_t nr;  /* number of chars actually read */
+  char *p;
+  luaL_Buffer b;
+  luaL_buffinit(L, &b);
+  p = luaL_prepbuffsize(&b, n);  /* prepare buffer to read whole block */
+  nr = fread(p, sizeof(char), n, f);  /* try to read 'n' chars */
+  luaL_addsize(&b, nr);
+  luaL_pushresult(&b);  /* close buffer */
+  return (nr > 0);  /* true iff read something */
+}
+
+
+static int g_read (lua_State *L, FILE *f, int first) {
+  int nargs = lua_gettop(L) - 1;
+  int n, success;
+  clearerr(f);
+  if (nargs == 0) {  /* no arguments? */
+    success = read_line(L, f, 1);
+    n = first + 1;  /* to return 1 result */
+  }
+  else {
+    /* ensure stack space for all results and for auxlib's buffer */
+    luaL_checkstack(L, nargs+LUA_MINSTACK, "too many arguments");
+    success = 1;
+    for (n = first; nargs-- && success; n++) {
+      if (lua_type(L, n) == LUA_TNUMBER) {
+        size_t l = (size_t)luaL_checkinteger(L, n);
+        success = (l == 0) ? test_eof(L, f) : read_chars(L, f, l);
+      }
+      else {
+        const char *p = luaL_checkstring(L, n);
+        if (*p == '*') p++;  /* skip optional '*' (for compatibility) */
+        switch (*p) {
+          case 'n':  /* number */
+            success = read_number(L, f);
+            break;
+          case 'l':  /* line */
+            success = read_line(L, f, 1);
+            break;
+          case 'L':  /* line with end-of-line */
+            success = read_line(L, f, 0);
+            break;
+          case 'a':  /* file */
+            read_all(L, f);  /* read entire file */
+            success = 1; /* always success */
+            break;
+          default:
+            return luaL_argerror(L, n, "invalid format");
+        }
+      }
+    }
+  }
+  if (ferror(f))
+    return luaL_fileresult(L, 0, NULL);
+  if (!success) {
+    lua_pop(L, 1);  /* remove last result */
+    luaL_pushfail(L);  /* push nil instead */
+  }
+  return n - first;
+}
+
+
+static int io_read (lua_State *L) {
+  return g_read(L, getiofile(L, IO_INPUT), 1);
+}
+
+
+static int f_read (lua_State *L) {
+  return g_read(L, tofile(L), 2);
+}
+
+
+/*
+** Iteration function for 'lines'.
+*/
+static int io_readline (lua_State *L) {
+  LStream *p = (LStream *)lua_touserdata(L, lua_upvalueindex(1));
+  int i;
+  int n = (int)lua_tointeger(L, lua_upvalueindex(2));
+  if (isclosed(p))  /* file is already closed? */
+    return luaL_error(L, "file is already closed");
+  lua_settop(L , 1);
+  luaL_checkstack(L, n, "too many arguments");
+  for (i = 1; i <= n; i++)  /* push arguments to 'g_read' */
+    lua_pushvalue(L, lua_upvalueindex(3 + i));
+  n = g_read(L, p->f, 2);  /* 'n' is number of results */
+  lua_assert(n > 0);  /* should return at least a nil */
+  if (lua_toboolean(L, -n))  /* read at least one value? */
+    return n;  /* return them */
+  else {  /* first result is false: EOF or error */
+    if (n > 1) {  /* is there error information? */
+      /* 2nd result is error message */
+      return luaL_error(L, "%s", lua_tostring(L, -n + 1));
+    }
+    if (lua_toboolean(L, lua_upvalueindex(3))) {  /* generator created file? */
+      lua_settop(L, 0);  /* clear stack */
+      lua_pushvalue(L, lua_upvalueindex(1));  /* push file at index 1 */
+      aux_close(L);  /* close it */
+    }
+    return 0;
+  }
+}
+
+/* }====================================================== */
+
+
+static int g_write (lua_State *L, FILE *f, int arg) {
+  int nargs = lua_gettop(L) - arg;
+  int status = 1;
+  for (; nargs--; arg++) {
+    if (lua_type(L, arg) == LUA_TNUMBER) {
+      /* optimization: could be done exactly as for strings */
+      int len = lua_isinteger(L, arg)
+                ? fprintf(f, LUA_INTEGER_FMT,
+                             (LUAI_UACINT)lua_tointeger(L, arg))
+                : fprintf(f, LUA_NUMBER_FMT,
+                             (LUAI_UACNUMBER)lua_tonumber(L, arg));
+      status = status && (len > 0);
+    }
+    else {
+      size_t l;
+      const char *s = luaL_checklstring(L, arg, &l);
+      status = status && (fwrite(s, sizeof(char), l, f) == l);
+    }
+  }
+  if (l_likely(status))
+    return 1;  /* file handle already on stack top */
+  else return luaL_fileresult(L, status, NULL);
+}
+
+
+static int io_write (lua_State *L) {
+  return g_write(L, getiofile(L, IO_OUTPUT), 1);
+}
+
+
+static int f_write (lua_State *L) {
+  FILE *f = tofile(L);
+  lua_pushvalue(L, 1);  /* push file at the stack top (to be returned) */
+  return g_write(L, f, 2);
+}
+
+
+static int f_seek (lua_State *L) {
+  static const int mode[] = {SEEK_SET, SEEK_CUR, SEEK_END};
+  static const char *const modenames[] = {"set", "cur", "end", NULL};
+  FILE *f = tofile(L);
+  int op = luaL_checkoption(L, 2, "cur", modenames);
+  lua_Integer p3 = luaL_optinteger(L, 3, 0);
+  l_seeknum offset = (l_seeknum)p3;
+  luaL_argcheck(L, (lua_Integer)offset == p3, 3,
+                  "not an integer in proper range");
+  op = l_fseek(f, offset, mode[op]);
+  if (l_unlikely(op))
+    return luaL_fileresult(L, 0, NULL);  /* error */
+  else {
+    lua_pushinteger(L, (lua_Integer)l_ftell(f));
+    return 1;
+  }
+}
+
+
+static int f_setvbuf (lua_State *L) {
+  static const int mode[] = {_IONBF, _IOFBF, _IOLBF};
+  static const char *const modenames[] = {"no", "full", "line", NULL};
+  FILE *f = tofile(L);
+  int op = luaL_checkoption(L, 2, NULL, modenames);
+  lua_Integer sz = luaL_optinteger(L, 3, LUAL_BUFFERSIZE);
+  int res = setvbuf(f, NULL, mode[op], (size_t)sz);
+  return luaL_fileresult(L, res == 0, NULL);
+}
+
+
+
+static int io_flush (lua_State *L) {
+  return luaL_fileresult(L, fflush(getiofile(L, IO_OUTPUT)) == 0, NULL);
+}
+
+
+static int f_flush (lua_State *L) {
+  return luaL_fileresult(L, fflush(tofile(L)) == 0, NULL);
+}
+
+
+/*
+** functions for 'io' library
+*/
+static const luaL_Reg iolib[] = {
+  {"close", io_close},
+  {"flush", io_flush},
+  {"input", io_input},
+  {"lines", io_lines},
+  {"open", io_open},
+  {"output", io_output},
+  {"popen", io_popen},
+  {"read", io_read},
+  {"tmpfile", io_tmpfile},
+  {"type", io_type},
+  {"write", io_write},
+  {NULL, NULL}
+};
+
+
+/*
+** methods for file handles
+*/
+static const luaL_Reg meth[] = {
+  {"read", f_read},
+  {"write", f_write},
+  {"lines", f_lines},
+  {"flush", f_flush},
+  {"seek", f_seek},
+  {"close", f_close},
+  {"setvbuf", f_setvbuf},
+  {NULL, NULL}
+};
+
+
+/*
+** metamethods for file handles
+*/
+static const luaL_Reg metameth[] = {
+  {"__index", NULL},  /* place holder */
+  {"__gc", f_gc},
+  {"__close", f_gc},
+  {"__tostring", f_tostring},
+  {NULL, NULL}
+};
+
+
+static void createmeta (lua_State *L) {
+  luaL_newmetatable(L, LUA_FILEHANDLE);  /* metatable for file handles */
+  luaL_setfuncs(L, metameth, 0);  /* add metamethods to new metatable */
+  luaL_newlibtable(L, meth);  /* create method table */
+  luaL_setfuncs(L, meth, 0);  /* add file methods to method table */
+  lua_setfield(L, -2, "__index");  /* metatable.__index = method table */
+  lua_pop(L, 1);  /* pop metatable */
+}
+
+
+/*
+** function to (not) close the standard files stdin, stdout, and stderr
+*/
+static int io_noclose (lua_State *L) {
+  LStream *p = tolstream(L);
+  p->closef = &io_noclose;  /* keep file opened */
+  luaL_pushfail(L);
+  lua_pushliteral(L, "cannot close standard file");
+  return 2;
+}
+
+
+static void createstdfile (lua_State *L, FILE *f, const char *k,
+                           const char *fname) {
+  LStream *p = newprefile(L);
+  p->f = f;
+  p->closef = &io_noclose;
+  if (k != NULL) {
+    lua_pushvalue(L, -1);
+    lua_setfield(L, LUA_REGISTRYINDEX, k);  /* add file to registry */
+  }
+  lua_setfield(L, -2, fname);  /* add file to module */
+}
+
+
+LUAMOD_API int luaopen_io (lua_State *L) {
+  luaL_newlib(L, iolib);  /* new module */
+  createmeta(L);
+  /* create (and set) default files */
+  createstdfile(L, stdin, IO_INPUT, "stdin");
+  createstdfile(L, stdout, IO_OUTPUT, "stdout");
+  createstdfile(L, stderr, NULL, "stderr");
+  return 1;
+}
+
diff --git a/src/libs/3rdparty/lua/src/ljumptab.h b/src/libs/3rdparty/lua/src/ljumptab.h
new file mode 100644
index 00000000000..8306f250ccb
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ljumptab.h
@@ -0,0 +1,112 @@
+/*
+** $Id: ljumptab.h $
+** Jump Table for the Lua interpreter
+** See Copyright Notice in lua.h
+*/
+
+
+#undef vmdispatch
+#undef vmcase
+#undef vmbreak
+
+#define vmdispatch(x)     goto *disptab[x];
+
+#define vmcase(l)     L_##l:
+
+#define vmbreak		vmfetch(); vmdispatch(GET_OPCODE(i));
+
+
+static const void *const disptab[NUM_OPCODES] = {
+
+#if 0
+** you can update the following list with this command:
+**
+**  sed -n '/^OP_/\!d; s/OP_/\&\&L_OP_/ ; s/,.*/,/ ; s/\/.*// ; p'  lopcodes.h
+**
+#endif
+
+&&L_OP_MOVE,
+&&L_OP_LOADI,
+&&L_OP_LOADF,
+&&L_OP_LOADK,
+&&L_OP_LOADKX,
+&&L_OP_LOADFALSE,
+&&L_OP_LFALSESKIP,
+&&L_OP_LOADTRUE,
+&&L_OP_LOADNIL,
+&&L_OP_GETUPVAL,
+&&L_OP_SETUPVAL,
+&&L_OP_GETTABUP,
+&&L_OP_GETTABLE,
+&&L_OP_GETI,
+&&L_OP_GETFIELD,
+&&L_OP_SETTABUP,
+&&L_OP_SETTABLE,
+&&L_OP_SETI,
+&&L_OP_SETFIELD,
+&&L_OP_NEWTABLE,
+&&L_OP_SELF,
+&&L_OP_ADDI,
+&&L_OP_ADDK,
+&&L_OP_SUBK,
+&&L_OP_MULK,
+&&L_OP_MODK,
+&&L_OP_POWK,
+&&L_OP_DIVK,
+&&L_OP_IDIVK,
+&&L_OP_BANDK,
+&&L_OP_BORK,
+&&L_OP_BXORK,
+&&L_OP_SHRI,
+&&L_OP_SHLI,
+&&L_OP_ADD,
+&&L_OP_SUB,
+&&L_OP_MUL,
+&&L_OP_MOD,
+&&L_OP_POW,
+&&L_OP_DIV,
+&&L_OP_IDIV,
+&&L_OP_BAND,
+&&L_OP_BOR,
+&&L_OP_BXOR,
+&&L_OP_SHL,
+&&L_OP_SHR,
+&&L_OP_MMBIN,
+&&L_OP_MMBINI,
+&&L_OP_MMBINK,
+&&L_OP_UNM,
+&&L_OP_BNOT,
+&&L_OP_NOT,
+&&L_OP_LEN,
+&&L_OP_CONCAT,
+&&L_OP_CLOSE,
+&&L_OP_TBC,
+&&L_OP_JMP,
+&&L_OP_EQ,
+&&L_OP_LT,
+&&L_OP_LE,
+&&L_OP_EQK,
+&&L_OP_EQI,
+&&L_OP_LTI,
+&&L_OP_LEI,
+&&L_OP_GTI,
+&&L_OP_GEI,
+&&L_OP_TEST,
+&&L_OP_TESTSET,
+&&L_OP_CALL,
+&&L_OP_TAILCALL,
+&&L_OP_RETURN,
+&&L_OP_RETURN0,
+&&L_OP_RETURN1,
+&&L_OP_FORLOOP,
+&&L_OP_FORPREP,
+&&L_OP_TFORPREP,
+&&L_OP_TFORCALL,
+&&L_OP_TFORLOOP,
+&&L_OP_SETLIST,
+&&L_OP_CLOSURE,
+&&L_OP_VARARG,
+&&L_OP_VARARGPREP,
+&&L_OP_EXTRAARG
+
+};
diff --git a/src/libs/3rdparty/lua/src/llex.c b/src/libs/3rdparty/lua/src/llex.c
new file mode 100644
index 00000000000..5fc39a5cdec
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/llex.c
@@ -0,0 +1,581 @@
+/*
+** $Id: llex.c $
+** Lexical Analyzer
+** See Copyright Notice in lua.h
+*/
+
+#define llex_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <locale.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lctype.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lgc.h"
+#include "llex.h"
+#include "lobject.h"
+#include "lparser.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "lzio.h"
+
+
+
+#define next(ls)	(ls->current = zgetc(ls->z))
+
+
+
+#define currIsNewline(ls)	(ls->current == '\n' || ls->current == '\r')
+
+
+/* ORDER RESERVED */
+static const char *const luaX_tokens [] = {
+    "and", "break", "do", "else", "elseif",
+    "end", "false", "for", "function", "goto", "if",
+    "in", "local", "nil", "not", "or", "repeat",
+    "return", "then", "true", "until", "while",
+    "//", "..", "...", "==", ">=", "<=", "~=",
+    "<<", ">>", "::", "<eof>",
+    "<number>", "<integer>", "<name>", "<string>"
+};
+
+
+#define save_and_next(ls) (save(ls, ls->current), next(ls))
+
+
+static l_noret lexerror (LexState *ls, const char *msg, int token);
+
+
+static void save (LexState *ls, int c) {
+  Mbuffer *b = ls->buff;
+  if (luaZ_bufflen(b) + 1 > luaZ_sizebuffer(b)) {
+    size_t newsize;
+    if (luaZ_sizebuffer(b) >= MAX_SIZE/2)
+      lexerror(ls, "lexical element too long", 0);
+    newsize = luaZ_sizebuffer(b) * 2;
+    luaZ_resizebuffer(ls->L, b, newsize);
+  }
+  b->buffer[luaZ_bufflen(b)++] = cast_char(c);
+}
+
+
+void luaX_init (lua_State *L) {
+  int i;
+  TString *e = luaS_newliteral(L, LUA_ENV);  /* create env name */
+  luaC_fix(L, obj2gco(e));  /* never collect this name */
+  for (i=0; i<NUM_RESERVED; i++) {
+    TString *ts = luaS_new(L, luaX_tokens[i]);
+    luaC_fix(L, obj2gco(ts));  /* reserved words are never collected */
+    ts->extra = cast_byte(i+1);  /* reserved word */
+  }
+}
+
+
+const char *luaX_token2str (LexState *ls, int token) {
+  if (token < FIRST_RESERVED) {  /* single-byte symbols? */
+    if (lisprint(token))
+      return luaO_pushfstring(ls->L, "'%c'", token);
+    else  /* control character */
+      return luaO_pushfstring(ls->L, "'<\\%d>'", token);
+  }
+  else {
+    const char *s = luaX_tokens[token - FIRST_RESERVED];
+    if (token < TK_EOS)  /* fixed format (symbols and reserved words)? */
+      return luaO_pushfstring(ls->L, "'%s'", s);
+    else  /* names, strings, and numerals */
+      return s;
+  }
+}
+
+
+static const char *txtToken (LexState *ls, int token) {
+  switch (token) {
+    case TK_NAME: case TK_STRING:
+    case TK_FLT: case TK_INT:
+      save(ls, '\0');
+      return luaO_pushfstring(ls->L, "'%s'", luaZ_buffer(ls->buff));
+    default:
+      return luaX_token2str(ls, token);
+  }
+}
+
+
+static l_noret lexerror (LexState *ls, const char *msg, int token) {
+  msg = luaG_addinfo(ls->L, msg, ls->source, ls->linenumber);
+  if (token)
+    luaO_pushfstring(ls->L, "%s near %s", msg, txtToken(ls, token));
+  luaD_throw(ls->L, LUA_ERRSYNTAX);
+}
+
+
+l_noret luaX_syntaxerror (LexState *ls, const char *msg) {
+  lexerror(ls, msg, ls->t.token);
+}
+
+
+/*
+** Creates a new string and anchors it in scanner's table so that it
+** will not be collected until the end of the compilation; by that time
+** it should be anchored somewhere. It also internalizes long strings,
+** ensuring there is only one copy of each unique string.  The table
+** here is used as a set: the string enters as the key, while its value
+** is irrelevant. We use the string itself as the value only because it
+** is a TValue readily available. Later, the code generation can change
+** this value.
+*/
+TString *luaX_newstring (LexState *ls, const char *str, size_t l) {
+  lua_State *L = ls->L;
+  TString *ts = luaS_newlstr(L, str, l);  /* create new string */
+  const TValue *o = luaH_getstr(ls->h, ts);
+  if (!ttisnil(o))  /* string already present? */
+    ts = keystrval(nodefromval(o));  /* get saved copy */
+  else {  /* not in use yet */
+    TValue *stv = s2v(L->top.p++);  /* reserve stack space for string */
+    setsvalue(L, stv, ts);  /* temporarily anchor the string */
+    luaH_finishset(L, ls->h, stv, o, stv);  /* t[string] = string */
+    /* table is not a metatable, so it does not need to invalidate cache */
+    luaC_checkGC(L);
+    L->top.p--;  /* remove string from stack */
+  }
+  return ts;
+}
+
+
+/*
+** increment line number and skips newline sequence (any of
+** \n, \r, \n\r, or \r\n)
+*/
+static void inclinenumber (LexState *ls) {
+  int old = ls->current;
+  lua_assert(currIsNewline(ls));
+  next(ls);  /* skip '\n' or '\r' */
+  if (currIsNewline(ls) && ls->current != old)
+    next(ls);  /* skip '\n\r' or '\r\n' */
+  if (++ls->linenumber >= MAX_INT)
+    lexerror(ls, "chunk has too many lines", 0);
+}
+
+
+void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source,
+                    int firstchar) {
+  ls->t.token = 0;
+  ls->L = L;
+  ls->current = firstchar;
+  ls->lookahead.token = TK_EOS;  /* no look-ahead token */
+  ls->z = z;
+  ls->fs = NULL;
+  ls->linenumber = 1;
+  ls->lastline = 1;
+  ls->source = source;
+  ls->envn = luaS_newliteral(L, LUA_ENV);  /* get env name */
+  luaZ_resizebuffer(ls->L, ls->buff, LUA_MINBUFFER);  /* initialize buffer */
+}
+
+
+
+/*
+** =======================================================
+** LEXICAL ANALYZER
+** =======================================================
+*/
+
+
+static int check_next1 (LexState *ls, int c) {
+  if (ls->current == c) {
+    next(ls);
+    return 1;
+  }
+  else return 0;
+}
+
+
+/*
+** Check whether current char is in set 'set' (with two chars) and
+** saves it
+*/
+static int check_next2 (LexState *ls, const char *set) {
+  lua_assert(set[2] == '\0');
+  if (ls->current == set[0] || ls->current == set[1]) {
+    save_and_next(ls);
+    return 1;
+  }
+  else return 0;
+}
+
+
+/* LUA_NUMBER */
+/*
+** This function is quite liberal in what it accepts, as 'luaO_str2num'
+** will reject ill-formed numerals. Roughly, it accepts the following
+** pattern:
+**
+**   %d(%x|%.|([Ee][+-]?))* | 0[Xx](%x|%.|([Pp][+-]?))*
+**
+** The only tricky part is to accept [+-] only after a valid exponent
+** mark, to avoid reading '3-4' or '0xe+1' as a single number.
+**
+** The caller might have already read an initial dot.
+*/
+static int read_numeral (LexState *ls, SemInfo *seminfo) {
+  TValue obj;
+  const char *expo = "Ee";
+  int first = ls->current;
+  lua_assert(lisdigit(ls->current));
+  save_and_next(ls);
+  if (first == '0' && check_next2(ls, "xX"))  /* hexadecimal? */
+    expo = "Pp";
+  for (;;) {
+    if (check_next2(ls, expo))  /* exponent mark? */
+      check_next2(ls, "-+");  /* optional exponent sign */
+    else if (lisxdigit(ls->current) || ls->current == '.')  /* '%x|%.' */
+      save_and_next(ls);
+    else break;
+  }
+  if (lislalpha(ls->current))  /* is numeral touching a letter? */
+    save_and_next(ls);  /* force an error */
+  save(ls, '\0');
+  if (luaO_str2num(luaZ_buffer(ls->buff), &obj) == 0)  /* format error? */
+    lexerror(ls, "malformed number", TK_FLT);
+  if (ttisinteger(&obj)) {
+    seminfo->i = ivalue(&obj);
+    return TK_INT;
+  }
+  else {
+    lua_assert(ttisfloat(&obj));
+    seminfo->r = fltvalue(&obj);
+    return TK_FLT;
+  }
+}
+
+
+/*
+** read a sequence '[=*[' or ']=*]', leaving the last bracket. If
+** sequence is well formed, return its number of '='s + 2; otherwise,
+** return 1 if it is a single bracket (no '='s and no 2nd bracket);
+** otherwise (an unfinished '[==...') return 0.
+*/
+static size_t skip_sep (LexState *ls) {
+  size_t count = 0;
+  int s = ls->current;
+  lua_assert(s == '[' || s == ']');
+  save_and_next(ls);
+  while (ls->current == '=') {
+    save_and_next(ls);
+    count++;
+  }
+  return (ls->current == s) ? count + 2
+         : (count == 0) ? 1
+         : 0;
+}
+
+
+static void read_long_string (LexState *ls, SemInfo *seminfo, size_t sep) {
+  int line = ls->linenumber;  /* initial line (for error message) */
+  save_and_next(ls);  /* skip 2nd '[' */
+  if (currIsNewline(ls))  /* string starts with a newline? */
+    inclinenumber(ls);  /* skip it */
+  for (;;) {
+    switch (ls->current) {
+      case EOZ: {  /* error */
+        const char *what = (seminfo ? "string" : "comment");
+        const char *msg = luaO_pushfstring(ls->L,
+                     "unfinished long %s (starting at line %d)", what, line);
+        lexerror(ls, msg, TK_EOS);
+        break;  /* to avoid warnings */
+      }
+      case ']': {
+        if (skip_sep(ls) == sep) {
+          save_and_next(ls);  /* skip 2nd ']' */
+          goto endloop;
+        }
+        break;
+      }
+      case '\n': case '\r': {
+        save(ls, '\n');
+        inclinenumber(ls);
+        if (!seminfo) luaZ_resetbuffer(ls->buff);  /* avoid wasting space */
+        break;
+      }
+      default: {
+        if (seminfo) save_and_next(ls);
+        else next(ls);
+      }
+    }
+  } endloop:
+  if (seminfo)
+    seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + sep,
+                                     luaZ_bufflen(ls->buff) - 2 * sep);
+}
+
+
+static void esccheck (LexState *ls, int c, const char *msg) {
+  if (!c) {
+    if (ls->current != EOZ)
+      save_and_next(ls);  /* add current to buffer for error message */
+    lexerror(ls, msg, TK_STRING);
+  }
+}
+
+
+static int gethexa (LexState *ls) {
+  save_and_next(ls);
+  esccheck (ls, lisxdigit(ls->current), "hexadecimal digit expected");
+  return luaO_hexavalue(ls->current);
+}
+
+
+static int readhexaesc (LexState *ls) {
+  int r = gethexa(ls);
+  r = (r << 4) + gethexa(ls);
+  luaZ_buffremove(ls->buff, 2);  /* remove saved chars from buffer */
+  return r;
+}
+
+
+static unsigned long readutf8esc (LexState *ls) {
+  unsigned long r;
+  int i = 4;  /* chars to be removed: '\', 'u', '{', and first digit */
+  save_and_next(ls);  /* skip 'u' */
+  esccheck(ls, ls->current == '{', "missing '{'");
+  r = gethexa(ls);  /* must have at least one digit */
+  while (cast_void(save_and_next(ls)), lisxdigit(ls->current)) {
+    i++;
+    esccheck(ls, r <= (0x7FFFFFFFu >> 4), "UTF-8 value too large");
+    r = (r << 4) + luaO_hexavalue(ls->current);
+  }
+  esccheck(ls, ls->current == '}', "missing '}'");
+  next(ls);  /* skip '}' */
+  luaZ_buffremove(ls->buff, i);  /* remove saved chars from buffer */
+  return r;
+}
+
+
+static void utf8esc (LexState *ls) {
+  char buff[UTF8BUFFSZ];
+  int n = luaO_utf8esc(buff, readutf8esc(ls));
+  for (; n > 0; n--)  /* add 'buff' to string */
+    save(ls, buff[UTF8BUFFSZ - n]);
+}
+
+
+static int readdecesc (LexState *ls) {
+  int i;
+  int r = 0;  /* result accumulator */
+  for (i = 0; i < 3 && lisdigit(ls->current); i++) {  /* read up to 3 digits */
+    r = 10*r + ls->current - '0';
+    save_and_next(ls);
+  }
+  esccheck(ls, r <= UCHAR_MAX, "decimal escape too large");
+  luaZ_buffremove(ls->buff, i);  /* remove read digits from buffer */
+  return r;
+}
+
+
+static void read_string (LexState *ls, int del, SemInfo *seminfo) {
+  save_and_next(ls);  /* keep delimiter (for error messages) */
+  while (ls->current != del) {
+    switch (ls->current) {
+      case EOZ:
+        lexerror(ls, "unfinished string", TK_EOS);
+        break;  /* to avoid warnings */
+      case '\n':
+      case '\r':
+        lexerror(ls, "unfinished string", TK_STRING);
+        break;  /* to avoid warnings */
+      case '\\': {  /* escape sequences */
+        int c;  /* final character to be saved */
+        save_and_next(ls);  /* keep '\\' for error messages */
+        switch (ls->current) {
+          case 'a': c = '\a'; goto read_save;
+          case 'b': c = '\b'; goto read_save;
+          case 'f': c = '\f'; goto read_save;
+          case 'n': c = '\n'; goto read_save;
+          case 'r': c = '\r'; goto read_save;
+          case 't': c = '\t'; goto read_save;
+          case 'v': c = '\v'; goto read_save;
+          case 'x': c = readhexaesc(ls); goto read_save;
+          case 'u': utf8esc(ls);  goto no_save;
+          case '\n': case '\r':
+            inclinenumber(ls); c = '\n'; goto only_save;
+          case '\\': case '\"': case '\'':
+            c = ls->current; goto read_save;
+          case EOZ: goto no_save;  /* will raise an error next loop */
+          case 'z': {  /* zap following span of spaces */
+            luaZ_buffremove(ls->buff, 1);  /* remove '\\' */
+            next(ls);  /* skip the 'z' */
+            while (lisspace(ls->current)) {
+              if (currIsNewline(ls)) inclinenumber(ls);
+              else next(ls);
+            }
+            goto no_save;
+          }
+          default: {
+            esccheck(ls, lisdigit(ls->current), "invalid escape sequence");
+            c = readdecesc(ls);  /* digital escape '\ddd' */
+            goto only_save;
+          }
+        }
+       read_save:
+         next(ls);
+         /* go through */
+       only_save:
+         luaZ_buffremove(ls->buff, 1);  /* remove '\\' */
+         save(ls, c);
+         /* go through */
+       no_save: break;
+      }
+      default:
+        save_and_next(ls);
+    }
+  }
+  save_and_next(ls);  /* skip delimiter */
+  seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + 1,
+                                   luaZ_bufflen(ls->buff) - 2);
+}
+
+
+static int llex (LexState *ls, SemInfo *seminfo) {
+  luaZ_resetbuffer(ls->buff);
+  for (;;) {
+    switch (ls->current) {
+      case '\n': case '\r': {  /* line breaks */
+        inclinenumber(ls);
+        break;
+      }
+      case ' ': case '\f': case '\t': case '\v': {  /* spaces */
+        next(ls);
+        break;
+      }
+      case '-': {  /* '-' or '--' (comment) */
+        next(ls);
+        if (ls->current != '-') return '-';
+        /* else is a comment */
+        next(ls);
+        if (ls->current == '[') {  /* long comment? */
+          size_t sep = skip_sep(ls);
+          luaZ_resetbuffer(ls->buff);  /* 'skip_sep' may dirty the buffer */
+          if (sep >= 2) {
+            read_long_string(ls, NULL, sep);  /* skip long comment */
+            luaZ_resetbuffer(ls->buff);  /* previous call may dirty the buff. */
+            break;
+          }
+        }
+        /* else short comment */
+        while (!currIsNewline(ls) && ls->current != EOZ)
+          next(ls);  /* skip until end of line (or end of file) */
+        break;
+      }
+      case '[': {  /* long string or simply '[' */
+        size_t sep = skip_sep(ls);
+        if (sep >= 2) {
+          read_long_string(ls, seminfo, sep);
+          return TK_STRING;
+        }
+        else if (sep == 0)  /* '[=...' missing second bracket? */
+          lexerror(ls, "invalid long string delimiter", TK_STRING);
+        return '[';
+      }
+      case '=': {
+        next(ls);
+        if (check_next1(ls, '=')) return TK_EQ;  /* '==' */
+        else return '=';
+      }
+      case '<': {
+        next(ls);
+        if (check_next1(ls, '=')) return TK_LE;  /* '<=' */
+        else if (check_next1(ls, '<')) return TK_SHL;  /* '<<' */
+        else return '<';
+      }
+      case '>': {
+        next(ls);
+        if (check_next1(ls, '=')) return TK_GE;  /* '>=' */
+        else if (check_next1(ls, '>')) return TK_SHR;  /* '>>' */
+        else return '>';
+      }
+      case '/': {
+        next(ls);
+        if (check_next1(ls, '/')) return TK_IDIV;  /* '//' */
+        else return '/';
+      }
+      case '~': {
+        next(ls);
+        if (check_next1(ls, '=')) return TK_NE;  /* '~=' */
+        else return '~';
+      }
+      case ':': {
+        next(ls);
+        if (check_next1(ls, ':')) return TK_DBCOLON;  /* '::' */
+        else return ':';
+      }
+      case '"': case '\'': {  /* short literal strings */
+        read_string(ls, ls->current, seminfo);
+        return TK_STRING;
+      }
+      case '.': {  /* '.', '..', '...', or number */
+        save_and_next(ls);
+        if (check_next1(ls, '.')) {
+          if (check_next1(ls, '.'))
+            return TK_DOTS;   /* '...' */
+          else return TK_CONCAT;   /* '..' */
+        }
+        else if (!lisdigit(ls->current)) return '.';
+        else return read_numeral(ls, seminfo);
+      }
+      case '0': case '1': case '2': case '3': case '4':
+      case '5': case '6': case '7': case '8': case '9': {
+        return read_numeral(ls, seminfo);
+      }
+      case EOZ: {
+        return TK_EOS;
+      }
+      default: {
+        if (lislalpha(ls->current)) {  /* identifier or reserved word? */
+          TString *ts;
+          do {
+            save_and_next(ls);
+          } while (lislalnum(ls->current));
+          ts = luaX_newstring(ls, luaZ_buffer(ls->buff),
+                                  luaZ_bufflen(ls->buff));
+          seminfo->ts = ts;
+          if (isreserved(ts))  /* reserved word? */
+            return ts->extra - 1 + FIRST_RESERVED;
+          else {
+            return TK_NAME;
+          }
+        }
+        else {  /* single-char tokens ('+', '*', '%', '{', '}', ...) */
+          int c = ls->current;
+          next(ls);
+          return c;
+        }
+      }
+    }
+  }
+}
+
+
+void luaX_next (LexState *ls) {
+  ls->lastline = ls->linenumber;
+  if (ls->lookahead.token != TK_EOS) {  /* is there a look-ahead token? */
+    ls->t = ls->lookahead;  /* use this one */
+    ls->lookahead.token = TK_EOS;  /* and discharge it */
+  }
+  else
+    ls->t.token = llex(ls, &ls->t.seminfo);  /* read next token */
+}
+
+
+int luaX_lookahead (LexState *ls) {
+  lua_assert(ls->lookahead.token == TK_EOS);
+  ls->lookahead.token = llex(ls, &ls->lookahead.seminfo);
+  return ls->lookahead.token;
+}
+
diff --git a/src/libs/3rdparty/lua/src/llex.h b/src/libs/3rdparty/lua/src/llex.h
new file mode 100644
index 00000000000..389d2f86359
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/llex.h
@@ -0,0 +1,91 @@
+/*
+** $Id: llex.h $
+** Lexical Analyzer
+** See Copyright Notice in lua.h
+*/
+
+#ifndef llex_h
+#define llex_h
+
+#include <limits.h>
+
+#include "lobject.h"
+#include "lzio.h"
+
+
+/*
+** Single-char tokens (terminal symbols) are represented by their own
+** numeric code. Other tokens start at the following value.
+*/
+#define FIRST_RESERVED	(UCHAR_MAX + 1)
+
+
+#if !defined(LUA_ENV)
+#define LUA_ENV		"_ENV"
+#endif
+
+
+/*
+* WARNING: if you change the order of this enumeration,
+* grep "ORDER RESERVED"
+*/
+enum RESERVED {
+  /* terminal symbols denoted by reserved words */
+  TK_AND = FIRST_RESERVED, TK_BREAK,
+  TK_DO, TK_ELSE, TK_ELSEIF, TK_END, TK_FALSE, TK_FOR, TK_FUNCTION,
+  TK_GOTO, TK_IF, TK_IN, TK_LOCAL, TK_NIL, TK_NOT, TK_OR, TK_REPEAT,
+  TK_RETURN, TK_THEN, TK_TRUE, TK_UNTIL, TK_WHILE,
+  /* other terminal symbols */
+  TK_IDIV, TK_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE,
+  TK_SHL, TK_SHR,
+  TK_DBCOLON, TK_EOS,
+  TK_FLT, TK_INT, TK_NAME, TK_STRING
+};
+
+/* number of reserved words */
+#define NUM_RESERVED	(cast_int(TK_WHILE-FIRST_RESERVED + 1))
+
+
+typedef union {
+  lua_Number r;
+  lua_Integer i;
+  TString *ts;
+} SemInfo;  /* semantics information */
+
+
+typedef struct Token {
+  int token;
+  SemInfo seminfo;
+} Token;
+
+
+/* state of the lexer plus state of the parser when shared by all
+   functions */
+typedef struct LexState {
+  int current;  /* current character (charint) */
+  int linenumber;  /* input line counter */
+  int lastline;  /* line of last token 'consumed' */
+  Token t;  /* current token */
+  Token lookahead;  /* look ahead token */
+  struct FuncState *fs;  /* current function (parser) */
+  struct lua_State *L;
+  ZIO *z;  /* input stream */
+  Mbuffer *buff;  /* buffer for tokens */
+  Table *h;  /* to avoid collection/reuse strings */
+  struct Dyndata *dyd;  /* dynamic structures used by the parser */
+  TString *source;  /* current source name */
+  TString *envn;  /* environment variable name */
+} LexState;
+
+
+LUAI_FUNC void luaX_init (lua_State *L);
+LUAI_FUNC void luaX_setinput (lua_State *L, LexState *ls, ZIO *z,
+                              TString *source, int firstchar);
+LUAI_FUNC TString *luaX_newstring (LexState *ls, const char *str, size_t l);
+LUAI_FUNC void luaX_next (LexState *ls);
+LUAI_FUNC int luaX_lookahead (LexState *ls);
+LUAI_FUNC l_noret luaX_syntaxerror (LexState *ls, const char *s);
+LUAI_FUNC const char *luaX_token2str (LexState *ls, int token);
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/llimits.h b/src/libs/3rdparty/lua/src/llimits.h
new file mode 100644
index 00000000000..1c826f7be20
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/llimits.h
@@ -0,0 +1,380 @@
+/*
+** $Id: llimits.h $
+** Limits, basic types, and some other 'installation-dependent' definitions
+** See Copyright Notice in lua.h
+*/
+
+#ifndef llimits_h
+#define llimits_h
+
+
+#include <limits.h>
+#include <stddef.h>
+
+
+#include "lua.h"
+
+
+/*
+** 'lu_mem' and 'l_mem' are unsigned/signed integers big enough to count
+** the total memory used by Lua (in bytes). Usually, 'size_t' and
+** 'ptrdiff_t' should work, but we use 'long' for 16-bit machines.
+*/
+#if defined(LUAI_MEM)		/* { external definitions? */
+typedef LUAI_UMEM lu_mem;
+typedef LUAI_MEM l_mem;
+#elif LUAI_IS32INT	/* }{ */
+typedef size_t lu_mem;
+typedef ptrdiff_t l_mem;
+#else  /* 16-bit ints */	/* }{ */
+typedef unsigned long lu_mem;
+typedef long l_mem;
+#endif				/* } */
+
+
+/* chars used as small naturals (so that 'char' is reserved for characters) */
+typedef unsigned char lu_byte;
+typedef signed char ls_byte;
+
+
+/* maximum value for size_t */
+#define MAX_SIZET	((size_t)(~(size_t)0))
+
+/* maximum size visible for Lua (must be representable in a lua_Integer) */
+#define MAX_SIZE	(sizeof(size_t) < sizeof(lua_Integer) ? MAX_SIZET \
+                          : (size_t)(LUA_MAXINTEGER))
+
+
+#define MAX_LUMEM	((lu_mem)(~(lu_mem)0))
+
+#define MAX_LMEM	((l_mem)(MAX_LUMEM >> 1))
+
+
+#define MAX_INT		INT_MAX  /* maximum value of an int */
+
+
+/*
+** floor of the log2 of the maximum signed value for integral type 't'.
+** (That is, maximum 'n' such that '2^n' fits in the given signed type.)
+*/
+#define log2maxs(t)	(sizeof(t) * 8 - 2)
+
+
+/*
+** test whether an unsigned value is a power of 2 (or zero)
+*/
+#define ispow2(x)	(((x) & ((x) - 1)) == 0)
+
+
+/* number of chars of a literal string without the ending \0 */
+#define LL(x)   (sizeof(x)/sizeof(char) - 1)
+
+
+/*
+** conversion of pointer to unsigned integer: this is for hashing only;
+** there is no problem if the integer cannot hold the whole pointer
+** value. (In strict ISO C this may cause undefined behavior, but no
+** actual machine seems to bother.)
+*/
+#if !defined(LUA_USE_C89) && defined(__STDC_VERSION__) && \
+    __STDC_VERSION__ >= 199901L
+#include <stdint.h>
+#if defined(UINTPTR_MAX)  /* even in C99 this type is optional */
+#define L_P2I	uintptr_t
+#else  /* no 'intptr'? */
+#define L_P2I	uintmax_t  /* use the largest available integer */
+#endif
+#else  /* C89 option */
+#define L_P2I	size_t
+#endif
+
+#define point2uint(p)	((unsigned int)((L_P2I)(p) & UINT_MAX))
+
+
+
+/* types of 'usual argument conversions' for lua_Number and lua_Integer */
+typedef LUAI_UACNUMBER l_uacNumber;
+typedef LUAI_UACINT l_uacInt;
+
+
+/*
+** Internal assertions for in-house debugging
+*/
+#if defined LUAI_ASSERT
+#undef NDEBUG
+#include <assert.h>
+#define lua_assert(c)           assert(c)
+#endif
+
+#if defined(lua_assert)
+#define check_exp(c,e)		(lua_assert(c), (e))
+/* to avoid problems with conditions too long */
+#define lua_longassert(c)	((c) ? (void)0 : lua_assert(0))
+#else
+#define lua_assert(c)		((void)0)
+#define check_exp(c,e)		(e)
+#define lua_longassert(c)	((void)0)
+#endif
+
+/*
+** assertion for checking API calls
+*/
+#if !defined(luai_apicheck)
+#define luai_apicheck(l,e)	((void)l, lua_assert(e))
+#endif
+
+#define api_check(l,e,msg)	luai_apicheck(l,(e) && msg)
+
+
+/* macro to avoid warnings about unused variables */
+#if !defined(UNUSED)
+#define UNUSED(x)	((void)(x))
+#endif
+
+
+/* type casts (a macro highlights casts in the code) */
+#define cast(t, exp)	((t)(exp))
+
+#define cast_void(i)	cast(void, (i))
+#define cast_voidp(i)	cast(void *, (i))
+#define cast_num(i)	cast(lua_Number, (i))
+#define cast_int(i)	cast(int, (i))
+#define cast_uint(i)	cast(unsigned int, (i))
+#define cast_byte(i)	cast(lu_byte, (i))
+#define cast_uchar(i)	cast(unsigned char, (i))
+#define cast_char(i)	cast(char, (i))
+#define cast_charp(i)	cast(char *, (i))
+#define cast_sizet(i)	cast(size_t, (i))
+
+
+/* cast a signed lua_Integer to lua_Unsigned */
+#if !defined(l_castS2U)
+#define l_castS2U(i)	((lua_Unsigned)(i))
+#endif
+
+/*
+** cast a lua_Unsigned to a signed lua_Integer; this cast is
+** not strict ISO C, but two-complement architectures should
+** work fine.
+*/
+#if !defined(l_castU2S)
+#define l_castU2S(i)	((lua_Integer)(i))
+#endif
+
+
+/*
+** non-return type
+*/
+#if !defined(l_noret)
+
+#if defined(__GNUC__)
+#define l_noret		void __attribute__((noreturn))
+#elif defined(_MSC_VER) && _MSC_VER >= 1200
+#define l_noret		void __declspec(noreturn)
+#else
+#define l_noret		void
+#endif
+
+#endif
+
+
+/*
+** Inline functions
+*/
+#if !defined(LUA_USE_C89)
+#define l_inline	inline
+#elif defined(__GNUC__)
+#define l_inline	__inline__
+#else
+#define l_inline	/* empty */
+#endif
+
+#define l_sinline	static l_inline
+
+
+/*
+** type for virtual-machine instructions;
+** must be an unsigned with (at least) 4 bytes (see details in lopcodes.h)
+*/
+#if LUAI_IS32INT
+typedef unsigned int l_uint32;
+#else
+typedef unsigned long l_uint32;
+#endif
+
+typedef l_uint32 Instruction;
+
+
+
+/*
+** Maximum length for short strings, that is, strings that are
+** internalized. (Cannot be smaller than reserved words or tags for
+** metamethods, as these strings must be internalized;
+** #("function") = 8, #("__newindex") = 10.)
+*/
+#if !defined(LUAI_MAXSHORTLEN)
+#define LUAI_MAXSHORTLEN	40
+#endif
+
+
+/*
+** Initial size for the string table (must be power of 2).
+** The Lua core alone registers ~50 strings (reserved words +
+** metaevent keys + a few others). Libraries would typically add
+** a few dozens more.
+*/
+#if !defined(MINSTRTABSIZE)
+#define MINSTRTABSIZE	128
+#endif
+
+
+/*
+** Size of cache for strings in the API. 'N' is the number of
+** sets (better be a prime) and "M" is the size of each set (M == 1
+** makes a direct cache.)
+*/
+#if !defined(STRCACHE_N)
+#define STRCACHE_N		53
+#define STRCACHE_M		2
+#endif
+
+
+/* minimum size for string buffer */
+#if !defined(LUA_MINBUFFER)
+#define LUA_MINBUFFER	32
+#endif
+
+
+/*
+** Maximum depth for nested C calls, syntactical nested non-terminals,
+** and other features implemented through recursion in C. (Value must
+** fit in a 16-bit unsigned integer. It must also be compatible with
+** the size of the C stack.)
+*/
+#if !defined(LUAI_MAXCCALLS)
+#define LUAI_MAXCCALLS		200
+#endif
+
+
+/*
+** macros that are executed whenever program enters the Lua core
+** ('lua_lock') and leaves the core ('lua_unlock')
+*/
+#if !defined(lua_lock)
+#define lua_lock(L)	((void) 0)
+#define lua_unlock(L)	((void) 0)
+#endif
+
+/*
+** macro executed during Lua functions at points where the
+** function can yield.
+*/
+#if !defined(luai_threadyield)
+#define luai_threadyield(L)	{lua_unlock(L); lua_lock(L);}
+#endif
+
+
+/*
+** these macros allow user-specific actions when a thread is
+** created/deleted/resumed/yielded.
+*/
+#if !defined(luai_userstateopen)
+#define luai_userstateopen(L)		((void)L)
+#endif
+
+#if !defined(luai_userstateclose)
+#define luai_userstateclose(L)		((void)L)
+#endif
+
+#if !defined(luai_userstatethread)
+#define luai_userstatethread(L,L1)	((void)L)
+#endif
+
+#if !defined(luai_userstatefree)
+#define luai_userstatefree(L,L1)	((void)L)
+#endif
+
+#if !defined(luai_userstateresume)
+#define luai_userstateresume(L,n)	((void)L)
+#endif
+
+#if !defined(luai_userstateyield)
+#define luai_userstateyield(L,n)	((void)L)
+#endif
+
+
+
+/*
+** The luai_num* macros define the primitive operations over numbers.
+*/
+
+/* floor division (defined as 'floor(a/b)') */
+#if !defined(luai_numidiv)
+#define luai_numidiv(L,a,b)     ((void)L, l_floor(luai_numdiv(L,a,b)))
+#endif
+
+/* float division */
+#if !defined(luai_numdiv)
+#define luai_numdiv(L,a,b)      ((a)/(b))
+#endif
+
+/*
+** modulo: defined as 'a - floor(a/b)*b'; the direct computation
+** using this definition has several problems with rounding errors,
+** so it is better to use 'fmod'. 'fmod' gives the result of
+** 'a - trunc(a/b)*b', and therefore must be corrected when
+** 'trunc(a/b) ~= floor(a/b)'. That happens when the division has a
+** non-integer negative result: non-integer result is equivalent to
+** a non-zero remainder 'm'; negative result is equivalent to 'a' and
+** 'b' with different signs, or 'm' and 'b' with different signs
+** (as the result 'm' of 'fmod' has the same sign of 'a').
+*/
+#if !defined(luai_nummod)
+#define luai_nummod(L,a,b,m)  \
+  { (void)L; (m) = l_mathop(fmod)(a,b); \
+    if (((m) > 0) ? (b) < 0 : ((m) < 0 && (b) > 0)) (m) += (b); }
+#endif
+
+/* exponentiation */
+#if !defined(luai_numpow)
+#define luai_numpow(L,a,b)  \
+  ((void)L, (b == 2) ? (a)*(a) : l_mathop(pow)(a,b))
+#endif
+
+/* the others are quite standard operations */
+#if !defined(luai_numadd)
+#define luai_numadd(L,a,b)      ((a)+(b))
+#define luai_numsub(L,a,b)      ((a)-(b))
+#define luai_nummul(L,a,b)      ((a)*(b))
+#define luai_numunm(L,a)        (-(a))
+#define luai_numeq(a,b)         ((a)==(b))
+#define luai_numlt(a,b)         ((a)<(b))
+#define luai_numle(a,b)         ((a)<=(b))
+#define luai_numgt(a,b)         ((a)>(b))
+#define luai_numge(a,b)         ((a)>=(b))
+#define luai_numisnan(a)        (!luai_numeq((a), (a)))
+#endif
+
+
+
+
+
+/*
+** macro to control inclusion of some hard tests on stack reallocation
+*/
+#if !defined(HARDSTACKTESTS)
+#define condmovestack(L,pre,pos)	((void)0)
+#else
+/* realloc stack keeping its size */
+#define condmovestack(L,pre,pos)  \
+  { int sz_ = stacksize(L); pre; luaD_reallocstack((L), sz_, 0); pos; }
+#endif
+
+#if !defined(HARDMEMTESTS)
+#define condchangemem(L,pre,pos)	((void)0)
+#else
+#define condchangemem(L,pre,pos)  \
+	{ if (gcrunning(G(L))) { pre; luaC_fullgc(L, 0); pos; } }
+#endif
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lmathlib.c b/src/libs/3rdparty/lua/src/lmathlib.c
new file mode 100644
index 00000000000..d0b1e1e5d6f
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lmathlib.c
@@ -0,0 +1,764 @@
+/*
+** $Id: lmathlib.c $
+** Standard mathematical library
+** See Copyright Notice in lua.h
+*/
+
+#define lmathlib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <float.h>
+#include <limits.h>
+#include <math.h>
+#include <stdlib.h>
+#include <time.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+#undef PI
+#define PI	(l_mathop(3.141592653589793238462643383279502884))
+
+
+static int math_abs (lua_State *L) {
+  if (lua_isinteger(L, 1)) {
+    lua_Integer n = lua_tointeger(L, 1);
+    if (n < 0) n = (lua_Integer)(0u - (lua_Unsigned)n);
+    lua_pushinteger(L, n);
+  }
+  else
+    lua_pushnumber(L, l_mathop(fabs)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_sin (lua_State *L) {
+  lua_pushnumber(L, l_mathop(sin)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_cos (lua_State *L) {
+  lua_pushnumber(L, l_mathop(cos)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_tan (lua_State *L) {
+  lua_pushnumber(L, l_mathop(tan)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_asin (lua_State *L) {
+  lua_pushnumber(L, l_mathop(asin)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_acos (lua_State *L) {
+  lua_pushnumber(L, l_mathop(acos)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_atan (lua_State *L) {
+  lua_Number y = luaL_checknumber(L, 1);
+  lua_Number x = luaL_optnumber(L, 2, 1);
+  lua_pushnumber(L, l_mathop(atan2)(y, x));
+  return 1;
+}
+
+
+static int math_toint (lua_State *L) {
+  int valid;
+  lua_Integer n = lua_tointegerx(L, 1, &valid);
+  if (l_likely(valid))
+    lua_pushinteger(L, n);
+  else {
+    luaL_checkany(L, 1);
+    luaL_pushfail(L);  /* value is not convertible to integer */
+  }
+  return 1;
+}
+
+
+static void pushnumint (lua_State *L, lua_Number d) {
+  lua_Integer n;
+  if (lua_numbertointeger(d, &n))  /* does 'd' fit in an integer? */
+    lua_pushinteger(L, n);  /* result is integer */
+  else
+    lua_pushnumber(L, d);  /* result is float */
+}
+
+
+static int math_floor (lua_State *L) {
+  if (lua_isinteger(L, 1))
+    lua_settop(L, 1);  /* integer is its own floor */
+  else {
+    lua_Number d = l_mathop(floor)(luaL_checknumber(L, 1));
+    pushnumint(L, d);
+  }
+  return 1;
+}
+
+
+static int math_ceil (lua_State *L) {
+  if (lua_isinteger(L, 1))
+    lua_settop(L, 1);  /* integer is its own ceil */
+  else {
+    lua_Number d = l_mathop(ceil)(luaL_checknumber(L, 1));
+    pushnumint(L, d);
+  }
+  return 1;
+}
+
+
+static int math_fmod (lua_State *L) {
+  if (lua_isinteger(L, 1) && lua_isinteger(L, 2)) {
+    lua_Integer d = lua_tointeger(L, 2);
+    if ((lua_Unsigned)d + 1u <= 1u) {  /* special cases: -1 or 0 */
+      luaL_argcheck(L, d != 0, 2, "zero");
+      lua_pushinteger(L, 0);  /* avoid overflow with 0x80000... / -1 */
+    }
+    else
+      lua_pushinteger(L, lua_tointeger(L, 1) % d);
+  }
+  else
+    lua_pushnumber(L, l_mathop(fmod)(luaL_checknumber(L, 1),
+                                     luaL_checknumber(L, 2)));
+  return 1;
+}
+
+
+/*
+** next function does not use 'modf', avoiding problems with 'double*'
+** (which is not compatible with 'float*') when lua_Number is not
+** 'double'.
+*/
+static int math_modf (lua_State *L) {
+  if (lua_isinteger(L ,1)) {
+    lua_settop(L, 1);  /* number is its own integer part */
+    lua_pushnumber(L, 0);  /* no fractional part */
+  }
+  else {
+    lua_Number n = luaL_checknumber(L, 1);
+    /* integer part (rounds toward zero) */
+    lua_Number ip = (n < 0) ? l_mathop(ceil)(n) : l_mathop(floor)(n);
+    pushnumint(L, ip);
+    /* fractional part (test needed for inf/-inf) */
+    lua_pushnumber(L, (n == ip) ? l_mathop(0.0) : (n - ip));
+  }
+  return 2;
+}
+
+
+static int math_sqrt (lua_State *L) {
+  lua_pushnumber(L, l_mathop(sqrt)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+
+static int math_ult (lua_State *L) {
+  lua_Integer a = luaL_checkinteger(L, 1);
+  lua_Integer b = luaL_checkinteger(L, 2);
+  lua_pushboolean(L, (lua_Unsigned)a < (lua_Unsigned)b);
+  return 1;
+}
+
+static int math_log (lua_State *L) {
+  lua_Number x = luaL_checknumber(L, 1);
+  lua_Number res;
+  if (lua_isnoneornil(L, 2))
+    res = l_mathop(log)(x);
+  else {
+    lua_Number base = luaL_checknumber(L, 2);
+#if !defined(LUA_USE_C89)
+    if (base == l_mathop(2.0))
+      res = l_mathop(log2)(x);
+    else
+#endif
+    if (base == l_mathop(10.0))
+      res = l_mathop(log10)(x);
+    else
+      res = l_mathop(log)(x)/l_mathop(log)(base);
+  }
+  lua_pushnumber(L, res);
+  return 1;
+}
+
+static int math_exp (lua_State *L) {
+  lua_pushnumber(L, l_mathop(exp)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_deg (lua_State *L) {
+  lua_pushnumber(L, luaL_checknumber(L, 1) * (l_mathop(180.0) / PI));
+  return 1;
+}
+
+static int math_rad (lua_State *L) {
+  lua_pushnumber(L, luaL_checknumber(L, 1) * (PI / l_mathop(180.0)));
+  return 1;
+}
+
+
+static int math_min (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  int imin = 1;  /* index of current minimum value */
+  int i;
+  luaL_argcheck(L, n >= 1, 1, "value expected");
+  for (i = 2; i <= n; i++) {
+    if (lua_compare(L, i, imin, LUA_OPLT))
+      imin = i;
+  }
+  lua_pushvalue(L, imin);
+  return 1;
+}
+
+
+static int math_max (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  int imax = 1;  /* index of current maximum value */
+  int i;
+  luaL_argcheck(L, n >= 1, 1, "value expected");
+  for (i = 2; i <= n; i++) {
+    if (lua_compare(L, imax, i, LUA_OPLT))
+      imax = i;
+  }
+  lua_pushvalue(L, imax);
+  return 1;
+}
+
+
+static int math_type (lua_State *L) {
+  if (lua_type(L, 1) == LUA_TNUMBER)
+    lua_pushstring(L, (lua_isinteger(L, 1)) ? "integer" : "float");
+  else {
+    luaL_checkany(L, 1);
+    luaL_pushfail(L);
+  }
+  return 1;
+}
+
+
+
+/*
+** {==================================================================
+** Pseudo-Random Number Generator based on 'xoshiro256**'.
+** ===================================================================
+*/
+
+/* number of binary digits in the mantissa of a float */
+#define FIGS	l_floatatt(MANT_DIG)
+
+#if FIGS > 64
+/* there are only 64 random bits; use them all */
+#undef FIGS
+#define FIGS	64
+#endif
+
+
+/*
+** LUA_RAND32 forces the use of 32-bit integers in the implementation
+** of the PRN generator (mainly for testing).
+*/
+#if !defined(LUA_RAND32) && !defined(Rand64)
+
+/* try to find an integer type with at least 64 bits */
+
+#if ((ULONG_MAX >> 31) >> 31) >= 3
+
+/* 'long' has at least 64 bits */
+#define Rand64		unsigned long
+
+#elif !defined(LUA_USE_C89) && defined(LLONG_MAX)
+
+/* there is a 'long long' type (which must have at least 64 bits) */
+#define Rand64		unsigned long long
+
+#elif ((LUA_MAXUNSIGNED >> 31) >> 31) >= 3
+
+/* 'lua_Unsigned' has at least 64 bits */
+#define Rand64		lua_Unsigned
+
+#endif
+
+#endif
+
+
+#if defined(Rand64)  /* { */
+
+/*
+** Standard implementation, using 64-bit integers.
+** If 'Rand64' has more than 64 bits, the extra bits do not interfere
+** with the 64 initial bits, except in a right shift. Moreover, the
+** final result has to discard the extra bits.
+*/
+
+/* avoid using extra bits when needed */
+#define trim64(x)	((x) & 0xffffffffffffffffu)
+
+
+/* rotate left 'x' by 'n' bits */
+static Rand64 rotl (Rand64 x, int n) {
+  return (x << n) | (trim64(x) >> (64 - n));
+}
+
+static Rand64 nextrand (Rand64 *state) {
+  Rand64 state0 = state[0];
+  Rand64 state1 = state[1];
+  Rand64 state2 = state[2] ^ state0;
+  Rand64 state3 = state[3] ^ state1;
+  Rand64 res = rotl(state1 * 5, 7) * 9;
+  state[0] = state0 ^ state3;
+  state[1] = state1 ^ state2;
+  state[2] = state2 ^ (state1 << 17);
+  state[3] = rotl(state3, 45);
+  return res;
+}
+
+
+/* must take care to not shift stuff by more than 63 slots */
+
+
+/*
+** Convert bits from a random integer into a float in the
+** interval [0,1), getting the higher FIG bits from the
+** random unsigned integer and converting that to a float.
+*/
+
+/* must throw out the extra (64 - FIGS) bits */
+#define shift64_FIG	(64 - FIGS)
+
+/* to scale to [0, 1), multiply by scaleFIG = 2^(-FIGS) */
+#define scaleFIG	(l_mathop(0.5) / ((Rand64)1 << (FIGS - 1)))
+
+static lua_Number I2d (Rand64 x) {
+  return (lua_Number)(trim64(x) >> shift64_FIG) * scaleFIG;
+}
+
+/* convert a 'Rand64' to a 'lua_Unsigned' */
+#define I2UInt(x)	((lua_Unsigned)trim64(x))
+
+/* convert a 'lua_Unsigned' to a 'Rand64' */
+#define Int2I(x)	((Rand64)(x))
+
+
+#else	/* no 'Rand64'   }{ */
+
+/* get an integer with at least 32 bits */
+#if LUAI_IS32INT
+typedef unsigned int lu_int32;
+#else
+typedef unsigned long lu_int32;
+#endif
+
+
+/*
+** Use two 32-bit integers to represent a 64-bit quantity.
+*/
+typedef struct Rand64 {
+  lu_int32 h;  /* higher half */
+  lu_int32 l;  /* lower half */
+} Rand64;
+
+
+/*
+** If 'lu_int32' has more than 32 bits, the extra bits do not interfere
+** with the 32 initial bits, except in a right shift and comparisons.
+** Moreover, the final result has to discard the extra bits.
+*/
+
+/* avoid using extra bits when needed */
+#define trim32(x)	((x) & 0xffffffffu)
+
+
+/*
+** basic operations on 'Rand64' values
+*/
+
+/* build a new Rand64 value */
+static Rand64 packI (lu_int32 h, lu_int32 l) {
+  Rand64 result;
+  result.h = h;
+  result.l = l;
+  return result;
+}
+
+/* return i << n */
+static Rand64 Ishl (Rand64 i, int n) {
+  lua_assert(n > 0 && n < 32);
+  return packI((i.h << n) | (trim32(i.l) >> (32 - n)), i.l << n);
+}
+
+/* i1 ^= i2 */
+static void Ixor (Rand64 *i1, Rand64 i2) {
+  i1->h ^= i2.h;
+  i1->l ^= i2.l;
+}
+
+/* return i1 + i2 */
+static Rand64 Iadd (Rand64 i1, Rand64 i2) {
+  Rand64 result = packI(i1.h + i2.h, i1.l + i2.l);
+  if (trim32(result.l) < trim32(i1.l))  /* carry? */
+    result.h++;
+  return result;
+}
+
+/* return i * 5 */
+static Rand64 times5 (Rand64 i) {
+  return Iadd(Ishl(i, 2), i);  /* i * 5 == (i << 2) + i */
+}
+
+/* return i * 9 */
+static Rand64 times9 (Rand64 i) {
+  return Iadd(Ishl(i, 3), i);  /* i * 9 == (i << 3) + i */
+}
+
+/* return 'i' rotated left 'n' bits */
+static Rand64 rotl (Rand64 i, int n) {
+  lua_assert(n > 0 && n < 32);
+  return packI((i.h << n) | (trim32(i.l) >> (32 - n)),
+               (trim32(i.h) >> (32 - n)) | (i.l << n));
+}
+
+/* for offsets larger than 32, rotate right by 64 - offset */
+static Rand64 rotl1 (Rand64 i, int n) {
+  lua_assert(n > 32 && n < 64);
+  n = 64 - n;
+  return packI((trim32(i.h) >> n) | (i.l << (32 - n)),
+               (i.h << (32 - n)) | (trim32(i.l) >> n));
+}
+
+/*
+** implementation of 'xoshiro256**' algorithm on 'Rand64' values
+*/
+static Rand64 nextrand (Rand64 *state) {
+  Rand64 res = times9(rotl(times5(state[1]), 7));
+  Rand64 t = Ishl(state[1], 17);
+  Ixor(&state[2], state[0]);
+  Ixor(&state[3], state[1]);
+  Ixor(&state[1], state[2]);
+  Ixor(&state[0], state[3]);
+  Ixor(&state[2], t);
+  state[3] = rotl1(state[3], 45);
+  return res;
+}
+
+
+/*
+** Converts a 'Rand64' into a float.
+*/
+
+/* an unsigned 1 with proper type */
+#define UONE		((lu_int32)1)
+
+
+#if FIGS <= 32
+
+/* 2^(-FIGS) */
+#define scaleFIG       (l_mathop(0.5) / (UONE << (FIGS - 1)))
+
+/*
+** get up to 32 bits from higher half, shifting right to
+** throw out the extra bits.
+*/
+static lua_Number I2d (Rand64 x) {
+  lua_Number h = (lua_Number)(trim32(x.h) >> (32 - FIGS));
+  return h * scaleFIG;
+}
+
+#else	/* 32 < FIGS <= 64 */
+
+/* must take care to not shift stuff by more than 31 slots */
+
+/* 2^(-FIGS) = 1.0 / 2^30 / 2^3 / 2^(FIGS-33) */
+#define scaleFIG  \
+    (l_mathop(1.0) / (UONE << 30) / l_mathop(8.0) / (UONE << (FIGS - 33)))
+
+/*
+** use FIGS - 32 bits from lower half, throwing out the other
+** (32 - (FIGS - 32)) = (64 - FIGS) bits
+*/
+#define shiftLOW	(64 - FIGS)
+
+/*
+** higher 32 bits go after those (FIGS - 32) bits: shiftHI = 2^(FIGS - 32)
+*/
+#define shiftHI		((lua_Number)(UONE << (FIGS - 33)) * l_mathop(2.0))
+
+
+static lua_Number I2d (Rand64 x) {
+  lua_Number h = (lua_Number)trim32(x.h) * shiftHI;
+  lua_Number l = (lua_Number)(trim32(x.l) >> shiftLOW);
+  return (h + l) * scaleFIG;
+}
+
+#endif
+
+
+/* convert a 'Rand64' to a 'lua_Unsigned' */
+static lua_Unsigned I2UInt (Rand64 x) {
+  return (((lua_Unsigned)trim32(x.h) << 31) << 1) | (lua_Unsigned)trim32(x.l);
+}
+
+/* convert a 'lua_Unsigned' to a 'Rand64' */
+static Rand64 Int2I (lua_Unsigned n) {
+  return packI((lu_int32)((n >> 31) >> 1), (lu_int32)n);
+}
+
+#endif  /* } */
+
+
+/*
+** A state uses four 'Rand64' values.
+*/
+typedef struct {
+  Rand64 s[4];
+} RanState;
+
+
+/*
+** Project the random integer 'ran' into the interval [0, n].
+** Because 'ran' has 2^B possible values, the projection can only be
+** uniform when the size of the interval is a power of 2 (exact
+** division). Otherwise, to get a uniform projection into [0, n], we
+** first compute 'lim', the smallest Mersenne number not smaller than
+** 'n'. We then project 'ran' into the interval [0, lim].  If the result
+** is inside [0, n], we are done. Otherwise, we try with another 'ran',
+** until we have a result inside the interval.
+*/
+static lua_Unsigned project (lua_Unsigned ran, lua_Unsigned n,
+                             RanState *state) {
+  if ((n & (n + 1)) == 0)  /* is 'n + 1' a power of 2? */
+    return ran & n;  /* no bias */
+  else {
+    lua_Unsigned lim = n;
+    /* compute the smallest (2^b - 1) not smaller than 'n' */
+    lim |= (lim >> 1);
+    lim |= (lim >> 2);
+    lim |= (lim >> 4);
+    lim |= (lim >> 8);
+    lim |= (lim >> 16);
+#if (LUA_MAXUNSIGNED >> 31) >= 3
+    lim |= (lim >> 32);  /* integer type has more than 32 bits */
+#endif
+    lua_assert((lim & (lim + 1)) == 0  /* 'lim + 1' is a power of 2, */
+      && lim >= n  /* not smaller than 'n', */
+      && (lim >> 1) < n);  /* and it is the smallest one */
+    while ((ran &= lim) > n)  /* project 'ran' into [0..lim] */
+      ran = I2UInt(nextrand(state->s));  /* not inside [0..n]? try again */
+    return ran;
+  }
+}
+
+
+static int math_random (lua_State *L) {
+  lua_Integer low, up;
+  lua_Unsigned p;
+  RanState *state = (RanState *)lua_touserdata(L, lua_upvalueindex(1));
+  Rand64 rv = nextrand(state->s);  /* next pseudo-random value */
+  switch (lua_gettop(L)) {  /* check number of arguments */
+    case 0: {  /* no arguments */
+      lua_pushnumber(L, I2d(rv));  /* float between 0 and 1 */
+      return 1;
+    }
+    case 1: {  /* only upper limit */
+      low = 1;
+      up = luaL_checkinteger(L, 1);
+      if (up == 0) {  /* single 0 as argument? */
+        lua_pushinteger(L, I2UInt(rv));  /* full random integer */
+        return 1;
+      }
+      break;
+    }
+    case 2: {  /* lower and upper limits */
+      low = luaL_checkinteger(L, 1);
+      up = luaL_checkinteger(L, 2);
+      break;
+    }
+    default: return luaL_error(L, "wrong number of arguments");
+  }
+  /* random integer in the interval [low, up] */
+  luaL_argcheck(L, low <= up, 1, "interval is empty");
+  /* project random integer into the interval [0, up - low] */
+  p = project(I2UInt(rv), (lua_Unsigned)up - (lua_Unsigned)low, state);
+  lua_pushinteger(L, p + (lua_Unsigned)low);
+  return 1;
+}
+
+
+static void setseed (lua_State *L, Rand64 *state,
+                     lua_Unsigned n1, lua_Unsigned n2) {
+  int i;
+  state[0] = Int2I(n1);
+  state[1] = Int2I(0xff);  /* avoid a zero state */
+  state[2] = Int2I(n2);
+  state[3] = Int2I(0);
+  for (i = 0; i < 16; i++)
+    nextrand(state);  /* discard initial values to "spread" seed */
+  lua_pushinteger(L, n1);
+  lua_pushinteger(L, n2);
+}
+
+
+/*
+** Set a "random" seed. To get some randomness, use the current time
+** and the address of 'L' (in case the machine does address space layout
+** randomization).
+*/
+static void randseed (lua_State *L, RanState *state) {
+  lua_Unsigned seed1 = (lua_Unsigned)time(NULL);
+  lua_Unsigned seed2 = (lua_Unsigned)(size_t)L;
+  setseed(L, state->s, seed1, seed2);
+}
+
+
+static int math_randomseed (lua_State *L) {
+  RanState *state = (RanState *)lua_touserdata(L, lua_upvalueindex(1));
+  if (lua_isnone(L, 1)) {
+    randseed(L, state);
+  }
+  else {
+    lua_Integer n1 = luaL_checkinteger(L, 1);
+    lua_Integer n2 = luaL_optinteger(L, 2, 0);
+    setseed(L, state->s, n1, n2);
+  }
+  return 2;  /* return seeds */
+}
+
+
+static const luaL_Reg randfuncs[] = {
+  {"random", math_random},
+  {"randomseed", math_randomseed},
+  {NULL, NULL}
+};
+
+
+/*
+** Register the random functions and initialize their state.
+*/
+static void setrandfunc (lua_State *L) {
+  RanState *state = (RanState *)lua_newuserdatauv(L, sizeof(RanState), 0);
+  randseed(L, state);  /* initialize with a "random" seed */
+  lua_pop(L, 2);  /* remove pushed seeds */
+  luaL_setfuncs(L, randfuncs, 1);
+}
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Deprecated functions (for compatibility only)
+** ===================================================================
+*/
+#if defined(LUA_COMPAT_MATHLIB)
+
+static int math_cosh (lua_State *L) {
+  lua_pushnumber(L, l_mathop(cosh)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_sinh (lua_State *L) {
+  lua_pushnumber(L, l_mathop(sinh)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_tanh (lua_State *L) {
+  lua_pushnumber(L, l_mathop(tanh)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_pow (lua_State *L) {
+  lua_Number x = luaL_checknumber(L, 1);
+  lua_Number y = luaL_checknumber(L, 2);
+  lua_pushnumber(L, l_mathop(pow)(x, y));
+  return 1;
+}
+
+static int math_frexp (lua_State *L) {
+  int e;
+  lua_pushnumber(L, l_mathop(frexp)(luaL_checknumber(L, 1), &e));
+  lua_pushinteger(L, e);
+  return 2;
+}
+
+static int math_ldexp (lua_State *L) {
+  lua_Number x = luaL_checknumber(L, 1);
+  int ep = (int)luaL_checkinteger(L, 2);
+  lua_pushnumber(L, l_mathop(ldexp)(x, ep));
+  return 1;
+}
+
+static int math_log10 (lua_State *L) {
+  lua_pushnumber(L, l_mathop(log10)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+#endif
+/* }================================================================== */
+
+
+
+static const luaL_Reg mathlib[] = {
+  {"abs",   math_abs},
+  {"acos",  math_acos},
+  {"asin",  math_asin},
+  {"atan",  math_atan},
+  {"ceil",  math_ceil},
+  {"cos",   math_cos},
+  {"deg",   math_deg},
+  {"exp",   math_exp},
+  {"tointeger", math_toint},
+  {"floor", math_floor},
+  {"fmod",   math_fmod},
+  {"ult",   math_ult},
+  {"log",   math_log},
+  {"max",   math_max},
+  {"min",   math_min},
+  {"modf",   math_modf},
+  {"rad",   math_rad},
+  {"sin",   math_sin},
+  {"sqrt",  math_sqrt},
+  {"tan",   math_tan},
+  {"type", math_type},
+#if defined(LUA_COMPAT_MATHLIB)
+  {"atan2", math_atan},
+  {"cosh",   math_cosh},
+  {"sinh",   math_sinh},
+  {"tanh",   math_tanh},
+  {"pow",   math_pow},
+  {"frexp", math_frexp},
+  {"ldexp", math_ldexp},
+  {"log10", math_log10},
+#endif
+  /* placeholders */
+  {"random", NULL},
+  {"randomseed", NULL},
+  {"pi", NULL},
+  {"huge", NULL},
+  {"maxinteger", NULL},
+  {"mininteger", NULL},
+  {NULL, NULL}
+};
+
+
+/*
+** Open math library
+*/
+LUAMOD_API int luaopen_math (lua_State *L) {
+  luaL_newlib(L, mathlib);
+  lua_pushnumber(L, PI);
+  lua_setfield(L, -2, "pi");
+  lua_pushnumber(L, (lua_Number)HUGE_VAL);
+  lua_setfield(L, -2, "huge");
+  lua_pushinteger(L, LUA_MAXINTEGER);
+  lua_setfield(L, -2, "maxinteger");
+  lua_pushinteger(L, LUA_MININTEGER);
+  lua_setfield(L, -2, "mininteger");
+  setrandfunc(L);
+  return 1;
+}
+
diff --git a/src/libs/3rdparty/lua/src/lmem.c b/src/libs/3rdparty/lua/src/lmem.c
new file mode 100644
index 00000000000..9800a86fc02
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lmem.c
@@ -0,0 +1,215 @@
+/*
+** $Id: lmem.c $
+** Interface to Memory Manager
+** See Copyright Notice in lua.h
+*/
+
+#define lmem_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <stddef.h>
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+
+
+
+/*
+** About the realloc function:
+** void *frealloc (void *ud, void *ptr, size_t osize, size_t nsize);
+** ('osize' is the old size, 'nsize' is the new size)
+**
+** - frealloc(ud, p, x, 0) frees the block 'p' and returns NULL.
+** Particularly, frealloc(ud, NULL, 0, 0) does nothing,
+** which is equivalent to free(NULL) in ISO C.
+**
+** - frealloc(ud, NULL, x, s) creates a new block of size 's'
+** (no matter 'x'). Returns NULL if it cannot create the new block.
+**
+** - otherwise, frealloc(ud, b, x, y) reallocates the block 'b' from
+** size 'x' to size 'y'. Returns NULL if it cannot reallocate the
+** block to the new size.
+*/
+
+
+/*
+** Macro to call the allocation function.
+*/
+#define callfrealloc(g,block,os,ns)    ((*g->frealloc)(g->ud, block, os, ns))
+
+
+/*
+** When an allocation fails, it will try again after an emergency
+** collection, except when it cannot run a collection.  The GC should
+** not be called while the state is not fully built, as the collector
+** is not yet fully initialized. Also, it should not be called when
+** 'gcstopem' is true, because then the interpreter is in the middle of
+** a collection step.
+*/
+#define cantryagain(g)	(completestate(g) && !g->gcstopem)
+
+
+
+
+#if defined(EMERGENCYGCTESTS)
+/*
+** First allocation will fail except when freeing a block (frees never
+** fail) and when it cannot try again; this fail will trigger 'tryagain'
+** and a full GC cycle at every allocation.
+*/
+static void *firsttry (global_State *g, void *block, size_t os, size_t ns) {
+  if (ns > 0 && cantryagain(g))
+    return NULL;  /* fail */
+  else  /* normal allocation */
+    return callfrealloc(g, block, os, ns);
+}
+#else
+#define firsttry(g,block,os,ns)    callfrealloc(g, block, os, ns)
+#endif
+
+
+
+
+
+/*
+** {==================================================================
+** Functions to allocate/deallocate arrays for the Parser
+** ===================================================================
+*/
+
+/*
+** Minimum size for arrays during parsing, to avoid overhead of
+** reallocating to size 1, then 2, and then 4. All these arrays
+** will be reallocated to exact sizes or erased when parsing ends.
+*/
+#define MINSIZEARRAY	4
+
+
+void *luaM_growaux_ (lua_State *L, void *block, int nelems, int *psize,
+                     int size_elems, int limit, const char *what) {
+  void *newblock;
+  int size = *psize;
+  if (nelems + 1 <= size)  /* does one extra element still fit? */
+    return block;  /* nothing to be done */
+  if (size >= limit / 2) {  /* cannot double it? */
+    if (l_unlikely(size >= limit))  /* cannot grow even a little? */
+      luaG_runerror(L, "too many %s (limit is %d)", what, limit);
+    size = limit;  /* still have at least one free place */
+  }
+  else {
+    size *= 2;
+    if (size < MINSIZEARRAY)
+      size = MINSIZEARRAY;  /* minimum size */
+  }
+  lua_assert(nelems + 1 <= size && size <= limit);
+  /* 'limit' ensures that multiplication will not overflow */
+  newblock = luaM_saferealloc_(L, block, cast_sizet(*psize) * size_elems,
+                                         cast_sizet(size) * size_elems);
+  *psize = size;  /* update only when everything else is OK */
+  return newblock;
+}
+
+
+/*
+** In prototypes, the size of the array is also its number of
+** elements (to save memory). So, if it cannot shrink an array
+** to its number of elements, the only option is to raise an
+** error.
+*/
+void *luaM_shrinkvector_ (lua_State *L, void *block, int *size,
+                          int final_n, int size_elem) {
+  void *newblock;
+  size_t oldsize = cast_sizet((*size) * size_elem);
+  size_t newsize = cast_sizet(final_n * size_elem);
+  lua_assert(newsize <= oldsize);
+  newblock = luaM_saferealloc_(L, block, oldsize, newsize);
+  *size = final_n;
+  return newblock;
+}
+
+/* }================================================================== */
+
+
+l_noret luaM_toobig (lua_State *L) {
+  luaG_runerror(L, "memory allocation error: block too big");
+}
+
+
+/*
+** Free memory
+*/
+void luaM_free_ (lua_State *L, void *block, size_t osize) {
+  global_State *g = G(L);
+  lua_assert((osize == 0) == (block == NULL));
+  callfrealloc(g, block, osize, 0);
+  g->GCdebt -= osize;
+}
+
+
+/*
+** In case of allocation fail, this function will do an emergency
+** collection to free some memory and then try the allocation again.
+*/
+static void *tryagain (lua_State *L, void *block,
+                       size_t osize, size_t nsize) {
+  global_State *g = G(L);
+  if (cantryagain(g)) {
+    luaC_fullgc(L, 1);  /* try to free some memory... */
+    return callfrealloc(g, block, osize, nsize);  /* try again */
+  }
+  else return NULL;  /* cannot run an emergency collection */
+}
+
+
+/*
+** Generic allocation routine.
+*/
+void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) {
+  void *newblock;
+  global_State *g = G(L);
+  lua_assert((osize == 0) == (block == NULL));
+  newblock = firsttry(g, block, osize, nsize);
+  if (l_unlikely(newblock == NULL && nsize > 0)) {
+    newblock = tryagain(L, block, osize, nsize);
+    if (newblock == NULL)  /* still no memory? */
+      return NULL;  /* do not update 'GCdebt' */
+  }
+  lua_assert((nsize == 0) == (newblock == NULL));
+  g->GCdebt = (g->GCdebt + nsize) - osize;
+  return newblock;
+}
+
+
+void *luaM_saferealloc_ (lua_State *L, void *block, size_t osize,
+                                                    size_t nsize) {
+  void *newblock = luaM_realloc_(L, block, osize, nsize);
+  if (l_unlikely(newblock == NULL && nsize > 0))  /* allocation failed? */
+    luaM_error(L);
+  return newblock;
+}
+
+
+void *luaM_malloc_ (lua_State *L, size_t size, int tag) {
+  if (size == 0)
+    return NULL;  /* that's all */
+  else {
+    global_State *g = G(L);
+    void *newblock = firsttry(g, NULL, tag, size);
+    if (l_unlikely(newblock == NULL)) {
+      newblock = tryagain(L, NULL, tag, size);
+      if (newblock == NULL)
+        luaM_error(L);
+    }
+    g->GCdebt += size;
+    return newblock;
+  }
+}
diff --git a/src/libs/3rdparty/lua/src/lmem.h b/src/libs/3rdparty/lua/src/lmem.h
new file mode 100644
index 00000000000..8c75a44beb4
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lmem.h
@@ -0,0 +1,93 @@
+/*
+** $Id: lmem.h $
+** Interface to Memory Manager
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lmem_h
+#define lmem_h
+
+
+#include <stddef.h>
+
+#include "llimits.h"
+#include "lua.h"
+
+
+#define luaM_error(L)	luaD_throw(L, LUA_ERRMEM)
+
+
+/*
+** This macro tests whether it is safe to multiply 'n' by the size of
+** type 't' without overflows. Because 'e' is always constant, it avoids
+** the runtime division MAX_SIZET/(e).
+** (The macro is somewhat complex to avoid warnings:  The 'sizeof'
+** comparison avoids a runtime comparison when overflow cannot occur.
+** The compiler should be able to optimize the real test by itself, but
+** when it does it, it may give a warning about "comparison is always
+** false due to limited range of data type"; the +1 tricks the compiler,
+** avoiding this warning but also this optimization.)
+*/
+#define luaM_testsize(n,e)  \
+	(sizeof(n) >= sizeof(size_t) && cast_sizet((n)) + 1 > MAX_SIZET/(e))
+
+#define luaM_checksize(L,n,e)  \
+	(luaM_testsize(n,e) ? luaM_toobig(L) : cast_void(0))
+
+
+/*
+** Computes the minimum between 'n' and 'MAX_SIZET/sizeof(t)', so that
+** the result is not larger than 'n' and cannot overflow a 'size_t'
+** when multiplied by the size of type 't'. (Assumes that 'n' is an
+** 'int' or 'unsigned int' and that 'int' is not larger than 'size_t'.)
+*/
+#define luaM_limitN(n,t)  \
+  ((cast_sizet(n) <= MAX_SIZET/sizeof(t)) ? (n) :  \
+     cast_uint((MAX_SIZET/sizeof(t))))
+
+
+/*
+** Arrays of chars do not need any test
+*/
+#define luaM_reallocvchar(L,b,on,n)  \
+  cast_charp(luaM_saferealloc_(L, (b), (on)*sizeof(char), (n)*sizeof(char)))
+
+#define luaM_freemem(L, b, s)	luaM_free_(L, (b), (s))
+#define luaM_free(L, b)		luaM_free_(L, (b), sizeof(*(b)))
+#define luaM_freearray(L, b, n)   luaM_free_(L, (b), (n)*sizeof(*(b)))
+
+#define luaM_new(L,t)		cast(t*, luaM_malloc_(L, sizeof(t), 0))
+#define luaM_newvector(L,n,t)	cast(t*, luaM_malloc_(L, (n)*sizeof(t), 0))
+#define luaM_newvectorchecked(L,n,t) \
+  (luaM_checksize(L,n,sizeof(t)), luaM_newvector(L,n,t))
+
+#define luaM_newobject(L,tag,s)	luaM_malloc_(L, (s), tag)
+
+#define luaM_growvector(L,v,nelems,size,t,limit,e) \
+	((v)=cast(t *, luaM_growaux_(L,v,nelems,&(size),sizeof(t), \
+                         luaM_limitN(limit,t),e)))
+
+#define luaM_reallocvector(L, v,oldn,n,t) \
+   (cast(t *, luaM_realloc_(L, v, cast_sizet(oldn) * sizeof(t), \
+                                  cast_sizet(n) * sizeof(t))))
+
+#define luaM_shrinkvector(L,v,size,fs,t) \
+   ((v)=cast(t *, luaM_shrinkvector_(L, v, &(size), fs, sizeof(t))))
+
+LUAI_FUNC l_noret luaM_toobig (lua_State *L);
+
+/* not to be called directly */
+LUAI_FUNC void *luaM_realloc_ (lua_State *L, void *block, size_t oldsize,
+                                                          size_t size);
+LUAI_FUNC void *luaM_saferealloc_ (lua_State *L, void *block, size_t oldsize,
+                                                              size_t size);
+LUAI_FUNC void luaM_free_ (lua_State *L, void *block, size_t osize);
+LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int nelems,
+                               int *size, int size_elem, int limit,
+                               const char *what);
+LUAI_FUNC void *luaM_shrinkvector_ (lua_State *L, void *block, int *nelem,
+                                    int final_n, int size_elem);
+LUAI_FUNC void *luaM_malloc_ (lua_State *L, size_t size, int tag);
+
+#endif
+
diff --git a/src/libs/3rdparty/lua/src/loadlib.c b/src/libs/3rdparty/lua/src/loadlib.c
new file mode 100644
index 00000000000..d792dffaa03
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/loadlib.c
@@ -0,0 +1,767 @@
+/*
+** $Id: loadlib.c $
+** Dynamic library loader for Lua
+** See Copyright Notice in lua.h
+**
+** This module contains an implementation of loadlib for Unix systems
+** that have dlfcn, an implementation for Windows, and a stub for other
+** systems.
+*/
+
+#define loadlib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+/*
+** LUA_IGMARK is a mark to ignore all before it when building the
+** luaopen_ function name.
+*/
+#if !defined (LUA_IGMARK)
+#define LUA_IGMARK		"-"
+#endif
+
+
+/*
+** LUA_CSUBSEP is the character that replaces dots in submodule names
+** when searching for a C loader.
+** LUA_LSUBSEP is the character that replaces dots in submodule names
+** when searching for a Lua loader.
+*/
+#if !defined(LUA_CSUBSEP)
+#define LUA_CSUBSEP		LUA_DIRSEP
+#endif
+
+#if !defined(LUA_LSUBSEP)
+#define LUA_LSUBSEP		LUA_DIRSEP
+#endif
+
+
+/* prefix for open functions in C libraries */
+#define LUA_POF		"luaopen_"
+
+/* separator for open functions in C libraries */
+#define LUA_OFSEP	"_"
+
+
+/*
+** key for table in the registry that keeps handles
+** for all loaded C libraries
+*/
+static const char *const CLIBS = "_CLIBS";
+
+#define LIB_FAIL	"open"
+
+
+#define setprogdir(L)           ((void)0)
+
+
+/*
+** Special type equivalent to '(void*)' for functions in gcc
+** (to suppress warnings when converting function pointers)
+*/
+typedef void (*voidf)(void);
+
+
+/*
+** system-dependent functions
+*/
+
+/*
+** unload library 'lib'
+*/
+static void lsys_unloadlib (void *lib);
+
+/*
+** load C library in file 'path'. If 'seeglb', load with all names in
+** the library global.
+** Returns the library; in case of error, returns NULL plus an
+** error string in the stack.
+*/
+static void *lsys_load (lua_State *L, const char *path, int seeglb);
+
+/*
+** Try to find a function named 'sym' in library 'lib'.
+** Returns the function; in case of error, returns NULL plus an
+** error string in the stack.
+*/
+static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym);
+
+
+
+
+#if defined(LUA_USE_DLOPEN)	/* { */
+/*
+** {========================================================================
+** This is an implementation of loadlib based on the dlfcn interface.
+** The dlfcn interface is available in Linux, SunOS, Solaris, IRIX, FreeBSD,
+** NetBSD, AIX 4.2, HPUX 11, and  probably most other Unix flavors, at least
+** as an emulation layer on top of native functions.
+** =========================================================================
+*/
+
+#include <dlfcn.h>
+
+/*
+** Macro to convert pointer-to-void* to pointer-to-function. This cast
+** is undefined according to ISO C, but POSIX assumes that it works.
+** (The '__extension__' in gnu compilers is only to avoid warnings.)
+*/
+#if defined(__GNUC__)
+#define cast_func(p) (__extension__ (lua_CFunction)(p))
+#else
+#define cast_func(p) ((lua_CFunction)(p))
+#endif
+
+
+static void lsys_unloadlib (void *lib) {
+  dlclose(lib);
+}
+
+
+static void *lsys_load (lua_State *L, const char *path, int seeglb) {
+  void *lib = dlopen(path, RTLD_NOW | (seeglb ? RTLD_GLOBAL : RTLD_LOCAL));
+  if (l_unlikely(lib == NULL))
+    lua_pushstring(L, dlerror());
+  return lib;
+}
+
+
+static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
+  lua_CFunction f = cast_func(dlsym(lib, sym));
+  if (l_unlikely(f == NULL))
+    lua_pushstring(L, dlerror());
+  return f;
+}
+
+/* }====================================================== */
+
+
+
+#elif defined(LUA_DL_DLL)	/* }{ */
+/*
+** {======================================================================
+** This is an implementation of loadlib for Windows using native functions.
+** =======================================================================
+*/
+
+#include <windows.h>
+
+
+/*
+** optional flags for LoadLibraryEx
+*/
+#if !defined(LUA_LLE_FLAGS)
+#define LUA_LLE_FLAGS	0
+#endif
+
+
+#undef setprogdir
+
+
+/*
+** Replace in the path (on the top of the stack) any occurrence
+** of LUA_EXEC_DIR with the executable's path.
+*/
+static void setprogdir (lua_State *L) {
+  char buff[MAX_PATH + 1];
+  char *lb;
+  DWORD nsize = sizeof(buff)/sizeof(char);
+  DWORD n = GetModuleFileNameA(NULL, buff, nsize);  /* get exec. name */
+  if (n == 0 || n == nsize || (lb = strrchr(buff, '\\')) == NULL)
+    luaL_error(L, "unable to get ModuleFileName");
+  else {
+    *lb = '\0';  /* cut name on the last '\\' to get the path */
+    luaL_gsub(L, lua_tostring(L, -1), LUA_EXEC_DIR, buff);
+    lua_remove(L, -2);  /* remove original string */
+  }
+}
+
+
+
+
+static void pusherror (lua_State *L) {
+  int error = GetLastError();
+  char buffer[128];
+  if (FormatMessageA(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM,
+      NULL, error, 0, buffer, sizeof(buffer)/sizeof(char), NULL))
+    lua_pushstring(L, buffer);
+  else
+    lua_pushfstring(L, "system error %d\n", error);
+}
+
+static void lsys_unloadlib (void *lib) {
+  FreeLibrary((HMODULE)lib);
+}
+
+
+static void *lsys_load (lua_State *L, const char *path, int seeglb) {
+  HMODULE lib = LoadLibraryExA(path, NULL, LUA_LLE_FLAGS);
+  (void)(seeglb);  /* not used: symbols are 'global' by default */
+  if (lib == NULL) pusherror(L);
+  return lib;
+}
+
+
+static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
+  lua_CFunction f = (lua_CFunction)(voidf)GetProcAddress((HMODULE)lib, sym);
+  if (f == NULL) pusherror(L);
+  return f;
+}
+
+/* }====================================================== */
+
+
+#else				/* }{ */
+/*
+** {======================================================
+** Fallback for other systems
+** =======================================================
+*/
+
+#undef LIB_FAIL
+#define LIB_FAIL	"absent"
+
+
+#define DLMSG	"dynamic libraries not enabled; check your Lua installation"
+
+
+static void lsys_unloadlib (void *lib) {
+  (void)(lib);  /* not used */
+}
+
+
+static void *lsys_load (lua_State *L, const char *path, int seeglb) {
+  (void)(path); (void)(seeglb);  /* not used */
+  lua_pushliteral(L, DLMSG);
+  return NULL;
+}
+
+
+static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
+  (void)(lib); (void)(sym);  /* not used */
+  lua_pushliteral(L, DLMSG);
+  return NULL;
+}
+
+/* }====================================================== */
+#endif				/* } */
+
+
+/*
+** {==================================================================
+** Set Paths
+** ===================================================================
+*/
+
+/*
+** LUA_PATH_VAR and LUA_CPATH_VAR are the names of the environment
+** variables that Lua check to set its paths.
+*/
+#if !defined(LUA_PATH_VAR)
+#define LUA_PATH_VAR    "LUA_PATH"
+#endif
+
+#if !defined(LUA_CPATH_VAR)
+#define LUA_CPATH_VAR   "LUA_CPATH"
+#endif
+
+
+
+/*
+** return registry.LUA_NOENV as a boolean
+*/
+static int noenv (lua_State *L) {
+  int b;
+  lua_getfield(L, LUA_REGISTRYINDEX, "LUA_NOENV");
+  b = lua_toboolean(L, -1);
+  lua_pop(L, 1);  /* remove value */
+  return b;
+}
+
+
+/*
+** Set a path
+*/
+static void setpath (lua_State *L, const char *fieldname,
+                                   const char *envname,
+                                   const char *dft) {
+  const char *dftmark;
+  const char *nver = lua_pushfstring(L, "%s%s", envname, LUA_VERSUFFIX);
+  const char *path = getenv(nver);  /* try versioned name */
+  if (path == NULL)  /* no versioned environment variable? */
+    path = getenv(envname);  /* try unversioned name */
+  if (path == NULL || noenv(L))  /* no environment variable? */
+    lua_pushstring(L, dft);  /* use default */
+  else if ((dftmark = strstr(path, LUA_PATH_SEP LUA_PATH_SEP)) == NULL)
+    lua_pushstring(L, path);  /* nothing to change */
+  else {  /* path contains a ";;": insert default path in its place */
+    size_t len = strlen(path);
+    luaL_Buffer b;
+    luaL_buffinit(L, &b);
+    if (path < dftmark) {  /* is there a prefix before ';;'? */
+      luaL_addlstring(&b, path, dftmark - path);  /* add it */
+      luaL_addchar(&b, *LUA_PATH_SEP);
+    }
+    luaL_addstring(&b, dft);  /* add default */
+    if (dftmark < path + len - 2) {  /* is there a suffix after ';;'? */
+      luaL_addchar(&b, *LUA_PATH_SEP);
+      luaL_addlstring(&b, dftmark + 2, (path + len - 2) - dftmark);
+    }
+    luaL_pushresult(&b);
+  }
+  setprogdir(L);
+  lua_setfield(L, -3, fieldname);  /* package[fieldname] = path value */
+  lua_pop(L, 1);  /* pop versioned variable name ('nver') */
+}
+
+/* }================================================================== */
+
+
+/*
+** return registry.CLIBS[path]
+*/
+static void *checkclib (lua_State *L, const char *path) {
+  void *plib;
+  lua_getfield(L, LUA_REGISTRYINDEX, CLIBS);
+  lua_getfield(L, -1, path);
+  plib = lua_touserdata(L, -1);  /* plib = CLIBS[path] */
+  lua_pop(L, 2);  /* pop CLIBS table and 'plib' */
+  return plib;
+}
+
+
+/*
+** registry.CLIBS[path] = plib        -- for queries
+** registry.CLIBS[#CLIBS + 1] = plib  -- also keep a list of all libraries
+*/
+static void addtoclib (lua_State *L, const char *path, void *plib) {
+  lua_getfield(L, LUA_REGISTRYINDEX, CLIBS);
+  lua_pushlightuserdata(L, plib);
+  lua_pushvalue(L, -1);
+  lua_setfield(L, -3, path);  /* CLIBS[path] = plib */
+  lua_rawseti(L, -2, luaL_len(L, -2) + 1);  /* CLIBS[#CLIBS + 1] = plib */
+  lua_pop(L, 1);  /* pop CLIBS table */
+}
+
+
+/*
+** __gc tag method for CLIBS table: calls 'lsys_unloadlib' for all lib
+** handles in list CLIBS
+*/
+static int gctm (lua_State *L) {
+  lua_Integer n = luaL_len(L, 1);
+  for (; n >= 1; n--) {  /* for each handle, in reverse order */
+    lua_rawgeti(L, 1, n);  /* get handle CLIBS[n] */
+    lsys_unloadlib(lua_touserdata(L, -1));
+    lua_pop(L, 1);  /* pop handle */
+  }
+  return 0;
+}
+
+
+
+/* error codes for 'lookforfunc' */
+#define ERRLIB		1
+#define ERRFUNC		2
+
+/*
+** Look for a C function named 'sym' in a dynamically loaded library
+** 'path'.
+** First, check whether the library is already loaded; if not, try
+** to load it.
+** Then, if 'sym' is '*', return true (as library has been loaded).
+** Otherwise, look for symbol 'sym' in the library and push a
+** C function with that symbol.
+** Return 0 and 'true' or a function in the stack; in case of
+** errors, return an error code and an error message in the stack.
+*/
+static int lookforfunc (lua_State *L, const char *path, const char *sym) {
+  void *reg = checkclib(L, path);  /* check loaded C libraries */
+  if (reg == NULL) {  /* must load library? */
+    reg = lsys_load(L, path, *sym == '*');  /* global symbols if 'sym'=='*' */
+    if (reg == NULL) return ERRLIB;  /* unable to load library */
+    addtoclib(L, path, reg);
+  }
+  if (*sym == '*') {  /* loading only library (no function)? */
+    lua_pushboolean(L, 1);  /* return 'true' */
+    return 0;  /* no errors */
+  }
+  else {
+    lua_CFunction f = lsys_sym(L, reg, sym);
+    if (f == NULL)
+      return ERRFUNC;  /* unable to find function */
+    lua_pushcfunction(L, f);  /* else create new function */
+    return 0;  /* no errors */
+  }
+}
+
+
+static int ll_loadlib (lua_State *L) {
+  const char *path = luaL_checkstring(L, 1);
+  const char *init = luaL_checkstring(L, 2);
+  int stat = lookforfunc(L, path, init);
+  if (l_likely(stat == 0))  /* no errors? */
+    return 1;  /* return the loaded function */
+  else {  /* error; error message is on stack top */
+    luaL_pushfail(L);
+    lua_insert(L, -2);
+    lua_pushstring(L, (stat == ERRLIB) ?  LIB_FAIL : "init");
+    return 3;  /* return fail, error message, and where */
+  }
+}
+
+
+
+/*
+** {======================================================
+** 'require' function
+** =======================================================
+*/
+
+
+static int readable (const char *filename) {
+  FILE *f = fopen(filename, "r");  /* try to open file */
+  if (f == NULL) return 0;  /* open failed */
+  fclose(f);
+  return 1;
+}
+
+
+/*
+** Get the next name in '*path' = 'name1;name2;name3;...', changing
+** the ending ';' to '\0' to create a zero-terminated string. Return
+** NULL when list ends.
+*/
+static const char *getnextfilename (char **path, char *end) {
+  char *sep;
+  char *name = *path;
+  if (name == end)
+    return NULL;  /* no more names */
+  else if (*name == '\0') {  /* from previous iteration? */
+    *name = *LUA_PATH_SEP;  /* restore separator */
+    name++;  /* skip it */
+  }
+  sep = strchr(name, *LUA_PATH_SEP);  /* find next separator */
+  if (sep == NULL)  /* separator not found? */
+    sep = end;  /* name goes until the end */
+  *sep = '\0';  /* finish file name */
+  *path = sep;  /* will start next search from here */
+  return name;
+}
+
+
+/*
+** Given a path such as ";blabla.so;blublu.so", pushes the string
+**
+** no file 'blabla.so'
+**	no file 'blublu.so'
+*/
+static void pusherrornotfound (lua_State *L, const char *path) {
+  luaL_Buffer b;
+  luaL_buffinit(L, &b);
+  luaL_addstring(&b, "no file '");
+  luaL_addgsub(&b, path, LUA_PATH_SEP, "'\n\tno file '");
+  luaL_addstring(&b, "'");
+  luaL_pushresult(&b);
+}
+
+
+static const char *searchpath (lua_State *L, const char *name,
+                                             const char *path,
+                                             const char *sep,
+                                             const char *dirsep) {
+  luaL_Buffer buff;
+  char *pathname;  /* path with name inserted */
+  char *endpathname;  /* its end */
+  const char *filename;
+  /* separator is non-empty and appears in 'name'? */
+  if (*sep != '\0' && strchr(name, *sep) != NULL)
+    name = luaL_gsub(L, name, sep, dirsep);  /* replace it by 'dirsep' */
+  luaL_buffinit(L, &buff);
+  /* add path to the buffer, replacing marks ('?') with the file name */
+  luaL_addgsub(&buff, path, LUA_PATH_MARK, name);
+  luaL_addchar(&buff, '\0');
+  pathname = luaL_buffaddr(&buff);  /* writable list of file names */
+  endpathname = pathname + luaL_bufflen(&buff) - 1;
+  while ((filename = getnextfilename(&pathname, endpathname)) != NULL) {
+    if (readable(filename))  /* does file exist and is readable? */
+      return lua_pushstring(L, filename);  /* save and return name */
+  }
+  luaL_pushresult(&buff);  /* push path to create error message */
+  pusherrornotfound(L, lua_tostring(L, -1));  /* create error message */
+  return NULL;  /* not found */
+}
+
+
+static int ll_searchpath (lua_State *L) {
+  const char *f = searchpath(L, luaL_checkstring(L, 1),
+                                luaL_checkstring(L, 2),
+                                luaL_optstring(L, 3, "."),
+                                luaL_optstring(L, 4, LUA_DIRSEP));
+  if (f != NULL) return 1;
+  else {  /* error message is on top of the stack */
+    luaL_pushfail(L);
+    lua_insert(L, -2);
+    return 2;  /* return fail + error message */
+  }
+}
+
+
+static const char *findfile (lua_State *L, const char *name,
+                                           const char *pname,
+                                           const char *dirsep) {
+  const char *path;
+  lua_getfield(L, lua_upvalueindex(1), pname);
+  path = lua_tostring(L, -1);
+  if (l_unlikely(path == NULL))
+    luaL_error(L, "'package.%s' must be a string", pname);
+  return searchpath(L, name, path, ".", dirsep);
+}
+
+
+static int checkload (lua_State *L, int stat, const char *filename) {
+  if (l_likely(stat)) {  /* module loaded successfully? */
+    lua_pushstring(L, filename);  /* will be 2nd argument to module */
+    return 2;  /* return open function and file name */
+  }
+  else
+    return luaL_error(L, "error loading module '%s' from file '%s':\n\t%s",
+                          lua_tostring(L, 1), filename, lua_tostring(L, -1));
+}
+
+
+static int searcher_Lua (lua_State *L) {
+  const char *filename;
+  const char *name = luaL_checkstring(L, 1);
+  filename = findfile(L, name, "path", LUA_LSUBSEP);
+  if (filename == NULL) return 1;  /* module not found in this path */
+  return checkload(L, (luaL_loadfile(L, filename) == LUA_OK), filename);
+}
+
+
+/*
+** Try to find a load function for module 'modname' at file 'filename'.
+** First, change '.' to '_' in 'modname'; then, if 'modname' has
+** the form X-Y (that is, it has an "ignore mark"), build a function
+** name "luaopen_X" and look for it. (For compatibility, if that
+** fails, it also tries "luaopen_Y".) If there is no ignore mark,
+** look for a function named "luaopen_modname".
+*/
+static int loadfunc (lua_State *L, const char *filename, const char *modname) {
+  const char *openfunc;
+  const char *mark;
+  modname = luaL_gsub(L, modname, ".", LUA_OFSEP);
+  mark = strchr(modname, *LUA_IGMARK);
+  if (mark) {
+    int stat;
+    openfunc = lua_pushlstring(L, modname, mark - modname);
+    openfunc = lua_pushfstring(L, LUA_POF"%s", openfunc);
+    stat = lookforfunc(L, filename, openfunc);
+    if (stat != ERRFUNC) return stat;
+    modname = mark + 1;  /* else go ahead and try old-style name */
+  }
+  openfunc = lua_pushfstring(L, LUA_POF"%s", modname);
+  return lookforfunc(L, filename, openfunc);
+}
+
+
+static int searcher_C (lua_State *L) {
+  const char *name = luaL_checkstring(L, 1);
+  const char *filename = findfile(L, name, "cpath", LUA_CSUBSEP);
+  if (filename == NULL) return 1;  /* module not found in this path */
+  return checkload(L, (loadfunc(L, filename, name) == 0), filename);
+}
+
+
+static int searcher_Croot (lua_State *L) {
+  const char *filename;
+  const char *name = luaL_checkstring(L, 1);
+  const char *p = strchr(name, '.');
+  int stat;
+  if (p == NULL) return 0;  /* is root */
+  lua_pushlstring(L, name, p - name);
+  filename = findfile(L, lua_tostring(L, -1), "cpath", LUA_CSUBSEP);
+  if (filename == NULL) return 1;  /* root not found */
+  if ((stat = loadfunc(L, filename, name)) != 0) {
+    if (stat != ERRFUNC)
+      return checkload(L, 0, filename);  /* real error */
+    else {  /* open function not found */
+      lua_pushfstring(L, "no module '%s' in file '%s'", name, filename);
+      return 1;
+    }
+  }
+  lua_pushstring(L, filename);  /* will be 2nd argument to module */
+  return 2;
+}
+
+
+static int searcher_preload (lua_State *L) {
+  const char *name = luaL_checkstring(L, 1);
+  lua_getfield(L, LUA_REGISTRYINDEX, LUA_PRELOAD_TABLE);
+  if (lua_getfield(L, -1, name) == LUA_TNIL) {  /* not found? */
+    lua_pushfstring(L, "no field package.preload['%s']", name);
+    return 1;
+  }
+  else {
+    lua_pushliteral(L, ":preload:");
+    return 2;
+  }
+}
+
+
+static void findloader (lua_State *L, const char *name) {
+  int i;
+  luaL_Buffer msg;  /* to build error message */
+  /* push 'package.searchers' to index 3 in the stack */
+  if (l_unlikely(lua_getfield(L, lua_upvalueindex(1), "searchers")
+                 != LUA_TTABLE))
+    luaL_error(L, "'package.searchers' must be a table");
+  luaL_buffinit(L, &msg);
+  /*  iterate over available searchers to find a loader */
+  for (i = 1; ; i++) {
+    luaL_addstring(&msg, "\n\t");  /* error-message prefix */
+    if (l_unlikely(lua_rawgeti(L, 3, i) == LUA_TNIL)) {  /* no more searchers? */
+      lua_pop(L, 1);  /* remove nil */
+      luaL_buffsub(&msg, 2);  /* remove prefix */
+      luaL_pushresult(&msg);  /* create error message */
+      luaL_error(L, "module '%s' not found:%s", name, lua_tostring(L, -1));
+    }
+    lua_pushstring(L, name);
+    lua_call(L, 1, 2);  /* call it */
+    if (lua_isfunction(L, -2))  /* did it find a loader? */
+      return;  /* module loader found */
+    else if (lua_isstring(L, -2)) {  /* searcher returned error message? */
+      lua_pop(L, 1);  /* remove extra return */
+      luaL_addvalue(&msg);  /* concatenate error message */
+    }
+    else {  /* no error message */
+      lua_pop(L, 2);  /* remove both returns */
+      luaL_buffsub(&msg, 2);  /* remove prefix */
+    }
+  }
+}
+
+
+static int ll_require (lua_State *L) {
+  const char *name = luaL_checkstring(L, 1);
+  lua_settop(L, 1);  /* LOADED table will be at index 2 */
+  lua_getfield(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
+  lua_getfield(L, 2, name);  /* LOADED[name] */
+  if (lua_toboolean(L, -1))  /* is it there? */
+    return 1;  /* package is already loaded */
+  /* else must load package */
+  lua_pop(L, 1);  /* remove 'getfield' result */
+  findloader(L, name);
+  lua_rotate(L, -2, 1);  /* function <-> loader data */
+  lua_pushvalue(L, 1);  /* name is 1st argument to module loader */
+  lua_pushvalue(L, -3);  /* loader data is 2nd argument */
+  /* stack: ...; loader data; loader function; mod. name; loader data */
+  lua_call(L, 2, 1);  /* run loader to load module */
+  /* stack: ...; loader data; result from loader */
+  if (!lua_isnil(L, -1))  /* non-nil return? */
+    lua_setfield(L, 2, name);  /* LOADED[name] = returned value */
+  else
+    lua_pop(L, 1);  /* pop nil */
+  if (lua_getfield(L, 2, name) == LUA_TNIL) {   /* module set no value? */
+    lua_pushboolean(L, 1);  /* use true as result */
+    lua_copy(L, -1, -2);  /* replace loader result */
+    lua_setfield(L, 2, name);  /* LOADED[name] = true */
+  }
+  lua_rotate(L, -2, 1);  /* loader data <-> module result  */
+  return 2;  /* return module result and loader data */
+}
+
+/* }====================================================== */
+
+
+
+
+static const luaL_Reg pk_funcs[] = {
+  {"loadlib", ll_loadlib},
+  {"searchpath", ll_searchpath},
+  /* placeholders */
+  {"preload", NULL},
+  {"cpath", NULL},
+  {"path", NULL},
+  {"searchers", NULL},
+  {"loaded", NULL},
+  {NULL, NULL}
+};
+
+
+static const luaL_Reg ll_funcs[] = {
+  {"require", ll_require},
+  {NULL, NULL}
+};
+
+
+static void createsearcherstable (lua_State *L) {
+  static const lua_CFunction searchers[] = {
+    searcher_preload,
+    searcher_Lua,
+    searcher_C,
+    searcher_Croot,
+    NULL
+  };
+  int i;
+  /* create 'searchers' table */
+  lua_createtable(L, sizeof(searchers)/sizeof(searchers[0]) - 1, 0);
+  /* fill it with predefined searchers */
+  for (i=0; searchers[i] != NULL; i++) {
+    lua_pushvalue(L, -2);  /* set 'package' as upvalue for all searchers */
+    lua_pushcclosure(L, searchers[i], 1);
+    lua_rawseti(L, -2, i+1);
+  }
+  lua_setfield(L, -2, "searchers");  /* put it in field 'searchers' */
+}
+
+
+/*
+** create table CLIBS to keep track of loaded C libraries,
+** setting a finalizer to close all libraries when closing state.
+*/
+static void createclibstable (lua_State *L) {
+  luaL_getsubtable(L, LUA_REGISTRYINDEX, CLIBS);  /* create CLIBS table */
+  lua_createtable(L, 0, 1);  /* create metatable for CLIBS */
+  lua_pushcfunction(L, gctm);
+  lua_setfield(L, -2, "__gc");  /* set finalizer for CLIBS table */
+  lua_setmetatable(L, -2);
+}
+
+
+LUAMOD_API int luaopen_package (lua_State *L) {
+  createclibstable(L);
+  luaL_newlib(L, pk_funcs);  /* create 'package' table */
+  createsearcherstable(L);
+  /* set paths */
+  setpath(L, "path", LUA_PATH_VAR, LUA_PATH_DEFAULT);
+  setpath(L, "cpath", LUA_CPATH_VAR, LUA_CPATH_DEFAULT);
+  /* store config information */
+  lua_pushliteral(L, LUA_DIRSEP "\n" LUA_PATH_SEP "\n" LUA_PATH_MARK "\n"
+                     LUA_EXEC_DIR "\n" LUA_IGMARK "\n");
+  lua_setfield(L, -2, "config");
+  /* set field 'loaded' */
+  luaL_getsubtable(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
+  lua_setfield(L, -2, "loaded");
+  /* set field 'preload' */
+  luaL_getsubtable(L, LUA_REGISTRYINDEX, LUA_PRELOAD_TABLE);
+  lua_setfield(L, -2, "preload");
+  lua_pushglobaltable(L);
+  lua_pushvalue(L, -2);  /* set 'package' as upvalue for next lib */
+  luaL_setfuncs(L, ll_funcs, 1);  /* open lib into global table */
+  lua_pop(L, 1);  /* pop global table */
+  return 1;  /* return 'package' table */
+}
+
diff --git a/src/libs/3rdparty/lua/src/lobject.c b/src/libs/3rdparty/lua/src/lobject.c
new file mode 100644
index 00000000000..f73ffc6d92b
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lobject.c
@@ -0,0 +1,602 @@
+/*
+** $Id: lobject.c $
+** Some generic functions over Lua objects
+** See Copyright Notice in lua.h
+*/
+
+#define lobject_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <locale.h>
+#include <math.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lctype.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "lvm.h"
+
+
+/*
+** Computes ceil(log2(x))
+*/
+int luaO_ceillog2 (unsigned int x) {
+  static const lu_byte log_2[256] = {  /* log_2[i] = ceil(log2(i - 1)) */
+    0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+    6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+    8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+    8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+    8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+    8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
+  };
+  int l = 0;
+  x--;
+  while (x >= 256) { l += 8; x >>= 8; }
+  return l + log_2[x];
+}
+
+
+static lua_Integer intarith (lua_State *L, int op, lua_Integer v1,
+                                                   lua_Integer v2) {
+  switch (op) {
+    case LUA_OPADD: return intop(+, v1, v2);
+    case LUA_OPSUB:return intop(-, v1, v2);
+    case LUA_OPMUL:return intop(*, v1, v2);
+    case LUA_OPMOD: return luaV_mod(L, v1, v2);
+    case LUA_OPIDIV: return luaV_idiv(L, v1, v2);
+    case LUA_OPBAND: return intop(&, v1, v2);
+    case LUA_OPBOR: return intop(|, v1, v2);
+    case LUA_OPBXOR: return intop(^, v1, v2);
+    case LUA_OPSHL: return luaV_shiftl(v1, v2);
+    case LUA_OPSHR: return luaV_shiftr(v1, v2);
+    case LUA_OPUNM: return intop(-, 0, v1);
+    case LUA_OPBNOT: return intop(^, ~l_castS2U(0), v1);
+    default: lua_assert(0); return 0;
+  }
+}
+
+
+static lua_Number numarith (lua_State *L, int op, lua_Number v1,
+                                                  lua_Number v2) {
+  switch (op) {
+    case LUA_OPADD: return luai_numadd(L, v1, v2);
+    case LUA_OPSUB: return luai_numsub(L, v1, v2);
+    case LUA_OPMUL: return luai_nummul(L, v1, v2);
+    case LUA_OPDIV: return luai_numdiv(L, v1, v2);
+    case LUA_OPPOW: return luai_numpow(L, v1, v2);
+    case LUA_OPIDIV: return luai_numidiv(L, v1, v2);
+    case LUA_OPUNM: return luai_numunm(L, v1);
+    case LUA_OPMOD: return luaV_modf(L, v1, v2);
+    default: lua_assert(0); return 0;
+  }
+}
+
+
+int luaO_rawarith (lua_State *L, int op, const TValue *p1, const TValue *p2,
+                   TValue *res) {
+  switch (op) {
+    case LUA_OPBAND: case LUA_OPBOR: case LUA_OPBXOR:
+    case LUA_OPSHL: case LUA_OPSHR:
+    case LUA_OPBNOT: {  /* operate only on integers */
+      lua_Integer i1; lua_Integer i2;
+      if (tointegerns(p1, &i1) && tointegerns(p2, &i2)) {
+        setivalue(res, intarith(L, op, i1, i2));
+        return 1;
+      }
+      else return 0;  /* fail */
+    }
+    case LUA_OPDIV: case LUA_OPPOW: {  /* operate only on floats */
+      lua_Number n1; lua_Number n2;
+      if (tonumberns(p1, n1) && tonumberns(p2, n2)) {
+        setfltvalue(res, numarith(L, op, n1, n2));
+        return 1;
+      }
+      else return 0;  /* fail */
+    }
+    default: {  /* other operations */
+      lua_Number n1; lua_Number n2;
+      if (ttisinteger(p1) && ttisinteger(p2)) {
+        setivalue(res, intarith(L, op, ivalue(p1), ivalue(p2)));
+        return 1;
+      }
+      else if (tonumberns(p1, n1) && tonumberns(p2, n2)) {
+        setfltvalue(res, numarith(L, op, n1, n2));
+        return 1;
+      }
+      else return 0;  /* fail */
+    }
+  }
+}
+
+
+void luaO_arith (lua_State *L, int op, const TValue *p1, const TValue *p2,
+                 StkId res) {
+  if (!luaO_rawarith(L, op, p1, p2, s2v(res))) {
+    /* could not perform raw operation; try metamethod */
+    luaT_trybinTM(L, p1, p2, res, cast(TMS, (op - LUA_OPADD) + TM_ADD));
+  }
+}
+
+
+int luaO_hexavalue (int c) {
+  if (lisdigit(c)) return c - '0';
+  else return (ltolower(c) - 'a') + 10;
+}
+
+
+static int isneg (const char **s) {
+  if (**s == '-') { (*s)++; return 1; }
+  else if (**s == '+') (*s)++;
+  return 0;
+}
+
+
+
+/*
+** {==================================================================
+** Lua's implementation for 'lua_strx2number'
+** ===================================================================
+*/
+
+#if !defined(lua_strx2number)
+
+/* maximum number of significant digits to read (to avoid overflows
+   even with single floats) */
+#define MAXSIGDIG	30
+
+/*
+** convert a hexadecimal numeric string to a number, following
+** C99 specification for 'strtod'
+*/
+static lua_Number lua_strx2number (const char *s, char **endptr) {
+  int dot = lua_getlocaledecpoint();
+  lua_Number r = l_mathop(0.0);  /* result (accumulator) */
+  int sigdig = 0;  /* number of significant digits */
+  int nosigdig = 0;  /* number of non-significant digits */
+  int e = 0;  /* exponent correction */
+  int neg;  /* 1 if number is negative */
+  int hasdot = 0;  /* true after seen a dot */
+  *endptr = cast_charp(s);  /* nothing is valid yet */
+  while (lisspace(cast_uchar(*s))) s++;  /* skip initial spaces */
+  neg = isneg(&s);  /* check sign */
+  if (!(*s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X')))  /* check '0x' */
+    return l_mathop(0.0);  /* invalid format (no '0x') */
+  for (s += 2; ; s++) {  /* skip '0x' and read numeral */
+    if (*s == dot) {
+      if (hasdot) break;  /* second dot? stop loop */
+      else hasdot = 1;
+    }
+    else if (lisxdigit(cast_uchar(*s))) {
+      if (sigdig == 0 && *s == '0')  /* non-significant digit (zero)? */
+        nosigdig++;
+      else if (++sigdig <= MAXSIGDIG)  /* can read it without overflow? */
+          r = (r * l_mathop(16.0)) + luaO_hexavalue(*s);
+      else e++; /* too many digits; ignore, but still count for exponent */
+      if (hasdot) e--;  /* decimal digit? correct exponent */
+    }
+    else break;  /* neither a dot nor a digit */
+  }
+  if (nosigdig + sigdig == 0)  /* no digits? */
+    return l_mathop(0.0);  /* invalid format */
+  *endptr = cast_charp(s);  /* valid up to here */
+  e *= 4;  /* each digit multiplies/divides value by 2^4 */
+  if (*s == 'p' || *s == 'P') {  /* exponent part? */
+    int exp1 = 0;  /* exponent value */
+    int neg1;  /* exponent sign */
+    s++;  /* skip 'p' */
+    neg1 = isneg(&s);  /* sign */
+    if (!lisdigit(cast_uchar(*s)))
+      return l_mathop(0.0);  /* invalid; must have at least one digit */
+    while (lisdigit(cast_uchar(*s)))  /* read exponent */
+      exp1 = exp1 * 10 + *(s++) - '0';
+    if (neg1) exp1 = -exp1;
+    e += exp1;
+    *endptr = cast_charp(s);  /* valid up to here */
+  }
+  if (neg) r = -r;
+  return l_mathop(ldexp)(r, e);
+}
+
+#endif
+/* }====================================================== */
+
+
+/* maximum length of a numeral to be converted to a number */
+#if !defined (L_MAXLENNUM)
+#define L_MAXLENNUM	200
+#endif
+
+/*
+** Convert string 's' to a Lua number (put in 'result'). Return NULL on
+** fail or the address of the ending '\0' on success. ('mode' == 'x')
+** means a hexadecimal numeral.
+*/
+static const char *l_str2dloc (const char *s, lua_Number *result, int mode) {
+  char *endptr;
+  *result = (mode == 'x') ? lua_strx2number(s, &endptr)  /* try to convert */
+                          : lua_str2number(s, &endptr);
+  if (endptr == s) return NULL;  /* nothing recognized? */
+  while (lisspace(cast_uchar(*endptr))) endptr++;  /* skip trailing spaces */
+  return (*endptr == '\0') ? endptr : NULL;  /* OK iff no trailing chars */
+}
+
+
+/*
+** Convert string 's' to a Lua number (put in 'result') handling the
+** current locale.
+** This function accepts both the current locale or a dot as the radix
+** mark. If the conversion fails, it may mean number has a dot but
+** locale accepts something else. In that case, the code copies 's'
+** to a buffer (because 's' is read-only), changes the dot to the
+** current locale radix mark, and tries to convert again.
+** The variable 'mode' checks for special characters in the string:
+** - 'n' means 'inf' or 'nan' (which should be rejected)
+** - 'x' means a hexadecimal numeral
+** - '.' just optimizes the search for the common case (no special chars)
+*/
+static const char *l_str2d (const char *s, lua_Number *result) {
+  const char *endptr;
+  const char *pmode = strpbrk(s, ".xXnN");  /* look for special chars */
+  int mode = pmode ? ltolower(cast_uchar(*pmode)) : 0;
+  if (mode == 'n')  /* reject 'inf' and 'nan' */
+    return NULL;
+  endptr = l_str2dloc(s, result, mode);  /* try to convert */
+  if (endptr == NULL) {  /* failed? may be a different locale */
+    char buff[L_MAXLENNUM + 1];
+    const char *pdot = strchr(s, '.');
+    if (pdot == NULL || strlen(s) > L_MAXLENNUM)
+      return NULL;  /* string too long or no dot; fail */
+    strcpy(buff, s);  /* copy string to buffer */
+    buff[pdot - s] = lua_getlocaledecpoint();  /* correct decimal point */
+    endptr = l_str2dloc(buff, result, mode);  /* try again */
+    if (endptr != NULL)
+      endptr = s + (endptr - buff);  /* make relative to 's' */
+  }
+  return endptr;
+}
+
+
+#define MAXBY10		cast(lua_Unsigned, LUA_MAXINTEGER / 10)
+#define MAXLASTD	cast_int(LUA_MAXINTEGER % 10)
+
+static const char *l_str2int (const char *s, lua_Integer *result) {
+  lua_Unsigned a = 0;
+  int empty = 1;
+  int neg;
+  while (lisspace(cast_uchar(*s))) s++;  /* skip initial spaces */
+  neg = isneg(&s);
+  if (s[0] == '0' &&
+      (s[1] == 'x' || s[1] == 'X')) {  /* hex? */
+    s += 2;  /* skip '0x' */
+    for (; lisxdigit(cast_uchar(*s)); s++) {
+      a = a * 16 + luaO_hexavalue(*s);
+      empty = 0;
+    }
+  }
+  else {  /* decimal */
+    for (; lisdigit(cast_uchar(*s)); s++) {
+      int d = *s - '0';
+      if (a >= MAXBY10 && (a > MAXBY10 || d > MAXLASTD + neg))  /* overflow? */
+        return NULL;  /* do not accept it (as integer) */
+      a = a * 10 + d;
+      empty = 0;
+    }
+  }
+  while (lisspace(cast_uchar(*s))) s++;  /* skip trailing spaces */
+  if (empty || *s != '\0') return NULL;  /* something wrong in the numeral */
+  else {
+    *result = l_castU2S((neg) ? 0u - a : a);
+    return s;
+  }
+}
+
+
+size_t luaO_str2num (const char *s, TValue *o) {
+  lua_Integer i; lua_Number n;
+  const char *e;
+  if ((e = l_str2int(s, &i)) != NULL) {  /* try as an integer */
+    setivalue(o, i);
+  }
+  else if ((e = l_str2d(s, &n)) != NULL) {  /* else try as a float */
+    setfltvalue(o, n);
+  }
+  else
+    return 0;  /* conversion failed */
+  return (e - s) + 1;  /* success; return string size */
+}
+
+
+int luaO_utf8esc (char *buff, unsigned long x) {
+  int n = 1;  /* number of bytes put in buffer (backwards) */
+  lua_assert(x <= 0x7FFFFFFFu);
+  if (x < 0x80)  /* ascii? */
+    buff[UTF8BUFFSZ - 1] = cast_char(x);
+  else {  /* need continuation bytes */
+    unsigned int mfb = 0x3f;  /* maximum that fits in first byte */
+    do {  /* add continuation bytes */
+      buff[UTF8BUFFSZ - (n++)] = cast_char(0x80 | (x & 0x3f));
+      x >>= 6;  /* remove added bits */
+      mfb >>= 1;  /* now there is one less bit available in first byte */
+    } while (x > mfb);  /* still needs continuation byte? */
+    buff[UTF8BUFFSZ - n] = cast_char((~mfb << 1) | x);  /* add first byte */
+  }
+  return n;
+}
+
+
+/*
+** Maximum length of the conversion of a number to a string. Must be
+** enough to accommodate both LUA_INTEGER_FMT and LUA_NUMBER_FMT.
+** (For a long long int, this is 19 digits plus a sign and a final '\0',
+** adding to 21. For a long double, it can go to a sign, 33 digits,
+** the dot, an exponent letter, an exponent sign, 5 exponent digits,
+** and a final '\0', adding to 43.)
+*/
+#define MAXNUMBER2STR	44
+
+
+/*
+** Convert a number object to a string, adding it to a buffer
+*/
+static int tostringbuff (TValue *obj, char *buff) {
+  int len;
+  lua_assert(ttisnumber(obj));
+  if (ttisinteger(obj))
+    len = lua_integer2str(buff, MAXNUMBER2STR, ivalue(obj));
+  else {
+    len = lua_number2str(buff, MAXNUMBER2STR, fltvalue(obj));
+    if (buff[strspn(buff, "-0123456789")] == '\0') {  /* looks like an int? */
+      buff[len++] = lua_getlocaledecpoint();
+      buff[len++] = '0';  /* adds '.0' to result */
+    }
+  }
+  return len;
+}
+
+
+/*
+** Convert a number object to a Lua string, replacing the value at 'obj'
+*/
+void luaO_tostring (lua_State *L, TValue *obj) {
+  char buff[MAXNUMBER2STR];
+  int len = tostringbuff(obj, buff);
+  setsvalue(L, obj, luaS_newlstr(L, buff, len));
+}
+
+
+
+
+/*
+** {==================================================================
+** 'luaO_pushvfstring'
+** ===================================================================
+*/
+
+/*
+** Size for buffer space used by 'luaO_pushvfstring'. It should be
+** (LUA_IDSIZE + MAXNUMBER2STR) + a minimal space for basic messages,
+** so that 'luaG_addinfo' can work directly on the buffer.
+*/
+#define BUFVFS		(LUA_IDSIZE + MAXNUMBER2STR + 95)
+
+/* buffer used by 'luaO_pushvfstring' */
+typedef struct BuffFS {
+  lua_State *L;
+  int pushed;  /* true if there is a part of the result on the stack */
+  int blen;  /* length of partial string in 'space' */
+  char space[BUFVFS];  /* holds last part of the result */
+} BuffFS;
+
+
+/*
+** Push given string to the stack, as part of the result, and
+** join it to previous partial result if there is one.
+** It may call 'luaV_concat' while using one slot from EXTRA_STACK.
+** This call cannot invoke metamethods, as both operands must be
+** strings. It can, however, raise an error if the result is too
+** long. In that case, 'luaV_concat' frees the extra slot before
+** raising the error.
+*/
+static void pushstr (BuffFS *buff, const char *str, size_t lstr) {
+  lua_State *L = buff->L;
+  setsvalue2s(L, L->top.p, luaS_newlstr(L, str, lstr));
+  L->top.p++;  /* may use one slot from EXTRA_STACK */
+  if (!buff->pushed)  /* no previous string on the stack? */
+    buff->pushed = 1;  /* now there is one */
+  else  /* join previous string with new one */
+    luaV_concat(L, 2);
+}
+
+
+/*
+** empty the buffer space into the stack
+*/
+static void clearbuff (BuffFS *buff) {
+  pushstr(buff, buff->space, buff->blen);  /* push buffer contents */
+  buff->blen = 0;  /* space now is empty */
+}
+
+
+/*
+** Get a space of size 'sz' in the buffer. If buffer has not enough
+** space, empty it. 'sz' must fit in an empty buffer.
+*/
+static char *getbuff (BuffFS *buff, int sz) {
+  lua_assert(buff->blen <= BUFVFS); lua_assert(sz <= BUFVFS);
+  if (sz > BUFVFS - buff->blen)  /* not enough space? */
+    clearbuff(buff);
+  return buff->space + buff->blen;
+}
+
+
+#define addsize(b,sz)	((b)->blen += (sz))
+
+
+/*
+** Add 'str' to the buffer. If string is larger than the buffer space,
+** push the string directly to the stack.
+*/
+static void addstr2buff (BuffFS *buff, const char *str, size_t slen) {
+  if (slen <= BUFVFS) {  /* does string fit into buffer? */
+    char *bf = getbuff(buff, cast_int(slen));
+    memcpy(bf, str, slen);  /* add string to buffer */
+    addsize(buff, cast_int(slen));
+  }
+  else {  /* string larger than buffer */
+    clearbuff(buff);  /* string comes after buffer's content */
+    pushstr(buff, str, slen);  /* push string */
+  }
+}
+
+
+/*
+** Add a numeral to the buffer.
+*/
+static void addnum2buff (BuffFS *buff, TValue *num) {
+  char *numbuff = getbuff(buff, MAXNUMBER2STR);
+  int len = tostringbuff(num, numbuff);  /* format number into 'numbuff' */
+  addsize(buff, len);
+}
+
+
+/*
+** this function handles only '%d', '%c', '%f', '%p', '%s', and '%%'
+   conventional formats, plus Lua-specific '%I' and '%U'
+*/
+const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) {
+  BuffFS buff;  /* holds last part of the result */
+  const char *e;  /* points to next '%' */
+  buff.pushed = buff.blen = 0;
+  buff.L = L;
+  while ((e = strchr(fmt, '%')) != NULL) {
+    addstr2buff(&buff, fmt, e - fmt);  /* add 'fmt' up to '%' */
+    switch (*(e + 1)) {  /* conversion specifier */
+      case 's': {  /* zero-terminated string */
+        const char *s = va_arg(argp, char *);
+        if (s == NULL) s = "(null)";
+        addstr2buff(&buff, s, strlen(s));
+        break;
+      }
+      case 'c': {  /* an 'int' as a character */
+        char c = cast_uchar(va_arg(argp, int));
+        addstr2buff(&buff, &c, sizeof(char));
+        break;
+      }
+      case 'd': {  /* an 'int' */
+        TValue num;
+        setivalue(&num, va_arg(argp, int));
+        addnum2buff(&buff, &num);
+        break;
+      }
+      case 'I': {  /* a 'lua_Integer' */
+        TValue num;
+        setivalue(&num, cast(lua_Integer, va_arg(argp, l_uacInt)));
+        addnum2buff(&buff, &num);
+        break;
+      }
+      case 'f': {  /* a 'lua_Number' */
+        TValue num;
+        setfltvalue(&num, cast_num(va_arg(argp, l_uacNumber)));
+        addnum2buff(&buff, &num);
+        break;
+      }
+      case 'p': {  /* a pointer */
+        const int sz = 3 * sizeof(void*) + 8; /* enough space for '%p' */
+        char *bf = getbuff(&buff, sz);
+        void *p = va_arg(argp, void *);
+        int len = lua_pointer2str(bf, sz, p);
+        addsize(&buff, len);
+        break;
+      }
+      case 'U': {  /* a 'long' as a UTF-8 sequence */
+        char bf[UTF8BUFFSZ];
+        int len = luaO_utf8esc(bf, va_arg(argp, long));
+        addstr2buff(&buff, bf + UTF8BUFFSZ - len, len);
+        break;
+      }
+      case '%': {
+        addstr2buff(&buff, "%", 1);
+        break;
+      }
+      default: {
+        luaG_runerror(L, "invalid option '%%%c' to 'lua_pushfstring'",
+                         *(e + 1));
+      }
+    }
+    fmt = e + 2;  /* skip '%' and the specifier */
+  }
+  addstr2buff(&buff, fmt, strlen(fmt));  /* rest of 'fmt' */
+  clearbuff(&buff);  /* empty buffer into the stack */
+  lua_assert(buff.pushed == 1);
+  return svalue(s2v(L->top.p - 1));
+}
+
+
+const char *luaO_pushfstring (lua_State *L, const char *fmt, ...) {
+  const char *msg;
+  va_list argp;
+  va_start(argp, fmt);
+  msg = luaO_pushvfstring(L, fmt, argp);
+  va_end(argp);
+  return msg;
+}
+
+/* }================================================================== */
+
+
+#define RETS	"..."
+#define PRE	"[string \""
+#define POS	"\"]"
+
+#define addstr(a,b,l)	( memcpy(a,b,(l) * sizeof(char)), a += (l) )
+
+void luaO_chunkid (char *out, const char *source, size_t srclen) {
+  size_t bufflen = LUA_IDSIZE;  /* free space in buffer */
+  if (*source == '=') {  /* 'literal' source */
+    if (srclen <= bufflen)  /* small enough? */
+      memcpy(out, source + 1, srclen * sizeof(char));
+    else {  /* truncate it */
+      addstr(out, source + 1, bufflen - 1);
+      *out = '\0';
+    }
+  }
+  else if (*source == '@') {  /* file name */
+    if (srclen <= bufflen)  /* small enough? */
+      memcpy(out, source + 1, srclen * sizeof(char));
+    else {  /* add '...' before rest of name */
+      addstr(out, RETS, LL(RETS));
+      bufflen -= LL(RETS);
+      memcpy(out, source + 1 + srclen - bufflen, bufflen * sizeof(char));
+    }
+  }
+  else {  /* string; format as [string "source"] */
+    const char *nl = strchr(source, '\n');  /* find first new line (if any) */
+    addstr(out, PRE, LL(PRE));  /* add prefix */
+    bufflen -= LL(PRE RETS POS) + 1;  /* save space for prefix+suffix+'\0' */
+    if (srclen < bufflen && nl == NULL) {  /* small one-line source? */
+      addstr(out, source, srclen);  /* keep it */
+    }
+    else {
+      if (nl != NULL) srclen = nl - source;  /* stop at first newline */
+      if (srclen > bufflen) srclen = bufflen;
+      addstr(out, source, srclen);
+      addstr(out, RETS, LL(RETS));
+    }
+    memcpy(out, POS, (LL(POS) + 1) * sizeof(char));
+  }
+}
+
diff --git a/src/libs/3rdparty/lua/src/lobject.h b/src/libs/3rdparty/lua/src/lobject.h
new file mode 100644
index 00000000000..556608e4aa2
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lobject.h
@@ -0,0 +1,815 @@
+/*
+** $Id: lobject.h $
+** Type definitions for Lua objects
+** See Copyright Notice in lua.h
+*/
+
+
+#ifndef lobject_h
+#define lobject_h
+
+
+#include <stdarg.h>
+
+
+#include "llimits.h"
+#include "lua.h"
+
+
+/*
+** Extra types for collectable non-values
+*/
+#define LUA_TUPVAL	LUA_NUMTYPES  /* upvalues */
+#define LUA_TPROTO	(LUA_NUMTYPES+1)  /* function prototypes */
+#define LUA_TDEADKEY	(LUA_NUMTYPES+2)  /* removed keys in tables */
+
+
+
+/*
+** number of all possible types (including LUA_TNONE but excluding DEADKEY)
+*/
+#define LUA_TOTALTYPES		(LUA_TPROTO + 2)
+
+
+/*
+** tags for Tagged Values have the following use of bits:
+** bits 0-3: actual tag (a LUA_T* constant)
+** bits 4-5: variant bits
+** bit 6: whether value is collectable
+*/
+
+/* add variant bits to a type */
+#define makevariant(t,v)	((t) | ((v) << 4))
+
+
+
+/*
+** Union of all Lua values
+*/
+typedef union Value {
+  struct GCObject *gc;    /* collectable objects */
+  void *p;         /* light userdata */
+  lua_CFunction f; /* light C functions */
+  lua_Integer i;   /* integer numbers */
+  lua_Number n;    /* float numbers */
+  /* not used, but may avoid warnings for uninitialized value */
+  lu_byte ub;
+} Value;
+
+
+/*
+** Tagged Values. This is the basic representation of values in Lua:
+** an actual value plus a tag with its type.
+*/
+
+#define TValuefields	Value value_; lu_byte tt_
+
+typedef struct TValue {
+  TValuefields;
+} TValue;
+
+
+#define val_(o)		((o)->value_)
+#define valraw(o)	(val_(o))
+
+
+/* raw type tag of a TValue */
+#define rawtt(o)	((o)->tt_)
+
+/* tag with no variants (bits 0-3) */
+#define novariant(t)	((t) & 0x0F)
+
+/* type tag of a TValue (bits 0-3 for tags + variant bits 4-5) */
+#define withvariant(t)	((t) & 0x3F)
+#define ttypetag(o)	withvariant(rawtt(o))
+
+/* type of a TValue */
+#define ttype(o)	(novariant(rawtt(o)))
+
+
+/* Macros to test type */
+#define checktag(o,t)		(rawtt(o) == (t))
+#define checktype(o,t)		(ttype(o) == (t))
+
+
+/* Macros for internal tests */
+
+/* collectable object has the same tag as the original value */
+#define righttt(obj)		(ttypetag(obj) == gcvalue(obj)->tt)
+
+/*
+** Any value being manipulated by the program either is non
+** collectable, or the collectable object has the right tag
+** and it is not dead. The option 'L == NULL' allows other
+** macros using this one to be used where L is not available.
+*/
+#define checkliveness(L,obj) \
+	((void)L, lua_longassert(!iscollectable(obj) || \
+		(righttt(obj) && (L == NULL || !isdead(G(L),gcvalue(obj))))))
+
+
+/* Macros to set values */
+
+/* set a value's tag */
+#define settt_(o,t)	((o)->tt_=(t))
+
+
+/* main macro to copy values (from 'obj2' to 'obj1') */
+#define setobj(L,obj1,obj2) \
+	{ TValue *io1=(obj1); const TValue *io2=(obj2); \
+          io1->value_ = io2->value_; settt_(io1, io2->tt_); \
+	  checkliveness(L,io1); lua_assert(!isnonstrictnil(io1)); }
+
+/*
+** Different types of assignments, according to source and destination.
+** (They are mostly equal now, but may be different in the future.)
+*/
+
+/* from stack to stack */
+#define setobjs2s(L,o1,o2)	setobj(L,s2v(o1),s2v(o2))
+/* to stack (not from same stack) */
+#define setobj2s(L,o1,o2)	setobj(L,s2v(o1),o2)
+/* from table to same table */
+#define setobjt2t	setobj
+/* to new object */
+#define setobj2n	setobj
+/* to table */
+#define setobj2t	setobj
+
+
+/*
+** Entries in a Lua stack. Field 'tbclist' forms a list of all
+** to-be-closed variables active in this stack. Dummy entries are
+** used when the distance between two tbc variables does not fit
+** in an unsigned short. They are represented by delta==0, and
+** their real delta is always the maximum value that fits in
+** that field.
+*/
+typedef union StackValue {
+  TValue val;
+  struct {
+    TValuefields;
+    unsigned short delta;
+  } tbclist;
+} StackValue;
+
+
+/* index to stack elements */
+typedef StackValue *StkId;
+
+
+/*
+** When reallocating the stack, change all pointers to the stack into
+** proper offsets.
+*/
+typedef union {
+  StkId p;  /* actual pointer */
+  ptrdiff_t offset;  /* used while the stack is being reallocated */
+} StkIdRel;
+
+
+/* convert a 'StackValue' to a 'TValue' */
+#define s2v(o)	(&(o)->val)
+
+
+
+/*
+** {==================================================================
+** Nil
+** ===================================================================
+*/
+
+/* Standard nil */
+#define LUA_VNIL	makevariant(LUA_TNIL, 0)
+
+/* Empty slot (which might be different from a slot containing nil) */
+#define LUA_VEMPTY	makevariant(LUA_TNIL, 1)
+
+/* Value returned for a key not found in a table (absent key) */
+#define LUA_VABSTKEY	makevariant(LUA_TNIL, 2)
+
+
+/* macro to test for (any kind of) nil */
+#define ttisnil(v)		checktype((v), LUA_TNIL)
+
+
+/* macro to test for a standard nil */
+#define ttisstrictnil(o)	checktag((o), LUA_VNIL)
+
+
+#define setnilvalue(obj) settt_(obj, LUA_VNIL)
+
+
+#define isabstkey(v)		checktag((v), LUA_VABSTKEY)
+
+
+/*
+** macro to detect non-standard nils (used only in assertions)
+*/
+#define isnonstrictnil(v)	(ttisnil(v) && !ttisstrictnil(v))
+
+
+/*
+** By default, entries with any kind of nil are considered empty.
+** (In any definition, values associated with absent keys must also
+** be accepted as empty.)
+*/
+#define isempty(v)		ttisnil(v)
+
+
+/* macro defining a value corresponding to an absent key */
+#define ABSTKEYCONSTANT		{NULL}, LUA_VABSTKEY
+
+
+/* mark an entry as empty */
+#define setempty(v)		settt_(v, LUA_VEMPTY)
+
+
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Booleans
+** ===================================================================
+*/
+
+
+#define LUA_VFALSE	makevariant(LUA_TBOOLEAN, 0)
+#define LUA_VTRUE	makevariant(LUA_TBOOLEAN, 1)
+
+#define ttisboolean(o)		checktype((o), LUA_TBOOLEAN)
+#define ttisfalse(o)		checktag((o), LUA_VFALSE)
+#define ttistrue(o)		checktag((o), LUA_VTRUE)
+
+
+#define l_isfalse(o)	(ttisfalse(o) || ttisnil(o))
+
+
+#define setbfvalue(obj)		settt_(obj, LUA_VFALSE)
+#define setbtvalue(obj)		settt_(obj, LUA_VTRUE)
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Threads
+** ===================================================================
+*/
+
+#define LUA_VTHREAD		makevariant(LUA_TTHREAD, 0)
+
+#define ttisthread(o)		checktag((o), ctb(LUA_VTHREAD))
+
+#define thvalue(o)	check_exp(ttisthread(o), gco2th(val_(o).gc))
+
+#define setthvalue(L,obj,x) \
+  { TValue *io = (obj); lua_State *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(LUA_VTHREAD)); \
+    checkliveness(L,io); }
+
+#define setthvalue2s(L,o,t)	setthvalue(L,s2v(o),t)
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Collectable Objects
+** ===================================================================
+*/
+
+/*
+** Common Header for all collectable objects (in macro form, to be
+** included in other objects)
+*/
+#define CommonHeader	struct GCObject *next; lu_byte tt; lu_byte marked
+
+
+/* Common type for all collectable objects */
+typedef struct GCObject {
+  CommonHeader;
+} GCObject;
+
+
+/* Bit mark for collectable types */
+#define BIT_ISCOLLECTABLE	(1 << 6)
+
+#define iscollectable(o)	(rawtt(o) & BIT_ISCOLLECTABLE)
+
+/* mark a tag as collectable */
+#define ctb(t)			((t) | BIT_ISCOLLECTABLE)
+
+#define gcvalue(o)	check_exp(iscollectable(o), val_(o).gc)
+
+#define gcvalueraw(v)	((v).gc)
+
+#define setgcovalue(L,obj,x) \
+  { TValue *io = (obj); GCObject *i_g=(x); \
+    val_(io).gc = i_g; settt_(io, ctb(i_g->tt)); }
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Numbers
+** ===================================================================
+*/
+
+/* Variant tags for numbers */
+#define LUA_VNUMINT	makevariant(LUA_TNUMBER, 0)  /* integer numbers */
+#define LUA_VNUMFLT	makevariant(LUA_TNUMBER, 1)  /* float numbers */
+
+#define ttisnumber(o)		checktype((o), LUA_TNUMBER)
+#define ttisfloat(o)		checktag((o), LUA_VNUMFLT)
+#define ttisinteger(o)		checktag((o), LUA_VNUMINT)
+
+#define nvalue(o)	check_exp(ttisnumber(o), \
+	(ttisinteger(o) ? cast_num(ivalue(o)) : fltvalue(o)))
+#define fltvalue(o)	check_exp(ttisfloat(o), val_(o).n)
+#define ivalue(o)	check_exp(ttisinteger(o), val_(o).i)
+
+#define fltvalueraw(v)	((v).n)
+#define ivalueraw(v)	((v).i)
+
+#define setfltvalue(obj,x) \
+  { TValue *io=(obj); val_(io).n=(x); settt_(io, LUA_VNUMFLT); }
+
+#define chgfltvalue(obj,x) \
+  { TValue *io=(obj); lua_assert(ttisfloat(io)); val_(io).n=(x); }
+
+#define setivalue(obj,x) \
+  { TValue *io=(obj); val_(io).i=(x); settt_(io, LUA_VNUMINT); }
+
+#define chgivalue(obj,x) \
+  { TValue *io=(obj); lua_assert(ttisinteger(io)); val_(io).i=(x); }
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Strings
+** ===================================================================
+*/
+
+/* Variant tags for strings */
+#define LUA_VSHRSTR	makevariant(LUA_TSTRING, 0)  /* short strings */
+#define LUA_VLNGSTR	makevariant(LUA_TSTRING, 1)  /* long strings */
+
+#define ttisstring(o)		checktype((o), LUA_TSTRING)
+#define ttisshrstring(o)	checktag((o), ctb(LUA_VSHRSTR))
+#define ttislngstring(o)	checktag((o), ctb(LUA_VLNGSTR))
+
+#define tsvalueraw(v)	(gco2ts((v).gc))
+
+#define tsvalue(o)	check_exp(ttisstring(o), gco2ts(val_(o).gc))
+
+#define setsvalue(L,obj,x) \
+  { TValue *io = (obj); TString *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(x_->tt)); \
+    checkliveness(L,io); }
+
+/* set a string to the stack */
+#define setsvalue2s(L,o,s)	setsvalue(L,s2v(o),s)
+
+/* set a string to a new object */
+#define setsvalue2n	setsvalue
+
+
+/*
+** Header for a string value.
+*/
+typedef struct TString {
+  CommonHeader;
+  lu_byte extra;  /* reserved words for short strings; "has hash" for longs */
+  lu_byte shrlen;  /* length for short strings */
+  unsigned int hash;
+  union {
+    size_t lnglen;  /* length for long strings */
+    struct TString *hnext;  /* linked list for hash table */
+  } u;
+  char contents[1];
+} TString;
+
+
+
+/*
+** Get the actual string (array of bytes) from a 'TString'.
+*/
+#define getstr(ts)  ((ts)->contents)
+
+
+/* get the actual string (array of bytes) from a Lua value */
+#define svalue(o)       getstr(tsvalue(o))
+
+/* get string length from 'TString *s' */
+#define tsslen(s)	((s)->tt == LUA_VSHRSTR ? (s)->shrlen : (s)->u.lnglen)
+
+/* get string length from 'TValue *o' */
+#define vslen(o)	tsslen(tsvalue(o))
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Userdata
+** ===================================================================
+*/
+
+
+/*
+** Light userdata should be a variant of userdata, but for compatibility
+** reasons they are also different types.
+*/
+#define LUA_VLIGHTUSERDATA	makevariant(LUA_TLIGHTUSERDATA, 0)
+
+#define LUA_VUSERDATA		makevariant(LUA_TUSERDATA, 0)
+
+#define ttislightuserdata(o)	checktag((o), LUA_VLIGHTUSERDATA)
+#define ttisfulluserdata(o)	checktag((o), ctb(LUA_VUSERDATA))
+
+#define pvalue(o)	check_exp(ttislightuserdata(o), val_(o).p)
+#define uvalue(o)	check_exp(ttisfulluserdata(o), gco2u(val_(o).gc))
+
+#define pvalueraw(v)	((v).p)
+
+#define setpvalue(obj,x) \
+  { TValue *io=(obj); val_(io).p=(x); settt_(io, LUA_VLIGHTUSERDATA); }
+
+#define setuvalue(L,obj,x) \
+  { TValue *io = (obj); Udata *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(LUA_VUSERDATA)); \
+    checkliveness(L,io); }
+
+
+/* Ensures that addresses after this type are always fully aligned. */
+typedef union UValue {
+  TValue uv;
+  LUAI_MAXALIGN;  /* ensures maximum alignment for udata bytes */
+} UValue;
+
+
+/*
+** Header for userdata with user values;
+** memory area follows the end of this structure.
+*/
+typedef struct Udata {
+  CommonHeader;
+  unsigned short nuvalue;  /* number of user values */
+  size_t len;  /* number of bytes */
+  struct Table *metatable;
+  GCObject *gclist;
+  UValue uv[1];  /* user values */
+} Udata;
+
+
+/*
+** Header for userdata with no user values. These userdata do not need
+** to be gray during GC, and therefore do not need a 'gclist' field.
+** To simplify, the code always use 'Udata' for both kinds of userdata,
+** making sure it never accesses 'gclist' on userdata with no user values.
+** This structure here is used only to compute the correct size for
+** this representation. (The 'bindata' field in its end ensures correct
+** alignment for binary data following this header.)
+*/
+typedef struct Udata0 {
+  CommonHeader;
+  unsigned short nuvalue;  /* number of user values */
+  size_t len;  /* number of bytes */
+  struct Table *metatable;
+  union {LUAI_MAXALIGN;} bindata;
+} Udata0;
+
+
+/* compute the offset of the memory area of a userdata */
+#define udatamemoffset(nuv) \
+	((nuv) == 0 ? offsetof(Udata0, bindata)  \
+                    : offsetof(Udata, uv) + (sizeof(UValue) * (nuv)))
+
+/* get the address of the memory block inside 'Udata' */
+#define getudatamem(u)	(cast_charp(u) + udatamemoffset((u)->nuvalue))
+
+/* compute the size of a userdata */
+#define sizeudata(nuv,nb)	(udatamemoffset(nuv) + (nb))
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Prototypes
+** ===================================================================
+*/
+
+#define LUA_VPROTO	makevariant(LUA_TPROTO, 0)
+
+
+/*
+** Description of an upvalue for function prototypes
+*/
+typedef struct Upvaldesc {
+  TString *name;  /* upvalue name (for debug information) */
+  lu_byte instack;  /* whether it is in stack (register) */
+  lu_byte idx;  /* index of upvalue (in stack or in outer function's list) */
+  lu_byte kind;  /* kind of corresponding variable */
+} Upvaldesc;
+
+
+/*
+** Description of a local variable for function prototypes
+** (used for debug information)
+*/
+typedef struct LocVar {
+  TString *varname;
+  int startpc;  /* first point where variable is active */
+  int endpc;    /* first point where variable is dead */
+} LocVar;
+
+
+/*
+** Associates the absolute line source for a given instruction ('pc').
+** The array 'lineinfo' gives, for each instruction, the difference in
+** lines from the previous instruction. When that difference does not
+** fit into a byte, Lua saves the absolute line for that instruction.
+** (Lua also saves the absolute line periodically, to speed up the
+** computation of a line number: we can use binary search in the
+** absolute-line array, but we must traverse the 'lineinfo' array
+** linearly to compute a line.)
+*/
+typedef struct AbsLineInfo {
+  int pc;
+  int line;
+} AbsLineInfo;
+
+/*
+** Function Prototypes
+*/
+typedef struct Proto {
+  CommonHeader;
+  lu_byte numparams;  /* number of fixed (named) parameters */
+  lu_byte is_vararg;
+  lu_byte maxstacksize;  /* number of registers needed by this function */
+  int sizeupvalues;  /* size of 'upvalues' */
+  int sizek;  /* size of 'k' */
+  int sizecode;
+  int sizelineinfo;
+  int sizep;  /* size of 'p' */
+  int sizelocvars;
+  int sizeabslineinfo;  /* size of 'abslineinfo' */
+  int linedefined;  /* debug information  */
+  int lastlinedefined;  /* debug information  */
+  TValue *k;  /* constants used by the function */
+  Instruction *code;  /* opcodes */
+  struct Proto **p;  /* functions defined inside the function */
+  Upvaldesc *upvalues;  /* upvalue information */
+  ls_byte *lineinfo;  /* information about source lines (debug information) */
+  AbsLineInfo *abslineinfo;  /* idem */
+  LocVar *locvars;  /* information about local variables (debug information) */
+  TString  *source;  /* used for debug information */
+  GCObject *gclist;
+} Proto;
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Functions
+** ===================================================================
+*/
+
+#define LUA_VUPVAL	makevariant(LUA_TUPVAL, 0)
+
+
+/* Variant tags for functions */
+#define LUA_VLCL	makevariant(LUA_TFUNCTION, 0)  /* Lua closure */
+#define LUA_VLCF	makevariant(LUA_TFUNCTION, 1)  /* light C function */
+#define LUA_VCCL	makevariant(LUA_TFUNCTION, 2)  /* C closure */
+
+#define ttisfunction(o)		checktype(o, LUA_TFUNCTION)
+#define ttisLclosure(o)		checktag((o), ctb(LUA_VLCL))
+#define ttislcf(o)		checktag((o), LUA_VLCF)
+#define ttisCclosure(o)		checktag((o), ctb(LUA_VCCL))
+#define ttisclosure(o)         (ttisLclosure(o) || ttisCclosure(o))
+
+
+#define isLfunction(o)	ttisLclosure(o)
+
+#define clvalue(o)	check_exp(ttisclosure(o), gco2cl(val_(o).gc))
+#define clLvalue(o)	check_exp(ttisLclosure(o), gco2lcl(val_(o).gc))
+#define fvalue(o)	check_exp(ttislcf(o), val_(o).f)
+#define clCvalue(o)	check_exp(ttisCclosure(o), gco2ccl(val_(o).gc))
+
+#define fvalueraw(v)	((v).f)
+
+#define setclLvalue(L,obj,x) \
+  { TValue *io = (obj); LClosure *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(LUA_VLCL)); \
+    checkliveness(L,io); }
+
+#define setclLvalue2s(L,o,cl)	setclLvalue(L,s2v(o),cl)
+
+#define setfvalue(obj,x) \
+  { TValue *io=(obj); val_(io).f=(x); settt_(io, LUA_VLCF); }
+
+#define setclCvalue(L,obj,x) \
+  { TValue *io = (obj); CClosure *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(LUA_VCCL)); \
+    checkliveness(L,io); }
+
+
+/*
+** Upvalues for Lua closures
+*/
+typedef struct UpVal {
+  CommonHeader;
+  union {
+    TValue *p;  /* points to stack or to its own value */
+    ptrdiff_t offset;  /* used while the stack is being reallocated */
+  } v;
+  union {
+    struct {  /* (when open) */
+      struct UpVal *next;  /* linked list */
+      struct UpVal **previous;
+    } open;
+    TValue value;  /* the value (when closed) */
+  } u;
+} UpVal;
+
+
+
+#define ClosureHeader \
+	CommonHeader; lu_byte nupvalues; GCObject *gclist
+
+typedef struct CClosure {
+  ClosureHeader;
+  lua_CFunction f;
+  TValue upvalue[1];  /* list of upvalues */
+} CClosure;
+
+
+typedef struct LClosure {
+  ClosureHeader;
+  struct Proto *p;
+  UpVal *upvals[1];  /* list of upvalues */
+} LClosure;
+
+
+typedef union Closure {
+  CClosure c;
+  LClosure l;
+} Closure;
+
+
+#define getproto(o)	(clLvalue(o)->p)
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Tables
+** ===================================================================
+*/
+
+#define LUA_VTABLE	makevariant(LUA_TTABLE, 0)
+
+#define ttistable(o)		checktag((o), ctb(LUA_VTABLE))
+
+#define hvalue(o)	check_exp(ttistable(o), gco2t(val_(o).gc))
+
+#define sethvalue(L,obj,x) \
+  { TValue *io = (obj); Table *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(LUA_VTABLE)); \
+    checkliveness(L,io); }
+
+#define sethvalue2s(L,o,h)	sethvalue(L,s2v(o),h)
+
+
+/*
+** Nodes for Hash tables: A pack of two TValue's (key-value pairs)
+** plus a 'next' field to link colliding entries. The distribution
+** of the key's fields ('key_tt' and 'key_val') not forming a proper
+** 'TValue' allows for a smaller size for 'Node' both in 4-byte
+** and 8-byte alignments.
+*/
+typedef union Node {
+  struct NodeKey {
+    TValuefields;  /* fields for value */
+    lu_byte key_tt;  /* key type */
+    int next;  /* for chaining */
+    Value key_val;  /* key value */
+  } u;
+  TValue i_val;  /* direct access to node's value as a proper 'TValue' */
+} Node;
+
+
+/* copy a value into a key */
+#define setnodekey(L,node,obj) \
+	{ Node *n_=(node); const TValue *io_=(obj); \
+	  n_->u.key_val = io_->value_; n_->u.key_tt = io_->tt_; \
+	  checkliveness(L,io_); }
+
+
+/* copy a value from a key */
+#define getnodekey(L,obj,node) \
+	{ TValue *io_=(obj); const Node *n_=(node); \
+	  io_->value_ = n_->u.key_val; io_->tt_ = n_->u.key_tt; \
+	  checkliveness(L,io_); }
+
+
+/*
+** About 'alimit': if 'isrealasize(t)' is true, then 'alimit' is the
+** real size of 'array'. Otherwise, the real size of 'array' is the
+** smallest power of two not smaller than 'alimit' (or zero iff 'alimit'
+** is zero); 'alimit' is then used as a hint for #t.
+*/
+
+#define BITRAS		(1 << 7)
+#define isrealasize(t)		(!((t)->flags & BITRAS))
+#define setrealasize(t)		((t)->flags &= cast_byte(~BITRAS))
+#define setnorealasize(t)	((t)->flags |= BITRAS)
+
+
+typedef struct Table {
+  CommonHeader;
+  lu_byte flags;  /* 1<<p means tagmethod(p) is not present */
+  lu_byte lsizenode;  /* log2 of size of 'node' array */
+  unsigned int alimit;  /* "limit" of 'array' array */
+  TValue *array;  /* array part */
+  Node *node;
+  Node *lastfree;  /* any free position is before this position */
+  struct Table *metatable;
+  GCObject *gclist;
+} Table;
+
+
+/*
+** Macros to manipulate keys inserted in nodes
+*/
+#define keytt(node)		((node)->u.key_tt)
+#define keyval(node)		((node)->u.key_val)
+
+#define keyisnil(node)		(keytt(node) == LUA_TNIL)
+#define keyisinteger(node)	(keytt(node) == LUA_VNUMINT)
+#define keyival(node)		(keyval(node).i)
+#define keyisshrstr(node)	(keytt(node) == ctb(LUA_VSHRSTR))
+#define keystrval(node)		(gco2ts(keyval(node).gc))
+
+#define setnilkey(node)		(keytt(node) = LUA_TNIL)
+
+#define keyiscollectable(n)	(keytt(n) & BIT_ISCOLLECTABLE)
+
+#define gckey(n)	(keyval(n).gc)
+#define gckeyN(n)	(keyiscollectable(n) ? gckey(n) : NULL)
+
+
+/*
+** Dead keys in tables have the tag DEADKEY but keep their original
+** gcvalue. This distinguishes them from regular keys but allows them to
+** be found when searched in a special way. ('next' needs that to find
+** keys removed from a table during a traversal.)
+*/
+#define setdeadkey(node)	(keytt(node) = LUA_TDEADKEY)
+#define keyisdead(node)		(keytt(node) == LUA_TDEADKEY)
+
+/* }================================================================== */
+
+
+
+/*
+** 'module' operation for hashing (size is always a power of 2)
+*/
+#define lmod(s,size) \
+	(check_exp((size&(size-1))==0, (cast_int((s) & ((size)-1)))))
+
+
+#define twoto(x)	(1<<(x))
+#define sizenode(t)	(twoto((t)->lsizenode))
+
+
+/* size of buffer for 'luaO_utf8esc' function */
+#define UTF8BUFFSZ	8
+
+LUAI_FUNC int luaO_utf8esc (char *buff, unsigned long x);
+LUAI_FUNC int luaO_ceillog2 (unsigned int x);
+LUAI_FUNC int luaO_rawarith (lua_State *L, int op, const TValue *p1,
+                             const TValue *p2, TValue *res);
+LUAI_FUNC void luaO_arith (lua_State *L, int op, const TValue *p1,
+                           const TValue *p2, StkId res);
+LUAI_FUNC size_t luaO_str2num (const char *s, TValue *o);
+LUAI_FUNC int luaO_hexavalue (int c);
+LUAI_FUNC void luaO_tostring (lua_State *L, TValue *obj);
+LUAI_FUNC const char *luaO_pushvfstring (lua_State *L, const char *fmt,
+                                                       va_list argp);
+LUAI_FUNC const char *luaO_pushfstring (lua_State *L, const char *fmt, ...);
+LUAI_FUNC void luaO_chunkid (char *out, const char *source, size_t srclen);
+
+
+#endif
+
diff --git a/src/libs/3rdparty/lua/src/lopcodes.c b/src/libs/3rdparty/lua/src/lopcodes.c
new file mode 100644
index 00000000000..c67aa227c58
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lopcodes.c
@@ -0,0 +1,104 @@
+/*
+** $Id: lopcodes.c $
+** Opcodes for Lua virtual machine
+** See Copyright Notice in lua.h
+*/
+
+#define lopcodes_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include "lopcodes.h"
+
+
+/* ORDER OP */
+
+LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = {
+/*       MM OT IT T  A  mode		   opcode  */
+  opmode(0, 0, 0, 0, 1, iABC)		/* OP_MOVE */
+ ,opmode(0, 0, 0, 0, 1, iAsBx)		/* OP_LOADI */
+ ,opmode(0, 0, 0, 0, 1, iAsBx)		/* OP_LOADF */
+ ,opmode(0, 0, 0, 0, 1, iABx)		/* OP_LOADK */
+ ,opmode(0, 0, 0, 0, 1, iABx)		/* OP_LOADKX */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_LOADFALSE */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_LFALSESKIP */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_LOADTRUE */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_LOADNIL */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_GETUPVAL */
+ ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_SETUPVAL */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_GETTABUP */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_GETTABLE */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_GETI */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_GETFIELD */
+ ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_SETTABUP */
+ ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_SETTABLE */
+ ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_SETI */
+ ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_SETFIELD */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_NEWTABLE */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_SELF */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_ADDI */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_ADDK */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_SUBK */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_MULK */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_MODK */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_POWK */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_DIVK */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_IDIVK */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_BANDK */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_BORK */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_BXORK */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_SHRI */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_SHLI */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_ADD */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_SUB */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_MUL */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_MOD */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_POW */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_DIV */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_IDIV */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_BAND */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_BOR */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_BXOR */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_SHL */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_SHR */
+ ,opmode(1, 0, 0, 0, 0, iABC)		/* OP_MMBIN */
+ ,opmode(1, 0, 0, 0, 0, iABC)		/* OP_MMBINI*/
+ ,opmode(1, 0, 0, 0, 0, iABC)		/* OP_MMBINK*/
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_UNM */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_BNOT */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_NOT */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_LEN */
+ ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_CONCAT */
+ ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_CLOSE */
+ ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_TBC */
+ ,opmode(0, 0, 0, 0, 0, isJ)		/* OP_JMP */
+ ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_EQ */
+ ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_LT */
+ ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_LE */
+ ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_EQK */
+ ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_EQI */
+ ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_LTI */
+ ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_LEI */
+ ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_GTI */
+ ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_GEI */
+ ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_TEST */
+ ,opmode(0, 0, 0, 1, 1, iABC)		/* OP_TESTSET */
+ ,opmode(0, 1, 1, 0, 1, iABC)		/* OP_CALL */
+ ,opmode(0, 1, 1, 0, 1, iABC)		/* OP_TAILCALL */
+ ,opmode(0, 0, 1, 0, 0, iABC)		/* OP_RETURN */
+ ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_RETURN0 */
+ ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_RETURN1 */
+ ,opmode(0, 0, 0, 0, 1, iABx)		/* OP_FORLOOP */
+ ,opmode(0, 0, 0, 0, 1, iABx)		/* OP_FORPREP */
+ ,opmode(0, 0, 0, 0, 0, iABx)		/* OP_TFORPREP */
+ ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_TFORCALL */
+ ,opmode(0, 0, 0, 0, 1, iABx)		/* OP_TFORLOOP */
+ ,opmode(0, 0, 1, 0, 0, iABC)		/* OP_SETLIST */
+ ,opmode(0, 0, 0, 0, 1, iABx)		/* OP_CLOSURE */
+ ,opmode(0, 1, 0, 0, 1, iABC)		/* OP_VARARG */
+ ,opmode(0, 0, 1, 0, 1, iABC)		/* OP_VARARGPREP */
+ ,opmode(0, 0, 0, 0, 0, iAx)		/* OP_EXTRAARG */
+};
+
diff --git a/src/libs/3rdparty/lua/src/lopcodes.h b/src/libs/3rdparty/lua/src/lopcodes.h
new file mode 100644
index 00000000000..4c55145399f
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lopcodes.h
@@ -0,0 +1,405 @@
+/*
+** $Id: lopcodes.h $
+** Opcodes for Lua virtual machine
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lopcodes_h
+#define lopcodes_h
+
+#include "llimits.h"
+
+
+/*===========================================================================
+  We assume that instructions are unsigned 32-bit integers.
+  All instructions have an opcode in the first 7 bits.
+  Instructions can have the following formats:
+
+        3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
+        1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+iABC          C(8)     |      B(8)     |k|     A(8)      |   Op(7)     |
+iABx                Bx(17)               |     A(8)      |   Op(7)     |
+iAsBx              sBx (signed)(17)      |     A(8)      |   Op(7)     |
+iAx                           Ax(25)                     |   Op(7)     |
+isJ                           sJ (signed)(25)            |   Op(7)     |
+
+  A signed argument is represented in excess K: the represented value is
+  the written unsigned value minus K, where K is half the maximum for the
+  corresponding unsigned argument.
+===========================================================================*/
+
+
+enum OpMode {iABC, iABx, iAsBx, iAx, isJ};  /* basic instruction formats */
+
+
+/*
+** size and position of opcode arguments.
+*/
+#define SIZE_C		8
+#define SIZE_B		8
+#define SIZE_Bx		(SIZE_C + SIZE_B + 1)
+#define SIZE_A		8
+#define SIZE_Ax		(SIZE_Bx + SIZE_A)
+#define SIZE_sJ		(SIZE_Bx + SIZE_A)
+
+#define SIZE_OP		7
+
+#define POS_OP		0
+
+#define POS_A		(POS_OP + SIZE_OP)
+#define POS_k		(POS_A + SIZE_A)
+#define POS_B		(POS_k + 1)
+#define POS_C		(POS_B + SIZE_B)
+
+#define POS_Bx		POS_k
+
+#define POS_Ax		POS_A
+
+#define POS_sJ		POS_A
+
+
+/*
+** limits for opcode arguments.
+** we use (signed) 'int' to manipulate most arguments,
+** so they must fit in ints.
+*/
+
+/* Check whether type 'int' has at least 'b' bits ('b' < 32) */
+#define L_INTHASBITS(b)		((UINT_MAX >> ((b) - 1)) >= 1)
+
+
+#if L_INTHASBITS(SIZE_Bx)
+#define MAXARG_Bx	((1<<SIZE_Bx)-1)
+#else
+#define MAXARG_Bx	MAX_INT
+#endif
+
+#define OFFSET_sBx	(MAXARG_Bx>>1)         /* 'sBx' is signed */
+
+
+#if L_INTHASBITS(SIZE_Ax)
+#define MAXARG_Ax	((1<<SIZE_Ax)-1)
+#else
+#define MAXARG_Ax	MAX_INT
+#endif
+
+#if L_INTHASBITS(SIZE_sJ)
+#define MAXARG_sJ	((1 << SIZE_sJ) - 1)
+#else
+#define MAXARG_sJ	MAX_INT
+#endif
+
+#define OFFSET_sJ	(MAXARG_sJ >> 1)
+
+
+#define MAXARG_A	((1<<SIZE_A)-1)
+#define MAXARG_B	((1<<SIZE_B)-1)
+#define MAXARG_C	((1<<SIZE_C)-1)
+#define OFFSET_sC	(MAXARG_C >> 1)
+
+#define int2sC(i)	((i) + OFFSET_sC)
+#define sC2int(i)	((i) - OFFSET_sC)
+
+
+/* creates a mask with 'n' 1 bits at position 'p' */
+#define MASK1(n,p)	((~((~(Instruction)0)<<(n)))<<(p))
+
+/* creates a mask with 'n' 0 bits at position 'p' */
+#define MASK0(n,p)	(~MASK1(n,p))
+
+/*
+** the following macros help to manipulate instructions
+*/
+
+#define GET_OPCODE(i)	(cast(OpCode, ((i)>>POS_OP) & MASK1(SIZE_OP,0)))
+#define SET_OPCODE(i,o)	((i) = (((i)&MASK0(SIZE_OP,POS_OP)) | \
+		((cast(Instruction, o)<<POS_OP)&MASK1(SIZE_OP,POS_OP))))
+
+#define checkopm(i,m)	(getOpMode(GET_OPCODE(i)) == m)
+
+
+#define getarg(i,pos,size)	(cast_int(((i)>>(pos)) & MASK1(size,0)))
+#define setarg(i,v,pos,size)	((i) = (((i)&MASK0(size,pos)) | \
+                ((cast(Instruction, v)<<pos)&MASK1(size,pos))))
+
+#define GETARG_A(i)	getarg(i, POS_A, SIZE_A)
+#define SETARG_A(i,v)	setarg(i, v, POS_A, SIZE_A)
+
+#define GETARG_B(i)	check_exp(checkopm(i, iABC), getarg(i, POS_B, SIZE_B))
+#define GETARG_sB(i)	sC2int(GETARG_B(i))
+#define SETARG_B(i,v)	setarg(i, v, POS_B, SIZE_B)
+
+#define GETARG_C(i)	check_exp(checkopm(i, iABC), getarg(i, POS_C, SIZE_C))
+#define GETARG_sC(i)	sC2int(GETARG_C(i))
+#define SETARG_C(i,v)	setarg(i, v, POS_C, SIZE_C)
+
+#define TESTARG_k(i)	check_exp(checkopm(i, iABC), (cast_int(((i) & (1u << POS_k)))))
+#define GETARG_k(i)	check_exp(checkopm(i, iABC), getarg(i, POS_k, 1))
+#define SETARG_k(i,v)	setarg(i, v, POS_k, 1)
+
+#define GETARG_Bx(i)	check_exp(checkopm(i, iABx), getarg(i, POS_Bx, SIZE_Bx))
+#define SETARG_Bx(i,v)	setarg(i, v, POS_Bx, SIZE_Bx)
+
+#define GETARG_Ax(i)	check_exp(checkopm(i, iAx), getarg(i, POS_Ax, SIZE_Ax))
+#define SETARG_Ax(i,v)	setarg(i, v, POS_Ax, SIZE_Ax)
+
+#define GETARG_sBx(i)  \
+	check_exp(checkopm(i, iAsBx), getarg(i, POS_Bx, SIZE_Bx) - OFFSET_sBx)
+#define SETARG_sBx(i,b)	SETARG_Bx((i),cast_uint((b)+OFFSET_sBx))
+
+#define GETARG_sJ(i)  \
+	check_exp(checkopm(i, isJ), getarg(i, POS_sJ, SIZE_sJ) - OFFSET_sJ)
+#define SETARG_sJ(i,j) \
+	setarg(i, cast_uint((j)+OFFSET_sJ), POS_sJ, SIZE_sJ)
+
+
+#define CREATE_ABCk(o,a,b,c,k)	((cast(Instruction, o)<<POS_OP) \
+			| (cast(Instruction, a)<<POS_A) \
+			| (cast(Instruction, b)<<POS_B) \
+			| (cast(Instruction, c)<<POS_C) \
+			| (cast(Instruction, k)<<POS_k))
+
+#define CREATE_ABx(o,a,bc)	((cast(Instruction, o)<<POS_OP) \
+			| (cast(Instruction, a)<<POS_A) \
+			| (cast(Instruction, bc)<<POS_Bx))
+
+#define CREATE_Ax(o,a)		((cast(Instruction, o)<<POS_OP) \
+			| (cast(Instruction, a)<<POS_Ax))
+
+#define CREATE_sJ(o,j,k)	((cast(Instruction, o) << POS_OP) \
+			| (cast(Instruction, j) << POS_sJ) \
+			| (cast(Instruction, k) << POS_k))
+
+
+#if !defined(MAXINDEXRK)  /* (for debugging only) */
+#define MAXINDEXRK	MAXARG_B
+#endif
+
+
+/*
+** invalid register that fits in 8 bits
+*/
+#define NO_REG		MAXARG_A
+
+
+/*
+** R[x] - register
+** K[x] - constant (in constant table)
+** RK(x) == if k(i) then K[x] else R[x]
+*/
+
+
+/*
+** Grep "ORDER OP" if you change these enums. Opcodes marked with a (*)
+** has extra descriptions in the notes after the enumeration.
+*/
+
+typedef enum {
+/*----------------------------------------------------------------------
+  name		args	description
+------------------------------------------------------------------------*/
+OP_MOVE,/*	A B	R[A] := R[B]					*/
+OP_LOADI,/*	A sBx	R[A] := sBx					*/
+OP_LOADF,/*	A sBx	R[A] := (lua_Number)sBx				*/
+OP_LOADK,/*	A Bx	R[A] := K[Bx]					*/
+OP_LOADKX,/*	A	R[A] := K[extra arg]				*/
+OP_LOADFALSE,/*	A	R[A] := false					*/
+OP_LFALSESKIP,/*A	R[A] := false; pc++	(*)			*/
+OP_LOADTRUE,/*	A	R[A] := true					*/
+OP_LOADNIL,/*	A B	R[A], R[A+1], ..., R[A+B] := nil		*/
+OP_GETUPVAL,/*	A B	R[A] := UpValue[B]				*/
+OP_SETUPVAL,/*	A B	UpValue[B] := R[A]				*/
+
+OP_GETTABUP,/*	A B C	R[A] := UpValue[B][K[C]:string]			*/
+OP_GETTABLE,/*	A B C	R[A] := R[B][R[C]]				*/
+OP_GETI,/*	A B C	R[A] := R[B][C]					*/
+OP_GETFIELD,/*	A B C	R[A] := R[B][K[C]:string]			*/
+
+OP_SETTABUP,/*	A B C	UpValue[A][K[B]:string] := RK(C)		*/
+OP_SETTABLE,/*	A B C	R[A][R[B]] := RK(C)				*/
+OP_SETI,/*	A B C	R[A][B] := RK(C)				*/
+OP_SETFIELD,/*	A B C	R[A][K[B]:string] := RK(C)			*/
+
+OP_NEWTABLE,/*	A B C k	R[A] := {}					*/
+
+OP_SELF,/*	A B C	R[A+1] := R[B]; R[A] := R[B][RK(C):string]	*/
+
+OP_ADDI,/*	A B sC	R[A] := R[B] + sC				*/
+
+OP_ADDK,/*	A B C	R[A] := R[B] + K[C]:number			*/
+OP_SUBK,/*	A B C	R[A] := R[B] - K[C]:number			*/
+OP_MULK,/*	A B C	R[A] := R[B] * K[C]:number			*/
+OP_MODK,/*	A B C	R[A] := R[B] % K[C]:number			*/
+OP_POWK,/*	A B C	R[A] := R[B] ^ K[C]:number			*/
+OP_DIVK,/*	A B C	R[A] := R[B] / K[C]:number			*/
+OP_IDIVK,/*	A B C	R[A] := R[B] // K[C]:number			*/
+
+OP_BANDK,/*	A B C	R[A] := R[B] & K[C]:integer			*/
+OP_BORK,/*	A B C	R[A] := R[B] | K[C]:integer			*/
+OP_BXORK,/*	A B C	R[A] := R[B] ~ K[C]:integer			*/
+
+OP_SHRI,/*	A B sC	R[A] := R[B] >> sC				*/
+OP_SHLI,/*	A B sC	R[A] := sC << R[B]				*/
+
+OP_ADD,/*	A B C	R[A] := R[B] + R[C]				*/
+OP_SUB,/*	A B C	R[A] := R[B] - R[C]				*/
+OP_MUL,/*	A B C	R[A] := R[B] * R[C]				*/
+OP_MOD,/*	A B C	R[A] := R[B] % R[C]				*/
+OP_POW,/*	A B C	R[A] := R[B] ^ R[C]				*/
+OP_DIV,/*	A B C	R[A] := R[B] / R[C]				*/
+OP_IDIV,/*	A B C	R[A] := R[B] // R[C]				*/
+
+OP_BAND,/*	A B C	R[A] := R[B] & R[C]				*/
+OP_BOR,/*	A B C	R[A] := R[B] | R[C]				*/
+OP_BXOR,/*	A B C	R[A] := R[B] ~ R[C]				*/
+OP_SHL,/*	A B C	R[A] := R[B] << R[C]				*/
+OP_SHR,/*	A B C	R[A] := R[B] >> R[C]				*/
+
+OP_MMBIN,/*	A B C	call C metamethod over R[A] and R[B]	(*)	*/
+OP_MMBINI,/*	A sB C k	call C metamethod over R[A] and sB	*/
+OP_MMBINK,/*	A B C k		call C metamethod over R[A] and K[B]	*/
+
+OP_UNM,/*	A B	R[A] := -R[B]					*/
+OP_BNOT,/*	A B	R[A] := ~R[B]					*/
+OP_NOT,/*	A B	R[A] := not R[B]				*/
+OP_LEN,/*	A B	R[A] := #R[B] (length operator)			*/
+
+OP_CONCAT,/*	A B	R[A] := R[A].. ... ..R[A + B - 1]		*/
+
+OP_CLOSE,/*	A	close all upvalues >= R[A]			*/
+OP_TBC,/*	A	mark variable A "to be closed"			*/
+OP_JMP,/*	sJ	pc += sJ					*/
+OP_EQ,/*	A B k	if ((R[A] == R[B]) ~= k) then pc++		*/
+OP_LT,/*	A B k	if ((R[A] <  R[B]) ~= k) then pc++		*/
+OP_LE,/*	A B k	if ((R[A] <= R[B]) ~= k) then pc++		*/
+
+OP_EQK,/*	A B k	if ((R[A] == K[B]) ~= k) then pc++		*/
+OP_EQI,/*	A sB k	if ((R[A] == sB) ~= k) then pc++		*/
+OP_LTI,/*	A sB k	if ((R[A] < sB) ~= k) then pc++			*/
+OP_LEI,/*	A sB k	if ((R[A] <= sB) ~= k) then pc++		*/
+OP_GTI,/*	A sB k	if ((R[A] > sB) ~= k) then pc++			*/
+OP_GEI,/*	A sB k	if ((R[A] >= sB) ~= k) then pc++		*/
+
+OP_TEST,/*	A k	if (not R[A] == k) then pc++			*/
+OP_TESTSET,/*	A B k	if (not R[B] == k) then pc++ else R[A] := R[B] (*) */
+
+OP_CALL,/*	A B C	R[A], ... ,R[A+C-2] := R[A](R[A+1], ... ,R[A+B-1]) */
+OP_TAILCALL,/*	A B C k	return R[A](R[A+1], ... ,R[A+B-1])		*/
+
+OP_RETURN,/*	A B C k	return R[A], ... ,R[A+B-2]	(see note)	*/
+OP_RETURN0,/*		return						*/
+OP_RETURN1,/*	A	return R[A]					*/
+
+OP_FORLOOP,/*	A Bx	update counters; if loop continues then pc-=Bx; */
+OP_FORPREP,/*	A Bx	<check values and prepare counters>;
+                        if not to run then pc+=Bx+1;			*/
+
+OP_TFORPREP,/*	A Bx	create upvalue for R[A + 3]; pc+=Bx		*/
+OP_TFORCALL,/*	A C	R[A+4], ... ,R[A+3+C] := R[A](R[A+1], R[A+2]);	*/
+OP_TFORLOOP,/*	A Bx	if R[A+2] ~= nil then { R[A]=R[A+2]; pc -= Bx }	*/
+
+OP_SETLIST,/*	A B C k	R[A][C+i] := R[A+i], 1 <= i <= B		*/
+
+OP_CLOSURE,/*	A Bx	R[A] := closure(KPROTO[Bx])			*/
+
+OP_VARARG,/*	A C	R[A], R[A+1], ..., R[A+C-2] = vararg		*/
+
+OP_VARARGPREP,/*A	(adjust vararg parameters)			*/
+
+OP_EXTRAARG/*	Ax	extra (larger) argument for previous opcode	*/
+} OpCode;
+
+
+#define NUM_OPCODES	((int)(OP_EXTRAARG) + 1)
+
+
+
+/*===========================================================================
+  Notes:
+
+  (*) Opcode OP_LFALSESKIP is used to convert a condition to a boolean
+  value, in a code equivalent to (not cond ? false : true).  (It
+  produces false and skips the next instruction producing true.)
+
+  (*) Opcodes OP_MMBIN and variants follow each arithmetic and
+  bitwise opcode. If the operation succeeds, it skips this next
+  opcode. Otherwise, this opcode calls the corresponding metamethod.
+
+  (*) Opcode OP_TESTSET is used in short-circuit expressions that need
+  both to jump and to produce a value, such as (a = b or c).
+
+  (*) In OP_CALL, if (B == 0) then B = top - A. If (C == 0), then
+  'top' is set to last_result+1, so next open instruction (OP_CALL,
+  OP_RETURN*, OP_SETLIST) may use 'top'.
+
+  (*) In OP_VARARG, if (C == 0) then use actual number of varargs and
+  set top (like in OP_CALL with C == 0).
+
+  (*) In OP_RETURN, if (B == 0) then return up to 'top'.
+
+  (*) In OP_LOADKX and OP_NEWTABLE, the next instruction is always
+  OP_EXTRAARG.
+
+  (*) In OP_SETLIST, if (B == 0) then real B = 'top'; if k, then
+  real C = EXTRAARG _ C (the bits of EXTRAARG concatenated with the
+  bits of C).
+
+  (*) In OP_NEWTABLE, B is log2 of the hash size (which is always a
+  power of 2) plus 1, or zero for size zero. If not k, the array size
+  is C. Otherwise, the array size is EXTRAARG _ C.
+
+  (*) For comparisons, k specifies what condition the test should accept
+  (true or false).
+
+  (*) In OP_MMBINI/OP_MMBINK, k means the arguments were flipped
+   (the constant is the first operand).
+
+  (*) All 'skips' (pc++) assume that next instruction is a jump.
+
+  (*) In instructions OP_RETURN/OP_TAILCALL, 'k' specifies that the
+  function builds upvalues, which may need to be closed. C > 0 means
+  the function is vararg, so that its 'func' must be corrected before
+  returning; in this case, (C - 1) is its number of fixed parameters.
+
+  (*) In comparisons with an immediate operand, C signals whether the
+  original operand was a float. (It must be corrected in case of
+  metamethods.)
+
+===========================================================================*/
+
+
+/*
+** masks for instruction properties. The format is:
+** bits 0-2: op mode
+** bit 3: instruction set register A
+** bit 4: operator is a test (next instruction must be a jump)
+** bit 5: instruction uses 'L->top' set by previous instruction (when B == 0)
+** bit 6: instruction sets 'L->top' for next instruction (when C == 0)
+** bit 7: instruction is an MM instruction (call a metamethod)
+*/
+
+LUAI_DDEC(const lu_byte luaP_opmodes[NUM_OPCODES];)
+
+#define getOpMode(m)	(cast(enum OpMode, luaP_opmodes[m] & 7))
+#define testAMode(m)	(luaP_opmodes[m] & (1 << 3))
+#define testTMode(m)	(luaP_opmodes[m] & (1 << 4))
+#define testITMode(m)	(luaP_opmodes[m] & (1 << 5))
+#define testOTMode(m)	(luaP_opmodes[m] & (1 << 6))
+#define testMMMode(m)	(luaP_opmodes[m] & (1 << 7))
+
+/* "out top" (set top for next instruction) */
+#define isOT(i)  \
+	((testOTMode(GET_OPCODE(i)) && GETARG_C(i) == 0) || \
+          GET_OPCODE(i) == OP_TAILCALL)
+
+/* "in top" (uses top from previous instruction) */
+#define isIT(i)		(testITMode(GET_OPCODE(i)) && GETARG_B(i) == 0)
+
+#define opmode(mm,ot,it,t,a,m)  \
+    (((mm) << 7) | ((ot) << 6) | ((it) << 5) | ((t) << 4) | ((a) << 3) | (m))
+
+
+/* number of list items to accumulate before a SETLIST instruction */
+#define LFIELDS_PER_FLUSH	50
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lopnames.h b/src/libs/3rdparty/lua/src/lopnames.h
new file mode 100644
index 00000000000..965cec9bf2f
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lopnames.h
@@ -0,0 +1,103 @@
+/*
+** $Id: lopnames.h $
+** Opcode names
+** See Copyright Notice in lua.h
+*/
+
+#if !defined(lopnames_h)
+#define lopnames_h
+
+#include <stddef.h>
+
+
+/* ORDER OP */
+
+static const char *const opnames[] = {
+  "MOVE",
+  "LOADI",
+  "LOADF",
+  "LOADK",
+  "LOADKX",
+  "LOADFALSE",
+  "LFALSESKIP",
+  "LOADTRUE",
+  "LOADNIL",
+  "GETUPVAL",
+  "SETUPVAL",
+  "GETTABUP",
+  "GETTABLE",
+  "GETI",
+  "GETFIELD",
+  "SETTABUP",
+  "SETTABLE",
+  "SETI",
+  "SETFIELD",
+  "NEWTABLE",
+  "SELF",
+  "ADDI",
+  "ADDK",
+  "SUBK",
+  "MULK",
+  "MODK",
+  "POWK",
+  "DIVK",
+  "IDIVK",
+  "BANDK",
+  "BORK",
+  "BXORK",
+  "SHRI",
+  "SHLI",
+  "ADD",
+  "SUB",
+  "MUL",
+  "MOD",
+  "POW",
+  "DIV",
+  "IDIV",
+  "BAND",
+  "BOR",
+  "BXOR",
+  "SHL",
+  "SHR",
+  "MMBIN",
+  "MMBINI",
+  "MMBINK",
+  "UNM",
+  "BNOT",
+  "NOT",
+  "LEN",
+  "CONCAT",
+  "CLOSE",
+  "TBC",
+  "JMP",
+  "EQ",
+  "LT",
+  "LE",
+  "EQK",
+  "EQI",
+  "LTI",
+  "LEI",
+  "GTI",
+  "GEI",
+  "TEST",
+  "TESTSET",
+  "CALL",
+  "TAILCALL",
+  "RETURN",
+  "RETURN0",
+  "RETURN1",
+  "FORLOOP",
+  "FORPREP",
+  "TFORPREP",
+  "TFORCALL",
+  "TFORLOOP",
+  "SETLIST",
+  "CLOSURE",
+  "VARARG",
+  "VARARGPREP",
+  "EXTRAARG",
+  NULL
+};
+
+#endif
+
diff --git a/src/libs/3rdparty/lua/src/loslib.c b/src/libs/3rdparty/lua/src/loslib.c
new file mode 100644
index 00000000000..ad5a9276885
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/loslib.c
@@ -0,0 +1,428 @@
+/*
+** $Id: loslib.c $
+** Standard Operating System library
+** See Copyright Notice in lua.h
+*/
+
+#define loslib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <errno.h>
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+/*
+** {==================================================================
+** List of valid conversion specifiers for the 'strftime' function;
+** options are grouped by length; group of length 2 start with '||'.
+** ===================================================================
+*/
+#if !defined(LUA_STRFTIMEOPTIONS)	/* { */
+
+#if defined(LUA_USE_WINDOWS)
+#define LUA_STRFTIMEOPTIONS  "aAbBcdHIjmMpSUwWxXyYzZ%" \
+    "||" "#c#x#d#H#I#j#m#M#S#U#w#W#y#Y"  /* two-char options */
+#elif defined(LUA_USE_C89)  /* ANSI C 89 (only 1-char options) */
+#define LUA_STRFTIMEOPTIONS  "aAbBcdHIjmMpSUwWxXyYZ%"
+#else  /* C99 specification */
+#define LUA_STRFTIMEOPTIONS  "aAbBcCdDeFgGhHIjmMnprRStTuUVwWxXyYzZ%" \
+    "||" "EcECExEXEyEY" "OdOeOHOIOmOMOSOuOUOVOwOWOy"  /* two-char options */
+#endif
+
+#endif					/* } */
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Configuration for time-related stuff
+** ===================================================================
+*/
+
+/*
+** type to represent time_t in Lua
+*/
+#if !defined(LUA_NUMTIME)	/* { */
+
+#define l_timet			lua_Integer
+#define l_pushtime(L,t)		lua_pushinteger(L,(lua_Integer)(t))
+#define l_gettime(L,arg)	luaL_checkinteger(L, arg)
+
+#else				/* }{ */
+
+#define l_timet			lua_Number
+#define l_pushtime(L,t)		lua_pushnumber(L,(lua_Number)(t))
+#define l_gettime(L,arg)	luaL_checknumber(L, arg)
+
+#endif				/* } */
+
+
+#if !defined(l_gmtime)		/* { */
+/*
+** By default, Lua uses gmtime/localtime, except when POSIX is available,
+** where it uses gmtime_r/localtime_r
+*/
+
+#if defined(LUA_USE_POSIX)	/* { */
+
+#define l_gmtime(t,r)		gmtime_r(t,r)
+#define l_localtime(t,r)	localtime_r(t,r)
+
+#else				/* }{ */
+
+/* ISO C definitions */
+#define l_gmtime(t,r)		((void)(r)->tm_sec, gmtime(t))
+#define l_localtime(t,r)	((void)(r)->tm_sec, localtime(t))
+
+#endif				/* } */
+
+#endif				/* } */
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Configuration for 'tmpnam':
+** By default, Lua uses tmpnam except when POSIX is available, where
+** it uses mkstemp.
+** ===================================================================
+*/
+#if !defined(lua_tmpnam)	/* { */
+
+#if defined(LUA_USE_POSIX)	/* { */
+
+#include <unistd.h>
+
+#define LUA_TMPNAMBUFSIZE	32
+
+#if !defined(LUA_TMPNAMTEMPLATE)
+#define LUA_TMPNAMTEMPLATE	"/tmp/lua_XXXXXX"
+#endif
+
+#define lua_tmpnam(b,e) { \
+        strcpy(b, LUA_TMPNAMTEMPLATE); \
+        e = mkstemp(b); \
+        if (e != -1) close(e); \
+        e = (e == -1); }
+
+#else				/* }{ */
+
+/* ISO C definitions */
+#define LUA_TMPNAMBUFSIZE	L_tmpnam
+#define lua_tmpnam(b,e)		{ e = (tmpnam(b) == NULL); }
+
+#endif				/* } */
+
+#endif				/* } */
+/* }================================================================== */
+
+
+#if !defined(l_system)
+#if defined(LUA_USE_IOS)
+/* Despite claiming to be ISO C, iOS does not implement 'system'. */
+#define l_system(cmd) ((cmd) == NULL ? 0 : -1)
+#else
+#define l_system(cmd)	system(cmd)  /* default definition */
+#endif
+#endif
+
+
+static int os_execute (lua_State *L) {
+  const char *cmd = luaL_optstring(L, 1, NULL);
+  int stat;
+  errno = 0;
+  stat = l_system(cmd);
+  if (cmd != NULL)
+    return luaL_execresult(L, stat);
+  else {
+    lua_pushboolean(L, stat);  /* true if there is a shell */
+    return 1;
+  }
+}
+
+
+static int os_remove (lua_State *L) {
+  const char *filename = luaL_checkstring(L, 1);
+  return luaL_fileresult(L, remove(filename) == 0, filename);
+}
+
+
+static int os_rename (lua_State *L) {
+  const char *fromname = luaL_checkstring(L, 1);
+  const char *toname = luaL_checkstring(L, 2);
+  return luaL_fileresult(L, rename(fromname, toname) == 0, NULL);
+}
+
+
+static int os_tmpname (lua_State *L) {
+  char buff[LUA_TMPNAMBUFSIZE];
+  int err;
+  lua_tmpnam(buff, err);
+  if (l_unlikely(err))
+    return luaL_error(L, "unable to generate a unique filename");
+  lua_pushstring(L, buff);
+  return 1;
+}
+
+
+static int os_getenv (lua_State *L) {
+  lua_pushstring(L, getenv(luaL_checkstring(L, 1)));  /* if NULL push nil */
+  return 1;
+}
+
+
+static int os_clock (lua_State *L) {
+  lua_pushnumber(L, ((lua_Number)clock())/(lua_Number)CLOCKS_PER_SEC);
+  return 1;
+}
+
+
+/*
+** {======================================================
+** Time/Date operations
+** { year=%Y, month=%m, day=%d, hour=%H, min=%M, sec=%S,
+**   wday=%w+1, yday=%j, isdst=? }
+** =======================================================
+*/
+
+/*
+** About the overflow check: an overflow cannot occur when time
+** is represented by a lua_Integer, because either lua_Integer is
+** large enough to represent all int fields or it is not large enough
+** to represent a time that cause a field to overflow.  However, if
+** times are represented as doubles and lua_Integer is int, then the
+** time 0x1.e1853b0d184f6p+55 would cause an overflow when adding 1900
+** to compute the year.
+*/
+static void setfield (lua_State *L, const char *key, int value, int delta) {
+  #if (defined(LUA_NUMTIME) && LUA_MAXINTEGER <= INT_MAX)
+    if (l_unlikely(value > LUA_MAXINTEGER - delta))
+      luaL_error(L, "field '%s' is out-of-bound", key);
+  #endif
+  lua_pushinteger(L, (lua_Integer)value + delta);
+  lua_setfield(L, -2, key);
+}
+
+
+static void setboolfield (lua_State *L, const char *key, int value) {
+  if (value < 0)  /* undefined? */
+    return;  /* does not set field */
+  lua_pushboolean(L, value);
+  lua_setfield(L, -2, key);
+}
+
+
+/*
+** Set all fields from structure 'tm' in the table on top of the stack
+*/
+static void setallfields (lua_State *L, struct tm *stm) {
+  setfield(L, "year", stm->tm_year, 1900);
+  setfield(L, "month", stm->tm_mon, 1);
+  setfield(L, "day", stm->tm_mday, 0);
+  setfield(L, "hour", stm->tm_hour, 0);
+  setfield(L, "min", stm->tm_min, 0);
+  setfield(L, "sec", stm->tm_sec, 0);
+  setfield(L, "yday", stm->tm_yday, 1);
+  setfield(L, "wday", stm->tm_wday, 1);
+  setboolfield(L, "isdst", stm->tm_isdst);
+}
+
+
+static int getboolfield (lua_State *L, const char *key) {
+  int res;
+  res = (lua_getfield(L, -1, key) == LUA_TNIL) ? -1 : lua_toboolean(L, -1);
+  lua_pop(L, 1);
+  return res;
+}
+
+
+static int getfield (lua_State *L, const char *key, int d, int delta) {
+  int isnum;
+  int t = lua_getfield(L, -1, key);  /* get field and its type */
+  lua_Integer res = lua_tointegerx(L, -1, &isnum);
+  if (!isnum) {  /* field is not an integer? */
+    if (l_unlikely(t != LUA_TNIL))  /* some other value? */
+      return luaL_error(L, "field '%s' is not an integer", key);
+    else if (l_unlikely(d < 0))  /* absent field; no default? */
+      return luaL_error(L, "field '%s' missing in date table", key);
+    res = d;
+  }
+  else {
+    if (!(res >= 0 ? res - delta <= INT_MAX : INT_MIN + delta <= res))
+      return luaL_error(L, "field '%s' is out-of-bound", key);
+    res -= delta;
+  }
+  lua_pop(L, 1);
+  return (int)res;
+}
+
+
+static const char *checkoption (lua_State *L, const char *conv,
+                                ptrdiff_t convlen, char *buff) {
+  const char *option = LUA_STRFTIMEOPTIONS;
+  int oplen = 1;  /* length of options being checked */
+  for (; *option != '\0' && oplen <= convlen; option += oplen) {
+    if (*option == '|')  /* next block? */
+      oplen++;  /* will check options with next length (+1) */
+    else if (memcmp(conv, option, oplen) == 0) {  /* match? */
+      memcpy(buff, conv, oplen);  /* copy valid option to buffer */
+      buff[oplen] = '\0';
+      return conv + oplen;  /* return next item */
+    }
+  }
+  luaL_argerror(L, 1,
+    lua_pushfstring(L, "invalid conversion specifier '%%%s'", conv));
+  return conv;  /* to avoid warnings */
+}
+
+
+static time_t l_checktime (lua_State *L, int arg) {
+  l_timet t = l_gettime(L, arg);
+  luaL_argcheck(L, (time_t)t == t, arg, "time out-of-bounds");
+  return (time_t)t;
+}
+
+
+/* maximum size for an individual 'strftime' item */
+#define SIZETIMEFMT	250
+
+
+static int os_date (lua_State *L) {
+  size_t slen;
+  const char *s = luaL_optlstring(L, 1, "%c", &slen);
+  time_t t = luaL_opt(L, l_checktime, 2, time(NULL));
+  const char *se = s + slen;  /* 's' end */
+  struct tm tmr, *stm;
+  if (*s == '!') {  /* UTC? */
+    stm = l_gmtime(&t, &tmr);
+    s++;  /* skip '!' */
+  }
+  else
+    stm = l_localtime(&t, &tmr);
+  if (stm == NULL)  /* invalid date? */
+    return luaL_error(L,
+                 "date result cannot be represented in this installation");
+  if (strcmp(s, "*t") == 0) {
+    lua_createtable(L, 0, 9);  /* 9 = number of fields */
+    setallfields(L, stm);
+  }
+  else {
+    char cc[4];  /* buffer for individual conversion specifiers */
+    luaL_Buffer b;
+    cc[0] = '%';
+    luaL_buffinit(L, &b);
+    while (s < se) {
+      if (*s != '%')  /* not a conversion specifier? */
+        luaL_addchar(&b, *s++);
+      else {
+        size_t reslen;
+        char *buff = luaL_prepbuffsize(&b, SIZETIMEFMT);
+        s++;  /* skip '%' */
+        s = checkoption(L, s, se - s, cc + 1);  /* copy specifier to 'cc' */
+        reslen = strftime(buff, SIZETIMEFMT, cc, stm);
+        luaL_addsize(&b, reslen);
+      }
+    }
+    luaL_pushresult(&b);
+  }
+  return 1;
+}
+
+
+static int os_time (lua_State *L) {
+  time_t t;
+  if (lua_isnoneornil(L, 1))  /* called without args? */
+    t = time(NULL);  /* get current time */
+  else {
+    struct tm ts;
+    luaL_checktype(L, 1, LUA_TTABLE);
+    lua_settop(L, 1);  /* make sure table is at the top */
+    ts.tm_year = getfield(L, "year", -1, 1900);
+    ts.tm_mon = getfield(L, "month", -1, 1);
+    ts.tm_mday = getfield(L, "day", -1, 0);
+    ts.tm_hour = getfield(L, "hour", 12, 0);
+    ts.tm_min = getfield(L, "min", 0, 0);
+    ts.tm_sec = getfield(L, "sec", 0, 0);
+    ts.tm_isdst = getboolfield(L, "isdst");
+    t = mktime(&ts);
+    setallfields(L, &ts);  /* update fields with normalized values */
+  }
+  if (t != (time_t)(l_timet)t || t == (time_t)(-1))
+    return luaL_error(L,
+                  "time result cannot be represented in this installation");
+  l_pushtime(L, t);
+  return 1;
+}
+
+
+static int os_difftime (lua_State *L) {
+  time_t t1 = l_checktime(L, 1);
+  time_t t2 = l_checktime(L, 2);
+  lua_pushnumber(L, (lua_Number)difftime(t1, t2));
+  return 1;
+}
+
+/* }====================================================== */
+
+
+static int os_setlocale (lua_State *L) {
+  static const int cat[] = {LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY,
+                      LC_NUMERIC, LC_TIME};
+  static const char *const catnames[] = {"all", "collate", "ctype", "monetary",
+     "numeric", "time", NULL};
+  const char *l = luaL_optstring(L, 1, NULL);
+  int op = luaL_checkoption(L, 2, "all", catnames);
+  lua_pushstring(L, setlocale(cat[op], l));
+  return 1;
+}
+
+
+static int os_exit (lua_State *L) {
+  int status;
+  if (lua_isboolean(L, 1))
+    status = (lua_toboolean(L, 1) ? EXIT_SUCCESS : EXIT_FAILURE);
+  else
+    status = (int)luaL_optinteger(L, 1, EXIT_SUCCESS);
+  if (lua_toboolean(L, 2))
+    lua_close(L);
+  if (L) exit(status);  /* 'if' to avoid warnings for unreachable 'return' */
+  return 0;
+}
+
+
+static const luaL_Reg syslib[] = {
+  {"clock",     os_clock},
+  {"date",      os_date},
+  {"difftime",  os_difftime},
+  {"execute",   os_execute},
+  {"exit",      os_exit},
+  {"getenv",    os_getenv},
+  {"remove",    os_remove},
+  {"rename",    os_rename},
+  {"setlocale", os_setlocale},
+  {"time",      os_time},
+  {"tmpname",   os_tmpname},
+  {NULL, NULL}
+};
+
+/* }====================================================== */
+
+
+
+LUAMOD_API int luaopen_os (lua_State *L) {
+  luaL_newlib(L, syslib);
+  return 1;
+}
+
diff --git a/src/libs/3rdparty/lua/src/lparser.c b/src/libs/3rdparty/lua/src/lparser.c
new file mode 100644
index 00000000000..b745f236f06
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lparser.c
@@ -0,0 +1,1967 @@
+/*
+** $Id: lparser.c $
+** Lua Parser
+** See Copyright Notice in lua.h
+*/
+
+#define lparser_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <limits.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lcode.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "llex.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lparser.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+
+
+
+/* maximum number of local variables per function (must be smaller
+   than 250, due to the bytecode format) */
+#define MAXVARS		200
+
+
+#define hasmultret(k)		((k) == VCALL || (k) == VVARARG)
+
+
+/* because all strings are unified by the scanner, the parser
+   can use pointer equality for string equality */
+#define eqstr(a,b)	((a) == (b))
+
+
+/*
+** nodes for block list (list of active blocks)
+*/
+typedef struct BlockCnt {
+  struct BlockCnt *previous;  /* chain */
+  int firstlabel;  /* index of first label in this block */
+  int firstgoto;  /* index of first pending goto in this block */
+  lu_byte nactvar;  /* # active locals outside the block */
+  lu_byte upval;  /* true if some variable in the block is an upvalue */
+  lu_byte isloop;  /* true if 'block' is a loop */
+  lu_byte insidetbc;  /* true if inside the scope of a to-be-closed var. */
+} BlockCnt;
+
+
+
+/*
+** prototypes for recursive non-terminal functions
+*/
+static void statement (LexState *ls);
+static void expr (LexState *ls, expdesc *v);
+
+
+static l_noret error_expected (LexState *ls, int token) {
+  luaX_syntaxerror(ls,
+      luaO_pushfstring(ls->L, "%s expected", luaX_token2str(ls, token)));
+}
+
+
+static l_noret errorlimit (FuncState *fs, int limit, const char *what) {
+  lua_State *L = fs->ls->L;
+  const char *msg;
+  int line = fs->f->linedefined;
+  const char *where = (line == 0)
+                      ? "main function"
+                      : luaO_pushfstring(L, "function at line %d", line);
+  msg = luaO_pushfstring(L, "too many %s (limit is %d) in %s",
+                             what, limit, where);
+  luaX_syntaxerror(fs->ls, msg);
+}
+
+
+static void checklimit (FuncState *fs, int v, int l, const char *what) {
+  if (v > l) errorlimit(fs, l, what);
+}
+
+
+/*
+** Test whether next token is 'c'; if so, skip it.
+*/
+static int testnext (LexState *ls, int c) {
+  if (ls->t.token == c) {
+    luaX_next(ls);
+    return 1;
+  }
+  else return 0;
+}
+
+
+/*
+** Check that next token is 'c'.
+*/
+static void check (LexState *ls, int c) {
+  if (ls->t.token != c)
+    error_expected(ls, c);
+}
+
+
+/*
+** Check that next token is 'c' and skip it.
+*/
+static void checknext (LexState *ls, int c) {
+  check(ls, c);
+  luaX_next(ls);
+}
+
+
+#define check_condition(ls,c,msg)	{ if (!(c)) luaX_syntaxerror(ls, msg); }
+
+
+/*
+** Check that next token is 'what' and skip it. In case of error,
+** raise an error that the expected 'what' should match a 'who'
+** in line 'where' (if that is not the current line).
+*/
+static void check_match (LexState *ls, int what, int who, int where) {
+  if (l_unlikely(!testnext(ls, what))) {
+    if (where == ls->linenumber)  /* all in the same line? */
+      error_expected(ls, what);  /* do not need a complex message */
+    else {
+      luaX_syntaxerror(ls, luaO_pushfstring(ls->L,
+             "%s expected (to close %s at line %d)",
+              luaX_token2str(ls, what), luaX_token2str(ls, who), where));
+    }
+  }
+}
+
+
+static TString *str_checkname (LexState *ls) {
+  TString *ts;
+  check(ls, TK_NAME);
+  ts = ls->t.seminfo.ts;
+  luaX_next(ls);
+  return ts;
+}
+
+
+static void init_exp (expdesc *e, expkind k, int i) {
+  e->f = e->t = NO_JUMP;
+  e->k = k;
+  e->u.info = i;
+}
+
+
+static void codestring (expdesc *e, TString *s) {
+  e->f = e->t = NO_JUMP;
+  e->k = VKSTR;
+  e->u.strval = s;
+}
+
+
+static void codename (LexState *ls, expdesc *e) {
+  codestring(e, str_checkname(ls));
+}
+
+
+/*
+** Register a new local variable in the active 'Proto' (for debug
+** information).
+*/
+static int registerlocalvar (LexState *ls, FuncState *fs, TString *varname) {
+  Proto *f = fs->f;
+  int oldsize = f->sizelocvars;
+  luaM_growvector(ls->L, f->locvars, fs->ndebugvars, f->sizelocvars,
+                  LocVar, SHRT_MAX, "local variables");
+  while (oldsize < f->sizelocvars)
+    f->locvars[oldsize++].varname = NULL;
+  f->locvars[fs->ndebugvars].varname = varname;
+  f->locvars[fs->ndebugvars].startpc = fs->pc;
+  luaC_objbarrier(ls->L, f, varname);
+  return fs->ndebugvars++;
+}
+
+
+/*
+** Create a new local variable with the given 'name'. Return its index
+** in the function.
+*/
+static int new_localvar (LexState *ls, TString *name) {
+  lua_State *L = ls->L;
+  FuncState *fs = ls->fs;
+  Dyndata *dyd = ls->dyd;
+  Vardesc *var;
+  checklimit(fs, dyd->actvar.n + 1 - fs->firstlocal,
+                 MAXVARS, "local variables");
+  luaM_growvector(L, dyd->actvar.arr, dyd->actvar.n + 1,
+                  dyd->actvar.size, Vardesc, USHRT_MAX, "local variables");
+  var = &dyd->actvar.arr[dyd->actvar.n++];
+  var->vd.kind = VDKREG;  /* default */
+  var->vd.name = name;
+  return dyd->actvar.n - 1 - fs->firstlocal;
+}
+
+#define new_localvarliteral(ls,v) \
+    new_localvar(ls,  \
+      luaX_newstring(ls, "" v, (sizeof(v)/sizeof(char)) - 1));
+
+
+
+/*
+** Return the "variable description" (Vardesc) of a given variable.
+** (Unless noted otherwise, all variables are referred to by their
+** compiler indices.)
+*/
+static Vardesc *getlocalvardesc (FuncState *fs, int vidx) {
+  return &fs->ls->dyd->actvar.arr[fs->firstlocal + vidx];
+}
+
+
+/*
+** Convert 'nvar', a compiler index level, to its corresponding
+** register. For that, search for the highest variable below that level
+** that is in a register and uses its register index ('ridx') plus one.
+*/
+static int reglevel (FuncState *fs, int nvar) {
+  while (nvar-- > 0) {
+    Vardesc *vd = getlocalvardesc(fs, nvar);  /* get previous variable */
+    if (vd->vd.kind != RDKCTC)  /* is in a register? */
+      return vd->vd.ridx + 1;
+  }
+  return 0;  /* no variables in registers */
+}
+
+
+/*
+** Return the number of variables in the register stack for the given
+** function.
+*/
+int luaY_nvarstack (FuncState *fs) {
+  return reglevel(fs, fs->nactvar);
+}
+
+
+/*
+** Get the debug-information entry for current variable 'vidx'.
+*/
+static LocVar *localdebuginfo (FuncState *fs, int vidx) {
+  Vardesc *vd = getlocalvardesc(fs,  vidx);
+  if (vd->vd.kind == RDKCTC)
+    return NULL;  /* no debug info. for constants */
+  else {
+    int idx = vd->vd.pidx;
+    lua_assert(idx < fs->ndebugvars);
+    return &fs->f->locvars[idx];
+  }
+}
+
+
+/*
+** Create an expression representing variable 'vidx'
+*/
+static void init_var (FuncState *fs, expdesc *e, int vidx) {
+  e->f = e->t = NO_JUMP;
+  e->k = VLOCAL;
+  e->u.var.vidx = vidx;
+  e->u.var.ridx = getlocalvardesc(fs, vidx)->vd.ridx;
+}
+
+
+/*
+** Raises an error if variable described by 'e' is read only
+*/
+static void check_readonly (LexState *ls, expdesc *e) {
+  FuncState *fs = ls->fs;
+  TString *varname = NULL;  /* to be set if variable is const */
+  switch (e->k) {
+    case VCONST: {
+      varname = ls->dyd->actvar.arr[e->u.info].vd.name;
+      break;
+    }
+    case VLOCAL: {
+      Vardesc *vardesc = getlocalvardesc(fs, e->u.var.vidx);
+      if (vardesc->vd.kind != VDKREG)  /* not a regular variable? */
+        varname = vardesc->vd.name;
+      break;
+    }
+    case VUPVAL: {
+      Upvaldesc *up = &fs->f->upvalues[e->u.info];
+      if (up->kind != VDKREG)
+        varname = up->name;
+      break;
+    }
+    default:
+      return;  /* other cases cannot be read-only */
+  }
+  if (varname) {
+    const char *msg = luaO_pushfstring(ls->L,
+       "attempt to assign to const variable '%s'", getstr(varname));
+    luaK_semerror(ls, msg);  /* error */
+  }
+}
+
+
+/*
+** Start the scope for the last 'nvars' created variables.
+*/
+static void adjustlocalvars (LexState *ls, int nvars) {
+  FuncState *fs = ls->fs;
+  int reglevel = luaY_nvarstack(fs);
+  int i;
+  for (i = 0; i < nvars; i++) {
+    int vidx = fs->nactvar++;
+    Vardesc *var = getlocalvardesc(fs, vidx);
+    var->vd.ridx = reglevel++;
+    var->vd.pidx = registerlocalvar(ls, fs, var->vd.name);
+  }
+}
+
+
+/*
+** Close the scope for all variables up to level 'tolevel'.
+** (debug info.)
+*/
+static void removevars (FuncState *fs, int tolevel) {
+  fs->ls->dyd->actvar.n -= (fs->nactvar - tolevel);
+  while (fs->nactvar > tolevel) {
+    LocVar *var = localdebuginfo(fs, --fs->nactvar);
+    if (var)  /* does it have debug information? */
+      var->endpc = fs->pc;
+  }
+}
+
+
+/*
+** Search the upvalues of the function 'fs' for one
+** with the given 'name'.
+*/
+static int searchupvalue (FuncState *fs, TString *name) {
+  int i;
+  Upvaldesc *up = fs->f->upvalues;
+  for (i = 0; i < fs->nups; i++) {
+    if (eqstr(up[i].name, name)) return i;
+  }
+  return -1;  /* not found */
+}
+
+
+static Upvaldesc *allocupvalue (FuncState *fs) {
+  Proto *f = fs->f;
+  int oldsize = f->sizeupvalues;
+  checklimit(fs, fs->nups + 1, MAXUPVAL, "upvalues");
+  luaM_growvector(fs->ls->L, f->upvalues, fs->nups, f->sizeupvalues,
+                  Upvaldesc, MAXUPVAL, "upvalues");
+  while (oldsize < f->sizeupvalues)
+    f->upvalues[oldsize++].name = NULL;
+  return &f->upvalues[fs->nups++];
+}
+
+
+static int newupvalue (FuncState *fs, TString *name, expdesc *v) {
+  Upvaldesc *up = allocupvalue(fs);
+  FuncState *prev = fs->prev;
+  if (v->k == VLOCAL) {
+    up->instack = 1;
+    up->idx = v->u.var.ridx;
+    up->kind = getlocalvardesc(prev, v->u.var.vidx)->vd.kind;
+    lua_assert(eqstr(name, getlocalvardesc(prev, v->u.var.vidx)->vd.name));
+  }
+  else {
+    up->instack = 0;
+    up->idx = cast_byte(v->u.info);
+    up->kind = prev->f->upvalues[v->u.info].kind;
+    lua_assert(eqstr(name, prev->f->upvalues[v->u.info].name));
+  }
+  up->name = name;
+  luaC_objbarrier(fs->ls->L, fs->f, name);
+  return fs->nups - 1;
+}
+
+
+/*
+** Look for an active local variable with the name 'n' in the
+** function 'fs'. If found, initialize 'var' with it and return
+** its expression kind; otherwise return -1.
+*/
+static int searchvar (FuncState *fs, TString *n, expdesc *var) {
+  int i;
+  for (i = cast_int(fs->nactvar) - 1; i >= 0; i--) {
+    Vardesc *vd = getlocalvardesc(fs, i);
+    if (eqstr(n, vd->vd.name)) {  /* found? */
+      if (vd->vd.kind == RDKCTC)  /* compile-time constant? */
+        init_exp(var, VCONST, fs->firstlocal + i);
+      else  /* real variable */
+        init_var(fs, var, i);
+      return var->k;
+    }
+  }
+  return -1;  /* not found */
+}
+
+
+/*
+** Mark block where variable at given level was defined
+** (to emit close instructions later).
+*/
+static void markupval (FuncState *fs, int level) {
+  BlockCnt *bl = fs->bl;
+  while (bl->nactvar > level)
+    bl = bl->previous;
+  bl->upval = 1;
+  fs->needclose = 1;
+}
+
+
+/*
+** Mark that current block has a to-be-closed variable.
+*/
+static void marktobeclosed (FuncState *fs) {
+  BlockCnt *bl = fs->bl;
+  bl->upval = 1;
+  bl->insidetbc = 1;
+  fs->needclose = 1;
+}
+
+
+/*
+** Find a variable with the given name 'n'. If it is an upvalue, add
+** this upvalue into all intermediate functions. If it is a global, set
+** 'var' as 'void' as a flag.
+*/
+static void singlevaraux (FuncState *fs, TString *n, expdesc *var, int base) {
+  if (fs == NULL)  /* no more levels? */
+    init_exp(var, VVOID, 0);  /* default is global */
+  else {
+    int v = searchvar(fs, n, var);  /* look up locals at current level */
+    if (v >= 0) {  /* found? */
+      if (v == VLOCAL && !base)
+        markupval(fs, var->u.var.vidx);  /* local will be used as an upval */
+    }
+    else {  /* not found as local at current level; try upvalues */
+      int idx = searchupvalue(fs, n);  /* try existing upvalues */
+      if (idx < 0) {  /* not found? */
+        singlevaraux(fs->prev, n, var, 0);  /* try upper levels */
+        if (var->k == VLOCAL || var->k == VUPVAL)  /* local or upvalue? */
+          idx  = newupvalue(fs, n, var);  /* will be a new upvalue */
+        else  /* it is a global or a constant */
+          return;  /* don't need to do anything at this level */
+      }
+      init_exp(var, VUPVAL, idx);  /* new or old upvalue */
+    }
+  }
+}
+
+
+/*
+** Find a variable with the given name 'n', handling global variables
+** too.
+*/
+static void singlevar (LexState *ls, expdesc *var) {
+  TString *varname = str_checkname(ls);
+  FuncState *fs = ls->fs;
+  singlevaraux(fs, varname, var, 1);
+  if (var->k == VVOID) {  /* global name? */
+    expdesc key;
+    singlevaraux(fs, ls->envn, var, 1);  /* get environment variable */
+    lua_assert(var->k != VVOID);  /* this one must exist */
+    luaK_exp2anyregup(fs, var);  /* but could be a constant */
+    codestring(&key, varname);  /* key is variable name */
+    luaK_indexed(fs, var, &key);  /* env[varname] */
+  }
+}
+
+
+/*
+** Adjust the number of results from an expression list 'e' with 'nexps'
+** expressions to 'nvars' values.
+*/
+static void adjust_assign (LexState *ls, int nvars, int nexps, expdesc *e) {
+  FuncState *fs = ls->fs;
+  int needed = nvars - nexps;  /* extra values needed */
+  if (hasmultret(e->k)) {  /* last expression has multiple returns? */
+    int extra = needed + 1;  /* discount last expression itself */
+    if (extra < 0)
+      extra = 0;
+    luaK_setreturns(fs, e, extra);  /* last exp. provides the difference */
+  }
+  else {
+    if (e->k != VVOID)  /* at least one expression? */
+      luaK_exp2nextreg(fs, e);  /* close last expression */
+    if (needed > 0)  /* missing values? */
+      luaK_nil(fs, fs->freereg, needed);  /* complete with nils */
+  }
+  if (needed > 0)
+    luaK_reserveregs(fs, needed);  /* registers for extra values */
+  else  /* adding 'needed' is actually a subtraction */
+    fs->freereg += needed;  /* remove extra values */
+}
+
+
+#define enterlevel(ls)	luaE_incCstack(ls->L)
+
+
+#define leavelevel(ls) ((ls)->L->nCcalls--)
+
+
+/*
+** Generates an error that a goto jumps into the scope of some
+** local variable.
+*/
+static l_noret jumpscopeerror (LexState *ls, Labeldesc *gt) {
+  const char *varname = getstr(getlocalvardesc(ls->fs, gt->nactvar)->vd.name);
+  const char *msg = "<goto %s> at line %d jumps into the scope of local '%s'";
+  msg = luaO_pushfstring(ls->L, msg, getstr(gt->name), gt->line, varname);
+  luaK_semerror(ls, msg);  /* raise the error */
+}
+
+
+/*
+** Solves the goto at index 'g' to given 'label' and removes it
+** from the list of pending gotos.
+** If it jumps into the scope of some variable, raises an error.
+*/
+static void solvegoto (LexState *ls, int g, Labeldesc *label) {
+  int i;
+  Labellist *gl = &ls->dyd->gt;  /* list of gotos */
+  Labeldesc *gt = &gl->arr[g];  /* goto to be resolved */
+  lua_assert(eqstr(gt->name, label->name));
+  if (l_unlikely(gt->nactvar < label->nactvar))  /* enter some scope? */
+    jumpscopeerror(ls, gt);
+  luaK_patchlist(ls->fs, gt->pc, label->pc);
+  for (i = g; i < gl->n - 1; i++)  /* remove goto from pending list */
+    gl->arr[i] = gl->arr[i + 1];
+  gl->n--;
+}
+
+
+/*
+** Search for an active label with the given name.
+*/
+static Labeldesc *findlabel (LexState *ls, TString *name) {
+  int i;
+  Dyndata *dyd = ls->dyd;
+  /* check labels in current function for a match */
+  for (i = ls->fs->firstlabel; i < dyd->label.n; i++) {
+    Labeldesc *lb = &dyd->label.arr[i];
+    if (eqstr(lb->name, name))  /* correct label? */
+      return lb;
+  }
+  return NULL;  /* label not found */
+}
+
+
+/*
+** Adds a new label/goto in the corresponding list.
+*/
+static int newlabelentry (LexState *ls, Labellist *l, TString *name,
+                          int line, int pc) {
+  int n = l->n;
+  luaM_growvector(ls->L, l->arr, n, l->size,
+                  Labeldesc, SHRT_MAX, "labels/gotos");
+  l->arr[n].name = name;
+  l->arr[n].line = line;
+  l->arr[n].nactvar = ls->fs->nactvar;
+  l->arr[n].close = 0;
+  l->arr[n].pc = pc;
+  l->n = n + 1;
+  return n;
+}
+
+
+static int newgotoentry (LexState *ls, TString *name, int line, int pc) {
+  return newlabelentry(ls, &ls->dyd->gt, name, line, pc);
+}
+
+
+/*
+** Solves forward jumps. Check whether new label 'lb' matches any
+** pending gotos in current block and solves them. Return true
+** if any of the gotos need to close upvalues.
+*/
+static int solvegotos (LexState *ls, Labeldesc *lb) {
+  Labellist *gl = &ls->dyd->gt;
+  int i = ls->fs->bl->firstgoto;
+  int needsclose = 0;
+  while (i < gl->n) {
+    if (eqstr(gl->arr[i].name, lb->name)) {
+      needsclose |= gl->arr[i].close;
+      solvegoto(ls, i, lb);  /* will remove 'i' from the list */
+    }
+    else
+      i++;
+  }
+  return needsclose;
+}
+
+
+/*
+** Create a new label with the given 'name' at the given 'line'.
+** 'last' tells whether label is the last non-op statement in its
+** block. Solves all pending gotos to this new label and adds
+** a close instruction if necessary.
+** Returns true iff it added a close instruction.
+*/
+static int createlabel (LexState *ls, TString *name, int line,
+                        int last) {
+  FuncState *fs = ls->fs;
+  Labellist *ll = &ls->dyd->label;
+  int l = newlabelentry(ls, ll, name, line, luaK_getlabel(fs));
+  if (last) {  /* label is last no-op statement in the block? */
+    /* assume that locals are already out of scope */
+    ll->arr[l].nactvar = fs->bl->nactvar;
+  }
+  if (solvegotos(ls, &ll->arr[l])) {  /* need close? */
+    luaK_codeABC(fs, OP_CLOSE, luaY_nvarstack(fs), 0, 0);
+    return 1;
+  }
+  return 0;
+}
+
+
+/*
+** Adjust pending gotos to outer level of a block.
+*/
+static void movegotosout (FuncState *fs, BlockCnt *bl) {
+  int i;
+  Labellist *gl = &fs->ls->dyd->gt;
+  /* correct pending gotos to current block */
+  for (i = bl->firstgoto; i < gl->n; i++) {  /* for each pending goto */
+    Labeldesc *gt = &gl->arr[i];
+    /* leaving a variable scope? */
+    if (reglevel(fs, gt->nactvar) > reglevel(fs, bl->nactvar))
+      gt->close |= bl->upval;  /* jump may need a close */
+    gt->nactvar = bl->nactvar;  /* update goto level */
+  }
+}
+
+
+static void enterblock (FuncState *fs, BlockCnt *bl, lu_byte isloop) {
+  bl->isloop = isloop;
+  bl->nactvar = fs->nactvar;
+  bl->firstlabel = fs->ls->dyd->label.n;
+  bl->firstgoto = fs->ls->dyd->gt.n;
+  bl->upval = 0;
+  bl->insidetbc = (fs->bl != NULL && fs->bl->insidetbc);
+  bl->previous = fs->bl;
+  fs->bl = bl;
+  lua_assert(fs->freereg == luaY_nvarstack(fs));
+}
+
+
+/*
+** generates an error for an undefined 'goto'.
+*/
+static l_noret undefgoto (LexState *ls, Labeldesc *gt) {
+  const char *msg;
+  if (eqstr(gt->name, luaS_newliteral(ls->L, "break"))) {
+    msg = "break outside loop at line %d";
+    msg = luaO_pushfstring(ls->L, msg, gt->line);
+  }
+  else {
+    msg = "no visible label '%s' for <goto> at line %d";
+    msg = luaO_pushfstring(ls->L, msg, getstr(gt->name), gt->line);
+  }
+  luaK_semerror(ls, msg);
+}
+
+
+static void leaveblock (FuncState *fs) {
+  BlockCnt *bl = fs->bl;
+  LexState *ls = fs->ls;
+  int hasclose = 0;
+  int stklevel = reglevel(fs, bl->nactvar);  /* level outside the block */
+  removevars(fs, bl->nactvar);  /* remove block locals */
+  lua_assert(bl->nactvar == fs->nactvar);  /* back to level on entry */
+  if (bl->isloop)  /* has to fix pending breaks? */
+    hasclose = createlabel(ls, luaS_newliteral(ls->L, "break"), 0, 0);
+  if (!hasclose && bl->previous && bl->upval)  /* still need a 'close'? */
+    luaK_codeABC(fs, OP_CLOSE, stklevel, 0, 0);
+  fs->freereg = stklevel;  /* free registers */
+  ls->dyd->label.n = bl->firstlabel;  /* remove local labels */
+  fs->bl = bl->previous;  /* current block now is previous one */
+  if (bl->previous)  /* was it a nested block? */
+    movegotosout(fs, bl);  /* update pending gotos to enclosing block */
+  else {
+    if (bl->firstgoto < ls->dyd->gt.n)  /* still pending gotos? */
+      undefgoto(ls, &ls->dyd->gt.arr[bl->firstgoto]);  /* error */
+  }
+}
+
+
+/*
+** adds a new prototype into list of prototypes
+*/
+static Proto *addprototype (LexState *ls) {
+  Proto *clp;
+  lua_State *L = ls->L;
+  FuncState *fs = ls->fs;
+  Proto *f = fs->f;  /* prototype of current function */
+  if (fs->np >= f->sizep) {
+    int oldsize = f->sizep;
+    luaM_growvector(L, f->p, fs->np, f->sizep, Proto *, MAXARG_Bx, "functions");
+    while (oldsize < f->sizep)
+      f->p[oldsize++] = NULL;
+  }
+  f->p[fs->np++] = clp = luaF_newproto(L);
+  luaC_objbarrier(L, f, clp);
+  return clp;
+}
+
+
+/*
+** codes instruction to create new closure in parent function.
+** The OP_CLOSURE instruction uses the last available register,
+** so that, if it invokes the GC, the GC knows which registers
+** are in use at that time.
+
+*/
+static void codeclosure (LexState *ls, expdesc *v) {
+  FuncState *fs = ls->fs->prev;
+  init_exp(v, VRELOC, luaK_codeABx(fs, OP_CLOSURE, 0, fs->np - 1));
+  luaK_exp2nextreg(fs, v);  /* fix it at the last register */
+}
+
+
+static void open_func (LexState *ls, FuncState *fs, BlockCnt *bl) {
+  Proto *f = fs->f;
+  fs->prev = ls->fs;  /* linked list of funcstates */
+  fs->ls = ls;
+  ls->fs = fs;
+  fs->pc = 0;
+  fs->previousline = f->linedefined;
+  fs->iwthabs = 0;
+  fs->lasttarget = 0;
+  fs->freereg = 0;
+  fs->nk = 0;
+  fs->nabslineinfo = 0;
+  fs->np = 0;
+  fs->nups = 0;
+  fs->ndebugvars = 0;
+  fs->nactvar = 0;
+  fs->needclose = 0;
+  fs->firstlocal = ls->dyd->actvar.n;
+  fs->firstlabel = ls->dyd->label.n;
+  fs->bl = NULL;
+  f->source = ls->source;
+  luaC_objbarrier(ls->L, f, f->source);
+  f->maxstacksize = 2;  /* registers 0/1 are always valid */
+  enterblock(fs, bl, 0);
+}
+
+
+static void close_func (LexState *ls) {
+  lua_State *L = ls->L;
+  FuncState *fs = ls->fs;
+  Proto *f = fs->f;
+  luaK_ret(fs, luaY_nvarstack(fs), 0);  /* final return */
+  leaveblock(fs);
+  lua_assert(fs->bl == NULL);
+  luaK_finish(fs);
+  luaM_shrinkvector(L, f->code, f->sizecode, fs->pc, Instruction);
+  luaM_shrinkvector(L, f->lineinfo, f->sizelineinfo, fs->pc, ls_byte);
+  luaM_shrinkvector(L, f->abslineinfo, f->sizeabslineinfo,
+                       fs->nabslineinfo, AbsLineInfo);
+  luaM_shrinkvector(L, f->k, f->sizek, fs->nk, TValue);
+  luaM_shrinkvector(L, f->p, f->sizep, fs->np, Proto *);
+  luaM_shrinkvector(L, f->locvars, f->sizelocvars, fs->ndebugvars, LocVar);
+  luaM_shrinkvector(L, f->upvalues, f->sizeupvalues, fs->nups, Upvaldesc);
+  ls->fs = fs->prev;
+  luaC_checkGC(L);
+}
+
+
+
+/*============================================================*/
+/* GRAMMAR RULES */
+/*============================================================*/
+
+
+/*
+** check whether current token is in the follow set of a block.
+** 'until' closes syntactical blocks, but do not close scope,
+** so it is handled in separate.
+*/
+static int block_follow (LexState *ls, int withuntil) {
+  switch (ls->t.token) {
+    case TK_ELSE: case TK_ELSEIF:
+    case TK_END: case TK_EOS:
+      return 1;
+    case TK_UNTIL: return withuntil;
+    default: return 0;
+  }
+}
+
+
+static void statlist (LexState *ls) {
+  /* statlist -> { stat [';'] } */
+  while (!block_follow(ls, 1)) {
+    if (ls->t.token == TK_RETURN) {
+      statement(ls);
+      return;  /* 'return' must be last statement */
+    }
+    statement(ls);
+  }
+}
+
+
+static void fieldsel (LexState *ls, expdesc *v) {
+  /* fieldsel -> ['.' | ':'] NAME */
+  FuncState *fs = ls->fs;
+  expdesc key;
+  luaK_exp2anyregup(fs, v);
+  luaX_next(ls);  /* skip the dot or colon */
+  codename(ls, &key);
+  luaK_indexed(fs, v, &key);
+}
+
+
+static void yindex (LexState *ls, expdesc *v) {
+  /* index -> '[' expr ']' */
+  luaX_next(ls);  /* skip the '[' */
+  expr(ls, v);
+  luaK_exp2val(ls->fs, v);
+  checknext(ls, ']');
+}
+
+
+/*
+** {======================================================================
+** Rules for Constructors
+** =======================================================================
+*/
+
+
+typedef struct ConsControl {
+  expdesc v;  /* last list item read */
+  expdesc *t;  /* table descriptor */
+  int nh;  /* total number of 'record' elements */
+  int na;  /* number of array elements already stored */
+  int tostore;  /* number of array elements pending to be stored */
+} ConsControl;
+
+
+static void recfield (LexState *ls, ConsControl *cc) {
+  /* recfield -> (NAME | '['exp']') = exp */
+  FuncState *fs = ls->fs;
+  int reg = ls->fs->freereg;
+  expdesc tab, key, val;
+  if (ls->t.token == TK_NAME) {
+    checklimit(fs, cc->nh, MAX_INT, "items in a constructor");
+    codename(ls, &key);
+  }
+  else  /* ls->t.token == '[' */
+    yindex(ls, &key);
+  cc->nh++;
+  checknext(ls, '=');
+  tab = *cc->t;
+  luaK_indexed(fs, &tab, &key);
+  expr(ls, &val);
+  luaK_storevar(fs, &tab, &val);
+  fs->freereg = reg;  /* free registers */
+}
+
+
+static void closelistfield (FuncState *fs, ConsControl *cc) {
+  if (cc->v.k == VVOID) return;  /* there is no list item */
+  luaK_exp2nextreg(fs, &cc->v);
+  cc->v.k = VVOID;
+  if (cc->tostore == LFIELDS_PER_FLUSH) {
+    luaK_setlist(fs, cc->t->u.info, cc->na, cc->tostore);  /* flush */
+    cc->na += cc->tostore;
+    cc->tostore = 0;  /* no more items pending */
+  }
+}
+
+
+static void lastlistfield (FuncState *fs, ConsControl *cc) {
+  if (cc->tostore == 0) return;
+  if (hasmultret(cc->v.k)) {
+    luaK_setmultret(fs, &cc->v);
+    luaK_setlist(fs, cc->t->u.info, cc->na, LUA_MULTRET);
+    cc->na--;  /* do not count last expression (unknown number of elements) */
+  }
+  else {
+    if (cc->v.k != VVOID)
+      luaK_exp2nextreg(fs, &cc->v);
+    luaK_setlist(fs, cc->t->u.info, cc->na, cc->tostore);
+  }
+  cc->na += cc->tostore;
+}
+
+
+static void listfield (LexState *ls, ConsControl *cc) {
+  /* listfield -> exp */
+  expr(ls, &cc->v);
+  cc->tostore++;
+}
+
+
+static void field (LexState *ls, ConsControl *cc) {
+  /* field -> listfield | recfield */
+  switch(ls->t.token) {
+    case TK_NAME: {  /* may be 'listfield' or 'recfield' */
+      if (luaX_lookahead(ls) != '=')  /* expression? */
+        listfield(ls, cc);
+      else
+        recfield(ls, cc);
+      break;
+    }
+    case '[': {
+      recfield(ls, cc);
+      break;
+    }
+    default: {
+      listfield(ls, cc);
+      break;
+    }
+  }
+}
+
+
+static void constructor (LexState *ls, expdesc *t) {
+  /* constructor -> '{' [ field { sep field } [sep] ] '}'
+     sep -> ',' | ';' */
+  FuncState *fs = ls->fs;
+  int line = ls->linenumber;
+  int pc = luaK_codeABC(fs, OP_NEWTABLE, 0, 0, 0);
+  ConsControl cc;
+  luaK_code(fs, 0);  /* space for extra arg. */
+  cc.na = cc.nh = cc.tostore = 0;
+  cc.t = t;
+  init_exp(t, VNONRELOC, fs->freereg);  /* table will be at stack top */
+  luaK_reserveregs(fs, 1);
+  init_exp(&cc.v, VVOID, 0);  /* no value (yet) */
+  checknext(ls, '{');
+  do {
+    lua_assert(cc.v.k == VVOID || cc.tostore > 0);
+    if (ls->t.token == '}') break;
+    closelistfield(fs, &cc);
+    field(ls, &cc);
+  } while (testnext(ls, ',') || testnext(ls, ';'));
+  check_match(ls, '}', '{', line);
+  lastlistfield(fs, &cc);
+  luaK_settablesize(fs, pc, t->u.info, cc.na, cc.nh);
+}
+
+/* }====================================================================== */
+
+
+static void setvararg (FuncState *fs, int nparams) {
+  fs->f->is_vararg = 1;
+  luaK_codeABC(fs, OP_VARARGPREP, nparams, 0, 0);
+}
+
+
+static void parlist (LexState *ls) {
+  /* parlist -> [ {NAME ','} (NAME | '...') ] */
+  FuncState *fs = ls->fs;
+  Proto *f = fs->f;
+  int nparams = 0;
+  int isvararg = 0;
+  if (ls->t.token != ')') {  /* is 'parlist' not empty? */
+    do {
+      switch (ls->t.token) {
+        case TK_NAME: {
+          new_localvar(ls, str_checkname(ls));
+          nparams++;
+          break;
+        }
+        case TK_DOTS: {
+          luaX_next(ls);
+          isvararg = 1;
+          break;
+        }
+        default: luaX_syntaxerror(ls, "<name> or '...' expected");
+      }
+    } while (!isvararg && testnext(ls, ','));
+  }
+  adjustlocalvars(ls, nparams);
+  f->numparams = cast_byte(fs->nactvar);
+  if (isvararg)
+    setvararg(fs, f->numparams);  /* declared vararg */
+  luaK_reserveregs(fs, fs->nactvar);  /* reserve registers for parameters */
+}
+
+
+static void body (LexState *ls, expdesc *e, int ismethod, int line) {
+  /* body ->  '(' parlist ')' block END */
+  FuncState new_fs;
+  BlockCnt bl;
+  new_fs.f = addprototype(ls);
+  new_fs.f->linedefined = line;
+  open_func(ls, &new_fs, &bl);
+  checknext(ls, '(');
+  if (ismethod) {
+    new_localvarliteral(ls, "self");  /* create 'self' parameter */
+    adjustlocalvars(ls, 1);
+  }
+  parlist(ls);
+  checknext(ls, ')');
+  statlist(ls);
+  new_fs.f->lastlinedefined = ls->linenumber;
+  check_match(ls, TK_END, TK_FUNCTION, line);
+  codeclosure(ls, e);
+  close_func(ls);
+}
+
+
+static int explist (LexState *ls, expdesc *v) {
+  /* explist -> expr { ',' expr } */
+  int n = 1;  /* at least one expression */
+  expr(ls, v);
+  while (testnext(ls, ',')) {
+    luaK_exp2nextreg(ls->fs, v);
+    expr(ls, v);
+    n++;
+  }
+  return n;
+}
+
+
+static void funcargs (LexState *ls, expdesc *f, int line) {
+  FuncState *fs = ls->fs;
+  expdesc args;
+  int base, nparams;
+  switch (ls->t.token) {
+    case '(': {  /* funcargs -> '(' [ explist ] ')' */
+      luaX_next(ls);
+      if (ls->t.token == ')')  /* arg list is empty? */
+        args.k = VVOID;
+      else {
+        explist(ls, &args);
+        if (hasmultret(args.k))
+          luaK_setmultret(fs, &args);
+      }
+      check_match(ls, ')', '(', line);
+      break;
+    }
+    case '{': {  /* funcargs -> constructor */
+      constructor(ls, &args);
+      break;
+    }
+    case TK_STRING: {  /* funcargs -> STRING */
+      codestring(&args, ls->t.seminfo.ts);
+      luaX_next(ls);  /* must use 'seminfo' before 'next' */
+      break;
+    }
+    default: {
+      luaX_syntaxerror(ls, "function arguments expected");
+    }
+  }
+  lua_assert(f->k == VNONRELOC);
+  base = f->u.info;  /* base register for call */
+  if (hasmultret(args.k))
+    nparams = LUA_MULTRET;  /* open call */
+  else {
+    if (args.k != VVOID)
+      luaK_exp2nextreg(fs, &args);  /* close last argument */
+    nparams = fs->freereg - (base+1);
+  }
+  init_exp(f, VCALL, luaK_codeABC(fs, OP_CALL, base, nparams+1, 2));
+  luaK_fixline(fs, line);
+  fs->freereg = base+1;  /* call remove function and arguments and leaves
+                            (unless changed) one result */
+}
+
+
+
+
+/*
+** {======================================================================
+** Expression parsing
+** =======================================================================
+*/
+
+
+static void primaryexp (LexState *ls, expdesc *v) {
+  /* primaryexp -> NAME | '(' expr ')' */
+  switch (ls->t.token) {
+    case '(': {
+      int line = ls->linenumber;
+      luaX_next(ls);
+      expr(ls, v);
+      check_match(ls, ')', '(', line);
+      luaK_dischargevars(ls->fs, v);
+      return;
+    }
+    case TK_NAME: {
+      singlevar(ls, v);
+      return;
+    }
+    default: {
+      luaX_syntaxerror(ls, "unexpected symbol");
+    }
+  }
+}
+
+
+static void suffixedexp (LexState *ls, expdesc *v) {
+  /* suffixedexp ->
+       primaryexp { '.' NAME | '[' exp ']' | ':' NAME funcargs | funcargs } */
+  FuncState *fs = ls->fs;
+  int line = ls->linenumber;
+  primaryexp(ls, v);
+  for (;;) {
+    switch (ls->t.token) {
+      case '.': {  /* fieldsel */
+        fieldsel(ls, v);
+        break;
+      }
+      case '[': {  /* '[' exp ']' */
+        expdesc key;
+        luaK_exp2anyregup(fs, v);
+        yindex(ls, &key);
+        luaK_indexed(fs, v, &key);
+        break;
+      }
+      case ':': {  /* ':' NAME funcargs */
+        expdesc key;
+        luaX_next(ls);
+        codename(ls, &key);
+        luaK_self(fs, v, &key);
+        funcargs(ls, v, line);
+        break;
+      }
+      case '(': case TK_STRING: case '{': {  /* funcargs */
+        luaK_exp2nextreg(fs, v);
+        funcargs(ls, v, line);
+        break;
+      }
+      default: return;
+    }
+  }
+}
+
+
+static void simpleexp (LexState *ls, expdesc *v) {
+  /* simpleexp -> FLT | INT | STRING | NIL | TRUE | FALSE | ... |
+                  constructor | FUNCTION body | suffixedexp */
+  switch (ls->t.token) {
+    case TK_FLT: {
+      init_exp(v, VKFLT, 0);
+      v->u.nval = ls->t.seminfo.r;
+      break;
+    }
+    case TK_INT: {
+      init_exp(v, VKINT, 0);
+      v->u.ival = ls->t.seminfo.i;
+      break;
+    }
+    case TK_STRING: {
+      codestring(v, ls->t.seminfo.ts);
+      break;
+    }
+    case TK_NIL: {
+      init_exp(v, VNIL, 0);
+      break;
+    }
+    case TK_TRUE: {
+      init_exp(v, VTRUE, 0);
+      break;
+    }
+    case TK_FALSE: {
+      init_exp(v, VFALSE, 0);
+      break;
+    }
+    case TK_DOTS: {  /* vararg */
+      FuncState *fs = ls->fs;
+      check_condition(ls, fs->f->is_vararg,
+                      "cannot use '...' outside a vararg function");
+      init_exp(v, VVARARG, luaK_codeABC(fs, OP_VARARG, 0, 0, 1));
+      break;
+    }
+    case '{': {  /* constructor */
+      constructor(ls, v);
+      return;
+    }
+    case TK_FUNCTION: {
+      luaX_next(ls);
+      body(ls, v, 0, ls->linenumber);
+      return;
+    }
+    default: {
+      suffixedexp(ls, v);
+      return;
+    }
+  }
+  luaX_next(ls);
+}
+
+
+static UnOpr getunopr (int op) {
+  switch (op) {
+    case TK_NOT: return OPR_NOT;
+    case '-': return OPR_MINUS;
+    case '~': return OPR_BNOT;
+    case '#': return OPR_LEN;
+    default: return OPR_NOUNOPR;
+  }
+}
+
+
+static BinOpr getbinopr (int op) {
+  switch (op) {
+    case '+': return OPR_ADD;
+    case '-': return OPR_SUB;
+    case '*': return OPR_MUL;
+    case '%': return OPR_MOD;
+    case '^': return OPR_POW;
+    case '/': return OPR_DIV;
+    case TK_IDIV: return OPR_IDIV;
+    case '&': return OPR_BAND;
+    case '|': return OPR_BOR;
+    case '~': return OPR_BXOR;
+    case TK_SHL: return OPR_SHL;
+    case TK_SHR: return OPR_SHR;
+    case TK_CONCAT: return OPR_CONCAT;
+    case TK_NE: return OPR_NE;
+    case TK_EQ: return OPR_EQ;
+    case '<': return OPR_LT;
+    case TK_LE: return OPR_LE;
+    case '>': return OPR_GT;
+    case TK_GE: return OPR_GE;
+    case TK_AND: return OPR_AND;
+    case TK_OR: return OPR_OR;
+    default: return OPR_NOBINOPR;
+  }
+}
+
+
+/*
+** Priority table for binary operators.
+*/
+static const struct {
+  lu_byte left;  /* left priority for each binary operator */
+  lu_byte right; /* right priority */
+} priority[] = {  /* ORDER OPR */
+   {10, 10}, {10, 10},           /* '+' '-' */
+   {11, 11}, {11, 11},           /* '*' '%' */
+   {14, 13},                  /* '^' (right associative) */
+   {11, 11}, {11, 11},           /* '/' '//' */
+   {6, 6}, {4, 4}, {5, 5},   /* '&' '|' '~' */
+   {7, 7}, {7, 7},           /* '<<' '>>' */
+   {9, 8},                   /* '..' (right associative) */
+   {3, 3}, {3, 3}, {3, 3},   /* ==, <, <= */
+   {3, 3}, {3, 3}, {3, 3},   /* ~=, >, >= */
+   {2, 2}, {1, 1}            /* and, or */
+};
+
+#define UNARY_PRIORITY	12  /* priority for unary operators */
+
+
+/*
+** subexpr -> (simpleexp | unop subexpr) { binop subexpr }
+** where 'binop' is any binary operator with a priority higher than 'limit'
+*/
+static BinOpr subexpr (LexState *ls, expdesc *v, int limit) {
+  BinOpr op;
+  UnOpr uop;
+  enterlevel(ls);
+  uop = getunopr(ls->t.token);
+  if (uop != OPR_NOUNOPR) {  /* prefix (unary) operator? */
+    int line = ls->linenumber;
+    luaX_next(ls);  /* skip operator */
+    subexpr(ls, v, UNARY_PRIORITY);
+    luaK_prefix(ls->fs, uop, v, line);
+  }
+  else simpleexp(ls, v);
+  /* expand while operators have priorities higher than 'limit' */
+  op = getbinopr(ls->t.token);
+  while (op != OPR_NOBINOPR && priority[op].left > limit) {
+    expdesc v2;
+    BinOpr nextop;
+    int line = ls->linenumber;
+    luaX_next(ls);  /* skip operator */
+    luaK_infix(ls->fs, op, v);
+    /* read sub-expression with higher priority */
+    nextop = subexpr(ls, &v2, priority[op].right);
+    luaK_posfix(ls->fs, op, v, &v2, line);
+    op = nextop;
+  }
+  leavelevel(ls);
+  return op;  /* return first untreated operator */
+}
+
+
+static void expr (LexState *ls, expdesc *v) {
+  subexpr(ls, v, 0);
+}
+
+/* }==================================================================== */
+
+
+
+/*
+** {======================================================================
+** Rules for Statements
+** =======================================================================
+*/
+
+
+static void block (LexState *ls) {
+  /* block -> statlist */
+  FuncState *fs = ls->fs;
+  BlockCnt bl;
+  enterblock(fs, &bl, 0);
+  statlist(ls);
+  leaveblock(fs);
+}
+
+
+/*
+** structure to chain all variables in the left-hand side of an
+** assignment
+*/
+struct LHS_assign {
+  struct LHS_assign *prev;
+  expdesc v;  /* variable (global, local, upvalue, or indexed) */
+};
+
+
+/*
+** check whether, in an assignment to an upvalue/local variable, the
+** upvalue/local variable is begin used in a previous assignment to a
+** table. If so, save original upvalue/local value in a safe place and
+** use this safe copy in the previous assignment.
+*/
+static void check_conflict (LexState *ls, struct LHS_assign *lh, expdesc *v) {
+  FuncState *fs = ls->fs;
+  int extra = fs->freereg;  /* eventual position to save local variable */
+  int conflict = 0;
+  for (; lh; lh = lh->prev) {  /* check all previous assignments */
+    if (vkisindexed(lh->v.k)) {  /* assignment to table field? */
+      if (lh->v.k == VINDEXUP) {  /* is table an upvalue? */
+        if (v->k == VUPVAL && lh->v.u.ind.t == v->u.info) {
+          conflict = 1;  /* table is the upvalue being assigned now */
+          lh->v.k = VINDEXSTR;
+          lh->v.u.ind.t = extra;  /* assignment will use safe copy */
+        }
+      }
+      else {  /* table is a register */
+        if (v->k == VLOCAL && lh->v.u.ind.t == v->u.var.ridx) {
+          conflict = 1;  /* table is the local being assigned now */
+          lh->v.u.ind.t = extra;  /* assignment will use safe copy */
+        }
+        /* is index the local being assigned? */
+        if (lh->v.k == VINDEXED && v->k == VLOCAL &&
+            lh->v.u.ind.idx == v->u.var.ridx) {
+          conflict = 1;
+          lh->v.u.ind.idx = extra;  /* previous assignment will use safe copy */
+        }
+      }
+    }
+  }
+  if (conflict) {
+    /* copy upvalue/local value to a temporary (in position 'extra') */
+    if (v->k == VLOCAL)
+      luaK_codeABC(fs, OP_MOVE, extra, v->u.var.ridx, 0);
+    else
+      luaK_codeABC(fs, OP_GETUPVAL, extra, v->u.info, 0);
+    luaK_reserveregs(fs, 1);
+  }
+}
+
+/*
+** Parse and compile a multiple assignment. The first "variable"
+** (a 'suffixedexp') was already read by the caller.
+**
+** assignment -> suffixedexp restassign
+** restassign -> ',' suffixedexp restassign | '=' explist
+*/
+static void restassign (LexState *ls, struct LHS_assign *lh, int nvars) {
+  expdesc e;
+  check_condition(ls, vkisvar(lh->v.k), "syntax error");
+  check_readonly(ls, &lh->v);
+  if (testnext(ls, ',')) {  /* restassign -> ',' suffixedexp restassign */
+    struct LHS_assign nv;
+    nv.prev = lh;
+    suffixedexp(ls, &nv.v);
+    if (!vkisindexed(nv.v.k))
+      check_conflict(ls, lh, &nv.v);
+    enterlevel(ls);  /* control recursion depth */
+    restassign(ls, &nv, nvars+1);
+    leavelevel(ls);
+  }
+  else {  /* restassign -> '=' explist */
+    int nexps;
+    checknext(ls, '=');
+    nexps = explist(ls, &e);
+    if (nexps != nvars)
+      adjust_assign(ls, nvars, nexps, &e);
+    else {
+      luaK_setoneret(ls->fs, &e);  /* close last expression */
+      luaK_storevar(ls->fs, &lh->v, &e);
+      return;  /* avoid default */
+    }
+  }
+  init_exp(&e, VNONRELOC, ls->fs->freereg-1);  /* default assignment */
+  luaK_storevar(ls->fs, &lh->v, &e);
+}
+
+
+static int cond (LexState *ls) {
+  /* cond -> exp */
+  expdesc v;
+  expr(ls, &v);  /* read condition */
+  if (v.k == VNIL) v.k = VFALSE;  /* 'falses' are all equal here */
+  luaK_goiftrue(ls->fs, &v);
+  return v.f;
+}
+
+
+static void gotostat (LexState *ls) {
+  FuncState *fs = ls->fs;
+  int line = ls->linenumber;
+  TString *name = str_checkname(ls);  /* label's name */
+  Labeldesc *lb = findlabel(ls, name);
+  if (lb == NULL)  /* no label? */
+    /* forward jump; will be resolved when the label is declared */
+    newgotoentry(ls, name, line, luaK_jump(fs));
+  else {  /* found a label */
+    /* backward jump; will be resolved here */
+    int lblevel = reglevel(fs, lb->nactvar);  /* label level */
+    if (luaY_nvarstack(fs) > lblevel)  /* leaving the scope of a variable? */
+      luaK_codeABC(fs, OP_CLOSE, lblevel, 0, 0);
+    /* create jump and link it to the label */
+    luaK_patchlist(fs, luaK_jump(fs), lb->pc);
+  }
+}
+
+
+/*
+** Break statement. Semantically equivalent to "goto break".
+*/
+static void breakstat (LexState *ls) {
+  int line = ls->linenumber;
+  luaX_next(ls);  /* skip break */
+  newgotoentry(ls, luaS_newliteral(ls->L, "break"), line, luaK_jump(ls->fs));
+}
+
+
+/*
+** Check whether there is already a label with the given 'name'.
+*/
+static void checkrepeated (LexState *ls, TString *name) {
+  Labeldesc *lb = findlabel(ls, name);
+  if (l_unlikely(lb != NULL)) {  /* already defined? */
+    const char *msg = "label '%s' already defined on line %d";
+    msg = luaO_pushfstring(ls->L, msg, getstr(name), lb->line);
+    luaK_semerror(ls, msg);  /* error */
+  }
+}
+
+
+static void labelstat (LexState *ls, TString *name, int line) {
+  /* label -> '::' NAME '::' */
+  checknext(ls, TK_DBCOLON);  /* skip double colon */
+  while (ls->t.token == ';' || ls->t.token == TK_DBCOLON)
+    statement(ls);  /* skip other no-op statements */
+  checkrepeated(ls, name);  /* check for repeated labels */
+  createlabel(ls, name, line, block_follow(ls, 0));
+}
+
+
+static void whilestat (LexState *ls, int line) {
+  /* whilestat -> WHILE cond DO block END */
+  FuncState *fs = ls->fs;
+  int whileinit;
+  int condexit;
+  BlockCnt bl;
+  luaX_next(ls);  /* skip WHILE */
+  whileinit = luaK_getlabel(fs);
+  condexit = cond(ls);
+  enterblock(fs, &bl, 1);
+  checknext(ls, TK_DO);
+  block(ls);
+  luaK_jumpto(fs, whileinit);
+  check_match(ls, TK_END, TK_WHILE, line);
+  leaveblock(fs);
+  luaK_patchtohere(fs, condexit);  /* false conditions finish the loop */
+}
+
+
+static void repeatstat (LexState *ls, int line) {
+  /* repeatstat -> REPEAT block UNTIL cond */
+  int condexit;
+  FuncState *fs = ls->fs;
+  int repeat_init = luaK_getlabel(fs);
+  BlockCnt bl1, bl2;
+  enterblock(fs, &bl1, 1);  /* loop block */
+  enterblock(fs, &bl2, 0);  /* scope block */
+  luaX_next(ls);  /* skip REPEAT */
+  statlist(ls);
+  check_match(ls, TK_UNTIL, TK_REPEAT, line);
+  condexit = cond(ls);  /* read condition (inside scope block) */
+  leaveblock(fs);  /* finish scope */
+  if (bl2.upval) {  /* upvalues? */
+    int exit = luaK_jump(fs);  /* normal exit must jump over fix */
+    luaK_patchtohere(fs, condexit);  /* repetition must close upvalues */
+    luaK_codeABC(fs, OP_CLOSE, reglevel(fs, bl2.nactvar), 0, 0);
+    condexit = luaK_jump(fs);  /* repeat after closing upvalues */
+    luaK_patchtohere(fs, exit);  /* normal exit comes to here */
+  }
+  luaK_patchlist(fs, condexit, repeat_init);  /* close the loop */
+  leaveblock(fs);  /* finish loop */
+}
+
+
+/*
+** Read an expression and generate code to put its results in next
+** stack slot.
+**
+*/
+static void exp1 (LexState *ls) {
+  expdesc e;
+  expr(ls, &e);
+  luaK_exp2nextreg(ls->fs, &e);
+  lua_assert(e.k == VNONRELOC);
+}
+
+
+/*
+** Fix for instruction at position 'pc' to jump to 'dest'.
+** (Jump addresses are relative in Lua). 'back' true means
+** a back jump.
+*/
+static void fixforjump (FuncState *fs, int pc, int dest, int back) {
+  Instruction *jmp = &fs->f->code[pc];
+  int offset = dest - (pc + 1);
+  if (back)
+    offset = -offset;
+  if (l_unlikely(offset > MAXARG_Bx))
+    luaX_syntaxerror(fs->ls, "control structure too long");
+  SETARG_Bx(*jmp, offset);
+}
+
+
+/*
+** Generate code for a 'for' loop.
+*/
+static void forbody (LexState *ls, int base, int line, int nvars, int isgen) {
+  /* forbody -> DO block */
+  static const OpCode forprep[2] = {OP_FORPREP, OP_TFORPREP};
+  static const OpCode forloop[2] = {OP_FORLOOP, OP_TFORLOOP};
+  BlockCnt bl;
+  FuncState *fs = ls->fs;
+  int prep, endfor;
+  checknext(ls, TK_DO);
+  prep = luaK_codeABx(fs, forprep[isgen], base, 0);
+  enterblock(fs, &bl, 0);  /* scope for declared variables */
+  adjustlocalvars(ls, nvars);
+  luaK_reserveregs(fs, nvars);
+  block(ls);
+  leaveblock(fs);  /* end of scope for declared variables */
+  fixforjump(fs, prep, luaK_getlabel(fs), 0);
+  if (isgen) {  /* generic for? */
+    luaK_codeABC(fs, OP_TFORCALL, base, 0, nvars);
+    luaK_fixline(fs, line);
+  }
+  endfor = luaK_codeABx(fs, forloop[isgen], base, 0);
+  fixforjump(fs, endfor, prep + 1, 1);
+  luaK_fixline(fs, line);
+}
+
+
+static void fornum (LexState *ls, TString *varname, int line) {
+  /* fornum -> NAME = exp,exp[,exp] forbody */
+  FuncState *fs = ls->fs;
+  int base = fs->freereg;
+  new_localvarliteral(ls, "(for state)");
+  new_localvarliteral(ls, "(for state)");
+  new_localvarliteral(ls, "(for state)");
+  new_localvar(ls, varname);
+  checknext(ls, '=');
+  exp1(ls);  /* initial value */
+  checknext(ls, ',');
+  exp1(ls);  /* limit */
+  if (testnext(ls, ','))
+    exp1(ls);  /* optional step */
+  else {  /* default step = 1 */
+    luaK_int(fs, fs->freereg, 1);
+    luaK_reserveregs(fs, 1);
+  }
+  adjustlocalvars(ls, 3);  /* control variables */
+  forbody(ls, base, line, 1, 0);
+}
+
+
+static void forlist (LexState *ls, TString *indexname) {
+  /* forlist -> NAME {,NAME} IN explist forbody */
+  FuncState *fs = ls->fs;
+  expdesc e;
+  int nvars = 5;  /* gen, state, control, toclose, 'indexname' */
+  int line;
+  int base = fs->freereg;
+  /* create control variables */
+  new_localvarliteral(ls, "(for state)");
+  new_localvarliteral(ls, "(for state)");
+  new_localvarliteral(ls, "(for state)");
+  new_localvarliteral(ls, "(for state)");
+  /* create declared variables */
+  new_localvar(ls, indexname);
+  while (testnext(ls, ',')) {
+    new_localvar(ls, str_checkname(ls));
+    nvars++;
+  }
+  checknext(ls, TK_IN);
+  line = ls->linenumber;
+  adjust_assign(ls, 4, explist(ls, &e), &e);
+  adjustlocalvars(ls, 4);  /* control variables */
+  marktobeclosed(fs);  /* last control var. must be closed */
+  luaK_checkstack(fs, 3);  /* extra space to call generator */
+  forbody(ls, base, line, nvars - 4, 1);
+}
+
+
+static void forstat (LexState *ls, int line) {
+  /* forstat -> FOR (fornum | forlist) END */
+  FuncState *fs = ls->fs;
+  TString *varname;
+  BlockCnt bl;
+  enterblock(fs, &bl, 1);  /* scope for loop and control variables */
+  luaX_next(ls);  /* skip 'for' */
+  varname = str_checkname(ls);  /* first variable name */
+  switch (ls->t.token) {
+    case '=': fornum(ls, varname, line); break;
+    case ',': case TK_IN: forlist(ls, varname); break;
+    default: luaX_syntaxerror(ls, "'=' or 'in' expected");
+  }
+  check_match(ls, TK_END, TK_FOR, line);
+  leaveblock(fs);  /* loop scope ('break' jumps to this point) */
+}
+
+
+static void test_then_block (LexState *ls, int *escapelist) {
+  /* test_then_block -> [IF | ELSEIF] cond THEN block */
+  BlockCnt bl;
+  FuncState *fs = ls->fs;
+  expdesc v;
+  int jf;  /* instruction to skip 'then' code (if condition is false) */
+  luaX_next(ls);  /* skip IF or ELSEIF */
+  expr(ls, &v);  /* read condition */
+  checknext(ls, TK_THEN);
+  if (ls->t.token == TK_BREAK) {  /* 'if x then break' ? */
+    int line = ls->linenumber;
+    luaK_goiffalse(ls->fs, &v);  /* will jump if condition is true */
+    luaX_next(ls);  /* skip 'break' */
+    enterblock(fs, &bl, 0);  /* must enter block before 'goto' */
+    newgotoentry(ls, luaS_newliteral(ls->L, "break"), line, v.t);
+    while (testnext(ls, ';')) {}  /* skip semicolons */
+    if (block_follow(ls, 0)) {  /* jump is the entire block? */
+      leaveblock(fs);
+      return;  /* and that is it */
+    }
+    else  /* must skip over 'then' part if condition is false */
+      jf = luaK_jump(fs);
+  }
+  else {  /* regular case (not a break) */
+    luaK_goiftrue(ls->fs, &v);  /* skip over block if condition is false */
+    enterblock(fs, &bl, 0);
+    jf = v.f;
+  }
+  statlist(ls);  /* 'then' part */
+  leaveblock(fs);
+  if (ls->t.token == TK_ELSE ||
+      ls->t.token == TK_ELSEIF)  /* followed by 'else'/'elseif'? */
+    luaK_concat(fs, escapelist, luaK_jump(fs));  /* must jump over it */
+  luaK_patchtohere(fs, jf);
+}
+
+
+static void ifstat (LexState *ls, int line) {
+  /* ifstat -> IF cond THEN block {ELSEIF cond THEN block} [ELSE block] END */
+  FuncState *fs = ls->fs;
+  int escapelist = NO_JUMP;  /* exit list for finished parts */
+  test_then_block(ls, &escapelist);  /* IF cond THEN block */
+  while (ls->t.token == TK_ELSEIF)
+    test_then_block(ls, &escapelist);  /* ELSEIF cond THEN block */
+  if (testnext(ls, TK_ELSE))
+    block(ls);  /* 'else' part */
+  check_match(ls, TK_END, TK_IF, line);
+  luaK_patchtohere(fs, escapelist);  /* patch escape list to 'if' end */
+}
+
+
+static void localfunc (LexState *ls) {
+  expdesc b;
+  FuncState *fs = ls->fs;
+  int fvar = fs->nactvar;  /* function's variable index */
+  new_localvar(ls, str_checkname(ls));  /* new local variable */
+  adjustlocalvars(ls, 1);  /* enter its scope */
+  body(ls, &b, 0, ls->linenumber);  /* function created in next register */
+  /* debug information will only see the variable after this point! */
+  localdebuginfo(fs, fvar)->startpc = fs->pc;
+}
+
+
+static int getlocalattribute (LexState *ls) {
+  /* ATTRIB -> ['<' Name '>'] */
+  if (testnext(ls, '<')) {
+    const char *attr = getstr(str_checkname(ls));
+    checknext(ls, '>');
+    if (strcmp(attr, "const") == 0)
+      return RDKCONST;  /* read-only variable */
+    else if (strcmp(attr, "close") == 0)
+      return RDKTOCLOSE;  /* to-be-closed variable */
+    else
+      luaK_semerror(ls,
+        luaO_pushfstring(ls->L, "unknown attribute '%s'", attr));
+  }
+  return VDKREG;  /* regular variable */
+}
+
+
+static void checktoclose (FuncState *fs, int level) {
+  if (level != -1) {  /* is there a to-be-closed variable? */
+    marktobeclosed(fs);
+    luaK_codeABC(fs, OP_TBC, reglevel(fs, level), 0, 0);
+  }
+}
+
+
+static void localstat (LexState *ls) {
+  /* stat -> LOCAL NAME ATTRIB { ',' NAME ATTRIB } ['=' explist] */
+  FuncState *fs = ls->fs;
+  int toclose = -1;  /* index of to-be-closed variable (if any) */
+  Vardesc *var;  /* last variable */
+  int vidx, kind;  /* index and kind of last variable */
+  int nvars = 0;
+  int nexps;
+  expdesc e;
+  do {
+    vidx = new_localvar(ls, str_checkname(ls));
+    kind = getlocalattribute(ls);
+    getlocalvardesc(fs, vidx)->vd.kind = kind;
+    if (kind == RDKTOCLOSE) {  /* to-be-closed? */
+      if (toclose != -1)  /* one already present? */
+        luaK_semerror(ls, "multiple to-be-closed variables in local list");
+      toclose = fs->nactvar + nvars;
+    }
+    nvars++;
+  } while (testnext(ls, ','));
+  if (testnext(ls, '='))
+    nexps = explist(ls, &e);
+  else {
+    e.k = VVOID;
+    nexps = 0;
+  }
+  var = getlocalvardesc(fs, vidx);  /* get last variable */
+  if (nvars == nexps &&  /* no adjustments? */
+      var->vd.kind == RDKCONST &&  /* last variable is const? */
+      luaK_exp2const(fs, &e, &var->k)) {  /* compile-time constant? */
+    var->vd.kind = RDKCTC;  /* variable is a compile-time constant */
+    adjustlocalvars(ls, nvars - 1);  /* exclude last variable */
+    fs->nactvar++;  /* but count it */
+  }
+  else {
+    adjust_assign(ls, nvars, nexps, &e);
+    adjustlocalvars(ls, nvars);
+  }
+  checktoclose(fs, toclose);
+}
+
+
+static int funcname (LexState *ls, expdesc *v) {
+  /* funcname -> NAME {fieldsel} [':' NAME] */
+  int ismethod = 0;
+  singlevar(ls, v);
+  while (ls->t.token == '.')
+    fieldsel(ls, v);
+  if (ls->t.token == ':') {
+    ismethod = 1;
+    fieldsel(ls, v);
+  }
+  return ismethod;
+}
+
+
+static void funcstat (LexState *ls, int line) {
+  /* funcstat -> FUNCTION funcname body */
+  int ismethod;
+  expdesc v, b;
+  luaX_next(ls);  /* skip FUNCTION */
+  ismethod = funcname(ls, &v);
+  body(ls, &b, ismethod, line);
+  check_readonly(ls, &v);
+  luaK_storevar(ls->fs, &v, &b);
+  luaK_fixline(ls->fs, line);  /* definition "happens" in the first line */
+}
+
+
+static void exprstat (LexState *ls) {
+  /* stat -> func | assignment */
+  FuncState *fs = ls->fs;
+  struct LHS_assign v;
+  suffixedexp(ls, &v.v);
+  if (ls->t.token == '=' || ls->t.token == ',') { /* stat -> assignment ? */
+    v.prev = NULL;
+    restassign(ls, &v, 1);
+  }
+  else {  /* stat -> func */
+    Instruction *inst;
+    check_condition(ls, v.v.k == VCALL, "syntax error");
+    inst = &getinstruction(fs, &v.v);
+    SETARG_C(*inst, 1);  /* call statement uses no results */
+  }
+}
+
+
+static void retstat (LexState *ls) {
+  /* stat -> RETURN [explist] [';'] */
+  FuncState *fs = ls->fs;
+  expdesc e;
+  int nret;  /* number of values being returned */
+  int first = luaY_nvarstack(fs);  /* first slot to be returned */
+  if (block_follow(ls, 1) || ls->t.token == ';')
+    nret = 0;  /* return no values */
+  else {
+    nret = explist(ls, &e);  /* optional return values */
+    if (hasmultret(e.k)) {
+      luaK_setmultret(fs, &e);
+      if (e.k == VCALL && nret == 1 && !fs->bl->insidetbc) {  /* tail call? */
+        SET_OPCODE(getinstruction(fs,&e), OP_TAILCALL);
+        lua_assert(GETARG_A(getinstruction(fs,&e)) == luaY_nvarstack(fs));
+      }
+      nret = LUA_MULTRET;  /* return all values */
+    }
+    else {
+      if (nret == 1)  /* only one single value? */
+        first = luaK_exp2anyreg(fs, &e);  /* can use original slot */
+      else {  /* values must go to the top of the stack */
+        luaK_exp2nextreg(fs, &e);
+        lua_assert(nret == fs->freereg - first);
+      }
+    }
+  }
+  luaK_ret(fs, first, nret);
+  testnext(ls, ';');  /* skip optional semicolon */
+}
+
+
+static void statement (LexState *ls) {
+  int line = ls->linenumber;  /* may be needed for error messages */
+  enterlevel(ls);
+  switch (ls->t.token) {
+    case ';': {  /* stat -> ';' (empty statement) */
+      luaX_next(ls);  /* skip ';' */
+      break;
+    }
+    case TK_IF: {  /* stat -> ifstat */
+      ifstat(ls, line);
+      break;
+    }
+    case TK_WHILE: {  /* stat -> whilestat */
+      whilestat(ls, line);
+      break;
+    }
+    case TK_DO: {  /* stat -> DO block END */
+      luaX_next(ls);  /* skip DO */
+      block(ls);
+      check_match(ls, TK_END, TK_DO, line);
+      break;
+    }
+    case TK_FOR: {  /* stat -> forstat */
+      forstat(ls, line);
+      break;
+    }
+    case TK_REPEAT: {  /* stat -> repeatstat */
+      repeatstat(ls, line);
+      break;
+    }
+    case TK_FUNCTION: {  /* stat -> funcstat */
+      funcstat(ls, line);
+      break;
+    }
+    case TK_LOCAL: {  /* stat -> localstat */
+      luaX_next(ls);  /* skip LOCAL */
+      if (testnext(ls, TK_FUNCTION))  /* local function? */
+        localfunc(ls);
+      else
+        localstat(ls);
+      break;
+    }
+    case TK_DBCOLON: {  /* stat -> label */
+      luaX_next(ls);  /* skip double colon */
+      labelstat(ls, str_checkname(ls), line);
+      break;
+    }
+    case TK_RETURN: {  /* stat -> retstat */
+      luaX_next(ls);  /* skip RETURN */
+      retstat(ls);
+      break;
+    }
+    case TK_BREAK: {  /* stat -> breakstat */
+      breakstat(ls);
+      break;
+    }
+    case TK_GOTO: {  /* stat -> 'goto' NAME */
+      luaX_next(ls);  /* skip 'goto' */
+      gotostat(ls);
+      break;
+    }
+    default: {  /* stat -> func | assignment */
+      exprstat(ls);
+      break;
+    }
+  }
+  lua_assert(ls->fs->f->maxstacksize >= ls->fs->freereg &&
+             ls->fs->freereg >= luaY_nvarstack(ls->fs));
+  ls->fs->freereg = luaY_nvarstack(ls->fs);  /* free registers */
+  leavelevel(ls);
+}
+
+/* }====================================================================== */
+
+
+/*
+** compiles the main function, which is a regular vararg function with an
+** upvalue named LUA_ENV
+*/
+static void mainfunc (LexState *ls, FuncState *fs) {
+  BlockCnt bl;
+  Upvaldesc *env;
+  open_func(ls, fs, &bl);
+  setvararg(fs, 0);  /* main function is always declared vararg */
+  env = allocupvalue(fs);  /* ...set environment upvalue */
+  env->instack = 1;
+  env->idx = 0;
+  env->kind = VDKREG;
+  env->name = ls->envn;
+  luaC_objbarrier(ls->L, fs->f, env->name);
+  luaX_next(ls);  /* read first token */
+  statlist(ls);  /* parse main body */
+  check(ls, TK_EOS);
+  close_func(ls);
+}
+
+
+LClosure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff,
+                       Dyndata *dyd, const char *name, int firstchar) {
+  LexState lexstate;
+  FuncState funcstate;
+  LClosure *cl = luaF_newLclosure(L, 1);  /* create main closure */
+  setclLvalue2s(L, L->top.p, cl);  /* anchor it (to avoid being collected) */
+  luaD_inctop(L);
+  lexstate.h = luaH_new(L);  /* create table for scanner */
+  sethvalue2s(L, L->top.p, lexstate.h);  /* anchor it */
+  luaD_inctop(L);
+  funcstate.f = cl->p = luaF_newproto(L);
+  luaC_objbarrier(L, cl, cl->p);
+  funcstate.f->source = luaS_new(L, name);  /* create and anchor TString */
+  luaC_objbarrier(L, funcstate.f, funcstate.f->source);
+  lexstate.buff = buff;
+  lexstate.dyd = dyd;
+  dyd->actvar.n = dyd->gt.n = dyd->label.n = 0;
+  luaX_setinput(L, &lexstate, z, funcstate.f->source, firstchar);
+  mainfunc(&lexstate, &funcstate);
+  lua_assert(!funcstate.prev && funcstate.nups == 1 && !lexstate.fs);
+  /* all scopes should be correctly finished */
+  lua_assert(dyd->actvar.n == 0 && dyd->gt.n == 0 && dyd->label.n == 0);
+  L->top.p--;  /* remove scanner's table */
+  return cl;  /* closure is on the stack, too */
+}
+
diff --git a/src/libs/3rdparty/lua/src/lparser.h b/src/libs/3rdparty/lua/src/lparser.h
new file mode 100644
index 00000000000..5e4500f181a
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lparser.h
@@ -0,0 +1,171 @@
+/*
+** $Id: lparser.h $
+** Lua Parser
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lparser_h
+#define lparser_h
+
+#include "llimits.h"
+#include "lobject.h"
+#include "lzio.h"
+
+
+/*
+** Expression and variable descriptor.
+** Code generation for variables and expressions can be delayed to allow
+** optimizations; An 'expdesc' structure describes a potentially-delayed
+** variable/expression. It has a description of its "main" value plus a
+** list of conditional jumps that can also produce its value (generated
+** by short-circuit operators 'and'/'or').
+*/
+
+/* kinds of variables/expressions */
+typedef enum {
+  VVOID,  /* when 'expdesc' describes the last expression of a list,
+             this kind means an empty list (so, no expression) */
+  VNIL,  /* constant nil */
+  VTRUE,  /* constant true */
+  VFALSE,  /* constant false */
+  VK,  /* constant in 'k'; info = index of constant in 'k' */
+  VKFLT,  /* floating constant; nval = numerical float value */
+  VKINT,  /* integer constant; ival = numerical integer value */
+  VKSTR,  /* string constant; strval = TString address;
+             (string is fixed by the lexer) */
+  VNONRELOC,  /* expression has its value in a fixed register;
+                 info = result register */
+  VLOCAL,  /* local variable; var.ridx = register index;
+              var.vidx = relative index in 'actvar.arr'  */
+  VUPVAL,  /* upvalue variable; info = index of upvalue in 'upvalues' */
+  VCONST,  /* compile-time <const> variable;
+              info = absolute index in 'actvar.arr'  */
+  VINDEXED,  /* indexed variable;
+                ind.t = table register;
+                ind.idx = key's R index */
+  VINDEXUP,  /* indexed upvalue;
+                ind.t = table upvalue;
+                ind.idx = key's K index */
+  VINDEXI, /* indexed variable with constant integer;
+                ind.t = table register;
+                ind.idx = key's value */
+  VINDEXSTR, /* indexed variable with literal string;
+                ind.t = table register;
+                ind.idx = key's K index */
+  VJMP,  /* expression is a test/comparison;
+            info = pc of corresponding jump instruction */
+  VRELOC,  /* expression can put result in any register;
+              info = instruction pc */
+  VCALL,  /* expression is a function call; info = instruction pc */
+  VVARARG  /* vararg expression; info = instruction pc */
+} expkind;
+
+
+#define vkisvar(k)	(VLOCAL <= (k) && (k) <= VINDEXSTR)
+#define vkisindexed(k)	(VINDEXED <= (k) && (k) <= VINDEXSTR)
+
+
+typedef struct expdesc {
+  expkind k;
+  union {
+    lua_Integer ival;    /* for VKINT */
+    lua_Number nval;  /* for VKFLT */
+    TString *strval;  /* for VKSTR */
+    int info;  /* for generic use */
+    struct {  /* for indexed variables */
+      short idx;  /* index (R or "long" K) */
+      lu_byte t;  /* table (register or upvalue) */
+    } ind;
+    struct {  /* for local variables */
+      lu_byte ridx;  /* register holding the variable */
+      unsigned short vidx;  /* compiler index (in 'actvar.arr')  */
+    } var;
+  } u;
+  int t;  /* patch list of 'exit when true' */
+  int f;  /* patch list of 'exit when false' */
+} expdesc;
+
+
+/* kinds of variables */
+#define VDKREG		0   /* regular */
+#define RDKCONST	1   /* constant */
+#define RDKTOCLOSE	2   /* to-be-closed */
+#define RDKCTC		3   /* compile-time constant */
+
+/* description of an active local variable */
+typedef union Vardesc {
+  struct {
+    TValuefields;  /* constant value (if it is a compile-time constant) */
+    lu_byte kind;
+    lu_byte ridx;  /* register holding the variable */
+    short pidx;  /* index of the variable in the Proto's 'locvars' array */
+    TString *name;  /* variable name */
+  } vd;
+  TValue k;  /* constant value (if any) */
+} Vardesc;
+
+
+
+/* description of pending goto statements and label statements */
+typedef struct Labeldesc {
+  TString *name;  /* label identifier */
+  int pc;  /* position in code */
+  int line;  /* line where it appeared */
+  lu_byte nactvar;  /* number of active variables in that position */
+  lu_byte close;  /* goto that escapes upvalues */
+} Labeldesc;
+
+
+/* list of labels or gotos */
+typedef struct Labellist {
+  Labeldesc *arr;  /* array */
+  int n;  /* number of entries in use */
+  int size;  /* array size */
+} Labellist;
+
+
+/* dynamic structures used by the parser */
+typedef struct Dyndata {
+  struct {  /* list of all active local variables */
+    Vardesc *arr;
+    int n;
+    int size;
+  } actvar;
+  Labellist gt;  /* list of pending gotos */
+  Labellist label;   /* list of active labels */
+} Dyndata;
+
+
+/* control of blocks */
+struct BlockCnt;  /* defined in lparser.c */
+
+
+/* state needed to generate code for a given function */
+typedef struct FuncState {
+  Proto *f;  /* current function header */
+  struct FuncState *prev;  /* enclosing function */
+  struct LexState *ls;  /* lexical state */
+  struct BlockCnt *bl;  /* chain of current blocks */
+  int pc;  /* next position to code (equivalent to 'ncode') */
+  int lasttarget;   /* 'label' of last 'jump label' */
+  int previousline;  /* last line that was saved in 'lineinfo' */
+  int nk;  /* number of elements in 'k' */
+  int np;  /* number of elements in 'p' */
+  int nabslineinfo;  /* number of elements in 'abslineinfo' */
+  int firstlocal;  /* index of first local var (in Dyndata array) */
+  int firstlabel;  /* index of first label (in 'dyd->label->arr') */
+  short ndebugvars;  /* number of elements in 'f->locvars' */
+  lu_byte nactvar;  /* number of active local variables */
+  lu_byte nups;  /* number of upvalues */
+  lu_byte freereg;  /* first free register */
+  lu_byte iwthabs;  /* instructions issued since last absolute line info */
+  lu_byte needclose;  /* function needs to close upvalues when returning */
+} FuncState;
+
+
+LUAI_FUNC int luaY_nvarstack (FuncState *fs);
+LUAI_FUNC LClosure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff,
+                                 Dyndata *dyd, const char *name, int firstchar);
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lprefix.h b/src/libs/3rdparty/lua/src/lprefix.h
new file mode 100644
index 00000000000..484f2ad6fbf
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lprefix.h
@@ -0,0 +1,45 @@
+/*
+** $Id: lprefix.h $
+** Definitions for Lua code that must come before any other header file
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lprefix_h
+#define lprefix_h
+
+
+/*
+** Allows POSIX/XSI stuff
+*/
+#if !defined(LUA_USE_C89)	/* { */
+
+#if !defined(_XOPEN_SOURCE)
+#define _XOPEN_SOURCE           600
+#elif _XOPEN_SOURCE == 0
+#undef _XOPEN_SOURCE  /* use -D_XOPEN_SOURCE=0 to undefine it */
+#endif
+
+/*
+** Allows manipulation of large files in gcc and some other compilers
+*/
+#if !defined(LUA_32BITS) && !defined(_FILE_OFFSET_BITS)
+#define _LARGEFILE_SOURCE       1
+#define _FILE_OFFSET_BITS       64
+#endif
+
+#endif				/* } */
+
+
+/*
+** Windows stuff
+*/
+#if defined(_WIN32)	/* { */
+
+#if !defined(_CRT_SECURE_NO_WARNINGS)
+#define _CRT_SECURE_NO_WARNINGS  /* avoid warnings about ISO C functions */
+#endif
+
+#endif			/* } */
+
+#endif
+
diff --git a/src/libs/3rdparty/lua/src/lstate.c b/src/libs/3rdparty/lua/src/lstate.c
new file mode 100644
index 00000000000..1e925e5ad4c
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lstate.c
@@ -0,0 +1,445 @@
+/*
+** $Id: lstate.c $
+** Global State
+** See Copyright Notice in lua.h
+*/
+
+#define lstate_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <stddef.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lapi.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "llex.h"
+#include "lmem.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+
+
+
+/*
+** thread state + extra space
+*/
+typedef struct LX {
+  lu_byte extra_[LUA_EXTRASPACE];
+  lua_State l;
+} LX;
+
+
+/*
+** Main thread combines a thread state and the global state
+*/
+typedef struct LG {
+  LX l;
+  global_State g;
+} LG;
+
+
+
+#define fromstate(L)	(cast(LX *, cast(lu_byte *, (L)) - offsetof(LX, l)))
+
+
+/*
+** A macro to create a "random" seed when a state is created;
+** the seed is used to randomize string hashes.
+*/
+#if !defined(luai_makeseed)
+
+#include <time.h>
+
+/*
+** Compute an initial seed with some level of randomness.
+** Rely on Address Space Layout Randomization (if present) and
+** current time.
+*/
+#define addbuff(b,p,e) \
+  { size_t t = cast_sizet(e); \
+    memcpy(b + p, &t, sizeof(t)); p += sizeof(t); }
+
+static unsigned int luai_makeseed (lua_State *L) {
+  char buff[3 * sizeof(size_t)];
+  unsigned int h = cast_uint(time(NULL));
+  int p = 0;
+  addbuff(buff, p, L);  /* heap variable */
+  addbuff(buff, p, &h);  /* local variable */
+  addbuff(buff, p, &lua_newstate);  /* public function */
+  lua_assert(p == sizeof(buff));
+  return luaS_hash(buff, p, h);
+}
+
+#endif
+
+
+/*
+** set GCdebt to a new value keeping the value (totalbytes + GCdebt)
+** invariant (and avoiding underflows in 'totalbytes')
+*/
+void luaE_setdebt (global_State *g, l_mem debt) {
+  l_mem tb = gettotalbytes(g);
+  lua_assert(tb > 0);
+  if (debt < tb - MAX_LMEM)
+    debt = tb - MAX_LMEM;  /* will make 'totalbytes == MAX_LMEM' */
+  g->totalbytes = tb - debt;
+  g->GCdebt = debt;
+}
+
+
+LUA_API int lua_setcstacklimit (lua_State *L, unsigned int limit) {
+  UNUSED(L); UNUSED(limit);
+  return LUAI_MAXCCALLS;  /* warning?? */
+}
+
+
+CallInfo *luaE_extendCI (lua_State *L) {
+  CallInfo *ci;
+  lua_assert(L->ci->next == NULL);
+  ci = luaM_new(L, CallInfo);
+  lua_assert(L->ci->next == NULL);
+  L->ci->next = ci;
+  ci->previous = L->ci;
+  ci->next = NULL;
+  ci->u.l.trap = 0;
+  L->nci++;
+  return ci;
+}
+
+
+/*
+** free all CallInfo structures not in use by a thread
+*/
+void luaE_freeCI (lua_State *L) {
+  CallInfo *ci = L->ci;
+  CallInfo *next = ci->next;
+  ci->next = NULL;
+  while ((ci = next) != NULL) {
+    next = ci->next;
+    luaM_free(L, ci);
+    L->nci--;
+  }
+}
+
+
+/*
+** free half of the CallInfo structures not in use by a thread,
+** keeping the first one.
+*/
+void luaE_shrinkCI (lua_State *L) {
+  CallInfo *ci = L->ci->next;  /* first free CallInfo */
+  CallInfo *next;
+  if (ci == NULL)
+    return;  /* no extra elements */
+  while ((next = ci->next) != NULL) {  /* two extra elements? */
+    CallInfo *next2 = next->next;  /* next's next */
+    ci->next = next2;  /* remove next from the list */
+    L->nci--;
+    luaM_free(L, next);  /* free next */
+    if (next2 == NULL)
+      break;  /* no more elements */
+    else {
+      next2->previous = ci;
+      ci = next2;  /* continue */
+    }
+  }
+}
+
+
+/*
+** Called when 'getCcalls(L)' larger or equal to LUAI_MAXCCALLS.
+** If equal, raises an overflow error. If value is larger than
+** LUAI_MAXCCALLS (which means it is handling an overflow) but
+** not much larger, does not report an error (to allow overflow
+** handling to work).
+*/
+void luaE_checkcstack (lua_State *L) {
+  if (getCcalls(L) == LUAI_MAXCCALLS)
+    luaG_runerror(L, "C stack overflow");
+  else if (getCcalls(L) >= (LUAI_MAXCCALLS / 10 * 11))
+    luaD_throw(L, LUA_ERRERR);  /* error while handling stack error */
+}
+
+
+LUAI_FUNC void luaE_incCstack (lua_State *L) {
+  L->nCcalls++;
+  if (l_unlikely(getCcalls(L) >= LUAI_MAXCCALLS))
+    luaE_checkcstack(L);
+}
+
+
+static void stack_init (lua_State *L1, lua_State *L) {
+  int i; CallInfo *ci;
+  /* initialize stack array */
+  L1->stack.p = luaM_newvector(L, BASIC_STACK_SIZE + EXTRA_STACK, StackValue);
+  L1->tbclist.p = L1->stack.p;
+  for (i = 0; i < BASIC_STACK_SIZE + EXTRA_STACK; i++)
+    setnilvalue(s2v(L1->stack.p + i));  /* erase new stack */
+  L1->top.p = L1->stack.p;
+  L1->stack_last.p = L1->stack.p + BASIC_STACK_SIZE;
+  /* initialize first ci */
+  ci = &L1->base_ci;
+  ci->next = ci->previous = NULL;
+  ci->callstatus = CIST_C;
+  ci->func.p = L1->top.p;
+  ci->u.c.k = NULL;
+  ci->nresults = 0;
+  setnilvalue(s2v(L1->top.p));  /* 'function' entry for this 'ci' */
+  L1->top.p++;
+  ci->top.p = L1->top.p + LUA_MINSTACK;
+  L1->ci = ci;
+}
+
+
+static void freestack (lua_State *L) {
+  if (L->stack.p == NULL)
+    return;  /* stack not completely built yet */
+  L->ci = &L->base_ci;  /* free the entire 'ci' list */
+  luaE_freeCI(L);
+  lua_assert(L->nci == 0);
+  luaM_freearray(L, L->stack.p, stacksize(L) + EXTRA_STACK);  /* free stack */
+}
+
+
+/*
+** Create registry table and its predefined values
+*/
+static void init_registry (lua_State *L, global_State *g) {
+  /* create registry */
+  Table *registry = luaH_new(L);
+  sethvalue(L, &g->l_registry, registry);
+  luaH_resize(L, registry, LUA_RIDX_LAST, 0);
+  /* registry[LUA_RIDX_MAINTHREAD] = L */
+  setthvalue(L, &registry->array[LUA_RIDX_MAINTHREAD - 1], L);
+  /* registry[LUA_RIDX_GLOBALS] = new table (table of globals) */
+  sethvalue(L, &registry->array[LUA_RIDX_GLOBALS - 1], luaH_new(L));
+}
+
+
+/*
+** open parts of the state that may cause memory-allocation errors.
+*/
+static void f_luaopen (lua_State *L, void *ud) {
+  global_State *g = G(L);
+  UNUSED(ud);
+  stack_init(L, L);  /* init stack */
+  init_registry(L, g);
+  luaS_init(L);
+  luaT_init(L);
+  luaX_init(L);
+  g->gcstp = 0;  /* allow gc */
+  setnilvalue(&g->nilvalue);  /* now state is complete */
+  luai_userstateopen(L);
+}
+
+
+/*
+** preinitialize a thread with consistent values without allocating
+** any memory (to avoid errors)
+*/
+static void preinit_thread (lua_State *L, global_State *g) {
+  G(L) = g;
+  L->stack.p = NULL;
+  L->ci = NULL;
+  L->nci = 0;
+  L->twups = L;  /* thread has no upvalues */
+  L->nCcalls = 0;
+  L->errorJmp = NULL;
+  L->hook = NULL;
+  L->hookmask = 0;
+  L->basehookcount = 0;
+  L->allowhook = 1;
+  resethookcount(L);
+  L->openupval = NULL;
+  L->status = LUA_OK;
+  L->errfunc = 0;
+  L->oldpc = 0;
+}
+
+
+static void close_state (lua_State *L) {
+  global_State *g = G(L);
+  if (!completestate(g))  /* closing a partially built state? */
+    luaC_freeallobjects(L);  /* just collect its objects */
+  else {  /* closing a fully built state */
+    L->ci = &L->base_ci;  /* unwind CallInfo list */
+    luaD_closeprotected(L, 1, LUA_OK);  /* close all upvalues */
+    luaC_freeallobjects(L);  /* collect all objects */
+    luai_userstateclose(L);
+  }
+  luaM_freearray(L, G(L)->strt.hash, G(L)->strt.size);
+  freestack(L);
+  lua_assert(gettotalbytes(g) == sizeof(LG));
+  (*g->frealloc)(g->ud, fromstate(L), sizeof(LG), 0);  /* free main block */
+}
+
+
+LUA_API lua_State *lua_newthread (lua_State *L) {
+  global_State *g = G(L);
+  GCObject *o;
+  lua_State *L1;
+  lua_lock(L);
+  luaC_checkGC(L);
+  /* create new thread */
+  o = luaC_newobjdt(L, LUA_TTHREAD, sizeof(LX), offsetof(LX, l));
+  L1 = gco2th(o);
+  /* anchor it on L stack */
+  setthvalue2s(L, L->top.p, L1);
+  api_incr_top(L);
+  preinit_thread(L1, g);
+  L1->hookmask = L->hookmask;
+  L1->basehookcount = L->basehookcount;
+  L1->hook = L->hook;
+  resethookcount(L1);
+  /* initialize L1 extra space */
+  memcpy(lua_getextraspace(L1), lua_getextraspace(g->mainthread),
+         LUA_EXTRASPACE);
+  luai_userstatethread(L, L1);
+  stack_init(L1, L);  /* init stack */
+  lua_unlock(L);
+  return L1;
+}
+
+
+void luaE_freethread (lua_State *L, lua_State *L1) {
+  LX *l = fromstate(L1);
+  luaF_closeupval(L1, L1->stack.p);  /* close all upvalues */
+  lua_assert(L1->openupval == NULL);
+  luai_userstatefree(L, L1);
+  freestack(L1);
+  luaM_free(L, l);
+}
+
+
+int luaE_resetthread (lua_State *L, int status) {
+  CallInfo *ci = L->ci = &L->base_ci;  /* unwind CallInfo list */
+  setnilvalue(s2v(L->stack.p));  /* 'function' entry for basic 'ci' */
+  ci->func.p = L->stack.p;
+  ci->callstatus = CIST_C;
+  if (status == LUA_YIELD)
+    status = LUA_OK;
+  L->status = LUA_OK;  /* so it can run __close metamethods */
+  status = luaD_closeprotected(L, 1, status);
+  if (status != LUA_OK)  /* errors? */
+    luaD_seterrorobj(L, status, L->stack.p + 1);
+  else
+    L->top.p = L->stack.p + 1;
+  ci->top.p = L->top.p + LUA_MINSTACK;
+  luaD_reallocstack(L, cast_int(ci->top.p - L->stack.p), 0);
+  return status;
+}
+
+
+LUA_API int lua_closethread (lua_State *L, lua_State *from) {
+  int status;
+  lua_lock(L);
+  L->nCcalls = (from) ? getCcalls(from) : 0;
+  status = luaE_resetthread(L, L->status);
+  lua_unlock(L);
+  return status;
+}
+
+
+/*
+** Deprecated! Use 'lua_closethread' instead.
+*/
+LUA_API int lua_resetthread (lua_State *L) {
+  return lua_closethread(L, NULL);
+}
+
+
+LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) {
+  int i;
+  lua_State *L;
+  global_State *g;
+  LG *l = cast(LG *, (*f)(ud, NULL, LUA_TTHREAD, sizeof(LG)));
+  if (l == NULL) return NULL;
+  L = &l->l.l;
+  g = &l->g;
+  L->tt = LUA_VTHREAD;
+  g->currentwhite = bitmask(WHITE0BIT);
+  L->marked = luaC_white(g);
+  preinit_thread(L, g);
+  g->allgc = obj2gco(L);  /* by now, only object is the main thread */
+  L->next = NULL;
+  incnny(L);  /* main thread is always non yieldable */
+  g->frealloc = f;
+  g->ud = ud;
+  g->warnf = NULL;
+  g->ud_warn = NULL;
+  g->mainthread = L;
+  g->seed = luai_makeseed(L);
+  g->gcstp = GCSTPGC;  /* no GC while building state */
+  g->strt.size = g->strt.nuse = 0;
+  g->strt.hash = NULL;
+  setnilvalue(&g->l_registry);
+  g->panic = NULL;
+  g->gcstate = GCSpause;
+  g->gckind = KGC_INC;
+  g->gcstopem = 0;
+  g->gcemergency = 0;
+  g->finobj = g->tobefnz = g->fixedgc = NULL;
+  g->firstold1 = g->survival = g->old1 = g->reallyold = NULL;
+  g->finobjsur = g->finobjold1 = g->finobjrold = NULL;
+  g->sweepgc = NULL;
+  g->gray = g->grayagain = NULL;
+  g->weak = g->ephemeron = g->allweak = NULL;
+  g->twups = NULL;
+  g->totalbytes = sizeof(LG);
+  g->GCdebt = 0;
+  g->lastatomic = 0;
+  setivalue(&g->nilvalue, 0);  /* to signal that state is not yet built */
+  setgcparam(g->gcpause, LUAI_GCPAUSE);
+  setgcparam(g->gcstepmul, LUAI_GCMUL);
+  g->gcstepsize = LUAI_GCSTEPSIZE;
+  setgcparam(g->genmajormul, LUAI_GENMAJORMUL);
+  g->genminormul = LUAI_GENMINORMUL;
+  for (i=0; i < LUA_NUMTAGS; i++) g->mt[i] = NULL;
+  if (luaD_rawrunprotected(L, f_luaopen, NULL) != LUA_OK) {
+    /* memory allocation error: free partial state */
+    close_state(L);
+    L = NULL;
+  }
+  return L;
+}
+
+
+LUA_API void lua_close (lua_State *L) {
+  lua_lock(L);
+  L = G(L)->mainthread;  /* only the main thread can be closed */
+  close_state(L);
+}
+
+
+void luaE_warning (lua_State *L, const char *msg, int tocont) {
+  lua_WarnFunction wf = G(L)->warnf;
+  if (wf != NULL)
+    wf(G(L)->ud_warn, msg, tocont);
+}
+
+
+/*
+** Generate a warning from an error message
+*/
+void luaE_warnerror (lua_State *L, const char *where) {
+  TValue *errobj = s2v(L->top.p - 1);  /* error object */
+  const char *msg = (ttisstring(errobj))
+                  ? svalue(errobj)
+                  : "error object is not a string";
+  /* produce warning "error in %s (%s)" (where, msg) */
+  luaE_warning(L, "error in ", 1);
+  luaE_warning(L, where, 1);
+  luaE_warning(L, " (", 1);
+  luaE_warning(L, msg, 1);
+  luaE_warning(L, ")", 0);
+}
+
diff --git a/src/libs/3rdparty/lua/src/lstate.h b/src/libs/3rdparty/lua/src/lstate.h
new file mode 100644
index 00000000000..8bf6600e344
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lstate.h
@@ -0,0 +1,409 @@
+/*
+** $Id: lstate.h $
+** Global State
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lstate_h
+#define lstate_h
+
+#include "lua.h"
+
+
+/* Some header files included here need this definition */
+typedef struct CallInfo CallInfo;
+
+
+#include "lobject.h"
+#include "ltm.h"
+#include "lzio.h"
+
+
+/*
+** Some notes about garbage-collected objects: All objects in Lua must
+** be kept somehow accessible until being freed, so all objects always
+** belong to one (and only one) of these lists, using field 'next' of
+** the 'CommonHeader' for the link:
+**
+** 'allgc': all objects not marked for finalization;
+** 'finobj': all objects marked for finalization;
+** 'tobefnz': all objects ready to be finalized;
+** 'fixedgc': all objects that are not to be collected (currently
+** only small strings, such as reserved words).
+**
+** For the generational collector, some of these lists have marks for
+** generations. Each mark points to the first element in the list for
+** that particular generation; that generation goes until the next mark.
+**
+** 'allgc' -> 'survival': new objects;
+** 'survival' -> 'old': objects that survived one collection;
+** 'old1' -> 'reallyold': objects that became old in last collection;
+** 'reallyold' -> NULL: objects old for more than one cycle.
+**
+** 'finobj' -> 'finobjsur': new objects marked for finalization;
+** 'finobjsur' -> 'finobjold1': survived   """";
+** 'finobjold1' -> 'finobjrold': just old  """";
+** 'finobjrold' -> NULL: really old       """".
+**
+** All lists can contain elements older than their main ages, due
+** to 'luaC_checkfinalizer' and 'udata2finalize', which move
+** objects between the normal lists and the "marked for finalization"
+** lists. Moreover, barriers can age young objects in young lists as
+** OLD0, which then become OLD1. However, a list never contains
+** elements younger than their main ages.
+**
+** The generational collector also uses a pointer 'firstold1', which
+** points to the first OLD1 object in the list. It is used to optimize
+** 'markold'. (Potentially OLD1 objects can be anywhere between 'allgc'
+** and 'reallyold', but often the list has no OLD1 objects or they are
+** after 'old1'.) Note the difference between it and 'old1':
+** 'firstold1': no OLD1 objects before this point; there can be all
+**   ages after it.
+** 'old1': no objects younger than OLD1 after this point.
+*/
+
+/*
+** Moreover, there is another set of lists that control gray objects.
+** These lists are linked by fields 'gclist'. (All objects that
+** can become gray have such a field. The field is not the same
+** in all objects, but it always has this name.)  Any gray object
+** must belong to one of these lists, and all objects in these lists
+** must be gray (with two exceptions explained below):
+**
+** 'gray': regular gray objects, still waiting to be visited.
+** 'grayagain': objects that must be revisited at the atomic phase.
+**   That includes
+**   - black objects got in a write barrier;
+**   - all kinds of weak tables during propagation phase;
+**   - all threads.
+** 'weak': tables with weak values to be cleared;
+** 'ephemeron': ephemeron tables with white->white entries;
+** 'allweak': tables with weak keys and/or weak values to be cleared.
+**
+** The exceptions to that "gray rule" are:
+** - TOUCHED2 objects in generational mode stay in a gray list (because
+** they must be visited again at the end of the cycle), but they are
+** marked black because assignments to them must activate barriers (to
+** move them back to TOUCHED1).
+** - Open upvales are kept gray to avoid barriers, but they stay out
+** of gray lists. (They don't even have a 'gclist' field.)
+*/
+
+
+
+/*
+** About 'nCcalls':  This count has two parts: the lower 16 bits counts
+** the number of recursive invocations in the C stack; the higher
+** 16 bits counts the number of non-yieldable calls in the stack.
+** (They are together so that we can change and save both with one
+** instruction.)
+*/
+
+
+/* true if this thread does not have non-yieldable calls in the stack */
+#define yieldable(L)		(((L)->nCcalls & 0xffff0000) == 0)
+
+/* real number of C calls */
+#define getCcalls(L)	((L)->nCcalls & 0xffff)
+
+
+/* Increment the number of non-yieldable calls */
+#define incnny(L)	((L)->nCcalls += 0x10000)
+
+/* Decrement the number of non-yieldable calls */
+#define decnny(L)	((L)->nCcalls -= 0x10000)
+
+/* Non-yieldable call increment */
+#define nyci	(0x10000 | 1)
+
+
+
+
+struct lua_longjmp;  /* defined in ldo.c */
+
+
+/*
+** Atomic type (relative to signals) to better ensure that 'lua_sethook'
+** is thread safe
+*/
+#if !defined(l_signalT)
+#include <signal.h>
+#define l_signalT	sig_atomic_t
+#endif
+
+
+/*
+** Extra stack space to handle TM calls and some other extras. This
+** space is not included in 'stack_last'. It is used only to avoid stack
+** checks, either because the element will be promptly popped or because
+** there will be a stack check soon after the push. Function frames
+** never use this extra space, so it does not need to be kept clean.
+*/
+#define EXTRA_STACK   5
+
+
+#define BASIC_STACK_SIZE        (2*LUA_MINSTACK)
+
+#define stacksize(th)	cast_int((th)->stack_last.p - (th)->stack.p)
+
+
+/* kinds of Garbage Collection */
+#define KGC_INC		0	/* incremental gc */
+#define KGC_GEN		1	/* generational gc */
+
+
+typedef struct stringtable {
+  TString **hash;
+  int nuse;  /* number of elements */
+  int size;
+} stringtable;
+
+
+/*
+** Information about a call.
+** About union 'u':
+** - field 'l' is used only for Lua functions;
+** - field 'c' is used only for C functions.
+** About union 'u2':
+** - field 'funcidx' is used only by C functions while doing a
+** protected call;
+** - field 'nyield' is used only while a function is "doing" an
+** yield (from the yield until the next resume);
+** - field 'nres' is used only while closing tbc variables when
+** returning from a function;
+** - field 'transferinfo' is used only during call/returnhooks,
+** before the function starts or after it ends.
+*/
+struct CallInfo {
+  StkIdRel func;  /* function index in the stack */
+  StkIdRel	top;  /* top for this function */
+  struct CallInfo *previous, *next;  /* dynamic call link */
+  union {
+    struct {  /* only for Lua functions */
+      const Instruction *savedpc;
+      volatile l_signalT trap;
+      int nextraargs;  /* # of extra arguments in vararg functions */
+    } l;
+    struct {  /* only for C functions */
+      lua_KFunction k;  /* continuation in case of yields */
+      ptrdiff_t old_errfunc;
+      lua_KContext ctx;  /* context info. in case of yields */
+    } c;
+  } u;
+  union {
+    int funcidx;  /* called-function index */
+    int nyield;  /* number of values yielded */
+    int nres;  /* number of values returned */
+    struct {  /* info about transferred values (for call/return hooks) */
+      unsigned short ftransfer;  /* offset of first value transferred */
+      unsigned short ntransfer;  /* number of values transferred */
+    } transferinfo;
+  } u2;
+  short nresults;  /* expected number of results from this function */
+  unsigned short callstatus;
+};
+
+
+/*
+** Bits in CallInfo status
+*/
+#define CIST_OAH	(1<<0)	/* original value of 'allowhook' */
+#define CIST_C		(1<<1)	/* call is running a C function */
+#define CIST_FRESH	(1<<2)	/* call is on a fresh "luaV_execute" frame */
+#define CIST_HOOKED	(1<<3)	/* call is running a debug hook */
+#define CIST_YPCALL	(1<<4)	/* doing a yieldable protected call */
+#define CIST_TAIL	(1<<5)	/* call was tail called */
+#define CIST_HOOKYIELD	(1<<6)	/* last hook called yielded */
+#define CIST_FIN	(1<<7)	/* function "called" a finalizer */
+#define CIST_TRAN	(1<<8)	/* 'ci' has transfer information */
+#define CIST_CLSRET	(1<<9)  /* function is closing tbc variables */
+/* Bits 10-12 are used for CIST_RECST (see below) */
+#define CIST_RECST	10
+#if defined(LUA_COMPAT_LT_LE)
+#define CIST_LEQ	(1<<13)  /* using __lt for __le */
+#endif
+
+
+/*
+** Field CIST_RECST stores the "recover status", used to keep the error
+** status while closing to-be-closed variables in coroutines, so that
+** Lua can correctly resume after an yield from a __close method called
+** because of an error.  (Three bits are enough for error status.)
+*/
+#define getcistrecst(ci)     (((ci)->callstatus >> CIST_RECST) & 7)
+#define setcistrecst(ci,st)  \
+  check_exp(((st) & 7) == (st),   /* status must fit in three bits */  \
+            ((ci)->callstatus = ((ci)->callstatus & ~(7 << CIST_RECST))  \
+                                                  | ((st) << CIST_RECST)))
+
+
+/* active function is a Lua function */
+#define isLua(ci)	(!((ci)->callstatus & CIST_C))
+
+/* call is running Lua code (not a hook) */
+#define isLuacode(ci)	(!((ci)->callstatus & (CIST_C | CIST_HOOKED)))
+
+/* assume that CIST_OAH has offset 0 and that 'v' is strictly 0/1 */
+#define setoah(st,v)	((st) = ((st) & ~CIST_OAH) | (v))
+#define getoah(st)	((st) & CIST_OAH)
+
+
+/*
+** 'global state', shared by all threads of this state
+*/
+typedef struct global_State {
+  lua_Alloc frealloc;  /* function to reallocate memory */
+  void *ud;         /* auxiliary data to 'frealloc' */
+  l_mem totalbytes;  /* number of bytes currently allocated - GCdebt */
+  l_mem GCdebt;  /* bytes allocated not yet compensated by the collector */
+  lu_mem GCestimate;  /* an estimate of the non-garbage memory in use */
+  lu_mem lastatomic;  /* see function 'genstep' in file 'lgc.c' */
+  stringtable strt;  /* hash table for strings */
+  TValue l_registry;
+  TValue nilvalue;  /* a nil value */
+  unsigned int seed;  /* randomized seed for hashes */
+  lu_byte currentwhite;
+  lu_byte gcstate;  /* state of garbage collector */
+  lu_byte gckind;  /* kind of GC running */
+  lu_byte gcstopem;  /* stops emergency collections */
+  lu_byte genminormul;  /* control for minor generational collections */
+  lu_byte genmajormul;  /* control for major generational collections */
+  lu_byte gcstp;  /* control whether GC is running */
+  lu_byte gcemergency;  /* true if this is an emergency collection */
+  lu_byte gcpause;  /* size of pause between successive GCs */
+  lu_byte gcstepmul;  /* GC "speed" */
+  lu_byte gcstepsize;  /* (log2 of) GC granularity */
+  GCObject *allgc;  /* list of all collectable objects */
+  GCObject **sweepgc;  /* current position of sweep in list */
+  GCObject *finobj;  /* list of collectable objects with finalizers */
+  GCObject *gray;  /* list of gray objects */
+  GCObject *grayagain;  /* list of objects to be traversed atomically */
+  GCObject *weak;  /* list of tables with weak values */
+  GCObject *ephemeron;  /* list of ephemeron tables (weak keys) */
+  GCObject *allweak;  /* list of all-weak tables */
+  GCObject *tobefnz;  /* list of userdata to be GC */
+  GCObject *fixedgc;  /* list of objects not to be collected */
+  /* fields for generational collector */
+  GCObject *survival;  /* start of objects that survived one GC cycle */
+  GCObject *old1;  /* start of old1 objects */
+  GCObject *reallyold;  /* objects more than one cycle old ("really old") */
+  GCObject *firstold1;  /* first OLD1 object in the list (if any) */
+  GCObject *finobjsur;  /* list of survival objects with finalizers */
+  GCObject *finobjold1;  /* list of old1 objects with finalizers */
+  GCObject *finobjrold;  /* list of really old objects with finalizers */
+  struct lua_State *twups;  /* list of threads with open upvalues */
+  lua_CFunction panic;  /* to be called in unprotected errors */
+  struct lua_State *mainthread;
+  TString *memerrmsg;  /* message for memory-allocation errors */
+  TString *tmname[TM_N];  /* array with tag-method names */
+  struct Table *mt[LUA_NUMTYPES];  /* metatables for basic types */
+  TString *strcache[STRCACHE_N][STRCACHE_M];  /* cache for strings in API */
+  lua_WarnFunction warnf;  /* warning function */
+  void *ud_warn;         /* auxiliary data to 'warnf' */
+} global_State;
+
+
+/*
+** 'per thread' state
+*/
+struct lua_State {
+  CommonHeader;
+  lu_byte status;
+  lu_byte allowhook;
+  unsigned short nci;  /* number of items in 'ci' list */
+  StkIdRel top;  /* first free slot in the stack */
+  global_State *l_G;
+  CallInfo *ci;  /* call info for current function */
+  StkIdRel stack_last;  /* end of stack (last element + 1) */
+  StkIdRel stack;  /* stack base */
+  UpVal *openupval;  /* list of open upvalues in this stack */
+  StkIdRel tbclist;  /* list of to-be-closed variables */
+  GCObject *gclist;
+  struct lua_State *twups;  /* list of threads with open upvalues */
+  struct lua_longjmp *errorJmp;  /* current error recover point */
+  CallInfo base_ci;  /* CallInfo for first level (C calling Lua) */
+  volatile lua_Hook hook;
+  ptrdiff_t errfunc;  /* current error handling function (stack index) */
+  l_uint32 nCcalls;  /* number of nested (non-yieldable | C)  calls */
+  int oldpc;  /* last pc traced */
+  int basehookcount;
+  int hookcount;
+  volatile l_signalT hookmask;
+};
+
+
+#define G(L)	(L->l_G)
+
+/*
+** 'g->nilvalue' being a nil value flags that the state was completely
+** build.
+*/
+#define completestate(g)	ttisnil(&g->nilvalue)
+
+
+/*
+** Union of all collectable objects (only for conversions)
+** ISO C99, 6.5.2.3 p.5:
+** "if a union contains several structures that share a common initial
+** sequence [...], and if the union object currently contains one
+** of these structures, it is permitted to inspect the common initial
+** part of any of them anywhere that a declaration of the complete type
+** of the union is visible."
+*/
+union GCUnion {
+  GCObject gc;  /* common header */
+  struct TString ts;
+  struct Udata u;
+  union Closure cl;
+  struct Table h;
+  struct Proto p;
+  struct lua_State th;  /* thread */
+  struct UpVal upv;
+};
+
+
+/*
+** ISO C99, 6.7.2.1 p.14:
+** "A pointer to a union object, suitably converted, points to each of
+** its members [...], and vice versa."
+*/
+#define cast_u(o)	cast(union GCUnion *, (o))
+
+/* macros to convert a GCObject into a specific value */
+#define gco2ts(o)  \
+	check_exp(novariant((o)->tt) == LUA_TSTRING, &((cast_u(o))->ts))
+#define gco2u(o)  check_exp((o)->tt == LUA_VUSERDATA, &((cast_u(o))->u))
+#define gco2lcl(o)  check_exp((o)->tt == LUA_VLCL, &((cast_u(o))->cl.l))
+#define gco2ccl(o)  check_exp((o)->tt == LUA_VCCL, &((cast_u(o))->cl.c))
+#define gco2cl(o)  \
+	check_exp(novariant((o)->tt) == LUA_TFUNCTION, &((cast_u(o))->cl))
+#define gco2t(o)  check_exp((o)->tt == LUA_VTABLE, &((cast_u(o))->h))
+#define gco2p(o)  check_exp((o)->tt == LUA_VPROTO, &((cast_u(o))->p))
+#define gco2th(o)  check_exp((o)->tt == LUA_VTHREAD, &((cast_u(o))->th))
+#define gco2upv(o)	check_exp((o)->tt == LUA_VUPVAL, &((cast_u(o))->upv))
+
+
+/*
+** macro to convert a Lua object into a GCObject
+** (The access to 'tt' tries to ensure that 'v' is actually a Lua object.)
+*/
+#define obj2gco(v)	check_exp((v)->tt >= LUA_TSTRING, &(cast_u(v)->gc))
+
+
+/* actual number of total bytes allocated */
+#define gettotalbytes(g)	cast(lu_mem, (g)->totalbytes + (g)->GCdebt)
+
+LUAI_FUNC void luaE_setdebt (global_State *g, l_mem debt);
+LUAI_FUNC void luaE_freethread (lua_State *L, lua_State *L1);
+LUAI_FUNC CallInfo *luaE_extendCI (lua_State *L);
+LUAI_FUNC void luaE_freeCI (lua_State *L);
+LUAI_FUNC void luaE_shrinkCI (lua_State *L);
+LUAI_FUNC void luaE_checkcstack (lua_State *L);
+LUAI_FUNC void luaE_incCstack (lua_State *L);
+LUAI_FUNC void luaE_warning (lua_State *L, const char *msg, int tocont);
+LUAI_FUNC void luaE_warnerror (lua_State *L, const char *where);
+LUAI_FUNC int luaE_resetthread (lua_State *L, int status);
+
+
+#endif
+
diff --git a/src/libs/3rdparty/lua/src/lstring.c b/src/libs/3rdparty/lua/src/lstring.c
new file mode 100644
index 00000000000..13dcaf4259b
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lstring.c
@@ -0,0 +1,273 @@
+/*
+** $Id: lstring.c $
+** String table (keeps all strings handled by Lua)
+** See Copyright Notice in lua.h
+*/
+
+#define lstring_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <string.h>
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+
+
+/*
+** Maximum size for string table.
+*/
+#define MAXSTRTB	cast_int(luaM_limitN(MAX_INT, TString*))
+
+
+/*
+** equality for long strings
+*/
+int luaS_eqlngstr (TString *a, TString *b) {
+  size_t len = a->u.lnglen;
+  lua_assert(a->tt == LUA_VLNGSTR && b->tt == LUA_VLNGSTR);
+  return (a == b) ||  /* same instance or... */
+    ((len == b->u.lnglen) &&  /* equal length and ... */
+     (memcmp(getstr(a), getstr(b), len) == 0));  /* equal contents */
+}
+
+
+unsigned int luaS_hash (const char *str, size_t l, unsigned int seed) {
+  unsigned int h = seed ^ cast_uint(l);
+  for (; l > 0; l--)
+    h ^= ((h<<5) + (h>>2) + cast_byte(str[l - 1]));
+  return h;
+}
+
+
+unsigned int luaS_hashlongstr (TString *ts) {
+  lua_assert(ts->tt == LUA_VLNGSTR);
+  if (ts->extra == 0) {  /* no hash? */
+    size_t len = ts->u.lnglen;
+    ts->hash = luaS_hash(getstr(ts), len, ts->hash);
+    ts->extra = 1;  /* now it has its hash */
+  }
+  return ts->hash;
+}
+
+
+static void tablerehash (TString **vect, int osize, int nsize) {
+  int i;
+  for (i = osize; i < nsize; i++)  /* clear new elements */
+    vect[i] = NULL;
+  for (i = 0; i < osize; i++) {  /* rehash old part of the array */
+    TString *p = vect[i];
+    vect[i] = NULL;
+    while (p) {  /* for each string in the list */
+      TString *hnext = p->u.hnext;  /* save next */
+      unsigned int h = lmod(p->hash, nsize);  /* new position */
+      p->u.hnext = vect[h];  /* chain it into array */
+      vect[h] = p;
+      p = hnext;
+    }
+  }
+}
+
+
+/*
+** Resize the string table. If allocation fails, keep the current size.
+** (This can degrade performance, but any non-zero size should work
+** correctly.)
+*/
+void luaS_resize (lua_State *L, int nsize) {
+  stringtable *tb = &G(L)->strt;
+  int osize = tb->size;
+  TString **newvect;
+  if (nsize < osize)  /* shrinking table? */
+    tablerehash(tb->hash, osize, nsize);  /* depopulate shrinking part */
+  newvect = luaM_reallocvector(L, tb->hash, osize, nsize, TString*);
+  if (l_unlikely(newvect == NULL)) {  /* reallocation failed? */
+    if (nsize < osize)  /* was it shrinking table? */
+      tablerehash(tb->hash, nsize, osize);  /* restore to original size */
+    /* leave table as it was */
+  }
+  else {  /* allocation succeeded */
+    tb->hash = newvect;
+    tb->size = nsize;
+    if (nsize > osize)
+      tablerehash(newvect, osize, nsize);  /* rehash for new size */
+  }
+}
+
+
+/*
+** Clear API string cache. (Entries cannot be empty, so fill them with
+** a non-collectable string.)
+*/
+void luaS_clearcache (global_State *g) {
+  int i, j;
+  for (i = 0; i < STRCACHE_N; i++)
+    for (j = 0; j < STRCACHE_M; j++) {
+      if (iswhite(g->strcache[i][j]))  /* will entry be collected? */
+        g->strcache[i][j] = g->memerrmsg;  /* replace it with something fixed */
+    }
+}
+
+
+/*
+** Initialize the string table and the string cache
+*/
+void luaS_init (lua_State *L) {
+  global_State *g = G(L);
+  int i, j;
+  stringtable *tb = &G(L)->strt;
+  tb->hash = luaM_newvector(L, MINSTRTABSIZE, TString*);
+  tablerehash(tb->hash, 0, MINSTRTABSIZE);  /* clear array */
+  tb->size = MINSTRTABSIZE;
+  /* pre-create memory-error message */
+  g->memerrmsg = luaS_newliteral(L, MEMERRMSG);
+  luaC_fix(L, obj2gco(g->memerrmsg));  /* it should never be collected */
+  for (i = 0; i < STRCACHE_N; i++)  /* fill cache with valid strings */
+    for (j = 0; j < STRCACHE_M; j++)
+      g->strcache[i][j] = g->memerrmsg;
+}
+
+
+
+/*
+** creates a new string object
+*/
+static TString *createstrobj (lua_State *L, size_t l, int tag, unsigned int h) {
+  TString *ts;
+  GCObject *o;
+  size_t totalsize;  /* total size of TString object */
+  totalsize = sizelstring(l);
+  o = luaC_newobj(L, tag, totalsize);
+  ts = gco2ts(o);
+  ts->hash = h;
+  ts->extra = 0;
+  getstr(ts)[l] = '\0';  /* ending 0 */
+  return ts;
+}
+
+
+TString *luaS_createlngstrobj (lua_State *L, size_t l) {
+  TString *ts = createstrobj(L, l, LUA_VLNGSTR, G(L)->seed);
+  ts->u.lnglen = l;
+  return ts;
+}
+
+
+void luaS_remove (lua_State *L, TString *ts) {
+  stringtable *tb = &G(L)->strt;
+  TString **p = &tb->hash[lmod(ts->hash, tb->size)];
+  while (*p != ts)  /* find previous element */
+    p = &(*p)->u.hnext;
+  *p = (*p)->u.hnext;  /* remove element from its list */
+  tb->nuse--;
+}
+
+
+static void growstrtab (lua_State *L, stringtable *tb) {
+  if (l_unlikely(tb->nuse == MAX_INT)) {  /* too many strings? */
+    luaC_fullgc(L, 1);  /* try to free some... */
+    if (tb->nuse == MAX_INT)  /* still too many? */
+      luaM_error(L);  /* cannot even create a message... */
+  }
+  if (tb->size <= MAXSTRTB / 2)  /* can grow string table? */
+    luaS_resize(L, tb->size * 2);
+}
+
+
+/*
+** Checks whether short string exists and reuses it or creates a new one.
+*/
+static TString *internshrstr (lua_State *L, const char *str, size_t l) {
+  TString *ts;
+  global_State *g = G(L);
+  stringtable *tb = &g->strt;
+  unsigned int h = luaS_hash(str, l, g->seed);
+  TString **list = &tb->hash[lmod(h, tb->size)];
+  lua_assert(str != NULL);  /* otherwise 'memcmp'/'memcpy' are undefined */
+  for (ts = *list; ts != NULL; ts = ts->u.hnext) {
+    if (l == ts->shrlen && (memcmp(str, getstr(ts), l * sizeof(char)) == 0)) {
+      /* found! */
+      if (isdead(g, ts))  /* dead (but not collected yet)? */
+        changewhite(ts);  /* resurrect it */
+      return ts;
+    }
+  }
+  /* else must create a new string */
+  if (tb->nuse >= tb->size) {  /* need to grow string table? */
+    growstrtab(L, tb);
+    list = &tb->hash[lmod(h, tb->size)];  /* rehash with new size */
+  }
+  ts = createstrobj(L, l, LUA_VSHRSTR, h);
+  memcpy(getstr(ts), str, l * sizeof(char));
+  ts->shrlen = cast_byte(l);
+  ts->u.hnext = *list;
+  *list = ts;
+  tb->nuse++;
+  return ts;
+}
+
+
+/*
+** new string (with explicit length)
+*/
+TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
+  if (l <= LUAI_MAXSHORTLEN)  /* short string? */
+    return internshrstr(L, str, l);
+  else {
+    TString *ts;
+    if (l_unlikely(l >= (MAX_SIZE - sizeof(TString))/sizeof(char)))
+      luaM_toobig(L);
+    ts = luaS_createlngstrobj(L, l);
+    memcpy(getstr(ts), str, l * sizeof(char));
+    return ts;
+  }
+}
+
+
+/*
+** Create or reuse a zero-terminated string, first checking in the
+** cache (using the string address as a key). The cache can contain
+** only zero-terminated strings, so it is safe to use 'strcmp' to
+** check hits.
+*/
+TString *luaS_new (lua_State *L, const char *str) {
+  unsigned int i = point2uint(str) % STRCACHE_N;  /* hash */
+  int j;
+  TString **p = G(L)->strcache[i];
+  for (j = 0; j < STRCACHE_M; j++) {
+    if (strcmp(str, getstr(p[j])) == 0)  /* hit? */
+      return p[j];  /* that is it */
+  }
+  /* normal route */
+  for (j = STRCACHE_M - 1; j > 0; j--)
+    p[j] = p[j - 1];  /* move out last element */
+  /* new element is first in the list */
+  p[0] = luaS_newlstr(L, str, strlen(str));
+  return p[0];
+}
+
+
+Udata *luaS_newudata (lua_State *L, size_t s, int nuvalue) {
+  Udata *u;
+  int i;
+  GCObject *o;
+  if (l_unlikely(s > MAX_SIZE - udatamemoffset(nuvalue)))
+    luaM_toobig(L);
+  o = luaC_newobj(L, LUA_VUSERDATA, sizeudata(nuvalue, s));
+  u = gco2u(o);
+  u->len = s;
+  u->nuvalue = nuvalue;
+  u->metatable = NULL;
+  for (i = 0; i < nuvalue; i++)
+    setnilvalue(&u->uv[i].uv);
+  return u;
+}
+
diff --git a/src/libs/3rdparty/lua/src/lstring.h b/src/libs/3rdparty/lua/src/lstring.h
new file mode 100644
index 00000000000..450c2390d1b
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lstring.h
@@ -0,0 +1,57 @@
+/*
+** $Id: lstring.h $
+** String table (keep all strings handled by Lua)
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lstring_h
+#define lstring_h
+
+#include "lgc.h"
+#include "lobject.h"
+#include "lstate.h"
+
+
+/*
+** Memory-allocation error message must be preallocated (it cannot
+** be created after memory is exhausted)
+*/
+#define MEMERRMSG       "not enough memory"
+
+
+/*
+** Size of a TString: Size of the header plus space for the string
+** itself (including final '\0').
+*/
+#define sizelstring(l)  (offsetof(TString, contents) + ((l) + 1) * sizeof(char))
+
+#define luaS_newliteral(L, s)	(luaS_newlstr(L, "" s, \
+                                 (sizeof(s)/sizeof(char))-1))
+
+
+/*
+** test whether a string is a reserved word
+*/
+#define isreserved(s)	((s)->tt == LUA_VSHRSTR && (s)->extra > 0)
+
+
+/*
+** equality for short strings, which are always internalized
+*/
+#define eqshrstr(a,b)	check_exp((a)->tt == LUA_VSHRSTR, (a) == (b))
+
+
+LUAI_FUNC unsigned int luaS_hash (const char *str, size_t l, unsigned int seed);
+LUAI_FUNC unsigned int luaS_hashlongstr (TString *ts);
+LUAI_FUNC int luaS_eqlngstr (TString *a, TString *b);
+LUAI_FUNC void luaS_resize (lua_State *L, int newsize);
+LUAI_FUNC void luaS_clearcache (global_State *g);
+LUAI_FUNC void luaS_init (lua_State *L);
+LUAI_FUNC void luaS_remove (lua_State *L, TString *ts);
+LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, int nuvalue);
+LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
+LUAI_FUNC TString *luaS_new (lua_State *L, const char *str);
+LUAI_FUNC TString *luaS_createlngstrobj (lua_State *L, size_t l);
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lstrlib.c b/src/libs/3rdparty/lua/src/lstrlib.c
new file mode 100644
index 00000000000..03167161df1
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lstrlib.c
@@ -0,0 +1,1874 @@
+/*
+** $Id: lstrlib.c $
+** Standard library for string operations and pattern-matching
+** See Copyright Notice in lua.h
+*/
+
+#define lstrlib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <ctype.h>
+#include <float.h>
+#include <limits.h>
+#include <locale.h>
+#include <math.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+/*
+** maximum number of captures that a pattern can do during
+** pattern-matching. This limit is arbitrary, but must fit in
+** an unsigned char.
+*/
+#if !defined(LUA_MAXCAPTURES)
+#define LUA_MAXCAPTURES		32
+#endif
+
+
+/* macro to 'unsign' a character */
+#define uchar(c)	((unsigned char)(c))
+
+
+/*
+** Some sizes are better limited to fit in 'int', but must also fit in
+** 'size_t'. (We assume that 'lua_Integer' cannot be smaller than 'int'.)
+*/
+#define MAX_SIZET	((size_t)(~(size_t)0))
+
+#define MAXSIZE  \
+	(sizeof(size_t) < sizeof(int) ? MAX_SIZET : (size_t)(INT_MAX))
+
+
+
+
+static int str_len (lua_State *L) {
+  size_t l;
+  luaL_checklstring(L, 1, &l);
+  lua_pushinteger(L, (lua_Integer)l);
+  return 1;
+}
+
+
+/*
+** translate a relative initial string position
+** (negative means back from end): clip result to [1, inf).
+** The length of any string in Lua must fit in a lua_Integer,
+** so there are no overflows in the casts.
+** The inverted comparison avoids a possible overflow
+** computing '-pos'.
+*/
+static size_t posrelatI (lua_Integer pos, size_t len) {
+  if (pos > 0)
+    return (size_t)pos;
+  else if (pos == 0)
+    return 1;
+  else if (pos < -(lua_Integer)len)  /* inverted comparison */
+    return 1;  /* clip to 1 */
+  else return len + (size_t)pos + 1;
+}
+
+
+/*
+** Gets an optional ending string position from argument 'arg',
+** with default value 'def'.
+** Negative means back from end: clip result to [0, len]
+*/
+static size_t getendpos (lua_State *L, int arg, lua_Integer def,
+                         size_t len) {
+  lua_Integer pos = luaL_optinteger(L, arg, def);
+  if (pos > (lua_Integer)len)
+    return len;
+  else if (pos >= 0)
+    return (size_t)pos;
+  else if (pos < -(lua_Integer)len)
+    return 0;
+  else return len + (size_t)pos + 1;
+}
+
+
+static int str_sub (lua_State *L) {
+  size_t l;
+  const char *s = luaL_checklstring(L, 1, &l);
+  size_t start = posrelatI(luaL_checkinteger(L, 2), l);
+  size_t end = getendpos(L, 3, -1, l);
+  if (start <= end)
+    lua_pushlstring(L, s + start - 1, (end - start) + 1);
+  else lua_pushliteral(L, "");
+  return 1;
+}
+
+
+static int str_reverse (lua_State *L) {
+  size_t l, i;
+  luaL_Buffer b;
+  const char *s = luaL_checklstring(L, 1, &l);
+  char *p = luaL_buffinitsize(L, &b, l);
+  for (i = 0; i < l; i++)
+    p[i] = s[l - i - 1];
+  luaL_pushresultsize(&b, l);
+  return 1;
+}
+
+
+static int str_lower (lua_State *L) {
+  size_t l;
+  size_t i;
+  luaL_Buffer b;
+  const char *s = luaL_checklstring(L, 1, &l);
+  char *p = luaL_buffinitsize(L, &b, l);
+  for (i=0; i<l; i++)
+    p[i] = tolower(uchar(s[i]));
+  luaL_pushresultsize(&b, l);
+  return 1;
+}
+
+
+static int str_upper (lua_State *L) {
+  size_t l;
+  size_t i;
+  luaL_Buffer b;
+  const char *s = luaL_checklstring(L, 1, &l);
+  char *p = luaL_buffinitsize(L, &b, l);
+  for (i=0; i<l; i++)
+    p[i] = toupper(uchar(s[i]));
+  luaL_pushresultsize(&b, l);
+  return 1;
+}
+
+
+static int str_rep (lua_State *L) {
+  size_t l, lsep;
+  const char *s = luaL_checklstring(L, 1, &l);
+  lua_Integer n = luaL_checkinteger(L, 2);
+  const char *sep = luaL_optlstring(L, 3, "", &lsep);
+  if (n <= 0)
+    lua_pushliteral(L, "");
+  else if (l_unlikely(l + lsep < l || l + lsep > MAXSIZE / n))
+    return luaL_error(L, "resulting string too large");
+  else {
+    size_t totallen = (size_t)n * l + (size_t)(n - 1) * lsep;
+    luaL_Buffer b;
+    char *p = luaL_buffinitsize(L, &b, totallen);
+    while (n-- > 1) {  /* first n-1 copies (followed by separator) */
+      memcpy(p, s, l * sizeof(char)); p += l;
+      if (lsep > 0) {  /* empty 'memcpy' is not that cheap */
+        memcpy(p, sep, lsep * sizeof(char));
+        p += lsep;
+      }
+    }
+    memcpy(p, s, l * sizeof(char));  /* last copy (not followed by separator) */
+    luaL_pushresultsize(&b, totallen);
+  }
+  return 1;
+}
+
+
+static int str_byte (lua_State *L) {
+  size_t l;
+  const char *s = luaL_checklstring(L, 1, &l);
+  lua_Integer pi = luaL_optinteger(L, 2, 1);
+  size_t posi = posrelatI(pi, l);
+  size_t pose = getendpos(L, 3, pi, l);
+  int n, i;
+  if (posi > pose) return 0;  /* empty interval; return no values */
+  if (l_unlikely(pose - posi >= (size_t)INT_MAX))  /* arithmetic overflow? */
+    return luaL_error(L, "string slice too long");
+  n = (int)(pose -  posi) + 1;
+  luaL_checkstack(L, n, "string slice too long");
+  for (i=0; i<n; i++)
+    lua_pushinteger(L, uchar(s[posi+i-1]));
+  return n;
+}
+
+
+static int str_char (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  int i;
+  luaL_Buffer b;
+  char *p = luaL_buffinitsize(L, &b, n);
+  for (i=1; i<=n; i++) {
+    lua_Unsigned c = (lua_Unsigned)luaL_checkinteger(L, i);
+    luaL_argcheck(L, c <= (lua_Unsigned)UCHAR_MAX, i, "value out of range");
+    p[i - 1] = uchar(c);
+  }
+  luaL_pushresultsize(&b, n);
+  return 1;
+}
+
+
+/*
+** Buffer to store the result of 'string.dump'. It must be initialized
+** after the call to 'lua_dump', to ensure that the function is on the
+** top of the stack when 'lua_dump' is called. ('luaL_buffinit' might
+** push stuff.)
+*/
+struct str_Writer {
+  int init;  /* true iff buffer has been initialized */
+  luaL_Buffer B;
+};
+
+
+static int writer (lua_State *L, const void *b, size_t size, void *ud) {
+  struct str_Writer *state = (struct str_Writer *)ud;
+  if (!state->init) {
+    state->init = 1;
+    luaL_buffinit(L, &state->B);
+  }
+  luaL_addlstring(&state->B, (const char *)b, size);
+  return 0;
+}
+
+
+static int str_dump (lua_State *L) {
+  struct str_Writer state;
+  int strip = lua_toboolean(L, 2);
+  luaL_checktype(L, 1, LUA_TFUNCTION);
+  lua_settop(L, 1);  /* ensure function is on the top of the stack */
+  state.init = 0;
+  if (l_unlikely(lua_dump(L, writer, &state, strip) != 0))
+    return luaL_error(L, "unable to dump given function");
+  luaL_pushresult(&state.B);
+  return 1;
+}
+
+
+
+/*
+** {======================================================
+** METAMETHODS
+** =======================================================
+*/
+
+#if defined(LUA_NOCVTS2N)	/* { */
+
+/* no coercion from strings to numbers */
+
+static const luaL_Reg stringmetamethods[] = {
+  {"__index", NULL},  /* placeholder */
+  {NULL, NULL}
+};
+
+#else		/* }{ */
+
+static int tonum (lua_State *L, int arg) {
+  if (lua_type(L, arg) == LUA_TNUMBER) {  /* already a number? */
+    lua_pushvalue(L, arg);
+    return 1;
+  }
+  else {  /* check whether it is a numerical string */
+    size_t len;
+    const char *s = lua_tolstring(L, arg, &len);
+    return (s != NULL && lua_stringtonumber(L, s) == len + 1);
+  }
+}
+
+
+static void trymt (lua_State *L, const char *mtname) {
+  lua_settop(L, 2);  /* back to the original arguments */
+  if (l_unlikely(lua_type(L, 2) == LUA_TSTRING ||
+                 !luaL_getmetafield(L, 2, mtname)))
+    luaL_error(L, "attempt to %s a '%s' with a '%s'", mtname + 2,
+                  luaL_typename(L, -2), luaL_typename(L, -1));
+  lua_insert(L, -3);  /* put metamethod before arguments */
+  lua_call(L, 2, 1);  /* call metamethod */
+}
+
+
+static int arith (lua_State *L, int op, const char *mtname) {
+  if (tonum(L, 1) && tonum(L, 2))
+    lua_arith(L, op);  /* result will be on the top */
+  else
+    trymt(L, mtname);
+  return 1;
+}
+
+
+static int arith_add (lua_State *L) {
+  return arith(L, LUA_OPADD, "__add");
+}
+
+static int arith_sub (lua_State *L) {
+  return arith(L, LUA_OPSUB, "__sub");
+}
+
+static int arith_mul (lua_State *L) {
+  return arith(L, LUA_OPMUL, "__mul");
+}
+
+static int arith_mod (lua_State *L) {
+  return arith(L, LUA_OPMOD, "__mod");
+}
+
+static int arith_pow (lua_State *L) {
+  return arith(L, LUA_OPPOW, "__pow");
+}
+
+static int arith_div (lua_State *L) {
+  return arith(L, LUA_OPDIV, "__div");
+}
+
+static int arith_idiv (lua_State *L) {
+  return arith(L, LUA_OPIDIV, "__idiv");
+}
+
+static int arith_unm (lua_State *L) {
+  return arith(L, LUA_OPUNM, "__unm");
+}
+
+
+static const luaL_Reg stringmetamethods[] = {
+  {"__add", arith_add},
+  {"__sub", arith_sub},
+  {"__mul", arith_mul},
+  {"__mod", arith_mod},
+  {"__pow", arith_pow},
+  {"__div", arith_div},
+  {"__idiv", arith_idiv},
+  {"__unm", arith_unm},
+  {"__index", NULL},  /* placeholder */
+  {NULL, NULL}
+};
+
+#endif		/* } */
+
+/* }====================================================== */
+
+/*
+** {======================================================
+** PATTERN MATCHING
+** =======================================================
+*/
+
+
+#define CAP_UNFINISHED	(-1)
+#define CAP_POSITION	(-2)
+
+
+typedef struct MatchState {
+  const char *src_init;  /* init of source string */
+  const char *src_end;  /* end ('\0') of source string */
+  const char *p_end;  /* end ('\0') of pattern */
+  lua_State *L;
+  int matchdepth;  /* control for recursive depth (to avoid C stack overflow) */
+  unsigned char level;  /* total number of captures (finished or unfinished) */
+  struct {
+    const char *init;
+    ptrdiff_t len;
+  } capture[LUA_MAXCAPTURES];
+} MatchState;
+
+
+/* recursive function */
+static const char *match (MatchState *ms, const char *s, const char *p);
+
+
+/* maximum recursion depth for 'match' */
+#if !defined(MAXCCALLS)
+#define MAXCCALLS	200
+#endif
+
+
+#define L_ESC		'%'
+#define SPECIALS	"^$*+?.([%-"
+
+
+static int check_capture (MatchState *ms, int l) {
+  l -= '1';
+  if (l_unlikely(l < 0 || l >= ms->level ||
+                 ms->capture[l].len == CAP_UNFINISHED))
+    return luaL_error(ms->L, "invalid capture index %%%d", l + 1);
+  return l;
+}
+
+
+static int capture_to_close (MatchState *ms) {
+  int level = ms->level;
+  for (level--; level>=0; level--)
+    if (ms->capture[level].len == CAP_UNFINISHED) return level;
+  return luaL_error(ms->L, "invalid pattern capture");
+}
+
+
+static const char *classend (MatchState *ms, const char *p) {
+  switch (*p++) {
+    case L_ESC: {
+      if (l_unlikely(p == ms->p_end))
+        luaL_error(ms->L, "malformed pattern (ends with '%%')");
+      return p+1;
+    }
+    case '[': {
+      if (*p == '^') p++;
+      do {  /* look for a ']' */
+        if (l_unlikely(p == ms->p_end))
+          luaL_error(ms->L, "malformed pattern (missing ']')");
+        if (*(p++) == L_ESC && p < ms->p_end)
+          p++;  /* skip escapes (e.g. '%]') */
+      } while (*p != ']');
+      return p+1;
+    }
+    default: {
+      return p;
+    }
+  }
+}
+
+
+static int match_class (int c, int cl) {
+  int res;
+  switch (tolower(cl)) {
+    case 'a' : res = isalpha(c); break;
+    case 'c' : res = iscntrl(c); break;
+    case 'd' : res = isdigit(c); break;
+    case 'g' : res = isgraph(c); break;
+    case 'l' : res = islower(c); break;
+    case 'p' : res = ispunct(c); break;
+    case 's' : res = isspace(c); break;
+    case 'u' : res = isupper(c); break;
+    case 'w' : res = isalnum(c); break;
+    case 'x' : res = isxdigit(c); break;
+    case 'z' : res = (c == 0); break;  /* deprecated option */
+    default: return (cl == c);
+  }
+  return (islower(cl) ? res : !res);
+}
+
+
+static int matchbracketclass (int c, const char *p, const char *ec) {
+  int sig = 1;
+  if (*(p+1) == '^') {
+    sig = 0;
+    p++;  /* skip the '^' */
+  }
+  while (++p < ec) {
+    if (*p == L_ESC) {
+      p++;
+      if (match_class(c, uchar(*p)))
+        return sig;
+    }
+    else if ((*(p+1) == '-') && (p+2 < ec)) {
+      p+=2;
+      if (uchar(*(p-2)) <= c && c <= uchar(*p))
+        return sig;
+    }
+    else if (uchar(*p) == c) return sig;
+  }
+  return !sig;
+}
+
+
+static int singlematch (MatchState *ms, const char *s, const char *p,
+                        const char *ep) {
+  if (s >= ms->src_end)
+    return 0;
+  else {
+    int c = uchar(*s);
+    switch (*p) {
+      case '.': return 1;  /* matches any char */
+      case L_ESC: return match_class(c, uchar(*(p+1)));
+      case '[': return matchbracketclass(c, p, ep-1);
+      default:  return (uchar(*p) == c);
+    }
+  }
+}
+
+
+static const char *matchbalance (MatchState *ms, const char *s,
+                                   const char *p) {
+  if (l_unlikely(p >= ms->p_end - 1))
+    luaL_error(ms->L, "malformed pattern (missing arguments to '%%b')");
+  if (*s != *p) return NULL;
+  else {
+    int b = *p;
+    int e = *(p+1);
+    int cont = 1;
+    while (++s < ms->src_end) {
+      if (*s == e) {
+        if (--cont == 0) return s+1;
+      }
+      else if (*s == b) cont++;
+    }
+  }
+  return NULL;  /* string ends out of balance */
+}
+
+
+static const char *max_expand (MatchState *ms, const char *s,
+                                 const char *p, const char *ep) {
+  ptrdiff_t i = 0;  /* counts maximum expand for item */
+  while (singlematch(ms, s + i, p, ep))
+    i++;
+  /* keeps trying to match with the maximum repetitions */
+  while (i>=0) {
+    const char *res = match(ms, (s+i), ep+1);
+    if (res) return res;
+    i--;  /* else didn't match; reduce 1 repetition to try again */
+  }
+  return NULL;
+}
+
+
+static const char *min_expand (MatchState *ms, const char *s,
+                                 const char *p, const char *ep) {
+  for (;;) {
+    const char *res = match(ms, s, ep+1);
+    if (res != NULL)
+      return res;
+    else if (singlematch(ms, s, p, ep))
+      s++;  /* try with one more repetition */
+    else return NULL;
+  }
+}
+
+
+static const char *start_capture (MatchState *ms, const char *s,
+                                    const char *p, int what) {
+  const char *res;
+  int level = ms->level;
+  if (level >= LUA_MAXCAPTURES) luaL_error(ms->L, "too many captures");
+  ms->capture[level].init = s;
+  ms->capture[level].len = what;
+  ms->level = level+1;
+  if ((res=match(ms, s, p)) == NULL)  /* match failed? */
+    ms->level--;  /* undo capture */
+  return res;
+}
+
+
+static const char *end_capture (MatchState *ms, const char *s,
+                                  const char *p) {
+  int l = capture_to_close(ms);
+  const char *res;
+  ms->capture[l].len = s - ms->capture[l].init;  /* close capture */
+  if ((res = match(ms, s, p)) == NULL)  /* match failed? */
+    ms->capture[l].len = CAP_UNFINISHED;  /* undo capture */
+  return res;
+}
+
+
+static const char *match_capture (MatchState *ms, const char *s, int l) {
+  size_t len;
+  l = check_capture(ms, l);
+  len = ms->capture[l].len;
+  if ((size_t)(ms->src_end-s) >= len &&
+      memcmp(ms->capture[l].init, s, len) == 0)
+    return s+len;
+  else return NULL;
+}
+
+
+static const char *match (MatchState *ms, const char *s, const char *p) {
+  if (l_unlikely(ms->matchdepth-- == 0))
+    luaL_error(ms->L, "pattern too complex");
+  init: /* using goto to optimize tail recursion */
+  if (p != ms->p_end) {  /* end of pattern? */
+    switch (*p) {
+      case '(': {  /* start capture */
+        if (*(p + 1) == ')')  /* position capture? */
+          s = start_capture(ms, s, p + 2, CAP_POSITION);
+        else
+          s = start_capture(ms, s, p + 1, CAP_UNFINISHED);
+        break;
+      }
+      case ')': {  /* end capture */
+        s = end_capture(ms, s, p + 1);
+        break;
+      }
+      case '$': {
+        if ((p + 1) != ms->p_end)  /* is the '$' the last char in pattern? */
+          goto dflt;  /* no; go to default */
+        s = (s == ms->src_end) ? s : NULL;  /* check end of string */
+        break;
+      }
+      case L_ESC: {  /* escaped sequences not in the format class[*+?-]? */
+        switch (*(p + 1)) {
+          case 'b': {  /* balanced string? */
+            s = matchbalance(ms, s, p + 2);
+            if (s != NULL) {
+              p += 4; goto init;  /* return match(ms, s, p + 4); */
+            }  /* else fail (s == NULL) */
+            break;
+          }
+          case 'f': {  /* frontier? */
+            const char *ep; char previous;
+            p += 2;
+            if (l_unlikely(*p != '['))
+              luaL_error(ms->L, "missing '[' after '%%f' in pattern");
+            ep = classend(ms, p);  /* points to what is next */
+            previous = (s == ms->src_init) ? '\0' : *(s - 1);
+            if (!matchbracketclass(uchar(previous), p, ep - 1) &&
+               matchbracketclass(uchar(*s), p, ep - 1)) {
+              p = ep; goto init;  /* return match(ms, s, ep); */
+            }
+            s = NULL;  /* match failed */
+            break;
+          }
+          case '0': case '1': case '2': case '3':
+          case '4': case '5': case '6': case '7':
+          case '8': case '9': {  /* capture results (%0-%9)? */
+            s = match_capture(ms, s, uchar(*(p + 1)));
+            if (s != NULL) {
+              p += 2; goto init;  /* return match(ms, s, p + 2) */
+            }
+            break;
+          }
+          default: goto dflt;
+        }
+        break;
+      }
+      default: dflt: {  /* pattern class plus optional suffix */
+        const char *ep = classend(ms, p);  /* points to optional suffix */
+        /* does not match at least once? */
+        if (!singlematch(ms, s, p, ep)) {
+          if (*ep == '*' || *ep == '?' || *ep == '-') {  /* accept empty? */
+            p = ep + 1; goto init;  /* return match(ms, s, ep + 1); */
+          }
+          else  /* '+' or no suffix */
+            s = NULL;  /* fail */
+        }
+        else {  /* matched once */
+          switch (*ep) {  /* handle optional suffix */
+            case '?': {  /* optional */
+              const char *res;
+              if ((res = match(ms, s + 1, ep + 1)) != NULL)
+                s = res;
+              else {
+                p = ep + 1; goto init;  /* else return match(ms, s, ep + 1); */
+              }
+              break;
+            }
+            case '+':  /* 1 or more repetitions */
+              s++;  /* 1 match already done */
+              /* FALLTHROUGH */
+            case '*':  /* 0 or more repetitions */
+              s = max_expand(ms, s, p, ep);
+              break;
+            case '-':  /* 0 or more repetitions (minimum) */
+              s = min_expand(ms, s, p, ep);
+              break;
+            default:  /* no suffix */
+              s++; p = ep; goto init;  /* return match(ms, s + 1, ep); */
+          }
+        }
+        break;
+      }
+    }
+  }
+  ms->matchdepth++;
+  return s;
+}
+
+
+
+static const char *lmemfind (const char *s1, size_t l1,
+                               const char *s2, size_t l2) {
+  if (l2 == 0) return s1;  /* empty strings are everywhere */
+  else if (l2 > l1) return NULL;  /* avoids a negative 'l1' */
+  else {
+    const char *init;  /* to search for a '*s2' inside 's1' */
+    l2--;  /* 1st char will be checked by 'memchr' */
+    l1 = l1-l2;  /* 's2' cannot be found after that */
+    while (l1 > 0 && (init = (const char *)memchr(s1, *s2, l1)) != NULL) {
+      init++;   /* 1st char is already checked */
+      if (memcmp(init, s2+1, l2) == 0)
+        return init-1;
+      else {  /* correct 'l1' and 's1' to try again */
+        l1 -= init-s1;
+        s1 = init;
+      }
+    }
+    return NULL;  /* not found */
+  }
+}
+
+
+/*
+** get information about the i-th capture. If there are no captures
+** and 'i==0', return information about the whole match, which
+** is the range 's'..'e'. If the capture is a string, return
+** its length and put its address in '*cap'. If it is an integer
+** (a position), push it on the stack and return CAP_POSITION.
+*/
+static size_t get_onecapture (MatchState *ms, int i, const char *s,
+                              const char *e, const char **cap) {
+  if (i >= ms->level) {
+    if (l_unlikely(i != 0))
+      luaL_error(ms->L, "invalid capture index %%%d", i + 1);
+    *cap = s;
+    return e - s;
+  }
+  else {
+    ptrdiff_t capl = ms->capture[i].len;
+    *cap = ms->capture[i].init;
+    if (l_unlikely(capl == CAP_UNFINISHED))
+      luaL_error(ms->L, "unfinished capture");
+    else if (capl == CAP_POSITION)
+      lua_pushinteger(ms->L, (ms->capture[i].init - ms->src_init) + 1);
+    return capl;
+  }
+}
+
+
+/*
+** Push the i-th capture on the stack.
+*/
+static void push_onecapture (MatchState *ms, int i, const char *s,
+                                                    const char *e) {
+  const char *cap;
+  ptrdiff_t l = get_onecapture(ms, i, s, e, &cap);
+  if (l != CAP_POSITION)
+    lua_pushlstring(ms->L, cap, l);
+  /* else position was already pushed */
+}
+
+
+static int push_captures (MatchState *ms, const char *s, const char *e) {
+  int i;
+  int nlevels = (ms->level == 0 && s) ? 1 : ms->level;
+  luaL_checkstack(ms->L, nlevels, "too many captures");
+  for (i = 0; i < nlevels; i++)
+    push_onecapture(ms, i, s, e);
+  return nlevels;  /* number of strings pushed */
+}
+
+
+/* check whether pattern has no special characters */
+static int nospecials (const char *p, size_t l) {
+  size_t upto = 0;
+  do {
+    if (strpbrk(p + upto, SPECIALS))
+      return 0;  /* pattern has a special character */
+    upto += strlen(p + upto) + 1;  /* may have more after \0 */
+  } while (upto <= l);
+  return 1;  /* no special chars found */
+}
+
+
+static void prepstate (MatchState *ms, lua_State *L,
+                       const char *s, size_t ls, const char *p, size_t lp) {
+  ms->L = L;
+  ms->matchdepth = MAXCCALLS;
+  ms->src_init = s;
+  ms->src_end = s + ls;
+  ms->p_end = p + lp;
+}
+
+
+static void reprepstate (MatchState *ms) {
+  ms->level = 0;
+  lua_assert(ms->matchdepth == MAXCCALLS);
+}
+
+
+static int str_find_aux (lua_State *L, int find) {
+  size_t ls, lp;
+  const char *s = luaL_checklstring(L, 1, &ls);
+  const char *p = luaL_checklstring(L, 2, &lp);
+  size_t init = posrelatI(luaL_optinteger(L, 3, 1), ls) - 1;
+  if (init > ls) {  /* start after string's end? */
+    luaL_pushfail(L);  /* cannot find anything */
+    return 1;
+  }
+  /* explicit request or no special characters? */
+  if (find && (lua_toboolean(L, 4) || nospecials(p, lp))) {
+    /* do a plain search */
+    const char *s2 = lmemfind(s + init, ls - init, p, lp);
+    if (s2) {
+      lua_pushinteger(L, (s2 - s) + 1);
+      lua_pushinteger(L, (s2 - s) + lp);
+      return 2;
+    }
+  }
+  else {
+    MatchState ms;
+    const char *s1 = s + init;
+    int anchor = (*p == '^');
+    if (anchor) {
+      p++; lp--;  /* skip anchor character */
+    }
+    prepstate(&ms, L, s, ls, p, lp);
+    do {
+      const char *res;
+      reprepstate(&ms);
+      if ((res=match(&ms, s1, p)) != NULL) {
+        if (find) {
+          lua_pushinteger(L, (s1 - s) + 1);  /* start */
+          lua_pushinteger(L, res - s);   /* end */
+          return push_captures(&ms, NULL, 0) + 2;
+        }
+        else
+          return push_captures(&ms, s1, res);
+      }
+    } while (s1++ < ms.src_end && !anchor);
+  }
+  luaL_pushfail(L);  /* not found */
+  return 1;
+}
+
+
+static int str_find (lua_State *L) {
+  return str_find_aux(L, 1);
+}
+
+
+static int str_match (lua_State *L) {
+  return str_find_aux(L, 0);
+}
+
+
+/* state for 'gmatch' */
+typedef struct GMatchState {
+  const char *src;  /* current position */
+  const char *p;  /* pattern */
+  const char *lastmatch;  /* end of last match */
+  MatchState ms;  /* match state */
+} GMatchState;
+
+
+static int gmatch_aux (lua_State *L) {
+  GMatchState *gm = (GMatchState *)lua_touserdata(L, lua_upvalueindex(3));
+  const char *src;
+  gm->ms.L = L;
+  for (src = gm->src; src <= gm->ms.src_end; src++) {
+    const char *e;
+    reprepstate(&gm->ms);
+    if ((e = match(&gm->ms, src, gm->p)) != NULL && e != gm->lastmatch) {
+      gm->src = gm->lastmatch = e;
+      return push_captures(&gm->ms, src, e);
+    }
+  }
+  return 0;  /* not found */
+}
+
+
+static int gmatch (lua_State *L) {
+  size_t ls, lp;
+  const char *s = luaL_checklstring(L, 1, &ls);
+  const char *p = luaL_checklstring(L, 2, &lp);
+  size_t init = posrelatI(luaL_optinteger(L, 3, 1), ls) - 1;
+  GMatchState *gm;
+  lua_settop(L, 2);  /* keep strings on closure to avoid being collected */
+  gm = (GMatchState *)lua_newuserdatauv(L, sizeof(GMatchState), 0);
+  if (init > ls)  /* start after string's end? */
+    init = ls + 1;  /* avoid overflows in 's + init' */
+  prepstate(&gm->ms, L, s, ls, p, lp);
+  gm->src = s + init; gm->p = p; gm->lastmatch = NULL;
+  lua_pushcclosure(L, gmatch_aux, 3);
+  return 1;
+}
+
+
+static void add_s (MatchState *ms, luaL_Buffer *b, const char *s,
+                                                   const char *e) {
+  size_t l;
+  lua_State *L = ms->L;
+  const char *news = lua_tolstring(L, 3, &l);
+  const char *p;
+  while ((p = (char *)memchr(news, L_ESC, l)) != NULL) {
+    luaL_addlstring(b, news, p - news);
+    p++;  /* skip ESC */
+    if (*p == L_ESC)  /* '%%' */
+      luaL_addchar(b, *p);
+    else if (*p == '0')  /* '%0' */
+        luaL_addlstring(b, s, e - s);
+    else if (isdigit(uchar(*p))) {  /* '%n' */
+      const char *cap;
+      ptrdiff_t resl = get_onecapture(ms, *p - '1', s, e, &cap);
+      if (resl == CAP_POSITION)
+        luaL_addvalue(b);  /* add position to accumulated result */
+      else
+        luaL_addlstring(b, cap, resl);
+    }
+    else
+      luaL_error(L, "invalid use of '%c' in replacement string", L_ESC);
+    l -= p + 1 - news;
+    news = p + 1;
+  }
+  luaL_addlstring(b, news, l);
+}
+
+
+/*
+** Add the replacement value to the string buffer 'b'.
+** Return true if the original string was changed. (Function calls and
+** table indexing resulting in nil or false do not change the subject.)
+*/
+static int add_value (MatchState *ms, luaL_Buffer *b, const char *s,
+                                      const char *e, int tr) {
+  lua_State *L = ms->L;
+  switch (tr) {
+    case LUA_TFUNCTION: {  /* call the function */
+      int n;
+      lua_pushvalue(L, 3);  /* push the function */
+      n = push_captures(ms, s, e);  /* all captures as arguments */
+      lua_call(L, n, 1);  /* call it */
+      break;
+    }
+    case LUA_TTABLE: {  /* index the table */
+      push_onecapture(ms, 0, s, e);  /* first capture is the index */
+      lua_gettable(L, 3);
+      break;
+    }
+    default: {  /* LUA_TNUMBER or LUA_TSTRING */
+      add_s(ms, b, s, e);  /* add value to the buffer */
+      return 1;  /* something changed */
+    }
+  }
+  if (!lua_toboolean(L, -1)) {  /* nil or false? */
+    lua_pop(L, 1);  /* remove value */
+    luaL_addlstring(b, s, e - s);  /* keep original text */
+    return 0;  /* no changes */
+  }
+  else if (l_unlikely(!lua_isstring(L, -1)))
+    return luaL_error(L, "invalid replacement value (a %s)",
+                         luaL_typename(L, -1));
+  else {
+    luaL_addvalue(b);  /* add result to accumulator */
+    return 1;  /* something changed */
+  }
+}
+
+
+static int str_gsub (lua_State *L) {
+  size_t srcl, lp;
+  const char *src = luaL_checklstring(L, 1, &srcl);  /* subject */
+  const char *p = luaL_checklstring(L, 2, &lp);  /* pattern */
+  const char *lastmatch = NULL;  /* end of last match */
+  int tr = lua_type(L, 3);  /* replacement type */
+  lua_Integer max_s = luaL_optinteger(L, 4, srcl + 1);  /* max replacements */
+  int anchor = (*p == '^');
+  lua_Integer n = 0;  /* replacement count */
+  int changed = 0;  /* change flag */
+  MatchState ms;
+  luaL_Buffer b;
+  luaL_argexpected(L, tr == LUA_TNUMBER || tr == LUA_TSTRING ||
+                   tr == LUA_TFUNCTION || tr == LUA_TTABLE, 3,
+                      "string/function/table");
+  luaL_buffinit(L, &b);
+  if (anchor) {
+    p++; lp--;  /* skip anchor character */
+  }
+  prepstate(&ms, L, src, srcl, p, lp);
+  while (n < max_s) {
+    const char *e;
+    reprepstate(&ms);  /* (re)prepare state for new match */
+    if ((e = match(&ms, src, p)) != NULL && e != lastmatch) {  /* match? */
+      n++;
+      changed = add_value(&ms, &b, src, e, tr) | changed;
+      src = lastmatch = e;
+    }
+    else if (src < ms.src_end)  /* otherwise, skip one character */
+      luaL_addchar(&b, *src++);
+    else break;  /* end of subject */
+    if (anchor) break;
+  }
+  if (!changed)  /* no changes? */
+    lua_pushvalue(L, 1);  /* return original string */
+  else {  /* something changed */
+    luaL_addlstring(&b, src, ms.src_end-src);
+    luaL_pushresult(&b);  /* create and return new string */
+  }
+  lua_pushinteger(L, n);  /* number of substitutions */
+  return 2;
+}
+
+/* }====================================================== */
+
+
+
+/*
+** {======================================================
+** STRING FORMAT
+** =======================================================
+*/
+
+#if !defined(lua_number2strx)	/* { */
+
+/*
+** Hexadecimal floating-point formatter
+*/
+
+#define SIZELENMOD	(sizeof(LUA_NUMBER_FRMLEN)/sizeof(char))
+
+
+/*
+** Number of bits that goes into the first digit. It can be any value
+** between 1 and 4; the following definition tries to align the number
+** to nibble boundaries by making what is left after that first digit a
+** multiple of 4.
+*/
+#define L_NBFD		((l_floatatt(MANT_DIG) - 1)%4 + 1)
+
+
+/*
+** Add integer part of 'x' to buffer and return new 'x'
+*/
+static lua_Number adddigit (char *buff, int n, lua_Number x) {
+  lua_Number dd = l_mathop(floor)(x);  /* get integer part from 'x' */
+  int d = (int)dd;
+  buff[n] = (d < 10 ? d + '0' : d - 10 + 'a');  /* add to buffer */
+  return x - dd;  /* return what is left */
+}
+
+
+static int num2straux (char *buff, int sz, lua_Number x) {
+  /* if 'inf' or 'NaN', format it like '%g' */
+  if (x != x || x == (lua_Number)HUGE_VAL || x == -(lua_Number)HUGE_VAL)
+    return l_sprintf(buff, sz, LUA_NUMBER_FMT, (LUAI_UACNUMBER)x);
+  else if (x == 0) {  /* can be -0... */
+    /* create "0" or "-0" followed by exponent */
+    return l_sprintf(buff, sz, LUA_NUMBER_FMT "x0p+0", (LUAI_UACNUMBER)x);
+  }
+  else {
+    int e;
+    lua_Number m = l_mathop(frexp)(x, &e);  /* 'x' fraction and exponent */
+    int n = 0;  /* character count */
+    if (m < 0) {  /* is number negative? */
+      buff[n++] = '-';  /* add sign */
+      m = -m;  /* make it positive */
+    }
+    buff[n++] = '0'; buff[n++] = 'x';  /* add "0x" */
+    m = adddigit(buff, n++, m * (1 << L_NBFD));  /* add first digit */
+    e -= L_NBFD;  /* this digit goes before the radix point */
+    if (m > 0) {  /* more digits? */
+      buff[n++] = lua_getlocaledecpoint();  /* add radix point */
+      do {  /* add as many digits as needed */
+        m = adddigit(buff, n++, m * 16);
+      } while (m > 0);
+    }
+    n += l_sprintf(buff + n, sz - n, "p%+d", e);  /* add exponent */
+    lua_assert(n < sz);
+    return n;
+  }
+}
+
+
+static int lua_number2strx (lua_State *L, char *buff, int sz,
+                            const char *fmt, lua_Number x) {
+  int n = num2straux(buff, sz, x);
+  if (fmt[SIZELENMOD] == 'A') {
+    int i;
+    for (i = 0; i < n; i++)
+      buff[i] = toupper(uchar(buff[i]));
+  }
+  else if (l_unlikely(fmt[SIZELENMOD] != 'a'))
+    return luaL_error(L, "modifiers for format '%%a'/'%%A' not implemented");
+  return n;
+}
+
+#endif				/* } */
+
+
+/*
+** Maximum size for items formatted with '%f'. This size is produced
+** by format('%.99f', -maxfloat), and is equal to 99 + 3 ('-', '.',
+** and '\0') + number of decimal digits to represent maxfloat (which
+** is maximum exponent + 1). (99+3+1, adding some extra, 110)
+*/
+#define MAX_ITEMF	(110 + l_floatatt(MAX_10_EXP))
+
+
+/*
+** All formats except '%f' do not need that large limit.  The other
+** float formats use exponents, so that they fit in the 99 limit for
+** significant digits; 's' for large strings and 'q' add items directly
+** to the buffer; all integer formats also fit in the 99 limit.  The
+** worst case are floats: they may need 99 significant digits, plus
+** '0x', '-', '.', 'e+XXXX', and '\0'. Adding some extra, 120.
+*/
+#define MAX_ITEM	120
+
+
+/* valid flags in a format specification */
+#if !defined(L_FMTFLAGSF)
+
+/* valid flags for a, A, e, E, f, F, g, and G conversions */
+#define L_FMTFLAGSF	"-+#0 "
+
+/* valid flags for o, x, and X conversions */
+#define L_FMTFLAGSX	"-#0"
+
+/* valid flags for d and i conversions */
+#define L_FMTFLAGSI	"-+0 "
+
+/* valid flags for u conversions */
+#define L_FMTFLAGSU	"-0"
+
+/* valid flags for c, p, and s conversions */
+#define L_FMTFLAGSC	"-"
+
+#endif
+
+
+/*
+** Maximum size of each format specification (such as "%-099.99d"):
+** Initial '%', flags (up to 5), width (2), period, precision (2),
+** length modifier (8), conversion specifier, and final '\0', plus some
+** extra.
+*/
+#define MAX_FORMAT	32
+
+
+static void addquoted (luaL_Buffer *b, const char *s, size_t len) {
+  luaL_addchar(b, '"');
+  while (len--) {
+    if (*s == '"' || *s == '\\' || *s == '\n') {
+      luaL_addchar(b, '\\');
+      luaL_addchar(b, *s);
+    }
+    else if (iscntrl(uchar(*s))) {
+      char buff[10];
+      if (!isdigit(uchar(*(s+1))))
+        l_sprintf(buff, sizeof(buff), "\\%d", (int)uchar(*s));
+      else
+        l_sprintf(buff, sizeof(buff), "\\%03d", (int)uchar(*s));
+      luaL_addstring(b, buff);
+    }
+    else
+      luaL_addchar(b, *s);
+    s++;
+  }
+  luaL_addchar(b, '"');
+}
+
+
+/*
+** Serialize a floating-point number in such a way that it can be
+** scanned back by Lua. Use hexadecimal format for "common" numbers
+** (to preserve precision); inf, -inf, and NaN are handled separately.
+** (NaN cannot be expressed as a numeral, so we write '(0/0)' for it.)
+*/
+static int quotefloat (lua_State *L, char *buff, lua_Number n) {
+  const char *s;  /* for the fixed representations */
+  if (n == (lua_Number)HUGE_VAL)  /* inf? */
+    s = "1e9999";
+  else if (n == -(lua_Number)HUGE_VAL)  /* -inf? */
+    s = "-1e9999";
+  else if (n != n)  /* NaN? */
+    s = "(0/0)";
+  else {  /* format number as hexadecimal */
+    int  nb = lua_number2strx(L, buff, MAX_ITEM,
+                                 "%" LUA_NUMBER_FRMLEN "a", n);
+    /* ensures that 'buff' string uses a dot as the radix character */
+    if (memchr(buff, '.', nb) == NULL) {  /* no dot? */
+      char point = lua_getlocaledecpoint();  /* try locale point */
+      char *ppoint = (char *)memchr(buff, point, nb);
+      if (ppoint) *ppoint = '.';  /* change it to a dot */
+    }
+    return nb;
+  }
+  /* for the fixed representations */
+  return l_sprintf(buff, MAX_ITEM, "%s", s);
+}
+
+
+static void addliteral (lua_State *L, luaL_Buffer *b, int arg) {
+  switch (lua_type(L, arg)) {
+    case LUA_TSTRING: {
+      size_t len;
+      const char *s = lua_tolstring(L, arg, &len);
+      addquoted(b, s, len);
+      break;
+    }
+    case LUA_TNUMBER: {
+      char *buff = luaL_prepbuffsize(b, MAX_ITEM);
+      int nb;
+      if (!lua_isinteger(L, arg))  /* float? */
+        nb = quotefloat(L, buff, lua_tonumber(L, arg));
+      else {  /* integers */
+        lua_Integer n = lua_tointeger(L, arg);
+        const char *format = (n == LUA_MININTEGER)  /* corner case? */
+                           ? "0x%" LUA_INTEGER_FRMLEN "x"  /* use hex */
+                           : LUA_INTEGER_FMT;  /* else use default format */
+        nb = l_sprintf(buff, MAX_ITEM, format, (LUAI_UACINT)n);
+      }
+      luaL_addsize(b, nb);
+      break;
+    }
+    case LUA_TNIL: case LUA_TBOOLEAN: {
+      luaL_tolstring(L, arg, NULL);
+      luaL_addvalue(b);
+      break;
+    }
+    default: {
+      luaL_argerror(L, arg, "value has no literal form");
+    }
+  }
+}
+
+
+static const char *get2digits (const char *s) {
+  if (isdigit(uchar(*s))) {
+    s++;
+    if (isdigit(uchar(*s))) s++;  /* (2 digits at most) */
+  }
+  return s;
+}
+
+
+/*
+** Check whether a conversion specification is valid. When called,
+** first character in 'form' must be '%' and last character must
+** be a valid conversion specifier. 'flags' are the accepted flags;
+** 'precision' signals whether to accept a precision.
+*/
+static void checkformat (lua_State *L, const char *form, const char *flags,
+                                       int precision) {
+  const char *spec = form + 1;  /* skip '%' */
+  spec += strspn(spec, flags);  /* skip flags */
+  if (*spec != '0') {  /* a width cannot start with '0' */
+    spec = get2digits(spec);  /* skip width */
+    if (*spec == '.' && precision) {
+      spec++;
+      spec = get2digits(spec);  /* skip precision */
+    }
+  }
+  if (!isalpha(uchar(*spec)))  /* did not go to the end? */
+    luaL_error(L, "invalid conversion specification: '%s'", form);
+}
+
+
+/*
+** Get a conversion specification and copy it to 'form'.
+** Return the address of its last character.
+*/
+static const char *getformat (lua_State *L, const char *strfrmt,
+                                            char *form) {
+  /* spans flags, width, and precision ('0' is included as a flag) */
+  size_t len = strspn(strfrmt, L_FMTFLAGSF "123456789.");
+  len++;  /* adds following character (should be the specifier) */
+  /* still needs space for '%', '\0', plus a length modifier */
+  if (len >= MAX_FORMAT - 10)
+    luaL_error(L, "invalid format (too long)");
+  *(form++) = '%';
+  memcpy(form, strfrmt, len * sizeof(char));
+  *(form + len) = '\0';
+  return strfrmt + len - 1;
+}
+
+
+/*
+** add length modifier into formats
+*/
+static void addlenmod (char *form, const char *lenmod) {
+  size_t l = strlen(form);
+  size_t lm = strlen(lenmod);
+  char spec = form[l - 1];
+  strcpy(form + l - 1, lenmod);
+  form[l + lm - 1] = spec;
+  form[l + lm] = '\0';
+}
+
+
+static int str_format (lua_State *L) {
+  int top = lua_gettop(L);
+  int arg = 1;
+  size_t sfl;
+  const char *strfrmt = luaL_checklstring(L, arg, &sfl);
+  const char *strfrmt_end = strfrmt+sfl;
+  const char *flags;
+  luaL_Buffer b;
+  luaL_buffinit(L, &b);
+  while (strfrmt < strfrmt_end) {
+    if (*strfrmt != L_ESC)
+      luaL_addchar(&b, *strfrmt++);
+    else if (*++strfrmt == L_ESC)
+      luaL_addchar(&b, *strfrmt++);  /* %% */
+    else { /* format item */
+      char form[MAX_FORMAT];  /* to store the format ('%...') */
+      int maxitem = MAX_ITEM;  /* maximum length for the result */
+      char *buff = luaL_prepbuffsize(&b, maxitem);  /* to put result */
+      int nb = 0;  /* number of bytes in result */
+      if (++arg > top)
+        return luaL_argerror(L, arg, "no value");
+      strfrmt = getformat(L, strfrmt, form);
+      switch (*strfrmt++) {
+        case 'c': {
+          checkformat(L, form, L_FMTFLAGSC, 0);
+          nb = l_sprintf(buff, maxitem, form, (int)luaL_checkinteger(L, arg));
+          break;
+        }
+        case 'd': case 'i':
+          flags = L_FMTFLAGSI;
+          goto intcase;
+        case 'u':
+          flags = L_FMTFLAGSU;
+          goto intcase;
+        case 'o': case 'x': case 'X':
+          flags = L_FMTFLAGSX;
+         intcase: {
+          lua_Integer n = luaL_checkinteger(L, arg);
+          checkformat(L, form, flags, 1);
+          addlenmod(form, LUA_INTEGER_FRMLEN);
+          nb = l_sprintf(buff, maxitem, form, (LUAI_UACINT)n);
+          break;
+        }
+        case 'a': case 'A':
+          checkformat(L, form, L_FMTFLAGSF, 1);
+          addlenmod(form, LUA_NUMBER_FRMLEN);
+          nb = lua_number2strx(L, buff, maxitem, form,
+                                  luaL_checknumber(L, arg));
+          break;
+        case 'f':
+          maxitem = MAX_ITEMF;  /* extra space for '%f' */
+          buff = luaL_prepbuffsize(&b, maxitem);
+          /* FALLTHROUGH */
+        case 'e': case 'E': case 'g': case 'G': {
+          lua_Number n = luaL_checknumber(L, arg);
+          checkformat(L, form, L_FMTFLAGSF, 1);
+          addlenmod(form, LUA_NUMBER_FRMLEN);
+          nb = l_sprintf(buff, maxitem, form, (LUAI_UACNUMBER)n);
+          break;
+        }
+        case 'p': {
+          const void *p = lua_topointer(L, arg);
+          checkformat(L, form, L_FMTFLAGSC, 0);
+          if (p == NULL) {  /* avoid calling 'printf' with argument NULL */
+            p = "(null)";  /* result */
+            form[strlen(form) - 1] = 's';  /* format it as a string */
+          }
+          nb = l_sprintf(buff, maxitem, form, p);
+          break;
+        }
+        case 'q': {
+          if (form[2] != '\0')  /* modifiers? */
+            return luaL_error(L, "specifier '%%q' cannot have modifiers");
+          addliteral(L, &b, arg);
+          break;
+        }
+        case 's': {
+          size_t l;
+          const char *s = luaL_tolstring(L, arg, &l);
+          if (form[2] == '\0')  /* no modifiers? */
+            luaL_addvalue(&b);  /* keep entire string */
+          else {
+            luaL_argcheck(L, l == strlen(s), arg, "string contains zeros");
+            checkformat(L, form, L_FMTFLAGSC, 1);
+            if (strchr(form, '.') == NULL && l >= 100) {
+              /* no precision and string is too long to be formatted */
+              luaL_addvalue(&b);  /* keep entire string */
+            }
+            else {  /* format the string into 'buff' */
+              nb = l_sprintf(buff, maxitem, form, s);
+              lua_pop(L, 1);  /* remove result from 'luaL_tolstring' */
+            }
+          }
+          break;
+        }
+        default: {  /* also treat cases 'pnLlh' */
+          return luaL_error(L, "invalid conversion '%s' to 'format'", form);
+        }
+      }
+      lua_assert(nb < maxitem);
+      luaL_addsize(&b, nb);
+    }
+  }
+  luaL_pushresult(&b);
+  return 1;
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** PACK/UNPACK
+** =======================================================
+*/
+
+
+/* value used for padding */
+#if !defined(LUAL_PACKPADBYTE)
+#define LUAL_PACKPADBYTE		0x00
+#endif
+
+/* maximum size for the binary representation of an integer */
+#define MAXINTSIZE	16
+
+/* number of bits in a character */
+#define NB	CHAR_BIT
+
+/* mask for one character (NB 1's) */
+#define MC	((1 << NB) - 1)
+
+/* size of a lua_Integer */
+#define SZINT	((int)sizeof(lua_Integer))
+
+
+/* dummy union to get native endianness */
+static const union {
+  int dummy;
+  char little;  /* true iff machine is little endian */
+} nativeendian = {1};
+
+
+/*
+** information to pack/unpack stuff
+*/
+typedef struct Header {
+  lua_State *L;
+  int islittle;
+  int maxalign;
+} Header;
+
+
+/*
+** options for pack/unpack
+*/
+typedef enum KOption {
+  Kint,		/* signed integers */
+  Kuint,	/* unsigned integers */
+  Kfloat,	/* single-precision floating-point numbers */
+  Knumber,	/* Lua "native" floating-point numbers */
+  Kdouble,	/* double-precision floating-point numbers */
+  Kchar,	/* fixed-length strings */
+  Kstring,	/* strings with prefixed length */
+  Kzstr,	/* zero-terminated strings */
+  Kpadding,	/* padding */
+  Kpaddalign,	/* padding for alignment */
+  Knop		/* no-op (configuration or spaces) */
+} KOption;
+
+
+/*
+** Read an integer numeral from string 'fmt' or return 'df' if
+** there is no numeral
+*/
+static int digit (int c) { return '0' <= c && c <= '9'; }
+
+static int getnum (const char **fmt, int df) {
+  if (!digit(**fmt))  /* no number? */
+    return df;  /* return default value */
+  else {
+    int a = 0;
+    do {
+      a = a*10 + (*((*fmt)++) - '0');
+    } while (digit(**fmt) && a <= ((int)MAXSIZE - 9)/10);
+    return a;
+  }
+}
+
+
+/*
+** Read an integer numeral and raises an error if it is larger
+** than the maximum size for integers.
+*/
+static int getnumlimit (Header *h, const char **fmt, int df) {
+  int sz = getnum(fmt, df);
+  if (l_unlikely(sz > MAXINTSIZE || sz <= 0))
+    return luaL_error(h->L, "integral size (%d) out of limits [1,%d]",
+                            sz, MAXINTSIZE);
+  return sz;
+}
+
+
+/*
+** Initialize Header
+*/
+static void initheader (lua_State *L, Header *h) {
+  h->L = L;
+  h->islittle = nativeendian.little;
+  h->maxalign = 1;
+}
+
+
+/*
+** Read and classify next option. 'size' is filled with option's size.
+*/
+static KOption getoption (Header *h, const char **fmt, int *size) {
+  /* dummy structure to get native alignment requirements */
+  struct cD { char c; union { LUAI_MAXALIGN; } u; };
+  int opt = *((*fmt)++);
+  *size = 0;  /* default */
+  switch (opt) {
+    case 'b': *size = sizeof(char); return Kint;
+    case 'B': *size = sizeof(char); return Kuint;
+    case 'h': *size = sizeof(short); return Kint;
+    case 'H': *size = sizeof(short); return Kuint;
+    case 'l': *size = sizeof(long); return Kint;
+    case 'L': *size = sizeof(long); return Kuint;
+    case 'j': *size = sizeof(lua_Integer); return Kint;
+    case 'J': *size = sizeof(lua_Integer); return Kuint;
+    case 'T': *size = sizeof(size_t); return Kuint;
+    case 'f': *size = sizeof(float); return Kfloat;
+    case 'n': *size = sizeof(lua_Number); return Knumber;
+    case 'd': *size = sizeof(double); return Kdouble;
+    case 'i': *size = getnumlimit(h, fmt, sizeof(int)); return Kint;
+    case 'I': *size = getnumlimit(h, fmt, sizeof(int)); return Kuint;
+    case 's': *size = getnumlimit(h, fmt, sizeof(size_t)); return Kstring;
+    case 'c':
+      *size = getnum(fmt, -1);
+      if (l_unlikely(*size == -1))
+        luaL_error(h->L, "missing size for format option 'c'");
+      return Kchar;
+    case 'z': return Kzstr;
+    case 'x': *size = 1; return Kpadding;
+    case 'X': return Kpaddalign;
+    case ' ': break;
+    case '<': h->islittle = 1; break;
+    case '>': h->islittle = 0; break;
+    case '=': h->islittle = nativeendian.little; break;
+    case '!': {
+      const int maxalign = offsetof(struct cD, u);
+      h->maxalign = getnumlimit(h, fmt, maxalign);
+      break;
+    }
+    default: luaL_error(h->L, "invalid format option '%c'", opt);
+  }
+  return Knop;
+}
+
+
+/*
+** Read, classify, and fill other details about the next option.
+** 'psize' is filled with option's size, 'notoalign' with its
+** alignment requirements.
+** Local variable 'size' gets the size to be aligned. (Kpadal option
+** always gets its full alignment, other options are limited by
+** the maximum alignment ('maxalign'). Kchar option needs no alignment
+** despite its size.
+*/
+static KOption getdetails (Header *h, size_t totalsize,
+                           const char **fmt, int *psize, int *ntoalign) {
+  KOption opt = getoption(h, fmt, psize);
+  int align = *psize;  /* usually, alignment follows size */
+  if (opt == Kpaddalign) {  /* 'X' gets alignment from following option */
+    if (**fmt == '\0' || getoption(h, fmt, &align) == Kchar || align == 0)
+      luaL_argerror(h->L, 1, "invalid next option for option 'X'");
+  }
+  if (align <= 1 || opt == Kchar)  /* need no alignment? */
+    *ntoalign = 0;
+  else {
+    if (align > h->maxalign)  /* enforce maximum alignment */
+      align = h->maxalign;
+    if (l_unlikely((align & (align - 1)) != 0))  /* not a power of 2? */
+      luaL_argerror(h->L, 1, "format asks for alignment not power of 2");
+    *ntoalign = (align - (int)(totalsize & (align - 1))) & (align - 1);
+  }
+  return opt;
+}
+
+
+/*
+** Pack integer 'n' with 'size' bytes and 'islittle' endianness.
+** The final 'if' handles the case when 'size' is larger than
+** the size of a Lua integer, correcting the extra sign-extension
+** bytes if necessary (by default they would be zeros).
+*/
+static void packint (luaL_Buffer *b, lua_Unsigned n,
+                     int islittle, int size, int neg) {
+  char *buff = luaL_prepbuffsize(b, size);
+  int i;
+  buff[islittle ? 0 : size - 1] = (char)(n & MC);  /* first byte */
+  for (i = 1; i < size; i++) {
+    n >>= NB;
+    buff[islittle ? i : size - 1 - i] = (char)(n & MC);
+  }
+  if (neg && size > SZINT) {  /* negative number need sign extension? */
+    for (i = SZINT; i < size; i++)  /* correct extra bytes */
+      buff[islittle ? i : size - 1 - i] = (char)MC;
+  }
+  luaL_addsize(b, size);  /* add result to buffer */
+}
+
+
+/*
+** Copy 'size' bytes from 'src' to 'dest', correcting endianness if
+** given 'islittle' is different from native endianness.
+*/
+static void copywithendian (char *dest, const char *src,
+                            int size, int islittle) {
+  if (islittle == nativeendian.little)
+    memcpy(dest, src, size);
+  else {
+    dest += size - 1;
+    while (size-- != 0)
+      *(dest--) = *(src++);
+  }
+}
+
+
+static int str_pack (lua_State *L) {
+  luaL_Buffer b;
+  Header h;
+  const char *fmt = luaL_checkstring(L, 1);  /* format string */
+  int arg = 1;  /* current argument to pack */
+  size_t totalsize = 0;  /* accumulate total size of result */
+  initheader(L, &h);
+  lua_pushnil(L);  /* mark to separate arguments from string buffer */
+  luaL_buffinit(L, &b);
+  while (*fmt != '\0') {
+    int size, ntoalign;
+    KOption opt = getdetails(&h, totalsize, &fmt, &size, &ntoalign);
+    totalsize += ntoalign + size;
+    while (ntoalign-- > 0)
+     luaL_addchar(&b, LUAL_PACKPADBYTE);  /* fill alignment */
+    arg++;
+    switch (opt) {
+      case Kint: {  /* signed integers */
+        lua_Integer n = luaL_checkinteger(L, arg);
+        if (size < SZINT) {  /* need overflow check? */
+          lua_Integer lim = (lua_Integer)1 << ((size * NB) - 1);
+          luaL_argcheck(L, -lim <= n && n < lim, arg, "integer overflow");
+        }
+        packint(&b, (lua_Unsigned)n, h.islittle, size, (n < 0));
+        break;
+      }
+      case Kuint: {  /* unsigned integers */
+        lua_Integer n = luaL_checkinteger(L, arg);
+        if (size < SZINT)  /* need overflow check? */
+          luaL_argcheck(L, (lua_Unsigned)n < ((lua_Unsigned)1 << (size * NB)),
+                           arg, "unsigned overflow");
+        packint(&b, (lua_Unsigned)n, h.islittle, size, 0);
+        break;
+      }
+      case Kfloat: {  /* C float */
+        float f = (float)luaL_checknumber(L, arg);  /* get argument */
+        char *buff = luaL_prepbuffsize(&b, sizeof(f));
+        /* move 'f' to final result, correcting endianness if needed */
+        copywithendian(buff, (char *)&f, sizeof(f), h.islittle);
+        luaL_addsize(&b, size);
+        break;
+      }
+      case Knumber: {  /* Lua float */
+        lua_Number f = luaL_checknumber(L, arg);  /* get argument */
+        char *buff = luaL_prepbuffsize(&b, sizeof(f));
+        /* move 'f' to final result, correcting endianness if needed */
+        copywithendian(buff, (char *)&f, sizeof(f), h.islittle);
+        luaL_addsize(&b, size);
+        break;
+      }
+      case Kdouble: {  /* C double */
+        double f = (double)luaL_checknumber(L, arg);  /* get argument */
+        char *buff = luaL_prepbuffsize(&b, sizeof(f));
+        /* move 'f' to final result, correcting endianness if needed */
+        copywithendian(buff, (char *)&f, sizeof(f), h.islittle);
+        luaL_addsize(&b, size);
+        break;
+      }
+      case Kchar: {  /* fixed-size string */
+        size_t len;
+        const char *s = luaL_checklstring(L, arg, &len);
+        luaL_argcheck(L, len <= (size_t)size, arg,
+                         "string longer than given size");
+        luaL_addlstring(&b, s, len);  /* add string */
+        while (len++ < (size_t)size)  /* pad extra space */
+          luaL_addchar(&b, LUAL_PACKPADBYTE);
+        break;
+      }
+      case Kstring: {  /* strings with length count */
+        size_t len;
+        const char *s = luaL_checklstring(L, arg, &len);
+        luaL_argcheck(L, size >= (int)sizeof(size_t) ||
+                         len < ((size_t)1 << (size * NB)),
+                         arg, "string length does not fit in given size");
+        packint(&b, (lua_Unsigned)len, h.islittle, size, 0);  /* pack length */
+        luaL_addlstring(&b, s, len);
+        totalsize += len;
+        break;
+      }
+      case Kzstr: {  /* zero-terminated string */
+        size_t len;
+        const char *s = luaL_checklstring(L, arg, &len);
+        luaL_argcheck(L, strlen(s) == len, arg, "string contains zeros");
+        luaL_addlstring(&b, s, len);
+        luaL_addchar(&b, '\0');  /* add zero at the end */
+        totalsize += len + 1;
+        break;
+      }
+      case Kpadding: luaL_addchar(&b, LUAL_PACKPADBYTE);  /* FALLTHROUGH */
+      case Kpaddalign: case Knop:
+        arg--;  /* undo increment */
+        break;
+    }
+  }
+  luaL_pushresult(&b);
+  return 1;
+}
+
+
+static int str_packsize (lua_State *L) {
+  Header h;
+  const char *fmt = luaL_checkstring(L, 1);  /* format string */
+  size_t totalsize = 0;  /* accumulate total size of result */
+  initheader(L, &h);
+  while (*fmt != '\0') {
+    int size, ntoalign;
+    KOption opt = getdetails(&h, totalsize, &fmt, &size, &ntoalign);
+    luaL_argcheck(L, opt != Kstring && opt != Kzstr, 1,
+                     "variable-length format");
+    size += ntoalign;  /* total space used by option */
+    luaL_argcheck(L, totalsize <= MAXSIZE - size, 1,
+                     "format result too large");
+    totalsize += size;
+  }
+  lua_pushinteger(L, (lua_Integer)totalsize);
+  return 1;
+}
+
+
+/*
+** Unpack an integer with 'size' bytes and 'islittle' endianness.
+** If size is smaller than the size of a Lua integer and integer
+** is signed, must do sign extension (propagating the sign to the
+** higher bits); if size is larger than the size of a Lua integer,
+** it must check the unread bytes to see whether they do not cause an
+** overflow.
+*/
+static lua_Integer unpackint (lua_State *L, const char *str,
+                              int islittle, int size, int issigned) {
+  lua_Unsigned res = 0;
+  int i;
+  int limit = (size  <= SZINT) ? size : SZINT;
+  for (i = limit - 1; i >= 0; i--) {
+    res <<= NB;
+    res |= (lua_Unsigned)(unsigned char)str[islittle ? i : size - 1 - i];
+  }
+  if (size < SZINT) {  /* real size smaller than lua_Integer? */
+    if (issigned) {  /* needs sign extension? */
+      lua_Unsigned mask = (lua_Unsigned)1 << (size*NB - 1);
+      res = ((res ^ mask) - mask);  /* do sign extension */
+    }
+  }
+  else if (size > SZINT) {  /* must check unread bytes */
+    int mask = (!issigned || (lua_Integer)res >= 0) ? 0 : MC;
+    for (i = limit; i < size; i++) {
+      if (l_unlikely((unsigned char)str[islittle ? i : size - 1 - i] != mask))
+        luaL_error(L, "%d-byte integer does not fit into Lua Integer", size);
+    }
+  }
+  return (lua_Integer)res;
+}
+
+
+static int str_unpack (lua_State *L) {
+  Header h;
+  const char *fmt = luaL_checkstring(L, 1);
+  size_t ld;
+  const char *data = luaL_checklstring(L, 2, &ld);
+  size_t pos = posrelatI(luaL_optinteger(L, 3, 1), ld) - 1;
+  int n = 0;  /* number of results */
+  luaL_argcheck(L, pos <= ld, 3, "initial position out of string");
+  initheader(L, &h);
+  while (*fmt != '\0') {
+    int size, ntoalign;
+    KOption opt = getdetails(&h, pos, &fmt, &size, &ntoalign);
+    luaL_argcheck(L, (size_t)ntoalign + size <= ld - pos, 2,
+                    "data string too short");
+    pos += ntoalign;  /* skip alignment */
+    /* stack space for item + next position */
+    luaL_checkstack(L, 2, "too many results");
+    n++;
+    switch (opt) {
+      case Kint:
+      case Kuint: {
+        lua_Integer res = unpackint(L, data + pos, h.islittle, size,
+                                       (opt == Kint));
+        lua_pushinteger(L, res);
+        break;
+      }
+      case Kfloat: {
+        float f;
+        copywithendian((char *)&f, data + pos, sizeof(f), h.islittle);
+        lua_pushnumber(L, (lua_Number)f);
+        break;
+      }
+      case Knumber: {
+        lua_Number f;
+        copywithendian((char *)&f, data + pos, sizeof(f), h.islittle);
+        lua_pushnumber(L, f);
+        break;
+      }
+      case Kdouble: {
+        double f;
+        copywithendian((char *)&f, data + pos, sizeof(f), h.islittle);
+        lua_pushnumber(L, (lua_Number)f);
+        break;
+      }
+      case Kchar: {
+        lua_pushlstring(L, data + pos, size);
+        break;
+      }
+      case Kstring: {
+        size_t len = (size_t)unpackint(L, data + pos, h.islittle, size, 0);
+        luaL_argcheck(L, len <= ld - pos - size, 2, "data string too short");
+        lua_pushlstring(L, data + pos + size, len);
+        pos += len;  /* skip string */
+        break;
+      }
+      case Kzstr: {
+        size_t len = strlen(data + pos);
+        luaL_argcheck(L, pos + len < ld, 2,
+                         "unfinished string for format 'z'");
+        lua_pushlstring(L, data + pos, len);
+        pos += len + 1;  /* skip string plus final '\0' */
+        break;
+      }
+      case Kpaddalign: case Kpadding: case Knop:
+        n--;  /* undo increment */
+        break;
+    }
+    pos += size;
+  }
+  lua_pushinteger(L, pos + 1);  /* next position */
+  return n + 1;
+}
+
+/* }====================================================== */
+
+
+static const luaL_Reg strlib[] = {
+  {"byte", str_byte},
+  {"char", str_char},
+  {"dump", str_dump},
+  {"find", str_find},
+  {"format", str_format},
+  {"gmatch", gmatch},
+  {"gsub", str_gsub},
+  {"len", str_len},
+  {"lower", str_lower},
+  {"match", str_match},
+  {"rep", str_rep},
+  {"reverse", str_reverse},
+  {"sub", str_sub},
+  {"upper", str_upper},
+  {"pack", str_pack},
+  {"packsize", str_packsize},
+  {"unpack", str_unpack},
+  {NULL, NULL}
+};
+
+
+static void createmetatable (lua_State *L) {
+  /* table to be metatable for strings */
+  luaL_newlibtable(L, stringmetamethods);
+  luaL_setfuncs(L, stringmetamethods, 0);
+  lua_pushliteral(L, "");  /* dummy string */
+  lua_pushvalue(L, -2);  /* copy table */
+  lua_setmetatable(L, -2);  /* set table as metatable for strings */
+  lua_pop(L, 1);  /* pop dummy string */
+  lua_pushvalue(L, -2);  /* get string library */
+  lua_setfield(L, -2, "__index");  /* metatable.__index = string */
+  lua_pop(L, 1);  /* pop metatable */
+}
+
+
+/*
+** Open string library
+*/
+LUAMOD_API int luaopen_string (lua_State *L) {
+  luaL_newlib(L, strlib);
+  createmetatable(L);
+  return 1;
+}
+
diff --git a/src/libs/3rdparty/lua/src/ltable.c b/src/libs/3rdparty/lua/src/ltable.c
new file mode 100644
index 00000000000..3c690c5f175
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ltable.c
@@ -0,0 +1,980 @@
+/*
+** $Id: ltable.c $
+** Lua tables (hash)
+** See Copyright Notice in lua.h
+*/
+
+#define ltable_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+/*
+** Implementation of tables (aka arrays, objects, or hash tables).
+** Tables keep its elements in two parts: an array part and a hash part.
+** Non-negative integer keys are all candidates to be kept in the array
+** part. The actual size of the array is the largest 'n' such that
+** more than half the slots between 1 and n are in use.
+** Hash uses a mix of chained scatter table with Brent's variation.
+** A main invariant of these tables is that, if an element is not
+** in its main position (i.e. the 'original' position that its hash gives
+** to it), then the colliding element is in its own main position.
+** Hence even when the load factor reaches 100%, performance remains good.
+*/
+
+#include <math.h>
+#include <limits.h>
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "lvm.h"
+
+
+/*
+** MAXABITS is the largest integer such that MAXASIZE fits in an
+** unsigned int.
+*/
+#define MAXABITS	cast_int(sizeof(int) * CHAR_BIT - 1)
+
+
+/*
+** MAXASIZE is the maximum size of the array part. It is the minimum
+** between 2^MAXABITS and the maximum size that, measured in bytes,
+** fits in a 'size_t'.
+*/
+#define MAXASIZE	luaM_limitN(1u << MAXABITS, TValue)
+
+/*
+** MAXHBITS is the largest integer such that 2^MAXHBITS fits in a
+** signed int.
+*/
+#define MAXHBITS	(MAXABITS - 1)
+
+
+/*
+** MAXHSIZE is the maximum size of the hash part. It is the minimum
+** between 2^MAXHBITS and the maximum size such that, measured in bytes,
+** it fits in a 'size_t'.
+*/
+#define MAXHSIZE	luaM_limitN(1u << MAXHBITS, Node)
+
+
+/*
+** When the original hash value is good, hashing by a power of 2
+** avoids the cost of '%'.
+*/
+#define hashpow2(t,n)		(gnode(t, lmod((n), sizenode(t))))
+
+/*
+** for other types, it is better to avoid modulo by power of 2, as
+** they can have many 2 factors.
+*/
+#define hashmod(t,n)	(gnode(t, ((n) % ((sizenode(t)-1)|1))))
+
+
+#define hashstr(t,str)		hashpow2(t, (str)->hash)
+#define hashboolean(t,p)	hashpow2(t, p)
+
+
+#define hashpointer(t,p)	hashmod(t, point2uint(p))
+
+
+#define dummynode		(&dummynode_)
+
+static const Node dummynode_ = {
+  {{NULL}, LUA_VEMPTY,  /* value's value and type */
+   LUA_VNIL, 0, {NULL}}  /* key type, next, and key value */
+};
+
+
+static const TValue absentkey = {ABSTKEYCONSTANT};
+
+
+/*
+** Hash for integers. To allow a good hash, use the remainder operator
+** ('%'). If integer fits as a non-negative int, compute an int
+** remainder, which is faster. Otherwise, use an unsigned-integer
+** remainder, which uses all bits and ensures a non-negative result.
+*/
+static Node *hashint (const Table *t, lua_Integer i) {
+  lua_Unsigned ui = l_castS2U(i);
+  if (ui <= cast_uint(INT_MAX))
+    return hashmod(t, cast_int(ui));
+  else
+    return hashmod(t, ui);
+}
+
+
+/*
+** Hash for floating-point numbers.
+** The main computation should be just
+**     n = frexp(n, &i); return (n * INT_MAX) + i
+** but there are some numerical subtleties.
+** In a two-complement representation, INT_MAX does not has an exact
+** representation as a float, but INT_MIN does; because the absolute
+** value of 'frexp' is smaller than 1 (unless 'n' is inf/NaN), the
+** absolute value of the product 'frexp * -INT_MIN' is smaller or equal
+** to INT_MAX. Next, the use of 'unsigned int' avoids overflows when
+** adding 'i'; the use of '~u' (instead of '-u') avoids problems with
+** INT_MIN.
+*/
+#if !defined(l_hashfloat)
+static int l_hashfloat (lua_Number n) {
+  int i;
+  lua_Integer ni;
+  n = l_mathop(frexp)(n, &i) * -cast_num(INT_MIN);
+  if (!lua_numbertointeger(n, &ni)) {  /* is 'n' inf/-inf/NaN? */
+    lua_assert(luai_numisnan(n) || l_mathop(fabs)(n) == cast_num(HUGE_VAL));
+    return 0;
+  }
+  else {  /* normal case */
+    unsigned int u = cast_uint(i) + cast_uint(ni);
+    return cast_int(u <= cast_uint(INT_MAX) ? u : ~u);
+  }
+}
+#endif
+
+
+/*
+** returns the 'main' position of an element in a table (that is,
+** the index of its hash value).
+*/
+static Node *mainpositionTV (const Table *t, const TValue *key) {
+  switch (ttypetag(key)) {
+    case LUA_VNUMINT: {
+      lua_Integer i = ivalue(key);
+      return hashint(t, i);
+    }
+    case LUA_VNUMFLT: {
+      lua_Number n = fltvalue(key);
+      return hashmod(t, l_hashfloat(n));
+    }
+    case LUA_VSHRSTR: {
+      TString *ts = tsvalue(key);
+      return hashstr(t, ts);
+    }
+    case LUA_VLNGSTR: {
+      TString *ts = tsvalue(key);
+      return hashpow2(t, luaS_hashlongstr(ts));
+    }
+    case LUA_VFALSE:
+      return hashboolean(t, 0);
+    case LUA_VTRUE:
+      return hashboolean(t, 1);
+    case LUA_VLIGHTUSERDATA: {
+      void *p = pvalue(key);
+      return hashpointer(t, p);
+    }
+    case LUA_VLCF: {
+      lua_CFunction f = fvalue(key);
+      return hashpointer(t, f);
+    }
+    default: {
+      GCObject *o = gcvalue(key);
+      return hashpointer(t, o);
+    }
+  }
+}
+
+
+l_sinline Node *mainpositionfromnode (const Table *t, Node *nd) {
+  TValue key;
+  getnodekey(cast(lua_State *, NULL), &key, nd);
+  return mainpositionTV(t, &key);
+}
+
+
+/*
+** Check whether key 'k1' is equal to the key in node 'n2'. This
+** equality is raw, so there are no metamethods. Floats with integer
+** values have been normalized, so integers cannot be equal to
+** floats. It is assumed that 'eqshrstr' is simply pointer equality, so
+** that short strings are handled in the default case.
+** A true 'deadok' means to accept dead keys as equal to their original
+** values. All dead keys are compared in the default case, by pointer
+** identity. (Only collectable objects can produce dead keys.) Note that
+** dead long strings are also compared by identity.
+** Once a key is dead, its corresponding value may be collected, and
+** then another value can be created with the same address. If this
+** other value is given to 'next', 'equalkey' will signal a false
+** positive. In a regular traversal, this situation should never happen,
+** as all keys given to 'next' came from the table itself, and therefore
+** could not have been collected. Outside a regular traversal, we
+** have garbage in, garbage out. What is relevant is that this false
+** positive does not break anything.  (In particular, 'next' will return
+** some other valid item on the table or nil.)
+*/
+static int equalkey (const TValue *k1, const Node *n2, int deadok) {
+  if ((rawtt(k1) != keytt(n2)) &&  /* not the same variants? */
+       !(deadok && keyisdead(n2) && iscollectable(k1)))
+   return 0;  /* cannot be same key */
+  switch (keytt(n2)) {
+    case LUA_VNIL: case LUA_VFALSE: case LUA_VTRUE:
+      return 1;
+    case LUA_VNUMINT:
+      return (ivalue(k1) == keyival(n2));
+    case LUA_VNUMFLT:
+      return luai_numeq(fltvalue(k1), fltvalueraw(keyval(n2)));
+    case LUA_VLIGHTUSERDATA:
+      return pvalue(k1) == pvalueraw(keyval(n2));
+    case LUA_VLCF:
+      return fvalue(k1) == fvalueraw(keyval(n2));
+    case ctb(LUA_VLNGSTR):
+      return luaS_eqlngstr(tsvalue(k1), keystrval(n2));
+    default:
+      return gcvalue(k1) == gcvalueraw(keyval(n2));
+  }
+}
+
+
+/*
+** True if value of 'alimit' is equal to the real size of the array
+** part of table 't'. (Otherwise, the array part must be larger than
+** 'alimit'.)
+*/
+#define limitequalsasize(t)	(isrealasize(t) || ispow2((t)->alimit))
+
+
+/*
+** Returns the real size of the 'array' array
+*/
+LUAI_FUNC unsigned int luaH_realasize (const Table *t) {
+  if (limitequalsasize(t))
+    return t->alimit;  /* this is the size */
+  else {
+    unsigned int size = t->alimit;
+    /* compute the smallest power of 2 not smaller than 'n' */
+    size |= (size >> 1);
+    size |= (size >> 2);
+    size |= (size >> 4);
+    size |= (size >> 8);
+#if (UINT_MAX >> 14) > 3  /* unsigned int has more than 16 bits */
+    size |= (size >> 16);
+#if (UINT_MAX >> 30) > 3
+    size |= (size >> 32);  /* unsigned int has more than 32 bits */
+#endif
+#endif
+    size++;
+    lua_assert(ispow2(size) && size/2 < t->alimit && t->alimit < size);
+    return size;
+  }
+}
+
+
+/*
+** Check whether real size of the array is a power of 2.
+** (If it is not, 'alimit' cannot be changed to any other value
+** without changing the real size.)
+*/
+static int ispow2realasize (const Table *t) {
+  return (!isrealasize(t) || ispow2(t->alimit));
+}
+
+
+static unsigned int setlimittosize (Table *t) {
+  t->alimit = luaH_realasize(t);
+  setrealasize(t);
+  return t->alimit;
+}
+
+
+#define limitasasize(t)	check_exp(isrealasize(t), t->alimit)
+
+
+
+/*
+** "Generic" get version. (Not that generic: not valid for integers,
+** which may be in array part, nor for floats with integral values.)
+** See explanation about 'deadok' in function 'equalkey'.
+*/
+static const TValue *getgeneric (Table *t, const TValue *key, int deadok) {
+  Node *n = mainpositionTV(t, key);
+  for (;;) {  /* check whether 'key' is somewhere in the chain */
+    if (equalkey(key, n, deadok))
+      return gval(n);  /* that's it */
+    else {
+      int nx = gnext(n);
+      if (nx == 0)
+        return &absentkey;  /* not found */
+      n += nx;
+    }
+  }
+}
+
+
+/*
+** returns the index for 'k' if 'k' is an appropriate key to live in
+** the array part of a table, 0 otherwise.
+*/
+static unsigned int arrayindex (lua_Integer k) {
+  if (l_castS2U(k) - 1u < MAXASIZE)  /* 'k' in [1, MAXASIZE]? */
+    return cast_uint(k);  /* 'key' is an appropriate array index */
+  else
+    return 0;
+}
+
+
+/*
+** returns the index of a 'key' for table traversals. First goes all
+** elements in the array part, then elements in the hash part. The
+** beginning of a traversal is signaled by 0.
+*/
+static unsigned int findindex (lua_State *L, Table *t, TValue *key,
+                               unsigned int asize) {
+  unsigned int i;
+  if (ttisnil(key)) return 0;  /* first iteration */
+  i = ttisinteger(key) ? arrayindex(ivalue(key)) : 0;
+  if (i - 1u < asize)  /* is 'key' inside array part? */
+    return i;  /* yes; that's the index */
+  else {
+    const TValue *n = getgeneric(t, key, 1);
+    if (l_unlikely(isabstkey(n)))
+      luaG_runerror(L, "invalid key to 'next'");  /* key not found */
+    i = cast_int(nodefromval(n) - gnode(t, 0));  /* key index in hash table */
+    /* hash elements are numbered after array ones */
+    return (i + 1) + asize;
+  }
+}
+
+
+int luaH_next (lua_State *L, Table *t, StkId key) {
+  unsigned int asize = luaH_realasize(t);
+  unsigned int i = findindex(L, t, s2v(key), asize);  /* find original key */
+  for (; i < asize; i++) {  /* try first array part */
+    if (!isempty(&t->array[i])) {  /* a non-empty entry? */
+      setivalue(s2v(key), i + 1);
+      setobj2s(L, key + 1, &t->array[i]);
+      return 1;
+    }
+  }
+  for (i -= asize; cast_int(i) < sizenode(t); i++) {  /* hash part */
+    if (!isempty(gval(gnode(t, i)))) {  /* a non-empty entry? */
+      Node *n = gnode(t, i);
+      getnodekey(L, s2v(key), n);
+      setobj2s(L, key + 1, gval(n));
+      return 1;
+    }
+  }
+  return 0;  /* no more elements */
+}
+
+
+static void freehash (lua_State *L, Table *t) {
+  if (!isdummy(t))
+    luaM_freearray(L, t->node, cast_sizet(sizenode(t)));
+}
+
+
+/*
+** {=============================================================
+** Rehash
+** ==============================================================
+*/
+
+/*
+** Compute the optimal size for the array part of table 't'. 'nums' is a
+** "count array" where 'nums[i]' is the number of integers in the table
+** between 2^(i - 1) + 1 and 2^i. 'pna' enters with the total number of
+** integer keys in the table and leaves with the number of keys that
+** will go to the array part; return the optimal size.  (The condition
+** 'twotoi > 0' in the for loop stops the loop if 'twotoi' overflows.)
+*/
+static unsigned int computesizes (unsigned int nums[], unsigned int *pna) {
+  int i;
+  unsigned int twotoi;  /* 2^i (candidate for optimal size) */
+  unsigned int a = 0;  /* number of elements smaller than 2^i */
+  unsigned int na = 0;  /* number of elements to go to array part */
+  unsigned int optimal = 0;  /* optimal size for array part */
+  /* loop while keys can fill more than half of total size */
+  for (i = 0, twotoi = 1;
+       twotoi > 0 && *pna > twotoi / 2;
+       i++, twotoi *= 2) {
+    a += nums[i];
+    if (a > twotoi/2) {  /* more than half elements present? */
+      optimal = twotoi;  /* optimal size (till now) */
+      na = a;  /* all elements up to 'optimal' will go to array part */
+    }
+  }
+  lua_assert((optimal == 0 || optimal / 2 < na) && na <= optimal);
+  *pna = na;
+  return optimal;
+}
+
+
+static int countint (lua_Integer key, unsigned int *nums) {
+  unsigned int k = arrayindex(key);
+  if (k != 0) {  /* is 'key' an appropriate array index? */
+    nums[luaO_ceillog2(k)]++;  /* count as such */
+    return 1;
+  }
+  else
+    return 0;
+}
+
+
+/*
+** Count keys in array part of table 't': Fill 'nums[i]' with
+** number of keys that will go into corresponding slice and return
+** total number of non-nil keys.
+*/
+static unsigned int numusearray (const Table *t, unsigned int *nums) {
+  int lg;
+  unsigned int ttlg;  /* 2^lg */
+  unsigned int ause = 0;  /* summation of 'nums' */
+  unsigned int i = 1;  /* count to traverse all array keys */
+  unsigned int asize = limitasasize(t);  /* real array size */
+  /* traverse each slice */
+  for (lg = 0, ttlg = 1; lg <= MAXABITS; lg++, ttlg *= 2) {
+    unsigned int lc = 0;  /* counter */
+    unsigned int lim = ttlg;
+    if (lim > asize) {
+      lim = asize;  /* adjust upper limit */
+      if (i > lim)
+        break;  /* no more elements to count */
+    }
+    /* count elements in range (2^(lg - 1), 2^lg] */
+    for (; i <= lim; i++) {
+      if (!isempty(&t->array[i-1]))
+        lc++;
+    }
+    nums[lg] += lc;
+    ause += lc;
+  }
+  return ause;
+}
+
+
+static int numusehash (const Table *t, unsigned int *nums, unsigned int *pna) {
+  int totaluse = 0;  /* total number of elements */
+  int ause = 0;  /* elements added to 'nums' (can go to array part) */
+  int i = sizenode(t);
+  while (i--) {
+    Node *n = &t->node[i];
+    if (!isempty(gval(n))) {
+      if (keyisinteger(n))
+        ause += countint(keyival(n), nums);
+      totaluse++;
+    }
+  }
+  *pna += ause;
+  return totaluse;
+}
+
+
+/*
+** Creates an array for the hash part of a table with the given
+** size, or reuses the dummy node if size is zero.
+** The computation for size overflow is in two steps: the first
+** comparison ensures that the shift in the second one does not
+** overflow.
+*/
+static void setnodevector (lua_State *L, Table *t, unsigned int size) {
+  if (size == 0) {  /* no elements to hash part? */
+    t->node = cast(Node *, dummynode);  /* use common 'dummynode' */
+    t->lsizenode = 0;
+    t->lastfree = NULL;  /* signal that it is using dummy node */
+  }
+  else {
+    int i;
+    int lsize = luaO_ceillog2(size);
+    if (lsize > MAXHBITS || (1u << lsize) > MAXHSIZE)
+      luaG_runerror(L, "table overflow");
+    size = twoto(lsize);
+    t->node = luaM_newvector(L, size, Node);
+    for (i = 0; i < cast_int(size); i++) {
+      Node *n = gnode(t, i);
+      gnext(n) = 0;
+      setnilkey(n);
+      setempty(gval(n));
+    }
+    t->lsizenode = cast_byte(lsize);
+    t->lastfree = gnode(t, size);  /* all positions are free */
+  }
+}
+
+
+/*
+** (Re)insert all elements from the hash part of 'ot' into table 't'.
+*/
+static void reinsert (lua_State *L, Table *ot, Table *t) {
+  int j;
+  int size = sizenode(ot);
+  for (j = 0; j < size; j++) {
+    Node *old = gnode(ot, j);
+    if (!isempty(gval(old))) {
+      /* doesn't need barrier/invalidate cache, as entry was
+         already present in the table */
+      TValue k;
+      getnodekey(L, &k, old);
+      luaH_set(L, t, &k, gval(old));
+    }
+  }
+}
+
+
+/*
+** Exchange the hash part of 't1' and 't2'.
+*/
+static void exchangehashpart (Table *t1, Table *t2) {
+  lu_byte lsizenode = t1->lsizenode;
+  Node *node = t1->node;
+  Node *lastfree = t1->lastfree;
+  t1->lsizenode = t2->lsizenode;
+  t1->node = t2->node;
+  t1->lastfree = t2->lastfree;
+  t2->lsizenode = lsizenode;
+  t2->node = node;
+  t2->lastfree = lastfree;
+}
+
+
+/*
+** Resize table 't' for the new given sizes. Both allocations (for
+** the hash part and for the array part) can fail, which creates some
+** subtleties. If the first allocation, for the hash part, fails, an
+** error is raised and that is it. Otherwise, it copies the elements from
+** the shrinking part of the array (if it is shrinking) into the new
+** hash. Then it reallocates the array part.  If that fails, the table
+** is in its original state; the function frees the new hash part and then
+** raises the allocation error. Otherwise, it sets the new hash part
+** into the table, initializes the new part of the array (if any) with
+** nils and reinserts the elements of the old hash back into the new
+** parts of the table.
+*/
+void luaH_resize (lua_State *L, Table *t, unsigned int newasize,
+                                          unsigned int nhsize) {
+  unsigned int i;
+  Table newt;  /* to keep the new hash part */
+  unsigned int oldasize = setlimittosize(t);
+  TValue *newarray;
+  /* create new hash part with appropriate size into 'newt' */
+  setnodevector(L, &newt, nhsize);
+  if (newasize < oldasize) {  /* will array shrink? */
+    t->alimit = newasize;  /* pretend array has new size... */
+    exchangehashpart(t, &newt);  /* and new hash */
+    /* re-insert into the new hash the elements from vanishing slice */
+    for (i = newasize; i < oldasize; i++) {
+      if (!isempty(&t->array[i]))
+        luaH_setint(L, t, i + 1, &t->array[i]);
+    }
+    t->alimit = oldasize;  /* restore current size... */
+    exchangehashpart(t, &newt);  /* and hash (in case of errors) */
+  }
+  /* allocate new array */
+  newarray = luaM_reallocvector(L, t->array, oldasize, newasize, TValue);
+  if (l_unlikely(newarray == NULL && newasize > 0)) {  /* allocation failed? */
+    freehash(L, &newt);  /* release new hash part */
+    luaM_error(L);  /* raise error (with array unchanged) */
+  }
+  /* allocation ok; initialize new part of the array */
+  exchangehashpart(t, &newt);  /* 't' has the new hash ('newt' has the old) */
+  t->array = newarray;  /* set new array part */
+  t->alimit = newasize;
+  for (i = oldasize; i < newasize; i++)  /* clear new slice of the array */
+     setempty(&t->array[i]);
+  /* re-insert elements from old hash part into new parts */
+  reinsert(L, &newt, t);  /* 'newt' now has the old hash */
+  freehash(L, &newt);  /* free old hash part */
+}
+
+
+void luaH_resizearray (lua_State *L, Table *t, unsigned int nasize) {
+  int nsize = allocsizenode(t);
+  luaH_resize(L, t, nasize, nsize);
+}
+
+/*
+** nums[i] = number of keys 'k' where 2^(i - 1) < k <= 2^i
+*/
+static void rehash (lua_State *L, Table *t, const TValue *ek) {
+  unsigned int asize;  /* optimal size for array part */
+  unsigned int na;  /* number of keys in the array part */
+  unsigned int nums[MAXABITS + 1];
+  int i;
+  int totaluse;
+  for (i = 0; i <= MAXABITS; i++) nums[i] = 0;  /* reset counts */
+  setlimittosize(t);
+  na = numusearray(t, nums);  /* count keys in array part */
+  totaluse = na;  /* all those keys are integer keys */
+  totaluse += numusehash(t, nums, &na);  /* count keys in hash part */
+  /* count extra key */
+  if (ttisinteger(ek))
+    na += countint(ivalue(ek), nums);
+  totaluse++;
+  /* compute new size for array part */
+  asize = computesizes(nums, &na);
+  /* resize the table to new computed sizes */
+  luaH_resize(L, t, asize, totaluse - na);
+}
+
+
+
+/*
+** }=============================================================
+*/
+
+
+Table *luaH_new (lua_State *L) {
+  GCObject *o = luaC_newobj(L, LUA_VTABLE, sizeof(Table));
+  Table *t = gco2t(o);
+  t->metatable = NULL;
+  t->flags = cast_byte(maskflags);  /* table has no metamethod fields */
+  t->array = NULL;
+  t->alimit = 0;
+  setnodevector(L, t, 0);
+  return t;
+}
+
+
+void luaH_free (lua_State *L, Table *t) {
+  freehash(L, t);
+  luaM_freearray(L, t->array, luaH_realasize(t));
+  luaM_free(L, t);
+}
+
+
+static Node *getfreepos (Table *t) {
+  if (!isdummy(t)) {
+    while (t->lastfree > t->node) {
+      t->lastfree--;
+      if (keyisnil(t->lastfree))
+        return t->lastfree;
+    }
+  }
+  return NULL;  /* could not find a free place */
+}
+
+
+
+/*
+** inserts a new key into a hash table; first, check whether key's main
+** position is free. If not, check whether colliding node is in its main
+** position or not: if it is not, move colliding node to an empty place and
+** put new key in its main position; otherwise (colliding node is in its main
+** position), new key goes to an empty position.
+*/
+void luaH_newkey (lua_State *L, Table *t, const TValue *key, TValue *value) {
+  Node *mp;
+  TValue aux;
+  if (l_unlikely(ttisnil(key)))
+    luaG_runerror(L, "table index is nil");
+  else if (ttisfloat(key)) {
+    lua_Number f = fltvalue(key);
+    lua_Integer k;
+    if (luaV_flttointeger(f, &k, F2Ieq)) {  /* does key fit in an integer? */
+      setivalue(&aux, k);
+      key = &aux;  /* insert it as an integer */
+    }
+    else if (l_unlikely(luai_numisnan(f)))
+      luaG_runerror(L, "table index is NaN");
+  }
+  if (ttisnil(value))
+    return;  /* do not insert nil values */
+  mp = mainpositionTV(t, key);
+  if (!isempty(gval(mp)) || isdummy(t)) {  /* main position is taken? */
+    Node *othern;
+    Node *f = getfreepos(t);  /* get a free place */
+    if (f == NULL) {  /* cannot find a free place? */
+      rehash(L, t, key);  /* grow table */
+      /* whatever called 'newkey' takes care of TM cache */
+      luaH_set(L, t, key, value);  /* insert key into grown table */
+      return;
+    }
+    lua_assert(!isdummy(t));
+    othern = mainpositionfromnode(t, mp);
+    if (othern != mp) {  /* is colliding node out of its main position? */
+      /* yes; move colliding node into free position */
+      while (othern + gnext(othern) != mp)  /* find previous */
+        othern += gnext(othern);
+      gnext(othern) = cast_int(f - othern);  /* rechain to point to 'f' */
+      *f = *mp;  /* copy colliding node into free pos. (mp->next also goes) */
+      if (gnext(mp) != 0) {
+        gnext(f) += cast_int(mp - f);  /* correct 'next' */
+        gnext(mp) = 0;  /* now 'mp' is free */
+      }
+      setempty(gval(mp));
+    }
+    else {  /* colliding node is in its own main position */
+      /* new node will go into free position */
+      if (gnext(mp) != 0)
+        gnext(f) = cast_int((mp + gnext(mp)) - f);  /* chain new position */
+      else lua_assert(gnext(f) == 0);
+      gnext(mp) = cast_int(f - mp);
+      mp = f;
+    }
+  }
+  setnodekey(L, mp, key);
+  luaC_barrierback(L, obj2gco(t), key);
+  lua_assert(isempty(gval(mp)));
+  setobj2t(L, gval(mp), value);
+}
+
+
+/*
+** Search function for integers. If integer is inside 'alimit', get it
+** directly from the array part. Otherwise, if 'alimit' is not equal to
+** the real size of the array, key still can be in the array part. In
+** this case, try to avoid a call to 'luaH_realasize' when key is just
+** one more than the limit (so that it can be incremented without
+** changing the real size of the array).
+*/
+const TValue *luaH_getint (Table *t, lua_Integer key) {
+  if (l_castS2U(key) - 1u < t->alimit)  /* 'key' in [1, t->alimit]? */
+    return &t->array[key - 1];
+  else if (!limitequalsasize(t) &&  /* key still may be in the array part? */
+           (l_castS2U(key) == t->alimit + 1 ||
+            l_castS2U(key) - 1u < luaH_realasize(t))) {
+    t->alimit = cast_uint(key);  /* probably '#t' is here now */
+    return &t->array[key - 1];
+  }
+  else {
+    Node *n = hashint(t, key);
+    for (;;) {  /* check whether 'key' is somewhere in the chain */
+      if (keyisinteger(n) && keyival(n) == key)
+        return gval(n);  /* that's it */
+      else {
+        int nx = gnext(n);
+        if (nx == 0) break;
+        n += nx;
+      }
+    }
+    return &absentkey;
+  }
+}
+
+
+/*
+** search function for short strings
+*/
+const TValue *luaH_getshortstr (Table *t, TString *key) {
+  Node *n = hashstr(t, key);
+  lua_assert(key->tt == LUA_VSHRSTR);
+  for (;;) {  /* check whether 'key' is somewhere in the chain */
+    if (keyisshrstr(n) && eqshrstr(keystrval(n), key))
+      return gval(n);  /* that's it */
+    else {
+      int nx = gnext(n);
+      if (nx == 0)
+        return &absentkey;  /* not found */
+      n += nx;
+    }
+  }
+}
+
+
+const TValue *luaH_getstr (Table *t, TString *key) {
+  if (key->tt == LUA_VSHRSTR)
+    return luaH_getshortstr(t, key);
+  else {  /* for long strings, use generic case */
+    TValue ko;
+    setsvalue(cast(lua_State *, NULL), &ko, key);
+    return getgeneric(t, &ko, 0);
+  }
+}
+
+
+/*
+** main search function
+*/
+const TValue *luaH_get (Table *t, const TValue *key) {
+  switch (ttypetag(key)) {
+    case LUA_VSHRSTR: return luaH_getshortstr(t, tsvalue(key));
+    case LUA_VNUMINT: return luaH_getint(t, ivalue(key));
+    case LUA_VNIL: return &absentkey;
+    case LUA_VNUMFLT: {
+      lua_Integer k;
+      if (luaV_flttointeger(fltvalue(key), &k, F2Ieq)) /* integral index? */
+        return luaH_getint(t, k);  /* use specialized version */
+      /* else... */
+    }  /* FALLTHROUGH */
+    default:
+      return getgeneric(t, key, 0);
+  }
+}
+
+
+/*
+** Finish a raw "set table" operation, where 'slot' is where the value
+** should have been (the result of a previous "get table").
+** Beware: when using this function you probably need to check a GC
+** barrier and invalidate the TM cache.
+*/
+void luaH_finishset (lua_State *L, Table *t, const TValue *key,
+                                   const TValue *slot, TValue *value) {
+  if (isabstkey(slot))
+    luaH_newkey(L, t, key, value);
+  else
+    setobj2t(L, cast(TValue *, slot), value);
+}
+
+
+/*
+** beware: when using this function you probably need to check a GC
+** barrier and invalidate the TM cache.
+*/
+void luaH_set (lua_State *L, Table *t, const TValue *key, TValue *value) {
+  const TValue *slot = luaH_get(t, key);
+  luaH_finishset(L, t, key, slot, value);
+}
+
+
+void luaH_setint (lua_State *L, Table *t, lua_Integer key, TValue *value) {
+  const TValue *p = luaH_getint(t, key);
+  if (isabstkey(p)) {
+    TValue k;
+    setivalue(&k, key);
+    luaH_newkey(L, t, &k, value);
+  }
+  else
+    setobj2t(L, cast(TValue *, p), value);
+}
+
+
+/*
+** Try to find a boundary in the hash part of table 't'. From the
+** caller, we know that 'j' is zero or present and that 'j + 1' is
+** present. We want to find a larger key that is absent from the
+** table, so that we can do a binary search between the two keys to
+** find a boundary. We keep doubling 'j' until we get an absent index.
+** If the doubling would overflow, we try LUA_MAXINTEGER. If it is
+** absent, we are ready for the binary search. ('j', being max integer,
+** is larger or equal to 'i', but it cannot be equal because it is
+** absent while 'i' is present; so 'j > i'.) Otherwise, 'j' is a
+** boundary. ('j + 1' cannot be a present integer key because it is
+** not a valid integer in Lua.)
+*/
+static lua_Unsigned hash_search (Table *t, lua_Unsigned j) {
+  lua_Unsigned i;
+  if (j == 0) j++;  /* the caller ensures 'j + 1' is present */
+  do {
+    i = j;  /* 'i' is a present index */
+    if (j <= l_castS2U(LUA_MAXINTEGER) / 2)
+      j *= 2;
+    else {
+      j = LUA_MAXINTEGER;
+      if (isempty(luaH_getint(t, j)))  /* t[j] not present? */
+        break;  /* 'j' now is an absent index */
+      else  /* weird case */
+        return j;  /* well, max integer is a boundary... */
+    }
+  } while (!isempty(luaH_getint(t, j)));  /* repeat until an absent t[j] */
+  /* i < j  &&  t[i] present  &&  t[j] absent */
+  while (j - i > 1u) {  /* do a binary search between them */
+    lua_Unsigned m = (i + j) / 2;
+    if (isempty(luaH_getint(t, m))) j = m;
+    else i = m;
+  }
+  return i;
+}
+
+
+static unsigned int binsearch (const TValue *array, unsigned int i,
+                                                    unsigned int j) {
+  while (j - i > 1u) {  /* binary search */
+    unsigned int m = (i + j) / 2;
+    if (isempty(&array[m - 1])) j = m;
+    else i = m;
+  }
+  return i;
+}
+
+
+/*
+** Try to find a boundary in table 't'. (A 'boundary' is an integer index
+** such that t[i] is present and t[i+1] is absent, or 0 if t[1] is absent
+** and 'maxinteger' if t[maxinteger] is present.)
+** (In the next explanation, we use Lua indices, that is, with base 1.
+** The code itself uses base 0 when indexing the array part of the table.)
+** The code starts with 'limit = t->alimit', a position in the array
+** part that may be a boundary.
+**
+** (1) If 't[limit]' is empty, there must be a boundary before it.
+** As a common case (e.g., after 't[#t]=nil'), check whether 'limit-1'
+** is present. If so, it is a boundary. Otherwise, do a binary search
+** between 0 and limit to find a boundary. In both cases, try to
+** use this boundary as the new 'alimit', as a hint for the next call.
+**
+** (2) If 't[limit]' is not empty and the array has more elements
+** after 'limit', try to find a boundary there. Again, try first
+** the special case (which should be quite frequent) where 'limit+1'
+** is empty, so that 'limit' is a boundary. Otherwise, check the
+** last element of the array part. If it is empty, there must be a
+** boundary between the old limit (present) and the last element
+** (absent), which is found with a binary search. (This boundary always
+** can be a new limit.)
+**
+** (3) The last case is when there are no elements in the array part
+** (limit == 0) or its last element (the new limit) is present.
+** In this case, must check the hash part. If there is no hash part
+** or 'limit+1' is absent, 'limit' is a boundary.  Otherwise, call
+** 'hash_search' to find a boundary in the hash part of the table.
+** (In those cases, the boundary is not inside the array part, and
+** therefore cannot be used as a new limit.)
+*/
+lua_Unsigned luaH_getn (Table *t) {
+  unsigned int limit = t->alimit;
+  if (limit > 0 && isempty(&t->array[limit - 1])) {  /* (1)? */
+    /* there must be a boundary before 'limit' */
+    if (limit >= 2 && !isempty(&t->array[limit - 2])) {
+      /* 'limit - 1' is a boundary; can it be a new limit? */
+      if (ispow2realasize(t) && !ispow2(limit - 1)) {
+        t->alimit = limit - 1;
+        setnorealasize(t);  /* now 'alimit' is not the real size */
+      }
+      return limit - 1;
+    }
+    else {  /* must search for a boundary in [0, limit] */
+      unsigned int boundary = binsearch(t->array, 0, limit);
+      /* can this boundary represent the real size of the array? */
+      if (ispow2realasize(t) && boundary > luaH_realasize(t) / 2) {
+        t->alimit = boundary;  /* use it as the new limit */
+        setnorealasize(t);
+      }
+      return boundary;
+    }
+  }
+  /* 'limit' is zero or present in table */
+  if (!limitequalsasize(t)) {  /* (2)? */
+    /* 'limit' > 0 and array has more elements after 'limit' */
+    if (isempty(&t->array[limit]))  /* 'limit + 1' is empty? */
+      return limit;  /* this is the boundary */
+    /* else, try last element in the array */
+    limit = luaH_realasize(t);
+    if (isempty(&t->array[limit - 1])) {  /* empty? */
+      /* there must be a boundary in the array after old limit,
+         and it must be a valid new limit */
+      unsigned int boundary = binsearch(t->array, t->alimit, limit);
+      t->alimit = boundary;
+      return boundary;
+    }
+    /* else, new limit is present in the table; check the hash part */
+  }
+  /* (3) 'limit' is the last element and either is zero or present in table */
+  lua_assert(limit == luaH_realasize(t) &&
+             (limit == 0 || !isempty(&t->array[limit - 1])));
+  if (isdummy(t) || isempty(luaH_getint(t, cast(lua_Integer, limit + 1))))
+    return limit;  /* 'limit + 1' is absent */
+  else  /* 'limit + 1' is also present */
+    return hash_search(t, limit);
+}
+
+
+
+#if defined(LUA_DEBUG)
+
+/* export these functions for the test library */
+
+Node *luaH_mainposition (const Table *t, const TValue *key) {
+  return mainpositionTV(t, key);
+}
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/ltable.h b/src/libs/3rdparty/lua/src/ltable.h
new file mode 100644
index 00000000000..75dd9e26e01
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ltable.h
@@ -0,0 +1,65 @@
+/*
+** $Id: ltable.h $
+** Lua tables (hash)
+** See Copyright Notice in lua.h
+*/
+
+#ifndef ltable_h
+#define ltable_h
+
+#include "lobject.h"
+
+
+#define gnode(t,i)	(&(t)->node[i])
+#define gval(n)		(&(n)->i_val)
+#define gnext(n)	((n)->u.next)
+
+
+/*
+** Clear all bits of fast-access metamethods, which means that the table
+** may have any of these metamethods. (First access that fails after the
+** clearing will set the bit again.)
+*/
+#define invalidateTMcache(t)	((t)->flags &= ~maskflags)
+
+
+/* true when 't' is using 'dummynode' as its hash part */
+#define isdummy(t)		((t)->lastfree == NULL)
+
+
+/* allocated size for hash nodes */
+#define allocsizenode(t)	(isdummy(t) ? 0 : sizenode(t))
+
+
+/* returns the Node, given the value of a table entry */
+#define nodefromval(v)	cast(Node *, (v))
+
+
+LUAI_FUNC const TValue *luaH_getint (Table *t, lua_Integer key);
+LUAI_FUNC void luaH_setint (lua_State *L, Table *t, lua_Integer key,
+                                                    TValue *value);
+LUAI_FUNC const TValue *luaH_getshortstr (Table *t, TString *key);
+LUAI_FUNC const TValue *luaH_getstr (Table *t, TString *key);
+LUAI_FUNC const TValue *luaH_get (Table *t, const TValue *key);
+LUAI_FUNC void luaH_newkey (lua_State *L, Table *t, const TValue *key,
+                                                    TValue *value);
+LUAI_FUNC void luaH_set (lua_State *L, Table *t, const TValue *key,
+                                                 TValue *value);
+LUAI_FUNC void luaH_finishset (lua_State *L, Table *t, const TValue *key,
+                                       const TValue *slot, TValue *value);
+LUAI_FUNC Table *luaH_new (lua_State *L);
+LUAI_FUNC void luaH_resize (lua_State *L, Table *t, unsigned int nasize,
+                                                    unsigned int nhsize);
+LUAI_FUNC void luaH_resizearray (lua_State *L, Table *t, unsigned int nasize);
+LUAI_FUNC void luaH_free (lua_State *L, Table *t);
+LUAI_FUNC int luaH_next (lua_State *L, Table *t, StkId key);
+LUAI_FUNC lua_Unsigned luaH_getn (Table *t);
+LUAI_FUNC unsigned int luaH_realasize (const Table *t);
+
+
+#if defined(LUA_DEBUG)
+LUAI_FUNC Node *luaH_mainposition (const Table *t, const TValue *key);
+#endif
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/ltablib.c b/src/libs/3rdparty/lua/src/ltablib.c
new file mode 100644
index 00000000000..e6bc4d04af4
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ltablib.c
@@ -0,0 +1,430 @@
+/*
+** $Id: ltablib.c $
+** Library for Table Manipulation
+** See Copyright Notice in lua.h
+*/
+
+#define ltablib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <limits.h>
+#include <stddef.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+/*
+** Operations that an object must define to mimic a table
+** (some functions only need some of them)
+*/
+#define TAB_R	1			/* read */
+#define TAB_W	2			/* write */
+#define TAB_L	4			/* length */
+#define TAB_RW	(TAB_R | TAB_W)		/* read/write */
+
+
+#define aux_getn(L,n,w)	(checktab(L, n, (w) | TAB_L), luaL_len(L, n))
+
+
+static int checkfield (lua_State *L, const char *key, int n) {
+  lua_pushstring(L, key);
+  return (lua_rawget(L, -n) != LUA_TNIL);
+}
+
+
+/*
+** Check that 'arg' either is a table or can behave like one (that is,
+** has a metatable with the required metamethods)
+*/
+static void checktab (lua_State *L, int arg, int what) {
+  if (lua_type(L, arg) != LUA_TTABLE) {  /* is it not a table? */
+    int n = 1;  /* number of elements to pop */
+    if (lua_getmetatable(L, arg) &&  /* must have metatable */
+        (!(what & TAB_R) || checkfield(L, "__index", ++n)) &&
+        (!(what & TAB_W) || checkfield(L, "__newindex", ++n)) &&
+        (!(what & TAB_L) || checkfield(L, "__len", ++n))) {
+      lua_pop(L, n);  /* pop metatable and tested metamethods */
+    }
+    else
+      luaL_checktype(L, arg, LUA_TTABLE);  /* force an error */
+  }
+}
+
+
+static int tinsert (lua_State *L) {
+  lua_Integer pos;  /* where to insert new element */
+  lua_Integer e = aux_getn(L, 1, TAB_RW);
+  e = luaL_intop(+, e, 1);  /* first empty element */
+  switch (lua_gettop(L)) {
+    case 2: {  /* called with only 2 arguments */
+      pos = e;  /* insert new element at the end */
+      break;
+    }
+    case 3: {
+      lua_Integer i;
+      pos = luaL_checkinteger(L, 2);  /* 2nd argument is the position */
+      /* check whether 'pos' is in [1, e] */
+      luaL_argcheck(L, (lua_Unsigned)pos - 1u < (lua_Unsigned)e, 2,
+                       "position out of bounds");
+      for (i = e; i > pos; i--) {  /* move up elements */
+        lua_geti(L, 1, i - 1);
+        lua_seti(L, 1, i);  /* t[i] = t[i - 1] */
+      }
+      break;
+    }
+    default: {
+      return luaL_error(L, "wrong number of arguments to 'insert'");
+    }
+  }
+  lua_seti(L, 1, pos);  /* t[pos] = v */
+  return 0;
+}
+
+
+static int tremove (lua_State *L) {
+  lua_Integer size = aux_getn(L, 1, TAB_RW);
+  lua_Integer pos = luaL_optinteger(L, 2, size);
+  if (pos != size)  /* validate 'pos' if given */
+    /* check whether 'pos' is in [1, size + 1] */
+    luaL_argcheck(L, (lua_Unsigned)pos - 1u <= (lua_Unsigned)size, 2,
+                     "position out of bounds");
+  lua_geti(L, 1, pos);  /* result = t[pos] */
+  for ( ; pos < size; pos++) {
+    lua_geti(L, 1, pos + 1);
+    lua_seti(L, 1, pos);  /* t[pos] = t[pos + 1] */
+  }
+  lua_pushnil(L);
+  lua_seti(L, 1, pos);  /* remove entry t[pos] */
+  return 1;
+}
+
+
+/*
+** Copy elements (1[f], ..., 1[e]) into (tt[t], tt[t+1], ...). Whenever
+** possible, copy in increasing order, which is better for rehashing.
+** "possible" means destination after original range, or smaller
+** than origin, or copying to another table.
+*/
+static int tmove (lua_State *L) {
+  lua_Integer f = luaL_checkinteger(L, 2);
+  lua_Integer e = luaL_checkinteger(L, 3);
+  lua_Integer t = luaL_checkinteger(L, 4);
+  int tt = !lua_isnoneornil(L, 5) ? 5 : 1;  /* destination table */
+  checktab(L, 1, TAB_R);
+  checktab(L, tt, TAB_W);
+  if (e >= f) {  /* otherwise, nothing to move */
+    lua_Integer n, i;
+    luaL_argcheck(L, f > 0 || e < LUA_MAXINTEGER + f, 3,
+                  "too many elements to move");
+    n = e - f + 1;  /* number of elements to move */
+    luaL_argcheck(L, t <= LUA_MAXINTEGER - n + 1, 4,
+                  "destination wrap around");
+    if (t > e || t <= f || (tt != 1 && !lua_compare(L, 1, tt, LUA_OPEQ))) {
+      for (i = 0; i < n; i++) {
+        lua_geti(L, 1, f + i);
+        lua_seti(L, tt, t + i);
+      }
+    }
+    else {
+      for (i = n - 1; i >= 0; i--) {
+        lua_geti(L, 1, f + i);
+        lua_seti(L, tt, t + i);
+      }
+    }
+  }
+  lua_pushvalue(L, tt);  /* return destination table */
+  return 1;
+}
+
+
+static void addfield (lua_State *L, luaL_Buffer *b, lua_Integer i) {
+  lua_geti(L, 1, i);
+  if (l_unlikely(!lua_isstring(L, -1)))
+    luaL_error(L, "invalid value (%s) at index %I in table for 'concat'",
+                  luaL_typename(L, -1), (LUAI_UACINT)i);
+  luaL_addvalue(b);
+}
+
+
+static int tconcat (lua_State *L) {
+  luaL_Buffer b;
+  lua_Integer last = aux_getn(L, 1, TAB_R);
+  size_t lsep;
+  const char *sep = luaL_optlstring(L, 2, "", &lsep);
+  lua_Integer i = luaL_optinteger(L, 3, 1);
+  last = luaL_optinteger(L, 4, last);
+  luaL_buffinit(L, &b);
+  for (; i < last; i++) {
+    addfield(L, &b, i);
+    luaL_addlstring(&b, sep, lsep);
+  }
+  if (i == last)  /* add last value (if interval was not empty) */
+    addfield(L, &b, i);
+  luaL_pushresult(&b);
+  return 1;
+}
+
+
+/*
+** {======================================================
+** Pack/unpack
+** =======================================================
+*/
+
+static int tpack (lua_State *L) {
+  int i;
+  int n = lua_gettop(L);  /* number of elements to pack */
+  lua_createtable(L, n, 1);  /* create result table */
+  lua_insert(L, 1);  /* put it at index 1 */
+  for (i = n; i >= 1; i--)  /* assign elements */
+    lua_seti(L, 1, i);
+  lua_pushinteger(L, n);
+  lua_setfield(L, 1, "n");  /* t.n = number of elements */
+  return 1;  /* return table */
+}
+
+
+static int tunpack (lua_State *L) {
+  lua_Unsigned n;
+  lua_Integer i = luaL_optinteger(L, 2, 1);
+  lua_Integer e = luaL_opt(L, luaL_checkinteger, 3, luaL_len(L, 1));
+  if (i > e) return 0;  /* empty range */
+  n = (lua_Unsigned)e - i;  /* number of elements minus 1 (avoid overflows) */
+  if (l_unlikely(n >= (unsigned int)INT_MAX  ||
+                 !lua_checkstack(L, (int)(++n))))
+    return luaL_error(L, "too many results to unpack");
+  for (; i < e; i++) {  /* push arg[i..e - 1] (to avoid overflows) */
+    lua_geti(L, 1, i);
+  }
+  lua_geti(L, 1, e);  /* push last element */
+  return (int)n;
+}
+
+/* }====================================================== */
+
+
+
+/*
+** {======================================================
+** Quicksort
+** (based on 'Algorithms in MODULA-3', Robert Sedgewick;
+**  Addison-Wesley, 1993.)
+** =======================================================
+*/
+
+
+/* type for array indices */
+typedef unsigned int IdxT;
+
+
+/*
+** Produce a "random" 'unsigned int' to randomize pivot choice. This
+** macro is used only when 'sort' detects a big imbalance in the result
+** of a partition. (If you don't want/need this "randomness", ~0 is a
+** good choice.)
+*/
+#if !defined(l_randomizePivot)		/* { */
+
+#include <time.h>
+
+/* size of 'e' measured in number of 'unsigned int's */
+#define sof(e)		(sizeof(e) / sizeof(unsigned int))
+
+/*
+** Use 'time' and 'clock' as sources of "randomness". Because we don't
+** know the types 'clock_t' and 'time_t', we cannot cast them to
+** anything without risking overflows. A safe way to use their values
+** is to copy them to an array of a known type and use the array values.
+*/
+static unsigned int l_randomizePivot (void) {
+  clock_t c = clock();
+  time_t t = time(NULL);
+  unsigned int buff[sof(c) + sof(t)];
+  unsigned int i, rnd = 0;
+  memcpy(buff, &c, sof(c) * sizeof(unsigned int));
+  memcpy(buff + sof(c), &t, sof(t) * sizeof(unsigned int));
+  for (i = 0; i < sof(buff); i++)
+    rnd += buff[i];
+  return rnd;
+}
+
+#endif					/* } */
+
+
+/* arrays larger than 'RANLIMIT' may use randomized pivots */
+#define RANLIMIT	100u
+
+
+static void set2 (lua_State *L, IdxT i, IdxT j) {
+  lua_seti(L, 1, i);
+  lua_seti(L, 1, j);
+}
+
+
+/*
+** Return true iff value at stack index 'a' is less than the value at
+** index 'b' (according to the order of the sort).
+*/
+static int sort_comp (lua_State *L, int a, int b) {
+  if (lua_isnil(L, 2))  /* no function? */
+    return lua_compare(L, a, b, LUA_OPLT);  /* a < b */
+  else {  /* function */
+    int res;
+    lua_pushvalue(L, 2);    /* push function */
+    lua_pushvalue(L, a-1);  /* -1 to compensate function */
+    lua_pushvalue(L, b-2);  /* -2 to compensate function and 'a' */
+    lua_call(L, 2, 1);      /* call function */
+    res = lua_toboolean(L, -1);  /* get result */
+    lua_pop(L, 1);          /* pop result */
+    return res;
+  }
+}
+
+
+/*
+** Does the partition: Pivot P is at the top of the stack.
+** precondition: a[lo] <= P == a[up-1] <= a[up],
+** so it only needs to do the partition from lo + 1 to up - 2.
+** Pos-condition: a[lo .. i - 1] <= a[i] == P <= a[i + 1 .. up]
+** returns 'i'.
+*/
+static IdxT partition (lua_State *L, IdxT lo, IdxT up) {
+  IdxT i = lo;  /* will be incremented before first use */
+  IdxT j = up - 1;  /* will be decremented before first use */
+  /* loop invariant: a[lo .. i] <= P <= a[j .. up] */
+  for (;;) {
+    /* next loop: repeat ++i while a[i] < P */
+    while ((void)lua_geti(L, 1, ++i), sort_comp(L, -1, -2)) {
+      if (l_unlikely(i == up - 1))  /* a[i] < P  but a[up - 1] == P  ?? */
+        luaL_error(L, "invalid order function for sorting");
+      lua_pop(L, 1);  /* remove a[i] */
+    }
+    /* after the loop, a[i] >= P and a[lo .. i - 1] < P */
+    /* next loop: repeat --j while P < a[j] */
+    while ((void)lua_geti(L, 1, --j), sort_comp(L, -3, -1)) {
+      if (l_unlikely(j < i))  /* j < i  but  a[j] > P ?? */
+        luaL_error(L, "invalid order function for sorting");
+      lua_pop(L, 1);  /* remove a[j] */
+    }
+    /* after the loop, a[j] <= P and a[j + 1 .. up] >= P */
+    if (j < i) {  /* no elements out of place? */
+      /* a[lo .. i - 1] <= P <= a[j + 1 .. i .. up] */
+      lua_pop(L, 1);  /* pop a[j] */
+      /* swap pivot (a[up - 1]) with a[i] to satisfy pos-condition */
+      set2(L, up - 1, i);
+      return i;
+    }
+    /* otherwise, swap a[i] - a[j] to restore invariant and repeat */
+    set2(L, i, j);
+  }
+}
+
+
+/*
+** Choose an element in the middle (2nd-3th quarters) of [lo,up]
+** "randomized" by 'rnd'
+*/
+static IdxT choosePivot (IdxT lo, IdxT up, unsigned int rnd) {
+  IdxT r4 = (up - lo) / 4;  /* range/4 */
+  IdxT p = rnd % (r4 * 2) + (lo + r4);
+  lua_assert(lo + r4 <= p && p <= up - r4);
+  return p;
+}
+
+
+/*
+** Quicksort algorithm (recursive function)
+*/
+static void auxsort (lua_State *L, IdxT lo, IdxT up,
+                                   unsigned int rnd) {
+  while (lo < up) {  /* loop for tail recursion */
+    IdxT p;  /* Pivot index */
+    IdxT n;  /* to be used later */
+    /* sort elements 'lo', 'p', and 'up' */
+    lua_geti(L, 1, lo);
+    lua_geti(L, 1, up);
+    if (sort_comp(L, -1, -2))  /* a[up] < a[lo]? */
+      set2(L, lo, up);  /* swap a[lo] - a[up] */
+    else
+      lua_pop(L, 2);  /* remove both values */
+    if (up - lo == 1)  /* only 2 elements? */
+      return;  /* already sorted */
+    if (up - lo < RANLIMIT || rnd == 0)  /* small interval or no randomize? */
+      p = (lo + up)/2;  /* middle element is a good pivot */
+    else  /* for larger intervals, it is worth a random pivot */
+      p = choosePivot(lo, up, rnd);
+    lua_geti(L, 1, p);
+    lua_geti(L, 1, lo);
+    if (sort_comp(L, -2, -1))  /* a[p] < a[lo]? */
+      set2(L, p, lo);  /* swap a[p] - a[lo] */
+    else {
+      lua_pop(L, 1);  /* remove a[lo] */
+      lua_geti(L, 1, up);
+      if (sort_comp(L, -1, -2))  /* a[up] < a[p]? */
+        set2(L, p, up);  /* swap a[up] - a[p] */
+      else
+        lua_pop(L, 2);
+    }
+    if (up - lo == 2)  /* only 3 elements? */
+      return;  /* already sorted */
+    lua_geti(L, 1, p);  /* get middle element (Pivot) */
+    lua_pushvalue(L, -1);  /* push Pivot */
+    lua_geti(L, 1, up - 1);  /* push a[up - 1] */
+    set2(L, p, up - 1);  /* swap Pivot (a[p]) with a[up - 1] */
+    p = partition(L, lo, up);
+    /* a[lo .. p - 1] <= a[p] == P <= a[p + 1 .. up] */
+    if (p - lo < up - p) {  /* lower interval is smaller? */
+      auxsort(L, lo, p - 1, rnd);  /* call recursively for lower interval */
+      n = p - lo;  /* size of smaller interval */
+      lo = p + 1;  /* tail call for [p + 1 .. up] (upper interval) */
+    }
+    else {
+      auxsort(L, p + 1, up, rnd);  /* call recursively for upper interval */
+      n = up - p;  /* size of smaller interval */
+      up = p - 1;  /* tail call for [lo .. p - 1]  (lower interval) */
+    }
+    if ((up - lo) / 128 > n) /* partition too imbalanced? */
+      rnd = l_randomizePivot();  /* try a new randomization */
+  }  /* tail call auxsort(L, lo, up, rnd) */
+}
+
+
+static int sort (lua_State *L) {
+  lua_Integer n = aux_getn(L, 1, TAB_RW);
+  if (n > 1) {  /* non-trivial interval? */
+    luaL_argcheck(L, n < INT_MAX, 1, "array too big");
+    if (!lua_isnoneornil(L, 2))  /* is there a 2nd argument? */
+      luaL_checktype(L, 2, LUA_TFUNCTION);  /* must be a function */
+    lua_settop(L, 2);  /* make sure there are two arguments */
+    auxsort(L, 1, (IdxT)n, 0);
+  }
+  return 0;
+}
+
+/* }====================================================== */
+
+
+static const luaL_Reg tab_funcs[] = {
+  {"concat", tconcat},
+  {"insert", tinsert},
+  {"pack", tpack},
+  {"unpack", tunpack},
+  {"remove", tremove},
+  {"move", tmove},
+  {"sort", sort},
+  {NULL, NULL}
+};
+
+
+LUAMOD_API int luaopen_table (lua_State *L) {
+  luaL_newlib(L, tab_funcs);
+  return 1;
+}
+
diff --git a/src/libs/3rdparty/lua/src/ltm.c b/src/libs/3rdparty/lua/src/ltm.c
new file mode 100644
index 00000000000..07a060811d5
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ltm.c
@@ -0,0 +1,271 @@
+/*
+** $Id: ltm.c $
+** Tag methods
+** See Copyright Notice in lua.h
+*/
+
+#define ltm_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <string.h>
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lgc.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+#include "lvm.h"
+
+
+static const char udatatypename[] = "userdata";
+
+LUAI_DDEF const char *const luaT_typenames_[LUA_TOTALTYPES] = {
+  "no value",
+  "nil", "boolean", udatatypename, "number",
+  "string", "table", "function", udatatypename, "thread",
+  "upvalue", "proto" /* these last cases are used for tests only */
+};
+
+
+void luaT_init (lua_State *L) {
+  static const char *const luaT_eventname[] = {  /* ORDER TM */
+    "__index", "__newindex",
+    "__gc", "__mode", "__len", "__eq",
+    "__add", "__sub", "__mul", "__mod", "__pow",
+    "__div", "__idiv",
+    "__band", "__bor", "__bxor", "__shl", "__shr",
+    "__unm", "__bnot", "__lt", "__le",
+    "__concat", "__call", "__close"
+  };
+  int i;
+  for (i=0; i<TM_N; i++) {
+    G(L)->tmname[i] = luaS_new(L, luaT_eventname[i]);
+    luaC_fix(L, obj2gco(G(L)->tmname[i]));  /* never collect these names */
+  }
+}
+
+
+/*
+** function to be used with macro "fasttm": optimized for absence of
+** tag methods
+*/
+const TValue *luaT_gettm (Table *events, TMS event, TString *ename) {
+  const TValue *tm = luaH_getshortstr(events, ename);
+  lua_assert(event <= TM_EQ);
+  if (notm(tm)) {  /* no tag method? */
+    events->flags |= cast_byte(1u<<event);  /* cache this fact */
+    return NULL;
+  }
+  else return tm;
+}
+
+
+const TValue *luaT_gettmbyobj (lua_State *L, const TValue *o, TMS event) {
+  Table *mt;
+  switch (ttype(o)) {
+    case LUA_TTABLE:
+      mt = hvalue(o)->metatable;
+      break;
+    case LUA_TUSERDATA:
+      mt = uvalue(o)->metatable;
+      break;
+    default:
+      mt = G(L)->mt[ttype(o)];
+  }
+  return (mt ? luaH_getshortstr(mt, G(L)->tmname[event]) : &G(L)->nilvalue);
+}
+
+
+/*
+** Return the name of the type of an object. For tables and userdata
+** with metatable, use their '__name' metafield, if present.
+*/
+const char *luaT_objtypename (lua_State *L, const TValue *o) {
+  Table *mt;
+  if ((ttistable(o) && (mt = hvalue(o)->metatable) != NULL) ||
+      (ttisfulluserdata(o) && (mt = uvalue(o)->metatable) != NULL)) {
+    const TValue *name = luaH_getshortstr(mt, luaS_new(L, "__name"));
+    if (ttisstring(name))  /* is '__name' a string? */
+      return getstr(tsvalue(name));  /* use it as type name */
+  }
+  return ttypename(ttype(o));  /* else use standard type name */
+}
+
+
+void luaT_callTM (lua_State *L, const TValue *f, const TValue *p1,
+                  const TValue *p2, const TValue *p3) {
+  StkId func = L->top.p;
+  setobj2s(L, func, f);  /* push function (assume EXTRA_STACK) */
+  setobj2s(L, func + 1, p1);  /* 1st argument */
+  setobj2s(L, func + 2, p2);  /* 2nd argument */
+  setobj2s(L, func + 3, p3);  /* 3rd argument */
+  L->top.p = func + 4;
+  /* metamethod may yield only when called from Lua code */
+  if (isLuacode(L->ci))
+    luaD_call(L, func, 0);
+  else
+    luaD_callnoyield(L, func, 0);
+}
+
+
+void luaT_callTMres (lua_State *L, const TValue *f, const TValue *p1,
+                     const TValue *p2, StkId res) {
+  ptrdiff_t result = savestack(L, res);
+  StkId func = L->top.p;
+  setobj2s(L, func, f);  /* push function (assume EXTRA_STACK) */
+  setobj2s(L, func + 1, p1);  /* 1st argument */
+  setobj2s(L, func + 2, p2);  /* 2nd argument */
+  L->top.p += 3;
+  /* metamethod may yield only when called from Lua code */
+  if (isLuacode(L->ci))
+    luaD_call(L, func, 1);
+  else
+    luaD_callnoyield(L, func, 1);
+  res = restorestack(L, result);
+  setobjs2s(L, res, --L->top.p);  /* move result to its place */
+}
+
+
+static int callbinTM (lua_State *L, const TValue *p1, const TValue *p2,
+                      StkId res, TMS event) {
+  const TValue *tm = luaT_gettmbyobj(L, p1, event);  /* try first operand */
+  if (notm(tm))
+    tm = luaT_gettmbyobj(L, p2, event);  /* try second operand */
+  if (notm(tm)) return 0;
+  luaT_callTMres(L, tm, p1, p2, res);
+  return 1;
+}
+
+
+void luaT_trybinTM (lua_State *L, const TValue *p1, const TValue *p2,
+                    StkId res, TMS event) {
+  if (l_unlikely(!callbinTM(L, p1, p2, res, event))) {
+    switch (event) {
+      case TM_BAND: case TM_BOR: case TM_BXOR:
+      case TM_SHL: case TM_SHR: case TM_BNOT: {
+        if (ttisnumber(p1) && ttisnumber(p2))
+          luaG_tointerror(L, p1, p2);
+        else
+          luaG_opinterror(L, p1, p2, "perform bitwise operation on");
+      }
+      /* calls never return, but to avoid warnings: *//* FALLTHROUGH */
+      default:
+        luaG_opinterror(L, p1, p2, "perform arithmetic on");
+    }
+  }
+}
+
+
+void luaT_tryconcatTM (lua_State *L) {
+  StkId top = L->top.p;
+  if (l_unlikely(!callbinTM(L, s2v(top - 2), s2v(top - 1), top - 2,
+                               TM_CONCAT)))
+    luaG_concaterror(L, s2v(top - 2), s2v(top - 1));
+}
+
+
+void luaT_trybinassocTM (lua_State *L, const TValue *p1, const TValue *p2,
+                                       int flip, StkId res, TMS event) {
+  if (flip)
+    luaT_trybinTM(L, p2, p1, res, event);
+  else
+    luaT_trybinTM(L, p1, p2, res, event);
+}
+
+
+void luaT_trybiniTM (lua_State *L, const TValue *p1, lua_Integer i2,
+                                   int flip, StkId res, TMS event) {
+  TValue aux;
+  setivalue(&aux, i2);
+  luaT_trybinassocTM(L, p1, &aux, flip, res, event);
+}
+
+
+/*
+** Calls an order tag method.
+** For lessequal, LUA_COMPAT_LT_LE keeps compatibility with old
+** behavior: if there is no '__le', try '__lt', based on l <= r iff
+** !(r < l) (assuming a total order). If the metamethod yields during
+** this substitution, the continuation has to know about it (to negate
+** the result of r<l); bit CIST_LEQ in the call status keeps that
+** information.
+*/
+int luaT_callorderTM (lua_State *L, const TValue *p1, const TValue *p2,
+                      TMS event) {
+  if (callbinTM(L, p1, p2, L->top.p, event))  /* try original event */
+    return !l_isfalse(s2v(L->top.p));
+#if defined(LUA_COMPAT_LT_LE)
+  else if (event == TM_LE) {
+      /* try '!(p2 < p1)' for '(p1 <= p2)' */
+      L->ci->callstatus |= CIST_LEQ;  /* mark it is doing 'lt' for 'le' */
+      if (callbinTM(L, p2, p1, L->top.p, TM_LT)) {
+        L->ci->callstatus ^= CIST_LEQ;  /* clear mark */
+        return l_isfalse(s2v(L->top.p));
+      }
+      /* else error will remove this 'ci'; no need to clear mark */
+  }
+#endif
+  luaG_ordererror(L, p1, p2);  /* no metamethod found */
+  return 0;  /* to avoid warnings */
+}
+
+
+int luaT_callorderiTM (lua_State *L, const TValue *p1, int v2,
+                       int flip, int isfloat, TMS event) {
+  TValue aux; const TValue *p2;
+  if (isfloat) {
+    setfltvalue(&aux, cast_num(v2));
+  }
+  else
+    setivalue(&aux, v2);
+  if (flip) {  /* arguments were exchanged? */
+    p2 = p1; p1 = &aux;  /* correct them */
+  }
+  else
+    p2 = &aux;
+  return luaT_callorderTM(L, p1, p2, event);
+}
+
+
+void luaT_adjustvarargs (lua_State *L, int nfixparams, CallInfo *ci,
+                         const Proto *p) {
+  int i;
+  int actual = cast_int(L->top.p - ci->func.p) - 1;  /* number of arguments */
+  int nextra = actual - nfixparams;  /* number of extra arguments */
+  ci->u.l.nextraargs = nextra;
+  luaD_checkstack(L, p->maxstacksize + 1);
+  /* copy function to the top of the stack */
+  setobjs2s(L, L->top.p++, ci->func.p);
+  /* move fixed parameters to the top of the stack */
+  for (i = 1; i <= nfixparams; i++) {
+    setobjs2s(L, L->top.p++, ci->func.p + i);
+    setnilvalue(s2v(ci->func.p + i));  /* erase original parameter (for GC) */
+  }
+  ci->func.p += actual + 1;
+  ci->top.p += actual + 1;
+  lua_assert(L->top.p <= ci->top.p && ci->top.p <= L->stack_last.p);
+}
+
+
+void luaT_getvarargs (lua_State *L, CallInfo *ci, StkId where, int wanted) {
+  int i;
+  int nextra = ci->u.l.nextraargs;
+  if (wanted < 0) {
+    wanted = nextra;  /* get all extra arguments available */
+    checkstackGCp(L, nextra, where);  /* ensure stack space */
+    L->top.p = where + nextra;  /* next instruction will need top */
+  }
+  for (i = 0; i < wanted && i < nextra; i++)
+    setobjs2s(L, where + i, ci->func.p - nextra + i);
+  for (; i < wanted; i++)   /* complete required results with nil */
+    setnilvalue(s2v(where + i));
+}
+
diff --git a/src/libs/3rdparty/lua/src/ltm.h b/src/libs/3rdparty/lua/src/ltm.h
new file mode 100644
index 00000000000..c309e2ae10e
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/ltm.h
@@ -0,0 +1,104 @@
+/*
+** $Id: ltm.h $
+** Tag methods
+** See Copyright Notice in lua.h
+*/
+
+#ifndef ltm_h
+#define ltm_h
+
+
+#include "lobject.h"
+#include "lstate.h"
+
+
+/*
+* WARNING: if you change the order of this enumeration,
+* grep "ORDER TM" and "ORDER OP"
+*/
+typedef enum {
+  TM_INDEX,
+  TM_NEWINDEX,
+  TM_GC,
+  TM_MODE,
+  TM_LEN,
+  TM_EQ,  /* last tag method with fast access */
+  TM_ADD,
+  TM_SUB,
+  TM_MUL,
+  TM_MOD,
+  TM_POW,
+  TM_DIV,
+  TM_IDIV,
+  TM_BAND,
+  TM_BOR,
+  TM_BXOR,
+  TM_SHL,
+  TM_SHR,
+  TM_UNM,
+  TM_BNOT,
+  TM_LT,
+  TM_LE,
+  TM_CONCAT,
+  TM_CALL,
+  TM_CLOSE,
+  TM_N		/* number of elements in the enum */
+} TMS;
+
+
+/*
+** Mask with 1 in all fast-access methods. A 1 in any of these bits
+** in the flag of a (meta)table means the metatable does not have the
+** corresponding metamethod field. (Bit 7 of the flag is used for
+** 'isrealasize'.)
+*/
+#define maskflags	(~(~0u << (TM_EQ + 1)))
+
+
+/*
+** Test whether there is no tagmethod.
+** (Because tagmethods use raw accesses, the result may be an "empty" nil.)
+*/
+#define notm(tm)	ttisnil(tm)
+
+
+#define gfasttm(g,et,e) ((et) == NULL ? NULL : \
+  ((et)->flags & (1u<<(e))) ? NULL : luaT_gettm(et, e, (g)->tmname[e]))
+
+#define fasttm(l,et,e)	gfasttm(G(l), et, e)
+
+#define ttypename(x)	luaT_typenames_[(x) + 1]
+
+LUAI_DDEC(const char *const luaT_typenames_[LUA_TOTALTYPES];)
+
+
+LUAI_FUNC const char *luaT_objtypename (lua_State *L, const TValue *o);
+
+LUAI_FUNC const TValue *luaT_gettm (Table *events, TMS event, TString *ename);
+LUAI_FUNC const TValue *luaT_gettmbyobj (lua_State *L, const TValue *o,
+                                                       TMS event);
+LUAI_FUNC void luaT_init (lua_State *L);
+
+LUAI_FUNC void luaT_callTM (lua_State *L, const TValue *f, const TValue *p1,
+                            const TValue *p2, const TValue *p3);
+LUAI_FUNC void luaT_callTMres (lua_State *L, const TValue *f,
+                            const TValue *p1, const TValue *p2, StkId p3);
+LUAI_FUNC void luaT_trybinTM (lua_State *L, const TValue *p1, const TValue *p2,
+                              StkId res, TMS event);
+LUAI_FUNC void luaT_tryconcatTM (lua_State *L);
+LUAI_FUNC void luaT_trybinassocTM (lua_State *L, const TValue *p1,
+       const TValue *p2, int inv, StkId res, TMS event);
+LUAI_FUNC void luaT_trybiniTM (lua_State *L, const TValue *p1, lua_Integer i2,
+                               int inv, StkId res, TMS event);
+LUAI_FUNC int luaT_callorderTM (lua_State *L, const TValue *p1,
+                                const TValue *p2, TMS event);
+LUAI_FUNC int luaT_callorderiTM (lua_State *L, const TValue *p1, int v2,
+                                 int inv, int isfloat, TMS event);
+
+LUAI_FUNC void luaT_adjustvarargs (lua_State *L, int nfixparams,
+                                   CallInfo *ci, const Proto *p);
+LUAI_FUNC void luaT_getvarargs (lua_State *L, CallInfo *ci,
+                                              StkId where, int wanted);
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lua.c b/src/libs/3rdparty/lua/src/lua.c
new file mode 100644
index 00000000000..0ff88454530
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lua.c
@@ -0,0 +1,679 @@
+/*
+** $Id: lua.c $
+** Lua stand-alone interpreter
+** See Copyright Notice in lua.h
+*/
+
+#define lua_c
+
+#include "lprefix.h"
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <signal.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+#if !defined(LUA_PROGNAME)
+#define LUA_PROGNAME		"lua"
+#endif
+
+#if !defined(LUA_INIT_VAR)
+#define LUA_INIT_VAR		"LUA_INIT"
+#endif
+
+#define LUA_INITVARVERSION	LUA_INIT_VAR LUA_VERSUFFIX
+
+
+static lua_State *globalL = NULL;
+
+static const char *progname = LUA_PROGNAME;
+
+
+#if defined(LUA_USE_POSIX)   /* { */
+
+/*
+** Use 'sigaction' when available.
+*/
+static void setsignal (int sig, void (*handler)(int)) {
+  struct sigaction sa;
+  sa.sa_handler = handler;
+  sa.sa_flags = 0;
+  sigemptyset(&sa.sa_mask);  /* do not mask any signal */
+  sigaction(sig, &sa, NULL);
+}
+
+#else           /* }{ */
+
+#define setsignal            signal
+
+#endif                               /* } */
+
+
+/*
+** Hook set by signal function to stop the interpreter.
+*/
+static void lstop (lua_State *L, lua_Debug *ar) {
+  (void)ar;  /* unused arg. */
+  lua_sethook(L, NULL, 0, 0);  /* reset hook */
+  luaL_error(L, "interrupted!");
+}
+
+
+/*
+** Function to be called at a C signal. Because a C signal cannot
+** just change a Lua state (as there is no proper synchronization),
+** this function only sets a hook that, when called, will stop the
+** interpreter.
+*/
+static void laction (int i) {
+  int flag = LUA_MASKCALL | LUA_MASKRET | LUA_MASKLINE | LUA_MASKCOUNT;
+  setsignal(i, SIG_DFL); /* if another SIGINT happens, terminate process */
+  lua_sethook(globalL, lstop, flag, 1);
+}
+
+
+static void print_usage (const char *badoption) {
+  lua_writestringerror("%s: ", progname);
+  if (badoption[1] == 'e' || badoption[1] == 'l')
+    lua_writestringerror("'%s' needs argument\n", badoption);
+  else
+    lua_writestringerror("unrecognized option '%s'\n", badoption);
+  lua_writestringerror(
+  "usage: %s [options] [script [args]]\n"
+  "Available options are:\n"
+  "  -e stat   execute string 'stat'\n"
+  "  -i        enter interactive mode after executing 'script'\n"
+  "  -l mod    require library 'mod' into global 'mod'\n"
+  "  -l g=mod  require library 'mod' into global 'g'\n"
+  "  -v        show version information\n"
+  "  -E        ignore environment variables\n"
+  "  -W        turn warnings on\n"
+  "  --        stop handling options\n"
+  "  -         stop handling options and execute stdin\n"
+  ,
+  progname);
+}
+
+
+/*
+** Prints an error message, adding the program name in front of it
+** (if present)
+*/
+static void l_message (const char *pname, const char *msg) {
+  if (pname) lua_writestringerror("%s: ", pname);
+  lua_writestringerror("%s\n", msg);
+}
+
+
+/*
+** Check whether 'status' is not OK and, if so, prints the error
+** message on the top of the stack. It assumes that the error object
+** is a string, as it was either generated by Lua or by 'msghandler'.
+*/
+static int report (lua_State *L, int status) {
+  if (status != LUA_OK) {
+    const char *msg = lua_tostring(L, -1);
+    l_message(progname, msg);
+    lua_pop(L, 1);  /* remove message */
+  }
+  return status;
+}
+
+
+/*
+** Message handler used to run all chunks
+*/
+static int msghandler (lua_State *L) {
+  const char *msg = lua_tostring(L, 1);
+  if (msg == NULL) {  /* is error object not a string? */
+    if (luaL_callmeta(L, 1, "__tostring") &&  /* does it have a metamethod */
+        lua_type(L, -1) == LUA_TSTRING)  /* that produces a string? */
+      return 1;  /* that is the message */
+    else
+      msg = lua_pushfstring(L, "(error object is a %s value)",
+                               luaL_typename(L, 1));
+  }
+  luaL_traceback(L, L, msg, 1);  /* append a standard traceback */
+  return 1;  /* return the traceback */
+}
+
+
+/*
+** Interface to 'lua_pcall', which sets appropriate message function
+** and C-signal handler. Used to run all chunks.
+*/
+static int docall (lua_State *L, int narg, int nres) {
+  int status;
+  int base = lua_gettop(L) - narg;  /* function index */
+  lua_pushcfunction(L, msghandler);  /* push message handler */
+  lua_insert(L, base);  /* put it under function and args */
+  globalL = L;  /* to be available to 'laction' */
+  setsignal(SIGINT, laction);  /* set C-signal handler */
+  status = lua_pcall(L, narg, nres, base);
+  setsignal(SIGINT, SIG_DFL); /* reset C-signal handler */
+  lua_remove(L, base);  /* remove message handler from the stack */
+  return status;
+}
+
+
+static void print_version (void) {
+  lua_writestring(LUA_COPYRIGHT, strlen(LUA_COPYRIGHT));
+  lua_writeline();
+}
+
+
+/*
+** Create the 'arg' table, which stores all arguments from the
+** command line ('argv'). It should be aligned so that, at index 0,
+** it has 'argv[script]', which is the script name. The arguments
+** to the script (everything after 'script') go to positive indices;
+** other arguments (before the script name) go to negative indices.
+** If there is no script name, assume interpreter's name as base.
+** (If there is no interpreter's name either, 'script' is -1, so
+** table sizes are zero.)
+*/
+static void createargtable (lua_State *L, char **argv, int argc, int script) {
+  int i, narg;
+  narg = argc - (script + 1);  /* number of positive indices */
+  lua_createtable(L, narg, script + 1);
+  for (i = 0; i < argc; i++) {
+    lua_pushstring(L, argv[i]);
+    lua_rawseti(L, -2, i - script);
+  }
+  lua_setglobal(L, "arg");
+}
+
+
+static int dochunk (lua_State *L, int status) {
+  if (status == LUA_OK) status = docall(L, 0, 0);
+  return report(L, status);
+}
+
+
+static int dofile (lua_State *L, const char *name) {
+  return dochunk(L, luaL_loadfile(L, name));
+}
+
+
+static int dostring (lua_State *L, const char *s, const char *name) {
+  return dochunk(L, luaL_loadbuffer(L, s, strlen(s), name));
+}
+
+
+/*
+** Receives 'globname[=modname]' and runs 'globname = require(modname)'.
+*/
+static int dolibrary (lua_State *L, char *globname) {
+  int status;
+  char *modname = strchr(globname, '=');
+  if (modname == NULL)  /* no explicit name? */
+    modname = globname;  /* module name is equal to global name */
+  else {
+    *modname = '\0';  /* global name ends here */
+    modname++;  /* module name starts after the '=' */
+  }
+  lua_getglobal(L, "require");
+  lua_pushstring(L, modname);
+  status = docall(L, 1, 1);  /* call 'require(modname)' */
+  if (status == LUA_OK)
+    lua_setglobal(L, globname);  /* globname = require(modname) */
+  return report(L, status);
+}
+
+
+/*
+** Push on the stack the contents of table 'arg' from 1 to #arg
+*/
+static int pushargs (lua_State *L) {
+  int i, n;
+  if (lua_getglobal(L, "arg") != LUA_TTABLE)
+    luaL_error(L, "'arg' is not a table");
+  n = (int)luaL_len(L, -1);
+  luaL_checkstack(L, n + 3, "too many arguments to script");
+  for (i = 1; i <= n; i++)
+    lua_rawgeti(L, -i, i);
+  lua_remove(L, -i);  /* remove table from the stack */
+  return n;
+}
+
+
+static int handle_script (lua_State *L, char **argv) {
+  int status;
+  const char *fname = argv[0];
+  if (strcmp(fname, "-") == 0 && strcmp(argv[-1], "--") != 0)
+    fname = NULL;  /* stdin */
+  status = luaL_loadfile(L, fname);
+  if (status == LUA_OK) {
+    int n = pushargs(L);  /* push arguments to script */
+    status = docall(L, n, LUA_MULTRET);
+  }
+  return report(L, status);
+}
+
+
+/* bits of various argument indicators in 'args' */
+#define has_error	1	/* bad option */
+#define has_i		2	/* -i */
+#define has_v		4	/* -v */
+#define has_e		8	/* -e */
+#define has_E		16	/* -E */
+
+
+/*
+** Traverses all arguments from 'argv', returning a mask with those
+** needed before running any Lua code or an error code if it finds any
+** invalid argument. In case of error, 'first' is the index of the bad
+** argument.  Otherwise, 'first' is -1 if there is no program name,
+** 0 if there is no script name, or the index of the script name.
+*/
+static int collectargs (char **argv, int *first) {
+  int args = 0;
+  int i;
+  if (argv[0] != NULL) {  /* is there a program name? */
+    if (argv[0][0])  /* not empty? */
+      progname = argv[0];  /* save it */
+  }
+  else {  /* no program name */
+    *first = -1;
+    return 0;
+  }
+  for (i = 1; argv[i] != NULL; i++) {  /* handle arguments */
+    *first = i;
+    if (argv[i][0] != '-')  /* not an option? */
+        return args;  /* stop handling options */
+    switch (argv[i][1]) {  /* else check option */
+      case '-':  /* '--' */
+        if (argv[i][2] != '\0')  /* extra characters after '--'? */
+          return has_error;  /* invalid option */
+        *first = i + 1;
+        return args;
+      case '\0':  /* '-' */
+        return args;  /* script "name" is '-' */
+      case 'E':
+        if (argv[i][2] != '\0')  /* extra characters? */
+          return has_error;  /* invalid option */
+        args |= has_E;
+        break;
+      case 'W':
+        if (argv[i][2] != '\0')  /* extra characters? */
+          return has_error;  /* invalid option */
+        break;
+      case 'i':
+        args |= has_i;  /* (-i implies -v) *//* FALLTHROUGH */
+      case 'v':
+        if (argv[i][2] != '\0')  /* extra characters? */
+          return has_error;  /* invalid option */
+        args |= has_v;
+        break;
+      case 'e':
+        args |= has_e;  /* FALLTHROUGH */
+      case 'l':  /* both options need an argument */
+        if (argv[i][2] == '\0') {  /* no concatenated argument? */
+          i++;  /* try next 'argv' */
+          if (argv[i] == NULL || argv[i][0] == '-')
+            return has_error;  /* no next argument or it is another option */
+        }
+        break;
+      default:  /* invalid option */
+        return has_error;
+    }
+  }
+  *first = 0;  /* no script name */
+  return args;
+}
+
+
+/*
+** Processes options 'e' and 'l', which involve running Lua code, and
+** 'W', which also affects the state.
+** Returns 0 if some code raises an error.
+*/
+static int runargs (lua_State *L, char **argv, int n) {
+  int i;
+  for (i = 1; i < n; i++) {
+    int option = argv[i][1];
+    lua_assert(argv[i][0] == '-');  /* already checked */
+    switch (option) {
+      case 'e':  case 'l': {
+        int status;
+        char *extra = argv[i] + 2;  /* both options need an argument */
+        if (*extra == '\0') extra = argv[++i];
+        lua_assert(extra != NULL);
+        status = (option == 'e')
+                 ? dostring(L, extra, "=(command line)")
+                 : dolibrary(L, extra);
+        if (status != LUA_OK) return 0;
+        break;
+      }
+      case 'W':
+        lua_warning(L, "@on", 0);  /* warnings on */
+        break;
+    }
+  }
+  return 1;
+}
+
+
+static int handle_luainit (lua_State *L) {
+  const char *name = "=" LUA_INITVARVERSION;
+  const char *init = getenv(name + 1);
+  if (init == NULL) {
+    name = "=" LUA_INIT_VAR;
+    init = getenv(name + 1);  /* try alternative name */
+  }
+  if (init == NULL) return LUA_OK;
+  else if (init[0] == '@')
+    return dofile(L, init+1);
+  else
+    return dostring(L, init, name);
+}
+
+
+/*
+** {==================================================================
+** Read-Eval-Print Loop (REPL)
+** ===================================================================
+*/
+
+#if !defined(LUA_PROMPT)
+#define LUA_PROMPT		"> "
+#define LUA_PROMPT2		">> "
+#endif
+
+#if !defined(LUA_MAXINPUT)
+#define LUA_MAXINPUT		512
+#endif
+
+
+/*
+** lua_stdin_is_tty detects whether the standard input is a 'tty' (that
+** is, whether we're running lua interactively).
+*/
+#if !defined(lua_stdin_is_tty)	/* { */
+
+#if defined(LUA_USE_POSIX)	/* { */
+
+#include <unistd.h>
+#define lua_stdin_is_tty()	isatty(0)
+
+#elif defined(LUA_USE_WINDOWS)	/* }{ */
+
+#include <io.h>
+#include <windows.h>
+
+#define lua_stdin_is_tty()	_isatty(_fileno(stdin))
+
+#else				/* }{ */
+
+/* ISO C definition */
+#define lua_stdin_is_tty()	1  /* assume stdin is a tty */
+
+#endif				/* } */
+
+#endif				/* } */
+
+
+/*
+** lua_readline defines how to show a prompt and then read a line from
+** the standard input.
+** lua_saveline defines how to "save" a read line in a "history".
+** lua_freeline defines how to free a line read by lua_readline.
+*/
+#if !defined(lua_readline)	/* { */
+
+#if defined(LUA_USE_READLINE)	/* { */
+
+#include <readline/readline.h>
+#include <readline/history.h>
+#define lua_initreadline(L)	((void)L, rl_readline_name="lua")
+#define lua_readline(L,b,p)	((void)L, ((b)=readline(p)) != NULL)
+#define lua_saveline(L,line)	((void)L, add_history(line))
+#define lua_freeline(L,b)	((void)L, free(b))
+
+#else				/* }{ */
+
+#define lua_initreadline(L)  ((void)L)
+#define lua_readline(L,b,p) \
+        ((void)L, fputs(p, stdout), fflush(stdout),  /* show prompt */ \
+        fgets(b, LUA_MAXINPUT, stdin) != NULL)  /* get line */
+#define lua_saveline(L,line)	{ (void)L; (void)line; }
+#define lua_freeline(L,b)	{ (void)L; (void)b; }
+
+#endif				/* } */
+
+#endif				/* } */
+
+
+/*
+** Return the string to be used as a prompt by the interpreter. Leave
+** the string (or nil, if using the default value) on the stack, to keep
+** it anchored.
+*/
+static const char *get_prompt (lua_State *L, int firstline) {
+  if (lua_getglobal(L, firstline ? "_PROMPT" : "_PROMPT2") == LUA_TNIL)
+    return (firstline ? LUA_PROMPT : LUA_PROMPT2);  /* use the default */
+  else {  /* apply 'tostring' over the value */
+    const char *p = luaL_tolstring(L, -1, NULL);
+    lua_remove(L, -2);  /* remove original value */
+    return p;
+  }
+}
+
+/* mark in error messages for incomplete statements */
+#define EOFMARK		"<eof>"
+#define marklen		(sizeof(EOFMARK)/sizeof(char) - 1)
+
+
+/*
+** Check whether 'status' signals a syntax error and the error
+** message at the top of the stack ends with the above mark for
+** incomplete statements.
+*/
+static int incomplete (lua_State *L, int status) {
+  if (status == LUA_ERRSYNTAX) {
+    size_t lmsg;
+    const char *msg = lua_tolstring(L, -1, &lmsg);
+    if (lmsg >= marklen && strcmp(msg + lmsg - marklen, EOFMARK) == 0) {
+      lua_pop(L, 1);
+      return 1;
+    }
+  }
+  return 0;  /* else... */
+}
+
+
+/*
+** Prompt the user, read a line, and push it into the Lua stack.
+*/
+static int pushline (lua_State *L, int firstline) {
+  char buffer[LUA_MAXINPUT];
+  char *b = buffer;
+  size_t l;
+  const char *prmt = get_prompt(L, firstline);
+  int readstatus = lua_readline(L, b, prmt);
+  if (readstatus == 0)
+    return 0;  /* no input (prompt will be popped by caller) */
+  lua_pop(L, 1);  /* remove prompt */
+  l = strlen(b);
+  if (l > 0 && b[l-1] == '\n')  /* line ends with newline? */
+    b[--l] = '\0';  /* remove it */
+  if (firstline && b[0] == '=')  /* for compatibility with 5.2, ... */
+    lua_pushfstring(L, "return %s", b + 1);  /* change '=' to 'return' */
+  else
+    lua_pushlstring(L, b, l);
+  lua_freeline(L, b);
+  return 1;
+}
+
+
+/*
+** Try to compile line on the stack as 'return <line>;'; on return, stack
+** has either compiled chunk or original line (if compilation failed).
+*/
+static int addreturn (lua_State *L) {
+  const char *line = lua_tostring(L, -1);  /* original line */
+  const char *retline = lua_pushfstring(L, "return %s;", line);
+  int status = luaL_loadbuffer(L, retline, strlen(retline), "=stdin");
+  if (status == LUA_OK) {
+    lua_remove(L, -2);  /* remove modified line */
+    if (line[0] != '\0')  /* non empty? */
+      lua_saveline(L, line);  /* keep history */
+  }
+  else
+    lua_pop(L, 2);  /* pop result from 'luaL_loadbuffer' and modified line */
+  return status;
+}
+
+
+/*
+** Read multiple lines until a complete Lua statement
+*/
+static int multiline (lua_State *L) {
+  for (;;) {  /* repeat until gets a complete statement */
+    size_t len;
+    const char *line = lua_tolstring(L, 1, &len);  /* get what it has */
+    int status = luaL_loadbuffer(L, line, len, "=stdin");  /* try it */
+    if (!incomplete(L, status) || !pushline(L, 0)) {
+      lua_saveline(L, line);  /* keep history */
+      return status;  /* cannot or should not try to add continuation line */
+    }
+    lua_pushliteral(L, "\n");  /* add newline... */
+    lua_insert(L, -2);  /* ...between the two lines */
+    lua_concat(L, 3);  /* join them */
+  }
+}
+
+
+/*
+** Read a line and try to load (compile) it first as an expression (by
+** adding "return " in front of it) and second as a statement. Return
+** the final status of load/call with the resulting function (if any)
+** in the top of the stack.
+*/
+static int loadline (lua_State *L) {
+  int status;
+  lua_settop(L, 0);
+  if (!pushline(L, 1))
+    return -1;  /* no input */
+  if ((status = addreturn(L)) != LUA_OK)  /* 'return ...' did not work? */
+    status = multiline(L);  /* try as command, maybe with continuation lines */
+  lua_remove(L, 1);  /* remove line from the stack */
+  lua_assert(lua_gettop(L) == 1);
+  return status;
+}
+
+
+/*
+** Prints (calling the Lua 'print' function) any values on the stack
+*/
+static void l_print (lua_State *L) {
+  int n = lua_gettop(L);
+  if (n > 0) {  /* any result to be printed? */
+    luaL_checkstack(L, LUA_MINSTACK, "too many results to print");
+    lua_getglobal(L, "print");
+    lua_insert(L, 1);
+    if (lua_pcall(L, n, 0, 0) != LUA_OK)
+      l_message(progname, lua_pushfstring(L, "error calling 'print' (%s)",
+                                             lua_tostring(L, -1)));
+  }
+}
+
+
+/*
+** Do the REPL: repeatedly read (load) a line, evaluate (call) it, and
+** print any results.
+*/
+static void doREPL (lua_State *L) {
+  int status;
+  const char *oldprogname = progname;
+  progname = NULL;  /* no 'progname' on errors in interactive mode */
+  lua_initreadline(L);
+  while ((status = loadline(L)) != -1) {
+    if (status == LUA_OK)
+      status = docall(L, 0, LUA_MULTRET);
+    if (status == LUA_OK) l_print(L);
+    else report(L, status);
+  }
+  lua_settop(L, 0);  /* clear stack */
+  lua_writeline();
+  progname = oldprogname;
+}
+
+/* }================================================================== */
+
+
+/*
+** Main body of stand-alone interpreter (to be called in protected mode).
+** Reads the options and handles them all.
+*/
+static int pmain (lua_State *L) {
+  int argc = (int)lua_tointeger(L, 1);
+  char **argv = (char **)lua_touserdata(L, 2);
+  int script;
+  int args = collectargs(argv, &script);
+  int optlim = (script > 0) ? script : argc; /* first argv not an option */
+  luaL_checkversion(L);  /* check that interpreter has correct version */
+  if (args == has_error) {  /* bad arg? */
+    print_usage(argv[script]);  /* 'script' has index of bad arg. */
+    return 0;
+  }
+  if (args & has_v)  /* option '-v'? */
+    print_version();
+  if (args & has_E) {  /* option '-E'? */
+    lua_pushboolean(L, 1);  /* signal for libraries to ignore env. vars. */
+    lua_setfield(L, LUA_REGISTRYINDEX, "LUA_NOENV");
+  }
+  luaL_openlibs(L);  /* open standard libraries */
+  createargtable(L, argv, argc, script);  /* create table 'arg' */
+  lua_gc(L, LUA_GCRESTART);  /* start GC... */
+  lua_gc(L, LUA_GCGEN, 0, 0);  /* ...in generational mode */
+  if (!(args & has_E)) {  /* no option '-E'? */
+    if (handle_luainit(L) != LUA_OK)  /* run LUA_INIT */
+      return 0;  /* error running LUA_INIT */
+  }
+  if (!runargs(L, argv, optlim))  /* execute arguments -e and -l */
+    return 0;  /* something failed */
+  if (script > 0) {  /* execute main script (if there is one) */
+    if (handle_script(L, argv + script) != LUA_OK)
+      return 0;  /* interrupt in case of error */
+  }
+  if (args & has_i)  /* -i option? */
+    doREPL(L);  /* do read-eval-print loop */
+  else if (script < 1 && !(args & (has_e | has_v))) { /* no active option? */
+    if (lua_stdin_is_tty()) {  /* running in interactive mode? */
+      print_version();
+      doREPL(L);  /* do read-eval-print loop */
+    }
+    else dofile(L, NULL);  /* executes stdin as a file */
+  }
+  lua_pushboolean(L, 1);  /* signal no errors */
+  return 1;
+}
+
+
+int main (int argc, char **argv) {
+  int status, result;
+  lua_State *L = luaL_newstate();  /* create state */
+  if (L == NULL) {
+    l_message(argv[0], "cannot create state: not enough memory");
+    return EXIT_FAILURE;
+  }
+  lua_gc(L, LUA_GCSTOP);  /* stop GC while building state */
+  lua_pushcfunction(L, &pmain);  /* to call 'pmain' in protected mode */
+  lua_pushinteger(L, argc);  /* 1st argument */
+  lua_pushlightuserdata(L, argv); /* 2nd argument */
+  status = lua_pcall(L, 2, 1, 0);  /* do the call */
+  result = lua_toboolean(L, -1);  /* get result */
+  report(L, status);
+  lua_close(L);
+  return (result && status == LUA_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+
diff --git a/src/libs/3rdparty/lua/src/lua.h b/src/libs/3rdparty/lua/src/lua.h
new file mode 100644
index 00000000000..fd16cf8050b
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lua.h
@@ -0,0 +1,523 @@
+/*
+** $Id: lua.h $
+** Lua - A Scripting Language
+** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
+** See Copyright Notice at the end of this file
+*/
+
+
+#ifndef lua_h
+#define lua_h
+
+#include <stdarg.h>
+#include <stddef.h>
+
+
+#include "luaconf.h"
+
+
+#define LUA_VERSION_MAJOR	"5"
+#define LUA_VERSION_MINOR	"4"
+#define LUA_VERSION_RELEASE	"6"
+
+#define LUA_VERSION_NUM			504
+#define LUA_VERSION_RELEASE_NUM		(LUA_VERSION_NUM * 100 + 6)
+
+#define LUA_VERSION	"Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
+#define LUA_RELEASE	LUA_VERSION "." LUA_VERSION_RELEASE
+#define LUA_COPYRIGHT	LUA_RELEASE "  Copyright (C) 1994-2023 Lua.org, PUC-Rio"
+#define LUA_AUTHORS	"R. Ierusalimschy, L. H. de Figueiredo, W. Celes"
+
+
+/* mark for precompiled code ('<esc>Lua') */
+#define LUA_SIGNATURE	"\x1bLua"
+
+/* option for multiple returns in 'lua_pcall' and 'lua_call' */
+#define LUA_MULTRET	(-1)
+
+
+/*
+** Pseudo-indices
+** (-LUAI_MAXSTACK is the minimum valid index; we keep some free empty
+** space after that to help overflow detection)
+*/
+#define LUA_REGISTRYINDEX	(-LUAI_MAXSTACK - 1000)
+#define lua_upvalueindex(i)	(LUA_REGISTRYINDEX - (i))
+
+
+/* thread status */
+#define LUA_OK		0
+#define LUA_YIELD	1
+#define LUA_ERRRUN	2
+#define LUA_ERRSYNTAX	3
+#define LUA_ERRMEM	4
+#define LUA_ERRERR	5
+
+
+typedef struct lua_State lua_State;
+
+
+/*
+** basic types
+*/
+#define LUA_TNONE		(-1)
+
+#define LUA_TNIL		0
+#define LUA_TBOOLEAN		1
+#define LUA_TLIGHTUSERDATA	2
+#define LUA_TNUMBER		3
+#define LUA_TSTRING		4
+#define LUA_TTABLE		5
+#define LUA_TFUNCTION		6
+#define LUA_TUSERDATA		7
+#define LUA_TTHREAD		8
+
+#define LUA_NUMTYPES		9
+
+
+
+/* minimum Lua stack available to a C function */
+#define LUA_MINSTACK	20
+
+
+/* predefined values in the registry */
+#define LUA_RIDX_MAINTHREAD	1
+#define LUA_RIDX_GLOBALS	2
+#define LUA_RIDX_LAST		LUA_RIDX_GLOBALS
+
+
+/* type of numbers in Lua */
+typedef LUA_NUMBER lua_Number;
+
+
+/* type for integer functions */
+typedef LUA_INTEGER lua_Integer;
+
+/* unsigned integer type */
+typedef LUA_UNSIGNED lua_Unsigned;
+
+/* type for continuation-function contexts */
+typedef LUA_KCONTEXT lua_KContext;
+
+
+/*
+** Type for C functions registered with Lua
+*/
+typedef int (*lua_CFunction) (lua_State *L);
+
+/*
+** Type for continuation functions
+*/
+typedef int (*lua_KFunction) (lua_State *L, int status, lua_KContext ctx);
+
+
+/*
+** Type for functions that read/write blocks when loading/dumping Lua chunks
+*/
+typedef const char * (*lua_Reader) (lua_State *L, void *ud, size_t *sz);
+
+typedef int (*lua_Writer) (lua_State *L, const void *p, size_t sz, void *ud);
+
+
+/*
+** Type for memory-allocation functions
+*/
+typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
+
+
+/*
+** Type for warning functions
+*/
+typedef void (*lua_WarnFunction) (void *ud, const char *msg, int tocont);
+
+
+/*
+** Type used by the debug API to collect debug information
+*/
+typedef struct lua_Debug lua_Debug;
+
+
+/*
+** Functions to be called by the debugger in specific events
+*/
+typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
+
+
+/*
+** generic extra include file
+*/
+#if defined(LUA_USER_H)
+#include LUA_USER_H
+#endif
+
+
+/*
+** RCS ident string
+*/
+extern const char lua_ident[];
+
+
+/*
+** state manipulation
+*/
+LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud);
+LUA_API void       (lua_close) (lua_State *L);
+LUA_API lua_State *(lua_newthread) (lua_State *L);
+LUA_API int        (lua_closethread) (lua_State *L, lua_State *from);
+LUA_API int        (lua_resetthread) (lua_State *L);  /* Deprecated! */
+
+LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf);
+
+
+LUA_API lua_Number (lua_version) (lua_State *L);
+
+
+/*
+** basic stack manipulation
+*/
+LUA_API int   (lua_absindex) (lua_State *L, int idx);
+LUA_API int   (lua_gettop) (lua_State *L);
+LUA_API void  (lua_settop) (lua_State *L, int idx);
+LUA_API void  (lua_pushvalue) (lua_State *L, int idx);
+LUA_API void  (lua_rotate) (lua_State *L, int idx, int n);
+LUA_API void  (lua_copy) (lua_State *L, int fromidx, int toidx);
+LUA_API int   (lua_checkstack) (lua_State *L, int n);
+
+LUA_API void  (lua_xmove) (lua_State *from, lua_State *to, int n);
+
+
+/*
+** access functions (stack -> C)
+*/
+
+LUA_API int             (lua_isnumber) (lua_State *L, int idx);
+LUA_API int             (lua_isstring) (lua_State *L, int idx);
+LUA_API int             (lua_iscfunction) (lua_State *L, int idx);
+LUA_API int             (lua_isinteger) (lua_State *L, int idx);
+LUA_API int             (lua_isuserdata) (lua_State *L, int idx);
+LUA_API int             (lua_type) (lua_State *L, int idx);
+LUA_API const char     *(lua_typename) (lua_State *L, int tp);
+
+LUA_API lua_Number      (lua_tonumberx) (lua_State *L, int idx, int *isnum);
+LUA_API lua_Integer     (lua_tointegerx) (lua_State *L, int idx, int *isnum);
+LUA_API int             (lua_toboolean) (lua_State *L, int idx);
+LUA_API const char     *(lua_tolstring) (lua_State *L, int idx, size_t *len);
+LUA_API lua_Unsigned    (lua_rawlen) (lua_State *L, int idx);
+LUA_API lua_CFunction   (lua_tocfunction) (lua_State *L, int idx);
+LUA_API void	       *(lua_touserdata) (lua_State *L, int idx);
+LUA_API lua_State      *(lua_tothread) (lua_State *L, int idx);
+LUA_API const void     *(lua_topointer) (lua_State *L, int idx);
+
+
+/*
+** Comparison and arithmetic functions
+*/
+
+#define LUA_OPADD	0	/* ORDER TM, ORDER OP */
+#define LUA_OPSUB	1
+#define LUA_OPMUL	2
+#define LUA_OPMOD	3
+#define LUA_OPPOW	4
+#define LUA_OPDIV	5
+#define LUA_OPIDIV	6
+#define LUA_OPBAND	7
+#define LUA_OPBOR	8
+#define LUA_OPBXOR	9
+#define LUA_OPSHL	10
+#define LUA_OPSHR	11
+#define LUA_OPUNM	12
+#define LUA_OPBNOT	13
+
+LUA_API void  (lua_arith) (lua_State *L, int op);
+
+#define LUA_OPEQ	0
+#define LUA_OPLT	1
+#define LUA_OPLE	2
+
+LUA_API int   (lua_rawequal) (lua_State *L, int idx1, int idx2);
+LUA_API int   (lua_compare) (lua_State *L, int idx1, int idx2, int op);
+
+
+/*
+** push functions (C -> stack)
+*/
+LUA_API void        (lua_pushnil) (lua_State *L);
+LUA_API void        (lua_pushnumber) (lua_State *L, lua_Number n);
+LUA_API void        (lua_pushinteger) (lua_State *L, lua_Integer n);
+LUA_API const char *(lua_pushlstring) (lua_State *L, const char *s, size_t len);
+LUA_API const char *(lua_pushstring) (lua_State *L, const char *s);
+LUA_API const char *(lua_pushvfstring) (lua_State *L, const char *fmt,
+                                                      va_list argp);
+LUA_API const char *(lua_pushfstring) (lua_State *L, const char *fmt, ...);
+LUA_API void  (lua_pushcclosure) (lua_State *L, lua_CFunction fn, int n);
+LUA_API void  (lua_pushboolean) (lua_State *L, int b);
+LUA_API void  (lua_pushlightuserdata) (lua_State *L, void *p);
+LUA_API int   (lua_pushthread) (lua_State *L);
+
+
+/*
+** get functions (Lua -> stack)
+*/
+LUA_API int (lua_getglobal) (lua_State *L, const char *name);
+LUA_API int (lua_gettable) (lua_State *L, int idx);
+LUA_API int (lua_getfield) (lua_State *L, int idx, const char *k);
+LUA_API int (lua_geti) (lua_State *L, int idx, lua_Integer n);
+LUA_API int (lua_rawget) (lua_State *L, int idx);
+LUA_API int (lua_rawgeti) (lua_State *L, int idx, lua_Integer n);
+LUA_API int (lua_rawgetp) (lua_State *L, int idx, const void *p);
+
+LUA_API void  (lua_createtable) (lua_State *L, int narr, int nrec);
+LUA_API void *(lua_newuserdatauv) (lua_State *L, size_t sz, int nuvalue);
+LUA_API int   (lua_getmetatable) (lua_State *L, int objindex);
+LUA_API int  (lua_getiuservalue) (lua_State *L, int idx, int n);
+
+
+/*
+** set functions (stack -> Lua)
+*/
+LUA_API void  (lua_setglobal) (lua_State *L, const char *name);
+LUA_API void  (lua_settable) (lua_State *L, int idx);
+LUA_API void  (lua_setfield) (lua_State *L, int idx, const char *k);
+LUA_API void  (lua_seti) (lua_State *L, int idx, lua_Integer n);
+LUA_API void  (lua_rawset) (lua_State *L, int idx);
+LUA_API void  (lua_rawseti) (lua_State *L, int idx, lua_Integer n);
+LUA_API void  (lua_rawsetp) (lua_State *L, int idx, const void *p);
+LUA_API int   (lua_setmetatable) (lua_State *L, int objindex);
+LUA_API int   (lua_setiuservalue) (lua_State *L, int idx, int n);
+
+
+/*
+** 'load' and 'call' functions (load and run Lua code)
+*/
+LUA_API void  (lua_callk) (lua_State *L, int nargs, int nresults,
+                           lua_KContext ctx, lua_KFunction k);
+#define lua_call(L,n,r)		lua_callk(L, (n), (r), 0, NULL)
+
+LUA_API int   (lua_pcallk) (lua_State *L, int nargs, int nresults, int errfunc,
+                            lua_KContext ctx, lua_KFunction k);
+#define lua_pcall(L,n,r,f)	lua_pcallk(L, (n), (r), (f), 0, NULL)
+
+LUA_API int   (lua_load) (lua_State *L, lua_Reader reader, void *dt,
+                          const char *chunkname, const char *mode);
+
+LUA_API int (lua_dump) (lua_State *L, lua_Writer writer, void *data, int strip);
+
+
+/*
+** coroutine functions
+*/
+LUA_API int  (lua_yieldk)     (lua_State *L, int nresults, lua_KContext ctx,
+                               lua_KFunction k);
+LUA_API int  (lua_resume)     (lua_State *L, lua_State *from, int narg,
+                               int *nres);
+LUA_API int  (lua_status)     (lua_State *L);
+LUA_API int (lua_isyieldable) (lua_State *L);
+
+#define lua_yield(L,n)		lua_yieldk(L, (n), 0, NULL)
+
+
+/*
+** Warning-related functions
+*/
+LUA_API void (lua_setwarnf) (lua_State *L, lua_WarnFunction f, void *ud);
+LUA_API void (lua_warning)  (lua_State *L, const char *msg, int tocont);
+
+
+/*
+** garbage-collection function and options
+*/
+
+#define LUA_GCSTOP		0
+#define LUA_GCRESTART		1
+#define LUA_GCCOLLECT		2
+#define LUA_GCCOUNT		3
+#define LUA_GCCOUNTB		4
+#define LUA_GCSTEP		5
+#define LUA_GCSETPAUSE		6
+#define LUA_GCSETSTEPMUL	7
+#define LUA_GCISRUNNING		9
+#define LUA_GCGEN		10
+#define LUA_GCINC		11
+
+LUA_API int (lua_gc) (lua_State *L, int what, ...);
+
+
+/*
+** miscellaneous functions
+*/
+
+LUA_API int   (lua_error) (lua_State *L);
+
+LUA_API int   (lua_next) (lua_State *L, int idx);
+
+LUA_API void  (lua_concat) (lua_State *L, int n);
+LUA_API void  (lua_len)    (lua_State *L, int idx);
+
+LUA_API size_t   (lua_stringtonumber) (lua_State *L, const char *s);
+
+LUA_API lua_Alloc (lua_getallocf) (lua_State *L, void **ud);
+LUA_API void      (lua_setallocf) (lua_State *L, lua_Alloc f, void *ud);
+
+LUA_API void (lua_toclose) (lua_State *L, int idx);
+LUA_API void (lua_closeslot) (lua_State *L, int idx);
+
+
+/*
+** {==============================================================
+** some useful macros
+** ===============================================================
+*/
+
+#define lua_getextraspace(L)	((void *)((char *)(L) - LUA_EXTRASPACE))
+
+#define lua_tonumber(L,i)	lua_tonumberx(L,(i),NULL)
+#define lua_tointeger(L,i)	lua_tointegerx(L,(i),NULL)
+
+#define lua_pop(L,n)		lua_settop(L, -(n)-1)
+
+#define lua_newtable(L)		lua_createtable(L, 0, 0)
+
+#define lua_register(L,n,f) (lua_pushcfunction(L, (f)), lua_setglobal(L, (n)))
+
+#define lua_pushcfunction(L,f)	lua_pushcclosure(L, (f), 0)
+
+#define lua_isfunction(L,n)	(lua_type(L, (n)) == LUA_TFUNCTION)
+#define lua_istable(L,n)	(lua_type(L, (n)) == LUA_TTABLE)
+#define lua_islightuserdata(L,n)	(lua_type(L, (n)) == LUA_TLIGHTUSERDATA)
+#define lua_isnil(L,n)		(lua_type(L, (n)) == LUA_TNIL)
+#define lua_isboolean(L,n)	(lua_type(L, (n)) == LUA_TBOOLEAN)
+#define lua_isthread(L,n)	(lua_type(L, (n)) == LUA_TTHREAD)
+#define lua_isnone(L,n)		(lua_type(L, (n)) == LUA_TNONE)
+#define lua_isnoneornil(L, n)	(lua_type(L, (n)) <= 0)
+
+#define lua_pushliteral(L, s)	lua_pushstring(L, "" s)
+
+#define lua_pushglobaltable(L)  \
+	((void)lua_rawgeti(L, LUA_REGISTRYINDEX, LUA_RIDX_GLOBALS))
+
+#define lua_tostring(L,i)	lua_tolstring(L, (i), NULL)
+
+
+#define lua_insert(L,idx)	lua_rotate(L, (idx), 1)
+
+#define lua_remove(L,idx)	(lua_rotate(L, (idx), -1), lua_pop(L, 1))
+
+#define lua_replace(L,idx)	(lua_copy(L, -1, (idx)), lua_pop(L, 1))
+
+/* }============================================================== */
+
+
+/*
+** {==============================================================
+** compatibility macros
+** ===============================================================
+*/
+#if defined(LUA_COMPAT_APIINTCASTS)
+
+#define lua_pushunsigned(L,n)	lua_pushinteger(L, (lua_Integer)(n))
+#define lua_tounsignedx(L,i,is)	((lua_Unsigned)lua_tointegerx(L,i,is))
+#define lua_tounsigned(L,i)	lua_tounsignedx(L,(i),NULL)
+
+#endif
+
+#define lua_newuserdata(L,s)	lua_newuserdatauv(L,s,1)
+#define lua_getuservalue(L,idx)	lua_getiuservalue(L,idx,1)
+#define lua_setuservalue(L,idx)	lua_setiuservalue(L,idx,1)
+
+#define LUA_NUMTAGS		LUA_NUMTYPES
+
+/* }============================================================== */
+
+/*
+** {======================================================================
+** Debug API
+** =======================================================================
+*/
+
+
+/*
+** Event codes
+*/
+#define LUA_HOOKCALL	0
+#define LUA_HOOKRET	1
+#define LUA_HOOKLINE	2
+#define LUA_HOOKCOUNT	3
+#define LUA_HOOKTAILCALL 4
+
+
+/*
+** Event masks
+*/
+#define LUA_MASKCALL	(1 << LUA_HOOKCALL)
+#define LUA_MASKRET	(1 << LUA_HOOKRET)
+#define LUA_MASKLINE	(1 << LUA_HOOKLINE)
+#define LUA_MASKCOUNT	(1 << LUA_HOOKCOUNT)
+
+
+LUA_API int (lua_getstack) (lua_State *L, int level, lua_Debug *ar);
+LUA_API int (lua_getinfo) (lua_State *L, const char *what, lua_Debug *ar);
+LUA_API const char *(lua_getlocal) (lua_State *L, const lua_Debug *ar, int n);
+LUA_API const char *(lua_setlocal) (lua_State *L, const lua_Debug *ar, int n);
+LUA_API const char *(lua_getupvalue) (lua_State *L, int funcindex, int n);
+LUA_API const char *(lua_setupvalue) (lua_State *L, int funcindex, int n);
+
+LUA_API void *(lua_upvalueid) (lua_State *L, int fidx, int n);
+LUA_API void  (lua_upvaluejoin) (lua_State *L, int fidx1, int n1,
+                                               int fidx2, int n2);
+
+LUA_API void (lua_sethook) (lua_State *L, lua_Hook func, int mask, int count);
+LUA_API lua_Hook (lua_gethook) (lua_State *L);
+LUA_API int (lua_gethookmask) (lua_State *L);
+LUA_API int (lua_gethookcount) (lua_State *L);
+
+LUA_API int (lua_setcstacklimit) (lua_State *L, unsigned int limit);
+
+struct lua_Debug {
+  int event;
+  const char *name;	/* (n) */
+  const char *namewhat;	/* (n) 'global', 'local', 'field', 'method' */
+  const char *what;	/* (S) 'Lua', 'C', 'main', 'tail' */
+  const char *source;	/* (S) */
+  size_t srclen;	/* (S) */
+  int currentline;	/* (l) */
+  int linedefined;	/* (S) */
+  int lastlinedefined;	/* (S) */
+  unsigned char nups;	/* (u) number of upvalues */
+  unsigned char nparams;/* (u) number of parameters */
+  char isvararg;        /* (u) */
+  char istailcall;	/* (t) */
+  unsigned short ftransfer;   /* (r) index of first value transferred */
+  unsigned short ntransfer;   /* (r) number of transferred values */
+  char short_src[LUA_IDSIZE]; /* (S) */
+  /* private part */
+  struct CallInfo *i_ci;  /* active function */
+};
+
+/* }====================================================================== */
+
+
+/******************************************************************************
+* Copyright (C) 1994-2023 Lua.org, PUC-Rio.
+*
+* Permission is hereby granted, free of charge, to any person obtaining
+* a copy of this software and associated documentation files (the
+* "Software"), to deal in the Software without restriction, including
+* without limitation the rights to use, copy, modify, merge, publish,
+* distribute, sublicense, and/or sell copies of the Software, and to
+* permit persons to whom the Software is furnished to do so, subject to
+* the following conditions:
+*
+* The above copyright notice and this permission notice shall be
+* included in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+******************************************************************************/
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lua.hpp b/src/libs/3rdparty/lua/src/lua.hpp
new file mode 100644
index 00000000000..ec417f59469
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lua.hpp
@@ -0,0 +1,9 @@
+// lua.hpp
+// Lua header files for C++
+// <<extern "C">> not supplied automatically because Lua also compiles as C++
+
+extern "C" {
+#include "lua.h"
+#include "lualib.h"
+#include "lauxlib.h"
+}
diff --git a/src/libs/3rdparty/lua/src/luac.c b/src/libs/3rdparty/lua/src/luac.c
new file mode 100644
index 00000000000..5f4a141bddd
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/luac.c
@@ -0,0 +1,723 @@
+/*
+** $Id: luac.c $
+** Lua compiler (saves bytecodes to files; also lists bytecodes)
+** See Copyright Notice in lua.h
+*/
+
+#define luac_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+#include "lauxlib.h"
+
+#include "ldebug.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lopnames.h"
+#include "lstate.h"
+#include "lundump.h"
+
+static void PrintFunction(const Proto* f, int full);
+#define luaU_print	PrintFunction
+
+#define PROGNAME	"luac"		/* default program name */
+#define OUTPUT		PROGNAME ".out"	/* default output file */
+
+static int listing=0;			/* list bytecodes? */
+static int dumping=1;			/* dump bytecodes? */
+static int stripping=0;			/* strip debug information? */
+static char Output[]={ OUTPUT };	/* default output file name */
+static const char* output=Output;	/* actual output file name */
+static const char* progname=PROGNAME;	/* actual program name */
+static TString **tmname;
+
+static void fatal(const char* message)
+{
+ fprintf(stderr,"%s: %s\n",progname,message);
+ exit(EXIT_FAILURE);
+}
+
+static void cannot(const char* what)
+{
+ fprintf(stderr,"%s: cannot %s %s: %s\n",progname,what,output,strerror(errno));
+ exit(EXIT_FAILURE);
+}
+
+static void usage(const char* message)
+{
+ if (*message=='-')
+  fprintf(stderr,"%s: unrecognized option '%s'\n",progname,message);
+ else
+  fprintf(stderr,"%s: %s\n",progname,message);
+ fprintf(stderr,
+  "usage: %s [options] [filenames]\n"
+  "Available options are:\n"
+  "  -l       list (use -l -l for full listing)\n"
+  "  -o name  output to file 'name' (default is \"%s\")\n"
+  "  -p       parse only\n"
+  "  -s       strip debug information\n"
+  "  -v       show version information\n"
+  "  --       stop handling options\n"
+  "  -        stop handling options and process stdin\n"
+  ,progname,Output);
+ exit(EXIT_FAILURE);
+}
+
+#define IS(s)	(strcmp(argv[i],s)==0)
+
+static int doargs(int argc, char* argv[])
+{
+ int i;
+ int version=0;
+ if (argv[0]!=NULL && *argv[0]!=0) progname=argv[0];
+ for (i=1; i<argc; i++)
+ {
+  if (*argv[i]!='-')			/* end of options; keep it */
+   break;
+  else if (IS("--"))			/* end of options; skip it */
+  {
+   ++i;
+   if (version) ++version;
+   break;
+  }
+  else if (IS("-"))			/* end of options; use stdin */
+   break;
+  else if (IS("-l"))			/* list */
+   ++listing;
+  else if (IS("-o"))			/* output file */
+  {
+   output=argv[++i];
+   if (output==NULL || *output==0 || (*output=='-' && output[1]!=0))
+    usage("'-o' needs argument");
+   if (IS("-")) output=NULL;
+  }
+  else if (IS("-p"))			/* parse only */
+   dumping=0;
+  else if (IS("-s"))			/* strip debug information */
+   stripping=1;
+  else if (IS("-v"))			/* show version */
+   ++version;
+  else					/* unknown option */
+   usage(argv[i]);
+ }
+ if (i==argc && (listing || !dumping))
+ {
+  dumping=0;
+  argv[--i]=Output;
+ }
+ if (version)
+ {
+  printf("%s\n",LUA_COPYRIGHT);
+  if (version==argc-1) exit(EXIT_SUCCESS);
+ }
+ return i;
+}
+
+#define FUNCTION "(function()end)();\n"
+
+static const char* reader(lua_State* L, void* ud, size_t* size)
+{
+ UNUSED(L);
+ if ((*(int*)ud)--)
+ {
+  *size=sizeof(FUNCTION)-1;
+  return FUNCTION;
+ }
+ else
+ {
+  *size=0;
+  return NULL;
+ }
+}
+
+#define toproto(L,i) getproto(s2v(L->top.p+(i)))
+
+static const Proto* combine(lua_State* L, int n)
+{
+ if (n==1)
+  return toproto(L,-1);
+ else
+ {
+  Proto* f;
+  int i=n;
+  if (lua_load(L,reader,&i,"=(" PROGNAME ")",NULL)!=LUA_OK) fatal(lua_tostring(L,-1));
+  f=toproto(L,-1);
+  for (i=0; i<n; i++)
+  {
+   f->p[i]=toproto(L,i-n-1);
+   if (f->p[i]->sizeupvalues>0) f->p[i]->upvalues[0].instack=0;
+  }
+  return f;
+ }
+}
+
+static int writer(lua_State* L, const void* p, size_t size, void* u)
+{
+ UNUSED(L);
+ return (fwrite(p,size,1,(FILE*)u)!=1) && (size!=0);
+}
+
+static int pmain(lua_State* L)
+{
+ int argc=(int)lua_tointeger(L,1);
+ char** argv=(char**)lua_touserdata(L,2);
+ const Proto* f;
+ int i;
+ tmname=G(L)->tmname;
+ if (!lua_checkstack(L,argc)) fatal("too many input files");
+ for (i=0; i<argc; i++)
+ {
+  const char* filename=IS("-") ? NULL : argv[i];
+  if (luaL_loadfile(L,filename)!=LUA_OK) fatal(lua_tostring(L,-1));
+ }
+ f=combine(L,argc);
+ if (listing) luaU_print(f,listing>1);
+ if (dumping)
+ {
+  FILE* D= (output==NULL) ? stdout : fopen(output,"wb");
+  if (D==NULL) cannot("open");
+  lua_lock(L);
+  luaU_dump(L,f,writer,D,stripping);
+  lua_unlock(L);
+  if (ferror(D)) cannot("write");
+  if (fclose(D)) cannot("close");
+ }
+ return 0;
+}
+
+int main(int argc, char* argv[])
+{
+ lua_State* L;
+ int i=doargs(argc,argv);
+ argc-=i; argv+=i;
+ if (argc<=0) usage("no input files given");
+ L=luaL_newstate();
+ if (L==NULL) fatal("cannot create state: not enough memory");
+ lua_pushcfunction(L,&pmain);
+ lua_pushinteger(L,argc);
+ lua_pushlightuserdata(L,argv);
+ if (lua_pcall(L,2,0,0)!=LUA_OK) fatal(lua_tostring(L,-1));
+ lua_close(L);
+ return EXIT_SUCCESS;
+}
+
+/*
+** print bytecodes
+*/
+
+#define UPVALNAME(x) ((f->upvalues[x].name) ? getstr(f->upvalues[x].name) : "-")
+#define VOID(p) ((const void*)(p))
+#define eventname(i) (getstr(tmname[i]))
+
+static void PrintString(const TString* ts)
+{
+ const char* s=getstr(ts);
+ size_t i,n=tsslen(ts);
+ printf("\"");
+ for (i=0; i<n; i++)
+ {
+  int c=(int)(unsigned char)s[i];
+  switch (c)
+  {
+   case '"':
+	printf("\\\"");
+	break;
+   case '\\':
+	printf("\\\\");
+	break;
+   case '\a':
+	printf("\\a");
+	break;
+   case '\b':
+	printf("\\b");
+	break;
+   case '\f':
+	printf("\\f");
+	break;
+   case '\n':
+	printf("\\n");
+	break;
+   case '\r':
+	printf("\\r");
+	break;
+   case '\t':
+	printf("\\t");
+	break;
+   case '\v':
+	printf("\\v");
+	break;
+   default:
+	if (isprint(c)) printf("%c",c); else printf("\\%03d",c);
+	break;
+  }
+ }
+ printf("\"");
+}
+
+static void PrintType(const Proto* f, int i)
+{
+ const TValue* o=&f->k[i];
+ switch (ttypetag(o))
+ {
+  case LUA_VNIL:
+	printf("N");
+	break;
+  case LUA_VFALSE:
+  case LUA_VTRUE:
+	printf("B");
+	break;
+  case LUA_VNUMFLT:
+	printf("F");
+	break;
+  case LUA_VNUMINT:
+	printf("I");
+	break;
+  case LUA_VSHRSTR:
+  case LUA_VLNGSTR:
+	printf("S");
+	break;
+  default:				/* cannot happen */
+	printf("?%d",ttypetag(o));
+	break;
+ }
+ printf("\t");
+}
+
+static void PrintConstant(const Proto* f, int i)
+{
+ const TValue* o=&f->k[i];
+ switch (ttypetag(o))
+ {
+  case LUA_VNIL:
+	printf("nil");
+	break;
+  case LUA_VFALSE:
+	printf("false");
+	break;
+  case LUA_VTRUE:
+	printf("true");
+	break;
+  case LUA_VNUMFLT:
+	{
+	char buff[100];
+	sprintf(buff,LUA_NUMBER_FMT,fltvalue(o));
+	printf("%s",buff);
+	if (buff[strspn(buff,"-0123456789")]=='\0') printf(".0");
+	break;
+	}
+  case LUA_VNUMINT:
+	printf(LUA_INTEGER_FMT,ivalue(o));
+	break;
+  case LUA_VSHRSTR:
+  case LUA_VLNGSTR:
+	PrintString(tsvalue(o));
+	break;
+  default:				/* cannot happen */
+	printf("?%d",ttypetag(o));
+	break;
+ }
+}
+
+#define COMMENT		"\t; "
+#define EXTRAARG	GETARG_Ax(code[pc+1])
+#define EXTRAARGC	(EXTRAARG*(MAXARG_C+1))
+#define ISK		(isk ? "k" : "")
+
+static void PrintCode(const Proto* f)
+{
+ const Instruction* code=f->code;
+ int pc,n=f->sizecode;
+ for (pc=0; pc<n; pc++)
+ {
+  Instruction i=code[pc];
+  OpCode o=GET_OPCODE(i);
+  int a=GETARG_A(i);
+  int b=GETARG_B(i);
+  int c=GETARG_C(i);
+  int ax=GETARG_Ax(i);
+  int bx=GETARG_Bx(i);
+  int sb=GETARG_sB(i);
+  int sc=GETARG_sC(i);
+  int sbx=GETARG_sBx(i);
+  int isk=GETARG_k(i);
+  int line=luaG_getfuncline(f,pc);
+  printf("\t%d\t",pc+1);
+  if (line>0) printf("[%d]\t",line); else printf("[-]\t");
+  printf("%-9s\t",opnames[o]);
+  switch (o)
+  {
+   case OP_MOVE:
+	printf("%d %d",a,b);
+	break;
+   case OP_LOADI:
+	printf("%d %d",a,sbx);
+	break;
+   case OP_LOADF:
+	printf("%d %d",a,sbx);
+	break;
+   case OP_LOADK:
+	printf("%d %d",a,bx);
+	printf(COMMENT); PrintConstant(f,bx);
+	break;
+   case OP_LOADKX:
+	printf("%d",a);
+	printf(COMMENT); PrintConstant(f,EXTRAARG);
+	break;
+   case OP_LOADFALSE:
+	printf("%d",a);
+	break;
+   case OP_LFALSESKIP:
+	printf("%d",a);
+	break;
+   case OP_LOADTRUE:
+	printf("%d",a);
+	break;
+   case OP_LOADNIL:
+	printf("%d %d",a,b);
+	printf(COMMENT "%d out",b+1);
+	break;
+   case OP_GETUPVAL:
+	printf("%d %d",a,b);
+	printf(COMMENT "%s",UPVALNAME(b));
+	break;
+   case OP_SETUPVAL:
+	printf("%d %d",a,b);
+	printf(COMMENT "%s",UPVALNAME(b));
+	break;
+   case OP_GETTABUP:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT "%s",UPVALNAME(b));
+	printf(" "); PrintConstant(f,c);
+	break;
+   case OP_GETTABLE:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_GETI:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_GETFIELD:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_SETTABUP:
+	printf("%d %d %d%s",a,b,c,ISK);
+	printf(COMMENT "%s",UPVALNAME(a));
+	printf(" "); PrintConstant(f,b);
+	if (isk) { printf(" "); PrintConstant(f,c); }
+	break;
+   case OP_SETTABLE:
+	printf("%d %d %d%s",a,b,c,ISK);
+	if (isk) { printf(COMMENT); PrintConstant(f,c); }
+	break;
+   case OP_SETI:
+	printf("%d %d %d%s",a,b,c,ISK);
+	if (isk) { printf(COMMENT); PrintConstant(f,c); }
+	break;
+   case OP_SETFIELD:
+	printf("%d %d %d%s",a,b,c,ISK);
+	printf(COMMENT); PrintConstant(f,b);
+	if (isk) { printf(" "); PrintConstant(f,c); }
+	break;
+   case OP_NEWTABLE:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT "%d",c+EXTRAARGC);
+	break;
+   case OP_SELF:
+	printf("%d %d %d%s",a,b,c,ISK);
+	if (isk) { printf(COMMENT); PrintConstant(f,c); }
+	break;
+   case OP_ADDI:
+	printf("%d %d %d",a,b,sc);
+	break;
+   case OP_ADDK:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_SUBK:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_MULK:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_MODK:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_POWK:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_DIVK:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_IDIVK:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_BANDK:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_BORK:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_BXORK:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT); PrintConstant(f,c);
+	break;
+   case OP_SHRI:
+	printf("%d %d %d",a,b,sc);
+	break;
+   case OP_SHLI:
+	printf("%d %d %d",a,b,sc);
+	break;
+   case OP_ADD:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_SUB:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_MUL:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_MOD:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_POW:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_DIV:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_IDIV:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_BAND:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_BOR:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_BXOR:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_SHL:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_SHR:
+	printf("%d %d %d",a,b,c);
+	break;
+   case OP_MMBIN:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT "%s",eventname(c));
+	break;
+   case OP_MMBINI:
+	printf("%d %d %d %d",a,sb,c,isk);
+	printf(COMMENT "%s",eventname(c));
+	if (isk) printf(" flip");
+	break;
+   case OP_MMBINK:
+	printf("%d %d %d %d",a,b,c,isk);
+	printf(COMMENT "%s ",eventname(c)); PrintConstant(f,b);
+	if (isk) printf(" flip");
+	break;
+   case OP_UNM:
+	printf("%d %d",a,b);
+	break;
+   case OP_BNOT:
+	printf("%d %d",a,b);
+	break;
+   case OP_NOT:
+	printf("%d %d",a,b);
+	break;
+   case OP_LEN:
+	printf("%d %d",a,b);
+	break;
+   case OP_CONCAT:
+	printf("%d %d",a,b);
+	break;
+   case OP_CLOSE:
+	printf("%d",a);
+	break;
+   case OP_TBC:
+	printf("%d",a);
+	break;
+   case OP_JMP:
+	printf("%d",GETARG_sJ(i));
+	printf(COMMENT "to %d",GETARG_sJ(i)+pc+2);
+	break;
+   case OP_EQ:
+	printf("%d %d %d",a,b,isk);
+	break;
+   case OP_LT:
+	printf("%d %d %d",a,b,isk);
+	break;
+   case OP_LE:
+	printf("%d %d %d",a,b,isk);
+	break;
+   case OP_EQK:
+	printf("%d %d %d",a,b,isk);
+	printf(COMMENT); PrintConstant(f,b);
+	break;
+   case OP_EQI:
+	printf("%d %d %d",a,sb,isk);
+	break;
+   case OP_LTI:
+	printf("%d %d %d",a,sb,isk);
+	break;
+   case OP_LEI:
+	printf("%d %d %d",a,sb,isk);
+	break;
+   case OP_GTI:
+	printf("%d %d %d",a,sb,isk);
+	break;
+   case OP_GEI:
+	printf("%d %d %d",a,sb,isk);
+	break;
+   case OP_TEST:
+	printf("%d %d",a,isk);
+	break;
+   case OP_TESTSET:
+	printf("%d %d %d",a,b,isk);
+	break;
+   case OP_CALL:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT);
+	if (b==0) printf("all in "); else printf("%d in ",b-1);
+	if (c==0) printf("all out"); else printf("%d out",c-1);
+	break;
+   case OP_TAILCALL:
+	printf("%d %d %d%s",a,b,c,ISK);
+	printf(COMMENT "%d in",b-1);
+	break;
+   case OP_RETURN:
+	printf("%d %d %d%s",a,b,c,ISK);
+	printf(COMMENT);
+	if (b==0) printf("all out"); else printf("%d out",b-1);
+	break;
+   case OP_RETURN0:
+	break;
+   case OP_RETURN1:
+	printf("%d",a);
+	break;
+   case OP_FORLOOP:
+	printf("%d %d",a,bx);
+	printf(COMMENT "to %d",pc-bx+2);
+	break;
+   case OP_FORPREP:
+	printf("%d %d",a,bx);
+	printf(COMMENT "exit to %d",pc+bx+3);
+	break;
+   case OP_TFORPREP:
+	printf("%d %d",a,bx);
+	printf(COMMENT "to %d",pc+bx+2);
+	break;
+   case OP_TFORCALL:
+	printf("%d %d",a,c);
+	break;
+   case OP_TFORLOOP:
+	printf("%d %d",a,bx);
+	printf(COMMENT "to %d",pc-bx+2);
+	break;
+   case OP_SETLIST:
+	printf("%d %d %d",a,b,c);
+	if (isk) printf(COMMENT "%d",c+EXTRAARGC);
+	break;
+   case OP_CLOSURE:
+	printf("%d %d",a,bx);
+	printf(COMMENT "%p",VOID(f->p[bx]));
+	break;
+   case OP_VARARG:
+	printf("%d %d",a,c);
+	printf(COMMENT);
+	if (c==0) printf("all out"); else printf("%d out",c-1);
+	break;
+   case OP_VARARGPREP:
+	printf("%d",a);
+	break;
+   case OP_EXTRAARG:
+	printf("%d",ax);
+	break;
+#if 0
+   default:
+	printf("%d %d %d",a,b,c);
+	printf(COMMENT "not handled");
+	break;
+#endif
+  }
+  printf("\n");
+ }
+}
+
+
+#define SS(x)	((x==1)?"":"s")
+#define S(x)	(int)(x),SS(x)
+
+static void PrintHeader(const Proto* f)
+{
+ const char* s=f->source ? getstr(f->source) : "=?";
+ if (*s=='@' || *s=='=')
+  s++;
+ else if (*s==LUA_SIGNATURE[0])
+  s="(bstring)";
+ else
+  s="(string)";
+ printf("\n%s <%s:%d,%d> (%d instruction%s at %p)\n",
+	(f->linedefined==0)?"main":"function",s,
+	f->linedefined,f->lastlinedefined,
+	S(f->sizecode),VOID(f));
+ printf("%d%s param%s, %d slot%s, %d upvalue%s, ",
+	(int)(f->numparams),f->is_vararg?"+":"",SS(f->numparams),
+	S(f->maxstacksize),S(f->sizeupvalues));
+ printf("%d local%s, %d constant%s, %d function%s\n",
+	S(f->sizelocvars),S(f->sizek),S(f->sizep));
+}
+
+static void PrintDebug(const Proto* f)
+{
+ int i,n;
+ n=f->sizek;
+ printf("constants (%d) for %p:\n",n,VOID(f));
+ for (i=0; i<n; i++)
+ {
+  printf("\t%d\t",i);
+  PrintType(f,i);
+  PrintConstant(f,i);
+  printf("\n");
+ }
+ n=f->sizelocvars;
+ printf("locals (%d) for %p:\n",n,VOID(f));
+ for (i=0; i<n; i++)
+ {
+  printf("\t%d\t%s\t%d\t%d\n",
+  i,getstr(f->locvars[i].varname),f->locvars[i].startpc+1,f->locvars[i].endpc+1);
+ }
+ n=f->sizeupvalues;
+ printf("upvalues (%d) for %p:\n",n,VOID(f));
+ for (i=0; i<n; i++)
+ {
+  printf("\t%d\t%s\t%d\t%d\n",
+  i,UPVALNAME(i),f->upvalues[i].instack,f->upvalues[i].idx);
+ }
+}
+
+static void PrintFunction(const Proto* f, int full)
+{
+ int i,n=f->sizep;
+ PrintHeader(f);
+ PrintCode(f);
+ if (full) PrintDebug(f);
+ for (i=0; i<n; i++) PrintFunction(f->p[i],full);
+}
diff --git a/src/libs/3rdparty/lua/src/luaconf.h b/src/libs/3rdparty/lua/src/luaconf.h
new file mode 100644
index 00000000000..433df492959
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/luaconf.h
@@ -0,0 +1,793 @@
+/*
+** $Id: luaconf.h $
+** Configuration file for Lua
+** See Copyright Notice in lua.h
+*/
+
+
+#ifndef luaconf_h
+#define luaconf_h
+
+#include <limits.h>
+#include <stddef.h>
+
+
+/*
+** ===================================================================
+** General Configuration File for Lua
+**
+** Some definitions here can be changed externally, through the compiler
+** (e.g., with '-D' options): They are commented out or protected
+** by '#if !defined' guards. However, several other definitions
+** should be changed directly here, either because they affect the
+** Lua ABI (by making the changes here, you ensure that all software
+** connected to Lua, such as C libraries, will be compiled with the same
+** configuration); or because they are seldom changed.
+**
+** Search for "@@" to find all configurable definitions.
+** ===================================================================
+*/
+
+
+/*
+** {====================================================================
+** System Configuration: macros to adapt (if needed) Lua to some
+** particular platform, for instance restricting it to C89.
+** =====================================================================
+*/
+
+/*
+@@ LUA_USE_C89 controls the use of non-ISO-C89 features.
+** Define it if you want Lua to avoid the use of a few C99 features
+** or Windows-specific features on Windows.
+*/
+/* #define LUA_USE_C89 */
+
+
+/*
+** By default, Lua on Windows use (some) specific Windows features
+*/
+#if !defined(LUA_USE_C89) && defined(_WIN32) && !defined(_WIN32_WCE) &&!defined(LUA_USE_WINDOWS)
+#define LUA_USE_WINDOWS  /* enable goodies for regular Windows */
+#endif
+
+
+#if defined(LUA_USE_WINDOWS)
+#define LUA_DL_DLL	/* enable support for DLL */
+#define LUA_USE_C89	/* broadly, Windows is C89 */
+#endif
+
+
+#if defined(LUA_USE_LINUX)
+#define LUA_USE_POSIX
+#define LUA_USE_DLOPEN		/* needs an extra library: -ldl */
+#endif
+
+
+#if defined(LUA_USE_MACOSX)
+#define LUA_USE_POSIX
+#define LUA_USE_DLOPEN		/* MacOS does not need -ldl */
+#endif
+
+
+#if defined(LUA_USE_IOS)
+#define LUA_USE_POSIX
+#define LUA_USE_DLOPEN
+#endif
+
+
+/*
+@@ LUAI_IS32INT is true iff 'int' has (at least) 32 bits.
+*/
+#define LUAI_IS32INT	((UINT_MAX >> 30) >= 3)
+
+/* }================================================================== */
+
+
+
+/*
+** {==================================================================
+** Configuration for Number types. These options should not be
+** set externally, because any other code connected to Lua must
+** use the same configuration.
+** ===================================================================
+*/
+
+/*
+@@ LUA_INT_TYPE defines the type for Lua integers.
+@@ LUA_FLOAT_TYPE defines the type for Lua floats.
+** Lua should work fine with any mix of these options supported
+** by your C compiler. The usual configurations are 64-bit integers
+** and 'double' (the default), 32-bit integers and 'float' (for
+** restricted platforms), and 'long'/'double' (for C compilers not
+** compliant with C99, which may not have support for 'long long').
+*/
+
+/* predefined options for LUA_INT_TYPE */
+#define LUA_INT_INT		1
+#define LUA_INT_LONG		2
+#define LUA_INT_LONGLONG	3
+
+/* predefined options for LUA_FLOAT_TYPE */
+#define LUA_FLOAT_FLOAT		1
+#define LUA_FLOAT_DOUBLE	2
+#define LUA_FLOAT_LONGDOUBLE	3
+
+
+/* Default configuration ('long long' and 'double', for 64-bit Lua) */
+#define LUA_INT_DEFAULT		LUA_INT_LONGLONG
+#define LUA_FLOAT_DEFAULT	LUA_FLOAT_DOUBLE
+
+
+/*
+@@ LUA_32BITS enables Lua with 32-bit integers and 32-bit floats.
+*/
+#define LUA_32BITS	0
+
+
+/*
+@@ LUA_C89_NUMBERS ensures that Lua uses the largest types available for
+** C89 ('long' and 'double'); Windows always has '__int64', so it does
+** not need to use this case.
+*/
+#if defined(LUA_USE_C89) && !defined(LUA_USE_WINDOWS)
+#define LUA_C89_NUMBERS		1
+#else
+#define LUA_C89_NUMBERS		0
+#endif
+
+
+#if LUA_32BITS		/* { */
+/*
+** 32-bit integers and 'float'
+*/
+#if LUAI_IS32INT  /* use 'int' if big enough */
+#define LUA_INT_TYPE	LUA_INT_INT
+#else  /* otherwise use 'long' */
+#define LUA_INT_TYPE	LUA_INT_LONG
+#endif
+#define LUA_FLOAT_TYPE	LUA_FLOAT_FLOAT
+
+#elif LUA_C89_NUMBERS	/* }{ */
+/*
+** largest types available for C89 ('long' and 'double')
+*/
+#define LUA_INT_TYPE	LUA_INT_LONG
+#define LUA_FLOAT_TYPE	LUA_FLOAT_DOUBLE
+
+#else		/* }{ */
+/* use defaults */
+
+#define LUA_INT_TYPE	LUA_INT_DEFAULT
+#define LUA_FLOAT_TYPE	LUA_FLOAT_DEFAULT
+
+#endif				/* } */
+
+
+/* }================================================================== */
+
+
+
+/*
+** {==================================================================
+** Configuration for Paths.
+** ===================================================================
+*/
+
+/*
+** LUA_PATH_SEP is the character that separates templates in a path.
+** LUA_PATH_MARK is the string that marks the substitution points in a
+** template.
+** LUA_EXEC_DIR in a Windows path is replaced by the executable's
+** directory.
+*/
+#define LUA_PATH_SEP            ";"
+#define LUA_PATH_MARK           "?"
+#define LUA_EXEC_DIR            "!"
+
+
+/*
+@@ LUA_PATH_DEFAULT is the default path that Lua uses to look for
+** Lua libraries.
+@@ LUA_CPATH_DEFAULT is the default path that Lua uses to look for
+** C libraries.
+** CHANGE them if your machine has a non-conventional directory
+** hierarchy or if you want to install your libraries in
+** non-conventional directories.
+*/
+
+#define LUA_VDIR	LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
+#if defined(_WIN32)	/* { */
+/*
+** In Windows, any exclamation mark ('!') in the path is replaced by the
+** path of the directory of the executable file of the current process.
+*/
+#define LUA_LDIR	"!\\lua\\"
+#define LUA_CDIR	"!\\"
+#define LUA_SHRDIR	"!\\..\\share\\lua\\" LUA_VDIR "\\"
+
+#if !defined(LUA_PATH_DEFAULT)
+#define LUA_PATH_DEFAULT  \
+		LUA_LDIR"?.lua;"  LUA_LDIR"?\\init.lua;" \
+		LUA_CDIR"?.lua;"  LUA_CDIR"?\\init.lua;" \
+		LUA_SHRDIR"?.lua;" LUA_SHRDIR"?\\init.lua;" \
+		".\\?.lua;" ".\\?\\init.lua"
+#endif
+
+#if !defined(LUA_CPATH_DEFAULT)
+#define LUA_CPATH_DEFAULT \
+		LUA_CDIR"?.dll;" \
+		LUA_CDIR"..\\lib\\lua\\" LUA_VDIR "\\?.dll;" \
+		LUA_CDIR"loadall.dll;" ".\\?.dll"
+#endif
+
+#else			/* }{ */
+
+#define LUA_ROOT	"/usr/local/"
+#define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR "/"
+#define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR "/"
+
+#if !defined(LUA_PATH_DEFAULT)
+#define LUA_PATH_DEFAULT  \
+		LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
+		LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" \
+		"./?.lua;" "./?/init.lua"
+#endif
+
+#if !defined(LUA_CPATH_DEFAULT)
+#define LUA_CPATH_DEFAULT \
+		LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so"
+#endif
+
+#endif			/* } */
+
+
+/*
+@@ LUA_DIRSEP is the directory separator (for submodules).
+** CHANGE it if your machine does not use "/" as the directory separator
+** and is not Windows. (On Windows Lua automatically uses "\".)
+*/
+#if !defined(LUA_DIRSEP)
+
+#if defined(_WIN32)
+#define LUA_DIRSEP	"\\"
+#else
+#define LUA_DIRSEP	"/"
+#endif
+
+#endif
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Marks for exported symbols in the C code
+** ===================================================================
+*/
+
+/*
+@@ LUA_API is a mark for all core API functions.
+@@ LUALIB_API is a mark for all auxiliary library functions.
+@@ LUAMOD_API is a mark for all standard library opening functions.
+** CHANGE them if you need to define those functions in some special way.
+** For instance, if you want to create one Windows DLL with the core and
+** the libraries, you may want to use the following definition (define
+** LUA_BUILD_AS_DLL to get it).
+*/
+#if defined(LUA_BUILD_AS_DLL)	/* { */
+
+#if defined(LUA_CORE) || defined(LUA_LIB)	/* { */
+#define LUA_API __declspec(dllexport)
+#else						/* }{ */
+#define LUA_API __declspec(dllimport)
+#endif						/* } */
+
+#else				/* }{ */
+
+#define LUA_API		extern
+
+#endif				/* } */
+
+
+/*
+** More often than not the libs go together with the core.
+*/
+#define LUALIB_API	LUA_API
+#define LUAMOD_API	LUA_API
+
+
+/*
+@@ LUAI_FUNC is a mark for all extern functions that are not to be
+** exported to outside modules.
+@@ LUAI_DDEF and LUAI_DDEC are marks for all extern (const) variables,
+** none of which to be exported to outside modules (LUAI_DDEF for
+** definitions and LUAI_DDEC for declarations).
+** CHANGE them if you need to mark them in some special way. Elf/gcc
+** (versions 3.2 and later) mark them as "hidden" to optimize access
+** when Lua is compiled as a shared library. Not all elf targets support
+** this attribute. Unfortunately, gcc does not offer a way to check
+** whether the target offers that support, and those without support
+** give a warning about it. To avoid these warnings, change to the
+** default definition.
+*/
+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \
+    defined(__ELF__)		/* { */
+#define LUAI_FUNC	__attribute__((visibility("internal"))) extern
+#else				/* }{ */
+#define LUAI_FUNC	extern
+#endif				/* } */
+
+#define LUAI_DDEC(dec)	LUAI_FUNC dec
+#define LUAI_DDEF	/* empty */
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Compatibility with previous versions
+** ===================================================================
+*/
+
+/*
+@@ LUA_COMPAT_5_3 controls other macros for compatibility with Lua 5.3.
+** You can define it to get all options, or change specific options
+** to fit your specific needs.
+*/
+#if defined(LUA_COMPAT_5_3)	/* { */
+
+/*
+@@ LUA_COMPAT_MATHLIB controls the presence of several deprecated
+** functions in the mathematical library.
+** (These functions were already officially removed in 5.3;
+** nevertheless they are still available here.)
+*/
+#define LUA_COMPAT_MATHLIB
+
+/*
+@@ LUA_COMPAT_APIINTCASTS controls the presence of macros for
+** manipulating other integer types (lua_pushunsigned, lua_tounsigned,
+** luaL_checkint, luaL_checklong, etc.)
+** (These macros were also officially removed in 5.3, but they are still
+** available here.)
+*/
+#define LUA_COMPAT_APIINTCASTS
+
+
+/*
+@@ LUA_COMPAT_LT_LE controls the emulation of the '__le' metamethod
+** using '__lt'.
+*/
+#define LUA_COMPAT_LT_LE
+
+
+/*
+@@ The following macros supply trivial compatibility for some
+** changes in the API. The macros themselves document how to
+** change your code to avoid using them.
+** (Once more, these macros were officially removed in 5.3, but they are
+** still available here.)
+*/
+#define lua_strlen(L,i)		lua_rawlen(L, (i))
+
+#define lua_objlen(L,i)		lua_rawlen(L, (i))
+
+#define lua_equal(L,idx1,idx2)		lua_compare(L,(idx1),(idx2),LUA_OPEQ)
+#define lua_lessthan(L,idx1,idx2)	lua_compare(L,(idx1),(idx2),LUA_OPLT)
+
+#endif				/* } */
+
+/* }================================================================== */
+
+
+
+/*
+** {==================================================================
+** Configuration for Numbers (low-level part).
+** Change these definitions if no predefined LUA_FLOAT_* / LUA_INT_*
+** satisfy your needs.
+** ===================================================================
+*/
+
+/*
+@@ LUAI_UACNUMBER is the result of a 'default argument promotion'
+@@ over a floating number.
+@@ l_floatatt(x) corrects float attribute 'x' to the proper float type
+** by prefixing it with one of FLT/DBL/LDBL.
+@@ LUA_NUMBER_FRMLEN is the length modifier for writing floats.
+@@ LUA_NUMBER_FMT is the format for writing floats.
+@@ lua_number2str converts a float to a string.
+@@ l_mathop allows the addition of an 'l' or 'f' to all math operations.
+@@ l_floor takes the floor of a float.
+@@ lua_str2number converts a decimal numeral to a number.
+*/
+
+
+/* The following definitions are good for most cases here */
+
+#define l_floor(x)		(l_mathop(floor)(x))
+
+#define lua_number2str(s,sz,n)  \
+	l_sprintf((s), sz, LUA_NUMBER_FMT, (LUAI_UACNUMBER)(n))
+
+/*
+@@ lua_numbertointeger converts a float number with an integral value
+** to an integer, or returns 0 if float is not within the range of
+** a lua_Integer.  (The range comparisons are tricky because of
+** rounding. The tests here assume a two-complement representation,
+** where MININTEGER always has an exact representation as a float;
+** MAXINTEGER may not have one, and therefore its conversion to float
+** may have an ill-defined value.)
+*/
+#define lua_numbertointeger(n,p) \
+  ((n) >= (LUA_NUMBER)(LUA_MININTEGER) && \
+   (n) < -(LUA_NUMBER)(LUA_MININTEGER) && \
+      (*(p) = (LUA_INTEGER)(n), 1))
+
+
+/* now the variable definitions */
+
+#if LUA_FLOAT_TYPE == LUA_FLOAT_FLOAT		/* { single float */
+
+#define LUA_NUMBER	float
+
+#define l_floatatt(n)		(FLT_##n)
+
+#define LUAI_UACNUMBER	double
+
+#define LUA_NUMBER_FRMLEN	""
+#define LUA_NUMBER_FMT		"%.7g"
+
+#define l_mathop(op)		op##f
+
+#define lua_str2number(s,p)	strtof((s), (p))
+
+
+#elif LUA_FLOAT_TYPE == LUA_FLOAT_LONGDOUBLE	/* }{ long double */
+
+#define LUA_NUMBER	long double
+
+#define l_floatatt(n)		(LDBL_##n)
+
+#define LUAI_UACNUMBER	long double
+
+#define LUA_NUMBER_FRMLEN	"L"
+#define LUA_NUMBER_FMT		"%.19Lg"
+
+#define l_mathop(op)		op##l
+
+#define lua_str2number(s,p)	strtold((s), (p))
+
+#elif LUA_FLOAT_TYPE == LUA_FLOAT_DOUBLE	/* }{ double */
+
+#define LUA_NUMBER	double
+
+#define l_floatatt(n)		(DBL_##n)
+
+#define LUAI_UACNUMBER	double
+
+#define LUA_NUMBER_FRMLEN	""
+#define LUA_NUMBER_FMT		"%.14g"
+
+#define l_mathop(op)		op
+
+#define lua_str2number(s,p)	strtod((s), (p))
+
+#else						/* }{ */
+
+#error "numeric float type not defined"
+
+#endif					/* } */
+
+
+
+/*
+@@ LUA_UNSIGNED is the unsigned version of LUA_INTEGER.
+@@ LUAI_UACINT is the result of a 'default argument promotion'
+@@ over a LUA_INTEGER.
+@@ LUA_INTEGER_FRMLEN is the length modifier for reading/writing integers.
+@@ LUA_INTEGER_FMT is the format for writing integers.
+@@ LUA_MAXINTEGER is the maximum value for a LUA_INTEGER.
+@@ LUA_MININTEGER is the minimum value for a LUA_INTEGER.
+@@ LUA_MAXUNSIGNED is the maximum value for a LUA_UNSIGNED.
+@@ lua_integer2str converts an integer to a string.
+*/
+
+
+/* The following definitions are good for most cases here */
+
+#define LUA_INTEGER_FMT		"%" LUA_INTEGER_FRMLEN "d"
+
+#define LUAI_UACINT		LUA_INTEGER
+
+#define lua_integer2str(s,sz,n)  \
+	l_sprintf((s), sz, LUA_INTEGER_FMT, (LUAI_UACINT)(n))
+
+/*
+** use LUAI_UACINT here to avoid problems with promotions (which
+** can turn a comparison between unsigneds into a signed comparison)
+*/
+#define LUA_UNSIGNED		unsigned LUAI_UACINT
+
+
+/* now the variable definitions */
+
+#if LUA_INT_TYPE == LUA_INT_INT		/* { int */
+
+#define LUA_INTEGER		int
+#define LUA_INTEGER_FRMLEN	""
+
+#define LUA_MAXINTEGER		INT_MAX
+#define LUA_MININTEGER		INT_MIN
+
+#define LUA_MAXUNSIGNED		UINT_MAX
+
+#elif LUA_INT_TYPE == LUA_INT_LONG	/* }{ long */
+
+#define LUA_INTEGER		long
+#define LUA_INTEGER_FRMLEN	"l"
+
+#define LUA_MAXINTEGER		LONG_MAX
+#define LUA_MININTEGER		LONG_MIN
+
+#define LUA_MAXUNSIGNED		ULONG_MAX
+
+#elif LUA_INT_TYPE == LUA_INT_LONGLONG	/* }{ long long */
+
+/* use presence of macro LLONG_MAX as proxy for C99 compliance */
+#if defined(LLONG_MAX)		/* { */
+/* use ISO C99 stuff */
+
+#define LUA_INTEGER		long long
+#define LUA_INTEGER_FRMLEN	"ll"
+
+#define LUA_MAXINTEGER		LLONG_MAX
+#define LUA_MININTEGER		LLONG_MIN
+
+#define LUA_MAXUNSIGNED		ULLONG_MAX
+
+#elif defined(LUA_USE_WINDOWS) /* }{ */
+/* in Windows, can use specific Windows types */
+
+#define LUA_INTEGER		__int64
+#define LUA_INTEGER_FRMLEN	"I64"
+
+#define LUA_MAXINTEGER		_I64_MAX
+#define LUA_MININTEGER		_I64_MIN
+
+#define LUA_MAXUNSIGNED		_UI64_MAX
+
+#else				/* }{ */
+
+#error "Compiler does not support 'long long'. Use option '-DLUA_32BITS' \
+  or '-DLUA_C89_NUMBERS' (see file 'luaconf.h' for details)"
+
+#endif				/* } */
+
+#else				/* }{ */
+
+#error "numeric integer type not defined"
+
+#endif				/* } */
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Dependencies with C99 and other C details
+** ===================================================================
+*/
+
+/*
+@@ l_sprintf is equivalent to 'snprintf' or 'sprintf' in C89.
+** (All uses in Lua have only one format item.)
+*/
+#if !defined(LUA_USE_C89)
+#define l_sprintf(s,sz,f,i)	snprintf(s,sz,f,i)
+#else
+#define l_sprintf(s,sz,f,i)	((void)(sz), sprintf(s,f,i))
+#endif
+
+
+/*
+@@ lua_strx2number converts a hexadecimal numeral to a number.
+** In C99, 'strtod' does that conversion. Otherwise, you can
+** leave 'lua_strx2number' undefined and Lua will provide its own
+** implementation.
+*/
+#if !defined(LUA_USE_C89)
+#define lua_strx2number(s,p)		lua_str2number(s,p)
+#endif
+
+
+/*
+@@ lua_pointer2str converts a pointer to a readable string in a
+** non-specified way.
+*/
+#define lua_pointer2str(buff,sz,p)	l_sprintf(buff,sz,"%p",p)
+
+
+/*
+@@ lua_number2strx converts a float to a hexadecimal numeral.
+** In C99, 'sprintf' (with format specifiers '%a'/'%A') does that.
+** Otherwise, you can leave 'lua_number2strx' undefined and Lua will
+** provide its own implementation.
+*/
+#if !defined(LUA_USE_C89)
+#define lua_number2strx(L,b,sz,f,n)  \
+	((void)L, l_sprintf(b,sz,f,(LUAI_UACNUMBER)(n)))
+#endif
+
+
+/*
+** 'strtof' and 'opf' variants for math functions are not valid in
+** C89. Otherwise, the macro 'HUGE_VALF' is a good proxy for testing the
+** availability of these variants. ('math.h' is already included in
+** all files that use these macros.)
+*/
+#if defined(LUA_USE_C89) || (defined(HUGE_VAL) && !defined(HUGE_VALF))
+#undef l_mathop  /* variants not available */
+#undef lua_str2number
+#define l_mathop(op)		(lua_Number)op  /* no variant */
+#define lua_str2number(s,p)	((lua_Number)strtod((s), (p)))
+#endif
+
+
+/*
+@@ LUA_KCONTEXT is the type of the context ('ctx') for continuation
+** functions.  It must be a numerical type; Lua will use 'intptr_t' if
+** available, otherwise it will use 'ptrdiff_t' (the nearest thing to
+** 'intptr_t' in C89)
+*/
+#define LUA_KCONTEXT	ptrdiff_t
+
+#if !defined(LUA_USE_C89) && defined(__STDC_VERSION__) && \
+    __STDC_VERSION__ >= 199901L
+#include <stdint.h>
+#if defined(INTPTR_MAX)  /* even in C99 this type is optional */
+#undef LUA_KCONTEXT
+#define LUA_KCONTEXT	intptr_t
+#endif
+#endif
+
+
+/*
+@@ lua_getlocaledecpoint gets the locale "radix character" (decimal point).
+** Change that if you do not want to use C locales. (Code using this
+** macro must include the header 'locale.h'.)
+*/
+#if !defined(lua_getlocaledecpoint)
+#define lua_getlocaledecpoint()		(localeconv()->decimal_point[0])
+#endif
+
+
+/*
+** macros to improve jump prediction, used mostly for error handling
+** and debug facilities. (Some macros in the Lua API use these macros.
+** Define LUA_NOBUILTIN if you do not want '__builtin_expect' in your
+** code.)
+*/
+#if !defined(luai_likely)
+
+#if defined(__GNUC__) && !defined(LUA_NOBUILTIN)
+#define luai_likely(x)		(__builtin_expect(((x) != 0), 1))
+#define luai_unlikely(x)	(__builtin_expect(((x) != 0), 0))
+#else
+#define luai_likely(x)		(x)
+#define luai_unlikely(x)	(x)
+#endif
+
+#endif
+
+
+#if defined(LUA_CORE) || defined(LUA_LIB)
+/* shorter names for Lua's own use */
+#define l_likely(x)	luai_likely(x)
+#define l_unlikely(x)	luai_unlikely(x)
+#endif
+
+
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Language Variations
+** =====================================================================
+*/
+
+/*
+@@ LUA_NOCVTN2S/LUA_NOCVTS2N control how Lua performs some
+** coercions. Define LUA_NOCVTN2S to turn off automatic coercion from
+** numbers to strings. Define LUA_NOCVTS2N to turn off automatic
+** coercion from strings to numbers.
+*/
+/* #define LUA_NOCVTN2S */
+/* #define LUA_NOCVTS2N */
+
+
+/*
+@@ LUA_USE_APICHECK turns on several consistency checks on the C API.
+** Define it as a help when debugging C code.
+*/
+#if defined(LUA_USE_APICHECK)
+#include <assert.h>
+#define luai_apicheck(l,e)	assert(e)
+#endif
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Macros that affect the API and must be stable (that is, must be the
+** same when you compile Lua and when you compile code that links to
+** Lua).
+** =====================================================================
+*/
+
+/*
+@@ LUAI_MAXSTACK limits the size of the Lua stack.
+** CHANGE it if you need a different limit. This limit is arbitrary;
+** its only purpose is to stop Lua from consuming unlimited stack
+** space (and to reserve some numbers for pseudo-indices).
+** (It must fit into max(size_t)/32 and max(int)/2.)
+*/
+#if LUAI_IS32INT
+#define LUAI_MAXSTACK		1000000
+#else
+#define LUAI_MAXSTACK		15000
+#endif
+
+
+/*
+@@ LUA_EXTRASPACE defines the size of a raw memory area associated with
+** a Lua state with very fast access.
+** CHANGE it if you need a different size.
+*/
+#define LUA_EXTRASPACE		(sizeof(void *))
+
+
+/*
+@@ LUA_IDSIZE gives the maximum size for the description of the source
+** of a function in debug information.
+** CHANGE it if you want a different size.
+*/
+#define LUA_IDSIZE	60
+
+
+/*
+@@ LUAL_BUFFERSIZE is the initial buffer size used by the lauxlib
+** buffer system.
+*/
+#define LUAL_BUFFERSIZE   ((int)(16 * sizeof(void*) * sizeof(lua_Number)))
+
+
+/*
+@@ LUAI_MAXALIGN defines fields that, when used in a union, ensure
+** maximum alignment for the other items in that union.
+*/
+#define LUAI_MAXALIGN  lua_Number n; double u; void *s; lua_Integer i; long l
+
+/* }================================================================== */
+
+
+
+
+
+/* =================================================================== */
+
+/*
+** Local configuration. You can use this space to add your redefinitions
+** without modifying the main part of the file.
+*/
+
+
+
+
+
+#endif
+
diff --git a/src/libs/3rdparty/lua/src/lualib.h b/src/libs/3rdparty/lua/src/lualib.h
new file mode 100644
index 00000000000..2625529076a
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lualib.h
@@ -0,0 +1,52 @@
+/*
+** $Id: lualib.h $
+** Lua standard libraries
+** See Copyright Notice in lua.h
+*/
+
+
+#ifndef lualib_h
+#define lualib_h
+
+#include "lua.h"
+
+
+/* version suffix for environment variable names */
+#define LUA_VERSUFFIX          "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR
+
+
+LUAMOD_API int (luaopen_base) (lua_State *L);
+
+#define LUA_COLIBNAME	"coroutine"
+LUAMOD_API int (luaopen_coroutine) (lua_State *L);
+
+#define LUA_TABLIBNAME	"table"
+LUAMOD_API int (luaopen_table) (lua_State *L);
+
+#define LUA_IOLIBNAME	"io"
+LUAMOD_API int (luaopen_io) (lua_State *L);
+
+#define LUA_OSLIBNAME	"os"
+LUAMOD_API int (luaopen_os) (lua_State *L);
+
+#define LUA_STRLIBNAME	"string"
+LUAMOD_API int (luaopen_string) (lua_State *L);
+
+#define LUA_UTF8LIBNAME	"utf8"
+LUAMOD_API int (luaopen_utf8) (lua_State *L);
+
+#define LUA_MATHLIBNAME	"math"
+LUAMOD_API int (luaopen_math) (lua_State *L);
+
+#define LUA_DBLIBNAME	"debug"
+LUAMOD_API int (luaopen_debug) (lua_State *L);
+
+#define LUA_LOADLIBNAME	"package"
+LUAMOD_API int (luaopen_package) (lua_State *L);
+
+
+/* open all previous libraries */
+LUALIB_API void (luaL_openlibs) (lua_State *L);
+
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lundump.c b/src/libs/3rdparty/lua/src/lundump.c
new file mode 100644
index 00000000000..02aed64fb62
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lundump.c
@@ -0,0 +1,335 @@
+/*
+** $Id: lundump.c $
+** load precompiled Lua chunks
+** See Copyright Notice in lua.h
+*/
+
+#define lundump_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <limits.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstring.h"
+#include "lundump.h"
+#include "lzio.h"
+
+
+#if !defined(luai_verifycode)
+#define luai_verifycode(L,f)  /* empty */
+#endif
+
+
+typedef struct {
+  lua_State *L;
+  ZIO *Z;
+  const char *name;
+} LoadState;
+
+
+static l_noret error (LoadState *S, const char *why) {
+  luaO_pushfstring(S->L, "%s: bad binary format (%s)", S->name, why);
+  luaD_throw(S->L, LUA_ERRSYNTAX);
+}
+
+
+/*
+** All high-level loads go through loadVector; you can change it to
+** adapt to the endianness of the input
+*/
+#define loadVector(S,b,n)	loadBlock(S,b,(n)*sizeof((b)[0]))
+
+static void loadBlock (LoadState *S, void *b, size_t size) {
+  if (luaZ_read(S->Z, b, size) != 0)
+    error(S, "truncated chunk");
+}
+
+
+#define loadVar(S,x)		loadVector(S,&x,1)
+
+
+static lu_byte loadByte (LoadState *S) {
+  int b = zgetc(S->Z);
+  if (b == EOZ)
+    error(S, "truncated chunk");
+  return cast_byte(b);
+}
+
+
+static size_t loadUnsigned (LoadState *S, size_t limit) {
+  size_t x = 0;
+  int b;
+  limit >>= 7;
+  do {
+    b = loadByte(S);
+    if (x >= limit)
+      error(S, "integer overflow");
+    x = (x << 7) | (b & 0x7f);
+  } while ((b & 0x80) == 0);
+  return x;
+}
+
+
+static size_t loadSize (LoadState *S) {
+  return loadUnsigned(S, ~(size_t)0);
+}
+
+
+static int loadInt (LoadState *S) {
+  return cast_int(loadUnsigned(S, INT_MAX));
+}
+
+
+static lua_Number loadNumber (LoadState *S) {
+  lua_Number x;
+  loadVar(S, x);
+  return x;
+}
+
+
+static lua_Integer loadInteger (LoadState *S) {
+  lua_Integer x;
+  loadVar(S, x);
+  return x;
+}
+
+
+/*
+** Load a nullable string into prototype 'p'.
+*/
+static TString *loadStringN (LoadState *S, Proto *p) {
+  lua_State *L = S->L;
+  TString *ts;
+  size_t size = loadSize(S);
+  if (size == 0)  /* no string? */
+    return NULL;
+  else if (--size <= LUAI_MAXSHORTLEN) {  /* short string? */
+    char buff[LUAI_MAXSHORTLEN];
+    loadVector(S, buff, size);  /* load string into buffer */
+    ts = luaS_newlstr(L, buff, size);  /* create string */
+  }
+  else {  /* long string */
+    ts = luaS_createlngstrobj(L, size);  /* create string */
+    setsvalue2s(L, L->top.p, ts);  /* anchor it ('loadVector' can GC) */
+    luaD_inctop(L);
+    loadVector(S, getstr(ts), size);  /* load directly in final place */
+    L->top.p--;  /* pop string */
+  }
+  luaC_objbarrier(L, p, ts);
+  return ts;
+}
+
+
+/*
+** Load a non-nullable string into prototype 'p'.
+*/
+static TString *loadString (LoadState *S, Proto *p) {
+  TString *st = loadStringN(S, p);
+  if (st == NULL)
+    error(S, "bad format for constant string");
+  return st;
+}
+
+
+static void loadCode (LoadState *S, Proto *f) {
+  int n = loadInt(S);
+  f->code = luaM_newvectorchecked(S->L, n, Instruction);
+  f->sizecode = n;
+  loadVector(S, f->code, n);
+}
+
+
+static void loadFunction(LoadState *S, Proto *f, TString *psource);
+
+
+static void loadConstants (LoadState *S, Proto *f) {
+  int i;
+  int n = loadInt(S);
+  f->k = luaM_newvectorchecked(S->L, n, TValue);
+  f->sizek = n;
+  for (i = 0; i < n; i++)
+    setnilvalue(&f->k[i]);
+  for (i = 0; i < n; i++) {
+    TValue *o = &f->k[i];
+    int t = loadByte(S);
+    switch (t) {
+      case LUA_VNIL:
+        setnilvalue(o);
+        break;
+      case LUA_VFALSE:
+        setbfvalue(o);
+        break;
+      case LUA_VTRUE:
+        setbtvalue(o);
+        break;
+      case LUA_VNUMFLT:
+        setfltvalue(o, loadNumber(S));
+        break;
+      case LUA_VNUMINT:
+        setivalue(o, loadInteger(S));
+        break;
+      case LUA_VSHRSTR:
+      case LUA_VLNGSTR:
+        setsvalue2n(S->L, o, loadString(S, f));
+        break;
+      default: lua_assert(0);
+    }
+  }
+}
+
+
+static void loadProtos (LoadState *S, Proto *f) {
+  int i;
+  int n = loadInt(S);
+  f->p = luaM_newvectorchecked(S->L, n, Proto *);
+  f->sizep = n;
+  for (i = 0; i < n; i++)
+    f->p[i] = NULL;
+  for (i = 0; i < n; i++) {
+    f->p[i] = luaF_newproto(S->L);
+    luaC_objbarrier(S->L, f, f->p[i]);
+    loadFunction(S, f->p[i], f->source);
+  }
+}
+
+
+/*
+** Load the upvalues for a function. The names must be filled first,
+** because the filling of the other fields can raise read errors and
+** the creation of the error message can call an emergency collection;
+** in that case all prototypes must be consistent for the GC.
+*/
+static void loadUpvalues (LoadState *S, Proto *f) {
+  int i, n;
+  n = loadInt(S);
+  f->upvalues = luaM_newvectorchecked(S->L, n, Upvaldesc);
+  f->sizeupvalues = n;
+  for (i = 0; i < n; i++)  /* make array valid for GC */
+    f->upvalues[i].name = NULL;
+  for (i = 0; i < n; i++) {  /* following calls can raise errors */
+    f->upvalues[i].instack = loadByte(S);
+    f->upvalues[i].idx = loadByte(S);
+    f->upvalues[i].kind = loadByte(S);
+  }
+}
+
+
+static void loadDebug (LoadState *S, Proto *f) {
+  int i, n;
+  n = loadInt(S);
+  f->lineinfo = luaM_newvectorchecked(S->L, n, ls_byte);
+  f->sizelineinfo = n;
+  loadVector(S, f->lineinfo, n);
+  n = loadInt(S);
+  f->abslineinfo = luaM_newvectorchecked(S->L, n, AbsLineInfo);
+  f->sizeabslineinfo = n;
+  for (i = 0; i < n; i++) {
+    f->abslineinfo[i].pc = loadInt(S);
+    f->abslineinfo[i].line = loadInt(S);
+  }
+  n = loadInt(S);
+  f->locvars = luaM_newvectorchecked(S->L, n, LocVar);
+  f->sizelocvars = n;
+  for (i = 0; i < n; i++)
+    f->locvars[i].varname = NULL;
+  for (i = 0; i < n; i++) {
+    f->locvars[i].varname = loadStringN(S, f);
+    f->locvars[i].startpc = loadInt(S);
+    f->locvars[i].endpc = loadInt(S);
+  }
+  n = loadInt(S);
+  if (n != 0)  /* does it have debug information? */
+    n = f->sizeupvalues;  /* must be this many */
+  for (i = 0; i < n; i++)
+    f->upvalues[i].name = loadStringN(S, f);
+}
+
+
+static void loadFunction (LoadState *S, Proto *f, TString *psource) {
+  f->source = loadStringN(S, f);
+  if (f->source == NULL)  /* no source in dump? */
+    f->source = psource;  /* reuse parent's source */
+  f->linedefined = loadInt(S);
+  f->lastlinedefined = loadInt(S);
+  f->numparams = loadByte(S);
+  f->is_vararg = loadByte(S);
+  f->maxstacksize = loadByte(S);
+  loadCode(S, f);
+  loadConstants(S, f);
+  loadUpvalues(S, f);
+  loadProtos(S, f);
+  loadDebug(S, f);
+}
+
+
+static void checkliteral (LoadState *S, const char *s, const char *msg) {
+  char buff[sizeof(LUA_SIGNATURE) + sizeof(LUAC_DATA)]; /* larger than both */
+  size_t len = strlen(s);
+  loadVector(S, buff, len);
+  if (memcmp(s, buff, len) != 0)
+    error(S, msg);
+}
+
+
+static void fchecksize (LoadState *S, size_t size, const char *tname) {
+  if (loadByte(S) != size)
+    error(S, luaO_pushfstring(S->L, "%s size mismatch", tname));
+}
+
+
+#define checksize(S,t)	fchecksize(S,sizeof(t),#t)
+
+static void checkHeader (LoadState *S) {
+  /* skip 1st char (already read and checked) */
+  checkliteral(S, &LUA_SIGNATURE[1], "not a binary chunk");
+  if (loadByte(S) != LUAC_VERSION)
+    error(S, "version mismatch");
+  if (loadByte(S) != LUAC_FORMAT)
+    error(S, "format mismatch");
+  checkliteral(S, LUAC_DATA, "corrupted chunk");
+  checksize(S, Instruction);
+  checksize(S, lua_Integer);
+  checksize(S, lua_Number);
+  if (loadInteger(S) != LUAC_INT)
+    error(S, "integer format mismatch");
+  if (loadNumber(S) != LUAC_NUM)
+    error(S, "float format mismatch");
+}
+
+
+/*
+** Load precompiled chunk.
+*/
+LClosure *luaU_undump(lua_State *L, ZIO *Z, const char *name) {
+  LoadState S;
+  LClosure *cl;
+  if (*name == '@' || *name == '=')
+    S.name = name + 1;
+  else if (*name == LUA_SIGNATURE[0])
+    S.name = "binary string";
+  else
+    S.name = name;
+  S.L = L;
+  S.Z = Z;
+  checkHeader(&S);
+  cl = luaF_newLclosure(L, loadByte(&S));
+  setclLvalue2s(L, L->top.p, cl);
+  luaD_inctop(L);
+  cl->p = luaF_newproto(L);
+  luaC_objbarrier(L, cl, cl->p);
+  loadFunction(&S, cl->p, NULL);
+  lua_assert(cl->nupvalues == cl->p->sizeupvalues);
+  luai_verifycode(L, cl->p);
+  return cl;
+}
+
diff --git a/src/libs/3rdparty/lua/src/lundump.h b/src/libs/3rdparty/lua/src/lundump.h
new file mode 100644
index 00000000000..f3748a99807
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lundump.h
@@ -0,0 +1,36 @@
+/*
+** $Id: lundump.h $
+** load precompiled Lua chunks
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lundump_h
+#define lundump_h
+
+#include "llimits.h"
+#include "lobject.h"
+#include "lzio.h"
+
+
+/* data to catch conversion errors */
+#define LUAC_DATA	"\x19\x93\r\n\x1a\n"
+
+#define LUAC_INT	0x5678
+#define LUAC_NUM	cast_num(370.5)
+
+/*
+** Encode major-minor version in one byte, one nibble for each
+*/
+#define MYINT(s)	(s[0]-'0')  /* assume one-digit numerals */
+#define LUAC_VERSION	(MYINT(LUA_VERSION_MAJOR)*16+MYINT(LUA_VERSION_MINOR))
+
+#define LUAC_FORMAT	0	/* this is the official format */
+
+/* load one chunk; from lundump.c */
+LUAI_FUNC LClosure* luaU_undump (lua_State* L, ZIO* Z, const char* name);
+
+/* dump one chunk; from ldump.c */
+LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w,
+                         void* data, int strip);
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lutf8lib.c b/src/libs/3rdparty/lua/src/lutf8lib.c
new file mode 100644
index 00000000000..3a5b9bc38a5
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lutf8lib.c
@@ -0,0 +1,291 @@
+/*
+** $Id: lutf8lib.c $
+** Standard library for UTF-8 manipulation
+** See Copyright Notice in lua.h
+*/
+
+#define lutf8lib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <assert.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+#define MAXUNICODE	0x10FFFFu
+
+#define MAXUTF		0x7FFFFFFFu
+
+
+#define MSGInvalid	"invalid UTF-8 code"
+
+/*
+** Integer type for decoded UTF-8 values; MAXUTF needs 31 bits.
+*/
+#if (UINT_MAX >> 30) >= 1
+typedef unsigned int utfint;
+#else
+typedef unsigned long utfint;
+#endif
+
+
+#define iscont(c)	(((c) & 0xC0) == 0x80)
+#define iscontp(p)	iscont(*(p))
+
+
+/* from strlib */
+/* translate a relative string position: negative means back from end */
+static lua_Integer u_posrelat (lua_Integer pos, size_t len) {
+  if (pos >= 0) return pos;
+  else if (0u - (size_t)pos > len) return 0;
+  else return (lua_Integer)len + pos + 1;
+}
+
+
+/*
+** Decode one UTF-8 sequence, returning NULL if byte sequence is
+** invalid.  The array 'limits' stores the minimum value for each
+** sequence length, to check for overlong representations. Its first
+** entry forces an error for non-ascii bytes with no continuation
+** bytes (count == 0).
+*/
+static const char *utf8_decode (const char *s, utfint *val, int strict) {
+  static const utfint limits[] =
+        {~(utfint)0, 0x80, 0x800, 0x10000u, 0x200000u, 0x4000000u};
+  unsigned int c = (unsigned char)s[0];
+  utfint res = 0;  /* final result */
+  if (c < 0x80)  /* ascii? */
+    res = c;
+  else {
+    int count = 0;  /* to count number of continuation bytes */
+    for (; c & 0x40; c <<= 1) {  /* while it needs continuation bytes... */
+      unsigned int cc = (unsigned char)s[++count];  /* read next byte */
+      if (!iscont(cc))  /* not a continuation byte? */
+        return NULL;  /* invalid byte sequence */
+      res = (res << 6) | (cc & 0x3F);  /* add lower 6 bits from cont. byte */
+    }
+    res |= ((utfint)(c & 0x7F) << (count * 5));  /* add first byte */
+    if (count > 5 || res > MAXUTF || res < limits[count])
+      return NULL;  /* invalid byte sequence */
+    s += count;  /* skip continuation bytes read */
+  }
+  if (strict) {
+    /* check for invalid code points; too large or surrogates */
+    if (res > MAXUNICODE || (0xD800u <= res && res <= 0xDFFFu))
+      return NULL;
+  }
+  if (val) *val = res;
+  return s + 1;  /* +1 to include first byte */
+}
+
+
+/*
+** utf8len(s [, i [, j [, lax]]]) --> number of characters that
+** start in the range [i,j], or nil + current position if 's' is not
+** well formed in that interval
+*/
+static int utflen (lua_State *L) {
+  lua_Integer n = 0;  /* counter for the number of characters */
+  size_t len;  /* string length in bytes */
+  const char *s = luaL_checklstring(L, 1, &len);
+  lua_Integer posi = u_posrelat(luaL_optinteger(L, 2, 1), len);
+  lua_Integer posj = u_posrelat(luaL_optinteger(L, 3, -1), len);
+  int lax = lua_toboolean(L, 4);
+  luaL_argcheck(L, 1 <= posi && --posi <= (lua_Integer)len, 2,
+                   "initial position out of bounds");
+  luaL_argcheck(L, --posj < (lua_Integer)len, 3,
+                   "final position out of bounds");
+  while (posi <= posj) {
+    const char *s1 = utf8_decode(s + posi, NULL, !lax);
+    if (s1 == NULL) {  /* conversion error? */
+      luaL_pushfail(L);  /* return fail ... */
+      lua_pushinteger(L, posi + 1);  /* ... and current position */
+      return 2;
+    }
+    posi = s1 - s;
+    n++;
+  }
+  lua_pushinteger(L, n);
+  return 1;
+}
+
+
+/*
+** codepoint(s, [i, [j [, lax]]]) -> returns codepoints for all
+** characters that start in the range [i,j]
+*/
+static int codepoint (lua_State *L) {
+  size_t len;
+  const char *s = luaL_checklstring(L, 1, &len);
+  lua_Integer posi = u_posrelat(luaL_optinteger(L, 2, 1), len);
+  lua_Integer pose = u_posrelat(luaL_optinteger(L, 3, posi), len);
+  int lax = lua_toboolean(L, 4);
+  int n;
+  const char *se;
+  luaL_argcheck(L, posi >= 1, 2, "out of bounds");
+  luaL_argcheck(L, pose <= (lua_Integer)len, 3, "out of bounds");
+  if (posi > pose) return 0;  /* empty interval; return no values */
+  if (pose - posi >= INT_MAX)  /* (lua_Integer -> int) overflow? */
+    return luaL_error(L, "string slice too long");
+  n = (int)(pose -  posi) + 1;  /* upper bound for number of returns */
+  luaL_checkstack(L, n, "string slice too long");
+  n = 0;  /* count the number of returns */
+  se = s + pose;  /* string end */
+  for (s += posi - 1; s < se;) {
+    utfint code;
+    s = utf8_decode(s, &code, !lax);
+    if (s == NULL)
+      return luaL_error(L, MSGInvalid);
+    lua_pushinteger(L, code);
+    n++;
+  }
+  return n;
+}
+
+
+static void pushutfchar (lua_State *L, int arg) {
+  lua_Unsigned code = (lua_Unsigned)luaL_checkinteger(L, arg);
+  luaL_argcheck(L, code <= MAXUTF, arg, "value out of range");
+  lua_pushfstring(L, "%U", (long)code);
+}
+
+
+/*
+** utfchar(n1, n2, ...)  -> char(n1)..char(n2)...
+*/
+static int utfchar (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  if (n == 1)  /* optimize common case of single char */
+    pushutfchar(L, 1);
+  else {
+    int i;
+    luaL_Buffer b;
+    luaL_buffinit(L, &b);
+    for (i = 1; i <= n; i++) {
+      pushutfchar(L, i);
+      luaL_addvalue(&b);
+    }
+    luaL_pushresult(&b);
+  }
+  return 1;
+}
+
+
+/*
+** offset(s, n, [i])  -> index where n-th character counting from
+**   position 'i' starts; 0 means character at 'i'.
+*/
+static int byteoffset (lua_State *L) {
+  size_t len;
+  const char *s = luaL_checklstring(L, 1, &len);
+  lua_Integer n  = luaL_checkinteger(L, 2);
+  lua_Integer posi = (n >= 0) ? 1 : len + 1;
+  posi = u_posrelat(luaL_optinteger(L, 3, posi), len);
+  luaL_argcheck(L, 1 <= posi && --posi <= (lua_Integer)len, 3,
+                   "position out of bounds");
+  if (n == 0) {
+    /* find beginning of current byte sequence */
+    while (posi > 0 && iscontp(s + posi)) posi--;
+  }
+  else {
+    if (iscontp(s + posi))
+      return luaL_error(L, "initial position is a continuation byte");
+    if (n < 0) {
+       while (n < 0 && posi > 0) {  /* move back */
+         do {  /* find beginning of previous character */
+           posi--;
+         } while (posi > 0 && iscontp(s + posi));
+         n++;
+       }
+     }
+     else {
+       n--;  /* do not move for 1st character */
+       while (n > 0 && posi < (lua_Integer)len) {
+         do {  /* find beginning of next character */
+           posi++;
+         } while (iscontp(s + posi));  /* (cannot pass final '\0') */
+         n--;
+       }
+     }
+  }
+  if (n == 0)  /* did it find given character? */
+    lua_pushinteger(L, posi + 1);
+  else  /* no such character */
+    luaL_pushfail(L);
+  return 1;
+}
+
+
+static int iter_aux (lua_State *L, int strict) {
+  size_t len;
+  const char *s = luaL_checklstring(L, 1, &len);
+  lua_Unsigned n = (lua_Unsigned)lua_tointeger(L, 2);
+  if (n < len) {
+    while (iscontp(s + n)) n++;  /* go to next character */
+  }
+  if (n >= len)  /* (also handles original 'n' being negative) */
+    return 0;  /* no more codepoints */
+  else {
+    utfint code;
+    const char *next = utf8_decode(s + n, &code, strict);
+    if (next == NULL || iscontp(next))
+      return luaL_error(L, MSGInvalid);
+    lua_pushinteger(L, n + 1);
+    lua_pushinteger(L, code);
+    return 2;
+  }
+}
+
+
+static int iter_auxstrict (lua_State *L) {
+  return iter_aux(L, 1);
+}
+
+static int iter_auxlax (lua_State *L) {
+  return iter_aux(L, 0);
+}
+
+
+static int iter_codes (lua_State *L) {
+  int lax = lua_toboolean(L, 2);
+  const char *s = luaL_checkstring(L, 1);
+  luaL_argcheck(L, !iscontp(s), 1, MSGInvalid);
+  lua_pushcfunction(L, lax ? iter_auxlax : iter_auxstrict);
+  lua_pushvalue(L, 1);
+  lua_pushinteger(L, 0);
+  return 3;
+}
+
+
+/* pattern to match a single UTF-8 character */
+#define UTF8PATT	"[\0-\x7F\xC2-\xFD][\x80-\xBF]*"
+
+
+static const luaL_Reg funcs[] = {
+  {"offset", byteoffset},
+  {"codepoint", codepoint},
+  {"char", utfchar},
+  {"len", utflen},
+  {"codes", iter_codes},
+  /* placeholders */
+  {"charpattern", NULL},
+  {NULL, NULL}
+};
+
+
+LUAMOD_API int luaopen_utf8 (lua_State *L) {
+  luaL_newlib(L, funcs);
+  lua_pushlstring(L, UTF8PATT, sizeof(UTF8PATT)/sizeof(char) - 1);
+  lua_setfield(L, -2, "charpattern");
+  return 1;
+}
+
diff --git a/src/libs/3rdparty/lua/src/lvm.c b/src/libs/3rdparty/lua/src/lvm.c
new file mode 100644
index 00000000000..8493a770c56
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lvm.c
@@ -0,0 +1,1901 @@
+/*
+** $Id: lvm.c $
+** Lua virtual machine
+** See Copyright Notice in lua.h
+*/
+
+#define lvm_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+#include <float.h>
+#include <limits.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+#include "lvm.h"
+
+
+/*
+** By default, use jump tables in the main interpreter loop on gcc
+** and compatible compilers.
+*/
+#if !defined(LUA_USE_JUMPTABLE)
+#if defined(__GNUC__)
+#define LUA_USE_JUMPTABLE	1
+#else
+#define LUA_USE_JUMPTABLE	0
+#endif
+#endif
+
+
+
+/* limit for table tag-method chains (to avoid infinite loops) */
+#define MAXTAGLOOP	2000
+
+
+/*
+** 'l_intfitsf' checks whether a given integer is in the range that
+** can be converted to a float without rounding. Used in comparisons.
+*/
+
+/* number of bits in the mantissa of a float */
+#define NBM		(l_floatatt(MANT_DIG))
+
+/*
+** Check whether some integers may not fit in a float, testing whether
+** (maxinteger >> NBM) > 0. (That implies (1 << NBM) <= maxinteger.)
+** (The shifts are done in parts, to avoid shifting by more than the size
+** of an integer. In a worst case, NBM == 113 for long double and
+** sizeof(long) == 32.)
+*/
+#if ((((LUA_MAXINTEGER >> (NBM / 4)) >> (NBM / 4)) >> (NBM / 4)) \
+	>> (NBM - (3 * (NBM / 4))))  >  0
+
+/* limit for integers that fit in a float */
+#define MAXINTFITSF	((lua_Unsigned)1 << NBM)
+
+/* check whether 'i' is in the interval [-MAXINTFITSF, MAXINTFITSF] */
+#define l_intfitsf(i)	((MAXINTFITSF + l_castS2U(i)) <= (2 * MAXINTFITSF))
+
+#else  /* all integers fit in a float precisely */
+
+#define l_intfitsf(i)	1
+
+#endif
+
+
+/*
+** Try to convert a value from string to a number value.
+** If the value is not a string or is a string not representing
+** a valid numeral (or if coercions from strings to numbers
+** are disabled via macro 'cvt2num'), do not modify 'result'
+** and return 0.
+*/
+static int l_strton (const TValue *obj, TValue *result) {
+  lua_assert(obj != result);
+  if (!cvt2num(obj))  /* is object not a string? */
+    return 0;
+  else
+    return (luaO_str2num(svalue(obj), result) == vslen(obj) + 1);
+}
+
+
+/*
+** Try to convert a value to a float. The float case is already handled
+** by the macro 'tonumber'.
+*/
+int luaV_tonumber_ (const TValue *obj, lua_Number *n) {
+  TValue v;
+  if (ttisinteger(obj)) {
+    *n = cast_num(ivalue(obj));
+    return 1;
+  }
+  else if (l_strton(obj, &v)) {  /* string coercible to number? */
+    *n = nvalue(&v);  /* convert result of 'luaO_str2num' to a float */
+    return 1;
+  }
+  else
+    return 0;  /* conversion failed */
+}
+
+
+/*
+** try to convert a float to an integer, rounding according to 'mode'.
+*/
+int luaV_flttointeger (lua_Number n, lua_Integer *p, F2Imod mode) {
+  lua_Number f = l_floor(n);
+  if (n != f) {  /* not an integral value? */
+    if (mode == F2Ieq) return 0;  /* fails if mode demands integral value */
+    else if (mode == F2Iceil)  /* needs ceil? */
+      f += 1;  /* convert floor to ceil (remember: n != f) */
+  }
+  return lua_numbertointeger(f, p);
+}
+
+
+/*
+** try to convert a value to an integer, rounding according to 'mode',
+** without string coercion.
+** ("Fast track" handled by macro 'tointegerns'.)
+*/
+int luaV_tointegerns (const TValue *obj, lua_Integer *p, F2Imod mode) {
+  if (ttisfloat(obj))
+    return luaV_flttointeger(fltvalue(obj), p, mode);
+  else if (ttisinteger(obj)) {
+    *p = ivalue(obj);
+    return 1;
+  }
+  else
+    return 0;
+}
+
+
+/*
+** try to convert a value to an integer.
+*/
+int luaV_tointeger (const TValue *obj, lua_Integer *p, F2Imod mode) {
+  TValue v;
+  if (l_strton(obj, &v))  /* does 'obj' point to a numerical string? */
+    obj = &v;  /* change it to point to its corresponding number */
+  return luaV_tointegerns(obj, p, mode);
+}
+
+
+/*
+** Try to convert a 'for' limit to an integer, preserving the semantics
+** of the loop. Return true if the loop must not run; otherwise, '*p'
+** gets the integer limit.
+** (The following explanation assumes a positive step; it is valid for
+** negative steps mutatis mutandis.)
+** If the limit is an integer or can be converted to an integer,
+** rounding down, that is the limit.
+** Otherwise, check whether the limit can be converted to a float. If
+** the float is too large, clip it to LUA_MAXINTEGER.  If the float
+** is too negative, the loop should not run, because any initial
+** integer value is greater than such limit; so, the function returns
+** true to signal that. (For this latter case, no integer limit would be
+** correct; even a limit of LUA_MININTEGER would run the loop once for
+** an initial value equal to LUA_MININTEGER.)
+*/
+static int forlimit (lua_State *L, lua_Integer init, const TValue *lim,
+                                   lua_Integer *p, lua_Integer step) {
+  if (!luaV_tointeger(lim, p, (step < 0 ? F2Iceil : F2Ifloor))) {
+    /* not coercible to in integer */
+    lua_Number flim;  /* try to convert to float */
+    if (!tonumber(lim, &flim)) /* cannot convert to float? */
+      luaG_forerror(L, lim, "limit");
+    /* else 'flim' is a float out of integer bounds */
+    if (luai_numlt(0, flim)) {  /* if it is positive, it is too large */
+      if (step < 0) return 1;  /* initial value must be less than it */
+      *p = LUA_MAXINTEGER;  /* truncate */
+    }
+    else {  /* it is less than min integer */
+      if (step > 0) return 1;  /* initial value must be greater than it */
+      *p = LUA_MININTEGER;  /* truncate */
+    }
+  }
+  return (step > 0 ? init > *p : init < *p);  /* not to run? */
+}
+
+
+/*
+** Prepare a numerical for loop (opcode OP_FORPREP).
+** Return true to skip the loop. Otherwise,
+** after preparation, stack will be as follows:
+**   ra : internal index (safe copy of the control variable)
+**   ra + 1 : loop counter (integer loops) or limit (float loops)
+**   ra + 2 : step
+**   ra + 3 : control variable
+*/
+static int forprep (lua_State *L, StkId ra) {
+  TValue *pinit = s2v(ra);
+  TValue *plimit = s2v(ra + 1);
+  TValue *pstep = s2v(ra + 2);
+  if (ttisinteger(pinit) && ttisinteger(pstep)) { /* integer loop? */
+    lua_Integer init = ivalue(pinit);
+    lua_Integer step = ivalue(pstep);
+    lua_Integer limit;
+    if (step == 0)
+      luaG_runerror(L, "'for' step is zero");
+    setivalue(s2v(ra + 3), init);  /* control variable */
+    if (forlimit(L, init, plimit, &limit, step))
+      return 1;  /* skip the loop */
+    else {  /* prepare loop counter */
+      lua_Unsigned count;
+      if (step > 0) {  /* ascending loop? */
+        count = l_castS2U(limit) - l_castS2U(init);
+        if (step != 1)  /* avoid division in the too common case */
+          count /= l_castS2U(step);
+      }
+      else {  /* step < 0; descending loop */
+        count = l_castS2U(init) - l_castS2U(limit);
+        /* 'step+1' avoids negating 'mininteger' */
+        count /= l_castS2U(-(step + 1)) + 1u;
+      }
+      /* store the counter in place of the limit (which won't be
+         needed anymore) */
+      setivalue(plimit, l_castU2S(count));
+    }
+  }
+  else {  /* try making all values floats */
+    lua_Number init; lua_Number limit; lua_Number step;
+    if (l_unlikely(!tonumber(plimit, &limit)))
+      luaG_forerror(L, plimit, "limit");
+    if (l_unlikely(!tonumber(pstep, &step)))
+      luaG_forerror(L, pstep, "step");
+    if (l_unlikely(!tonumber(pinit, &init)))
+      luaG_forerror(L, pinit, "initial value");
+    if (step == 0)
+      luaG_runerror(L, "'for' step is zero");
+    if (luai_numlt(0, step) ? luai_numlt(limit, init)
+                            : luai_numlt(init, limit))
+      return 1;  /* skip the loop */
+    else {
+      /* make sure internal values are all floats */
+      setfltvalue(plimit, limit);
+      setfltvalue(pstep, step);
+      setfltvalue(s2v(ra), init);  /* internal index */
+      setfltvalue(s2v(ra + 3), init);  /* control variable */
+    }
+  }
+  return 0;
+}
+
+
+/*
+** Execute a step of a float numerical for loop, returning
+** true iff the loop must continue. (The integer case is
+** written online with opcode OP_FORLOOP, for performance.)
+*/
+static int floatforloop (StkId ra) {
+  lua_Number step = fltvalue(s2v(ra + 2));
+  lua_Number limit = fltvalue(s2v(ra + 1));
+  lua_Number idx = fltvalue(s2v(ra));  /* internal index */
+  idx = luai_numadd(L, idx, step);  /* increment index */
+  if (luai_numlt(0, step) ? luai_numle(idx, limit)
+                          : luai_numle(limit, idx)) {
+    chgfltvalue(s2v(ra), idx);  /* update internal index */
+    setfltvalue(s2v(ra + 3), idx);  /* and control variable */
+    return 1;  /* jump back */
+  }
+  else
+    return 0;  /* finish the loop */
+}
+
+
+/*
+** Finish the table access 'val = t[key]'.
+** if 'slot' is NULL, 't' is not a table; otherwise, 'slot' points to
+** t[k] entry (which must be empty).
+*/
+void luaV_finishget (lua_State *L, const TValue *t, TValue *key, StkId val,
+                      const TValue *slot) {
+  int loop;  /* counter to avoid infinite loops */
+  const TValue *tm;  /* metamethod */
+  for (loop = 0; loop < MAXTAGLOOP; loop++) {
+    if (slot == NULL) {  /* 't' is not a table? */
+      lua_assert(!ttistable(t));
+      tm = luaT_gettmbyobj(L, t, TM_INDEX);
+      if (l_unlikely(notm(tm)))
+        luaG_typeerror(L, t, "index");  /* no metamethod */
+      /* else will try the metamethod */
+    }
+    else {  /* 't' is a table */
+      lua_assert(isempty(slot));
+      tm = fasttm(L, hvalue(t)->metatable, TM_INDEX);  /* table's metamethod */
+      if (tm == NULL) {  /* no metamethod? */
+        setnilvalue(s2v(val));  /* result is nil */
+        return;
+      }
+      /* else will try the metamethod */
+    }
+    if (ttisfunction(tm)) {  /* is metamethod a function? */
+      luaT_callTMres(L, tm, t, key, val);  /* call it */
+      return;
+    }
+    t = tm;  /* else try to access 'tm[key]' */
+    if (luaV_fastget(L, t, key, slot, luaH_get)) {  /* fast track? */
+      setobj2s(L, val, slot);  /* done */
+      return;
+    }
+    /* else repeat (tail call 'luaV_finishget') */
+  }
+  luaG_runerror(L, "'__index' chain too long; possible loop");
+}
+
+
+/*
+** Finish a table assignment 't[key] = val'.
+** If 'slot' is NULL, 't' is not a table.  Otherwise, 'slot' points
+** to the entry 't[key]', or to a value with an absent key if there
+** is no such entry.  (The value at 'slot' must be empty, otherwise
+** 'luaV_fastget' would have done the job.)
+*/
+void luaV_finishset (lua_State *L, const TValue *t, TValue *key,
+                     TValue *val, const TValue *slot) {
+  int loop;  /* counter to avoid infinite loops */
+  for (loop = 0; loop < MAXTAGLOOP; loop++) {
+    const TValue *tm;  /* '__newindex' metamethod */
+    if (slot != NULL) {  /* is 't' a table? */
+      Table *h = hvalue(t);  /* save 't' table */
+      lua_assert(isempty(slot));  /* slot must be empty */
+      tm = fasttm(L, h->metatable, TM_NEWINDEX);  /* get metamethod */
+      if (tm == NULL) {  /* no metamethod? */
+        luaH_finishset(L, h, key, slot, val);  /* set new value */
+        invalidateTMcache(h);
+        luaC_barrierback(L, obj2gco(h), val);
+        return;
+      }
+      /* else will try the metamethod */
+    }
+    else {  /* not a table; check metamethod */
+      tm = luaT_gettmbyobj(L, t, TM_NEWINDEX);
+      if (l_unlikely(notm(tm)))
+        luaG_typeerror(L, t, "index");
+    }
+    /* try the metamethod */
+    if (ttisfunction(tm)) {
+      luaT_callTM(L, tm, t, key, val);
+      return;
+    }
+    t = tm;  /* else repeat assignment over 'tm' */
+    if (luaV_fastget(L, t, key, slot, luaH_get)) {
+      luaV_finishfastset(L, t, slot, val);
+      return;  /* done */
+    }
+    /* else 'return luaV_finishset(L, t, key, val, slot)' (loop) */
+  }
+  luaG_runerror(L, "'__newindex' chain too long; possible loop");
+}
+
+
+/*
+** Compare two strings 'ls' x 'rs', returning an integer less-equal-
+** -greater than zero if 'ls' is less-equal-greater than 'rs'.
+** The code is a little tricky because it allows '\0' in the strings
+** and it uses 'strcoll' (to respect locales) for each segments
+** of the strings.
+*/
+static int l_strcmp (const TString *ls, const TString *rs) {
+  const char *l = getstr(ls);
+  size_t ll = tsslen(ls);
+  const char *r = getstr(rs);
+  size_t lr = tsslen(rs);
+  for (;;) {  /* for each segment */
+    int temp = strcoll(l, r);
+    if (temp != 0)  /* not equal? */
+      return temp;  /* done */
+    else {  /* strings are equal up to a '\0' */
+      size_t len = strlen(l);  /* index of first '\0' in both strings */
+      if (len == lr)  /* 'rs' is finished? */
+        return (len == ll) ? 0 : 1;  /* check 'ls' */
+      else if (len == ll)  /* 'ls' is finished? */
+        return -1;  /* 'ls' is less than 'rs' ('rs' is not finished) */
+      /* both strings longer than 'len'; go on comparing after the '\0' */
+      len++;
+      l += len; ll -= len; r += len; lr -= len;
+    }
+  }
+}
+
+
+/*
+** Check whether integer 'i' is less than float 'f'. If 'i' has an
+** exact representation as a float ('l_intfitsf'), compare numbers as
+** floats. Otherwise, use the equivalence 'i < f <=> i < ceil(f)'.
+** If 'ceil(f)' is out of integer range, either 'f' is greater than
+** all integers or less than all integers.
+** (The test with 'l_intfitsf' is only for performance; the else
+** case is correct for all values, but it is slow due to the conversion
+** from float to int.)
+** When 'f' is NaN, comparisons must result in false.
+*/
+l_sinline int LTintfloat (lua_Integer i, lua_Number f) {
+  if (l_intfitsf(i))
+    return luai_numlt(cast_num(i), f);  /* compare them as floats */
+  else {  /* i < f <=> i < ceil(f) */
+    lua_Integer fi;
+    if (luaV_flttointeger(f, &fi, F2Iceil))  /* fi = ceil(f) */
+      return i < fi;   /* compare them as integers */
+    else  /* 'f' is either greater or less than all integers */
+      return f > 0;  /* greater? */
+  }
+}
+
+
+/*
+** Check whether integer 'i' is less than or equal to float 'f'.
+** See comments on previous function.
+*/
+l_sinline int LEintfloat (lua_Integer i, lua_Number f) {
+  if (l_intfitsf(i))
+    return luai_numle(cast_num(i), f);  /* compare them as floats */
+  else {  /* i <= f <=> i <= floor(f) */
+    lua_Integer fi;
+    if (luaV_flttointeger(f, &fi, F2Ifloor))  /* fi = floor(f) */
+      return i <= fi;   /* compare them as integers */
+    else  /* 'f' is either greater or less than all integers */
+      return f > 0;  /* greater? */
+  }
+}
+
+
+/*
+** Check whether float 'f' is less than integer 'i'.
+** See comments on previous function.
+*/
+l_sinline int LTfloatint (lua_Number f, lua_Integer i) {
+  if (l_intfitsf(i))
+    return luai_numlt(f, cast_num(i));  /* compare them as floats */
+  else {  /* f < i <=> floor(f) < i */
+    lua_Integer fi;
+    if (luaV_flttointeger(f, &fi, F2Ifloor))  /* fi = floor(f) */
+      return fi < i;   /* compare them as integers */
+    else  /* 'f' is either greater or less than all integers */
+      return f < 0;  /* less? */
+  }
+}
+
+
+/*
+** Check whether float 'f' is less than or equal to integer 'i'.
+** See comments on previous function.
+*/
+l_sinline int LEfloatint (lua_Number f, lua_Integer i) {
+  if (l_intfitsf(i))
+    return luai_numle(f, cast_num(i));  /* compare them as floats */
+  else {  /* f <= i <=> ceil(f) <= i */
+    lua_Integer fi;
+    if (luaV_flttointeger(f, &fi, F2Iceil))  /* fi = ceil(f) */
+      return fi <= i;   /* compare them as integers */
+    else  /* 'f' is either greater or less than all integers */
+      return f < 0;  /* less? */
+  }
+}
+
+
+/*
+** Return 'l < r', for numbers.
+*/
+l_sinline int LTnum (const TValue *l, const TValue *r) {
+  lua_assert(ttisnumber(l) && ttisnumber(r));
+  if (ttisinteger(l)) {
+    lua_Integer li = ivalue(l);
+    if (ttisinteger(r))
+      return li < ivalue(r);  /* both are integers */
+    else  /* 'l' is int and 'r' is float */
+      return LTintfloat(li, fltvalue(r));  /* l < r ? */
+  }
+  else {
+    lua_Number lf = fltvalue(l);  /* 'l' must be float */
+    if (ttisfloat(r))
+      return luai_numlt(lf, fltvalue(r));  /* both are float */
+    else  /* 'l' is float and 'r' is int */
+      return LTfloatint(lf, ivalue(r));
+  }
+}
+
+
+/*
+** Return 'l <= r', for numbers.
+*/
+l_sinline int LEnum (const TValue *l, const TValue *r) {
+  lua_assert(ttisnumber(l) && ttisnumber(r));
+  if (ttisinteger(l)) {
+    lua_Integer li = ivalue(l);
+    if (ttisinteger(r))
+      return li <= ivalue(r);  /* both are integers */
+    else  /* 'l' is int and 'r' is float */
+      return LEintfloat(li, fltvalue(r));  /* l <= r ? */
+  }
+  else {
+    lua_Number lf = fltvalue(l);  /* 'l' must be float */
+    if (ttisfloat(r))
+      return luai_numle(lf, fltvalue(r));  /* both are float */
+    else  /* 'l' is float and 'r' is int */
+      return LEfloatint(lf, ivalue(r));
+  }
+}
+
+
+/*
+** return 'l < r' for non-numbers.
+*/
+static int lessthanothers (lua_State *L, const TValue *l, const TValue *r) {
+  lua_assert(!ttisnumber(l) || !ttisnumber(r));
+  if (ttisstring(l) && ttisstring(r))  /* both are strings? */
+    return l_strcmp(tsvalue(l), tsvalue(r)) < 0;
+  else
+    return luaT_callorderTM(L, l, r, TM_LT);
+}
+
+
+/*
+** Main operation less than; return 'l < r'.
+*/
+int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r) {
+  if (ttisnumber(l) && ttisnumber(r))  /* both operands are numbers? */
+    return LTnum(l, r);
+  else return lessthanothers(L, l, r);
+}
+
+
+/*
+** return 'l <= r' for non-numbers.
+*/
+static int lessequalothers (lua_State *L, const TValue *l, const TValue *r) {
+  lua_assert(!ttisnumber(l) || !ttisnumber(r));
+  if (ttisstring(l) && ttisstring(r))  /* both are strings? */
+    return l_strcmp(tsvalue(l), tsvalue(r)) <= 0;
+  else
+    return luaT_callorderTM(L, l, r, TM_LE);
+}
+
+
+/*
+** Main operation less than or equal to; return 'l <= r'.
+*/
+int luaV_lessequal (lua_State *L, const TValue *l, const TValue *r) {
+  if (ttisnumber(l) && ttisnumber(r))  /* both operands are numbers? */
+    return LEnum(l, r);
+  else return lessequalothers(L, l, r);
+}
+
+
+/*
+** Main operation for equality of Lua values; return 't1 == t2'.
+** L == NULL means raw equality (no metamethods)
+*/
+int luaV_equalobj (lua_State *L, const TValue *t1, const TValue *t2) {
+  const TValue *tm;
+  if (ttypetag(t1) != ttypetag(t2)) {  /* not the same variant? */
+    if (ttype(t1) != ttype(t2) || ttype(t1) != LUA_TNUMBER)
+      return 0;  /* only numbers can be equal with different variants */
+    else {  /* two numbers with different variants */
+      /* One of them is an integer. If the other does not have an
+         integer value, they cannot be equal; otherwise, compare their
+         integer values. */
+      lua_Integer i1, i2;
+      return (luaV_tointegerns(t1, &i1, F2Ieq) &&
+              luaV_tointegerns(t2, &i2, F2Ieq) &&
+              i1 == i2);
+    }
+  }
+  /* values have same type and same variant */
+  switch (ttypetag(t1)) {
+    case LUA_VNIL: case LUA_VFALSE: case LUA_VTRUE: return 1;
+    case LUA_VNUMINT: return (ivalue(t1) == ivalue(t2));
+    case LUA_VNUMFLT: return luai_numeq(fltvalue(t1), fltvalue(t2));
+    case LUA_VLIGHTUSERDATA: return pvalue(t1) == pvalue(t2);
+    case LUA_VLCF: return fvalue(t1) == fvalue(t2);
+    case LUA_VSHRSTR: return eqshrstr(tsvalue(t1), tsvalue(t2));
+    case LUA_VLNGSTR: return luaS_eqlngstr(tsvalue(t1), tsvalue(t2));
+    case LUA_VUSERDATA: {
+      if (uvalue(t1) == uvalue(t2)) return 1;
+      else if (L == NULL) return 0;
+      tm = fasttm(L, uvalue(t1)->metatable, TM_EQ);
+      if (tm == NULL)
+        tm = fasttm(L, uvalue(t2)->metatable, TM_EQ);
+      break;  /* will try TM */
+    }
+    case LUA_VTABLE: {
+      if (hvalue(t1) == hvalue(t2)) return 1;
+      else if (L == NULL) return 0;
+      tm = fasttm(L, hvalue(t1)->metatable, TM_EQ);
+      if (tm == NULL)
+        tm = fasttm(L, hvalue(t2)->metatable, TM_EQ);
+      break;  /* will try TM */
+    }
+    default:
+      return gcvalue(t1) == gcvalue(t2);
+  }
+  if (tm == NULL)  /* no TM? */
+    return 0;  /* objects are different */
+  else {
+    luaT_callTMres(L, tm, t1, t2, L->top.p);  /* call TM */
+    return !l_isfalse(s2v(L->top.p));
+  }
+}
+
+
+/* macro used by 'luaV_concat' to ensure that element at 'o' is a string */
+#define tostring(L,o)  \
+	(ttisstring(o) || (cvt2str(o) && (luaO_tostring(L, o), 1)))
+
+#define isemptystr(o)	(ttisshrstring(o) && tsvalue(o)->shrlen == 0)
+
+/* copy strings in stack from top - n up to top - 1 to buffer */
+static void copy2buff (StkId top, int n, char *buff) {
+  size_t tl = 0;  /* size already copied */
+  do {
+    size_t l = vslen(s2v(top - n));  /* length of string being copied */
+    memcpy(buff + tl, svalue(s2v(top - n)), l * sizeof(char));
+    tl += l;
+  } while (--n > 0);
+}
+
+
+/*
+** Main operation for concatenation: concat 'total' values in the stack,
+** from 'L->top.p - total' up to 'L->top.p - 1'.
+*/
+void luaV_concat (lua_State *L, int total) {
+  if (total == 1)
+    return;  /* "all" values already concatenated */
+  do {
+    StkId top = L->top.p;
+    int n = 2;  /* number of elements handled in this pass (at least 2) */
+    if (!(ttisstring(s2v(top - 2)) || cvt2str(s2v(top - 2))) ||
+        !tostring(L, s2v(top - 1)))
+      luaT_tryconcatTM(L);  /* may invalidate 'top' */
+    else if (isemptystr(s2v(top - 1)))  /* second operand is empty? */
+      cast_void(tostring(L, s2v(top - 2)));  /* result is first operand */
+    else if (isemptystr(s2v(top - 2))) {  /* first operand is empty string? */
+      setobjs2s(L, top - 2, top - 1);  /* result is second op. */
+    }
+    else {
+      /* at least two non-empty string values; get as many as possible */
+      size_t tl = vslen(s2v(top - 1));
+      TString *ts;
+      /* collect total length and number of strings */
+      for (n = 1; n < total && tostring(L, s2v(top - n - 1)); n++) {
+        size_t l = vslen(s2v(top - n - 1));
+        if (l_unlikely(l >= (MAX_SIZE/sizeof(char)) - tl)) {
+          L->top.p = top - total;  /* pop strings to avoid wasting stack */
+          luaG_runerror(L, "string length overflow");
+        }
+        tl += l;
+      }
+      if (tl <= LUAI_MAXSHORTLEN) {  /* is result a short string? */
+        char buff[LUAI_MAXSHORTLEN];
+        copy2buff(top, n, buff);  /* copy strings to buffer */
+        ts = luaS_newlstr(L, buff, tl);
+      }
+      else {  /* long string; copy strings directly to final result */
+        ts = luaS_createlngstrobj(L, tl);
+        copy2buff(top, n, getstr(ts));
+      }
+      setsvalue2s(L, top - n, ts);  /* create result */
+    }
+    total -= n - 1;  /* got 'n' strings to create one new */
+    L->top.p -= n - 1;  /* popped 'n' strings and pushed one */
+  } while (total > 1);  /* repeat until only 1 result left */
+}
+
+
+/*
+** Main operation 'ra = #rb'.
+*/
+void luaV_objlen (lua_State *L, StkId ra, const TValue *rb) {
+  const TValue *tm;
+  switch (ttypetag(rb)) {
+    case LUA_VTABLE: {
+      Table *h = hvalue(rb);
+      tm = fasttm(L, h->metatable, TM_LEN);
+      if (tm) break;  /* metamethod? break switch to call it */
+      setivalue(s2v(ra), luaH_getn(h));  /* else primitive len */
+      return;
+    }
+    case LUA_VSHRSTR: {
+      setivalue(s2v(ra), tsvalue(rb)->shrlen);
+      return;
+    }
+    case LUA_VLNGSTR: {
+      setivalue(s2v(ra), tsvalue(rb)->u.lnglen);
+      return;
+    }
+    default: {  /* try metamethod */
+      tm = luaT_gettmbyobj(L, rb, TM_LEN);
+      if (l_unlikely(notm(tm)))  /* no metamethod? */
+        luaG_typeerror(L, rb, "get length of");
+      break;
+    }
+  }
+  luaT_callTMres(L, tm, rb, rb, ra);
+}
+
+
+/*
+** Integer division; return 'm // n', that is, floor(m/n).
+** C division truncates its result (rounds towards zero).
+** 'floor(q) == trunc(q)' when 'q >= 0' or when 'q' is integer,
+** otherwise 'floor(q) == trunc(q) - 1'.
+*/
+lua_Integer luaV_idiv (lua_State *L, lua_Integer m, lua_Integer n) {
+  if (l_unlikely(l_castS2U(n) + 1u <= 1u)) {  /* special cases: -1 or 0 */
+    if (n == 0)
+      luaG_runerror(L, "attempt to divide by zero");
+    return intop(-, 0, m);   /* n==-1; avoid overflow with 0x80000...//-1 */
+  }
+  else {
+    lua_Integer q = m / n;  /* perform C division */
+    if ((m ^ n) < 0 && m % n != 0)  /* 'm/n' would be negative non-integer? */
+      q -= 1;  /* correct result for different rounding */
+    return q;
+  }
+}
+
+
+/*
+** Integer modulus; return 'm % n'. (Assume that C '%' with
+** negative operands follows C99 behavior. See previous comment
+** about luaV_idiv.)
+*/
+lua_Integer luaV_mod (lua_State *L, lua_Integer m, lua_Integer n) {
+  if (l_unlikely(l_castS2U(n) + 1u <= 1u)) {  /* special cases: -1 or 0 */
+    if (n == 0)
+      luaG_runerror(L, "attempt to perform 'n%%0'");
+    return 0;   /* m % -1 == 0; avoid overflow with 0x80000...%-1 */
+  }
+  else {
+    lua_Integer r = m % n;
+    if (r != 0 && (r ^ n) < 0)  /* 'm/n' would be non-integer negative? */
+      r += n;  /* correct result for different rounding */
+    return r;
+  }
+}
+
+
+/*
+** Float modulus
+*/
+lua_Number luaV_modf (lua_State *L, lua_Number m, lua_Number n) {
+  lua_Number r;
+  luai_nummod(L, m, n, r);
+  return r;
+}
+
+
+/* number of bits in an integer */
+#define NBITS	cast_int(sizeof(lua_Integer) * CHAR_BIT)
+
+
+/*
+** Shift left operation. (Shift right just negates 'y'.)
+*/
+lua_Integer luaV_shiftl (lua_Integer x, lua_Integer y) {
+  if (y < 0) {  /* shift right? */
+    if (y <= -NBITS) return 0;
+    else return intop(>>, x, -y);
+  }
+  else {  /* shift left */
+    if (y >= NBITS) return 0;
+    else return intop(<<, x, y);
+  }
+}
+
+
+/*
+** create a new Lua closure, push it in the stack, and initialize
+** its upvalues.
+*/
+static void pushclosure (lua_State *L, Proto *p, UpVal **encup, StkId base,
+                         StkId ra) {
+  int nup = p->sizeupvalues;
+  Upvaldesc *uv = p->upvalues;
+  int i;
+  LClosure *ncl = luaF_newLclosure(L, nup);
+  ncl->p = p;
+  setclLvalue2s(L, ra, ncl);  /* anchor new closure in stack */
+  for (i = 0; i < nup; i++) {  /* fill in its upvalues */
+    if (uv[i].instack)  /* upvalue refers to local variable? */
+      ncl->upvals[i] = luaF_findupval(L, base + uv[i].idx);
+    else  /* get upvalue from enclosing function */
+      ncl->upvals[i] = encup[uv[i].idx];
+    luaC_objbarrier(L, ncl, ncl->upvals[i]);
+  }
+}
+
+
+/*
+** finish execution of an opcode interrupted by a yield
+*/
+void luaV_finishOp (lua_State *L) {
+  CallInfo *ci = L->ci;
+  StkId base = ci->func.p + 1;
+  Instruction inst = *(ci->u.l.savedpc - 1);  /* interrupted instruction */
+  OpCode op = GET_OPCODE(inst);
+  switch (op) {  /* finish its execution */
+    case OP_MMBIN: case OP_MMBINI: case OP_MMBINK: {
+      setobjs2s(L, base + GETARG_A(*(ci->u.l.savedpc - 2)), --L->top.p);
+      break;
+    }
+    case OP_UNM: case OP_BNOT: case OP_LEN:
+    case OP_GETTABUP: case OP_GETTABLE: case OP_GETI:
+    case OP_GETFIELD: case OP_SELF: {
+      setobjs2s(L, base + GETARG_A(inst), --L->top.p);
+      break;
+    }
+    case OP_LT: case OP_LE:
+    case OP_LTI: case OP_LEI:
+    case OP_GTI: case OP_GEI:
+    case OP_EQ: {  /* note that 'OP_EQI'/'OP_EQK' cannot yield */
+      int res = !l_isfalse(s2v(L->top.p - 1));
+      L->top.p--;
+#if defined(LUA_COMPAT_LT_LE)
+      if (ci->callstatus & CIST_LEQ) {  /* "<=" using "<" instead? */
+        ci->callstatus ^= CIST_LEQ;  /* clear mark */
+        res = !res;  /* negate result */
+      }
+#endif
+      lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_JMP);
+      if (res != GETARG_k(inst))  /* condition failed? */
+        ci->u.l.savedpc++;  /* skip jump instruction */
+      break;
+    }
+    case OP_CONCAT: {
+      StkId top = L->top.p - 1;  /* top when 'luaT_tryconcatTM' was called */
+      int a = GETARG_A(inst);      /* first element to concatenate */
+      int total = cast_int(top - 1 - (base + a));  /* yet to concatenate */
+      setobjs2s(L, top - 2, top);  /* put TM result in proper position */
+      L->top.p = top - 1;  /* top is one after last element (at top-2) */
+      luaV_concat(L, total);  /* concat them (may yield again) */
+      break;
+    }
+    case OP_CLOSE: {  /* yielded closing variables */
+      ci->u.l.savedpc--;  /* repeat instruction to close other vars. */
+      break;
+    }
+    case OP_RETURN: {  /* yielded closing variables */
+      StkId ra = base + GETARG_A(inst);
+      /* adjust top to signal correct number of returns, in case the
+         return is "up to top" ('isIT') */
+      L->top.p = ra + ci->u2.nres;
+      /* repeat instruction to close other vars. and complete the return */
+      ci->u.l.savedpc--;
+      break;
+    }
+    default: {
+      /* only these other opcodes can yield */
+      lua_assert(op == OP_TFORCALL || op == OP_CALL ||
+           op == OP_TAILCALL || op == OP_SETTABUP || op == OP_SETTABLE ||
+           op == OP_SETI || op == OP_SETFIELD);
+      break;
+    }
+  }
+}
+
+
+
+
+/*
+** {==================================================================
+** Macros for arithmetic/bitwise/comparison opcodes in 'luaV_execute'
+** ===================================================================
+*/
+
+#define l_addi(L,a,b)	intop(+, a, b)
+#define l_subi(L,a,b)	intop(-, a, b)
+#define l_muli(L,a,b)	intop(*, a, b)
+#define l_band(a,b)	intop(&, a, b)
+#define l_bor(a,b)	intop(|, a, b)
+#define l_bxor(a,b)	intop(^, a, b)
+
+#define l_lti(a,b)	(a < b)
+#define l_lei(a,b)	(a <= b)
+#define l_gti(a,b)	(a > b)
+#define l_gei(a,b)	(a >= b)
+
+
+/*
+** Arithmetic operations with immediate operands. 'iop' is the integer
+** operation, 'fop' is the float operation.
+*/
+#define op_arithI(L,iop,fop) {  \
+  StkId ra = RA(i); \
+  TValue *v1 = vRB(i);  \
+  int imm = GETARG_sC(i);  \
+  if (ttisinteger(v1)) {  \
+    lua_Integer iv1 = ivalue(v1);  \
+    pc++; setivalue(s2v(ra), iop(L, iv1, imm));  \
+  }  \
+  else if (ttisfloat(v1)) {  \
+    lua_Number nb = fltvalue(v1);  \
+    lua_Number fimm = cast_num(imm);  \
+    pc++; setfltvalue(s2v(ra), fop(L, nb, fimm)); \
+  }}
+
+
+/*
+** Auxiliary function for arithmetic operations over floats and others
+** with two register operands.
+*/
+#define op_arithf_aux(L,v1,v2,fop) {  \
+  lua_Number n1; lua_Number n2;  \
+  if (tonumberns(v1, n1) && tonumberns(v2, n2)) {  \
+    pc++; setfltvalue(s2v(ra), fop(L, n1, n2));  \
+  }}
+
+
+/*
+** Arithmetic operations over floats and others with register operands.
+*/
+#define op_arithf(L,fop) {  \
+  StkId ra = RA(i); \
+  TValue *v1 = vRB(i);  \
+  TValue *v2 = vRC(i);  \
+  op_arithf_aux(L, v1, v2, fop); }
+
+
+/*
+** Arithmetic operations with K operands for floats.
+*/
+#define op_arithfK(L,fop) {  \
+  StkId ra = RA(i); \
+  TValue *v1 = vRB(i);  \
+  TValue *v2 = KC(i); lua_assert(ttisnumber(v2));  \
+  op_arithf_aux(L, v1, v2, fop); }
+
+
+/*
+** Arithmetic operations over integers and floats.
+*/
+#define op_arith_aux(L,v1,v2,iop,fop) {  \
+  StkId ra = RA(i); \
+  if (ttisinteger(v1) && ttisinteger(v2)) {  \
+    lua_Integer i1 = ivalue(v1); lua_Integer i2 = ivalue(v2);  \
+    pc++; setivalue(s2v(ra), iop(L, i1, i2));  \
+  }  \
+  else op_arithf_aux(L, v1, v2, fop); }
+
+
+/*
+** Arithmetic operations with register operands.
+*/
+#define op_arith(L,iop,fop) {  \
+  TValue *v1 = vRB(i);  \
+  TValue *v2 = vRC(i);  \
+  op_arith_aux(L, v1, v2, iop, fop); }
+
+
+/*
+** Arithmetic operations with K operands.
+*/
+#define op_arithK(L,iop,fop) {  \
+  TValue *v1 = vRB(i);  \
+  TValue *v2 = KC(i); lua_assert(ttisnumber(v2));  \
+  op_arith_aux(L, v1, v2, iop, fop); }
+
+
+/*
+** Bitwise operations with constant operand.
+*/
+#define op_bitwiseK(L,op) {  \
+  StkId ra = RA(i); \
+  TValue *v1 = vRB(i);  \
+  TValue *v2 = KC(i);  \
+  lua_Integer i1;  \
+  lua_Integer i2 = ivalue(v2);  \
+  if (tointegerns(v1, &i1)) {  \
+    pc++; setivalue(s2v(ra), op(i1, i2));  \
+  }}
+
+
+/*
+** Bitwise operations with register operands.
+*/
+#define op_bitwise(L,op) {  \
+  StkId ra = RA(i); \
+  TValue *v1 = vRB(i);  \
+  TValue *v2 = vRC(i);  \
+  lua_Integer i1; lua_Integer i2;  \
+  if (tointegerns(v1, &i1) && tointegerns(v2, &i2)) {  \
+    pc++; setivalue(s2v(ra), op(i1, i2));  \
+  }}
+
+
+/*
+** Order operations with register operands. 'opn' actually works
+** for all numbers, but the fast track improves performance for
+** integers.
+*/
+#define op_order(L,opi,opn,other) {  \
+  StkId ra = RA(i); \
+  int cond;  \
+  TValue *rb = vRB(i);  \
+  if (ttisinteger(s2v(ra)) && ttisinteger(rb)) {  \
+    lua_Integer ia = ivalue(s2v(ra));  \
+    lua_Integer ib = ivalue(rb);  \
+    cond = opi(ia, ib);  \
+  }  \
+  else if (ttisnumber(s2v(ra)) && ttisnumber(rb))  \
+    cond = opn(s2v(ra), rb);  \
+  else  \
+    Protect(cond = other(L, s2v(ra), rb));  \
+  docondjump(); }
+
+
+/*
+** Order operations with immediate operand. (Immediate operand is
+** always small enough to have an exact representation as a float.)
+*/
+#define op_orderI(L,opi,opf,inv,tm) {  \
+  StkId ra = RA(i); \
+  int cond;  \
+  int im = GETARG_sB(i);  \
+  if (ttisinteger(s2v(ra)))  \
+    cond = opi(ivalue(s2v(ra)), im);  \
+  else if (ttisfloat(s2v(ra))) {  \
+    lua_Number fa = fltvalue(s2v(ra));  \
+    lua_Number fim = cast_num(im);  \
+    cond = opf(fa, fim);  \
+  }  \
+  else {  \
+    int isf = GETARG_C(i);  \
+    Protect(cond = luaT_callorderiTM(L, s2v(ra), im, inv, isf, tm));  \
+  }  \
+  docondjump(); }
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Function 'luaV_execute': main interpreter loop
+** ===================================================================
+*/
+
+/*
+** some macros for common tasks in 'luaV_execute'
+*/
+
+
+#define RA(i)	(base+GETARG_A(i))
+#define RB(i)	(base+GETARG_B(i))
+#define vRB(i)	s2v(RB(i))
+#define KB(i)	(k+GETARG_B(i))
+#define RC(i)	(base+GETARG_C(i))
+#define vRC(i)	s2v(RC(i))
+#define KC(i)	(k+GETARG_C(i))
+#define RKC(i)	((TESTARG_k(i)) ? k + GETARG_C(i) : s2v(base + GETARG_C(i)))
+
+
+
+#define updatetrap(ci)  (trap = ci->u.l.trap)
+
+#define updatebase(ci)	(base = ci->func.p + 1)
+
+
+#define updatestack(ci)  \
+	{ if (l_unlikely(trap)) { updatebase(ci); ra = RA(i); } }
+
+
+/*
+** Execute a jump instruction. The 'updatetrap' allows signals to stop
+** tight loops. (Without it, the local copy of 'trap' could never change.)
+*/
+#define dojump(ci,i,e)	{ pc += GETARG_sJ(i) + e; updatetrap(ci); }
+
+
+/* for test instructions, execute the jump instruction that follows it */
+#define donextjump(ci)	{ Instruction ni = *pc; dojump(ci, ni, 1); }
+
+/*
+** do a conditional jump: skip next instruction if 'cond' is not what
+** was expected (parameter 'k'), else do next instruction, which must
+** be a jump.
+*/
+#define docondjump()	if (cond != GETARG_k(i)) pc++; else donextjump(ci);
+
+
+/*
+** Correct global 'pc'.
+*/
+#define savepc(L)	(ci->u.l.savedpc = pc)
+
+
+/*
+** Whenever code can raise errors, the global 'pc' and the global
+** 'top' must be correct to report occasional errors.
+*/
+#define savestate(L,ci)		(savepc(L), L->top.p = ci->top.p)
+
+
+/*
+** Protect code that, in general, can raise errors, reallocate the
+** stack, and change the hooks.
+*/
+#define Protect(exp)  (savestate(L,ci), (exp), updatetrap(ci))
+
+/* special version that does not change the top */
+#define ProtectNT(exp)  (savepc(L), (exp), updatetrap(ci))
+
+/*
+** Protect code that can only raise errors. (That is, it cannot change
+** the stack or hooks.)
+*/
+#define halfProtect(exp)  (savestate(L,ci), (exp))
+
+/* 'c' is the limit of live values in the stack */
+#define checkGC(L,c)  \
+	{ luaC_condGC(L, (savepc(L), L->top.p = (c)), \
+                         updatetrap(ci)); \
+           luai_threadyield(L); }
+
+
+/* fetch an instruction and prepare its execution */
+#define vmfetch()	{ \
+  if (l_unlikely(trap)) {  /* stack reallocation or hooks? */ \
+    trap = luaG_traceexec(L, pc);  /* handle hooks */ \
+    updatebase(ci);  /* correct stack */ \
+  } \
+  i = *(pc++); \
+}
+
+#define vmdispatch(o)	switch(o)
+#define vmcase(l)	case l:
+#define vmbreak		break
+
+
+void luaV_execute (lua_State *L, CallInfo *ci) {
+  LClosure *cl;
+  TValue *k;
+  StkId base;
+  const Instruction *pc;
+  int trap;
+#if LUA_USE_JUMPTABLE
+#include "ljumptab.h"
+#endif
+ startfunc:
+  trap = L->hookmask;
+ returning:  /* trap already set */
+  cl = clLvalue(s2v(ci->func.p));
+  k = cl->p->k;
+  pc = ci->u.l.savedpc;
+  if (l_unlikely(trap)) {
+    if (pc == cl->p->code) {  /* first instruction (not resuming)? */
+      if (cl->p->is_vararg)
+        trap = 0;  /* hooks will start after VARARGPREP instruction */
+      else  /* check 'call' hook */
+        luaD_hookcall(L, ci);
+    }
+    ci->u.l.trap = 1;  /* assume trap is on, for now */
+  }
+  base = ci->func.p + 1;
+  /* main loop of interpreter */
+  for (;;) {
+    Instruction i;  /* instruction being executed */
+    vmfetch();
+    #if 0
+      /* low-level line tracing for debugging Lua */
+      printf("line: %d\n", luaG_getfuncline(cl->p, pcRel(pc, cl->p)));
+    #endif
+    lua_assert(base == ci->func.p + 1);
+    lua_assert(base <= L->top.p && L->top.p <= L->stack_last.p);
+    /* invalidate top for instructions not expecting it */
+    lua_assert(isIT(i) || (cast_void(L->top.p = base), 1));
+    vmdispatch (GET_OPCODE(i)) {
+      vmcase(OP_MOVE) {
+        StkId ra = RA(i);
+        setobjs2s(L, ra, RB(i));
+        vmbreak;
+      }
+      vmcase(OP_LOADI) {
+        StkId ra = RA(i);
+        lua_Integer b = GETARG_sBx(i);
+        setivalue(s2v(ra), b);
+        vmbreak;
+      }
+      vmcase(OP_LOADF) {
+        StkId ra = RA(i);
+        int b = GETARG_sBx(i);
+        setfltvalue(s2v(ra), cast_num(b));
+        vmbreak;
+      }
+      vmcase(OP_LOADK) {
+        StkId ra = RA(i);
+        TValue *rb = k + GETARG_Bx(i);
+        setobj2s(L, ra, rb);
+        vmbreak;
+      }
+      vmcase(OP_LOADKX) {
+        StkId ra = RA(i);
+        TValue *rb;
+        rb = k + GETARG_Ax(*pc); pc++;
+        setobj2s(L, ra, rb);
+        vmbreak;
+      }
+      vmcase(OP_LOADFALSE) {
+        StkId ra = RA(i);
+        setbfvalue(s2v(ra));
+        vmbreak;
+      }
+      vmcase(OP_LFALSESKIP) {
+        StkId ra = RA(i);
+        setbfvalue(s2v(ra));
+        pc++;  /* skip next instruction */
+        vmbreak;
+      }
+      vmcase(OP_LOADTRUE) {
+        StkId ra = RA(i);
+        setbtvalue(s2v(ra));
+        vmbreak;
+      }
+      vmcase(OP_LOADNIL) {
+        StkId ra = RA(i);
+        int b = GETARG_B(i);
+        do {
+          setnilvalue(s2v(ra++));
+        } while (b--);
+        vmbreak;
+      }
+      vmcase(OP_GETUPVAL) {
+        StkId ra = RA(i);
+        int b = GETARG_B(i);
+        setobj2s(L, ra, cl->upvals[b]->v.p);
+        vmbreak;
+      }
+      vmcase(OP_SETUPVAL) {
+        StkId ra = RA(i);
+        UpVal *uv = cl->upvals[GETARG_B(i)];
+        setobj(L, uv->v.p, s2v(ra));
+        luaC_barrier(L, uv, s2v(ra));
+        vmbreak;
+      }
+      vmcase(OP_GETTABUP) {
+        StkId ra = RA(i);
+        const TValue *slot;
+        TValue *upval = cl->upvals[GETARG_B(i)]->v.p;
+        TValue *rc = KC(i);
+        TString *key = tsvalue(rc);  /* key must be a string */
+        if (luaV_fastget(L, upval, key, slot, luaH_getshortstr)) {
+          setobj2s(L, ra, slot);
+        }
+        else
+          Protect(luaV_finishget(L, upval, rc, ra, slot));
+        vmbreak;
+      }
+      vmcase(OP_GETTABLE) {
+        StkId ra = RA(i);
+        const TValue *slot;
+        TValue *rb = vRB(i);
+        TValue *rc = vRC(i);
+        lua_Unsigned n;
+        if (ttisinteger(rc)  /* fast track for integers? */
+            ? (cast_void(n = ivalue(rc)), luaV_fastgeti(L, rb, n, slot))
+            : luaV_fastget(L, rb, rc, slot, luaH_get)) {
+          setobj2s(L, ra, slot);
+        }
+        else
+          Protect(luaV_finishget(L, rb, rc, ra, slot));
+        vmbreak;
+      }
+      vmcase(OP_GETI) {
+        StkId ra = RA(i);
+        const TValue *slot;
+        TValue *rb = vRB(i);
+        int c = GETARG_C(i);
+        if (luaV_fastgeti(L, rb, c, slot)) {
+          setobj2s(L, ra, slot);
+        }
+        else {
+          TValue key;
+          setivalue(&key, c);
+          Protect(luaV_finishget(L, rb, &key, ra, slot));
+        }
+        vmbreak;
+      }
+      vmcase(OP_GETFIELD) {
+        StkId ra = RA(i);
+        const TValue *slot;
+        TValue *rb = vRB(i);
+        TValue *rc = KC(i);
+        TString *key = tsvalue(rc);  /* key must be a string */
+        if (luaV_fastget(L, rb, key, slot, luaH_getshortstr)) {
+          setobj2s(L, ra, slot);
+        }
+        else
+          Protect(luaV_finishget(L, rb, rc, ra, slot));
+        vmbreak;
+      }
+      vmcase(OP_SETTABUP) {
+        const TValue *slot;
+        TValue *upval = cl->upvals[GETARG_A(i)]->v.p;
+        TValue *rb = KB(i);
+        TValue *rc = RKC(i);
+        TString *key = tsvalue(rb);  /* key must be a string */
+        if (luaV_fastget(L, upval, key, slot, luaH_getshortstr)) {
+          luaV_finishfastset(L, upval, slot, rc);
+        }
+        else
+          Protect(luaV_finishset(L, upval, rb, rc, slot));
+        vmbreak;
+      }
+      vmcase(OP_SETTABLE) {
+        StkId ra = RA(i);
+        const TValue *slot;
+        TValue *rb = vRB(i);  /* key (table is in 'ra') */
+        TValue *rc = RKC(i);  /* value */
+        lua_Unsigned n;
+        if (ttisinteger(rb)  /* fast track for integers? */
+            ? (cast_void(n = ivalue(rb)), luaV_fastgeti(L, s2v(ra), n, slot))
+            : luaV_fastget(L, s2v(ra), rb, slot, luaH_get)) {
+          luaV_finishfastset(L, s2v(ra), slot, rc);
+        }
+        else
+          Protect(luaV_finishset(L, s2v(ra), rb, rc, slot));
+        vmbreak;
+      }
+      vmcase(OP_SETI) {
+        StkId ra = RA(i);
+        const TValue *slot;
+        int c = GETARG_B(i);
+        TValue *rc = RKC(i);
+        if (luaV_fastgeti(L, s2v(ra), c, slot)) {
+          luaV_finishfastset(L, s2v(ra), slot, rc);
+        }
+        else {
+          TValue key;
+          setivalue(&key, c);
+          Protect(luaV_finishset(L, s2v(ra), &key, rc, slot));
+        }
+        vmbreak;
+      }
+      vmcase(OP_SETFIELD) {
+        StkId ra = RA(i);
+        const TValue *slot;
+        TValue *rb = KB(i);
+        TValue *rc = RKC(i);
+        TString *key = tsvalue(rb);  /* key must be a string */
+        if (luaV_fastget(L, s2v(ra), key, slot, luaH_getshortstr)) {
+          luaV_finishfastset(L, s2v(ra), slot, rc);
+        }
+        else
+          Protect(luaV_finishset(L, s2v(ra), rb, rc, slot));
+        vmbreak;
+      }
+      vmcase(OP_NEWTABLE) {
+        StkId ra = RA(i);
+        int b = GETARG_B(i);  /* log2(hash size) + 1 */
+        int c = GETARG_C(i);  /* array size */
+        Table *t;
+        if (b > 0)
+          b = 1 << (b - 1);  /* size is 2^(b - 1) */
+        lua_assert((!TESTARG_k(i)) == (GETARG_Ax(*pc) == 0));
+        if (TESTARG_k(i))  /* non-zero extra argument? */
+          c += GETARG_Ax(*pc) * (MAXARG_C + 1);  /* add it to size */
+        pc++;  /* skip extra argument */
+        L->top.p = ra + 1;  /* correct top in case of emergency GC */
+        t = luaH_new(L);  /* memory allocation */
+        sethvalue2s(L, ra, t);
+        if (b != 0 || c != 0)
+          luaH_resize(L, t, c, b);  /* idem */
+        checkGC(L, ra + 1);
+        vmbreak;
+      }
+      vmcase(OP_SELF) {
+        StkId ra = RA(i);
+        const TValue *slot;
+        TValue *rb = vRB(i);
+        TValue *rc = RKC(i);
+        TString *key = tsvalue(rc);  /* key must be a string */
+        setobj2s(L, ra + 1, rb);
+        if (luaV_fastget(L, rb, key, slot, luaH_getstr)) {
+          setobj2s(L, ra, slot);
+        }
+        else
+          Protect(luaV_finishget(L, rb, rc, ra, slot));
+        vmbreak;
+      }
+      vmcase(OP_ADDI) {
+        op_arithI(L, l_addi, luai_numadd);
+        vmbreak;
+      }
+      vmcase(OP_ADDK) {
+        op_arithK(L, l_addi, luai_numadd);
+        vmbreak;
+      }
+      vmcase(OP_SUBK) {
+        op_arithK(L, l_subi, luai_numsub);
+        vmbreak;
+      }
+      vmcase(OP_MULK) {
+        op_arithK(L, l_muli, luai_nummul);
+        vmbreak;
+      }
+      vmcase(OP_MODK) {
+        savestate(L, ci);  /* in case of division by 0 */
+        op_arithK(L, luaV_mod, luaV_modf);
+        vmbreak;
+      }
+      vmcase(OP_POWK) {
+        op_arithfK(L, luai_numpow);
+        vmbreak;
+      }
+      vmcase(OP_DIVK) {
+        op_arithfK(L, luai_numdiv);
+        vmbreak;
+      }
+      vmcase(OP_IDIVK) {
+        savestate(L, ci);  /* in case of division by 0 */
+        op_arithK(L, luaV_idiv, luai_numidiv);
+        vmbreak;
+      }
+      vmcase(OP_BANDK) {
+        op_bitwiseK(L, l_band);
+        vmbreak;
+      }
+      vmcase(OP_BORK) {
+        op_bitwiseK(L, l_bor);
+        vmbreak;
+      }
+      vmcase(OP_BXORK) {
+        op_bitwiseK(L, l_bxor);
+        vmbreak;
+      }
+      vmcase(OP_SHRI) {
+        StkId ra = RA(i);
+        TValue *rb = vRB(i);
+        int ic = GETARG_sC(i);
+        lua_Integer ib;
+        if (tointegerns(rb, &ib)) {
+          pc++; setivalue(s2v(ra), luaV_shiftl(ib, -ic));
+        }
+        vmbreak;
+      }
+      vmcase(OP_SHLI) {
+        StkId ra = RA(i);
+        TValue *rb = vRB(i);
+        int ic = GETARG_sC(i);
+        lua_Integer ib;
+        if (tointegerns(rb, &ib)) {
+          pc++; setivalue(s2v(ra), luaV_shiftl(ic, ib));
+        }
+        vmbreak;
+      }
+      vmcase(OP_ADD) {
+        op_arith(L, l_addi, luai_numadd);
+        vmbreak;
+      }
+      vmcase(OP_SUB) {
+        op_arith(L, l_subi, luai_numsub);
+        vmbreak;
+      }
+      vmcase(OP_MUL) {
+        op_arith(L, l_muli, luai_nummul);
+        vmbreak;
+      }
+      vmcase(OP_MOD) {
+        savestate(L, ci);  /* in case of division by 0 */
+        op_arith(L, luaV_mod, luaV_modf);
+        vmbreak;
+      }
+      vmcase(OP_POW) {
+        op_arithf(L, luai_numpow);
+        vmbreak;
+      }
+      vmcase(OP_DIV) {  /* float division (always with floats) */
+        op_arithf(L, luai_numdiv);
+        vmbreak;
+      }
+      vmcase(OP_IDIV) {  /* floor division */
+        savestate(L, ci);  /* in case of division by 0 */
+        op_arith(L, luaV_idiv, luai_numidiv);
+        vmbreak;
+      }
+      vmcase(OP_BAND) {
+        op_bitwise(L, l_band);
+        vmbreak;
+      }
+      vmcase(OP_BOR) {
+        op_bitwise(L, l_bor);
+        vmbreak;
+      }
+      vmcase(OP_BXOR) {
+        op_bitwise(L, l_bxor);
+        vmbreak;
+      }
+      vmcase(OP_SHR) {
+        op_bitwise(L, luaV_shiftr);
+        vmbreak;
+      }
+      vmcase(OP_SHL) {
+        op_bitwise(L, luaV_shiftl);
+        vmbreak;
+      }
+      vmcase(OP_MMBIN) {
+        StkId ra = RA(i);
+        Instruction pi = *(pc - 2);  /* original arith. expression */
+        TValue *rb = vRB(i);
+        TMS tm = (TMS)GETARG_C(i);
+        StkId result = RA(pi);
+        lua_assert(OP_ADD <= GET_OPCODE(pi) && GET_OPCODE(pi) <= OP_SHR);
+        Protect(luaT_trybinTM(L, s2v(ra), rb, result, tm));
+        vmbreak;
+      }
+      vmcase(OP_MMBINI) {
+        StkId ra = RA(i);
+        Instruction pi = *(pc - 2);  /* original arith. expression */
+        int imm = GETARG_sB(i);
+        TMS tm = (TMS)GETARG_C(i);
+        int flip = GETARG_k(i);
+        StkId result = RA(pi);
+        Protect(luaT_trybiniTM(L, s2v(ra), imm, flip, result, tm));
+        vmbreak;
+      }
+      vmcase(OP_MMBINK) {
+        StkId ra = RA(i);
+        Instruction pi = *(pc - 2);  /* original arith. expression */
+        TValue *imm = KB(i);
+        TMS tm = (TMS)GETARG_C(i);
+        int flip = GETARG_k(i);
+        StkId result = RA(pi);
+        Protect(luaT_trybinassocTM(L, s2v(ra), imm, flip, result, tm));
+        vmbreak;
+      }
+      vmcase(OP_UNM) {
+        StkId ra = RA(i);
+        TValue *rb = vRB(i);
+        lua_Number nb;
+        if (ttisinteger(rb)) {
+          lua_Integer ib = ivalue(rb);
+          setivalue(s2v(ra), intop(-, 0, ib));
+        }
+        else if (tonumberns(rb, nb)) {
+          setfltvalue(s2v(ra), luai_numunm(L, nb));
+        }
+        else
+          Protect(luaT_trybinTM(L, rb, rb, ra, TM_UNM));
+        vmbreak;
+      }
+      vmcase(OP_BNOT) {
+        StkId ra = RA(i);
+        TValue *rb = vRB(i);
+        lua_Integer ib;
+        if (tointegerns(rb, &ib)) {
+          setivalue(s2v(ra), intop(^, ~l_castS2U(0), ib));
+        }
+        else
+          Protect(luaT_trybinTM(L, rb, rb, ra, TM_BNOT));
+        vmbreak;
+      }
+      vmcase(OP_NOT) {
+        StkId ra = RA(i);
+        TValue *rb = vRB(i);
+        if (l_isfalse(rb))
+          setbtvalue(s2v(ra));
+        else
+          setbfvalue(s2v(ra));
+        vmbreak;
+      }
+      vmcase(OP_LEN) {
+        StkId ra = RA(i);
+        Protect(luaV_objlen(L, ra, vRB(i)));
+        vmbreak;
+      }
+      vmcase(OP_CONCAT) {
+        StkId ra = RA(i);
+        int n = GETARG_B(i);  /* number of elements to concatenate */
+        L->top.p = ra + n;  /* mark the end of concat operands */
+        ProtectNT(luaV_concat(L, n));
+        checkGC(L, L->top.p); /* 'luaV_concat' ensures correct top */
+        vmbreak;
+      }
+      vmcase(OP_CLOSE) {
+        StkId ra = RA(i);
+        Protect(luaF_close(L, ra, LUA_OK, 1));
+        vmbreak;
+      }
+      vmcase(OP_TBC) {
+        StkId ra = RA(i);
+        /* create new to-be-closed upvalue */
+        halfProtect(luaF_newtbcupval(L, ra));
+        vmbreak;
+      }
+      vmcase(OP_JMP) {
+        dojump(ci, i, 0);
+        vmbreak;
+      }
+      vmcase(OP_EQ) {
+        StkId ra = RA(i);
+        int cond;
+        TValue *rb = vRB(i);
+        Protect(cond = luaV_equalobj(L, s2v(ra), rb));
+        docondjump();
+        vmbreak;
+      }
+      vmcase(OP_LT) {
+        op_order(L, l_lti, LTnum, lessthanothers);
+        vmbreak;
+      }
+      vmcase(OP_LE) {
+        op_order(L, l_lei, LEnum, lessequalothers);
+        vmbreak;
+      }
+      vmcase(OP_EQK) {
+        StkId ra = RA(i);
+        TValue *rb = KB(i);
+        /* basic types do not use '__eq'; we can use raw equality */
+        int cond = luaV_rawequalobj(s2v(ra), rb);
+        docondjump();
+        vmbreak;
+      }
+      vmcase(OP_EQI) {
+        StkId ra = RA(i);
+        int cond;
+        int im = GETARG_sB(i);
+        if (ttisinteger(s2v(ra)))
+          cond = (ivalue(s2v(ra)) == im);
+        else if (ttisfloat(s2v(ra)))
+          cond = luai_numeq(fltvalue(s2v(ra)), cast_num(im));
+        else
+          cond = 0;  /* other types cannot be equal to a number */
+        docondjump();
+        vmbreak;
+      }
+      vmcase(OP_LTI) {
+        op_orderI(L, l_lti, luai_numlt, 0, TM_LT);
+        vmbreak;
+      }
+      vmcase(OP_LEI) {
+        op_orderI(L, l_lei, luai_numle, 0, TM_LE);
+        vmbreak;
+      }
+      vmcase(OP_GTI) {
+        op_orderI(L, l_gti, luai_numgt, 1, TM_LT);
+        vmbreak;
+      }
+      vmcase(OP_GEI) {
+        op_orderI(L, l_gei, luai_numge, 1, TM_LE);
+        vmbreak;
+      }
+      vmcase(OP_TEST) {
+        StkId ra = RA(i);
+        int cond = !l_isfalse(s2v(ra));
+        docondjump();
+        vmbreak;
+      }
+      vmcase(OP_TESTSET) {
+        StkId ra = RA(i);
+        TValue *rb = vRB(i);
+        if (l_isfalse(rb) == GETARG_k(i))
+          pc++;
+        else {
+          setobj2s(L, ra, rb);
+          donextjump(ci);
+        }
+        vmbreak;
+      }
+      vmcase(OP_CALL) {
+        StkId ra = RA(i);
+        CallInfo *newci;
+        int b = GETARG_B(i);
+        int nresults = GETARG_C(i) - 1;
+        if (b != 0)  /* fixed number of arguments? */
+          L->top.p = ra + b;  /* top signals number of arguments */
+        /* else previous instruction set top */
+        savepc(L);  /* in case of errors */
+        if ((newci = luaD_precall(L, ra, nresults)) == NULL)
+          updatetrap(ci);  /* C call; nothing else to be done */
+        else {  /* Lua call: run function in this same C frame */
+          ci = newci;
+          goto startfunc;
+        }
+        vmbreak;
+      }
+      vmcase(OP_TAILCALL) {
+        StkId ra = RA(i);
+        int b = GETARG_B(i);  /* number of arguments + 1 (function) */
+        int n;  /* number of results when calling a C function */
+        int nparams1 = GETARG_C(i);
+        /* delta is virtual 'func' - real 'func' (vararg functions) */
+        int delta = (nparams1) ? ci->u.l.nextraargs + nparams1 : 0;
+        if (b != 0)
+          L->top.p = ra + b;
+        else  /* previous instruction set top */
+          b = cast_int(L->top.p - ra);
+        savepc(ci);  /* several calls here can raise errors */
+        if (TESTARG_k(i)) {
+          luaF_closeupval(L, base);  /* close upvalues from current call */
+          lua_assert(L->tbclist.p < base);  /* no pending tbc variables */
+          lua_assert(base == ci->func.p + 1);
+        }
+        if ((n = luaD_pretailcall(L, ci, ra, b, delta)) < 0)  /* Lua function? */
+          goto startfunc;  /* execute the callee */
+        else {  /* C function? */
+          ci->func.p -= delta;  /* restore 'func' (if vararg) */
+          luaD_poscall(L, ci, n);  /* finish caller */
+          updatetrap(ci);  /* 'luaD_poscall' can change hooks */
+          goto ret;  /* caller returns after the tail call */
+        }
+      }
+      vmcase(OP_RETURN) {
+        StkId ra = RA(i);
+        int n = GETARG_B(i) - 1;  /* number of results */
+        int nparams1 = GETARG_C(i);
+        if (n < 0)  /* not fixed? */
+          n = cast_int(L->top.p - ra);  /* get what is available */
+        savepc(ci);
+        if (TESTARG_k(i)) {  /* may there be open upvalues? */
+          ci->u2.nres = n;  /* save number of returns */
+          if (L->top.p < ci->top.p)
+            L->top.p = ci->top.p;
+          luaF_close(L, base, CLOSEKTOP, 1);
+          updatetrap(ci);
+          updatestack(ci);
+        }
+        if (nparams1)  /* vararg function? */
+          ci->func.p -= ci->u.l.nextraargs + nparams1;
+        L->top.p = ra + n;  /* set call for 'luaD_poscall' */
+        luaD_poscall(L, ci, n);
+        updatetrap(ci);  /* 'luaD_poscall' can change hooks */
+        goto ret;
+      }
+      vmcase(OP_RETURN0) {
+        if (l_unlikely(L->hookmask)) {
+          StkId ra = RA(i);
+          L->top.p = ra;
+          savepc(ci);
+          luaD_poscall(L, ci, 0);  /* no hurry... */
+          trap = 1;
+        }
+        else {  /* do the 'poscall' here */
+          int nres;
+          L->ci = ci->previous;  /* back to caller */
+          L->top.p = base - 1;
+          for (nres = ci->nresults; l_unlikely(nres > 0); nres--)
+            setnilvalue(s2v(L->top.p++));  /* all results are nil */
+        }
+        goto ret;
+      }
+      vmcase(OP_RETURN1) {
+        if (l_unlikely(L->hookmask)) {
+          StkId ra = RA(i);
+          L->top.p = ra + 1;
+          savepc(ci);
+          luaD_poscall(L, ci, 1);  /* no hurry... */
+          trap = 1;
+        }
+        else {  /* do the 'poscall' here */
+          int nres = ci->nresults;
+          L->ci = ci->previous;  /* back to caller */
+          if (nres == 0)
+            L->top.p = base - 1;  /* asked for no results */
+          else {
+            StkId ra = RA(i);
+            setobjs2s(L, base - 1, ra);  /* at least this result */
+            L->top.p = base;
+            for (; l_unlikely(nres > 1); nres--)
+              setnilvalue(s2v(L->top.p++));  /* complete missing results */
+          }
+        }
+       ret:  /* return from a Lua function */
+        if (ci->callstatus & CIST_FRESH)
+          return;  /* end this frame */
+        else {
+          ci = ci->previous;
+          goto returning;  /* continue running caller in this frame */
+        }
+      }
+      vmcase(OP_FORLOOP) {
+        StkId ra = RA(i);
+        if (ttisinteger(s2v(ra + 2))) {  /* integer loop? */
+          lua_Unsigned count = l_castS2U(ivalue(s2v(ra + 1)));
+          if (count > 0) {  /* still more iterations? */
+            lua_Integer step = ivalue(s2v(ra + 2));
+            lua_Integer idx = ivalue(s2v(ra));  /* internal index */
+            chgivalue(s2v(ra + 1), count - 1);  /* update counter */
+            idx = intop(+, idx, step);  /* add step to index */
+            chgivalue(s2v(ra), idx);  /* update internal index */
+            setivalue(s2v(ra + 3), idx);  /* and control variable */
+            pc -= GETARG_Bx(i);  /* jump back */
+          }
+        }
+        else if (floatforloop(ra))  /* float loop */
+          pc -= GETARG_Bx(i);  /* jump back */
+        updatetrap(ci);  /* allows a signal to break the loop */
+        vmbreak;
+      }
+      vmcase(OP_FORPREP) {
+        StkId ra = RA(i);
+        savestate(L, ci);  /* in case of errors */
+        if (forprep(L, ra))
+          pc += GETARG_Bx(i) + 1;  /* skip the loop */
+        vmbreak;
+      }
+      vmcase(OP_TFORPREP) {
+       StkId ra = RA(i);
+        /* create to-be-closed upvalue (if needed) */
+        halfProtect(luaF_newtbcupval(L, ra + 3));
+        pc += GETARG_Bx(i);
+        i = *(pc++);  /* go to next instruction */
+        lua_assert(GET_OPCODE(i) == OP_TFORCALL && ra == RA(i));
+        goto l_tforcall;
+      }
+      vmcase(OP_TFORCALL) {
+       l_tforcall: {
+        StkId ra = RA(i);
+        /* 'ra' has the iterator function, 'ra + 1' has the state,
+           'ra + 2' has the control variable, and 'ra + 3' has the
+           to-be-closed variable. The call will use the stack after
+           these values (starting at 'ra + 4')
+        */
+        /* push function, state, and control variable */
+        memcpy(ra + 4, ra, 3 * sizeof(*ra));
+        L->top.p = ra + 4 + 3;
+        ProtectNT(luaD_call(L, ra + 4, GETARG_C(i)));  /* do the call */
+        updatestack(ci);  /* stack may have changed */
+        i = *(pc++);  /* go to next instruction */
+        lua_assert(GET_OPCODE(i) == OP_TFORLOOP && ra == RA(i));
+        goto l_tforloop;
+      }}
+      vmcase(OP_TFORLOOP) {
+       l_tforloop: {
+        StkId ra = RA(i);
+        if (!ttisnil(s2v(ra + 4))) {  /* continue loop? */
+          setobjs2s(L, ra + 2, ra + 4);  /* save control variable */
+          pc -= GETARG_Bx(i);  /* jump back */
+        }
+        vmbreak;
+      }}
+      vmcase(OP_SETLIST) {
+        StkId ra = RA(i);
+        int n = GETARG_B(i);
+        unsigned int last = GETARG_C(i);
+        Table *h = hvalue(s2v(ra));
+        if (n == 0)
+          n = cast_int(L->top.p - ra) - 1;  /* get up to the top */
+        else
+          L->top.p = ci->top.p;  /* correct top in case of emergency GC */
+        last += n;
+        if (TESTARG_k(i)) {
+          last += GETARG_Ax(*pc) * (MAXARG_C + 1);
+          pc++;
+        }
+        if (last > luaH_realasize(h))  /* needs more space? */
+          luaH_resizearray(L, h, last);  /* preallocate it at once */
+        for (; n > 0; n--) {
+          TValue *val = s2v(ra + n);
+          setobj2t(L, &h->array[last - 1], val);
+          last--;
+          luaC_barrierback(L, obj2gco(h), val);
+        }
+        vmbreak;
+      }
+      vmcase(OP_CLOSURE) {
+        StkId ra = RA(i);
+        Proto *p = cl->p->p[GETARG_Bx(i)];
+        halfProtect(pushclosure(L, p, cl->upvals, base, ra));
+        checkGC(L, ra + 1);
+        vmbreak;
+      }
+      vmcase(OP_VARARG) {
+        StkId ra = RA(i);
+        int n = GETARG_C(i) - 1;  /* required results */
+        Protect(luaT_getvarargs(L, ci, ra, n));
+        vmbreak;
+      }
+      vmcase(OP_VARARGPREP) {
+        ProtectNT(luaT_adjustvarargs(L, GETARG_A(i), ci, cl->p));
+        if (l_unlikely(trap)) {  /* previous "Protect" updated trap */
+          luaD_hookcall(L, ci);
+          L->oldpc = 1;  /* next opcode will be seen as a "new" line */
+        }
+        updatebase(ci);  /* function has new base after adjustment */
+        vmbreak;
+      }
+      vmcase(OP_EXTRAARG) {
+        lua_assert(0);
+        vmbreak;
+      }
+    }
+  }
+}
+
+/* }================================================================== */
diff --git a/src/libs/3rdparty/lua/src/lvm.h b/src/libs/3rdparty/lua/src/lvm.h
new file mode 100644
index 00000000000..dba1ad27702
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lvm.h
@@ -0,0 +1,141 @@
+/*
+** $Id: lvm.h $
+** Lua virtual machine
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lvm_h
+#define lvm_h
+
+
+#include "ldo.h"
+#include "lobject.h"
+#include "ltm.h"
+
+
+#if !defined(LUA_NOCVTN2S)
+#define cvt2str(o)	ttisnumber(o)
+#else
+#define cvt2str(o)	0	/* no conversion from numbers to strings */
+#endif
+
+
+#if !defined(LUA_NOCVTS2N)
+#define cvt2num(o)	ttisstring(o)
+#else
+#define cvt2num(o)	0	/* no conversion from strings to numbers */
+#endif
+
+
+/*
+** You can define LUA_FLOORN2I if you want to convert floats to integers
+** by flooring them (instead of raising an error if they are not
+** integral values)
+*/
+#if !defined(LUA_FLOORN2I)
+#define LUA_FLOORN2I		F2Ieq
+#endif
+
+
+/*
+** Rounding modes for float->integer coercion
+ */
+typedef enum {
+  F2Ieq,     /* no rounding; accepts only integral values */
+  F2Ifloor,  /* takes the floor of the number */
+  F2Iceil    /* takes the ceil of the number */
+} F2Imod;
+
+
+/* convert an object to a float (including string coercion) */
+#define tonumber(o,n) \
+	(ttisfloat(o) ? (*(n) = fltvalue(o), 1) : luaV_tonumber_(o,n))
+
+
+/* convert an object to a float (without string coercion) */
+#define tonumberns(o,n) \
+	(ttisfloat(o) ? ((n) = fltvalue(o), 1) : \
+	(ttisinteger(o) ? ((n) = cast_num(ivalue(o)), 1) : 0))
+
+
+/* convert an object to an integer (including string coercion) */
+#define tointeger(o,i) \
+  (l_likely(ttisinteger(o)) ? (*(i) = ivalue(o), 1) \
+                          : luaV_tointeger(o,i,LUA_FLOORN2I))
+
+
+/* convert an object to an integer (without string coercion) */
+#define tointegerns(o,i) \
+  (l_likely(ttisinteger(o)) ? (*(i) = ivalue(o), 1) \
+                          : luaV_tointegerns(o,i,LUA_FLOORN2I))
+
+
+#define intop(op,v1,v2) l_castU2S(l_castS2U(v1) op l_castS2U(v2))
+
+#define luaV_rawequalobj(t1,t2)		luaV_equalobj(NULL,t1,t2)
+
+
+/*
+** fast track for 'gettable': if 't' is a table and 't[k]' is present,
+** return 1 with 'slot' pointing to 't[k]' (position of final result).
+** Otherwise, return 0 (meaning it will have to check metamethod)
+** with 'slot' pointing to an empty 't[k]' (if 't' is a table) or NULL
+** (otherwise). 'f' is the raw get function to use.
+*/
+#define luaV_fastget(L,t,k,slot,f) \
+  (!ttistable(t)  \
+   ? (slot = NULL, 0)  /* not a table; 'slot' is NULL and result is 0 */  \
+   : (slot = f(hvalue(t), k),  /* else, do raw access */  \
+      !isempty(slot)))  /* result not empty? */
+
+
+/*
+** Special case of 'luaV_fastget' for integers, inlining the fast case
+** of 'luaH_getint'.
+*/
+#define luaV_fastgeti(L,t,k,slot) \
+  (!ttistable(t)  \
+   ? (slot = NULL, 0)  /* not a table; 'slot' is NULL and result is 0 */  \
+   : (slot = (l_castS2U(k) - 1u < hvalue(t)->alimit) \
+              ? &hvalue(t)->array[k - 1] : luaH_getint(hvalue(t), k), \
+      !isempty(slot)))  /* result not empty? */
+
+
+/*
+** Finish a fast set operation (when fast get succeeds). In that case,
+** 'slot' points to the place to put the value.
+*/
+#define luaV_finishfastset(L,t,slot,v) \
+    { setobj2t(L, cast(TValue *,slot), v); \
+      luaC_barrierback(L, gcvalue(t), v); }
+
+
+/*
+** Shift right is the same as shift left with a negative 'y'
+*/
+#define luaV_shiftr(x,y)	luaV_shiftl(x,intop(-, 0, y))
+
+
+
+LUAI_FUNC int luaV_equalobj (lua_State *L, const TValue *t1, const TValue *t2);
+LUAI_FUNC int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r);
+LUAI_FUNC int luaV_lessequal (lua_State *L, const TValue *l, const TValue *r);
+LUAI_FUNC int luaV_tonumber_ (const TValue *obj, lua_Number *n);
+LUAI_FUNC int luaV_tointeger (const TValue *obj, lua_Integer *p, F2Imod mode);
+LUAI_FUNC int luaV_tointegerns (const TValue *obj, lua_Integer *p,
+                                F2Imod mode);
+LUAI_FUNC int luaV_flttointeger (lua_Number n, lua_Integer *p, F2Imod mode);
+LUAI_FUNC void luaV_finishget (lua_State *L, const TValue *t, TValue *key,
+                               StkId val, const TValue *slot);
+LUAI_FUNC void luaV_finishset (lua_State *L, const TValue *t, TValue *key,
+                               TValue *val, const TValue *slot);
+LUAI_FUNC void luaV_finishOp (lua_State *L);
+LUAI_FUNC void luaV_execute (lua_State *L, CallInfo *ci);
+LUAI_FUNC void luaV_concat (lua_State *L, int total);
+LUAI_FUNC lua_Integer luaV_idiv (lua_State *L, lua_Integer x, lua_Integer y);
+LUAI_FUNC lua_Integer luaV_mod (lua_State *L, lua_Integer x, lua_Integer y);
+LUAI_FUNC lua_Number luaV_modf (lua_State *L, lua_Number x, lua_Number y);
+LUAI_FUNC lua_Integer luaV_shiftl (lua_Integer x, lua_Integer y);
+LUAI_FUNC void luaV_objlen (lua_State *L, StkId ra, const TValue *rb);
+
+#endif
diff --git a/src/libs/3rdparty/lua/src/lzio.c b/src/libs/3rdparty/lua/src/lzio.c
new file mode 100644
index 00000000000..cd0a02d5f9b
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lzio.c
@@ -0,0 +1,68 @@
+/*
+** $Id: lzio.c $
+** Buffered streams
+** See Copyright Notice in lua.h
+*/
+
+#define lzio_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <string.h>
+
+#include "lua.h"
+
+#include "llimits.h"
+#include "lmem.h"
+#include "lstate.h"
+#include "lzio.h"
+
+
+int luaZ_fill (ZIO *z) {
+  size_t size;
+  lua_State *L = z->L;
+  const char *buff;
+  lua_unlock(L);
+  buff = z->reader(L, z->data, &size);
+  lua_lock(L);
+  if (buff == NULL || size == 0)
+    return EOZ;
+  z->n = size - 1;  /* discount char being returned */
+  z->p = buff;
+  return cast_uchar(*(z->p++));
+}
+
+
+void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader, void *data) {
+  z->L = L;
+  z->reader = reader;
+  z->data = data;
+  z->n = 0;
+  z->p = NULL;
+}
+
+
+/* --------------------------------------------------------------- read --- */
+size_t luaZ_read (ZIO *z, void *b, size_t n) {
+  while (n) {
+    size_t m;
+    if (z->n == 0) {  /* no bytes in buffer? */
+      if (luaZ_fill(z) == EOZ)  /* try to read more */
+        return n;  /* no more input; return number of missing bytes */
+      else {
+        z->n++;  /* luaZ_fill consumed first byte; put it back */
+        z->p--;
+      }
+    }
+    m = (n <= z->n) ? n : z->n;  /* min. between n and z->n */
+    memcpy(b, z->p, m);
+    z->n -= m;
+    z->p += m;
+    b = (char *)b + m;
+    n -= m;
+  }
+  return 0;
+}
+
diff --git a/src/libs/3rdparty/lua/src/lzio.h b/src/libs/3rdparty/lua/src/lzio.h
new file mode 100644
index 00000000000..38f397fd284
--- /dev/null
+++ b/src/libs/3rdparty/lua/src/lzio.h
@@ -0,0 +1,66 @@
+/*
+** $Id: lzio.h $
+** Buffered streams
+** See Copyright Notice in lua.h
+*/
+
+
+#ifndef lzio_h
+#define lzio_h
+
+#include "lua.h"
+
+#include "lmem.h"
+
+
+#define EOZ	(-1)			/* end of stream */
+
+typedef struct Zio ZIO;
+
+#define zgetc(z)  (((z)->n--)>0 ?  cast_uchar(*(z)->p++) : luaZ_fill(z))
+
+
+typedef struct Mbuffer {
+  char *buffer;
+  size_t n;
+  size_t buffsize;
+} Mbuffer;
+
+#define luaZ_initbuffer(L, buff) ((buff)->buffer = NULL, (buff)->buffsize = 0)
+
+#define luaZ_buffer(buff)	((buff)->buffer)
+#define luaZ_sizebuffer(buff)	((buff)->buffsize)
+#define luaZ_bufflen(buff)	((buff)->n)
+
+#define luaZ_buffremove(buff,i)	((buff)->n -= (i))
+#define luaZ_resetbuffer(buff) ((buff)->n = 0)
+
+
+#define luaZ_resizebuffer(L, buff, size) \
+	((buff)->buffer = luaM_reallocvchar(L, (buff)->buffer, \
+				(buff)->buffsize, size), \
+	(buff)->buffsize = size)
+
+#define luaZ_freebuffer(L, buff)	luaZ_resizebuffer(L, buff, 0)
+
+
+LUAI_FUNC void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader,
+                                        void *data);
+LUAI_FUNC size_t luaZ_read (ZIO* z, void *b, size_t n);	/* read next n bytes */
+
+
+
+/* --------- Private Part ------------------ */
+
+struct Zio {
+  size_t n;			/* bytes still unread */
+  const char *p;		/* current position in buffer */
+  lua_Reader reader;		/* reader function */
+  void *data;			/* additional data */
+  lua_State *L;			/* Lua state (for reader) */
+};
+
+
+LUAI_FUNC int luaZ_fill (ZIO *z);
+
+#endif
diff --git a/src/libs/3rdparty/sol2/CMakeLists.txt b/src/libs/3rdparty/sol2/CMakeLists.txt
new file mode 100644
index 00000000000..1afdb1bdbb8
--- /dev/null
+++ b/src/libs/3rdparty/sol2/CMakeLists.txt
@@ -0,0 +1,12 @@
+add_library(sol2 INTERFACE)
+
+target_include_directories(sol2 INTERFACE  
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>  
+    $<INSTALL_INTERFACE:include>
+)
+
+install(TARGETS sol2 EXPORT QtCreator)
+
+qtc_add_public_header(include/sol/sol.hpp)
+qtc_add_public_header(include/sol/config.hpp)
+qtc_add_public_header(include/sol/forward.hpp)
diff --git a/src/libs/3rdparty/sol2/LICENSE.txt b/src/libs/3rdparty/sol2/LICENSE.txt
new file mode 100644
index 00000000000..58134405482
--- /dev/null
+++ b/src/libs/3rdparty/sol2/LICENSE.txt
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013-2022 Rapptz, ThePhD, and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/libs/3rdparty/sol2/include/sol/config.hpp b/src/libs/3rdparty/sol2/include/sol/config.hpp
new file mode 100644
index 00000000000..36ef3fe47e6
--- /dev/null
+++ b/src/libs/3rdparty/sol2/include/sol/config.hpp
@@ -0,0 +1,57 @@
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+// This file was generated with a script.
+// Generated 2024-01-13 14:25:56.570832 UTC
+// This header was generated with sol v3.3.1 (revision 9c882a28)
+// https://github.com/ThePhD/sol2
+
+#ifndef SOL_SINGLE_SOL_CONFIG_HPP
+#define SOL_SINGLE_SOL_CONFIG_HPP
+
+// beginning of sol/config.hpp
+
+/* Base, empty configuration file!
+
+     To override, place a file in your include paths of the form:
+
+. (your include path here)
+| sol (directory, or equivalent)
+  | config.hpp (your config.hpp file)
+
+     So that when sol2 includes the file
+
+#include <sol/config.hpp>
+
+     it gives you the configuration values you desire. Configuration values can be
+seen in the safety.rst of the doc/src, or at
+https://sol2.readthedocs.io/en/latest/safety.html ! You can also pass them through
+the build system, or the command line options of your compiler.
+
+*/
+
+#define SOL_SAFE_FUNCTIONS 1
+#define SOL_SAFE_USERTYPE 1
+#define SOL_NO_NIL 1
+
+// end of sol/config.hpp
+
+#endif // SOL_SINGLE_SOL_CONFIG_HPP
diff --git a/src/libs/3rdparty/sol2/include/sol/forward.hpp b/src/libs/3rdparty/sol2/include/sol/forward.hpp
new file mode 100644
index 00000000000..83fba4d2548
--- /dev/null
+++ b/src/libs/3rdparty/sol2/include/sol/forward.hpp
@@ -0,0 +1,1340 @@
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+// This file was generated with a script.
+// Generated 2024-01-13 14:25:56.569197 UTC
+// This header was generated with sol v3.3.1 (revision 9c882a28)
+// https://github.com/ThePhD/sol2
+
+#ifndef SOL_SINGLE_INCLUDE_SOL_FORWARD_HPP
+#define SOL_SINGLE_INCLUDE_SOL_FORWARD_HPP
+
+// beginning of sol/forward.hpp
+
+#ifndef SOL_FORWARD_HPP
+#define SOL_FORWARD_HPP
+
+// beginning of sol/version.hpp
+
+#include "config.hpp"
+
+#define SOL_VERSION_MAJOR 3
+#define SOL_VERSION_MINOR 2
+#define SOL_VERSION_PATCH 3
+#define SOL_VERSION_STRING "3.2.3"
+#define SOL_VERSION ((SOL_VERSION_MAJOR * 100000) + (SOL_VERSION_MINOR * 100) + (SOL_VERSION_PATCH))
+
+#define SOL_TOKEN_TO_STRING_POST_EXPANSION_I_(_TOKEN) #_TOKEN
+#define SOL_TOKEN_TO_STRING_I_(_TOKEN) SOL_TOKEN_TO_STRING_POST_EXPANSION_I_(_TOKEN)
+
+#define SOL_CONCAT_TOKENS_POST_EXPANSION_I_(_LEFT, _RIGHT) _LEFT##_RIGHT
+#define SOL_CONCAT_TOKENS_I_(_LEFT, _RIGHT) SOL_CONCAT_TOKENS_POST_EXPANSION_I_(_LEFT, _RIGHT)
+
+#define SOL_RAW_IS_ON(OP_SYMBOL) ((3 OP_SYMBOL 3) != 0)
+#define SOL_RAW_IS_OFF(OP_SYMBOL) ((3 OP_SYMBOL 3) == 0)
+#define SOL_RAW_IS_DEFAULT_ON(OP_SYMBOL) ((3 OP_SYMBOL 3) > 3)
+#define SOL_RAW_IS_DEFAULT_OFF(OP_SYMBOL) ((3 OP_SYMBOL 3 OP_SYMBOL 3) < 0)
+
+#define SOL_IS_ON(OP_SYMBOL) SOL_RAW_IS_ON(OP_SYMBOL ## _I_)
+#define SOL_IS_OFF(OP_SYMBOL) SOL_RAW_IS_OFF(OP_SYMBOL ## _I_)
+#define SOL_IS_DEFAULT_ON(OP_SYMBOL) SOL_RAW_IS_DEFAULT_ON(OP_SYMBOL ## _I_)
+#define SOL_IS_DEFAULT_OFF(OP_SYMBOL) SOL_RAW_IS_DEFAULT_OFF(OP_SYMBOL ## _I_)
+
+#define SOL_ON          |
+#define SOL_OFF         ^
+#define SOL_DEFAULT_ON  +
+#define SOL_DEFAULT_OFF -
+
+#if defined(SOL_BUILD_CXX_MODE)
+	#if (SOL_BUILD_CXX_MODE != 0)
+		#define SOL_BUILD_CXX_MODE_I_ SOL_ON
+	#else
+		#define SOL_BUILD_CXX_MODE_I_ SOL_OFF
+	#endif
+#elif defined(__cplusplus)
+	#define SOL_BUILD_CXX_MODE_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_BUILD_CXX_MODE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_BUILD_C_MODE)
+	#if (SOL_BUILD_C_MODE != 0)
+		#define SOL_BUILD_C_MODE_I_ SOL_ON
+	#else
+		#define SOL_BUILD_C_MODE_I_ SOL_OFF
+	#endif
+#elif defined(__STDC__)
+	#define SOL_BUILD_C_MODE_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_BUILD_C_MODE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if SOL_IS_ON(SOL_BUILD_C_MODE)
+	#include <stddef.h>
+	#include <stdint.h>
+	#include <limits.h>
+#else
+	#include <cstddef>
+	#include <cstdint>
+	#include <climits>
+#endif
+
+#if defined(SOL_HAS_BUILTIN)
+	#define SOL_HAS_BUILTIN_I_(...) SOL_HAS_BUILTIN(__VA_ARGS__)
+#elif defined(__has_builtin)
+	#define SOL_HAS_BUILTIN_I_(...) __has_builtin(__VA_ARGS__)
+#else
+	#define SOL_HAS_BUILTIN_I_(...) 0
+#endif
+
+#if defined(SOL_COMPILER_VCXX)
+	#if defined(SOL_COMPILER_VCXX != 0)
+		#define SOL_COMPILER_VCXX_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_VCXX_I_ SOL_OFF
+	#endif
+#elif defined(_MSC_VER)
+	#define SOL_COMPILER_VCXX_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_COMPILER_VCXX_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_COMPILER_GCC)
+	#if defined(SOL_COMPILER_GCC != 0)
+		#define SOL_COMPILER_GCC_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_GCC_I_ SOL_OFF
+	#endif
+#elif defined(__GNUC__)
+	#define SOL_COMPILER_GCC_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_COMPILER_GCC_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_COMPILER_CLANG)
+	#if defined(SOL_COMPILER_CLANG != 0)
+		#define SOL_COMPILER_CLANG_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_CLANG_I_ SOL_OFF
+	#endif
+#elif defined(__clang__)
+	#define SOL_COMPILER_CLANG_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_COMPILER_CLANG_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_COMPILER_EDG)
+	#if defined(SOL_COMPILER_EDG != 0)
+		#define SOL_COMPILER_EDG_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_EDG_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_COMPILER_EDG_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_COMPILER_MINGW)
+	#if (SOL_COMPILER_MINGW != 0)
+		#define SOL_COMPILER_MINGW_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_MINGW_I_ SOL_OFF
+	#endif
+#elif defined(__MINGW32__)
+	#define SOL_COMPILER_MINGW_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_COMPILER_MINGW_I_ SOL_DEFAULT_OFF
+#endif
+
+#if SIZE_MAX <= 0xFFFFULL
+	#define SOL_PLATFORM_X16_I_ SOL_ON
+	#define SOL_PLATFORM_X86_I_ SOL_OFF
+	#define SOL_PLATFORM_X64_I_ SOL_OFF
+#elif SIZE_MAX <= 0xFFFFFFFFULL
+	#define SOL_PLATFORM_X16_I_ SOL_OFF
+	#define SOL_PLATFORM_X86_I_ SOL_ON
+	#define SOL_PLATFORM_X64_I_ SOL_OFF
+#else
+	#define SOL_PLATFORM_X16_I_ SOL_OFF
+	#define SOL_PLATFORM_X86_I_ SOL_OFF
+	#define SOL_PLATFORM_X64_I_ SOL_ON
+#endif
+
+#define SOL_PLATFORM_ARM32_I_ SOL_OFF
+#define SOL_PLATFORM_ARM64_I_ SOL_OFF
+
+#if defined(SOL_PLATFORM_WINDOWS)
+	#if (SOL_PLATFORM_WINDOWS != 0)
+		#define SOL_PLATFORM_WINDOWS_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_WINDOWS_I_ SOL_OFF
+	#endif
+#elif defined(_WIN32)
+	#define SOL_PLATFORM_WINDOWS_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_PLATFORM_WINDOWS_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_PLATFORM_CYGWIN)
+	#if (SOL_PLATFORM_CYGWIN != 0)
+		#define SOL_PLATFORM_CYGWIN_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_CYGWIN_I_ SOL_ON
+	#endif
+#elif defined(__CYGWIN__)
+	#define SOL_PLATFORM_CYGWIN_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_PLATFORM_CYGWIN_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_PLATFORM_APPLE)
+	#if (SOL_PLATFORM_APPLE != 0)
+		#define SOL_PLATFORM_APPLE_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_APPLE_I_ SOL_OFF
+	#endif
+#elif defined(__APPLE__)
+	#define SOL_PLATFORM_APPLE_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_PLATFORM_APPLE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_PLATFORM_UNIX)
+	#if (SOL_PLATFORM_UNIX != 0)
+		#define SOL_PLATFORM_UNIXLIKE_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_UNIXLIKE_I_ SOL_OFF
+	#endif
+#elif defined(__unix__)
+	#define SOL_PLATFORM_UNIXLIKE_I_ SOL_DEFAUKT_ON
+#else
+	#define SOL_PLATFORM_UNIXLIKE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_PLATFORM_LINUX)
+	#if (SOL_PLATFORM_LINUX != 0)
+		#define SOL_PLATFORM_LINUXLIKE_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_LINUXLIKE_I_ SOL_OFF
+	#endif
+#elif defined(__LINUX__)
+	#define SOL_PLATFORM_LINUXLIKE_I_ SOL_DEFAUKT_ON
+#else
+	#define SOL_PLATFORM_LINUXLIKE_I_ SOL_DEFAULT_OFF
+#endif
+
+#define SOL_PLATFORM_APPLE_IPHONE_I_ SOL_OFF
+#define SOL_PLATFORM_BSDLIKE_I_      SOL_OFF
+
+#if defined(SOL_IN_DEBUG_DETECTED)
+	#if SOL_IN_DEBUG_DETECTED != 0
+		#define SOL_DEBUG_BUILD_I_ SOL_ON
+	#else
+		#define SOL_DEBUG_BUILD_I_ SOL_OFF
+	#endif
+#elif !defined(NDEBUG)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX) && defined(_DEBUG)
+		#define SOL_DEBUG_BUILD_I_ SOL_ON
+	#elif (SOL_IS_ON(SOL_COMPILER_CLANG) || SOL_IS_ON(SOL_COMPILER_GCC)) && !defined(__OPTIMIZE__)
+		#define SOL_DEBUG_BUILD_I_ SOL_ON
+	#else
+		#define SOL_DEBUG_BUILD_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_DEBUG_BUILD_I_ SOL_DEFAULT_OFF
+#endif // We are in a debug mode of some sort
+
+#if defined(SOL_NO_EXCEPTIONS)
+	#if (SOL_NO_EXCEPTIONS != 0)
+		#define SOL_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_EXCEPTIONS_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_VCXX)
+	#if !defined(_CPPUNWIND)
+		#define SOL_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_EXCEPTIONS_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_CLANG) || SOL_IS_ON(SOL_COMPILER_GCC)
+	#if !defined(__EXCEPTIONS)
+		#define SOL_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_EXCEPTIONS_I_ SOL_ON
+	#endif
+#else
+	#define SOL_EXCEPTIONS_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_NO_RTTI)
+	#if (SOL_NO_RTTI != 0)
+		#define SOL_RTTI_I_ SOL_OFF
+	#else
+		#define SOL_RTTI_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_VCXX)
+	#if !defined(_CPPRTTI)
+		#define SOL_RTTI_I_ SOL_OFF
+	#else
+		#define SOL_RTTI_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_CLANG) || SOL_IS_ON(SOL_COMPILER_GCC)
+	#if !defined(__GXX_RTTI)
+		#define SOL_RTTI_I_ SOL_OFF
+	#else
+		#define SOL_RTTI_I_ SOL_ON
+	#endif
+#else
+	#define SOL_RTTI_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_NO_THREAD_LOCAL)
+	#if SOL_NO_THREAD_LOCAL != 0
+		#define SOL_USE_THREAD_LOCAL_I_ SOL_OFF
+	#else
+		#define SOL_USE_THREAD_LOCAL_I_ SOL_ON
+	#endif
+#else
+	#define SOL_USE_THREAD_LOCAL_I_ SOL_DEFAULT_ON
+#endif // thread_local keyword is bjorked on some platforms
+
+#if defined(SOL_ALL_SAFETIES_ON)
+	#if SOL_ALL_SAFETIES_ON != 0
+		#define SOL_ALL_SAFETIES_ON_I_ SOL_ON
+	#else
+		#define SOL_ALL_SAFETIES_ON_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_ALL_SAFETIES_ON_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_SAFE_GETTER)
+	#if SOL_SAFE_GETTER != 0
+		#define SOL_SAFE_GETTER_I_ SOL_ON
+	#else
+		#define SOL_SAFE_GETTER_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_GETTER_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_GETTER_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_GETTER_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_USERTYPE)
+	#if SOL_SAFE_USERTYPE != 0
+		#define SOL_SAFE_USERTYPE_I_ SOL_ON
+	#else
+		#define SOL_SAFE_USERTYPE_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_USERTYPE_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_USERTYPE_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_USERTYPE_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_REFERENCES)
+	#if SOL_SAFE_REFERENCES != 0
+		#define SOL_SAFE_REFERENCES_I_ SOL_ON
+	#else
+		#define SOL_SAFE_REFERENCES_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_REFERENCES_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_REFERENCES_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_REFERENCES_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_FUNCTIONS)
+	#if SOL_SAFE_FUNCTIONS != 0
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
+	#else
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_OFF
+	#endif
+#elif defined (SOL_SAFE_FUNCTION_OBJECTS)
+	#if SOL_SAFE_FUNCTION_OBJECTS != 0
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
+	#else
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_FUNCTION_CALLS)
+	#if SOL_SAFE_FUNCTION_CALLS != 0
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_ON
+	#else
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_PROXIES)
+	#if SOL_SAFE_PROXIES != 0
+		#define SOL_SAFE_PROXIES_I_ SOL_ON
+	#else
+		#define SOL_SAFE_PROXIES_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_PROXIES_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_PROXIES_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_PROXIES_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_NUMERICS)
+	#if SOL_SAFE_NUMERICS != 0
+		#define SOL_SAFE_NUMERICS_I_ SOL_ON
+	#else
+		#define SOL_SAFE_NUMERICS_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_NUMERICS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_NUMERICS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_NUMERICS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_ALL_INTEGER_VALUES_FIT)
+	#if (SOL_ALL_INTEGER_VALUES_FIT != 0)
+		#define SOL_ALL_INTEGER_VALUES_FIT_I_ SOL_ON
+	#else
+		#define SOL_ALL_INTEGER_VALUES_FIT_I_ SOL_OFF
+	#endif
+#elif !SOL_IS_DEFAULT_OFF(SOL_SAFE_NUMERICS) && SOL_IS_OFF(SOL_SAFE_NUMERICS)
+	// if numerics is intentionally turned off, flip this on
+	#define SOL_ALL_INTEGER_VALUES_FIT_I_ SOL_DEFAULT_ON
+#else
+	// default to off
+	#define SOL_ALL_INTEGER_VALUES_FIT_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_SAFE_STACK_CHECK)
+	#if SOL_SAFE_STACK_CHECK != 0
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_ON
+	#else
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_NO_CHECK_NUMBER_PRECISION)
+	#if SOL_NO_CHECK_NUMBER_PRECISION != 0
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_OFF
+	#else
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#endif
+#elif defined(SOL_NO_CHECKING_NUMBER_PRECISION)
+	#if SOL_NO_CHECKING_NUMBER_PRECISION != 0
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_OFF
+	#else
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_SAFE_NUMERICS)
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_STRINGS_ARE_NUMBERS)
+	#if (SOL_STRINGS_ARE_NUMBERS != 0)
+		#define SOL_STRINGS_ARE_NUMBERS_I_ SOL_ON
+	#else
+		#define SOL_STRINGS_ARE_NUMBERS_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_STRINGS_ARE_NUMBERS_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_ENABLE_INTEROP)
+	#if SOL_ENABLE_INTEROP != 0
+		#define SOL_USE_INTEROP_I_ SOL_ON
+	#else
+		#define SOL_USE_INTEROP_I_ SOL_OFF
+	#endif
+#elif defined(SOL_USE_INTEROP)
+	#if SOL_USE_INTEROP != 0
+		#define SOL_USE_INTEROP_I_ SOL_ON
+	#else
+		#define SOL_USE_INTEROP_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USE_INTEROP_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_NO_NIL)
+	#if (SOL_NO_NIL != 0)
+		#define SOL_NIL_I_ SOL_OFF
+	#else
+		#define SOL_NIL_I_ SOL_ON
+	#endif
+#elif defined(__MAC_OS_X_VERSION_MAX_ALLOWED) || defined(__OBJC__) || defined(nil)
+	#define SOL_NIL_I_ SOL_DEFAULT_OFF
+#else
+	#define SOL_NIL_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_USERTYPE_TYPE_BINDING_INFO)
+	#if (SOL_USERTYPE_TYPE_BINDING_INFO != 0)
+		#define SOL_USERTYPE_TYPE_BINDING_INFO_I_ SOL_ON
+	#else
+		#define SOL_USERTYPE_TYPE_BINDING_INFO_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USERTYPE_TYPE_BINDING_INFO_I_ SOL_DEFAULT_ON
+#endif // We should generate a my_type.__type table with lots of class information for usertypes
+
+#if defined(SOL_AUTOMAGICAL_TYPES_BY_DEFAULT)
+	#if (SOL_AUTOMAGICAL_TYPES_BY_DEFAULT != 0)
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_ON
+	#else
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_OFF
+	#endif
+#elif defined(SOL_DEFAULT_AUTOMAGICAL_USERTYPES)
+	#if (SOL_DEFAULT_AUTOMAGICAL_USERTYPES != 0)
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_ON
+	#else
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_DEFAULT_ON
+#endif // make is_automagical on/off by default
+
+#if defined(SOL_STD_VARIANT)
+	#if (SOL_STD_VARIANT != 0)
+		#define SOL_STD_VARIANT_I_ SOL_ON
+	#else
+		#define SOL_STD_VARIANT_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_COMPILER_CLANG) && SOL_IS_ON(SOL_PLATFORM_APPLE)
+		#if defined(__has_include)
+			#if __has_include(<variant>)
+				#define SOL_STD_VARIANT_I_ SOL_DEFAULT_ON
+			#else
+				#define SOL_STD_VARIANT_I_ SOL_DEFAULT_OFF
+			#endif
+		#else
+			#define SOL_STD_VARIANT_I_ SOL_DEFAULT_OFF
+		#endif
+	#else
+		#define SOL_STD_VARIANT_I_ SOL_DEFAULT_ON
+	#endif
+#endif // make is_automagical on/off by default
+
+#if defined(SOL_NOEXCEPT_FUNCTION_TYPE)
+	#if (SOL_NOEXCEPT_FUNCTION_TYPE != 0)
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_ON
+	#else
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_OFF
+	#endif
+#else
+	#if defined(__cpp_noexcept_function_type)
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_COMPILER_VCXX) && (defined(_MSVC_LANG) && (_MSVC_LANG < 201403L))
+		// There is a bug in the VC++ compiler??
+		// on /std:c++latest under x86 conditions (VS 15.5.2),
+		// compiler errors are tossed for noexcept markings being on function types
+		// that are identical in every other way to their non-noexcept marked types function types...
+		// VS 2019: There is absolutely a bug.
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_OFF
+	#else
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_DEFAULT_ON
+	#endif
+#endif // noexcept is part of a function's type
+
+#if defined(SOL_STACK_STRING_OPTIMIZATION_SIZE) && SOL_STACK_STRING_OPTIMIZATION_SIZE > 0
+	#define SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_ SOL_STACK_STRING_OPTIMIZATION_SIZE
+#else
+	#define SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_ 1024
+#endif
+
+#if defined(SOL_ID_SIZE) && SOL_ID_SIZE > 0
+	#define SOL_ID_SIZE_I_ SOL_ID_SIZE
+#else
+	#define SOL_ID_SIZE_I_ 512
+#endif
+
+#if defined(LUA_IDSIZE) && LUA_IDSIZE > 0
+	#define SOL_FILE_ID_SIZE_I_ LUA_IDSIZE
+#elif defined(SOL_ID_SIZE) && SOL_ID_SIZE > 0
+	#define SOL_FILE_ID_SIZE_I_ SOL_FILE_ID_SIZE
+#else
+	#define SOL_FILE_ID_SIZE_I_ 2048
+#endif
+
+#if defined(SOL_PRINT_ERRORS)
+	#if (SOL_PRINT_ERRORS != 0)
+		#define SOL_PRINT_ERRORS_I_ SOL_ON
+	#else
+		#define SOL_PRINT_ERRORS_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_PRINT_ERRORS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_PRINT_ERRORS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_PRINT_ERRORS_I_ SOL_OFF
+	#endif
+#endif
+
+#if defined(SOL_DEFAULT_PASS_ON_ERROR)
+	#if (SOL_DEFAULT_PASS_ON_ERROR != 0)
+		#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_ON
+	#else
+		#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_USING_CXX_LUA)
+	#if (SOL_USING_CXX_LUA != 0)
+		#define SOL_USING_CXX_LUA_I_ SOL_ON
+	#else
+		#define SOL_USING_CXX_LUA_I_ SOL_OFF
+	#endif
+#elif defined(SOL_USE_CXX_LUA)
+	// alternative spelling
+	#if (SOL_USE_CXX_LUA != 0)
+		#define SOL_USING_CXX_LUA_I_ SOL_ON
+	#else
+		#define SOL_USING_CXX_LUA_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USING_CXX_LUA_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_USING_CXX_LUAJIT)
+	#if (SOL_USING_CXX_LUAJIT != 0)
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_ON
+	#else
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_OFF
+	#endif
+#elif defined(SOL_USE_CXX_LUAJIT)
+	#if (SOL_USE_CXX_LUAJIT != 0)
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_ON
+	#else
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USING_CXX_LUAJIT_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_NO_LUA_HPP)
+	#if (SOL_NO_LUA_HPP != 0)
+		#define SOL_USE_LUA_HPP_I_ SOL_OFF
+	#else
+		#define SOL_USE_LUA_HPP_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_USING_CXX_LUA)
+	#define SOL_USE_LUA_HPP_I_ SOL_OFF
+#elif defined(__has_include)
+	#if __has_include(<lua.hpp>)
+		#define SOL_USE_LUA_HPP_I_ SOL_ON
+	#else
+		#define SOL_USE_LUA_HPP_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USE_LUA_HPP_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_CONTAINERS_START)
+	#define SOL_CONTAINER_START_INDEX_I_ SOL_CONTAINERS_START
+#elif defined(SOL_CONTAINERS_START_INDEX)
+	#define SOL_CONTAINER_START_INDEX_I_ SOL_CONTAINERS_START_INDEX
+#elif defined(SOL_CONTAINER_START_INDEX)
+	#define SOL_CONTAINER_START_INDEX_I_ SOL_CONTAINER_START_INDEX
+#else
+	#define SOL_CONTAINER_START_INDEX_I_ 1
+#endif
+
+#if defined (SOL_NO_MEMORY_ALIGNMENT)
+	#if (SOL_NO_MEMORY_ALIGNMENT != 0)
+		#define SOL_ALIGN_MEMORY_I_ SOL_OFF
+	#else
+		#define SOL_ALIGN_MEMORY_I_ SOL_ON
+	#endif
+#else
+	#define SOL_ALIGN_MEMORY_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_USE_BOOST)
+	#if (SOL_USE_BOOST != 0)
+		#define SOL_USE_BOOST_I_ SOL_ON
+	#else
+		#define SOL_USE_BOOST_I_ SOL_OFF
+	#endif
+#else
+		#define SOL_USE_BOOST_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_USE_UNSAFE_BASE_LOOKUP)
+	#if (SOL_USE_UNSAFE_BASE_LOOKUP != 0)
+		#define SOL_USE_UNSAFE_BASE_LOOKUP_I_ SOL_ON
+	#else
+		#define SOL_USE_UNSAFE_BASE_LOOKUP_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USE_UNSAFE_BASE_LOOKUP_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_INSIDE_UNREAL)
+	#if (SOL_INSIDE_UNREAL != 0)
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_ON
+	#else
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_OFF
+	#endif
+#else
+	#if defined(UE_BUILD_DEBUG) || defined(UE_BUILD_DEVELOPMENT) || defined(UE_BUILD_TEST) || defined(UE_BUILD_SHIPPING) || defined(UE_SERVER)
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_NO_COMPAT)
+	#if (SOL_NO_COMPAT != 0)
+		#define SOL_USE_COMPATIBILITY_LAYER_I_ SOL_OFF
+	#else
+		#define SOL_USE_COMPATIBILITY_LAYER_I_ SOL_ON
+	#endif
+#else
+	#define SOL_USE_COMPATIBILITY_LAYER_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_GET_FUNCTION_POINTER_UNSAFE)
+	#if (SOL_GET_FUNCTION_POINTER_UNSAFE != 0)
+		#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_ON
+	#else
+		#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_CONTAINER_CHECK_IS_EXHAUSTIVE)
+	#if (SOL_CONTAINER_CHECK_IS_EXHAUSTIVE != 0)
+		#define SOL_CONTAINER_CHECK_IS_EXHAUSTIVE_I_ SOL_ON
+	#else
+		#define SOL_CONTAINER_CHECK_IS_EXHAUSTIVE_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_CONTAINER_CHECK_IS_EXHAUSTIVE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_FUNCTION_CALL_VALUE_SEMANTICS)
+	#if (SOL_FUNCTION_CALL_VALUE_SEMANTICS != 0)
+		#define SOL_FUNCTION_CALL_VALUE_SEMANTICS_I_ SOL_ON
+	#else
+		#define SOL_FUNCTION_CALL_VALUE_SEMANTICS_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_FUNCTION_CALL_VALUE_SEMANTICS_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_MINGW_CCTYPE_IS_POISONED)
+	#if (SOL_MINGW_CCTYPE_IS_POISONED != 0)
+		#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_ON
+	#else
+		#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_OFF
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_MINGW) && defined(__GNUC__) && (__GNUC__ < 6)
+	// MinGW is off its rocker in some places...
+	#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_CHAR8_T)
+	#if (SOL_CHAR8_T != 0)
+		#define SOL_CHAR8_T_I_ SOL_ON
+	#else
+		#define SOL_CHAR8_T_I_ SOL_OFF
+	#endif
+#else
+	#if defined(__cpp_char8_t)
+		#define SOL_CHAR8_T_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_CHAR8_T_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if SOL_IS_ON(SOL_USE_BOOST)
+	#include <boost/version.hpp>
+
+	#if BOOST_VERSION >= 107500 // Since Boost 1.75.0 boost::none is constexpr
+		#define SOL_BOOST_NONE_CONSTEXPR_I_ constexpr
+	#else
+		#define SOL_BOOST_NONE_CONSTEXPR_I_ const
+	#endif // BOOST_VERSION
+#else
+	// assume boost isn't using a garbage version
+	#define SOL_BOOST_NONE_CONSTEXPR_I_ constexpr
+#endif
+
+#if defined(SOL2_CI)
+	#if (SOL2_CI != 0)
+		#define SOL2_CI_I_ SOL_ON
+	#else
+		#define SOL2_CI_I_ SOL_OFF
+	#endif
+#else
+	#define SOL2_CI_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_ASSERT)
+	#define SOL_USER_ASSERT_I_ SOL_ON
+#else
+	#define SOL_USER_ASSERT_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_ASSERT_MSG)
+	#define SOL_USER_ASSERT_MSG_I_ SOL_ON
+#else
+	#define SOL_USER_ASSERT_MSG_I_ SOL_DEFAULT_OFF
+#endif
+
+// beginning of sol/prologue.hpp
+
+#if defined(SOL_PROLOGUE_I_)
+	#error "[sol2] Library Prologue was already included in translation unit and not properly ended with an epilogue."
+#endif
+
+#define SOL_PROLOGUE_I_ 1
+
+#if SOL_IS_ON(SOL_BUILD_CXX_MODE)
+	#define _FWD(...) static_cast<decltype( __VA_ARGS__ )&&>( __VA_ARGS__ )
+
+	#if SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+		#define _MOVE(...) static_cast<__typeof( __VA_ARGS__ )&&>( __VA_ARGS__ )
+	#else
+		#include <type_traits>
+		
+		#define _MOVE(...) static_cast<::std::remove_reference_t<( __VA_ARGS__ )>&&>( __VA_OPT__(,) )
+	#endif
+#endif
+
+// end of sol/prologue.hpp
+
+// beginning of sol/epilogue.hpp
+
+#if !defined(SOL_PROLOGUE_I_)
+	#error "[sol2] Library Prologue is missing from this translation unit."
+#else
+	#undef SOL_PROLOGUE_I_
+#endif
+
+#if SOL_IS_ON(SOL_BUILD_CXX_MODE)
+	#undef _FWD
+	#undef _MOVE
+#endif
+
+// end of sol/epilogue.hpp
+
+// beginning of sol/detail/build_version.hpp
+
+#if defined(SOL_DLL)
+	#if (SOL_DLL != 0)
+		#define SOL_DLL_I_ SOL_ON
+	#else
+		#define SOL_DLL_I_ SOL_OFF
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_VCXX) && (defined(DLL_) || defined(_DLL))
+	#define SOL_DLL_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_DLL_I_ SOL_DEFAULT_OFF
+#endif // DLL definition
+
+#if defined(SOL_HEADER_ONLY)
+	#if (SOL_HEADER_ONLY != 0)
+		#define SOL_HEADER_ONLY_I_ SOL_ON
+	#else
+		#define SOL_HEADER_ONLY_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_HEADER_ONLY_I_ SOL_DEFAULT_OFF
+#endif // Header only library
+
+#if defined(SOL_BUILD)
+	#if (SOL_BUILD != 0)
+		#define SOL_BUILD_I_ SOL_ON
+	#else
+		#define SOL_BUILD_I_ SOL_OFF
+	#endif
+#elif SOL_IS_ON(SOL_HEADER_ONLY)
+	#define SOL_BUILD_I_ SOL_DEFAULT_OFF
+#else
+	#define SOL_BUILD_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_UNITY_BUILD)
+	#if (SOL_UNITY_BUILD != 0)
+		#define SOL_UNITY_BUILD_I_ SOL_ON
+	#else
+		#define SOL_UNITY_BUILD_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_UNITY_BUILD_I_ SOL_DEFAULT_OFF
+#endif // Header only library
+
+#if defined(SOL_C_FUNCTION_LINKAGE)
+	#define SOL_C_FUNCTION_LINKAGE_I_ SOL_C_FUNCTION_LINKAGE
+#else
+	#if SOL_IS_ON(SOL_BUILD_CXX_MODE)
+		// C++
+		#define SOL_C_FUNCTION_LINKAGE_I_ extern "C"
+	#else
+		// normal
+		#define SOL_C_FUNCTION_LINKAGE_I_
+	#endif // C++ or not
+#endif // Linkage specification for C functions
+
+#if defined(SOL_API_LINKAGE)
+	#define SOL_API_LINKAGE_I_ SOL_API_LINKAGE
+#else
+	#if SOL_IS_ON(SOL_DLL)
+		#if SOL_IS_ON(SOL_COMPILER_VCXX) || SOL_IS_ON(SOL_PLATFORM_WINDOWS) || SOL_IS_ON(SOL_PLATFORM_CYGWIN)
+			// MSVC Compiler; or, Windows, or Cygwin platforms
+			#if SOL_IS_ON(SOL_BUILD)
+				// Building the library
+				#if SOL_IS_ON(SOL_COMPILER_GCC)
+					// Using GCC
+					#define SOL_API_LINKAGE_I_ __attribute__((dllexport))
+				#else
+					// Using Clang, MSVC, etc...
+					#define SOL_API_LINKAGE_I_ __declspec(dllexport)
+				#endif
+			#else
+				#if SOL_IS_ON(SOL_COMPILER_GCC)
+					#define SOL_API_LINKAGE_I_ __attribute__((dllimport))
+				#else
+					#define SOL_API_LINKAGE_I_ __declspec(dllimport)
+				#endif
+			#endif
+		#else
+			// extern if building normally on non-MSVC
+			#define SOL_API_LINKAGE_I_ extern
+		#endif
+	#elif SOL_IS_ON(SOL_UNITY_BUILD)
+		// Built-in library, like how stb typical works
+		#if SOL_IS_ON(SOL_HEADER_ONLY)
+			// Header only, so functions are defined "inline"
+			#define SOL_API_LINKAGE_I_ inline
+		#else
+			// Not header only, so seperately compiled files
+			#define SOL_API_LINKAGE_I_ extern
+		#endif
+	#else
+		// Normal static library
+		#if SOL_IS_ON(SOL_BUILD_CXX_MODE)
+			#define SOL_API_LINKAGE_I_
+		#else
+			#define SOL_API_LINKAGE_I_ extern
+		#endif
+	#endif // DLL or not
+#endif // Build definitions
+
+#if defined(SOL_PUBLIC_FUNC_DECL)
+	#define SOL_PUBLIC_FUNC_DECL_I_ SOL_PUBLIC_FUNC_DECL
+#else
+	#define SOL_PUBLIC_FUNC_DECL_I_ SOL_API_LINKAGE_I_
+#endif
+
+#if defined(SOL_INTERNAL_FUNC_DECL_)
+	#define SOL_INTERNAL_FUNC_DECL_I_ SOL_INTERNAL_FUNC_DECL_
+#else
+	#define SOL_INTERNAL_FUNC_DECL_I_ SOL_API_LINKAGE_I_
+#endif
+
+#if defined(SOL_PUBLIC_FUNC_DEF)
+	#define SOL_PUBLIC_FUNC_DEF_I_ SOL_PUBLIC_FUNC_DEF
+#else
+	#define SOL_PUBLIC_FUNC_DEF_I_ SOL_API_LINKAGE_I_
+#endif
+
+#if defined(SOL_INTERNAL_FUNC_DEF)
+	#define SOL_INTERNAL_FUNC_DEF_I_ SOL_INTERNAL_FUNC_DEF
+#else
+	#define SOL_INTERNAL_FUNC_DEF_I_ SOL_API_LINKAGE_I_
+#endif
+
+#if defined(SOL_FUNC_DECL)
+	#define SOL_FUNC_DECL_I_ SOL_FUNC_DECL
+#elif SOL_IS_ON(SOL_HEADER_ONLY)
+	#define SOL_FUNC_DECL_I_ 
+#elif SOL_IS_ON(SOL_DLL)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		#if SOL_IS_ON(SOL_BUILD)
+			#define SOL_FUNC_DECL_I_ extern __declspec(dllexport)
+		#else
+			#define SOL_FUNC_DECL_I_ extern __declspec(dllimport)
+		#endif
+	#elif SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+		#define SOL_FUNC_DECL_I_ extern __attribute__((visibility("default")))
+	#else
+		#define SOL_FUNC_DECL_I_ extern
+	#endif
+#endif
+
+#if defined(SOL_FUNC_DEFN)
+	#define SOL_FUNC_DEFN_I_ SOL_FUNC_DEFN
+#elif SOL_IS_ON(SOL_HEADER_ONLY)
+	#define SOL_FUNC_DEFN_I_ inline
+#elif SOL_IS_ON(SOL_DLL)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		#if SOL_IS_ON(SOL_BUILD)
+			#define SOL_FUNC_DEFN_I_ __declspec(dllexport)
+		#else
+			#define SOL_FUNC_DEFN_I_ __declspec(dllimport)
+		#endif
+	#elif SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+		#define SOL_FUNC_DEFN_I_ __attribute__((visibility("default")))
+	#else
+		#define SOL_FUNC_DEFN_I_
+	#endif
+#endif
+
+#if defined(SOL_HIDDEN_FUNC_DECL)
+	#define SOL_HIDDEN_FUNC_DECL_I_ SOL_HIDDEN_FUNC_DECL
+#elif SOL_IS_ON(SOL_HEADER_ONLY)
+	#define SOL_HIDDEN_FUNC_DECL_I_ 
+#elif SOL_IS_ON(SOL_DLL)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		#if SOL_IS_ON(SOL_BUILD)
+			#define SOL_HIDDEN_FUNC_DECL_I_ extern __declspec(dllexport)
+		#else
+			#define SOL_HIDDEN_FUNC_DECL_I_ extern __declspec(dllimport)
+		#endif
+	#elif SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+		#define SOL_HIDDEN_FUNC_DECL_I_ extern __attribute__((visibility("default")))
+	#else
+		#define SOL_HIDDEN_FUNC_DECL_I_ extern
+	#endif
+#endif
+
+#if defined(SOL_HIDDEN_FUNC_DEFN)
+	#define SOL_HIDDEN_FUNC_DEFN_I_ SOL_HIDDEN_FUNC_DEFN
+#elif SOL_IS_ON(SOL_HEADER_ONLY)
+	#define SOL_HIDDEN_FUNC_DEFN_I_ inline
+#elif SOL_IS_ON(SOL_DLL)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		#if SOL_IS_ON(SOL_BUILD)
+			#define SOL_HIDDEN_FUNC_DEFN_I_ 
+		#else
+			#define SOL_HIDDEN_FUNC_DEFN_I_ 
+		#endif
+	#elif SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+		#define SOL_HIDDEN_FUNC_DEFN_I_ __attribute__((visibility("hidden")))
+	#else
+		#define SOL_HIDDEN_FUNC_DEFN_I_
+	#endif
+#endif
+
+// end of sol/detail/build_version.hpp
+
+// end of sol/version.hpp
+
+#include <utility>
+#include <type_traits>
+#include <string_view>
+
+#if SOL_IS_ON(SOL_USING_CXX_LUA) || SOL_IS_ON(SOL_USING_CXX_LUAJIT)
+struct lua_State;
+#else
+extern "C" {
+struct lua_State;
+}
+#endif // C++ Mangling for Lua vs. Not
+
+namespace sol {
+
+	enum class type;
+
+	class stateless_reference;
+	template <bool b>
+	class basic_reference;
+	using reference = basic_reference<false>;
+	using main_reference = basic_reference<true>;
+	class stateless_stack_reference;
+	class stack_reference;
+
+	template <typename A>
+	class basic_bytecode;
+
+	struct lua_value;
+
+	struct proxy_base_tag;
+	template <typename>
+	struct proxy_base;
+	template <typename, typename>
+	struct table_proxy;
+
+	template <bool, typename>
+	class basic_table_core;
+	template <bool b>
+	using table_core = basic_table_core<b, reference>;
+	template <bool b>
+	using main_table_core = basic_table_core<b, main_reference>;
+	template <bool b>
+	using stack_table_core = basic_table_core<b, stack_reference>;
+	template <typename base_type>
+	using basic_table = basic_table_core<false, base_type>;
+	using table = table_core<false>;
+	using global_table = table_core<true>;
+	using main_table = main_table_core<false>;
+	using main_global_table = main_table_core<true>;
+	using stack_table = stack_table_core<false>;
+	using stack_global_table = stack_table_core<true>;
+
+	template <typename>
+	struct basic_lua_table;
+	using lua_table = basic_lua_table<reference>;
+	using stack_lua_table = basic_lua_table<stack_reference>;
+
+	template <typename T, typename base_type>
+	class basic_usertype;
+	template <typename T>
+	using usertype = basic_usertype<T, reference>;
+	template <typename T>
+	using stack_usertype = basic_usertype<T, stack_reference>;
+
+	template <typename base_type>
+	class basic_metatable;
+	using metatable = basic_metatable<reference>;
+	using stack_metatable = basic_metatable<stack_reference>;
+
+	template <typename base_t>
+	struct basic_environment;
+	using environment = basic_environment<reference>;
+	using main_environment = basic_environment<main_reference>;
+	using stack_environment = basic_environment<stack_reference>;
+
+	template <typename T, bool>
+	class basic_function;
+	template <typename T, bool, typename H>
+	class basic_protected_function;
+	using unsafe_function = basic_function<reference, false>;
+	using safe_function = basic_protected_function<reference, false, reference>;
+	using main_unsafe_function = basic_function<main_reference, false>;
+	using main_safe_function = basic_protected_function<main_reference, false, reference>;
+	using stack_unsafe_function = basic_function<stack_reference, false>;
+	using stack_safe_function = basic_protected_function<stack_reference, false, reference>;
+	using stack_aligned_unsafe_function = basic_function<stack_reference, true>;
+	using stack_aligned_safe_function = basic_protected_function<stack_reference, true, reference>;
+	using protected_function = safe_function;
+	using main_protected_function = main_safe_function;
+	using stack_protected_function = stack_safe_function;
+	using stack_aligned_protected_function = stack_aligned_safe_function;
+#if SOL_IS_ON(SOL_SAFE_FUNCTION_OBJECTS)
+	using function = protected_function;
+	using main_function = main_protected_function;
+	using stack_function = stack_protected_function;
+	using stack_aligned_function = stack_aligned_safe_function;
+#else
+	using function = unsafe_function;
+	using main_function = main_unsafe_function;
+	using stack_function = stack_unsafe_function;
+	using stack_aligned_function = stack_aligned_unsafe_function;
+#endif
+	using stack_aligned_stack_handler_function = basic_protected_function<stack_reference, true, stack_reference>;
+
+	struct unsafe_function_result;
+	struct protected_function_result;
+	using safe_function_result = protected_function_result;
+#if SOL_IS_ON(SOL_SAFE_FUNCTION_OBJECTS)
+	using function_result = safe_function_result;
+#else
+	using function_result = unsafe_function_result;
+#endif
+
+	template <typename base_t>
+	class basic_object_base;
+	template <typename base_t>
+	class basic_object;
+	template <typename base_t>
+	class basic_userdata;
+	template <typename base_t>
+	class basic_lightuserdata;
+	template <typename base_t>
+	class basic_coroutine;
+	template <typename base_t>
+	class basic_packaged_coroutine;
+	template <typename base_t>
+	class basic_thread;
+
+	using object = basic_object<reference>;
+	using userdata = basic_userdata<reference>;
+	using lightuserdata = basic_lightuserdata<reference>;
+	using thread = basic_thread<reference>;
+	using coroutine = basic_coroutine<reference>;
+	using packaged_coroutine = basic_packaged_coroutine<reference>;
+	using main_object = basic_object<main_reference>;
+	using main_userdata = basic_userdata<main_reference>;
+	using main_lightuserdata = basic_lightuserdata<main_reference>;
+	using main_coroutine = basic_coroutine<main_reference>;
+	using stack_object = basic_object<stack_reference>;
+	using stack_userdata = basic_userdata<stack_reference>;
+	using stack_lightuserdata = basic_lightuserdata<stack_reference>;
+	using stack_thread = basic_thread<stack_reference>;
+	using stack_coroutine = basic_coroutine<stack_reference>;
+
+	struct stack_proxy_base;
+	struct stack_proxy;
+	struct variadic_args;
+	struct variadic_results;
+	struct stack_count;
+	struct this_state;
+	struct this_main_state;
+	struct this_environment;
+
+	class state_view;
+	class state;
+
+	template <typename T>
+	struct as_table_t;
+	template <typename T>
+	struct as_container_t;
+	template <typename T>
+	struct nested;
+	template <typename T>
+	struct light;
+	template <typename T>
+	struct user;
+	template <typename T>
+	struct as_args_t;
+	template <typename T>
+	struct protect_t;
+	template <typename F, typename... Policies>
+	struct policy_wrapper;
+
+	template <typename T>
+	struct usertype_traits;
+	template <typename T>
+	struct unique_usertype_traits;
+
+	template <typename... Args>
+	struct types {
+		typedef std::make_index_sequence<sizeof...(Args)> indices;
+		static constexpr std::size_t size() {
+			return sizeof...(Args);
+		}
+	};
+
+	template <typename T>
+	struct derive : std::false_type {
+		typedef types<> type;
+	};
+
+	template <typename T>
+	struct base : std::false_type {
+		typedef types<> type;
+	};
+
+	template <typename T>
+	struct weak_derive {
+		static bool value;
+	};
+
+	template <typename T>
+	bool weak_derive<T>::value = false;
+
+	namespace stack {
+		struct record;
+	}
+
+#if SOL_IS_OFF(SOL_USE_BOOST)
+	template <class T>
+	class optional;
+
+	template <class T>
+	class optional<T&>;
+#endif
+
+	using check_handler_type = int(lua_State*, int, type, type, const char*);
+
+} // namespace sol
+
+#define SOL_BASE_CLASSES(T, ...)                       \
+	namespace sol {                                   \
+		template <>                                  \
+		struct base<T> : std::true_type {            \
+			typedef ::sol::types<__VA_ARGS__> type; \
+		};                                           \
+	}                                                 \
+	static_assert(true, "")
+#define SOL_DERIVED_CLASSES(T, ...)                    \
+	namespace sol {                                   \
+		template <>                                  \
+		struct derive<T> : std::true_type {          \
+			typedef ::sol::types<__VA_ARGS__> type; \
+		};                                           \
+	}                                                 \
+	static_assert(true, "")
+
+#endif // SOL_FORWARD_HPP
+// end of sol/forward.hpp
+
+#endif // SOL_SINGLE_INCLUDE_SOL_FORWARD_HPP
diff --git a/src/libs/3rdparty/sol2/include/sol/sol.hpp b/src/libs/3rdparty/sol2/include/sol/sol.hpp
new file mode 100644
index 00000000000..85665a50c93
--- /dev/null
+++ b/src/libs/3rdparty/sol2/include/sol/sol.hpp
@@ -0,0 +1,29202 @@
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+// This file was generated with a script.
+// Generated 2024-01-13 14:25:56.532275 UTC
+// This header was generated with sol v3.3.1 (revision 9c882a28)
+// https://github.com/ThePhD/sol2
+
+#ifndef SOL_SINGLE_INCLUDE_SOL_HPP
+#define SOL_SINGLE_INCLUDE_SOL_HPP
+
+// beginning of sol/sol.hpp
+
+#ifndef SOL_HPP
+#define SOL_HPP
+
+// beginning of sol/version.hpp
+
+#include "config.hpp"
+
+#define SOL_VERSION_MAJOR 3
+#define SOL_VERSION_MINOR 2
+#define SOL_VERSION_PATCH 3
+#define SOL_VERSION_STRING "3.2.3"
+#define SOL_VERSION ((SOL_VERSION_MAJOR * 100000) + (SOL_VERSION_MINOR * 100) + (SOL_VERSION_PATCH))
+
+#define SOL_TOKEN_TO_STRING_POST_EXPANSION_I_(_TOKEN) #_TOKEN
+#define SOL_TOKEN_TO_STRING_I_(_TOKEN) SOL_TOKEN_TO_STRING_POST_EXPANSION_I_(_TOKEN)
+
+#define SOL_CONCAT_TOKENS_POST_EXPANSION_I_(_LEFT, _RIGHT) _LEFT##_RIGHT
+#define SOL_CONCAT_TOKENS_I_(_LEFT, _RIGHT) SOL_CONCAT_TOKENS_POST_EXPANSION_I_(_LEFT, _RIGHT)
+
+#define SOL_RAW_IS_ON(OP_SYMBOL) ((3 OP_SYMBOL 3) != 0)
+#define SOL_RAW_IS_OFF(OP_SYMBOL) ((3 OP_SYMBOL 3) == 0)
+#define SOL_RAW_IS_DEFAULT_ON(OP_SYMBOL) ((3 OP_SYMBOL 3) > 3)
+#define SOL_RAW_IS_DEFAULT_OFF(OP_SYMBOL) ((3 OP_SYMBOL 3 OP_SYMBOL 3) < 0)
+
+#define SOL_IS_ON(OP_SYMBOL) SOL_RAW_IS_ON(OP_SYMBOL ## _I_)
+#define SOL_IS_OFF(OP_SYMBOL) SOL_RAW_IS_OFF(OP_SYMBOL ## _I_)
+#define SOL_IS_DEFAULT_ON(OP_SYMBOL) SOL_RAW_IS_DEFAULT_ON(OP_SYMBOL ## _I_)
+#define SOL_IS_DEFAULT_OFF(OP_SYMBOL) SOL_RAW_IS_DEFAULT_OFF(OP_SYMBOL ## _I_)
+
+#define SOL_ON          |
+#define SOL_OFF         ^
+#define SOL_DEFAULT_ON  +
+#define SOL_DEFAULT_OFF -
+
+#if defined(SOL_BUILD_CXX_MODE)
+	#if (SOL_BUILD_CXX_MODE != 0)
+		#define SOL_BUILD_CXX_MODE_I_ SOL_ON
+	#else
+		#define SOL_BUILD_CXX_MODE_I_ SOL_OFF
+	#endif
+#elif defined(__cplusplus)
+	#define SOL_BUILD_CXX_MODE_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_BUILD_CXX_MODE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_BUILD_C_MODE)
+	#if (SOL_BUILD_C_MODE != 0)
+		#define SOL_BUILD_C_MODE_I_ SOL_ON
+	#else
+		#define SOL_BUILD_C_MODE_I_ SOL_OFF
+	#endif
+#elif defined(__STDC__)
+	#define SOL_BUILD_C_MODE_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_BUILD_C_MODE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if SOL_IS_ON(SOL_BUILD_C_MODE)
+	#include <stddef.h>
+	#include <stdint.h>
+	#include <limits.h>
+#else
+	#include <cstddef>
+	#include <cstdint>
+	#include <climits>
+#endif
+
+#if defined(SOL_HAS_BUILTIN)
+	#define SOL_HAS_BUILTIN_I_(...) SOL_HAS_BUILTIN(__VA_ARGS__)
+#elif defined(__has_builtin)
+	#define SOL_HAS_BUILTIN_I_(...) __has_builtin(__VA_ARGS__)
+#else
+	#define SOL_HAS_BUILTIN_I_(...) 0
+#endif
+
+#if defined(SOL_COMPILER_VCXX)
+	#if defined(SOL_COMPILER_VCXX != 0)
+		#define SOL_COMPILER_VCXX_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_VCXX_I_ SOL_OFF
+	#endif
+#elif defined(_MSC_VER)
+	#define SOL_COMPILER_VCXX_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_COMPILER_VCXX_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_COMPILER_GCC)
+	#if defined(SOL_COMPILER_GCC != 0)
+		#define SOL_COMPILER_GCC_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_GCC_I_ SOL_OFF
+	#endif
+#elif defined(__GNUC__)
+	#define SOL_COMPILER_GCC_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_COMPILER_GCC_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_COMPILER_CLANG)
+	#if defined(SOL_COMPILER_CLANG != 0)
+		#define SOL_COMPILER_CLANG_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_CLANG_I_ SOL_OFF
+	#endif
+#elif defined(__clang__)
+	#define SOL_COMPILER_CLANG_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_COMPILER_CLANG_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_COMPILER_EDG)
+	#if defined(SOL_COMPILER_EDG != 0)
+		#define SOL_COMPILER_EDG_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_EDG_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_COMPILER_EDG_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_COMPILER_MINGW)
+	#if (SOL_COMPILER_MINGW != 0)
+		#define SOL_COMPILER_MINGW_I_ SOL_ON
+	#else
+		#define SOL_COMPILER_MINGW_I_ SOL_OFF
+	#endif
+#elif defined(__MINGW32__)
+	#define SOL_COMPILER_MINGW_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_COMPILER_MINGW_I_ SOL_DEFAULT_OFF
+#endif
+
+#if SIZE_MAX <= 0xFFFFULL
+	#define SOL_PLATFORM_X16_I_ SOL_ON
+	#define SOL_PLATFORM_X86_I_ SOL_OFF
+	#define SOL_PLATFORM_X64_I_ SOL_OFF
+#elif SIZE_MAX <= 0xFFFFFFFFULL
+	#define SOL_PLATFORM_X16_I_ SOL_OFF
+	#define SOL_PLATFORM_X86_I_ SOL_ON
+	#define SOL_PLATFORM_X64_I_ SOL_OFF
+#else
+	#define SOL_PLATFORM_X16_I_ SOL_OFF
+	#define SOL_PLATFORM_X86_I_ SOL_OFF
+	#define SOL_PLATFORM_X64_I_ SOL_ON
+#endif
+
+#define SOL_PLATFORM_ARM32_I_ SOL_OFF
+#define SOL_PLATFORM_ARM64_I_ SOL_OFF
+
+#if defined(SOL_PLATFORM_WINDOWS)
+	#if (SOL_PLATFORM_WINDOWS != 0)
+		#define SOL_PLATFORM_WINDOWS_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_WINDOWS_I_ SOL_OFF
+	#endif
+#elif defined(_WIN32)
+	#define SOL_PLATFORM_WINDOWS_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_PLATFORM_WINDOWS_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_PLATFORM_CYGWIN)
+	#if (SOL_PLATFORM_CYGWIN != 0)
+		#define SOL_PLATFORM_CYGWIN_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_CYGWIN_I_ SOL_ON
+	#endif
+#elif defined(__CYGWIN__)
+	#define SOL_PLATFORM_CYGWIN_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_PLATFORM_CYGWIN_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_PLATFORM_APPLE)
+	#if (SOL_PLATFORM_APPLE != 0)
+		#define SOL_PLATFORM_APPLE_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_APPLE_I_ SOL_OFF
+	#endif
+#elif defined(__APPLE__)
+	#define SOL_PLATFORM_APPLE_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_PLATFORM_APPLE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_PLATFORM_UNIX)
+	#if (SOL_PLATFORM_UNIX != 0)
+		#define SOL_PLATFORM_UNIXLIKE_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_UNIXLIKE_I_ SOL_OFF
+	#endif
+#elif defined(__unix__)
+	#define SOL_PLATFORM_UNIXLIKE_I_ SOL_DEFAUKT_ON
+#else
+	#define SOL_PLATFORM_UNIXLIKE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_PLATFORM_LINUX)
+	#if (SOL_PLATFORM_LINUX != 0)
+		#define SOL_PLATFORM_LINUXLIKE_I_ SOL_ON
+	#else
+		#define SOL_PLATFORM_LINUXLIKE_I_ SOL_OFF
+	#endif
+#elif defined(__LINUX__)
+	#define SOL_PLATFORM_LINUXLIKE_I_ SOL_DEFAUKT_ON
+#else
+	#define SOL_PLATFORM_LINUXLIKE_I_ SOL_DEFAULT_OFF
+#endif
+
+#define SOL_PLATFORM_APPLE_IPHONE_I_ SOL_OFF
+#define SOL_PLATFORM_BSDLIKE_I_      SOL_OFF
+
+#if defined(SOL_IN_DEBUG_DETECTED)
+	#if SOL_IN_DEBUG_DETECTED != 0
+		#define SOL_DEBUG_BUILD_I_ SOL_ON
+	#else
+		#define SOL_DEBUG_BUILD_I_ SOL_OFF
+	#endif
+#elif !defined(NDEBUG)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX) && defined(_DEBUG)
+		#define SOL_DEBUG_BUILD_I_ SOL_ON
+	#elif (SOL_IS_ON(SOL_COMPILER_CLANG) || SOL_IS_ON(SOL_COMPILER_GCC)) && !defined(__OPTIMIZE__)
+		#define SOL_DEBUG_BUILD_I_ SOL_ON
+	#else
+		#define SOL_DEBUG_BUILD_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_DEBUG_BUILD_I_ SOL_DEFAULT_OFF
+#endif // We are in a debug mode of some sort
+
+#if defined(SOL_NO_EXCEPTIONS)
+	#if (SOL_NO_EXCEPTIONS != 0)
+		#define SOL_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_EXCEPTIONS_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_VCXX)
+	#if !defined(_CPPUNWIND)
+		#define SOL_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_EXCEPTIONS_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_CLANG) || SOL_IS_ON(SOL_COMPILER_GCC)
+	#if !defined(__EXCEPTIONS)
+		#define SOL_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_EXCEPTIONS_I_ SOL_ON
+	#endif
+#else
+	#define SOL_EXCEPTIONS_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_NO_RTTI)
+	#if (SOL_NO_RTTI != 0)
+		#define SOL_RTTI_I_ SOL_OFF
+	#else
+		#define SOL_RTTI_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_VCXX)
+	#if !defined(_CPPRTTI)
+		#define SOL_RTTI_I_ SOL_OFF
+	#else
+		#define SOL_RTTI_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_CLANG) || SOL_IS_ON(SOL_COMPILER_GCC)
+	#if !defined(__GXX_RTTI)
+		#define SOL_RTTI_I_ SOL_OFF
+	#else
+		#define SOL_RTTI_I_ SOL_ON
+	#endif
+#else
+	#define SOL_RTTI_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_NO_THREAD_LOCAL)
+	#if SOL_NO_THREAD_LOCAL != 0
+		#define SOL_USE_THREAD_LOCAL_I_ SOL_OFF
+	#else
+		#define SOL_USE_THREAD_LOCAL_I_ SOL_ON
+	#endif
+#else
+	#define SOL_USE_THREAD_LOCAL_I_ SOL_DEFAULT_ON
+#endif // thread_local keyword is bjorked on some platforms
+
+#if defined(SOL_ALL_SAFETIES_ON)
+	#if SOL_ALL_SAFETIES_ON != 0
+		#define SOL_ALL_SAFETIES_ON_I_ SOL_ON
+	#else
+		#define SOL_ALL_SAFETIES_ON_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_ALL_SAFETIES_ON_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_SAFE_GETTER)
+	#if SOL_SAFE_GETTER != 0
+		#define SOL_SAFE_GETTER_I_ SOL_ON
+	#else
+		#define SOL_SAFE_GETTER_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_GETTER_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_GETTER_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_GETTER_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_USERTYPE)
+	#if SOL_SAFE_USERTYPE != 0
+		#define SOL_SAFE_USERTYPE_I_ SOL_ON
+	#else
+		#define SOL_SAFE_USERTYPE_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_USERTYPE_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_USERTYPE_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_USERTYPE_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_REFERENCES)
+	#if SOL_SAFE_REFERENCES != 0
+		#define SOL_SAFE_REFERENCES_I_ SOL_ON
+	#else
+		#define SOL_SAFE_REFERENCES_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_REFERENCES_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_REFERENCES_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_REFERENCES_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_FUNCTIONS)
+	#if SOL_SAFE_FUNCTIONS != 0
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
+	#else
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_OFF
+	#endif
+#elif defined (SOL_SAFE_FUNCTION_OBJECTS)
+	#if SOL_SAFE_FUNCTION_OBJECTS != 0
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
+	#else
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_FUNCTION_CALLS)
+	#if SOL_SAFE_FUNCTION_CALLS != 0
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_ON
+	#else
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_PROXIES)
+	#if SOL_SAFE_PROXIES != 0
+		#define SOL_SAFE_PROXIES_I_ SOL_ON
+	#else
+		#define SOL_SAFE_PROXIES_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_PROXIES_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_PROXIES_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_PROXIES_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_SAFE_NUMERICS)
+	#if SOL_SAFE_NUMERICS != 0
+		#define SOL_SAFE_NUMERICS_I_ SOL_ON
+	#else
+		#define SOL_SAFE_NUMERICS_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_NUMERICS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_NUMERICS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_NUMERICS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_ALL_INTEGER_VALUES_FIT)
+	#if (SOL_ALL_INTEGER_VALUES_FIT != 0)
+		#define SOL_ALL_INTEGER_VALUES_FIT_I_ SOL_ON
+	#else
+		#define SOL_ALL_INTEGER_VALUES_FIT_I_ SOL_OFF
+	#endif
+#elif !SOL_IS_DEFAULT_OFF(SOL_SAFE_NUMERICS) && SOL_IS_OFF(SOL_SAFE_NUMERICS)
+	// if numerics is intentionally turned off, flip this on
+	#define SOL_ALL_INTEGER_VALUES_FIT_I_ SOL_DEFAULT_ON
+#else
+	// default to off
+	#define SOL_ALL_INTEGER_VALUES_FIT_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_SAFE_STACK_CHECK)
+	#if SOL_SAFE_STACK_CHECK != 0
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_ON
+	#else
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_SAFE_STACK_CHECK_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_NO_CHECK_NUMBER_PRECISION)
+	#if SOL_NO_CHECK_NUMBER_PRECISION != 0
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_OFF
+	#else
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#endif
+#elif defined(SOL_NO_CHECKING_NUMBER_PRECISION)
+	#if SOL_NO_CHECKING_NUMBER_PRECISION != 0
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_OFF
+	#else
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_SAFE_NUMERICS)
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_STRINGS_ARE_NUMBERS)
+	#if (SOL_STRINGS_ARE_NUMBERS != 0)
+		#define SOL_STRINGS_ARE_NUMBERS_I_ SOL_ON
+	#else
+		#define SOL_STRINGS_ARE_NUMBERS_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_STRINGS_ARE_NUMBERS_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_ENABLE_INTEROP)
+	#if SOL_ENABLE_INTEROP != 0
+		#define SOL_USE_INTEROP_I_ SOL_ON
+	#else
+		#define SOL_USE_INTEROP_I_ SOL_OFF
+	#endif
+#elif defined(SOL_USE_INTEROP)
+	#if SOL_USE_INTEROP != 0
+		#define SOL_USE_INTEROP_I_ SOL_ON
+	#else
+		#define SOL_USE_INTEROP_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USE_INTEROP_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_NO_NIL)
+	#if (SOL_NO_NIL != 0)
+		#define SOL_NIL_I_ SOL_OFF
+	#else
+		#define SOL_NIL_I_ SOL_ON
+	#endif
+#elif defined(__MAC_OS_X_VERSION_MAX_ALLOWED) || defined(__OBJC__) || defined(nil)
+	#define SOL_NIL_I_ SOL_DEFAULT_OFF
+#else
+	#define SOL_NIL_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_USERTYPE_TYPE_BINDING_INFO)
+	#if (SOL_USERTYPE_TYPE_BINDING_INFO != 0)
+		#define SOL_USERTYPE_TYPE_BINDING_INFO_I_ SOL_ON
+	#else
+		#define SOL_USERTYPE_TYPE_BINDING_INFO_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USERTYPE_TYPE_BINDING_INFO_I_ SOL_DEFAULT_ON
+#endif // We should generate a my_type.__type table with lots of class information for usertypes
+
+#if defined(SOL_AUTOMAGICAL_TYPES_BY_DEFAULT)
+	#if (SOL_AUTOMAGICAL_TYPES_BY_DEFAULT != 0)
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_ON
+	#else
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_OFF
+	#endif
+#elif defined(SOL_DEFAULT_AUTOMAGICAL_USERTYPES)
+	#if (SOL_DEFAULT_AUTOMAGICAL_USERTYPES != 0)
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_ON
+	#else
+		#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_DEFAULT_AUTOMAGICAL_USERTYPES_I_ SOL_DEFAULT_ON
+#endif // make is_automagical on/off by default
+
+#if defined(SOL_STD_VARIANT)
+	#if (SOL_STD_VARIANT != 0)
+		#define SOL_STD_VARIANT_I_ SOL_ON
+	#else
+		#define SOL_STD_VARIANT_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_COMPILER_CLANG) && SOL_IS_ON(SOL_PLATFORM_APPLE)
+		#if defined(__has_include)
+			#if __has_include(<variant>)
+				#define SOL_STD_VARIANT_I_ SOL_DEFAULT_ON
+			#else
+				#define SOL_STD_VARIANT_I_ SOL_DEFAULT_OFF
+			#endif
+		#else
+			#define SOL_STD_VARIANT_I_ SOL_DEFAULT_OFF
+		#endif
+	#else
+		#define SOL_STD_VARIANT_I_ SOL_DEFAULT_ON
+	#endif
+#endif // make is_automagical on/off by default
+
+#if defined(SOL_NOEXCEPT_FUNCTION_TYPE)
+	#if (SOL_NOEXCEPT_FUNCTION_TYPE != 0)
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_ON
+	#else
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_OFF
+	#endif
+#else
+	#if defined(__cpp_noexcept_function_type)
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_COMPILER_VCXX) && (defined(_MSVC_LANG) && (_MSVC_LANG < 201403L))
+		// There is a bug in the VC++ compiler??
+		// on /std:c++latest under x86 conditions (VS 15.5.2),
+		// compiler errors are tossed for noexcept markings being on function types
+		// that are identical in every other way to their non-noexcept marked types function types...
+		// VS 2019: There is absolutely a bug.
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_OFF
+	#else
+		#define SOL_USE_NOEXCEPT_FUNCTION_TYPE_I_ SOL_DEFAULT_ON
+	#endif
+#endif // noexcept is part of a function's type
+
+#if defined(SOL_STACK_STRING_OPTIMIZATION_SIZE) && SOL_STACK_STRING_OPTIMIZATION_SIZE > 0
+	#define SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_ SOL_STACK_STRING_OPTIMIZATION_SIZE
+#else
+	#define SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_ 1024
+#endif
+
+#if defined(SOL_ID_SIZE) && SOL_ID_SIZE > 0
+	#define SOL_ID_SIZE_I_ SOL_ID_SIZE
+#else
+	#define SOL_ID_SIZE_I_ 512
+#endif
+
+#if defined(LUA_IDSIZE) && LUA_IDSIZE > 0
+	#define SOL_FILE_ID_SIZE_I_ LUA_IDSIZE
+#elif defined(SOL_ID_SIZE) && SOL_ID_SIZE > 0
+	#define SOL_FILE_ID_SIZE_I_ SOL_FILE_ID_SIZE
+#else
+	#define SOL_FILE_ID_SIZE_I_ 2048
+#endif
+
+#if defined(SOL_PRINT_ERRORS)
+	#if (SOL_PRINT_ERRORS != 0)
+		#define SOL_PRINT_ERRORS_I_ SOL_ON
+	#else
+		#define SOL_PRINT_ERRORS_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_ALL_SAFETIES_ON)
+		#define SOL_PRINT_ERRORS_I_ SOL_ON
+	#elif SOL_IS_ON(SOL_DEBUG_BUILD)
+		#define SOL_PRINT_ERRORS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_PRINT_ERRORS_I_ SOL_OFF
+	#endif
+#endif
+
+#if defined(SOL_DEFAULT_PASS_ON_ERROR)
+	#if (SOL_DEFAULT_PASS_ON_ERROR != 0)
+		#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_ON
+	#else
+		#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_DEFAULT_PASS_ON_ERROR_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_USING_CXX_LUA)
+	#if (SOL_USING_CXX_LUA != 0)
+		#define SOL_USING_CXX_LUA_I_ SOL_ON
+	#else
+		#define SOL_USING_CXX_LUA_I_ SOL_OFF
+	#endif
+#elif defined(SOL_USE_CXX_LUA)
+	// alternative spelling
+	#if (SOL_USE_CXX_LUA != 0)
+		#define SOL_USING_CXX_LUA_I_ SOL_ON
+	#else
+		#define SOL_USING_CXX_LUA_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USING_CXX_LUA_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_USING_CXX_LUAJIT)
+	#if (SOL_USING_CXX_LUAJIT != 0)
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_ON
+	#else
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_OFF
+	#endif
+#elif defined(SOL_USE_CXX_LUAJIT)
+	#if (SOL_USE_CXX_LUAJIT != 0)
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_ON
+	#else
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USING_CXX_LUAJIT_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_NO_LUA_HPP)
+	#if (SOL_NO_LUA_HPP != 0)
+		#define SOL_USE_LUA_HPP_I_ SOL_OFF
+	#else
+		#define SOL_USE_LUA_HPP_I_ SOL_ON
+	#endif
+#elif SOL_IS_ON(SOL_USING_CXX_LUA)
+	#define SOL_USE_LUA_HPP_I_ SOL_OFF
+#elif defined(__has_include)
+	#if __has_include(<lua.hpp>)
+		#define SOL_USE_LUA_HPP_I_ SOL_ON
+	#else
+		#define SOL_USE_LUA_HPP_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USE_LUA_HPP_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_CONTAINERS_START)
+	#define SOL_CONTAINER_START_INDEX_I_ SOL_CONTAINERS_START
+#elif defined(SOL_CONTAINERS_START_INDEX)
+	#define SOL_CONTAINER_START_INDEX_I_ SOL_CONTAINERS_START_INDEX
+#elif defined(SOL_CONTAINER_START_INDEX)
+	#define SOL_CONTAINER_START_INDEX_I_ SOL_CONTAINER_START_INDEX
+#else
+	#define SOL_CONTAINER_START_INDEX_I_ 1
+#endif
+
+#if defined (SOL_NO_MEMORY_ALIGNMENT)
+	#if (SOL_NO_MEMORY_ALIGNMENT != 0)
+		#define SOL_ALIGN_MEMORY_I_ SOL_OFF
+	#else
+		#define SOL_ALIGN_MEMORY_I_ SOL_ON
+	#endif
+#else
+	#define SOL_ALIGN_MEMORY_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_USE_BOOST)
+	#if (SOL_USE_BOOST != 0)
+		#define SOL_USE_BOOST_I_ SOL_ON
+	#else
+		#define SOL_USE_BOOST_I_ SOL_OFF
+	#endif
+#else
+		#define SOL_USE_BOOST_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_USE_UNSAFE_BASE_LOOKUP)
+	#if (SOL_USE_UNSAFE_BASE_LOOKUP != 0)
+		#define SOL_USE_UNSAFE_BASE_LOOKUP_I_ SOL_ON
+	#else
+		#define SOL_USE_UNSAFE_BASE_LOOKUP_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_USE_UNSAFE_BASE_LOOKUP_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_INSIDE_UNREAL)
+	#if (SOL_INSIDE_UNREAL != 0)
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_ON
+	#else
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_OFF
+	#endif
+#else
+	#if defined(UE_BUILD_DEBUG) || defined(UE_BUILD_DEVELOPMENT) || defined(UE_BUILD_TEST) || defined(UE_BUILD_SHIPPING) || defined(UE_SERVER)
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_INSIDE_UNREAL_ENGINE_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_NO_COMPAT)
+	#if (SOL_NO_COMPAT != 0)
+		#define SOL_USE_COMPATIBILITY_LAYER_I_ SOL_OFF
+	#else
+		#define SOL_USE_COMPATIBILITY_LAYER_I_ SOL_ON
+	#endif
+#else
+	#define SOL_USE_COMPATIBILITY_LAYER_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_GET_FUNCTION_POINTER_UNSAFE)
+	#if (SOL_GET_FUNCTION_POINTER_UNSAFE != 0)
+		#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_ON
+	#else
+		#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_CONTAINER_CHECK_IS_EXHAUSTIVE)
+	#if (SOL_CONTAINER_CHECK_IS_EXHAUSTIVE != 0)
+		#define SOL_CONTAINER_CHECK_IS_EXHAUSTIVE_I_ SOL_ON
+	#else
+		#define SOL_CONTAINER_CHECK_IS_EXHAUSTIVE_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_CONTAINER_CHECK_IS_EXHAUSTIVE_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_FUNCTION_CALL_VALUE_SEMANTICS)
+	#if (SOL_FUNCTION_CALL_VALUE_SEMANTICS != 0)
+		#define SOL_FUNCTION_CALL_VALUE_SEMANTICS_I_ SOL_ON
+	#else
+		#define SOL_FUNCTION_CALL_VALUE_SEMANTICS_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_FUNCTION_CALL_VALUE_SEMANTICS_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_MINGW_CCTYPE_IS_POISONED)
+	#if (SOL_MINGW_CCTYPE_IS_POISONED != 0)
+		#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_ON
+	#else
+		#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_OFF
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_MINGW) && defined(__GNUC__) && (__GNUC__ < 6)
+	// MinGW is off its rocker in some places...
+	#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_MINGW_CCTYPE_IS_POISONED_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_CHAR8_T)
+	#if (SOL_CHAR8_T != 0)
+		#define SOL_CHAR8_T_I_ SOL_ON
+	#else
+		#define SOL_CHAR8_T_I_ SOL_OFF
+	#endif
+#else
+	#if defined(__cpp_char8_t)
+		#define SOL_CHAR8_T_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_CHAR8_T_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if SOL_IS_ON(SOL_USE_BOOST)
+	#include <boost/version.hpp>
+
+	#if BOOST_VERSION >= 107500 // Since Boost 1.75.0 boost::none is constexpr
+		#define SOL_BOOST_NONE_CONSTEXPR_I_ constexpr
+	#else
+		#define SOL_BOOST_NONE_CONSTEXPR_I_ const
+	#endif // BOOST_VERSION
+#else
+	// assume boost isn't using a garbage version
+	#define SOL_BOOST_NONE_CONSTEXPR_I_ constexpr
+#endif
+
+#if defined(SOL2_CI)
+	#if (SOL2_CI != 0)
+		#define SOL2_CI_I_ SOL_ON
+	#else
+		#define SOL2_CI_I_ SOL_OFF
+	#endif
+#else
+	#define SOL2_CI_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_ASSERT)
+	#define SOL_USER_ASSERT_I_ SOL_ON
+#else
+	#define SOL_USER_ASSERT_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_ASSERT_MSG)
+	#define SOL_USER_ASSERT_MSG_I_ SOL_ON
+#else
+	#define SOL_USER_ASSERT_MSG_I_ SOL_DEFAULT_OFF
+#endif
+
+// beginning of sol/prologue.hpp
+
+#if defined(SOL_PROLOGUE_I_)
+	#error "[sol2] Library Prologue was already included in translation unit and not properly ended with an epilogue."
+#endif
+
+#define SOL_PROLOGUE_I_ 1
+
+#if SOL_IS_ON(SOL_BUILD_CXX_MODE)
+	#define _FWD(...) static_cast<decltype( __VA_ARGS__ )&&>( __VA_ARGS__ )
+
+	#if SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+		#define _MOVE(...) static_cast<__typeof( __VA_ARGS__ )&&>( __VA_ARGS__ )
+	#else
+		#include <type_traits>
+		
+		#define _MOVE(...) static_cast<::std::remove_reference_t<( __VA_ARGS__ )>&&>( __VA_OPT__(,) )
+	#endif
+#endif
+
+// end of sol/prologue.hpp
+
+// beginning of sol/epilogue.hpp
+
+#if !defined(SOL_PROLOGUE_I_)
+	#error "[sol2] Library Prologue is missing from this translation unit."
+#else
+	#undef SOL_PROLOGUE_I_
+#endif
+
+#if SOL_IS_ON(SOL_BUILD_CXX_MODE)
+	#undef _FWD
+	#undef _MOVE
+#endif
+
+// end of sol/epilogue.hpp
+
+// beginning of sol/detail/build_version.hpp
+
+#if defined(SOL_DLL)
+	#if (SOL_DLL != 0)
+		#define SOL_DLL_I_ SOL_ON
+	#else
+		#define SOL_DLL_I_ SOL_OFF
+	#endif
+#elif SOL_IS_ON(SOL_COMPILER_VCXX) && (defined(DLL_) || defined(_DLL))
+	#define SOL_DLL_I_ SOL_DEFAULT_ON
+#else
+	#define SOL_DLL_I_ SOL_DEFAULT_OFF
+#endif // DLL definition
+
+#if defined(SOL_HEADER_ONLY)
+	#if (SOL_HEADER_ONLY != 0)
+		#define SOL_HEADER_ONLY_I_ SOL_ON
+	#else
+		#define SOL_HEADER_ONLY_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_HEADER_ONLY_I_ SOL_DEFAULT_OFF
+#endif // Header only library
+
+#if defined(SOL_BUILD)
+	#if (SOL_BUILD != 0)
+		#define SOL_BUILD_I_ SOL_ON
+	#else
+		#define SOL_BUILD_I_ SOL_OFF
+	#endif
+#elif SOL_IS_ON(SOL_HEADER_ONLY)
+	#define SOL_BUILD_I_ SOL_DEFAULT_OFF
+#else
+	#define SOL_BUILD_I_ SOL_DEFAULT_ON
+#endif
+
+#if defined(SOL_UNITY_BUILD)
+	#if (SOL_UNITY_BUILD != 0)
+		#define SOL_UNITY_BUILD_I_ SOL_ON
+	#else
+		#define SOL_UNITY_BUILD_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_UNITY_BUILD_I_ SOL_DEFAULT_OFF
+#endif // Header only library
+
+#if defined(SOL_C_FUNCTION_LINKAGE)
+	#define SOL_C_FUNCTION_LINKAGE_I_ SOL_C_FUNCTION_LINKAGE
+#else
+	#if SOL_IS_ON(SOL_BUILD_CXX_MODE)
+		// C++
+		#define SOL_C_FUNCTION_LINKAGE_I_ extern "C"
+	#else
+		// normal
+		#define SOL_C_FUNCTION_LINKAGE_I_
+	#endif // C++ or not
+#endif // Linkage specification for C functions
+
+#if defined(SOL_API_LINKAGE)
+	#define SOL_API_LINKAGE_I_ SOL_API_LINKAGE
+#else
+	#if SOL_IS_ON(SOL_DLL)
+		#if SOL_IS_ON(SOL_COMPILER_VCXX) || SOL_IS_ON(SOL_PLATFORM_WINDOWS) || SOL_IS_ON(SOL_PLATFORM_CYGWIN)
+			// MSVC Compiler; or, Windows, or Cygwin platforms
+			#if SOL_IS_ON(SOL_BUILD)
+				// Building the library
+				#if SOL_IS_ON(SOL_COMPILER_GCC)
+					// Using GCC
+					#define SOL_API_LINKAGE_I_ __attribute__((dllexport))
+				#else
+					// Using Clang, MSVC, etc...
+					#define SOL_API_LINKAGE_I_ __declspec(dllexport)
+				#endif
+			#else
+				#if SOL_IS_ON(SOL_COMPILER_GCC)
+					#define SOL_API_LINKAGE_I_ __attribute__((dllimport))
+				#else
+					#define SOL_API_LINKAGE_I_ __declspec(dllimport)
+				#endif
+			#endif
+		#else
+			// extern if building normally on non-MSVC
+			#define SOL_API_LINKAGE_I_ extern
+		#endif
+	#elif SOL_IS_ON(SOL_UNITY_BUILD)
+		// Built-in library, like how stb typical works
+		#if SOL_IS_ON(SOL_HEADER_ONLY)
+			// Header only, so functions are defined "inline"
+			#define SOL_API_LINKAGE_I_ inline
+		#else
+			// Not header only, so seperately compiled files
+			#define SOL_API_LINKAGE_I_ extern
+		#endif
+	#else
+		// Normal static library
+		#if SOL_IS_ON(SOL_BUILD_CXX_MODE)
+			#define SOL_API_LINKAGE_I_
+		#else
+			#define SOL_API_LINKAGE_I_ extern
+		#endif
+	#endif // DLL or not
+#endif // Build definitions
+
+#if defined(SOL_PUBLIC_FUNC_DECL)
+	#define SOL_PUBLIC_FUNC_DECL_I_ SOL_PUBLIC_FUNC_DECL
+#else
+	#define SOL_PUBLIC_FUNC_DECL_I_ SOL_API_LINKAGE_I_
+#endif
+
+#if defined(SOL_INTERNAL_FUNC_DECL_)
+	#define SOL_INTERNAL_FUNC_DECL_I_ SOL_INTERNAL_FUNC_DECL_
+#else
+	#define SOL_INTERNAL_FUNC_DECL_I_ SOL_API_LINKAGE_I_
+#endif
+
+#if defined(SOL_PUBLIC_FUNC_DEF)
+	#define SOL_PUBLIC_FUNC_DEF_I_ SOL_PUBLIC_FUNC_DEF
+#else
+	#define SOL_PUBLIC_FUNC_DEF_I_ SOL_API_LINKAGE_I_
+#endif
+
+#if defined(SOL_INTERNAL_FUNC_DEF)
+	#define SOL_INTERNAL_FUNC_DEF_I_ SOL_INTERNAL_FUNC_DEF
+#else
+	#define SOL_INTERNAL_FUNC_DEF_I_ SOL_API_LINKAGE_I_
+#endif
+
+#if defined(SOL_FUNC_DECL)
+	#define SOL_FUNC_DECL_I_ SOL_FUNC_DECL
+#elif SOL_IS_ON(SOL_HEADER_ONLY)
+	#define SOL_FUNC_DECL_I_ 
+#elif SOL_IS_ON(SOL_DLL)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		#if SOL_IS_ON(SOL_BUILD)
+			#define SOL_FUNC_DECL_I_ extern __declspec(dllexport)
+		#else
+			#define SOL_FUNC_DECL_I_ extern __declspec(dllimport)
+		#endif
+	#elif SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+		#define SOL_FUNC_DECL_I_ extern __attribute__((visibility("default")))
+	#else
+		#define SOL_FUNC_DECL_I_ extern
+	#endif
+#endif
+
+#if defined(SOL_FUNC_DEFN)
+	#define SOL_FUNC_DEFN_I_ SOL_FUNC_DEFN
+#elif SOL_IS_ON(SOL_HEADER_ONLY)
+	#define SOL_FUNC_DEFN_I_ inline
+#elif SOL_IS_ON(SOL_DLL)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		#if SOL_IS_ON(SOL_BUILD)
+			#define SOL_FUNC_DEFN_I_ __declspec(dllexport)
+		#else
+			#define SOL_FUNC_DEFN_I_ __declspec(dllimport)
+		#endif
+	#elif SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+		#define SOL_FUNC_DEFN_I_ __attribute__((visibility("default")))
+	#else
+		#define SOL_FUNC_DEFN_I_
+	#endif
+#endif
+
+#if defined(SOL_HIDDEN_FUNC_DECL)
+	#define SOL_HIDDEN_FUNC_DECL_I_ SOL_HIDDEN_FUNC_DECL
+#elif SOL_IS_ON(SOL_HEADER_ONLY)
+	#define SOL_HIDDEN_FUNC_DECL_I_ 
+#elif SOL_IS_ON(SOL_DLL)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		#if SOL_IS_ON(SOL_BUILD)
+			#define SOL_HIDDEN_FUNC_DECL_I_ extern __declspec(dllexport)
+		#else
+			#define SOL_HIDDEN_FUNC_DECL_I_ extern __declspec(dllimport)
+		#endif
+	#elif SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+		#define SOL_HIDDEN_FUNC_DECL_I_ extern __attribute__((visibility("default")))
+	#else
+		#define SOL_HIDDEN_FUNC_DECL_I_ extern
+	#endif
+#endif
+
+#if defined(SOL_HIDDEN_FUNC_DEFN)
+	#define SOL_HIDDEN_FUNC_DEFN_I_ SOL_HIDDEN_FUNC_DEFN
+#elif SOL_IS_ON(SOL_HEADER_ONLY)
+	#define SOL_HIDDEN_FUNC_DEFN_I_ inline
+#elif SOL_IS_ON(SOL_DLL)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		#if SOL_IS_ON(SOL_BUILD)
+			#define SOL_HIDDEN_FUNC_DEFN_I_ 
+		#else
+			#define SOL_HIDDEN_FUNC_DEFN_I_ 
+		#endif
+	#elif SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+		#define SOL_HIDDEN_FUNC_DEFN_I_ __attribute__((visibility("hidden")))
+	#else
+		#define SOL_HIDDEN_FUNC_DEFN_I_
+	#endif
+#endif
+
+// end of sol/detail/build_version.hpp
+
+// end of sol/version.hpp
+
+#if SOL_IS_ON(SOL_INSIDE_UNREAL_ENGINE)
+#ifdef check
+#pragma push_macro("check")
+#undef check
+#endif
+#endif // Unreal Engine 4 Bullshit
+
+#if SOL_IS_ON(SOL_COMPILER_GCC)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#pragma GCC diagnostic ignored "-Wconversion"
+#if __GNUC__ > 6
+#pragma GCC diagnostic ignored "-Wnoexcept-type"
+#endif
+#elif SOL_IS_ON(SOL_COMPILER_CLANG)
+#elif SOL_IS_ON(SOL_COMPILER_VCXX)
+#pragma warning(push)
+#pragma warning(disable : 4505) // unreferenced local function has been removed GEE THANKS
+#endif                          // clang++ vs. g++ vs. VC++
+
+// beginning of sol/forward.hpp
+
+#ifndef SOL_FORWARD_HPP
+#define SOL_FORWARD_HPP
+
+#include <utility>
+#include <type_traits>
+#include <string_view>
+
+#if SOL_IS_ON(SOL_USING_CXX_LUA) || SOL_IS_ON(SOL_USING_CXX_LUAJIT)
+struct lua_State;
+#else
+extern "C" {
+struct lua_State;
+}
+#endif // C++ Mangling for Lua vs. Not
+
+namespace sol {
+
+	enum class type;
+
+	class stateless_reference;
+	template <bool b>
+	class basic_reference;
+	using reference = basic_reference<false>;
+	using main_reference = basic_reference<true>;
+	class stateless_stack_reference;
+	class stack_reference;
+
+	template <typename A>
+	class basic_bytecode;
+
+	struct lua_value;
+
+	struct proxy_base_tag;
+	template <typename>
+	struct proxy_base;
+	template <typename, typename>
+	struct table_proxy;
+
+	template <bool, typename>
+	class basic_table_core;
+	template <bool b>
+	using table_core = basic_table_core<b, reference>;
+	template <bool b>
+	using main_table_core = basic_table_core<b, main_reference>;
+	template <bool b>
+	using stack_table_core = basic_table_core<b, stack_reference>;
+	template <typename base_type>
+	using basic_table = basic_table_core<false, base_type>;
+	using table = table_core<false>;
+	using global_table = table_core<true>;
+	using main_table = main_table_core<false>;
+	using main_global_table = main_table_core<true>;
+	using stack_table = stack_table_core<false>;
+	using stack_global_table = stack_table_core<true>;
+
+	template <typename>
+	struct basic_lua_table;
+	using lua_table = basic_lua_table<reference>;
+	using stack_lua_table = basic_lua_table<stack_reference>;
+
+	template <typename T, typename base_type>
+	class basic_usertype;
+	template <typename T>
+	using usertype = basic_usertype<T, reference>;
+	template <typename T>
+	using stack_usertype = basic_usertype<T, stack_reference>;
+
+	template <typename base_type>
+	class basic_metatable;
+	using metatable = basic_metatable<reference>;
+	using stack_metatable = basic_metatable<stack_reference>;
+
+	template <typename base_t>
+	struct basic_environment;
+	using environment = basic_environment<reference>;
+	using main_environment = basic_environment<main_reference>;
+	using stack_environment = basic_environment<stack_reference>;
+
+	template <typename T, bool>
+	class basic_function;
+	template <typename T, bool, typename H>
+	class basic_protected_function;
+	using unsafe_function = basic_function<reference, false>;
+	using safe_function = basic_protected_function<reference, false, reference>;
+	using main_unsafe_function = basic_function<main_reference, false>;
+	using main_safe_function = basic_protected_function<main_reference, false, reference>;
+	using stack_unsafe_function = basic_function<stack_reference, false>;
+	using stack_safe_function = basic_protected_function<stack_reference, false, reference>;
+	using stack_aligned_unsafe_function = basic_function<stack_reference, true>;
+	using stack_aligned_safe_function = basic_protected_function<stack_reference, true, reference>;
+	using protected_function = safe_function;
+	using main_protected_function = main_safe_function;
+	using stack_protected_function = stack_safe_function;
+	using stack_aligned_protected_function = stack_aligned_safe_function;
+#if SOL_IS_ON(SOL_SAFE_FUNCTION_OBJECTS)
+	using function = protected_function;
+	using main_function = main_protected_function;
+	using stack_function = stack_protected_function;
+	using stack_aligned_function = stack_aligned_safe_function;
+#else
+	using function = unsafe_function;
+	using main_function = main_unsafe_function;
+	using stack_function = stack_unsafe_function;
+	using stack_aligned_function = stack_aligned_unsafe_function;
+#endif
+	using stack_aligned_stack_handler_function = basic_protected_function<stack_reference, true, stack_reference>;
+
+	struct unsafe_function_result;
+	struct protected_function_result;
+	using safe_function_result = protected_function_result;
+#if SOL_IS_ON(SOL_SAFE_FUNCTION_OBJECTS)
+	using function_result = safe_function_result;
+#else
+	using function_result = unsafe_function_result;
+#endif
+
+	template <typename base_t>
+	class basic_object_base;
+	template <typename base_t>
+	class basic_object;
+	template <typename base_t>
+	class basic_userdata;
+	template <typename base_t>
+	class basic_lightuserdata;
+	template <typename base_t>
+	class basic_coroutine;
+	template <typename base_t>
+	class basic_packaged_coroutine;
+	template <typename base_t>
+	class basic_thread;
+
+	using object = basic_object<reference>;
+	using userdata = basic_userdata<reference>;
+	using lightuserdata = basic_lightuserdata<reference>;
+	using thread = basic_thread<reference>;
+	using coroutine = basic_coroutine<reference>;
+	using packaged_coroutine = basic_packaged_coroutine<reference>;
+	using main_object = basic_object<main_reference>;
+	using main_userdata = basic_userdata<main_reference>;
+	using main_lightuserdata = basic_lightuserdata<main_reference>;
+	using main_coroutine = basic_coroutine<main_reference>;
+	using stack_object = basic_object<stack_reference>;
+	using stack_userdata = basic_userdata<stack_reference>;
+	using stack_lightuserdata = basic_lightuserdata<stack_reference>;
+	using stack_thread = basic_thread<stack_reference>;
+	using stack_coroutine = basic_coroutine<stack_reference>;
+
+	struct stack_proxy_base;
+	struct stack_proxy;
+	struct variadic_args;
+	struct variadic_results;
+	struct stack_count;
+	struct this_state;
+	struct this_main_state;
+	struct this_environment;
+
+	class state_view;
+	class state;
+
+	template <typename T>
+	struct as_table_t;
+	template <typename T>
+	struct as_container_t;
+	template <typename T>
+	struct nested;
+	template <typename T>
+	struct light;
+	template <typename T>
+	struct user;
+	template <typename T>
+	struct as_args_t;
+	template <typename T>
+	struct protect_t;
+	template <typename F, typename... Policies>
+	struct policy_wrapper;
+
+	template <typename T>
+	struct usertype_traits;
+	template <typename T>
+	struct unique_usertype_traits;
+
+	template <typename... Args>
+	struct types {
+		typedef std::make_index_sequence<sizeof...(Args)> indices;
+		static constexpr std::size_t size() {
+			return sizeof...(Args);
+		}
+	};
+
+	template <typename T>
+	struct derive : std::false_type {
+		typedef types<> type;
+	};
+
+	template <typename T>
+	struct base : std::false_type {
+		typedef types<> type;
+	};
+
+	template <typename T>
+	struct weak_derive {
+		static bool value;
+	};
+
+	template <typename T>
+	bool weak_derive<T>::value = false;
+
+	namespace stack {
+		struct record;
+	}
+
+#if SOL_IS_OFF(SOL_USE_BOOST)
+	template <class T>
+	class optional;
+
+	template <class T>
+	class optional<T&>;
+#endif
+
+	using check_handler_type = int(lua_State*, int, type, type, const char*);
+
+} // namespace sol
+
+#define SOL_BASE_CLASSES(T, ...)                       \
+	namespace sol {                                   \
+		template <>                                  \
+		struct base<T> : std::true_type {            \
+			typedef ::sol::types<__VA_ARGS__> type; \
+		};                                           \
+	}                                                 \
+	static_assert(true, "")
+#define SOL_DERIVED_CLASSES(T, ...)                    \
+	namespace sol {                                   \
+		template <>                                  \
+		struct derive<T> : std::true_type {          \
+			typedef ::sol::types<__VA_ARGS__> type; \
+		};                                           \
+	}                                                 \
+	static_assert(true, "")
+
+#endif // SOL_FORWARD_HPP
+// end of sol/forward.hpp
+
+// beginning of sol/forward_detail.hpp
+
+#ifndef SOL_FORWARD_DETAIL_HPP
+#define SOL_FORWARD_DETAIL_HPP
+
+// beginning of sol/traits.hpp
+
+// beginning of sol/tuple.hpp
+
+// beginning of sol/base_traits.hpp
+
+#include <type_traits>
+
+namespace sol {
+	namespace detail {
+		struct unchecked_t { };
+		const unchecked_t unchecked = unchecked_t {};
+	} // namespace detail
+
+	namespace meta {
+		using sfinae_yes_t = std::true_type;
+		using sfinae_no_t = std::false_type;
+
+		template <typename...>
+		using void_t = void;
+
+		template <typename T>
+		using unqualified = std::remove_cv<std::remove_reference_t<T>>;
+
+		template <typename T>
+		using unqualified_t = typename unqualified<T>::type;
+
+		namespace meta_detail {
+			template <typename T>
+			struct unqualified_non_alias : unqualified<T> { };
+
+			template <template <class...> class Test, class, class... Args>
+			struct is_detected : std::false_type { };
+
+			template <template <class...> class Test, class... Args>
+			struct is_detected<Test, void_t<Test<Args...>>, Args...> : std::true_type { };
+		} // namespace meta_detail
+
+		template <template <class...> class Trait, class... Args>
+		using is_detected = typename meta_detail::is_detected<Trait, void, Args...>::type;
+
+		template <template <class...> class Trait, class... Args>
+		constexpr inline bool is_detected_v = is_detected<Trait, Args...>::value;
+
+		template <typename _Default, typename _Void, template <typename...> typename _Op, typename... _Args>
+		class detector {
+		public:
+			using value_t = ::std::false_type;
+			using type = _Default;
+		};
+
+		template <typename _Default, template <typename...> typename _Op, typename... _Args>
+		class detector<_Default, void_t<_Op<_Args...>>, _Op, _Args...> {
+		public:
+			using value_t = ::std::true_type;
+			using type = _Op<_Args...>;
+		};
+
+		class nonesuch {
+		public:
+			~nonesuch() = delete;
+			nonesuch(nonesuch const&) = delete;
+			nonesuch& operator=(nonesuch const&) = delete;
+		};
+
+		template <template <typename...> typename _Op, typename... _Args>
+		using detected_t = typename detector<nonesuch, void, _Op, _Args...>::type;
+
+		template <typename _Default, template <typename...> typename _Op, typename... _Args>
+		using detected_or = detector<_Default, void, _Op, _Args...>;
+
+		template <typename _Default, template <typename...> typename _Op, typename... _Args>
+		using detected_or_t = typename detector<_Default, void, _Op, _Args...>::type;
+
+		template <typename _Default, template <typename...> typename _Op, typename... _Args>
+		constexpr inline bool detected_or_v = detector<_Default, void, _Op, _Args...>::value;
+
+		template <std::size_t I>
+		using index_value = std::integral_constant<std::size_t, I>;
+
+		template <bool>
+		struct conditional {
+			template <typename T, typename U>
+			using type = T;
+		};
+
+		template <>
+		struct conditional<false> {
+			template <typename T, typename U>
+			using type = U;
+		};
+
+		template <bool B, typename T, typename U>
+		using conditional_t = typename conditional<B>::template type<T, U>;
+
+		namespace meta_detail {
+			template <typename T, template <typename...> class Templ>
+			struct is_specialization_of : std::false_type { };
+			template <typename... T, template <typename...> class Templ>
+			struct is_specialization_of<Templ<T...>, Templ> : std::true_type { };
+		} // namespace meta_detail
+
+		template <typename T, template <typename...> class Templ>
+		using is_specialization_of = meta_detail::is_specialization_of<std::remove_cv_t<T>, Templ>;
+
+		template <typename T, template <typename...> class Templ>
+		inline constexpr bool is_specialization_of_v = is_specialization_of<std::remove_cv_t<T>, Templ>::value;
+
+		template <typename T>
+		struct identity {
+			typedef T type;
+		};
+
+		template <typename T>
+		using identity_t = typename identity<T>::type;
+
+		template <typename T>
+		using is_builtin_type = std::integral_constant<bool, std::is_arithmetic<T>::value || std::is_pointer<T>::value || std::is_array<T>::value>;
+
+		namespace meta_detail {
+			template <typename T, typename = void>
+			struct has_internal_marker_impl : std::false_type { };
+			template <typename T>
+			struct has_internal_marker_impl<T, void_t<typename T::SOL_INTERNAL_UNSPECIALIZED_MARKER_>> : std::true_type { };
+
+			template <typename T>
+			using has_internal_marker = has_internal_marker_impl<T>;
+
+			template <typename T>
+			constexpr inline bool has_internal_marker_v = has_internal_marker<T>::value;
+		} // namespace meta_detail
+
+	} // namespace meta
+} // namespace sol
+
+// end of sol/base_traits.hpp
+
+#include <tuple>
+#include <cstddef>
+
+namespace sol {
+	namespace detail {
+		using swallow = std::initializer_list<int>;
+	} // namespace detail
+
+	namespace meta {
+		template <typename T>
+		using is_tuple = is_specialization_of<T, std::tuple>;
+
+		template <typename T>
+		constexpr inline bool is_tuple_v = is_tuple<T>::value;
+
+		namespace detail {
+			template <typename... Args>
+			struct tuple_types_ {
+				typedef types<Args...> type;
+			};
+
+			template <typename... Args>
+			struct tuple_types_<std::tuple<Args...>> {
+				typedef types<Args...> type;
+			};
+		} // namespace detail
+
+		template <typename... Args>
+		using tuple_types = typename detail::tuple_types_<Args...>::type;
+
+		template <typename Arg>
+		struct pop_front_type;
+
+		template <typename Arg>
+		using pop_front_type_t = typename pop_front_type<Arg>::type;
+
+		template <typename... Args>
+		struct pop_front_type<types<Args...>> {
+			typedef void front_type;
+			typedef types<Args...> type;
+		};
+
+		template <typename Arg, typename... Args>
+		struct pop_front_type<types<Arg, Args...>> {
+			typedef Arg front_type;
+			typedef types<Args...> type;
+		};
+
+		template <std::size_t N, typename Tuple>
+		using tuple_element = std::tuple_element<N, std::remove_reference_t<Tuple>>;
+
+		template <std::size_t N, typename Tuple>
+		using tuple_element_t = std::tuple_element_t<N, std::remove_reference_t<Tuple>>;
+
+		template <std::size_t N, typename Tuple>
+		using unqualified_tuple_element = unqualified<tuple_element_t<N, Tuple>>;
+
+		template <std::size_t N, typename Tuple>
+		using unqualified_tuple_element_t = unqualified_t<tuple_element_t<N, Tuple>>;
+
+	} // namespace meta
+} // namespace sol
+
+// end of sol/tuple.hpp
+
+// beginning of sol/bind_traits.hpp
+
+namespace sol { namespace meta {
+	namespace meta_detail {
+		template <typename F>
+		using detect_deducible_signature = decltype(&F::operator());
+	} // namespace meta_detail
+
+	template <typename F>
+	using call_operator_deducible = typename is_detected<meta_detail::detect_deducible_signature, F>::type;
+
+	template <typename F>
+	constexpr inline bool call_operator_deducible_v = call_operator_deducible<F>::value;
+
+	namespace meta_detail {
+
+		template <std::size_t I, typename T>
+		struct void_tuple_element : meta::tuple_element<I, T> { };
+
+		template <std::size_t I>
+		struct void_tuple_element<I, std::tuple<>> {
+			typedef void type;
+		};
+
+		template <std::size_t I, typename T>
+		using void_tuple_element_t = typename void_tuple_element<I, T>::type;
+
+		template <bool it_is_noexcept, bool has_c_variadic, typename T, typename R, typename... Args>
+		struct basic_traits {
+		private:
+			using first_type = meta::conditional_t<std::is_void<T>::value, int, T>&;
+
+		public:
+			inline static constexpr const bool is_noexcept = it_is_noexcept;
+			inline static constexpr bool is_member_function = std::is_void<T>::value;
+			inline static constexpr bool has_c_var_arg = has_c_variadic;
+			inline static constexpr std::size_t arity = sizeof...(Args);
+			inline static constexpr std::size_t free_arity = sizeof...(Args) + static_cast<std::size_t>(!std::is_void<T>::value);
+			typedef types<Args...> args_list;
+			typedef std::tuple<Args...> args_tuple;
+			typedef T object_type;
+			typedef R return_type;
+			typedef tuple_types<R> returns_list;
+			typedef R(function_type)(Args...);
+			typedef meta::conditional_t<std::is_void<T>::value, args_list, types<first_type, Args...>> free_args_list;
+			typedef meta::conditional_t<std::is_void<T>::value, R(Args...), R(first_type, Args...)> free_function_type;
+			typedef meta::conditional_t<std::is_void<T>::value, R (*)(Args...), R (*)(first_type, Args...)> free_function_pointer_type;
+			typedef std::remove_pointer_t<free_function_pointer_type> signature_type;
+			template <std::size_t i>
+			using arg_at = void_tuple_element_t<i, args_tuple>;
+		};
+
+		template <typename Signature, bool b = call_operator_deducible<Signature>::value>
+		struct fx_traits : public basic_traits<false, false, void, void> { };
+
+		// Free Functions
+		template <typename R, typename... Args>
+		struct fx_traits<R(Args...), false> : public basic_traits<false, false, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args...);
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R (*)(Args...), false> : public basic_traits<false, false, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args...);
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R(Args..., ...), false> : public basic_traits<false, true, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args..., ...);
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R (*)(Args..., ...), false> : public basic_traits<false, true, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args..., ...);
+		};
+
+		// Member Functions
+		/* C-Style Variadics */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...), false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...);
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...), false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...);
+		};
+
+		/* Const Volatile */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile;
+		};
+
+		/* Member Function Qualifiers */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...)&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) &;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...)&, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) &;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const&, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile&, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...)&&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) &&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...)&&, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) &&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const&&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const&&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const&&, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const&&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile&&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile&&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile&&, false> : public basic_traits<false, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile&&;
+		};
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+
+		template <typename R, typename... Args>
+		struct fx_traits<R(Args...) noexcept, false> : public basic_traits<true, false, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args...) noexcept;
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R (*)(Args...) noexcept, false> : public basic_traits<true, false, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args...) noexcept;
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R(Args..., ...) noexcept, false> : public basic_traits<true, true, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args..., ...) noexcept;
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R (*)(Args..., ...) noexcept, false> : public basic_traits<true, true, void, R, Args...> {
+			typedef R (*function_pointer_type)(Args..., ...) noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) noexcept;
+		};
+
+		/* Const Volatile */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...)& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) & noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...)& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) & noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...)&& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) && noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...)&& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) && noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const&& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const&& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const&& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const&& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args...) const volatile&& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args...) const volatile&& noexcept;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (T::*)(Args..., ...) const volatile&& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (T::*function_pointer_type)(Args..., ...) const volatile&& noexcept;
+		};
+
+#endif // noexcept is part of a function's type
+
+#if SOL_IS_ON(SOL_COMPILER_VCXX) && SOL_IS_ON(SOL_PLATFORM_X86)
+		template <typename R, typename... Args>
+		struct fx_traits<R __stdcall(Args...), false> : public basic_traits<false, false, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args...);
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R(__stdcall*)(Args...), false> : public basic_traits<false, false, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args...);
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...), false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...);
+		};
+
+		/* Const Volatile */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile;
+		};
+
+		/* Member Function Qualifiers */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...)&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) &;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...)&&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) &&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const&&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const&&;
+		};
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile&&, false> : public basic_traits<false, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile&&;
+		};
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+
+		template <typename R, typename... Args>
+		struct fx_traits<R __stdcall(Args...) noexcept, false> : public basic_traits<true, false, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args...) noexcept;
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R(__stdcall*)(Args...) noexcept, false> : public basic_traits<true, false, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args...) noexcept;
+		};
+
+		/* __stdcall cannot be applied to functions with varargs*/
+		/*template <typename R, typename... Args>
+		struct fx_traits<__stdcall R(Args..., ...) noexcept, false> : public basic_traits<true, true, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args..., ...) noexcept;
+		};
+
+		template <typename R, typename... Args>
+		struct fx_traits<R (__stdcall *)(Args..., ...) noexcept, false> : public basic_traits<true, true, void, R, Args...> {
+			typedef R(__stdcall* function_pointer_type)(Args..., ...) noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) noexcept;
+		};*/
+
+		/* Const Volatile */
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const volatile noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const volatile noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...)& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) & noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) & noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) & noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const& noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const& noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile& noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const volatile& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const volatile& noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...)&& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) && noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) && noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) && noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const&& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const&& noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const&& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const&& noexcept;
+		};*/
+
+		template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args...) const volatile&& noexcept, false> : public basic_traits<true, false, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args...) const volatile&& noexcept;
+		};
+
+		/* __stdcall does not work with varargs */
+		/*template <typename T, typename R, typename... Args>
+		struct fx_traits<R (__stdcall T::*)(Args..., ...) const volatile&& noexcept, false> : public basic_traits<true, true, T, R, Args...> {
+			typedef R (__stdcall T::*function_pointer_type)(Args..., ...) const volatile&& noexcept;
+		};*/
+#endif // noexcept is part of a function's type
+#endif // __stdcall x86 VC++ bug
+
+		template <typename Signature>
+		struct fx_traits<Signature, true> : public fx_traits<typename fx_traits<decltype(&Signature::operator())>::function_type, false> { };
+
+		template <typename Signature, bool b = std::is_member_object_pointer<Signature>::value>
+		struct callable_traits : public fx_traits<std::decay_t<Signature>> { };
+
+		template <typename R, typename T>
+		struct callable_traits<R(T::*), true> {
+			typedef meta::conditional_t<std::is_array_v<R>, std::add_lvalue_reference_t<R>, R> return_type;
+			typedef return_type Arg;
+			typedef T object_type;
+			using signature_type = R(T::*);
+			inline static constexpr bool is_noexcept = false;
+			inline static constexpr bool is_member_function = false;
+			inline static constexpr std::size_t arity = 1;
+			inline static constexpr std::size_t free_arity = 2;
+			typedef std::tuple<Arg> args_tuple;
+			typedef types<Arg> args_list;
+			typedef types<T, Arg> free_args_list;
+			typedef meta::tuple_types<return_type> returns_list;
+			typedef return_type(function_type)(T&, return_type);
+			typedef return_type (*function_pointer_type)(T&, Arg);
+			typedef return_type (*free_function_pointer_type)(T&, Arg);
+			template <std::size_t i>
+			using arg_at = void_tuple_element_t<i, args_tuple>;
+		};
+
+	} // namespace meta_detail
+
+	template <typename Signature>
+	using bind_traits = meta_detail::callable_traits<Signature>;
+
+	namespace meta_detail {
+		template <typename, bool>
+		struct is_probably_stateless_lambda : std::false_type { };
+
+		template <typename T>
+		struct is_probably_stateless_lambda<T, true> : std::is_convertible<T, typename bind_traits<T>::function_type*>::type { };
+	} // namespace meta_detail
+
+	template <typename T>
+	using is_probably_stateless_lambda = typename meta_detail::is_probably_stateless_lambda<T, std::is_empty_v<T> && call_operator_deducible_v<T>>::type;
+
+	template <typename T>
+	inline constexpr bool is_probably_stateless_lambda_v = is_probably_stateless_lambda<T>::value;
+
+	template <typename Signature>
+	using function_args_t = typename bind_traits<Signature>::args_list;
+
+	template <typename Signature>
+	using function_signature_t = typename bind_traits<Signature>::signature_type;
+
+	template <typename Signature>
+	using function_return_t = typename bind_traits<Signature>::return_type;
+}} // namespace sol::meta
+
+// end of sol/bind_traits.hpp
+
+// beginning of sol/pointer_like.hpp
+
+#include <utility>
+#include <type_traits>
+#include <memory>
+
+namespace sol {
+
+	namespace meta {
+		namespace meta_detail {
+			template <typename T>
+			using is_dereferenceable_test = decltype(*std::declval<T>());
+
+			template <typename T>
+			using is_explicitly_dereferenceable_test = decltype(std::declval<T>().operator*());
+		} // namespace meta_detail
+
+		template <typename T>
+		using is_pointer_like = std::integral_constant<bool,
+		     !std::is_array_v<T> && (std::is_pointer_v<T> || is_detected_v<meta_detail::is_explicitly_dereferenceable_test, T>)>;
+
+		template <typename T>
+		constexpr inline bool is_pointer_like_v = is_pointer_like<T>::value;
+	} // namespace meta
+
+	namespace detail {
+
+		template <typename T>
+		auto unwrap(T&& item) -> decltype(std::forward<T>(item)) {
+			return std::forward<T>(item);
+		}
+
+		template <typename T>
+		T& unwrap(std::reference_wrapper<T> arg) {
+			return arg.get();
+		}
+
+		template <typename T>
+		inline decltype(auto) deref(T&& item) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::is_pointer_like_v<Tu>) {
+				return *std::forward<T>(item);
+			}
+			else {
+				return std::forward<T>(item);
+			}
+		}
+
+		template <typename T>
+		inline decltype(auto) deref_move_only(T&& item) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::is_pointer_like_v<Tu> && !std::is_pointer_v<Tu> && !std::is_copy_constructible_v<Tu>) {
+				return *std::forward<T>(item);
+			}
+			else {
+				return std::forward<T>(item);
+			}
+		}
+
+		template <typename T>
+		inline T* ptr(T& val) {
+			return std::addressof(val);
+		}
+
+		template <typename T>
+		inline T* ptr(std::reference_wrapper<T> val) {
+			return std::addressof(val.get());
+		}
+
+		template <typename T>
+		inline T* ptr(T* val) {
+			return val;
+		}
+	} // namespace detail
+} // namespace sol
+
+// end of sol/pointer_like.hpp
+
+// beginning of sol/string_view.hpp
+
+#include <cstddef>
+#include <string>
+#include <string_view>
+#include <functional>
+
+namespace sol {
+	template <typename C, typename T = std::char_traits<C>>
+	using basic_string_view = std::basic_string_view<C, T>;
+
+	typedef std::string_view string_view;
+	typedef std::wstring_view wstring_view;
+	typedef std::u16string_view u16string_view;
+	typedef std::u32string_view u32string_view;
+	typedef std::hash<std::string_view> string_view_hash;
+} // namespace sol
+
+// end of sol/string_view.hpp
+
+#include <type_traits>
+#include <cstdint>
+#include <memory>
+#include <functional>
+#include <array>
+#include <iterator>
+#include <iosfwd>
+#if SOL_IS_ON(SOL_STD_VARIANT)
+#include <variant>
+#endif // variant is weird on XCode, thanks XCode
+
+namespace sol { namespace meta {
+	template <typename T>
+	struct unwrapped {
+		typedef T type;
+	};
+
+	template <typename T>
+	struct unwrapped<std::reference_wrapper<T>> {
+		typedef T type;
+	};
+
+	template <typename T>
+	using unwrapped_t = typename unwrapped<T>::type;
+
+	template <typename T>
+	struct unwrap_unqualified : unwrapped<unqualified_t<T>> { };
+
+	template <typename T>
+	using unwrap_unqualified_t = typename unwrap_unqualified<T>::type;
+
+	template <typename T>
+	struct remove_member_pointer;
+
+	template <typename R, typename T>
+	struct remove_member_pointer<R T::*> {
+		typedef R type;
+	};
+
+	template <typename R, typename T>
+	struct remove_member_pointer<R T::*const> {
+		typedef R type;
+	};
+
+	template <typename T>
+	using remove_member_pointer_t = remove_member_pointer<T>;
+
+	template <typename T, typename...>
+	struct all_same : std::true_type { };
+
+	template <typename T, typename U, typename... Args>
+	struct all_same<T, U, Args...> : std::integral_constant<bool, std::is_same<T, U>::value && all_same<T, Args...>::value> { };
+
+	template <typename T, typename...>
+	struct any_same : std::false_type { };
+
+	template <typename T, typename U, typename... Args>
+	struct any_same<T, U, Args...> : std::integral_constant<bool, std::is_same<T, U>::value || any_same<T, Args...>::value> { };
+
+	template <typename T, typename... Args>
+	constexpr inline bool any_same_v = any_same<T, Args...>::value;
+
+	template <bool B>
+	using boolean = std::integral_constant<bool, B>;
+
+	template <bool B>
+	constexpr inline bool boolean_v = boolean<B>::value;
+
+	template <typename T>
+	using neg = boolean<!T::value>;
+
+	template <typename T>
+	constexpr inline bool neg_v = neg<T>::value;
+
+	template <typename... Args>
+	struct all : boolean<true> { };
+
+	template <typename T, typename... Args>
+	struct all<T, Args...> : std::conditional_t<T::value, all<Args...>, boolean<false>> { };
+
+	template <typename... Args>
+	struct any : boolean<false> { };
+
+	template <typename T, typename... Args>
+	struct any<T, Args...> : std::conditional_t<T::value, boolean<true>, any<Args...>> { };
+
+	template <typename... Args>
+	constexpr inline bool all_v = all<Args...>::value;
+
+	template <typename... Args>
+	constexpr inline bool any_v = any<Args...>::value;
+
+	enum class enable_t { _ };
+
+	constexpr const auto enabler = enable_t::_;
+
+	template <bool value, typename T = void>
+	using disable_if_t = std::enable_if_t<!value, T>;
+
+	template <typename... Args>
+	using enable = std::enable_if_t<all<Args...>::value, enable_t>;
+
+	template <typename... Args>
+	using disable = std::enable_if_t<neg<all<Args...>>::value, enable_t>;
+
+	template <typename... Args>
+	using enable_any = std::enable_if_t<any<Args...>::value, enable_t>;
+
+	template <typename... Args>
+	using disable_any = std::enable_if_t<neg<any<Args...>>::value, enable_t>;
+
+	template <typename V, typename... Vs>
+	struct find_in_pack_v : boolean<false> { };
+
+	template <typename V, typename Vs1, typename... Vs>
+	struct find_in_pack_v<V, Vs1, Vs...> : any<boolean<(V::value == Vs1::value)>, find_in_pack_v<V, Vs...>> { };
+
+	namespace meta_detail {
+		template <std::size_t I, typename T, typename... Args>
+		struct index_in_pack : std::integral_constant<std::size_t, SIZE_MAX> { };
+
+		template <std::size_t I, typename T, typename T1, typename... Args>
+		struct index_in_pack<I, T, T1, Args...>
+		: conditional_t<std::is_same<T, T1>::value, std::integral_constant<std::ptrdiff_t, I>, index_in_pack<I + 1, T, Args...>> { };
+	} // namespace meta_detail
+
+	template <typename T, typename... Args>
+	struct index_in_pack : meta_detail::index_in_pack<0, T, Args...> { };
+
+	template <typename T, typename List>
+	struct index_in : meta_detail::index_in_pack<0, T, List> { };
+
+	template <typename T, typename... Args>
+	struct index_in<T, types<Args...>> : meta_detail::index_in_pack<0, T, Args...> { };
+
+	template <std::size_t I, typename... Args>
+	struct at_in_pack { };
+
+	template <std::size_t I, typename... Args>
+	using at_in_pack_t = typename at_in_pack<I, Args...>::type;
+
+	template <std::size_t I, typename Arg, typename... Args>
+	struct at_in_pack<I, Arg, Args...> : std::conditional<I == 0, Arg, at_in_pack_t<I - 1, Args...>> { };
+
+	template <typename Arg, typename... Args>
+	struct at_in_pack<0, Arg, Args...> {
+		typedef Arg type;
+	};
+
+	namespace meta_detail {
+		template <typename, typename TI>
+		using on_even = meta::boolean<(TI::value % 2) == 0>;
+
+		template <typename, typename TI>
+		using on_odd = meta::boolean<(TI::value % 2) == 1>;
+
+		template <typename, typename>
+		using on_always = std::true_type;
+
+		template <template <typename...> class When, std::size_t Limit, std::size_t I, template <typename...> class Pred, typename... Ts>
+		struct count_when_for_pack : std::integral_constant<std::size_t, 0> { };
+		template <template <typename...> class When, std::size_t Limit, std::size_t I, template <typename...> class Pred, typename T, typename... Ts>
+			          struct count_when_for_pack<When, Limit, I, Pred, T, Ts...> : conditional_t < sizeof...(Ts)
+			     == 0
+			|| Limit<2, std::integral_constant<std::size_t, I + static_cast<std::size_t>(Limit != 0 && Pred<T>::value)>,
+			     count_when_for_pack<When, Limit - static_cast<std::size_t>(When<T, std::integral_constant<std::size_t, I>>::value),
+			          I + static_cast<std::size_t>(When<T, std::integral_constant<std::size_t, I>>::value&& Pred<T>::value), Pred, Ts...>> { };
+	} // namespace meta_detail
+
+	template <template <typename...> class Pred, typename... Ts>
+	struct count_for_pack : meta_detail::count_when_for_pack<meta_detail::on_always, sizeof...(Ts), 0, Pred, Ts...> { };
+
+	template <template <typename...> class Pred, typename... Ts>
+	inline constexpr std::size_t count_for_pack_v = count_for_pack<Pred, Ts...>::value;
+
+	template <template <typename...> class Pred, typename List>
+	struct count_for;
+
+	template <template <typename...> class Pred, typename... Args>
+	struct count_for<Pred, types<Args...>> : count_for_pack<Pred, Args...> { };
+
+	template <std::size_t Limit, template <typename...> class Pred, typename... Ts>
+	struct count_for_to_pack : meta_detail::count_when_for_pack<meta_detail::on_always, Limit, 0, Pred, Ts...> { };
+
+	template <std::size_t Limit, template <typename...> class Pred, typename... Ts>
+	inline constexpr std::size_t count_for_to_pack_v = count_for_to_pack<Limit, Pred, Ts...>::value;
+
+	template <template <typename...> class When, std::size_t Limit, template <typename...> class Pred, typename... Ts>
+	struct count_when_for_to_pack : meta_detail::count_when_for_pack<When, Limit, 0, Pred, Ts...> { };
+
+	template <template <typename...> class When, std::size_t Limit, template <typename...> class Pred, typename... Ts>
+	inline constexpr std::size_t count_when_for_to_pack_v = count_when_for_to_pack<When, Limit, Pred, Ts...>::value;
+
+	template <template <typename...> class Pred, typename... Ts>
+	using count_even_for_pack = count_when_for_to_pack<meta_detail::on_even, sizeof...(Ts), Pred, Ts...>;
+
+	template <template <typename...> class Pred, typename... Ts>
+	inline constexpr std::size_t count_even_for_pack_v = count_even_for_pack<Pred, Ts...>::value;
+
+	template <template <typename...> class Pred, typename... Ts>
+	using count_odd_for_pack = count_when_for_to_pack<meta_detail::on_odd, sizeof...(Ts), Pred, Ts...>;
+
+	template <template <typename...> class Pred, typename... Ts>
+	inline constexpr std::size_t count_odd_for_pack_v = count_odd_for_pack<Pred, Ts...>::value;
+
+	template <typename... Args>
+	struct return_type {
+		typedef std::tuple<Args...> type;
+	};
+
+	template <typename T>
+	struct return_type<T> {
+		typedef T type;
+	};
+
+	template <>
+	struct return_type<> {
+		typedef void type;
+	};
+
+	template <typename... Args>
+	using return_type_t = typename return_type<Args...>::type;
+
+	namespace meta_detail {
+		template <typename>
+		struct always_true : std::true_type { };
+		struct is_invokable_tester {
+			template <typename Fun, typename... Args>
+			static always_true<decltype(std::declval<Fun>()(std::declval<Args>()...))> test(int);
+			template <typename...>
+			static std::false_type test(...);
+		};
+	} // namespace meta_detail
+
+	template <typename T>
+	struct is_invokable;
+	template <typename Fun, typename... Args>
+	struct is_invokable<Fun(Args...)> : decltype(meta_detail::is_invokable_tester::test<Fun, Args...>(0)) { };
+
+	namespace meta_detail {
+
+		template <typename T, typename = void>
+		struct is_invocable : std::is_function<std::remove_pointer_t<T>> { };
+
+		template <typename T>
+		struct is_invocable<T,
+			std::enable_if_t<std::is_final<unqualified_t<T>>::value && std::is_class<unqualified_t<T>>::value
+			     && std::is_same<decltype(void(&T::operator())), void>::value>> { };
+
+		template <typename T>
+		struct is_invocable<T,
+			std::enable_if_t<!std::is_final<unqualified_t<T>>::value && std::is_class<unqualified_t<T>>::value
+			     && std::is_destructible<unqualified_t<T>>::value>> {
+			struct F {
+				void operator()() {};
+			};
+			struct Derived : T, F { };
+			template <typename U, U>
+			struct Check;
+
+			template <typename V>
+			static sfinae_no_t test(Check<void (F::*)(), &V::operator()>*);
+
+			template <typename>
+			static sfinae_yes_t test(...);
+
+			static constexpr bool value = std::is_same_v<decltype(test<Derived>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct is_invocable<T,
+			std::enable_if_t<!std::is_final<unqualified_t<T>>::value && std::is_class<unqualified_t<T>>::value
+			     && !std::is_destructible<unqualified_t<T>>::value>> {
+			struct F {
+				void operator()() {};
+			};
+			struct Derived : T, F {
+				~Derived() = delete;
+			};
+			template <typename U, U>
+			struct Check;
+
+			template <typename V>
+			static sfinae_no_t test(Check<void (F::*)(), &V::operator()>*);
+
+			template <typename>
+			static sfinae_yes_t test(...);
+
+			static constexpr bool value = std::is_same_v<decltype(test<Derived>(0)), sfinae_yes_t>;
+		};
+
+		struct has_begin_end_impl {
+			template <typename T, typename U = unqualified_t<T>, typename B = decltype(std::declval<U&>().begin()),
+				typename E = decltype(std::declval<U&>().end())>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_key_type_impl {
+			template <typename T, typename U = unqualified_t<T>, typename V = typename U::key_type>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_key_comp_impl {
+			template <typename T, typename V = decltype(std::declval<unqualified_t<T>>().key_comp())>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_load_factor_impl {
+			template <typename T, typename V = decltype(std::declval<unqualified_t<T>>().load_factor())>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_mapped_type_impl {
+			template <typename T, typename V = typename unqualified_t<T>::mapped_type>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_value_type_impl {
+			template <typename T, typename V = typename unqualified_t<T>::value_type>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_iterator_impl {
+			template <typename T, typename V = typename unqualified_t<T>::iterator>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		struct has_key_value_pair_impl {
+			template <typename T, typename U = unqualified_t<T>, typename V = typename U::value_type, typename F = decltype(std::declval<V&>().first),
+				typename S = decltype(std::declval<V&>().second)>
+			static std::true_type test(int);
+
+			template <typename...>
+			static std::false_type test(...);
+		};
+
+		template <typename T>
+		struct has_push_back_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().push_back(std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_insert_with_iterator_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().insert(
+				std::declval<std::add_rvalue_reference_t<typename C::iterator>>(), std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = !std::is_same_v<decltype(test<T>(0)), sfinae_no_t>;
+		};
+
+		template <typename T>
+		struct has_insert_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().insert(std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = !std::is_same_v<decltype(test<T>(0)), sfinae_no_t>;
+		};
+
+		template <typename T>
+		struct has_insert_after_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().insert_after(std::declval<std::add_rvalue_reference_t<typename C::const_iterator>>(),
+				std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_size_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().size())*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_max_size_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().max_size())*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_to_string_test {
+		private:
+			template <typename C>
+			static sfinae_yes_t test(decltype(std::declval<C>().to_string())*);
+			template <typename C>
+			static sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), sfinae_yes_t>;
+		};
+
+		template <typename T, typename U, typename = void>
+		class supports_op_less_test : public std::false_type { };
+		template <typename T, typename U>
+		class supports_op_less_test<T, U, void_t<decltype(std::declval<T&>() < std::declval<U&>())>>
+		: public std::integral_constant<bool,
+#if SOL_IS_ON(SOL_STD_VARIANT)
+			  !is_specialization_of_v<unqualified_t<T>, std::variant> && !is_specialization_of_v<unqualified_t<U>, std::variant>
+#else
+			  true
+#endif
+			  > {
+		};
+
+		template <typename T, typename U, typename = void>
+		class supports_op_equal_test : public std::false_type { };
+		template <typename T, typename U>
+		class supports_op_equal_test<T, U, void_t<decltype(std::declval<T&>() == std::declval<U&>())>>
+		: public std::integral_constant<bool,
+#if SOL_IS_ON(SOL_STD_VARIANT)
+			  !is_specialization_of_v<unqualified_t<T>, std::variant> && !is_specialization_of_v<unqualified_t<U>, std::variant>
+#else
+			  true
+#endif
+			  > {
+		};
+
+		template <typename T, typename U, typename = void>
+		class supports_op_less_equal_test : public std::false_type { };
+		template <typename T, typename U>
+		class supports_op_less_equal_test<T, U, void_t<decltype(std::declval<T&>() <= std::declval<U&>())>>
+		: public std::integral_constant<bool,
+#if SOL_IS_ON(SOL_STD_VARIANT)
+			  !is_specialization_of_v<unqualified_t<T>, std::variant> && !is_specialization_of_v<unqualified_t<U>, std::variant>
+#else
+			  true
+#endif
+			  > {
+		};
+
+		template <typename T, typename U, typename = void>
+		class supports_op_left_shift_test : public std::false_type { };
+		template <typename T, typename U>
+		class supports_op_left_shift_test<T, U, void_t<decltype(std::declval<T&>() << std::declval<U&>())>> : public std::true_type { };
+
+		template <typename T, typename = void>
+		class supports_adl_to_string_test : public std::false_type { };
+		template <typename T>
+		class supports_adl_to_string_test<T, void_t<decltype(to_string(std::declval<const T&>()))>> : public std::true_type { };
+
+		template <typename T, bool b>
+		struct is_matched_lookup_impl : std::false_type { };
+		template <typename T>
+		struct is_matched_lookup_impl<T, true> : std::is_same<typename T::key_type, typename T::value_type> { };
+
+		template <typename T>
+		using non_void_t = meta::conditional_t<std::is_void_v<T>, ::sol::detail::unchecked_t, T>;
+
+		template <typename T>
+		using detect_sentinel = typename T::sentinel;
+	} // namespace meta_detail
+
+	template <typename T, typename Fallback>
+	class sentinel_or {
+	public:
+		using type = detected_or_t<Fallback, meta_detail::detect_sentinel, T>;
+	};
+
+	template <typename T, typename Fallback>
+	using sentinel_or_t = typename sentinel_or<T, Fallback>::type;
+
+	template <typename T, typename U = T>
+	class supports_op_less : public meta_detail::supports_op_less_test<T, U> { };
+
+	template <typename T, typename U = T>
+	class supports_op_equal : public meta_detail::supports_op_equal_test<T, U> { };
+
+	template <typename T, typename U = T>
+	class supports_op_less_equal : public meta_detail::supports_op_less_equal_test<T, U> { };
+
+	template <typename T, typename U = T>
+	class supports_op_left_shift : public meta_detail::supports_op_left_shift_test<T, U> { };
+
+	template <typename T>
+	class supports_adl_to_string : public meta_detail::supports_adl_to_string_test<T> { };
+
+	template <typename T>
+	class supports_to_string_member : public meta::boolean<meta_detail::has_to_string_test<meta_detail::non_void_t<T>>::value> { };
+
+	template <typename T>
+	using is_invocable = boolean<meta_detail::is_invocable<T>::value>;
+
+	template <typename T>
+	constexpr inline bool is_invocable_v = is_invocable<T>::value;
+
+	template <typename T>
+	struct has_begin_end : decltype(meta_detail::has_begin_end_impl::test<T>(0)) { };
+
+	template <typename T>
+	constexpr inline bool has_begin_end_v = has_begin_end<T>::value;
+
+	template <typename T>
+	struct has_key_value_pair : decltype(meta_detail::has_key_value_pair_impl::test<T>(0)) { };
+
+	template <typename T>
+	struct has_key_type : decltype(meta_detail::has_key_type_impl::test<T>(0)) { };
+
+	template <typename T>
+	struct has_key_comp : decltype(meta_detail::has_key_comp_impl::test<T>(0)) { };
+
+	template <typename T>
+	struct has_load_factor : decltype(meta_detail::has_load_factor_impl::test<T>(0)) { };
+
+	template <typename T>
+	struct has_mapped_type : decltype(meta_detail::has_mapped_type_impl::test<T>(0)) { };
+
+	template <typename T>
+	struct has_iterator : decltype(meta_detail::has_iterator_impl::test<T>(0)) { };
+
+	template <typename T>
+	struct has_value_type : decltype(meta_detail::has_value_type_impl::test<T>(0)) { };
+
+	template <typename T>
+	using has_push_back = meta::boolean<meta_detail::has_push_back_test<T>::value>;
+
+	template <typename T>
+	using has_max_size = meta::boolean<meta_detail::has_max_size_test<T>::value>;
+
+	template <typename T>
+	using has_insert = meta::boolean<meta_detail::has_insert_test<T>::value>;
+
+	template <typename T>
+	using has_insert_with_iterator = meta::boolean<meta_detail::has_insert_with_iterator_test<T>::value>;
+
+	template <typename T>
+	using has_insert_after = meta::boolean<meta_detail::has_insert_after_test<T>::value>;
+
+	template <typename T>
+	using has_size = meta::boolean<meta_detail::has_size_test<T>::value>;
+
+	template <typename T>
+	using is_associative = meta::all<has_key_type<T>, has_key_value_pair<T>, has_mapped_type<T>>;
+
+	template <typename T>
+	using is_lookup = meta::all<has_key_type<T>, has_value_type<T>>;
+
+	template <typename T>
+	using is_ordered = meta::all<has_key_comp<T>, meta::neg<has_load_factor<T>>>;
+
+	template <typename T>
+	using is_matched_lookup = meta_detail::is_matched_lookup_impl<T, is_lookup<T>::value>;
+
+	template <typename T>
+	using is_initializer_list = meta::is_specialization_of<T, std::initializer_list>;
+
+	template <typename T>
+	constexpr inline bool is_initializer_list_v = is_initializer_list<T>::value;
+
+	template <typename T, typename CharT = char>
+	using is_string_literal_array_of = boolean<std::is_array_v<T> && std::is_same_v<std::remove_all_extents_t<T>, CharT>>;
+
+	template <typename T, typename CharT = char>
+	constexpr inline bool is_string_literal_array_of_v = is_string_literal_array_of<T, CharT>::value;
+
+	template <typename T>
+	using is_string_literal_array = boolean<std::is_array_v<T>
+		&& any_same_v<std::remove_all_extents_t<T>, char,
+#if SOL_IS_ON(SOL_CHAR8_T)
+		     char8_t,
+#endif
+		     char16_t, char32_t, wchar_t>>;
+
+	template <typename T>
+	constexpr inline bool is_string_literal_array_v = is_string_literal_array<T>::value;
+
+	template <typename T, typename CharT>
+	struct is_string_of : std::false_type { };
+
+	template <typename CharT, typename CharTargetT, typename TraitsT, typename AllocT>
+	struct is_string_of<std::basic_string<CharT, TraitsT, AllocT>, CharTargetT> : std::is_same<CharT, CharTargetT> { };
+
+	template <typename T, typename CharT>
+	constexpr inline bool is_string_of_v = is_string_of<T, CharT>::value;
+
+	template <typename T, typename CharT>
+	struct is_string_view_of : std::false_type { };
+
+	template <typename CharT, typename CharTargetT, typename TraitsT>
+	struct is_string_view_of<std::basic_string_view<CharT, TraitsT>, CharTargetT> : std::is_same<CharT, CharTargetT> { };
+
+	template <typename T, typename CharT>
+	constexpr inline bool is_string_view_of_v = is_string_view_of<T, CharT>::value;
+
+	template <typename T>
+	using is_string_like
+		= meta::boolean<is_specialization_of_v<T, std::basic_string> || is_specialization_of_v<T, std::basic_string_view> || is_string_literal_array_v<T>>;
+
+	template <typename T>
+	constexpr inline bool is_string_like_v = is_string_like<T>::value;
+
+	template <typename T, typename CharT = char>
+	using is_string_constructible = meta::boolean<is_string_literal_array_of_v<T, CharT> || std::is_same_v<T, const CharT*> || std::is_same_v<T, CharT>
+		|| is_string_of_v<T, CharT> || std::is_same_v<T, std::initializer_list<CharT>> || is_string_view_of_v<T, CharT> || std::is_null_pointer_v<T>>;
+
+	template <typename T, typename CharT = char>
+	constexpr inline bool is_string_constructible_v = is_string_constructible<T, CharT>::value;
+
+	template <typename T>
+	using is_string_like_or_constructible = meta::boolean<is_string_like_v<T> || is_string_constructible_v<T>>;
+
+	template <typename T>
+	struct is_pair : std::false_type { };
+
+	template <typename T1, typename T2>
+	struct is_pair<std::pair<T1, T2>> : std::true_type { };
+
+	template <typename T, typename Char>
+	using is_c_str_of = any<std::is_same<T, const Char*>, std::is_same<T, Char const* const>, std::is_same<T, Char*>, is_string_literal_array_of<T, Char>>;
+
+	template <typename T, typename Char>
+	constexpr inline bool is_c_str_of_v = is_c_str_of<T, Char>::value;
+
+	template <typename T>
+	using is_c_str = is_c_str_of<T, char>;
+
+	template <typename T>
+	constexpr inline bool is_c_str_v = is_c_str<T>::value;
+
+	template <typename T, typename Char>
+	using is_c_str_or_string_of = any<is_c_str_of<T, Char>, is_string_of<T, Char>>;
+
+	template <typename T, typename Char>
+	constexpr inline bool is_c_str_or_string_of_v = is_c_str_or_string_of<T, Char>::value;
+
+	template <typename T>
+	using is_c_str_or_string = is_c_str_or_string_of<T, char>;
+
+	template <typename T>
+	constexpr inline bool is_c_str_or_string_v = is_c_str_or_string<T>::value;
+
+	template <typename T>
+	struct is_move_only : all<neg<std::is_reference<T>>, neg<std::is_copy_constructible<unqualified_t<T>>>, std::is_move_constructible<unqualified_t<T>>> { };
+
+	template <typename T>
+	using is_not_move_only = neg<is_move_only<T>>;
+
+	namespace meta_detail {
+		template <typename T>
+		decltype(auto) force_tuple(T&& x) {
+			if constexpr (meta::is_specialization_of_v<meta::unqualified_t<T>, std::tuple>) {
+				return std::forward<T>(x);
+			}
+			else {
+				return std::tuple<T>(std::forward<T>(x));
+			}
+		}
+	} // namespace meta_detail
+
+	template <typename... X>
+	decltype(auto) tuplefy(X&&... x) {
+		return std::tuple_cat(meta_detail::force_tuple(std::forward<X>(x))...);
+	}
+
+	template <typename T, typename = void>
+	struct iterator_tag {
+		using type = std::input_iterator_tag;
+	};
+
+	template <typename T>
+	struct iterator_tag<T, conditional_t<false, typename std::iterator_traits<T>::iterator_category, void>> {
+		using type = typename std::iterator_traits<T>::iterator_category;
+	};
+}}     // namespace sol::meta
+
+// end of sol/traits.hpp
+
+namespace sol {
+	namespace detail {
+		const bool default_safe_function_calls =
+#if SOL_IS_ON(SOL_SAFE_FUNCTION_CALLS)
+		     true;
+#else
+		     false;
+#endif
+	} // namespace detail
+
+	namespace meta { namespace meta_detail {
+	}} // namespace meta::meta_detail
+
+	namespace stack { namespace stack_detail {
+		using undefined_method_func = void (*)(stack_reference);
+
+		template <typename T>
+		void set_undefined_methods_on(stack_reference);
+
+		struct undefined_metatable;
+	}} // namespace stack::stack_detail
+} // namespace sol
+
+#endif // SOL_FORWARD_DETAIL_HPP
+// end of sol/forward_detail.hpp
+
+// beginning of sol/assert.hpp
+
+#if SOL_IS_ON(SOL2_CI)
+
+struct pre_main {
+	pre_main() {
+#ifdef _MSC_VER
+		_set_abort_behavior(0, _WRITE_ABORT_MSG);
+#endif
+	}
+} inline sol2_ci_dont_lock_ci_please = {};
+
+#endif // Prevent lockup when doing Continuous Integration
+
+#if SOL_IS_ON(SOL_USER_ASSERT)
+	#define SOL_ASSERT(...) SOL_C_ASSERT(__VA_ARGS__)
+#else
+	#if SOL_IS_ON(SOL_DEBUG_BUILD)
+		#include <exception>
+		#include <iostream>
+		#include <cstdlib>
+
+			#define SOL_ASSERT(...)                                                                                               \
+				do {                                                                                                               \
+					if (!(__VA_ARGS__)) {                                                                                           \
+						std::cerr << "Assertion `" #__VA_ARGS__ "` failed in " << __FILE__ << " line " << __LINE__ << std::endl; \
+						std::terminate();                                                                                        \
+					}                                                                                                             \
+				} while (false)
+	#else
+		#define SOL_ASSERT(...)           \
+			do {                           \
+				if (false) {              \
+					(void)(__VA_ARGS__); \
+				}                         \
+			} while (false)
+	#endif
+#endif
+
+#if SOL_IS_ON(SOL_USER_ASSERT_MSG)
+	#define SOL_ASSERT_MSG(message, ...) SOL_ASSERT_MSG(message, __VA_ARGS__)
+#else
+	#if SOL_IS_ON(SOL_DEBUG_BUILD)
+		#include <exception>
+		#include <iostream>
+		#include <cstdlib>
+
+		#define SOL_ASSERT_MSG(message, ...)                                                                                                         \
+			do {                                                                                                                                  \
+				if (!(__VA_ARGS__)) {                                                                                                              \
+					std::cerr << "Assertion `" #__VA_ARGS__ "` failed in " << __FILE__ << " line " << __LINE__ << ": " << message << std::endl; \
+					std::terminate();                                                                                                           \
+				}                                                                                                                                \
+			} while (false)
+	#else
+		#define SOL_ASSERT_MSG(message, ...)    \
+			do {                             \
+				if (false) {                \
+					(void)(__VA_ARGS__);   \
+					(void)sizeof(message); \
+				}                           \
+			} while (false)
+	#endif
+#endif
+
+// end of sol/assert.hpp
+
+// beginning of sol/bytecode.hpp
+
+// beginning of sol/compatibility.hpp
+
+// beginning of sol/compatibility/lua_version.hpp
+
+#if SOL_IS_ON(SOL_USING_CXX_LUA)
+	#include <lua.h>
+	#include <lualib.h>
+	#include <lauxlib.h>
+#elif SOL_IS_ON(SOL_USE_LUA_HPP)
+	#include <lua.hpp>
+#else
+	extern "C" {
+		#include <lua.h>
+		#include <lauxlib.h>
+		#include <lualib.h>
+	}
+#endif // C++ Mangling for Lua vs. Not
+
+#if defined(SOL_LUAJIT)
+	#if (SOL_LUAJIT != 0)
+		#define SOL_USE_LUAJIT_I_ SOL_ON
+	#else
+		#define SOL_USE_LUAJIT_I_ SOL_OFF
+	#endif
+#elif defined(LUAJIT_VERSION)
+	#define SOL_USE_LUAJIT_I_ SOL_ON
+#else
+	#define SOL_USE_LUAJIT_I_ SOL_DEFAULT_OFF
+#endif // luajit
+
+#if SOL_IS_ON(SOL_USING_CXX_LUAJIT)
+	#include <luajit.h>
+#elif SOL_IS_ON(SOL_USE_LUAJIT)
+	extern "C" {
+		#include <luajit.h>
+	}
+#endif // C++ LuaJIT ... whatever that means
+
+#if defined(SOL_LUAJIT_VERSION)
+	#define SOL_LUAJIT_VERSION_I_ SOL_LUAJIT_VERSION
+#elif SOL_IS_ON(SOL_USE_LUAJIT)
+	#define SOL_LUAJIT_VERSION_I_ LUAJIT_VERSION_NUM
+#else
+	#define SOL_LUAJIT_VERSION_I_ 0
+#endif
+
+#if defined(SOL_LUAJIT_FFI_DISABLED)
+	#define SOL_LUAJIT_FFI_DISABLED_I_ SOL_ON
+#elif defined(LUAJIT_DISABLE_FFI)
+	#define SOL_LUAJIT_FFI_DISABLED_I_ SOL_ON
+#else
+	#define SOL_LUAJIT_FFI_DISABLED_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(MOONJIT_VERSION)
+	#define SOL_USE_MOONJIT_I_ SOL_ON
+#else
+	#define SOL_USE_MOONJIT_I_ SOL_OFF
+#endif
+
+#if !defined(SOL_LUA_VERSION)
+	#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 502
+		#define SOL_LUA_VERSION LUA_VERSION_NUM
+	#elif defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 501
+		#define SOL_LUA_VERSION LUA_VERSION_NUM
+	#elif !defined(LUA_VERSION_NUM) || !(LUA_VERSION_NUM)
+		// Definitely 5.0
+		#define SOL_LUA_VERSION 500
+	#else
+		// ??? Not sure, assume latest?
+		#define SOL_LUA_VERSION 504
+	#endif // Lua Version 503, 502, 501 || luajit, 500
+#endif // SOL_LUA_VERSION
+
+#if defined(SOL_LUA_VERSION)
+	#define SOL_LUA_VERSION_I_ SOL_LUA_VERSION
+#else
+	#define SOL_LUA_VERSION_I_ 504
+#endif
+
+#if defined(SOL_EXCEPTIONS_ALWAYS_UNSAFE)
+	#if (SOL_EXCEPTIONS_ALWAYS_UNSAFE != 0)
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_OFF
+	#else
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_ON
+	#endif
+#elif defined(SOL_EXCEPTIONS_SAFE_PROPAGATION)
+	#if (SOL_EXCEPTIONS_SAFE_PROPAGATION != 0)
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_ON
+	#else
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_OFF
+	#endif
+#elif SOL_LUAJIT_VERSION_I_ >= 20100
+	// LuaJIT 2.1.0-beta3 and better have exception support locked in for all platforms (mostly)
+	#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_ON
+#elif SOL_LUAJIT_VERSION_I_ >= 20000
+	// LuaJIT 2.0.x have exception support only on x64 builds
+	#if SOL_IS_ON(SOL_PLATFORM_X64)
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_OFF
+	#endif
+#else
+	// otherwise, there is no exception safety for
+	// shoving exceptions through Lua and errors should
+	// always be serialized
+	#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_EXCEPTIONS_CATCH_ALL)
+	#if (SOL_EXCEPTIONS_CATCH_ALL != 0)
+		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_ON
+	#else
+		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_ON(SOL_USE_LUAJIT)
+		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_DEFAULT_OFF
+	#elif SOL_IS_ON(SOL_USING_CXX_LUAJIT)
+		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_DEFAULT_OFF
+	#elif SOL_IS_ON(SOL_USING_CXX_LUA)
+		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_DEFAULT_OFF
+	#else
+		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_DEFAULT_ON
+	#endif
+#endif
+
+#if defined(SOL_LUAJIT_USE_EXCEPTION_TRAMPOLINE)
+	#if (SOL_LUAJIT_USE_EXCEPTION_TRAMPOLINE != 0)
+		#define SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_ SOL_ON
+	#else
+		#define SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_OFF(SOL_PROPAGATE_EXCEPTIONS) && SOL_IS_ON(SOL_USE_LUAJIT)
+		#define SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_ SOL_ON
+	#else
+		#define SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(SOL_LUAL_STREAM_HAS_CLOSE_FUNCTION)
+	#if (SOL_LUAL_STREAM_HAS_CLOSE_FUNCTION != 0)
+		#define SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_ SOL_ON
+	#else
+		#define SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_ SOL_OFF
+	#endif
+#else
+	#if SOL_IS_OFF(SOL_USE_LUAJIT) && (SOL_LUA_VERSION > 501)
+		#define SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_ SOL_ON
+	#else
+		#define SOL_LUAL_STREAM_USE_CLOSE_FUNCTION_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined (SOL_LUA_BIT32_LIB)
+	#if SOL_LUA_BIT32_LIB != 0
+		#define SOL_LUA_BIT32_LIB_I_ SOL_ON
+	#else
+		#define SOL_LUA_BIT32_LIB_I_ SOL_OFF
+	#endif
+#else
+	// Lua 5.2 only (deprecated in 5.3 (503)) (Can be turned on with Compat flags)
+	// Lua 5.2, or other versions of Lua with the compat flag, or Lua that is not 5.2 with the specific define (5.4.1 either removed it entirely or broke it)
+	#if (SOL_LUA_VERSION_I_ == 502)
+		#define SOL_LUA_BIT32_LIB_I_ SOL_ON
+	#elif defined(LUA_COMPAT_BITLIB)
+		#define SOL_LUA_BIT32_LIB_I_ SOL_ON
+	#elif (SOL_LUA_VERSION_I_ < 504 && defined(LUA_COMPAT_5_2))
+		#define SOL_LUA_BIT32_LIB_I_ SOL_ON
+	#else
+		#define SOL_LUA_BIT32_LIB_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined (SOL_LUA_NIL_IN_TABLES)
+	#if SOL_LUA_NIL_IN_TABLES != 0
+		#define SOL_LUA_NIL_IN_TABLES_I_ SOL_ON
+	#else
+		#define SOL_LUA_NIL_IN_TABLES_I_ SOL_OFF
+	#endif
+#else
+	#if defined(LUA_NILINTABLE) && (LUA_NILINTABLE != 0)
+		#define SOL_LUA_NIL_IN_TABLES_I_ SOL_DEFAULT_ON
+	#else
+		#define SOL_LUA_NIL_IN_TABLES_I_ SOL_DEFAULT_OFF
+	#endif
+#endif
+
+// end of sol/compatibility/lua_version.hpp
+
+#if SOL_IS_ON(SOL_USE_COMPATIBILITY_LAYER)
+
+#if SOL_IS_ON(SOL_USING_CXX_LUA) || SOL_IS_ON(SOL_USING_CXX_LUAJIT)
+	#ifndef COMPAT53_LUA_CPP
+		#define COMPAT53_LUA_CPP 1
+	#endif // Build Lua Compat layer as C++
+#endif
+	#ifndef COMPAT53_INCLUDE_SOURCE
+		#define COMPAT53_INCLUDE_SOURCE 1
+	#endif // Build Compat Layer Inline
+// beginning of sol/compatibility/compat-5.3.h
+
+#ifndef KEPLER_PROJECT_COMPAT53_H_
+#define KEPLER_PROJECT_COMPAT53_H_
+
+#include <stddef.h>
+#include <limits.h>
+#include <string.h>
+#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
+extern "C" {
+#endif
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
+#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
+}
+#endif
+
+#ifndef COMPAT53_PREFIX
+/* we chose this name because many other lua bindings / libs have
+* their own compatibility layer, and that use the compat53 declaration
+* frequently, causing all kinds of linker / compiler issues
+*/
+#  define COMPAT53_PREFIX kp_compat53
+#endif // COMPAT53_PREFIX
+
+#ifndef COMPAT53_API
+#  if defined(COMPAT53_INCLUDE_SOURCE) && COMPAT53_INCLUDE_SOURCE
+#    if defined(__GNUC__) || defined(__clang__)
+#      define COMPAT53_API __attribute__((__unused__)) static inline 
+#    else
+#      define COMPAT53_API static inline 
+#    endif /* Clang/GCC */
+#  else /* COMPAT53_INCLUDE_SOURCE */
+/* we are not including source, so everything is extern */
+#      define COMPAT53_API extern
+#  endif /* COMPAT53_INCLUDE_SOURCE */
+#endif /* COMPAT53_PREFIX */
+
+#define COMPAT53_CONCAT_HELPER(a, b) a##b
+#define COMPAT53_CONCAT(a, b) COMPAT53_CONCAT_HELPER(a, b)
+
+/* declarations for Lua 5.1 */
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 501
+
+/* XXX not implemented:
+* lua_arith (new operators)
+* lua_upvalueid
+* lua_upvaluejoin
+* lua_version
+* lua_yieldk
+*/
+
+#ifndef LUA_OK
+#  define LUA_OK 0
+#endif
+#ifndef LUA_OPADD
+#  define LUA_OPADD 0
+#endif
+#ifndef LUA_OPSUB
+#  define LUA_OPSUB 1
+#endif
+#ifndef LUA_OPMUL
+#  define LUA_OPMUL 2
+#endif
+#ifndef LUA_OPDIV
+#  define LUA_OPDIV 3
+#endif
+#ifndef LUA_OPMOD
+#  define LUA_OPMOD 4
+#endif
+#ifndef LUA_OPPOW
+#  define LUA_OPPOW 5
+#endif
+#ifndef LUA_OPUNM
+#  define LUA_OPUNM 6
+#endif
+#ifndef LUA_OPEQ
+#  define LUA_OPEQ 0
+#endif
+#ifndef LUA_OPLT
+#  define LUA_OPLT 1
+#endif
+#ifndef LUA_OPLE
+#  define LUA_OPLE 2
+#endif
+
+/* LuaJIT/Lua 5.1 does not have the updated
+* error codes for thread status/function returns (but some patched versions do)
+* define it only if it's not found
+*/
+#if !defined(LUA_ERRGCMM)
+/* Use + 2 because in some versions of Lua (Lua 5.1)
+* LUA_ERRFILE is defined as (LUA_ERRERR+1)
+* so we need to avoid it (LuaJIT might have something at this
+* integer value too)
+*/
+#  define LUA_ERRGCMM (LUA_ERRERR + 2)
+#endif /* LUA_ERRGCMM define */
+
+#if !defined(MOONJIT_VERSION)
+typedef size_t lua_Unsigned;
+#endif
+
+typedef struct luaL_Buffer_53 {
+	luaL_Buffer b; /* make incorrect code crash! */
+	char *ptr;
+	size_t nelems;
+	size_t capacity;
+	lua_State *L2;
+} luaL_Buffer_53;
+#define luaL_Buffer luaL_Buffer_53
+
+/* In PUC-Rio 5.1, userdata is a simple FILE*
+* In LuaJIT, it's a struct where the first member is a FILE*
+* We can't support the `closef` member
+*/
+typedef struct luaL_Stream {
+	FILE *f;
+} luaL_Stream;
+
+#define lua_absindex COMPAT53_CONCAT(COMPAT53_PREFIX, _absindex)
+COMPAT53_API int lua_absindex(lua_State *L, int i);
+
+#define lua_arith COMPAT53_CONCAT(COMPAT53_PREFIX, _arith)
+COMPAT53_API void lua_arith(lua_State *L, int op);
+
+#define lua_compare COMPAT53_CONCAT(COMPAT53_PREFIX, _compare)
+COMPAT53_API int lua_compare(lua_State *L, int idx1, int idx2, int op);
+
+#define lua_copy COMPAT53_CONCAT(COMPAT53_PREFIX, _copy)
+COMPAT53_API void lua_copy(lua_State *L, int from, int to);
+
+#define lua_getuservalue(L, i) \
+  (lua_getfenv((L), (i)), lua_type((L), -1))
+#define lua_setuservalue(L, i) \
+  (luaL_checktype((L), -1, LUA_TTABLE), lua_setfenv((L), (i)))
+
+#define lua_len COMPAT53_CONCAT(COMPAT53_PREFIX, _len)
+COMPAT53_API void lua_len(lua_State *L, int i);
+
+#define lua_pushstring(L, s) \
+  (lua_pushstring((L), (s)), lua_tostring((L), -1))
+
+#define lua_pushlstring(L, s, len) \
+  ((((len) == 0) ? lua_pushlstring((L), "", 0) : lua_pushlstring((L), (s), (len))), lua_tostring((L), -1))
+
+#ifndef luaL_newlibtable
+#  define luaL_newlibtable(L, l) \
+  (lua_createtable((L), 0, sizeof((l))/sizeof(*(l))-1))
+#endif
+#ifndef luaL_newlib
+#  define luaL_newlib(L, l) \
+  (luaL_newlibtable((L), (l)), luaL_register((L), NULL, (l)))
+#endif
+
+#ifndef lua_pushglobaltable
+#  define lua_pushglobaltable(L) \
+  lua_pushvalue((L), LUA_GLOBALSINDEX)
+#endif
+#define lua_rawgetp COMPAT53_CONCAT(COMPAT53_PREFIX, _rawgetp)
+COMPAT53_API int lua_rawgetp(lua_State *L, int i, const void *p);
+
+#define lua_rawsetp COMPAT53_CONCAT(COMPAT53_PREFIX, _rawsetp)
+COMPAT53_API void lua_rawsetp(lua_State *L, int i, const void *p);
+
+#define lua_rawlen(L, i) lua_objlen((L), (i))
+
+#define lua_tointeger(L, i) lua_tointegerx((L), (i), NULL)
+
+#define lua_tonumberx COMPAT53_CONCAT(COMPAT53_PREFIX, _tonumberx)
+COMPAT53_API lua_Number lua_tonumberx(lua_State *L, int i, int *isnum);
+
+#define luaL_checkversion COMPAT53_CONCAT(COMPAT53_PREFIX, L_checkversion)
+COMPAT53_API void luaL_checkversion(lua_State *L);
+
+#define lua_load COMPAT53_CONCAT(COMPAT53_PREFIX, _load_53)
+COMPAT53_API int lua_load(lua_State *L, lua_Reader reader, void *data, const char* source, const char* mode);
+
+#define luaL_loadfilex COMPAT53_CONCAT(COMPAT53_PREFIX, L_loadfilex)
+COMPAT53_API int luaL_loadfilex(lua_State *L, const char *filename, const char *mode);
+
+#define luaL_loadbufferx COMPAT53_CONCAT(COMPAT53_PREFIX, L_loadbufferx)
+COMPAT53_API int luaL_loadbufferx(lua_State *L, const char *buff, size_t sz, const char *name, const char *mode);
+
+#define luaL_checkstack COMPAT53_CONCAT(COMPAT53_PREFIX, L_checkstack_53)
+COMPAT53_API void luaL_checkstack(lua_State *L, int sp, const char *msg);
+
+#define luaL_getsubtable COMPAT53_CONCAT(COMPAT53_PREFIX, L_getsubtable)
+COMPAT53_API int luaL_getsubtable(lua_State* L, int i, const char *name);
+
+#define luaL_len COMPAT53_CONCAT(COMPAT53_PREFIX, L_len)
+COMPAT53_API lua_Integer luaL_len(lua_State *L, int i);
+
+#define luaL_setfuncs COMPAT53_CONCAT(COMPAT53_PREFIX, L_setfuncs)
+COMPAT53_API void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup);
+
+#define luaL_setmetatable COMPAT53_CONCAT(COMPAT53_PREFIX, L_setmetatable)
+COMPAT53_API void luaL_setmetatable(lua_State *L, const char *tname);
+
+#define luaL_testudata COMPAT53_CONCAT(COMPAT53_PREFIX, L_testudata)
+COMPAT53_API void *luaL_testudata(lua_State *L, int i, const char *tname);
+
+#define luaL_traceback COMPAT53_CONCAT(COMPAT53_PREFIX, L_traceback)
+COMPAT53_API void luaL_traceback(lua_State *L, lua_State *L1, const char *msg, int level);
+
+#define luaL_fileresult COMPAT53_CONCAT(COMPAT53_PREFIX, L_fileresult)
+COMPAT53_API int luaL_fileresult(lua_State *L, int stat, const char *fname);
+
+#define luaL_execresult COMPAT53_CONCAT(COMPAT53_PREFIX, L_execresult)
+COMPAT53_API int luaL_execresult(lua_State *L, int stat);
+
+#define lua_callk(L, na, nr, ctx, cont) \
+  ((void)(ctx), (void)(cont), lua_call((L), (na), (nr)))
+#define lua_pcallk(L, na, nr, err, ctx, cont) \
+  ((void)(ctx), (void)(cont), lua_pcall((L), (na), (nr), (err)))
+
+#define lua_resume(L, from, nargs) \
+  ((void)(from), lua_resume((L), (nargs)))
+
+#define luaL_buffinit COMPAT53_CONCAT(COMPAT53_PREFIX, _buffinit_53)
+COMPAT53_API void luaL_buffinit(lua_State *L, luaL_Buffer_53 *B);
+
+#define luaL_prepbuffsize COMPAT53_CONCAT(COMPAT53_PREFIX, _prepbufsize_53)
+COMPAT53_API char *luaL_prepbuffsize(luaL_Buffer_53 *B, size_t s);
+
+#define luaL_addlstring COMPAT53_CONCAT(COMPAT53_PREFIX, _addlstring_53)
+COMPAT53_API void luaL_addlstring(luaL_Buffer_53 *B, const char *s, size_t l);
+
+#define luaL_addvalue COMPAT53_CONCAT(COMPAT53_PREFIX, _addvalue_53)
+COMPAT53_API void luaL_addvalue(luaL_Buffer_53 *B);
+
+#define luaL_pushresult COMPAT53_CONCAT(COMPAT53_PREFIX, _pushresult_53)
+COMPAT53_API void luaL_pushresult(luaL_Buffer_53 *B);
+
+#undef luaL_buffinitsize
+#define luaL_buffinitsize(L, B, s) \
+  (luaL_buffinit((L), (B)), luaL_prepbuffsize((B), (s)))
+
+#undef luaL_prepbuffer
+#define luaL_prepbuffer(B) \
+  luaL_prepbuffsize((B), LUAL_BUFFERSIZE)
+
+#undef luaL_addchar
+#define luaL_addchar(B, c) \
+  ((void)((B)->nelems < (B)->capacity || luaL_prepbuffsize((B), 1)), \
+   ((B)->ptr[(B)->nelems++] = (c)))
+
+#undef luaL_addsize
+#define luaL_addsize(B, s) \
+  ((B)->nelems += (s))
+
+#undef luaL_addstring
+#define luaL_addstring(B, s) \
+  luaL_addlstring((B), (s), strlen((s)))
+
+#undef luaL_pushresultsize
+#define luaL_pushresultsize(B, s) \
+  (luaL_addsize((B), (s)), luaL_pushresult((B)))
+
+#if defined(LUA_COMPAT_APIINTCASTS)
+#define lua_pushunsigned(L, n) \
+  lua_pushinteger((L), (lua_Integer)(n))
+#define lua_tounsignedx(L, i, is) \
+  ((lua_Unsigned)lua_tointegerx((L), (i), (is)))
+#define lua_tounsigned(L, i) \
+  lua_tounsignedx((L), (i), NULL)
+#define luaL_checkunsigned(L, a) \
+  ((lua_Unsigned)luaL_checkinteger((L), (a)))
+#define luaL_optunsigned(L, a, d) \
+  ((lua_Unsigned)luaL_optinteger((L), (a), (lua_Integer)(d)))
+#endif
+
+#endif /* Lua 5.1 only */
+
+/* declarations for Lua 5.1 and 5.2 */
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM <= 502
+
+typedef int lua_KContext;
+
+typedef int(*lua_KFunction)(lua_State *L, int status, lua_KContext ctx);
+
+#define lua_dump(L, w, d, s) \
+  ((void)(s), lua_dump((L), (w), (d)))
+
+#define lua_getfield(L, i, k) \
+  (lua_getfield((L), (i), (k)), lua_type((L), -1))
+
+#define lua_gettable(L, i) \
+  (lua_gettable((L), (i)), lua_type((L), -1))
+
+#define lua_geti COMPAT53_CONCAT(COMPAT53_PREFIX, _geti)
+COMPAT53_API int lua_geti(lua_State *L, int index, lua_Integer i);
+
+#define lua_isinteger COMPAT53_CONCAT(COMPAT53_PREFIX, _isinteger)
+COMPAT53_API int lua_isinteger(lua_State *L, int index);
+
+#define lua_tointegerx COMPAT53_CONCAT(COMPAT53_PREFIX, _tointegerx_53)
+COMPAT53_API lua_Integer lua_tointegerx(lua_State *L, int i, int *isnum);
+
+#define lua_numbertointeger(n, p) \
+  ((*(p) = (lua_Integer)(n)), 1)
+
+#define lua_rawget(L, i) \
+  (lua_rawget((L), (i)), lua_type((L), -1))
+
+#define lua_rawgeti(L, i, n) \
+  (lua_rawgeti((L), (i), (n)), lua_type((L), -1))
+
+#define lua_rotate COMPAT53_CONCAT(COMPAT53_PREFIX, _rotate)
+COMPAT53_API void lua_rotate(lua_State *L, int idx, int n);
+
+#define lua_seti COMPAT53_CONCAT(COMPAT53_PREFIX, _seti)
+COMPAT53_API void lua_seti(lua_State *L, int index, lua_Integer i);
+
+#define lua_stringtonumber COMPAT53_CONCAT(COMPAT53_PREFIX, _stringtonumber)
+COMPAT53_API size_t lua_stringtonumber(lua_State *L, const char *s);
+
+#define luaL_tolstring COMPAT53_CONCAT(COMPAT53_PREFIX, L_tolstring)
+COMPAT53_API const char *luaL_tolstring(lua_State *L, int idx, size_t *len);
+
+#define luaL_getmetafield(L, o, e) \
+  (luaL_getmetafield((L), (o), (e)) ? lua_type((L), -1) : LUA_TNIL)
+
+#define luaL_newmetatable(L, tn) \
+  (luaL_newmetatable((L), (tn)) ? (lua_pushstring((L), (tn)), lua_setfield((L), -2, "__name"), 1) : 0)
+
+#define luaL_requiref COMPAT53_CONCAT(COMPAT53_PREFIX, L_requiref_53)
+COMPAT53_API void luaL_requiref(lua_State *L, const char *modname,
+	lua_CFunction openf, int glb);
+
+#endif /* Lua 5.1 and Lua 5.2 */
+
+/* declarations for Lua 5.2 */
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 502
+
+/* XXX not implemented:
+* lua_isyieldable
+* lua_getextraspace
+* lua_arith (new operators)
+* lua_pushfstring (new formats)
+*/
+
+#define lua_getglobal(L, n) \
+  (lua_getglobal((L), (n)), lua_type((L), -1))
+
+#define lua_getuservalue(L, i) \
+  (lua_getuservalue((L), (i)), lua_type((L), -1))
+
+#define lua_pushlstring(L, s, len) \
+  (((len) == 0) ? lua_pushlstring((L), "", 0) : lua_pushlstring((L), (s), (len)))
+
+#define lua_rawgetp(L, i, p) \
+  (lua_rawgetp((L), (i), (p)), lua_type((L), -1))
+
+#define LUA_KFUNCTION(_name) \
+  static int (_name)(lua_State *L, int status, lua_KContext ctx); \
+  static int (_name ## _52)(lua_State *L) { \
+    lua_KContext ctx; \
+    int status = lua_getctx(L, &ctx); \
+    return (_name)(L, status, ctx); \
+  } \
+  static int (_name)(lua_State *L, int status, lua_KContext ctx)
+
+#define lua_pcallk(L, na, nr, err, ctx, cont) \
+  lua_pcallk((L), (na), (nr), (err), (ctx), cont ## _52)
+
+#define lua_callk(L, na, nr, ctx, cont) \
+  lua_callk((L), (na), (nr), (ctx), cont ## _52)
+
+#define lua_yieldk(L, nr, ctx, cont) \
+  lua_yieldk((L), (nr), (ctx), cont ## _52)
+
+#ifdef lua_call
+#  undef lua_call
+#  define lua_call(L, na, nr) \
+  (lua_callk)((L), (na), (nr), 0, NULL)
+#endif
+
+#ifdef lua_pcall
+#  undef lua_pcall
+#  define lua_pcall(L, na, nr, err) \
+  (lua_pcallk)((L), (na), (nr), (err), 0, NULL)
+#endif
+
+#ifdef lua_yield
+#  undef lua_yield
+#  define lua_yield(L, nr) \
+  (lua_yieldk)((L), (nr), 0, NULL)
+#endif
+
+#endif /* Lua 5.2 only */
+
+/* other Lua versions */
+#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 501 || LUA_VERSION_NUM > 504
+
+#  error "unsupported Lua version (i.e. not Lua 5.1, 5.2, 5.3, or 5.4)"
+
+#endif /* other Lua versions except 5.1, 5.2, 5.3, and 5.4 */
+
+/* helper macro for defining continuation functions (for every version
+* *except* Lua 5.2) */
+#ifndef LUA_KFUNCTION
+#define LUA_KFUNCTION(_name) \
+  static int (_name)(lua_State *L, int status, lua_KContext ctx)
+#endif
+
+#if defined(COMPAT53_INCLUDE_SOURCE) && COMPAT53_INCLUDE_SOURCE == 1
+// beginning of sol/compatibility/compat-5.3.c.h
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+
+/* don't compile it again if it already is included via compat53.h */
+#ifndef KEPLER_PROJECT_COMPAT53_C_
+#define KEPLER_PROJECT_COMPAT53_C_
+
+/* definitions for Lua 5.1 only */
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 501
+
+#ifndef COMPAT53_FOPEN_NO_LOCK
+#if defined(_MSC_VER)
+#define COMPAT53_FOPEN_NO_LOCK 1
+#else /* otherwise */
+#define COMPAT53_FOPEN_NO_LOCK 0
+#endif /* VC++ only so far */
+#endif /* No-lock fopen_s usage if possible */
+
+#if defined(_MSC_VER) && COMPAT53_FOPEN_NO_LOCK
+#include <share.h>
+#endif /* VC++ _fsopen for share-allowed file read */
+
+#ifndef COMPAT53_HAVE_STRERROR_R
+#if defined(__GLIBC__) || defined(_POSIX_VERSION) || defined(__APPLE__) || (!defined(__MINGW32__) && defined(__GNUC__) && (__GNUC__ < 6))
+#define COMPAT53_HAVE_STRERROR_R 1
+#else /* none of the defines matched: define to 0 */
+#define COMPAT53_HAVE_STRERROR_R 0
+#endif /* have strerror_r of some form */
+#endif /* strerror_r */
+
+#ifndef COMPAT53_HAVE_STRERROR_S
+#if defined(_MSC_VER) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || (defined(__STDC_LIB_EXT1__) && __STDC_LIB_EXT1__)
+#define COMPAT53_HAVE_STRERROR_S 1
+#else /* not VC++ or C11 */
+#define COMPAT53_HAVE_STRERROR_S 0
+#endif /* strerror_s from VC++ or C11 */
+#endif /* strerror_s */
+
+#ifndef COMPAT53_LUA_FILE_BUFFER_SIZE
+#define COMPAT53_LUA_FILE_BUFFER_SIZE 4096
+#endif /* Lua File Buffer Size */
+
+static char* compat53_strerror(int en, char* buff, size_t sz) {
+#if COMPAT53_HAVE_STRERROR_R
+	/* use strerror_r here, because it's available on these specific platforms */
+	if (sz > 0) {
+		buff[0] = '\0';
+		/* we don't care whether the GNU version or the XSI version is used: */
+		if (strerror_r(en, buff, sz)) {
+			/* Yes, we really DO want to ignore the return value!
+			 * GCC makes that extra hard, not even a (void) cast will do. */
+		}
+		if (buff[0] == '\0') {
+			/* Buffer is unchanged, so we probably have called GNU strerror_r which
+			 * returned a static constant string. Chances are that strerror will
+			 * return the same static constant string and therefore be thread-safe. */
+			return strerror(en);
+		}
+	}
+	return buff; /* sz is 0 *or* strerror_r wrote into the buffer */
+#elif COMPAT53_HAVE_STRERROR_S
+	/* for MSVC and other C11 implementations, use strerror_s since it's
+	 * provided by default by the libraries */
+	strerror_s(buff, sz, en);
+	return buff;
+#else
+	/* fallback, but strerror is not guaranteed to be threadsafe due to modifying
+	 * errno itself and some impls not locking a static buffer for it ... but most
+	 * known systems have threadsafe errno: this might only change if the locale
+	 * is changed out from under someone while this function is being called */
+	(void)buff;
+	(void)sz;
+	return strerror(en);
+#endif
+}
+
+COMPAT53_API int lua_absindex(lua_State* L, int i) {
+	if (i < 0 && i > LUA_REGISTRYINDEX)
+		i += lua_gettop(L) + 1;
+	return i;
+}
+
+static void compat53_call_lua(lua_State* L, char const code[], size_t len, int nargs, int nret) {
+	lua_rawgetp(L, LUA_REGISTRYINDEX, (void*)code);
+	if (lua_type(L, -1) != LUA_TFUNCTION) {
+		lua_pop(L, 1);
+		if (luaL_loadbuffer(L, code, len, "=none"))
+			lua_error(L);
+		lua_pushvalue(L, -1);
+		lua_rawsetp(L, LUA_REGISTRYINDEX, (void*)code);
+	}
+	lua_insert(L, -nargs - 1);
+	lua_call(L, nargs, nret);
+}
+
+COMPAT53_API void lua_arith(lua_State* L, int op) {
+	static const char compat53_arith_code[]
+	     = "local op,a,b=...\n"
+	       "if op==0 then return a+b\n"
+	       "elseif op==1 then return a-b\n"
+	       "elseif op==2 then return a*b\n"
+	       "elseif op==3 then return a/b\n"
+	       "elseif op==4 then return a%b\n"
+	       "elseif op==5 then return a^b\n"
+	       "elseif op==6 then return -a\n"
+	       "end\n";
+
+	if (op < LUA_OPADD || op > LUA_OPUNM)
+		luaL_error(L, "invalid 'op' argument for lua_arith");
+	luaL_checkstack(L, 5, "not enough stack slots");
+	if (op == LUA_OPUNM)
+		lua_pushvalue(L, -1);
+	lua_pushnumber(L, op);
+	lua_insert(L, -3);
+	compat53_call_lua(L, compat53_arith_code, sizeof(compat53_arith_code) - 1, 3, 1);
+}
+
+COMPAT53_API int lua_compare(lua_State* L, int idx1, int idx2, int op) {
+	static const char compat53_compare_code[]
+	     = "local a,b=...\n"
+	       "return a<=b\n";
+
+	int result = 0;
+	switch (op) {
+	case LUA_OPEQ:
+		return lua_equal(L, idx1, idx2);
+	case LUA_OPLT:
+		return lua_lessthan(L, idx1, idx2);
+	case LUA_OPLE:
+		luaL_checkstack(L, 5, "not enough stack slots");
+		idx1 = lua_absindex(L, idx1);
+		idx2 = lua_absindex(L, idx2);
+		lua_pushvalue(L, idx1);
+		lua_pushvalue(L, idx2);
+		compat53_call_lua(L, compat53_compare_code, sizeof(compat53_compare_code) - 1, 2, 1);
+		result = lua_toboolean(L, -1);
+		lua_pop(L, 1);
+		return result;
+	default:
+		luaL_error(L, "invalid 'op' argument for lua_compare");
+	}
+	return 0;
+}
+
+COMPAT53_API void lua_copy(lua_State* L, int from, int to) {
+	int abs_to = lua_absindex(L, to);
+	luaL_checkstack(L, 1, "not enough stack slots");
+	lua_pushvalue(L, from);
+	lua_replace(L, abs_to);
+}
+
+COMPAT53_API void lua_len(lua_State* L, int i) {
+	switch (lua_type(L, i)) {
+	case LUA_TSTRING:
+		lua_pushnumber(L, (lua_Number)lua_objlen(L, i));
+		break;
+	case LUA_TTABLE:
+		if (!luaL_callmeta(L, i, "__len"))
+			lua_pushnumber(L, (lua_Number)lua_objlen(L, i));
+		break;
+	case LUA_TUSERDATA:
+		if (luaL_callmeta(L, i, "__len"))
+			break;
+		/* FALLTHROUGH */
+	default:
+		luaL_error(L, "attempt to get length of a %s value", lua_typename(L, lua_type(L, i)));
+	}
+}
+
+COMPAT53_API int lua_rawgetp(lua_State* L, int i, const void* p) {
+	int abs_i = lua_absindex(L, i);
+	lua_pushlightuserdata(L, (void*)p);
+	lua_rawget(L, abs_i);
+	return lua_type(L, -1);
+}
+
+COMPAT53_API void lua_rawsetp(lua_State* L, int i, const void* p) {
+	int abs_i = lua_absindex(L, i);
+	luaL_checkstack(L, 1, "not enough stack slots");
+	lua_pushlightuserdata(L, (void*)p);
+	lua_insert(L, -2);
+	lua_rawset(L, abs_i);
+}
+
+COMPAT53_API lua_Number lua_tonumberx(lua_State* L, int i, int* isnum) {
+	lua_Number n = lua_tonumber(L, i);
+	if (isnum != NULL) {
+		*isnum = (n != 0 || lua_isnumber(L, i));
+	}
+	return n;
+}
+
+COMPAT53_API void luaL_checkversion(lua_State* L) {
+	(void)L;
+}
+
+COMPAT53_API void luaL_checkstack(lua_State* L, int sp, const char* msg) {
+	if (!lua_checkstack(L, sp + LUA_MINSTACK)) {
+		if (msg != NULL)
+			luaL_error(L, "stack overflow (%s)", msg);
+		else {
+			lua_pushliteral(L, "stack overflow");
+			lua_error(L);
+		}
+	}
+}
+
+COMPAT53_API int luaL_getsubtable(lua_State* L, int i, const char* name) {
+	int abs_i = lua_absindex(L, i);
+	luaL_checkstack(L, 3, "not enough stack slots");
+	lua_pushstring(L, name);
+	lua_gettable(L, abs_i);
+	if (lua_istable(L, -1))
+		return 1;
+	lua_pop(L, 1);
+	lua_newtable(L);
+	lua_pushstring(L, name);
+	lua_pushvalue(L, -2);
+	lua_settable(L, abs_i);
+	return 0;
+}
+
+COMPAT53_API lua_Integer luaL_len(lua_State* L, int i) {
+	lua_Integer res = 0;
+	int isnum = 0;
+	luaL_checkstack(L, 1, "not enough stack slots");
+	lua_len(L, i);
+	res = lua_tointegerx(L, -1, &isnum);
+	lua_pop(L, 1);
+	if (!isnum)
+		luaL_error(L, "object length is not an integer");
+	return res;
+}
+
+COMPAT53_API void luaL_setfuncs(lua_State* L, const luaL_Reg* l, int nup) {
+	luaL_checkstack(L, nup + 1, "too many upvalues");
+	for (; l->name != NULL; l++) { /* fill the table with given functions */
+		int i;
+		lua_pushstring(L, l->name);
+		for (i = 0; i < nup; i++) /* copy upvalues to the top */
+			lua_pushvalue(L, -(nup + 1));
+		lua_pushcclosure(L, l->func, nup); /* closure with those upvalues */
+		lua_settable(L, -(nup + 3));       /* table must be below the upvalues, the name and the closure */
+	}
+	lua_pop(L, nup); /* remove upvalues */
+}
+
+COMPAT53_API void luaL_setmetatable(lua_State* L, const char* tname) {
+	luaL_checkstack(L, 1, "not enough stack slots");
+	luaL_getmetatable(L, tname);
+	lua_setmetatable(L, -2);
+}
+
+COMPAT53_API void* luaL_testudata(lua_State* L, int i, const char* tname) {
+	void* p = lua_touserdata(L, i);
+	luaL_checkstack(L, 2, "not enough stack slots");
+	if (p == NULL || !lua_getmetatable(L, i))
+		return NULL;
+	else {
+		int res = 0;
+		luaL_getmetatable(L, tname);
+		res = lua_rawequal(L, -1, -2);
+		lua_pop(L, 2);
+		if (!res)
+			p = NULL;
+	}
+	return p;
+}
+
+static int compat53_countlevels(lua_State* L) {
+	lua_Debug ar;
+	int li = 1, le = 1;
+	/* find an upper bound */
+	while (lua_getstack(L, le, &ar)) {
+		li = le;
+		le *= 2;
+	}
+	/* do a binary search */
+	while (li < le) {
+		int m = (li + le) / 2;
+		if (lua_getstack(L, m, &ar))
+			li = m + 1;
+		else
+			le = m;
+	}
+	return le - 1;
+}
+
+static int compat53_findfield(lua_State* L, int objidx, int level) {
+	if (level == 0 || !lua_istable(L, -1))
+		return 0;                               /* not found */
+	lua_pushnil(L);                              /* start 'next' loop */
+	while (lua_next(L, -2)) {                    /* for each pair in table */
+		if (lua_type(L, -2) == LUA_TSTRING) {   /* ignore non-string keys */
+			if (lua_rawequal(L, objidx, -1)) { /* found object? */
+				lua_pop(L, 1);                /* remove value (but keep name) */
+				return 1;
+			}
+			else if (compat53_findfield(L, objidx, level - 1)) { /* try recursively */
+				lua_remove(L, -2);                              /* remove table (but keep name) */
+				lua_pushliteral(L, ".");
+				lua_insert(L, -2); /* place '.' between the two names */
+				lua_concat(L, 3);
+				return 1;
+			}
+		}
+		lua_pop(L, 1); /* remove value */
+	}
+	return 0; /* not found */
+}
+
+static int compat53_pushglobalfuncname(lua_State* L, lua_Debug* ar) {
+	int top = lua_gettop(L);
+	lua_getinfo(L, "f", ar); /* push function */
+	lua_pushvalue(L, LUA_GLOBALSINDEX);
+	if (compat53_findfield(L, top + 1, 2)) {
+		lua_copy(L, -1, top + 1); /* move name to proper place */
+		lua_pop(L, 2);            /* remove pushed values */
+		return 1;
+	}
+	else {
+		lua_settop(L, top); /* remove function and global table */
+		return 0;
+	}
+}
+
+static void compat53_pushfuncname(lua_State* L, lua_Debug* ar) {
+	if (*ar->namewhat != '\0') /* is there a name? */
+		lua_pushfstring(L, "function " LUA_QS, ar->name);
+	else if (*ar->what == 'm') /* main? */
+		lua_pushliteral(L, "main chunk");
+	else if (*ar->what == 'C') {
+		if (compat53_pushglobalfuncname(L, ar)) {
+			lua_pushfstring(L, "function " LUA_QS, lua_tostring(L, -1));
+			lua_remove(L, -2); /* remove name */
+		}
+		else
+			lua_pushliteral(L, "?");
+	}
+	else
+		lua_pushfstring(L, "function <%s:%d>", ar->short_src, ar->linedefined);
+}
+
+#define COMPAT53_LEVELS1 12 /* size of the first part of the stack */
+#define COMPAT53_LEVELS2 10 /* size of the second part of the stack */
+
+COMPAT53_API void luaL_traceback(lua_State* L, lua_State* L1, const char* msg, int level) {
+	lua_Debug ar;
+	int top = lua_gettop(L);
+	int numlevels = compat53_countlevels(L1);
+	int mark = (numlevels > COMPAT53_LEVELS1 + COMPAT53_LEVELS2) ? COMPAT53_LEVELS1 : 0;
+	if (msg)
+		lua_pushfstring(L, "%s\n", msg);
+	lua_pushliteral(L, "stack traceback:");
+	while (lua_getstack(L1, level++, &ar)) {
+		if (level == mark) {                       /* too many levels? */
+			lua_pushliteral(L, "\n\t...");        /* add a '...' */
+			level = numlevels - COMPAT53_LEVELS2; /* and skip to last ones */
+		}
+		else {
+			lua_getinfo(L1, "Slnt", &ar);
+			lua_pushfstring(L, "\n\t%s:", ar.short_src);
+			if (ar.currentline > 0)
+				lua_pushfstring(L, "%d:", ar.currentline);
+			lua_pushliteral(L, " in ");
+			compat53_pushfuncname(L, &ar);
+			lua_concat(L, lua_gettop(L) - top);
+		}
+	}
+	lua_concat(L, lua_gettop(L) - top);
+}
+
+COMPAT53_API int luaL_fileresult(lua_State* L, int stat, const char* fname) {
+	const char* serr = NULL;
+	int en = errno; /* calls to Lua API may change this value */
+	char buf[512] = { 0 };
+	if (stat) {
+		lua_pushboolean(L, 1);
+		return 1;
+	}
+	else {
+		lua_pushnil(L);
+		serr = compat53_strerror(en, buf, sizeof(buf));
+		if (fname)
+			lua_pushfstring(L, "%s: %s", fname, serr);
+		else
+			lua_pushstring(L, serr);
+		lua_pushnumber(L, (lua_Number)en);
+		return 3;
+	}
+}
+
+static int compat53_checkmode(lua_State* L, const char* mode, const char* modename, int err) {
+	if (mode && strchr(mode, modename[0]) == NULL) {
+		lua_pushfstring(L, "attempt to load a %s chunk (mode is '%s')", modename, mode);
+		return err;
+	}
+	return LUA_OK;
+}
+
+typedef struct {
+	lua_Reader reader;
+	void* ud;
+	int has_peeked_data;
+	const char* peeked_data;
+	size_t peeked_data_size;
+} compat53_reader_data;
+
+static const char* compat53_reader(lua_State* L, void* ud, size_t* size) {
+	compat53_reader_data* data = (compat53_reader_data*)ud;
+	if (data->has_peeked_data) {
+		data->has_peeked_data = 0;
+		*size = data->peeked_data_size;
+		return data->peeked_data;
+	}
+	else
+		return data->reader(L, data->ud, size);
+}
+
+COMPAT53_API int lua_load(lua_State* L, lua_Reader reader, void* data, const char* source, const char* mode) {
+	int status = LUA_OK;
+	compat53_reader_data compat53_data = { reader, data, 1, 0, 0 };
+	compat53_data.peeked_data = reader(L, data, &(compat53_data.peeked_data_size));
+	if (compat53_data.peeked_data && compat53_data.peeked_data_size && compat53_data.peeked_data[0] == LUA_SIGNATURE[0]) /* binary file? */
+		status = compat53_checkmode(L, mode, "binary", LUA_ERRSYNTAX);
+	else
+		status = compat53_checkmode(L, mode, "text", LUA_ERRSYNTAX);
+	if (status != LUA_OK)
+		return status;
+		/* we need to call the original 5.1 version of lua_load! */
+#undef lua_load
+	return lua_load(L, compat53_reader, &compat53_data, source);
+#define lua_load COMPAT53_CONCAT(COMPAT53_PREFIX, _load_53)
+}
+
+typedef struct {
+	int n;                                    /* number of pre-read characters */
+	FILE* f;                                  /* file being read */
+	char buff[COMPAT53_LUA_FILE_BUFFER_SIZE]; /* area for reading file */
+} compat53_LoadF;
+
+static const char* compat53_getF(lua_State* L, void* ud, size_t* size) {
+	compat53_LoadF* lf = (compat53_LoadF*)ud;
+	(void)L;            /* not used */
+	if (lf->n > 0) {    /* are there pre-read characters to be read? */
+		*size = lf->n; /* return them (chars already in buffer) */
+		lf->n = 0;     /* no more pre-read characters */
+	}
+	else { /* read a block from file */
+		  /* 'fread' can return > 0 *and* set the EOF flag. If next call to
+		  'compat53_getF' called 'fread', it might still wait for user input.
+		  The next check avoids this problem. */
+		if (feof(lf->f))
+			return NULL;
+		*size = fread(lf->buff, 1, sizeof(lf->buff), lf->f); /* read block */
+	}
+	return lf->buff;
+}
+
+static int compat53_errfile(lua_State* L, const char* what, int fnameindex) {
+	char buf[512] = { 0 };
+	const char* serr = compat53_strerror(errno, buf, sizeof(buf));
+	const char* filename = lua_tostring(L, fnameindex) + 1;
+	lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr);
+	lua_remove(L, fnameindex);
+	return LUA_ERRFILE;
+}
+
+static int compat53_skipBOM(compat53_LoadF* lf) {
+	const char* p = "\xEF\xBB\xBF"; /* UTF-8 BOM mark */
+	int c;
+	lf->n = 0;
+	do {
+		c = getc(lf->f);
+		if (c == EOF || c != *(const unsigned char*)p++)
+			return c;
+		lf->buff[lf->n++] = (char)c; /* to be read by the parser */
+	} while (*p != '\0');
+	lf->n = 0;          /* prefix matched; discard it */
+	return getc(lf->f); /* return next character */
+}
+
+/*
+** reads the first character of file 'f' and skips an optional BOM mark
+** in its beginning plus its first line if it starts with '#'. Returns
+** true if it skipped the first line.  In any case, '*cp' has the
+** first "valid" character of the file (after the optional BOM and
+** a first-line comment).
+*/
+static int compat53_skipcomment(compat53_LoadF* lf, int* cp) {
+	int c = *cp = compat53_skipBOM(lf);
+	if (c == '#') { /* first line is a comment (Unix exec. file)? */
+		do {       /* skip first line */
+			c = getc(lf->f);
+		} while (c != EOF && c != '\n');
+		*cp = getc(lf->f); /* skip end-of-line, if present */
+		return 1;          /* there was a comment */
+	}
+	else
+		return 0; /* no comment */
+}
+
+COMPAT53_API int luaL_loadfilex(lua_State* L, const char* filename, const char* mode) {
+	compat53_LoadF lf;
+	int status, readstatus;
+	int c;
+	int fnameindex = lua_gettop(L) + 1; /* index of filename on the stack */
+	if (filename == NULL) {
+		lua_pushliteral(L, "=stdin");
+		lf.f = stdin;
+	}
+	else {
+		lua_pushfstring(L, "@%s", filename);
+#if defined(_MSC_VER)
+		/* This code is here to stop a deprecation error that stops builds
+		 * if a certain macro is defined. While normally not caring would
+		 * be best, some header-only libraries and builds can't afford to
+		 * dictate this to the user. A quick check shows that fopen_s this
+		 * goes back to VS 2005, and _fsopen goes back to VS 2003 .NET,
+		 * possibly even before that so we don't need to do any version
+		 * number checks, since this has been there since forever.  */
+
+		/* TO USER: if you want the behavior of typical fopen_s/fopen,
+		 * which does lock the file on VC++, define the macro used below to 0 */
+#if COMPAT53_FOPEN_NO_LOCK
+		lf.f = _fsopen(filename, "r", _SH_DENYNO); /* do not lock the file in any way */
+		if (lf.f == NULL)
+			return compat53_errfile(L, "open", fnameindex);
+#else  /* use default locking version */
+		if (fopen_s(&lf.f, filename, "r") != 0)
+			return compat53_errfile(L, "open", fnameindex);
+#endif /* Locking vs. No-locking fopen variants */
+#else
+		lf.f = fopen(filename, "r"); /* default stdlib doesn't forcefully lock files here */
+		if (lf.f == NULL)
+			return compat53_errfile(L, "open", fnameindex);
+#endif
+	}
+	if (compat53_skipcomment(&lf, &c))       /* read initial portion */
+		lf.buff[lf.n++] = '\n';             /* add line to correct line numbers */
+	if (c == LUA_SIGNATURE[0] && filename) { /* binary file? */
+#if defined(_MSC_VER)
+		if (freopen_s(&lf.f, filename, "rb", lf.f) != 0)
+			return compat53_errfile(L, "reopen", fnameindex);
+#else
+		lf.f = freopen(filename, "rb", lf.f); /* reopen in binary mode */
+		if (lf.f == NULL)
+			return compat53_errfile(L, "reopen", fnameindex);
+#endif
+		compat53_skipcomment(&lf, &c); /* re-read initial portion */
+	}
+	if (c != EOF)
+		lf.buff[lf.n++] = (char)c; /* 'c' is the first character of the stream */
+	status = lua_load(L, &compat53_getF, &lf, lua_tostring(L, -1), mode);
+	readstatus = ferror(lf.f);
+	if (filename)
+		fclose(lf.f); /* close file (even in case of errors) */
+	if (readstatus) {
+		lua_settop(L, fnameindex); /* ignore results from 'lua_load' */
+		return compat53_errfile(L, "read", fnameindex);
+	}
+	lua_remove(L, fnameindex);
+	return status;
+}
+
+COMPAT53_API int luaL_loadbufferx(lua_State* L, const char* buff, size_t sz, const char* name, const char* mode) {
+	int status = LUA_OK;
+	if (sz > 0 && buff[0] == LUA_SIGNATURE[0]) {
+		status = compat53_checkmode(L, mode, "binary", LUA_ERRSYNTAX);
+	}
+	else {
+		status = compat53_checkmode(L, mode, "text", LUA_ERRSYNTAX);
+	}
+	if (status != LUA_OK)
+		return status;
+	return luaL_loadbuffer(L, buff, sz, name);
+}
+
+#if !defined(l_inspectstat) \
+     && (defined(unix) || defined(__unix) || defined(__unix__) || defined(__TOS_AIX__) || defined(_SYSTYPE_BSD) || (defined(__APPLE__) && defined(__MACH__)))
+/* some form of unix; check feature macros in unistd.h for details */
+#include <unistd.h>
+/* check posix version; the relevant include files and macros probably
+ * were available before 2001, but I'm not sure */
+#if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L
+#include <sys/wait.h>
+#define l_inspectstat(stat, what)   \
+	if (WIFEXITED(stat)) {         \
+		stat = WEXITSTATUS(stat); \
+	}                              \
+	else if (WIFSIGNALED(stat)) {  \
+		stat = WTERMSIG(stat);    \
+		what = "signal";          \
+	}
+#endif
+#endif
+
+/* provide default (no-op) version */
+#if !defined(l_inspectstat)
+#define l_inspectstat(stat, what) ((void)0)
+#endif
+
+COMPAT53_API int luaL_execresult(lua_State* L, int stat) {
+	const char* what = "exit";
+	if (stat == -1)
+		return luaL_fileresult(L, 0, NULL);
+	else {
+		l_inspectstat(stat, what);
+		if (*what == 'e' && stat == 0)
+			lua_pushboolean(L, 1);
+		else
+			lua_pushnil(L);
+		lua_pushstring(L, what);
+		lua_pushinteger(L, stat);
+		return 3;
+	}
+}
+
+COMPAT53_API void luaL_buffinit(lua_State* L, luaL_Buffer_53* B) {
+	/* make it crash if used via pointer to a 5.1-style luaL_Buffer */
+	B->b.p = NULL;
+	B->b.L = NULL;
+	B->b.lvl = 0;
+	/* reuse the buffer from the 5.1-style luaL_Buffer though! */
+	B->ptr = B->b.buffer;
+	B->capacity = LUAL_BUFFERSIZE;
+	B->nelems = 0;
+	B->L2 = L;
+}
+
+COMPAT53_API char* luaL_prepbuffsize(luaL_Buffer_53* B, size_t s) {
+	if (B->capacity - B->nelems < s) { /* needs to grow */
+		char* newptr = NULL;
+		size_t newcap = B->capacity * 2;
+		if (newcap - B->nelems < s)
+			newcap = B->nelems + s;
+		if (newcap < B->capacity) /* overflow */
+			luaL_error(B->L2, "buffer too large");
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 504
+		newptr = (char*)lua_newuserdatauv(B->L2, newcap, 0);
+#else
+		newptr = (char*)lua_newuserdata(B->L2, newcap);
+#endif
+		memcpy(newptr, B->ptr, B->nelems);
+		if (B->ptr != B->b.buffer)
+			lua_replace(B->L2, -2); /* remove old buffer */
+		B->ptr = newptr;
+		B->capacity = newcap;
+	}
+	return B->ptr + B->nelems;
+}
+
+COMPAT53_API void luaL_addlstring(luaL_Buffer_53* B, const char* s, size_t l) {
+	memcpy(luaL_prepbuffsize(B, l), s, l);
+	luaL_addsize(B, l);
+}
+
+COMPAT53_API void luaL_addvalue(luaL_Buffer_53* B) {
+	size_t len = 0;
+	const char* s = lua_tolstring(B->L2, -1, &len);
+	if (!s)
+		luaL_error(B->L2, "cannot convert value to string");
+	if (B->ptr != B->b.buffer)
+		lua_insert(B->L2, -2); /* userdata buffer must be at stack top */
+	luaL_addlstring(B, s, len);
+	lua_remove(B->L2, B->ptr != B->b.buffer ? -2 : -1);
+}
+
+void luaL_pushresult(luaL_Buffer_53* B) {
+	lua_pushlstring(B->L2, B->ptr, B->nelems);
+	if (B->ptr != B->b.buffer)
+		lua_replace(B->L2, -2); /* remove userdata buffer */
+}
+
+#endif /* Lua 5.1 */
+
+/* definitions for Lua 5.1 and Lua 5.2 */
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM <= 502
+
+COMPAT53_API int lua_geti(lua_State* L, int index, lua_Integer i) {
+	index = lua_absindex(L, index);
+	lua_pushinteger(L, i);
+	lua_gettable(L, index);
+	return lua_type(L, -1);
+}
+
+COMPAT53_API int lua_isinteger(lua_State* L, int index) {
+	if (lua_type(L, index) == LUA_TNUMBER) {
+		lua_Number n = lua_tonumber(L, index);
+		lua_Integer i = lua_tointeger(L, index);
+		if (i == n)
+			return 1;
+	}
+	return 0;
+}
+
+COMPAT53_API lua_Integer lua_tointegerx(lua_State* L, int i, int* isnum) {
+	int ok = 0;
+	lua_Number n = lua_tonumberx(L, i, &ok);
+	if (ok) {
+		if (n == (lua_Integer)n) {
+			if (isnum)
+				*isnum = 1;
+			return (lua_Integer)n;
+		}
+	}
+	if (isnum)
+		*isnum = 0;
+	return 0;
+}
+
+static void compat53_reverse(lua_State* L, int a, int b) {
+	for (; a < b; ++a, --b) {
+		lua_pushvalue(L, a);
+		lua_pushvalue(L, b);
+		lua_replace(L, a);
+		lua_replace(L, b);
+	}
+}
+
+COMPAT53_API void lua_rotate(lua_State* L, int idx, int n) {
+	int n_elems = 0;
+	idx = lua_absindex(L, idx);
+	n_elems = lua_gettop(L) - idx + 1;
+	if (n < 0)
+		n += n_elems;
+	if (n > 0 && n < n_elems) {
+		luaL_checkstack(L, 2, "not enough stack slots available");
+		n = n_elems - n;
+		compat53_reverse(L, idx, idx + n - 1);
+		compat53_reverse(L, idx + n, idx + n_elems - 1);
+		compat53_reverse(L, idx, idx + n_elems - 1);
+	}
+}
+
+COMPAT53_API void lua_seti(lua_State* L, int index, lua_Integer i) {
+	luaL_checkstack(L, 1, "not enough stack slots available");
+	index = lua_absindex(L, index);
+	lua_pushinteger(L, i);
+	lua_insert(L, -2);
+	lua_settable(L, index);
+}
+
+#if !defined(lua_str2number)
+#define lua_str2number(s, p) strtod((s), (p))
+#endif
+
+COMPAT53_API size_t lua_stringtonumber(lua_State* L, const char* s) {
+	char* endptr;
+	lua_Number n = lua_str2number(s, &endptr);
+	if (endptr != s) {
+		while (*endptr != '\0' && isspace((unsigned char)*endptr))
+			++endptr;
+		if (*endptr == '\0') {
+			lua_pushnumber(L, n);
+			return endptr - s + 1;
+		}
+	}
+	return 0;
+}
+
+COMPAT53_API const char* luaL_tolstring(lua_State* L, int idx, size_t* len) {
+	if (!luaL_callmeta(L, idx, "__tostring")) {
+		int t = lua_type(L, idx), tt = 0;
+		char const* name = NULL;
+		switch (t) {
+		case LUA_TNIL:
+			lua_pushliteral(L, "nil");
+			break;
+		case LUA_TSTRING:
+		case LUA_TNUMBER:
+			lua_pushvalue(L, idx);
+			break;
+		case LUA_TBOOLEAN:
+			if (lua_toboolean(L, idx))
+				lua_pushliteral(L, "true");
+			else
+				lua_pushliteral(L, "false");
+			break;
+		default:
+			tt = luaL_getmetafield(L, idx, "__name");
+			name = (tt == LUA_TSTRING) ? lua_tostring(L, -1) : lua_typename(L, t);
+			lua_pushfstring(L, "%s: %p", name, lua_topointer(L, idx));
+			if (tt != LUA_TNIL)
+				lua_replace(L, -2);
+			break;
+		}
+	}
+	else {
+		if (!lua_isstring(L, -1))
+			luaL_error(L, "'__tostring' must return a string");
+	}
+	return lua_tolstring(L, -1, len);
+}
+
+COMPAT53_API void luaL_requiref(lua_State* L, const char* modname, lua_CFunction openf, int glb) {
+	luaL_checkstack(L, 3, "not enough stack slots available");
+	luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED");
+	if (lua_getfield(L, -1, modname) == LUA_TNIL) {
+		lua_pop(L, 1);
+		lua_pushcfunction(L, openf);
+		lua_pushstring(L, modname);
+		lua_call(L, 1, 1);
+		lua_pushvalue(L, -1);
+		lua_setfield(L, -3, modname);
+	}
+	if (glb) {
+		lua_pushvalue(L, -1);
+		lua_setglobal(L, modname);
+	}
+	lua_replace(L, -2);
+}
+
+#endif /* Lua 5.1 and 5.2 */
+
+#endif /* KEPLER_PROJECT_COMPAT53_C_ */
+
+/*********************************************************************
+ * This file contains parts of Lua 5.2's and Lua 5.3's source code:
+ *
+ * Copyright (C) 1994-2014 Lua.org, PUC-Rio.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *********************************************************************/
+// end of sol/compatibility/compat-5.3.c.h
+
+#endif
+
+#endif /* KEPLER_PROJECT_COMPAT53_H_ */
+
+// end of sol/compatibility/compat-5.3.h
+
+// beginning of sol/compatibility/compat-5.4.h
+
+#ifndef NOT_KEPLER_PROJECT_COMPAT54_H_
+#define NOT_KEPLER_PROJECT_COMPAT54_H_
+
+#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
+extern "C" {
+#endif
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
+#if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
+}
+#endif
+
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 504
+
+#if !defined(LUA_ERRGCMM)
+/* So Lua 5.4 actually removes this, which breaks sol2...
+ man, this API is quite unstable...!
+*/
+#  define LUA_ERRGCMM (LUA_ERRERR + 2)
+#endif /* LUA_ERRGCMM define */
+
+#endif // Lua 5.4 only
+
+#endif // NOT_KEPLER_PROJECT_COMPAT54_H_// end of sol/compatibility/compat-5.4.h
+
+#endif
+
+// end of sol/compatibility.hpp
+
+#include <vector>
+#include <cstdint>
+#include <cstddef>
+
+namespace sol {
+
+	template <typename Allocator = std::allocator<std::byte>>
+	class basic_bytecode : private std::vector<std::byte, Allocator> {
+	private:
+		using base_t = std::vector<std::byte, Allocator>;
+
+	public:
+		using typename base_t::allocator_type;
+		using typename base_t::const_iterator;
+		using typename base_t::const_pointer;
+		using typename base_t::const_reference;
+		using typename base_t::const_reverse_iterator;
+		using typename base_t::difference_type;
+		using typename base_t::iterator;
+		using typename base_t::pointer;
+		using typename base_t::reference;
+		using typename base_t::reverse_iterator;
+		using typename base_t::size_type;
+		using typename base_t::value_type;
+
+		using base_t::base_t;
+		using base_t::operator=;
+
+		using base_t::data;
+		using base_t::empty;
+		using base_t::max_size;
+		using base_t::size;
+
+		using base_t::at;
+		using base_t::operator[];
+		using base_t::back;
+		using base_t::front;
+
+		using base_t::begin;
+		using base_t::cbegin;
+		using base_t::cend;
+		using base_t::end;
+
+		using base_t::crbegin;
+		using base_t::crend;
+		using base_t::rbegin;
+		using base_t::rend;
+
+		using base_t::get_allocator;
+		using base_t::swap;
+
+		using base_t::clear;
+		using base_t::emplace;
+		using base_t::emplace_back;
+		using base_t::erase;
+		using base_t::insert;
+		using base_t::pop_back;
+		using base_t::push_back;
+		using base_t::reserve;
+		using base_t::resize;
+		using base_t::shrink_to_fit;
+
+		string_view as_string_view() const {
+			return string_view(reinterpret_cast<const char*>(this->data()), this->size());
+		}
+	};
+
+	template <typename Container>
+	inline int basic_insert_dump_writer(lua_State*, const void* memory, size_t memory_size, void* userdata_pointer) {
+		using storage_t = Container;
+		const std::byte* p_code = static_cast<const std::byte*>(memory);
+		storage_t& bc = *static_cast<storage_t*>(userdata_pointer);
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+		bc.insert(bc.cend(), p_code, p_code + memory_size);
+#else
+		try {
+			bc.insert(bc.cend(), p_code, p_code + memory_size);
+		}
+		catch (...) {
+			return -1;
+		}
+#endif
+		return 0;
+	}
+
+	using bytecode = basic_bytecode<>;
+
+	constexpr inline auto bytecode_dump_writer = &basic_insert_dump_writer<bytecode>;
+
+} // namespace sol
+
+// end of sol/bytecode.hpp
+
+// beginning of sol/stack.hpp
+
+// beginning of sol/trampoline.hpp
+
+// beginning of sol/types.hpp
+
+// beginning of sol/error.hpp
+
+#include <stdexcept>
+#include <string>
+#include <array>
+
+namespace sol {
+	namespace detail {
+		struct direct_error_tag { };
+		const auto direct_error = direct_error_tag {};
+
+		struct error_result {
+			int results;
+			const char* format_string;
+			std::array<const char*, 4> argument_strings;
+
+			error_result() : results(0), format_string(nullptr) {
+			}
+
+			error_result(int results_) : results(results_), format_string(nullptr) {
+			}
+
+			error_result(const char* format_string_, const char* first_message_) : results(0), format_string(format_string_), argument_strings() {
+				argument_strings[0] = first_message_;
+			}
+		};
+
+		inline int handle_errors(lua_State* L, const error_result& er) {
+			if (er.format_string == nullptr) {
+				return er.results;
+			}
+			return luaL_error(L, er.format_string, er.argument_strings[0], er.argument_strings[1], er.argument_strings[2], er.argument_strings[3]);
+		}
+	} // namespace detail
+
+	class error : public std::runtime_error {
+	private:
+		// Because VC++ is upsetting, most of the time!
+		std::string what_reason;
+
+	public:
+		error(const std::string& str) : error(detail::direct_error, "lua: error: " + str) {
+		}
+		error(std::string&& str) : error(detail::direct_error, "lua: error: " + std::move(str)) {
+		}
+		error(detail::direct_error_tag, const std::string& str) : std::runtime_error(""), what_reason(str) {
+		}
+		error(detail::direct_error_tag, std::string&& str) : std::runtime_error(""), what_reason(std::move(str)) {
+		}
+
+		error(const error& e) = default;
+		error(error&& e) = default;
+		error& operator=(const error& e) = default;
+		error& operator=(error&& e) = default;
+
+		virtual const char* what() const noexcept override {
+			return what_reason.c_str();
+		}
+	};
+
+} // namespace sol
+
+// end of sol/error.hpp
+
+// beginning of sol/optional.hpp
+
+// beginning of sol/in_place.hpp
+
+#include <cstddef>
+#include <utility>
+
+namespace sol {
+
+	using in_place_t = std::in_place_t;
+	constexpr std::in_place_t in_place {};
+	constexpr std::in_place_t in_place_of {};
+
+	template <typename T>
+	using in_place_type_t = std::in_place_type_t<T>;
+	template <typename T>
+	constexpr std::in_place_type_t<T> in_place_type {};
+
+	template <size_t I>
+	using in_place_index_t = std::in_place_index_t<I>;
+	template <size_t I>
+	constexpr in_place_index_t<I> in_place_index {};
+
+} // namespace sol
+
+// end of sol/in_place.hpp
+
+#if SOL_IS_ON(SOL_USE_BOOST)
+#include <boost/optional.hpp>
+#else
+// beginning of sol/optional_implementation.hpp
+
+#define SOL_TL_OPTIONAL_VERSION_MAJOR 0
+#define SOL_TL_OPTIONAL_VERSION_MINOR 5
+
+#include <exception>
+#include <functional>
+#include <new>
+#include <type_traits>
+#include <utility>
+#include <cstdlib>
+#include <optional>
+
+#if (defined(_MSC_VER) && _MSC_VER == 1900)
+#define SOL_TL_OPTIONAL_MSVC2015
+#endif
+
+#if (defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ <= 9 && !defined(__clang__))
+#define SOL_TL_OPTIONAL_GCC49
+#endif
+
+#if (defined(__GNUC__) && __GNUC__ == 5 && __GNUC_MINOR__ <= 4 && !defined(__clang__))
+#define SOL_TL_OPTIONAL_GCC54
+#endif
+
+#if (defined(__GNUC__) && __GNUC__ == 5 && __GNUC_MINOR__ <= 5 && !defined(__clang__))
+#define SOL_TL_OPTIONAL_GCC55
+#endif
+
+#if (defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ <= 9 && !defined(__clang__))
+#define SOL_TL_OPTIONAL_NO_CONSTRR
+
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T) std::has_trivial_copy_constructor<T>::value
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_ASSIGNABLE(T) std::has_trivial_copy_assign<T>::value
+
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_DESTRUCTIBLE(T) std::is_trivially_destructible<T>::value
+
+#elif (defined(__GNUC__) && __GNUC__ < 8 && !defined(__clang__))
+#ifndef SOL_TL_GCC_LESS_8_TRIVIALLY_COPY_CONSTRUCTIBLE_MUTEX
+#define SOL_TL_GCC_LESS_8_TRIVIALLY_COPY_CONSTRUCTIBLE_MUTEX
+namespace sol { namespace detail {
+	template <class T>
+	struct is_trivially_copy_constructible : std::is_trivially_copy_constructible<T> { };
+#ifdef _GLIBCXX_VECTOR
+	template <class T, class A>
+	struct is_trivially_copy_constructible<std::vector<T, A>> : std::is_trivially_copy_constructible<T> { };
+#endif
+}} // namespace sol::detail
+#endif
+
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T) sol::detail::is_trivially_copy_constructible<T>::value
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_ASSIGNABLE(T) std::is_trivially_copy_assignable<T>::value
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_DESTRUCTIBLE(T) std::is_trivially_destructible<T>::value
+#else
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T) std::is_trivially_copy_constructible<T>::value
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_ASSIGNABLE(T) std::is_trivially_copy_assignable<T>::value
+#define SOL_TL_OPTIONAL_IS_TRIVIALLY_DESTRUCTIBLE(T) std::is_trivially_destructible<T>::value
+#endif
+
+#if __cplusplus > 201103L
+#define SOL_TL_OPTIONAL_CXX14
+#endif
+
+#if (__cplusplus == 201103L || defined(SOL_TL_OPTIONAL_MSVC2015) || defined(SOL_TL_OPTIONAL_GCC49))
+#define SOL_TL_OPTIONAL_11_CONSTEXPR
+#else
+   /// \exclude
+#define SOL_TL_OPTIONAL_11_CONSTEXPR constexpr
+#endif
+
+namespace sol {
+#ifndef SOL_TL_MONOSTATE_INPLACE_MUTEX
+#define SOL_TL_MONOSTATE_INPLACE_MUTEX
+	/// \brief Used to represent an optional with no data; essentially a bool
+	class monostate { };
+#endif
+
+	template <class T>
+	class optional;
+
+	/// \exclude
+	namespace detail {
+#ifndef SOL_TL_TRAITS_MUTEX
+#define SOL_TL_TRAITS_MUTEX
+		// C++14-style aliases for brevity
+		template <class T>
+		using remove_const_t = typename std::remove_const<T>::type;
+		template <class T>
+		using remove_reference_t = typename std::remove_reference<T>::type;
+		template <class T>
+		using decay_t = typename std::decay<T>::type;
+		template <bool E, class T = void>
+		using enable_if_t = typename std::enable_if<E, T>::type;
+		template <bool B, class T, class F>
+		using conditional_t = typename std::conditional<B, T, F>::type;
+
+		// std::conjunction from C++17
+		template <class...>
+		struct conjunction : std::true_type { };
+		template <class B>
+		struct conjunction<B> : B { };
+		template <class B, class... Bs>
+		struct conjunction<B, Bs...> : std::conditional<bool(B::value), conjunction<Bs...>, B>::type { };
+
+#if defined(_LIBCPP_VERSION) && __cplusplus == 201103L
+#define SOL_TL_OPTIONAL_LIBCXX_MEM_FN_WORKAROUND
+#endif
+
+#ifdef SOL_TL_OPTIONAL_LIBCXX_MEM_FN_WORKAROUND
+		template <class T>
+		struct is_pointer_to_non_const_member_func : std::false_type { };
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...)> : std::true_type { };
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...)&> : std::true_type { };
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) &&> : std::true_type { };
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) volatile> : std::true_type { };
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) volatile&> : std::true_type { };
+		template <class T, class Ret, class... Args>
+		struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) volatile&&> : std::true_type { };
+
+		template <class T>
+		struct is_const_or_const_ref : std::false_type { };
+		template <class T>
+		struct is_const_or_const_ref<T const&> : std::true_type { };
+		template <class T>
+		struct is_const_or_const_ref<T const> : std::true_type { };
+#endif
+
+		// std::invoke from C++17
+		// https://stackoverflow.com/questions/38288042/c11-14-invoke-workaround
+		template <typename Fn, typename... Args,
+#ifdef SOL_TL_OPTIONAL_LIBCXX_MEM_FN_WORKAROUND
+		     typename = enable_if_t<!(is_pointer_to_non_const_member_func<Fn>::value && is_const_or_const_ref<Args...>::value)>,
+#endif
+		     typename = enable_if_t<std::is_member_pointer<decay_t<Fn>>::value>, int = 0>
+		constexpr auto invoke(Fn&& f, Args&&... args) noexcept(noexcept(std::mem_fn(f)(std::forward<Args>(args)...)))
+		     -> decltype(std::mem_fn(f)(std::forward<Args>(args)...)) {
+			return std::mem_fn(f)(std::forward<Args>(args)...);
+		}
+
+		template <typename Fn, typename... Args, typename = enable_if_t<!std::is_member_pointer<decay_t<Fn>>::value>>
+		constexpr auto invoke(Fn&& f, Args&&... args) noexcept(noexcept(std::forward<Fn>(f)(std::forward<Args>(args)...)))
+		     -> decltype(std::forward<Fn>(f)(std::forward<Args>(args)...)) {
+			return std::forward<Fn>(f)(std::forward<Args>(args)...);
+		}
+
+		// std::invoke_result from C++17
+		template <class F, class, class... Us>
+		struct invoke_result_impl;
+
+		template <class F, class... Us>
+		struct invoke_result_impl<F, decltype(detail::invoke(std::declval<F>(), std::declval<Us>()...), void()), Us...> {
+			using type = decltype(detail::invoke(std::declval<F>(), std::declval<Us>()...));
+		};
+
+		template <class F, class... Us>
+		using invoke_result = invoke_result_impl<F, void, Us...>;
+
+		template <class F, class... Us>
+		using invoke_result_t = typename invoke_result<F, Us...>::type;
+#endif
+
+		// std::void_t from C++17
+		template <class...>
+		struct voider {
+			using type = void;
+		};
+		template <class... Ts>
+		using void_t = typename voider<Ts...>::type;
+
+		// Trait for checking if a type is a sol::optional
+		template <class T>
+		struct is_optional_impl : std::false_type { };
+		template <class T>
+		struct is_optional_impl<optional<T>> : std::true_type { };
+		template <class T>
+		using is_optional = is_optional_impl<decay_t<T>>;
+
+		// Change void to sol::monostate
+		template <class U>
+		using fixup_void = conditional_t<std::is_void<U>::value, monostate, U>;
+
+		template <class F, class U, class = invoke_result_t<F, U>>
+		using get_map_return = optional<fixup_void<invoke_result_t<F, U>>>;
+
+		// Check if invoking F for some Us returns void
+		template <class F, class = void, class... U>
+		struct returns_void_impl;
+		template <class F, class... U>
+		struct returns_void_impl<F, void_t<invoke_result_t<F, U...>>, U...> : std::is_void<invoke_result_t<F, U...>> { };
+		template <class F, class... U>
+		using returns_void = returns_void_impl<F, void, U...>;
+
+		template <class T, class... U>
+		using enable_if_ret_void = enable_if_t<returns_void<T&&, U...>::value>;
+
+		template <class T, class... U>
+		using disable_if_ret_void = enable_if_t<!returns_void<T&&, U...>::value>;
+
+		template <class T, class U>
+		using enable_forward_value = detail::enable_if_t<std::is_constructible<T, U&&>::value && !std::is_same<detail::decay_t<U>, in_place_t>::value
+		     && !std::is_same<optional<T>, detail::decay_t<U>>::value>;
+
+		template <class T, class U, class Other>
+		using enable_from_other = detail::enable_if_t<std::is_constructible<T, Other>::value && !std::is_constructible<T, optional<U>&>::value
+		     && !std::is_constructible<T, optional<U>&&>::value && !std::is_constructible<T, const optional<U>&>::value
+		     && !std::is_constructible<T, const optional<U>&&>::value && !std::is_convertible<optional<U>&, T>::value
+		     && !std::is_convertible<optional<U>&&, T>::value && !std::is_convertible<const optional<U>&, T>::value
+		     && !std::is_convertible<const optional<U>&&, T>::value>;
+
+		template <class T, class U>
+		using enable_assign_forward = detail::enable_if_t<!std::is_same<optional<T>, detail::decay_t<U>>::value
+		     && !detail::conjunction<std::is_scalar<T>, std::is_same<T, detail::decay_t<U>>>::value && std::is_constructible<T, U>::value
+		     && std::is_assignable<T&, U>::value>;
+
+		template <class T, class U, class Other>
+		using enable_assign_from_other = detail::enable_if_t<std::is_constructible<T, Other>::value && std::is_assignable<T&, Other>::value
+		     && !std::is_constructible<T, optional<U>&>::value && !std::is_constructible<T, optional<U>&&>::value
+		     && !std::is_constructible<T, const optional<U>&>::value && !std::is_constructible<T, const optional<U>&&>::value
+		     && !std::is_convertible<optional<U>&, T>::value && !std::is_convertible<optional<U>&&, T>::value
+		     && !std::is_convertible<const optional<U>&, T>::value && !std::is_convertible<const optional<U>&&, T>::value
+		     && !std::is_assignable<T&, optional<U>&>::value && !std::is_assignable<T&, optional<U>&&>::value
+		     && !std::is_assignable<T&, const optional<U>&>::value && !std::is_assignable<T&, const optional<U>&&>::value>;
+
+#ifdef _MSC_VER
+		// TODO make a version which works with MSVC
+		template <class T, class U = T>
+		struct is_swappable : std::true_type { };
+
+		template <class T, class U = T>
+		struct is_nothrow_swappable : std::true_type { };
+#else
+		// https://stackoverflow.com/questions/26744589/what-is-a-proper-way-to-implement-is-swappable-to-test-for-the-swappable-concept
+		namespace swap_adl_tests {
+			// if swap ADL finds this then it would call std::swap otherwise (same
+			// signature)
+			struct tag { };
+
+			template <class T>
+			tag swap(T&, T&);
+			template <class T, std::size_t N>
+			tag swap(T (&a)[N], T (&b)[N]);
+
+			// helper functions to test if an unqualified swap is possible, and if it
+			// becomes std::swap
+			template <class, class>
+			std::false_type can_swap(...) noexcept(false);
+			template <class T, class U, class = decltype(swap(std::declval<T&>(), std::declval<U&>()))>
+			std::true_type can_swap(int) noexcept(noexcept(swap(std::declval<T&>(), std::declval<U&>())));
+
+			template <class, class>
+			std::false_type uses_std(...);
+			template <class T, class U>
+			std::is_same<decltype(swap(std::declval<T&>(), std::declval<U&>())), tag> uses_std(int);
+
+			template <class T>
+			struct is_std_swap_noexcept
+			: std::integral_constant<bool, std::is_nothrow_move_constructible<T>::value && std::is_nothrow_move_assignable<T>::value> { };
+
+			template <class T, std::size_t N>
+			struct is_std_swap_noexcept<T[N]> : is_std_swap_noexcept<T> { };
+
+			template <class T, class U>
+			struct is_adl_swap_noexcept : std::integral_constant<bool, noexcept(can_swap<T, U>(0))> { };
+		} // namespace swap_adl_tests
+
+		template <class T, class U = T>
+		struct is_swappable : std::integral_constant<bool,
+		                           decltype(detail::swap_adl_tests::can_swap<T, U>(0))::value
+		                                && (!decltype(detail::swap_adl_tests::uses_std<T, U>(0))::value
+		                                     || (std::is_move_assignable<T>::value && std::is_move_constructible<T>::value))> { };
+
+		template <class T, std::size_t N>
+		struct is_swappable<T[N], T[N]> : std::integral_constant<bool,
+		                                       decltype(detail::swap_adl_tests::can_swap<T[N], T[N]>(0))::value
+		                                            && (!decltype(detail::swap_adl_tests::uses_std<T[N], T[N]>(0))::value || is_swappable<T, T>::value)> { };
+
+		template <class T, class U = T>
+		struct is_nothrow_swappable
+		: std::integral_constant<bool,
+		       is_swappable<T, U>::value
+		            && ((decltype(detail::swap_adl_tests::uses_std<T, U>(0))::value&& detail::swap_adl_tests::is_std_swap_noexcept<T>::value)
+		                 || (!decltype(detail::swap_adl_tests::uses_std<T, U>(0))::value&& detail::swap_adl_tests::is_adl_swap_noexcept<T, U>::value))> { };
+#endif
+
+		// The storage base manages the actual storage, and correctly propagates
+		// trivial destroyion from T. This case is for when T is not trivially
+		// destructible.
+		template <class T, bool = ::std::is_trivially_destructible<T>::value>
+		struct optional_storage_base {
+			SOL_TL_OPTIONAL_11_CONSTEXPR optional_storage_base() noexcept : m_dummy(), m_has_value(false) {
+			}
+
+			template <class... U>
+			SOL_TL_OPTIONAL_11_CONSTEXPR optional_storage_base(in_place_t, U&&... u) : m_value(std::forward<U>(u)...), m_has_value(true) {
+			}
+
+			~optional_storage_base() {
+				if (m_has_value) {
+					m_value.~T();
+					m_has_value = false;
+				}
+			}
+
+			struct dummy { };
+			union {
+				dummy m_dummy;
+				T m_value;
+			};
+
+			bool m_has_value;
+		};
+
+		// This case is for when T is trivially destructible.
+		template <class T>
+		struct optional_storage_base<T, true> {
+			SOL_TL_OPTIONAL_11_CONSTEXPR optional_storage_base() noexcept : m_dummy(), m_has_value(false) {
+			}
+
+			template <class... U>
+			SOL_TL_OPTIONAL_11_CONSTEXPR optional_storage_base(in_place_t, U&&... u) : m_value(std::forward<U>(u)...), m_has_value(true) {
+			}
+
+			// No destructor, so this class is trivially destructible
+
+			struct dummy { };
+			union {
+				dummy m_dummy;
+				T m_value;
+			};
+
+			bool m_has_value = false;
+		};
+
+		// This base class provides some handy member functions which can be used in
+		// further derived classes
+		template <class T>
+		struct optional_operations_base : optional_storage_base<T> {
+			using optional_storage_base<T>::optional_storage_base;
+
+			void hard_reset() noexcept {
+				get().~T();
+				this->m_has_value = false;
+			}
+
+			template <class... Args>
+			void construct(Args&&... args) noexcept {
+				new (std::addressof(this->m_value)) T(std::forward<Args>(args)...);
+				this->m_has_value = true;
+			}
+
+			template <class Opt>
+			void assign(Opt&& rhs) {
+				if (this->has_value()) {
+					if (rhs.has_value()) {
+						this->m_value = std::forward<Opt>(rhs).get();
+					}
+					else {
+						this->m_value.~T();
+						this->m_has_value = false;
+					}
+				}
+
+				else if (rhs.has_value()) {
+					construct(std::forward<Opt>(rhs).get());
+				}
+			}
+
+			bool has_value() const {
+				return this->m_has_value;
+			}
+
+			SOL_TL_OPTIONAL_11_CONSTEXPR T& get() & {
+				return this->m_value;
+			}
+			SOL_TL_OPTIONAL_11_CONSTEXPR const T& get() const& {
+				return this->m_value;
+			}
+			SOL_TL_OPTIONAL_11_CONSTEXPR T&& get() && {
+				return std::move(this->m_value);
+			}
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+			constexpr const T&& get() const&& {
+				return std::move(this->m_value);
+			}
+#endif
+		};
+
+		// This class manages conditionally having a trivial copy constructor
+		// This specialization is for when T is trivially copy constructible
+		template <class T, bool = SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T)>
+		struct optional_copy_base : optional_operations_base<T> {
+			using optional_operations_base<T>::optional_operations_base;
+		};
+
+		// This specialization is for when T is not trivially copy constructible
+		template <class T>
+		struct optional_copy_base<T, false> : optional_operations_base<T> {
+			using base_t = optional_operations_base<T>;
+
+			using base_t::base_t;
+
+			optional_copy_base() = default;
+			optional_copy_base(const optional_copy_base& rhs) : base_t() {
+				if (rhs.has_value()) {
+					this->construct(rhs.get());
+				}
+				else {
+					this->m_has_value = false;
+				}
+			}
+
+			optional_copy_base(optional_copy_base&& rhs) = default;
+			optional_copy_base& operator=(const optional_copy_base& rhs) = default;
+			optional_copy_base& operator=(optional_copy_base&& rhs) = default;
+		};
+
+#ifndef SOL_TL_OPTIONAL_GCC49
+		template <class T, bool = std::is_trivially_move_constructible<T>::value>
+		struct optional_move_base : optional_copy_base<T> {
+			using optional_copy_base<T>::optional_copy_base;
+		};
+#else
+		template <class T, bool = false>
+		struct optional_move_base;
+#endif
+		template <class T>
+		struct optional_move_base<T, false> : optional_copy_base<T> {
+			using optional_copy_base<T>::optional_copy_base;
+
+			optional_move_base() = default;
+			optional_move_base(const optional_move_base& rhs) = default;
+
+			optional_move_base(optional_move_base&& rhs) noexcept(std::is_nothrow_move_constructible<T>::value) {
+				if (rhs.has_value()) {
+					this->construct(std::move(rhs.get()));
+				}
+				else {
+					this->m_has_value = false;
+				}
+			}
+			optional_move_base& operator=(const optional_move_base& rhs) = default;
+			optional_move_base& operator=(optional_move_base&& rhs) = default;
+		};
+
+		// This class manages conditionally having a trivial copy assignment operator
+		template <class T,
+		     bool = SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_ASSIGNABLE(T) && SOL_TL_OPTIONAL_IS_TRIVIALLY_COPY_CONSTRUCTIBLE(T)
+		          && SOL_TL_OPTIONAL_IS_TRIVIALLY_DESTRUCTIBLE(T)>
+		struct optional_copy_assign_base : optional_move_base<T> {
+			using optional_move_base<T>::optional_move_base;
+		};
+
+		template <class T>
+		struct optional_copy_assign_base<T, false> : optional_move_base<T> {
+			using optional_move_base<T>::optional_move_base;
+
+			optional_copy_assign_base() = default;
+			optional_copy_assign_base(const optional_copy_assign_base& rhs) = default;
+
+			optional_copy_assign_base(optional_copy_assign_base&& rhs) = default;
+			optional_copy_assign_base& operator=(const optional_copy_assign_base& rhs) {
+				this->assign(rhs);
+				return *this;
+			}
+			optional_copy_assign_base& operator=(optional_copy_assign_base&& rhs) = default;
+		};
+
+#ifndef SOL_TL_OPTIONAL_GCC49
+		template <class T,
+		     bool = std::is_trivially_destructible<T>::value&& std::is_trivially_move_constructible<T>::value&& std::is_trivially_move_assignable<T>::value>
+		struct optional_move_assign_base : optional_copy_assign_base<T> {
+			using optional_copy_assign_base<T>::optional_copy_assign_base;
+		};
+#else
+		template <class T, bool = false>
+		struct optional_move_assign_base;
+#endif
+
+		template <class T>
+		struct optional_move_assign_base<T, false> : optional_copy_assign_base<T> {
+			using optional_copy_assign_base<T>::optional_copy_assign_base;
+
+			optional_move_assign_base() = default;
+			optional_move_assign_base(const optional_move_assign_base& rhs) = default;
+
+			optional_move_assign_base(optional_move_assign_base&& rhs) = default;
+
+			optional_move_assign_base& operator=(const optional_move_assign_base& rhs) = default;
+
+			optional_move_assign_base& operator=(optional_move_assign_base&& rhs) noexcept(
+			     std::is_nothrow_move_constructible<T>::value&& std::is_nothrow_move_assignable<T>::value) {
+				this->assign(std::move(rhs));
+				return *this;
+			}
+		};
+
+		// optional_delete_ctor_base will conditionally delete copy and move
+		// constructors depending on whether T is copy/move constructible
+		template <class T, bool EnableCopy = std::is_copy_constructible<T>::value, bool EnableMove = std::is_move_constructible<T>::value>
+		struct optional_delete_ctor_base {
+			optional_delete_ctor_base() = default;
+			optional_delete_ctor_base(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = default;
+			optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
+		};
+
+		template <class T>
+		struct optional_delete_ctor_base<T, true, false> {
+			optional_delete_ctor_base() = default;
+			optional_delete_ctor_base(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = delete;
+			optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
+		};
+
+		template <class T>
+		struct optional_delete_ctor_base<T, false, true> {
+			optional_delete_ctor_base() = default;
+			optional_delete_ctor_base(const optional_delete_ctor_base&) = delete;
+			optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = default;
+			optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
+		};
+
+		template <class T>
+		struct optional_delete_ctor_base<T, false, false> {
+			optional_delete_ctor_base() = default;
+			optional_delete_ctor_base(const optional_delete_ctor_base&) = delete;
+			optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = delete;
+			optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
+			optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
+		};
+
+		// optional_delete_assign_base will conditionally delete copy and move
+		// constructors depending on whether T is copy/move constructible + assignable
+		template <class T, bool EnableCopy = (std::is_copy_constructible<T>::value && std::is_copy_assignable<T>::value),
+		     bool EnableMove = (std::is_move_constructible<T>::value && std::is_move_assignable<T>::value)>
+		struct optional_delete_assign_base {
+			optional_delete_assign_base() = default;
+			optional_delete_assign_base(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
+			optional_delete_assign_base& operator=(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = default;
+		};
+
+		template <class T>
+		struct optional_delete_assign_base<T, true, false> {
+			optional_delete_assign_base() = default;
+			optional_delete_assign_base(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
+			optional_delete_assign_base& operator=(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = delete;
+		};
+
+		template <class T>
+		struct optional_delete_assign_base<T, false, true> {
+			optional_delete_assign_base() = default;
+			optional_delete_assign_base(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
+			optional_delete_assign_base& operator=(const optional_delete_assign_base&) = delete;
+			optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = default;
+		};
+
+		template <class T>
+		struct optional_delete_assign_base<T, false, false> {
+			optional_delete_assign_base() = default;
+			optional_delete_assign_base(const optional_delete_assign_base&) = default;
+			optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
+			optional_delete_assign_base& operator=(const optional_delete_assign_base&) = delete;
+			optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = delete;
+		};
+
+	} // namespace detail
+
+	/// \brief A tag type to represent an empty optional
+	using nullopt_t = std::nullopt_t;
+
+	/// \brief Represents an empty optional
+	/// \synopsis static constexpr nullopt_t nullopt;
+	///
+	/// *Examples*:
+	/// ```
+	/// sol::optional<int> a = sol::nullopt;
+	/// void foo (sol::optional<int>);
+	/// foo(sol::nullopt); //pass an empty optional
+	/// ```
+	using std::nullopt;
+
+	/// @brief An exception for when an optional is accessed through specific methods while it is not engaged.
+	class bad_optional_access : public std::exception {
+	public:
+		/// @brief Default-constructs an optional exception.
+		bad_optional_access() = default;
+		/// @brief Returns a pointer to a null-terminated string containing the reason for the exception.
+		const char* what() const noexcept override {
+			return "Optional has no value";
+		}
+	};
+
+	/// An optional object is an object that contains the storage for another
+	/// object and manages the lifetime of this contained object, if any. The
+	/// contained object may be initialized after the optional object has been
+	/// initialized, and may be destroyed before the optional object has been
+	/// destroyed. The initialization state of the contained object is tracked by
+	/// the optional object.
+	template <class T>
+	class optional : private detail::optional_move_assign_base<T>,
+	                 private detail::optional_delete_ctor_base<T>,
+	                 private detail::optional_delete_assign_base<T> {
+		using base = detail::optional_move_assign_base<T>;
+
+		static_assert(!std::is_same<T, in_place_t>::value, "instantiation of optional with in_place_t is ill-formed");
+		static_assert(!std::is_same<detail::decay_t<T>, nullopt_t>::value, "instantiation of optional with nullopt_t is ill-formed");
+
+	public:
+#if defined(SOL_TL_OPTIONAL_CXX14) && !defined(SOL_TL_OPTIONAL_GCC49) && !defined(SOL_TL_OPTIONAL_GCC54) && !defined(SOL_TL_OPTIONAL_GCC55)
+		/// \group and_then
+		/// Carries out some operation which returns an optional on the stored
+		/// object if there is one. \requires `std::invoke(std::forward<F>(f),
+		/// value())` returns a `std::optional<U>` for some `U`. \returns Let `U` be
+		/// the result of `std::invoke(std::forward<F>(f), value())`. Returns a
+		/// `std::optional<U>`. The return value is empty if `*this` is empty,
+		/// otherwise the return value of `std::invoke(std::forward<F>(f), value())`
+		/// is returned.
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto and_then(F&& f) & {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto and_then(F&& f) && {
+			using result = detail::invoke_result_t<F, T&&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &;
+		template <class F>
+		constexpr auto and_then(F&& f) const& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &&;
+		template <class F>
+		constexpr auto and_then(F&& f) const&& {
+			using result = detail::invoke_result_t<F, const T&&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
+		}
+#endif
+#else
+		/// \group and_then
+		/// Carries out some operation which returns an optional on the stored
+		/// object if there is one. \requires `std::invoke(std::forward<F>(f),
+		/// value())` returns a `std::optional<U>` for some `U`.
+		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
+		/// value())`. Returns a `std::optional<U>`. The return value is empty if
+		/// `*this` is empty, otherwise the return value of
+		/// `std::invoke(std::forward<F>(f), value())` is returned.
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR detail::invoke_result_t<F, T&> and_then(F&& f) & {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR detail::invoke_result_t<F, T&&> and_then(F&& f) && {
+			using result = detail::invoke_result_t<F, T&&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &;
+		template <class F>
+		constexpr detail::invoke_result_t<F, const T&> and_then(F&& f) const& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &&;
+		template <class F>
+		constexpr detail::invoke_result_t<F, const T&&> and_then(F&& f) const&& {
+			using result = detail::invoke_result_t<F, const T&&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
+		}
+#endif
+#endif
+
+#if defined(SOL_TL_OPTIONAL_CXX14) && !defined(SOL_TL_OPTIONAL_GCC49) && !defined(SOL_TL_OPTIONAL_GCC54) && !defined(SOL_TL_OPTIONAL_GCC55)
+		/// \brief Carries out some operation on the stored object if there is one.
+		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
+		/// value())`. Returns a `std::optional<U>`. The return value is empty if
+		/// `*this` is empty, otherwise an `optional<U>` is constructed from the
+		/// return value of `std::invoke(std::forward<F>(f), value())` and is
+		/// returned.
+		///
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto map(F&& f) & {
+			return optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto map(F&& f) && {
+			return optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) const&;
+		template <class F>
+		constexpr auto map(F&& f) const& {
+			return optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) const&&;
+		template <class F>
+		constexpr auto map(F&& f) const&& {
+			return optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+#else
+		/// \brief Carries out some operation on the stored object if there is one.
+		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
+		/// value())`. Returns a `std::optional<U>`. The return value is empty if
+		/// `*this` is empty, otherwise an `optional<U>` is constructed from the
+		/// return value of `std::invoke(std::forward<F>(f), value())` and is
+		/// returned.
+		///
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR decltype(optional_map_impl(std::declval<optional&>(), std::declval<F&&>())) map(F&& f) & {
+			return optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR decltype(optional_map_impl(std::declval<optional&&>(), std::declval<F&&>())) map(F&& f) && {
+			return optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) const&;
+		template <class F>
+		constexpr decltype(optional_map_impl(std::declval<const optional&>(), std::declval<F&&>())) map(F&& f) const& {
+			return optional_map_impl(*this, std::forward<F>(f));
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) const&&;
+		template <class F>
+		constexpr decltype(optional_map_impl(std::declval<const optional&&>(), std::declval<F&&>())) map(F&& f) const&& {
+			return optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+#endif
+#endif
+
+		/// \brief Calls `f` if the optional is empty
+		/// \requires `std::invoke_result_t<F>` must be void or convertible to
+		/// `optional<T>`.
+		/// \effects If `*this` has a value, returns `*this`.
+		/// Otherwise, if `f` returns `void`, calls `std::forward<F>(f)` and returns
+		/// `std::nullopt`. Otherwise, returns `std::forward<F>(f)()`.
+		///
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) &;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) & {
+			if (has_value())
+				return *this;
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) & {
+			return has_value() ? *this : std::forward<F>(f)();
+		}
+
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) &&;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) && {
+			if (has_value())
+				return std::move(*this);
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) && {
+			return has_value() ? std::move(*this) : std::forward<F>(f)();
+		}
+
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) const &;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const& {
+			if (has_value())
+				return *this;
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) const& {
+			return has_value() ? *this : std::forward<F>(f)();
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \exclude
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const&& {
+			if (has_value())
+				return std::move(*this);
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const&& {
+			return has_value() ? std::move(*this) : std::forward<F>(f)();
+		}
+#endif
+
+		/// \brief Maps the stored value with `f` if there is one, otherwise returns
+		/// `u`.
+		///
+		/// \details If there is a value stored, then `f` is called with `**this`
+		/// and the value is returned. Otherwise `u` is returned.
+		///
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) & {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
+		}
+
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) && {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
+		}
+
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) const& {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) const&& {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
+		}
+#endif
+
+		/// \brief Maps the stored value with `f` if there is one, otherwise calls
+		/// `u` and returns the result.
+		///
+		/// \details If there is a value stored, then `f` is
+		/// called with `**this` and the value is returned. Otherwise
+		/// `std::forward<U>(u)()` is returned.
+		///
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u) &;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) & {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
+		}
+
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u)
+		/// &&;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) && {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
+		}
+
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u)
+		/// const &;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const& {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u)
+		/// const &&;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const&& {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
+		}
+#endif
+
+		/// \returns `u` if `*this` has a value, otherwise an empty optional.
+		template <class U>
+		constexpr optional<typename std::decay<U>::type> conjunction(U&& u) const {
+			using result = optional<detail::decay_t<U>>;
+			return has_value() ? result { u } : result { nullopt };
+		}
+
+		/// \returns `rhs` if `*this` is empty, otherwise the current value.
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(const optional& rhs) & {
+			return has_value() ? *this : rhs;
+		}
+
+		/// \group disjunction
+		constexpr optional disjunction(const optional& rhs) const& {
+			return has_value() ? *this : rhs;
+		}
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(const optional& rhs) && {
+			return has_value() ? std::move(*this) : rhs;
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group disjunction
+		constexpr optional disjunction(const optional& rhs) const&& {
+			return has_value() ? std::move(*this) : rhs;
+		}
+#endif
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(optional&& rhs) & {
+			return has_value() ? *this : std::move(rhs);
+		}
+
+		/// \group disjunction
+		constexpr optional disjunction(optional&& rhs) const& {
+			return has_value() ? *this : std::move(rhs);
+		}
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(optional&& rhs) && {
+			return has_value() ? std::move(*this) : std::move(rhs);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group disjunction
+		constexpr optional disjunction(optional&& rhs) const&& {
+			return has_value() ? std::move(*this) : std::move(rhs);
+		}
+#endif
+
+		/// Takes the value out of the optional, leaving it empty
+		/// \group take
+		optional take() & {
+			optional ret = *this;
+			reset();
+			return ret;
+		}
+
+		/// \group take
+		optional take() const& {
+			optional ret = *this;
+			reset();
+			return ret;
+		}
+
+		/// \group take
+		optional take() && {
+			optional ret = std::move(*this);
+			reset();
+			return ret;
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group take
+		optional take() const&& {
+			optional ret = std::move(*this);
+			reset();
+			return ret;
+		}
+#endif
+
+		using value_type = T;
+
+		/// Constructs an optional that does not contain a value.
+		/// \group ctor_empty
+		constexpr optional() noexcept = default;
+
+		/// \group ctor_empty
+		constexpr optional(nullopt_t) noexcept {
+		}
+
+		/// Copy constructor
+		///
+		/// If `rhs` contains a value, the stored value is direct-initialized with
+		/// it. Otherwise, the constructed optional is empty.
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional(const optional& rhs) = default;
+
+		/// Move constructor
+		///
+		/// If `rhs` contains a value, the stored value is direct-initialized with
+		/// it. Otherwise, the constructed optional is empty.
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional(optional&& rhs) = default;
+
+		/// Constructs the stored value in-place using the given arguments.
+		/// \group in_place
+		/// \synopsis template <class... Args> constexpr explicit optional(in_place_t, Args&&... args);
+		template <class... Args>
+		constexpr explicit optional(detail::enable_if_t<std::is_constructible<T, Args...>::value, in_place_t>, Args&&... args)
+		: base(in_place, std::forward<Args>(args)...) {
+		}
+
+		/// \group in_place
+		/// \synopsis template <class U, class... Args> \n constexpr explicit optional(in_place_t, std::initializer_list<U>&, Args&&... args);
+		template <class U, class... Args>
+		SOL_TL_OPTIONAL_11_CONSTEXPR explicit optional(detail::enable_if_t<std::is_constructible<T, std::initializer_list<U>&, Args&&...>::value, in_place_t>,
+		     std::initializer_list<U> il, Args&&... args) {
+			this->construct(il, std::forward<Args>(args)...);
+		}
+
+#if 0 // SOL_MODIFICATION
+      /// Constructs the stored value with `u`.
+      /// \synopsis template <class U=T> constexpr optional(U &&u);
+		template <class U = T, detail::enable_if_t<std::is_convertible<U&&, T>::value>* = nullptr, detail::enable_forward_value<T, U>* = nullptr>
+		constexpr optional(U&& u) : base(in_place, std::forward<U>(u)) {
+		}
+
+		/// \exclude
+		template <class U = T, detail::enable_if_t<!std::is_convertible<U&&, T>::value>* = nullptr, detail::enable_forward_value<T, U>* = nullptr>
+		constexpr explicit optional(U&& u) : base(in_place, std::forward<U>(u)) {
+		}
+#else
+		/// Constructs the stored value with `u`.
+		/// \synopsis template <class U=T> constexpr optional(U &&u);
+		constexpr optional(T&& u) : base(in_place, std::move(u)) {
+		}
+
+		/// \exclude
+		constexpr optional(const T& u) : base(in_place, u) {
+		}
+#endif // sol2 modification
+
+		/// Converting copy constructor.
+		/// \synopsis template <class U> optional(const optional<U> &rhs);
+		template <class U, detail::enable_from_other<T, U, const U&>* = nullptr, detail::enable_if_t<std::is_convertible<const U&, T>::value>* = nullptr>
+		optional(const optional<U>& rhs) {
+			if (rhs.has_value()) {
+				this->construct(*rhs);
+			}
+		}
+
+		/// \exclude
+		template <class U, detail::enable_from_other<T, U, const U&>* = nullptr, detail::enable_if_t<!std::is_convertible<const U&, T>::value>* = nullptr>
+		explicit optional(const optional<U>& rhs) {
+			if (rhs.has_value()) {
+				this->construct(*rhs);
+			}
+		}
+
+		/// Converting move constructor.
+		/// \synopsis template <class U> optional(optional<U> &&rhs);
+		template <class U, detail::enable_from_other<T, U, U&&>* = nullptr, detail::enable_if_t<std::is_convertible<U&&, T>::value>* = nullptr>
+		optional(optional<U>&& rhs) {
+			if (rhs.has_value()) {
+				this->construct(std::move(*rhs));
+			}
+		}
+
+		/// \exclude
+		template <class U, detail::enable_from_other<T, U, U&&>* = nullptr, detail::enable_if_t<!std::is_convertible<U&&, T>::value>* = nullptr>
+		explicit optional(optional<U>&& rhs) {
+			this->construct(std::move(*rhs));
+		}
+
+		/// Destroys the stored value if there is one.
+		~optional() = default;
+
+		/// Assignment to empty.
+		///
+		/// Destroys the current value if there is one.
+		optional& operator=(nullopt_t) noexcept {
+			if (has_value()) {
+				this->m_value.~T();
+				this->m_has_value = false;
+			}
+
+			return *this;
+		}
+
+		/// Copy assignment.
+		///
+		/// Copies the value from `rhs` if there is one. Otherwise resets the stored
+		/// value in `*this`.
+		optional& operator=(const optional& rhs) = default;
+
+		/// Move assignment.
+		///
+		/// Moves the value from `rhs` if there is one. Otherwise resets the stored
+		/// value in `*this`.
+		optional& operator=(optional&& rhs) = default;
+
+		/// Assigns the stored value from `u`, destroying the old value if there was
+		/// one.
+		/// \synopsis optional &operator=(U &&u);
+		template <class U = T, detail::enable_assign_forward<T, U>* = nullptr>
+		optional& operator=(U&& u) {
+			if (has_value()) {
+				this->m_value = std::forward<U>(u);
+			}
+			else {
+				this->construct(std::forward<U>(u));
+			}
+
+			return *this;
+		}
+
+		/// Converting copy assignment operator.
+		///
+		/// Copies the value from `rhs` if there is one. Otherwise resets the stored
+		/// value in `*this`.
+		/// \synopsis optional &operator=(const optional<U> & rhs);
+		template <class U, detail::enable_assign_from_other<T, U, const U&>* = nullptr>
+		optional& operator=(const optional<U>& rhs) {
+			if (has_value()) {
+				if (rhs.has_value()) {
+					this->m_value = *rhs;
+				}
+				else {
+					this->hard_reset();
+				}
+			}
+
+			if (rhs.has_value()) {
+				this->construct(*rhs);
+			}
+
+			return *this;
+		}
+
+		// TODO check exception guarantee
+		/// Converting move assignment operator.
+		///
+		/// Moves the value from `rhs` if there is one. Otherwise resets the stored
+		/// value in `*this`.
+		/// \synopsis optional &operator=(optional<U> && rhs);
+		template <class U, detail::enable_assign_from_other<T, U, U>* = nullptr>
+		optional& operator=(optional<U>&& rhs) {
+			if (has_value()) {
+				if (rhs.has_value()) {
+					this->m_value = std::move(*rhs);
+				}
+				else {
+					this->hard_reset();
+				}
+			}
+
+			if (rhs.has_value()) {
+				this->construct(std::move(*rhs));
+			}
+
+			return *this;
+		}
+
+		/// Constructs the value in-place, destroying the current one if there is
+		/// one.
+		/// \group emplace
+		template <class... Args>
+		T& emplace(Args&&... args) {
+			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
+
+			*this = nullopt;
+			this->construct(std::forward<Args>(args)...);
+			return value();
+		}
+
+		/// \group emplace
+		/// \synopsis template <class U, class... Args> \n T& emplace(std::initializer_list<U> il, Args &&... args);
+		template <class U, class... Args>
+		detail::enable_if_t<std::is_constructible<T, std::initializer_list<U>&, Args&&...>::value, T&> emplace(std::initializer_list<U> il, Args&&... args) {
+			*this = nullopt;
+			this->construct(il, std::forward<Args>(args)...);
+			return value();
+		}
+
+		/// Swaps this optional with the other.
+		///
+		/// If neither optionals have a value, nothing happens.
+		/// If both have a value, the values are swapped.
+		/// If one has a value, it is moved to the other and the movee is left
+		/// valueless.
+		void swap(optional& rhs) noexcept(std::is_nothrow_move_constructible<T>::value&& detail::is_nothrow_swappable<T>::value) {
+			if (has_value()) {
+				if (rhs.has_value()) {
+					using std::swap;
+					swap(**this, *rhs);
+				}
+				else {
+					new (std::addressof(rhs.m_value)) T(std::move(this->m_value));
+					this->m_value.T::~T();
+				}
+			}
+			else if (rhs.has_value()) {
+				new (std::addressof(this->m_value)) T(std::move(rhs.m_value));
+				rhs.m_value.T::~T();
+			}
+		}
+
+		/// \returns a pointer to the stored value
+		/// \requires a value is stored
+		/// \group pointer
+		/// \synopsis constexpr const T *operator->() const;
+		constexpr const T* operator->() const {
+			return std::addressof(this->m_value);
+		}
+
+		/// \group pointer
+		/// \synopsis constexpr T *operator->();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T* operator->() {
+			return std::addressof(this->m_value);
+		}
+
+		/// \returns the stored value
+		/// \requires a value is stored
+		/// \group deref
+		/// \synopsis constexpr T &operator*();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T& operator*() & {
+			return this->m_value;
+		}
+
+		/// \group deref
+		/// \synopsis constexpr const T &operator*() const;
+		constexpr const T& operator*() const& {
+			return this->m_value;
+		}
+
+		/// \exclude
+		SOL_TL_OPTIONAL_11_CONSTEXPR T&& operator*() && {
+			return std::move(this->m_value);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \exclude
+		constexpr const T&& operator*() const&& {
+			return std::move(this->m_value);
+		}
+#endif
+
+		/// \returns whether or not the optional has a value
+		/// \group has_value
+		constexpr bool has_value() const noexcept {
+			return this->m_has_value;
+		}
+
+		/// \group has_value
+		constexpr explicit operator bool() const noexcept {
+			return this->m_has_value;
+		}
+
+		/// \returns the contained value if there is one, otherwise throws
+		/// [bad_optional_access]
+		/// \group value
+		/// \synopsis constexpr T &value();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T& value() & {
+			if (has_value())
+				return this->m_value;
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+		/// \group value
+		/// \synopsis constexpr const T &value() const;
+		SOL_TL_OPTIONAL_11_CONSTEXPR const T& value() const& {
+			if (has_value())
+				return this->m_value;
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+		/// \exclude
+		SOL_TL_OPTIONAL_11_CONSTEXPR T&& value() && {
+			if (has_value())
+				return std::move(this->m_value);
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \exclude
+		SOL_TL_OPTIONAL_11_CONSTEXPR const T&& value() const&& {
+			if (has_value())
+				return std::move(this->m_value);
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+#endif
+
+		/// \returns the stored value if there is one, otherwise returns `u`
+		/// \group value_or
+		template <class U>
+		constexpr T value_or(U&& u) const& {
+			static_assert(std::is_copy_constructible<T>::value && std::is_convertible<U&&, T>::value, "T must be copy constructible and convertible from U");
+			return has_value() ? **this : static_cast<T>(std::forward<U>(u));
+		}
+
+		/// \group value_or
+		template <class U>
+		SOL_TL_OPTIONAL_11_CONSTEXPR T value_or(U&& u) && {
+			static_assert(std::is_move_constructible<T>::value && std::is_convertible<U&&, T>::value, "T must be move constructible and convertible from U");
+			return has_value() ? **this : static_cast<T>(std::forward<U>(u));
+		}
+
+		/// Destroys the stored value if one exists, making the optional empty
+		void reset() noexcept {
+			if (has_value()) {
+				this->m_value.~T();
+				this->m_has_value = false;
+			}
+		}
+	}; // namespace sol
+
+	/// \group relop
+	/// \brief Compares two optional objects
+	/// \details If both optionals contain a value, they are compared with `T`s
+	/// relational operators. Otherwise `lhs` and `rhs` are equal only if they are
+	/// both empty, and `lhs` is less than `rhs` only if `rhs` is empty and `lhs`
+	/// is not.
+	template <class T, class U>
+	inline constexpr bool operator==(const optional<T>& lhs, const optional<U>& rhs) {
+		return lhs.has_value() == rhs.has_value() && (!lhs.has_value() || *lhs == *rhs);
+	}
+	/// \group relop
+	template <class T, class U>
+	inline constexpr bool operator!=(const optional<T>& lhs, const optional<U>& rhs) {
+		return lhs.has_value() != rhs.has_value() || (lhs.has_value() && *lhs != *rhs);
+	}
+	/// \group relop
+	template <class T, class U>
+	inline constexpr bool operator<(const optional<T>& lhs, const optional<U>& rhs) {
+		return rhs.has_value() && (!lhs.has_value() || *lhs < *rhs);
+	}
+	/// \group relop
+	template <class T, class U>
+	inline constexpr bool operator>(const optional<T>& lhs, const optional<U>& rhs) {
+		return lhs.has_value() && (!rhs.has_value() || *lhs > *rhs);
+	}
+	/// \group relop
+	template <class T, class U>
+	inline constexpr bool operator<=(const optional<T>& lhs, const optional<U>& rhs) {
+		return !lhs.has_value() || (rhs.has_value() && *lhs <= *rhs);
+	}
+	/// \group relop
+	template <class T, class U>
+	inline constexpr bool operator>=(const optional<T>& lhs, const optional<U>& rhs) {
+		return !rhs.has_value() || (lhs.has_value() && *lhs >= *rhs);
+	}
+
+	/// \group relop_nullopt
+	/// \brief Compares an optional to a `nullopt`
+	/// \details Equivalent to comparing the optional to an empty optional
+	template <class T>
+	inline constexpr bool operator==(const optional<T>& lhs, nullopt_t) noexcept {
+		return !lhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator==(nullopt_t, const optional<T>& rhs) noexcept {
+		return !rhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator!=(const optional<T>& lhs, nullopt_t) noexcept {
+		return lhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator!=(nullopt_t, const optional<T>& rhs) noexcept {
+		return rhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator<(const optional<T>&, nullopt_t) noexcept {
+		return false;
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator<(nullopt_t, const optional<T>& rhs) noexcept {
+		return rhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator<=(const optional<T>& lhs, nullopt_t) noexcept {
+		return !lhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator<=(nullopt_t, const optional<T>&) noexcept {
+		return true;
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator>(const optional<T>& lhs, nullopt_t) noexcept {
+		return lhs.has_value();
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator>(nullopt_t, const optional<T>&) noexcept {
+		return false;
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator>=(const optional<T>&, nullopt_t) noexcept {
+		return true;
+	}
+	/// \group relop_nullopt
+	template <class T>
+	inline constexpr bool operator>=(nullopt_t, const optional<T>& rhs) noexcept {
+		return !rhs.has_value();
+	}
+
+	/// \group relop_t
+	/// \brief Compares the optional with a value.
+	/// \details If the optional has a value, it is compared with the other value
+	/// using `T`s relational operators. Otherwise, the optional is considered
+	/// less than the value.
+	template <class T, class U>
+	inline constexpr bool operator==(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs == rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator==(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs == *rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator!=(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs != rhs : true;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator!=(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs != *rhs : true;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator<(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs < rhs : true;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator<(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs < *rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator<=(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs <= rhs : true;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator<=(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs <= *rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator>(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs > rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator>(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs > *rhs : true;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator>=(const optional<T>& lhs, const U& rhs) {
+		return lhs.has_value() ? *lhs >= rhs : false;
+	}
+	/// \group relop_t
+	template <class T, class U>
+	inline constexpr bool operator>=(const U& lhs, const optional<T>& rhs) {
+		return rhs.has_value() ? lhs >= *rhs : true;
+	}
+
+	/// \synopsis template <class T>  \n  void swap(optional<T> &lhs, optional<T> &rhs);
+	template <class T, detail::enable_if_t<std::is_move_constructible<T>::value>* = nullptr, detail::enable_if_t<detail::is_swappable<T>::value>* = nullptr>
+	void swap(optional<T>& lhs, optional<T>& rhs) noexcept(noexcept(lhs.swap(rhs))) {
+		return lhs.swap(rhs);
+	}
+
+	namespace detail {
+		struct i_am_secret { };
+	} // namespace detail
+
+	template <class T = detail::i_am_secret, class U, class Ret = detail::conditional_t<std::is_same<T, detail::i_am_secret>::value, detail::decay_t<U>, T>>
+	inline constexpr optional<Ret> make_optional(U&& v) {
+		return optional<Ret>(std::forward<U>(v));
+	}
+
+	template <class T, class... Args>
+	inline constexpr optional<T> make_optional(Args&&... args) {
+		return optional<T>(in_place, std::forward<Args>(args)...);
+	}
+	template <class T, class U, class... Args>
+	inline constexpr optional<T> make_optional(std::initializer_list<U> il, Args&&... args) {
+		return optional<T>(in_place, il, std::forward<Args>(args)...);
+	}
+
+#if __cplusplus >= 201703L
+	template <class T>
+	optional(T) -> optional<T>;
+#endif
+
+	/// \exclude
+	namespace detail {
+#ifdef SOL_TL_OPTIONAL_CXX14
+		template <class Opt, class F, class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
+		     detail::enable_if_t<!std::is_void<Ret>::value>* = nullptr>
+		constexpr auto optional_map_impl(Opt&& opt, F&& f) {
+			return opt.has_value() ? detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt)) : optional<Ret>(nullopt);
+		}
+
+		template <class Opt, class F, class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
+		     detail::enable_if_t<std::is_void<Ret>::value>* = nullptr>
+		auto optional_map_impl(Opt&& opt, F&& f) {
+			if (opt.has_value()) {
+				detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt));
+				return make_optional(monostate {});
+			}
+
+			return optional<monostate>(nullopt);
+		}
+#else
+		template <class Opt, class F, class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
+		     detail::enable_if_t<!std::is_void<Ret>::value>* = nullptr>
+
+		constexpr auto optional_map_impl(Opt&& opt, F&& f) -> optional<Ret> {
+			return opt.has_value() ? detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt)) : optional<Ret>(nullopt);
+		}
+
+		template <class Opt, class F, class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
+		     detail::enable_if_t<std::is_void<Ret>::value>* = nullptr>
+
+		auto optional_map_impl(Opt&& opt, F&& f) -> optional<monostate> {
+			if (opt.has_value()) {
+				detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt));
+				return monostate {};
+			}
+
+			return nullopt;
+		}
+#endif
+	} // namespace detail
+
+	/// Specialization for when `T` is a reference. `optional<T&>` acts similarly
+	/// to a `T*`, but provides more operations and shows intent more clearly.
+	///
+	/// *Examples*:
+	///
+	/// ```
+	/// int i = 42;
+	/// sol::optional<int&> o = i;
+	/// *o == 42; //true
+	/// i = 12;
+	/// *o = 12; //true
+	/// &*o == &i; //true
+	/// ```
+	///
+	/// Assignment has rebind semantics rather than assign-through semantics:
+	///
+	/// ```
+	/// int j = 8;
+	/// o = j;
+	///
+	/// &*o == &j; //true
+	/// ```
+	template <class T>
+	class optional<T&> {
+	public:
+#if defined(SOL_TL_OPTIONAL_CXX14) && !defined(SOL_TL_OPTIONAL_GCC49) && !defined(SOL_TL_OPTIONAL_GCC54) && !defined(SOL_TL_OPTIONAL_GCC55)
+		/// \group and_then
+		/// Carries out some operation which returns an optional on the stored
+		/// object if there is one. \requires `std::invoke(std::forward<F>(f),
+		/// value())` returns a `std::optional<U>` for some `U`. \returns Let `U` be
+		/// the result of `std::invoke(std::forward<F>(f), value())`. Returns a
+		/// `std::optional<U>`. The return value is empty if `*this` is empty,
+		/// otherwise the return value of `std::invoke(std::forward<F>(f), value())`
+		/// is returned.
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto and_then(F&& f) & {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto and_then(F&& f) && {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &;
+		template <class F>
+		constexpr auto and_then(F&& f) const& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &&;
+		template <class F>
+		constexpr auto and_then(F&& f) const&& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+#endif
+#else
+		/// \group and_then
+		/// Carries out some operation which returns an optional on the stored
+		/// object if there is one. \requires `std::invoke(std::forward<F>(f),
+		/// value())` returns a `std::optional<U>` for some `U`. \returns Let `U` be
+		/// the result of `std::invoke(std::forward<F>(f), value())`. Returns a
+		/// `std::optional<U>`. The return value is empty if `*this` is empty,
+		/// otherwise the return value of `std::invoke(std::forward<F>(f), value())`
+		/// is returned.
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR detail::invoke_result_t<F, T&> and_then(F&& f) & {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR detail::invoke_result_t<F, T&> and_then(F&& f) && {
+			using result = detail::invoke_result_t<F, T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &;
+		template <class F>
+		constexpr detail::invoke_result_t<F, const T&> and_then(F&& f) const& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group and_then
+		/// \synopsis template <class F> \n constexpr auto and_then(F &&f) const &&;
+		template <class F>
+		constexpr detail::invoke_result_t<F, const T&> and_then(F&& f) const&& {
+			using result = detail::invoke_result_t<F, const T&>;
+			static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+		}
+#endif
+#endif
+
+#if defined(SOL_TL_OPTIONAL_CXX14) && !defined(SOL_TL_OPTIONAL_GCC49) && !defined(SOL_TL_OPTIONAL_GCC54) && !defined(SOL_TL_OPTIONAL_GCC55)
+		/// \brief Carries out some operation on the stored object if there is one.
+		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
+		/// value())`. Returns a `std::optional<U>`. The return value is empty if
+		/// `*this` is empty, otherwise an `optional<U>` is constructed from the
+		/// return value of `std::invoke(std::forward<F>(f), value())` and is
+		/// returned.
+		///
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto map(F&& f) & {
+			return detail::optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR auto map(F&& f) && {
+			return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) const&;
+		template <class F>
+		constexpr auto map(F&& f) const& {
+			return detail::optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> constexpr auto map(F &&f) const&&;
+		template <class F>
+		constexpr auto map(F&& f) const&& {
+			return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+#else
+		/// \brief Carries out some operation on the stored object if there is one.
+		/// \returns Let `U` be the result of `std::invoke(std::forward<F>(f),
+		/// value())`. Returns a `std::optional<U>`. The return value is empty if
+		/// `*this` is empty, otherwise an `optional<U>` is constructed from the
+		/// return value of `std::invoke(std::forward<F>(f), value())` and is
+		/// returned.
+		///
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) &;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR decltype(detail::optional_map_impl(std::declval<optional&>(), std::declval<F&&>())) map(F&& f) & {
+			return detail::optional_map_impl(*this, std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) &&;
+		template <class F>
+		SOL_TL_OPTIONAL_11_CONSTEXPR decltype(detail::optional_map_impl(std::declval<optional&&>(), std::declval<F&&>())) map(F&& f) && {
+			return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) const&;
+		template <class F>
+		constexpr decltype(detail::optional_map_impl(std::declval<const optional&>(), std::declval<F&&>())) map(F&& f) const& {
+			return detail::optional_map_impl(*this, std::forward<F>(f));
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map
+		/// \synopsis template <class F> auto map(F &&f) const&&;
+		template <class F>
+		constexpr decltype(detail::optional_map_impl(std::declval<const optional&&>(), std::declval<F&&>())) map(F&& f) const&& {
+			return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
+		}
+#endif
+#endif
+
+		/// \brief Calls `f` if the optional is empty
+		/// \requires `std::invoke_result_t<F>` must be void or convertible to
+		/// `optional<T>`. \effects If `*this` has a value, returns `*this`.
+		/// Otherwise, if `f` returns `void`, calls `std::forward<F>(f)` and returns
+		/// `std::nullopt`. Otherwise, returns `std::forward<F>(f)()`.
+		///
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) &;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) & {
+			if (has_value())
+				return *this;
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) & {
+			return has_value() ? *this : std::forward<F>(f)();
+		}
+
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) &&;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) && {
+			if (has_value())
+				return std::move(*this);
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) && {
+			return has_value() ? std::move(*this) : std::forward<F>(f)();
+		}
+
+		/// \group or_else
+		/// \synopsis template <class F> optional<T> or_else (F &&f) const &;
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const& {
+			if (has_value())
+				return *this;
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> SOL_TL_OPTIONAL_11_CONSTEXPR or_else(F&& f) const& {
+			return has_value() ? *this : std::forward<F>(f)();
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \exclude
+		template <class F, detail::enable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const&& {
+			if (has_value())
+				return std::move(*this);
+
+			std::forward<F>(f)();
+			return nullopt;
+		}
+
+		/// \exclude
+		template <class F, detail::disable_if_ret_void<F>* = nullptr>
+		optional<T> or_else(F&& f) const&& {
+			return has_value() ? std::move(*this) : std::forward<F>(f)();
+		}
+#endif
+
+		/// \brief Maps the stored value with `f` if there is one, otherwise returns
+		/// `u`.
+		///
+		/// \details If there is a value stored, then `f` is called with `**this`
+		/// and the value is returned. Otherwise `u` is returned.
+		///
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) & {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
+		}
+
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) && {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
+		}
+
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) const& {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map_or
+		template <class F, class U>
+		U map_or(F&& f, U&& u) const&& {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
+		}
+#endif
+
+		/// \brief Maps the stored value with `f` if there is one, otherwise calls
+		/// `u` and returns the result.
+		///
+		/// \details If there is a value stored, then `f` is
+		/// called with `**this` and the value is returned. Otherwise
+		/// `std::forward<U>(u)()` is returned.
+		///
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u) &;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) & {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
+		}
+
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u)
+		/// &&;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) && {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
+		}
+
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u)
+		/// const &;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const& {
+			return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group map_or_else
+		/// \synopsis template <class F, class U> \n auto map_or_else(F &&f, U &&u)
+		/// const &&;
+		template <class F, class U>
+		detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const&& {
+			return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
+		}
+#endif
+
+		/// \returns `u` if `*this` has a value, otherwise an empty optional.
+		template <class U>
+		constexpr optional<typename std::decay<U>::type> conjunction(U&& u) const {
+			using result = optional<detail::decay_t<U>>;
+			return has_value() ? result { u } : result { nullopt };
+		}
+
+		/// \returns `rhs` if `*this` is empty, otherwise the current value.
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(const optional& rhs) & {
+			return has_value() ? *this : rhs;
+		}
+
+		/// \group disjunction
+		constexpr optional disjunction(const optional& rhs) const& {
+			return has_value() ? *this : rhs;
+		}
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(const optional& rhs) && {
+			return has_value() ? std::move(*this) : rhs;
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group disjunction
+		constexpr optional disjunction(const optional& rhs) const&& {
+			return has_value() ? std::move(*this) : rhs;
+		}
+#endif
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(optional&& rhs) & {
+			return has_value() ? *this : std::move(rhs);
+		}
+
+		/// \group disjunction
+		constexpr optional disjunction(optional&& rhs) const& {
+			return has_value() ? *this : std::move(rhs);
+		}
+
+		/// \group disjunction
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional disjunction(optional&& rhs) && {
+			return has_value() ? std::move(*this) : std::move(rhs);
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group disjunction
+		constexpr optional disjunction(optional&& rhs) const&& {
+			return has_value() ? std::move(*this) : std::move(rhs);
+		}
+#endif
+
+		/// Takes the value out of the optional, leaving it empty
+		/// \group take
+		optional take() & {
+			optional ret = *this;
+			reset();
+			return ret;
+		}
+
+		/// \group take
+		optional take() const& {
+			optional ret = *this;
+			reset();
+			return ret;
+		}
+
+		/// \group take
+		optional take() && {
+			optional ret = std::move(*this);
+			reset();
+			return ret;
+		}
+
+#ifndef SOL_TL_OPTIONAL_NO_CONSTRR
+		/// \group take
+		optional take() const&& {
+			optional ret = std::move(*this);
+			reset();
+			return ret;
+		}
+#endif
+
+		using value_type = T&;
+
+		/// Constructs an optional that does not contain a value.
+		/// \group ctor_empty
+		constexpr optional() noexcept : m_value(nullptr) {
+		}
+
+		/// \group ctor_empty
+		constexpr optional(nullopt_t) noexcept : m_value(nullptr) {
+		}
+
+		/// Copy constructor
+		///
+		/// If `rhs` contains a value, the stored value is direct-initialized with
+		/// it. Otherwise, the constructed optional is empty.
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional(const optional& rhs) noexcept = default;
+
+		/// Move constructor
+		///
+		/// If `rhs` contains a value, the stored value is direct-initialized with
+		/// it. Otherwise, the constructed optional is empty.
+		SOL_TL_OPTIONAL_11_CONSTEXPR optional(optional&& rhs) = default;
+
+		/// Constructs the stored value with `u`.
+		/// \synopsis template <class U=T> constexpr optional(U &&u);
+		template <class U = T, detail::enable_if_t<!detail::is_optional<detail::decay_t<U>>::value>* = nullptr>
+		constexpr optional(U&& u) : m_value(std::addressof(u)) {
+			static_assert(std::is_lvalue_reference<U>::value, "U must be an lvalue");
+		}
+
+		/// \exclude
+		template <class U>
+		constexpr explicit optional(const optional<U>& rhs) : optional(*rhs) {
+		}
+
+		/// No-op
+		~optional() = default;
+
+		/// Assignment to empty.
+		///
+		/// Destroys the current value if there is one.
+		optional& operator=(nullopt_t) noexcept {
+			m_value = nullptr;
+			return *this;
+		}
+
+		/// Copy assignment.
+		///
+		/// Rebinds this optional to the referee of `rhs` if there is one. Otherwise
+		/// resets the stored value in `*this`.
+		optional& operator=(const optional& rhs) = default;
+
+		/// Rebinds this optional to `u`.
+		///
+		/// \requires `U` must be an lvalue reference.
+		/// \synopsis optional &operator=(U &&u);
+		template <class U = T, detail::enable_if_t<!detail::is_optional<detail::decay_t<U>>::value>* = nullptr>
+		optional& operator=(U&& u) {
+			static_assert(std::is_lvalue_reference<U>::value, "U must be an lvalue");
+			m_value = std::addressof(u);
+			return *this;
+		}
+
+		/// Converting copy assignment operator.
+		///
+		/// Rebinds this optional to the referee of `rhs` if there is one. Otherwise
+		/// resets the stored value in `*this`.
+		template <class U>
+		optional& operator=(const optional<U>& rhs) {
+			m_value = std::addressof(rhs.value());
+			return *this;
+		}
+
+		/// Constructs the value in-place, destroying the current one if there is
+		/// one.
+		///
+		/// \group emplace
+		template <class... Args>
+		T& emplace(Args&&... args) noexcept {
+			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
+
+			*this = nullopt;
+			this->construct(std::forward<Args>(args)...);
+		}
+
+		/// Swaps this optional with the other.
+		///
+		/// If neither optionals have a value, nothing happens.
+		/// If both have a value, the values are swapped.
+		/// If one has a value, it is moved to the other and the movee is left
+		/// valueless.
+		void swap(optional& rhs) noexcept {
+			std::swap(m_value, rhs.m_value);
+		}
+
+		/// \returns a pointer to the stored value
+		/// \requires a value is stored
+		/// \group pointer
+		/// \synopsis constexpr const T *operator->() const;
+		constexpr const T* operator->() const {
+			return m_value;
+		}
+
+		/// \group pointer
+		/// \synopsis constexpr T *operator->();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T* operator->() {
+			return m_value;
+		}
+
+		/// \returns the stored value
+		/// \requires a value is stored
+		/// \group deref
+		/// \synopsis constexpr T &operator*();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T& operator*() {
+			return *m_value;
+		}
+
+		/// \group deref
+		/// \synopsis constexpr const T &operator*() const;
+		constexpr const T& operator*() const {
+			return *m_value;
+		}
+
+		/// \returns whether or not the optional has a value
+		/// \group has_value
+		constexpr bool has_value() const noexcept {
+			return m_value != nullptr;
+		}
+
+		/// \group has_value
+		constexpr explicit operator bool() const noexcept {
+			return m_value != nullptr;
+		}
+
+		/// \returns the contained value if there is one, otherwise throws
+		/// [bad_optional_access]
+		/// \group value
+		/// synopsis constexpr T &value();
+		SOL_TL_OPTIONAL_11_CONSTEXPR T& value() {
+			if (has_value())
+				return *m_value;
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+		/// \group value
+		/// \synopsis constexpr const T &value() const;
+		SOL_TL_OPTIONAL_11_CONSTEXPR const T& value() const {
+			if (has_value())
+				return *m_value;
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+			std::abort();
+#else
+			throw bad_optional_access();
+#endif // No exceptions allowed
+		}
+
+		/// \returns the stored value if there is one, otherwise returns `u`
+		/// \group value_or
+		template <class U>
+		constexpr T& value_or(U&& u) const {
+			static_assert(std::is_convertible<U&&, T&>::value, "T must be convertible from U");
+			return has_value() ? const_cast<T&>(**this) : static_cast<T&>(std::forward<U>(u));
+		}
+
+		/// Destroys the stored value if one exists, making the optional empty
+		void reset() noexcept {
+			m_value = nullptr;
+		}
+
+	private:
+		T* m_value;
+	};
+
+} // namespace sol
+
+namespace std {
+	// TODO SFINAE
+	template <class T>
+	struct hash<::sol::optional<T>> {
+		::std::size_t operator()(const ::sol::optional<T>& o) const {
+			if (!o.has_value())
+				return 0;
+
+			return ::std::hash<::sol::detail::remove_const_t<T>>()(*o);
+		}
+	};
+} // namespace std
+
+// end of sol/optional_implementation.hpp
+
+#endif // Boost vs. Better optional
+
+#include <optional>
+
+namespace sol {
+
+#if SOL_IS_ON(SOL_USE_BOOST)
+	template <typename T>
+	using optional = boost::optional<T>;
+	using nullopt_t = boost::none_t;
+	SOL_BOOST_NONE_CONSTEXPR_I_ nullopt_t nullopt = boost::none;
+#endif // Boost vs. Better optional
+
+	namespace meta {
+		template <typename T>
+		using is_optional = any<is_specialization_of<T, optional>, is_specialization_of<T, std::optional>>;
+
+		template <typename T>
+		constexpr inline bool is_optional_v = is_optional<T>::value;
+	} // namespace meta
+
+	namespace detail {
+		template <typename T>
+		struct associated_nullopt {
+			inline static constexpr std::nullopt_t value = std::nullopt;
+		};
+
+#if SOL_IS_ON(SOL_USE_BOOST)
+		template <typename T>
+		struct associated_nullopt<boost::optional<T>> {
+			inline static SOL_BOOST_NONE_CONSTEXPR_I_ boost::none_t value = boost::none;
+		};
+#endif // Boost nullopt
+
+#if SOL_IS_ON(SOL_USE_BOOST)
+		template <typename T>
+		inline SOL_BOOST_NONE_CONSTEXPR_I_ auto associated_nullopt_v = associated_nullopt<T>::value;
+#else
+		template <typename T>
+		inline constexpr auto associated_nullopt_v = associated_nullopt<T>::value;
+#endif // Boost continues to lag behind, to not many people's surprise...
+	} // namespace detail
+} // namespace sol
+
+#if SOL_IS_ON(SOL_USE_BOOST)
+#undef SOL_BOOST_NONE_CONSTEXPR_I_
+#endif
+
+// end of sol/optional.hpp
+
+// beginning of sol/raii.hpp
+
+#include <memory>
+
+namespace sol {
+	namespace detail {
+		struct default_construct {
+			template <typename T, typename... Args>
+			static void construct(T&& obj, Args&&... args) {
+				typedef meta::unqualified_t<T> Tu;
+				std::allocator<Tu> alloc {};
+				std::allocator_traits<std::allocator<Tu>>::construct(alloc, std::forward<T>(obj), std::forward<Args>(args)...);
+			}
+
+			template <typename T, typename... Args>
+			void operator()(T&& obj, Args&&... args) const {
+				construct(std::forward<T>(obj), std::forward<Args>(args)...);
+			}
+		};
+
+		struct default_destroy {
+			template <typename T>
+			static void destroy(T&& obj) {
+				std::allocator<meta::unqualified_t<T>> alloc {};
+				alloc.destroy(obj);
+			}
+
+			template <typename T>
+			void operator()(T&& obj) const {
+				destroy(std::forward<T>(obj));
+			}
+		};
+
+		struct deleter {
+			template <typename T>
+			void operator()(T* p) const {
+				delete p;
+			}
+		};
+
+		struct state_deleter {
+			void operator()(lua_State* L) const {
+				lua_close(L);
+			}
+		};
+
+		template <typename T, typename Dx, typename... Args>
+		inline std::unique_ptr<T, Dx> make_unique_deleter(Args&&... args) {
+			return std::unique_ptr<T, Dx>(new T(std::forward<Args>(args)...));
+		}
+
+		template <typename Tag, typename T>
+		struct tagged {
+		private:
+			T value_;
+
+		public:
+			template <typename Arg, typename... Args, meta::disable<std::is_same<meta::unqualified_t<Arg>, tagged>> = meta::enabler>
+			tagged(Arg&& arg, Args&&... args) : value_(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+			}
+
+			T& value() & {
+				return value_;
+			}
+
+			T const& value() const& {
+				return value_;
+			}
+
+			T&& value() && {
+				return std::move(value_);
+			}
+		};
+	} // namespace detail
+
+	template <typename... Args>
+	struct constructor_list { };
+
+	template <typename... Args>
+	using constructors = constructor_list<Args...>;
+
+	const auto default_constructor = constructors<types<>> {};
+
+	struct no_construction { };
+	const auto no_constructor = no_construction {};
+
+	struct call_construction { };
+	const auto call_constructor = call_construction {};
+
+	template <typename... Functions>
+	struct constructor_wrapper {
+		std::tuple<Functions...> functions;
+		template <typename Arg, typename... Args, meta::disable<std::is_same<meta::unqualified_t<Arg>, constructor_wrapper>> = meta::enabler>
+		constructor_wrapper(Arg&& arg, Args&&... args) : functions(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+	};
+
+	template <typename... Functions>
+	inline auto initializers(Functions&&... functions) {
+		return constructor_wrapper<std::decay_t<Functions>...>(std::forward<Functions>(functions)...);
+	}
+
+	template <typename... Functions>
+	struct factory_wrapper {
+		std::tuple<Functions...> functions;
+		template <typename Arg, typename... Args, meta::disable<std::is_same<meta::unqualified_t<Arg>, factory_wrapper>> = meta::enabler>
+		factory_wrapper(Arg&& arg, Args&&... args) : functions(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+	};
+
+	template <typename... Functions>
+	inline auto factories(Functions&&... functions) {
+		return factory_wrapper<std::decay_t<Functions>...>(std::forward<Functions>(functions)...);
+	}
+
+	template <typename Function>
+	struct destructor_wrapper {
+		Function fx;
+		destructor_wrapper(Function f) : fx(std::move(f)) {
+		}
+	};
+
+	template <>
+	struct destructor_wrapper<void> { };
+
+	const destructor_wrapper<void> default_destructor {};
+
+	template <typename Fx>
+	inline auto destructor(Fx&& fx) {
+		return destructor_wrapper<std::decay_t<Fx>>(std::forward<Fx>(fx));
+	}
+
+} // namespace sol
+
+// end of sol/raii.hpp
+
+// beginning of sol/policies.hpp
+
+#include <array>
+
+namespace sol {
+	namespace detail {
+		struct policy_base_tag { };
+	} // namespace detail
+
+	template <int Target, int... In>
+	struct static_stack_dependencies : detail::policy_base_tag { };
+	typedef static_stack_dependencies<-1, 1> self_dependency;
+	template <int... In>
+	struct returns_self_with : detail::policy_base_tag { };
+	typedef returns_self_with<> returns_self;
+
+	struct stack_dependencies : detail::policy_base_tag {
+		int target;
+		std::array<int, 64> stack_indices;
+		std::size_t len;
+
+		template <typename... Args>
+		stack_dependencies(int stack_target, Args&&... args) : target(stack_target), stack_indices(), len(sizeof...(Args)) {
+			std::size_t i = 0;
+			(void)detail::swallow { int(), (stack_indices[i++] = static_cast<int>(std::forward<Args>(args)), int())... };
+		}
+
+		int& operator[](std::size_t i) {
+			return stack_indices[i];
+		}
+
+		const int& operator[](std::size_t i) const {
+			return stack_indices[i];
+		}
+
+		std::size_t size() const {
+			return len;
+		}
+	};
+
+	template <typename F, typename... Policies>
+	struct policy_wrapper {
+		typedef std::index_sequence_for<Policies...> indices;
+
+		F value;
+		std::tuple<Policies...> policies;
+
+		template <typename Fx, typename... Args, meta::enable<meta::neg<std::is_same<meta::unqualified_t<Fx>, policy_wrapper>>> = meta::enabler>
+		policy_wrapper(Fx&& fx, Args&&... args) : value(std::forward<Fx>(fx)), policies(std::forward<Args>(args)...) {
+		}
+
+		policy_wrapper(const policy_wrapper&) = default;
+		policy_wrapper& operator=(const policy_wrapper&) = default;
+		policy_wrapper(policy_wrapper&&) = default;
+		policy_wrapper& operator=(policy_wrapper&&) = default;
+	};
+
+	template <typename F, typename... Args>
+	auto policies(F&& f, Args&&... args) {
+		return policy_wrapper<std::decay_t<F>, std::decay_t<Args>...>(std::forward<F>(f), std::forward<Args>(args)...);
+	}
+
+	namespace detail {
+		template <typename T>
+		using is_policy = meta::is_specialization_of<T, policy_wrapper>;
+
+		template <typename T>
+		inline constexpr bool is_policy_v = is_policy<T>::value;
+	} // namespace detail
+} // namespace sol
+
+// end of sol/policies.hpp
+
+// beginning of sol/ebco.hpp
+
+#include <type_traits>
+#include <utility>
+#include <memory>
+
+namespace sol { namespace detail {
+
+	template <typename T, std::size_t tag = 0, typename = void>
+	struct ebco {
+		T m_value;
+
+		ebco() = default;
+		ebco(const ebco&) = default;
+		ebco(ebco&&) = default;
+		ebco& operator=(const ebco&) = default;
+		ebco& operator=(ebco&&) = default;
+		ebco(const T& v) noexcept(std::is_nothrow_copy_constructible_v<T>) : m_value(v) {};
+		ebco(T&& v) noexcept(std::is_nothrow_move_constructible_v<T>) : m_value(std::move(v)) {};
+		ebco& operator=(const T& v) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			m_value = v;
+			return *this;
+		}
+		ebco& operator=(T&& v) noexcept(std::is_nothrow_move_assignable_v<T>) {
+			m_value = std::move(v);
+			return *this;
+		};
+		template <typename Arg, typename... Args,
+			typename = std::enable_if_t<
+			     !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>,
+			          ebco> && !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>, T> && (sizeof...(Args) > 0 || !std::is_convertible_v<Arg, T>)>>
+		ebco(Arg&& arg, Args&&... args) noexcept(std::is_nothrow_constructible_v<T, Arg, Args...>)
+		: m_value(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+
+		T& value() & noexcept {
+			return m_value;
+		}
+
+		T const& value() const& noexcept {
+			return m_value;
+		}
+
+		T&& value() && noexcept {
+			return std::move(m_value);
+		}
+	};
+
+	template <typename T, std::size_t tag>
+	struct ebco<T, tag, std::enable_if_t<!std::is_reference_v<T> && std::is_class_v<T> && !std::is_final_v<T>>> : T {
+		ebco() = default;
+		ebco(const ebco&) = default;
+		ebco(ebco&&) = default;
+		ebco(const T& v) noexcept(std::is_nothrow_copy_constructible_v<T>) : T(v) {};
+		ebco(T&& v) noexcept(std::is_nothrow_move_constructible_v<T>) : T(std::move(v)) {};
+		template <typename Arg, typename... Args,
+			typename = std::enable_if_t<
+			     !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>,
+			          ebco> && !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>, T> && (sizeof...(Args) > 0 || !std::is_convertible_v<Arg, T>)>>
+		ebco(Arg&& arg, Args&&... args) noexcept(std::is_nothrow_constructible_v<T, Arg, Args...>) : T(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+
+		ebco& operator=(const ebco&) = default;
+		ebco& operator=(ebco&&) = default;
+		ebco& operator=(const T& v) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			static_cast<T&>(*this) = v;
+			return *this;
+		}
+		ebco& operator=(T&& v) noexcept(std::is_nothrow_move_assignable_v<T>) {
+			static_cast<T&>(*this) = std::move(v);
+			return *this;
+		};
+
+		T& value() & noexcept {
+			return static_cast<T&>(*this);
+		}
+
+		T const& value() const& noexcept {
+			return static_cast<T const&>(*this);
+		}
+
+		T&& value() && noexcept {
+			return std::move(static_cast<T&>(*this));
+		}
+	};
+
+	template <typename T, std::size_t tag>
+	struct ebco<T&, tag> {
+	private:
+		T* m_ref;
+
+	public:
+		ebco() = default;
+		ebco(const ebco&) = default;
+		ebco(ebco&&) = default;
+		ebco(T& v) noexcept : m_ref(std::addressof(v)) {};
+
+		ebco& operator=(const ebco&) = default;
+		ebco& operator=(ebco&&) = default;
+		ebco& operator=(T& v) noexcept {
+			m_ref = std::addressof(v);
+			return *this;
+		}
+
+		T& value() const noexcept {
+			return *(const_cast<ebco<T&, tag>&>(*this).m_ref);
+		}
+	};
+
+	template <typename T, std::size_t tag>
+	struct ebco<T&&, tag> {
+		T&& ref;
+
+		ebco() = default;
+		ebco(const ebco&) = delete;
+		ebco(ebco&&) = default;
+		ebco(T&& v) noexcept : ref(v) {};
+
+		ebco& operator=(const ebco&) = delete;
+		ebco& operator=(ebco&&) = delete;
+
+		T& value() & noexcept {
+			return ref;
+		}
+
+		const T& value() const& noexcept {
+			return ref;
+		}
+
+		T&& value() && noexcept {
+			return std::move(ref);
+		}
+	};
+
+}} // namespace sol::detail
+
+// end of sol/ebco.hpp
+
+#include <array>
+#include <initializer_list>
+#include <string>
+#include <string_view>
+#include <limits>
+#include <optional>
+#include <memory>
+#if SOL_IS_ON(SOL_STD_VARIANT)
+#include <variant>
+#endif // variant shenanigans (thanks, Mac OSX)
+
+namespace sol {
+	namespace d {
+		// shortest possible hidden detail namespace
+		// when types are transcribed, this saves
+		// quite a bit of space, actually.
+		// it's a little unfortunate, but here we are?
+		template <typename T>
+		struct u { };
+	} // namespace d
+
+	namespace detail {
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+		typedef int (*lua_CFunction_noexcept)(lua_State* L) noexcept;
+#else
+		typedef int (*lua_CFunction_noexcept)(lua_State* L);
+#endif // noexcept function type for lua_CFunction
+
+		template <typename T>
+		struct implicit_wrapper {
+			T& value;
+
+			implicit_wrapper(T* value_) : value(*value_) {
+			}
+
+			implicit_wrapper(T& value_) : value(value_) {
+			}
+
+			operator T&() {
+				return value;
+			}
+
+			operator T*() {
+				return std::addressof(value);
+			}
+		};
+
+		struct yield_tag_t { };
+		inline constexpr yield_tag_t yield_tag {};
+	} // namespace detail
+
+	struct lua_nil_t { };
+	inline constexpr lua_nil_t lua_nil {};
+	inline bool operator==(lua_nil_t, lua_nil_t) {
+		return true;
+	}
+	inline bool operator!=(lua_nil_t, lua_nil_t) {
+		return false;
+	}
+#if SOL_IS_ON(SOL_NIL)
+	using nil_t = lua_nil_t;
+	inline constexpr const nil_t& nil = lua_nil;
+#endif
+
+	namespace detail {
+		struct non_lua_nil_t { };
+	} // namespace detail
+
+	struct metatable_key_t { };
+	inline constexpr metatable_key_t metatable_key {};
+
+	struct global_tag_t {
+	} inline constexpr global_tag {};
+
+	struct env_key_t { };
+	inline constexpr env_key_t env_key {};
+
+	struct no_metatable_t { };
+	inline constexpr no_metatable_t no_metatable {};
+
+	template <typename T>
+	struct yielding_t {
+		T func;
+
+		yielding_t() = default;
+		yielding_t(const yielding_t&) = default;
+		yielding_t(yielding_t&&) = default;
+		yielding_t& operator=(const yielding_t&) = default;
+		yielding_t& operator=(yielding_t&&) = default;
+		template <typename Arg,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<Arg>, yielding_t>>,
+		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<Arg>>>> = meta::enabler>
+		yielding_t(Arg&& arg) : func(std::forward<Arg>(arg)) {
+		}
+		template <typename Arg0, typename Arg1, typename... Args>
+		yielding_t(Arg0&& arg0, Arg1&& arg1, Args&&... args) : func(std::forward<Arg0>(arg0), std::forward<Arg1>(arg1), std::forward<Args>(args)...) {
+		}
+	};
+
+	template <typename F>
+	inline yielding_t<std::decay_t<F>> yielding(F&& f) {
+		return yielding_t<std::decay_t<F>>(std::forward<F>(f));
+	}
+
+	typedef std::remove_pointer_t<lua_CFunction> lua_CFunction_ref;
+
+	template <typename T>
+	struct non_null { };
+
+	template <typename... Args>
+	struct function_sig { };
+
+	struct upvalue_index {
+		int index;
+		upvalue_index(int idx) : index(lua_upvalueindex(idx)) {
+		}
+
+		operator int() const {
+			return index;
+		}
+	};
+
+	struct raw_index {
+		int index;
+		raw_index(int i) : index(i) {
+		}
+
+		operator int() const {
+			return index;
+		}
+	};
+
+	struct absolute_index {
+		int index;
+		absolute_index(lua_State* L, int idx) : index(lua_absindex(L, idx)) {
+		}
+
+		operator int() const {
+			return index;
+		}
+	};
+
+	struct ref_index {
+		int index;
+		ref_index(int idx) : index(idx) {
+		}
+
+		operator int() const {
+			return index;
+		}
+	};
+
+	struct stack_count {
+		int count;
+
+		stack_count(int cnt) : count(cnt) {
+		}
+	};
+
+	struct lightuserdata_value {
+		void* value;
+		lightuserdata_value(void* data) : value(data) {
+		}
+		operator void*() const {
+			return value;
+		}
+	};
+
+	struct userdata_value {
+	private:
+		void* m_value;
+
+	public:
+		userdata_value(void* data) : m_value(data) {
+		}
+
+		void* value() const {
+			return m_value;
+		}
+
+		operator void*() const {
+			return value();
+		}
+	};
+
+	template <typename T>
+	struct light {
+	private:
+		static_assert(!std::is_void_v<T>, "the type for light will never be void");
+		T* m_value;
+
+	public:
+		light(T& x) : m_value(std::addressof(x)) {
+		}
+		light(T* x) : m_value(x) {
+		}
+		explicit light(void* x) : m_value(static_cast<T*>(x)) {
+		}
+
+		T* value() const {
+			return m_value;
+		}
+
+		operator T*() const {
+			return m_value;
+		}
+		operator T&() const {
+			return *m_value;
+		}
+
+		void* void_value() const {
+			return m_value;
+		}
+	};
+
+	template <typename T>
+	auto make_light(T& l) {
+		typedef meta::unwrapped_t<std::remove_pointer_t<std::remove_pointer_t<T>>> L;
+		return light<L>(l);
+	}
+
+	template <typename T>
+	struct user : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+
+		using base_t::value;
+
+		operator std::add_pointer_t<std::remove_reference_t<T>>() {
+			return std::addressof(this->base_t::value());
+		}
+
+		operator std::add_pointer_t<std::add_const_t<std::remove_reference_t<T>>>() const {
+			return std::addressof(this->base_t::value());
+		}
+
+		operator std::add_lvalue_reference_t<T>() {
+			return this->base_t::value();
+		}
+
+		operator std::add_const_t<std::add_lvalue_reference_t<T>>&() const {
+			return this->base_t::value();
+		}
+	};
+
+	template <typename T>
+	auto make_user(T&& u) {
+		typedef meta::unwrapped_t<meta::unqualified_t<T>> U;
+		return user<U>(std::forward<T>(u));
+	}
+
+	template <typename T>
+	struct metatable_registry_key : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+
+		using base_t::value;
+	};
+
+	template <typename T>
+	auto meta_registry_key(T&& key) {
+		typedef meta::unqualified_t<T> K;
+		return metatable_registry_key<K>(std::forward<T>(key));
+	}
+
+	template <typename... Upvalues>
+	struct closure {
+		lua_CFunction c_function;
+		std::tuple<Upvalues...> upvalues;
+		closure(lua_CFunction f, Upvalues... targetupvalues) : c_function(f), upvalues(std::forward<Upvalues>(targetupvalues)...) {
+		}
+	};
+
+	template <>
+	struct closure<> {
+		lua_CFunction c_function;
+		int upvalues;
+		closure(lua_CFunction f, int upvalue_count = 0) : c_function(f), upvalues(upvalue_count) {
+		}
+	};
+
+	typedef closure<> c_closure;
+
+	template <typename... Args>
+	closure<Args...> make_closure(lua_CFunction f, Args&&... args) {
+		return closure<Args...>(f, std::forward<Args>(args)...);
+	}
+
+	template <typename Sig, typename... Ps>
+	struct function_arguments {
+		std::tuple<Ps...> arguments;
+		template <typename Arg, typename... Args, meta::disable<std::is_same<meta::unqualified_t<Arg>, function_arguments>> = meta::enabler>
+		function_arguments(Arg&& arg, Args&&... args) : arguments(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+	};
+
+	template <typename Sig = function_sig<>, typename... Args>
+	auto as_function(Args&&... args) {
+		return function_arguments<Sig, std::decay_t<Args>...>(std::forward<Args>(args)...);
+	}
+
+	template <typename Sig = function_sig<>, typename... Args>
+	auto as_function_reference(Args&&... args) {
+		return function_arguments<Sig, Args...>(std::forward<Args>(args)...);
+	}
+
+	template <typename T>
+	struct as_table_t : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		as_table_t() = default;
+		as_table_t(const as_table_t&) = default;
+		as_table_t(as_table_t&&) = default;
+		as_table_t& operator=(const as_table_t&) = default;
+		as_table_t& operator=(as_table_t&&) = default;
+		as_table_t(const meta::unqualified_t<T>& obj) noexcept(std::is_nothrow_constructible_v<base_t, const meta::unqualified_t<T>&>) : base_t(obj) {
+		}
+		as_table_t(meta::unqualified_t<T>&& obj) noexcept(std::is_nothrow_constructible_v<base_t, meta::unqualified_t<T>&&>) : base_t(std::move(obj)) {
+		}
+		template <typename Arg, typename... Args,
+		     std::enable_if_t<
+		          !std::is_same_v<as_table_t, meta::unqualified_t<Arg>> && !std::is_same_v<meta::unqualified_t<T>, meta::unqualified_t<Arg>>>* = nullptr>
+		as_table_t(Arg&& arg, Args&&... args) noexcept(std::is_nothrow_constructible_v<base_t, Arg, Args...>)
+		: base_t(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+
+		using base_t::value;
+
+		operator std::add_lvalue_reference_t<T>() {
+			return this->base_t::value();
+		}
+
+		operator std::add_const_t<std::add_lvalue_reference_t<T>>() const {
+			return this->base_t::value();
+		}
+	};
+
+	template <typename T>
+	struct nested : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using nested_type = T;
+
+		nested() = default;
+		nested(const nested&) = default;
+		nested(nested&&) = default;
+		nested& operator=(const nested&) = default;
+		nested& operator=(nested&&) = default;
+		nested(const meta::unqualified_t<T>& obj) noexcept(std::is_nothrow_constructible_v<base_t, const meta::unqualified_t<T>&>) : base_t(obj) {
+		}
+		nested(meta::unqualified_t<T>&& obj) noexcept(std::is_nothrow_constructible_v<base_t, meta::unqualified_t<T>&&>) : base_t(std::move(obj)) {
+		}
+		template <typename Arg, typename... Args,
+		     std::enable_if_t<
+		          !std::is_same_v<nested, meta::unqualified_t<Arg>> && !std::is_same_v<meta::unqualified_t<T>, meta::unqualified_t<Arg>>>* = nullptr>
+		nested(Arg&& arg, Args&&... args) noexcept(std::is_nothrow_constructible_v<base_t, Arg, Args...>)
+		: base_t(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+
+		using base_t::value;
+
+		operator std::add_lvalue_reference_t<T>() {
+			return this->base_t::value();
+		}
+
+		operator std::add_const_t<std::add_lvalue_reference_t<T>>() const {
+			return this->base_t::value();
+		}
+	};
+
+	struct nested_tag_t { };
+	constexpr inline nested_tag_t nested_tag {};
+
+	template <typename T>
+	as_table_t<T> as_table_ref(T&& container) {
+		return as_table_t<T>(std::forward<T>(container));
+	}
+
+	template <typename T>
+	as_table_t<meta::unqualified_t<T>> as_table(T&& container) {
+		return as_table_t<meta::unqualified_t<T>>(std::forward<T>(container));
+	}
+
+	template <typename T>
+	nested<T> as_nested_ref(T&& container) {
+		return nested<T>(std::forward<T>(container));
+	}
+
+	template <typename T>
+	nested<meta::unqualified_t<T>> as_nested(T&& container) {
+		return nested<meta::unqualified_t<T>>(std::forward<T>(container));
+	}
+
+	template <typename T>
+	struct as_container_t : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using type = T;
+
+		as_container_t() = default;
+		as_container_t(const as_container_t&) = default;
+		as_container_t(as_container_t&&) = default;
+		as_container_t& operator=(const as_container_t&) = default;
+		as_container_t& operator=(as_container_t&&) = default;
+
+		using base_t::base_t;
+
+		using base_t::value;
+
+		operator std::add_lvalue_reference_t<T>() {
+			return value();
+		}
+	};
+
+	template <typename T>
+	auto as_container(T&& value) {
+		return as_container_t<T>(std::forward<T>(value));
+	}
+
+	template <typename T, std::size_t Limit = 15>
+	struct exhaustive_until : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+
+		using base_t::value;
+
+		operator std::add_pointer_t<std::remove_reference_t<T>>() {
+			return std::addressof(this->base_t::value());
+		}
+
+		operator std::add_pointer_t<std::add_const_t<std::remove_reference_t<T>>>() const {
+			return std::addressof(this->base_t::value());
+		}
+
+		operator std::add_lvalue_reference_t<T>() {
+			return this->base_t::value();
+		}
+
+		operator std::add_const_t<std::add_lvalue_reference_t<T>>&() const {
+			return this->base_t::value();
+		}
+	};
+
+	template <typename T>
+	using exhaustive = exhaustive_until<T, (std::numeric_limits<size_t>::max)()>;
+
+	template <typename T>
+	struct non_exhaustive : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+
+		using base_t::value;
+
+		operator std::add_pointer_t<std::remove_reference_t<T>>() {
+			return std::addressof(this->base_t::value());
+		}
+
+		operator std::add_pointer_t<std::add_const_t<std::remove_reference_t<T>>>() const {
+			return std::addressof(this->base_t::value());
+		}
+
+		operator std::add_lvalue_reference_t<T>() {
+			return this->base_t::value();
+		}
+
+		operator std::add_const_t<std::add_lvalue_reference_t<T>>&() const {
+			return this->base_t::value();
+		}
+	};
+
+	template <typename T>
+	struct push_invoke_t : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		push_invoke_t() = default;
+		push_invoke_t(const push_invoke_t&) = default;
+		push_invoke_t(push_invoke_t&&) = default;
+		push_invoke_t& operator=(const push_invoke_t&) = default;
+		push_invoke_t& operator=(push_invoke_t&&) = default;
+
+		using base_t::base_t;
+
+		using base_t::value;
+	};
+
+	template <typename Fx>
+	auto push_invoke(Fx&& fx) {
+		return push_invoke_t<Fx>(std::forward<Fx>(fx));
+	}
+
+	template <typename T>
+	struct forward_as_value_t : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		forward_as_value_t() = default;
+		forward_as_value_t(const forward_as_value_t&) = default;
+		forward_as_value_t(forward_as_value_t&&) = default;
+		forward_as_value_t& operator=(const forward_as_value_t&) = default;
+		forward_as_value_t& operator=(forward_as_value_t&&) = default;
+
+		using base_t::base_t;
+
+		using base_t::value;
+	};
+
+	template <typename T>
+	auto pass_as_value(T& value_ref_) {
+		return forward_as_value_t<T>(value_ref_);
+	}
+
+	struct override_value_t { };
+	constexpr inline override_value_t override_value = override_value_t();
+	struct update_if_empty_t { };
+	constexpr inline update_if_empty_t update_if_empty = update_if_empty_t();
+	struct create_if_nil_t { };
+	constexpr inline create_if_nil_t create_if_nil = create_if_nil_t();
+
+	namespace detail {
+		enum insert_mode { none = 0x0, update_if_empty = 0x01, override_value = 0x02, create_if_nil = 0x04 };
+
+		template <typename T, typename...>
+		using is_insert_mode = std::integral_constant<bool,
+		     std::is_same_v<T, override_value_t> || std::is_same_v<T, update_if_empty_t> || std::is_same_v<T, create_if_nil_t>>;
+
+		template <typename T, typename...>
+		using is_not_insert_mode = meta::neg<is_insert_mode<T>>;
+	} // namespace detail
+
+	struct this_state {
+		lua_State* L;
+
+		this_state(lua_State* Ls) : L(Ls) {
+		}
+
+		operator lua_State*() const noexcept {
+			return lua_state();
+		}
+
+		lua_State* operator->() const noexcept {
+			return lua_state();
+		}
+
+		lua_State* lua_state() const noexcept {
+			return L;
+		}
+	};
+
+	struct this_main_state {
+		lua_State* L;
+
+		this_main_state(lua_State* Ls) : L(Ls) {
+		}
+
+		operator lua_State*() const noexcept {
+			return lua_state();
+		}
+
+		lua_State* operator->() const noexcept {
+			return lua_state();
+		}
+
+		lua_State* lua_state() const noexcept {
+			return L;
+		}
+	};
+
+	struct new_table {
+		int sequence_hint = 0;
+		int map_hint = 0;
+
+		new_table() = default;
+		new_table(const new_table&) = default;
+		new_table(new_table&&) = default;
+		new_table& operator=(const new_table&) = default;
+		new_table& operator=(new_table&&) = default;
+
+		new_table(int sequence_hint_, int map_hint_ = 0) noexcept : sequence_hint(sequence_hint_), map_hint(map_hint_) {
+		}
+	};
+
+	const new_table create = {};
+
+	enum class lib : unsigned char {
+		// print, assert, and other base functions
+		base,
+		// require and other package functions
+		package,
+		// coroutine functions and utilities
+		coroutine,
+		// string library
+		string,
+		// functionality from the OS
+		os,
+		// all things math
+		math,
+		// the table manipulator and observer functions
+		table,
+		// the debug library
+		debug,
+		// the bit library: different based on which you're using
+		bit32,
+		// input/output library
+		io,
+		// LuaJIT only
+		ffi,
+		// LuaJIT only
+		jit,
+		// library for handling utf8: new to Lua
+		utf8,
+		// do not use
+		count
+	};
+
+	enum class call_syntax { dot = 0, colon = 1 };
+
+	enum class load_mode {
+		any = 0,
+		text = 1,
+		binary = 2,
+	};
+
+	enum class call_status : int {
+		ok = LUA_OK,
+		yielded = LUA_YIELD,
+		runtime = LUA_ERRRUN,
+		memory = LUA_ERRMEM,
+		handler = LUA_ERRERR,
+		gc = LUA_ERRGCMM,
+		syntax = LUA_ERRSYNTAX,
+		file = LUA_ERRFILE,
+	};
+
+	enum class thread_status : int {
+		ok = LUA_OK,
+		yielded = LUA_YIELD,
+		runtime = LUA_ERRRUN,
+		memory = LUA_ERRMEM,
+		gc = LUA_ERRGCMM,
+		handler = LUA_ERRERR,
+		dead = -1,
+	};
+
+	enum class load_status : int {
+		ok = LUA_OK,
+		syntax = LUA_ERRSYNTAX,
+		memory = LUA_ERRMEM,
+		gc = LUA_ERRGCMM,
+		file = LUA_ERRFILE,
+	};
+
+	enum class gc_mode : int {
+		incremental = 0,
+		generational = 1,
+		default_value = incremental,
+	};
+
+	enum class type : int {
+		none = LUA_TNONE,
+		lua_nil = LUA_TNIL,
+#if SOL_IS_ON(SOL_NIL)
+		nil = lua_nil,
+#endif // Objective C/C++ Keyword that's found in OSX SDK and OBJC -- check for all forms to protect
+		string = LUA_TSTRING,
+		number = LUA_TNUMBER,
+		thread = LUA_TTHREAD,
+		boolean = LUA_TBOOLEAN,
+		function = LUA_TFUNCTION,
+		userdata = LUA_TUSERDATA,
+		lightuserdata = LUA_TLIGHTUSERDATA,
+		table = LUA_TTABLE,
+		poly = -0xFFFF
+	};
+
+	inline const std::string& to_string(call_status c) {
+		static const std::array<std::string, 10> names { { "ok",
+			"yielded",
+			"runtime",
+			"memory",
+			"handler",
+			"gc",
+			"syntax",
+			"file",
+			"CRITICAL_EXCEPTION_FAILURE",
+			"CRITICAL_INDETERMINATE_STATE_FAILURE" } };
+		switch (c) {
+		case call_status::ok:
+			return names[0];
+		case call_status::yielded:
+			return names[1];
+		case call_status::runtime:
+			return names[2];
+		case call_status::memory:
+			return names[3];
+		case call_status::handler:
+			return names[4];
+		case call_status::gc:
+			return names[5];
+		case call_status::syntax:
+			return names[6];
+		case call_status::file:
+			return names[7];
+		}
+		if (static_cast<std::ptrdiff_t>(c) == -1) {
+			// One of the many cases where a critical exception error has occurred
+			return names[8];
+		}
+		return names[9];
+	}
+
+	inline bool is_indeterminate_call_failure(call_status c) {
+		switch (c) {
+		case call_status::ok:
+		case call_status::yielded:
+		case call_status::runtime:
+		case call_status::memory:
+		case call_status::handler:
+		case call_status::gc:
+		case call_status::syntax:
+		case call_status::file:
+			return false;
+		}
+		return true;
+	}
+
+	inline const std::string& to_string(load_status c) {
+		static const std::array<std::string, 7> names {
+			{ "ok", "memory", "gc", "syntax", "file", "CRITICAL_EXCEPTION_FAILURE", "CRITICAL_INDETERMINATE_STATE_FAILURE" }
+		};
+		switch (c) {
+		case load_status::ok:
+			return names[0];
+		case load_status::memory:
+			return names[1];
+		case load_status::gc:
+			return names[2];
+		case load_status::syntax:
+			return names[3];
+		case load_status::file:
+			return names[4];
+		}
+		if (static_cast<int>(c) == -1) {
+			// One of the many cases where a critical exception error has occurred
+			return names[5];
+		}
+		return names[6];
+	}
+
+	inline const std::string& to_string(load_mode c) {
+		static const std::array<std::string, 3> names { {
+			"bt",
+			"t",
+			"b",
+		} };
+		return names[static_cast<std::size_t>(c)];
+	}
+
+	enum class meta_function : unsigned {
+		construct,
+		index,
+		new_index,
+		mode,
+		call,
+		call_function = call,
+		metatable,
+		to_string,
+		length,
+		unary_minus,
+		addition,
+		subtraction,
+		multiplication,
+		division,
+		modulus,
+		power_of,
+		involution = power_of,
+		concatenation,
+		equal_to,
+		less_than,
+		less_than_or_equal_to,
+		garbage_collect,
+		floor_division,
+		bitwise_left_shift,
+		bitwise_right_shift,
+		bitwise_not,
+		bitwise_and,
+		bitwise_or,
+		bitwise_xor,
+		pairs,
+		ipairs,
+		next,
+		type,
+		type_info,
+		call_construct,
+		storage,
+		gc_names,
+		static_index,
+		static_new_index,
+	};
+
+	typedef meta_function meta_method;
+
+	inline const std::array<std::string, 37>& meta_function_names() {
+		static const std::array<std::string, 37> names = { { "new",
+			"__index",
+			"__newindex",
+			"__mode",
+			"__call",
+			"__metatable",
+			"__tostring",
+			"__len",
+			"__unm",
+			"__add",
+			"__sub",
+			"__mul",
+			"__div",
+			"__mod",
+			"__pow",
+			"__concat",
+			"__eq",
+			"__lt",
+			"__le",
+			"__gc",
+
+			"__idiv",
+			"__shl",
+			"__shr",
+			"__bnot",
+			"__band",
+			"__bor",
+			"__bxor",
+
+			"__pairs",
+			"__ipairs",
+			"next",
+
+			"__type",
+			"__typeinfo",
+			"__sol.call_new",
+			"__sol.storage",
+			"__sol.gc_names",
+			"__sol.static_index",
+			"__sol.static_new_index" } };
+		return names;
+	}
+
+	inline const std::string& to_string(meta_function mf) {
+		return meta_function_names()[static_cast<std::size_t>(mf)];
+	}
+
+	inline type type_of(lua_State* L, int index) {
+		return static_cast<type>(lua_type(L, index));
+	}
+
+	inline std::string type_name(lua_State* L, type t) {
+		return lua_typename(L, static_cast<int>(t));
+	}
+
+	template <typename T>
+	struct is_stateless_lua_reference
+	: std::integral_constant<bool,
+	       (std::is_base_of_v<stateless_stack_reference, T> || std::is_base_of_v<stateless_reference, T>)&&(
+	            !std::is_base_of_v<stack_reference, T> && !std::is_base_of_v<reference, T> && !std::is_base_of_v<main_reference, T>)> { };
+
+	template <typename T>
+	inline constexpr bool is_stateless_lua_reference_v = is_stateless_lua_reference<T>::value;
+
+	template <typename T>
+	struct is_lua_reference
+	: std::integral_constant<bool,
+	       std::is_base_of_v<reference,
+	            T> || std::is_base_of_v<main_reference, T> || std::is_base_of_v<stack_reference, T> || std::is_base_of_v<stateless_stack_reference, T> || std::is_base_of_v<stateless_reference, T>> {
+	};
+
+	template <typename T>
+	inline constexpr bool is_lua_reference_v = is_lua_reference<T>::value;
+
+	template <typename T>
+	struct is_lua_reference_or_proxy : std::integral_constant<bool, is_lua_reference_v<T> || meta::is_specialization_of_v<T, table_proxy>> { };
+
+	template <typename T>
+	inline constexpr bool is_lua_reference_or_proxy_v = is_lua_reference_or_proxy<T>::value;
+
+	template <typename T>
+	struct is_transparent_argument
+	: std::integral_constant<bool,
+	       std::is_same_v<meta::unqualified_t<T>,
+	            this_state> || std::is_same_v<meta::unqualified_t<T>, this_main_state> || std::is_same_v<meta::unqualified_t<T>, this_environment> || std::is_same_v<meta::unqualified_t<T>, variadic_args>> {
+	};
+
+	template <typename T>
+	constexpr inline bool is_transparent_argument_v = is_transparent_argument<T>::value;
+
+	template <typename T>
+	struct is_variadic_arguments : meta::any<std::is_same<T, variadic_args>, meta::is_optional<T>> { };
+
+	template <typename T>
+	struct is_container
+	: std::integral_constant<bool,
+	       !std::is_same_v<state_view,
+	            T> && !std::is_same_v<state, T> && !meta::is_initializer_list_v<T> && !meta::is_string_like_v<T> && !meta::is_string_literal_array_v<T> && !is_transparent_argument_v<T> && !is_lua_reference_v<T> && (meta::has_begin_end_v<T> || std::is_array_v<T>)> {
+	};
+
+	template <typename T>
+	constexpr inline bool is_container_v = is_container<T>::value;
+
+	template <typename T>
+	struct is_to_stringable : meta::any<meta::supports_to_string_member<meta::unqualified_t<T>>, meta::supports_adl_to_string<meta::unqualified_t<T>>,
+	                               meta::supports_op_left_shift<std::ostream, meta::unqualified_t<T>>> { };
+
+	template <typename T>
+	inline constexpr bool is_to_stringable_v = is_to_stringable<T>::value;
+
+	template <typename T>
+	struct is_callable : std::true_type { };
+
+	template <typename T>
+	inline constexpr bool is_callable_v = is_callable<T>::value;
+
+	namespace detail {
+		template <typename T, typename = void>
+		struct lua_type_of : std::integral_constant<type, type::userdata> { };
+
+		template <typename C, typename T, typename A>
+		struct lua_type_of<std::basic_string<C, T, A>> : std::integral_constant<type, type::string> { };
+
+		template <typename C, typename T>
+		struct lua_type_of<basic_string_view<C, T>> : std::integral_constant<type, type::string> { };
+
+		template <std::size_t N>
+		struct lua_type_of<char[N]> : std::integral_constant<type, type::string> { };
+
+		template <std::size_t N>
+		struct lua_type_of<wchar_t[N]> : std::integral_constant<type, type::string> { };
+
+#if SOL_IS_ON(SOL_CHAR8_T)
+		template <std::size_t N>
+		struct lua_type_of<char8_t[N]> : std::integral_constant<type, type::string> { };
+#endif
+
+		template <std::size_t N>
+		struct lua_type_of<char16_t[N]> : std::integral_constant<type, type::string> { };
+
+		template <std::size_t N>
+		struct lua_type_of<char32_t[N]> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<char> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<wchar_t> : std::integral_constant<type, type::string> { };
+
+#if SOL_IS_ON(SOL_CHAR8_T)
+		template <>
+		struct lua_type_of<char8_t> : std::integral_constant<type, type::string> { };
+#endif
+
+		template <>
+		struct lua_type_of<char16_t> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<char32_t> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<const char*> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<const wchar_t*> : std::integral_constant<type, type::string> { };
+
+#if SOL_IS_ON(SOL_CHAR8_T)
+		template <>
+		struct lua_type_of<const char8_t*> : std::integral_constant<type, type::string> { };
+#endif
+
+		template <>
+		struct lua_type_of<const char16_t*> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<const char32_t*> : std::integral_constant<type, type::string> { };
+
+		template <>
+		struct lua_type_of<bool> : std::integral_constant<type, type::boolean> { };
+
+		template <>
+		struct lua_type_of<lua_nil_t> : std::integral_constant<type, type::lua_nil> { };
+
+		template <>
+		struct lua_type_of<nullopt_t> : std::integral_constant<type, type::lua_nil> { };
+
+		template <>
+		struct lua_type_of<lua_value> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<detail::non_lua_nil_t> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<std::nullptr_t> : std::integral_constant<type, type::lua_nil> { };
+
+		template <>
+		struct lua_type_of<error> : std::integral_constant<type, type::string> { };
+
+		template <bool b, typename Base>
+		struct lua_type_of<basic_table_core<b, Base>> : std::integral_constant<type, type::table> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_lua_table<Base>> : std::integral_constant<type, type::table> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_metatable<Base>> : std::integral_constant<type, type::table> { };
+
+		template <typename T, typename Base>
+		struct lua_type_of<basic_usertype<T, Base>> : std::integral_constant<type, type::table> { };
+
+		template <>
+		struct lua_type_of<metatable_key_t> : std::integral_constant<type, type::table> { };
+
+		template <typename B>
+		struct lua_type_of<basic_environment<B>> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<env_key_t> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<new_table> : std::integral_constant<type, type::table> { };
+
+		template <typename T>
+		struct lua_type_of<as_table_t<T>> : std::integral_constant<type, type::table> { };
+
+		template <typename T>
+		struct lua_type_of<std::initializer_list<T>> : std::integral_constant<type, type::table> { };
+
+		template <bool b>
+		struct lua_type_of<basic_reference<b>> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<stack_reference> : std::integral_constant<type, type::poly> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_object<Base>> : std::integral_constant<type, type::poly> { };
+
+		template <typename... Args>
+		struct lua_type_of<std::tuple<Args...>> : std::integral_constant<type, type::poly> { };
+
+		template <typename A, typename B>
+		struct lua_type_of<std::pair<A, B>> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<void*> : std::integral_constant<type, type::lightuserdata> { };
+
+		template <>
+		struct lua_type_of<const void*> : std::integral_constant<type, type::lightuserdata> { };
+
+		template <>
+		struct lua_type_of<lightuserdata_value> : std::integral_constant<type, type::lightuserdata> { };
+
+		template <>
+		struct lua_type_of<userdata_value> : std::integral_constant<type, type::userdata> { };
+
+		template <typename T>
+		struct lua_type_of<light<T>> : std::integral_constant<type, type::lightuserdata> { };
+
+		template <typename T>
+		struct lua_type_of<user<T>> : std::integral_constant<type, type::userdata> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_lightuserdata<Base>> : std::integral_constant<type, type::lightuserdata> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_userdata<Base>> : std::integral_constant<type, type::userdata> { };
+
+		template <>
+		struct lua_type_of<lua_CFunction> : std::integral_constant<type, type::function> { };
+
+		template <>
+		struct lua_type_of<std::remove_pointer_t<lua_CFunction>> : std::integral_constant<type, type::function> { };
+
+		template <typename Base, bool aligned>
+		struct lua_type_of<basic_function<Base, aligned>> : std::integral_constant<type, type::function> { };
+
+		template <typename Base, bool aligned, typename Handler>
+		struct lua_type_of<basic_protected_function<Base, aligned, Handler>> : std::integral_constant<type, type::function> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_coroutine<Base>> : std::integral_constant<type, type::function> { };
+
+		template <typename Base>
+		struct lua_type_of<basic_thread<Base>> : std::integral_constant<type, type::thread> { };
+
+		template <typename Signature>
+		struct lua_type_of<std::function<Signature>> : std::integral_constant<type, type::function> { };
+
+		template <typename T>
+		struct lua_type_of<optional<T>> : std::integral_constant<type, type::poly> { };
+
+		template <typename T>
+		struct lua_type_of<std::optional<T>> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<variadic_args> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<variadic_results> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<stack_count> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<this_state> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<this_main_state> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<this_environment> : std::integral_constant<type, type::poly> { };
+
+		template <>
+		struct lua_type_of<type> : std::integral_constant<type, type::poly> { };
+
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE)
+		template <typename T>
+		struct lua_type_of<T*> : std::integral_constant<type, std::is_function_v<T> ? type::function : type::userdata> { };
+#else
+		template <typename T>
+		struct lua_type_of<T*> : std::integral_constant<type, type::userdata> { };
+#endif
+
+		template <typename T>
+		struct lua_type_of<T, std::enable_if_t<std::is_arithmetic_v<T> || std::is_same_v<T, lua_Number> || std::is_same_v<T, lua_Integer>>>
+		: std::integral_constant<type, type::number> { };
+
+		template <typename T>
+		struct lua_type_of<T, std::enable_if_t<std::is_function_v<T>>> : std::integral_constant<type, type::function> { };
+
+		template <typename T>
+		struct lua_type_of<T, std::enable_if_t<std::is_enum_v<T>>> : std::integral_constant<type, type::number> { };
+
+		template <>
+		struct lua_type_of<meta_function> : std::integral_constant<type, type::string> { };
+
+#if SOL_IS_ON(SOL_STD_VARIANT)
+		template <typename... Tn>
+		struct lua_type_of<std::variant<Tn...>> : std::integral_constant<type, type::poly> { };
+#endif // std::variant deployment sucks on Clang
+
+		template <typename T>
+		struct lua_type_of<nested<T>> : meta::conditional_t<::sol::is_container_v<T>, std::integral_constant<type, type::table>, lua_type_of<T>> { };
+
+		template <typename C, C v, template <typename...> class V, typename... Args>
+		struct accumulate : std::integral_constant<C, v> { };
+
+		template <typename C, C v, template <typename...> class V, typename T, typename... Args>
+		struct accumulate<C, v, V, T, Args...> : accumulate<C, v + V<T>::value, V, Args...> { };
+
+		template <typename C, C v, template <typename...> class V, typename List>
+		struct accumulate_list;
+
+		template <typename C, C v, template <typename...> class V, typename... Args>
+		struct accumulate_list<C, v, V, types<Args...>> : accumulate<C, v, V, Args...> { };
+	} // namespace detail
+
+	template <typename T>
+	struct lua_type_of : detail::lua_type_of<T> {
+		typedef int SOL_INTERNAL_UNSPECIALIZED_MARKER_;
+	};
+
+	template <typename T>
+	inline constexpr type lua_type_of_v = lua_type_of<T>::value;
+
+	template <typename T>
+	struct lua_size : std::integral_constant<int, 1> {
+		typedef int SOL_INTERNAL_UNSPECIALIZED_MARKER_;
+	};
+
+	template <typename A, typename B>
+	struct lua_size<std::pair<A, B>> : std::integral_constant<int, lua_size<A>::value + lua_size<B>::value> { };
+
+	template <typename... Args>
+	struct lua_size<std::tuple<Args...>> : std::integral_constant<int, detail::accumulate<int, 0, lua_size, Args...>::value> { };
+
+	template <typename T>
+	inline constexpr int lua_size_v = lua_size<T>::value;
+
+	namespace detail {
+		// MSVC's decltype detection is broken, which breaks other
+		// parts of the code. So we add more workarounds. The moment it's fixed,
+		// we take it away and break everyone that doesn't upgrade.
+		template <typename T>
+		using is_msvc_callable_rigged = meta::any<meta::is_specialization_of<T, push_invoke_t>, meta::is_specialization_of<T, as_table_t>,
+		     meta::is_specialization_of<T, forward_as_value_t>, meta::is_specialization_of<T, as_container_t>, meta::is_specialization_of<T, nested>,
+		     meta::is_specialization_of<T, yielding_t>>;
+
+		template <typename T>
+		inline constexpr bool is_msvc_callable_rigged_v = is_msvc_callable_rigged<T>::value;
+	} // namespace detail
+
+	template <typename T>
+	struct is_lua_primitive : std::integral_constant<bool,
+	                               type::userdata != lua_type_of_v<T>                                   // cf
+	                                    || ((type::userdata == lua_type_of_v<T>)                        // cf
+	                                         &&meta::meta_detail::has_internal_marker_v<lua_type_of<T>> // cf
+	                                         && !meta::meta_detail::has_internal_marker_v<lua_size<T>>) // cf
+	                                    || is_lua_reference_or_proxy_v<T>                               // cf
+	                                    || meta::is_specialization_of_v<T, std::tuple>                  // cf
+	                                    || meta::is_specialization_of_v<T, std::pair>> { };
+
+	template <typename T>
+	constexpr inline bool is_lua_primitive_v = is_lua_primitive<T>::value;
+
+	template <typename T>
+	struct is_value_semantic_for_function
+#if SOL_IS_ON(SOL_FUNCTION_CALL_VALUE_SEMANTICS)
+	: std::true_type {
+	};
+#else
+	: std::false_type {
+	};
+#endif
+
+	template <typename T>
+	constexpr inline bool is_value_semantic_for_function_v = is_value_semantic_for_function<T>::value;
+
+	template <typename T>
+	struct is_main_threaded : std::is_base_of<main_reference, T> { };
+
+	template <typename T>
+	inline constexpr bool is_main_threaded_v = is_main_threaded<T>::value;
+
+	template <typename T>
+	struct is_stack_based : std::is_base_of<stack_reference, T> { };
+	template <>
+	struct is_stack_based<variadic_args> : std::true_type { };
+	template <>
+	struct is_stack_based<unsafe_function_result> : std::true_type { };
+	template <>
+	struct is_stack_based<protected_function_result> : std::true_type { };
+	template <>
+	struct is_stack_based<stack_proxy> : std::true_type { };
+	template <>
+	struct is_stack_based<stack_proxy_base> : std::true_type { };
+	template <>
+	struct is_stack_based<stack_count> : std::true_type { };
+
+	template <typename T>
+	constexpr inline bool is_stack_based_v = is_stack_based<T>::value;
+
+	template <typename T>
+	struct is_lua_primitive<T*> : std::true_type { };
+	template <>
+	struct is_lua_primitive<unsafe_function_result> : std::true_type { };
+	template <>
+	struct is_lua_primitive<protected_function_result> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<std::reference_wrapper<T>> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<user<T>> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<light<T>> : is_lua_primitive<T*> { };
+	template <typename T>
+	struct is_lua_primitive<optional<T>> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<std::optional<T>> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<as_table_t<T>> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<nested<T>> : std::true_type { };
+	template <>
+	struct is_lua_primitive<userdata_value> : std::true_type { };
+	template <>
+	struct is_lua_primitive<lightuserdata_value> : std::true_type { };
+	template <>
+	struct is_lua_primitive<stack_proxy> : std::true_type { };
+	template <>
+	struct is_lua_primitive<stack_proxy_base> : std::true_type { };
+	template <typename T>
+	struct is_lua_primitive<non_null<T>> : is_lua_primitive<T*> { };
+
+	template <typename T>
+	struct is_lua_index : std::is_integral<T> { };
+	template <>
+	struct is_lua_index<raw_index> : std::true_type { };
+	template <>
+	struct is_lua_index<absolute_index> : std::true_type { };
+	template <>
+	struct is_lua_index<ref_index> : std::true_type { };
+	template <>
+	struct is_lua_index<upvalue_index> : std::true_type { };
+
+	template <typename Signature>
+	struct lua_bind_traits : meta::bind_traits<Signature> {
+	private:
+		typedef meta::bind_traits<Signature> base_t;
+
+	public:
+		typedef std::integral_constant<bool, meta::count_for<is_variadic_arguments, typename base_t::args_list>::value != 0> runtime_variadics_t;
+		static const std::size_t true_arity = base_t::arity;
+		static const std::size_t arity = detail::accumulate_list<std::size_t, 0, lua_size, typename base_t::args_list>::value
+		     - meta::count_for<is_transparent_argument, typename base_t::args_list>::value;
+		static const std::size_t true_free_arity = base_t::free_arity;
+		static const std::size_t free_arity = detail::accumulate_list<std::size_t, 0, lua_size, typename base_t::free_args_list>::value
+		     - meta::count_for<is_transparent_argument, typename base_t::args_list>::value;
+	};
+
+	template <typename T>
+	struct is_table : std::false_type { };
+	template <bool x, typename T>
+	struct is_table<basic_table_core<x, T>> : std::true_type { };
+	template <typename T>
+	struct is_table<basic_lua_table<T>> : std::true_type { };
+
+	template <typename T>
+	inline constexpr bool is_table_v = is_table<T>::value;
+
+	template <typename T>
+	struct is_global_table : std::false_type { };
+	template <typename T>
+	struct is_global_table<basic_table_core<true, T>> : std::true_type { };
+
+	template <typename T>
+	inline constexpr bool is_global_table_v = is_global_table<T>::value;
+
+	template <typename T>
+	struct is_stack_table : std::false_type { };
+	template <bool x, typename T>
+	struct is_stack_table<basic_table_core<x, T>> : std::integral_constant<bool, std::is_base_of_v<stack_reference, T>> { };
+	template <typename T>
+	struct is_stack_table<basic_lua_table<T>> : std::integral_constant<bool, std::is_base_of_v<stack_reference, T>> { };
+
+	template <typename T>
+	inline constexpr bool is_stack_table_v = is_stack_table<T>::value;
+
+	template <typename T>
+	struct is_function : std::false_type { };
+	template <typename T, bool aligned>
+	struct is_function<basic_function<T, aligned>> : std::true_type { };
+	template <typename T, bool aligned, typename Handler>
+	struct is_function<basic_protected_function<T, aligned, Handler>> : std::true_type { };
+
+	template <typename T>
+	using is_lightuserdata = meta::is_specialization_of<T, basic_lightuserdata>;
+
+	template <typename T>
+	inline constexpr bool is_lightuserdata_v = is_lightuserdata<T>::value;
+
+	template <typename T>
+	using is_userdata = meta::is_specialization_of<T, basic_userdata>;
+
+	template <typename T>
+	inline constexpr bool is_userdata_v = is_userdata<T>::value;
+
+	template <typename T>
+	using is_environment = std::integral_constant<bool, is_userdata_v<T> || is_table_v<T> || meta::is_specialization_of_v<T, basic_environment>>;
+
+	template <typename T>
+	inline constexpr bool is_environment_v = is_environment<T>::value;
+
+	template <typename T>
+	using is_table_like = std::integral_constant<bool, is_table_v<T> || is_environment_v<T> || is_userdata_v<T>>;
+
+	template <typename T>
+	inline constexpr bool is_table_like_v = is_table_like<T>::value;
+
+	template <typename T>
+	struct is_automagical
+	: std::integral_constant<bool,
+	       (SOL_IS_ON(SOL_DEFAULT_AUTOMAGICAL_USERTYPES))
+	            || (std::is_array_v<
+	                     meta::unqualified_t<T>> || (!std::is_same_v<meta::unqualified_t<T>, state> && !std::is_same_v<meta::unqualified_t<T>, state_view>))> {
+	};
+
+	template <typename T>
+	inline type type_of() {
+		return lua_type_of<meta::unqualified_t<T>>::value;
+	}
+
+	namespace detail {
+		template <typename T>
+		struct is_non_factory_constructor : std::false_type { };
+
+		template <typename... Args>
+		struct is_non_factory_constructor<constructors<Args...>> : std::true_type { };
+
+		template <typename... Args>
+		struct is_non_factory_constructor<constructor_wrapper<Args...>> : std::true_type { };
+
+		template <>
+		struct is_non_factory_constructor<no_construction> : std::true_type { };
+
+		template <typename T>
+		inline constexpr bool is_non_factory_constructor_v = is_non_factory_constructor<T>::value;
+
+		template <typename T>
+		struct is_constructor : is_non_factory_constructor<T> { };
+
+		template <typename... Args>
+		struct is_constructor<factory_wrapper<Args...>> : std::true_type { };
+
+		template <typename T>
+		struct is_constructor<protect_t<T>> : is_constructor<meta::unqualified_t<T>> { };
+
+		template <typename F, typename... Policies>
+		struct is_constructor<policy_wrapper<F, Policies...>> : is_constructor<meta::unqualified_t<F>> { };
+
+		template <typename T>
+		inline constexpr bool is_constructor_v = is_constructor<T>::value;
+
+		template <typename... Args>
+		using any_is_constructor = meta::any<is_constructor<meta::unqualified_t<Args>>...>;
+
+		template <typename... Args>
+		inline constexpr bool any_is_constructor_v = any_is_constructor<Args...>::value;
+
+		template <typename T>
+		struct is_destructor : std::false_type { };
+
+		template <typename Fx>
+		struct is_destructor<destructor_wrapper<Fx>> : std::true_type { };
+
+		template <typename... Args>
+		using any_is_destructor = meta::any<is_destructor<meta::unqualified_t<Args>>...>;
+
+		template <typename... Args>
+		inline constexpr bool any_is_destructor_v = any_is_destructor<Args...>::value;
+	} // namespace detail
+
+	template <typename T>
+	using is_lua_c_function = meta::any<std::is_same<lua_CFunction, T>, std::is_same<detail::lua_CFunction_noexcept, T>, std::is_same<lua_CFunction_ref, T>>;
+
+	template <typename T>
+	inline constexpr bool is_lua_c_function_v = is_lua_c_function<T>::value;
+
+	enum class automagic_flags : unsigned {
+		none = 0x000u,
+		default_constructor = 0x001,
+		destructor = 0x002u,
+		pairs_operator = 0x004u,
+		to_string_operator = 0x008u,
+		call_operator = 0x010u,
+		less_than_operator = 0x020u,
+		less_than_or_equal_to_operator = 0x040u,
+		length_operator = 0x080u,
+		equal_to_operator = 0x100u,
+		all = default_constructor | destructor | pairs_operator | to_string_operator | call_operator | less_than_operator | less_than_or_equal_to_operator
+		     | length_operator | equal_to_operator
+	};
+
+	inline constexpr automagic_flags operator|(automagic_flags left, automagic_flags right) noexcept {
+		return static_cast<automagic_flags>(
+		     static_cast<std::underlying_type_t<automagic_flags>>(left) | static_cast<std::underlying_type_t<automagic_flags>>(right));
+	}
+
+	inline constexpr automagic_flags operator&(automagic_flags left, automagic_flags right) noexcept {
+		return static_cast<automagic_flags>(
+		     static_cast<std::underlying_type_t<automagic_flags>>(left) & static_cast<std::underlying_type_t<automagic_flags>>(right));
+	}
+
+	inline constexpr automagic_flags& operator|=(automagic_flags& left, automagic_flags right) noexcept {
+		left = left | right;
+		return left;
+	}
+
+	inline constexpr automagic_flags& operator&=(automagic_flags& left, automagic_flags right) noexcept {
+		left = left & right;
+		return left;
+	}
+
+	template <typename Left, typename Right>
+	constexpr bool has_flag(Left left, Right right) noexcept {
+		return (left & right) == right;
+	}
+
+	template <typename Left, typename Right>
+	constexpr bool has_any_flag(Left left, Right right) noexcept {
+		return (left & right) != static_cast<Left>(static_cast<std::underlying_type_t<Left>>(0));
+	}
+
+	template <typename Left, typename Right>
+	constexpr auto clear_flags(Left left, Right right) noexcept {
+		return static_cast<Left>(static_cast<std::underlying_type_t<Left>>(left) & ~static_cast<std::underlying_type_t<Right>>(right));
+	}
+
+	struct automagic_enrollments {
+		bool default_constructor = true;
+		bool destructor = true;
+		bool pairs_operator = true;
+		bool to_string_operator = true;
+		bool call_operator = true;
+		bool less_than_operator = true;
+		bool less_than_or_equal_to_operator = true;
+		bool length_operator = true;
+		bool equal_to_operator = true;
+	};
+
+	template <automagic_flags compile_time_defaults = automagic_flags::all>
+	struct constant_automagic_enrollments : public automagic_enrollments { };
+
+} // namespace sol
+
+// end of sol/types.hpp
+
+#include <exception>
+#include <cstring>
+
+#if SOL_IS_ON(SOL_PRINT_ERRORS)
+#include <iostream>
+#endif
+
+namespace sol {
+	// must push a single object to be the error object
+	// NOTE: the VAST MAJORITY of all Lua libraries -- C or otherwise -- expect a string for the type of error
+	// break this convention at your own risk
+	using exception_handler_function = int (*)(lua_State*, optional<const std::exception&>, string_view);
+
+	namespace detail {
+		inline const char (&default_exception_handler_name())[11] {
+			static const char name[11] = "sol.\xE2\x98\xA2\xE2\x98\xA2";
+			return name;
+		}
+
+		// must push at least 1 object on the stack
+		inline int default_exception_handler(lua_State* L, optional<const std::exception&>, string_view what) {
+#if SOL_IS_ON(SOL_PRINT_ERRORS)
+			std::cerr << "[sol2] An exception occurred: ";
+			std::cerr.write(what.data(), static_cast<std::streamsize>(what.size()));
+			std::cerr << std::endl;
+#endif
+			lua_pushlstring(L, what.data(), what.size());
+			return 1;
+		}
+
+		inline int call_exception_handler(lua_State* L, optional<const std::exception&> maybe_ex, string_view what) {
+			lua_getglobal(L, default_exception_handler_name());
+			type t = static_cast<type>(lua_type(L, -1));
+			if (t != type::lightuserdata) {
+				lua_pop(L, 1);
+				return default_exception_handler(L, std::move(maybe_ex), std::move(what));
+			}
+			void* vfunc = lua_touserdata(L, -1);
+			lua_pop(L, 1);
+			if (vfunc == nullptr) {
+				return default_exception_handler(L, std::move(maybe_ex), std::move(what));
+			}
+			exception_handler_function exfunc = reinterpret_cast<exception_handler_function>(vfunc);
+			return exfunc(L, std::move(maybe_ex), std::move(what));
+		}
+
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+		template <lua_CFunction f>
+		int static_trampoline(lua_State* L) noexcept {
+			return f(L);
+		}
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+		template <lua_CFunction_noexcept f>
+		int static_trampoline_noexcept(lua_State* L) noexcept {
+			return f(L);
+		}
+#else
+		template <lua_CFunction f>
+		int static_trampoline_noexcept(lua_State* L) noexcept {
+			return f(L);
+		}
+#endif
+
+		template <typename Fx, typename... Args>
+		int trampoline(lua_State* L, Fx&& f, Args&&... args) noexcept {
+			return f(L, std::forward<Args>(args)...);
+		}
+
+		inline int c_trampoline(lua_State* L, lua_CFunction f) noexcept {
+			return trampoline(L, f);
+		}
+#else
+
+		inline int lua_cfunction_trampoline(lua_State* L, lua_CFunction f) {
+#if SOL_IS_ON(SOL_PROPAGATE_EXCEPTIONS)
+			return f(L);
+#else
+			try {
+				return f(L);
+			}
+			catch (const char* cs) {
+				call_exception_handler(L, optional<const std::exception&>(nullopt), string_view(cs));
+			}
+			catch (const std::string& s) {
+				call_exception_handler(L, optional<const std::exception&>(nullopt), string_view(s.c_str(), s.size()));
+			}
+			catch (const std::exception& e) {
+				call_exception_handler(L, optional<const std::exception&>(e), e.what());
+			}
+#if SOL_IS_ON(SOL_EXCEPTIONS_CATCH_ALL)
+			// LuaJIT cannot have the catchall when the safe propagation is on
+			// but LuaJIT will swallow all C++ errors
+			// if we don't at least catch std::exception ones
+			catch (...) {
+				call_exception_handler(L, optional<const std::exception&>(nullopt), "caught (...) exception");
+			}
+#endif // LuaJIT cannot have the catchall, but we must catch std::exceps for it
+			return lua_error(L);
+#endif // Safe exceptions
+		}
+
+		template <lua_CFunction f>
+		int static_trampoline(lua_State* L) {
+			return lua_cfunction_trampoline(L, f);
+		}
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+		template <lua_CFunction_noexcept f>
+		int static_trampoline_noexcept(lua_State* L) noexcept {
+			return f(L);
+		}
+#else
+		template <lua_CFunction f>
+		int static_trampoline_noexcept(lua_State* L) noexcept {
+			return f(L);
+		}
+#endif
+
+		template <typename Fx, typename... Args>
+		int trampoline(lua_State* L, Fx&& f, Args&&... args) {
+			if constexpr (meta::bind_traits<meta::unqualified_t<Fx>>::is_noexcept) {
+				return f(L, std::forward<Args>(args)...);
+			}
+			else {
+#if SOL_IS_ON(SOL_PROPAGATE_EXCEPTIONS)
+				return f(L, std::forward<Args>(args)...);
+#else
+				try {
+					return f(L, std::forward<Args>(args)...);
+				}
+				catch (const char* cs) {
+					call_exception_handler(L, optional<const std::exception&>(nullopt), string_view(cs));
+				}
+				catch (const std::string& s) {
+					call_exception_handler(L, optional<const std::exception&>(nullopt), string_view(s.c_str(), s.size()));
+				}
+				catch (const std::exception& e) {
+					call_exception_handler(L, optional<const std::exception&>(e), e.what());
+				}
+#if SOL_IS_ON(SOL_EXCEPTIONS_CATCH_ALL)
+				// LuaJIT cannot have the catchall when the safe propagation is on
+				// but LuaJIT will swallow all C++ errors
+				// if we don't at least catch std::exception ones
+				catch (...) {
+					call_exception_handler(L, optional<const std::exception&>(nullopt), "caught (...) exception");
+				}
+#endif
+				return lua_error(L);
+#endif
+			}
+		}
+
+		inline int c_trampoline(lua_State* L, lua_CFunction f) {
+			return trampoline(L, f);
+		}
+#endif // Exceptions vs. No Exceptions
+
+		template <typename F, F fx>
+		inline int typed_static_trampoline(lua_State* L) {
+#if 0
+			// TODO: you must evaluate the get/check_get of every
+			// argument, to ensure it doesn't throw
+			// (e.g., for the sol_lua_check_access extension point!)
+			// This incluudes properly noexcept-ing all the above
+			// trampolines / safety nets
+			if constexpr (meta::bind_traits<F>::is_noexcept) {
+				return static_trampoline_noexcept<fx>(L);
+			}
+			else
+#endif
+			{ return static_trampoline<fx>(L); }
+		}
+	} // namespace detail
+
+	inline void set_default_exception_handler(lua_State* L, exception_handler_function exf = &detail::default_exception_handler) {
+		static_assert(sizeof(void*) >= sizeof(exception_handler_function),
+		     "void* storage is too small to transport the exception handler: please file a bug on the sol2 issue tracker to get this looked at!");
+		void* storage;
+		std::memcpy(&storage, &exf, sizeof(exception_handler_function));
+		lua_pushlightuserdata(L, storage);
+		lua_setglobal(L, detail::default_exception_handler_name());
+	}
+} // namespace sol
+
+// end of sol/trampoline.hpp
+
+// beginning of sol/stack_core.hpp
+
+// beginning of sol/inheritance.hpp
+
+// beginning of sol/usertype_traits.hpp
+
+// beginning of sol/demangle.hpp
+
+#include <string>
+#include <array>
+#include <cctype>
+#if SOL_IS_ON(SOL_MINGW_CCTYPE_IS_POISONED)
+extern "C" {
+#include <ctype.h>
+}
+#endif // MinGW is on some stuff
+#include <locale>
+
+namespace sol { namespace detail {
+	inline constexpr std::array<string_view, 9> removals { { "{anonymous}",
+		"(anonymous namespace)",
+		"public:",
+		"private:",
+		"protected:",
+		"struct ",
+		"class ",
+		"`anonymous-namespace'",
+		"`anonymous namespace'" } };
+
+#if SOL_IS_ON(SOL_COMPILER_GCC) || SOL_IS_ON(SOL_COMPILER_CLANG)
+	inline std::string ctti_get_type_name_from_sig(std::string name) {
+		// cardinal sins from MINGW
+		using namespace std;
+		std::size_t start = name.find_first_of('[');
+		start = name.find_first_of('=', start);
+		std::size_t end = name.find_last_of(']');
+		if (end == std::string::npos)
+			end = name.size();
+		if (start == std::string::npos)
+			start = 0;
+		if (start < name.size() - 1)
+			start += 1;
+		name = name.substr(start, end - start);
+		start = name.rfind("seperator_mark");
+		if (start != std::string::npos) {
+			name.erase(start - 2, name.length());
+		}
+		while (!name.empty() && isblank(name.front()))
+			name.erase(name.begin());
+		while (!name.empty() && isblank(name.back()))
+			name.pop_back();
+
+		for (std::size_t r = 0; r < removals.size(); ++r) {
+			auto found = name.find(removals[r]);
+			while (found != std::string::npos) {
+				name.erase(found, removals[r].size());
+				found = name.find(removals[r]);
+			}
+		}
+
+		return name;
+	}
+
+	template <typename T, class seperator_mark = int>
+	inline std::string ctti_get_type_name() {
+		return ctti_get_type_name_from_sig(__PRETTY_FUNCTION__);
+	}
+#elif SOL_IS_ON(SOL_COMPILER_VCXX)
+	inline std::string ctti_get_type_name_from_sig(std::string name) {
+		std::size_t start = name.find("get_type_name");
+		if (start == std::string::npos)
+			start = 0;
+		else
+			start += 13;
+		if (start < name.size() - 1)
+			start += 1;
+		std::size_t end = name.find_last_of('>');
+		if (end == std::string::npos)
+			end = name.size();
+		name = name.substr(start, end - start);
+		if (name.find("struct", 0) == 0)
+			name.replace(0, 6, "", 0);
+		if (name.find("class", 0) == 0)
+			name.replace(0, 5, "", 0);
+		while (!name.empty() && isblank(name.front()))
+			name.erase(name.begin());
+		while (!name.empty() && isblank(name.back()))
+			name.pop_back();
+
+		for (std::size_t r = 0; r < removals.size(); ++r) {
+			auto found = name.find(removals[r]);
+			while (found != std::string::npos) {
+				name.erase(found, removals[r].size());
+				found = name.find(removals[r]);
+			}
+		}
+
+		return name;
+	}
+
+	template <typename T>
+	std::string ctti_get_type_name() {
+		return ctti_get_type_name_from_sig(__FUNCSIG__);
+	}
+#else
+#error Compiler not supported for demangling
+#endif // compilers
+
+	template <typename T>
+	std::string demangle_once() {
+		std::string realname = ctti_get_type_name<T>();
+		return realname;
+	}
+
+	inline std::string short_demangle_from_type_name(std::string realname) {
+		// This isn't the most complete but it'll do for now...?
+		static const std::array<std::string, 10> ops = {
+			{ "operator<", "operator<<", "operator<<=", "operator<=", "operator>", "operator>>", "operator>>=", "operator>=", "operator->", "operator->*" }
+		};
+		int level = 0;
+		std::size_t idx = 0;
+		for (idx = static_cast<std::size_t>(realname.empty() ? 0 : realname.size() - 1); idx > 0; --idx) {
+			if (level == 0 && realname[idx] == ':') {
+				break;
+			}
+			bool isleft = realname[idx] == '<';
+			bool isright = realname[idx] == '>';
+			if (!isleft && !isright)
+				continue;
+			bool earlybreak = false;
+			for (const auto& op : ops) {
+				std::size_t nisop = realname.rfind(op, idx);
+				if (nisop == std::string::npos)
+					continue;
+				std::size_t nisopidx = idx - op.size() + 1;
+				if (nisop == nisopidx) {
+					idx = static_cast<std::size_t>(nisopidx);
+					earlybreak = true;
+				}
+				break;
+			}
+			if (earlybreak) {
+				continue;
+			}
+			level += isleft ? -1 : 1;
+		}
+		if (idx > 0) {
+			realname.erase(0, realname.length() < static_cast<std::size_t>(idx) ? realname.length() : idx + 1);
+		}
+		return realname;
+	}
+
+	template <typename T>
+	std::string short_demangle_once() {
+		std::string realname = ctti_get_type_name<T>();
+		return short_demangle_from_type_name(realname);
+	}
+
+	template <typename T>
+	const std::string& demangle() {
+		static const std::string d = demangle_once<T>();
+		return d;
+	}
+
+	template <typename T>
+	const std::string& short_demangle() {
+		static const std::string d = short_demangle_once<T>();
+		return d;
+	}
+}} // namespace sol::detail
+
+// end of sol/demangle.hpp
+
+namespace sol {
+
+	template <typename T>
+	struct usertype_traits {
+		static const std::string& name() {
+			static const std::string& n = detail::short_demangle<T>();
+			return n;
+		}
+		static const std::string& qualified_name() {
+			static const std::string& q_n = detail::demangle<T>();
+			return q_n;
+		}
+		static const std::string& metatable() {
+			static const std::string m = std::string("sol.").append(detail::demangle<T>());
+			return m;
+		}
+		static const std::string& user_metatable() {
+			static const std::string u_m = std::string("sol.").append(detail::demangle<T>()).append(".user");
+			return u_m;
+		}
+		static const std::string& user_gc_metatable() {
+			static const std::string u_g_m = std::string("sol.").append(detail::demangle<T>()).append(".user\xE2\x99\xBB");
+			return u_g_m;
+		}
+		static const std::string& gc_table() {
+			static const std::string g_t = std::string("sol.").append(detail::demangle<T>()).append(".\xE2\x99\xBB");
+			return g_t;
+		}
+	};
+
+} // namespace sol
+
+// end of sol/usertype_traits.hpp
+
+// beginning of sol/unique_usertype_traits.hpp
+
+#include <memory>
+
+namespace sol {
+
+	namespace detail {
+		template <typename T>
+		struct unique_fallback {
+			using SOL_INTERNAL_UNSPECIALIZED_MARKER_ = int;
+		};
+
+		template <typename T>
+		struct unique_fallback<std::shared_ptr<T>> {
+		private:
+			using pointer = typename std::pointer_traits<std::shared_ptr<T>>::element_type*;
+
+		public:
+			// rebind is non-void
+			// if and only if unique usertype
+			// is cast-capable
+			template <typename X>
+			using rebind_actual_type = std::shared_ptr<X>;
+
+			static bool is_null(lua_State*, const std::shared_ptr<T>& p) noexcept {
+				return p == nullptr;
+			}
+
+			static pointer get(lua_State*, const std::shared_ptr<T>& p) noexcept {
+				return p.get();
+			}
+		};
+
+		template <typename T, typename D>
+		struct unique_fallback<std::unique_ptr<T, D>> {
+		private:
+			using pointer = typename std::unique_ptr<T, D>::pointer;
+
+		public:
+			static bool is_null(lua_State*, const std::unique_ptr<T, D>& p) noexcept {
+				return p == nullptr;
+			}
+
+			static pointer get(lua_State*, const std::unique_ptr<T, D>& p) noexcept {
+				return p.get();
+			}
+		};
+	} // namespace detail
+
+	namespace meta { namespace meta_detail {
+		template <typename T, typename = void>
+		struct unique_actual_type;
+
+		template <typename T>
+		struct unique_actual_type<T, meta::void_t<typename T::actual_type>> {
+			using type = typename T::actual_type;
+		};
+
+		template <typename T, typename... Rest, template <typename...> class Templ>
+		struct unique_actual_type<Templ<T, Rest...>> {
+			using type = T;
+		};
+
+	}} // namespace meta::meta_detail
+
+	template <typename T>
+	using unique_usertype_actual_t = typename meta::meta_detail::unique_actual_type<unique_usertype_traits<T>>::type;
+
+	namespace meta { namespace meta_detail {
+		template <typename T>
+		using value_test_t = decltype(T::value);
+
+		template <typename T>
+		using type_test_t = typename T::type;
+
+		template <typename T>
+		using type_element_type_t = typename T::element_type;
+
+		template <typename T, typename = void>
+		struct unique_element_type {
+			using type = typename std::pointer_traits<typename unique_actual_type<T>::type>::element_type;
+		};
+
+		template <typename T>
+		struct unique_element_type<T, std::enable_if_t<meta::is_detected_v<type_element_type_t, T>>> {
+			using type = typename T::element_type;
+		};
+
+		template <typename T>
+		struct unique_element_type<T, std::enable_if_t<meta::is_detected_v<type_test_t, T>>> {
+			using type = typename T::type;
+		};
+
+		template <typename T, typename = void>
+		struct unique_valid : std::integral_constant<bool, !has_internal_marker_v<T>> { };
+
+		template <typename T>
+		struct unique_valid<T, meta::void_t<decltype(T::value)>> : std::integral_constant<bool, T::value> { };
+	}} // namespace meta::meta_detail
+
+	template <typename T>
+	using unique_usertype_element_t = typename meta::meta_detail::unique_element_type<unique_usertype_traits<T>>::type;
+
+	template <typename T, typename Element = void>
+	using unique_usertype_rebind_actual_t = typename unique_usertype_traits<T>::template rebind_actual_type<Element>;
+
+	template <typename T>
+	struct unique_usertype_traits : public detail::unique_fallback<T> { };
+
+	template <typename T>
+	struct is_unique_usertype : std::integral_constant<bool, meta::meta_detail::unique_valid<unique_usertype_traits<T>>::value> { };
+
+	template <typename T>
+	inline constexpr bool is_unique_usertype_v = is_unique_usertype<T>::value;
+
+	namespace meta { namespace meta_detail {
+		template <typename T>
+		using adl_sol_lua_check_access_test_t
+			= decltype(sol_lua_check_access(types<T>(), static_cast<lua_State*>(nullptr), -1, std::declval<stack::record&>()));
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_check_access_v = meta::is_detected_v<adl_sol_lua_check_access_test_t, T>;
+
+		template <typename T>
+		using unique_usertype_get_with_state_test_t
+			= decltype(unique_usertype_traits<T>::get(static_cast<lua_State*>(nullptr), std::declval<unique_usertype_actual_t<T>>()));
+
+		template <typename T>
+		inline constexpr bool unique_usertype_get_with_state_v = meta::is_detected_v<unique_usertype_get_with_state_test_t, T>;
+
+		template <typename T>
+		using unique_usertype_is_null_with_state_test_t
+			= decltype(unique_usertype_traits<T>::is_null(static_cast<lua_State*>(nullptr), std::declval<unique_usertype_actual_t<T>>()));
+
+		template <typename T>
+		inline constexpr bool unique_usertype_is_null_with_state_v = meta::is_detected_v<unique_usertype_is_null_with_state_test_t, T>;
+	}} // namespace meta::meta_detail
+
+	namespace detail {
+		template <typename T>
+		constexpr bool unique_is_null_noexcept() noexcept {
+			if constexpr (meta::meta_detail::unique_usertype_is_null_with_state_v<std::remove_cv_t<T>>) {
+				return noexcept(
+				     unique_usertype_traits<T>::is_null(static_cast<lua_State*>(nullptr), std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
+			}
+			else {
+				return noexcept(unique_usertype_traits<T>::is_null(std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
+			}
+		}
+
+		template <typename T>
+		bool unique_is_null(lua_State* L_, T& value_) noexcept(unique_is_null_noexcept<std::remove_cv_t<T>>()) {
+			using Tu = std::remove_cv_t<T>;
+			if constexpr (meta::meta_detail::unique_usertype_is_null_with_state_v<Tu>) {
+				return unique_usertype_traits<Tu>::is_null(L_, value_);
+			}
+			else {
+				return unique_usertype_traits<Tu>::is_null(value_);
+			}
+		}
+
+		template <typename T>
+		constexpr bool unique_get_noexcept() noexcept {
+			if constexpr (meta::meta_detail::unique_usertype_get_with_state_v<std::remove_cv_t<T>>) {
+				return noexcept(
+				     unique_usertype_traits<T>::get(static_cast<lua_State*>(nullptr), std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
+			}
+			else {
+				return noexcept(unique_usertype_traits<T>::get(std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
+			}
+		}
+
+		template <typename T>
+		auto unique_get(lua_State* L_, T& value_) noexcept(unique_get_noexcept<std::remove_cv_t<T>>()) {
+			using Tu = std::remove_cv_t<T>;
+			if constexpr (meta::meta_detail::unique_usertype_get_with_state_v<Tu>) {
+				return unique_usertype_traits<Tu>::get(L_, value_);
+			}
+			else {
+				return unique_usertype_traits<Tu>::get(value_);
+			}
+		}
+	} // namespace detail
+
+	namespace meta { namespace meta_detail {
+		template <typename T, typename Element = void>
+		using is_rebind_actual_type_test_t = typename T::template rebind_actual_type<Element>;
+
+		template <typename T, typename Element = void>
+		using is_rebind_actual_type = meta::is_detected<is_rebind_actual_type_test_t, T, Element>;
+
+		template <typename T, typename Element = void>
+		inline constexpr bool is_rebind_actual_type_v = is_rebind_actual_type<T, Element>::value;
+
+		template <typename T, typename Element, bool = is_rebind_actual_type_v<T, Element>>
+		struct is_actual_type_rebindable_for_test : std::false_type { };
+
+		template <typename T, typename Element>
+		struct is_actual_type_rebindable_for_test<T, Element, true>
+		: std::integral_constant<bool, !std::is_void_v<typename T::template rebind_actual_type<Element>>> { };
+	}} // namespace meta::meta_detail
+
+	template <typename T, typename Element = void>
+	using is_actual_type_rebindable_for = typename meta::meta_detail::is_actual_type_rebindable_for_test<unique_usertype_traits<T>, Element>::type;
+
+	template <typename T, typename Element = void>
+	inline constexpr bool is_actual_type_rebindable_for_v = is_actual_type_rebindable_for<T, Element>::value;
+
+} // namespace sol
+
+// end of sol/unique_usertype_traits.hpp
+
+namespace sol {
+	template <typename... Args>
+	struct base_list { };
+	template <typename... Args>
+	using bases = base_list<Args...>;
+
+	typedef bases<> base_classes_tag;
+	const auto base_classes = base_classes_tag();
+
+	template <typename... Args>
+	struct is_to_stringable<base_list<Args...>> : std::false_type { };
+
+	namespace detail {
+
+		inline decltype(auto) base_class_check_key() {
+			static const auto& key = "class_check";
+			return key;
+		}
+
+		inline decltype(auto) base_class_cast_key() {
+			static const auto& key = "class_cast";
+			return key;
+		}
+
+		inline decltype(auto) base_class_index_propogation_key() {
+			static const auto& key = u8"\xF0\x9F\x8C\xB2.index";
+			return key;
+		}
+
+		inline decltype(auto) base_class_new_index_propogation_key() {
+			static const auto& key = u8"\xF0\x9F\x8C\xB2.new_index";
+			return key;
+		}
+
+		template <typename T>
+		struct inheritance {
+			typedef typename base<T>::type bases_t;
+
+			static bool type_check_bases(types<>, const string_view&) {
+				return false;
+			}
+
+			template <typename Base, typename... Args>
+			static bool type_check_bases(types<Base, Args...>, const string_view& ti) {
+				return ti == usertype_traits<Base>::qualified_name() || type_check_bases(types<Args...>(), ti);
+			}
+
+			static bool type_check(const string_view& ti) {
+				return ti == usertype_traits<T>::qualified_name() || type_check_bases(bases_t(), ti);
+			}
+
+			template <typename... Bases>
+			static bool type_check_with(const string_view& ti) {
+				return ti == usertype_traits<T>::qualified_name() || type_check_bases(types<Bases...>(), ti);
+			}
+
+			static void* type_cast_bases(types<>, T*, const string_view&) {
+				return nullptr;
+			}
+
+			template <typename Base, typename... Args>
+			static void* type_cast_bases(types<Base, Args...>, T* data, const string_view& ti) {
+				// Make sure to convert to T first, and then dynamic cast to the proper type
+				return ti != usertype_traits<Base>::qualified_name() ? type_cast_bases(types<Args...>(), data, ti)
+				                                                     : static_cast<void*>(static_cast<Base*>(data));
+			}
+
+			static void* type_cast(void* voiddata, const string_view& ti) {
+				T* data = static_cast<T*>(voiddata);
+				return static_cast<void*>(ti != usertype_traits<T>::qualified_name() ? type_cast_bases(bases_t(), data, ti) : data);
+			}
+
+			template <typename... Bases>
+			static void* type_cast_with(void* voiddata, const string_view& ti) {
+				T* data = static_cast<T*>(voiddata);
+				return static_cast<void*>(ti != usertype_traits<T>::qualified_name() ? type_cast_bases(types<Bases...>(), data, ti) : data);
+			}
+
+			template <typename U>
+			static bool type_unique_cast_bases(types<>, void*, void*, const string_view&) {
+				return 0;
+			}
+
+			template <typename U, typename Base, typename... Args>
+			static int type_unique_cast_bases(types<Base, Args...>, void* source_data, void* target_data, const string_view& ti) {
+				using uu_traits = unique_usertype_traits<U>;
+				using base_ptr = typename uu_traits::template rebind_actual_type<Base>;
+				string_view base_ti = usertype_traits<Base>::qualified_name();
+				if (base_ti == ti) {
+					if (target_data != nullptr) {
+						U* source = static_cast<U*>(source_data);
+						base_ptr* target = static_cast<base_ptr*>(target_data);
+						// perform proper derived -> base conversion
+						*target = *source;
+					}
+					return 2;
+				}
+				return type_unique_cast_bases<U>(types<Args...>(), source_data, target_data, ti);
+			}
+
+			template <typename U>
+			static int type_unique_cast(void* source_data, void* target_data, const string_view& ti, const string_view& rebind_ti) {
+				if constexpr (is_actual_type_rebindable_for_v<U>) {
+					using rebound_actual_type = unique_usertype_rebind_actual_t<U>;
+					using maybe_bases_or_empty = meta::conditional_t<std::is_void_v<rebound_actual_type>, types<>, bases_t>;
+					string_view this_rebind_ti = usertype_traits<rebound_actual_type>::qualified_name();
+					if (rebind_ti != this_rebind_ti) {
+						// this is not even of the same unique type
+						return 0;
+					}
+					string_view this_ti = usertype_traits<T>::qualified_name();
+					if (ti == this_ti) {
+						// direct match, return 1
+						return 1;
+					}
+					return type_unique_cast_bases<U>(maybe_bases_or_empty(), source_data, target_data, ti);
+				}
+				else {
+					(void)rebind_ti;
+					string_view this_ti = usertype_traits<T>::qualified_name();
+					if (ti == this_ti) {
+						// direct match, return 1
+						return 1;
+					}
+					return type_unique_cast_bases<U>(types<>(), source_data, target_data, ti);
+				}
+			}
+
+			template <typename U, typename... Bases>
+			static int type_unique_cast_with(void* source_data, void* target_data, const string_view& ti, const string_view& rebind_ti) {
+				using uc_bases_t = types<Bases...>;
+				if constexpr (is_actual_type_rebindable_for_v<U>) {
+					using rebound_actual_type = unique_usertype_rebind_actual_t<U>;
+					using cond_bases_t = meta::conditional_t<std::is_void_v<rebound_actual_type>, types<>, uc_bases_t>;
+					string_view this_rebind_ti = usertype_traits<rebound_actual_type>::qualified_name();
+					if (rebind_ti != this_rebind_ti) {
+						// this is not even of the same unique type
+						return 0;
+					}
+					string_view this_ti = usertype_traits<T>::qualified_name();
+					if (ti == this_ti) {
+						// direct match, return 1
+						return 1;
+					}
+					return type_unique_cast_bases<U>(cond_bases_t(), source_data, target_data, ti);
+				}
+				else {
+					(void)rebind_ti;
+					string_view this_ti = usertype_traits<T>::qualified_name();
+					if (ti == this_ti) {
+						// direct match, return 1
+						return 1;
+					}
+					return type_unique_cast_bases<U>(types<>(), source_data, target_data, ti);
+				}
+			}
+		};
+
+		using inheritance_check_function = decltype(&inheritance<void>::type_check);
+		using inheritance_cast_function = decltype(&inheritance<void>::type_cast);
+		using inheritance_unique_cast_function = decltype(&inheritance<void>::type_unique_cast<void>);
+	} // namespace detail
+} // namespace sol
+
+// end of sol/inheritance.hpp
+
+// beginning of sol/error_handler.hpp
+
+#include <cstdio>
+
+namespace sol {
+
+	namespace detail {
+		constexpr const char* not_a_number = "not a numeric type";
+		constexpr const char* not_a_number_or_number_string = "not a numeric type or numeric string";
+		constexpr const char* not_a_number_integral = "not a numeric type that fits exactly an integer (number maybe has significant decimals)";
+		constexpr const char* not_a_number_or_number_string_integral
+		     = "not a numeric type or a numeric string that fits exactly an integer (e.g. number maybe has significant decimals)";
+
+		constexpr const char* not_enough_stack_space = "not enough space left on Lua stack";
+		constexpr const char* not_enough_stack_space_floating = "not enough space left on Lua stack for a floating point number";
+		constexpr const char* not_enough_stack_space_integral = "not enough space left on Lua stack for an integral number";
+		constexpr const char* not_enough_stack_space_string = "not enough space left on Lua stack for a string";
+		constexpr const char* not_enough_stack_space_meta_function_name = "not enough space left on Lua stack for the name of a meta_function";
+		constexpr const char* not_enough_stack_space_userdata = "not enough space left on Lua stack to create a sol2 userdata";
+		constexpr const char* not_enough_stack_space_generic = "not enough space left on Lua stack to push valuees";
+		constexpr const char* not_enough_stack_space_environment = "not enough space left on Lua stack to retrieve environment";
+		constexpr const char* protected_function_error = "caught (...) unknown error during protected_function call";
+
+		inline void accumulate_and_mark(const std::string& n, std::string& aux_message, int& marker) {
+			if (marker > 0) {
+				aux_message += ", ";
+			}
+			aux_message += n;
+			++marker;
+		}
+	} // namespace detail
+
+	inline std::string associated_type_name(lua_State* L, int index, type t) {
+		switch (t) {
+		case type::poly:
+			return "anything";
+		case type::userdata: {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 2, "not enough space to push get the type name");
+#endif // make sure stack doesn't overflow
+			if (lua_getmetatable(L, index) == 0) {
+				break;
+			}
+			lua_pushlstring(L, "__name", 6);
+			lua_rawget(L, -2);
+			size_t sz;
+			const char* name = lua_tolstring(L, -1, &sz);
+			std::string tn(name, static_cast<std::string::size_type>(sz));
+			lua_pop(L, 2);
+			return tn;
+		}
+		default:
+			break;
+		}
+		return lua_typename(L, static_cast<int>(t));
+	}
+
+	inline int push_type_panic_string(lua_State* L, int index, type expected, type actual, string_view message, string_view aux_message) noexcept {
+		const char* err = message.size() == 0
+		     ? (aux_message.size() == 0 ? "stack index %d, expected %s, received %s" : "stack index %d, expected %s, received %s: %s")
+		     : "stack index %d, expected %s, received %s: %s %s";
+		const char* type_name = expected == type::poly ? "anything" : lua_typename(L, static_cast<int>(expected));
+		{
+			std::string actual_name = associated_type_name(L, index, actual);
+			lua_pushfstring(L, err, index, type_name, actual_name.c_str(), message.data(), aux_message.data());
+		}
+		return 1;
+	}
+
+	inline int type_panic_string(lua_State* L, int index, type expected, type actual, string_view message = "") noexcept(false) {
+		push_type_panic_string(L, index, expected, actual, message, "");
+		return lua_error(L);
+	}
+
+	inline int type_panic_c_str(lua_State* L, int index, type expected, type actual, const char* message = nullptr) noexcept(false) {
+		push_type_panic_string(L, index, expected, actual, message == nullptr ? "" : message, "");
+		return lua_error(L);
+	}
+
+	struct type_panic_t {
+		int operator()(lua_State* L, int index, type expected, type actual) const noexcept(false) {
+			return type_panic_c_str(L, index, expected, actual, nullptr);
+		}
+		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
+			return type_panic_c_str(L, index, expected, actual, message.data());
+		}
+	};
+
+	const type_panic_t type_panic = {};
+
+	struct constructor_handler {
+		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
+			push_type_panic_string(L, index, expected, actual, message, "(type check failed in constructor)");
+			return lua_error(L);
+		}
+	};
+
+	template <typename F = void>
+	struct argument_handler {
+		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
+			push_type_panic_string(L, index, expected, actual, message, "(bad argument to variable or function call)");
+			return lua_error(L);
+		}
+	};
+
+	template <typename R, typename... Args>
+	struct argument_handler<types<R, Args...>> {
+		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
+			{
+				std::string aux_message = "(bad argument into '";
+				aux_message += detail::demangle<R>();
+				aux_message += "(";
+				int marker = 0;
+				(void)detail::swallow { int(), (detail::accumulate_and_mark(detail::demangle<Args>(), aux_message, marker), int())... };
+				aux_message += ")')";
+				push_type_panic_string(L, index, expected, actual, message, aux_message);
+			}
+			return lua_error(L);
+		}
+	};
+
+	// Specify this function as the handler for lua::check if you know there's nothing wrong
+	inline int no_panic(lua_State*, int, type, type, const char* = nullptr) noexcept {
+		return 0;
+	}
+
+	inline void type_error(lua_State* L, int expected, int actual) noexcept(false) {
+		luaL_error(L, "expected %s, received %s", lua_typename(L, expected), lua_typename(L, actual));
+	}
+
+	inline void type_error(lua_State* L, type expected, type actual) noexcept(false) {
+		type_error(L, static_cast<int>(expected), static_cast<int>(actual));
+	}
+
+	inline void type_assert(lua_State* L, int index, type expected, type actual) noexcept(false) {
+		if (expected != type::poly && expected != actual) {
+			type_panic_c_str(L, index, expected, actual, nullptr);
+		}
+	}
+
+	inline void type_assert(lua_State* L, int index, type expected) {
+		type actual = type_of(L, index);
+		type_assert(L, index, expected, actual);
+	}
+
+} // namespace sol
+
+// end of sol/error_handler.hpp
+
+// beginning of sol/reference.hpp
+
+// beginning of sol/stack_reference.hpp
+
+namespace sol {
+	namespace detail {
+		inline bool xmovable(lua_State* leftL, lua_State* rightL) {
+			if (rightL == nullptr || leftL == nullptr || leftL == rightL) {
+				return false;
+			}
+			const void* leftregistry = lua_topointer(leftL, LUA_REGISTRYINDEX);
+			const void* rightregistry = lua_topointer(rightL, LUA_REGISTRYINDEX);
+			return leftregistry == rightregistry;
+		}
+	} // namespace detail
+
+	class stateless_stack_reference {
+	private:
+		friend class stack_reference;
+
+		int m_index = 0;
+
+		int registry_index() const noexcept {
+			return LUA_NOREF;
+		}
+
+	public:
+		stateless_stack_reference() noexcept = default;
+		stateless_stack_reference(lua_nil_t) noexcept : stateless_stack_reference() {};
+		stateless_stack_reference(lua_State* L_, int index_) noexcept : stateless_stack_reference(absolute_index(L_, index_)) {
+		}
+		stateless_stack_reference(lua_State*, absolute_index index_) noexcept : stateless_stack_reference(index_) {
+		}
+		stateless_stack_reference(lua_State*, raw_index index_) noexcept : stateless_stack_reference(index_) {
+		}
+		stateless_stack_reference(absolute_index index_) noexcept : m_index(index_) {
+		}
+		stateless_stack_reference(raw_index index_) noexcept : m_index(index_) {
+		}
+		stateless_stack_reference(lua_State*, ref_index) noexcept = delete;
+		stateless_stack_reference(ref_index) noexcept = delete;
+		stateless_stack_reference(const reference&) noexcept = delete;
+		stateless_stack_reference(const stateless_stack_reference&) noexcept = default;
+		stateless_stack_reference(stateless_stack_reference&& o) noexcept = default;
+		stateless_stack_reference& operator=(stateless_stack_reference&&) noexcept = default;
+		stateless_stack_reference& operator=(const stateless_stack_reference&) noexcept = default;
+
+		int push(lua_State* L_) const noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L_, 1, "not enough Lua stack space to push a single reference value");
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L_, m_index);
+			return 1;
+		}
+
+		void pop(lua_State* L_, int pop_count = 1) const noexcept {
+			lua_pop(L_, pop_count);
+		}
+
+		int stack_index() const noexcept {
+			return m_index;
+		}
+
+		const void* pointer(lua_State* L_) const noexcept {
+			const void* pointer_id = lua_topointer(L_, stack_index());
+			return pointer_id;
+		}
+
+		type get_type(lua_State* L_) const noexcept {
+			int untyped_value = lua_type(L_, stack_index());
+			return static_cast<type>(untyped_value);
+		}
+
+		bool valid(lua_State* L) const noexcept {
+			type t = get_type(L);
+			return t != type::lua_nil && t != type::none;
+		}
+
+		void reset(lua_State*) noexcept {
+			m_index = 0;
+		}
+
+		void reset(lua_State* L_, int index_) noexcept {
+			m_index = absolute_index(L_, index_);
+		}
+
+		void abandon(lua_State* = nullptr) noexcept {
+			m_index = 0;
+		}
+
+		stateless_stack_reference copy(lua_State* L_) const noexcept {
+			return stateless_stack_reference(L_, raw_index(m_index));
+		}
+
+		void copy_assign(lua_State*, const stateless_stack_reference& right) noexcept {
+			m_index = right.m_index;
+		}
+
+		bool equals(lua_State* L_, const stateless_stack_reference& r) const noexcept {
+			return lua_compare(L_, this->stack_index(), r.stack_index(), LUA_OPEQ) == 1;
+		}
+
+		bool equals(lua_State* L_, lua_nil_t) const noexcept {
+			return valid(L_);
+		}
+	};
+
+	class stack_reference : public stateless_stack_reference {
+	private:
+		lua_State* luastate = nullptr;
+
+	public:
+		stack_reference() noexcept = default;
+		stack_reference(lua_nil_t) noexcept : stack_reference() {};
+		stack_reference(lua_State* L, lua_nil_t) noexcept : stateless_stack_reference(L, 0), luastate(L) {
+		}
+		stack_reference(lua_State* L, int i) noexcept : stateless_stack_reference(L, i), luastate(L) {
+		}
+		stack_reference(lua_State* L, absolute_index i) noexcept : stateless_stack_reference(L, i), luastate(L) {
+		}
+		stack_reference(lua_State* L, raw_index i) noexcept : stateless_stack_reference(L, i), luastate(L) {
+		}
+		stack_reference(lua_State* L, ref_index i) noexcept = delete;
+		stack_reference(lua_State* L, const reference& r) noexcept = delete;
+		stack_reference(lua_State* L, const stack_reference& r) noexcept : luastate(L) {
+			if (!r.valid()) {
+				m_index = 0;
+				return;
+			}
+			int i = r.stack_index();
+			if (detail::xmovable(lua_state(), r.lua_state())) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, 1, "not enough Lua stack space to push a single reference value");
+#endif // make sure stack doesn't overflow
+				lua_pushvalue(r.lua_state(), r.stack_index());
+				lua_xmove(r.lua_state(), luastate, 1);
+				i = absolute_index(luastate, -1);
+			}
+			m_index = i;
+		}
+		stack_reference(stack_reference&& o) noexcept = default;
+		stack_reference& operator=(stack_reference&&) noexcept = default;
+		stack_reference(const stack_reference&) noexcept = default;
+		stack_reference& operator=(const stack_reference&) noexcept = default;
+
+		int push() const noexcept {
+			return push(lua_state());
+		}
+
+		int push(lua_State* L_) const noexcept {
+			return stateless_stack_reference::push(L_);
+		}
+
+		void pop() const noexcept {
+			pop(lua_state());
+		}
+
+		void pop(lua_State* L_, int pop_count_ = 1) const noexcept {
+			stateless_stack_reference::pop(L_, pop_count_);
+		}
+
+		const void* pointer() const noexcept {
+			return stateless_stack_reference::pointer(lua_state());
+		}
+
+		type get_type() const noexcept {
+			return stateless_stack_reference::get_type(lua_state());
+		}
+
+		lua_State* lua_state() const noexcept {
+			return luastate;
+		}
+
+		bool valid() const noexcept {
+			return stateless_stack_reference::valid(lua_state());
+		}
+
+		void abandon() {
+			stateless_stack_reference::abandon(lua_state());
+		}
+	};
+
+	inline bool operator==(const stack_reference& l, const stack_reference& r) {
+		return lua_compare(l.lua_state(), l.stack_index(), r.stack_index(), LUA_OPEQ) == 1;
+	}
+
+	inline bool operator!=(const stack_reference& l, const stack_reference& r) {
+		return !operator==(l, r);
+	}
+
+	inline bool operator==(const stack_reference& lhs, const lua_nil_t&) {
+		return !lhs.valid();
+	}
+
+	inline bool operator==(const lua_nil_t&, const stack_reference& rhs) {
+		return !rhs.valid();
+	}
+
+	inline bool operator!=(const stack_reference& lhs, const lua_nil_t&) {
+		return lhs.valid();
+	}
+
+	inline bool operator!=(const lua_nil_t&, const stack_reference& rhs) {
+		return rhs.valid();
+	}
+
+	inline bool operator==(const stateless_stack_reference& l, const stateless_stack_reference& r) {
+		return l.stack_index() == r.stack_index();
+	}
+
+	inline bool operator!=(const stateless_stack_reference& l, const stateless_stack_reference& r) {
+		return l.stack_index() != r.stack_index();
+	}
+
+	struct stateless_stack_reference_equals {
+		using is_transparent = std::true_type;
+
+		stateless_stack_reference_equals(lua_State* L_) noexcept : m_L(L_) {
+		}
+
+		lua_State* lua_state() const noexcept {
+			return m_L;
+		}
+
+		bool operator()(const stateless_stack_reference& lhs, const stateless_stack_reference& rhs) const {
+			return lhs.equals(lua_state(), rhs);
+		}
+
+		bool operator()(lua_nil_t lhs, const stateless_stack_reference& rhs) const {
+			return rhs.equals(lua_state(), lhs);
+		}
+
+		bool operator()(const stateless_stack_reference& lhs, lua_nil_t rhs) const {
+			return lhs.equals(lua_state(), rhs);
+		}
+
+	private:
+		lua_State* m_L;
+	};
+
+	struct stack_reference_equals {
+		using is_transparent = std::true_type;
+
+		bool operator()(const lua_nil_t& lhs, const stack_reference& rhs) const {
+			return lhs == rhs;
+		}
+
+		bool operator()(const stack_reference& lhs, const lua_nil_t& rhs) const {
+			return lhs == rhs;
+		}
+
+		bool operator()(const stack_reference& lhs, const stack_reference& rhs) const {
+			return lhs == rhs;
+		}
+	};
+
+	struct stateless_stack_reference_hash {
+		using argument_type = stateless_stack_reference;
+		using result_type = std::size_t;
+		using is_transparent = std::true_type;
+
+		stateless_stack_reference_hash(lua_State* L_) noexcept : m_L(L_) {
+		}
+
+		lua_State* lua_state() const noexcept {
+			return m_L;
+		}
+
+		result_type operator()(const argument_type& lhs) const noexcept {
+			std::hash<const void*> h;
+			return h(lhs.pointer(lua_state()));
+		}
+
+	private:
+		lua_State* m_L;
+	};
+
+	struct stack_reference_hash {
+		using argument_type = stack_reference;
+		using result_type = std::size_t;
+		using is_transparent = std::true_type;
+
+		result_type operator()(const argument_type& lhs) const noexcept {
+			std::hash<const void*> h;
+			return h(lhs.pointer());
+		}
+	};
+} // namespace sol
+
+// end of sol/stack_reference.hpp
+
+#include <functional>
+
+namespace sol {
+	namespace detail {
+		inline const char (&default_main_thread_name())[9] {
+			static const char name[9] = "sol.\xF0\x9F\x93\x8C";
+			return name;
+		}
+	} // namespace detail
+
+	namespace stack {
+		inline void remove(lua_State* L_, int rawindex, int count) {
+			if (count < 1)
+				return;
+			int top = lua_gettop(L_);
+			if (top < 1) {
+				return;
+			}
+			if (rawindex == -count || top == rawindex) {
+				// Slice them right off the top
+				lua_pop(L_, static_cast<int>(count));
+				return;
+			}
+
+			// Remove each item one at a time using stack operations
+			// Probably slower, maybe, haven't benchmarked,
+			// but necessary
+			int index = lua_absindex(L_, rawindex);
+			if (index < 0) {
+				index = lua_gettop(L_) + (index + 1);
+			}
+			int last = index + count;
+			for (int i = index; i < last; ++i) {
+				lua_remove(L_, index);
+			}
+		}
+
+		struct push_popper_at {
+			lua_State* L;
+			int index;
+			int count;
+			push_popper_at(lua_State* L_, int index_ = -1, int count_ = 1) : L(L_), index(index_), count(count_) {
+			}
+			~push_popper_at() {
+				remove(L, index, count);
+			}
+		};
+
+		template <bool top_level>
+		struct push_popper_n {
+			lua_State* L;
+			int pop_count;
+			push_popper_n(lua_State* L_, int pop_count_) : L(L_), pop_count(pop_count_) {
+			}
+			push_popper_n(const push_popper_n&) = delete;
+			push_popper_n(push_popper_n&&) = default;
+			push_popper_n& operator=(const push_popper_n&) = delete;
+			push_popper_n& operator=(push_popper_n&&) = default;
+			~push_popper_n() {
+				lua_pop(L, pop_count);
+			}
+		};
+
+		template <>
+		struct push_popper_n<true> {
+			push_popper_n(lua_State*, int) {
+			}
+		};
+
+		template <bool, typename T, typename = void>
+		struct push_popper {
+			using Tu = meta::unqualified_t<T>;
+			T m_object;
+			int m_index;
+
+			push_popper(T object_) noexcept : m_object(object_), m_index(lua_absindex(m_object.lua_state(), -m_object.push())) {
+			}
+
+			int index_of(const Tu&) const noexcept {
+				return m_index;
+			}
+
+			~push_popper() {
+				m_object.pop();
+			}
+		};
+
+		template <typename T, typename C>
+		struct push_popper<true, T, C> {
+			using Tu = meta::unqualified_t<T>;
+
+			push_popper(T) noexcept {
+			}
+
+			int index_of(const Tu&) const noexcept {
+				return -1;
+			}
+
+			~push_popper() {
+			}
+		};
+
+		template <typename T>
+		struct push_popper<false, T, std::enable_if_t<is_stack_based_v<meta::unqualified_t<T>>>> {
+			using Tu = meta::unqualified_t<T>;
+
+			push_popper(T) noexcept {
+			}
+
+			int index_of(const Tu& object_) const noexcept {
+				return object_.stack_index();
+			}
+
+			~push_popper() {
+			}
+		};
+
+		template <bool, typename T, typename = void>
+		struct stateless_push_popper {
+			using Tu = meta::unqualified_t<T>;
+			lua_State* m_L;
+			T m_object;
+			int m_index;
+
+			stateless_push_popper(lua_State* L_, T object_) noexcept : m_L(L_), m_object(object_), m_index(lua_absindex(m_L, -m_object.push(m_L))) {
+			}
+
+			int index_of(const Tu&) const noexcept {
+				return m_index;
+			}
+
+			~stateless_push_popper() {
+				m_object.pop(m_L);
+			}
+		};
+
+		template <typename T, typename C>
+		struct stateless_push_popper<true, T, C> {
+			using Tu = meta::unqualified_t<T>;
+
+			stateless_push_popper(lua_State*, T) noexcept {
+			}
+
+			int index_of(lua_State*, const Tu&) const noexcept {
+				return -1;
+			}
+
+			~stateless_push_popper() {
+			}
+		};
+
+		template <typename T>
+		struct stateless_push_popper<false, T, std::enable_if_t<is_stack_based_v<meta::unqualified_t<T>>>> {
+			using Tu = meta::unqualified_t<T>;
+			lua_State* m_L;
+
+			stateless_push_popper(lua_State* L_, T) noexcept : m_L(L_) {
+			}
+
+			int index_of(const Tu& object_) const noexcept {
+				return object_.stack_index();
+			}
+
+			~stateless_push_popper() {
+			}
+		};
+
+		template <bool top_level = false, typename T>
+		push_popper<top_level, T> push_pop(T&& x) {
+			return push_popper<top_level, T>(std::forward<T>(x));
+		}
+
+		template <bool top_level = false, typename T>
+		stateless_push_popper<top_level, T> push_pop(lua_State* L_, T&& object_) {
+			return stateless_push_popper<top_level, T>(L_, std::forward<T>(object_));
+		}
+
+		template <typename T>
+		push_popper_at push_pop_at(T&& object_) {
+			int push_count = object_.push();
+			lua_State* L = object_.lua_state();
+			return push_popper_at(L, lua_absindex(L, -push_count), push_count);
+		}
+
+		template <bool top_level = false>
+		push_popper_n<top_level> pop_n(lua_State* L_, int pop_count_) {
+			return push_popper_n<top_level>(L_, pop_count_);
+		}
+	} // namespace stack
+
+	inline lua_State* main_thread(lua_State* L_, lua_State* backup_if_unsupported_ = nullptr) {
+#if SOL_LUA_VERSION_I_ < 502
+		if (L_ == nullptr)
+			return backup_if_unsupported_;
+		lua_getglobal(L_, detail::default_main_thread_name());
+		auto pp = stack::pop_n(L_, 1);
+		if (type_of(L_, -1) == type::thread) {
+			return lua_tothread(L_, -1);
+		}
+		return backup_if_unsupported_;
+#else
+		if (L_ == nullptr)
+			return backup_if_unsupported_;
+		lua_rawgeti(L_, LUA_REGISTRYINDEX, LUA_RIDX_MAINTHREAD);
+		lua_State* Lmain = lua_tothread(L_, -1);
+		lua_pop(L_, 1);
+		return Lmain;
+#endif // Lua 5.2+ has the main thread unqualified_getter
+	}
+
+	namespace detail {
+		struct no_safety_tag {
+		} inline constexpr no_safety {};
+
+		template <bool b>
+		inline lua_State* pick_main_thread(lua_State* L_, lua_State* backup_if_unsupported = nullptr) {
+			(void)L_;
+			(void)backup_if_unsupported;
+			if (b) {
+				return main_thread(L_, backup_if_unsupported);
+			}
+			return L_;
+		}
+	} // namespace detail
+
+	class stateless_reference {
+	private:
+		template <bool o_main_only>
+		friend class basic_reference;
+
+		int ref = LUA_NOREF;
+
+		int copy_ref(lua_State* L_) const noexcept {
+			if (ref == LUA_NOREF)
+				return LUA_NOREF;
+			push(L_);
+			return luaL_ref(L_, LUA_REGISTRYINDEX);
+		}
+
+		lua_State* copy_assign_ref(lua_State* L_, lua_State* rL, const stateless_reference& r) {
+			if (valid(L_)) {
+				deref(L_);
+			}
+			ref = r.copy_ref(L_);
+			return rL;
+		}
+
+		lua_State* move_assign(lua_State* L_, lua_State* rL, stateless_reference&& r) {
+			if (valid(L_)) {
+				deref(L_);
+			}
+			ref = r.ref;
+			r.ref = LUA_NOREF;
+			return rL;
+		}
+
+	protected:
+		int stack_index() const noexcept {
+			return -1;
+		}
+
+		stateless_reference(lua_State* L_, global_tag_t) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L_, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			lua_pushglobaltable(L_);
+			ref = luaL_ref(L_, LUA_REGISTRYINDEX);
+		}
+
+		stateless_reference(int raw_ref_index) noexcept : ref(raw_ref_index) {
+		}
+
+	public:
+		stateless_reference() noexcept = default;
+		stateless_reference(lua_nil_t) noexcept : stateless_reference() {
+		}
+		stateless_reference(const stack_reference& r) noexcept : stateless_reference(r.lua_state(), r.stack_index()) {
+		}
+		stateless_reference(stack_reference&& r) noexcept : stateless_reference(r.lua_state(), r.stack_index()) {
+		}
+		stateless_reference(lua_State* L_, const stateless_reference& r) noexcept {
+			if (r.ref == LUA_REFNIL) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF || L_ == nullptr) {
+				ref = LUA_NOREF;
+				return;
+			}
+			ref = r.copy_ref(L_);
+		}
+
+		stateless_reference(lua_State* L_, stateless_reference&& r) noexcept {
+			if (r.ref == LUA_REFNIL) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF || L_ == nullptr) {
+				ref = LUA_NOREF;
+				return;
+			}
+			ref = r.ref;
+			r.ref = LUA_NOREF;
+		}
+
+		stateless_reference(lua_State* L_, const stack_reference& r) noexcept {
+			if (L_ == nullptr || r.lua_state() == nullptr || r.get_type() == type::none) {
+				ref = LUA_NOREF;
+				return;
+			}
+			if (r.get_type() == type::lua_nil) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (L_ != r.lua_state() && !detail::xmovable(L_, r.lua_state())) {
+				return;
+			}
+			r.push(L_);
+			ref = luaL_ref(L_, LUA_REGISTRYINDEX);
+		}
+
+		stateless_reference(lua_State* L_, const stateless_stack_reference& r) noexcept : stateless_reference(L_, r.stack_index()) {
+		}
+
+		stateless_reference(lua_State* L_, int index = -1) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L_, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L_, index);
+			ref = luaL_ref(L_, LUA_REGISTRYINDEX);
+		}
+		stateless_reference(lua_State* L_, absolute_index index_) noexcept : stateless_reference(L_, index_.index) {
+		}
+		stateless_reference(lua_State* L_, ref_index index_) noexcept {
+			lua_rawgeti(L_, LUA_REGISTRYINDEX, index_.index);
+			ref = luaL_ref(L_, LUA_REGISTRYINDEX);
+		}
+		stateless_reference(lua_State*, lua_nil_t) noexcept {
+		}
+
+		~stateless_reference() noexcept = default;
+
+		stateless_reference(const stateless_reference& o) noexcept = delete;
+		stateless_reference& operator=(const stateless_reference& r) noexcept = delete;
+
+		stateless_reference(stateless_reference&& o) noexcept : ref(o.ref) {
+			o.ref = LUA_NOREF;
+		}
+
+		stateless_reference& operator=(stateless_reference&& o) noexcept {
+			ref = o.ref;
+			o.ref = LUA_NOREF;
+			return *this;
+		}
+
+		int push(lua_State* L_) const noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L_, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			lua_rawgeti(L_, LUA_REGISTRYINDEX, ref);
+			return 1;
+		}
+
+		void pop(lua_State* L_, int n = 1) const noexcept {
+			lua_pop(L_, n);
+		}
+
+		int registry_index() const noexcept {
+			return ref;
+		}
+
+		void reset(lua_State* L_) noexcept {
+			if (valid(L_)) {
+				deref(L_);
+			}
+			ref = LUA_NOREF;
+		}
+
+		void reset(lua_State* L_, int index_) noexcept {
+			reset(L_);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L_, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L_, index_);
+			ref = luaL_ref(L_, LUA_REGISTRYINDEX);
+		}
+
+		bool valid(lua_State*) const noexcept {
+			return !(ref == LUA_NOREF || ref == LUA_REFNIL);
+		}
+
+		const void* pointer(lua_State* L_) const noexcept {
+			int si = push(L_);
+			const void* vp = lua_topointer(L_, -si);
+			lua_pop(L_, si);
+			return vp;
+		}
+
+		type get_type(lua_State* L_) const noexcept {
+			int p = push(L_);
+			int result = lua_type(L_, -1);
+			pop(L_, p);
+			return static_cast<type>(result);
+		}
+
+		void abandon(lua_State* = nullptr) {
+			ref = LUA_NOREF;
+		}
+
+		void deref(lua_State* L_) const noexcept {
+			luaL_unref(L_, LUA_REGISTRYINDEX, ref);
+		}
+
+		stateless_reference copy(lua_State* L_) const noexcept {
+			if (!valid(L_)) {
+				return {};
+			}
+			return stateless_reference(copy_ref(L_));
+		}
+
+		void copy_assign(lua_State* L_, const stateless_reference& right) noexcept {
+			if (valid(L_)) {
+				deref(L_);
+			}
+			if (!right.valid(L_)) {
+				return;
+			}
+			ref = right.copy_ref(L_);
+		}
+
+		bool equals(lua_State* L_, const stateless_reference& r) const noexcept {
+			auto ppl = stack::push_pop(L_, *this);
+			auto ppr = stack::push_pop(L_, r);
+			return lua_compare(L_, -1, -2, LUA_OPEQ) == 1;
+		}
+
+		bool equals(lua_State* L_, const stateless_stack_reference& r) const noexcept {
+			auto ppl = stack::push_pop(L_, *this);
+			return lua_compare(L_, -1, r.stack_index(), LUA_OPEQ) == 1;
+		}
+
+		bool equals(lua_State* L_, lua_nil_t) const noexcept {
+			return valid(L_);
+		}
+	};
+
+	template <bool main_only = false>
+	class basic_reference : public stateless_reference {
+	private:
+		template <bool o_main_only>
+		friend class basic_reference;
+		lua_State* luastate = nullptr; // non-owning
+
+		template <bool r_main_only>
+		void copy_assign_complex(const basic_reference<r_main_only>& r) {
+			if (valid()) {
+				deref();
+			}
+			if (r.ref == LUA_REFNIL) {
+				luastate = detail::pick_main_thread < main_only && !r_main_only > (r.lua_state(), r.lua_state());
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF) {
+				luastate = r.luastate;
+				ref = LUA_NOREF;
+				return;
+			}
+			if (detail::xmovable(lua_state(), r.lua_state())) {
+				r.push(lua_state());
+				ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+				return;
+			}
+			luastate = detail::pick_main_thread < main_only && !r_main_only > (r.lua_state(), r.lua_state());
+			ref = r.copy_ref();
+		}
+
+		template <bool r_main_only>
+		void move_assign(basic_reference<r_main_only>&& r) {
+			if (valid()) {
+				deref();
+			}
+			if (r.ref == LUA_REFNIL) {
+				luastate = detail::pick_main_thread < main_only && !r_main_only > (r.lua_state(), r.lua_state());
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF) {
+				luastate = r.luastate;
+				ref = LUA_NOREF;
+				return;
+			}
+			if (detail::xmovable(lua_state(), r.lua_state())) {
+				r.push(lua_state());
+				ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+				return;
+			}
+
+			luastate = detail::pick_main_thread < main_only && !r_main_only > (r.lua_state(), r.lua_state());
+			ref = r.ref;
+			r.ref = LUA_NOREF;
+			r.luastate = nullptr;
+		}
+
+	protected:
+		basic_reference(lua_State* L_, global_tag_t) noexcept : basic_reference(detail::pick_main_thread<main_only>(L_, L_), global_tag, global_tag) {
+		}
+
+		basic_reference(lua_State* L_, global_tag_t, global_tag_t) noexcept : stateless_reference(L_, global_tag), luastate(L_) {
+		}
+
+		basic_reference(lua_State* oL, const basic_reference<!main_only>& o) noexcept : stateless_reference(oL, o), luastate(oL) {
+		}
+
+		void deref() const noexcept {
+			return stateless_reference::deref(lua_state());
+		}
+
+		int copy_ref() const noexcept {
+			return copy_ref(lua_state());
+		}
+
+		int copy_ref(lua_State* L_) const noexcept {
+			return stateless_reference::copy_ref(L_);
+		}
+
+	public:
+		basic_reference() noexcept = default;
+		basic_reference(lua_nil_t) noexcept : basic_reference() {
+		}
+		basic_reference(const stack_reference& r) noexcept : basic_reference(r.lua_state(), r.stack_index()) {
+		}
+		basic_reference(stack_reference&& r) noexcept : basic_reference(r.lua_state(), r.stack_index()) {
+		}
+		template <bool r_main_only>
+		basic_reference(lua_State* L_, const basic_reference<r_main_only>& r) noexcept : luastate(detail::pick_main_thread<main_only>(L_, L_)) {
+			if (r.ref == LUA_REFNIL) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF || lua_state() == nullptr) {
+				ref = LUA_NOREF;
+				return;
+			}
+			if (detail::xmovable(lua_state(), r.lua_state())) {
+				r.push(lua_state());
+				ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+				return;
+			}
+			ref = r.copy_ref();
+		}
+
+		template <bool r_main_only>
+		basic_reference(lua_State* L_, basic_reference<r_main_only>&& r) noexcept : luastate(detail::pick_main_thread<main_only>(L_, L_)) {
+			if (r.ref == LUA_REFNIL) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (r.ref == LUA_NOREF || lua_state() == nullptr) {
+				ref = LUA_NOREF;
+				return;
+			}
+			if (detail::xmovable(lua_state(), r.lua_state())) {
+				r.push(lua_state());
+				ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+				return;
+			}
+			ref = r.ref;
+			r.ref = LUA_NOREF;
+			r.luastate = nullptr;
+		}
+
+		basic_reference(lua_State* L_, const stack_reference& r) noexcept : luastate(detail::pick_main_thread<main_only>(L_, L_)) {
+			if (lua_state() == nullptr || r.lua_state() == nullptr || r.get_type() == type::none) {
+				ref = LUA_NOREF;
+				return;
+			}
+			if (r.get_type() == type::lua_nil) {
+				ref = LUA_REFNIL;
+				return;
+			}
+			if (lua_state() != r.lua_state() && !detail::xmovable(lua_state(), r.lua_state())) {
+				return;
+			}
+			r.push(lua_state());
+			ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+		}
+		basic_reference(lua_State* L_, int index = -1) noexcept : luastate(detail::pick_main_thread<main_only>(L_, L_)) {
+			// use L_ to stick with that state's execution stack
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L_, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L_, index);
+			ref = luaL_ref(L_, LUA_REGISTRYINDEX);
+		}
+		basic_reference(lua_State* L_, ref_index index) noexcept : luastate(detail::pick_main_thread<main_only>(L_, L_)) {
+			lua_rawgeti(lua_state(), LUA_REGISTRYINDEX, index.index);
+			ref = luaL_ref(lua_state(), LUA_REGISTRYINDEX);
+		}
+		basic_reference(lua_State* L_, lua_nil_t) noexcept : luastate(detail::pick_main_thread<main_only>(L_, L_)) {
+		}
+
+		~basic_reference() noexcept {
+			if (lua_state() == nullptr || ref == LUA_NOREF)
+				return;
+			deref();
+		}
+
+		basic_reference(const basic_reference& o) noexcept : stateless_reference(o.copy_ref()), luastate(o.lua_state()) {
+		}
+
+		basic_reference(basic_reference&& o) noexcept : stateless_reference(std::move(o)), luastate(o.lua_state()) {
+			o.luastate = nullptr;
+		}
+
+		basic_reference(const basic_reference<!main_only>& o) noexcept
+		: basic_reference(detail::pick_main_thread<main_only>(o.lua_state(), o.lua_state()), o) {
+		}
+
+		basic_reference(basic_reference<!main_only>&& o) noexcept
+		: stateless_reference(std::move(o)), luastate(detail::pick_main_thread<main_only>(o.lua_state(), o.lua_state())) {
+			o.luastate = nullptr;
+			o.ref = LUA_NOREF;
+		}
+
+		basic_reference& operator=(basic_reference&& r) noexcept {
+			move_assign(std::move(r));
+			return *this;
+		}
+
+		basic_reference& operator=(const basic_reference& r) noexcept {
+			copy_assign_complex(r);
+			return *this;
+		}
+
+		basic_reference& operator=(basic_reference<!main_only>&& r) noexcept {
+			move_assign(std::move(r));
+			return *this;
+		}
+
+		basic_reference& operator=(const basic_reference<!main_only>& r) noexcept {
+			copy_assign_complex(r);
+			return *this;
+		}
+
+		basic_reference& operator=(const lua_nil_t&) noexcept {
+			reset();
+			return *this;
+		}
+
+		template <typename Super>
+		basic_reference& operator=(proxy_base<Super>&& r);
+
+		template <typename Super>
+		basic_reference& operator=(const proxy_base<Super>& r);
+
+		int push() const noexcept {
+			return push(lua_state());
+		}
+
+		void reset() noexcept {
+			stateless_reference::reset(luastate);
+			luastate = nullptr;
+		}
+
+		int push(lua_State* L_) const noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L_, 1, "not enough Lua stack space to push this reference value");
+#endif // make sure stack doesn't overflow
+			if (lua_state() == nullptr) {
+				lua_pushnil(L_);
+				return 1;
+			}
+			lua_rawgeti(lua_state(), LUA_REGISTRYINDEX, ref);
+			if (L_ != lua_state()) {
+				lua_xmove(lua_state(), L_, 1);
+			}
+			return 1;
+		}
+
+		void pop() const noexcept {
+			pop(lua_state());
+		}
+
+		void pop(lua_State* L_, int n = 1) const noexcept {
+			stateless_reference::pop(L_, n);
+		}
+
+		int registry_index() const noexcept {
+			return stateless_reference::registry_index();
+		}
+
+		bool valid() const noexcept {
+			return stateless_reference::valid(lua_state());
+		}
+
+		bool valid(lua_State* L_) const noexcept {
+			return stateless_reference::valid(L_);
+		}
+
+		const void* pointer() const noexcept {
+			return stateless_reference::pointer(lua_state());
+		}
+
+		explicit operator bool() const noexcept {
+			return valid();
+		}
+
+		type get_type() const noexcept {
+			return stateless_reference::get_type(lua_state());
+		}
+
+		lua_State* lua_state() const noexcept {
+			return luastate;
+		}
+	};
+
+	template <bool lb, bool rb>
+	inline bool operator==(const basic_reference<lb>& l, const basic_reference<rb>& r) noexcept {
+		auto ppl = stack::push_pop(l);
+		auto ppr = stack::push_pop(r);
+		return lua_compare(l.lua_state(), -1, -2, LUA_OPEQ) == 1;
+	}
+
+	template <bool lb, bool rb>
+	inline bool operator!=(const basic_reference<lb>& l, const basic_reference<rb>& r) noexcept {
+		return !operator==(l, r);
+	}
+
+	template <bool lb>
+	inline bool operator==(const basic_reference<lb>& l, const stack_reference& r) noexcept {
+		auto ppl = stack::push_pop(l);
+		return lua_compare(l.lua_state(), -1, r.stack_index(), LUA_OPEQ) == 1;
+	}
+
+	template <bool lb>
+	inline bool operator!=(const basic_reference<lb>& l, const stack_reference& r) noexcept {
+		return !operator==(l, r);
+	}
+
+	template <bool rb>
+	inline bool operator==(const stack_reference& l, const basic_reference<rb>& r) noexcept {
+		auto ppr = stack::push_pop(r);
+		return lua_compare(l.lua_state(), -1, r.stack_index(), LUA_OPEQ) == 1;
+	}
+
+	template <bool rb>
+	inline bool operator!=(const stack_reference& l, const basic_reference<rb>& r) noexcept {
+		return !operator==(l, r);
+	}
+
+	template <bool lb>
+	inline bool operator==(const basic_reference<lb>& lhs, const lua_nil_t&) noexcept {
+		return !lhs.valid();
+	}
+
+	template <bool rb>
+	inline bool operator==(const lua_nil_t&, const basic_reference<rb>& rhs) noexcept {
+		return !rhs.valid();
+	}
+
+	template <bool lb>
+	inline bool operator!=(const basic_reference<lb>& lhs, const lua_nil_t&) noexcept {
+		return lhs.valid();
+	}
+
+	template <bool rb>
+	inline bool operator!=(const lua_nil_t&, const basic_reference<rb>& rhs) noexcept {
+		return rhs.valid();
+	}
+
+	inline bool operator==(const stateless_reference& l, const stateless_reference& r) noexcept {
+		return l.registry_index() == r.registry_index();
+	}
+
+	inline bool operator!=(const stateless_reference& l, const stateless_reference& r) noexcept {
+		return l.registry_index() != r.registry_index();
+	}
+
+	inline bool operator==(const stateless_reference& lhs, const lua_nil_t&) noexcept {
+		return lhs.registry_index() == LUA_REFNIL;
+	}
+
+	inline bool operator==(const lua_nil_t&, const stateless_reference& rhs) noexcept {
+		return rhs.registry_index() == LUA_REFNIL;
+	}
+
+	inline bool operator!=(const stateless_reference& lhs, const lua_nil_t&) noexcept {
+		return lhs.registry_index() != LUA_REFNIL;
+	}
+
+	inline bool operator!=(const lua_nil_t&, const stateless_reference& rhs) noexcept {
+		return rhs.registry_index() != LUA_REFNIL;
+	}
+
+	struct stateless_reference_equals : public stateless_stack_reference_equals {
+		using is_transparent = std::true_type;
+
+		stateless_reference_equals(lua_State* L_) noexcept : stateless_stack_reference_equals(L_) {
+		}
+
+		bool operator()(const lua_nil_t& lhs, const stateless_reference& rhs) const noexcept {
+			return rhs.equals(lua_state(), lhs);
+		}
+
+		bool operator()(const stateless_reference& lhs, const lua_nil_t& rhs) const noexcept {
+			return lhs.equals(lua_state(), rhs);
+		}
+
+		bool operator()(const stateless_reference& lhs, const stateless_reference& rhs) const noexcept {
+			return lhs.equals(lua_state(), rhs);
+		}
+	};
+
+	struct reference_equals : public stack_reference_equals {
+		using is_transparent = std::true_type;
+
+		template <bool rb>
+		bool operator()(const lua_nil_t& lhs, const basic_reference<rb>& rhs) const noexcept {
+			return lhs == rhs;
+		}
+
+		template <bool lb>
+		bool operator()(const basic_reference<lb>& lhs, const lua_nil_t& rhs) const noexcept {
+			return lhs == rhs;
+		}
+
+		template <bool lb, bool rb>
+		bool operator()(const basic_reference<lb>& lhs, const basic_reference<rb>& rhs) const noexcept {
+			return lhs == rhs;
+		}
+
+		template <bool lb>
+		bool operator()(const basic_reference<lb>& lhs, const stack_reference& rhs) const noexcept {
+			return lhs == rhs;
+		}
+
+		template <bool rb>
+		bool operator()(const stack_reference& lhs, const basic_reference<rb>& rhs) const noexcept {
+			return lhs == rhs;
+		}
+	};
+
+	struct stateless_reference_hash : public stateless_stack_reference_hash {
+		using argument_type = stateless_reference;
+		using result_type = std::size_t;
+		using is_transparent = std::true_type;
+
+		stateless_reference_hash(lua_State* L_) noexcept : stateless_stack_reference_hash(L_) {
+		}
+
+		result_type operator()(const stateless_reference& lhs) const noexcept {
+			std::hash<const void*> h;
+			return h(lhs.pointer(lua_state()));
+		}
+	};
+
+	struct reference_hash : public stack_reference_hash {
+		using argument_type = reference;
+		using result_type = std::size_t;
+		using is_transparent = std::true_type;
+
+		template <bool lb>
+		result_type operator()(const basic_reference<lb>& lhs) const noexcept {
+			std::hash<const void*> h;
+			return h(lhs.pointer());
+		}
+	};
+} // namespace sol
+
+// end of sol/reference.hpp
+
+// beginning of sol/tie.hpp
+
+namespace sol {
+
+	namespace detail {
+		template <typename T>
+		struct is_speshul : std::false_type { };
+	} // namespace detail
+
+	template <typename T>
+	struct tie_size : std::tuple_size<T> { };
+
+	template <typename T>
+	struct is_tieable : std::integral_constant<bool, (::sol::tie_size<T>::value > 0)> { };
+
+	template <typename... Tn>
+	struct tie_t : public std::tuple<std::add_lvalue_reference_t<Tn>...> {
+	private:
+		typedef std::tuple<std::add_lvalue_reference_t<Tn>...> base_t;
+
+		template <typename T>
+		void set(std::false_type, T&& target) {
+			std::get<0>(*this) = std::forward<T>(target);
+		}
+
+		template <typename T>
+		void set(std::true_type, T&& target) {
+			typedef tie_size<meta::unqualified_t<T>> value_size;
+			typedef tie_size<std::tuple<Tn...>> tie_size;
+			typedef meta::conditional_t<(value_size::value < tie_size::value), value_size, tie_size> indices_size;
+			typedef std::make_index_sequence<indices_size::value> indices;
+			set_extra(detail::is_speshul<meta::unqualified_t<T>>(), indices(), std::forward<T>(target));
+		}
+
+		template <std::size_t... I, typename T>
+		void set_extra(std::true_type, std::index_sequence<I...>, T&& target) {
+			using std::get;
+			(void)detail::swallow { 0, (get<I>(static_cast<base_t&>(*this)) = get<I>(types<Tn...>(), target), 0)..., 0 };
+		}
+
+		template <std::size_t... I, typename T>
+		void set_extra(std::false_type, std::index_sequence<I...>, T&& target) {
+			using std::get;
+			(void)detail::swallow { 0, (get<I>(static_cast<base_t&>(*this)) = get<I>(target), 0)..., 0 };
+		}
+
+	public:
+		using base_t::base_t;
+
+		template <typename T>
+		tie_t& operator=(T&& value) {
+			typedef is_tieable<meta::unqualified_t<T>> tieable;
+			set(tieable(), std::forward<T>(value));
+			return *this;
+		}
+	};
+
+	template <typename... Tn>
+	struct tie_size<tie_t<Tn...>> : std::tuple_size<std::tuple<Tn...>> { };
+
+	namespace adl_barrier_detail {
+		template <typename... Tn>
+		inline tie_t<std::remove_reference_t<Tn>...> tie(Tn&&... argn) {
+			return tie_t<std::remove_reference_t<Tn>...>(std::forward<Tn>(argn)...);
+		}
+	} // namespace adl_barrier_detail
+
+	using namespace adl_barrier_detail;
+
+} // namespace sol
+
+// end of sol/tie.hpp
+
+// beginning of sol/stack_guard.hpp
+
+#include <functional>
+
+namespace sol {
+	namespace detail {
+		inline void stack_fail(int, int) {
+#if SOL_IS_ON(SOL_EXCEPTIONS)
+			throw error(detail::direct_error, "imbalanced stack after operation finish");
+#else
+			// Lol, what do you want, an error printout? :3c
+			// There's no sane default here. The right way would be C-style abort(), and that's not acceptable, so
+			// hopefully someone will register their own stack_fail thing for the `fx` parameter of stack_guard.
+#endif // No Exceptions
+		}
+	} // namespace detail
+
+	struct stack_guard {
+		lua_State* L;
+		int top;
+		std::function<void(int, int)> on_mismatch;
+
+		stack_guard(lua_State* L) : stack_guard(L, lua_gettop(L)) {
+		}
+		stack_guard(lua_State* L, int top, std::function<void(int, int)> fx = detail::stack_fail) : L(L), top(top), on_mismatch(std::move(fx)) {
+		}
+		bool check_stack(int modification = 0) const {
+			int bottom = lua_gettop(L) + modification;
+			if (top == bottom) {
+				return true;
+			}
+			on_mismatch(top, bottom);
+			return false;
+		}
+		~stack_guard() {
+			check_stack();
+		}
+	};
+} // namespace sol
+
+// end of sol/stack_guard.hpp
+
+#include <vector>
+#include <bitset>
+#include <forward_list>
+#include <string>
+#include <limits>
+#include <algorithm>
+#include <sstream>
+#include <optional>
+#include <type_traits>
+
+namespace sol {
+	namespace detail {
+		struct with_function_tag { };
+		struct as_reference_tag { };
+		template <typename T>
+		struct as_pointer_tag { };
+		template <typename T>
+		struct as_value_tag { };
+		template <typename T>
+		struct as_unique_tag { };
+		template <typename T>
+		struct as_table_tag { };
+
+		template <typename Tag>
+		inline constexpr bool is_tagged_v
+		     = meta::is_specialization_of_v<Tag,
+		            detail::
+		                 as_pointer_tag> || meta::is_specialization_of_v<Tag, as_value_tag> || meta::is_specialization_of_v<Tag, as_unique_tag> || meta::is_specialization_of_v<Tag, as_table_tag> || std::is_same_v<Tag, as_reference_tag> || std::is_same_v<Tag, with_function_tag>;
+
+		using lua_reg_table = luaL_Reg[64];
+
+		using unique_destructor = void (*)(void*);
+		using unique_tag = detail::inheritance_unique_cast_function;
+
+		inline void* alloc_newuserdata(lua_State* L, std::size_t bytesize) {
+#if SOL_LUA_VERSION_I_ >= 504
+			return lua_newuserdatauv(L, bytesize, 1);
+#else
+			return lua_newuserdata(L, bytesize);
+#endif
+		}
+
+		constexpr std::uintptr_t align(std::size_t alignment, std::uintptr_t ptr, std::size_t& space) {
+			// this handles arbitrary alignments...
+			// make this into a power-of-2-only?
+			// actually can't: this is a C++14-compatible framework,
+			// power of 2 alignment is C++17
+			std::uintptr_t offby = static_cast<std::uintptr_t>(ptr % alignment);
+			std::uintptr_t padding = (alignment - offby) % alignment;
+			ptr += padding;
+			space -= padding;
+			return ptr;
+		}
+
+		inline void* align(std::size_t alignment, void* ptr, std::size_t& space) {
+			return reinterpret_cast<void*>(align(alignment, reinterpret_cast<std::uintptr_t>(ptr), space));
+		}
+
+		constexpr std::uintptr_t align_one(std::size_t alignment, std::size_t size, std::uintptr_t ptr) {
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(alignment, ptr, space) + size;
+		}
+
+		template <typename... Args>
+		constexpr std::size_t aligned_space_for(std::uintptr_t ptr) {
+			std::uintptr_t end = ptr;
+			((end = align_one(alignof(Args), sizeof(Args), end)), ...);
+			return static_cast<std::size_t>(end - ptr);
+		}
+
+		template <typename... Args>
+		constexpr std::size_t aligned_space_for() {
+			static_assert(sizeof...(Args) > 0);
+
+			constexpr std::size_t max_arg_alignment = (std::max)({ alignof(Args)... });
+			if constexpr (max_arg_alignment <= alignof(std::max_align_t)) {
+				// If all types are `good enough`, simply calculate alignment in case of the worst allocator
+				std::size_t worst_required_size = 0;
+				for (std::size_t ptr = 0; ptr < max_arg_alignment; ptr++) {
+					worst_required_size = (std::max)(worst_required_size, aligned_space_for<Args...>(ptr));
+				}
+				return worst_required_size;
+			}
+			else {
+				// For over-aligned types let's assume that every Arg in Args starts at the worst aligned address
+				return (aligned_space_for<Args>(0x1) + ...);
+			}
+		}
+
+		inline void* align_usertype_pointer(void* ptr) {
+			using use_align = std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY)
+			     false
+#else
+			     (std::alignment_of<void*>::value > 1)
+#endif
+			     >;
+			if (!use_align::value) {
+				return ptr;
+			}
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(std::alignment_of<void*>::value, ptr, space);
+		}
+
+		template <bool pre_aligned = false, bool pre_shifted = false>
+		void* align_usertype_unique_destructor(void* ptr) {
+			using use_align = std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY)
+			     false
+#else
+			     (std::alignment_of<unique_destructor>::value > 1)
+#endif
+			     >;
+			if (!pre_aligned) {
+				ptr = align_usertype_pointer(ptr);
+			}
+			if (!pre_shifted) {
+				ptr = static_cast<void*>(static_cast<char*>(ptr) + sizeof(void*));
+			}
+			if (!use_align::value) {
+				return static_cast<void*>(static_cast<void**>(ptr) + 1);
+			}
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(std::alignment_of<unique_destructor>::value, ptr, space);
+		}
+
+		template <bool pre_aligned = false, bool pre_shifted = false>
+		void* align_usertype_unique_tag(void* ptr) {
+			using use_align = std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY)
+			     false
+#else
+			     (std::alignment_of<unique_tag>::value > 1)
+#endif
+			     >;
+			if (!pre_aligned) {
+				ptr = align_usertype_unique_destructor(ptr);
+			}
+			if (!pre_shifted) {
+				ptr = static_cast<void*>(static_cast<char*>(ptr) + sizeof(unique_destructor));
+			}
+			if (!use_align::value) {
+				return ptr;
+			}
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(std::alignment_of<unique_tag>::value, ptr, space);
+		}
+
+		template <typename T, bool pre_aligned = false, bool pre_shifted = false>
+		void* align_usertype_unique(void* ptr) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY)
+			     false
+#else
+			     (std::alignment_of_v<T> > 1)
+#endif
+			     >
+			     use_align;
+			if (!pre_aligned) {
+				ptr = align_usertype_unique_tag(ptr);
+			}
+			if (!pre_shifted) {
+				ptr = static_cast<void*>(static_cast<char*>(ptr) + sizeof(unique_tag));
+			}
+			if (!use_align::value) {
+				return ptr;
+			}
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(std::alignment_of_v<T>, ptr, space);
+		}
+
+		template <typename T>
+		void* align_user(void* ptr) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY)
+			     false
+#else
+			     (std::alignment_of_v<T> > 1)
+#endif
+			     >
+			     use_align;
+			if (!use_align::value) {
+				return ptr;
+			}
+			std::size_t space = (std::numeric_limits<std::size_t>::max)();
+			return align(std::alignment_of_v<T>, ptr, space);
+		}
+
+		template <typename T>
+		T** usertype_allocate_pointer(lua_State* L) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY)
+			     false
+#else
+			     (std::alignment_of<T*>::value > 1)
+#endif
+			     >
+			     use_align;
+			if (!use_align::value) {
+				T** pointerpointer = static_cast<T**>(alloc_newuserdata(L, sizeof(T*)));
+				return pointerpointer;
+			}
+			constexpr std::size_t initial_size = aligned_space_for<T*>();
+
+			std::size_t allocated_size = initial_size;
+			void* unadjusted = alloc_newuserdata(L, initial_size);
+			void* adjusted = align(std::alignment_of<T*>::value, unadjusted, allocated_size);
+			if (adjusted == nullptr) {
+				// trash allocator can burn in hell
+				lua_pop(L, 1);
+				// luaL_error(L, "if you are the one that wrote this allocator you should feel bad for doing a
+				// worse job than malloc/realloc and should go read some books, yeah?");
+				luaL_error(L, "cannot properly align memory for '%s'", detail::demangle<T*>().data());
+			}
+			return static_cast<T**>(adjusted);
+		}
+
+		inline bool attempt_alloc(lua_State* L, std::size_t ptr_align, std::size_t ptr_size, std::size_t value_align,
+		     std::size_t allocated_size, void*& pointer_adjusted, void*& data_adjusted) {
+			void* adjusted = alloc_newuserdata(L, allocated_size);
+			pointer_adjusted = align(ptr_align, adjusted, allocated_size);
+			if (pointer_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			// subtract size of what we're going to allocate there
+			allocated_size -= ptr_size;
+			adjusted = static_cast<void*>(static_cast<char*>(pointer_adjusted) + ptr_size);
+			data_adjusted = align(value_align, adjusted, allocated_size);
+			if (data_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			return true;
+		}
+
+		inline bool attempt_alloc_unique(lua_State* L, std::size_t ptr_align, std::size_t ptr_size, std::size_t real_align,
+		     std::size_t allocated_size, void*& pointer_adjusted, void*& dx_adjusted, void*& id_adjusted, void*& data_adjusted) {
+			void* adjusted = alloc_newuserdata(L, allocated_size);
+			pointer_adjusted = align(ptr_align, adjusted, allocated_size);
+			if (pointer_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			allocated_size -= ptr_size;
+
+			adjusted = static_cast<void*>(static_cast<char*>(pointer_adjusted) + ptr_size);
+			dx_adjusted = align(std::alignment_of_v<unique_destructor>, adjusted, allocated_size);
+			if (dx_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			allocated_size -= sizeof(unique_destructor);
+
+			adjusted = static_cast<void*>(static_cast<char*>(dx_adjusted) + sizeof(unique_destructor));
+
+			id_adjusted = align(std::alignment_of_v<unique_tag>, adjusted, allocated_size);
+			if (id_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			allocated_size -= sizeof(unique_tag);
+
+			adjusted = static_cast<void*>(static_cast<char*>(id_adjusted) + sizeof(unique_tag));
+			data_adjusted = align(real_align, adjusted, allocated_size);
+			if (data_adjusted == nullptr) {
+				lua_pop(L, 1);
+				return false;
+			}
+			return true;
+		}
+
+		template <typename T>
+		T* usertype_allocate(lua_State* L) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY)
+			     false
+#else
+			     (std::alignment_of<T*>::value > 1 || std::alignment_of_v<T> > 1)
+#endif
+			     >
+			     use_align;
+			if (!use_align::value) {
+				T** pointerpointer = static_cast<T**>(alloc_newuserdata(L, sizeof(T*) + sizeof(T)));
+				T*& pointerreference = *pointerpointer;
+				T* allocationtarget = reinterpret_cast<T*>(pointerpointer + 1);
+				pointerreference = allocationtarget;
+				return allocationtarget;
+			}
+
+			constexpr std::size_t initial_size = aligned_space_for<T*, T>();
+
+			void* pointer_adjusted;
+			void* data_adjusted;
+			bool result
+			     = attempt_alloc(L, std::alignment_of_v<T*>, sizeof(T*), std::alignment_of_v<T>, initial_size, pointer_adjusted, data_adjusted);
+			if (!result) {
+				if (pointer_adjusted == nullptr) {
+					luaL_error(L, "aligned allocation of userdata block (pointer section) for '%s' failed", detail::demangle<T>().c_str());
+				}
+				else {
+					luaL_error(L, "aligned allocation of userdata block (data section) for '%s' failed", detail::demangle<T>().c_str());
+				}
+				return nullptr;
+			}
+
+			T** pointerpointer = reinterpret_cast<T**>(pointer_adjusted);
+			T*& pointerreference = *pointerpointer;
+			T* allocationtarget = reinterpret_cast<T*>(data_adjusted);
+			pointerreference = allocationtarget;
+			return allocationtarget;
+		}
+
+		template <typename T, typename Real>
+		Real* usertype_unique_allocate(lua_State* L, T**& pref, unique_destructor*& dx, unique_tag*& id) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY)
+			     false
+#else
+			     (std::alignment_of<T*>::value > 1 || std::alignment_of<unique_tag>::value > 1 || std::alignment_of<unique_destructor>::value > 1
+			          || std::alignment_of<Real>::value > 1)
+#endif
+			     >
+			     use_align;
+			if (!use_align::value) {
+				pref = static_cast<T**>(alloc_newuserdata(L, sizeof(T*) + sizeof(detail::unique_destructor) + sizeof(unique_tag) + sizeof(Real)));
+				dx = static_cast<detail::unique_destructor*>(static_cast<void*>(pref + 1));
+				id = static_cast<unique_tag*>(static_cast<void*>(dx + 1));
+				Real* mem = static_cast<Real*>(static_cast<void*>(id + 1));
+				return mem;
+			}
+
+			constexpr std::size_t initial_size = aligned_space_for<T*, unique_destructor, unique_tag, Real>();
+
+			void* pointer_adjusted = nullptr;
+			void* dx_adjusted = nullptr;
+			void* id_adjusted = nullptr;
+			void* data_adjusted = nullptr;
+			bool result = attempt_alloc_unique(L,
+			     std::alignment_of_v<T*>,
+			     sizeof(T*),
+			     std::alignment_of_v<Real>,
+			     initial_size,
+			     pointer_adjusted,
+			     dx_adjusted,
+			     id_adjusted,
+			     data_adjusted);
+			if (!result) {
+				if (pointer_adjusted == nullptr) {
+					luaL_error(L, "aligned allocation of userdata block (pointer section) for '%s' failed", detail::demangle<T>().c_str());
+				}
+				else if (dx_adjusted == nullptr) {
+					luaL_error(L, "aligned allocation of userdata block (deleter section) for '%s' failed", detail::demangle<T>().c_str());
+				}
+				else {
+					luaL_error(L, "aligned allocation of userdata block (data section) for '%s' failed", detail::demangle<T>().c_str());
+				}
+				return nullptr;
+			}
+
+			pref = static_cast<T**>(pointer_adjusted);
+			dx = static_cast<detail::unique_destructor*>(dx_adjusted);
+			id = static_cast<unique_tag*>(id_adjusted);
+			Real* mem = static_cast<Real*>(data_adjusted);
+			return mem;
+		}
+
+		template <typename T>
+		T* user_allocate(lua_State* L) {
+			typedef std::integral_constant<bool,
+#if SOL_IS_OFF(SOL_ALIGN_MEMORY)
+			     false
+#else
+			     (std::alignment_of_v<T> > 1)
+#endif
+			     >
+			     use_align;
+			if (!use_align::value) {
+				T* pointer = static_cast<T*>(alloc_newuserdata(L, sizeof(T)));
+				return pointer;
+			}
+
+			constexpr std::size_t initial_size = aligned_space_for<T>();
+
+			std::size_t allocated_size = initial_size;
+			void* unadjusted = alloc_newuserdata(L, allocated_size);
+			void* adjusted = align(std::alignment_of_v<T>, unadjusted, allocated_size);
+			if (adjusted == nullptr) {
+				lua_pop(L, 1);
+				luaL_error(L, "cannot properly align memory for '%s'", detail::demangle<T>().data());
+			}
+			return static_cast<T*>(adjusted);
+		}
+
+		template <typename T>
+		int usertype_alloc_destroy(lua_State* L) noexcept {
+			void* memory = lua_touserdata(L, 1);
+			memory = align_usertype_pointer(memory);
+			T** pdata = static_cast<T**>(memory);
+			T* data = *pdata;
+			std::allocator<T> alloc {};
+			std::allocator_traits<std::allocator<T>>::destroy(alloc, data);
+			return 0;
+		}
+
+		template <typename T>
+		int unique_destroy(lua_State* L) noexcept {
+			void* memory = lua_touserdata(L, 1);
+			memory = align_usertype_unique_destructor(memory);
+			unique_destructor& dx = *static_cast<unique_destructor*>(memory);
+			memory = align_usertype_unique_tag<true>(memory);
+			(dx)(memory);
+			return 0;
+		}
+
+		template <typename T>
+		int user_alloc_destroy(lua_State* L) noexcept {
+			void* memory = lua_touserdata(L, 1);
+			void* aligned_memory = align_user<T>(memory);
+			T* typed_memory = static_cast<T*>(aligned_memory);
+			std::allocator<T> alloc;
+			std::allocator_traits<std::allocator<T>>::destroy(alloc, typed_memory);
+			return 0;
+		}
+
+		template <typename T, typename Real>
+		void usertype_unique_alloc_destroy(void* memory) {
+			void* aligned_memory = align_usertype_unique<Real, true>(memory);
+			Real* typed_memory = static_cast<Real*>(aligned_memory);
+			std::allocator<Real> alloc;
+			std::allocator_traits<std::allocator<Real>>::destroy(alloc, typed_memory);
+		}
+
+		template <typename T>
+		int cannot_destroy(lua_State* L) {
+			return luaL_error(L,
+			     "cannot call the destructor for '%s': it is either hidden (protected/private) or removed with '= "
+			     "delete' and thusly this type is being destroyed without properly destroying, invoking undefined "
+			     "behavior: please bind a usertype and specify a custom destructor to define the behavior properly",
+			     detail::demangle<T>().data());
+		}
+
+		template <typename T>
+		void reserve(T&, std::size_t) {
+		}
+
+		template <typename T, typename Al>
+		void reserve(std::vector<T, Al>& vec, std::size_t hint) {
+			vec.reserve(hint);
+		}
+
+		template <typename T, typename Tr, typename Al>
+		void reserve(std::basic_string<T, Tr, Al>& str, std::size_t hint) {
+			str.reserve(hint);
+		}
+
+		inline bool property_always_true(meta_function) {
+			return true;
+		}
+
+		struct properties_enrollment_allowed {
+			int& times_through;
+			std::bitset<64>& properties;
+			automagic_enrollments& enrollments;
+
+			properties_enrollment_allowed(int& times_through_, std::bitset<64>& properties_, automagic_enrollments& enrollments_)
+			: times_through(times_through_), properties(properties_), enrollments(enrollments_) {
+			}
+
+			bool operator()(meta_function mf) const {
+				bool p = properties[static_cast<std::size_t>(mf)];
+				if (times_through > 0) {
+					return p;
+				}
+				switch (mf) {
+				case meta_function::length:
+					return enrollments.length_operator && !p;
+				case meta_function::pairs:
+					return enrollments.pairs_operator && !p;
+				case meta_function::call:
+					return enrollments.call_operator && !p;
+				case meta_function::less_than:
+					return enrollments.less_than_operator && !p;
+				case meta_function::less_than_or_equal_to:
+					return enrollments.less_than_or_equal_to_operator && !p;
+				case meta_function::equal_to:
+					return enrollments.equal_to_operator && !p;
+				default:
+					break;
+				}
+				return !p;
+			}
+		};
+
+		struct indexed_insert {
+			lua_reg_table& registration_table;
+			int& index;
+
+			indexed_insert(lua_reg_table& registration_table_, int& index_ref_) : registration_table(registration_table_), index(index_ref_) {
+			}
+			void operator()(meta_function meta_function_name_, lua_CFunction c_function_) {
+				registration_table[index] = luaL_Reg { to_string(meta_function_name_).c_str(), c_function_ };
+				++index;
+			}
+		};
+	} // namespace detail
+
+	namespace stack {
+
+		template <typename T, bool global = false, bool raw = false, typename = void>
+		struct field_getter;
+		template <typename T, typename P, bool global = false, bool raw = false, typename = void>
+		struct probe_field_getter;
+
+		template <typename T, bool global = false, bool raw = false, typename = void>
+		struct field_setter;
+
+		template <typename T, typename = void>
+		struct unqualified_getter;
+		template <typename T, typename = void>
+		struct qualified_getter;
+
+		template <typename T, typename = void>
+		struct qualified_interop_getter;
+		template <typename T, typename = void>
+		struct unqualified_interop_getter;
+
+		template <typename T, typename = void>
+		struct popper;
+
+		template <typename T, typename = void>
+		struct unqualified_pusher;
+
+		template <typename T, type t, typename = void>
+		struct unqualified_checker;
+		template <typename T, type t, typename = void>
+		struct qualified_checker;
+
+		template <typename T, typename = void>
+		struct unqualified_check_getter;
+		template <typename T, typename = void>
+		struct qualified_check_getter;
+
+		struct probe {
+			bool success;
+			int levels;
+
+			probe(bool s, int l) : success(s), levels(l) {
+			}
+
+			operator bool() const {
+				return success;
+			};
+		};
+
+		struct record {
+			int last;
+			int used;
+
+			record() noexcept : last(), used() {
+			}
+			void use(int count) noexcept {
+				last = count;
+				used += count;
+			}
+		};
+
+		namespace stack_detail {
+			template <typename Function>
+			Function* get_function_pointer(lua_State*, int, record&) noexcept;
+			template <typename Function, typename Handler>
+			bool check_function_pointer(lua_State* L, int index, Handler&& handler, record& tracking) noexcept;
+		} // namespace stack_detail
+
+	} // namespace stack
+
+	namespace meta { namespace meta_detail {
+		template <typename T>
+		using adl_sol_lua_get_test_t = decltype(sol_lua_get(types<T>(), static_cast<lua_State*>(nullptr), -1, std::declval<stack::record&>()));
+
+		template <typename T>
+		using adl_sol_lua_interop_get_test_t
+			= decltype(sol_lua_interop_get(types<T>(), static_cast<lua_State*>(nullptr), -1, static_cast<void*>(nullptr), std::declval<stack::record&>()));
+
+		template <typename T>
+		using adl_sol_lua_check_test_t = decltype(sol_lua_check(types<T>(), static_cast<lua_State*>(nullptr), -1, &no_panic, std::declval<stack::record&>()));
+
+		template <typename T>
+		using adl_sol_lua_interop_check_test_t
+			= decltype(sol_lua_interop_check(types<T>(), static_cast<lua_State*>(nullptr), -1, type::none, &no_panic, std::declval<stack::record&>()));
+
+		template <typename T>
+		using adl_sol_lua_check_get_test_t
+			= decltype(sol_lua_check_get(types<T>(), static_cast<lua_State*>(nullptr), -1, &no_panic, std::declval<stack::record&>()));
+
+		template <typename... Args>
+		using adl_sol_lua_push_test_t = decltype(sol_lua_push(static_cast<lua_State*>(nullptr), std::declval<Args>()...));
+
+		template <typename T, typename... Args>
+		using adl_sol_lua_push_exact_test_t = decltype(sol_lua_push(types<T>(), static_cast<lua_State*>(nullptr), std::declval<Args>()...));
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_get_v = meta::is_detected_v<adl_sol_lua_get_test_t, T>;
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_interop_get_v = meta::is_detected_v<adl_sol_lua_interop_get_test_t, T>;
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_check_v = meta::is_detected_v<adl_sol_lua_check_test_t, T>;
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_interop_check_v = meta::is_detected_v<adl_sol_lua_interop_check_test_t, T>;
+
+		template <typename T>
+		inline constexpr bool is_adl_sol_lua_check_get_v = meta::is_detected_v<adl_sol_lua_check_get_test_t, T>;
+
+		template <typename... Args>
+		inline constexpr bool is_adl_sol_lua_push_v = meta::is_detected_v<adl_sol_lua_push_test_t, Args...>;
+
+		template <typename T, typename... Args>
+		inline constexpr bool is_adl_sol_lua_push_exact_v = meta::is_detected_v<adl_sol_lua_push_exact_test_t, T, Args...>;
+	}} // namespace meta::meta_detail
+
+	namespace stack {
+		namespace stack_detail {
+			constexpr const char* not_enough_stack_space = "not enough space left on Lua stack";
+			constexpr const char* not_enough_stack_space_floating = "not enough space left on Lua stack for a floating point number";
+			constexpr const char* not_enough_stack_space_integral = "not enough space left on Lua stack for an integral number";
+			constexpr const char* not_enough_stack_space_string = "not enough space left on Lua stack for a string";
+			constexpr const char* not_enough_stack_space_meta_function_name = "not enough space left on Lua stack for the name of a meta_function";
+			constexpr const char* not_enough_stack_space_userdata = "not enough space left on Lua stack to create a sol2 userdata";
+			constexpr const char* not_enough_stack_space_generic = "not enough space left on Lua stack to push valuees";
+			constexpr const char* not_enough_stack_space_environment = "not enough space left on Lua stack to retrieve environment";
+
+			template <typename T>
+			struct strip {
+				typedef T type;
+			};
+			template <typename T>
+			struct strip<std::reference_wrapper<T>> {
+				typedef T& type;
+			};
+			template <typename T>
+			struct strip<user<T>> {
+				typedef T& type;
+			};
+			template <typename T>
+			struct strip<non_null<T>> {
+				typedef T type;
+			};
+			template <typename T>
+			using strip_t = typename strip<T>::type;
+
+			template <typename C>
+			static int get_size_hint(C& c) {
+				return static_cast<int>(c.size());
+			}
+
+			template <typename V, typename Al>
+			static int get_size_hint(const std::forward_list<V, Al>&) {
+				// forward_list makes me sad
+				return static_cast<int>(32);
+			}
+
+			template <typename T>
+			decltype(auto) unchecked_unqualified_get(lua_State* L, int index, record& tracking) {
+				using Tu = meta::unqualified_t<T>;
+				if constexpr (meta::meta_detail::is_adl_sol_lua_get_v<Tu>) {
+					return sol_lua_get(types<Tu>(), L, index, tracking);
+				}
+				else {
+					unqualified_getter<Tu> g {};
+					return g.get(L, index, tracking);
+				}
+			}
+
+			template <typename T>
+			decltype(auto) unchecked_get(lua_State* L, int index, record& tracking) {
+				if constexpr (meta::meta_detail::is_adl_sol_lua_get_v<T>) {
+					return sol_lua_get(types<T>(), L, index, tracking);
+				}
+				else {
+					qualified_getter<T> g {};
+					return g.get(L, index, tracking);
+				}
+			}
+
+			template <typename T>
+			decltype(auto) unqualified_interop_get(lua_State* L, int index, void* unadjusted_pointer, record& tracking) {
+				using Tu = meta::unqualified_t<T>;
+				if constexpr (meta::meta_detail::is_adl_sol_lua_interop_get_v<Tu>) {
+					return sol_lua_interop_get(types<Tu>(), L, index, unadjusted_pointer, tracking);
+				}
+				else {
+					(void)L;
+					(void)index;
+					(void)unadjusted_pointer;
+					(void)tracking;
+					using Ti = stack_detail::strip_t<Tu>;
+					return std::pair<bool, Ti*> { false, nullptr };
+				}
+			}
+
+			template <typename T>
+			decltype(auto) interop_get(lua_State* L, int index, void* unadjusted_pointer, record& tracking) {
+				if constexpr (meta::meta_detail::is_adl_sol_lua_interop_get_v<T>) {
+					return sol_lua_interop_get(types<T>(), L, index, unadjusted_pointer, tracking);
+				}
+				else {
+					return unqualified_interop_get<T>(L, index, unadjusted_pointer, tracking);
+				}
+			}
+
+			template <typename T, typename Handler>
+			bool unqualified_interop_check(lua_State* L, int index, type index_type, Handler&& handler, record& tracking) {
+				using Tu = meta::unqualified_t<T>;
+				if constexpr (meta::meta_detail::is_adl_sol_lua_interop_check_v<Tu>) {
+					return sol_lua_interop_check(types<Tu>(), L, index, index_type, std::forward<Handler>(handler), tracking);
+				}
+				else {
+					(void)L;
+					(void)index;
+					(void)index_type;
+					(void)handler;
+					(void)tracking;
+					return false;
+				}
+			}
+
+			template <typename T, typename Handler>
+			bool interop_check(lua_State* L, int index, type index_type, Handler&& handler, record& tracking) {
+				if constexpr (meta::meta_detail::is_adl_sol_lua_interop_check_v<T>) {
+					return sol_lua_interop_check(types<T>(), L, index, index_type, std::forward<Handler>(handler), tracking);
+				}
+				else {
+					return unqualified_interop_check<T>(L, index, index_type, std::forward<Handler>(handler), tracking);
+				}
+			}
+
+			using undefined_method_func = void (*)(stack_reference);
+
+			struct undefined_metatable {
+				lua_State* L;
+				const char* key;
+				undefined_method_func on_new_table;
+
+				undefined_metatable(lua_State* l, const char* k, undefined_method_func umf) : L(l), key(k), on_new_table(umf) {
+				}
+
+				void operator()() const {
+					if (luaL_newmetatable(L, key) == 1) {
+						on_new_table(stack_reference(L, -1));
+					}
+					lua_setmetatable(L, -2);
+				}
+			};
+		} // namespace stack_detail
+
+		inline bool maybe_indexable(lua_State* L, int index = -1) {
+			type t = type_of(L, index);
+			return t == type::userdata || t == type::table;
+		}
+
+		inline int top(lua_State* L) {
+			return lua_gettop(L);
+		}
+
+		inline bool is_main_thread(lua_State* L) {
+			int ismainthread = lua_pushthread(L);
+			lua_pop(L, 1);
+			return ismainthread == 1;
+		}
+
+		inline void coroutine_create_guard(lua_State* L) {
+			if (is_main_thread(L)) {
+				return;
+			}
+			int stacksize = lua_gettop(L);
+			if (stacksize < 1) {
+				return;
+			}
+			if (type_of(L, 1) != type::function) {
+				return;
+			}
+			// well now we're screwed...
+			// we can clean the stack and pray it doesn't destroy anything?
+			lua_pop(L, stacksize);
+		}
+
+		inline void clear(lua_State* L, int table_index) {
+			lua_pushnil(L);
+			while (lua_next(L, table_index) != 0) {
+				// remove value
+				lua_pop(L, 1);
+				// duplicate key to protect form rawset
+				lua_pushvalue(L, -1);
+				// push new value
+				lua_pushnil(L);
+				// table_index%[key] = nil
+				lua_rawset(L, table_index);
+			}
+		}
+
+		inline void clear(reference& r) {
+			auto pp = push_pop<false>(r);
+			int stack_index = pp.index_of(r);
+			clear(r.lua_state(), stack_index);
+		}
+
+		inline void clear(stack_reference& r) {
+			clear(r.lua_state(), r.stack_index());
+		}
+
+		inline void clear(lua_State* L_, stateless_reference& r) {
+			r.push(L_);
+			int stack_index = absolute_index(L_, -1);
+			clear(L_, stack_index);
+			r.pop(L_);
+		}
+
+		inline void clear(lua_State* L_, stateless_stack_reference& r) {
+			clear(L_, r.stack_index());
+		}
+
+		template <typename T, typename... Args>
+		int push(lua_State* L, T&& t, Args&&... args) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::meta_detail::is_adl_sol_lua_push_exact_v<T, T, Args...>) {
+				return sol_lua_push(types<T>(), L, std::forward<T>(t), std::forward<Args>(args)...);
+			}
+			else if constexpr (meta::meta_detail::is_adl_sol_lua_push_exact_v<Tu, T, Args...>) {
+				return sol_lua_push(types<Tu>(), L, std::forward<T>(t), std::forward<Args>(args)...);
+			}
+			else if constexpr (meta::meta_detail::is_adl_sol_lua_push_v<T, Args...>) {
+				return sol_lua_push(L, std::forward<T>(t), std::forward<Args>(args)...);
+			}
+			else {
+				unqualified_pusher<Tu> p {};
+				return p.push(L, std::forward<T>(t), std::forward<Args>(args)...);
+			}
+		}
+
+		// overload allows to use a pusher of a specific type, but pass in any kind of args
+		template <typename T, typename Arg, typename... Args, typename = std::enable_if_t<!std::is_same<T, Arg>::value>>
+		int push(lua_State* L, Arg&& arg, Args&&... args) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::meta_detail::is_adl_sol_lua_push_exact_v<T, Arg, Args...>) {
+				return sol_lua_push(types<T>(), L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+			else if constexpr (meta::meta_detail::is_adl_sol_lua_push_exact_v<Tu, Arg, Args...>) {
+				return sol_lua_push(types<Tu>(), L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+			else if constexpr (meta::meta_detail::is_adl_sol_lua_push_v<Arg, Args...> && !detail::is_tagged_v<Tu>) {
+				return sol_lua_push(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+			else {
+				unqualified_pusher<Tu> p {};
+				return p.push(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+		}
+
+		template <typename T, typename... Args>
+		int push_userdata(lua_State* L, T&& t, Args&&... args) {
+			using U = meta::unqualified_t<T>;
+			using Tr = meta::conditional_t<std::is_pointer_v<U>,
+			     detail::as_pointer_tag<std::remove_pointer_t<U>>,
+			     meta::conditional_t<is_unique_usertype_v<U>, detail::as_unique_tag<U>, detail::as_value_tag<U>>>;
+			return stack::push<Tr>(L, std::forward<T>(t), std::forward<Args>(args)...);
+		}
+
+		template <typename T, typename Arg, typename... Args>
+		int push_userdata(lua_State* L, Arg&& arg, Args&&... args) {
+			using U = meta::unqualified_t<T>;
+			using Tr = meta::conditional_t<std::is_pointer_v<U>,
+			     detail::as_pointer_tag<std::remove_pointer_t<U>>,
+			     meta::conditional_t<is_unique_usertype_v<U>, detail::as_unique_tag<U>, detail::as_value_tag<U>>>;
+			return stack::push<Tr>(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+		}
+
+		namespace stack_detail {
+
+			template <typename T, typename Arg, typename... Args>
+			int push_reference(lua_State* L, Arg&& arg, Args&&... args) {
+				// clang-format off
+				using use_reference_tag =
+				meta::all<
+					meta::neg<is_value_semantic_for_function<T>>
+#if SOL_IS_OFF(SOL_FUNCTION_CALL_VALUE_SEMANTICS)
+					, std::is_lvalue_reference<T>,
+					meta::neg<std::is_const<std::remove_reference_t<T>>>,
+					meta::neg<is_lua_primitive<meta::unqualified_t<T>>>,
+					meta::neg<is_unique_usertype<meta::unqualified_t<T>>>
+#endif
+				>;
+				// clang-format on
+				using Tr = meta::conditional_t<use_reference_tag::value, detail::as_reference_tag, meta::unqualified_t<T>>;
+				return stack::push<Tr>(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+
+		} // namespace stack_detail
+
+		template <typename T, typename... Args>
+		int push_reference(lua_State* L, T&& t, Args&&... args) {
+			return stack_detail::push_reference<T>(L, std::forward<T>(t), std::forward<Args>(args)...);
+		}
+
+		template <typename T, typename Arg, typename... Args>
+		int push_reference(lua_State* L, Arg&& arg, Args&&... args) {
+			return stack_detail::push_reference<T>(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+		}
+
+		inline int multi_push(lua_State*) {
+			// do nothing
+			return 0;
+		}
+
+		template <typename T, typename... Args>
+		int multi_push(lua_State* L, T&& t, Args&&... args) {
+			int pushcount = push(L, std::forward<T>(t));
+			void(detail::swallow { (pushcount += stack::push(L, std::forward<Args>(args)), 0)... });
+			return pushcount;
+		}
+
+		inline int multi_push_reference(lua_State*) {
+			// do nothing
+			return 0;
+		}
+
+		template <typename T, typename... Args>
+		int multi_push_reference(lua_State* L, T&& t, Args&&... args) {
+			int pushcount = stack::push_reference(L, std::forward<T>(t));
+			void(detail::swallow { (pushcount += stack::push_reference(L, std::forward<Args>(args)), 0)... });
+			return pushcount;
+		}
+
+		template <typename T, typename Handler>
+		bool unqualified_check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::meta_detail::is_adl_sol_lua_check_v<Tu>) {
+				return sol_lua_check(types<Tu>(), L, index, std::forward<Handler>(handler), tracking);
+			}
+			else {
+				unqualified_checker<Tu, lua_type_of_v<Tu>> c{};
+				return c.check(L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+
+		template <typename T, typename Handler>
+		bool unqualified_check(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return unqualified_check<T>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename T>
+		bool unqualified_check(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			auto handler = &no_panic;
+			return unqualified_check<T>(L, index, handler);
+		}
+
+		template <typename T, typename Handler>
+		bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			if constexpr (meta::meta_detail::is_adl_sol_lua_check_v<T>) {
+				return sol_lua_check(types<T>(), L, index, std::forward<Handler>(handler), tracking);
+			}
+			else {
+				using Tu = meta::unqualified_t<T>;
+				qualified_checker<T, lua_type_of_v<Tu>> c{};
+				return c.check(L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+
+		template <typename T, typename Handler>
+		bool check(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return check<T>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename T>
+		bool check(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			auto handler = &no_panic;
+			return check<T>(L, index, handler);
+		}
+
+		template <typename T, typename Handler>
+		bool check_usertype(lua_State* L, int index, type, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			using detail_t = meta::conditional_t<std::is_pointer_v<T>, detail::as_pointer_tag<Tu>, detail::as_value_tag<Tu>>;
+			return check<detail_t>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename T, typename Handler>
+		bool check_usertype(lua_State* L, int index, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			using detail_t = meta::conditional_t<std::is_pointer_v<T>, detail::as_pointer_tag<Tu>, detail::as_value_tag<Tu>>;
+			return check<detail_t>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename T, typename Handler>
+		bool check_usertype(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return check_usertype<T>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename T>
+		bool check_usertype(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			auto handler = &no_panic;
+			return check_usertype<T>(L, index, handler);
+		}
+
+		template <typename T, typename Handler>
+		decltype(auto) unqualified_check_get(lua_State* L, int index, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::meta_detail::is_adl_sol_lua_check_get_v<T>) {
+				return sol_lua_check_get(types<T>(), L, index, std::forward<Handler>(handler), tracking);
+			}
+			else if constexpr (meta::meta_detail::is_adl_sol_lua_check_get_v<Tu>) {
+				return sol_lua_check_get(types<Tu>(), L, index, std::forward<Handler>(handler), tracking);
+			}
+			else {
+				unqualified_check_getter<Tu> cg {};
+				return cg.get(L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+
+		template <typename T, typename Handler>
+		decltype(auto) unqualified_check_get(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return unqualified_check_get<T>(L, index, handler, tracking);
+		}
+
+		template <typename T>
+		decltype(auto) unqualified_check_get(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			auto handler = &no_panic;
+			return unqualified_check_get<T>(L, index, handler);
+		}
+
+		template <typename T, typename Handler>
+		decltype(auto) check_get(lua_State* L, int index, Handler&& handler, record& tracking) {
+			if constexpr (meta::meta_detail::is_adl_sol_lua_check_get_v<T>) {
+				return sol_lua_check_get(types<T>(), L, index, std::forward<Handler>(handler), tracking);
+			}
+			else {
+				qualified_check_getter<T> cg {};
+				return cg.get(L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+
+		template <typename T, typename Handler>
+		decltype(auto) check_get(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return check_get<T>(L, index, handler, tracking);
+		}
+
+		template <typename T>
+		decltype(auto) check_get(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			auto handler = &no_panic;
+			return check_get<T>(L, index, handler);
+		}
+
+		namespace stack_detail {
+
+			template <typename Handler>
+			bool check_types(lua_State*, int, Handler&&, record&) {
+				return true;
+			}
+
+			template <typename T, typename... Args, typename Handler>
+			bool check_types(lua_State* L, int firstargument, Handler&& handler, record& tracking) {
+				if (!stack::check<T>(L, firstargument + tracking.used, handler, tracking))
+					return false;
+				return check_types<Args...>(L, firstargument, std::forward<Handler>(handler), tracking);
+			}
+
+			template <typename... Args, typename Handler>
+			bool check_types(types<Args...>, lua_State* L, int index, Handler&& handler, record& tracking) {
+				return check_types<Args...>(L, index, std::forward<Handler>(handler), tracking);
+			}
+
+		} // namespace stack_detail
+
+		template <typename... Args, typename Handler>
+		bool multi_check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			return stack_detail::check_types<Args...>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename... Args, typename Handler>
+		bool multi_check(lua_State* L, int index, Handler&& handler) {
+			record tracking {};
+			return multi_check<Args...>(L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename... Args>
+		bool multi_check(lua_State* L, int index) {
+			return multi_check<Args...>(L, index);
+		}
+
+		template <typename T>
+		auto unqualified_get(lua_State* L, int index, record& tracking) -> decltype(stack_detail::unchecked_unqualified_get<T>(L, index, tracking)) {
+#if SOL_IS_ON(SOL_SAFE_GETTER)
+			static constexpr bool is_op = meta::is_optional_v<T>;
+			if constexpr (is_op) {
+				return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
+			}
+			else {
+				if (is_lua_reference<T>::value) {
+					return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
+				}
+				auto op = unqualified_check_get<T>(L, index, type_panic_c_str, tracking);
+				return *std::move(op);
+			}
+#else
+			return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
+#endif
+		}
+
+		template <typename T>
+		decltype(auto) unqualified_get(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			record tracking {};
+			return unqualified_get<T>(L, index, tracking);
+		}
+
+		template <typename T>
+		auto get(lua_State* L, int index, record& tracking) -> decltype(stack_detail::unchecked_get<T>(L, index, tracking)) {
+#if SOL_IS_ON(SOL_SAFE_GETTER)
+			static constexpr bool is_op = meta::is_optional_v<T>;
+			if constexpr (is_op) {
+				return stack_detail::unchecked_get<T>(L, index, tracking);
+			}
+			else {
+				if (is_lua_reference<T>::value) {
+					return stack_detail::unchecked_get<T>(L, index, tracking);
+				}
+				auto op = check_get<T>(L, index, type_panic_c_str, tracking);
+				return *std::move(op);
+			}
+#else
+			return stack_detail::unchecked_get<T>(L, index, tracking);
+#endif
+		}
+
+		template <typename T>
+		decltype(auto) get(lua_State* L, int index = -lua_size<meta::unqualified_t<T>>::value) {
+			record tracking {};
+			return get<T>(L, index, tracking);
+		}
+
+		template <typename T>
+		decltype(auto) get_usertype(lua_State* L, int index, record& tracking) {
+			using UT = meta::conditional_t<std::is_pointer<T>::value, detail::as_pointer_tag<std::remove_pointer_t<T>>, detail::as_value_tag<T>>;
+			return get<UT>(L, index, tracking);
+		}
+
+		template <typename T>
+		decltype(auto) get_usertype(lua_State* L, int index = -lua_size_v<meta::unqualified_t<T>>) {
+			record tracking {};
+			return get_usertype<T>(L, index, tracking);
+		}
+
+		template <typename T>
+		decltype(auto) pop(lua_State* L) {
+			return popper<T> {}.pop(L);
+		}
+
+		template <bool global = false, bool raw = false, typename Key>
+		void get_field(lua_State* L, Key&& key) {
+			field_getter<meta::unqualified_t<Key>, global, raw> {}.get(L, std::forward<Key>(key));
+		}
+
+		template <bool global = false, bool raw = false, typename Key>
+		void get_field(lua_State* L, Key&& key, int tableindex) {
+			field_getter<meta::unqualified_t<Key>, global, raw> {}.get(L, std::forward<Key>(key), tableindex);
+		}
+
+		template <bool global = false, typename Key>
+		void raw_get_field(lua_State* L, Key&& key) {
+			get_field<global, true>(L, std::forward<Key>(key));
+		}
+
+		template <bool global = false, typename Key>
+		void raw_get_field(lua_State* L, Key&& key, int tableindex) {
+			get_field<global, true>(L, std::forward<Key>(key), tableindex);
+		}
+
+		template <bool global = false, bool raw = false, typename C = detail::non_lua_nil_t, typename Key>
+		probe probe_get_field(lua_State* L, Key&& key) {
+			return probe_field_getter<meta::unqualified_t<Key>, C, global, raw> {}.get(L, std::forward<Key>(key));
+		}
+
+		template <bool global = false, bool raw = false, typename C = detail::non_lua_nil_t, typename Key>
+		probe probe_get_field(lua_State* L, Key&& key, int tableindex) {
+			return probe_field_getter<meta::unqualified_t<Key>, C, global, raw> {}.get(L, std::forward<Key>(key), tableindex);
+		}
+
+		template <bool global = false, typename C = detail::non_lua_nil_t, typename Key>
+		probe probe_raw_get_field(lua_State* L, Key&& key) {
+			return probe_get_field<global, true, C>(L, std::forward<Key>(key));
+		}
+
+		template <bool global = false, typename C = detail::non_lua_nil_t, typename Key>
+		probe probe_raw_get_field(lua_State* L, Key&& key, int tableindex) {
+			return probe_get_field<global, true, C>(L, std::forward<Key>(key), tableindex);
+		}
+
+		template <bool global = false, bool raw = false, typename Key, typename Value>
+		void set_field(lua_State* L, Key&& key, Value&& value) {
+			field_setter<meta::unqualified_t<Key>, global, raw> {}.set(L, std::forward<Key>(key), std::forward<Value>(value));
+		}
+
+		template <bool global = false, bool raw = false, typename Key, typename Value>
+		void set_field(lua_State* L, Key&& key, Value&& value, int tableindex) {
+			field_setter<meta::unqualified_t<Key>, global, raw> {}.set(L, std::forward<Key>(key), std::forward<Value>(value), tableindex);
+		}
+
+		template <bool global = false, typename Key, typename Value>
+		void raw_set_field(lua_State* L, Key&& key, Value&& value) {
+			set_field<global, true>(L, std::forward<Key>(key), std::forward<Value>(value));
+		}
+
+		template <bool global = false, typename Key, typename Value>
+		void raw_set_field(lua_State* L, Key&& key, Value&& value, int tableindex) {
+			set_field<global, true>(L, std::forward<Key>(key), std::forward<Value>(value), tableindex);
+		}
+
+		template <typename T, typename F>
+		void modify_unique_usertype_as(const stack_reference& obj, F&& f) {
+			void* raw = lua_touserdata(obj.lua_state(), obj.stack_index());
+			void* ptr_memory = detail::align_usertype_pointer(raw);
+			void* uu_memory = detail::align_usertype_unique<T>(raw);
+			T& uu = *static_cast<T*>(uu_memory);
+			f(uu);
+			*static_cast<void**>(ptr_memory) = static_cast<void*>(detail::unique_get(obj.lua_state(), uu));
+		}
+
+		template <typename F>
+		void modify_unique_usertype(const stack_reference& obj, F&& f) {
+			using bt = meta::bind_traits<meta::unqualified_t<F>>;
+			using T = typename bt::template arg_at<0>;
+			using Tu = meta::unqualified_t<T>;
+			modify_unique_usertype_as<Tu>(obj, std::forward<F>(f));
+		}
+
+		namespace stack_detail {
+			template <typename T, typename Handler>
+			decltype(auto) check_get_arg(lua_State* L_, int index_, Handler&& handler_, record& tracking_) {
+				if constexpr (meta::meta_detail::is_adl_sol_lua_check_access_v<T>) {
+					sol_lua_check_access(types<meta::unqualified_t<T>>(), L_, index_, tracking_);
+				}
+				return check_get<T>(L_, index_, std::forward<Handler>(handler_), tracking_);
+			}
+
+			template <typename T>
+			decltype(auto) unchecked_get_arg(lua_State* L_, int index_, record& tracking_) {
+				if constexpr (meta::meta_detail::is_adl_sol_lua_check_access_v<T>) {
+					sol_lua_check_access(types<meta::unqualified_t<T>>(), L_, index_, tracking_);
+				}
+				return unchecked_get<T>(L_, index_, tracking_);
+			}
+		} // namespace stack_detail
+
+	} // namespace stack
+
+	namespace detail {
+
+		template <typename T>
+		lua_CFunction make_destructor(std::true_type) {
+			if constexpr (is_unique_usertype_v<T>) {
+				return &unique_destroy<T>;
+			}
+			else if constexpr (!std::is_pointer_v<T>) {
+				return &usertype_alloc_destroy<T>;
+			}
+			else {
+				return &cannot_destroy<T>;
+			}
+		}
+
+		template <typename T>
+		lua_CFunction make_destructor(std::false_type) {
+			return &cannot_destroy<T>;
+		}
+
+		template <typename T>
+		lua_CFunction make_destructor() {
+			return make_destructor<T>(std::is_destructible<T>());
+		}
+
+		struct no_comp {
+			template <typename A, typename B>
+			bool operator()(A&&, B&&) const {
+				return false;
+			}
+		};
+
+		template <typename T>
+		int is_check(lua_State* L) {
+			return stack::push(L, stack::check<T>(L, 1, &no_panic));
+		}
+
+		template <typename T>
+		int member_default_to_string(std::true_type, lua_State* L) {
+			decltype(auto) ts = stack::get<T>(L, 1).to_string();
+			return stack::push(L, std::forward<decltype(ts)>(ts));
+		}
+
+		template <typename T>
+		int member_default_to_string(std::false_type, lua_State* L) {
+			return luaL_error(L,
+			     "cannot perform to_string on '%s': no 'to_string' overload in namespace, 'to_string' member "
+			     "function, or operator<<(ostream&, ...) present",
+			     detail::demangle<T>().data());
+		}
+
+		template <typename T>
+		int adl_default_to_string(std::true_type, lua_State* L) {
+			using namespace std;
+			decltype(auto) ts = to_string(stack::get<T>(L, 1));
+			return stack::push(L, std::forward<decltype(ts)>(ts));
+		}
+
+		template <typename T>
+		int adl_default_to_string(std::false_type, lua_State* L) {
+			return member_default_to_string<T>(meta::supports_to_string_member<T>(), L);
+		}
+
+		template <typename T>
+		int oss_default_to_string(std::true_type, lua_State* L) {
+			std::ostringstream oss;
+			oss << stack::unqualified_get<T>(L, 1);
+			return stack::push(L, oss.str());
+		}
+
+		template <typename T>
+		int oss_default_to_string(std::false_type, lua_State* L) {
+			return adl_default_to_string<T>(meta::supports_adl_to_string<T>(), L);
+		}
+
+		template <typename T>
+		int default_to_string(lua_State* L) {
+			return oss_default_to_string<T>(meta::supports_op_left_shift<std::ostream, T>(), L);
+		}
+
+		template <typename T>
+		int default_size(lua_State* L) {
+			decltype(auto) self = stack::unqualified_get<T>(L, 1);
+			return stack::push(L, self.size());
+		}
+
+		template <typename T, typename Op>
+		int comparsion_operator_wrap(lua_State* L) {
+			if constexpr (std::is_void_v<T>) {
+				return stack::push(L, false);
+			}
+			else {
+				auto maybel = stack::unqualified_check_get<T>(L, 1);
+				if (!maybel) {
+					return stack::push(L, false);
+				}
+				auto mayber = stack::unqualified_check_get<T>(L, 2);
+				if (!mayber) {
+					return stack::push(L, false);
+				}
+				decltype(auto) l = *maybel;
+				decltype(auto) r = *mayber;
+				if constexpr (std::is_same_v<no_comp, Op>) {
+					std::equal_to<> op;
+					return stack::push(L, op(detail::ptr(l), detail::ptr(r)));
+				}
+				else {
+					if constexpr (std::is_same_v<std::equal_to<>, Op> // clang-format hack
+					     || std::is_same_v<std::less_equal<>, Op>     //
+					     || std::is_same_v<std::less_equal<>, Op>) {  //
+						if (detail::ptr(l) == detail::ptr(r)) {
+							return stack::push(L, true);
+						}
+					}
+					Op op;
+					return stack::push(L, op(detail::deref(l), detail::deref(r)));
+				}
+			}
+		}
+
+		template <typename T, typename IFx, typename Fx>
+		void insert_default_registrations(IFx&& ifx, Fx&& fx);
+
+		template <typename T, bool, bool>
+		struct get_is_primitive : is_lua_primitive<T> { };
+
+		template <typename T>
+		struct get_is_primitive<T, true, false>
+		: meta::neg<std::is_reference<decltype(sol_lua_get(types<T>(), nullptr, -1, std::declval<stack::record&>()))>> { };
+
+		template <typename T>
+		struct get_is_primitive<T, false, true>
+		: meta::neg<std::is_reference<decltype(sol_lua_get(types<meta::unqualified_t<T>>(), nullptr, -1, std::declval<stack::record&>()))>> { };
+
+		template <typename T>
+		struct get_is_primitive<T, true, true> : get_is_primitive<T, true, false> { };
+
+	} // namespace detail
+
+	template <typename T>
+	struct is_proxy_primitive
+	: detail::get_is_primitive<T, meta::meta_detail::is_adl_sol_lua_get_v<T>, meta::meta_detail::is_adl_sol_lua_get_v<meta::unqualified_t<T>>> { };
+
+} // namespace sol
+
+// end of sol/stack_core.hpp
+
+// beginning of sol/stack_check.hpp
+
+// beginning of sol/stack_check_unqualified.hpp
+
+#include <memory>
+#include <functional>
+#include <utility>
+#include <cmath>
+#include <optional>
+#if SOL_IS_ON(SOL_STD_VARIANT)
+#include <variant>
+#endif // variant shenanigans
+
+namespace sol { namespace stack {
+	template <typename Handler>
+	bool loose_table_check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+		tracking.use(1);
+		type t = type_of(L_, index);
+		if (t == type::table) {
+			return true;
+		}
+		if (t != type::userdata) {
+			handler(L_, index, type::table, t, "value is not a table or a userdata that can behave like one");
+			return false;
+		}
+		return true;
+	}
+
+	namespace stack_detail {
+		inline bool impl_check_metatable(lua_State* L_, int index, const std::string& metakey, bool poptable) {
+			luaL_getmetatable(L_, &metakey[0]);
+			const type expectedmetatabletype = static_cast<type>(lua_type(L_, -1));
+			if (expectedmetatabletype != type::lua_nil) {
+				if (lua_rawequal(L_, -1, index) == 1) {
+					lua_pop(L_, 1 + static_cast<int>(poptable));
+					return true;
+				}
+			}
+			lua_pop(L_, 1);
+			return false;
+		}
+
+		template <typename T, bool poptable = true>
+		inline bool check_metatable(lua_State* L_, int index = -2) {
+			return impl_check_metatable(L_, index, usertype_traits<T>::metatable(), poptable);
+		}
+
+		template <type expected, int (*check_func)(lua_State*, int)>
+		struct basic_check {
+			template <typename Handler>
+			static bool check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+				tracking.use(1);
+				bool success = check_func(L_, index) == 1;
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, expected, type_of(L_, index), "");
+				}
+				return success;
+			}
+		};
+	} // namespace stack_detail
+
+	template <typename T, typename>
+	struct unqualified_interop_checker {
+		template <typename Handler>
+		static bool check(lua_State*, int, type, Handler&&, record&) {
+			return false;
+		}
+	};
+
+	template <typename T, typename>
+	struct qualified_interop_checker {
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, type index_type, Handler&& handler, record& tracking) {
+			return stack_detail::unqualified_interop_check<T>(L_, index, index_type, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+	template <typename T, type expected, typename>
+	struct unqualified_checker {
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+			if constexpr (std::is_same_v<T, bool>) {
+				tracking.use(1);
+				bool success = lua_isboolean(L_, index) == 1;
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, expected, type_of(L_, index), "");
+				}
+				return success;
+			}
+			else if constexpr (meta::any_same_v<T,
+				                   char
+#if SOL_IS_ON(SOL_CHAR8_T)
+				                   ,
+				                   char8_t
+#endif
+				                   ,
+				                   char16_t,
+				                   char32_t>) {
+				return stack::check<std::basic_string<T>>(L_, index, std::forward<Handler>(handler), tracking);
+			}
+			else if constexpr (std::is_integral_v<T> || std::is_same_v<T, lua_Integer>) {
+				tracking.use(1);
+#if SOL_LUA_VERSION_I_ >= 503
+				// Lua 5.3 and greater checks for numeric precision
+#if SOL_IS_ON(SOL_STRINGS_ARE_NUMBERS)
+				// imprecise, sloppy conversions
+				int isnum = 0;
+				lua_tointegerx(L_, index, &isnum);
+				const bool success = isnum != 0;
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, type::number, type_of(L_, index), detail::not_a_number_or_number_string_integral);
+				}
+#elif SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS)
+				// this check is precise, do not convert
+				if (lua_isinteger(L_, index) == 1) {
+					return true;
+				}
+				const bool success = false;
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, type::number, type_of(L_, index), detail::not_a_number_integral);
+				}
+#else
+				// Numerics are neither safe nor string-convertible
+				type t = type_of(L_, index);
+				const bool success = t == type::number;
+#endif
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, type::number, type_of(L_, index), detail::not_a_number);
+				}
+				return success;
+#else
+				// Lua 5.2 and below checks
+#if SOL_IS_OFF(SOL_STRINGS_ARE_NUMBERS)
+				// must pre-check, because it will convert
+				type t = type_of(L_, index);
+				if (t != type::number) {
+					// expected type, actual type
+					handler(L_, index, type::number, t, detail::not_a_number);
+					return false;
+				}
+#endif // Do not allow strings to be numbers
+
+#if SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS)
+				int isnum = 0;
+				const lua_Number v = lua_tonumberx(L_, index, &isnum);
+				const bool success = isnum != 0 && static_cast<lua_Number>(llround(v)) == v;
+#else
+				const bool success = true;
+#endif // Safe numerics and number precision checking
+				if (!success) {
+					// Use defines to provide a better error message!
+#if SOL_IS_ON(SOL_STRINGS_ARE_NUMBERS)
+					handler(L_, index, type::number, type_of(L_, index), detail::not_a_number_or_number_string);
+#elif SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS)
+					handler(L_, index, type::number, t, detail::not_a_number_or_number_string);
+#else
+					handler(L_, index, type::number, t, detail::not_a_number);
+#endif
+				}
+				return success;
+#endif
+			}
+			else if constexpr (std::is_floating_point_v<T> || std::is_same_v<T, lua_Number>) {
+				tracking.use(1);
+#if SOL_IS_ON(SOL_STRINGS_ARE_NUMBERS)
+				bool success = lua_isnumber(L_, index) == 1;
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, type::number, type_of(L_, index), detail::not_a_number_or_number_string);
+				}
+				return success;
+#else
+				type t = type_of(L_, index);
+				bool success = t == type::number;
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, type::number, t, detail::not_a_number);
+				}
+				return success;
+#endif // Strings are Numbers
+			}
+			else if constexpr (meta::any_same_v<T, type, this_state, this_main_state, this_environment, variadic_args>) {
+				(void)L_;
+				(void)index;
+				(void)handler;
+				tracking.use(0);
+				return true;
+			}
+			else if constexpr (is_unique_usertype_v<T>) {
+				using element = unique_usertype_element_t<T>;
+				using actual = unique_usertype_actual_t<T>;
+				const type indextype = type_of(L_, index);
+				tracking.use(1);
+				if (indextype != type::userdata) {
+					handler(L_, index, type::userdata, indextype, "value is not a userdata");
+					return false;
+				}
+				if (lua_getmetatable(L_, index) == 0) {
+					return true;
+				}
+				int metatableindex = lua_gettop(L_);
+				if (stack_detail::check_metatable<d::u<element>>(L_, metatableindex)) {
+					void* memory = lua_touserdata(L_, index);
+					memory = detail::align_usertype_unique_destructor(memory);
+					detail::unique_destructor& pdx = *static_cast<detail::unique_destructor*>(memory);
+					bool success = &detail::usertype_unique_alloc_destroy<element, actual> == pdx;
+					if (!success) {
+						memory = detail::align_usertype_unique_tag<true>(memory);
+#if 0
+						// New version, one day
+#else
+						const char*& name_tag = *static_cast<const char**>(memory);
+						success = usertype_traits<T>::qualified_name() == name_tag;
+#endif
+						if (!success) {
+							handler(L_, index, type::userdata, indextype, "value is a userdata but is not the correct unique usertype");
+						}
+					}
+					return success;
+				}
+				lua_pop(L_, 1);
+				handler(L_, index, type::userdata, indextype, "unrecognized userdata (not pushed by sol?)");
+				return false;
+			}
+			else if constexpr (meta::any_same_v<T, lua_nil_t, std::nullopt_t, nullopt_t>) {
+				bool success = lua_isnil(L_, index);
+				if (success) {
+					tracking.use(1);
+					return success;
+				}
+				tracking.use(0);
+				success = lua_isnone(L_, index);
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, expected, type_of(L_, index), "");
+				}
+				return success;
+			}
+			else if constexpr (std::is_same_v<T, env_key_t>) {
+				tracking.use(1);
+				type t = type_of(L_, index);
+				if (t == type::table || t == type::none || t == type::lua_nil || t == type::userdata) {
+					return true;
+				}
+				handler(L_, index, type::table, t, "value cannot not have a valid environment");
+				return true;
+			}
+			else if constexpr (std::is_same_v<T, detail::non_lua_nil_t>) {
+				return !stack::unqualified_check<lua_nil_t>(L_, index, std::forward<Handler>(handler), tracking);
+			}
+			else if constexpr (meta::is_specialization_of_v<T, basic_lua_table>) {
+				tracking.use(1);
+				type t = type_of(L_, index);
+				if (t != type::table) {
+					handler(L_, index, type::table, t, "value is not a table");
+					return false;
+				}
+				return true;
+			}
+			else if constexpr (meta::is_specialization_of_v<T, basic_bytecode>) {
+				tracking.use(1);
+				type t = type_of(L_, index);
+				if (t != type::function) {
+					handler(L_, index, type::function, t, "value is not a function that can be dumped");
+					return false;
+				}
+				return true;
+			}
+			else if constexpr (meta::is_specialization_of_v<T, basic_environment>) {
+				tracking.use(1);
+				if (lua_getmetatable(L_, index) == 0) {
+					return true;
+				}
+				type t = type_of(L_, -1);
+				if (t == type::table || t == type::none || t == type::lua_nil) {
+					lua_pop(L_, 1);
+					return true;
+				}
+				if (t != type::userdata) {
+					lua_pop(L_, 1);
+					handler(L_, index, type::table, t, "value does not have a valid metatable");
+					return false;
+				}
+				return true;
+			}
+			else if constexpr (std::is_same_v<T, metatable_key_t>) {
+				tracking.use(1);
+				if (lua_getmetatable(L_, index) == 0) {
+					return true;
+				}
+				type t = type_of(L_, -1);
+				if (t == type::table || t == type::none || t == type::lua_nil) {
+					lua_pop(L_, 1);
+					return true;
+				}
+				if (t != type::userdata) {
+					lua_pop(L_, 1);
+					handler(L_, index, expected, t, "value does not have a valid metatable");
+					return false;
+				}
+				return true;
+			}
+			else if constexpr (std::is_same_v<T, luaL_Stream*> || std::is_same_v<T, luaL_Stream>) {
+				if (lua_getmetatable(L_, index) == 0) {
+					type t = type_of(L_, index);
+					handler(L_, index, expected, t, "value is not a valid luaL_Stream (has no metatable/is not a valid value)");
+					return false;
+				}
+				luaL_getmetatable(L_, LUA_FILEHANDLE);
+				if (type_of(L_, index) != type::table) {
+					type t = type_of(L_, index);
+					lua_pop(L_, 1);
+					handler(L_,
+						index,
+						expected,
+						t,
+						"value is not a valid luaL_Stream (there is no metatable for luaL_Stream -- did you forget to "
+						"my_lua_state.open_libraries(sol::lib::state) or equivalent?)");
+					return false;
+				}
+				int is_stream_table = lua_compare(L_, -1, -2, LUA_OPEQ);
+				lua_pop(L_, 2);
+				if (is_stream_table == 0) {
+					type t = type_of(L_, index);
+					handler(L_, index, expected, t, "value is not a valid luaL_Stream (incorrect metatable)");
+					return false;
+				}
+				return true;
+			}
+			else if constexpr (meta::is_optional_v<T>) {
+				using ValueType = typename T::value_type;
+				(void)handler;
+				type t = type_of(L_, index);
+				if (t == type::none) {
+					tracking.use(0);
+					return true;
+				}
+				if (t == type::lua_nil) {
+					tracking.use(1);
+					return true;
+				}
+				return stack::unqualified_check<ValueType>(L_, index, &no_panic, tracking);
+			}
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE)
+			else if constexpr (std::is_function_v<T> || (std::is_pointer_v<T> && std::is_function_v<std::remove_pointer_t<T>>)) {
+				return stack_detail::check_function_pointer<std::remove_pointer_t<T>>(L_, index, std::forward<Handler>(handler), tracking);
+			}
+#endif
+			else if constexpr (expected == type::userdata) {
+				if constexpr (meta::any_same_v<T, userdata_value> || meta::is_specialization_of_v<T, basic_userdata>) {
+					tracking.use(1);
+					type t = type_of(L_, index);
+					bool success = t == type::userdata;
+					if (!success) {
+						// expected type, actual type
+						handler(L_, index, type::userdata, t, "");
+					}
+					return success;
+				}
+				else if constexpr (meta::is_specialization_of_v<T, user>) {
+					unqualified_checker<lightuserdata_value, type::userdata> c;
+					(void)c;
+					return c.check(L_, index, std::forward<Handler>(handler), tracking);
+				}
+				else {
+					if constexpr (std::is_pointer_v<T>) {
+						return check_usertype<T>(L_, index, std::forward<Handler>(handler), tracking);
+					}
+					else if constexpr (meta::is_specialization_of_v<T, std::reference_wrapper>) {
+						using T_internal = typename T::type;
+						return stack::check<T_internal>(L_, index, std::forward<Handler>(handler), tracking);
+					}
+					else {
+						return check_usertype<T>(L_, index, std::forward<Handler>(handler), tracking);
+					}
+				}
+			}
+			else if constexpr (expected == type::poly) {
+				tracking.use(1);
+				bool success = is_lua_reference_v<T> || !lua_isnone(L_, index);
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, type::poly, type_of(L_, index), "");
+				}
+				return success;
+			}
+			else if constexpr (expected == type::lightuserdata) {
+				tracking.use(1);
+				type t = type_of(L_, index);
+				bool success = t == type::userdata || t == type::lightuserdata;
+				if (!success) {
+					// expected type, actual type
+					handler(L_, index, type::lightuserdata, t, "");
+				}
+				return success;
+			}
+			else if constexpr (expected == type::function) {
+				if constexpr (meta::any_same_v<T, lua_CFunction, std::remove_pointer_t<lua_CFunction>, c_closure>) {
+					tracking.use(1);
+					bool success = lua_iscfunction(L_, index) == 1;
+					if (!success) {
+						// expected type, actual type
+						handler(L_, index, expected, type_of(L_, index), "");
+					}
+					return success;
+				}
+				else {
+					tracking.use(1);
+					type t = type_of(L_, index);
+					if (t == type::lua_nil || t == type::none || t == type::function) {
+						// allow for lua_nil to be returned
+						return true;
+					}
+					if (t != type::userdata && t != type::table) {
+						handler(L_, index, type::function, t, "must be a function or table or a userdata");
+						return false;
+					}
+					// Do advanced check for call-style userdata?
+					static const auto& callkey = to_string(meta_function::call);
+					if (lua_getmetatable(L_, index) == 0) {
+						// No metatable, no __call key possible
+						handler(L_, index, type::function, t, "value is not a function and does not have overriden metatable");
+						return false;
+					}
+					if (lua_isnoneornil(L_, -1)) {
+						lua_pop(L_, 1);
+						handler(L_, index, type::function, t, "value is not a function and does not have valid metatable");
+						return false;
+					}
+					lua_getfield(L_, -1, &callkey[0]);
+					if (lua_isnoneornil(L_, -1)) {
+						lua_pop(L_, 2);
+						handler(L_, index, type::function, t, "value's metatable does not have __call overridden in metatable, cannot call this type");
+						return false;
+					}
+					// has call, is definitely a function
+					lua_pop(L_, 2);
+					return true;
+				}
+			}
+			else if constexpr (expected == type::table) {
+				return stack::loose_table_check(L_, index, std::forward<Handler>(handler), tracking);
+			}
+			else {
+				tracking.use(1);
+				const type indextype = type_of(L_, index);
+				bool success = expected == indextype;
+				if (!success) {
+					// expected type, actual type, message
+					handler(L_, index, expected, indextype, "");
+				}
+				return success;
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_checker<non_null<T>, type::userdata> : unqualified_checker<T, lua_type_of_v<T>> { };
+
+	template <typename T>
+	struct unqualified_checker<detail::as_value_tag<T>, type::userdata> {
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+			const type indextype = type_of(L_, index);
+			return check(types<T>(), L_, index, indextype, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename U, typename Handler>
+		static bool check(types<U>, lua_State* L_, int index, type indextype, Handler&& handler, record& tracking) {
+			if constexpr (
+				std::is_same_v<T,
+				     lightuserdata_value> || std::is_same_v<T, userdata_value> || std::is_same_v<T, userdata> || std::is_same_v<T, lightuserdata>) {
+				tracking.use(1);
+				if (indextype != type::userdata) {
+					handler(L_, index, type::userdata, indextype, "value is not a valid userdata");
+					return false;
+				}
+				return true;
+			}
+			else {
+#if SOL_IS_ON(SOL_USE_INTEROP)
+				if (stack_detail::interop_check<U>(L_, index, indextype, handler, tracking)) {
+					return true;
+				}
+#endif // interop extensibility
+				tracking.use(1);
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE)
+				if (lua_iscfunction(L_, index) != 0) {
+					// a potential match...
+					return true;
+				}
+#endif
+				if (indextype != type::userdata) {
+					handler(L_, index, type::userdata, indextype, "value is not a valid userdata");
+					return false;
+				}
+				if (lua_getmetatable(L_, index) == 0) {
+					return true;
+				}
+				int metatableindex = lua_gettop(L_);
+				if (stack_detail::check_metatable<U>(L_, metatableindex))
+					return true;
+				if (stack_detail::check_metatable<U*>(L_, metatableindex))
+					return true;
+				if (stack_detail::check_metatable<d::u<U>>(L_, metatableindex))
+					return true;
+				if (stack_detail::check_metatable<as_container_t<U>>(L_, metatableindex))
+					return true;
+				bool success = false;
+				bool has_derived = derive<T>::value || weak_derive<T>::value;
+				if (has_derived) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+					luaL_checkstack(L_, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+					auto pn = stack::pop_n(L_, 1);
+					lua_pushstring(L_, &detail::base_class_check_key()[0]);
+					lua_rawget(L_, metatableindex);
+					if (type_of(L_, -1) != type::lua_nil) {
+						void* basecastdata = lua_touserdata(L_, -1);
+						detail::inheritance_check_function ic = reinterpret_cast<detail::inheritance_check_function>(basecastdata);
+						success = ic(usertype_traits<T>::qualified_name());
+					}
+				}
+				lua_pop(L_, 1);
+				if (!success) {
+					handler(L_, index, type::userdata, indextype, "value at this index does not properly reflect the desired type");
+					return false;
+				}
+				return true;
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_checker<detail::as_pointer_tag<T>, type::userdata> {
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, type indextype, Handler&& handler, record& tracking) {
+			if (indextype == type::lua_nil) {
+				tracking.use(1);
+				return true;
+			}
+			return check_usertype<std::remove_pointer_t<T>>(L_, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+			const type indextype = type_of(L_, index);
+			return check(L_, index, indextype, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+	template <typename T, std::size_t N, type expect>
+	struct unqualified_checker<exhaustive_until<T, N>, expect> {
+		template <typename K, typename V, typename Handler>
+		static bool check_two(types<K, V>, lua_State* arg_L, int relindex, type, Handler&& handler, record& tracking) {
+			tracking.use(1);
+
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(arg_L, 3, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+
+			int index = lua_absindex(arg_L, relindex);
+			lua_pushnil(arg_L);
+			while (lua_next(arg_L, index) != 0) {
+				const bool is_key_okay = stack::check<K>(arg_L, -2, std::forward<Handler>(handler), tracking);
+				if (!is_key_okay) {
+					lua_pop(arg_L, 2);
+					return false;
+				}
+				const bool is_value_okay = stack::check<V>(arg_L, -1, std::forward<Handler>(handler), tracking);
+				if (!is_value_okay) {
+					lua_pop(arg_L, 2);
+					return false;
+				}
+				lua_pop(arg_L, 1);
+			}
+			return true;
+		}
+
+		template <typename V, typename Handler>
+		static bool check_one(types<V>, lua_State* arg_L, int relindex, type, Handler&& handler, record& tracking) {
+			tracking.use(1);
+
+			size_t index = lua_absindex(arg_L, relindex);
+			// Zzzz slower but necessary thanks to the lower version API and missing functions qq
+			std::size_t idx = 0;
+			int vi = 0;
+			for (lua_Integer i = 0;; (void)(i += lua_size<V>::value), lua_pop(arg_L, static_cast<int>(vi))) {
+				vi = 0;
+				if (idx >= N) {
+					return true;
+				}
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(arg_L, 2, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				bool isnil = false;
+				for (; vi < static_cast<int>(lua_size<V>::value); ++vi) {
+					lua_pushinteger(arg_L, i);
+					lua_gettable(arg_L, static_cast<int>(index));
+					type vt = type_of(arg_L, -1);
+					isnil = vt == type::lua_nil;
+					if (isnil) {
+						if (i == 0) {
+							vi += 1;
+							goto loop_continue;
+						}
+						lua_pop(arg_L, static_cast<int>(vi + 1));
+						return true;
+					}
+				}
+				if (!stack::check<V>(arg_L, -lua_size<V>::value, std::forward<Handler>(handler), tracking)) {
+					lua_pop(arg_L, lua_size<V>::value);
+					return false;
+				}
+				++idx;
+			loop_continue:;
+			}
+		}
+
+		template <typename Handler>
+		static bool check(lua_State* arg_L, int index, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (is_container_v<Tu>) {
+				if constexpr (meta::is_associative<Tu>::value) {
+					typedef typename Tu::value_type P;
+					typedef typename P::first_type K;
+					typedef typename P::second_type V;
+					return check_two(types<K, V>(), arg_L, index, expect, std::forward<Handler>(handler), tracking);
+				}
+				else {
+					typedef typename Tu::value_type V;
+					return check_one(types<V>(), arg_L, index, expect, std::forward<Handler>(handler), tracking);
+				}
+			}
+			else {
+				unqualified_checker<Tu, expect> c {};
+				return c.check(arg_L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+	};
+
+	template <typename T, type expect>
+	struct unqualified_checker<non_exhaustive<T>, expect> {
+		template <typename Handler>
+		static bool check(lua_State* arg_L, int index, Handler&& handler, record& tracking) {
+			return stack::check<T>(arg_L, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+	template <typename... Args>
+	struct unqualified_checker<std::tuple<Args...>, type::poly> {
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+			return stack::multi_check<Args...>(L_, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+	template <typename A, typename B>
+	struct unqualified_checker<std::pair<A, B>, type::poly> {
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+			return stack::multi_check<A, B>(L_, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+#if SOL_IS_ON(SOL_STD_VARIANT)
+
+	template <typename... Tn>
+	struct unqualified_checker<std::variant<Tn...>, type::poly> {
+		typedef std::variant<Tn...> V;
+		typedef std::variant_size<V> V_size;
+		typedef std::integral_constant<bool, V_size::value == 0> V_is_empty;
+
+		template <typename Handler>
+		static bool is_one(std::integral_constant<std::size_t, 0>, lua_State* L_, int index, Handler&& handler, record& tracking) {
+			if constexpr (V_is_empty::value) {
+				if (lua_isnone(L_, index)) {
+					return true;
+				}
+			}
+			tracking.use(1);
+			handler(L_, index, type::poly, type_of(L_, index), "value does not fit any type present in the variant");
+			return false;
+		}
+
+		template <std::size_t I, typename Handler>
+		static bool is_one(std::integral_constant<std::size_t, I>, lua_State* L_, int index, Handler&& handler, record& tracking) {
+			typedef std::variant_alternative_t<I - 1, V> T;
+			record temp_tracking = tracking;
+			if (stack::check<T>(L_, index, &no_panic, temp_tracking)) {
+				tracking = temp_tracking;
+				return true;
+			}
+			return is_one(std::integral_constant<std::size_t, I - 1>(), L_, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename Handler>
+		static bool check(lua_State* L_, int index, Handler&& handler, record& tracking) {
+			return is_one(std::integral_constant<std::size_t, V_size::value>(), L_, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+#endif // variant shenanigans
+
+}} // namespace sol::stack
+
+// end of sol/stack_check_unqualified.hpp
+
+// beginning of sol/stack_check_qualified.hpp
+
+namespace sol { namespace stack {
+
+	template <typename X, type expected, typename>
+	struct qualified_checker {
+		template <typename Handler>
+		static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
+			using no_cv_X = meta::unqualified_t<X>;
+			if constexpr (!std::is_reference_v<X> && is_unique_usertype_v<no_cv_X>) {
+				using element = unique_usertype_element_t<no_cv_X>;
+				if constexpr (is_actual_type_rebindable_for_v<no_cv_X>) {
+					using rebound_actual_type = unique_usertype_rebind_actual_t<no_cv_X>;
+					// we have a unique pointer type that can be
+					// rebound to a base/derived type
+					const type indextype = type_of(L, index);
+					tracking.use(1);
+					if (indextype != type::userdata) {
+						handler(L, index, type::userdata, indextype, "value is not a userdata");
+						return false;
+					}
+					void* memory = lua_touserdata(L, index);
+					memory = detail::align_usertype_unique_destructor(memory);
+					detail::unique_destructor& pdx = *static_cast<detail::unique_destructor*>(memory);
+					if (&detail::usertype_unique_alloc_destroy<element, no_cv_X> == pdx) {
+						return true;
+					}
+					if constexpr (derive<element>::value) {
+						memory = detail::align_usertype_unique_tag<true, false>(memory);
+						detail::unique_tag& ic = *reinterpret_cast<detail::unique_tag*>(memory);
+						string_view ti = usertype_traits<element>::qualified_name();
+						string_view rebind_ti = usertype_traits<rebound_actual_type>::qualified_name();
+						if (ic(nullptr, nullptr, ti, rebind_ti) != 0) {
+							return true;
+						}
+					}
+					handler(L, index, type::userdata, indextype, "value is a userdata but is not the correct unique usertype");
+					return false;
+				}
+				else {
+					return stack::unqualified_check<X>(L, index, std::forward<Handler>(handler), tracking);
+				}
+			}
+			else if constexpr (!std::is_reference_v<X> && is_container_v<no_cv_X>) {
+				if (type_of(L, index) == type::userdata) {
+					return stack::unqualified_check<X>(L, index, std::forward<Handler>(handler), tracking);
+				}
+				else {
+					return stack::unqualified_check<nested<X>>(L, index, std::forward<Handler>(handler), tracking);
+				}
+			}
+			else if constexpr (!std::is_reference_v<X> && meta::is_specialization_of_v<X, nested>) {
+				using NestedX = typename meta::unqualified_t<X>::nested_type;
+				return stack::check<NestedX>(L, index, ::std::forward<Handler>(handler), tracking);
+			}
+			else {
+				return stack::unqualified_check<X>(L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+	};
+}} // namespace sol::stack
+
+// end of sol/stack_check_qualified.hpp
+
+// end of sol/stack_check.hpp
+
+// beginning of sol/stack_get.hpp
+
+// beginning of sol/stack_get_unqualified.hpp
+
+// beginning of sol/overload.hpp
+
+#include <utility>
+
+namespace sol {
+	template <typename... Functions>
+	struct overload_set {
+		std::tuple<Functions...> functions;
+		template <typename Arg, typename... Args, meta::disable<std::is_same<overload_set, meta::unqualified_t<Arg>>> = meta::enabler>
+		overload_set(Arg&& arg, Args&&... args) : functions(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+		overload_set(const overload_set&) = default;
+		overload_set(overload_set&&) = default;
+		overload_set& operator=(const overload_set&) = default;
+		overload_set& operator=(overload_set&&) = default;
+	};
+
+	template <typename... Args>
+	decltype(auto) overload(Args&&... args) {
+		return overload_set<std::decay_t<Args>...>(std::forward<Args>(args)...);
+	}
+} // namespace sol
+
+// end of sol/overload.hpp
+
+// beginning of sol/unicode.hpp
+
+#include <array>
+#include <cstring>
+
+namespace sol {
+	// Everything here was lifted pretty much straight out of
+	// ogonek, because fuck figuring it out=
+	namespace unicode {
+		enum class error_code {
+			ok = 0,
+			invalid_code_point,
+			invalid_code_unit,
+			invalid_leading_surrogate,
+			invalid_trailing_surrogate,
+			sequence_too_short,
+			overlong_sequence,
+		};
+
+		inline const string_view& to_string(error_code ec) {
+			static const string_view storage[7] = { "ok",
+				"invalid code points",
+				"invalid code unit",
+				"invalid leading surrogate",
+				"invalid trailing surrogate",
+				"sequence too short",
+				"overlong sequence" };
+			return storage[static_cast<std::size_t>(ec)];
+		}
+
+		template <typename It>
+		struct decoded_result {
+			error_code error;
+			char32_t codepoint;
+			It next;
+		};
+
+		template <typename C>
+		struct encoded_result {
+			error_code error;
+			std::size_t code_units_size;
+			std::array<C, 4> code_units;
+		};
+
+		struct unicode_detail {
+			// codepoint related
+			static constexpr char32_t last_code_point = 0x10FFFF;
+
+			static constexpr char32_t first_lead_surrogate = 0xD800;
+			static constexpr char32_t last_lead_surrogate = 0xDBFF;
+
+			static constexpr char32_t first_trail_surrogate = 0xDC00;
+			static constexpr char32_t last_trail_surrogate = 0xDFFF;
+
+			static constexpr char32_t first_surrogate = first_lead_surrogate;
+			static constexpr char32_t last_surrogate = last_trail_surrogate;
+
+			static constexpr bool is_lead_surrogate(char32_t u) {
+				return u >= first_lead_surrogate && u <= last_lead_surrogate;
+			}
+			static constexpr bool is_trail_surrogate(char32_t u) {
+				return u >= first_trail_surrogate && u <= last_trail_surrogate;
+			}
+			static constexpr bool is_surrogate(char32_t u) {
+				return u >= first_surrogate && u <= last_surrogate;
+			}
+
+			// utf8 related
+			static constexpr auto last_1byte_value = 0x7Fu;
+			static constexpr auto last_2byte_value = 0x7FFu;
+			static constexpr auto last_3byte_value = 0xFFFFu;
+
+			static constexpr auto start_2byte_mask = 0x80u;
+			static constexpr auto start_3byte_mask = 0xE0u;
+			static constexpr auto start_4byte_mask = 0xF0u;
+
+			static constexpr auto continuation_mask = 0xC0u;
+			static constexpr auto continuation_signature = 0x80u;
+
+			static constexpr bool is_invalid(unsigned char b) {
+				return b == 0xC0 || b == 0xC1 || b > 0xF4;
+			}
+
+			static constexpr bool is_continuation(unsigned char b) {
+				return (b & unicode_detail::continuation_mask) == unicode_detail::continuation_signature;
+			}
+
+			static constexpr bool is_overlong(char32_t u, std::size_t bytes) {
+				return u <= unicode_detail::last_1byte_value || (u <= unicode_detail::last_2byte_value && bytes > 2)
+				     || (u <= unicode_detail::last_3byte_value && bytes > 3);
+			}
+
+			static constexpr int sequence_length(unsigned char b) {
+				return (b & start_2byte_mask) == 0                ? 1
+				     : (b & start_3byte_mask) != start_3byte_mask ? 2
+				     : (b & start_4byte_mask) != start_4byte_mask ? 3
+				                                                  : 4;
+			}
+
+			static constexpr char32_t decode(unsigned char b0, unsigned char b1) {
+				return (static_cast<char32_t>((b0 & 0x1Fu) << 6u) | static_cast<char32_t>(b1 & 0x3Fu));
+			}
+			static constexpr char32_t decode(unsigned char b0, unsigned char b1, unsigned char b2) {
+				return static_cast<char32_t>((b0 & 0x0Fu) << 12u) | static_cast<char32_t>((b1 & 0x3Fu) << 6u) | static_cast<char32_t>(b2 & 0x3Fu);
+			}
+			static constexpr char32_t decode(unsigned char b0, unsigned char b1, unsigned char b2, unsigned char b3) {
+				return static_cast<char32_t>(static_cast<char32_t>((b0 & 0x07u) << 18u) | static_cast<char32_t>((b1 & 0x3F) << 12)
+				     | static_cast<char32_t>((b2 & 0x3Fu) << 6u) | static_cast<char32_t>(b3 & 0x3Fu));
+			}
+
+			// utf16 related
+			static constexpr char32_t last_bmp_value = 0xFFFF;
+			static constexpr char32_t normalizing_value = 0x10000;
+			static constexpr int lead_surrogate_bitmask = 0xFFC00;
+			static constexpr int trail_surrogate_bitmask = 0x3FF;
+			static constexpr int lead_shifted_bits = 10;
+			static constexpr char32_t replacement = 0xFFFD;
+
+			static char32_t combine_surrogates(char16_t lead, char16_t trail) {
+				auto hi = lead - first_lead_surrogate;
+				auto lo = trail - first_trail_surrogate;
+				return normalizing_value + ((hi << lead_shifted_bits) | lo);
+			}
+		};
+
+		inline encoded_result<char> code_point_to_utf8(char32_t codepoint) {
+			encoded_result<char> er;
+			er.error = error_code::ok;
+			if (codepoint <= unicode_detail::last_1byte_value) {
+				er.code_units_size = 1;
+				er.code_units = std::array<char, 4> { { static_cast<char>(codepoint) } };
+			}
+			else if (codepoint <= unicode_detail::last_2byte_value) {
+				er.code_units_size = 2;
+				er.code_units = std::array<char, 4> { {
+					static_cast<char>(0xC0 | ((codepoint & 0x7C0) >> 6)),
+					static_cast<char>(0x80 | (codepoint & 0x3F)),
+				} };
+			}
+			else if (codepoint <= unicode_detail::last_3byte_value) {
+				er.code_units_size = 3;
+				er.code_units = std::array<char, 4> { {
+					static_cast<char>(0xE0 | ((codepoint & 0xF000) >> 12)),
+					static_cast<char>(0x80 | ((codepoint & 0xFC0) >> 6)),
+					static_cast<char>(0x80 | (codepoint & 0x3F)),
+				} };
+			}
+			else {
+				er.code_units_size = 4;
+				er.code_units = std::array<char, 4> { {
+					static_cast<char>(0xF0 | ((codepoint & 0x1C0000) >> 18)),
+					static_cast<char>(0x80 | ((codepoint & 0x3F000) >> 12)),
+					static_cast<char>(0x80 | ((codepoint & 0xFC0) >> 6)),
+					static_cast<char>(0x80 | (codepoint & 0x3F)),
+				} };
+			}
+			return er;
+		}
+
+		inline encoded_result<char16_t> code_point_to_utf16(char32_t codepoint) {
+			encoded_result<char16_t> er;
+
+			if (codepoint <= unicode_detail::last_bmp_value) {
+				er.code_units_size = 1;
+				er.code_units = std::array<char16_t, 4> { { static_cast<char16_t>(codepoint) } };
+				er.error = error_code::ok;
+			}
+			else {
+				auto normal = codepoint - unicode_detail::normalizing_value;
+				auto lead = unicode_detail::first_lead_surrogate + ((normal & unicode_detail::lead_surrogate_bitmask) >> unicode_detail::lead_shifted_bits);
+				auto trail = unicode_detail::first_trail_surrogate + (normal & unicode_detail::trail_surrogate_bitmask);
+				er.code_units = std::array<char16_t, 4> { { static_cast<char16_t>(lead), static_cast<char16_t>(trail) } };
+				er.code_units_size = 2;
+				er.error = error_code::ok;
+			}
+			return er;
+		}
+
+		inline encoded_result<char32_t> code_point_to_utf32(char32_t codepoint) {
+			encoded_result<char32_t> er;
+			er.code_units_size = 1;
+			er.code_units[0] = codepoint;
+			er.error = error_code::ok;
+			return er;
+		}
+
+		template <typename It>
+		inline decoded_result<It> utf8_to_code_point(It it, It last) {
+			decoded_result<It> dr;
+			if (it == last) {
+				dr.next = it;
+				dr.error = error_code::sequence_too_short;
+				return dr;
+			}
+
+			unsigned char b0 = static_cast<unsigned char>(*it);
+			std::size_t length = static_cast<std::size_t>(unicode_detail::sequence_length(b0));
+
+			if (length == 1) {
+				dr.codepoint = static_cast<char32_t>(b0);
+				dr.error = error_code::ok;
+				++it;
+				dr.next = it;
+				return dr;
+			}
+
+			if (unicode_detail::is_invalid(b0) || unicode_detail::is_continuation(b0)) {
+				dr.error = error_code::invalid_code_unit;
+				dr.next = it;
+				return dr;
+			}
+
+			++it;
+			std::array<unsigned char, 4> b;
+			b[0] = b0;
+			for (std::size_t i = 1; i < length; ++i) {
+				b[i] = static_cast<unsigned char>(*it);
+				if (!unicode_detail::is_continuation(b[i])) {
+					dr.error = error_code::invalid_code_unit;
+					dr.next = it;
+					return dr;
+				}
+				++it;
+			}
+
+			char32_t decoded;
+			switch (length) {
+			case 2:
+				decoded = unicode_detail::decode(b[0], b[1]);
+				break;
+			case 3:
+				decoded = unicode_detail::decode(b[0], b[1], b[2]);
+				break;
+			default:
+				decoded = unicode_detail::decode(b[0], b[1], b[2], b[3]);
+				break;
+			}
+
+			if (unicode_detail::is_overlong(decoded, length)) {
+				dr.error = error_code::overlong_sequence;
+				return dr;
+			}
+			if (unicode_detail::is_surrogate(decoded) || decoded > unicode_detail::last_code_point) {
+				dr.error = error_code::invalid_code_point;
+				return dr;
+			}
+
+			// then everything is fine
+			dr.codepoint = decoded;
+			dr.error = error_code::ok;
+			dr.next = it;
+			return dr;
+		}
+
+		template <typename It>
+		inline decoded_result<It> utf16_to_code_point(It it, It last) {
+			decoded_result<It> dr;
+			if (it == last) {
+				dr.next = it;
+				dr.error = error_code::sequence_too_short;
+				return dr;
+			}
+
+			char16_t lead = static_cast<char16_t>(*it);
+
+			if (!unicode_detail::is_surrogate(lead)) {
+				++it;
+				dr.codepoint = static_cast<char32_t>(lead);
+				dr.next = it;
+				dr.error = error_code::ok;
+				return dr;
+			}
+			if (!unicode_detail::is_lead_surrogate(lead)) {
+				dr.error = error_code::invalid_leading_surrogate;
+				dr.next = it;
+				return dr;
+			}
+
+			++it;
+			auto trail = *it;
+			if (!unicode_detail::is_trail_surrogate(trail)) {
+				dr.error = error_code::invalid_trailing_surrogate;
+				dr.next = it;
+				return dr;
+			}
+
+			dr.codepoint = unicode_detail::combine_surrogates(lead, trail);
+			dr.next = ++it;
+			dr.error = error_code::ok;
+			return dr;
+		}
+
+		template <typename It>
+		inline decoded_result<It> utf32_to_code_point(It it, It last) {
+			decoded_result<It> dr;
+			if (it == last) {
+				dr.next = it;
+				dr.error = error_code::sequence_too_short;
+				return dr;
+			}
+			dr.codepoint = static_cast<char32_t>(*it);
+			dr.next = ++it;
+			dr.error = error_code::ok;
+			return dr;
+		}
+	} // namespace unicode
+} // namespace sol
+// end of sol/unicode.hpp
+
+// beginning of sol/abort.hpp
+
+#include <cstdlib>
+
+#if SOL_IS_ON(SOL_DEBUG_BUILD)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		#define SOL_DEBUG_ABORT() \
+			if (true) { ::std::abort(); } \
+			static_assert(true, "")
+	#else
+		#define SOL_DEBUG_ABORT() ::std::abort()
+	#endif
+#else
+	#define SOL_DEBUG_ABORT() static_assert(true, "")
+#endif
+
+// end of sol/abort.hpp
+
+#include <memory>
+#include <functional>
+#include <utility>
+#include <cstdlib>
+#include <cmath>
+#include <string_view>
+#if SOL_IS_ON(SOL_STD_VARIANT)
+#include <variant>
+#endif // Apple clang screwed up
+
+namespace sol { namespace stack {
+
+	namespace stack_detail {
+		template <typename Ch>
+		struct count_code_units_utf {
+			std::size_t needed_size;
+
+			count_code_units_utf() : needed_size(0) {
+			}
+
+			void operator()(const unicode::encoded_result<Ch> er) {
+				needed_size += er.code_units_size;
+			}
+		};
+
+		template <typename Ch, typename ErCh>
+		struct copy_code_units_utf {
+			Ch* target_;
+
+			copy_code_units_utf(Ch* target) : target_(target) {
+			}
+
+			void operator()(const unicode::encoded_result<ErCh> er) {
+				std::memcpy(target_, er.code_units.data(), er.code_units_size * sizeof(ErCh));
+				target_ += er.code_units_size;
+			}
+		};
+
+		template <typename Ch, typename F>
+		inline void convert(const char* strb, const char* stre, F&& f) {
+			char32_t cp = 0;
+			for (const char* strtarget = strb; strtarget < stre;) {
+				auto dr = unicode::utf8_to_code_point(strtarget, stre);
+				if (dr.error != unicode::error_code::ok) {
+					cp = unicode::unicode_detail::replacement;
+					++strtarget;
+				}
+				else {
+					cp = dr.codepoint;
+					strtarget = dr.next;
+				}
+				if constexpr (std::is_same_v<Ch, char32_t>) {
+					auto er = unicode::code_point_to_utf32(cp);
+					f(er);
+				}
+				else {
+					auto er = unicode::code_point_to_utf16(cp);
+					f(er);
+				}
+			}
+		}
+
+		template <typename BaseCh, typename S>
+		inline S get_into(lua_State* L, int index, record& tracking) {
+			using Ch = typename S::value_type;
+			tracking.use(1);
+			size_t len;
+			auto utf8p = lua_tolstring(L, index, &len);
+			if (len < 1)
+				return S();
+			const char* strb = utf8p;
+			const char* stre = utf8p + len;
+			stack_detail::count_code_units_utf<BaseCh> count_units;
+			convert<BaseCh>(strb, stre, count_units);
+			S r(count_units.needed_size, static_cast<Ch>(0));
+			r.resize(count_units.needed_size);
+			Ch* target = &r[0];
+			stack_detail::copy_code_units_utf<Ch, BaseCh> copy_units(target);
+			convert<BaseCh>(strb, stre, copy_units);
+			return r;
+		}
+	} // namespace stack_detail
+
+	template <typename T, typename>
+	struct unqualified_getter {
+		static decltype(auto) get(lua_State* L, int index, record& tracking) {
+			if constexpr (std::is_same_v<T, bool>) {
+				tracking.use(1);
+				return lua_toboolean(L, index) != 0;
+			}
+			else if constexpr (std::is_enum_v<T>) {
+				tracking.use(1);
+				return static_cast<T>(lua_tointegerx(L, index, nullptr));
+			}
+			else if constexpr (std::is_integral_v<T> || std::is_same_v<T, lua_Integer>) {
+				tracking.use(1);
+#if SOL_LUA_VERSION_I_ >= 503
+				if (lua_isinteger(L, index) != 0) {
+					return static_cast<T>(lua_tointeger(L, index));
+				}
+#endif
+				return static_cast<T>(llround(lua_tonumber(L, index)));
+			}
+			else if constexpr (std::is_floating_point_v<T> || std::is_same_v<T, lua_Number>) {
+				tracking.use(1);
+				return static_cast<T>(lua_tonumber(L, index));
+			}
+			else if constexpr (is_lua_reference_v<T>) {
+				if constexpr (is_global_table_v<T>) {
+					tracking.use(1);
+					return T(L, global_tag);
+				}
+				else {
+					tracking.use(1);
+					return T(L, index);
+				}
+			}
+			else if constexpr (is_unique_usertype_v<T>) {
+				using actual = unique_usertype_actual_t<T>;
+
+				tracking.use(1);
+				void* memory = lua_touserdata(L, index);
+				void* aligned_memory = detail::align_usertype_unique<actual>(memory);
+				actual* typed_memory = static_cast<actual*>(aligned_memory);
+				return *typed_memory;
+			}
+			else if constexpr (meta::is_optional_v<T>) {
+				using ValueType = typename T::value_type;
+				return unqualified_check_getter<ValueType>::template get_using<T>(L, index, &no_panic, tracking);
+			}
+			else if constexpr (std::is_same_v<T, luaL_Stream*>) {
+				luaL_Stream* pstream = static_cast<luaL_Stream*>(lua_touserdata(L, index));
+				return pstream;
+			}
+			else if constexpr (std::is_same_v<T, luaL_Stream>) {
+				luaL_Stream* pstream = static_cast<luaL_Stream*>(lua_touserdata(L, index));
+				return *pstream;
+			}
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE)
+			else if constexpr (std::is_function_v<T> || (std::is_pointer_v<T> && std::is_function_v<std::remove_pointer_t<T>>)) {
+				return stack_detail::get_function_pointer<std::remove_pointer_t<T>>(L, index, tracking);
+			}
+#endif
+			else {
+				return stack_detail::unchecked_unqualified_get<detail::as_value_tag<T>>(L, index, tracking);
+			}
+		}
+	};
+
+	template <typename X, typename>
+	struct qualified_getter {
+		static decltype(auto) get(lua_State* L, int index, record& tracking) {
+			using Tu = meta::unqualified_t<X>;
+			static constexpr bool is_maybe_userdata_of_some_kind
+				= !std::is_reference_v<
+				       X> && is_container_v<Tu> && std::is_default_constructible_v<Tu> && !is_lua_primitive_v<Tu> && !is_transparent_argument_v<Tu>;
+			if constexpr (is_maybe_userdata_of_some_kind) {
+				if (type_of(L, index) == type::userdata) {
+					return static_cast<Tu>(stack_detail::unchecked_unqualified_get<Tu>(L, index, tracking));
+				}
+				else {
+					return stack_detail::unchecked_unqualified_get<sol::nested<Tu>>(L, index, tracking);
+				}
+			}
+			else if constexpr (!std::is_reference_v<X> && is_unique_usertype_v<Tu> && !is_actual_type_rebindable_for_v<Tu>) {
+				using element = unique_usertype_element_t<Tu>;
+				using actual = unique_usertype_actual_t<Tu>;
+				tracking.use(1);
+				void* memory = lua_touserdata(L, index);
+				memory = detail::align_usertype_unique_destructor(memory);
+				detail::unique_destructor& pdx = *static_cast<detail::unique_destructor*>(memory);
+				if (&detail::usertype_unique_alloc_destroy<element, Tu> == pdx) {
+					memory = detail::align_usertype_unique_tag<true, false>(memory);
+					memory = detail::align_usertype_unique<actual, true, false>(memory);
+					actual* mem = static_cast<actual*>(memory);
+					return static_cast<actual>(*mem);
+				}
+				actual r {};
+				if constexpr (!derive<element>::value) {
+					// In debug mode we would rather abort you for this grave failure rather
+					// than let you deref a null pointer and fuck everything over
+					SOL_DEBUG_ABORT();
+					return static_cast<actual>(std::move(r));
+				}
+				else {
+					memory = detail::align_usertype_unique_tag<true, false>(memory);
+					detail::unique_tag& ic = *reinterpret_cast<detail::unique_tag*>(memory);
+					memory = detail::align_usertype_unique<actual, true, false>(memory);
+					string_view ti = usertype_traits<element>::qualified_name();
+					int cast_operation;
+					if constexpr (is_actual_type_rebindable_for_v<Tu>) {
+						using rebound_actual_type = unique_usertype_rebind_actual_t<Tu, void>;
+						string_view rebind_ti = usertype_traits<rebound_actual_type>::qualified_name();
+						cast_operation = ic(memory, &r, ti, rebind_ti);
+					}
+					else {
+						string_view rebind_ti("");
+						cast_operation = ic(memory, &r, ti, rebind_ti);
+					}
+					switch (cast_operation) {
+					case 1: {
+						// it's a perfect match,
+						// alias memory directly
+						actual* mem = static_cast<actual*>(memory);
+						return static_cast<actual>(*mem);
+					}
+					case 2:
+						// it's a base match, return the
+						// aliased creation
+						return static_cast<actual>(std::move(r));
+					default:
+						// uh oh..
+						break;
+					}
+					SOL_DEBUG_ABORT();
+					return static_cast<actual>(r);
+				}
+			}
+			else {
+				return stack_detail::unchecked_unqualified_get<Tu>(L, index, tracking);
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<as_table_t<T>> {
+		using Tu = meta::unqualified_t<T>;
+
+		template <typename V>
+		static void push_back_at_end(std::true_type, types<V>, lua_State* L, T& cont, std::size_t) {
+			cont.push_back(stack::get<V>(L, -lua_size<V>::value));
+		}
+
+		template <typename V>
+		static void push_back_at_end(std::false_type, types<V> t, lua_State* L, T& cont, std::size_t idx) {
+			insert_at_end(meta::has_insert<Tu>(), t, L, cont, idx);
+		}
+
+		template <typename V>
+		static void insert_at_end(std::true_type, types<V>, lua_State* L, T& cont, std::size_t) {
+			using std::cend;
+			cont.insert(cend(cont), stack::get<V>(L, -lua_size<V>::value));
+		}
+
+		template <typename V>
+		static void insert_at_end(std::false_type, types<V>, lua_State* L, T& cont, std::size_t idx) {
+			cont[idx] = stack::get<V>(L, -lua_size<V>::value);
+		}
+
+		static bool max_size_check(std::false_type, T&, std::size_t) {
+			return false;
+		}
+
+		static bool max_size_check(std::true_type, T& cont, std::size_t idx) {
+			return idx >= std::size_t(cont.max_size());
+		}
+
+		static T get(lua_State* L, int relindex, record& tracking) {
+			return get(meta::is_associative<Tu>(), L, relindex, tracking);
+		}
+
+		static T get(std::false_type, lua_State* L, int relindex, record& tracking) {
+			typedef typename Tu::value_type V;
+			return get(types<V>(), L, relindex, tracking);
+		}
+
+		template <typename V>
+		static T get(types<V> t, lua_State* L, int relindex, record& tracking) {
+			tracking.use(1);
+
+			// the W4 flag is really great,
+			// so great that it can tell my for loops (twice nested)
+			// below never actually terminate
+			// without hitting where the gotos have infested
+
+			// so now I would get the error W4XXX unreachable
+			// me that the return cont at the end of this function
+			// which is fair until other compilers complain
+			// that there isn't a return and that based on
+			// SOME MAGICAL FORCE
+			// control flow falls off the end of a non-void function
+			// so it needs to be there for the compilers that are
+			// too flimsy to analyze the basic blocks...
+			// (I'm sure I should file a bug but those compilers are already
+			// in the wild; it doesn't matter if I fix them,
+			// someone else is still going to get some old-ass compiler
+			// and then bother me about the unclean build for the 30th
+			// time)
+
+			// "Why not an IIFE?"
+			// Because additional lambdas / functions which serve as
+			// capture-all-and-then-invoke bloat binary sizes
+			// by an actually detectable amount
+			// (one user uses sol2 pretty heavily and 22 MB of binary size
+			// was saved by reducing reliance on lambdas in templates)
+
+			// This would really be solved by having break N;
+			// be a real, proper thing...
+			// but instead, we have to use labels and gotos
+			// and earn the universal vitriol of the dogmatic
+			// programming community
+
+			// all in all: W4 is great!~
+
+			int index = lua_absindex(L, relindex);
+			T cont;
+			std::size_t idx = 0;
+#if SOL_LUA_VERSION_I_ >= 503
+			// This method is HIGHLY performant over regular table iteration
+			// thanks to the Lua API changes in 5.3
+			// Questionable in 5.4
+			for (lua_Integer i = 0;; i += lua_size<V>::value) {
+				if (max_size_check(meta::has_max_size<Tu>(), cont, idx)) {
+					// see above comment
+					goto done;
+				}
+				bool isnil = false;
+				for (int vi = 0; vi < lua_size<V>::value; ++vi) {
+#if SOL_IS_ON(SOL_LUA_NIL_IN_TABLES) && SOL_LUA_VERSION_I_ >= 600
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+					luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+					lua_pushinteger(L, static_cast<lua_Integer>(i + vi));
+					if (lua_keyin(L, index) == 0) {
+						// it's time to stop
+						isnil = true;
+					}
+					else {
+						// we have a key, have to get the value
+						lua_geti(L, index, i + vi);
+					}
+#else
+					type vt = static_cast<type>(lua_geti(L, index, i + vi));
+					isnil = vt == type::none || vt == type::lua_nil;
+#endif
+					if (isnil) {
+						if (i == 0) {
+							break;
+						}
+#if SOL_IS_ON(SOL_LUA_NIL_IN_TABLES) && SOL_LUA_VERSION_I_ >= 600
+						lua_pop(L, vi);
+#else
+						lua_pop(L, (vi + 1));
+#endif
+						// see above comment
+						goto done;
+					}
+				}
+				if (isnil) {
+#if SOL_IS_ON(SOL_LUA_NIL_IN_TABLES) && SOL_LUA_VERSION_I_ >= 600
+#else
+					lua_pop(L, lua_size<V>::value);
+#endif
+					continue;
+				}
+
+				push_back_at_end(meta::has_push_back<Tu>(), t, L, cont, idx);
+				++idx;
+				lua_pop(L, lua_size<V>::value);
+			}
+#else
+			// Zzzz slower but necessary thanks to the lower version API and missing functions qq
+			for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) {
+				if (idx >= cont.max_size()) {
+					// see above comment
+					goto done;
+				}
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, 2, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				bool isnil = false;
+				for (int vi = 0; vi < lua_size<V>::value; ++vi) {
+					lua_pushinteger(L, i);
+					lua_gettable(L, index);
+					type vt = type_of(L, -1);
+					isnil = vt == type::lua_nil;
+					if (isnil) {
+						if (i == 0) {
+							break;
+						}
+						lua_pop(L, (vi + 1));
+						// see above comment
+						goto done;
+					}
+				}
+				if (isnil)
+					continue;
+				push_back_at_end(meta::has_push_back<Tu>(), t, L, cont, idx);
+				++idx;
+			}
+#endif
+		done:
+			return cont;
+		}
+
+		static T get(std::true_type, lua_State* L, int index, record& tracking) {
+			typedef typename Tu::value_type P;
+			typedef typename P::first_type K;
+			typedef typename P::second_type V;
+			return get(types<K, V>(), L, index, tracking);
+		}
+
+		template <typename K, typename V>
+		static T get(types<K, V>, lua_State* L, int relindex, record& tracking) {
+			tracking.use(1);
+
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 3, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+
+			T associative;
+			int index = lua_absindex(L, relindex);
+			lua_pushnil(L);
+			while (lua_next(L, index) != 0) {
+				decltype(auto) key = stack::check_get<K>(L, -2);
+				if (!key) {
+					lua_pop(L, 1);
+					continue;
+				}
+				associative.emplace(std::forward<decltype(*key)>(*key), stack::get<V>(L, -1));
+				lua_pop(L, 1);
+			}
+			return associative;
+		}
+	};
+
+	template <typename T, typename Al>
+	struct unqualified_getter<as_table_t<std::forward_list<T, Al>>> {
+		typedef std::forward_list<T, Al> C;
+
+		static C get(lua_State* L, int relindex, record& tracking) {
+			return get(meta::has_key_value_pair<C>(), L, relindex, tracking);
+		}
+
+		static C get(std::true_type, lua_State* L, int index, record& tracking) {
+			typedef typename T::value_type P;
+			typedef typename P::first_type K;
+			typedef typename P::second_type V;
+			return get(types<K, V>(), L, index, tracking);
+		}
+
+		static C get(std::false_type, lua_State* L, int relindex, record& tracking) {
+			typedef typename C::value_type V;
+			return get(types<V>(), L, relindex, tracking);
+		}
+
+		template <typename V>
+		static C get(types<V>, lua_State* L, int relindex, record& tracking) {
+			tracking.use(1);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 3, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+
+			int index = lua_absindex(L, relindex);
+			C cont;
+			auto at = cont.cbefore_begin();
+			std::size_t idx = 0;
+#if SOL_LUA_VERSION_I_ >= 503
+			// This method is HIGHLY performant over regular table iteration thanks to the Lua API changes in 5.3
+			for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) {
+				if (idx >= cont.max_size()) {
+					goto done;
+				}
+				bool isnil = false;
+				for (int vi = 0; vi < lua_size<V>::value; ++vi) {
+					type t = static_cast<type>(lua_geti(L, index, i + vi));
+					isnil = t == type::lua_nil;
+					if (isnil) {
+						if (i == 0) {
+							break;
+						}
+						lua_pop(L, (vi + 1));
+						goto done;
+					}
+				}
+				if (isnil)
+					continue;
+				at = cont.insert_after(at, stack::get<V>(L, -lua_size<V>::value));
+				++idx;
+			}
+#else
+			// Zzzz slower but necessary thanks to the lower version API and missing functions qq
+			for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) {
+				if (idx >= cont.max_size()) {
+					goto done;
+				}
+				bool isnil = false;
+				for (int vi = 0; vi < lua_size<V>::value; ++vi) {
+					lua_pushinteger(L, i);
+					lua_gettable(L, index);
+					type t = type_of(L, -1);
+					isnil = t == type::lua_nil;
+					if (isnil) {
+						if (i == 0) {
+							break;
+						}
+						lua_pop(L, (vi + 1));
+						goto done;
+					}
+				}
+				if (isnil)
+					continue;
+				at = cont.insert_after(at, stack::get<V>(L, -lua_size<V>::value));
+				++idx;
+			}
+#endif
+		done:
+			return cont;
+		}
+
+		template <typename K, typename V>
+		static C get(types<K, V>, lua_State* L, int relindex, record& tracking) {
+			tracking.use(1);
+
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 3, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+
+			C associative;
+			auto at = associative.cbefore_begin();
+			int index = lua_absindex(L, relindex);
+			lua_pushnil(L);
+			while (lua_next(L, index) != 0) {
+				decltype(auto) key = stack::check_get<K>(L, -2);
+				if (!key) {
+					lua_pop(L, 1);
+					continue;
+				}
+				at = associative.emplace_after(at, std::forward<decltype(*key)>(*key), stack::get<V>(L, -1));
+				lua_pop(L, 1);
+			}
+			return associative;
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<nested<T>> {
+		static T get(lua_State* L, int index, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (is_container_v<Tu>) {
+				if constexpr (meta::is_associative<Tu>::value) {
+					typedef typename Tu::value_type P;
+					typedef typename P::first_type K;
+					typedef typename P::second_type V;
+					unqualified_getter<as_table_t<T>> g {};
+					return g.get(types<K, nested<V>>(), L, index, tracking);
+				}
+				else {
+					typedef typename Tu::value_type V;
+					unqualified_getter<as_table_t<T>> g {};
+					return g.get(types<nested<V>>(), L, index, tracking);
+				}
+			}
+			else {
+				unqualified_getter<Tu> g {};
+				return g.get(L, index, tracking);
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<as_container_t<T>> {
+		static decltype(auto) get(lua_State* L, int index, record& tracking) {
+			return stack::unqualified_get<T>(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<as_container_t<T>*> {
+		static decltype(auto) get(lua_State* L, int index, record& tracking) {
+			return stack::unqualified_get<T*>(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<exhaustive<T>> {
+		static decltype(auto) get(lua_State* arg_L, int index, record& tracking) {
+			return stack::get<T>(arg_L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<non_exhaustive<T>> {
+		static decltype(auto) get(lua_State* arg_L, int index, record& tracking) {
+			return stack::get<T>(arg_L, index, tracking);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<userdata_value> {
+		static userdata_value get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return userdata_value(lua_touserdata(L, index));
+		}
+	};
+
+	template <>
+	struct unqualified_getter<lightuserdata_value> {
+		static lightuserdata_value get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return lightuserdata_value(lua_touserdata(L, index));
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<light<T>> {
+		static light<T> get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			void* memory = lua_touserdata(L, index);
+			return light<T>(static_cast<T*>(memory));
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<user<T>> {
+		static std::add_lvalue_reference_t<T> get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			void* memory = lua_touserdata(L, index);
+			memory = detail::align_user<T>(memory);
+			return *static_cast<std::remove_reference_t<T>*>(memory);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<user<T*>> {
+		static T* get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			void* memory = lua_touserdata(L, index);
+			memory = detail::align_user<T*>(memory);
+			return static_cast<T*>(memory);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<type> {
+		static type get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return static_cast<type>(lua_type(L, index));
+		}
+	};
+
+	template <>
+	struct unqualified_getter<std::string> {
+		static std::string get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			std::size_t len;
+			auto str = lua_tolstring(L, index, &len);
+			return std::string(str, len);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<const char*> {
+		static const char* get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			size_t sz;
+			return lua_tolstring(L, index, &sz);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<char> {
+		static char get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			size_t len;
+			auto str = lua_tolstring(L, index, &len);
+			return len > 0 ? str[0] : '\0';
+		}
+	};
+
+	template <typename Traits>
+	struct unqualified_getter<basic_string_view<char, Traits>> {
+		static string_view get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			size_t sz;
+			const char* str = lua_tolstring(L, index, &sz);
+			return basic_string_view<char, Traits>(str, sz);
+		}
+	};
+
+	template <typename Traits, typename Al>
+	struct unqualified_getter<std::basic_string<wchar_t, Traits, Al>> {
+		using S = std::basic_string<wchar_t, Traits, Al>;
+		static S get(lua_State* L, int index, record& tracking) {
+			using Ch = meta::conditional_t<sizeof(wchar_t) == 2, char16_t, char32_t>;
+			return stack_detail::get_into<Ch, S>(L, index, tracking);
+		}
+	};
+
+	template <typename Traits, typename Al>
+	struct unqualified_getter<std::basic_string<char16_t, Traits, Al>> {
+		static std::basic_string<char16_t, Traits, Al> get(lua_State* L, int index, record& tracking) {
+			return stack_detail::get_into<char16_t, std::basic_string<char16_t, Traits, Al>>(L, index, tracking);
+		}
+	};
+
+	template <typename Traits, typename Al>
+	struct unqualified_getter<std::basic_string<char32_t, Traits, Al>> {
+		static std::basic_string<char32_t, Traits, Al> get(lua_State* L, int index, record& tracking) {
+			return stack_detail::get_into<char32_t, std::basic_string<char32_t, Traits, Al>>(L, index, tracking);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<char16_t> {
+		static char16_t get(lua_State* L, int index, record& tracking) {
+			string_view utf8 = stack::get<string_view>(L, index, tracking);
+			const char* strb = utf8.data();
+			const char* stre = utf8.data() + utf8.size();
+			char32_t cp = 0;
+			auto dr = unicode::utf8_to_code_point(strb, stre);
+			if (dr.error != unicode::error_code::ok) {
+				cp = unicode::unicode_detail::replacement;
+			}
+			else {
+				cp = dr.codepoint;
+			}
+			auto er = unicode::code_point_to_utf16(cp);
+			return er.code_units[0];
+		}
+	};
+
+	template <>
+	struct unqualified_getter<char32_t> {
+		static char32_t get(lua_State* L, int index, record& tracking) {
+			string_view utf8 = stack::get<string_view>(L, index, tracking);
+			const char* strb = utf8.data();
+			const char* stre = utf8.data() + utf8.size();
+			char32_t cp = 0;
+			auto dr = unicode::utf8_to_code_point(strb, stre);
+			if (dr.error != unicode::error_code::ok) {
+				cp = unicode::unicode_detail::replacement;
+			}
+			else {
+				cp = dr.codepoint;
+			}
+			auto er = unicode::code_point_to_utf32(cp);
+			return er.code_units[0];
+		}
+	};
+
+	template <>
+	struct unqualified_getter<wchar_t> {
+		static wchar_t get(lua_State* L, int index, record& tracking) {
+			typedef meta::conditional_t<sizeof(wchar_t) == 2, char16_t, char32_t> Ch;
+			unqualified_getter<Ch> g;
+			(void)g;
+			auto c = g.get(L, index, tracking);
+			return static_cast<wchar_t>(c);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<meta_function> {
+		static meta_function get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			const char* name = unqualified_getter<const char*> {}.get(L, index, tracking);
+			const auto& mfnames = meta_function_names();
+			for (std::size_t i = 0; i < mfnames.size(); ++i)
+				if (mfnames[i] == name)
+					return static_cast<meta_function>(i);
+			return meta_function::construct;
+		}
+	};
+
+	template <>
+	struct unqualified_getter<lua_nil_t> {
+		static lua_nil_t get(lua_State*, int, record& tracking) {
+			tracking.use(1);
+			return lua_nil;
+		}
+	};
+
+	template <>
+	struct unqualified_getter<std::nullptr_t> {
+		static std::nullptr_t get(lua_State*, int, record& tracking) {
+			tracking.use(1);
+			return nullptr;
+		}
+	};
+
+	template <>
+	struct unqualified_getter<nullopt_t> {
+		static nullopt_t get(lua_State*, int, record& tracking) {
+			tracking.use(1);
+			return nullopt;
+		}
+	};
+
+	template <>
+	struct unqualified_getter<this_state> {
+		static this_state get(lua_State* L, int, record& tracking) {
+			tracking.use(0);
+			return this_state(L);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<this_main_state> {
+		static this_main_state get(lua_State* L, int, record& tracking) {
+			tracking.use(0);
+			return this_main_state(main_thread(L, L));
+		}
+	};
+
+	template <>
+	struct unqualified_getter<lua_CFunction> {
+		static lua_CFunction get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return lua_tocfunction(L, index);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<c_closure> {
+		static c_closure get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return c_closure(lua_tocfunction(L, index), -1);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<error> {
+		static error get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			size_t sz = 0;
+			const char* err = lua_tolstring(L, index, &sz);
+			if (err == nullptr) {
+				return error(detail::direct_error, "");
+			}
+			return error(detail::direct_error, std::string(err, sz));
+		}
+	};
+
+	template <>
+	struct unqualified_getter<void*> {
+		static void* get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return lua_touserdata(L, index);
+		}
+	};
+
+	template <>
+	struct unqualified_getter<const void*> {
+		static const void* get(lua_State* L, int index, record& tracking) {
+			tracking.use(1);
+			return lua_touserdata(L, index);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<detail::as_value_tag<T>> {
+		static T* get_no_lua_nil(lua_State* L, int index, record& tracking) {
+			void* memory = lua_touserdata(L, index);
+#if SOL_IS_ON(SOL_USE_INTEROP)
+			auto ugr = stack_detail::interop_get<T>(L, index, memory, tracking);
+			if (ugr.first) {
+				return ugr.second;
+			}
+#endif // interop extensibility
+			tracking.use(1);
+			void* rawdata = detail::align_usertype_pointer(memory);
+			void** pudata = static_cast<void**>(rawdata);
+			void* udata = *pudata;
+			return get_no_lua_nil_from(L, udata, index, tracking);
+		}
+
+		static T* get_no_lua_nil_from(lua_State* L, void* udata, int index, record&) {
+			bool has_derived = derive<T>::value || weak_derive<T>::value;
+			if (has_derived) {
+				if (lua_getmetatable(L, index) == 1) {
+					lua_getfield(L, -1, &detail::base_class_cast_key()[0]);
+					if (type_of(L, -1) != type::lua_nil) {
+						void* basecastdata = lua_touserdata(L, -1);
+						detail::inheritance_cast_function ic = reinterpret_cast<detail::inheritance_cast_function>(basecastdata);
+						// use the casting function to properly adjust the pointer for the desired T
+						udata = ic(udata, usertype_traits<T>::qualified_name());
+					}
+					lua_pop(L, 2);
+				}
+			}
+			if constexpr (std::is_function_v<T>) {
+				T* func = reinterpret_cast<T*>(udata);
+				return func;
+			}
+			else {
+				T* obj = static_cast<T*>(udata);
+				return obj;
+			}
+		}
+
+		static T& get(lua_State* L, int index, record& tracking) {
+			return *get_no_lua_nil(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<detail::as_pointer_tag<T>> {
+		static T* get(lua_State* L, int index, record& tracking) {
+			type t = type_of(L, index);
+			if (t == type::lua_nil) {
+				tracking.use(1);
+				return nullptr;
+			}
+			unqualified_getter<detail::as_value_tag<T>> g{};
+			return g.get_no_lua_nil(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<non_null<T*>> {
+		static T* get(lua_State* L, int index, record& tracking) {
+			unqualified_getter<detail::as_value_tag<T>> g{};
+			return g.get_no_lua_nil(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<T&> {
+		static T& get(lua_State* L, int index, record& tracking) {
+			unqualified_getter<detail::as_value_tag<T>> g{};
+			return g.get(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<std::reference_wrapper<T>> {
+		static T& get(lua_State* L, int index, record& tracking) {
+			unqualified_getter<T&> g{};
+			return g.get(L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<T*> {
+		static T* get(lua_State* L, int index, record& tracking) {
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE)
+			if constexpr (std::is_function_v<T>) {
+				return stack_detail::get_function_pointer<T>(L, index, tracking);
+			}
+			else {
+				unqualified_getter<detail::as_pointer_tag<T>> g{};
+				return g.get(L, index, tracking);
+			}
+#else
+			unqualified_getter<detail::as_pointer_tag<T>> g{};
+			return g.get(L, index, tracking);
+#endif
+		}
+	};
+
+	template <typename... Tn>
+	struct unqualified_getter<std::tuple<Tn...>> {
+		typedef std::tuple<decltype(stack::get<Tn>(nullptr, 0))...> R;
+
+		template <typename... Args>
+		static R apply(std::index_sequence<>, lua_State*, int, record&, Args&&... args) {
+			// Fuck you too, VC++
+			return R { std::forward<Args>(args)... };
+		}
+
+		template <std::size_t I, std::size_t... Ix, typename... Args>
+		static R apply(std::index_sequence<I, Ix...>, lua_State* L, int index, record& tracking, Args&&... args) {
+			// Fuck you too, VC++
+			typedef std::tuple_element_t<I, std::tuple<Tn...>> T;
+			return apply(std::index_sequence<Ix...>(), L, index, tracking, std::forward<Args>(args)..., stack::get<T>(L, index + tracking.used, tracking));
+		}
+
+		static R get(lua_State* L, int index, record& tracking) {
+			return apply(std::make_index_sequence<sizeof...(Tn)>(), L, index, tracking);
+		}
+	};
+
+	template <typename A, typename B>
+	struct unqualified_getter<std::pair<A, B>> {
+		static decltype(auto) get(lua_State* L, int index, record& tracking) {
+			return std::pair<decltype(stack::get<A>(L, index)), decltype(stack::get<B>(L, index))> { stack::get<A>(L, index, tracking),
+				stack::get<B>(L, index + tracking.used, tracking) };
+		}
+	};
+
+#if SOL_IS_ON(SOL_STD_VARIANT)
+
+	template <typename... Tn>
+	struct unqualified_getter<std::variant<Tn...>> {
+		using V = std::variant<Tn...>;
+
+		static V get_one(std::integral_constant<std::size_t, std::variant_size_v<V>>, lua_State* L, int index, record& tracking) {
+			(void)L;
+			(void)index;
+			(void)tracking;
+			if constexpr (std::variant_size_v<V> == 0) {
+				return V();
+			}
+			else {
+				// using T = std::variant_alternative_t<0, V>;
+				std::abort();
+				// return V(std::in_place_index<0>, stack::get<T>(L, index, tracking));
+			}
+		}
+
+		template <std::size_t I>
+		static V get_one(std::integral_constant<std::size_t, I>, lua_State* L, int index, record& tracking) {
+			typedef std::variant_alternative_t<I, V> T;
+			record temp_tracking = tracking;
+			if (stack::check<T>(L, index, &no_panic, temp_tracking)) {
+				tracking = temp_tracking;
+				return V(std::in_place_index<I>, stack::get<T>(L, index));
+			}
+			return get_one(std::integral_constant<std::size_t, I + 1>(), L, index, tracking);
+		}
+
+		static V get(lua_State* L, int index, record& tracking) {
+			return get_one(std::integral_constant<std::size_t, 0>(), L, index, tracking);
+		}
+	};
+#endif // variant
+
+}} // namespace sol::stack
+
+// end of sol/stack_get_unqualified.hpp
+
+// beginning of sol/stack_get_qualified.hpp
+
+namespace sol { namespace stack {
+
+	// There are no more enable_ifs that can be used here,
+	// so this is just for posterity, I guess?
+	// maybe I'll fill this file in later.
+
+}} // namespace sol::stack
+
+// end of sol/stack_get_qualified.hpp
+
+// end of sol/stack_get.hpp
+
+// beginning of sol/stack_check_get.hpp
+
+// beginning of sol/stack_check_get_unqualified.hpp
+
+#include <cstdlib>
+#include <cmath>
+#include <optional>
+#if SOL_IS_ON(SOL_STD_VARIANT)
+#include <variant>
+#endif // variant shenanigans (thanks, Mac OSX)
+
+namespace sol { namespace stack {
+	template <typename T, typename>
+	struct unqualified_check_getter {
+		typedef decltype(stack_detail::unchecked_unqualified_get<T>(nullptr, -1, std::declval<record&>())) R;
+
+		template <typename Optional, typename Handler>
+		static Optional get_using(lua_State* L, int index, Handler&& handler, record& tracking) {
+			if constexpr (!meta::meta_detail::is_adl_sol_lua_check_v<T> && !meta::meta_detail::is_adl_sol_lua_get_v<T>) {
+				if constexpr (is_lua_reference_v<T>) {
+					if constexpr (is_global_table_v<T>) {
+						(void)L;
+						(void)index;
+						(void)handler;
+						tracking.use(1);
+						return true;
+					}
+					else {
+						// actually check if it's none here, otherwise
+						// we'll have a none object inside an optional!
+						bool success = lua_isnoneornil(L, index) == 0 && stack::check<T>(L, index, &no_panic);
+						if (!success) {
+							// expected type, actual type
+							tracking.use(static_cast<int>(success));
+							handler(L, index, type::poly, type_of(L, index), "");
+							return detail::associated_nullopt_v<Optional>;
+						}
+						return stack_detail::unchecked_get<T>(L, index, tracking);
+					}
+				}
+				else if constexpr ((std::is_integral_v<T> || std::is_same_v<T, lua_Integer>)&&!std::is_same_v<T, bool>) {
+#if SOL_LUA_VERSION_I_ >= 503
+					if (lua_isinteger(L, index) != 0) {
+						tracking.use(1);
+						return static_cast<T>(lua_tointeger(L, index));
+					}
+#endif
+					int isnum = 0;
+					const lua_Number value = lua_tonumberx(L, index, &isnum);
+					if (isnum != 0) {
+#if SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS)
+						const auto integer_value = llround(value);
+						if (static_cast<lua_Number>(integer_value) == value) {
+							tracking.use(1);
+							return static_cast<T>(integer_value);
+						}
+#else
+						tracking.use(1);
+						return static_cast<T>(value);
+#endif
+					}
+					const type t = type_of(L, index);
+					tracking.use(static_cast<int>(t != type::none));
+					handler(L, index, type::number, t, "not an integer");
+					return detail::associated_nullopt_v<Optional>;
+				}
+				else if constexpr (std::is_floating_point_v<T> || std::is_same_v<T, lua_Number>) {
+					int isnum = 0;
+					lua_Number value = lua_tonumberx(L, index, &isnum);
+					if (isnum == 0) {
+						type t = type_of(L, index);
+						tracking.use(static_cast<int>(t != type::none));
+						handler(L, index, type::number, t, "not a valid floating point number");
+						return detail::associated_nullopt_v<Optional>;
+					}
+					tracking.use(1);
+					return static_cast<T>(value);
+				}
+				else if constexpr (std::is_enum_v<T> && !meta::any_same_v<T, meta_function, type>) {
+					int isnum = 0;
+					lua_Integer value = lua_tointegerx(L, index, &isnum);
+					if (isnum == 0) {
+						type t = type_of(L, index);
+						tracking.use(static_cast<int>(t != type::none));
+						handler(L, index, type::number, t, "not a valid enumeration value");
+						return detail::associated_nullopt_v<Optional>;
+					}
+					tracking.use(1);
+					return static_cast<T>(value);
+				}
+				else {
+					if (!unqualified_check<T>(L, index, std::forward<Handler>(handler))) {
+						tracking.use(static_cast<int>(!lua_isnone(L, index)));
+						return detail::associated_nullopt_v<Optional>;
+					}
+					return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
+				}
+			}
+			else {
+				if (!unqualified_check<T>(L, index, std::forward<Handler>(handler))) {
+					tracking.use(static_cast<int>(!lua_isnone(L, index)));
+					return detail::associated_nullopt_v<Optional>;
+				}
+				return stack_detail::unchecked_unqualified_get<T>(L, index, tracking);
+			}
+		}
+
+		template <typename Handler>
+		static optional<R> get(lua_State* L, int index, Handler&& handler, record& tracking) {
+			return get_using<optional<R>>(L, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+#if SOL_IS_ON(SOL_STD_VARIANT)
+	template <typename... Tn, typename C>
+	struct unqualified_check_getter<std::variant<Tn...>, C> {
+		typedef std::variant<Tn...> V;
+		typedef std::variant_size<V> V_size;
+		typedef std::integral_constant<bool, V_size::value == 0> V_is_empty;
+
+		template <typename Handler>
+		static optional<V> get_empty(std::true_type, lua_State*, int, Handler&&, record&) {
+			return nullopt;
+		}
+
+		template <typename Handler>
+		static optional<V> get_empty(std::false_type, lua_State* L, int index, Handler&& handler, record&) {
+			// This should never be reached...
+			// please check your code and understand what you did to bring yourself here
+			// maybe file a bug report, or 5
+			handler(
+				L, index, type::poly, type_of(L, index), "this variant code should never be reached: if it has, you have done something so terribly wrong");
+			return nullopt;
+		}
+
+		template <typename Handler>
+		static optional<V> get_one(std::integral_constant<std::size_t, 0>, lua_State* L, int index, Handler&& handler, record& tracking) {
+			return get_empty(V_is_empty(), L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <std::size_t I, typename Handler>
+		static optional<V> get_one(std::integral_constant<std::size_t, I>, lua_State* L, int index, Handler&& handler, record& tracking) {
+			typedef std::variant_alternative_t<I - 1, V> T;
+			if (stack::check<T>(L, index, &no_panic, tracking)) {
+				return V(std::in_place_index<I - 1>, stack::get<T>(L, index));
+			}
+			return get_one(std::integral_constant<std::size_t, I - 1>(), L, index, std::forward<Handler>(handler), tracking);
+		}
+
+		template <typename Handler>
+		static optional<V> get(lua_State* L, int index, Handler&& handler, record& tracking) {
+			return get_one(std::integral_constant<std::size_t, V_size::value>(), L, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+#endif // standard variant
+}}     // namespace sol::stack
+
+// end of sol/stack_check_get_unqualified.hpp
+
+// beginning of sol/stack_check_get_qualified.hpp
+
+namespace sol { namespace stack {
+
+#if SOL_IS_ON(SOL_COMPILER_GCC)
+#pragma GCC diagnostic push
+#if !SOL_IS_ON(SOL_COMPILER_CLANG)
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
+#endif
+
+	namespace stack_detail {
+		template <typename OptionalType, typename T, typename Handler>
+		OptionalType get_optional(lua_State* L, int index, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+
+			if constexpr (is_lua_reference_v<T>) {
+				if constexpr (is_global_table_v<Tu>) {
+					(void)L;
+					(void)index;
+					(void)handler;
+					tracking.use(1);
+					return true;
+				}
+				else {
+					// actually check if it's none here, otherwise
+					// we'll have a none object inside an optional!
+					bool success = lua_isnoneornil(L, index) == 0 && stack::check<T>(L, index, &no_panic);
+					if (!success) {
+						// expected type, actual type
+						tracking.use(static_cast<int>(success));
+						handler(L, index, type::poly, type_of(L, index), "");
+						return {};
+					}
+					return OptionalType(stack_detail::unchecked_get<T>(L, index, tracking));
+				}
+			}
+			else if constexpr (!std::is_reference_v<T> && is_unique_usertype_v<Tu> && !is_actual_type_rebindable_for_v<Tu>) {
+				// we can take shortcuts here to save on separate checking, and just return nullopt!
+				using element = unique_usertype_element_t<Tu>;
+				using actual = unique_usertype_actual_t<Tu>;
+				tracking.use(1);
+				void* memory = lua_touserdata(L, index);
+				memory = detail::align_usertype_unique_destructor(memory);
+				detail::unique_destructor& pdx = *static_cast<detail::unique_destructor*>(memory);
+				if (&detail::usertype_unique_alloc_destroy<element, Tu> == pdx) {
+					memory = detail::align_usertype_unique_tag<true, false>(memory);
+					memory = detail::align_usertype_unique<actual, true, false>(memory);
+					actual* mem = static_cast<actual*>(memory);
+					return static_cast<actual>(*mem);
+				}
+				if constexpr (!derive<element>::value) {
+					return OptionalType();
+				}
+				else {
+					memory = detail::align_usertype_unique_tag<true, false>(memory);
+					detail::unique_tag& ic = *reinterpret_cast<detail::unique_tag*>(memory);
+					memory = detail::align_usertype_unique<actual, true, false>(memory);
+					string_view ti = usertype_traits<element>::qualified_name();
+					int cast_operation;
+					actual r {};
+					if constexpr (is_actual_type_rebindable_for_v<Tu>) {
+						using rebound_actual_type = unique_usertype_rebind_actual_t<Tu, void>;
+						string_view rebind_ti = usertype_traits<rebound_actual_type>::qualified_name();
+						cast_operation = ic(memory, &r, ti, rebind_ti);
+					}
+					else {
+						string_view rebind_ti("");
+						cast_operation = ic(memory, &r, ti, rebind_ti);
+					}
+					switch (cast_operation) {
+					case 1: {
+						// it's a perfect match,
+						// alias memory directly
+						actual* mem = static_cast<actual*>(memory);
+						return OptionalType(*mem);
+					}
+					case 2:
+						// it's a base match, return the
+						// aliased creation
+						return OptionalType(std::move(r));
+					default:
+						break;
+					}
+					return OptionalType();
+				}
+			}
+			else {
+				if (!check<T>(L, index, std::forward<Handler>(handler))) {
+					tracking.use(static_cast<int>(!lua_isnone(L, index)));
+					return OptionalType();
+				}
+				return OptionalType(stack_detail::unchecked_get<T>(L, index, tracking));
+			}
+		}
+	} // namespace stack_detail
+
+#if SOL_IS_ON(SOL_COMPILER_GCC)
+#pragma GCC diagnostic pop
+#endif
+
+	template <typename T, typename>
+	struct qualified_check_getter {
+		typedef decltype(stack_detail::unchecked_get<T>(nullptr, -1, std::declval<record&>())) R;
+
+		template <typename Handler>
+		optional<R> get(lua_State* L, int index, Handler&& handler, record& tracking) {
+			return stack_detail::get_optional<optional<R>, T>(L, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
+	template <typename Optional>
+	struct qualified_getter<Optional, std::enable_if_t<meta::is_optional_v<Optional>>> {
+		static Optional get(lua_State* L, int index, record& tracking) {
+			using T = typename meta::unqualified_t<Optional>::value_type;
+			return stack_detail::get_optional<Optional, T>(L, index, &no_panic, tracking);
+		}
+	};
+
+}} // namespace sol::stack
+
+// end of sol/stack_check_get_qualified.hpp
+
+// end of sol/stack_check_get.hpp
+
+// beginning of sol/stack_push.hpp
+
+#include <memory>
+#include <type_traits>
+#include <cassert>
+#include <limits>
+#include <cmath>
+#include <string_view>
+#if SOL_IS_ON(SOL_STD_VARIANT)
+#include <variant>
+#endif // Can use variant
+
+// beginning of sol/debug.hpp
+
+#include <iostream>
+
+namespace sol { namespace detail { namespace debug {
+	inline std::string dump_types(lua_State* L) {
+		std::string visual;
+		std::size_t size = lua_gettop(L) + 1;
+		for (std::size_t i = 1; i < size; ++i) {
+			if (i != 1) {
+				visual += " | ";
+			}
+			visual += type_name(L, stack::get<type>(L, static_cast<int>(i)));
+		}
+		return visual;
+	}
+
+	inline void print_stack(lua_State* L) {
+		std::cout << dump_types(L) << std::endl;
+	}
+
+	inline void print_section(const std::string& message, lua_State* L) {
+		std::cout << "-- " << message << " -- [ " << dump_types(L) << " ]" << std::endl;
+	}
+}}} // namespace sol::detail::debug
+
+// end of sol/debug.hpp
+
+namespace sol { namespace stack {
+	namespace stack_detail {
+		template <typename T>
+		inline bool integer_value_fits(const T& value) {
+			// We check if we can rely on casts or a lack of padding bits to satisfy
+			// the requirements here
+			// If it lacks padding bits, we can jump back and forth between lua_Integer and whatever type without
+			// loss of information
+			constexpr bool is_same_signedness
+				= (std::is_signed_v<T> && std::is_signed_v<lua_Integer>) || (std::is_unsigned_v<T> && std::is_unsigned_v<lua_Integer>);
+			constexpr bool probaby_fits_within_lua_Integer = sizeof(T) == sizeof(lua_Integer)
+#if SOL_IS_ON(SOL_ALL_INTEGER_VALUES_FIT)
+				&& ((std::has_unique_object_representations_v<T> && std::has_unique_object_representations_v<lua_Integer>) ? true : is_same_signedness)
+#else
+				&& is_same_signedness
+#endif
+				;
+			if constexpr (sizeof(T) < sizeof(lua_Integer) || probaby_fits_within_lua_Integer) {
+				(void)value;
+				return true;
+			}
+			else {
+				auto u_min = static_cast<std::intmax_t>((std::numeric_limits<lua_Integer>::min)());
+				auto u_max = static_cast<std::uintmax_t>((std::numeric_limits<lua_Integer>::max)());
+				auto t_min = static_cast<std::intmax_t>((std::numeric_limits<T>::min)());
+				auto t_max = static_cast<std::uintmax_t>((std::numeric_limits<T>::max)());
+				return (u_min <= t_min || value >= static_cast<T>(u_min)) && (u_max >= t_max || value <= static_cast<T>(u_max));
+			}
+		}
+
+		template <typename T>
+		int msvc_is_ass_with_if_constexpr_push_enum(std::true_type, lua_State* L, const T& value) {
+			if constexpr (meta::any_same_v<std::underlying_type_t<T>,
+				              char
+#if SOL_IS_ON(SOL_CHAR8_T)
+				              ,
+				              char8_t
+#endif
+				              ,
+				              char16_t,
+				              char32_t>) {
+				if constexpr (std::is_signed_v<T>) {
+					return stack::push(L, static_cast<std::int_least32_t>(value));
+				}
+				else {
+					return stack::push(L, static_cast<std::uint_least32_t>(value));
+				}
+			}
+			else {
+				return stack::push(L, static_cast<std::underlying_type_t<T>>(value));
+			}
+		}
+
+		template <typename T>
+		int msvc_is_ass_with_if_constexpr_push_enum(std::false_type, lua_State*, const T&) {
+			return 0;
+		}
+	} // namespace stack_detail
+
+	inline int push_environment_of(lua_State* L, int target_index = -1) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+		luaL_checkstack(L, 1, detail::not_enough_stack_space_environment);
+#endif // make sure stack doesn't overflow
+#if SOL_LUA_VERSION_I_ < 502
+		// Use lua_getfenv
+		lua_getfenv(L, target_index);
+#else
+
+		if (lua_iscfunction(L, target_index) != 0) {
+			const char* maybe_upvalue_name = lua_getupvalue(L, target_index, 1);
+			if (maybe_upvalue_name != nullptr) {
+				// it worked, take this one
+				return 1;
+			}
+		}
+		// Nominally, we search for the `"_ENV"` value.
+		// If we don't find it.... uh, well. We've got a problem?
+		for (int upvalue_index = 1;; ++upvalue_index) {
+			const char* maybe_upvalue_name = lua_getupvalue(L, target_index, upvalue_index);
+			if (maybe_upvalue_name == nullptr) {
+				push(L, lua_nil);
+				break;
+			}
+
+			string_view upvalue_name(maybe_upvalue_name);
+			if (upvalue_name == "_ENV") {
+				// Keep this one!
+				break;
+			}
+			// Discard what we received, loop back around
+			lua_pop(L, 1);
+		}
+#endif
+		return 1;
+	}
+
+	template <typename T>
+	int push_environment_of(const T& target) {
+		lua_State* target_L = target.lua_state();
+		int target_index = absolute_index(target_L, -target.push());
+		int env_count = push_environment_of(target_L, target_index);
+		SOL_ASSERT(env_count == 1);
+		lua_rotate(target_L, target_index, 1);
+		lua_pop(target_L, 1);
+		return env_count;
+	}
+
+	template <typename T>
+	struct unqualified_pusher<detail::as_value_tag<T>> {
+		template <typename F, typename... Args>
+		static int push_fx(lua_State* L, F&& f, Args&&... args) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
+#endif // make sure stack doesn't overflow
+       // Basically, we store all user-data like this:
+       // If it's a movable/copyable value (no std::ref(x)), then we store the pointer to the new
+       // data in the first sizeof(T*) bytes, and then however many bytes it takes to
+       // do the actual object. Things that are std::ref or plain T* are stored as
+       // just the sizeof(T*), and nothing else.
+			T* obj = detail::usertype_allocate<T>(L);
+			f();
+			std::allocator<T> alloc {};
+			std::allocator_traits<std::allocator<T>>::construct(alloc, obj, std::forward<Args>(args)...);
+			return 1;
+		}
+
+		template <typename K, typename... Args>
+		static int push_keyed(lua_State* L, K&& k, Args&&... args) {
+			stack_detail::undefined_metatable fx(L, &k[0], &stack::stack_detail::set_undefined_methods_on<T>);
+			return push_fx(L, fx, std::forward<Args>(args)...);
+		}
+
+		template <typename Arg, typename... Args>
+		static int push(lua_State* L, Arg&& arg, Args&&... args) {
+			if constexpr (std::is_same_v<meta::unqualified_t<Arg>, detail::with_function_tag>) {
+				(void)arg;
+				return push_fx(L, std::forward<Args>(args)...);
+			}
+			else {
+				return push_keyed(L, usertype_traits<T>::metatable(), std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+		}
+
+		static int push(lua_State* L) {
+			return push_keyed(L, usertype_traits<T>::metatable());
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<detail::as_pointer_tag<T>> {
+		typedef meta::unqualified_t<T> U;
+
+		template <typename F>
+		static int push_fx(lua_State* L, F&& f, T* obj) {
+			if (obj == nullptr)
+				return stack::push(L, lua_nil);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
+#endif // make sure stack doesn't overflow
+			T** pref = detail::usertype_allocate_pointer<T>(L);
+			f();
+			*pref = obj;
+			return 1;
+		}
+
+		template <typename K>
+		static int push_keyed(lua_State* L, K&& k, T* obj) {
+			stack_detail::undefined_metatable fx(L, &k[0], &stack::stack_detail::set_undefined_methods_on<U*>);
+			return push_fx(L, fx, obj);
+		}
+
+		template <typename Arg, typename... Args>
+		static int push(lua_State* L, Arg&& arg, Args&&... args) {
+			if constexpr (std::is_same_v<meta::unqualified_t<Arg>, detail::with_function_tag>) {
+				(void)arg;
+				return push_fx(L, std::forward<Args>(args)...);
+			}
+			else {
+				return push_keyed(L, usertype_traits<U*>::metatable(), std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<detail::as_reference_tag> {
+		template <typename T>
+		static int push(lua_State* L, T&& obj) {
+			return stack::push(L, detail::ptr(obj));
+		}
+	};
+
+	namespace stack_detail {
+		template <typename T>
+		struct uu_pusher {
+			using element = unique_usertype_element_t<T>;
+			using actual = unique_usertype_actual_t<T>;
+
+			template <typename Arg, typename... Args>
+			static int push(lua_State* L, Arg&& arg, Args&&... args) {
+				if constexpr (std::is_base_of_v<actual, meta::unqualified_t<Arg>>) {
+					if (detail::unique_is_null(L, arg)) {
+						return stack::push(L, lua_nil);
+					}
+					return push_deep(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+				}
+				else {
+					return push_deep(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
+				}
+			}
+
+			template <typename... Args>
+			static int push_deep(lua_State* L, Args&&... args) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
+#endif // make sure stack doesn't overflow
+				element** pointer_to_memory = nullptr;
+				detail::unique_destructor* fx = nullptr;
+				detail::unique_tag* id = nullptr;
+				actual* typed_memory = detail::usertype_unique_allocate<element, actual>(L, pointer_to_memory, fx, id);
+				if (luaL_newmetatable(L, &usertype_traits<d::u<std::remove_cv_t<element>>>::metatable()[0]) == 1) {
+					detail::lua_reg_table registration_table {};
+					int index = 0;
+					detail::indexed_insert insert_callable(registration_table, index);
+					detail::insert_default_registrations<element>(insert_callable, detail::property_always_true);
+					registration_table[index] = { to_string(meta_function::garbage_collect).c_str(), detail::make_destructor<T>() };
+					luaL_setfuncs(L, registration_table, 0);
+				}
+				lua_setmetatable(L, -2);
+				*fx = detail::usertype_unique_alloc_destroy<element, actual>;
+				*id = &detail::inheritance<element>::template type_unique_cast<actual>;
+				detail::default_construct::construct(typed_memory, std::forward<Args>(args)...);
+				*pointer_to_memory = detail::unique_get<T>(L, *typed_memory);
+				return 1;
+			}
+		};
+	} // namespace stack_detail
+
+	template <typename T>
+	struct unqualified_pusher<detail::as_unique_tag<T>> {
+		template <typename... Args>
+		static int push(lua_State* L, Args&&... args) {
+			stack_detail::uu_pusher<T> p;
+			(void)p;
+			return p.push(L, std::forward<Args>(args)...);
+		}
+	};
+
+	template <typename T, typename>
+	struct unqualified_pusher {
+		template <typename... Args>
+		static int push(lua_State* L, Args&&... args) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (is_lua_reference_v<Tu>) {
+				using int_arr = int[];
+				int_arr p { (std::forward<Args>(args).push(L))... };
+				return p[0];
+			}
+			else if constexpr (std::is_same_v<Tu, bool>) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				lua_pushboolean(L, std::forward<Args>(args)...);
+				return 1;
+			}
+			else if constexpr (std::is_integral_v<Tu> || std::is_same_v<Tu, lua_Integer>) {
+				const Tu& value(std::forward<Args>(args)...);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_integral);
+#endif // make sure stack doesn't overflow
+#if SOL_LUA_VERSION_I_ >= 503
+				if (stack_detail::integer_value_fits<Tu>(value)) {
+					lua_pushinteger(L, static_cast<lua_Integer>(value));
+					return 1;
+				}
+#endif // Lua 5.3 and above
+#if SOL_IS_ON(SOL_NUMBER_PRECISION_CHECKS)
+				if (static_cast<T>(llround(static_cast<lua_Number>(value))) != value) {
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+					// Is this really worth it?
+					SOL_ASSERT_MSG(false, "integer value will be misrepresented in lua");
+					lua_pushinteger(L, static_cast<lua_Integer>(value));
+					return 1;
+#else
+					throw error(detail::direct_error, "integer value will be misrepresented in lua");
+#endif // No Exceptions
+				}
+#endif // Safe Numerics and Number Precision Check
+				lua_pushnumber(L, static_cast<lua_Number>(value));
+				return 1;
+			}
+			else if constexpr (std::is_floating_point_v<Tu> || std::is_same_v<Tu, lua_Number>) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_floating);
+#endif // make sure stack doesn't overflow
+				lua_pushnumber(L, std::forward<Args>(args)...);
+				return 1;
+			}
+			else if constexpr (std::is_same_v<Tu, luaL_Stream*>) {
+				luaL_Stream* source { std::forward<Args>(args)... };
+				luaL_Stream* stream = static_cast<luaL_Stream*>(detail::alloc_newuserdata(L, sizeof(luaL_Stream)));
+				stream->f = source->f;
+#if SOL_IS_ON(SOL_LUAL_STREAM_USE_CLOSE_FUNCTION)
+				stream->closef = source->closef;
+#endif // LuaJIT and Lua 5.1 and below do not have
+				return 1;
+			}
+			else if constexpr (std::is_same_v<Tu, luaL_Stream>) {
+				luaL_Stream& source(std::forward<Args>(args)...);
+				luaL_Stream* stream = static_cast<luaL_Stream*>(detail::alloc_newuserdata(L, sizeof(luaL_Stream)));
+				stream->f = source.f;
+#if SOL_IS_ON(SOL_LUAL_STREAM_USE_CLOSE_FUNCTION)
+				stream->closef = source.closef;
+#endif // LuaJIT and Lua 5.1 and below do not have
+				return 1;
+			}
+			else if constexpr (std::is_enum_v<Tu>) {
+				return stack_detail::msvc_is_ass_with_if_constexpr_push_enum(std::true_type(), L, std::forward<Args>(args)...);
+			}
+			else if constexpr (std::is_pointer_v<Tu>) {
+				return stack::push<detail::as_pointer_tag<std::remove_pointer_t<T>>>(L, std::forward<Args>(args)...);
+			}
+			else if constexpr (is_unique_usertype_v<Tu>) {
+				return stack::push<detail::as_unique_tag<T>>(L, std::forward<Args>(args)...);
+			}
+			else {
+				return stack::push<detail::as_value_tag<T>>(L, std::forward<Args>(args)...);
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<std::reference_wrapper<T>> {
+		static int push(lua_State* L, const std::reference_wrapper<T>& t) {
+			return stack::push(L, std::addressof(detail::deref(t.get())));
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<detail::as_table_tag<T>> {
+		using has_kvp = meta::has_key_value_pair<meta::unqualified_t<std::remove_pointer_t<T>>>;
+
+		static int push(lua_State* L, const T& tablecont) {
+			return push(has_kvp(), std::false_type(), L, tablecont);
+		}
+
+		static int push(lua_State* L, const T& tablecont, nested_tag_t) {
+			return push(has_kvp(), std::true_type(), L, tablecont);
+		}
+
+		static int push(std::true_type, lua_State* L, const T& tablecont) {
+			return push(has_kvp(), std::true_type(), L, tablecont);
+		}
+
+		static int push(std::false_type, lua_State* L, const T& tablecont) {
+			return push(has_kvp(), std::false_type(), L, tablecont);
+		}
+
+		template <bool is_nested>
+		static int push(std::true_type, std::integral_constant<bool, is_nested>, lua_State* L, const T& tablecont) {
+			auto& cont = detail::deref(detail::unwrap(tablecont));
+			lua_createtable(L, static_cast<int>(cont.size()), 0);
+			int tableindex = lua_gettop(L);
+			for (const auto& pair : cont) {
+				if (is_nested) {
+					set_field(L, pair.first, as_nested_ref(pair.second), tableindex);
+				}
+				else {
+					set_field(L, pair.first, pair.second, tableindex);
+				}
+			}
+			return 1;
+		}
+
+		template <bool is_nested>
+		static int push(std::false_type, std::integral_constant<bool, is_nested>, lua_State* L, const T& tablecont) {
+			auto& cont = detail::deref(detail::unwrap(tablecont));
+			lua_createtable(L, stack_detail::get_size_hint(cont), 0);
+			int tableindex = lua_gettop(L);
+			std::size_t index = 1;
+			for (const auto& i : cont) {
+#if SOL_LUA_VERSION_I_ >= 503
+				int p = is_nested ? stack::push(L, as_nested_ref(i)) : stack::push(L, i);
+				for (int pi = 0; pi < p; ++pi) {
+					lua_seti(L, tableindex, static_cast<lua_Integer>(index++));
+				}
+#else
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				lua_pushinteger(L, static_cast<lua_Integer>(index));
+				int p = is_nested ? stack::push(L, as_nested_ref(i)) : stack::push(L, i);
+				if (p == 1) {
+					++index;
+					lua_settable(L, tableindex);
+				}
+				else {
+					int firstindex = tableindex + 1 + 1;
+					for (int pi = 0; pi < p; ++pi) {
+						stack::push(L, index);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+						luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+						lua_pushvalue(L, firstindex);
+						lua_settable(L, tableindex);
+						++index;
+						++firstindex;
+					}
+					lua_pop(L, 1 + p);
+				}
+#endif // Lua Version 5.3 and others
+			}
+			// TODO: figure out a better way to do this...?
+			// set_field(L, -1, cont.size());
+			return 1;
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<as_table_t<T>> {
+		static int push(lua_State* L, const as_table_t<T>& value_) {
+			using inner_t = std::remove_pointer_t<meta::unwrap_unqualified_t<T>>;
+			if constexpr (is_container_v<inner_t>) {
+				return stack::push<detail::as_table_tag<T>>(L, value_.value());
+			}
+			else {
+				return stack::push(L, value_.value());
+			}
+		}
+
+		static int push(lua_State* L, const T& value_) {
+			using inner_t = std::remove_pointer_t<meta::unwrap_unqualified_t<T>>;
+			if constexpr (is_container_v<inner_t>) {
+				return stack::push<detail::as_table_tag<T>>(L, value_);
+			}
+			else {
+				return stack::push(L, value_);
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<nested<T>> {
+		static int push(lua_State* L, const T& nested_value) noexcept {
+			using Tu = meta::unwrap_unqualified_t<T>;
+			using inner_t = std::remove_pointer_t<Tu>;
+			if constexpr (is_container_v<inner_t>) {
+				return stack::push<detail::as_table_tag<T>>(L, nested_value, nested_tag);
+			}
+			else {
+				return stack::push<Tu>(L, nested_value);
+			}
+		}
+
+		static int push(lua_State* L, const nested<T>& nested_wrapper_) noexcept {
+			using Tu = meta::unwrap_unqualified_t<T>;
+			using inner_t = std::remove_pointer_t<Tu>;
+			if constexpr (is_container_v<inner_t>) {
+				return stack::push<detail::as_table_tag<T>>(L, nested_wrapper_.value(), nested_tag);
+			}
+			else {
+				return stack::push<Tu>(L, nested_wrapper_.value());
+			}
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<std::initializer_list<T>> {
+		static int push(lua_State* L, const std::initializer_list<T>& il) noexcept {
+			unqualified_pusher<detail::as_table_tag<std::initializer_list<T>>> p {};
+			return p.push(L, il);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<lua_nil_t> {
+		static int push(lua_State* L, lua_nil_t) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushnil(L);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<stack_count> {
+		static int push(lua_State*, stack_count st) noexcept {
+			return st.count;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<metatable_key_t> {
+		static int push(lua_State* L, metatable_key_t) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, to_string(meta_function::metatable).c_str(), 4);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<std::remove_pointer_t<lua_CFunction>> {
+		static int push(lua_State* L, lua_CFunction func, int n = 0) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushcclosure(L, func, n);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<lua_CFunction> {
+		static int push(lua_State* L, lua_CFunction func, int n = 0) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushcclosure(L, func, n);
+			return 1;
+		}
+	};
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+	template <>
+	struct unqualified_pusher<std::remove_pointer_t<detail::lua_CFunction_noexcept>> {
+		static int push(lua_State* L, detail::lua_CFunction_noexcept func, int n = 0) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushcclosure(L, func, n);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<detail::lua_CFunction_noexcept> {
+		static int push(lua_State* L, detail::lua_CFunction_noexcept func, int n = 0) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushcclosure(L, func, n);
+			return 1;
+		}
+	};
+#endif // noexcept function type
+
+	template <>
+	struct unqualified_pusher<c_closure> {
+		static int push(lua_State* L, c_closure cc) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushcclosure(L, cc.c_function, cc.upvalues);
+			return 1;
+		}
+	};
+
+	template <typename Arg, typename... Args>
+	struct unqualified_pusher<closure<Arg, Args...>> {
+		template <std::size_t... I, typename T>
+		static int push(std::index_sequence<I...>, lua_State* L, T&& c) {
+			using f_tuple = decltype(std::forward<T>(c).upvalues);
+			int pushcount = multi_push(L, std::get<I>(std::forward<f_tuple>(std::forward<T>(c).upvalues))...);
+			return stack::push(L, c_closure(c.c_function, pushcount));
+		}
+
+		template <typename T>
+		static int push(lua_State* L, T&& c) {
+			return push(std::make_index_sequence<1 + sizeof...(Args)>(), L, std::forward<T>(c));
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<void*> {
+		static int push(lua_State* L, void* userdata) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlightuserdata(L, userdata);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<const void*> {
+		static int push(lua_State* L, const void* userdata) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlightuserdata(L, const_cast<void*>(userdata));
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<lightuserdata_value> {
+		static int push(lua_State* L, lightuserdata_value userdata) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlightuserdata(L, userdata);
+			return 1;
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<light<T>> {
+		static int push(lua_State* L, light<T> l) noexcept {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlightuserdata(L, static_cast<void*>(l.value()));
+			return 1;
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<user<T>> {
+		template <bool with_meta = true, typename Key, typename... Args>
+		static int push_with(lua_State* L, Key&& name, Args&&... args) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
+#endif // make sure stack doesn't overflow
+       // A dumb pusher
+			T* data = detail::user_allocate<T>(L);
+			if (with_meta) {
+				// Make sure we have a plain GC set for this data
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				if (luaL_newmetatable(L, name) != 0) {
+					lua_CFunction cdel = detail::user_alloc_destroy<T>;
+					lua_pushcclosure(L, cdel, 0);
+					lua_setfield(L, -2, "__gc");
+				}
+				lua_setmetatable(L, -2);
+			}
+			std::allocator<T> alloc {};
+			std::allocator_traits<std::allocator<T>>::construct(alloc, data, std::forward<Args>(args)...);
+			return 1;
+		}
+
+		template <typename Arg, typename... Args>
+		static int push(lua_State* L, Arg&& arg, Args&&... args) {
+			if constexpr (std::is_same_v<meta::unqualified_t<Arg>, metatable_key_t>) {
+				const auto name = &arg[0];
+				return push_with<true>(L, name, std::forward<Args>(args)...);
+			}
+			else if constexpr (std::is_same_v<meta::unqualified_t<Arg>, no_metatable_t>) {
+				(void)arg;
+				const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+				return push_with<false>(L, name, std::forward<Args>(args)...);
+			}
+			else {
+				const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+				return push_with(L, name, std::forward<Arg>(arg), std::forward<Args>(args)...);
+			}
+		}
+
+		static int push(lua_State* L, const user<T>& u) {
+			const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+			return push_with(L, name, u.value);
+		}
+
+		static int push(lua_State* L, user<T>&& u) {
+			const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+			return push_with(L, name, std::move(u.value()));
+		}
+
+		static int push(lua_State* L, no_metatable_t, const user<T>& u) {
+			const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+			return push_with<false>(L, name, u.value());
+		}
+
+		static int push(lua_State* L, no_metatable_t, user<T>&& u) {
+			const auto name = &usertype_traits<meta::unqualified_t<T>>::user_gc_metatable()[0];
+			return push_with<false>(L, name, std::move(u.value()));
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<userdata_value> {
+		static int push(lua_State* L, userdata_value data) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_userdata);
+#endif // make sure stack doesn't overflow
+			void** ud = detail::usertype_allocate_pointer<void>(L);
+			*ud = data.value();
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<const char*> {
+		static int push_sized(lua_State* L, const char* str, std::size_t len) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, str, len);
+			return 1;
+		}
+
+		static int push(lua_State* L, const char* str) {
+			if (str == nullptr)
+				return stack::push(L, lua_nil);
+			return push_sized(L, str, std::char_traits<char>::length(str));
+		}
+
+		static int push(lua_State* L, const char* strb, const char* stre) {
+			return push_sized(L, strb, static_cast<std::size_t>(stre - strb));
+		}
+
+		static int push(lua_State* L, const char* str, std::size_t len) {
+			return push_sized(L, str, len);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char*> {
+		static int push_sized(lua_State* L, const char* str, std::size_t len) {
+			unqualified_pusher<const char*> p {};
+			(void)p;
+			return p.push_sized(L, str, len);
+		}
+
+		static int push(lua_State* L, const char* str) {
+			unqualified_pusher<const char*> p {};
+			(void)p;
+			return p.push(L, str);
+		}
+
+		static int push(lua_State* L, const char* strb, const char* stre) {
+			unqualified_pusher<const char*> p {};
+			(void)p;
+			return p.push(L, strb, stre);
+		}
+
+		static int push(lua_State* L, const char* str, std::size_t len) {
+			unqualified_pusher<const char*> p {};
+			(void)p;
+			return p.push(L, str, len);
+		}
+	};
+
+	template <size_t N>
+	struct unqualified_pusher<char[N]> {
+		static int push(lua_State* L, const char (&str)[N]) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, str, std::char_traits<char>::length(str));
+			return 1;
+		}
+
+		static int push(lua_State* L, const char (&str)[N], std::size_t sz) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, str, sz);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char> {
+		static int push(lua_State* L, char c) {
+			const char str[2] = { c, '\0' };
+			return stack::push(L, static_cast<const char*>(str), 1u);
+		}
+	};
+
+#if SOL_IS_ON(SOL_CHAR8_T)
+	template <>
+	struct unqualified_pusher<const char8_t*> {
+		static int push_sized(lua_State* L, const char8_t* str, std::size_t len) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, reinterpret_cast<const char*>(str), len);
+			return 1;
+		}
+
+		static int push(lua_State* L, const char8_t* str) {
+			if (str == nullptr)
+				return stack::push(L, lua_nil);
+			return push_sized(L, str, std::char_traits<char>::length(reinterpret_cast<const char*>(str)));
+		}
+
+		static int push(lua_State* L, const char8_t* strb, const char8_t* stre) {
+			return push_sized(L, strb, static_cast<std::size_t>(stre - strb));
+		}
+
+		static int push(lua_State* L, const char8_t* str, std::size_t len) {
+			return push_sized(L, str, len);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char8_t*> {
+		static int push_sized(lua_State* L, const char8_t* str, std::size_t len) {
+			unqualified_pusher<const char8_t*> p {};
+			(void)p;
+			return p.push_sized(L, str, len);
+		}
+
+		static int push(lua_State* L, const char8_t* str) {
+			unqualified_pusher<const char8_t*> p {};
+			(void)p;
+			return p.push(L, str);
+		}
+
+		static int push(lua_State* L, const char8_t* strb, const char8_t* stre) {
+			unqualified_pusher<const char8_t*> p {};
+			(void)p;
+			return p.push(L, strb, stre);
+		}
+
+		static int push(lua_State* L, const char8_t* str, std::size_t len) {
+			unqualified_pusher<const char8_t*> p {};
+			(void)p;
+			return p.push(L, str, len);
+		}
+	};
+
+	template <size_t N>
+	struct unqualified_pusher<char8_t[N]> {
+		static int push(lua_State* L, const char8_t (&str)[N]) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+			const char* str_as_char = reinterpret_cast<const char*>(static_cast<const char8_t*>(str));
+			lua_pushlstring(L, str_as_char, std::char_traits<char>::length(str_as_char));
+			return 1;
+		}
+
+		static int push(lua_State* L, const char8_t (&str)[N], std::size_t sz) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+			lua_pushlstring(L, str, sz);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char8_t> {
+		static int push(lua_State* L, char8_t c) {
+			const char8_t str[2] = { c, '\0' };
+			return stack::push(L, static_cast<const char8_t*>(str), 1u);
+		}
+	};
+#endif // char8_t
+
+	template <typename Ch, typename Traits, typename Al>
+	struct unqualified_pusher<std::basic_string<Ch, Traits, Al>> {
+		static int push(lua_State* L, const std::basic_string<Ch, Traits, Al>& str) {
+			if constexpr (!std::is_same_v<Ch, char>) {
+				return stack::push(L, str.data(), str.size());
+			}
+			else {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+				lua_pushlstring(L, str.c_str(), str.size());
+				return 1;
+			}
+		}
+
+		static int push(lua_State* L, const std::basic_string<Ch, Traits, Al>& str, std::size_t sz) {
+			if constexpr (!std::is_same_v<Ch, char>) {
+				return stack::push(L, str.data(), sz);
+			}
+			else {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, 1, detail::not_enough_stack_space_string);
+#endif // make sure stack doesn't overflow
+				lua_pushlstring(L, str.c_str(), sz);
+				return 1;
+			}
+		}
+	};
+
+	template <typename Ch, typename Traits>
+	struct unqualified_pusher<basic_string_view<Ch, Traits>> {
+		static int push(lua_State* L, const basic_string_view<Ch, Traits>& sv) {
+			return stack::push(L, sv.data(), sv.length());
+		}
+
+		static int push(lua_State* L, const basic_string_view<Ch, Traits>& sv, std::size_t n) {
+			return stack::push(L, sv.data(), n);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<meta_function> {
+		static int push(lua_State* L, meta_function m) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_meta_function_name);
+#endif // make sure stack doesn't overflow
+			const std::string& str = to_string(m);
+			lua_pushlstring(L, str.c_str(), str.size());
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<absolute_index> {
+		static int push(lua_State* L, absolute_index ai) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L, ai);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<raw_index> {
+		static int push(lua_State* L, raw_index ri) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushvalue(L, ri);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<ref_index> {
+		static int push(lua_State* L, ref_index ri) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_rawgeti(L, LUA_REGISTRYINDEX, ri);
+			return 1;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<const wchar_t*> {
+		static int push(lua_State* L, const wchar_t* wstr) {
+			return push(L, wstr, std::char_traits<wchar_t>::length(wstr));
+		}
+
+		static int push(lua_State* L, const wchar_t* wstr, std::size_t sz) {
+			return push(L, wstr, wstr + sz);
+		}
+
+		static int push(lua_State* L, const wchar_t* strb, const wchar_t* stre) {
+			if constexpr (sizeof(wchar_t) == 2) {
+				const char16_t* sb = reinterpret_cast<const char16_t*>(strb);
+				const char16_t* se = reinterpret_cast<const char16_t*>(stre);
+				return stack::push(L, sb, se);
+			}
+			else {
+				const char32_t* sb = reinterpret_cast<const char32_t*>(strb);
+				const char32_t* se = reinterpret_cast<const char32_t*>(stre);
+				return stack::push(L, sb, se);
+			}
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<wchar_t*> {
+		static int push(lua_State* L, const wchar_t* str) {
+			unqualified_pusher<const wchar_t*> p {};
+			(void)p;
+			return p.push(L, str);
+		}
+
+		static int push(lua_State* L, const wchar_t* strb, const wchar_t* stre) {
+			unqualified_pusher<const wchar_t*> p {};
+			(void)p;
+			return p.push(L, strb, stre);
+		}
+
+		static int push(lua_State* L, const wchar_t* str, std::size_t len) {
+			unqualified_pusher<const wchar_t*> p {};
+			(void)p;
+			return p.push(L, str, len);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<const char16_t*> {
+		static int convert_into(lua_State* L, char* start, std::size_t, const char16_t* strb, const char16_t* stre) {
+			char* target = start;
+			char32_t cp = 0;
+			for (const char16_t* strtarget = strb; strtarget < stre;) {
+				auto dr = unicode::utf16_to_code_point(strtarget, stre);
+				if (dr.error != unicode::error_code::ok) {
+					cp = unicode::unicode_detail::replacement;
+				}
+				else {
+					cp = dr.codepoint;
+				}
+				auto er = unicode::code_point_to_utf8(cp);
+				const char* utf8data = er.code_units.data();
+				std::memcpy(target, utf8data, er.code_units_size);
+				target += er.code_units_size;
+				strtarget = dr.next;
+			}
+
+			return stack::push(L, start, target);
+		}
+
+		static int push(lua_State* L, const char16_t* u16str) {
+			return push(L, u16str, std::char_traits<char16_t>::length(u16str));
+		}
+
+		static int push(lua_State* L, const char16_t* u16str, std::size_t sz) {
+			return push(L, u16str, u16str + sz);
+		}
+
+		static int push(lua_State* L, const char16_t* strb, const char16_t* stre) {
+			char sbo[SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_];
+			// if our max string space is small enough, use SBO
+			// right off the bat
+			std::size_t max_possible_code_units = static_cast<std::size_t>(static_cast<std::size_t>(stre - strb) * static_cast<std::size_t>(4));
+			if (max_possible_code_units <= SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_) {
+				return convert_into(L, sbo, max_possible_code_units, strb, stre);
+			}
+			// otherwise, we must manually count/check size
+			std::size_t needed_size = 0;
+			for (const char16_t* strtarget = strb; strtarget < stre;) {
+				auto dr = unicode::utf16_to_code_point(strtarget, stre);
+				auto er = unicode::code_point_to_utf8(dr.codepoint);
+				needed_size += er.code_units_size;
+				strtarget = dr.next;
+			}
+			if (needed_size < SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_) {
+				return convert_into(L, sbo, needed_size, strb, stre);
+			}
+			std::string u8str("", 0);
+			u8str.resize(needed_size);
+			char* target = const_cast<char*>(u8str.data());
+			return convert_into(L, target, needed_size, strb, stre);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char16_t*> {
+		static int push(lua_State* L, const char16_t* str) {
+			unqualified_pusher<const char16_t*> p {};
+			(void)p;
+			return p.push(L, str);
+		}
+
+		static int push(lua_State* L, const char16_t* strb, const char16_t* stre) {
+			unqualified_pusher<const char16_t*> p {};
+			(void)p;
+			return p.push(L, strb, stre);
+		}
+
+		static int push(lua_State* L, const char16_t* str, std::size_t len) {
+			unqualified_pusher<const char16_t*> p {};
+			(void)p;
+			return p.push(L, str, len);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<const char32_t*> {
+		static int convert_into(lua_State* L, char* start, std::size_t, const char32_t* strb, const char32_t* stre) {
+			char* target = start;
+			char32_t cp = 0;
+			for (const char32_t* strtarget = strb; strtarget < stre;) {
+				auto dr = unicode::utf32_to_code_point(strtarget, stre);
+				if (dr.error != unicode::error_code::ok) {
+					cp = unicode::unicode_detail::replacement;
+				}
+				else {
+					cp = dr.codepoint;
+				}
+				auto er = unicode::code_point_to_utf8(cp);
+				const char* data = er.code_units.data();
+				std::memcpy(target, data, er.code_units_size);
+				target += er.code_units_size;
+				strtarget = dr.next;
+			}
+			return stack::push(L, start, target);
+		}
+
+		static int push(lua_State* L, const char32_t* u32str) {
+			return push(L, u32str, u32str + std::char_traits<char32_t>::length(u32str));
+		}
+
+		static int push(lua_State* L, const char32_t* u32str, std::size_t sz) {
+			return push(L, u32str, u32str + sz);
+		}
+
+		static int push(lua_State* L, const char32_t* strb, const char32_t* stre) {
+			char sbo[SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_];
+			// if our max string space is small enough, use SBO
+			// right off the bat
+			std::size_t max_possible_code_units = static_cast<std::size_t>(static_cast<std::size_t>(stre - strb) * static_cast<std::size_t>(4));
+			if (max_possible_code_units <= SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_) {
+				return convert_into(L, sbo, max_possible_code_units, strb, stre);
+			}
+			// otherwise, we must manually count/check size
+			std::size_t needed_size = 0;
+			for (const char32_t* strtarget = strb; strtarget < stre;) {
+				auto dr = unicode::utf32_to_code_point(strtarget, stre);
+				auto er = unicode::code_point_to_utf8(dr.codepoint);
+				needed_size += er.code_units_size;
+				strtarget = dr.next;
+			}
+			if (needed_size < SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_) {
+				return convert_into(L, sbo, needed_size, strb, stre);
+			}
+			std::string u8str("", 0);
+			u8str.resize(needed_size);
+			char* target = const_cast<char*>(u8str.data());
+			return convert_into(L, target, needed_size, strb, stre);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char32_t*> {
+		static int push(lua_State* L, const char32_t* str) {
+			unqualified_pusher<const char32_t*> p {};
+			(void)p;
+			return p.push(L, str);
+		}
+
+		static int push(lua_State* L, const char32_t* strb, const char32_t* stre) {
+			unqualified_pusher<const char32_t*> p {};
+			(void)p;
+			return p.push(L, strb, stre);
+		}
+
+		static int push(lua_State* L, const char32_t* str, std::size_t len) {
+			unqualified_pusher<const char32_t*> p {};
+			(void)p;
+			return p.push(L, str, len);
+		}
+	};
+
+	template <size_t N>
+	struct unqualified_pusher<wchar_t[N]> {
+		static int push(lua_State* L, const wchar_t (&str)[N]) {
+			return push(L, str, std::char_traits<wchar_t>::length(str));
+		}
+
+		static int push(lua_State* L, const wchar_t (&str)[N], std::size_t sz) {
+			const wchar_t* str_ptr = static_cast<const wchar_t*>(str);
+			return stack::push<const wchar_t*>(L, str_ptr, str_ptr + sz);
+		}
+	};
+
+	template <size_t N>
+	struct unqualified_pusher<char16_t[N]> {
+		static int push(lua_State* L, const char16_t (&str)[N]) {
+			return push(L, str, std::char_traits<char16_t>::length(str));
+		}
+
+		static int push(lua_State* L, const char16_t (&str)[N], std::size_t sz) {
+			const char16_t* str_ptr = static_cast<const char16_t*>(str);
+			return stack::push<const char16_t*>(L, str_ptr, str_ptr + sz);
+		}
+	};
+
+	template <size_t N>
+	struct unqualified_pusher<char32_t[N]> {
+		static int push(lua_State* L, const char32_t (&str)[N]) {
+			return push(L, str, std::char_traits<char32_t>::length(str));
+		}
+
+		static int push(lua_State* L, const char32_t (&str)[N], std::size_t sz) {
+			const char32_t* str_ptr = static_cast<const char32_t*>(str);
+			return stack::push<const char32_t*>(L, str_ptr, str_ptr + sz);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<wchar_t> {
+		static int push(lua_State* L, wchar_t c) {
+			const wchar_t str[2] = { c, '\0' };
+			return stack::push(L, static_cast<const wchar_t*>(str), 1u);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char16_t> {
+		static int push(lua_State* L, char16_t c) {
+			const char16_t str[2] = { c, '\0' };
+			return stack::push(L, static_cast<const char16_t*>(str), 1u);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<char32_t> {
+		static int push(lua_State* L, char32_t c) {
+			const char32_t str[2] = { c, '\0' };
+			return stack::push(L, static_cast<const char32_t*>(str), 1u);
+		}
+	};
+
+	template <typename... Args>
+	struct unqualified_pusher<std::tuple<Args...>> {
+		template <std::size_t... I, typename T>
+		static int push(std::index_sequence<I...>, lua_State* L, T&& t) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, static_cast<int>(sizeof...(I)), detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			int pushcount = 0;
+			(void)detail::swallow { 0, (pushcount += stack::push(L, std::get<I>(std::forward<T>(t))), 0)... };
+			return pushcount;
+		}
+
+		template <typename T>
+		static int push(lua_State* L, T&& t) {
+			return push(std::index_sequence_for<Args...>(), L, std::forward<T>(t));
+		}
+	};
+
+	template <typename A, typename B>
+	struct unqualified_pusher<std::pair<A, B>> {
+		template <typename T>
+		static int push(lua_State* L, T&& t) {
+			int pushcount = stack::push(L, std::get<0>(std::forward<T>(t)));
+			pushcount += stack::push(L, std::get<1>(std::forward<T>(t)));
+			return pushcount;
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<T, std::enable_if_t<meta::is_optional_v<T>>> {
+		using ValueType = typename meta::unqualified_t<T>::value_type;
+
+		template <typename Optional>
+		static int push(lua_State* L, Optional&& op) {
+			using QualifiedValueType = meta::conditional_t<std::is_lvalue_reference_v<Optional>, ValueType&, ValueType&&>;
+			if (!op) {
+				return stack::push(L, nullopt);
+			}
+			return stack::push(L, static_cast<QualifiedValueType>(op.value()));
+		}
+	};
+
+	template <typename T>
+	struct unqualified_pusher<forward_as_value_t<T>> {
+		static int push(lua_State* L, const forward_as_value_t<T>& value_) {
+			return stack::push<T>(L, value_.value());
+		}
+
+		static int push(lua_State* L, forward_as_value_t<T>&& value_) {
+			return stack::push<T>(L, std::move(value_).value());
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<nullopt_t> {
+		static int push(lua_State* L, nullopt_t) noexcept {
+			return stack::push(L, lua_nil);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<std::nullptr_t> {
+		static int push(lua_State* L, std::nullptr_t) noexcept {
+			return stack::push(L, lua_nil);
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<this_state> {
+		static int push(lua_State*, const this_state&) noexcept {
+			return 0;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<this_main_state> {
+		static int push(lua_State*, const this_main_state&) noexcept {
+			return 0;
+		}
+	};
+
+	template <>
+	struct unqualified_pusher<new_table> {
+		static int push(lua_State* L, const new_table& nt) {
+			lua_createtable(L, nt.sequence_hint, nt.map_hint);
+			return 1;
+		}
+	};
+
+	template <typename Allocator>
+	struct unqualified_pusher<basic_bytecode<Allocator>> {
+		template <typename T>
+		static int push(lua_State* L, T&& bc, const char* bytecode_name) {
+			const auto first = bc.data();
+			const auto bcsize = bc.size();
+			// pushes either the function, or an error
+			// if it errors, shit goes south, and people can test that upstream
+			(void)luaL_loadbuffer(
+				L, reinterpret_cast<const char*>(first), static_cast<std::size_t>(bcsize * (sizeof(*first) / sizeof(const char))), bytecode_name);
+			return 1;
+		}
+
+		template <typename T>
+		static int push(lua_State* L, T&& bc) {
+			return push(L, std::forward<bc>(bc), "bytecode");
+		}
+	};
+
+#if SOL_IS_ON(SOL_STD_VARIANT)
+	namespace stack_detail {
+
+		struct push_function {
+			lua_State* L;
+
+			push_function(lua_State* L_) noexcept : L(L_) {
+			}
+
+			template <typename T>
+			int operator()(T&& value) const {
+				return stack::push<T>(L, std::forward<T>(value));
+			}
+		};
+
+	} // namespace stack_detail
+
+	template <typename... Tn>
+	struct unqualified_pusher<std::variant<Tn...>> {
+		static int push(lua_State* L, const std::variant<Tn...>& v) {
+			return std::visit(stack_detail::push_function(L), v);
+		}
+
+		static int push(lua_State* L, std::variant<Tn...>&& v) {
+			return std::visit(stack_detail::push_function(L), std::move(v));
+		}
+	};
+#endif // Variant because Clang is terrible
+
+}} // namespace sol::stack
+
+// end of sol/stack_push.hpp
+
+// beginning of sol/stack_pop.hpp
+
+#include <utility>
+#include <tuple>
+
+namespace sol { namespace stack {
+	template <typename T, typename>
+	struct popper {
+		inline static decltype(auto) pop(lua_State* L) {
+			if constexpr (is_stack_based_v<meta::unqualified_t<T>>) {
+				static_assert(!is_stack_based_v<meta::unqualified_t<T>>,
+					"You cannot pop something that lives solely on the stack: it will not remain on the stack when popped and thusly will go out of "
+					"scope!");
+			}
+			else {
+				record tracking {};
+				decltype(auto) r = get<T>(L, -lua_size<T>::value, tracking);
+				lua_pop(L, tracking.used);
+				return r;
+			}
+		}
+	};
+}} // namespace sol::stack
+
+// end of sol/stack_pop.hpp
+
+// beginning of sol/stack_field.hpp
+
+namespace sol { namespace stack {
+
+	namespace stack_detail {
+		template <typename T, bool global, bool raw>
+		inline constexpr bool is_get_direct_tableless_v = (global && !raw && meta::is_c_str_or_string_v<T>);
+
+		template <typename T, bool global, bool raw>
+		inline constexpr bool is_get_direct_v = (is_get_direct_tableless_v<T, global, raw>) // cf-hack
+			|| (!global && !raw && (meta::is_c_str_or_string_v<T> || meta::is_string_of_v<T, char>)) // cf-hack
+			|| (!global && raw && (std::is_integral_v<T> && !std::is_same_v<T, bool>))
+#if SOL_LUA_VERSION_I_ >= 503
+			|| (!global && !raw && (std::is_integral_v<T> && !std::is_same_v<T, bool>))
+#endif // integer keys 5.3 or better
+#if SOL_LUA_VERSION_I_ >= 502
+			|| (!global && raw && std::is_pointer_v<T> && std::is_void_v<std::remove_pointer_t<T>>)
+#endif // void pointer keys 5.2 or better
+			;
+
+		template <typename T, bool global, bool raw>
+		inline constexpr bool is_set_direct_tableless_v = (global && !raw && meta::is_c_str_or_string_v<T>);
+
+		template <typename T, bool global, bool raw>
+		inline constexpr bool is_set_direct_v = (is_set_direct_tableless_v<T, global, raw>) // cf-hack
+			|| (!global && !raw && (meta::is_c_str_or_string_v<T> || meta::is_string_of_v<T, char>)) // cf-hack
+			|| (!global && raw && (std::is_integral_v<T> && !std::is_same_v<T, bool>))     // cf-hack
+#if SOL_LUA_VERSION_I_ >= 503
+			|| (!global && !raw && (std::is_integral_v<T> && !std::is_same_v<T, bool>))
+#endif // integer keys 5.3 or better
+#if SOL_LUA_VERSION_I_ >= 502
+			|| (!global && raw && (std::is_pointer_v<T> && std::is_void_v<std::remove_pointer_t<T>>))
+#endif // void pointer keys 5.2 or better
+			;
+	} // namespace stack_detail
+
+	template <typename T, bool global, bool raw, typename>
+	struct field_getter {
+		static inline constexpr int default_table_index
+			= meta::conditional_t<stack_detail::is_get_direct_v<T, global, raw>, std::integral_constant<int, -1>, std::integral_constant<int, -2>>::value;
+
+		template <typename Key>
+		void get(lua_State* L, Key&& key, int tableindex = default_table_index) {
+			if constexpr (std::is_same_v<T, update_if_empty_t> || std::is_same_v<T, override_value_t> || std::is_same_v<T, create_if_nil_t>) {
+				(void)L;
+				(void)key;
+				(void)tableindex;
+			}
+			else if constexpr (std::is_same_v<T, env_key_t>) {
+				(void)key;
+#if SOL_LUA_VERSION_I_ < 502
+				// Use lua_setfenv
+				lua_getfenv(L, tableindex);
+#else
+				// Use upvalues as explained in Lua 5.2 and beyond's manual
+				if (lua_getupvalue(L, tableindex, 1) == nullptr) {
+					push(L, lua_nil);
+				}
+#endif
+			}
+			else if constexpr (std::is_same_v<T, metatable_key_t>) {
+				(void)key;
+				if (lua_getmetatable(L, tableindex) == 0)
+					push(L, lua_nil);
+			}
+			else if constexpr (raw) {
+				if constexpr (std::is_integral_v<T> && !std::is_same_v<bool, T>) {
+					lua_rawgeti(L, tableindex, static_cast<lua_Integer>(key));
+				}
+#if SOL_LUA_VERSION_I_ >= 502
+				else if constexpr (std::is_pointer_v<T> && std::is_void_v<std::remove_pointer_t<T>>) {
+					lua_rawgetp(L, tableindex, key);
+				}
+#endif // Lua 5.2.x+
+				else {
+					push(L, std::forward<Key>(key));
+					lua_rawget(L, tableindex);
+				}
+			}
+			else {
+				if constexpr (meta::is_c_str_or_string_v<T>) {
+					if constexpr (global) {
+						(void)tableindex;
+						lua_getglobal(L, &key[0]);
+					}
+					else {
+						lua_getfield(L, tableindex, &key[0]);
+					}
+				}
+				else if constexpr (std::is_same_v<T, meta_function>) {
+					const auto& real_key = to_string(key);
+					lua_getfield(L, tableindex, &real_key[0]);
+				}
+#if SOL_LUA_VERSION_I_ >= 503
+				else if constexpr (std::is_integral_v<T> && !std::is_same_v<bool, T>) {
+					lua_geti(L, tableindex, static_cast<lua_Integer>(key));
+				}
+#endif // Lua 5.3.x+
+				else {
+					push(L, std::forward<Key>(key));
+					lua_gettable(L, tableindex);
+				}
+			}
+		}
+	};
+
+	template <typename... Args, bool b, bool raw, typename C>
+	struct field_getter<std::tuple<Args...>, b, raw, C> {
+		template <std::size_t... I, typename Keys>
+		void apply(std::index_sequence<0, I...>, lua_State* L, Keys&& keys, int tableindex) {
+			get_field<b, raw>(L, std::get<0>(std::forward<Keys>(keys)), tableindex);
+			void(detail::swallow { (get_field<false, raw>(L, std::get<I>(std::forward<Keys>(keys))), 0)... });
+			reference saved(L, -1);
+			lua_pop(L, static_cast<int>(sizeof...(I)));
+			saved.push();
+		}
+
+		template <typename Keys>
+		void get(lua_State* L, Keys&& keys) {
+			apply(std::make_index_sequence<sizeof...(Args)>(), L, std::forward<Keys>(keys), lua_absindex(L, -1));
+		}
+
+		template <typename Keys>
+		void get(lua_State* L, Keys&& keys, int tableindex) {
+			apply(std::make_index_sequence<sizeof...(Args)>(), L, std::forward<Keys>(keys), tableindex);
+		}
+	};
+
+	template <typename A, typename B, bool b, bool raw, typename C>
+	struct field_getter<std::pair<A, B>, b, raw, C> {
+		template <typename Keys>
+		void get(lua_State* L, Keys&& keys, int tableindex) {
+			get_field<b, raw>(L, std::get<0>(std::forward<Keys>(keys)), tableindex);
+			get_field<false, raw>(L, std::get<1>(std::forward<Keys>(keys)));
+			reference saved(L, -1);
+			lua_pop(L, static_cast<int>(2));
+			saved.push();
+		}
+
+		template <typename Keys>
+		void get(lua_State* L, Keys&& keys) {
+			get_field<b, raw>(L, std::get<0>(std::forward<Keys>(keys)));
+			get_field<false, raw>(L, std::get<1>(std::forward<Keys>(keys)));
+			reference saved(L, -1);
+			lua_pop(L, static_cast<int>(2));
+			saved.push();
+		}
+	};
+
+	template <typename T, bool global, bool raw, typename>
+	struct field_setter {
+		static constexpr int default_table_index
+			= meta::conditional_t<stack_detail::is_set_direct_v<T, global, raw>, std::integral_constant<int, -2>, std::integral_constant<int, -3>>::value;
+
+		template <typename Key, typename Value>
+		void set(lua_State* L, Key&& key, Value&& value, int tableindex = default_table_index) {
+			if constexpr (std::is_same_v<T, update_if_empty_t> || std::is_same_v<T, override_value_t>) {
+				(void)L;
+				(void)key;
+				(void)value;
+				(void)tableindex;
+			}
+			else if constexpr (std::is_same_v<T, metatable_key_t>) {
+				(void)key;
+				push(L, std::forward<Value>(value));
+				lua_setmetatable(L, tableindex);
+			}
+			else if constexpr (raw) {
+				if constexpr (std::is_integral_v<T> && !std::is_same_v<bool, T>) {
+					push(L, std::forward<Value>(value));
+					lua_rawseti(L, tableindex, static_cast<lua_Integer>(key));
+				}
+#if SOL_LUA_VERSION_I_ >= 502
+				else if constexpr (std::is_pointer_v<T> && std::is_void_v<std::remove_pointer_t<T>>) {
+					push(L, std::forward<Value>(value));
+					lua_rawsetp(L, tableindex, std::forward<Key>(key));
+				}
+#endif // Lua 5.2.x
+				else {
+					push(L, std::forward<Key>(key));
+					push(L, std::forward<Value>(value));
+					lua_rawset(L, tableindex);
+				}
+			}
+			else {
+				if constexpr (meta::is_c_str_or_string_v<T>) {
+					if constexpr (global) {
+						push(L, std::forward<Value>(value));
+						lua_setglobal(L, &key[0]);
+						(void)tableindex;
+					}
+					else {
+						push(L, std::forward<Value>(value));
+						lua_setfield(L, tableindex, &key[0]);
+					}
+				}
+#if SOL_LUA_VERSION_I_ >= 503
+				else if constexpr (std::is_integral_v<T> && !std::is_same_v<bool, T>) {
+					push(L, std::forward<Value>(value));
+					lua_seti(L, tableindex, static_cast<lua_Integer>(key));
+				}
+#endif // Lua 5.3.x
+				else {
+					push(L, std::forward<Key>(key));
+					push(L, std::forward<Value>(value));
+					lua_settable(L, tableindex);
+				}
+			}
+		}
+	};
+
+	template <typename... Args, bool b, bool raw, typename C>
+	struct field_setter<std::tuple<Args...>, b, raw, C> {
+		template <bool g, std::size_t I, typename Keys, typename Value>
+		void apply(std::index_sequence<I>, lua_State* L, Keys&& keys, Value&& value, int tableindex) {
+			I < 1 ? set_field<g, raw>(L, std::get<I>(std::forward<Keys>(keys)), std::forward<Value>(value), tableindex)
+				 : set_field<g, raw>(L, std::get<I>(std::forward<Keys>(keys)), std::forward<Value>(value));
+		}
+
+		template <bool g, std::size_t I0, std::size_t I1, std::size_t... I, typename Keys, typename Value>
+		void apply(std::index_sequence<I0, I1, I...>, lua_State* L, Keys&& keys, Value&& value, int tableindex) {
+			I0 < 1 ? get_field<g, raw>(L, std::get<I0>(std::forward<Keys>(keys)), tableindex)
+				  : get_field<g, raw>(L, std::get<I0>(std::forward<Keys>(keys)), -1);
+			apply<false>(std::index_sequence<I1, I...>(), L, std::forward<Keys>(keys), std::forward<Value>(value), -1);
+		}
+
+		template <bool g, std::size_t I0, std::size_t... I, typename Keys, typename Value>
+		void top_apply(std::index_sequence<I0, I...>, lua_State* L, Keys&& keys, Value&& value, int tableindex) {
+			apply<g>(std::index_sequence<I0, I...>(), L, std::forward<Keys>(keys), std::forward<Value>(value), tableindex);
+			lua_pop(L, static_cast<int>(sizeof...(I)));
+		}
+
+		template <typename Keys, typename Value>
+		void set(lua_State* L, Keys&& keys, Value&& value, int tableindex = -3) {
+			top_apply<b>(std::make_index_sequence<sizeof...(Args)>(), L, std::forward<Keys>(keys), std::forward<Value>(value), tableindex);
+		}
+	};
+
+	template <typename A, typename B, bool b, bool raw, typename C>
+	struct field_setter<std::pair<A, B>, b, raw, C> {
+		template <typename Keys, typename Value>
+		void set(lua_State* L, Keys&& keys, Value&& value, int tableindex = -1) {
+			get_field<b, raw>(L, std::get<0>(std::forward<Keys>(keys)), tableindex);
+			set_field<false, raw>(L, std::get<1>(std::forward<Keys>(keys)), std::forward<Value>(value), lua_gettop(L));
+			lua_pop(L, 1);
+		}
+	};
+}} // namespace sol::stack
+
+// end of sol/stack_field.hpp
+
+// beginning of sol/stack_probe.hpp
+
+namespace sol { namespace stack {
+	template <typename T, typename P, bool b, bool raw, typename>
+	struct probe_field_getter {
+		template <typename Key>
+		probe get(lua_State* L, Key&& key, int tableindex = -2) {
+			if constexpr (!b) {
+				if (!maybe_indexable(L, tableindex)) {
+					return probe(false, 0);
+				}
+			}
+			get_field<b, raw>(L, std::forward<Key>(key), tableindex);
+			return probe(check<P>(L), 1);
+		}
+	};
+
+	template <typename A, typename B, typename P, bool b, bool raw, typename C>
+	struct probe_field_getter<std::pair<A, B>, P, b, raw, C> {
+		template <typename Keys>
+		probe get(lua_State* L, Keys&& keys, int tableindex = -2) {
+			if (!b && !maybe_indexable(L, tableindex)) {
+				return probe(false, 0);
+			}
+			get_field<b, raw>(L, std::get<0>(keys), tableindex);
+			if (!maybe_indexable(L)) {
+				return probe(false, 1);
+			}
+			get_field<false, raw>(L, std::get<1>(keys), tableindex);
+			return probe(check<P>(L), 2);
+		}
+	};
+
+	template <typename... Args, typename P, bool b, bool raw, typename C>
+	struct probe_field_getter<std::tuple<Args...>, P, b, raw, C> {
+		template <std::size_t I, typename Keys>
+		probe apply(std::index_sequence<I>, int sofar, lua_State* L, Keys&& keys, int tableindex) {
+			get_field<(I < 1) && b, raw>(L, std::get<I>(keys), tableindex);
+			return probe(check<P>(L), sofar);
+		}
+
+		template <std::size_t I, std::size_t I1, std::size_t... In, typename Keys>
+		probe apply(std::index_sequence<I, I1, In...>, int sofar, lua_State* L, Keys&& keys, int tableindex) {
+			get_field < I<1 && b, raw>(L, std::get<I>(keys), tableindex);
+			if (!maybe_indexable(L)) {
+				return probe(false, sofar);
+			}
+			return apply(std::index_sequence<I1, In...>(), sofar + 1, L, std::forward<Keys>(keys), -1);
+		}
+
+		template <typename Keys>
+		probe get(lua_State* L, Keys&& keys, int tableindex = -2) {
+			if constexpr (!b) {
+				if (!maybe_indexable(L, tableindex)) {
+					return probe(false, 0);
+				}
+				return apply(std::index_sequence_for<Args...>(), 1, L, std::forward<Keys>(keys), tableindex);
+			}
+			else {
+				return apply(std::index_sequence_for<Args...>(), 1, L, std::forward<Keys>(keys), tableindex);
+			}
+		}
+	};
+}} // namespace sol::stack
+
+// end of sol/stack_probe.hpp
+
+#include <cstring>
+#include <array>
+
+namespace sol {
+	namespace detail {
+		using typical_chunk_name_t = char[SOL_ID_SIZE_I_];
+		using typical_file_chunk_name_t = char[SOL_FILE_ID_SIZE_I_];
+
+		inline const std::string& default_chunk_name() {
+			static const std::string name = "";
+			return name;
+		}
+
+		template <std::size_t N>
+		const char* make_chunk_name(const string_view& code, const std::string& chunkname, char (&basechunkname)[N]) {
+			if (chunkname.empty()) {
+				auto it = code.cbegin();
+				auto e = code.cend();
+				std::size_t i = 0;
+				static const std::size_t n = N - 4;
+				for (i = 0; i < n && it != e; ++i, ++it) {
+					basechunkname[i] = *it;
+				}
+				if (it != e) {
+					for (std::size_t c = 0; c < 3; ++i, ++c) {
+						basechunkname[i] = '.';
+					}
+				}
+				basechunkname[i] = '\0';
+				return &basechunkname[0];
+			}
+			else {
+				return chunkname.c_str();
+			}
+		}
+
+		inline void clear_entries(stack_reference r) {
+			stack::push(r.lua_state(), lua_nil);
+			while (lua_next(r.lua_state(), -2)) {
+				absolute_index key(r.lua_state(), -2);
+				auto pn = stack::pop_n(r.lua_state(), 1);
+				stack::set_field<false, true>(r.lua_state(), key, lua_nil, r.stack_index());
+			}
+		}
+
+		inline void clear_entries(const reference& registry_reference) {
+			auto pp = stack::push_pop(registry_reference);
+			stack_reference ref(registry_reference.lua_state(), -1);
+			clear_entries(ref);
+		}
+	} // namespace detail
+
+	namespace stack {
+		namespace stack_detail {
+			template <typename T>
+			inline int push_as_upvalues(lua_State* L, T& item) {
+				typedef std::decay_t<T> TValue;
+				static const std::size_t itemsize = sizeof(TValue);
+				static const std::size_t voidsize = sizeof(void*);
+				static const std::size_t voidsizem1 = voidsize - 1;
+				static const std::size_t data_t_count = (sizeof(TValue) + voidsizem1) / voidsize;
+				typedef std::array<void*, data_t_count> data_t;
+
+				data_t data { {} };
+				std::memcpy(&data[0], std::addressof(item), itemsize);
+				int pushcount = 0;
+				for (const auto& v : data) {
+					lua_pushlightuserdata(L, v);
+					pushcount += 1;
+				}
+				return pushcount;
+			}
+
+			template <typename T>
+			inline std::pair<T, int> get_as_upvalues(lua_State* L, int index = 2) {
+				static const std::size_t data_t_count = (sizeof(T) + (sizeof(void*) - 1)) / sizeof(void*);
+				typedef std::array<void*, data_t_count> data_t;
+				data_t voiddata { {} };
+				for (std::size_t i = 0, d = 0; d < sizeof(T); ++i, d += sizeof(void*)) {
+					voiddata[i] = lua_touserdata(L, upvalue_index(index++));
+				}
+				return std::pair<T, int>(*reinterpret_cast<T*>(static_cast<void*>(voiddata.data())), index);
+			}
+
+			template <typename T>
+			inline std::pair<T, int> get_as_upvalues_using_function(lua_State* L, int function_index = -1) {
+				static const std::size_t data_t_count = (sizeof(T) + (sizeof(void*) - 1)) / sizeof(void*);
+				typedef std::array<void*, data_t_count> data_t;
+				function_index = lua_absindex(L, function_index);
+				int index = 0;
+				data_t voiddata { {} };
+				for (std::size_t d = 0; d < sizeof(T); d += sizeof(void*)) {
+					// first upvalue is nullptr to respect environment shenanigans
+					// So +2 instead of +1
+					const char* upvalue_name = lua_getupvalue(L, function_index, index + 2);
+					if (upvalue_name == nullptr) {
+						// We should freak out here...
+						break;
+					}
+					voiddata[index] = lua_touserdata(L, -1);
+					++index;
+				}
+				lua_pop(L, index);
+				return std::pair<T, int>(*reinterpret_cast<T*>(static_cast<void*>(voiddata.data())), index);
+			}
+
+			template <bool checked, typename Handler, typename Fx, typename... Args>
+			static decltype(auto) eval(types<>, std::index_sequence<>, lua_State*, int, Handler&&, record&, Fx&& fx, Args&&... args) {
+				return std::forward<Fx>(fx)(std::forward<Args>(args)...);
+			}
+
+			template <bool checked, typename Arg, typename... Args, std::size_t I, std::size_t... Is, typename Handler, typename Fx, typename... FxArgs>
+			static decltype(auto) eval(types<Arg, Args...>, std::index_sequence<I, Is...>, lua_State* L_, int start_index_, Handler&& handler_,
+			     record& tracking_, Fx&& fx_, FxArgs&&... fxargs_) {
+#if 0 && SOL_IS_ON(SOL_PROPAGATE_EXCEPTIONS)
+				// NOTE: THIS IS TERMPORARILY TURNED OFF BECAUSE IT IMPACTS ACTUAL SEMANTICS W.R.T. THINGS LIKE LUAJIT,
+				// SO IT MUST REMAIN OFF UNTIL WE CAN ESTABLISH SIMILAR BEHAVIOR IN MODES WHERE `checked == false`!
+
+				// We can save performance/time by letting errors unwind produced arguments
+				// rather than checking everything once, and then potentially re-doing work
+				if constexpr (checked) {
+					return eval<checked>(types<Args...>(),
+					     std::index_sequence<Is...>(),
+					     L_,
+					     start_index_,
+					     std::forward<Handler>(handler_),
+					     tracking_,
+					     std::forward<Fx>(fx_),
+					     std::forward<FxArgs>(fxargs_)...,
+					     *stack_detail::check_get_arg<Arg>(L_, start_index_ + tracking_.used, handler_, tracking_));
+				}
+				else
+#endif
+				{
+					return eval<checked>(types<Args...>(),
+					     std::index_sequence<Is...>(),
+					     L_,
+					     start_index_,
+					     std::forward<Handler>(handler_),
+					     tracking_,
+					     std::forward<Fx>(fx_),
+					     std::forward<FxArgs>(fxargs_)...,
+					     stack_detail::unchecked_get_arg<Arg>(L_, start_index_ + tracking_.used, tracking_));
+				}
+			}
+
+			template <bool checkargs = detail::default_safe_function_calls, std::size_t... I, typename R, typename... Args, typename Fx, typename... FxArgs>
+			inline decltype(auto) call(types<R>, types<Args...> argument_types_, std::index_sequence<I...> argument_indices_, lua_State* L_,
+			     int start_index_, Fx&& fx_, FxArgs&&... args_) {
+				static_assert(meta::all_v<meta::is_not_move_only<Args>...>,
+				     "One of the arguments being bound is a move-only type, and it is not being taken by reference: this will break your code. Please take "
+				     "a reference and std::move it manually if this was your intention.");
+				argument_handler<types<R, Args...>> handler {};
+				record tracking {};
+#if SOL_IS_OFF(SOL_PROPAGATE_EXCEPTIONS)
+				if constexpr (checkargs) {
+					multi_check<Args...>(L_, start_index_, handler);
+				}
+#endif
+				if constexpr (std::is_void_v<R>) {
+					eval<checkargs>(
+					     argument_types_, argument_indices_, L_, start_index_, handler, tracking, std::forward<Fx>(fx_), std::forward<FxArgs>(args_)...);
+				}
+				else {
+					return eval<checkargs>(
+					     argument_types_, argument_indices_, L_, start_index_, handler, tracking, std::forward<Fx>(fx_), std::forward<FxArgs>(args_)...);
+				}
+			}
+
+			template <typename T>
+			void raw_table_set(lua_State* L, T&& arg, int tableindex = -2) {
+				int push_count = push(L, std::forward<T>(arg));
+				SOL_ASSERT(push_count == 1);
+				std::size_t unique_index = static_cast<std::size_t>(luaL_len(L, tableindex) + 1u);
+				lua_rawseti(L, tableindex, static_cast<int>(unique_index));
+			}
+
+		} // namespace stack_detail
+
+		template <typename T>
+		int set_ref(lua_State* L, T&& arg, int tableindex = -2) {
+			int push_count = push(L, std::forward<T>(arg));
+			SOL_ASSERT(push_count == 1);
+			return luaL_ref(L, tableindex);
+		}
+
+		template <bool check_args = detail::default_safe_function_calls, typename R, typename... Args, typename Fx, typename... FxArgs>
+		inline decltype(auto) call(types<R> tr, types<Args...> ta, lua_State* L, int start, Fx&& fx, FxArgs&&... args) {
+			using args_indices = std::make_index_sequence<sizeof...(Args)>;
+			if constexpr (std::is_void_v<R>) {
+				stack_detail::call<check_args>(tr, ta, args_indices(), L, start, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+			}
+			else {
+				return stack_detail::call<check_args>(tr, ta, args_indices(), L, start, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+			}
+		}
+
+		template <bool check_args = detail::default_safe_function_calls, typename R, typename... Args, typename Fx, typename... FxArgs>
+		inline decltype(auto) call(types<R> tr, types<Args...> ta, lua_State* L, Fx&& fx, FxArgs&&... args) {
+			if constexpr (std::is_void_v<R>) {
+				call<check_args>(tr, ta, L, 1, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+			}
+			else {
+				return call<check_args>(tr, ta, L, 1, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+			}
+		}
+
+		template <bool check_args = detail::default_safe_function_calls, typename R, typename... Args, typename Fx, typename... FxArgs>
+		inline decltype(auto) call_from_top(types<R> tr, types<Args...> ta, lua_State* L, Fx&& fx, FxArgs&&... args) {
+			using expected_count_t = meta::count_for_pack<lua_size, Args...>;
+			if constexpr (std::is_void_v<R>) {
+				call<check_args>(tr,
+				     ta,
+				     L,
+				     (std::max)(static_cast<int>(lua_gettop(L) - expected_count_t::value), static_cast<int>(0)),
+				     std::forward<Fx>(fx),
+				     std::forward<FxArgs>(args)...);
+			}
+			else {
+				return call<check_args>(tr,
+				     ta,
+				     L,
+				     (std::max)(static_cast<int>(lua_gettop(L) - expected_count_t::value), static_cast<int>(0)),
+				     std::forward<Fx>(fx),
+				     std::forward<FxArgs>(args)...);
+			}
+		}
+
+		template <bool check_args = detail::default_safe_function_calls, bool clean_stack = true, typename Ret0, typename... Ret, typename... Args,
+		     typename Fx, typename... FxArgs>
+		inline int call_into_lua(types<Ret0, Ret...> tr, types<Args...> ta, lua_State* L, int start, Fx&& fx, FxArgs&&... fxargs) {
+			if constexpr (std::is_void_v<Ret0>) {
+				call<check_args>(tr, ta, L, start, std::forward<Fx>(fx), std::forward<FxArgs>(fxargs)...);
+				if constexpr (clean_stack) {
+					lua_settop(L, 0);
+				}
+				return 0;
+			}
+			else {
+				(void)tr;
+				decltype(auto) r
+				     = call<check_args>(types<meta::return_type_t<Ret0, Ret...>>(), ta, L, start, std::forward<Fx>(fx), std::forward<FxArgs>(fxargs)...);
+				using R = meta::unqualified_t<decltype(r)>;
+				using is_stack = meta::any<is_stack_based<R>, std::is_same<R, absolute_index>, std::is_same<R, ref_index>, std::is_same<R, raw_index>>;
+				if constexpr (clean_stack && !is_stack::value) {
+					lua_settop(L, 0);
+				}
+				return push_reference(L, std::forward<decltype(r)>(r));
+			}
+		}
+
+		template <bool check_args = detail::default_safe_function_calls, bool clean_stack = true, typename Fx, typename... FxArgs>
+		inline int call_lua(lua_State* L, int start, Fx&& fx, FxArgs&&... fxargs) {
+			using traits_type = lua_bind_traits<meta::unqualified_t<Fx>>;
+			using args_list = typename traits_type::args_list;
+			using returns_list = typename traits_type::returns_list;
+			return call_into_lua<check_args, clean_stack>(returns_list(), args_list(), L, start, std::forward<Fx>(fx), std::forward<FxArgs>(fxargs)...);
+		}
+
+		inline call_syntax get_call_syntax(lua_State* L, const string_view& key, int index) {
+			if (lua_gettop(L) < 1) {
+				return call_syntax::dot;
+			}
+			luaL_getmetatable(L, key.data());
+			auto pn = pop_n(L, 1);
+			if (lua_compare(L, -1, index, LUA_OPEQ) != 1) {
+				return call_syntax::dot;
+			}
+			return call_syntax::colon;
+		}
+
+		inline void script(
+		     lua_State* L, lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
+			if (lua_load(L, reader, data, chunknametarget, to_string(mode).c_str()) || lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+		}
+
+		inline void script(
+		     lua_State* L, const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
+			if (luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str()) || lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+		}
+
+		inline void script_file(lua_State* L, const std::string& filename, load_mode mode = load_mode::any) {
+			if (luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str()) || lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+		}
+
+		inline void luajit_exception_handler(lua_State* L, int (*handler)(lua_State*, lua_CFunction) = detail::c_trampoline) {
+#if SOL_IS_ON(SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE)
+			if (L == nullptr) {
+				return;
+			}
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushlightuserdata(L, (void*)handler);
+			auto pn = pop_n(L, 1);
+			luaJIT_setmode(L, -1, LUAJIT_MODE_WRAPCFUNC | LUAJIT_MODE_ON);
+#else
+			(void)L;
+			(void)handler;
+#endif
+		}
+
+		inline void luajit_exception_off(lua_State* L) {
+#if SOL_IS_ON(SOL_USE_LUAJIT_EXCEPTION_TRAMPOLINE)
+			if (L == nullptr) {
+				return;
+			}
+			luaJIT_setmode(L, -1, LUAJIT_MODE_WRAPCFUNC | LUAJIT_MODE_OFF);
+#else
+			(void)L;
+#endif
+		}
+	} // namespace stack
+} // namespace sol
+
+// end of sol/stack.hpp
+
+// beginning of sol/object.hpp
+
+// beginning of sol/make_reference.hpp
+
+namespace sol {
+
+	template <typename R = reference, bool should_pop = !is_stack_based_v<R>, typename T>
+	R make_reference(lua_State* L, T&& value) {
+		int backpedal = stack::push(L, std::forward<T>(value));
+		R r = stack::get<R>(L, -backpedal);
+		if (should_pop) {
+			lua_pop(L, backpedal);
+		}
+		return r;
+	}
+
+	template <typename T, typename R = reference, bool should_pop = !is_stack_based_v<R>, typename... Args>
+	R make_reference(lua_State* L, Args&&... args) {
+		int backpedal = stack::push<T>(L, std::forward<Args>(args)...);
+		R r = stack::get<R>(L, -backpedal);
+		if (should_pop) {
+			lua_pop(L, backpedal);
+		}
+		return r;
+	}
+
+	template <typename R = reference, bool should_pop = !is_stack_based_v<R>, typename T>
+	R make_reference_userdata(lua_State* L, T&& value) {
+		int backpedal = stack::push_userdata(L, std::forward<T>(value));
+		R r = stack::get<R>(L, -backpedal);
+		if (should_pop) {
+			lua_pop(L, backpedal);
+		}
+		return r;
+	}
+
+	template <typename T, typename R = reference, bool should_pop = !is_stack_based_v<R>, typename... Args>
+	R make_reference_userdata(lua_State* L, Args&&... args) {
+		int backpedal = stack::push_userdata<T>(L, std::forward<Args>(args)...);
+		R r = stack::get<R>(L, -backpedal);
+		if (should_pop) {
+			lua_pop(L, backpedal);
+		}
+		return r;
+	}
+
+} // namespace sol
+
+// end of sol/make_reference.hpp
+
+// beginning of sol/object_base.hpp
+
+namespace sol {
+
+	template <typename ref_t>
+	class basic_object_base : public ref_t {
+	private:
+		using base_t = ref_t;
+
+		template <typename T>
+		decltype(auto) as_stack(std::true_type) const {
+			return stack::get<T>(base_t::lua_state(), base_t::stack_index());
+		}
+
+		template <typename T>
+		decltype(auto) as_stack(std::false_type) const {
+			base_t::push();
+			return stack::pop<T>(base_t::lua_state());
+		}
+
+		template <typename T>
+		bool is_stack(std::true_type) const {
+			return stack::check<T>(base_t::lua_state(), base_t::stack_index(), &no_panic);
+		}
+
+		template <typename T>
+		bool is_stack(std::false_type) const {
+			int r = base_t::registry_index();
+			if (r == LUA_REFNIL)
+				return meta::any_same<meta::unqualified_t<T>, lua_nil_t, nullopt_t, std::nullptr_t>::value ? true : false;
+			if (r == LUA_NOREF)
+				return false;
+			auto pp = stack::push_pop(*this);
+			return stack::check<T>(base_t::lua_state(), -1, &no_panic);
+		}
+
+	public:
+		basic_object_base() noexcept = default;
+		basic_object_base(const basic_object_base&) = default;
+		basic_object_base(basic_object_base&&) = default;
+		basic_object_base& operator=(const basic_object_base&) = default;
+		basic_object_base& operator=(basic_object_base&&) = default;
+		template <typename T, typename... Args, meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_object_base>>> = meta::enabler>
+		basic_object_base(T&& arg, Args&&... args) : base_t(std::forward<T>(arg), std::forward<Args>(args)...) {
+		}
+
+		template <typename T>
+		decltype(auto) as() const {
+			return as_stack<T>(is_stack_based<base_t>());
+		}
+
+		template <typename T>
+		bool is() const {
+			return is_stack<T>(is_stack_based<base_t>());
+		}
+	};
+} // namespace sol
+
+// end of sol/object_base.hpp
+
+namespace sol {
+
+	template <typename base_type>
+	class basic_object : public basic_object_base<base_type> {
+	private:
+		typedef basic_object_base<base_type> base_t;
+
+		template <bool invert_and_pop = false>
+		basic_object(std::integral_constant<bool, invert_and_pop>, lua_State* L_, int index_ = -1) noexcept : base_t(L_, index_) {
+			if (invert_and_pop) {
+				lua_pop(L_, -index_);
+			}
+		}
+
+	protected:
+		basic_object(detail::no_safety_tag, lua_nil_t n) : base_t(n) {
+		}
+		basic_object(detail::no_safety_tag, lua_State* L_, int index_) : base_t(L_, index_) {
+		}
+		basic_object(detail::no_safety_tag, lua_State* L_, ref_index index_) : base_t(L_, index_) {
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_object>>, meta::neg<std::is_same<base_type, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_object(detail::no_safety_tag, T&& r) noexcept : base_t(std::forward<T>(r)) {
+		}
+
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_object(detail::no_safety_tag, lua_State* L_, T&& r) noexcept : base_t(L_, std::forward<T>(r)) {
+		}
+
+	public:
+		basic_object() noexcept = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_object>>, meta::neg<std::is_same<base_type, stack_reference>>,
+		          is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_object(T&& r) : base_t(std::forward<T>(r)) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_object(lua_State* L_, T&& r) : base_t(L_, std::forward<T>(r)) {
+		}
+		basic_object(lua_State* L_, global_tag_t t) : base_t(L_, t) {
+		}
+		basic_object(lua_nil_t r) : base_t(r) {
+		}
+		basic_object(const basic_object&) = default;
+		basic_object(basic_object&&) = default;
+		basic_object(const stack_reference& r) noexcept : basic_object(r.lua_state(), r.stack_index()) {
+		}
+		basic_object(stack_reference&& r) noexcept : basic_object(r.lua_state(), r.stack_index()) {
+		}
+		template <typename Super>
+		basic_object(const proxy_base<Super>& r) noexcept : basic_object(r.operator basic_object()) {
+		}
+		template <typename Super>
+		basic_object(proxy_base<Super>&& r) noexcept : basic_object(r.operator basic_object()) {
+		}
+		basic_object(lua_State* L_, lua_nil_t r) noexcept : base_t(L_, r) {
+		}
+		basic_object(lua_State* L_, int index_ = -1) noexcept : base_t(L_, index_) {
+		}
+		basic_object(lua_State* L_, absolute_index index_) noexcept : base_t(L_, index_) {
+		}
+		basic_object(lua_State* L_, raw_index index_) noexcept : base_t(L_, index_) {
+		}
+		basic_object(lua_State* L_, ref_index index_) noexcept : base_t(L_, index_) {
+		}
+		template <typename T, typename... Args>
+		basic_object(lua_State* L_, in_place_type_t<T>, Args&&... args) noexcept
+		: basic_object(std::integral_constant<bool, !is_stack_based<base_t>::value>(), L_, -stack::push<T>(L_, std::forward<Args>(args)...)) {
+		}
+		template <typename T, typename... Args>
+		basic_object(lua_State* L_, in_place_t, T&& arg, Args&&... args) noexcept
+		: basic_object(L_, in_place_type<T>, std::forward<T>(arg), std::forward<Args>(args)...) {
+		}
+		basic_object& operator=(const basic_object&) = default;
+		basic_object& operator=(basic_object&&) = default;
+		basic_object& operator=(const base_type& b) {
+			base_t::operator=(b);
+			return *this;
+		}
+		basic_object& operator=(base_type&& b) {
+			base_t::operator=(std::move(b));
+			return *this;
+		}
+		template <typename Super>
+		basic_object& operator=(const proxy_base<Super>& r) {
+			this->operator=(r.operator basic_object());
+			return *this;
+		}
+		template <typename Super>
+		basic_object& operator=(proxy_base<Super>&& r) {
+			this->operator=(r.operator basic_object());
+			return *this;
+		}
+	};
+
+	template <typename T>
+	object make_object(lua_State* L_, T&& value) {
+		return make_reference<object, true>(L_, std::forward<T>(value));
+	}
+
+	template <typename T, typename... Args>
+	object make_object(lua_State* L_, Args&&... args) {
+		return make_reference<T, object, true>(L_, std::forward<Args>(args)...);
+	}
+
+	template <typename T>
+	object make_object_userdata(lua_State* L_, T&& value) {
+		return make_reference_userdata<object, true>(L_, std::forward<T>(value));
+	}
+
+	template <typename T, typename... Args>
+	object make_object_userdata(lua_State* L_, Args&&... args) {
+		return make_reference_userdata<T, object, true>(L_, std::forward<Args>(args)...);
+	}
+} // namespace sol
+
+// end of sol/object.hpp
+
+// beginning of sol/function.hpp
+
+// beginning of sol/unsafe_function.hpp
+
+// beginning of sol/function_result.hpp
+
+// beginning of sol/protected_function_result.hpp
+
+// beginning of sol/proxy_base.hpp
+
+namespace sol {
+	struct proxy_base_tag { };
+
+	namespace detail {
+		template <typename T>
+		using proxy_key_t = meta::conditional_t<meta::is_specialization_of_v<meta::unqualified_t<T>, std::tuple>, T,
+		     std::tuple<meta::conditional_t<std::is_array_v<meta::unqualified_t<T>>, std::remove_reference_t<T>&, meta::unqualified_t<T>>>>;
+	}
+
+	template <typename Super>
+	struct proxy_base : public proxy_base_tag {
+		lua_State* lua_state() const {
+			const Super& super = *static_cast<const Super*>(static_cast<const void*>(this));
+			return super.lua_state();
+		}
+
+		operator std::string() const {
+			const Super& super = *static_cast<const Super*>(static_cast<const void*>(this));
+			return super.template get<std::string>();
+		}
+
+		template <typename T, meta::enable<meta::neg<meta::is_string_constructible<T>>, is_proxy_primitive<meta::unqualified_t<T>>> = meta::enabler>
+		operator T() const {
+			const Super& super = *static_cast<const Super*>(static_cast<const void*>(this));
+			return super.template get<T>();
+		}
+
+		template <typename T,
+		     meta::enable<meta::neg<meta::is_string_constructible<T>>, meta::neg<is_proxy_primitive<meta::unqualified_t<T>>>> = meta::enabler>
+		operator T&() const {
+			const Super& super = *static_cast<const Super*>(static_cast<const void*>(this));
+			return super.template get<T&>();
+		}
+	};
+
+} // namespace sol
+
+// end of sol/proxy_base.hpp
+
+// beginning of sol/stack_iterator.hpp
+
+#include <limits>
+#include <iterator>
+
+namespace sol {
+	template <typename proxy_t, bool is_const>
+	struct stack_iterator {
+		typedef meta::conditional_t<is_const, const proxy_t, proxy_t> reference;
+		typedef meta::conditional_t<is_const, const proxy_t*, proxy_t*> pointer;
+		typedef proxy_t value_type;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::random_access_iterator_tag iterator_category;
+		lua_State* L;
+		int index;
+		int stacktop;
+		proxy_t sp;
+
+		stack_iterator() : L(nullptr), index((std::numeric_limits<int>::max)()), stacktop((std::numeric_limits<int>::max)()), sp() {
+		}
+		stack_iterator(const stack_iterator<proxy_t, true>& r) : L(r.L), index(r.index), stacktop(r.stacktop), sp(r.sp) {
+		}
+		stack_iterator(lua_State* luastate, int idx, int topidx) : L(luastate), index(idx), stacktop(topidx), sp(luastate, idx) {
+		}
+
+		reference operator*() {
+			return proxy_t(L, index);
+		}
+
+		reference operator*() const {
+			return proxy_t(L, index);
+		}
+
+		pointer operator->() {
+			sp = proxy_t(L, index);
+			return &sp;
+		}
+
+		pointer operator->() const {
+			const_cast<proxy_t&>(sp) = proxy_t(L, index);
+			return &sp;
+		}
+
+		stack_iterator& operator++() {
+			++index;
+			return *this;
+		}
+
+		stack_iterator operator++(int) {
+			auto r = *this;
+			this->operator++();
+			return r;
+		}
+
+		stack_iterator& operator--() {
+			--index;
+			return *this;
+		}
+
+		stack_iterator operator--(int) {
+			auto r = *this;
+			this->operator--();
+			return r;
+		}
+
+		stack_iterator& operator+=(difference_type idx) {
+			index += static_cast<int>(idx);
+			return *this;
+		}
+
+		stack_iterator& operator-=(difference_type idx) {
+			index -= static_cast<int>(idx);
+			return *this;
+		}
+
+		difference_type operator-(const stack_iterator& r) const {
+			return index - r.index;
+		}
+
+		stack_iterator operator+(difference_type idx) const {
+			stack_iterator r = *this;
+			r += idx;
+			return r;
+		}
+
+		reference operator[](difference_type idx) const {
+			return proxy_t(L, index + static_cast<int>(idx));
+		}
+
+		bool operator==(const stack_iterator& r) const {
+			if (stacktop == (std::numeric_limits<int>::max)()) {
+				return r.index == r.stacktop;
+			}
+			else if (r.stacktop == (std::numeric_limits<int>::max)()) {
+				return index == stacktop;
+			}
+			return index == r.index;
+		}
+
+		bool operator!=(const stack_iterator& r) const {
+			return !(this->operator==(r));
+		}
+
+		bool operator<(const stack_iterator& r) const {
+			return index < r.index;
+		}
+
+		bool operator>(const stack_iterator& r) const {
+			return index > r.index;
+		}
+
+		bool operator<=(const stack_iterator& r) const {
+			return index <= r.index;
+		}
+
+		bool operator>=(const stack_iterator& r) const {
+			return index >= r.index;
+		}
+	};
+
+	template <typename proxy_t, bool is_const>
+	inline stack_iterator<proxy_t, is_const> operator+(
+	     typename stack_iterator<proxy_t, is_const>::difference_type n, const stack_iterator<proxy_t, is_const>& r) {
+		return r + n;
+	}
+} // namespace sol
+
+// end of sol/stack_iterator.hpp
+
+// beginning of sol/stack_proxy.hpp
+
+// beginning of sol/stack_proxy_base.hpp
+
+namespace sol {
+	struct stack_proxy_base : public proxy_base<stack_proxy_base> {
+	private:
+		lua_State* m_L;
+		int m_index;
+
+	public:
+		stack_proxy_base() : m_L(nullptr), m_index(0) {
+		}
+		stack_proxy_base(lua_State* L_, int index_) : m_L(L_), m_index(index_) {
+		}
+
+		template <typename T>
+		decltype(auto) get() const {
+			return stack::get<T>(m_L, stack_index());
+		}
+
+		template <typename T>
+		bool is() const {
+			return stack::check<T>(m_L, stack_index());
+		}
+
+		template <typename T>
+		decltype(auto) as() const {
+			return get<T>();
+		}
+
+		type get_type() const noexcept {
+			return type_of(lua_state(), stack_index());
+		}
+
+		int push() const {
+			return push(m_L);
+		}
+
+		int push(lua_State* L_) const {
+			lua_pushvalue(L_, m_index);
+			return 1;
+		}
+
+		lua_State* lua_state() const {
+			return m_L;
+		}
+		int stack_index() const {
+			return m_index;
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_getter<stack_proxy_base> {
+			static stack_proxy_base get(lua_State* L_, int index_ = -1) {
+				return stack_proxy_base(L_, index_);
+			}
+		};
+
+		template <>
+		struct unqualified_pusher<stack_proxy_base> {
+			static int push(lua_State*, const stack_proxy_base& proxy_reference) {
+				return proxy_reference.push();
+			}
+		};
+	} // namespace stack
+
+} // namespace sol
+
+// end of sol/stack_proxy_base.hpp
+
+namespace sol {
+	struct stack_proxy : public stack_proxy_base {
+	public:
+		stack_proxy() : stack_proxy_base() {
+		}
+		stack_proxy(lua_State* L, int index) : stack_proxy_base(L, index) {
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args);
+
+		template <typename... Args>
+		decltype(auto) operator()(Args&&... args) {
+			return call<>(std::forward<Args>(args)...);
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_getter<stack_proxy> {
+			static stack_proxy get(lua_State* L, int index, record& tracking) {
+				tracking.use(0);
+				return stack_proxy(L, index);
+			}
+		};
+
+		template <>
+		struct unqualified_pusher<stack_proxy> {
+			static int push(lua_State*, const stack_proxy& ref) {
+				return ref.push();
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/stack_proxy.hpp
+
+#include <cstdint>
+
+namespace sol {
+	struct protected_function_result : public proxy_base<protected_function_result> {
+	private:
+		lua_State* L;
+		int index;
+		int returncount;
+		int popcount;
+		call_status err;
+
+	public:
+		typedef stack_proxy reference_type;
+		typedef stack_proxy value_type;
+		typedef stack_proxy* pointer;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::size_t size_type;
+		typedef stack_iterator<stack_proxy, false> iterator;
+		typedef stack_iterator<stack_proxy, true> const_iterator;
+		typedef std::reverse_iterator<iterator> reverse_iterator;
+		typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+
+		protected_function_result() noexcept : protected_function_result(nullptr) {}
+		protected_function_result(lua_State* Ls, int idx = -1, int retnum = 0, int popped = 0, call_status pferr = call_status::ok) noexcept
+		: L(Ls), index(idx), returncount(retnum), popcount(popped), err(pferr) {
+		}
+
+		// We do not want anyone to copy these around willy-nilly
+		// Will likely break people, but also will probably get rid of quiet bugs that have
+		// been lurking. (E.g., Vanilla Lua will just quietly discard over-pops and under-pops:
+		// LuaJIT and other Lua engines will implode and segfault at random later times.)
+		protected_function_result(const protected_function_result&) = delete;
+		protected_function_result& operator=(const protected_function_result&) = delete;
+
+		protected_function_result(protected_function_result&& o) noexcept
+		: L(o.L), index(o.index), returncount(o.returncount), popcount(o.popcount), err(o.err) {
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but we will be thorough
+			o.abandon();
+		}
+		protected_function_result& operator=(protected_function_result&& o) noexcept {
+			L = o.L;
+			index = o.index;
+			returncount = o.returncount;
+			popcount = o.popcount;
+			err = o.err;
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but we will be thorough
+			o.abandon();
+			return *this;
+		}
+
+		protected_function_result(const unsafe_function_result& o) = delete;
+		protected_function_result& operator=(const unsafe_function_result& o) = delete;
+		protected_function_result(unsafe_function_result&& o) noexcept;
+		protected_function_result& operator=(unsafe_function_result&& o) noexcept;
+
+		call_status status() const noexcept {
+			return err;
+		}
+
+		bool valid() const noexcept {
+			return status() == call_status::ok || status() == call_status::yielded;
+		}
+
+#if SOL_IS_ON(SOL_COMPILER_GCC)
+#pragma GCC diagnostic push
+#if !SOL_IS_ON(SOL_COMPILER_CLANG)
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
+#endif
+
+		template <typename T>
+		decltype(auto) get(int index_offset = 0) const {
+			using UT = meta::unqualified_t<T>;
+			int target = index + index_offset;
+			if constexpr (meta::is_optional_v<UT>) {
+				using ValueType = typename UT::value_type;
+				if constexpr (std::is_same_v<ValueType, error>) {
+					if (valid()) {
+						return UT();
+					}
+					return UT(error(detail::direct_error, stack::get<std::string>(L, target)));
+				}
+				else {
+					if (!valid()) {
+						return UT();
+					}
+					return stack::get<UT>(L, target);
+				}
+			}
+			else {
+				if constexpr (std::is_same_v<T, error>) {
+#if SOL_IS_ON(SOL_SAFE_PROXIES)
+					if (valid()) {
+						type t = type_of(L, target);
+						type_panic_c_str(L, target, t, type::none, "bad get from protected_function_result (is an error)");
+					}
+#endif // Check Argument Safety
+					return error(detail::direct_error, stack::get<std::string>(L, target));
+				}
+				else {
+#if SOL_IS_ON(SOL_SAFE_PROXIES)
+					if (!valid()) {
+						type t = type_of(L, target);
+						type_panic_c_str(L, target, t, type::none, "bad get from protected_function_result (is not an error)");
+					}
+#endif // Check Argument Safety
+					return stack::get<T>(L, target);
+				}
+			}
+		}
+
+#if SOL_IS_ON(SOL_COMPILER_GCC)
+#pragma GCC diagnostic pop
+#endif
+
+		type get_type(int index_offset = 0) const noexcept {
+			return type_of(L, index + static_cast<int>(index_offset));
+		}
+
+		stack_proxy operator[](difference_type index_offset) const {
+			return stack_proxy(L, index + static_cast<int>(index_offset));
+		}
+
+		iterator begin() {
+			return iterator(L, index, stack_index() + return_count());
+		}
+		iterator end() {
+			return iterator(L, stack_index() + return_count(), stack_index() + return_count());
+		}
+		const_iterator begin() const {
+			return const_iterator(L, index, stack_index() + return_count());
+		}
+		const_iterator end() const {
+			return const_iterator(L, stack_index() + return_count(), stack_index() + return_count());
+		}
+		const_iterator cbegin() const {
+			return begin();
+		}
+		const_iterator cend() const {
+			return end();
+		}
+
+		reverse_iterator rbegin() {
+			return std::reverse_iterator<iterator>(begin());
+		}
+		reverse_iterator rend() {
+			return std::reverse_iterator<iterator>(end());
+		}
+		const_reverse_iterator rbegin() const {
+			return std::reverse_iterator<const_iterator>(begin());
+		}
+		const_reverse_iterator rend() const {
+			return std::reverse_iterator<const_iterator>(end());
+		}
+		const_reverse_iterator crbegin() const {
+			return std::reverse_iterator<const_iterator>(cbegin());
+		}
+		const_reverse_iterator crend() const {
+			return std::reverse_iterator<const_iterator>(cend());
+		}
+
+		lua_State* lua_state() const noexcept {
+			return L;
+		};
+		int stack_index() const noexcept {
+			return index;
+		};
+		int return_count() const noexcept {
+			return returncount;
+		};
+		int pop_count() const noexcept {
+			return popcount;
+		};
+		void abandon() noexcept {
+			// L = nullptr;
+			index = 0;
+			returncount = 0;
+			popcount = 0;
+			err = call_status::runtime;
+		}
+		~protected_function_result() {
+			if (L == nullptr)
+				return;
+			stack::remove(L, index, popcount);
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_pusher<protected_function_result> {
+			static int push(lua_State* L, const protected_function_result& pfr) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(L, static_cast<int>(pfr.pop_count()), detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				int p = 0;
+				for (int i = 0; i < pfr.pop_count(); ++i) {
+					lua_pushvalue(L, i + pfr.stack_index());
+					++p;
+				}
+				return p;
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/protected_function_result.hpp
+
+// beginning of sol/unsafe_function_result.hpp
+
+#include <cstdint>
+
+namespace sol {
+	struct unsafe_function_result : public proxy_base<unsafe_function_result> {
+	private:
+		lua_State* L;
+		int index;
+		int returncount;
+
+	public:
+		typedef stack_proxy reference_type;
+		typedef stack_proxy value_type;
+		typedef stack_proxy* pointer;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::size_t size_type;
+		typedef stack_iterator<stack_proxy, false> iterator;
+		typedef stack_iterator<stack_proxy, true> const_iterator;
+		typedef std::reverse_iterator<iterator> reverse_iterator;
+		typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+
+		unsafe_function_result() noexcept : unsafe_function_result(nullptr) {}
+		unsafe_function_result(lua_State* Ls, int idx = -1, int retnum = 0) noexcept : L(Ls), index(idx), returncount(retnum) {
+		}
+
+		// We do not want anyone to copy these around willy-nilly
+		// Will likely break people, but also will probably get rid of quiet bugs that have
+		// been lurking. (E.g., Vanilla Lua will just quietly discard over-pops and under-pops:
+		// LuaJIT and other Lua engines will implode and segfault at random later times.)
+		unsafe_function_result(const unsafe_function_result&) = delete;
+		unsafe_function_result& operator=(const unsafe_function_result&) = delete;
+
+		unsafe_function_result(unsafe_function_result&& o) noexcept : L(o.L), index(o.index), returncount(o.returncount) {
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but will be thorough
+			o.abandon();
+		}
+		unsafe_function_result& operator=(unsafe_function_result&& o) noexcept {
+			L = o.L;
+			index = o.index;
+			returncount = o.returncount;
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but will be thorough
+			o.abandon();
+			return *this;
+		}
+
+		unsafe_function_result(const protected_function_result& o) = delete;
+		unsafe_function_result& operator=(const protected_function_result& o) = delete;
+		unsafe_function_result(protected_function_result&& o) noexcept;
+		unsafe_function_result& operator=(protected_function_result&& o) noexcept;
+
+		template <typename T>
+		decltype(auto) get(difference_type index_offset = 0) const {
+			return stack::get<T>(L, index + static_cast<int>(index_offset));
+		}
+
+		type get_type(difference_type index_offset = 0) const noexcept {
+			return type_of(L, index + static_cast<int>(index_offset));
+		}
+
+		stack_proxy operator[](difference_type index_offset) const {
+			return stack_proxy(L, index + static_cast<int>(index_offset));
+		}
+
+		iterator begin() {
+			return iterator(L, index, stack_index() + return_count());
+		}
+		iterator end() {
+			return iterator(L, stack_index() + return_count(), stack_index() + return_count());
+		}
+		const_iterator begin() const {
+			return const_iterator(L, index, stack_index() + return_count());
+		}
+		const_iterator end() const {
+			return const_iterator(L, stack_index() + return_count(), stack_index() + return_count());
+		}
+		const_iterator cbegin() const {
+			return begin();
+		}
+		const_iterator cend() const {
+			return end();
+		}
+
+		reverse_iterator rbegin() {
+			return std::reverse_iterator<iterator>(begin());
+		}
+		reverse_iterator rend() {
+			return std::reverse_iterator<iterator>(end());
+		}
+		const_reverse_iterator rbegin() const {
+			return std::reverse_iterator<const_iterator>(begin());
+		}
+		const_reverse_iterator rend() const {
+			return std::reverse_iterator<const_iterator>(end());
+		}
+		const_reverse_iterator crbegin() const {
+			return std::reverse_iterator<const_iterator>(cbegin());
+		}
+		const_reverse_iterator crend() const {
+			return std::reverse_iterator<const_iterator>(cend());
+		}
+
+		call_status status() const noexcept {
+			return call_status::ok;
+		}
+
+		bool valid() const noexcept {
+			return status() == call_status::ok || status() == call_status::yielded;
+		}
+
+		lua_State* lua_state() const {
+			return L;
+		};
+		int stack_index() const {
+			return index;
+		};
+		int return_count() const {
+			return returncount;
+		};
+		void abandon() noexcept {
+			// L = nullptr;
+			index = 0;
+			returncount = 0;
+		}
+		~unsafe_function_result() {
+			if (L != nullptr) {
+				lua_pop(L, returncount);
+			}
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_pusher<unsafe_function_result> {
+			static int push(lua_State* L, const unsafe_function_result& fr) {
+				int p = 0;
+				for (int i = 0; i < fr.return_count(); ++i) {
+					lua_pushvalue(L, i + fr.stack_index());
+					++p;
+				}
+				return p;
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/unsafe_function_result.hpp
+
+#include <cstdint>
+
+namespace sol {
+
+	namespace detail {
+		template <>
+		struct is_speshul<unsafe_function_result> : std::true_type { };
+		template <>
+		struct is_speshul<protected_function_result> : std::true_type { };
+
+		template <std::size_t I, typename... Args, typename T>
+		stack_proxy get(types<Args...>, meta::index_value<0>, meta::index_value<I>, const T& fr) {
+			return stack_proxy(fr.lua_state(), fr.stack_index() + static_cast<int>(I));
+		}
+
+		template <std::size_t I, std::size_t N, typename Arg, typename... Args, typename T, meta::enable<meta::boolean<(N > 0)>> = meta::enabler>
+		stack_proxy get(types<Arg, Args...>, meta::index_value<N>, meta::index_value<I>, const T& fr) {
+			return get(types<Args...>(), meta::index_value<N - 1>(), meta::index_value<I + lua_size<Arg>::value>(), fr);
+		}
+	} // namespace detail
+
+	template <>
+	struct tie_size<unsafe_function_result> : std::integral_constant<std::size_t, SIZE_MAX> { };
+
+	template <>
+	struct tie_size<protected_function_result> : std::integral_constant<std::size_t, SIZE_MAX> { };
+
+	template <std::size_t I>
+	stack_proxy get(const unsafe_function_result& fr) {
+		return stack_proxy(fr.lua_state(), fr.stack_index() + static_cast<int>(I));
+	}
+
+	template <std::size_t I, typename... Args>
+	stack_proxy get(types<Args...> t, const unsafe_function_result& fr) {
+		return detail::get(t, meta::index_value<I>(), meta::index_value<0>(), fr);
+	}
+
+	template <std::size_t I>
+	stack_proxy get(const protected_function_result& fr) {
+		return stack_proxy(fr.lua_state(), fr.stack_index() + static_cast<int>(I));
+	}
+
+	template <std::size_t I, typename... Args>
+	stack_proxy get(types<Args...> t, const protected_function_result& fr) {
+		return detail::get(t, meta::index_value<I>(), meta::index_value<0>(), fr);
+	}
+} // namespace sol
+
+// end of sol/function_result.hpp
+
+// beginning of sol/function_types.hpp
+
+// beginning of sol/function_types_core.hpp
+
+// beginning of sol/wrapper.hpp
+
+namespace sol {
+
+	namespace detail {
+		template <typename T>
+		using array_return_type = meta::conditional_t<std::is_array<T>::value, std::add_lvalue_reference_t<T>, T>;
+	}
+
+	template <typename F, typename = void>
+	struct wrapper {
+		typedef lua_bind_traits<meta::unqualified_t<F>> traits_type;
+		typedef typename traits_type::args_list args_list;
+		typedef typename traits_type::args_list free_args_list;
+		typedef typename traits_type::returns_list returns_list;
+
+		template <typename... Args>
+		static decltype(auto) call(F& f, Args&&... args) {
+			return f(std::forward<Args>(args)...);
+		}
+
+		struct caller {
+			template <typename... Args>
+			decltype(auto) operator()(F& fx, Args&&... args) const {
+				return call(fx, std::forward<Args>(args)...);
+			}
+		};
+	};
+
+	template <typename F>
+	struct wrapper<F, std::enable_if_t<std::is_function<std::remove_pointer_t<meta::unqualified_t<F>>>::value>> {
+		typedef lua_bind_traits<std::remove_pointer_t<meta::unqualified_t<F>>> traits_type;
+		typedef typename traits_type::args_list args_list;
+		typedef typename traits_type::args_list free_args_list;
+		typedef typename traits_type::returns_list returns_list;
+
+		template <F fx, typename... Args>
+		static decltype(auto) invoke(Args&&... args) {
+			return fx(std::forward<Args>(args)...);
+		}
+
+		template <typename... Args>
+		static decltype(auto) call(F& fx, Args&&... args) {
+			return fx(std::forward<Args>(args)...);
+		}
+
+		struct caller {
+			template <typename... Args>
+			decltype(auto) operator()(F& fx, Args&&... args) const {
+				return call(fx, std::forward<Args>(args)...);
+			}
+		};
+
+		template <F fx>
+		struct invoker {
+			template <typename... Args>
+			decltype(auto) operator()(Args&&... args) const {
+				return invoke<fx>(std::forward<Args>(args)...);
+			}
+		};
+	};
+
+	template <typename F>
+	struct wrapper<F, std::enable_if_t<std::is_member_object_pointer<meta::unqualified_t<F>>::value>> {
+		typedef lua_bind_traits<meta::unqualified_t<F>> traits_type;
+		typedef typename traits_type::object_type object_type;
+		typedef typename traits_type::return_type return_type;
+		typedef typename traits_type::args_list args_list;
+		typedef types<object_type&, return_type> free_args_list;
+		typedef typename traits_type::returns_list returns_list;
+
+		template <F fx>
+		static auto call(object_type& mem) -> detail::array_return_type<decltype(mem.*fx)> {
+			return mem.*fx;
+		}
+
+		template <F fx, typename Arg, typename... Args>
+		static decltype(auto) invoke(object_type& mem, Arg&& arg, Args&&...) {
+			return mem.*fx = std::forward<Arg>(arg);
+		}
+
+		template <typename Fx>
+		static auto call(Fx&& fx, object_type& mem) -> detail::array_return_type<decltype(mem.*fx)> {
+			return mem.*fx;
+		}
+
+		template <typename Fx, typename Arg, typename... Args>
+		static void call(Fx&& fx, object_type& mem, Arg&& arg, Args&&...) {
+			using actual_type = meta::unqualified_t<detail::array_return_type<decltype(mem.*fx)>>;
+			if constexpr (std::is_array_v<actual_type>) {
+				using std::cbegin;
+				using std::cend;
+				auto first = cbegin(arg);
+				auto last = cend(arg);
+				for (std::size_t i = 0; first != last; ++i, ++first) {
+					(mem.*fx)[i] = *first;
+				}
+			}
+			else {
+				(mem.*fx) = std::forward<Arg>(arg);
+			}
+		}
+
+		struct caller {
+			template <typename Fx, typename... Args>
+			decltype(auto) operator()(Fx&& fx, object_type& mem, Args&&... args) const {
+				return call(std::forward<Fx>(fx), mem, std::forward<Args>(args)...);
+			}
+		};
+
+		template <F fx>
+		struct invoker {
+			template <typename... Args>
+			decltype(auto) operator()(Args&&... args) const {
+				return invoke<fx>(std::forward<Args>(args)...);
+			}
+		};
+	};
+
+	template <typename F, typename R, typename O, typename... FArgs>
+	struct member_function_wrapper {
+		typedef O object_type;
+		typedef lua_bind_traits<F> traits_type;
+		typedef typename traits_type::args_list args_list;
+		typedef types<object_type&, FArgs...> free_args_list;
+		typedef meta::tuple_types<R> returns_list;
+
+		template <F fx, typename... Args>
+		static R invoke(O& mem, Args&&... args) {
+			return (mem.*fx)(std::forward<Args>(args)...);
+		}
+
+		template <typename Fx, typename... Args>
+		static R call(Fx&& fx, O& mem, Args&&... args) {
+			return (mem.*fx)(std::forward<Args>(args)...);
+		}
+
+		struct caller {
+			template <typename Fx, typename... Args>
+			decltype(auto) operator()(Fx&& fx, O& mem, Args&&... args) const {
+				return call(std::forward<Fx>(fx), mem, std::forward<Args>(args)...);
+			}
+		};
+
+		template <F fx>
+		struct invoker {
+			template <typename... Args>
+			decltype(auto) operator()(O& mem, Args&&... args) const {
+				return invoke<fx>(mem, std::forward<Args>(args)...);
+			}
+		};
+	};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...)> : public member_function_wrapper<R (O::*)(Args...), R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const> : public member_function_wrapper<R (O::*)(Args...) const, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile> : public member_function_wrapper<R (O::*)(Args...) const volatile, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...)&> : public member_function_wrapper<R (O::*)(Args...)&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const&> : public member_function_wrapper<R (O::*)(Args...) const&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile&> : public member_function_wrapper<R (O::*)(Args...) const volatile&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...)&> : public member_function_wrapper<R (O::*)(Args..., ...)&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const&> : public member_function_wrapper<R (O::*)(Args..., ...) const&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const volatile&> : public member_function_wrapper<R (O::*)(Args..., ...) const volatile&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) &&> : public member_function_wrapper<R (O::*)(Args...)&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const&&> : public member_function_wrapper<R (O::*)(Args...) const&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile&&> : public member_function_wrapper<R (O::*)(Args...) const volatile&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) &&> : public member_function_wrapper<R (O::*)(Args..., ...)&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const&&> : public member_function_wrapper<R (O::*)(Args..., ...) const&, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const volatile&&> : public member_function_wrapper<R (O::*)(Args..., ...) const volatile&, R, O, Args...> { };
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+	// noexcept has become a part of a function's type
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) noexcept> : public member_function_wrapper<R (O::*)(Args...) noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const noexcept> : public member_function_wrapper<R (O::*)(Args...) const noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile noexcept> : public member_function_wrapper<R (O::*)(Args...) const volatile noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...)& noexcept> : public member_function_wrapper<R (O::*)(Args...)& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const& noexcept> : public member_function_wrapper<R (O::*)(Args...) const& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile& noexcept> : public member_function_wrapper<R (O::*)(Args...) const volatile& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...)& noexcept> : public member_function_wrapper<R (O::*)(Args..., ...)& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const& noexcept> : public member_function_wrapper<R (O::*)(Args..., ...) const& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const volatile& noexcept>
+	: public member_function_wrapper<R (O::*)(Args..., ...) const volatile& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...)&& noexcept> : public member_function_wrapper<R (O::*)(Args...)& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const&& noexcept> : public member_function_wrapper<R (O::*)(Args...) const& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args...) const volatile&& noexcept> : public member_function_wrapper<R (O::*)(Args...) const volatile& noexcept, R, O, Args...> {
+	};
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...)&& noexcept> : public member_function_wrapper<R (O::*)(Args..., ...)& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const&& noexcept> : public member_function_wrapper<R (O::*)(Args..., ...) const& noexcept, R, O, Args...> { };
+
+	template <typename R, typename O, typename... Args>
+	struct wrapper<R (O::*)(Args..., ...) const volatile&& noexcept>
+	: public member_function_wrapper<R (O::*)(Args..., ...) const volatile& noexcept, R, O, Args...> { };
+
+#endif // noexcept is part of a function's type
+
+} // namespace sol
+
+// end of sol/wrapper.hpp
+
+#include <memory>
+
+namespace sol { namespace function_detail {
+	template <typename Fx, int start = 1, bool is_yielding = false>
+	int call(lua_State* L) {
+		Fx& fx = stack::get<user<Fx>>(L, upvalue_index(start));
+		int nr = fx(L);
+		if (is_yielding) {
+			return lua_yield(L, nr);
+		}
+		else {
+			return nr;
+		}
+	}
+}} // namespace sol::function_detail
+
+// end of sol/function_types_core.hpp
+
+// beginning of sol/function_types_templated.hpp
+
+// beginning of sol/call.hpp
+
+// beginning of sol/property.hpp
+
+#include <type_traits>
+#include <utility>
+
+namespace sol {
+	namespace detail {
+		struct no_prop { };
+	} // namespace detail
+
+	template <typename R, typename W>
+	struct property_wrapper : detail::ebco<R, 0>, detail::ebco<W, 1> {
+	private:
+		using read_base_t = detail::ebco<R, 0>;
+		using write_base_t = detail::ebco<W, 1>;
+
+	public:
+		template <typename Rx, typename Wx>
+		property_wrapper(Rx&& r, Wx&& w) : read_base_t(std::forward<Rx>(r)), write_base_t(std::forward<Wx>(w)) {
+		}
+
+		W& write() {
+			return write_base_t::value();
+		}
+
+		const W& write() const {
+			return write_base_t::value();
+		}
+
+		R& read() {
+			return read_base_t::value();
+		}
+
+		const R& read() const {
+			return read_base_t::value();
+		}
+	};
+
+	template <typename F, typename G>
+	inline decltype(auto) property(F&& f, G&& g) {
+		typedef lua_bind_traits<meta::unqualified_t<F>> left_traits;
+		typedef lua_bind_traits<meta::unqualified_t<G>> right_traits;
+		if constexpr (left_traits::free_arity < right_traits::free_arity) {
+			return property_wrapper<std::decay_t<F>, std::decay_t<G>>(std::forward<F>(f), std::forward<G>(g));
+		}
+		else {
+			return property_wrapper<std::decay_t<G>, std::decay_t<F>>(std::forward<G>(g), std::forward<F>(f));
+		}
+	}
+
+	template <typename F>
+	inline decltype(auto) property(F&& f) {
+		typedef lua_bind_traits<meta::unqualified_t<F>> left_traits;
+		if constexpr (left_traits::free_arity < 2) {
+			return property_wrapper<std::decay_t<F>, detail::no_prop>(std::forward<F>(f), detail::no_prop());
+		}
+		else {
+			return property_wrapper<detail::no_prop, std::decay_t<F>>(detail::no_prop(), std::forward<F>(f));
+		}
+	}
+
+	template <typename F>
+	inline decltype(auto) readonly_property(F&& f) {
+		return property_wrapper<std::decay_t<F>, detail::no_prop>(std::forward<F>(f), detail::no_prop());
+	}
+
+	template <typename F>
+	inline decltype(auto) writeonly_property(F&& f) {
+		return property_wrapper<detail::no_prop, std::decay_t<F>>(detail::no_prop(), std::forward<F>(f));
+	}
+
+	template <typename T>
+	struct readonly_wrapper : detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+
+		operator T&() {
+			return base_t::value();
+		}
+		operator const T&() const {
+			return base_t::value();
+		}
+	};
+
+	// Allow someone to make a member variable readonly (const)
+	template <typename R, typename T>
+	inline auto readonly(R T::*v) {
+		return readonly_wrapper<meta::unqualified_t<decltype(v)>>(v);
+	}
+
+	template <typename T>
+	struct var_wrapper : detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+	};
+
+	template <typename V>
+	inline auto var(V&& v) {
+		typedef std::decay_t<V> T;
+		return var_wrapper<T>(std::forward<V>(v));
+	}
+
+	namespace meta {
+		template <typename T>
+		using is_member_object = std::integral_constant<bool, std::is_member_object_pointer_v<T> || is_specialization_of_v<T, readonly_wrapper>>;
+
+		template <typename T>
+		inline constexpr bool is_member_object_v = is_member_object<T>::value;
+
+		template <typename T>
+		using is_member_object_or_function = std::integral_constant<bool, is_member_object_v<T> || std::is_member_pointer_v<T>>;
+
+		template <typename T>
+		inline constexpr bool is_member_object_or_function_v = is_member_object_or_function<T>::value;
+	} // namespace meta
+
+} // namespace sol
+
+// end of sol/property.hpp
+
+// beginning of sol/protect.hpp
+
+#include <utility>
+
+namespace sol {
+
+	template <typename T>
+	struct protect_t {
+		T value;
+
+		template <typename Arg, typename... Args, meta::disable<std::is_same<protect_t, meta::unqualified_t<Arg>>> = meta::enabler>
+		protect_t(Arg&& arg, Args&&... args) : value(std::forward<Arg>(arg), std::forward<Args>(args)...) {
+		}
+
+		protect_t(const protect_t&) = default;
+		protect_t(protect_t&&) = default;
+		protect_t& operator=(const protect_t&) = default;
+		protect_t& operator=(protect_t&&) = default;
+	};
+
+	template <typename T>
+	auto protect(T&& value) {
+		return protect_t<std::decay_t<T>>(std::forward<T>(value));
+	}
+
+} // namespace sol
+
+// end of sol/protect.hpp
+
+namespace sol {
+	namespace u_detail {
+
+	} // namespace u_detail
+
+	namespace policy_detail {
+		template <int I, int... In>
+		inline void handle_policy(static_stack_dependencies<I, In...>, lua_State* L, int&) {
+			if constexpr (sizeof...(In) == 0) {
+				(void)L;
+				return;
+			}
+			else {
+				absolute_index ai(L, I);
+				if (type_of(L, ai) != type::userdata) {
+					return;
+				}
+				lua_createtable(L, static_cast<int>(sizeof...(In)), 0);
+				stack_reference deps(L, -1);
+				auto per_dep = [&L, &deps](int i) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+					luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+					lua_pushvalue(L, i);
+					luaL_ref(L, deps.stack_index());
+				};
+				(void)per_dep;
+				(void)detail::swallow { int(), (per_dep(In), int())... };
+				lua_setuservalue(L, ai);
+			}
+		}
+
+		template <int... In>
+		inline void handle_policy(returns_self_with<In...>, lua_State* L, int& pushed) {
+			pushed = stack::push(L, raw_index(1));
+			handle_policy(static_stack_dependencies<-1, In...>(), L, pushed);
+		}
+
+		inline void handle_policy(const stack_dependencies& sdeps, lua_State* L, int&) {
+			absolute_index ai(L, sdeps.target);
+			if (type_of(L, ai) != type::userdata) {
+				return;
+			}
+			lua_createtable(L, static_cast<int>(sdeps.size()), 0);
+			stack_reference deps(L, -1);
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, static_cast<int>(sdeps.size()), detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			for (std::size_t i = 0; i < sdeps.size(); ++i) {
+				lua_pushvalue(L, sdeps.stack_indices[i]);
+				luaL_ref(L, deps.stack_index());
+			}
+			lua_setuservalue(L, ai);
+		}
+
+		template <typename P, meta::disable<std::is_base_of<detail::policy_base_tag, meta::unqualified_t<P>>> = meta::enabler>
+		inline void handle_policy(P&& p, lua_State* L, int& pushed) {
+			pushed = std::forward<P>(p)(L, pushed);
+		}
+	} // namespace policy_detail
+
+	namespace function_detail {
+		inline int no_construction_error(lua_State* L) {
+			return luaL_error(L, "sol: cannot call this constructor (tagged as non-constructible)");
+		}
+	} // namespace function_detail
+
+	namespace call_detail {
+
+		template <typename R, typename W>
+		inline auto& pick(std::true_type, property_wrapper<R, W>& f) {
+			return f.read();
+		}
+
+		template <typename R, typename W>
+		inline auto& pick(std::false_type, property_wrapper<R, W>& f) {
+			return f.write();
+		}
+
+		template <typename T, typename List>
+		struct void_call : void_call<T, meta::function_args_t<List>> { };
+
+		template <typename T, typename... Args>
+		struct void_call<T, types<Args...>> {
+			static void call(Args...) {
+			}
+		};
+
+		template <typename T, bool checked, bool clean_stack>
+		struct constructor_match {
+			T* obj_;
+			reference* obj_lua_ref_;
+			stack::stack_detail::undefined_metatable* p_umf_;
+
+			constructor_match(T* obj_ptr, reference& obj_lua_ref, stack::stack_detail::undefined_metatable& umf)
+			: obj_(obj_ptr), obj_lua_ref_(&obj_lua_ref), p_umf_(&umf) {
+			}
+
+			template <typename Fx, std::size_t I, typename... R, typename... Args>
+			int operator()(types<Fx>, meta::index_value<I>, types<R...> r, types<Args...> a, lua_State* L, int, int start) const {
+				detail::default_construct func {};
+				int result = stack::call_into_lua<checked, clean_stack>(r, a, L, start, func, this->obj_);
+				// construct userdata table
+				// SPECIFICALLY, after we've created it successfully.
+				// If the constructor exits for any reason we have to break things down...
+				if constexpr (clean_stack) {
+					obj_lua_ref_->push();
+					(*this->p_umf_)();
+					obj_lua_ref_->pop();
+				}
+				else {
+					(*this->p_umf_)();
+				}
+				return result;
+			}
+		};
+
+		namespace overload_detail {
+			template <std::size_t... M, typename Match, typename... Args>
+			inline int overload_match_arity(types<>, std::index_sequence<>, std::index_sequence<M...>, Match&&, lua_State* L, int, int, Args&&...) {
+				return luaL_error(L, "sol: no matching function call takes this number of arguments and the specified types");
+			}
+
+			template <typename Fx, typename... Fxs, std::size_t I, std::size_t... In, std::size_t... M, typename Match, typename... Args>
+			inline int overload_match_arity(types<Fx, Fxs...>, std::index_sequence<I, In...>, std::index_sequence<M...>, Match&& matchfx, lua_State* L,
+			     int fxarity, int start, Args&&... args) {
+				typedef lua_bind_traits<meta::unwrap_unqualified_t<Fx>> traits;
+				typedef meta::tuple_types<typename traits::return_type> return_types;
+				typedef typename traits::free_args_list args_list;
+				// compile-time eliminate any functions that we know ahead of time are of improper arity
+				if constexpr (!traits::runtime_variadics_t::value
+				     && meta::find_in_pack_v<meta::index_value<traits::free_arity>, meta::index_value<M>...>::value) {
+					return overload_match_arity(types<Fxs...>(),
+					     std::index_sequence<In...>(),
+					     std::index_sequence<M...>(),
+					     std::forward<Match>(matchfx),
+					     L,
+					     fxarity,
+					     start,
+					     std::forward<Args>(args)...);
+				}
+				else {
+					if constexpr (!traits::runtime_variadics_t::value) {
+						if (traits::free_arity != fxarity) {
+							return overload_match_arity(types<Fxs...>(),
+							     std::index_sequence<In...>(),
+							     std::index_sequence<traits::free_arity, M...>(),
+							     std::forward<Match>(matchfx),
+							     L,
+							     fxarity,
+							     start,
+							     std::forward<Args>(args)...);
+						}
+					}
+					stack::record tracking {};
+					if (!stack::stack_detail::check_types(args_list(), L, start, &no_panic, tracking)) {
+						return overload_match_arity(types<Fxs...>(),
+						     std::index_sequence<In...>(),
+						     std::index_sequence<M...>(),
+						     std::forward<Match>(matchfx),
+						     L,
+						     fxarity,
+						     start,
+						     std::forward<Args>(args)...);
+					}
+					return matchfx(types<Fx>(), meta::index_value<I>(), return_types(), args_list(), L, fxarity, start, std::forward<Args>(args)...);
+				}
+			}
+
+			template <std::size_t... M, typename Match, typename... Args>
+			inline int overload_match_arity_single(
+			     types<>, std::index_sequence<>, std::index_sequence<M...>, Match&& matchfx, lua_State* L, int fxarity, int start, Args&&... args) {
+				return overload_match_arity(types<>(),
+				     std::index_sequence<>(),
+				     std::index_sequence<M...>(),
+				     std::forward<Match>(matchfx),
+				     L,
+				     fxarity,
+				     start,
+				     std::forward<Args>(args)...);
+			}
+
+			template <typename Fx, std::size_t I, std::size_t... M, typename Match, typename... Args>
+			inline int overload_match_arity_single(
+			     types<Fx>, std::index_sequence<I>, std::index_sequence<M...>, Match&& matchfx, lua_State* L, int fxarity, int start, Args&&... args) {
+				typedef lua_bind_traits<meta::unwrap_unqualified_t<Fx>> traits;
+				typedef meta::tuple_types<typename traits::return_type> return_types;
+				typedef typename traits::free_args_list args_list;
+				// compile-time eliminate any functions that we know ahead of time are of improper arity
+				if constexpr (!traits::runtime_variadics_t::value
+				     && meta::find_in_pack_v<meta::index_value<traits::free_arity>, meta::index_value<M>...>::value) {
+					return overload_match_arity(types<>(),
+					     std::index_sequence<>(),
+					     std::index_sequence<M...>(),
+					     std::forward<Match>(matchfx),
+					     L,
+					     fxarity,
+					     start,
+					     std::forward<Args>(args)...);
+				}
+				if constexpr (!traits::runtime_variadics_t::value) {
+					if (traits::free_arity != fxarity) {
+						return overload_match_arity(types<>(),
+						     std::index_sequence<>(),
+						     std::index_sequence<traits::free_arity, M...>(),
+						     std::forward<Match>(matchfx),
+						     L,
+						     fxarity,
+						     start,
+						     std::forward<Args>(args)...);
+					}
+				}
+				return matchfx(types<Fx>(), meta::index_value<I>(), return_types(), args_list(), L, fxarity, start, std::forward<Args>(args)...);
+			}
+
+			template <typename Fx, typename Fx1, typename... Fxs, std::size_t I, std::size_t I1, std::size_t... In, std::size_t... M, typename Match,
+			     typename... Args>
+			inline int overload_match_arity_single(types<Fx, Fx1, Fxs...>, std::index_sequence<I, I1, In...>, std::index_sequence<M...>, Match&& matchfx,
+			     lua_State* L, int fxarity, int start, Args&&... args) {
+				typedef lua_bind_traits<meta::unwrap_unqualified_t<Fx>> traits;
+				typedef meta::tuple_types<typename traits::return_type> return_types;
+				typedef typename traits::free_args_list args_list;
+				// compile-time eliminate any functions that we know ahead of time are of improper arity
+				if constexpr (!traits::runtime_variadics_t::value
+				     && meta::find_in_pack_v<meta::index_value<traits::free_arity>, meta::index_value<M>...>::value) {
+					return overload_match_arity(types<Fx1, Fxs...>(),
+					     std::index_sequence<I1, In...>(),
+					     std::index_sequence<M...>(),
+					     std::forward<Match>(matchfx),
+					     L,
+					     fxarity,
+					     start,
+					     std::forward<Args>(args)...);
+				}
+				else {
+					if constexpr (!traits::runtime_variadics_t::value) {
+						if (traits::free_arity != fxarity) {
+							return overload_match_arity(types<Fx1, Fxs...>(),
+							     std::index_sequence<I1, In...>(),
+							     std::index_sequence<traits::free_arity, M...>(),
+							     std::forward<Match>(matchfx),
+							     L,
+							     fxarity,
+							     start,
+							     std::forward<Args>(args)...);
+						}
+					}
+					stack::record tracking {};
+					if (!stack::stack_detail::check_types(args_list(), L, start, &no_panic, tracking)) {
+						return overload_match_arity(types<Fx1, Fxs...>(),
+						     std::index_sequence<I1, In...>(),
+						     std::index_sequence<M...>(),
+						     std::forward<Match>(matchfx),
+						     L,
+						     fxarity,
+						     start,
+						     std::forward<Args>(args)...);
+					}
+					return matchfx(types<Fx>(), meta::index_value<I>(), return_types(), args_list(), L, fxarity, start, std::forward<Args>(args)...);
+				}
+			}
+		} // namespace overload_detail
+
+		template <typename... Functions, typename Match, typename... Args>
+		inline int overload_match_arity(Match&& matchfx, lua_State* L, int fxarity, int start, Args&&... args) {
+			return overload_detail::overload_match_arity_single(types<Functions...>(),
+			     std::make_index_sequence<sizeof...(Functions)>(),
+			     std::index_sequence<>(),
+			     std::forward<Match>(matchfx),
+			     L,
+			     fxarity,
+			     start,
+			     std::forward<Args>(args)...);
+		}
+
+		template <typename... Functions, typename Match, typename... Args>
+		inline int overload_match(Match&& matchfx, lua_State* L, int start, Args&&... args) {
+			int fxarity = lua_gettop(L) - (start - 1);
+			return overload_match_arity<Functions...>(std::forward<Match>(matchfx), L, fxarity, start, std::forward<Args>(args)...);
+		}
+
+		template <typename T, typename... TypeLists, typename Match, typename... Args>
+		inline int construct_match(Match&& matchfx, lua_State* L, int fxarity, int start, Args&&... args) {
+			// use same overload resolution matching as all other parts of the framework
+			return overload_match_arity<decltype(void_call<T, TypeLists>::call)...>(
+			     std::forward<Match>(matchfx), L, fxarity, start, std::forward<Args>(args)...);
+		}
+
+		template <typename T, bool checked, bool clean_stack, typename... TypeLists>
+		inline int construct_trampolined(lua_State* L) {
+			static const auto& meta = usertype_traits<T>::metatable();
+			int argcount = lua_gettop(L);
+			call_syntax syntax = argcount > 0 ? stack::get_call_syntax(L, usertype_traits<T>::user_metatable(), 1) : call_syntax::dot;
+			argcount -= static_cast<int>(syntax);
+
+			T* obj = detail::usertype_allocate<T>(L);
+			reference userdataref(L, -1);
+			stack::stack_detail::undefined_metatable umf(L, &meta[0], &stack::stack_detail::set_undefined_methods_on<T>);
+
+			// put userdata at the first index
+			lua_insert(L, 1);
+			construct_match<T, TypeLists...>(constructor_match<T, checked, clean_stack>(obj, userdataref, umf), L, argcount, 1 + static_cast<int>(syntax));
+
+			userdataref.push();
+			return 1;
+		}
+
+		template <typename T, bool checked, bool clean_stack, typename... TypeLists>
+		inline int construct(lua_State* L) {
+			return detail::static_trampoline<&construct_trampolined<T, checked, clean_stack, TypeLists...>>(L);
+		}
+
+		template <typename F, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename = void>
+		struct agnostic_lua_call_wrapper {
+			template <typename Fx, typename... Args>
+			static int call(lua_State* L, Fx&& f, Args&&... args) {
+				using uFx = meta::unqualified_t<Fx>;
+				static constexpr bool is_ref = is_lua_reference_v<uFx>;
+				if constexpr (is_ref) {
+					if constexpr (is_index) {
+						return stack::push(L, std::forward<Fx>(f), std::forward<Args>(args)...);
+					}
+					else {
+						std::forward<Fx>(f) = stack::unqualified_get<F>(L, boost + (is_variable ? 3 : 1));
+						return 0;
+					}
+				}
+				else {
+					using wrap = wrapper<uFx>;
+					using traits_type = typename wrap::traits_type;
+					using fp_t = typename traits_type::function_pointer_type;
+					constexpr bool is_function_pointer_convertible = std::is_class_v<uFx> && std::is_convertible_v<std::decay_t<Fx>, fp_t>;
+					if constexpr (is_function_pointer_convertible) {
+						fp_t fx = f;
+						return agnostic_lua_call_wrapper<fp_t, is_index, is_variable, checked, boost, clean_stack> {}.call(
+						     L, fx, std::forward<Args>(args)...);
+					}
+					else {
+						using returns_list = typename wrap::returns_list;
+						using args_list = typename wrap::free_args_list;
+						using caller = typename wrap::caller;
+						return stack::call_into_lua<checked, clean_stack>(
+						     returns_list(), args_list(), L, boost + 1, caller(), std::forward<Fx>(f), std::forward<Args>(args)...);
+					}
+				}
+			}
+		};
+
+		template <typename T, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<var_wrapper<T>, is_index, is_variable, checked, boost, clean_stack, C> {
+			template <typename F>
+			static int call(lua_State* L, F&& f) {
+				if constexpr (is_index) {
+					constexpr bool is_stack = is_stack_based_v<meta::unqualified_t<decltype(detail::unwrap(f.value()))>>;
+					if constexpr (clean_stack && !is_stack) {
+						lua_settop(L, 0);
+					}
+					return stack::push_reference(L, detail::unwrap(f.value()));
+				}
+				else {
+					if constexpr (std::is_const_v<meta::unwrapped_t<T>>) {
+						(void)f;
+						return luaL_error(L, "sol: cannot write to a readonly (const) variable");
+					}
+					else {
+						using R = meta::unwrapped_t<T>;
+						if constexpr (std::is_assignable_v<std::add_lvalue_reference_t<meta::unqualified_t<R>>, R>) {
+							detail::unwrap(f.value()) = stack::unqualified_get<meta::unwrapped_t<T>>(L, boost + (is_variable ? 3 : 1));
+							if (clean_stack) {
+								lua_settop(L, 0);
+							}
+							return 0;
+						}
+						else {
+							return luaL_error(L, "sol: cannot write to this variable: copy assignment/constructor not available");
+						}
+					}
+				}
+			}
+		};
+
+		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<lua_CFunction_ref, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, lua_CFunction_ref f) {
+				return f(L);
+			}
+		};
+
+		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<lua_CFunction, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, lua_CFunction f) {
+				return f(L);
+			}
+		};
+
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<detail::lua_CFunction_noexcept, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, detail::lua_CFunction_noexcept f) {
+				return f(L);
+			}
+		};
+#endif // noexcept function types
+
+		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<detail::no_prop, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, const detail::no_prop&) {
+				return luaL_error(L, is_index ? "sol: cannot read from a writeonly property" : "sol: cannot write to a readonly property");
+			}
+		};
+
+		template <bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<no_construction, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, const no_construction&) {
+				return function_detail::no_construction_error(L);
+			}
+		};
+
+		template <typename... Args, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<bases<Args...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State*, const bases<Args...>&) {
+				// Uh. How did you even call this, lul
+				return 0;
+			}
+		};
+
+		template <typename T, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct agnostic_lua_call_wrapper<std::reference_wrapper<T>, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, std::reference_wrapper<T> f) {
+				agnostic_lua_call_wrapper<T, is_index, is_variable, checked, boost, clean_stack> alcw {};
+				return alcw.call(L, f.get());
+			}
+		};
+
+		template <typename T, typename F, bool is_index, bool is_variable, bool checked = detail::default_safe_function_calls, int boost = 0,
+		     bool clean_stack = true, typename = void>
+		struct lua_call_wrapper {
+			template <typename Fx, typename... Args>
+			static int call(lua_State* L, Fx&& fx, Args&&... args) {
+				if constexpr (std::is_member_function_pointer_v<F>) {
+					using wrap = wrapper<F>;
+					using object_type = typename wrap::object_type;
+					if constexpr (sizeof...(Args) < 1) {
+						using Ta = meta::conditional_t<std::is_void_v<T>, object_type, T>;
+						static_assert(std::is_base_of_v<object_type, Ta>,
+						     "It seems like you might have accidentally bound a class type with a member function method that does not correspond to the "
+						     "class. For example, there could be a small type in your new_usertype<T>(...) binding, where you specify one class \"T\" "
+						     "but then bind member methods from a complete unrelated class. Check things over!");
+#if SOL_IS_ON(SOL_SAFE_USERTYPE)
+						auto maybeo = stack::check_get<Ta*>(L, 1);
+						if (!maybeo || maybeo.value() == nullptr) {
+							return luaL_error(L,
+							     "sol: received nil for 'self' argument (use ':' for accessing member functions, make sure member variables are "
+							     "preceeded by the "
+							     "actual object with '.' syntax)");
+						}
+						object_type* o = static_cast<object_type*>(maybeo.value());
+						return call(L, std::forward<Fx>(fx), *o);
+#else
+						object_type& o = static_cast<object_type&>(*stack::unqualified_get<non_null<Ta*>>(L, 1));
+						return call(L, std::forward<Fx>(fx), o);
+#endif // Safety
+					}
+					else {
+						using returns_list = typename wrap::returns_list;
+						using args_list = typename wrap::args_list;
+						using caller = typename wrap::caller;
+						return stack::call_into_lua<checked, clean_stack>(
+						     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), std::forward<Fx>(fx), std::forward<Args>(args)...);
+					}
+				}
+				else if constexpr (std::is_member_object_pointer_v<F>) {
+					using wrap = wrapper<F>;
+					using object_type = typename wrap::object_type;
+					if constexpr (is_index) {
+						if constexpr (sizeof...(Args) < 1) {
+							using Ta = meta::conditional_t<std::is_void_v<T>, object_type, T>;
+							static_assert(std::is_base_of_v<object_type, Ta>,
+							     "It seems like you might have accidentally bound a class type with a member function method that does not correspond "
+							     "to the class. For example, there could be a small type in your new_usertype<T>(...) binding, where you specify one "
+							     "class \"T\" but then bind member methods from a complete unrelated class. Check things over!");
+#if SOL_IS_ON(SOL_SAFE_USERTYPE)
+							auto maybeo = stack::check_get<Ta*>(L, 1);
+							if (!maybeo || maybeo.value() == nullptr) {
+								if (is_variable) {
+									return luaL_error(L, "sol: 'self' argument is lua_nil (bad '.' access?)");
+								}
+								return luaL_error(L, "sol: 'self' argument is lua_nil (pass 'self' as first argument)");
+							}
+							object_type* o = static_cast<object_type*>(maybeo.value());
+							return call(L, std::forward<Fx>(fx), *o);
+#else
+							object_type& o = static_cast<object_type&>(*stack::get<non_null<Ta*>>(L, 1));
+							return call(L, std::forward<Fx>(fx), o);
+#endif // Safety
+						}
+						else {
+							using returns_list = typename wrap::returns_list;
+							using caller = typename wrap::caller;
+							return stack::call_into_lua<checked, clean_stack>(returns_list(),
+							     types<>(),
+							     L,
+							     boost + (is_variable ? 3 : 2),
+							     caller(),
+							     std::forward<Fx>(fx),
+							     std::forward<Args>(args)...);
+						}
+					}
+					else {
+						using traits_type = lua_bind_traits<F>;
+						using return_type = typename traits_type::return_type;
+						constexpr bool ret_is_const = std::is_const_v<std::remove_reference_t<return_type>>;
+						if constexpr (ret_is_const) {
+							(void)fx;
+							(void)detail::swallow { 0, (static_cast<void>(args), 0)... };
+							return luaL_error(L, "sol: cannot write to a readonly (const) variable");
+						}
+						else {
+							using u_return_type = meta::unqualified_t<return_type>;
+							constexpr bool is_assignable = std::is_copy_assignable_v<u_return_type> || std::is_array_v<u_return_type>;
+							if constexpr (!is_assignable) {
+								(void)fx;
+								(void)detail::swallow { 0, ((void)args, 0)... };
+								return luaL_error(L, "sol: cannot write to this variable: copy assignment/constructor not available");
+							}
+							else {
+								using args_list = typename wrap::args_list;
+								using caller = typename wrap::caller;
+								if constexpr (sizeof...(Args) > 0) {
+									return stack::call_into_lua<checked, clean_stack>(types<void>(),
+									     args_list(),
+									     L,
+									     boost + (is_variable ? 3 : 2),
+									     caller(),
+									     std::forward<Fx>(fx),
+									     std::forward<Args>(args)...);
+								}
+								else {
+									using Ta = meta::conditional_t<std::is_void_v<T>, object_type, T>;
+#if SOL_IS_ON(SOL_SAFE_USERTYPE)
+									auto maybeo = stack::check_get<Ta*>(L, 1);
+									if (!maybeo || maybeo.value() == nullptr) {
+										if (is_variable) {
+											return luaL_error(L, "sol: received nil for 'self' argument (bad '.' access?)");
+										}
+										return luaL_error(L, "sol: received nil for 'self' argument (pass 'self' as first argument)");
+									}
+									object_type* po = static_cast<object_type*>(maybeo.value());
+									object_type& o = *po;
+#else
+									object_type& o = static_cast<object_type&>(*stack::get<non_null<Ta*>>(L, 1));
+#endif // Safety
+
+									return stack::call_into_lua<checked, clean_stack>(
+									     types<void>(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), std::forward<Fx>(fx), o);
+								}
+							}
+						}
+					}
+				}
+				else {
+					agnostic_lua_call_wrapper<F, is_index, is_variable, checked, boost, clean_stack> alcw {};
+					return alcw.call(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+				}
+			}
+		};
+
+		template <typename T, typename F, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, readonly_wrapper<F>, is_index, is_variable, checked, boost, clean_stack, C> {
+			using traits_type = lua_bind_traits<F>;
+			using wrap = wrapper<F>;
+			using object_type = typename wrap::object_type;
+
+			static int call(lua_State* L, readonly_wrapper<F>&& rw) {
+				if constexpr (!is_index) {
+					(void)rw;
+					return luaL_error(L, "sol: cannot write to a sol::readonly variable");
+				}
+				else {
+					lua_call_wrapper<T, F, true, is_variable, checked, boost, clean_stack, C> lcw;
+					return lcw.call(L, std::move(rw.value()));
+				}
+			}
+
+			static int call(lua_State* L, readonly_wrapper<F>&& rw, object_type& o) {
+				if constexpr (!is_index) {
+					(void)o;
+					return call(L, std::move(rw));
+				}
+				else {
+					lua_call_wrapper<T, F, true, is_variable, checked, boost, clean_stack, C> lcw;
+					return lcw.call(L, rw.value(), o);
+				}
+			}
+
+			static int call(lua_State* L, const readonly_wrapper<F>& rw) {
+				if constexpr (!is_index) {
+					(void)rw;
+					return luaL_error(L, "sol: cannot write to a sol::readonly variable");
+				}
+				else {
+					lua_call_wrapper<T, F, true, is_variable, checked, boost, clean_stack, C> lcw;
+					return lcw.call(L, rw.value());
+				}
+			}
+
+			static int call(lua_State* L, const readonly_wrapper<F>& rw, object_type& o) {
+				if constexpr (!is_index) {
+					(void)o;
+					return call(L, rw);
+				}
+				else {
+					lua_call_wrapper<T, F, true, is_variable, checked, boost, clean_stack, C> lcw;
+					return lcw.call(L, rw.value(), o);
+				}
+			}
+		};
+
+		template <typename T, typename... Args, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, constructor_list<Args...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef constructor_list<Args...> F;
+
+			static int call(lua_State* L, F&) {
+				const auto& meta = usertype_traits<T>::metatable();
+				int argcount = lua_gettop(L);
+				call_syntax syntax = argcount > 0 ? stack::get_call_syntax(L, usertype_traits<T>::user_metatable(), 1) : call_syntax::dot;
+				argcount -= static_cast<int>(syntax);
+
+				T* obj = detail::usertype_allocate<T>(L);
+				reference userdataref(L, -1);
+				stack::stack_detail::undefined_metatable umf(L, &meta[0], &stack::stack_detail::set_undefined_methods_on<T>);
+
+				// put userdata at the first index
+				lua_insert(L, 1);
+				// Because of the way constructors work,
+				// we have to kill the data, but only if the cosntructor is successfulyl invoked...
+				// if it's not successfully invoked and we panic,
+				// we cannot actually deallcoate/delete the data.
+				construct_match<T, Args...>(
+				     constructor_match<T, checked, clean_stack>(obj, userdataref, umf), L, argcount, boost + 1 + 1 + static_cast<int>(syntax));
+
+				userdataref.push();
+				return 1;
+			}
+		};
+
+		template <typename T, typename... Cxs, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, constructor_wrapper<Cxs...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef constructor_wrapper<Cxs...> F;
+
+			struct onmatch {
+				template <typename Fx, std::size_t I, typename... R, typename... Args>
+				int operator()(types<Fx>, meta::index_value<I>, types<R...> r, types<Args...> a, lua_State* L, int, int start, F& f) {
+					const auto& meta = usertype_traits<T>::metatable();
+					T* obj = detail::usertype_allocate<T>(L);
+					reference userdataref(L, -1);
+					stack::stack_detail::undefined_metatable umf(L, &meta[0], &stack::stack_detail::set_undefined_methods_on<T>);
+					umf();
+
+					auto& func = std::get<I>(f.functions);
+					// put userdata at the first index
+					lua_insert(L, 1);
+					stack::call_into_lua<checked, clean_stack>(r, a, L, boost + 1 + start, func, detail::implicit_wrapper<T>(obj));
+
+					userdataref.push();
+					return 1;
+				}
+			};
+
+			static int call(lua_State* L, F& f) {
+				call_syntax syntax = stack::get_call_syntax(L, usertype_traits<T>::user_metatable(), 1);
+				int syntaxval = static_cast<int>(syntax);
+				int argcount = lua_gettop(L) - syntaxval;
+				return construct_match<T, meta::pop_front_type_t<meta::function_args_t<Cxs>>...>(onmatch(), L, argcount, 1 + syntaxval, f);
+			}
+		};
+
+		template <typename T, typename Fx, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, destructor_wrapper<Fx>, is_index, is_variable, checked, boost, clean_stack, C> {
+
+			template <typename F>
+			static int call(lua_State* L, F&& f) {
+				if constexpr (std::is_void_v<Fx>) {
+					return detail::usertype_alloc_destroy<T>(L);
+				}
+				else {
+					using uFx = meta::unqualified_t<Fx>;
+					lua_call_wrapper<T, uFx, is_index, is_variable, checked, boost, clean_stack> lcw {};
+					return lcw.call(L, std::forward<F>(f).fx);
+				}
+			}
+		};
+
+		template <typename T, typename... Fs, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, overload_set<Fs...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef overload_set<Fs...> F;
+
+			struct on_match {
+				template <typename Fx, std::size_t I, typename... R, typename... Args>
+				int operator()(types<Fx>, meta::index_value<I>, types<R...>, types<Args...>, lua_State* L, int, int, F& fx) {
+					auto& f = std::get<I>(fx.functions);
+					return lua_call_wrapper<T, Fx, is_index, is_variable, checked, boost> {}.call(L, f);
+				}
+			};
+
+			static int call(lua_State* L, F& fx) {
+				return overload_match_arity<Fs...>(on_match(), L, lua_gettop(L), 1, fx);
+			}
+		};
+
+		template <typename T, typename... Fs, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, factory_wrapper<Fs...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef factory_wrapper<Fs...> F;
+
+			struct on_match {
+				template <typename Fx, std::size_t I, typename... R, typename... Args>
+				int operator()(types<Fx>, meta::index_value<I>, types<R...>, types<Args...>, lua_State* L, int, int, F& fx) {
+					auto& f = std::get<I>(fx.functions);
+					return lua_call_wrapper<T, Fx, is_index, is_variable, checked, boost, clean_stack> {}.call(L, f);
+				}
+			};
+
+			static int call(lua_State* L, F& fx) {
+				return overload_match_arity<Fs...>(on_match(), L, lua_gettop(L) - boost, 1 + boost, fx);
+			}
+		};
+
+		template <typename T, typename R, typename W, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, property_wrapper<R, W>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef meta::conditional_t<is_index, R, W> P;
+			typedef meta::unqualified_t<P> U;
+			typedef wrapper<U> wrap;
+			typedef lua_bind_traits<U> traits_type;
+			typedef meta::unqualified_t<typename traits_type::template arg_at<0>> object_type;
+
+			template <typename F, typename... Args>
+			static int call(lua_State* L, F&& f, Args&&... args) {
+				constexpr bool is_specialized = meta::any<std::is_same<U, detail::no_prop>,
+				     meta::is_specialization_of<U, var_wrapper>,
+				     meta::is_specialization_of<U, constructor_wrapper>,
+				     meta::is_specialization_of<U, constructor_list>,
+				     std::is_member_pointer<U>>::value;
+				if constexpr (is_specialized) {
+					if constexpr (is_index) {
+						decltype(auto) p = f.read();
+						lua_call_wrapper<T, meta::unqualified_t<decltype(p)>, is_index, is_variable, checked, boost, clean_stack> lcw {};
+						return lcw.call(L, p, std::forward<Args>(args)...);
+					}
+					else {
+						decltype(auto) p = f.write();
+						lua_call_wrapper<T, meta::unqualified_t<decltype(p)>, is_index, is_variable, checked, boost, clean_stack> lcw {};
+						return lcw.call(L, p, std::forward<Args>(args)...);
+					}
+				}
+				else {
+					constexpr bool non_class_object_type = meta::any<std::is_void<object_type>,
+					     meta::boolean<lua_type_of<meta::unwrap_unqualified_t<object_type>>::value != type::userdata>>::value;
+					if constexpr (non_class_object_type) {
+						// The type being void means we don't have any arguments, so it might be a free functions?
+						using args_list = typename traits_type::free_args_list;
+						using returns_list = typename wrap::returns_list;
+						using caller = typename wrap::caller;
+						if constexpr (is_index) {
+							decltype(auto) pf = f.read();
+							return stack::call_into_lua<checked, clean_stack>(
+							     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), pf);
+						}
+						else {
+							decltype(auto) pf = f.write();
+							return stack::call_into_lua<checked, clean_stack>(
+							     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), pf);
+						}
+					}
+					else {
+						using args_list = meta::pop_front_type_t<typename traits_type::free_args_list>;
+						using Ta = T;
+						using Oa = std::remove_pointer_t<object_type>;
+#if SOL_IS_ON(SOL_SAFE_USERTYPE)
+						auto maybeo = stack::check_get<Ta*>(L, 1);
+						if (!maybeo || maybeo.value() == nullptr) {
+							if (is_variable) {
+								return luaL_error(L, "sol: 'self' argument is lua_nil (bad '.' access?)");
+							}
+							return luaL_error(L, "sol: 'self' argument is lua_nil (pass 'self' as first argument)");
+						}
+						Oa* o = static_cast<Oa*>(maybeo.value());
+#else
+						Oa* o = static_cast<Oa*>(stack::get<non_null<Ta*>>(L, 1));
+#endif // Safety
+						using returns_list = typename wrap::returns_list;
+						using caller = typename wrap::caller;
+						if constexpr (is_index) {
+							decltype(auto) pf = f.read();
+							return stack::call_into_lua<checked, clean_stack>(
+							     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), pf, detail::implicit_wrapper<Oa>(*o));
+						}
+						else {
+							decltype(auto) pf = f.write();
+							return stack::call_into_lua<checked, clean_stack>(
+							     returns_list(), args_list(), L, boost + (is_variable ? 3 : 2), caller(), pf, detail::implicit_wrapper<Oa>(*o));
+						}
+					}
+				}
+			}
+		};
+
+		template <typename T, typename V, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, protect_t<V>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef protect_t<V> F;
+
+			template <typename... Args>
+			static int call(lua_State* L, F& fx, Args&&... args) {
+				return lua_call_wrapper<T, V, is_index, is_variable, true, boost, clean_stack> {}.call(L, fx.value, std::forward<Args>(args)...);
+			}
+		};
+
+		template <typename T, typename F, typename... Policies, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, policy_wrapper<F, Policies...>, is_index, is_variable, checked, boost, clean_stack, C> {
+			typedef policy_wrapper<F, Policies...> P;
+
+			template <std::size_t... In>
+			static int call(std::index_sequence<In...>, lua_State* L, P& fx) {
+				int pushed = lua_call_wrapper<T, F, is_index, is_variable, checked, boost, false, C> {}.call(L, fx.value);
+				(void)detail::swallow { int(), (policy_detail::handle_policy(std::get<In>(fx.policies), L, pushed), int())... };
+				return pushed;
+			}
+
+			static int call(lua_State* L, P& fx) {
+				typedef typename P::indices indices;
+				return call(indices(), L, fx);
+			}
+		};
+
+		template <typename T, typename Y, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, yielding_t<Y>, is_index, is_variable, checked, boost, clean_stack, C> {
+			template <typename F>
+			static int call(lua_State* L, F&& f) {
+				return lua_call_wrapper<T, meta::unqualified_t<Y>, is_index, is_variable, checked, boost, clean_stack> {}.call(L, f.func);
+			}
+		};
+
+		template <typename T, typename Sig, typename P, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
+		struct lua_call_wrapper<T, function_arguments<Sig, P>, is_index, is_variable, checked, boost, clean_stack, C> {
+			static int call(lua_State* L, const function_arguments<Sig, P>& f) {
+				lua_call_wrapper<T, meta::unqualified_t<P>, is_index, is_variable, checked, boost, clean_stack> lcw {};
+				return lcw.call(L, std::get<0>(f.arguments));
+			}
+
+			static int call(lua_State* L, function_arguments<Sig, P>& f) {
+				lua_call_wrapper<T, meta::unqualified_t<P>, is_index, is_variable, checked, boost, clean_stack> lcw {};
+				return lcw.call(L, std::get<0>(f.arguments));
+			}
+
+			static int call(lua_State* L, function_arguments<Sig, P>&& f) {
+				lua_call_wrapper<T, meta::unqualified_t<P>, is_index, is_variable, checked, boost, clean_stack> lcw {};
+				return lcw.call(L, std::get<0>(std::move(f.arguments)));
+			}
+		};
+
+		template <typename T, bool is_index, bool is_variable, int boost = 0, bool checked = detail::default_safe_function_calls, bool clean_stack = true,
+		     typename Fx, typename... Args>
+		inline int call_wrapped(lua_State* L, Fx&& fx, Args&&... args) {
+			using uFx = meta::unqualified_t<Fx>;
+			if constexpr (meta::is_specialization_of_v<uFx, yielding_t>) {
+				using real_fx = meta::unqualified_t<decltype(std::forward<Fx>(fx).func)>;
+				lua_call_wrapper<T, real_fx, is_index, is_variable, checked, boost, clean_stack> lcw {};
+				return lcw.call(L, std::forward<Fx>(fx).func, std::forward<Args>(args)...);
+			}
+			else {
+				lua_call_wrapper<T, uFx, is_index, is_variable, checked, boost, clean_stack> lcw {};
+				return lcw.call(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+		}
+
+		template <typename T, bool is_index, bool is_variable, typename F, int start = 1, bool checked = detail::default_safe_function_calls,
+		     bool clean_stack = true>
+		inline int call_user(lua_State* L) {
+			auto& fx = stack::unqualified_get<user<F>>(L, upvalue_index(start));
+			using uFx = meta::unqualified_t<F>;
+			int nr = call_wrapped<T, is_index, is_variable, 0, checked, clean_stack>(L, fx);
+			if constexpr (meta::is_specialization_of_v<uFx, yielding_t>) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		template <typename T, typename = void>
+		struct is_var_bind : std::false_type { };
+
+		template <typename T>
+		struct is_var_bind<T, std::enable_if_t<std::is_member_object_pointer<T>::value>> : std::true_type { };
+
+		template <typename T>
+		struct is_var_bind<T, std::enable_if_t<is_lua_reference_or_proxy<T>::value>> : std::true_type { };
+
+		template <>
+		struct is_var_bind<detail::no_prop> : std::true_type { };
+
+		template <typename R, typename W>
+		struct is_var_bind<property_wrapper<R, W>> : std::true_type { };
+
+		template <typename T>
+		struct is_var_bind<var_wrapper<T>> : std::true_type { };
+
+		template <typename T>
+		struct is_var_bind<readonly_wrapper<T>> : is_var_bind<meta::unqualified_t<T>> { };
+
+		template <typename F, typename... Policies>
+		struct is_var_bind<policy_wrapper<F, Policies...>> : is_var_bind<meta::unqualified_t<F>> { };
+	} // namespace call_detail
+
+	template <typename T>
+	struct is_variable_binding : call_detail::is_var_bind<meta::unqualified_t<T>> { };
+
+	template <typename T>
+	using is_var_wrapper = meta::is_specialization_of<T, var_wrapper>;
+
+	template <typename T>
+	struct is_function_binding : meta::neg<is_variable_binding<T>> { };
+
+} // namespace sol
+
+// end of sol/call.hpp
+
+namespace sol {
+	namespace function_detail {
+		template <typename F, F fx>
+		inline int call_wrapper_variable(std::false_type, lua_State* L) {
+			typedef meta::bind_traits<meta::unqualified_t<F>> traits_type;
+			typedef typename traits_type::args_list args_list;
+			typedef meta::tuple_types<typename traits_type::return_type> return_type;
+			return stack::call_into_lua(return_type(), args_list(), L, 1, fx);
+		}
+
+		template <typename R, typename V, V, typename T>
+		inline int call_set_assignable(std::false_type, T&&, lua_State* L) {
+			return luaL_error(L, "cannot write to this type: copy assignment/constructor not available");
+		}
+
+		template <typename R, typename V, V variable, typename T>
+		inline int call_set_assignable(std::true_type, lua_State* L, T&& mem) {
+			(mem.*variable) = stack::get<R>(L, 2);
+			return 0;
+		}
+
+		template <typename R, typename V, V, typename T>
+		inline int call_set_variable(std::false_type, lua_State* L, T&&) {
+			return luaL_error(L, "cannot write to a const variable");
+		}
+
+		template <typename R, typename V, V variable, typename T>
+		inline int call_set_variable(std::true_type, lua_State* L, T&& mem) {
+			return call_set_assignable<R, V, variable>(std::is_assignable<std::add_lvalue_reference_t<R>, R>(), L, std::forward<T>(mem));
+		}
+
+		template <typename V, V variable>
+		inline int call_wrapper_variable(std::true_type, lua_State* L) {
+			typedef meta::bind_traits<meta::unqualified_t<V>> traits_type;
+			typedef typename traits_type::object_type T;
+			typedef typename traits_type::return_type R;
+			auto& mem = stack::get<T>(L, 1);
+			switch (lua_gettop(L)) {
+			case 1: {
+				decltype(auto) r = (mem.*variable);
+				stack::push_reference(L, std::forward<decltype(r)>(r));
+				return 1;
+			}
+			case 2:
+				return call_set_variable<R, V, variable>(meta::neg<std::is_const<R>>(), L, mem);
+			default:
+				return luaL_error(L, "incorrect number of arguments to member variable function call");
+			}
+		}
+
+		template <typename F, F fx>
+		inline int call_wrapper_function(std::false_type, lua_State* L) {
+			return call_wrapper_variable<F, fx>(std::is_member_object_pointer<F>(), L);
+		}
+
+		template <typename F, F fx>
+		inline int call_wrapper_function(std::true_type, lua_State* L) {
+			return call_detail::call_wrapped<void, false, false>(L, fx);
+		}
+
+		template <typename F, F fx>
+		int call_wrapper_entry(lua_State* L) noexcept(meta::bind_traits<F>::is_noexcept) {
+			return call_wrapper_function<F, fx>(std::is_member_function_pointer<meta::unqualified_t<F>>(), L);
+		}
+
+		template <typename... Fxs>
+		struct c_call_matcher {
+			template <typename Fx, std::size_t I, typename R, typename... Args>
+			int operator()(types<Fx>, meta::index_value<I>, types<R>, types<Args...>, lua_State* L, int, int) const {
+				typedef meta::at_in_pack_t<I, Fxs...> target;
+				return target::call(L);
+			}
+		};
+
+		template <typename F, F fx>
+		inline int c_call_raw(std::true_type, lua_State* L) {
+			return fx(L);
+		}
+
+		template <typename F, F fx>
+		inline int c_call_raw(std::false_type, lua_State* L) {
+#ifdef __clang__
+			return detail::trampoline(L, function_detail::call_wrapper_entry<F, fx>);
+#else
+			return detail::typed_static_trampoline<decltype(&function_detail::call_wrapper_entry<F, fx>), (&function_detail::call_wrapper_entry<F, fx>)>(L);
+#endif // fuck you clang :c
+		}
+
+	} // namespace function_detail
+
+	template <typename F, F fx>
+	inline int c_call(lua_State* L) {
+		typedef meta::unqualified_t<F> Fu;
+		typedef std::integral_constant<bool,
+		     std::is_same<Fu, lua_CFunction>::value
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+		          || std::is_same<Fu, detail::lua_CFunction_noexcept>::value
+#endif
+		     >
+		     is_raw;
+		return function_detail::c_call_raw<F, fx>(is_raw(), L);
+	}
+
+	template <typename F, F f>
+	struct wrap {
+		typedef F type;
+
+		static int call(lua_State* L) noexcept(noexcept(c_call<type, f>(L))) {
+			return c_call<type, f>(L);
+		}
+	};
+
+	template <typename... Fxs>
+	inline int c_call(lua_State* L) {
+		if constexpr (sizeof...(Fxs) < 2) {
+			using target = meta::at_in_pack_t<0, Fxs...>;
+			return target::call(L);
+		}
+		else {
+			return call_detail::overload_match_arity<typename Fxs::type...>(function_detail::c_call_matcher<Fxs...>(), L, lua_gettop(L), 1);
+		}
+	}
+
+} // namespace sol
+
+// end of sol/function_types_templated.hpp
+
+// beginning of sol/function_types_stateless.hpp
+
+namespace sol { namespace function_detail {
+	template <typename Function>
+	struct upvalue_free_function {
+		using function_type = std::remove_pointer_t<std::decay_t<Function>>;
+		using traits_type = meta::bind_traits<function_type>;
+
+		static int real_call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			auto udata = stack::stack_detail::get_as_upvalues<function_type*>(L);
+			function_type* fx = udata.first;
+			return call_detail::call_wrapped<void, true, false>(L, fx);
+		}
+
+		template <bool is_yielding, bool no_trampoline>
+		static int call(lua_State* L) {
+			int nr;
+			if constexpr (no_trampoline) {
+				nr = real_call(L);
+			}
+			else {
+				nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+	};
+
+	template <typename T, typename Function>
+	struct upvalue_member_function {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef lua_bind_traits<function_type> traits_type;
+
+		static int real_call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			// Layout:
+			// idx 1...n: verbatim data of member function pointer
+			// idx n + 1: is the object's void pointer
+			// We don't need to store the size, because the other side is templated
+			// with the same member function pointer type
+			function_type& memfx = stack::get<user<function_type>>(L, upvalue_index(2));
+			auto& item = *static_cast<T*>(stack::get<void*>(L, upvalue_index(3)));
+			return call_detail::call_wrapped<T, true, false, -1>(L, memfx, item);
+		}
+
+		template <bool is_yielding, bool no_trampoline>
+		static int call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			int nr;
+			if constexpr (no_trampoline) {
+				nr = real_call(L);
+			}
+			else {
+				nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			return call(L);
+		}
+	};
+
+	template <typename T, typename Function>
+	struct upvalue_member_variable {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef lua_bind_traits<function_type> traits_type;
+
+		static int real_call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			// Layout:
+			// idx 1...n: verbatim data of member variable pointer
+			// idx n + 1: is the object's void pointer
+			// We don't need to store the size, because the other side is templated
+			// with the same member function pointer type
+			auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
+			auto objdata = stack::stack_detail::get_as_upvalues<T*>(L, memberdata.second);
+			auto& mem = *objdata.first;
+			function_type& var = memberdata.first;
+			switch (lua_gettop(L)) {
+			case 0:
+				return call_detail::call_wrapped<T, true, false, -1>(L, var, mem);
+			case 1:
+				return call_detail::call_wrapped<T, false, false, -1>(L, var, mem);
+			default:
+				return luaL_error(L, "sol: incorrect number of arguments to member variable function");
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline>
+		static int call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			int nr;
+			if constexpr (no_trampoline) {
+				nr = real_call(L);
+			}
+			else {
+				nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			return call(L);
+		}
+	};
+
+	template <typename T, typename Function>
+	struct upvalue_member_variable<T, readonly_wrapper<Function>> {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef lua_bind_traits<function_type> traits_type;
+
+		static int real_call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			// Layout:
+			// idx 1...n: verbatim data of member variable pointer
+			// idx n + 1: is the object's void pointer
+			// We don't need to store the size, because the other side is templated
+			// with the same member function pointer type
+			auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
+			auto objdata = stack::stack_detail::get_as_upvalues<T*>(L, memberdata.second);
+			auto& mem = *objdata.first;
+			function_type& var = memberdata.first;
+			switch (lua_gettop(L)) {
+			case 0:
+				return call_detail::call_wrapped<T, true, false, -1>(L, var, mem);
+			default:
+				return luaL_error(L, "sol: incorrect number of arguments to member variable function");
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline>
+		static int call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			int nr;
+			if constexpr (no_trampoline) {
+				nr = real_call(L);
+			}
+			else {
+				nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			return call(L);
+		}
+	};
+
+	template <typename T, typename Function>
+	struct upvalue_this_member_function {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef lua_bind_traits<function_type> traits_type;
+
+		static int real_call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			// Layout:
+			// idx 1...n: verbatim data of member variable pointer
+			function_type& memfx = stack::get<user<function_type>>(L, upvalue_index(2));
+			return call_detail::call_wrapped<T, false, false>(L, memfx);
+		}
+
+		template <bool is_yielding, bool no_trampoline>
+		static int call(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			int nr;
+			if constexpr (no_trampoline) {
+				nr = real_call(L);
+			}
+			else {
+				nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			return call(L);
+		}
+	};
+
+	template <typename T, typename Function>
+	struct upvalue_this_member_variable {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+
+		static int real_call(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			// Layout:
+			// idx 1...n: verbatim data of member variable pointer
+			auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
+			function_type& var = memberdata.first;
+			switch (lua_gettop(L)) {
+			case 1:
+				return call_detail::call_wrapped<T, true, false>(L, var);
+			case 2:
+				return call_detail::call_wrapped<T, false, false>(L, var);
+			default:
+				return luaL_error(L, "sol: incorrect number of arguments to member variable function");
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline>
+		static int call(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			int nr;
+			if constexpr (no_trampoline) {
+				nr = real_call(L);
+			}
+			else {
+				nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			return call(L);
+		}
+	};
+
+	template <typename T, typename Function>
+	struct upvalue_this_member_variable<T, readonly_wrapper<Function>> {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef lua_bind_traits<function_type> traits_type;
+
+		static int real_call(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			// Layout:
+			// idx 1...n: verbatim data of member variable pointer
+			auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
+			function_type& var = memberdata.first;
+			switch (lua_gettop(L)) {
+			case 1:
+				return call_detail::call_wrapped<T, true, false>(L, var);
+			default:
+				return luaL_error(L, "sol: incorrect number of arguments to member variable function");
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline>
+		static int call(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			int nr;
+			if constexpr (no_trampoline) {
+				nr = real_call(L);
+			}
+			else {
+				nr = detail::typed_static_trampoline<decltype(&real_call), (&real_call)>(L);
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			return call(L);
+		}
+	};
+}} // namespace sol::function_detail
+
+// end of sol/function_types_stateless.hpp
+
+// beginning of sol/function_types_stateful.hpp
+
+namespace sol { namespace function_detail {
+	template <typename Func, bool is_yielding, bool no_trampoline>
+	struct functor_function {
+		typedef std::decay_t<meta::unwrap_unqualified_t<Func>> function_type;
+		function_type invocation;
+
+		template <typename... Args>
+		functor_function(function_type f, Args&&... args) noexcept(std::is_nothrow_constructible_v<function_type, function_type, Args...>)
+		: invocation(std::move(f), std::forward<Args>(args)...) {
+		}
+
+		static int call(lua_State* L, functor_function& self) noexcept(noexcept(call_detail::call_wrapped<void, true, false>(L, self.invocation))) {
+			int nr = call_detail::call_wrapped<void, true, false>(L, self.invocation);
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) noexcept(noexcept(call_detail::call_wrapped<void, true, false>(L, invocation))) {
+			if constexpr (no_trampoline) {
+				return call(L, *this);
+			}
+			else {
+				return detail::trampoline(L, &call, *this);
+			}
+		}
+	};
+
+	template <typename T, typename Function, bool is_yielding, bool no_trampoline>
+	struct member_function {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef meta::function_return_t<function_type> return_type;
+		typedef meta::function_args_t<function_type> args_lists;
+		using traits_type = meta::bind_traits<function_type>;
+		function_type invocation;
+		T member;
+
+		template <typename... Args>
+		member_function(function_type f, Args&&... args) noexcept(
+			std::is_nothrow_constructible_v<function_type, function_type>&& std::is_nothrow_constructible_v<T, Args...>)
+		: invocation(std::move(f)), member(std::forward<Args>(args)...) {
+		}
+
+		static int call(lua_State* L, member_function& self)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			int nr = call_detail::call_wrapped<T, true, false, -1>(L, self.invocation, detail::unwrap(detail::deref(self.member)));
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L)
+#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		// MSVC is broken, what a surprise...
+#else
+			noexcept(traits_type::is_noexcept)
+#endif
+		{
+			if constexpr (no_trampoline) {
+				return call(L, *this);
+			}
+			else {
+				return detail::trampoline(L, &call, *this);
+			}
+		}
+	};
+
+	template <typename T, typename Function, bool is_yielding, bool no_trampoline>
+	struct member_variable {
+		typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
+		typedef typename meta::bind_traits<function_type>::return_type return_type;
+		typedef typename meta::bind_traits<function_type>::args_list args_lists;
+		function_type var;
+		T member;
+		typedef std::add_lvalue_reference_t<meta::unwrapped_t<std::remove_reference_t<decltype(detail::deref(member))>>> M;
+
+		template <typename... Args>
+		member_variable(function_type v, Args&&... args) noexcept(
+			std::is_nothrow_constructible_v<function_type, function_type>&& std::is_nothrow_constructible_v<T, Args...>)
+		: var(std::move(v)), member(std::forward<Args>(args)...) {
+		}
+
+		static int call(lua_State* L, member_variable& self) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			int nr;
+			{
+				M mem = detail::unwrap(detail::deref(self.member));
+				switch (lua_gettop(L)) {
+				case 0:
+					nr = call_detail::call_wrapped<T, true, false, -1>(L, self.var, mem);
+					break;
+				case 1:
+					nr = call_detail::call_wrapped<T, false, false, -1>(L, self.var, mem);
+					break;
+				default:
+					nr = luaL_error(L, "sol: incorrect number of arguments to member variable function");
+					break;
+				}
+			}
+			if (is_yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		int operator()(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
+			if constexpr (no_trampoline) {
+				return call(L, *this);
+			}
+			else {
+				return detail::trampoline(L, &call, *this);
+			}
+		}
+	};
+}} // namespace sol::function_detail
+
+// end of sol/function_types_stateful.hpp
+
+// beginning of sol/function_types_overloaded.hpp
+
+namespace sol { namespace function_detail {
+	template <int start_skew, typename... Functions>
+	struct overloaded_function {
+		typedef std::tuple<Functions...> overload_list;
+		typedef std::make_index_sequence<sizeof...(Functions)> indices;
+		overload_list overloads;
+
+		overloaded_function(overload_list set) : overloads(std::move(set)) {
+		}
+
+		overloaded_function(Functions... fxs) : overloads(fxs...) {
+		}
+
+		template <typename Fx, std::size_t I, typename... R, typename... Args>
+		static int call(types<Fx>, meta::index_value<I>, types<R...>, types<Args...>, lua_State* L, int, int, overload_list& ol) {
+			auto& func = std::get<I>(ol);
+			int nr = call_detail::call_wrapped<void, true, false, start_skew>(L, func);
+			return nr;
+		}
+
+		struct on_success {
+			template <typename... Args>
+			int operator()(Args&&... args) const {
+				return call(std::forward<Args>(args)...);
+			}
+		};
+
+		int operator()(lua_State* L) {
+			on_success call_obj {};
+			return call_detail::overload_match<Functions...>(call_obj, L, 1 + start_skew, overloads);
+		}
+	};
+}} // namespace sol::function_detail
+
+// end of sol/function_types_overloaded.hpp
+
+// beginning of sol/resolve.hpp
+
+namespace sol {
+
+#ifndef __clang__
+	// constexpr is fine for not-clang
+
+	namespace detail {
+		template <typename R, typename... Args, typename F, typename = std::invoke_result_t<meta::unqualified_t<F>, Args...>>
+		inline constexpr auto resolve_i(types<R(Args...)>, F&&) -> R (meta::unqualified_t<F>::*)(Args...) {
+			using Sig = R(Args...);
+			typedef meta::unqualified_t<F> Fu;
+			return static_cast<Sig Fu::*>(&Fu::operator());
+		}
+
+		template <typename F, typename U = meta::unqualified_t<F>>
+		inline constexpr auto resolve_f(std::true_type, F&& f)
+		     -> decltype(resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f))) {
+			return resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f));
+		}
+
+		template <typename F>
+		inline constexpr void resolve_f(std::false_type, F&&) {
+			static_assert(meta::call_operator_deducible_v<F>, "Cannot use no-template-parameter call with an overloaded functor: specify the signature");
+		}
+
+		template <typename F, typename U = meta::unqualified_t<F>>
+		inline constexpr auto resolve_i(types<>, F&& f) -> decltype(resolve_f(meta::call_operator_deducible<U>(), std::forward<F>(f))) {
+			return resolve_f(meta::call_operator_deducible<U> {}, std::forward<F>(f));
+		}
+
+		template <typename... Args, typename F, typename R = std::invoke_result_t<F&, Args...>>
+		inline constexpr auto resolve_i(types<Args...>, F&& f) -> decltype(resolve_i(types<R(Args...)>(), std::forward<F>(f))) {
+			return resolve_i(types<R(Args...)>(), std::forward<F>(f));
+		}
+
+		template <typename Sig, typename C>
+		inline constexpr Sig C::*resolve_v(std::false_type, Sig C::*mem_func_ptr) {
+			return mem_func_ptr;
+		}
+
+		template <typename Sig, typename C>
+		inline constexpr Sig C::*resolve_v(std::true_type, Sig C::*mem_variable_ptr) {
+			return mem_variable_ptr;
+		}
+	} // namespace detail
+
+	template <typename... Args, typename R>
+	inline constexpr auto resolve(R fun_ptr(Args...)) -> R (*)(Args...) {
+		return fun_ptr;
+	}
+
+	template <typename Sig>
+	inline constexpr Sig* resolve(Sig* fun_ptr) {
+		return fun_ptr;
+	}
+
+	template <typename... Args, typename R, typename C>
+	inline constexpr auto resolve(R (C::*mem_ptr)(Args...)) -> R (C::*)(Args...) {
+		return mem_ptr;
+	}
+
+	template <typename Sig, typename C>
+	inline constexpr Sig C::*resolve(Sig C::*mem_ptr) {
+		return detail::resolve_v(std::is_member_object_pointer<Sig C::*>(), mem_ptr);
+	}
+
+	template <typename... Sig, typename F, meta::disable<std::is_function<meta::unqualified_t<F>>> = meta::enabler>
+	inline constexpr auto resolve(F&& f) -> decltype(detail::resolve_i(types<Sig...>(), std::forward<F>(f))) {
+		return detail::resolve_i(types<Sig...>(), std::forward<F>(f));
+	}
+#else
+
+	// Clang has distinct problems with constexpr arguments,
+	// so don't use the constexpr versions inside of clang.
+
+	namespace detail {
+		template <typename R, typename... Args, typename F, typename = std::invoke_result_t<meta::unqualified_t<F>, Args...>>
+		inline auto resolve_i(types<R(Args...)>, F&&) -> R (meta::unqualified_t<F>::*)(Args...) {
+			using Sig = R(Args...);
+			typedef meta::unqualified_t<F> Fu;
+			return static_cast<Sig Fu::*>(&Fu::operator());
+		}
+
+		template <typename F, typename U = meta::unqualified_t<F>>
+		inline auto resolve_f(std::true_type, F&& f)
+		     -> decltype(resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f))) {
+			return resolve_i(types<meta::function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f));
+		}
+
+		template <typename F>
+		inline void resolve_f(std::false_type, F&&) {
+			static_assert(meta::call_operator_deducible_v<F>, "Cannot use no-template-parameter call with an overloaded functor: specify the signature");
+		}
+
+		template <typename F, typename U = meta::unqualified_t<F>>
+		inline auto resolve_i(types<>, F&& f) -> decltype(resolve_f(meta::call_operator_deducible<U>(), std::forward<F>(f))) {
+			return resolve_f(meta::call_operator_deducible<U> {}, std::forward<F>(f));
+		}
+
+		template <typename... Args, typename F, typename R = std::invoke_result_t<F&, Args...>>
+		inline auto resolve_i(types<Args...>, F&& f) -> decltype(resolve_i(types<R(Args...)>(), std::forward<F>(f))) {
+			return resolve_i(types<R(Args...)>(), std::forward<F>(f));
+		}
+
+		template <typename Sig, typename C>
+		inline Sig C::*resolve_v(std::false_type, Sig C::*mem_func_ptr) {
+			return mem_func_ptr;
+		}
+
+		template <typename Sig, typename C>
+		inline Sig C::*resolve_v(std::true_type, Sig C::*mem_variable_ptr) {
+			return mem_variable_ptr;
+		}
+	} // namespace detail
+
+	template <typename... Args, typename R>
+	inline auto resolve(R fun_ptr(Args...)) -> R (*)(Args...) {
+		return fun_ptr;
+	}
+
+	template <typename Sig>
+	inline Sig* resolve(Sig* fun_ptr) {
+		return fun_ptr;
+	}
+
+	template <typename... Args, typename R, typename C>
+	inline auto resolve(R (C::*mem_ptr)(Args...)) -> R (C::*)(Args...) {
+		return mem_ptr;
+	}
+
+	template <typename Sig, typename C>
+	inline Sig C::*resolve(Sig C::*mem_ptr) {
+		return detail::resolve_v(std::is_member_object_pointer<Sig C::*>(), mem_ptr);
+	}
+
+	template <typename... Sig, typename F>
+	inline auto resolve(F&& f) -> decltype(detail::resolve_i(types<Sig...>(), std::forward<F>(f))) {
+		return detail::resolve_i(types<Sig...>(), std::forward<F>(f));
+	}
+
+#endif
+
+} // namespace sol
+
+// end of sol/resolve.hpp
+
+namespace sol {
+	namespace function_detail {
+		template <typename T>
+		struct class_indicator {
+			using type = T;
+		};
+
+		struct call_indicator { };
+
+		template <bool yielding>
+		int lua_c_wrapper(lua_State* L) {
+			lua_CFunction cf = lua_tocfunction(L, lua_upvalueindex(2));
+			int nr = cf(L);
+			if constexpr (yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		template <bool yielding>
+		int lua_c_noexcept_wrapper(lua_State* L) noexcept {
+			detail::lua_CFunction_noexcept cf = reinterpret_cast<detail::lua_CFunction_noexcept>(lua_tocfunction(L, lua_upvalueindex(2)));
+			int nr = cf(L);
+			if constexpr (yielding) {
+				return lua_yield(L, nr);
+			}
+			else {
+				return nr;
+			}
+		}
+
+		struct c_function_invocation { };
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename... Args>
+		void select(lua_State* L, Fx&& fx, Args&&... args);
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename... Args>
+		void select_set_fx(lua_State* L, Args&&... args) {
+			lua_CFunction freefunc = no_trampoline ? function_detail::call<meta::unqualified_t<Fx>, 2, is_yielding>
+			                                       : detail::static_trampoline<function_detail::call<meta::unqualified_t<Fx>, 2, is_yielding>>;
+
+			int upvalues = 0;
+			upvalues += stack::push(L, nullptr);
+			upvalues += stack::push<user<Fx>>(L, std::forward<Args>(args)...);
+			stack::push(L, c_closure(freefunc, upvalues));
+		}
+
+		template <bool is_yielding, bool no_trampoline, typename R, typename... A, typename Fx, typename... Args>
+		void select_convertible(types<R(A...)>, lua_State* L, Fx&& fx, Args&&... args) {
+			using dFx = std::decay_t<meta::unwrap_unqualified_t<Fx>>;
+			using fx_ptr_t = R (*)(A...);
+			constexpr bool is_convertible = std::is_convertible_v<dFx, fx_ptr_t>;
+			if constexpr (is_convertible) {
+				fx_ptr_t fxptr = detail::unwrap(std::forward<Fx>(fx));
+				select<is_yielding, no_trampoline>(L, std::move(fxptr), std::forward<Args>(args)...);
+			}
+			else {
+				using F = function_detail::functor_function<dFx, false, true>;
+				select_set_fx<is_yielding, no_trampoline, F>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename... Args>
+		void select_convertible(types<>, lua_State* L, Fx&& fx, Args&&... args) {
+			typedef meta::function_signature_t<meta::unwrap_unqualified_t<Fx>> Sig;
+			select_convertible<is_yielding, no_trampoline>(types<Sig>(), L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+		}
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename... Args>
+		void select_member_variable(lua_State* L, Fx&& fx, Args&&... args) {
+			using uFx = meta::unqualified_t<Fx>;
+			if constexpr (sizeof...(Args) < 1) {
+				using C = typename meta::bind_traits<uFx>::object_type;
+				lua_CFunction freefunc = &function_detail::upvalue_this_member_variable<C, Fx>::template call<is_yielding, no_trampoline>;
+
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::stack_detail::push_as_upvalues(L, fx);
+				stack::push(L, c_closure(freefunc, upvalues));
+			}
+			else if constexpr (sizeof...(Args) < 2) {
+				using Tu = typename meta::meta_detail::unqualified_non_alias<Args...>::type;
+				constexpr bool is_reference = meta::is_specialization_of_v<Tu, std::reference_wrapper> || std::is_pointer_v<Tu>;
+				if constexpr (meta::is_specialization_of_v<Tu, function_detail::class_indicator>) {
+					lua_CFunction freefunc
+					     = &function_detail::upvalue_this_member_variable<typename Tu::type, Fx>::template call<is_yielding, no_trampoline>;
+
+					int upvalues = 0;
+					upvalues += stack::push(L, nullptr);
+					upvalues += stack::stack_detail::push_as_upvalues(L, fx);
+					stack::push(L, c_closure(freefunc, upvalues));
+				}
+				else if constexpr (is_reference) {
+					typedef std::decay_t<Fx> dFx;
+					dFx memfxptr(std::forward<Fx>(fx));
+					auto userptr = detail::ptr(std::forward<Args>(args)...);
+					lua_CFunction freefunc = &function_detail::upvalue_member_variable<std::decay_t<decltype(*userptr)>,
+					     meta::unqualified_t<Fx>>::template call<is_yielding, no_trampoline>;
+
+					int upvalues = 0;
+					upvalues += stack::push(L, nullptr);
+					upvalues += stack::stack_detail::push_as_upvalues(L, memfxptr);
+					upvalues += stack::push(L, static_cast<void const*>(userptr));
+					stack::push(L, c_closure(freefunc, upvalues));
+				}
+				else {
+					using clean_fx = std::remove_pointer_t<std::decay_t<Fx>>;
+					using F = function_detail::member_variable<Tu, clean_fx, is_yielding, no_trampoline>;
+					select_set_fx<is_yielding, no_trampoline, F>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+				}
+			}
+			else {
+				using C = typename meta::bind_traits<uFx>::object_type;
+				using clean_fx = std::remove_pointer_t<std::decay_t<Fx>>;
+				using F = function_detail::member_variable<C, clean_fx, is_yielding, no_trampoline>;
+				select_set_fx<is_yielding, no_trampoline, F>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename T, typename... Args>
+		void select_member_function_with(lua_State* L, Fx&& fx, T&& obj, Args&&... args) {
+			using dFx = std::decay_t<Fx>;
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (meta::is_specialization_of_v<Tu, function_detail::class_indicator>) {
+				(void)obj;
+				using C = typename Tu::type;
+				lua_CFunction freefunc = &function_detail::upvalue_this_member_function<C, dFx>::template call<is_yielding, no_trampoline>;
+
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<dFx>>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+				stack::push(L, c_closure(freefunc, upvalues));
+			}
+			else {
+				constexpr bool is_reference = meta::is_specialization_of_v<Tu, std::reference_wrapper> || std::is_pointer_v<Tu>;
+				if constexpr (is_reference) {
+					auto userptr = detail::ptr(std::forward<T>(obj));
+					lua_CFunction freefunc
+					     = &function_detail::upvalue_member_function<std::decay_t<decltype(*userptr)>, dFx>::template call<is_yielding, no_trampoline>;
+
+					int upvalues = 0;
+					upvalues += stack::push(L, nullptr);
+					upvalues += stack::push<user<dFx>>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+					upvalues += stack::push(L, lightuserdata_value(static_cast<void*>(userptr)));
+					stack::push(L, c_closure(freefunc, upvalues));
+				}
+				else {
+					using F = function_detail::member_function<Tu, dFx, is_yielding, no_trampoline>;
+					select_set_fx<is_yielding, no_trampoline, F>(L, std::forward<Fx>(fx), std::forward<T>(obj), std::forward<Args>(args)...);
+				}
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename... Args>
+		void select_member_function(lua_State* L, Fx&& fx, Args&&... args) {
+			using dFx = std::decay_t<Fx>;
+			if constexpr (sizeof...(Args) < 1) {
+				using C = typename meta::bind_traits<meta::unqualified_t<Fx>>::object_type;
+				lua_CFunction freefunc = &function_detail::upvalue_this_member_function<C, dFx>::template call<is_yielding, no_trampoline>;
+
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<dFx>>(L, std::forward<Fx>(fx));
+				stack::push(L, c_closure(freefunc, upvalues));
+			}
+			else {
+				select_member_function_with<is_yielding, no_trampoline>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+		}
+
+		template <bool is_yielding, bool no_trampoline, typename Fx, typename... Args>
+		void select(lua_State* L, Fx&& fx, Args&&... args) {
+			using uFx = meta::unqualified_t<Fx>;
+			if constexpr (is_lua_reference_v<uFx>) {
+				// TODO: hoist into lambda in this case for yielding???
+				stack::push(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+			else if constexpr (is_lua_c_function_v<uFx>) {
+				if constexpr (no_trampoline) {
+					if (is_yielding) {
+						int upvalues = 0;
+						upvalues += stack::push(L, nullptr);
+						upvalues += stack::push(L, std::forward<Fx>(fx));
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+						if constexpr (std::is_nothrow_invocable_r_v<int, uFx, lua_State*>) {
+							detail::lua_CFunction_noexcept cf = &lua_c_noexcept_wrapper<true>;
+							lua_pushcclosure(L, reinterpret_cast<lua_CFunction>(cf), upvalues);
+						}
+						else
+#endif
+						{
+							lua_CFunction cf = &function_detail::lua_c_wrapper<true>;
+							lua_pushcclosure(L, cf, upvalues);
+						}
+					}
+					else {
+						lua_pushcclosure(L, std::forward<Fx>(fx), 0);
+					}
+				}
+				else {
+					int upvalues = 0;
+					upvalues += stack::push(L, nullptr);
+					upvalues += stack::push(L, std::forward<Fx>(fx));
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+					if constexpr (std::is_nothrow_invocable_r_v<int, uFx, lua_State*>) {
+						detail::lua_CFunction_noexcept cf = &lua_c_noexcept_wrapper<is_yielding>;
+						lua_pushcclosure(L, reinterpret_cast<lua_CFunction>(cf), upvalues);
+					}
+					else {
+						lua_CFunction cf = &function_detail::lua_c_wrapper<is_yielding>;
+						lua_pushcclosure(L, cf, upvalues);
+					}
+#else
+					lua_CFunction cf = &function_detail::lua_c_wrapper<is_yielding>;
+					lua_pushcclosure(L, cf, upvalues);
+#endif
+				}
+			}
+			else if constexpr (std::is_function_v<std::remove_pointer_t<uFx>>) {
+				std::decay_t<Fx> target(std::forward<Fx>(fx), std::forward<Args>(args)...);
+				lua_CFunction freefunc = &function_detail::upvalue_free_function<Fx>::template call<is_yielding, no_trampoline>;
+
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::stack_detail::push_as_upvalues(L, target);
+				stack::push(L, c_closure(freefunc, upvalues));
+			}
+			else if constexpr (std::is_member_function_pointer_v<uFx>) {
+				select_member_function<is_yielding, no_trampoline>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+			else if constexpr (meta::is_member_object_v<uFx>) {
+				select_member_variable<is_yielding, no_trampoline>(L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+			else {
+				select_convertible<is_yielding, no_trampoline>(types<>(), L, std::forward<Fx>(fx), std::forward<Args>(args)...);
+			}
+		}
+	} // namespace function_detail
+
+	namespace stack {
+		template <typename... Sigs>
+		struct unqualified_pusher<function_sig<Sigs...>> {
+			template <bool is_yielding, typename Arg0, typename... Args>
+			static int push_yielding(lua_State* L, Arg0&& arg0, Args&&... args) {
+				if constexpr (meta::is_specialization_of_v<meta::unqualified_t<Arg0>, std::function>) {
+					if constexpr (is_yielding) {
+						return stack::push<meta::unqualified_t<Arg0>>(L, detail::yield_tag, std::forward<Arg0>(arg0), std::forward<Args>(args)...);
+					}
+					else {
+						return stack::push(L, std::forward<Arg0>(arg0), std::forward<Args>(args)...);
+					}
+				}
+				else {
+					function_detail::select<is_yielding, false>(L, std::forward<Arg0>(arg0), std::forward<Args>(args)...);
+					return 1;
+				}
+			}
+
+			template <typename Arg0, typename... Args>
+			static int push(lua_State* L, Arg0&& arg0, Args&&... args) {
+				if constexpr (std::is_same_v<meta::unqualified_t<Arg0>, detail::yield_tag_t>) {
+					push_yielding<true>(L, std::forward<Args>(args)...);
+				}
+				else if constexpr (meta::is_specialization_of_v<meta::unqualified_t<Arg0>, yielding_t>) {
+					push_yielding<true>(L, std::forward<Arg0>(arg0).func, std::forward<Args>(args)...);
+				}
+				else {
+					push_yielding<false>(L, std::forward<Arg0>(arg0), std::forward<Args>(args)...);
+				}
+				return 1;
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<yielding_t<T>> {
+			template <typename... Args>
+			static int push(lua_State* L, const yielding_t<T>& f, Args&&... args) {
+				if constexpr (meta::is_specialization_of_v<meta::unqualified_t<T>, std::function>) {
+					return stack::push<T>(L, detail::yield_tag, f.func, std::forward<Args>(args)...);
+				}
+				else {
+					function_detail::select<true, false>(L, f.func, std::forward<Args>(args)...);
+					return 1;
+				}
+			}
+
+			template <typename... Args>
+			static int push(lua_State* L, yielding_t<T>&& f, Args&&... args) {
+				if constexpr (meta::is_specialization_of_v<meta::unqualified_t<T>, std::function>) {
+					return stack::push<T>(L, detail::yield_tag, std::move(f.func), std::forward<Args>(args)...);
+				}
+				else {
+					function_detail::select<true, false>(L, std::move(f.func), std::forward<Args>(args)...);
+					return 1;
+				}
+			}
+		};
+
+		template <typename T, typename... Args>
+		struct unqualified_pusher<function_arguments<T, Args...>> {
+			template <std::size_t... I, typename FP>
+			static int push_func(std::index_sequence<I...>, lua_State* L, FP&& fp) {
+				return stack::push<T>(L, std::get<I>(std::forward<FP>(fp).arguments)...);
+			}
+
+			static int push(lua_State* L, const function_arguments<T, Args...>& fp) {
+				return push_func(std::make_index_sequence<sizeof...(Args)>(), L, fp);
+			}
+
+			static int push(lua_State* L, function_arguments<T, Args...>&& fp) {
+				return push_func(std::make_index_sequence<sizeof...(Args)>(), L, std::move(fp));
+			}
+		};
+
+		template <typename Signature>
+		struct unqualified_pusher<std::function<Signature>> {
+			using TargetFunctor = function_detail::functor_function<std::function<Signature>, false, true>;
+
+			static int push(lua_State* L, detail::yield_tag_t, const std::function<Signature>& fx) {
+				if (fx) {
+					function_detail::select_set_fx<true, false, TargetFunctor>(L, fx);
+					return 1;
+				}
+				return stack::push(L, lua_nil);
+			}
+
+			static int push(lua_State* L, detail::yield_tag_t, std::function<Signature>&& fx) {
+				if (fx) {
+					function_detail::select_set_fx<true, false, TargetFunctor>(L, std::move(fx));
+					return 1;
+				}
+				return stack::push(L, lua_nil);
+			}
+
+			static int push(lua_State* L, const std::function<Signature>& fx) {
+				if (fx) {
+					function_detail::select_set_fx<false, false, TargetFunctor>(L, fx);
+					return 1;
+				}
+				return stack::push(L, lua_nil);
+			}
+
+			static int push(lua_State* L, std::function<Signature>&& fx) {
+				if (fx) {
+					function_detail::select_set_fx<false, false, TargetFunctor>(L, std::move(fx));
+					return 1;
+				}
+				return stack::push(L, lua_nil);
+			}
+		};
+
+		template <typename Signature>
+		struct unqualified_pusher<Signature, std::enable_if_t<meta::is_member_object_or_function_v<Signature>>> {
+			template <typename... Args>
+			static int push(lua_State* L, Args&&... args) {
+				function_detail::select<false, false>(L, std::forward<Args>(args)...);
+				return 1;
+			}
+		};
+
+		template <typename Signature>
+		struct unqualified_pusher<Signature,
+		     std::enable_if_t<meta::all<std::is_function<std::remove_pointer_t<Signature>>, meta::neg<std::is_same<Signature, lua_CFunction>>,
+		          meta::neg<std::is_same<Signature, std::remove_pointer_t<lua_CFunction>>>
+#if SOL_IS_ON(SOL_USE_NOEXCEPT_FUNCTION_TYPE)
+		          ,
+		          meta::neg<std::is_same<Signature, detail::lua_CFunction_noexcept>>,
+		          meta::neg<std::is_same<Signature, std::remove_pointer_t<detail::lua_CFunction_noexcept>>>
+#endif // noexcept function types
+		          >::value>> {
+			template <typename F>
+			static int push(lua_State* L, F&& f) {
+				function_detail::select<false, true>(L, std::forward<F>(f));
+				return 1;
+			}
+		};
+
+		template <typename... Functions>
+		struct unqualified_pusher<overload_set<Functions...>> {
+			static int push(lua_State* L, overload_set<Functions...>&& set) {
+				using F = function_detail::overloaded_function<0, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, std::move(set.functions));
+				return 1;
+			}
+
+			static int push(lua_State* L, const overload_set<Functions...>& set) {
+				using F = function_detail::overloaded_function<0, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, set.functions);
+				return 1;
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<protect_t<T>> {
+			static int push(lua_State* L, protect_t<T>&& pw) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, protect_t<T>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<protect_t<T>>>(L, std::move(pw.value));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, const protect_t<T>& pw) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, protect_t<T>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<protect_t<T>>>(L, pw.value);
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename F, typename G>
+		struct unqualified_pusher<property_wrapper<F, G>> {
+			static int push(lua_State* L, property_wrapper<F, G>&& pw) {
+				if constexpr (std::is_void_v<F>) {
+					return stack::push(L, std::move(pw.write()));
+				}
+				else if constexpr (std::is_void_v<G>) {
+					return stack::push(L, std::move(pw.read()));
+				}
+				else {
+					return stack::push(L, overload(std::move(pw.read()), std::move(pw.write())));
+				}
+			}
+
+			static int push(lua_State* L, const property_wrapper<F, G>& pw) {
+				if constexpr (std::is_void_v<F>) {
+					return stack::push(L, pw.write);
+				}
+				else if constexpr (std::is_void_v<G>) {
+					return stack::push(L, pw.read);
+				}
+				else {
+					return stack::push(L, overload(pw.read, pw.write));
+				}
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<var_wrapper<T>> {
+			static int push(lua_State* L, var_wrapper<T>&& vw) {
+				return stack::push(L, std::move(vw.value()));
+			}
+			static int push(lua_State* L, const var_wrapper<T>& vw) {
+				return stack::push(L, vw.value());
+			}
+		};
+
+		template <typename... Functions>
+		struct unqualified_pusher<factory_wrapper<Functions...>> {
+			static int push(lua_State* L, const factory_wrapper<Functions...>& fw) {
+				using F = function_detail::overloaded_function<0, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, fw.functions);
+				return 1;
+			}
+
+			static int push(lua_State* L, factory_wrapper<Functions...>&& fw) {
+				using F = function_detail::overloaded_function<0, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, std::move(fw.functions));
+				return 1;
+			}
+
+			static int push(lua_State* L, const factory_wrapper<Functions...>& fw, function_detail::call_indicator) {
+				using F = function_detail::overloaded_function<1, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, fw.functions);
+				return 1;
+			}
+
+			static int push(lua_State* L, factory_wrapper<Functions...>&& fw, function_detail::call_indicator) {
+				using F = function_detail::overloaded_function<1, Functions...>;
+				function_detail::select_set_fx<false, false, F>(L, std::move(fw.functions));
+				return 1;
+			}
+		};
+
+		template <>
+		struct unqualified_pusher<no_construction> {
+			static int push(lua_State* L, no_construction) {
+				lua_CFunction cf = &function_detail::no_construction_error;
+				return stack::push(L, cf);
+			}
+
+			static int push(lua_State* L, no_construction c, function_detail::call_indicator) {
+				return push(L, c);
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<detail::tagged<T, no_construction>> {
+			static int push(lua_State* L, detail::tagged<T, no_construction>) {
+				lua_CFunction cf = &function_detail::no_construction_error;
+				return stack::push(L, cf);
+			}
+
+			static int push(lua_State* L, no_construction, function_detail::call_indicator) {
+				lua_CFunction cf = &function_detail::no_construction_error;
+				return stack::push(L, cf);
+			}
+		};
+
+		template <typename T, typename... Lists>
+		struct unqualified_pusher<detail::tagged<T, constructor_list<Lists...>>> {
+			static int push(lua_State* L, detail::tagged<T, constructor_list<Lists...>>) {
+				lua_CFunction cf = call_detail::construct<T, detail::default_safe_function_calls, true, Lists...>;
+				return stack::push(L, cf);
+			}
+
+			static int push(lua_State* L, constructor_list<Lists...>) {
+				lua_CFunction cf = call_detail::construct<T, detail::default_safe_function_calls, true, Lists...>;
+				return stack::push(L, cf);
+			}
+		};
+
+		template <typename L0, typename... Lists>
+		struct unqualified_pusher<constructor_list<L0, Lists...>> {
+			typedef constructor_list<L0, Lists...> cl_t;
+			static int push(lua_State* L, cl_t cl) {
+				typedef typename meta::bind_traits<L0>::return_type T;
+				return stack::push<detail::tagged<T, cl_t>>(L, cl);
+			}
+		};
+
+		template <typename T, typename... Fxs>
+		struct unqualified_pusher<detail::tagged<T, constructor_wrapper<Fxs...>>> {
+			static int push(lua_State* L, detail::tagged<T, constructor_wrapper<Fxs...>>&& c) {
+				return push(L, std::move(c.value()));
+			}
+
+			static int push(lua_State* L, const detail::tagged<T, const constructor_wrapper<Fxs...>>& c) {
+				return push(L, c.value());
+			}
+
+			static int push(lua_State* L, constructor_wrapper<Fxs...>&& c) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, constructor_wrapper<Fxs...>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<constructor_wrapper<Fxs...>>>(L, std::move(c));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, const constructor_wrapper<Fxs...>& c) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, constructor_wrapper<Fxs...>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<constructor_wrapper<Fxs...>>>(L, c);
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename F, typename... Fxs>
+		struct unqualified_pusher<constructor_wrapper<F, Fxs...>> {
+			static int push(lua_State* L, const constructor_wrapper<F, Fxs...>& c) {
+				typedef typename meta::bind_traits<F>::template arg_at<0> arg0;
+				typedef meta::unqualified_t<std::remove_pointer_t<arg0>> T;
+				return stack::push<detail::tagged<T, constructor_wrapper<F, Fxs...>>>(L, c);
+			}
+
+			static int push(lua_State* L, constructor_wrapper<F, Fxs...>&& c) {
+				typedef typename meta::bind_traits<F>::template arg_at<0> arg0;
+				typedef meta::unqualified_t<std::remove_pointer_t<arg0>> T;
+				return stack::push<detail::tagged<T, constructor_wrapper<F, Fxs...>>>(L, std::move(c));
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<detail::tagged<T, destructor_wrapper<void>>> {
+			static int push(lua_State* L, destructor_wrapper<void>) {
+				lua_CFunction cf = detail::usertype_alloc_destroy<T>;
+				return stack::push(L, cf);
+			}
+		};
+
+		template <typename T, typename Fx>
+		struct unqualified_pusher<detail::tagged<T, destructor_wrapper<Fx>>> {
+			static int push(lua_State* L, destructor_wrapper<Fx>&& c) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, destructor_wrapper<Fx>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, std::move(c));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, const destructor_wrapper<Fx>& c) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, destructor_wrapper<Fx>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, c);
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename Fx>
+		struct unqualified_pusher<destructor_wrapper<Fx>> {
+			static int push(lua_State* L, destructor_wrapper<Fx>&& c) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, destructor_wrapper<Fx>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, std::move(c));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, const destructor_wrapper<Fx>& c) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, destructor_wrapper<Fx>, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, c);
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename F, typename... Policies>
+		struct unqualified_pusher<policy_wrapper<F, Policies...>> {
+			using P = policy_wrapper<F, Policies...>;
+
+			static int push(lua_State* L, const P& p) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, P, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<P>>(L, p);
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, P&& p) {
+				lua_CFunction cf = call_detail::call_user<void, false, false, P, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<P>>(L, std::move(p));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename T, typename F, typename... Policies>
+		struct unqualified_pusher<detail::tagged<T, policy_wrapper<F, Policies...>>> {
+			using P = policy_wrapper<F, Policies...>;
+			using Tagged = detail::tagged<T, P>;
+
+			static int push(lua_State* L, const Tagged& p) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, P, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<P>>(L, p.value());
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+
+			static int push(lua_State* L, Tagged&& p) {
+				lua_CFunction cf = call_detail::call_user<T, false, false, P, 2>;
+				int upvalues = 0;
+				upvalues += stack::push(L, nullptr);
+				upvalues += stack::push<user<P>>(L, std::move(p.value()));
+				return stack::push(L, c_closure(cf, upvalues));
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<push_invoke_t<T>> {
+			static int push(lua_State* L, push_invoke_t<T>&& pi) {
+				if constexpr (std::is_invocable_v<std::add_rvalue_reference_t<T>, lua_State*>) {
+					return stack::push(L, std::move(pi.value())(L));
+				}
+				else {
+					return stack::push(L, std::move(pi.value())());
+				}
+			}
+
+			static int push(lua_State* L, const push_invoke_t<T>& pi) {
+				if constexpr (std::is_invocable_v<const T, lua_State*>) {
+					return stack::push(L, pi.value()(L));
+				}
+				else {
+					return stack::push(L, pi.value()());
+				}
+			}
+		};
+
+		namespace stack_detail {
+			template <typename Function, typename Handler>
+			bool check_function_pointer(lua_State* L, int index, Handler&& handler, record& tracking) noexcept {
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE)
+				tracking.use(1);
+				bool success = lua_iscfunction(L, index) == 1;
+				if (success) {
+					// there must be at LEAST 2 upvalues; otherwise, we didn't serialize it.
+					const char* upvalue_name = lua_getupvalue(L, index, 2);
+					lua_pop(L, 1);
+					success = upvalue_name != nullptr;
+				}
+				if (!success) {
+					// expected type, actual type
+					handler(
+					     L, index, type::function, type_of(L, index), "type must be a Lua C Function gotten from a function pointer serialized by sol2");
+				}
+				return success;
+#else
+				(void)L;
+				(void)index;
+				(void)handler;
+				(void)tracking;
+				return false;
+#endif
+			}
+
+			template <typename Function>
+			Function* get_function_pointer(lua_State* L, int index, record& tracking) noexcept {
+#if SOL_IS_ON(SOL_GET_FUNCTION_POINTER_UNSAFE)
+				tracking.use(1);
+				auto udata = stack::stack_detail::get_as_upvalues_using_function<Function*>(L, index);
+				Function* fx = udata.first;
+				return fx;
+#else
+				(void)L;
+				(void)index;
+				(void)tracking;
+				static_assert(meta::meta_detail::always_true<Function>::value,
+#if SOL_IS_DEFAULT_OFF(SOL_GET_FUNCTION_POINTER_UNSAFE)
+				     "You are attempting to retrieve a function pointer type. "
+				     "This is inherently unsafe in sol2. In order to do this, you must turn on the "
+				     "SOL_GET_FUNCTION_POINTER_UNSAFE configuration macro, as detailed in the documentation. "
+				     "Please be careful!"
+#else
+				     "You are attempting to retrieve a function pointer type. "
+				     "You explicitly turned off the ability to do this by defining "
+				     "SOL_GET_FUNCTION_POINTER_UNSAFE or similar to be off. "
+				     "Please reconsider this!"
+#endif
+				);
+				return nullptr;
+#endif
+			}
+		} // namespace stack_detail
+	}      // namespace stack
+} // namespace sol
+
+// end of sol/function_types.hpp
+
+// beginning of sol/dump_handler.hpp
+
+#include <cstdint>
+#include <exception>
+
+namespace sol {
+
+	class dump_error : public error {
+	private:
+		int m_ec;
+
+	public:
+		dump_error(int error_code_) : error("dump returned non-zero error of " + std::to_string(error_code_)), m_ec(error_code_) {
+		}
+
+		int error_code() const {
+			return m_ec;
+		}
+	};
+
+	inline int dump_pass_on_error(lua_State* L_, int result_code, lua_Writer writer_function, void* userdata_pointer_, bool strip) {
+		(void)L_;
+		(void)writer_function;
+		(void)userdata_pointer_;
+		(void)strip;
+		return result_code;
+	}
+
+	inline int dump_panic_on_error(lua_State* L_, int result_code, lua_Writer writer_function, void* userdata_pointer_, bool strip) {
+		(void)L_;
+		(void)writer_function;
+		(void)userdata_pointer_;
+		(void)strip;
+		return luaL_error(L_, "a non-zero error code (%d) was returned by the lua_Writer for the dump function", result_code);
+	}
+
+	inline int dump_throw_on_error(lua_State* L_, int result_code, lua_Writer writer_function, void* userdata_pointer_, bool strip) {
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+		return dump_panic_on_error(L_, result_code, writer_function, userdata_pointer_, strip);
+#else
+		(void)L_;
+		(void)writer_function;
+		(void)userdata_pointer_;
+		(void)strip;
+		throw dump_error(result_code);
+#endif // no exceptions stuff
+	}
+
+} // namespace sol
+
+// end of sol/dump_handler.hpp
+
+#include <cstdint>
+
+namespace sol {
+	template <typename ref_t, bool aligned = false>
+	class basic_function : public basic_object<ref_t> {
+	private:
+		using base_t = basic_object<ref_t>;
+
+		void luacall(std::ptrdiff_t argcount, std::ptrdiff_t resultcount) const {
+			lua_call(lua_state(), static_cast<int>(argcount), static_cast<int>(resultcount));
+		}
+
+		template <std::size_t... I, typename... Ret>
+		auto invoke(types<Ret...>, std::index_sequence<I...>, std::ptrdiff_t n) const {
+			luacall(n, lua_size<std::tuple<Ret...>>::value);
+			return stack::pop<std::tuple<Ret...>>(lua_state());
+		}
+
+		template <std::size_t I, typename Ret, meta::enable<meta::neg<std::is_void<Ret>>> = meta::enabler>
+		Ret invoke(types<Ret>, std::index_sequence<I>, std::ptrdiff_t n) const {
+			luacall(n, lua_size<Ret>::value);
+			return stack::pop<Ret>(lua_state());
+		}
+
+		template <std::size_t I>
+		void invoke(types<void>, std::index_sequence<I>, std::ptrdiff_t n) const {
+			luacall(n, 0);
+		}
+
+		unsafe_function_result invoke(types<>, std::index_sequence<>, std::ptrdiff_t n) const {
+			int stacksize = lua_gettop(lua_state());
+			int firstreturn = (std::max)(1, stacksize - static_cast<int>(n));
+			luacall(n, LUA_MULTRET);
+			int poststacksize = lua_gettop(lua_state());
+			int returncount = poststacksize - (firstreturn - 1);
+			return unsafe_function_result(lua_state(), firstreturn, returncount);
+		}
+
+	public:
+		using base_t::lua_state;
+
+		basic_function() = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_function>>, meta::neg<std::is_same<base_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_function(T&& r) noexcept : base_t(std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			if (!is_function<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_function>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+		basic_function(const basic_function&) = default;
+		basic_function& operator=(const basic_function&) = default;
+		basic_function(basic_function&&) = default;
+		basic_function& operator=(basic_function&&) = default;
+		basic_function(const stack_reference& r) : basic_function(r.lua_state(), r.stack_index()) {
+		}
+		basic_function(stack_reference&& r) : basic_function(r.lua_state(), r.stack_index()) {
+		}
+		basic_function(lua_nil_t n) : base_t(n) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_function(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_function>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_function(lua_State* L, int index = -1) : base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_function>(L, index, handler);
+#endif // Safety
+		}
+		basic_function(lua_State* L, ref_index index) : base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_function>(lua_state(), -1, handler);
+#endif // Safety
+		}
+
+		template <typename Fx>
+		int dump(lua_Writer writer, void* userdata, bool strip, Fx&& on_error) const {
+			this->push();
+			auto ppn = stack::push_popper_n<false>(this->lua_state(), 1);
+			int r = lua_dump(this->lua_state(), writer, userdata, strip ? 1 : 0);
+			if (r != 0) {
+				return on_error(this->lua_state(), r, writer, userdata, strip);
+			}
+			return r;
+		}
+
+		int dump(lua_Writer writer, void* userdata, bool strip = false) const {
+			return dump(writer, userdata, strip, &dump_throw_on_error);
+		}
+
+		template <typename Container = bytecode>
+		Container dump() const {
+			Container bc;
+			(void)dump(static_cast<lua_Writer>(&basic_insert_dump_writer<Container>), static_cast<void*>(&bc), false, &dump_panic_on_error);
+			return bc;
+		}
+
+		template <typename Container = bytecode, typename Fx>
+		Container dump(Fx&& on_error) const {
+			Container bc;
+			(void)dump(static_cast<lua_Writer>(&basic_insert_dump_writer<Container>), static_cast<void*>(&bc), false, std::forward<Fx>(on_error));
+			return bc;
+		}
+
+		template <typename... Args>
+		unsafe_function_result operator()(Args&&... args) const {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) operator()(types<Ret...>, Args&&... args) const {
+			return call<Ret...>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) const {
+			if (!aligned) {
+				base_t::push();
+			}
+			int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+			return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), static_cast<std::ptrdiff_t>(pushcount));
+		}
+	};
+} // namespace sol
+
+// end of sol/unsafe_function.hpp
+
+// beginning of sol/protected_function.hpp
+
+// beginning of sol/protected_handler.hpp
+
+#include <cstdint>
+
+namespace sol { namespace detail {
+	inline const char (&default_handler_name())[9] {
+		static const char name[9] = "sol.\xF0\x9F\x94\xA9";
+		return name;
+	}
+
+	template <bool ShouldPush, typename Target = reference>
+	struct protected_handler {
+		lua_State* m_L;
+		const Target& target;
+		int stack_index;
+
+		protected_handler(std::false_type, lua_State* L_, const Target& target_) : m_L(L_), target(target_), stack_index(0) {
+			if (ShouldPush) {
+				stack_index = lua_gettop(L_) + 1;
+				target.push(L_);
+			}
+		}
+
+		protected_handler(std::true_type, lua_State* L_, const Target& target_) : m_L(L_), target(target_), stack_index(0) {
+			if (ShouldPush) {
+				stack_index = target.stack_index();
+			}
+		}
+
+		protected_handler(lua_State* L_, const Target& target_) : protected_handler(meta::boolean<is_stack_based_v<Target>>(), L_, target_) {
+		}
+
+		bool valid() const noexcept {
+			return ShouldPush;
+		}
+
+		~protected_handler() {
+			if constexpr (!is_stack_based_v<Target>) {
+				if (stack_index != 0) {
+					lua_remove(m_L, stack_index);
+				}
+			}
+		}
+	};
+
+	template <typename Base, typename T>
+	inline basic_function<Base> force_cast(T& p) {
+		return p;
+	}
+
+	template <typename Reference, bool IsMainReference = false>
+	inline Reference get_default_handler(lua_State* L_) {
+		if (is_stack_based_v<Reference> || L_ == nullptr)
+			return Reference(L_, lua_nil);
+		L_ = IsMainReference ? main_thread(L_, L_) : L_;
+		lua_getglobal(L_, default_handler_name());
+		auto pp = stack::pop_n(L_, 1);
+		return Reference(L_, -1);
+	}
+
+	template <typename T>
+	inline void set_default_handler(lua_State* L, const T& ref) {
+		if (L == nullptr) {
+			return;
+		}
+		if (!ref.valid()) {
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(L, 1, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+			lua_pushnil(L);
+			lua_setglobal(L, default_handler_name());
+		}
+		else {
+			ref.push(L);
+			lua_setglobal(L, default_handler_name());
+		}
+	}
+}} // namespace sol::detail
+
+// end of sol/protected_handler.hpp
+
+#include <cstdint>
+#include <algorithm>
+
+namespace sol {
+
+	namespace detail {
+		template <bool ShouldPush_, typename Handler_>
+		inline void handle_protected_exception(
+		     lua_State* L_, optional<const std::exception&> maybe_ex, const char* error, detail::protected_handler<ShouldPush_, Handler_>& handler_) {
+			handler_.stack_index = 0;
+			if (ShouldPush_) {
+				handler_.target.push(L_);
+				detail::call_exception_handler(L_, maybe_ex, error);
+				lua_call(L_, 1, 1);
+			}
+			else {
+				detail::call_exception_handler(L_, maybe_ex, error);
+			}
+		}
+	} // namespace detail
+
+	template <typename Reference, bool Aligned = false, typename Handler = reference>
+	class basic_protected_function : public basic_object<Reference> {
+	private:
+		using base_t = basic_object<Reference>;
+		using handler_t = Handler;
+		inline static constexpr bool is_stack_handler_v = is_stack_based_v<handler_t>;
+
+		basic_protected_function(std::true_type, const basic_protected_function& other_) noexcept
+		: base_t(other_), m_error_handler(other_.m_error_handler.copy(lua_state())) {
+		}
+
+		basic_protected_function(std::false_type, const basic_protected_function& other_) noexcept : base_t(other_), m_error_handler(other_.m_error_handler) {
+		}
+
+	public:
+		basic_protected_function() = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_protected_function>>,
+		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<T>>>, meta::neg<std::is_same<base_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_protected_function(T&& r) noexcept : base_t(std::forward<T>(r)), m_error_handler(get_default_handler(r.lua_state())) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			if (!is_function<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_protected_function>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+		basic_protected_function(const basic_protected_function& other_) noexcept
+		: basic_protected_function(meta::boolean<is_stateless_lua_reference_v<Handler>>(), other_) {
+		}
+		basic_protected_function& operator=(const basic_protected_function& other_) {
+			base_t::operator=(other_);
+			if constexpr (is_stateless_lua_reference_v<Handler>) {
+				m_error_handler.copy_assign(lua_state(), other_.m_error_handler);
+			}
+			else {
+				m_error_handler = other_.m_error_handler;
+			}
+			return *this;
+		}
+		basic_protected_function(basic_protected_function&&) = default;
+		basic_protected_function& operator=(basic_protected_function&&) = default;
+		basic_protected_function(const basic_function<base_t>& b) : basic_protected_function(b, get_default_handler(b.lua_state())) {
+		}
+		basic_protected_function(basic_function<base_t>&& b) : basic_protected_function(std::move(b), get_default_handler(b.lua_state())) {
+		}
+		basic_protected_function(const basic_function<base_t>& b, handler_t eh) : base_t(b), m_error_handler(std::move(eh)) {
+		}
+		basic_protected_function(basic_function<base_t>&& b, handler_t eh) : base_t(std::move(b)), m_error_handler(std::move(eh)) {
+		}
+		basic_protected_function(const stack_reference& r) : basic_protected_function(r.lua_state(), r.stack_index(), get_default_handler(r.lua_state())) {
+		}
+		basic_protected_function(stack_reference&& r) : basic_protected_function(r.lua_state(), r.stack_index(), get_default_handler(r.lua_state())) {
+		}
+		basic_protected_function(const stack_reference& r, handler_t eh) : basic_protected_function(r.lua_state(), r.stack_index(), std::move(eh)) {
+		}
+		basic_protected_function(stack_reference&& r, handler_t eh) : basic_protected_function(r.lua_state(), r.stack_index(), std::move(eh)) {
+		}
+
+		template <typename Super>
+		basic_protected_function(const proxy_base<Super>& p) : basic_protected_function(p, get_default_handler(p.lua_state())) {
+		}
+		template <typename Super>
+		basic_protected_function(proxy_base<Super>&& p) : basic_protected_function(std::move(p), get_default_handler(p.lua_state())) {
+		}
+		template <typename Proxy, typename HandlerReference,
+		     meta::enable<std::is_base_of<proxy_base_tag, meta::unqualified_t<Proxy>>,
+		          meta::neg<is_lua_index<meta::unqualified_t<HandlerReference>>>> = meta::enabler>
+		basic_protected_function(Proxy&& p, HandlerReference&& eh)
+		: basic_protected_function(detail::force_cast<base_t>(p), make_reference<handler_t>(p.lua_state(), std::forward<HandlerReference>(eh))) {
+		}
+
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_protected_function(lua_State* L_, T&& r) : basic_protected_function(L_, std::forward<T>(r), get_default_handler(L_)) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_protected_function(lua_State* L_, T&& r, handler_t eh) : base_t(L_, std::forward<T>(r)), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_protected_function>(lua_state(), -1, handler);
+#endif // Safety
+		}
+
+		basic_protected_function(lua_nil_t n) : base_t(n), m_error_handler(n) {
+		}
+
+		basic_protected_function(lua_State* L_, int index_ = -1) : basic_protected_function(L_, index_, get_default_handler(L_)) {
+		}
+		basic_protected_function(lua_State* L_, int index_, handler_t eh) : base_t(L_, index_), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_protected_function>(L_, index_, handler);
+#endif // Safety
+		}
+		basic_protected_function(lua_State* L_, absolute_index index_) : basic_protected_function(L_, index_, get_default_handler(L_)) {
+		}
+		basic_protected_function(lua_State* L_, absolute_index index_, handler_t eh) : base_t(L_, index_), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_protected_function>(L_, index_, handler);
+#endif // Safety
+		}
+		basic_protected_function(lua_State* L_, raw_index index_) : basic_protected_function(L_, index_, get_default_handler(L_)) {
+		}
+		basic_protected_function(lua_State* L_, raw_index index_, handler_t eh) : base_t(L_, index_), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_protected_function>(L_, index_, handler);
+#endif // Safety
+		}
+		basic_protected_function(lua_State* L_, ref_index index_) : basic_protected_function(L_, index_, get_default_handler(L_)) {
+		}
+		basic_protected_function(lua_State* L_, ref_index index_, handler_t eh) : base_t(L_, index_), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_protected_function>(lua_state(), -1, handler);
+#endif // Safety
+		}
+
+		using base_t::lua_state;
+
+		template <typename Fx>
+		int dump(lua_Writer writer, void* userdata_pointer_, bool strip, Fx&& on_error) const {
+			this->push();
+			auto ppn = stack::push_popper_n<false>(this->lua_state(), 1);
+			int r = lua_dump(this->lua_state(), writer, userdata_pointer_, strip ? 1 : 0);
+			if (r != 0) {
+				return on_error(this->lua_state(), r, writer, userdata_pointer_, strip);
+			}
+			return r;
+		}
+
+		int dump(lua_Writer writer, void* userdata_pointer_, bool strip = false) const {
+			return dump(writer, userdata_pointer_, strip, &dump_pass_on_error);
+		}
+
+		template <typename Container = bytecode>
+		Container dump() const {
+			Container bc;
+			(void)dump(static_cast<lua_Writer>(&basic_insert_dump_writer<Container>), static_cast<void*>(&bc), false, &dump_throw_on_error);
+			return bc;
+		}
+
+		template <typename Container = bytecode, typename Fx>
+		Container dump(Fx&& on_error) const {
+			Container bc;
+			(void)dump(static_cast<lua_Writer>(&basic_insert_dump_writer<Container>), static_cast<void*>(&bc), false, std::forward<Fx>(on_error));
+			return bc;
+		}
+
+		template <typename... Args>
+		protected_function_result operator()(Args&&... args) const {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) operator()(types<Ret...>, Args&&... args) const {
+			return call<Ret...>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) const {
+			if constexpr (!Aligned) {
+				// we do not expect the function to already be on the stack: push it
+				if (m_error_handler.valid(lua_state())) {
+					detail::protected_handler<true, handler_t> h(lua_state(), m_error_handler);
+					base_t::push();
+					int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+					return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount, h);
+				}
+				else {
+					detail::protected_handler<false, handler_t> h(lua_state(), m_error_handler);
+					base_t::push();
+					int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+					return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount, h);
+				}
+			}
+			else {
+				// the function is already on the stack at the right location
+				if (m_error_handler.valid()) {
+					// the handler will be pushed onto the stack manually,
+					// since it's not already on the stack this means we need to push our own
+					// function on the stack too and swap things to be in-place
+					if constexpr (!is_stack_handler_v) {
+						// so, we need to remove the function at the top and then dump the handler out ourselves
+						base_t::push();
+					}
+					detail::protected_handler<true, handler_t> h(lua_state(), m_error_handler);
+					if constexpr (!is_stack_handler_v) {
+						lua_replace(lua_state(), -3);
+						h.stack_index = lua_absindex(lua_state(), -2);
+					}
+					int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+					return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount, h);
+				}
+				else {
+					detail::protected_handler<false, handler_t> h(lua_state(), m_error_handler);
+					int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+					return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount, h);
+				}
+			}
+		}
+
+		~basic_protected_function() {
+			if constexpr (is_stateless_lua_reference_v<handler_t>) {
+				this->m_error_handler.reset(lua_state());
+			}
+		}
+
+		static handler_t get_default_handler(lua_State* L_) {
+			return detail::get_default_handler<handler_t, is_main_threaded_v<base_t>>(L_);
+		}
+
+		template <typename T>
+		static void set_default_handler(const T& ref) {
+			detail::set_default_handler(ref.lua_state(), ref);
+		}
+
+		auto get_error_handler() const noexcept {
+			if constexpr (is_stateless_lua_reference_v<handler_t>) {
+				if constexpr (is_stack_based_v<handler_t>) {
+					return stack_reference(lua_state(), m_error_handler.stack_index());
+				}
+				else {
+					return basic_reference<is_main_threaded_v<base_t>>(lua_state(), ref_index(m_error_handler.registry_index()));
+				}
+			}
+			else {
+				return m_error_handler;
+			}
+		}
+
+		template <typename ErrorHandler_>
+		void set_error_handler(ErrorHandler_&& error_handler_) noexcept {
+			static_assert(!is_stack_based_v<handler_t> || is_stack_based_v<ErrorHandler_>,
+			     "A stack-based error handler can only be set from a parameter that is also stack-based.");
+			if constexpr (std::is_rvalue_reference_v<ErrorHandler_>) {
+				m_error_handler = std::forward<ErrorHandler_>(error_handler_);
+			}
+			else {
+				m_error_handler.copy_assign(lua_state(), std::forward<ErrorHandler_>(error_handler_));
+			}
+		}
+
+		void abandon () noexcept {
+			this->m_error_handler.abandon();
+			base_t::abandon();
+		}
+
+	private:
+		handler_t m_error_handler;
+
+		template <bool b>
+		call_status luacall(std::ptrdiff_t argcount, std::ptrdiff_t result_count_, detail::protected_handler<b, handler_t>& h) const {
+			return static_cast<call_status>(lua_pcall(lua_state(), static_cast<int>(argcount), static_cast<int>(result_count_), h.stack_index));
+		}
+
+		template <std::size_t... I, bool b, typename... Ret>
+		auto invoke(types<Ret...>, std::index_sequence<I...>, std::ptrdiff_t n, detail::protected_handler<b, handler_t>& h) const {
+			luacall(n, sizeof...(Ret), h);
+			return stack::pop<std::tuple<Ret...>>(lua_state());
+		}
+
+		template <std::size_t I, bool b, typename Ret>
+		Ret invoke(types<Ret>, std::index_sequence<I>, std::ptrdiff_t n, detail::protected_handler<b, handler_t>& h) const {
+			luacall(n, 1, h);
+			return stack::pop<Ret>(lua_state());
+		}
+
+		template <std::size_t I, bool b>
+		void invoke(types<void>, std::index_sequence<I>, std::ptrdiff_t n, detail::protected_handler<b, handler_t>& h) const {
+			luacall(n, 0, h);
+		}
+
+		template <bool b>
+		protected_function_result invoke(types<>, std::index_sequence<>, std::ptrdiff_t n, detail::protected_handler<b, handler_t>& h) const {
+			int stacksize = lua_gettop(lua_state());
+			int poststacksize = stacksize;
+			int firstreturn = 1;
+			int returncount = 0;
+			call_status code = call_status::ok;
+#if SOL_IS_ON(SOL_EXCEPTIONS) && SOL_IS_OFF(SOL_PROPAGATE_EXCEPTIONS)
+			try {
+#endif // No Exceptions
+				firstreturn = (std::max)(1, static_cast<int>(stacksize - n - static_cast<int>(h.valid() && !is_stack_handler_v)));
+				code = luacall(n, LUA_MULTRET, h);
+				poststacksize = lua_gettop(lua_state()) - static_cast<int>(h.valid() && !is_stack_handler_v);
+				returncount = poststacksize - (firstreturn - 1);
+#if SOL_IS_ON(SOL_EXCEPTIONS) && SOL_IS_OFF(SOL_PROPAGATE_EXCEPTIONS)
+			}
+			// Handle C++ errors thrown from C++ functions bound inside of lua
+			catch (const char* error) {
+				detail::handle_protected_exception(lua_state(), optional<const std::exception&>(nullopt), error, h);
+				firstreturn = lua_gettop(lua_state());
+				return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
+			}
+			catch (const std::string& error) {
+				detail::handle_protected_exception(lua_state(), optional<const std::exception&>(nullopt), error.c_str(), h);
+				firstreturn = lua_gettop(lua_state());
+				return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
+			}
+			catch (const std::exception& error) {
+				detail::handle_protected_exception(lua_state(), optional<const std::exception&>(error), error.what(), h);
+				firstreturn = lua_gettop(lua_state());
+				return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
+			}
+#if SOL_IS_ON(SOL_EXCEPTIONS_CATCH_ALL)
+			// LuaJIT cannot have the catchall when the safe propagation is on
+			// but LuaJIT will swallow all C++ errors
+			// if we don't at least catch std::exception ones
+			catch (...) {
+				detail::handle_protected_exception(lua_state(), optional<const std::exception&>(nullopt), detail::protected_function_error, h);
+				firstreturn = lua_gettop(lua_state());
+				return protected_function_result(lua_state(), firstreturn, 0, 1, call_status::runtime);
+			}
+#endif // Always catch edge case
+#else
+			// do not handle exceptions: they can be propogated into C++ and keep all type information / rich information
+#endif // Exceptions vs. No Exceptions
+			return protected_function_result(lua_state(), firstreturn, returncount, returncount, code);
+		}
+	};
+} // namespace sol
+
+// end of sol/protected_function.hpp
+
+#include <functional>
+
+namespace sol {
+	template <typename... Ret, typename... Args>
+	decltype(auto) stack_proxy::call(Args&&... args) {
+		stack_function sf(this->lua_state(), this->stack_index());
+		return sf.template call<Ret...>(std::forward<Args>(args)...);
+	}
+
+	inline protected_function_result::protected_function_result(unsafe_function_result&& o) noexcept
+	: L(o.lua_state()), index(o.stack_index()), returncount(o.return_count()), popcount(o.return_count()), err(o.status()) {
+		// Must be manual, otherwise destructor will screw us
+		// return count being 0 is enough to keep things clean
+		// but we will be thorough
+		o.abandon();
+	}
+
+	inline protected_function_result& protected_function_result::operator=(unsafe_function_result&& o) noexcept {
+		L = o.lua_state();
+		index = o.stack_index();
+		returncount = o.return_count();
+		popcount = o.return_count();
+		err = o.status();
+		// Must be manual, otherwise destructor will screw us
+		// return count being 0 is enough to keep things clean
+		// but we will be thorough
+		o.abandon();
+		return *this;
+	}
+
+	inline unsafe_function_result::unsafe_function_result(protected_function_result&& o) noexcept
+	: L(o.lua_state()), index(o.stack_index()), returncount(o.return_count()) {
+		// Must be manual, otherwise destructor will screw us
+		// return count being 0 is enough to keep things clean
+		// but we will be thorough
+		o.abandon();
+	}
+	inline unsafe_function_result& unsafe_function_result::operator=(protected_function_result&& o) noexcept {
+		L = o.lua_state();
+		index = o.stack_index();
+		returncount = o.return_count();
+		// Must be manual, otherwise destructor will screw us
+		// return count being 0 is enough to keep things clean
+		// but we will be thorough
+		o.abandon();
+		return *this;
+	}
+
+	namespace detail {
+		template <typename... R>
+		struct std_shim {
+			unsafe_function lua_func_;
+
+			std_shim(unsafe_function lua_func) : lua_func_(std::move(lua_func)) {
+			}
+
+			template <typename... Args>
+			meta::return_type_t<R...> operator()(Args&&... args) {
+				return lua_func_.call<R...>(std::forward<Args>(args)...);
+			}
+		};
+
+		template <>
+		struct std_shim<void> {
+			unsafe_function lua_func_;
+
+			std_shim(unsafe_function lua_func) : lua_func_(std::move(lua_func)) {
+			}
+
+			template <typename... Args>
+			void operator()(Args&&... args) {
+				lua_func_.call<void>(std::forward<Args>(args)...);
+			}
+		};
+	} // namespace detail
+
+	namespace stack {
+		template <typename Signature>
+		struct unqualified_getter<std::function<Signature>> {
+			typedef meta::bind_traits<Signature> fx_t;
+			typedef typename fx_t::args_list args_lists;
+			typedef meta::tuple_types<typename fx_t::return_type> return_types;
+
+			template <typename... R>
+			static std::function<Signature> get_std_func(types<R...>, lua_State* L, int index) {
+				detail::std_shim<R...> fx(unsafe_function(L, index));
+				return fx;
+			}
+
+			static std::function<Signature> get(lua_State* L, int index, record& tracking) {
+				tracking.use(1);
+				type t = type_of(L, index);
+				if (t == type::none || t == type::lua_nil) {
+					return nullptr;
+				}
+				return get_std_func(return_types(), L, index);
+			}
+		};
+
+		template <typename Allocator>
+		struct unqualified_getter<basic_bytecode<Allocator>> {
+			static basic_bytecode<Allocator> get(lua_State* L, int index, record& tracking) {
+				tracking.use(1);
+				stack_function sf(L, index);
+				return sf.dump(&dump_panic_on_error);
+			}
+		};
+	} // namespace stack
+
+} // namespace sol
+
+// end of sol/function.hpp
+
+// beginning of sol/usertype.hpp
+
+// beginning of sol/usertype_core.hpp
+
+// beginning of sol/deprecate.hpp
+
+#ifndef SOL_DEPRECATED
+#ifdef _MSC_VER
+#define SOL_DEPRECATED __declspec(deprecated)
+#elif __GNUC__
+#define SOL_DEPRECATED __attribute__((deprecated))
+#else
+#define SOL_DEPRECATED [[deprecated]]
+#endif // compilers
+#endif // SOL_DEPRECATED
+
+namespace sol { namespace detail {
+	template <typename T>
+	struct SOL_DEPRECATED deprecate_type {
+		using type = T;
+	};
+}} // namespace sol::detail
+
+// end of sol/deprecate.hpp
+
+// beginning of sol/usertype_container_launch.hpp
+
+// beginning of sol/usertype_container.hpp
+
+namespace sol {
+
+	template <typename T>
+	struct usertype_container;
+
+	namespace container_detail {
+
+		template <typename T>
+		struct has_clear_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::clear));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_empty_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::empty));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_erase_after_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(
+			     decltype(std::declval<C>().erase_after(std::declval<std::add_rvalue_reference_t<typename C::const_iterator>>()))*);
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T, typename = void>
+		struct has_find_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(std::declval<C>().find(std::declval<std::add_rvalue_reference_t<typename C::value_type>>()))*);
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_find_test<T, std::enable_if_t<meta::is_lookup<T>::value>> {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(std::declval<C>().find(std::declval<std::add_rvalue_reference_t<typename C::key_type>>()))*);
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_erase_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(std::declval<C>().erase(std::declval<typename C::iterator>()))*);
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_erase_key_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(std::declval<C>().erase(std::declval<typename C::key_type>()))*);
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_find_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::find));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_index_of_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::index_of));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_insert_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::insert));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_erase_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::erase));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_index_set_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::index_set));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_index_get_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::index_get));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_set_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::set));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_get_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::get));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_at_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::at));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_pairs_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::pairs));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_ipairs_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::ipairs));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_next_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::next));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_add_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::add));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		struct has_traits_size_test {
+		private:
+			template <typename C>
+			static meta::sfinae_yes_t test(decltype(&C::size));
+			template <typename C>
+			static meta::sfinae_no_t test(...);
+
+		public:
+			static constexpr bool value = std::is_same_v<decltype(test<T>(0)), meta::sfinae_yes_t>;
+		};
+
+		template <typename T>
+		using has_clear = meta::boolean<has_clear_test<T>::value>;
+
+		template <typename T>
+		using has_empty = meta::boolean<has_empty_test<T>::value>;
+
+		template <typename T>
+		using has_find = meta::boolean<has_find_test<T>::value>;
+
+		template <typename T>
+		using has_erase = meta::boolean<has_erase_test<T>::value>;
+
+		template <typename T>
+		using has_erase_key = meta::boolean<has_erase_key_test<T>::value>;
+
+		template <typename T>
+		using has_erase_after = meta::boolean<has_erase_after_test<T>::value>;
+
+		template <typename T>
+		using has_traits_get = meta::boolean<has_traits_get_test<T>::value>;
+
+		template <typename T>
+		using has_traits_at = meta::boolean<has_traits_at_test<T>::value>;
+
+		template <typename T>
+		using has_traits_set = meta::boolean<has_traits_set_test<T>::value>;
+
+		template <typename T>
+		using has_traits_index_get = meta::boolean<has_traits_index_get_test<T>::value>;
+
+		template <typename T>
+		using has_traits_index_set = meta::boolean<has_traits_index_set_test<T>::value>;
+
+		template <typename T>
+		using has_traits_pairs = meta::boolean<has_traits_pairs_test<T>::value>;
+
+		template <typename T>
+		using has_traits_ipairs = meta::boolean<has_traits_ipairs_test<T>::value>;
+
+		template <typename T>
+		using has_traits_next = meta::boolean<has_traits_next_test<T>::value>;
+
+		template <typename T>
+		using has_traits_add = meta::boolean<has_traits_add_test<T>::value>;
+
+		template <typename T>
+		using has_traits_size = meta::boolean<has_traits_size_test<T>::value>;
+
+		template <typename T>
+		using has_traits_clear = has_clear<T>;
+
+		template <typename T>
+		using has_traits_empty = has_empty<T>;
+
+		template <typename T>
+		using has_traits_find = meta::boolean<has_traits_find_test<T>::value>;
+
+		template <typename T>
+		using has_traits_index_of = meta::boolean<has_traits_index_of_test<T>::value>;
+
+		template <typename T>
+		using has_traits_insert = meta::boolean<has_traits_insert_test<T>::value>;
+
+		template <typename T>
+		using has_traits_erase = meta::boolean<has_traits_erase_test<T>::value>;
+
+		template <typename T>
+		struct is_forced_container : is_container<T> { };
+
+		template <typename T>
+		struct is_forced_container<as_container_t<T>> : std::true_type { };
+
+		template <typename T>
+		struct container_decay {
+			typedef T type;
+		};
+
+		template <typename T>
+		struct container_decay<as_container_t<T>> {
+			typedef T type;
+		};
+
+		template <typename T>
+		using container_decay_t = typename container_decay<meta::unqualified_t<T>>::type;
+
+		template <typename T>
+		decltype(auto) get_key(std::false_type, T&& t) {
+			return std::forward<T>(t);
+		}
+
+		template <typename T>
+		decltype(auto) get_key(std::true_type, T&& t) {
+			return t.first;
+		}
+
+		template <typename T>
+		decltype(auto) get_value(std::false_type, T&& t) {
+			return std::forward<T>(t);
+		}
+
+		template <typename T>
+		decltype(auto) get_value(std::true_type, T&& t) {
+			return t.second;
+		}
+
+		template <typename X, typename = void>
+		struct usertype_container_default {
+		private:
+			typedef std::remove_pointer_t<meta::unwrap_unqualified_t<X>> T;
+
+		public:
+			typedef lua_nil_t iterator;
+			typedef iterator sentinel;
+			typedef lua_nil_t value_type;
+
+			static int at(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'at(index)' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int get(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'get(key)' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int index_get(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'container[key]' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int set(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'set(key, value)' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int index_set(lua_State* L_) {
+				return luaL_error(
+				     L_, "sol: cannot call 'container[key] = value' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int add(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'add' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int insert(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'insert' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int find(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'find' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int index_of(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'index_of' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int size(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'end' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int clear(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'clear' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int empty(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'empty' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int erase(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'erase' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int next(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'next' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int pairs(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call '__pairs/pairs' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static int ipairs(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call '__ipairs' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+			}
+
+			static iterator begin(lua_State* L_, T&) {
+				luaL_error(L_, "sol: cannot call 'being' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+				return lua_nil;
+			}
+
+			static sentinel end(lua_State* L_, T&) {
+				luaL_error(L_, "sol: cannot call 'end' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
+				return lua_nil;
+			}
+		};
+
+		template <typename X>
+		struct usertype_container_default<X,
+		     std::enable_if_t<meta::all<is_forced_container<meta::unqualified_t<X>>, meta::has_value_type<meta::unqualified_t<container_decay_t<X>>>,
+		          meta::has_iterator<meta::unqualified_t<container_decay_t<X>>>>::value>> {
+		private:
+			using T = std::remove_pointer_t<meta::unwrap_unqualified_t<container_decay_t<X>>>;
+
+		private:
+			using deferred_uc = usertype_container<X>;
+			using is_associative = meta::is_associative<T>;
+			using is_lookup = meta::is_lookup<T>;
+			using is_ordered = meta::is_ordered<T>;
+			using is_matched_lookup = meta::is_matched_lookup<T>;
+			using iterator = typename T::iterator;
+			using sentinel = meta::sentinel_or_t<T, iterator>;
+			using value_type = typename T::value_type;
+			typedef meta::conditional_t<is_matched_lookup::value, std::pair<value_type, value_type>,
+			     meta::conditional_t<is_associative::value || is_lookup::value, value_type, std::pair<std::ptrdiff_t, value_type>>>
+			     KV;
+			typedef typename KV::first_type K;
+			typedef typename KV::second_type V;
+			typedef meta::conditional_t<is_matched_lookup::value, std::ptrdiff_t, K> next_K;
+			typedef decltype(*std::declval<iterator&>()) iterator_return;
+			typedef meta::conditional_t<is_associative::value || is_matched_lookup::value, std::add_lvalue_reference_t<V>,
+			     meta::conditional_t<is_lookup::value, V, iterator_return>>
+			     captured_type;
+			typedef typename meta::iterator_tag<iterator>::type iterator_category;
+			typedef std::is_same<iterator_category, std::input_iterator_tag> is_input_iterator;
+			typedef meta::conditional_t<is_input_iterator::value, V, decltype(detail::deref_move_only(std::declval<captured_type>()))> push_type;
+			typedef std::is_copy_assignable<V> is_copyable;
+			typedef meta::neg<meta::any<std::is_const<V>, std::is_const<std::remove_reference_t<iterator_return>>, meta::neg<is_copyable>>> is_writable;
+			typedef meta::unqualified_t<decltype(get_key(is_associative(), std::declval<std::add_lvalue_reference_t<value_type>>()))> key_type;
+			typedef meta::all<std::is_integral<K>, meta::neg<meta::any<is_associative, is_lookup>>> is_linear_integral;
+
+			struct iter : detail::ebco<iterator, 0>, detail::ebco<sentinel, 1> {
+				using it_base = detail::ebco<iterator, 0>;
+				using sen_base = detail::ebco<sentinel, 1>;
+				main_reference keep_alive;
+				std::size_t index;
+
+				iter(lua_State* L_, int stack_index_, iterator it_, sentinel sen_) noexcept
+				: it_base(std::move(it_)), sen_base(std::move(sen_)), keep_alive(L_, stack_index_), index(0) {
+				}
+
+				iterator& it() noexcept {
+					return it_base::value();
+				}
+
+				const iterator& it() const noexcept {
+					return it_base::value();
+				}
+
+				sentinel& sen() noexcept {
+					return sen_base::value();
+				}
+
+				const sentinel& sen() const noexcept {
+					return sen_base::value();
+				}
+			};
+
+			static auto& get_src(lua_State* L_) {
+#if SOL_IS_ON(SOL_SAFE_USERTYPE)
+				auto p = stack::unqualified_check_get<T*>(L_, 1);
+				if (!p) {
+					luaL_error(L_,
+					     "sol: 'self' is not of type '%s' (pass 'self' as first argument with ':' or call on proper type)",
+					     detail::demangle<T>().c_str());
+				}
+				if (p.value() == nullptr) {
+					luaL_error(
+					     L_, "sol: 'self' argument is nil (pass 'self' as first argument with ':' or call on a '%s' type)", detail::demangle<T>().c_str());
+				}
+				return *p.value();
+#else
+				return stack::unqualified_get<T>(L_, 1);
+#endif // Safe getting with error
+			}
+
+			static detail::error_result at_category(std::input_iterator_tag, lua_State* L_, T& self, std::ptrdiff_t pos) {
+				pos += deferred_uc::index_adjustment(L_, self);
+				if (pos < 0) {
+					return stack::push(L_, lua_nil);
+				}
+				auto it = deferred_uc::begin(L_, self);
+				auto e = deferred_uc::end(L_, self);
+				if (it == e) {
+					return stack::push(L_, lua_nil);
+				}
+				while (pos > 0) {
+					--pos;
+					++it;
+					if (it == e) {
+						return stack::push(L_, lua_nil);
+					}
+				}
+				return get_associative(is_associative(), L_, it);
+			}
+
+			static detail::error_result at_category(std::random_access_iterator_tag, lua_State* L_, T& self, std::ptrdiff_t pos) {
+				std::ptrdiff_t len = static_cast<std::ptrdiff_t>(size_start(L_, self));
+				pos += deferred_uc::index_adjustment(L_, self);
+				if (pos < 0 || pos >= len) {
+					return stack::push(L_, lua_nil);
+				}
+				auto it = std::next(deferred_uc::begin(L_, self), pos);
+				return get_associative(is_associative(), L_, it);
+			}
+
+			static detail::error_result at_start(lua_State* L_, T& self, std::ptrdiff_t pos) {
+				return at_category(iterator_category(), L_, self, pos);
+			}
+
+			template <typename Iter>
+			static detail::error_result get_associative(std::true_type, lua_State* L_, Iter& it) {
+				decltype(auto) v = *it;
+				return stack::stack_detail::push_reference<push_type>(L_, detail::deref_move_only(v.second));
+			}
+
+			template <typename Iter>
+			static detail::error_result get_associative(std::false_type, lua_State* L_, Iter& it) {
+				return stack::stack_detail::push_reference<push_type>(L_, detail::deref_move_only(*it));
+			}
+
+			static detail::error_result get_category(std::input_iterator_tag, lua_State* L_, T& self, K& key) {
+				key = static_cast<K>(key + deferred_uc::index_adjustment(L_, self));
+				if (key < 0) {
+					return stack::push(L_, lua_nil);
+				}
+				auto it = deferred_uc::begin(L_, self);
+				auto e = deferred_uc::end(L_, self);
+				if (it == e) {
+					return stack::push(L_, lua_nil);
+				}
+				while (key > 0) {
+					--key;
+					++it;
+					if (it == e) {
+						return stack::push(L_, lua_nil);
+					}
+				}
+				return get_associative(is_associative(), L_, it);
+			}
+
+			static detail::error_result get_category(std::random_access_iterator_tag, lua_State* L_, T& self, K& key) {
+				std::ptrdiff_t len = static_cast<std::ptrdiff_t>(size_start(L_, self));
+				key = static_cast<K>(static_cast<std::ptrdiff_t>(key) + deferred_uc::index_adjustment(L_, self));
+				if (key < 0 || key >= len) {
+					return stack::push(L_, lua_nil);
+				}
+				auto it = std::next(deferred_uc::begin(L_, self), key);
+				return get_associative(is_associative(), L_, it);
+			}
+
+			static detail::error_result get_it(std::true_type, lua_State* L_, T& self, K& key) {
+				return get_category(iterator_category(), L_, self, key);
+			}
+
+			static detail::error_result get_comparative(std::true_type, lua_State* L_, T& self, K& key) {
+				auto fx = [&](const value_type& r) -> bool { return key == get_key(is_associative(), r); };
+				auto e = deferred_uc::end(L_, self);
+				auto it = std::find_if(deferred_uc::begin(L_, self), e, std::ref(fx));
+				if (it == e) {
+					return stack::push(L_, lua_nil);
+				}
+				return get_associative(is_associative(), L_, it);
+			}
+
+			static detail::error_result get_comparative(std::false_type, lua_State*, T&, K&) {
+				return detail::error_result("cannot get this key on '%s': no suitable way to increment iterator and compare to key value '%s'",
+				     detail::demangle<T>().data(),
+				     detail::demangle<K>().data());
+			}
+
+			static detail::error_result get_it(std::false_type, lua_State* L_, T& self, K& key) {
+				return get_comparative(meta::supports_op_equal<K, key_type>(), L_, self, key);
+			}
+
+			static detail::error_result set_associative(std::true_type, iterator& it, stack_object value) {
+				decltype(auto) v = *it;
+				v.second = value.as<V>();
+				return {};
+			}
+
+			static detail::error_result set_associative(std::false_type, iterator& it, stack_object value) {
+				decltype(auto) v = *it;
+				v = value.as<V>();
+				return {};
+			}
+
+			static detail::error_result set_writable(std::true_type, lua_State*, T&, iterator& it, stack_object value) {
+				return set_associative(is_associative(), it, std::move(value));
+			}
+
+			static detail::error_result set_writable(std::false_type, lua_State*, T&, iterator&, stack_object) {
+				return detail::error_result(
+				     "cannot perform a 'set': '%s's iterator reference is not writable (non-copy-assignable or const)", detail::demangle<T>().data());
+			}
+
+			static detail::error_result set_category(std::input_iterator_tag, lua_State* L_, T& self, stack_object okey, stack_object value) {
+				decltype(auto) key = okey.as<K>();
+				key = static_cast<K>(static_cast<std::ptrdiff_t>(key) + deferred_uc::index_adjustment(L_, self));
+				auto e = deferred_uc::end(L_, self);
+				auto it = deferred_uc::begin(L_, self);
+				auto backit = it;
+				for (; key > 0 && it != e; --key, ++it) {
+					backit = it;
+				}
+				if (it == e) {
+					if (key == 0) {
+						return add_copyable(is_copyable(), L_, self, std::move(value), meta::has_insert_after<T>::value ? backit : it);
+					}
+					return detail::error_result("out of bounds (too big) for set on '%s'", detail::demangle<T>().c_str());
+				}
+				return set_writable(is_writable(), L_, self, it, std::move(value));
+			}
+
+			static detail::error_result set_category(std::random_access_iterator_tag, lua_State* L_, T& self, stack_object okey, stack_object value) {
+				decltype(auto) key = okey.as<K>();
+				key = static_cast<K>(static_cast<std::ptrdiff_t>(key) + deferred_uc::index_adjustment(L_, self));
+				if (key < 0) {
+					return detail::error_result("sol: out of bounds (too small) for set on '%s'", detail::demangle<T>().c_str());
+				}
+				std::ptrdiff_t len = static_cast<std::ptrdiff_t>(size_start(L_, self));
+				if (key == len) {
+					return add_copyable(is_copyable(), L_, self, std::move(value));
+				}
+				else if (key >= len) {
+					return detail::error_result("sol: out of bounds (too big) for set on '%s'", detail::demangle<T>().c_str());
+				}
+				auto it = std::next(deferred_uc::begin(L_, self), key);
+				return set_writable(is_writable(), L_, self, it, std::move(value));
+			}
+
+			static detail::error_result set_comparative(std::true_type, lua_State* L_, T& self, stack_object okey, stack_object value) {
+				decltype(auto) key = okey.as<K>();
+				if (!is_writable::value) {
+					return detail::error_result(
+					     "cannot perform a 'set': '%s's iterator reference is not writable (non-copy-assignable or const)", detail::demangle<T>().data());
+				}
+				auto fx = [&](const value_type& r) -> bool { return key == get_key(is_associative(), r); };
+				auto e = deferred_uc::end(L_, self);
+				auto it = std::find_if(deferred_uc::begin(L_, self), e, std::ref(fx));
+				if (it == e) {
+					return {};
+				}
+				return set_writable(is_writable(), L_, self, it, std::move(value));
+			}
+
+			static detail::error_result set_comparative(std::false_type, lua_State*, T&, stack_object, stack_object) {
+				return detail::error_result("cannot set this value on '%s': no suitable way to increment iterator or compare to '%s' key",
+				     detail::demangle<T>().data(),
+				     detail::demangle<K>().data());
+			}
+
+			template <typename Iter>
+			static detail::error_result set_associative_insert(std::true_type, lua_State*, T& self, Iter& it, K& key, stack_object value) {
+				if constexpr (meta::has_insert_with_iterator<T>::value) {
+					self.insert(it, value_type(key, value.as<V>()));
+					return {};
+				}
+				else if constexpr (meta::has_insert<T>::value) {
+					self.insert(value_type(key, value.as<V>()));
+					return {};
+				}
+				else {
+					(void)self;
+					(void)it;
+					(void)key;
+					return detail::error_result(
+					     "cannot call 'set' on '%s': there is no 'insert' function on this associative type", detail::demangle<T>().c_str());
+				}
+			}
+
+			template <typename Iter>
+			static detail::error_result set_associative_insert(std::false_type, lua_State*, T& self, Iter& it, K& key, stack_object) {
+				if constexpr (meta::has_insert_with_iterator<T>::value) {
+					self.insert(it, key);
+					return {};
+				}
+				else if constexpr (meta::has_insert<T>::value) {
+					self.insert(key);
+					return {};
+				}
+				else {
+					(void)self;
+					(void)it;
+					(void)key;
+					return detail::error_result(
+					     "cannot call 'set' on '%s': there is no 'insert' function on this non-associative type", detail::demangle<T>().c_str());
+				}
+			}
+
+			static detail::error_result set_associative_find(std::true_type, lua_State* L_, T& self, stack_object okey, stack_object value) {
+				decltype(auto) key = okey.as<K>();
+				auto it = self.find(key);
+				if (it == deferred_uc::end(L_, self)) {
+					return set_associative_insert(is_associative(), L_, self, it, key, std::move(value));
+				}
+				return set_writable(is_writable(), L_, self, it, std::move(value));
+			}
+
+			static detail::error_result set_associative_find(std::false_type, lua_State* L_, T& self, stack_object key, stack_object value) {
+				return set_comparative(meta::supports_op_equal<K, key_type>(), L_, self, std::move(key), std::move(value));
+			}
+
+			static detail::error_result set_it(std::true_type, lua_State* L_, T& self, stack_object key, stack_object value) {
+				return set_category(iterator_category(), L_, self, std::move(key), std::move(value));
+			}
+
+			static detail::error_result set_it(std::false_type, lua_State* L_, T& self, stack_object key, stack_object value) {
+				return set_associative_find(meta::all<has_find<T>, meta::any<is_associative, is_lookup>>(), L_, self, std::move(key), std::move(value));
+			}
+
+			template <bool idx_of = false>
+			static detail::error_result find_has_associative_lookup(std::true_type, lua_State* L_, T& self) {
+				if constexpr (!is_ordered::value && idx_of) {
+					(void)L_;
+					(void)self;
+					return detail::error_result("cannot perform an 'index_of': '%s's is not an ordered container", detail::demangle<T>().data());
+				}
+				else {
+					decltype(auto) key = stack::unqualified_get<K>(L_, 2);
+					auto it = self.find(key);
+					if (it == deferred_uc::end(L_, self)) {
+						return stack::push(L_, lua_nil);
+					}
+					if constexpr (idx_of) {
+						auto dist = std::distance(deferred_uc::begin(L_, self), it);
+						dist -= deferred_uc::index_adjustment(L_, self);
+						return stack::push(L_, dist);
+					}
+					else {
+						return get_associative(is_associative(), L_, it);
+					}
+				}
+			}
+
+			template <bool idx_of = false>
+			static detail::error_result find_has_associative_lookup(std::false_type, lua_State* L_, T& self) {
+				if constexpr (!is_ordered::value && idx_of) {
+					(void)L_;
+					(void)self;
+					return detail::error_result("cannot perform an 'index_of': '%s's is not an ordered container", detail::demangle<T>().data());
+				}
+				else {
+					decltype(auto) value = stack::unqualified_get<V>(L_, 2);
+					auto it = self.find(value);
+					if (it == deferred_uc::end(L_, self)) {
+						return stack::push(L_, lua_nil);
+					}
+					if constexpr (idx_of) {
+						auto dist = std::distance(deferred_uc::begin(L_, self), it);
+						dist -= deferred_uc::index_adjustment(L_, self);
+						return stack::push(L_, dist);
+					}
+					else {
+						return get_associative(is_associative(), L_, it);
+					}
+				}
+			}
+
+			template <bool idx_of = false>
+			static detail::error_result find_has(std::true_type, lua_State* L_, T& self) {
+				return find_has_associative_lookup<idx_of>(meta::any<is_lookup, is_associative>(), L_, self);
+			}
+
+			template <typename Iter>
+			static detail::error_result find_associative_lookup(std::true_type, lua_State* L_, T&, Iter& it, std::size_t) {
+				return get_associative(is_associative(), L_, it);
+			}
+
+			template <typename Iter>
+			static detail::error_result find_associative_lookup(std::false_type, lua_State* L_, T& self, Iter&, std::size_t idx) {
+				idx = static_cast<std::size_t>(static_cast<std::ptrdiff_t>(idx) - deferred_uc::index_adjustment(L_, self));
+				return stack::push(L_, idx);
+			}
+
+			template <bool = false>
+			static detail::error_result find_comparative(std::false_type, lua_State*, T&) {
+				return detail::error_result("cannot call 'find' on '%s': there is no 'find' function and the value_type is not equality comparable",
+				     detail::demangle<T>().c_str());
+			}
+
+			template <bool idx_of = false>
+			static detail::error_result find_comparative(std::true_type, lua_State* L_, T& self) {
+				decltype(auto) value = stack::unqualified_get<V>(L_, 2);
+				auto it = deferred_uc::begin(L_, self);
+				auto e = deferred_uc::end(L_, self);
+				std::size_t idx = 0;
+				for (;; ++it, ++idx) {
+					if (it == e) {
+						return stack::push(L_, lua_nil);
+					}
+					if (value == get_value(is_associative(), *it)) {
+						break;
+					}
+				}
+				return find_associative_lookup(meta::all<meta::boolean<!idx_of>, meta::any<is_lookup, is_associative>>(), L_, self, it, idx);
+			}
+
+			template <bool idx_of = false>
+			static detail::error_result find_has(std::false_type, lua_State* L_, T& self) {
+				return find_comparative<idx_of>(meta::supports_op_equal<V>(), L_, self);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_insert_after(std::false_type, lua_State* L_, T& self, stack_object value, Iter&) {
+				return add_insert_after(std::false_type(), L_, self, value);
+			}
+
+			static detail::error_result add_insert_after(std::false_type, lua_State*, T&, stack_object) {
+				return detail::error_result("cannot call 'add' on type '%s': no suitable insert/push_back C++ functions", detail::demangle<T>().data());
+			}
+
+			template <typename Iter>
+			static detail::error_result add_insert_after(std::true_type, lua_State*, T& self, stack_object value, Iter& pos) {
+				self.insert_after(pos, value.as<V>());
+				return {};
+			}
+
+			static detail::error_result add_insert_after(std::true_type, lua_State* L_, T& self, stack_object value) {
+				auto backit = self.before_begin();
+				{
+					auto e = deferred_uc::end(L_, self);
+					for (auto it = deferred_uc::begin(L_, self); it != e; ++backit, ++it) { }
+				}
+				return add_insert_after(std::true_type(), L_, self, value, backit);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_insert(std::true_type, lua_State*, T& self, stack_object value, Iter& pos) {
+				self.insert(pos, value.as<V>());
+				return {};
+			}
+
+			static detail::error_result add_insert(std::true_type, lua_State* L_, T& self, stack_object value) {
+				auto pos = deferred_uc::end(L_, self);
+				return add_insert(std::true_type(), L_, self, value, pos);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_insert(std::false_type, lua_State* L_, T& self, stack_object value, Iter& pos) {
+				return add_insert_after(meta::has_insert_after<T>(), L_, self, std::move(value), pos);
+			}
+
+			static detail::error_result add_insert(std::false_type, lua_State* L_, T& self, stack_object value) {
+				return add_insert_after(meta::has_insert_after<T>(), L_, self, std::move(value));
+			}
+
+			template <typename Iter>
+			static detail::error_result add_push_back(std::true_type, lua_State*, T& self, stack_object value, Iter&) {
+				self.push_back(value.as<V>());
+				return {};
+			}
+
+			static detail::error_result add_push_back(std::true_type, lua_State*, T& self, stack_object value) {
+				self.push_back(value.as<V>());
+				return {};
+			}
+
+			template <typename Iter>
+			static detail::error_result add_push_back(std::false_type, lua_State* L_, T& self, stack_object value, Iter& pos) {
+				return add_insert(
+				     std::integral_constant < bool, meta::has_insert<T>::value || meta::has_insert_with_iterator<T>::value > (), L_, self, value, pos);
+			}
+
+			static detail::error_result add_push_back(std::false_type, lua_State* L_, T& self, stack_object value) {
+				return add_insert(
+				     std::integral_constant < bool, meta::has_insert<T>::value || meta::has_insert_with_iterator<T>::value > (), L_, self, value);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_associative(std::true_type, lua_State* L_, T& self, stack_object key, Iter& pos) {
+				if constexpr (meta::has_insert_with_iterator<T>::value) {
+					self.insert(pos, value_type(key.as<K>(), stack::unqualified_get<V>(L_, 3)));
+					return {};
+				}
+				else if constexpr (meta::has_insert<T>::value) {
+					self.insert(value_type(key.as<K>(), stack::unqualified_get<V>(L_, 3)));
+					return {};
+				}
+				else {
+					(void)L_;
+					(void)self;
+					(void)key;
+					(void)pos;
+					return detail::error_result(
+					     "cannot call 'insert' on '%s': there is no 'insert' function on this associative type", detail::demangle<T>().c_str());
+				}
+			}
+
+			static detail::error_result add_associative(std::true_type, lua_State* L_, T& self, stack_object key) {
+				auto pos = deferred_uc::end(L_, self);
+				return add_associative(std::true_type(), L_, self, std::move(key), pos);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_associative(std::false_type, lua_State* L_, T& self, stack_object value, Iter& pos) {
+				return add_push_back(meta::has_push_back<T>(), L_, self, value, pos);
+			}
+
+			static detail::error_result add_associative(std::false_type, lua_State* L_, T& self, stack_object value) {
+				return add_push_back(meta::has_push_back<T>(), L_, self, value);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_copyable(std::true_type, lua_State* L_, T& self, stack_object value, Iter& pos) {
+				return add_associative(is_associative(), L_, self, std::move(value), pos);
+			}
+
+			static detail::error_result add_copyable(std::true_type, lua_State* L_, T& self, stack_object value) {
+				return add_associative(is_associative(), L_, self, value);
+			}
+
+			template <typename Iter>
+			static detail::error_result add_copyable(std::false_type, lua_State* L_, T& self, stack_object value, Iter&) {
+				return add_copyable(std::false_type(), L_, self, std::move(value));
+			}
+
+			static detail::error_result add_copyable(std::false_type, lua_State*, T&, stack_object) {
+				return detail::error_result("cannot call 'add' on '%s': value_type is non-copyable", detail::demangle<T>().data());
+			}
+
+			static detail::error_result insert_lookup(std::true_type, lua_State* L_, T& self, stack_object, stack_object value) {
+				// TODO: should we warn or error about someone calling insert on an ordered / lookup container with no associativity?
+				return add_copyable(std::true_type(), L_, self, std::move(value));
+			}
+
+			static detail::error_result insert_lookup(std::false_type, lua_State* L_, T& self, stack_object where, stack_object value) {
+				auto it = deferred_uc::begin(L_, self);
+				auto key = where.as<K>();
+				key = static_cast<K>(static_cast<std::ptrdiff_t>(key) + deferred_uc::index_adjustment(L_, self));
+				std::advance(it, key);
+				self.insert(it, value.as<V>());
+				return {};
+			}
+
+			static detail::error_result insert_after_has(std::true_type, lua_State* L_, T& self, stack_object where, stack_object value) {
+				auto key = where.as<K>();
+				auto backit = self.before_begin();
+				{
+					key = static_cast<K>(static_cast<std::ptrdiff_t>(key) + deferred_uc::index_adjustment(L_, self));
+					auto e = deferred_uc::end(L_, self);
+					for (auto it = deferred_uc::begin(L_, self); key > 0; ++backit, ++it, --key) {
+						if (backit == e) {
+							return detail::error_result("sol: out of bounds (too big) for set on '%s'", detail::demangle<T>().c_str());
+						}
+					}
+				}
+				self.insert_after(backit, value.as<V>());
+				return {};
+			}
+
+			static detail::error_result insert_after_has(std::false_type, lua_State*, T&, stack_object, stack_object) {
+				return detail::error_result(
+				     "cannot call 'insert' on '%s': no suitable or similar functionality detected on this container", detail::demangle<T>().data());
+			}
+
+			static detail::error_result insert_has(std::true_type, lua_State* L_, T& self, stack_object key, stack_object value) {
+				return insert_lookup(meta::any<is_associative, is_lookup>(), L_, self, std::move(key), std::move(value));
+			}
+
+			static detail::error_result insert_has(std::false_type, lua_State* L_, T& self, stack_object where, stack_object value) {
+				return insert_after_has(meta::has_insert_after<T>(), L_, self, where, value);
+			}
+
+			static detail::error_result insert_copyable(std::true_type, lua_State* L_, T& self, stack_object key, stack_object value) {
+				return insert_has(std::integral_constant < bool,
+				     meta::has_insert<T>::value || meta::has_insert_with_iterator<T>::value > (),
+				     L_,
+				     self,
+				     std::move(key),
+				     std::move(value));
+			}
+
+			static detail::error_result insert_copyable(std::false_type, lua_State*, T&, stack_object, stack_object) {
+				return detail::error_result("cannot call 'insert' on '%s': value_type is non-copyable", detail::demangle<T>().data());
+			}
+
+			static detail::error_result erase_integral(std::true_type, lua_State* L_, T& self, K& key) {
+				auto it = deferred_uc::begin(L_, self);
+				key = (static_cast<std::ptrdiff_t>(key) + deferred_uc::index_adjustment(L_, self));
+				std::advance(it, key);
+				self.erase(it);
+
+				return {};
+			}
+
+			static detail::error_result erase_integral(std::false_type, lua_State* L_, T& self, const K& key) {
+				auto fx = [&](const value_type& r) -> bool { return key == r; };
+				auto e = deferred_uc::end(L_, self);
+				auto it = std::find_if(deferred_uc::begin(L_, self), e, std::ref(fx));
+				if (it == e) {
+					return {};
+				}
+				self.erase(it);
+
+				return {};
+			}
+
+			static detail::error_result erase_associative_lookup(std::true_type, lua_State*, T& self, const K& key) {
+				self.erase(key);
+				return {};
+			}
+
+			static detail::error_result erase_associative_lookup(std::false_type, lua_State* L_, T& self, K& key) {
+				return erase_integral(std::is_integral<K>(), L_, self, key);
+			}
+
+			static detail::error_result erase_after_has(std::true_type, lua_State* L_, T& self, K& key) {
+				auto backit = self.before_begin();
+				{
+					key = static_cast<K>(static_cast<std::ptrdiff_t>(key) + deferred_uc::index_adjustment(L_, self));
+					auto e = deferred_uc::end(L_, self);
+					for (auto it = deferred_uc::begin(L_, self); key > 0; ++backit, ++it, --key) {
+						if (backit == e) {
+							return detail::error_result("sol: out of bounds for erase on '%s'", detail::demangle<T>().c_str());
+						}
+					}
+				}
+				self.erase_after(backit);
+				return {};
+			}
+
+			static detail::error_result erase_after_has(std::false_type, lua_State*, T&, const K&) {
+				return detail::error_result("sol: cannot call erase on '%s'", detail::demangle<T>().c_str());
+			}
+
+			static detail::error_result erase_key_has(std::true_type, lua_State* L_, T& self, K& key) {
+				return erase_associative_lookup(meta::any<is_associative, is_lookup>(), L_, self, key);
+			}
+
+			static detail::error_result erase_key_has(std::false_type, lua_State* L_, T& self, K& key) {
+				return erase_after_has(has_erase_after<T>(), L_, self, key);
+			}
+
+			static detail::error_result erase_has(std::true_type, lua_State* L_, T& self, K& key) {
+				return erase_associative_lookup(meta::any<is_associative, is_lookup>(), L_, self, key);
+			}
+
+			static detail::error_result erase_has(std::false_type, lua_State* L_, T& self, K& key) {
+				return erase_key_has(has_erase_key<T>(), L_, self, key);
+			}
+
+			static auto size_has(std::false_type, lua_State* L_, T& self) {
+				return std::distance(deferred_uc::begin(L_, self), deferred_uc::end(L_, self));
+			}
+
+			static auto size_has(std::true_type, lua_State*, T& self) {
+				return self.size();
+			}
+
+			static void clear_has(std::true_type, lua_State*, T& self) {
+				self.clear();
+			}
+
+			static void clear_has(std::false_type, lua_State* L_, T&) {
+				luaL_error(L_, "sol: cannot call clear on '%s'", detail::demangle<T>().c_str());
+			}
+
+			static bool empty_has(std::true_type, lua_State*, T& self) {
+				return self.empty();
+			}
+
+			static bool empty_has(std::false_type, lua_State* L_, T& self) {
+				return deferred_uc::begin(L_, self) == deferred_uc::end(L_, self);
+			}
+
+			static detail::error_result get_associative_find(std::true_type, lua_State* L_, T& self, K& key) {
+				auto it = self.find(key);
+				if (it == deferred_uc::end(L_, self)) {
+					stack::push(L_, lua_nil);
+					return {};
+				}
+				return get_associative(std::true_type(), L_, it);
+			}
+
+			static detail::error_result get_associative_find(std::false_type, lua_State* L_, T& self, K& key) {
+				return get_it(is_linear_integral(), L_, self, key);
+			}
+
+			static detail::error_result get_start(lua_State* L_, T& self, K& key) {
+				return get_associative_find(std::integral_constant < bool, is_associative::value&& has_find<T>::value > (), L_, self, key);
+			}
+
+			static detail::error_result set_start(lua_State* L_, T& self, stack_object key, stack_object value) {
+				return set_it(is_linear_integral(), L_, self, std::move(key), std::move(value));
+			}
+
+			static std::size_t size_start(lua_State* L_, T& self) {
+				return static_cast<std::size_t>(size_has(meta::has_size<T>(), L_, self));
+			}
+
+			static void clear_start(lua_State* L_, T& self) {
+				clear_has(has_clear<T>(), L_, self);
+			}
+
+			static bool empty_start(lua_State* L_, T& self) {
+				return empty_has(has_empty<T>(), L_, self);
+			}
+
+			static detail::error_result erase_start(lua_State* L_, T& self, K& key) {
+				return erase_has(has_erase<T>(), L_, self, key);
+			}
+
+			template <bool ip>
+			static int next_associative(std::true_type, lua_State* L_) {
+				iter& i = stack::unqualified_get<user<iter>>(L_, 1);
+				auto& it = i.it;
+				auto& end = i.end;
+				if (it == end) {
+					return stack::push(L_, lua_nil);
+				}
+				int p;
+				if constexpr (ip) {
+					++i.index;
+					p = stack::push_reference(L_, i.index);
+				}
+				else {
+					p = stack::push_reference(L_, it->first);
+				}
+				p += stack::stack_detail::push_reference<push_type>(L_, detail::deref_move_only(it->second));
+				std::advance(it, 1);
+				return p;
+			}
+
+			template <bool>
+			static int next_associative(std::false_type, lua_State* L_) {
+				iter& i = stack::unqualified_get<user<iter>>(L_, 1);
+				auto& it = i.it();
+				auto& end = i.sen();
+				next_K k = stack::unqualified_get<next_K>(L_, 2);
+				if (it == end) {
+					return stack::push(L_, lua_nil);
+				}
+				int p;
+				if constexpr (std::is_integral_v<next_K>) {
+					p = stack::push_reference(L_, k + 1);
+				}
+				else {
+					p = stack::stack_detail::push_reference(L_, k + 1);
+				}
+				p += stack::stack_detail::push_reference<push_type>(L_, detail::deref_move_only(*it));
+				std::advance(it, 1);
+				return p;
+			}
+
+			template <bool ip>
+			static int next_iter(lua_State* L_) {
+				typedef meta::any<is_associative, meta::all<is_lookup, meta::neg<is_matched_lookup>>> is_assoc;
+				return next_associative<ip>(is_assoc(), L_);
+			}
+
+			template <bool ip>
+			static int pairs_associative(std::true_type, lua_State* L_) {
+				auto& src = get_src(L_);
+				stack::push(L_, next_iter<ip>);
+				stack::push<user<iter>>(L_, L_, 1, deferred_uc::begin(L_, src), deferred_uc::begin(L_, src));
+				stack::push(L_, lua_nil);
+				return 3;
+			}
+
+			template <bool ip>
+			static int pairs_associative(std::false_type, lua_State* L_) {
+				auto& src = get_src(L_);
+				stack::push(L_, next_iter<ip>);
+				stack::push<user<iter>>(L_, L_, 1, deferred_uc::begin(L_, src), deferred_uc::end(L_, src));
+				stack::push(L_, 0);
+				return 3;
+			}
+
+		public:
+			static int at(lua_State* L_) {
+				auto& self = get_src(L_);
+				detail::error_result er;
+				{
+					std::ptrdiff_t pos = stack::unqualified_get<std::ptrdiff_t>(L_, 2);
+					er = at_start(L_, self, pos);
+				}
+				return handle_errors(L_, er);
+			}
+
+			static int get(lua_State* L_) {
+				auto& self = get_src(L_);
+				detail::error_result er;
+				{
+					decltype(auto) key = stack::unqualified_get<K>(L_);
+					er = get_start(L_, self, key);
+				}
+				return handle_errors(L_, er);
+			}
+
+			static int index_get(lua_State* L_) {
+				return get(L_);
+			}
+
+			static int set(lua_State* L_) {
+				stack_object value = stack_object(L_, raw_index(3));
+				if constexpr (is_linear_integral::value) {
+					// for non-associative containers,
+					// erasure only happens if it is the
+					// last index in the container
+					auto key = stack::get<K>(L_, 2);
+					auto self_size = deferred_uc::size(L_);
+					if (key == static_cast<K>(self_size)) {
+						if (type_of(L_, 3) == type::lua_nil) {
+							return erase(L_);
+						}
+					}
+				}
+				else {
+					if (type_of(L_, 3) == type::lua_nil) {
+						return erase(L_);
+					}
+				}
+				auto& self = get_src(L_);
+				detail::error_result er = set_start(L_, self, stack_object(L_, raw_index(2)), std::move(value));
+				return handle_errors(L_, er);
+			}
+
+			static int index_set(lua_State* L_) {
+				return set(L_);
+			}
+
+			static int add(lua_State* L_) {
+				auto& self = get_src(L_);
+				detail::error_result er = add_copyable(is_copyable(), L_, self, stack_object(L_, raw_index(2)));
+				return handle_errors(L_, er);
+			}
+
+			static int insert(lua_State* L_) {
+				auto& self = get_src(L_);
+				detail::error_result er = insert_copyable(is_copyable(), L_, self, stack_object(L_, raw_index(2)), stack_object(L_, raw_index(3)));
+				return handle_errors(L_, er);
+			}
+
+			static int find(lua_State* L_) {
+				auto& self = get_src(L_);
+				detail::error_result er = find_has(has_find<T>(), L_, self);
+				return handle_errors(L_, er);
+			}
+
+			static int index_of(lua_State* L_) {
+				auto& self = get_src(L_);
+				detail::error_result er = find_has<true>(has_find<T>(), L_, self);
+				return handle_errors(L_, er);
+			}
+
+			static iterator begin(lua_State*, T& self) {
+				if constexpr (meta::has_begin_end_v<T>) {
+					return self.begin();
+				}
+				else {
+					using std::begin;
+					return begin(self);
+				}
+			}
+
+			static sentinel end(lua_State*, T& self) {
+				if constexpr (meta::has_begin_end_v<T>) {
+					return self.end();
+				}
+				else {
+					using std::end;
+					return end(self);
+				}
+			}
+
+			static int size(lua_State* L_) {
+				auto& self = get_src(L_);
+				std::size_t r = size_start(L_, self);
+				return stack::push(L_, r);
+			}
+
+			static int clear(lua_State* L_) {
+				auto& self = get_src(L_);
+				clear_start(L_, self);
+				return 0;
+			}
+
+			static int erase(lua_State* L_) {
+				auto& self = get_src(L_);
+				detail::error_result er;
+				{
+					decltype(auto) key = stack::unqualified_get<K>(L_, 2);
+					er = erase_start(L_, self, key);
+				}
+				return handle_errors(L_, er);
+			}
+
+			static int empty(lua_State* L_) {
+				auto& self = get_src(L_);
+				return stack::push(L_, empty_start(L_, self));
+			}
+
+			static std::ptrdiff_t index_adjustment(lua_State*, T&) {
+				return static_cast<std::ptrdiff_t>((SOL_CONTAINER_START_INDEX_I_) == 0 ? 0 : -(SOL_CONTAINER_START_INDEX_I_));
+			}
+
+			static int pairs(lua_State* L_) {
+				typedef meta::any<is_associative, meta::all<is_lookup, meta::neg<is_matched_lookup>>> is_assoc;
+				return pairs_associative<false>(is_assoc(), L_);
+			}
+
+			static int ipairs(lua_State* L_) {
+				typedef meta::any<is_associative, meta::all<is_lookup, meta::neg<is_matched_lookup>>> is_assoc;
+				return pairs_associative<true>(is_assoc(), L_);
+			}
+
+			static int next(lua_State* L_) {
+				return stack::push(L_, next_iter<false>);
+			}
+		};
+
+		template <typename X>
+		struct usertype_container_default<X, std::enable_if_t<std::is_array<std::remove_pointer_t<meta::unwrap_unqualified_t<X>>>::value>> {
+		private:
+			typedef std::remove_pointer_t<meta::unwrap_unqualified_t<X>> T;
+			typedef usertype_container<X> deferred_uc;
+
+		public:
+			typedef std::remove_extent_t<T> value_type;
+			typedef value_type* iterator;
+			typedef iterator sentinel;
+
+		private:
+			struct iter : detail::ebco<iterator, 0>, detail::ebco<sentinel, 1> {
+				using it_base = detail::ebco<iterator, 0>;
+				using sen_base = detail::ebco<sentinel, 1>;
+				reference keep_alive;
+				
+				iter(lua_State* L_, int stack_index_, iterator it_, sentinel sen_) noexcept
+				: it_base(std::move(it_)), sen_base(std::move(sen_)), keep_alive(sol::main_thread(L_, L_), stack_index_) {
+				}
+
+				iterator& it() noexcept {
+					return it_base::value();
+				}
+
+				const iterator& it() const noexcept {
+					return it_base::value();
+				}
+
+				sentinel& sen() noexcept {
+					return sen_base::value();
+				}
+
+				const sentinel& sen() const noexcept {
+					return sen_base::value();
+				}
+			};
+
+			static auto& get_src(lua_State* L_) {
+				auto p = stack::unqualified_check_get<T*>(L_, 1);
+#if SOL_IS_ON(SOL_SAFE_USERTYPE)
+				if (!p) {
+					luaL_error(L_,
+					     "sol: 'self' is not of type '%s' (pass 'self' as first argument with ':' or call on proper type)",
+					     detail::demangle<T>().c_str());
+				}
+				if (p.value() == nullptr) {
+					luaL_error(
+					     L_, "sol: 'self' argument is nil (pass 'self' as first argument with ':' or call on a '%s' type)", detail::demangle<T>().c_str());
+				}
+#endif // Safe getting with error
+				return *p.value();
+			}
+
+			static int find(std::true_type, lua_State* L_) {
+				T& self = get_src(L_);
+				decltype(auto) value = stack::unqualified_get<value_type>(L_, 2);
+				std::size_t N = std::extent<T>::value;
+				for (std::size_t idx = 0; idx < N; ++idx) {
+					using v_t = std::add_const_t<decltype(self[idx])>;
+					v_t v = self[idx];
+					if (v == value) {
+						idx = static_cast<std::size_t>(static_cast<std::ptrdiff_t>(idx) - deferred_uc::index_adjustment(L_, self));
+						return stack::push(L_, idx);
+					}
+				}
+				return stack::push(L_, lua_nil);
+			}
+
+			static int find(std::false_type, lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'find' on '%s': no supported comparison operator for the value type", detail::demangle<T>().c_str());
+			}
+
+			static int next_iter(lua_State* L_) {
+				iter& i = stack::unqualified_get<user<iter>>(L_, 1);
+				auto& it = i.it();
+				auto& end = i.sen();
+				std::size_t k = stack::unqualified_get<std::size_t>(L_, 2);
+				if (it == end) {
+					return 0;
+				}
+				int p;
+				p = stack::push(L_, k + 1);
+				p += stack::push_reference(L_, detail::deref_move_only(*it));
+				std::advance(it, 1);
+				return p;
+			}
+
+		public:
+			static int clear(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'clear' on type '%s': cannot remove all items from a fixed array", detail::demangle<T>().c_str());
+			}
+
+			static int erase(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'erase' on type '%s': cannot remove an item from fixed arrays", detail::demangle<T>().c_str());
+			}
+
+			static int add(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'add' on type '%s': cannot add to fixed arrays", detail::demangle<T>().c_str());
+			}
+
+			static int insert(lua_State* L_) {
+				return luaL_error(L_, "sol: cannot call 'insert' on type '%s': cannot insert new entries into fixed arrays", detail::demangle<T>().c_str());
+			}
+
+			static int at(lua_State* L_) {
+				return get(L_);
+			}
+
+			static int get(lua_State* L_) {
+				T& self = get_src(L_);
+				std::ptrdiff_t idx = stack::unqualified_get<std::ptrdiff_t>(L_, 2);
+				idx += deferred_uc::index_adjustment(L_, self);
+				if (idx >= static_cast<std::ptrdiff_t>(std::extent<T>::value) || idx < 0) {
+					return stack::push(L_, lua_nil);
+				}
+				return stack::push_reference(L_, detail::deref_move_only(self[idx]));
+			}
+
+			static int index_get(lua_State* L_) {
+				return get(L_);
+			}
+
+			static int set(lua_State* L_) {
+				T& self = get_src(L_);
+				std::ptrdiff_t idx = stack::unqualified_get<std::ptrdiff_t>(L_, 2);
+				idx += deferred_uc::index_adjustment(L_, self);
+				if (idx >= static_cast<std::ptrdiff_t>(std::extent<T>::value)) {
+					return luaL_error(L_, "sol: index out of bounds (too big) for set on '%s'", detail::demangle<T>().c_str());
+				}
+				if (idx < 0) {
+					return luaL_error(L_, "sol: index out of bounds (too small) for set on '%s'", detail::demangle<T>().c_str());
+				}
+				self[idx] = stack::unqualified_get<value_type>(L_, 3);
+				return 0;
+			}
+
+			static int index_set(lua_State* L_) {
+				return set(L_);
+			}
+
+			static int index_of(lua_State* L_) {
+				return find(L_);
+			}
+
+			static int find(lua_State* L_) {
+				return find(meta::supports_op_equal<value_type, value_type>(), L_);
+			}
+
+			static int size(lua_State* L_) {
+				return stack::push(L_, std::extent<T>::value);
+			}
+
+			static int empty(lua_State* L_) {
+				return stack::push(L_, std::extent<T>::value > 0);
+			}
+
+			static int pairs(lua_State* L_) {
+				auto& src = get_src(L_);
+				stack::push(L_, next_iter);
+				stack::push<user<iter>>(L_, L_, 1, deferred_uc::begin(L_, src), deferred_uc::end(L_, src));
+				stack::push(L_, 0);
+				return 3;
+			}
+
+			static int ipairs(lua_State* L_) {
+				return pairs(L_);
+			}
+
+			static int next(lua_State* L_) {
+				return stack::push(L_, next_iter);
+			}
+
+			static std::ptrdiff_t index_adjustment(lua_State*, T&) {
+				return (SOL_CONTAINER_START_INDEX_I_) == 0 ? 0 : -(SOL_CONTAINER_START_INDEX_I_);
+			}
+
+			static iterator begin(lua_State*, T& self) {
+				return std::addressof(self[0]);
+			}
+
+			static sentinel end(lua_State*, T& self) {
+				return std::addressof(self[0]) + std::extent<T>::value;
+			}
+		};
+
+		template <typename X>
+		struct usertype_container_default<usertype_container<X>> : usertype_container_default<X> { };
+	} // namespace container_detail
+
+	template <typename T>
+	struct usertype_container : container_detail::usertype_container_default<T> { };
+
+} // namespace sol
+
+// end of sol/usertype_container.hpp
+
+#include <unordered_map>
+
+namespace sol {
+
+	namespace container_detail {
+		template <typename X>
+		struct u_c_launch {
+			using T = std::remove_pointer_t<meta::unqualified_t<X>>;
+			using uc = usertype_container<T>;
+			using default_uc = usertype_container_default<T>;
+
+			static inline int real_index_get_traits(std::true_type, lua_State* L) {
+				return uc::index_get(L);
+			}
+
+			static inline int real_index_get_traits(std::false_type, lua_State* L) {
+				return default_uc::index_get(L);
+			}
+
+			static inline int real_index_call(lua_State* L) {
+				static const std::unordered_map<string_view, lua_CFunction> calls {
+					{ "at", &real_at_call },
+					{ "get", &real_get_call },
+					{ "set", &real_set_call },
+					{ "size", &real_length_call },
+					{ "add", &real_add_call },
+					{ "empty", &real_empty_call },
+					{ "insert", &real_insert_call },
+					{ "clear", &real_clear_call },
+					{ "find", &real_find_call },
+					{ "index_of", &real_index_of_call },
+					{ "erase", &real_erase_call },
+					{ "pairs", &pairs_call },
+					{ "next", &next_call },
+				};
+				auto maybenameview = stack::unqualified_check_get<string_view>(L, 2);
+				if (maybenameview) {
+					const string_view& name = *maybenameview;
+					auto it = calls.find(name);
+					if (it != calls.cend()) {
+						return stack::push(L, it->second);
+					}
+				}
+				return real_index_get_traits(container_detail::has_traits_index_get<uc>(), L);
+			}
+
+			static inline int real_at_traits(std::true_type, lua_State* L) {
+				return uc::at(L);
+			}
+
+			static inline int real_at_traits(std::false_type, lua_State* L) {
+				return default_uc::at(L);
+			}
+
+			static inline int real_at_call(lua_State* L) {
+				return real_at_traits(container_detail::has_traits_at<uc>(), L);
+			}
+
+			static inline int real_get_traits(std::true_type, lua_State* L) {
+				return uc::get(L);
+			}
+
+			static inline int real_get_traits(std::false_type, lua_State* L) {
+				return default_uc::get(L);
+			}
+
+			static inline int real_get_call(lua_State* L) {
+				return real_get_traits(container_detail::has_traits_get<uc>(), L);
+			}
+
+			static inline int real_set_traits(std::true_type, lua_State* L) {
+				return uc::set(L);
+			}
+
+			static inline int real_set_traits(std::false_type, lua_State* L) {
+				return default_uc::set(L);
+			}
+
+			static inline int real_set_call(lua_State* L) {
+				return real_set_traits(container_detail::has_traits_set<uc>(), L);
+			}
+
+			static inline int real_index_set_traits(std::true_type, lua_State* L) {
+				return uc::index_set(L);
+			}
+
+			static inline int real_index_set_traits(std::false_type, lua_State* L) {
+				return default_uc::index_set(L);
+			}
+
+			static inline int real_new_index_call(lua_State* L) {
+				return real_index_set_traits(container_detail::has_traits_index_set<uc>(), L);
+			}
+
+			static inline int real_pairs_traits(std::true_type, lua_State* L) {
+				return uc::pairs(L);
+			}
+
+			static inline int real_pairs_traits(std::false_type, lua_State* L) {
+				return default_uc::pairs(L);
+			}
+
+			static inline int real_pairs_call(lua_State* L) {
+				return real_pairs_traits(container_detail::has_traits_pairs<uc>(), L);
+			}
+
+			static inline int real_ipairs_traits(std::true_type, lua_State* L) {
+				return uc::ipairs(L);
+			}
+
+			static inline int real_ipairs_traits(std::false_type, lua_State* L) {
+				return default_uc::ipairs(L);
+			}
+
+			static inline int real_ipairs_call(lua_State* L) {
+				return real_ipairs_traits(container_detail::has_traits_ipairs<uc>(), L);
+			}
+
+			static inline int real_next_traits(std::true_type, lua_State* L) {
+				return uc::next(L);
+			}
+
+			static inline int real_next_traits(std::false_type, lua_State* L) {
+				return default_uc::next(L);
+			}
+
+			static inline int real_next_call(lua_State* L) {
+				return real_next_traits(container_detail::has_traits_next<uc>(), L);
+			}
+
+			static inline int real_size_traits(std::true_type, lua_State* L) {
+				return uc::size(L);
+			}
+
+			static inline int real_size_traits(std::false_type, lua_State* L) {
+				return default_uc::size(L);
+			}
+
+			static inline int real_length_call(lua_State* L) {
+				return real_size_traits(container_detail::has_traits_size<uc>(), L);
+			}
+
+			static inline int real_add_traits(std::true_type, lua_State* L) {
+				return uc::add(L);
+			}
+
+			static inline int real_add_traits(std::false_type, lua_State* L) {
+				return default_uc::add(L);
+			}
+
+			static inline int real_add_call(lua_State* L) {
+				return real_add_traits(container_detail::has_traits_add<uc>(), L);
+			}
+
+			static inline int real_insert_traits(std::true_type, lua_State* L) {
+				return uc::insert(L);
+			}
+
+			static inline int real_insert_traits(std::false_type, lua_State* L) {
+				return default_uc::insert(L);
+			}
+
+			static inline int real_insert_call(lua_State* L) {
+				return real_insert_traits(container_detail::has_traits_insert<uc>(), L);
+			}
+
+			static inline int real_clear_traits(std::true_type, lua_State* L) {
+				return uc::clear(L);
+			}
+
+			static inline int real_clear_traits(std::false_type, lua_State* L) {
+				return default_uc::clear(L);
+			}
+
+			static inline int real_clear_call(lua_State* L) {
+				return real_clear_traits(container_detail::has_traits_clear<uc>(), L);
+			}
+
+			static inline int real_empty_traits(std::true_type, lua_State* L) {
+				return uc::empty(L);
+			}
+
+			static inline int real_empty_traits(std::false_type, lua_State* L) {
+				return default_uc::empty(L);
+			}
+
+			static inline int real_empty_call(lua_State* L) {
+				return real_empty_traits(container_detail::has_traits_empty<uc>(), L);
+			}
+
+			static inline int real_erase_traits(std::true_type, lua_State* L) {
+				return uc::erase(L);
+			}
+
+			static inline int real_erase_traits(std::false_type, lua_State* L) {
+				return default_uc::erase(L);
+			}
+
+			static inline int real_erase_call(lua_State* L) {
+				return real_erase_traits(container_detail::has_traits_erase<uc>(), L);
+			}
+
+			static inline int real_find_traits(std::true_type, lua_State* L) {
+				return uc::find(L);
+			}
+
+			static inline int real_find_traits(std::false_type, lua_State* L) {
+				return default_uc::find(L);
+			}
+
+			static inline int real_find_call(lua_State* L) {
+				return real_find_traits(container_detail::has_traits_find<uc>(), L);
+			}
+
+			static inline int real_index_of_call(lua_State* L) {
+				if constexpr (container_detail::has_traits_index_of<uc>()) {
+					return uc::index_of(L);
+				}
+				else {
+					return default_uc::index_of(L);
+				}
+			}
+
+			static inline int add_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_add_call), (&real_add_call)>(L);
+			}
+
+			static inline int erase_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_erase_call), (&real_erase_call)>(L);
+			}
+
+			static inline int insert_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_insert_call), (&real_insert_call)>(L);
+			}
+
+			static inline int clear_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_clear_call), (&real_clear_call)>(L);
+			}
+
+			static inline int empty_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_empty_call), (&real_empty_call)>(L);
+			}
+
+			static inline int find_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_find_call), (&real_find_call)>(L);
+			}
+
+			static inline int index_of_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_index_of_call), (&real_index_of_call)>(L);
+			}
+
+			static inline int length_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_length_call), (&real_length_call)>(L);
+			}
+
+			static inline int pairs_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_pairs_call), (&real_pairs_call)>(L);
+			}
+
+			static inline int ipairs_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_ipairs_call), (&real_ipairs_call)>(L);
+			}
+
+			static inline int next_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_next_call), (&real_next_call)>(L);
+			}
+
+			static inline int at_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_at_call), (&real_at_call)>(L);
+			}
+
+			static inline int get_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_get_call), (&real_get_call)>(L);
+			}
+
+			static inline int set_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_set_call), (&real_set_call)>(L);
+			}
+
+			static inline int index_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_index_call), (&real_index_call)>(L);
+			}
+
+			static inline int new_index_call(lua_State* L) {
+				return detail::typed_static_trampoline<decltype(&real_new_index_call), (&real_new_index_call)>(L);
+			}
+		};
+	} // namespace container_detail
+
+	namespace stack {
+		namespace stack_detail {
+			template <typename T, bool is_shim = false>
+			struct metatable_setup {
+				lua_State* L;
+
+				metatable_setup(lua_State* L) : L(L) {
+				}
+
+				void operator()() {
+					using meta_usertype_container
+					     = container_detail::u_c_launch<meta::conditional_t<is_shim, as_container_t<std::remove_pointer_t<T>>, std::remove_pointer_t<T>>>;
+					static const char* metakey
+					     = is_shim ? &usertype_traits<as_container_t<std::remove_pointer_t<T>>>::metatable()[0] : &usertype_traits<T>::metatable()[0];
+					static const std::array<luaL_Reg, 20> reg = { {
+						// clang-format off
+						{ "__pairs", &meta_usertype_container::pairs_call },
+						{ "__ipairs", &meta_usertype_container::ipairs_call },
+						{ "__len", &meta_usertype_container::length_call },
+						{ "__index", &meta_usertype_container::index_call },
+						{ "__newindex", &meta_usertype_container::new_index_call },
+						{ "pairs", &meta_usertype_container::pairs_call },
+						{ "next", &meta_usertype_container::next_call },
+						{ "at", &meta_usertype_container::at_call },
+						{ "get", &meta_usertype_container::get_call },
+						{ "set", &meta_usertype_container::set_call },
+						{ "size", &meta_usertype_container::length_call },
+						{ "empty", &meta_usertype_container::empty_call },
+						{ "clear", &meta_usertype_container::clear_call },
+						{ "insert", &meta_usertype_container::insert_call },
+						{ "add", &meta_usertype_container::add_call },
+						{ "find", &meta_usertype_container::find_call },
+						{ "index_of", &meta_usertype_container::index_of_call },
+						{ "erase", &meta_usertype_container::erase_call },
+						std::is_pointer<T>::value ? luaL_Reg{ nullptr, nullptr } : luaL_Reg{ "__gc", &detail::usertype_alloc_destroy<T> },
+						{ nullptr, nullptr }
+						// clang-format on 
+					} };
+
+					if (luaL_newmetatable(L, metakey) == 1) {
+						luaL_setfuncs(L, reg.data(), 0);
+					}
+					lua_setmetatable(L, -2);
+				}
+			};
+		} // namespace stack_detail
+
+		template <typename T>
+		struct unqualified_pusher<as_container_t<T>> {
+			using C = meta::unqualified_t<T>;
+
+			static int push_lvalue(std::true_type, lua_State* L, const C& cont) {
+				stack_detail::metatable_setup<C*, true> fx(L);
+				return stack::push<detail::as_pointer_tag<const C>>(L, detail::with_function_tag(), fx, detail::ptr(cont));
+			}
+
+			static int push_lvalue(std::false_type, lua_State* L, const C& cont) {
+				stack_detail::metatable_setup<C, true> fx(L);
+				return stack::push<detail::as_value_tag<C>>(L, detail::with_function_tag(), fx, cont);
+			}
+
+			static int push_rvalue(std::true_type, lua_State* L, C&& cont) {
+				stack_detail::metatable_setup<C, true> fx(L);
+				return stack::push<detail::as_value_tag<C>>(L, detail::with_function_tag(), fx, std::move(cont));
+			}
+
+			static int push_rvalue(std::false_type, lua_State* L, const C& cont) {
+				return push_lvalue(std::is_lvalue_reference<T>(), L, cont);
+			}
+
+			static int push(lua_State* L, const as_container_t<T>& as_cont) {
+				return push_lvalue(std::is_lvalue_reference<T>(), L, as_cont.value());
+			}
+
+			static int push(lua_State* L, as_container_t<T>&& as_cont) {
+				return push_rvalue(meta::all<std::is_rvalue_reference<T>, meta::neg<std::is_lvalue_reference<T>>>(), L, std::forward<T>(as_cont.value()));
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<as_container_t<T*>> {
+			using C = std::add_pointer_t<meta::unqualified_t<std::remove_pointer_t<T>>>;
+
+			static int push(lua_State* L, T* cont) {
+				stack_detail::metatable_setup<C> fx(L);
+				return stack::push<detail::as_pointer_tag<T>>(L, detail::with_function_tag(), fx, cont);
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<T, std::enable_if_t<is_container_v<T>>> {
+			using C = T;
+
+			template <typename... Args>
+			static int push(lua_State* L, Args&&... args) {
+				stack_detail::metatable_setup<C> fx(L);
+				return stack::push<detail::as_value_tag<T>>(L, detail::with_function_tag(), fx, std::forward<Args>(args)...);
+			}
+		};
+
+		template <typename T>
+		struct unqualified_pusher<T*, std::enable_if_t<is_container_v<T>>> {
+			using C = std::add_pointer_t<meta::unqualified_t<std::remove_pointer_t<T>>>;
+
+			static int push(lua_State* L, T* cont) {
+				stack_detail::metatable_setup<C> fx(L);
+				return stack::push<detail::as_pointer_tag<T>>(L, detail::with_function_tag(), fx, cont);
+			}
+		};
+	} // namespace stack
+
+} // namespace sol
+
+// end of sol/usertype_container_launch.hpp
+
+#include <sstream>
+#include <type_traits>
+
+namespace sol {
+	namespace u_detail {
+		constexpr const lua_Integer toplevel_magic = static_cast<lua_Integer>(0xCCC2CCC1);
+
+		constexpr const int environment_index = 1;
+		constexpr const int usertype_storage_index = 2;
+		constexpr const int usertype_storage_base_index = 3;
+		constexpr const int exact_function_index = 4;
+		constexpr const int magic_index = 5;
+
+		constexpr const int simple_usertype_storage_index = 2;
+		constexpr const int index_function_index = 3;
+		constexpr const int new_index_function_index = 4;
+
+		constexpr const int base_walking_failed_index = -32467;
+		constexpr const int lookup_failed_index = -42469;
+
+		enum class submetatable_type {
+			// must be sequential
+			value,
+			reference,
+			unique,
+			const_reference,
+			const_value,
+			// must be LAST!
+			named
+		};
+
+		inline auto make_string_view(string_view s) {
+			return s;
+		}
+
+#if SOL_IS_ON(SOL_CHAR8_T)
+		inline auto make_string_view(const char8_t* s) {
+			return string_view(reinterpret_cast<const char*>(s));
+		}
+#endif
+
+		inline auto make_string_view(call_construction) {
+			return string_view(to_string(meta_function::call_function));
+		}
+
+		inline auto make_string_view(meta_function mf) {
+			return string_view(to_string(mf));
+		}
+
+		inline auto make_string_view(base_classes_tag) {
+			return string_view(detail::base_class_cast_key());
+		}
+
+		template <typename Arg>
+		inline std::string make_string(Arg&& arg) {
+			string_view s = make_string_view(arg);
+			return std::string(s.data(), s.size());
+		}
+
+		inline int is_indexer(string_view s) {
+			if (s == to_string(meta_function::index)) {
+				return 1;
+			}
+			else if (s == to_string(meta_function::new_index)) {
+				return 2;
+			}
+			return 0;
+		}
+
+		inline int is_indexer(meta_function mf) {
+			if (mf == meta_function::index) {
+				return 1;
+			}
+			else if (mf == meta_function::new_index) {
+				return 2;
+			}
+			return 0;
+		}
+
+		inline int is_indexer(call_construction) {
+			return 0;
+		}
+	} // namespace u_detail
+
+	namespace detail {
+
+		template <typename T, typename IFx, typename Fx>
+		inline void insert_default_registrations(IFx&& ifx, Fx&& fx) {
+			(void)ifx;
+			(void)fx;
+			if constexpr (is_automagical<T>::value) {
+				if (fx(meta_function::less_than)) {
+					if constexpr (meta::supports_op_less<T>::value) {
+						lua_CFunction f = &comparsion_operator_wrap<T, std::less<>>;
+						ifx(meta_function::less_than, f);
+					}
+				}
+				if (fx(meta_function::less_than_or_equal_to)) {
+					if constexpr (meta::supports_op_less_equal<T>::value) {
+						lua_CFunction f = &comparsion_operator_wrap<T, std::less_equal<>>;
+						ifx(meta_function::less_than_or_equal_to, f);
+					}
+				}
+				if (fx(meta_function::equal_to)) {
+					if constexpr (meta::supports_op_equal<T>::value) {
+						lua_CFunction f = &comparsion_operator_wrap<T, std::equal_to<>>;
+						ifx(meta_function::equal_to, f);
+					}
+					else {
+						lua_CFunction f = &comparsion_operator_wrap<T, no_comp>;
+						ifx(meta_function::equal_to, f);
+					}
+				}
+				if (fx(meta_function::pairs)) {
+					ifx(meta_function::pairs, &container_detail::u_c_launch<as_container_t<T>>::pairs_call);
+				}
+				if (fx(meta_function::length)) {
+					if constexpr (meta::has_size<const T>::value || meta::has_size<T>::value) {
+						auto f = &default_size<T>;
+						ifx(meta_function::length, f);
+					}
+				}
+				if (fx(meta_function::to_string)) {
+					if constexpr (is_to_stringable_v<T>) {
+						if constexpr (!meta::is_probably_stateless_lambda_v<T> && !std::is_member_pointer_v<T>) {
+							auto f = &detail::static_trampoline<&default_to_string<T>>;
+							ifx(meta_function::to_string, f);
+						}
+					}
+				}
+				if (fx(meta_function::call_function)) {
+					if constexpr (is_callable_v<T>) {
+						if constexpr (meta::call_operator_deducible_v<T>) {
+							auto f = &c_call<decltype(&T::operator()), &T::operator()>;
+							ifx(meta_function::call_function, f);
+						}
+					}
+				}
+			}
+		}
+	} // namespace detail
+
+	namespace stack { namespace stack_detail {
+		template <typename X>
+		void set_undefined_methods_on(stack_reference t) {
+			using T = std::remove_pointer_t<X>;
+
+			lua_State* L = t.lua_state();
+
+			t.push();
+
+			detail::lua_reg_table l {};
+			int index = 0;
+			detail::indexed_insert insert_fx(l, index);
+			detail::insert_default_registrations<T>(insert_fx, detail::property_always_true);
+			if constexpr (!std::is_pointer_v<X>) {
+				l[index] = luaL_Reg { to_string(meta_function::garbage_collect).c_str(), detail::make_destructor<T>() };
+			}
+			luaL_setfuncs(L, l, 0);
+
+			// __type table
+			lua_createtable(L, 0, 2);
+			const std::string& name = detail::demangle<T>();
+			lua_pushlstring(L, name.c_str(), name.size());
+			lua_setfield(L, -2, "name");
+			lua_CFunction is_func = &detail::is_check<T>;
+			lua_pushcclosure(L, is_func, 0);
+			lua_setfield(L, -2, "is");
+			lua_setfield(L, t.stack_index(), to_string(meta_function::type).c_str());
+
+			t.pop();
+		}
+	}} // namespace stack::stack_detail
+} // namespace sol
+
+// end of sol/usertype_core.hpp
+
+// beginning of sol/usertype_storage.hpp
+
+#include <bitset>
+#include <unordered_map>
+#include <memory>
+
+namespace sol { namespace u_detail {
+
+	struct usertype_storage_base;
+	template <typename T>
+	struct usertype_storage;
+
+	optional<usertype_storage_base&> maybe_get_usertype_storage_base(lua_State* L_, int index);
+	usertype_storage_base& get_usertype_storage_base(lua_State* L_, const char* gcmetakey);
+	template <typename T>
+	optional<usertype_storage<T>&> maybe_get_usertype_storage(lua_State* L_);
+	template <typename T>
+	usertype_storage<T>& get_usertype_storage(lua_State* L_);
+
+	using index_call_function = int(lua_State*, void*);
+	using change_indexing_mem_func = void (usertype_storage_base::*)(
+		lua_State*, submetatable_type, void*, stateless_stack_reference&, lua_CFunction, lua_CFunction, lua_CFunction, lua_CFunction);
+
+	struct index_call_storage {
+		index_call_function* index;
+		index_call_function* new_index;
+		void* binding_data;
+	};
+
+	struct new_index_call_storage : index_call_storage {
+		void* new_binding_data;
+	};
+
+	struct binding_base {
+		virtual void* data() = 0;
+		virtual ~binding_base() {
+		}
+	};
+
+	template <typename K, typename Fq, typename T = void>
+	struct binding : binding_base {
+		using uF = meta::unqualified_t<Fq>;
+		using F = meta::conditional_t<meta::is_c_str_of_v<uF, char>
+#if SOL_IS_ON(SOL_CHAR8_T)
+			     || meta::is_c_str_of_v<uF, char8_t>
+#endif
+			     || meta::is_c_str_of_v<uF, char16_t> || meta::is_c_str_of_v<uF, char32_t> || meta::is_c_str_of_v<uF, wchar_t>,
+			std::add_pointer_t<std::add_const_t<std::remove_all_extents_t<Fq>>>, std::decay_t<Fq>>;
+		F data_;
+
+		template <typename... Args>
+		binding(Args&&... args) : data_(std::forward<Args>(args)...) {
+		}
+
+		virtual void* data() override {
+			return static_cast<void*>(std::addressof(data_));
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int call_with_(lua_State* L_, void* target) {
+			constexpr int boost = !detail::is_non_factory_constructor<F>::value && std::is_same<K, call_construction>::value ? 1 : 0;
+			auto& f = *static_cast<F*>(target);
+			return call_detail::call_wrapped<T, is_index, is_variable, boost>(L_, f);
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int call_(lua_State* L_) {
+			void* f = stack::get<void*>(L_, upvalue_index(usertype_storage_index));
+			return call_with_<is_index, is_variable>(L_, f);
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int call(lua_State* L_) {
+			int r = detail::typed_static_trampoline<decltype(&call_<is_index, is_variable>), (&call_<is_index, is_variable>)>(L_);
+			if constexpr (meta::is_specialization_of_v<uF, yielding_t>) {
+				return lua_yield(L_, r);
+			}
+			else {
+				return r;
+			}
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int index_call_with_(lua_State* L_, void* target) {
+			if constexpr (!is_variable) {
+				if constexpr (is_lua_c_function_v<std::decay_t<F>>) {
+					auto& f = *static_cast<std::decay_t<F>*>(target);
+					return stack::push(L_, f);
+				}
+				else {
+					// set up upvalues
+					// for a chained call
+					int upvalues = 0;
+					upvalues += stack::push(L_, nullptr);
+					upvalues += stack::push(L_, target);
+					auto cfunc = &call<is_index, is_variable>;
+					return stack::push(L_, c_closure(cfunc, upvalues));
+				}
+			}
+			else {
+				constexpr int boost = !detail::is_non_factory_constructor<F>::value && std::is_same<K, call_construction>::value ? 1 : 0;
+				auto& f = *static_cast<F*>(target);
+				return call_detail::call_wrapped<T, is_index, is_variable, boost>(L_, f);
+			}
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int index_call_(lua_State* L_) {
+			void* f = stack::get<void*>(L_, upvalue_index(usertype_storage_index));
+			return index_call_with_<is_index, is_variable>(L_, f);
+		}
+
+		template <bool is_index = true, bool is_variable = false>
+		static inline int index_call(lua_State* L_) {
+			int r = detail::typed_static_trampoline<decltype(&index_call_<is_index, is_variable>), (&index_call_<is_index, is_variable>)>(L_);
+			if constexpr (meta::is_specialization_of_v<uF, yielding_t>) {
+				return lua_yield(L_, r);
+			}
+			else {
+				return r;
+			}
+		}
+	};
+
+	inline int index_fail(lua_State* L_) {
+		if (lua_getmetatable(L_, 1) == 1) {
+			int metatarget = lua_gettop(L_);
+			stack::get_field<false, true>(L_, stack_reference(L_, raw_index(2)), metatarget);
+			return 1;
+		}
+		// With runtime extensibility, we can't
+		// hard-error things. They have to
+		// return nil, like regular table types
+		return stack::push(L_, lua_nil);
+	}
+
+	inline int index_target_fail(lua_State* L_, void*) {
+		return index_fail(L_);
+	}
+
+	inline int new_index_fail(lua_State* L_) {
+		return luaL_error(L_, "sol: cannot set (new_index) into this object: no defined new_index operation on usertype");
+	}
+
+	inline int new_index_target_fail(lua_State* L_, void*) {
+		return new_index_fail(L_);
+	}
+
+	struct string_for_each_metatable_func {
+		bool is_destruction = false;
+		bool is_index = false;
+		bool is_new_index = false;
+		bool is_static_index = false;
+		bool is_static_new_index = false;
+		bool poison_indexing = false;
+		bool is_unqualified_lua_CFunction = false;
+		bool is_unqualified_lua_reference = false;
+		std::string* p_key = nullptr;
+		reference* p_binding_ref = nullptr;
+		lua_CFunction call_func = nullptr;
+		index_call_storage* p_ics = nullptr;
+		usertype_storage_base* p_usb = nullptr;
+		void* p_derived_usb = nullptr;
+		lua_CFunction idx_call = nullptr, new_idx_call = nullptr, meta_idx_call = nullptr, meta_new_idx_call = nullptr;
+		change_indexing_mem_func change_indexing;
+
+		void operator()(lua_State* L_, submetatable_type smt_, stateless_reference& fast_index_table_) {
+			std::string& key = *p_key;
+			usertype_storage_base& usb = *p_usb;
+			index_call_storage& ics = *p_ics;
+
+			if (smt_ == submetatable_type::named) {
+				// do not override __call or
+				// other specific meta functions on named metatable:
+				// we need that for call construction
+				// and other amenities
+				return;
+			}
+			int fast_index_table_push = fast_index_table_.push(L_);
+			stateless_stack_reference t(L_, -fast_index_table_push);
+			if (poison_indexing) {
+				(usb.*change_indexing)(L_, smt_, p_derived_usb, t, idx_call, new_idx_call, meta_idx_call, meta_new_idx_call);
+			}
+			if (is_destruction
+				&& (smt_ == submetatable_type::reference || smt_ == submetatable_type::const_reference || smt_ == submetatable_type::named
+				     || smt_ == submetatable_type::unique)) {
+				// gc does not apply to us here
+				// for reference types (raw T*, std::ref)
+				// for the named metatable itself,
+				// or for unique_usertypes, which do their own custom destroyion
+				t.pop(L_);
+				return;
+			}
+			if (is_index || is_new_index || is_static_index || is_static_new_index) {
+				// do not serialize the new_index and index functions here directly
+				// we control those...
+				t.pop(L_);
+				return;
+			}
+			if (is_unqualified_lua_CFunction) {
+				stack::set_field<false, true>(L_, key, call_func, t.stack_index());
+			}
+			else if (is_unqualified_lua_reference) {
+				reference& binding_ref = *p_binding_ref;
+				stack::set_field<false, true>(L_, key, binding_ref, t.stack_index());
+			}
+			else {
+				stack::set_field<false, true>(L_, key, make_closure(call_func, nullptr, ics.binding_data), t.stack_index());
+			}
+			t.pop(L_);
+		}
+	};
+
+	struct lua_reference_func {
+		reference key;
+		reference value;
+
+		void operator()(lua_State* L_, submetatable_type smt_, stateless_reference& fast_index_table_) {
+			if (smt_ == submetatable_type::named) {
+				return;
+			}
+			int fast_index_table_push = fast_index_table_.push(L_);
+			stateless_stack_reference t(L_, -fast_index_table_push);
+			stack::set_field<false, true>(L_, key, value, t.stack_index());
+			t.pop(L_);
+		}
+	};
+
+	struct update_bases_func {
+		detail::inheritance_check_function base_class_check_func;
+		detail::inheritance_cast_function base_class_cast_func;
+		lua_CFunction idx_call, new_idx_call, meta_idx_call, meta_new_idx_call;
+		usertype_storage_base* p_usb;
+		void* p_derived_usb;
+		change_indexing_mem_func change_indexing;
+
+		void operator()(lua_State* L_, submetatable_type smt_, stateless_reference& fast_index_table_) {
+			int fast_index_table_push = fast_index_table_.push(L_);
+			stateless_stack_reference t(L_, -fast_index_table_push);
+			stack::set_field(L_, detail::base_class_check_key(), reinterpret_cast<void*>(base_class_check_func), t.stack_index());
+			stack::set_field(L_, detail::base_class_cast_key(), reinterpret_cast<void*>(base_class_cast_func), t.stack_index());
+			// change indexing, forcefully
+			(p_usb->*change_indexing)(L_, smt_, p_derived_usb, t, idx_call, new_idx_call, meta_idx_call, meta_new_idx_call);
+			t.pop(L_);
+		}
+	};
+
+	struct binding_data_equals {
+		void* binding_data;
+
+		binding_data_equals(void* b) : binding_data(b) {
+		}
+
+		bool operator()(const std::unique_ptr<binding_base>& ptr) const {
+			return binding_data == ptr->data();
+		}
+	};
+
+	struct usertype_storage_base {
+	public:
+		lua_State* m_L;
+		std::vector<std::unique_ptr<binding_base>> storage;
+		std::vector<std::unique_ptr<char[]>> string_keys_storage;
+		std::unordered_map<string_view, index_call_storage> string_keys;
+		std::unordered_map<stateless_reference, stateless_reference, stateless_reference_hash, stateless_reference_equals> auxiliary_keys;
+		stateless_reference value_index_table;
+		stateless_reference reference_index_table;
+		stateless_reference unique_index_table;
+		stateless_reference const_reference_index_table;
+		stateless_reference const_value_index_table;
+		stateless_reference named_index_table;
+		stateless_reference type_table;
+		stateless_reference gc_names_table;
+		stateless_reference named_metatable;
+		new_index_call_storage base_index;
+		new_index_call_storage static_base_index;
+		bool is_using_index;
+		bool is_using_new_index;
+		std::bitset<64> properties;
+
+		usertype_storage_base(lua_State* L_)
+		: m_L(L_)
+		, storage()
+		, string_keys_storage()
+		, string_keys()
+		, auxiliary_keys(0, stateless_reference_hash(L_), stateless_reference_equals(L_))
+		, value_index_table()
+		, reference_index_table()
+		, unique_index_table()
+		, const_reference_index_table()
+		, const_value_index_table()
+		, named_index_table()
+		, type_table(make_reference<stateless_reference>(L_, create))
+		, gc_names_table(make_reference<stateless_reference>(L_, create))
+		, named_metatable(make_reference<stateless_reference>(L_, create))
+		, base_index()
+		, static_base_index()
+		, is_using_index(false)
+		, is_using_new_index(false)
+		, properties() {
+			base_index.binding_data = nullptr;
+			base_index.index = index_target_fail;
+			base_index.new_index = new_index_target_fail;
+			base_index.new_binding_data = nullptr;
+			static_base_index.binding_data = nullptr;
+			static_base_index.index = index_target_fail;
+			static_base_index.new_binding_data = this;
+			static_base_index.new_index = new_index_target_set;
+		}
+
+		template <typename Fx>
+		void for_each_table(lua_State* L_, Fx&& fx) {
+			for (int i = 0; i < 6; ++i) {
+				submetatable_type smt = static_cast<submetatable_type>(i);
+				stateless_reference* p_fast_index_table = nullptr;
+				switch (smt) {
+				case submetatable_type::const_value:
+					p_fast_index_table = &this->const_value_index_table;
+					break;
+				case submetatable_type::reference:
+					p_fast_index_table = &this->reference_index_table;
+					break;
+				case submetatable_type::unique:
+					p_fast_index_table = &this->unique_index_table;
+					break;
+				case submetatable_type::const_reference:
+					p_fast_index_table = &this->const_reference_index_table;
+					break;
+				case submetatable_type::named:
+					p_fast_index_table = &this->named_index_table;
+					break;
+				case submetatable_type::value:
+				default:
+					p_fast_index_table = &this->value_index_table;
+					break;
+				}
+				fx(L_, smt, *p_fast_index_table);
+			}
+		}
+
+		void add_entry(string_view sv, index_call_storage ics) {
+			string_keys_storage.emplace_back(new char[sv.size()]);
+			std::unique_ptr<char[]>& sv_storage = string_keys_storage.back();
+			std::memcpy(sv_storage.get(), sv.data(), sv.size());
+			string_view stored_sv(sv_storage.get(), sv.size());
+			string_keys.insert_or_assign(std::move(stored_sv), std::move(ics));
+		}
+
+		template <typename T, typename... Bases>
+		void update_bases(lua_State* L_, bases<Bases...>) {
+			static_assert(sizeof(void*) <= sizeof(detail::inheritance_check_function),
+				"The size of this data pointer is too small to fit the inheritance checking function: Please file "
+				"a bug report.");
+			static_assert(sizeof(void*) <= sizeof(detail::inheritance_cast_function),
+				"The size of this data pointer is too small to fit the inheritance checking function: Please file "
+				"a bug report.");
+			static_assert(!meta::any_same<T, Bases...>::value, "base classes cannot list the original class as part of the bases");
+			if constexpr (sizeof...(Bases) > 0) {
+				(void)detail::swallow { 0, ((weak_derive<Bases>::value = true), 0)... };
+
+				void* derived_this = static_cast<void*>(static_cast<usertype_storage<T>*>(this));
+
+				update_bases_func for_each_fx;
+				for_each_fx.base_class_check_func = &detail::inheritance<T>::template type_check_with<Bases...>;
+				for_each_fx.base_class_cast_func = &detail::inheritance<T>::template type_cast_with<Bases...>;
+				for_each_fx.idx_call = &usertype_storage<T>::template index_call_with_bases<false, Bases...>;
+				for_each_fx.new_idx_call = &usertype_storage<T>::template index_call_with_bases<true, Bases...>;
+				for_each_fx.meta_idx_call = &usertype_storage<T>::template meta_index_call_with_bases<false, Bases...>;
+				for_each_fx.meta_new_idx_call = &usertype_storage<T>::template meta_index_call_with_bases<true, Bases...>;
+				for_each_fx.p_usb = this;
+				for_each_fx.p_derived_usb = derived_this;
+				for_each_fx.change_indexing = &usertype_storage_base::change_indexing;
+				for_each_fx.p_derived_usb = derived_this;
+				this->for_each_table(L_, for_each_fx);
+			}
+			else {
+				(void)L_;
+			}
+		}
+
+		void clear() {
+			if (value_index_table.valid(m_L)) {
+				stack::clear(m_L, value_index_table);
+			}
+			if (reference_index_table.valid(m_L)) {
+				stack::clear(m_L, reference_index_table);
+			}
+			if (unique_index_table.valid(m_L)) {
+				stack::clear(m_L, unique_index_table);
+			}
+			if (const_reference_index_table.valid(m_L)) {
+				stack::clear(m_L, const_reference_index_table);
+			}
+			if (const_value_index_table.valid(m_L)) {
+				stack::clear(m_L, const_value_index_table);
+			}
+			if (named_index_table.valid(m_L)) {
+				stack::clear(m_L, named_index_table);
+			}
+			if (type_table.valid(m_L)) {
+				stack::clear(m_L, type_table);
+			}
+			if (gc_names_table.valid(m_L)) {
+				stack::clear(m_L, gc_names_table);
+			}
+			if (named_metatable.valid(m_L)) {
+				auto pp = stack::push_pop(m_L, named_metatable);
+				int named_metatable_index = pp.index_of(named_metatable);
+				if (lua_getmetatable(m_L, named_metatable_index) == 1) {
+					stack::clear(m_L, absolute_index(m_L, -1));
+				}
+				stack::clear(m_L, named_metatable);
+			}
+
+			value_index_table.reset(m_L);
+			reference_index_table.reset(m_L);
+			unique_index_table.reset(m_L);
+			const_reference_index_table.reset(m_L);
+			const_value_index_table.reset(m_L);
+			named_index_table.reset(m_L);
+			type_table.reset(m_L);
+			gc_names_table.reset(m_L);
+			named_metatable.reset(m_L);
+
+			storage.clear();
+			string_keys.clear();
+			auxiliary_keys.clear();
+			string_keys_storage.clear();
+		}
+
+		template <bool is_new_index, typename Base>
+		static void base_walk_index(lua_State* L_, usertype_storage_base& self, bool& keep_going, int& base_result) {
+			using bases = typename base<Base>::type;
+			if (!keep_going) {
+				return;
+			}
+			(void)L_;
+			(void)self;
+#if SOL_IS_ON(SOL_USE_UNSAFE_BASE_LOOKUP)
+			usertype_storage_base& base_storage = get_usertype_storage<Base>(L_);
+			base_result = self_index_call<is_new_index, true>(bases(), L_, base_storage);
+#else
+			optional<usertype_storage<Base>&> maybe_base_storage = maybe_get_usertype_storage<Base>(L_);
+			if (static_cast<bool>(maybe_base_storage)) {
+				base_result = self_index_call<is_new_index, true>(bases(), L_, *maybe_base_storage);
+				keep_going = base_result == base_walking_failed_index;
+			}
+#endif // Fast versus slow, safe base lookup
+		}
+
+		template <bool is_new_index = false, bool base_walking = false, bool from_named_metatable = false, typename... Bases>
+		static inline int self_index_call(types<Bases...>, lua_State* L, usertype_storage_base& self) {
+			if constexpr (!from_named_metatable || !is_new_index) {
+				type k_type = stack::get<type>(L, 2);
+				if (k_type == type::string) {
+					index_call_storage* target = nullptr;
+					string_view k = stack::get<string_view>(L, 2);
+					{
+						auto it = self.string_keys.find(k);
+						if (it != self.string_keys.cend()) {
+							target = &it->second;
+						}
+					}
+					if (target != nullptr) {
+						// let the target decide what to do, unless it's named...
+						if constexpr (is_new_index) {
+							return (target->new_index)(L, target->binding_data);
+						}
+						else {
+							return (target->index)(L, target->binding_data);
+						}
+					}
+				}
+				else if (k_type != type::lua_nil && k_type != type::none) {
+					stateless_reference* target = nullptr;
+					{
+						stack_reference k = stack::get<stack_reference>(L, 2);
+						auto it = self.auxiliary_keys.find(k);
+						if (it != self.auxiliary_keys.cend()) {
+							target = &it->second;
+						}
+					}
+					if (target != nullptr) {
+						if constexpr (is_new_index) {
+							// set value and return
+							target->reset(L, 3);
+							return 0;
+						}
+						else {
+							// push target to return
+							// what we found
+							return stack::push(L, *target);
+						}
+					}
+				}
+			}
+
+			// retrieve bases and walk through them.
+			bool keep_going = true;
+			int base_result;
+			(void)keep_going;
+			(void)base_result;
+			(void)detail::swallow { 1, (base_walk_index<is_new_index, Bases>(L, self, keep_going, base_result), 1)... };
+			if constexpr (sizeof...(Bases) > 0) {
+				if (!keep_going) {
+					return base_result;
+				}
+			}
+			if constexpr (base_walking) {
+				// if we're JUST base-walking then don't index-fail, just
+				// return the false bits
+				return base_walking_failed_index;
+			}
+			else if constexpr (from_named_metatable) {
+				if constexpr (is_new_index) {
+					return self.static_base_index.new_index(L, self.static_base_index.new_binding_data);
+				}
+				else {
+					return self.static_base_index.index(L, self.static_base_index.binding_data);
+				}
+			}
+			else {
+				if constexpr (is_new_index) {
+					return self.base_index.new_index(L, self.base_index.new_binding_data);
+				}
+				else {
+					return self.base_index.index(L, self.base_index.binding_data);
+				}
+			}
+		}
+
+		void change_indexing(lua_State* L_, submetatable_type submetatable_, void* derived_this_, stateless_stack_reference& t_, lua_CFunction index_,
+			lua_CFunction new_index_, lua_CFunction meta_index_, lua_CFunction meta_new_index_) {
+			usertype_storage_base& this_base = *this;
+			void* base_this = static_cast<void*>(&this_base);
+
+			this->is_using_index |= true;
+			this->is_using_new_index |= true;
+			if (submetatable_ == submetatable_type::named) {
+				stack::set_field(L_, metatable_key, named_index_table, t_.stack_index());
+				stateless_stack_reference stack_metametatable(L_, -named_metatable.push(L_));
+				stack::set_field<false, true>(L_,
+					meta_function::index,
+					make_closure(meta_index_, nullptr, derived_this_, base_this, nullptr, toplevel_magic),
+					stack_metametatable.stack_index());
+				stack::set_field<false, true>(L_,
+					meta_function::new_index,
+					make_closure(meta_new_index_, nullptr, derived_this_, base_this, nullptr, toplevel_magic),
+					stack_metametatable.stack_index());
+				stack_metametatable.pop(L_);
+			}
+			else {
+				stack::set_field<false, true>(
+					L_, meta_function::index, make_closure(index_, nullptr, derived_this_, base_this, nullptr, toplevel_magic), t_.stack_index());
+				stack::set_field<false, true>(
+					L_, meta_function::new_index, make_closure(new_index_, nullptr, derived_this_, base_this, nullptr, toplevel_magic), t_.stack_index());
+			}
+		}
+
+		template <typename T = void, typename Key, typename Value>
+		void set(lua_State* L, Key&& key, Value&& value);
+
+		static int new_index_target_set(lua_State* L, void* target) {
+			usertype_storage_base& self = *static_cast<usertype_storage_base*>(target);
+			self.set(L, reference(L, raw_index(2)), reference(L, raw_index(3)));
+			return 0;
+		}
+
+		~usertype_storage_base() {
+			value_index_table.reset(m_L);
+			reference_index_table.reset(m_L);
+			unique_index_table.reset(m_L);
+			const_reference_index_table.reset(m_L);
+			const_value_index_table.reset(m_L);
+			named_index_table.reset(m_L);
+			type_table.reset(m_L);
+			gc_names_table.reset(m_L);
+			named_metatable.reset(m_L);
+
+			auto auxiliary_first = auxiliary_keys.cbegin();
+			auto auxiliary_last = auxiliary_keys.cend();
+			while (auxiliary_first != auxiliary_last) {
+				// save a copy to what we're going to destroy
+				auto auxiliary_target = auxiliary_first;
+				// move the iterator up by 1
+				++auxiliary_first;
+				// extract the node and destroy the key
+				auto extracted_node = auxiliary_keys.extract(auxiliary_target);
+				extracted_node.key().reset(m_L);
+				extracted_node.mapped().reset(m_L);
+				// continue if auxiliary_first hasn't been exhausted
+			}
+		}
+	};
+
+	template <typename T>
+	struct usertype_storage : usertype_storage_base {
+
+		using usertype_storage_base::usertype_storage_base;
+
+		template <bool is_new_index, bool from_named_metatable>
+		static inline int index_call_(lua_State* L) {
+			using bases = typename base<T>::type;
+			usertype_storage_base& self = stack::get<light<usertype_storage_base>>(L, upvalue_index(usertype_storage_index));
+			return self_index_call<is_new_index, false, from_named_metatable>(bases(), L, self);
+		}
+
+		template <bool is_new_index, bool from_named_metatable, typename... Bases>
+		static inline int index_call_with_bases_(lua_State* L) {
+			using bases = types<Bases...>;
+			usertype_storage_base& self = stack::get<light<usertype_storage_base>>(L, upvalue_index(usertype_storage_index));
+			return self_index_call<is_new_index, false, from_named_metatable>(bases(), L, self);
+		}
+
+		template <bool is_new_index>
+		static inline int index_call(lua_State* L) {
+			return detail::static_trampoline<&index_call_<is_new_index, false>>(L);
+		}
+
+		template <bool is_new_index, typename... Bases>
+		static inline int index_call_with_bases(lua_State* L) {
+			return detail::static_trampoline<&index_call_with_bases_<is_new_index, false, Bases...>>(L);
+		}
+
+		template <bool is_new_index>
+		static inline int meta_index_call(lua_State* L) {
+			return detail::static_trampoline<&index_call_<is_new_index, true>>(L);
+		}
+
+		template <bool is_new_index, typename... Bases>
+		static inline int meta_index_call_with_bases(lua_State* L) {
+			return detail::static_trampoline<&index_call_with_bases_<is_new_index, true, Bases...>>(L);
+		}
+
+		template <typename Key, typename Value>
+		inline void set(lua_State* L, Key&& key, Value&& value);
+	};
+
+	template <typename T, typename Key, typename Value>
+	void usertype_storage_base::set(lua_State* L, Key&& key, Value&& value) {
+		using ValueU = meta::unwrap_unqualified_t<Value>;
+		using KeyU = meta::unwrap_unqualified_t<Key>;
+		using Binding = binding<KeyU, ValueU, T>;
+		using is_var_bind = is_variable_binding<ValueU>;
+		if constexpr (std::is_same_v<KeyU, call_construction>) {
+			(void)key;
+			std::unique_ptr<Binding> p_binding = std::make_unique<Binding>(std::forward<Value>(value));
+			Binding& b = *p_binding;
+			this->storage.push_back(std::move(p_binding));
+
+			this->named_index_table.push(L);
+			absolute_index metametatable_index(L, -1);
+			std::string_view call_metamethod_name = to_string(meta_function::call);
+			lua_pushlstring(L, call_metamethod_name.data(), call_metamethod_name.size());
+			stack::push(L, nullptr);
+			stack::push(L, b.data());
+			lua_CFunction target_func = &b.template call<false, false>;
+			lua_pushcclosure(L, target_func, 2);
+			lua_rawset(L, metametatable_index);
+			this->named_index_table.pop(L);
+		}
+		else if constexpr (std::is_same_v<KeyU, base_classes_tag>) {
+			(void)key;
+			this->update_bases<T>(L, std::forward<Value>(value));
+		}
+		else if constexpr ((meta::is_string_like_or_constructible<KeyU>::value || std::is_same_v<KeyU, meta_function>)) {
+			std::string s = u_detail::make_string(std::forward<Key>(key));
+			auto storage_it = this->storage.end();
+			auto string_it = this->string_keys.find(s);
+			if (string_it != this->string_keys.cend()) {
+				const auto& binding_data = string_it->second.binding_data;
+				storage_it = std::find_if(this->storage.begin(), this->storage.end(), binding_data_equals(binding_data));
+				this->string_keys.erase(string_it);
+			}
+
+			std::unique_ptr<Binding> p_binding = std::make_unique<Binding>(std::forward<Value>(value));
+			Binding& b = *p_binding;
+			if (storage_it != this->storage.cend()) {
+				*storage_it = std::move(p_binding);
+			}
+			else {
+				this->storage.push_back(std::move(p_binding));
+			}
+
+			bool is_index = (s == to_string(meta_function::index));
+			bool is_new_index = (s == to_string(meta_function::new_index));
+			bool is_static_index = (s == to_string(meta_function::static_index));
+			bool is_static_new_index = (s == to_string(meta_function::static_new_index));
+			bool is_destruction = s == to_string(meta_function::garbage_collect);
+			bool poison_indexing = (!is_using_index || !is_using_new_index) && (is_var_bind::value || is_index || is_new_index);
+			void* derived_this = static_cast<void*>(static_cast<usertype_storage<T>*>(this));
+			index_call_storage ics;
+			ics.binding_data = b.data();
+			ics.index = is_index || is_static_index ? &Binding::template call_with_<true, is_var_bind::value>
+				                                   : &Binding::template index_call_with_<true, is_var_bind::value>;
+			ics.new_index = is_new_index || is_static_new_index ? &Binding::template call_with_<false, is_var_bind::value>
+				                                               : &Binding::template index_call_with_<false, is_var_bind::value>;
+
+			string_for_each_metatable_func for_each_fx;
+			for_each_fx.is_destruction = is_destruction;
+			for_each_fx.is_index = is_index;
+			for_each_fx.is_new_index = is_new_index;
+			for_each_fx.is_static_index = is_static_index;
+			for_each_fx.is_static_new_index = is_static_new_index;
+			for_each_fx.poison_indexing = poison_indexing;
+			for_each_fx.p_key = &s;
+			for_each_fx.p_ics = &ics;
+			if constexpr (is_lua_c_function_v<ValueU>) {
+				for_each_fx.is_unqualified_lua_CFunction = true;
+				for_each_fx.call_func = *static_cast<lua_CFunction*>(ics.binding_data);
+			}
+			else if constexpr (is_lua_reference_or_proxy_v<ValueU>) {
+				for_each_fx.is_unqualified_lua_reference = true;
+				for_each_fx.p_binding_ref = static_cast<reference*>(ics.binding_data);
+			}
+			else {
+				for_each_fx.call_func = &b.template call<false, is_var_bind::value>;
+			}
+			for_each_fx.p_usb = this;
+			for_each_fx.p_derived_usb = derived_this;
+			for_each_fx.idx_call = &usertype_storage<T>::template index_call<false>;
+			for_each_fx.new_idx_call = &usertype_storage<T>::template index_call<true>;
+			for_each_fx.meta_idx_call = &usertype_storage<T>::template meta_index_call<false>;
+			for_each_fx.meta_new_idx_call = &usertype_storage<T>::template meta_index_call<true>;
+			for_each_fx.change_indexing = &usertype_storage_base::change_indexing;
+			// set base index and base new_index
+			// functions here
+			if (is_index) {
+				this->base_index.index = ics.index;
+				this->base_index.binding_data = ics.binding_data;
+			}
+			if (is_new_index) {
+				this->base_index.new_index = ics.new_index;
+				this->base_index.new_binding_data = ics.binding_data;
+			}
+			if (is_static_index) {
+				this->static_base_index.index = ics.index;
+				this->static_base_index.binding_data = ics.binding_data;
+			}
+			if (is_static_new_index) {
+				this->static_base_index.new_index = ics.new_index;
+				this->static_base_index.new_binding_data = ics.binding_data;
+			}
+			this->for_each_table(L, for_each_fx);
+			this->add_entry(s, std::move(ics));
+		}
+		else {
+			// the reference-based implementation might compare poorly and hash
+			// poorly in some cases...
+			if constexpr (is_lua_reference_v<KeyU> && is_lua_reference_v<ValueU>) {
+				if (key.get_type() == type::string) {
+					stack::push(L, key);
+					std::string string_key = stack::pop<std::string>(L);
+					this->set<T>(L, string_key, std::forward<Value>(value));
+				}
+				else {
+					lua_reference_func ref_additions_fx { key, value };
+
+					this->for_each_table(L, ref_additions_fx);
+					this->auxiliary_keys.insert_or_assign(std::forward<Key>(key), std::forward<Value>(value));
+				}
+			}
+			else {
+				reference ref_key = make_reference(L, std::forward<Key>(key));
+				reference ref_value = make_reference(L, std::forward<Value>(value));
+				lua_reference_func ref_additions_fx { ref_key, ref_value };
+
+				this->for_each_table(L, ref_additions_fx);
+				this->auxiliary_keys.insert_or_assign(std::move(ref_key), std::move(ref_value));
+			}
+		}
+	}
+
+	template <typename T>
+	template <typename Key, typename Value>
+	void usertype_storage<T>::set(lua_State* L, Key&& key, Value&& value) {
+		static_cast<usertype_storage_base&>(*this).set<T>(L, std::forward<Key>(key), std::forward<Value>(value));
+	}
+
+	template <typename T>
+	inline void clear_usertype_registry_names(lua_State* L) {
+		using u_traits = usertype_traits<T>;
+		using u_const_traits = usertype_traits<const T>;
+		using u_unique_traits = usertype_traits<d::u<T>>;
+		using u_ref_traits = usertype_traits<T*>;
+		using u_const_ref_traits = usertype_traits<T const*>;
+
+		stack_reference registry(L, raw_index(LUA_REGISTRYINDEX));
+		registry.push();
+		// eliminate all named entries for this usertype
+		// in the registry (luaL_newmetatable does
+		// [name] = new table
+		// in registry upon creation
+		stack::set_field(L, &u_traits::metatable()[0], lua_nil, registry.stack_index());
+		stack::set_field(L, &u_const_traits::metatable()[0], lua_nil, registry.stack_index());
+		stack::set_field(L, &u_const_ref_traits::metatable()[0], lua_nil, registry.stack_index());
+		stack::set_field(L, &u_ref_traits::metatable()[0], lua_nil, registry.stack_index());
+		stack::set_field(L, &u_unique_traits::metatable()[0], lua_nil, registry.stack_index());
+		registry.pop();
+	}
+
+	template <typename T>
+	inline int destroy_usertype_storage(lua_State* L) noexcept {
+		clear_usertype_registry_names<T>(L);
+		return detail::user_alloc_destroy<usertype_storage<T>>(L);
+	}
+
+	template <typename T>
+	inline usertype_storage<T>& create_usertype_storage(lua_State* L) {
+		const char* gcmetakey = &usertype_traits<T>::gc_table()[0];
+
+		// Make sure userdata's memory is properly in lua first,
+		// otherwise all the light userdata we make later will become invalid
+		int usertype_storage_push_count = stack::push<user<usertype_storage<T>>>(L, no_metatable, L);
+		stack_reference usertype_storage_ref(L, -usertype_storage_push_count);
+
+		// create and push onto the stack a table to use as metatable for this GC
+		// we create a metatable to attach to the regular gc_table
+		// so that the destructor is called for the usertype storage
+		int usertype_storage_metatabe_count = stack::push(L, new_table(0, 1));
+		stack_reference usertype_storage_metatable(L, -usertype_storage_metatabe_count);
+		// set the destroyion routine on the metatable
+		stack::set_field(L, meta_function::garbage_collect, &destroy_usertype_storage<T>, usertype_storage_metatable.stack_index());
+		// set the metatable on the usertype storage userdata
+		stack::set_field(L, metatable_key, usertype_storage_metatable, usertype_storage_ref.stack_index());
+		usertype_storage_metatable.pop();
+
+		// set the usertype storage and its metatable
+		// into the global table...
+		stack::set_field<true>(L, gcmetakey, usertype_storage_ref);
+		usertype_storage_ref.pop();
+
+		// then retrieve the lua-stored version so we have a well-pinned
+		// reference that does not die
+		stack::get_field<true>(L, gcmetakey);
+		usertype_storage<T>& target_umt = stack::pop<user<usertype_storage<T>>>(L);
+		return target_umt;
+	}
+
+	inline optional<usertype_storage_base&> maybe_as_usertype_storage_base(lua_State* L, int index) {
+		if (type_of(L, index) != type::lightuserdata) {
+			return nullopt;
+		}
+		usertype_storage_base& base_storage = *static_cast<usertype_storage_base*>(stack::get<void*>(L, index));
+		return base_storage;
+	}
+
+	inline optional<usertype_storage_base&> maybe_get_usertype_storage_base_inside(lua_State* L, int index) {
+		// okay, maybe we're looking at a table that is nested?
+		if (type_of(L, index) != type::table) {
+			return nullopt;
+		}
+		stack::get_field(L, meta_function::storage, index);
+		auto maybe_storage_base = maybe_as_usertype_storage_base(L, -1);
+		lua_pop(L, 1);
+		return maybe_storage_base;
+	}
+
+	inline optional<usertype_storage_base&> maybe_get_usertype_storage_base(lua_State* L, int index) {
+		// If we can get the index directly as this type, go for it
+		auto maybe_already_is_usertype_storage_base = maybe_as_usertype_storage_base(L, index);
+		if (maybe_already_is_usertype_storage_base) {
+			return maybe_already_is_usertype_storage_base;
+		}
+		return maybe_get_usertype_storage_base_inside(L, index);
+	}
+
+	inline optional<usertype_storage_base&> maybe_get_usertype_storage_base(lua_State* L, const char* gcmetakey) {
+		stack::get_field<true>(L, gcmetakey);
+		auto maybe_storage = maybe_as_usertype_storage_base(L, lua_gettop(L));
+		lua_pop(L, 1);
+		return maybe_storage;
+	}
+
+	inline usertype_storage_base& get_usertype_storage_base(lua_State* L, const char* gcmetakey) {
+		stack::get_field<true>(L, gcmetakey);
+		stack::record tracking;
+		usertype_storage_base& target_umt = stack::stack_detail::unchecked_unqualified_get<user<usertype_storage_base>>(L, -1, tracking);
+		lua_pop(L, 1);
+		return target_umt;
+	}
+
+	template <typename T>
+	inline optional<usertype_storage<T>&> maybe_get_usertype_storage(lua_State* L) {
+		const char* gcmetakey = &usertype_traits<T>::gc_table()[0];
+		stack::get_field<true>(L, gcmetakey);
+		int target = lua_gettop(L);
+		if (!stack::check<user<usertype_storage<T>>>(L, target)) {
+			return nullopt;
+		}
+		usertype_storage<T>& target_umt = stack::pop<user<usertype_storage<T>>>(L);
+		return target_umt;
+	}
+
+	template <typename T>
+	inline usertype_storage<T>& get_usertype_storage(lua_State* L) {
+		const char* gcmetakey = &usertype_traits<T>::gc_table()[0];
+		stack::get_field<true>(L, gcmetakey);
+		usertype_storage<T>& target_umt = stack::pop<user<usertype_storage<T>>>(L);
+		return target_umt;
+	}
+
+	template <typename T>
+	inline void clear_usertype_storage(lua_State* L) {
+		using u_traits = usertype_traits<T>;
+
+		const char* gcmetakey = &u_traits::gc_table()[0];
+		stack::get_field<true>(L, gcmetakey);
+		if (!stack::check<user<usertype_storage<T>>>(L)) {
+			lua_pop(L, 1);
+			return;
+		}
+		usertype_storage<T>& target_umt = stack::pop<user<usertype_storage<T>>>(L);
+		target_umt.clear();
+
+		clear_usertype_registry_names<T>(L);
+
+		stack::set_field<true>(L, gcmetakey, lua_nil);
+	}
+
+	template <typename T, automagic_flags enrollment_flags>
+	inline int register_usertype(lua_State* L_, automagic_enrollments enrollments_ = {}) {
+		using u_traits = usertype_traits<T>;
+		using u_const_traits = usertype_traits<const T>;
+		using u_unique_traits = usertype_traits<d::u<T>>;
+		using u_ref_traits = usertype_traits<T*>;
+		using u_const_ref_traits = usertype_traits<T const*>;
+		using uts = usertype_storage<T>;
+
+		// always have __new_index point to usertype_storage method
+		// have __index always point to regular fast-lookup
+		// meta_method table
+		// if __new_index is invoked, runtime-swap
+		// to slow __index if necessary
+		// (no speed penalty because function calls
+		// are all read-only -- only depend on __index
+		// to retrieve function and then call happens VIA Lua)
+
+		// __type entry:
+		// table contains key -> value lookup,
+		// where key is entry in metatable
+		// and value is type information as a string as
+		// best as we can give it
+
+		// name entry:
+		// string that contains raw class name,
+		// as defined from C++
+
+		// is entry:
+		// checks if argument supplied is of type T
+
+		// __storage entry:
+		// a light userdata pointing to the storage
+		// mostly to enable this new abstraction
+		// to not require the type name `T`
+		// to get at the C++ usertype storage within
+
+		// we then let typical definitions potentially override these intrinsics
+		// it's the user's fault if they override things or screw them up:
+		// these names have been reserved and documented since sol2
+
+		// STEP 0: tell the old usertype (if it exists)
+		// to fuck off
+		clear_usertype_storage<T>(L_);
+
+		// STEP 1: Create backing store for usertype storage
+		// Pretty much the most important step.
+		// STEP 2: Create Lua tables used for fast method indexing.
+		// This is done inside of the storage table's constructor
+		usertype_storage<T>& storage = create_usertype_storage<T>(L_);
+		usertype_storage_base& base_storage = storage;
+		void* light_storage = static_cast<void*>(&storage);
+		void* light_base_storage = static_cast<void*>(&base_storage);
+
+		// STEP 3: set up GC escape hatch table entirely
+		storage.gc_names_table.push(L_);
+		stateless_stack_reference gnt(L_, -1);
+		stack::set_field(L_, submetatable_type::named, &u_traits::gc_table()[0], gnt.stack_index());
+		stack::set_field(L_, submetatable_type::const_value, &u_const_traits::metatable()[0], gnt.stack_index());
+		stack::set_field(L_, submetatable_type::const_reference, &u_const_ref_traits::metatable()[0], gnt.stack_index());
+		stack::set_field(L_, submetatable_type::reference, &u_ref_traits::metatable()[0], gnt.stack_index());
+		stack::set_field(L_, submetatable_type::unique, &u_unique_traits::metatable()[0], gnt.stack_index());
+		stack::set_field(L_, submetatable_type::value, &u_traits::metatable()[0], gnt.stack_index());
+		gnt.pop(L_);
+
+		// STEP 4: add some useful information to the type table
+		stateless_stack_reference stacked_type_table(L_, -storage.type_table.push(L_));
+		stack::set_field(L_, "name", detail::demangle<T>(), stacked_type_table.stack_index());
+		stack::set_field(L_, "is", &detail::is_check<T>, stacked_type_table.stack_index());
+		stacked_type_table.pop(L_);
+
+		// STEP 5: create and hook up metatable,
+		// add intrinsics
+		// this one is the actual meta-handling table,
+		// the next one will be the one for
+		int for_each_backing_metatable_calls = 0;
+		auto for_each_backing_metatable = [&](lua_State* L_, submetatable_type smt_, stateless_reference& fast_index_table_) {
+			// Pointer types, AKA "references" from C++
+			const char* metakey = nullptr;
+			switch (smt_) {
+			case submetatable_type::const_value:
+				metakey = &u_const_traits::metatable()[0];
+				break;
+			case submetatable_type::reference:
+				metakey = &u_ref_traits::metatable()[0];
+				break;
+			case submetatable_type::unique:
+				metakey = &u_unique_traits::metatable()[0];
+				break;
+			case submetatable_type::const_reference:
+				metakey = &u_const_ref_traits::metatable()[0];
+				break;
+			case submetatable_type::named:
+				metakey = &u_traits::user_metatable()[0];
+				break;
+			case submetatable_type::value:
+			default:
+				metakey = &u_traits::metatable()[0];
+				break;
+			}
+
+			luaL_newmetatable(L_, metakey);
+			if (smt_ == submetatable_type::named) {
+				// the named table itself
+				// gets the associated name value
+				storage.named_metatable.reset(L_, -1);
+				lua_pop(L_, 1);
+				// but the thing we perform the methods on
+				// is still the metatable of the named
+				// table
+				lua_createtable(L_, 0, 6);
+			}
+			stateless_stack_reference t(L_, -1);
+			fast_index_table_.reset(L_, t.stack_index());
+			stack::set_field<false, true>(L_, meta_function::type, storage.type_table, t.stack_index());
+			// destructible? serialize default destructor here
+			// otherwise, not destructible: serialize a "hey you messed up"
+			switch (smt_) {
+			case submetatable_type::const_reference:
+			case submetatable_type::reference:
+			case submetatable_type::named:
+				break;
+			case submetatable_type::unique:
+				if constexpr (std::is_destructible_v<T>) {
+					stack::set_field<false, true>(L_, meta_function::garbage_collect, &detail::unique_destroy<T>, t.stack_index());
+				}
+				else {
+					stack::set_field<false, true>(L_, meta_function::garbage_collect, &detail::cannot_destroy<T>, t.stack_index());
+				}
+				break;
+			case submetatable_type::value:
+			case submetatable_type::const_value:
+			default:
+				if constexpr (std::is_destructible_v<T>) {
+					stack::set_field<false, true>(L_, meta_function::garbage_collect, detail::make_destructor<T>(), t.stack_index());
+				}
+				else {
+					stack::set_field<false, true>(L_, meta_function::garbage_collect, &detail::cannot_destroy<T>, t.stack_index());
+				}
+				break;
+			}
+
+			static_assert(sizeof(void*) <= sizeof(detail::inheritance_check_function),
+				"The size of this data pointer is too small to fit the inheritance checking function: file a bug "
+				"report.");
+			static_assert(sizeof(void*) <= sizeof(detail::inheritance_cast_function),
+				"The size of this data pointer is too small to fit the inheritance checking function: file a bug "
+				"report.");
+			stack::set_field<false, true>(L_, detail::base_class_check_key(), reinterpret_cast<void*>(&detail::inheritance<T>::type_check), t.stack_index());
+			stack::set_field<false, true>(L_, detail::base_class_cast_key(), reinterpret_cast<void*>(&detail::inheritance<T>::type_cast), t.stack_index());
+
+			auto prop_fx = detail::properties_enrollment_allowed(for_each_backing_metatable_calls, storage.properties, enrollments_);
+			auto insert_fx = [&L_, &t, &storage](meta_function mf, lua_CFunction reg) {
+				stack::set_field<false, true>(L_, mf, reg, t.stack_index());
+				storage.properties[static_cast<std::size_t>(mf)] = true;
+			};
+			detail::insert_default_registrations<T>(insert_fx, prop_fx);
+
+			// There are no variables, so serialize the fast function stuff
+			// be sure to reset the index stuff to the non-fast version
+			// if the user ever adds something later!
+			if (smt_ == submetatable_type::named) {
+				// add escape hatch storage pointer and gc names
+				stack::set_field<false, true>(L_, meta_function::storage, light_base_storage, t.stack_index());
+				stack::set_field<false, true>(L_, meta_function::gc_names, storage.gc_names_table, t.stack_index());
+
+				// fancy new_indexing when using the named table
+				{
+					absolute_index named_metatable_index(L_, -storage.named_metatable.push(L_));
+					stack::set_field<false, true>(L_, metatable_key, t, named_metatable_index);
+					storage.named_metatable.pop(L_);
+				}
+				stack_reference stack_metametatable(L_, -storage.named_index_table.push(L_));
+				stack::set_field<false, true>(L_,
+					meta_function::index,
+					make_closure(uts::template meta_index_call<false>, nullptr, light_storage, light_base_storage, nullptr, toplevel_magic),
+					stack_metametatable.stack_index());
+				stack::set_field<false, true>(L_,
+					meta_function::new_index,
+					make_closure(uts::template meta_index_call<true>, nullptr, light_storage, light_base_storage, nullptr, toplevel_magic),
+					stack_metametatable.stack_index());
+				stack_metametatable.pop();
+			}
+			else {
+				// otherwise just plain for index,
+				// and elaborated for new_index
+				stack::set_field<false, true>(L_, meta_function::index, t, t.stack_index());
+				stack::set_field<false, true>(L_,
+					meta_function::new_index,
+					make_closure(uts::template index_call<true>, nullptr, light_storage, light_base_storage, nullptr, toplevel_magic),
+					t.stack_index());
+				storage.is_using_new_index = true;
+			}
+
+			++for_each_backing_metatable_calls;
+			fast_index_table_.reset(L_, t.stack_index());
+			t.pop(L_);
+		};
+
+		storage.for_each_table(L_, for_each_backing_metatable);
+
+		// can only use set AFTER we initialize all the metatables
+		if constexpr (std::is_default_constructible_v<T> && has_flag(enrollment_flags, automagic_flags::default_constructor)) {
+			if (enrollments_.default_constructor) {
+				storage.set(L_, meta_function::construct, constructors<T()>());
+			}
+		}
+
+		// return the named metatable we want names linked into
+		storage.named_metatable.push(L_);
+		return 1;
+	}
+}} // namespace sol::u_detail
+
+// end of sol/usertype_storage.hpp
+
+// beginning of sol/usertype_proxy.hpp
+
+namespace sol {
+	template <typename Table, typename Key>
+	struct usertype_proxy : public proxy_base<usertype_proxy<Table, Key>> {
+	private:
+		using key_type = detail::proxy_key_t<Key>;
+
+		template <typename T, std::size_t... I>
+		decltype(auto) tuple_get(std::index_sequence<I...>) const& {
+			return tbl.template traverse_get<T>(std::get<I>(key)...);
+		}
+
+		template <typename T, std::size_t... I>
+		decltype(auto) tuple_get(std::index_sequence<I...>) && {
+			return tbl.template traverse_get<T>(std::get<I>(std::move(key))...);
+		}
+
+		template <std::size_t... I, typename T>
+		void tuple_set(std::index_sequence<I...>, T&& value) & {
+			if constexpr (sizeof...(I) > 1) {
+				tbl.traverse_set(std::get<I>(key)..., std::forward<T>(value));
+			}
+			else {
+				tbl.set(std::get<I>(key)..., std::forward<T>(value));
+			}
+		}
+
+		template <std::size_t... I, typename T>
+		void tuple_set(std::index_sequence<I...>, T&& value) && {
+			if constexpr (sizeof...(I) > 1) {
+				tbl.traverse_set(std::get<I>(std::move(key))..., std::forward<T>(value));
+			}
+			else {
+				tbl.set(std::get<I>(std::move(key))..., std::forward<T>(value));
+			}
+		}
+
+	public:
+		Table tbl;
+		key_type key;
+
+		template <typename T>
+		usertype_proxy(Table table, T&& k) : tbl(table), key(std::forward<T>(k)) {
+		}
+
+		template <typename T>
+		usertype_proxy& set(T&& item) & {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			tuple_set(idx_seq(), std::forward<T>(item));
+			return *this;
+		}
+
+		template <typename T>
+		usertype_proxy&& set(T&& item) && {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			std::move(*this).tuple_set(idx_seq(), std::forward<T>(item));
+			return std::move(*this);
+		}
+
+		template <typename T>
+		usertype_proxy& operator=(T&& other) & {
+			return set(std::forward<T>(other));
+		}
+
+		template <typename T>
+		usertype_proxy&& operator=(T&& other) && {
+			return std::move(*this).set(std::forward<T>(other));
+		}
+
+		template <typename T>
+		usertype_proxy& operator=(std::initializer_list<T> other) & {
+			return set(std::move(other));
+		}
+
+		template <typename T>
+		usertype_proxy&& operator=(std::initializer_list<T> other) && {
+			return std::move(*this).set(std::move(other));
+		}
+
+		template <typename T>
+		decltype(auto) get() const& {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			return tuple_get<T>(idx_seq());
+		}
+
+		template <typename T>
+		decltype(auto) get() && {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			return std::move(*this).template tuple_get<T>(idx_seq());
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) const& {
+			auto keys = meta::tuplefy(key, std::forward<K>(k));
+			return usertype_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) & {
+			auto keys = meta::tuplefy(key, std::forward<K>(k));
+			return usertype_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) && {
+			auto keys = meta::tuplefy(std::move(key), std::forward<K>(k));
+			return usertype_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) {
+#if !defined(__clang__) && defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 191200000
+			// MSVC is ass sometimes
+			return get<function>().call<Ret...>(std::forward<Args>(args)...);
+#else
+			return get<function>().template call<Ret...>(std::forward<Args>(args)...);
+#endif
+		}
+
+		template <typename... Args>
+		decltype(auto) operator()(Args&&... args) {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		bool valid() const {
+			auto pp = stack::push_pop(tbl);
+			auto p = stack::probe_get_field<std::is_same<meta::unqualified_t<Table>, global_table>::value>(lua_state(), key, lua_gettop(lua_state()));
+			lua_pop(lua_state(), p.levels);
+			return p;
+		}
+
+		int push() const noexcept {
+			return push(this->lua_state());
+		}
+
+		int push(lua_State* L) const noexcept {
+			return get<reference>().push(L);
+		}
+
+		type get_type() const {
+			type t = type::none;
+			auto pp = stack::push_pop(tbl);
+			auto p = stack::probe_get_field<std::is_same<meta::unqualified_t<Table>, global_table>::value>(lua_state(), key, lua_gettop(lua_state()));
+			if (p) {
+				t = type_of(lua_state(), -1);
+			}
+			lua_pop(lua_state(), p.levels);
+			return t;
+		}
+
+		lua_State* lua_state() const {
+			return tbl.lua_state();
+		}
+	};
+} // namespace sol
+
+// end of sol/usertype_proxy.hpp
+
+// beginning of sol/metatable.hpp
+
+// beginning of sol/table_core.hpp
+
+// beginning of sol/table_proxy.hpp
+
+namespace sol {
+
+	template <typename Table, typename Key>
+	struct table_proxy : public proxy_base<table_proxy<Table, Key>> {
+	private:
+		using key_type = detail::proxy_key_t<Key>;
+
+		template <typename T, std::size_t... I>
+		decltype(auto) tuple_get(std::index_sequence<I...>) const& {
+			return tbl.template traverse_get<T>(std::get<I>(key)...);
+		}
+
+		template <typename T, std::size_t... I>
+		decltype(auto) tuple_get(std::index_sequence<I...>) && {
+			return tbl.template traverse_get<T>(std::get<I>(std::move(key))...);
+		}
+
+		template <std::size_t... I, typename T>
+		void tuple_set(std::index_sequence<I...>, T&& value) & {
+			tbl.traverse_set(std::get<I>(key)..., std::forward<T>(value));
+		}
+
+		template <std::size_t... I, typename T>
+		void tuple_set(std::index_sequence<I...>, T&& value) && {
+			tbl.traverse_set(std::get<I>(std::move(key))..., std::forward<T>(value));
+		}
+
+		auto setup_table(std::true_type) {
+			auto p = stack::probe_get_field<std::is_same_v<meta::unqualified_t<Table>, global_table>>(lua_state(), key, tbl.stack_index());
+			lua_pop(lua_state(), p.levels);
+			return p;
+		}
+
+		bool is_valid(std::false_type) {
+			auto pp = stack::push_pop(tbl);
+			auto p = stack::probe_get_field<std::is_same_v<meta::unqualified_t<Table>, global_table>>(lua_state(), key, lua_gettop(lua_state()));
+			lua_pop(lua_state(), p.levels);
+			return p;
+		}
+
+	public:
+		Table tbl;
+		key_type key;
+
+		template <typename T>
+		table_proxy(Table table, T&& k) : tbl(table), key(std::forward<T>(k)) {
+		}
+
+		table_proxy(const table_proxy&) = default;
+		table_proxy(table_proxy&&) = default;
+		table_proxy& operator=(const table_proxy& right) {
+			return set(right);
+		}
+		table_proxy& operator=(table_proxy&& right) {
+			return set(std::move(right));
+		}
+
+		template <typename T>
+		table_proxy& set(T&& item) & {
+			tuple_set(std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>(), std::forward<T>(item));
+			return *this;
+		}
+
+		template <typename T>
+		table_proxy&& set(T&& item) && {
+			std::move(*this).tuple_set(std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>(), std::forward<T>(item));
+			return std::move(*this);
+		}
+
+		template <typename... Args>
+		table_proxy& set_function(Args&&... args) & {
+			tbl.set_function(key, std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename... Args>
+		table_proxy&& set_function(Args&&... args) && {
+			tbl.set_function(std::move(key), std::forward<Args>(args)...);
+			return std::move(*this);
+		}
+
+		template <typename T, std::enable_if_t<!std::is_same_v<meta::unqualified_t<T>, table_proxy>>* = nullptr>
+		table_proxy& operator=(T&& other) & {
+			using Tu = meta::unwrap_unqualified_t<T>;
+			if constexpr (!is_lua_reference_or_proxy_v<Tu> && meta::is_invocable_v<Tu>) {
+				return set_function(std::forward<T>(other));
+			}
+			else {
+				return set(std::forward<T>(other));
+			}
+		}
+
+		template <typename T, std::enable_if_t<!std::is_same_v<meta::unqualified_t<T>, table_proxy>>* = nullptr>
+		table_proxy&& operator=(T&& other) && {
+			using Tu = meta::unwrap_unqualified_t<T>;
+			if constexpr (!is_lua_reference_or_proxy_v<Tu> && meta::is_invocable_v<Tu> && !detail::is_msvc_callable_rigged_v<T>) {
+				return std::move(*this).set_function(std::forward<T>(other));
+			}
+			else {
+				return std::move(*this).set(std::forward<T>(other));
+			}
+		}
+
+		template <typename T>
+		table_proxy& operator=(std::initializer_list<T> other) & {
+			return set(std::move(other));
+		}
+
+		template <typename T>
+		table_proxy&& operator=(std::initializer_list<T> other) && {
+			return std::move(*this).set(std::move(other));
+		}
+
+		template <typename T>
+		bool is() const {
+			typedef decltype(get<T>()) U;
+			optional<U> option = this->get<optional<U>>();
+			return option.has_value();
+		}
+
+		template <typename T>
+		decltype(auto) get() const& {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			return tuple_get<T>(idx_seq());
+		}
+
+		template <typename T>
+		decltype(auto) get() && {
+			using idx_seq = std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>;
+			return std::move(*this).template tuple_get<T>(idx_seq());
+		}
+
+		template <typename T>
+		decltype(auto) get_or(T&& otherwise) const {
+			typedef decltype(get<T>()) U;
+			optional<U> option = get<optional<U>>();
+			if (option) {
+				return static_cast<U>(option.value());
+			}
+			return static_cast<U>(std::forward<T>(otherwise));
+		}
+
+		template <typename T, typename D>
+		decltype(auto) get_or(D&& otherwise) const {
+			optional<T> option = get<optional<T>>();
+			if (option) {
+				return static_cast<T>(option.value());
+			}
+			return static_cast<T>(std::forward<D>(otherwise));
+		}
+
+		template <typename T>
+		decltype(auto) get_or_create() {
+			return get_or_create<T>(new_table());
+		}
+
+		template <typename T, typename Otherwise>
+		decltype(auto) get_or_create(Otherwise&& other) {
+			if (!this->valid()) {
+				this->set(std::forward<Otherwise>(other));
+			}
+			return get<T>();
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) const& {
+			auto keys = meta::tuplefy(key, std::forward<K>(k));
+			return table_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) & {
+			auto keys = meta::tuplefy(key, std::forward<K>(k));
+			return table_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename K>
+		decltype(auto) operator[](K&& k) && {
+			auto keys = meta::tuplefy(std::move(key), std::forward<K>(k));
+			return table_proxy<Table, decltype(keys)>(tbl, std::move(keys));
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) {
+			lua_State* L = this->lua_state();
+			push(L);
+			int idx = lua_gettop(L);
+			stack_aligned_function func(L, idx);
+			return func.call<Ret...>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Args>
+		decltype(auto) operator()(Args&&... args) {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		bool valid() const {
+			auto pp = stack::push_pop(tbl);
+			auto p = stack::probe_get_field<std::is_same<meta::unqualified_t<Table>, global_table>::value>(lua_state(), key, lua_gettop(lua_state()));
+			lua_pop(lua_state(), p.levels);
+			return p;
+		}
+
+		int push() const noexcept {
+			return push(this->lua_state());
+		}
+
+		int push(lua_State* L) const noexcept {
+			if constexpr (std::is_same_v<meta::unqualified_t<Table>, global_table> || is_stack_table_v<meta::unqualified_t<Table>>) {
+				auto pp = stack::push_pop<true>(tbl);
+				int tableindex = pp.index_of(tbl);
+				int top_index = lua_gettop(L);
+				stack::get_field<true>(lua_state(), key, tableindex);
+				lua_replace(L, top_index + 1);
+				lua_settop(L, top_index + 1);
+			}
+			else {
+				auto pp = stack::push_pop<false>(tbl);
+				int tableindex = pp.index_of(tbl);
+				int aftertableindex = lua_gettop(L);
+				stack::get_field<false>(lua_state(), key, tableindex);
+				lua_replace(L, tableindex);
+				lua_settop(L, aftertableindex + 1);
+			}
+			return 1;
+		}
+
+		type get_type() const {
+			type t = type::none;
+			auto pp = stack::push_pop(tbl);
+			auto p = stack::probe_get_field<std::is_same<meta::unqualified_t<Table>, global_table>::value>(lua_state(), key, lua_gettop(lua_state()));
+			if (p) {
+				t = type_of(lua_state(), -1);
+			}
+			lua_pop(lua_state(), p.levels);
+			return t;
+		}
+
+		lua_State* lua_state() const {
+			return tbl.lua_state();
+		}
+
+		table_proxy& force() {
+			if (!this->valid()) {
+				this->set(new_table());
+			}
+			return *this;
+		}
+	};
+
+	template <typename Table, typename Key, typename T>
+	inline bool operator==(T&& left, const table_proxy<Table, Key>& right) {
+		using G = decltype(stack::get<T>(nullptr, 0));
+		return right.template get<optional<G>>() == left;
+	}
+
+	template <typename Table, typename Key, typename T>
+	inline bool operator==(const table_proxy<Table, Key>& right, T&& left) {
+		using G = decltype(stack::get<T>(nullptr, 0));
+		return right.template get<optional<G>>() == left;
+	}
+
+	template <typename Table, typename Key, typename T>
+	inline bool operator!=(T&& left, const table_proxy<Table, Key>& right) {
+		using G = decltype(stack::get<T>(nullptr, 0));
+		return right.template get<optional<G>>() != left;
+	}
+
+	template <typename Table, typename Key, typename T>
+	inline bool operator!=(const table_proxy<Table, Key>& right, T&& left) {
+		using G = decltype(stack::get<T>(nullptr, 0));
+		return right.template get<optional<G>>() != left;
+	}
+
+	template <typename Table, typename Key>
+	inline bool operator==(lua_nil_t, const table_proxy<Table, Key>& right) {
+		return !right.valid();
+	}
+
+	template <typename Table, typename Key>
+	inline bool operator==(const table_proxy<Table, Key>& right, lua_nil_t) {
+		return !right.valid();
+	}
+
+	template <typename Table, typename Key>
+	inline bool operator!=(lua_nil_t, const table_proxy<Table, Key>& right) {
+		return right.valid();
+	}
+
+	template <typename Table, typename Key>
+	inline bool operator!=(const table_proxy<Table, Key>& right, lua_nil_t) {
+		return right.valid();
+	}
+
+	template <bool b>
+	template <typename Super>
+	basic_reference<b>& basic_reference<b>::operator=(proxy_base<Super>&& r) {
+		basic_reference<b> v = r;
+		this->operator=(std::move(v));
+		return *this;
+	}
+
+	template <bool b>
+	template <typename Super>
+	basic_reference<b>& basic_reference<b>::operator=(const proxy_base<Super>& r) {
+		basic_reference<b> v = r;
+		this->operator=(std::move(v));
+		return *this;
+	}
+
+	namespace stack {
+		template <typename Table, typename Key>
+		struct unqualified_pusher<table_proxy<Table, Key>> {
+			static int push(lua_State* L, const table_proxy<Table, Key>& p) {
+				return p.push(L);
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/table_proxy.hpp
+
+// beginning of sol/table_iterator.hpp
+
+#include <iterator>
+
+namespace sol {
+
+	template <typename reference_type>
+	class basic_table_iterator {
+	public:
+		typedef object key_type;
+		typedef object mapped_type;
+		typedef std::pair<object, object> value_type;
+		typedef std::input_iterator_tag iterator_category;
+		typedef std::ptrdiff_t difference_type;
+		typedef value_type* pointer;
+		typedef value_type& reference;
+		typedef const value_type& const_reference;
+
+	private:
+		std::pair<object, object> kvp;
+		reference_type ref;
+		int tableidx = 0;
+		int keyidx = 0;
+		std::ptrdiff_t idx = 0;
+
+	public:
+		basic_table_iterator() noexcept : keyidx(-1), idx(-1) {
+		}
+
+		basic_table_iterator(reference_type x) noexcept : ref(std::move(x)) {
+			ref.push();
+			tableidx = lua_gettop(ref.lua_state());
+			stack::push(ref.lua_state(), lua_nil);
+			this->operator++();
+			if (idx == -1) {
+				return;
+			}
+			--idx;
+		}
+
+		basic_table_iterator& operator++() noexcept {
+			if (idx == -1)
+				return *this;
+
+			if (lua_next(ref.lua_state(), tableidx) == 0) {
+				idx = -1;
+				keyidx = -1;
+				return *this;
+			}
+			++idx;
+			kvp.first = object(ref.lua_state(), -2);
+			kvp.second = object(ref.lua_state(), -1);
+			lua_pop(ref.lua_state(), 1);
+			// leave key on the stack
+			keyidx = lua_gettop(ref.lua_state());
+			return *this;
+		}
+
+		basic_table_iterator operator++(int) noexcept {
+			auto saved = *this;
+			this->operator++();
+			return saved;
+		}
+
+		reference operator*() const noexcept {
+			return const_cast<reference>(kvp);
+		}
+
+		bool operator==(const basic_table_iterator& right) const noexcept {
+			return idx == right.idx;
+		}
+
+		bool operator!=(const basic_table_iterator& right) const noexcept {
+			return idx != right.idx;
+		}
+
+		~basic_table_iterator() {
+			if (keyidx != -1) {
+				stack::remove(ref.lua_state(), keyidx, 1);
+			}
+			if (ref.lua_state() != nullptr && ref.valid()) {
+				stack::remove(ref.lua_state(), tableidx, 1);
+			}
+		}
+	};
+
+} // namespace sol
+
+// end of sol/table_iterator.hpp
+
+// beginning of sol/pairs_iterator.hpp
+
+// beginning of sol/stack/detail/pairs.hpp
+
+#include <optional>
+
+namespace sol { namespace stack { namespace stack_detail {
+
+	inline bool maybe_push_lua_next_function(lua_State* L_) {
+		stack::get_field<true, false>(L_, "next");
+		bool is_next = stack::check<protected_function>(L_);
+		if (is_next) {
+			return true;
+		}
+		stack::get_field<true, false>(L_, "table");
+		stack::record tracking{};
+		if (!stack::loose_table_check(L_, -1, &no_panic, tracking)) {
+			return false;
+		}
+		lua_getfield(L_, -1, "next");
+		bool is_table_next_func = stack::check<protected_function>(L_, -1);
+		if (is_table_next_func) {
+			return true;
+		}
+		lua_pop(L_, 1);
+		return false;
+	}
+
+	inline std::optional<protected_function> find_lua_next_function(lua_State* L_) {
+		if (maybe_push_lua_next_function(L_)) {
+			return stack::pop<protected_function>(L_);
+		}
+		return std::nullopt;
+	}
+
+	inline int c_lua_next(lua_State* L_) noexcept {
+		stack_reference table_stack_ref(L_, raw_index(1));
+		stateless_stack_reference key_stack_ref(L_, raw_index(2));
+		int result = lua_next(table_stack_ref.lua_state(), table_stack_ref.stack_index());
+		if (result == 0) {
+			stack::push(L_, lua_nil);
+			return 1;
+		}
+		return 2;
+	}
+
+	inline int readonly_pairs(lua_State* L_) noexcept {
+		int pushed = 0;
+		if (!maybe_push_lua_next_function(L_)) {
+			// we do not have the "next" function in the global namespace
+			// from the "table" global entiry, use our own
+			pushed += stack::push(L_, &c_lua_next);
+		}
+		else {
+			pushed += 1;
+		}
+		int metatable_exists = lua_getmetatable(L_, 1);
+		SOL_ASSERT(metatable_exists == 1);
+		const auto& index_key = to_string(sol::meta_function::index);
+		lua_getfield(L_, lua_gettop(L_), index_key.c_str());
+		lua_remove(L_, -2);
+		pushed += 1;
+		pushed += stack::push(L_, lua_nil);
+		return pushed;
+	}
+
+}}} // sol::stack::stack_detail
+
+// end of sol/stack/detail/pairs.hpp
+
+namespace sol {
+
+	struct pairs_sentinel { };
+
+	class pairs_iterator {
+	private:
+		inline static constexpr int empty_key_index = -1;
+
+	public:
+		using key_type = object;
+		using mapped_type = object;
+		using value_type = std::pair<object, object>;
+		using iterator_category = std::input_iterator_tag;
+		using difference_type = std::ptrdiff_t;
+		using pointer = value_type*;
+		using const_pointer = value_type const*;
+		using reference = value_type&;
+		using const_reference = const value_type&;
+
+		pairs_iterator() noexcept
+		: m_L(nullptr)
+		, m_next_function_ref(lua_nil)
+		, m_table_ref(lua_nil)
+		, m_cached_key_value_pair({ lua_nil, lua_nil })
+		, m_key_index(empty_key_index)
+		, m_iteration_index(0) {
+		}
+
+		pairs_iterator(const pairs_iterator&) = delete;
+		pairs_iterator& operator=(const pairs_iterator&) = delete;
+
+		pairs_iterator(pairs_iterator&& right) noexcept
+		: m_L(right.m_L)
+		, m_next_function_ref(std::move(right.m_next_function_ref))
+		, m_table_ref(std::move(right.m_table_ref))
+		, m_cached_key_value_pair(std::move(right.m_cached_key_value_pair))
+		, m_key_index(right.m_key_index)
+		, m_iteration_index(right.m_iteration_index) {
+			right.m_key_index = empty_key_index;
+		}
+
+		pairs_iterator& operator=(pairs_iterator&& right) noexcept {
+			m_L = right.m_L;
+			m_next_function_ref = std::move(right.m_next_function_ref);
+			m_table_ref = std::move(right.m_table_ref);
+			m_cached_key_value_pair = std::move(right.m_cached_key_value_pair);
+			m_key_index = right.m_key_index;
+			m_iteration_index = right.m_iteration_index;
+			right.m_key_index = empty_key_index;
+			return *this;
+		}
+
+		template <typename Source>
+		pairs_iterator(const Source& source_) noexcept : m_L(source_.lua_state()), m_key_index(empty_key_index), m_iteration_index(0) {
+			if (m_L == nullptr || !source_.valid()) {
+				m_key_index = empty_key_index;
+				return;
+			}
+			int source_index = -source_.push(m_L);
+			int abs_source_index = lua_absindex(m_L, source_index);
+			int metatable_exists = lua_getmetatable(m_L, abs_source_index);
+			lua_remove(m_L, abs_source_index);
+			if (metatable_exists == 1) {
+				// just has a metatable, but does it have __pairs ?
+				stack_reference metatable(m_L, raw_index(abs_source_index));
+				stack::get_field<is_global_table_v<Source>, true>(m_L, meta_function::pairs, metatable.stack_index());
+				optional<protected_function> maybe_pairs_function = stack::pop<optional<protected_function>>(m_L);
+				if (maybe_pairs_function.has_value()) {
+					protected_function& pairs_function = *maybe_pairs_function;
+					protected_function_result next_fn_and_table_and_first_key = pairs_function(source_);
+					if (next_fn_and_table_and_first_key.valid()) {
+						m_next_function_ref = next_fn_and_table_and_first_key.get<protected_function>(0);
+						m_table_ref = next_fn_and_table_and_first_key.get<sol::reference>(1);
+						m_key_index = next_fn_and_table_and_first_key.stack_index() - 1;
+						// remove next function and table
+						lua_remove(m_L, m_key_index);
+						lua_remove(m_L, m_key_index);
+						next_fn_and_table_and_first_key.abandon();
+						lua_remove(m_L, abs_source_index);
+						this->operator++();
+						m_iteration_index = 0;
+						return;
+					}
+				}
+			}
+
+			{
+				auto maybe_next = stack::stack_detail::find_lua_next_function(m_L);
+				if (maybe_next.has_value()) {
+					m_next_function_ref = std::move(*maybe_next);
+					m_table_ref = source_;
+
+					stack::push(m_L, lua_nil);
+					m_key_index = lua_gettop(m_L);
+					this->operator++();
+					m_iteration_index = 0;
+					return;
+				}
+			}
+
+			// okay, so none of the above worked and now we need to create
+			// a shim / polyfill instead
+			stack::push(m_L, &stack::stack_detail::c_lua_next);
+			m_next_function_ref = stack::pop<protected_function>(m_L);
+			m_table_ref = source_;
+			stack::push(m_L, lua_nil);
+			m_key_index = lua_gettop(m_L);
+			this->operator++();
+			m_iteration_index = 0;
+		}
+
+		pairs_iterator& operator++() {
+			if (m_key_index == empty_key_index) {
+				return *this;
+			}
+			{
+				sol::protected_function_result next_results = m_next_function_ref(m_table_ref, stack_reference(m_L, m_key_index));
+				if (!next_results.valid()) {
+					// TODO: abort, or throw an error?
+					m_clear();
+					m_key_index = empty_key_index;
+					return *this;
+				}
+				int next_results_count = next_results.return_count();
+				if (next_results_count < 2) {
+					// iteration is over!
+					next_results.abandon();
+					lua_settop(m_L, m_key_index - 1);
+					m_key_index = empty_key_index;
+					++m_iteration_index;
+					return *this;
+				}
+				else {
+					lua_remove(m_L, m_key_index);
+					m_key_index = next_results.stack_index() - 1;
+					m_cached_key_value_pair.first = stack::get<object>(m_L, m_key_index);
+					m_cached_key_value_pair.second = stack::get<object>(m_L, m_key_index + 1);
+					lua_settop(m_L, m_key_index);
+					next_results.abandon();
+				}
+			}
+			++m_iteration_index;
+			return *this;
+		}
+
+		std::ptrdiff_t index() const {
+			return static_cast<std::ptrdiff_t>(m_iteration_index);
+		}
+
+		const_reference operator*() const noexcept {
+			return m_cached_key_value_pair;
+		}
+
+		reference operator*() noexcept {
+			return m_cached_key_value_pair;
+		}
+
+		friend bool operator==(const pairs_iterator& left, const pairs_iterator& right) noexcept {
+			return left.m_table_ref == right.m_table_ref && left.m_iteration_index == right.m_iteration_index;
+		}
+
+		friend bool operator!=(const pairs_iterator& left, const pairs_iterator& right) noexcept {
+			return left.m_table_ref != right.m_table_ref || left.m_iteration_index != right.m_iteration_index;
+		}
+
+		friend bool operator==(const pairs_iterator& left, const pairs_sentinel&) noexcept {
+			return left.m_key_index == empty_key_index;
+		}
+
+		friend bool operator!=(const pairs_iterator& left, const pairs_sentinel&) noexcept {
+			return left.m_key_index != empty_key_index;
+		}
+
+		friend bool operator==(const pairs_sentinel&, const pairs_iterator& left) noexcept {
+			return left.m_key_index == empty_key_index;
+		}
+
+		friend bool operator!=(const pairs_sentinel&, const pairs_iterator& left) noexcept {
+			return left.m_key_index != empty_key_index;
+		}
+
+		~pairs_iterator() {
+			if (m_key_index != empty_key_index) {
+				m_clear();
+			}
+		}
+
+	private:
+		void m_clear() noexcept {
+			lua_remove(m_L, m_key_index);
+		}
+
+		lua_State* m_L;
+		protected_function m_next_function_ref;
+		sol::reference m_table_ref;
+		std::pair<object, object> m_cached_key_value_pair;
+		int m_key_index;
+		int m_iteration_index;
+	};
+
+	template <typename Source>
+	class basic_pairs_range {
+	private:
+		using source_t = std::add_lvalue_reference_t<Source>;
+		source_t m_source;
+
+	public:
+		using iterator = pairs_iterator;
+		using const_iterator = pairs_iterator;
+
+		basic_pairs_range(source_t source_) noexcept : m_source(source_) {
+		}
+
+		iterator begin() noexcept {
+			return iterator(m_source);
+		}
+
+		iterator begin() const noexcept {
+			return iterator(m_source);
+		}
+
+		const_iterator cbegin() const noexcept {
+			return const_iterator(m_source);
+		}
+
+		pairs_sentinel end() noexcept {
+			return {};
+		}
+
+		pairs_sentinel end() const noexcept {
+			return {};
+		}
+
+		pairs_sentinel cend() const noexcept {
+			return {};
+		}
+	};
+} // namespace sol
+
+// end of sol/pairs_iterator.hpp
+
+namespace sol {
+	namespace detail {
+		template <std::size_t n>
+		struct clean {
+			lua_State* L;
+			clean(lua_State* luastate) : L(luastate) {
+			}
+			~clean() {
+				lua_pop(L, static_cast<int>(n));
+			}
+		};
+
+		struct ref_clean {
+			lua_State* L;
+			int& pop_count;
+
+			ref_clean(lua_State* L_, int& pop_count_) noexcept : L(L_), pop_count(pop_count_) {
+			}
+			~ref_clean() {
+				lua_pop(L, static_cast<int>(pop_count));
+			}
+		};
+
+		inline int fail_on_newindex(lua_State* L_) {
+			return luaL_error(L_, "sol: cannot modify the elements of an enumeration table");
+		}
+
+	} // namespace detail
+
+	template <bool top_level, typename ref_t>
+	class basic_table_core : public basic_object<ref_t> {
+	private:
+		using base_t = basic_object<ref_t>;
+
+		friend class state;
+		friend class state_view;
+		template <typename, typename>
+		friend class basic_usertype;
+		template <typename>
+		friend class basic_metatable;
+
+		template <typename T>
+		using is_get_direct_tableless = meta::boolean<stack::stack_detail::is_get_direct_tableless_v<T, top_level, false>>;
+
+		template <typename T>
+		using is_raw_get_direct_tableless = std::false_type;
+
+		template <typename T>
+		using is_set_direct_tableless = meta::boolean<stack::stack_detail::is_set_direct_tableless_v<T, top_level, false>>;
+
+		template <typename T>
+		using is_raw_set_direct_tableless = std::false_type;
+
+		template <bool raw, typename... Ret, typename... Keys>
+		decltype(auto) tuple_get(int table_index, Keys&&... keys) const {
+			if constexpr (sizeof...(Ret) < 2) {
+				return traverse_get_single_maybe_tuple<raw, Ret...>(table_index, std::forward<Keys>(keys)...);
+			}
+			else {
+				using multi_ret = decltype(stack::pop<std::tuple<Ret...>>(nullptr));
+				return multi_ret(traverse_get_single_maybe_tuple<raw, Ret>(table_index, std::forward<Keys>(keys))...);
+			}
+		}
+
+		template <bool raw, typename Ret, size_t... I, typename Key>
+		decltype(auto) traverse_get_single_tuple(int table_index, std::index_sequence<I...>, Key&& key) const {
+			return traverse_get_single<raw, Ret>(table_index, std::get<I>(std::forward<Key>(key))...);
+		}
+
+		template <bool raw, typename Ret, typename Key>
+		decltype(auto) traverse_get_single_maybe_tuple(int table_index, Key&& key) const {
+			if constexpr (meta::is_tuple_v<meta::unqualified_t<Key>>) {
+				return traverse_get_single_tuple<raw, Ret>(
+				     table_index, std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<Key>>>(), std::forward<Key>(key));
+			}
+			else {
+				return traverse_get_single<raw, Ret>(table_index, std::forward<Key>(key));
+			}
+		}
+
+		template <bool raw, typename Ret, typename... Keys>
+		decltype(auto) traverse_get_single(int table_index, Keys&&... keys) const {
+			constexpr static bool global = (meta::count_for_to_pack_v < 1, is_get_direct_tableless, meta::unqualified_t<Keys>... >> 0);
+			if constexpr (meta::is_optional_v<meta::unqualified_t<Ret>>) {
+				int popcount = 0;
+				detail::ref_clean c(base_t::lua_state(), popcount);
+				return traverse_get_deep_optional<global, raw, detail::insert_mode::none, Ret>(popcount, table_index, std::forward<Keys>(keys)...);
+			}
+			else {
+				detail::clean<sizeof...(Keys) - meta::count_for_pack_v<detail::is_insert_mode, meta::unqualified_t<Keys>...>> c(base_t::lua_state());
+				return traverse_get_deep<global, raw, detail::insert_mode::none, Ret>(table_index, std::forward<Keys>(keys)...);
+			}
+		}
+
+		template <bool raw, typename Pairs, std::size_t... I>
+		void tuple_set(std::index_sequence<I...>, Pairs&& pairs) {
+			constexpr static bool global = (meta::count_even_for_pack_v < is_set_direct_tableless,
+			     meta::unqualified_t<decltype(std::get<I * 2>(std::forward<Pairs>(pairs)))>... >> 0);
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			lua_State* L = base_t::lua_state();
+			(void)table_index;
+			(void)L;
+			void(detail::swallow { (stack::set_field<(top_level), raw>(
+			                             L, std::get<I * 2>(std::forward<Pairs>(pairs)), std::get<I * 2 + 1>(std::forward<Pairs>(pairs)), table_index),
+			     0)... });
+		}
+
+		template <bool global, bool raw, detail::insert_mode mode, typename T, typename Key, typename... Keys>
+		decltype(auto) traverse_get_deep(int table_index, Key&& key, Keys&&... keys) const {
+			if constexpr (std::is_same_v<meta::unqualified_t<Key>, create_if_nil_t>) {
+				(void)key;
+				return traverse_get_deep<false, raw, static_cast<detail::insert_mode>(mode | detail::insert_mode::create_if_nil), T>(
+				     table_index, std::forward<Keys>(keys)...);
+			}
+			else {
+				lua_State* L = base_t::lua_state();
+				stack::get_field<global, raw>(L, std::forward<Key>(key), table_index);
+				if constexpr (sizeof...(Keys) > 0) {
+					if constexpr ((mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
+						type t = type_of(L, -1);
+						if (t == type::lua_nil || t == type::none) {
+							lua_pop(L, 1);
+							stack::push(L, new_table(0, 0));
+						}
+					}
+					return traverse_get_deep<false, raw, mode, T>(lua_gettop(L), std::forward<Keys>(keys)...);
+				}
+				else {
+					if constexpr ((mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
+						type t = type_of(L, -1);
+						if ((t == type::lua_nil || t == type::none) && (is_table_like_v<T>)) {
+							lua_pop(L, 1);
+							stack::push(L, new_table(0, 0));
+						}
+					}
+					return stack::get<T>(L);
+				}
+			}
+		}
+
+		template <bool global, bool raw, detail::insert_mode mode, typename T, typename Key, typename... Keys>
+		decltype(auto) traverse_get_deep_optional(int& popcount, int table_index, Key&& key, Keys&&... keys) const {
+			if constexpr (std::is_same_v<meta::unqualified_t<Key>, create_if_nil_t>) {
+				constexpr detail::insert_mode new_mode = static_cast<detail::insert_mode>(mode | detail::insert_mode::create_if_nil);
+				(void)key;
+				return traverse_get_deep_optional<global, raw, new_mode, T>(popcount, table_index, std::forward<Keys>(keys)...);
+			}
+			else if constexpr (std::is_same_v<meta::unqualified_t<Key>, update_if_empty_t>) {
+				constexpr detail::insert_mode new_mode = static_cast<detail::insert_mode>(mode | detail::insert_mode::update_if_empty);
+				(void)key;
+				return traverse_get_deep_optional<global, raw, new_mode, T>(popcount, table_index, std::forward<Keys>(keys)...);
+			}
+			else if constexpr (std::is_same_v<meta::unqualified_t<Key>, override_value_t>) {
+				constexpr detail::insert_mode new_mode = static_cast<detail::insert_mode>(mode | detail::insert_mode::override_value);
+				(void)key;
+				return traverse_get_deep_optional<global, raw, new_mode, T>(popcount, table_index, std::forward<Keys>(keys)...);
+			}
+			else {
+				if constexpr (sizeof...(Keys) > 0) {
+					lua_State* L = base_t::lua_state();
+					auto p = stack::probe_get_field<global, raw>(L, std::forward<Key>(key), table_index);
+					popcount += p.levels;
+					if (!p.success) {
+						if constexpr ((mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
+							lua_pop(L, 1);
+							constexpr bool is_seq = meta::count_for_to_pack_v < 1, std::is_integral, Keys... >> 0;
+							stack::push(L, new_table(static_cast<int>(is_seq), static_cast<int>(!is_seq)));
+							stack::set_field<global, raw>(L, std::forward<Key>(key), stack_reference(L, -1), table_index);
+						}
+						else {
+							return T(nullopt);
+						}
+					}
+					return traverse_get_deep_optional<false, raw, mode, T>(popcount, lua_gettop(L), std::forward<Keys>(keys)...);
+				}
+				else {
+					using R = decltype(stack::get<T>(nullptr));
+					using value_type = typename meta::unqualified_t<R>::value_type;
+					lua_State* L = base_t::lua_state();
+					auto p = stack::probe_get_field<global, raw, value_type>(L, key, table_index);
+					popcount += p.levels;
+					if (!p.success) {
+						if constexpr ((mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
+							lua_pop(L, 1);
+							stack::push(L, new_table(0, 0));
+							stack::set_field<global, raw>(L, std::forward<Key>(key), stack_reference(L, -1), table_index);
+							if (stack::check<value_type>(L, lua_gettop(L), &no_panic)) {
+								return stack::get<T>(L);
+							}
+						}
+						return R(nullopt);
+					}
+					return stack::get<T>(L);
+				}
+			}
+		}
+
+		template <bool global, bool raw, detail::insert_mode mode, typename Key, typename... Keys>
+		void traverse_set_deep(int table_index, Key&& key, Keys&&... keys) const {
+			using KeyU = meta::unqualified_t<Key>;
+			if constexpr (std::is_same_v<KeyU, update_if_empty_t>) {
+				(void)key;
+				traverse_set_deep<global, raw, static_cast<detail::insert_mode>(mode | detail::insert_mode::update_if_empty)>(
+				     table_index, std::forward<Keys>(keys)...);
+			}
+			else if constexpr (std::is_same_v<KeyU, create_if_nil_t>) {
+				(void)key;
+				traverse_set_deep<global, raw, static_cast<detail::insert_mode>(mode | detail::insert_mode::create_if_nil)>(
+				     table_index, std::forward<Keys>(keys)...);
+			}
+			else if constexpr (std::is_same_v<KeyU, override_value_t>) {
+				(void)key;
+				traverse_set_deep<global, raw, static_cast<detail::insert_mode>(mode | detail::insert_mode::override_value)>(
+				     table_index, std::forward<Keys>(keys)...);
+			}
+			else {
+				lua_State* L = base_t::lua_state();
+				if constexpr (sizeof...(Keys) == 1) {
+					if constexpr ((mode & detail::insert_mode::update_if_empty) == detail::insert_mode::update_if_empty) {
+						auto p = stack::probe_get_field<global, raw>(L, key, table_index);
+						lua_pop(L, p.levels);
+						if (!p.success) {
+							stack::set_field<global, raw>(L, std::forward<Key>(key), std::forward<Keys>(keys)..., table_index);
+						}
+					}
+					else {
+						stack::set_field<global, raw>(L, std::forward<Key>(key), std::forward<Keys>(keys)..., table_index);
+					}
+				}
+				else {
+					if constexpr (mode != detail::insert_mode::none) {
+						stack::get_field<global, raw>(L, key, table_index);
+						type vt = type_of(L, -1);
+						if constexpr ((mode & detail::insert_mode::update_if_empty) == detail::insert_mode::update_if_empty
+						     || (mode & detail::insert_mode::create_if_nil) == detail::insert_mode::create_if_nil) {
+							if (vt == type::lua_nil || vt == type::none) {
+								constexpr bool is_seq = meta::count_for_to_pack_v < 1, std::is_integral, Keys... >> 0;
+								lua_pop(L, 1);
+								stack::push(L, new_table(static_cast<int>(is_seq), static_cast<int>(!is_seq)));
+								stack::set_field<global, raw>(L, std::forward<Key>(key), stack_reference(L, -1), table_index);
+							}
+						}
+						else {
+							if (vt != type::table) {
+								constexpr bool is_seq = meta::count_for_to_pack_v < 1, std::is_integral, Keys... >> 0;
+								lua_pop(L, 1);
+								stack::push(L, new_table(static_cast<int>(is_seq), static_cast<int>(!is_seq)));
+								stack::set_field<global, raw>(L, std::forward<Key>(key), stack_reference(L, -1), table_index);
+							}
+						}
+					}
+					else {
+						stack::get_field<global, raw>(L, std::forward<Key>(key), table_index);
+					}
+					traverse_set_deep<false, raw, mode>(lua_gettop(L), std::forward<Keys>(keys)...);
+				}
+			}
+		}
+
+	protected:
+		basic_table_core(detail::no_safety_tag, lua_nil_t n) : base_t(n) {
+		}
+		basic_table_core(detail::no_safety_tag, lua_State* L, int index) : base_t(L, index) {
+		}
+		basic_table_core(detail::no_safety_tag, lua_State* L, ref_index index) : base_t(L, index) {
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_table_core>>, meta::neg<std::is_same<ref_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_table_core(detail::no_safety_tag, T&& r) noexcept : base_t(std::forward<T>(r)) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_table_core(detail::no_safety_tag, lua_State* L, T&& r) noexcept : base_t(L, std::forward<T>(r)) {
+		}
+
+	public:
+		using iterator = basic_table_iterator<ref_t>;
+		using const_iterator = iterator;
+
+		using base_t::lua_state;
+
+		basic_table_core() noexcept = default;
+		basic_table_core(const basic_table_core&) = default;
+		basic_table_core(basic_table_core&&) = default;
+		basic_table_core& operator=(const basic_table_core&) = default;
+		basic_table_core& operator=(basic_table_core&&) = default;
+
+		basic_table_core(const stack_reference& r) : basic_table_core(r.lua_state(), r.stack_index()) {
+		}
+
+		basic_table_core(stack_reference&& r) : basic_table_core(r.lua_state(), r.stack_index()) {
+		}
+
+		template <typename T, meta::enable_any<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_table_core(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			int table_index = pp.index_of(*this);
+			constructor_handler handler {};
+			stack::check<basic_table_core>(lua_state(), table_index, handler);
+#endif // Safety
+		}
+
+		basic_table_core(lua_State* L, const new_table& nt) : base_t(L, -stack::push(L, nt)) {
+			if (!is_stack_based<meta::unqualified_t<ref_t>>::value) {
+				lua_pop(L, 1);
+			}
+		}
+
+		basic_table_core(lua_State* L, int index = -1) : basic_table_core(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_table_core>(L, index, handler);
+#endif // Safety
+		}
+
+		basic_table_core(lua_State* L, ref_index index) : basic_table_core(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			int table_index = pp.index_of(*this);
+			constructor_handler handler {};
+			stack::check<basic_table_core>(lua_state(), table_index, handler);
+#endif // Safety
+		}
+
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_table_core>>, meta::neg<std::is_same<ref_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_table_core(T&& r) noexcept : basic_table_core(detail::no_safety, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			if (!is_table<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				int table_index = pp.index_of(*this);
+				constructor_handler handler {};
+				stack::check<basic_table_core>(lua_state(), table_index, handler);
+			}
+#endif // Safety
+		}
+
+		basic_table_core(lua_nil_t r) noexcept : basic_table_core(detail::no_safety, r) {
+		}
+
+		basic_table_core(lua_State* L, global_tag_t t) noexcept : base_t(L, t) {
+		}
+
+		iterator begin() const {
+			if (this->get_type() == type::table) {
+				return iterator(*this);
+			}
+			return iterator();
+		}
+
+		iterator end() const {
+			return iterator();
+		}
+
+		const_iterator cbegin() const {
+			return begin();
+		}
+
+		const_iterator cend() const {
+			return end();
+		}
+
+		basic_pairs_range<basic_table_core> pairs() noexcept {
+			return basic_pairs_range<basic_table_core>(*this);
+		}
+
+		basic_pairs_range<const basic_table_core> pairs() const noexcept {
+			return basic_pairs_range<const basic_table_core>(*this);
+		}
+
+		void clear() {
+			auto pp = stack::push_pop<false>(*this);
+			int table_index = pp.index_of(*this);
+			stack::clear(lua_state(), table_index);
+		}
+
+		template <typename... Ret, typename... Keys>
+		decltype(auto) get(Keys&&... keys) const {
+			static_assert(sizeof...(Keys) == sizeof...(Ret), "number of keys and number of return types do not match");
+			constexpr static bool global = meta::all<meta::boolean<top_level>, is_get_direct_tableless<meta::unqualified_t<Keys>>...>::value;
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			return tuple_get<false, Ret...>(table_index, std::forward<Keys>(keys)...);
+		}
+
+		template <typename T, typename Key>
+		decltype(auto) get_or(Key&& key, T&& otherwise) const {
+			typedef decltype(get<T>("")) U;
+			optional<U> option = get<optional<U>>(std::forward<Key>(key));
+			if (option) {
+				return static_cast<U>(option.value());
+			}
+			return static_cast<U>(std::forward<T>(otherwise));
+		}
+
+		template <typename T, typename Key, typename D>
+		decltype(auto) get_or(Key&& key, D&& otherwise) const {
+			optional<T> option = get<optional<T>>(std::forward<Key>(key));
+			if (option) {
+				return static_cast<T>(option.value());
+			}
+			return static_cast<T>(std::forward<D>(otherwise));
+		}
+
+		template <typename T, typename... Keys>
+		decltype(auto) traverse_get(Keys&&... keys) const {
+			static_assert(sizeof...(Keys) > 0, "must pass at least 1 key to get");
+			constexpr static bool global = (meta::count_for_to_pack_v < 1, is_get_direct_tableless, meta::unqualified_t<Keys>... >> 0);
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			return traverse_get_single<false, T>(table_index, std::forward<Keys>(keys)...);
+		}
+
+		template <typename... Keys>
+		basic_table_core& traverse_set(Keys&&... keys) {
+			static_assert(sizeof...(Keys) > 1, "must pass at least 1 key and 1 value to set");
+			constexpr static bool global
+			     = (meta::count_when_for_to_pack_v < detail::is_not_insert_mode, 1, is_set_direct_tableless, meta::unqualified_t<Keys>... >> 0);
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			lua_State* L = base_t::lua_state();
+			auto pn = stack::pop_n(L, static_cast<int>(sizeof...(Keys) - 2 - meta::count_for_pack_v<detail::is_insert_mode, meta::unqualified_t<Keys>...>));
+			traverse_set_deep<top_level, false, detail::insert_mode::none>(table_index, std::forward<Keys>(keys)...);
+			return *this;
+		}
+
+		template <typename... Args>
+		basic_table_core& set(Args&&... args) {
+			if constexpr (sizeof...(Args) == 2) {
+				traverse_set(std::forward<Args>(args)...);
+			}
+			else {
+				tuple_set<false>(std::make_index_sequence<sizeof...(Args) / 2>(), std::forward_as_tuple(std::forward<Args>(args)...));
+			}
+			return *this;
+		}
+
+		template <typename... Ret, typename... Keys>
+		decltype(auto) raw_get(Keys&&... keys) const {
+			static_assert(sizeof...(Keys) == sizeof...(Ret), "number of keys and number of return types do not match");
+			constexpr static bool global = (meta::count_for_to_pack_v < 1, is_raw_get_direct_tableless, meta::unqualified_t<Keys>... >> 0);
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			return tuple_get<true, Ret...>(table_index, std::forward<Keys>(keys)...);
+		}
+
+		template <typename T, typename Key>
+		decltype(auto) raw_get_or(Key&& key, T&& otherwise) const {
+			typedef decltype(raw_get<T>("")) U;
+			optional<U> option = raw_get<optional<U>>(std::forward<Key>(key));
+			if (option) {
+				return static_cast<U>(option.value());
+			}
+			return static_cast<U>(std::forward<T>(otherwise));
+		}
+
+		template <typename T, typename Key, typename D>
+		decltype(auto) raw_get_or(Key&& key, D&& otherwise) const {
+			optional<T> option = raw_get<optional<T>>(std::forward<Key>(key));
+			if (option) {
+				return static_cast<T>(option.value());
+			}
+			return static_cast<T>(std::forward<D>(otherwise));
+		}
+
+		template <typename T, typename... Keys>
+		decltype(auto) traverse_raw_get(Keys&&... keys) const {
+			constexpr static bool global = (meta::count_for_to_pack_v < 1, is_raw_get_direct_tableless, meta::unqualified_t<Keys>... >> 0);
+			auto pp = stack::push_pop<global>(*this);
+			int table_index = pp.index_of(*this);
+			return traverse_get_single<true, T>(table_index, std::forward<Keys>(keys)...);
+		}
+
+		template <typename... Keys>
+		basic_table_core& traverse_raw_set(Keys&&... keys) {
+			constexpr static bool global = (meta::count_for_to_pack_v < 1, is_raw_set_direct_tableless, meta::unqualified_t<Keys>... >> 0);
+			auto pp = stack::push_pop<global>(*this);
+			lua_State* L = base_t::lua_state();
+			auto pn = stack::pop_n(L, static_cast<int>(sizeof...(Keys) - 2 - meta::count_for_pack_v<detail::is_insert_mode, meta::unqualified_t<Keys>...>));
+			traverse_set_deep<top_level, true, false>(std::forward<Keys>(keys)...);
+			return *this;
+		}
+
+		template <typename... Args>
+		basic_table_core& raw_set(Args&&... args) {
+			tuple_set<true>(std::make_index_sequence<sizeof...(Args) / 2>(), std::forward_as_tuple(std::forward<Args>(args)...));
+			return *this;
+		}
+
+		template <typename Class, typename Key>
+		usertype<Class> new_usertype(Key&& key);
+
+		template <typename Class, typename Key, automagic_flags enrollment_flags>
+		usertype<Class> new_usertype(Key&& key, constant_automagic_enrollments<enrollment_flags> enrollment);
+
+		template <typename Class, typename Key>
+		usertype<Class> new_usertype(Key&& key, automagic_enrollments enrollment);
+
+		template <typename Class, typename Key, typename Arg, typename... Args,
+		     typename = std::enable_if_t<!std::is_base_of_v<automagic_enrollments, meta::unqualified_t<Arg>>>>
+		usertype<Class> new_usertype(Key&& key, Arg&& arg, Args&&... args);
+
+		template <bool read_only = true, typename... Args>
+		table new_enum(const string_view& name, Args&&... args) {
+			table target = create_with(std::forward<Args>(args)...);
+			if constexpr (read_only) {
+				// Need to create a special iterator to handle this
+				table x
+				     = create_with(meta_function::new_index, detail::fail_on_newindex, meta_function::index, target, meta_function::pairs, stack::stack_detail::readonly_pairs);
+				table shim = create_named(name, metatable_key, x);
+				return shim;
+			}
+			else {
+				set(name, target);
+				return target;
+			}
+		}
+
+		template <typename T, bool read_only = true>
+		table new_enum(const string_view& name, std::initializer_list<std::pair<string_view, T>> items) {
+			table target = create(static_cast<int>(items.size()), static_cast<int>(0));
+			for (const auto& kvp : items) {
+				target.set(kvp.first, kvp.second);
+			}
+			if constexpr (read_only) {
+				table x = create_with(meta_function::new_index, detail::fail_on_newindex, meta_function::index, target);
+				table shim = create_named(name, metatable_key, x);
+				return shim;
+			}
+			else {
+				set(name, target);
+				return target;
+			}
+		}
+
+		template <typename Key = object, typename Value = object, typename Fx>
+		void for_each(Fx&& fx) const {
+			lua_State* L = base_t::lua_state();
+			if constexpr (std::is_invocable_v<Fx, Key, Value>) {
+				auto pp = stack::push_pop(*this);
+				int table_index = pp.index_of(*this);
+				stack::push(L, lua_nil);
+				while (lua_next(L, table_index)) {
+					Key key(L, -2);
+					Value value(L, -1);
+					auto pn = stack::pop_n(L, 1);
+					fx(key, value);
+				}
+			}
+			else {
+				auto pp = stack::push_pop(*this);
+				int table_index = pp.index_of(*this);
+				stack::push(L, lua_nil);
+				while (lua_next(L, table_index)) {
+					Key key(L, -2);
+					Value value(L, -1);
+					auto pn = stack::pop_n(L, 1);
+					std::pair<Key&, Value&> keyvalue(key, value);
+					fx(keyvalue);
+				}
+			}
+		}
+
+		size_t size() const {
+			auto pp = stack::push_pop(*this);
+			int table_index = pp.index_of(*this);
+			lua_State* L = base_t::lua_state();
+			lua_len(L, table_index);
+			return stack::pop<size_t>(L);
+		}
+
+		bool empty() const {
+			return cbegin() == cend();
+		}
+
+		template <typename T>
+		auto operator[](T&& key) & {
+			return table_proxy<basic_table_core&, detail::proxy_key_t<T>>(*this, std::forward<T>(key));
+		}
+
+		template <typename T>
+		auto operator[](T&& key) const& {
+			return table_proxy<const basic_table_core&, detail::proxy_key_t<T>>(*this, std::forward<T>(key));
+		}
+
+		template <typename T>
+		auto operator[](T&& key) && {
+			return table_proxy<basic_table_core, detail::proxy_key_t<T>>(std::move(*this), std::forward<T>(key));
+		}
+
+		template <typename Sig, typename Key, typename... Args>
+		basic_table_core& set_function(Key&& key, Args&&... args) {
+			set_fx(types<Sig>(), std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename Key, typename... Args>
+		basic_table_core& set_function(Key&& key, Args&&... args) {
+			set_fx(types<>(), std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename... Args>
+		basic_table_core& add(Args&&... args) {
+			auto pp = stack::push_pop(*this);
+			int table_index = pp.index_of(*this);
+			lua_State* L = base_t::lua_state();
+			(void)detail::swallow { 0, (stack::stack_detail::raw_table_set(L, std::forward<Args>(args), table_index), 0)... };
+			return *this;
+		}
+
+	private:
+		template <typename R, typename... Args, typename Fx, typename Key, typename = std::invoke_result_t<Fx, Args...>>
+		void set_fx(types<R(Args...)>, Key&& key, Fx&& fx) {
+			set_resolved_function<R(Args...)>(std::forward<Key>(key), std::forward<Fx>(fx));
+		}
+
+		template <typename Fx, typename Key, meta::enable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
+		void set_fx(types<>, Key&& key, Fx&& fx) {
+			set(std::forward<Key>(key), std::forward<Fx>(fx));
+		}
+
+		template <typename Fx, typename Key, typename... Args,
+		     meta::disable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
+		void set_fx(types<>, Key&& key, Fx&& fx, Args&&... args) {
+			set(std::forward<Key>(key), as_function_reference(std::forward<Fx>(fx), std::forward<Args>(args)...));
+		}
+
+		template <typename... Sig, typename... Args, typename Key>
+		void set_resolved_function(Key&& key, Args&&... args) {
+			set(std::forward<Key>(key), as_function_reference<function_sig<Sig...>>(std::forward<Args>(args)...));
+		}
+
+	public:
+		static inline table create(lua_State* L, int narr = 0, int nrec = 0) {
+			lua_createtable(L, narr, nrec);
+			table result(L);
+			lua_pop(L, 1);
+			return result;
+		}
+
+		template <typename Key, typename Value, typename... Args>
+		static inline table create(lua_State* L, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			lua_createtable(L, narr, nrec);
+			table result(L);
+			result.set(std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+			lua_pop(L, 1);
+			return result;
+		}
+
+		template <typename... Args>
+		static inline table create_with(lua_State* L, Args&&... args) {
+			static_assert(sizeof...(Args) % 2 == 0, "You must have an even number of arguments for a key, value ... list.");
+			constexpr int narr = static_cast<int>(meta::count_odd_for_pack_v<std::is_integral, Args...>);
+			return create(L, narr, static_cast<int>((sizeof...(Args) / 2) - narr), std::forward<Args>(args)...);
+		}
+
+		table create(int narr = 0, int nrec = 0) {
+			return create(base_t::lua_state(), narr, nrec);
+		}
+
+		template <typename Key, typename Value, typename... Args>
+		table create(int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			return create(base_t::lua_state(), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+		}
+
+		template <typename Name>
+		table create(Name&& name, int narr = 0, int nrec = 0) {
+			table x = create(base_t::lua_state(), narr, nrec);
+			this->set(std::forward<Name>(name), x);
+			return x;
+		}
+
+		template <typename Name, typename Key, typename Value, typename... Args>
+		table create(Name&& name, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			table x = create(base_t::lua_state(), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+			this->set(std::forward<Name>(name), x);
+			return x;
+		}
+
+		template <typename... Args>
+		table create_with(Args&&... args) {
+			return create_with(base_t::lua_state(), std::forward<Args>(args)...);
+		}
+
+		template <typename Name, typename... Args>
+		table create_named(Name&& name, Args&&... args) {
+			static const int narr = static_cast<int>(meta::count_even_for_pack_v<std::is_integral, Args...>);
+			return create(std::forward<Name>(name), narr, (sizeof...(Args) / 2) - narr, std::forward<Args>(args)...);
+		}
+	};
+} // namespace sol
+
+// end of sol/table_core.hpp
+
+namespace sol {
+
+	template <typename base_type>
+	class basic_metatable : public basic_table<base_type> {
+		typedef basic_table<base_type> base_t;
+		friend class state;
+		friend class state_view;
+
+	protected:
+		basic_metatable(detail::no_safety_tag, lua_nil_t n) : base_t(n) {
+		}
+		basic_metatable(detail::no_safety_tag, lua_State* L, int index) : base_t(L, index) {
+		}
+		basic_metatable(detail::no_safety_tag, lua_State* L, ref_index index) : base_t(L, index) {
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_metatable>>, meta::neg<std::is_same<base_type, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_metatable(detail::no_safety_tag, T&& r) noexcept : base_t(std::forward<T>(r)) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_metatable(detail::no_safety_tag, lua_State* L, T&& r) noexcept : base_t(L, std::forward<T>(r)) {
+		}
+
+		template <typename R, typename... Args, typename Fx, typename Key, typename = std::invoke_result_t<Fx, Args...>>
+		void set_fx(types<R(Args...)>, Key&& key, Fx&& fx) {
+			set_resolved_function<R(Args...)>(std::forward<Key>(key), std::forward<Fx>(fx));
+		}
+
+		template <typename Fx, typename Key, meta::enable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
+		void set_fx(types<>, Key&& key, Fx&& fx) {
+			set(std::forward<Key>(key), std::forward<Fx>(fx));
+		}
+
+		template <typename Fx, typename Key, typename... Args,
+		     meta::disable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
+		void set_fx(types<>, Key&& key, Fx&& fx, Args&&... args) {
+			set(std::forward<Key>(key), as_function_reference(std::forward<Fx>(fx), std::forward<Args>(args)...));
+		}
+
+		template <typename... Sig, typename... Args, typename Key>
+		void set_resolved_function(Key&& key, Args&&... args) {
+			set(std::forward<Key>(key), as_function_reference<function_sig<Sig...>>(std::forward<Args>(args)...));
+		}
+
+	public:
+		using base_t::lua_state;
+
+		basic_metatable() noexcept = default;
+		basic_metatable(const basic_metatable&) = default;
+		basic_metatable(basic_metatable&&) = default;
+		basic_metatable& operator=(const basic_metatable&) = default;
+		basic_metatable& operator=(basic_metatable&&) = default;
+		basic_metatable(const stack_reference& r) : basic_metatable(r.lua_state(), r.stack_index()) {
+		}
+		basic_metatable(stack_reference&& r) : basic_metatable(r.lua_state(), r.stack_index()) {
+		}
+		template <typename T, meta::enable_any<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_metatable(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_metatable>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_metatable(lua_State* L, int index = -1) : basic_metatable(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_metatable>(L, index, handler);
+#endif // Safety
+		}
+		basic_metatable(lua_State* L, ref_index index) : basic_metatable(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_metatable>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_metatable>>, meta::neg<std::is_same<base_type, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_metatable(T&& r) noexcept : basic_metatable(detail::no_safety, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			if (!is_table<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_metatable>(base_t::lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+		basic_metatable(lua_nil_t r) noexcept : basic_metatable(detail::no_safety, r) {
+		}
+
+		template <typename Key, typename Value>
+		basic_metatable<base_type>& set(Key&& key, Value&& value);
+
+		template <typename Sig, typename Key, typename... Args>
+		basic_metatable& set_function(Key&& key, Args&&... args) {
+			set_fx(types<Sig>(), std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename Key, typename... Args>
+		basic_metatable& set_function(Key&& key, Args&&... args) {
+			set_fx(types<>(), std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		void unregister() {
+			using ustorage_base = u_detail::usertype_storage_base;
+
+			lua_State* L = this->lua_state();
+
+			auto pp = stack::push_pop(*this);
+			int top = lua_gettop(L);
+
+			stack_reference mt(L, -1);
+			stack::get_field(L, meta_function::gc_names, mt.stack_index());
+			if (type_of(L, -1) != type::table) {
+				lua_settop(L, top);
+				return;
+			}
+			stack_reference gc_names_table(L, -1);
+			stack::get_field(L, meta_function::storage, mt.stack_index());
+			if (type_of(L, -1) != type::lightuserdata) {
+				lua_settop(L, top);
+				return;
+			}
+			ustorage_base& base_storage = *static_cast<ustorage_base*>(stack::get<void*>(L, -1));
+			std::array<string_view, 6> registry_traits;
+			for (std::size_t i = 0; i < registry_traits.size(); ++i) {
+				u_detail::submetatable_type smt = static_cast<u_detail::submetatable_type>(i);
+				stack::get_field<false, true>(L, smt, gc_names_table.stack_index());
+				registry_traits[i] = stack::get<string_view>(L, -1);
+			}
+
+			// get the registry
+			stack_reference registry(L, raw_index(LUA_REGISTRYINDEX));
+			registry.push();
+			// eliminate all named entries for this usertype
+			// in the registry (luaL_newmetatable does
+			// [name] = new table
+			// in registry upon creation)
+			for (std::size_t i = 0; i < registry_traits.size(); ++i) {
+				u_detail::submetatable_type smt = static_cast<u_detail::submetatable_type>(i);
+				const string_view& gcmetakey = registry_traits[i];
+				if (smt == u_detail::submetatable_type::named) {
+					// use .data() to make it treat it like a c string,
+					// which it is...
+					stack::set_field<true>(L, gcmetakey.data(), lua_nil);
+				}
+				else {
+					// do not change the values in the registry: they need to be present
+					// no matter what, for safety's sake
+					// stack::set_field(L, gcmetakey, lua_nil, registry.stack_index());
+				}
+			}
+
+			// destroy all storage and tables
+			base_storage.clear();
+
+			// 6 strings from gc_names table,
+			// + 1 registry,
+			// + 1 gc_names table
+			// + 1 light userdata of storage
+			// + 1 registry
+			// 10 total, 4 left since popping off 6 gc_names tables
+			lua_settop(L, top);
+		}
+	};
+
+} // namespace sol
+
+// end of sol/metatable.hpp
+
+namespace sol {
+
+	template <typename T, typename base_type>
+	class basic_usertype : private basic_metatable<base_type> {
+	private:
+		using base_t = basic_metatable<base_type>;
+		using table_base_t = basic_table<base_type>;
+
+		template <typename>
+		friend class basic_metatable;
+
+		template <bool, typename>
+		friend class basic_table_core;
+
+		template <std::size_t... I, typename... Args>
+		void tuple_set(std::index_sequence<I...>, std::tuple<Args...>&& args) {
+			(void)args;
+			(void)detail::swallow { 0, (this->set(std::get<I * 2>(std::move(args)), std::get<I * 2 + 1>(std::move(args))), 0)... };
+		}
+
+		template <typename R, typename... Args, typename Fx, typename Key, typename = std::invoke_result_t<Fx, Args...>>
+		void set_fx(types<R(Args...)>, Key&& key, Fx&& fx) {
+			set_resolved_function<R(Args...)>(std::forward<Key>(key), std::forward<Fx>(fx));
+		}
+
+		template <typename Fx, typename Key, meta::enable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
+		void set_fx(types<>, Key&& key, Fx&& fx) {
+			set(std::forward<Key>(key), std::forward<Fx>(fx));
+		}
+
+		template <typename Fx, typename Key, typename... Args,
+		     meta::disable<meta::is_specialization_of<meta::unqualified_t<Fx>, overload_set>> = meta::enabler>
+		void set_fx(types<>, Key&& key, Fx&& fx, Args&&... args) {
+			set(std::forward<Key>(key), as_function_reference(std::forward<Fx>(fx), std::forward<Args>(args)...));
+		}
+
+		template <typename... Sig, typename... Args, typename Key>
+		void set_resolved_function(Key&& key, Args&&... args) {
+			set(std::forward<Key>(key), as_function_reference<function_sig<Sig...>>(std::forward<Args>(args)...));
+		}
+
+	public:
+		using base_t::base_t;
+
+		using base_t::get;
+		using base_t::lua_state;
+		using base_t::pop;
+		using base_t::push;
+		using base_t::traverse_get;
+		using base_t::traverse_set;
+		using base_t::unregister;
+
+		template <typename Key, typename Value>
+		basic_usertype& set(Key&& key, Value&& value) {
+			optional<u_detail::usertype_storage<T>&> maybe_uts = u_detail::maybe_get_usertype_storage<T>(this->lua_state());
+			if (maybe_uts) {
+				u_detail::usertype_storage<T>& uts = *maybe_uts;
+				uts.set(this->lua_state(), std::forward<Key>(key), std::forward<Value>(value));
+			}
+			else {
+				using ValueU = meta::unqualified_t<Value>;
+				// cannot get metatable: try regular table set?
+				if constexpr (detail::is_non_factory_constructor_v<ValueU> || detail::is_policy_v<ValueU>) {
+					// tag constructors so we don't get destroyed by lack of info
+					table_base_t::set(std::forward<Key>(key), detail::tagged<T, Value>(std::forward<Value>(value)));
+				}
+				else {
+					table_base_t::set(std::forward<Key>(key), std::forward<Value>(value));
+				}
+			}
+			return *this;
+		}
+
+		template <typename Sig, typename Key, typename... Args>
+		basic_usertype& set_function(Key&& key, Args&&... args) {
+			set_fx(types<Sig>(), std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename Key, typename... Args>
+		basic_usertype& set_function(Key&& key, Args&&... args) {
+			set_fx(types<>(), std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename Key>
+		usertype_proxy<basic_usertype&, std::decay_t<Key>> operator[](Key&& key) {
+			return usertype_proxy<basic_usertype&, std::decay_t<Key>>(*this, std::forward<Key>(key));
+		}
+
+		template <typename Key>
+		usertype_proxy<const basic_usertype&, std::decay_t<Key>> operator[](Key&& key) const {
+			return usertype_proxy<const basic_usertype&, std::decay_t<Key>>(*this, std::forward<Key>(key));
+		}
+	};
+
+} // namespace sol
+
+// end of sol/usertype.hpp
+
+// beginning of sol/table.hpp
+
+// beginning of sol/lua_table.hpp
+
+namespace sol {
+
+	template <typename ref_t>
+	struct basic_lua_table : basic_table_core<false, ref_t> {
+	private:
+		using base_t = basic_table_core<false, ref_t>;
+
+		friend class state;
+		friend class state_view;
+
+	public:
+		using base_t::lua_state;
+
+		basic_lua_table() noexcept = default;
+		basic_lua_table(const basic_lua_table&) = default;
+		basic_lua_table(basic_lua_table&&) = default;
+		basic_lua_table& operator=(const basic_lua_table&) = default;
+		basic_lua_table& operator=(basic_lua_table&&) = default;
+		basic_lua_table(const stack_reference& r) : basic_lua_table(r.lua_state(), r.stack_index()) {
+		}
+		basic_lua_table(stack_reference&& r) : basic_lua_table(r.lua_state(), r.stack_index()) {
+		}
+		template <typename T, meta::enable_any<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_lua_table(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_lua_table>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_lua_table(lua_State* L, const new_table& nt) : base_t(L, nt) {
+			if (!is_stack_based<meta::unqualified_t<ref_t>>::value) {
+				lua_pop(L, 1);
+			}
+		}
+		basic_lua_table(lua_State* L, int index = -1) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_lua_table>(L, index, handler);
+#endif // Safety
+		}
+		basic_lua_table(lua_State* L, ref_index index) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_lua_table>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_lua_table>>, meta::neg<std::is_same<ref_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_lua_table(T&& r) noexcept : basic_lua_table(detail::no_safety, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			if (!is_table<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_lua_table>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+		basic_lua_table(lua_nil_t r) noexcept : basic_lua_table(detail::no_safety, r) {
+		}
+	};
+
+} // namespace sol
+
+// end of sol/lua_table.hpp
+
+namespace sol {
+	typedef table_core<false> table;
+
+	template <bool is_global, typename base_type>
+	template <typename Class, typename Key>
+	usertype<Class> basic_table_core<is_global, base_type>::new_usertype(Key&& key) {
+		constant_automagic_enrollments<> enrollments {};
+		return this->new_usertype<Class>(std::forward<Key>(key), std::move(enrollments));
+	}
+
+	template <bool is_global, typename base_type>
+	template <typename Class, typename Key, automagic_flags enrollment_flags>
+	usertype<Class> basic_table_core<is_global, base_type>::new_usertype(Key&& key, constant_automagic_enrollments<enrollment_flags> enrollments) {
+		int mt_index = u_detail::register_usertype<Class, enrollment_flags>(this->lua_state(), std::move(enrollments));
+		usertype<Class> mt(this->lua_state(), -mt_index);
+		lua_pop(this->lua_state(), 1);
+		set(std::forward<Key>(key), mt);
+		return mt;
+	}
+
+	template <bool is_global, typename base_type>
+	template <typename Class, typename Key>
+	usertype<Class> basic_table_core<is_global, base_type>::new_usertype(Key&& key, automagic_enrollments enrollments) {
+		int mt_index = u_detail::register_usertype<Class, automagic_flags::all>(this->lua_state(), std::move(enrollments));
+		usertype<Class> mt(this->lua_state(), -mt_index);
+		lua_pop(this->lua_state(), 1);
+		set(std::forward<Key>(key), mt);
+		return mt;
+	}
+
+	template <bool is_global, typename base_type>
+	template <typename Class, typename Key, typename Arg, typename... Args, typename>
+	usertype<Class> basic_table_core<is_global, base_type>::new_usertype(Key&& key, Arg&& arg, Args&&... args) {
+		constexpr automagic_flags enrollment_flags = meta::any_same_v<no_construction, meta::unqualified_t<Arg>, meta::unqualified_t<Args>...>
+		     ? clear_flags(automagic_flags::all, automagic_flags::default_constructor)
+		     : automagic_flags::all;
+		constant_automagic_enrollments<enrollment_flags> enrollments;
+		enrollments.default_constructor = !detail::any_is_constructor_v<Arg, Args...>;
+		enrollments.destructor = !detail::any_is_destructor_v<Arg, Args...>;
+		usertype<Class> ut = this->new_usertype<Class>(std::forward<Key>(key), std::move(enrollments));
+		static_assert(sizeof...(Args) % 2 == static_cast<std::size_t>(!detail::any_is_constructor_v<Arg>),
+		     "you must pass an even number of arguments to new_usertype after first passing a constructor");
+		if constexpr (detail::any_is_constructor_v<Arg>) {
+			ut.set(meta_function::construct, std::forward<Arg>(arg));
+			ut.tuple_set(std::make_index_sequence<(sizeof...(Args)) / 2>(), std::forward_as_tuple(std::forward<Args>(args)...));
+		}
+		else {
+			ut.tuple_set(std::make_index_sequence<(sizeof...(Args) + 1) / 2>(), std::forward_as_tuple(std::forward<Arg>(arg), std::forward<Args>(args)...));
+		}
+		return ut;
+	}
+
+	template <typename base_type>
+	template <typename Key, typename Value>
+	basic_metatable<base_type>& basic_metatable<base_type>::set(Key&& key, Value&& value) {
+		this->push();
+		lua_State* L = this->lua_state();
+		int target = lua_gettop(L);
+		optional<u_detail::usertype_storage_base&> maybe_uts = nullopt;
+		maybe_uts = u_detail::maybe_get_usertype_storage_base(L, target);
+		if (maybe_uts) {
+			u_detail::usertype_storage_base& uts = *maybe_uts;
+			uts.set(L, std::forward<Key>(key), std::forward<Value>(value));
+			return *this;
+		}
+		else {
+			base_t::set(std::forward<Key>(key), std::forward<Value>(value));
+		}
+		this->pop();
+		return *this;
+	}
+
+	namespace stack {
+		template <>
+		struct unqualified_getter<metatable_key_t> {
+			static metatable get(lua_State* L, int index = -1) {
+				if (lua_getmetatable(L, index) == 0) {
+					return metatable(L, ref_index(LUA_REFNIL));
+				}
+				return metatable(L, -1);
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/table.hpp
+
+// beginning of sol/state.hpp
+
+// beginning of sol/state_view.hpp
+
+// beginning of sol/environment.hpp
+
+namespace sol {
+
+	template <typename base_type>
+	struct basic_environment : basic_table<base_type> {
+	private:
+		typedef basic_table<base_type> base_t;
+
+	public:
+		using base_t::lua_state;
+
+		basic_environment() noexcept = default;
+		basic_environment(const basic_environment&) = default;
+		basic_environment(basic_environment&&) = default;
+		basic_environment& operator=(const basic_environment&) = default;
+		basic_environment& operator=(basic_environment&&) = default;
+		basic_environment(const stack_reference& r) : basic_environment(r.lua_state(), r.stack_index()) {
+		}
+		basic_environment(stack_reference&& r) : basic_environment(r.lua_state(), r.stack_index()) {
+		}
+
+		basic_environment(lua_State* L, new_table nt) : base_t(L, std::move(nt)) {
+		}
+		template <bool b>
+		basic_environment(lua_State* L, new_table t, const basic_reference<b>& fallback) : basic_environment(L, std::move(t)) {
+			stack_table mt(L, new_table(0, 1));
+			mt.set(meta_function::index, fallback);
+			this->set(metatable_key, mt);
+			mt.pop();
+		}
+
+		basic_environment(env_key_t, const stack_reference& extraction_target)
+		: base_t(detail::no_safety, extraction_target.lua_state(), (stack::push_environment_of(extraction_target), -1)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<env_key_t>(this->lua_state(), -1, handler);
+#endif // Safety
+			lua_pop(this->lua_state(), 1);
+		}
+		template <bool b>
+		basic_environment(env_key_t, const basic_reference<b>& extraction_target)
+		: base_t(detail::no_safety, extraction_target.lua_state(), (stack::push_environment_of(extraction_target), -1)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<env_key_t>(this->lua_state(), -1, handler);
+#endif // Safety
+			lua_pop(this->lua_state(), 1);
+		}
+		basic_environment(lua_State* L, int index = -1) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_environment>(L, index, handler);
+#endif // Safety
+		}
+		basic_environment(lua_State* L, ref_index index) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_environment>(L, -1, handler);
+#endif // Safety
+		}
+		template <typename T,
+		     meta::enable<meta::neg<meta::any_same<meta::unqualified_t<T>, basic_environment>>, meta::neg<std::is_same<base_type, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_environment(T&& r) noexcept : base_t(detail::no_safety, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			if (!is_environment<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_environment>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+		basic_environment(lua_nil_t r) noexcept : base_t(detail::no_safety, r) {
+		}
+
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_environment(lua_State* L, T&& r) noexcept : base_t(detail::no_safety, L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			if (!is_environment<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_environment>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+
+		template <typename T>
+		bool set_on(const T& target) const {
+			lua_State* L = target.lua_state();
+			auto pp = stack::push_pop(target);
+			int target_index = pp.index_of(target);
+#if SOL_LUA_VERSION_I_ < 502
+			// Use lua_setfenv
+			this->push();
+			int success_result = lua_setfenv(L, target_index);
+			return success_result != 0;
+#else
+			// If this is a C function, the environment is always placed in
+			// the first value, as is expected of sol2 (all upvalues have an empty name, "")
+			if (lua_iscfunction(L, target_index) != 0) {
+				const char* maybe_upvalue_name = lua_getupvalue(L, target_index, 1);
+				if (maybe_upvalue_name == nullptr) {
+					return false;
+				}
+				string_view upvalue_name(maybe_upvalue_name);
+				if (upvalue_name == "") {
+					this->push();
+					const char* success = lua_setupvalue(L, target_index, 1);
+					if (success == nullptr) {
+						// left things alone on the stack, pop them off
+						lua_pop(L, 2);
+						return false;
+					}
+					lua_pop(L, 1);
+					return true;
+				}
+				lua_pop(L, 1);
+				return false;
+			}
+			else {
+				// Must search for the right upvalue target on index
+				for (int upvalue_index = 1;; ++upvalue_index) {
+					const char* maybe_upvalue_name = lua_getupvalue(L, target_index, upvalue_index);
+					if (maybe_upvalue_name == nullptr) {
+						break;
+					}
+					string_view upvalue_name(maybe_upvalue_name);
+					if (upvalue_name == "_ENV") {
+						lua_pop(L, 1);
+						this->push();
+						const char* success = lua_setupvalue(L, target_index, upvalue_index);
+						if (success == nullptr) {
+							// left things alone on the stack, pop them off
+							lua_pop(L, 1);
+							break;
+						}
+						// whether or not we succeeded, we found _ENV
+						// so we need to break
+						return true;
+					}
+					lua_pop(L, 1);
+				}
+				// if we get here,
+				// we did not find an _ENV here...
+				return false;
+			}
+#endif
+		}
+	};
+
+	template <typename T, typename E>
+	bool set_environment(const basic_environment<E>& env, const T& target) {
+		return env.set_on(target);
+	}
+
+	template <typename E = reference, typename T>
+	basic_environment<E> get_environment(const T& target) {
+		lua_State* L = target.lua_state();
+		auto pp = stack::pop_n(L, stack::push_environment_of(target));
+		return basic_environment<E>(L, -1);
+	}
+
+	struct this_environment {
+		optional<environment> env;
+
+		this_environment() : env(nullopt) {
+		}
+		this_environment(environment e) : env(std::move(e)) {
+		}
+		this_environment(const this_environment&) = default;
+		this_environment(this_environment&&) = default;
+		this_environment& operator=(const this_environment&) = default;
+		this_environment& operator=(this_environment&&) = default;
+
+		explicit operator bool() const {
+			return static_cast<bool>(env);
+		}
+
+		operator optional<environment>&() {
+			return env;
+		}
+
+		operator const optional<environment>&() const {
+			return env;
+		}
+
+		operator environment&() {
+			return env.value();
+		}
+
+		operator const environment&() const {
+			return env.value();
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_getter<env_key_t> {
+			static environment get(lua_State* L, int index, record& tracking) {
+				tracking.use(1);
+				return get_environment(stack_reference(L, raw_index(index)));
+			}
+		};
+
+		template <>
+		struct unqualified_getter<this_environment> {
+			static this_environment get(lua_State* L, int, record& tracking) {
+				tracking.use(0);
+				lua_Debug info;
+				// Level 0 means current function (this C function, which may or may not be useful for us?)
+				// Level 1 means next call frame up the stack. (Can be nothing if function called directly from C++ with lua_p/call)
+				int pre_stack_size = lua_gettop(L);
+				if (lua_getstack(L, 1, &info) != 1) {
+					if (lua_getstack(L, 0, &info) != 1) {
+						lua_settop(L, pre_stack_size);
+						return this_environment();
+					}
+				}
+				if (lua_getinfo(L, "f", &info) == 0) {
+					lua_settop(L, pre_stack_size);
+					return this_environment();
+				}
+
+				stack_reference f(L, -1);
+				environment env(env_key, f);
+				if (!env.valid()) {
+					lua_settop(L, pre_stack_size);
+					return this_environment();
+				}
+				return this_environment(std::move(env));
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/environment.hpp
+
+// beginning of sol/load_result.hpp
+
+#include <cstdint>
+
+namespace sol {
+	struct load_result : public proxy_base<load_result> {
+	private:
+		lua_State* L;
+		int index;
+		int returncount;
+		int popcount;
+		load_status err;
+
+	public:
+		load_result() noexcept : load_result(nullptr) {}
+		load_result(lua_State* Ls, int stackindex = -1, int retnum = 0, int popnum = 0, load_status lerr = load_status::ok) noexcept
+		: L(Ls), index(stackindex), returncount(retnum), popcount(popnum), err(lerr) {
+		}
+
+		// We do not want anyone to copy these around willy-nilly
+		// Will likely break people, but also will probably get rid of quiet bugs that have
+		// been lurking. (E.g., Vanilla Lua will just quietly discard over-pops and under-pops:
+		// LuaJIT and other Lua engines will implode and segfault at random later times.)
+		load_result(const load_result&) = delete;
+		load_result& operator=(const load_result&) = delete;
+
+		load_result(load_result&& o) noexcept : L(o.L), index(o.index), returncount(o.returncount), popcount(o.popcount), err(o.err) {
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but we will be thorough
+			o.L = nullptr;
+			o.index = 0;
+			o.returncount = 0;
+			o.popcount = 0;
+			o.err = load_status::syntax;
+		}
+		load_result& operator=(load_result&& o) noexcept {
+			L = o.L;
+			index = o.index;
+			returncount = o.returncount;
+			popcount = o.popcount;
+			err = o.err;
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but we will be thorough
+			o.L = nullptr;
+			o.index = 0;
+			o.returncount = 0;
+			o.popcount = 0;
+			o.err = load_status::syntax;
+			return *this;
+		}
+
+		load_status status() const noexcept {
+			return err;
+		}
+
+		bool valid() const noexcept {
+			return status() == load_status::ok;
+		}
+
+		template <typename T>
+		T get() const {
+			using UT = meta::unqualified_t<T>;
+			if constexpr (meta::is_optional_v<UT>) {
+				using ValueType = typename UT::value_type;
+				if constexpr (std::is_same_v<ValueType, error>) {
+					if (valid()) {
+						return UT(nullopt);
+					}
+					return error(detail::direct_error, stack::get<std::string>(L, index));
+				}
+				else {
+					if (!valid()) {
+						return UT(nullopt);
+					}
+					return stack::get<UT>(L, index);
+				}
+			}
+			else {
+				if constexpr (std::is_same_v<T, error>) {
+#if SOL_IS_ON(SOL_SAFE_PROXIES)
+					if (valid()) {
+						type_panic_c_str(L, index, type_of(L, index), type::none, "expecting an error type (a string, from Lua)");
+					}
+#endif // Check proxy type's safety
+					return error(detail::direct_error, stack::get<std::string>(L, index));
+				}
+				else {
+#if SOL_IS_ON(SOL_SAFE_PROXIES)
+					if (!valid()) {
+						type_panic_c_str(L, index, type_of(L, index), type::none);
+					}
+#endif // Check proxy type's safety
+					return stack::get<T>(L, index);
+				}
+			}
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) {
+			return get<protected_function>().template call<Ret...>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Args>
+		decltype(auto) operator()(Args&&... args) {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		lua_State* lua_state() const noexcept {
+			return L;
+		};
+		int stack_index() const noexcept {
+			return index;
+		};
+
+		~load_result() {
+			if (L != nullptr) {
+				stack::remove(L, index, popcount);
+			}
+		}
+	};
+} // namespace sol
+
+// end of sol/load_result.hpp
+
+// beginning of sol/state_handling.hpp
+
+// beginning of sol/lua_value.hpp
+
+namespace sol {
+	struct lua_value {
+	public:
+		struct arr : detail::ebco<std::initializer_list<lua_value>> {
+		private:
+			using base_t = detail::ebco<std::initializer_list<lua_value>>;
+
+		public:
+			using base_t::base_t;
+		};
+
+	private:
+		template <typename T>
+		using is_reference_or_lua_value_init_list
+		     = meta::any<meta::is_specialization_of<T, std::initializer_list>, std::is_same<T, reference>, std::is_same<T, arr>>;
+
+		template <typename T>
+		using is_lua_value_single_constructible = meta::any<std::is_same<T, lua_value>, is_reference_or_lua_value_init_list<T>>;
+
+		static lua_State*& thread_local_lua_state() {
+#if SOL_IS_ON(SOL_USE_THREAD_LOCAL)
+			static thread_local lua_State* L = nullptr;
+#else
+			static lua_State* L = nullptr;
+#endif
+			return L;
+		}
+
+		reference ref_value;
+
+	public:
+		static void set_lua_state(lua_State* L) {
+			thread_local_lua_state() = L;
+		}
+
+		template <typename T, meta::disable<is_reference_or_lua_value_init_list<meta::unqualified_t<T>>> = meta::enabler>
+		lua_value(lua_State* L_, T&& value) : lua_value(((set_lua_state(L_)), std::forward<T>(value))) {
+		}
+
+		template <typename T, meta::disable<is_lua_value_single_constructible<meta::unqualified_t<T>>> = meta::enabler>
+		lua_value(T&& value) : ref_value(make_reference(thread_local_lua_state(), std::forward<T>(value))) {
+		}
+
+		lua_value(lua_State* L_, std::initializer_list<std::pair<lua_value, lua_value>> il)
+		: lua_value([&L_, &il]() {
+			set_lua_state(L_);
+			return std::move(il);
+		}()) {
+		}
+
+		lua_value(std::initializer_list<std::pair<lua_value, lua_value>> il) : ref_value(make_reference(thread_local_lua_state(), std::move(il))) {
+		}
+
+		lua_value(lua_State* L_, arr il)
+		: lua_value([&L_, &il]() {
+			set_lua_state(L_);
+			return std::move(il);
+		}()) {
+		}
+
+		lua_value(arr il) : ref_value(make_reference(thread_local_lua_state(), std::move(il.value()))) {
+		}
+
+		lua_value(lua_State* L_, reference r)
+		: lua_value([&L_, &r]() {
+			set_lua_state(L_);
+			return std::move(r);
+		}()) {
+		}
+
+		lua_value(reference r) : ref_value(std::move(r)) {
+		}
+
+		lua_value(const lua_value&) noexcept = default;
+		lua_value(lua_value&&) = default;
+		lua_value& operator=(const lua_value&) = default;
+		lua_value& operator=(lua_value&&) = default;
+
+		const reference& value() const& {
+			return ref_value;
+		}
+
+		reference& value() & {
+			return ref_value;
+		}
+
+		reference&& value() && {
+			return std::move(ref_value);
+		}
+
+		template <typename T>
+		decltype(auto) as() const {
+			ref_value.push();
+			return stack::pop<T>(ref_value.lua_state());
+		}
+
+		template <typename T>
+		bool is() const {
+			int r = ref_value.registry_index();
+			if (r == LUA_REFNIL)
+				return meta::any_same<meta::unqualified_t<T>, lua_nil_t, nullopt_t, std::nullptr_t>::value ? true : false;
+			if (r == LUA_NOREF)
+				return false;
+			auto pp = stack::push_pop(ref_value);
+			return stack::check<T>(ref_value.lua_state(), -1, &no_panic);
+		}
+	};
+
+	using array_value = typename lua_value::arr;
+
+	namespace stack {
+		template <>
+		struct unqualified_pusher<lua_value> {
+			static int push(lua_State* L, const lua_value& lv) {
+				return stack::push(L, lv.value());
+			}
+
+			static int push(lua_State* L, lua_value&& lv) {
+				return stack::push(L, std::move(lv).value());
+			}
+		};
+
+		template <>
+		struct unqualified_getter<lua_value> {
+			static lua_value get(lua_State* L, int index, record& tracking) {
+				return lua_value(L, stack::get<reference>(L, index, tracking));
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/lua_value.hpp
+
+#if SOL_IS_ON(SOL_PRINT_ERRORS)
+#include <iostream>
+#endif
+
+namespace sol {
+	inline void register_main_thread(lua_State* L) {
+#if SOL_LUA_VERSION_I_ < 502
+		if (L == nullptr) {
+			lua_pushnil(L);
+			lua_setglobal(L, detail::default_main_thread_name());
+			return;
+		}
+		lua_pushthread(L);
+		lua_setglobal(L, detail::default_main_thread_name());
+#else
+		(void)L;
+#endif
+	}
+
+	inline int default_at_panic(lua_State* L) {
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+		(void)L;
+		return -1;
+#else
+		size_t messagesize;
+		const char* message = lua_tolstring(L, -1, &messagesize);
+		if (message) {
+			std::string err(message, messagesize);
+			lua_settop(L, 0);
+#if SOL_IS_ON(SOL_PRINT_ERRORS)
+			std::cerr << "[sol2] An error occurred and panic has been invoked: ";
+			std::cerr << err;
+			std::cerr << std::endl;
+#endif
+			throw error(err);
+		}
+		lua_settop(L, 0);
+		throw error(std::string("An unexpected error occurred and panic has been invoked"));
+#endif // Printing Errors
+	}
+
+	inline int default_traceback_error_handler(lua_State* L) {
+		std::string msg = "An unknown error has triggered the default error handler";
+		optional<string_view> maybetopmsg = stack::unqualified_check_get<string_view>(L, 1, &no_panic);
+		if (maybetopmsg) {
+			const string_view& topmsg = maybetopmsg.value();
+			msg.assign(topmsg.data(), topmsg.size());
+		}
+		luaL_traceback(L, L, msg.c_str(), 1);
+		optional<string_view> maybetraceback = stack::unqualified_check_get<string_view>(L, -1, &no_panic);
+		if (maybetraceback) {
+			const string_view& traceback = maybetraceback.value();
+			msg.assign(traceback.data(), traceback.size());
+		}
+#if SOL_IS_ON(SOL_PRINT_ERRORS)
+		// std::cerr << "[sol2] An error occurred and was caught in traceback: ";
+		// std::cerr << msg;
+		// std::cerr << std::endl;
+#endif // Printing
+		return stack::push(L, msg);
+	}
+
+	inline void set_default_state(lua_State* L, lua_CFunction panic_function = &default_at_panic,
+	     lua_CFunction traceback_function = c_call<decltype(&default_traceback_error_handler), &default_traceback_error_handler>,
+	     exception_handler_function exf = detail::default_exception_handler) {
+		lua_atpanic(L, panic_function);
+		protected_function::set_default_handler(object(L, in_place, traceback_function));
+		set_default_exception_handler(L, exf);
+		register_main_thread(L);
+		stack::luajit_exception_handler(L);
+		lua_value::set_lua_state(L);
+	}
+
+	inline std::size_t total_memory_used(lua_State* L) {
+		std::size_t kb = static_cast<std::size_t>(lua_gc(L, LUA_GCCOUNT, 0));
+		kb *= 1024;
+		kb += static_cast<std::size_t>(lua_gc(L, LUA_GCCOUNTB, 0));
+		return kb;
+	}
+
+	inline protected_function_result script_pass_on_error(lua_State*, protected_function_result result) {
+		return result;
+	}
+
+	inline protected_function_result script_throw_on_error(lua_State* L, protected_function_result result) {
+		type t = type_of(L, result.stack_index());
+		std::string err = "sol: ";
+		err += to_string(result.status());
+		err += " error";
+#if SOL_IS_ON(SOL_EXCEPTIONS)
+		std::exception_ptr eptr = std::current_exception();
+		if (eptr) {
+			err += " with a ";
+			try {
+				std::rethrow_exception(eptr);
+			}
+			catch (const std::exception& ex) {
+				err += "std::exception -- ";
+				err.append(ex.what());
+			}
+			catch (const std::string& message) {
+				err += "thrown message -- ";
+				err.append(message);
+			}
+			catch (const char* message) {
+				err += "thrown message -- ";
+				err.append(message);
+			}
+			catch (...) {
+				err.append("thrown but unknown type, cannot serialize into error message");
+			}
+		}
+#endif // serialize exception information if possible
+		if (t == type::string) {
+			err += ": ";
+			string_view serr = stack::unqualified_get<string_view>(L, result.stack_index());
+			err.append(serr.data(), serr.size());
+		}
+#if SOL_IS_ON(SOL_PRINT_ERRORS)
+		std::cerr << "[sol2] An error occurred and has been passed to an error handler: ";
+		std::cerr << err;
+		std::cerr << std::endl;
+#endif
+		// replacing information of stack error into pfr
+		int target = result.stack_index();
+		if (result.pop_count() > 0) {
+			stack::remove(L, target, result.pop_count());
+		}
+		stack::push(L, err);
+		int top = lua_gettop(L);
+		int towards = top - target;
+		if (towards != 0) {
+			lua_rotate(L, top, towards);
+		}
+#if SOL_IS_OFF(SOL_EXCEPTIONS)
+		return result;
+#else
+		// just throw our error
+		throw error(detail::direct_error, err);
+#endif // If exceptions are allowed
+	}
+
+	inline protected_function_result script_default_on_error(lua_State* L, protected_function_result pfr) {
+#if SOL_IS_ON(SOL_DEFAULT_PASS_ON_ERROR)
+		return script_pass_on_error(L, std::move(pfr));
+#else
+		return script_throw_on_error(L, std::move(pfr));
+#endif
+	}
+
+	namespace stack {
+		inline error get_traceback_or_errors(lua_State* L) {
+			int p = default_traceback_error_handler(L);
+			sol::error err = stack::get<sol::error>(L, -p);
+			lua_pop(L, p);
+			return err;
+		}
+	} // namespace stack
+} // namespace sol
+
+// end of sol/state_handling.hpp
+
+#include <memory>
+#include <cstddef>
+
+namespace sol {
+
+	class state_view {
+	private:
+		lua_State* L;
+		table reg;
+		global_table global;
+
+		optional<object> is_loaded_package(const std::string& key) {
+			auto loaded = reg.traverse_get<optional<object>>("_LOADED", key);
+			bool is53mod = loaded && !(loaded->is<bool>() && !loaded->as<bool>());
+			if (is53mod)
+				return loaded;
+#if SOL_LUA_VERSION_I_ <= 501
+			auto loaded51 = global.traverse_get<optional<object>>("package", "loaded", key);
+			bool is51mod = loaded51 && !(loaded51->is<bool>() && !loaded51->as<bool>());
+			if (is51mod)
+				return loaded51;
+#endif
+			return nullopt;
+		}
+
+		template <typename T>
+		void ensure_package(const std::string& key, T&& sr) {
+#if SOL_LUA_VERSION_I_ <= 501
+			auto pkg = global["package"];
+			if (!pkg.valid()) {
+				pkg = create_table_with("loaded", create_table_with(key, sr));
+			}
+			else {
+				auto ld = pkg["loaded"];
+				if (!ld.valid()) {
+					ld = create_table_with(key, sr);
+				}
+				else {
+					ld[key] = sr;
+				}
+			}
+#endif
+			auto loaded = reg["_LOADED"];
+			if (!loaded.valid()) {
+				loaded = create_table_with(key, sr);
+			}
+			else {
+				loaded[key] = sr;
+			}
+		}
+
+		template <typename Fx>
+		object require_core(const std::string& key, Fx&& action, bool create_global = true) {
+			optional<object> loaded = is_loaded_package(key);
+			if (loaded && loaded->valid())
+				return std::move(*loaded);
+			int before = lua_gettop(L);
+			action();
+			int after = lua_gettop(L);
+			if (before == after) {
+				// I mean, you were supposed to return
+				// something, ANYTHING, from your requires script. I guess I'll just
+				// but some trash in here, it's on you after that?
+				ensure_package(key, static_cast<void*>(L));
+				return object(L, lua_nil);
+			}
+			stack_reference sr(L, -1);
+			if (create_global)
+				set(key, sr);
+			ensure_package(key, sr);
+			return stack::pop<object>(L);
+		}
+
+	public:
+		using iterator = typename global_table::iterator;
+		using const_iterator = typename global_table::const_iterator;
+
+		state_view(lua_State* Ls) : L(Ls), reg(Ls, LUA_REGISTRYINDEX), global(Ls, global_tag) {
+		}
+
+		state_view(this_state Ls) : state_view(Ls.L) {
+		}
+
+		lua_State* lua_state() const {
+			return L;
+		}
+
+		template <typename... Args>
+		void open_libraries(Args&&... args) {
+			static_assert(meta::all_same<lib, meta::unqualified_t<Args>...>::value, "all types must be libraries");
+			if constexpr (sizeof...(args) == 0) {
+				luaL_openlibs(L);
+				return;
+			}
+			else {
+				lib libraries[1 + sizeof...(args)] = { lib::count, std::forward<Args>(args)... };
+
+				for (auto&& library : libraries) {
+					switch (library) {
+#if SOL_LUA_VERSION_I_ <= 501 && SOL_IS_ON(SOL_USE_LUAJIT)
+					case lib::coroutine:
+#endif // luajit opens coroutine base stuff
+					case lib::base:
+						luaL_requiref(L, "base", luaopen_base, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::package:
+						luaL_requiref(L, "package", luaopen_package, 1);
+						lua_pop(L, 1);
+						break;
+#if SOL_IS_OFF(SOL_USE_LUAJIT)
+					case lib::coroutine:
+#if SOL_LUA_VERSION_I_ > 501
+						luaL_requiref(L, "coroutine", luaopen_coroutine, 1);
+						lua_pop(L, 1);
+#endif // Lua 5.2+ only
+						break;
+#endif // Not LuaJIT - comes builtin
+					case lib::string:
+						luaL_requiref(L, "string", luaopen_string, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::table:
+						luaL_requiref(L, "table", luaopen_table, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::math:
+						luaL_requiref(L, "math", luaopen_math, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::bit32:
+#if SOL_IS_ON(SOL_USE_LUAJIT)
+						luaL_requiref(L, "bit32", luaopen_bit, 1);
+						lua_pop(L, 1);
+#elif SOL_IS_ON(SOL_LUA_BIT32_LIB)
+						luaL_requiref(L, "bit32", luaopen_bit32, 1);
+						lua_pop(L, 1);
+#else
+#endif
+						break;
+					case lib::io:
+						luaL_requiref(L, "io", luaopen_io, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::os:
+						luaL_requiref(L, "os", luaopen_os, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::debug:
+						luaL_requiref(L, "debug", luaopen_debug, 1);
+						lua_pop(L, 1);
+						break;
+					case lib::utf8:
+#if SOL_LUA_VERSION_I_ > 502 && SOL_IS_OFF(SOL_USE_LUAJIT)
+						luaL_requiref(L, "utf8", luaopen_utf8, 1);
+						lua_pop(L, 1);
+#endif // Lua 5.3+ only
+						break;
+					case lib::ffi:
+#if SOL_IS_ON(SOL_USE_LUAJIT) && SOL_IS_OFF(SOL_LUAJIT_FFI_DISABLED)
+						luaL_requiref(L, "ffi", luaopen_ffi, 1);
+						lua_pop(L, 1);
+#endif // LuaJIT only
+						break;
+					case lib::jit:
+#if SOL_IS_ON(SOL_USE_LUAJIT)
+						luaL_requiref(L, "jit", luaopen_jit, 0);
+						lua_pop(L, 1);
+#endif // LuaJIT Only
+						break;
+					case lib::count:
+					default:
+						break;
+					}
+				}
+			}
+		}
+
+		object require(const std::string& key, lua_CFunction open_function, bool create_global = true) {
+			luaL_requiref(L, key.c_str(), open_function, create_global ? 1 : 0);
+			return stack::pop<object>(L);
+		}
+
+		object require_script(const std::string& key, const string_view& code, bool create_global = true,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			auto action = [this, &code, &chunkname, &mode]() { stack::script(L, code, chunkname, mode); };
+			return require_core(key, action, create_global);
+		}
+
+		object require_file(const std::string& key, const std::string& filename, bool create_global = true, load_mode mode = load_mode::any) {
+			auto action = [this, &filename, &mode]() { stack::script_file(L, filename, mode); };
+			return require_core(key, action, create_global);
+		}
+
+		void clear_package_loaders() {
+			optional<table> maybe_package = this->global["package"];
+			if (!maybe_package) {
+				// package lib wasn't opened
+				// open package lib
+				return;
+			}
+			table& package = *maybe_package;
+			// yay for version differences...
+			// one day Lua 5.1 will die a peaceful death
+			// and its old bones will find blissful rest
+			auto loaders_proxy = package
+#if SOL_LUA_VERSION_I_ < 502
+			     ["loaders"]
+#else
+			     ["searchers"]
+#endif
+			     ;
+			if (!loaders_proxy.valid()) {
+				// nothing to clear
+				return;
+			}
+			// we need to create the table for loaders
+			// table does not exist, so create and move forward
+			loaders_proxy = new_table(1, 0);
+		}
+
+		template <typename Fx>
+		void add_package_loader(Fx&& fx, bool clear_all_package_loaders = false) {
+			optional<table> maybe_package = this->global["package"];
+			if (!maybe_package) {
+				// package lib wasn't opened
+				// open package lib
+				return;
+			}
+			table& package = *maybe_package;
+			// yay for version differences...
+			// one day Lua 5.1 will die a peaceful death
+			// and its old bones will find blissful rest
+			auto loaders_proxy = package
+#if SOL_LUA_VERSION_I_ < 502
+			     ["loaders"]
+#else
+			     ["searchers"]
+#endif
+			     ;
+			bool make_new_table = clear_all_package_loaders || !loaders_proxy.valid();
+			if (make_new_table) {
+				// we need to create the table for loaders
+				// table does not exist, so create and move forward
+				loaders_proxy = new_table(1, 0);
+			}
+			optional<table> maybe_loaders = loaders_proxy;
+			if (!maybe_loaders) {
+				// loaders/searches
+				// thing exists in package, but it
+				// ain't a table or a table-alike...!
+				return;
+			}
+			table loaders = loaders_proxy;
+			loaders.add(std::forward<Fx>(fx));
+		}
+
+		template <typename E>
+		protected_function_result do_reader(lua_Reader reader, void* data, const basic_environment<E>& env,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
+			load_status x = static_cast<load_status>(lua_load(L, reader, data, chunknametarget, to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			set_environment(env, pf);
+			return pf();
+		}
+
+		protected_function_result do_reader(
+		     lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
+			load_status x = static_cast<load_status>(lua_load(L, reader, data, chunknametarget, to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			return pf();
+		}
+
+		template <typename E>
+		protected_function_result do_string(const string_view& code, const basic_environment<E>& env,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
+			load_status x = static_cast<load_status>(luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			set_environment(env, pf);
+			return pf();
+		}
+
+		protected_function_result do_string(
+		     const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
+			load_status x = static_cast<load_status>(luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			return pf();
+		}
+
+		template <typename E>
+		protected_function_result do_file(const std::string& filename, const basic_environment<E>& env, load_mode mode = load_mode::any) {
+			load_status x = static_cast<load_status>(luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			set_environment(env, pf);
+			return pf();
+		}
+
+		protected_function_result do_file(const std::string& filename, load_mode mode = load_mode::any) {
+			load_status x = static_cast<load_status>(luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str()));
+			if (x != load_status::ok) {
+				return protected_function_result(L, absolute_index(L, -1), 0, 1, static_cast<call_status>(x));
+			}
+			stack_aligned_protected_function pf(L, -1);
+			return pf();
+		}
+
+		template <typename Fx,
+		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
+		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
+		protected_function_result safe_script(
+		     lua_Reader reader, void* data, Fx&& on_error, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			protected_function_result pfr = do_reader(reader, data, chunkname, mode);
+			if (!pfr.valid()) {
+				return on_error(L, std::move(pfr));
+			}
+			return pfr;
+		}
+
+		protected_function_result safe_script(
+		     lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(reader, data, script_default_on_error, chunkname, mode);
+		}
+
+		template <typename Fx,
+		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
+		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
+		protected_function_result safe_script(
+		     const string_view& code, Fx&& on_error, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			protected_function_result pfr = do_string(code, chunkname, mode);
+			if (!pfr.valid()) {
+				return on_error(L, std::move(pfr));
+			}
+			return pfr;
+		}
+
+		template <typename Fx, typename E>
+		protected_function_result safe_script(const string_view& code, const basic_environment<E>& env, Fx&& on_error,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			protected_function_result pfr = do_string(code, env, chunkname, mode);
+			if (!pfr.valid()) {
+				return on_error(L, std::move(pfr));
+			}
+			return pfr;
+		}
+
+		template <typename E>
+		protected_function_result safe_script(const string_view& code, const basic_environment<E>& env,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, env, script_default_on_error, chunkname, mode);
+		}
+
+		protected_function_result safe_script(
+		     const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, script_default_on_error, chunkname, mode);
+		}
+
+		template <typename Fx,
+		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
+		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
+		protected_function_result safe_script_file(const std::string& filename, Fx&& on_error, load_mode mode = load_mode::any) {
+			protected_function_result pfr = do_file(filename, mode);
+			if (!pfr.valid()) {
+				return on_error(L, std::move(pfr));
+			}
+			return pfr;
+		}
+
+		template <typename Fx, typename E>
+		protected_function_result safe_script_file(
+		     const std::string& filename, const basic_environment<E>& env, Fx&& on_error, load_mode mode = load_mode::any) {
+			protected_function_result pfr = do_file(filename, env, mode);
+			if (!pfr.valid()) {
+				return on_error(L, std::move(pfr));
+			}
+			return pfr;
+		}
+
+		template <typename E>
+		protected_function_result safe_script_file(const std::string& filename, const basic_environment<E>& env, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, env, script_default_on_error, mode);
+		}
+
+		protected_function_result safe_script_file(const std::string& filename, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, script_default_on_error, mode);
+		}
+
+		template <typename E>
+		unsafe_function_result unsafe_script(lua_Reader reader, void* data, const basic_environment<E>& env,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
+			int index = lua_gettop(L);
+			if (lua_load(L, reader, data, chunknametarget, to_string(mode).c_str())) {
+				lua_error(L);
+			}
+			set_environment(env, stack_reference(L, raw_index(index + 1)));
+			if (lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		unsafe_function_result unsafe_script(
+		     lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			int index = lua_gettop(L);
+			stack::script(L, reader, data, chunkname, mode);
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		template <typename E>
+		unsafe_function_result unsafe_script(const string_view& code, const basic_environment<E>& env,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
+			int index = lua_gettop(L);
+			if (luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str())) {
+				lua_error(L);
+			}
+			set_environment(env, stack_reference(L, raw_index(index + 1)));
+			if (lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		unsafe_function_result unsafe_script(
+		     const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			int index = lua_gettop(L);
+			stack::script(L, code, chunkname, mode);
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		template <typename E>
+		unsafe_function_result unsafe_script_file(const std::string& filename, const basic_environment<E>& env, load_mode mode = load_mode::any) {
+			int index = lua_gettop(L);
+			if (luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str())) {
+				lua_error(L);
+			}
+			set_environment(env, stack_reference(L, raw_index(index + 1)));
+			if (lua_pcall(L, 0, LUA_MULTRET, 0)) {
+				lua_error(L);
+			}
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		unsafe_function_result unsafe_script_file(const std::string& filename, load_mode mode = load_mode::any) {
+			int index = lua_gettop(L);
+			stack::script_file(L, filename, mode);
+			int postindex = lua_gettop(L);
+			int returns = postindex - index;
+			return unsafe_function_result(L, (std::max)(postindex - (returns - 1), 1), returns);
+		}
+
+		template <typename Fx,
+		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
+		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
+		protected_function_result script(
+		     const string_view& code, Fx&& on_error, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, std::forward<Fx>(on_error), chunkname, mode);
+		}
+
+		template <typename Fx,
+		     meta::disable_any<meta::is_string_constructible<meta::unqualified_t<Fx>>,
+		          meta::is_specialization_of<meta::unqualified_t<Fx>, basic_environment>> = meta::enabler>
+		protected_function_result script_file(const std::string& filename, Fx&& on_error, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, std::forward<Fx>(on_error), mode);
+		}
+
+		template <typename Fx, typename E>
+		protected_function_result script(const string_view& code, const basic_environment<E>& env, Fx&& on_error,
+		     const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, env, std::forward<Fx>(on_error), chunkname, mode);
+		}
+
+		template <typename Fx, typename E>
+		protected_function_result script_file(const std::string& filename, const basic_environment<E>& env, Fx&& on_error, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, env, std::forward<Fx>(on_error), mode);
+		}
+
+		protected_function_result script(
+		     const string_view& code, const environment& env, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, env, script_default_on_error, chunkname, mode);
+		}
+
+		protected_function_result script_file(const std::string& filename, const environment& env, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, env, script_default_on_error, mode);
+		}
+
+#if SOL_IS_ON(SOL_SAFE_FUNCTION_OBJECTS)
+		protected_function_result script(
+		     lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(reader, data, chunkname, mode);
+		}
+
+		protected_function_result script(
+		     const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return safe_script(code, chunkname, mode);
+		}
+
+		protected_function_result script_file(const std::string& filename, load_mode mode = load_mode::any) {
+			return safe_script_file(filename, mode);
+		}
+#else
+		unsafe_function_result script(const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return unsafe_script(code, chunkname, mode);
+		}
+
+		unsafe_function_result script_file(const std::string& filename, load_mode mode = load_mode::any) {
+			return unsafe_script_file(filename, mode);
+		}
+#endif
+		load_result load(const string_view& code, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name(code, chunkname, basechunkname);
+			load_status x = static_cast<load_status>(luaL_loadbufferx(L, code.data(), code.size(), chunknametarget, to_string(mode).c_str()));
+			return load_result(L, absolute_index(L, -1), 1, 1, x);
+		}
+
+		load_result load_buffer(const char* buff, size_t size, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return load(string_view(buff, size), chunkname, mode);
+		}
+
+		load_result load_buffer(
+		     const std::byte* buff, size_t size, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			return load(string_view(reinterpret_cast<const char*>(buff), size), chunkname, mode);
+		}
+
+		load_result load_file(const std::string& filename, load_mode mode = load_mode::any) {
+			load_status x = static_cast<load_status>(luaL_loadfilex(L, filename.c_str(), to_string(mode).c_str()));
+			return load_result(L, absolute_index(L, -1), 1, 1, x);
+		}
+
+		load_result load(lua_Reader reader, void* data, const std::string& chunkname = detail::default_chunk_name(), load_mode mode = load_mode::any) {
+			detail::typical_chunk_name_t basechunkname = {};
+			const char* chunknametarget = detail::make_chunk_name("lua_Reader", chunkname, basechunkname);
+			load_status x = static_cast<load_status>(lua_load(L, reader, data, chunknametarget, to_string(mode).c_str()));
+			return load_result(L, absolute_index(L, -1), 1, 1, x);
+		}
+
+		iterator begin() const {
+			return global.begin();
+		}
+
+		iterator end() const {
+			return global.end();
+		}
+
+		const_iterator cbegin() const {
+			return global.cbegin();
+		}
+
+		const_iterator cend() const {
+			return global.cend();
+		}
+
+		global_table globals() const {
+			// if we return a reference
+			// we'll be screwed a bit
+			return global;
+		}
+
+		global_table& globals() {
+			return global;
+		}
+
+		table registry() const {
+			return reg;
+		}
+
+		std::size_t memory_used() const {
+			return total_memory_used(lua_state());
+		}
+
+		int stack_top() const {
+			return stack::top(L);
+		}
+
+		int stack_clear() {
+			int s = stack_top();
+			lua_pop(L, s);
+			return s;
+		}
+
+		bool supports_gc_mode(gc_mode mode) const noexcept {
+#if SOL_LUA_VERSION_I_ >= 504
+			// supports all modes
+			(void)mode;
+			return true;
+#endif
+			return mode == gc_mode::default_value;
+		}
+
+		bool is_gc_on() const {
+#if SOL_LUA_VERSION_I_ >= 502
+			return lua_gc(lua_state(), LUA_GCISRUNNING, 0) == 1;
+#else
+			// You cannot turn it off in Lua 5.1
+			return true;
+#endif
+		}
+
+		void collect_garbage() {
+			lua_gc(lua_state(), LUA_GCCOLLECT, 0);
+		}
+
+		void collect_gc() {
+			collect_garbage();
+		}
+
+		bool step_gc(int step_size_kilobytes) {
+			// THOUGHT: std::chrono-alikes to map "kilobyte size" here...?
+			// Make it harder to give MB or KB to a B parameter...?
+			// Probably overkill for now.
+#if SOL_LUA_VERSION_I_ >= 504
+			// The manual implies that this function is almost always successful...
+			// is it?? It could depend on the GC mode...
+			return lua_gc(lua_state(), LUA_GCSTEP, step_size_kilobytes) != 0;
+#else
+			return lua_gc(lua_state(), LUA_GCSTEP, step_size_kilobytes) == 1;
+#endif
+		}
+
+		void restart_gc() {
+			lua_gc(lua_state(), LUA_GCRESTART, 0);
+		}
+
+		void stop_gc() {
+			lua_gc(lua_state(), LUA_GCSTOP, 0);
+		}
+
+		// Returns the old GC mode. Check support using the supports_gc_mode function.
+		gc_mode change_gc_mode_incremental(int pause, int step_multiplier, int step_byte_size) {
+			// "What the fuck does any of this mean??"
+			// http://www.lua.org/manual/5.4/manual.html#2.5.1
+
+			// THOUGHT: std::chrono-alikes to map "byte size" here...?
+			// Make it harder to give MB or KB to a B parameter...?
+			// Probably overkill for now.
+#if SOL_LUA_VERSION_I_ >= 504
+			int old_mode = lua_gc(lua_state(), LUA_GCINC, pause, step_multiplier, step_byte_size);
+			if (old_mode == LUA_GCGEN) {
+				return gc_mode::generational;
+			}
+			else if (old_mode == LUA_GCINC) {
+				return gc_mode::incremental;
+			}
+#else
+			lua_gc(lua_state(), LUA_GCSETPAUSE, pause);
+			lua_gc(lua_state(), LUA_GCSETSTEPMUL, step_multiplier);
+			(void)step_byte_size; // means nothing in older versions
+#endif
+			return gc_mode::default_value;
+		}
+
+		// Returns the old GC mode. Check support using the supports_gc_mode function.
+		gc_mode change_gc_mode_generational(int minor_multiplier, int major_multiplier) {
+#if SOL_LUA_VERSION_I_ >= 504
+			// "What does this shit mean?"
+			// http://www.lua.org/manual/5.4/manual.html#2.5.2
+			int old_mode = lua_gc(lua_state(), LUA_GCGEN, minor_multiplier, major_multiplier);
+			if (old_mode == LUA_GCGEN) {
+				return gc_mode::generational;
+			}
+			else if (old_mode == LUA_GCINC) {
+				return gc_mode::incremental;
+			}
+#else
+			(void)minor_multiplier;
+			(void)major_multiplier;
+#endif
+			return gc_mode::default_value;
+		}
+
+		operator lua_State*() const {
+			return lua_state();
+		}
+
+		void set_panic(lua_CFunction panic) {
+			lua_atpanic(lua_state(), panic);
+		}
+
+		void set_exception_handler(exception_handler_function handler) {
+			set_default_exception_handler(lua_state(), handler);
+		}
+
+		template <typename... Args, typename... Keys>
+		decltype(auto) get(Keys&&... keys) const {
+			return global.get<Args...>(std::forward<Keys>(keys)...);
+		}
+
+		template <typename T, typename Key>
+		decltype(auto) get_or(Key&& key, T&& otherwise) const {
+			return global.get_or(std::forward<Key>(key), std::forward<T>(otherwise));
+		}
+
+		template <typename T, typename Key, typename D>
+		decltype(auto) get_or(Key&& key, D&& otherwise) const {
+			return global.get_or<T>(std::forward<Key>(key), std::forward<D>(otherwise));
+		}
+
+		template <typename... Args>
+		state_view& set(Args&&... args) {
+			global.set(std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename T, typename... Keys>
+		decltype(auto) traverse_get(Keys&&... keys) const {
+			return global.traverse_get<T>(std::forward<Keys>(keys)...);
+		}
+
+		template <typename... Args>
+		state_view& traverse_set(Args&&... args) {
+			global.traverse_set(std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename Class, typename... Args>
+		usertype<Class> new_usertype(Args&&... args) {
+			return global.new_usertype<Class>(std::forward<Args>(args)...);
+		}
+
+		template <bool read_only = true, typename... Args>
+		state_view& new_enum(const string_view& name, Args&&... args) {
+			global.new_enum<read_only>(name, std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename T, bool read_only = true>
+		state_view& new_enum(const string_view& name, std::initializer_list<std::pair<string_view, T>> items) {
+			global.new_enum<T, read_only>(name, std::move(items));
+			return *this;
+		}
+
+		template <typename Fx>
+		void for_each(Fx&& fx) {
+			global.for_each(std::forward<Fx>(fx));
+		}
+
+		template <typename T>
+		table_proxy<global_table&, detail::proxy_key_t<T>> operator[](T&& key) {
+			return global[std::forward<T>(key)];
+		}
+
+		template <typename T>
+		table_proxy<const global_table&, detail::proxy_key_t<T>> operator[](T&& key) const {
+			return global[std::forward<T>(key)];
+		}
+
+		template <typename Sig, typename... Args, typename Key>
+		state_view& set_function(Key&& key, Args&&... args) {
+			global.set_function<Sig>(std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename... Args, typename Key>
+		state_view& set_function(Key&& key, Args&&... args) {
+			global.set_function(std::forward<Key>(key), std::forward<Args>(args)...);
+			return *this;
+		}
+
+		template <typename Name>
+		table create_table(Name&& name, int narr = 0, int nrec = 0) {
+			return global.create(std::forward<Name>(name), narr, nrec);
+		}
+
+		template <typename Name, typename Key, typename Value, typename... Args>
+		table create_table(Name&& name, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			return global.create(std::forward<Name>(name), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+		}
+
+		template <typename Name, typename... Args>
+		table create_named_table(Name&& name, Args&&... args) {
+			table x = global.create_with(std::forward<Args>(args)...);
+			global.set(std::forward<Name>(name), x);
+			return x;
+		}
+
+		table create_table(int narr = 0, int nrec = 0) {
+			return create_table(lua_state(), narr, nrec);
+		}
+
+		template <typename Key, typename Value, typename... Args>
+		table create_table(int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			return create_table(lua_state(), narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+		}
+
+		template <typename... Args>
+		table create_table_with(Args&&... args) {
+			return create_table_with(lua_state(), std::forward<Args>(args)...);
+		}
+
+		static inline table create_table(lua_State* L, int narr = 0, int nrec = 0) {
+			return global_table::create(L, narr, nrec);
+		}
+
+		template <typename Key, typename Value, typename... Args>
+		static inline table create_table(lua_State* L, int narr, int nrec, Key&& key, Value&& value, Args&&... args) {
+			return global_table::create(L, narr, nrec, std::forward<Key>(key), std::forward<Value>(value), std::forward<Args>(args)...);
+		}
+
+		template <typename... Args>
+		static inline table create_table_with(lua_State* L, Args&&... args) {
+			return global_table::create_with(L, std::forward<Args>(args)...);
+		}
+	};
+} // namespace sol
+
+// end of sol/state_view.hpp
+
+// beginning of sol/thread.hpp
+
+namespace sol {
+	struct lua_thread_state {
+		lua_State* L;
+
+		lua_thread_state(lua_State* Ls) : L(Ls) {
+		}
+
+		lua_State* lua_state() const noexcept {
+			return L;
+		}
+		operator lua_State*() const noexcept {
+			return lua_state();
+		}
+		lua_State* operator->() const noexcept {
+			return lua_state();
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_pusher<lua_thread_state> {
+			int push(lua_State*, lua_thread_state lts) {
+				lua_pushthread(lts.L);
+				return 1;
+			}
+		};
+
+		template <>
+		struct unqualified_getter<lua_thread_state> {
+			lua_thread_state get(lua_State* L, int index, record& tracking) {
+				tracking.use(1);
+				lua_thread_state lts(lua_tothread(L, index));
+				return lts;
+			}
+		};
+
+		template <>
+		struct unqualified_check_getter<lua_thread_state> {
+			template <typename Handler>
+			optional<lua_thread_state> get(lua_State* L, int index, Handler&& handler, record& tracking) {
+				lua_thread_state lts(lua_tothread(L, index));
+				if (lts.lua_state() == nullptr) {
+					handler(L, index, type::thread, type_of(L, index), "value is not a valid thread type");
+					return nullopt;
+				}
+				tracking.use(1);
+				return lts;
+			}
+		};
+	} // namespace stack
+
+	template <typename ref_t>
+	class basic_thread : public basic_object<ref_t> {
+	private:
+		using base_t = basic_object<ref_t>;
+
+	public:
+		using base_t::lua_state;
+
+		basic_thread() noexcept = default;
+		basic_thread(const basic_thread&) = default;
+		basic_thread(basic_thread&&) = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_thread>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_thread(T&& r) : base_t(std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_thread>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_thread(const stack_reference& r) : basic_thread(r.lua_state(), r.stack_index()) {};
+		basic_thread(stack_reference&& r) : basic_thread(r.lua_state(), r.stack_index()) {};
+		basic_thread& operator=(const basic_thread&) = default;
+		basic_thread& operator=(basic_thread&&) = default;
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_thread(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_thread>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_thread(lua_State* L, int index = -1) : base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_thread>(L, index, handler);
+#endif // Safety
+		}
+		basic_thread(lua_State* L, ref_index index) : base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_thread>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_thread(lua_State* L, lua_State* actualthread) : basic_thread(L, lua_thread_state { actualthread }) {
+		}
+		basic_thread(lua_State* L, this_state actualthread) : basic_thread(L, lua_thread_state { actualthread.L }) {
+		}
+		basic_thread(lua_State* L, lua_thread_state actualthread) : base_t(L, -stack::push(L, actualthread)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_thread>(lua_state(), -1, handler);
+#endif // Safety
+			if (!is_stack_based<base_t>::value) {
+				lua_pop(lua_state(), 1);
+			}
+		}
+
+		state_view state() const {
+			return state_view(this->thread_state());
+		}
+
+		bool is_main_thread() const {
+			return stack::is_main_thread(this->thread_state());
+		}
+
+		lua_State* thread_state() const {
+			auto pp = stack::push_pop(*this);
+			lua_State* lthread = lua_tothread(lua_state(), -1);
+			return lthread;
+		}
+
+		thread_status status() const {
+			lua_State* lthread = thread_state();
+			auto lstat = static_cast<thread_status>(lua_status(lthread));
+			if (lstat == thread_status::ok) {
+				lua_Debug ar;
+				if (lua_getstack(lthread, 0, &ar) > 0)
+					return thread_status::ok;
+				else if (lua_gettop(lthread) == 0)
+					return thread_status::dead;
+				else
+					return thread_status::yielded;
+			}
+			return lstat;
+		}
+
+		basic_thread create() {
+			return create(lua_state());
+		}
+
+		static basic_thread create(lua_State* L) {
+			lua_newthread(L);
+			basic_thread result(L);
+			if (!is_stack_based<base_t>::value) {
+				lua_pop(L, 1);
+			}
+			return result;
+		}
+	};
+
+	typedef basic_thread<reference> thread;
+	typedef basic_thread<stack_reference> stack_thread;
+} // namespace sol
+
+// end of sol/thread.hpp
+
+namespace sol {
+
+	class state : private std::unique_ptr<lua_State, detail::state_deleter>, public state_view {
+	private:
+		typedef std::unique_ptr<lua_State, detail::state_deleter> unique_base;
+
+	public:
+		state(lua_CFunction panic = default_at_panic) : unique_base(luaL_newstate()), state_view(unique_base::get()) {
+			set_default_state(unique_base::get(), panic);
+		}
+
+		state(lua_CFunction panic, lua_Alloc alfunc, void* alpointer = nullptr)
+		: unique_base(lua_newstate(alfunc, alpointer)), state_view(unique_base::get()) {
+			set_default_state(unique_base::get(), panic);
+		}
+
+		state(const state&) = delete;
+		state(state&&) = default;
+		state& operator=(const state&) = delete;
+		state& operator=(state&& that) {
+			state_view::operator=(std::move(that));
+			unique_base::operator=(std::move(that));
+			return *this;
+		}
+
+		using state_view::get;
+
+		~state() {
+		}
+	};
+} // namespace sol
+
+// end of sol/state.hpp
+
+// beginning of sol/coroutine.hpp
+
+namespace sol {
+	template <typename Reference>
+	class basic_coroutine : public basic_object<Reference> {
+	private:
+		using base_t = basic_object<Reference>;
+		using handler_t = reference;
+
+	private:
+		call_status stats = call_status::yielded;
+
+		void luacall(std::ptrdiff_t argcount, std::ptrdiff_t) {
+#if SOL_LUA_VERSION_I_ >= 504
+			int nresults;
+			stats = static_cast<call_status>(lua_resume(lua_state(), nullptr, static_cast<int>(argcount), &nresults));
+#else
+			stats = static_cast<call_status>(lua_resume(lua_state(), nullptr, static_cast<int>(argcount)));
+#endif
+		}
+
+		template <std::size_t... I, typename... Ret>
+		auto invoke(types<Ret...>, std::index_sequence<I...>, std::ptrdiff_t n) {
+			luacall(n, sizeof...(Ret));
+			return stack::pop<std::tuple<Ret...>>(lua_state());
+		}
+
+		template <std::size_t I, typename Ret>
+		Ret invoke(types<Ret>, std::index_sequence<I>, std::ptrdiff_t n) {
+			luacall(n, 1);
+			return stack::pop<Ret>(lua_state());
+		}
+
+		template <std::size_t I>
+		void invoke(types<void>, std::index_sequence<I>, std::ptrdiff_t n) {
+			luacall(n, 0);
+		}
+
+		protected_function_result invoke(types<>, std::index_sequence<>, std::ptrdiff_t n) {
+			int firstreturn = 1;
+			luacall(n, LUA_MULTRET);
+			int poststacksize = lua_gettop(this->lua_state());
+			int returncount = poststacksize - (firstreturn - 1);
+			if (error()) {
+				if (m_error_handler.valid()) {
+					string_view err = stack::get<string_view>(this->lua_state(), poststacksize);
+					m_error_handler.push();
+					stack::push(this->lua_state(), err);
+					lua_call(lua_state(), 1, 1);
+				}
+				return protected_function_result(this->lua_state(), lua_absindex(this->lua_state(), -1), 1, returncount, status());
+			}
+			return protected_function_result(this->lua_state(), firstreturn, returncount, returncount, status());
+		}
+
+	public:
+		using base_t::lua_state;
+
+		basic_coroutine() = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_coroutine>>,
+		          meta::neg<std::is_base_of<proxy_base_tag, meta::unqualified_t<T>>>, meta::neg<std::is_same<base_t, stack_reference>>,
+		          meta::neg<std::is_same<lua_nil_t, meta::unqualified_t<T>>>, is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_coroutine(T&& r) noexcept
+		: base_t(std::forward<T>(r)), m_error_handler(detail::get_default_handler<reference, is_main_threaded<base_t>::value>(r.lua_state())) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			if (!is_function<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				constructor_handler handler {};
+				stack::check<basic_coroutine>(lua_state(), -1, handler);
+			}
+#endif // Safety
+		}
+
+		basic_coroutine(const basic_coroutine& other) = default;
+		basic_coroutine& operator=(const basic_coroutine&) = default;
+
+		basic_coroutine(basic_coroutine&& other) noexcept : base_t(std::move(other)), m_error_handler(this->lua_state(), std::move(other.m_error_handler)) {
+		}
+
+		basic_coroutine& operator=(basic_coroutine&& other) noexcept {
+			base_t::operator=(std::move(other));
+			// must change the state, since it could change on the coroutine type
+			m_error_handler = handler_t(this->lua_state(), std::move(other.m_error_handler));
+			return *this;
+		}
+
+		basic_coroutine(const basic_function<base_t>& b) noexcept
+		: basic_coroutine(b, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(b.lua_state())) {
+		}
+		basic_coroutine(basic_function<base_t>&& b) noexcept
+		: basic_coroutine(std::move(b), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(b.lua_state())) {
+		}
+		basic_coroutine(const basic_function<base_t>& b, handler_t eh) noexcept : base_t(b), m_error_handler(std::move(eh)) {
+		}
+		basic_coroutine(basic_function<base_t>&& b, handler_t eh) noexcept : base_t(std::move(b)), m_error_handler(std::move(eh)) {
+		}
+		basic_coroutine(const stack_reference& r) noexcept
+		: basic_coroutine(r.lua_state(), r.stack_index(), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(r.lua_state())) {
+		}
+		basic_coroutine(stack_reference&& r) noexcept
+		: basic_coroutine(r.lua_state(), r.stack_index(), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(r.lua_state())) {
+		}
+		basic_coroutine(const stack_reference& r, handler_t eh) noexcept : basic_coroutine(r.lua_state(), r.stack_index(), std::move(eh)) {
+		}
+		basic_coroutine(stack_reference&& r, handler_t eh) noexcept : basic_coroutine(r.lua_state(), r.stack_index(), std::move(eh)) {
+		}
+
+		template <typename Super>
+		basic_coroutine(const proxy_base<Super>& p)
+		: basic_coroutine(p, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(p.lua_state())) {
+		}
+		template <typename Super>
+		basic_coroutine(proxy_base<Super>&& p)
+		: basic_coroutine(std::move(p), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(p.lua_state())) {
+		}
+		template <typename Proxy, typename HandlerReference,
+		     meta::enable<std::is_base_of<proxy_base_tag, meta::unqualified_t<Proxy>>,
+		          meta::neg<is_lua_index<meta::unqualified_t<HandlerReference>>>> = meta::enabler>
+		basic_coroutine(Proxy&& p, HandlerReference&& eh) : basic_coroutine(detail::force_cast<base_t>(p), std::forward<HandlerReference>(eh)) {
+		}
+
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_coroutine(lua_State* L, T&& r) noexcept
+		: basic_coroutine(L, std::forward<T>(r), detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_coroutine(lua_State* L, T&& r, handler_t eh) : base_t(L, std::forward<T>(r)), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_coroutine>(lua_state(), -1, handler);
+#endif // Safety
+		}
+
+		basic_coroutine(lua_nil_t n) : base_t(n), m_error_handler(n) {
+		}
+
+		basic_coroutine(lua_State* L, int index = -1)
+		: basic_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		basic_coroutine(lua_State* L, int index, handler_t eh) : base_t(L, index), m_error_handler(std::move(eh)) {
+#ifdef SOL_SAFE_REFERENCES
+			constructor_handler handler {};
+			stack::check<basic_coroutine>(L, index, handler);
+#endif // Safety
+		}
+		basic_coroutine(lua_State* L, absolute_index index)
+		: basic_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		basic_coroutine(lua_State* L, absolute_index index, handler_t eh) : base_t(L, index), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_coroutine>(L, index, handler);
+#endif // Safety
+		}
+		basic_coroutine(lua_State* L, raw_index index)
+		: basic_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		basic_coroutine(lua_State* L, raw_index index, handler_t eh) : base_t(L, index), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_coroutine>(L, index, handler);
+#endif // Safety
+		}
+		basic_coroutine(lua_State* L, ref_index index)
+		: basic_coroutine(L, index, detail::get_default_handler<reference, is_main_threaded<base_t>::value>(L)) {
+		}
+		basic_coroutine(lua_State* L, ref_index index, handler_t eh) : base_t(L, index), m_error_handler(std::move(eh)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_coroutine>(lua_state(), -1, handler);
+#endif // Safety
+		}
+
+		call_status status() const noexcept {
+			return stats;
+		}
+
+		bool error() const noexcept {
+			call_status cs = status();
+			return cs != call_status::ok && cs != call_status::yielded;
+		}
+
+		bool runnable() const noexcept {
+			return base_t::valid() && (status() == call_status::yielded);
+		}
+
+		explicit operator bool() const noexcept {
+			return runnable();
+		}
+
+		template <typename... Args>
+		protected_function_result operator()(Args&&... args) {
+			return call<>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) operator()(types<Ret...>, Args&&... args) {
+			return call<Ret...>(std::forward<Args>(args)...);
+		}
+
+		template <typename... Ret, typename... Args>
+		decltype(auto) call(Args&&... args) {
+			// some users screw up coroutine.create
+			// and try to use it with sol::coroutine without ever calling the first resume in Lua
+			// this makes the stack incompatible with other kinds of stacks: protect against this
+			// make sure coroutines don't screw us over
+			base_t::push();
+			int pushcount = stack::multi_push_reference(lua_state(), std::forward<Args>(args)...);
+			return invoke(types<Ret...>(), std::make_index_sequence<sizeof...(Ret)>(), pushcount);
+		}
+
+	private:
+		handler_t m_error_handler;
+	};
+} // namespace sol
+
+// end of sol/coroutine.hpp
+
+// beginning of sol/userdata.hpp
+
+namespace sol {
+	template <typename base_type>
+	class basic_userdata : public basic_table<base_type> {
+	private:
+		using base_t = basic_table<base_type>;
+
+	public:
+		using base_t::lua_state;
+
+		basic_userdata() noexcept = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_userdata>>, meta::neg<std::is_same<base_t, stack_reference>>,
+		          is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_userdata(T&& r) noexcept : base_t(std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			if (!is_userdata<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				type_assert(lua_state(), -1, type::userdata);
+			}
+#endif // Safety
+		}
+		basic_userdata(const basic_userdata&) = default;
+		basic_userdata(basic_userdata&&) = default;
+		basic_userdata& operator=(const basic_userdata&) = default;
+		basic_userdata& operator=(basic_userdata&&) = default;
+		basic_userdata(const stack_reference& r) : basic_userdata(r.lua_state(), r.stack_index()) {
+		}
+		basic_userdata(stack_reference&& r) : basic_userdata(r.lua_state(), r.stack_index()) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_userdata(lua_State* L, T&& r) : base_t(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_userdata>(L, -1, handler);
+#endif // Safety
+		}
+		basic_userdata(lua_State* L, int index = -1) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_userdata>(L, index, handler);
+#endif // Safety
+		}
+		basic_userdata(lua_State* L, ref_index index) : base_t(detail::no_safety, L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_userdata>(L, -1, handler);
+#endif // Safety
+		}
+	};
+
+	template <typename base_type>
+	class basic_lightuserdata : public basic_object_base<base_type> {
+		typedef basic_object_base<base_type> base_t;
+
+	public:
+		using base_t::lua_state;
+
+		basic_lightuserdata() noexcept = default;
+		template <typename T,
+		     meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_lightuserdata>>, meta::neg<std::is_same<base_t, stack_reference>>,
+		          is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_lightuserdata(T&& r) noexcept : base_t(std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			if (!is_lightuserdata<meta::unqualified_t<T>>::value) {
+				auto pp = stack::push_pop(*this);
+				type_assert(lua_state(), -1, type::lightuserdata);
+			}
+#endif // Safety
+		}
+		basic_lightuserdata(const basic_lightuserdata&) = default;
+		basic_lightuserdata(basic_lightuserdata&&) = default;
+		basic_lightuserdata& operator=(const basic_lightuserdata&) = default;
+		basic_lightuserdata& operator=(basic_lightuserdata&&) = default;
+		basic_lightuserdata(const stack_reference& r) : basic_lightuserdata(r.lua_state(), r.stack_index()) {
+		}
+		basic_lightuserdata(stack_reference&& r) : basic_lightuserdata(r.lua_state(), r.stack_index()) {
+		}
+		template <typename T, meta::enable<is_lua_reference<meta::unqualified_t<T>>> = meta::enabler>
+		basic_lightuserdata(lua_State* L, T&& r) : basic_lightuserdata(L, std::forward<T>(r)) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_lightuserdata>(lua_state(), -1, handler);
+#endif // Safety
+		}
+		basic_lightuserdata(lua_State* L, int index = -1) : base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			constructor_handler handler {};
+			stack::check<basic_lightuserdata>(L, index, handler);
+#endif // Safety
+		}
+		basic_lightuserdata(lua_State* L, ref_index index) : base_t(L, index) {
+#if SOL_IS_ON(SOL_SAFE_REFERENCES)
+			auto pp = stack::push_pop(*this);
+			constructor_handler handler {};
+			stack::check<basic_lightuserdata>(lua_state(), index, handler);
+#endif // Safety
+		}
+	};
+
+} // namespace sol
+
+// end of sol/userdata.hpp
+
+// beginning of sol/as_args.hpp
+
+namespace sol {
+	template <typename T>
+	struct as_args_t {
+		T src;
+	};
+
+	template <typename Source>
+	auto as_args(Source&& source) {
+		return as_args_t<Source> { std::forward<Source>(source) };
+	}
+
+	namespace stack {
+		template <typename T>
+		struct unqualified_pusher<as_args_t<T>> {
+			int push(lua_State* L, const as_args_t<T>& e) {
+				int p = 0;
+				for (const auto& i : e.src) {
+					p += stack::push(L, i);
+				}
+				return p;
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/as_args.hpp
+
+// beginning of sol/variadic_args.hpp
+
+#include <limits>
+#include <iterator>
+
+namespace sol {
+	struct variadic_args {
+	private:
+		lua_State* L;
+		int index;
+		int stacktop;
+
+	public:
+		typedef stack_proxy reference_type;
+		typedef stack_proxy value_type;
+		typedef stack_proxy* pointer;
+		typedef std::ptrdiff_t difference_type;
+		typedef std::size_t size_type;
+		typedef stack_iterator<stack_proxy, false> iterator;
+		typedef stack_iterator<stack_proxy, true> const_iterator;
+		typedef std::reverse_iterator<iterator> reverse_iterator;
+		typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+
+		variadic_args() = default;
+		variadic_args(lua_State* luastate, int stackindex = -1) : L(luastate), index(lua_absindex(luastate, stackindex)), stacktop(lua_gettop(luastate)) {
+		}
+		variadic_args(lua_State* luastate, int stackindex, int lastindex) : L(luastate), index(lua_absindex(luastate, stackindex)), stacktop(lastindex) {
+		}
+		variadic_args(const variadic_args&) = default;
+		variadic_args& operator=(const variadic_args&) = default;
+		variadic_args(variadic_args&& o) : L(o.L), index(o.index), stacktop(o.stacktop) {
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but will be thorough
+			o.L = nullptr;
+			o.index = 0;
+			o.stacktop = 0;
+		}
+		variadic_args& operator=(variadic_args&& o) {
+			L = o.L;
+			index = o.index;
+			stacktop = o.stacktop;
+			// Must be manual, otherwise destructor will screw us
+			// return count being 0 is enough to keep things clean
+			// but will be thorough
+			o.L = nullptr;
+			o.index = 0;
+			o.stacktop = 0;
+			return *this;
+		}
+
+		iterator begin() {
+			return iterator(L, index, stacktop + 1);
+		}
+		iterator end() {
+			return iterator(L, stacktop + 1, stacktop + 1);
+		}
+		const_iterator begin() const {
+			return const_iterator(L, index, stacktop + 1);
+		}
+		const_iterator end() const {
+			return const_iterator(L, stacktop + 1, stacktop + 1);
+		}
+		const_iterator cbegin() const {
+			return begin();
+		}
+		const_iterator cend() const {
+			return end();
+		}
+
+		reverse_iterator rbegin() {
+			return std::reverse_iterator<iterator>(begin());
+		}
+		reverse_iterator rend() {
+			return std::reverse_iterator<iterator>(end());
+		}
+		const_reverse_iterator rbegin() const {
+			return std::reverse_iterator<const_iterator>(begin());
+		}
+		const_reverse_iterator rend() const {
+			return std::reverse_iterator<const_iterator>(end());
+		}
+		const_reverse_iterator crbegin() const {
+			return std::reverse_iterator<const_iterator>(cbegin());
+		}
+		const_reverse_iterator crend() const {
+			return std::reverse_iterator<const_iterator>(cend());
+		}
+
+		int push() const {
+			return push(L);
+		}
+
+		int push(lua_State* target) const {
+			int pushcount = 0;
+			for (int i = index; i <= stacktop; ++i) {
+				lua_pushvalue(L, i);
+				pushcount += 1;
+			}
+			if (target != L) {
+				lua_xmove(L, target, pushcount);
+			}
+			return pushcount;
+		}
+
+		template <typename T>
+		decltype(auto) get(difference_type index_offset = 0) const {
+			return stack::get<T>(L, index + static_cast<int>(index_offset));
+		}
+
+		type get_type(difference_type index_offset = 0) const noexcept {
+			return type_of(L, index + static_cast<int>(index_offset));
+		}
+
+		stack_proxy operator[](difference_type index_offset) const {
+			return stack_proxy(L, index + static_cast<int>(index_offset));
+		}
+
+		lua_State* lua_state() const {
+			return L;
+		};
+		int stack_index() const {
+			return index;
+		};
+		int leftover_count() const {
+			return stacktop - (index - 1);
+		}
+		std::size_t size() const {
+			return static_cast<std::size_t>(leftover_count());
+		}
+		int top() const {
+			return stacktop;
+		}
+	};
+
+	namespace stack {
+		template <>
+		struct unqualified_getter<variadic_args> {
+			static variadic_args get(lua_State* L, int index, record& tracking) {
+				tracking.last = 0;
+				return variadic_args(L, index);
+			}
+		};
+
+		template <>
+		struct unqualified_pusher<variadic_args> {
+			static int push(lua_State* L, const variadic_args& ref) {
+				return ref.push(L);
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/variadic_args.hpp
+
+// beginning of sol/variadic_results.hpp
+
+// beginning of sol/as_returns.hpp
+
+namespace sol {
+	template <typename T>
+	struct as_returns_t : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+		using base_t::value;
+	};
+
+	template <typename Source>
+	auto as_returns(Source&& source) {
+		return as_returns_t<std::decay_t<Source>> { std::forward<Source>(source) };
+	}
+
+	namespace stack {
+		template <typename T>
+		struct unqualified_pusher<as_returns_t<T>> {
+			int push(lua_State* L, const as_returns_t<T>& e) {
+				auto& src = detail::unwrap(e.value());
+				int p = 0;
+				for (const auto& i : src) {
+					p += stack::push(L, i);
+				}
+				return p;
+			}
+		};
+	} // namespace stack
+} // namespace sol
+
+// end of sol/as_returns.hpp
+
+#include <vector>
+
+namespace sol {
+
+	template <typename Al = typename std::allocator<object>>
+	struct basic_variadic_results : public std::vector<object, Al> {
+	private:
+		using base_t = std::vector<object, Al>;
+
+	public:
+		basic_variadic_results() : base_t() {
+		}
+
+		basic_variadic_results(unsafe_function_result fr) : base_t() {
+			this->reserve(fr.return_count());
+			this->insert(this->cend(), fr.begin(), fr.end());
+		}
+
+		basic_variadic_results(protected_function_result fr) : base_t() {
+			this->reserve(fr.return_count());
+			this->insert(this->cend(), fr.begin(), fr.end());
+		}
+
+		template <typename Arg0, typename... Args,
+		     meta::disable_any<std::is_same<meta::unqualified_t<Arg0>, basic_variadic_results>, std::is_same<meta::unqualified_t<Arg0>, function_result>,
+		          std::is_same<meta::unqualified_t<Arg0>, protected_function_result>> = meta::enabler>
+		basic_variadic_results(Arg0&& arg0, Args&&... args) : base_t(std::forward<Arg0>(arg0), std::forward<Args>(args)...) {
+		}
+
+		basic_variadic_results(const basic_variadic_results&) = default;
+		basic_variadic_results(basic_variadic_results&&) = default;
+	};
+
+	struct variadic_results : public basic_variadic_results<> {
+	private:
+		using base_t = basic_variadic_results<>;
+
+	public:
+		using base_t::base_t;
+	};
+
+	template <typename Al>
+	struct is_container<basic_variadic_results<Al>> : std::false_type { };
+
+	template <>
+	struct is_container<variadic_results> : std::false_type { };
+
+	namespace stack {
+		template <typename Al>
+		struct unqualified_pusher<basic_variadic_results<Al>> {
+			int push(lua_State* L, const basic_variadic_results<Al>& e) {
+				int p = 0;
+				for (const auto& i : e) {
+					p += stack::push(L, i);
+				}
+				return p;
+			}
+		};
+
+		template <>
+		struct unqualified_pusher<variadic_results> {
+			int push(lua_State* L, const variadic_results& r) {
+				using base_t = basic_variadic_results<>;
+				return stack::push(L, static_cast<const base_t&>(r));
+			}
+		};
+	} // namespace stack
+
+} // namespace sol
+
+// end of sol/variadic_results.hpp
+
+#if SOL_IS_ON(SOL_COMPILER_GCC)
+#pragma GCC diagnostic pop
+#elif SOL_IS_ON(SOL_COMPILER_CLANG)
+#elif SOL_IS_ON(SOL_COMPILER_VCXX)
+#pragma warning(pop)
+#endif // g++
+
+#if SOL_IS_ON(SOL_INSIDE_UNREAL_ENGINE)
+#undef check
+#pragma pop_macro("check")
+#endif // Unreal Engine 4 Bullshit
+
+#endif // SOL_HPP
+// end of sol/sol.hpp
+
+#endif // SOL_SINGLE_INCLUDE_SOL_HPP
diff --git a/src/libs/3rdparty/sol2/sol2.qbs b/src/libs/3rdparty/sol2/sol2.qbs
new file mode 100644
index 00000000000..fb435308f7e
--- /dev/null
+++ b/src/libs/3rdparty/sol2/sol2.qbs
@@ -0,0 +1,17 @@
+Product {
+    name: "sol2"
+
+    Group {
+        prefix: "include/"
+        files: [
+            "sol/config.hpp",
+            "sol/forward.hpp",
+            "sol/sol.hpp",
+        ]
+    }
+
+    Export {
+        Depends { name: "cpp" }
+        cpp.includePaths: project.ide_source_tree + "/src/libs/3rdparty/sol2/include"
+    }
+}
diff --git a/src/libs/advanceddockingsystem/dockmanager.cpp b/src/libs/advanceddockingsystem/dockmanager.cpp
index d88ef8002ea..388a7820a2e 100644
--- a/src/libs/advanceddockingsystem/dockmanager.cpp
+++ b/src/libs/advanceddockingsystem/dockmanager.cpp
@@ -1537,62 +1537,31 @@ QByteArray DockManager::loadFile(const FilePath &filePath)
 
 QString DockManager::readDisplayName(const FilePath &filePath)
 {
-    auto data = loadFile(filePath);
-
-    if (data.isEmpty())
-        return {};
-
-    auto tmp = data.startsWith("<?xml") ? data : qUncompress(data);
-
-    DockingStateReader reader(tmp);
-    if (!reader.readNextStartElement())
-        return {};
-
-    if (reader.name() != QLatin1String("QtAdvancedDockingSystem"))
-        return {};
-
-    return reader.attributes().value(workspaceDisplayNameAttribute.toString()).toString();
+    return readAttribute(filePath, workspaceDisplayNameAttribute);
 }
 
 bool DockManager::writeDisplayName(const FilePath &filePath, const QString &displayName)
 {
-    const expected_str<QByteArray> content = filePath.fileContents();
-
-    QTC_ASSERT_EXPECTED(content, return false);
-
-    QDomDocument doc;
-    QString error_msg;
-    int error_line, error_col;
-    if (!doc.setContent(*content, &error_msg, &error_line, &error_col)) {
-        qWarning() << QString("XML error on line %1, col %2: %3")
-                          .arg(error_line)
-                          .arg(error_col)
-                          .arg(error_msg);
-        return false;
-    }
-
-    QDomElement docElem = doc.documentElement();
-    docElem.setAttribute(workspaceDisplayNameAttribute.toString(), displayName);
-
-    const expected_str<void> result = write(filePath, doc.toByteArray(workspaceXmlFormattingIndent));
-    if (!result) {
-        qWarning() << "Could not write display name" << displayName << "to" << filePath << ":"
-                   << result.error();
-        return false;
-    }
-
-    return true;
+    return writeAttribute(filePath, workspaceDisplayNameAttribute, displayName);
 }
 
 QString DockManager::readMcusEnabled(const FilePath &filePath)
 {
-    auto data = loadFile(filePath);
+    return readAttribute(filePath, workspaceMcusEnabledAttribute);
+}
 
+bool DockManager::writeMcusEnabled(const FilePath &filePath, const QString &mcusEnabled)
+{
+    return writeAttribute(filePath, workspaceMcusEnabledAttribute, mcusEnabled);
+}
+
+QString DockManager::readAttribute(const FilePath &filePath, QStringView key)
+{
+    auto data = loadFile(filePath);
     if (data.isEmpty())
         return {};
 
     auto tmp = data.startsWith("<?xml") ? data : qUncompress(data);
-
     DockingStateReader reader(tmp);
     if (!reader.readNextStartElement())
         return {};
@@ -1600,13 +1569,12 @@ QString DockManager::readMcusEnabled(const FilePath &filePath)
     if (reader.name() != QLatin1String("QtAdvancedDockingSystem"))
         return {};
 
-    return reader.attributes().value(workspaceMcusEnabledAttribute.toString()).toString();
+    return reader.attributes().value(key.toString()).toString();
 }
 
-bool DockManager::writeMcusEnabled(const FilePath &filePath, const QString &mcusEnabled)
+bool DockManager::writeAttribute(const FilePath &filePath, QStringView key, const QString &value)
 {
     const expected_str<QByteArray> content = filePath.fileContents();
-
     QTC_ASSERT_EXPECTED(content, return false);
 
     QDomDocument doc;
@@ -1614,23 +1582,19 @@ bool DockManager::writeMcusEnabled(const FilePath &filePath, const QString &mcus
     int error_line, error_col;
     if (!doc.setContent(*content, &error_msg, &error_line, &error_col)) {
         qWarning() << QString("XML error on line %1, col %2: %3")
-                          .arg(error_line)
-                          .arg(error_col)
-                          .arg(error_msg);
+                          .arg(error_line).arg(error_col).arg(error_msg);
         return false;
     }
 
     QDomElement docElem = doc.documentElement();
-    docElem.setAttribute(workspaceMcusEnabledAttribute.toString(), mcusEnabled);
+    docElem.setAttribute(key.toString(), value);
 
     const expected_str<void> result = write(filePath, doc.toByteArray(workspaceXmlFormattingIndent));
-    if (!result) {
-        qWarning() << "Could not write mcusEnabled" << mcusEnabled << "to" << filePath << ":"
-                   << result.error();
-        return false;
-    }
+    if (result)
+        return true;
 
-    return true;
+    qWarning() << "Could not write" << key << value << "to" << filePath << ":" << result.error();
+    return false;
 }
 
 expected_str<void> DockManager::write(const FilePath &filePath, const QByteArray &data)
diff --git a/src/libs/advanceddockingsystem/dockmanager.h b/src/libs/advanceddockingsystem/dockmanager.h
index 7cff32085a4..1dcad1d4511 100644
--- a/src/libs/advanceddockingsystem/dockmanager.h
+++ b/src/libs/advanceddockingsystem/dockmanager.h
@@ -460,7 +460,7 @@ public:
 
     /**
      * This function sets the tool button style for the given dock widget state. It is possible to
-     * switch the tool button style depending on the state. If a dock widget is floating, then here 
+     * switch the tool button style depending on the state. If a dock widget is floating, then here
      * are more space and it is possible to select a style that requires more space like
      * Qt::ToolButtonTextUnderIcon. For the docked state Qt::ToolButtonIconOnly might be better.
      */
@@ -788,6 +788,9 @@ signals:
     void lockWorkspaceChanged();
 
 private:
+    static QString readAttribute(const Utils::FilePath &filePath, QStringView key);
+    static bool writeAttribute(const Utils::FilePath &filePath, QStringView key,
+                               const QString &value);
     static Utils::expected_str<void> write(const Utils::FilePath &filePath, const QByteArray &data);
 
     Utils::expected_str<QByteArray> loadWorkspace(const Workspace &workspace) const;
diff --git a/src/libs/advanceddockingsystem/workspaceview.cpp b/src/libs/advanceddockingsystem/workspaceview.cpp
index 26983c2bcd7..116ad95670c 100644
--- a/src/libs/advanceddockingsystem/workspaceview.cpp
+++ b/src/libs/advanceddockingsystem/workspaceview.cpp
@@ -289,7 +289,7 @@ void WorkspaceView::keyPressEvent(QKeyEvent *event)
 
 void WorkspaceView::dropEvent(QDropEvent *event)
 {
-    const QModelIndex dropIndex = indexAt(event->pos());
+    const QModelIndex dropIndex = indexAt(event->position().toPoint());
     const DropIndicatorPosition dropIndicator = dropIndicatorPosition();
 
     const auto droppedWorkspaces = selectedWorkspaces();
diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index 4fc1cd2d569..e779c447bf7 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -1062,6 +1062,8 @@ ClassOrNamespace *ResolveExpression::baseExpression(const QList<LookupItem> &bas
         }
 
         typedefsResolver.resolve(&ty, &scope, r.binding());
+        if (auto ref = ty->asReferenceType()) // deref if needed
+            ty = ref->elementType();
 
         if (Q_UNLIKELY(debug))
             qDebug() << "-  after typedef resolving:" << oo.prettyType(ty);
@@ -1082,6 +1084,9 @@ ClassOrNamespace *ResolveExpression::baseExpression(const QList<LookupItem> &bas
                 if (ClassOrNamespace *binding = findClass(type, scope))
                     return binding;
 
+                if (ClassOrNamespace *binding = findClass(type, r.scope())) // local classes and structs
+                    return binding;
+
             } else {
                 ClassOrNamespace *binding
                         = findClassForTemplateParameterInExpressionScope(r.binding(),
@@ -1176,6 +1181,9 @@ ClassOrNamespace *ResolveExpression::baseExpression(const QList<LookupItem> &bas
 
             if (ClassOrNamespace *binding = findClass(ty, scope, enclosingBinding))
                 return binding;
+
+            if (ClassOrNamespace *binding = findClass(ty, r.scope())) // local classes and structs
+                return binding;
         }
     }
 
diff --git a/src/libs/extensionsystem/CMakeLists.txt b/src/libs/extensionsystem/CMakeLists.txt
index fb836631d93..a1768577b01 100644
--- a/src/libs/extensionsystem/CMakeLists.txt
+++ b/src/libs/extensionsystem/CMakeLists.txt
@@ -11,7 +11,7 @@ add_qtc_library(ExtensionSystem
     pluginerroroverview.cpp pluginerroroverview.h
     pluginerrorview.cpp pluginerrorview.h
     pluginmanager.cpp pluginmanager.h pluginmanager_p.h
-    pluginspec.cpp pluginspec.h pluginspec_p.h
+    pluginspec.cpp pluginspec.h
     pluginview.cpp pluginview.h
   EXPLICIT_MOC
     pluginmanager.h
@@ -20,10 +20,16 @@ add_qtc_library(ExtensionSystem
 
 find_package(Qt6 COMPONENTS Test QUIET)
 
+# If ExtensionSystem was compiled with QtTest, it should provide the test options
+# and the test related API, regardless if Qt Creator was compiled with tests or not,
+# and regardless if an external plugin is compiled with tests or not.
+# ExtensionSystem may not require QtTest in public headers though.
+# API with EXTENSIONSYSTEM_TEST_EXPORT (like CppPluginSpec) should only be exported
+# if Qt Creator is compiled with tests.
 extend_qtc_library(ExtensionSystem
   CONDITION TARGET Qt::Test
   DEPENDS Qt::Test
-  DEFINES WITH_TESTS
+  PUBLIC_DEFINES EXTENSIONSYSTEM_WITH_TESTOPTION
 )
 
 extend_qtc_library(ExtensionSystem
diff --git a/src/libs/extensionsystem/extensionsystem.qbs b/src/libs/extensionsystem/extensionsystem.qbs
index 8748c27ba69..c34e97e7544 100644
--- a/src/libs/extensionsystem/extensionsystem.qbs
+++ b/src/libs/extensionsystem/extensionsystem.qbs
@@ -2,6 +2,7 @@ QtcLibrary {
     name: "ExtensionSystem"
 
     cpp.defines: base.concat(["EXTENSIONSYSTEM_LIBRARY", "IDE_TEST_DIR=\".\""])
+                     .concat(qtc.withPluginTests ? ["EXTENSIONSYSTEM_WITH_TESTOPTION"] : [])
 
     Depends { name: "Qt"; submodules: ["core", "widgets"] }
     Depends { name: "Qt.testlib"; condition: qtc.withPluginTests }
@@ -29,12 +30,13 @@ QtcLibrary {
         "pluginmanager_p.h",
         "pluginspec.cpp",
         "pluginspec.h",
-        "pluginspec_p.h",
         "pluginview.cpp",
         "pluginview.h",
     ]
 
     Export {
         Depends { name: "Qt.core" }
+        Depends { name: "qtc" }
+        cpp.defines: qtc.withPluginTests ? ["EXTENSIONSYSTEM_WITH_TESTOPTION"] : []
     }
 }
diff --git a/src/libs/extensionsystem/invoker.h b/src/libs/extensionsystem/invoker.h
index 8cd27eb1759..ada8aa7cf51 100644
--- a/src/libs/extensionsystem/invoker.h
+++ b/src/libs/extensionsystem/invoker.h
@@ -38,7 +38,7 @@ private:
     InvokerBase(const InvokerBase &); // Unimplemented.
     template <class T> const char *typeName()
     {
-        return QMetaType::typeName(qMetaTypeId<T>());
+        return QMetaType(qMetaTypeId<T>()).name();
     }
     QObject *target;
     QGenericArgument arg[10];
diff --git a/src/libs/extensionsystem/optionsparser.cpp b/src/libs/extensionsystem/optionsparser.cpp
index 205442488e6..21dfba16ecb 100644
--- a/src/libs/extensionsystem/optionsparser.cpp
+++ b/src/libs/extensionsystem/optionsparser.cpp
@@ -6,7 +6,6 @@
 #include "extensionsystemtr.h"
 #include "pluginmanager.h"
 #include "pluginmanager_p.h"
-#include "pluginspec_p.h"
 
 #include <utils/algorithm.h>
 
@@ -65,7 +64,7 @@ bool OptionsParser::parse()
             continue;
         if (checkForNoCrashcheckOption())
             continue;
-#ifdef WITH_TESTS
+#ifdef EXTENSIONSYSTEM_WITH_TESTOPTION
         if (checkForTestOptions())
             continue;
         if (checkForScenarioOption())
@@ -119,7 +118,7 @@ bool OptionsParser::checkForTestOptions()
                     } else {
                         m_pmPrivate->testSpecs.emplace_back(spec, args);
                     }
-                } else  {
+                } else {
                     if (m_errorString)
                         *m_errorString = Tr::tr("The plugin \"%1\" does not exist.").arg(pluginName);
                     m_hasError = true;
@@ -177,7 +176,7 @@ bool OptionsParser::checkForLoadOption()
     if (nextToken(RequiredToken)) {
         if (m_currentArg == QLatin1String("all")) {
             for (PluginSpec *spec : std::as_const(m_pmPrivate->pluginSpecs))
-                spec->d->setForceEnabled(true);
+                spec->setForceEnabled(true);
             m_isDependencyRefreshNeeded = true;
         } else {
             PluginSpec *spec = m_pmPrivate->pluginByName(m_currentArg);
@@ -186,7 +185,7 @@ bool OptionsParser::checkForLoadOption()
                     *m_errorString = Tr::tr("The plugin \"%1\" does not exist.").arg(m_currentArg);
                 m_hasError = true;
             } else {
-                spec->d->setForceEnabled(true);
+                spec->setForceEnabled(true);
                 m_isDependencyRefreshNeeded = true;
             }
         }
@@ -202,7 +201,7 @@ bool OptionsParser::checkForNoLoadOption()
     if (nextToken(RequiredToken)) {
         if (m_currentArg == QLatin1String("all")) {
             for (PluginSpec *spec : std::as_const(m_pmPrivate->pluginSpecs))
-                spec->d->setForceDisabled(true);
+                spec->setForceDisabled(true);
             m_isDependencyRefreshNeeded = true;
         } else {
             PluginSpec *spec = m_pmPrivate->pluginByName(m_currentArg);
@@ -211,10 +210,10 @@ bool OptionsParser::checkForNoLoadOption()
                     *m_errorString = Tr::tr("The plugin \"%1\" does not exist.").arg(m_currentArg);
                 m_hasError = true;
             } else {
-                spec->d->setForceDisabled(true);
+                spec->setForceDisabled(true);
                 // recursively disable all plugins that require this plugin
                 for (PluginSpec *dependantSpec : PluginManager::pluginsRequiringPlugin(spec))
-                    dependantSpec->d->setForceDisabled(true);
+                    dependantSpec->setForceDisabled(true);
                 m_isDependencyRefreshNeeded = true;
             }
         }
@@ -292,10 +291,10 @@ bool OptionsParser::checkForUnknownOption()
 void OptionsParser::forceDisableAllPluginsExceptTestedAndForceEnabled()
 {
     for (const PluginManagerPrivate::TestSpec &testSpec : m_pmPrivate->testSpecs)
-        testSpec.pluginSpec->d->setForceEnabled(true);
+        testSpec.pluginSpec->setForceEnabled(true);
     for (PluginSpec *spec : std::as_const(m_pmPrivate->pluginSpecs)) {
         if (!spec->isForceEnabled() && !spec->isRequired())
-            spec->d->setForceDisabled(true);
+            spec->setForceDisabled(true);
     }
 }
 
diff --git a/src/libs/extensionsystem/plugindetailsview.cpp b/src/libs/extensionsystem/plugindetailsview.cpp
index 73fa2b1229d..35e646bad71 100644
--- a/src/libs/extensionsystem/plugindetailsview.cpp
+++ b/src/libs/extensionsystem/plugindetailsview.cpp
@@ -8,6 +8,7 @@
 #include "pluginspec.h"
 
 #include <utils/algorithm.h>
+#include <utils/infolabel.h>
 #include <utils/layoutbuilder.h>
 
 #include <QCoreApplication>
@@ -54,6 +55,7 @@ public:
         , copyright(createContentsLabel())
         , license(createTextEdit())
         , dependencies(new QListWidget(q))
+        , softLoadable(new Utils::InfoLabel)
     {
         using namespace Layouting;
 
@@ -70,7 +72,8 @@ public:
             Tr::tr("Description:"), description, br,
             Tr::tr("Copyright:"), copyright, br,
             Tr::tr("License:"), license, br,
-            Tr::tr("Dependencies:"), dependencies,
+            Tr::tr("Dependencies:"), dependencies, br,
+            Tr::tr("Loadable without restart:"), softLoadable, br,
             noMargin
         }.attachTo(q);
         // clang-format on
@@ -90,6 +93,7 @@ public:
     QLabel *copyright = nullptr;
     QTextEdit *license = nullptr;
     QListWidget *dependencies = nullptr;
+    Utils::InfoLabel *softLoadable = nullptr;
 
 private:
     QLabel *createContentsLabel() {
@@ -142,7 +146,7 @@ void PluginDetailsView::update(PluginSpec *spec)
     d->vendor->setText(spec->vendor());
     d->component->setText(spec->category().isEmpty() ? Tr::tr("None") : spec->category());
     d->url->setText(QString::fromLatin1("<a href=\"%1\">%1</a>").arg(spec->url()));
-    d->location->setText(QDir::toNativeSeparators(spec->filePath()));
+    d->location->setText(spec->filePath().toUserOutput());
     const QString pattern = spec->platformSpecification().pattern();
     const QString platform = pattern.isEmpty() ? Tr::tr("All") : pattern;
     const QString platformString = Tr::tr("%1 (current: \"%2\")")
@@ -157,6 +161,8 @@ void PluginDetailsView::update(PluginSpec *spec)
     d->license->setText(spec->license());
     d->dependencies->addItems(Utils::transform<QList>(spec->dependencies(),
                                                       &PluginDependency::toString));
+    d->softLoadable->setType(spec->isSoftLoadable() ? Utils::InfoLabel::Ok
+                                                    : Utils::InfoLabel::NotOk);
 }
 
 void PluginDetailsView::showModal(QWidget *parent, PluginSpec *spec)
diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
index 4254fdfc0bf..4fbaba01e57 100644
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -8,7 +8,6 @@
 #include "optionsparser.h"
 #include "pluginmanager_p.h"
 #include "pluginspec.h"
-#include "pluginspec_p.h"
 
 #include <nanotrace/nanotrace.h>
 
@@ -18,8 +17,8 @@
 #include <utils/futuresynchronizer.h>
 #include <utils/hostosinfo.h>
 #include <utils/mimeutils.h>
-#include <utils/qtcprocess.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/qtcsettings.h>
 #include <utils/threadutils.h>
 
@@ -35,6 +34,7 @@
 #include <QLibraryInfo>
 #include <QMessageBox>
 #include <QMetaProperty>
+#include <QPluginLoader>
 #include <QPushButton>
 #include <QScopeGuard>
 #include <QSysInfo>
@@ -42,7 +42,7 @@
 #include <QTimer>
 #include <QWriteLocker>
 
-#ifdef WITH_TESTS
+#ifdef EXTENSIONSYSTEM_WITH_TESTOPTION
 #include <utils/hostosinfo.h>
 #include <QTest>
 #include <QThread>
@@ -50,6 +50,7 @@
 
 #include <functional>
 #include <memory>
+#include <type_traits>
 
 Q_LOGGING_CATEGORY(pluginLog, "qtc.extensionsystem", QtWarningMsg)
 
@@ -327,6 +328,11 @@ void PluginManager::loadPluginsAtRuntime(const QSet<PluginSpec *> &plugins)
     d->loadPluginsAtRuntime(plugins);
 }
 
+void PluginManager::addPlugins(const PluginSpecs &specs)
+{
+    d->addPlugins(specs);
+}
+
 /*!
     Returns \c true if any plugin has errors even though it is enabled.
     Most useful to call after loadPlugins().
@@ -428,17 +434,12 @@ QString PluginManager::systemInformation()
     return result;
 }
 
-FutureSynchronizer *PluginManager::futureSynchronizer()
-{
-    return d->m_futureSynchronizer.get();
-}
-
 /*!
     The list of paths were the plugin manager searches for plugins.
 
     \sa setPluginPaths()
 */
-QStringList PluginManager::pluginPaths()
+FilePaths PluginManager::pluginPaths()
 {
     return d->pluginPaths;
 }
@@ -450,7 +451,7 @@ QStringList PluginManager::pluginPaths()
     \sa pluginPaths()
     \sa loadPlugins()
 */
-void PluginManager::setPluginPaths(const QStringList &paths)
+void PluginManager::setPluginPaths(const FilePaths &paths)
 {
     d->setPluginPaths(paths);
 }
@@ -551,12 +552,12 @@ QStringList PluginManager::argumentsForRestart()
 
     \sa setPluginPaths()
 */
-const QVector<PluginSpec *> PluginManager::plugins()
+const PluginSpecs PluginManager::plugins()
 {
     return d->pluginSpecs;
 }
 
-QHash<QString, QVector<PluginSpec *>> PluginManager::pluginCollections()
+QHash<QString, PluginSpecs> PluginManager::pluginCollections()
 {
     return d->pluginCategories;
 }
@@ -636,11 +637,13 @@ void PluginManager::remoteArguments(const QString &serializedArgument, QObject *
     for (const PluginSpec *ps : plugins()) {
         if (ps->state() == PluginSpec::Running) {
             const QStringList pluginOptions = subList(serializedArguments, QLatin1Char(':') + ps->name());
-            QObject *socketParent = ps->plugin()->remoteCommand(pluginOptions, workingDirectory,
-                                                                arguments);
-            if (socketParent && socket) {
-                socket->setParent(socketParent);
-                socket = nullptr;
+            if (IPlugin *plugin = ps->plugin()) {
+                QObject *socketParent
+                    = plugin->remoteCommand(pluginOptions, workingDirectory, arguments);
+                if (socketParent && socket) {
+                    socket->setParent(socketParent);
+                    socket = nullptr;
+                }
             }
         }
     }
@@ -740,7 +743,7 @@ void PluginManager::formatOptions(QTextStream &str, int optionIndentation, int d
                  QLatin1String("Disable startup check for previously crashed instance"),
                  optionIndentation,
                  descriptionIndentation);
-#ifdef WITH_TESTS
+#ifdef EXTENSIONSYSTEM_WITH_TESTOPTION
     formatOption(str, QString::fromLatin1(OptionsParser::TEST_OPTION)
                  + QLatin1String(" <plugin>[,testfunction[:testdata]]..."), QString(),
                  QLatin1String("Run plugin's tests (by default a separate settings path is used)"),
@@ -793,7 +796,7 @@ bool PluginManager::testRunRequested()
     return !d->testSpecs.empty();
 }
 
-#ifdef WITH_TESTS
+#ifdef EXTENSIONSYSTEM_WITH_TESTOPTION
 // Called in plugin initialization, the scenario function will be called later, from main
 bool PluginManager::registerScenario(const QString &scenarioId, std::function<bool()> scenarioStarter)
 {
@@ -896,21 +899,15 @@ PluginManager::ProcessData PluginManager::creatorProcessData()
 /*!
     Returns a list of plugins in load order.
 */
-QVector<PluginSpec *> PluginManager::loadQueue()
+PluginSpecs PluginManager::loadQueue()
 {
+    // Ensure order preservation
+    static_assert(std::is_same<PluginSpecs, QList<class PluginSpec *> >::value);
     return d->loadQueue();
 }
 
 //============PluginManagerPrivate===========
 
-/*!
-    \internal
-*/
-PluginSpec *PluginManagerPrivate::createSpec()
-{
-    return new PluginSpec();
-}
-
 /*!
     \internal
 */
@@ -935,14 +932,6 @@ void PluginManagerPrivate::setGlobalSettings(QtcSettings *s)
         globalSettings->setParent(this);
 }
 
-/*!
-    \internal
-*/
-PluginSpecPrivate *PluginManagerPrivate::privateSpec(PluginSpec *spec)
-{
-    return spec->d;
-}
-
 void PluginManagerPrivate::startDelayedInitialize()
 {
     Utils::setMimeStartupPhase(MimeStartupPhase::PluginsDelayedInitializing);
@@ -954,8 +943,8 @@ void PluginManagerPrivate::startDelayedInitialize()
             delayedInitializeQueue.pop();
             NANOTRACE_SCOPE(specName, specName + "::delayedInitialized");
             profilingReport(">delayedInitialize", spec);
-            bool delay = spec->d->delayedInitialize();
-            profilingReport("<delayedInitialize", spec, &spec->d->performanceData.delayedInitialize);
+            bool delay = spec->delayedInitialize();
+            profilingReport("<delayedInitialize", spec, &spec->performanceData().delayedInitialize);
             if (delay) // give UI a bit of breathing space, but prevent user interaction
                 QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
         }
@@ -967,17 +956,18 @@ void PluginManagerPrivate::startDelayedInitialize()
     }
     NANOTRACE_SHUTDOWN();
     emit q->initializationDone();
-#ifdef WITH_TESTS
-        if (PluginManager::testRunRequested())
-            startTests();
-        else if (PluginManager::isScenarioRequested()) {
-            if (PluginManager::runScenario()) {
-                const QString info = QString("Successfully started scenario \"%1\"...").arg(d->m_requestedScenario);
-                qInfo("%s", qPrintable(info));
-            } else {
-                QMetaObject::invokeMethod(this, [] { emit m_instance->scenarioFinished(1); });
-            }
+#ifdef EXTENSIONSYSTEM_WITH_TESTOPTION
+    if (PluginManager::testRunRequested())
+        startTests();
+    else if (PluginManager::isScenarioRequested()) {
+        if (PluginManager::runScenario()) {
+            const QString info
+                = QString("Successfully started scenario \"%1\"...").arg(d->m_requestedScenario);
+            qInfo("%s", qPrintable(info));
+        } else {
+            QMetaObject::invokeMethod(this, [] { emit m_instance->scenarioFinished(1); });
         }
+    }
 #endif
 }
 
@@ -986,10 +976,7 @@ void PluginManagerPrivate::startDelayedInitialize()
 */
 PluginManagerPrivate::PluginManagerPrivate(PluginManager *pluginManager) :
     q(pluginManager)
-{
-    m_futureSynchronizer.reset(new FutureSynchronizer);
-}
-
+{}
 
 /*!
     \internal
@@ -1042,7 +1029,7 @@ void PluginManagerPrivate::stopAll()
     m_isShuttingDown = true;
     delayedInitializeTimer.stop();
 
-    const QVector<PluginSpec *> queue = loadQueue();
+    const PluginSpecs queue = loadQueue();
     for (PluginSpec *spec : queue)
         loadPlugin(spec, PluginSpec::Stopped);
 }
@@ -1052,7 +1039,11 @@ void PluginManagerPrivate::stopAll()
 */
 void PluginManagerPrivate::deleteAll()
 {
-    m_futureSynchronizer.reset(); // Synchronize all futures from all plugins
+    // Guard against someone playing with the setting
+    QTC_ASSERT(
+        Utils::futureSynchronizer()->isCancelOnWait(),
+        Utils::futureSynchronizer()->cancelAllFutures());
+    Utils::futureSynchronizer()->waitForFinished(); // Synchronize all futures from all plugins
     Utils::reverseForeach(loadQueue(), [this](PluginSpec *spec) {
         loadPlugin(spec, PluginSpec::Deleted);
     });
@@ -1068,10 +1059,8 @@ void PluginManagerPrivate::checkForDuplicatePlugins()
             if (spec->isEffectivelyEnabled() && other->isEffectivelyEnabled()) {
                 const QString error = Tr::tr(
                     "Multiple versions of the same plugin have been found.");
-                spec->d->hasError = true;
-                spec->d->errorString = error;
-                other->d->hasError = true;
-                other->d->errorString = error;
+                spec->setError(error);
+                other->setError(error);
             }
         } else {
             seen.insert(spec->name(), spec);
@@ -1081,14 +1070,15 @@ void PluginManagerPrivate::checkForDuplicatePlugins()
 
 static QHash<IPlugin *, QList<TestCreator>> g_testCreators;
 
-void PluginManagerPrivate::addTestCreator(IPlugin *plugin, const TestCreator &testCreator)
+void PluginManagerPrivate::addTestCreator(
+    [[maybe_unused]] IPlugin *plugin, [[maybe_unused]] const TestCreator &testCreator)
 {
-#ifdef WITH_TESTS
+#ifdef EXTENSIONSYSTEM_WITH_TESTOPTION
     g_testCreators[plugin].append(testCreator);
 #endif
 }
 
-#ifdef WITH_TESTS
+#ifdef EXTENSIONSYSTEM_WITH_TESTOPTION
 
 using TestPlan = QHash<QObject *, QStringList>; // Object -> selected test functions
 
@@ -1380,7 +1370,7 @@ void PluginManagerPrivate::loadPlugins()
     if (m_profilingVerbosity > 0)
         qDebug("Profiling started");
 
-    const QVector<PluginSpec *> queue = loadQueue();
+    const PluginSpecs queue = loadQueue();
     Utils::setMimeStartupPhase(MimeStartupPhase::PluginsLoading);
     {
         NANOTRACE_SCOPE("ExtensionSystem", "Load");
@@ -1403,7 +1393,7 @@ void PluginManagerPrivate::loadPlugins()
                 delayedInitializeQueue.push(spec);
             } else {
                 // Plugin initialization failed, so cleanup after it
-                spec->d->kill();
+                spec->kill();
             }
         });
     }
@@ -1421,10 +1411,23 @@ void PluginManagerPrivate::loadPlugins()
 void PluginManagerPrivate::loadPluginsAtRuntime(const QSet<PluginSpec *> &plugins)
 {
     QTC_CHECK(allOf(plugins, [](PluginSpec *spec) { return spec->isSoftLoadable(); }));
-    // load the plugins ordered by dependency
+
+    // load the plugins and their dependencies (if possible) ordered by dependency
     const QList<PluginSpec *> queue = filtered(loadQueue(), [&plugins](PluginSpec *spec) {
-        return plugins.contains(spec);
+        // Is the current plugin already running, or not soft loadable?
+        if (spec->state() == PluginSpec::State::Running || !spec->isSoftLoadable())
+            return false;
+
+        // Is the current plugin in the list of plugins to load?
+        if (plugins.contains(spec))
+            return true;
+
+        // Is the current plugin a dependency of any of the plugins we want to load?
+        return plugins.contains(spec) || Utils::anyOf(plugins, [spec](PluginSpec *other) {
+                   return other->requiresAny({spec});
+               });
     });
+
     std::queue<PluginSpec *> localDelayedInitializeQueue;
     for (PluginSpec *spec : queue)
         loadPlugin(spec, PluginSpec::Loaded);
@@ -1434,12 +1437,12 @@ void PluginManagerPrivate::loadPluginsAtRuntime(const QSet<PluginSpec *> &plugin
                           [this](PluginSpec *spec) { loadPlugin(spec, PluginSpec::Running); });
     Utils::reverseForeach(queue, [](PluginSpec *spec) {
         if (spec->state() == PluginSpec::Running) {
-            const bool delay = spec->d->delayedInitialize();
+            const bool delay = spec->delayedInitialize();
             if (delay)
                 QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
         } else {
             // Plugin initialization failed, so cleanup after it
-            spec->d->kill();
+            spec->kill();
         }
     });
     emit q->pluginsChanged();
@@ -1456,7 +1459,7 @@ void PluginManagerPrivate::shutdown()
         shutdownEventLoop->exec();
     }
     deleteAll();
-#ifdef WITH_TESTS
+#ifdef EXTENSIONSYSTEM_WITH_TESTOPTION
     if (PluginManager::isScenarioRunning("TestModelManagerInterface")) {
         qDebug() << "Point 2: Expect the next call to Point 3 triggers a crash";
         QThread::sleep(5);
@@ -1473,11 +1476,11 @@ void PluginManagerPrivate::shutdown()
 /*!
     \internal
 */
-const QVector<PluginSpec *> PluginManagerPrivate::loadQueue()
+const PluginSpecs PluginManagerPrivate::loadQueue()
 {
-    QVector<PluginSpec *> queue;
+    PluginSpecs queue;
     for (PluginSpec *spec : std::as_const(pluginSpecs)) {
-        QVector<PluginSpec *> circularityCheckQueue;
+        PluginSpecs circularityCheckQueue;
         loadQueue(spec, queue, circularityCheckQueue);
     }
     return queue;
@@ -1487,24 +1490,24 @@ const QVector<PluginSpec *> PluginManagerPrivate::loadQueue()
     \internal
 */
 bool PluginManagerPrivate::loadQueue(PluginSpec *spec,
-                                     QVector<PluginSpec *> &queue,
-                                     QVector<PluginSpec *> &circularityCheckQueue)
+                                     PluginSpecs &queue,
+                                     PluginSpecs &circularityCheckQueue)
 {
     if (queue.contains(spec))
         return true;
     // check for circular dependencies
     if (circularityCheckQueue.contains(spec)) {
-        spec->d->hasError = true;
-        spec->d->errorString = Tr::tr("Circular dependency detected:");
-        spec->d->errorString += QLatin1Char('\n');
+        QString errorString = Tr::tr("Circular dependency detected:");
+        errorString += QLatin1Char('\n');
         int index = circularityCheckQueue.indexOf(spec);
         for (int i = index; i < circularityCheckQueue.size(); ++i) {
             const PluginSpec *depSpec = circularityCheckQueue.at(i);
-            spec->d->errorString.append(Tr::tr("%1 (%2) depends on")
-                                        .arg(depSpec->name(), depSpec->version()));
-            spec->d->errorString += QLatin1Char('\n');
+            errorString.append(
+                Tr::tr("%1 (%2) depends on").arg(depSpec->name(), depSpec->version()));
+            errorString += QLatin1Char('\n');
         }
-        spec->d->errorString.append(Tr::tr("%1 (%2)").arg(spec->name(), spec->version()));
+        errorString.append(Tr::tr("%1 (%2)").arg(spec->name(), spec->version()));
+        spec->setError(errorString);
         return false;
     }
     circularityCheckQueue.append(spec);
@@ -1523,10 +1526,9 @@ bool PluginManagerPrivate::loadQueue(PluginSpec *spec,
             continue;
         PluginSpec *depSpec = it.value();
         if (!loadQueue(depSpec, queue, circularityCheckQueue)) {
-            spec->d->hasError = true;
-            spec->d->errorString =
+            spec->setError(
                 Tr::tr("Cannot load plugin because dependency failed to load: %1 (%2)\nReason: %3")
-                    .arg(depSpec->name(), depSpec->version(), depSpec->errorString());
+                    .arg(depSpec->name(), depSpec->version(), depSpec->errorString()));
             return false;
         }
     }
@@ -1619,9 +1621,9 @@ void PluginManagerPrivate::checkForProblematicPlugins()
             dialog.addButton(Tr::tr("Continue"), QMessageBox::RejectRole);
             dialog.exec();
             if (dialog.clickedButton() == disableButton) {
-                spec->d->setForceDisabled(true);
+                spec->setForceDisabled(true);
                 for (PluginSpec *other : dependents)
-                    other->d->setForceDisabled(true);
+                    other->setForceDisabled(true);
                 enableDependenciesIndirectly();
             }
         }
@@ -1664,15 +1666,15 @@ void PluginManagerPrivate::loadPlugin(PluginSpec *spec, PluginSpec::State destSt
     case PluginSpec::Running: {
         NANOTRACE_SCOPE(specName, specName + "::extensionsInitialized");
         profilingReport(">initializeExtensions", spec);
-        spec->d->initializeExtensions();
+        spec->initializeExtensions();
         profilingReport("<initializeExtensions",
                         spec,
-                        &spec->d->performanceData.extensionsInitialized);
+                        &spec->performanceData().extensionsInitialized);
         return;
     }
     case PluginSpec::Deleted:
         profilingReport(">delete", spec);
-        spec->d->kill();
+        spec->kill();
         profilingReport("<delete", spec);
         return;
     default:
@@ -1686,10 +1688,10 @@ void PluginManagerPrivate::loadPlugin(PluginSpec *spec, PluginSpec::State destSt
                 continue;
             PluginSpec *depSpec = it.value();
             if (depSpec->state() != destState) {
-                spec->d->hasError = true;
-                spec->d->errorString =
-                    Tr::tr("Cannot load plugin because dependency failed to load: %1(%2)\nReason: %3")
-                        .arg(depSpec->name(), depSpec->version(), depSpec->errorString());
+                spec->setError(
+                    Tr::tr(
+                        "Cannot load plugin because dependency failed to load: %1(%2)\nReason: %3")
+                        .arg(depSpec->name(), depSpec->version(), depSpec->errorString()));
                 return;
             }
         }
@@ -1698,20 +1700,20 @@ void PluginManagerPrivate::loadPlugin(PluginSpec *spec, PluginSpec::State destSt
     case PluginSpec::Loaded: {
         NANOTRACE_SCOPE(specName, specName + "::load");
         profilingReport(">loadLibrary", spec);
-        spec->d->loadLibrary();
-        profilingReport("<loadLibrary", spec, &spec->d->performanceData.load);
+        spec->loadLibrary();
+        profilingReport("<loadLibrary", spec, &spec->performanceData().load);
         break;
     }
     case PluginSpec::Initialized: {
         NANOTRACE_SCOPE(specName, specName + "::initialize");
         profilingReport(">initializePlugin", spec);
-        spec->d->initializePlugin();
-        profilingReport("<initializePlugin", spec, &spec->d->performanceData.initialize);
+        spec->initializePlugin();
+        profilingReport("<initializePlugin", spec, &spec->performanceData().initialize);
         break;
     }
     case PluginSpec::Stopped:
         profilingReport(">stop", spec);
-        if (spec->d->stop() == IPlugin::AsynchronousShutdown) {
+        if (spec->stop() == IPlugin::AsynchronousShutdown) {
             asynchronousPlugins << spec;
             connect(spec->plugin(), &IPlugin::asynchronousShutdownFinished, this, [this, spec] {
                 asynchronousPlugins.remove(spec);
@@ -1729,7 +1731,7 @@ void PluginManagerPrivate::loadPlugin(PluginSpec *spec, PluginSpec::State destSt
 /*!
     \internal
 */
-void PluginManagerPrivate::setPluginPaths(const QStringList &paths)
+void PluginManagerPrivate::setPluginPaths(const FilePaths &paths)
 {
     qCDebug(pluginLog) << "Plugin search paths:" << paths;
     qCDebug(pluginLog) << "Required IID:" << pluginIID;
@@ -1738,60 +1740,40 @@ void PluginManagerPrivate::setPluginPaths(const QStringList &paths)
     readPluginPaths();
 }
 
-static const QStringList pluginFiles(const QStringList &pluginPaths)
+static const FilePaths pluginFiles(const FilePaths &pluginPaths)
 {
-    QStringList pluginFiles;
-    QStringList searchPaths = pluginPaths;
+    FilePaths pluginFiles;
+    FilePaths searchPaths = pluginPaths;
     while (!searchPaths.isEmpty()) {
-        const QDir dir(searchPaths.takeFirst());
-        const QFileInfoList files = dir.entryInfoList(QDir::Files | QDir::NoSymLinks);
-        const QStringList absoluteFilePaths = Utils::transform(files, &QFileInfo::absoluteFilePath);
-        pluginFiles += Utils::filtered(absoluteFilePaths, [](const QString &path) { return QLibrary::isLibrary(path); });
-        const QFileInfoList dirs = dir.entryInfoList(QDir::Dirs|QDir::NoDotAndDotDot);
-        searchPaths += Utils::transform(dirs, &QFileInfo::absoluteFilePath);
+        const FilePath dir = searchPaths.takeFirst().absoluteFilePath();
+        const FilePaths files = dir.dirEntries(QDir::Files | QDir::NoSymLinks);
+        pluginFiles += Utils::filtered(files, [](const FilePath &path) {
+            return QLibrary::isLibrary(path.toFSPathString());
+        });
+        const FilePaths dirs = dir.dirEntries(QDir::Dirs | QDir::NoDotAndDotDot);
+        searchPaths += dirs;
     }
     return pluginFiles;
 }
 
-/*!
-    \internal
-*/
-void PluginManagerPrivate::readPluginPaths()
+void PluginManagerPrivate::addPlugins(const PluginSpecs &specs)
 {
-    qDeleteAll(pluginSpecs);
-    pluginSpecs.clear();
-    pluginCategories.clear();
+    pluginSpecs += specs;
 
-    // default
-    pluginCategories.insert(QString(), QVector<PluginSpec *>());
-
-    // from the file system
-    for (const QString &pluginFile : pluginFiles(pluginPaths)) {
-        PluginSpec *spec = PluginSpec::read(pluginFile);
-        if (spec) // Qt Creator plugin
-            pluginSpecs.append(spec);
-    }
-    // static
-    for (const QStaticPlugin &plugin : QPluginLoader::staticPlugins()) {
-        PluginSpec *spec = PluginSpec::read(plugin);
-        if (spec) // Qt Creator plugin
-            pluginSpecs.append(spec);
-    }
-
-    for (PluginSpec *spec : pluginSpecs) {
+    for (PluginSpec *spec : specs) {
         // defaultDisabledPlugins and defaultEnabledPlugins from install settings
         // is used to override the defaults read from the plugin spec
         if (spec->isEnabledByDefault() && defaultDisabledPlugins.contains(spec->name())) {
-            spec->d->setEnabledByDefault(false);
-            spec->d->setEnabledBySettings(false);
+            spec->setEnabledByDefault(false);
+            spec->setEnabledBySettings(false);
         } else if (!spec->isEnabledByDefault() && defaultEnabledPlugins.contains(spec->name())) {
-            spec->d->setEnabledByDefault(true);
-            spec->d->setEnabledBySettings(true);
+            spec->setEnabledByDefault(true);
+            spec->setEnabledBySettings(true);
         }
         if (!spec->isEnabledByDefault() && forceEnabledPlugins.contains(spec->name()))
-            spec->d->setEnabledBySettings(true);
+            spec->setEnabledBySettings(true);
         if (spec->isEnabledByDefault() && disabledPlugins.contains(spec->name()))
-            spec->d->setEnabledBySettings(false);
+            spec->setEnabledBySettings(false);
 
         pluginCategories[spec->category()].append(spec);
     }
@@ -1803,21 +1785,50 @@ void PluginManagerPrivate::readPluginPaths()
     emit q->pluginsChanged();
 }
 
+/*!
+    \internal
+*/
+void PluginManagerPrivate::readPluginPaths()
+{
+    PluginSpecs newSpecs;
+
+    // from the file system
+    for (const FilePath &pluginFile : pluginFiles(pluginPaths)) {
+        expected_str<PluginSpec *> spec = readCppPluginSpec(pluginFile);
+        if (!spec) {
+            qCInfo(pluginLog).noquote() << QString("Ignoring plugin \"%1\" because: %2")
+                                               .arg(pluginFile.toUserOutput())
+                                               .arg(spec.error());
+            continue;
+        }
+        newSpecs.append(*spec);
+    }
+
+    // static
+    for (const QStaticPlugin &plugin : QPluginLoader::staticPlugins()) {
+        expected_str<PluginSpec *> spec = readCppPluginSpec(plugin);
+        QTC_ASSERT_EXPECTED(spec, continue);
+        newSpecs.append(*spec);
+    }
+
+    addPlugins(newSpecs);
+}
+
 void PluginManagerPrivate::resolveDependencies()
 {
     for (PluginSpec *spec : std::as_const(pluginSpecs))
-        spec->d->resolveDependencies(pluginSpecs);
+        spec->resolveDependencies(pluginSpecs);
 }
 
 void PluginManagerPrivate::enableDependenciesIndirectly()
 {
     for (PluginSpec *spec : std::as_const(pluginSpecs))
-        spec->d->enabledIndirectly = false;
+        spec->setEnabledIndirectly(false);
     // cannot use reverse loadQueue here, because test dependencies can introduce circles
-    QVector<PluginSpec *> queue = Utils::filtered(pluginSpecs, &PluginSpec::isEffectivelyEnabled);
+    PluginSpecs queue = Utils::filtered(pluginSpecs, &PluginSpec::isEffectivelyEnabled);
     while (!queue.isEmpty()) {
         PluginSpec *spec = queue.takeFirst();
-        queue += spec->d->enableDependenciesIndirectly(containsTestSpec(spec));
+        queue += spec->enableDependenciesIndirectly(containsTestSpec(spec));
     }
 }
 
@@ -1888,11 +1899,11 @@ void PluginManagerPrivate::profilingReport(const char *what, const PluginSpec *s
 QString PluginManagerPrivate::profilingSummary(qint64 *totalOut) const
 {
     QString summary;
-    const QVector<PluginSpec *> specs = Utils::sorted(pluginSpecs,
-                                                      [](PluginSpec *s1, PluginSpec *s2) {
-                                                          return s1->performanceData().total()
-                                                                 < s2->performanceData().total();
-                                                      });
+    const PluginSpecs specs = Utils::sorted(pluginSpecs,
+                                            [](PluginSpec *s1, PluginSpec *s2) {
+                                                return s1->performanceData().total()
+                                                       < s2->performanceData().total();
+                                            });
     const qint64 total
         = std::accumulate(specs.constBegin(), specs.constEnd(), 0, [](qint64 t, PluginSpec *s) {
               return t + s->performanceData().total();
diff --git a/src/libs/extensionsystem/pluginmanager.h b/src/libs/extensionsystem/pluginmanager.h
index a38f3c3fe7b..68bba7a83c3 100644
--- a/src/libs/extensionsystem/pluginmanager.h
+++ b/src/libs/extensionsystem/pluginmanager.h
@@ -6,6 +6,7 @@
 #include "extensionsystem_global.h"
 
 #include <aggregation/aggregate.h>
+#include <utils/filepath.h>
 #include <utils/qtcsettings.h>
 
 #include <QObject>
@@ -15,8 +16,6 @@ QT_BEGIN_NAMESPACE
 class QTextStream;
 QT_END_NAMESPACE
 
-namespace Utils { class FutureSynchronizer; }
-
 namespace ExtensionSystem {
 class IPlugin;
 class PluginSpec;
@@ -69,8 +68,8 @@ public:
     static QVector<PluginSpec *> loadQueue();
     static void loadPlugins();
     static void loadPluginsAtRuntime(const QSet<PluginSpec *> &plugins);
-    static QStringList pluginPaths();
-    static void setPluginPaths(const QStringList &paths);
+    static Utils::FilePaths pluginPaths();
+    static void setPluginPaths(const Utils::FilePaths &paths);
     static QString pluginIID();
     static void setPluginIID(const QString &iid);
     static const QVector<PluginSpec *> plugins();
@@ -82,6 +81,8 @@ public:
     static void checkForProblematicPlugins();
     static PluginSpec *specForPlugin(IPlugin *plugin);
 
+    static void addPlugins(const QVector<PluginSpec *> &specs);
+
     // Settings
     static void setSettings(Utils::QtcSettings *settings);
     static Utils::QtcSettings *settings();
@@ -104,7 +105,7 @@ public:
 
     static bool testRunRequested();
 
-#ifdef WITH_TESTS
+#ifdef EXTENSIONSYSTEM_WITH_TESTOPTION
     static bool registerScenario(const QString &scenarioId, std::function<bool()> scenarioStarter);
     static bool isScenarioRequested();
     static bool runScenario();
@@ -136,8 +137,6 @@ public:
 
     static QString systemInformation();
 
-    static Utils::FutureSynchronizer *futureSynchronizer();
-
 signals:
     void objectAdded(QObject *obj);
     void aboutToRemoveObject(QObject *obj);
diff --git a/src/libs/extensionsystem/pluginmanager_p.h b/src/libs/extensionsystem/pluginmanager_p.h
index 27efbf4c8f3..ad9d4f81ee2 100644
--- a/src/libs/extensionsystem/pluginmanager_p.h
+++ b/src/libs/extensionsystem/pluginmanager_p.h
@@ -36,8 +36,6 @@ class PluginManager;
 
 namespace Internal {
 
-class PluginSpecPrivate;
-
 class EXTENSIONSYSTEM_TEST_EXPORT PluginManagerPrivate : public QObject
 {
 public:
@@ -52,8 +50,10 @@ public:
     void checkForProblematicPlugins();
     void loadPlugins();
     void loadPluginsAtRuntime(const QSet<PluginSpec *> &plugins);
+    void addPlugins(const QVector<PluginSpec *> &specs);
+
     void shutdown();
-    void setPluginPaths(const QStringList &paths);
+    void setPluginPaths(const Utils::FilePaths &paths);
     const QVector<ExtensionSystem::PluginSpec *> loadQueue();
     void loadPlugin(PluginSpec *spec, PluginSpec::State destState);
     void resolveDependencies();
@@ -91,7 +91,7 @@ public:
     QHash<QString, QVector<PluginSpec *>> pluginCategories;
     QVector<PluginSpec *> pluginSpecs;
     std::vector<TestSpec> testSpecs;
-    QStringList pluginPaths;
+    Utils::FilePaths pluginPaths;
     QString pluginIID;
     QVector<QObject *> allObjects;      // ### make this a QVector<QPointer<QObject> > > ?
     QStringList defaultDisabledPlugins; // Plugins/Ignored from install settings
@@ -119,10 +119,6 @@ public:
     PluginSpec *pluginForOption(const QString &option, bool *requiresArgument) const;
     PluginSpec *pluginByName(const QString &name) const;
 
-    // used by tests
-    static PluginSpec *createSpec();
-    static PluginSpecPrivate *privateSpec(PluginSpec *spec);
-
     static void addTestCreator(IPlugin *plugin, const std::function<QObject *()> &testCreator);
 
     mutable QReadWriteLock m_lock;
@@ -140,7 +136,6 @@ public:
     QWaitCondition m_scenarioWaitCondition;
 
     PluginManager::ProcessData m_creatorProcessData;
-    std::unique_ptr<Utils::FutureSynchronizer> m_futureSynchronizer;
 
 private:
     PluginManager *q;
@@ -155,7 +150,7 @@ private:
     void deleteAll();
     void checkForDuplicatePlugins();
 
-#ifdef WITH_TESTS
+#ifdef EXTENSIONSYSTEM_WITH_TESTOPTION
     void startTests();
 #endif
 };
diff --git a/src/libs/extensionsystem/pluginspec.cpp b/src/libs/extensionsystem/pluginspec.cpp
index 49f9c680fe8..d2515760493 100644
--- a/src/libs/extensionsystem/pluginspec.cpp
+++ b/src/libs/extensionsystem/pluginspec.cpp
@@ -6,7 +6,6 @@
 #include "extensionsystemtr.h"
 #include "iplugin.h"
 #include "pluginmanager.h"
-#include "pluginspec_p.h"
 
 #include <utils/algorithm.h>
 #include <utils/hostosinfo.h>
@@ -24,7 +23,10 @@
 #include <QJsonValue>
 #include <QPluginLoader>
 
+Q_LOGGING_CATEGORY(pluginSpecLog, "qtc.extensionsystem.plugin", QtWarningMsg)
+
 using namespace ExtensionSystem::Internal;
+using namespace Utils;
 
 namespace ExtensionSystem {
 
@@ -168,22 +170,78 @@ QString PluginDependency::toString() const
     return name + " (" + version + typeString(type) + ")";
 }
 
-/*!
-    \internal
-*/
-PluginSpec::PluginSpec()
-    : d(new PluginSpecPrivate(this))
+namespace Internal {
+class PluginSpecImplPrivate
 {
-}
+public:
+    std::optional<QPluginLoader> loader;
+    std::optional<QStaticPlugin> staticPlugin;
+
+    IPlugin *plugin = nullptr;
+};
+
+class PluginSpecPrivate
+{
+public:
+    ExtensionSystem::PerformanceData performanceData;
+
+    QString name;
+    QString version;
+    QString compatVersion;
+    QString vendor;
+    QString category;
+    QString description;
+    QString longDescription;
+    QString url;
+    QString license;
+    QString revision;
+    QString copyright;
+    QStringList arguments;
+    QRegularExpression platformSpecification;
+    QVector<ExtensionSystem::PluginDependency> dependencies;
+
+    PluginSpec::PluginArgumentDescriptions argumentDescriptions;
+    FilePath location;
+    FilePath filePath;
+
+    bool experimental{false};
+    bool deprecated{false};
+    bool required{false};
+
+    bool enabledByDefault{false};
+    bool enabledBySettings{true};
+    bool enabledIndirectly{false};
+    bool forceEnabled{false};
+    bool forceDisabled{false};
+    bool softLoadable{false};
+
+    std::optional<QString> errorString;
+
+    PluginSpec::State state;
+    QHash<PluginDependency, PluginSpec *> dependencySpecs;
+
+    QJsonObject metaData;
+
+    Utils::expected_str<void> readMetaData(const QJsonObject &metaData);
+    Utils::expected_str<void> reportError(const QString &error)
+    {
+        errorString = error;
+        return {};
+    };
+};
+} // namespace Internal
 
 /*!
     \internal
 */
-PluginSpec::~PluginSpec()
-{
-    delete d;
-    d = nullptr;
-}
+CppPluginSpec::CppPluginSpec()
+    : d(new PluginSpecImplPrivate)
+{}
+
+/*!
+    \internal
+*/
+CppPluginSpec::~CppPluginSpec() = default;
 
 /*!
     Returns the plugin name. This is valid after the PluginSpec::Read state is
@@ -278,10 +336,7 @@ QString PluginSpec::category() const
 
 QString PluginSpec::revision() const
 {
-    const QJsonValue revision = metaData().value("Revision");
-    if (revision.isString())
-        return revision.toString();
-    return QString();
+    return d->revision;
 }
 
 /*!
@@ -419,7 +474,7 @@ QJsonObject PluginSpec::metaData() const
     return d->metaData;
 }
 
-const PerformanceData &PluginSpec::performanceData() const
+PerformanceData &PluginSpec::performanceData() const
 {
     return d->performanceData;
 }
@@ -436,7 +491,7 @@ PluginSpec::PluginArgumentDescriptions PluginSpec::argumentDescriptions() const
 /*!
     Returns the absolute path to the directory containing the plugin.
 */
-QString PluginSpec::location() const
+FilePath PluginSpec::location() const
 {
     return d->location;
 }
@@ -444,7 +499,7 @@ QString PluginSpec::location() const
 /*!
     Returns the absolute path to the plugin.
 */
-QString PluginSpec::filePath() const
+FilePath PluginSpec::filePath() const
 {
     return d->filePath;
 }
@@ -491,7 +546,7 @@ PluginSpec::State PluginSpec::state() const
 */
 bool PluginSpec::hasError() const
 {
-    return d->hasError;
+    return d->errorString.has_value();
 }
 
 /*!
@@ -500,18 +555,21 @@ bool PluginSpec::hasError() const
 */
 QString PluginSpec::errorString() const
 {
-    return d->errorString;
+    return d->errorString.value_or(QString());
 }
 
 /*!
-    Returns whether this plugin can be used to fill in a dependency of the given
-    \a pluginName and \a version.
+    Returns whether the plugin \a spec can be used to fill the \a dependency of this plugin.
 
-        \sa PluginSpec::dependencies()
+    \sa PluginSpec::dependencies()
 */
-bool PluginSpec::provides(const QString &pluginName, const QString &version) const
+bool PluginSpec::provides(PluginSpec *spec, const PluginDependency &dependency) const
 {
-    return d->provides(pluginName, version);
+    if (QString::compare(dependency.name, spec->name(), Qt::CaseInsensitive) != 0)
+        return false;
+
+    return (versionCompare(spec->version(), dependency.version) >= 0)
+           && (versionCompare(spec->compatVersion(), dependency.version) <= 0);
 }
 
 /*!
@@ -519,7 +577,7 @@ bool PluginSpec::provides(const QString &pluginName, const QString &version) con
     already been successfully loaded. That is, the PluginSpec::Loaded state
     is reached.
 */
-IPlugin *PluginSpec::plugin() const
+IPlugin *CppPluginSpec::plugin() const
 {
     return d->plugin;
 }
@@ -548,6 +606,11 @@ bool PluginSpec::requiresAny(const QSet<PluginSpec *> &plugins) const
     return false;
 }
 
+void PluginSpec::setEnabledByDefault(bool value)
+{
+    d->enabledByDefault = value;
+}
+
 /*!
     Sets whether the plugin should be loaded at startup to \a value.
 
@@ -555,27 +618,44 @@ bool PluginSpec::requiresAny(const QSet<PluginSpec *> &plugins) const
 */
 void PluginSpec::setEnabledBySettings(bool value)
 {
-    d->setEnabledBySettings(value);
+    d->enabledBySettings = value;
+}
+void PluginSpec::setEnabledIndirectly(bool value)
+{
+    d->enabledIndirectly = value;
+}
+void PluginSpec::setForceDisabled(bool value)
+{
+    if (value)
+        d->forceEnabled = false;
+    d->forceDisabled = value;
+}
+void PluginSpec::setForceEnabled(bool value)
+{
+    if (value)
+        d->forceDisabled = false;
+    d->forceEnabled = value;
 }
 
-PluginSpec *PluginSpec::read(const QString &filePath)
+// returns the plugins that it actually indirectly enabled
+PluginSpecs PluginSpec::enableDependenciesIndirectly(bool enableTestDependencies)
 {
-    auto spec = new PluginSpec;
-    if (!spec->d->read(filePath)) { // not a Qt Creator plugin
-        delete spec;
-        return nullptr;
-    }
-    return spec;
-}
+    if (!isEffectivelyEnabled()) // plugin not enabled, nothing to do
+        return {};
 
-PluginSpec *PluginSpec::read(const QStaticPlugin &plugin)
-{
-    auto spec = new PluginSpec;
-    if (!spec->d->read(plugin)) { // not a Qt Creator plugin
-        delete spec;
-        return nullptr;
+    PluginSpecs enabled;
+    for (auto it = d->dependencySpecs.cbegin(), end = d->dependencySpecs.cend(); it != end; ++it) {
+        if (it.key().type != PluginDependency::Required
+            && (!enableTestDependencies || it.key().type != PluginDependency::Test))
+            continue;
+
+        PluginSpec *dependencySpec = it.value();
+        if (!dependencySpec->isEffectivelyEnabled()) {
+            dependencySpec->setEnabledIndirectly(true);
+            enabled << dependencySpec;
+        }
     }
-    return spec;
+    return enabled;
 }
 
 //==========PluginSpecPrivate==================
@@ -610,112 +690,46 @@ namespace {
     const char ARGUMENT_PARAMETER[] = "Parameter";
     const char ARGUMENT_DESCRIPTION[] = "Description";
 }
-/*!
-    \internal
-*/
-PluginSpecPrivate::PluginSpecPrivate(PluginSpec *spec)
-    : q(spec)
-{}
-
-void PluginSpecPrivate::reset()
-{
-    name.clear();
-    version.clear();
-    compatVersion.clear();
-    vendor.clear();
-    copyright.clear();
-    license.clear();
-    description.clear();
-    longDescription.clear();
-    url.clear();
-    category.clear();
-    location.clear();
-    filePath.clear();
-    state = PluginSpec::Invalid;
-    hasError = false;
-    errorString.clear();
-    dependencies.clear();
-    metaData = QJsonObject();
-    loader.reset();
-    staticPlugin.reset();
-}
 
 /*!
     \internal
     Returns false if the file does not represent a Qt Creator plugin.
 */
-bool PluginSpecPrivate::read(const QString &fileName)
+expected_str<PluginSpec *> readCppPluginSpec(const FilePath &fileName)
 {
-    qCDebug(pluginLog) << "\nReading meta data of" << fileName;
-    reset();
-    QFileInfo fileInfo(fileName);
-    location = fileInfo.absolutePath();
-    filePath = fileInfo.absoluteFilePath();
-    loader.emplace();
+    auto spec = new CppPluginSpec;
+
+    const FilePath absPath = fileName.absoluteFilePath();
+
+    spec->setLocation(absPath.parentDir());
+    spec->setFilePath(absPath);
+    spec->d->loader.emplace();
+
     if (Utils::HostOsInfo::isMacHost())
-        loader->setLoadHints(QLibrary::ExportExternalSymbolsHint);
-    loader->setFileName(filePath);
-    if (loader->fileName().isEmpty()) {
-        qCDebug(pluginLog) << "Cannot open file";
-        return false;
-    }
+        spec->d->loader->setLoadHints(QLibrary::ExportExternalSymbolsHint);
 
-    if (!readMetaData(loader->metaData()))
-        return false;
+    spec->d->loader->setFileName(absPath.toFSPathString());
+    if (spec->d->loader->fileName().isEmpty())
+        return make_unexpected(::ExtensionSystem::Tr::tr("Cannot open file"));
 
-    state = PluginSpec::Read;
-    return true;
+    expected_str<void> r = spec->readMetaData(spec->d->loader->metaData());
+    if (!r)
+        return make_unexpected(r.error());
+
+    return spec;
 }
 
-bool PluginSpecPrivate::read(const QStaticPlugin &plugin)
+expected_str<PluginSpec *> readCppPluginSpec(const QStaticPlugin &plugin)
 {
+    auto spec = new CppPluginSpec;
+
     qCDebug(pluginLog) << "\nReading meta data of static plugin";
-    reset();
-    staticPlugin = plugin;
-    if (!readMetaData(plugin.metaData()))
-        return false;
+    spec->d->staticPlugin = plugin;
+    expected_str<void> r = spec->readMetaData(plugin.metaData());
+    if (!r)
+        return make_unexpected(r.error());
 
-    state = PluginSpec::Read;
-    return true;
-}
-
-void PluginSpecPrivate::setEnabledBySettings(bool value)
-{
-    enabledBySettings = value;
-}
-
-void PluginSpecPrivate::setEnabledByDefault(bool value)
-{
-    enabledByDefault = value;
-}
-
-void PluginSpecPrivate::setForceEnabled(bool value)
-{
-    forceEnabled = value;
-    if (value)
-        forceDisabled = false;
-}
-
-void PluginSpecPrivate::setForceDisabled(bool value)
-{
-    if (value)
-        forceEnabled = false;
-    forceDisabled = value;
-}
-
-void PluginSpecPrivate::setSoftLoadable(bool value)
-{
-    softLoadable = value;
-}
-
-/*!
-    \internal
-*/
-bool PluginSpecPrivate::reportError(const QString &err)
-{
-    errorString = err;
-    hasError = true;
-    return true;
+    return spec;
 }
 
 static inline QString msgValueMissing(const char *key)
@@ -725,58 +739,67 @@ static inline QString msgValueMissing(const char *key)
 
 static inline QString msgValueIsNotAString(const char *key)
 {
-    return Tr::tr("Value for key \"%1\" is not a string")
-            .arg(QLatin1String(key));
+    return Tr::tr("Value for key \"%1\" is not a string").arg(QLatin1String(key));
 }
 
 static inline QString msgValueIsNotABool(const char *key)
 {
-    return Tr::tr("Value for key \"%1\" is not a bool")
-            .arg(QLatin1String(key));
+    return Tr::tr("Value for key \"%1\" is not a bool").arg(QLatin1String(key));
 }
 
 static inline QString msgValueIsNotAObjectArray(const char *key)
 {
-    return Tr::tr("Value for key \"%1\" is not an array of objects")
-            .arg(QLatin1String(key));
+    return Tr::tr("Value for key \"%1\" is not an array of objects").arg(QLatin1String(key));
 }
 
 static inline QString msgValueIsNotAMultilineString(const char *key)
 {
     return Tr::tr("Value for key \"%1\" is not a string and not an array of strings")
-            .arg(QLatin1String(key));
+        .arg(QLatin1String(key));
 }
 
 static inline QString msgInvalidFormat(const char *key, const QString &content)
 {
-    return Tr::tr("Value \"%2\" for key \"%1\" has invalid format")
-            .arg(QLatin1String(key), content);
+    return Tr::tr("Value \"%2\" for key \"%1\" has invalid format").arg(QLatin1String(key), content);
+}
+
+Utils::expected_str<void> PluginSpec::readMetaData(const QJsonObject &metaData)
+{
+    return d->readMetaData(metaData);
+}
+Utils::expected_str<void> PluginSpec::reportError(const QString &error)
+{
+    return d->reportError(error);
 }
 
 /*!
     \internal
 */
-bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
+expected_str<void> CppPluginSpec::readMetaData(const QJsonObject &pluginMetaData)
 {
-    qCDebug(pluginLog) << "MetaData:" << QJsonDocument(pluginMetaData).toJson();
+    qCDebug(pluginLog).noquote() << "MetaData:" << QJsonDocument(pluginMetaData).toJson();
     QJsonValue value;
     value = pluginMetaData.value(QLatin1String("IID"));
-    if (!value.isString()) {
-        qCDebug(pluginLog) << "Not a plugin (no string IID found)";
-        return false;
-    }
-    if (value.toString() != PluginManager::pluginIID()) {
-        qCDebug(pluginLog) << "Plugin ignored (IID does not match)";
-        return false;
-    }
+    if (!value.isString())
+        return make_unexpected(::ExtensionSystem::Tr::tr("No IID found"));
+
+    if (value.toString() != PluginManager::pluginIID())
+        return make_unexpected(::ExtensionSystem::Tr::tr("Expected IID \"%1\", but found \"%2\"")
+                                   .arg(PluginManager::pluginIID())
+                                   .arg(value.toString()));
 
     value = pluginMetaData.value(QLatin1String(PLUGIN_METADATA));
-    if (!value.isObject()) {
+    if (!value.isObject())
         return reportError(::ExtensionSystem::Tr::tr("Plugin meta data not found"));
-    }
-    metaData = value.toObject();
 
-    value = metaData.value(QLatin1String(PLUGIN_NAME));
+    return PluginSpec::readMetaData(value.toObject());
+}
+
+Utils::expected_str<void> PluginSpecPrivate::readMetaData(const QJsonObject &data)
+{
+    metaData = data;
+
+    QJsonValue value = metaData.value(QLatin1String(PLUGIN_NAME));
     if (value.isUndefined())
         return reportError(msgValueMissing(PLUGIN_NAME));
     if (!value.isString())
@@ -789,14 +812,14 @@ bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
     if (!value.isString())
         return reportError(msgValueIsNotAString(PLUGIN_VERSION));
     version = value.toString();
-    if (!isValidVersion(version))
+    if (!PluginSpec::isValidVersion(version))
         return reportError(msgInvalidFormat(PLUGIN_VERSION, version));
 
     value = metaData.value(QLatin1String(PLUGIN_COMPATVERSION));
     if (!value.isUndefined() && !value.isString())
         return reportError(msgValueIsNotAString(PLUGIN_COMPATVERSION));
     compatVersion = value.toString(version);
-    if (!value.isUndefined() && !isValidVersion(compatVersion))
+    if (!value.isUndefined() && !PluginSpec::isValidVersion(compatVersion))
         return reportError(msgInvalidFormat(PLUGIN_COMPATVERSION, compatVersion));
 
     value = metaData.value(QLatin1String(PLUGIN_REQUIRED));
@@ -820,11 +843,9 @@ bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
     value = metaData.value(QLatin1String(PLUGIN_DISABLED_BY_DEFAULT));
     if (!value.isUndefined() && !value.isBool())
         return reportError(msgValueIsNotABool(PLUGIN_DISABLED_BY_DEFAULT));
-    enabledByDefault = !value.toBool(false);
+    enabledByDefault = !value.toBool(experimental || deprecated);
     qCDebug(pluginLog) << "enabledByDefault =" << enabledByDefault;
 
-    if (experimental || deprecated)
-        enabledByDefault = false;
     enabledBySettings = enabledByDefault;
 
     value = metaData.value(QLatin1String(PLUGIN_SOFTLOADABLE));
@@ -844,11 +865,11 @@ bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
     copyright = value.toString();
 
     value = metaData.value(QLatin1String(DESCRIPTION));
-    if (!value.isUndefined() && !Utils::readMultiLineString(value, &description))
+    if (!value.isUndefined() && !readMultiLineString(value, &description))
         return reportError(msgValueIsNotAString(DESCRIPTION));
 
     value = metaData.value(QLatin1String(LONGDESCRIPTION));
-    if (!value.isUndefined() && !Utils::readMultiLineString(value, &longDescription))
+    if (!value.isUndefined() && !readMultiLineString(value, &longDescription))
         return reportError(msgValueIsNotAString(LONGDESCRIPTION));
 
     value = metaData.value(QLatin1String(URL));
@@ -862,9 +883,14 @@ bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
     category = value.toString();
 
     value = metaData.value(QLatin1String(LICENSE));
-    if (!value.isUndefined() && !Utils::readMultiLineString(value, &license))
+    if (!value.isUndefined() && !readMultiLineString(value, &license))
         return reportError(msgValueIsNotAMultilineString(LICENSE));
 
+    value = metaData.value("Revision");
+    if (!value.isUndefined() && !value.isString())
+        return reportError(msgValueIsNotAString("Revision"));
+    revision = value.toString();
+
     value = metaData.value(QLatin1String(PLATFORM));
     if (!value.isUndefined() && !value.isString())
         return reportError(msgValueIsNotAString(PLATFORM));
@@ -906,7 +932,7 @@ bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
                         .arg(msgValueIsNotAString(DEPENDENCY_VERSION)));
             }
             dep.version = value.toString();
-            if (!isValidVersion(dep.version)) {
+            if (!PluginSpec::isValidVersion(dep.version)) {
                 return reportError(
                     ::ExtensionSystem::Tr::tr("Dependency: %1")
                         .arg(msgInvalidFormat(DEPENDENCY_VERSION, dep.version)));
@@ -987,23 +1013,15 @@ bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
         }
     }
 
-    return true;
+    state = PluginSpec::Read;
+
+    return {};
 }
 
 /*!
     \internal
 */
-bool PluginSpecPrivate::provides(const QString &pluginName, const QString &pluginVersion) const
-{
-    if (QString::compare(pluginName, name, Qt::CaseInsensitive) != 0)
-        return false;
-    return (versionCompare(version, pluginVersion) >= 0) && (versionCompare(compatVersion, pluginVersion) <= 0);
-}
-
-/*!
-    \internal
-*/
-const QRegularExpression &PluginSpecPrivate::versionRegExp()
+static const QRegularExpression &versionRegExp()
 {
     static const QRegularExpression reg("^([0-9]+)(?:[.]([0-9]+))?(?:[.]([0-9]+))?(?:_([0-9]+))?$");
     return reg;
@@ -1011,7 +1029,7 @@ const QRegularExpression &PluginSpecPrivate::versionRegExp()
 /*!
     \internal
 */
-bool PluginSpecPrivate::isValidVersion(const QString &version)
+bool PluginSpec::isValidVersion(const QString &version)
 {
     return versionRegExp().match(version).hasMatch();
 }
@@ -1019,7 +1037,7 @@ bool PluginSpecPrivate::isValidVersion(const QString &version)
 /*!
     \internal
 */
-int PluginSpecPrivate::versionCompare(const QString &version1, const QString &version2)
+int PluginSpec::versionCompare(const QString &version1, const QString &version2)
 {
     const QRegularExpressionMatch match1 = versionRegExp().match(version1);
     const QRegularExpressionMatch match2 = versionRegExp().match(version2);
@@ -1041,196 +1059,206 @@ int PluginSpecPrivate::versionCompare(const QString &version1, const QString &ve
 /*!
     \internal
 */
-bool PluginSpecPrivate::resolveDependencies(const QVector<PluginSpec *> &specs)
+bool PluginSpec::resolveDependencies(const PluginSpecs &specs)
 {
-    if (hasError)
+    if (hasError())
         return false;
-    if (state == PluginSpec::Resolved)
-        state = PluginSpec::Read; // Go back, so we just re-resolve the dependencies.
-    if (state != PluginSpec::Read) {
-        errorString = ::ExtensionSystem::Tr::tr("Resolving dependencies failed because state != Read");
-        hasError = true;
+    if (state() > PluginSpec::Resolved)
+        return true; // We are resolved already.
+    if (state() == PluginSpec::Resolved)
+        setState(PluginSpec::Read); // Go back, so we just re-resolve the dependencies.
+    if (state() != PluginSpec::Read) {
+        setError(::ExtensionSystem::Tr::tr("Resolving dependencies failed because state != Read"));
         return false;
     }
+
     QHash<PluginDependency, PluginSpec *> resolvedDependencies;
-    for (const PluginDependency &dependency : std::as_const(dependencies)) {
-        PluginSpec * const found = Utils::findOrDefault(specs, [&dependency](PluginSpec *spec) {
-            return spec->provides(dependency.name, dependency.version);
+    for (const PluginDependency &dependency : d->dependencies) {
+        PluginSpec *const found = findOrDefault(specs, [this, &dependency](PluginSpec *spec) {
+            return provides(spec, dependency);
         });
         if (!found) {
             if (dependency.type == PluginDependency::Required) {
-                hasError = true;
-                if (!errorString.isEmpty())
-                    errorString.append(QLatin1Char('\n'));
-                errorString.append(::ExtensionSystem::Tr::tr("Could not resolve dependency '%1(%2)'")
-                    .arg(dependency.name, dependency.version));
+                const QString error = ::ExtensionSystem::Tr::tr(
+                                          "Could not resolve dependency '%1(%2)'")
+                                          .arg(dependency.name, dependency.version);
+                if (hasError())
+                    setError(errorString() + '\n' + error);
+                else
+                    setError(error);
             }
             continue;
         }
         resolvedDependencies.insert(dependency, found);
     }
-    if (hasError)
+    if (hasError())
         return false;
 
-    dependencySpecs = resolvedDependencies;
+    d->dependencySpecs = resolvedDependencies;
 
-    state = PluginSpec::Resolved;
+    d->state = PluginSpec::Resolved;
 
     return true;
 }
 
-// returns the plugins that it actually indirectly enabled
-QVector<PluginSpec *> PluginSpecPrivate::enableDependenciesIndirectly(bool enableTestDependencies)
+PluginSpec::PluginSpec()
+    : d(new PluginSpecPrivate())
+{}
+
+PluginSpec::~PluginSpec() = default;
+
+void PluginSpec::setState(State state)
 {
-    if (!q->isEffectivelyEnabled()) // plugin not enabled, nothing to do
-        return {};
-    QVector<PluginSpec *> enabled;
-    for (auto it = dependencySpecs.cbegin(), end = dependencySpecs.cend(); it != end; ++it) {
-        if (it.key().type != PluginDependency::Required
-                && (!enableTestDependencies || it.key().type != PluginDependency::Test))
-            continue;
-        PluginSpec *dependencySpec = it.value();
-        if (!dependencySpec->isEffectivelyEnabled()) {
-            dependencySpec->d->enabledIndirectly = true;
-            enabled << dependencySpec;
-        }
-    }
-    return enabled;
+    d->state = state;
+}
+
+void PluginSpec::setLocation(const FilePath &location)
+{
+    d->location = location;
+}
+
+void PluginSpec::setFilePath(const FilePath &filePath)
+{
+    d->filePath = filePath;
+}
+
+void PluginSpec::setError(const QString &errorString)
+{
+    qCWarning(pluginSpecLog).noquote() << "[" << name() << "]"
+                                       << "Plugin error:" << errorString;
+    d->errorString = errorString;
 }
 
 /*!
     \internal
 */
-bool PluginSpecPrivate::loadLibrary()
+bool CppPluginSpec::loadLibrary()
 {
-    if (hasError)
+    if (hasError())
         return false;
-    if (state != PluginSpec::Resolved) {
-        if (state == PluginSpec::Loaded)
+
+    if (state() != PluginSpec::Resolved) {
+        if (state() == PluginSpec::Loaded)
             return true;
-        errorString =
-            ::ExtensionSystem::Tr::tr("Loading the library failed because state != Resolved");
-        hasError = true;
+        setError(::ExtensionSystem::Tr::tr("Loading the library failed because state != Resolved"));
         return false;
     }
-    if (loader && !loader->load()) {
-        hasError = true;
-        errorString = QDir::toNativeSeparators(filePath) + QString::fromLatin1(": ")
-                      + loader->errorString();
+    if (d->loader && !d->loader->load()) {
+        setError(filePath().toUserOutput() + QString::fromLatin1(": ") + d->loader->errorString());
         return false;
     }
-    auto *pluginObject = loader ? qobject_cast<IPlugin *>(loader->instance())
-                                : qobject_cast<IPlugin *>(staticPlugin->instance());
+    auto *pluginObject = d->loader ? qobject_cast<IPlugin *>(d->loader->instance())
+                                   : qobject_cast<IPlugin *>(d->staticPlugin->instance());
     if (!pluginObject) {
-        hasError = true;
-        errorString =
-            ::ExtensionSystem::Tr::tr("Plugin is not valid (does not derive from IPlugin)");
-        if (loader)
-            loader->unload();
+        setError(::ExtensionSystem::Tr::tr("Plugin is not valid (does not derive from IPlugin)"));
+        if (d->loader)
+            d->loader->unload();
         return false;
     }
-    state = PluginSpec::Loaded;
-    plugin = pluginObject;
+    setState(PluginSpec::Loaded);
+    d->plugin = pluginObject;
     return true;
 }
 
 /*!
     \internal
 */
-bool PluginSpecPrivate::initializePlugin()
+bool CppPluginSpec::initializePlugin()
 {
-    if (hasError)
+    if (hasError())
         return false;
-    if (state != PluginSpec::Loaded) {
-        if (state == PluginSpec::Initialized)
+
+    if (state() != PluginSpec::Loaded) {
+        if (state() == PluginSpec::Initialized)
             return true;
-        errorString = ::ExtensionSystem::Tr::tr(
-            "Initializing the plugin failed because state != Loaded");
-        hasError = true;
+        setError(
+            ::ExtensionSystem::Tr::tr("Initializing the plugin failed because state != Loaded"));
         return false;
     }
-    if (!plugin) {
-        errorString = ::ExtensionSystem::Tr::tr(
-            "Internal error: have no plugin instance to initialize");
-        hasError = true;
+    if (!d->plugin) {
+        setError(
+            ::ExtensionSystem::Tr::tr("Internal error: have no plugin instance to initialize"));
         return false;
     }
     QString err;
-    if (!plugin->initialize(arguments, &err)) {
-        errorString = ::ExtensionSystem::Tr::tr("Plugin initialization failed: %1").arg(err);
-        hasError = true;
+    if (!d->plugin->initialize(arguments(), &err)) {
+        setError(::ExtensionSystem::Tr::tr("Plugin initialization failed: %1").arg(err));
         return false;
     }
-    state = PluginSpec::Initialized;
+    setState(PluginSpec::Initialized);
     return true;
 }
 
 /*!
     \internal
 */
-bool PluginSpecPrivate::initializeExtensions()
+bool CppPluginSpec::initializeExtensions()
 {
-    if (hasError)
+    if (hasError())
         return false;
-    if (state != PluginSpec::Initialized) {
-        if (state == PluginSpec::Running)
+
+    if (state() != PluginSpec::Initialized) {
+        if (state() == PluginSpec::Running)
             return true;
-        errorString = ::ExtensionSystem::Tr::tr(
-            "Cannot perform extensionsInitialized because state != Initialized");
-        hasError = true;
+        setError(::ExtensionSystem::Tr::tr(
+            "Cannot perform extensionsInitialized because state != Initialized"));
         return false;
     }
-    if (!plugin) {
-        errorString = ::ExtensionSystem::Tr::tr(
-            "Internal error: have no plugin instance to perform extensionsInitialized");
-        hasError = true;
+    if (!d->plugin) {
+        setError(::ExtensionSystem::Tr::tr(
+            "Internal error: have no plugin instance to perform extensionsInitialized"));
         return false;
     }
-    plugin->extensionsInitialized();
-    state = PluginSpec::Running;
+    d->plugin->extensionsInitialized();
+    setState(PluginSpec::Running);
     return true;
 }
 
 /*!
     \internal
 */
-bool PluginSpecPrivate::delayedInitialize()
+bool CppPluginSpec::delayedInitialize()
 {
-    if (hasError)
+    if (hasError())
+        return true;
+
+    if (state() != PluginSpec::Running)
         return false;
-    if (state != PluginSpec::Running)
-        return false;
-    if (!plugin) {
-        errorString = ::ExtensionSystem::Tr::tr(
-            "Internal error: have no plugin instance to perform delayedInitialize");
-        hasError = true;
+    if (!d->plugin) {
+        setError(::ExtensionSystem::Tr::tr(
+            "Internal error: have no plugin instance to perform delayedInitialize"));
         return false;
     }
-    const bool res =  plugin->delayedInitialize();
+    const bool res = d->plugin->delayedInitialize();
     return res;
 }
 
 /*!
     \internal
 */
-IPlugin::ShutdownFlag PluginSpecPrivate::stop()
+IPlugin::ShutdownFlag CppPluginSpec::stop()
 {
-    if (!plugin)
+    if (hasError())
+        return IPlugin::ShutdownFlag::SynchronousShutdown;
+
+    if (!d->plugin)
         return IPlugin::SynchronousShutdown;
-    state = PluginSpec::Stopped;
-    return plugin->aboutToShutdown();
+    setState(PluginSpec::Stopped);
+    return d->plugin->aboutToShutdown();
 }
 
 /*!
     \internal
 */
-void PluginSpecPrivate::kill()
+void CppPluginSpec::kill()
 {
-    if (!plugin)
+    if (hasError())
         return;
-    delete plugin;
-    plugin = nullptr;
-    state = PluginSpec::Deleted;
-}
 
-} // ExtensionSystem
+    if (!d->plugin)
+        return;
+    delete d->plugin;
+    d->plugin = nullptr;
+    setState(PluginSpec::Deleted);
+}
+} // namespace ExtensionSystem
diff --git a/src/libs/extensionsystem/pluginspec.h b/src/libs/extensionsystem/pluginspec.h
index 8db6bb44114..e9a771d4a99 100644
--- a/src/libs/extensionsystem/pluginspec.h
+++ b/src/libs/extensionsystem/pluginspec.h
@@ -5,6 +5,11 @@
 
 #include "extensionsystem_global.h"
 
+#include "iplugin.h"
+
+#include <utils/expected.h>
+#include <utils/filepath.h>
+
 #include <QHash>
 #include <QStaticPlugin>
 #include <QString>
@@ -14,30 +19,31 @@ QT_BEGIN_NAMESPACE
 class QRegularExpression;
 QT_END_NAMESPACE
 
+class tst_PluginSpec;
+
 namespace ExtensionSystem {
 
 namespace Internal {
 
 class OptionsParser;
-class PluginSpecPrivate;
+class PluginSpecImplPrivate;
 class PluginManagerPrivate;
+class PluginSpecPrivate;
 
 } // Internal
 
-class IPlugin;
 class PluginView;
 
 struct EXTENSIONSYSTEM_EXPORT PluginDependency
 {
-    enum Type {
-        Required,
-        Optional,
-        Test
-    };
+    enum Type { Required, Optional, Test };
 
     PluginDependency() : type(Required) {}
-
-    friend size_t qHash(const PluginDependency &value);
+    PluginDependency(const QString &name, const QString &version, Type type = Required)
+        : name(name)
+        , version(version)
+        , type(type)
+    {}
 
     QString name;
     QString version;
@@ -46,6 +52,8 @@ struct EXTENSIONSYSTEM_EXPORT PluginDependency
     QString toString() const;
 };
 
+size_t EXTENSIONSYSTEM_EXPORT qHash(const PluginDependency &value);
+
 struct EXTENSIONSYSTEM_EXPORT PluginArgumentDescription
 {
     QString name;
@@ -71,79 +79,137 @@ struct EXTENSIONSYSTEM_EXPORT PerformanceData
     }
 };
 
+using PluginSpecs = QList<class PluginSpec *>;
+
 class EXTENSIONSYSTEM_EXPORT PluginSpec
 {
+    friend class ::tst_PluginSpec;
+    friend class Internal::PluginManagerPrivate;
+    friend class Internal::OptionsParser;
+
 public:
-    enum State { Invalid, Read, Resolved, Loaded, Initialized, Running, Stopped, Deleted};
-
-    ~PluginSpec();
-
-    // information from the xml file, valid after 'Read' state is reached
-    QString name() const;
-    QString version() const;
-    QString compatVersion() const;
-    QString vendor() const;
-    QString copyright() const;
-    QString license() const;
-    QString description() const;
-    QString longDescription() const;
-    QString url() const;
-    QString category() const;
-    QString revision() const;
-    QRegularExpression platformSpecification() const;
-    bool isAvailableForHostPlatform() const;
-    bool isRequired() const;
-    bool isExperimental() const;
-    bool isDeprecated() const;
-    bool isEnabledByDefault() const;
-    bool isEnabledBySettings() const;
-    bool isEffectivelyEnabled() const;
-    bool isEnabledIndirectly() const;
-    bool isForceEnabled() const;
-    bool isForceDisabled() const;
-    bool isSoftLoadable() const;
-    QVector<PluginDependency> dependencies() const;
-    QJsonObject metaData() const;
-    const PerformanceData &performanceData() const;
+    PluginSpec();
+    virtual ~PluginSpec();
 
     using PluginArgumentDescriptions = QVector<PluginArgumentDescription>;
-    PluginArgumentDescriptions argumentDescriptions() const;
+    enum State { Invalid, Read, Resolved, Loaded, Initialized, Running, Stopped, Deleted};
 
-    // other information, valid after 'Read' state is reached
-    QString location() const;
-    QString filePath() const;
+    // information read from the plugin, valid after 'Read' state is reached
+    virtual QString name() const;
+    virtual QString version() const;
+    virtual QString compatVersion() const;
+    virtual QString vendor() const;
+    virtual QString copyright() const;
+    virtual QString license() const;
+    virtual QString description() const;
+    virtual QString longDescription() const;
+    virtual QString url() const;
+    virtual QString category() const;
+    virtual QString revision() const;
+    virtual QRegularExpression platformSpecification() const;
 
-    QStringList arguments() const;
-    void setArguments(const QStringList &arguments);
-    void addArgument(const QString &argument);
+    virtual bool isAvailableForHostPlatform() const;
+    virtual bool isRequired() const;
+    virtual bool isExperimental() const;
+    virtual bool isDeprecated() const;
+    virtual bool isEnabledByDefault() const;
+    virtual bool isEnabledBySettings() const;
+    virtual bool isEffectivelyEnabled() const;
+    virtual bool isEnabledIndirectly() const;
+    virtual bool isForceEnabled() const;
+    virtual bool isForceDisabled() const;
+    virtual bool isSoftLoadable() const;
 
-    bool provides(const QString &pluginName, const QString &version) const;
+    virtual QVector<PluginDependency> dependencies() const;
+    virtual QJsonObject metaData() const;
+    virtual PerformanceData &performanceData() const;
+    virtual PluginArgumentDescriptions argumentDescriptions() const;
+    virtual Utils::FilePath location() const;
+    virtual Utils::FilePath filePath() const;
+    virtual QStringList arguments() const;
+    virtual void setArguments(const QStringList &arguments);
+    virtual void addArgument(const QString &argument);
+    virtual QHash<PluginDependency, PluginSpec *> dependencySpecs() const;
 
-    // dependency specs, valid after 'Resolved' state is reached
-    QHash<PluginDependency, PluginSpec *> dependencySpecs() const;
-    bool requiresAny(const QSet<PluginSpec *> &plugins) const;
+    virtual bool provides(PluginSpec *spec, const PluginDependency &dependency) const;
+    virtual bool requiresAny(const QSet<PluginSpec *> &plugins) const;
+    virtual PluginSpecs enableDependenciesIndirectly(bool enableTestDependencies);
+    virtual bool resolveDependencies(const PluginSpecs &pluginSpecs);
 
-    // linked plugin instance, valid after 'Loaded' state is reached
-    IPlugin *plugin() const;
+    virtual IPlugin *plugin() const = 0;
+    virtual State state() const;
+    virtual bool hasError() const;
+    virtual QString errorString() const;
 
-    // state
-    State state() const;
-    bool hasError() const;
-    QString errorString() const;
+    static bool isValidVersion(const QString &version);
+    static int versionCompare(const QString &version1, const QString &version2);
 
-    void setEnabledBySettings(bool value);
+    virtual void setEnabledBySettings(bool value);
 
-    static PluginSpec *read(const QString &filePath);
-    static PluginSpec *read(const QStaticPlugin &plugin);
+protected:
+    virtual void setEnabledByDefault(bool value);
+    virtual void setEnabledIndirectly(bool value);
+    virtual void setForceDisabled(bool value);
+    virtual void setForceEnabled(bool value);
+
+    virtual bool loadLibrary() = 0;
+    virtual bool initializePlugin() = 0;
+    virtual bool initializeExtensions() = 0;
+    virtual bool delayedInitialize() = 0;
+    virtual IPlugin::ShutdownFlag stop() = 0;
+    virtual void kill() = 0;
+
+    virtual void setError(const QString &errorString);
+
+protected:
+    virtual void setState(State state);
+
+    virtual void setLocation(const Utils::FilePath &location);
+    virtual void setFilePath(const Utils::FilePath &filePath);
+    virtual Utils::expected_str<void> readMetaData(const QJsonObject &metaData);
+    Utils::expected_str<void> reportError(const QString &error);
 
 private:
-    PluginSpec();
+    std::unique_ptr<Internal::PluginSpecPrivate> d;
+};
 
-    Internal::PluginSpecPrivate *d;
+EXTENSIONSYSTEM_EXPORT Utils::expected_str<PluginSpec *> readCppPluginSpec(
+    const Utils::FilePath &filePath);
+EXTENSIONSYSTEM_EXPORT Utils::expected_str<PluginSpec *> readCppPluginSpec(
+    const QStaticPlugin &plugin);
+
+class EXTENSIONSYSTEM_TEST_EXPORT CppPluginSpec : public PluginSpec
+{
+    friend EXTENSIONSYSTEM_EXPORT Utils::expected_str<PluginSpec *> readCppPluginSpec(
+        const Utils::FilePath &filePath);
+    friend EXTENSIONSYSTEM_EXPORT Utils::expected_str<PluginSpec *> readCppPluginSpec(
+        const QStaticPlugin &plugin);
+
+public:
+    ~CppPluginSpec() override;
+
+    // linked plugin instance, valid after 'Loaded' state is reached
+    IPlugin *plugin() const override;
+
+    bool loadLibrary() override;
+    bool initializePlugin() override;
+    bool initializeExtensions() override;
+    bool delayedInitialize() override;
+    IPlugin::ShutdownFlag stop() override;
+    void kill() override;
+
+    Utils::expected_str<void> readMetaData(const QJsonObject &pluginMetaData) override;
+
+protected:
+    CppPluginSpec();
+
+private:
+    std::unique_ptr<Internal::PluginSpecImplPrivate> d;
     friend class PluginView;
     friend class Internal::OptionsParser;
     friend class Internal::PluginManagerPrivate;
-    friend class Internal::PluginSpecPrivate;
+    friend class Internal::PluginSpecImplPrivate;
+    friend class ::tst_PluginSpec;
 };
 
 } // namespace ExtensionSystem
diff --git a/src/libs/extensionsystem/pluginspec_p.h b/src/libs/extensionsystem/pluginspec_p.h
deleted file mode 100644
index 61832213cad..00000000000
--- a/src/libs/extensionsystem/pluginspec_p.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include "pluginspec.h"
-#include "iplugin.h"
-
-#include <QJsonObject>
-#include <QObject>
-#include <QPluginLoader>
-#include <QRegularExpression>
-#include <QStringList>
-#include <QVector>
-#include <QXmlStreamReader>
-
-#include <optional>
-
-namespace ExtensionSystem {
-
-class IPlugin;
-
-namespace Internal {
-
-class EXTENSIONSYSTEM_TEST_EXPORT PluginSpecPrivate : public QObject
-{
-    Q_OBJECT
-
-public:
-    PluginSpecPrivate(PluginSpec *spec);
-
-    void reset();
-    bool read(const QString &fileName);
-    bool read(const QStaticPlugin &plugin);
-    bool provides(const QString &pluginName, const QString &version) const;
-    bool resolveDependencies(const QVector<PluginSpec *> &specs);
-    bool loadLibrary();
-    bool initializePlugin();
-    bool initializeExtensions();
-    bool delayedInitialize();
-    IPlugin::ShutdownFlag stop();
-    void kill();
-
-    void setEnabledBySettings(bool value);
-    void setEnabledByDefault(bool value);
-    void setForceEnabled(bool value);
-    void setForceDisabled(bool value);
-    void setSoftLoadable(bool value);
-
-    std::optional<QPluginLoader> loader;
-    std::optional<QStaticPlugin> staticPlugin;
-
-    QString name;
-    QString version;
-    QString compatVersion;
-    bool required = false;
-    bool experimental = false;
-    bool enabledByDefault = true;
-    bool deprecated = false;
-    QString vendor;
-    QString copyright;
-    QString license;
-    QString description;
-    QString longDescription;
-    QString url;
-    QString category;
-    QRegularExpression platformSpecification;
-    QVector<PluginDependency> dependencies;
-    QJsonObject metaData;
-    bool enabledBySettings = true;
-    bool enabledIndirectly = false;
-    bool forceEnabled = false;
-    bool forceDisabled = false;
-    bool softLoadable = false;
-
-    QString location;
-    QString filePath;
-    QStringList arguments;
-
-    QHash<PluginDependency, PluginSpec *> dependencySpecs;
-    PluginSpec::PluginArgumentDescriptions argumentDescriptions;
-    IPlugin *plugin = nullptr;
-
-    QList<TestCreator> registeredPluginTests;
-
-    PluginSpec::State state = PluginSpec::Invalid;
-    bool hasError = false;
-    QString errorString;
-
-    PerformanceData performanceData;
-
-    static bool isValidVersion(const QString &version);
-    static int versionCompare(const QString &version1, const QString &version2);
-
-    QVector<PluginSpec *> enableDependenciesIndirectly(bool enableTestDependencies = false);
-
-    bool readMetaData(const QJsonObject &pluginMetaData);
-
-private:
-    PluginSpec *q;
-
-    bool reportError(const QString &err);
-    static const QRegularExpression &versionRegExp();
-};
-
-} // namespace Internal
-} // namespace ExtensionSystem
diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp
index b29e5c21f6d..24ec0a969d5 100644
--- a/src/libs/extensionsystem/pluginview.cpp
+++ b/src/libs/extensionsystem/pluginview.cpp
@@ -5,7 +5,7 @@
 
 #include "extensionsystemtr.h"
 #include "pluginmanager.h"
-#include "pluginspec_p.h"
+#include "pluginspec.h"
 
 #include <utils/algorithm.h>
 #include <utils/categorysortfiltermodel.h>
@@ -89,8 +89,8 @@ static const QIcon &icon(IconIndex icon)
 class PluginItem : public TreeItem
 {
 public:
-    PluginItem(PluginSpec *spec, PluginView *view)
-        : m_spec(spec), m_view(view)
+    PluginItem(PluginSpec *spec, PluginData *data)
+        : m_spec(spec), m_data(data)
     {}
 
     QVariant data(int column, int role) const override
@@ -120,7 +120,7 @@ public:
                     toolTip = Tr::tr("Path: %1\nPlugin is disabled by command line argument.");
                 else
                     toolTip = Tr::tr("Path: %1");
-                return toolTip.arg(QDir::toNativeSeparators(m_spec->filePath()));
+                return toolTip.arg(m_spec->filePath().toUserOutput());
             }
             if (role == Qt::DecorationRole) {
                 bool ok = !m_spec->hasError();
@@ -167,7 +167,7 @@ public:
     bool setData(int column, const QVariant &data, int role) override
     {
         if (column == LoadedColumn && role == Qt::CheckStateRole)
-            return m_view->setPluginsEnabled({m_spec}, data.toBool());
+            return m_data->setPluginsEnabled({m_spec}, data.toBool());
         return false;
     }
 
@@ -193,19 +193,19 @@ public:
 
 public:
     PluginSpec *m_spec; // Not owned.
-    PluginView *m_view; // Not owned.
+    PluginData *m_data; // Not owned.
 };
 
 class CollectionItem : public TreeItem
 {
 public:
-    CollectionItem(const QString &name, const QVector<PluginSpec *> &plugins, PluginView *view)
+    CollectionItem(const QString &name, const PluginSpecs &plugins, PluginData *data)
         : m_name(name)
         , m_plugins(plugins)
-        , m_view(view)
+        , m_data(data)
     {
         for (PluginSpec *spec : plugins)
-            appendChild(new PluginItem(spec, view));
+            appendChild(new PluginItem(spec, data));
     }
 
     QVariant data(int column, int role) const override
@@ -239,9 +239,9 @@ public:
     bool setData(int column, const QVariant &data, int role) override
     {
         if (column == LoadedColumn && role == Qt::CheckStateRole) {
-            const QVector<PluginSpec *> affectedPlugins
+            const PluginSpecs affectedPlugins
                 = Utils::filtered(m_plugins, [](PluginSpec *spec) { return !spec->isRequired(); });
-            if (m_view->setPluginsEnabled(toSet(affectedPlugins), data.toBool())) {
+            if (m_data->setPluginsEnabled(toSet(affectedPlugins), data.toBool())) {
                 update();
                 return true;
             }
@@ -259,20 +259,32 @@ public:
 
 public:
     QString m_name;
-    const QVector<PluginSpec *> m_plugins;
-    PluginView *m_view; // Not owned.
+    const PluginSpecs m_plugins;
+    PluginData *m_data; // Not owned.
 };
 
 } // Internal
 
 using namespace ExtensionSystem::Internal;
 
+PluginData::PluginData(QWidget *parent, PluginView *owner)
+    : m_parent(parent), m_pluginView(owner)
+{
+    m_model = new TreeModel<TreeItem, CollectionItem, PluginItem>(parent);
+    m_model->setHeader({ Tr::tr("Name"), Tr::tr("Load"), Tr::tr("Version"), Tr::tr("Vendor") });
+
+    m_sortModel = new CategorySortFilterModel(parent);
+    m_sortModel->setSourceModel(m_model);
+    m_sortModel->setSortRole(SortRole);
+    m_sortModel->setFilterKeyColumn(-1/*all*/);
+}
+
 /*!
     Constructs a plugin view with \a parent that displays a list of plugins
     from a plugin manager.
 */
 PluginView::PluginView(QWidget *parent)
-    : QWidget(parent)
+    : QWidget(parent), m_data(this, this)
 {
     m_categoryView = new TreeView(this);
     m_categoryView->setAlternatingRowColors(true);
@@ -282,14 +294,7 @@ PluginView::PluginView(QWidget *parent)
     m_categoryView->setSelectionMode(QAbstractItemView::SingleSelection);
     m_categoryView->setSelectionBehavior(QAbstractItemView::SelectRows);
 
-    m_model = new TreeModel<TreeItem, CollectionItem, PluginItem>(this);
-    m_model->setHeader({ Tr::tr("Name"), Tr::tr("Load"), Tr::tr("Version"), Tr::tr("Vendor") });
-
-    m_sortModel = new CategorySortFilterModel(this);
-    m_sortModel->setSourceModel(m_model);
-    m_sortModel->setSortRole(SortRole);
-    m_sortModel->setFilterKeyColumn(-1/*all*/);
-    m_categoryView->setModel(m_sortModel);
+    m_categoryView->setModel(m_data.m_sortModel);
 
     auto *gridLayout = new QGridLayout(this);
     gridLayout->setContentsMargins(2, 2, 2, 2);
@@ -329,7 +334,7 @@ PluginSpec *PluginView::currentPlugin() const
 */
 void PluginView::setFilter(const QString &filter)
 {
-    m_sortModel->setFilterRegularExpression(
+    m_data.m_sortModel->setFilterRegularExpression(
         QRegularExpression(QRegularExpression::escape(filter),
                            QRegularExpression::CaseInsensitiveOption));
     m_categoryView->expandAll();
@@ -337,33 +342,38 @@ void PluginView::setFilter(const QString &filter)
 
 PluginSpec *PluginView::pluginForIndex(const QModelIndex &index) const
 {
-    const QModelIndex &sourceIndex = m_sortModel->mapToSource(index);
-    PluginItem *item = m_model->itemForIndexAtLevel<2>(sourceIndex);
+    const QModelIndex &sourceIndex = m_data.m_sortModel->mapToSource(index);
+    PluginItem *item = m_data.m_model->itemForIndexAtLevel<2>(sourceIndex);
     return item ? item->m_spec: nullptr;
 }
 
 void PluginView::updatePlugins()
 {
     // Model.
-    m_model->clear();
+    m_data.m_model->clear();
 
-    const QHash<QString, QVector<PluginSpec *>> pluginCollections
+    const QHash<QString, PluginSpecs> pluginCollections
         = PluginManager::pluginCollections();
     std::vector<CollectionItem *> collections;
     const auto end = pluginCollections.cend();
     for (auto it = pluginCollections.cbegin(); it != end; ++it) {
         const QString name = it.key().isEmpty() ? Tr::tr("Utilities") : it.key();
-        collections.push_back(new CollectionItem(name, it.value(), this));
+        collections.push_back(new CollectionItem(name, it.value(), &m_data));
     }
     Utils::sort(collections, &CollectionItem::m_name);
 
     for (CollectionItem *collection : std::as_const(collections))
-        m_model->rootItem()->appendChild(collection);
+        m_data.m_model->rootItem()->appendChild(collection);
 
-    emit m_model->layoutChanged();
+    emit m_data.m_model->layoutChanged();
     m_categoryView->expandAll();
 }
 
+PluginData &PluginView::data()
+{
+    return m_data;
+}
+
 static QString pluginListString(const QSet<PluginSpec *> &plugins)
 {
     QStringList names = Utils::transform<QList>(plugins, &PluginSpec::name);
@@ -371,7 +381,7 @@ static QString pluginListString(const QSet<PluginSpec *> &plugins)
     return names.join(QLatin1Char('\n'));
 }
 
-bool PluginView::setPluginsEnabled(const QSet<PluginSpec *> &plugins, bool enable)
+bool PluginData::setPluginsEnabled(const QSet<PluginSpec *> &plugins, bool enable)
 {
     QSet<PluginSpec *> additionalPlugins;
     if (enable) {
@@ -383,7 +393,7 @@ bool PluginView::setPluginsEnabled(const QSet<PluginSpec *> &plugins, bool enabl
         }
         additionalPlugins.subtract(plugins);
         if (!additionalPlugins.isEmpty()) {
-            if (QMessageBox::question(this, Tr::tr("Enabling Plugins"),
+            if (QMessageBox::question(m_parent, Tr::tr("Enabling Plugins"),
                              Tr::tr("Enabling\n%1\nwill also enable the following plugins:\n\n%2")
                              .arg(pluginListString(plugins), pluginListString(additionalPlugins)),
                              QMessageBox::Ok | QMessageBox::Cancel,
@@ -400,7 +410,7 @@ bool PluginView::setPluginsEnabled(const QSet<PluginSpec *> &plugins, bool enabl
         }
         additionalPlugins.subtract(plugins);
         if (!additionalPlugins.isEmpty()) {
-            if (QMessageBox::question(this, Tr::tr("Disabling Plugins"),
+            if (QMessageBox::question(m_parent, Tr::tr("Disabling Plugins"),
                              Tr::tr("Disabling\n%1\nwill also disable the following plugins:\n\n%2")
                              .arg(pluginListString(plugins), pluginListString(additionalPlugins)),
                              QMessageBox::Ok | QMessageBox::Cancel,
@@ -417,19 +427,22 @@ bool PluginView::setPluginsEnabled(const QSet<PluginSpec *> &plugins, bool enabl
         });
         QTC_ASSERT(item, continue);
         if (m_affectedPlugins.find(spec) == m_affectedPlugins.end())
-            m_affectedPlugins[spec] = spec->d->enabledBySettings;
-        spec->d->setEnabledBySettings(enable);
+            m_affectedPlugins[spec] = spec->isEnabledBySettings();
+        spec->setEnabledBySettings(enable);
         item->updateColumn(LoadedColumn);
         item->parent()->updateColumn(LoadedColumn);
     }
-    emit pluginsChanged(affectedPlugins, enable);
+
+    if (m_pluginView)
+        emit m_pluginView->pluginsChanged(affectedPlugins, enable);
+
     return true;
 }
 
 void PluginView::cancelChanges()
 {
-    for (auto element : m_affectedPlugins)
-        element.first->d->setEnabledBySettings(element.second);
+    for (auto element : m_data.m_affectedPlugins)
+        element.first->setEnabledBySettings(element.second);
 }
 
 } // namespace ExtensionSystem
diff --git a/src/libs/extensionsystem/pluginview.h b/src/libs/extensionsystem/pluginview.h
index cd0c60b69a7..db144247277 100644
--- a/src/libs/extensionsystem/pluginview.h
+++ b/src/libs/extensionsystem/pluginview.h
@@ -22,12 +22,32 @@ class TreeView;
 namespace ExtensionSystem {
 
 class PluginSpec;
+class PluginView;
 
 namespace Internal {
 class CollectionItem;
 class PluginItem;
 } // Internal
 
+class EXTENSIONSYSTEM_EXPORT PluginData
+{
+public:
+    explicit PluginData(QWidget *parent, PluginView *pluginView = nullptr);
+
+    bool setPluginsEnabled(const QSet<PluginSpec *> &plugins, bool enable);
+
+private:
+    QWidget *m_parent = nullptr;
+    PluginView *m_pluginView = nullptr;
+    Utils::TreeModel<Utils::TreeItem, Internal::CollectionItem, Internal::PluginItem> *m_model;
+    Utils::CategorySortFilterModel *m_sortModel;
+    std::unordered_map<PluginSpec *, bool> m_affectedPlugins;
+
+    friend class Internal::CollectionItem;
+    friend class Internal::PluginItem;
+    friend class PluginView;
+};
+
 class EXTENSIONSYSTEM_EXPORT PluginView : public QWidget
 {
     Q_OBJECT
@@ -40,6 +60,8 @@ public:
     void setFilter(const QString &filter);
     void cancelChanges();
 
+    PluginData &data();
+
 signals:
     void currentPluginChanged(ExtensionSystem::PluginSpec *spec);
     void pluginActivated(ExtensionSystem::PluginSpec *spec);
@@ -48,15 +70,9 @@ signals:
 private:
     PluginSpec *pluginForIndex(const QModelIndex &index) const;
     void updatePlugins();
-    bool setPluginsEnabled(const QSet<PluginSpec *> &plugins, bool enable);
 
+    PluginData m_data;
     Utils::TreeView *m_categoryView;
-    Utils::TreeModel<Utils::TreeItem, Internal::CollectionItem, Internal::PluginItem> *m_model;
-    Utils::CategorySortFilterModel *m_sortModel;
-    std::unordered_map<PluginSpec *, bool> m_affectedPlugins;
-
-    friend class Internal::CollectionItem;
-    friend class Internal::PluginItem;
 };
 
 } // namespace ExtensionSystem
diff --git a/src/libs/languageserverprotocol/CMakeLists.txt b/src/libs/languageserverprotocol/CMakeLists.txt
index a3031413a46..02610460165 100644
--- a/src/libs/languageserverprotocol/CMakeLists.txt
+++ b/src/libs/languageserverprotocol/CMakeLists.txt
@@ -22,5 +22,6 @@ add_qtc_library(LanguageServerProtocol
     servercapabilities.cpp servercapabilities.h
     shutdownmessages.cpp shutdownmessages.h
     textsynchronization.cpp textsynchronization.h
+    typehierarchy.cpp typehierarchy.h
     workspace.cpp workspace.h
 )
diff --git a/src/libs/languageserverprotocol/callhierarchy.cpp b/src/libs/languageserverprotocol/callhierarchy.cpp
index 4b19d71fa82..49b789c28ac 100644
--- a/src/libs/languageserverprotocol/callhierarchy.cpp
+++ b/src/libs/languageserverprotocol/callhierarchy.cpp
@@ -25,4 +25,9 @@ CallHierarchyOutgoingCallsRequest::CallHierarchyOutgoingCallsRequest(
     : Request(methodName, params)
 {}
 
+std::optional<QList<SymbolTag>> CallHierarchyItem::symbolTags() const
+{
+    return Internal::getSymbolTags(*this);
+}
+
 } // namespace LanguageServerProtocol
diff --git a/src/libs/languageserverprotocol/callhierarchy.h b/src/libs/languageserverprotocol/callhierarchy.h
index 1cc022d6d1f..27e241b8ba9 100644
--- a/src/libs/languageserverprotocol/callhierarchy.h
+++ b/src/libs/languageserverprotocol/callhierarchy.h
@@ -18,6 +18,8 @@ public:
     SymbolKind symbolKind() const { return SymbolKind(typedValue<int>(kindKey)); }
     void setSymbolKind(const SymbolKind &symbolKind) { insert(kindKey, int(symbolKind)); }
 
+    std::optional<QList<SymbolTag>> symbolTags() const;
+
     Range range() const { return typedValue<Range>(rangeKey); }
     void setRange(const Range &range) { insert(rangeKey, range); }
 
diff --git a/src/libs/languageserverprotocol/clientcapabilities.cpp b/src/libs/languageserverprotocol/clientcapabilities.cpp
index acae7ad554a..60ea4523fd8 100644
--- a/src/libs/languageserverprotocol/clientcapabilities.cpp
+++ b/src/libs/languageserverprotocol/clientcapabilities.cpp
@@ -19,6 +19,20 @@ void SymbolCapabilities::SymbolKindCapabilities::setValueSet(const QList<SymbolK
     insert(valueSetKey, enumArrayToJsonArray<SymbolKind>(valueSet));
 }
 
+std::optional<QList<SymbolTag> > SymbolCapabilities::SymbolTagCapabilities::valueSet() const
+{
+    if (std::optional<QList<int>> array = optionalArray<int>(valueSetKey)) {
+        return std::make_optional(
+            Utils::transform(*array, [](int value) { return static_cast<SymbolTag>(value); }));
+    }
+    return std::nullopt;
+}
+
+void SymbolCapabilities::SymbolTagCapabilities::setValueSet(const QList<SymbolTag> &valueSet)
+{
+    insert(valueSetKey, enumArrayToJsonArray<SymbolTag>(valueSet));
+}
+
 WorkspaceClientCapabilities::WorkspaceClientCapabilities()
 {
     setWorkspaceFolders(true);
diff --git a/src/libs/languageserverprotocol/clientcapabilities.h b/src/libs/languageserverprotocol/clientcapabilities.h
index 367e1b3fe4c..91c9954cd7a 100644
--- a/src/libs/languageserverprotocol/clientcapabilities.h
+++ b/src/libs/languageserverprotocol/clientcapabilities.h
@@ -131,12 +131,31 @@ public:
         void clearValueSet() { remove(valueSetKey); }
     };
 
+    class LANGUAGESERVERPROTOCOL_EXPORT SymbolTagCapabilities : public JsonObject
+    {
+    public:
+        using JsonObject::JsonObject;
+
+        /*
+         * The client supports tags on `SymbolInformation` and `WorkspaceSymbol`.
+         * Clients supporting tags have to handle unknown tags gracefully.
+         */
+        std::optional<QList<SymbolTag>> valueSet() const;
+        void setValueSet(const QList<SymbolTag> &valueSet);
+        void clearValueSet() { remove(valueSetKey); }
+    };
+
     // Specific capabilities for the `SymbolKind` in the `workspace/symbol` request.
     std::optional<SymbolKindCapabilities> symbolKind() const
     { return optionalValue<SymbolKindCapabilities>(symbolKindKey); }
     void setSymbolKind(const SymbolKindCapabilities &symbolKind) { insert(symbolKindKey, symbolKind); }
     void clearSymbolKind() { remove(symbolKindKey); }
 
+    std::optional<SymbolTagCapabilities> symbolTag() const
+    { return optionalValue<SymbolTagCapabilities>(tagSupportKey); }
+    void setSymbolTag(const SymbolTagCapabilities &symbolTag) { insert(tagSupportKey, symbolTag); }
+    void clearSymbolTag() { remove(tagSupportKey); }
+
     std::optional<bool> hierarchicalDocumentSymbolSupport() const
     { return optionalValue<bool>(hierarchicalDocumentSymbolSupportKey); }
     void setHierarchicalDocumentSymbolSupport(bool hierarchicalDocumentSymbolSupport)
@@ -510,6 +529,12 @@ public:
     void setCallHierarchy(const DynamicRegistrationCapabilities &callHierarchy)
     { insert(callHierarchyKey, callHierarchy); }
     void clearCallHierarchy() { remove(callHierarchyKey); }
+
+    std::optional<DynamicRegistrationCapabilities> typeHierarchy() const
+    { return optionalValue<DynamicRegistrationCapabilities>(typeHierarchyKey); }
+    void setTypeHierarchy(const DynamicRegistrationCapabilities &typeHierarchy)
+    { insert(typeHierarchyKey, typeHierarchy); }
+    void clearTypeHierarchy() { remove(typeHierarchyKey); }
 };
 
 class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensWorkspaceClientCapabilities : public JsonObject
diff --git a/src/libs/languageserverprotocol/jsonkeys.h b/src/libs/languageserverprotocol/jsonkeys.h
index 236d28bfda1..37894f166e9 100644
--- a/src/libs/languageserverprotocol/jsonkeys.h
+++ b/src/libs/languageserverprotocol/jsonkeys.h
@@ -193,10 +193,12 @@ constexpr Key startKey{"start"};
 constexpr Key supportedKey{"supported"};
 constexpr Key symbolKey{"symbol"};
 constexpr Key symbolKindKey{"symbolKind"};
+constexpr Key symbolTagKey{"symbolTag"};
 constexpr Key syncKindKey{"syncKind"};
 constexpr Key synchronizationKey{"synchronization"};
 constexpr Key tabSizeKey{"tabSize"};
 constexpr Key tagsKey{"tags"};
+constexpr Key tagSupportKey{"tagSupport"};
 constexpr Key targetKey{"target"};
 constexpr Key textDocumentKey{"textDocument"};
 constexpr Key textDocumentSyncKey{"textDocumentSync"};
@@ -216,6 +218,8 @@ constexpr Key trimTrailingWhitespaceKey{"trimTrailingWhitespace"};
 constexpr Key typeDefinitionKey{"typeDefinition"};
 constexpr Key typeDefinitionProviderKey{"typeDefinitionProvider"};
 constexpr Key typeKey{"type"};
+constexpr Key typeHierarchyKey{"typeHierarchy"};
+constexpr Key typeHierarchyProviderKey{"typeHierarchyProvider"};
 constexpr Key unregistrationsKey{"unregistrations"};
 constexpr Key uriKey{"uri"};
 constexpr Key valueKey{"value"};
diff --git a/src/libs/languageserverprotocol/jsonobject.h b/src/libs/languageserverprotocol/jsonobject.h
index 178e74e5ad7..ce2ad50a40a 100644
--- a/src/libs/languageserverprotocol/jsonobject.h
+++ b/src/libs/languageserverprotocol/jsonobject.h
@@ -10,26 +10,11 @@
 #include <QDebug>
 #include <QJsonObject>
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
 #include <QLatin1StringView>
-#else
-#include <QLatin1String>
-#endif
 
 namespace LanguageServerProtocol {
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
 using Key = QLatin1StringView;
-#else
-class Key : public QLatin1String
-{
-public:
-    using QLatin1String::QLatin1String;
-    constexpr inline explicit Key(const char *s) noexcept
-        : QLatin1String(s, std::char_traits<char>::length(s))
-    {}
-};
-#endif
 
 class LANGUAGESERVERPROTOCOL_EXPORT JsonObject
 {
@@ -108,7 +93,8 @@ private:
 template<typename T, typename V>
 JsonObject::iterator JsonObject::insertVariant(const Key key, const V &variant)
 {
-    return std::holds_alternative<T>(variant) ? insert(key, std::get<T>(variant)) : end();
+    const auto v = std::get_if<T>(&variant);
+    return v ? insert(key, *v) : end();
 }
 
 template<typename T1, typename T2, typename... Args, typename V>
diff --git a/src/libs/languageserverprotocol/jsonrpcmessages.h b/src/libs/languageserverprotocol/jsonrpcmessages.h
index 680bff95782..a794f7f8193 100644
--- a/src/libs/languageserverprotocol/jsonrpcmessages.h
+++ b/src/libs/languageserverprotocol/jsonrpcmessages.h
@@ -68,19 +68,19 @@ public:
 private:
     friend size_t qHash(const MessageId &id)
     {
-        if (std::holds_alternative<int>(id))
-            return QT_PREPEND_NAMESPACE(qHash(std::get<int>(id)));
-        if (std::holds_alternative<QString>(id))
-            return QT_PREPEND_NAMESPACE(qHash(std::get<QString>(id)));
+        if (const int *iid = std::get_if<int>(&id))
+            return QT_PREPEND_NAMESPACE(qHash(*iid));
+        if (const QString *sid = std::get_if<QString>(&id))
+            return QT_PREPEND_NAMESPACE(qHash(*sid));
         return QT_PREPEND_NAMESPACE(qHash(0));
     }
 
     friend QDebug operator<<(QDebug stream, const MessageId &id)
     {
-        if (std::holds_alternative<int>(id))
-            stream << std::get<int>(id);
+        if (const int *iid = std::get_if<int>(&id))
+            stream << *iid;
         else
-            stream << std::get<QString>(id);
+            stream << *std::get_if<QString>(&id);
         return stream;
     }
 };
diff --git a/src/libs/languageserverprotocol/languagefeatures.cpp b/src/libs/languageserverprotocol/languagefeatures.cpp
index dcf076bd033..0c76a3b1c03 100644
--- a/src/libs/languageserverprotocol/languagefeatures.cpp
+++ b/src/libs/languageserverprotocol/languagefeatures.cpp
@@ -261,6 +261,12 @@ DocumentHighlightsResult::DocumentHighlightsResult(const QJsonValue &value)
     }
 }
 
+template<>
+MarkedString fromJsonValue<MarkedString>(const QJsonValue &value)
+{
+    return MarkedString(value);
+}
+
 MarkedString::MarkedString(const QJsonValue &value)
 {
     if (value.isObject())
@@ -303,8 +309,8 @@ HoverContent::HoverContent(const QJsonValue &value)
 
 bool HoverContent::isValid() const
 {
-    if (std::holds_alternative<MarkedString>(*this))
-        return std::get<MarkedString>(*this).isValid();
+    if (const auto s = std::get_if<MarkedString>(this))
+        return s->isValid();
     return true;
 }
 
diff --git a/src/libs/languageserverprotocol/languagefeatures.h b/src/libs/languageserverprotocol/languagefeatures.h
index e5ca9df31d6..6a60ec3612f 100644
--- a/src/libs/languageserverprotocol/languagefeatures.h
+++ b/src/libs/languageserverprotocol/languagefeatures.h
@@ -52,6 +52,9 @@ public:
     operator QJsonValue() const;
 };
 
+template<>
+LANGUAGESERVERPROTOCOL_EXPORT MarkedString fromJsonValue<MarkedString>(const QJsonValue &value);
+
 class LANGUAGESERVERPROTOCOL_EXPORT HoverContent
     : public std::variant<MarkedString, QList<MarkedString>, MarkupContent>
 {
diff --git a/src/libs/languageserverprotocol/languageserverprotocol.qbs b/src/libs/languageserverprotocol/languageserverprotocol.qbs
index 0368ceafee8..2bf717c2930 100644
--- a/src/libs/languageserverprotocol/languageserverprotocol.qbs
+++ b/src/libs/languageserverprotocol/languageserverprotocol.qbs
@@ -44,6 +44,8 @@ QtcLibrary {
         "shutdownmessages.h",
         "textsynchronization.cpp",
         "textsynchronization.h",
+        "typehierarchy.cpp",
+        "typehierarchy.h",
         "workspace.cpp",
         "workspace.h",
     ]
diff --git a/src/libs/languageserverprotocol/lsptypes.cpp b/src/libs/languageserverprotocol/lsptypes.cpp
index ddd9b0e66c0..1bc87075728 100644
--- a/src/libs/languageserverprotocol/lsptypes.cpp
+++ b/src/libs/languageserverprotocol/lsptypes.cpp
@@ -6,6 +6,7 @@
 #include "languageserverprotocoltr.h"
 #include "lsputils.h"
 
+#include <utils/algorithm.h>
 #include <utils/textutils.h>
 
 #include <QFile>
@@ -100,10 +101,10 @@ MarkupOrString::MarkupOrString(const QJsonValue &val)
 
 QJsonValue MarkupOrString::toJson() const
 {
-    if (std::holds_alternative<QString>(*this))
-        return std::get<QString>(*this);
-    if (std::holds_alternative<MarkupContent>(*this))
-        return QJsonValue(std::get<MarkupContent>(*this));
+    if (const auto s = std::get_if<QString>(this))
+        return *s;
+    if (const auto c = std::get_if<MarkupContent>(this))
+        return QJsonValue(*c);
     return {};
 }
 
@@ -487,4 +488,27 @@ bool DeleteFileOperation::isValid() const
     return contains(uriKey) && value(kindKey) == "delete";
 }
 
+namespace Internal {
+std::optional<QList<SymbolTag>> getSymbolTags(const JsonObject &o)
+{
+    const QJsonObject &obj = o;
+    const QJsonValue &val = obj.value(tagsKey);
+    if (val.isUndefined() || !val.isArray())
+        return std::nullopt;
+
+    return Utils::transform<QList<SymbolTag>>(val.toArray(), [](const QJsonValue &v) {
+        return static_cast<SymbolTag>(v.toInt());
+    });
+}
+} // namespace Internal
+
+std::optional<QList<SymbolTag>> SymbolInformation::symbolTags() const
+{
+    return Internal::getSymbolTags(*this);
+}
+
+std::optional<QList<SymbolTag>> DocumentSymbol::symbolTags() const
+{
+    return Internal::getSymbolTags(*this);
+}
 } // namespace LanguageServerProtocol
diff --git a/src/libs/languageserverprotocol/lsptypes.h b/src/libs/languageserverprotocol/lsptypes.h
index ae19f36145b..6e25fcb49d0 100644
--- a/src/libs/languageserverprotocol/lsptypes.h
+++ b/src/libs/languageserverprotocol/lsptypes.h
@@ -574,6 +574,13 @@ public:
     { return contains(uriKey) && contains(nameKey); }
 };
 
+enum class SymbolTag {
+    Deprecated = 1,
+};
+namespace Internal {
+std::optional<QList<SymbolTag>> getSymbolTags(const JsonObject &o);
+} // namespace Internal
+
 class LANGUAGESERVERPROTOCOL_EXPORT SymbolInformation : public JsonObject
 {
 public:
@@ -585,6 +592,8 @@ public:
     int kind() const { return typedValue<int>(kindKey); }
     void setKind(int kind) { insert(kindKey, kind); }
 
+    std::optional<QList<SymbolTag>> symbolTags() const;
+
     std::optional<bool> deprecated() const { return optionalValue<bool>(deprecatedKey); }
     void setDeprecated(bool deprecated) { insert(deprecatedKey, deprecated); }
     void clearDeprecated() { remove(deprecatedKey); }
@@ -616,6 +625,8 @@ public:
     int kind() const { return typedValue<int>(kindKey); }
     void setKind(int kind) { insert(kindKey, kind); }
 
+    std::optional<QList<SymbolTag>> symbolTags() const;
+
     std::optional<bool> deprecated() const { return optionalValue<bool>(deprecatedKey); }
     void setDeprecated(bool deprecated) { insert(deprecatedKey, deprecated); }
     void clearDeprecated() { remove(deprecatedKey); }
@@ -693,4 +704,4 @@ enum Kind {
 };
 } // namespace CompletionItemKind
 
-} // namespace LanguageClient
+} // namespace LanguageServerProtocol
diff --git a/src/libs/languageserverprotocol/lsputils.h b/src/libs/languageserverprotocol/lsputils.h
index 0c815bafd8a..a5178f813fd 100644
--- a/src/libs/languageserverprotocol/lsputils.h
+++ b/src/libs/languageserverprotocol/lsputils.h
@@ -68,7 +68,7 @@ public:
         if (value.isArray()) {
             QList<T> values;
             values.reserve(value.toArray().count());
-            for (auto arrayValue : value.toArray())
+            for (const auto &arrayValue : value.toArray())
                 values << fromJsonValue<T>(arrayValue);
             *this = values;
         } else {
@@ -89,15 +89,16 @@ public:
 
     QList<T> toListOrEmpty() const
     {
-        if (std::holds_alternative<QList<T>>(*this))
-            return std::get<QList<T>>(*this);
+        if (const auto l = std::get_if<QList<T>>(this))
+            return *l;
         return {};
     }
 
     QList<T> toList() const
     {
-        QTC_ASSERT(std::holds_alternative<QList<T>>(*this), return {});
-        return std::get<QList<T>>(*this);
+        const auto l = std::get_if<QList<T>>(this);
+        QTC_ASSERT(l, return {});
+        return *l;
     }
     bool isNull() const { return std::holds_alternative<std::nullptr_t>(*this); }
 };
@@ -127,15 +128,17 @@ public:
 
     T value(const T &defaultValue = T()) const
     {
-        QTC_ASSERT(std::holds_alternative<T>(*this), return defaultValue);
-        return std::get<T>(*this);
+        const auto t = std::get_if<T>(this);
+        QTC_ASSERT(t, return defaultValue);
+        return *t;
     }
 
     template<typename Type>
     LanguageClientValue<Type> transform()
     {
-        QTC_ASSERT(!std::holds_alternative<T>(*this), return LanguageClientValue<Type>());
-        return Type(std::get<T>(*this));
+        const auto t = std::get_if<T>(this);
+        QTC_ASSERT(t, return LanguageClientValue<Type>());
+        return Type(*t);
     }
 
     bool isNull() const { return std::holds_alternative<std::nullptr_t>(*this); }
diff --git a/src/libs/languageserverprotocol/progresssupport.cpp b/src/libs/languageserverprotocol/progresssupport.cpp
index 2ae4af1b989..ce110782dc1 100644
--- a/src/libs/languageserverprotocol/progresssupport.cpp
+++ b/src/libs/languageserverprotocol/progresssupport.cpp
@@ -21,9 +21,9 @@ ProgressToken::ProgressToken(const QJsonValue &value)
 
 ProgressToken::operator QJsonValue() const
 {
-    if (std::holds_alternative<QString>(*this))
-        return QJsonValue(std::get<QString>(*this));
-    return QJsonValue(std::get<int>(*this));
+    if (const auto s = std::get_if<QString>(this))
+        return QJsonValue(*s);
+    return QJsonValue(*std::get_if<int>(this));
 }
 
 ProgressParams::ProgressType ProgressParams::value() const
diff --git a/src/libs/languageserverprotocol/servercapabilities.cpp b/src/libs/languageserverprotocol/servercapabilities.cpp
index 885198d12e8..b109d086872 100644
--- a/src/libs/languageserverprotocol/servercapabilities.cpp
+++ b/src/libs/languageserverprotocol/servercapabilities.cpp
@@ -189,13 +189,35 @@ void ServerCapabilities::setCallHierarchyProvider(
     const std::variant<bool, WorkDoneProgressOptions> &callHierarchyProvider)
 {
     QJsonValue val;
-    if (std::holds_alternative<bool>(callHierarchyProvider))
-        val = std::get<bool>(callHierarchyProvider);
-    else if (std::holds_alternative<WorkDoneProgressOptions>(callHierarchyProvider))
-        val = QJsonObject(std::get<WorkDoneProgressOptions>(callHierarchyProvider));
+    if (const auto boolvalue = std::get_if<bool>(&callHierarchyProvider))
+        val = *boolvalue;
+    else if (const auto options = std::get_if<WorkDoneProgressOptions>(&callHierarchyProvider))
+        val = QJsonObject(*options);
     insert(callHierarchyProviderKey, val);
 }
 
+std::optional<std::variant<bool, WorkDoneProgressOptions>> ServerCapabilities::typeHierarchyProvider()
+    const
+{
+    const QJsonValue &provider = value(typeHierarchyProviderKey);
+    if (provider.isBool())
+        return provider.toBool();
+    else if (provider.isObject())
+        return WorkDoneProgressOptions(provider.toObject());
+    return std::nullopt;
+}
+
+void ServerCapabilities::setTypeHierarchyProvider(
+    const std::variant<bool, WorkDoneProgressOptions> &typeHierarchyProvider)
+{
+    QJsonValue val;
+    if (const auto boolvalue = std::get_if<bool>(&typeHierarchyProvider))
+        val = *boolvalue;
+    else if (const auto options = std::get_if<WorkDoneProgressOptions>(&typeHierarchyProvider))
+        val = QJsonObject(*options);
+    insert(typeHierarchyProviderKey, val);
+}
+
 std::optional<std::variant<bool, WorkDoneProgressOptions>>
 ServerCapabilities::workspaceSymbolProvider() const
 {
diff --git a/src/libs/languageserverprotocol/servercapabilities.h b/src/libs/languageserverprotocol/servercapabilities.h
index c3b50dd5904..32598d2afa5 100644
--- a/src/libs/languageserverprotocol/servercapabilities.h
+++ b/src/libs/languageserverprotocol/servercapabilities.h
@@ -330,6 +330,10 @@ public:
     void setCallHierarchyProvider(const std::variant<bool, WorkDoneProgressOptions> &callHierarchyProvider);
     void clearCallHierarchyProvider() { remove(callHierarchyProviderKey); }
 
+    std::optional<std::variant<bool, WorkDoneProgressOptions>> typeHierarchyProvider() const;
+    void setTypeHierarchyProvider(const std::variant<bool, WorkDoneProgressOptions> &typeHierarchyProvider);
+    void clearTypeHierarchyProvider() { remove(typeHierarchyProviderKey); }
+
     // The server provides workspace symbol support.
     std::optional<std::variant<bool, WorkDoneProgressOptions>> workspaceSymbolProvider() const;
     void setWorkspaceSymbolProvider(std::variant<bool, WorkDoneProgressOptions> workspaceSymbolProvider);
diff --git a/src/libs/languageserverprotocol/typehierarchy.cpp b/src/libs/languageserverprotocol/typehierarchy.cpp
new file mode 100644
index 00000000000..1734e25a6b6
--- /dev/null
+++ b/src/libs/languageserverprotocol/typehierarchy.cpp
@@ -0,0 +1,28 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0
+
+#include "typehierarchy.h"
+
+namespace LanguageServerProtocol {
+
+bool TypeHierarchyItem::isValid() const
+{
+    return contains(nameKey) && contains(kindKey) && contains(uriKey) && contains(rangeKey)
+           && contains(selectionRangeKey);
+}
+std::optional<QList<SymbolTag>> TypeHierarchyItem::symbolTags() const
+{
+    return Internal::getSymbolTags(*this);
+}
+
+PrepareTypeHierarchyRequest::PrepareTypeHierarchyRequest(const TextDocumentPositionParams &params)
+    : Request(methodName, params)
+{}
+TypeHierarchySupertypesRequest::TypeHierarchySupertypesRequest(const TypeHierarchyParams &params)
+    : Request(methodName, params)
+{}
+TypeHierarchySubtypesRequest::TypeHierarchySubtypesRequest(const TypeHierarchyParams &params)
+    : Request(methodName, params)
+{}
+
+} // namespace LanguageServerProtocol
diff --git a/src/libs/languageserverprotocol/typehierarchy.h b/src/libs/languageserverprotocol/typehierarchy.h
new file mode 100644
index 00000000000..d5e88c8cfd3
--- /dev/null
+++ b/src/libs/languageserverprotocol/typehierarchy.h
@@ -0,0 +1,85 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "jsonrpcmessages.h"
+
+namespace LanguageServerProtocol {
+
+class LANGUAGESERVERPROTOCOL_EXPORT TypeHierarchyItem : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    QString name() const { return typedValue<QString>(nameKey); }
+    void setName(const QString &name) { insert(nameKey, name); }
+
+    SymbolKind symbolKind() const { return SymbolKind(typedValue<int>(kindKey)); }
+    void setSymbolKind(const SymbolKind &symbolKind) { insert(kindKey, int(symbolKind)); }
+
+    std::optional<QList<SymbolTag>> symbolTags() const;
+
+    std::optional<QString> detail() const { return optionalValue<QString>(detailKey); }
+    void setDetail(const QString &detail) { insert(detailKey, detail); }
+    void clearDetail() { remove(detailKey); }
+
+    DocumentUri uri() const { return DocumentUri::fromProtocol(typedValue<QString>(uriKey)); }
+    void setUri(const DocumentUri &uri) { insert(uriKey, uri); }
+
+    Range range() const { return typedValue<Range>(rangeKey); }
+    void setRange(const Range &range) { insert(rangeKey, range); }
+
+    Range selectionRange() const { return typedValue<Range>(selectionRangeKey); }
+    void setSelectionRange(Range selectionRange) { insert(selectionRangeKey, selectionRange); }
+
+    /*
+     * A data entry field that is preserved between a type hierarchy prepare and
+     * supertypes or subtypes requests. It could also be used to identify the
+     * type hierarchy in the server, helping improve the performance on
+     * resolving supertypes and subtypes.
+     */
+    std::optional<QJsonValue> data() const { return optionalValue<QJsonValue>(dataKey); }
+
+    bool isValid() const override;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT PrepareTypeHierarchyRequest : public Request<
+        LanguageClientArray<TypeHierarchyItem>, std::nullptr_t, TextDocumentPositionParams>
+{
+public:
+    explicit PrepareTypeHierarchyRequest(const TextDocumentPositionParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/prepareTypeHierarchy";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT TypeHierarchyParams : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    TypeHierarchyItem item() const { return typedValue<TypeHierarchyItem>(itemKey); }
+    void setItem(const TypeHierarchyItem &item) { insert(itemKey, item); }
+
+    bool isValid() const override { return contains(itemKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT TypeHierarchySupertypesRequest : public Request<
+        LanguageClientArray<TypeHierarchyItem>, std::nullptr_t, TypeHierarchyParams>
+{
+public:
+    explicit TypeHierarchySupertypesRequest(const TypeHierarchyParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "typeHierarchy/supertypes";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT TypeHierarchySubtypesRequest
+    : public Request<LanguageClientArray<TypeHierarchyItem>, std::nullptr_t, TypeHierarchyParams>
+{
+public:
+    explicit TypeHierarchySubtypesRequest(const TypeHierarchyParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "typeHierarchy/subtypes";
+};
+
+} // namespace LanguageServerProtocol
diff --git a/src/libs/languageserverprotocol/workspace.cpp b/src/libs/languageserverprotocol/workspace.cpp
index 2d49be2d5ff..0d37b809347 100644
--- a/src/libs/languageserverprotocol/workspace.cpp
+++ b/src/libs/languageserverprotocol/workspace.cpp
@@ -64,10 +64,11 @@ ExecuteCommandParams::ExecuteCommandParams(const Command &command)
 
 LanguageServerProtocol::WorkSpaceFolderResult::operator const QJsonValue() const
 {
-    if (!std::holds_alternative<QList<WorkSpaceFolder>>(*this))
+    const auto folders = std::get_if<QList<WorkSpaceFolder>>(this);
+    if (!folders)
         return QJsonValue::Null;
     QJsonArray array;
-    for (const auto &folder : std::get<QList<WorkSpaceFolder>>(*this))
+    for (const auto &folder : *folders)
         array.append(QJsonValue(folder));
     return array;
 }
diff --git a/src/libs/languageutils/componentversion.cpp b/src/libs/languageutils/componentversion.cpp
index f041740d3b2..edfa2c552bb 100644
--- a/src/libs/languageutils/componentversion.cpp
+++ b/src/libs/languageutils/componentversion.cpp
@@ -6,8 +6,6 @@
 #include <QString>
 #include <QCryptographicHash>
 
-#include <limits>
-
 namespace LanguageUtils {
 
 // QTC_TEMP
@@ -42,8 +40,8 @@ QString ComponentVersion::toString() const
 
 void ComponentVersion::addToHash(QCryptographicHash &hash) const
 {
-    hash.addData(reinterpret_cast<const char *>(&_major), sizeof(_major));
-    hash.addData(reinterpret_cast<const char *>(&_minor), sizeof(_minor));
+    hash.addData(QByteArrayView(reinterpret_cast<const char *>(&_major), sizeof(_major)));
+    hash.addData(QByteArrayView(reinterpret_cast<const char *>(&_minor), sizeof(_minor)));
 }
 
 } // namespace LanguageUtils
diff --git a/src/libs/languageutils/fakemetaobject.cpp b/src/libs/languageutils/fakemetaobject.cpp
index 4c553cdc7b5..da7877c1b63 100644
--- a/src/libs/languageutils/fakemetaobject.cpp
+++ b/src/libs/languageutils/fakemetaobject.cpp
@@ -6,6 +6,21 @@
 
 using namespace LanguageUtils;
 
+static QByteArrayView asData(const void *mem, size_t len)
+{
+    return QByteArrayView(reinterpret_cast<const char *>(mem), len);
+}
+
+static void addData(QCryptographicHash &hash, int x)
+{
+    hash.addData(asData(&x, sizeof(int)));
+}
+
+static void addData(QCryptographicHash &hash, const QString &x)
+{
+    hash.addData(asData(x.constData(), x.size() * sizeof(QChar)));
+}
+
 FakeMetaEnum::FakeMetaEnum()
 {}
 
@@ -39,15 +54,12 @@ bool FakeMetaEnum::hasKey(const QString &key) const
 
 void FakeMetaEnum::addToHash(QCryptographicHash &hash) const
 {
-    int len = m_name.size();
-    hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
-    hash.addData(reinterpret_cast<const char *>(m_name.constData()), len * sizeof(QChar));
-    len = m_keys.size();
-    hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
+    addData(hash, m_name.size());
+    addData(hash, m_name);
+    addData(hash, m_keys.size());
     for (const QString &key : std::as_const(m_keys)) {
-        len = key.size();
-        hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
-        hash.addData(reinterpret_cast<const char *>(key.constData()), len * sizeof(QChar));
+        addData(hash, key.size());
+        addData(hash, key);
     }
 }
 
@@ -121,29 +133,23 @@ void FakeMetaMethod::setRevision(int r)
 
 void FakeMetaMethod::addToHash(QCryptographicHash &hash) const
 {
-    int len = m_name.size();
-    hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
-    hash.addData(reinterpret_cast<const char *>(m_name.constData()), len * sizeof(QChar));
-    hash.addData(reinterpret_cast<const char *>(&m_methodAccess), sizeof(m_methodAccess));
-    hash.addData(reinterpret_cast<const char *>(&m_methodTy), sizeof(m_methodTy));
-    hash.addData(reinterpret_cast<const char *>(&m_revision), sizeof(m_revision));
-    len = m_paramNames.size();
-    hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
+    addData(hash, m_name.size());
+    addData(hash, m_name);
+    addData(hash, m_methodAccess);
+    addData(hash, m_methodTy);
+    addData(hash, m_revision);
+    addData(hash, m_paramNames.size());
     for (const QString &pName : std::as_const(m_paramNames)) {
-        len = pName.size();
-        hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
-        hash.addData(reinterpret_cast<const char *>(pName.constData()), len * sizeof(QChar));
+        addData(hash, pName.size());
+        addData(hash, pName);
     }
-    len = m_paramTypes.size();
-    hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
+    addData(hash, m_paramTypes.size());
     for (const QString &pType : std::as_const(m_paramTypes)) {
-        len = pType.size();
-        hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
-        hash.addData(reinterpret_cast<const char *>(pType.constData()), len * sizeof(QChar));
+        addData(hash, pType.size());
+        addData(hash, pType);
     }
-    len = m_returnType.size();
-    hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
-    hash.addData(reinterpret_cast<const char *>(m_returnType.constData()), len * sizeof(QChar));
+    addData(hash, m_returnType.size());
+    addData(hash, m_returnType);
 }
 
 QString FakeMetaMethod::describe(int baseIndent) const
@@ -213,17 +219,15 @@ int FakeMetaProperty::revision() const
 
 void FakeMetaProperty::addToHash(QCryptographicHash &hash) const
 {
-    int len = m_propertyName.size();
-    hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
-    hash.addData(reinterpret_cast<const char *>(m_propertyName.constData()), len * sizeof(QChar));
-    hash.addData(reinterpret_cast<const char *>(&m_revision), sizeof(m_revision));
+    addData(hash, m_propertyName.size());
+    addData(hash, m_propertyName);
+    addData(hash, m_revision);
     int flags = (m_isList ? (1 << 0) : 0)
             + (m_isPointer ? (1 << 1) : 0)
             + (m_isWritable ? (1 << 2) : 0);
-    hash.addData(reinterpret_cast<const char *>(&flags), sizeof(flags));
-    len = m_type.size();
-    hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
-    hash.addData(reinterpret_cast<const char *>(m_type.constData()), len * sizeof(QChar));
+    addData(hash, flags);
+    addData(hash, m_type.size());
+    addData(hash, m_type);
 }
 
 QString FakeMetaProperty::describe(int baseIndent) const
@@ -361,34 +365,34 @@ QByteArray FakeMetaObject::calculateFingerprint() const
 {
     QCryptographicHash hash(QCryptographicHash::Sha1);
     int len = m_className.size();
-    hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
-    hash.addData(reinterpret_cast<const char *>(m_className.constData()), len * sizeof(QChar));
+    addData(hash, len);
+    addData(hash, m_className);
     len = m_attachedTypeName.size();
-    hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
-    hash.addData(reinterpret_cast<const char *>(m_attachedTypeName.constData()), len * sizeof(QChar));
+    addData(hash, len);
+    addData(hash, m_attachedTypeName);
     len = m_defaultPropertyName.size();
-    hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
-    hash.addData(reinterpret_cast<const char *>(m_defaultPropertyName.constData()), len * sizeof(QChar));
+    addData(hash, len);
+    addData(hash, m_defaultPropertyName);
     len = m_enumNameToIndex.size();
-    hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
+    addData(hash, len);
     {
         QStringList keys(m_enumNameToIndex.keys());
         keys.sort();
         for (const QString &key : std::as_const(keys)) {
             len = key.size();
-            hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
-            hash.addData(reinterpret_cast<const char *>(key.constData()), len * sizeof(QChar));
+            addData(hash, len);
+            addData(hash, key);
             int value = m_enumNameToIndex.value(key);
-            hash.addData(reinterpret_cast<const char *>(&value), sizeof(value)); // avoid? this adds order dependency to fingerprint...
+            addData(hash, value);
             m_enums.at(value).addToHash(hash);
         }
     }
     len = m_exports.size();
-    hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
+    addData(hash, len);
     for (const Export &e : std::as_const(m_exports))
         e.addToHash(hash); // normalize order?
     len = m_exports.size();
-    hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
+    addData(hash, len);
     for (const FakeMetaMethod &m : std::as_const(m_methods))
         m.addToHash(hash); // normalize order?
     {
@@ -396,16 +400,16 @@ QByteArray FakeMetaObject::calculateFingerprint() const
         keys.sort();
         for (const QString &key : std::as_const(keys)) {
             len = key.size();
-            hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
-            hash.addData(reinterpret_cast<const char *>(key.constData()), len * sizeof(QChar));
+            addData(hash, len);
+            addData(hash, key);
             int value = m_propNameToIdx.value(key);
-            hash.addData(reinterpret_cast<const char *>(&value), sizeof(value)); // avoid? this adds order dependency to fingerprint...
+            addData(hash, value);
             m_props.at(value).addToHash(hash);
         }
     }
     len = m_superName.size();
-    hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
-    hash.addData(reinterpret_cast<const char *>(m_superName.constData()), len * sizeof(QChar));
+    addData(hash, len);
+    addData(hash, m_superName);
 
     QByteArray res = hash.result();
     res.append('F');
@@ -540,14 +544,12 @@ bool FakeMetaObject::Export::isValid() const
 
 void FakeMetaObject::Export::addToHash(QCryptographicHash &hash) const
 {
-    int len = package.size();
-    hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
-    hash.addData(reinterpret_cast<const char *>(package.constData()), len * sizeof(QChar));
-    len = type.size();
-    hash.addData(reinterpret_cast<const char *>(&len), sizeof(len));
-    hash.addData(reinterpret_cast<const char *>(type.constData()), len * sizeof(QChar));
+    addData(hash, package.size());
+    addData(hash, package);
+    addData(hash, type.size());
+    addData(hash, type);
     version.addToHash(hash);
-    hash.addData(reinterpret_cast<const char *>(&metaObjectRevision), sizeof(metaObjectRevision));
+    addData(hash, metaObjectRevision);
 }
 
 QString FakeMetaObject::Export::describe(int baseIndent) const
diff --git a/src/libs/libs.qbs b/src/libs/libs.qbs
index a6426d4ae47..aaf42e181c3 100644
--- a/src/libs/libs.qbs
+++ b/src/libs/libs.qbs
@@ -26,7 +26,9 @@ Project {
         "utils/utils.qbs",
         "3rdparty/libptyqt/ptyqt.qbs",
         "3rdparty/libvterm/vterm.qbs",
+        "3rdparty/lua/lua.qbs",
         "3rdparty/qtkeychain/qtkeychain.qbs",
+        "3rdparty/sol2/sol2.qbs",
         "3rdparty/syntax-highlighting/syntax-highlighting.qbs",
         "3rdparty/winpty/winpty.qbs",
         "3rdparty/yaml-cpp/yaml-cpp.qbs",
diff --git a/src/libs/modelinglib/CMakeLists.txt b/src/libs/modelinglib/CMakeLists.txt
index 27801f479a4..e966b39459a 100644
--- a/src/libs/modelinglib/CMakeLists.txt
+++ b/src/libs/modelinglib/CMakeLists.txt
@@ -126,12 +126,15 @@ add_qtc_library(Modeling
     qmt/model/mrelation.cpp qmt/model/mrelation.h
     qmt/model/msourceexpansion.cpp qmt/model/msourceexpansion.h
     qmt/model/mvisitor.h
+    qmt/model_ui/modeltreefilterdata.h qmt/model_ui/modeltreefilterdata.cpp
     qmt/model_ui/modeltreeviewinterface.h
     qmt/model_ui/sortedtreemodel.cpp qmt/model_ui/sortedtreemodel.h
     qmt/model_ui/stereotypescontroller.cpp qmt/model_ui/stereotypescontroller.h
     qmt/model_ui/treemodel.cpp qmt/model_ui/treemodel.h
     qmt/model_ui/treemodelmanager.cpp qmt/model_ui/treemodelmanager.h
+    qmt/model_widgets_ui/addrelatedelementsdialog.h qmt/model_widgets_ui/addrelatedelementsdialog.cpp
     qmt/model_widgets_ui/classmembersedit.cpp qmt/model_widgets_ui/classmembersedit.h
+    qmt/model_widgets_ui/modeltreefilter.h qmt/model_widgets_ui/modeltreefilter.cpp
     qmt/model_widgets_ui/modeltreeview.cpp qmt/model_widgets_ui/modeltreeview.h
     qmt/model_widgets_ui/palettebox.cpp qmt/model_widgets_ui/palettebox.h
     qmt/model_widgets_ui/propertiesview.cpp qmt/model_widgets_ui/propertiesview.h
@@ -158,6 +161,7 @@ add_qtc_library(Modeling
     qmt/style/defaultstyle.h
     qmt/style/objectvisuals.cpp qmt/style/objectvisuals.h
     qmt/style/relationstarterstyle.cpp qmt/style/relationstarterstyle.h
+    qmt/style/relationvisuals.cpp qmt/style/relationvisuals.h
     qmt/style/stylecontroller.cpp qmt/style/stylecontroller.h
     qmt/style/style.cpp
     qmt/style/styledobject.cpp qmt/style/styledobject.h
diff --git a/src/libs/modelinglib/modelinglib.qbs b/src/libs/modelinglib/modelinglib.qbs
index 90fc1d0d982..54ad0cad64c 100644
--- a/src/libs/modelinglib/modelinglib.qbs
+++ b/src/libs/modelinglib/modelinglib.qbs
@@ -238,6 +238,8 @@ QtcLibrary {
             "model_controller/mselection.h",
             "model_controller/mvoidvisitor.cpp",
             "model_controller/mvoidvisitor.h",
+            "model_ui/modeltreefilterdata.cpp",
+            "model_ui/modeltreefilterdata.h",
             "model_ui/modeltreeviewinterface.h",
             "model_ui/sortedtreemodel.cpp",
             "model_ui/sortedtreemodel.h",
@@ -247,8 +249,12 @@ QtcLibrary {
             "model_ui/treemodel.h",
             "model_ui/treemodelmanager.cpp",
             "model_ui/treemodelmanager.h",
+            "model_widgets_ui/addrelatedelementsdialog.h",
+            "model_widgets_ui/addrelatedelementsdialog.cpp",
             "model_widgets_ui/classmembersedit.cpp",
             "model_widgets_ui/classmembersedit.h",
+            "model_widgets_ui/modeltreefilter.cpp",
+            "model_widgets_ui/modeltreefilter.h",
             "model_widgets_ui/modeltreeview.cpp",
             "model_widgets_ui/modeltreeview.h",
             "model_widgets_ui/palettebox.cpp",
@@ -295,6 +301,8 @@ QtcLibrary {
             "style/objectvisuals.h",
             "style/relationstarterstyle.cpp",
             "style/relationstarterstyle.h",
+            "style/relationvisuals.cpp",
+            "style/relationvisuals.h",
             "style/style.cpp",
             "style/style.h",
             "style/stylecontroller.cpp",
@@ -388,8 +396,8 @@ QtcLibrary {
 
     Export {
         cpp.includePaths: [
-            ".",
-            "./qtserialization/inc"
+            exportingProduct.sourceDirectory,
+            exportingProduct.sourceDirectory + "/qtserialization/inc"
         ]
     }
 }
diff --git a/src/libs/modelinglib/qmt/config/configcontroller.cpp b/src/libs/modelinglib/qmt/config/configcontroller.cpp
index 4bb9b806c41..c584bce1c2c 100644
--- a/src/libs/modelinglib/qmt/config/configcontroller.cpp
+++ b/src/libs/modelinglib/qmt/config/configcontroller.cpp
@@ -9,12 +9,11 @@
 
 #include "qmt/stereotype/stereotypecontroller.h"
 
-#include <QDir>
-#include <QFileInfo>
-#include <QFile>
-
 #include <QDebug>
 
+using Utils::FilePath;
+using Utils::FilePaths;
+
 namespace qmt {
 
 class ConfigController::ConfigControllerPrivate
@@ -39,7 +38,7 @@ void ConfigController::setStereotypeController(StereotypeController *stereotypeC
     d->m_stereotypeController = stereotypeController;
 }
 
-void ConfigController::readStereotypeDefinitions(const QString &path)
+void ConfigController::readStereotypeDefinitions(const FilePath &path)
 {
     if (path.isEmpty()) {
         // TODO add error handling
@@ -54,25 +53,19 @@ void ConfigController::readStereotypeDefinitions(const QString &path)
     connect(&parser, &StereotypeDefinitionParser::toolbarParsed,
             this, &ConfigController::onToolbarParsed);
 
-    QStringList fileNames;
-    QDir dir;
-    QFileInfo fileInfo(path);
-    if (fileInfo.isFile()) {
-        dir.setPath(fileInfo.path());
-        fileNames.append(fileInfo.fileName());
-    } else if (fileInfo.isDir()) {
-        dir.setPath(path);
-        dir.setNameFilters(QStringList("*.def"));
-        fileNames = dir.entryList(QDir::Files);
+    FilePaths paths;
+    if (path.isFile()) {
+        paths.append(path);
+    } else if (path.isDir()) {
+        paths = path.dirEntries({ { "*.def" } });
     } else {
         // TODO add error handling
         return;
     }
-    for (const QString &fileName : std::as_const(fileNames)) {
-        QFile file(QFileInfo(dir, fileName).absoluteFilePath());
-        if (file.open(QIODevice::ReadOnly)) {
-            QString text = QString::fromUtf8(file.readAll());
-            file.close();
+    for (const FilePath &filePath : std::as_const(paths)) {
+        auto data = filePath.fileContents();
+        if (data.has_value()) {
+            QString text = QString::fromUtf8(data.value());
             StringTextSource source;
             source.setSourceId(1);
             source.setText(text);
diff --git a/src/libs/modelinglib/qmt/config/configcontroller.h b/src/libs/modelinglib/qmt/config/configcontroller.h
index 28e6d65afcd..7d8af82f6ee 100644
--- a/src/libs/modelinglib/qmt/config/configcontroller.h
+++ b/src/libs/modelinglib/qmt/config/configcontroller.h
@@ -5,6 +5,8 @@
 
 #include "qmt/infrastructure/qmt_global.h"
 
+#include <utils/filepath.h>
+
 #include <QObject>
 
 namespace qmt {
@@ -24,7 +26,7 @@ public:
 
     void setStereotypeController(StereotypeController *stereotypeController);
 
-    void readStereotypeDefinitions(const QString &path);
+    void readStereotypeDefinitions(const Utils::FilePath &path);
 
 private:
     void onStereotypeIconParsed(const StereotypeIcon &stereotypeIcon);
diff --git a/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp b/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp
index b3caebb1645..d81f71c5000 100644
--- a/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp
+++ b/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp
@@ -28,12 +28,15 @@ static const int KEYWORD_WIDTH         =  6;
 static const int KEYWORD_HEIGHT        =  7;
 static const int KEYWORD_MINWIDTH      =  8;
 static const int KEYWORD_MINHEIGHT     =  9;
-static const int KEYWORD_LOCK_SIZE     = 10;
-static const int KEYWORD_DISPLAY       = 11;
-static const int KEYWORD_TEXTALIGN     = 12;
-static const int KEYWORD_BASECOLOR     = 13;
-static const int KEYWORD_SHAPE         = 14;
-static const int KEYWORD_OUTLINE       = 15;
+static const int KEYWORD_ICONWIDTH     = 10;
+static const int KEYWORD_ICONHEIGHT    = 11;
+static const int KEYWORD_LOCK_SIZE     = 12;
+static const int KEYWORD_DISPLAY       = 13;
+static const int KEYWORD_TEXTALIGN     = 14;
+static const int KEYWORD_BASECOLOR     = 15;
+static const int KEYWORD_SHAPE         = 16;
+static const int KEYWORD_OUTLINE       = 17;
+static const int KEYWORD_Z             = 18;
 
 // Shape items
 static const int KEYWORD_CIRCLE        = 30;
@@ -102,8 +105,18 @@ static const int KEYWORD_DASH          = 136;
 static const int KEYWORD_DASHDOT       = 137;
 static const int KEYWORD_DASHDOTDOT    = 138;
 static const int KEYWORD_COLOR         = 139;
+static const int KEYWORD_EMPHASIZED    = 140;
 
-// Operatoren
+// Shape Value Units and Origin
+static const int KEYWORD_ABS           = 150;
+static const int KEYWORD_FIX           = 151;
+static const int KEYWORD_SCALE         = 152;
+static const int KEYWORD_FRACT         = 153;
+static const int KEYWORD_ORIGIN        = 154;
+static const int KEYWORD_CENTER        = 155;
+static const int KEYWORD_SIZE          = 156;
+
+// Operators
 static const int OPERATOR_SEMICOLON    =  1;
 static const int OPERATOR_BRACE_OPEN   =  2;
 static const int OPERATOR_BRACE_CLOSE  =  3;
@@ -111,6 +124,7 @@ static const int OPERATOR_COLON        =  4;
 static const int OPERATOR_COMMA        =  5;
 static const int OPERATOR_PERIOD       =  6;
 static const int OPERATOR_MINUS        =  7;
+static const int OPERATOR_PERCENTAGE   =  8;
 
 template <typename T, typename U>
 QHash<T, U> operator<<(QHash<T, U> hash, QPair<T, U> pair) {
@@ -213,12 +227,15 @@ void StereotypeDefinitionParser::parse(ITextSource *source)
                              {"height", KEYWORD_HEIGHT},
                              {"minwidth", KEYWORD_MINWIDTH},
                              {"minheight", KEYWORD_MINHEIGHT},
+                             {"iconwidth", KEYWORD_ICONWIDTH},
+                             {"iconheight", KEYWORD_ICONHEIGHT},
                              {"locksize", KEYWORD_LOCK_SIZE},
                              {"display", KEYWORD_DISPLAY},
                              {"textalignment", KEYWORD_TEXTALIGN},
                              {"basecolor", KEYWORD_BASECOLOR},
                              {"shape", KEYWORD_SHAPE},
                              {"outline", KEYWORD_OUTLINE},
+                             {"z", KEYWORD_Z},
                              {"circle", KEYWORD_CIRCLE},
                              {"ellipse", KEYWORD_ELLIPSE},
                              {"line", KEYWORD_LINE},
@@ -276,7 +293,15 @@ void StereotypeDefinitionParser::parse(ITextSource *source)
                              {"dash", KEYWORD_DASH},
                              {"dashdot", KEYWORD_DASHDOT},
                              {"dashdotdot", KEYWORD_DASHDOTDOT},
-                             {"color", KEYWORD_COLOR}});
+                             {"color", KEYWORD_COLOR},
+                             {"emphasized", KEYWORD_EMPHASIZED},
+                             {"abs", KEYWORD_ABS},
+                             {"fix", KEYWORD_FIX},
+                             {"scale", KEYWORD_SCALE},
+                             {"fract", KEYWORD_FRACT},
+                             {"origin", KEYWORD_ORIGIN},
+                             {"center", KEYWORD_CENTER},
+                             {"size", KEYWORD_SIZE}});
 
     textScanner.setOperators({{";", OPERATOR_SEMICOLON},
                               {"{", OPERATOR_BRACE_OPEN},
@@ -284,7 +309,8 @@ void StereotypeDefinitionParser::parse(ITextSource *source)
                               {":", OPERATOR_COLON},
                               {",", OPERATOR_COMMA},
                               {".", OPERATOR_PERIOD},
-                              {"-", OPERATOR_MINUS}});
+                              {"-", OPERATOR_MINUS},
+                              {"%", OPERATOR_PERCENTAGE}});
 
     textScanner.setSource(source);
 
@@ -364,6 +390,23 @@ void StereotypeDefinitionParser::parseIcon()
         case KEYWORD_MINHEIGHT:
             stereotypeIcon.setMinHeight(parseFloatProperty());
             break;
+        case KEYWORD_ICONWIDTH:
+            stereotypeIcon.setIconWith(parseFloatProperty());
+            break;
+        case KEYWORD_ICONHEIGHT:
+            stereotypeIcon.setIconHeight(parseFloatProperty());
+            break;
+        case KEYWORD_Z:
+        {
+            const static QHash<QString, StereotypeIcon::DepthLayer> zNames = QHash<QString, StereotypeIcon::DepthLayer>()
+                    << qMakePair(QString("behinditems"), StereotypeIcon::DepthBehindItems)
+                    << qMakePair(QString("amongitems"), StereotypeIcon::DepthAmongItems)
+                    << qMakePair(QString("beforeitems"), StereotypeIcon::DepthBeforeItems);
+            parseEnum<StereotypeIcon::DepthLayer>(
+                        parseIdentifierProperty(), zNames, token.sourcePos(),
+                        [&](StereotypeIcon::DepthLayer layer) { stereotypeIcon.setDepthLayer(layer); });
+            break;
+        }
         case KEYWORD_LOCK_SIZE:
         {
             const static QHash<QString, StereotypeIcon::SizeLock> lockNames
@@ -577,7 +620,7 @@ QHash<int, StereotypeDefinitionParser::IconCommandParameter> StereotypeDefinitio
                 throw StereotypeDefinitionParserError("Property given twice.", token.sourcePos());
             IconCommandParameter parameter = parameters.value(token.subtype());
             if (parameter.type() == IconCommandParameter::ShapeValue)
-                parameter.setShapeValue(ShapeValueF(parseFloatProperty(), parameter.unit(), parameter.origin()));
+                parameter.setShapeValue(parseShapeValueProperty(parameter.unit(), parameter.origin()));
             else if (parameter.type() == IconCommandParameter::Boolean)
                 parameter.setBoolean(parseBoolProperty());
             else
@@ -650,8 +693,6 @@ void StereotypeDefinitionParser::parseRelation(CustomRelation::Element element)
         }
         case KEYWORD_COLOR:
         {
-            if (element != CustomRelation::Element::Relation)
-                throwUnknownPropertyError(token);
             Value expression = parseProperty();
             if (expression.type() == Color) {
                 relation.setColorType(CustomRelation::ColorType::Custom);
@@ -663,6 +704,10 @@ void StereotypeDefinitionParser::parseRelation(CustomRelation::Element element)
                     relation.setColorType(CustomRelation::ColorType::EndA);
                 } else if (colorName == "b") {
                     relation.setColorType(CustomRelation::ColorType::EndB);
+                } else if (colorName == "warning") {
+                    relation.setColorType(CustomRelation::ColorType::Warning);
+                } else if (colorName == "error") {
+                    relation.setColorType(CustomRelation::ColorType::Error);
                 } else if (QColor::isValidColor(colorName)) {
                     relation.setColorType(CustomRelation::ColorType::Custom);
                     relation.setColor(QColor(colorName));
@@ -674,6 +719,9 @@ void StereotypeDefinitionParser::parseRelation(CustomRelation::Element element)
             }
             break;
         }
+        case KEYWORD_EMPHASIZED:
+            relation.setEmphasized(parseBoolProperty());
+            break;
         case KEYWORD_END:
             parseRelationEnd(&relation);
             break;
@@ -976,6 +1024,65 @@ StereotypeDefinitionParser::Value StereotypeDefinitionParser::parseProperty()
     return parseExpression();
 }
 
+ShapeValueF StereotypeDefinitionParser::parseShapeValueProperty(ShapeValueF::Unit unit, ShapeValueF::Origin origin)
+{
+    expectColon();
+    qreal value = parseFloatExpression();
+    // unit
+    Token token = d->m_scanner->read();
+    if (token.type() == Token::TokenOperator) {
+        switch (token.subtype()) {
+        case OPERATOR_PERCENTAGE:
+            unit = ShapeValueF::UnitPercentage;
+            break;
+        default:
+            d->m_scanner->unread(token);
+            break;
+        }
+    } else if (token.type() == Token::TokenKeyword) {
+        switch (token.subtype()) {
+        case KEYWORD_ABS:
+            unit = ShapeValueF::UnitAbsolute;
+            break;
+        case KEYWORD_FIX:
+            unit = ShapeValueF::UnitRelative;
+            break;
+        case KEYWORD_SCALE:
+            unit = ShapeValueF::UnitScaled;
+            break;
+        case KEYWORD_FRACT:
+            unit = ShapeValueF::UnitPercentage;
+            break;
+        default:
+            d->m_scanner->unread(token);
+            break;
+        }
+    } else {
+        d->m_scanner->unread(token);
+    }
+    // origin
+    token = d->m_scanner->read();
+    if (token.type() == Token::TokenKeyword) {
+        switch (token.subtype()) {
+        case KEYWORD_ORIGIN:
+            origin = ShapeValueF::OriginTopOrLeft;
+            break;
+        case KEYWORD_CENTER:
+            origin = ShapeValueF::OriginCenter;
+            break;
+        case KEYWORD_SIZE:
+            origin = ShapeValueF::OriginBottomOrRight;
+            break;
+        default:
+            d->m_scanner->unread(token);
+            break;
+        }
+    } else {
+        d->m_scanner->unread(token);
+    }
+    return ShapeValueF(value, unit, origin);
+}
+
 QString StereotypeDefinitionParser::parseStringExpression()
 {
     Token token = d->m_scanner->read();
@@ -1050,11 +1157,8 @@ QColor StereotypeDefinitionParser::parseColorExpression()
     Token token = d->m_scanner->read();
     if (token.type() == Token::TokenIdentifier || token.type() == Token::TokenColor) {
         QString value = token.text().toLower();
-        QColor color;
-        if (QColor::isValidColor(value)) {
-            color.setNamedColor(value);
-            return color;
-        }
+        if (QColor::isValidColorName(value))
+            return QColor::fromString(value);
     }
     throw StereotypeDefinitionParserError("Expected color name.", token.sourcePos());
 }
@@ -1084,9 +1188,8 @@ StereotypeDefinitionParser::Value StereotypeDefinitionParser::parseExpression()
         return Value(Float, QVariant(value));
     } else if (token.type() == Token::TokenColor) {
         QString value = token.text().toLower();
-        QColor color;
-        if (QColor::isValidColor(value)) {
-            color.setNamedColor(value);
+        if (QColor::isValidColorName(value)) {
+            const QColor color = QColor::fromString(value);
             return Value(Color, QVariant(color));
         } else {
             throw StereotypeDefinitionParserError("Invalid color.", token.sourcePos());
diff --git a/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.h b/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.h
index e32126c7302..97b14211cac 100644
--- a/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.h
+++ b/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.h
@@ -6,6 +6,7 @@
 #include <QObject>
 #include "qmt/infrastructure/exceptions.h"
 #include "qmt/stereotype/customrelation.h"
+#include "qmt/stereotype/shapevalue.h"
 #include "qmt/stereotype/toolbar.h"
 
 #include "sourcepos.h"
@@ -20,7 +21,6 @@ class ITextSource;
 class Token;
 class StereotypeIcon;
 class Toolbar;
-class ShapeValueF;
 
 class QMT_EXPORT StereotypeDefinitionParserError : public Exception
 {
@@ -97,6 +97,7 @@ private:
     bool parseBoolProperty();
     QColor parseColorProperty();
     Value parseProperty();
+    ShapeValueF parseShapeValueProperty(ShapeValueF::Unit unit, ShapeValueF::Origin origin);
 
     QString parseStringExpression();
     qreal parseFloatExpression();
diff --git a/src/libs/modelinglib/qmt/controller/namecontroller.cpp b/src/libs/modelinglib/qmt/controller/namecontroller.cpp
index d910be4b128..2f9506d3fe5 100644
--- a/src/libs/modelinglib/qmt/controller/namecontroller.cpp
+++ b/src/libs/modelinglib/qmt/controller/namecontroller.cpp
@@ -3,9 +3,10 @@
 
 #include "namecontroller.h"
 
-#include <QFileInfo>
 #include <QDebug>
 
+using Utils::FilePath;
+
 namespace qmt {
 
 NameController::NameController(QObject *parent)
@@ -17,10 +18,9 @@ NameController::~NameController()
 {
 }
 
-QString NameController::convertFileNameToElementName(const QString &fileName)
+QString NameController::convertFileNameToElementName(const FilePath &fileName)
 {
-    QFileInfo fileInfo(fileName);
-    QString baseName = fileInfo.baseName().trimmed();
+    QString baseName = fileName.baseName().trimmed();
     QString elementName;
     bool makeTitlecase = true;
     bool insertSpace = false;
@@ -65,13 +65,19 @@ QString NameController::convertElementNameToBaseFileName(const QString &elementN
     return baseFileName;
 }
 
-QString NameController::calcRelativePath(const QString &absoluteFileName, const QString &anchorPath)
+FilePath NameController::calcRelativePath(const FilePath &absoluteFileName,
+                                          const FilePath &anchorPath)
 {
+    // TODO try using Utils::FilePath::relativePath
+    QString absoluteFilePath = absoluteFileName.path();
+    QString anchorPathString = anchorPath.path();
     int secondLastSlashIndex = -1;
     int slashIndex = -1;
     int i = 0;
-    while (i < absoluteFileName.size() && i < anchorPath.size() && absoluteFileName.at(i) == anchorPath.at(i)) {
-        if (absoluteFileName.at(i) == QLatin1Char('/')) {
+    while (i < absoluteFilePath.size() && i < anchorPathString.size()
+           && absoluteFilePath.at(i) == anchorPathString.at(i))
+    {
+        if (absoluteFilePath.at(i) == QLatin1Char('/')) {
             secondLastSlashIndex = slashIndex;
             slashIndex = i;
         }
@@ -81,22 +87,22 @@ QString NameController::calcRelativePath(const QString &absoluteFileName, const
     QString relativePath;
 
     if (slashIndex < 0) {
-        relativePath = absoluteFileName;
-    } else if (i >= absoluteFileName.size()) {
+        relativePath = absoluteFilePath;
+    } else if (i >= absoluteFilePath.size()) {
         // absoluteFileName is a substring of anchor path.
         if (slashIndex == i - 1) {
             if (secondLastSlashIndex < 0)
-                relativePath = absoluteFileName;
+                relativePath = absoluteFilePath;
             else
-                relativePath = absoluteFileName.mid(secondLastSlashIndex + 1);
+                relativePath = absoluteFilePath.mid(secondLastSlashIndex + 1);
         } else {
-            relativePath = absoluteFileName.mid(slashIndex + 1);
+            relativePath = absoluteFilePath.mid(slashIndex + 1);
         }
     } else {
-        relativePath = absoluteFileName.mid(slashIndex + 1);
+        relativePath = absoluteFilePath.mid(slashIndex + 1);
     }
 
-    return relativePath;
+    return FilePath::fromString(relativePath);
 }
 
 QString NameController::calcElementNameSearchId(const QString &elementName)
@@ -109,16 +115,17 @@ QString NameController::calcElementNameSearchId(const QString &elementName)
     return searchId;
 }
 
-QStringList NameController::buildElementsPath(const QString &filePath, bool ignoreLastFilePathPart)
+QStringList NameController::buildElementsPath(const FilePath &filePath,
+                                              bool ignoreLastFilePathPart)
 {
     QList<QString> relativeElements;
 
-    QStringList split = filePath.split("/");
+    QStringList split = filePath.toString().split("/");
     QStringList::const_iterator splitEnd = split.constEnd();
     if (ignoreLastFilePathPart || split.last().isEmpty())
         --splitEnd;
     for (auto it = split.constBegin(); it != splitEnd; ++it) {
-        QString packageName = qmt::NameController::convertFileNameToElementName(*it);
+        QString packageName = qmt::NameController::convertFileNameToElementName(FilePath::fromString(*it));
         relativeElements.append(packageName);
     }
     return relativeElements;
diff --git a/src/libs/modelinglib/qmt/controller/namecontroller.h b/src/libs/modelinglib/qmt/controller/namecontroller.h
index 03e3be30bb8..bb1ff0c3e1a 100644
--- a/src/libs/modelinglib/qmt/controller/namecontroller.h
+++ b/src/libs/modelinglib/qmt/controller/namecontroller.h
@@ -6,6 +6,8 @@
 #include <QObject>
 #include "qmt/infrastructure/qmt_global.h"
 
+#include <utils/filepath.h>
+
 #include <QString>
 #include <QStringList>
 
@@ -18,12 +20,12 @@ private:
     ~NameController() override;
 
 public:
-    static QString convertFileNameToElementName(const QString &fileName);
+    static QString convertFileNameToElementName(const Utils::FilePath &fileName);
     static QString convertElementNameToBaseFileName(const QString &elementName);
-    // TODO use Utils::FilePath instead
-    static QString calcRelativePath(const QString &absoluteFileName, const QString &anchorPath);
+    static Utils::FilePath calcRelativePath(const Utils::FilePath &absoluteFileName,
+                                            const Utils::FilePath &anchorPath);
     static QString calcElementNameSearchId(const QString &elementName);
-    static QStringList buildElementsPath(const QString &filePath, bool ignoreLastFilePathPart);
+    static QStringList buildElementsPath(const Utils::FilePath &filePath, bool ignoreLastFilePathPart);
     static bool parseClassName(const QString &fullClassName, QString *umlNamespace,
                                QString *className, QStringList *templateParameters);
 };
diff --git a/src/libs/modelinglib/qmt/diagram/dobject.cpp b/src/libs/modelinglib/qmt/diagram/dobject.cpp
index 4e0e5cb6423..543e6af30fc 100644
--- a/src/libs/modelinglib/qmt/diagram/dobject.cpp
+++ b/src/libs/modelinglib/qmt/diagram/dobject.cpp
@@ -6,11 +6,11 @@
 #include "dvisitor.h"
 #include "dconstvisitor.h"
 
+using Utils::FilePath;
+
 namespace qmt {
 
-DObject::DObject()
-{
-}
+DObject::DObject() {}
 
 DObject::DObject(const DObject &rhs)
     : DElement(rhs),
@@ -25,7 +25,10 @@ DObject::DObject(const DObject &rhs)
       m_visualSecondaryRole(rhs.m_visualSecondaryRole),
       m_stereotypeDisplay(rhs.m_stereotypeDisplay),
       m_isAutoSized(rhs.m_isAutoSized),
-      m_isVisualEmphasized(rhs.m_isVisualEmphasized)
+      m_isVisualEmphasized(rhs.m_isVisualEmphasized),
+      m_hasLinkedFile(rhs.m_hasLinkedFile),
+      m_imagePath(rhs.m_imagePath),
+      m_image(rhs.m_image)
 {
 }
 
@@ -49,6 +52,9 @@ DObject &DObject::operator =(const DObject &rhs)
         m_stereotypeDisplay = rhs.m_stereotypeDisplay;
         m_isAutoSized = rhs.m_isAutoSized;
         m_isVisualEmphasized = rhs.m_isVisualEmphasized;
+        m_hasLinkedFile = rhs.m_hasLinkedFile;
+        m_imagePath = rhs.m_imagePath;
+        m_image = rhs.m_image;
     }
     return *this;
 }
@@ -113,6 +119,26 @@ void DObject::setVisualEmphasized(bool visualEmphasized)
     m_isVisualEmphasized = visualEmphasized;
 }
 
+void DObject::setLinkedFile(bool linkedFile)
+{
+    m_hasLinkedFile = linkedFile;
+}
+
+bool DObject::hasImage() const
+{
+    return !m_image.isNull();
+}
+
+void DObject::setImagePath(const FilePath &path)
+{
+    m_imagePath = path;
+}
+
+void DObject::setImage(const QImage &image)
+{
+    m_image = image;
+}
+
 void DObject::accept(DVisitor *visitor)
 {
     visitor->visitDObject(this);
diff --git a/src/libs/modelinglib/qmt/diagram/dobject.h b/src/libs/modelinglib/qmt/diagram/dobject.h
index c8cf2b0e4dd..7364f157499 100644
--- a/src/libs/modelinglib/qmt/diagram/dobject.h
+++ b/src/libs/modelinglib/qmt/diagram/dobject.h
@@ -7,6 +7,9 @@
 
 #include "qmt/infrastructure/uid.h"
 
+#include <utils/filepath.h>
+
+#include <QImage>
 #include <QList>
 #include <QPointF>
 #include <QRectF>
@@ -78,6 +81,13 @@ public:
     void setAutoSized(bool autoSized);
     bool isVisualEmphasized() const { return m_isVisualEmphasized; }
     void setVisualEmphasized(bool visualEmphasized);
+    bool hasLinkedFile() const { return m_hasLinkedFile; }
+    void setLinkedFile(bool linkedFile);
+    Utils::FilePath imagePath() const { return m_imagePath; }
+    void setImagePath(const Utils::FilePath &path);
+    bool hasImage() const;
+    QImage image() const { return m_image; }
+    void setImage(const QImage &image);
 
     void accept(DVisitor *visitor) override;
     void accept(DConstVisitor *visitor) const override;
@@ -95,6 +105,9 @@ private:
     StereotypeDisplay m_stereotypeDisplay = StereotypeSmart;
     bool m_isAutoSized = true;
     bool m_isVisualEmphasized = false;
+    bool m_hasLinkedFile = false;
+    Utils::FilePath m_imagePath;
+    QImage m_image;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram/drelation.cpp b/src/libs/modelinglib/qmt/diagram/drelation.cpp
index a21f61c7078..890bd275e4f 100644
--- a/src/libs/modelinglib/qmt/diagram/drelation.cpp
+++ b/src/libs/modelinglib/qmt/diagram/drelation.cpp
@@ -65,6 +65,31 @@ void DRelation::setIntermediatePoints(const QList<DRelation::IntermediatePoint>
     m_intermediatePoints = intermediatePoints;
 }
 
+void DRelation::setVisualPrimaryRole(VisualPrimaryRole visualPrimaryRole)
+{
+    m_visualPrimaryRole = visualPrimaryRole;
+}
+
+void DRelation::setVisualSecondaryRole(VisualSecondaryRole visualSecondaryRole)
+{
+    m_visualSecondaryRole = visualSecondaryRole;
+}
+
+void DRelation::setVisualEmphasized(bool visualEmphasized)
+{
+    m_isVisualEmphasized = visualEmphasized;
+}
+
+void DRelation::setColor(const QColor &color)
+{
+    m_color = color;
+}
+
+void DRelation::setThickness(qreal thickness)
+{
+    m_thickness = thickness;
+}
+
 void DRelation::accept(DVisitor *visitor)
 {
     visitor->visitDRelation(this);
diff --git a/src/libs/modelinglib/qmt/diagram/drelation.h b/src/libs/modelinglib/qmt/diagram/drelation.h
index 34bdaf1986d..ed5624ad9f0 100644
--- a/src/libs/modelinglib/qmt/diagram/drelation.h
+++ b/src/libs/modelinglib/qmt/diagram/drelation.h
@@ -5,6 +5,7 @@
 
 #include "delement.h"
 
+#include <QColor>
 #include <QList>
 #include <QPointF>
 
@@ -15,6 +16,22 @@ class DObject;
 class QMT_EXPORT DRelation : public DElement
 {
 public:
+    enum VisualPrimaryRole {
+        PrimaryRoleNormal,
+        PrimaryRoleCustom1,
+        PrimaryRoleCustom2,
+        PrimaryRoleCustom3,
+        PrimaryRoleCustom4,
+        PrimaryRoleCustom5
+    };
+
+    enum VisualSecondaryRole {
+        SecondaryRoleNone,
+        SecondaryRoleWarning,
+        SecondaryRoleError,
+        SecondaryRoleSoften
+    };
+
     class IntermediatePoint
     {
     public:
@@ -42,6 +59,16 @@ public:
     void setName(const QString &name);
     const QList<IntermediatePoint> intermediatePoints() const { return m_intermediatePoints; }
     void setIntermediatePoints(const QList<IntermediatePoint> &intermediatePoints);
+    VisualPrimaryRole visualPrimaryRole() const { return m_visualPrimaryRole; }
+    void setVisualPrimaryRole(VisualPrimaryRole visualPrimaryRole);
+    VisualSecondaryRole visualSecondaryRole() const { return m_visualSecondaryRole; }
+    void setVisualSecondaryRole(VisualSecondaryRole visualSecondaryRole);
+    bool isVisualEmphasized() const { return m_isVisualEmphasized; }
+    void setVisualEmphasized(bool visualEmphasized);
+    QColor color() const { return m_color; }
+    void setColor(const QColor &color);
+    qreal thickness() const { return m_thickness; }
+    void setThickness(qreal thickness);
 
     void accept(DVisitor *visitor) override;
     void accept(DConstVisitor *visitor) const override;
@@ -53,6 +80,11 @@ private:
     Uid m_endBUid;
     QString m_name;
     QList<IntermediatePoint> m_intermediatePoints;
+    VisualPrimaryRole m_visualPrimaryRole = PrimaryRoleNormal;
+    VisualSecondaryRole m_visualSecondaryRole = SecondaryRoleNone;
+    bool m_isVisualEmphasized = false;
+    QColor m_color;
+    qreal m_thickness = 0;
 };
 
 bool operator==(const DRelation::IntermediatePoint &lhs, const DRelation::IntermediatePoint &rhs);
diff --git a/src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.cpp b/src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.cpp
index 5e881758127..5e4c0725885 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.cpp
+++ b/src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.cpp
@@ -49,7 +49,10 @@ void DFlatAssignmentVisitor::visitDObject(const DObject *object)
     target->setVisualPrimaryRole(object->visualPrimaryRole());
     target->setVisualSecondaryRole(object->visualSecondaryRole());
     target->setVisualEmphasized(object->isVisualEmphasized());
+    target->setLinkedFile(object->hasLinkedFile());
     target->setStereotypeDisplay(object->stereotypeDisplay());
+    target->setImagePath(object->imagePath());
+    target->setImage(object->image());
 }
 
 void DFlatAssignmentVisitor::visitDPackage(const DPackage *package)
@@ -100,6 +103,8 @@ void DFlatAssignmentVisitor::visitDRelation(const DRelation *relation)
     QMT_ASSERT(target, return);
     target->setStereotypes(relation->stereotypes());
     target->setIntermediatePoints(relation->intermediatePoints());
+    target->setVisualPrimaryRole(relation->visualPrimaryRole());
+    target->setThickness(relation->thickness());
 }
 
 void DFlatAssignmentVisitor::visitDInheritance(const DInheritance *inheritance)
diff --git a/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp b/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp
index 91a95438ad5..2dd079e1bcb 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp
+++ b/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp
@@ -65,13 +65,16 @@ void DUpdateVisitor::visitMObject(const MObject *object)
     }
     if (isUpdating(object->name() != dobject->name()))
         dobject->setName(object->name());
+    bool hasLinkedFile = !object->linkedFileName().isEmpty();
+    if (isUpdating(hasLinkedFile != dobject->hasLinkedFile()))
+        dobject->setLinkedFile(hasLinkedFile);
     // TODO unlikely that this is called for all objects if hierarchy is modified
     // PERFORM remove loop
     int depth = 1;
     const MObject *owner = object->owner();
     while (owner) {
         owner = owner->owner();
-        depth += 1;
+        depth += 3;
     }
     if (isUpdating(depth != dobject->depth()))
         dobject->setDepth(depth);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/capabilities/windable.h b/src/libs/modelinglib/qmt/diagram_scene/capabilities/windable.h
index a21f1caea33..c31249e5c10 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/capabilities/windable.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/capabilities/windable.h
@@ -20,7 +20,7 @@ public:
     virtual void insertHandle(int beforeIndex, const QPointF &pos, double rasterWidth, double rasterHeight) = 0;
     virtual void deleteHandle(int index) = 0;
     virtual void setHandlePos(int index, const QPointF &pos) = 0;
-    virtual void dropHandle(int index, double rasterWidth, double rasterHeight) = 0;
+    virtual void dropHandle(int index, bool extraSnap, double rasterWidth, double rasterHeight) = 0;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp
index 13167f691d8..9366a395033 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp
@@ -209,15 +209,26 @@ DSelection DiagramSceneModel::selectedElements() const
     return selection;
 }
 
-DElement *DiagramSceneModel::findTopmostElement(const QPointF &scenePos) const
+QGraphicsItem *DiagramSceneModel::findTopmostItem(const QPointF &scenePos) const
 {
     // fetch affected items from scene in correct drawing order to find topmost element
     const QList<QGraphicsItem *> items = m_graphicsScene->items(scenePos);
+    QGraphicsItem *candidate = NULL;
     for (QGraphicsItem *item : items) {
-        if (m_graphicsItems.contains(item))
-            return m_itemToElementMap.value(item);
+        if (m_graphicsItems.contains(item)) {
+            if (!candidate || item->zValue() > candidate->zValue())
+                candidate = item;
+        }
     }
-    return nullptr;
+    return candidate;
+}
+
+DElement *DiagramSceneModel::findTopmostElement(const QPointF &scenePos) const
+{
+    QGraphicsItem *item = findTopmostItem(scenePos);
+    if (!item)
+        return nullptr;
+    return m_itemToElementMap.value(item);
 }
 
 DObject *DiagramSceneModel::findTopmostObject(const QPointF &scenePos) const
@@ -230,16 +241,13 @@ DObject *DiagramSceneModel::findTopmostObject(const QPointF &scenePos) const
 
 ObjectItem *DiagramSceneModel::findTopmostObjectItem(const QPointF &scenePos) const
 {
-    // fetch affected items from scene in correct drawing order to find topmost element
-    const QList<QGraphicsItem *> items = m_graphicsScene->items(scenePos);
-    for (QGraphicsItem *item : std::as_const(items)) {
-        if (m_graphicsItems.contains(item)) {
-            DObject *object = dynamic_cast<DObject *>(m_itemToElementMap.value(item));
-            if (object)
-                return dynamic_cast<ObjectItem *>(item);
-        }
-    }
-    return nullptr;
+    QGraphicsItem *item = findTopmostItem(scenePos);
+    if (!item)
+        return nullptr;
+    DObject *object = dynamic_cast<DObject *>(m_itemToElementMap.value(item));
+    if (!object)
+        return nullptr;
+    return dynamic_cast<ObjectItem *>(item);
 }
 
 QGraphicsItem *DiagramSceneModel::graphicsItem(DElement *element) const
@@ -353,9 +361,8 @@ void DiagramSceneModel::selectAllElements()
 void DiagramSceneModel::selectElement(DElement *element)
 {
     QGraphicsItem *selectItem = m_elementToItemMap.value(element);
-    // We have to create a copy since "setSelected" may modify m_selectedItems
-    const QSet<QGraphicsItem *> copy = m_selectedItems;
-    for (QGraphicsItem *item : copy) {
+    auto selectedItems = m_selectedItems;
+    for (QGraphicsItem *item : std::as_const(selectedItems)) {
         if (item != selectItem)
             item->setSelected(false);
     }
@@ -365,9 +372,17 @@ void DiagramSceneModel::selectElement(DElement *element)
 
 void DiagramSceneModel::editElement(DElement *element)
 {
-    auto editable = dynamic_cast<IEditable *>(m_elementToItemMap.value(element));
-    if (editable && editable->isEditable())
+    QGraphicsItem *item = m_elementToItemMap.value(element);
+    auto editable = dynamic_cast<IEditable *>(item);
+    if (editable && editable->isEditable()) {
+        auto selectable = dynamic_cast<ISelectable *>(item);
+        if (selectable && item != m_focusItem) {
+            unsetFocusItem();
+            selectable->setFocusSelected(true);
+            m_focusItem = item;
+        }
         editable->edit();
+    }
 }
 
 void DiagramSceneModel::copyToClipboard()
@@ -509,9 +524,8 @@ void DiagramSceneModel::selectItem(QGraphicsItem *item, bool multiSelect)
 {
     if (!multiSelect) {
         if (!item->isSelected()) {
-            // We have to create a copy since "setSelected" may modify m_selectedItems
-            const QSet<QGraphicsItem *> copy = m_selectedItems;
-            for (QGraphicsItem *selectedItem : copy) {
+            auto selectedItems = m_selectedItems;
+            for (QGraphicsItem *selectedItem : std::as_const(selectedItems)) {
                 if (selectedItem != item)
                     selectedItem->setSelected(false);
             }
@@ -626,6 +640,7 @@ void DiagramSceneModel::keyReleaseEvent(QKeyEvent *event)
 
 void DiagramSceneModel::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
+    m_mousePressed = true;
     updateFocusItem(Utils::toSet(m_graphicsScene->selectedItems()));
     m_latchController->mousePressEventLatching(event);
     mousePressEventReparenting(event);
@@ -660,8 +675,10 @@ void DiagramSceneModel::mouseMoveEventReparenting(QGraphicsSceneMouseEvent *even
 
 void DiagramSceneModel::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
+    m_mousePressed = false;
     m_latchController->mouseReleaseEventLatching(event);
     mouseReleaseEventReparenting(event);
+    recalcSceneRectSize();
 }
 
 void DiagramSceneModel::mouseReleaseEventReparenting(QGraphicsSceneMouseEvent *event)
@@ -853,7 +870,7 @@ void DiagramSceneModel::onSelectionChanged()
     QSet<QGraphicsItem *> newSecondarySelectedItems;
 
     // select all contained objects secondarily
-    for (QGraphicsItem *selectedItem : std::as_const(m_secondarySelectedItems)) {
+    for (QGraphicsItem *selectedItem : std::as_const(m_selectedItems)) {
         const QList<QGraphicsItem *> items = collectCollidingObjectItems(selectedItem, CollidingInnerItems);
         for (QGraphicsItem *item : items) {
             if (!item->isSelected() && dynamic_cast<ISelectable *>(item)
@@ -910,7 +927,8 @@ void DiagramSceneModel::onSelectionChanged()
         }
     }
 
-    for (QGraphicsItem *item : std::as_const(m_secondarySelectedItems)) {
+    auto secondarySelectedItems = m_secondarySelectedItems;
+    for (QGraphicsItem *item : std::as_const(secondarySelectedItems)) {
         if (!newSecondarySelectedItems.contains(item)) {
             auto selectable = dynamic_cast<ISelectable *>(item);
             QMT_ASSERT(selectable, return);
@@ -1041,8 +1059,19 @@ void DiagramSceneModel::recalcSceneRectSize()
         if (!dynamic_cast<SwimlaneItem *>(item))
             sceneRect |= item->mapRectToScene(item->boundingRect());
     }
-    m_sceneRect = sceneRect;
-    emit sceneRectChanged(sceneRect);
+    if (m_mousePressed) {
+        if (sceneRect.left() < m_sceneRect.left())
+            m_sceneRect.setLeft(sceneRect.left());
+        if (sceneRect.right() > m_sceneRect.right())
+            m_sceneRect.setRight(sceneRect.right());
+        if (sceneRect.top() < m_sceneRect.top())
+            m_sceneRect.setTop(sceneRect.top());
+        if (sceneRect.bottom() > m_sceneRect.bottom())
+            m_sceneRect.setBottom(sceneRect.bottom());
+    } else {
+        m_sceneRect = sceneRect;
+    }
+    emit sceneRectChanged(m_sceneRect);
 }
 
 QGraphicsItem *DiagramSceneModel::createGraphicsItem(DElement *element)
diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h
index 0021faf4598..b976f421f93 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h
@@ -79,6 +79,7 @@ public:
     bool hasSelection() const;
     bool hasMultiObjectsSelection() const;
     DSelection selectedElements() const;
+    QGraphicsItem *findTopmostItem(const QPointF &scenePos) const;
     DElement *findTopmostElement(const QPointF &scenePos) const;
     DObject *findTopmostObject(const QPointF &scenePos) const;
     ObjectItem *findTopmostObjectItem(const QPointF &scenePos) const;
@@ -169,6 +170,7 @@ private:
     QGraphicsItem *m_focusItem = nullptr;
     QRectF m_sceneRect;
     QList<Uid> m_relationEndsUid;
+    bool m_mousePressed = false;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp
index 14ad25b2c1d..23a9c524a2b 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp
@@ -85,29 +85,16 @@ void ClassItem::update()
         m_methodsText.clear();
     }
 
-    // custom icon
-    if (stereotypeIconDisplay() == StereotypeIcon::DisplayIcon) {
-        if (!m_customIcon)
-            m_customIcon = new CustomIconItem(diagramSceneModel(), this);
-        m_customIcon->setStereotypeIconId(stereotypeIconId());
-        m_customIcon->setBaseSize(stereotypeIconMinimumSize(m_customIcon->stereotypeIcon(), CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT));
-        m_customIcon->setBrush(style->fillBrush());
-        m_customIcon->setPen(style->outerLinePen());
-        m_customIcon->setZValue(SHAPE_ZVALUE);
-    } else if (m_customIcon) {
-        m_customIcon->scene()->removeItem(m_customIcon);
-        delete m_customIcon;
-        m_customIcon = nullptr;
-    }
+    updateCustomIcon(style);
 
     // shape
-    if (!m_customIcon) {
+    if (!customIconItem()) {
         if (!m_shape)
             m_shape = new QGraphicsRectItem(this);
         m_shape->setBrush(style->fillBrush());
         m_shape->setPen(style->outerLinePen());
         m_shape->setZValue(SHAPE_ZVALUE);
-    } else if (m_shape){
+    } else if (m_shape) {
         m_shape->scene()->removeItem(m_shape);
         delete m_shape;
         m_shape = nullptr;
@@ -259,7 +246,7 @@ void ClassItem::update()
         m_templateParameterBox = nullptr;
     }
 
-    updateSelectionMarker(m_customIcon);
+    updateSelectionMarker(customIconItem());
     updateRelationStarter();
     updateAlignmentButtons();
     updateGeometry();
@@ -267,8 +254,8 @@ void ClassItem::update()
 
 bool ClassItem::intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine) const
 {
-    if (m_customIcon) {
-        QList<QPolygonF> polygons = m_customIcon->outline();
+    if (customIconItem()) {
+        QList<QPolygonF> polygons = customIconItem()->outline();
         for (int i = 0; i < polygons.size(); ++i)
             polygons[i].translate(object()->pos() + object()->rect().topLeft());
         if (shapeIcon().textAlignment() == qmt::StereotypeIcon::TextalignBelow) {
@@ -508,7 +495,7 @@ DClass::TemplateDisplay ClassItem::templateDisplay() const
 
     DClass::TemplateDisplay templateDisplay = diagramClass->templateDisplay();
     if (templateDisplay == DClass::TemplateSmart) {
-        if (m_customIcon)
+        if (customIconItem())
             templateDisplay = DClass::TemplateName;
         else
             templateDisplay = DClass::TemplateBox;
@@ -521,8 +508,8 @@ QSizeF ClassItem::calcMinimumGeometry() const
     double width = 0.0;
     double height = 0.0;
 
-    if (m_customIcon) {
-        QSizeF sz = stereotypeIconMinimumSize(m_customIcon->stereotypeIcon(),
+    if (customIconItem()) {
+        QSizeF sz = customIconItemMinimumSize(customIconItem(),
                                               CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT);
         if (shapeIcon().textAlignment() != qmt::StereotypeIcon::TextalignTop
                 && shapeIcon().textAlignment() != qmt::StereotypeIcon::TextalignCenter)
@@ -589,12 +576,7 @@ void ClassItem::updateGeometry()
     height = geometry.height();
 
     if (object()->isAutoSized()) {
-        if (!m_customIcon) {
-            if (width < MINIMUM_AUTO_WIDTH)
-                width = MINIMUM_AUTO_WIDTH;
-            if (height < MINIMUM_AUTO_HEIGHT)
-                height = MINIMUM_AUTO_HEIGHT;
-        }
+        correctAutoSize(customIconItem(), width, height, MINIMUM_AUTO_WIDTH, MINIMUM_AUTO_HEIGHT);
     } else {
         QRectF rect = object()->rect();
         if (rect.width() > width)
@@ -619,15 +601,15 @@ void ClassItem::updateGeometry()
     // a backup for the graphics item used for manual resized and persistency.
     object()->setRect(rect);
 
-    if (m_customIcon) {
-        m_customIcon->setPos(left, top);
-        m_customIcon->setActualSize(QSizeF(width, height));
+    if (customIconItem()) {
+        customIconItem()->setPos(left, top);
+        customIconItem()->setActualSize(QSizeF(width, height));
     }
 
     if (m_shape)
         m_shape->setRect(rect);
 
-    if (m_customIcon) {
+    if (customIconItem()) {
         switch (shapeIcon().textAlignment()) {
         case qmt::StereotypeIcon::TextalignBelow:
             y += height + BODY_VERT_BORDER;
@@ -679,7 +661,7 @@ void ClassItem::updateGeometry()
         y += nameItem()->boundingRect().height();
     }
     if (m_contextLabel) {
-        if (m_customIcon)
+        if (customIconItem())
             m_contextLabel->resetMaxWidth();
         else
             m_contextLabel->setMaxWidth(width - 2 * BODY_HORIZ_BORDER);
@@ -692,7 +674,7 @@ void ClassItem::updateGeometry()
         y += 8.0;
     }
     if (m_attributes) {
-        if (m_customIcon)
+        if (customIconItem())
             m_attributes->setPos(-m_attributes->boundingRect().width() / 2.0, y);
         else
             m_attributes->setPos(left + BODY_HORIZ_BORDER, y);
@@ -704,7 +686,7 @@ void ClassItem::updateGeometry()
         y += 8.0;
     }
     if (m_methods) {
-        if (m_customIcon)
+        if (customIconItem())
             m_methods->setPos(-m_methods->boundingRect().width() / 2.0, y);
         else
             m_methods->setPos(left + BODY_HORIZ_BORDER, y);
@@ -765,21 +747,22 @@ void ClassItem::updateMembers(const Style *style)
             break;
         }
 
+        bool needBr = false;
         if (text && !text->isEmpty())
-            *text += "<br/>";
+            needBr = true;
 
-        bool addNewline = false;
-        bool addSpace = false;
         if (currentVisibility)
             *currentVisibility = member.visibility();
         if (currentGroup && member.group() != *currentGroup) {
-            *text += QString("[%1]").arg(member.group());
-            addNewline = true;
+            needBr = false;
+            *text += QString("<p style=\"padding:0;margin-top:6;margin-bottom:0;\"><b>[%1]</b></p>").arg(member.group());
             *currentGroup = member.group();
         }
-        if (addNewline)
+
+        if (needBr)
             *text += "<br/>";
 
+        bool addSpace = false;
         bool haveSignal = false;
         bool haveSlot = false;
         if (member.visibility() != MClassMember::VisibilityUndefined) {
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.h
index 83ce0a9a5a0..cc92ab1ff53 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.h
@@ -53,7 +53,6 @@ private:
     void updateGeometry();
     void updateMembers(const Style *style);
 
-    CustomIconItem *m_customIcon = nullptr;
     QGraphicsRectItem *m_shape = nullptr;
     QGraphicsSimpleTextItem *m_baseClasses = nullptr;
     QGraphicsSimpleTextItem *m_namespace = nullptr;
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.cpp
index 6a54a001e5f..e7fffcbf9a3 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.cpp
@@ -53,24 +53,11 @@ void ComponentItem::update()
 
     const Style *style = adaptedStyle(stereotypeIconId());
 
-    // custom icon
-    if (stereotypeIconDisplay() == StereotypeIcon::DisplayIcon) {
-        if (!m_customIcon)
-            m_customIcon = new CustomIconItem(diagramSceneModel(), this);
-        m_customIcon->setStereotypeIconId(stereotypeIconId());
-        m_customIcon->setBaseSize(stereotypeIconMinimumSize(m_customIcon->stereotypeIcon(), CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT));
-        m_customIcon->setBrush(style->fillBrush());
-        m_customIcon->setPen(style->outerLinePen());
-        m_customIcon->setZValue(SHAPE_ZVALUE);
-    } else if (m_customIcon) {
-        m_customIcon->scene()->removeItem(m_customIcon);
-        delete m_customIcon;
-        m_customIcon = nullptr;
-    }
+    updateCustomIcon(style);
 
     // shape
     bool deleteRects = false;
-    if (!m_customIcon) {
+    if (!customIconItem()) {
         if (!m_shape)
             m_shape = new QGraphicsRectItem(this);
         m_shape->setBrush(style->fillBrush());
@@ -130,7 +117,7 @@ void ComponentItem::update()
         m_contextLabel = nullptr;
     }
 
-    updateSelectionMarker(m_customIcon);
+    updateSelectionMarker(customIconItem());
     updateRelationStarter();
     updateAlignmentButtons();
     updateGeometry();
@@ -138,8 +125,8 @@ void ComponentItem::update()
 
 bool ComponentItem::intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine) const
 {
-    if (m_customIcon) {
-        QList<QPolygonF> polygons = m_customIcon->outline();
+    if (customIconItem()) {
+        QList<QPolygonF> polygons = customIconItem()->outline();
         for (int i = 0; i < polygons.size(); ++i)
             polygons[i].translate(object()->pos() + object()->rect().topLeft());
         if (shapeIcon().textAlignment() == qmt::StereotypeIcon::TextalignBelow) {
@@ -207,14 +194,16 @@ QSizeF ComponentItem::calcMinimumGeometry() const
 {
     double width = 0.0;
     double height = 0.0;
+    double customMinHeight = 0.0;
 
-    if (m_customIcon) {
-        QSizeF sz = stereotypeIconMinimumSize(m_customIcon->stereotypeIcon(),
+    if (customIconItem()) {
+        QSizeF sz = customIconItemMinimumSize(customIconItem(),
                                               CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT);
         if (shapeIcon().textAlignment() != qmt::StereotypeIcon::TextalignTop
                 && shapeIcon().textAlignment() != qmt::StereotypeIcon::TextalignCenter)
             return sz;
         width = sz.width();
+        customMinHeight = sz.height();
     }
 
     height += BODY_VERT_BORDER;
@@ -234,7 +223,7 @@ QSizeF ComponentItem::calcMinimumGeometry() const
         height += m_contextLabel->height();
     height += BODY_VERT_BORDER;
 
-    if (!hasPlainShape()) {
+    if (!customIconItem() && !hasPlainShape()) {
         width = RECT_WIDTH * 0.5 + BODY_HORIZ_BORDER + width + BODY_HORIZ_BORDER + RECT_WIDTH * 0.5;
         double minHeight = UPPER_RECT_Y + RECT_HEIGHT + RECT_Y_DISTANCE + RECT_HEIGHT + LOWER_RECT_MIN_Y;
         if (height < minHeight)
@@ -243,6 +232,9 @@ QSizeF ComponentItem::calcMinimumGeometry() const
         width = BODY_HORIZ_BORDER + width + BODY_HORIZ_BORDER;
     }
 
+    if (height < customMinHeight)
+        height = customMinHeight;
+
     return GeometryUtilities::ensureMinimumRasterSize(QSizeF(width, height), 2 * RASTER_WIDTH, 2 * RASTER_HEIGHT);
 }
 
@@ -259,7 +251,7 @@ void ComponentItem::updateGeometry()
     height = geometry.height();
 
     if (object()->isAutoSized()) {
-        // nothing
+        correctAutoSize(customIconItem(), width, height, 0, 0);
     } else {
         QRectF rect = object()->rect();
         if (rect.width() > width)
@@ -283,9 +275,9 @@ void ComponentItem::updateGeometry()
     // a backup for the graphics item used for manual resized and persistency.
     object()->setRect(rect);
 
-    if (m_customIcon) {
-        m_customIcon->setPos(left, top);
-        m_customIcon->setActualSize(QSizeF(width, height));
+    if (customIconItem()) {
+        customIconItem()->setPos(left, top);
+        customIconItem()->setActualSize(QSizeF(width, height));
     }
 
     if (m_shape)
@@ -303,7 +295,7 @@ void ComponentItem::updateGeometry()
         m_lowerRect->setPos(left - RECT_WIDTH * 0.5, top + UPPER_RECT_Y + RECT_HEIGHT + RECT_Y_DISTANCE);
     }
 
-    if (m_customIcon) {
+    if (customIconItem()) {
         switch (shapeIcon().textAlignment()) {
         case qmt::StereotypeIcon::TextalignBelow:
             y += height + BODY_VERT_BORDER;
@@ -345,7 +337,7 @@ void ComponentItem::updateGeometry()
         y += nameItem()->boundingRect().height();
     }
     if (m_contextLabel) {
-        if (m_customIcon) {
+        if (customIconItem()) {
             m_contextLabel->resetMaxWidth();
         } else {
             double maxContextWidth = width - 2 * BODY_HORIZ_BORDER - (hasPlainShape() ? 0 : RECT_WIDTH);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.h
index f00fbf30eb4..f4910f53ce2 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.h
@@ -41,7 +41,6 @@ private:
     QSizeF calcMinimumGeometry() const;
     void updateGeometry();
 
-    CustomIconItem *m_customIcon = nullptr;
     QGraphicsRectItem *m_shape = nullptr;
     QGraphicsRectItem *m_upperRect = nullptr;
     QGraphicsRectItem *m_lowerRect = nullptr;
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.cpp
index c37c38b3bb8..951d6f3b1ad 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.cpp
@@ -47,23 +47,10 @@ void DiagramItem::update()
 
     const Style *style = adaptedStyle(stereotypeIconId());
 
-    // custom icon
-    if (stereotypeIconDisplay() == StereotypeIcon::DisplayIcon) {
-        if (!m_customIcon)
-            m_customIcon = new CustomIconItem(diagramSceneModel(), this);
-        m_customIcon->setStereotypeIconId(stereotypeIconId());
-        m_customIcon->setBaseSize(stereotypeIconMinimumSize(m_customIcon->stereotypeIcon(), CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT));
-        m_customIcon->setBrush(style->fillBrush());
-        m_customIcon->setPen(style->outerLinePen());
-        m_customIcon->setZValue(SHAPE_ZVALUE);
-    } else if (m_customIcon) {
-        m_customIcon->scene()->removeItem(m_customIcon);
-        delete m_customIcon;
-        m_customIcon = nullptr;
-    }
+    updateCustomIcon(style);
 
     // shape
-    if (!m_customIcon) {
+    if (!customIconItem()) {
         if (!m_body)
             m_body = new QGraphicsPolygonItem(this);
         m_body->setBrush(style->fillBrush());
@@ -93,15 +80,15 @@ void DiagramItem::update()
     // diagram name
     updateNameItem(style);
 
-    updateSelectionMarker(m_customIcon);
+    updateSelectionMarker(customIconItem());
     updateAlignmentButtons();
     updateGeometry();
 }
 
 bool DiagramItem::intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine) const
 {
-    if (m_customIcon) {
-        QList<QPolygonF> polygons = m_customIcon->outline();
+    if (customIconItem()) {
+        QList<QPolygonF> polygons = customIconItem()->outline();
         for (int i = 0; i < polygons.size(); ++i)
             polygons[i].translate(object()->pos() + object()->rect().topLeft());
         if (shapeIcon().textAlignment() == qmt::StereotypeIcon::TextalignBelow) {
@@ -131,8 +118,8 @@ QSizeF DiagramItem::calcMinimumGeometry() const
     double width = MINIMUM_WIDTH;
     double height = 0.0;
 
-    if (m_customIcon) {
-        QSizeF sz = stereotypeIconMinimumSize(m_customIcon->stereotypeIcon(),
+    if (customIconItem()) {
+        QSizeF sz = customIconItemMinimumSize(customIconItem(),
                                               CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT);
         if (shapeIcon().textAlignment() != qmt::StereotypeIcon::TextalignTop
                 && shapeIcon().textAlignment() != qmt::StereotypeIcon::TextalignCenter)
@@ -175,12 +162,7 @@ void DiagramItem::updateGeometry()
     height = geometry.height();
 
     if (object()->isAutoSized()) {
-        if (!m_customIcon) {
-            if (width < MINIMUM_AUTO_WIDTH)
-                width = MINIMUM_AUTO_WIDTH;
-            if (height < MINIMUM_AUTO_HEIGHT)
-                height = MINIMUM_AUTO_HEIGHT;
-        }
+        correctAutoSize(customIconItem(), width, height, MINIMUM_AUTO_WIDTH, MINIMUM_AUTO_HEIGHT);
     } else {
         QRectF rect = object()->rect();
         if (rect.width() > width)
@@ -203,9 +185,9 @@ void DiagramItem::updateGeometry()
     // a backup for the graphics item used for manual resized and persistency.
     object()->setRect(rect);
 
-    if (m_customIcon) {
-        m_customIcon->setPos(left, top);
-        m_customIcon->setActualSize(QSizeF(width, height));
+    if (customIconItem()) {
+        customIconItem()->setPos(left, top);
+        customIconItem()->setActualSize(QSizeF(width, height));
     }
 
     if (m_body) {
@@ -227,7 +209,7 @@ void DiagramItem::updateGeometry()
         m_fold->setPolygon(foldPolygon);
     }
 
-    if (m_customIcon) {
+    if (customIconItem()) {
         switch (shapeIcon().textAlignment()) {
         case qmt::StereotypeIcon::TextalignBelow:
             y += height + BODY_VERT_BORDER;
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.h
index 81012b04a18..88d9f9a7a83 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.h
@@ -29,7 +29,6 @@ private:
     QSizeF calcMinimumGeometry() const;
     void updateGeometry();
 
-    CustomIconItem *m_customIcon = nullptr;
     QGraphicsPolygonItem *m_body = nullptr;
     QGraphicsPolygonItem *m_fold = nullptr;
 };
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp
index 97a1b337fc8..9855889b084 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp
@@ -52,22 +52,10 @@ void ItemItem::update()
 
     const Style *style = adaptedStyle(shapeIconId());
 
-    if (!shapeIconId().isEmpty()) {
-        if (!m_customIcon)
-            m_customIcon = new CustomIconItem(diagramSceneModel(), this);
-        m_customIcon->setStereotypeIconId(shapeIconId());
-        m_customIcon->setBaseSize(stereotypeIconMinimumSize(m_customIcon->stereotypeIcon(), CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT));
-        m_customIcon->setBrush(style->fillBrush());
-        m_customIcon->setPen(style->outerLinePen());
-        m_customIcon->setZValue(SHAPE_ZVALUE);
-    } else if (m_customIcon) {
-        m_customIcon->scene()->removeItem(m_customIcon);
-        delete m_customIcon;
-        m_customIcon = nullptr;
-    }
+    updateCustomIcon(style);
 
     // shape
-    if (!m_customIcon) {
+    if (!customIconItem()) {
         if (!m_shape)
             m_shape = new QGraphicsRectItem(this);
         m_shape->setBrush(style->fillBrush());
@@ -100,7 +88,7 @@ void ItemItem::update()
         m_contextLabel = nullptr;
     }
 
-    updateSelectionMarker(m_customIcon);
+    updateSelectionMarker(customIconItem());
     updateRelationStarter();
     updateAlignmentButtons();
     updateGeometry();
@@ -108,8 +96,8 @@ void ItemItem::update()
 
 bool ItemItem::intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine) const
 {
-    if (m_customIcon) {
-        QList<QPolygonF> polygons = m_customIcon->outline();
+    if (customIconItem()) {
+        QList<QPolygonF> polygons = customIconItem()->outline();
         for (int i = 0; i < polygons.size(); ++i)
             polygons[i].translate(object()->pos() + object()->rect().topLeft());
         if (shapeIcon().textAlignment() == qmt::StereotypeIcon::TextalignBelow) {
@@ -152,14 +140,16 @@ QSizeF ItemItem::calcMinimumGeometry() const
 {
     double width = 0.0;
     double height = 0.0;
+    double customMinHeight = 0.0;
 
-    if (m_customIcon) {
-        QSizeF sz = stereotypeIconMinimumSize(m_customIcon->stereotypeIcon(),
+    if (customIconItem()) {
+        QSizeF sz = customIconItemMinimumSize(customIconItem(),
                                               CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT);
         if (shapeIcon().textAlignment() != qmt::StereotypeIcon::TextalignTop
                   && shapeIcon().textAlignment() != qmt::StereotypeIcon::TextalignCenter)
             return sz;
         width = sz.width();
+        customMinHeight = sz.height();
     }
 
     height += BODY_VERT_BORDER;
@@ -181,6 +171,9 @@ QSizeF ItemItem::calcMinimumGeometry() const
 
     width = BODY_HORIZ_BORDER + width + BODY_HORIZ_BORDER;
 
+    if (height < customMinHeight)
+        height = customMinHeight;
+
     return GeometryUtilities::ensureMinimumRasterSize(QSizeF(width, height), 2 * RASTER_WIDTH, 2 * RASTER_HEIGHT);
 }
 
@@ -197,7 +190,7 @@ void ItemItem::updateGeometry()
     height = geometry.height();
 
     if (object()->isAutoSized()) {
-        // nothing
+        correctAutoSize(customIconItem(), width, height, 0, 0);
     } else {
         QRectF rect = object()->rect();
         if (rect.width() > width)
@@ -221,15 +214,15 @@ void ItemItem::updateGeometry()
     // a backup for the graphics item used for manual resized and persistency.
     object()->setRect(rect);
 
-    if (m_customIcon) {
-        m_customIcon->setPos(left, top);
-        m_customIcon->setActualSize(QSizeF(width, height));
+    if (customIconItem()) {
+        customIconItem()->setPos(left, top);
+        customIconItem()->setActualSize(QSizeF(width, height));
     }
 
     if (m_shape)
         m_shape->setRect(rect);
 
-    if (m_customIcon) {
+    if (customIconItem()) {
         switch (shapeIcon().textAlignment()) {
         case qmt::StereotypeIcon::TextalignBelow:
             y += height + BODY_VERT_BORDER;
@@ -271,7 +264,7 @@ void ItemItem::updateGeometry()
         y += nameItem()->boundingRect().height();
     }
     if (m_contextLabel) {
-        if (m_customIcon) {
+        if (customIconItem()) {
             m_contextLabel->resetMaxWidth();
         } else {
             double maxContextWidth = width - 2 * BODY_HORIZ_BORDER;
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.h
index 327b3799ac1..de091a2bc72 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.h
@@ -39,7 +39,6 @@ private:
     QSizeF calcMinimumGeometry() const;
     void updateGeometry();
 
-    CustomIconItem *m_customIcon = nullptr;
     QGraphicsRectItem *m_shape = nullptr;
     ContextLabelItem *m_contextLabel = nullptr;
 };
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp
index 0fe32080cfe..d4f6bd386b8 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp
@@ -185,6 +185,8 @@ void ObjectItem::setFocusSelected(bool focusSelected)
     if (m_isFocusSelected != focusSelected) {
         m_isFocusSelected = focusSelected;
         update();
+        if (m_nameItem)
+            m_nameItem->setEditable(focusSelected);
     }
 }
 
@@ -353,9 +355,9 @@ void ObjectItem::relationDrawn(const QString &id, ObjectItem *targetItem, const
                         elementType = targetItem->stereotypeIconId();
                     else if (!targetItem->shapeIconId().isEmpty())
                         elementType = targetItem->shapeIconId();
-                    else
-                        elementType = targetItem->elementType();
-                    if (!endItems.contains(elementType)) {
+                    if ((!elementType.isEmpty() && !endItems.contains(elementType))
+                         && !endItems.contains(targetItem->elementType()))
+                    {
                         return;
                     }
                     // create relation
@@ -498,6 +500,7 @@ void ObjectItem::updateStereotypes(const QString &stereotypeIconId, StereotypeIc
             m_stereotypeIcon = new CustomIconItem(m_diagramSceneModel, this);
         m_stereotypeIcon->setStereotypeIconId(stereotypeIconId);
         m_stereotypeIcon->setBaseSize(QSizeF(m_stereotypeIcon->shapeWidth(), m_stereotypeIcon->shapeHeight()));
+        m_stereotypeIcon->setActualSize(QSizeF(m_stereotypeIcon->shapeWidth(), m_stereotypeIcon->shapeHeight()));
         m_stereotypeIcon->setBrush(style->fillBrush());
         m_stereotypeIcon->setPen(style->innerLinePen());
     } else if (m_stereotypeIcon) {
@@ -518,45 +521,92 @@ void ObjectItem::updateStereotypes(const QString &stereotypeIconId, StereotypeIc
     }
 }
 
-QSizeF ObjectItem::stereotypeIconMinimumSize(const StereotypeIcon &stereotypeIcon,
+QSizeF ObjectItem::customIconItemMinimumSize(const CustomIconItem *customIconItem,
                                              qreal minimumWidth, qreal minimumHeight) const
 {
     Q_UNUSED(minimumWidth)
 
     qreal width = 0.0;
     qreal height = 0.0;
-    if (stereotypeIcon.hasMinWidth() && !stereotypeIcon.hasMinHeight()) {
-        width = stereotypeIcon.minWidth();
-        if (stereotypeIcon.sizeLock() == StereotypeIcon::LockHeight || stereotypeIcon.sizeLock() == StereotypeIcon::LockSize)
-            height = stereotypeIcon.minHeight();
-        else
-            height = width * stereotypeIcon.height() / stereotypeIcon.width();
-    } else if (!stereotypeIcon.hasMinWidth() && stereotypeIcon.hasMinHeight()) {
-        height = stereotypeIcon.minHeight();
-        if (stereotypeIcon.sizeLock() == StereotypeIcon::LockWidth || stereotypeIcon.sizeLock() == StereotypeIcon::LockSize)
-            width = stereotypeIcon.minWidth();
-        else
-            width = height * stereotypeIcon.width() / stereotypeIcon.height();
-    } else if (stereotypeIcon.hasMinWidth() && stereotypeIcon.hasMinHeight()) {
-        if (stereotypeIcon.sizeLock() == StereotypeIcon::LockRatio) {
-            width = stereotypeIcon.minWidth();
-            height = width * stereotypeIcon.height() / stereotypeIcon.width();
-            if (height < stereotypeIcon.minHeight()) {
-                height = stereotypeIcon.minHeight();
-                width = height * stereotypeIcon.width() / stereotypeIcon.height();
-                QMT_CHECK(width <= stereotypeIcon.minWidth());
-            }
-        } else {
-            width = stereotypeIcon.minWidth();
-            height = stereotypeIcon.minHeight();
+    if (customIconItem->hasImage()) {
+        const QImage &image = customIconItem->image();
+        width = minimumWidth;
+        height = image.height() * width / image.width();
+        if (height < minimumHeight) {
+            height = minimumHeight;
+            width = image.width() * height / image.height();
         }
     } else {
-        height = minimumHeight;
-        width = height * stereotypeIcon.width() / stereotypeIcon.height();
+        const StereotypeIcon &stereotypeIcon = customIconItem->stereotypeIcon();
+        if (stereotypeIcon.hasMinWidth() && !stereotypeIcon.hasMinHeight()) {
+            width = stereotypeIcon.minWidth();
+            if (stereotypeIcon.sizeLock() == StereotypeIcon::LockHeight || stereotypeIcon.sizeLock() == StereotypeIcon::LockSize)
+                height = stereotypeIcon.minHeight();
+            else
+                height = width * stereotypeIcon.height() / stereotypeIcon.width();
+        } else if (!stereotypeIcon.hasMinWidth() && stereotypeIcon.hasMinHeight()) {
+            height = stereotypeIcon.minHeight();
+            if (stereotypeIcon.sizeLock() == StereotypeIcon::LockWidth || stereotypeIcon.sizeLock() == StereotypeIcon::LockSize)
+                width = stereotypeIcon.minWidth();
+            else
+                width = height * stereotypeIcon.width() / stereotypeIcon.height();
+        } else if (stereotypeIcon.hasMinWidth() && stereotypeIcon.hasMinHeight()) {
+            if (stereotypeIcon.sizeLock() == StereotypeIcon::LockRatio) {
+                width = stereotypeIcon.minWidth();
+                height = width * stereotypeIcon.height() / stereotypeIcon.width();
+                if (height < stereotypeIcon.minHeight()) {
+                    height = stereotypeIcon.minHeight();
+                    width = height * stereotypeIcon.width() / stereotypeIcon.height();
+                    QMT_CHECK(width <= stereotypeIcon.minWidth());
+                }
+            } else {
+                width = stereotypeIcon.minWidth();
+                height = stereotypeIcon.minHeight();
+            }
+        } else {
+            height = minimumHeight;
+            width = height * stereotypeIcon.width() / stereotypeIcon.height();
+        }
     }
     return QSizeF(width, height);
 }
 
+void ObjectItem::correctAutoSize(const CustomIconItem* customIconItem, qreal &width, qreal &height, qreal minimumWidth, qreal minimumHeight) const
+{
+    if (customIconItem) {
+        if (customIconItem->hasImage()) {
+            width = customIconItem->image().width();
+            height = customIconItem->image().height();
+        }
+    } else {
+        if (width < minimumWidth)
+            width = minimumWidth;
+        if (height < minimumHeight)
+            height = minimumHeight;
+    }
+}
+
+void ObjectItem::updateCustomIcon(const Style *style)
+{
+    if (object()->hasImage()) {
+        if (!m_customIcon)
+            m_customIcon = new CustomIconItem(diagramSceneModel(), this);
+        m_customIcon->setImage(object()->image());
+        m_customIcon->setZValue(SHAPE_ZVALUE);
+    } else if (!shapeIconId().isEmpty()) {
+        if (!m_customIcon)
+            m_customIcon = new CustomIconItem(diagramSceneModel(), this);
+        m_customIcon->setStereotypeIconId(shapeIconId());
+        m_customIcon->setBrush(style->fillBrush());
+        m_customIcon->setPen(style->outerLinePen());
+        m_customIcon->setZValue(SHAPE_ZVALUE);
+    } else if (m_customIcon) {
+        m_customIcon->scene()->removeItem(m_customIcon);
+        delete m_customIcon;
+        m_customIcon = nullptr;
+    }
+}
+
 bool ObjectItem::suppressTextDisplay() const
 {
     return m_shapeIcon.textAlignment() == StereotypeIcon::TextalignNone;
@@ -564,6 +614,7 @@ bool ObjectItem::suppressTextDisplay() const
 
 void ObjectItem::updateNameItem(const Style *style)
 {
+    QString display_name = buildDisplayName();
     if (!suppressTextDisplay()) {
         if (!m_nameItem) {
             m_nameItem = new EditableTextItem(this);
@@ -582,16 +633,18 @@ void ObjectItem::updateNameItem(const Style *style)
             QObject::connect(m_nameItem, &EditableTextItem::returnKeyPressed, m_nameItem,
                              [this] { this->m_nameItem->clearFocus(); });
         }
-        if (style->headerFont() != m_nameItem->font())
-            m_nameItem->setFont(style->headerFont());
+        QFont font = style->headerFont();
+        if (object()->hasLinkedFile())
+            font.setUnderline(true);
+        if (font != m_nameItem->font())
+            m_nameItem->setFont(font);
         if (style->textBrush().color() != m_nameItem->defaultTextColor())
             m_nameItem->setDefaultTextColor(style->textBrush().color());
         if (!m_nameItem->hasFocus()) {
-            QString name = buildDisplayName();
-            if (name != m_nameItem->toPlainText())
-                m_nameItem->setPlainText(name);
+            if (display_name != m_nameItem->toPlainText())
+                m_nameItem->setPlainText(display_name);
         }
-    } else if (m_nameItem ){
+    } else if (m_nameItem) {
         m_nameItem->scene()->removeItem(m_nameItem);
         delete m_nameItem;
         m_nameItem = nullptr;
@@ -621,30 +674,45 @@ void ObjectItem::setObjectName(const QString &objectName)
 
 void ObjectItem::updateDepth()
 {
-    setZValue(m_object->depth());
+    int depth_delta = 0;
+    switch (m_shapeIcon.depthLayer()) {
+    case StereotypeIcon::DepthBehindItems:
+        depth_delta = -1;
+        break;
+    case StereotypeIcon::DepthAmongItems:
+        depth_delta = 0;
+        break;
+    case StereotypeIcon::DepthBeforeItems:
+        depth_delta = 1;
+        break;
+    }
+    setZValue(m_object->depth() + depth_delta);
 }
 
-void ObjectItem::updateSelectionMarker(CustomIconItem *customIconItem)
+void ObjectItem::updateSelectionMarker(const CustomIconItem *customIconItem)
 {
     if (customIconItem) {
-        StereotypeIcon stereotypeIcon = customIconItem->stereotypeIcon();
         ResizeFlags resizeFlags = ResizeUnlocked;
-        switch (stereotypeIcon.sizeLock()) {
-        case StereotypeIcon::LockNone:
-            resizeFlags = ResizeUnlocked;
-            break;
-        case StereotypeIcon::LockWidth:
-            resizeFlags = ResizeLockedWidth;
-            break;
-        case StereotypeIcon::LockHeight:
-            resizeFlags = ResizeLockedHeight;
-            break;
-        case StereotypeIcon::LockSize:
-            resizeFlags = ResizeLockedSize;
-            break;
-        case StereotypeIcon::LockRatio:
+        if (customIconItem->hasImage()) {
             resizeFlags = ResizeLockedRatio;
-            break;
+        } else {
+            switch (customIconItem->stereotypeIcon().sizeLock()) {
+            case StereotypeIcon::LockNone:
+                resizeFlags = ResizeUnlocked;
+                break;
+            case StereotypeIcon::LockWidth:
+                resizeFlags = ResizeLockedWidth;
+                break;
+            case StereotypeIcon::LockHeight:
+                resizeFlags = ResizeLockedHeight;
+                break;
+            case StereotypeIcon::LockSize:
+                resizeFlags = ResizeLockedSize;
+                break;
+            case StereotypeIcon::LockRatio:
+                resizeFlags = ResizeLockedRatio;
+                break;
+            }
         }
         updateSelectionMarker(resizeFlags);
     } else {
@@ -990,6 +1058,10 @@ void ObjectItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
         addSeparator = true;
     if (element_tasks->extendContextMenu(object(), diagramSceneModel()->diagram(), &menu))
         addSeparator = true;
+    if (element_tasks->hasLinkedFile(m_object, m_diagramSceneModel->diagram())) {
+        menu.addAction(new ContextMenuAction(Tr::tr("Open Linked File"), "openLinkedFile", &menu));
+        addSeparator = true;
+    }
     if (addSeparator)
         menu.addSeparator();
     menu.addAction(new ContextMenuAction(Tr::tr("Remove"), "remove",
@@ -1000,12 +1072,12 @@ void ObjectItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
     QMenu alignMenu;
     alignMenu.setTitle(Tr::tr("Align Objects"));
     alignMenu.addAction(new ContextMenuAction(Tr::tr("Align Left"), "alignLeft", &alignMenu));
-    alignMenu.addAction(new ContextMenuAction(Tr::tr("Center Vertically"), "centerVertically",
+    alignMenu.addAction(new ContextMenuAction(Tr::tr("Center Horizontally"), "centerHorizontally",
                                               &alignMenu));
     alignMenu.addAction(new ContextMenuAction(Tr::tr("Align Right"), "alignRight", &alignMenu));
     alignMenu.addSeparator();
     alignMenu.addAction(new ContextMenuAction(Tr::tr("Align Top"), "alignTop", &alignMenu));
-    alignMenu.addAction(new ContextMenuAction(Tr::tr("Center Horizontally"), "centerHorizontally",
+    alignMenu.addAction(new ContextMenuAction(Tr::tr("Center Vertically"), "centerVertically",
                                               &alignMenu));
     alignMenu.addAction(new ContextMenuAction(Tr::tr("Align Bottom"), "alignBottom", &alignMenu));
     alignMenu.addSeparator();
@@ -1022,7 +1094,6 @@ void ObjectItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
     layoutMenu.addAction(new ContextMenuAction(Tr::tr("Equal Vertical Space"), "sameVBorderDistance", &alignMenu));
     layoutMenu.setEnabled(m_diagramSceneModel->hasMultiObjectsSelection());
     menu.addMenu(&layoutMenu);
-    menu.addAction(new ContextMenuAction(Tr::tr("Add Related Elements"), "addRelatedElements", &menu));
 
     QAction *selectedAction = menu.exec(event->screenPos());
     if (selectedAction) {
@@ -1035,6 +1106,8 @@ void ObjectItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
                 m_diagramSceneModel->diagramSceneController()->elementTasks()->openDiagram(m_object, m_diagramSceneModel->diagram());
             } else if (action->id() == "createDiagram") {
                 m_diagramSceneModel->diagramSceneController()->elementTasks()->createAndOpenDiagram(m_object, m_diagramSceneModel->diagram());
+            } else if (action->id() == "openLinkedFile") {
+                m_diagramSceneModel->diagramSceneController()->elementTasks()->openLinkedFile(m_object, m_diagramSceneModel->diagram());
             } else if (action->id() == "remove") {
                 DSelection selection = m_diagramSceneModel->selectedElements();
                 if (selection.isEmpty())
@@ -1073,11 +1146,6 @@ void ObjectItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
                 align(IAlignable::AlignHeight, "height");
             } else if (action->id() == "sameSize") {
                 align(IAlignable::AlignSize, "size");
-            } else if (action->id() == "addRelatedElements") {
-                DSelection selection = m_diagramSceneModel->selectedElements();
-                if (selection.isEmpty())
-                    selection.append(m_object->uid(), m_diagramSceneModel->diagram()->uid());
-                m_diagramSceneModel->diagramSceneController()->addRelatedElements(selection, m_diagramSceneModel->diagram());
             }
         }
     }
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h
index e7acd5705ca..254ef215caa 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h
@@ -120,8 +120,12 @@ protected:
                            StereotypeIcon::Display stereotypeDisplay, const Style *style);
     StereotypesItem *stereotypesItem() const { return m_stereotypesItem; }
     CustomIconItem *stereotypeIconItem() const { return m_stereotypeIcon; }
-    QSizeF stereotypeIconMinimumSize(const StereotypeIcon &stereotypeIcon, qreal minimumWidth,
+    CustomIconItem *customIconItem() const { return m_customIcon; }
+    QSizeF customIconItemMinimumSize(const CustomIconItem* customIconItem, qreal minimumWidth,
                                      qreal minimumHeight) const;
+    void correctAutoSize(const CustomIconItem *customIconItem, qreal& width, qreal& height,
+                           qreal minimumWidth, qreal minimumHeight) const;
+    void updateCustomIcon(const Style* style);
     bool suppressTextDisplay() const;
     void updateNameItem(const Style *style);
     EditableTextItem *nameItem() const { return m_nameItem; }
@@ -130,7 +134,7 @@ protected:
     void setObjectName(const QString &objectName);
 
     void updateDepth();
-    void updateSelectionMarker(CustomIconItem *customIconItem);
+    void updateSelectionMarker(const CustomIconItem* customIconItem);
     void updateSelectionMarker(ResizeFlags resizeFlags);
     void updateSelectionMarkerGeometry(const QRectF &objectRect);
     void updateRelationStarter();
@@ -169,6 +173,7 @@ private:
     StereotypeIcon::Display m_stereotypeIconDisplay = StereotypeIcon::DisplayLabel;
     StereotypesItem *m_stereotypesItem = nullptr;
     CustomIconItem *m_stereotypeIcon = nullptr;
+    CustomIconItem *m_customIcon = nullptr;
     EditableTextItem *m_nameItem = nullptr;
     RectangularSelectionItem *m_selectionMarker = nullptr;
     RelationStarter *m_relationStarter = nullptr;
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.cpp
index b473d17ec8e..03e6d8d0f5d 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.cpp
@@ -64,23 +64,10 @@ void PackageItem::update()
 
     const Style *style = adaptedStyle(stereotypeIconId());
 
-    // custom icon
-    if (stereotypeIconDisplay() == StereotypeIcon::DisplayIcon) {
-        if (!m_customIcon)
-            m_customIcon = new CustomIconItem(diagramSceneModel(), this);
-        m_customIcon->setStereotypeIconId(stereotypeIconId());
-        m_customIcon->setBaseSize(stereotypeIconMinimumSize(m_customIcon->stereotypeIcon(), CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT));
-        m_customIcon->setBrush(style->fillBrush());
-        m_customIcon->setPen(style->outerLinePen());
-        m_customIcon->setZValue(SHAPE_ZVALUE);
-    } else if (m_customIcon) {
-        m_customIcon->scene()->removeItem(m_customIcon);
-        delete m_customIcon;
-        m_customIcon = nullptr;
-    }
+    updateCustomIcon(style);
 
     // shape
-    if (!m_customIcon) {
+    if (!customIconItem()) {
         if (!m_shape)
             m_shape = new QGraphicsPolygonItem(this);
         m_shape->setBrush(style->fillBrush());
@@ -111,7 +98,7 @@ void PackageItem::update()
         m_contextLabel = nullptr;
     }
 
-    updateSelectionMarker(m_customIcon);
+    updateSelectionMarker(customIconItem());
     updateRelationStarter();
     updateAlignmentButtons();
     updateGeometry();
@@ -119,8 +106,8 @@ void PackageItem::update()
 
 bool PackageItem::intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine) const
 {
-    if (m_customIcon) {
-        QList<QPolygonF> polygons = m_customIcon->outline();
+    if (customIconItem()) {
+        QList<QPolygonF> polygons = customIconItem()->outline();
         for (int i = 0; i < polygons.size(); ++i)
             polygons[i].translate(object()->pos() + object()->rect().topLeft());
         if (shapeIcon().textAlignment() == qmt::StereotypeIcon::TextalignBelow) {
@@ -169,8 +156,8 @@ PackageItem::ShapeGeometry PackageItem::calcMinimumGeometry() const
     double width = 0.0;
     double height = 0.0;
 
-    if (m_customIcon) {
-        QSizeF sz = stereotypeIconMinimumSize(m_customIcon->stereotypeIcon(),
+    if (customIconItem()) {
+        QSizeF sz = customIconItemMinimumSize(customIconItem(),
                                               CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT);
         if (shapeIcon().textAlignment() != qmt::StereotypeIcon::TextalignTop
                 && shapeIcon().textAlignment() != qmt::StereotypeIcon::TextalignCenter)
@@ -244,12 +231,7 @@ void PackageItem::updateGeometry()
 
     // calc width and height
     if (object()->isAutoSized()) {
-        if (!m_customIcon) {
-            if (width < MINIMUM_AUTO_WIDTH)
-                width = MINIMUM_AUTO_WIDTH;
-            if (height < MINIMUM_AUTO_HEIGHT)
-                height = MINIMUM_AUTO_HEIGHT;
-        }
+        correctAutoSize(customIconItem(), width, height, MINIMUM_AUTO_WIDTH, MINIMUM_AUTO_HEIGHT);
     } else {
         QRectF rect = object()->rect();
         if (rect.width() > width)
@@ -273,9 +255,9 @@ void PackageItem::updateGeometry()
     // a backup for the graphics item used for manual resized and persistency.
     object()->setRect(rect);
 
-    if (m_customIcon) {
-        m_customIcon->setPos(left, top);
-        m_customIcon->setActualSize(QSizeF(width, height));
+    if (customIconItem()) {
+        customIconItem()->setPos(left, top);
+        customIconItem()->setActualSize(QSizeF(width, height));
 
         switch (shapeIcon().textAlignment()) {
         case qmt::StereotypeIcon::TextalignBelow:
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.h
index 19c2fe54abc..f87af2fa354 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.h
@@ -40,7 +40,6 @@ private:
     ShapeGeometry calcMinimumGeometry() const;
     void updateGeometry();
 
-    CustomIconItem *m_customIcon = nullptr;
     QGraphicsPolygonItem *m_shape = nullptr;
     ContextLabelItem *m_contextLabel = nullptr;
 };
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
index a2f444f59e2..ca9dd8c3a2b 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
@@ -380,7 +380,12 @@ void RelationItem::setHandlePos(int index, const QPointF &pos)
     }
 }
 
-void RelationItem::dropHandle(int index, double rasterWidth, double rasterHeight)
+static inline bool between(double v, double mid, double range)
+{
+    return v >= mid-range && v <= mid+range;
+}
+
+void RelationItem::dropHandle(int index, bool extraSnap, double rasterWidth, double rasterHeight)
 {
     if (index == 0) {
         m_grabbedEndA = false;
@@ -398,9 +403,40 @@ void RelationItem::dropHandle(int index, double rasterWidth, double rasterHeight
         QMT_ASSERT(index >= 0 && index < intermediatePoints.size(), return);
 
         QPointF pos = intermediatePoints.at(index).pos();
-        double x = qRound(pos.x() / rasterWidth) * rasterWidth;
-        double y = qRound(pos.y() / rasterHeight) * rasterHeight;
-        intermediatePoints[index].setPos(QPointF(x, y));
+        static constexpr int ANGLE = 20.0;
+        bool roundX = true;
+        bool roundY = true;
+        if (extraSnap) {
+            if (index >= 1) {
+                double angle = GeometryUtilities::calcAngle(QLineF(intermediatePoints.at(index).pos(),
+                    intermediatePoints.at(index - 1).pos()));
+                if (between(qAbs(angle), 90, ANGLE)) {
+                    pos.setX(intermediatePoints.at(index - 1).pos().x());
+                    roundX = false;
+                }
+                if (between(angle, 0, ANGLE) || between(qAbs(angle), 180, ANGLE)) {
+                    pos.setY(intermediatePoints.at(index - 1).pos().y());
+                    roundY = false;
+                }
+            }
+            if (index < intermediatePoints.size() - 1) {
+                double angle = GeometryUtilities::calcAngle(QLineF(intermediatePoints.at(index).pos(),
+                    intermediatePoints.at(index + 1).pos()));
+                if (between(qAbs(angle), 90, ANGLE)) {
+                    pos.setX(intermediatePoints.at(index + 1).pos().x());
+                    roundX = false;
+                }
+                if (between(angle, 0, ANGLE) || between(qAbs(angle), 180, ANGLE)) {
+                    pos.setY(intermediatePoints.at(index + 1).pos().y());
+                    roundY = false;
+                }
+            }
+        }
+        if (roundX)
+            pos.setX(qRound(pos.x() / rasterWidth) * rasterWidth);
+        if (roundY)
+            pos.setY(qRound(pos.y() / rasterHeight) * rasterHeight);
+        intermediatePoints[index].setPos(pos);
 
         m_diagramSceneModel->diagramController()->startUpdateElement(m_relation, m_diagramSceneModel->diagram(), DiagramController::UpdateMinor);
         m_relation->setIntermediatePoints(intermediatePoints);
@@ -507,9 +543,11 @@ void RelationItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 
 const Style *RelationItem::adaptedStyle()
 {
-    DObject *endAObject = m_diagramSceneModel->diagramController()->findElement<DObject>(m_relation->endAUid(), m_diagramSceneModel->diagram());
-    DObject *endBObject = m_diagramSceneModel->diagramController()->findElement<DObject>(m_relation->endBUid(), m_diagramSceneModel->diagram());
-    StyledRelation styledRelation(m_relation, endAObject, endBObject);
+    const DObject *endAObject = m_diagramSceneModel->diagramController()->findElement<DObject>(m_relation->endAUid(), m_diagramSceneModel->diagram());
+    const DObject *endBObject = m_diagramSceneModel->diagramController()->findElement<DObject>(m_relation->endBUid(), m_diagramSceneModel->diagram());
+    const CustomRelation customRelation = m_diagramSceneModel->stereotypeController()
+                                              ->findCustomRelationByStereotype(m_relation->stereotypes().value(0));
+    StyledRelation styledRelation(m_relation, endAObject, endBObject, &customRelation);
     return m_diagramSceneModel->styleController()->adaptRelationStyle(styledRelation);
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h
index a43b8b2749c..0980d232e47 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h
@@ -56,7 +56,7 @@ public:
     void insertHandle(int beforeIndex, const QPointF &pos, double rasterWidth, double rasterHeight) override;
     void deleteHandle(int index) override;
     void setHandlePos(int index, const QPointF &pos) override;
-    void dropHandle(int index, double rasterWidth, double rasterHeight) override;
+    void dropHandle(int index, bool extraSnap, double rasterWidth, double rasterHeight) override;
 
     virtual void update();
 
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.cpp
index ad668f6bee3..9313327c87a 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.cpp
@@ -57,7 +57,9 @@ void StereotypeDisplayVisitor::visitDObject(const DObject *object)
     DObject::StereotypeDisplay stereotypeDisplay = object->stereotypeDisplay();
     m_stereotypeIconId = m_stereotypeController->findStereotypeIconId(m_stereotypeIconElement, object->stereotypes());
 
-    if (m_stereotypeIconId.isEmpty() && stereotypeDisplay == DObject::StereotypeIcon) {
+    if (object->hasImage() && stereotypeDisplay == DObject::StereotypeSmart) {
+        stereotypeDisplay = DObject::StereotypeLabel;
+    } else if (m_stereotypeIconId.isEmpty() && stereotypeDisplay == DObject::StereotypeIcon) {
         stereotypeDisplay = DObject::StereotypeLabel;
     } else if (!m_stereotypeIconId.isEmpty() && stereotypeDisplay == DObject::StereotypeSmart) {
         StereotypeIcon stereotypeIcon = m_stereotypeController->findStereotypeIcon(m_stereotypeIconId);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp
index 3a14eb10d99..632da76f05a 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp
@@ -384,27 +384,29 @@ void ArrowItem::updateShaft(const Style *style)
     QMT_ASSERT(m_shaftItem, return);
 
     QPen pen(style->linePen());
+    pen.setCapStyle(Qt::FlatCap);
+
+    auto scale = [&pen](qreal v) {
+        return v / ((pen.widthF() - 1.0) / 2.0 + 1.0);
+    };
+
     switch (m_shaft) {
     case ShaftSolid:
         break;
     case ShaftDashed:
-        pen.setDashPattern(QVector<qreal>()
-                           << (4.0 / pen.widthF()) << (4.0 / pen.widthF()));
+        pen.setDashPattern(QVector<qreal>() << scale(5.0) << scale(3.0));
         break;
     case ShaftDot:
-        pen.setDashPattern(QVector<qreal>()
-                           << (2.0 / pen.widthF()) << (2.0 / pen.widthF()));
+        pen.setDashPattern(QVector<qreal>() << scale(3.0) << scale(3.0));
         break;
     case ShaftDashDot:
-        pen.setDashPattern(QVector<qreal>()
-                           << (4.0 / pen.widthF()) << (2.0 / pen.widthF())
-                           << (2.0 / pen.widthF()) << (2.0 / pen.widthF()));
+        pen.setDashPattern(QVector<qreal>() << scale(5.0) << scale(3.0)
+                                            << scale(3.0) << scale(3.0));
         break;
     case ShaftDashDotDot:
-        pen.setDashPattern(QVector<qreal>()
-                           << (4.0 / pen.widthF()) << (2.0 / pen.widthF())
-                           << (2.0 / pen.widthF()) << (2.0 / pen.widthF())
-                           << (2.0 / pen.widthF()) << (2.0 / pen.widthF()));
+        pen.setDashPattern(QVector<qreal>() << scale(5.0) << scale(3.0)
+                                            << scale(3.0) << scale(3.0)
+                                            << scale(3.0) << scale(3.0));
         break;
     }
     m_shaftItem->setPen(pen);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.cpp
index 066f9b78751..36e4c4f7895 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.cpp
@@ -57,55 +57,97 @@ void CustomIconItem::setPen(const QPen &pen)
     m_pen = pen;
 }
 
+void CustomIconItem::setImage(const QImage &image)
+{
+    m_image = image;
+}
+
 double CustomIconItem::shapeWidth() const
 {
-    return m_stereotypeIcon.width();
+    if (!m_image.isNull())
+        return m_image.width();
+    return m_stereotypeIcon.hasIconWidth() ? m_stereotypeIcon.iconWidth()
+                                           : m_stereotypeIcon.width();
 }
 
 double CustomIconItem::shapeHeight() const
 {
-    return m_stereotypeIcon.height();
+    if (!m_image.isNull())
+        return m_image.height();
+    return m_stereotypeIcon.hasIconHeight() ? m_stereotypeIcon.iconHeight()
+                                            : m_stereotypeIcon.height();
 }
 
 QRectF CustomIconItem::boundingRect() const
 {
-    ShapeSizeVisitor visitor(QPointF(0.0, 0.0), QSizeF(m_stereotypeIcon.width(), m_stereotypeIcon.height()), m_baseSize, m_actualSize);
+    if (!m_image.isNull())
+        return QRectF(QPointF(0.0, 0.0), m_actualSize) | childrenBoundingRect();
+    ShapeSizeVisitor visitor(QPointF(0.0, 0.0),
+                             QSizeF(m_stereotypeIcon.width(), m_stereotypeIcon.height()),
+                             m_baseSize,
+                             m_actualSize);
     m_stereotypeIcon.iconShape().visitShapes(&visitor);
     return visitor.boundingRect() | childrenBoundingRect();
 }
 
-void CustomIconItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+void CustomIconItem::paint(QPainter *painter,
+                           const QStyleOptionGraphicsItem *option,
+                           QWidget *widget)
 {
     Q_UNUSED(option)
     Q_UNUSED(widget)
 
     painter->save();
-    painter->setBrush(m_brush);
-    painter->setPen(m_pen);
+    if (!m_image.isNull()) {
+        painter->drawImage(QRectF(QPointF(0.0, 0.0), m_actualSize), m_image);
+    } else {
+        painter->setBrush(m_brush);
+        painter->setPen(m_pen);
 #ifdef DEBUG_OUTLINE
-    ShapePolygonVisitor visitor(QPointF(0.0, 0.0), QSizeF(m_stereotypeIcon.width(), m_stereotypeIcon.height()), m_baseSize, m_actualSize);
-    IconShape shape = m_stereotypeIcon.outlineShape();
-    if (shape.isEmpty())
-        shape = m_stereotypeIcon.iconShape();
-    shape.visitShapes(&visitor);
-    painter->drawPath(visitor.path());
-    ShapePaintVisitor visitor1(painter, QPointF(0.0, 0.0), QSizeF(m_stereotypeIcon.width(), m_stereotypeIcon.height()), m_baseSize, m_actualSize);
-    m_stereotypeIcon.iconShape().visitShapes(&visitor1);
+        ShapePolygonVisitor visitor(QPointF(0.0, 0.0),
+                                    QSizeF(m_stereotypeIcon.width(), m_stereotypeIcon.height()),
+                                    m_baseSize,
+                                    m_actualSize);
+        IconShape shape = m_stereotypeIcon.outlineShape();
+        if (shape.isEmpty())
+            shape = m_stereotypeIcon.iconShape();
+        shape.visitShapes(&visitor);
+        painter->drawPath(visitor.path());
+        ShapePaintVisitor visitor1(painter,
+                                   QPointF(0.0, 0.0),
+                                   QSizeF(m_stereotypeIcon.width(), m_stereotypeIcon.height()),
+                                   m_baseSize,
+                                   m_actualSize);
+        m_stereotypeIcon.iconShape().visitShapes(&visitor1);
 #else
-    ShapePaintVisitor visitor(painter, QPointF(0.0, 0.0), QSizeF(m_stereotypeIcon.width(), m_stereotypeIcon.height()), m_baseSize, m_actualSize);
-    m_stereotypeIcon.iconShape().visitShapes(&visitor);
+        ShapePaintVisitor visitor(painter,
+                                  QPointF(0.0, 0.0),
+                                  QSizeF(m_stereotypeIcon.width(), m_stereotypeIcon.height()),
+                                  m_baseSize,
+                                  m_actualSize);
+        m_stereotypeIcon.iconShape().visitShapes(&visitor);
 #endif
+    }
     painter->restore();
 }
 
 QList<QPolygonF> CustomIconItem::outline() const
 {
-    ShapePolygonVisitor visitor(QPointF(0.0, 0.0), QSizeF(m_stereotypeIcon.width(), m_stereotypeIcon.height()), m_baseSize, m_actualSize);
-    IconShape shape = m_stereotypeIcon.outlineShape();
-    if (shape.isEmpty())
-        shape = m_stereotypeIcon.iconShape();
-    shape.visitShapes(&visitor);
-    return visitor.toPolygons();
+    if (!m_image.isNull()) {
+        QList<QPolygonF> polygons;
+        polygons.append(QPolygonF(QRectF(QPointF(0.0, 0.0), m_actualSize)));
+        return polygons;
+    } else {
+        ShapePolygonVisitor visitor(QPointF(0.0, 0.0),
+                                    QSizeF(m_stereotypeIcon.width(), m_stereotypeIcon.height()),
+                                    m_baseSize,
+                                    m_actualSize);
+        IconShape shape = m_stereotypeIcon.outlineShape();
+        if (shape.isEmpty())
+            shape = m_stereotypeIcon.iconShape();
+        shape.visitShapes(&visitor);
+        return visitor.toPolygons();
+    }
 }
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.h
index 7f85e875164..f61db552ac9 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.h
@@ -9,6 +9,7 @@
 #include "qmt/stereotype/stereotypeicon.h"
 
 #include <QBrush>
+#include <QImage>
 #include <QPen>
 
 namespace qmt {
@@ -26,6 +27,9 @@ public:
     void setActualSize(const QSizeF &actualSize);
     void setBrush(const QBrush &brush);
     void setPen(const QPen &pen);
+    QImage image() const { return m_image; }
+    bool hasImage() const { return !m_image.isNull(); }
+    void setImage(const QImage &image);
     StereotypeIcon stereotypeIcon() const { return m_stereotypeIcon; }
     double shapeWidth() const;
     double shapeHeight() const;
@@ -43,6 +47,7 @@ private:
     QSizeF m_actualSize;
     QBrush m_brush;
     QPen m_pen;
+    QImage m_image;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.cpp
index 60275cb5ec3..185321d84cc 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.cpp
@@ -13,13 +13,18 @@ namespace qmt {
 EditableTextItem::EditableTextItem(QGraphicsItem *parent)
     : QGraphicsTextItem(parent)
 {
-    setTextInteractionFlags(Qt::TextEditorInteraction);
+    setTextInteractionFlags(Qt::NoTextInteraction);
 }
 
 EditableTextItem::~EditableTextItem()
 {
 }
 
+void EditableTextItem::setEditable(bool editable)
+{
+    setTextInteractionFlags(editable ? Qt::TextEditorInteraction : Qt::NoTextInteraction);
+}
+
 void EditableTextItem::setShowFocus(bool showFocus)
 {
     m_showFocus = showFocus;
@@ -72,13 +77,6 @@ void EditableTextItem::keyReleaseEvent(QKeyEvent *event)
         QGraphicsTextItem::keyReleaseEvent(event);
 }
 
-void EditableTextItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    scene()->clearSelection();
-    parentItem()->setSelected(true);
-    QGraphicsTextItem::mousePressEvent(event);
-}
-
 void EditableTextItem::focusOutEvent(QFocusEvent *event)
 {
     QGraphicsTextItem::focusOutEvent(event);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.h
index 7c361b72fd6..b18bf85cfc6 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.h
@@ -19,6 +19,7 @@ signals:
     void returnKeyPressed();
 
 public:
+    void setEditable(bool editable);
     void setShowFocus(bool showFocus);
     void setFilterReturnKey(bool filterReturnKey);
     void setFilterTabKey(bool filterTabKey);
@@ -30,7 +31,6 @@ public:
 protected:
     void keyPressEvent(QKeyEvent *event) override;
     void keyReleaseEvent(QKeyEvent *event) override;
-    void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
     void focusOutEvent(QFocusEvent *event) override;
 
 private:
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp
index 8206a7fe9ac..231b78a3a08 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp
@@ -79,7 +79,10 @@ protected:
     {
         m_lastPos = event->scenePos();
         QPointF delta = m_lastPos - m_startPos;
-        m_owner->moveHandle(m_pointIndex, delta, Release, m_qualifier);
+        HandleQualifier qualifier = m_qualifier;
+        if (qualifier == None && (event->modifiers() & Qt::ShiftModifier) != 0)
+            qualifier = SnapHandle;
+        m_owner->moveHandle(m_pointIndex, delta, Release, qualifier);
         clearFocus();
     }
 
@@ -267,6 +270,7 @@ void PathSelectionItem::moveHandle(int pointIndex, const QPointF &deltaMove, Han
 {
     switch (handleQualifier) {
     case None:
+    case SnapHandle:
     {
         if (handleStatus == Press) {
             m_focusHandleItem = m_handles.at(pointIndex);
@@ -275,13 +279,13 @@ void PathSelectionItem::moveHandle(int pointIndex, const QPointF &deltaMove, Han
         QPointF newPos = m_originalHandlePos + deltaMove;
         m_windable->setHandlePos(pointIndex, newPos);
         if (handleStatus == Release) {
-            m_windable->dropHandle(pointIndex, RASTER_WIDTH, RASTER_HEIGHT);
+            m_windable->dropHandle(pointIndex, handleQualifier == SnapHandle, RASTER_WIDTH, RASTER_HEIGHT);
             m_focusHandleItem = nullptr;
         }
         break;
     }
     case DeleteHandle:
-        if (handleStatus == Press)
+        if (handleStatus == Release)
             m_windable->deleteHandle(pointIndex);
         break;
     }
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h
index 0c4891948af..06a2d36c494 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h
@@ -25,7 +25,8 @@ class PathSelectionItem : public QGraphicsItem
 
     enum HandleQualifier {
         None,
-        DeleteHandle
+        DeleteHandle,
+        SnapHandle
     };
 
 public:
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp
index 26b8ebc1c4e..49bca85162d 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp
@@ -121,11 +121,13 @@ void RelationStarter::keyPressEvent(QKeyEvent *event)
             m_currentPreviewArrowIntermediatePoints.append(p);
             // Do not update the preview arrow here because last two points are now identical which looks wired
         }
+        event->accept();
     } else if (event->key() == Qt::Key_Control) {
         if (!m_currentPreviewArrowIntermediatePoints.isEmpty()) {
             m_currentPreviewArrowIntermediatePoints.removeLast();
             updateCurrentPreviewArrow(m_currentPreviewArrow->lastLineSegment().p1());
         }
+        event->accept();
     }
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.cpp b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.cpp
index 5634c4eb7f4..555dc812e62 100644
--- a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.cpp
+++ b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.cpp
@@ -14,9 +14,14 @@
 #include <QDragLeaveEvent>
 #include <QDropEvent>
 #include <QMimeData>
+#include <QScrollBar>
 
 namespace qmt {
 
+namespace {
+const qreal ADJUSTMENT = 80;
+};
+
 DiagramView::DiagramView(QWidget *parent)
     : QGraphicsView(parent)
 {
@@ -25,6 +30,9 @@ DiagramView::DiagramView(QWidget *parent)
     setDragMode(QGraphicsView::RubberBandDrag);
     setFrameShape(QFrame::NoFrame);
     setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+    m_panTimer.setInterval(200);
+    m_panTimer.setSingleShot(false);
+    connect(&m_panTimer, &QTimer::timeout, this, &DiagramView::onPanTimeout);
 }
 
 DiagramView::~DiagramView()
@@ -104,7 +112,7 @@ void DiagramView::dropEvent(QDropEvent *event)
                 if (diagramSceneController->isAddingAllowed(Uid(QUuid(key)),
                                                             m_diagramSceneModel->diagram())) {
                     diagramSceneController->addExistingModelElement(Uid(QUuid(key)),
-                                                                    mapToScene(event->pos()),
+                                                                    mapToScene(event->position().toPoint()),
                                                                     m_diagramSceneModel->diagram());
                 }
             }
@@ -118,10 +126,10 @@ void DiagramView::dropEvent(QDropEvent *event)
             QString stereotype;
             dataStream >> newElementId >> name >> stereotype;
             if (!newElementId.isEmpty()) {
-                QPointF pos = mapToScene(event->pos());
+                QPointF pos = mapToScene(event->position().toPoint());
                 diagramSceneController->dropNewElement(
                             newElementId, name, stereotype, m_diagramSceneModel->findTopmostElement(pos),
-                            pos, m_diagramSceneModel->diagram(), event->pos(), size());
+                            pos, m_diagramSceneModel->diagram(), event->position().toPoint(), size());
             }
         }
         event->accept();
@@ -130,12 +138,41 @@ void DiagramView::dropEvent(QDropEvent *event)
     }
 }
 
+void DiagramView::mousePressEvent(QMouseEvent *event)
+{
+    m_panTimer.start();
+    QGraphicsView::mousePressEvent(event);
+}
+
+void DiagramView::mouseReleaseEvent(QMouseEvent *event)
+{
+    m_panTimer.stop();
+    QGraphicsView::mouseReleaseEvent(event);
+}
+
+void DiagramView::mouseMoveEvent(QMouseEvent *event)
+{
+    QGraphicsView::mouseMoveEvent(event);
+    m_lastMouse = event->pos();
+}
+
 void DiagramView::onSceneRectChanged(const QRectF &sceneRect)
 {
     // add some adjustment to all 4 sides
-    static const qreal ADJUSTMENT = 80;
     QRectF rect = sceneRect.adjusted(-ADJUSTMENT, -ADJUSTMENT, ADJUSTMENT, ADJUSTMENT);
     setSceneRect(rect);
 }
 
+void DiagramView::onPanTimeout()
+{
+    if (m_lastMouse.x() < ADJUSTMENT)
+        horizontalScrollBar()->triggerAction(QScrollBar::SliderSingleStepSub);
+    else if (m_lastMouse.x() > viewport()->size().width() - ADJUSTMENT)
+        horizontalScrollBar()->triggerAction(QScrollBar::SliderSingleStepAdd);
+    if (m_lastMouse.y() < ADJUSTMENT)
+        verticalScrollBar()->triggerAction(QScrollBar::SliderSingleStepSub);
+    else if (m_lastMouse.y() > viewport()->size().height() - ADJUSTMENT)
+        verticalScrollBar()->triggerAction(QScrollBar::SliderSingleStepAdd);
+}
+
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.h b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.h
index 41386f09bdb..4eee60ff44d 100644
--- a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.h
+++ b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.h
@@ -7,6 +7,7 @@
 #include "qmt/infrastructure/qmt_global.h"
 
 #include <QPointer>
+#include <QTimer>
 
 namespace qmt {
 
@@ -27,11 +28,17 @@ protected:
     void dragLeaveEvent(QDragLeaveEvent *event) override;
     void dragMoveEvent(QDragMoveEvent *event) override;
     void dropEvent(QDropEvent *event) override;
+    void mousePressEvent(QMouseEvent *event) override;
+    void mouseReleaseEvent(QMouseEvent *event) override;
+    void mouseMoveEvent(QMouseEvent *event) override;
 
 private:
     void onSceneRectChanged(const QRectF &sceneRect);
+    void onPanTimeout();
 
     QPointer<DiagramSceneModel> m_diagramSceneModel;
+    QPointF m_lastMouse;
+    QTimer m_panTimer;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/document_controller/documentcontroller.cpp b/src/libs/modelinglib/qmt/document_controller/documentcontroller.cpp
index 68184d2fb54..696fc305583 100644
--- a/src/libs/modelinglib/qmt/document_controller/documentcontroller.cpp
+++ b/src/libs/modelinglib/qmt/document_controller/documentcontroller.cpp
@@ -32,7 +32,7 @@
 
 #include "../../modelinglibtr.h"
 
-#include <QFileInfo>
+using Utils::FilePath;
 
 namespace qmt {
 
@@ -233,7 +233,7 @@ MDiagram *DocumentController::findOrCreateRootDiagram()
     return rootDiagram;
 }
 
-void DocumentController::createNewProject(const QString &fileName)
+void DocumentController::createNewProject(const FilePath &fileName)
 {
     m_diagramsManager->removeAllDiagrams();
     m_treeModel->setModelController(nullptr);
@@ -246,7 +246,7 @@ void DocumentController::createNewProject(const QString &fileName)
     m_modelController->setRootPackage(m_projectController->project()->rootPackage());
 }
 
-void DocumentController::loadProject(const QString &fileName)
+void DocumentController::loadProject(const FilePath &fileName)
 {
     m_diagramsManager->removeAllDiagrams();
     m_treeModel->setModelController(nullptr);
diff --git a/src/libs/modelinglib/qmt/document_controller/documentcontroller.h b/src/libs/modelinglib/qmt/document_controller/documentcontroller.h
index 8053d189e0a..9c5188e3f7d 100644
--- a/src/libs/modelinglib/qmt/document_controller/documentcontroller.h
+++ b/src/libs/modelinglib/qmt/document_controller/documentcontroller.h
@@ -7,6 +7,8 @@
 #include "qmt/infrastructure/qmt_global.h"
 #include "qmt/model_controller/modelcontroller.h"
 
+#include <utils/filepath.h>
+
 namespace qmt {
 
 class ProjectController;
@@ -77,8 +79,8 @@ public:
     MDiagram *findRootDiagram();
     MDiagram *findOrCreateRootDiagram();
 
-    void createNewProject(const QString &fileName);
-    void loadProject(const QString &fileName);
+    void createNewProject(const Utils::FilePath &fileName);
+    void loadProject(const Utils::FilePath &fileName);
 
 private:
     ProjectController *m_projectController = nullptr;
diff --git a/src/libs/modelinglib/qmt/infrastructure/ioexceptions.cpp b/src/libs/modelinglib/qmt/infrastructure/ioexceptions.cpp
index 4af8df92366..bb11a4d566e 100644
--- a/src/libs/modelinglib/qmt/infrastructure/ioexceptions.cpp
+++ b/src/libs/modelinglib/qmt/infrastructure/ioexceptions.cpp
@@ -7,6 +7,8 @@
 
 #include <QObject>
 
+using Utils::FilePath;
+
 namespace qmt {
 
 IOException::IOException(const QString &errorMsg)
@@ -14,39 +16,39 @@ IOException::IOException(const QString &errorMsg)
 {
 }
 
-FileIOException::FileIOException(const QString &errorMsg, const QString &fileName, int lineNumber)
+FileIOException::FileIOException(const QString &errorMsg, const FilePath &fileName, int lineNumber)
     : IOException(errorMsg),
       m_fileName(fileName),
       m_lineNumber(lineNumber)
 {
 }
 
-FileNotFoundException::FileNotFoundException(const QString &fileName)
+FileNotFoundException::FileNotFoundException(const FilePath &fileName)
     : FileIOException(Tr::tr("File not found."), fileName)
 {
 }
 
-FileCreationException::FileCreationException(const QString &fileName)
+FileCreationException::FileCreationException(const FilePath &fileName)
     : FileIOException(Tr::tr("Unable to create file."), fileName)
 {
 }
 
-FileWriteError::FileWriteError(const QString &fileName, int lineNumber)
+FileWriteError::FileWriteError(const FilePath &fileName, int lineNumber)
     : FileIOException(Tr::tr("Writing to file failed."), fileName, lineNumber)
 {
 }
 
-FileReadError::FileReadError(const QString &fileName, int lineNumber)
+FileReadError::FileReadError(const FilePath &fileName, int lineNumber)
     : FileIOException(Tr::tr("Reading from file failed."), fileName, lineNumber)
 {
 }
 
-IllegalXmlFile::IllegalXmlFile(const QString &fileName, int lineNumber)
+IllegalXmlFile::IllegalXmlFile(const FilePath &fileName, int lineNumber)
     : FileIOException(Tr::tr("Illegal XML file."), fileName, lineNumber)
 {
 }
 
-UnknownFileVersion::UnknownFileVersion(int version, const QString &fileName, int lineNumber)
+UnknownFileVersion::UnknownFileVersion(int version, const FilePath &fileName, int lineNumber)
     : FileIOException(Tr::tr("Unable to handle file version %1.")
                       .arg(version), fileName, lineNumber)
 {
diff --git a/src/libs/modelinglib/qmt/infrastructure/ioexceptions.h b/src/libs/modelinglib/qmt/infrastructure/ioexceptions.h
index aece890529f..7dc91ff4ba0 100644
--- a/src/libs/modelinglib/qmt/infrastructure/ioexceptions.h
+++ b/src/libs/modelinglib/qmt/infrastructure/ioexceptions.h
@@ -5,6 +5,8 @@
 
 #include "exceptions.h"
 
+#include <utils/filepath.h>
+
 namespace qmt {
 
 class IOException : public Exception
@@ -16,51 +18,51 @@ public:
 class FileIOException : public IOException
 {
 public:
-    explicit FileIOException(const QString &errorMsg, const QString &fileName = QString(),
+    explicit FileIOException(const QString &errorMsg, const Utils::FilePath &fileName = {},
                              int lineNumber = -1);
 
-    QString fileName() const { return m_fileName; }
+    Utils::FilePath fileName() const { return m_fileName; }
     int lineNumber() const { return m_lineNumber; }
 
 private:
-    QString m_fileName;
+    Utils::FilePath m_fileName;
     int m_lineNumber = -1;
 };
 
 class FileNotFoundException : public FileIOException
 {
 public:
-    explicit FileNotFoundException(const QString &fileName);
+    explicit FileNotFoundException(const Utils::FilePath &fileName);
 };
 
 class FileCreationException : public FileIOException
 {
 public:
-    explicit FileCreationException(const QString &fileName);
+    explicit FileCreationException(const Utils::FilePath &fileName);
 };
 
 class FileWriteError : public FileIOException
 {
 public:
-    explicit FileWriteError(const QString &fileName, int lineNumber = -1);
+    explicit FileWriteError(const Utils::FilePath &fileName, int lineNumber = -1);
 };
 
 class FileReadError : public FileIOException
 {
 public:
-    explicit FileReadError(const QString &fileName, int lineNumber = -1);
+    explicit FileReadError(const Utils::FilePath &fileName, int lineNumber = -1);
 };
 
 class IllegalXmlFile : public FileIOException
 {
 public:
-    explicit IllegalXmlFile(const QString &fileName, int lineNumber = -1);
+    explicit IllegalXmlFile(const Utils::FilePath &fileName, int lineNumber = -1);
 };
 
 class UnknownFileVersion : public FileIOException
 {
 public:
-    UnknownFileVersion(int version, const QString &fileName, int lineNumber = -1);
+    UnknownFileVersion(int version, const Utils::FilePath &fileName, int lineNumber = -1);
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/model/mdiagram.h b/src/libs/modelinglib/qmt/model/mdiagram.h
index 8f327daabc7..bebe17cb506 100644
--- a/src/libs/modelinglib/qmt/model/mdiagram.h
+++ b/src/libs/modelinglib/qmt/model/mdiagram.h
@@ -21,7 +21,7 @@ public:
 
     MDiagram &operator=(const MDiagram &rhs);
 
-    const QList<DElement *> &diagramElements() const { return m_elements; }
+    const QList<DElement *> diagramElements() const { return m_elements; }
     DElement *findDiagramElement(const Uid &key) const;
     DElement *findDelegate(const Uid &modelUid) const;
     void setDiagramElements(const QList<DElement *> &elements);
diff --git a/src/libs/modelinglib/qmt/model/mobject.cpp b/src/libs/modelinglib/qmt/model/mobject.cpp
index 734be135673..f5b4e2b36fe 100644
--- a/src/libs/modelinglib/qmt/model/mobject.cpp
+++ b/src/libs/modelinglib/qmt/model/mobject.cpp
@@ -8,6 +8,8 @@
 #include "mvisitor.h"
 #include "mconstvisitor.h"
 
+using Utils::FilePath;
+
 namespace qmt {
 
 MObject::MObject()
@@ -20,6 +22,7 @@ MObject::MObject()
 MObject::MObject(const MObject &rhs)
     : MElement(rhs),
       m_name(rhs.m_name),
+      m_linkedfilename(rhs.m_linkedfilename),
       m_children(true),
       m_relations(true)
 {
@@ -34,6 +37,7 @@ MObject &MObject::operator =(const MObject &rhs)
     if (this != &rhs) {
         MElement::operator=(rhs);
         m_name = rhs.m_name;
+        m_linkedfilename = rhs.m_linkedfilename;
         // no deep copy; list of children remains unchanged
     }
     return *this;
@@ -44,6 +48,11 @@ void MObject::setName(const QString &name)
     m_name = name;
 }
 
+void MObject::setLinkedFileName(const FilePath &linkedfilename)
+{
+    m_linkedfilename = linkedfilename;
+}
+
 void MObject::setChildren(const Handles<MObject> &children)
 {
     m_children = children;
diff --git a/src/libs/modelinglib/qmt/model/mobject.h b/src/libs/modelinglib/qmt/model/mobject.h
index 1dc95887d9a..29d10da4ba0 100644
--- a/src/libs/modelinglib/qmt/model/mobject.h
+++ b/src/libs/modelinglib/qmt/model/mobject.h
@@ -6,6 +6,8 @@
 #include "melement.h"
 #include "qmt/infrastructure/handles.h"
 
+#include <utils/filepath.h>
+
 #include <QString>
 
 namespace qmt {
@@ -23,6 +25,8 @@ public:
 
     QString name() const { return m_name; }
     void setName(const QString &name);
+    Utils::FilePath linkedFileName() const { return m_linkedfilename; }
+    void setLinkedFileName(const Utils::FilePath &linkedfilename);
 
     const Handles<MObject> &children() const { return m_children; }
     void setChildren(const Handles<MObject> &children);
@@ -48,6 +52,7 @@ public:
 
 private:
     QString m_name;
+    Utils::FilePath m_linkedfilename;
     Handles<MObject> m_children;
     Handles<MRelation> m_relations;
 };
diff --git a/src/libs/modelinglib/qmt/model_controller/mflatassignmentvisitor.cpp b/src/libs/modelinglib/qmt/model_controller/mflatassignmentvisitor.cpp
index deb458e4bc6..66cfb4576fc 100644
--- a/src/libs/modelinglib/qmt/model_controller/mflatassignmentvisitor.cpp
+++ b/src/libs/modelinglib/qmt/model_controller/mflatassignmentvisitor.cpp
@@ -35,6 +35,7 @@ void MFlatAssignmentVisitor::visitMObject(const MObject *object)
     auto targetObject = dynamic_cast<MObject *>(m_target);
     QMT_ASSERT(targetObject, return);
     targetObject->setName(object->name());
+    targetObject->setLinkedFileName(object->linkedFileName());
 }
 
 void MFlatAssignmentVisitor::visitMPackage(const MPackage *package)
diff --git a/src/libs/modelinglib/qmt/model_ui/modeltreefilterdata.cpp b/src/libs/modelinglib/qmt/model_ui/modeltreefilterdata.cpp
new file mode 100644
index 00000000000..ba411690f57
--- /dev/null
+++ b/src/libs/modelinglib/qmt/model_ui/modeltreefilterdata.cpp
@@ -0,0 +1,43 @@
+// Copyright (C) 2018 Jochen Becher
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "modeltreefilterdata.h"
+
+namespace qmt {
+
+void ModelTreeViewData::setShowRelations(bool newShowRelations)
+{
+    m_showRelations = newShowRelations;
+}
+
+void ModelTreeViewData::setShowDiagramElements(bool newShowDiagramElements)
+{
+    m_showDiagramElements = newShowDiagramElements;
+}
+
+void ModelTreeFilterData::setType(Type newType)
+{
+    m_type = newType;
+}
+
+void ModelTreeFilterData::setCustomId(const QString &newCustomId)
+{
+    m_customId = newCustomId;
+}
+
+void ModelTreeFilterData::setStereotypes(const QStringList &newStereotypes)
+{
+    m_stereotypes = newStereotypes;
+}
+
+void ModelTreeFilterData::setName(const QString &newName)
+{
+    m_name = newName;
+}
+
+void ModelTreeFilterData::setDirection(Direction newDirection)
+{
+    m_direction = newDirection;
+}
+
+} // namespace qmt
diff --git a/src/libs/modelinglib/qmt/model_ui/modeltreefilterdata.h b/src/libs/modelinglib/qmt/model_ui/modeltreefilterdata.h
new file mode 100644
index 00000000000..3af018fefd5
--- /dev/null
+++ b/src/libs/modelinglib/qmt/model_ui/modeltreefilterdata.h
@@ -0,0 +1,72 @@
+// Copyright (C) 2018 Jochen Becher
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <QString>
+#include <QStringList>
+
+namespace qmt {
+
+class ModelTreeViewData
+{
+public:
+
+    bool showRelations() const { return m_showRelations; }
+    void setShowRelations(bool newShowRelations);
+
+    bool showDiagramElements() const { return m_showDiagramElements; }
+    void setShowDiagramElements(bool newShowDiagramElements);
+
+private:
+    bool m_showRelations = true;
+    bool m_showDiagramElements = false;
+};
+
+class ModelTreeFilterData
+{
+public:
+    enum class Type {
+        Any,
+        Package,
+        Component,
+        Class,
+        Diagram,
+        Item,
+        Dependency,
+        Association,
+        Inheritance,
+        Connection
+    };
+
+    enum class Direction {
+        Any,
+        Outgoing,
+        Incoming,
+        Bidirectional
+    };
+
+    Type type() const { return m_type; }
+    void setType(Type newType);
+
+    QString customId() const { return m_customId; }
+    void setCustomId(const QString &newCustomId);
+
+    QStringList stereotypes() const { return m_stereotypes; }
+    void setStereotypes(const QStringList &newStereotypes);
+
+    QString name() const { return m_name; }
+    void setName(const QString &newName);
+
+    Direction direction() const { return m_direction; }
+    void setDirection(Direction newDirection);
+
+private:
+    Type m_type = Type::Any;
+    QString m_customId;
+    QStringList m_stereotypes;
+    QString m_name;
+    Direction m_direction = Direction::Any;
+};
+
+} // namespace qmt
diff --git a/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.cpp b/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.cpp
index 972c2f9c005..e69e1635a73 100644
--- a/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.cpp
+++ b/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.cpp
@@ -3,14 +3,203 @@
 
 #include "sortedtreemodel.h"
 
+#include "qmt/model/massociation.h"
+#include "qmt/model/mcanvasdiagram.h"
+#include "qmt/model/mclass.h"
+#include "qmt/model/mcomponent.h"
+#include "qmt/model/mconnection.h"
+#include "qmt/model/mdependency.h"
+#include "qmt/model/minheritance.h"
+#include "qmt/model/mitem.h"
+#include "qmt/model/mpackage.h"
+#include "qmt/model/mconstvisitor.h"
 #include "treemodel.h"
 
 namespace qmt {
 
+namespace {
+
+class Filter : public MConstVisitor {
+public:
+
+    void setModelTreeViewData(const ModelTreeViewData *viewData)
+    {
+        m_viewData = viewData;
+    }
+
+    void setModelTreeFilterData(const ModelTreeFilterData *filterData)
+    {
+        m_filterData = filterData;
+    }
+
+    bool keep() const { return m_keep; }
+
+    void visitMElement(const MElement *element) override
+    {
+        if (!m_filterData->stereotypes().isEmpty()) {
+            const QStringList stereotypes = element->stereotypes();
+            bool containsElementStereotype = std::any_of(
+                stereotypes.constBegin(), stereotypes.constEnd(),
+                [&](const QString &s) { return m_filterData->stereotypes().contains(s); });
+            if (!containsElementStereotype) {
+                m_keep = false;
+                return;
+            }
+        }
+    }
+
+    void visitMObject(const MObject *object) override
+    {
+        if (!m_filterData->name().isEmpty() && m_filterData->name() != object->name())
+            m_keep = false;
+        else
+            visitMElement(object);
+    }
+
+    void visitMPackage(const MPackage *package) override
+    {
+        if (m_filterData->type() != ModelTreeFilterData::Type::Any
+            && m_filterData->type() != ModelTreeFilterData::Type::Package)
+        {
+            m_keep = false;
+        } else {
+            visitMObject(package);
+        }
+    }
+
+    void visitMClass(const MClass *klass) override
+    {
+        if (m_filterData->type() != ModelTreeFilterData::Type::Any
+            && m_filterData->type() != ModelTreeFilterData::Type::Class)
+        {
+            m_keep = false;
+        } else {
+            visitMObject(klass);
+        }
+    }
+
+    void visitMComponent(const MComponent *component) override
+    {
+        if (m_filterData->type() != ModelTreeFilterData::Type::Any
+            && m_filterData->type() != ModelTreeFilterData::Type::Component)
+        {
+            m_keep = false;
+        } else {
+            visitMObject(component);
+        }
+    }
+
+    void visitMDiagram(const MDiagram *diagram) override
+    {
+        if (m_filterData->type() != ModelTreeFilterData::Type::Any
+            && m_filterData->type() != ModelTreeFilterData::Type::Diagram)
+        {
+            m_keep = false;
+        } else {
+            visitMObject(diagram);
+        }
+    }
+
+    void visitMCanvasDiagram(const MCanvasDiagram *diagram) override
+    {
+        visitMDiagram(diagram);
+    }
+
+    void visitMItem(const MItem *item) override
+    {
+        if (m_filterData->type() != ModelTreeFilterData::Type::Any
+            && m_filterData->type() != ModelTreeFilterData::Type::Item)
+        {
+            m_keep = false;
+        } else {
+            visitMObject(item);
+        }
+    }
+
+    void visitMRelation(const MRelation *relation) override
+    {
+        if (!m_viewData->showRelations())
+            m_keep = false;
+        else if (!m_filterData->name().isEmpty() && m_filterData->name() != relation->name())
+            m_keep = false;
+        else
+            visitMElement(relation);
+    }
+
+    void visitMDependency(const MDependency *dependency) override
+    {
+        if (m_filterData->type() != ModelTreeFilterData::Type::Any
+            && m_filterData->type() != ModelTreeFilterData::Type::Dependency)
+        {
+            m_keep = false;
+        } else {
+            switch (m_filterData->direction()) {
+            case ModelTreeFilterData::Direction::Any:
+                break;
+            case ModelTreeFilterData::Direction::Outgoing:
+                if (dependency->direction() != MDependency::AToB)
+                    m_keep = false;
+                break;
+            case ModelTreeFilterData::Direction::Incoming:
+                if (dependency->direction() != MDependency::BToA)
+                    m_keep = false;
+                break;
+            case ModelTreeFilterData::Direction::Bidirectional:
+                if (dependency->direction() != MDependency::Bidirectional)
+                    m_keep = false;
+                break;
+            }
+            if (m_keep)
+                visitMRelation(dependency);
+        }
+    }
+
+    void visitMInheritance(const MInheritance *inheritance) override
+    {
+        if (m_filterData->type() != ModelTreeFilterData::Type::Any
+            && m_filterData->type() != ModelTreeFilterData::Type::Inheritance)
+        {
+            m_keep = false;
+        } else {
+            visitMRelation(inheritance);
+        }
+    }
+
+    void visitMAssociation(const MAssociation *association) override
+    {
+        if (m_filterData->type() != ModelTreeFilterData::Type::Any
+            && m_filterData->type() != ModelTreeFilterData::Type::Association)
+        {
+            m_keep = false;
+        } else {
+            visitMRelation(association);
+        }
+    }
+
+    void visitMConnection(const MConnection *connection) override
+    {
+        if (m_filterData->type() != ModelTreeFilterData::Type::Any
+            && m_filterData->type() != ModelTreeFilterData::Type::Connection)
+        {
+            m_keep = false;
+        } else {
+            visitMRelation(connection);
+        }
+    }
+
+private:
+    const ModelTreeViewData *m_viewData = nullptr;
+    const ModelTreeFilterData *m_filterData = nullptr;
+    bool m_keep = true;
+};
+
+}
+
 SortedTreeModel::SortedTreeModel(QObject *parent)
     : QSortFilterProxyModel(parent)
 {
     setDynamicSortFilter(false);
+    setRecursiveFilteringEnabled(true);
     setSortCaseSensitivity(Qt::CaseInsensitive);
 
     m_delayedSortTimer.setSingleShot(true);
@@ -33,6 +222,37 @@ void SortedTreeModel::setTreeModel(TreeModel *treeModel)
     startDelayedSortTimer();
 }
 
+void SortedTreeModel::setModelTreeViewData(const ModelTreeViewData &viewData)
+{
+    m_modelTreeViewData = viewData;
+    beginResetModel();
+    endResetModel();
+    startDelayedSortTimer();
+}
+
+void SortedTreeModel::setModelTreeFilterData(const ModelTreeFilterData &filterData)
+{
+    m_modelTreeViewFilterData = filterData;
+    beginResetModel();
+    endResetModel();
+    startDelayedSortTimer();
+}
+
+bool SortedTreeModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
+{
+    QModelIndex index = sourceModel()->index(source_row, 0, source_parent);
+    MElement *element = m_treeModel->element(index);
+    if (element) {
+        Filter filter;
+        filter.setModelTreeViewData(&m_modelTreeViewData);
+        filter.setModelTreeFilterData(&m_modelTreeViewFilterData);
+        element->accept(&filter);
+        if (!filter.keep())
+            return false;
+    }
+    return true;
+}
+
 bool SortedTreeModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
 {
     TreeModel::ItemType leftItemType = TreeModel::ItemType(sourceModel()->data(left, TreeModel::RoleItemType).toInt());
diff --git a/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h b/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h
index 0c01cf7de79..797a3211321 100644
--- a/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h
+++ b/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "qmt/infrastructure/qmt_global.h"
+#include "qmt/model_ui/modeltreefilterdata.h"
 
 #include <QSortFilterProxyModel>
 #include <QTimer>
@@ -21,7 +22,11 @@ public:
     TreeModel *treeModel() const { return m_treeModel; }
     void setTreeModel(TreeModel *treeModel);
 
+    void setModelTreeViewData(const ModelTreeViewData &viewData);
+    void setModelTreeFilterData(const ModelTreeFilterData &filterData);
+
 protected:
+    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
     bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
 
 private:
@@ -32,6 +37,8 @@ private:
     void startDelayedSortTimer();
 
     TreeModel *m_treeModel = nullptr;
+    ModelTreeViewData m_modelTreeViewData;
+    ModelTreeFilterData m_modelTreeViewFilterData;
     QTimer m_delayedSortTimer;
 };
 
diff --git a/src/libs/modelinglib/qmt/model_ui/treemodel.cpp b/src/libs/modelinglib/qmt/model_ui/treemodel.cpp
index 3e8d5a59b69..23d589a6540 100644
--- a/src/libs/modelinglib/qmt/model_ui/treemodel.cpp
+++ b/src/libs/modelinglib/qmt/model_ui/treemodel.cpp
@@ -30,6 +30,8 @@
 
 #include <QStandardItem>
 
+using Utils::FilePath;
+
 namespace qmt {
 
 class TreeModel::ModelItem : public QStandardItem
@@ -807,7 +809,7 @@ QString TreeModel::createRelationLabel(const MRelation *relation)
 }
 
 QIcon TreeModel::createIcon(StereotypeIcon::Element stereotypeIconElement, StyleEngine::ElementType styleElementType,
-                            const QStringList &stereotypes, const QString &defaultIconPath)
+                            const QStringList &stereotypes, const FilePath &defaultIconPath)
 {
     const Style *style = m_styleController->adaptStyle(styleElementType);
     return m_stereotypeController->createIcon(stereotypeIconElement, stereotypes, defaultIconPath, style,
diff --git a/src/libs/modelinglib/qmt/model_ui/treemodel.h b/src/libs/modelinglib/qmt/model_ui/treemodel.h
index add325a94ab..5ea35963489 100644
--- a/src/libs/modelinglib/qmt/model_ui/treemodel.h
+++ b/src/libs/modelinglib/qmt/model_ui/treemodel.h
@@ -9,6 +9,8 @@
 #include <qmt/stereotype/stereotypeicon.h>
 #include <qmt/style/styleengine.h>
 
+#include <utils/filepath.h>
+
 #include <QScopedPointer>
 #include <QHash>
 
@@ -93,8 +95,9 @@ private:
     QString createObjectLabel(const MObject *object);
     QString createRelationLabel(const MRelation *relation);
     QIcon createIcon(StereotypeIcon::Element stereotypeIconElement,
-                     StyleEngine::ElementType styleElementType, const QStringList &stereotypes,
-                     const QString &defaultIconPath);
+                     StyleEngine::ElementType styleElementType,
+                     const QStringList &stereotypes,
+                     const Utils::FilePath &defaultIconPath);
 
     enum Busy {
         NotBusy,
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/addrelatedelementsdialog.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/addrelatedelementsdialog.cpp
new file mode 100644
index 00000000000..40499e28398
--- /dev/null
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/addrelatedelementsdialog.cpp
@@ -0,0 +1,426 @@
+// Copyright (C) 2018 Jochen Becher
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "addrelatedelementsdialog.h"
+
+#include <qmt/tasks/diagramscenecontroller.h>
+#include <qmt/diagram_controller/dselection.h>
+#include <qmt/model/mdiagram.h>
+#include <qmt/model/mrelation.h>
+#include <qmt/model/mdependency.h>
+#include <qmt/model/minheritance.h>
+#include <qmt/model/massociation.h>
+#include <qmt/model/mconnection.h>
+#include <qmt/model_controller/modelcontroller.h>
+#include <qmt/model_controller/mvoidvisitor.h>
+
+#include "../../modelinglibtr.h"
+
+#include <utils/layoutbuilder.h>
+
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QStringListModel>
+
+namespace qmt {
+
+namespace {
+
+enum class RelationType {
+    Any,
+    Dependency,
+    Association,
+    Inheritance,
+    Connection
+};
+
+enum class RelationDirection {
+    Any,
+    Outgoing,
+    Incoming,
+    Bidirectional
+};
+
+enum class ElementType {
+    Any,
+    Package,
+    Component,
+    Class,
+    Diagram,
+    Item,
+};
+
+class Filter : public qmt::MVoidConstVisitor {
+public:
+
+    void setRelationType(RelationType newRelationType)
+    {
+        m_relationType = newRelationType;
+    }
+
+    void setRelationTypeId(const QString &newRelationTypeId)
+    {
+        m_relationTypeId = newRelationTypeId;
+    }
+
+    void setRelationDirection(RelationDirection newRelationDirection)
+    {
+        m_relationDirection = newRelationDirection;
+    }
+
+    void setRelationStereotypes(const QStringList &newRelationStereotypes)
+    {
+        m_relationStereotypes = newRelationStereotypes;
+    }
+
+    void setElementType(ElementType newElementType)
+    {
+        m_elementType = newElementType;
+    }
+
+    void setElementStereotypes(const QStringList &newElementStereotypes)
+    {
+        m_elementStereotypes = newElementStereotypes;
+    }
+
+    void setObject(const qmt::DObject *dobject, const qmt::MObject *mobject)
+    {
+        m_dobject = dobject;
+        m_mobject = mobject;
+    }
+
+    void setRelation(const qmt::MRelation *relation)
+    {
+        m_relation = relation;
+    }
+
+    bool keep() const { return m_keep; }
+
+    void reset()
+    {
+        m_dobject = nullptr;
+        m_mobject = nullptr;
+        m_relation = nullptr;
+        m_keep = true;
+    }
+
+    // MConstVisitor interface
+    void visitMObject(const qmt::MObject *object) override
+    {
+        if (!m_elementStereotypes.isEmpty()) {
+            const QStringList stereotypes = object->stereotypes();
+            bool containsElementStereotype = std::any_of(
+                stereotypes.constBegin(), stereotypes.constEnd(),
+                [&](const QString &s) { return m_elementStereotypes.contains(s); });
+            if (!containsElementStereotype) {
+                m_keep = false;
+                return;
+            }
+        }
+    }
+
+    void visitMPackage(const qmt::MPackage *package) override
+    {
+        if (m_elementType == ElementType::Any || m_elementType == ElementType::Package)
+            qmt::MVoidConstVisitor::visitMPackage(package);
+        else
+            m_keep = false;
+    }
+
+    void visitMClass(const qmt::MClass *klass) override
+    {
+        if (m_elementType == ElementType::Any || m_elementType == ElementType::Class)
+            qmt::MVoidConstVisitor::visitMClass(klass);
+        else
+            m_keep = false;
+    }
+
+    void visitMComponent(const qmt::MComponent *component) override
+    {
+        if (m_elementType == ElementType::Any || m_elementType == ElementType::Component)
+            qmt::MVoidConstVisitor::visitMComponent(component);
+        else
+            m_keep = false;
+    }
+
+    void visitMDiagram(const qmt::MDiagram *diagram) override
+    {
+        if (m_elementType == ElementType::Any || m_elementType == ElementType::Diagram)
+            qmt::MVoidConstVisitor::visitMDiagram(diagram);
+        else
+            m_keep = false;
+    }
+
+    void visitMItem(const qmt::MItem *item) override
+    {
+        if (m_elementType == ElementType::Any || m_elementType == ElementType::Item)
+            qmt::MVoidConstVisitor::visitMItem(item);
+        else
+            m_keep = false;
+    }
+
+    void visitMRelation(const qmt::MRelation *relation) override
+    {
+        if (!m_relationStereotypes.isEmpty()) {
+            const QStringList relationStereotypes = relation->stereotypes();
+            bool containsRelationStereotype = std::any_of(
+                relationStereotypes.constBegin(), relationStereotypes.constEnd(),
+                [&](const QString &s) { return m_relationStereotypes.contains(s); });
+            if (!containsRelationStereotype) {
+                m_keep = false;
+                return;
+            }
+        }
+    }
+
+    void visitMDependency(const qmt::MDependency *dependency) override
+    {
+        if (m_relationDirection != RelationDirection::Any) {
+            bool keep = false;
+            if (m_relationDirection == RelationDirection::Outgoing) {
+                if (dependency->direction() == qmt::MDependency::AToB && dependency->endAUid() == m_mobject->uid())
+                    keep = true;
+                else if (dependency->direction() == qmt::MDependency::BToA && dependency->endBUid() == m_mobject->uid())
+                    keep = true;
+            } else if (m_relationDirection == RelationDirection::Incoming) {
+                if (dependency->direction() == qmt::MDependency::AToB && dependency->endBUid() == m_mobject->uid())
+                    keep = true;
+                else if (dependency->direction() == qmt::MDependency::BToA && dependency->endAUid() == m_mobject->uid())
+                    keep = true;
+            } else if (m_relationDirection == RelationDirection::Bidirectional) {
+                if (dependency->direction() == qmt::MDependency::Bidirectional)
+                    keep = true;
+            }
+            m_keep = keep;
+            if (!keep)
+                return;
+        }
+        if (m_relationType == RelationType::Any || m_relationType == RelationType::Dependency)
+            qmt::MVoidConstVisitor::visitMDependency(dependency);
+        else
+            m_keep = false;
+    }
+
+    bool testDirection(const qmt::MRelation *relation)
+    {
+        if (m_relationDirection != RelationDirection::Any) {
+            bool keep = false;
+            if (m_relationDirection == RelationDirection::Outgoing) {
+                if (relation->endAUid() == m_mobject->uid())
+                    keep = true;
+            } else if (m_relationDirection == RelationDirection::Incoming) {
+                if (relation->endBUid() == m_mobject->uid())
+                    keep = true;
+            }
+            m_keep = keep;
+            if (!keep)
+                return false;
+        }
+        return true;
+    }
+
+    void visitMInheritance(const qmt::MInheritance *inheritance) override
+    {
+        if (!testDirection(inheritance))
+            return;
+        if (m_relationType == RelationType::Any || m_relationType == RelationType::Inheritance)
+            qmt::MVoidConstVisitor::visitMInheritance(inheritance);
+        else
+            m_keep = false;
+    }
+
+    void visitMAssociation(const qmt::MAssociation *association) override
+    {
+        if (!testDirection(association))
+            return;
+        if (m_relationType == RelationType::Any || m_relationType == RelationType::Association)
+            qmt::MVoidConstVisitor::visitMAssociation(association);
+        else
+            m_keep = false;
+    }
+
+    void visitMConnection(const qmt::MConnection *connection) override
+    {
+        if (!testDirection(connection))
+            return;
+        if (m_relationType == RelationType::Any || m_relationType == RelationType::Connection)
+            qmt::MVoidConstVisitor::visitMConnection(connection);
+        else
+            m_keep = false;
+    }
+
+private:
+    RelationType m_relationType = RelationType::Any;
+    QString m_relationTypeId;
+    RelationDirection m_relationDirection = RelationDirection::Any;
+    QStringList m_relationStereotypes;
+    ElementType m_elementType = ElementType::Any;
+    QStringList m_elementStereotypes;
+    const qmt::DObject *m_dobject = nullptr;
+    const qmt::MObject *m_mobject = nullptr;
+    const qmt::MRelation *m_relation = nullptr;
+    bool m_keep = true;
+};
+} // namespace
+
+class AddRelatedElementsDialog::Private {
+public:
+    qmt::DiagramSceneController *m_diagramSceneController = nullptr;
+    qmt::DSelection m_selection;
+    qmt::Uid m_diagramUid;
+    QStringListModel m_relationTypeModel;
+    QStringListModel m_relationDirectionModel;
+    QStringListModel m_relationStereotypesModel;
+    QStringListModel m_elementTypeModel;
+    QStringListModel m_elementStereotypesModel;
+    Filter m_filter;
+
+    QComboBox *RelationTypeCombobox;
+    QComboBox *DirectionCombobox;
+    QComboBox *StereotypesCombobox;
+    QComboBox *ElementStereotypesCombobox;
+    QComboBox *ElementTypeComboBox;
+    QLabel *NumberOfMatchingElementsValue;
+    QDialogButtonBox *buttonBox;
+};
+
+AddRelatedElementsDialog::AddRelatedElementsDialog(QWidget *parent) :
+    QDialog(parent),
+    d(new Private)
+{
+    setMinimumWidth(500);
+
+    d->RelationTypeCombobox = new QComboBox;
+    d->DirectionCombobox = new QComboBox;
+    d->StereotypesCombobox = new QComboBox;
+    d->StereotypesCombobox->setEditable(true);
+    d->ElementTypeComboBox = new QComboBox;
+    d->ElementStereotypesCombobox = new QComboBox;
+    d->ElementStereotypesCombobox->setEditable(true);
+    d->NumberOfMatchingElementsValue = new QLabel;
+    d->buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+
+    using namespace Layouting;
+    Column {
+        Group {
+            title(Tr::tr("Relation Attributes")),
+            Form {
+                Tr::tr("Type"), d->RelationTypeCombobox, br,
+                Tr::tr("Direction"), d->DirectionCombobox, br,
+                Tr::tr("Stereotypes"), d->StereotypesCombobox, br,
+            },
+        },
+        Group {
+            title(Tr::tr("Other Element Attributes")),
+            Form {
+                Tr::tr("Type"), d->ElementTypeComboBox, br,
+                Tr::tr("Stereotypes"), d->ElementStereotypesCombobox, br,
+            },
+        },
+        Row {
+            Tr::tr("Number of matching elements: "), d->NumberOfMatchingElementsValue, st,
+        },
+        st,
+        d->buttonBox,
+    }.attachTo(this);
+
+    connect(d->RelationTypeCombobox, &QComboBox::currentIndexChanged, this, &AddRelatedElementsDialog::updateNumberOfElements);
+    connect(d->DirectionCombobox, &QComboBox::currentIndexChanged, this, &AddRelatedElementsDialog::updateNumberOfElements);
+    connect(d->StereotypesCombobox, &QComboBox::currentTextChanged, this, &AddRelatedElementsDialog::updateNumberOfElements);
+    connect(d->ElementTypeComboBox, &QComboBox::currentIndexChanged, this, &AddRelatedElementsDialog::updateNumberOfElements);
+    connect(d->ElementStereotypesCombobox, &QComboBox::currentTextChanged, this, &AddRelatedElementsDialog::updateNumberOfElements);
+    connect(d->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+    connect(d->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+    connect(this, &QDialog::accepted, this, &AddRelatedElementsDialog::onAccepted);
+}
+
+AddRelatedElementsDialog::~AddRelatedElementsDialog()
+{
+    delete d;
+}
+
+void AddRelatedElementsDialog::setDiagramSceneController(qmt::DiagramSceneController *diagramSceneController)
+{
+    d->m_diagramSceneController = diagramSceneController;
+}
+
+void AddRelatedElementsDialog::setElements(const qmt::DSelection &selection, qmt::MDiagram *diagram)
+{
+    d->m_selection = selection;
+    d->m_diagramUid = diagram->uid();
+    QStringList relationTypes = {"Any", "Dependency", "Association", "Inheritance"};
+    d->m_relationTypeModel.setStringList(relationTypes);
+    d->RelationTypeCombobox->setModel(&d->m_relationTypeModel);
+    QStringList relationDirections = {"Any", "Outgoing (->)", "Incoming (<-)", "Bidirectional (<->)"};
+    d->m_relationDirectionModel.setStringList(relationDirections);
+    d->DirectionCombobox->setModel(&d->m_relationDirectionModel);
+    QStringList relationStereotypes = { };
+    d->m_relationStereotypesModel.setStringList(relationStereotypes);
+    d->StereotypesCombobox->setModel(&d->m_relationStereotypesModel);
+    QStringList elementTypes = {"Any", "Package", "Component", "Class", "Diagram", "Item"};
+    d->m_elementTypeModel.setStringList(elementTypes);
+    d->ElementTypeComboBox->setModel(&d->m_elementTypeModel);
+    QStringList elementStereotypes = { };
+    d->m_elementStereotypesModel.setStringList(elementStereotypes);
+    d->ElementStereotypesCombobox->setModel(&d->m_elementStereotypesModel);
+    updateNumberOfElements();
+}
+
+void AddRelatedElementsDialog::onAccepted()
+{
+    qmt::MDiagram *diagram = d->m_diagramSceneController->modelController()->findElement<qmt::MDiagram>(d->m_diagramUid);
+    if (diagram) {
+        updateFilter();
+        d->m_diagramSceneController->addRelatedElements(
+            d->m_selection, diagram,
+            [this](qmt::DObject *dobject, qmt::MObject *mobject, qmt::MRelation *relation) -> bool
+            {
+                return this->filter(dobject, mobject, relation);
+            });
+    }
+}
+
+void AddRelatedElementsDialog::updateFilter()
+{
+    d->m_filter.setRelationType((RelationType) d->RelationTypeCombobox->currentIndex());
+    d->m_filter.setRelationDirection((RelationDirection) d->DirectionCombobox->currentIndex());
+    d->m_filter.setRelationStereotypes(d->StereotypesCombobox->currentText().split(',', Qt::SkipEmptyParts));
+    d->m_filter.setElementType((ElementType) d->ElementTypeComboBox->currentIndex());
+    d->m_filter.setElementStereotypes(d->ElementStereotypesCombobox->currentText().split(',', Qt::SkipEmptyParts));
+}
+
+bool AddRelatedElementsDialog::filter(qmt::DObject *dobject, qmt::MObject *mobject, qmt::MRelation *relation)
+{
+    d->m_filter.reset();
+    d->m_filter.setObject(dobject, mobject);
+    d->m_filter.setRelation(relation);
+    relation->accept(&d->m_filter);
+    if (!d->m_filter.keep())
+        return false;
+    qmt::MObject *targetObject = nullptr;
+    if (relation->endAUid() != mobject->uid())
+        targetObject = d->m_diagramSceneController->modelController()->findObject(relation->endAUid());
+    else if (relation->endBUid() != mobject->uid())
+        targetObject = d->m_diagramSceneController->modelController()->findObject(relation->endBUid());
+    if (!targetObject)
+        return false;
+    targetObject->accept(&d->m_filter);
+    return d->m_filter.keep();
+}
+
+void AddRelatedElementsDialog::updateNumberOfElements()
+{
+    qmt::MDiagram *diagram = d->m_diagramSceneController->modelController()->findElement<qmt::MDiagram>(d->m_diagramUid);
+    if (diagram) {
+        updateFilter();
+        d->NumberOfMatchingElementsValue->setText(QString::number(d->m_diagramSceneController->countRelatedElements(
+            d->m_selection, diagram,
+            [this](qmt::DObject *dobject, qmt::MObject *mobject, qmt::MRelation *relation) -> bool
+            {
+                return this->filter(dobject, mobject, relation);
+            })));
+    }
+}
+
+} // namespace qmt
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/addrelatedelementsdialog.h b/src/libs/modelinglib/qmt/model_widgets_ui/addrelatedelementsdialog.h
new file mode 100644
index 00000000000..e0fefa1c6cc
--- /dev/null
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/addrelatedelementsdialog.h
@@ -0,0 +1,43 @@
+// Copyright (C) 2018 Jochen Becher
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "qmt/infrastructure/qmt_global.h"
+
+#include <QDialog>
+
+namespace qmt {
+
+class DSelection;
+class DObject;
+class MObject;
+class MDiagram;
+class MRelation;
+class DiagramSceneController;
+}
+
+namespace qmt {
+
+class QMT_EXPORT AddRelatedElementsDialog : public QDialog
+{
+    Q_OBJECT
+    class Private;
+
+public:
+    explicit AddRelatedElementsDialog(QWidget *parent = nullptr);
+    ~AddRelatedElementsDialog();
+
+    void setDiagramSceneController(qmt::DiagramSceneController *diagramSceneController);
+    void setElements(const qmt::DSelection &selection, qmt::MDiagram *diagram);
+
+private:
+    void onAccepted();
+    void updateFilter();
+    bool filter(qmt::DObject *dobject, qmt::MObject *mobject, qmt::MRelation *relation);
+    void updateNumberOfElements();
+
+    Private *d = nullptr;
+};
+
+} // namespace qmt
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreefilter.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreefilter.cpp
new file mode 100644
index 00000000000..f02b4668300
--- /dev/null
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreefilter.cpp
@@ -0,0 +1,173 @@
+// Copyright (C) 2018 Jochen Becher
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "modeltreefilter.h"
+
+#include "../../modelinglibtr.h"
+
+#include <utils/layoutbuilder.h>
+
+#include <QCheckBox>
+#include <QComboBox>
+#include <QFrame>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QStringListModel>
+
+namespace qmt {
+
+class ModelTreeFilter::Private {
+public:
+    QStringListModel m_typeModel;
+    QStringListModel m_stereotypesModel;
+    QStringListModel m_directionModel;
+
+    QPushButton *resetViewButton;
+    QCheckBox *relationsCheckBox;
+    QCheckBox *diagramElementsCheckBox;
+    QPushButton *clearFilterButton;
+    QComboBox *typeComboBox;
+    QComboBox *stereotypesComboBox;
+    QLineEdit *nameLineEdit;
+    QComboBox *directionComboBox;
+};
+
+ModelTreeFilter::ModelTreeFilter(QWidget *parent) :
+    QWidget(parent),
+    d(new Private)
+{
+    d->resetViewButton = new QPushButton(Tr::tr("Reset"));
+    d->relationsCheckBox = new QCheckBox(Tr::tr("Relations"));
+    d->diagramElementsCheckBox = new QCheckBox(Tr::tr("Diagram Elements"));
+    d->diagramElementsCheckBox->setMaximumHeight(0);
+    d->clearFilterButton = new QPushButton(Tr::tr("Clear"));
+    d->typeComboBox = new QComboBox;
+    d->stereotypesComboBox = new QComboBox;
+    d->stereotypesComboBox->setEditable(true);
+    d->nameLineEdit = new QLineEdit;
+    d->directionComboBox = new QComboBox;
+
+    const auto boldLabel = [] (const QString &title) -> QLabel * {
+        auto label = new QLabel(title);
+        QFont boldFont = label->font();
+        boldFont.setWeight(QFont::Bold);
+        label->setFont(boldFont);
+        return label;
+    };
+
+    const auto line = [] () -> QFrame * {
+        auto line = new QFrame;
+        line->setFrameShadow(QFrame::Plain);
+        line->setFrameShape(QFrame::HLine);
+        return line;
+    };
+
+    const int margin = 9;
+
+    using namespace Layouting;
+    Column {
+        Column {
+            Row {
+                boldLabel(Tr::tr("View")), st, d->resetViewButton
+            },
+            d->relationsCheckBox,
+            d->diagramElementsCheckBox,
+            customMargins(margin, 0, margin, 0),
+        },
+        Space(10),
+        line(),
+        Column {
+            Row {
+                boldLabel(Tr::tr("Filter")), st, d->clearFilterButton
+            },
+            Space(10),
+            Form {
+                Tr::tr("Type:"), d->typeComboBox, br,
+                Tr::tr("Stereotypes:"), d->stereotypesComboBox, br,
+                Tr::tr("Name:"), d->nameLineEdit, br,
+                Tr::tr("Direction:"), d->directionComboBox, br,
+            },
+            customMargins(margin, 0, margin, 0),
+        },
+        st,
+        line(),
+        customMargins(0, margin, 0, 0),
+    }.attachTo(this);
+
+    connect(d->resetViewButton, &QPushButton::clicked, this, &ModelTreeFilter::resetView);
+    connect(d->relationsCheckBox, &QCheckBox::clicked, this, &ModelTreeFilter::onViewChanged);
+    connect(d->diagramElementsCheckBox, &QCheckBox::clicked, this, &ModelTreeFilter::onViewChanged);
+    connect(d->clearFilterButton, &QPushButton::clicked, this, &ModelTreeFilter::clearFilter);
+    connect(d->typeComboBox, &QComboBox::currentIndexChanged, this, [this](int index) {
+        d->directionComboBox->setDisabled(index != (int) ModelTreeFilterData::Type::Dependency);
+    });
+    connect(d->typeComboBox, &QComboBox::currentIndexChanged, this, &ModelTreeFilter::onFilterChanged);
+    connect(d->stereotypesComboBox, &QComboBox::currentTextChanged, this, &ModelTreeFilter::onFilterChanged);
+    connect(d->nameLineEdit, &QLineEdit::textChanged, this, &ModelTreeFilter::onFilterChanged);
+    connect(d->directionComboBox, &QComboBox::currentTextChanged, this, &ModelTreeFilter::onFilterChanged);
+    setupFilter();
+    resetView();
+    clearFilter();
+}
+
+ModelTreeFilter::~ModelTreeFilter()
+{
+    delete d;
+}
+
+void ModelTreeFilter::setupFilter()
+{
+    QStringList types = {"Any", "Package", "Component", "Class", "Diagram", "Item",
+                         "Dependency", "Association", "Inheritance", "Connection"};
+    d->m_typeModel.setStringList(types);
+    d->typeComboBox->setModel(&d->m_typeModel);
+
+    QStringList stereotypes = { };
+    d->m_stereotypesModel.setStringList(stereotypes);
+    d->stereotypesComboBox->setModel(&d->m_stereotypesModel);
+
+    QStringList directions = {"Any", "Outgoing (->)", "Incoming (<-)", "Bidirectional (<->)"};
+    d->m_directionModel.setStringList(directions);
+    d->directionComboBox->setModel(&d->m_directionModel);
+}
+
+void ModelTreeFilter::resetView()
+{
+    d->relationsCheckBox->setChecked(true);
+    d->diagramElementsCheckBox->setChecked(false);
+    onViewChanged();
+}
+
+void ModelTreeFilter::clearFilter()
+{
+    d->typeComboBox->setCurrentIndex(0);
+    d->stereotypesComboBox->clearEditText();
+    d->nameLineEdit->clear();
+    d->directionComboBox->setCurrentIndex(0);
+    onFilterChanged();
+}
+
+void ModelTreeFilter::onViewChanged()
+{
+    ModelTreeViewData modelTreeViewData;
+    modelTreeViewData.setShowRelations(d->relationsCheckBox->isChecked());
+    modelTreeViewData.setShowDiagramElements(d->diagramElementsCheckBox->isChecked());
+    emit viewDataChanged(modelTreeViewData);
+}
+
+void ModelTreeFilter::onFilterChanged()
+{
+    ModelTreeFilterData modelTreeFilterData;
+    modelTreeFilterData.setType((ModelTreeFilterData::Type) d->typeComboBox->currentIndex());
+    modelTreeFilterData.setCustomId(QString());
+    modelTreeFilterData.setStereotypes(d->stereotypesComboBox->currentText().split(',', Qt::SkipEmptyParts));
+    modelTreeFilterData.setName(d->nameLineEdit->text().trimmed());
+    if (modelTreeFilterData.type() == ModelTreeFilterData::Type::Dependency)
+        modelTreeFilterData.setDirection((ModelTreeFilterData::Direction) d->directionComboBox->currentIndex());
+    else
+        modelTreeFilterData.setDirection(ModelTreeFilterData::Direction::Any);
+    emit filterDataChanged(modelTreeFilterData);
+}
+
+} // namespace qmt
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreefilter.h b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreefilter.h
new file mode 100644
index 00000000000..1de7237c6ee
--- /dev/null
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreefilter.h
@@ -0,0 +1,39 @@
+// Copyright (C) 2018 Jochen Becher
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "qmt/infrastructure/qmt_global.h"
+#include "qmt/model_ui/modeltreefilterdata.h"
+
+#include <QWidget>
+
+namespace qmt {
+
+class QMT_EXPORT ModelTreeFilter : public QWidget
+{
+    Q_OBJECT
+    class Private;
+
+public:
+    explicit ModelTreeFilter(QWidget *parent = nullptr);
+    ~ModelTreeFilter();
+
+signals:
+    void viewDataChanged(const ModelTreeViewData &modelTreeViewData);
+    void filterDataChanged(const ModelTreeFilterData &modelTreeFilterData);
+
+private:
+
+    void setupFilter();
+    void resetView();
+    void clearFilter();
+    void onViewChanged();
+    void onFilterChanged();
+
+private:
+    Private *d = nullptr;
+};
+
+
+} // namespace qmt
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp
index 68c22ce6dfa..e2006a37b5d 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp
@@ -71,6 +71,46 @@ void ModelTreeView::setElementTasks(IElementTasks *elementTasks)
     m_elementTasks = elementTasks;
 }
 
+static void StoreStatus(QTreeView *view, QSortFilterProxyModel *model, const QModelIndex &parent, QVector<QModelIndex> &expanded_items)
+{
+    for (int index = 0; index < model->rowCount(parent); ++index) {
+        auto proxy_index = model->index(index, 0, parent);
+        if (view->isExpanded(proxy_index)) {
+            auto source_index = model->mapToSource(proxy_index);
+            expanded_items.append(source_index);
+        }
+        StoreStatus(view, model, proxy_index, expanded_items);
+    }
+}
+
+static void ApplyStatus(QTreeView *view, QSortFilterProxyModel *model, QVector<QModelIndex> &expanded_items)
+{
+    for (auto source_index : expanded_items) {
+        auto proxy_index = model->mapFromSource(source_index);
+        view->setExpanded(proxy_index, true);
+    }
+}
+
+void ModelTreeView::setModelTreeViewData(const ModelTreeViewData &viewData)
+{
+    if (m_sortedTreeModel) {
+        QVector<QModelIndex> expanded_items;
+        StoreStatus(this, m_sortedTreeModel, QModelIndex(), expanded_items);
+        m_sortedTreeModel->setModelTreeViewData(viewData);
+        ApplyStatus(this, m_sortedTreeModel, expanded_items);
+    }
+}
+
+void ModelTreeView::setModelTreeFilterData(const ModelTreeFilterData &filterData)
+{
+    if (m_sortedTreeModel) {
+        QVector<QModelIndex> expanded_items;
+        StoreStatus(this, m_sortedTreeModel, QModelIndex(), expanded_items);
+        m_sortedTreeModel->setModelTreeFilterData(filterData);
+        ApplyStatus(this, m_sortedTreeModel, expanded_items);
+    }
+}
+
 QModelIndex ModelTreeView::mapToSourceModelIndex(const QModelIndex &index) const
 {
     return m_sortedTreeModel->mapToSource(index);
@@ -144,7 +184,7 @@ void ModelTreeView::dragMoveEvent(QDragMoveEvent *event)
 {
     QTreeView::dragMoveEvent(event);
     bool accept = false;
-    QModelIndex dropIndex = indexAt(event->pos());
+    QModelIndex dropIndex = indexAt(event->position().toPoint());
     QModelIndex dropSourceModelIndex = m_sortedTreeModel->mapToSource(dropIndex);
     if (dropSourceModelIndex.isValid()) {
         TreeModel *treeModel = m_sortedTreeModel->treeModel();
@@ -175,7 +215,7 @@ void ModelTreeView::dropEvent(QDropEvent *event)
     bool accept = false;
     event->setDropAction(Qt::MoveAction);
     if (event->mimeData()->hasFormat("text/model-elements")) {
-        QModelIndex dropIndex = indexAt(event->pos());
+        QModelIndex dropIndex = indexAt(event->position().toPoint());
         QModelIndex dropSourceModelIndex = m_sortedTreeModel->mapToSource(dropIndex);
         if (dropSourceModelIndex.isValid()) {
             TreeModel *treeModel = m_sortedTreeModel->treeModel();
@@ -237,6 +277,10 @@ void ModelTreeView::contextMenuEvent(QContextMenuEvent *event)
             menu.addAction(new ContextMenuAction(Tr::tr("Open Diagram"), "openDiagram", &menu));
             addSeparator = true;
         }
+        if (m_elementTasks->hasLinkedFile(melement)) {
+            menu.addAction(new ContextMenuAction(Tr::tr("Open Linked File"), "openLinkedFile", &menu));
+            addSeparator = true;
+        }
         if (melement->owner()) {
             if (addSeparator)
                 menu.addSeparator();
@@ -253,6 +297,8 @@ void ModelTreeView::contextMenuEvent(QContextMenuEvent *event)
                 m_elementTasks->openClassDefinition(melement);
             } else if (action->id() == "openDiagram") {
                 m_elementTasks->openDiagram(melement);
+            } else if (action->id() == "openLinkedFile") {
+                m_elementTasks->openLinkedFile(melement);
             } else if (action->id() == "delete") {
                 MSelection selection;
                 selection.append(melement->uid(), melement->owner()->uid());
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h
index 0c07cb0372a..e5537644a37 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h
@@ -5,6 +5,7 @@
 
 #include "qmt/infrastructure/qmt_global.h"
 #include "qmt/model_ui/modeltreeviewinterface.h"
+#include "qmt/model_ui/modeltreefilterdata.h"
 
 #include <QElapsedTimer>
 #include <QTreeView>
@@ -32,6 +33,9 @@ public:
     void setTreeModel(SortedTreeModel *model);
     void setElementTasks(IElementTasks *elementTasks);
 
+    void setModelTreeViewData(const ModelTreeViewData &viewData);
+    void setModelTreeFilterData(const ModelTreeFilterData &filterData);
+
     QModelIndex mapToSourceModelIndex(const QModelIndex &index) const;
     void selectFromSourceModelIndex(const QModelIndex &index);
 
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
index 969313ca33f..11df24188db 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
@@ -43,6 +43,7 @@
 #include "qmt/diagram_scene/items/stereotypedisplayvisitor.h"
 #include "qmt/stereotype/stereotypecontroller.h"
 #include "qmt/stereotype/customrelation.h"
+#include "qmt/style/relationvisuals.h"
 #include "qmt/style/stylecontroller.h"
 #include "qmt/style/style.h"
 #include "qmt/style/objectvisuals.h"
@@ -237,6 +238,61 @@ static DClass::TemplateDisplay translateIndexToTemplateDisplay(int index)
     return map[index];
 }
 
+static int translateRelationVisualPrimaryRoleToIndex(DRelation::VisualPrimaryRole visualRole)
+{
+    switch (visualRole) {
+    case DRelation::PrimaryRoleNormal:
+        return 0;
+    case DRelation::PrimaryRoleCustom1:
+        return 1;
+    case DRelation::PrimaryRoleCustom2:
+        return 2;
+    case DRelation::PrimaryRoleCustom3:
+        return 3;
+    case DRelation::PrimaryRoleCustom4:
+        return 4;
+    case DRelation::PrimaryRoleCustom5:
+        return 5;
+    }
+    return 0;
+}
+
+static DRelation::VisualPrimaryRole translateIndexToRelationVisualPrimaryRole(int index)
+{
+    static const DRelation::VisualPrimaryRole map[] = {
+        DRelation::PrimaryRoleNormal,
+        DRelation::PrimaryRoleCustom1, DRelation::PrimaryRoleCustom2, DRelation::PrimaryRoleCustom3,
+        DRelation::PrimaryRoleCustom4, DRelation::PrimaryRoleCustom5
+    };
+    QMT_ASSERT(index >= 0 && index <= 5, return DRelation::PrimaryRoleNormal);
+    return map[index];
+}
+
+static int translateRelationVisualSecondaryRoleToIndex(DRelation::VisualSecondaryRole visualRole)
+{
+    switch (visualRole) {
+    case DRelation::SecondaryRoleNone:
+        return 0;
+    case DRelation::SecondaryRoleWarning:
+        return 1;
+    case DRelation::SecondaryRoleError:
+        return 2;
+    case DRelation::SecondaryRoleSoften:
+        return 3;
+    }
+    return 0;
+}
+
+static DRelation::VisualSecondaryRole translateIndexToRelationVisualSecondaryRole(int index)
+{
+    static const DRelation::VisualSecondaryRole map[] = {
+        DRelation::SecondaryRoleNone,
+        DRelation::SecondaryRoleWarning, DRelation::SecondaryRoleError, DRelation::SecondaryRoleSoften
+    };
+    QMT_ASSERT(index >= 0 && index <= 5, return DRelation::SecondaryRoleNone);
+    return map[index];
+}
+
 static int translateAnnotationVisualRoleToIndex(DAnnotation::VisualRole visualRole)
 {
     switch (visualRole) {
@@ -398,6 +454,7 @@ void PropertiesView::MView::visitMPackage(const MPackage *package)
     else
         setTitle<MPackage>(m_modelElements, Tr::tr("Package"), Tr::tr("Packages"));
     visitMObject(package);
+    visitMObjectBehind(package);
 }
 
 void PropertiesView::MView::visitMClass(const MClass *klass)
@@ -472,12 +529,14 @@ void PropertiesView::MView::visitMClass(const MClass *klass)
     }
     if (m_classMembersEdit->isEnabled() != isSingleSelection)
         m_classMembersEdit->setEnabled(isSingleSelection);
+    visitMObjectBehind(klass);
 }
 
 void PropertiesView::MView::visitMComponent(const MComponent *component)
 {
     setTitle<MComponent>(m_modelElements, Tr::tr("Component"), Tr::tr("Components"));
     visitMObject(component);
+    visitMObjectBehind(component);
 }
 
 void PropertiesView::MView::visitMDiagram(const MDiagram *diagram)
@@ -497,6 +556,7 @@ void PropertiesView::MView::visitMCanvasDiagram(const MCanvasDiagram *diagram)
 {
     setTitle<MCanvasDiagram>(m_modelElements, Tr::tr("Canvas Diagram"), Tr::tr("Canvas Diagrams"));
     visitMDiagram(diagram);
+    visitMDiagramBehind(diagram);
 }
 
 void PropertiesView::MView::visitMItem(const MItem *item)
@@ -521,6 +581,7 @@ void PropertiesView::MView::visitMItem(const MItem *item)
         if (m_itemVarietyEdit->isEnabled() != isSingleSelection)
             m_itemVarietyEdit->setEnabled(isSingleSelection);
     }
+    visitMObjectBehind(item);
 }
 
 void PropertiesView::MView::visitMRelation(const MRelation *relation)
@@ -850,6 +911,7 @@ void PropertiesView::MView::visitDElement(const DElement *element)
 void PropertiesView::MView::visitDObject(const DObject *object)
 {
     visitDElement(object);
+    visitDObjectBefore(object);
 #ifdef SHOW_DEBUG_PROPERTIES
     if (!m_posRectLabel) {
         m_posRectLabel = new QLabel(m_topWidget);
@@ -1057,6 +1119,52 @@ void PropertiesView::MView::visitDItem(const DItem *item)
 void PropertiesView::MView::visitDRelation(const DRelation *relation)
 {
     visitDElement(relation);
+    if (!m_relationVisualPrimaryRoleSelector) {
+        m_relationVisualPrimaryRoleSelector = new PaletteBox(m_topWidget);
+        setRelationPrimaryRolePalette(m_styleElementType, DRelation::PrimaryRoleNormal);
+        setRelationPrimaryRolePalette(m_styleElementType, DRelation::PrimaryRoleCustom1);
+        setRelationPrimaryRolePalette(m_styleElementType, DRelation::PrimaryRoleCustom2);
+        setRelationPrimaryRolePalette(m_styleElementType, DRelation::PrimaryRoleCustom3);
+        setRelationPrimaryRolePalette(m_styleElementType, DRelation::PrimaryRoleCustom4);
+        setRelationPrimaryRolePalette(m_styleElementType, DRelation::PrimaryRoleCustom5);
+        addRow(Tr::tr("Color:"), m_relationVisualPrimaryRoleSelector, "color");
+        connect(m_relationVisualPrimaryRoleSelector, &PaletteBox::activated,
+                this, &PropertiesView::MView::onRelationVisualPrimaryRoleChanged);
+    }
+    if (!m_relationVisualPrimaryRoleSelector->hasFocus()) {
+        DRelation::VisualPrimaryRole visualPrimaryRole;
+        if (haveSameValue(m_diagramElements, &DRelation::visualPrimaryRole, &visualPrimaryRole))
+            m_relationVisualPrimaryRoleSelector->setCurrentIndex(translateRelationVisualPrimaryRoleToIndex(visualPrimaryRole));
+        else
+            m_relationVisualPrimaryRoleSelector->setCurrentIndex(-1);
+    }
+    if (!m_relationVisualSecondaryRoleSelector) {
+        m_relationVisualSecondaryRoleSelector = new QComboBox(m_topWidget);
+        m_relationVisualSecondaryRoleSelector->addItems({ Tr::tr("Normal"), Tr::tr("Warning"), Tr::tr("Error"), Tr::tr("Soften") });
+        addRow(Tr::tr("Role:"), m_relationVisualSecondaryRoleSelector, "role");
+        connect(m_relationVisualSecondaryRoleSelector, QOverload<int>::of(&QComboBox::activated),
+                this, &PropertiesView::MView::onRelationVisualSecondaryRoleChanged);
+    }
+    if (!m_relationVisualSecondaryRoleSelector->hasFocus()) {
+        DRelation::VisualSecondaryRole visualSecondaryRole;
+        if (haveSameValue(m_diagramElements, &DRelation::visualSecondaryRole, &visualSecondaryRole))
+            m_relationVisualSecondaryRoleSelector->setCurrentIndex(translateRelationVisualSecondaryRoleToIndex(visualSecondaryRole));
+        else
+            m_relationVisualSecondaryRoleSelector->setCurrentIndex(-1);
+    }
+    if (!m_relationVisualEmphasizedCheckbox) {
+        m_relationVisualEmphasizedCheckbox = new QCheckBox(Tr::tr("Emphasized"), m_topWidget);
+        addRow(QString(), m_relationVisualEmphasizedCheckbox, "emphasized");
+        connect(m_relationVisualEmphasizedCheckbox, &QAbstractButton::clicked,
+                this, &PropertiesView::MView::onRelationVisualEmphasizedChanged);
+    }
+    if (!m_relationVisualEmphasizedCheckbox->hasFocus()) {
+        bool emphasized;
+        if (haveSameValue(m_diagramElements, &DRelation::isVisualEmphasized, &emphasized))
+            m_relationVisualEmphasizedCheckbox->setChecked(emphasized);
+        else
+            m_relationVisualEmphasizedCheckbox->setChecked(false);
+    }
 #ifdef SHOW_DEBUG_PROPERTIES
     if (!m_pointsLabel) {
         m_pointsLabel = new QLabel(m_topWidget);
@@ -1145,6 +1253,26 @@ void PropertiesView::MView::visitDSwimlane(const DSwimlane *swimlane)
     visitDElement(swimlane);
 }
 
+void PropertiesView::MView::visitMElementBehind(const MElement *element)
+{
+    Q_UNUSED(element)
+}
+
+void PropertiesView::MView::visitMObjectBehind(const MObject *object)
+{
+    visitMElementBehind(object);
+}
+
+void PropertiesView::MView::visitMDiagramBehind(const MDiagram *diagram)
+{
+    visitMObjectBehind(diagram);
+}
+
+void PropertiesView::MView::visitDObjectBefore(const DObject *object)
+{
+    Q_UNUSED(object);
+}
+
 void PropertiesView::MView::onStereotypesChanged(const QString &stereotypes)
 {
     QList<QString> set = m_stereotypesController->fromString(stereotypes);
@@ -1392,7 +1520,42 @@ void PropertiesView::MView::onAnnotationVisualRoleChanged(int visualRoleIndex)
 {
     DAnnotation::VisualRole visualRole = translateIndexToAnnotationVisualRole((visualRoleIndex));
     assignModelElement<DAnnotation, DAnnotation::VisualRole>(
-                m_diagramElements, SelectionMulti, visualRole, &DAnnotation::visualRole, &DAnnotation::setVisualRole);
+        m_diagramElements, SelectionMulti, visualRole, &DAnnotation::visualRole, &DAnnotation::setVisualRole);
+}
+
+
+void PropertiesView::MView::onRelationVisualPrimaryRoleChanged(int visualRoleIndex)
+{
+    DRelation::VisualPrimaryRole visualRole = translateIndexToRelationVisualPrimaryRole(visualRoleIndex);
+    assignModelElement<DRelation, DRelation::VisualPrimaryRole>(
+        m_diagramElements, SelectionMulti, visualRole,
+        &DRelation::visualPrimaryRole, &DRelation::setVisualPrimaryRole);
+}
+
+void PropertiesView::MView::onRelationVisualSecondaryRoleChanged(int visualRoleIndex)
+{
+    DRelation::VisualSecondaryRole visualRole = translateIndexToRelationVisualSecondaryRole(visualRoleIndex);
+    assignModelElement<DRelation, DRelation::VisualSecondaryRole>(
+        m_diagramElements, SelectionMulti, visualRole,
+        &DRelation::visualSecondaryRole, &DRelation::setVisualSecondaryRole);
+}
+
+void PropertiesView::MView::onRelationVisualEmphasizedChanged(bool visualEmphasized)
+{
+    assignModelElement<DRelation, bool>(m_diagramElements, SelectionMulti, visualEmphasized,
+                                      &DRelation::isVisualEmphasized, &DRelation::setVisualEmphasized);
+}
+
+void PropertiesView::MView::onRelationColorChanged(const QColor &color)
+{
+    assignModelElement<DRelation, QColor>(m_diagramElements, SelectionMulti, color,
+                                          &DRelation::color, &DRelation::setColor);
+}
+
+void PropertiesView::MView::onRelationThicknessChanged(qreal thickness)
+{
+    assignModelElement<DRelation, qreal>(m_diagramElements, SelectionMulti, thickness,
+                                         &DRelation::thickness, &DRelation::setThickness);
 }
 
 void PropertiesView::MView::prepare()
@@ -1553,7 +1716,8 @@ void PropertiesView::MView::setPrimaryRolePalette(StyleEngine::ElementType eleme
                                                   DObject::VisualPrimaryRole visualPrimaryRole, const QColor &baseColor)
 {
     int index = translateVisualPrimaryRoleToIndex(visualPrimaryRole);
-    const Style *style = m_propertiesView->styleController()->adaptObjectStyle(elementType, ObjectVisuals(visualPrimaryRole, DObject::SecondaryRoleNone, false, baseColor, 0));
+    const Style *style = m_propertiesView->styleController()->adaptObjectStyle(
+        elementType, ObjectVisuals(visualPrimaryRole, DObject::SecondaryRoleNone, false, baseColor, 0));
     m_visualPrimaryRoleSelector->setBrush(index, style->fillBrush());
     m_visualPrimaryRoleSelector->setLinePen(index, style->linePen());
 }
@@ -1595,112 +1759,15 @@ QString PropertiesView::MView::formatTemplateParameters(const QList<QString> &te
     return templateParamters;
 }
 
-template<class T, class V>
-QList<T *> PropertiesView::MView::filter(const QList<V *> &elements)
+void PropertiesView::MView::setRelationPrimaryRolePalette(StyleEngine::ElementType elementType,
+                                                          DRelation::VisualPrimaryRole visualPrimaryRole)
 {
-    QList<T *> filtered;
-    for (V *element : elements) {
-        auto t = dynamic_cast<T *>(element);
-        if (t)
-            filtered.append(t);
-    }
-    return filtered;
-}
-
-template<class T, class V, class BASE>
-bool PropertiesView::MView::haveSameValue(const QList<BASE *> &baseElements, V (T::*getter)() const, V *value)
-{
-    const QList<T *> elements = filter<T>(baseElements);
-    QMT_CHECK(!elements.isEmpty());
-    V candidate = V(); // avoid warning of reading uninitialized variable
-    bool haveCandidate = false;
-    for (T *element : elements) {
-        if (!haveCandidate) {
-            candidate = ((*element).*getter)();
-            haveCandidate = true;
-        } else {
-            if (candidate != ((*element).*getter)())
-                return false;
-        }
-    }
-    QMT_CHECK(haveCandidate);
-    if (!haveCandidate)
-        return false;
-    if (value)
-        *value = candidate;
-    return true;
-}
-
-template<class T, class V, class BASE>
-void PropertiesView::MView::assignModelElement(const QList<BASE *> &baseElements, SelectionType selectionType,
-                                               const V &value, V (T::*getter)() const, void (T::*setter)(const V &))
-{
-    const QList<T *> elements = filter<T>(baseElements);
-    if ((selectionType == SelectionSingle && elements.size() == 1) || selectionType == SelectionMulti) {
-        for (T *element : elements) {
-            if (value != ((*element).*getter)()) {
-                m_propertiesView->beginUpdate(element);
-                ((*element).*setter)(value);
-                m_propertiesView->endUpdate(element, false);
-            }
-        }
-    }
-}
-
-template<class T, class V, class BASE>
-void PropertiesView::MView::assignModelElement(const QList<BASE *> &baseElements, SelectionType selectionType,
-                                               const V &value, V (T::*getter)() const, void (T::*setter)(V))
-{
-    const QList<T *> elements = filter<T>(baseElements);
-    if ((selectionType == SelectionSingle && elements.size() == 1) || selectionType == SelectionMulti) {
-        for (T *element : elements) {
-            if (value != ((*element).*getter)()) {
-                m_propertiesView->beginUpdate(element);
-                ((*element).*setter)(value);
-                m_propertiesView->endUpdate(element, false);
-            }
-        }
-    }
-}
-
-template<class T, class E, class V, class BASE>
-void PropertiesView::MView::assignEmbeddedModelElement(const QList<BASE *> &baseElements, SelectionType selectionType,
-                                                       const V &value, E (T::*getter)() const,
-                                                       void (T::*setter)(const E &),
-                                                       V (E::*vGetter)() const, void (E::*vSetter)(const V &))
-{
-    const QList<T *> elements = filter<T>(baseElements);
-    if ((selectionType == SelectionSingle && elements.size() == 1) || selectionType == SelectionMulti) {
-        for (T *element : elements) {
-            E embedded = ((*element).*getter)();
-            if (value != (embedded.*vGetter)()) {
-                m_propertiesView->beginUpdate(element);
-                (embedded.*vSetter)(value);
-                ((*element).*setter)(embedded);
-                m_propertiesView->endUpdate(element, false);
-            }
-        }
-    }
-}
-
-template<class T, class E, class V, class BASE>
-void PropertiesView::MView::assignEmbeddedModelElement(const QList<BASE *> &baseElements, SelectionType selectionType,
-                                                       const V &value, E (T::*getter)() const,
-                                                       void (T::*setter)(const E &),
-                                                       V (E::*vGetter)() const, void (E::*vSetter)(V))
-{
-    const QList<T *> elements = filter<T>(baseElements);
-    if ((selectionType == SelectionSingle && elements.size() == 1) || selectionType == SelectionMulti) {
-        for (T *element : elements) {
-            E embedded = ((*element).*getter)();
-            if (value != (embedded.*vGetter)()) {
-                m_propertiesView->beginUpdate(element);
-                (embedded.*vSetter)(value);
-                ((*element).*setter)(embedded);
-                m_propertiesView->endUpdate(element, false);
-            }
-        }
-    }
+    int index = translateRelationVisualPrimaryRoleToIndex(visualPrimaryRole);
+    const Style *style = m_propertiesView->styleController()->adaptRelationStyle(
+        elementType, RelationVisuals(DObject::PrimaryRoleNormal, visualPrimaryRole,
+                                     DRelation::SecondaryRoleNone, false));
+    m_relationVisualPrimaryRoleSelector->setBrush(index, style->fillBrush());
+    m_relationVisualPrimaryRoleSelector->setLinePen(index, style->linePen());
 }
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h
index 4762803a209..8fa9f0d1374 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h
@@ -8,6 +8,8 @@
 #include "qmt/model/mconstvisitor.h"
 #include "qmt/diagram/dconstvisitor.h"
 #include "qmt/diagram/dobject.h"
+#include "qmt/diagram/drelation.h"
+#include "qmt/infrastructure/qmtassert.h"
 #include "qmt/stereotype/stereotypeicon.h"
 #include "qmt/style/styleengine.h"
 
@@ -76,6 +78,11 @@ public:
     void edit();
 
 protected:
+    virtual void visitMElementBehind(const MElement *element);
+    virtual void visitMObjectBehind(const MObject *object);
+    virtual void visitMDiagramBehind(const MDiagram *diagram);
+    virtual void visitDObjectBefore(const DObject *object);
+
     void onStereotypesChanged(const QString &stereotypes);
     void onObjectNameChanged(const QString &name);
     void onNamespaceChanged(const QString &umlNamespace);
@@ -110,6 +117,11 @@ protected:
     void onPlainShapeChanged(bool plainShape);
     void onItemShapeChanged(const QString &shape);
     void onAutoWidthChanged(bool autoWidthed);
+    void onRelationVisualPrimaryRoleChanged(int visualRoleIndex);
+    void onRelationVisualSecondaryRoleChanged(int visualRoleIndex);
+    void onRelationVisualEmphasizedChanged(bool visualEmphasized);
+    void onRelationColorChanged(const QColor &color);
+    void onRelationThicknessChanged(qreal thickness);
     void onAnnotationVisualRoleChanged(int visualRoleIndex);
 
     void prepare();
@@ -139,6 +151,9 @@ protected:
     QList<QString> splitTemplateParameters(const QString &templateParameters);
     QString formatTemplateParameters(const QList<QString> &templateParametersList);
 
+    void setRelationPrimaryRolePalette(StyleEngine::ElementType elementType,
+                                       DRelation::VisualPrimaryRole visualPrimaryRole);
+
     enum SelectionType {
         SelectionSingle,
         SelectionMulti
@@ -149,6 +164,9 @@ protected:
     template<class T, class V, class BASE>
     bool haveSameValue(const QList<BASE *> &baseElements, V (T::*getter)() const, V *value);
     template<class T, class V, class BASE>
+    bool isValueChanged(const QList<BASE *> &baseElements, SelectionType selectionType,
+                        const V &value, V (T::*getter)() const);
+    template<class T, class V, class BASE>
     void assignModelElement(const QList<BASE *> &baseElements, SelectionType selectionType,
                             const V &value, V (T::*getter)() const, void (T::*setter)(const V &));
     template<class T, class V, class BASE>
@@ -232,7 +250,132 @@ protected:
     QCheckBox *m_annotationAutoWidthCheckbox = nullptr;
     QComboBox *m_annotationVisualRoleSelector = nullptr;
     // DRelation
+    PaletteBox *m_relationVisualPrimaryRoleSelector = nullptr;
+    QComboBox *m_relationVisualSecondaryRoleSelector = nullptr;
+    QCheckBox *m_relationVisualEmphasizedCheckbox = nullptr;
     QLabel *m_pointsLabel = nullptr;
 };
 
+template<class T, class V>
+QList<T *> PropertiesView::MView::filter(const QList<V *> &elements)
+{
+    QList<T *> filtered;
+    for (auto *element : elements) {
+        auto t = dynamic_cast<T *>(element);
+        if (t)
+            filtered.append(t);
+    }
+    return filtered;
+}
+
+template<class T, class V, class BASE>
+inline bool PropertiesView::MView::haveSameValue(const QList<BASE *> &baseElements, V (T::*getter)() const, V *value)
+{
+    QList<T *> elements = filter<T>(baseElements);
+    QMT_CHECK(!elements.isEmpty());
+    V candidate = V(); // avoid warning of reading uninitialized variable
+    bool haveCandidate = false;
+    for (const auto *element : elements) {
+        if (!haveCandidate) {
+            candidate = ((*element).*getter)();
+            haveCandidate = true;
+        } else {
+            if (candidate != ((*element).*getter)())
+                return false;
+        }
+    }
+    QMT_CHECK(haveCandidate);
+    if (!haveCandidate)
+        return false;
+    if (value)
+        *value = candidate;
+    return true;
+}
+
+template<class T, class V, class BASE>
+inline bool PropertiesView::MView::isValueChanged(const QList<BASE *> &baseElements, SelectionType selectionType,
+                                                  const V &value, V (T::*getter)() const)
+{
+    QList<T *> elements = filter<T>(baseElements);
+    if ((selectionType == SelectionSingle && elements.size() == 1) || selectionType == SelectionMulti) {
+        for (const auto *element : elements) {
+            if (value != ((*element).*getter)())
+                return true;
+        }
+    }
+    return false;
+}
+
+template<class T, class V, class BASE>
+inline void PropertiesView::MView::assignModelElement(const QList<BASE *> &baseElements, SelectionType selectionType,
+                                                      const V &value, V (T::*getter)() const, void (T::*setter)(const V &))
+{
+    QList<T *> elements = filter<T>(baseElements);
+    if ((selectionType == SelectionSingle && elements.size() == 1) || selectionType == SelectionMulti) {
+        for (auto *element : elements) {
+            if (value != ((*element).*getter)()) {
+                m_propertiesView->beginUpdate(element);
+                ((*element).*setter)(value);
+                m_propertiesView->endUpdate(element, false);
+            }
+        }
+    }
+}
+
+template<class T, class V, class BASE>
+inline void PropertiesView::MView::assignModelElement(const QList<BASE *> &baseElements, SelectionType selectionType,
+                                                      const V &value, V (T::*getter)() const, void (T::*setter)(V))
+{
+    QList<T *> elements = filter<T>(baseElements);
+    if ((selectionType == SelectionSingle && elements.size() == 1) || selectionType == SelectionMulti) {
+        for (auto *element : elements) {
+            if (value != ((*element).*getter)()) {
+                m_propertiesView->beginUpdate(element);
+                ((*element).*setter)(value);
+                m_propertiesView->endUpdate(element, false);
+            }
+        }
+    }
+}
+
+template<class T, class E, class V, class BASE>
+inline void PropertiesView::MView::assignEmbeddedModelElement(const QList<BASE *> &baseElements, SelectionType selectionType,
+                                                              const V &value, E (T::*getter)() const,
+                                                              void (T::*setter)(const E &),
+                                                              V (E::*vGetter)() const, void (E::*vSetter)(const V &))
+{
+    QList<T *> elements = filter<T>(baseElements);
+    if ((selectionType == SelectionSingle && elements.size() == 1) || selectionType == SelectionMulti) {
+        for (auto *element : elements) {
+            E embedded = ((*element).*getter)();
+            if (value != (embedded.*vGetter)()) {
+                m_propertiesView->beginUpdate(element);
+                (embedded.*vSetter)(value);
+                ((*element).*setter)(embedded);
+                m_propertiesView->endUpdate(element, false);
+            }
+        }
+    }
+}
+
+template<class T, class E, class V, class BASE>
+inline void PropertiesView::MView::assignEmbeddedModelElement(const QList<BASE *> &baseElements, SelectionType selectionType,
+                                                              const V &value, E (T::*getter)() const,
+                                                              void (T::*setter)(const E &),
+                                                              V (E::*vGetter)() const, void (E::*vSetter)(V))
+{
+    QList<T *> elements = filter<T>(baseElements);
+    if ((selectionType == SelectionSingle && elements.size() == 1) || selectionType == SelectionMulti) {
+        for (auto *element : elements) {
+            E embedded = ((*element).*getter)();
+            if (value != (embedded.*vGetter)()) {
+                m_propertiesView->beginUpdate(element);
+                (embedded.*vSetter)(value);
+                ((*element).*setter)(embedded);
+                m_propertiesView->endUpdate(element, false);
+            }
+        }
+    }
+}
+
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/project/project.cpp b/src/libs/modelinglib/qmt/project/project.cpp
index 098db684ef9..2e08adc6dfe 100644
--- a/src/libs/modelinglib/qmt/project/project.cpp
+++ b/src/libs/modelinglib/qmt/project/project.cpp
@@ -3,6 +3,8 @@
 
 #include "project.h"
 
+using Utils::FilePath;
+
 namespace qmt {
 
 Project::Project()
@@ -23,7 +25,7 @@ bool Project::hasFileName() const
     return !m_fileName.isEmpty();
 }
 
-void Project::setFileName(const QString &fileName)
+void Project::setFileName(const FilePath &fileName)
 {
     m_fileName = fileName;
 }
@@ -33,7 +35,7 @@ void Project::setRootPackage(MPackage *rootPackage)
     m_rootPackage = rootPackage;
 }
 
-void Project::setConfigPath(const QString &configPath)
+void Project::setConfigPath(const FilePath &configPath)
 {
     m_configPath = configPath;
 }
diff --git a/src/libs/modelinglib/qmt/project/project.h b/src/libs/modelinglib/qmt/project/project.h
index fab6bb42284..556471e9eda 100644
--- a/src/libs/modelinglib/qmt/project/project.h
+++ b/src/libs/modelinglib/qmt/project/project.h
@@ -5,6 +5,8 @@
 
 #include "qmt/infrastructure/uid.h"
 
+#include <utils/filepath.h>
+
 #include <QString>
 
 namespace qmt {
@@ -20,18 +22,18 @@ public:
     Uid uid() const { return m_uid; }
     void setUid(const Uid &uid);
     bool hasFileName() const;
-    QString fileName() const { return m_fileName; }
-    void setFileName(const QString &fileName);
+    Utils::FilePath fileName() const { return m_fileName; }
+    void setFileName(const Utils::FilePath &fileName);
     MPackage *rootPackage() const { return m_rootPackage; }
     void setRootPackage(MPackage *rootPackage);
-    QString configPath() const { return m_configPath; }
-    void setConfigPath(const QString &configPath);
+    Utils::FilePath configPath() const { return m_configPath; }
+    void setConfigPath(const Utils::FilePath &configPath);
 
 private:
     Uid m_uid;
-    QString m_fileName;
+    Utils::FilePath m_fileName;
     MPackage *m_rootPackage = nullptr;
-    QString m_configPath;
+    Utils::FilePath m_configPath;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/project_controller/projectcontroller.cpp b/src/libs/modelinglib/qmt/project_controller/projectcontroller.cpp
index f7a7e6d2c9e..47eb01138eb 100644
--- a/src/libs/modelinglib/qmt/project_controller/projectcontroller.cpp
+++ b/src/libs/modelinglib/qmt/project_controller/projectcontroller.cpp
@@ -10,6 +10,8 @@
 
 #include "../../modelinglibtr.h"
 
+using Utils::FilePath;
+
 namespace qmt {
 
 NoFileNameException::NoFileNameException()
@@ -31,7 +33,7 @@ ProjectController::~ProjectController()
 {
 }
 
-void ProjectController::newProject(const QString &fileName)
+void ProjectController::newProject(const FilePath &fileName)
 {
     m_project.reset(new Project());
     auto rootPackage = new MPackage();
@@ -43,7 +45,7 @@ void ProjectController::newProject(const QString &fileName)
     emit changed();
 }
 
-void ProjectController::setFileName(const QString &fileName)
+void ProjectController::setFileName(const FilePath &fileName)
 {
     if (fileName != m_project->fileName()) {
         m_project->setFileName(fileName);
@@ -82,7 +84,7 @@ void ProjectController::save()
     emit changed();
 }
 
-void ProjectController::saveAs(const QString &fileName)
+void ProjectController::saveAs(const FilePath &fileName)
 {
     setFileName(fileName);
     save();
diff --git a/src/libs/modelinglib/qmt/project_controller/projectcontroller.h b/src/libs/modelinglib/qmt/project_controller/projectcontroller.h
index 1992c72448f..09cf65074a0 100644
--- a/src/libs/modelinglib/qmt/project_controller/projectcontroller.h
+++ b/src/libs/modelinglib/qmt/project_controller/projectcontroller.h
@@ -6,6 +6,8 @@
 #include "qmt/infrastructure/exceptions.h"
 #include "qmt/infrastructure/qmt_global.h"
 
+#include <utils/filepath.h>
+
 #include <QObject>
 #include <QString>
 
@@ -35,19 +37,19 @@ public:
 
 signals:
     void changed();
-    void fileNameChanged(const QString &fileName);
+    void fileNameChanged(const Utils::FilePath &fileName);
 
 public:
     Project *project() const { return m_project.data(); }
     bool isModified() const { return m_isModified; }
 
-    void newProject(const QString &fileName);
-    void setFileName(const QString &fileName);
+    void newProject(const Utils::FilePath &fileName);
+    void setFileName(const Utils::FilePath &fileName);
     void setModified();
 
     void load();
     void save();
-    void saveAs(const QString &fileName);
+    void saveAs(const Utils::FilePath &fileName);
 
 private:
     QScopedPointer<Project> m_project;
diff --git a/src/libs/modelinglib/qmt/serializer/diagramserializer.cpp b/src/libs/modelinglib/qmt/serializer/diagramserializer.cpp
index 5170d4fdc7e..2d68862c32f 100644
--- a/src/libs/modelinglib/qmt/serializer/diagramserializer.cpp
+++ b/src/libs/modelinglib/qmt/serializer/diagramserializer.cpp
@@ -29,10 +29,35 @@
 #include "qark/qxmlinarchive.h"
 #include "qark/serialize.h"
 
+#include <QBuffer>
+
 using namespace qmt;
 
 namespace qark {
 
+template<class Archive>
+inline void save(Archive &archive, const QImage &image)
+{
+    QByteArray a;
+    QBuffer buffer(&a);
+    buffer.open(QIODevice::WriteOnly);
+    image.save(&buffer, "PNG");
+    // TODO add write(const QByteArray &)
+    archive.write(QString::fromLatin1(a.toBase64()));
+}
+
+template<class Archive>
+inline void load(Archive &archive, QImage &image)
+{
+    QString s;
+    // TODO add read(QByteArray &)
+    archive.read(&s);
+    QByteArray a = QByteArray::fromBase64(s.toLatin1());
+    QBuffer buffer(&a);
+    buffer.open(QIODevice::ReadOnly);
+    image.load(&buffer, "PNG");
+}
+
 // DElement
 
 QARK_REGISTER_TYPE_NAME(DElement, "DElement")
@@ -102,7 +127,10 @@ inline void Access<Archive, DObject>::serialize(Archive &archive, DObject &objec
             || attr("visual-role", object, &visualRole, &setVisualRole)
             || attr("visual-role2", object, &DObject::visualSecondaryRole, &DObject::setVisualSecondaryRole)
             || attr("visual-emphasized", object, &DObject::isVisualEmphasized, &DObject::setVisualEmphasized)
+            || attr("linkedfile", object, &DObject::hasLinkedFile, &DObject::setLinkedFile)
             || attr("stereotype-display", object, &DObject::stereotypeDisplay, &DObject::setStereotypeDisplay)
+            || attr("image-path", object, &DObject::imagePath, &DObject::setImagePath)
+            || attr("image", object, &DObject::image, &DObject::setImage)
             // depth is not persistent
             || end;
 }
@@ -220,6 +248,9 @@ inline void Access<Archive, DRelation>::serialize(Archive &archive, DRelation &r
             || attr("b", relation, &DRelation::endBUid, &DRelation::setEndBUid)
             || attr("name", relation, &DRelation::name, &DRelation::setName)
             || attr("points", relation, &DRelation::intermediatePoints, &DRelation::setIntermediatePoints)
+            || attr("visualPrimaryRole", relation, &DRelation::visualPrimaryRole, &DRelation::setVisualPrimaryRole)
+            || attr("visualSecondaryRole", relation, &DRelation::visualSecondaryRole, &DRelation::setVisualSecondaryRole)
+            || attr("thickness", relation, &DRelation::thickness, &DRelation::setThickness)
             || end;
 }
 
diff --git a/src/libs/modelinglib/qmt/serializer/diagramserializer.h b/src/libs/modelinglib/qmt/serializer/diagramserializer.h
index a571ff94ef2..aa5d1adb526 100644
--- a/src/libs/modelinglib/qmt/serializer/diagramserializer.h
+++ b/src/libs/modelinglib/qmt/serializer/diagramserializer.h
@@ -6,6 +6,7 @@
 #include "qmt/diagram/dannotation.h"
 #include "qmt/diagram/dobject.h"
 #include "qmt/diagram/dclass.h"
+#include "qmt/diagram/drelation.h"
 
 #include "qark/serialize_enum.h"
 
@@ -16,5 +17,7 @@ QARK_SERIALIZE_ENUM(qmt::DObject::VisualSecondaryRole)
 QARK_SERIALIZE_ENUM(qmt::DObject::StereotypeDisplay)
 QARK_SERIALIZE_ENUM(qmt::DClass::TemplateDisplay)
 QARK_SERIALIZE_ENUM(qmt::DAnnotation::VisualRole)
+QARK_SERIALIZE_ENUM(qmt::DRelation::VisualPrimaryRole)
+QARK_SERIALIZE_ENUM(qmt::DRelation::VisualSecondaryRole)
 
 } // namespace qark
diff --git a/src/libs/modelinglib/qmt/serializer/infrastructureserializer.h b/src/libs/modelinglib/qmt/serializer/infrastructureserializer.h
index e67e5af4eb5..59103b3fa92 100644
--- a/src/libs/modelinglib/qmt/serializer/infrastructureserializer.h
+++ b/src/libs/modelinglib/qmt/serializer/infrastructureserializer.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <utils/filepath.h>
+
 #include "qmt/infrastructure/handle.h"
 #include "qmt/infrastructure/handles.h"
 #include "qmt/infrastructure/uid.h"
@@ -51,4 +53,20 @@ inline void serialize(Archive &archive, qmt::Handles<T> &handles)
             || end;
 }
 
+// Utils::FilePath
+
+template<class Archive>
+inline void save(Archive &archive, const Utils::FilePath &filePath)
+{
+    archive.write(filePath.toFSPathString());
+}
+
+template<class Archive>
+inline void load(Archive &archive, Utils::FilePath &filePath)
+{
+    QString s;
+    archive.read(&s);
+    filePath = Utils::FilePath::fromUserInput(s);
+}
+
 } // namespace qark
diff --git a/src/libs/modelinglib/qmt/serializer/modelserializer.cpp b/src/libs/modelinglib/qmt/serializer/modelserializer.cpp
index 115eba08d0e..935a825ab27 100644
--- a/src/libs/modelinglib/qmt/serializer/modelserializer.cpp
+++ b/src/libs/modelinglib/qmt/serializer/modelserializer.cpp
@@ -95,6 +95,7 @@ inline void Access<Archive, MObject>::serialize(Archive &archive, MObject &objec
     archive || tag(object)
             || base<MElement>(object)
             || attr("name", object, &MObject::name, &MObject::setName)
+            || attr("linkedfilename", object, &MObject::linkedFileName, &MObject::setLinkedFileName)
             || attr("children", object, &MObject::children, &MObject::setChildren)
             || attr("relations", object, &MObject::relations, &MObject::setRelations)
             || end;
diff --git a/src/libs/modelinglib/qmt/serializer/projectserializer.cpp b/src/libs/modelinglib/qmt/serializer/projectserializer.cpp
index 77f231b358c..832d47309b6 100644
--- a/src/libs/modelinglib/qmt/serializer/projectserializer.cpp
+++ b/src/libs/modelinglib/qmt/serializer/projectserializer.cpp
@@ -20,6 +20,8 @@
 
 #include <QFile>
 
+using Utils::FilePath;
+
 namespace qark {
 
 using namespace qmt;
@@ -48,11 +50,11 @@ ProjectSerializer::~ProjectSerializer()
 {
 }
 
-void ProjectSerializer::save(const QString &fileName, const Project *project)
+void ProjectSerializer::save(const FilePath &fileName, const Project *project)
 {
     QMT_ASSERT(project, return);
 
-    QFile file(fileName);
+    QFile file(fileName.toFSPathString());
     if (!file.open(QIODevice::WriteOnly))
         throw FileCreationException(fileName);
 
@@ -84,11 +86,11 @@ QByteArray ProjectSerializer::save(const Project *project)
     return buffer;
 }
 
-void ProjectSerializer::load(const QString &fileName, Project *project)
+void ProjectSerializer::load(const FilePath &fileName, Project *project)
 {
     QMT_ASSERT(project, return);
 
-    QFile file(fileName);
+    QFile file(fileName.toFSPathString());
     if (!file.open(QIODevice::ReadOnly))
         throw FileNotFoundException(fileName);
 
diff --git a/src/libs/modelinglib/qmt/serializer/projectserializer.h b/src/libs/modelinglib/qmt/serializer/projectserializer.h
index c6dd74bcd87..bafa4070714 100644
--- a/src/libs/modelinglib/qmt/serializer/projectserializer.h
+++ b/src/libs/modelinglib/qmt/serializer/projectserializer.h
@@ -5,6 +5,8 @@
 
 #include "qmt/infrastructure/qmt_global.h"
 
+#include <utils/filepath.h>
+
 #include <QString>
 
 QT_BEGIN_NAMESPACE
@@ -21,9 +23,9 @@ public:
     ProjectSerializer();
     ~ProjectSerializer();
 
-    void save(const QString &fileName, const Project *project);
+    void save(const Utils::FilePath &fileName, const Project *project);
     QByteArray save(const Project *project);
-    void load(const QString &fileName, Project *project);
+    void load(const Utils::FilePath &fileName, Project *project);
 
 private:
     void write(QXmlStreamWriter *writer, const Project *project);
diff --git a/src/libs/modelinglib/qmt/stereotype/customrelation.cpp b/src/libs/modelinglib/qmt/stereotype/customrelation.cpp
index fa9c80a1a0f..cc80da1b800 100644
--- a/src/libs/modelinglib/qmt/stereotype/customrelation.cpp
+++ b/src/libs/modelinglib/qmt/stereotype/customrelation.cpp
@@ -114,4 +114,9 @@ void CustomRelation::setColor(const QColor &color)
     m_color = color;
 }
 
+void CustomRelation::setEmphasized(bool emphasized)
+{
+    m_emphasized = emphasized;
+}
+
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/stereotype/customrelation.h b/src/libs/modelinglib/qmt/stereotype/customrelation.h
index 7125865aded..dd32c542c0c 100644
--- a/src/libs/modelinglib/qmt/stereotype/customrelation.h
+++ b/src/libs/modelinglib/qmt/stereotype/customrelation.h
@@ -55,7 +55,10 @@ public:
     enum class ColorType {
         EndA,
         EndB,
-        Custom
+        Custom,
+        Warning,
+        Error,
+        Soften,
     };
 
     class End {
@@ -113,6 +116,8 @@ public:
     void setColorType(ColorType colorType);
     QColor color() const { return m_color; }
     void setColor(const QColor &color);
+    bool emphasized() const { return m_emphasized; }
+    void setEmphasized(bool emphasized);
 
     friend auto qHash(CustomRelation::Relationship relationship) {
         return ::qHash(static_cast<int>(relationship));
@@ -139,6 +144,7 @@ private:
     ShaftPattern m_shaftPattern = ShaftPattern::Solid;
     ColorType m_colorType = ColorType::EndA;
     QColor m_color;
+    bool m_emphasized = false;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/stereotype/shapevalue.cpp b/src/libs/modelinglib/qmt/stereotype/shapevalue.cpp
index 9e1ee46c156..cf8ea5ef65b 100644
--- a/src/libs/modelinglib/qmt/stereotype/shapevalue.cpp
+++ b/src/libs/modelinglib/qmt/stereotype/shapevalue.cpp
@@ -29,7 +29,7 @@ qreal ShapeValueF::mapScaledTo(qreal scaledOrigin, qreal originalSize, qreal bas
         v = originalSize != 0 ? (m_value * actualSize / originalSize) : m_value;
         break;
     case UnitPercentage:
-        v = m_value * actualSize;
+        v = m_value * actualSize / 100.0;
         break;
     }
     switch (m_origin) {
diff --git a/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.cpp b/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.cpp
index 030c9e12a51..2f679df1177 100644
--- a/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.cpp
+++ b/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.cpp
@@ -10,6 +10,8 @@
 
 #include "qmt/infrastructure/qmtassert.h"
 #include "qmt/style/style.h"
+
+#include <utils/filepath.h>
 #include <utils/algorithm.h>
 
 #include <QHash>
@@ -19,12 +21,14 @@
 
 #include <algorithm>
 
+using Utils::FilePath;
+
 namespace qmt {
 
 namespace {
 
 struct IconKey {
-    IconKey(StereotypeIcon::Element element, const QList<QString> &stereotypes, const QString &defaultIconPath,
+    IconKey(StereotypeIcon::Element element, const QList<QString> &stereotypes, const FilePath &defaultIconPath,
             const Uid &styleUid, const QSize &size, const QMarginsF &margins, qreal lineWidth)
         : m_element(element),
           m_stereotypes(stereotypes),
@@ -53,7 +57,7 @@ struct IconKey {
 
     const StereotypeIcon::Element m_element;
     const QList<QString> m_stereotypes;
-    const QString m_defaultIconPath;
+    const FilePath m_defaultIconPath;
     const Uid m_styleUid;
     const QSize m_size;
     const QMarginsF m_margins;
@@ -68,6 +72,7 @@ public:
     QHash<QPair<StereotypeIcon::Element, QString>, QString> m_stereotypeToIconIdMap;
     QHash<QString, StereotypeIcon> m_iconIdToStereotypeIconsMap;
     QHash<QString, CustomRelation> m_relationIdToCustomRelationMap;
+    QHash<QString, CustomRelation> m_stereotypeToCustomRelationMap;
     QList<Toolbar> m_toolbars;
     QList<Toolbar> m_elementToolbars;
     QHash<IconKey, QIcon> m_iconMap;
@@ -150,8 +155,13 @@ CustomRelation StereotypeController::findCustomRelation(const QString &customRel
     return d->m_relationIdToCustomRelationMap.value(customRelationId);
 }
 
+CustomRelation StereotypeController::findCustomRelationByStereotype(const QString &steoreotype) const
+{
+    return d->m_stereotypeToCustomRelationMap.value(steoreotype);
+}
+
 QIcon StereotypeController::createIcon(StereotypeIcon::Element element, const QList<QString> &stereotypes,
-                                       const QString &defaultIconPath, const Style *style, const QSize &size,
+                                       const FilePath &defaultIconPath, const Style *style, const QSize &size,
                                        const QMarginsF &margins, qreal lineWidth)
 {
     IconKey key(element, stereotypes, defaultIconPath, style->uid(), size, margins, lineWidth);
@@ -225,7 +235,7 @@ QIcon StereotypeController::createIcon(StereotypeIcon::Element element, const QL
         icon = QIcon(pixmap);
     }
     if (icon.isNull() && !defaultIconPath.isEmpty())
-        icon = QIcon(defaultIconPath);
+        icon = QIcon(defaultIconPath.toFSPathString());
     d->m_iconMap.insert(key, icon);
     return icon;
 
@@ -251,6 +261,9 @@ void StereotypeController::addStereotypeIcon(const StereotypeIcon &stereotypeIco
 void StereotypeController::addCustomRelation(const CustomRelation &customRelation)
 {
     d->m_relationIdToCustomRelationMap.insert(customRelation.id(), customRelation);
+    QString stereotype = Utils::toList(customRelation.stereotypes()).value(0);
+    if (!stereotype.isEmpty())
+        d->m_stereotypeToCustomRelationMap.insert(stereotype, customRelation);
 }
 
 void StereotypeController::addToolbar(const Toolbar &toolbar)
diff --git a/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h b/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h
index 676f9a275a5..49acc5f9373 100644
--- a/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h
+++ b/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h
@@ -5,6 +5,8 @@
 
 #include "stereotypeicon.h"
 
+#include <utils/filepath.h>
+
 #include <QMarginsF>
 #include <QObject>
 
@@ -33,9 +35,14 @@ public:
                                              const QList<QString> &stereotypes) const;
     StereotypeIcon findStereotypeIcon(const QString &stereotypeIconId) const;
     CustomRelation findCustomRelation(const QString &customRelationId) const;
-    QIcon createIcon(StereotypeIcon::Element element, const QList<QString> &stereotypes,
-                     const QString &defaultIconPath, const Style *style,
-                     const QSize &size, const QMarginsF &margins, qreal lineWidth);
+    CustomRelation findCustomRelationByStereotype(const QString &steoreotype) const;
+    QIcon createIcon(StereotypeIcon::Element element,
+                     const QList<QString> &stereotypes,
+                     const Utils::FilePath &defaultIconPath,
+                     const Style *style,
+                     const QSize &size,
+                     const QMarginsF &margins,
+                     qreal lineWidth);
 
     void addStereotypeIcon(const StereotypeIcon &stereotypeIcon);
     void addCustomRelation(const CustomRelation &customRelation);
diff --git a/src/libs/modelinglib/qmt/stereotype/stereotypeicon.cpp b/src/libs/modelinglib/qmt/stereotype/stereotypeicon.cpp
index 8bcf5df170d..19e466c509c 100644
--- a/src/libs/modelinglib/qmt/stereotype/stereotypeicon.cpp
+++ b/src/libs/modelinglib/qmt/stereotype/stereotypeicon.cpp
@@ -62,6 +62,21 @@ void StereotypeIcon::setMinHeight(qreal minHeight)
     m_minHeight = minHeight;
 }
 
+void StereotypeIcon::setIconWith(qreal iconWidth)
+{
+    m_iconWidth = iconWidth;
+}
+
+void StereotypeIcon::setIconHeight(qreal iconHeight)
+{
+    m_iconHeight = iconHeight;
+}
+
+void StereotypeIcon::setDepthLayer(DepthLayer depthLayer)
+{
+    m_depthLayer = depthLayer;
+}
+
 void StereotypeIcon::setSizeLock(StereotypeIcon::SizeLock sizeLock)
 {
     m_sizeLock = sizeLock;
diff --git a/src/libs/modelinglib/qmt/stereotype/stereotypeicon.h b/src/libs/modelinglib/qmt/stereotype/stereotypeicon.h
index be45245da5d..fcb5f1a15cd 100644
--- a/src/libs/modelinglib/qmt/stereotype/stereotypeicon.h
+++ b/src/libs/modelinglib/qmt/stereotype/stereotypeicon.h
@@ -31,6 +31,12 @@ public:
         DisplaySmart
     };
 
+    enum DepthLayer {
+        DepthBehindItems,
+        DepthAmongItems,
+        DepthBeforeItems,
+    };
+
     enum SizeLock {
         LockNone,
         LockWidth,
@@ -62,12 +68,20 @@ public:
     void setWidth(qreal width);
     qreal height() const { return m_height; }
     void setHeight(qreal height);
-    bool hasMinWidth() const { return m_minWidth > 0; }
+    bool hasMinWidth() const { return m_minWidth > 0.0; }
     qreal minWidth() const { return m_minWidth; }
     void setMinWidth(qreal minWidth);
-    bool hasMinHeight() const { return m_minHeight > 0; }
+    bool hasMinHeight() const { return m_minHeight > 0.0; }
     qreal minHeight() const { return m_minHeight; }
     void setMinHeight(qreal minHeight);
+    bool hasIconWidth() const { return m_iconWidth > 0.0; }
+    qreal iconWidth() const { return m_iconWidth; }
+    void setIconWith(qreal iconWidth);
+    bool hasIconHeight() const { return m_iconHeight > 0.0; }
+    qreal iconHeight() const { return m_iconHeight; }
+    void setIconHeight(qreal iconHeight);
+    DepthLayer depthLayer() const { return m_depthLayer; }
+    void setDepthLayer(DepthLayer depthLayer);
     SizeLock sizeLock() const { return m_sizeLock; }
     void setSizeLock(SizeLock sizeLock);
     Display display() const { return m_display; }
@@ -90,8 +104,11 @@ private:
     QString m_name;
     qreal m_width = 100.0;
     qreal m_height = 100.0;
-    qreal m_minWidth = -1;
-    qreal m_minHeight = -1;
+    qreal m_minWidth = -1.0;
+    qreal m_minHeight = -1.0;
+    qreal m_iconWidth = -1.0;
+    qreal m_iconHeight = -1.0;
+    DepthLayer m_depthLayer = DepthAmongItems;
     SizeLock m_sizeLock = LockNone;
     Display m_display = DisplaySmart;
     TextAlignment m_textAlignment = TextalignBelow;
diff --git a/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp b/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp
index 74e91837dc9..bce1804892d 100644
--- a/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp
+++ b/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp
@@ -5,6 +5,7 @@
 
 #include "defaultstyle.h"
 #include "objectvisuals.h"
+#include "relationvisuals.h"
 #include "styledobject.h"
 #include "styledrelation.h"
 
@@ -14,6 +15,7 @@
 #include "qmt/diagram/ditem.h"
 #include "qmt/diagram/dannotation.h"
 #include "qmt/infrastructure/qmtassert.h"
+#include "qmt/stereotype/customrelation.h"
 
 #include <utils/algorithm.h>
 
@@ -73,25 +75,29 @@ bool operator==(const ObjectStyleKey &lhs, const ObjectStyleKey &rhs)
 class RelationStyleKey
 {
 public:
-    RelationStyleKey(StyleEngine::ElementType elementType = StyleEngine::TypeOther,
-                     DObject::VisualPrimaryRole visualPrimaryRole = DObject::PrimaryRoleNormal)
+    RelationStyleKey(StyleEngine::ElementType elementType, const RelationVisuals &relationVisuals,
+                     bool withObject = false)
         : m_elementType(elementType),
-          m_visualPrimaryRole(visualPrimaryRole)
+          m_relationVisuals(relationVisuals),
+        m_withObject(withObject)
     {
     }
 
     StyleEngine::ElementType m_elementType = StyleEngine::TypeOther;
-    DObject::VisualPrimaryRole m_visualPrimaryRole = DObject::PrimaryRoleNormal;
+    RelationVisuals m_relationVisuals;
+    bool m_withObject = false;
 };
 
 size_t qHash(const RelationStyleKey &styleKey)
 {
-    return ::qHash(styleKey.m_elementType) ^ ::qHash(styleKey.m_visualPrimaryRole);
+    return ::qHash(styleKey.m_elementType) ^ qHash(styleKey.m_relationVisuals);
 }
 
 bool operator==(const RelationStyleKey &lhs, const RelationStyleKey &rhs)
 {
-    return lhs.m_elementType == rhs.m_elementType && lhs.m_visualPrimaryRole == rhs.m_visualPrimaryRole;
+    return lhs.m_elementType == rhs.m_elementType
+           && lhs.m_relationVisuals == rhs.m_relationVisuals
+           && lhs.m_withObject == rhs.m_withObject;
 }
 
 class AnnotationStyleKey
@@ -253,34 +259,6 @@ const Style *DefaultStyleEngine::applyObjectStyle(const Style *baseStyle, StyleE
     return derivedStyle;
 }
 
-static bool areStackingRoles(DObject::VisualPrimaryRole rhsPrimaryRole,
-                             DObject::VisualSecondaryRole rhsSecondaryRole,
-                             DObject::VisualPrimaryRole lhsPrimaryRole,
-                             DObject::VisualSecondaryRole lhsSecondaryRols)
-{
-    switch (rhsSecondaryRole) {
-    case DObject::SecondaryRoleNone:
-    case DObject::SecondaryRoleLighter:
-    case DObject::SecondaryRoleDarker:
-    case DObject::SecondaryRoleFlat:
-        switch (lhsSecondaryRols) {
-        case DObject::SecondaryRoleNone:
-        case DObject::SecondaryRoleLighter:
-        case DObject::SecondaryRoleDarker:
-        case DObject::SecondaryRoleFlat:
-            return lhsPrimaryRole == rhsPrimaryRole;
-        case DObject::SecondaryRoleSoften:
-        case DObject::SecondaryRoleOutline:
-            return false;
-        }
-        break;
-    case DObject::SecondaryRoleSoften:
-    case DObject::SecondaryRoleOutline:
-        return false;
-    }
-    return true;
-}
-
 const Style *DefaultStyleEngine::applyObjectStyle(const Style *baseStyle, const StyledObject &styledObject,
                                                   const Parameters *parameters)
 {
@@ -325,10 +303,12 @@ const Style *DefaultStyleEngine::applyObjectStyle(const Style *baseStyle, const
     }
     int depth = 0;
     if (!depths.isEmpty()) {
-        for (auto it = depths.cbegin(); it != depths.cend(); ++it) {
-            if (it->m_elementType == elementType
-                && areStackingRoles(it->m_visualPrimaryRole, it->m_visualSecondaryRole,
-                                    styledVisualPrimaryRole, styledVisualSecondaryRole)) {
+        const QList<int> keys = Utils::sorted(depths.keys());
+        for (int d : keys) {
+            DepthProperties properties = depths.value(d);
+            if (properties.m_elementType == elementType
+                    && areStackingRoles(properties.m_visualPrimaryRole, properties.m_visualSecondaryRole,
+                                        styledVisualPrimaryRole, styledVisualSecondaryRole)) {
                 ++depth;
             } else {
                 depth = 0;
@@ -345,13 +325,100 @@ const Style *DefaultStyleEngine::applyObjectStyle(const Style *baseStyle, const
                             parameters);
 }
 
+const Style *DefaultStyleEngine::applyRelationStyle(const Style *baseStyle, ElementType elementType, const RelationVisuals &relationVisuals, const Parameters *parameters)
+{
+    Q_UNUSED(parameters);
+
+    RelationStyleKey key(elementType, relationVisuals);
+    const Style *derivedStyle = m_relationStyleMap.value(key);
+    if (!derivedStyle) {
+        auto style = new Style(baseStyle->type());
+        static QColor customColors[] = {
+            QColor(0xEE, 0x8E, 0x99).darker(110),  // ROLE_CUSTOM1,
+            QColor(0x80, 0xAF, 0x47).lighter(130), // ROLE_CUSTOM2,
+            QColor(0xFF, 0xA1, 0x5B).lighter(100), // ROLE_CUSTOM3,
+            QColor(0x55, 0xC4, 0xCF).lighter(120), // ROLE_CUSTOM4,
+            QColor(0xFF, 0xE1, 0x4B)               // ROLE_CUSTOM5,
+        };
+
+        int index = static_cast<int>(relationVisuals.visualPrimaryRole()) - static_cast<int>(DRelation::PrimaryRoleCustom1);
+        QColor lineColor = index >= 0 && index <= 4 ? customColors[index] : Qt::black;
+        switch (relationVisuals.visualSecondaryRole()) {
+        case DRelation::SecondaryRoleNone:
+            break;
+        case DRelation::SecondaryRoleWarning:
+            lineColor = Qt::yellow;
+            break;
+        case DRelation::SecondaryRoleError:
+            lineColor = Qt::red;
+            break;
+        case DRelation::SecondaryRoleSoften:
+            lineColor = Qt::gray;
+            break;
+        }
+
+        QColor fillColor = lineColor == Qt::black ? Qt::darkGray : lineColor.lighter(150);
+        QPen linePen = baseStyle->linePen();
+        linePen.setWidth(1);
+        linePen.setColor(lineColor);
+        style->setLinePen(linePen);
+        QBrush textBrush = baseStyle->textBrush();
+        textBrush.setColor(Qt::black);
+        style->setTextBrush(textBrush);
+        QBrush brush = baseStyle->fillBrush();
+        brush.setColor(fillColor);
+        brush.setStyle(Qt::SolidPattern);
+        style->setFillBrush(brush);
+        style->setNormalFont(baseStyle->normalFont());
+        style->setSmallFont(baseStyle->smallFont());
+        style->setHeaderFont(baseStyle->headerFont());
+        m_relationStyleMap.insert(key, style);
+        derivedStyle = style;
+    }
+    return derivedStyle;
+}
+
 const Style *DefaultStyleEngine::applyRelationStyle(const Style *baseStyle, const StyledRelation &styledRelation,
                                                     const Parameters *parameters)
 {
     Q_UNUSED(parameters)
 
     ElementType elementType = objectType(styledRelation.endA());
-    RelationStyleKey key(elementType, styledRelation.endA() ? styledRelation.endA()->visualPrimaryRole() : DObject::PrimaryRoleNormal);
+    RelationVisuals relationVisuals;
+    if (styledRelation.customRelation()) {
+        switch (styledRelation.customRelation()->colorType()) {
+        case CustomRelation::ColorType::EndA:
+            // TODO implement
+            break;
+        case CustomRelation::ColorType::EndB:
+            // TODO implement
+            break;
+        case CustomRelation::ColorType::Custom:
+            // TODO implement
+            break;
+        case CustomRelation::ColorType::Warning:
+            relationVisuals.setVisualSecondaryRole(DRelation::VisualSecondaryRole::SecondaryRoleWarning);
+            break;
+        case CustomRelation::ColorType::Error:
+            relationVisuals.setVisualSecondaryRole(DRelation::VisualSecondaryRole::SecondaryRoleError);
+            break;
+        case CustomRelation::ColorType::Soften:
+            relationVisuals.setVisualSecondaryRole(DRelation::VisualSecondaryRole::SecondaryRoleSoften);
+            break;
+        }
+        relationVisuals.setEmphasized(styledRelation.customRelation()->emphasized());
+    }
+    if (styledRelation.endA())
+        relationVisuals.setVisualObjectPrimaryRole(styledRelation.endA()->visualPrimaryRole());
+    if (styledRelation.relation()) {
+        if (styledRelation.relation()->visualPrimaryRole() != DRelation::VisualPrimaryRole::PrimaryRoleNormal)
+            relationVisuals.setVisualPrimaryRole(styledRelation.relation()->visualPrimaryRole());
+        if (styledRelation.relation()->visualSecondaryRole() != DRelation::VisualSecondaryRole::SecondaryRoleNone)
+            relationVisuals.setVisualSecondaryRole(styledRelation.relation()->visualSecondaryRole());
+        if (styledRelation.relation()->isVisualEmphasized())
+            relationVisuals.setEmphasized(styledRelation.relation()->isVisualEmphasized());
+    }
+    RelationStyleKey key(elementType, relationVisuals, true);
     const Style *derivedStyle = m_relationStyleMap.value(key);
     if (!derivedStyle) {
         auto style = new Style(baseStyle->type());
@@ -365,12 +432,36 @@ const Style *DefaultStyleEngine::applyRelationStyle(const Style *baseStyle, cons
         QColor lineColor = DefaultStyleEngine::lineColor(objectType(object), objectVisuals);
         QColor fillColor = lineColor;
 
+        static QColor customColors[] = {
+            QColor(0xEE, 0x8E, 0x99).darker(110),  // ROLE_CUSTOM1,
+            QColor(0x80, 0xAF, 0x47).lighter(130), // ROLE_CUSTOM2,
+            QColor(0xFF, 0xA1, 0x5B).lighter(100), // ROLE_CUSTOM3,
+            QColor(0x55, 0xC4, 0xCF).lighter(120), // ROLE_CUSTOM4,
+            QColor(0xFF, 0xE1, 0x4B)               // ROLE_CUSTOM5,
+        };
+
+        int index = static_cast<int>(relationVisuals.visualPrimaryRole()) - static_cast<int>(DRelation::PrimaryRoleCustom1);
+        lineColor = (index >= 0 && index <= 4) ? customColors[index] : lineColor;
+        switch (relationVisuals.visualSecondaryRole()) {
+        case DRelation::SecondaryRoleNone:
+            break;
+        case DRelation::SecondaryRoleWarning:
+            lineColor = QColor(0xffc800);
+            break;
+        case DRelation::SecondaryRoleError:
+            lineColor = Qt::red;
+            break;
+        case DRelation::SecondaryRoleSoften:
+            lineColor = Qt::gray;
+            break;
+        }
+
         QPen linePen = baseStyle->linePen();
-        linePen.setWidth(1);
+        linePen.setWidth(relationVisuals.isEmphasized() ? 3 : 1);
         linePen.setColor(lineColor);
         style->setLinePen(linePen);
         QBrush textBrush = baseStyle->textBrush();
-        textBrush.setColor(QColor("black"));
+        textBrush.setColor(Qt::black);
         style->setTextBrush(textBrush);
         QBrush brush = baseStyle->fillBrush();
         brush.setColor(fillColor);
@@ -497,6 +588,34 @@ DefaultStyleEngine::ElementType DefaultStyleEngine::objectType(const DObject *ob
     return elementType;
 }
 
+bool DefaultStyleEngine::areStackingRoles(DObject::VisualPrimaryRole rhsPrimaryRole,
+                                          DObject::VisualSecondaryRole rhsSecondaryRole,
+                                          DObject::VisualPrimaryRole lhsPrimaryRole,
+                                          DObject::VisualSecondaryRole lhsSecondaryRols)
+{
+    switch (rhsSecondaryRole) {
+    case DObject::SecondaryRoleNone:
+    case DObject::SecondaryRoleLighter:
+    case DObject::SecondaryRoleDarker:
+    case DObject::SecondaryRoleFlat:
+        switch (lhsSecondaryRols) {
+        case DObject::SecondaryRoleNone:
+        case DObject::SecondaryRoleLighter:
+        case DObject::SecondaryRoleDarker:
+        case DObject::SecondaryRoleFlat:
+            return lhsPrimaryRole == rhsPrimaryRole;
+        case DObject::SecondaryRoleSoften:
+        case DObject::SecondaryRoleOutline:
+            return false;
+        }
+        break;
+    case DObject::SecondaryRoleSoften:
+    case DObject::SecondaryRoleOutline:
+        return false;
+    }
+    return true;
+}
+
 QColor DefaultStyleEngine::baseColor(ElementType elementType, ObjectVisuals objectVisuals)
 {
     if (objectVisuals.visualSecondaryRole() == DObject::SecondaryRoleOutline)
diff --git a/src/libs/modelinglib/qmt/style/defaultstyleengine.h b/src/libs/modelinglib/qmt/style/defaultstyleengine.h
index 67cdf9ed857..b5ebe557e0b 100644
--- a/src/libs/modelinglib/qmt/style/defaultstyleengine.h
+++ b/src/libs/modelinglib/qmt/style/defaultstyleengine.h
@@ -37,6 +37,9 @@ public:
                                   const Parameters *parameters) override;
     const Style *applyObjectStyle(const Style *baseStyle, const StyledObject &styledObject,
                                   const Parameters *parameters) override;
+    const Style *applyRelationStyle(const Style *baseStyle, ElementType elementType,
+                                    const RelationVisuals &relationVisuals,
+                                    const Parameters *parameters) override;
     const Style *applyRelationStyle(const Style *baseStyle, const StyledRelation &styledRelation,
                                     const Parameters *parameters) override;
     const Style *applyAnnotationStyle(const Style *baseStyle, const DAnnotation *annotation,
@@ -54,6 +57,11 @@ private:
 
     ElementType objectType(const DObject *object);
 
+    bool areStackingRoles(DObject::VisualPrimaryRole rhsPrimaryRole,
+                          DObject::VisualSecondaryRole rhsSecondaryRole,
+                          DObject::VisualPrimaryRole lhsPrimaryRole,
+                          DObject::VisualSecondaryRole lhsSecondaryRols);
+
     QColor baseColor(ElementType elementType, ObjectVisuals objectVisuals);
     QColor lineColor(ElementType elementType, const ObjectVisuals &objectVisuals);
     QColor fillColor(ElementType elementType, const ObjectVisuals &objectVisuals);
diff --git a/src/libs/modelinglib/qmt/style/relationvisuals.cpp b/src/libs/modelinglib/qmt/style/relationvisuals.cpp
new file mode 100644
index 00000000000..d297047ae1d
--- /dev/null
+++ b/src/libs/modelinglib/qmt/style/relationvisuals.cpp
@@ -0,0 +1,58 @@
+// Copyright (C) 2024 Jochen Becher
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "relationvisuals.h"
+
+namespace qmt {
+
+RelationVisuals::RelationVisuals() {}
+
+RelationVisuals::RelationVisuals(DObject::VisualPrimaryRole visualObjectPrimaryRole,
+                                 DRelation::VisualPrimaryRole visualPrimaryRole,
+                                 DRelation::VisualSecondaryRole visualSecondaryRole,
+                                 bool emphasized)
+    : m_visualObjectPrimaryRole(visualObjectPrimaryRole)
+    , m_visualPrimaryRole(visualPrimaryRole)
+    , m_visualSecondaryRole(visualSecondaryRole)
+    , m_isEmphasized(emphasized)
+{}
+
+RelationVisuals::~RelationVisuals() {}
+
+void RelationVisuals::setVisualPrimaryRole(DRelation::VisualPrimaryRole VisualPrimaryRole)
+{
+    m_visualPrimaryRole = VisualPrimaryRole;
+}
+
+void RelationVisuals::setVisualObjectPrimaryRole(DObject::VisualPrimaryRole visualPrimaryRole)
+{
+    m_visualObjectPrimaryRole = visualPrimaryRole;
+}
+
+void RelationVisuals::setVisualSecondaryRole(DRelation::VisualSecondaryRole visualSecondaryRole)
+{
+    m_visualSecondaryRole = visualSecondaryRole;
+}
+
+void RelationVisuals::setEmphasized(bool emphasized)
+{
+    m_isEmphasized = emphasized;
+}
+
+bool operator==(const RelationVisuals &lhs, const RelationVisuals &rhs)
+{
+    return lhs.visualObjectPrimaryRole() == rhs.visualObjectPrimaryRole()
+           && lhs.visualPrimaryRole() == rhs.visualPrimaryRole()
+           && lhs.visualSecondaryRole() == rhs.visualSecondaryRole()
+           && lhs.isEmphasized() == rhs.isEmphasized();
+}
+
+size_t qHash(const RelationVisuals &relationVisuals)
+{
+    return ::qHash(static_cast<int>(relationVisuals.visualObjectPrimaryRole()))
+           ^ ::qHash(static_cast<int>(relationVisuals.visualPrimaryRole()))
+           ^ ::qHash(static_cast<int>(relationVisuals.visualSecondaryRole()))
+           ^ ::qHash(relationVisuals.isEmphasized());
+}
+
+} // namespace qmt
diff --git a/src/libs/modelinglib/qmt/style/relationvisuals.h b/src/libs/modelinglib/qmt/style/relationvisuals.h
new file mode 100644
index 00000000000..be87a7d2917
--- /dev/null
+++ b/src/libs/modelinglib/qmt/style/relationvisuals.h
@@ -0,0 +1,42 @@
+// Copyright (C) 2024 Jochen Becher
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "qmt/diagram/drelation.h"
+#include "qmt/diagram/dobject.h"
+
+#include <QColor>
+
+namespace qmt {
+
+class QMT_EXPORT RelationVisuals
+{
+public:
+    RelationVisuals();
+    RelationVisuals(DObject::VisualPrimaryRole visualObjectPrimaryRole,
+                    DRelation::VisualPrimaryRole visualPrimaryRole,
+                    DRelation::VisualSecondaryRole visualSecondaryRole,
+                    bool emphasized);
+    ~RelationVisuals();
+
+    DObject::VisualPrimaryRole visualObjectPrimaryRole() const { return m_visualObjectPrimaryRole; }
+    void setVisualObjectPrimaryRole(DObject::VisualPrimaryRole visualPrimaryRole);
+    DRelation::VisualPrimaryRole visualPrimaryRole() const { return m_visualPrimaryRole; }
+    void setVisualPrimaryRole(DRelation::VisualPrimaryRole visualPrimaryRole);
+    DRelation::VisualSecondaryRole visualSecondaryRole() const { return m_visualSecondaryRole; }
+    void setVisualSecondaryRole(DRelation::VisualSecondaryRole visualSecondaryRole);
+    bool isEmphasized() const { return m_isEmphasized; }
+    void setEmphasized(bool emphasized);
+
+private:
+    DObject::VisualPrimaryRole m_visualObjectPrimaryRole = DObject::PrimaryRoleNormal;
+    DRelation::VisualPrimaryRole m_visualPrimaryRole = DRelation::PrimaryRoleNormal;
+    DRelation::VisualSecondaryRole m_visualSecondaryRole = DRelation::SecondaryRoleNone;
+    bool m_isEmphasized = false;
+};
+
+bool operator==(const RelationVisuals &lhs, const RelationVisuals &rhs);
+size_t qHash(const RelationVisuals &relationVisuals);
+
+} // namespace qmt
diff --git a/src/libs/modelinglib/qmt/style/stylecontroller.cpp b/src/libs/modelinglib/qmt/style/stylecontroller.cpp
index 5cd50c1738a..bbfc28622ed 100644
--- a/src/libs/modelinglib/qmt/style/stylecontroller.cpp
+++ b/src/libs/modelinglib/qmt/style/stylecontroller.cpp
@@ -63,6 +63,12 @@ const Style *StyleController::adaptObjectStyle(const StyledObject &object)
     return m_defaultStyleEngine->applyObjectStyle(m_defaultStyle.data(), object, &parameters);
 }
 
+const Style *StyleController::adaptRelationStyle(StyleEngine::ElementType elementType, const RelationVisuals &relationVisuals)
+{
+    Parameters parameters(this);
+    return m_defaultStyleEngine->applyRelationStyle(m_defaultStyle.data(), elementType, relationVisuals, &parameters);
+}
+
 const Style *StyleController::adaptRelationStyle(const StyledRelation &relation)
 {
     Parameters parameters(this);
diff --git a/src/libs/modelinglib/qmt/style/stylecontroller.h b/src/libs/modelinglib/qmt/style/stylecontroller.h
index 2627bb2caa2..afa566460fc 100644
--- a/src/libs/modelinglib/qmt/style/stylecontroller.h
+++ b/src/libs/modelinglib/qmt/style/stylecontroller.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include "styleengine.h"
-#include "qmt/diagram/dobject.h"
 
 #include <QObject>
 #include <QScopedPointer>
@@ -14,6 +13,7 @@ namespace qmt {
 class Style;
 class ObjectVisuals;
 class StyledObject;
+class RelationVisuals;
 class StyledRelation;
 class DAnnotation;
 class DBoundary;
@@ -33,6 +33,8 @@ public:
     const Style *adaptObjectStyle(StyleEngine::ElementType elementType,
                                   const ObjectVisuals &objectVisuals);
     const Style *adaptObjectStyle(const StyledObject &object);
+    const Style *adaptRelationStyle(StyleEngine::ElementType elementType,
+                                    const RelationVisuals &relationVisuals);
     const Style *adaptRelationStyle(const StyledRelation &relation);
     const Style *adaptAnnotationStyle(const DAnnotation *annotation);
     const Style *adaptBoundaryStyle(const DBoundary *boundary);
diff --git a/src/libs/modelinglib/qmt/style/styledrelation.cpp b/src/libs/modelinglib/qmt/style/styledrelation.cpp
index 3c78abf96df..144e5f22ac7 100644
--- a/src/libs/modelinglib/qmt/style/styledrelation.cpp
+++ b/src/libs/modelinglib/qmt/style/styledrelation.cpp
@@ -5,10 +5,12 @@
 
 namespace qmt {
 
-StyledRelation::StyledRelation(const DRelation *relation, const DObject *endA, const DObject *endB)
+StyledRelation::StyledRelation(const DRelation *relation, const DObject *endA, const DObject *endB,
+                               const CustomRelation *customRelation)
     : m_relation(relation),
       m_endA(endA),
-      m_endB(endB)
+      m_endB(endB),
+      m_customRelation(customRelation)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/style/styledrelation.h b/src/libs/modelinglib/qmt/style/styledrelation.h
index 422947908e2..27e8735463d 100644
--- a/src/libs/modelinglib/qmt/style/styledrelation.h
+++ b/src/libs/modelinglib/qmt/style/styledrelation.h
@@ -9,21 +9,25 @@ namespace qmt {
 
 class DRelation;
 class DObject;
+class CustomRelation;
 
 class QMT_EXPORT StyledRelation
 {
 public:
-    StyledRelation(const DRelation *relation, const DObject *endA, const DObject *endB);
+    StyledRelation(const DRelation *relation, const DObject *endA, const DObject *endB,
+                   const CustomRelation *customRelation);
     ~StyledRelation();
 
     const DRelation *relation() const { return m_relation; }
     const DObject *endA() const { return m_endA; }
     const DObject *endB() const { return m_endB; }
+    const CustomRelation *customRelation() const { return m_customRelation; }
 
 private:
     const DRelation *m_relation = nullptr;
     const DObject *m_endA = nullptr;
     const DObject *m_endB = nullptr;
+    const CustomRelation *m_customRelation = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/style/styleengine.h b/src/libs/modelinglib/qmt/style/styleengine.h
index e78f4303d93..463a62a194d 100644
--- a/src/libs/modelinglib/qmt/style/styleengine.h
+++ b/src/libs/modelinglib/qmt/style/styleengine.h
@@ -14,6 +14,7 @@ namespace qmt {
 class Style;
 class ObjectVisuals;
 class StyledObject;
+class RelationVisuals;
 class StyledRelation;
 
 class DAnnotation;
@@ -51,6 +52,9 @@ public:
                                           const Parameters *parameters) = 0;
     virtual const Style *applyObjectStyle(const Style *baseStyle, const StyledObject &,
                                           const Parameters *) = 0;
+    virtual const Style *applyRelationStyle(const Style *baseStyle, ElementType elementType,
+                                            const RelationVisuals &relationVisuals,
+                                            const Parameters *) = 0;
     virtual const Style *applyRelationStyle(const Style *baseStyle, const StyledRelation &,
                                             const Parameters *) = 0;
     virtual const Style *applyAnnotationStyle(const Style *baseStyle, const DAnnotation *,
diff --git a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp
index 00aacf9c824..23f6ddc2973 100644
--- a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp
+++ b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp
@@ -42,8 +42,6 @@
 #include "../../modelinglibtr.h"
 
 #include <QMenu>
-#include <QFileInfo>
-#include <QDir>
 #include <QQueue>
 #include <QPair>
 
@@ -421,7 +419,44 @@ void DiagramSceneController::dropNewModelElement(MObject *modelObject, MPackage
         emit newElementCreated(element, diagram);
 }
 
-void DiagramSceneController::addRelatedElements(const DSelection &selection, MDiagram *diagram)
+int DiagramSceneController::countRelatedElements(const DSelection &selection, MDiagram *diagram, std::function<bool (qmt::DObject *, qmt::MObject *, qmt::MRelation *)> filter)
+{
+    int counter = 0;
+    const QList<DSelection::Index> indices = selection.indices();
+    for (const DSelection::Index &index : indices) {
+        DElement *delement = m_diagramController->findElement(index.elementKey(), diagram);
+        QMT_ASSERT(delement, return 0);
+        DObject *dobject = dynamic_cast<DObject *>(delement);
+        if (dobject && dobject->modelUid().isValid()) {
+            MObject *mobject = m_modelController->findElement<MObject>(delement->modelUid());
+            if (mobject) {
+                const QList<MRelation *> relations = m_modelController->findRelationsOfObject(mobject);
+                QList<MRelation *> filteredRelations;
+                const QList<MRelation *> *relationsList = nullptr;
+                if (filter) {
+                    for (MRelation *relation : relations) {
+                        if (filter(dobject, mobject, relation))
+                            filteredRelations.append(relation);
+                    }
+                    relationsList = &filteredRelations;
+                } else {
+                    relationsList = &relations;
+                }
+                for (MRelation *relation : *relationsList) {
+                    if (relation->endAUid() != mobject->uid())
+                        ++counter;
+                    else if (relation->endBUid() != mobject->uid())
+                        ++counter;
+                }
+            }
+        }
+    }
+    return counter;
+}
+
+void DiagramSceneController::addRelatedElements(
+    const DSelection &selection, MDiagram *diagram,
+    std::function<bool (qmt::DObject *dobject, qmt::MObject *mobject, qmt::MRelation *relation)> filter)
 {
     m_diagramController->undoController()->beginMergeSequence(Tr::tr("Add Related Element"));
     const QList<DSelection::Index> indices = selection.indices();
@@ -435,8 +470,19 @@ void DiagramSceneController::addRelatedElements(const DSelection &selection, MDi
                 qreal dAngle = 360.0 / 11.5;
                 qreal dRadius = 100.0;
                 const QList<MRelation *> relations = m_modelController->findRelationsOfObject(mobject);
+                QList<MRelation *> filteredRelations;
+                const QList<MRelation *> *relationsList = nullptr;
+                if (filter) {
+                    for (MRelation *relation : relations) {
+                        if (filter(dobject, mobject, relation))
+                            filteredRelations.append(relation);
+                    }
+                    relationsList = &filteredRelations;
+                } else {
+                    relationsList = &relations;
+                }
                 int count = 0;
-                for (MRelation *relation : relations) {
+                for (MRelation *relation : *relationsList) {
                     if (relation->endAUid() != mobject->uid() || relation->endBUid() != mobject->uid())
                         ++count;
                 }
@@ -446,7 +492,7 @@ void DiagramSceneController::addRelatedElements(const DSelection &selection, MDi
                 }
                 qreal radius = 200.0;
                 qreal angle = 0.0;
-                for (MRelation *relation : relations) {
+                for (MRelation *relation : *relationsList) {
                     QPointF pos(dobject->pos());
                     pos += QPointF(radius * sin(angle / 180 * M_PI), -radius * cos(angle / 180 * M_PI));
                     bool added = false;
diff --git a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h
index a062fa10c4e..14e704a1929 100644
--- a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h
+++ b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h
@@ -86,7 +86,12 @@ public:
                         DElement *topMostElementAtPos, const QPointF &pos, MDiagram *diagram, const QPoint &viewPos, const QSize &viewSize);
     void dropNewModelElement(MObject *modelObject, MPackage *parentPackage, const QPointF &pos,
                              MDiagram *diagram);
-    void addRelatedElements(const DSelection &selection, MDiagram *diagram);
+    int countRelatedElements(
+        const DSelection &selection, MDiagram *diagram,
+        std::function<bool (qmt::DObject *dobject, qmt::MObject *mobject, qmt::MRelation *relation)> filter);
+    void addRelatedElements(
+        const DSelection &selection, MDiagram *diagram,
+        std::function<bool (qmt::DObject *dobject, qmt::MObject *mobject, qmt::MRelation *relation)> filter);
 
     MPackage *findSuitableParentPackage(DElement *topmostDiagramElement, MDiagram *diagram);
     MDiagram *findDiagramBySearchId(MPackage *package, const QString &diagramName);
diff --git a/src/libs/modelinglib/qmt/tasks/ielementtasks.h b/src/libs/modelinglib/qmt/tasks/ielementtasks.h
index a40277d8749..8c226327626 100644
--- a/src/libs/modelinglib/qmt/tasks/ielementtasks.h
+++ b/src/libs/modelinglib/qmt/tasks/ielementtasks.h
@@ -59,8 +59,13 @@ public:
     virtual void createAndOpenDiagram(const MElement *) = 0;
     virtual void createAndOpenDiagram(const DElement *, const MDiagram *) = 0;
 
+    virtual bool hasLinkedFile(const MElement *) const = 0;
+    virtual bool hasLinkedFile(const DElement *, const MDiagram *) const = 0;
+    virtual void openLinkedFile(const MElement *) = 0;
+    virtual void openLinkedFile(const DElement *, const MDiagram *) = 0;
+
     virtual bool extendContextMenu(const DElement *, const MDiagram *, QMenu *) = 0;
-    virtual bool handleContextMenuAction(const DElement *, const MDiagram *, const QString &) = 0;
+    virtual bool handleContextMenuAction(DElement *, MDiagram *, const QString &) = 0;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/tasks/voidelementtasks.cpp b/src/libs/modelinglib/qmt/tasks/voidelementtasks.cpp
index 2bd7fbe0499..fdc2e24bd4e 100644
--- a/src/libs/modelinglib/qmt/tasks/voidelementtasks.cpp
+++ b/src/libs/modelinglib/qmt/tasks/voidelementtasks.cpp
@@ -147,12 +147,30 @@ void VoidElementTasks::createAndOpenDiagram(const DElement *, const MDiagram *)
 {
 }
 
+bool VoidElementTasks::hasLinkedFile(const MElement *) const
+{
+    return false;
+}
+
+bool VoidElementTasks::hasLinkedFile(const DElement *, const MDiagram *) const
+{
+    return false;
+}
+
+void VoidElementTasks::openLinkedFile(const MElement *)
+{
+}
+
+void VoidElementTasks::openLinkedFile(const DElement *, const MDiagram *)
+{
+}
+
 bool VoidElementTasks::extendContextMenu(const DElement *, const MDiagram *, QMenu *)
 {
     return false;
 }
 
-bool VoidElementTasks::handleContextMenuAction(const DElement *, const MDiagram *, const QString &)
+bool VoidElementTasks::handleContextMenuAction(DElement *, MDiagram *, const QString &)
 {
     return false;
 }
diff --git a/src/libs/modelinglib/qmt/tasks/voidelementtasks.h b/src/libs/modelinglib/qmt/tasks/voidelementtasks.h
index 3e3d483d9ae..9e8753b71e0 100644
--- a/src/libs/modelinglib/qmt/tasks/voidelementtasks.h
+++ b/src/libs/modelinglib/qmt/tasks/voidelementtasks.h
@@ -51,8 +51,13 @@ public:
     void createAndOpenDiagram(const MElement *) override;
     void createAndOpenDiagram(const DElement *, const MDiagram *) override;
 
+    bool hasLinkedFile(const qmt::MElement *) const override;
+    bool hasLinkedFile(const qmt::DElement *, const qmt::MDiagram *) const override;
+    void openLinkedFile(const qmt::MElement *) override;
+    void openLinkedFile(const qmt::DElement *, const qmt::MDiagram *) override;
+
     bool extendContextMenu(const DElement *, const MDiagram *, QMenu *) override;
-    bool handleContextMenuAction(const DElement *, const MDiagram *, const QString &) override;
+    bool handleContextMenuAction(DElement *, MDiagram *, const QString &) override;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h b/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h
index c95f2c3f96e..109b77d991e 100644
--- a/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h
+++ b/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "parameters.h"
+#include "tag.h"
 
 #include <QList>
 #include <QHash>
diff --git a/src/libs/qmljs/jsoncheck.cpp b/src/libs/qmljs/jsoncheck.cpp
index 1d7c04e50cf..3cb44111f9d 100644
--- a/src/libs/qmljs/jsoncheck.cpp
+++ b/src/libs/qmljs/jsoncheck.cpp
@@ -447,7 +447,7 @@ JsonValue *JsonValue::build(const QVariant &variant, JsonMemoryPool *pool)
 {
     switch (variant.typeId()) {
 
-    case QVariant::List: {
+    case QMetaType::QVariantList: {
         auto newValue = new (pool) JsonArrayValue;
         const QList<QVariant> list = variant.toList();
         for (const QVariant &element : list)
@@ -455,7 +455,7 @@ JsonValue *JsonValue::build(const QVariant &variant, JsonMemoryPool *pool)
         return newValue;
     }
 
-    case QVariant::Map: {
+    case QMetaType::QVariantMap: {
         auto newValue = new (pool) JsonObjectValue;
         const QVariantMap variantMap = variant.toMap();
         for (QVariantMap::const_iterator it = variantMap.begin(); it != variantMap.end(); ++it)
@@ -463,19 +463,19 @@ JsonValue *JsonValue::build(const QVariant &variant, JsonMemoryPool *pool)
         return newValue;
     }
 
-    case QVariant::String:
+    case QMetaType::QString:
         return new (pool) JsonStringValue(variant.toString());
 
-    case QVariant::Int:
+    case QMetaType::Int:
         return new (pool) JsonIntValue(variant.toInt());
 
-    case QVariant::Double:
+    case QMetaType::Double:
         return new (pool) JsonDoubleValue(variant.toDouble());
 
-    case QVariant::Bool:
+    case QMetaType::Bool:
         return new (pool) JsonBooleanValue(variant.toBool());
 
-    case QVariant::Invalid:
+    case QMetaType::UnknownType:
         return new (pool) JsonNullValue;
 
     default:
diff --git a/src/libs/qmljs/qmljsbind.cpp b/src/libs/qmljs/qmljsbind.cpp
index 6ccddcbe630..163680998f1 100644
--- a/src/libs/qmljs/qmljsbind.cpp
+++ b/src/libs/qmljs/qmljsbind.cpp
@@ -333,6 +333,23 @@ bool Bind::visit(UiInlineComponent *ast)
     return true;
 }
 
+bool Bind::visit(UiEnumDeclaration *ast)
+{
+    if (_currentObjectValue) {
+        UiEnumValue *value = new UiEnumValue(ast, &_valueOwner, _currentObjectValue->originId());
+        _qmlObjects.insert(ast, value);
+        _currentObjectValue->setMember(ast->name, value);
+        // add enum value's keys as member to its parent object
+        for (auto it = ast->members; it; it = it->next) {
+            const QString name = it->member.toString();
+            _currentObjectValue->setMember(name, _valueOwner.intValue());
+            _currentObjectValue->setPropertyInfo(
+                        name, PropertyInfo(PropertyInfo::Readable | PropertyInfo::ValueType));
+        }
+    }
+    return true;
+}
+
 bool Bind::visit(AST::TemplateLiteral *ast)
 {
     Node::accept(ast->expression, this);
diff --git a/src/libs/qmljs/qmljsbind.h b/src/libs/qmljs/qmljsbind.h
index 08a60c17cc1..d7096abdb28 100644
--- a/src/libs/qmljs/qmljsbind.h
+++ b/src/libs/qmljs/qmljsbind.h
@@ -57,6 +57,7 @@ protected:
     bool visit(AST::UiScriptBinding *ast) override;
     bool visit(AST::UiArrayBinding *ast) override;
     bool visit(AST::UiInlineComponent *ast) override;
+    bool visit(AST::UiEnumDeclaration *ast) override;
 
     // QML/JS
     bool visit(AST::TemplateLiteral *ast) override;
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp
index 99d14269a25..c3876f0c46a 100644
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -860,6 +860,32 @@ bool Check::visit(UiObjectInitializer *)
     return true;
 }
 
+bool Check::visit(AST::UiEnumDeclaration *ast)
+{
+    const Value *localLookup = _scopeChain.lookup(ast->name.toString());
+    Utils::FilePath fp;
+    int line, column;
+    if (localLookup->getSourceLocation(&fp, &line, &column)) {
+        // if it's not "us" we get shadowed by another enum declaration
+        if (int(ast->identifierToken.startLine) != line || int(ast->identifierToken.startColumn) != column)
+            addMessage(ErrDuplicateId, SourceLocation(0, 0, line, column));
+    }
+    return true;
+}
+
+bool Check::visit(AST::UiEnumMemberList *ast)
+{
+    QStringList names;
+    for (auto it = ast; it; it = it->next) {
+        if (!it->member.first().isUpper())
+            addMessage(ErrInvalidEnumValue, it->memberToken); // better a different message?
+        if (names.contains(it->member)) // duplicate enum value
+            addMessage(ErrInvalidEnumValue, it->memberToken); // better a different message?
+        names.append(it->member.toString());
+    }
+    return true;
+}
+
 bool Check::visit(AST::TemplateLiteral *ast)
 {
     Node::accept(ast->expression, this);
diff --git a/src/libs/qmljs/qmljscheck.h b/src/libs/qmljs/qmljscheck.h
index 1fb96d251b5..d7fc6cc4256 100644
--- a/src/libs/qmljs/qmljscheck.h
+++ b/src/libs/qmljs/qmljscheck.h
@@ -57,6 +57,8 @@ protected:
     bool visit(AST::FunctionDeclaration *ast) override;
     bool visit(AST::FunctionExpression *ast) override;
     bool visit(AST::UiObjectInitializer *) override;
+    bool visit(AST::UiEnumDeclaration *ast) override;
+    bool visit(AST::UiEnumMemberList *ast) override;
 
     bool visit(AST::TemplateLiteral *ast) override;
     bool visit(AST::BinaryExpression *ast) override;
diff --git a/src/libs/qmljs/qmljsicons.cpp b/src/libs/qmljs/qmljsicons.cpp
index 0086843553b..a0522ca726b 100644
--- a/src/libs/qmljs/qmljsicons.cpp
+++ b/src/libs/qmljs/qmljsicons.cpp
@@ -120,3 +120,8 @@ QIcon Icons::functionDeclarationIcon()
 {
     return Utils::CodeModelIcon::iconForType(Utils::CodeModelIcon::FuncPublic);
 }
+
+QIcon Icons::enumMemberIcon()
+{
+    return Utils::CodeModelIcon::iconForType(Utils::CodeModelIcon::Enum);
+}
diff --git a/src/libs/qmljs/qmljsicons.h b/src/libs/qmljs/qmljsicons.h
index 4466d07a18e..1565ae5355c 100644
--- a/src/libs/qmljs/qmljsicons.h
+++ b/src/libs/qmljs/qmljsicons.h
@@ -28,6 +28,7 @@ public:
     static QIcon scriptBindingIcon();
     static QIcon publicMemberIcon();
     static QIcon functionDeclarationIcon();
+    static QIcon enumMemberIcon();
 
 private:
     Icons();
diff --git a/src/libs/qmljs/qmljsimportdependencies.cpp b/src/libs/qmljs/qmljsimportdependencies.cpp
index f1c4181a830..8e725fa521f 100644
--- a/src/libs/qmljs/qmljsimportdependencies.cpp
+++ b/src/libs/qmljs/qmljsimportdependencies.cpp
@@ -185,14 +185,14 @@ ImportKey::ImportKey(ImportType::Enum type, const QString &path, int majorVersio
 
 void ImportKey::addToHash(QCryptographicHash &hash) const
 {
-    hash.addData(reinterpret_cast<const char *>(&type), sizeof(type));
-    hash.addData(reinterpret_cast<const char *>(&majorVersion), sizeof(majorVersion));
-    hash.addData(reinterpret_cast<const char *>(&minorVersion), sizeof(minorVersion));
+    hash.addData(QByteArrayView(reinterpret_cast<const char *>(&type), sizeof(type)));
+    hash.addData(QByteArrayView(reinterpret_cast<const char *>(&majorVersion), sizeof(majorVersion)));
+    hash.addData(QByteArrayView(reinterpret_cast<const char *>(&minorVersion), sizeof(minorVersion)));
     for (const QString &s : splitPath) {
-        hash.addData("/", 1);
-        hash.addData(reinterpret_cast<const char *>(s.constData()), sizeof(QChar) * s.size());
+        hash.addData("/");
+        hash.addData(QByteArrayView(reinterpret_cast<const char *>(s.constData()), sizeof(QChar) * s.size()));
     }
-    hash.addData("/", 1);
+    hash.addData("/");
 }
 
 ImportKey ImportKey::flatKey() const {
@@ -547,11 +547,11 @@ QByteArray DependencyInfo::calculateFingerprint(const ImportDependencies &deps)
     QStringList coreImports = Utils::toList(allCoreImports);
     coreImports.sort();
     for (const QString &importId : std::as_const(coreImports)) {
-        hash.addData(reinterpret_cast<const char*>(importId.constData()), importId.size() * sizeof(QChar));
+        hash.addData(QByteArrayView(reinterpret_cast<const char*>(importId.constData()), importId.size() * sizeof(QChar)));
         QByteArray coreImportFingerprint = deps.coreImport(importId).fingerprint;
         hash.addData(coreImportFingerprint);
     }
-    hash.addData("/", 1);
+    hash.addData("/");
     QList<ImportKey> imports = Utils::toList(allImports);
     std::sort(imports.begin(), imports.end());
     for (const ImportKey &k : std::as_const(imports))
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp
index a9fa36a5289..c81d849a9f5 100644
--- a/src/libs/qmljs/qmljsinterpreter.cpp
+++ b/src/libs/qmljs/qmljsinterpreter.cpp
@@ -635,6 +635,52 @@ const CppComponentValue *QmlEnumValue::owner() const
     return m_owner;
 }
 
+UiEnumValue::UiEnumValue(AST::UiEnumDeclaration *ast,
+                         ValueOwner *valueOwner, const QString &originId)
+    : ObjectValue(valueOwner, originId)
+    , m_name(ast->name.toString())
+{
+    setClassName("enum");
+    m_path = Utils::FilePath::fromUserInput(originId);
+    m_line = ast->identifierToken.startLine;
+    m_column = ast->identifierToken.startColumn;
+
+    for (auto it = ast->members; it; it = it->next) {
+        const QString name = it->member.toString();
+        setMember(name, valueOwner->intValue());
+        setPropertyInfo(name, PropertyInfo(PropertyInfo::Readable|PropertyInfo::ValueType));
+        m_keys.append(name);
+        m_values.append(it->value);
+    }
+}
+
+UiEnumValue::~UiEnumValue()
+{
+}
+
+const UiEnumValue *UiEnumValue::asUiEnumValue() const
+{
+    return this;
+}
+
+bool UiEnumValue::getSourceLocation(Utils::FilePath *path, int *line, int *column) const
+{
+    *path = m_path;
+    *line = m_line;
+    *column = m_column;
+    return true;
+}
+
+QString UiEnumValue::name() const
+{
+    return m_name;
+}
+
+QStringList UiEnumValue::keys() const
+{
+    return m_keys;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ValueVisitor
 ////////////////////////////////////////////////////////////////////////////////
@@ -791,6 +837,11 @@ const QmlEnumValue *Value::asQmlEnumValue() const
     return nullptr;
 }
 
+const UiEnumValue *Value::asUiEnumValue() const
+{
+    return nullptr;
+}
+
 const QmlPrototypeReference *Value::asQmlPrototypeReference() const
 {
     return nullptr;
diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h
index 8651196aefa..aeb3c9e4389 100644
--- a/src/libs/qmljs/qmljsinterpreter.h
+++ b/src/libs/qmljs/qmljsinterpreter.h
@@ -44,6 +44,7 @@ class NumberValue;
 class ModuleApiInfo;
 class ObjectValue;
 class QmlEnumValue;
+class UiEnumValue;
 class QmlPrototypeReference;
 class RealValue;
 class Reference;
@@ -115,6 +116,7 @@ public:
     virtual const CppComponentValue *asCppComponentValue() const;
     virtual const ASTObjectValue *asAstObjectValue() const;
     virtual const QmlEnumValue *asQmlEnumValue() const;
+    virtual const UiEnumValue *asUiEnumValue() const;
     virtual const QmlPrototypeReference *asQmlPrototypeReference() const;
     virtual const ASTPropertyReference *asAstPropertyReference() const;
     virtual const ASTVariableReference *asAstVariableReference() const;
@@ -246,6 +248,12 @@ template <> Q_INLINE_TEMPLATE const QmlEnumValue *value_cast(const Value *v)
     else   return nullptr;
 }
 
+template <> Q_INLINE_TEMPLATE const UiEnumValue *value_cast(const Value *v)
+{
+    if (v) return v->asUiEnumValue();
+    else   return nullptr;
+}
+
 template <> Q_INLINE_TEMPLATE const QmlPrototypeReference *value_cast(const Value *v)
 {
     if (v) return v->asQmlPrototypeReference();
@@ -559,6 +567,27 @@ private:
     int m_enumIndex;
 };
 
+class QMLJS_EXPORT UiEnumValue : public ObjectValue
+{
+public:
+    UiEnumValue(AST::UiEnumDeclaration *uiEnum, ValueOwner *valueOwner,
+                const QString &originId);
+    ~UiEnumValue();
+
+    const UiEnumValue *asUiEnumValue() const override;
+    bool getSourceLocation(Utils::FilePath *path, int *line, int *column) const override;
+    QString name() const;
+    QStringList keys() const;
+
+private:
+    const QString m_name;
+    Utils::FilePath m_path;
+    int m_line;
+    int m_column;
+    QStringList m_keys;
+    QList<int> m_values;
+};
+
 
 // A ObjectValue based on a FakeMetaObject.
 // May only have other CppComponentValue as ancestors.
diff --git a/src/libs/qmljs/qmljsstaticanalysismessage.cpp b/src/libs/qmljs/qmljsstaticanalysismessage.cpp
index 432b97aba72..a58bf43765b 100644
--- a/src/libs/qmljs/qmljsstaticanalysismessage.cpp
+++ b/src/libs/qmljs/qmljsstaticanalysismessage.cpp
@@ -153,7 +153,7 @@ StaticAnalysisMessages::StaticAnalysisMessages()
            Tr::tr("Invalid property type \"%1\"."), 1);
     newMsg(WarnEqualityTypeCoercion, Error,
            Tr::tr("== and != perform type coercion, use === or !== to avoid it."));
-    newMsg(WarnExpectedNewWithUppercaseFunction, Error,
+    newMsg(WarnExpectedNewWithUppercaseFunction, Warning,
            Tr::tr("Calls of functions that start with an uppercase letter should use 'new'."));
     newMsg(WarnNewWithLowercaseFunction, Error,
            Tr::tr("Use 'new' only with functions that start with an uppercase letter."));
diff --git a/src/libs/qtcreatorcdbext/pytype.cpp b/src/libs/qtcreatorcdbext/pytype.cpp
index 9345c1d91af..479895bbcd9 100644
--- a/src/libs/qtcreatorcdbext/pytype.cpp
+++ b/src/libs/qtcreatorcdbext/pytype.cpp
@@ -49,10 +49,24 @@ static bool isType(const std::string &typeName, const std::vector<std::string> &
 
 static bool isIntegralType(const std::string &typeName)
 {
-    static const std::vector<std::string> integralTypes({"bool",
-            "char", "unsigned char", "char16_t", "char32_t", "wchar_t",
-            "short", "unsigned short", "int", "unsigned int",
-            "long", "unsigned long", "int64", "unsigned int64", "__int64", "unsigned __int64"});
+    static const std::vector<std::string> integralTypes(
+                {"bool",
+                 "char",
+                 "unsigned char",
+                 "char16_t",
+                 "char32_t",
+                 "wchar_t",
+                 "short",
+                 "unsigned short",
+                 "int",
+                 "unsigned int",
+                 "long",
+                 "unsigned long",
+                 "int64",
+                 "unsigned int64",
+                 "__int64",
+                 "unsigned __int64",
+                 "HRESULT"});
     return isType(typeName, integralTypes);
 }
 
diff --git a/src/libs/qtcreatorcdbext/pyvalue.cpp b/src/libs/qtcreatorcdbext/pyvalue.cpp
index f3813abf85e..671f4d5350b 100644
--- a/src/libs/qtcreatorcdbext/pyvalue.cpp
+++ b/src/libs/qtcreatorcdbext/pyvalue.cpp
@@ -13,8 +13,23 @@ constexpr bool debuggingValueEnabled() { return debugPyValue || debugPyCdbextMod
 
 static std::map<CIDebugSymbolGroup *, std::list<PyValue *>> valuesForSymbolGroup;
 
+void dumpSymbolGroup(CIDebugSymbolGroup *symbolGroup)
+{
+    if (!debuggingValueEnabled())
+        return;
+
+    ULONG count;
+    if (FAILED(symbolGroup->GetNumberSymbols(&count)))
+        return;
+    DebugPrint() << "Symbol group " << symbolGroup << " has " << count << " symbols";
+    for (ULONG i = 0; i < count; ++i)
+        DebugPrint() << "  " << i << ": " << PyValue(i, symbolGroup).name();
+}
+
 void PyValue::indicesMoved(CIDebugSymbolGroup *symbolGroup, ULONG start, ULONG delta)
 {
+    if (debuggingValueEnabled())
+        DebugPrint() << "PyValue::indicesMoved " << symbolGroup << " start " << start << " delta " << delta << "\n";
     if (delta == 0)
         return;
     ULONG count;
@@ -26,6 +41,7 @@ void PyValue::indicesMoved(CIDebugSymbolGroup *symbolGroup, ULONG start, ULONG d
         if (val->m_index >= start && val->m_index + delta < count)
             val->m_index += delta;
     }
+    dumpSymbolGroup(symbolGroup);
 }
 
 PyValue::PyValue(unsigned long index, CIDebugSymbolGroup *symbolGroup)
@@ -146,6 +162,7 @@ bool PyValue::expand()
         return false;
     if (params.Flags & DEBUG_SYMBOL_EXPANDED)
         return true;
+    dumpSymbolGroup(m_symbolGroup);
     if (FAILED(m_symbolGroup->ExpandSymbol(m_index, TRUE)))
         return false;
     if (FAILED(m_symbolGroup->GetSymbolParameters(m_index, 1, &params)))
diff --git a/src/libs/solutions/spinner/spinner.cpp b/src/libs/solutions/spinner/spinner.cpp
index b56684720bb..479467ae58d 100644
--- a/src/libs/solutions/spinner/spinner.cpp
+++ b/src/libs/solutions/spinner/spinner.cpp
@@ -72,6 +72,8 @@ public:
 
     void setUpdateCallback(const UpdateCallback &cb) { m_callback = cb; }
 
+    void setColor(const QColor &color);
+
     QSize size() const { return m_pixmap.size() / m_pixmap.devicePixelRatio(); }
     void paint(QPainter &painter, const QRect &rect) const;
     void startAnimation() { m_timer.start(); }
@@ -87,6 +89,7 @@ private:
     QTimer m_timer;
     mutable QPixmap m_pixmap;
     UpdateCallback m_callback;
+    QColor m_color;
 };
 
 static QString imageFileNameForSpinnerSize(SpinnerSize size)
@@ -102,12 +105,12 @@ static QString imageFileNameForSpinnerSize(SpinnerSize size)
     return {};
 }
 
-static QPixmap themedPixmapForSpinnerSize(SpinnerSize size, qreal dpr)
+static QPixmap themedPixmapForSpinnerSize(SpinnerSize size, const QColor &color, qreal dpr)
 {
     QImage mask(qt_findAtNxFile(imageFileNameForSpinnerSize(size), dpr));
     mask.invertPixels();
     QImage themedImage(mask.size(), QImage::Format_ARGB32);
-    themedImage.fill(qApp->palette().text().color());
+    themedImage.fill(color);
     themedImage.setAlphaChannel(mask);
     QPixmap themedPixmap = QPixmap::fromImage(themedImage);
     themedPixmap.setDevicePixelRatio(mask.devicePixelRatio());
@@ -115,6 +118,7 @@ static QPixmap themedPixmapForSpinnerSize(SpinnerSize size, qreal dpr)
 }
 
 SpinnerPainter::SpinnerPainter(SpinnerSize size)
+    : m_color(qApp->palette().text().color())
 {
     m_timer.setSingleShot(false);
     QObject::connect(&m_timer, &QTimer::timeout, &m_timer, [this] {
@@ -130,14 +134,20 @@ void SpinnerPainter::setSize(SpinnerSize size)
     m_size = size;
     m_rotationStep = size == SpinnerSize::Small ? 45 : 30;
     m_timer.setInterval(size == SpinnerSize::Small ? 100 : 80);
-    m_pixmap = themedPixmapForSpinnerSize(size, qApp->devicePixelRatio());
+    m_pixmap = themedPixmapForSpinnerSize(size, m_color, qApp->devicePixelRatio());
+}
+
+void SpinnerPainter::setColor(const QColor &color)
+{
+    m_color = color;
+    m_pixmap = themedPixmapForSpinnerSize(m_size, m_color, qApp->devicePixelRatio());
 }
 
 void SpinnerPainter::paint(QPainter &painter, const QRect &rect) const
 {
     const qreal dpr = painter.device()->devicePixelRatioF();
     if (!qFuzzyCompare(m_pixmap.devicePixelRatio(), dpr))
-        m_pixmap = themedPixmapForSpinnerSize(m_size, dpr);
+        m_pixmap = themedPixmapForSpinnerSize(m_size, m_color, dpr);
     painter.save();
     painter.setRenderHint(QPainter::SmoothPixmapTransform);
     QPoint translate(rect.x() + rect.width() / 2, rect.y() + rect.height() / 2);
@@ -173,6 +183,11 @@ public:
     }
     QSize sizeHint() const final { return m_paint.size(); }
 
+    void setColor(const QColor &color)
+    {
+        m_paint.setColor(color);
+    }
+
 protected:
     void showEvent(QShowEvent *) final { m_paint.startAnimation(); }
     void hideEvent(QHideEvent *) final { m_paint.stopAnimation(); }
@@ -231,6 +246,14 @@ void Spinner::setSize(SpinnerSize size)
     m_widget->setSize(size);
 }
 
+/*!
+    Sets the color of the spinner to \a color.
+*/
+void Spinner::setColor(const QColor &color)
+{
+    m_widget->setColor(color);
+}
+
 /*!
     Shows the animated spinner as an overlay for the parent widget
     set previously in the constructor.
diff --git a/src/libs/solutions/spinner/spinner.h b/src/libs/solutions/spinner/spinner.h
index 8ab7cb84d9a..8dd166a8640 100644
--- a/src/libs/solutions/spinner/spinner.h
+++ b/src/libs/solutions/spinner/spinner.h
@@ -27,6 +27,7 @@ class SPINNER_EXPORT Spinner : public QObject
 public:
     explicit Spinner(SpinnerSize size, QWidget *parent = nullptr);
     void setSize(SpinnerSize size);
+    void setColor(const QColor &color);
     void show();
     void hide();
     bool isVisible() const;
diff --git a/src/libs/solutions/spinner/spinner.qbs b/src/libs/solutions/spinner/spinner.qbs
index d02858d0484..74fefc89875 100644
--- a/src/libs/solutions/spinner/spinner.qbs
+++ b/src/libs/solutions/spinner/spinner.qbs
@@ -14,7 +14,7 @@ QtcLibrary {
 
     Export {
         Depends { name: "cpp" }
-        cpp.includePaths: ".."
+        cpp.includePaths: exportingProduct.sourceDirectory + "/.."
     }
 }
 
diff --git a/src/libs/solutions/tasking/barrier.cpp b/src/libs/solutions/tasking/barrier.cpp
index e160dbac769..126d4f3b8a5 100644
--- a/src/libs/solutions/tasking/barrier.cpp
+++ b/src/libs/solutions/tasking/barrier.cpp
@@ -1,36 +1,36 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 Jarek Kobus
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "barrier.h"
 
+QT_BEGIN_NAMESPACE
+
 namespace Tasking {
 
 // That's cut down qtcassert.{c,h} to avoid the dependency.
-#define QTC_STRINGIFY_HELPER(x) #x
-#define QTC_STRINGIFY(x) QTC_STRINGIFY_HELPER(x)
-#define QTC_STRING(cond) qDebug("SOFT ASSERT: \"%s\" in %s: %s", cond,  __FILE__, QTC_STRINGIFY(__LINE__))
-#define QTC_ASSERT(cond, action) if (Q_LIKELY(cond)) {} else { QTC_STRING(#cond); action; } do {} while (0)
-#define QTC_CHECK(cond) if (cond) {} else { QTC_STRING(#cond); } do {} while (0)
+#define QT_STRING(cond) qDebug("SOFT ASSERT: \"%s\" in %s: %s", cond,  __FILE__, QT_STRINGIFY(__LINE__))
+#define QT_ASSERT(cond, action) if (Q_LIKELY(cond)) {} else { QT_STRING(#cond); action; } do {} while (0)
 
 void Barrier::setLimit(int value)
 {
-    QTC_ASSERT(!isRunning(), return);
-    QTC_ASSERT(value > 0, return);
+    QT_ASSERT(!isRunning(), return);
+    QT_ASSERT(value > 0, return);
 
     m_limit = value;
 }
 
 void Barrier::start()
 {
-    QTC_ASSERT(!isRunning(), return);
+    QT_ASSERT(!isRunning(), return);
     m_current = 0;
-    m_result = {};
+    m_result.reset();
 }
 
 void Barrier::advance()
 {
     // Calling advance on finished is OK
-    QTC_ASSERT(isRunning() || m_result, return);
+    QT_ASSERT(isRunning() || m_result, return);
     if (!isRunning()) // no-op
         return;
     ++m_current;
@@ -41,7 +41,7 @@ void Barrier::advance()
 void Barrier::stopWithResult(DoneResult result)
 {
     // Calling stopWithResult on finished is OK when the same success is passed
-    QTC_ASSERT(isRunning() || (m_result && *m_result == result), return);
+    QT_ASSERT(isRunning() || (m_result && *m_result == result), return);
     if (!isRunning()) // no-op
         return;
     m_current = -1;
@@ -50,3 +50,5 @@ void Barrier::stopWithResult(DoneResult result)
 }
 
 } // namespace Tasking
+
+QT_END_NAMESPACE
diff --git a/src/libs/solutions/tasking/barrier.h b/src/libs/solutions/tasking/barrier.h
index a9ed9949f06..a484844d38e 100644
--- a/src/libs/solutions/tasking/barrier.h
+++ b/src/libs/solutions/tasking/barrier.h
@@ -1,12 +1,16 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 Jarek Kobus
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#pragma once
+#ifndef TASKING_BARRIER_H
+#define TASKING_BARRIER_H
 
 #include "tasking_global.h"
 
 #include "tasktree.h"
 
+QT_BEGIN_NAMESPACE
+
 namespace Tasking {
 
 class TASKING_EXPORT Barrier final : public QObject
@@ -25,7 +29,7 @@ public:
     int current() const { return m_current; }
     std::optional<DoneResult> result() const { return m_result; }
 
-signals:
+Q_SIGNALS:
     void done(DoneResult success);
 
 private:
@@ -91,3 +95,7 @@ GroupItem waitForBarrierTask(const MultiBarrier<Limit> &sharedBarrier)
 }
 
 } // namespace Tasking
+
+QT_END_NAMESPACE
+
+#endif // TASKING_BARRIER_H
diff --git a/src/libs/solutions/tasking/concurrentcall.h b/src/libs/solutions/tasking/concurrentcall.h
index 6bd44601318..ae1fcd17cd5 100644
--- a/src/libs/solutions/tasking/concurrentcall.h
+++ b/src/libs/solutions/tasking/concurrentcall.h
@@ -1,11 +1,15 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 Jarek Kobus
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#pragma once
+#ifndef TASKING_CONCURRENTCALL_H
+#define TASKING_CONCURRENTCALL_H
 
 #include "tasktree.h"
 
-#include <QtConcurrent>
+#include <QtConcurrent/QtConcurrent>
+
+QT_BEGIN_NAMESPACE
 
 namespace Tasking {
 
@@ -76,7 +80,7 @@ public:
         }
     }
 
-    void start() {
+    void start() final {
         if (!this->task()->m_startHandler) {
             emit this->done(DoneResult::Error); // TODO: Add runtime assert
             return;
@@ -98,3 +102,7 @@ template <typename T>
 using ConcurrentCallTask = CustomTask<ConcurrentCallTaskAdapter<T>>;
 
 } // namespace Tasking
+
+QT_END_NAMESPACE
+
+#endif // TASKING_CONCURRENTCALL_H
diff --git a/src/libs/solutions/tasking/networkquery.cpp b/src/libs/solutions/tasking/networkquery.cpp
index 335f79afd94..30789ec925b 100644
--- a/src/libs/solutions/tasking/networkquery.cpp
+++ b/src/libs/solutions/tasking/networkquery.cpp
@@ -1,9 +1,12 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 Jarek Kobus
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 #include "networkquery.h"
 
-#include <QNetworkAccessManager>
+#include <QtNetwork/QNetworkAccessManager>
+
+QT_BEGIN_NAMESPACE
 
 namespace Tasking {
 
@@ -51,3 +54,5 @@ NetworkQuery::~NetworkQuery()
 }
 
 } // namespace Tasking
+
+QT_END_NAMESPACE
diff --git a/src/libs/solutions/tasking/networkquery.h b/src/libs/solutions/tasking/networkquery.h
index dd099dc7a88..6d288486712 100644
--- a/src/libs/solutions/tasking/networkquery.h
+++ b/src/libs/solutions/tasking/networkquery.h
@@ -1,20 +1,21 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 Jarek Kobus
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-#pragma once
+#ifndef TASKING_NETWORKQUERY_H
+#define TASKING_NETWORKQUERY_H
 
 #include "tasking_global.h"
 
 #include "tasktree.h"
 
-#include <QNetworkReply>
-#include <QNetworkRequest>
+#include <QtNetwork/QNetworkReply>
+#include <QtNetwork/QNetworkRequest>
 
 #include <memory>
 
 QT_BEGIN_NAMESPACE
 class QNetworkAccessManager;
-QT_END_NAMESPACE
 
 namespace Tasking {
 
@@ -37,7 +38,7 @@ public:
     QNetworkReply *reply() const { return m_reply.get(); }
     void start();
 
-signals:
+Q_SIGNALS:
     void started();
     void done(DoneResult result);
 
@@ -59,3 +60,7 @@ public:
 using NetworkQueryTask = CustomTask<NetworkQueryTaskAdapter>;
 
 } // namespace Tasking
+
+QT_END_NAMESPACE
+
+#endif // TASKING_NETWORKQUERY_H
diff --git a/src/libs/solutions/tasking/qprocesstask.cpp b/src/libs/solutions/tasking/qprocesstask.cpp
index 7d63e658478..b0a61986a38 100644
--- a/src/libs/solutions/tasking/qprocesstask.cpp
+++ b/src/libs/solutions/tasking/qprocesstask.cpp
@@ -1,14 +1,19 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 Jarek Kobus
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 #include "qprocesstask.h"
 
-#include <QCoreApplication>
-#include <QDebug>
-#include <QMutex>
-#include <QThread>
-#include <QTimer>
-#include <QWaitCondition>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+#include <QtCore/QMutex>
+#include <QtCore/QThread>
+#include <QtCore/QTimer>
+#include <QtCore/QWaitCondition>
+
+QT_BEGIN_NAMESPACE
+
+#if QT_CONFIG(process)
 
 namespace Tasking {
 
@@ -60,7 +65,7 @@ public:
         terminate();
     }
 
-signals:
+Q_SIGNALS:
     void finished();
 
 private:
@@ -262,4 +267,13 @@ void QProcessDeleter::operator()(QProcess *process)
 
 } // namespace Tasking
 
+#endif // QT_CONFIG(process)
+
+QT_END_NAMESPACE
+
+#if QT_CONFIG(process)
+
 #include "qprocesstask.moc"
+
+#endif // QT_CONFIG(process)
+
diff --git a/src/libs/solutions/tasking/qprocesstask.h b/src/libs/solutions/tasking/qprocesstask.h
index cc0b83698b8..3b06e624fb5 100644
--- a/src/libs/solutions/tasking/qprocesstask.h
+++ b/src/libs/solutions/tasking/qprocesstask.h
@@ -1,13 +1,19 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 Jarek Kobus
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#pragma once
+#ifndef TASKING_QPROCESSTASK_H
+#define TASKING_QPROCESSTASK_H
 
 #include "tasking_global.h"
 
 #include "tasktree.h"
 
-#include <QProcess>
+#include <QtCore/QProcess>
+
+QT_BEGIN_NAMESPACE
+
+#if QT_CONFIG(process)
 
 namespace Tasking {
 
@@ -45,17 +51,17 @@ public:
 class TASKING_EXPORT QProcessAdapter : public TaskAdapter<QProcess, QProcessDeleter>
 {
 private:
-    void start() override {
+    void start() final {
         connect(task(), &QProcess::finished, this, [this] {
             const bool success = task()->exitStatus() == QProcess::NormalExit
                                  && task()->error() == QProcess::UnknownError
                                  && task()->exitCode() == 0;
-            emit done(toDoneResult(success));
+            Q_EMIT done(toDoneResult(success));
         });
         connect(task(), &QProcess::errorOccurred, this, [this](QProcess::ProcessError error) {
             if (error != QProcess::FailedToStart)
                 return;
-            emit done(DoneResult::Error);
+            Q_EMIT done(DoneResult::Error);
         });
         task()->start();
     }
@@ -64,3 +70,9 @@ private:
 using QProcessTask = CustomTask<QProcessAdapter>;
 
 } // namespace Tasking
+
+#endif // QT_CONFIG(process)
+
+QT_END_NAMESPACE
+
+#endif // TASKING_QPROCESSTASK_H
diff --git a/src/libs/solutions/tasking/tasking.qbs b/src/libs/solutions/tasking/tasking.qbs
index 3b69d7449ff..f0601530d1c 100644
--- a/src/libs/solutions/tasking/tasking.qbs
+++ b/src/libs/solutions/tasking/tasking.qbs
@@ -22,7 +22,10 @@ QtcLibrary {
 
     Export {
         Depends { name: "cpp" }
-        cpp.includePaths: ["..", "../.."]
+        cpp.includePaths: [
+            exportingProduct.sourceDirectory + "/..",
+            exportingProduct.sourceDirectory + "/../.."
+        ]
     }
 }
 
diff --git a/src/libs/solutions/tasking/tasking_global.h b/src/libs/solutions/tasking/tasking_global.h
index d7e76fa9e6f..024d7e33036 100644
--- a/src/libs/solutions/tasking/tasking_global.h
+++ b/src/libs/solutions/tasking/tasking_global.h
@@ -1,9 +1,12 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#pragma once
+#ifndef TASKING_GLOBAL_H
+#define TASKING_GLOBAL_H
 
-#include <qglobal.h>
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
 
 #if defined(TASKING_LIBRARY)
 #  define TASKING_EXPORT Q_DECL_EXPORT
@@ -12,3 +15,7 @@
 #else
 #  define TASKING_EXPORT Q_DECL_IMPORT
 #endif
+
+QT_END_NAMESPACE
+
+#endif // TASKING_GLOBAL_H
diff --git a/src/libs/solutions/tasking/tasktree.cpp b/src/libs/solutions/tasking/tasktree.cpp
index 7d37bf97587..91bdaf2d9e1 100644
--- a/src/libs/solutions/tasking/tasktree.cpp
+++ b/src/libs/solutions/tasking/tasktree.cpp
@@ -1,22 +1,28 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 Jarek Kobus
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "tasktree.h"
 
-#include <QDebug>
-#include <QEventLoop>
-#include <QFutureWatcher>
-#include <QHash>
-#include <QMetaEnum>
-#include <QMutex>
-#include <QPromise>
-#include <QPointer>
-#include <QSet>
-#include <QTime>
-#include <QTimer>
+#include "barrier.h"
 
+#include <QtCore/QDebug>
+#include <QtCore/QEventLoop>
+#include <QtCore/QFutureWatcher>
+#include <QtCore/QHash>
+#include <QtCore/QMetaEnum>
+#include <QtCore/QMutex>
+#include <QtCore/QPointer>
+#include <QtCore/QPromise>
+#include <QtCore/QSet>
+#include <QtCore/QTime>
+#include <QtCore/QTimer>
+
+using namespace Qt::StringLiterals;
 using namespace std::chrono;
 
+QT_BEGIN_NAMESPACE
+
 namespace Tasking {
 
 // That's cut down qtcassert.{c,h} to avoid the dependency.
@@ -672,7 +678,7 @@ private:
 /*!
     \typealias CustomTask::TaskDoneHandler
 
-    Type alias for \c std::function<DoneResult(const Task &, DoneWith)>.
+    Type alias for \c std::function<DoneResult(const Task &, DoneWith)> or DoneResult.
 
     The \c TaskDoneHandler is an optional argument of a custom task element's constructor.
     Any function with the above signature, when passed as a task done handler,
@@ -697,6 +703,9 @@ private:
     the DoneWith argument. When the handler returns the DoneResult value,
     the task's final result may be tweaked inside the done handler's body by the returned value.
 
+    For a \c TaskDoneHandler of the DoneResult type, no additional handling is executed,
+    and the task finishes unconditionally with the passed value of DoneResult.
+
     \sa CustomTask(), TaskSetupHandler, GroupDoneHandler
 */
 
@@ -881,6 +890,20 @@ private:
     \sa sequential, parallelLimit()
 */
 
+/*!
+    \variable parallelIdealThreadCountLimit
+    A convenient global group's element describing the parallel execution mode with a limited
+    number of tasks running simultanously. The limit is equal to the ideal number of threads
+    excluding the calling thread.
+
+    This is a shortcut to:
+    \code
+        parallelLimit(qMax(QThread::idealThreadCount() - 1, 1))
+    \endcode
+
+    \sa parallel, parallelLimit()
+*/
+
 /*!
     \variable stopOnError
     A convenient global group's element describing the StopOnError workflow policy.
@@ -1037,7 +1060,7 @@ private:
 /*!
     \typealias GroupItem::GroupDoneHandler
 
-    Type alias for \c std::function<DoneResult(DoneWith)>.
+    Type alias for \c std::function<DoneResult(DoneWith)> or DoneResult.
 
     The \c GroupDoneHandler is an argument of the onGroupDone() element.
     Any function with the above signature, when passed as a group done handler,
@@ -1052,6 +1075,10 @@ private:
     the DoneWith argument. When the handler returns the DoneResult value,
     the group's final result may be tweaked inside the done handler's body by the returned value.
 
+    For a \c GroupDoneHandler of the DoneResult type, no additional handling is executed,
+    and the group finishes unconditionally with the passed value of DoneResult,
+    ignoring the group's workflow policy.
+
     \sa onGroupDone(), GroupSetupHandler, CustomTask::TaskDoneHandler
 */
 
@@ -1161,6 +1188,7 @@ const GroupItem nullItem = GroupItem({});
 
 const GroupItem sequential = parallelLimit(1);
 const GroupItem parallel = parallelLimit(0);
+const GroupItem parallelIdealThreadCountLimit = parallelLimit(qMax(QThread::idealThreadCount() - 1, 1));
 
 const GroupItem stopOnError = workflowPolicy(WorkflowPolicy::StopOnError);
 const GroupItem continueOnError = workflowPolicy(WorkflowPolicy::ContinueOnError);
@@ -1271,6 +1299,12 @@ const void *Loop::valuePtr() const
 
 using StoragePtr = void *;
 
+static constexpr QLatin1StringView s_activeStorageWarning =
+    "The referenced storage is not reachable in the running tree. "
+    "A nullptr will be returned which might lead to a crash in the calling code. "
+    "It is possible that no storage was added to the tree, "
+    "or the storage is not reachable from where it is referenced."_L1;
+
 class StorageThreadData
 {
     Q_DISABLE_COPY_MOVE(StorageThreadData)
@@ -1279,7 +1313,7 @@ public:
     StorageThreadData() = default;
     void pushStorage(StoragePtr storagePtr)
     {
-        m_activeStorageStack.push_back(storagePtr);
+        m_activeStorageStack.push_back({storagePtr, activeTaskTree()});
     }
     void popStorage()
     {
@@ -1288,16 +1322,16 @@ public:
     }
     StoragePtr activeStorage() const
     {
-        QT_ASSERT(m_activeStorageStack.size(), qWarning(
-            "The referenced storage is not reachable in the running tree. "
-            "A nullptr will be returned which might lead to a crash in the calling code. "
-            "It is possible that no storage was added to the tree, "
-            "or the storage is not reachable from where it is referenced."); return nullptr);
-        return m_activeStorageStack.last();
+        QT_ASSERT(m_activeStorageStack.size(),
+                  qWarning().noquote() << s_activeStorageWarning; return nullptr);
+        const QPair<StoragePtr, TaskTree *> &top = m_activeStorageStack.last();
+        QT_ASSERT(top.second == activeTaskTree(),
+                  qWarning().noquote() << s_activeStorageWarning; return nullptr);
+        return top.first;
     }
 
 private:
-    QList<StoragePtr> m_activeStorageStack;
+    QList<QPair<StoragePtr, TaskTree *>> m_activeStorageStack;
 };
 
 class StorageData
@@ -1430,6 +1464,11 @@ ExecutableItem ExecutableItem::withTimeout(milliseconds timeout,
 
 static QString currentTime() { return QTime::currentTime().toString(Qt::ISODateWithMs); }
 
+static QString logHeader(const QString &logName)
+{
+    return QString::fromLatin1("TASK TREE LOG [%1] \"%2\"").arg(currentTime(), logName);
+};
+
 /*!
     Attaches a custom debug printout to a copy of \c this ExecutableItem,
     issued on task startup and after the task is finished, and returns the coupled item.
@@ -1443,9 +1482,6 @@ static QString currentTime() { return QTime::currentTime().toString(Qt::ISODateW
 */
 ExecutableItem ExecutableItem::withLog(const QString &logName) const
 {
-    const auto header = [logName] {
-        return QString("TASK TREE LOG [%1] \"%2\"").arg(currentTime(), logName);
-    };
     struct LogStorage
     {
         time_point<system_clock, nanoseconds> start;
@@ -1454,25 +1490,43 @@ ExecutableItem ExecutableItem::withLog(const QString &logName) const
     const Storage<LogStorage> storage;
     return Group {
         storage,
-        onGroupSetup([storage, header] {
+        onGroupSetup([storage, logName] {
             storage->start = system_clock::now();
             storage->asyncCount = activeTaskTree()->asyncCount();
-            qDebug().noquote() << header() << "started.";
+            qDebug().noquote().nospace() << logHeader(logName) << " started.";
         }),
         *this,
-        onGroupDone([storage, header](DoneWith result) {
+        onGroupDone([storage, logName](DoneWith result) {
             const auto elapsed = duration_cast<milliseconds>(system_clock::now() - storage->start);
             const int asyncCountDiff = activeTaskTree()->asyncCount() - storage->asyncCount;
             QT_CHECK(asyncCountDiff >= 0);
             const QMetaEnum doneWithEnum = QMetaEnum::fromType<DoneWith>();
-            const QString syncType = asyncCountDiff ? QString("asynchronously")
-                                                    : QString("synchronously");
-            qDebug().noquote().nospace() << header() << " finished " << syncType << " with "
-                << doneWithEnum.valueToKey(int(result)) << " within " << elapsed.count() << "ms.";
+            const QString syncType = asyncCountDiff ? QString::fromLatin1("asynchronously")
+                                                    : QString::fromLatin1("synchronously");
+            qDebug().noquote().nospace() << logHeader(logName) << " finished " << syncType
+                                         << " with " << doneWithEnum.valueToKey(int(result))
+                                         << " within " << elapsed.count() << "ms.";
         })
     };
 }
 
+ExecutableItem ExecutableItem::withCancelImpl(
+    const std::function<void(QObject *, const std::function<void()> &)> &connectWrapper) const
+{
+    const auto onSetup = [connectWrapper](Barrier &barrier) {
+        connectWrapper(&barrier, [barrierPtr = &barrier] { barrierPtr->advance(); });
+    };
+    return Group {
+        parallel,
+        stopOnSuccessOrError,
+        Group {
+            finishAllAndError,
+            BarrierTask(onSetup)
+        },
+        *this
+    };
+}
+
 class TaskTreePrivate;
 class TaskNode;
 class RuntimeContainer;
@@ -1941,23 +1995,24 @@ SetupResult TaskTreePrivate::continueStart(RuntimeContainer *container, SetupRes
 {
     const SetupResult groupAction = startAction == SetupResult::Continue ? startChildren(container)
                                                                          : startAction;
-    if (groupAction != SetupResult::Continue) {
-        const bool bit = container->updateSuccessBit(groupAction == SetupResult::StopWithSuccess);
-        RuntimeIteration *parentIteration = container->parentIteration();
-        RuntimeTask *parentTask = container->m_parentTask;
-        QT_CHECK(parentTask);
-        const bool result = invokeDoneHandler(container, bit ? DoneWith::Success : DoneWith::Error);
-        if (parentIteration) {
-            parentIteration->deleteChild(parentTask);
-            if (!parentIteration->m_container->isStarting())
-                childDone(parentIteration, result);
-        } else {
-            QT_CHECK(m_runtimeRoot.get() == parentTask);
-            m_runtimeRoot.reset();
-            emitDone(result ? DoneWith::Success : DoneWith::Error);
-        }
+    if (groupAction == SetupResult::Continue)
+        return groupAction;
+
+    const bool bit = container->updateSuccessBit(groupAction == SetupResult::StopWithSuccess);
+    RuntimeIteration *parentIteration = container->parentIteration();
+    RuntimeTask *parentTask = container->m_parentTask;
+    QT_CHECK(parentTask);
+    const bool result = invokeDoneHandler(container, bit ? DoneWith::Success : DoneWith::Error);
+    if (parentIteration) {
+        parentIteration->deleteChild(parentTask);
+        if (!parentIteration->m_container->isStarting())
+            childDone(parentIteration, result);
+    } else {
+        QT_CHECK(m_runtimeRoot.get() == parentTask);
+        m_runtimeRoot.reset();
+        emitDone(result ? DoneWith::Success : DoneWith::Error);
     }
-    return groupAction;
+    return toSetupResult(result);
 }
 
 SetupResult TaskTreePrivate::startChildren(RuntimeContainer *container)
@@ -2389,7 +2444,7 @@ bool TaskTreePrivate::invokeDoneHandler(RuntimeTask *node, DoneWith doneWith)
     \section2 Task's Done Handler
 
     When a running task finishes, the task tree invokes an optionally provided done handler.
-    The handler should always take a \c const \e reference to the associated task class object:
+    The handler should take a \c const \e reference to the associated task class object:
 
     \code
         const auto onSetup = [](QProcess &process) {
@@ -3346,7 +3401,7 @@ TimeoutTaskAdapter::~TimeoutTaskAdapter()
 void TimeoutTaskAdapter::start()
 {
     m_timerId = scheduleTimeout(*task(), this, [this] {
-        m_timerId = {};
+        m_timerId.reset();
         emit done(DoneResult::Success);
     });
 }
@@ -3381,3 +3436,5 @@ void TimeoutTaskAdapter::start()
 */
 
 } // namespace Tasking
+
+QT_END_NAMESPACE
diff --git a/src/libs/solutions/tasking/tasktree.h b/src/libs/solutions/tasking/tasktree.h
index 8ea255303ba..308069edccf 100644
--- a/src/libs/solutions/tasking/tasktree.h
+++ b/src/libs/solutions/tasking/tasktree.h
@@ -1,19 +1,20 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 Jarek Kobus
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#pragma once
+#ifndef TASKING_TASKTREE_H
+#define TASKING_TASKTREE_H
 
 #include "tasking_global.h"
 
-#include <QObject>
-#include <QList>
+#include <QtCore/QList>
+#include <QtCore/QObject>
 
 #include <memory>
 
 QT_BEGIN_NAMESPACE
 template <class T>
 class QFuture;
-QT_END_NAMESPACE
 
 namespace Tasking {
 
@@ -41,7 +42,7 @@ enum class WorkflowPolicy
     FinishAllAndSuccess,  // 4  - Reports success after all children finished.
     FinishAllAndError     // 5  - Reports error after all children finished.
 };
-Q_ENUM_NS(WorkflowPolicy);
+Q_ENUM_NS(WorkflowPolicy)
 
 enum class SetupResult
 {
@@ -49,14 +50,14 @@ enum class SetupResult
     StopWithSuccess,
     StopWithError
 };
-Q_ENUM_NS(SetupResult);
+Q_ENUM_NS(SetupResult)
 
 enum class DoneResult
 {
     Success,
     Error
 };
-Q_ENUM_NS(DoneResult);
+Q_ENUM_NS(DoneResult)
 
 enum class DoneWith
 {
@@ -64,7 +65,7 @@ enum class DoneWith
     Error,
     Cancel
 };
-Q_ENUM_NS(DoneWith);
+Q_ENUM_NS(DoneWith)
 
 enum class CallDoneIf
 {
@@ -72,7 +73,7 @@ enum class CallDoneIf
     Success,
     Error
 };
-Q_ENUM_NS(CallDoneIf);
+Q_ENUM_NS(CallDoneIf)
 
 TASKING_EXPORT DoneResult toDoneResult(bool success);
 
@@ -84,7 +85,7 @@ class TASKING_EXPORT TaskInterface : public QObject
 {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void done(DoneResult result);
 
 private:
@@ -187,7 +188,7 @@ public:
     }
 
 private:
-    static StorageConstructor ctor() { return [] { return new StorageStruct; }; }
+    static StorageConstructor ctor() { return [] { return new StorageStruct(); }; }
     static StorageDestructor dtor() {
         return [](void *storage) { delete static_cast<StorageStruct *>(storage); };
     }
@@ -290,10 +291,25 @@ public:
     ExecutableItem withTimeout(std::chrono::milliseconds timeout,
                                const std::function<void()> &handler = {}) const;
     ExecutableItem withLog(const QString &logName) const;
+    template <typename SenderSignalPairGetter>
+    ExecutableItem withCancel(SenderSignalPairGetter &&getter) const
+    {
+        const auto connectWrapper = [getter](QObject *guard, const std::function<void()> &trigger) {
+            const auto senderSignalPair = getter();
+            QObject::connect(senderSignalPair.first, senderSignalPair.second, guard, [trigger] {
+                trigger();
+            }, static_cast<Qt::ConnectionType>(Qt::QueuedConnection | Qt::SingleShotConnection));
+        };
+        return withCancelImpl(connectWrapper);
+    }
 
 protected:
     ExecutableItem() = default;
     ExecutableItem(const TaskHandler &handler) : GroupItem(handler) {}
+
+private:
+    ExecutableItem withCancelImpl(
+        const std::function<void(QObject *, const std::function<void()> &)> &connectWrapper) const;
 };
 
 class TASKING_EXPORT Group : public ExecutableItem
@@ -330,19 +346,23 @@ private:
             std::invoke(handler);
             return SetupResult::Continue;
         };
-    };
+    }
     template <typename Handler>
     static GroupDoneHandler wrapGroupDone(Handler &&handler)
     {
+        static constexpr bool isDoneResultType = std::is_same_v<Handler, DoneResult>;
         // R, V, D stands for: Done[R]esult, [V]oid, [D]oneWith
         static constexpr bool isRD = isInvocable<DoneResult, Handler, DoneWith>();
         static constexpr bool isR = isInvocable<DoneResult, Handler>();
         static constexpr bool isVD = isInvocable<void, Handler, DoneWith>();
         static constexpr bool isV = isInvocable<void, Handler>();
-        static_assert(isRD || isR || isVD || isV,
+        static_assert(isDoneResultType || isRD || isR || isVD || isV,
             "Group done handler needs to take (DoneWith) or (void) as an argument and has to "
-            "return void or DoneResult. The passed handler doesn't fulfill these requirements.");
+            "return void or DoneResult. Alternatively, it may be of DoneResult type. "
+            "The passed handler doesn't fulfill these requirements.");
         return [handler](DoneWith result) {
+            if constexpr (isDoneResultType)
+                return handler;
             if constexpr (isRD)
                 return std::invoke(handler, result);
             if constexpr (isR)
@@ -353,7 +373,7 @@ private:
                 std::invoke(handler);
             return result == DoneWith::Success ? DoneResult::Success : DoneResult::Error;
         };
-    };
+    }
 };
 
 template <typename Handler>
@@ -375,6 +395,7 @@ TASKING_EXPORT extern const GroupItem nullItem;
 
 TASKING_EXPORT extern const GroupItem sequential;
 TASKING_EXPORT extern const GroupItem parallel;
+TASKING_EXPORT extern const GroupItem parallelIdealThreadCountLimit;
 
 TASKING_EXPORT extern const GroupItem stopOnError;
 TASKING_EXPORT extern const GroupItem continueOnError;
@@ -417,7 +438,7 @@ private:
             std::invoke(handler);
             return SetupResult::StopWithSuccess;
         };
-    };
+    }
 };
 
 template <typename Task, typename Deleter = std::default_delete<Task>>
@@ -474,12 +495,13 @@ private:
             std::invoke(handler, *adapter.task());
             return SetupResult::Continue;
         };
-    };
+    }
 
     template <typename Handler>
     static InterfaceDoneHandler wrapDone(Handler &&handler) {
         if constexpr (std::is_same_v<Handler, TaskDoneHandler>)
-            return {}; // When user passed {} for the done handler.
+            return {}; // User passed {} for the done handler.
+        static constexpr bool isDoneResultType = std::is_same_v<Handler, DoneResult>;
         // R, V, T, D stands for: Done[R]esult, [V]oid, [T]ask, [D]oneWith
         static constexpr bool isRTD = isInvocable<DoneResult, Handler, const Task &, DoneWith>();
         static constexpr bool isRT = isInvocable<DoneResult, Handler, const Task &>();
@@ -489,11 +511,14 @@ private:
         static constexpr bool isVT = isInvocable<void, Handler, const Task &>();
         static constexpr bool isVD = isInvocable<void, Handler, DoneWith>();
         static constexpr bool isV = isInvocable<void, Handler>();
-        static_assert(isRTD || isRT || isRD || isR || isVTD || isVT || isVD || isV,
+        static_assert(isDoneResultType || isRTD || isRT || isRD || isR || isVTD || isVT || isVD || isV,
             "Task done handler needs to take (const Task &, DoneWith), (const Task &), "
             "(DoneWith) or (void) as arguments and has to return void or DoneResult. "
+            "Alternatively, it may be of DoneResult type. "
             "The passed handler doesn't fulfill these requirements.");
         return [handler](const TaskInterface &taskInterface, DoneWith result) {
+            if constexpr (isDoneResultType)
+                return handler;
             const Adapter &adapter = static_cast<const Adapter &>(taskInterface);
             if constexpr (isRTD)
                 return std::invoke(handler, *adapter.task(), result);
@@ -513,7 +538,7 @@ private:
                 std::invoke(handler);
             return result == DoneWith::Success ? DoneResult::Success : DoneResult::Error;
         };
-    };
+    }
 };
 
 class TASKING_EXPORT TaskTree final : public QObject
@@ -563,7 +588,7 @@ public:
                             wrapHandler<const StorageStruct>(std::forward<Handler>(handler)));
     }
 
-signals:
+Q_SIGNALS:
     void started();
     void done(DoneWith result);
     void asyncCountChanged(int count);
@@ -608,3 +633,7 @@ using TaskTreeTask = CustomTask<TaskTreeTaskAdapter>;
 using TimeoutTask = CustomTask<TimeoutTaskAdapter>;
 
 } // namespace Tasking
+
+QT_END_NAMESPACE
+
+#endif // TASKING_TASKTREE_H
diff --git a/src/libs/solutions/tasking/tasktreerunner.cpp b/src/libs/solutions/tasking/tasktreerunner.cpp
index 0f7e96db088..d0daa5daaed 100644
--- a/src/libs/solutions/tasking/tasktreerunner.cpp
+++ b/src/libs/solutions/tasking/tasktreerunner.cpp
@@ -1,3 +1,4 @@
+// Copyright (C) 2024 Jarek Kobus
 // Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
@@ -5,6 +6,8 @@
 
 #include "tasktree.h"
 
+QT_BEGIN_NAMESPACE
+
 namespace Tasking {
 
 TaskTreeRunner::~TaskTreeRunner() = default;
@@ -38,3 +41,5 @@ void TaskTreeRunner::reset()
 }
 
 } // namespace Tasking
+
+QT_END_NAMESPACE
diff --git a/src/libs/solutions/tasking/tasktreerunner.h b/src/libs/solutions/tasking/tasktreerunner.h
index 92d9f9c0b45..ba41c0913fd 100644
--- a/src/libs/solutions/tasking/tasktreerunner.h
+++ b/src/libs/solutions/tasking/tasktreerunner.h
@@ -1,12 +1,16 @@
+// Copyright (C) 2024 Jarek Kobus
 // Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#pragma once
+#ifndef TASKING_TASKTREERUNNER_H
+#define TASKING_TASKTREERUNNER_H
 
 #include "tasking_global.h"
 #include "tasktree.h"
 
-#include <QObject>
+#include <QtCore/QObject>
+
+QT_BEGIN_NAMESPACE
 
 namespace Tasking {
 
@@ -33,7 +37,7 @@ public:
     // No done() signal is emitted.
     void reset();
 
-signals:
+Q_SIGNALS:
     void aboutToStart(TaskTree *taskTree);
     void done(DoneWith result);
 
@@ -42,3 +46,7 @@ private:
 };
 
 } // namespace Tasking
+
+QT_END_NAMESPACE
+
+#endif // TASKING_TASKTREERUNNER_H
diff --git a/src/libs/sqlite/CMakeLists.txt b/src/libs/sqlite/CMakeLists.txt
index d0657468efc..b010cfb0f2a 100644
--- a/src/libs/sqlite/CMakeLists.txt
+++ b/src/libs/sqlite/CMakeLists.txt
@@ -81,4 +81,6 @@ extend_qtc_library(Sqlite
 extend_qtc_library(Sqlite
   CONDITION QTC_STATIC_BUILD
   PRIVATE_COMPILE_OPTIONS $<IF:$<CXX_COMPILER_ID:MSVC>,/FIsqlite_static_config.h,-includesqlite_static_config.h>
+  PROPERTIES
+    INTERFACE_COMPILE_OPTIONS $<IF:$<CXX_COMPILER_ID:MSVC>,/FI../3rdparty/sqlite/sqlite_static_config.h,-include../3rdparty/sqlite/sqlite_static_config.h>
 )
diff --git a/src/libs/sqlite/sqlitevalue.h b/src/libs/sqlite/sqlitevalue.h
index 725682494bd..7adadb43b35 100644
--- a/src/libs/sqlite/sqlitevalue.h
+++ b/src/libs/sqlite/sqlitevalue.h
@@ -373,18 +373,18 @@ private:
         if (value.isNull())
             return VariantType{NullValue{}};
 
-        switch (value.userType()) {
-        case QVariant::Int:
+        switch (value.typeId()) {
+        case QMetaType::Int:
             return VariantType{static_cast<long long>(value.toInt())};
-        case QVariant::LongLong:
+        case QMetaType::LongLong:
             return VariantType{value.toLongLong()};
-        case QVariant::UInt:
+        case QMetaType::UInt:
             return VariantType{static_cast<long long>(value.toUInt())};
-        case QVariant::Double:
+        case QMetaType::Double:
             return VariantType{value.toFloat()};
-        case QVariant::String:
+        case QMetaType::QString:
             return VariantType{value.toString()};
-        case QVariant::ByteArray:
+        case QMetaType::QByteArray:
             return VariantType{Blob{value.toByteArray()}};
         default:
             throw CannotConvert();
diff --git a/src/libs/tracing/CMakeLists.txt b/src/libs/tracing/CMakeLists.txt
index e89f31f9cc8..cd0014f0d2d 100644
--- a/src/libs/tracing/CMakeLists.txt
+++ b/src/libs/tracing/CMakeLists.txt
@@ -105,3 +105,7 @@ qt_add_qml_module(Tracing
   SOURCES
     ${TRACING_CPP_SOURCES}
 )
+extend_qtc_library(Tracing
+  INCLUDES
+    ../utils/theme
+)
diff --git a/src/libs/tracing/timelineitemsrenderpass.cpp b/src/libs/tracing/timelineitemsrenderpass.cpp
index b93bd83b427..5b50a153e6c 100644
--- a/src/libs/tracing/timelineitemsrenderpass.cpp
+++ b/src/libs/tracing/timelineitemsrenderpass.cpp
@@ -464,11 +464,7 @@ bool TimelineItemsMaterialShader::updateUniformData(RenderState &state,
 TimelineItemsMaterial::TimelineItemsMaterial() : m_selectedItem(-1)
 {
     setFlag(QSGMaterial::Blending, false);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
     setFlag(QSGMaterial::NoBatching, true);
-#else
-    setFlag(QSGMaterial::CustomCompileStep, true);
-#endif // >= Qt 6.3/6.0
 }
 
 QVector2D TimelineItemsMaterial::scale() const
diff --git a/src/libs/tracing/timelinenotesrenderpass.cpp b/src/libs/tracing/timelinenotesrenderpass.cpp
index 0f3fa00de32..c0cfa368b5c 100644
--- a/src/libs/tracing/timelinenotesrenderpass.cpp
+++ b/src/libs/tracing/timelinenotesrenderpass.cpp
@@ -152,11 +152,7 @@ TimelineNotesRenderPassState::TimelineNotesRenderPassState(int numExpandedRows)
     m_nullGeometry(NotesGeometry::point2DWithDistanceFromTop(), 0)
 {
     m_material.setFlag(QSGMaterial::Blending, true);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
     m_material.setFlag(QSGMaterial::NoBatching, true);
-#else
-    m_material.setFlag(QSGMaterial::CustomCompileStep, true);
-#endif // >= Qt 6.3
     m_expandedRows.reserve(numExpandedRows);
     for (int i = 0; i < numExpandedRows; ++i)
         m_expandedRows << createNode();
@@ -221,7 +217,7 @@ NotesMaterialShader::NotesMaterialShader()
 static QColor notesColor()
 {
     return Utils::creatorTheme()
-            ? Utils::creatorTheme()->color(Utils::Theme::Timeline_HighlightColor)
+            ? Utils::creatorColor(Utils::Theme::Timeline_HighlightColor)
             : QColor(255, 165, 0);
 }
 
diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt
index 30e4be2eaa9..ca5e88b66c4 100644
--- a/src/libs/utils/CMakeLists.txt
+++ b/src/libs/utils/CMakeLists.txt
@@ -31,6 +31,7 @@ add_qtc_library(Utils
     completingtextedit.cpp completingtextedit.h
     cpplanguage_details.h
     crumblepath.cpp crumblepath.h
+    datafromprocess.h
     delegates.cpp delegates.h
     detailsbutton.cpp detailsbutton.h
     detailswidget.cpp detailswidget.h
@@ -93,6 +94,7 @@ add_qtc_library(Utils
     link.cpp link.h
     listmodel.h
     listutils.h
+    lua.cpp lua.h
     macroexpander.cpp macroexpander.h
     mathutils.cpp mathutils.h
     mimeconstants.h
@@ -270,7 +272,6 @@ extend_qtc_library(Utils
           fsengine/fsengine_impl.h
           fsengine/diriterator.h
           fsengine/fileiteratordevicesappender.h
-          fsengine/rootinjectfsengine.h
           fsengine/fixedlistfsengine.h
           fsengine/fsenginehandler.cpp
           fsengine/fsenginehandler.h
diff --git a/src/libs/utils/algorithm.h b/src/libs/utils/algorithm.h
index 038b887ae65..f173f9844a5 100644
--- a/src/libs/utils/algorithm.h
+++ b/src/libs/utils/algorithm.h
@@ -22,7 +22,9 @@
 
 #include <memory>
 #include <optional>
+#include <tuple>
 #include <type_traits>
+#include <utility>
 
 namespace Utils
 {
@@ -1009,6 +1011,14 @@ C filtered(const C &container, R (S::*predicate)() const)
     return out;
 }
 
+template<typename C, typename R, typename S>
+Q_REQUIRED_RESULT C filtered(const C &container, R S::*predicate)
+{
+    C out;
+    std::copy_if(std::begin(container), std::end(container), inserter(out), std::mem_fn(predicate));
+    return out;
+}
+
 //////////////////
 // filteredCast
 /////////////////
@@ -1556,6 +1566,17 @@ void addToHash(QHash<Key, T> *result, const QHash<Key, T> &additionalContents)
     result->insert(additionalContents);
 }
 
+template <typename Tuple, std::size_t... I>
+static std::size_t tupleHashHelper(uint seed, const Tuple &tuple, std::index_sequence<I...>)
+{
+    return qHashMulti(seed, (std::get<I>(tuple), ...));
+}
+
+template<typename... T> std::size_t qHash(const std::tuple<T...> &tuple, uint seed = 0)
+{
+    return tupleHashHelper(seed, tuple, std::make_index_sequence<sizeof...(T)>());
+}
+
 // Workaround for missing information from QSet::insert()
 // Return type could be a pair like for std::set, but we never use the iterator anyway.
 template<typename T, typename U> [[nodiscard]] bool insert(QSet<T> &s, const U &v)
diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp
index 5cc028bcdb8..996ac56fdb1 100644
--- a/src/libs/utils/aspects.cpp
+++ b/src/libs/utils/aspects.cpp
@@ -10,6 +10,7 @@
 #include "guard.h"
 #include "iconbutton.h"
 #include "layoutbuilder.h"
+#include "macroexpander.h"
 #include "passworddialog.h"
 #include "pathchooser.h"
 #include "pathlisteditor.h"
@@ -27,6 +28,7 @@
 #include <QDebug>
 #include <QGroupBox>
 #include <QLabel>
+#include <QLayout>
 #include <QLineEdit>
 #include <QListWidget>
 #include <QPaintEvent>
@@ -38,6 +40,7 @@
 #include <QSpinBox>
 #include <QStandardItemModel>
 #include <QTextEdit>
+#include <QTreeWidget>
 #include <QUndoStack>
 
 using namespace Layouting;
@@ -93,6 +96,7 @@ public:
     BaseAspect::DataCloner m_dataCloner;
     QList<BaseAspect::DataExtractor> m_dataExtractors;
 
+    MacroExpander *m_expander = globalMacroExpander();
     QUndoStack *m_undoStack = nullptr;
 };
 
@@ -103,16 +107,21 @@ public:
     \brief The \c BaseAspect class provides a common base for classes implementing
     aspects.
 
-    An aspect is a hunk of data like a property or collection of related
+    An \e aspect is a hunk of data like a property or collection of related
     properties of some object, together with a description of its behavior
     for common operations like visualizing or persisting.
 
-    Simple aspects are for example a boolean property represented by a QCheckBox
+    Simple aspects are, for example, a boolean property represented by a QCheckBox
     in the user interface, or a string property represented by a PathChooser,
-    selecting directories in the filesystem.
+    for selecting directories in the filesystem.
 
-    While aspects implementations usually have the ability to visualize and to persist
+    While aspects implementations usually can visualize and persist
     their data, or use an ID, neither of these is mandatory.
+
+    The derived classes can implement addToLayout() to create a UI.
+
+    Implement \c guiToBuffer() and \c bufferToGui() to synchronize the UI with
+    the internal data.
 */
 
 /*!
@@ -198,7 +207,20 @@ QVariant BaseAspect::defaultVariantValue() const
 }
 
 /*!
-    \fn TypedAspect::setDefaultValue(const ValueType &value)
+    \class Utils::TypedAspect
+    \inheaderfile utils/aspects.h
+    \inmodule QtCreator
+
+    \brief The \c TypedAspect class is a helper class for implementing a simple
+    aspect.
+
+    A typed aspect contains a single piece of data that is of the type
+    \c ValueType.
+*/
+
+
+/*!
+    \fn template <typename ValueType> void Utils::TypedAspect<ValueType>::setDefaultValue(const ValueType &value)
 
     Sets a default \a value and the current value for this aspect.
 
@@ -261,14 +283,14 @@ QLabel *BaseAspect::createLabel()
     return label;
 }
 
-void BaseAspect::addLabeledItem(LayoutItem &parent, QWidget *widget)
+void BaseAspect::addLabeledItem(Layout &parent, QWidget *widget)
 {
     if (QLabel *l = createLabel()) {
         l->setBuddy(widget);
         parent.addItem(l);
-        parent.addItem(Span(std::max(d->m_spanX - 1, 1), LayoutItem(widget)));
+        parent.addItem(Span(std::max(d->m_spanX - 1, 1), widget));
     } else {
-        parent.addItem(LayoutItem(widget));
+        parent.addItem(widget);
     }
 }
 
@@ -514,21 +536,20 @@ AspectContainer *BaseAspect::container() const
     Adds the visual representation of this aspect to the layout with the
     specified \a parent using a layout builder.
 */
-void BaseAspect::addToLayout(LayoutItem &)
+void BaseAspect::addToLayout(Layout &)
 {
 }
 
-void createItem(Layouting::LayoutItem *item, const BaseAspect &aspect)
+void addToLayout(Layouting::Layout *iface, BaseAspect &aspect)
 {
-    const_cast<BaseAspect &>(aspect).addToLayout(*item);
+    aspect.addToLayout(*iface);
 }
 
-void createItem(Layouting::LayoutItem *item, const BaseAspect *aspect)
+void addToLayout(Layouting::Layout *item, BaseAspect *aspect)
 {
-    const_cast<BaseAspect *>(aspect)->addToLayout(*item);
+    aspect->addToLayout(*item);
 }
 
-
 /*!
     Updates this aspect's value from user-initiated changes in the widget.
 
@@ -705,6 +726,29 @@ QVariant BaseAspect::fromSettingsValue(const QVariant &val) const
     return d->m_fromSettings ? d->m_fromSettings(val) : val;
 }
 
+void BaseAspect::setMacroExpander(MacroExpander *expander)
+{
+    d->m_expander = expander;
+}
+
+MacroExpander *BaseAspect::macroExpander() const
+{
+    return d->m_expander;
+}
+
+void BaseAspect::addMacroExpansion(QWidget *w)
+{
+    if (!d->m_expander)
+        return;
+    const auto chooser = new VariableChooser(w);
+    chooser->addSupportedWidget(w);
+    if (d->m_expander == globalMacroExpander()) // default for VariableChooser()
+        return;
+    chooser->addMacroExpanderProvider([this] { return d->m_expander; });
+    if (auto pathChooser = qobject_cast<PathChooser *>(w))
+        pathChooser->setMacroExpander(d->m_expander);
+}
+
 namespace Internal {
 
 class BoolAspectPrivate
@@ -840,15 +884,15 @@ public:
         aspect->bufferToGui();
     }
 
-    void addToLayoutFirst(LayoutItem &parent)
+    void addToLayoutFirst(Layout &parent)
     {
         if (m_checked && m_checkBoxPlacement == CheckBoxPlacement::Top) {
             m_checked->addToLayout(parent);
-            parent.addItem(br);
+            parent.flush();
         }
     }
 
-    void addToLayoutLast(LayoutItem &parent)
+    void addToLayoutLast(Layout &parent)
     {
         if (m_checked && m_checkBoxPlacement == CheckBoxPlacement::Right)
             m_checked->addToLayout(parent);
@@ -868,7 +912,6 @@ public:
     Qt::TextElideMode m_elideMode = Qt::ElideNone;
     QString m_placeHolderText;
     Key m_historyCompleterKey;
-    MacroExpanderProvider m_expanderProvider;
     StringAspect::ValueAcceptor m_valueAcceptor;
     std::optional<FancyLineEdit::ValidationFunction> m_validator;
 
@@ -913,6 +956,10 @@ public:
 class StringListAspectPrivate
 {
 public:
+    UndoableValue<QStringList> undoable;
+    bool allowAdding{true};
+    bool allowRemoving{true};
+    bool allowEditing{true};
 };
 
 class FilePathListAspectPrivate
@@ -1096,16 +1143,6 @@ void StringAspect::setAcceptRichText(bool acceptRichText)
     emit acceptRichTextChanged(acceptRichText);
 }
 
-void StringAspect::setMacroExpanderProvider(const MacroExpanderProvider &expanderProvider)
-{
-    d->m_expanderProvider = expanderProvider;
-}
-
-void StringAspect::setUseGlobalMacroExpander()
-{
-    d->m_expanderProvider = &globalMacroExpander;
-}
-
 void StringAspect::setUseResetButton()
 {
     d->m_useResetButton = true;
@@ -1122,18 +1159,10 @@ void StringAspect::setAutoApplyOnEditingFinished(bool applyOnEditingFinished)
     d->m_autoApplyOnEditingFinished = applyOnEditingFinished;
 }
 
-void StringAspect::addToLayout(LayoutItem &parent)
+void StringAspect::addToLayout(Layout &parent)
 {
     d->m_checkerImpl.addToLayoutFirst(parent);
 
-    const auto useMacroExpander = [this](QWidget *w) {
-        if (!d->m_expanderProvider)
-            return;
-        const auto chooser = new VariableChooser(w);
-        chooser->addSupportedWidget(w);
-        chooser->addMacroExpanderProvider(d->m_expanderProvider);
-    };
-
     const QString displayedString = d->m_displayFilter ? d->m_displayFilter(volatileValue())
                                                        : volatileValue();
 
@@ -1141,6 +1170,7 @@ void StringAspect::addToLayout(LayoutItem &parent)
     case PasswordLineEditDisplay:
     case LineEditDisplay: {
         auto lineEditDisplay = createSubWidget<FancyLineEdit>();
+        addMacroExpansion(lineEditDisplay);
         lineEditDisplay->setPlaceholderText(d->m_placeHolderText);
         if (!d->m_historyCompleterKey.isEmpty())
             lineEditDisplay->setHistoryCompleter(d->m_historyCompleterKey);
@@ -1174,7 +1204,6 @@ void StringAspect::addToLayout(LayoutItem &parent)
         }
 
         addLabeledItem(parent, lineEditDisplay);
-        useMacroExpander(lineEditDisplay);
         if (d->m_useResetButton) {
             auto resetButton = createSubWidget<QPushButton>(Tr::tr("Reset"));
             resetButton->setEnabled(lineEditDisplay->text() != defaultValue());
@@ -1232,6 +1261,7 @@ void StringAspect::addToLayout(LayoutItem &parent)
     }
     case TextEditDisplay: {
         auto textEditDisplay = createSubWidget<QTextEdit>();
+        addMacroExpansion(textEditDisplay);
         textEditDisplay->setPlaceholderText(d->m_placeHolderText);
         textEditDisplay->setUndoRedoEnabled(false);
         textEditDisplay->setAcceptRichText(d->m_acceptRichText);
@@ -1250,7 +1280,6 @@ void StringAspect::addToLayout(LayoutItem &parent)
         }
 
         addLabeledItem(parent, textEditDisplay);
-        useMacroExpander(textEditDisplay);
         bufferToGui();
         connect(this,
                 &StringAspect::acceptRichTextChanged,
@@ -1300,8 +1329,10 @@ void StringAspect::addToLayout(LayoutItem &parent)
 
 QString StringAspect::expandedValue() const
 {
-    if (!m_internal.isEmpty() && d->m_expanderProvider)
-        return d->m_expanderProvider()->expand(m_internal);
+    if (!m_internal.isEmpty()) {
+        if (auto expander = macroExpander())
+            return expander->expand(m_internal);
+    }
     return m_internal;
 }
 
@@ -1383,10 +1414,10 @@ public:
     PathChooser::Kind m_expectedKind = PathChooser::File;
     Environment m_environment;
     QPointer<PathChooser> m_pathChooserDisplay;
-    MacroExpanderProvider m_expanderProvider;
     FilePath m_baseFileName;
     StringAspect::ValueAcceptor m_valueAcceptor;
     std::optional<FancyLineEdit::ValidationFunction> m_validator;
+    std::optional<FilePath> m_effectiveBinary;
     std::function<void()> m_openTerminal;
 
     CheckableAspectImplementation m_checkerImpl;
@@ -1407,6 +1438,8 @@ FilePathAspect::FilePathAspect(AspectContainer *container)
 
     addDataExtractor(this, &FilePathAspect::value, &Data::value);
     addDataExtractor(this, &FilePathAspect::operator(), &Data::filePath);
+
+    connect(this, &BaseAspect::changed, this, [this] { d->m_effectiveBinary.reset(); });
 }
 
 FilePathAspect::~FilePathAspect() = default;
@@ -1427,11 +1460,36 @@ FilePath FilePathAspect::operator()() const
 FilePath FilePathAspect::expandedValue() const
 {
     const auto value = TypedAspect::value();
-    if (!value.isEmpty() && d->m_expanderProvider)
-        return FilePath::fromUserInput(d->m_expanderProvider()->expand(value));
+    if (!value.isEmpty()) {
+        if (auto expander = macroExpander())
+            return FilePath::fromUserInput(expander->expand(value));
+    }
     return FilePath::fromUserInput(value);
 }
 
+/*!
+    Returns the full path of the set command. Only makes a difference if
+    expected kind is \c Command or \c ExistingCommand and the current
+    file path is an executable provided without its path.
+    Performs a lookup in PATH if necessary.
+ */
+FilePath FilePathAspect::effectiveBinary() const
+{
+    if (d->m_effectiveBinary)
+        return *d->m_effectiveBinary;
+
+    const FilePath current = expandedValue();
+    const PathChooser::Kind kind = d->m_expectedKind;
+    if (kind != PathChooser::ExistingCommand && kind != PathChooser::Command)
+        return current;
+
+    if (current.needsDevice())
+        return current;
+
+    d->m_effectiveBinary.emplace(current.searchInPath());
+    return *d->m_effectiveBinary;
+}
+
 QString FilePathAspect::value() const
 {
     return TypedAspect::value();
@@ -1533,21 +1591,14 @@ PathChooser *FilePathAspect::pathChooser() const
     return d->m_pathChooserDisplay.data();
 }
 
-void FilePathAspect::addToLayout(Layouting::LayoutItem &parent)
+void FilePathAspect::addToLayout(Layouting::Layout &parent)
 {
     d->m_checkerImpl.addToLayoutFirst(parent);
 
-    const auto useMacroExpander = [this](QWidget *w) {
-        if (!d->m_expanderProvider)
-            return;
-        const auto chooser = new VariableChooser(w);
-        chooser->addSupportedWidget(w);
-        chooser->addMacroExpanderProvider(d->m_expanderProvider);
-    };
-
     const QString displayedString = d->m_displayFilter ? d->m_displayFilter(value()) : value();
 
     d->m_pathChooserDisplay = createSubWidget<PathChooser>();
+    addMacroExpansion(d->m_pathChooserDisplay->lineEdit());
     d->m_pathChooserDisplay->setExpectedKind(d->m_expectedKind);
     if (!d->m_historyCompleterKey.isEmpty())
         d->m_pathChooserDisplay->setHistoryCompleter(d->m_historyCompleterKey);
@@ -1572,7 +1623,6 @@ void FilePathAspect::addToLayout(Layouting::LayoutItem &parent)
         d->m_pathChooserDisplay->lineEdit()->setPlaceholderText(d->m_placeHolderText);
     d->m_checkerImpl.updateWidgetFromCheckStatus(this, d->m_pathChooserDisplay.data());
     addLabeledItem(parent, d->m_pathChooserDisplay);
-    useMacroExpander(d->m_pathChooserDisplay->lineEdit());
     connect(d->m_pathChooserDisplay, &PathChooser::validChanged, this, &FilePathAspect::validChanged);
     bufferToGui();
     if (isAutoApply() && d->m_autoApplyOnEditingFinished) {
@@ -1670,9 +1720,12 @@ void FilePathAspect::setAutoApplyOnEditingFinished(bool applyOnEditingFinished)
 */
 void FilePathAspect::setExpectedKind(const PathChooser::Kind expectedKind)
 {
-    d->m_expectedKind = expectedKind;
-    if (d->m_pathChooserDisplay)
-        d->m_pathChooserDisplay->setExpectedKind(expectedKind);
+    if (d->m_expectedKind != expectedKind) {
+        d->m_expectedKind = expectedKind;
+        d->m_effectiveBinary.reset();
+        if (d->m_pathChooserDisplay)
+            d->m_pathChooserDisplay->setExpectedKind(expectedKind);
+    }
 }
 
 void FilePathAspect::setEnvironment(const Environment &env)
@@ -1713,11 +1766,6 @@ void FilePathAspect::setHistoryCompleter(const Key &historyCompleterKey)
         d->m_pathChooserDisplay->setHistoryCompleter(historyCompleterKey);
 }
 
-void FilePathAspect::setMacroExpanderProvider(const MacroExpanderProvider &expanderProvider)
-{
-    d->m_expanderProvider = expanderProvider;
-}
-
 void FilePathAspect::validateInput()
 {
     if (d->m_pathChooserDisplay)
@@ -1751,7 +1799,7 @@ ColorAspect::ColorAspect(AspectContainer *container)
 
 ColorAspect::~ColorAspect() = default;
 
-void ColorAspect::addToLayout(Layouting::LayoutItem &parent)
+void ColorAspect::addToLayout(Layouting::Layout &parent)
 {
     QTC_CHECK(!d->m_colorButton);
     d->m_colorButton = createSubWidget<QtColorButton>();
@@ -1928,7 +1976,7 @@ BoolAspect::BoolAspect(AspectContainer *container)
 */
 BoolAspect::~BoolAspect() = default;
 
-void BoolAspect::addToLayoutHelper(Layouting::LayoutItem &parent, QAbstractButton *button)
+void BoolAspect::addToLayoutHelper(Layouting::Layout &parent, QAbstractButton *button)
 {
     switch (d->m_labelPlacement) {
     case LabelPlacement::Compact:
@@ -1937,7 +1985,7 @@ void BoolAspect::addToLayoutHelper(Layouting::LayoutItem &parent, QAbstractButto
         break;
     case LabelPlacement::AtCheckBox:
         button->setText(labelText());
-        parent.addItem(empty());
+        parent.addItem(empty);
         parent.addItem(button);
         break;
     case LabelPlacement::InExtraLabel:
@@ -1955,20 +2003,18 @@ void BoolAspect::addToLayoutHelper(Layouting::LayoutItem &parent, QAbstractButto
     });
 }
 
-LayoutItem BoolAspect::adoptButton(QAbstractButton *button)
+std::function<void(Layouting::Layout *)> BoolAspect::adoptButton(QAbstractButton *button)
 {
-    LayoutItem parent;
-
-    addToLayoutHelper(parent, button);
-
-    bufferToGui();
-    return parent;
+    return [this, button](Layouting::Layout *layout) {
+        addToLayoutHelper(*layout, button);
+        bufferToGui();
+    };
 }
 
 /*!
     \reimp
 */
-void BoolAspect::addToLayout(Layouting::LayoutItem &parent)
+void BoolAspect::addToLayout(Layouting::Layout &parent)
 {
     QCheckBox *checkBox = createSubWidget<QCheckBox>();
     addToLayoutHelper(parent, checkBox);
@@ -2074,7 +2120,7 @@ SelectionAspect::~SelectionAspect() = default;
 /*!
     \reimp
 */
-void SelectionAspect::addToLayout(Layouting::LayoutItem &parent)
+void SelectionAspect::addToLayout(Layouting::Layout &parent)
 {
     QTC_CHECK(d->m_buttonGroup == nullptr);
     QTC_CHECK(!d->m_comboBox);
@@ -2248,7 +2294,7 @@ MultiSelectionAspect::~MultiSelectionAspect() = default;
 /*!
     \reimp
 */
-void MultiSelectionAspect::addToLayout(LayoutItem &builder)
+void MultiSelectionAspect::addToLayout(Layout &builder)
 {
     QTC_CHECK(d->m_listView == nullptr);
     if (d->m_allValues.isEmpty())
@@ -2357,7 +2403,7 @@ IntegerAspect::~IntegerAspect() = default;
 /*!
     \reimp
 */
-void IntegerAspect::addToLayout(Layouting::LayoutItem &parent)
+void IntegerAspect::addToLayout(Layouting::Layout &parent)
 {
     QTC_CHECK(!d->m_spinBox);
     d->m_spinBox = createSubWidget<QSpinBox>();
@@ -2369,7 +2415,7 @@ void IntegerAspect::addToLayout(Layouting::LayoutItem &parent)
     if (d->m_maximumValue && d->m_maximumValue)
         d->m_spinBox->setRange(int(d->m_minimumValue.value() / d->m_displayScaleFactor),
                                int(d->m_maximumValue.value() / d->m_displayScaleFactor));
-    d->m_spinBox->setValue(int(value() / d->m_displayScaleFactor)); // Must happen after setRange()
+    bufferToGui();
     addLabeledItem(parent, d->m_spinBox);
     connect(d->m_spinBox.data(), &QSpinBox::valueChanged,
             this, &IntegerAspect::handleGuiChanged);
@@ -2459,7 +2505,7 @@ DoubleAspect::~DoubleAspect() = default;
 /*!
     \reimp
 */
-void DoubleAspect::addToLayout(LayoutItem &builder)
+void DoubleAspect::addToLayout(Layout &builder)
 {
     QTC_CHECK(!d->m_spinBox);
     d->m_spinBox = createSubWidget<QDoubleSpinBox>();
@@ -2526,9 +2572,9 @@ void DoubleAspect::setSingleStep(double step)
 */
 
 TriStateAspect::TriStateAspect(AspectContainer *container,
-                               const QString &onString,
-                               const QString &offString,
-                               const QString &defaultString)
+                               const QString &enabledDisplay,
+                               const QString &disabledDisplay,
+                               const QString &defaultDisplay)
     : SelectionAspect(container)
 {
     setDisplayStyle(DisplayStyle::ComboBox);
@@ -2536,17 +2582,26 @@ TriStateAspect::TriStateAspect(AspectContainer *container,
     SelectionAspect::addOption({});
     SelectionAspect::addOption({});
     SelectionAspect::addOption({});
-    setOptionTexts(onString, offString, defaultString);
+    setOptionText(TriState::EnabledValue, enabledDisplay);
+    setOptionText(TriState::DisabledValue, disabledDisplay);
+    setOptionText(TriState::DefaultValue, defaultDisplay);
 }
 
-void TriStateAspect::setOptionTexts(const QString &onString,
-                                    const QString &offString,
-                                    const QString &defaultString)
+static QString defaultTristateDisplay(TriState::Value tristate)
 {
-    QTC_ASSERT(d->m_options.size() == 3, return);
-    d->m_options[0].displayName = onString.isEmpty() ? Tr::tr("Enable") : onString;
-    d->m_options[1].displayName = offString.isEmpty() ? Tr::tr("Disable") : offString;
-    d->m_options[2].displayName = defaultString.isEmpty() ? Tr::tr("Leave at Default") : defaultString;
+    switch (tristate) {
+        case TriState::EnabledValue: return Tr::tr("Enable");
+        case TriState::DisabledValue: return Tr::tr("Disable");
+        case TriState::DefaultValue: return Tr::tr("Default");
+    }
+    QTC_CHECK(false);
+    return {};
+}
+
+void TriStateAspect::setOptionText(const TriState::Value tristate, const QString &display)
+{
+    d->m_options[tristate].displayName = display.isEmpty()
+        ? defaultTristateDisplay(tristate) : display;
 }
 
 TriState TriStateAspect::value() const
@@ -2604,13 +2659,119 @@ StringListAspect::StringListAspect(AspectContainer *container)
 */
 StringListAspect::~StringListAspect() = default;
 
-/*!
-    \reimp
-*/
-void StringListAspect::addToLayout(LayoutItem &parent)
+bool StringListAspect::guiToBuffer()
 {
-    Q_UNUSED(parent)
-    // TODO - when needed.
+    const QStringList newValue = d->undoable.get();
+    if (newValue != m_buffer) {
+        m_buffer = newValue;
+        return true;
+    }
+    return false;
+}
+
+void StringListAspect::bufferToGui()
+{
+    d->undoable.setWithoutUndo(m_buffer);
+}
+
+void StringListAspect::addToLayout(Layout &parent)
+{
+    d->undoable.setSilently(value());
+
+    auto editor = new QTreeWidget();
+    editor->setHeaderHidden(true);
+    editor->setRootIsDecorated(false);
+    editor->setEditTriggers(
+        d->allowEditing ? QAbstractItemView::AllEditTriggers : QAbstractItemView::NoEditTriggers);
+
+    QPushButton *add = d->allowAdding ? new QPushButton(Tr::tr("Add")) : nullptr;
+    QPushButton *remove = d->allowRemoving ? new QPushButton(Tr::tr("Remove")) : nullptr;
+
+    auto itemsToStringList = [editor] {
+        QStringList items;
+        const QTreeWidgetItem *rootItem = editor->invisibleRootItem();
+        for (int i = 0, count = rootItem->childCount(); i < count; ++i) {
+            auto expr = rootItem->child(i)->data(0, Qt::DisplayRole).toString();
+            items.append(expr);
+        }
+        return items;
+    };
+
+    auto populate = [editor, this] {
+        editor->clear();
+        for (const QString &entry : d->undoable.get()) {
+            auto item = new QTreeWidgetItem(editor, {entry});
+            item->setData(0, Qt::ToolTipRole, entry);
+            item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable);
+        }
+    };
+
+    if (add) {
+        connect(add, &QPushButton::clicked, this, [this, populate, editor] {
+            d->undoable.setSilently(d->undoable.get() << "");
+            populate();
+            const QTreeWidgetItem *root = editor->invisibleRootItem();
+            QTreeWidgetItem *lastChild = root->child(root->childCount() - 1);
+            const QModelIndex index = editor->indexFromItem(lastChild, 0);
+            editor->edit(index);
+        });
+    }
+
+    if (remove) {
+        connect(remove, &QPushButton::clicked, this, [this, editor, itemsToStringList] {
+            const QList<QTreeWidgetItem *> selected = editor->selectedItems();
+            QTC_ASSERT(selected.size() == 1, return);
+            editor->invisibleRootItem()->removeChild(selected.first());
+            delete selected.first();
+            d->undoable.set(undoStack(), itemsToStringList());
+        });
+    }
+
+    connect(
+        &d->undoable.m_signal, &UndoSignaller::changed, editor, [this, populate, itemsToStringList] {
+            if (itemsToStringList() != d->undoable.get())
+                populate();
+
+            handleGuiChanged();
+        });
+
+    connect(
+        editor->model(),
+        &QAbstractItemModel::dataChanged,
+        this,
+        [this,
+         itemsToStringList](const QModelIndex &tl, const QModelIndex &br, const QList<int> &roles) {
+            if (!roles.contains(Qt::DisplayRole))
+                return;
+            if (tl != br)
+                return;
+            d->undoable.set(undoStack(), itemsToStringList());
+        });
+
+    populate();
+
+    parent.addItem(
+        // clang-format off
+        Column {
+            createLabel(),
+            Row {
+                editor,
+                If { d->allowAdding || d->allowRemoving, {
+                    Column {
+                        If { d->allowAdding, {add}, {}},
+                        If { d->allowRemoving, {remove}, {}},
+                        st,
+                    }
+                }, {}},
+            }
+        } // clang-format on
+    );
+
+    registerSubWidget(editor);
+    if (d->allowAdding)
+        registerSubWidget(add);
+    if (d->allowRemoving)
+        registerSubWidget(remove);
 }
 
 void StringListAspect::appendValue(const QString &s, bool allowDuplicates)
@@ -2646,6 +2807,32 @@ void StringListAspect::removeValues(const QStringList &values)
     setValue(val);
 }
 
+void StringListAspect::setUiAllowAdding(bool allowAdding)
+{
+    d->allowAdding = allowAdding;
+}
+void StringListAspect::setUiAllowRemoving(bool allowRemoving)
+{
+    d->allowRemoving = allowRemoving;
+}
+void StringListAspect::setUiAllowEditing(bool allowEditing)
+{
+    d->allowEditing = allowEditing;
+}
+
+bool StringListAspect::uiAllowAdding() const
+{
+    return d->allowAdding;
+}
+bool StringListAspect::uiAllowRemoving() const
+{
+    return d->allowRemoving;
+}
+bool StringListAspect::uiAllowEditing() const
+{
+    return d->allowEditing;
+}
+
 /*!
     \class Utils::FilePathListAspect
     \inmodule QtCreator
@@ -2683,7 +2870,7 @@ void FilePathListAspect::bufferToGui()
     d->undoable.setWithoutUndo(m_buffer);
 }
 
-void FilePathListAspect::addToLayout(LayoutItem &parent)
+void FilePathListAspect::addToLayout(Layout &parent)
 {
     d->undoable.setSilently(value());
 
@@ -2777,7 +2964,7 @@ IntegersAspect::~IntegersAspect() = default;
 /*!
     \reimp
 */
-void IntegersAspect::addToLayout(Layouting::LayoutItem &parent)
+void IntegersAspect::addToLayout(Layouting::Layout &parent)
 {
     Q_UNUSED(parent)
     // TODO - when needed.
@@ -2814,7 +3001,7 @@ TextDisplay::~TextDisplay() = default;
 /*!
     \reimp
 */
-void TextDisplay::addToLayout(LayoutItem &parent)
+void TextDisplay::addToLayout(Layout &parent)
 {
     if (!d->m_label) {
         d->m_label = createSubWidget<InfoLabel>(d->m_message, d->m_type);
@@ -2866,7 +3053,7 @@ public:
     QList<BaseAspect *> m_items; // Both owned and non-owned.
     QList<BaseAspect *> m_ownedItems; // Owned only.
     QStringList m_settingsGroup;
-    std::function<Layouting::LayoutItem ()> m_layouter;
+    std::function<Layouting::Layout()> m_layouter;
 };
 
 AspectContainer::AspectContainer()
@@ -2881,6 +3068,11 @@ AspectContainer::~AspectContainer()
     qDeleteAll(d->m_ownedItems);
 }
 
+void AspectContainer::addToLayout(Layouting::Layout &parent)
+{
+    parent.addItem(layouter()());
+}
+
 /*!
     \internal
 */
@@ -2890,6 +3082,8 @@ void AspectContainer::registerAspect(BaseAspect *aspect, bool takeOwnership)
     d->m_items.append(aspect);
     if (takeOwnership)
         d->m_ownedItems.append(aspect);
+
+    connect(aspect, &BaseAspect::changed, this, [this]() { emit changed(); });
 }
 
 void AspectContainer::registerAspects(const AspectContainer &aspects)
@@ -2918,12 +3112,12 @@ AspectContainer::const_iterator AspectContainer::end() const
     return d->m_items.cend();
 }
 
-void AspectContainer::setLayouter(const std::function<Layouting::LayoutItem ()> &layouter)
+void AspectContainer::setLayouter(const std::function<Layouting::Layout ()> &layouter)
 {
     d->m_layouter = layouter;
 }
 
-std::function<LayoutItem ()> AspectContainer::layouter() const
+std::function<Layout ()> AspectContainer::layouter() const
 {
     return d->m_layouter;
 }
@@ -3039,6 +3233,14 @@ void AspectContainer::setUndoStack(QUndoStack *undoStack)
         aspect->setUndoStack(undoStack);
 }
 
+void AspectContainer::setMacroExpander(MacroExpander *expander)
+{
+    BaseAspect::setMacroExpander(expander);
+
+    for (BaseAspect *aspect : std::as_const(d->m_items))
+        aspect->setMacroExpander(expander);
+}
+
 bool AspectContainer::equals(const AspectContainer &other) const
 {
     // FIXME: Expensive, but should not really be needed in a fully aspectified world.
@@ -3420,7 +3622,7 @@ private:
     int m_index;
 };
 
-void AspectList::addToLayout(Layouting::LayoutItem &parent)
+void AspectList::addToLayout(Layouting::Layout &parent)
 {
     using namespace Layouting;
 
@@ -3439,7 +3641,7 @@ void AspectList::addToLayout(Layouting::LayoutItem &parent)
             addItem(d->createItem());
         });
 
-        Column column{noMargin()};
+        Column column{noMargin};
 
         forEachItem<BaseAspect>([&column, this](const std::shared_ptr<BaseAspect> &item, int idx) {
             auto removeBtn = new IconButton;
@@ -3530,7 +3732,7 @@ bool StringSelectionAspect::guiToBuffer()
     return oldBuffer != m_buffer;
 }
 
-void StringSelectionAspect::addToLayout(Layouting::LayoutItem &parent)
+void StringSelectionAspect::addToLayout(Layouting::Layout &parent)
 {
     QTC_ASSERT(m_fillCallback, return);
 
@@ -3603,4 +3805,4 @@ void StringSelectionAspect::addToLayout(Layouting::LayoutItem &parent)
     return addLabeledItem(parent, comboBox);
 }
 
-} // namespace Utils
+} // Utils
diff --git a/src/libs/utils/aspects.h b/src/libs/utils/aspects.h
index 2941cfec613..60a198c1f7b 100644
--- a/src/libs/utils/aspects.h
+++ b/src/libs/utils/aspects.h
@@ -7,7 +7,6 @@
 #include "guiutils.h"
 #include "id.h"
 #include "infolabel.h"
-#include "macroexpander.h"
 #include "pathchooser.h"
 #include "qtcsettings.h"
 #include "store.h"
@@ -29,15 +28,14 @@ class QStandardItemModel;
 class QItemSelectionModel;
 QT_END_NAMESPACE
 
-namespace Layouting {
-class LayoutItem;
-}
+namespace Layouting { class Layout; }
 
 namespace Utils {
 
 class AspectContainer;
 class BoolAspect;
 class CheckableDecider;
+class MacroExpander;
 
 namespace Internal {
 class AspectContainerPrivate;
@@ -64,6 +62,7 @@ class QTCREATOR_UTILS_EXPORT BaseAspect : public QObject
 
 public:
     BaseAspect(AspectContainer *container = nullptr);
+    BaseAspect(const BaseAspect &) = delete;
     ~BaseAspect() override;
 
     Id id() const;
@@ -125,9 +124,7 @@ public:
     virtual void toMap(Store &map) const;
     virtual void toActiveMap(Store &map) const { toMap(map); }
     virtual void volatileToMap(Store &map) const;
-
-    virtual void addToLayout(Layouting::LayoutItem &parent);
-
+    virtual void addToLayout(Layouting::Layout &parent);
     virtual void readSettings();
     virtual void writeSettings() const;
 
@@ -205,6 +202,9 @@ public:
     // This is expensive. Do not use without good reason
     void writeToSettingsImmediatly() const;
 
+    void setMacroExpander(MacroExpander *expander);
+    MacroExpander *macroExpander() const;
+
 signals:
     void changed();
     void volatileValueChanged();
@@ -222,8 +222,10 @@ protected:
 
     virtual void handleGuiChanged();
 
+    void addMacroExpansion(QWidget *w);
+
     QLabel *createLabel();
-    void addLabeledItem(Layouting::LayoutItem &parent, QWidget *widget);
+    void addLabeledItem(Layouting::Layout &parent, QWidget *widget);
 
     void setDataCreatorHelper(const DataCreator &creator) const;
     void setDataClonerHelper(const DataCloner &cloner) const;
@@ -276,8 +278,8 @@ private:
     friend class Internal::CheckableAspectImplementation;
 };
 
-QTCREATOR_UTILS_EXPORT void createItem(Layouting::LayoutItem *item, const BaseAspect &aspect);
-QTCREATOR_UTILS_EXPORT void createItem(Layouting::LayoutItem *item, const BaseAspect *aspect);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layouting::Layout *layout, BaseAspect *aspect);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layouting::Layout *layout, BaseAspect &aspect);
 
 template<typename ValueType>
 class
@@ -439,7 +441,7 @@ public:
     BoolAspect(AspectContainer *container = nullptr);
     ~BoolAspect() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
     std::function<void(QObject *)> groupChecker();
 
     Utils::CheckableDecider askAgainCheckableDecider();
@@ -452,10 +454,10 @@ public:
                   LabelPlacement labelPlacement = LabelPlacement::InExtraLabel);
     void setLabelPlacement(LabelPlacement labelPlacement);
 
-    Layouting::LayoutItem adoptButton(QAbstractButton *button);
+    std::function<void(Layouting::Layout *)> adoptButton(QAbstractButton *button);
 
 private:
-    void addToLayoutHelper(Layouting::LayoutItem &parent, QAbstractButton *button);
+    void addToLayoutHelper(Layouting::Layout &parent, QAbstractButton *button);
 
     void bufferToGui() override;
     bool guiToBuffer() override;
@@ -504,7 +506,7 @@ public:
     ColorAspect(AspectContainer *container = nullptr);
     ~ColorAspect() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
 private:
     void bufferToGui() override;
@@ -521,7 +523,7 @@ public:
     SelectionAspect(AspectContainer *container = nullptr);
     ~SelectionAspect() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
     void finish() override;
 
     QString stringValue() const;
@@ -569,7 +571,7 @@ public:
     MultiSelectionAspect(AspectContainer *container = nullptr);
     ~MultiSelectionAspect() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     enum class DisplayStyle { ListView };
     void setDisplayStyle(DisplayStyle style);
@@ -596,7 +598,7 @@ public:
     StringAspect(AspectContainer *container = nullptr);
     ~StringAspect() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     QString operator()() const { return expandedValue(); }
     QString expandedValue() const;
@@ -610,8 +612,6 @@ public:
     void setPlaceHolderText(const QString &placeHolderText);
     void setHistoryCompleter(const Key &historyCompleterKey);
     void setAcceptRichText(bool acceptRichText);
-    void setMacroExpanderProvider(const MacroExpanderProvider &expanderProvider);
-    void setUseGlobalMacroExpander();
     void setUseResetButton();
     void setValidationFunction(const FancyLineEdit::ValidationFunction &validator);
     void setAutoApplyOnEditingFinished(bool applyOnEditingFinished);
@@ -666,6 +666,7 @@ public:
     };
 
     FilePath operator()() const;
+    FilePath effectiveBinary() const;
     FilePath expandedValue() const;
     QString value() const;
     void setValue(const FilePath &filePath, Announcement howToAnnounce = DoEmit);
@@ -687,7 +688,6 @@ public:
     void setValidationFunction(const FancyLineEdit::ValidationFunction &validator);
     void setDisplayFilter(const std::function<QString (const QString &)> &displayFilter);
     void setHistoryCompleter(const Key &historyCompleterKey);
-    void setMacroExpanderProvider(const MacroExpanderProvider &expanderProvider);
     void setShowToolTipOnLabel(bool show);
     void setAutoApplyOnEditingFinished(bool applyOnEditingFinished);
 
@@ -703,7 +703,7 @@ public:
 
     PathChooser *pathChooser() const; // Avoid to use.
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     void fromMap(const Utils::Store &map) override;
     void toMap(Utils::Store &map) const override;
@@ -730,7 +730,7 @@ public:
     IntegerAspect(AspectContainer *container = nullptr);
     ~IntegerAspect() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     void setRange(qint64 min, qint64 max);
     void setLabel(const QString &label); // FIXME: Use setLabelText
@@ -759,7 +759,7 @@ public:
     DoubleAspect(AspectContainer *container = nullptr);
     ~DoubleAspect() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     void setRange(double min, double max);
     void setPrefix(const QString &prefix);
@@ -777,11 +777,11 @@ private:
 
 class QTCREATOR_UTILS_EXPORT TriState
 {
-    enum Value { EnabledValue, DisabledValue, DefaultValue };
-    explicit TriState(Value v) : m_value(v) {}
-
 public:
+    enum Value { EnabledValue, DisabledValue, DefaultValue };
+
     TriState() = default;
+    explicit TriState(Value v) : m_value(v) {}
 
     int toInt() const { return int(m_value); }
     QVariant toVariant() const { return int(m_value); }
@@ -805,9 +805,9 @@ class QTCREATOR_UTILS_EXPORT TriStateAspect : public SelectionAspect
 
 public:
     TriStateAspect(AspectContainer *container = nullptr,
-                   const QString &onString = {},
-                   const QString &offString = {},
-                   const QString &defaultString = {});
+                   const QString &enabledDisplay = {},
+                   const QString &disabledDisplay = {},
+                   const QString &defaultDisplay = {});
 
     TriState operator()() const { return value(); }
     TriState value() const;
@@ -816,9 +816,8 @@ public:
     TriState defaultValue() const;
     void setDefaultValue(TriState setting);
 
-    void setOptionTexts(const QString &onString,
-                        const QString &offString,
-                        const QString &defaultString);
+    void setOptionText(const TriState::Value tristate, const QString &display);
+
 private:
     void addOption(const QString &displayName, const QString &toolTip = {}) = delete;
     void addOption(const Option &option) = delete;
@@ -832,13 +831,24 @@ public:
     StringListAspect(AspectContainer *container = nullptr);
     ~StringListAspect() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    bool guiToBuffer() override;
+    void bufferToGui() override;
+
+    void addToLayout(Layouting::Layout &parent) override;
 
     void appendValue(const QString &value, bool allowDuplicates = true);
     void removeValue(const QString &value);
     void appendValues(const QStringList &values, bool allowDuplicates = true);
     void removeValues(const QStringList &values);
 
+    void setUiAllowAdding(bool allowAdding);
+    void setUiAllowRemoving(bool allowRemoving);
+    void setUiAllowEditing(bool allowEditing);
+
+    bool uiAllowAdding() const;
+    bool uiAllowRemoving() const;
+    bool uiAllowEditing() const;
+
 private:
     std::unique_ptr<Internal::StringListAspectPrivate> d;
 };
@@ -856,7 +866,7 @@ public:
     bool guiToBuffer() override;
     void bufferToGui() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
     void setPlaceHolderText(const QString &placeHolderText);
 
     void appendValue(const FilePath &path, bool allowDuplicates = true);
@@ -876,7 +886,7 @@ public:
     IntegersAspect(AspectContainer *container = nullptr);
     ~IntegersAspect() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 };
 
 class QTCREATOR_UTILS_EXPORT TextDisplay : public BaseAspect
@@ -889,7 +899,7 @@ public:
                          InfoLabel::InfoType type = InfoLabel::None);
     ~TextDisplay() override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     void setIconType(InfoLabel::InfoType t);
     void setText(const QString &message);
@@ -940,6 +950,8 @@ public:
     AspectContainer(const AspectContainer &) = delete;
     AspectContainer &operator=(const AspectContainer &) = delete;
 
+    void addToLayout(Layouting::Layout &parent) override;
+
     void registerAspect(BaseAspect *aspect, bool takeOwnership = false);
     void registerAspects(const AspectContainer &aspects);
 
@@ -965,6 +977,8 @@ public:
     bool isDirty() override;
     void setUndoStack(QUndoStack *undoStack) override;
 
+    void setMacroExpander(MacroExpander *expander);
+
     template <typename T> T *aspect() const
     {
         for (BaseAspect *aspect : aspects())
@@ -990,8 +1004,8 @@ public:
     const_iterator begin() const;
     const_iterator end() const;
 
-    void setLayouter(const std::function<Layouting::LayoutItem()> &layouter);
-    std::function<Layouting::LayoutItem()> layouter() const;
+    void setLayouter(const std::function<Layouting::Layout()> &layouter);
+    std::function<Layouting::Layout()> layouter() const;
 
 signals:
     void applied();
@@ -1132,7 +1146,7 @@ public:
 
     QVariant volatileVariantValue() const override { return {}; }
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
 private:
     std::unique_ptr<Internal::AspectListPrivate> d;
@@ -1144,7 +1158,7 @@ class QTCREATOR_UTILS_EXPORT StringSelectionAspect : public Utils::TypedAspect<Q
 public:
     StringSelectionAspect(Utils::AspectContainer *container = nullptr);
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     using ResultCallback = std::function<void(QList<QStandardItem *> items)>;
     using FillCallback = std::function<void(ResultCallback)>;
diff --git a/src/libs/utils/async.cpp b/src/libs/utils/async.cpp
index 33487db73be..b67e83fc721 100644
--- a/src/libs/utils/async.cpp
+++ b/src/libs/utils/async.cpp
@@ -17,16 +17,6 @@ public:
     }
 };
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 3, 0)
-Q_GLOBAL_STATIC_WITH_ARGS(AsyncThreadPool, s_idle,         (QThread::IdlePriority));
-Q_GLOBAL_STATIC_WITH_ARGS(AsyncThreadPool, s_lowest,       (QThread::LowestPriority));
-Q_GLOBAL_STATIC_WITH_ARGS(AsyncThreadPool, s_low,          (QThread::LowPriority));
-Q_GLOBAL_STATIC_WITH_ARGS(AsyncThreadPool, s_normal,       (QThread::NormalPriority));
-Q_GLOBAL_STATIC_WITH_ARGS(AsyncThreadPool, s_high,         (QThread::HighPriority));
-Q_GLOBAL_STATIC_WITH_ARGS(AsyncThreadPool, s_highest,      (QThread::HighestPriority));
-Q_GLOBAL_STATIC_WITH_ARGS(AsyncThreadPool, s_timeCritical, (QThread::TimeCriticalPriority));
-Q_GLOBAL_STATIC_WITH_ARGS(AsyncThreadPool, s_inherit,      (QThread::InheritPriority));
-#else
 Q_GLOBAL_STATIC(AsyncThreadPool, s_idle,         QThread::IdlePriority);
 Q_GLOBAL_STATIC(AsyncThreadPool, s_lowest,       QThread::LowestPriority);
 Q_GLOBAL_STATIC(AsyncThreadPool, s_low,          QThread::LowPriority);
@@ -35,7 +25,6 @@ Q_GLOBAL_STATIC(AsyncThreadPool, s_high,         QThread::HighPriority);
 Q_GLOBAL_STATIC(AsyncThreadPool, s_highest,      QThread::HighestPriority);
 Q_GLOBAL_STATIC(AsyncThreadPool, s_timeCritical, QThread::TimeCriticalPriority);
 Q_GLOBAL_STATIC(AsyncThreadPool, s_inherit,      QThread::InheritPriority);
-#endif
 
 QThreadPool *asyncThreadPool(QThread::Priority priority)
 {
diff --git a/src/libs/utils/async.h b/src/libs/utils/async.h
index af6fb3fd85d..8c7155bc131 100644
--- a/src/libs/utils/async.h
+++ b/src/libs/utils/async.h
@@ -7,6 +7,7 @@
 
 #include "futuresynchronizer.h"
 #include "qtcassert.h"
+#include "threadutils.h"
 
 #include <solutions/tasking/tasktree.h>
 
@@ -130,7 +131,9 @@ template <typename ResultType>
 class Async : public AsyncBase
 {
 public:
-    Async() {
+    Async()
+        : m_synchronizer(isMainThread() ? futureSynchronizer() : nullptr)
+    {
         connect(&m_watcher, &QFutureWatcherBase::finished, this, &AsyncBase::done);
         connect(&m_watcher, &QFutureWatcherBase::resultReadyAt, this, &AsyncBase::resultReadyAt);
     }
diff --git a/src/libs/utils/changeset.cpp b/src/libs/utils/changeset.cpp
index c0c54b1e486..881097c6b70 100644
--- a/src/libs/utils/changeset.cpp
+++ b/src/libs/utils/changeset.cpp
@@ -100,6 +100,41 @@ void ChangeSet::clear()
     m_error = false;
 }
 
+ChangeSet ChangeSet::makeReplace(const Range &range, const QString &replacement)
+{
+    ChangeSet c;
+    c.replace(range, replacement);
+    return c;
+}
+
+ChangeSet ChangeSet::makeReplace(int start, int end, const QString &replacement)
+{
+    ChangeSet c;
+    c.replace(start, end, replacement);
+    return c;
+}
+
+ChangeSet ChangeSet::makeRemove(const Range &range)
+{
+    ChangeSet c;
+    c.remove(range);
+    return c;
+}
+
+ChangeSet ChangeSet::makeFlip(int start1, int end1, int start2, int end2)
+{
+    ChangeSet c;
+    c.flip(start1, end1, start2, end2);
+    return c;
+}
+
+ChangeSet ChangeSet::makeInsert(int pos, const QString &text)
+{
+    ChangeSet c;
+    c.insert(pos, text);
+    return c;
+}
+
 bool ChangeSet::replace_helper(int pos, int length, const QString &replacement)
 {
     if (hasOverlap(pos, length))
diff --git a/src/libs/utils/changeset.h b/src/libs/utils/changeset.h
index 6370b20d3c2..aee9c99dab5 100644
--- a/src/libs/utils/changeset.h
+++ b/src/libs/utils/changeset.h
@@ -76,6 +76,12 @@ public:
 
     void clear();
 
+    static ChangeSet makeReplace(const Range &range, const QString &replacement);
+    static ChangeSet makeReplace(int start, int end, const QString &replacement);
+    static ChangeSet makeRemove(const Range &range);
+    static ChangeSet makeFlip(int start1, int end1, int start2, int end2);
+    static ChangeSet makeInsert(int pos, const QString &text);
+
     bool replace(const Range &range, const QString &replacement);
     bool remove(const Range &range);
     bool move(const Range &range, int to);
diff --git a/src/libs/utils/checkablemessagebox.cpp b/src/libs/utils/checkablemessagebox.cpp
index 19d3669adac..1d721e04c86 100644
--- a/src/libs/utils/checkablemessagebox.cpp
+++ b/src/libs/utils/checkablemessagebox.cpp
@@ -3,6 +3,7 @@
 
 #include "checkablemessagebox.h"
 
+#include "guiutils.h"
 #include "hostosinfo.h"
 #include "qtcassert.h"
 #include "qtcsettings.h"
@@ -95,7 +96,7 @@ static QMessageBox::StandardButton exec(
             return acceptButton;
     }
 
-    QMessageBox msgBox(parent);
+    QMessageBox msgBox(dialogParent(parent));
     prepare(icon, title, text, decider, buttons, defaultButton, buttonTextOverrides, msg, msgBox);
     msgBox.exec();
 
@@ -131,7 +132,7 @@ static void show(QWidget *parent,
         return;
     }
 
-    QMessageBox *msgBox = new QMessageBox(parent);
+    QMessageBox *msgBox = new QMessageBox(dialogParent(parent));
     prepare(icon, title, text, decider, buttons, defaultButton, buttonTextOverrides, msg, *msgBox);
 
     std::optional<QPointer<QObject>> guardPtr;
diff --git a/src/libs/utils/clangutils.cpp b/src/libs/utils/clangutils.cpp
index 4c8c7d801db..86e8e6204e9 100644
--- a/src/libs/utils/clangutils.cpp
+++ b/src/libs/utils/clangutils.cpp
@@ -65,7 +65,7 @@ bool checkClangdVersion(const FilePath &clangd, QString *error)
 
 QVersionNumber minimumClangdVersion()
 {
-    return QVersionNumber(14);
+    return QVersionNumber(17);
 }
 
 } // namespace Utils
diff --git a/src/libs/utils/codegeneration.cpp b/src/libs/utils/codegeneration.cpp
index 8842023a239..ad3b8bad18f 100644
--- a/src/libs/utils/codegeneration.cpp
+++ b/src/libs/utils/codegeneration.cpp
@@ -29,23 +29,6 @@ QTCREATOR_UTILS_EXPORT QString fileNameToCppIdentifier(const QString &s)
     return rc;
 }
 
-QTCREATOR_UTILS_EXPORT QString headerGuard(const QString &file)
-{
-    return headerGuard(file, QStringList());
-}
-
-QTCREATOR_UTILS_EXPORT QString headerGuard(const QString &file, const QStringList &namespaceList)
-{
-    const QChar underscore = QLatin1Char('_');
-    QString rc;
-    for (int i = 0; i < namespaceList.count(); i++)
-        rc += namespaceList.at(i).toUpper() + underscore;
-
-    const QFileInfo fi(file);
-    rc += fileNameToCppIdentifier(fi.fileName()).toUpper();
-    return rc;
-}
-
 QTCREATOR_UTILS_EXPORT
 void writeIncludeFileDirective(const QString &file, bool globalInclude,
                                QTextStream &str)
diff --git a/src/libs/utils/codegeneration.h b/src/libs/utils/codegeneration.h
index 9ea0bb28c7e..e1c297eb92c 100644
--- a/src/libs/utils/codegeneration.h
+++ b/src/libs/utils/codegeneration.h
@@ -17,9 +17,6 @@ namespace Utils {
 // or replacing them by an underscore).
 QTCREATOR_UTILS_EXPORT QString fileNameToCppIdentifier(const QString &s);
 
-QTCREATOR_UTILS_EXPORT QString headerGuard(const QString &file);
-QTCREATOR_UTILS_EXPORT QString headerGuard(const QString &file, const QStringList &namespaceList);
-
 QTCREATOR_UTILS_EXPORT
 void writeIncludeFileDirective(const QString &file,
                                bool globalInclude,
diff --git a/src/libs/utils/commandline.cpp b/src/libs/utils/commandline.cpp
index 8e6bc60277e..b4fa60481ed 100644
--- a/src/libs/utils/commandline.cpp
+++ b/src/libs/utils/commandline.cpp
@@ -1425,6 +1425,19 @@ CommandLine::CommandLine(const FilePath &exe, const QStringList &args)
     addArgs(args);
 }
 
+CommandLine::CommandLine(const FilePath &exe, std::initializer_list<ArgRef> args)
+    : m_executable(exe)
+{
+    for (const ArgRef &arg : args) {
+        if (const auto ptr = std::get_if<const char *>(&arg.m_arg))
+            addArg(QString::fromUtf8(*ptr));
+        else if (const auto ptr = std::get_if<std::reference_wrapper<const QString>>(&arg.m_arg))
+            addArg(*ptr);
+        else if (const auto ptr = std::get_if<std::reference_wrapper<const QStringList>>(&arg.m_arg))
+            addArgs(*ptr);
+    }
+}
+
 CommandLine::CommandLine(const FilePath &exe, const QStringList &args, OsType osType)
     : m_executable(exe)
 {
diff --git a/src/libs/utils/commandline.h b/src/libs/utils/commandline.h
index 52ff8c5496f..3718f80bca3 100644
--- a/src/libs/utils/commandline.h
+++ b/src/libs/utils/commandline.h
@@ -11,6 +11,8 @@
 #include <QPair>
 #include <QStringList>
 
+#include <variant>
+
 namespace Utils {
 
 class AbstractMacroExpander;
@@ -120,8 +122,22 @@ public:
     CommandLine();
     ~CommandLine();
 
+    struct ArgRef
+    {
+        ArgRef(const char *arg) : m_arg(arg) {}
+        ArgRef(const QString &arg) : m_arg(arg) {}
+        ArgRef(const QStringList &args) : m_arg(args) {}
+
+    private:
+        friend class CommandLine;
+        const std::variant<const char *,
+                           std::reference_wrapper<const QString>,
+                           std::reference_wrapper<const QStringList>> m_arg;
+    };
+
     explicit CommandLine(const FilePath &executable);
     CommandLine(const FilePath &exe, const QStringList &args);
+    CommandLine(const FilePath &exe, std::initializer_list<ArgRef> args);
     CommandLine(const FilePath &exe, const QStringList &args, OsType osType);
     CommandLine(const FilePath &exe, const QString &unparsedArgs, RawType);
 
diff --git a/src/libs/utils/crumblepath.cpp b/src/libs/utils/crumblepath.cpp
index 779b1c9e559..d434350460f 100644
--- a/src/libs/utils/crumblepath.cpp
+++ b/src/libs/utils/crumblepath.cpp
@@ -111,9 +111,9 @@ void CrumblePathButton::paintEvent(QPaintEvent*)
         p.drawPixmap(width() - overlapSize, segmentRect.top(), middleSegmentPixmap);
 
     if (option.state & QStyle::State_Enabled)
-        option.palette.setColor(QPalette::ButtonText, creatorTheme()->color(Theme::PanelTextColorLight));
+        option.palette.setColor(QPalette::ButtonText, creatorColor(Theme::PanelTextColorLight));
     else
-        option.palette.setColor(QPalette::Disabled, QPalette::ButtonText, creatorTheme()->color(Theme::IconsDisabledColor));
+        option.palette.setColor(QPalette::Disabled, QPalette::ButtonText, creatorColor(Theme::IconsDisabledColor));
 
     QStylePainter sp(this);
     if (option.state & QStyle::State_Sunken)
diff --git a/src/libs/utils/datafromprocess.h b/src/libs/utils/datafromprocess.h
new file mode 100644
index 00000000000..5acb220ba4e
--- /dev/null
+++ b/src/libs/utils/datafromprocess.h
@@ -0,0 +1,148 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "algorithm.h"
+#include "commandline.h"
+#include "environment.h"
+#include "filepath.h"
+#include "qtcprocess.h"
+
+#include <QDateTime>
+#include <QHash>
+#include <QMutex>
+#include <QMutexLocker>
+
+#include <chrono>
+#include <functional>
+#include <memory>
+#include <optional>
+#include <utility>
+
+namespace Utils {
+
+// Use this facility for cached retrieval of data from a tool that always returns the same
+// output for the same parameters and is side effect free.
+// A prime example is version info via a --version switch.
+template<typename Data> class DataFromProcess
+{
+public:
+    class Parameters
+    {
+    public:
+        using OutputParser = std::function<std::optional<Data>(const QString &)>;
+        using ErrorHandler = std::function<void(const Process &)>;
+        using Callback = std::function<void(const std::optional<Data> &)>;
+
+        Parameters(const CommandLine &cmdLine, const OutputParser &parser)
+            : commandLine(cmdLine)
+            , parser(parser)
+        {}
+
+        CommandLine commandLine;
+        Environment environment = Environment::systemEnvironment();
+        std::chrono::seconds timeout = std::chrono::seconds(10);
+        OutputParser parser;
+        ErrorHandler errorHandler;
+        Callback callback;
+        QList<ProcessResult> allowedResults{ProcessResult::FinishedWithSuccess};
+    };
+
+    // Use the first variant whenever possible.
+    static void provideData(const Parameters &params);
+    static std::optional<Data> getData(const Parameters &params);
+
+private:
+    using Key = std::tuple<FilePath, QStringList, QString>;
+    using Value = std::pair<std::optional<Data>, QDateTime>;
+
+    static std::optional<Data> getOrProvideData(const Parameters &params);
+    static std::optional<Data> handleProcessFinished(const Parameters &params,
+                                                     const QDateTime &exeTimestamp,
+                                                     const Key &cacheKey,
+                                                     const std::shared_ptr<Process> &process);
+
+    static inline QHash<Key, Value> m_cache;
+    static inline QMutex m_cacheMutex;
+};
+
+template<typename Data>
+inline void DataFromProcess<Data>::provideData(const Parameters &params)
+{
+    QTC_ASSERT(params.callback, return);
+    getOrProvideData(params);
+}
+
+template<typename Data>
+inline std::optional<Data> DataFromProcess<Data>::getData(const Parameters &params)
+{
+    QTC_ASSERT(!params.callback, return {});
+    return getOrProvideData(params);
+}
+
+template<typename Data>
+inline std::optional<Data> DataFromProcess<Data>::getOrProvideData(const Parameters &params)
+{
+    if (params.commandLine.executable().isEmpty()) {
+        if (params.callback)
+            params.callback({});
+        return {};
+    }
+
+    const auto key = std::make_tuple(params.commandLine.executable(),
+                                     params.environment.toStringList(),
+                                     params.commandLine.arguments());
+    const QDateTime exeTimestamp = params.commandLine.executable().lastModified();
+    {
+        QMutexLocker<QMutex> cacheLocker(&m_cacheMutex);
+        const auto it = m_cache.constFind(key);
+        if (it != m_cache.constEnd() && it.value().second == exeTimestamp)
+            return it.value().first;
+    }
+
+    const auto outputRetriever = std::make_shared<Process>();
+    outputRetriever->setCommand(params.commandLine);
+    if (params.callback) {
+        QObject::connect(outputRetriever.get(),
+                         &Process::done,
+                         [params, exeTimestamp, key, outputRetriever] {
+                             handleProcessFinished(params, exeTimestamp, key, outputRetriever);
+                         });
+        outputRetriever->start();
+        return {};
+    }
+
+    outputRetriever->runBlocking(params.timeout);
+    return handleProcessFinished(params, exeTimestamp, key, outputRetriever);
+}
+
+template<typename Data>
+inline std::optional<Data> DataFromProcess<Data>::handleProcessFinished(
+    const Parameters &params,
+    const QDateTime &exeTimestamp,
+    const Key &cacheKey,
+    const std::shared_ptr<Process> &process)
+{
+    // Do not store into cache: The next call might succeed.
+    if (process->result() == ProcessResult::Canceled) {
+        if (params.callback)
+            params.callback({});
+        return {};
+    }
+
+    std::optional<Data> data;
+    if (params.allowedResults.contains(process->result()))
+        data = params.parser(process->cleanedStdOut());
+    else if (params.errorHandler)
+        params.errorHandler(*process);
+    QMutexLocker<QMutex> cacheLocker(&m_cacheMutex);
+    m_cache.insert(cacheKey, std::make_pair(data, exeTimestamp));
+    if (params.callback) {
+        params.callback(data);
+        return {};
+    }
+    return data;
+}
+
+} // namespace Utils
diff --git a/src/libs/utils/detailsbutton.cpp b/src/libs/utils/detailsbutton.cpp
index 88c0ca273ea..c6e1b6da3f1 100644
--- a/src/libs/utils/detailsbutton.cpp
+++ b/src/libs/utils/detailsbutton.cpp
@@ -87,8 +87,8 @@ QColor DetailsButton::outlineColor()
 {
     return HostOsInfo::isMacHost()
             ? QGuiApplication::palette().color(QPalette::Mid)
-            : StyleHelper::mergedColors(creatorTheme()->color(Theme::TextColorNormal),
-                                        creatorTheme()->color(Theme::BackgroundColorNormal), 15);
+            : StyleHelper::mergedColors(creatorColor(Theme::TextColorNormal),
+                                        creatorColor(Theme::BackgroundColorNormal), 15);
 }
 
 void DetailsButton::paintEvent(QPaintEvent *e)
diff --git a/src/libs/utils/detailswidget.cpp b/src/libs/utils/detailswidget.cpp
index ec7a3d22ebb..d278a609ff8 100644
--- a/src/libs/utils/detailswidget.cpp
+++ b/src/libs/utils/detailswidget.cpp
@@ -224,7 +224,7 @@ void DetailsWidget::paintEvent(QPaintEvent *paintEvent)
     QPainter p(this);
     if (creatorTheme()->flag(Theme::FlatProjectsMode) || HostOsInfo::isMacHost()) {
         const QColor bgColor = creatorTheme()->flag(Theme::FlatProjectsMode) ?
-                    creatorTheme()->color(Theme::DetailsWidgetBackgroundColor)
+                    creatorColor(Theme::DetailsWidgetBackgroundColor)
                   : palette().color(QPalette::Window);
         p.fillRect(rect(), bgColor);
     }
diff --git a/src/libs/utils/devicefileaccess.cpp b/src/libs/utils/devicefileaccess.cpp
index 2769f592816..c8f920c07f7 100644
--- a/src/libs/utils/devicefileaccess.cpp
+++ b/src/libs/utils/devicefileaccess.cpp
@@ -17,9 +17,11 @@
 #endif
 
 #include <QCoreApplication>
+#include <QFileSystemWatcher>
 #include <QOperatingSystemVersion>
 #include <QRandomGenerator>
 #include <QRegularExpression>
+#include <QStandardPaths>
 #include <QStorageInfo>
 #include <QTemporaryFile>
 
@@ -33,7 +35,6 @@
 #include <qplatformdefs.h>
 #endif
 
-#include <QStandardPaths>
 #include <algorithm>
 #include <array>
 
@@ -314,12 +315,10 @@ expected_str<QByteArray> DeviceFileAccess::fileContents(const FilePath &filePath
 }
 
 expected_str<qint64> DeviceFileAccess::writeFileContents(const FilePath &filePath,
-                                                         const QByteArray &data,
-                                                         qint64 offset) const
+                                                         const QByteArray &data) const
 {
     Q_UNUSED(filePath)
     Q_UNUSED(data)
-    Q_UNUSED(offset)
     QTC_CHECK(false);
     return make_unexpected(
         Tr::tr("writeFileContents is not implemented for \"%1\".").arg(filePath.toUserOutput()));
@@ -391,6 +390,13 @@ expected_str<FilePath> DeviceFileAccess::createTempFile(const FilePath &filePath
         Tr::tr("createTempFile is not implemented for \"%1\".").arg(filePath.toUserOutput()));
 }
 
+Utils::expected_str<std::unique_ptr<FilePathWatcher>> DeviceFileAccess::watch(
+    const FilePath &path) const
+{
+    Q_UNUSED(path);
+    return make_unexpected(Tr::tr("watch is not implemented."));
+}
+
 // DesktopDeviceFileAccess
 
 DesktopDeviceFileAccess::~DesktopDeviceFileAccess() = default;
@@ -738,8 +744,7 @@ expected_str<QByteArray> DesktopDeviceFileAccess::fileContents(const FilePath &f
 }
 
 expected_str<qint64> DesktopDeviceFileAccess::writeFileContents(const FilePath &filePath,
-                                                                const QByteArray &data,
-                                                                qint64 offset) const
+                                                                const QByteArray &data) const
 {
     QFile file(filePath.path());
     const bool isOpened = file.open(QFile::WriteOnly | QFile::Truncate);
@@ -747,8 +752,6 @@ expected_str<qint64> DesktopDeviceFileAccess::writeFileContents(const FilePath &
         return make_unexpected(
             Tr::tr("Could not open file \"%1\" for writing.").arg(filePath.toUserOutput()));
 
-    if (offset != 0)
-        file.seek(offset);
     qint64 res = file.write(data);
     if (res != data.size())
         return make_unexpected(
@@ -772,6 +775,29 @@ expected_str<FilePath> DesktopDeviceFileAccess::createTempFile(const FilePath &f
     return filePath.withNewPath(file.fileName());
 }
 
+class DesktopFilePathWatcher : public FilePathWatcher
+{
+    QFileSystemWatcher m_watcher;
+
+public:
+    DesktopFilePathWatcher(const FilePath &path) {
+        connect(&m_watcher, &QFileSystemWatcher::fileChanged, this, [this, path] {
+            emit pathChanged(path);
+        });
+        connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, [this, path] {
+            emit pathChanged(path);
+        });
+
+        m_watcher.addPath(path.path());
+    }
+};
+
+Utils::expected_str<std::unique_ptr<FilePathWatcher>> DesktopDeviceFileAccess::watch(
+    const FilePath &path) const
+{
+    return std::make_unique<DesktopFilePathWatcher>(path);
+}
+
 QDateTime DesktopDeviceFileAccess::lastModified(const FilePath &filePath) const
 {
     return QFileInfo(filePath.path()).lastModified();
@@ -1064,6 +1090,10 @@ expected_str<QByteArray> UnixDeviceFileAccess::fileContents(const FilePath &file
     if (disconnected())
         return make_unexpected_disconnected();
 
+    expected_str<FilePath> localSource = filePath.localSource();
+    if (localSource && *localSource != filePath)
+        return localSource->fileContents(limit, offset);
+
     QStringList args = {"if=" + filePath.path()};
     if (limit > 0 || offset > 0) {
         const qint64 gcd = std::gcd(limit, offset);
@@ -1088,17 +1118,16 @@ expected_str<QByteArray> UnixDeviceFileAccess::fileContents(const FilePath &file
 }
 
 expected_str<qint64> UnixDeviceFileAccess::writeFileContents(const FilePath &filePath,
-                                                             const QByteArray &data,
-                                                             qint64 offset) const
+                                                             const QByteArray &data) const
 {
     if (disconnected())
         return make_unexpected_disconnected();
 
+    expected_str<FilePath> localSource = filePath.localSource();
+    if (localSource && *localSource != filePath)
+        return localSource->writeFileContents(data);
+
     QStringList args = {"of=" + filePath.path()};
-    if (offset != 0) {
-        args.append("bs=1");
-        args.append(QString("seek=%1").arg(offset));
-    }
     RunResult result = runInShell({"dd", args, OsType::OsTypeLinux}, data);
 
     if (result.exitCode != 0) {
diff --git a/src/libs/utils/devicefileaccess.h b/src/libs/utils/devicefileaccess.h
index ba484541275..451fb2db4be 100644
--- a/src/libs/utils/devicefileaccess.h
+++ b/src/libs/utils/devicefileaccess.h
@@ -69,10 +69,11 @@ protected:
                                                   qint64 offset) const;
 
     virtual expected_str<qint64> writeFileContents(const FilePath &filePath,
-                                                   const QByteArray &data,
-                                                   qint64 offset) const;
+                                                   const QByteArray &data) const;
 
     virtual expected_str<FilePath> createTempFile(const FilePath &filePath);
+
+    virtual Utils::expected_str<std::unique_ptr<FilePathWatcher>> watch(const FilePath &path) const;
 };
 
 class QTCREATOR_UTILS_EXPORT DesktopDeviceFileAccess : public DeviceFileAccess
@@ -125,11 +126,11 @@ protected:
                                           qint64 limit,
                                           qint64 offset) const override;
     expected_str<qint64> writeFileContents(const FilePath &filePath,
-                                           const QByteArray &data,
-                                           qint64 offset) const override;
+                                           const QByteArray &data) const override;
 
     expected_str<FilePath> createTempFile(const FilePath &filePath) override;
 
+    Utils::expected_str<std::unique_ptr<FilePathWatcher>> watch(const FilePath &path) const override;
 };
 
 class QTCREATOR_UTILS_EXPORT UnixDeviceFileAccess : public DeviceFileAccess
@@ -178,8 +179,7 @@ protected:
                                           qint64 limit,
                                           qint64 offset) const override;
     expected_str<qint64> writeFileContents(const FilePath &filePath,
-                                           const QByteArray &data,
-                                           qint64 offset) const override;
+                                           const QByteArray &data) const override;
 
     expected_str<FilePath> createTempFile(const FilePath &filePath) override;
 
diff --git a/src/libs/utils/dropsupport.cpp b/src/libs/utils/dropsupport.cpp
index 7416edf9c37..4ed12456438 100644
--- a/src/libs/utils/dropsupport.cpp
+++ b/src/libs/utils/dropsupport.cpp
@@ -108,7 +108,7 @@ bool DropSupport::eventFilter(QObject *obj, QEvent *event)
                     de->acceptProposedAction();
                 bool needToScheduleEmit = m_files.isEmpty();
                 m_files.append(tempFiles);
-                m_dropPos = de->pos();
+                m_dropPos = de->position().toPoint();
                 if (needToScheduleEmit) { // otherwise we already have a timer pending
                     // Delay the actual drop, to avoid conflict between
                     // actions that happen when opening files, and actions that the item views do
@@ -122,7 +122,7 @@ bool DropSupport::eventFilter(QObject *obj, QEvent *event)
                 accepted = true;
                 bool needToScheduleEmit = m_values.isEmpty();
                 m_values.append(fileDropMimeData->values());
-                m_dropPos = de->pos();
+                m_dropPos = de->position().toPoint();
                 if (needToScheduleEmit)
                     QTimer::singleShot(100, this, &DropSupport::emitValuesDropped);
             }
diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp
index be43f2a2062..190cde2d2df 100644
--- a/src/libs/utils/environment.cpp
+++ b/src/libs/utils/environment.cpp
@@ -433,60 +433,82 @@ const NameValueDictionary &Environment::resolved() const
             m_dict = Environment::systemEnvironment().toDictionary();
             m_fullDict = true;
             break;
-        case SetFixedDictionary:
-            m_dict = std::get<SetFixedDictionary>(item);
-            m_fullDict = true;
-            break;
-        case SetValue: {
-            auto [key, value, enabled] = std::get<SetValue>(item);
-            m_dict.set(key, value, enabled);
-            break;
-        }
-        case SetFallbackValue: {
-            auto [key, value] = std::get<SetFallbackValue>(item);
-            if (m_fullDict) {
-                if (m_dict.value(key).isEmpty())
-                    m_dict.set(key, value, true);
-            } else {
-                QTC_ASSERT(false, qDebug() << "operating on partial dictionary");
-                m_dict.set(key, value, true);
+        case SetFixedDictionary: {
+            const auto dict = std::get_if<SetFixedDictionary>(&item);
+            if (QTC_GUARD(dict)) {
+                m_dict = *dict;
+                m_fullDict = true;
             }
             break;
         }
-        case UnsetValue:
-            m_dict.unset(std::get<UnsetValue>(item));
+        case SetValue: {
+            const auto setvalue = std::get_if<SetValue>(&item);
+            if (QTC_GUARD(setvalue)) {
+                auto [key, value, enabled] = *setvalue;
+                m_dict.set(key, value, enabled);
+            }
             break;
+        }
+        case SetFallbackValue: {
+            const auto fallbackvalue = std::get_if<SetFallbackValue>(&item);
+            if (QTC_GUARD(fallbackvalue)) {
+                auto [key, value] = *fallbackvalue;
+                if (m_fullDict) {
+                    if (m_dict.value(key).isEmpty())
+                        m_dict.set(key, value, true);
+                } else {
+                    QTC_ASSERT(false, qDebug() << "operating on partial dictionary");
+                    m_dict.set(key, value, true);
+                }
+            }
+            break;
+        }
+        case UnsetValue: {
+            const auto unsetvalue = std::get_if<UnsetValue>(&item);
+            if (QTC_GUARD(unsetvalue))
+                m_dict.unset(*unsetvalue);
+            break;
+        }
         case PrependOrSet: {
-            auto [key, value, sep] = std::get<PrependOrSet>(item);
-            QTC_ASSERT(!key.contains('='), return m_dict);
-            const auto it = m_dict.findKey(key);
-            if (it == m_dict.m_values.end()) {
-                m_dict.m_values.insert(DictKey(key, m_dict.nameCaseSensitivity()), {value, true});
-            } else {
-                // Prepend unless it is already there
-                const QString toPrepend = value + pathListSeparator(sep);
-                if (!it.value().first.startsWith(toPrepend))
-                    it.value().first.prepend(toPrepend);
+            const auto prependorset = std::get_if<PrependOrSet>(&item);
+            if (QTC_GUARD(prependorset)) {
+                auto [key, value, sep] = *prependorset;
+                QTC_ASSERT(!key.contains('='), return m_dict);
+                const auto it = m_dict.findKey(key);
+                if (it == m_dict.m_values.end()) {
+                    m_dict.m_values.insert(DictKey(key, m_dict.nameCaseSensitivity()), {value, true});
+                } else {
+                    // Prepend unless it is already there
+                    const QString toPrepend = value + pathListSeparator(sep);
+                    if (!it.value().first.startsWith(toPrepend))
+                        it.value().first.prepend(toPrepend);
+                }
             }
             break;
         }
         case AppendOrSet: {
-            auto [key, value, sep] = std::get<AppendOrSet>(item);
-            QTC_ASSERT(!key.contains('='), return m_dict);
-            const auto it = m_dict.findKey(key);
-            if (it == m_dict.m_values.end()) {
-                m_dict.m_values.insert(DictKey(key, m_dict.nameCaseSensitivity()), {value, true});
-            } else {
-                // Prepend unless it is already there
-                const QString toAppend = pathListSeparator(sep) + value;
-                if (!it.value().first.endsWith(toAppend))
-                    it.value().first.append(toAppend);
+            const auto appendorset = std::get_if<AppendOrSet>(&item);
+            if (QTC_GUARD(appendorset)) {
+                auto [key, value, sep] = *appendorset;
+                QTC_ASSERT(!key.contains('='), return m_dict);
+                const auto it = m_dict.findKey(key);
+                if (it == m_dict.m_values.end()) {
+                    m_dict.m_values.insert(DictKey(key, m_dict.nameCaseSensitivity()), {value, true});
+                } else {
+                    // Prepend unless it is already there
+                    const QString toAppend = pathListSeparator(sep) + value;
+                    if (!it.value().first.endsWith(toAppend))
+                        it.value().first.append(toAppend);
+                }
             }
             break;
         }
         case Modify: {
-            EnvironmentItems items = std::get<Modify>(item);
-            m_dict.modify(items);
+            const auto modify = std::get_if<Modify>(&item);
+            if (QTC_GUARD(modify)) {
+                EnvironmentItems items = *modify;
+                m_dict.modify(items);
+            }
             break;
         }
         case SetupEnglishOutput:
diff --git a/src/libs/utils/environmentmodel.cpp b/src/libs/utils/environmentmodel.cpp
index 6ac9b356406..e81ee520d81 100644
--- a/src/libs/utils/environmentmodel.cpp
+++ b/src/libs/utils/environmentmodel.cpp
@@ -397,7 +397,8 @@ EnvironmentItems EnvironmentModel::userChanges() const
 void EnvironmentModel::setUserChanges(const EnvironmentItems &items)
 {
     EnvironmentItems filtered = Utils::filtered(items, [](const EnvironmentItem &i) {
-        return i.name != "export " && !i.name.contains('=');
+        return i.operation == EnvironmentItem::Comment
+                || (i.name != "export " && !i.name.contains('='));
     });
     // We assume nobody is reordering the items here.
     if (filtered == d->m_items)
diff --git a/src/libs/utils/expected.h b/src/libs/utils/expected.h
index 33231c1246e..0e018eb8ab5 100644
--- a/src/libs/utils/expected.h
+++ b/src/libs/utils/expected.h
@@ -30,3 +30,12 @@ using expected_str = tl::expected<T, QString>;
     } \
     do { \
     } while (0)
+
+#define QTC_CHECK_EXPECTED(expected) \
+    if (Q_LIKELY(expected)) { \
+    } else { \
+        ::Utils::writeAssertLocation( \
+            QString("%1:%2: %3").arg(__FILE__).arg(__LINE__).arg(expected.error()).toUtf8().data()); \
+    } \
+    do { \
+    } while (0)
diff --git a/src/libs/utils/externalterminalprocessimpl.cpp b/src/libs/utils/externalterminalprocessimpl.cpp
index 73b866febf3..693905bddc0 100644
--- a/src/libs/utils/externalterminalprocessimpl.cpp
+++ b/src/libs/utils/externalterminalprocessimpl.cpp
@@ -181,7 +181,7 @@ expected_str<qint64> ProcessStubCreator::startStubProcess(const ProcessSetupData
         process->setProcessMode(ProcessMode::Writer);
     } else {
         QString extraArgsFromOptions = terminal.executeArgs;
-        CommandLine cmdLine = {terminal.command, {}};
+        CommandLine cmdLine{terminal.command};
         if (!extraArgsFromOptions.isEmpty())
             cmdLine.addArgs(extraArgsFromOptions, CommandLine::Raw);
         cmdLine.addCommandLineAsArgs(setupData.m_commandLine, CommandLine::Raw);
diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp
index 44a94236085..69d7209c3a5 100644
--- a/src/libs/utils/fancylineedit.cpp
+++ b/src/libs/utils/fancylineedit.cpp
@@ -5,6 +5,7 @@
 
 #include "camelcasecursor.h"
 #include "execmenu.h"
+#include "futuresynchronizer.h"
 #include "historycompleter.h"
 #include "hostosinfo.h"
 #include "icon.h"
@@ -98,6 +99,7 @@ class FancyLineEditPrivate : public QObject
 {
 public:
     explicit FancyLineEditPrivate(FancyLineEdit *parent);
+    ~FancyLineEditPrivate();
 
     bool eventFilter(QObject *obj, QEvent *event) override;
 
@@ -134,8 +136,8 @@ FancyLineEditPrivate::FancyLineEditPrivate(FancyLineEdit *parent)
     : QObject(parent)
     , m_lineEdit(parent)
     , m_completionShortcut(completionShortcut()->key(), parent)
-    , m_okTextColor(creatorTheme()->color(Theme::TextColorNormal))
-    , m_errorTextColor(creatorTheme()->color(Theme::TextColorError))
+    , m_okTextColor(creatorColor(Theme::TextColorNormal))
+    , m_errorTextColor(creatorColor(Theme::TextColorError))
     , m_placeholderTextColor(QApplication::palette().color(QPalette::PlaceholderText))
     , m_spinner(new SpinnerSolution::Spinner(SpinnerSolution::SpinnerSize::Small, m_lineEdit))
 {
@@ -163,6 +165,12 @@ FancyLineEditPrivate::FancyLineEditPrivate(FancyLineEdit *parent)
     }
 }
 
+FancyLineEditPrivate::~FancyLineEditPrivate()
+{
+    if (m_validatorWatcher)
+        m_validatorWatcher->cancel();
+}
+
 bool FancyLineEditPrivate::eventFilter(QObject *obj, QEvent *event)
 {
     int buttonIndex = -1;
@@ -446,12 +454,27 @@ void FancyLineEdit::setFiltering(bool on)
     }
 }
 
+/*!
+    Set a synchronous or asynchronous validation function \a fn.
+    Asynchronous validation functions can continue to run after destruction of the
+    FancyLineEdit instance. During shutdown asynchronous validation functions can continue
+    to run until before the plugin instances are deleted (at that point the plugin manager
+    waits for them to finish before continuing).
+
+    \sa defaultValidationFunction()
+ */
 void FancyLineEdit::setValidationFunction(const FancyLineEdit::ValidationFunction &fn)
 {
     d->m_validationFunction = fn;
     validate();
 }
 
+/*!
+    Returns the default validation function, which synchonously executes the line edit's
+    validator.
+
+    \sa setValidationFunction()
+*/
 FancyLineEdit::ValidationFunction FancyLineEdit::defaultValidationFunction()
 {
     return &FancyLineEdit::validateWithValidator;
@@ -581,6 +604,7 @@ void FancyLineEdit::validate()
 
         AsyncValidationFuture future = validationFunction(text());
         d->m_validatorWatcher->setFuture(future);
+        Utils::futureSynchronizer()->addFuture(future);
 
         return;
     }
diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp
index 562f3247bd8..23a6ff24129 100644
--- a/src/libs/utils/filepath.cpp
+++ b/src/libs/utils/filepath.cpp
@@ -19,9 +19,11 @@
 #include <QFileInfo>
 #include <QRegularExpression>
 #include <QStringView>
-#include <QUrl>
-#include <QtGlobal>
 #include <QTemporaryFile>
+#include <QUrl>
+
+#include <QtConcurrent>
+#include <QtGlobal>
 
 #ifdef Q_OS_WIN
 #ifdef QTCREATOR_PCH_H
@@ -291,6 +293,31 @@ QString FilePath::toString() const
     return scheme() + "://" + encodedHost() + pathView();
 }
 
+bool FilePath::equals(const FilePath &first, const FilePath &second, Qt::CaseSensitivity cs)
+{
+    if (first.m_hash != 0 && second.m_hash != 0 && first.m_hash != second.m_hash)
+        return false;
+
+    return first.pathView().compare(second.pathView(), cs) == 0
+           && first.host() == second.host()
+           && first.scheme() == second.scheme();
+}
+
+/*!
+ * Returns true if the two file paths compare equal case-sensitively.
+ * This is relevant on semi-case sensitive systems like Windows with NTFS.
+ * @see QTCREATORBUG-30846
+ */
+bool FilePath::equalsCaseSensitive(const FilePath &other) const
+{
+    return equals(*this, other, Qt::CaseSensitive);
+}
+
+Utils::expected_str<std::unique_ptr<FilePathWatcher>> FilePath::watch() const
+{
+    return fileAccess()->watch(*this);
+}
+
 /*!
     Returns a QString for passing on to QString based APIs.
 
@@ -655,9 +682,9 @@ bool FilePath::ensureReachable(const FilePath &other) const
     return false;
 }
 
-expected_str<qint64> FilePath::writeFileContents(const QByteArray &data, qint64 offset) const
+expected_str<qint64> FilePath::writeFileContents(const QByteArray &data) const
 {
-    return fileAccess()->writeFileContents(*this, data, offset);
+    return fileAccess()->writeFileContents(*this, data);
 }
 
 FileStreamHandle FilePath::asyncCopy(const FilePath &target, QObject *context,
@@ -1228,6 +1255,9 @@ FilePathInfo FilePath::filePathInfo() const
 */
 bool FilePath::exists() const
 {
+    if (isEmpty())
+        return false;
+
     const expected_str<DeviceFileAccess *> access = getFileAccess(*this);
     if (!access)
         return false;
@@ -1240,6 +1270,9 @@ bool FilePath::exists() const
 */
 bool FilePath::isExecutableFile() const
 {
+    if (isEmpty())
+        return false;
+
     const expected_str<DeviceFileAccess *> access = getFileAccess(*this);
     if (!access)
         return false;
@@ -1252,6 +1285,9 @@ bool FilePath::isExecutableFile() const
 */
 bool FilePath::isWritableDir() const
 {
+    if (isEmpty())
+        return false;
+
     const expected_str<DeviceFileAccess *> access = getFileAccess(*this);
     if (!access)
         return false;
@@ -1264,6 +1300,9 @@ bool FilePath::isWritableDir() const
 */
 bool FilePath::isWritableFile() const
 {
+    if (isEmpty())
+        return false;
+
     const expected_str<DeviceFileAccess *> access = getFileAccess(*this);
     if (!access)
         return false;
@@ -1271,9 +1310,11 @@ bool FilePath::isWritableFile() const
     return (*access)->isWritableFile(*this);
 }
 
-
 bool FilePath::isReadableFile() const
 {
+    if (isEmpty())
+        return false;
+
     const expected_str<DeviceFileAccess *> access = getFileAccess(*this);
     if (!access)
         return false;
@@ -1283,6 +1324,9 @@ bool FilePath::isReadableFile() const
 
 bool FilePath::isReadableDir() const
 {
+    if (isEmpty())
+        return false;
+
     const expected_str<DeviceFileAccess *> access = getFileAccess(*this);
     if (!access)
         return false;
@@ -1292,6 +1336,9 @@ bool FilePath::isReadableDir() const
 
 bool FilePath::isFile() const
 {
+    if (isEmpty())
+        return false;
+
     const expected_str<DeviceFileAccess *> access = getFileAccess(*this);
     if (!access)
         return false;
@@ -1301,6 +1348,9 @@ bool FilePath::isFile() const
 
 bool FilePath::isDir() const
 {
+    if (isEmpty())
+        return false;
+
     const expected_str<DeviceFileAccess *> access = getFileAccess(*this);
     if (!access)
         return false;
@@ -1310,6 +1360,9 @@ bool FilePath::isDir() const
 
 bool FilePath::isSymLink() const
 {
+    if (isEmpty())
+        return false;
+
     const expected_str<DeviceFileAccess *> access = getFileAccess(*this);
     if (!access)
         return false;
@@ -1365,7 +1418,7 @@ FilePath FilePath::fromUtf8(const char *filename, int filenameSize)
 
 FilePath FilePath::fromSettings(const QVariant &variant)
 {
-    if (variant.type() == QVariant::Url) {
+    if (variant.typeId() == QMetaType::QUrl) {
         const QUrl url = variant.toUrl();
         return FilePath::fromParts(url.scheme(), url.host(), url.path());
     }
@@ -1497,21 +1550,28 @@ FilePath FilePath::relativePathFrom(const FilePath &anchor) const
 
     FilePath absPath;
     QString filename;
-    if (isFile()) {
+
+    const QList<FilePathInfo> infos
+        = QtConcurrent::blockingMapped(QList<FilePath>{*this, anchor}, [](const FilePath &path) {
+              return path.filePathInfo();
+          });
+
+    if (infos.first().fileFlags.testFlag(FilePathInfo::FileFlag::FileType)) {
         absPath = absolutePath();
         filename = fileName();
-    } else if (isDir()) {
+    } else if (infos.first().fileFlags.testFlag(FilePathInfo::FileFlag::DirectoryType)) {
         absPath = absoluteFilePath();
     } else {
         return {};
     }
     FilePath absoluteAnchorPath;
-    if (anchor.isFile())
+    if (infos.last().fileFlags.testFlag(FilePathInfo::FileFlag::FileType))
         absoluteAnchorPath = anchor.absolutePath();
-    else if (anchor.isDir())
+    else if (infos.last().fileFlags.testFlag(FilePathInfo::FileFlag::DirectoryType))
         absoluteAnchorPath = anchor.absoluteFilePath();
     else
         return {};
+
     QString relativeFilePath = calcRelativePath(absPath.pathView(), absoluteAnchorPath.pathView());
     if (!filename.isEmpty()) {
         if (relativeFilePath == ".")
@@ -2319,12 +2379,7 @@ DeviceFileHooks &DeviceFileHooks::instance()
 
 QTCREATOR_UTILS_EXPORT bool operator==(const FilePath &first, const FilePath &second)
 {
-    if (first.m_hash != 0 && second.m_hash != 0 && first.m_hash != second.m_hash)
-        return false;
-
-    return first.pathView().compare(second.pathView(), first.caseSensitivity()) == 0
-        && first.host() == second.host()
-        && first.scheme() == second.scheme();
+    return FilePath::equals(first, second, first.caseSensitivity());
 }
 
 QTCREATOR_UTILS_EXPORT bool operator!=(const FilePath &first, const FilePath &second)
diff --git a/src/libs/utils/filepath.h b/src/libs/utils/filepath.h
index 2b1eb14069e..d1845571203 100644
--- a/src/libs/utils/filepath.h
+++ b/src/libs/utils/filepath.h
@@ -55,6 +55,16 @@ public:
 
 using FilePaths = QList<class FilePath>;
 
+class QTCREATOR_UTILS_EXPORT FilePathWatcher : public QObject
+{
+    Q_OBJECT
+public:
+    using QObject::QObject;
+
+signals:
+    void pathChanged(const Utils::FilePath &path);
+};
+
 class QTCREATOR_UTILS_EXPORT FilePath
 {
 public:
@@ -139,7 +149,7 @@ public:
     FilePaths dirEntries(const FileFilter &filter, QDir::SortFlags sort = QDir::NoSort) const;
     FilePaths dirEntries(QDir::Filters filters) const;
     expected_str<QByteArray> fileContents(qint64 maxSize = -1, qint64 offset = 0) const;
-    expected_str<qint64> writeFileContents(const QByteArray &data, qint64 offset = 0) const;
+    expected_str<qint64> writeFileContents(const QByteArray &data) const;
     FilePathInfo filePathInfo() const;
 
     [[nodiscard]] FilePath operator/(const QString &str) const;
@@ -268,6 +278,10 @@ public:
     // FIXME: Avoid. See toSettings, toVariant, toUserOutput, toFSPathString, path, nativePath.
     QString toString() const;
 
+    bool equalsCaseSensitive(const FilePath &other) const;
+
+    Utils::expected_str<std::unique_ptr<FilePathWatcher>> watch() const;
+
 private:
     // These are needed.
     QTCREATOR_UTILS_EXPORT friend bool operator==(const FilePath &first, const FilePath &second);
@@ -282,6 +296,8 @@ private:
 
     QTCREATOR_UTILS_EXPORT friend QDebug operator<<(QDebug dbg, const FilePath &c);
 
+    static bool equals(const FilePath &first, const FilePath &second, Qt::CaseSensitivity cs);
+
     // Implementation details. May change.
     friend class ::tst_fileutils;
     void setPath(QStringView path);
diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp
index f97934cde40..c023ccab9b9 100644
--- a/src/libs/utils/filesearch.cpp
+++ b/src/libs/utils/filesearch.cpp
@@ -462,14 +462,17 @@ static bool isFileIncluded(const QList<QRegularExpression> &filterRegs,
     return isIncluded && (exclusionRegs.isEmpty() || !matches(exclusionRegs, filePath));
 }
 
-std::function<FilePaths(const FilePaths &)> filterFilesFunction(const QStringList &filters,
-                                                                const QStringList &exclusionFilters)
+FilterFilesFunction filterFilesFunction(const QStringList &filters,
+                                        const QStringList &exclusionFilters,
+                                        const FilterFileFunction &filterFileFuntion)
 {
     const QList<QRegularExpression> filterRegs = filtersToRegExps(filters);
     const QList<QRegularExpression> exclusionRegs = filtersToRegExps(exclusionFilters);
-    return [filterRegs, exclusionRegs](const FilePaths &filePaths) {
-        return Utils::filtered(filePaths, [&filterRegs, &exclusionRegs](const FilePath &filePath) {
-            return isFileIncluded(filterRegs, exclusionRegs, filePath);
+    return [filterRegs, exclusionRegs, filterFileFuntion](const FilePaths &filePaths) {
+        return Utils::filtered(filePaths, [&filterRegs, &exclusionRegs, filterFileFuntion](
+                                              const FilePath &filePath) {
+            return isFileIncluded(filterRegs, exclusionRegs, filePath) &&
+                   (!filterFileFuntion || filterFileFuntion(filePath));
         });
     };
 }
@@ -583,12 +586,14 @@ const int s_progressMaximum = 1000;
 struct SubDirCache
 {
     SubDirCache(const FilePaths &directories, const QStringList &filters,
-                const QStringList &exclusionFilters, QTextCodec *encoding);
+                const QStringList &exclusionFilters,
+                const FilterFileFunction &filterFileFuntion, QTextCodec *encoding);
 
     std::optional<FileContainerIterator::Item> updateCache(int advanceIntoIndex,
                                                            const SubDirCache &initialCache);
 
-    std::function<FilePaths(const FilePaths &)> m_filterFiles;
+    FilterFilesFunction m_filterFilesFunction;
+    FilterFileFunction m_filterFileFunction;
     QTextCodec *m_encoding = nullptr;
     QStack<FilePath> m_dirs;
     QSet<FilePath> m_knownDirs;
@@ -606,8 +611,10 @@ struct SubDirCache
 };
 
 SubDirCache::SubDirCache(const FilePaths &directories, const QStringList &filters,
-                         const QStringList &exclusionFilters, QTextCodec *encoding)
-    : m_filterFiles(filterFilesFunction(filters, exclusionFilters))
+                         const QStringList &exclusionFilters,
+                         const FilterFileFunction &filterFileFuntion, QTextCodec *encoding)
+    : m_filterFilesFunction(filterFilesFunction(filters, exclusionFilters, filterFileFuntion))
+    , m_filterFileFunction(filterFileFuntion)
     , m_encoding(encoding == nullptr ? QTextCodec::codecForLocale() : encoding)
 {
     const qreal maxPer = qreal(s_progressMaximum) / directories.count();
@@ -642,7 +649,7 @@ std::optional<FileContainerIterator::Item> SubDirCache::updateCache(int advanceI
         const FilePath dir = m_dirs.pop();
         const qreal dirProgressMax = m_progressValues.pop();
         const bool processed = m_processedValues.pop();
-        if (dir.exists()) {
+        if (dir.exists() && (!m_filterFileFunction || m_filterFileFunction(dir))) {
             using Dir = FilePath;
             using CanonicalDir = FilePath;
             std::vector<std::pair<Dir, CanonicalDir>> subDirs;
@@ -657,7 +664,7 @@ std::optional<FileContainerIterator::Item> SubDirCache::updateCache(int advanceI
             }
             if (subDirs.empty()) {
                 const FilePaths allFilePaths = dir.dirEntries(QDir::Files | QDir::Hidden);
-                const FilePaths filePaths = m_filterFiles(allFilePaths);
+                const FilePaths filePaths = m_filterFilesFunction(allFilePaths);
                 m_items.reserve(m_items.size() + filePaths.size());
                 Utils::reverseForeach(filePaths, [this](const FilePath &file) {
                     m_items.append({file, m_encoding});
@@ -706,15 +713,25 @@ static FileContainerIterator::Advancer subDirAdvancer(const SubDirCache &initial
 }
 
 static FileContainer::AdvancerProvider subDirAdvancerProvider(const FilePaths &directories,
-    const QStringList &filters, const QStringList &exclusionFilters, QTextCodec *encoding)
+    const QStringList &filters, const QStringList &exclusionFilters,
+    const FilterFileFunction &filterFileFuntion, QTextCodec *encoding)
 {
-    const SubDirCache initialCache(directories, filters, exclusionFilters, encoding);
-    return [=] { return subDirAdvancer(initialCache); };
+    const SubDirCache initialCache(directories, filters, exclusionFilters, filterFileFuntion,
+                                   encoding);
+    return [initialCache] { return subDirAdvancer(initialCache); };
 }
 
 SubDirFileContainer::SubDirFileContainer(const FilePaths &directories, const QStringList &filters,
                                          const QStringList &exclusionFilters, QTextCodec *encoding)
-    : FileContainer(subDirAdvancerProvider(directories, filters, exclusionFilters, encoding),
-                    s_progressMaximum) {}
+    : FileContainer(subDirAdvancerProvider(directories, filters, exclusionFilters, {}, encoding),
+                    s_progressMaximum)
+{}
+
+SubDirFileContainer::SubDirFileContainer(const FilePaths &directories,
+                                         const FilterFileFunction &filterFileFuntion,
+                                         QTextCodec *encoding)
+    : FileContainer(subDirAdvancerProvider(directories, {}, {}, filterFileFuntion, encoding),
+                    s_progressMaximum)
+{}
 
 } // namespace Utils
diff --git a/src/libs/utils/filesearch.h b/src/libs/utils/filesearch.h
index 2d2155a723c..08a0a3a981a 100644
--- a/src/libs/utils/filesearch.h
+++ b/src/libs/utils/filesearch.h
@@ -31,6 +31,9 @@ enum FindFlag {
 };
 Q_DECLARE_FLAGS(FindFlags, FindFlag)
 
+using FilterFileFunction = std::function<bool(const FilePath &filePath)>;
+using FilterFilesFunction = std::function<FilePaths(const FilePaths &filePath)>;
+
 QTCREATOR_UTILS_EXPORT
 QTextDocument::FindFlags textDocumentFlagsForFindFlags(FindFlags flags);
 
@@ -39,8 +42,9 @@ void searchInContents(QPromise<SearchResultItems> &promise, const QString &searc
                       FindFlags flags, const FilePath &filePath, const QString &contents);
 
 QTCREATOR_UTILS_EXPORT
-std::function<FilePaths(const FilePaths &)> filterFilesFunction(const QStringList &filters,
-                                                                const QStringList &exclusionFilters);
+FilterFilesFunction filterFilesFunction(const QStringList &filters,
+                                        const QStringList &exclusionFilters,
+                                        const FilterFileFunction &filterFileFuntion = {});
 
 QTCREATOR_UTILS_EXPORT
 QStringList splitFilterUiText(const QString &text);
@@ -150,9 +154,10 @@ public:
 class QTCREATOR_UTILS_EXPORT SubDirFileContainer : public FileContainer
 {
 public:
+    SubDirFileContainer(const FilePaths &directories, const QStringList &filters,
+                        const QStringList &exclusionFilters, QTextCodec *encoding = nullptr);
     SubDirFileContainer(const FilePaths &directories,
-                        const QStringList &filters,
-                        const QStringList &exclusionFilters,
+                        const FilterFileFunction &filterFileFuntion = {},
                         QTextCodec *encoding = nullptr);
 };
 
diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp
index b3649a457d1..defc39ede64 100644
--- a/src/libs/utils/fileutils.cpp
+++ b/src/libs/utils/fileutils.cpp
@@ -5,7 +5,6 @@
 #include "savefile.h"
 
 #include "algorithm.h"
-#include "devicefileaccess.h"
 #include "environment.h"
 #include "qtcassert.h"
 #include "utilstr.h"
@@ -24,6 +23,8 @@
 #include <qplatformdefs.h>
 
 #ifdef QT_GUI_LIB
+#include "guiutils.h"
+
 #include <QMessageBox>
 #include <QGuiApplication>
 #endif
@@ -304,49 +305,50 @@ FileUtils::CopyAskingForOverwrite::CopyAskingForOverwrite(QWidget *dialogParent,
     , m_postOperation(postOperation)
 {}
 
-bool FileUtils::CopyAskingForOverwrite::operator()(const FilePath &src,
-                                                   const FilePath &dest,
-                                                   QString *error)
+FileUtils::CopyHelper FileUtils::CopyAskingForOverwrite::operator()()
 {
-    bool copyFile = true;
-    if (dest.exists()) {
-        if (m_skipAll)
-            copyFile = false;
-        else if (!m_overwriteAll) {
-            const int res = QMessageBox::question(
-                m_parent,
-                Tr::tr("Overwrite File?"),
-                Tr::tr("Overwrite existing file \"%1\"?").arg(dest.toUserOutput()),
-                QMessageBox::Yes | QMessageBox::YesToAll | QMessageBox::No | QMessageBox::NoToAll
-                    | QMessageBox::Cancel);
-            if (res == QMessageBox::Cancel) {
+    CopyHelper helperFunction = [this](const FilePath &src, const FilePath &dest, QString *error) {
+        bool copyFile = true;
+        if (dest.exists()) {
+            if (m_skipAll)
+                copyFile = false;
+            else if (!m_overwriteAll) {
+                const int res = QMessageBox::question(
+                    m_parent,
+                    Tr::tr("Overwrite File?"),
+                    Tr::tr("Overwrite existing file \"%1\"?").arg(dest.toUserOutput()),
+                    QMessageBox::Yes | QMessageBox::YesToAll | QMessageBox::No
+                            | QMessageBox::NoToAll | QMessageBox::Cancel);
+                if (res == QMessageBox::Cancel) {
+                    return false;
+                } else if (res == QMessageBox::No) {
+                    copyFile = false;
+                } else if (res == QMessageBox::NoToAll) {
+                    m_skipAll = true;
+                    copyFile = false;
+                } else if (res == QMessageBox::YesToAll) {
+                    m_overwriteAll = true;
+                }
+                if (copyFile)
+                    dest.removeFile();
+            }
+        }
+        if (copyFile) {
+            dest.parentDir().ensureWritableDir();
+            if (!src.copyFile(dest)) {
+                if (error) {
+                    *error = Tr::tr("Could not copy file \"%1\" to \"%2\".")
+                                 .arg(src.toUserOutput(), dest.toUserOutput());
+                }
                 return false;
-            } else if (res == QMessageBox::No) {
-                copyFile = false;
-            } else if (res == QMessageBox::NoToAll) {
-                m_skipAll = true;
-                copyFile = false;
-            } else if (res == QMessageBox::YesToAll) {
-                m_overwriteAll = true;
             }
-            if (copyFile)
-                dest.removeFile();
+            if (m_postOperation)
+                m_postOperation(dest);
         }
-    }
-    if (copyFile) {
-        dest.parentDir().ensureWritableDir();
-        if (!src.copyFile(dest)) {
-            if (error) {
-                *error = Tr::tr("Could not copy file \"%1\" to \"%2\".")
-                             .arg(src.toUserOutput(), dest.toUserOutput());
-            }
-            return false;
-        }
-        if (m_postOperation)
-            m_postOperation(dest);
-    }
-    m_files.append(dest.absoluteFilePath());
-    return true;
+        m_files.append(dest.absoluteFilePath());
+        return true;
+    };
+    return helperFunction;
 }
 
 FilePaths FileUtils::CopyAskingForOverwrite::files() const
@@ -414,18 +416,6 @@ void withNtfsPermissions(const std::function<void()> &task)
 
 #ifdef QT_WIDGETS_LIB
 
-static std::function<QWidget *()> s_dialogParentGetter;
-
-void FileUtils::setDialogParentGetter(const std::function<QWidget *()> &getter)
-{
-    s_dialogParentGetter = getter;
-}
-
-static QWidget *dialogParent(QWidget *parent)
-{
-    return parent ? parent : s_dialogParentGetter ? s_dialogParentGetter() : nullptr;
-}
-
 static QUrl filePathToQUrl(const FilePath &filePath)
 {
     return QUrl::fromLocalFile(filePath.toFSPathString());
@@ -705,11 +695,10 @@ FilePathInfo FileUtils::filePathInfoFromTriple(const QString &infos, int modeBas
     return {size, flags, dt};
 }
 
-bool FileUtils::copyRecursively(
-    const FilePath &srcFilePath,
-    const FilePath &tgtFilePath,
-    QString *error,
-    std::function<bool(const FilePath &, const FilePath &, QString *)> copyHelper)
+bool FileUtils::copyRecursively(const FilePath &srcFilePath,
+                                const FilePath &tgtFilePath,
+                                QString *error,
+                                CopyHelper copyHelper)
 {
     if (srcFilePath.isDir()) {
         if (!tgtFilePath.ensureWritableDir()) {
diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h
index b20f7568dbe..32e7da429f4 100644
--- a/src/libs/utils/fileutils.h
+++ b/src/libs/utils/fileutils.h
@@ -43,13 +43,14 @@ struct QTCREATOR_UTILS_EXPORT RunResult
 class QTCREATOR_UTILS_EXPORT FileUtils
 {
 public:
+    using CopyHelper = std::function<bool(const FilePath &, const FilePath &, QString *)>;
 #ifdef QT_GUI_LIB
     class QTCREATOR_UTILS_EXPORT CopyAskingForOverwrite
     {
     public:
         CopyAskingForOverwrite(QWidget *dialogParent,
                                const std::function<void(FilePath)> &postOperation = {});
-        bool operator()(const FilePath &src, const FilePath &dest, QString *error);
+        CopyHelper operator()();
         FilePaths files() const;
 
     private:
@@ -65,7 +66,7 @@ public:
         const FilePath &srcFilePath,
         const FilePath &tgtFilePath,
         QString *error,
-        std::function<bool(const FilePath &, const FilePath &, QString *)> helper);
+        CopyHelper helper);
 
     static bool copyIfDifferent(const FilePath &srcFilePath,
                                 const FilePath &tgtFilePath);
@@ -89,8 +90,6 @@ public:
     static FilePaths usefulExtraSearchPaths();
 
 #ifdef QT_WIDGETS_LIB
-    static void setDialogParentGetter(const std::function<QWidget *()> &getter);
-
     static bool hasNativeFileDialog();
 
     static FilePath getOpenFilePath(QWidget *parent,
@@ -236,7 +235,5 @@ private:
 
 QTCREATOR_UTILS_EXPORT QTextStream &operator<<(QTextStream &s, const FilePath &fn);
 
-bool isRelativePathHelper(const QString &path, OsType osType);
-
 } // namespace Utils
 
diff --git a/src/libs/utils/fsengine/fsengine_impl.cpp b/src/libs/utils/fsengine/fsengine_impl.cpp
index 44a53289d65..295f0cac747 100644
--- a/src/libs/utils/fsengine/fsengine_impl.cpp
+++ b/src/libs/utils/fsengine/fsengine_impl.cpp
@@ -35,11 +35,7 @@ FSEngineImpl::~FSEngineImpl()
     delete m_tempStorage;
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
 bool FSEngineImpl::open(QIODeviceBase::OpenMode openMode, std::optional<QFile::Permissions>)
-#else
-bool FSEngineImpl::open(QIODevice::OpenMode openMode)
-#endif
 {
     const FilePathInfoCache::CachedData data = g_filePathInfoCache.cached(m_filePath,
                                                                           createCacheData);
@@ -162,12 +158,8 @@ bool FSEngineImpl::link(const QString &newName)
     return false;
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
 bool FSEngineImpl::mkdir(const QString &dirName, bool createParentDirectories,
                          std::optional<QFile::Permissions>) const
-#else
-bool FSEngineImpl::mkdir(const QString &dirName, bool createParentDirectories) const
-#endif
 {
     Q_UNUSED(createParentDirectories)
     return FilePath::fromString(dirName).createDir();
diff --git a/src/libs/utils/fsengine/fsengine_impl.h b/src/libs/utils/fsengine/fsengine_impl.h
index 7a68119c83a..1a49f77cd2a 100644
--- a/src/libs/utils/fsengine/fsengine_impl.h
+++ b/src/libs/utils/fsengine/fsengine_impl.h
@@ -20,15 +20,10 @@ public:
     ~FSEngineImpl();
 
 public:
-#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
     bool open(QIODeviceBase::OpenMode openMode,
               std::optional<QFile::Permissions> permissions = std::nullopt) override;
     bool mkdir(const QString &dirName, bool createParentDirectories,
               std::optional<QFile::Permissions> permissions = std::nullopt) const override;
-#else
-    bool open(QIODevice::OpenMode openMode) override;
-    bool mkdir(const QString &dirName, bool createParentDirectories) const override;
-#endif
     bool close() override;
     bool flush() override;
     bool syncToDisk() override;
diff --git a/src/libs/utils/fsengine/fsenginehandler.cpp b/src/libs/utils/fsengine/fsenginehandler.cpp
index 29fe759a861..d6751d8b6a1 100644
--- a/src/libs/utils/fsengine/fsenginehandler.cpp
+++ b/src/libs/utils/fsengine/fsenginehandler.cpp
@@ -3,17 +3,42 @@
 
 #include "fsenginehandler.h"
 
+#include "fileiteratordevicesappender.h"
 #include "fixedlistfsengine.h"
-#include "fsengine_impl.h"
-#include "rootinjectfsengine.h"
-
 #include "fsengine.h"
+#include "fsengine_impl.h"
 
 #include "../algorithm.h"
 #include "../hostosinfo.h"
 
+#include <QtCore/private/qfsfileengine_p.h>
+
 namespace Utils::Internal {
 
+class RootInjectFSEngine final : public QFSFileEngine
+{
+public:
+    using QFSFileEngine::QFSFileEngine;
+
+public:
+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+    IteratorUniquePtr beginEntryList(const QString &path,
+                                     QDir::Filters filters,
+                                     const QStringList &filterNames) override
+    {
+        return std::make_unique<FileIteratorWrapper>(
+            QFSFileEngine::beginEntryList(path, filters, filterNames));
+    }
+#else
+    Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override
+    {
+        std::unique_ptr<QAbstractFileEngineIterator> baseIterator(
+            QFSFileEngine::beginEntryList(filters, filterNames));
+        return new FileIteratorWrapper(std::move(baseIterator));
+    }
+#endif
+};
+
 static FilePath removeDoubleSlash(const QString &fileName)
 {
     // Reduce every two or more slashes to a single slash.
diff --git a/src/libs/utils/fsengine/rootinjectfsengine.h b/src/libs/utils/fsengine/rootinjectfsengine.h
deleted file mode 100644
index 9eb6a8a8322..00000000000
--- a/src/libs/utils/fsengine/rootinjectfsengine.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include "fileiteratordevicesappender.h"
-
-#include <QtCore/private/qfsfileengine_p.h>
-
-namespace Utils {
-namespace Internal {
-
-class RootInjectFSEngine : public QFSFileEngine
-{
-public:
-    using QFSFileEngine::QFSFileEngine;
-
-public:
-#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
-    IteratorUniquePtr beginEntryList(const QString &path,
-                                     QDir::Filters filters,
-                                     const QStringList &filterNames) override
-    {
-        return std::make_unique<FileIteratorWrapper>(
-            QFSFileEngine::beginEntryList(path, filters, filterNames));
-    }
-#else
-    Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override
-    {
-        std::unique_ptr<QAbstractFileEngineIterator> baseIterator(
-            QFSFileEngine::beginEntryList(filters, filterNames));
-        return new FileIteratorWrapper(std::move(baseIterator));
-    }
-#endif
-};
-
-} // namespace Internal
-} // namespace Utils
diff --git a/src/libs/utils/futuresynchronizer.cpp b/src/libs/utils/futuresynchronizer.cpp
index da3347f35e3..912de677b92 100644
--- a/src/libs/utils/futuresynchronizer.cpp
+++ b/src/libs/utils/futuresynchronizer.cpp
@@ -3,6 +3,9 @@
 
 #include "futuresynchronizer.h"
 
+#include "qtcassert.h"
+#include "threadutils.h"
+
 /*!
   \class Utils::FutureSynchronizer
   \inmodule QtCreator
@@ -62,4 +65,18 @@ void FutureSynchronizer::flushFinishedFutures()
     m_futures = newFutures;
 }
 
+Q_GLOBAL_STATIC(FutureSynchronizer, s_futureSynchronizer);
+
+/*!
+    Returns a global FutureSynchronizer.
+    The application should cancel and wait for the tasks in this synchronizer before actually
+    unloading any libraries. This is for example done by the plugin manager in Qt Creator.
+    May only be accessed by the main thread.
+*/
+FutureSynchronizer *futureSynchronizer()
+{
+    QTC_ASSERT(isMainThread(), return nullptr);
+    return s_futureSynchronizer;
+}
+
 } // namespace Utils
diff --git a/src/libs/utils/futuresynchronizer.h b/src/libs/utils/futuresynchronizer.h
index 29b1f5e4563..83391dbc72e 100644
--- a/src/libs/utils/futuresynchronizer.h
+++ b/src/libs/utils/futuresynchronizer.h
@@ -42,4 +42,6 @@ private:
     bool m_cancelOnWait = true;
 };
 
+QTCREATOR_UTILS_EXPORT FutureSynchronizer *futureSynchronizer();
+
 } // namespace Utils
diff --git a/src/libs/utils/guiutils.cpp b/src/libs/utils/guiutils.cpp
index 17cc9053002..d7d9cb5f84f 100644
--- a/src/libs/utils/guiutils.cpp
+++ b/src/libs/utils/guiutils.cpp
@@ -46,4 +46,16 @@ void QTCREATOR_UTILS_EXPORT setWheelScrollingWithoutFocusBlocked(QWidget *widget
         widget->setFocusPolicy(Qt::StrongFocus);
 }
 
+static QWidget *(*s_dialogParentGetter)() = nullptr;
+
+void setDialogParentGetter(QWidget *(*getter)())
+{
+    s_dialogParentGetter = getter;
+}
+
+QWidget *dialogParent(QWidget *parent)
+{
+    return parent ? parent : s_dialogParentGetter ? s_dialogParentGetter() : nullptr;
+}
+
 } // namespace Utils
diff --git a/src/libs/utils/guiutils.h b/src/libs/utils/guiutils.h
index 83163777183..fea37f98f3c 100644
--- a/src/libs/utils/guiutils.h
+++ b/src/libs/utils/guiutils.h
@@ -9,6 +9,9 @@ class QWidget;
 
 namespace Utils {
 
-void QTCREATOR_UTILS_EXPORT setWheelScrollingWithoutFocusBlocked(QWidget *widget);
+QTCREATOR_UTILS_EXPORT void setWheelScrollingWithoutFocusBlocked(QWidget *widget);
+
+QTCREATOR_UTILS_EXPORT QWidget *dialogParent(QWidget *parent);
+QTCREATOR_UTILS_EXPORT void setDialogParentGetter(QWidget *(*getter)());
 
 } // namespace Utils
diff --git a/src/libs/utils/highlightingitemdelegate.cpp b/src/libs/utils/highlightingitemdelegate.cpp
index 7fe0507311a..9ad7abb01af 100644
--- a/src/libs/utils/highlightingitemdelegate.cpp
+++ b/src/libs/utils/highlightingitemdelegate.cpp
@@ -91,7 +91,7 @@ int HighlightingItemDelegate::drawLineNumber(QPainter *painter, const QStyleOpti
         return 0;
     const bool isSelected = option.state & QStyle::State_Selected;
     const QString lineText = QString::number(lineNumber);
-    const int minimumLineNumberDigits = qMax(kMinimumLineNumberDigits, lineText.count());
+    const int minimumLineNumberDigits = qMax(kMinimumLineNumberDigits, lineText.size());
     const int fontWidth =
         painter->fontMetrics().horizontalAdvance(QString(minimumLineNumberDigits, '0'));
     const int lineNumberAreaWidth = lineNumberAreaHorizontalPadding + fontWidth
diff --git a/src/libs/utils/historycompleter.cpp b/src/libs/utils/historycompleter.cpp
index 8eff3fdad82..8dc9ec3887e 100644
--- a/src/libs/utils/historycompleter.cpp
+++ b/src/libs/utils/historycompleter.cpp
@@ -54,11 +54,11 @@ public:
             optCopy.state |= QStyle::State_HasFocus;
         QItemDelegate::paint(painter,option,index);
         // add remove button
-        QWindow *window = view->window()->windowHandle();
-        const QPixmap iconPixmap = icon.pixmap(window, option.rect.size());
+        const qreal devicePixelRatio = painter->device()->devicePixelRatio();
+        const QPixmap iconPixmap = icon.pixmap(option.rect.size(), devicePixelRatio);
         QRect pixmapRect = QStyle::alignedRect(option.direction,
                                                Qt::AlignRight | Qt::AlignVCenter,
-                                               iconPixmap.size() / window->devicePixelRatio(),
+                                               iconPixmap.size() / devicePixelRatio,
                                                option.rect);
         if (!clearIconSize.isValid())
             clearIconSize = pixmapRect.size();
diff --git a/src/libs/utils/hostosinfo.cpp b/src/libs/utils/hostosinfo.cpp
index d8361266f08..717dc900cd8 100644
--- a/src/libs/utils/hostosinfo.cpp
+++ b/src/libs/utils/hostosinfo.cpp
@@ -29,36 +29,10 @@ namespace Utils {
 Qt::CaseSensitivity HostOsInfo::m_overrideFileNameCaseSensitivity = Qt::CaseSensitive;
 bool HostOsInfo::m_useOverrideFileNameCaseSensitivity = false;
 
-#ifdef Q_OS_WIN
-static WORD hostProcessorArchitecture()
+OsArch HostOsInfo::hostArchitecture()
 {
-    SYSTEM_INFO info;
-    GetNativeSystemInfo(&info);
-    return info.wProcessorArchitecture;
-}
-#endif
-
-HostOsInfo::HostArchitecture HostOsInfo::hostArchitecture()
-{
-#ifdef Q_OS_WIN
-    static const WORD processorArchitecture = hostProcessorArchitecture();
-    switch (processorArchitecture) {
-    case PROCESSOR_ARCHITECTURE_AMD64:
-        return HostOsInfo::HostArchitectureAMD64;
-    case PROCESSOR_ARCHITECTURE_INTEL:
-        return HostOsInfo::HostArchitectureX86;
-    case PROCESSOR_ARCHITECTURE_IA64:
-        return HostOsInfo::HostArchitectureItanium;
-    case PROCESSOR_ARCHITECTURE_ARM:
-        return HostOsInfo::HostArchitectureArm;
-    case PROCESSOR_ARCHITECTURE_ARM64:
-        return HostOsInfo::HostArchitectureArm64;
-    default:
-        return HostOsInfo::HostArchitectureUnknown;
-    }
-#else
-    return HostOsInfo::HostArchitectureUnknown;
-#endif
+    static const OsArch arch = osArchFromString(QSysInfo::currentCpuArchitecture());
+    return arch;
 }
 
 bool HostOsInfo::isRunningUnderRosetta()
diff --git a/src/libs/utils/hostosinfo.h b/src/libs/utils/hostosinfo.h
index 44880f7885c..fa153f24d54 100644
--- a/src/libs/utils/hostosinfo.h
+++ b/src/libs/utils/hostosinfo.h
@@ -41,9 +41,7 @@ public:
 #endif
     }
 
-    enum HostArchitecture { HostArchitectureX86, HostArchitectureAMD64, HostArchitectureItanium,
-                            HostArchitectureArm, HostArchitectureArm64, HostArchitectureUnknown };
-    static HostArchitecture hostArchitecture();
+    static OsArch hostArchitecture();
 
     static constexpr bool isWindowsHost() { return hostOs() == OsTypeWindows; }
     static constexpr bool isLinuxHost() { return hostOs() == OsTypeLinux; }
diff --git a/src/libs/utils/icon.cpp b/src/libs/utils/icon.cpp
index 5bd862c8f14..073ec771531 100644
--- a/src/libs/utils/icon.cpp
+++ b/src/libs/utils/icon.cpp
@@ -42,7 +42,7 @@ static MasksAndColors masksAndColors(const QList<IconMaskAndColor> &icon, int dp
     MasksAndColors result;
     for (const IconMaskAndColor &i: icon) {
         const QString &fileName = i.first.toString();
-        const QColor color = creatorTheme()->color(i.second);
+        const QColor color = creatorColor(i.second);
         const QString dprFileName = StyleHelper::availableImageResolutions(i.first.toString())
                                             .contains(dpr)
                                         ? StyleHelper::imageFileWithResolution(fileName, dpr)
@@ -165,7 +165,7 @@ QIcon Icon::icon() const
         const QPixmap combinedMask = Utils::combinedMask(masks, m_style);
         m_lastIcon.addPixmap(masksToIcon(masks, combinedMask, m_style));
 
-        const QColor disabledColor = creatorTheme()->color(Theme::IconsDisabledColor);
+        const QColor disabledColor = creatorColor(Theme::IconsDisabledColor);
         m_lastIcon.addPixmap(maskToColorAndAlpha(combinedMask, disabledColor), QIcon::Disabled);
     }
     return m_lastIcon;
@@ -182,7 +182,7 @@ QPixmap Icon::pixmap(QIcon::Mode iconMode) const
                 masksAndColors(m_iconSourceList, qRound(qApp->devicePixelRatio()));
         const QPixmap combinedMask = Utils::combinedMask(masks, m_style);
         return iconMode == QIcon::Disabled
-                ? maskToColorAndAlpha(combinedMask, creatorTheme()->color(Theme::IconsDisabledColor))
+                ? maskToColorAndAlpha(combinedMask, creatorColor(Theme::IconsDisabledColor))
                 : masksToIcon(masks, combinedMask, m_style);
     }
 }
@@ -210,22 +210,21 @@ QIcon Icon::sideBarIcon(const Icon &classic, const Icon &flat)
     return result;
 }
 
-QIcon Icon::modeIcon(const Icon &classic, const Icon &flat, const Icon &flatActive)
+QIcon Icon::modeIcon(const Icon &classic, const Icon &flat,
+                     [[maybe_unused]] const Icon &flatActive)
 {
     QIcon result = sideBarIcon(classic, flat);
-    if (creatorTheme()->flag(Theme::FlatSideBarIcons))
-        result.addPixmap(flatActive.pixmap(), QIcon::Active);
     return result;
 }
 
 QIcon Icon::combinedIcon(const QList<QIcon> &icons)
 {
     QIcon result;
-    QWindow *window = QApplication::allWidgets().constFirst()->windowHandle();
+    const qreal devicePixelRatio = QApplication::allWidgets().constFirst()->devicePixelRatio();
     for (const QIcon &icon: icons)
         for (const QIcon::Mode mode: {QIcon::Disabled, QIcon::Normal})
             for (const QSize &size: icon.availableSizes(mode))
-                result.addPixmap(icon.pixmap(window, size, mode), mode);
+                result.addPixmap(icon.pixmap(size, devicePixelRatio, mode), mode);
     return result;
 }
 
diff --git a/src/libs/utils/iconbutton.cpp b/src/libs/utils/iconbutton.cpp
index 746cf0ecb1c..3be368c43b2 100644
--- a/src/libs/utils/iconbutton.cpp
+++ b/src/libs/utils/iconbutton.cpp
@@ -26,7 +26,7 @@ void IconButton::paintEvent(QPaintEvent *e)
     QRect r(QPoint(), size());
 
     if (m_containsMouse && isEnabled()) {
-        QColor c = creatorTheme()->color(Theme::TextColorDisabled);
+        QColor c = creatorColor(Theme::TextColorDisabled);
         c.setAlphaF(c.alphaF() * .5);
         StyleHelper::drawPanelBgRect(&p, r, c);
     }
diff --git a/src/libs/utils/images/debugger_overlay_small.png b/src/libs/utils/images/debugger_overlay_small.png
index 809bf347326..440d2b59d28 100644
Binary files a/src/libs/utils/images/debugger_overlay_small.png and b/src/libs/utils/images/debugger_overlay_small.png differ
diff --git a/src/libs/utils/images/debugger_overlay_small@2x.png b/src/libs/utils/images/debugger_overlay_small@2x.png
index c24c861cbbb..40ea20ed47b 100644
Binary files a/src/libs/utils/images/debugger_overlay_small@2x.png and b/src/libs/utils/images/debugger_overlay_small@2x.png differ
diff --git a/src/libs/utils/infobar.cpp b/src/libs/utils/infobar.cpp
index bd6429a7622..dc5fb4878d2 100644
--- a/src/libs/utils/infobar.cpp
+++ b/src/libs/utils/infobar.cpp
@@ -47,10 +47,10 @@ void InfoBarWidget::paintEvent(QPaintEvent *event)
 {
     QWidget::paintEvent(event);
     QPainter p(this);
-    p.fillRect(rect(), creatorTheme()->color(Theme::InfoBarBackground));
+    p.fillRect(rect(), creatorColor(Theme::InfoBarBackground));
     const QRectF adjustedRect = QRectF(rect()).adjusted(0.5, 0.5, -0.5, -0.5);
     const bool topEdge = m_edge == Qt::TopEdge;
-    p.setPen(creatorTheme()->color(Theme::FancyToolBarSeparatorColor));
+    p.setPen(creatorColor(Theme::FancyToolBarSeparatorColor));
     p.drawLine(QLineF(topEdge ? adjustedRect.bottomLeft() : adjustedRect.topLeft(),
                       topEdge ? adjustedRect.bottomRight() : adjustedRect.topRight()));
 }
diff --git a/src/libs/utils/infolabel.cpp b/src/libs/utils/infolabel.cpp
index dbc762d9fee..e05c093ca57 100644
--- a/src/libs/utils/infolabel.cpp
+++ b/src/libs/utils/infolabel.cpp
@@ -114,14 +114,13 @@ void InfoLabel::paintEvent(QPaintEvent *event)
     if (m_filled && isEnabled()) {
         p.save();
         p.setOpacity(0.175);
-        p.fillRect(rect(), creatorTheme()->color(fillColorForType(m_type)));
+        p.fillRect(rect(), creatorColor(fillColorForType(m_type)));
         p.restore();
     }
     const QIcon &icon = iconForType(m_type);
-    QWindow *window = this->window()->windowHandle();
     const QIcon::Mode mode = !this->isEnabled() ? QIcon::Disabled : QIcon::Normal;
     const QPixmap iconPx =
-            icon.pixmap(window, QSize(iconSize, iconSize) * devicePixelRatio(), mode);
+            icon.pixmap(QSize(iconSize, iconSize) * devicePixelRatio(), devicePixelRatio(), mode);
     p.drawPixmap(iconRect, iconPx);
     ElidingLabel::paintEvent(event);
 }
diff --git a/src/libs/utils/launcherpackets.cpp b/src/libs/utils/launcherpackets.cpp
index 37261224ef5..a770e8865da 100644
--- a/src/libs/utils/launcherpackets.cpp
+++ b/src/libs/utils/launcherpackets.cpp
@@ -49,7 +49,8 @@ void StartProcessPacket::doSerialize(QDataStream &stream) const
            << unixTerminalDisabled
            << useCtrlCStub
            << reaperTimeout
-           << createConsoleOnWindows;
+           << createConsoleOnWindows
+           << forceDefaultErrorMode;
 }
 
 void StartProcessPacket::doDeserialize(QDataStream &stream)
@@ -70,7 +71,8 @@ void StartProcessPacket::doDeserialize(QDataStream &stream)
            >> unixTerminalDisabled
            >> useCtrlCStub
            >> reaperTimeout
-           >> createConsoleOnWindows;
+           >> createConsoleOnWindows
+           >> forceDefaultErrorMode;
     processMode = Utils::ProcessMode(processModeInt);
     processChannelMode = QProcess::ProcessChannelMode(processChannelModeInt);
 }
diff --git a/src/libs/utils/launcherpackets.h b/src/libs/utils/launcherpackets.h
index 27e98a74e5b..d00169c1f6f 100644
--- a/src/libs/utils/launcherpackets.h
+++ b/src/libs/utils/launcherpackets.h
@@ -99,6 +99,7 @@ public:
     bool useCtrlCStub = false;
     int reaperTimeout = 500;
     bool createConsoleOnWindows = false;
+    bool forceDefaultErrorMode = false;
 
 private:
     void doSerialize(QDataStream &stream) const override;
diff --git a/src/libs/utils/launchersocket.cpp b/src/libs/utils/launchersocket.cpp
index 23b7d39fcd1..61796a2bb3d 100644
--- a/src/libs/utils/launchersocket.cpp
+++ b/src/libs/utils/launchersocket.cpp
@@ -260,6 +260,7 @@ void CallerHandle::start(const QString &program, const QStringList &arguments)
     p.useCtrlCStub = m_setup->m_useCtrlCStub;
     p.reaperTimeout = m_setup->m_reaperTimeout.count();
     p.createConsoleOnWindows = m_setup->m_createConsoleOnWindows;
+    p.forceDefaultErrorMode = m_setup->m_forceDefaultErrorMode;
     sendPacket(p);
 }
 
diff --git a/src/libs/utils/layoutbuilder.cpp b/src/libs/utils/layoutbuilder.cpp
index 31c67e4d0f6..6f33e4f5ca4 100644
--- a/src/libs/utils/layoutbuilder.cpp
+++ b/src/libs/utils/layoutbuilder.cpp
@@ -3,7 +3,6 @@
 
 #include "layoutbuilder.h"
 
-#include <QApplication>
 #include <QDebug>
 #include <QFormLayout>
 #include <QGridLayout>
@@ -29,10 +28,23 @@ namespace Layouting {
 #define QTC_ASSERT(cond, action) if (Q_LIKELY(cond)) {} else { QTC_STRING(#cond); action; } do {} while (0)
 #define QTC_CHECK(cond) if (cond) {} else { QTC_STRING(#cond); } do {} while (0)
 
-class FlowLayout final : public QLayout
+template <typename X>
+typename X::Implementation *access(const X *x)
 {
-    Q_OBJECT
+    return static_cast<typename X::Implementation *>(x->ptr);
+}
 
+template <typename X>
+void apply(X *x, std::initializer_list<typename X::I> ps)
+{
+    for (auto && p : ps)
+        p.apply(x);
+}
+
+// FlowLayout
+
+class FlowLayout : public QLayout
+{
 public:
     explicit FlowLayout(QWidget *parent, int margin = -1, int hSpacing = -1, int vSpacing = -1)
         : QLayout(parent), m_hSpace(hSpacing), m_vSpace(vSpacing)
@@ -181,29 +193,56 @@ private:
     \namespace Layouting
     \inmodule QtCreator
 
-    \brief The Layouting namespace contains classes for use with layout builders.
+    \brief The Layouting namespace contains classes and functions to conveniently
+    create layouts in code.
+
+    Classes in the namespace help to create create QLayout or QWidget derived class,
+    instances should be used locally within a function and never stored.
+
+    \sa Layouting::Widget, Layouting::Layout
 */
 
 
+/*!
+    \class Layouting::Layout
+    \inmodule QtCreator
+
+    The Layout class is a base class for more specific builder
+    classes to create QLayout derived objects.
+ */
+
+/*!
+    \class Layouting::Widget
+    \inmodule QtCreator
+
+    The Widget class is a base class for more specific builder
+    classes to create QWidget derived objects.
+*/
+
 /*!
     \class Layouting::LayoutItem
     \inmodule QtCreator
 
-    \brief The LayoutItem class represents widgets, layouts, and aggregate
-    items for use in conjunction with layout builders.
-
-    Layout items are typically implicitly constructed when adding items to a
-    \c LayoutBuilder instance using \c LayoutBuilder::addItem() or
-    \c LayoutBuilder::addItems() and never stored in user code.
+    The LayoutItem class is used for intermediate results
+    while creating layouts with a concept of rows and spans, such
+    as Form and Grid.
 */
 
-/*!
-    Constructs a layout item instance representing an empty cell.
- */
 LayoutItem::LayoutItem() = default;
 
 LayoutItem::~LayoutItem() = default;
 
+LayoutItem::LayoutItem(QLayout *l)
+    : layout(l), empty(!l)
+{}
+
+LayoutItem::LayoutItem(QWidget *w)
+    : widget(w), empty(!w)
+{}
+
+LayoutItem::LayoutItem(const QString &t)
+    : text(t), empty(t.isEmpty())
+{}
 
 /*!
     \fn  template <class T> LayoutItem(const T &t)
@@ -217,44 +256,15 @@ LayoutItem::~LayoutItem() = default;
     \li  \c {QWidget *}
     \li  \c {QLayout *}
     \endlist
- */
+*/
 
-struct ResultItem
+// Object
+
+Object::Object(std::initializer_list<I> ps)
 {
-    ResultItem() = default;
-    explicit ResultItem(QLayout *l) : layout(l), empty(!l) {}
-    explicit ResultItem(QWidget *w) : widget(w), empty(!w) {}
-
-    QString text;
-    QLayout *layout = nullptr;
-    QWidget *widget = nullptr;
-    int space = -1;
-    int stretch = -1;
-    int span = 1;
-    bool empty = false;
-};
-
-struct Slice
-{
-    Slice() = default;
-    Slice(QLayout *l) : layout(l) {}
-    Slice(QWidget *w, bool isLayouting=false) : widget(w), isLayouting(isLayouting) {}
-
-    QLayout *layout = nullptr;
-    QWidget *widget = nullptr;
-
-    void flush();
-
-    // Grid-specific
-    int currentGridColumn = 0;
-    int currentGridRow = 0;
-    bool isFormAlignment = false;
-    bool isLayouting = false;
-    Qt::Alignment align = {}; // Can be changed to
-
-    // Grid or Form
-    QList<ResultItem> pendingItems;
-};
+    ptr = new Implementation;
+    apply(this, ps);
+}
 
 static QWidget *widgetForItem(QLayoutItem *item)
 {
@@ -262,12 +272,11 @@ static QWidget *widgetForItem(QLayoutItem *item)
         return w;
     if (item->spacerItem())
         return nullptr;
-    QLayout *l = item->layout();
-    if (!l)
-        return nullptr;
-    for (int i = 0, n = l->count(); i < n; ++i) {
-        if (QWidget *w = widgetForItem(l->itemAt(i)))
-            return w;
+    if (QLayout *l = item->layout()) {
+        for (int i = 0, n = l->count(); i < n; ++i) {
+            if (QWidget *w = widgetForItem(l->itemAt(i)))
+                return w;
+        }
     }
     return nullptr;
 }
@@ -279,7 +288,7 @@ static QLabel *createLabel(const QString &text)
     return label;
 }
 
-static void addItemToBoxLayout(QBoxLayout *layout, const ResultItem &item)
+static void addItemToBoxLayout(QBoxLayout *layout, const LayoutItem &item)
 {
     if (QWidget *w = item.widget) {
         layout->addWidget(w);
@@ -287,8 +296,6 @@ static void addItemToBoxLayout(QBoxLayout *layout, const ResultItem &item)
         layout->addLayout(l);
     } else if (item.stretch != -1) {
         layout->addStretch(item.stretch);
-    } else if (item.space != -1) {
-        layout->addSpacing(item.space);
     } else if (!item.text.isEmpty()) {
         layout->addWidget(createLabel(item.text));
     } else if (item.empty) {
@@ -298,7 +305,7 @@ static void addItemToBoxLayout(QBoxLayout *layout, const ResultItem &item)
     }
 }
 
-static void addItemToFlowLayout(FlowLayout *layout, const ResultItem &item)
+static void addItemToFlowLayout(FlowLayout *layout, const LayoutItem &item)
 {
     if (QWidget *w = item.widget) {
         layout->addWidget(w);
@@ -306,8 +313,6 @@ static void addItemToFlowLayout(FlowLayout *layout, const ResultItem &item)
         layout->addItem(l);
 //    } else if (item.stretch != -1) {
 //        layout->addStretch(item.stretch);
-//    } else if (item.space != -1) {
-//        layout->addSpacing(item.space);
     } else if (item.empty) {
         // Nothing to do, but no reason to warn, either
     } else if (!item.text.isEmpty()) {
@@ -317,163 +322,6 @@ static void addItemToFlowLayout(FlowLayout *layout, const ResultItem &item)
     }
 }
 
-void Slice::flush()
-{
-    if (pendingItems.empty())
-        return;
-
-    if (auto formLayout = qobject_cast<QFormLayout *>(layout)) {
-
-        // If there are more than two items, we cram the last ones in one hbox.
-        if (pendingItems.size() > 2) {
-            auto hbox = new QHBoxLayout;
-            hbox->setContentsMargins(0, 0, 0, 0);
-            for (int i = 1; i < pendingItems.size(); ++i)
-                addItemToBoxLayout(hbox, pendingItems.at(i));
-            while (pendingItems.size() > 1)
-                pendingItems.pop_back();
-            pendingItems.append(ResultItem(hbox));
-        }
-
-        if (pendingItems.size() == 1) { // One one item given, so this spans both columns.
-            const ResultItem &f0 = pendingItems.at(0);
-            if (auto layout = f0.layout)
-                formLayout->addRow(layout);
-            else if (auto widget = f0.widget)
-                formLayout->addRow(widget);
-        } else if (pendingItems.size() == 2) { // Normal case, both columns used.
-            ResultItem &f1 = pendingItems[1];
-            const ResultItem &f0 = pendingItems.at(0);
-            if (!f1.widget && !f1.layout && !f1.text.isEmpty())
-                f1.widget = createLabel(f1.text);
-
-            if (f0.widget) {
-                if (f1.layout)
-                    formLayout->addRow(f0.widget, f1.layout);
-                else if (f1.widget)
-                    formLayout->addRow(f0.widget, f1.widget);
-            } else  {
-                if (f1.layout)
-                    formLayout->addRow(createLabel(f0.text), f1.layout);
-                else if (f1.widget)
-                    formLayout->addRow(createLabel(f0.text), f1.widget);
-            }
-        } else {
-            QTC_CHECK(false);
-        }
-
-        // Set up label as buddy if possible.
-        const int lastRow = formLayout->rowCount() - 1;
-        QLayoutItem *l = formLayout->itemAt(lastRow, QFormLayout::LabelRole);
-        QLayoutItem *f = formLayout->itemAt(lastRow, QFormLayout::FieldRole);
-        if (l && f) {
-            if (QLabel *label = qobject_cast<QLabel *>(l->widget())) {
-                if (QWidget *widget = widgetForItem(f))
-                    label->setBuddy(widget);
-            }
-        }
-
-    } else if (auto gridLayout = qobject_cast<QGridLayout *>(layout)) {
-
-        for (const ResultItem &item : std::as_const(pendingItems)) {
-            Qt::Alignment a = currentGridColumn == 0 ? align : Qt::Alignment();
-            if (item.widget)
-                gridLayout->addWidget(item.widget, currentGridRow, currentGridColumn, 1, item.span, a);
-            else if (item.layout)
-                gridLayout->addLayout(item.layout, currentGridRow, currentGridColumn, 1, item.span, a);
-            else if (!item.text.isEmpty())
-                gridLayout->addWidget(createLabel(item.text), currentGridRow, currentGridColumn, 1, 1, a);
-            currentGridColumn += item.span;
-        }
-        ++currentGridRow;
-        currentGridColumn = 0;
-
-    } else if (auto boxLayout = qobject_cast<QBoxLayout *>(layout)) {
-
-        for (const ResultItem &item : std::as_const(pendingItems))
-            addItemToBoxLayout(boxLayout, item);
-
-    } else if (auto flowLayout = qobject_cast<FlowLayout *>(layout)) {
-
-        for (const ResultItem &item : std::as_const(pendingItems))
-            addItemToFlowLayout(flowLayout, item);
-
-    } else {
-        QTC_CHECK(false);
-    }
-
-    pendingItems.clear();
-}
-
-// LayoutBuilder
-
-class LayoutBuilder
-{
-    Q_DISABLE_COPY_MOVE(LayoutBuilder)
-
-public:
-    LayoutBuilder();
-    ~LayoutBuilder();
-
-    void addItem(const LayoutItem &item);
-    void addItems(const LayoutItems &items);
-
-    QList<Slice> stack;
-};
-
-static void addItemHelper(LayoutBuilder &builder, const LayoutItem &item)
-{
-    if (item.onAdd)
-        item.onAdd(builder);
-
-    if (item.setter) {
-        if (QWidget *widget = builder.stack.last().widget)
-            item.setter(widget);
-        else if (QLayout *layout = builder.stack.last().layout)
-            item.setter(layout);
-        else
-            QTC_CHECK(false);
-    }
-
-    for (const LayoutItem &subItem : item.subItems)
-        addItemHelper(builder, subItem);
-
-    if (item.onExit)
-        item.onExit(builder);
-}
-
-void doAddText(LayoutBuilder &builder, const QString &text)
-{
-    ResultItem fi;
-    fi.text = text;
-    builder.stack.last().pendingItems.append(fi);
-}
-
-void doAddSpace(LayoutBuilder &builder, const Space &space)
-{
-    ResultItem fi;
-    fi.space = space.space;
-    builder.stack.last().pendingItems.append(fi);
-}
-
-void doAddStretch(LayoutBuilder &builder, const Stretch &stretch)
-{
-    ResultItem fi;
-    fi.stretch = stretch.stretch;
-    builder.stack.last().pendingItems.append(fi);
-}
-
-void doAddLayout(LayoutBuilder &builder, QLayout *layout)
-{
-    builder.stack.last().pendingItems.append(ResultItem(layout));
-}
-
-void doAddWidget(LayoutBuilder &builder, QWidget *widget)
-{
-    builder.stack.last().pendingItems.append(ResultItem(widget));
-}
-
-
 /*!
     \class Layouting::Space
     \inmodule QtCreator
@@ -488,39 +336,67 @@ void doAddWidget(LayoutBuilder &builder, QWidget *widget)
     \brief The Stretch class represents some stretch in a layout.
  */
 
-/*!
-    \class Layouting::LayoutBuilder
-    \internal
-    \inmodule QtCreator
 
-    \brief The LayoutBuilder class provides a convenient way to fill \c QFormLayout
-    and \c QGridLayouts with contents.
+// Layout
 
-    Filling a layout with items happens item-by-item, row-by-row.
-
-    A LayoutBuilder instance is typically used locally within a function and never stored.
-
-    \sa addItem(), addItems()
-*/
-
-
-LayoutBuilder::LayoutBuilder() = default;
-
-/*!
-    \internal
-    Destructs a layout builder.
- */
-LayoutBuilder::~LayoutBuilder() = default;
-
-void LayoutBuilder::addItem(const LayoutItem &item)
+void Layout::span(int cols, int rows)
 {
-    addItemHelper(*this, item);
+    QTC_ASSERT(!pendingItems.empty(), return);
+    pendingItems.back().spanCols = cols;
+    pendingItems.back().spanRows = rows;
 }
 
-void LayoutBuilder::addItems(const LayoutItems &items)
+void Layout::setNoMargins()
 {
-    for (const LayoutItem &item : items)
-        addItemHelper(*this, item);
+    setContentsMargins(0, 0, 0, 0);
+}
+
+void Layout::setNormalMargins()
+{
+    setContentsMargins(9, 9, 9, 9);
+}
+
+void Layout::setContentsMargins(int left, int top, int right, int bottom)
+{
+    access(this)->setContentsMargins(left, top, right, bottom);
+}
+
+/*!
+    Attaches the constructed layout to the provided QWidget \a w.
+
+    This operation can only be performed once per LayoutBuilder instance.
+ */
+void Layout::attachTo(QWidget *widget)
+{
+    flush();
+    widget->setLayout(access(this));
+}
+
+/*!
+    Adds the layout item \a item as sub items.
+ */
+void Layout::addItem(I item)
+{
+    item.apply(this);
+}
+
+void Layout::addLayoutItem(const LayoutItem &item)
+{
+    if (QBoxLayout *lt = asBox())
+        addItemToBoxLayout(lt, item);
+    else if (FlowLayout *lt = asFlow())
+        addItemToFlowLayout(lt, item);
+    else
+        pendingItems.push_back(item);
+}
+
+/*!
+    Adds the layout items \a items as sub items.
+ */
+void Layout::addItems(std::initializer_list<I> items)
+{
+    for (const I &item : items)
+        item.apply(this);
 }
 
 /*!
@@ -529,485 +405,547 @@ void LayoutBuilder::addItems(const LayoutItems &items)
 
     \sa addItem(), addItems()
  */
-void LayoutItem::addRow(const LayoutItems &items)
+
+void Layout::addRow(std::initializer_list<I> items)
 {
-    addItem(br);
-    addItems(items);
+    for (const I &item : items)
+        item.apply(this);
+    flush();
 }
 
-/*!
-    Adds the layout item \a item as sub items.
- */
-void LayoutItem::addItem(const LayoutItem &item)
+void Layout::setSpacing(int spacing)
 {
-    subItems.append(item);
+    access(this)->setSpacing(spacing);
 }
 
-/*!
-    Adds the layout items \a items as sub items.
- */
-void LayoutItem::addItems(const LayoutItems &items)
+void Layout::setColumnStretch(int column, int stretch)
 {
-    subItems.append(items);
-}
-
-/*!
-    Attaches the constructed layout to the provided QWidget \a w.
-
-    This operation can only be performed once per LayoutBuilder instance.
- */
-
-void LayoutItem::attachTo(QWidget *w) const
-{
-    LayoutBuilder builder;
-
-    builder.stack.append(w);
-    addItemHelper(builder, *this);
-}
-
-QWidget *LayoutItem::emerge()
-{
-    LayoutBuilder builder;
-
-    builder.stack.append(Slice());
-    addItemHelper(builder, *this);
-
-    if (builder.stack.empty())
-        return nullptr;
-
-    QTC_ASSERT(builder.stack.last().pendingItems.size() == 1, return nullptr);
-    ResultItem ri = builder.stack.last().pendingItems.takeFirst();
-
-    QTC_ASSERT(ri.layout || ri.widget, return nullptr);
-
-    if (ri.layout) {
-        auto w = new QWidget;
-        w->setLayout(ri.layout);
-        return w;
+    if (auto grid = qobject_cast<QGridLayout *>(access(this))) {
+        grid->setColumnStretch(column, stretch);
+    } else {
+        QTC_CHECK(false);
     }
-
-    return ri.widget;
 }
 
-static void layoutExit(LayoutBuilder &builder)
+void addToWidget(Widget *widget, const Layout &layout)
 {
-    builder.stack.last().flush();
-    QLayout *layout = builder.stack.last().layout;
-    builder.stack.pop_back();
-
-    if (builder.stack.last().isLayouting) {
-        builder.stack.last().pendingItems.append(ResultItem(layout));
-    } else if (QWidget *widget = builder.stack.last().widget) {
-        widget->setLayout(layout);
-    } else
-        builder.stack.last().pendingItems.append(ResultItem(layout));
+    layout.flush_();
+    access(widget)->setLayout(access(&layout));
 }
 
-template<class T>
-static void layoutingWidgetExit(LayoutBuilder &builder)
+void addToLayout(Layout *layout, const Widget &inner)
 {
-    const Slice slice = builder.stack.last();
-    T *w = qobject_cast<T *>(slice.widget);
-    for (const ResultItem &ri : slice.pendingItems) {
-        if (ri.widget) {
-            w->addWidget(ri.widget);
-        } else if (ri.layout) {
-            auto child = new QWidget;
-            child->setLayout(ri.layout);
-            w->addWidget(child);
+    layout->addLayoutItem(access(&inner));
+}
+
+void addToLayout(Layout *layout, QWidget *inner)
+{
+    layout->addLayoutItem(inner);
+}
+
+void addToLayout(Layout *layout, QLayout *inner)
+{
+    layout->addLayoutItem(inner);
+}
+
+void addToLayout(Layout *layout, const Layout &inner)
+{
+    inner.flush_();
+    layout->addLayoutItem(access(&inner));
+}
+
+void addToLayout(Layout *layout, const LayoutModifier &inner)
+{
+    inner(layout);
+}
+
+void addToLayout(Layout *layout, const QString &inner)
+{
+    layout->addLayoutItem(inner);
+}
+
+void empty(Layout *layout)
+{
+    LayoutItem item;
+    item.empty = true;
+    layout->addLayoutItem(item);
+}
+
+void hr(Layout *layout)
+{
+    layout->addLayoutItem(createHr());
+}
+
+void br(Layout *layout)
+{
+    layout->flush();
+}
+
+void st(Layout *layout)
+{
+    LayoutItem item;
+    item.stretch = 1;
+    layout->addLayoutItem(item);
+}
+
+void noMargin(Layout *layout)
+{
+    layout->setNoMargins();
+}
+
+void normalMargin(Layout *layout)
+{
+    layout->setNormalMargins();
+}
+
+QFormLayout *Layout::asForm()
+{
+    return qobject_cast<QFormLayout *>(access(this));
+}
+
+QGridLayout *Layout::asGrid()
+{
+    return qobject_cast<QGridLayout *>(access(this));
+}
+
+QBoxLayout *Layout::asBox()
+{
+    return qobject_cast<QBoxLayout *>(access(this));
+}
+
+FlowLayout *Layout::asFlow()
+{
+    return dynamic_cast<FlowLayout *>(access(this));
+}
+
+void Layout::flush()
+{
+    if (pendingItems.empty())
+        return;
+
+    if (QGridLayout *lt = asGrid()) {
+        for (const LayoutItem &item : std::as_const(pendingItems)) {
+            Qt::Alignment a;
+            if (currentGridColumn == 0 && useFormAlignment) {
+                // if (auto widget = builder.stack.at(builder.stack.size() - 2).widget) {
+                //     a = widget->style()->styleHint(QStyle::SH_FormLayoutLabelAlignment);
+            }
+            if (item.widget)
+                lt->addWidget(item.widget, currentGridRow, currentGridColumn, item.spanRows, item.spanCols, a);
+            else if (item.layout)
+                lt->addLayout(item.layout, currentGridRow, currentGridColumn, item.spanRows, item.spanCols, a);
+            else if (!item.text.isEmpty())
+                lt->addWidget(createLabel(item.text), currentGridRow, currentGridColumn, item.spanRows, item.spanCols, a);
+            currentGridColumn += item.spanCols;
+            // Intentionally not used, use 'br'/'empty' for vertical progress.
+            // currentGridRow += item.spanRows;
         }
+        ++currentGridRow;
+        currentGridColumn = 0;
+        pendingItems.clear();
+        return;
     }
-    builder.stack.pop_back();
-    builder.stack.last().pendingItems.append(ResultItem(w));
-}
 
-static void widgetExit(LayoutBuilder &builder)
-{
-    QWidget *widget = builder.stack.last().widget;
-    builder.stack.pop_back();
-    builder.stack.last().pendingItems.append(ResultItem(widget));
-}
+    if (QFormLayout *fl = asForm()) {
+        if (pendingItems.size() > 2) {
+            auto hbox = new QHBoxLayout;
+            hbox->setContentsMargins(0, 0, 0, 0);
+            for (size_t i = 1; i < pendingItems.size(); ++i)
+                addItemToBoxLayout(hbox, pendingItems.at(i));
+            while (pendingItems.size() > 1)
+                pendingItems.pop_back();
+            pendingItems.push_back(hbox);
+        }
 
-Column::Column(std::initializer_list<LayoutItem> items)
-{
-    subItems = items;
-    onAdd = [](LayoutBuilder &builder) { builder.stack.append(new QVBoxLayout); };
-    onExit = layoutExit;
-}
+        if (pendingItems.size() == 1) { // Only one item given, so this spans both columns.
+            const LayoutItem &f0 = pendingItems.at(0);
+            if (auto layout = f0.layout)
+                fl->addRow(layout);
+            else if (auto widget = f0.widget)
+                fl->addRow(widget);
+        } else if (pendingItems.size() == 2) { // Normal case, both columns used.
+            LayoutItem &f1 = pendingItems[1];
+            const LayoutItem &f0 = pendingItems.at(0);
+            if (!f1.widget && !f1.layout && !f1.text.isEmpty())
+                f1.widget = createLabel(f1.text);
 
-Row::Row(std::initializer_list<LayoutItem> items)
-{
-    subItems = items;
-    onAdd = [](LayoutBuilder &builder) { builder.stack.append(new QHBoxLayout); };
-    onExit = layoutExit;
-}
+            // QFormLayout accepts only widgets or text in the first column.
+            // FIXME: Should we be more generous?
+            if (f0.widget) {
+                if (f1.layout)
+                    fl->addRow(f0.widget, f1.layout);
+                else if (f1.widget)
+                    fl->addRow(f0.widget, f1.widget);
+            } else  {
+                if (f1.layout)
+                    fl->addRow(createLabel(f0.text), f1.layout);
+                else if (f1.widget)
+                    fl->addRow(createLabel(f0.text), f1.widget);
+            }
+        } else {
+            QTC_CHECK(false);
+        }
 
-Flow::Flow(std::initializer_list<LayoutItem> items)
-{
-    subItems = items;
-    onAdd = [](LayoutBuilder &builder) { builder.stack.append(new FlowLayout); };
-    onExit = layoutExit;
-}
-
-Grid::Grid(std::initializer_list<LayoutItem> items)
-{
-    subItems = items;
-    onAdd = [](LayoutBuilder &builder) { builder.stack.append(new QGridLayout); };
-    onExit = layoutExit;
-}
-
-static QFormLayout *newFormLayout()
-{
-    auto formLayout = new QFormLayout;
-    formLayout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
-    return formLayout;
-}
-
-Form::Form(std::initializer_list<LayoutItem> items)
-{
-    subItems = items;
-    onAdd = [](LayoutBuilder &builder) { builder.stack.append(newFormLayout()); };
-    onExit = layoutExit;
-}
-
-LayoutItem br()
-{
-    LayoutItem item;
-    item.onAdd = [](LayoutBuilder &builder) {
-        builder.stack.last().flush();
-    };
-    return item;
-}
-
-LayoutItem empty()
-{
-    LayoutItem item;
-    item.onAdd = [](LayoutBuilder &builder) {
-        ResultItem ri;
-        ri.empty = true;
-        builder.stack.last().pendingItems.append(ri);
-    };
-    return item;
-}
-
-LayoutItem hr()
-{
-    LayoutItem item;
-    item.onAdd = [](LayoutBuilder &builder) { doAddWidget(builder, createHr()); };
-    return item;
-}
-
-LayoutItem st()
-{
-    LayoutItem item;
-    item.onAdd = [](LayoutBuilder &builder) { doAddStretch(builder, Stretch(1)); };
-    return item;
-}
-
-LayoutItem noMargin()
-{
-    return customMargin({});
-}
-
-LayoutItem normalMargin()
-{
-    return customMargin({9, 9, 9, 9});
-}
-
-LayoutItem customMargin(const QMargins &margin)
-{
-    LayoutItem item;
-    item.onAdd = [margin](LayoutBuilder &builder) {
-        if (auto layout = builder.stack.last().layout)
-            layout->setContentsMargins(margin);
-        else if (auto widget = builder.stack.last().widget)
-            widget->setContentsMargins(margin);
-    };
-    return item;
-}
-
-LayoutItem withFormAlignment()
-{
-    LayoutItem item;
-    item.onAdd = [](LayoutBuilder &builder) {
-        if (builder.stack.size() >= 2) {
-            if (auto widget = builder.stack.at(builder.stack.size() - 2).widget) {
-                const Qt::Alignment align(widget->style()->styleHint(QStyle::SH_FormLayoutLabelAlignment));
-                builder.stack.last().align = align;
+        // Set up label as buddy if possible.
+        const int lastRow = fl->rowCount() - 1;
+        QLayoutItem *l = fl->itemAt(lastRow, QFormLayout::LabelRole);
+        QLayoutItem *f = fl->itemAt(lastRow, QFormLayout::FieldRole);
+        if (l && f) {
+            if (QLabel *label = qobject_cast<QLabel *>(l->widget())) {
+                if (QWidget *widget = widgetForItem(f))
+                    label->setBuddy(widget);
             }
         }
-    };
-    return item;
+
+        pendingItems.clear();
+        return;
+    }
+
+    QTC_CHECK(false); // The other layouts shouldn't use flush()
+}
+
+void Layout::flush_() const
+{
+    const_cast<Layout *>(this)->flush();
+}
+
+void withFormAlignment(Layout *layout)
+{
+    layout->useFormAlignment = true;
+}
+
+// Flow
+
+Flow::Flow(std::initializer_list<I> ps)
+{
+    ptr = new FlowLayout;
+    apply(this, ps);
+    flush();
+}
+
+// Row & Column
+
+Row::Row(std::initializer_list<I> ps)
+{
+    ptr = new QHBoxLayout;
+    apply(this, ps);
+    flush();
+}
+
+Column::Column(std::initializer_list<I> ps)
+{
+    ptr = new QVBoxLayout;
+    apply(this, ps);
+    flush();
+}
+
+// Grid
+
+Grid::Grid()
+{
+    ptr = new QGridLayout;
+}
+
+Grid::Grid(std::initializer_list<I> ps)
+{
+    ptr = new QGridLayout;
+    apply(this, ps);
+    flush();
+}
+
+// Form
+
+Form::Form()
+{
+    ptr = new QFormLayout;
+}
+
+Form::Form(std::initializer_list<I> ps)
+{
+    auto lt = new QFormLayout;
+    ptr = lt;
+    lt->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
+    apply(this, ps);
+    flush();
+}
+
+void Layout::setFieldGrowthPolicy(int policy)
+{
+    if (auto lt = asForm())
+        lt->setFieldGrowthPolicy(QFormLayout::FieldGrowthPolicy(policy));
+}
+
+QWidget *Layout::emerge() const
+{
+    const_cast<Layout *>(this)->flush();
+    QWidget *widget = new QWidget;
+    widget->setLayout(access(this));
+    return widget;
+}
+
+void Layout::show() const
+{
+    return emerge()->show();
 }
 
 // "Widgets"
 
-template <class T>
-void setupWidget(LayoutItem *item)
+Widget::Widget(std::initializer_list<I> ps)
 {
-    item->onAdd = [](LayoutBuilder &builder) { builder.stack.append(new T); };
-    item->onExit = widgetExit;
-};
-
-Widget::Widget(std::initializer_list<LayoutItem> items)
-{
-    this->subItems = items;
-    setupWidget<QWidget>(this);
+    ptr = new Implementation;
+    apply(this, ps);
 }
 
-Group::Group(std::initializer_list<LayoutItem> items)
+void Widget::setSize(int w, int h)
 {
-    this->subItems = items;
-    setupWidget<QGroupBox>(this);
+    access(this)->resize(w, h);
 }
 
-Stack::Stack(std::initializer_list<LayoutItem> items)
+void Widget::setLayout(const Layout &layout)
 {
-    // We use a QStackedWidget instead of a QStackedLayout here because the latter will call
-    // "setVisible()" when a child is added, which can lead to the widget being spawned as a
-    // top-level widget. This can lead to the focus shifting away from the main application.
-    subItems = items;
-    onAdd = [](LayoutBuilder &builder) {
-        builder.stack.append(Slice(new QStackedWidget, true));
-    };
-    onExit = layoutingWidgetExit<QStackedWidget>;
+    access(this)->setLayout(access(&layout));
 }
 
-PushButton::PushButton(std::initializer_list<LayoutItem> items)
+void Widget::setWindowTitle(const QString &title)
 {
-    this->subItems = items;
-    setupWidget<QPushButton>(this);
+    access(this)->setWindowTitle(title);
 }
 
-SpinBox::SpinBox(std::initializer_list<LayoutItem> items)
+void Widget::setToolTip(const QString &title)
 {
-    this->subItems = items;
-    setupWidget<QSpinBox>(this);
+    access(this)->setToolTip(title);
 }
 
-TextEdit::TextEdit(std::initializer_list<LayoutItem> items)
+void Widget::show()
 {
-    this->subItems = items;
-    setupWidget<QTextEdit>(this);
+    access(this)->show();
 }
 
-Splitter::Splitter(std::initializer_list<LayoutItem> items)
+void Widget::setNoMargins(int)
 {
-    subItems = items;
-    onAdd = [](LayoutBuilder &builder) {
-        auto splitter = new QSplitter;
-        splitter->setOrientation(Qt::Vertical);
-        builder.stack.append(Slice(splitter, true));
-    };
-    onExit = layoutingWidgetExit<QSplitter>;
+    setContentsMargins(0, 0, 0, 0);
 }
 
-ToolBar::ToolBar(std::initializer_list<LayoutItem> items)
+void Widget::setNormalMargins(int)
 {
-    subItems = items;
-    onAdd = [](LayoutBuilder &builder) {
-        auto toolbar = new QToolBar;
-        toolbar->setOrientation(Qt::Horizontal);
-        builder.stack.append(Slice(toolbar, true));
-    };
-    onExit = layoutingWidgetExit<QToolBar>;
+    setContentsMargins(9, 9, 9, 9);
 }
 
-TabWidget::TabWidget(std::initializer_list<LayoutItem> items)
+void Widget::setContentsMargins(int left, int top, int right, int bottom)
 {
-    this->subItems = items;
-    setupWidget<QTabWidget>(this);
+    access(this)->setContentsMargins(left, top, right, bottom);
 }
 
-// Special Tab
-
-Tab::Tab(const QString &tabName, const LayoutItem &item)
+QWidget *Widget::emerge() const
 {
-    onAdd = [item](LayoutBuilder &builder) {
-        auto tab = new QWidget;
-        builder.stack.append(tab);
-        item.attachTo(tab);
-    };
-    onExit = [tabName](LayoutBuilder &builder) {
-        QWidget *inner = builder.stack.last().widget;
-        builder.stack.pop_back();
-        auto tabWidget = qobject_cast<QTabWidget *>(builder.stack.last().widget);
-        QTC_ASSERT(tabWidget, return);
-        tabWidget->addTab(inner, tabName);
-    };
+    return access(this);
+}
+
+// Label
+
+Label::Label(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+Label::Label(const QString &text)
+{
+    ptr = new Implementation;
+    setText(text);
+}
+
+void Label::setText(const QString &text)
+{
+    access(this)->setText(text);
+}
+
+void Label::setTextFormat(Qt::TextFormat format)
+{
+    access(this)->setTextFormat(format);
+}
+
+void Label::setWordWrap(bool on)
+{
+    access(this)->setWordWrap(on);
+}
+
+void Label::setTextInteractionFlags(Qt::TextInteractionFlags flags)
+{
+    access(this)->setTextInteractionFlags(flags);
+}
+
+void Label::setOpenExternalLinks(bool on)
+{
+    access(this)->setOpenExternalLinks(on);
+}
+
+void Label::onLinkHovered(const std::function<void (const QString &)> &func, QObject *guard)
+{
+    QObject::connect(access(this), &QLabel::linkHovered, guard, func);
+}
+
+// Group
+
+Group::Group(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+void Group::setTitle(const QString &title)
+{
+    access(this)->setTitle(title);
+    access(this)->setObjectName(title);
+}
+
+void Group::setGroupChecker(const std::function<void (QObject *)> &checker)
+{
+    checker(access(this));
+}
+
+// SpinBox
+
+SpinBox::SpinBox(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+void SpinBox::setValue(int val)
+{
+    access(this)->setValue(val);
+}
+
+void SpinBox::onTextChanged(const std::function<void (QString)> &func)
+{
+    QObject::connect(access(this), &QSpinBox::textChanged, func);
+}
+
+// TextEdit
+
+TextEdit::TextEdit(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+void TextEdit::setText(const QString &text)
+{
+    access(this)->setText(text);
+}
+
+// PushButton
+
+PushButton::PushButton(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+void PushButton::setText(const QString &text)
+{
+    access(this)->setText(text);
+}
+
+void PushButton::onClicked(const std::function<void ()> &func, QObject *guard)
+{
+    QObject::connect(access(this), &QAbstractButton::clicked, guard, func);
+}
+
+// Stack
+
+// We use a QStackedWidget instead of a QStackedLayout here because the latter will call
+// "setVisible()" when a child is added, which can lead to the widget being spawned as a
+// top-level widget. This can lead to the focus shifting away from the main application.
+Stack::Stack(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+void addToStack(Stack *stack, const Widget &inner)
+{
+    access(stack)->addWidget(inner.emerge());
+}
+
+void addToStack(Stack *stack, const Layout &inner)
+{
+    inner.flush_();
+    access(stack)->addWidget(inner.emerge());
+}
+
+void addToStack(Stack *stack, QWidget *inner)
+{
+    access(stack)->addWidget(inner);
+}
+
+// Splitter
+
+Splitter::Splitter(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    access(this)->setOrientation(Qt::Vertical);
+    apply(this, ps);
+}
+
+void addToSplitter(Splitter *splitter, QWidget *inner)
+{
+    access(splitter)->addWidget(inner);
+}
+
+void addToSplitter(Splitter *splitter, const Widget &inner)
+{
+    access(splitter)->addWidget(inner.emerge());
+}
+
+void addToSplitter(Splitter *splitter, const Layout &inner)
+{
+    inner.flush_();
+    access(splitter)->addWidget(inner.emerge());
+}
+
+// ToolBar
+
+ToolBar::ToolBar(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+    access(this)->setOrientation(Qt::Horizontal);
+}
+
+// TabWidget
+
+TabWidget::TabWidget(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+Tab::Tab(const QString &tabName, const Layout &inner)
+    : tabName(tabName), inner(inner)
+{}
+
+void addToTabWidget(TabWidget *tabWidget, const Tab &tab)
+{
+    access(tabWidget)->addTab(tab.inner.emerge(), tab.tabName);
 }
 
 // Special If
 
-If::If(bool condition, const LayoutItems &items, const LayoutItems &other)
+If::If(bool condition,
+   const std::initializer_list<Layout::I> ifcase,
+   const std::initializer_list<Layout::I> thencase)
+    : used(condition ? ifcase : thencase)
+{}
+
+void addToLayout(Layout *layout, const If &inner)
 {
-    subItems.append(condition ? items : other);
+    for (const Layout::I &item : inner.used)
+        item.apply(layout);
 }
 
-// Special Application
-
-Application::Application(std::initializer_list<LayoutItem> items)
-{
-    subItems = items;
-    setupWidget<QWidget>(this);
-    onExit = {}; // Hack: Don't dropp the last slice, we need the resulting widget.
-}
-
-int Application::exec(int &argc, char *argv[])
-{
-    QApplication app(argc, argv);
-    LayoutBuilder builder;
-    addItemHelper(builder, *this);
-    if (QWidget *widget = builder.stack.last().widget)
-        widget->show();
-    return app.exec();
-}
-
-// "Properties"
-
-LayoutItem title(const QString &title)
-{
-    return [title](QObject *target) {
-        if (auto groupBox = qobject_cast<QGroupBox *>(target)) {
-            groupBox->setTitle(title);
-            groupBox->setObjectName(title);
-        } else if (auto widget = qobject_cast<QWidget *>(target)) {
-            widget->setWindowTitle(title);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-LayoutItem windowTitle(const QString &windowTitle)
-{
-    return [windowTitle](QObject *target) {
-        if (auto widget = qobject_cast<QWidget *>(target)) {
-            widget->setWindowTitle(windowTitle);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-LayoutItem text(const QString &text)
-{
-    return [text](QObject *target) {
-        if (auto button = qobject_cast<QAbstractButton *>(target)) {
-            button->setText(text);
-        } else if (auto textEdit = qobject_cast<QTextEdit *>(target)) {
-            textEdit->setText(text);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-LayoutItem tooltip(const QString &toolTip)
-{
-    return [toolTip](QObject *target) {
-        if (auto widget = qobject_cast<QWidget *>(target)) {
-            widget->setToolTip(toolTip);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-LayoutItem spacing(int spacing)
-{
-    return [spacing](QObject *target) {
-        if (auto layout = qobject_cast<QLayout *>(target)) {
-            layout->setSpacing(spacing);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-LayoutItem resize(int w, int h)
-{
-    return [w, h](QObject *target) {
-        if (auto widget = qobject_cast<QWidget *>(target)) {
-            widget->resize(w, h);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-LayoutItem columnStretch(int column, int stretch)
-{
-    return [column, stretch](QObject *target) {
-        if (auto grid = qobject_cast<QGridLayout *>(target)) {
-            grid->setColumnStretch(column, stretch);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-LayoutItem fieldGrowthPolicy(QFormLayout::FieldGrowthPolicy policy)
-{
-    return [policy](QObject *target) {
-        if (auto form = qobject_cast<QFormLayout *>(target)) {
-            form->setFieldGrowthPolicy(policy);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-
-// Id based setters
-
-LayoutItem id(ID &out)
-{
-    return [&out](QObject *target) { out.ob = target; };
-}
-
-void setText(ID id, const QString &text)
-{
-    if (auto textEdit = qobject_cast<QTextEdit *>(id.ob))
-        textEdit->setText(text);
-}
-
-// Signals
-
-LayoutItem onClicked(const std::function<void ()> &func, QObject *guard)
-{
-    return [func, guard](QObject *target) {
-        if (auto button = qobject_cast<QAbstractButton *>(target)) {
-            QObject::connect(button, &QAbstractButton::clicked, guard ? guard : target, func);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-LayoutItem onTextChanged(const std::function<void (const QString &)> &func, QObject *guard)
-{
-    return [func, guard](QObject *target) {
-        if (auto button = qobject_cast<QSpinBox *>(target)) {
-            QObject::connect(button, &QSpinBox::textChanged, guard ? guard : target, func);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-LayoutItem onValueChanged(const std::function<void (int)> &func, QObject *guard)
-{
-    return [func, guard](QObject *target) {
-        if (auto button = qobject_cast<QSpinBox *>(target)) {
-            QObject::connect(button, &QSpinBox::valueChanged, guard ? guard : target, func);
-        } else {
-            QTC_CHECK(false);
-        }
-    };
-}
-
-// Convenience
+// Specials
 
 QWidget *createHr(QWidget *parent)
 {
@@ -1017,59 +955,49 @@ QWidget *createHr(QWidget *parent)
     return frame;
 }
 
-// Singletons.
+Span::Span(int cols, const Layout::I &item)
+    : item(item), spanCols(cols)
+{}
 
-LayoutItem::LayoutItem(const LayoutItem &t)
+Span::Span(int cols, int rows, const Layout::I &item)
+    : item(item), spanCols(cols), spanRows(rows)
+{}
+
+void addToLayout(Layout *layout, const Span &inner)
 {
-    operator=(t);
+    layout->addItem(inner.item);
+    if (layout->pendingItems.empty()) {
+        QTC_CHECK(inner.spanCols == 1 && inner.spanRows == 1);
+        return;
+    }
+    layout->pendingItems.back().spanCols = inner.spanCols;
+    layout->pendingItems.back().spanRows = inner.spanRows;
 }
 
-void createItem(LayoutItem *item,  LayoutItem(*t)())
+LayoutModifier spacing(int space)
 {
-    *item = t();
+    return [space](Layout *layout) { layout->setSpacing(space); };
 }
 
-void createItem(LayoutItem *item, const std::function<void(QObject *target)> &t)
+void addToLayout(Layout *layout, const Space &inner)
 {
-    item->setter = t;
+    if (auto lt = layout->asBox())
+        lt->addSpacing(inner.space);
 }
 
-void createItem(LayoutItem *item, QWidget *t)
+void addToLayout(Layout *layout, const Stretch &inner)
 {
-    if (auto l = qobject_cast<QLabel *>(t))
-        l->setTextInteractionFlags(l->textInteractionFlags() | Qt::TextSelectableByMouse);
-
-    item->onAdd = [t](LayoutBuilder &builder) { doAddWidget(builder, t); };
+    if (auto lt = layout->asBox())
+        lt->addStretch(inner.stretch);
 }
 
-void createItem(LayoutItem *item, QLayout *t)
-{
-    item->onAdd = [t](LayoutBuilder &builder) { doAddLayout(builder, t); };
-}
+// void createItem(LayoutItem *item, QWidget *t)
+// {
+//     if (auto l = qobject_cast<QLabel *>(t))
+//         l->setTextInteractionFlags(l->textInteractionFlags() | Qt::TextSelectableByMouse);
 
-void createItem(LayoutItem *item, const QString &t)
-{
-    item->onAdd = [t](LayoutBuilder &builder) { doAddText(builder, t); };
-}
+//     item->onAdd = [t](LayoutBuilder &builder) { doAddWidget(builder, t); };
+// }
 
-void createItem(LayoutItem *item, const Space &t)
-{
-    item->onAdd = [t](LayoutBuilder &builder) { doAddSpace(builder, t); };
-}
-
-void createItem(LayoutItem *item, const Stretch &t)
-{
-    item->onAdd = [t](LayoutBuilder &builder) { doAddStretch(builder, t); };
-}
-
-void createItem(LayoutItem *item, const Span &t)
-{
-    item->onAdd = [t](LayoutBuilder &builder) {
-        addItemHelper(builder, t.item);
-        builder.stack.last().pendingItems.last().span = t.span;
-    };
-}
 
 } // Layouting
-
-#include "layoutbuilder.moc"
diff --git a/src/libs/utils/layoutbuilder.h b/src/libs/utils/layoutbuilder.h
index c9fac7d8383..a411ea47633 100644
--- a/src/libs/utils/layoutbuilder.h
+++ b/src/libs/utils/layoutbuilder.h
@@ -3,12 +3,11 @@
 
 #pragma once
 
-#include <QFormLayout>
-#include <QList>
 #include <QString>
-#include <QtGlobal>
 
-#include <optional>
+#include <functional>
+#include <initializer_list>
+#include <vector>
 
 #if defined(UTILS_LIBRARY)
 #  define QTCREATOR_UTILS_EXPORT Q_DECL_EXPORT
@@ -19,251 +18,570 @@
 #endif
 
 QT_BEGIN_NAMESPACE
+class QBoxLayout;
+class QFormLayout;
+class QGridLayout;
+class QGroupBox;
+class QHBoxLayout;
+class QLabel;
 class QLayout;
-class QMargins;
 class QObject;
+class QPushButton;
+class QSpinBox;
+class QSplitter;
+class QStackedWidget;
+class QTabWidget;
+class QTextEdit;
+class QToolBar;
+class QVBoxLayout;
 class QWidget;
-template <class T> T qobject_cast(QObject *object);
 QT_END_NAMESPACE
 
 namespace Layouting {
 
-// LayoutItem
+class NestId {};
 
-class LayoutBuilder;
-class LayoutItem;
-using LayoutItems = QList<LayoutItem>;
+template <typename Id, typename Arg>
+class IdAndArg
+{
+public:
+    IdAndArg(Id, const Arg &arg) : arg(arg) {}
+    const Arg arg; // FIXME: Could be const &, but this would currently break bindTo().
+};
+
+template<typename T1, typename T2>
+struct Arg2
+{
+    Arg2(const T1 &a1, const T2 &a2)
+        : p1(a1)
+        , p2(a2)
+    {}
+    const T1 p1;
+    const T2 p2;
+};
+
+template<typename T1, typename T2, typename T3>
+struct Arg3
+{
+    Arg3(const T1 &a1, const T2 &a2, const T3 &a3)
+        : p1(a1)
+        , p2(a2)
+        , p3(a3)
+    {}
+    const T1 p1;
+    const T2 p2;
+    const T3 p3;
+};
+
+template<typename T1, typename T2, typename T3, typename T4>
+struct Arg4
+{
+    Arg4(const T1 &a1, const T2 &a2, const T3 &a3, const T4 &a4)
+        : p1(a1)
+        , p2(a2)
+        , p3(a3)
+        , p4(a4)
+    {}
+    const T1 p1;
+    const T2 p2;
+    const T3 p3;
+    const T4 p4;
+};
+
+// The main dispatcher
+
+void doit(auto x, auto id, auto p);
+
+template <typename X> class BuilderItem
+{
+public:
+    // Nested child object
+    template <typename Inner>
+    BuilderItem(Inner && p)
+    {
+        apply = [&p](X *x) { doit(x, NestId{}, std::forward<Inner>(p)); };
+    }
+
+    // Property setter
+    template <typename Id, typename Arg>
+    BuilderItem(IdAndArg<Id, Arg> && idarg)
+    {
+        apply = [&idarg](X *x) { doit(x, Id{}, idarg.arg); };
+    }
+
+    std::function<void(X *)> apply;
+};
+
+
+//////////////////////////////////////////////
+
+//
+// Basic
+//
+
+class QTCREATOR_UTILS_EXPORT Thing
+{
+public:
+    void *ptr; // The product.
+};
+
+class QTCREATOR_UTILS_EXPORT Object : public Thing
+{
+public:
+    using Implementation = QObject;
+    using I = BuilderItem<Object>;
+
+    Object() = default;
+    Object(std::initializer_list<I> ps);
+};
+
+//
+// Layouts
+//
+
+class FlowLayout;
+class Layout;
+using LayoutModifier = std::function<void(Layout *)>;
 
 class QTCREATOR_UTILS_EXPORT LayoutItem
 {
 public:
-    using Setter = std::function<void(QObject *target)>;
-
-    LayoutItem();
     ~LayoutItem();
+    LayoutItem();
+    LayoutItem(QLayout *l);
+    LayoutItem(QWidget *w);
+    LayoutItem(const QString &t);
 
-    LayoutItem(const LayoutItem &t);
-    LayoutItem &operator=(const LayoutItem &t) = default;
-
-    template <class T> LayoutItem(const T &t)
-    {
-        if constexpr (std::is_base_of_v<LayoutItem, T>)
-            LayoutItem::operator=(t);
-        else
-            createItem(this, t);
-    }
-
-    void attachTo(QWidget *w) const;
-    QWidget *emerge();
-
-    void addItem(const LayoutItem &item);
-    void addItems(const LayoutItems &items);
-    void addRow(const LayoutItems &items);
-
-    std::function<void(LayoutBuilder &)> onAdd;
-    std::function<void(LayoutBuilder &)> onExit;
-    std::function<void(QObject *target)> setter;
-    LayoutItems subItems;
+    QString text;
+    QLayout *layout = nullptr;
+    QWidget *widget = nullptr;
+    int stretch = -1;
+    int spanCols = 1;
+    int spanRows = 1;
+    bool empty = false;
 };
 
-// Special items
-
-class QTCREATOR_UTILS_EXPORT Space
+class QTCREATOR_UTILS_EXPORT Layout : public Object
 {
 public:
-    explicit Space(int space) : space(space) {}
-    const int space;
+    using Implementation = QLayout;
+    using I = BuilderItem<Layout>;
+
+    Layout() = default;
+    Layout(Implementation *w) { ptr = w; }
+
+    void span(int cols, int rows);
+
+    void setNoMargins();
+    void setNormalMargins();
+    void setContentsMargins(int left, int top, int right, int bottom);
+    void setColumnStretch(int cols, int rows);
+    void setSpacing(int space);
+    void setFieldGrowthPolicy(int policy);
+
+    void attachTo(QWidget *);
+
+    void addItem(I item);
+    void addItems(std::initializer_list<I> items);
+    void addRow(std::initializer_list<I> items);
+    void addLayoutItem(const LayoutItem &item);
+
+    void flush();
+    void flush_() const;
+
+    QWidget *emerge() const;
+    void show() const;
+
+    QFormLayout *asForm();
+    QGridLayout *asGrid();
+    QBoxLayout *asBox();
+    FlowLayout *asFlow();
+
+    // Grid-only
+    int currentGridColumn = 0;
+    int currentGridRow = 0;
+    //Qt::Alignment align = {};
+    bool useFormAlignment = false;
+
+    std::vector<LayoutItem> pendingItems;
+};
+
+class QTCREATOR_UTILS_EXPORT Column : public Layout
+{
+public:
+    using Implementation = QVBoxLayout;
+    using I = BuilderItem<Column>;
+
+    Column(std::initializer_list<I> ps);
+};
+
+class QTCREATOR_UTILS_EXPORT Row : public Layout
+{
+public:
+    using Implementation = QHBoxLayout;
+    using I = BuilderItem<Row>;
+
+    Row(std::initializer_list<I> ps);
+};
+
+class QTCREATOR_UTILS_EXPORT Form : public Layout
+{
+public:
+    using Implementation = QFormLayout;
+    using I = BuilderItem<Form>;
+
+    Form();
+    Form(std::initializer_list<I> ps);
+};
+
+class QTCREATOR_UTILS_EXPORT Grid : public Layout
+{
+public:
+    using Implementation = QGridLayout;
+    using I = BuilderItem<Grid>;
+
+    Grid();
+    Grid(std::initializer_list<I> ps);
+};
+
+class QTCREATOR_UTILS_EXPORT Flow : public Layout
+{
+public:
+    Flow(std::initializer_list<I> ps);
 };
 
 class QTCREATOR_UTILS_EXPORT Stretch
 {
 public:
-    explicit Stretch(int stretch = 1) : stretch(stretch) {}
-    const int stretch;
+    explicit Stretch(int stretch) : stretch(stretch) {}
+
+    int stretch;
+};
+
+class QTCREATOR_UTILS_EXPORT Space
+{
+public:
+    explicit Space(int space) : space(space) {}
+
+    int space;
 };
 
 class QTCREATOR_UTILS_EXPORT Span
 {
 public:
-    Span(int span, const LayoutItem &item) : span(span), item(item) {}
-    const int span;
-    LayoutItem item;
+    Span(int cols, const Layout::I &item);
+    Span(int cols, int rows, const Layout::I &item);
+
+    Layout::I item;
+    int spanCols = 1;
+    int spanRows = 1;
 };
 
-class QTCREATOR_UTILS_EXPORT Column : public LayoutItem
+//
+// Widgets
+//
+
+class QTCREATOR_UTILS_EXPORT Widget : public Object
 {
 public:
-    Column(std::initializer_list<LayoutItem> items);
+    using Implementation = QWidget;
+    using I = BuilderItem<Widget>;
+
+    Widget() = default;
+    Widget(std::initializer_list<I> ps);
+    Widget(Implementation *w) { ptr = w; }
+
+    QWidget *emerge() const;
+    void show();
+
+    void setLayout(const Layout &layout);
+    void setSize(int, int);
+    void setWindowTitle(const QString &);
+    void setToolTip(const QString &);
+    void setNoMargins(int = 0);
+    void setNormalMargins(int = 0);
+    void setContentsMargins(int left, int top, int right, int bottom);
 };
 
-class QTCREATOR_UTILS_EXPORT Row : public LayoutItem
+class QTCREATOR_UTILS_EXPORT Label : public Widget
 {
 public:
-    Row(std::initializer_list<LayoutItem> items);
+    using Implementation = QLabel;
+    using I = BuilderItem<Label>;
+
+    Label(std::initializer_list<I> ps);
+    Label(const QString &text);
+
+    void setText(const QString &);
+    void setTextFormat(Qt::TextFormat);
+    void setWordWrap(bool);
+    void setTextInteractionFlags(Qt::TextInteractionFlags);
+    void setOpenExternalLinks(bool);
+    void onLinkHovered(const std::function<void(const QString &)> &, QObject *guard);
 };
 
-class QTCREATOR_UTILS_EXPORT Flow : public LayoutItem
+class QTCREATOR_UTILS_EXPORT Group : public Widget
 {
 public:
-    Flow(std::initializer_list<LayoutItem> items);
+    using Implementation = QGroupBox;
+    using I = BuilderItem<Group>;
+
+    Group(std::initializer_list<I> ps);
+
+    void setTitle(const QString &);
+    void setGroupChecker(const std::function<void(QObject *)> &);
 };
 
-class QTCREATOR_UTILS_EXPORT Grid : public LayoutItem
+class QTCREATOR_UTILS_EXPORT SpinBox : public Widget
 {
 public:
-    Grid() : Grid({}) {}
-    Grid(std::initializer_list<LayoutItem> items);
+    using Implementation = QSpinBox;
+    using I = BuilderItem<SpinBox>;
+
+    SpinBox(std::initializer_list<I> ps);
+
+    void setValue(int);
+    void onTextChanged(const std::function<void(QString)> &);
 };
 
-class QTCREATOR_UTILS_EXPORT Form : public LayoutItem
+class QTCREATOR_UTILS_EXPORT PushButton : public Widget
 {
 public:
-    Form() : Form({}) {}
-    Form(std::initializer_list<LayoutItem> items);
+    using Implementation = QPushButton;
+    using I = BuilderItem<PushButton>;
+
+    PushButton(std::initializer_list<I> ps);
+
+    void setText(const QString &);
+    void onClicked(const std::function<void()> &, QObject *guard);
 };
 
-class QTCREATOR_UTILS_EXPORT Widget : public LayoutItem
+class QTCREATOR_UTILS_EXPORT TextEdit : public Widget
 {
 public:
-    Widget(std::initializer_list<LayoutItem> items);
+    using Implementation = QTextEdit;
+    using I = BuilderItem<TextEdit>;
+    using Id = Implementation *;
+
+    TextEdit(std::initializer_list<I> ps);
+
+    void setText(const QString &);
 };
 
-class QTCREATOR_UTILS_EXPORT Stack : public LayoutItem
+class QTCREATOR_UTILS_EXPORT Splitter : public Widget
 {
 public:
+    using Implementation = QSplitter;
+    using I = BuilderItem<Splitter>;
+
+    Splitter(std::initializer_list<I> items);
+};
+
+class QTCREATOR_UTILS_EXPORT Stack : public Widget
+{
+public:
+    using Implementation = QStackedWidget;
+    using I = BuilderItem<Stack>;
+
     Stack() : Stack({}) {}
-    Stack(std::initializer_list<LayoutItem> items);
+    Stack(std::initializer_list<I> items);
 };
 
-class QTCREATOR_UTILS_EXPORT Tab : public LayoutItem
+class QTCREATOR_UTILS_EXPORT Tab : public Widget
 {
 public:
-    Tab(const QString &tabName, const LayoutItem &item);
+    using Implementation = QWidget;
+
+    Tab(const QString &tabName, const Layout &inner);
+
+    const QString tabName;
+    const Layout inner;
 };
 
-class QTCREATOR_UTILS_EXPORT If : public LayoutItem
+class QTCREATOR_UTILS_EXPORT TabWidget : public Widget
 {
 public:
-    If(bool condition, const LayoutItems &item, const LayoutItems &other = {});
+    using Implementation = QTabWidget;
+    using I = BuilderItem<TabWidget>;
+
+    TabWidget(std::initializer_list<I> items);
 };
 
-class QTCREATOR_UTILS_EXPORT Group : public LayoutItem
+class QTCREATOR_UTILS_EXPORT ToolBar : public Widget
 {
 public:
-    Group(std::initializer_list<LayoutItem> items);
+    using Implementation = QToolBar;
+    using I = Layouting::BuilderItem<ToolBar>;
+
+    ToolBar(std::initializer_list<I> items);
 };
 
-class QTCREATOR_UTILS_EXPORT TextEdit : public LayoutItem
+// Special
+
+class QTCREATOR_UTILS_EXPORT If
 {
 public:
-    TextEdit(std::initializer_list<LayoutItem> items);
+    If(bool condition,
+       const std::initializer_list<Layout::I> ifcase,
+       const std::initializer_list<Layout::I> thencase = {});
+
+    const std::initializer_list<Layout::I> used;
 };
 
-class QTCREATOR_UTILS_EXPORT PushButton : public LayoutItem
+//
+// Dispatchers
+//
+
+// We need one 'Id' (and a corresponding function wrapping arguments into a
+// tuple marked by this id) per 'name' of "backend" setter member function,
+// i.e. one 'text' is sufficient for QLabel::setText, QLineEdit::setText.
+// The name of the Id does not have to match the backend names as it
+// is mapped per-backend-type in the respective setter implementation
+// but we assume that it generally makes sense to stay close to the
+// wrapped API name-wise.
+
+// These are free functions overloaded on the type of builder object
+// and setter id. The function implementations are independent, but
+// the base expectation is that they will forwards to the backend
+// type's setter.
+
+// Special dispatchers
+
+
+class BindToId {};
+
+template <typename T>
+auto bindTo(T **p)
 {
-public:
-    PushButton(std::initializer_list<LayoutItem> items);
-};
+    return IdAndArg{BindToId{}, p};
+}
 
-class QTCREATOR_UTILS_EXPORT SpinBox : public LayoutItem
+template <typename Interface>
+void doit(Interface *x, BindToId, auto p)
 {
-public:
-    SpinBox(std::initializer_list<LayoutItem> items);
-};
+    *p = static_cast<typename Interface::Implementation *>(x->ptr);
+}
 
-class QTCREATOR_UTILS_EXPORT Splitter : public LayoutItem
+class IdId {};
+auto id(auto p) { return IdAndArg{IdId{}, p}; }
+
+template <typename Interface>
+void doit(Interface *x, IdId, auto p)
 {
-public:
-    Splitter(std::initializer_list<LayoutItem> items);
-};
+    **p = static_cast<typename Interface::Implementation *>(x->ptr);
+}
 
-class QTCREATOR_UTILS_EXPORT ToolBar : public LayoutItem
+// Setter dispatchers
+
+#define QTCREATOR_SETTER(name, setter) \
+    class name##_TAG {}; \
+    inline auto name(auto p) { return IdAndArg{name##_TAG{}, p}; } \
+    inline void doit(auto x, name##_TAG, auto p) { x->setter(p); }
+
+#define QTCREATOR_SETTER2(name, setter) \
+    class name##_TAG {}; \
+    inline auto name(auto p1, auto p2) { return IdAndArg{name##_TAG{}, Arg2{p1, p2}}; } \
+    inline void doit(auto x, name##_TAG, auto p) { x->setter(p.p1, p.p2); }
+
+#define QTCREATOR_SETTER3(name, setter) \
+    class name##_TAG {}; \
+    inline auto name(auto p1, auto p2, auto p3) { return IdAndArg{name##_TAG{}, Arg3{p1, p2, p3}}; } \
+    inline void doit(auto x, name##_TAG, auto p) { x->setter(p.p1, p.p2, p.p3); }
+
+#define QTCREATOR_SETTER4(name, setter) \
+    class name##_TAG {}; \
+    inline auto name(auto p1, auto p2, auto p3, auto p4) { return IdAndArg{name##_TAG{}, Arg4{p1, p2, p3, p4}}; } \
+    inline void doit(auto x, name##_TAG, auto p) { x->setter(p.p1, p.p2, p.p3, p.p4); }
+
+QTCREATOR_SETTER(fieldGrowthPolicy, setFieldGrowthPolicy);
+QTCREATOR_SETTER(groupChecker, setGroupChecker);
+QTCREATOR_SETTER(openExternalLinks, setOpenExternalLinks);
+QTCREATOR_SETTER2(size, setSize)
+QTCREATOR_SETTER(text, setText)
+QTCREATOR_SETTER(textFormat, setTextFormat);
+QTCREATOR_SETTER(textInteractionFlags, setTextInteractionFlags);
+QTCREATOR_SETTER(title, setTitle)
+QTCREATOR_SETTER(toolTip, setToolTip);
+QTCREATOR_SETTER(windowTitle, setWindowTitle);
+QTCREATOR_SETTER(wordWrap, setWordWrap);
+QTCREATOR_SETTER2(columnStretch, setColumnStretch);
+QTCREATOR_SETTER2(onClicked, onClicked);
+QTCREATOR_SETTER2(onLinkHovered, onLinkHovered);
+QTCREATOR_SETTER2(onTextChanged, onTextChanged);
+QTCREATOR_SETTER4(customMargins, setContentsMargins);
+
+// Nesting dispatchers
+
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const Layout &inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const Widget &inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, QWidget *inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, QLayout *inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const LayoutModifier &inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const QString &inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const Space &inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const Stretch &inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const If &inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const Span &inner);
+// ... can be added to anywhere later to support "user types"
+
+QTCREATOR_UTILS_EXPORT void addToWidget(Widget *widget, const Layout &layout);
+
+QTCREATOR_UTILS_EXPORT void addToTabWidget(TabWidget *tabWidget, const Tab &inner);
+
+QTCREATOR_UTILS_EXPORT void addToSplitter(Splitter *splitter, QWidget *inner);
+QTCREATOR_UTILS_EXPORT void addToSplitter(Splitter *splitter, const Widget &inner);
+QTCREATOR_UTILS_EXPORT void addToSplitter(Splitter *splitter, const Layout &inner);
+
+QTCREATOR_UTILS_EXPORT void addToStack(Stack *stack, QWidget *inner);
+QTCREATOR_UTILS_EXPORT void addToStack(Stack *stack, const Widget &inner);
+QTCREATOR_UTILS_EXPORT void addToStack(Stack *stack, const Layout &inner);
+
+template <class Inner>
+void doit_nested(Layout *outer, Inner && inner)
 {
-public:
-    ToolBar(std::initializer_list<LayoutItem> items);
-};
+    addToLayout(outer, std::forward<Inner>(inner));
+}
 
-class QTCREATOR_UTILS_EXPORT TabWidget : public LayoutItem
+void doit_nested(Widget *outer, auto inner)
 {
-public:
-    TabWidget(std::initializer_list<LayoutItem> items);
-};
+    addToWidget(outer, inner);
+}
 
-class QTCREATOR_UTILS_EXPORT Application : public LayoutItem
+void doit_nested(TabWidget *outer, auto inner)
 {
-public:
-    Application(std::initializer_list<LayoutItem> items);
+    addToTabWidget(outer, inner);
+}
 
-    int exec(int &argc, char *argv[]);
-};
-
-
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, const std::function<void(QObject *target)> &t);
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, QWidget *t);
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, QLayout *t);
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, LayoutItem(*t)());
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, const QString &t);
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, const Span &t);
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, const Space &t);
-void QTCREATOR_UTILS_EXPORT createItem(LayoutItem *item, const Stretch &t);
-
-
-// "Singletons"
-
-QTCREATOR_UTILS_EXPORT LayoutItem br();
-QTCREATOR_UTILS_EXPORT LayoutItem st();
-QTCREATOR_UTILS_EXPORT LayoutItem empty();
-QTCREATOR_UTILS_EXPORT LayoutItem hr();
-QTCREATOR_UTILS_EXPORT LayoutItem noMargin();
-QTCREATOR_UTILS_EXPORT LayoutItem normalMargin();
-QTCREATOR_UTILS_EXPORT LayoutItem customMargin(const QMargins &margin);
-QTCREATOR_UTILS_EXPORT LayoutItem withFormAlignment();
-
-// "Setters"
-
-QTCREATOR_UTILS_EXPORT LayoutItem title(const QString &title);
-QTCREATOR_UTILS_EXPORT LayoutItem text(const QString &text);
-QTCREATOR_UTILS_EXPORT LayoutItem tooltip(const QString &toolTip);
-QTCREATOR_UTILS_EXPORT LayoutItem resize(int, int);
-QTCREATOR_UTILS_EXPORT LayoutItem columnStretch(int column, int stretch);
-QTCREATOR_UTILS_EXPORT LayoutItem spacing(int);
-QTCREATOR_UTILS_EXPORT LayoutItem windowTitle(const QString &windowTitle);
-QTCREATOR_UTILS_EXPORT LayoutItem fieldGrowthPolicy(QFormLayout::FieldGrowthPolicy policy);
-
-
-// "Getters"
-
-class ID
+void doit_nested(Stack *outer, auto inner)
 {
-public:
-    QObject *ob = nullptr;
-};
+    addToStack(outer, inner);
+}
 
-QTCREATOR_UTILS_EXPORT LayoutItem id(ID &out);
+void doit_nested(Splitter *outer, auto inner)
+{
+    addToSplitter(outer, inner);
+}
 
-QTCREATOR_UTILS_EXPORT void setText(ID id, const QString &text);
+template <class Inner>
+void doit(auto outer, NestId, Inner && inner)
+{
+    doit_nested(outer, std::forward<Inner>(inner));
+}
 
+// Special layout items
 
-// "Signals"
+QTCREATOR_UTILS_EXPORT void empty(Layout *);
+QTCREATOR_UTILS_EXPORT void br(Layout *);
+QTCREATOR_UTILS_EXPORT void st(Layout *);
+QTCREATOR_UTILS_EXPORT void noMargin(Layout *);
+QTCREATOR_UTILS_EXPORT void normalMargin(Layout *);
+QTCREATOR_UTILS_EXPORT void withFormAlignment(Layout *);
+QTCREATOR_UTILS_EXPORT void hr(Layout *);
 
-QTCREATOR_UTILS_EXPORT LayoutItem onClicked(const std::function<void()> &,
-                                            QObject *guard = nullptr);
-QTCREATOR_UTILS_EXPORT LayoutItem onTextChanged(const std::function<void(const QString &)> &,
-                                                QObject *guard = nullptr);
-QTCREATOR_UTILS_EXPORT LayoutItem onValueChanged(const std::function<void(int)> &,
-                                                QObject *guard = nullptr);
-
-QTCREATOR_UTILS_EXPORT LayoutItem onTextChanged(ID &id, QVariant(*sig)(QObject *));
+QTCREATOR_UTILS_EXPORT LayoutModifier spacing(int space);
 
 // Convenience
 
 QTCREATOR_UTILS_EXPORT QWidget *createHr(QWidget *parent = nullptr);
 
-template <class T>
-LayoutItem bindTo(T **out)
-{
-    return [out](QObject *target) { *out = qobject_cast<T *>(target); };
-}
-
-
 } // Layouting
diff --git a/src/libs/utils/lua.cpp b/src/libs/utils/lua.cpp
new file mode 100644
index 00000000000..4f12c626f11
--- /dev/null
+++ b/src/libs/utils/lua.cpp
@@ -0,0 +1,30 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "lua.h"
+
+#include "utilstr.h"
+
+namespace Utils {
+
+static LuaInterface *s_luaInterface = nullptr;
+
+void setLuaInterface(LuaInterface *luaInterface)
+{
+    s_luaInterface = luaInterface;
+}
+
+LuaInterface *luaInterface()
+{
+    return s_luaInterface;
+}
+
+expected_str<std::unique_ptr<LuaState>> runScript(const QString &script, const QString &name)
+{
+    if (!s_luaInterface)
+        return make_unexpected(Tr::tr("No Lua interface set"));
+
+    return s_luaInterface->runScript(script, name);
+}
+
+} // namespace Utils
diff --git a/src/libs/utils/lua.h b/src/libs/utils/lua.h
new file mode 100644
index 00000000000..7a3b8f78336
--- /dev/null
+++ b/src/libs/utils/lua.h
@@ -0,0 +1,34 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <QObject>
+
+#include "expected.h"
+#include "utils_global.h"
+
+namespace Utils {
+
+class LuaState
+{
+public:
+    virtual ~LuaState() = default;
+};
+
+class QTCREATOR_UTILS_EXPORT LuaInterface
+{
+public:
+    virtual ~LuaInterface() = default;
+    virtual expected_str<std::unique_ptr<LuaState>> runScript(
+        const QString &script, const QString &name)
+        = 0;
+};
+
+QTCREATOR_UTILS_EXPORT void setLuaInterface(LuaInterface *luaInterface);
+QTCREATOR_UTILS_EXPORT LuaInterface *luaInterface();
+
+QTCREATOR_UTILS_EXPORT expected_str<std::unique_ptr<LuaState>> runScript(
+    const QString &script, const QString &name);
+
+} // namespace Utils
diff --git a/src/libs/utils/macroexpander.cpp b/src/libs/utils/macroexpander.cpp
index dd57cd6b5a0..fc138974745 100644
--- a/src/libs/utils/macroexpander.cpp
+++ b/src/libs/utils/macroexpander.cpp
@@ -284,7 +284,7 @@ QByteArray MacroExpander::expand(const QByteArray &stringWithVariables) const
 
 QVariant MacroExpander::expandVariant(const QVariant &v) const
 {
-    const auto type = QMetaType::Type(v.type());
+    const int type = v.typeId();
     if (type == QMetaType::QString) {
         return expand(v.toString());
     } else if (type == QMetaType::QStringList) {
diff --git a/src/libs/utils/macroexpander.h b/src/libs/utils/macroexpander.h
index adde4db1d3f..fe98d46872f 100644
--- a/src/libs/utils/macroexpander.h
+++ b/src/libs/utils/macroexpander.h
@@ -5,7 +5,6 @@
 
 #include "utils_global.h"
 
-#include <QCoreApplication>
 #include <QList>
 
 #include <functional>
diff --git a/src/libs/utils/multitextcursor.cpp b/src/libs/utils/multitextcursor.cpp
index 0c2e5b07925..7e991d3cd31 100644
--- a/src/libs/utils/multitextcursor.cpp
+++ b/src/libs/utils/multitextcursor.cpp
@@ -330,13 +330,10 @@ static QTextLine currentTextLine(const QTextCursor &cursor)
     return layout->lineForTextPosition(relativePos);
 }
 
-bool MultiTextCursor::multiCursorAddEvent(QKeyEvent *e, QKeySequence::StandardKey matchKey)
+bool MultiTextCursor::multiCursorEvent(
+    QKeyEvent *e, QKeySequence::StandardKey matchKey, Qt::KeyboardModifiers filterModifiers)
 {
-    uint searchkey = (e->modifiers() | e->key())
-                     & ~(Qt::KeypadModifier
-                         | Qt::GroupSwitchModifier
-                         | Qt::AltModifier
-                         | Qt::ShiftModifier);
+    uint searchkey = (e->modifiers() | e->key()) & ~(filterModifiers | Qt::AltModifier);
 
     const QList<QKeySequence> bindings = QKeySequence::keyBindings(matchKey);
     return bindings.contains(QKeySequence(searchkey));
@@ -348,42 +345,42 @@ bool MultiTextCursor::handleMoveKeyEvent(QKeyEvent *e,
 {
     if (e->modifiers() & Qt::AltModifier && !Utils::HostOsInfo::isMacHost()) {
         QTextCursor::MoveOperation op = QTextCursor::NoMove;
-        if (multiCursorAddEvent(e, QKeySequence::MoveToNextWord)) {
+        if (multiCursorEvent(e, QKeySequence::MoveToNextWord)) {
             op = QTextCursor::WordRight;
-        } else if (multiCursorAddEvent(e, QKeySequence::MoveToPreviousWord)) {
+        } else if (multiCursorEvent(e, QKeySequence::MoveToPreviousWord)) {
             op = QTextCursor::WordLeft;
-        } else if (multiCursorAddEvent(e, QKeySequence::MoveToEndOfBlock)) {
+        } else if (multiCursorEvent(e, QKeySequence::MoveToEndOfBlock)) {
             op = QTextCursor::EndOfBlock;
-        } else if (multiCursorAddEvent(e, QKeySequence::MoveToStartOfBlock)) {
+        } else if (multiCursorEvent(e, QKeySequence::MoveToStartOfBlock)) {
             op = QTextCursor::StartOfBlock;
-        } else if (multiCursorAddEvent(e, QKeySequence::MoveToNextLine)) {
+        } else if (multiCursorEvent(e, QKeySequence::MoveToNextLine, Qt::ShiftModifier)) {
             op = QTextCursor::Down;
-        } else if (multiCursorAddEvent(e, QKeySequence::MoveToPreviousLine)) {
+        } else if (multiCursorEvent(e, QKeySequence::MoveToPreviousLine, Qt::ShiftModifier)) {
             op = QTextCursor::Up;
-        } else if (multiCursorAddEvent(e, QKeySequence::MoveToStartOfLine)) {
+        } else if (multiCursorEvent(e, QKeySequence::MoveToStartOfLine)) {
             op = QTextCursor::StartOfLine;
-        } else if (multiCursorAddEvent(e, QKeySequence::MoveToEndOfLine)) {
+        } else if (multiCursorEvent(e, QKeySequence::MoveToEndOfLine)) {
             op = QTextCursor::EndOfLine;
-        } else if (multiCursorAddEvent(e, QKeySequence::MoveToStartOfDocument)) {
+        } else if (multiCursorEvent(e, QKeySequence::MoveToStartOfDocument)) {
             op = QTextCursor::Start;
-        } else if (multiCursorAddEvent(e, QKeySequence::MoveToEndOfDocument)) {
+        } else if (multiCursorEvent(e, QKeySequence::MoveToEndOfDocument)) {
             op = QTextCursor::End;
-        } else {
-            return false;
         }
 
-        const std::list<QTextCursor> cursors = m_cursorList;
-        for (QTextCursor cursor : cursors) {
-            if (camelCaseNavigationEnabled && op == QTextCursor::WordRight)
-                CamelCaseCursor::right(&cursor, edit, QTextCursor::MoveAnchor);
-            else if (camelCaseNavigationEnabled && op == QTextCursor::WordLeft)
-                CamelCaseCursor::left(&cursor, edit, QTextCursor::MoveAnchor);
-            else
-                cursor.movePosition(op, QTextCursor::MoveAnchor);
+        if (op != QTextCursor::NoMove) {
+            const std::list<QTextCursor> cursors = m_cursorList;
+            for (QTextCursor cursor : cursors) {
+                if (camelCaseNavigationEnabled && op == QTextCursor::WordRight)
+                    CamelCaseCursor::right(&cursor, edit, QTextCursor::MoveAnchor);
+                else if (camelCaseNavigationEnabled && op == QTextCursor::WordLeft)
+                    CamelCaseCursor::left(&cursor, edit, QTextCursor::MoveAnchor);
+                else
+                    cursor.movePosition(op, QTextCursor::MoveAnchor);
 
-            addCursor(cursor);
+                addCursor(cursor);
+            }
+            return true;
         }
-        return true;
     }
 
     for (auto it = m_cursorList.begin(); it != m_cursorList.end(); ++it) {
@@ -395,28 +392,28 @@ bool MultiTextCursor::handleMoveKeyEvent(QKeyEvent *e,
             op = QTextCursor::Right;
         } else if (e == QKeySequence::MoveToPreviousChar) {
             op = QTextCursor::Left;
-        } else if (e == QKeySequence::SelectNextChar) {
+        } else if (multiCursorEvent(e, QKeySequence::SelectNextChar)) {
             op = QTextCursor::Right;
             mode = QTextCursor::KeepAnchor;
-        } else if (e == QKeySequence::SelectPreviousChar) {
+        } else if (multiCursorEvent(e, QKeySequence::SelectPreviousChar)) {
             op = QTextCursor::Left;
             mode = QTextCursor::KeepAnchor;
-        } else if (e == QKeySequence::SelectNextWord) {
+        } else if (multiCursorEvent(e, QKeySequence::SelectNextWord)) {
             op = QTextCursor::WordRight;
             mode = QTextCursor::KeepAnchor;
-        } else if (e == QKeySequence::SelectPreviousWord) {
+        } else if (multiCursorEvent(e, QKeySequence::SelectPreviousWord)) {
             op = QTextCursor::WordLeft;
             mode = QTextCursor::KeepAnchor;
-        } else if (e == QKeySequence::SelectStartOfLine) {
+        } else if (multiCursorEvent(e, QKeySequence::SelectStartOfLine)) {
             op = QTextCursor::StartOfLine;
             mode = QTextCursor::KeepAnchor;
-        } else if (e == QKeySequence::SelectEndOfLine) {
+        } else if (multiCursorEvent(e, QKeySequence::SelectEndOfLine)) {
             op = QTextCursor::EndOfLine;
             mode = QTextCursor::KeepAnchor;
-        } else if (e == QKeySequence::SelectStartOfBlock) {
+        } else if (multiCursorEvent(e, QKeySequence::SelectStartOfBlock)) {
             op = QTextCursor::StartOfBlock;
             mode = QTextCursor::KeepAnchor;
-        } else if (e == QKeySequence::SelectEndOfBlock) {
+        } else if (multiCursorEvent(e, QKeySequence::SelectEndOfBlock)) {
             op = QTextCursor::EndOfBlock;
             mode = QTextCursor::KeepAnchor;
         } else if (e == QKeySequence::SelectStartOfDocument) {
diff --git a/src/libs/utils/multitextcursor.h b/src/libs/utils/multitextcursor.h
index dc554dd2276..c1099013095 100644
--- a/src/libs/utils/multitextcursor.h
+++ b/src/libs/utils/multitextcursor.h
@@ -108,7 +108,10 @@ public:
     const_iterator constBegin() const { return m_cursorMap.cbegin(); }
     const_iterator constEnd() const { return m_cursorMap.cend(); }
 
-    static bool multiCursorAddEvent(QKeyEvent *e, QKeySequence::StandardKey matchKey);
+    static bool multiCursorEvent(
+        QKeyEvent *e,
+        QKeySequence::StandardKey matchKey,
+        Qt::KeyboardModifiers additionalFilterModifier = {});
 
 private:
     std::list<QTextCursor> m_cursorList;
diff --git a/src/libs/utils/namevalueitem.cpp b/src/libs/utils/namevalueitem.cpp
index 3f4cdbd4b2c..cb34f8a5505 100644
--- a/src/libs/utils/namevalueitem.cpp
+++ b/src/libs/utils/namevalueitem.cpp
@@ -19,6 +19,10 @@ EnvironmentItems EnvironmentItem::fromStringList(const QStringList &list)
 {
     EnvironmentItems result;
     for (const QString &string : list) {
+        if (string.startsWith("##")) {
+            result.append({string.mid(2), {}, EnvironmentItem::Comment});
+            continue;
+        }
         int pos = string.indexOf("+=");
         if (pos != -1) {
             result.append({string.left(pos), string.mid(pos + 2), EnvironmentItem::Append});
@@ -59,6 +63,8 @@ QStringList EnvironmentItem::toStringList(const EnvironmentItems &list)
             return QString('#' + item.name + '=' + item.value);
         case EnvironmentItem::SetEnabled:
             return QString(item.name + '=' + item.value);
+        case EnvironmentItem::Comment:
+            return QString("##" + item.name);
         }
         return QString();
     });
@@ -170,6 +176,8 @@ void EnvironmentItem::apply(NameValueDictionary *dictionary, Operation op) const
             apply(dictionary, SetEnabled);
         }
     } break;
+    case Comment: // ignore comments when applying to environment
+        break;
     }
 }
 
@@ -195,6 +203,9 @@ QDebug operator<<(QDebug debug, const EnvironmentItem &i)
     case EnvironmentItem::Append:
         debug << "append to \"" << i.name << "\":\"" << i.value << '"';
         break;
+    case EnvironmentItem::Comment:
+        debug << "comment:" << i.name;
+        break;
     }
     debug << ')';
     return debug;
diff --git a/src/libs/utils/namevalueitem.h b/src/libs/utils/namevalueitem.h
index 6ad5ed03791..c518b17e667 100644
--- a/src/libs/utils/namevalueitem.h
+++ b/src/libs/utils/namevalueitem.h
@@ -16,7 +16,7 @@ namespace Utils {
 class QTCREATOR_UTILS_EXPORT EnvironmentItem
 {
 public:
-    enum Operation : char { SetEnabled, Unset, Prepend, Append, SetDisabled };
+    enum Operation : char { SetEnabled, Unset, Prepend, Append, SetDisabled, Comment };
     EnvironmentItem() = default;
     EnvironmentItem(const QString &key, const QString &value, Operation operation = SetEnabled)
         : name(key)
diff --git a/src/libs/utils/namevaluesdialog.cpp b/src/libs/utils/namevaluesdialog.cpp
index 0b009c7568e..cd34a23955f 100644
--- a/src/libs/utils/namevaluesdialog.cpp
+++ b/src/libs/utils/namevaluesdialog.cpp
@@ -60,11 +60,12 @@ NameValueItemsWidget::NameValueItemsWidget(QWidget *parent)
     const QString helpText = Tr::tr(
         "Enter one environment variable per line.\n"
         "To set or change a variable, use VARIABLE=VALUE.\n"
+        "To disable a variable, prefix this line with \"#\".\n"
         "To append to a variable, use VARIABLE+=VALUE.\n"
         "To prepend to a variable, use VARIABLE=+VALUE.\n"
         "Existing variables can be referenced in a VALUE with ${OTHER}.\n"
         "To clear a variable, put its name on a line with nothing else on it.\n"
-        "To disable a variable, prefix the line with \"#\".");
+        "Lines starting with \"##\" will be treated as comments.");
 
     m_editor = new Internal::TextEditHelper(this);
     auto layout = new QVBoxLayout(this);
@@ -72,21 +73,14 @@ NameValueItemsWidget::NameValueItemsWidget(QWidget *parent)
     layout->addWidget(m_editor);
     layout->addWidget(new QLabel(helpText, this));
 
-    const auto checkForItemChange = [this] {
-        const EnvironmentItems newItems = environmentItems();
-        if (newItems != m_originalItems) {
-            m_originalItems = newItems;
-            emit userChangedItems(newItems);
-        }
-    };
     const auto timer = new QTimer(this);
     timer->setSingleShot(true);
     timer->setInterval(1000);
     connect(m_editor, &QPlainTextEdit::textChanged, timer, qOverload<>(&QTimer::start));
-    connect(timer, &QTimer::timeout, this, checkForItemChange);
-    connect(m_editor, &Internal::TextEditHelper::lostFocus, this, [timer, checkForItemChange] {
+    connect(timer, &QTimer::timeout, this, &NameValueItemsWidget::forceUpdateCheck);
+    connect(m_editor, &Internal::TextEditHelper::lostFocus, this, [this, timer] {
         timer->stop();
-        checkForItemChange();
+        forceUpdateCheck();
     });
 }
 
@@ -141,7 +135,7 @@ bool NameValueItemsWidget::editVariable(const QString &name, Selection selection
         skipWhiteSpace();
         if (offset < line.length()) {
             QChar nextChar = line.at(offset);
-            if (nextChar.isLetterOrNumber())
+            if (nextChar.isLetterOrNumber() || nextChar == '_')
                 continue;
             if (nextChar == '=') {
                 if (++offset < line.length() && line.at(offset) == '+')
@@ -158,6 +152,15 @@ bool NameValueItemsWidget::editVariable(const QString &name, Selection selection
     return false;
 }
 
+void NameValueItemsWidget::forceUpdateCheck()
+{
+    const EnvironmentItems newItems = environmentItems();
+    if (newItems != m_originalItems) {
+        m_originalItems = newItems;
+        emit userChangedItems(newItems);
+    }
+}
+
 NameValuesDialog::NameValuesDialog(const QString &windowTitle, QWidget *parent)
     : QDialog(parent)
 {
diff --git a/src/libs/utils/namevaluesdialog.h b/src/libs/utils/namevaluesdialog.h
index a1e884fe5b5..abf6b84b23e 100644
--- a/src/libs/utils/namevaluesdialog.h
+++ b/src/libs/utils/namevaluesdialog.h
@@ -29,6 +29,8 @@ public:
     enum class Selection { Name, Value };
     bool editVariable(const QString &name, Selection selection);
 
+    void forceUpdateCheck();
+
 signals:
     void userChangedItems(const EnvironmentItems &items);
 
diff --git a/src/libs/utils/osspecificaspects.h b/src/libs/utils/osspecificaspects.h
index c735f313abc..d778d5ea574 100644
--- a/src/libs/utils/osspecificaspects.h
+++ b/src/libs/utils/osspecificaspects.h
@@ -14,6 +14,8 @@ namespace Utils {
 // Add more as needed.
 enum OsType { OsTypeWindows, OsTypeLinux, OsTypeMac, OsTypeOtherUnix, OsTypeOther };
 
+enum OsArch { OsArchUnknown, OsArchX86, OsArchAMD64, OsArchItanium, OsArchArm, OsArchArm64 };
+
 inline QString osTypeToString(OsType osType)
 {
     switch (osType) {
@@ -33,17 +35,33 @@ inline QString osTypeToString(OsType osType)
 
 inline OsType osTypeFromString(const QString &string)
 {
-    if (string == "Windows")
+    if (string.compare("windows", Qt::CaseInsensitive) == 0)
         return OsTypeWindows;
-    if (string == "Linux")
+    if (string.compare("linux", Qt::CaseInsensitive) == 0)
         return OsTypeLinux;
-    if (string == "Mac")
+    if (string.compare("mac", Qt::CaseInsensitive) == 0
+        || string.compare("darwin", Qt::CaseInsensitive) == 0)
         return OsTypeMac;
-    if (string == "Other Unix")
+    if (string.compare("other unix", Qt::CaseInsensitive) == 0)
         return OsTypeOtherUnix;
     return OsTypeOther;
 }
 
+inline OsArch osArchFromString(const QString &architecture)
+{
+    if (architecture == QLatin1String("x86_64") || architecture == QLatin1String("amd64"))
+        return OsArchAMD64;
+    if (architecture == QLatin1String("x86"))
+        return OsArchX86;
+    if (architecture == QLatin1String("ia64"))
+        return OsArchItanium;
+    if (architecture == QLatin1String("arm"))
+        return OsArchArm;
+    if (architecture == QLatin1String("arm64") || architecture == QLatin1String("aarch64"))
+        return OsArchArm64;
+    return OsArchUnknown;
+}
+
 namespace OsSpecificAspects {
 
 inline QString withExecutableSuffix(OsType osType, const QString &executable)
diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp
index f8b3d8cec79..d36662f4d34 100644
--- a/src/libs/utils/outputformatter.cpp
+++ b/src/libs/utils/outputformatter.cpp
@@ -58,7 +58,7 @@ Link OutputLineParser::parseLinkTarget(const QString &target)
         return {};
     return Link(FilePath::fromString(parts.first()),
                 parts.length() > 1 ? parts.at(1).toInt() : 0,
-                parts.length() > 2 ? parts.at(2).toInt() : 0);
+                parts.length() > 2 ? parts.at(2).toInt() - 1 : 0);
 }
 
 // The redirection mechanism is needed for broken build tools (e.g. xcodebuild) that get invoked
@@ -141,26 +141,39 @@ FilePath OutputLineParser::absoluteFilePath(const FilePath &filePath) const
     return filePath;
 }
 
-void OutputLineParser::addLinkSpecForAbsoluteFilePath(OutputLineParser::LinkSpecs &linkSpecs,
-        const FilePath &filePath, int lineNo, int pos, int len)
+void OutputLineParser::addLinkSpecForAbsoluteFilePath(
+    OutputLineParser::LinkSpecs &linkSpecs,
+    const FilePath &filePath,
+    int lineNo,
+    int column,
+    int pos,
+    int len)
 {
     if (filePath.toFileInfo().isAbsolute())
-        linkSpecs.append({pos, len, createLinkTarget(filePath, lineNo)});
+        linkSpecs.append({pos, len, createLinkTarget(filePath, lineNo, column)});
 }
 
-void OutputLineParser::addLinkSpecForAbsoluteFilePath(OutputLineParser::LinkSpecs &linkSpecs,
-        const FilePath &filePath, int lineNo, const QRegularExpressionMatch &match,
-        int capIndex)
+void OutputLineParser::addLinkSpecForAbsoluteFilePath(
+    OutputLineParser::LinkSpecs &linkSpecs,
+    const FilePath &filePath,
+    int lineNo,
+    int column,
+    const QRegularExpressionMatch &match,
+    int capIndex)
 {
-    addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, lineNo, match.capturedStart(capIndex),
-                                   match.capturedLength(capIndex));
+    addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, lineNo, column,
+                                   match.capturedStart(capIndex), match.capturedLength(capIndex));
 }
-void OutputLineParser::addLinkSpecForAbsoluteFilePath(OutputLineParser::LinkSpecs &linkSpecs,
-        const FilePath &filePath, int lineNo, const QRegularExpressionMatch &match,
-                                                      const QString &capName)
+void OutputLineParser::addLinkSpecForAbsoluteFilePath(
+    OutputLineParser::LinkSpecs &linkSpecs,
+    const FilePath &filePath,
+    int lineNo,
+    int column,
+    const QRegularExpressionMatch &match,
+    const QString &capName)
 {
-    addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, lineNo, match.capturedStart(capName),
-                                   match.capturedLength(capName));
+    addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, lineNo, column,
+                                   match.capturedStart(capName), match.capturedLength(capName));
 }
 
 bool Utils::OutputLineParser::fileExists(const FilePath &fp) const
@@ -342,6 +355,7 @@ OutputLineParser::Result OutputFormatter::handleMessage(const QString &text, Out
                 = d->nextParser->handleLine(text, outputTypeForParser(d->nextParser, format));
         switch (res.status) {
         case OutputLineParser::Status::Done:
+            d->nextParser->flush();
             d->nextParser = nullptr;
             return res;
         case OutputLineParser::Status::InProgress:
@@ -359,6 +373,7 @@ OutputLineParser::Result OutputFormatter::handleMessage(const QString &text, Out
                 = parser->handleLine(text, outputTypeForParser(parser, format));
         switch (res.status) {
         case OutputLineParser::Status::Done:
+            parser->flush();
             involvedParsers << parser;
             return res;
         case OutputLineParser::Status::InProgress:
@@ -402,23 +417,32 @@ const QList<FormattedText> OutputFormatter::linkifiedText(
         }
 
         for (int nextLocalTextPos = 0; nextLocalTextPos < t.text.size(); ) {
-
-            // There are no more links in this part, so copy the rest of the text as-is.
-            if (nextLinkSpecIndex >= linkSpecs.size()) {
+            const auto copyRestOfSegmentAsIs = [&] {
                 linkified << FormattedText(t.text.mid(nextLocalTextPos), t.format);
                 totalTextLengthSoFar += t.text.length() - nextLocalTextPos;
+            };
+
+            // We are out of links.
+            if (nextLinkSpecIndex >= linkSpecs.size()) {
+                copyRestOfSegmentAsIs();
                 break;
             }
 
             const OutputLineParser::LinkSpec &linkSpec = linkSpecs.at(nextLinkSpecIndex);
             const int localLinkStartPos = linkSpec.startPos - totalPreviousTextLength;
+
+            // There are more links, but not in this segment.
+            if (localLinkStartPos >= t.text.size()) {
+                copyRestOfSegmentAsIs();
+                break;
+            }
+
             ++nextLinkSpecIndex;
 
             // We ignore links that would cross format boundaries.
             if (localLinkStartPos < nextLocalTextPos
                     || localLinkStartPos + linkSpec.length > t.text.length()) {
-                linkified << FormattedText(t.text.mid(nextLocalTextPos), t.format);
-                totalTextLengthSoFar += t.text.length() - nextLocalTextPos;
+                copyRestOfSegmentAsIs();
                 break;
             }
 
@@ -456,7 +480,7 @@ void OutputFormatter::append(const QString &text, const QTextCharFormat &format)
 QTextCharFormat OutputFormatter::linkFormat(const QTextCharFormat &inputFormat, const QString &href)
 {
     QTextCharFormat result = inputFormat;
-    result.setForeground(creatorTheme()->color(Theme::TextColorLink));
+    result.setForeground(creatorColor(Theme::TextColorLink));
     result.setUnderlineStyle(QTextCharFormat::SingleUnderline);
     result.setAnchor(true);
     result.setAnchorHref(href);
@@ -491,14 +515,13 @@ void OutputFormatter::initFormats()
     if (!plainTextEdit())
         return;
 
-    Theme *theme = creatorTheme();
-    d->formats[NormalMessageFormat].setForeground(theme->color(Theme::OutputPanes_NormalMessageTextColor));
-    d->formats[ErrorMessageFormat].setForeground(theme->color(Theme::OutputPanes_ErrorMessageTextColor));
-    d->formats[LogMessageFormat].setForeground(theme->color(Theme::OutputPanes_WarningMessageTextColor));
-    d->formats[StdOutFormat].setForeground(theme->color(Theme::OutputPanes_StdOutTextColor));
-    d->formats[StdErrFormat].setForeground(theme->color(Theme::OutputPanes_StdErrTextColor));
-    d->formats[DebugFormat].setForeground(theme->color(Theme::OutputPanes_DebugTextColor));
-    d->formats[GeneralMessageFormat].setForeground(theme->color(Theme::OutputPanes_DebugTextColor));
+    d->formats[NormalMessageFormat].setForeground(creatorColor(Theme::OutputPanes_NormalMessageTextColor));
+    d->formats[ErrorMessageFormat].setForeground(creatorColor(Theme::OutputPanes_ErrorMessageTextColor));
+    d->formats[LogMessageFormat].setForeground(creatorColor(Theme::OutputPanes_WarningMessageTextColor));
+    d->formats[StdOutFormat].setForeground(creatorColor(Theme::OutputPanes_StdOutTextColor));
+    d->formats[StdErrFormat].setForeground(creatorColor(Theme::OutputPanes_StdErrTextColor));
+    d->formats[DebugFormat].setForeground(creatorColor(Theme::OutputPanes_DebugTextColor));
+    d->formats[GeneralMessageFormat].setForeground(creatorColor(Theme::OutputPanes_DebugTextColor));
     setBoldFontEnabled(d->boldFontEnabled);
 }
 
diff --git a/src/libs/utils/outputformatter.h b/src/libs/utils/outputformatter.h
index d26dc643271..da4dfe8a3a1 100644
--- a/src/libs/utils/outputformatter.h
+++ b/src/libs/utils/outputformatter.h
@@ -93,12 +93,13 @@ protected:
     Utils::FilePath absoluteFilePath(const Utils::FilePath &filePath) const;
     static QString createLinkTarget(const FilePath &filePath, int line, int column);
     static void addLinkSpecForAbsoluteFilePath(LinkSpecs &linkSpecs, const FilePath &filePath,
-                                               int lineNo, int pos, int len);
+                                               int lineNo, int column, int pos, int len);
     static void addLinkSpecForAbsoluteFilePath(LinkSpecs &linkSpecs, const FilePath &filePath,
-                                               int lineNo, const QRegularExpressionMatch &match,
-                                               int capIndex);
+                                               int lineNo, int column,
+                                               const QRegularExpressionMatch &match, int capIndex);
     static void addLinkSpecForAbsoluteFilePath(LinkSpecs &linkSpecs, const FilePath &filePath,
-                                               int lineNo, const QRegularExpressionMatch &match,
+                                               int lineNo, int column,
+                                               const QRegularExpressionMatch &match,
                                                const QString &capName);
     bool fileExists(const Utils::FilePath &fp) const;
 
diff --git a/src/libs/utils/overlaywidget.cpp b/src/libs/utils/overlaywidget.cpp
index 720c5a90e18..950dc4b5dc3 100644
--- a/src/libs/utils/overlaywidget.cpp
+++ b/src/libs/utils/overlaywidget.cpp
@@ -8,16 +8,34 @@
 #include <QEvent>
 #include <QPainter>
 
+namespace Utils::Internal {
+class OverlayWidgetPrivate
+{
+public:
+    OverlayWidget::PaintFunction m_paint;
+    OverlayWidget::ResizeFunction m_resize;
+};
+} // namespace Utils::Internal
+
 Utils::OverlayWidget::OverlayWidget(QWidget *parent)
+    : d(new Internal::OverlayWidgetPrivate)
 {
     setAttribute(Qt::WA_TransparentForMouseEvents);
     if (parent)
         attachToWidget(parent);
+    d->m_resize = [](QWidget *w, const QSize &size) { w->setGeometry(QRect(QPoint(0, 0), size)); };
 }
 
+Utils::OverlayWidget::~OverlayWidget() = default;
+
 void Utils::OverlayWidget::setPaintFunction(const Utils::OverlayWidget::PaintFunction &paint)
 {
-    m_paint = paint;
+    d->m_paint = paint;
+}
+
+void Utils::OverlayWidget::setResizeFunction(const ResizeFunction &resize)
+{
+    d->m_resize = resize;
 }
 
 bool Utils::OverlayWidget::eventFilter(QObject *obj, QEvent *ev)
@@ -29,9 +47,9 @@ bool Utils::OverlayWidget::eventFilter(QObject *obj, QEvent *ev)
 
 void Utils::OverlayWidget::paintEvent(QPaintEvent *ev)
 {
-    if (m_paint) {
+    if (d->m_paint) {
         QPainter p(this);
-        m_paint(this, p, ev);
+        d->m_paint(this, p, ev);
     }
 }
 
@@ -50,5 +68,6 @@ void Utils::OverlayWidget::attachToWidget(QWidget *parent)
 void Utils::OverlayWidget::resizeToParent()
 {
     QTC_ASSERT(parentWidget(), return );
-    setGeometry(QRect(QPoint(0, 0), parentWidget()->size()));
+    if (d->m_resize)
+        d->m_resize(this, parentWidget()->size());
 }
diff --git a/src/libs/utils/overlaywidget.h b/src/libs/utils/overlaywidget.h
index 8bc5b7d1eb5..c5686ad171c 100644
--- a/src/libs/utils/overlaywidget.h
+++ b/src/libs/utils/overlaywidget.h
@@ -8,18 +8,26 @@
 #include <QWidget>
 
 #include <functional>
+#include <memory>
 
 namespace Utils {
 
+namespace Internal {
+class OverlayWidgetPrivate;
+}
+
 class QTCREATOR_UTILS_EXPORT OverlayWidget : public QWidget
 {
 public:
     using PaintFunction = std::function<void(QWidget *, QPainter &, QPaintEvent *)>;
+    using ResizeFunction = std::function<void(QWidget *, QSize)>;
 
     explicit OverlayWidget(QWidget *parent = nullptr);
+    ~OverlayWidget();
 
     void attachToWidget(QWidget *parent);
     void setPaintFunction(const PaintFunction &paint);
+    void setResizeFunction(const ResizeFunction &resize);
 
 protected:
     bool eventFilter(QObject *obj, QEvent *ev) override;
@@ -28,7 +36,7 @@ protected:
 private:
     void resizeToParent();
 
-    PaintFunction m_paint;
+    std::unique_ptr<Internal::OverlayWidgetPrivate> d;
 };
 
 } // namespace Utils
diff --git a/src/libs/utils/passworddialog.cpp b/src/libs/utils/passworddialog.cpp
index 7958f7d6bd9..94de5f7f0f7 100644
--- a/src/libs/utils/passworddialog.cpp
+++ b/src/libs/utils/passworddialog.cpp
@@ -34,10 +34,9 @@ void ShowPasswordButton::paintEvent(QPaintEvent *e)
     QRect r(QPoint(), size());
 
     if (m_containsMouse && isEnabled())
-        StyleHelper::drawPanelBgRect(&p, r, creatorTheme()->color(Theme::FancyToolButtonHoverColor));
+        StyleHelper::drawPanelBgRect(&p, r, creatorColor(Theme::FancyToolButtonHoverColor));
 
-    QWindow *window = this->window()->windowHandle();
-    QSize s = icon.actualSize(window, QSize(32, 16));
+    QSize s = icon.actualSize(QSize(32, 16));
 
     QPixmap px = icon.pixmap(s);
     QRect iRect(QPoint(), s);
@@ -61,8 +60,7 @@ void ShowPasswordButton::leaveEvent(QEvent *e)
 
 QSize ShowPasswordButton::sizeHint() const
 {
-    QWindow *window = this->window()->windowHandle();
-    QSize s = Utils::Icons::EYE_OPEN_TOOLBAR.icon().actualSize(window, QSize(32, 16)) + QSize(8, 8);
+    QSize s = Utils::Icons::EYE_OPEN_TOOLBAR.icon().actualSize(QSize(32, 16)) + QSize(8, 8);
 
     if (StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyleRelaxed)
         s += QSize(5, 5);
diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp
index a4d2a060884..8e941f52a34 100644
--- a/src/libs/utils/pathchooser.cpp
+++ b/src/libs/utils/pathchooser.cpp
@@ -5,6 +5,7 @@
 
 #include "async.h"
 #include "commandline.h"
+#include "datafromprocess.h"
 #include "environment.h"
 #include "fileutils.h"
 #include "guard.h"
@@ -18,6 +19,7 @@
 #include <QFileDialog>
 #include <QFuture>
 #include <QGuiApplication>
+#include <QHelpEvent>
 #include <QHBoxLayout>
 #include <QMenu>
 #include <QPushButton>
@@ -84,8 +86,6 @@ public:
     QStringList arguments() const { return m_arguments; }
     void setArguments(const QStringList &arguments) { m_arguments = arguments; }
 
-    static QString toolVersion(const CommandLine &cmd);
-
 private:
     // Extension point for concatenating existing tooltips.
     virtual QString defaultToolTip() const  { return QString(); }
@@ -107,38 +107,40 @@ bool BinaryVersionToolTipEventFilter::eventFilter(QObject *o, QEvent *e)
     QTC_ASSERT(le, return false);
 
     const QString binary = le->text();
-    if (!binary.isEmpty()) {
-        const QString version = BinaryVersionToolTipEventFilter::toolVersion(
-                    CommandLine(FilePath::fromString(QDir::cleanPath(binary)), m_arguments));
-        if (!version.isEmpty()) {
-            // Concatenate tooltips.
-            QString tooltip = "<html><head/><body>";
-            const QString defaultValue = defaultToolTip();
-            if (!defaultValue.isEmpty()) {
-                tooltip += "<p>";
-                tooltip += defaultValue;
-                tooltip += "</p>";
-            }
-            tooltip += "<pre>";
-            tooltip += version;
-            tooltip += "</pre><body></html>";
-            le->setToolTip(tooltip);
-        }
-    }
-    return false;
-}
+    DataFromProcess<QString>::Parameters params(CommandLine(FilePath::fromUserInput(binary),
+                                                            m_arguments),
+                                                [](const QString &output) { return output; });
+    params.callback = [binary, self = QPointer(this),
+                       le = QPointer(le)](const std::optional<QString> &version) {
+        if (!self || !le)
+            return;
+        if (!version || version->isEmpty())
+            return;
+        if (binary != le->text())
+            return;
 
-QString BinaryVersionToolTipEventFilter::toolVersion(const CommandLine &cmd)
-{
-    if (cmd.executable().isEmpty())
-        return QString();
-    Process proc;
-    proc.setCommand(cmd);
-    using namespace std::chrono_literals;
-    proc.runBlocking(1s);
-    if (proc.result() != ProcessResult::FinishedWithSuccess)
-        return QString();
-    return proc.allOutput();
+        // Concatenate tooltips.
+        QString tooltip = "<html><head/><body>";
+        const QString defaultValue = self->defaultToolTip();
+        if (!defaultValue.isEmpty()) {
+            tooltip += "<p>";
+            tooltip += defaultValue;
+            tooltip += "</p>";
+        }
+        tooltip += "<pre>";
+        tooltip += *version;
+        tooltip += "</pre><body></html>";
+        le->setToolTip(tooltip);
+        if (QRect(le->mapToGlobal(QPoint(0, 0)), le->size()).contains(QCursor::pos())) {
+            QCoreApplication::postEvent(le,
+                                        new QHelpEvent(QEvent::ToolTip,
+                                                       le->mapFromGlobal(QCursor::pos()),
+                                                       QCursor::pos()));
+        }
+    };
+    DataFromProcess<QString>::provideData(params);
+
+    return false;
 }
 
 // Extends BinaryVersionToolTipEventFilter to prepend the existing pathchooser
@@ -340,14 +342,14 @@ void PathChooser::setEnvironment(const Environment &env)
     }
 }
 
-FilePath PathChooser::rawFilePath() const
+FilePath PathChooser::unexpandedFilePath() const
 {
     return FilePath::fromUserInput(d->m_lineEdit->text());
 }
 
 FilePath PathChooser::filePath() const
 {
-    return d->expandedPath(rawFilePath());
+    return d->expandedPath(unexpandedFilePath());
 }
 
 FilePath PathChooser::absoluteFilePath() const
@@ -724,11 +726,6 @@ FancyLineEdit *PathChooser::lineEdit() const
     return d->m_lineEdit;
 }
 
-QString PathChooser::toolVersion(const CommandLine &cmd)
-{
-    return BinaryVersionToolTipEventFilter::toolVersion(cmd);
-}
-
 void PathChooser::installLineEditVersionToolTip(QLineEdit *le, const QStringList &arguments)
 {
     auto ef = new BinaryVersionToolTipEventFilter(le);
diff --git a/src/libs/utils/pathchooser.h b/src/libs/utils/pathchooser.h
index a91a853938f..b0d70e90b8f 100644
--- a/src/libs/utils/pathchooser.h
+++ b/src/libs/utils/pathchooser.h
@@ -67,10 +67,10 @@ public:
     bool isValid() const;
     QString errorMessage() const;
 
-    FilePath filePath() const; // Close to what's in the line edit.
+    FilePath filePath() const; // Close to what's in the line edit. Expands macros.
     FilePath absoluteFilePath() const; // Relative paths resolved wrt the specified base dir.
 
-    FilePath rawFilePath() const; // The raw unexpanded input as FilePath.
+    FilePath unexpandedFilePath() const; // The raw unexpanded input as FilePath.
 
     FilePath baseDirectory() const;
     void setBaseDirectory(const FilePath &base);
@@ -99,8 +99,6 @@ public:
     QStringList commandVersionArguments() const;
     void setCommandVersionArguments(const QStringList &arguments);
 
-    // Utility to run a tool and return its stdout.
-    static QString toolVersion(const CommandLine &cmd);
     // Install a tooltip on lineedits used for binaries showing the version.
     static void installLineEditVersionToolTip(QLineEdit *le, const QStringList &arguments);
 
diff --git a/src/libs/utils/persistentsettings.cpp b/src/libs/utils/persistentsettings.cpp
index 54a829004b3..a9888356f4b 100644
--- a/src/libs/utils/persistentsettings.cpp
+++ b/src/libs/utils/persistentsettings.cpp
@@ -106,13 +106,13 @@ const QString keyAttribute("key");
 
 struct ParseValueStackEntry
 {
-    explicit ParseValueStackEntry(QVariant::Type t = QVariant::Invalid, const QString &k = {}) : type(t), key(k) {}
+    explicit ParseValueStackEntry(QMetaType::Type t = QMetaType::UnknownType, const QString &k = {}) : typeId(t), key(k) {}
     explicit ParseValueStackEntry(const QVariant &aSimpleValue, const QString &k);
 
     QVariant value() const;
     void addChild(const QString &key, const QVariant &v);
 
-    QVariant::Type type;
+    QMetaType::Type typeId;
     QString key;
     QVariant simpleValue;
     QVariantList listValue;
@@ -120,19 +120,19 @@ struct ParseValueStackEntry
 };
 
 ParseValueStackEntry::ParseValueStackEntry(const QVariant &aSimpleValue, const QString &k)
-    : type(aSimpleValue.type()), key(k), simpleValue(aSimpleValue)
+    : typeId(QMetaType::Type(aSimpleValue.typeId())), key(k), simpleValue(aSimpleValue)
 {
     QTC_ASSERT(simpleValue.isValid(), return);
 }
 
 QVariant ParseValueStackEntry::value() const
 {
-    switch (type) {
-    case QVariant::Invalid:
+    switch (typeId) {
+    case QMetaType::UnknownType:
         return QVariant();
-    case QVariant::Map:
+    case QMetaType::QVariantMap:
         return QVariant(mapValue);
-    case QVariant::List:
+    case QMetaType::QVariantList:
         return QVariant(listValue);
     default:
         break;
@@ -142,16 +142,16 @@ QVariant ParseValueStackEntry::value() const
 
 void ParseValueStackEntry::addChild(const QString &key, const QVariant &v)
 {
-    switch (type) {
-    case QVariant::Map:
+    switch (typeId) {
+    case QMetaType::QVariantMap:
         mapValue.insert(key, v);
         break;
-    case QVariant::List:
+    case QMetaType::QVariantList:
         listValue.push_back(v);
         break;
     default:
         qWarning() << "ParseValueStackEntry::Internal error adding " << key << v << " to "
-                 << QVariant::typeToName(type) << value();
+                 << QMetaType(typeId).name() << value();
         break;
     }
 }
@@ -226,14 +226,14 @@ bool ParseContext::handleStartElement(QXmlStreamReader &r)
         const QXmlStreamAttributes attributes = r.attributes();
         const QString key = attributes.hasAttribute(keyAttribute) ?
                     attributes.value(keyAttribute).toString() : QString();
-        m_valueStack.push_back(ParseValueStackEntry(QVariant::List, key));
+        m_valueStack.push_back(ParseValueStackEntry(QMetaType::QVariantList, key));
         return false;
     }
     if (name == valueMapElement) {
         const QXmlStreamAttributes attributes = r.attributes();
         const QString key = attributes.hasAttribute(keyAttribute) ?
                     attributes.value(keyAttribute).toString() : QString();
-        m_valueStack.push_back(ParseValueStackEntry(QVariant::Map, key));
+        m_valueStack.push_back(ParseValueStackEntry(QMetaType::QVariantMap, key));
         return false;
     }
     return false;
@@ -283,7 +283,7 @@ QVariant ParseContext::readSimpleValue(QXmlStreamReader &r, const QXmlStreamAttr
     }
     QVariant value;
     value.setValue(text);
-    value.convert(QMetaType::type(type.toLatin1().constData()));
+    value.convert(QMetaType::fromName(type.toLatin1().constData()));
     return value;
 }
 
@@ -369,8 +369,8 @@ static void writeVariantValue(QXmlStreamWriter &w, const QVariant &variant, cons
         w.writeAttribute(typeAttribute, QLatin1String(variant.typeName()));
         if (!key.isEmpty())
             w.writeAttribute(keyAttribute, xmlAttrFromKey(key));
-        switch (variant.type()) {
-        case QVariant::Rect:
+        switch (variant.typeId()) {
+        case QMetaType::QRect:
             w.writeCharacters(rectangleToString(variant.toRect()));
             break;
         default:
diff --git a/src/libs/utils/processenums.h b/src/libs/utils/processenums.h
index 903bc8df9bf..e19321fcd04 100644
--- a/src/libs/utils/processenums.h
+++ b/src/libs/utils/processenums.h
@@ -41,6 +41,11 @@ enum class Channel {
     Error
 };
 
+enum class DetachedChannelMode {
+    Forward,
+    Discard
+};
+
 enum class TextChannelMode {
                 // Keep | Emit | Emit
                 //  raw | text | content
diff --git a/src/libs/utils/processhandle_mac.mm b/src/libs/utils/processhandle_mac.mm
index 52cc0d3e077..f492dae37d3 100644
--- a/src/libs/utils/processhandle_mac.mm
+++ b/src/libs/utils/processhandle_mac.mm
@@ -10,8 +10,7 @@ bool ProcessHandle::activate()
 {
     NSRunningApplication *app = [NSRunningApplication
             runningApplicationWithProcessIdentifier:pid()];
-    return app && [app activateWithOptions:static_cast<NSApplicationActivationOptions>(
-            NSApplicationActivateIgnoringOtherApps)];
+    return app && [app activateWithOptions:NSApplicationActivateAllWindows];
 }
 
 } // Utils
diff --git a/src/libs/utils/processhelper.cpp b/src/libs/utils/processhelper.cpp
index 6045b77bec1..7e7f34cf421 100644
--- a/src/libs/utils/processhelper.cpp
+++ b/src/libs/utils/processhelper.cpp
@@ -55,12 +55,13 @@ void ProcessStartHandler::setNativeArguments(const QString &arguments)
 #endif // Q_OS_WIN
 }
 
-void ProcessStartHandler::setWindowsSpecificStartupFlags(bool belowNormalPriority,
-                                                         bool createConsoleWindow)
+void ProcessStartHandler::setWindowsSpecificStartupFlags(
+    bool belowNormalPriority, bool createConsoleWindow, bool forceDefaultErrorMode)
 {
 #ifdef Q_OS_WIN
     m_process->setCreateProcessArgumentsModifier(
-        [belowNormalPriority, createConsoleWindow](QProcess::CreateProcessArguments *args) {
+        [belowNormalPriority, createConsoleWindow, forceDefaultErrorMode](
+            QProcess::CreateProcessArguments *args) {
             if (createConsoleWindow) {
                 args->flags |= CREATE_NEW_CONSOLE;
                 args->startupInfo->dwFlags &= ~STARTF_USESTDHANDLES;
@@ -69,11 +70,13 @@ void ProcessStartHandler::setWindowsSpecificStartupFlags(bool belowNormalPriorit
             if (belowNormalPriority)
                 args->flags |= BELOW_NORMAL_PRIORITY_CLASS;
 
-            args->flags |= CREATE_DEFAULT_ERROR_MODE;
+            if (forceDefaultErrorMode)
+                args->flags |= CREATE_DEFAULT_ERROR_MODE;
         });
 #else // Q_OS_WIN
     Q_UNUSED(belowNormalPriority)
     Q_UNUSED(createConsoleWindow)
+    Q_UNUSED(forceDefaultErrorMode)
 #endif
 }
 
diff --git a/src/libs/utils/processhelper.h b/src/libs/utils/processhelper.h
index a4efc17ae51..7c40cb3faa0 100644
--- a/src/libs/utils/processhelper.h
+++ b/src/libs/utils/processhelper.h
@@ -20,7 +20,8 @@ public:
     void handleProcessStart();
     void handleProcessStarted();
     void setNativeArguments(const QString &arguments);
-    void setWindowsSpecificStartupFlags(bool belowNormalPriority, bool createConsoleWindow);
+    void setWindowsSpecificStartupFlags(
+        bool belowNormalPriority, bool createConsoleWindow, bool forceDefaultErrorMode);
 
 private:
     ProcessMode m_processMode = ProcessMode::Reader;
diff --git a/src/libs/utils/processinterface.h b/src/libs/utils/processinterface.h
index 1e233b88abf..4d230c4ef9e 100644
--- a/src/libs/utils/processinterface.h
+++ b/src/libs/utils/processinterface.h
@@ -94,6 +94,7 @@ public:
     bool m_useCtrlCStub = false;
     bool m_belowNormalPriority = false; // internal, dependent on other fields and specific code path
     bool m_createConsoleOnWindows = false;
+    bool m_forceDefaultErrorMode = false;
 };
 
 class QTCREATOR_UTILS_EXPORT ProcessResultData
diff --git a/src/libs/utils/projectintropage.cpp b/src/libs/utils/projectintropage.cpp
index 1f32cce6bcc..2c8b43b66a4 100644
--- a/src/libs/utils/projectintropage.cpp
+++ b/src/libs/utils/projectintropage.cpp
@@ -110,7 +110,8 @@ ProjectIntroPage::ProjectIntroPage(QWidget *parent) :
     using namespace Layouting;
 
     Form {
-        Tr::tr("Name:"), d->m_nameLineEdit, br,
+        Tr::tr("Name:"), d->m_nameLineEdit,
+                br,
         d->m_projectLabel, d->m_projectComboBox, br,
         Column { Space(12) }, br,
         Tr::tr("Create in:"), d->m_pathChooser, br,
@@ -135,7 +136,7 @@ ProjectIntroPage::ProjectIntroPage(QWidget *parent) :
     connect(d->m_nameLineEdit, &FancyLineEdit::validReturnPressed,
             this, &ProjectIntroPage::slotActivated);
     connect(d->m_projectComboBox, &QComboBox::currentIndexChanged,
-            this, &ProjectIntroPage::slotChanged);
+            this, &ProjectIntroPage::onCurrentProjectIndexChanged);
 
     setProperty(SHORT_TITLE_PROPERTY, Tr::tr("Location"));
     registerFieldWithName(QLatin1String("Path"), d->m_pathChooser, "path", SIGNAL(textChanged(QString)));
@@ -192,15 +193,10 @@ bool ProjectIntroPage::isComplete() const
 
 bool ProjectIntroPage::validate()
 {
-    if (d->m_forceSubProject) {
-        int index = d->m_projectComboBox->currentIndex();
-        if (index == 0)
-            return false;
-        d->m_pathChooser->setFilePath(d->m_projectDirectories.at(index));
-    }
     // Validate and display status
     if (!d->m_pathChooser->isValid()) {
-        displayStatusMessage(InfoLabel::Error, d->m_pathChooser->errorMessage());
+        if (const QString msg = d->m_pathChooser->errorMessage(); !msg.isEmpty())
+            displayStatusMessage(InfoLabel::Error, msg);
         return false;
     }
 
@@ -259,6 +255,25 @@ void ProjectIntroPage::slotActivated()
         emit activated();
 }
 
+void ProjectIntroPage::onCurrentProjectIndexChanged(int index)
+{
+    if (d->m_forceSubProject) {
+        const int available = d->m_projectDirectories.size();
+        if (available == 0)
+            return;
+        QTC_ASSERT(index < available, return);
+        if (index < 0)
+            return;
+
+        const FilePath current = d->m_projectDirectories.at(index);
+        const FilePath visible = d->m_pathChooser->filePath();
+        if (visible != current && !visible.isChildOf(current))
+            d->m_pathChooser->setFilePath(current);
+
+        fieldsUpdated();
+    }
+}
+
 bool ProjectIntroPage::forceSubProject() const
 {
     return d->m_forceSubProject;
diff --git a/src/libs/utils/projectintropage.h b/src/libs/utils/projectintropage.h
index 48b2f6b036c..562b5b06e42 100644
--- a/src/libs/utils/projectintropage.h
+++ b/src/libs/utils/projectintropage.h
@@ -58,6 +58,7 @@ public slots:
 private:
     void slotChanged();
     void slotActivated();
+    void onCurrentProjectIndexChanged(int index);
 
     bool validate();
     void displayStatusMessage(InfoLabel::InfoType t, const QString &);
diff --git a/src/libs/utils/qtcolorbutton.cpp b/src/libs/utils/qtcolorbutton.cpp
index 6a8537bd5fa..5be9c9c069b 100644
--- a/src/libs/utils/qtcolorbutton.cpp
+++ b/src/libs/utils/qtcolorbutton.cpp
@@ -171,7 +171,7 @@ void QtColorButton::paintEvent(QPaintEvent *event)
         constexpr int size = 11;
         const qreal horPadding = (width() - size) / 2.0;
         const qreal verPadding = (height() - size) / 2.0;
-        const QPen pen(creatorTheme()->color(overlayColor), 2);
+        const QPen pen(creatorColor(overlayColor), 2);
 
         p.save();
         p.setOpacity(overlayOpacity);
@@ -202,7 +202,7 @@ void QtColorButton::paintEvent(QPaintEvent *event)
         p.setPen(pen);
         p.setCompositionMode(QPainter::CompositionMode_Difference);
     } else {
-        p.setPen(creatorTheme()->color(overlayColor));
+        p.setPen(creatorColor(overlayColor));
         p.setOpacity(overlayOpacity);
     }
     p.drawRect(rect().adjusted(0, 0, -1, -1));
diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index 3f06e04fc1b..2a51e01071f 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -511,7 +511,8 @@ private:
         handler->setWriteData(m_setup.m_writeData);
         handler->setNativeArguments(m_setup.m_nativeArguments);
         handler->setWindowsSpecificStartupFlags(m_setup.m_belowNormalPriority,
-                                                m_setup.m_createConsoleOnWindows);
+                                                m_setup.m_createConsoleOnWindows,
+                                                m_setup.m_forceDefaultErrorMode);
 
         const QProcessEnvironment penv = m_setup.m_environment.toProcessEnvironment();
         if (!penv.isEmpty())
@@ -1316,12 +1317,18 @@ void Process::closeWriteChannel()
     d->sendControlSignal(ControlSignal::CloseWriteChannel);
 }
 
-bool Process::startDetached(const CommandLine &cmd, const FilePath &workingDirectory, qint64 *pid)
+bool Process::startDetached(const CommandLine &cmd, const FilePath &workingDirectory,
+                            DetachedChannelMode channelMode, qint64 *pid)
 {
-    return QProcess::startDetached(cmd.executable().toUserOutput(),
-                                   cmd.splitArguments(),
-                                   workingDirectory.toUserOutput(),
-                                   pid);
+    QProcess process;
+    process.setProgram(cmd.executable().toUserOutput());
+    process.setArguments(cmd.splitArguments());
+    process.setWorkingDirectory(workingDirectory.toUserOutput());
+    if (channelMode == DetachedChannelMode::Discard) {
+        process.setStandardOutputFile(QProcess::nullDevice());
+        process.setStandardErrorFile(QProcess::nullDevice());
+    }
+    return process.startDetached(pid);
 }
 
 void Process::setLowPriority()
@@ -1360,7 +1367,7 @@ QString Process::toStandaloneCommandLine() const
     parts.append("/usr/bin/env");
     if (!d->m_setup.m_workingDirectory.isEmpty()) {
         parts.append("-C");
-        d->m_setup.m_workingDirectory.path();
+        parts.append(d->m_setup.m_workingDirectory.path());
     }
     parts.append("-i");
     if (d->m_setup.m_environment.hasChanges()) {
@@ -1383,6 +1390,16 @@ bool Process::createConsoleOnWindows() const
     return d->m_setup.m_createConsoleOnWindows;
 }
 
+void Process::setForceDefaultErrorModeOnWindows(bool force)
+{
+    d->m_setup.m_forceDefaultErrorMode = force;
+}
+
+bool Process::forceDefaultErrorModeOnWindows() const
+{
+    return d->m_setup.m_forceDefaultErrorMode;
+}
+
 void Process::setExtraData(const QString &key, const QVariant &value)
 {
     d->m_setup.m_extraData.insert(key, value);
@@ -2129,9 +2146,10 @@ void ProcessPrivate::setupDebugLog()
         static std::atomic_int startCounter = 0;
         const int currentNumber = startCounter.fetch_add(1);
         qCDebug(processLog).nospace().noquote()
-                << "Process " << currentNumber << " starting ("
-                << qPrintable(blockingMessage(property(QTC_PROCESS_BLOCKING_TYPE)))
-                << "): " << m_setup.m_commandLine.toUserOutput();
+            << "Process " << currentNumber << " starting ("
+            << qPrintable(blockingMessage(property(QTC_PROCESS_BLOCKING_TYPE)))
+            << (isMainThread() ? ", main thread" : "")
+            << "): " << m_setup.m_commandLine.toUserOutput();
         setProperty(QTC_PROCESS_NUMBER, currentNumber);
     });
 
diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h
index a7e00882a31..cc629fe127b 100644
--- a/src/libs/utils/qtcprocess.h
+++ b/src/libs/utils/qtcprocess.h
@@ -137,6 +137,7 @@ public:
     // Some of them could be aggregated in another public utils class.
 
     static bool startDetached(const CommandLine &cmd, const FilePath &workingDirectory = {},
+                              DetachedChannelMode channelMode = DetachedChannelMode::Forward,
                               qint64 *pid = nullptr);
 
     // Starts the command and waits for finish.
@@ -187,6 +188,9 @@ public:
     void setCreateConsoleOnWindows(bool create);
     bool createConsoleOnWindows() const;
 
+    void setForceDefaultErrorModeOnWindows(bool force);
+    bool forceDefaultErrorModeOnWindows() const;
+
 signals:
     void starting(); // On NotRunning -> Starting state transition
     void started();  // On Starting -> Running state transition
diff --git a/src/libs/utils/ranges.h b/src/libs/utils/ranges.h
index 5a3c3507c1c..825b4da41b7 100644
--- a/src/libs/utils/ranges.h
+++ b/src/libs/utils/ranges.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#if __cpp_lib_ranges >= 202002L
-#  include <ranges>
+#if defined(__cpp_lib_ranges) && __cpp_lib_ranges >= 201911L
+#include <ranges>
 
 namespace Utils {
 
diff --git a/src/libs/utils/smallstring.h b/src/libs/utils/smallstring.h
index 0209f0a8723..c20ab41c1f1 100644
--- a/src/libs/utils/smallstring.h
+++ b/src/libs/utils/smallstring.h
@@ -176,12 +176,10 @@ public:
 
     operator SmallStringView() const noexcept { return SmallStringView(data(), size()); }
 
- #if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
     explicit operator QLatin1StringView() const noexcept
     {
         return QLatin1StringView(data(), Utils::ssize(*this));
     }
-#endif
 
     operator QUtf8StringView() const noexcept
     {
diff --git a/src/libs/utils/smallstringview.h b/src/libs/utils/smallstringview.h
index 09666934721..09b2a2abaf7 100644
--- a/src/libs/utils/smallstringview.h
+++ b/src/libs/utils/smallstringview.h
@@ -80,12 +80,10 @@ public:
 
     QByteArray toByteArray() const { return QByteArrayView{*this}.toByteArray(); }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
     explicit operator QLatin1StringView() const noexcept
     {
         return QLatin1StringView(data(), Utils::ssize(*this));
     }
-#endif
 
     operator QUtf8StringView() const noexcept
     {
diff --git a/src/libs/utils/store.cpp b/src/libs/utils/store.cpp
index fa8d4232c02..8c0e2a6046a 100644
--- a/src/libs/utils/store.cpp
+++ b/src/libs/utils/store.cpp
@@ -50,10 +50,10 @@ static QVariantList mapListFromStoreList(const QVariantList &storeList);
 
 QVariant storeEntryFromMapEntry(const QVariant &mapEntry)
 {
-    if (mapEntry.type() == QVariant::Map)
+    if (mapEntry.typeId() == QMetaType::QVariantMap)
         return QVariant::fromValue(storeFromMap(mapEntry.toMap()));
 
-    if (mapEntry.type() == QVariant::List)
+    if (mapEntry.typeId() == QMetaType::QVariantList)
         return QVariant::fromValue(storeListFromMapList(mapEntry.toList()));
 
     return mapEntry;
@@ -64,7 +64,7 @@ QVariant mapEntryFromStoreEntry(const QVariant &storeEntry)
     if (storeEntry.metaType() == QMetaType::fromType<Store>())
         return QVariant::fromValue(mapFromStore(storeEntry.value<Store>()));
 
-    if (storeEntry.type() == QVariant::List)
+    if (storeEntry.typeId() == QMetaType::QVariantList)
         return QVariant::fromValue(mapListFromStoreList(storeEntry.toList()));
 
     return storeEntry;
diff --git a/src/libs/utils/stringutils.cpp b/src/libs/utils/stringutils.cpp
index d8de512b32d..d21c7cb9bc1 100644
--- a/src/libs/utils/stringutils.cpp
+++ b/src/libs/utils/stringutils.cpp
@@ -637,7 +637,7 @@ void MarkdownHighlighter::highlightBlock(const QString &text)
                 image.fill(QColor(0, 0, 0, 0).rgba());
                 image.setPixel(0,
                                height - 1,
-                               Utils::creatorTheme()->color(Theme::TextColorDisabled).rgba());
+                               Utils::creatorColor(Theme::TextColorDisabled).rgba());
 
                 h2Brush = QBrush(image);
             }
@@ -672,4 +672,10 @@ void MarkdownHighlighter::highlightBlock(const QString &text)
     }
 }
 
+QString ansiColoredText(const QString &text, const QColor &color)
+{
+    static const QString formatString("\033[38;2;%1;%2;%3m%4\033[0m");
+    return formatString.arg(color.red()).arg(color.green()).arg(color.blue()).arg(text);
+}
+
 } // namespace Utils
diff --git a/src/libs/utils/stringutils.h b/src/libs/utils/stringutils.h
index 3e729e672c3..cab6d774f3f 100644
--- a/src/libs/utils/stringutils.h
+++ b/src/libs/utils/stringutils.h
@@ -138,4 +138,6 @@ private:
     QBrush m_codeBgBrush;
 };
 
+QTCREATOR_UTILS_EXPORT QString ansiColoredText(const QString &text, const QColor &color);
+
 } // namespace Utils
diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp
index 07f526a4af0..080bb8a3820 100644
--- a/src/libs/utils/stylehelper.cpp
+++ b/src/libs/utils/stylehelper.cpp
@@ -107,7 +107,7 @@ QColor StyleHelper::notTooBrightHighlightColor()
 QPalette StyleHelper::sidebarFontPalette(const QPalette &original)
 {
     QPalette palette = original;
-    const QColor textColor = creatorTheme()->color(Theme::ProgressBarTitleColor);
+    const QColor textColor = creatorColor(Theme::ProgressBarTitleColor);
     palette.setColor(QPalette::WindowText, textColor);
     palette.setColor(QPalette::Text, textColor);
     return palette;
@@ -137,7 +137,7 @@ QColor StyleHelper::requestedBaseColor()
 QColor StyleHelper::toolbarBaseColor(bool lightColored)
 {
     if (creatorTheme()->flag(Theme::QDSTheme))
-        return creatorTheme()->color(Utils::Theme::DStoolbarBackground);
+        return creatorColor(Utils::Theme::DStoolbarBackground);
     else
         return StyleHelper::baseColor(lightColored);
 }
@@ -194,7 +194,7 @@ void StyleHelper::setBaseColor(const QColor &newcolor)
 {
     s_requestedBaseColor = newcolor;
 
-    const QColor themeBaseColor = creatorTheme()->color(Theme::PanelStatusBarBackgroundColor);
+    const QColor themeBaseColor = creatorColor(Theme::PanelStatusBarBackgroundColor);
     const QColor defaultBaseColor = QColor(DEFAULT_BASE_COLOR);
     QColor color;
 
@@ -366,11 +366,11 @@ void StyleHelper::drawArrow(QStyle::PrimitiveElement element, QPainter *painter,
         };
 
         if (!enabled) {
-            drawCommonStyleArrow(image.rect(), creatorTheme()->color(Theme::IconsDisabledColor));
+            drawCommonStyleArrow(image.rect(), creatorColor(Theme::IconsDisabledColor));
         } else {
             if (creatorTheme()->flag(Theme::ToolBarIconShadow))
                 drawCommonStyleArrow(image.rect().translated(0, devicePixelRatio), toolBarDropShadowColor());
-            drawCommonStyleArrow(image.rect(), creatorTheme()->color(Theme::IconsBaseColor));
+            drawCommonStyleArrow(image.rect(), creatorColor(Theme::IconsBaseColor));
         }
         painter.end();
         pixmap = QPixmap::fromImage(image);
@@ -463,9 +463,9 @@ void StyleHelper::drawMinimalArrow(QStyle::PrimitiveElement element, QPainter *p
         if (enabled) {
             if (creatorTheme()->flag(Theme::ToolBarIconShadow))
                 drawArrow(image.rect().translated(0, devicePixelRatio), toolBarDropShadowColor());
-            drawArrow(image.rect(), creatorTheme()->color(Theme::IconsBaseColor));
+            drawArrow(image.rect(), creatorColor(Theme::IconsBaseColor));
         } else {
-            drawArrow(image.rect(), creatorTheme()->color(Theme::IconsDisabledColor));
+            drawArrow(image.rect(), creatorColor(Theme::IconsDisabledColor));
         }
         painter.end();
         pixmap = QPixmap::fromImage(image);
@@ -551,8 +551,7 @@ void StyleHelper::drawIconWithShadow(const QIcon &icon, const QRect &rect,
         // return a high-dpi pixmap, which will in that case have a devicePixelRatio
         // different than 1. The shadow drawing caluculations are done in device
         // pixels.
-        QWindow *window = dynamic_cast<QWidget*>(p->device())->window()->windowHandle();
-        QPixmap px = icon.pixmap(window, rect.size(), iconMode);
+        QPixmap px = icon.pixmap(rect.size(), devicePixelRatio, iconMode);
         int radius = int(dipRadius * devicePixelRatio);
         QPoint offset = dipOffset * devicePixelRatio;
         cache = QPixmap(px.size() + QSize(radius * 2, radius * 2));
@@ -563,7 +562,7 @@ void StyleHelper::drawIconWithShadow(const QIcon &icon, const QRect &rect,
             const bool hasDisabledState =
                     icon.availableSizes().count() == icon.availableSizes(QIcon::Disabled).count();
             if (!hasDisabledState)
-                px = disabledSideBarIcon(icon.pixmap(window, rect.size()));
+                px = disabledSideBarIcon(icon.pixmap(rect.size(), devicePixelRatio));
         } else if (creatorTheme()->flag(Theme::ToolBarIconShadow)) {
             // Draw shadow
             QImage tmp(px.size() + QSize(radius * 2, radius * 2 + 1), QImage::Format_ARGB32_Premultiplied);
@@ -716,12 +715,7 @@ Qt::HighDpiScaleFactorRoundingPolicy StyleHelper::defaultHighDpiScaleFactorRound
 
 QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QList<IconFontHelper> &parameters)
 {
-    QFontDatabase a;
-
-    QTC_ASSERT(a.hasFamily(fontName), {});
-
-    if (!a.hasFamily(fontName))
-        return {};
+    QTC_ASSERT(QFontDatabase::hasFamily(fontName), {});
 
     QIcon icon;
 
@@ -751,38 +745,31 @@ QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QList<Icon
 
 QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QString &iconSymbol, int fontSize, int iconSize, QColor color)
 {
-    QFontDatabase a;
+    QTC_ASSERT(QFontDatabase::hasFamily(fontName), {});
 
-    QTC_ASSERT(a.hasFamily(fontName), {});
+    QIcon icon;
+    QSize size(iconSize, iconSize);
 
-    if (a.hasFamily(fontName)) {
+    const int maxDpr = qRound(qApp->devicePixelRatio());
+    for (int dpr = 1; dpr <= maxDpr; dpr++) {
+        QPixmap pixmap(size * dpr);
+        pixmap.setDevicePixelRatio(dpr);
+        pixmap.fill(Qt::transparent);
 
-        QIcon icon;
-        QSize size(iconSize, iconSize);
+        QFont font(fontName);
+        font.setPixelSize(fontSize);
 
-        const int maxDpr = qRound(qApp->devicePixelRatio());
-        for (int dpr = 1; dpr <= maxDpr; dpr++) {
-            QPixmap pixmap(size * dpr);
-            pixmap.setDevicePixelRatio(dpr);
-            pixmap.fill(Qt::transparent);
+        QPainter painter(&pixmap);
+        painter.save();
+        painter.setPen(color);
+        painter.setFont(font);
+        painter.drawText(QRectF(QPoint(0, 0), size), Qt::AlignCenter, iconSymbol);
+        painter.restore();
 
-            QFont font(fontName);
-            font.setPixelSize(fontSize);
-
-            QPainter painter(&pixmap);
-            painter.save();
-            painter.setPen(color);
-            painter.setFont(font);
-            painter.drawText(QRectF(QPoint(0, 0), size), Qt::AlignCenter, iconSymbol);
-            painter.restore();
-
-            icon.addPixmap(pixmap);
-        }
-
-        return icon;
+        icon.addPixmap(pixmap);
     }
 
-    return {};
+    return icon;
 }
 
 QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QString &iconSymbol, int fontSize, int iconSize)
@@ -794,55 +781,47 @@ QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QString &i
 QIcon StyleHelper::getCursorFromIconFont(const QString &fontName, const QString &cursorFill, const QString &cursorOutline,
                                          int fontSize, int iconSize)
 {
-    QFontDatabase a;
-
-    QTC_ASSERT(a.hasFamily(fontName), {});
+    QTC_ASSERT(QFontDatabase::hasFamily(fontName), {});
 
     const QColor outlineColor = Qt::black;
     const QColor fillColor = Qt::white;
 
-    if (a.hasFamily(fontName)) {
+    QIcon icon;
+    QSize size(iconSize, iconSize);
 
-        QIcon icon;
-        QSize size(iconSize, iconSize);
+    const int maxDpr = qRound(qApp->devicePixelRatio());
+    for (int dpr = 1; dpr <= maxDpr; dpr++) {
+        QPixmap pixmap(size * dpr);
+        pixmap.setDevicePixelRatio(dpr);
+        pixmap.fill(Qt::transparent);
 
-        const int maxDpr = qRound(qApp->devicePixelRatio());
-        for (int dpr = 1; dpr <= maxDpr; dpr++) {
-            QPixmap pixmap(size * dpr);
-            pixmap.setDevicePixelRatio(dpr);
-            pixmap.fill(Qt::transparent);
+        QFont font(fontName);
+        font.setPixelSize(fontSize);
 
-            QFont font(fontName);
-            font.setPixelSize(fontSize);
+        QPainter painter(&pixmap);
+        painter.save();
+        painter.setRenderHint(QPainter::Antialiasing, true);
+        painter.setRenderHint(QPainter::TextAntialiasing, true);
+        painter.setRenderHint(QPainter::LosslessImageRendering, true);
+        painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
 
-            QPainter painter(&pixmap);
-            painter.save();
-            painter.setRenderHint(QPainter::Antialiasing, true);
-            painter.setRenderHint(QPainter::TextAntialiasing, true);
-            painter.setRenderHint(QPainter::LosslessImageRendering, true);
-            painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
+        painter.setFont(font);
+        painter.setPen(outlineColor);
+        painter.drawText(QRectF(QPointF(0.0, 0.0), size),
+                         Qt::AlignCenter, cursorOutline);
 
-            painter.setFont(font);
-            painter.setPen(outlineColor);
-            painter.drawText(QRectF(QPointF(0.0, 0.0), size),
-                             Qt::AlignCenter, cursorOutline);
+        painter.setPen(fillColor);
+        painter.drawText(QRectF(QPointF(0.0, 0.0), size),
+                         Qt::AlignCenter, cursorFill);
 
-            painter.setPen(fillColor);
-            painter.drawText(QRectF(QPointF(0.0, 0.0), size),
-                             Qt::AlignCenter, cursorFill);
+        painter.restore();
 
-            painter.restore();
-
-            icon.addPixmap(pixmap);
-        }
-
-        return icon;
+        icon.addPixmap(pixmap);
     }
 
-    return {};
+    return icon;
 }
 
-
 QString StyleHelper::dpiSpecificImageFile(const QString &fileName)
 {
     // See QIcon::addFile()
@@ -970,6 +949,8 @@ static const UiFontMetrics& uiFontMetrics(StyleHelper::UiElement element)
         {StyleHelper::UiElementBody2,               {12, 20, QFont::Light}},
         {StyleHelper::UiElementButtonMedium,        {12, 16, QFont::Bold}},
         {StyleHelper::UiElementButtonSmall,         {10, 12, QFont::Bold}},
+        {StyleHelper::UiElementLabelMedium,         {12, 16, QFont::DemiBold}},
+        {StyleHelper::UiElementLabelSmall,          {10, 12, QFont::DemiBold}},
         {StyleHelper::UiElementCaptionStrong,       {10, 12, QFont::DemiBold}},
         {StyleHelper::UiElementCaption,             {10, 12, QFont::Normal}},
         {StyleHelper::UiElementIconStandard,        {12, 16, QFont::Medium}},
diff --git a/src/libs/utils/stylehelper.h b/src/libs/utils/stylehelper.h
index 7d434925e66..ecc2eea2b96 100644
--- a/src/libs/utils/stylehelper.h
+++ b/src/libs/utils/stylehelper.h
@@ -79,6 +79,8 @@ enum ToolbarStyle {
 };
 constexpr ToolbarStyle defaultToolbarStyle = ToolbarStyleCompact;
 
+// Keep in sync with:
+// SyleHelper::uiFontMetrics, ICore::uiConfigInformation, tst_manual_widgets_uifonts::main
 enum UiElement {
     UiElementH1,
     UiElementH2,
@@ -91,6 +93,8 @@ enum UiElement {
     UiElementBody2,
     UiElementButtonMedium,
     UiElementButtonSmall,
+    UiElementLabelMedium,
+    UiElementLabelSmall,
     UiElementCaptionStrong,
     UiElementCaption,
     UiElementIconStandard,
diff --git a/src/libs/utils/terminalinterface.cpp b/src/libs/utils/terminalinterface.cpp
index 0d5a3be0203..6f7bb11f81e 100644
--- a/src/libs/utils/terminalinterface.cpp
+++ b/src/libs/utils/terminalinterface.cpp
@@ -334,22 +334,12 @@ void TerminalInterface::start()
 
     Environment finalEnv = m_setup.m_environment;
 
-    if (HostOsInfo::isWindowsHost()) {
-        if (!finalEnv.hasKey("PATH")) {
-            const QString path = qtcEnvironmentVariable("PATH");
-            if (!path.isEmpty())
-                finalEnv.set("PATH", path);
-        }
-        if (!finalEnv.hasKey("SystemRoot")) {
-            const QString systemRoot = qtcEnvironmentVariable("SystemRoot");
-            if (!systemRoot.isEmpty())
-                finalEnv.set("SystemRoot", systemRoot);
-        }
-    } else if (HostOsInfo::isMacHost()) {
+    if (HostOsInfo::isMacHost())
         finalEnv.set("TERM", "xterm-256color");
-    }
 
     if (finalEnv.hasChanges()) {
+        finalEnv = finalEnv.appliedToEnvironment(Environment::systemEnvironment());
+
         d->envListFile = std::make_unique<QTemporaryFile>(this);
         if (!d->envListFile->open()) {
             cleanupAfterStartFailure(msgCannotCreateTempFile(d->envListFile->errorString()));
@@ -402,7 +392,7 @@ void TerminalInterface::start()
                                     m_setup.m_commandLine.executable().fileName());
 
     if (m_setup.m_runAsRoot && !HostOsInfo::isWindowsHost()) {
-        CommandLine rootCommand("sudo", {});
+        CommandLine rootCommand("sudo");
         rootCommand.addCommandLineAsArgs(cmd);
         stubSetupData.m_commandLine = rootCommand;
     } else {
diff --git a/src/libs/utils/theme/theme.cpp b/src/libs/utils/theme/theme.cpp
index 9b24078f86a..ef20ddddb7c 100644
--- a/src/libs/utils/theme/theme.cpp
+++ b/src/libs/utils/theme/theme.cpp
@@ -18,6 +18,7 @@
 namespace Utils {
 
 static Theme *m_creatorTheme = nullptr;
+static std::optional<QPalette> m_initialPalette;
 
 ThemePrivate::ThemePrivate()
 {
@@ -37,9 +38,31 @@ Theme *proxyTheme()
     return new Theme(m_creatorTheme);
 }
 
+// Convenience
+QColor creatorColor(Theme::Color role)
+{
+    return m_creatorTheme->color(role);
+}
+
+static bool paletteIsDark(const QPalette &pal)
+{
+    return pal.color(QPalette::Window).lightnessF() < pal.color(QPalette::WindowText).lightnessF();
+}
+
+static bool isOverridingPalette(const Theme *theme)
+{
+    if (theme->flag(Theme::DerivePaletteFromTheme))
+        return true;
+    if (theme->flag(Theme::DerivePaletteFromThemeIfNeeded)
+        && paletteIsDark(Theme::initialPalette()) != theme->flag(Theme::DarkUserInterface)) {
+        return true;
+    }
+    return false;
+}
+
 void setThemeApplicationPalette()
 {
-    if (m_creatorTheme && m_creatorTheme->flag(Theme::ApplyThemePaletteGlobally))
+    if (m_creatorTheme && isOverridingPalette(m_creatorTheme))
         QApplication::setPalette(m_creatorTheme->palette());
 }
 
@@ -185,7 +208,7 @@ void Theme::setDisplayName(const QString &name)
 
 void Theme::readSettingsInternal(QSettings &settings)
 {
-    const QStringList includes = settings.value("Includes").toString().split(",", Qt::SkipEmptyParts);
+    const QStringList includes = settings.value("Includes").toStringList();
 
     for (const QString &include : includes) {
         FilePath path = FilePath::fromString(d->fileName);
@@ -311,7 +334,13 @@ bool Theme::systemUsesDarkMode()
     if (HostOsInfo::isMacHost())
         return macOSSystemIsDark();
 
-    return false;
+    // Avoid enforcing the initial palette.
+    // The initial palette must be set after setting the macOS appearance in setInitialPalette,
+    // but systemUsesDarkMode is used to determine the default theme, which is in turn required
+    // for the setInitialPalette call
+    if (m_initialPalette)
+        return paletteIsDark(*m_initialPalette);
+    return paletteIsDark(QApplication::palette());
 }
 
 // If you copy QPalette, default values stay at default, even if that default is different
@@ -347,14 +376,17 @@ void Theme::setHelpMenu(QMenu *menu)
 
 QPalette Theme::initialPalette()
 {
-    static QPalette palette = copyPalette(QApplication::palette());
-    return palette;
+    if (!m_initialPalette) {
+        m_initialPalette = copyPalette(QApplication::palette());
+        QApplication::setPalette(*m_initialPalette);
+    }
+    return *m_initialPalette;
 }
 
 QPalette Theme::palette() const
 {
     QPalette pal = initialPalette();
-    if (!flag(DerivePaletteFromTheme))
+    if (!isOverridingPalette(this))
         return pal;
 
     const static struct {
diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h
index 6b3bf97d45d..8d7e922e79d 100644
--- a/src/libs/utils/theme/theme.h
+++ b/src/libs/utils/theme/theme.h
@@ -247,6 +247,10 @@ public:
         Token_Notification_Success,
         Token_Notification_Neutral,
         Token_Notification_Danger,
+        Token_Gradient01_Start,
+        Token_Gradient01_End,
+        Token_Gradient02_Start,
+        Token_Gradient02_End,
 
         /* Timeline Library */
         Timeline_TextColor,
@@ -527,7 +531,7 @@ public:
         DrawToolBarBorders,
         ComboBoxDrawTextShadow,
         DerivePaletteFromTheme,
-        ApplyThemePaletteGlobally,
+        DerivePaletteFromThemeIfNeeded,
         FlatToolBars,
         FlatSideBarIcons,
         FlatProjectsMode,
@@ -577,5 +581,6 @@ private:
 
 QTCREATOR_UTILS_EXPORT Theme *creatorTheme();
 QTCREATOR_UTILS_EXPORT Theme *proxyTheme();
+QTCREATOR_UTILS_EXPORT QColor creatorColor(Theme::Color role);
 
 } // namespace Utils
diff --git a/src/libs/utils/threadutils.cpp b/src/libs/utils/threadutils.cpp
index 344779dc931..cfb18059a63 100644
--- a/src/libs/utils/threadutils.cpp
+++ b/src/libs/utils/threadutils.cpp
@@ -10,7 +10,12 @@ namespace Utils {
 
 bool isMainThread()
 {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+    // TODO: Remove threadutils.h and replace all usages with:
+    return QThread::isMainThread();
+#else
     return QThread::currentThread() == qApp->thread();
+#endif
 }
 
 } // namespace Utils
diff --git a/src/libs/utils/treemodel.cpp b/src/libs/utils/treemodel.cpp
index 4649bb43c86..edddb2d484e 100644
--- a/src/libs/utils/treemodel.cpp
+++ b/src/libs/utils/treemodel.cpp
@@ -459,13 +459,13 @@ void ModelTest::data()
     // General Purpose roles that should return a QString
     QVariant variant = model->data(model->index(0, 0), Qt::ToolTipRole);
     if (variant.isValid())
-        Q_ASSERT(variant.canConvert(QVariant::String));
+        Q_ASSERT(variant.canConvert(QMetaType::QString));
     variant = model->data(model->index(0, 0), Qt::StatusTipRole);
     if (variant.isValid())
-        Q_ASSERT(variant.canConvert(QVariant::String));
+        Q_ASSERT(variant.canConvert(QMetaType::QString));
     variant = model->data(model->index(0, 0), Qt::WhatsThisRole);
     if (variant.isValid())
-        Q_ASSERT(variant.canConvert(QVariant::String));
+        Q_ASSERT(variant.canConvert(QMetaType::QString));
 
     // General Purpose roles that should return a QSize
     variant = model->data(model->index(0, 0), Qt::SizeHintRole);
diff --git a/src/libs/utils/unarchiver.cpp b/src/libs/utils/unarchiver.cpp
index 84365654253..d9092e4ca95 100644
--- a/src/libs/utils/unarchiver.cpp
+++ b/src/libs/utils/unarchiver.cpp
@@ -43,6 +43,7 @@ static const QList<Tool> &sTools()
 {
     static QList<Tool> tools;
     if (tools.isEmpty()) {
+        // clang-format off
         if (HostOsInfo::isWindowsHost()) {
             tools << Tool{{"powershell", "-command Expand-Archive -Force '%{src}' '%{dest}'", CommandLine::Raw},
                           {"application/zip"},
@@ -74,6 +75,10 @@ static const QList<Tool> &sTools()
         tools << Tool{{"cmake", {"-E", "tar", "xvjf", "%{src}"}},
                       {"application/x-bzip-compressed-tar"},
                       additionalCMakeDirs};
+        // Keep this at the end so its only used as last resort. Otherwise it might be used for
+        // .tar.gz files.
+        tools << Tool{{"gzip", {"-d", "%{src}", "-c"}}, {"application/gzip"}, {}};
+        // clang-format on
     }
     return tools;
 }
@@ -147,6 +152,45 @@ void Unarchiver::start()
                                                  m_sourceAndCommand->m_sourceFile, m_destDir);
     m_destDir.ensureWritableDir();
 
+    if (command.executable().fileName() == "gzip") {
+        std::shared_ptr<QFile> outputFile = std::make_shared<QFile>(
+            (m_destDir / m_gzipFileDestName).toFSPathString());
+
+        if (!outputFile->open(QIODevice::WriteOnly)) {
+            emit outputReceived(Tr::tr("Failed to open output file."));
+            emit done(DoneResult::Error);
+            return;
+        }
+
+        m_process.reset(new Process);
+        QObject::connect(m_process.get(), &Process::readyReadStandardOutput, this, [this, outputFile] {
+            const QByteArray data = m_process->readAllRawStandardOutput();
+            if (outputFile->write(data) != data.size()) {
+                emit outputReceived(Tr::tr("Failed to write output file."));
+                emit done(DoneResult::Error);
+            }
+        });
+        QObject::connect(m_process.get(), &Process::readyReadStandardError, this, [this] {
+            emit outputReceived(m_process->readAllStandardError());
+        });
+        QObject::connect(m_process.get(), &Process::done, this, [outputFile, this] {
+            outputFile->close();
+            const bool success = m_process->result() == ProcessResult::FinishedWithSuccess;
+            if (!success) {
+                outputFile->remove();
+                emit outputReceived(Tr::tr("Command failed."));
+            }
+            emit done(toDoneResult(success));
+        });
+        emit outputReceived(
+            Tr::tr("Running %1\nin \"%2\".\n\n", "Running <cmd> in <workingdirectory>")
+                .arg(command.toUserOutput(), m_destDir.toUserOutput()));
+        m_process->setCommand(command);
+        m_process->setWorkingDirectory(m_destDir);
+        m_process->start();
+        return;
+    }
+
     m_process.reset(new Process);
     m_process->setProcessChannelMode(QProcess::MergedChannels);
     QObject::connect(m_process.get(), &Process::readyReadStandardOutput, this, [this] {
diff --git a/src/libs/utils/unarchiver.h b/src/libs/utils/unarchiver.h
index 61818318bb7..23fcad07a81 100644
--- a/src/libs/utils/unarchiver.h
+++ b/src/libs/utils/unarchiver.h
@@ -32,7 +32,10 @@ public:
 
     void setSourceAndCommand(const SourceAndCommand &data) { m_sourceAndCommand = data; }
     void setDestDir(const FilePath &destDir) { m_destDir = destDir; }
-
+    void setGZipFileDestName(const QString &gzipFileDestName)
+    {
+        m_gzipFileDestName = gzipFileDestName;
+    }
     void start();
 
 signals:
@@ -43,6 +46,7 @@ private:
     std::optional<SourceAndCommand> m_sourceAndCommand;
     FilePath m_destDir;
     std::unique_ptr<Process> m_process;
+    QString m_gzipFileDestName;
 };
 
 class QTCREATOR_UTILS_EXPORT UnarchiverTaskAdapter : public Tasking::TaskAdapter<Unarchiver>
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 4b7caf4805e..e73c9ef9230 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -77,6 +77,7 @@ QtcLibrary {
         "cpplanguage_details.h",
         "crumblepath.cpp",
         "crumblepath.h",
+        "datafromprocess.h",
         "delegates.cpp",
         "delegates.h",
         "detailsbutton.cpp",
@@ -184,6 +185,8 @@ QtcLibrary {
         "link.h",
         "listmodel.h",
         "listutils.h",
+        "lua.cpp",
+        "lua.h",
         "macroexpander.cpp",
         "macroexpander.h",
         "mathutils.cpp",
@@ -257,6 +260,7 @@ QtcLibrary {
         "qtcolorbutton.h",
         "qtcsettings.cpp",
         "qtcsettings.h",
+        "ranges.h",
         "reloadpromptutils.cpp",
         "reloadpromptutils.h",
         "removefiledialog.cpp",
@@ -372,8 +376,7 @@ QtcLibrary {
             "fsenginehandler.cpp",
             "fsenginehandler.h",
             "fsengine_impl.cpp",
-            "fsengine_impl.h",
-            "rootinjectfsengine.h",
+            "fsengine_impl.h"
         ]
     }
 
@@ -472,6 +475,6 @@ QtcLibrary {
     Export {
         Depends { name: "Qt"; submodules: ["concurrent", "widgets" ] }
         Depends { name: "Tasking" }
-        cpp.includePaths: "mimetypes2"
+        cpp.includePaths: exportingProduct.sourceDirectory + "/mimetypes2"
     }
 }
diff --git a/src/libs/utils/wizard.cpp b/src/libs/utils/wizard.cpp
index 10d801c5214..29bfb787a6a 100644
--- a/src/libs/utils/wizard.cpp
+++ b/src/libs/utils/wizard.cpp
@@ -45,7 +45,9 @@ public:
         m_indicatorPixmap(indicatorPixmap)
     {
         m_indicatorLabel = new QLabel(this);
-        m_indicatorLabel->setFixedSize(m_indicatorPixmap.size());
+        const QSizeF indicatorSize = m_indicatorPixmap.deviceIndependentSize();
+        m_indicatorLabel->setFixedSize(
+            {qCeil(indicatorSize.width()), qCeil(indicatorSize.height())});
         m_titleLabel = new QLabel(title, this);
         auto l = new QHBoxLayout(this);
         l->setContentsMargins(0, 0, 0, 0);
@@ -276,6 +278,7 @@ public:
     bool m_automaticProgressCreation = true;
     WizardProgress *m_wizardProgress = nullptr;
     QSet<QString> m_fieldNames;
+    bool m_skipForSubproject = false;
 };
 
 Wizard::Wizard(QWidget *parent, Qt::WindowFlags flags) :
@@ -365,8 +368,8 @@ QHash<QString, QVariant> Wizard::variables() const
 QString typeOf(const QVariant &v)
 {
     QString result;
-    switch (v.type()) {
-    case QVariant::Map:
+    switch (v.typeId()) {
+    case QMetaType::QVariantMap:
         result = QLatin1String("Object");
         break;
     default:
@@ -525,6 +528,32 @@ void Wizard::_q_pageRemoved(int pageId)
     d->m_wizardProgress->removeItem(item);
 }
 
+void Wizard::setSkipForSubprojects(bool skip)
+{
+    Q_D(Wizard);
+    d->m_skipForSubproject = skip;
+}
+
+int Wizard::nextId() const
+{
+    Q_D(const Wizard);
+    if (!d->m_skipForSubproject)
+        return QWizard::nextId();
+
+    const QList<int> allIds = pageIds();
+    int index = allIds.indexOf(currentId());
+    QTC_ASSERT(index > -1, return QWizard::nextId());
+
+    while (++index < allIds.size()) {
+        if (auto wp = qobject_cast<WizardPage *>(page(index))) {
+            if (!wp->skipForSubprojects())
+                return index;
+        }
+    }
+    QTC_CHECK(false); // should not happen
+    return QWizard::nextId();
+}
+
 class WizardProgressPrivate
 {
     WizardProgress *q_ptr;
diff --git a/src/libs/utils/wizard.h b/src/libs/utils/wizard.h
index 35abff2f6d7..ac3ad795bf6 100644
--- a/src/libs/utils/wizard.h
+++ b/src/libs/utils/wizard.h
@@ -50,6 +50,10 @@ public:
 
     void showVariables();
 
+    // allows to skip pages
+    void setSkipForSubprojects(bool skip);
+    int nextId() const override;
+
 protected:
     virtual QString stringify(const QVariant &v) const;
     virtual QString evaluate(const QVariant &v) const;
diff --git a/src/libs/utils/wizardpage.h b/src/libs/utils/wizardpage.h
index 76d3039a673..1ab23f92b5a 100644
--- a/src/libs/utils/wizardpage.h
+++ b/src/libs/utils/wizardpage.h
@@ -74,6 +74,9 @@ public:
     void registerFieldWithName(const QString &name, QWidget *widget,
                                const char *property = nullptr, const char *changedSignal = nullptr);
 
+    void setSkipForSubprojects(bool skip) { m_skipForSubproject = skip; }
+    bool skipForSubprojects() const { return m_skipForSubproject; }
+
     virtual bool handleReject();
     virtual bool handleAccept();
 
@@ -85,6 +88,7 @@ private:
     void registerFieldName(const QString &name);
 
     QSet<QString> m_toRegister;
+    bool m_skipForSubproject = false;
 };
 
 } // namespace Utils
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 04466fed257..423b17d9284 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -2,6 +2,7 @@
 add_subdirectory(coreplugin)
 
 # Level 1: (only depends of Level 0)
+add_subdirectory(lua)
 add_subdirectory(texteditor)
 add_subdirectory(serialterminal)
 add_subdirectory(extensionmanager)
@@ -47,7 +48,6 @@ add_subdirectory(autotoolsprojectmanager)
 add_subdirectory(bazaar)
 add_subdirectory(beautifier)
 add_subdirectory(clearcase)
-add_subdirectory(cmakeprojectmanager)
 add_subdirectory(cvs)
 add_subdirectory(designer)
 add_subdirectory(docker)
@@ -79,6 +79,7 @@ if (WITH_QMLDESIGNER)
 endif()
 add_subdirectory(python)
 add_subdirectory(clangformat)
+add_subdirectory(cmakeprojectmanager)
 
 # Level 7:
 add_subdirectory(android)
@@ -98,6 +99,7 @@ add_subdirectory(perfprofiler)
 add_subdirectory(qbsprojectmanager)
 add_subdirectory(ctfvisualizer)
 add_subdirectory(squish)
+add_subdirectory(appstatisticsmonitor)
 
 # Level 8:
 add_subdirectory(boot2qt)
@@ -117,4 +119,3 @@ endif()
 add_subdirectory(qnx)
 add_subdirectory(mcusupport)
 add_subdirectory(qtapplicationmanager)
-
diff --git a/src/plugins/android/Android.json.in b/src/plugins/android/Android.json.in
index 7a020c5061f..92d62903a58 100644
--- a/src/plugins/android/Android.json.in
+++ b/src/plugins/android/Android.json.in
@@ -13,8 +13,14 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Device Support",
-    "Description" : "Support for deployment to and execution on Android Devices.",
-    "Url" : "http://necessitas.kde.org",
+    "Description" : "Develop applications for Android devices.",
+    "LongDescription" : [
+        "Connect devices with USB to run, debug, and analyze applications built for them.",
+        "You also need:",
+            "- Qt for Android",
+            "- Android development tools"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
 
     "Mimetypes" : [
diff --git a/src/plugins/android/CMakeLists.txt b/src/plugins/android/CMakeLists.txt
index e51a840e632..619484a2b53 100644
--- a/src/plugins/android/CMakeLists.txt
+++ b/src/plugins/android/CMakeLists.txt
@@ -34,7 +34,7 @@ add_qtc_plugin(Android
     androidrunnerworker.cpp androidrunnerworker.h
     androidsdkdownloader.cpp androidsdkdownloader.h
     androidsdkmanager.cpp androidsdkmanager.h
-    androidsdkmanagerwidget.cpp androidsdkmanagerwidget.h
+    androidsdkmanagerdialog.cpp androidsdkmanagerdialog.h
     androidsdkmodel.cpp androidsdkmodel.h
     androidsdkpackage.cpp androidsdkpackage.h
     androidsettingswidget.cpp androidsettingswidget.h
diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs
index e1bcc9e0ce2..f7f558f5434 100644
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -73,8 +73,8 @@ QtcPlugin {
         "androidsdkdownloader.h",
         "androidsdkmanager.cpp",
         "androidsdkmanager.h",
-        "androidsdkmanagerwidget.cpp",
-        "androidsdkmanagerwidget.h",
+        "androidsdkmanagerdialog.cpp",
+        "androidsdkmanagerdialog.h",
         "androidsdkmodel.cpp",
         "androidsdkmodel.h",
         "androidsdkpackage.cpp",
diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp
index c37daf43b89..d05c4e0bb51 100644
--- a/src/plugins/android/androidavdmanager.cpp
+++ b/src/plugins/android/androidavdmanager.cpp
@@ -2,212 +2,28 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "androidavdmanager.h"
+#include "androidconfigurations.h"
 #include "androidtr.h"
-#include "avdmanageroutputparser.h"
 
 #include <coreplugin/icore.h>
 
-#include <projectexplorer/projectexplorerconstants.h>
-
-#include <utils/algorithm.h>
-#include <utils/async.h>
 #include <utils/qtcprocess.h>
-#include <utils/qtcassert.h>
 
 #include <QLoggingCategory>
 #include <QMainWindow>
 #include <QMessageBox>
 
-#include <chrono>
-
 using namespace Utils;
-using namespace std;
 using namespace std::chrono_literals;
 
-namespace Android::Internal {
-
-const int avdCreateTimeoutMs = 30000;
+namespace Android::Internal::AndroidAvdManager {
 
 static Q_LOGGING_CATEGORY(avdManagerLog, "qtc.android.avdManager", QtWarningMsg)
 
-/*!
-    Runs the \c avdmanager tool specific to configuration \a config with arguments \a args. Returns
-    \c true if the command is successfully executed. Output is copied into \a output. The function
-    blocks the calling thread.
- */
-bool AndroidAvdManager::avdManagerCommand(const QStringList &args, QString *output)
-{
-    CommandLine cmd(androidConfig().avdManagerToolPath(), args);
-    Process proc;
-    proc.setEnvironment(androidConfig().toolsEnvironment());
-    qCDebug(avdManagerLog).noquote() << "Running AVD Manager command:" << cmd.toUserOutput();
-    proc.setCommand(cmd);
-    proc.runBlocking();
-    if (proc.result() == ProcessResult::FinishedWithSuccess) {
-        if (output)
-            *output = proc.allOutput();
-        return true;
-    }
-    return false;
-}
-
-static bool checkForTimeout(const chrono::steady_clock::time_point &start,
-                            int msecs = 3000)
-{
-    bool timedOut = false;
-    auto end = chrono::steady_clock::now();
-    if (chrono::duration_cast<chrono::milliseconds>(end-start).count() > msecs)
-        timedOut = true;
-    return timedOut;
-}
-
-static CreateAvdInfo createAvdCommand(const CreateAvdInfo &info)
-{
-    CreateAvdInfo result = info;
-
-    if (!result.isValid()) {
-        qCDebug(avdManagerLog) << "AVD Create failed. Invalid CreateAvdInfo" << result.name
-                               << result.systemImage->displayText() << result.systemImage->apiLevel();
-        result.error = Tr::tr("Cannot create AVD. Invalid input.");
-        return result;
-    }
-
-    CommandLine avdManager(androidConfig().avdManagerToolPath(), {"create", "avd", "-n", result.name});
-    avdManager.addArgs({"-k", result.systemImage->sdkStylePath()});
-
-    if (result.sdcardSize > 0)
-        avdManager.addArgs({"-c", QString("%1M").arg(result.sdcardSize)});
-
-    if (!result.deviceDefinition.isEmpty() && result.deviceDefinition != "Custom")
-        avdManager.addArgs({"-d", QString("%1").arg(result.deviceDefinition)});
-
-    if (result.overwrite)
-        avdManager.addArg("-f");
-
-    qCDebug(avdManagerLog).noquote() << "Running AVD Manager command:" << avdManager.toUserOutput();
-    Process proc;
-    proc.setProcessMode(ProcessMode::Writer);
-    proc.setEnvironment(androidConfig().toolsEnvironment());
-    proc.setCommand(avdManager);
-    proc.start();
-    if (!proc.waitForStarted()) {
-        result.error = Tr::tr("Could not start process \"%1\".").arg(avdManager.toUserOutput());
-        return result;
-    }
-    QTC_CHECK(proc.isRunning());
-    proc.write("yes\n"); // yes to "Do you wish to create a custom hardware profile"
-
-    auto start = chrono::steady_clock::now();
-    QString errorOutput;
-    QByteArray question;
-    while (errorOutput.isEmpty()) {
-        proc.waitForReadyRead(500ms);
-        question += proc.readAllRawStandardOutput();
-        if (question.endsWith(QByteArray("]:"))) {
-            // truncate to last line
-            int index = question.lastIndexOf(QByteArray("\n"));
-            if (index != -1)
-                question = question.mid(index);
-            if (question.contains("hw.gpu.enabled"))
-                proc.write("yes\n");
-            else
-                proc.write("\n");
-            question.clear();
-        }
-        // The exit code is always 0, so we need to check stderr
-        // For now assume that any output at all indicates a error
-        errorOutput = QString::fromLocal8Bit(proc.readAllRawStandardError());
-        if (!proc.isRunning())
-            break;
-
-        // For a sane input and command, process should finish before timeout.
-        if (checkForTimeout(start, avdCreateTimeoutMs))
-            result.error = Tr::tr("Cannot create AVD. Command timed out.");
-    }
-
-    result.error = errorOutput;
-    return result;
-}
-
-AndroidAvdManager::AndroidAvdManager() = default;
-
-AndroidAvdManager::~AndroidAvdManager() = default;
-
-QFuture<CreateAvdInfo> AndroidAvdManager::createAvd(CreateAvdInfo info) const
-{
-    return Utils::asyncRun(&createAvdCommand, info);
-}
-
-static void avdConfigEditManufacturerTag(const FilePath &avdPath, bool recoverMode = false)
-{
-    if (!avdPath.exists())
-        return;
-
-    const FilePath configFilePath = avdPath / "config.ini";
-    FileReader reader;
-    if (!reader.fetch(configFilePath, QIODevice::ReadOnly | QIODevice::Text))
-        return;
-
-    FileSaver saver(configFilePath);
-    QTextStream textStream(reader.data());
-    while (!textStream.atEnd()) {
-        QString line = textStream.readLine();
-        if (line.contains("hw.device.manufacturer")) {
-            if (recoverMode)
-                line.replace("#", "");
-            else
-                line.prepend("#");
-        }
-        line.append("\n");
-        saver.write(line.toUtf8());
-    }
-    saver.finalize();
-}
-
-static AndroidDeviceInfoList listVirtualDevices()
-{
-    QString output;
-    AndroidDeviceInfoList avdList;
-    /*
-        Currenly avdmanager tool fails to parse some AVDs because the correct
-        device definitions at devices.xml does not have some of the newest devices.
-        Particularly, failing because of tag "hw.device.manufacturer", thus removing
-        it would make paring successful. However, it has to be returned afterwards,
-        otherwise, Android Studio would give an error during parsing also. So this fix
-        aim to keep support for Qt Creator and Android Studio.
-    */
-    FilePaths allAvdErrorPaths;
-    FilePaths avdErrorPaths;
-
-    do {
-        if (!AndroidAvdManager::avdManagerCommand({"list", "avd"}, &output)) {
-            qCDebug(avdManagerLog)
-                << "Avd list command failed" << output << androidConfig().sdkToolsVersion();
-            return {};
-        }
-
-        avdErrorPaths.clear();
-        avdList = parseAvdList(output, &avdErrorPaths);
-        allAvdErrorPaths << avdErrorPaths;
-        for (const FilePath &avdPath : std::as_const(avdErrorPaths))
-            avdConfigEditManufacturerTag(avdPath); // comment out manufacturer tag
-    } while (!avdErrorPaths.isEmpty());            // try again
-
-    for (const FilePath &avdPath : std::as_const(allAvdErrorPaths))
-        avdConfigEditManufacturerTag(avdPath, true); // re-add manufacturer tag
-
-    return avdList;
-}
-
-QFuture<AndroidDeviceInfoList> AndroidAvdManager::avdList() const
-{
-    return Utils::asyncRun(listVirtualDevices);
-}
-
-QString AndroidAvdManager::startAvd(const QString &name) const
+QString startAvd(const QString &name, const std::optional<QFuture<void>> &future)
 {
     if (!findAvd(name).isEmpty() || startAvdAsync(name))
-        return waitForAvd(name);
+        return waitForAvd(name, future);
     return {};
 }
 
@@ -227,64 +43,70 @@ static bool is32BitUserSpace()
     return false;
 }
 
-bool AndroidAvdManager::startAvdAsync(const QString &avdName) const
+bool startAvdAsync(const QString &avdName)
 {
-    const FilePath emulator = androidConfig().emulatorToolPath();
-    if (!emulator.exists()) {
-        QMetaObject::invokeMethod(Core::ICore::mainWindow(), [emulator] {
+    const FilePath emulatorPath = AndroidConfig::emulatorToolPath();
+    if (!emulatorPath.exists()) {
+        QMetaObject::invokeMethod(Core::ICore::mainWindow(), [emulatorPath] {
             QMessageBox::critical(Core::ICore::dialogParent(),
                                   Tr::tr("Emulator Tool Is Missing"),
                                   Tr::tr("Install the missing emulator tool (%1) to the"
                                          " installed Android SDK.")
-                                  .arg(emulator.displayName()));
+                                  .arg(emulatorPath.displayName()));
         });
         return false;
     }
 
-    // TODO: Here we are potentially leaking Process instance in case when shutdown happens
-    // after the avdProcess has started and before it has finished. Giving a parent object here
-    // should solve the issue. However, AndroidAvdManager is not a QObject, so no clue what parent
-    // would be the most appropriate. Preferably some object taken form android plugin...
-    Process *avdProcess = new Process;
-    avdProcess->setProcessChannelMode(QProcess::MergedChannels);
-    QObject::connect(avdProcess, &Process::done, avdProcess, [avdProcess] {
-        if (avdProcess->exitCode()) {
-            const QString errorOutput = QString::fromLatin1(avdProcess->rawStdOut());
-            QMetaObject::invokeMethod(Core::ICore::mainWindow(), [errorOutput] {
-                const QString title = Tr::tr("AVD Start Error");
-                QMessageBox::critical(Core::ICore::dialogParent(), title, errorOutput);
-            });
-        }
-        avdProcess->deleteLater();
-    });
-
-    // start the emulator
-    CommandLine cmd(androidConfig().emulatorToolPath());
+    CommandLine cmd(emulatorPath);
     if (is32BitUserSpace())
         cmd.addArg("-force-32bit");
-
-    cmd.addArgs(androidConfig().emulatorArgs(), CommandLine::Raw);
+    cmd.addArgs(AndroidConfig::emulatorArgs(), CommandLine::Raw);
     cmd.addArgs({"-avd", avdName});
     qCDebug(avdManagerLog).noquote() << "Running command (startAvdAsync):" << cmd.toUserOutput();
-    avdProcess->setCommand(cmd);
-    avdProcess->start();
-    return avdProcess->waitForStarted(QDeadlineTimer::Forever);
+    if (Process::startDetached(cmd, {}, DetachedChannelMode::Discard))
+        return true;
+
+    QMetaObject::invokeMethod(Core::ICore::mainWindow(), [avdName] {
+        QMessageBox::critical(Core::ICore::dialogParent(), Tr::tr("AVD Start Error"),
+                              Tr::tr("Failed to start AVD emulator for \"%1\" device.").arg(avdName));
+    });
+    return false;
 }
 
-QString AndroidAvdManager::findAvd(const QString &avdName) const
+QString findAvd(const QString &avdName)
 {
-    const QVector<AndroidDeviceInfo> devices = androidConfig().connectedDevices();
-    for (const AndroidDeviceInfo &device : devices) {
-        if (device.type != ProjectExplorer::IDevice::Emulator)
+    const QStringList lines = AndroidConfig::devicesCommandOutput();
+    for (const QString &line : lines) {
+        // skip the daemon logs
+        if (line.startsWith("* daemon"))
             continue;
-        if (device.avdName == avdName)
-            return device.serialNumber;
+
+        const QString serialNumber = line.left(line.indexOf('\t')).trimmed();
+        if (!serialNumber.startsWith("emulator"))
+            continue;
+
+        if (AndroidConfig::getAvdName(serialNumber) == avdName)
+            return serialNumber;
     }
     return {};
 }
 
-QString AndroidAvdManager::waitForAvd(const QString &avdName,
-                                      const std::optional<QFuture<void>> &future) const
+static bool waitForBooted(const QString &serialNumber, const std::optional<QFuture<void>> &future)
+{
+    // found a serial number, now wait until it's done booting...
+    for (int i = 0; i < 60; ++i) {
+        if (future && future->isCanceled())
+            return false;
+        if (isAvdBooted(serialNumber))
+            return true;
+        QThread::sleep(2);
+        if (!AndroidConfig::isConnected(serialNumber)) // device was disconnected
+            return false;
+    }
+    return false;
+}
+
+QString waitForAvd(const QString &avdName, const std::optional<QFuture<void>> &future)
 {
     // we cannot use adb -e wait-for-device, since that doesn't work if a emulator is already running
     // 60 rounds of 2s sleeping, two minutes for the avd to start
@@ -300,36 +122,17 @@ QString AndroidAvdManager::waitForAvd(const QString &avdName,
     return {};
 }
 
-bool AndroidAvdManager::isAvdBooted(const QString &device) const
+bool isAvdBooted(const QString &device)
 {
-    QStringList arguments = AndroidDeviceInfo::adbSelector(device);
-    arguments << "shell" << "getprop" << "init.svc.bootanim";
-
-    const CommandLine command({androidConfig().adbToolPath(), arguments});
-    qCDebug(avdManagerLog).noquote() << "Running command (isAvdBooted):" << command.toUserOutput();
+    const CommandLine cmd{AndroidConfig::adbToolPath(), {AndroidDeviceInfo::adbSelector(device),
+                          "shell", "getprop", "init.svc.bootanim"}};
+    qCDebug(avdManagerLog).noquote() << "Running command (isAvdBooted):" << cmd.toUserOutput();
     Process adbProc;
-    adbProc.setCommand(command);
+    adbProc.setCommand(cmd);
     adbProc.runBlocking();
     if (adbProc.result() != ProcessResult::FinishedWithSuccess)
         return false;
-    QString value = adbProc.allOutput().trimmed();
-    return value == "stopped";
+    return adbProc.allOutput().trimmed() == "stopped";
 }
 
-bool AndroidAvdManager::waitForBooted(const QString &serialNumber,
-                                      const std::optional<QFuture<void>> &future) const
-{
-    // found a serial number, now wait until it's done booting...
-    for (int i = 0; i < 60; ++i) {
-        if (future && future->isCanceled())
-            return false;
-        if (isAvdBooted(serialNumber))
-            return true;
-        QThread::sleep(2);
-        if (!androidConfig().isConnected(serialNumber)) // device was disconnected
-            return false;
-    }
-    return false;
-}
-
-} // Android::Internal
+} // namespace Android::Internal::AndroidAvdManager
diff --git a/src/plugins/android/androidavdmanager.h b/src/plugins/android/androidavdmanager.h
index 4cf9a8d81d3..7f1b094bdd2 100644
--- a/src/plugins/android/androidavdmanager.h
+++ b/src/plugins/android/androidavdmanager.h
@@ -2,32 +2,16 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 #pragma once
 
-#include "androidconfigurations.h"
-
 #include <QFuture>
 
 #include <optional>
 
-namespace Android::Internal {
+namespace Android::Internal::AndroidAvdManager {
 
-class AndroidAvdManager
-{
-public:
-    AndroidAvdManager();
-    ~AndroidAvdManager();
+QString startAvd(const QString &name, const std::optional<QFuture<void>> &future = {});
+bool startAvdAsync(const QString &avdName);
+QString findAvd(const QString &avdName);
+QString waitForAvd(const QString &avdName, const std::optional<QFuture<void>> &future = {});
+bool isAvdBooted(const QString &device);
 
-    QFuture<CreateAvdInfo> createAvd(CreateAvdInfo info) const;
-    QFuture<AndroidDeviceInfoList> avdList() const;
-
-    QString startAvd(const QString &name) const;
-    bool startAvdAsync(const QString &avdName) const;
-    QString findAvd(const QString &avdName) const;
-    QString waitForAvd(const QString &avdName, const std::optional<QFuture<void>> &future = {}) const;
-    bool isAvdBooted(const QString &device) const;
-    static bool avdManagerCommand(const QStringList &args, QString *output);
-
-private:
-    bool waitForBooted(const QString &serialNumber, const std::optional<QFuture<void>> &future = {}) const;
-};
-
-} // Android::Internal
+} // namespace Android::Internal::AndroidAvdManager
diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp
index b9857f183ba..3ad6a4ba849 100644
--- a/src/plugins/android/androidbuildapkstep.cpp
+++ b/src/plugins/android/androidbuildapkstep.cpp
@@ -140,7 +140,7 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step)
     keystoreLocationChooser->setPromptDialogFilter(Tr::tr("Keystore files (*.keystore *.jks)"));
     keystoreLocationChooser->setPromptDialogTitle(Tr::tr("Select Keystore File"));
     connect(keystoreLocationChooser, &PathChooser::textChanged, this, [this, keystoreLocationChooser] {
-        const FilePath file = keystoreLocationChooser->rawFilePath();
+        const FilePath file = keystoreLocationChooser->unexpandedFilePath();
         m_step->setKeystorePath(file);
         m_signPackageCheckBox->setChecked(!file.isEmpty());
         if (!file.isEmpty())
@@ -415,7 +415,7 @@ bool AndroidBuildApkWidget::isOpenSslLibsIncluded()
 
 QString AndroidBuildApkWidget::openSslIncludeFileContent(const FilePath &projectPath)
 {
-    QString openSslPath = androidConfig().openSslLocation().toString();
+    QString openSslPath = AndroidConfig::openSslLocation().toString();
     if (projectPath.endsWith(".pro"))
         return "android: include(" + openSslPath + "/openssl.pri)";
     if (projectPath.endsWith("CMakeLists.txt"))
@@ -495,7 +495,7 @@ bool AndroidBuildApkStep::init()
         return false;
     }
 
-    if (version->qtVersion() < QVersionNumber(5, 4, 0)) {
+    if (version->qtVersion() < AndroidManager::firstQtWithAndroidDeployQt) {
         const QString error = Tr::tr("The minimum Qt version required for Gradle build to work is %1. "
                                      "It is recommended to install the latest Qt version.")
                 .arg("5.4.0");
@@ -541,7 +541,7 @@ bool AndroidBuildApkStep::init()
     QStringList arguments = {"--input", m_inputFile.path(),
                              "--output", outputDir.path(),
                              "--android-platform", m_buildTargetSdk,
-                             "--jdk", androidConfig().openJDKLocation().path()};
+                             "--jdk", AndroidConfig::openJDKLocation().path()};
 
     if (verboseOutput())
         arguments << "--verbose";
@@ -929,17 +929,16 @@ QVariant AndroidBuildApkStep::data(Utils::Id id) const
 {
     if (id == Constants::AndroidNdkPlatform) {
         if (auto qtVersion = QtKitAspect::qtVersion(kit()))
-            return androidConfig()
-                .bestNdkPlatformMatch(AndroidManager::minimumSDK(target()), qtVersion);
+            return AndroidConfig::bestNdkPlatformMatch(AndroidManager::minimumSDK(target()), qtVersion);
         return {};
     }
     if (id == Constants::NdkLocation) {
         if (auto qtVersion = QtKitAspect::qtVersion(kit()))
-            return QVariant::fromValue(androidConfig().ndkLocation(qtVersion));
+            return QVariant::fromValue(AndroidConfig::ndkLocation(qtVersion));
         return {};
     }
     if (id == Constants::SdkLocation)
-        return QVariant::fromValue(androidConfig().sdkLocation());
+        return QVariant::fromValue(AndroidConfig::sdkLocation());
 
     if (id == Constants::AndroidMkSpecAbis)
         return AndroidManager::applicationAbis(target());
@@ -1000,7 +999,7 @@ QAbstractItemModel *AndroidBuildApkStep::keystoreCertificates()
         "-storepass", m_keystorePasswd, "-J-Duser.language=en"};
 
     Process keytoolProc;
-    keytoolProc.setCommand({androidConfig().keytoolPath(), params});
+    keytoolProc.setCommand({AndroidConfig::keytoolPath(), params});
     using namespace std::chrono_literals;
     keytoolProc.runBlocking(30s);
     if (keytoolProc.result() > ProcessResult::FinishedWithError)
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 4108106a2ea..feadec6111e 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -59,8 +59,8 @@
 #   include <QTest>
 #endif // WITH_TESTS
 
-using namespace QtSupport;
 using namespace ProjectExplorer;
+using namespace QtSupport;
 using namespace Utils;
 
 namespace {
@@ -141,27 +141,19 @@ static QString buildToolsPackageMarker()
     return QLatin1String(Constants::buildToolsPackageName) + ";";
 }
 
-//////////////////////////////////
-// AndroidConfig
-//////////////////////////////////
-
-QLatin1String AndroidConfig::toolchainPrefix(const Abi &abi)
+static QString getDeviceProperty(const QString &device, const QString &property)
 {
-    switch (abi.architecture()) {
-    case Abi::ArmArchitecture:
-        if (abi.wordWidth() == 64)
-            return AArch64ToolchainPrefix;
-        return ArmToolchainPrefix;
-    case Abi::X86Architecture:
-        if (abi.wordWidth() == 64)
-            return X86_64ToolchainPrefix;
-        return X86ToolchainPrefix;
-    default:
-        return Unknown;
-    }
+    // workaround for '????????????' serial numbers
+    Process adbProc;
+    adbProc.setCommand({AndroidConfig::adbToolPath(),
+                        {AndroidDeviceInfo::adbSelector(device), "shell", "getprop", property}});
+    adbProc.runBlocking();
+    if (adbProc.result() == ProcessResult::FinishedWithSuccess)
+        return adbProc.allOutput();
+    return {};
 }
 
-QLatin1String AndroidConfig::toolsPrefix(const Abi &abi)
+static QLatin1String toolsPrefix(const Abi &abi)
 {
     switch (abi.architecture()) {
     case Abi::ArmArchitecture:
@@ -177,7 +169,149 @@ QLatin1String AndroidConfig::toolsPrefix(const Abi &abi)
     }
 }
 
-QLatin1String AndroidConfig::displayName(const Abi &abi)
+static QLatin1String toolchainPrefix(const Abi &abi)
+{
+    switch (abi.architecture()) {
+    case Abi::ArmArchitecture:
+        if (abi.wordWidth() == 64)
+            return AArch64ToolchainPrefix;
+        return ArmToolchainPrefix;
+    case Abi::X86Architecture:
+        if (abi.wordWidth() == 64)
+            return X86_64ToolchainPrefix;
+        return X86ToolchainPrefix;
+    default:
+        return Unknown;
+    }
+}
+
+static FilePath gdbPathFromNdk(const Abi &abi, const FilePath &ndkLocation)
+{
+    const FilePath path = ndkLocation.pathAppended(
+        QString("prebuilt/%1/bin/gdb%2").arg(AndroidConfig::toolchainHostFromNdk(ndkLocation),
+                                             QString(QTC_HOST_EXE_SUFFIX)));
+    if (path.exists())
+        return path;
+    // fallback for old NDKs (e.g. 10e)
+    return ndkLocation.pathAppended(QString("toolchains/%1-4.9/prebuilt/%2/bin/%3-gdb%4")
+                                        .arg(toolchainPrefix(abi),
+                                             AndroidConfig::toolchainHostFromNdk(ndkLocation),
+                                             toolsPrefix(abi),
+                                             QString(QTC_HOST_EXE_SUFFIX)));
+}
+
+static FilePath lldbPathFromNdk(const FilePath &ndkLocation)
+{
+    const FilePath path = ndkLocation.pathAppended(
+        QString("toolchains/llvm/prebuilt/%1/bin/lldb%2")
+            .arg(AndroidConfig::toolchainHostFromNdk(ndkLocation), QString(QTC_HOST_EXE_SUFFIX)));
+    return path.exists() ? path : FilePath();
+}
+
+namespace AndroidConfig {
+
+struct SdkForQtVersions
+{
+    QList<QVersionNumber> versions;
+    QStringList essentialPackages;
+
+    bool containsVersion(const QVersionNumber &qtVersion) const
+    {
+        return versions.contains(qtVersion)
+               || versions.contains(QVersionNumber(qtVersion.majorVersion(),
+                                                   qtVersion.minorVersion()));
+    }
+};
+
+struct AndroidConfigData
+{
+    void load(const QtcSettings &settings);
+    void save(QtcSettings &settings) const;
+    void parseDependenciesJson();
+
+    FilePath m_sdkLocation;
+    FilePath m_temporarySdkToolsPath;
+    QStringList m_sdkManagerToolArgs;
+    FilePath m_openJDKLocation;
+    FilePath m_keystoreLocation;
+    FilePath m_openSslLocation;
+    QString m_emulatorArgs;
+    bool m_automaticKitCreation = true;
+    QUrl m_sdkToolsUrl;
+    QByteArray m_sdkToolsSha256;
+    QStringList m_commonEssentialPkgs;
+    SdkForQtVersions m_defaultSdkDepends;
+    QList<SdkForQtVersions> m_specificQtVersions;
+    QStringList m_customNdkList;
+    FilePath m_defaultNdk;
+    bool m_sdkFullyConfigured = false;
+    QHash<QString, QString> m_serialNumberToDeviceName; // cache
+};
+
+static AndroidConfigData &config()
+{
+    static AndroidConfigData theAndroidConfig;
+    return theAndroidConfig;
+}
+
+static FilePath ndkSubPath(const SdkForQtVersions &packages)
+{
+    const QString ndkPrefix = ndkPackageMarker();
+    for (const QString &package : packages.essentialPackages)
+        if (package.startsWith(ndkPrefix))
+            return FilePath::fromString(NdksSubDir) / package.sliced(ndkPrefix.length());
+
+    return {};
+}
+
+static FilePath ndkSubPathFromQtVersion(const QtVersion &version)
+{
+    if (auto androidQtVersion = dynamic_cast<const AndroidQtVersion *>(&version)) {
+        bool ok;
+        const AndroidQtVersion::BuiltWith bw = androidQtVersion->builtWith(&ok);
+        if (ok)
+            return FilePath::fromString(NdksSubDir) / bw.ndkVersion.toString();
+    }
+
+    for (const SdkForQtVersions &item : config().m_specificQtVersions) {
+        if (item.containsVersion(version.qtVersion()))
+            return ndkSubPath(item);
+    }
+    return ndkSubPath(config().m_defaultSdkDepends);
+}
+
+//////////////////////////////////
+// AndroidConfig
+//////////////////////////////////
+
+QString getAvdName(const QString &serialnumber)
+{
+    const int index = serialnumber.indexOf(QLatin1String("-"));
+    if (index == -1)
+        return {};
+    bool ok;
+    const int port = serialnumber.mid(index + 1).toInt(&ok);
+    if (!ok)
+        return {};
+
+    QTcpSocket tcpSocket;
+    tcpSocket.connectToHost(QHostAddress(QHostAddress::LocalHost), port);
+    if (!tcpSocket.waitForConnected(100)) // Don't wait more than 100ms for a local connection
+        return {};
+
+    tcpSocket.write("avd name\nexit\n");
+    tcpSocket.waitForDisconnected(500);
+
+    const QByteArrayList response = tcpSocket.readAll().split('\n');
+    // The input "avd name" might not be echoed as-is, but contain ASCII control sequences.
+    for (int i = response.size() - 1; i > 1; --i) {
+        if (response.at(i).startsWith("OK"))
+            return QString::fromLatin1(response.at(i - 1)).trimmed();
+    }
+    return {};
+}
+
+QLatin1String displayName(const Abi &abi)
 {
     switch (abi.architecture()) {
     case Abi::ArmArchitecture:
@@ -193,11 +327,11 @@ QLatin1String AndroidConfig::displayName(const Abi &abi)
     }
 }
 
-void AndroidConfig::load(const QtcSettings &settings)
+void AndroidConfigData::load(const QtcSettings &settings)
 {
     // user settings
     QVariant emulatorArgs = settings.value(EmulatorArgsKey, QString("-netdelay none -netspeed full"));
-    if (emulatorArgs.typeId() == QVariant::StringList) // Changed in 8.0 from QStringList to QString.
+    if (emulatorArgs.typeId() == QMetaType::QStringList) // Changed in 8.0 from QStringList to QString.
         emulatorArgs = ProcessArgs::joinArgs(emulatorArgs.toStringList());
     m_emulatorArgs = emulatorArgs.toString();
     m_sdkLocation = FilePath::fromUserInput(settings.value(SDKLocationKey).toString()).cleanPath();
@@ -224,7 +358,7 @@ void AndroidConfig::load(const QtcSettings &settings)
         // persistent settings
     }
     m_customNdkList.removeAll("");
-    if (!m_defaultNdk.isEmpty() && ndkVersion(m_defaultNdk).isNull()) {
+    if (!m_defaultNdk.isEmpty() && AndroidConfig::ndkVersion(m_defaultNdk).isNull()) {
         if (avdConfigLog().isDebugEnabled())
             qCDebug(avdConfigLog).noquote() << "Clearing invalid default NDK setting:"
                                             << m_defaultNdk.toUserOutput();
@@ -233,7 +367,7 @@ void AndroidConfig::load(const QtcSettings &settings)
     parseDependenciesJson();
 }
 
-void AndroidConfig::save(QtcSettings &settings) const
+void AndroidConfigData::save(QtcSettings &settings) const
 {
     QFileInfo fileInfo(sdkSettingsFileName());
     if (fileInfo.exists())
@@ -251,7 +385,7 @@ void AndroidConfig::save(QtcSettings &settings) const
     settings.setValue(SdkFullyConfiguredKey, m_sdkFullyConfigured);
 }
 
-void AndroidConfig::parseDependenciesJson()
+void AndroidConfigData::parseDependenciesJson()
 {
     const FilePath sdkConfigUserFile = Core::ICore::userResourcePath(JsonFilePath);
     const FilePath sdkConfigFile = Core::ICore::resourcePath(JsonFilePath);
@@ -368,7 +502,7 @@ static QList<int> availableNdkPlatformsV21Plus(const FilePath &ndkLocation, cons
     if (abis.isEmpty())
         return {};
 
-    const QString abi = AndroidConfig::toolsPrefix(abis.first());
+    const QString abi = toolsPrefix(abis.first());
     const FilePath libPath =
             AndroidConfig::toolchainPathFromNdk(ndkLocation, hostOs) / "sysroot/usr/lib" / abi;
     const FilePaths dirEntries = libPath.dirEntries(QDir::Dirs | QDir::NoDotAndDotDot);
@@ -389,125 +523,90 @@ static QList<int> availableNdkPlatformsImpl(const FilePath &ndkLocation, const A
     return Utils::sorted(std::move(result), std::greater<>());
 }
 
-QList<int> AndroidConfig::availableNdkPlatforms(const QtVersion *qtVersion) const
+static QList<int> availableNdkPlatforms(const QtVersion *qtVersion)
 {
-    return availableNdkPlatformsImpl(ndkLocation(qtVersion), qtVersion->qtAbis(),
+    return availableNdkPlatformsImpl(AndroidConfig::ndkLocation(qtVersion), qtVersion->qtAbis(),
                                      HostOsInfo::hostOs());
 }
 
-QStringList AndroidConfig::getCustomNdkList() const
+QStringList getCustomNdkList() { return config().m_customNdkList; }
+
+void addCustomNdk(const QString &customNdk)
 {
-    return m_customNdkList;
+    if (!config().m_customNdkList.contains(customNdk))
+        config().m_customNdkList.append(customNdk);
 }
 
-void AndroidConfig::addCustomNdk(const QString &customNdk)
+void removeCustomNdk(const QString &customNdk)
 {
-    if (!m_customNdkList.contains(customNdk))
-        m_customNdkList.append(customNdk);
+    config().m_customNdkList.removeAll(customNdk);
 }
 
-void AndroidConfig::removeCustomNdk(const QString &customNdk)
+void setDefaultNdk(const FilePath &defaultNdk) { config().m_defaultNdk = defaultNdk; }
+
+FilePath defaultNdk() { return config().m_defaultNdk; }
+
+FilePath openSslLocation() { return config().m_openSslLocation; }
+
+void setOpenSslLocation(const FilePath &openSslLocation)
 {
-    m_customNdkList.removeAll(customNdk);
+    config().m_openSslLocation = openSslLocation;
 }
 
-void AndroidConfig::setDefaultNdk(const Utils::FilePath &defaultNdk)
-{
-    m_defaultNdk = defaultNdk;
-}
-
-FilePath AndroidConfig::defaultNdk() const
-{
-    return m_defaultNdk;
-}
-
-FilePath AndroidConfig::openSslLocation() const
-{
-    return m_openSslLocation;
-}
-
-void AndroidConfig::setOpenSslLocation(const FilePath &openSslLocation)
-{
-    m_openSslLocation = openSslLocation;
-}
-
-QStringList AndroidConfig::apiLevelNamesFor(const SdkPlatformList &platforms)
+QStringList apiLevelNamesFor(const SdkPlatformList &platforms)
 {
     return Utils::transform(platforms, AndroidConfig::apiLevelNameFor);
 }
 
-QString AndroidConfig::apiLevelNameFor(const SdkPlatform *platform)
+QString apiLevelNameFor(const SdkPlatform *platform)
 {
     if (platform && platform->apiLevel() > 0) {
         QString sdkStylePath = platform->sdkStylePath();
         return sdkStylePath.remove("platforms;");
     }
-
     return {};
 }
 
-FilePath AndroidConfig::adbToolPath() const
+FilePath adbToolPath()
 {
-    return m_sdkLocation.pathAppended("platform-tools/adb").withExecutableSuffix();
+    return config().m_sdkLocation.pathAppended("platform-tools/adb").withExecutableSuffix();
 }
 
-FilePath AndroidConfig::emulatorToolPath() const
+FilePath emulatorToolPath()
 {
-    const FilePath emulatorFile = m_sdkLocation.pathAppended("emulator/emulator")
-                                      .withExecutableSuffix();
-    if (emulatorFile.exists())
-        return emulatorFile;
-
-    return {};
+    const FilePath emulatorFile
+        = config().m_sdkLocation.pathAppended("emulator/emulator").withExecutableSuffix();
+    return emulatorFile.exists() ? emulatorFile : FilePath();
 }
 
-FilePath AndroidConfig::sdkManagerToolPath() const
+FilePath sdkManagerToolPath()
 {
-    const FilePath sdkmanagerPath = m_sdkLocation.pathAppended(Constants::cmdlineToolsName)
+    const FilePath sdkmanagerPath = config()
+                                        .m_sdkLocation.pathAppended(Constants::cmdlineToolsName)
                                         .pathAppended("latest/bin/sdkmanager" ANDROID_BAT_SUFFIX);
     if (sdkmanagerPath.exists())
         return sdkmanagerPath;
 
     // If it's a first time install use the path of Constants::cmdlineToolsName temporary download
-    const FilePath sdkmanagerTmpPath = m_temporarySdkToolsPath.pathAppended(
+    const FilePath sdkmanagerTmpPath = config().m_temporarySdkToolsPath.pathAppended(
         "/bin/sdkmanager" ANDROID_BAT_SUFFIX);
-    if (sdkmanagerTmpPath.exists())
-        return sdkmanagerTmpPath;
-
-    return {};
+    return sdkmanagerTmpPath.exists() ? sdkmanagerTmpPath : FilePath();
 }
 
-FilePath AndroidConfig::avdManagerToolPath() const
+FilePath avdManagerToolPath()
 {
-    const FilePath sdkmanagerPath = m_sdkLocation.pathAppended(Constants::cmdlineToolsName)
+    const FilePath sdkmanagerPath = config()
+                                        .m_sdkLocation.pathAppended(Constants::cmdlineToolsName)
                                         .pathAppended("/latest/bin/avdmanager" ANDROID_BAT_SUFFIX);
-    if (sdkmanagerPath.exists())
-        return sdkmanagerPath;
-
-    return {};
+    return sdkmanagerPath.exists() ? sdkmanagerPath : FilePath();
 }
 
-void AndroidConfig::setTemporarySdkToolsPath(const Utils::FilePath &path)
+void setTemporarySdkToolsPath(const FilePath &path)
 {
-    m_temporarySdkToolsPath = path;
+    config().m_temporarySdkToolsPath = path;
 }
 
-FilePath AndroidConfig::sdkToolsVersionPath() const
-{
-    const FilePath sdkVersionPaths = m_sdkLocation.pathAppended(Constants::cmdlineToolsName)
-                                         .pathAppended("/latest/source.properties");
-    if (sdkVersionPaths.exists())
-        return sdkVersionPaths;
-
-    // If it's a first time install use the path of Constants::cmdlineToolsName temporary download
-    const FilePath tmpSdkPath = m_temporarySdkToolsPath.pathAppended("source.properties");
-    if (tmpSdkPath.exists())
-        return tmpSdkPath;
-
-    return {};
-}
-
-FilePath AndroidConfig::toolchainPathFromNdk(const FilePath &ndkLocation, OsType hostOs)
+FilePath toolchainPathFromNdk(const FilePath &ndkLocation, OsType hostOs)
 {
     const FilePath tcPath = ndkLocation / "toolchains/";
     FilePath toolchainPath;
@@ -544,12 +643,12 @@ FilePath AndroidConfig::toolchainPathFromNdk(const FilePath &ndkLocation, OsType
     return {};
 }
 
-FilePath AndroidConfig::toolchainPath(const QtVersion *qtVersion) const
+FilePath toolchainPath(const QtVersion *qtVersion)
 {
     return toolchainPathFromNdk(ndkLocation(qtVersion));
 }
 
-FilePath AndroidConfig::clangPathFromNdk(const FilePath &ndkLocation)
+FilePath clangPathFromNdk(const FilePath &ndkLocation)
 {
     const FilePath path = toolchainPathFromNdk(ndkLocation);
     if (path.isEmpty())
@@ -557,205 +656,88 @@ FilePath AndroidConfig::clangPathFromNdk(const FilePath &ndkLocation)
     return path.pathAppended("bin/clang").withExecutableSuffix();
 }
 
-FilePath AndroidConfig::gdbPath(const Abi &abi, const QtVersion *qtVersion) const
-{
-    return gdbPathFromNdk(abi, ndkLocation(qtVersion));
-}
-
-FilePath AndroidConfig::gdbPathFromNdk(const Abi &abi, const FilePath &ndkLocation)
-{
-    const FilePath path = ndkLocation.pathAppended(
-        QString("prebuilt/%1/bin/gdb%2").arg(toolchainHostFromNdk(ndkLocation),
-                                             QString(QTC_HOST_EXE_SUFFIX)));
-    if (path.exists())
-        return path;
-    // fallback for old NDKs (e.g. 10e)
-    return ndkLocation.pathAppended(QString("toolchains/%1-4.9/prebuilt/%2/bin/%3-gdb%4")
-                                                   .arg(toolchainPrefix(abi),
-                                                        toolchainHostFromNdk(ndkLocation),
-                                                        toolsPrefix(abi),
-                                                        QString(QTC_HOST_EXE_SUFFIX)));
-}
-
-FilePath AndroidConfig::lldbPathFromNdk(const FilePath &ndkLocation)
-{
-    const FilePath path = ndkLocation.pathAppended(
-        QString("toolchains/llvm/prebuilt/%1/bin/lldb%2").arg(toolchainHostFromNdk(ndkLocation),
-                                              QString(QTC_HOST_EXE_SUFFIX)));
-    if (path.exists())
-        return path;
-    return {};
-}
-
-FilePath AndroidConfig::makePathFromNdk(const FilePath &ndkLocation)
+FilePath makePathFromNdk(const FilePath &ndkLocation)
 {
     return ndkLocation.pathAppended(
                 QString("prebuilt/%1/bin/make%2").arg(toolchainHostFromNdk(ndkLocation),
                                                       QString(QTC_HOST_EXE_SUFFIX)));
 }
 
-FilePath AndroidConfig::openJDKBinPath() const
+static FilePath openJDKBinPath()
 {
-    const FilePath path = m_openJDKLocation;
-    if (!path.isEmpty())
-        return path.pathAppended("bin");
-    return path;
+    const FilePath path = config().m_openJDKLocation;
+    return path.isEmpty() ? path : path.pathAppended("bin");
 }
 
-FilePath AndroidConfig::keytoolPath() const
+FilePath keytoolPath()
 {
     return openJDKBinPath().pathAppended(keytoolName).withExecutableSuffix();
 }
 
-QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const
+QStringList devicesCommandOutput()
 {
-    QVector<AndroidDeviceInfo> devices;
-    Process adbProc;
-    CommandLine cmd{adbToolPath(), {"devices"}};
-    adbProc.setCommand(cmd);
-    using namespace std::chrono_literals;
-    adbProc.runBlocking(30s);
-    if (adbProc.result() != ProcessResult::FinishedWithSuccess) {
-        if (error)
-            *error = Tr::tr("Could not run: %1").arg(cmd.toUserOutput());
-        return devices;
-    }
-    QStringList adbDevs = adbProc.allOutput().split('\n', Qt::SkipEmptyParts);
-    if (adbDevs.empty())
-        return devices;
+    Process adbProcess;
+    adbProcess.setCommand({adbToolPath(), {"devices"}});
+    adbProcess.runBlocking();
+    if (adbProcess.result() != ProcessResult::FinishedWithSuccess)
+        return {};
 
-    for (const QString &line : adbDevs) // remove the daemon logs
-        if (line.startsWith("* daemon"))
-            adbDevs.removeOne(line);
-    adbDevs.removeFirst(); // remove "List of devices attached" header line
-
-    // workaround for '????????????' serial numbers:
-    // can use "adb -d" when only one usb device attached
-    for (const QString &device : std::as_const(adbDevs)) {
-        const QString serialNo = device.left(device.indexOf('\t')).trimmed();
-        const QString deviceType = device.mid(device.indexOf('\t')).trimmed();
-        AndroidDeviceInfo dev;
-        dev.serialNumber = serialNo;
-        dev.type = serialNo.startsWith(QLatin1String("emulator")) ? IDevice::Emulator
-                                                                  : IDevice::Hardware;
-        dev.sdk = getSDKVersion(dev.serialNumber);
-        dev.cpuAbi = getAbis(dev.serialNumber);
-        if (deviceType == QLatin1String("unauthorized"))
-            dev.state = IDevice::DeviceConnected;
-        else if (deviceType == QLatin1String("offline"))
-            dev.state = IDevice::DeviceDisconnected;
-        else
-            dev.state = IDevice::DeviceReadyToUse;
-
-        if (dev.type == IDevice::Emulator) {
-            dev.avdName = getAvdName(dev.serialNumber);
-            if (dev.avdName.isEmpty())
-                dev.avdName = serialNo;
-        }
-
-        devices.push_back(dev);
-    }
-
-    Utils::sort(devices);
-    if (devices.isEmpty() && error)
-        *error = Tr::tr("No devices found in output of: %1").arg(cmd.toUserOutput());
-    return devices;
+    // mid(1) - remove "List of devices attached" header line.
+    // Example output: "List of devices attached\nemulator-5554\tdevice\n\n".
+    return adbProcess.allOutput().split('\n', Qt::SkipEmptyParts).mid(1);
 }
 
-bool AndroidConfig::isConnected(const QString &serialNumber) const
+bool isConnected(const QString &serialNumber)
 {
-    const QVector<AndroidDeviceInfo> devices = connectedDevices();
-    for (const AndroidDeviceInfo &device : devices) {
-        if (device.serialNumber == serialNumber)
+    const QStringList lines = devicesCommandOutput();
+    for (const QString &line : lines) {
+        // skip the daemon logs
+        if (!line.startsWith("* daemon") && line.left(line.indexOf('\t')).trimmed() == serialNumber)
             return true;
     }
     return false;
 }
 
-QString AndroidConfig::getDeviceProperty(const QString &device, const QString &property)
+bool sdkFullyConfigured() { return config().m_sdkFullyConfigured; }
+
+void setSdkFullyConfigured(bool allEssentialsInstalled)
 {
-    // workaround for '????????????' serial numbers
-    CommandLine cmd(androidConfig().adbToolPath(), AndroidDeviceInfo::adbSelector(device));
-    cmd.addArgs({"shell", "getprop", property});
-
-    Process adbProc;
-    adbProc.setCommand(cmd);
-    adbProc.runBlocking();
-    if (adbProc.result() != ProcessResult::FinishedWithSuccess)
-        return {};
-
-    return adbProc.allOutput();
+    config().m_sdkFullyConfigured = allEssentialsInstalled;
 }
 
-int AndroidConfig::getSDKVersion(const QString &device)
+int getSDKVersion(const QString &device)
 {
-    QString tmp = getDeviceProperty(device, "ro.build.version.sdk");
-    if (tmp.isEmpty())
-        return -1;
-    return tmp.trimmed().toInt();
-}
-
-QString AndroidConfig::getAvdName(const QString &serialnumber)
-{
-    int index = serialnumber.indexOf(QLatin1String("-"));
-    if (index == -1)
-        return {};
-    bool ok;
-    int port = serialnumber.mid(index + 1).toInt(&ok);
-    if (!ok)
-        return {};
-
-    const QByteArray avdName = "avd name\n";
-
-    QTcpSocket tcpSocket;
-    tcpSocket.connectToHost(QHostAddress(QHostAddress::LocalHost), port);
-    if (!tcpSocket.waitForConnected(100)) // Don't wait more than 100ms for a local connection
-        return {};
-
-    tcpSocket.write(avdName + "exit\n");
-    tcpSocket.waitForDisconnected(500);
-
-    QByteArray name;
-    const QByteArrayList response = tcpSocket.readAll().split('\n');
-    // The input "avd name" might not be echoed as-is, but contain ASCII
-    // control sequences.
-    for (int i = response.size() - 1; i > 1; --i) {
-        if (response.at(i).startsWith("OK")) {
-            name = response.at(i - 1);
-            break;
-        }
-    }
-    return QString::fromLatin1(name).trimmed();
+    const QString tmp = getDeviceProperty(device, "ro.build.version.sdk");
+    return tmp.isEmpty() ? -1 : tmp.trimmed().toInt();
 }
 
 //!
-//! \brief AndroidConfigurations::getProductModel
+//! \brief AndroidConfig::getProductModel
 //! \param device serial number
 //! \return the produce model of the device or if that cannot be read the serial number
 //!
-QString AndroidConfig::getProductModel(const QString &device) const
+QString getProductModel(const QString &device)
 {
-    if (m_serialNumberToDeviceName.contains(device))
-        return m_serialNumberToDeviceName.value(device);
+    if (config().m_serialNumberToDeviceName.contains(device))
+        return config().m_serialNumberToDeviceName.value(device);
 
-    QString model = getDeviceProperty(device, "ro.product.model").trimmed();
+    const QString model = getDeviceProperty(device, "ro.product.model").trimmed();
     if (model.isEmpty())
         return device;
 
-    if (!device.startsWith(QLatin1String("????")))
-        m_serialNumberToDeviceName.insert(device, model);
+    if (!device.startsWith("????"))
+        config().m_serialNumberToDeviceName.insert(device, model);
     return model;
 }
 
-QStringList AndroidConfig::getAbis(const QString &device)
+QStringList getAbis(const QString &device)
 {
-    const FilePath adbTool = androidConfig().adbToolPath();
+    const FilePath adbTool = AndroidConfig::adbToolPath();
     QStringList result;
     // First try via ro.product.cpu.abilist
-    QStringList arguments = AndroidDeviceInfo::adbSelector(device);
-    arguments << "shell" << "getprop" << "ro.product.cpu.abilist";
     Process adbProc;
-    adbProc.setCommand({adbTool, arguments});
+    adbProc.setCommand({adbTool,
+        {AndroidDeviceInfo::adbSelector(device), "shell", "getprop", "ro.product.cpu.abilist"}});
     adbProc.runBlocking();
     if (adbProc.result() != ProcessResult::FinishedWithSuccess)
         return result;
@@ -769,15 +751,13 @@ QStringList AndroidConfig::getAbis(const QString &device)
 
     // Fall back to ro.product.cpu.abi, ro.product.cpu.abi2 ...
     for (int i = 1; i < 6; ++i) {
-        QStringList arguments = AndroidDeviceInfo::adbSelector(device);
-        arguments << QLatin1String("shell") << QLatin1String("getprop");
+        CommandLine cmd{adbTool, {AndroidDeviceInfo::adbSelector(device), "shell", "getprop"}};
         if (i == 1)
-            arguments << QLatin1String("ro.product.cpu.abi");
+            cmd.addArg("ro.product.cpu.abi");
         else
-            arguments << QString::fromLatin1("ro.product.cpu.abi%1").arg(i);
-
+            cmd.addArg(QString::fromLatin1("ro.product.cpu.abi%1").arg(i));
         Process abiProc;
-        abiProc.setCommand({adbTool, arguments});
+        abiProc.setCommand(cmd);
         abiProc.runBlocking();
         if (abiProc.result() != ProcessResult::FinishedWithSuccess)
             return result;
@@ -790,17 +770,14 @@ QStringList AndroidConfig::getAbis(const QString &device)
     return result;
 }
 
-bool AndroidConfig::isValidNdk(const QString &ndkLocation) const
+bool isValidNdk(const QString &ndkLocation)
 {
-    auto ndkPath = Utils::FilePath::fromUserInput(ndkLocation);
+    const FilePath ndkPath = FilePath::fromUserInput(ndkLocation);
 
-    if (!ndkPath.exists())
+    if (!ndkPath.exists() || !ndkPath.pathAppended("toolchains").exists())
         return false;
 
-    if (!ndkPath.pathAppended("toolchains").exists())
-        return false;
-
-    const QVersionNumber version = ndkVersion(ndkPath);
+    const QVersionNumber version = AndroidConfig::ndkVersion(ndkPath);
     if (version.isNull())
         return false;
 
@@ -808,11 +785,10 @@ bool AndroidConfig::isValidNdk(const QString &ndkLocation) const
     if (version.majorVersion() <= 22
             && (!ndkPlatformsDir.exists() || ndkPlatformsDir.toString().contains(' ')))
         return false;
-
     return true;
 }
 
-QString AndroidConfig::bestNdkPlatformMatch(int target, const QtVersion *qtVersion) const
+QString bestNdkPlatformMatch(int target, const QtVersion *qtVersion)
 {
     target = std::max(AndroidManager::defaultMinimumSDK(qtVersion), target);
     const QList<int> platforms = availableNdkPlatforms(qtVersion);
@@ -823,19 +799,35 @@ QString AndroidConfig::bestNdkPlatformMatch(int target, const QtVersion *qtVersi
     return QString("android-%1").arg(AndroidManager::defaultMinimumSDK(qtVersion));
 }
 
-FilePath AndroidConfig::sdkLocation() const
+FilePath sdkLocation()
 {
-    return m_sdkLocation;
+    return config().m_sdkLocation;
 }
 
-void AndroidConfig::setSdkLocation(const FilePath &sdkLocation)
+void setSdkLocation(const FilePath &sdkLocation)
 {
-    m_sdkLocation = sdkLocation;
+    config().m_sdkLocation = sdkLocation;
 }
 
-QVersionNumber AndroidConfig::sdkToolsVersion() const
+static FilePath sdkToolsVersionPath()
 {
-    if (!m_sdkLocation.exists())
+    const FilePath sdkVersionPaths = config()
+                                         .m_sdkLocation.pathAppended(Constants::cmdlineToolsName)
+                                         .pathAppended("/latest/source.properties");
+    if (sdkVersionPaths.exists())
+        return sdkVersionPaths;
+
+    // If it's a first time install use the path of Constants::cmdlineToolsName temporary download
+    const FilePath tmpSdkPath = config().m_temporarySdkToolsPath.pathAppended("source.properties");
+    if (tmpSdkPath.exists())
+        return tmpSdkPath;
+
+    return {};
+}
+
+QVersionNumber sdkToolsVersion()
+{
+    if (!config().m_sdkLocation.exists())
         return {};
 
     const FilePath sdkToolsPropertiesPath = sdkToolsVersionPath();
@@ -843,40 +835,34 @@ QVersionNumber AndroidConfig::sdkToolsVersion() const
     return QVersionNumber::fromString(settings.value(sdkToolsVersionKey).toString());
 }
 
-QVersionNumber AndroidConfig::buildToolsVersion() const
+QVersionNumber buildToolsVersion()
 {
     //TODO: return version according to qt version
     QVersionNumber maxVersion;
-    QDir buildToolsDir(m_sdkLocation.pathAppended("build-tools").toString());
+    QDir buildToolsDir(config().m_sdkLocation.pathAppended("build-tools").toString());
     const auto files = buildToolsDir.entryInfoList(QDir::Dirs|QDir::NoDotAndDotDot);
     for (const QFileInfo &file: files)
         maxVersion = qMax(maxVersion, QVersionNumber::fromString(file.fileName()));
     return maxVersion;
 }
 
-QStringList AndroidConfig::sdkManagerToolArgs() const
-{
-    return m_sdkManagerToolArgs;
-}
+QStringList sdkManagerToolArgs() { return config().m_sdkManagerToolArgs; }
 
-void AndroidConfig::setSdkManagerToolArgs(const QStringList &args)
-{
-    m_sdkManagerToolArgs = args;
-}
+void setSdkManagerToolArgs(const QStringList &args) { config().m_sdkManagerToolArgs = args; }
 
-FilePath AndroidConfig::ndkLocation(const QtVersion *qtVersion) const
+FilePath ndkLocation(const QtVersion *qtVersion)
 {
-    if (!m_defaultNdk.isEmpty())
-        return m_defaultNdk; // A selected default NDK is good for any Qt version
+    if (!config().m_defaultNdk.isEmpty())
+        return config().m_defaultNdk; // A selected default NDK is good for any Qt version
     return sdkLocation().resolvePath(ndkSubPathFromQtVersion(*qtVersion));
 }
 
-QVersionNumber AndroidConfig::ndkVersion(const QtVersion *qtVersion) const
+QVersionNumber ndkVersion(const QtVersion *qtVersion)
 {
     return ndkVersion(ndkLocation(qtVersion));
 }
 
-QVersionNumber AndroidConfig::ndkVersion(const FilePath &ndkPath)
+QVersionNumber ndkVersion(const FilePath &ndkPath)
 {
     QVersionNumber version;
     if (!ndkPath.exists()) {
@@ -921,48 +907,13 @@ QVersionNumber AndroidConfig::ndkVersion(const FilePath &ndkPath)
     return version;
 }
 
-QStringList AndroidConfig::allEssentials() const
+QUrl sdkToolsUrl() { return config().m_sdkToolsUrl; }
+
+QByteArray getSdkToolsSha256() { return config().m_sdkToolsSha256; }
+
+static QStringList defaultEssentials()
 {
-    QtVersions installedVersions = QtVersionManager::versions(
-        [](const QtVersion *v) {
-            return v->targetDeviceTypes().contains(Android::Constants::ANDROID_DEVICE_TYPE);
-        });
-
-    QStringList allPackages(defaultEssentials());
-    for (const QtVersion *version : installedVersions)
-        allPackages.append(essentialsFromQtVersion(*version));
-    allPackages.removeDuplicates();
-
-    return allPackages;
-}
-
-static QStringList packagesWithoutNdks(const QStringList &packages)
-{
-    return Utils::filtered(packages, [] (const QString &p) {
-        return !p.startsWith(ndkPackageMarker()); });
-}
-
-bool AndroidConfig::allEssentialsInstalled(AndroidSdkManager *sdkManager)
-{
-    QStringList essentialPkgs(allEssentials());
-    const auto installedPkgs = sdkManager->installedSdkPackages();
-    for (const AndroidSdkPackage *pkg : installedPkgs) {
-        if (essentialPkgs.contains(pkg->sdkStylePath()))
-            essentialPkgs.removeOne(pkg->sdkStylePath());
-        if (essentialPkgs.isEmpty())
-            break;
-    }
-    if (!m_defaultNdk.isEmpty())
-        essentialPkgs = packagesWithoutNdks(essentialPkgs);
-    return essentialPkgs.isEmpty() ? true : false;
-}
-
-bool AndroidConfig::sdkToolsOk() const
-{
-    bool exists = sdkLocation().exists();
-    bool writable = sdkLocation().isWritableDir();
-    bool sdkToolsExist = !sdkToolsVersion().isNull();
-    return exists && writable && sdkToolsExist;
+    return config().m_defaultSdkDepends.essentialPackages + config().m_commonEssentialPkgs;
 }
 
 static QStringList packagesExcludingBuiltWithDefaults(const QStringList &packages)
@@ -1004,7 +955,7 @@ static QString essentialBuiltWithBuildToolsPackage(int builtWithApiVersion)
     return installedBuildTool;
 }
 
-QStringList AndroidConfig::essentialsFromQtVersion(const QtVersion &version) const
+static QStringList essentialsFromQtVersion(const QtVersion &version)
 {
     if (auto androidQtVersion = dynamic_cast<const AndroidQtVersion *>(&version)) {
         bool ok;
@@ -1017,72 +968,76 @@ QStringList AndroidConfig::essentialsFromQtVersion(const QtVersion &version) con
             builtWithPackages.append(essentialBuiltWithBuildToolsPackage(bw.apiVersion));
 
             return builtWithPackages + packagesExcludingBuiltWithDefaults(
-                       m_defaultSdkDepends.essentialPackages);
+                       config().m_defaultSdkDepends.essentialPackages);
         }
     }
 
-    QVersionNumber qtVersion = version.qtVersion();
-    for (const SdkForQtVersions &item : m_specificQtVersions)
+    const QVersionNumber qtVersion = version.qtVersion();
+    for (const SdkForQtVersions &item : config().m_specificQtVersions) {
         if (item.containsVersion(qtVersion))
             return item.essentialPackages;
-
-    return m_defaultSdkDepends.essentialPackages;
-}
-
-static FilePath ndkSubPath(const SdkForQtVersions &packages)
-{
-    const QString ndkPrefix = ndkPackageMarker();
-    for (const QString &package : packages.essentialPackages)
-        if (package.startsWith(ndkPrefix))
-            return FilePath::fromString(NdksSubDir) / package.sliced(ndkPrefix.length());
-
-    return {};
-}
-
-FilePath AndroidConfig::ndkSubPathFromQtVersion(const QtVersion &version) const
-{
-    if (auto androidQtVersion = dynamic_cast<const AndroidQtVersion *>(&version)) {
-        bool ok;
-        const AndroidQtVersion::BuiltWith bw = androidQtVersion->builtWith(&ok);
-        if (ok)
-            return FilePath::fromString(NdksSubDir) / bw.ndkVersion.toString();
     }
-
-    for (const SdkForQtVersions &item : m_specificQtVersions)
-        if (item.containsVersion(version.qtVersion()))
-            return ndkSubPath(item);
-
-    return ndkSubPath(m_defaultSdkDepends);
+    return config().m_defaultSdkDepends.essentialPackages;
 }
 
-QStringList AndroidConfig::defaultEssentials() const
+QStringList allEssentials()
 {
-    return m_defaultSdkDepends.essentialPackages + m_commonEssentialPkgs;
+    QtVersions installedVersions = QtVersionManager::versions(
+        [](const QtVersion *v) {
+            return v->targetDeviceTypes().contains(Android::Constants::ANDROID_DEVICE_TYPE);
+        });
+
+    QStringList allPackages(defaultEssentials());
+    for (const QtVersion *version : installedVersions)
+        allPackages.append(essentialsFromQtVersion(*version));
+    allPackages.removeDuplicates();
+
+    return allPackages;
 }
 
-bool SdkForQtVersions::containsVersion(const QVersionNumber &qtVersion) const
+static QStringList packagesWithoutNdks(const QStringList &packages)
 {
-    return versions.contains(qtVersion)
-            || versions.contains(QVersionNumber(qtVersion.majorVersion(),
-                                                qtVersion.minorVersion()));
+    return Utils::filtered(packages, [] (const QString &p) {
+        return !p.startsWith(ndkPackageMarker());
+    });
 }
 
-FilePath AndroidConfig::openJDKLocation() const
+bool allEssentialsInstalled(AndroidSdkManager *sdkManager)
 {
-    return m_openJDKLocation;
+    QStringList essentialPkgs(allEssentials());
+    const auto installedPkgs = sdkManager->installedSdkPackages();
+    for (const AndroidSdkPackage *pkg : installedPkgs) {
+        if (essentialPkgs.contains(pkg->sdkStylePath()))
+            essentialPkgs.removeOne(pkg->sdkStylePath());
+        if (essentialPkgs.isEmpty())
+            break;
+    }
+    if (!config().m_defaultNdk.isEmpty())
+        essentialPkgs = packagesWithoutNdks(essentialPkgs);
+    return essentialPkgs.isEmpty() ? true : false;
 }
 
-void AndroidConfig::setOpenJDKLocation(const FilePath &openJDKLocation)
+bool sdkToolsOk()
 {
-    m_openJDKLocation = openJDKLocation;
+    const bool exists = sdkLocation().exists();
+    const bool writable = sdkLocation().isWritableDir();
+    const bool sdkToolsExist = !sdkToolsVersion().isNull();
+    return exists && writable && sdkToolsExist;
 }
 
-QString AndroidConfig::toolchainHost(const QtVersion *qtVersion) const
+FilePath openJDKLocation() { return config().m_openJDKLocation; }
+
+void setOpenJDKLocation(const FilePath &openJDKLocation)
+{
+    config().m_openJDKLocation = openJDKLocation;
+}
+
+QString toolchainHost(const QtVersion *qtVersion)
 {
     return toolchainHostFromNdk(ndkLocation(qtVersion));
 }
 
-QString AndroidConfig::toolchainHostFromNdk(const FilePath &ndkPath)
+QString toolchainHostFromNdk(const FilePath &ndkPath)
 {
     // detect toolchain host
     QString toolchainHost;
@@ -1112,27 +1067,15 @@ QString AndroidConfig::toolchainHostFromNdk(const FilePath &ndkPath)
     return toolchainHost;
 }
 
-QString AndroidConfig::emulatorArgs() const
-{
-    return m_emulatorArgs;
-}
+QString emulatorArgs() { return config().m_emulatorArgs; }
 
-void AndroidConfig::setEmulatorArgs(const QString &args)
-{
-    m_emulatorArgs = args;
-}
+void setEmulatorArgs(const QString &args) { config().m_emulatorArgs = args; }
 
-bool AndroidConfig::automaticKitCreation() const
-{
-    return m_automaticKitCreation;
-}
+bool automaticKitCreation() { return config().m_automaticKitCreation; }
 
-void AndroidConfig::setAutomaticKitCreation(bool b)
-{
-    m_automaticKitCreation = b;
-}
+void setAutomaticKitCreation(bool b) { config().m_automaticKitCreation = b; }
 
-FilePath AndroidConfig::defaultSdkPath()
+FilePath defaultSdkPath()
 {
     QString sdkFromEnvVar = QString::fromLocal8Bit(getenv("ANDROID_SDK_ROOT"));
     if (!sdkFromEnvVar.isEmpty())
@@ -1153,332 +1096,7 @@ FilePath AndroidConfig::defaultSdkPath()
         QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/Android/Sdk");
 }
 
-///////////////////////////////////
-// AndroidConfigurations
-///////////////////////////////////
-
-AndroidConfigurations *m_instance = nullptr;
-
-AndroidConfigurations::AndroidConfigurations()
-    : m_sdkManager(new AndroidSdkManager)
-{
-    load();
-    connect(DeviceManager::instance(), &DeviceManager::devicesLoaded,
-            this, &AndroidConfigurations::updateAndroidDevice);
-
-    m_instance = this;
-}
-
-void AndroidConfigurations::setConfig(const AndroidConfig &devConfigs)
-{
-    emit m_instance->aboutToUpdate();
-    androidConfig() = devConfigs;
-
-    m_instance->save();
-    updateAndroidDevice();
-    registerNewToolchains();
-    updateAutomaticKitList();
-    removeOldToolchains();
-    emit m_instance->updated();
-}
-
-static bool matchToolchain(const Toolchain *atc, const Toolchain *btc)
-{
-    if (atc == btc)
-        return true;
-
-    if (!atc || !btc)
-        return false;
-
-    if (atc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPEID || btc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPEID)
-        return false;
-
-    return atc->targetAbi() == btc->targetAbi();
-}
-
-void AndroidConfigurations::registerNewToolchains()
-{
-    const Toolchains existingAndroidToolchains
-            = ToolchainManager::toolchains(Utils::equal(&Toolchain::typeId, Id(Constants::ANDROID_TOOLCHAIN_TYPEID)));
-
-    const Toolchains newToolchains = autodetectToolchains(existingAndroidToolchains);
-
-    for (Toolchain *tc : newToolchains)
-        ToolchainManager::registerToolchain(tc);
-
-    registerCustomToolchainsAndDebuggers();
-}
-
-void AndroidConfigurations::removeOldToolchains()
-{
-    const auto tcs = ToolchainManager::toolchains(Utils::equal(&Toolchain::typeId,
-                                                               Id(Constants::ANDROID_TOOLCHAIN_TYPEID)));
-    for (Toolchain *tc : tcs) {
-        if (!tc->isValid())
-            ToolchainManager::deregisterToolchain(tc);
-    }
-}
-
-void AndroidConfigurations::removeUnusedDebuggers()
-{
-    const QList<QtVersion*> qtVersions = QtVersionManager::versions([](const QtVersion *v) {
-        return v->type() == Constants::ANDROID_QT_TYPE;
-    });
-
-    QVector<FilePath> uniqueNdks;
-    for (const QtVersion *qt : qtVersions) {
-        FilePath ndkLocation = androidConfig().ndkLocation(qt);
-        if (!uniqueNdks.contains(ndkLocation))
-            uniqueNdks.append(ndkLocation);
-    }
-
-    uniqueNdks.append(FileUtils::toFilePathList(androidConfig().getCustomNdkList()));
-
-    const QList<Debugger::DebuggerItem> allDebuggers = Debugger::DebuggerItemManager::debuggers();
-    for (const Debugger::DebuggerItem &debugger : allDebuggers) {
-        if (!debugger.displayName().contains("Android"))
-            continue;
-
-        bool isChildOfNdk = false;
-        for (const FilePath &path : uniqueNdks) {
-            if (debugger.command().isChildOf(path)) {
-                isChildOfNdk = true;
-                break;
-            }
-        }
-
-        const bool isMultiAbiNdkGdb = debugger.command().fileName().startsWith("gdb");
-        const bool hasMultiAbiName = debugger.displayName().contains("Multi-Abi");
-
-        if (debugger.isAutoDetected() && (!isChildOfNdk || (isMultiAbiNdkGdb && !hasMultiAbiName)))
-            Debugger::DebuggerItemManager::deregisterDebugger(debugger.id());
-    }
-}
-
-static QStringList allSupportedAbis()
-{
-    return QStringList{
-        ProjectExplorer::Constants::ANDROID_ABI_ARMEABI_V7A,
-        ProjectExplorer::Constants::ANDROID_ABI_ARM64_V8A,
-        ProjectExplorer::Constants::ANDROID_ABI_X86,
-        ProjectExplorer::Constants::ANDROID_ABI_X86_64,
-    };
-}
-
-static bool containsAllAbis(const QStringList &abis)
-{
-    QStringList supportedAbis{allSupportedAbis()};
-    for (const QString &abi : abis)
-        if (supportedAbis.contains(abi))
-            supportedAbis.removeOne(abi);
-
-    return supportedAbis.isEmpty();
-}
-
-static QString getMultiOrSingleAbiString(const QStringList &abis)
-{
-    return containsAllAbis(abis) ? "Multi-Abi" : abis.join(",");
-}
-
-static const Debugger::DebuggerItem *existingDebugger(const FilePath &command,
-                                                      Debugger::DebuggerEngineType type)
-{
-    // check if the debugger is already registered, but ignoring the display name
-    const Debugger::DebuggerItem *existing = Debugger::DebuggerItemManager::findByCommand(command);
-
-    // Return existing debugger with same command
-    if (existing && existing->engineType() == type && existing->isAutoDetected())
-        return existing;
-    return nullptr;
-}
-
-static QVariant findOrRegisterDebugger(Toolchain *tc,
-                                       const QStringList &abisList,
-                                       bool customDebugger = false)
-{
-    const FilePath ndk = static_cast<AndroidToolchain *>(tc)->ndkLocation();
-    const FilePath lldbCommand = androidConfig().lldbPathFromNdk(ndk);
-    const Debugger::DebuggerItem *existingLldb = existingDebugger(lldbCommand,
-                                                                  Debugger::LldbEngineType);
-    // Return existing debugger with same command - prefer lldb (limit to sdk/ndk min version?)
-    if (existingLldb)
-        return existingLldb->id();
-
-    const FilePath gdbCommand = androidConfig().gdbPathFromNdk(tc->targetAbi(), ndk);
-
-    // check if the debugger is already registered, but ignoring the display name
-    const Debugger::DebuggerItem *existingGdb = existingDebugger(gdbCommand,
-                                                                 Debugger::GdbEngineType);
-    // Return existing debugger with same command
-    if (existingGdb)
-        return existingGdb->id();
-
-    const QString mainName = Tr::tr("Android Debugger (%1, NDK %2)");
-    const QString custom = customDebugger ? QString{"Custom "} : QString{};
-    // debugger not found, register a new one
-    // check lldb
-    QVariant registeredLldb;
-    if (!lldbCommand.isEmpty()) {
-        Debugger::DebuggerItem debugger;
-        debugger.setCommand(lldbCommand);
-        debugger.setEngineType(Debugger::LldbEngineType);
-        debugger.setUnexpandedDisplayName(custom + mainName
-                .arg(getMultiOrSingleAbiString(allSupportedAbis()))
-                .arg(androidConfig().ndkVersion(ndk).toString())
-                                          + ' ' + debugger.engineTypeName());
-        debugger.setAutoDetected(true);
-        debugger.reinitializeFromFile();
-        registeredLldb = Debugger::DebuggerItemManager::registerDebugger(debugger);
-    }
-
-    // we always have a value for gdb (but we shouldn't - we currently use a fallback)
-    if (!gdbCommand.exists()) {
-        if (!registeredLldb.isNull())
-            return registeredLldb;
-        return {};
-    }
-
-    Debugger::DebuggerItem debugger;
-    debugger.setCommand(gdbCommand);
-    debugger.setEngineType(Debugger::GdbEngineType);
-
-    // NDK 10 and older have multiple gdb versions per ABI, so check for that.
-    const bool oldNdkVersion = androidConfig().ndkVersion(ndk) <= QVersionNumber{11};
-    debugger.setUnexpandedDisplayName(custom + mainName
-            .arg(getMultiOrSingleAbiString(oldNdkVersion ? abisList : allSupportedAbis()))
-            .arg(androidConfig().ndkVersion(ndk).toString())
-                                      + ' ' + debugger.engineTypeName());
-    debugger.setAutoDetected(true);
-    debugger.reinitializeFromFile();
-    QVariant registeredGdb = Debugger::DebuggerItemManager::registerDebugger(debugger);
-    return registeredLldb.isNull() ? registeredGdb : registeredLldb;
-}
-
-void AndroidConfigurations::registerCustomToolchainsAndDebuggers()
-{
-    const Toolchains existingAndroidToolchains = ToolchainManager::toolchains(
-        Utils::equal(&Toolchain::typeId, Utils::Id(Constants::ANDROID_TOOLCHAIN_TYPEID)));
-
-    const FilePaths customNdks = FileUtils::toFilePathList(androidConfig().getCustomNdkList());
-    const Toolchains customToolchains
-        = autodetectToolchainsFromNdks(existingAndroidToolchains, customNdks, true);
-
-    for (Toolchain *tc : customToolchains) {
-        ToolchainManager::registerToolchain(tc);
-        const auto androidToolchain = static_cast<AndroidToolchain *>(tc);
-        QString abiStr;
-        if (androidToolchain)
-            abiStr = androidToolchain->platformLinkerFlags().at(1).split('-').first();
-        findOrRegisterDebugger(tc, {abiStr}, true);
-    }
-}
-void AndroidConfigurations::updateAutomaticKitList()
-{
-    for (Kit *k : KitManager::kits()) {
-        if (DeviceTypeKitAspect::deviceTypeId(k) == Constants::ANDROID_DEVICE_TYPE) {
-            if (k->value(Constants::ANDROID_KIT_NDK).isNull() || k->value(Constants::ANDROID_KIT_SDK).isNull()) {
-                if (QtVersion *qt = QtKitAspect::qtVersion(k)) {
-                    k->setValueSilently(Constants::ANDROID_KIT_NDK, androidConfig().ndkLocation(qt).toString());
-                    k->setValue(Constants::ANDROID_KIT_SDK, androidConfig().sdkLocation().toString());
-                }
-            }
-        }
-    }
-
-    const QList<Kit *> existingKits = Utils::filtered(KitManager::kits(), [](Kit *k) {
-        Id deviceTypeId = DeviceTypeKitAspect::deviceTypeId(k);
-        if (k->isAutoDetected() && !k->isSdkProvided()
-                && deviceTypeId == Constants::ANDROID_DEVICE_TYPE) {
-            return true;
-        }
-        return false;
-    });
-
-    removeUnusedDebuggers();
-
-    QHash<Abi, QList<const QtVersion *> > qtVersionsForArch;
-    const QList<QtVersion*> qtVersions = QtVersionManager::versions([](const QtVersion *v) {
-        return v->type() == Constants::ANDROID_QT_TYPE;
-    });
-    for (const QtVersion *qtVersion : qtVersions) {
-        const Abis qtAbis = qtVersion->qtAbis();
-        if (qtAbis.empty())
-            continue;
-        qtVersionsForArch[qtAbis.first()].append(qtVersion);
-    }
-
-    // register new kits
-    const Toolchains toolchains = ToolchainManager::toolchains([](const Toolchain *tc) {
-        return tc->isAutoDetected() && tc->typeId() == Constants::ANDROID_TOOLCHAIN_TYPEID
-               && tc->isValid();
-    });
-    QList<Kit *> unhandledKits = existingKits;
-    for (Toolchain *tc : toolchains) {
-        if (tc->language() != ProjectExplorer::Constants::CXX_LANGUAGE_ID)
-            continue;
-
-        for (const QtVersion *qt : qtVersionsForArch.value(tc->targetAbi())) {
-            FilePath tcNdk = static_cast<const AndroidToolchain *>(tc)->ndkLocation();
-            if (tcNdk != androidConfig().ndkLocation(qt))
-                continue;
-
-            const Toolchains allLanguages
-                = Utils::filtered(toolchains, [tc, tcNdk](Toolchain *otherTc) {
-                      FilePath otherNdk = static_cast<const AndroidToolchain *>(otherTc)->ndkLocation();
-                      return tc->targetAbi() == otherTc->targetAbi() && tcNdk == otherNdk;
-                  });
-
-            QHash<Id, Toolchain *> toolchainForLanguage;
-            for (Toolchain *tc : allLanguages)
-                toolchainForLanguage[tc->language()] = tc;
-
-            Kit *existingKit = Utils::findOrDefault(existingKits, [&](const Kit *b) {
-                if (qt != QtKitAspect::qtVersion(b))
-                    return false;
-                return matchToolchain(toolchainForLanguage[ProjectExplorer::Constants::CXX_LANGUAGE_ID],
-                                      ToolchainKitAspect::cxxToolchain(b))
-                        && matchToolchain(toolchainForLanguage[ProjectExplorer::Constants::C_LANGUAGE_ID],
-                                          ToolchainKitAspect::cToolchain(b));
-            });
-
-            const auto initializeKit = [allLanguages, tc, qt](Kit *k) {
-                k->setAutoDetected(true);
-                k->setAutoDetectionSource("AndroidConfiguration");
-                DeviceTypeKitAspect::setDeviceTypeId(k, Constants::ANDROID_DEVICE_TYPE);
-                for (Toolchain *tc : allLanguages)
-                    ToolchainKitAspect::setToolchain(k, tc);
-                QtKitAspect::setQtVersion(k, qt);
-                QStringList abis = static_cast<const AndroidQtVersion *>(qt)->androidAbis();
-                Debugger::DebuggerKitAspect::setDebugger(k, findOrRegisterDebugger(tc, abis));
-
-                BuildDeviceKitAspect::setDeviceId(k, DeviceManager::defaultDesktopDevice()->id());
-                k->setSticky(QtKitAspect::id(), true);
-                k->setSticky(DeviceTypeKitAspect::id(), true);
-
-                QString versionStr = QLatin1String("Qt %{Qt:Version}");
-                if (!qt->isAutodetected())
-                    versionStr = QString("%1").arg(qt->displayName());
-                k->setUnexpandedDisplayName(Tr::tr("Android %1 Clang %2")
-                                                .arg(versionStr)
-                                                .arg(getMultiOrSingleAbiString(abis)));
-                k->setValueSilently(Constants::ANDROID_KIT_NDK, androidConfig().ndkLocation(qt).toString());
-                k->setValueSilently(Constants::ANDROID_KIT_SDK, androidConfig().sdkLocation().toString());
-            };
-
-            if (existingKit) {
-                initializeKit(existingKit); // Update the existing kit with new data.
-                unhandledKits.removeOne(existingKit);
-            } else {
-                KitManager::registerKit(initializeKit);
-            }
-        }
-    }
-    // cleanup any mess that might have existed before, by removing all Android kits that
-    // existed before, but weren't re-used
-    KitManager::deregisterKits(unhandledKits);
-}
-
-Environment AndroidConfig::toolsEnvironment() const
+Environment toolsEnvironment()
 {
     Environment env = Environment::systemEnvironment();
     FilePath jdkLocation = openJDKLocation();
@@ -1489,30 +1107,6 @@ Environment AndroidConfig::toolsEnvironment() const
     return env;
 }
 
-AndroidConfig &androidConfig()
-{
-    static AndroidConfig theCurrentConfig;
-    return theCurrentConfig;
-}
-
-AndroidSdkManager *AndroidConfigurations::sdkManager()
-{
-    return m_instance->m_sdkManager.get();
-}
-
-AndroidConfigurations *AndroidConfigurations::instance()
-{
-    return m_instance;
-}
-
-void AndroidConfigurations::save()
-{
-    QtcSettings *settings = Core::ICore::settings();
-    settings->beginGroup(SettingsGroup);
-    androidConfig().save(*settings);
-    settings->endGroup();
-}
-
 static FilePath androidStudioPath()
 {
 #if defined(Q_OS_WIN)
@@ -1521,12 +1115,12 @@ static FilePath androidStudioPath()
     const QSettings settings64(registryKey, QSettings::Registry64Format);
     const QSettings settings32(registryKey, QSettings::Registry32Format);
     return FilePath::fromUserInput(
-                settings64.value(valueName, settings32.value(valueName).toString()).toString());
+        settings64.value(valueName, settings32.value(valueName).toString()).toString());
 #endif
     return {}; // TODO non-Windows
 }
 
-FilePath AndroidConfig::getJdkPath()
+FilePath getJdkPath()
 {
     FilePath jdkHome = FilePath::fromString(qtcEnvironmentVariable(Constants::JAVA_HOME_ENV_VAR));
     if (jdkHome.exists())
@@ -1595,11 +1189,354 @@ FilePath AndroidConfig::getJdkPath()
     return jdkHome;
 }
 
+} // namespace AndroidConfig
+
+///////////////////////////////////
+// AndroidConfigurations
+///////////////////////////////////
+
+AndroidConfigurations *m_instance = nullptr;
+
+AndroidConfigurations::AndroidConfigurations()
+    : m_sdkManager(new AndroidSdkManager)
+{
+    load();
+    connect(DeviceManager::instance(), &DeviceManager::devicesLoaded,
+            this, &AndroidConfigurations::updateAndroidDevice);
+
+    m_instance = this;
+}
+
+void AndroidConfigurations::applyConfig()
+{
+    emit m_instance->aboutToUpdate();
+    m_instance->save();
+    updateAndroidDevice();
+    registerNewToolchains();
+    updateAutomaticKitList();
+    removeOldToolchains();
+    emit m_instance->updated();
+}
+
+static bool matchToolchain(const Toolchain *atc, const Toolchain *btc)
+{
+    if (atc == btc)
+        return true;
+
+    if (!atc || !btc)
+        return false;
+
+    if (atc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPEID || btc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPEID)
+        return false;
+
+    return atc->targetAbi() == btc->targetAbi();
+}
+
+void AndroidConfigurations::registerNewToolchains()
+{
+    const Toolchains existingAndroidToolchains
+            = ToolchainManager::toolchains(Utils::equal(&Toolchain::typeId, Id(Constants::ANDROID_TOOLCHAIN_TYPEID)));
+
+    const Toolchains newToolchains = autodetectToolchains(existingAndroidToolchains);
+
+    for (Toolchain *tc : newToolchains)
+        ToolchainManager::registerToolchain(tc);
+
+    registerCustomToolchainsAndDebuggers();
+}
+
+void AndroidConfigurations::removeOldToolchains()
+{
+    const auto tcs = ToolchainManager::toolchains(Utils::equal(&Toolchain::typeId,
+                                                               Id(Constants::ANDROID_TOOLCHAIN_TYPEID)));
+    for (Toolchain *tc : tcs) {
+        if (!tc->isValid())
+            ToolchainManager::deregisterToolchain(tc);
+    }
+}
+
+void AndroidConfigurations::removeUnusedDebuggers()
+{
+    const QList<QtVersion*> qtVersions = QtVersionManager::versions([](const QtVersion *v) {
+        return v->type() == Constants::ANDROID_QT_TYPE;
+    });
+
+    QList<FilePath> uniqueNdks;
+    for (const QtVersion *qt : qtVersions) {
+        FilePath ndkLocation = AndroidConfig::ndkLocation(qt);
+        if (!uniqueNdks.contains(ndkLocation))
+            uniqueNdks.append(ndkLocation);
+    }
+
+    uniqueNdks.append(FileUtils::toFilePathList(AndroidConfig::getCustomNdkList()));
+
+    const QList<Debugger::DebuggerItem> allDebuggers = Debugger::DebuggerItemManager::debuggers();
+    for (const Debugger::DebuggerItem &debugger : allDebuggers) {
+        if (!debugger.displayName().contains("Android"))
+            continue;
+
+        bool isChildOfNdk = false;
+        for (const FilePath &path : uniqueNdks) {
+            if (debugger.command().isChildOf(path)) {
+                isChildOfNdk = true;
+                break;
+            }
+        }
+
+        const bool isMultiAbiNdkGdb = debugger.command().fileName().startsWith("gdb");
+        const bool hasMultiAbiName = debugger.displayName().contains("Multi-Abi");
+
+        if (debugger.isAutoDetected() && (!isChildOfNdk || (isMultiAbiNdkGdb && !hasMultiAbiName)))
+            Debugger::DebuggerItemManager::deregisterDebugger(debugger.id());
+    }
+}
+
+static QStringList allSupportedAbis()
+{
+    return QStringList{
+        ProjectExplorer::Constants::ANDROID_ABI_ARMEABI_V7A,
+        ProjectExplorer::Constants::ANDROID_ABI_ARM64_V8A,
+        ProjectExplorer::Constants::ANDROID_ABI_X86,
+        ProjectExplorer::Constants::ANDROID_ABI_X86_64,
+    };
+}
+
+static bool containsAllAbis(const QStringList &abis)
+{
+    QStringList supportedAbis{allSupportedAbis()};
+    for (const QString &abi : abis)
+        if (supportedAbis.contains(abi))
+            supportedAbis.removeOne(abi);
+
+    return supportedAbis.isEmpty();
+}
+
+static QString getMultiOrSingleAbiString(const QStringList &abis)
+{
+    return containsAllAbis(abis) ? "Multi-Abi" : abis.join(",");
+}
+
+static const Debugger::DebuggerItem *existingDebugger(const FilePath &command,
+                                                      Debugger::DebuggerEngineType type)
+{
+    // check if the debugger is already registered, but ignoring the display name
+    const Debugger::DebuggerItem *existing = Debugger::DebuggerItemManager::findByCommand(command);
+
+    // Return existing debugger with same command
+    if (existing && existing->engineType() == type && existing->isAutoDetected())
+        return existing;
+    return nullptr;
+}
+
+static QVariant findOrRegisterDebugger(Toolchain *tc,
+                                       const QStringList &abisList,
+                                       bool customDebugger = false)
+{
+    const FilePath ndk = static_cast<AndroidToolchain *>(tc)->ndkLocation();
+    const FilePath lldbCommand = lldbPathFromNdk(ndk);
+    const Debugger::DebuggerItem *existingLldb = existingDebugger(lldbCommand,
+                                                                  Debugger::LldbEngineType);
+    // Return existing debugger with same command - prefer lldb (limit to sdk/ndk min version?)
+    if (existingLldb)
+        return existingLldb->id();
+
+    const FilePath gdbCommand = gdbPathFromNdk(tc->targetAbi(), ndk);
+
+    // check if the debugger is already registered, but ignoring the display name
+    const Debugger::DebuggerItem *existingGdb = existingDebugger(gdbCommand,
+                                                                 Debugger::GdbEngineType);
+    // Return existing debugger with same command
+    if (existingGdb)
+        return existingGdb->id();
+
+    const QString mainName = Tr::tr("Android Debugger (%1, NDK %2)");
+    const QString custom = customDebugger ? QString{"Custom "} : QString{};
+    // debugger not found, register a new one
+    // check lldb
+    QVariant registeredLldb;
+    if (!lldbCommand.isEmpty()) {
+        Debugger::DebuggerItem debugger;
+        debugger.setCommand(lldbCommand);
+        debugger.setEngineType(Debugger::LldbEngineType);
+        debugger.setUnexpandedDisplayName(custom + mainName
+                .arg(getMultiOrSingleAbiString(allSupportedAbis()))
+                .arg(AndroidConfig::ndkVersion(ndk).toString())
+                                          + ' ' + debugger.engineTypeName());
+        debugger.setAutoDetected(true);
+        debugger.reinitializeFromFile();
+        registeredLldb = Debugger::DebuggerItemManager::registerDebugger(debugger);
+    }
+
+    // we always have a value for gdb (but we shouldn't - we currently use a fallback)
+    if (!gdbCommand.exists()) {
+        if (!registeredLldb.isNull())
+            return registeredLldb;
+        return {};
+    }
+
+    Debugger::DebuggerItem debugger;
+    debugger.setCommand(gdbCommand);
+    debugger.setEngineType(Debugger::GdbEngineType);
+
+    // NDK 10 and older have multiple gdb versions per ABI, so check for that.
+    const bool oldNdkVersion = AndroidConfig::ndkVersion(ndk) <= QVersionNumber{11};
+    debugger.setUnexpandedDisplayName(custom + mainName
+            .arg(getMultiOrSingleAbiString(oldNdkVersion ? abisList : allSupportedAbis()))
+            .arg(AndroidConfig::ndkVersion(ndk).toString())
+                                      + ' ' + debugger.engineTypeName());
+    debugger.setAutoDetected(true);
+    debugger.reinitializeFromFile();
+    QVariant registeredGdb = Debugger::DebuggerItemManager::registerDebugger(debugger);
+    return registeredLldb.isNull() ? registeredGdb : registeredLldb;
+}
+
+void AndroidConfigurations::registerCustomToolchainsAndDebuggers()
+{
+    const Toolchains existingAndroidToolchains = ToolchainManager::toolchains(
+        Utils::equal(&Toolchain::typeId, Id(Constants::ANDROID_TOOLCHAIN_TYPEID)));
+
+    const FilePaths customNdks = FileUtils::toFilePathList(AndroidConfig::getCustomNdkList());
+    const Toolchains customToolchains
+        = autodetectToolchainsFromNdks(existingAndroidToolchains, customNdks, true);
+
+    for (Toolchain *tc : customToolchains) {
+        ToolchainManager::registerToolchain(tc);
+        const auto androidToolchain = static_cast<AndroidToolchain *>(tc);
+        QString abiStr;
+        if (androidToolchain)
+            abiStr = androidToolchain->platformLinkerFlags().at(1).split('-').first();
+        findOrRegisterDebugger(tc, {abiStr}, true);
+    }
+}
+void AndroidConfigurations::updateAutomaticKitList()
+{
+    for (Kit *k : KitManager::kits()) {
+        if (DeviceTypeKitAspect::deviceTypeId(k) == Constants::ANDROID_DEVICE_TYPE) {
+            if (k->value(Constants::ANDROID_KIT_NDK).isNull() || k->value(Constants::ANDROID_KIT_SDK).isNull()) {
+                if (QtVersion *qt = QtKitAspect::qtVersion(k)) {
+                    k->setValueSilently(Constants::ANDROID_KIT_NDK, AndroidConfig::ndkLocation(qt).toString());
+                    k->setValue(Constants::ANDROID_KIT_SDK, AndroidConfig::sdkLocation().toString());
+                }
+            }
+        }
+    }
+
+    const QList<Kit *> existingKits = Utils::filtered(KitManager::kits(), [](Kit *k) {
+        Id deviceTypeId = DeviceTypeKitAspect::deviceTypeId(k);
+        if (k->isAutoDetected() && !k->isSdkProvided()
+                && deviceTypeId == Constants::ANDROID_DEVICE_TYPE) {
+            return true;
+        }
+        return false;
+    });
+
+    removeUnusedDebuggers();
+
+    QHash<Abi, QList<const QtVersion *> > qtVersionsForArch;
+    const QList<QtVersion*> qtVersions = QtVersionManager::versions([](const QtVersion *v) {
+        return v->type() == Constants::ANDROID_QT_TYPE;
+    });
+    for (const QtVersion *qtVersion : qtVersions) {
+        const Abis qtAbis = qtVersion->qtAbis();
+        if (qtAbis.empty())
+            continue;
+        qtVersionsForArch[qtAbis.first()].append(qtVersion);
+    }
+
+    // register new kits
+    const Toolchains toolchains = ToolchainManager::toolchains([](const Toolchain *tc) {
+        return tc->isAutoDetected() && tc->typeId() == Constants::ANDROID_TOOLCHAIN_TYPEID
+               && tc->isValid();
+    });
+    QList<Kit *> unhandledKits = existingKits;
+    for (Toolchain *tc : toolchains) {
+        if (tc->language() != ProjectExplorer::Constants::CXX_LANGUAGE_ID)
+            continue;
+
+        for (const QtVersion *qt : qtVersionsForArch.value(tc->targetAbi())) {
+            FilePath tcNdk = static_cast<const AndroidToolchain *>(tc)->ndkLocation();
+            if (tcNdk != AndroidConfig::ndkLocation(qt))
+                continue;
+
+            const Toolchains allLanguages
+                = Utils::filtered(toolchains, [tc, tcNdk](Toolchain *otherTc) {
+                      FilePath otherNdk = static_cast<const AndroidToolchain *>(otherTc)->ndkLocation();
+                      return tc->targetAbi() == otherTc->targetAbi() && tcNdk == otherNdk;
+                  });
+
+            QHash<Id, Toolchain *> toolchainForLanguage;
+            for (Toolchain *tc : allLanguages)
+                toolchainForLanguage[tc->language()] = tc;
+
+            Kit *existingKit = Utils::findOrDefault(existingKits, [&](const Kit *b) {
+                if (qt != QtKitAspect::qtVersion(b))
+                    return false;
+                return matchToolchain(toolchainForLanguage[ProjectExplorer::Constants::CXX_LANGUAGE_ID],
+                                      ToolchainKitAspect::cxxToolchain(b))
+                        && matchToolchain(toolchainForLanguage[ProjectExplorer::Constants::C_LANGUAGE_ID],
+                                          ToolchainKitAspect::cToolchain(b));
+            });
+
+            const auto initializeKit = [allLanguages, tc, qt](Kit *k) {
+                k->setAutoDetected(true);
+                k->setAutoDetectionSource("AndroidConfiguration");
+                DeviceTypeKitAspect::setDeviceTypeId(k, Constants::ANDROID_DEVICE_TYPE);
+                for (Toolchain *tc : allLanguages)
+                    ToolchainKitAspect::setToolchain(k, tc);
+                QtKitAspect::setQtVersion(k, qt);
+                QStringList abis = static_cast<const AndroidQtVersion *>(qt)->androidAbis();
+                Debugger::DebuggerKitAspect::setDebugger(k, findOrRegisterDebugger(tc, abis));
+
+                BuildDeviceKitAspect::setDeviceId(k, DeviceManager::defaultDesktopDevice()->id());
+                k->setSticky(QtKitAspect::id(), true);
+                k->setSticky(DeviceTypeKitAspect::id(), true);
+
+                QString versionStr = QLatin1String("Qt %{Qt:Version}");
+                if (!qt->isAutodetected())
+                    versionStr = QString("%1").arg(qt->displayName());
+                k->setUnexpandedDisplayName(Tr::tr("Android %1 Clang %2")
+                                                .arg(versionStr)
+                                                .arg(getMultiOrSingleAbiString(abis)));
+                k->setValueSilently(Constants::ANDROID_KIT_NDK, AndroidConfig::ndkLocation(qt).toString());
+                k->setValueSilently(Constants::ANDROID_KIT_SDK, AndroidConfig::sdkLocation().toString());
+            };
+
+            if (existingKit) {
+                initializeKit(existingKit); // Update the existing kit with new data.
+                unhandledKits.removeOne(existingKit);
+            } else {
+                KitManager::registerKit(initializeKit);
+            }
+        }
+    }
+    // cleanup any mess that might have existed before, by removing all Android kits that
+    // existed before, but weren't re-used
+    KitManager::deregisterKits(unhandledKits);
+}
+
+AndroidSdkManager *AndroidConfigurations::sdkManager()
+{
+    return m_instance->m_sdkManager.get();
+}
+
+AndroidConfigurations *AndroidConfigurations::instance()
+{
+    return m_instance;
+}
+
+void AndroidConfigurations::save()
+{
+    QtcSettings *settings = Core::ICore::settings();
+    settings->beginGroup(SettingsGroup);
+    AndroidConfig::config().save(*settings);
+    settings->endGroup();
+}
+
 void AndroidConfigurations::load()
 {
     QtcSettings *settings = Core::ICore::settings();
     settings->beginGroup(SettingsGroup);
-    androidConfig().load(*settings);
+    AndroidConfig::config().load(*settings);
     settings->endGroup();
 }
 
@@ -1610,8 +1547,7 @@ void AndroidConfigurations::updateAndroidDevice()
     IDevice::ConstPtr dev = devMgr->find(Constants::ANDROID_DEVICE_ID);
     if (dev)
         devMgr->removeDevice(dev->id());
-
-    AndroidDeviceManager::instance()->setupDevicesWatcher();
+    AndroidDeviceManager::setupDevicesWatcher();
 }
 
 #ifdef WITH_TESTS
@@ -1677,7 +1613,7 @@ void AndroidConfigurationsTest::testAndroidConfigAvailableNdkPlatforms()
     QFETCH(OsType, hostOs);
     QFETCH(QList<int>, expectedPlatforms);
 
-    const QList<int> foundPlatforms = availableNdkPlatformsImpl(ndkPath, abis, hostOs);
+    const QList<int> foundPlatforms = AndroidConfig::availableNdkPlatformsImpl(ndkPath, abis, hostOs);
     QCOMPARE(foundPlatforms, expectedPlatforms);
 }
 
diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h
index 2aeb343ff8a..81477b408a8 100644
--- a/src/plugins/android/androidconfigurations.h
+++ b/src/plugins/android/androidconfigurations.h
@@ -9,14 +9,14 @@
 #include "androidsdkpackage.h"
 
 #include <projectexplorer/toolchain.h>
+
 #include <qtsupport/qtversionmanager.h>
 
 #include <utils/filepath.h>
 
-#include <QStringList>
-#include <QVector>
 #include <QHash>
 #include <QMap>
+#include <QStringList>
 #include <QVersionNumber>
 
 namespace ProjectExplorer { class Abi; }
@@ -28,154 +28,96 @@ namespace Internal { class AndroidSdkManager; }
 class CreateAvdInfo
 {
 public:
-    bool isValid() const { return systemImage && systemImage->isValid() && !name.isEmpty(); }
-    const SystemImage *systemImage = nullptr;
+    QString sdkStylePath;
+    int apiLevel = -1;
     QString name;
     QString abi;
     QString deviceDefinition;
     int sdcardSize = 0;
-    QString error; // only used in the return value of createAVD
-    bool overwrite = false;
-    bool cancelled = false;
 };
 
-struct SdkForQtVersions
-{
-    QList<QVersionNumber> versions;
-    QStringList essentialPackages;
+namespace AndroidConfig {
 
-public:
-    bool containsVersion(const QVersionNumber &qtVersion) const;
-};
+QString getAvdName(const QString &serialnumber);
+QStringList apiLevelNamesFor(const SdkPlatformList &platforms);
+QString apiLevelNameFor(const SdkPlatform *platform);
 
-class AndroidConfig
-{
-public:
-    void load(const Utils::QtcSettings &settings);
-    void save(Utils::QtcSettings &settings) const;
+Utils::FilePath sdkLocation();
+void setSdkLocation(const Utils::FilePath &sdkLocation);
+QVersionNumber sdkToolsVersion();
+QVersionNumber buildToolsVersion();
+QStringList sdkManagerToolArgs();
+void setSdkManagerToolArgs(const QStringList &args);
 
-    static QStringList apiLevelNamesFor(const SdkPlatformList &platforms);
-    static QString apiLevelNameFor(const SdkPlatform *platform);
+Utils::FilePath ndkLocation(const QtSupport::QtVersion *qtVersion);
+QVersionNumber ndkVersion(const QtSupport::QtVersion *qtVersion);
+QVersionNumber ndkVersion(const Utils::FilePath &ndkPath);
 
-    Utils::FilePath sdkLocation() const;
-    void setSdkLocation(const Utils::FilePath &sdkLocation);
-    QVersionNumber sdkToolsVersion() const;
-    Utils::FilePath sdkToolsVersionPath() const;
-    QVersionNumber buildToolsVersion() const;
-    QStringList sdkManagerToolArgs() const;
-    void setSdkManagerToolArgs(const QStringList &args);
+QUrl sdkToolsUrl();
+QByteArray getSdkToolsSha256();
 
-    Utils::FilePath ndkLocation(const QtSupport::QtVersion *qtVersion) const;
-    QVersionNumber ndkVersion(const QtSupport::QtVersion *qtVersion) const;
-    static QVersionNumber ndkVersion(const Utils::FilePath &ndkPath);
+QStringList allEssentials();
+bool allEssentialsInstalled(Internal::AndroidSdkManager *sdkManager);
+bool sdkToolsOk();
 
-    QUrl sdkToolsUrl() const { return m_sdkToolsUrl; }
-    QByteArray getSdkToolsSha256() const { return m_sdkToolsSha256; }
-    Utils::FilePath ndkSubPathFromQtVersion(const QtSupport::QtVersion &version) const; // relative!
+Utils::FilePath openJDKLocation();
+void setOpenJDKLocation(const Utils::FilePath &openJDKLocation);
 
-    QStringList defaultEssentials() const;
-    QStringList essentialsFromQtVersion(const QtSupport::QtVersion &version) const;
-    QStringList allEssentials() const;
-    bool allEssentialsInstalled(Internal::AndroidSdkManager *sdkManager);
-    bool sdkToolsOk() const;
+QString toolchainHost(const QtSupport::QtVersion *qtVersion);
+QString toolchainHostFromNdk(const Utils::FilePath &ndkPath);
 
-    Utils::FilePath openJDKLocation() const;
-    void setOpenJDKLocation(const Utils::FilePath &openJDKLocation);
+QString emulatorArgs();
+void setEmulatorArgs(const QString &args);
 
-    Utils::FilePath keystoreLocation() const;
+bool automaticKitCreation();
+void setAutomaticKitCreation(bool b);
 
-    QString toolchainHost(const QtSupport::QtVersion *qtVersion) const;
-    static QString toolchainHostFromNdk(const Utils::FilePath &ndkPath);
+Utils::FilePath defaultSdkPath();
+Utils::FilePath adbToolPath();
+Utils::FilePath emulatorToolPath();
+Utils::FilePath sdkManagerToolPath();
+Utils::FilePath avdManagerToolPath();
 
-    QString emulatorArgs() const;
-    void setEmulatorArgs(const QString &args);
+void setTemporarySdkToolsPath(const Utils::FilePath &path);
 
-    bool automaticKitCreation() const;
-    void setAutomaticKitCreation(bool b);
+Utils::FilePath toolchainPath(const QtSupport::QtVersion *qtVersion);
+Utils::FilePath toolchainPathFromNdk(
+    const Utils::FilePath &ndkLocation, Utils::OsType hostOs = Utils::HostOsInfo::hostOs());
+Utils::FilePath clangPathFromNdk(const Utils::FilePath &ndkLocation);
 
-    static Utils::FilePath defaultSdkPath();
-    Utils::FilePath adbToolPath() const;
-    Utils::FilePath emulatorToolPath() const;
-    Utils::FilePath sdkManagerToolPath() const;
-    Utils::FilePath avdManagerToolPath() const;
+Utils::FilePath makePathFromNdk(const Utils::FilePath &ndkLocation);
 
-    void setTemporarySdkToolsPath(const Utils::FilePath &path);
+Utils::FilePath keytoolPath();
 
-    Utils::FilePath toolchainPath(const QtSupport::QtVersion *qtVersion) const;
-    static Utils::FilePath toolchainPathFromNdk(const Utils::FilePath &ndkLocation,
-                                                Utils::OsType hostOs = Utils::HostOsInfo::hostOs());
-    static Utils::FilePath clangPathFromNdk(const Utils::FilePath &ndkLocation);
+QStringList devicesCommandOutput();
 
-    Utils::FilePath gdbPath(const ProjectExplorer::Abi &abi, const QtSupport::QtVersion *qtVersion) const;
-    static Utils::FilePath gdbPathFromNdk(const ProjectExplorer::Abi &abi,
-                                          const Utils::FilePath &ndkLocation);
-    static Utils::FilePath lldbPathFromNdk(const Utils::FilePath &ndkLocation);
-    static Utils::FilePath makePathFromNdk(const Utils::FilePath &ndkLocation);
+QString bestNdkPlatformMatch(int target, const QtSupport::QtVersion *qtVersion);
 
-    Utils::FilePath keytoolPath() const;
+QLatin1String displayName(const ProjectExplorer::Abi &abi);
 
-    QVector<AndroidDeviceInfo> connectedDevices(QString *error = nullptr) const;
+QString getProductModel(const QString &device);
+bool isConnected(const QString &serialNumber);
 
-    QString bestNdkPlatformMatch(int target, const QtSupport::QtVersion *qtVersion) const;
+bool sdkFullyConfigured();
+void setSdkFullyConfigured(bool allEssentialsInstalled);
 
-    static QLatin1String toolchainPrefix(const ProjectExplorer::Abi &abi);
-    static QLatin1String toolsPrefix(const ProjectExplorer::Abi &abi);
-    static QLatin1String displayName(const ProjectExplorer::Abi &abi);
+bool isValidNdk(const QString &ndkLocation);
+QStringList getCustomNdkList();
+void addCustomNdk(const QString &customNdk);
+void removeCustomNdk(const QString &customNdk);
+void setDefaultNdk(const Utils::FilePath &defaultNdk);
+Utils::FilePath defaultNdk();
 
-    QString getProductModel(const QString &device) const;
-    bool isConnected(const QString &serialNumber) const;
+Utils::FilePath openSslLocation();
+void setOpenSslLocation(const Utils::FilePath &openSslLocation);
 
-    bool sdkFullyConfigured() const { return m_sdkFullyConfigured; }
-    void setSdkFullyConfigured(bool allEssentialsInstalled) { m_sdkFullyConfigured = allEssentialsInstalled; }
+Utils::FilePath getJdkPath();
+QStringList getAbis(const QString &device);
+int getSDKVersion(const QString &device);
 
-    bool isValidNdk(const QString &ndkLocation) const;
-    QStringList getCustomNdkList() const;
-    void addCustomNdk(const QString &customNdk);
-    void removeCustomNdk(const QString &customNdk);
-    void setDefaultNdk(const Utils::FilePath &defaultNdk);
-    Utils::FilePath defaultNdk() const;
+Utils::Environment toolsEnvironment();
 
-    Utils::FilePath openSslLocation() const;
-    void setOpenSslLocation(const Utils::FilePath &openSslLocation);
-
-    static Utils::FilePath getJdkPath();
-    static QStringList getAbis(const QString &device);
-    static int getSDKVersion(const QString &device);
-
-    Utils::Environment toolsEnvironment() const;
-
-private:
-    static QString getDeviceProperty(const QString &device, const QString &property);
-
-    Utils::FilePath openJDKBinPath() const;
-    static QString getAvdName(const QString &serialnumber);
-
-    void parseDependenciesJson();
-
-    QList<int> availableNdkPlatforms(const QtSupport::QtVersion *qtVersion) const;
-
-    Utils::FilePath m_sdkLocation;
-    Utils::FilePath m_temporarySdkToolsPath;
-    QStringList m_sdkManagerToolArgs;
-    Utils::FilePath m_openJDKLocation;
-    Utils::FilePath m_keystoreLocation;
-    Utils::FilePath m_openSslLocation;
-    QString m_emulatorArgs;
-    bool m_automaticKitCreation = true;
-    QUrl m_sdkToolsUrl;
-    QByteArray m_sdkToolsSha256;
-    QStringList m_commonEssentialPkgs;
-    SdkForQtVersions m_defaultSdkDepends;
-    QList<SdkForQtVersions> m_specificQtVersions;
-    QStringList m_customNdkList;
-    Utils::FilePath m_defaultNdk;
-    bool m_sdkFullyConfigured = false;
-
-    //caches
-    mutable QHash<QString, QString> m_serialNumberToDeviceName;
-};
-
-AndroidConfig &androidConfig();
+} // namespace AndroidConfig
 
 class AndroidConfigurations : public QObject
 {
@@ -183,7 +125,7 @@ class AndroidConfigurations : public QObject
 
 public:
     static Internal::AndroidSdkManager *sdkManager();
-    static void setConfig(const AndroidConfig &config);
+    static void applyConfig();
     static AndroidConfigurations *instance();
 
     static void registerNewToolchains();
diff --git a/src/plugins/android/androidcreatekeystorecertificate.cpp b/src/plugins/android/androidcreatekeystorecertificate.cpp
index 9cd6d7ee4ae..004ce94f7b8 100644
--- a/src/plugins/android/androidcreatekeystorecertificate.cpp
+++ b/src/plugins/android/androidcreatekeystorecertificate.cpp
@@ -262,8 +262,8 @@ void AndroidCreateKeystoreCertificate::buttonBoxAccepted()
     if (!m_stateNameLineEdit->text().isEmpty())
         distinguishedNames += QLatin1String(", S=") + m_stateNameLineEdit->text().replace(',', QLatin1String("\\,"));
 
-    const CommandLine command(androidConfig().keytoolPath(),
-                            { "-genkey", "-keyalg", "RSA",
+    const CommandLine command(AndroidConfig::keytoolPath(),
+                             {"-genkey", "-keyalg", "RSA",
                               "-keystore",  m_keystoreFilePath.toString(),
                               "-storepass", keystorePassword(),
                               "-alias", certificateAlias(),
diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp
index cea404ef6f2..cb3d58a0682 100644
--- a/src/plugins/android/androiddebugsupport.cpp
+++ b/src/plugins/android/androiddebugsupport.cpp
@@ -110,8 +110,7 @@ void AndroidDebugSupport::start()
 
     QtSupport::QtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(kit);
     if (!HostOsInfo::isWindowsHost()
-        && (qtVersion
-            && androidConfig().ndkVersion(qtVersion) >= QVersionNumber(11, 0, 0))) {
+        && (qtVersion && AndroidConfig::ndkVersion(qtVersion) >= QVersionNumber(11, 0, 0))) {
         qCDebug(androidDebugSupportLog) << "UseTargetAsync: " << true;
         setUseTargetAsync(true);
     }
@@ -165,7 +164,7 @@ void AndroidDebugSupport::start()
 
         int sdkVersion = qMax(AndroidManager::minimumSDK(kit), minimumNdk);
         if (qtVersion) {
-            const FilePath ndkLocation = androidConfig().ndkLocation(qtVersion);
+            const FilePath ndkLocation = AndroidConfig::ndkLocation(qtVersion);
             FilePath sysRoot = ndkLocation
                     / "platforms"
                     / QString("android-%1").arg(sdkVersion)
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp
index 6e520d3721b..9c5681d0868 100644
--- a/src/plugins/android/androiddeployqtstep.cpp
+++ b/src/plugins/android/androiddeployqtstep.cpp
@@ -66,27 +66,45 @@ const QLatin1String InstallFailedUpdateIncompatible("INSTALL_FAILED_UPDATE_INCOM
 const QLatin1String InstallFailedPermissionModelDowngrade("INSTALL_FAILED_PERMISSION_MODEL_DOWNGRADE");
 const QLatin1String InstallFailedVersionDowngrade("INSTALL_FAILED_VERSION_DOWNGRADE");
 
+enum DeployErrorFlag
+{
+    NoError = 0,
+    InconsistentCertificates = 0x0001,
+    UpdateIncompatible = 0x0002,
+    PermissionModelDowngrade = 0x0004,
+    VersionDowngrade = 0x0008,
+    Failure = 0x0010
+};
+
+Q_DECLARE_FLAGS(DeployErrorFlags, DeployErrorFlag)
+
+static DeployErrorFlags parseDeployErrors(const QString &deployOutputLine)
+{
+    DeployErrorFlags errorCode = NoError;
+
+    if (deployOutputLine.contains(InstallFailedInconsistentCertificatesString))
+        errorCode |= InconsistentCertificates;
+    if (deployOutputLine.contains(InstallFailedUpdateIncompatible))
+        errorCode |= UpdateIncompatible;
+    if (deployOutputLine.contains(InstallFailedPermissionModelDowngrade))
+        errorCode |= PermissionModelDowngrade;
+    if (deployOutputLine.contains(InstallFailedVersionDowngrade))
+        errorCode |= VersionDowngrade;
+
+    return errorCode;
+}
+
 // AndroidDeployQtStep
 
 class AndroidDeployQtStep : public BuildStep
 {
     Q_OBJECT
 
-    enum DeployErrorCode
-    {
-        NoError = 0,
-        InconsistentCertificates = 0x0001,
-        UpdateIncompatible = 0x0002,
-        PermissionModelDowngrade = 0x0004,
-        VersionDowngrade = 0x0008,
-        Failure = 0x0010
-    };
-
 public:
     AndroidDeployQtStep(BuildStepList *bc, Id id);
 
 signals:
-    void askForUninstall(DeployErrorCode errorCode);
+    void askForUninstall(DeployErrorFlags errorCode);
 
 private:
     void runCommand(const CommandLine &command);
@@ -94,26 +112,17 @@ private:
     bool init() override;
     Tasking::GroupItem runRecipe() final;
     void gatherFilesToPull();
-    DeployErrorCode runDeploy(QPromise<void> &promise);
-    void slotAskForUninstall(DeployErrorCode errorCode);
+    DeployErrorFlags runDeploy(QPromise<void> &promise);
+    void slotAskForUninstall(DeployErrorFlags errorFlags);
 
     void runImpl(QPromise<void> &promise);
 
     QWidget *createConfigWidget() override;
 
-    void processReadyReadStdOutput(DeployErrorCode &errorCode);
+    void processReadyReadStdOutput(DeployErrorFlags &errorCode);
     void stdOutput(const QString &line);
-    void processReadyReadStdError(DeployErrorCode &errorCode);
+    void processReadyReadStdError(DeployErrorFlags &errorCode);
     void stdError(const QString &line);
-    DeployErrorCode parseDeployErrors(const QString &deployOutputLine) const;
-
-    friend void operator|=(DeployErrorCode &e1, const DeployErrorCode &e2) {
-        e1 = static_cast<AndroidDeployQtStep::DeployErrorCode>((int)e1 | (int)e2);
-    }
-
-    friend DeployErrorCode operator|(const DeployErrorCode &e1, const DeployErrorCode &e2) {
-        return static_cast<AndroidDeployQtStep::DeployErrorCode>((int)e1 | (int)e2);
-    }
 
     void reportWarningOrError(const QString &message, Task::TaskType type);
 
@@ -149,7 +158,7 @@ AndroidDeployQtStep::AndroidDeployQtStep(BuildStepList *parent, Id id)
     m_uninstallPreviousPackage.setValue(false);
 
     const QtSupport::QtVersion * const qt = QtSupport::QtKitAspect::qtVersion(kit());
-    const bool forced = qt && qt->qtVersion() < QVersionNumber(5, 4, 0);
+    const bool forced = qt && qt->qtVersion() < AndroidManager::firstQtWithAndroidDeployQt;
     if (forced) {
         m_uninstallPreviousPackage.setValue(true);
         m_uninstallPreviousPackage.setEnabled(false);
@@ -169,7 +178,7 @@ bool AndroidDeployQtStep::init()
         return false;
     }
 
-    m_androiddeployqtArgs = CommandLine();
+    m_androiddeployqtArgs = {};
 
     m_androidABIs = AndroidManager::applicationAbis(target());
     if (m_androidABIs.isEmpty()) {
@@ -277,7 +286,7 @@ bool AndroidDeployQtStep::init()
     if (m_uninstallPreviousPackageRun)
         m_manifestName = AndroidManager::manifestPath(target());
 
-    m_useAndroiddeployqt = version->qtVersion() >= QVersionNumber(5, 4, 0);
+    m_useAndroiddeployqt = version->qtVersion() >= AndroidManager::firstQtWithAndroidDeployQt;
     if (m_useAndroiddeployqt) {
         const QString buildKey = target()->activeBuildKey();
         const ProjectNode *node = target()->project()->findNodeForBuildKey(buildKey);
@@ -288,7 +297,7 @@ bool AndroidDeployQtStep::init()
         m_apkPath = FilePath::fromString(node->data(Constants::AndroidApk).toString());
         if (!m_apkPath.isEmpty()) {
             m_manifestName = FilePath::fromString(node->data(Constants::AndroidManifest).toString());
-            m_command = androidConfig().adbToolPath();
+            m_command = AndroidConfig::adbToolPath();
             AndroidManager::setManifestPath(target(), m_manifestName);
         } else {
             QString jsonFile = AndroidQtVersion::androidDeploymentSettings(target()).toString();
@@ -326,22 +335,21 @@ bool AndroidDeployQtStep::init()
         }
     } else {
         m_uninstallPreviousPackageRun = true;
-        m_command = androidConfig().adbToolPath();
+        m_command = AndroidConfig::adbToolPath();
         m_apkPath = AndroidManager::packagePath(target());
         m_workingDirectory = bc ? AndroidManager::buildDirectory(target()): FilePath();
     }
     m_environment = bc ? bc->environment() : Environment();
 
-    m_adbPath = androidConfig().adbToolPath();
+    m_adbPath = AndroidConfig::adbToolPath();
 
-    AndroidAvdManager avdManager;
     // Start the AVD if not running.
-    if (!m_avdName.isEmpty() && avdManager.findAvd(m_avdName).isEmpty())
-        avdManager.startAvdAsync(m_avdName);
+    if (!m_avdName.isEmpty() && AndroidAvdManager::findAvd(m_avdName).isEmpty())
+        AndroidAvdManager::startAvdAsync(m_avdName);
     return true;
 }
 
-AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::runDeploy(QPromise<void> &promise)
+DeployErrorFlags AndroidDeployQtStep::runDeploy(QPromise<void> &promise)
 {
     CommandLine cmd(m_command);
     if (m_useAndroiddeployqt && m_apkPath.isEmpty()) {
@@ -356,23 +364,24 @@ AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::runDeploy(QPromise<voi
 
     } else {
         RunConfiguration *rc = target()->activeRunConfiguration();
-        QTC_ASSERT(rc, return DeployErrorCode::Failure);
+        QTC_ASSERT(rc, return Failure);
         QString packageName;
 
         if (m_uninstallPreviousPackageRun) {
-            packageName = AndroidManager::packageName(m_manifestName);
+            packageName = AndroidManager::packageName(target());
             if (packageName.isEmpty()) {
-                reportWarningOrError(Tr::tr("Cannot find the package name from the Android Manifest "
-                                            "file \"%1\".").arg(m_manifestName.toUserOutput()),
-                                     Task::Error);
+                reportWarningOrError(
+                    Tr::tr("Cannot find the package name from AndroidManifest.xml nor "
+                           "build.gradle files at \"%1\".")
+                        .arg(AndroidManager::androidBuildDirectory(target()).toUserOutput()),
+                    Task::Error);
                 return Failure;
             }
             const QString msg = Tr::tr("Uninstalling the previous package \"%1\".").arg(packageName);
             qCDebug(deployStepLog) << msg;
             emit addOutput(msg, OutputFormat::NormalMessage);
             runCommand({m_adbPath,
-                       AndroidDeviceInfo::adbSelector(m_serialNumber)
-                       << "uninstall" << packageName});
+                        {AndroidDeviceInfo::adbSelector(m_serialNumber), "uninstall", packageName}});
         }
 
         cmd.addArgs(AndroidDeviceInfo::adbSelector(m_serialNumber));
@@ -385,7 +394,7 @@ AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::runDeploy(QPromise<voi
     process.setEnvironment(m_environment);
     process.setUseCtrlCStub(true);
 
-    DeployErrorCode deployError = NoError;
+    DeployErrorFlags deployError = NoError;
 
     process.setStdOutLineCallback([this, &deployError](const QString &line) {
         deployError |= parseDeployErrors(line);
@@ -442,46 +451,32 @@ AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::runDeploy(QPromise<voi
     return deployError;
 }
 
-void AndroidDeployQtStep::slotAskForUninstall(DeployErrorCode errorCode)
+void AndroidDeployQtStep::slotAskForUninstall(DeployErrorFlags errorFlags)
 {
-    Q_ASSERT(errorCode > 0);
+    Q_ASSERT(errorFlags > 0);
 
-    QString uninstallMsg = Tr::tr("Deployment failed with the following errors:\n\n");
-    uint errorCodeFlags = errorCode;
-    uint mask = 1;
-    while (errorCodeFlags) {
-      switch (errorCodeFlags & mask) {
-      case DeployErrorCode::PermissionModelDowngrade:
-          uninstallMsg += InstallFailedPermissionModelDowngrade+"\n";
-          break;
-      case InconsistentCertificates:
-          uninstallMsg += InstallFailedInconsistentCertificatesString+"\n";
-          break;
-      case UpdateIncompatible:
-          uninstallMsg += InstallFailedUpdateIncompatible+"\n";
-          break;
-      case VersionDowngrade:
-          uninstallMsg += InstallFailedVersionDowngrade+"\n";
-          break;
-      default:
-          break;
-      }
-      errorCodeFlags &= ~mask;
-      mask <<= 1;
-    }
+    QString uninstallMsg = Tr::tr("Deployment failed with the following errors:") + "\n\n";
+    if (errorFlags & InconsistentCertificates)
+        uninstallMsg += InstallFailedInconsistentCertificatesString + '\n';
+    if (errorFlags & UpdateIncompatible)
+        uninstallMsg += InstallFailedUpdateIncompatible + '\n';
+    if (errorFlags & PermissionModelDowngrade)
+        uninstallMsg += InstallFailedPermissionModelDowngrade + '\n';
+    if (errorFlags & VersionDowngrade)
+        uninstallMsg += InstallFailedVersionDowngrade + '\n';
+    uninstallMsg += '\n';
+    uninstallMsg.append(Tr::tr("Uninstalling the installed package may solve the issue.") + '\n');
+    uninstallMsg.append(Tr::tr("Do you want to uninstall the existing package?"));
 
-    uninstallMsg.append(Tr::tr("\nUninstalling the installed package may solve the issue.\n"
-                               "Do you want to uninstall the existing package?"));
-    int button = QMessageBox::critical(nullptr, Tr::tr("Install failed"), uninstallMsg,
-                                       QMessageBox::Yes, QMessageBox::No);
-    m_askForUninstall = button == QMessageBox::Yes;
+    m_askForUninstall = QMessageBox::critical(nullptr, Tr::tr("Install failed"), uninstallMsg,
+                        QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes;
 }
 
 // TODO: This implementation is not thread safe.
 void AndroidDeployQtStep::runImpl(QPromise<void> &promise)
 {
     if (!m_avdName.isEmpty()) {
-        const QString serialNumber = AndroidAvdManager().waitForAvd(m_avdName, promise.future());
+        const QString serialNumber = AndroidAvdManager::waitForAvd(m_avdName, promise.future());
         qCDebug(deployStepLog) << "Deploying to AVD:" << m_avdName << serialNumber;
         if (serialNumber.isEmpty()) {
             reportWarningOrError(Tr::tr("The deployment AVD \"%1\" cannot be started.")
@@ -494,8 +489,8 @@ void AndroidDeployQtStep::runImpl(QPromise<void> &promise)
         AndroidManager::setDeviceSerialNumber(target(), serialNumber);
     }
 
-    DeployErrorCode returnValue = runDeploy(promise);
-    if (returnValue > DeployErrorCode::NoError && returnValue < DeployErrorCode::Failure) {
+    DeployErrorFlags returnValue = runDeploy(promise);
+    if (returnValue > NoError && returnValue < Failure) {
         emit askForUninstall(returnValue);
         if (m_askForUninstall) {
             m_uninstallPreviousPackageRun = true;
@@ -519,9 +514,8 @@ void AndroidDeployQtStep::runImpl(QPromise<void> &promise)
             reportWarningOrError(error, Task::Error);
         }
 
-        runCommand({m_adbPath,
-                   AndroidDeviceInfo::adbSelector(m_serialNumber)
-                   << "pull" << itr.key() << itr.value().nativePath()});
+        runCommand({m_adbPath, {AndroidDeviceInfo::adbSelector(m_serialNumber), "pull", itr.key(),
+                                itr.value().nativePath()}});
         if (!itr.value().exists()) {
             const QString error = Tr::tr("Package deploy: Failed to pull \"%1\" to \"%2\".")
                     .arg(itr.key())
@@ -635,22 +629,6 @@ void AndroidDeployQtStep::stdError(const QString &line)
     }
 }
 
-AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::parseDeployErrors(
-        const QString &deployOutputLine) const
-{
-    DeployErrorCode errorCode = NoError;
-
-    if (deployOutputLine.contains(InstallFailedInconsistentCertificatesString))
-        errorCode |= InconsistentCertificates;
-    if (deployOutputLine.contains(InstallFailedUpdateIncompatible))
-        errorCode |= UpdateIncompatible;
-    if (deployOutputLine.contains(InstallFailedPermissionModelDowngrade))
-        errorCode |= PermissionModelDowngrade;
-    if (deployOutputLine.contains(InstallFailedVersionDowngrade))
-        errorCode |= VersionDowngrade;
-
-    return errorCode;
-}
 
 void AndroidDeployQtStep::reportWarningOrError(const QString &message, Task::TaskType type)
 {
diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp
index 1d87fa1ddd0..2e24eae73a8 100644
--- a/src/plugins/android/androiddevice.cpp
+++ b/src/plugins/android/androiddevice.cpp
@@ -2,14 +2,16 @@
 // Copyright (C) 2016 BogDan Vatra <bog_dan_ro@yahoo.com>
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
+#include "androiddevice.h"
+
 #include "androidavdmanager.h"
 #include "androidconfigurations.h"
 #include "androidconstants.h"
-#include "androiddevice.h"
 #include "androidmanager.h"
 #include "androidsignaloperation.h"
 #include "androidtr.h"
 #include "avddialog.h"
+#include "avdmanageroutputparser.h"
 
 #include <coreplugin/icore.h>
 
@@ -21,6 +23,8 @@
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/target.h>
 
+#include <solutions/tasking/tasktree.h>
+
 #include <utils/async.h>
 #include <utils/qtcprocess.h>
 #include <utils/qtcassert.h>
@@ -35,6 +39,7 @@
 #include <QTimer>
 
 using namespace ProjectExplorer;
+using namespace Tasking;
 using namespace Utils;
 
 namespace {
@@ -47,10 +52,159 @@ static constexpr char ipRegexStr[] = "(\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}
 static const QRegularExpression ipRegex = QRegularExpression(ipRegexStr);
 static constexpr char wifiDevicePort[] = "5555";
 
+enum TagModification { CommentOut, Uncomment };
+static class AndroidDeviceManagerInstance *s_instance = nullptr;
+
+class AndroidDeviceManagerInstance : public QObject
+{
+public:
+    AndroidDeviceManagerInstance(QObject *parent);
+    ~AndroidDeviceManagerInstance()
+    {
+        QTC_ASSERT(s_instance == this, return);
+        s_instance = nullptr;
+    }
+
+    void setupDevicesWatcher();
+    void eraseAvd(const IDevice::Ptr &device, QWidget *parent);
+
+    Group m_avdListRecipe;
+    TaskTreeRunner m_avdListRunner;
+    std::unique_ptr<Process> m_removeAvdProcess;
+    QFileSystemWatcher m_avdFileSystemWatcher;
+    Guard m_avdPathGuard;
+    std::unique_ptr<Process> m_adbDeviceWatcherProcess;
+};
+
+static QString displayNameFromInfo(const AndroidDeviceInfo &info)
+{
+    return info.type == IDevice::Hardware ? AndroidConfig::getProductModel(info.serialNumber)
+                                          : info.avdName;
+}
+
+static IDevice::DeviceState getDeviceState(const QString &serial, IDevice::MachineType type)
+{
+    const QStringList args = AndroidDeviceInfo::adbSelector(serial) << "shell" << "echo 1";
+    const SdkToolResult result = AndroidManager::runAdbCommand(args);
+    if (result.success())
+        return IDevice::DeviceReadyToUse;
+    else if (type == IDevice::Emulator || result.stdErr().contains("unauthorized"))
+        return IDevice::DeviceConnected;
+    return IDevice::DeviceDisconnected;
+}
+
+static void updateDeviceState(const IDevice::ConstPtr &device)
+{
+    const AndroidDevice *dev = static_cast<const AndroidDevice *>(device.get());
+    const QString serial = dev->serialNumber();
+    DeviceManager *const devMgr = DeviceManager::instance();
+    const Id id = dev->id();
+    if (!serial.isEmpty())
+        devMgr->setDeviceState(id, getDeviceState(serial, dev->machineType()));
+    else if (dev->machineType() == IDevice::Emulator)
+        devMgr->setDeviceState(id, IDevice::DeviceConnected);
+}
+
+static void startAvd(const IDevice::Ptr &device, QWidget *parent)
+{
+    Q_UNUSED(parent)
+    const AndroidDevice *androidDev = static_cast<const AndroidDevice *>(device.get());
+    const QString name = androidDev->avdName();
+    qCDebug(androidDeviceLog, "Starting Android AVD id \"%s\".", qPrintable(name));
+    Utils::futureSynchronizer()->addFuture(Utils::asyncRun([name, device](QPromise<void> &promise) {
+        const QString serialNumber = AndroidAvdManager::startAvd(name, promise.future());
+        // Mark the AVD as ReadyToUse once we know it's started
+        if (!serialNumber.isEmpty()) {
+            DeviceManager *const devMgr = DeviceManager::instance();
+            devMgr->setDeviceState(device->id(), IDevice::DeviceReadyToUse);
+        }
+    }));
+}
+
+static void setEmulatorArguments(QWidget *parent)
+{
+    const QString helpUrl =
+        "https://developer.android.com/studio/run/emulator-commandline#startup-options";
+
+    QInputDialog dialog(parent ? parent : Core::ICore::dialogParent());
+    dialog.setWindowTitle(Tr::tr("Emulator Command-line Startup Options"));
+    dialog.setLabelText(Tr::tr("Emulator command-line startup options "
+                               "(<a href=\"%1\">Help Web Page</a>):")
+                            .arg(helpUrl));
+    dialog.setTextValue(AndroidConfig::emulatorArgs());
+
+    if (auto label = dialog.findChild<QLabel *>()) {
+        label->setOpenExternalLinks(true);
+        label->setMinimumWidth(500);
+    }
+
+    if (dialog.exec() == QDialog::Accepted)
+        AndroidConfig::setEmulatorArgs(dialog.textValue());
+}
+
+static QString emulatorName(const QString &serialNumber)
+{
+    const QStringList args = AndroidDeviceInfo::adbSelector(serialNumber) << "emu" << "avd" << "name";
+    return AndroidManager::runAdbCommand(args).stdOut();
+}
+
+static QString getRunningAvdsSerialNumber(const QString &name)
+{
+    const QStringList lines = AndroidConfig::devicesCommandOutput();
+    for (const QString &line : lines) {
+        // skip the daemon logs
+        if (line.startsWith("* daemon"))
+            continue;
+
+        const QString serialNumber = line.left(line.indexOf('\t')).trimmed();
+        if (!serialNumber.startsWith("emulator"))
+            continue;
+
+        const QString stdOut = emulatorName(serialNumber);
+        if (stdOut.isEmpty())
+            continue; // Not an avd
+
+        if (stdOut.left(stdOut.indexOf('\n')) == name)
+            return serialNumber;
+    }
+    return {};
+}
+
+static FilePath avdFilePath()
+{
+    QString avdEnvVar = qtcEnvironmentVariable("ANDROID_AVD_HOME");
+    if (avdEnvVar.isEmpty()) {
+        avdEnvVar = qtcEnvironmentVariable("ANDROID_SDK_HOME");
+        if (avdEnvVar.isEmpty())
+            avdEnvVar = qtcEnvironmentVariable("HOME");
+        avdEnvVar.append("/.android/avd");
+    }
+    return FilePath::fromUserInput(avdEnvVar);
+}
+
+static IDevice::Ptr createDeviceFromInfo(const CreateAvdInfo &info)
+{
+    if (info.apiLevel < 0) {
+        qCWarning(androidDeviceLog) << "System image of the created AVD is nullptr";
+        return IDevice::Ptr();
+    }
+    AndroidDevice *dev = new AndroidDevice;
+    const Id deviceId = AndroidDevice::idFromAvdInfo(info);
+    dev->setupId(IDevice::AutoDetected, deviceId);
+    dev->setMachineType(IDevice::Emulator);
+    dev->settings()->displayName.setValue(info.name);
+    dev->setDeviceState(IDevice::DeviceConnected);
+    dev->setAvdPath(avdFilePath() / (info.name + ".avd"));
+    dev->setExtraData(Constants::AndroidAvdName, info.name);
+    dev->setExtraData(Constants::AndroidCpuAbi, {info.abi});
+    dev->setExtraData(Constants::AndroidSdk, info.apiLevel);
+    return IDevice::Ptr(dev);
+}
+
 class AndroidDeviceWidget : public IDeviceWidget
 {
 public:
-    AndroidDeviceWidget(const ProjectExplorer::IDevice::Ptr &device);
+    AndroidDeviceWidget(const IDevice::Ptr &device);
 
     void updateDeviceFromUi() final {}
     static QString dialogTitle();
@@ -60,6 +214,66 @@ public:
     static bool questionDialog(const QString &question, QWidget *parent = nullptr);
 };
 
+static void setupWifiForDevice(const IDevice::Ptr &device, QWidget *parent)
+{
+    if (device->deviceState() != IDevice::DeviceReadyToUse) {
+        AndroidDeviceWidget::infoDialog(
+            Tr::tr("The device has to be connected with ADB debugging "
+                   "enabled to use this feature."), parent);
+        return;
+    }
+
+    const auto androidDev = static_cast<const AndroidDevice *>(device.get());
+    const QStringList adbSelector = AndroidDeviceInfo::adbSelector(androidDev->serialNumber());
+    // prepare port
+    QStringList args = adbSelector;
+    args.append({"tcpip", wifiDevicePort});
+    const SdkToolResult result = AndroidManager::runAdbCommand(args);
+    if (!result.success()) {
+        AndroidDeviceWidget::criticalDialog(
+            Tr::tr("Opening connection port %1 failed.").arg(wifiDevicePort),
+            parent);
+        return;
+    }
+
+    QTimer::singleShot(2000, parent, [adbSelector, parent] {
+        // Get device IP address
+        QStringList args = adbSelector;
+        args.append({"shell", "ip", "route"});
+        const SdkToolResult ipRes = AndroidManager::runAdbCommand(args);
+        if (!ipRes.success()) {
+            AndroidDeviceWidget::criticalDialog(
+                Tr::tr("Retrieving the device IP address failed."), parent);
+            return;
+        }
+
+        // Expected output from "ip route" is:
+        // 192.168.1.0/24 dev wlan0 proto kernel scope link src 192.168.1.190
+        // where the ip of interest is at the end of the line
+        const QStringList ipParts = ipRes.stdOut().split(" ");
+        QString ip;
+        if (!ipParts.isEmpty()) {
+            ip = ipParts.last();
+        }
+        if (!ipRegex.match(ipParts.last()).hasMatch()) {
+            AndroidDeviceWidget::criticalDialog(
+                Tr::tr("The retrieved IP address is invalid."), parent);
+            return;
+        }
+
+        // Connect to device
+        args = adbSelector;
+        args.append({"connect", QString("%1:%2").arg(ip).arg(wifiDevicePort)});
+        const SdkToolResult connectRes = AndroidManager::runAdbCommand(args);
+        if (!connectRes.success()) {
+            AndroidDeviceWidget::criticalDialog(
+                Tr::tr("Connecting to the device IP \"%1\" failed.").arg(ip),
+                parent);
+            return;
+        }
+    });
+}
+
 AndroidDeviceWidget::AndroidDeviceWidget(const IDevice::Ptr &device)
     : IDeviceWidget(device)
 {
@@ -158,7 +372,7 @@ AndroidDevice::AndroidDevice()
 
     addDeviceAction({Tr::tr("Refresh"), [](const IDevice::Ptr &device, QWidget *parent) {
         Q_UNUSED(parent)
-        AndroidDeviceManager::instance()->updateDeviceState(device);
+        updateDeviceState(device);
     }});
 }
 
@@ -188,26 +402,26 @@ void AndroidDevice::addActionsIfNotFound()
     if (machineType() == Emulator) {
         if (!hasStartAction) {
             addDeviceAction({startAvdAction, [](const IDevice::Ptr &device, QWidget *parent) {
-                AndroidDeviceManager::instance()->startAvd(device, parent);
+                startAvd(device, parent);
             }});
         }
 
         if (!hasEraseAction) {
             addDeviceAction({eraseAvdAction, [](const IDevice::Ptr &device, QWidget *parent) {
-                AndroidDeviceManager::instance()->eraseAvd(device, parent);
+                s_instance->eraseAvd(device, parent);
             }});
         }
 
         if (!hasAvdArgumentsAction) {
             addDeviceAction({avdArgumentsAction, [](const IDevice::Ptr &device, QWidget *parent) {
                 Q_UNUSED(device)
-                AndroidDeviceManager::instance()->setEmulatorArguments(parent);
+                setEmulatorArguments(parent);
             }});
         }
     } else if (machineType() == Hardware && !ipRegex.match(id().toString()).hasMatch()) {
         if (!hasSetupWifi) {
             addDeviceAction({setupWifi, [](const IDevice::Ptr &device, QWidget *parent) {
-                AndroidDeviceManager::instance()->setupWifiForDevice(device, parent);
+                setupWifiForDevice(device, parent);
             }});
         }
     }
@@ -237,17 +451,9 @@ AndroidDeviceInfo AndroidDevice::androidDeviceInfoFromIDevice(const IDevice *dev
     info.avdPath = FilePath::fromSettings(dev->extraData(Constants::AndroidAvdPath));
     info.sdk = dev->extraData(Constants::AndroidSdk).toInt();
     info.type = dev->machineType();
-
     return info;
 }
 
-QString AndroidDevice::displayNameFromInfo(const AndroidDeviceInfo &info)
-{
-    return info.type == IDevice::Hardware
-            ? androidConfig().getProductModel(info.serialNumber)
-            : info.avdName;
-}
-
 Id AndroidDevice::idFromDeviceInfo(const AndroidDeviceInfo &info)
 {
     const QString id = (info.type == IDevice::Hardware ? info.serialNumber : info.avdName);
@@ -256,7 +462,7 @@ Id AndroidDevice::idFromDeviceInfo(const AndroidDeviceInfo &info)
 
 Id AndroidDevice::idFromAvdInfo(const CreateAvdInfo &info)
 {
-    return  Id(Constants::ANDROID_DEVICE_ID).withSuffix(':' + info.name);
+    return Id(Constants::ANDROID_DEVICE_ID).withSuffix(':' + info.name);
 }
 
 QStringList AndroidDevice::supportedAbis() const
@@ -315,8 +521,7 @@ QString AndroidDevice::serialNumber() const
     const QString serialNumber = extraData(Constants::AndroidSerialNumber).toString();
     if (machineType() == Hardware)
         return serialNumber;
-
-    return AndroidDeviceManager::instance()->getRunningAvdsSerialNumber(avdName());
+    return getRunningAvdsSerialNumber(avdName());
 }
 
 QString AndroidDevice::avdName() const
@@ -410,331 +615,7 @@ void AndroidDevice::initAvdSettings()
     m_avdSettings.reset(new QSettings(configPath.toUserOutput(), QSettings::IniFormat));
 }
 
-void AndroidDeviceManager::updateAvdsList()
-{
-    if (!m_avdsFutureWatcher.isRunning() && androidConfig().adbToolPath().exists())
-        m_avdsFutureWatcher.setFuture(m_avdManager.avdList());
-}
-
-IDevice::DeviceState AndroidDeviceManager::getDeviceState(const QString &serial,
-                                                          IDevice::MachineType type) const
-{
-    const QStringList args = AndroidDeviceInfo::adbSelector(serial) << "shell" << "echo 1";
-    const SdkToolResult result = AndroidManager::runAdbCommand(args);
-    if (result.success())
-        return IDevice::DeviceReadyToUse;
-    else if (type == IDevice::Emulator || result.stdErr().contains("unauthorized"))
-        return IDevice::DeviceConnected;
-
-    return IDevice::DeviceDisconnected;
-}
-
-void AndroidDeviceManager::updateDeviceState(const ProjectExplorer::IDevice::ConstPtr &device)
-{
-    const AndroidDevice *dev = static_cast<const AndroidDevice *>(device.get());
-    const QString serial = dev->serialNumber();
-    DeviceManager *const devMgr = DeviceManager::instance();
-    const Id id = dev->id();
-    if (!serial.isEmpty())
-        devMgr->setDeviceState(id, getDeviceState(serial, dev->machineType()));
-    else if (dev->machineType() == IDevice::Emulator)
-        devMgr->setDeviceState(id, IDevice::DeviceConnected);
-}
-
-void AndroidDeviceManager::startAvd(const ProjectExplorer::IDevice::Ptr &device, QWidget *parent)
-{
-    Q_UNUSED(parent)
-    const AndroidDevice *androidDev = static_cast<const AndroidDevice *>(device.get());
-    const QString name = androidDev->avdName();
-    qCDebug(androidDeviceLog, "Starting Android AVD id \"%s\".", qPrintable(name));
-    auto future = Utils::asyncRun([this, name, device] {
-        const QString serialNumber = m_avdManager.startAvd(name);
-        // Mark the AVD as ReadyToUse once we know it's started
-        if (!serialNumber.isEmpty()) {
-            DeviceManager *const devMgr = DeviceManager::instance();
-            devMgr->setDeviceState(device->id(), IDevice::DeviceReadyToUse);
-        }
-    });
-    // TODO: use future!
-}
-
-void AndroidDeviceManager::eraseAvd(const IDevice::Ptr &device, QWidget *parent)
-{
-    if (!device)
-        return;
-
-    if (device->machineType() == IDevice::Hardware)
-        return;
-
-    const QString name = static_cast<const AndroidDevice *>(device.get())->avdName();
-    const QString question
-        = Tr::tr("Erase the Android AVD \"%1\"?\nThis cannot be undone.").arg(name);
-    if (!AndroidDeviceWidget::questionDialog(question, parent))
-        return;
-
-    qCDebug(androidDeviceLog) << QString("Erasing Android AVD \"%1\" from the system.").arg(name);
-    m_removeAvdProcess.reset(new Process);
-    const CommandLine command(androidConfig().avdManagerToolPath(), {"delete", "avd", "-n", name});
-    qCDebug(androidDeviceLog).noquote() << "Running command (removeAvd):" << command.toUserOutput();
-    m_removeAvdProcess->setEnvironment(androidConfig().toolsEnvironment());
-    m_removeAvdProcess->setCommand(command);
-    connect(m_removeAvdProcess.get(), &Process::done, this, [this, device] {
-        const QString name = device->displayName();
-        if (m_removeAvdProcess->result() == ProcessResult::FinishedWithSuccess) {
-            qCDebug(androidDeviceLog, "Android AVD id \"%s\" removed from the system.",
-                    qPrintable(name));
-            // Remove the device from QtC after it's been removed using avdmanager.
-            DeviceManager::instance()->removeDevice(device->id());
-        } else {
-            AndroidDeviceWidget::criticalDialog(Tr::tr("An error occurred while removing the "
-                                 "Android AVD \"%1\" using avdmanager tool.").arg(name));
-        }
-        m_removeAvdProcess.release()->deleteLater();
-    });
-    m_removeAvdProcess->start();
-}
-
-void AndroidDeviceManager::setupWifiForDevice(const IDevice::Ptr &device, QWidget *parent)
-{
-    if (device->deviceState() != IDevice::DeviceReadyToUse) {
-        AndroidDeviceWidget::infoDialog(
-                    Tr::tr("The device has to be connected with ADB debugging "
-                                      "enabled to use this feature."), parent);
-        return;
-    }
-
-    const auto androidDev = static_cast<const AndroidDevice *>(device.get());
-    const QStringList adbSelector = AndroidDeviceInfo::adbSelector(androidDev->serialNumber());
-    // prepare port
-    QStringList args = adbSelector;
-    args.append({"tcpip", wifiDevicePort});
-    const SdkToolResult result = AndroidManager::runAdbCommand(args);
-    if (!result.success()) {
-        AndroidDeviceWidget::criticalDialog(
-                    Tr::tr("Opening connection port %1 failed.").arg(wifiDevicePort),
-                    parent);
-        return;
-    }
-
-    QTimer::singleShot(2000, parent, [adbSelector, parent] {
-        // Get device IP address
-        QStringList args = adbSelector;
-        args.append({"shell", "ip", "route"});
-        const SdkToolResult ipRes = AndroidManager::runAdbCommand(args);
-        if (!ipRes.success()) {
-            AndroidDeviceWidget::criticalDialog(
-                        Tr::tr("Retrieving the device IP address failed."), parent);
-            return;
-        }
-
-        // Expected output from "ip route" is:
-        // 192.168.1.0/24 dev wlan0 proto kernel scope link src 192.168.1.190
-        // where the ip of interest is at the end of the line
-        const QStringList ipParts = ipRes.stdOut().split(" ");
-        QString ip;
-        if (!ipParts.isEmpty()) {
-            ip = ipParts.last();
-        }
-        if (!ipRegex.match(ipParts.last()).hasMatch()) {
-            AndroidDeviceWidget::criticalDialog(
-                        Tr::tr("The retrieved IP address is invalid."), parent);
-            return;
-        }
-
-        // Connect to device
-        args = adbSelector;
-        args.append({"connect", QString("%1:%2").arg(ip).arg(wifiDevicePort)});
-        const SdkToolResult connectRes = AndroidManager::runAdbCommand(args);
-        if (!connectRes.success()) {
-            AndroidDeviceWidget::criticalDialog(
-                        Tr::tr("Connecting to the device IP \"%1\" failed.").arg(ip),
-                        parent);
-            return;
-        }
-    });
-}
-
-QString AndroidDeviceManager::emulatorName(const QString &serialNumber) const
-{
-    QStringList args = AndroidDeviceInfo::adbSelector(serialNumber);
-    args.append({"emu", "avd", "name"});
-    return AndroidManager::runAdbCommand(args).stdOut();
-}
-
-void AndroidDeviceManager::setEmulatorArguments(QWidget *parent)
-{
-    const QString helpUrl =
-            "https://developer.android.com/studio/run/emulator-commandline#startup-options";
-
-    QInputDialog dialog(parent ? parent : Core::ICore::dialogParent());
-    dialog.setWindowTitle(Tr::tr("Emulator Command-line Startup Options"));
-    dialog.setLabelText(Tr::tr("Emulator command-line startup options "
-                                          "(<a href=\"%1\">Help Web Page</a>):")
-                            .arg(helpUrl));
-    dialog.setTextValue(androidConfig().emulatorArgs());
-
-    if (auto label = dialog.findChild<QLabel*>()) {
-        label->setOpenExternalLinks(true);
-        label->setMinimumWidth(500);
-    }
-
-    if (dialog.exec() != QDialog::Accepted)
-        return;
-
-    androidConfig().setEmulatorArgs(dialog.textValue());
-}
-
-QString AndroidDeviceManager::getRunningAvdsSerialNumber(const QString &name) const
-{
-    for (const AndroidDeviceInfo &dev : androidConfig().connectedDevices()) {
-        if (!dev.serialNumber.startsWith("emulator"))
-            continue;
-        const QString stdOut = emulatorName(dev.serialNumber);
-        if (stdOut.isEmpty())
-            continue; // Not an avd
-        const QStringList outputLines = stdOut.split('\n');
-        if (outputLines.size() > 1 && outputLines.first() == name)
-            return dev.serialNumber;
-    }
-
-    return {};
-}
-
-void AndroidDeviceManager::setupDevicesWatcher()
-{
-    if (!androidConfig().adbToolPath().exists()) {
-        qCDebug(androidDeviceLog) << "Cannot start ADB device watcher"
-                                  <<  "because adb path does not exist.";
-        return;
-    }
-
-    if (!m_adbDeviceWatcherProcess)
-        m_adbDeviceWatcherProcess.reset(new Process(this));
-
-    if (m_adbDeviceWatcherProcess->isRunning()) {
-        qCDebug(androidDeviceLog) << "ADB device watcher is already running.";
-        return;
-    }
-
-    connect(m_adbDeviceWatcherProcess.get(), &Process::done, this, [this] {
-        if (m_adbDeviceWatcherProcess->error() != QProcess::UnknownError) {
-            qCDebug(androidDeviceLog) << "ADB device watcher encountered an error:"
-                                      << m_adbDeviceWatcherProcess->errorString();
-            if (!m_adbDeviceWatcherProcess->isRunning()) {
-                qCDebug(androidDeviceLog) << "Restarting the ADB device watcher now.";
-                QTimer::singleShot(0, m_adbDeviceWatcherProcess.get(), &Process::start);
-            }
-        }
-        qCDebug(androidDeviceLog) << "ADB device watcher finished.";
-    });
-
-    m_adbDeviceWatcherProcess->setStdErrLineCallback([](const QString &error) {
-        qCDebug(androidDeviceLog) << "ADB device watcher error" << error; });
-    m_adbDeviceWatcherProcess->setStdOutLineCallback([this](const QString &output) {
-        HandleDevicesListChange(output);
-    });
-
-    const CommandLine command = CommandLine(androidConfig().adbToolPath(), {"track-devices"});
-    m_adbDeviceWatcherProcess->setCommand(command);
-    m_adbDeviceWatcherProcess->setWorkingDirectory(command.executable().parentDir());
-    m_adbDeviceWatcherProcess->setEnvironment(androidConfig().toolsEnvironment());
-    m_adbDeviceWatcherProcess->start();
-
-    // Setup AVD filesystem watcher to listen for changes when an avd is created/deleted,
-    // or started/stopped
-    QString avdEnvVar = qtcEnvironmentVariable("ANDROID_AVD_HOME");
-    if (avdEnvVar.isEmpty()) {
-        avdEnvVar = qtcEnvironmentVariable("ANDROID_SDK_HOME");
-        if (avdEnvVar.isEmpty())
-            avdEnvVar = qtcEnvironmentVariable("HOME");
-        avdEnvVar.append("/.android/avd");
-    }
-    const FilePath avdPath = FilePath::fromUserInput(avdEnvVar);
-    m_avdFileSystemWatcher.addPath(avdPath.toString());
-    connect(&m_avdsFutureWatcher, &QFutureWatcherBase::finished,
-            this,  &AndroidDeviceManager::HandleAvdsListChange);
-    connect(&m_avdFileSystemWatcher, &QFileSystemWatcher::directoryChanged, this, [this] {
-        // If the avd list upate command is running no need to call it again.
-        if (!m_avdsFutureWatcher.isRunning())
-            updateAvdsList();
-    });
-    // Call initial update
-    updateAvdsList();
-}
-
-void AndroidDeviceManager::HandleAvdsListChange()
-{
-    DeviceManager *const devMgr = DeviceManager::instance();
-
-    QVector<Id> existingAvds;
-    for (int i = 0; i < devMgr->deviceCount(); ++i) {
-        const IDevice::ConstPtr dev = devMgr->deviceAt(i);
-        const bool isEmulator = dev->machineType() == IDevice::Emulator;
-        if (isEmulator && dev->type() == Constants::ANDROID_DEVICE_TYPE)
-            existingAvds.append(dev->id());
-    }
-
-    QVector<Id> connectedDevs;
-    for (const AndroidDeviceInfo &item : m_avdsFutureWatcher.result()) {
-        const Id deviceId = AndroidDevice::idFromDeviceInfo(item);
-        const QString displayName = AndroidDevice::displayNameFromInfo(item);
-        IDevice::ConstPtr dev = devMgr->find(deviceId);
-        if (dev) {
-            const auto androidDev = static_cast<const AndroidDevice *>(dev.get());
-            // DeviceManager doens't seem to have a way to directly update the name, if the name
-            // of the device has changed, remove it and register it again with the new name.
-            // Also account for the case of an AVD registered through old QC which might have
-            // invalid data by checking if the avdPath is not empty.
-            if (dev->displayName() != displayName || androidDev->avdPath().toString().isEmpty()) {
-                devMgr->removeDevice(dev->id());
-            } else {
-                // Find the state of the AVD retrieved from the AVD watcher
-                const QString serial = getRunningAvdsSerialNumber(item.avdName);
-                if (!serial.isEmpty()) {
-                    const IDevice::DeviceState state = getDeviceState(serial, IDevice::Emulator);
-                    if (dev->deviceState() != state) {
-                        devMgr->setDeviceState(dev->id(), state);
-                        qCDebug(androidDeviceLog, "Device id \"%s\" changed its state.",
-                                dev->id().toString().toUtf8().data());
-                    }
-                } else {
-                    devMgr->setDeviceState(dev->id(), IDevice::DeviceConnected);
-                }
-                connectedDevs.append(dev->id());
-                continue;
-            }
-        }
-
-        AndroidDevice *newDev = new AndroidDevice();
-        newDev->setupId(IDevice::AutoDetected, deviceId);
-        newDev->settings()->displayName.setValue(displayName);
-        newDev->setMachineType(item.type);
-        newDev->setDeviceState(item.state);
-
-        newDev->setExtraData(Constants::AndroidAvdName, item.avdName);
-        newDev->setExtraData(Constants::AndroidSerialNumber, item.serialNumber);
-        newDev->setExtraData(Constants::AndroidCpuAbi, item.cpuAbi);
-        newDev->setExtraData(Constants::AndroidSdk, item.sdk);
-        newDev->setAvdPath(item.avdPath);
-
-        qCDebug(androidDeviceLog, "Registering new Android device id \"%s\".",
-                newDev->id().toString().toUtf8().data());
-        const IDevice::ConstPtr constNewDev = IDevice::ConstPtr(newDev);
-        devMgr->addDevice(IDevice::ConstPtr(constNewDev));
-        connectedDevs.append(constNewDev->id());
-    }
-
-    // Set devices no longer connected to disconnected state.
-    for (const Id &id : existingAvds) {
-        if (!connectedDevs.contains(id)) {
-                qCDebug(androidDeviceLog, "Removing AVD id \"%s\" because it no longer exists.",
-                        id.toString().toUtf8().data());
-                devMgr->removeDevice(id);
-        }
-    }
-}
-
-void AndroidDeviceManager::HandleDevicesListChange(const QString &serialNumber)
+static void handleDevicesListChange(const QString &serialNumber)
 {
     DeviceManager *const devMgr = DeviceManager::instance();
     const QStringList serialBits = serialNumber.split('\t');
@@ -771,7 +652,7 @@ void AndroidDeviceManager::HandleDevicesListChange(const QString &serialNumber)
         devMgr->setDeviceState(avdId, state);
     } else {
         const Id id = Id(Constants::ANDROID_DEVICE_ID).withSuffix(':' + serial);
-        QString displayName = androidConfig().getProductModel(serial);
+        QString displayName = AndroidConfig::getProductModel(serial);
         // Check if the device is connected via WiFi. A sample serial of such devices can be
         // like: "192.168.1.190:5555"
         static const auto ipRegex = QRegularExpression(ipRegexStr + QStringLiteral(":(\\d{1,5})"));
@@ -793,8 +674,8 @@ void AndroidDeviceManager::HandleDevicesListChange(const QString &serialNumber)
             newDev->setDeviceState(state);
 
             newDev->setExtraData(Constants::AndroidSerialNumber, serial);
-            newDev->setExtraData(Constants::AndroidCpuAbi, androidConfig().getAbis(serial));
-            newDev->setExtraData(Constants::AndroidSdk, androidConfig().getSDKVersion(serial));
+            newDev->setExtraData(Constants::AndroidCpuAbi, AndroidConfig::getAbis(serial));
+            newDev->setExtraData(Constants::AndroidSdk, AndroidConfig::getSDKVersion(serial));
 
             qCDebug(androidDeviceLog, "Registering new Android device id \"%s\".",
                     newDev->id().toString().toUtf8().data());
@@ -803,30 +684,310 @@ void AndroidDeviceManager::HandleDevicesListChange(const QString &serialNumber)
     }
 }
 
-static AndroidDeviceManager *s_instance = nullptr;
-
-AndroidDeviceManager *AndroidDeviceManager::instance()
+static void modifyManufacturerTag(const FilePath &avdPath, TagModification modification)
 {
-    return s_instance;
+    if (!avdPath.exists())
+        return;
+
+    const FilePath configFilePath = avdPath / "config.ini";
+    FileReader reader;
+    if (!reader.fetch(configFilePath, QIODevice::ReadOnly | QIODevice::Text))
+        return;
+
+    FileSaver saver(configFilePath);
+    QTextStream textStream(reader.data());
+    while (!textStream.atEnd()) {
+        QString line = textStream.readLine();
+        if (line.contains("hw.device.manufacturer")) {
+            if (modification == Uncomment)
+                line.replace("#", "");
+            else
+                line.prepend("#");
+        }
+        line.append("\n");
+        saver.write(line.toUtf8());
+    }
+    saver.finalize();
 }
 
-AndroidDeviceManager::AndroidDeviceManager(QObject *parent)
+static void handleAvdListChange(const AndroidDeviceInfoList &avdList)
+{
+    DeviceManager *const devMgr = DeviceManager::instance();
+
+    QList<Id> existingAvds;
+    for (int i = 0; i < devMgr->deviceCount(); ++i) {
+        const IDevice::ConstPtr dev = devMgr->deviceAt(i);
+        const bool isEmulator = dev->machineType() == IDevice::Emulator;
+        if (isEmulator && dev->type() == Constants::ANDROID_DEVICE_TYPE)
+            existingAvds.append(dev->id());
+    }
+
+    QList<Id> connectedDevs;
+    for (const AndroidDeviceInfo &item : avdList) {
+        const Id deviceId = AndroidDevice::idFromDeviceInfo(item);
+        const QString displayName = displayNameFromInfo(item);
+        IDevice::ConstPtr dev = devMgr->find(deviceId);
+        if (dev) {
+            const auto androidDev = static_cast<const AndroidDevice *>(dev.get());
+            // DeviceManager doens't seem to have a way to directly update the name, if the name
+            // of the device has changed, remove it and register it again with the new name.
+            // Also account for the case of an AVD registered through old QC which might have
+            // invalid data by checking if the avdPath is not empty.
+            if (dev->displayName() != displayName || androidDev->avdPath().toString().isEmpty()) {
+                devMgr->removeDevice(dev->id());
+            } else {
+                // Find the state of the AVD retrieved from the AVD watcher
+                const QString serial = getRunningAvdsSerialNumber(item.avdName);
+                if (!serial.isEmpty()) {
+                    const IDevice::DeviceState state = getDeviceState(serial, IDevice::Emulator);
+                    if (dev->deviceState() != state) {
+                        devMgr->setDeviceState(dev->id(), state);
+                        qCDebug(androidDeviceLog, "Device id \"%s\" changed its state.",
+                                dev->id().toString().toUtf8().data());
+                    }
+                } else {
+                    devMgr->setDeviceState(dev->id(), IDevice::DeviceConnected);
+                }
+                connectedDevs.append(dev->id());
+                continue;
+            }
+        }
+
+        AndroidDevice *newDev = new AndroidDevice;
+        newDev->setupId(IDevice::AutoDetected, deviceId);
+        newDev->settings()->displayName.setValue(displayName);
+        newDev->setMachineType(item.type);
+        newDev->setDeviceState(item.state);
+
+        newDev->setExtraData(Constants::AndroidAvdName, item.avdName);
+        newDev->setExtraData(Constants::AndroidSerialNumber, item.serialNumber);
+        newDev->setExtraData(Constants::AndroidCpuAbi, item.cpuAbi);
+        newDev->setExtraData(Constants::AndroidSdk, item.sdk);
+        newDev->setAvdPath(item.avdPath);
+
+        qCDebug(androidDeviceLog, "Registering new Android device id \"%s\".",
+                newDev->id().toString().toUtf8().data());
+        const IDevice::ConstPtr constNewDev = IDevice::ConstPtr(newDev);
+        devMgr->addDevice(IDevice::ConstPtr(constNewDev));
+        connectedDevs.append(constNewDev->id());
+    }
+
+    // Set devices no longer connected to disconnected state.
+    for (const Id &id : existingAvds) {
+        if (!connectedDevs.contains(id)) {
+            qCDebug(androidDeviceLog, "Removing AVD id \"%s\" because it no longer exists.",
+                    id.toString().toUtf8().data());
+            devMgr->removeDevice(id);
+        }
+    }
+}
+
+AndroidDeviceManagerInstance::AndroidDeviceManagerInstance(QObject *parent)
     : QObject(parent)
+    , m_avdListRecipe{}
 {
     QTC_ASSERT(!s_instance, return);
     s_instance = this;
+
+    const Storage<FilePaths> storage;
+
+    const LoopUntil iterator([storage](int iteration) {
+        return iteration == 0 || storage->count() > 0;
+    });
+
+    const auto onProcessSetup = [](Process &process) {
+        const CommandLine cmd(AndroidConfig::avdManagerToolPath(), {"list", "avd"});
+        qCDebug(androidDeviceLog).noquote() << "Running AVD Manager command:" << cmd.toUserOutput();
+        process.setEnvironment(AndroidConfig::toolsEnvironment());
+        process.setCommand(cmd);
+    };
+    const auto onProcessDone = [storage](const Process &process, DoneWith result) {
+        const QString output = process.allOutput();
+        if (result != DoneWith::Success) {
+            qCDebug(androidDeviceLog)
+                << "Avd list command failed" << output << AndroidConfig::sdkToolsVersion();
+            return DoneResult::Error;
+        }
+
+        const auto parsedAvdList = parseAvdList(output);
+        if (parsedAvdList.errorPaths.isEmpty()) {
+            for (const FilePath &avdPath : *storage)
+                modifyManufacturerTag(avdPath, Uncomment);
+            storage->clear(); // Don't repeat anymore
+            handleAvdListChange(parsedAvdList.avdList);
+        } else {
+            for (const FilePath &avdPath : parsedAvdList.errorPaths)
+                modifyManufacturerTag(avdPath, CommentOut);
+            storage->append(parsedAvdList.errorPaths);
+        }
+        return DoneResult::Success; // Repeat
+    };
+
+    // Currenly avdmanager tool fails to parse some AVDs because the correct
+    // device definitions at devices.xml does not have some of the newest devices.
+    // Particularly, failing because of tag "hw.device.manufacturer", thus removing
+    // it would make paring successful. However, it has to be returned afterwards,
+    // otherwise, Android Studio would give an error during parsing also. So this fix
+    // aim to keep support for Qt Creator and Android Studio.
+
+    m_avdListRecipe = Group {
+        storage,
+        iterator,
+        ProcessTask(onProcessSetup, onProcessDone)
+    };
 }
 
-AndroidDeviceManager::~AndroidDeviceManager()
+void AndroidDeviceManagerInstance::setupDevicesWatcher()
 {
-    m_avdsFutureWatcher.waitForFinished();
-    QTC_ASSERT(s_instance == this, return);
-    s_instance = nullptr;
+    if (!AndroidConfig::adbToolPath().exists()) {
+        qCDebug(androidDeviceLog) << "Cannot start ADB device watcher"
+                                  <<  "because adb path does not exist.";
+        return;
+    }
+
+    if (!m_adbDeviceWatcherProcess)
+        m_adbDeviceWatcherProcess.reset(new Process(this));
+
+    if (m_adbDeviceWatcherProcess->isRunning()) {
+        qCDebug(androidDeviceLog) << "ADB device watcher is already running.";
+        return;
+    }
+
+    connect(m_adbDeviceWatcherProcess.get(), &Process::done, this, [this] {
+        if (m_adbDeviceWatcherProcess->error() != QProcess::UnknownError) {
+            qCDebug(androidDeviceLog) << "ADB device watcher encountered an error:"
+                                      << m_adbDeviceWatcherProcess->errorString();
+            if (!m_adbDeviceWatcherProcess->isRunning()) {
+                qCDebug(androidDeviceLog) << "Restarting the ADB device watcher now.";
+                QTimer::singleShot(0, m_adbDeviceWatcherProcess.get(), &Process::start);
+            }
+        }
+        qCDebug(androidDeviceLog) << "ADB device watcher finished.";
+    });
+
+    m_adbDeviceWatcherProcess->setStdErrLineCallback([](const QString &error) {
+        qCDebug(androidDeviceLog) << "ADB device watcher error" << error; });
+    m_adbDeviceWatcherProcess->setStdOutLineCallback([](const QString &output) {
+        handleDevicesListChange(output);
+    });
+
+    const CommandLine command{AndroidConfig::adbToolPath(), {"track-devices"}};
+    m_adbDeviceWatcherProcess->setCommand(command);
+    m_adbDeviceWatcherProcess->setWorkingDirectory(command.executable().parentDir());
+    m_adbDeviceWatcherProcess->setEnvironment(AndroidConfig::toolsEnvironment());
+    m_adbDeviceWatcherProcess->start();
+
+    // Setup AVD filesystem watcher to listen for changes when an avd is created/deleted,
+    // or started/stopped
+    m_avdFileSystemWatcher.addPath(avdFilePath().toString());
+    connect(&m_avdFileSystemWatcher, &QFileSystemWatcher::directoryChanged, this, [this] {
+        if (!m_avdPathGuard.isLocked())
+            AndroidDeviceManager::updateAvdList();
+    });
+    // Call initial update
+    AndroidDeviceManager::updateAvdList();
 }
 
+void AndroidDeviceManagerInstance::eraseAvd(const IDevice::Ptr &device, QWidget *parent)
+{
+    if (!device)
+        return;
+
+    if (device->machineType() == IDevice::Hardware)
+        return;
+
+    const QString name = static_cast<const AndroidDevice *>(device.get())->avdName();
+    const QString question
+        = Tr::tr("Erase the Android AVD \"%1\"?\nThis cannot be undone.").arg(name);
+    if (!AndroidDeviceWidget::questionDialog(question, parent))
+        return;
+
+    qCDebug(androidDeviceLog) << QString("Erasing Android AVD \"%1\" from the system.").arg(name);
+    m_removeAvdProcess.reset(new Process);
+    const CommandLine command(AndroidConfig::avdManagerToolPath(), {"delete", "avd", "-n", name});
+    qCDebug(androidDeviceLog).noquote() << "Running command (removeAvd):" << command.toUserOutput();
+    m_removeAvdProcess->setEnvironment(AndroidConfig::toolsEnvironment());
+    m_removeAvdProcess->setCommand(command);
+    connect(m_removeAvdProcess.get(), &Process::done, this, [this, device] {
+        const QString name = device->displayName();
+        if (m_removeAvdProcess->result() == ProcessResult::FinishedWithSuccess) {
+            qCDebug(androidDeviceLog, "Android AVD id \"%s\" removed from the system.",
+                    qPrintable(name));
+            // Remove the device from QtC after it's been removed using avdmanager.
+            DeviceManager::instance()->removeDevice(device->id());
+        } else {
+            AndroidDeviceWidget::criticalDialog(Tr::tr("An error occurred while removing the "
+                                                       "Android AVD \"%1\" using avdmanager tool.").arg(name));
+        }
+        m_removeAvdProcess.release()->deleteLater();
+    });
+    m_removeAvdProcess->start();
+}
+
+namespace AndroidDeviceManager {
+
+void setupDevicesWatcher() { s_instance->setupDevicesWatcher(); }
+
+void updateAvdList()
+{
+    if (AndroidConfig::adbToolPath().exists())
+        s_instance->m_avdListRunner.start(s_instance->m_avdListRecipe);
+}
+
+expected_str<void> createAvd(const CreateAvdInfo &info, bool force)
+{
+    CommandLine cmd(AndroidConfig::avdManagerToolPath(), {"create", "avd", "-n", info.name});
+    cmd.addArgs({"-k", info.sdkStylePath});
+    if (info.sdcardSize > 0)
+        cmd.addArgs({"-c", QString("%1M").arg(info.sdcardSize)});
+
+    const QString deviceDef = info.deviceDefinition;
+    if (!deviceDef.isEmpty() && deviceDef != "Custom")
+        cmd.addArgs({"-d", deviceDef});
+
+    if (force)
+        cmd.addArg("-f");
+
+    Process process;
+    process.setProcessMode(ProcessMode::Writer);
+    process.setEnvironment(AndroidConfig::toolsEnvironment());
+    process.setCommand(cmd);
+    process.setWriteData("yes\n"); // yes to "Do you wish to create a custom hardware profile"
+
+    QByteArray buffer;
+    QObject::connect(&process, &Process::readyReadStandardOutput, &process, [&process, &buffer] {
+        // This interaction is needed only if there is no "-d" arg for the avdmanager command.
+        buffer += process.readAllRawStandardOutput();
+        if (buffer.endsWith(QByteArray("]:"))) {
+            // truncate to last line
+            const int index = buffer.lastIndexOf('\n');
+            if (index != -1)
+                buffer = buffer.mid(index);
+            if (buffer.contains("hw.gpu.enabled"))
+                process.write("yes\n");
+            else
+                process.write("\n");
+            buffer.clear();
+        }
+    });
+
+    GuardLocker locker(s_instance->m_avdPathGuard);
+    process.runBlocking();
+    if (process.result() != ProcessResult::FinishedWithSuccess) {
+        const QString stdErr = process.stdErr();
+        const QString errorMessage = stdErr.isEmpty() ? process.exitMessage()
+                                                      : process.exitMessage() + "\n\n" + stdErr;
+        return Utils::make_unexpected(errorMessage);
+    }
+    return {};
+}
+
+
+} // namespace AndroidDeviceManager
+
 // Factory
 
-class AndroidDeviceFactory final : public ProjectExplorer::IDeviceFactory
+class AndroidDeviceFactory final : public IDeviceFactory
 {
 public:
     AndroidDeviceFactory()
@@ -836,24 +997,26 @@ public:
         setCombinedIcon(":/android/images/androiddevicesmall.png",
                         ":/android/images/androiddevice.png");
         setConstructionFunction(&AndroidDevice::create);
-        if (androidConfig().sdkToolsOk()) {
-            setCreator([] {
-                AvdDialog dialog = AvdDialog(Core::ICore::dialogParent());
-                if (dialog.exec() != QDialog::Accepted)
-                    return IDevice::Ptr();
+        setCreator([] {
+            if (!AndroidConfig::sdkToolsOk()) {
+                AndroidDeviceWidget::infoDialog(Tr::tr("Android support is not yet configured."));
+                return IDevice::Ptr();
+            }
 
-                const IDevice::Ptr dev = dialog.device();
-                if (const auto androidDev = static_cast<AndroidDevice *>(dev.get())) {
-                    qCDebug(androidDeviceLog, "Created new Android AVD id \"%s\".",
-                            qPrintable(androidDev->avdName()));
-                } else {
-                    AndroidDeviceWidget::criticalDialog(
-                        Tr::tr("The device info returned from AvdDialog is invalid."));
-                }
+            AvdDialog dialog = AvdDialog(Core::ICore::dialogParent());
+            if (dialog.exec() != QDialog::Accepted)
+                return IDevice::Ptr();
 
-                return IDevice::Ptr(dev);
-            });
-        }
+            const IDevice::Ptr dev = createDeviceFromInfo(dialog.avdInfo());
+            if (const auto androidDev = static_cast<AndroidDevice *>(dev.get())) {
+                qCDebug(androidDeviceLog, "Created new Android AVD id \"%s\".",
+                        qPrintable(androidDev->avdName()));
+                return dev;
+            }
+            AndroidDeviceWidget::criticalDialog(
+                Tr::tr("The device info returned from AvdDialog is invalid."));
+            return IDevice::Ptr();
+        });
     }
 };
 
@@ -864,7 +1027,7 @@ void setupAndroidDevice()
 
 void setupAndroidDeviceManager(QObject *guard)
 {
-    (void) new AndroidDeviceManager(guard);
+    (void) new AndroidDeviceManagerInstance(guard);
 }
 
 } // Android::Internal
diff --git a/src/plugins/android/androiddevice.h b/src/plugins/android/androiddevice.h
index 57b386dc4d9..fbb7e0bccb6 100644
--- a/src/plugins/android/androiddevice.h
+++ b/src/plugins/android/androiddevice.h
@@ -4,14 +4,16 @@
 
 #pragma once
 
-#include "androidavdmanager.h"
 #include "androidconfigurations.h"
 #include "androiddeviceinfo.h"
 
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/devicesupport/idevicefactory.h>
 
-#include <QFutureWatcher>
+#include <solutions/tasking/tasktreerunner.h>
+
+#include <utils/guard.h>
+
 #include <QFileSystemWatcher>
 #include <QSettings>
 
@@ -27,7 +29,6 @@ public:
     static IDevice::Ptr create();
     static AndroidDeviceInfo androidDeviceInfoFromIDevice(const IDevice *dev);
 
-    static QString displayNameFromInfo(const AndroidDeviceInfo &info);
     static Utils::Id idFromDeviceInfo(const AndroidDeviceInfo &info);
     static Utils::Id idFromAvdInfo(const CreateAvdInfo &info);
 
@@ -69,40 +70,13 @@ private:
     std::unique_ptr<QSettings> m_avdSettings;
 };
 
-class AndroidDeviceManager : public QObject
-{
-public:
-    static AndroidDeviceManager *instance();
-    void setupDevicesWatcher();
-    void updateAvdsList();
-    IDevice::DeviceState getDeviceState(const QString &serial, IDevice::MachineType type) const;
-    void updateDeviceState(const ProjectExplorer::IDevice::ConstPtr &device);
+namespace AndroidDeviceManager {
 
-    void startAvd(const ProjectExplorer::IDevice::Ptr &device, QWidget *parent = nullptr);
-    void eraseAvd(const ProjectExplorer::IDevice::Ptr &device, QWidget *parent = nullptr);
-    void setupWifiForDevice(const ProjectExplorer::IDevice::Ptr &device, QWidget *parent = nullptr);
+void setupDevicesWatcher();
+void updateAvdList();
+Utils::expected_str<void> createAvd(const CreateAvdInfo &info, bool force);
 
-    void setEmulatorArguments(QWidget *parent = nullptr);
-
-    QString getRunningAvdsSerialNumber(const QString &name) const;
-
-private:
-    explicit AndroidDeviceManager(QObject *parent);
-    ~AndroidDeviceManager();
-
-    void HandleDevicesListChange(const QString &serialNumber);
-    void HandleAvdsListChange();
-
-    QString emulatorName(const QString &serialNumber) const;
-
-    QFutureWatcher<AndroidDeviceInfoList> m_avdsFutureWatcher;
-    std::unique_ptr<Utils::Process> m_removeAvdProcess;
-    QFileSystemWatcher m_avdFileSystemWatcher;
-    std::unique_ptr<Utils::Process> m_adbDeviceWatcherProcess;
-    AndroidAvdManager m_avdManager;
-
-    friend void setupAndroidDeviceManager(QObject *guard);
-};
+} // namespace AndroidDeviceManager
 
 void setupAndroidDevice();
 void setupAndroidDeviceManager(QObject *guard);
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index a2631f0c536..dac4eb3c8e4 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -34,6 +34,7 @@
 #include <QVersionNumber>
 
 using namespace Android::Internal;
+using namespace Core;
 using namespace ProjectExplorer;
 using namespace Utils;
 
@@ -50,19 +51,32 @@ const char qtcSignature[] = "This file is generated by QtCreator to be read by "
 
 static Q_LOGGING_CATEGORY(androidManagerLog, "qtc.android.androidManager", QtWarningMsg)
 
-class Library
+static std::optional<QDomElement> documentElement(const FilePath &fileName)
 {
-public:
-    int level = -1;
-    QStringList dependencies;
-    QString name;
-};
+    QFile file(fileName.toString());
+    if (!file.open(QIODevice::ReadOnly)) {
+        MessageManager::writeDisrupting(Tr::tr("Cannot open \"%1\".").arg(fileName.toUserOutput()));
+        return {};
+    }
+    QDomDocument doc;
+    if (!doc.setContent(file.readAll())) {
+        MessageManager::writeDisrupting(Tr::tr("Cannot parse \"%1\".").arg(fileName.toUserOutput()));
+        return {};
+    }
+    return doc.documentElement();
+}
 
-using LibrariesMap = QMap<QString, Library>;
-
-static bool openXmlFile(QDomDocument &doc, const FilePath &fileName);
-static bool openManifest(const Target *target, QDomDocument &doc);
-static int parseMinSdk(const QDomElement &manifestElem);
+static int parseMinSdk(const QDomElement &manifestElem)
+{
+    const QDomElement usesSdk = manifestElem.firstChildElement("uses-sdk");
+    if (!usesSdk.isNull() && usesSdk.hasAttribute("android:minSdkVersion")) {
+        bool ok;
+        int tmp = usesSdk.attribute("android:minSdkVersion").toInt(&ok);
+        if (ok)
+            return tmp;
+    }
+    return 0;
+}
 
 static const ProjectNode *currentProjectNode(const Target *target)
 {
@@ -71,30 +85,62 @@ static const ProjectNode *currentProjectNode(const Target *target)
 
 QString packageName(const Target *target)
 {
-    QDomDocument doc;
-    if (!openManifest(target, doc))
-        return {};
-    QDomElement manifestElem = doc.documentElement();
-    return manifestElem.attribute(QLatin1String("package"));
-}
+    QString packageName;
 
-QString packageName(const FilePath &manifestFile)
-{
-    QDomDocument doc;
-    if (!openXmlFile(doc, manifestFile))
-        return {};
-    QDomElement manifestElem = doc.documentElement();
-    return manifestElem.attribute(QLatin1String("package"));
+    // Check build.gradle
+    auto isComment = [](const QByteArray &trimmed) {
+        return trimmed.startsWith("//") || trimmed.startsWith('*') || trimmed.startsWith("/*");
+    };
+
+    const FilePath androidBuildDir = androidBuildDirectory(target);
+    const expected_str<QByteArray> gradleContents = androidBuildDir.pathAppended("build.gradle")
+                                                        .fileContents();
+    if (gradleContents) {
+        const auto lines = gradleContents->split('\n');
+        for (const auto &line : lines) {
+            const QByteArray trimmed = line.trimmed();
+            if (isComment(trimmed) || !trimmed.contains("namespace"))
+                continue;
+
+            int idx = trimmed.indexOf('=');
+            if (idx == -1)
+                idx = trimmed.indexOf(' ');
+            if (idx > -1) {
+                packageName = QString::fromUtf8(trimmed.mid(idx + 1).trimmed());
+                if (packageName == "androidPackageName") {
+                    // Check gradle.properties
+                    const QSettings gradleProperties = QSettings(
+                        androidBuildDir.pathAppended("gradle.properties").toFSPathString(),
+                        QSettings::IniFormat);
+                    packageName = gradleProperties.value("androidPackageName").toString();
+                } else {
+                    // Remove quotes
+                    if (packageName.size() > 2)
+                        packageName = packageName.remove(0, 1).chopped(1);
+                }
+
+                break;
+            }
+        }
+    }
+
+    if (packageName.isEmpty()) {
+        // Check AndroidManifest.xml
+        const auto element = documentElement(AndroidManager::manifestPath(target));
+        if (element)
+            packageName = element->attribute("package");
+    }
+
+    return packageName;
 }
 
 QString activityName(const Target *target)
 {
-    QDomDocument doc;
-    if (!openManifest(target, doc))
+    const auto element = documentElement(AndroidManager::manifestPath(target));
+    if (!element)
         return {};
-    QDomElement activityElem = doc.documentElement().firstChildElement(
-                QLatin1String("application")).firstChildElement(QLatin1String("activity"));
-    return activityElem.attribute(QLatin1String("android:name"));
+    return element->firstChildElement("application").firstChildElement("activity")
+                                                    .attribute("android:name");
 }
 
 static FilePath manifestSourcePath(const Target *target)
@@ -118,10 +164,11 @@ static FilePath manifestSourcePath(const Target *target)
 */
 int minimumSDK(const Target *target)
 {
-    QDomDocument doc;
-    if (!openXmlFile(doc, manifestSourcePath(target)))
+    const auto element = documentElement(manifestSourcePath(target));
+    if (!element)
         return minimumSDK(target->kit());
-    const int minSdkVersion = parseMinSdk(doc.documentElement());
+
+    const int minSdkVersion = parseMinSdk(*element);
     if (minSdkVersion == 0)
         return AndroidManager::defaultMinimumSDK(QtSupport::QtKitAspect::qtVersion(target->kit()));
     return minSdkVersion;
@@ -136,12 +183,12 @@ int minimumSDK(const Kit *kit)
     int minSdkVersion = -1;
     QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(kit);
     if (version && version->targetDeviceTypes().contains(Constants::ANDROID_DEVICE_TYPE)) {
-        FilePath stockManifestFilePath = FilePath::fromUserInput(
+        const FilePath stockManifestFilePath = FilePath::fromUserInput(
             version->prefix().toString() + "/src/android/templates/AndroidManifest.xml");
-        QDomDocument doc;
-        if (openXmlFile(doc, stockManifestFilePath)) {
-            minSdkVersion = parseMinSdk(doc.documentElement());
-        }
+
+        const auto element = documentElement(stockManifestFilePath);
+        if (element)
+            minSdkVersion = parseMinSdk(*element);
     }
     if (minSdkVersion == 0)
         return AndroidManager::defaultMinimumSDK(version);
@@ -190,25 +237,23 @@ QJsonObject deploymentSettings(const Target *target)
     QJsonObject settings;
     settings["_description"] = qtcSignature;
     settings["qt"] = qt->prefix().toString();
-    settings["ndk"] = androidConfig().ndkLocation(qt).toString();
-    settings["sdk"] = androidConfig().sdkLocation().toString();
+    settings["ndk"] = AndroidConfig::ndkLocation(qt).toString();
+    settings["sdk"] = AndroidConfig::sdkLocation().toString();
     if (!qt->supportsMultipleQtAbis()) {
         const QStringList abis = applicationAbis(target);
         QTC_ASSERT(abis.size() == 1, return {});
-        settings["stdcpp-path"] = (androidConfig().toolchainPath(qt)
+        settings["stdcpp-path"] = (AndroidConfig::toolchainPath(qt)
                                       / "sysroot/usr/lib"
                                       / archTriplet(abis.first())
                                       / "libc++_shared.so").toString();
     } else {
-        settings["stdcpp-path"] = androidConfig()
-                                      .toolchainPath(qt)
-                                      .pathAppended("sysroot/usr/lib")
-                                      .toString();
+        settings["stdcpp-path"]
+            = AndroidConfig::toolchainPath(qt).pathAppended("sysroot/usr/lib").toString();
     }
     settings["toolchain-prefix"] =  "llvm";
     settings["tool-prefix"] = "llvm";
     settings["useLLVM"] = true;
-    settings["ndk-host"] = androidConfig().toolchainHost(qt);
+    settings["ndk-host"] = AndroidConfig::toolchainHost(qt);
     return settings;
 }
 
@@ -240,7 +285,7 @@ bool isQt5CmakeProject(const ProjectExplorer::Target *target)
 {
     const QtSupport::QtVersion *qt = QtSupport::QtKitAspect::qtVersion(target->kit());
     const bool isQt5 = qt && qt->qtVersion() < QVersionNumber(6, 0, 0);
-    const Core::Context cmakeCtx = Core::Context(CMakeProjectManager::Constants::CMAKE_PROJECT_ID);
+    const Context cmakeCtx(CMakeProjectManager::Constants::CMAKE_PROJECT_ID);
     const bool isCmakeProject = (target->project()->projectContext() == cmakeCtx);
     return isQt5 && isCmakeProject;
 }
@@ -371,7 +416,7 @@ bool skipInstallationAndPackageSteps(const Target *target)
 
     const Project *p = target->project();
 
-    const Core::Context cmakeCtx = Core::Context(CMakeProjectManager::Constants::CMAKE_PROJECT_ID);
+    const Context cmakeCtx(CMakeProjectManager::Constants::CMAKE_PROJECT_ID);
     const bool isCmakeProject = p->projectContext() == cmakeCtx;
     if (isCmakeProject)
         return false; // CMake reports ProductType::Other for Android Apps
@@ -538,43 +583,6 @@ QString androidNameForApiLevel(int x)
     }
 }
 
-static void raiseError(const QString &reason)
-{
-    QMessageBox::critical(nullptr, Tr::tr("Error creating Android templates."), reason);
-}
-
-static bool openXmlFile(QDomDocument &doc, const FilePath &fileName)
-{
-    QFile f(fileName.toString());
-    if (!f.open(QIODevice::ReadOnly))
-        return false;
-
-    if (!doc.setContent(f.readAll())) {
-        raiseError(Tr::tr("Cannot parse \"%1\".").arg(fileName.toUserOutput()));
-        return false;
-    }
-    return true;
-}
-
-static bool openManifest(const Target *target, QDomDocument &doc)
-{
-    return openXmlFile(doc, AndroidManager::manifestPath(target));
-}
-
-static int parseMinSdk(const QDomElement &manifestElem)
-{
-    QDomElement usesSdk = manifestElem.firstChildElement(QLatin1String("uses-sdk"));
-    if (usesSdk.isNull())
-        return 0;
-    if (usesSdk.hasAttribute(QLatin1String("android:minSdkVersion"))) {
-        bool ok;
-        int tmp = usesSdk.attribute(QLatin1String("android:minSdkVersion")).toInt(&ok);
-        if (ok)
-            return tmp;
-    }
-    return 0;
-}
-
 void installQASIPackage(Target *target, const FilePath &packagePath)
 {
     const QStringList appAbis = AndroidManager::applicationAbis(target);
@@ -587,9 +595,9 @@ void installQASIPackage(Target *target, const FilePath &packagePath)
 
     QString deviceSerialNumber = info.serialNumber;
     if (info.type == IDevice::Emulator) {
-        deviceSerialNumber = AndroidAvdManager().startAvd(info.avdName);
+        deviceSerialNumber = AndroidAvdManager::startAvd(info.avdName);
         if (deviceSerialNumber.isEmpty())
-            Core::MessageManager::writeDisrupting(Tr::tr("Starting Android virtual device failed."));
+            MessageManager::writeDisrupting(Tr::tr("Starting Android virtual device failed."));
     }
 
     QStringList arguments = AndroidDeviceInfo::adbSelector(deviceSerialNumber);
@@ -600,7 +608,7 @@ void installQASIPackage(Target *target, const FilePath &packagePath)
         // TODO: Potential leak when the process is still running on Creator shutdown.
         QObject::connect(process, &Process::done, process, &QObject::deleteLater);
     } else {
-        Core::MessageManager::writeDisrupting(
+        MessageManager::writeDisrupting(
             Tr::tr("Android package installation failed.\n%1").arg(error));
     }
 }
@@ -609,7 +617,7 @@ bool checkKeystorePassword(const FilePath &keystorePath, const QString &keystore
 {
     if (keystorePasswd.isEmpty())
         return false;
-    const CommandLine cmd(androidConfig().keytoolPath(),
+    const CommandLine cmd(AndroidConfig::keytoolPath(),
                           {"-list", "-keystore", keystorePath.toUserOutput(),
                            "--storepass", keystorePasswd});
     Process proc;
@@ -630,7 +638,7 @@ bool checkCertificatePassword(const FilePath &keystorePath, const QString &keyst
         arguments << certificatePasswd;
 
     Process proc;
-    proc.setCommand({androidConfig().keytoolPath(), arguments});
+    proc.setCommand({AndroidConfig::keytoolPath(), arguments});
     proc.runBlocking(10s);
     return proc.result() == ProcessResult::FinishedWithSuccess;
 }
@@ -639,11 +647,11 @@ bool checkCertificateExists(const FilePath &keystorePath, const QString &keystor
                             const QString &alias)
 {
     // assumes that the keystore password is correct
-    QStringList arguments = { "-list", "-keystore", keystorePath.toUserOutput(),
-                              "--storepass", keystorePasswd, "-alias", alias };
+    const QStringList arguments = {"-list", "-keystore", keystorePath.toUserOutput(),
+                                   "--storepass", keystorePasswd, "-alias", alias};
 
     Process proc;
-    proc.setCommand({androidConfig().keytoolPath(), arguments});
+    proc.setCommand({AndroidConfig::keytoolPath(), arguments});
     proc.runBlocking(10s);
     return proc.result() == ProcessResult::FinishedWithSuccess;
 }
@@ -651,7 +659,7 @@ bool checkCertificateExists(const FilePath &keystorePath, const QString &keystor
 Process *startAdbProcess(const QStringList &args, QString *err)
 {
     std::unique_ptr<Process> process(new Process);
-    const FilePath adb = androidConfig().adbToolPath();
+    const FilePath adb = AndroidConfig::adbToolPath();
     const CommandLine command{adb, args};
     qCDebug(androidManagerLog).noquote() << "Running command (async):" << command.toUserOutput();
     process->setCommand(command);
@@ -689,7 +697,7 @@ static SdkToolResult runCommand(const CommandLine &command, const QByteArray &wr
 
 SdkToolResult runAdbCommand(const QStringList &args, const QByteArray &writeData, int timeoutS)
 {
-    return runCommand({androidConfig().adbToolPath(), args}, writeData, timeoutS);
+    return runCommand({AndroidConfig::adbToolPath(), args}, writeData, timeoutS);
 }
 
 } // namespace Android::AndroidManager
diff --git a/src/plugins/android/androidmanager.h b/src/plugins/android/androidmanager.h
index 7a141b58ce5..382768e898c 100644
--- a/src/plugins/android/androidmanager.h
+++ b/src/plugins/android/androidmanager.h
@@ -35,8 +35,10 @@ public:
 namespace AndroidManager
 {
 
+// With Qt 5.4, a couple of android tooling features moved over from Qt Creator to Qt.
+constexpr auto firstQtWithAndroidDeployQt = {5, 4, 0};
+
 QString packageName(const ProjectExplorer::Target *target);
-QString packageName(const Utils::FilePath &manifestFile);
 QString activityName(const ProjectExplorer::Target *target);
 
 QString deviceSerialNumber(const ProjectExplorer::Target *target);
diff --git a/src/plugins/android/androidmanifesteditorfactory.cpp b/src/plugins/android/androidmanifesteditorfactory.cpp
index 7a900a687ec..41d6af0861d 100644
--- a/src/plugins/android/androidmanifesteditorfactory.cpp
+++ b/src/plugins/android/androidmanifesteditorfactory.cpp
@@ -9,7 +9,6 @@
 
 #include <coreplugin/editormanager/ieditorfactory.h>
 
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorsettings.h>
 
 namespace Android::Internal {
@@ -18,10 +17,6 @@ class AndroidManifestEditorFactory final : public Core::IEditorFactory
 {
 public:
     AndroidManifestEditorFactory()
-        : m_actionHandler(Constants::ANDROID_MANIFEST_EDITOR_ID,
-                          Constants::ANDROID_MANIFEST_EDITOR_CONTEXT,
-                          TextEditor::TextEditorActionHandler::UnCommentSelection,
-                          [](Core::IEditor *editor) { return static_cast<AndroidManifestEditor *>(editor)->textEditor(); })
     {
         setId(Constants::ANDROID_MANIFEST_EDITOR_ID);
         setDisplayName(Tr::tr("Android Manifest editor"));
@@ -31,9 +26,6 @@ public:
             return androidManifestEditorWidget->editor();
         });
     }
-
-private:
-    TextEditor::TextEditorActionHandler m_actionHandler;
 };
 
 void setupAndroidManifestEditor()
diff --git a/src/plugins/android/androidmanifesteditoriconcontainerwidget.h b/src/plugins/android/androidmanifesteditoriconcontainerwidget.h
index dc7443e7452..28caf07c784 100644
--- a/src/plugins/android/androidmanifesteditoriconcontainerwidget.h
+++ b/src/plugins/android/androidmanifesteditoriconcontainerwidget.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include <QList>
 #include <QString>
-#include <QVector>
 #include <QWidget>
 
 #include <QCoreApplication>
@@ -30,7 +30,7 @@ public:
     void loadIcons();
     bool hasIcons() const;
 private:
-    QVector<AndroidManifestEditorIconWidget *> m_iconButtons;
+    QList<AndroidManifestEditorIconWidget *> m_iconButtons;
     QString m_iconFileName = QLatin1String("icon");
     bool m_hasIcons = false;
 signals:
diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp
index c941f3f43fc..049cd67404d 100644
--- a/src/plugins/android/androidmanifesteditorwidget.cpp
+++ b/src/plugins/android/androidmanifesteditorwidget.cpp
@@ -25,7 +25,6 @@
 #include <projectexplorer/projectwindow.h>
 #include <projectexplorer/target.h>
 
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditor.h>
 
 #include <utils/algorithm.h>
@@ -114,6 +113,7 @@ private:
 AndroidManifestEditorWidget::AndroidManifestEditorWidget()
 {
     m_textEditorWidget = new AndroidManifestTextEditorWidget(this);
+    m_textEditorWidget->setOptionalActions(TextEditor::OptionalActions::UnCommentSelection);
 
     initializePage();
 
@@ -592,7 +592,7 @@ void AndroidManifestEditorWidget::postSave()
     const FilePath docPath = m_textEditorWidget->textDocument()->filePath();
     if (Target *target = androidTarget(docPath)) {
         if (BuildConfiguration *bc = target->activeBuildConfiguration()) {
-            QString androidNdkPlatform = androidConfig().bestNdkPlatformMatch(
+            QString androidNdkPlatform = AndroidConfig::bestNdkPlatformMatch(
                 AndroidManager::minimumSDK(target),
                 QtSupport::QtKitAspect::qtVersion(
                     androidTarget(m_textEditorWidget->textDocument()->filePath())->kit()));
@@ -1406,7 +1406,7 @@ AndroidManifestTextEditorWidget::AndroidManifestTextEditorWidget(AndroidManifest
     setupGenericHighlighter();
     setMarksVisible(false);
 
-    // this context is used by the TextEditorActionHandler registered for the text editor in
+    // this context is used by the OptionalActions registered for the text editor in
     // the AndroidManifestEditorFactory
     m_context = new Core::IContext(this);
     m_context->setWidget(this);
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index e1217188bb7..2ab9e2f068f 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -112,8 +112,8 @@ class AndroidPlugin final : public ExtensionSystem::IPlugin
         setupJavaEditor();
         setupAndroidManifestEditor();
 
-        connect(KitManager::instance(), &KitManager::kitsLoaded,
-                this, &AndroidPlugin::kitsRestored);
+        connect(KitManager::instance(), &KitManager::kitsLoaded, this, &AndroidPlugin::kitsRestored,
+                Qt::SingleShotConnection);
 
         LanguageClient::LanguageClientSettings::registerClientType(
             {Android::Constants::JLS_SETTINGS_ID,
@@ -135,7 +135,7 @@ class AndroidPlugin final : public ExtensionSystem::IPlugin
                    return v->targetDeviceTypes().contains(Android::Constants::ANDROID_DEVICE_TYPE);
                }).isEmpty();
 
-        if (!androidConfig().sdkFullyConfigured() && qtForAndroidInstalled)
+        if (!AndroidConfig::sdkFullyConfigured() && qtForAndroidInstalled)
             askUserAboutAndroidSetup();
 
         AndroidConfigurations::registerNewToolchains();
@@ -145,8 +145,6 @@ class AndroidPlugin final : public ExtensionSystem::IPlugin
                     AndroidConfigurations::registerNewToolchains();
                     AndroidConfigurations::updateAutomaticKitList();
                 });
-        disconnect(KitManager::instance(), &KitManager::kitsLoaded,
-                   this, &AndroidPlugin::kitsRestored);
     }
 
     void askUserAboutAndroidSetup()
diff --git a/src/plugins/android/androidqmlpreviewworker.cpp b/src/plugins/android/androidqmlpreviewworker.cpp
index f194c6e9792..5570e540966 100644
--- a/src/plugins/android/androidqmlpreviewworker.cpp
+++ b/src/plugins/android/androidqmlpreviewworker.cpp
@@ -14,30 +14,27 @@
 #include <coreplugin/icore.h>
 
 #include <projectexplorer/buildsystem.h>
-#include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/environmentaspect.h>
-#include <projectexplorer/kit.h>
-#include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/runcontrol.h>
 #include <projectexplorer/target.h>
 
+#include <solutions/tasking/tasktreerunner.h>
+
 #include <qmlprojectmanager/qmlprojectconstants.h>
 
-#include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtkitaspect.h>
 
-#include <utils/async.h>
 #include <utils/qtcprocess.h>
 
 #include <QDateTime>
-#include <QDeadlineTimer>
-#include <QFutureWatcher>
-#include <QThread>
 
 using namespace ProjectExplorer;
+using namespace Tasking;
 using namespace Utils;
 
+using namespace std::chrono_literals;
+
 namespace Android::Internal {
 
 #define APP_ID "io.qt.qtdesignviewer"
@@ -45,7 +42,17 @@ namespace Android::Internal {
 class ApkInfo
 {
 public:
-    ApkInfo();
+    ApkInfo()
+        : abis{ProjectExplorer::Constants::ANDROID_ABI_X86,
+               ProjectExplorer::Constants::ANDROID_ABI_X86_64,
+               ProjectExplorer::Constants::ANDROID_ABI_ARM64_V8A,
+               ProjectExplorer::Constants::ANDROID_ABI_ARMEABI_V7A}
+        , appId(APP_ID)
+        , uploadDir("/data/local/tmp/" APP_ID "/")
+        // TODO Add possibility to run Qt5 built version of Qt Design Viewer
+        , activityId(APP_ID "/org.qtproject.qt.android.bindings.QtActivity")
+        , name("Qt Design Viewer")
+    {}
     const QStringList abis;
     const QString appId;
     const QString uploadDir;
@@ -53,18 +60,6 @@ public:
     const QString name;
 };
 
-ApkInfo::ApkInfo() :
-    abis({ProjectExplorer::Constants::ANDROID_ABI_X86,
-            ProjectExplorer::Constants::ANDROID_ABI_X86_64,
-            ProjectExplorer::Constants::ANDROID_ABI_ARM64_V8A,
-            ProjectExplorer::Constants::ANDROID_ABI_ARMEABI_V7A}),
-    appId(APP_ID),
-    uploadDir("/data/local/tmp/" APP_ID "/"),
-    // TODO Add possibility to run Qt5 built version of Qt Design Viewer
-    activityId(APP_ID "/org.qtproject.qt.android.bindings.QtActivity"),
-    name("Qt Design Viewer")
-{
-}
 
 Q_GLOBAL_STATIC(ApkInfo, apkInfo)
 
@@ -82,7 +77,6 @@ class AndroidQmlPreviewWorker : public RunWorker
     Q_OBJECT
 public:
     AndroidQmlPreviewWorker(RunControl *runControl);
-    ~AndroidQmlPreviewWorker();
 
 signals:
     void previewPidChanged();
@@ -96,10 +90,9 @@ private:
     bool preparePreviewArtefacts();
     bool uploadPreviewArtefacts();
 
+    CommandLine adbCommand(const QStringList &arguments) const;
     SdkToolResult runAdbCommand(const QStringList &arguments) const;
     SdkToolResult runAdbShellCommand(const QStringList &arguments) const;
-    int pidofPreview() const;
-    bool isPreviewRunning(int lastKnownPid = -1) const;
 
     void startPidWatcher();
     void startLogcat();
@@ -108,15 +101,15 @@ private:
     bool startPreviewApp();
     bool stopPreviewApp();
 
-    Utils::FilePath designViewerApkPath(const QString &abi) const;
-    Utils::FilePath createQmlrcFile(const Utils::FilePath &workFolder, const QString &basename);
+    FilePath designViewerApkPath(const QString &abi) const;
+    FilePath createQmlrcFile(const FilePath &workFolder, const QString &basename);
 
     RunControl *m_rc = nullptr;
     QString m_serialNumber;
     QStringList m_avdAbis;
     int m_viewerPid = -1;
-    QFutureWatcher<void> m_pidFutureWatcher;
-    Utils::Process m_logcatProcess;
+    TaskTreeRunner m_pidRunner;
+    Process m_logcatProcess;
     QString m_logcatStartTimeStamp;
     UploadInfo m_uploadInfo;
 };
@@ -133,6 +126,16 @@ FilePath AndroidQmlPreviewWorker::designViewerApkPath(const QString &abi) const
     return {};
 }
 
+CommandLine AndroidQmlPreviewWorker::adbCommand(const QStringList &arguments) const
+{
+    CommandLine cmd{AndroidConfig::adbToolPath()};
+    if (!m_serialNumber.isEmpty())
+        cmd.addArgs(AndroidDeviceInfo::adbSelector(m_serialNumber));
+    cmd.addArg("shell");
+    cmd.addArgs(arguments);
+    return cmd;
+}
+
 SdkToolResult AndroidQmlPreviewWorker::runAdbCommand(const QStringList &arguments) const
 {
     QStringList args;
@@ -147,44 +150,49 @@ SdkToolResult AndroidQmlPreviewWorker::runAdbShellCommand(const QStringList &arg
     return runAdbCommand(QStringList() << "shell" << arguments);
 }
 
-int AndroidQmlPreviewWorker::pidofPreview() const
-{
-    const QStringList command{"pidof", apkInfo()->appId};
-    const SdkToolResult res = runAdbShellCommand(command);
-    return res.success() ? res.stdOut().toInt() : -1;
-}
-
-bool AndroidQmlPreviewWorker::isPreviewRunning(int lastKnownPid) const
-{
-    const int pid = pidofPreview();
-    return (lastKnownPid > 1) ? lastKnownPid == pid : pid > 1;
-}
-
 void AndroidQmlPreviewWorker::startPidWatcher()
 {
-    m_pidFutureWatcher.setFuture(Utils::asyncRun([this] {
-        // wait for started
-        const int sleepTimeMs = 2000;
-        QDeadlineTimer deadline(20000);
-        while (!m_pidFutureWatcher.isCanceled() && !deadline.hasExpired()) {
-            if (m_viewerPid == -1) {
-                m_viewerPid = pidofPreview();
-                if (m_viewerPid > 0) {
-                    emit previewPidChanged();
-                    break;
-                }
-            }
-            QThread::msleep(sleepTimeMs);
-        }
+    const LoopUntil pidIterator([this](int) { return m_viewerPid <= 0; });
+    const LoopUntil alivePidIterator([this](int) { return m_viewerPid > 0; });
 
-        while (!m_pidFutureWatcher.isCanceled()) {
-            if (!isPreviewRunning(m_viewerPid)) {
-                stop();
-                break;
-            }
-            QThread::msleep(sleepTimeMs);
+    const auto onPidSetup = [this](Process &process) {
+        process.setCommand(adbCommand({"pidof", apkInfo()->appId}));
+    };
+    const auto onPidDone = [this](const Process &process) {
+        bool ok = false;
+        const int pid = process.cleanedStdOut().trimmed().toInt(&ok);
+        if (ok && pid > 0) {
+            m_viewerPid = pid;
+            // TODO: make a continuation task (logcat)
+            emit previewPidChanged();
         }
-    }));
+    };
+
+    const auto onAlivePidDone = [this](const Process &process) {
+        bool ok = false;
+        const int pid = process.cleanedStdOut().trimmed().toInt(&ok);
+        if (!ok || pid != m_viewerPid) {
+            m_viewerPid = -1;
+            stop();
+        }
+    };
+
+    const TimeoutTask timeout([](std::chrono::milliseconds &timeout) { timeout = 2s; });
+
+    const Group root {
+        Group {
+            pidIterator,
+            ProcessTask(onPidSetup, onPidDone, CallDoneIf::Success),
+            timeout
+        }.withTimeout(20s),
+        Group {
+            alivePidIterator,
+            ProcessTask(onPidSetup, onAlivePidDone),
+            timeout
+        }
+    };
+
+    m_pidRunner.start(root);
 }
 
 void AndroidQmlPreviewWorker::startLogcat()
@@ -192,7 +200,7 @@ void AndroidQmlPreviewWorker::startLogcat()
     QString args = QString("logcat --pid=%1").arg(m_viewerPid);
     if (!m_logcatStartTimeStamp.isEmpty())
         args += QString(" -T '%1'").arg(m_logcatStartTimeStamp);
-    CommandLine cmd(androidConfig().adbToolPath());
+    CommandLine cmd(AndroidConfig::adbToolPath());
     cmd.setArguments(args);
     m_logcatProcess.setCommand(cmd);
     m_logcatProcess.setUseCtrlCStub(true);
@@ -220,7 +228,7 @@ AndroidQmlPreviewWorker::AndroidQmlPreviewWorker(RunControl *runControl)
       m_rc(runControl)
 {
     connect(this, &RunWorker::started, this, &AndroidQmlPreviewWorker::startPidWatcher);
-    connect(this, &RunWorker::stopped, &m_pidFutureWatcher, &QFutureWatcher<void>::cancel);
+    connect(this, &RunWorker::stopped, &m_pidRunner, &TaskTreeRunner::reset);
     connect(this, &AndroidQmlPreviewWorker::previewPidChanged,
             this, &AndroidQmlPreviewWorker::startLogcat);
 
@@ -230,12 +238,6 @@ AndroidQmlPreviewWorker::AndroidQmlPreviewWorker(RunControl *runControl)
     });
 }
 
-AndroidQmlPreviewWorker::~AndroidQmlPreviewWorker()
-{
-    m_pidFutureWatcher.cancel();
-    m_pidFutureWatcher.waitForFinished();
-}
-
 void AndroidQmlPreviewWorker::start()
 {
     const SdkToolResult dateResult = runAdbCommand({"shell", "date", "+%s"});
@@ -254,7 +256,7 @@ void AndroidQmlPreviewWorker::start()
 
 void AndroidQmlPreviewWorker::stop()
 {
-    if (!isPreviewRunning(m_viewerPid) || stopPreviewApp())
+    if (m_viewerPid <= 0 || stopPreviewApp())
         appendMessage(Tr::tr("%1 has been stopped.").arg(apkInfo()->name), NormalMessageFormat);
     m_viewerPid = -1;
     reportStopped();
@@ -262,13 +264,12 @@ void AndroidQmlPreviewWorker::stop()
 
 bool AndroidQmlPreviewWorker::ensureAvdIsRunning()
 {
-    AndroidAvdManager avdMananager;
     QString devSN = AndroidManager::deviceSerialNumber(m_rc->target());
 
     if (devSN.isEmpty())
         devSN = m_serialNumber;
 
-    if (!avdMananager.isAvdBooted(devSN)) {
+    if (!AndroidAvdManager::isAvdBooted(devSN)) {
         const IDevice *dev = DeviceKitAspect::device(m_rc->target()->kit()).get();
         if (!dev) {
             appendMessage(Tr::tr("Selected device is invalid."), ErrorMessageFormat);
@@ -283,13 +284,13 @@ bool AndroidQmlPreviewWorker::ensureAvdIsRunning()
         if (devInfoLocal.isValid()) {
             if (dev->machineType() == IDevice::Emulator) {
                 appendMessage(Tr::tr("Launching AVD."), NormalMessageFormat);
-                devInfoLocal.serialNumber = avdMananager.startAvd(devInfoLocal.avdName);
+                devInfoLocal.serialNumber = AndroidAvdManager::startAvd(devInfoLocal.avdName);
             }
             if (devInfoLocal.serialNumber.isEmpty()) {
                 appendMessage(Tr::tr("Could not start AVD."), ErrorMessageFormat);
             } else {
                 m_serialNumber = devInfoLocal.serialNumber;
-                m_avdAbis = androidConfig().getAbis(m_serialNumber);
+                m_avdAbis = AndroidConfig::getAbis(m_serialNumber);
             }
             return !devInfoLocal.serialNumber.isEmpty();
         } else {
@@ -297,7 +298,7 @@ bool AndroidQmlPreviewWorker::ensureAvdIsRunning()
         }
         return false;
     }
-    m_avdAbis = androidConfig().getAbis(m_serialNumber);
+    m_avdAbis = AndroidConfig::getAbis(m_serialNumber);
     return true;
 }
 
@@ -459,7 +460,7 @@ bool AndroidQmlPreviewWorker::startPreviewApp()
     const QDir destDir(apkInfo()->uploadDir);
     const QString qmlrcPath = destDir.filePath(m_uploadInfo.uploadPackage.baseName()
                                                + packageSuffix);
-    const QStringList envVars = m_rc->aspect<EnvironmentAspect>()->environment.toStringList();
+    const QStringList envVars = m_rc->aspectData<EnvironmentAspect>()->environment.toStringList();
 
     const QStringList command {
         "am", "start",
diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp
index eb9f1801380..67232b0c9d2 100644
--- a/src/plugins/android/androidqtversion.cpp
+++ b/src/plugins/android/androidqtversion.cpp
@@ -61,9 +61,9 @@ QString AndroidQtVersion::invalidReason() const
 {
     QString tmp = QtVersion::invalidReason();
     if (tmp.isEmpty()) {
-        if (androidConfig().ndkLocation(this).isEmpty())
+        if (AndroidConfig::ndkLocation(this).isEmpty())
             return Tr::tr("NDK is not configured in Devices > Android.");
-        if (androidConfig().sdkLocation().isEmpty())
+        if (AndroidConfig::sdkLocation().isEmpty())
             return Tr::tr("SDK is not configured in Devices > Android.");
         if (qtAbis().isEmpty())
             return Tr::tr("Failed to detect the ABIs used by the Qt version. Check the settings in "
@@ -79,7 +79,7 @@ bool AndroidQtVersion::supportsMultipleQtAbis() const
 
 Abis AndroidQtVersion::detectQtAbis() const
 {
-    const bool conf = androidConfig().sdkFullyConfigured();
+    const bool conf = AndroidConfig::sdkFullyConfigured();
     return conf ? Utils::transform<Abis>(androidAbis(), &AndroidManager::androidAbi2Abi) : Abis();
 }
 
@@ -87,18 +87,17 @@ void AndroidQtVersion::addToEnvironment(const Kit *k, Utils::Environment &env) c
 {
     QtVersion::addToEnvironment(k, env);
 
-    const AndroidConfig &config = androidConfig();
     // this env vars are used by qmake mkspecs to generate makefiles (check QTDIR/mkspecs/android-g++/qmake.conf for more info)
-    env.set(QLatin1String("ANDROID_NDK_HOST"), config.toolchainHost(this));
-    env.set(QLatin1String("ANDROID_NDK_ROOT"), config.ndkLocation(this).toUserOutput());
+    env.set(QLatin1String("ANDROID_NDK_HOST"), AndroidConfig::toolchainHost(this));
+    env.set(QLatin1String("ANDROID_NDK_ROOT"), AndroidConfig::ndkLocation(this).toUserOutput());
     env.set(QLatin1String("ANDROID_NDK_PLATFORM"),
-            config.bestNdkPlatformMatch(qMax(minimumNDK(), AndroidManager::minimumSDK(k)), this));
+        AndroidConfig::bestNdkPlatformMatch(qMax(minimumNDK(), AndroidManager::minimumSDK(k)), this));
 }
 
 void AndroidQtVersion::setupQmakeRunEnvironment(Utils::Environment &env) const
 {
     env.set(QLatin1String("ANDROID_NDK_ROOT"),
-            androidConfig().ndkLocation(this).toUserOutput());
+            AndroidConfig::ndkLocation(this).toUserOutput());
 }
 
 QString AndroidQtVersion::description() const
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp
index 152c5fa4c58..260bef647f5 100644
--- a/src/plugins/android/androidrunner.cpp
+++ b/src/plugins/android/androidrunner.cpp
@@ -11,7 +11,6 @@
 #include "androidtr.h"
 
 #include <coreplugin/messagemanager.h>
-#include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorersettings.h>
 #include <projectexplorer/runconfigurationaspects.h>
 #include <projectexplorer/target.h>
@@ -36,7 +35,7 @@ AndroidRunner::AndroidRunner(RunControl *runControl, const QString &intentName)
 {
     setId("AndroidRunner");
     static const int metaTypes[] = {
-        qRegisterMetaType<QVector<QStringList> >("QVector<QStringList>"),
+        qRegisterMetaType<QList<QStringList>>("QList<QStringList>"),
         qRegisterMetaType<Utils::Port>("Utils::Port"),
         qRegisterMetaType<AndroidDeviceInfo>("Android::AndroidDeviceInfo")
     };
@@ -88,7 +87,7 @@ AndroidRunner::~AndroidRunner()
 
 void AndroidRunner::start()
 {
-    if (!ProjectExplorerPlugin::projectExplorerSettings().deployBeforeRun) {
+    if (!projectExplorerSettings().deployBeforeRun) {
         qCDebug(androidRunnerLog) << "Run without deployment";
        launchAVD();
        if (!m_launchedAVDName.isEmpty()) {
@@ -168,28 +167,24 @@ void AndroidRunner::launchAVD()
     AndroidManager::setDeviceSerialNumber(m_target, info.serialNumber);
     emit androidDeviceInfoChanged(info);
     if (info.isValid()) {
-        AndroidAvdManager avdManager;
-        if (!info.avdName.isEmpty() && avdManager.findAvd(info.avdName).isEmpty()) {
-            bool launched = avdManager.startAvdAsync(info.avdName);
-            m_launchedAVDName = launched ? info.avdName:"";
-        } else {
+        if (!info.avdName.isEmpty() && AndroidAvdManager::findAvd(info.avdName).isEmpty())
+            m_launchedAVDName = AndroidAvdManager::startAvdAsync(info.avdName) ? info.avdName : "";
+        else
             m_launchedAVDName.clear();
-        }
     }
 }
 
 void AndroidRunner::checkAVD()
 {
-    AndroidAvdManager avdManager;
-    QString serialNumber = avdManager.findAvd(m_launchedAVDName);
+    const QString serialNumber = AndroidAvdManager::findAvd(m_launchedAVDName);
     if (!serialNumber.isEmpty())
         return; // try again on next timer hit
 
-    if (avdManager.isAvdBooted(serialNumber)) {
+    if (AndroidAvdManager::isAvdBooted(serialNumber)) {
         m_checkAVDTimer.stop();
         AndroidManager::setDeviceSerialNumber(m_target, serialNumber);
         emit asyncStart();
-    } else if (!androidConfig().isConnected(serialNumber)) {
+    } else if (!AndroidConfig::isConnected(serialNumber)) {
         // device was disconnected
         m_checkAVDTimer.stop();
     }
diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp
index c9a2ea929dc..9befaba742a 100644
--- a/src/plugins/android/androidrunnerworker.cpp
+++ b/src/plugins/android/androidrunnerworker.cpp
@@ -20,20 +20,15 @@
 #include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtkitaspect.h>
 
-#include <utils/async.h>
-#include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcprocess.h>
-#include <utils/stringutils.h>
-#include <utils/temporaryfile.h>
 #include <utils/url.h>
 
 #include <QDate>
 #include <QLoggingCategory>
-#include <QScopeGuard>
 #include <QRegularExpression>
+#include <QScopeGuard>
 #include <QTcpServer>
-#include <QThread>
 
 #include <chrono>
 
@@ -57,17 +52,6 @@ static const QRegularExpression userIdPattern("u(\\d+)_a");
 
 static const std::chrono::milliseconds s_jdbTimeout = 5s;
 
-static int APP_START_TIMEOUT = 45000;
-static bool isTimedOut(const chrono::high_resolution_clock::time_point &start,
-                            int msecs = APP_START_TIMEOUT)
-{
-    bool timedOut = false;
-    auto end = chrono::high_resolution_clock::now();
-    if (chrono::duration_cast<chrono::milliseconds>(end-start).count() > msecs)
-        timedOut = true;
-    return timedOut;
-}
-
 static qint64 extractPID(const QString &output, const QString &packageName)
 {
     qint64 pid = -1;
@@ -82,67 +66,6 @@ static qint64 extractPID(const QString &output, const QString &packageName)
     return pid;
 }
 
-static void findProcessPIDAndUser(QPromise<PidUserPair> &promise,
-                                  QStringList selector,
-                                  const QString &packageName,
-                                  bool preNougat)
-{
-    if (packageName.isEmpty())
-        return;
-
-    static const QString pidScript = "pidof -s '%1'";
-    static const QString pidScriptPreNougat = QStringLiteral("for p in /proc/[0-9]*; "
-                                                    "do cat <$p/cmdline && echo :${p##*/}; done");
-    QStringList args = {selector};
-    FilePath adbPath = androidConfig().adbToolPath();
-    args.append("shell");
-    args.append(preNougat ? pidScriptPreNougat : pidScript.arg(packageName));
-
-    qint64 processPID = -1;
-    chrono::high_resolution_clock::time_point start = chrono::high_resolution_clock::now();
-    do {
-        QThread::msleep(200);
-        Process proc;
-        proc.setCommand({adbPath, args});
-        proc.runBlocking();
-        const QString out = proc.allOutput();
-        if (preNougat) {
-            processPID = extractPID(out, packageName);
-        } else {
-            if (!out.isEmpty())
-                processPID = out.trimmed().toLongLong();
-        }
-    } while ((processPID == -1 || processPID == 0) && !isTimedOut(start) && !promise.isCanceled());
-
-    qCDebug(androidRunWorkerLog) << "PID found:" << processPID << ", PreNougat:" << preNougat;
-
-    qint64 processUser = 0;
-    if (processPID > 0 && !promise.isCanceled()) {
-        args = {selector};
-        args.append({"shell", "ps", "-o", "user", "-p"});
-        args.append(QString::number(processPID));
-        Process proc;
-        proc.setCommand({adbPath, args});
-        proc.runBlocking();
-        const QString out = proc.allOutput();
-        if (!out.isEmpty()) {
-            QRegularExpressionMatch match;
-            qsizetype matchPos = out.indexOf(userIdPattern, 0, &match);
-            if (matchPos >= 0 && match.capturedLength(1) > 0) {
-                bool ok = false;
-                processUser = match.captured(1).toInt(&ok);
-                if (!ok)
-                    processUser = 0;
-            }
-        }
-    }
-
-    qCDebug(androidRunWorkerLog) << "USER found:" << processUser;
-
-    if (!promise.isCanceled())
-        promise.addResult(PidUserPair(processPID, processUser));
-}
-
 static QString gdbServerArch(const QString &androidAbi)
 {
     if (androidAbi == ProjectExplorer::Constants::ANDROID_ABI_ARM64_V8A)
@@ -170,11 +93,9 @@ static FilePath debugServer(bool useLldb, const Target *target)
     QtSupport::QtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(target->kit());
     QString preferredAbi = AndroidManager::apkDevicePreferredAbi(target);
 
-    const AndroidConfig &config = androidConfig();
-
     if (useLldb) {
         // Search suitable lldb-server binary.
-        const FilePath prebuilt = config.ndkLocation(qtVersion) / "toolchains/llvm/prebuilt";
+        const FilePath prebuilt = AndroidConfig::ndkLocation(qtVersion) / "toolchains/llvm/prebuilt";
         const QString abiNeedle = lldbServerArch2(preferredAbi);
 
         // The new, built-in LLDB.
@@ -194,7 +115,7 @@ static FilePath debugServer(bool useLldb, const Target *target)
             return lldbServer;
     } else {
         // Search suitable gdbserver binary.
-        const FilePath path = config.ndkLocation(qtVersion)
+        const FilePath path = AndroidConfig::ndkLocation(qtVersion)
                 .pathAppended(QString("prebuilt/android-%1/gdbserver/gdbserver")
                               .arg(gdbServerArch(preferredAbi)));
         if (path.exists())
@@ -210,7 +131,7 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa
     auto runControl = runner->runControl();
     m_useLldb = Debugger::DebuggerKitAspect::engineType(runControl->kit())
                     == Debugger::LldbEngineType;
-    auto aspect = runControl->aspect<Debugger::DebuggerRunConfigurationAspect>();
+    auto aspect = runControl->aspectData<Debugger::DebuggerRunConfigurationAspect>();
     Utils::Id runMode = runControl->runMode();
     const bool debuggingMode = runMode == ProjectExplorer::Constants::DEBUG_RUN_MODE;
     m_useCppDebugger = debuggingMode && aspect->useCppDebugger;
@@ -242,7 +163,7 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa
     m_deviceSerialNumber = AndroidManager::deviceSerialNumber(target);
     m_apiLevel = AndroidManager::deviceApiLevel(target);
 
-    m_extraEnvVars = runControl->aspect<EnvironmentAspect>()->environment;
+    m_extraEnvVars = runControl->aspectData<EnvironmentAspect>()->environment;
     qCDebug(androidRunWorkerLog).noquote() << "Environment variables for the app"
                                            << m_extraEnvVars.toStringList();
 
@@ -251,14 +172,14 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa
 
     if (const Store sd = runControl->settingsData(Constants::ANDROID_AM_START_ARGS);
         !sd.values().isEmpty()) {
-        QTC_CHECK(sd.first().type() == QVariant::String);
+        QTC_CHECK(sd.first().typeId() == QMetaType::QString);
         const QString startArgs = sd.first().toString();
         m_amStartExtraArgs = ProcessArgs::splitArgs(startArgs, OsTypeOtherUnix);
     }
 
     if (const Store sd = runControl->settingsData(Constants::ANDROID_PRESTARTSHELLCMDLIST);
         !sd.values().isEmpty()) {
-        QTC_CHECK(sd.first().type() == QVariant::String);
+        QTC_CHECK(sd.first().typeId() == QMetaType::QString);
         const QStringList commands = sd.first().toString().split('\n', Qt::SkipEmptyParts);
         for (const QString &shellCmd : commands)
             m_beforeStartAdbCommands.append(QString("shell %1").arg(shellCmd));
@@ -266,7 +187,7 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa
 
     if (const Store sd = runControl->settingsData(Constants::ANDROID_POSTFINISHSHELLCMDLIST);
         !sd.values().isEmpty()) {
-        QTC_CHECK(sd.first().type() == QVariant::String);
+        QTC_CHECK(sd.first().typeId() == QMetaType::QString);
         const QStringList commands = sd.first().toString().split('\n', Qt::SkipEmptyParts);
         for (const QString &shellCmd : commands)
             m_afterFinishAdbCommands.append(QString("shell %1").arg(shellCmd));
@@ -288,9 +209,6 @@ AndroidRunnerWorker::~AndroidRunnerWorker()
 {
     if (m_processPID != -1)
         forceStop();
-
-    if (!m_pidFinder.isFinished())
-        m_pidFinder.cancel();
 }
 
 bool AndroidRunnerWorker::runAdb(const QStringList &args, QString *stdOut,
@@ -367,12 +285,6 @@ bool AndroidRunnerWorker::packageFileExists(const QString &filePath)
     return success && !output.trimmed().isEmpty();
 }
 
-void AndroidRunnerWorker::adbKill(qint64 pid)
-{
-    if (!runAdb({"shell", "run-as", m_packageName, "kill", "-9", QString::number(pid)}))
-        runAdb({"shell", "kill", "-9", QString::number(pid)});
-}
-
 QStringList AndroidRunnerWorker::selector() const
 {
     return AndroidDeviceInfo::adbSelector(m_deviceSerialNumber);
@@ -385,8 +297,11 @@ void AndroidRunnerWorker::forceStop()
     // try killing it via kill -9
     QString output;
     runAdb({"shell", "pidof", m_packageName}, &output);
-    if (m_processPID != -1 && output == QString::number(m_processPID))
-        adbKill(m_processPID);
+    const QString pidString = QString::number(m_processPID);
+    if (m_processPID != -1 && output == pidString
+        && !runAdb({"shell", "run-as", m_packageName, "kill", "-9", pidString})) {
+        runAdb({"shell", "kill", "-9", pidString});
+    }
 }
 
 void AndroidRunnerWorker::logcatReadStandardError()
@@ -512,7 +427,7 @@ void Android::Internal::AndroidRunnerWorker::asyncStartLogcat()
     }
 
     const QStringList logcatArgs = selector() << "logcat" << timeArg;
-    const FilePath adb = androidConfig().adbToolPath();
+    const FilePath adb = AndroidConfig::adbToolPath();
     qCDebug(androidRunWorkerLog).noquote() << "Running logcat command (async):"
                                            << CommandLine(adb, logcatArgs).toUserOutput();
     m_adbLogcatProcess->setCommand({adb, logcatArgs});
@@ -710,19 +625,69 @@ void AndroidRunnerWorker::asyncStart()
 {
     asyncStartHelper();
 
-    m_pidFinder = Utils::onResultReady(Utils::asyncRun(findProcessPIDAndUser,
-                                                       selector(),
-                                                       m_packageName,
-                                                       m_isPreNougat),
-                                       this,
-                                       bind(&AndroidRunnerWorker::onProcessIdChanged, this, _1));
+    using namespace Tasking;
+
+    const Storage<PidUserPair> pidStorage;
+
+    const FilePath adbPath = AndroidConfig::adbToolPath();
+    const QStringList args = selector();
+    const QString pidScript = m_isPreNougat
+        ? QString("for p in /proc/[0-9]*; do cat <$p/cmdline && echo :${p##*/}; done")
+        : QString("pidof -s '%1'").arg(m_packageName);
+
+    const auto onPidSetup = [adbPath, args, pidScript](Process &process) {
+        process.setCommand({adbPath, {args, "shell", pidScript}});
+    };
+    const auto onPidDone = [pidStorage, packageName = m_packageName,
+                            isPreNougat = m_isPreNougat](const Process &process) {
+        const QString out = process.allOutput();
+        if (isPreNougat)
+            pidStorage->first = extractPID(out, packageName);
+        else if (!out.isEmpty())
+            pidStorage->first = out.trimmed().toLongLong();
+    };
+
+    const auto onUserSetup = [pidStorage, adbPath, args](Process &process) {
+        process.setCommand({adbPath, {args, "shell", "ps", "-o", "user", "-p",
+                                      QString::number(pidStorage->first)}});
+    };
+    const auto onUserDone = [pidStorage](const Process &process) {
+        const QString out = process.allOutput();
+        if (out.isEmpty())
+            return DoneResult::Error;
+
+        QRegularExpressionMatch match;
+        qsizetype matchPos = out.indexOf(userIdPattern, 0, &match);
+        if (matchPos >= 0 && match.capturedLength(1) > 0) {
+            bool ok = false;
+            const qint64 processUser = match.captured(1).toInt(&ok);
+            if (ok) {
+                pidStorage->second = processUser;
+                return DoneResult::Success;
+            }
+        }
+        return DoneResult::Error;
+    };
+
+    const Group root {
+        pidStorage,
+        onGroupSetup([pidStorage] { *pidStorage = {-1, 0}; }),
+        Forever {
+            stopOnSuccess,
+            ProcessTask(onPidSetup, onPidDone, CallDoneIf::Success),
+            TimeoutTask([](std::chrono::milliseconds &timeout) { timeout = 200ms; },
+                        DoneResult::Error)
+        }.withTimeout(45s),
+        ProcessTask(onUserSetup, onUserDone, CallDoneIf::Success),
+        onGroupDone([pidStorage, this] { onProcessIdChanged(*pidStorage); })
+    };
+
+    m_pidRunner.start(root);
 }
 
 void AndroidRunnerWorker::asyncStop()
 {
-    if (!m_pidFinder.isFinished())
-        m_pidFinder.cancel();
-
+    m_pidRunner.reset();
     if (m_processPID != -1)
         forceStop();
 
@@ -742,7 +707,7 @@ void AndroidRunnerWorker::handleJdbWaiting()
     }
     m_afterFinishAdbCommands.push_back(removeForward.join(' '));
 
-    const FilePath jdbPath = androidConfig().openJDKLocation()
+    const FilePath jdbPath = AndroidConfig::openJDKLocation()
             .pathAppended("bin/jdb").withExecutableSuffix();
 
     QStringList jdbArgs("-connect");
@@ -821,10 +786,8 @@ void AndroidRunnerWorker::removeForwardPort(const QString &port)
     }
 }
 
-void AndroidRunnerWorker::onProcessIdChanged(PidUserPair pidUser)
+void AndroidRunnerWorker::onProcessIdChanged(const PidUserPair &pidUser)
 {
-    // Don't write to m_psProc from a different thread
-    QTC_ASSERT(QThread::currentThread() == thread(), return);
     qCDebug(androidRunWorkerLog) << "Process ID changed from:" << m_processPID
                                  << "to:" << pidUser.first;
     m_processPID = pidUser.first;
diff --git a/src/plugins/android/androidrunnerworker.h b/src/plugins/android/androidrunnerworker.h
index 052fe2812cb..bba8d351041 100644
--- a/src/plugins/android/androidrunnerworker.h
+++ b/src/plugins/android/androidrunnerworker.h
@@ -6,12 +6,11 @@
 
 #include <qmldebug/qmldebugcommandlinearguments.h>
 
+#include <solutions/tasking/tasktreerunner.h>
+
 #include <utils/environment.h>
 #include <utils/port.h>
 
-#include <QFuture>
-#include <utility>
-
 namespace Utils {
 class FilePath;
 class Process;
@@ -35,24 +34,11 @@ public:
     AndroidRunnerWorker(ProjectExplorer::RunWorker *runner, const QString &packageName);
     ~AndroidRunnerWorker() override;
 
-    bool runAdb(const QStringList &args, QString *stdOut = nullptr, QString *stdErr = nullptr,
-                const QByteArray &writeData = {});
-    void adbKill(qint64 pid);
-    QStringList selector() const;
-    void forceStop();
-    void logcatReadStandardError();
-    void logcatReadStandardOutput();
-    void logcatProcess(const QByteArray &text, QByteArray &buffer, bool onlyError);
     void setAndroidDeviceInfo(const AndroidDeviceInfo &info);
-    void setIsPreNougat(bool isPreNougat) { m_isPreNougat = isPreNougat; }
-    void setIntentName(const QString &intentName) { m_intentName = intentName; }
-
     void asyncStart();
     void asyncStop();
-    void handleJdbWaiting();
-    void handleJdbSettled();
-
-    void removeForwardPort(const QString &port);
+    void setIsPreNougat(bool isPreNougat) { m_isPreNougat = isPreNougat; }
+    void setIntentName(const QString &intentName) { m_intentName = intentName; }
 
 signals:
     void remoteProcessStarted(Utils::Port debugServerPort, const QUrl &qmlServer, qint64 pid);
@@ -62,6 +48,19 @@ signals:
     void remoteErrorOutput(const QString &output);
 
 private:
+    bool runAdb(const QStringList &args, QString *stdOut = nullptr, QString *stdErr = nullptr,
+                const QByteArray &writeData = {});
+    QStringList selector() const;
+    void forceStop();
+    void logcatReadStandardError();
+    void logcatReadStandardOutput();
+    void logcatProcess(const QByteArray &text, QByteArray &buffer, bool onlyError);
+
+    void handleJdbWaiting();
+    void handleJdbSettled();
+
+    void removeForwardPort(const QString &port);
+
     void asyncStartHelper();
     void startNativeDebugging();
     bool startDebuggerServer(const QString &packageDir, const QString &debugServerFile, QString *errorStr = nullptr);
@@ -75,7 +74,7 @@ private:
         Waiting,
         Settled
     };
-    void onProcessIdChanged(PidUserPair pidUser);
+    void onProcessIdChanged(const PidUserPair &pidUser);
 
     // Create the processes and timer in the worker thread, for correct thread affinity
     bool m_isPreNougat = false;
@@ -90,7 +89,7 @@ private:
     std::unique_ptr<Utils::Process> m_psIsAlive;
     QByteArray m_stdoutBuffer;
     QByteArray m_stderrBuffer;
-    QFuture<PidUserPair> m_pidFinder;
+    Tasking::TaskTreeRunner m_pidRunner;
     bool m_useCppDebugger = false;
     bool m_useLldb = false; // FIXME: Un-implemented currently.
     QmlDebug::QmlDebugServicesPreset m_qmlDebugServices;
diff --git a/src/plugins/android/androidsdkdownloader.cpp b/src/plugins/android/androidsdkdownloader.cpp
index 7246b5b9a3d..8f0993363e0 100644
--- a/src/plugins/android/androidsdkdownloader.cpp
+++ b/src/plugins/android/androidsdkdownloader.cpp
@@ -1,20 +1,24 @@
 // Copyright (C) 2020 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
+#include "androidconfigurations.h"
 #include "androidconstants.h"
 #include "androidsdkdownloader.h"
 #include "androidtr.h"
 
+#include <coreplugin/icore.h>
+
+#include <solutions/tasking/barrier.h>
 #include <solutions/tasking/networkquery.h>
 
+#include <utils/async.h>
 #include <utils/filepath.h>
 #include <utils/networkaccessmanager.h>
 #include <utils/unarchiver.h>
 
-#include <coreplugin/icore.h>
-
 #include <QCryptographicHash>
 #include <QLoggingCategory>
+#include <QMessageBox>
 #include <QProgressDialog>
 #include <QStandardPaths>
 
@@ -24,16 +28,12 @@ using namespace Utils;
 namespace { Q_LOGGING_CATEGORY(sdkDownloaderLog, "qtc.android.sdkDownloader", QtWarningMsg) }
 
 namespace Android::Internal {
-/**
- * @class SdkDownloader
- * @brief Download Android SDK tools package from within Qt Creator.
- */
-AndroidSdkDownloader::AndroidSdkDownloader()
-{
-    connect(&m_taskTreeRunner, &TaskTreeRunner::done, this, [this] { m_progressDialog.reset(); });
-}
 
-AndroidSdkDownloader::~AndroidSdkDownloader() = default;
+static void logError(const QString &error)
+{
+    qCDebug(sdkDownloaderLog, "%s", error.toUtf8().data());
+    QMessageBox::warning(Core::ICore::dialogParent(), dialogTitle(), error);
+}
 
 static bool isHttpRedirect(QNetworkReply *reply)
 {
@@ -74,56 +74,62 @@ static std::optional<QString> saveToDisk(const FilePath &filename, QIODevice *da
     return {};
 }
 
-// TODO: Make it a separate async task in a chain?
-static bool verifyFileIntegrity(const FilePath fileName, const QByteArray &sha256)
+static void validateFileIntegrity(QPromise<void> &promise, const FilePath &fileName,
+                                  const QByteArray &sha256)
 {
     QFile file(fileName.toString());
     if (file.open(QFile::ReadOnly)) {
         QCryptographicHash hash(QCryptographicHash::Sha256);
-        if (hash.addData(&file))
-            return hash.result() == sha256;
+        if (hash.addData(&file) && hash.result() == sha256)
+            return;
     }
-    return false;
+    promise.future().cancel();
 }
 
-void AndroidSdkDownloader::downloadAndExtractSdk()
+GroupItem downloadSdkRecipe()
 {
-    if (androidConfig().sdkToolsUrl().isEmpty()) {
-        logError(Tr::tr("The SDK Tools download URL is empty."));
-        return;
-    }
+    struct StorageStruct
+    {
+        StorageStruct() {
+            progressDialog.reset(new QProgressDialog(Tr::tr("Downloading SDK Tools package..."),
+                                 Tr::tr("Cancel"), 0, 100, Core::ICore::dialogParent()));
+            progressDialog->setWindowModality(Qt::ApplicationModal);
+            progressDialog->setWindowTitle(dialogTitle());
+            progressDialog->setFixedSize(progressDialog->sizeHint());
+            progressDialog->setAutoClose(false);
+            progressDialog->show(); // TODO: Should not be needed. Investigate possible QT_BUG
+        }
+        std::unique_ptr<QProgressDialog> progressDialog;
+        std::optional<FilePath> sdkFileName;
+    };
 
-    m_progressDialog.reset(new QProgressDialog(Tr::tr("Downloading SDK Tools package..."),
-                                               Tr::tr("Cancel"), 0, 100, Core::ICore::dialogParent()));
-    m_progressDialog->setWindowModality(Qt::ApplicationModal);
-    m_progressDialog->setWindowTitle(dialogTitle());
-    m_progressDialog->setFixedSize(m_progressDialog->sizeHint());
-    m_progressDialog->setAutoClose(false);
-    connect(m_progressDialog.get(), &QProgressDialog::canceled, this, [this] {
-        m_taskTreeRunner.reset();
-        m_progressDialog.release()->deleteLater();
-    });
+    Storage<StorageStruct> storage;
 
-    Storage<std::optional<FilePath>> storage;
+    const auto onSetup = [] {
+        if (AndroidConfig::sdkToolsUrl().isEmpty()) {
+            logError(Tr::tr("The SDK Tools download URL is empty."));
+            return SetupResult::StopWithError;
+        }
+        return SetupResult::Continue;
+    };
 
-    const auto onQuerySetup = [this](NetworkQuery &query) {
-        query.setRequest(QNetworkRequest(androidConfig().sdkToolsUrl()));
+    const auto onQuerySetup = [storage](NetworkQuery &query) {
+        query.setRequest(QNetworkRequest(AndroidConfig::sdkToolsUrl()));
         query.setNetworkAccessManager(NetworkAccessManager::instance());
         NetworkQuery *queryPtr = &query;
-        connect(queryPtr, &NetworkQuery::started, this, [this, queryPtr] {
+        QProgressDialog *progressDialog = storage->progressDialog.get();
+        QObject::connect(queryPtr, &NetworkQuery::started, progressDialog, [queryPtr, progressDialog] {
             QNetworkReply *reply = queryPtr->reply();
             if (!reply)
                 return;
-            connect(reply, &QNetworkReply::downloadProgress,
-                    this, [this](qint64 received, qint64 max) {
-                if (!m_progressDialog)
-                    return;
-                m_progressDialog->setRange(0, max);
-                m_progressDialog->setValue(received);
+            QObject::connect(reply, &QNetworkReply::downloadProgress,
+                             progressDialog, [progressDialog](qint64 received, qint64 max) {
+                progressDialog->setRange(0, max);
+                progressDialog->setValue(received);
             });
 #if QT_CONFIG(ssl)
-            connect(reply, &QNetworkReply::sslErrors,
-                    this, [this, reply](const QList<QSslError> &sslErrors) {
+            QObject::connect(reply, &QNetworkReply::sslErrors,
+                    reply, [reply](const QList<QSslError> &sslErrors) {
                 for (const QSslError &error : sslErrors)
                     qCDebug(sdkDownloaderLog, "SSL error: %s\n", qPrintable(error.errorString()));
                 logError(Tr::tr("Encountered SSL errors, download is aborted."));
@@ -132,7 +138,10 @@ void AndroidSdkDownloader::downloadAndExtractSdk()
 #endif
         });
     };
-    const auto onQueryDone = [this, storage](const NetworkQuery &query, DoneWith result) {
+    const auto onQueryDone = [storage](const NetworkQuery &query, DoneWith result) {
+        if (result == DoneWith::Cancel)
+            return;
+
         QNetworkReply *reply = query.reply();
         QTC_ASSERT(reply, return);
         const QUrl url = reply->url();
@@ -151,19 +160,26 @@ void AndroidSdkDownloader::downloadAndExtractSdk()
             logError(*saveResult);
             return;
         }
-        *storage = sdkFileName;
+        storage->sdkFileName = sdkFileName;
     };
-
-    const auto onUnarchiveSetup = [this, storage](Unarchiver &unarchiver) {
-        m_progressDialog->setRange(0, 0);
-        m_progressDialog->setLabelText(Tr::tr("Unarchiving SDK Tools package..."));
-        if (!*storage)
+    const auto onValidationSetup = [storage](Async<void> &async) {
+        if (!storage->sdkFileName)
             return SetupResult::StopWithError;
-        const FilePath sdkFileName = **storage;
-        if (!verifyFileIntegrity(sdkFileName, androidConfig().getSdkToolsSha256())) {
-            logError(Tr::tr("Verifying the integrity of the downloaded file has failed."));
-            return SetupResult::StopWithError;
-        }
+        async.setConcurrentCallData(validateFileIntegrity, *storage->sdkFileName,
+                                    AndroidConfig::getSdkToolsSha256());
+        storage->progressDialog->setRange(0, 0);
+        storage->progressDialog->setLabelText(Tr::tr("Verifying package integrity..."));
+        return SetupResult::Continue;
+    };
+    const auto onValidationDone = [](DoneWith result) {
+        if (result != DoneWith::Error)
+            return;
+        logError(Tr::tr("Verifying the integrity of the downloaded file has failed."));
+    };
+    const auto onUnarchiveSetup = [storage](Unarchiver &unarchiver) {
+        storage->progressDialog->setRange(0, 0);
+        storage->progressDialog->setLabelText(Tr::tr("Unarchiving SDK Tools package..."));
+        const FilePath sdkFileName = *storage->sdkFileName;
         const auto sourceAndCommand = Unarchiver::sourceAndCommand(sdkFileName);
         if (!sourceAndCommand) {
             logError(sourceAndCommand.error());
@@ -173,35 +189,31 @@ void AndroidSdkDownloader::downloadAndExtractSdk()
         unarchiver.setDestDir(sdkFileName.parentDir());
         return SetupResult::Continue;
     };
-    const auto onUnarchiverDone = [this, storage](DoneWith result) {
+    const auto onUnarchiverDone = [storage](DoneWith result) {
+        if (result == DoneWith::Cancel)
+            return;
+
         if (result != DoneWith::Success) {
             logError(Tr::tr("Unarchiving error."));
             return;
         }
-        androidConfig().setTemporarySdkToolsPath(
-            (*storage)->parentDir().pathAppended(Constants::cmdlineToolsName));
-        QMetaObject::invokeMethod(this, [this] { emit sdkExtracted(); }, Qt::QueuedConnection);
+        AndroidConfig::setTemporarySdkToolsPath(
+            storage->sdkFileName->parentDir().pathAppended(Constants::cmdlineToolsName));
     };
+    const auto onCancelSetup = [storage] { return std::make_pair(storage->progressDialog.get(),
+                                                                 &QProgressDialog::canceled); };
 
-    const Group root {
+    return Group {
         storage,
-        NetworkQueryTask(onQuerySetup, onQueryDone),
-        UnarchiverTask(onUnarchiveSetup, onUnarchiverDone)
+        Group {
+            onGroupSetup(onSetup),
+            NetworkQueryTask(onQuerySetup, onQueryDone),
+            AsyncTask<void>(onValidationSetup, onValidationDone),
+            UnarchiverTask(onUnarchiveSetup, onUnarchiverDone)
+        }.withCancel(onCancelSetup)
     };
-
-    m_taskTreeRunner.start(root);
 }
 
-QString AndroidSdkDownloader::dialogTitle()
-{
-    return Tr::tr("Download SDK Tools");
-}
-
-void AndroidSdkDownloader::logError(const QString &error)
-{
-    qCDebug(sdkDownloaderLog, "%s", error.toUtf8().data());
-    QMetaObject::invokeMethod(this, [this, error] { emit sdkDownloaderError(error); },
-        Qt::QueuedConnection);
-}
+QString dialogTitle() { return Tr::tr("Download SDK Tools"); }
 
 } // namespace Android::Internal
diff --git a/src/plugins/android/androidsdkdownloader.h b/src/plugins/android/androidsdkdownloader.h
index 4ea9ebfa37a..e156420db71 100644
--- a/src/plugins/android/androidsdkdownloader.h
+++ b/src/plugins/android/androidsdkdownloader.h
@@ -3,36 +3,13 @@
 
 #pragma once
 
-#include "androidconfigurations.h"
+#include <QString>
 
-#include <solutions/tasking/tasktreerunner.h>
-
-QT_BEGIN_NAMESPACE
-class QProgressDialog;
-QT_END_NAMESPACE
+namespace Tasking { class GroupItem; }
 
 namespace Android::Internal {
 
-class AndroidSdkDownloader : public QObject
-{
-    Q_OBJECT
-
-public:
-    AndroidSdkDownloader();
-    ~AndroidSdkDownloader();
-
-    void downloadAndExtractSdk();
-    static QString dialogTitle();
-
-signals:
-    void sdkExtracted();
-    void sdkDownloaderError(const QString &error);
-
-private:
-    void logError(const QString &error);
-
-    std::unique_ptr<QProgressDialog> m_progressDialog;
-    Tasking::TaskTreeRunner m_taskTreeRunner;
-};
+Tasking::GroupItem downloadSdkRecipe();
+QString dialogTitle();
 
 } // namespace Android::Internal
diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp
index a4760b3d4a5..47b1f4b1155 100644
--- a/src/plugins/android/androidsdkmanager.cpp
+++ b/src/plugins/android/androidsdkmanager.cpp
@@ -4,40 +4,121 @@
 #include "androidconfigurations.h"
 #include "androidsdkmanager.h"
 #include "androidtr.h"
-#include "avdmanageroutputparser.h"
 #include "sdkmanageroutputparser.h"
 
-#include <utils/algorithm.h>
-#include <utils/async.h>
-#include <utils/qtcprocess.h>
-#include <utils/qtcassert.h>
-#include <utils/stringutils.h>
+#include <coreplugin/icore.h>
 
-#include <QFutureWatcher>
+#include <solutions/tasking/tasktreerunner.h>
+
+#include <utils/algorithm.h>
+#include <utils/layoutbuilder.h>
+#include <utils/outputformatter.h>
+#include <utils/qtcprocess.h>
+
+#include <QDialogButtonBox>
+#include <QLabel>
 #include <QLoggingCategory>
-#include <QReadWriteLock>
+#include <QMessageBox>
+#include <QPlainTextEdit>
+#include <QProgressBar>
 #include <QRegularExpression>
 #include <QTextCodec>
 
 namespace {
 Q_LOGGING_CATEGORY(sdkManagerLog, "qtc.android.sdkManager", QtWarningMsg)
-const char commonArgsKey[] = "Common Arguments:";
 }
 
+using namespace Tasking;
 using namespace Utils;
 
 using namespace std::chrono;
 using namespace std::chrono_literals;
 
-namespace Android {
-namespace Internal {
+namespace Android::Internal {
 
-const int sdkManagerCmdTimeoutS = 60;
-const int sdkManagerOperationTimeoutS = 600;
+class QuestionProgressDialog : public QDialog
+{
+    Q_OBJECT
 
-using SdkCmdPromise = QPromise<AndroidSdkManager::OperationOutput>;
+public:
+    QuestionProgressDialog(QWidget *parent)
+        : QDialog(parent)
+        , m_outputTextEdit(new QPlainTextEdit)
+        , m_questionLabel(new QLabel(Tr::tr("Do you want to accept the Android SDK license?")))
+        , m_answerButtonBox(new QDialogButtonBox)
+        , m_progressBar(new QProgressBar)
+        , m_dialogButtonBox(new QDialogButtonBox)
+        , m_formatter(new OutputFormatter)
+    {
+        setWindowTitle(Tr::tr("Android SDK Manager"));
+        m_outputTextEdit->setReadOnly(true);
+        m_questionLabel->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+        m_answerButtonBox->setStandardButtons(QDialogButtonBox::No | QDialogButtonBox::Yes);
+        m_dialogButtonBox->setStandardButtons(QDialogButtonBox::Cancel);
+        m_formatter->setPlainTextEdit(m_outputTextEdit);
+        m_formatter->setParent(this);
 
-static const QRegularExpression &assertionRegExp()
+        using namespace Layouting;
+
+        Column {
+            m_outputTextEdit,
+            Row { m_questionLabel, m_answerButtonBox },
+            m_progressBar,
+            m_dialogButtonBox
+        }.attachTo(this);
+
+        setQuestionVisible(false);
+        setQuestionEnabled(false);
+
+        connect(m_answerButtonBox, &QDialogButtonBox::rejected, this, [this] {
+            emit answerClicked(false);
+        });
+        connect(m_answerButtonBox, &QDialogButtonBox::accepted, this, [this] {
+            emit answerClicked(true);
+        });
+        connect(m_dialogButtonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+
+        // GUI tuning
+        setModal(true);
+        resize(800, 600);
+        show();
+    }
+
+    void setQuestionEnabled(bool enable)
+    {
+        m_questionLabel->setEnabled(enable);
+        m_answerButtonBox->setEnabled(enable);
+    }
+    void setQuestionVisible(bool visible)
+    {
+        m_questionLabel->setVisible(visible);
+        m_answerButtonBox->setVisible(visible);
+    }
+    void appendMessage(const QString &text, OutputFormat format)
+    {
+        m_formatter->appendMessage(text, format);
+        m_outputTextEdit->ensureCursorVisible();
+    }
+    void setProgress(int value) { m_progressBar->setValue(value); }
+
+signals:
+    void answerClicked(bool accepted);
+
+private:
+    QPlainTextEdit *m_outputTextEdit = nullptr;
+    QLabel *m_questionLabel = nullptr;
+    QDialogButtonBox *m_answerButtonBox = nullptr;
+    QProgressBar *m_progressBar = nullptr;
+    QDialogButtonBox *m_dialogButtonBox = nullptr;
+    OutputFormatter *m_formatter = nullptr;
+};
+
+static QString sdkRootArg()
+{
+    return "--sdk_root=" + AndroidConfig::sdkLocation().toString();
+}
+
+const QRegularExpression &assertionRegExp()
 {
     static const QRegularExpression theRegExp
         (R"((\(\s*y\s*[\/\\]\s*n\s*\)\s*)(?<mark>[\:\?]))", // (y/N)?
@@ -46,112 +127,201 @@ static const QRegularExpression &assertionRegExp()
     return theRegExp;
 }
 
-int parseProgress(const QString &out, bool &foundAssertion)
+static std::optional<int> parseProgress(const QString &out)
 {
-    int progress = -1;
     if (out.isEmpty())
-        return progress;
+        return {};
+
     static const QRegularExpression reg("(?<progress>\\d*)%");
     static const QRegularExpression regEndOfLine("[\\n\\r]");
     const QStringList lines = out.split(regEndOfLine, Qt::SkipEmptyParts);
+    std::optional<int> progress;
     for (const QString &line : lines) {
         QRegularExpressionMatch match = reg.match(line);
         if (match.hasMatch()) {
-            progress = match.captured("progress").toInt();
-            if (progress < 0 || progress > 100)
-                progress = -1;
+            const int parsedProgress = match.captured("progress").toInt();
+            if (parsedProgress >= 0 && parsedProgress <= 100)
+                progress = parsedProgress;
         }
-        if (!foundAssertion)
-            foundAssertion = assertionRegExp().match(line).hasMatch();
     }
     return progress;
 }
 
-void watcherDeleter(QFutureWatcher<void> *watcher)
+struct DialogStorage
 {
-    if (!watcher->isFinished() && !watcher->isCanceled())
-        watcher->cancel();
+    DialogStorage() { m_dialog.reset(new QuestionProgressDialog(Core::ICore::dialogParent())); };
+    std::unique_ptr<QuestionProgressDialog> m_dialog;
+};
 
-    if (!watcher->isFinished())
-        watcher->waitForFinished();
-
-    delete watcher;
-}
-
-static QString sdkRootArg(const AndroidConfig &config)
+static GroupItem licensesRecipe(const Storage<DialogStorage> &dialogStorage)
 {
-    return "--sdk_root=" + config.sdkLocation().toString();
-}
-/*!
-    Runs the \c sdkmanger tool with arguments \a args. Returns \c true if the command is
-    successfully executed. Output is copied into \a output. The function blocks the calling thread.
- */
-static bool sdkManagerCommand(const AndroidConfig &config, const QStringList &args,
-                              QString *output, int timeout = sdkManagerCmdTimeoutS)
-{
-    QStringList newArgs = args;
-    newArgs.append(sdkRootArg(config));
-    qCDebug(sdkManagerLog).noquote() << "Running SDK Manager command (sync):"
-                                     << CommandLine(config.sdkManagerToolPath(), newArgs)
-                                        .toUserOutput();
-    Process proc;
-    proc.setEnvironment(config.toolsEnvironment());
-    proc.setTimeOutMessageBoxEnabled(true);
-    proc.setCommand({config.sdkManagerToolPath(), newArgs});
-    proc.runBlocking(seconds(timeout), EventLoopMode::On);
-    if (output)
-        *output = proc.allOutput();
-    return proc.result() == ProcessResult::FinishedWithSuccess;
-}
+    struct OutputData
+    {
+        QString buffer;
+        int current = 0;
+        int total = 0;
+    };
 
-/*!
-    Runs the \c sdkmanger tool with arguments \a args. The operation command progress is updated in
-    to the future interface \a fi and \a output is populated with command output. The command listens
-    to cancel signal emmitted by \a sdkManager and kill the commands. The command is also killed
-    after the lapse of \a timeout seconds. The function blocks the calling thread.
- */
-static void sdkManagerCommand(const AndroidConfig &config, const QStringList &args,
-                              AndroidSdkManager &sdkManager, SdkCmdPromise &promise,
-                              AndroidSdkManager::OperationOutput &output, double progressQuota,
-                              bool interruptible = true, int timeout = sdkManagerOperationTimeoutS)
-{
-    QStringList newArgs = args;
-    newArgs.append(sdkRootArg(config));
-    qCDebug(sdkManagerLog).noquote() << "Running SDK Manager command (async):"
-                                     << CommandLine(config.sdkManagerToolPath(), newArgs)
-                                        .toUserOutput();
-    int offset = promise.future().progressValue();
-    Process proc;
-    proc.setEnvironment(config.toolsEnvironment());
-    bool assertionFound = false;
-    proc.setStdOutCallback([offset, progressQuota, &proc, &assertionFound, &promise](const QString &out) {
-        int progressPercent = parseProgress(out, assertionFound);
-        if (assertionFound)
-            proc.stop();
-        if (progressPercent != -1)
-            promise.setProgressValue(offset + qRound((progressPercent / 100.0) * progressQuota));
-    });
-    proc.setStdErrCallback([&output](const QString &err) {
-        output.stdError = err;
-    });
-    if (interruptible) {
-        QObject::connect(&sdkManager, &AndroidSdkManager::cancelActiveOperations, &proc, [&proc] {
-           proc.stop();
-           proc.waitForFinished();
+    const Storage<OutputData> outputStorage;
+
+    const auto onLicenseSetup = [dialogStorage, outputStorage](Process &process) {
+        QuestionProgressDialog *dialog = dialogStorage->m_dialog.get();
+        dialog->setProgress(0);
+        dialog->appendMessage(Tr::tr("Checking pending licenses...") + "\n", NormalMessageFormat);
+        dialog->appendMessage(Tr::tr("The installation of Android SDK packages may fail if the "
+                                     "respective licenses are not accepted.") + "\n\n",
+                              LogMessageFormat);
+        process.setProcessMode(ProcessMode::Writer);
+        process.setEnvironment(AndroidConfig::toolsEnvironment());
+        process.setCommand(CommandLine(AndroidConfig::sdkManagerToolPath(),
+                                       {"--licenses", sdkRootArg()}));
+        process.setUseCtrlCStub(true);
+
+        Process *processPtr = &process;
+        OutputData *outputPtr = outputStorage.activeStorage();
+        QObject::connect(processPtr, &Process::readyReadStandardOutput, dialog,
+                         [processPtr, outputPtr, dialog] {
+            QTextCodec *codec = QTextCodec::codecForLocale();
+            const QString stdOut = codec->toUnicode(processPtr->readAllRawStandardOutput());
+            outputPtr->buffer += stdOut;
+            dialog->appendMessage(stdOut, StdOutFormat);
+            const auto progress = parseProgress(stdOut);
+            if (progress)
+                dialog->setProgress(*progress);
+            if (assertionRegExp().match(outputPtr->buffer).hasMatch()) {
+                dialog->setQuestionVisible(true);
+                dialog->setQuestionEnabled(true);
+                if (outputPtr->total == 0) {
+                    // Example output to match:
+                    //   5 of 6 SDK package licenses not accepted.
+                    //   Review licenses that have not been accepted (y/N)?
+                    static const QRegularExpression reg(R"(((?<steps>\d+)\sof\s)\d+)");
+                    const QRegularExpressionMatch match = reg.match(outputPtr->buffer);
+                    if (match.hasMatch()) {
+                        outputPtr->total = match.captured("steps").toInt();
+                        const QByteArray reply = "y\n";
+                        dialog->appendMessage(QString::fromUtf8(reply), NormalMessageFormat);
+                        processPtr->writeRaw(reply);
+                        dialog->setProgress(0);
+                    }
+                }
+                outputPtr->buffer.clear();
+            }
         });
-    }
-    proc.setCommand({config.sdkManagerToolPath(), newArgs});
-    proc.runBlocking(seconds(timeout), EventLoopMode::On);
-    if (assertionFound) {
-        output.success = false;
-        output.stdOutput = proc.cleanedStdOut();
-        output.stdError = Tr::tr("The operation requires user interaction. "
-                                 "Use the \"sdkmanager\" command-line tool.");
-    } else {
-        output.success = proc.result() == ProcessResult::FinishedWithSuccess;
-    }
+
+        QObject::connect(dialog, &QuestionProgressDialog::answerClicked, processPtr,
+                         [processPtr, outputPtr, dialog](bool accepted) {
+            dialog->setQuestionEnabled(false);
+            const QByteArray reply = accepted ? "y\n" : "n\n";
+            dialog->appendMessage(QString::fromUtf8(reply), NormalMessageFormat);
+            processPtr->writeRaw(reply);
+            ++outputPtr->current;
+            if (outputPtr->total != 0)
+                dialog->setProgress(outputPtr->current * 100.0 / outputPtr->total);
+        });
+    };
+
+    return Group { outputStorage, ProcessTask(onLicenseSetup) };
 }
 
+static void setupSdkProcess(const QStringList &args, Process *process,
+                            QuestionProgressDialog *dialog, int current, int total)
+{
+    process->setEnvironment(AndroidConfig::toolsEnvironment());
+    process->setCommand({AndroidConfig::sdkManagerToolPath(),
+                         args + AndroidConfig::sdkManagerToolArgs()});
+    QObject::connect(process, &Process::readyReadStandardOutput, dialog,
+                     [process, dialog, current, total] {
+        QTextCodec *codec = QTextCodec::codecForLocale();
+        const auto progress = parseProgress(codec->toUnicode(process->readAllRawStandardOutput()));
+        if (!progress)
+            return;
+        dialog->setProgress((current * 100.0 + *progress) / total);
+    });
+    QObject::connect(process, &Process::readyReadStandardError, dialog, [process, dialog] {
+        QTextCodec *codec = QTextCodec::codecForLocale();
+        dialog->appendMessage(codec->toUnicode(process->readAllRawStandardError()), StdErrFormat);
+    });
+};
+
+static void handleSdkProcess(QuestionProgressDialog *dialog, DoneWith result)
+{
+    if (result == DoneWith::Success)
+        dialog->appendMessage(Tr::tr("Finished successfully.") + "\n\n", StdOutFormat);
+    else
+        dialog->appendMessage(Tr::tr("Failed.") + "\n\n", StdErrFormat);
+}
+
+static GroupItem installationRecipe(const Storage<DialogStorage> &dialogStorage,
+                                    const InstallationChange &change)
+{
+    const auto onSetup = [dialogStorage] {
+        dialogStorage->m_dialog->appendMessage(
+            Tr::tr("Installing / Uninstalling selected packages...") + '\n', NormalMessageFormat);
+        const QString optionsMessage = HostOsInfo::isMacHost()
+            ? Tr::tr("Closing the preferences dialog will cancel the running and scheduled SDK "
+                     "operations.")
+            : Tr::tr("Closing the options dialog will cancel the running and scheduled SDK "
+                     "operations.");
+        dialogStorage->m_dialog->appendMessage(optionsMessage + '\n', LogMessageFormat);
+    };
+
+    const int total = change.count();
+    const LoopList uninstallIterator(change.toUninstall);
+    const auto onUninstallSetup = [dialogStorage, uninstallIterator, total](Process &process) {
+        const QStringList args = {"--uninstall", *uninstallIterator, sdkRootArg()};
+        QuestionProgressDialog *dialog = dialogStorage->m_dialog.get();
+        setupSdkProcess(args, &process, dialog, uninstallIterator.iteration(), total);
+        dialog->appendMessage(Tr::tr("Uninstalling %1...").arg(*uninstallIterator) + '\n',
+                              StdOutFormat);
+        dialog->setProgress(uninstallIterator.iteration() * 100.0 / total);
+    };
+
+    const LoopList installIterator(change.toInstall);
+    const int offset = change.toUninstall.count();
+    const auto onInstallSetup = [dialogStorage, installIterator, offset, total](Process &process) {
+        const QStringList args = {*installIterator, sdkRootArg()};
+        QuestionProgressDialog *dialog = dialogStorage->m_dialog.get();
+        setupSdkProcess(args, &process, dialog, offset + installIterator.iteration(), total);
+        dialog->appendMessage(Tr::tr("Installing %1...").arg(*installIterator) + '\n',
+                              StdOutFormat);
+        dialog->setProgress((offset + installIterator.iteration()) * 100.0 / total);
+    };
+
+    const auto onDone = [dialogStorage](DoneWith result) {
+        handleSdkProcess(dialogStorage->m_dialog.get(), result);
+    };
+
+    return Group {
+        onGroupSetup(onSetup),
+        Group {
+            finishAllAndSuccess,
+            uninstallIterator,
+            ProcessTask(onUninstallSetup, onDone)
+        },
+        Group {
+            finishAllAndSuccess,
+            installIterator,
+            ProcessTask(onInstallSetup, onDone)
+        }
+    };
+}
+
+static GroupItem updateRecipe(const Storage<DialogStorage> &dialogStorage)
+{
+    const auto onUpdateSetup = [dialogStorage](Process &process) {
+        const QStringList args = {"--update", sdkRootArg()};
+        QuestionProgressDialog *dialog = dialogStorage->m_dialog.get();
+        setupSdkProcess(args, &process, dialog, 0, 1);
+        dialog->appendMessage(Tr::tr("Updating installed packages...") + '\n', NormalMessageFormat);
+        dialog->setProgress(0);
+    };
+    const auto onDone = [dialogStorage](DoneWith result) {
+        handleSdkProcess(dialogStorage->m_dialog.get(), result);
+    };
+
+    return ProcessTask(onUpdateSetup, onDone);
+}
 
 class AndroidSdkManagerPrivate
 {
@@ -160,56 +330,35 @@ public:
     ~AndroidSdkManagerPrivate();
 
     AndroidSdkPackageList filteredPackages(AndroidSdkPackage::PackageState state,
-                                           AndroidSdkPackage::PackageType type,
-                                           bool forceUpdate = false);
-    const AndroidSdkPackageList &allPackages(bool forceUpdate = false);
-    void refreshSdkPackages(bool forceReload = false);
+                                           AndroidSdkPackage::PackageType type)
+    {
+        m_sdkManager.refreshPackages();
+        return Utils::filtered(m_allPackages, [state, type](const AndroidSdkPackage *p) {
+            return p->state() & state && p->type() & type;
+        });
+    }
+    const AndroidSdkPackageList &allPackages();
 
-    void parseCommonArguments(QPromise<QString> &promise);
-    void updateInstalled(SdkCmdPromise &fi);
-    void update(SdkCmdPromise &fi, const QStringList &install,
-                const QStringList &uninstall);
-    void checkPendingLicense(SdkCmdPromise &fi);
-    void getPendingLicense(SdkCmdPromise &fi);
-
-    void addWatcher(const QFuture<AndroidSdkManager::OperationOutput> &future);
-    void setLicenseInput(bool acceptLicense);
-
-    std::unique_ptr<QFutureWatcher<void>, decltype(&watcherDeleter)> m_activeOperation;
-
-private:
-    QByteArray getUserInput() const;
-    void clearUserInput();
     void reloadSdkPackages();
-    void clearPackages();
-    bool onLicenseStdOut(const QString &output, bool notify,
-                         AndroidSdkManager::OperationOutput &result, SdkCmdPromise &fi);
+
+    void runDialogRecipe(const Storage<DialogStorage> &dialogStorage,
+                         const GroupItem &licenseRecipe, const GroupItem &continuationRecipe);
 
     AndroidSdkManager &m_sdkManager;
     AndroidSdkPackageList m_allPackages;
     FilePath lastSdkManagerPath;
-    QString m_licenseTextCache;
-    QByteArray m_licenseUserInput;
-    mutable QReadWriteLock m_licenseInputLock;
-
-public:
     bool m_packageListingSuccessful = false;
+    TaskTreeRunner m_taskTreeRunner;
 };
 
-AndroidSdkManager::AndroidSdkManager()
-    : m_d(new AndroidSdkManagerPrivate(*this))
-{
-}
+AndroidSdkManager::AndroidSdkManager() : m_d(new AndroidSdkManagerPrivate(*this)) {}
 
-AndroidSdkManager::~AndroidSdkManager()
-{
-    cancelOperatons();
-}
+AndroidSdkManager::~AndroidSdkManager() = default;
 
 SdkPlatformList AndroidSdkManager::installedSdkPlatforms()
 {
-    AndroidSdkPackageList list = m_d->filteredPackages(AndroidSdkPackage::Installed,
-                                                       AndroidSdkPackage::SdkPlatformPackage);
+    const AndroidSdkPackageList list = m_d->filteredPackages(AndroidSdkPackage::Installed,
+                                                             AndroidSdkPackage::SdkPlatformPackage);
     return Utils::static_container_cast<SdkPlatform *>(list);
 }
 
@@ -218,6 +367,32 @@ const AndroidSdkPackageList &AndroidSdkManager::allSdkPackages()
     return m_d->allPackages();
 }
 
+QStringList AndroidSdkManager::notFoundEssentialSdkPackages()
+{
+    QStringList essentials = AndroidConfig::allEssentials();
+    const AndroidSdkPackageList &packages = allSdkPackages();
+    for (AndroidSdkPackage *package : packages) {
+        essentials.removeOne(package->sdkStylePath());
+        if (essentials.isEmpty())
+            return {};
+    }
+    return essentials;
+}
+
+QStringList AndroidSdkManager::missingEssentialSdkPackages()
+{
+    const QStringList essentials = AndroidConfig::allEssentials();
+    const AndroidSdkPackageList &packages = allSdkPackages();
+    QStringList missingPackages;
+    for (AndroidSdkPackage *package : packages) {
+        if (essentials.contains(package->sdkStylePath())
+            && package->state() != AndroidSdkPackage::Installed) {
+            missingPackages.append(package->sdkStylePath());
+        }
+    }
+    return missingPackages;
+}
+
 AndroidSdkPackageList AndroidSdkManager::installedSdkPackages()
 {
     return m_d->filteredPackages(AndroidSdkPackage::Installed, AndroidSdkPackage::AnyValidType);
@@ -225,23 +400,21 @@ AndroidSdkPackageList AndroidSdkManager::installedSdkPackages()
 
 SystemImageList AndroidSdkManager::installedSystemImages()
 {
-    AndroidSdkPackageList list = m_d->filteredPackages(AndroidSdkPackage::AnyValidState,
-                                                       AndroidSdkPackage::SdkPlatformPackage);
-    QList<SdkPlatform *> platforms = Utils::static_container_cast<SdkPlatform *>(list);
-
+    const AndroidSdkPackageList list = m_d->filteredPackages(AndroidSdkPackage::AnyValidState,
+                                                             AndroidSdkPackage::SdkPlatformPackage);
+    const QList<SdkPlatform *> platforms = Utils::static_container_cast<SdkPlatform *>(list);
     SystemImageList result;
     for (SdkPlatform *platform : platforms) {
         if (platform->systemImages().size() > 0)
             result.append(platform->systemImages());
     }
-
     return result;
 }
 
 NdkList AndroidSdkManager::installedNdkPackages()
 {
-    AndroidSdkPackageList list = m_d->filteredPackages(AndroidSdkPackage::Installed,
-                                                       AndroidSdkPackage::NDKPackage);
+    const AndroidSdkPackageList list = m_d->filteredPackages(AndroidSdkPackage::Installed,
+                                                             AndroidSdkPackage::NDKPackage);
     return Utils::static_container_cast<Ndk *>(list);
 }
 
@@ -263,7 +436,6 @@ SdkPlatformList AndroidSdkManager::filteredSdkPlatforms(int minApiLevel,
 {
     const AndroidSdkPackageList list = m_d->filteredPackages(state,
                                                              AndroidSdkPackage::SdkPlatformPackage);
-
     SdkPlatformList result;
     for (AndroidSdkPackage *p : list) {
         auto platform = static_cast<SdkPlatform *>(p);
@@ -287,14 +459,15 @@ BuildToolsList AndroidSdkManager::filteredBuildTools(int minApiLevel,
     return result;
 }
 
-void AndroidSdkManager::reloadPackages(bool forceReload)
+void AndroidSdkManager::refreshPackages()
 {
-    m_d->refreshSdkPackages(forceReload);
+    if (AndroidConfig::sdkManagerToolPath() != m_d->lastSdkManagerPath)
+        reloadPackages();
 }
 
-bool AndroidSdkManager::isBusy() const
+void AndroidSdkManager::reloadPackages()
 {
-    return m_d->m_activeOperation && !m_d->m_activeOperation->isFinished();
+    m_d->reloadSdkPackages();
 }
 
 bool AndroidSdkManager::packageListingSuccessful() const
@@ -302,95 +475,51 @@ bool AndroidSdkManager::packageListingSuccessful() const
     return m_d->m_packageListingSuccessful;
 }
 
-QFuture<QString> AndroidSdkManager::availableArguments() const
+/*!
+    Runs the \c sdkmanger tool with arguments \a args. Returns \c true if the command is
+    successfully executed. Output is copied into \a output. The function blocks the calling thread.
+ */
+static bool sdkManagerCommand(const QStringList &args, QString *output)
 {
-    return Utils::asyncRun(&AndroidSdkManagerPrivate::parseCommonArguments, m_d.get());
+    QStringList newArgs = args;
+    newArgs.append(sdkRootArg());
+    Process proc;
+    proc.setEnvironment(AndroidConfig::toolsEnvironment());
+    proc.setTimeOutMessageBoxEnabled(true);
+    proc.setCommand({AndroidConfig::sdkManagerToolPath(), newArgs});
+    qCDebug(sdkManagerLog).noquote() << "Running SDK Manager command (sync):"
+                                     << proc.commandLine().toUserOutput();
+    proc.runBlocking(60s, EventLoopMode::On);
+    if (output)
+        *output = proc.allOutput();
+    return proc.result() == ProcessResult::FinishedWithSuccess;
 }
 
-QFuture<AndroidSdkManager::OperationOutput> AndroidSdkManager::updateAll()
-{
-    if (isBusy()) {
-        return QFuture<AndroidSdkManager::OperationOutput>();
-    }
-    auto future = Utils::asyncRun(&AndroidSdkManagerPrivate::updateInstalled, m_d.get());
-    m_d->addWatcher(future);
-    return future;
-}
-
-QFuture<AndroidSdkManager::OperationOutput>
-AndroidSdkManager::update(const QStringList &install, const QStringList &uninstall)
-{
-    if (isBusy())
-        return QFuture<AndroidSdkManager::OperationOutput>();
-    auto future = Utils::asyncRun(&AndroidSdkManagerPrivate::update, m_d.get(), install, uninstall);
-    m_d->addWatcher(future);
-    return future;
-}
-
-QFuture<AndroidSdkManager::OperationOutput> AndroidSdkManager::checkPendingLicenses()
-{
-    if (isBusy())
-        return QFuture<AndroidSdkManager::OperationOutput>();
-    auto future = Utils::asyncRun(&AndroidSdkManagerPrivate::checkPendingLicense, m_d.get());
-    m_d->addWatcher(future);
-    return future;
-}
-
-QFuture<AndroidSdkManager::OperationOutput> AndroidSdkManager::runLicenseCommand()
-{
-    if (isBusy())
-        return QFuture<AndroidSdkManager::OperationOutput>();
-    auto future = Utils::asyncRun(&AndroidSdkManagerPrivate::getPendingLicense, m_d.get());
-    m_d->addWatcher(future);
-    return future;
-}
-
-void AndroidSdkManager::cancelOperatons()
-{
-    emit cancelActiveOperations();
-    m_d->m_activeOperation.reset();
-}
-
-void AndroidSdkManager::acceptSdkLicense(bool accept)
-{
-    m_d->setLicenseInput(accept);
-}
-
-AndroidSdkManagerPrivate::AndroidSdkManagerPrivate(AndroidSdkManager &sdkManager):
-    m_activeOperation(nullptr, watcherDeleter),
-    m_sdkManager(sdkManager)
+AndroidSdkManagerPrivate::AndroidSdkManagerPrivate(AndroidSdkManager &sdkManager)
+    : m_sdkManager(sdkManager)
 {}
 
 AndroidSdkManagerPrivate::~AndroidSdkManagerPrivate()
 {
-    clearPackages();
+    qDeleteAll(m_allPackages);
 }
 
-AndroidSdkPackageList
-AndroidSdkManagerPrivate::filteredPackages(AndroidSdkPackage::PackageState state,
-                                           AndroidSdkPackage::PackageType type, bool forceUpdate)
+const AndroidSdkPackageList &AndroidSdkManagerPrivate::allPackages()
 {
-    refreshSdkPackages(forceUpdate);
-    return Utils::filtered(m_allPackages, [state, type](const AndroidSdkPackage *p) {
-       return p->state() & state && p->type() & type;
-    });
-}
-
-const AndroidSdkPackageList &AndroidSdkManagerPrivate::allPackages(bool forceUpdate)
-{
-    refreshSdkPackages(forceUpdate);
+    m_sdkManager.refreshPackages();
     return m_allPackages;
 }
 
 void AndroidSdkManagerPrivate::reloadSdkPackages()
 {
     emit m_sdkManager.packageReloadBegin();
-    clearPackages();
+    qDeleteAll(m_allPackages);
+    m_allPackages.clear();
 
-    lastSdkManagerPath = androidConfig().sdkManagerToolPath();
+    lastSdkManagerPath = AndroidConfig::sdkManagerToolPath();
     m_packageListingSuccessful = false;
 
-    if (androidConfig().sdkToolsVersion().isNull()) {
+    if (AndroidConfig::sdkToolsVersion().isNull()) {
         // Configuration has invalid sdk path or corrupt installation.
         emit m_sdkManager.packageReloadFinished();
         return;
@@ -398,8 +527,8 @@ void AndroidSdkManagerPrivate::reloadSdkPackages()
 
     QString packageListing;
     QStringList args({"--list", "--verbose"});
-    args << androidConfig().sdkManagerToolArgs();
-    m_packageListingSuccessful = sdkManagerCommand(androidConfig(), args, &packageListing);
+    args << AndroidConfig::sdkManagerToolArgs();
+    m_packageListingSuccessful = sdkManagerCommand(args, &packageListing);
     if (m_packageListingSuccessful) {
         SdkManagerOutputParser parser(m_allPackages);
         parser.parsePackageListing(packageListing);
@@ -410,239 +539,67 @@ void AndroidSdkManagerPrivate::reloadSdkPackages()
     emit m_sdkManager.packageReloadFinished();
 }
 
-void AndroidSdkManagerPrivate::refreshSdkPackages(bool forceReload)
+void AndroidSdkManagerPrivate::runDialogRecipe(const Storage<DialogStorage> &dialogStorage,
+                                               const GroupItem &licensesRecipe,
+                                               const GroupItem &continuationRecipe)
 {
-    // Sdk path changed. Updated packages.
-    // QTC updates the package listing only
-    if (androidConfig().sdkManagerToolPath() != lastSdkManagerPath || forceReload)
-        reloadSdkPackages();
-}
-
-void AndroidSdkManagerPrivate::updateInstalled(SdkCmdPromise &promise)
-{
-    promise.setProgressRange(0, 100);
-    promise.setProgressValue(0);
-    AndroidSdkManager::OperationOutput result;
-    result.type = AndroidSdkManager::UpdateAll;
-    result.stdOutput = Tr::tr("Updating installed packages.");
-    promise.addResult(result);
-    QStringList args("--update");
-    args << androidConfig().sdkManagerToolArgs();
-    if (!promise.isCanceled())
-        sdkManagerCommand(androidConfig(), args, m_sdkManager, promise, result, 100);
-    else
-        qCDebug(sdkManagerLog) << "Update: Operation cancelled before start";
-
-    if (result.stdError.isEmpty() && !result.success)
-        result.stdError = Tr::tr("Failed.");
-    result.stdOutput = Tr::tr("Done") + "\n\n";
-    promise.addResult(result);
-    promise.setProgressValue(100);
-}
-
-void AndroidSdkManagerPrivate::update(SdkCmdPromise &fi, const QStringList &install,
-                                      const QStringList &uninstall)
-{
-    fi.setProgressRange(0, 100);
-    fi.setProgressValue(0);
-    double progressQuota = 100.0 / (install.count() + uninstall.count());
-    int currentProgress = 0;
-
-    QString installTag = Tr::tr("Installing");
-    QString uninstallTag = Tr::tr("Uninstalling");
-
-    auto doOperation = [&](const QString& packagePath, const QStringList& args,
-            bool isInstall) {
-        AndroidSdkManager::OperationOutput result;
-        result.type = AndroidSdkManager::UpdatePackage;
-        result.stdOutput = QString("%1 %2").arg(isInstall ? installTag : uninstallTag)
-                .arg(packagePath);
-        fi.addResult(result);
-        if (fi.isCanceled())
-            qCDebug(sdkManagerLog) << args << "Update: Operation cancelled before start";
-        else
-            sdkManagerCommand(androidConfig(), args, m_sdkManager, fi, result, progressQuota, isInstall);
-        currentProgress += progressQuota;
-        fi.setProgressValue(currentProgress);
-        if (result.stdError.isEmpty() && !result.success)
-            result.stdError = Tr::tr("Failed");
-        result.stdOutput = Tr::tr("Done") + "\n\n";
-        fi.addResult(result);
-        return fi.isCanceled();
+    const auto onCancelSetup = [dialogStorage] {
+        return std::make_pair(dialogStorage->m_dialog.get(), &QDialog::rejected);
     };
+    const Group root {
+        dialogStorage,
+        Group {
+            licensesRecipe,
+            Sync([dialogStorage] { dialogStorage->m_dialog->setQuestionVisible(false); }),
+            continuationRecipe
+        }.withCancel(onCancelSetup)
+    };
+    m_taskTreeRunner.start(root, {}, [this](DoneWith) {
+        QMetaObject::invokeMethod(&m_sdkManager, &AndroidSdkManager::reloadPackages,
+                                  Qt::QueuedConnection);
+    });
+}
 
+void AndroidSdkManager::runInstallationChange(const InstallationChange &change,
+                                              const QString &extraMessage)
+{
+    QString message = Tr::tr("%n Android SDK packages shall be updated.", "", change.count());
+    if (!extraMessage.isEmpty())
+        message.prepend(extraMessage + "\n\n");
 
-    // Uninstall packages
-    for (const QString &sdkStylePath : uninstall) {
-        // Uninstall operations are not interptible. We don't want to leave half uninstalled.
-        QStringList args;
-        args << "--uninstall" << sdkStylePath << androidConfig().sdkManagerToolArgs();
-        if (doOperation(sdkStylePath, args, false))
-            break;
+    QMessageBox messageDlg(QMessageBox::Information, Tr::tr("Android SDK Changes"),
+                           message, QMessageBox::Ok | QMessageBox::Cancel,
+                           Core::ICore::dialogParent());
+
+    QString details;
+    if (!change.toUninstall.isEmpty()) {
+        QStringList toUninstall = {Tr::tr("[Packages to be uninstalled:]")};
+        toUninstall += change.toUninstall;
+        details += toUninstall.join("\n   ");
     }
-
-    // Install packages
-    for (const QString &sdkStylePath : install) {
-        QStringList args(sdkStylePath);
-        args << androidConfig().sdkManagerToolArgs();
-        if (doOperation(sdkStylePath, args, true))
-            break;
+    if (!change.toInstall.isEmpty()) {
+        if (!change.toUninstall.isEmpty())
+            details.append("\n\n");
+        QStringList toInstall = {Tr::tr("[Packages to be installed:]")};
+        toInstall += change.toInstall;
+        details += toInstall.join("\n   ");
     }
-    fi.setProgressValue(100);
-}
-
-void AndroidSdkManagerPrivate::checkPendingLicense(SdkCmdPromise &fi)
-{
-    fi.setProgressRange(0, 100);
-    fi.setProgressValue(0);
-    AndroidSdkManager::OperationOutput result;
-    result.type = AndroidSdkManager::LicenseCheck;
-    const QStringList args = {"--licenses", sdkRootArg(androidConfig())};
-    if (!fi.isCanceled()) {
-        const int timeOutS = 4; // Short timeout as workaround for QTCREATORBUG-25667
-        sdkManagerCommand(androidConfig(), args, m_sdkManager, fi, result, 100.0, true, timeOutS);
-    } else {
-        qCDebug(sdkManagerLog) << "Update: Operation cancelled before start";
-    }
-
-    fi.addResult(result);
-    fi.setProgressValue(100);
-}
-
-void AndroidSdkManagerPrivate::getPendingLicense(SdkCmdPromise &fi)
-{
-    fi.setProgressRange(0, 100);
-    fi.setProgressValue(0);
-
-    AndroidSdkManager::OperationOutput result;
-    result.type = AndroidSdkManager::LicenseWorkflow;
-
-    Process licenseCommand;
-    licenseCommand.setProcessMode(ProcessMode::Writer);
-    licenseCommand.setEnvironment(androidConfig().toolsEnvironment());
-    bool reviewingLicenses = false;
-    licenseCommand.setCommand(CommandLine(androidConfig().sdkManagerToolPath(),
-                                          {"--licenses", sdkRootArg(androidConfig())}));
-    licenseCommand.setUseCtrlCStub(true);
-    licenseCommand.start();
-    QTextCodec *codec = QTextCodec::codecForLocale();
-    int inputCounter = 0, steps = -1;
-    while (!licenseCommand.waitForFinished(200ms)) {
-        QString stdOut = codec->toUnicode(licenseCommand.readAllRawStandardOutput());
-        bool assertionFound = false;
-        if (!stdOut.isEmpty())
-            assertionFound = onLicenseStdOut(stdOut, reviewingLicenses, result, fi);
-
-        if (reviewingLicenses) {
-            // Check user input
-            QByteArray userInput = getUserInput();
-            if (!userInput.isEmpty()) {
-                clearUserInput();
-                licenseCommand.writeRaw(userInput);
-                ++inputCounter;
-                if (steps != -1)
-                    fi.setProgressValue(qRound((inputCounter / (double)steps) * 100));
-            }
-        } else if (assertionFound) {
-            // The first assertion is to start reviewing licenses. Always accept.
-            reviewingLicenses = true;
-            static const QRegularExpression reg(R"((\d+\sof\s)(?<steps>\d+))");
-            QRegularExpressionMatch match = reg.match(stdOut);
-            if (match.hasMatch())
-                steps = match.captured("steps").toInt();
-            licenseCommand.write("Y\n");
-        }
-
-        if (fi.isCanceled()) {
-            licenseCommand.terminate();
-            if (!licenseCommand.waitForFinished(300ms)) {
-                licenseCommand.kill();
-                licenseCommand.waitForFinished(200ms);
-            }
-        }
-        if (licenseCommand.state() == QProcess::NotRunning)
-            break;
-    }
-
-    m_licenseTextCache.clear();
-    result.success = licenseCommand.exitStatus() == QProcess::NormalExit;
-    if (!result.success)
-        result.stdError = Tr::tr("License command failed.") + "\n\n";
-    fi.addResult(result);
-    fi.setProgressValue(100);
-}
-
-void AndroidSdkManagerPrivate::setLicenseInput(bool acceptLicense)
-{
-    QWriteLocker locker(&m_licenseInputLock);
-    m_licenseUserInput = acceptLicense ? "Y\n" : "n\n";
-}
-
-QByteArray AndroidSdkManagerPrivate::getUserInput() const
-{
-    QReadLocker locker(&m_licenseInputLock);
-    return m_licenseUserInput;
-}
-
-void AndroidSdkManagerPrivate::clearUserInput()
-{
-    QWriteLocker locker(&m_licenseInputLock);
-    m_licenseUserInput.clear();
-}
-
-bool AndroidSdkManagerPrivate::onLicenseStdOut(const QString &output, bool notify,
-                                               AndroidSdkManager::OperationOutput &result,
-                                               SdkCmdPromise &fi)
-{
-    m_licenseTextCache.append(output);
-    const QRegularExpressionMatch assertionMatch = assertionRegExp().match(m_licenseTextCache);
-    if (assertionMatch.hasMatch()) {
-        if (notify) {
-            result.stdOutput = m_licenseTextCache;
-            fi.addResult(result);
-        }
-        // Clear the current contents. The found license text is dispatched. Continue collecting the
-        // next license text.
-        m_licenseTextCache.clear();
-        return true;
-    }
-    return false;
-}
-
-void AndroidSdkManagerPrivate::addWatcher(const QFuture<AndroidSdkManager::OperationOutput> &future)
-{
-    if (future.isFinished())
+    messageDlg.setDetailedText(details);
+    if (messageDlg.exec() == QMessageBox::Cancel)
         return;
-    m_activeOperation.reset(new QFutureWatcher<void>());
-    m_activeOperation->setFuture(QFuture<void>(future));
+
+    const Storage<DialogStorage> dialogStorage;
+    m_d->runDialogRecipe(dialogStorage,
+        change.toInstall.count() ? licensesRecipe(dialogStorage) : nullItem,
+        installationRecipe(dialogStorage, change));
 }
 
-void AndroidSdkManagerPrivate::parseCommonArguments(QPromise<QString> &promise)
+void AndroidSdkManager::runUpdate()
 {
-    QString argumentDetails;
-    QString output;
-    sdkManagerCommand(androidConfig(), QStringList("--help"), &output);
-    bool foundTag = false;
-    const auto lines = output.split('\n');
-    for (const QString& line : lines) {
-        if (promise.isCanceled())
-            break;
-        if (foundTag)
-            argumentDetails.append(line + "\n");
-        else if (line.startsWith(commonArgsKey))
-            foundTag = true;
-    }
-
-    if (!promise.isCanceled())
-        promise.addResult(argumentDetails);
+    const Storage<DialogStorage> dialogStorage;
+    m_d->runDialogRecipe(dialogStorage, licensesRecipe(dialogStorage), updateRecipe(dialogStorage));
 }
 
-void AndroidSdkManagerPrivate::clearPackages()
-{
-    for (AndroidSdkPackage *p : std::as_const(m_allPackages))
-        delete p;
-    m_allPackages.clear();
-}
+} // namespace Android::Internal
 
-} // namespace Internal
-} // namespace Android
+#include "androidsdkmanager.moc"
diff --git a/src/plugins/android/androidsdkmanager.h b/src/plugins/android/androidsdkmanager.h
index 4c4d051af36..47611368f42 100644
--- a/src/plugins/android/androidsdkmanager.h
+++ b/src/plugins/android/androidsdkmanager.h
@@ -4,47 +4,39 @@
 
 #include "androidsdkpackage.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <QObject>
-#include <QFuture>
 
 #include <memory>
 
-namespace Android {
+QT_BEGIN_NAMESPACE
+class QRegularExpression;
+QT_END_MOC_NAMESPACE
 
-class AndroidConfig;
-
-namespace Internal {
+namespace Android::Internal {
 
 class AndroidSdkManagerPrivate;
 
+struct InstallationChange
+{
+    QStringList toInstall;
+    QStringList toUninstall = {};
+    int count() const { return toInstall.count() + toUninstall.count(); }
+};
+
 class AndroidSdkManager : public QObject
 {
     Q_OBJECT
+
 public:
-    enum CommandType
-    {
-        None,
-        UpdateAll,
-        UpdatePackage,
-        LicenseCheck,
-        LicenseWorkflow
-    };
-
-    struct OperationOutput
-    {
-        bool success = false;
-        CommandType type = None;
-        QString stdOutput;
-        QString stdError;
-    };
-
     AndroidSdkManager();
-    ~AndroidSdkManager() override;
+    ~AndroidSdkManager();
 
     SdkPlatformList installedSdkPlatforms();
     const AndroidSdkPackageList &allSdkPackages();
+    QStringList notFoundEssentialSdkPackages();
+    QStringList missingEssentialSdkPackages();
     AndroidSdkPackageList installedSdkPackages();
     SystemImageList installedSystemImages();
     NdkList installedNdkPackages();
@@ -57,31 +49,23 @@ public:
     BuildToolsList filteredBuildTools(int minApiLevel,
                                       AndroidSdkPackage::PackageState state
                                       = AndroidSdkPackage::Installed);
-    void reloadPackages(bool forceReload = false);
-    bool isBusy() const;
+    void refreshPackages();
+    void reloadPackages();
 
     bool packageListingSuccessful() const;
 
-    QFuture<QString> availableArguments() const;
-    QFuture<OperationOutput> updateAll();
-    QFuture<OperationOutput> update(const QStringList &install, const QStringList &uninstall);
-    QFuture<OperationOutput> checkPendingLicenses();
-    QFuture<OperationOutput> runLicenseCommand();
-
-    void cancelOperatons();
-    void acceptSdkLicense(bool accept);
+    void runInstallationChange(const InstallationChange &change, const QString &extraMessage = {});
+    void runUpdate();
 
 signals:
     void packageReloadBegin();
     void packageReloadFinished();
-    void cancelActiveOperations();
 
 private:
     friend class AndroidSdkManagerPrivate;
     std::unique_ptr<AndroidSdkManagerPrivate> m_d;
 };
 
+const QRegularExpression &assertionRegExp();
 
-int parseProgress(const QString &out, bool &foundAssertion);
-} // namespace Internal
-} // namespace Android
+} // namespace Android::Internal
diff --git a/src/plugins/android/androidsdkmanager_test.cpp b/src/plugins/android/androidsdkmanager_test.cpp
index abe6aa229c1..f677c9cd34e 100644
--- a/src/plugins/android/androidsdkmanager_test.cpp
+++ b/src/plugins/android/androidsdkmanager_test.cpp
@@ -51,6 +51,27 @@ void AndroidSdkManagerTest::testAndroidSdkManagerProgressParser_data()
         << true;
 }
 
+static int parseProgress(const QString &out, bool &foundAssertion)
+{
+    int progress = -1;
+    if (out.isEmpty())
+        return progress;
+    static const QRegularExpression reg("(?<progress>\\d*)%");
+    static const QRegularExpression regEndOfLine("[\\n\\r]");
+    const QStringList lines = out.split(regEndOfLine, Qt::SkipEmptyParts);
+    for (const QString &line : lines) {
+        QRegularExpressionMatch match = reg.match(line);
+        if (match.hasMatch()) {
+            progress = match.captured("progress").toInt();
+            if (progress < 0 || progress > 100)
+                progress = -1;
+        }
+        if (!foundAssertion)
+            foundAssertion = assertionRegExp().match(line).hasMatch();
+    }
+    return progress;
+}
+
 void AndroidSdkManagerTest::testAndroidSdkManagerProgressParser()
 {
     QFETCH(QString, output);
diff --git a/src/plugins/android/androidsdkmanagerdialog.cpp b/src/plugins/android/androidsdkmanagerdialog.cpp
new file mode 100644
index 00000000000..8ae1cfd77b5
--- /dev/null
+++ b/src/plugins/android/androidsdkmanagerdialog.cpp
@@ -0,0 +1,342 @@
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "androidconfigurations.h"
+#include "androidsdkmanager.h"
+#include "androidsdkmanagerdialog.h"
+#include "androidsdkmodel.h"
+#include "androidtr.h"
+
+#include <utils/layoutbuilder.h>
+#include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
+
+#include <QCheckBox>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QHeaderView>
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QSortFilterProxyModel>
+#include <QTreeView>
+
+using namespace Utils;
+using namespace std::placeholders;
+
+namespace Android::Internal {
+
+class OptionsDialog : public QDialog
+{
+public:
+    OptionsDialog(AndroidSdkManager *sdkManager, QWidget *parent)
+        : QDialog(parent)
+    {
+        QTC_CHECK(sdkManager);
+        resize(800, 480);
+        setWindowTitle(Tr::tr("SDK Manager Arguments"));
+
+        m_argumentDetailsEdit = new QPlainTextEdit;
+        m_argumentDetailsEdit->setReadOnly(true);
+
+        m_process.setEnvironment(AndroidConfig::toolsEnvironment());
+        m_process.setCommand({AndroidConfig::sdkManagerToolPath(),
+                              {"--help", "--sdk_root=" + AndroidConfig::sdkLocation().toString()}});
+        connect(&m_process, &Process::done, this, [this] {
+            const QString output = m_process.allOutput();
+            QString argumentDetails;
+            const int tagIndex = output.indexOf("Common Arguments:");
+            if (tagIndex >= 0) {
+                const int detailsIndex = output.indexOf('\n', tagIndex);
+                if (detailsIndex >= 0)
+                    argumentDetails = output.mid(detailsIndex + 1);
+            }
+            if (argumentDetails.isEmpty())
+                argumentDetails = Tr::tr("Cannot load available arguments for \"sdkmanager\" command.");
+            m_argumentDetailsEdit->setPlainText(argumentDetails);
+        });
+        m_process.start();
+
+        auto dialogButtons = new QDialogButtonBox;
+        dialogButtons->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
+        connect(dialogButtons, &QDialogButtonBox::accepted, this, &OptionsDialog::accept);
+        connect(dialogButtons, &QDialogButtonBox::rejected, this, &OptionsDialog::reject);
+
+        m_argumentsEdit = new QLineEdit;
+        m_argumentsEdit->setText(AndroidConfig::sdkManagerToolArgs().join(" "));
+
+        using namespace Layouting;
+
+        Column {
+            Form { Tr::tr("SDK manager arguments:"), m_argumentsEdit, br },
+            Tr::tr("Available arguments:"),
+            m_argumentDetailsEdit,
+            dialogButtons,
+        }.attachTo(this);
+    }
+
+    QStringList sdkManagerArguments() const
+    {
+        const QString userInput = m_argumentsEdit->text().simplified();
+        return userInput.isEmpty() ? QStringList() : userInput.split(' ');
+    }
+
+private:
+    QPlainTextEdit *m_argumentDetailsEdit = nullptr;
+    QLineEdit *m_argumentsEdit = nullptr;
+    Process m_process;
+};
+
+class PackageFilterModel : public QSortFilterProxyModel
+{
+public:
+    PackageFilterModel(AndroidSdkModel *sdkModel);
+
+    void setAcceptedPackageState(AndroidSdkPackage::PackageState state);
+    void setAcceptedSearchPackage(const QString &text);
+    bool filterAcceptsRow(int source_row, const QModelIndex &sourceParent) const override;
+
+private:
+    AndroidSdkPackage::PackageState m_packageState = AndroidSdkPackage::AnyValidState;
+    QString m_searchText;
+};
+
+class AndroidSdkManagerDialog : public QDialog
+{
+public:
+    AndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent);
+
+private:
+    AndroidSdkManager *m_sdkManager = nullptr;
+    AndroidSdkModel *m_sdkModel = nullptr;
+};
+
+AndroidSdkManagerDialog::AndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent)
+    : QDialog(parent)
+    , m_sdkManager(sdkManager)
+    , m_sdkModel(new AndroidSdkModel(m_sdkManager, this))
+{
+    QTC_CHECK(sdkManager);
+
+    setWindowTitle(Tr::tr("Android SDK Manager"));
+    resize(664, 396);
+    setModal(true);
+
+    auto packagesView = new QTreeView;
+    packagesView->setIndentation(20);
+    packagesView->header()->setCascadingSectionResizes(false);
+
+    auto updateInstalledButton = new QPushButton(Tr::tr("Update Installed"));
+
+    auto channelCheckbox = new QComboBox;
+    channelCheckbox->addItem(Tr::tr("Default"));
+    channelCheckbox->addItem(Tr::tr("Stable"));
+    channelCheckbox->addItem(Tr::tr("Beta"));
+    channelCheckbox->addItem(Tr::tr("Dev"));
+    channelCheckbox->addItem(Tr::tr("Canary"));
+
+    auto obsoleteCheckBox = new QCheckBox(Tr::tr("Include obsolete"));
+
+    auto showAvailableRadio = new QRadioButton(Tr::tr("Available"));
+    auto showInstalledRadio = new QRadioButton(Tr::tr("Installed"));
+    auto showAllRadio = new QRadioButton(Tr::tr("All"));
+    showAllRadio->setChecked(true);
+
+    auto optionsButton = new QPushButton(Tr::tr("Advanced Options..."));
+
+    auto searchField = new FancyLineEdit;
+    searchField->setPlaceholderText("Filter");
+
+    auto expandCheck = new QCheckBox(Tr::tr("Expand All"));
+
+    auto buttonBox = new QDialogButtonBox;
+    buttonBox->setStandardButtons(QDialogButtonBox::Apply | QDialogButtonBox::Cancel);
+    buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
+
+    auto proxyModel = new PackageFilterModel(m_sdkModel);
+    packagesView->setModel(proxyModel);
+    packagesView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+    packagesView->header()->setSectionResizeMode(AndroidSdkModel::packageNameColumn,
+                                                       QHeaderView::Stretch);
+    packagesView->header()->setStretchLastSection(false);
+
+    using namespace Layouting;
+    Column {
+        Grid {
+            Row {searchField, expandCheck}, br,
+            packagesView,
+            Column {
+                updateInstalledButton,
+                st,
+                Group {
+                    title(Tr::tr("Show Packages")),
+                    Column {
+                        Row { Tr::tr("Channel:"), channelCheckbox },
+                        obsoleteCheckBox,
+                        hr,
+                        showAvailableRadio,
+                        showInstalledRadio,
+                        showAllRadio,
+                    }
+                },
+                optionsButton,
+            }, br,
+        },
+        buttonBox,
+    }.attachTo(this);
+
+    connect(m_sdkModel, &AndroidSdkModel::dataChanged, this, [this, buttonBox] {
+        buttonBox->button(QDialogButtonBox::Apply)
+            ->setEnabled(m_sdkModel->installationChange().count());
+    });
+
+    connect(expandCheck, &QCheckBox::stateChanged, this, [packagesView](int state) {
+        if (state == Qt::Checked)
+            packagesView->expandAll();
+        else
+            packagesView->collapseAll();
+    });
+    connect(updateInstalledButton, &QPushButton::clicked,
+            m_sdkManager, &AndroidSdkManager::runUpdate);
+    connect(showAllRadio, &QRadioButton::toggled, this, [this, proxyModel](bool checked) {
+        if (checked) {
+            proxyModel->setAcceptedPackageState(AndroidSdkPackage::AnyValidState);
+            m_sdkModel->resetSelection();
+        }
+    });
+    connect(showInstalledRadio, &QRadioButton::toggled, this, [this, proxyModel](bool checked) {
+        if (checked) {
+            proxyModel->setAcceptedPackageState(AndroidSdkPackage::Installed);
+            m_sdkModel->resetSelection();
+        }
+    });
+    connect(showAvailableRadio, &QRadioButton::toggled, this, [this, proxyModel](bool checked) {
+        if (checked) {
+            proxyModel->setAcceptedPackageState(AndroidSdkPackage::Available);
+            m_sdkModel->resetSelection();
+        }
+    });
+
+    connect(searchField, &QLineEdit::textChanged,
+            this, [this, proxyModel, expandCheck](const QString &text) {
+        proxyModel->setAcceptedSearchPackage(text);
+        m_sdkModel->resetSelection();
+        // It is more convenient to expand the view with the results
+        expandCheck->setChecked(!text.isEmpty());
+    });
+
+    connect(buttonBox->button(QDialogButtonBox::Apply), &QAbstractButton::clicked, this, [this] {
+        m_sdkManager->runInstallationChange(m_sdkModel->installationChange());
+    });
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &AndroidSdkManagerDialog::reject);
+
+    connect(optionsButton, &QPushButton::clicked, this, [this] {
+        OptionsDialog dlg(m_sdkManager, this);
+        if (dlg.exec() == QDialog::Accepted) {
+            QStringList arguments = dlg.sdkManagerArguments();
+            if (arguments != AndroidConfig::sdkManagerToolArgs()) {
+                AndroidConfig::setSdkManagerToolArgs(arguments);
+                m_sdkManager->reloadPackages();
+            }
+        }
+    });
+
+    connect(obsoleteCheckBox, &QCheckBox::stateChanged, this, [this](int state) {
+        const QString obsoleteArg = "--include_obsolete";
+        QStringList args = AndroidConfig::sdkManagerToolArgs();
+        if (state == Qt::Checked && !args.contains(obsoleteArg)) {
+            args.append(obsoleteArg);
+            AndroidConfig::setSdkManagerToolArgs(args);
+       } else if (state == Qt::Unchecked && args.contains(obsoleteArg)) {
+            args.removeAll(obsoleteArg);
+            AndroidConfig::setSdkManagerToolArgs(args);
+       }
+        m_sdkManager->reloadPackages();
+    });
+
+    connect(channelCheckbox, &QComboBox::currentIndexChanged, this, [this](int index) {
+        QStringList args = AndroidConfig::sdkManagerToolArgs();
+        QString existingArg;
+        for (int i = 0; i < 4; ++i) {
+            const QString arg = "--channel=" + QString::number(i);
+            if (args.contains(arg)) {
+                existingArg = arg;
+                break;
+            }
+        }
+
+        if (index == 0 && !existingArg.isEmpty()) {
+            args.removeAll(existingArg);
+            AndroidConfig::setSdkManagerToolArgs(args);
+        } else if (index > 0) {
+            // Add 1 to account for Stable (second item) being channel 0
+            const QString channelArg = "--channel=" + QString::number(index - 1);
+            if (existingArg != channelArg) {
+                if (!existingArg.isEmpty()) {
+                    args.removeAll(existingArg);
+                    AndroidConfig::setSdkManagerToolArgs(args);
+                }
+                args.append(channelArg);
+                AndroidConfig::setSdkManagerToolArgs(args);
+            }
+       }
+        m_sdkManager->reloadPackages();
+    });
+}
+
+PackageFilterModel::PackageFilterModel(AndroidSdkModel *sdkModel) :
+    QSortFilterProxyModel(sdkModel)
+{
+    setSourceModel(sdkModel);
+}
+
+void PackageFilterModel::setAcceptedPackageState(AndroidSdkPackage::PackageState state)
+{
+    m_packageState = state;
+    invalidateFilter();
+}
+
+void PackageFilterModel::setAcceptedSearchPackage(const QString &name)
+{
+    m_searchText = name;
+    invalidateFilter();
+}
+
+bool PackageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
+{
+    QModelIndex srcIndex = sourceModel()->index(sourceRow, 0, sourceParent);
+    if (!srcIndex.isValid())
+        return false;
+
+    auto packageState = [](const QModelIndex& i) {
+      return (AndroidSdkPackage::PackageState)i.data(AndroidSdkModel::PackageStateRole).toInt();
+    };
+
+    auto packageFound = [this](const QModelIndex& i) {
+        return i.data(AndroidSdkModel::packageNameColumn).toString()
+                .contains(m_searchText, Qt::CaseInsensitive);
+    };
+
+    bool showTopLevel = false;
+    if (!sourceParent.isValid()) {
+        // Top Level items
+        for (int row = 0; row < sourceModel()->rowCount(srcIndex); ++row) {
+            QModelIndex childIndex = sourceModel()->index(row, 0, srcIndex);
+            if ((m_packageState & packageState(childIndex) && packageFound(childIndex))) {
+                showTopLevel = true;
+                break;
+            }
+        }
+    }
+
+    return showTopLevel || ((packageState(srcIndex) & m_packageState) && packageFound(srcIndex));
+}
+
+void executeAndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent)
+{
+    AndroidSdkManagerDialog dialog(sdkManager, parent);
+    dialog.exec();
+}
+
+} // Android::Internal
diff --git a/src/plugins/android/androidsdkmanagerdialog.h b/src/plugins/android/androidsdkmanagerdialog.h
new file mode 100644
index 00000000000..e5e10c6783b
--- /dev/null
+++ b/src/plugins/android/androidsdkmanagerdialog.h
@@ -0,0 +1,13 @@
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+#pragma once
+
+#include <QWidget>
+
+namespace Android::Internal {
+
+class AndroidSdkManager;
+
+void executeAndroidSdkManagerDialog(AndroidSdkManager *sdkManager, QWidget *parent);
+
+} // Android::Internal
diff --git a/src/plugins/android/androidsdkmanagerwidget.cpp b/src/plugins/android/androidsdkmanagerwidget.cpp
deleted file mode 100644
index 7b1ca4e88f5..00000000000
--- a/src/plugins/android/androidsdkmanagerwidget.cpp
+++ /dev/null
@@ -1,682 +0,0 @@
-// Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "androidconfigurations.h"
-#include "androidsdkmanager.h"
-#include "androidsdkmanagerwidget.h"
-#include "androidsdkmodel.h"
-#include "androidtr.h"
-
-#include <coreplugin/icore.h>
-
-#include <utils/async.h>
-#include <utils/layoutbuilder.h>
-#include <utils/outputformatter.h>
-#include <utils/qtcassert.h>
-#include <utils/utilsicons.h>
-
-#include <QAbstractButton>
-#include <QDialogButtonBox>
-#include <QGridLayout>
-#include <QGuiApplication>
-#include <QLabel>
-#include <QLineEdit>
-#include <QLoggingCategory>
-#include <QMessageBox>
-#include <QSortFilterProxyModel>
-
-using namespace Utils;
-using namespace std::placeholders;
-
-namespace Android::Internal {
-
-static Q_LOGGING_CATEGORY(androidSdkMgrUiLog, "qtc.android.sdkManagerUi", QtWarningMsg)
-
-class PackageFilterModel : public QSortFilterProxyModel
-{
-public:
-    PackageFilterModel(AndroidSdkModel *sdkModel);
-
-    void setAcceptedPackageState(AndroidSdkPackage::PackageState state);
-    void setAcceptedSearchPackage(const QString &text);
-    bool filterAcceptsRow(int source_row, const QModelIndex &sourceParent) const override;
-
-private:
-    AndroidSdkPackage::PackageState m_packageState = AndroidSdkPackage::AnyValidState;
-    QString m_searchText;
-};
-
-AndroidSdkManagerWidget::AndroidSdkManagerWidget(AndroidSdkManager *sdkManager, QWidget *parent) :
-    QDialog(parent),
-    m_sdkManager(sdkManager),
-    m_sdkModel(new AndroidSdkModel(m_sdkManager, this))
-{
-    QTC_CHECK(sdkManager);
-
-    setWindowTitle(Tr::tr("Android SDK Manager"));
-    resize(664, 396);
-    setModal(true);
-
-    m_packagesStack = new QWidget;
-
-    auto packagesView = new QTreeView(m_packagesStack);
-    packagesView->setIndentation(20);
-    packagesView->header()->setCascadingSectionResizes(false);
-
-    auto updateInstalledButton = new QPushButton(Tr::tr("Update Installed"));
-
-    auto channelCheckbox = new QComboBox;
-    channelCheckbox->addItem(Tr::tr("Default"));
-    channelCheckbox->addItem(Tr::tr("Stable"));
-    channelCheckbox->addItem(Tr::tr("Beta"));
-    channelCheckbox->addItem(Tr::tr("Dev"));
-    channelCheckbox->addItem(Tr::tr("Canary"));
-
-    auto obsoleteCheckBox = new QCheckBox(Tr::tr("Include obsolete"));
-
-    auto showAvailableRadio = new QRadioButton(Tr::tr("Available"));
-    auto showInstalledRadio = new QRadioButton(Tr::tr("Installed"));
-    auto showAllRadio = new QRadioButton(Tr::tr("All"));
-    showAllRadio->setChecked(true);
-
-    auto optionsButton = new QPushButton(Tr::tr("Advanced Options..."));
-
-    auto searchField = new FancyLineEdit(m_packagesStack);
-    searchField->setPlaceholderText("Filter");
-
-    auto expandCheck = new QCheckBox(Tr::tr("Expand All"));
-
-    m_outputStack = new QWidget;
-    m_operationProgress = new QProgressBar(m_outputStack);
-
-    m_outputEdit = new QPlainTextEdit(m_outputStack);
-    m_outputEdit->setReadOnly(true);
-
-    m_sdkLicenseLabel = new QLabel(Tr::tr("Do you want to accept the Android SDK license?"));
-    m_sdkLicenseLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-    m_sdkLicenseLabel->hide();
-
-    m_sdkLicenseButtonBox = new QDialogButtonBox(m_outputStack);
-    m_sdkLicenseButtonBox->setEnabled(false);
-    m_sdkLicenseButtonBox->setStandardButtons(QDialogButtonBox::No|QDialogButtonBox::Yes);
-    m_sdkLicenseButtonBox->hide();
-
-    m_buttonBox = new QDialogButtonBox(this);
-    m_buttonBox->setStandardButtons(QDialogButtonBox::Apply | QDialogButtonBox::Cancel);
-    m_buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
-
-    m_viewStack = new QStackedWidget(this);
-    m_viewStack->addWidget(m_packagesStack);
-    m_viewStack->addWidget(m_outputStack);
-    m_viewStack->setCurrentWidget(m_packagesStack);
-
-    m_formatter = new OutputFormatter;
-    m_formatter->setPlainTextEdit(m_outputEdit);
-
-    auto proxyModel = new PackageFilterModel(m_sdkModel);
-    packagesView->setModel(proxyModel);
-    packagesView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
-    packagesView->header()->setSectionResizeMode(AndroidSdkModel::packageNameColumn,
-                                                       QHeaderView::Stretch);
-    packagesView->header()->setStretchLastSection(false);
-
-    using namespace Layouting;
-    Grid {
-        searchField, expandCheck, br,
-
-        Span(2, packagesView),
-        Column {
-            updateInstalledButton,
-            st,
-            Group {
-                title(Tr::tr("Show Packages")),
-                Column {
-                    Row { Tr::tr("Channel:"), channelCheckbox },
-                    obsoleteCheckBox,
-                    hr,
-                    showAvailableRadio,
-                    showInstalledRadio,
-                    showAllRadio,
-                }
-            },
-            optionsButton
-        },
-        noMargin
-    }.attachTo(m_packagesStack);
-
-    Column {
-        m_outputEdit,
-        Row { m_sdkLicenseLabel, m_sdkLicenseButtonBox },
-        m_operationProgress,
-        noMargin
-    }.attachTo(m_outputStack);
-
-    Column {
-        m_viewStack,
-        m_buttonBox
-    }.attachTo(this);
-
-    connect(m_sdkModel, &AndroidSdkModel::dataChanged, this, [this] {
-        if (m_viewStack->currentWidget() == m_packagesStack)
-            m_buttonBox->button(QDialogButtonBox::Apply)
-                ->setEnabled(!m_sdkModel->userSelection().isEmpty());
-    });
-
-    connect(m_sdkModel, &AndroidSdkModel::modelAboutToBeReset, this,
-            [this, expandCheck] {
-        m_buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
-        expandCheck->setChecked(false);
-        cancelPendingOperations();
-        switchView(PackageListing);
-    });
-
-    connect(expandCheck, &QCheckBox::stateChanged, this, [packagesView](int state) {
-        if (state == Qt::Checked)
-            packagesView->expandAll();
-        else
-            packagesView->collapseAll();
-    });
-    connect(updateInstalledButton, &QPushButton::clicked,
-            this, &AndroidSdkManagerWidget::onUpdatePackages);
-    connect(showAllRadio, &QRadioButton::toggled, this, [this, proxyModel](bool checked) {
-        if (checked) {
-            proxyModel->setAcceptedPackageState(AndroidSdkPackage::AnyValidState);
-            m_sdkModel->resetSelection();
-        }
-    });
-    connect(showInstalledRadio, &QRadioButton::toggled,
-            this, [this, proxyModel](bool checked) {
-        if (checked) {
-            proxyModel->setAcceptedPackageState(AndroidSdkPackage::Installed);
-            m_sdkModel->resetSelection();
-        }
-    });
-    connect(showAvailableRadio, &QRadioButton::toggled, this, [this, proxyModel](bool checked) {
-        if (checked) {
-            proxyModel->setAcceptedPackageState(AndroidSdkPackage::Available);
-            m_sdkModel->resetSelection();
-        }
-    });
-
-    connect(searchField, &QLineEdit::textChanged,
-            this, [this, proxyModel, expandCheck](const QString &text) {
-        proxyModel->setAcceptedSearchPackage(text);
-        m_sdkModel->resetSelection();
-        // It is more convenient to expand the view with the results
-        expandCheck->setChecked(!text.isEmpty());
-    });
-
-    connect(m_buttonBox->button(QDialogButtonBox::Apply), &QAbstractButton::clicked, this, [this] {
-        onApplyButton();
-    });
-    connect(m_buttonBox, &QDialogButtonBox::rejected, this, &AndroidSdkManagerWidget::onCancel);
-
-    connect(optionsButton, &QPushButton::clicked,
-            this, &AndroidSdkManagerWidget::onSdkManagerOptions);
-    connect(m_sdkLicenseButtonBox, &QDialogButtonBox::accepted, this, [this] {
-        m_sdkManager->acceptSdkLicense(true);
-        m_sdkLicenseButtonBox->setEnabled(false); // Wait for next license to enable controls
-    });
-    connect(m_sdkLicenseButtonBox, &QDialogButtonBox::rejected, this, [this] {
-        m_sdkManager->acceptSdkLicense(false);
-        m_sdkLicenseButtonBox->setEnabled(false); // Wait for next license to enable controls
-    });
-
-    connect(obsoleteCheckBox, &QCheckBox::stateChanged, this, [this](int state) {
-        const QString obsoleteArg = "--include_obsolete";
-        QStringList args = androidConfig().sdkManagerToolArgs();
-        if (state == Qt::Checked && !args.contains(obsoleteArg)) {
-            args.append(obsoleteArg);
-            androidConfig().setSdkManagerToolArgs(args);
-       } else if (state == Qt::Unchecked && args.contains(obsoleteArg)) {
-            args.removeAll(obsoleteArg);
-            androidConfig().setSdkManagerToolArgs(args);
-       }
-        m_sdkManager->reloadPackages(true);
-    });
-
-    connect(channelCheckbox, &QComboBox::currentIndexChanged, this, [this](int index) {
-        QStringList args = androidConfig().sdkManagerToolArgs();
-        QString existingArg;
-        for (int i = 0; i < 4; ++i) {
-            const QString arg = "--channel=" + QString::number(i);
-            if (args.contains(arg)) {
-                existingArg = arg;
-                break;
-            }
-        }
-
-        if (index == 0 && !existingArg.isEmpty()) {
-            args.removeAll(existingArg);
-            androidConfig().setSdkManagerToolArgs(args);
-        } else if (index > 0) {
-            // Add 1 to account for Stable (second item) being channel 0
-            const QString channelArg = "--channel=" + QString::number(index - 1);
-            if (existingArg != channelArg) {
-                if (!existingArg.isEmpty()) {
-                    args.removeAll(existingArg);
-                    androidConfig().setSdkManagerToolArgs(args);
-                }
-                args.append(channelArg);
-                androidConfig().setSdkManagerToolArgs(args);
-            }
-       }
-        m_sdkManager->reloadPackages(true);
-    });
-}
-
-AndroidSdkManagerWidget::~AndroidSdkManagerWidget()
-{
-    if (m_currentOperation)
-        delete m_currentOperation;
-    cancelPendingOperations();
-    delete m_formatter;
-}
-
-void AndroidSdkManagerWidget::installEssentials()
-{
-    m_sdkModel->selectMissingEssentials();
-    if (!m_sdkModel->missingEssentials().isEmpty()) {
-        QMessageBox::warning(Core::ICore::dialogParent(),
-                             Tr::tr("Android SDK Changes"),
-                             Tr::tr("%1 cannot find the following essential packages: \"%2\".\n"
-                                    "Install them manually after the current operation is done.\n")
-                                 .arg(QGuiApplication::applicationDisplayName(),
-                                      m_sdkModel->missingEssentials().join("\", \"")));
-    }
-    onApplyButton(Tr::tr("Android SDK installation is missing necessary packages. "
-                     "Do you want to install the missing packages?"));
-}
-
-void AndroidSdkManagerWidget::beginLicenseCheck()
-{
-    m_formatter->appendMessage(Tr::tr("Checking pending licenses...") + "\n", NormalMessageFormat);
-    m_formatter->appendMessage(Tr::tr("The installation of Android SDK packages may fail if the "
-                                      "respective licenses are not accepted.")
-                                   + "\n",
-                               LogMessageFormat);
-    addPackageFuture(m_sdkManager->checkPendingLicenses());
-}
-
-void AndroidSdkManagerWidget::onApplyButton(const QString &extraMessage)
-{
-    QTC_ASSERT(m_currentView == PackageListing, return);
-
-    if (m_sdkManager->isBusy()) {
-        m_formatter->appendMessage("\n" + Tr::tr("SDK Manager is busy."), StdErrFormat);
-        return;
-    }
-
-    const QList<const AndroidSdkPackage *> packagesToUpdate = m_sdkModel->userSelection();
-    if (packagesToUpdate.isEmpty())
-        return;
-
-    QStringList installPackages, uninstallPackages;
-    for (auto package : packagesToUpdate) {
-        QString str = QString("   %1").arg(package->descriptionText());
-        if (package->state() == AndroidSdkPackage::Installed)
-            uninstallPackages << str;
-        else
-            installPackages << str;
-    }
-
-    QString message = Tr::tr("%n Android SDK packages shall be updated.", "", packagesToUpdate.count());
-    if (!extraMessage.isEmpty())
-        message.prepend(extraMessage + "\n\n");
-    QMessageBox messageDlg(QMessageBox::Information,
-                           Tr::tr("Android SDK Changes"),
-                           message,
-                           QMessageBox::Ok | QMessageBox::Cancel,
-                           Core::ICore::dialogParent());
-
-    QString details;
-    if (!uninstallPackages.isEmpty())
-        details = Tr::tr("[Packages to be uninstalled:]\n").append(uninstallPackages.join("\n"));
-
-    if (!installPackages.isEmpty()) {
-        if (!uninstallPackages.isEmpty())
-            details.append("\n\n");
-        details.append("[Packages to be installed:]\n").append(installPackages.join("\n"));
-    }
-    messageDlg.setDetailedText(details);
-    if (messageDlg.exec() == QMessageBox::Cancel)
-        return;
-
-    // Open the SDK Manager dialog after accepting to continue with the installation
-    show();
-
-    switchView(Operations);
-    m_pendingCommand = AndroidSdkManager::UpdatePackage;
-    // User agreed with the selection. Check for licenses.
-    if (!installPackages.isEmpty()) {
-        // Pending license affects installtion only.
-        beginLicenseCheck();
-    } else {
-        // Uninstall only. Go Ahead.
-        beginExecution();
-    }
-}
-
-void AndroidSdkManagerWidget::onUpdatePackages()
-{
-    if (m_sdkManager->isBusy()) {
-        m_formatter->appendMessage("\n" + Tr::tr("SDK Manager is busy."), StdErrFormat);
-        return;
-    }
-    switchView(Operations);
-    m_pendingCommand = AndroidSdkManager::UpdateAll;
-    beginLicenseCheck();
-}
-
-void AndroidSdkManagerWidget::onCancel()
-{
-    cancelPendingOperations();
-    close();
-}
-
-void AndroidSdkManagerWidget::onOperationResult(int index)
-{
-    QTC_ASSERT(m_currentOperation, return);
-    AndroidSdkManager::OperationOutput result = m_currentOperation->resultAt(index);
-    if (result.type == AndroidSdkManager::LicenseWorkflow) {
-        // Show license controls and enable to user input.
-        m_sdkLicenseLabel->setVisible(true);
-        m_sdkLicenseButtonBox->setVisible(true);
-        m_sdkLicenseButtonBox->setEnabled(true);
-        m_sdkLicenseButtonBox->button(QDialogButtonBox::No)->setDefault(true);
-    }
-    auto breakLine = [](const QString &line) { return line.endsWith("\n") ? line : line + "\n";};
-    if (!result.stdError.isEmpty() && result.type != AndroidSdkManager::LicenseCheck)
-        m_formatter->appendMessage(breakLine(result.stdError), StdErrFormat);
-    if (!result.stdOutput.isEmpty() && result.type != AndroidSdkManager::LicenseCheck)
-        m_formatter->appendMessage(breakLine(result.stdOutput), StdOutFormat);
-    m_outputEdit->ensureCursorVisible();
-}
-
-void AndroidSdkManagerWidget::onLicenseCheckResult(const AndroidSdkManager::OperationOutput& output)
-{
-    if (output.success) {
-        // No assertion was found. Looks like all license are accepted. Go Ahead.
-        runPendingCommand();
-    } else {
-        // Run license workflow.
-        beginLicenseWorkflow();
-    }
-}
-
-void AndroidSdkManagerWidget::addPackageFuture(const QFuture<AndroidSdkManager::OperationOutput>
-                                               &future)
-{
-    QTC_ASSERT(!m_currentOperation, return);
-    if (!future.isFinished() || !future.isCanceled()) {
-        m_currentOperation = new QFutureWatcher<AndroidSdkManager::OperationOutput>;
-        connect(m_currentOperation, &QFutureWatcherBase::resultReadyAt,
-                this, &AndroidSdkManagerWidget::onOperationResult);
-        connect(m_currentOperation, &QFutureWatcherBase::finished,
-                this, &AndroidSdkManagerWidget::packageFutureFinished);
-        connect(m_currentOperation, &QFutureWatcherBase::progressValueChanged,
-                this, [this](int value) {
-            m_operationProgress->setValue(value);
-        });
-        m_currentOperation->setFuture(future);
-    } else {
-        qCDebug(androidSdkMgrUiLog) << "Operation canceled/finished before adding to the queue";
-        if (m_sdkManager->isBusy()) {
-            m_formatter->appendMessage(Tr::tr("SDK Manager is busy. Operation cancelled."),
-                                       StdErrFormat);
-        }
-        notifyOperationFinished();
-        switchView(PackageListing);
-    }
-}
-
-void AndroidSdkManagerWidget::beginExecution()
-{
-    const QList<const AndroidSdkPackage *> packagesToUpdate = m_sdkModel->userSelection();
-    if (packagesToUpdate.isEmpty()) {
-        switchView(PackageListing);
-        return;
-    }
-
-    QStringList installSdkPaths, uninstallSdkPaths;
-    for (auto package : packagesToUpdate) {
-        if (package->state() == AndroidSdkPackage::Installed)
-            uninstallSdkPaths << package->sdkStylePath();
-        else
-            installSdkPaths << package->sdkStylePath();
-    }
-    m_formatter->appendMessage(Tr::tr("Installing/Uninstalling selected packages...\n"),
-                               NormalMessageFormat);
-    m_formatter->appendMessage(Tr::tr("Closing the %1 dialog will cancel the running and scheduled SDK "
-                                  "operations.\n").arg(HostOsInfo::isMacHost() ?
-                                                           Tr::tr("preferences") : Tr::tr("options")),
-                               LogMessageFormat);
-
-    addPackageFuture(m_sdkManager->update(installSdkPaths, uninstallSdkPaths));
-}
-
-void AndroidSdkManagerWidget::beginUpdate()
-{
-    m_formatter->appendMessage(Tr::tr("Updating installed packages...\n"), NormalMessageFormat);
-    m_formatter->appendMessage(Tr::tr("Closing the %1 dialog will cancel the running and scheduled SDK "
-                                  "operations.\n").arg(HostOsInfo::isMacHost() ?
-                                                           Tr::tr("preferences") : Tr::tr("options")),
-                               LogMessageFormat);
-    addPackageFuture(m_sdkManager->updateAll());
-}
-
-void AndroidSdkManagerWidget::beginLicenseWorkflow()
-{
-    switchView(LicenseWorkflow);
-    addPackageFuture(m_sdkManager->runLicenseCommand());
-}
-
-void AndroidSdkManagerWidget::notifyOperationFinished()
-{
-    if (!m_currentOperation || m_currentOperation->isFinished()) {
-        QMessageBox::information(this, Tr::tr("Android SDK Changes"),
-                                 Tr::tr("Android SDK operations finished."), QMessageBox::Ok);
-        m_operationProgress->setValue(0);
-        // Once the update/install is done, let's hide the dialog.
-        hide();
-    }
-}
-
-void AndroidSdkManagerWidget::packageFutureFinished()
-{
-    QTC_ASSERT (m_currentOperation, return);
-
-    bool continueWorkflow = true;
-    if (m_currentOperation->isCanceled()) {
-        m_formatter->appendMessage(Tr::tr("Operation cancelled.\n"), StdErrFormat);
-        continueWorkflow = false;
-    }
-    m_operationProgress->setValue(100);
-    int resultCount = m_currentOperation->future().resultCount();
-    if (continueWorkflow && resultCount > 0) {
-        AndroidSdkManager::OperationOutput output = m_currentOperation->resultAt(resultCount -1);
-        AndroidSdkManager::CommandType type = output.type;
-        m_currentOperation->deleteLater();
-        m_currentOperation = nullptr;
-        switch (type) {
-        case AndroidSdkManager::LicenseCheck:
-            onLicenseCheckResult(output);
-            break;
-        case AndroidSdkManager::LicenseWorkflow:
-            m_sdkLicenseButtonBox->hide();
-            m_sdkLicenseLabel->hide();
-            runPendingCommand();
-            break;
-        case AndroidSdkManager::UpdateAll:
-        case AndroidSdkManager::UpdatePackage:
-            notifyOperationFinished();
-            switchView(PackageListing);
-            m_sdkManager->reloadPackages(true);
-            break;
-        default:
-            break;
-        }
-    } else {
-        m_currentOperation->deleteLater();
-        m_currentOperation = nullptr;
-        switchView(PackageListing);
-        m_sdkManager->reloadPackages(true);
-    }
-}
-
-void AndroidSdkManagerWidget::cancelPendingOperations()
-{
-    if (!m_sdkManager->isBusy()) {
-        m_formatter->appendMessage(Tr::tr("\nNo pending operations to cancel...\n"),
-                                   NormalMessageFormat);
-        switchView(PackageListing);
-        return;
-    }
-    m_formatter->appendMessage(Tr::tr("\nCancelling pending operations...\n"),
-                               NormalMessageFormat);
-    m_sdkManager->cancelOperatons();
-}
-
-void AndroidSdkManagerWidget::switchView(AndroidSdkManagerWidget::View view)
-{
-    if (m_currentView == PackageListing)
-        m_formatter->clear();
-    m_currentView = view;
-    if (m_currentView == PackageListing) {
-        // We need the buttonBox only in the main listing view, as the license and update
-        // views already have a cancel button.
-        m_buttonBox->button(QDialogButtonBox::Apply)->setVisible(true);
-        emit updatingSdkFinished();
-    } else {
-        m_buttonBox->button(QDialogButtonBox::Apply)->setVisible(false);
-        emit updatingSdk();
-    }
-
-    if (m_currentView == LicenseWorkflow)
-        emit licenseWorkflowStarted();
-
-    m_operationProgress->setValue(0);
-    m_viewStack->setCurrentWidget(m_currentView == PackageListing ?
-                                          m_packagesStack : m_outputStack);
-}
-
-void AndroidSdkManagerWidget::runPendingCommand()
-{
-    if (m_pendingCommand == AndroidSdkManager::UpdatePackage)
-        beginExecution(); // License workflow can only start when updating packages.
-    else if (m_pendingCommand == AndroidSdkManager::UpdateAll)
-        beginUpdate();
-    else
-        QTC_ASSERT(false, qCDebug(androidSdkMgrUiLog) << "Unexpected state: No pending command.");
-}
-
-void AndroidSdkManagerWidget::onSdkManagerOptions()
-{
-    OptionsDialog dlg(m_sdkManager, androidConfig().sdkManagerToolArgs(), this);
-    if (dlg.exec() == QDialog::Accepted) {
-        QStringList arguments = dlg.sdkManagerArguments();
-        if (arguments != androidConfig().sdkManagerToolArgs()) {
-            androidConfig().setSdkManagerToolArgs(arguments);
-            m_sdkManager->reloadPackages(true);
-        }
-    }
-}
-
-PackageFilterModel::PackageFilterModel(AndroidSdkModel *sdkModel) :
-    QSortFilterProxyModel(sdkModel)
-{
-    setSourceModel(sdkModel);
-}
-
-void PackageFilterModel::setAcceptedPackageState(AndroidSdkPackage::PackageState state)
-{
-    m_packageState = state;
-    invalidateFilter();
-}
-
-void PackageFilterModel::setAcceptedSearchPackage(const QString &name)
-{
-    m_searchText = name;
-    invalidateFilter();
-}
-
-bool PackageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
-{
-    QModelIndex srcIndex = sourceModel()->index(sourceRow, 0, sourceParent);
-    if (!srcIndex.isValid())
-        return false;
-
-    auto packageState = [](const QModelIndex& i) {
-      return (AndroidSdkPackage::PackageState)i.data(AndroidSdkModel::PackageStateRole).toInt();
-    };
-
-    auto packageFound = [this](const QModelIndex& i) {
-        return i.data(AndroidSdkModel::packageNameColumn).toString()
-                .contains(m_searchText, Qt::CaseInsensitive);
-    };
-
-    bool showTopLevel = false;
-    if (!sourceParent.isValid()) {
-        // Top Level items
-        for (int row = 0; row < sourceModel()->rowCount(srcIndex); ++row) {
-            QModelIndex childIndex = sourceModel()->index(row, 0, srcIndex);
-            if ((m_packageState & packageState(childIndex) && packageFound(childIndex))) {
-                showTopLevel = true;
-                break;
-            }
-        }
-    }
-
-    return showTopLevel || ((packageState(srcIndex) & m_packageState) && packageFound(srcIndex));
-}
-
-OptionsDialog::OptionsDialog(AndroidSdkManager *sdkManager, const QStringList &args,
-                             QWidget *parent) : QDialog(parent)
-{
-    QTC_CHECK(sdkManager);
-    resize(800, 480);
-    setWindowTitle(Tr::tr("SDK Manager Arguments"));
-
-    m_argumentDetailsEdit = new QPlainTextEdit(this);
-    m_argumentDetailsEdit->setReadOnly(true);
-
-    auto populateOptions = [this](const QString& options) {
-        if (options.isEmpty()) {
-            m_argumentDetailsEdit->setPlainText(Tr::tr("Cannot load available arguments for "
-                                                       "\"sdkmanager\" command."));
-        } else {
-            m_argumentDetailsEdit->setPlainText(options);
-        }
-    };
-    m_optionsFuture = sdkManager->availableArguments();
-    Utils::onResultReady(m_optionsFuture, this, populateOptions);
-
-    auto dialogButtons = new QDialogButtonBox(this);
-    dialogButtons->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
-    connect(dialogButtons, &QDialogButtonBox::accepted, this, &OptionsDialog::accept);
-    connect(dialogButtons, &QDialogButtonBox::rejected, this, &OptionsDialog::reject);
-
-    m_argumentsEdit = new QLineEdit(this);
-    m_argumentsEdit->setText(args.join(" "));
-
-    auto gridLayout = new QGridLayout(this);
-    gridLayout->addWidget(new QLabel(Tr::tr("SDK manager arguments:"), this), 0, 0, 1, 1);
-    gridLayout->addWidget(m_argumentsEdit, 0, 1, 1, 1);
-    gridLayout->addWidget(new QLabel(Tr::tr("Available arguments:"), this), 1, 0, 1, 2);
-    gridLayout->addWidget(m_argumentDetailsEdit, 2, 0, 1, 2);
-    gridLayout->addWidget(dialogButtons, 3, 0, 1, 2);
-}
-
-OptionsDialog::~OptionsDialog()
-{
-    m_optionsFuture.cancel();
-    m_optionsFuture.waitForFinished();
-}
-
-QStringList OptionsDialog::sdkManagerArguments() const
-{
-    QString userInput = m_argumentsEdit->text().simplified();
-    return userInput.isEmpty() ? QStringList() : userInput.split(' ');
-}
-
-} // Android::Internal
diff --git a/src/plugins/android/androidsdkmanagerwidget.h b/src/plugins/android/androidsdkmanagerwidget.h
deleted file mode 100644
index ab915dc615c..00000000000
--- a/src/plugins/android/androidsdkmanagerwidget.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-#pragma once
-
-#include "androidconfigurations.h"
-#include "androidsdkmanager.h"
-
-#include <QDialog>
-#include <QFutureWatcher>
-#include <QWidget>
-
-QT_BEGIN_NAMESPACE
-class QLineEdit;
-class QPlainTextEdit;
-QT_END_NAMESPACE
-
-#include <QtCore/QVariant>
-#include <QtWidgets/QAbstractButton>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QComboBox>
-#include <QtWidgets/QDialogButtonBox>
-#include <QtWidgets/QFrame>
-#include <QtWidgets/QGroupBox>
-#include <QtWidgets/QHeaderView>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QPlainTextEdit>
-#include <QtWidgets/QProgressBar>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QRadioButton>
-#include <QtWidgets/QSpacerItem>
-#include <QtWidgets/QStackedWidget>
-#include <QtWidgets/QTreeView>
-#include <QtWidgets/QWidget>
-#include <utils/fancylineedit.h>
-
-namespace Utils { class OutputFormatter; }
-
-namespace Android::Internal {
-
-class AndroidSdkManager;
-class AndroidSdkModel;
-
-class OptionsDialog : public QDialog
-{
-public:
-    OptionsDialog(AndroidSdkManager *sdkManager, const QStringList &args,
-                  QWidget *parent = nullptr);
-    ~OptionsDialog() override;
-
-    QStringList sdkManagerArguments() const;
-
-private:
-    QPlainTextEdit *m_argumentDetailsEdit;
-    QLineEdit *m_argumentsEdit;
-    QFuture<QString> m_optionsFuture;
-};
-
-class AndroidSdkManagerWidget : public QDialog
-{
-    Q_OBJECT
-
-    enum View {
-        PackageListing,
-        Operations,
-        LicenseWorkflow
-    };
-
-public:
-    AndroidSdkManagerWidget(AndroidSdkManager *sdkManager, QWidget *parent = nullptr);
-    ~AndroidSdkManagerWidget() override;
-
-    void installEssentials();
-
-signals:
-    void updatingSdk();
-    void updatingSdkFinished();
-    void licenseWorkflowStarted();
-
-private:
-    void onApplyButton(const QString &extraMessage = {});
-    void onUpdatePackages();
-    void onCancel();
-    void onOperationResult(int index);
-    void onLicenseCheckResult(const AndroidSdkManager::OperationOutput &output);
-    void onSdkManagerOptions();
-    void addPackageFuture(const QFuture<AndroidSdkManager::OperationOutput> &future);
-    void beginLicenseCheck();
-    void beginExecution();
-    void beginUpdate();
-    void beginLicenseWorkflow();
-    void notifyOperationFinished();
-    void packageFutureFinished();
-    void cancelPendingOperations();
-    void switchView(View view);
-    void runPendingCommand();
-
-    AndroidSdkManager::CommandType m_pendingCommand = AndroidSdkManager::None;
-    View m_currentView = PackageListing;
-    AndroidSdkManager *m_sdkManager = nullptr;
-    AndroidSdkModel *m_sdkModel = nullptr;
-    Utils::OutputFormatter *m_formatter = nullptr;
-    QFutureWatcher<AndroidSdkManager::OperationOutput> *m_currentOperation = nullptr;
-
-    QStackedWidget *m_viewStack;
-    QWidget *m_packagesStack;
-    QWidget *m_outputStack;
-    QProgressBar *m_operationProgress;
-    QPlainTextEdit *m_outputEdit;
-    QLabel *m_sdkLicenseLabel;
-    QDialogButtonBox *m_sdkLicenseButtonBox;
-    QDialogButtonBox *m_buttonBox;
-};
-
-} // Android::Internal
diff --git a/src/plugins/android/androidsdkmodel.cpp b/src/plugins/android/androidsdkmodel.cpp
index 9643b3a20a3..c2b3ffdba31 100644
--- a/src/plugins/android/androidsdkmodel.cpp
+++ b/src/plugins/android/androidsdkmodel.cpp
@@ -11,11 +11,6 @@
 #include <utils/utilsicons.h>
 
 #include <QIcon>
-#include <QLoggingCategory>
-
-namespace {
-static Q_LOGGING_CATEGORY(androidSdkModelLog, "qtc.android.sdkmodel", QtWarningMsg)
-}
 
 namespace Android {
 namespace Internal {
@@ -35,6 +30,9 @@ AndroidSdkModel::AndroidSdkModel(AndroidSdkManager *sdkManager, QObject *parent)
         refreshData();
         endResetModel();
     });
+    beginResetModel();
+    refreshData();
+    endResetModel();
 }
 
 QVariant AndroidSdkModel::headerData(int section, Qt::Orientation orientation, int role) const
@@ -258,51 +256,19 @@ bool AndroidSdkModel::setData(const QModelIndex &index, const QVariant &value, i
     return false;
 }
 
-void AndroidSdkModel::selectMissingEssentials()
+InstallationChange AndroidSdkModel::installationChange() const
 {
-    resetSelection();
-    QStringList pendingPkgs(androidConfig().allEssentials());
-    auto addTool = [this](QList<const AndroidSdkPackage *>::const_iterator itr) {
-        if ((*itr)->installedLocation().isEmpty()) {
-            m_changeState << *itr;
-            auto i = index(std::distance(m_tools.cbegin(), itr), 0, index(0, 0));
-            emit dataChanged(i, i, {Qt::CheckStateRole});
-        }
-    };
-    for (auto tool = m_tools.cbegin(); tool != m_tools.cend(); ++tool) {
-        if (!pendingPkgs.contains((*tool)->sdkStylePath()))
-            continue;
+    if (m_changeState.isEmpty())
+        return {};
 
-        addTool(tool);
-        pendingPkgs.removeOne((*tool)->sdkStylePath());
-
-        if (pendingPkgs.isEmpty())
-            break;
+    InstallationChange change;
+    for (const AndroidSdkPackage *package : m_changeState) {
+        if (package->state() == AndroidSdkPackage::Installed)
+            change.toUninstall << package->sdkStylePath();
+        else
+            change.toInstall << package->sdkStylePath();
     }
-
-    // Select SDK platform
-    for (const SdkPlatform *platform : std::as_const(m_sdkPlatforms)) {
-        if (!platform->installedLocation().isEmpty()) {
-            pendingPkgs.removeOne(platform->sdkStylePath());
-        } else if (pendingPkgs.contains(platform->sdkStylePath()) &&
-            platform->installedLocation().isEmpty()) {
-            auto i = index(0, 0, index(1, 0));
-            m_changeState << platform;
-            emit dataChanged(i, i, {Qt::CheckStateRole});
-            pendingPkgs.removeOne(platform->sdkStylePath());
-        }
-        if (pendingPkgs.isEmpty())
-            break;
-    }
-
-    m_missingEssentials = pendingPkgs;
-    if (!m_missingEssentials.isEmpty())
-        qCDebug(androidSdkModelLog) << "Couldn't find some essential packages:" << m_missingEssentials;
-}
-
-QList<const AndroidSdkPackage *> AndroidSdkModel::userSelection() const
-{
-    return Utils::toList(m_changeState);
+    return change;
 }
 
 void AndroidSdkModel::resetSelection()
@@ -329,18 +295,14 @@ void AndroidSdkModel::refreshData()
             m_tools << p;
     }
     Utils::sort(m_sdkPlatforms, [](const SdkPlatform *p1, const SdkPlatform *p2) {
-       return p1->apiLevel() > p2->apiLevel();
+        return p1->apiLevel() > p2->apiLevel();
     });
 
     Utils::sort(m_tools, [](const AndroidSdkPackage *p1, const AndroidSdkPackage *p2) {
-       if (p1->state() == p2->state()) {
-           if (p1->type() ==  p2->type())
-               return p1->revision() > p2->revision();
-           else
-               return p1->type() > p2->type();
-       } else {
-           return p1->state() < p2->state();
-       }
+        if (p1->state() == p2->state())
+            return p1->type() == p2->type() ? p1->revision() > p2->revision() : p1->type() > p2->type();
+        else
+            return p1->state() < p2->state();
     });
 }
 
diff --git a/src/plugins/android/androidsdkmodel.h b/src/plugins/android/androidsdkmodel.h
index 2033f5fa9b9..fdb148915af 100644
--- a/src/plugins/android/androidsdkmodel.h
+++ b/src/plugins/android/androidsdkmodel.h
@@ -41,11 +41,8 @@ public:
     Qt::ItemFlags flags(const QModelIndex &index) const override;
     bool setData(const QModelIndex &index, const QVariant &value, int role) override;
 
-    void selectMissingEssentials();
-    QList<const AndroidSdkPackage *> userSelection() const;
     void resetSelection();
-
-    QStringList missingEssentials() const { return m_missingEssentials; }
+    InstallationChange installationChange() const;
 
 private:
     void clearContainers();
@@ -55,7 +52,6 @@ private:
     QList<const SdkPlatform *> m_sdkPlatforms;
     QList<const AndroidSdkPackage *> m_tools;
     QSet<const AndroidSdkPackage *> m_changeState;
-    QStringList m_missingEssentials;
 };
 
 } // namespace Internal
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index 2dbad6c162b..cdfdd5c029a 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -5,15 +5,18 @@
 #include "androidconstants.h"
 #include "androidsdkdownloader.h"
 #include "androidsdkmanager.h"
-#include "androidsdkmanagerwidget.h"
+#include "androidsdkmanagerdialog.h"
 #include "androidsettingswidget.h"
 #include "androidtr.h"
 
 #include <coreplugin/dialogs/ioptionspage.h>
+#include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
 
 #include <projectexplorer/projectexplorerconstants.h>
 
+#include <solutions/tasking/tasktreerunner.h>
+
 #include <utils/async.h>
 #include <utils/detailswidget.h>
 #include <utils/hostosinfo.h>
@@ -23,6 +26,7 @@
 #include <utils/progressindicator.h>
 #include <utils/qtcprocess.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/utilsicons.h>
 
 #include <QCheckBox>
@@ -30,6 +34,7 @@
 #include <QDir>
 #include <QFileDialog>
 #include <QGroupBox>
+#include <QGuiApplication>
 #include <QList>
 #include <QListWidget>
 #include <QLoggingCategory>
@@ -157,7 +162,6 @@ class AndroidSettingsWidget final : public Core::IOptionsPageWidget
 public:
     // Todo: This would be so much simpler if it just used Utils::PathChooser!!!
     AndroidSettingsWidget();
-    ~AndroidSettingsWidget() final;
 
 private:
     void showEvent(QShowEvent *event) override;
@@ -179,10 +183,8 @@ private:
     bool isDefaultNdkSelected() const;
     void validateOpenSsl();
 
-    AndroidSdkManagerWidget *m_sdkManagerWidget = nullptr;
-
     AndroidSdkManager m_sdkManager;
-    AndroidSdkDownloader m_sdkDownloader;
+    Tasking::TaskTreeRunner m_sdkDownloader;
     bool m_isInitialReloadDone = false;
 
     SummaryWidget *m_androidSummary = nullptr;
@@ -312,7 +314,7 @@ AndroidSettingsWidget::AndroidSettingsWidget()
                        "and extracted to the selected path.\n"
                        "After the SDK Tools are properly set up, you are prompted to install any essential\n"
                        "packages required for Qt to build for Android.")
-                .arg(androidConfig().sdkToolsUrl().toString()));
+                .arg(AndroidConfig::sdkToolsUrl().toString()));
 
     auto sdkManagerToolButton = new QPushButton(Tr::tr("SDK Manager"));
 
@@ -336,9 +338,6 @@ AndroidSettingsWidget::AndroidSettingsWidget()
                        "If the automatic download fails, Qt Creator proposes to open the download URL\n"
                        "in the system's browser for manual download."));
 
-
-    m_sdkManagerWidget = new AndroidSdkManagerWidget(&m_sdkManager, this);
-
     const QMap<int, QString> androidValidationPoints = {
         { JavaPathExistsAndWritableRow, Tr::tr("JDK path exists and is writable.") },
         { SdkPathExistsAndWritableRow, Tr::tr("Android SDK path exists and is writable.") },
@@ -381,22 +380,22 @@ AndroidSettingsWidget::AndroidSettingsWidget()
 
     connect(m_openJdkLocationPathChooser, &PathChooser::rawPathChanged,
             this, &AndroidSettingsWidget::validateJdk);
-    if (androidConfig().openJDKLocation().isEmpty())
-        androidConfig().setOpenJDKLocation(AndroidConfig::getJdkPath());
-    m_openJdkLocationPathChooser->setFilePath(androidConfig().openJDKLocation());
+    if (AndroidConfig::openJDKLocation().isEmpty())
+        AndroidConfig::setOpenJDKLocation(AndroidConfig::getJdkPath());
+    m_openJdkLocationPathChooser->setFilePath(AndroidConfig::openJDKLocation());
     m_openJdkLocationPathChooser->setPromptDialogTitle(Tr::tr("Select JDK Path"));
 
-    if (androidConfig().sdkLocation().isEmpty())
-        androidConfig().setSdkLocation(AndroidConfig::defaultSdkPath());
-    m_sdkLocationPathChooser->setFilePath(androidConfig().sdkLocation());
+    if (AndroidConfig::sdkLocation().isEmpty())
+        AndroidConfig::setSdkLocation(AndroidConfig::defaultSdkPath());
+    m_sdkLocationPathChooser->setFilePath(AndroidConfig::sdkLocation());
     m_sdkLocationPathChooser->setPromptDialogTitle(Tr::tr("Select Android SDK Folder"));
 
     m_openSslPathChooser->setPromptDialogTitle(Tr::tr("Select OpenSSL Include Project File"));
-    if (androidConfig().openSslLocation().isEmpty())
-        androidConfig().setOpenSslLocation(androidConfig().sdkLocation() / ("android_openssl"));
-    m_openSslPathChooser->setFilePath(androidConfig().openSslLocation());
+    if (AndroidConfig::openSslLocation().isEmpty())
+        AndroidConfig::setOpenSslLocation(AndroidConfig::sdkLocation() / ("android_openssl"));
+    m_openSslPathChooser->setFilePath(AndroidConfig::openSslLocation());
 
-    m_createKitCheckBox->setChecked(androidConfig().automaticKitCreation());
+    m_createKitCheckBox->setChecked(AndroidConfig::automaticKitCreation());
 
     downloadNdkToolButton->setIcon(downloadIcon);
 
@@ -436,7 +435,7 @@ AndroidSettingsWidget::AndroidSettingsWidget()
             }
         },
         Group {
-            title(Tr::tr("Android OpenSSL settings (Optional)")),
+            title(Tr::tr("Android OpenSSL Settings (Optional)")),
             Grid {
                 Tr::tr("OpenSSL binaries location:"),
                 m_openSslPathChooser,
@@ -455,21 +454,21 @@ AndroidSettingsWidget::AndroidSettingsWidget()
     connect(m_ndkListWidget, &QListWidget::currentTextChanged,
             this, [this, removeCustomNdkButton](const QString &ndk) {
         updateUI();
-        removeCustomNdkButton->setEnabled(androidConfig().getCustomNdkList().contains(ndk));
+        removeCustomNdkButton->setEnabled(AndroidConfig::getCustomNdkList().contains(ndk));
     });
     connect(addCustomNdkButton, &QPushButton::clicked, this,
             &AndroidSettingsWidget::addCustomNdkItem);
     connect(removeCustomNdkButton, &QPushButton::clicked, this, [this] {
         if (isDefaultNdkSelected())
-            androidConfig().setDefaultNdk({});
-        androidConfig().removeCustomNdk(m_ndkListWidget->currentItem()->text());
+            AndroidConfig::setDefaultNdk({});
+        AndroidConfig::removeCustomNdk(m_ndkListWidget->currentItem()->text());
         m_ndkListWidget->takeItem(m_ndkListWidget->currentRow());
     });
     connect(m_makeDefaultNdkButton, &QPushButton::clicked, this, [this] {
         const FilePath defaultNdk = isDefaultNdkSelected()
                 ? FilePath()
                 : FilePath::fromUserInput(m_ndkListWidget->currentItem()->text());
-        androidConfig().setDefaultNdk(defaultNdk);
+        AndroidConfig::setDefaultNdk(defaultNdk);
         updateUI();
     });
 
@@ -495,41 +494,31 @@ AndroidSettingsWidget::AndroidSettingsWidget()
         m_androidSummary->setInProgressText("Retrieving packages information");
         m_androidProgress->show();
     });
-    connect(sdkManagerToolButton, &QAbstractButton::clicked,
-            this, [this] { m_sdkManagerWidget->exec(); });
+    connect(sdkManagerToolButton, &QAbstractButton::clicked, this, [this] {
+        executeAndroidSdkManagerDialog(&m_sdkManager, this);
+    });
     connect(sdkToolsAutoDownloadButton, &QAbstractButton::clicked,
             this, &AndroidSettingsWidget::downloadSdk);
-    connect(&m_sdkDownloader, &AndroidSdkDownloader::sdkDownloaderError, this, [this](const QString &error) {
-        QMessageBox::warning(this, AndroidSdkDownloader::dialogTitle(), error);
-    });
-    connect(&m_sdkDownloader, &AndroidSdkDownloader::sdkExtracted, this, [this] {
+    connect(&m_sdkDownloader, &Tasking::TaskTreeRunner::done, this, [this](Tasking::DoneWith result) {
+        if (result != Tasking::DoneWith::Success)
+            return;
         // Make sure the sdk path is created before installing packages
-        const FilePath sdkPath = androidConfig().sdkLocation();
+        const FilePath sdkPath = AndroidConfig::sdkLocation();
         if (!sdkPath.createDir()) {
-            QMessageBox::warning(this, AndroidSdkDownloader::dialogTitle(),
+            QMessageBox::warning(this, Android::Internal::dialogTitle(),
                                  Tr::tr("Failed to create the SDK Tools path %1.")
                                  .arg("\n\"" + sdkPath.toUserOutput() + "\""));
         }
-        m_sdkManager.reloadPackages(true);
+        m_sdkManager.reloadPackages();
         updateUI();
         apply();
 
-        QMetaObject::Connection *const openSslOneShot = new QMetaObject::Connection;
-        *openSslOneShot = connect(&m_sdkManager, &AndroidSdkManager::packageReloadFinished,
-                                  this, [this, openSslOneShot] {
-                                      QObject::disconnect(*openSslOneShot);
-                                      downloadOpenSslRepo(true);
-                                      delete openSslOneShot;
-        });
+        connect(&m_sdkManager, &AndroidSdkManager::packageReloadFinished, this, [this] {
+            downloadOpenSslRepo(true);
+        }, Qt::SingleShotConnection);
     });
 
-    setOnApply([] { AndroidConfigurations::setConfig(androidConfig()); });
-}
-
-AndroidSettingsWidget::~AndroidSettingsWidget()
-{
-    // Deleting m_sdkManagerWidget will cancel all ongoing and pending sdkmanager operations.
-    delete m_sdkManagerWidget;
+    setOnApply([] { AndroidConfigurations::applyConfig(); });
 }
 
 void AndroidSettingsWidget::showEvent(QShowEvent *event)
@@ -539,8 +528,7 @@ void AndroidSettingsWidget::showEvent(QShowEvent *event)
         validateJdk();
         // Reloading SDK packages (force) is still synchronous. Use zero timer
         // to let settings dialog open first.
-        QTimer::singleShot(0, &m_sdkManager, std::bind(&AndroidSdkManager::reloadPackages,
-                                                       &m_sdkManager, false));
+        QTimer::singleShot(0, &m_sdkManager, &AndroidSdkManager::refreshPackages);
         validateOpenSsl();
         m_isInitialReloadDone = true;
     }
@@ -555,12 +543,12 @@ void AndroidSettingsWidget::updateNdkList()
                                                         ndk->installedLocation().toUserOutput()));
     }
 
-    const auto customNdks = androidConfig().getCustomNdkList();
+    const auto customNdks = AndroidConfig::getCustomNdkList();
     for (const QString &ndk : customNdks) {
-        if (androidConfig().isValidNdk(ndk)) {
+        if (AndroidConfig::isValidNdk(ndk)) {
             m_ndkListWidget->addItem(new QListWidgetItem(Icons::UNLOCKED.icon(), ndk));
         } else {
-            androidConfig().removeCustomNdk(ndk);
+            AndroidConfig::removeCustomNdk(ndk);
         }
     }
 
@@ -575,8 +563,8 @@ void AndroidSettingsWidget::addCustomNdkItem()
             .constFirst();
     const QString ndkPath = QFileDialog::getExistingDirectory(this, Tr::tr("Select an NDK"), homePath);
 
-    if (androidConfig().isValidNdk(ndkPath)) {
-        androidConfig().addCustomNdk(ndkPath);
+    if (AndroidConfig::isValidNdk(ndkPath)) {
+        AndroidConfig::addCustomNdk(ndkPath);
         if (m_ndkListWidget->findItems(ndkPath, Qt::MatchExactly).size() == 0) {
             m_ndkListWidget->addItem(new QListWidgetItem(Icons::UNLOCKED.icon(), ndkPath));
         }
@@ -594,9 +582,9 @@ void AndroidSettingsWidget::addCustomNdkItem()
 
 bool AndroidSettingsWidget::isDefaultNdkSelected() const
 {
-    if (!androidConfig().defaultNdk().isEmpty()) {
+    if (!AndroidConfig::defaultNdk().isEmpty()) {
         if (const QListWidgetItem *item = m_ndkListWidget->currentItem()) {
-            return FilePath::fromUserInput(item->text()) == androidConfig().defaultNdk();
+            return FilePath::fromUserInput(item->text()) == AndroidConfig::defaultNdk();
         }
     }
     return false;
@@ -604,27 +592,27 @@ bool AndroidSettingsWidget::isDefaultNdkSelected() const
 
 void AndroidSettingsWidget::validateJdk()
 {
-    androidConfig().setOpenJDKLocation(m_openJdkLocationPathChooser->filePath());
-    expected_str<void> test = testJavaC(androidConfig().openJDKLocation());
+    AndroidConfig::setOpenJDKLocation(m_openJdkLocationPathChooser->filePath());
+    expected_str<void> test = testJavaC(AndroidConfig::openJDKLocation());
 
     m_androidSummary->setPointValid(JavaPathExistsAndWritableRow, test);
 
     updateUI();
 
     if (m_isInitialReloadDone)
-        m_sdkManager.reloadPackages(true);
+        m_sdkManager.reloadPackages();
 }
 
 void AndroidSettingsWidget::validateOpenSsl()
 {
-    androidConfig().setOpenSslLocation(m_openSslPathChooser->filePath());
+    AndroidConfig::setOpenSslLocation(m_openSslPathChooser->filePath());
 
-    m_openSslSummary->setPointValid(OpenSslPathExistsRow, androidConfig().openSslLocation().exists());
+    m_openSslSummary->setPointValid(OpenSslPathExistsRow, AndroidConfig::openSslLocation().exists());
 
-    const bool priFileExists = androidConfig().openSslLocation().pathAppended("openssl.pri").exists();
+    const bool priFileExists = AndroidConfig::openSslLocation().pathAppended("openssl.pri").exists();
     m_openSslSummary->setPointValid(OpenSslPriPathExists, priFileExists);
     const bool cmakeListsExists
-        = androidConfig().openSslLocation().pathAppended("CMakeLists.txt").exists();
+        = AndroidConfig::openSslLocation().pathAppended("CMakeLists.txt").exists();
     m_openSslSummary->setPointValid(OpenSslCmakeListsPathExists, cmakeListsExists);
 
     updateUI();
@@ -633,36 +621,36 @@ void AndroidSettingsWidget::validateOpenSsl()
 void AndroidSettingsWidget::onSdkPathChanged()
 {
     const FilePath sdkPath = m_sdkLocationPathChooser->filePath().cleanPath();
-    androidConfig().setSdkLocation(sdkPath);
-    FilePath currentOpenSslPath = androidConfig().openSslLocation();
+    AndroidConfig::setSdkLocation(sdkPath);
+    FilePath currentOpenSslPath = AndroidConfig::openSslLocation();
     if (currentOpenSslPath.isEmpty() || !currentOpenSslPath.exists())
         currentOpenSslPath = sdkPath.pathAppended("android_openssl");
     m_openSslPathChooser->setFilePath(currentOpenSslPath);
     // Package reload will trigger validateSdk.
-    m_sdkManager.reloadPackages();
+    m_sdkManager.refreshPackages();
 }
 
 void AndroidSettingsWidget::validateSdk()
 {
     const FilePath sdkPath = m_sdkLocationPathChooser->filePath().cleanPath();
-    androidConfig().setSdkLocation(sdkPath);
+    AndroidConfig::setSdkLocation(sdkPath);
 
-    const FilePath path = androidConfig().sdkLocation();
+    const FilePath path = AndroidConfig::sdkLocation();
     m_androidSummary->setPointValid(SdkPathExistsAndWritableRow,
                                     path.exists() && path.isWritableDir());
     m_androidSummary->setPointValid(SdkToolsInstalledRow,
-                                    !androidConfig().sdkToolsVersion().isNull());
+                                    !AndroidConfig::sdkToolsVersion().isNull());
     m_androidSummary->setPointValid(PlatformToolsInstalledRow,
-                                    androidConfig().adbToolPath().exists());
+                                    AndroidConfig::adbToolPath().exists());
     m_androidSummary->setPointValid(BuildToolsInstalledRow,
-                                    !androidConfig().buildToolsVersion().isNull());
+                                    !AndroidConfig::buildToolsVersion().isNull());
     m_androidSummary->setPointValid(SdkManagerSuccessfulRow, m_sdkManager.packageListingSuccessful());
     // installedSdkPlatforms should not trigger a package reload as validate SDK is only called
     // after AndroidSdkManager::packageReloadFinished.
     m_androidSummary->setPointValid(PlatformSdkInstalledRow,
                                     !m_sdkManager.installedSdkPlatforms().isEmpty());
     m_androidSummary->setPointValid(AllEssentialsInstalledRow,
-                                    androidConfig().allEssentialsInstalled(&m_sdkManager));
+                                    AndroidConfig::allEssentialsInstalled(&m_sdkManager));
 
     const bool sdkToolsOk = m_androidSummary->rowsOk({SdkPathExistsAndWritableRow,
                                                       SdkToolsInstalledRow,
@@ -671,9 +659,21 @@ void AndroidSettingsWidget::validateSdk()
                                                         BuildToolsInstalledRow,
                                                         PlatformSdkInstalledRow,
                                                         AllEssentialsInstalledRow});
-    androidConfig().setSdkFullyConfigured(sdkToolsOk && componentsOk);
-    if (sdkToolsOk && !componentsOk)
-        m_sdkManagerWidget->installEssentials();
+    AndroidConfig::setSdkFullyConfigured(sdkToolsOk && componentsOk);
+    if (sdkToolsOk && !componentsOk) {
+        const QStringList notFoundEssentials = m_sdkManager.notFoundEssentialSdkPackages();
+        if (!notFoundEssentials.isEmpty()) {
+            QMessageBox::warning(Core::ICore::dialogParent(),
+                Tr::tr("Android SDK Changes"),
+                Tr::tr("%1 cannot find the following essential packages: \"%2\".\n"
+                       "Install them manually after the current operation is done.\n")
+                    .arg(QGuiApplication::applicationDisplayName(),
+                         notFoundEssentials.join("\", \"")));
+        }
+        m_sdkManager.runInstallationChange({m_sdkManager.missingEssentialSdkPackages()},
+            Tr::tr("Android SDK installation is missing necessary packages. "
+                   "Do you want to install the missing packages?"));
+    }
 
     updateNdkList();
     updateUI();
@@ -733,7 +733,8 @@ void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent)
 
     const QString openSslRepo("https://github.com/KDAB/android_openssl.git");
     Process *gitCloner = new Process(this);
-    CommandLine gitCloneCommand("git", {"clone", "--depth=1", openSslRepo, openSslPath.toString()});
+    const CommandLine gitCloneCommand("git", {"clone", "--depth=1", openSslRepo,
+                                              openSslPath.toString()});
     gitCloner->setCommand(gitCloneCommand);
 
     qCDebug(androidsettingswidget) << "Cloning OpenSSL repo: " << gitCloneCommand.toUserOutput();
@@ -782,7 +783,7 @@ void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent)
 
 void AndroidSettingsWidget::createKitToggled()
 {
-    androidConfig().setAutomaticKitCreation(m_createKitCheckBox->isChecked());
+    AndroidConfig::setAutomaticKitCreation(m_createKitCheckBox->isChecked());
 }
 
 void AndroidSettingsWidget::updateUI()
@@ -793,8 +794,8 @@ void AndroidSettingsWidget::updateUI()
     const QListWidgetItem *currentItem = m_ndkListWidget->currentItem();
     const FilePath currentNdk = FilePath::fromUserInput(currentItem ? currentItem->text() : "");
     const QString infoText = Tr::tr("(SDK Version: %1, NDK Version: %2)")
-            .arg(androidConfig().sdkToolsVersion().toString())
-            .arg(currentNdk.isEmpty() ? "" : androidConfig().ndkVersion(currentNdk).toString());
+            .arg(AndroidConfig::sdkToolsVersion().toString())
+            .arg(currentNdk.isEmpty() ? "" : AndroidConfig::ndkVersion(currentNdk).toString());
     m_androidSummary->setInfoText(androidSetupOk ? infoText : "");
 
     m_androidSummary->setSetupOk(androidSetupOk);
@@ -808,7 +809,7 @@ void AndroidSettingsWidget::updateUI()
         for (int row = 0; row < m_ndkListWidget->count(); ++row) {
             QListWidgetItem *item = m_ndkListWidget->item(row);
             const bool isDefaultNdk =
-                    FilePath::fromUserInput(item->text()) == androidConfig().defaultNdk();
+                    FilePath::fromUserInput(item->text()) == AndroidConfig::defaultNdk();
             item->setFont(isDefaultNdk ? markedFont : font);
         }
     }
@@ -820,8 +821,8 @@ void AndroidSettingsWidget::updateUI()
 
 void AndroidSettingsWidget::downloadSdk()
 {
-    if (androidConfig().sdkToolsOk()) {
-        QMessageBox::warning(this, AndroidSdkDownloader::dialogTitle(),
+    if (AndroidConfig::sdkToolsOk()) {
+        QMessageBox::warning(this, Android::Internal::dialogTitle(),
                              Tr::tr("The selected path already has a valid SDK Tools package."));
         validateSdk();
         return;
@@ -830,10 +831,10 @@ void AndroidSettingsWidget::downloadSdk()
     const QString message = Tr::tr("Download and install Android SDK Tools to %1?")
             .arg("\n\"" + m_sdkLocationPathChooser->filePath().cleanPath().toUserOutput()
                  + "\"");
-    auto userInput = QMessageBox::information(this, AndroidSdkDownloader::dialogTitle(),
+    auto userInput = QMessageBox::information(this, Android::Internal::dialogTitle(),
                                               message, QMessageBox::Yes | QMessageBox::No);
     if (userInput == QMessageBox::Yes)
-        m_sdkDownloader.downloadAndExtractSdk();
+        m_sdkDownloader.start({Android::Internal::downloadSdkRecipe()});
 }
 
 // AndroidSettingsPage
diff --git a/src/plugins/android/androidsignaloperation.cpp b/src/plugins/android/androidsignaloperation.cpp
index 5016b2573e2..9e92e860b4d 100644
--- a/src/plugins/android/androidsignaloperation.cpp
+++ b/src/plugins/android/androidsignaloperation.cpp
@@ -13,7 +13,7 @@ namespace Android {
 namespace Internal {
 
 AndroidSignalOperation::AndroidSignalOperation()
-    : m_adbPath(androidConfig().adbToolPath())
+    : m_adbPath(AndroidConfig::adbToolPath())
     , m_timeout(new QTimer(this))
 {
     m_timeout->setInterval(5000);
diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp
index a83a99a4d85..e430249bdba 100644
--- a/src/plugins/android/androidtoolchain.cpp
+++ b/src/plugins/android/androidtoolchain.cpp
@@ -77,7 +77,7 @@ bool AndroidToolchain::isValid() const
     }
 
     const bool isChildofNdk = compilerCommand().isChildOf(m_ndkLocation);
-    const bool isChildofSdk = compilerCommand().isChildOf(androidConfig().sdkLocation());
+    const bool isChildofSdk = compilerCommand().isChildOf(AndroidConfig::sdkLocation());
 
     return GccToolchain::isValid() && typeId() == Constants::ANDROID_TOOLCHAIN_TYPEID
            && targetAbi().isValid() && (isChildofNdk || isChildofSdk)
@@ -86,9 +86,8 @@ bool AndroidToolchain::isValid() const
 
 void AndroidToolchain::addToEnvironment(Environment &env) const
 {
-    const AndroidConfig &config = androidConfig();
-    env.set(QLatin1String("ANDROID_NDK_HOST"), config.toolchainHostFromNdk(m_ndkLocation));
-    const FilePath javaHome = config.openJDKLocation();
+    env.set(QLatin1String("ANDROID_NDK_HOST"), AndroidConfig::toolchainHostFromNdk(m_ndkLocation));
+    const FilePath javaHome = AndroidConfig::openJDKLocation();
     if (javaHome.exists()) {
         env.set(Constants::JAVA_HOME_ENV_VAR, javaHome.toUserOutput());
         const FilePath javaBin = javaHome.pathAppended("bin");
@@ -97,8 +96,8 @@ void AndroidToolchain::addToEnvironment(Environment &env) const
         if (!currentJavaFilePath.isChildOf(javaBin))
             env.prependOrSetPath(javaBin);
     }
-    env.set(QLatin1String("ANDROID_HOME"), config.sdkLocation().toUserOutput());
-    env.set(QLatin1String("ANDROID_SDK_ROOT"), config.sdkLocation().toUserOutput());
+    env.set(QLatin1String("ANDROID_HOME"), AndroidConfig::sdkLocation().toUserOutput());
+    env.set(QLatin1String("ANDROID_SDK_ROOT"), AndroidConfig::sdkLocation().toUserOutput());
 }
 
 void AndroidToolchain::fromMap(const Store &data)
@@ -118,7 +117,7 @@ QStringList AndroidToolchain::suggestedMkspecList() const
 FilePath AndroidToolchain::makeCommand(const Environment &env) const
 {
     Q_UNUSED(env)
-    FilePath makePath = androidConfig().makePathFromNdk(m_ndkLocation);
+    FilePath makePath = AndroidConfig::makePathFromNdk(m_ndkLocation);
     return makePath.exists() ? makePath : FilePath("make");
 }
 
@@ -147,7 +146,7 @@ static FilePaths uniqueNdksForCurrentQtVersions()
 
     FilePaths uniqueNdks;
     for (const QtSupport::QtVersion *version : androidQtVersions) {
-        FilePath ndk = androidConfig().ndkLocation(version);
+        FilePath ndk = AndroidConfig::ndkLocation(version);
         if (!uniqueNdks.contains(ndk))
             uniqueNdks.append(ndk);
     }
@@ -161,15 +160,13 @@ ToolchainList autodetectToolchainsFromNdks(
     const bool isCustom)
 {
     QList<Toolchain *> result;
-    const AndroidConfig config = androidConfig();
-
     const Id LanguageIds[] {
         ProjectExplorer::Constants::CXX_LANGUAGE_ID,
         ProjectExplorer::Constants::C_LANGUAGE_ID
     };
 
     for (const FilePath &ndkLocation : ndkLocations) {
-        FilePath clangPath = config.clangPathFromNdk(ndkLocation);
+        const FilePath clangPath = AndroidConfig::clangPathFromNdk(ndkLocation);
         if (!clangPath.exists()) {
             qCDebug(androidTCLog) << "Clang toolchains detection fails. Can not find Clang"
                                   << clangPath;
@@ -193,11 +190,11 @@ ToolchainList autodetectToolchainsFromNdks(
                 const QString target = targetItr.key();
                 Toolchain *tc = findToolchain(compilerCommand, lang, target, alreadyKnown);
 
-                QLatin1String customStr = isCustom ? QLatin1String("Custom ") : QLatin1String();
+                const QString customStr = isCustom ? "Custom " : QString();
                 const QString displayName(customStr + QString("Android Clang (%1, %2, NDK %3)")
-                                              .arg(ToolchainManager::displayNameOfLanguageId(lang),
-                                                   AndroidConfig::displayName(abi),
-                                                   config.ndkVersion(ndkLocation).toString()));
+                                         .arg(ToolchainManager::displayNameOfLanguageId(lang),
+                                              AndroidConfig::displayName(abi),
+                                              AndroidConfig::ndkVersion(ndkLocation).toString()));
                 if (tc) {
                     // make sure to update the toolchain with current name format
                     if (tc->displayName() != displayName)
diff --git a/src/plugins/android/avddialog.cpp b/src/plugins/android/avddialog.cpp
index 81a54427168..4ae894a1920 100644
--- a/src/plugins/android/avddialog.cpp
+++ b/src/plugins/android/avddialog.cpp
@@ -3,31 +3,34 @@
 
 #include "avddialog.h"
 #include "androidtr.h"
-#include "androidavdmanager.h"
-#include "androidconstants.h"
+#include "androidconfigurations.h"
 #include "androiddevice.h"
 #include "androidsdkmanager.h"
 
+#include <coreplugin/icore.h>
+
 #include <projectexplorer/projectexplorerconstants.h>
 
 #include <utils/algorithm.h>
 #include <utils/infolabel.h>
 #include <utils/layoutbuilder.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/tooltip/tooltip.h>
 #include <utils/utilsicons.h>
 
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDialogButtonBox>
-#include <QFutureWatcher>
 #include <QKeyEvent>
 #include <QLineEdit>
 #include <QLoggingCategory>
+#include <QMessageBox>
 #include <QPushButton>
 #include <QSpinBox>
 #include <QToolTip>
 
+using namespace ProjectExplorer;
 using namespace Utils;
 
 namespace Android::Internal {
@@ -35,8 +38,8 @@ namespace Android::Internal {
 static Q_LOGGING_CATEGORY(avdDialogLog, "qtc.android.avdDialog", QtWarningMsg)
 
 AvdDialog::AvdDialog(QWidget *parent)
-    : QDialog(parent),
-      m_allowedNameChars(QLatin1String("[a-z|A-Z|0-9|._-]*"))
+    : QDialog(parent)
+    , m_allowedNameChars(QLatin1String("[a-z|A-Z|0-9|._-]*"))
 {
     resize(800, 0);
     setWindowTitle(Tr::tr("Create new AVD"));
@@ -106,6 +109,7 @@ AvdDialog::AvdDialog(QWidget *parent)
     m_deviceTypeToStringMap.insert(AvdDialog::Automotive, "Automotive");
     m_deviceTypeToStringMap.insert(AvdDialog::TV, "TV");
     m_deviceTypeToStringMap.insert(AvdDialog::Wear, "Wear");
+    m_deviceTypeToStringMap.insert(AvdDialog::Desktop, "Desktop");
 
     parseDeviceDefinitionsList();
     for (const QString &type : m_deviceTypeToStringMap)
@@ -118,32 +122,25 @@ int AvdDialog::exec()
 {
     const int execResult = QDialog::exec();
     if (execResult == QDialog::Accepted) {
-        CreateAvdInfo result;
-        result.systemImage = systemImage();
-        result.name = name();
-        result.abi = abi();
-        result.deviceDefinition = deviceDefinition();
-        result.sdcardSize = sdcardSize();
-        result.overwrite = m_overwriteCheckBox->isChecked();
-
-        const AndroidAvdManager avdManager;
-        QFutureWatcher<CreateAvdInfo> createAvdFutureWatcher;
-
-        QEventLoop loop;
-        QObject::connect(&createAvdFutureWatcher, &QFutureWatcher<CreateAvdInfo>::finished,
-                         &loop, &QEventLoop::quit);
-        QObject::connect(&createAvdFutureWatcher, &QFutureWatcher<CreateAvdInfo>::canceled,
-                         &loop, &QEventLoop::quit);
-        createAvdFutureWatcher.setFuture(avdManager.createAvd(result));
-        loop.exec(QEventLoop::ExcludeUserInputEvents);
-
-        const QFuture<CreateAvdInfo> future = createAvdFutureWatcher.future();
-        if (future.isResultReadyAt(0)) {
-            m_createdAvdInfo = future.result();
-            AndroidDeviceManager::instance()->updateAvdsList();
+        const SystemImage *si = systemImage();
+        if (!si || !si->isValid() || name().isEmpty()) {
+            QMessageBox::warning(Core::ICore::dialogParent(),
+                Tr::tr("Create new AVD"), Tr::tr("Cannot create AVD. Invalid input."));
+            return QDialog::Rejected;
         }
-    }
 
+        const CreateAvdInfo avdInfo{si->sdkStylePath(), si->apiLevel(), name(), abi(),
+                                    deviceDefinition(), sdcardSize()};
+        const auto result = AndroidDeviceManager::createAvd(avdInfo,
+                                                            m_overwriteCheckBox->isChecked());
+        if (!result) {
+            QMessageBox::warning(Core::ICore::dialogParent(), Tr::tr("Create new AVD"),
+                                 result.error());
+            return QDialog::Rejected;
+        }
+        m_createdAvdInfo = avdInfo;
+        AndroidDeviceManager::updateAvdList();
+    }
     return execResult;
 }
 
@@ -152,23 +149,9 @@ bool AvdDialog::isValid() const
     return !name().isEmpty() && systemImage() && systemImage()->isValid() && !abi().isEmpty();
 }
 
-ProjectExplorer::IDevice::Ptr AvdDialog::device() const
+CreateAvdInfo AvdDialog::avdInfo() const
 {
-    if (!m_createdAvdInfo.systemImage) {
-        qCWarning(avdDialogLog) << "System image of the created AVD is nullptr";
-        return IDevice::Ptr();
-    }
-    AndroidDevice *dev = new AndroidDevice();
-    const Utils::Id deviceId = AndroidDevice::idFromAvdInfo(m_createdAvdInfo);
-    using namespace ProjectExplorer;
-    dev->setupId(IDevice::AutoDetected, deviceId);
-    dev->setMachineType(IDevice::Emulator);
-    dev->settings()->displayName.setValue(m_createdAvdInfo.name);
-    dev->setDeviceState(IDevice::DeviceConnected);
-    dev->setExtraData(Constants::AndroidAvdName, m_createdAvdInfo.name);
-    dev->setExtraData(Constants::AndroidCpuAbi, {m_createdAvdInfo.abi});
-    dev->setExtraData(Constants::AndroidSdk, m_createdAvdInfo.systemImage->apiLevel());
-    return IDevice::Ptr(dev);
+    return m_createdAvdInfo;
 }
 
 AvdDialog::DeviceType AvdDialog::tagToDeviceType(const QString &type_tag)
@@ -179,20 +162,60 @@ AvdDialog::DeviceType AvdDialog::tagToDeviceType(const QString &type_tag)
         return AvdDialog::TV;
     else if (type_tag.contains("android-automotive"))
         return AvdDialog::Automotive;
-    else
-        return AvdDialog::PhoneOrTablet;
+    else if (type_tag.contains("android-desktop"))
+        return AvdDialog::Desktop;
+    return AvdDialog::PhoneOrTablet;
+}
+
+static bool avdManagerCommand(const QStringList &args, QString *output)
+{
+    CommandLine cmd(AndroidConfig::avdManagerToolPath(), args);
+    Process proc;
+    proc.setEnvironment(AndroidConfig::toolsEnvironment());
+    qCDebug(avdDialogLog).noquote() << "Running AVD Manager command:" << cmd.toUserOutput();
+    proc.setCommand(cmd);
+    proc.runBlocking();
+    if (proc.result() == ProcessResult::FinishedWithSuccess) {
+        if (output)
+            *output = proc.allOutput();
+        return true;
+    }
+    return false;
 }
 
 void AvdDialog::parseDeviceDefinitionsList()
 {
     QString output;
 
-    if (!AndroidAvdManager::avdManagerCommand({"list", "device"}, &output)) {
+    if (!avdManagerCommand({"list", "device"}, &output)) {
         qCDebug(avdDialogLog) << "Avd list command failed" << output
-                              << androidConfig().sdkToolsVersion();
+                              << AndroidConfig::sdkToolsVersion();
         return;
     }
 
+    /* Example output:
+Available devices definitions:
+id: 0 or "automotive_1024p_landscape"
+    Name: Automotive (1024p landscape)
+    OEM : Google
+    Tag : android-automotive-playstore
+---------
+id: 1 or "automotive_1080p_landscape"
+    Name: Automotive (1080p landscape)
+    OEM : Google
+    Tag : android-automotive
+---------
+id: 2 or "Galaxy Nexus"
+    Name: Galaxy Nexus
+    OEM : Google
+---------
+id: 3 or "desktop_large"
+    Name: Large Desktop
+    OEM : Google
+    Tag : android-desktop
+...
+     */
+
     QStringList avdDeviceInfo;
 
     const auto lines = output.split('\n');
diff --git a/src/plugins/android/avddialog.h b/src/plugins/android/avddialog.h
index 33247807d9d..2e92da15a05 100644
--- a/src/plugins/android/avddialog.h
+++ b/src/plugins/android/avddialog.h
@@ -20,7 +20,6 @@ QT_END_NAMESPACE
 namespace Utils { class InfoLabel; }
 
 namespace Android {
-class AndroidConfig;
 class SdkPlatform;
 
 namespace Internal {
@@ -33,9 +32,9 @@ public:
     explicit AvdDialog(QWidget *parent = nullptr);
     int exec() override;
 
-    enum DeviceType { Phone, Tablet, Automotive, TV, Wear, PhoneOrTablet };
+    enum DeviceType { Phone, Tablet, Automotive, TV, Wear, Desktop, PhoneOrTablet };
 
-    ProjectExplorer::IDevice::Ptr device() const;
+    CreateAvdInfo avdInfo() const;
 
     const SystemImage *systemImage() const;
     QString name() const;
diff --git a/src/plugins/android/avdmanageroutputparser.cpp b/src/plugins/android/avdmanageroutputparser.cpp
index eb252a2db7b..7a91b99f19d 100644
--- a/src/plugins/android/avdmanageroutputparser.cpp
+++ b/src/plugins/android/avdmanageroutputparser.cpp
@@ -86,10 +86,10 @@ static std::optional<AndroidDeviceInfo> parseAvd(const QStringList &deviceInfo)
     return {};
 }
 
-AndroidDeviceInfoList parseAvdList(const QString &output, Utils::FilePaths *avdErrorPaths)
+ParsedAvdList parseAvdList(const QString &output)
 {
-    QTC_CHECK(avdErrorPaths);
     AndroidDeviceInfoList avdList;
+    Utils::FilePaths errorPaths;
     QStringList avdInfo;
     using ErrorPath = Utils::FilePath;
     using AvdResult = std::variant<std::monostate, AndroidDeviceInfo, ErrorPath>;
@@ -120,14 +120,14 @@ AndroidDeviceInfoList parseAvdList(const QString &output, Utils::FilePaths *avdE
             if (auto info = std::get_if<AndroidDeviceInfo>(&result))
                 avdList << *info;
             else if (auto errorPath = std::get_if<ErrorPath>(&result))
-                *avdErrorPaths << *errorPath;
+                errorPaths << *errorPath;
             avdInfo.clear();
         } else {
             avdInfo << line;
         }
     }
 
-    return Utils::sorted(std::move(avdList));
+    return {Utils::sorted(std::move(avdList)), errorPaths};
 }
 
 int platformNameToApiLevel(const QString &platformName)
@@ -156,8 +156,10 @@ int platformNameToApiLevel(const QString &platformName)
 
 QString convertNameToExtension(const QString &name)
 {
-    if (name.endsWith("ext4"))
-        return " Extension 4";
+    static const QRegularExpression rexEx(R"(-ext(\d+)$)");
+    const QRegularExpressionMatch match = rexEx.match(name);
+    if (match.hasMatch())
+        return " Extension " + match.captured(1);
 
     return {};
 }
diff --git a/src/plugins/android/avdmanageroutputparser.h b/src/plugins/android/avdmanageroutputparser.h
index b3a74f8fc8e..81cbe64eaa3 100644
--- a/src/plugins/android/avdmanageroutputparser.h
+++ b/src/plugins/android/avdmanageroutputparser.h
@@ -10,7 +10,13 @@ namespace Internal {
 
 const char avdManufacturerError[] = "no longer exists as a device";
 
-AndroidDeviceInfoList parseAvdList(const QString &output, Utils::FilePaths *avdErrorPaths);
+struct ParsedAvdList
+{
+    AndroidDeviceInfoList avdList;
+    Utils::FilePaths errorPaths;
+};
+
+ParsedAvdList parseAvdList(const QString &output);
 int platformNameToApiLevel(const QString &platformName);
 QString convertNameToExtension(const QString &name);
 
diff --git a/src/plugins/android/certificatesmodel.h b/src/plugins/android/certificatesmodel.h
index b91b653f810..acb371205de 100644
--- a/src/plugins/android/certificatesmodel.h
+++ b/src/plugins/android/certificatesmodel.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <QAbstractListModel>
-#include <QVector>
+#include <QList>
 #include <QPair>
 
 namespace Android {
@@ -17,12 +17,12 @@ public:
     CertificatesModel(const QString &rowCertificates, QObject *parent);
 
 protected:
-    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int rowCount(const QModelIndex &parent = {}) const override;
 
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
 private:
-    QVector<QPair<QString, QString> > m_certs;
+    QList<QPair<QString, QString>> m_certs;
 };
 
 }
diff --git a/src/plugins/android/createandroidmanifestwizard.cpp b/src/plugins/android/createandroidmanifestwizard.cpp
index 7c334476a21..c446ddd55b4 100644
--- a/src/plugins/android/createandroidmanifestwizard.cpp
+++ b/src/plugins/android/createandroidmanifestwizard.cpp
@@ -151,7 +151,7 @@ ChooseDirectoryPage::ChooseDirectoryPage(CreateAndroidManifestWizard *wizard)
     m_layout->addRow(m_sourceDirectoryWarning);
 
     connect(m_androidPackageSourceDir, &PathChooser::textChanged, m_wizard, [this] {
-        m_wizard->setDirectory(m_androidPackageSourceDir->rawFilePath());
+        m_wizard->setDirectory(m_androidPackageSourceDir->unexpandedFilePath());
     });
 
     if (wizard->copyGradle()) {
@@ -228,7 +228,7 @@ CreateAndroidManifestWizard::CreateAndroidManifestWizard(BuildSystem *buildSyste
 
     const QList<BuildTargetInfo> buildTargets = buildSystem->applicationTargets();
     QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(buildSystem->kit());
-    m_copyGradle = version && version->qtVersion() >= QVersionNumber(5, 4, 0);
+    m_copyGradle = version && version->qtVersion() >= AndroidManager::firstQtWithAndroidDeployQt;
 
     if (buildTargets.isEmpty()) {
         // oh uhm can't create anything
@@ -277,21 +277,21 @@ void CreateAndroidManifestWizard::createAndroidTemplateFiles()
     QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(target->kit());
     if (!version)
         return;
-    if (version->qtVersion() < QVersionNumber(5, 4, 0)) {
+    if (version->qtVersion() < AndroidManager::firstQtWithAndroidDeployQt) {
         FileUtils::copyRecursively(version->prefix() / "src/android/java/AndroidManifest.xml",
                                    m_directory / "AndroidManifest.xml",
                                    nullptr,
-                                   copy);
+                                   copy());
     } else {
         FileUtils::copyRecursively(version->prefix() / "src/android/templates",
                                    m_directory,
                                    nullptr,
-                                   copy);
+                                   copy());
 
         if (m_copyGradle) {
             FilePath gradlePath = version->prefix() / "src/3rdparty/gradle";
             QTC_ASSERT(gradlePath.exists(), return);
-            FileUtils::copyRecursively(gradlePath, m_directory, nullptr, copy);
+            FileUtils::copyRecursively(gradlePath, m_directory, nullptr, copy());
         }
     }
 
diff --git a/src/plugins/android/javaeditor.cpp b/src/plugins/android/javaeditor.cpp
index 27ced1b025a..8fa69e6e8b2 100644
--- a/src/plugins/android/javaeditor.cpp
+++ b/src/plugins/android/javaeditor.cpp
@@ -10,7 +10,6 @@
 
 #include <texteditor/codeassist/keywordscompletionassist.h>
 #include <texteditor/textdocument.h>
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorconstants.h>
 #include <texteditor/texteditor.h>
 
@@ -48,7 +47,7 @@ public:
         setDocumentCreator(createJavaDocument);
         setUseGenericHighlighter(true);
         setCommentDefinition(Utils::CommentDefinition::CppStyle);
-        setEditorActionHandlers(TextEditor::TextEditorActionHandler::UnCommentSelection);
+        setOptionalActionMask(TextEditor::OptionalActions::UnCommentSelection);
         setCompletionAssistProvider(new TextEditor::KeywordsCompletionAssistProvider(keywords));
     }
 };
diff --git a/src/plugins/android/javalanguageserver.cpp b/src/plugins/android/javalanguageserver.cpp
index 97c3cd50275..90d536dcaef 100644
--- a/src/plugins/android/javalanguageserver.cpp
+++ b/src/plugins/android/javalanguageserver.cpp
@@ -19,12 +19,12 @@
 #include <qtsupport/qtkitaspect.h>
 
 #include <utils/environment.h>
+#include <utils/layoutbuilder.h>
 #include <utils/mimeconstants.h>
 #include <utils/pathchooser.h>
 #include <utils/temporarydirectory.h>
 #include <utils/variablechooser.h>
 
-#include <QGridLayout>
 #include <QLineEdit>
 #include <QXmlStreamWriter>
 
@@ -57,26 +57,23 @@ JLSSettingsWidget::JLSSettingsWidget(const JLSSettings *settings, QWidget *paren
     , m_java(new PathChooser(this))
     , m_ls(new PathChooser(this))
 {
-    int row = 0;
-    auto *mainLayout = new QGridLayout;
-    mainLayout->addWidget(new QLabel(Tr::tr("Name:")), row, 0);
-    mainLayout->addWidget(m_name, row, 1);
     auto chooser = new VariableChooser(this);
     chooser->addSupportedWidget(m_name);
 
-    mainLayout->addWidget(new QLabel(Tr::tr("Java:")), ++row, 0);
     m_java->setExpectedKind(PathChooser::ExistingCommand);
     m_java->setFilePath(settings->m_executable);
-    mainLayout->addWidget(m_java, row, 1);
 
-    mainLayout->addWidget(new QLabel(Tr::tr("Java Language Server:")), ++row, 0);
     m_ls->setExpectedKind(PathChooser::File);
     m_ls->lineEdit()->setPlaceholderText(Tr::tr("Path to equinox launcher jar"));
     m_ls->setPromptDialogFilter("org.eclipse.equinox.launcher_*.jar");
     m_ls->setFilePath(settings->m_languageServer);
-    mainLayout->addWidget(m_ls, row, 1);
 
-    setLayout(mainLayout);
+    using namespace Layouting;
+    Form {
+        Tr::tr("Name:"), m_name, br,
+        Tr::tr("Java:"), m_java, br,
+        Tr::tr("Java Language Server:"), m_ls, br,
+    }.attachTo(this);
 }
 
 JLSSettings::JLSSettings()
@@ -308,7 +305,7 @@ void JLSClient::updateProjectFiles()
 
             const QStringList classPaths = node->data(Constants::AndroidClassPaths).toStringList();
 
-            const FilePath &sdkLocation = androidConfig().sdkLocation();
+            const FilePath &sdkLocation = AndroidConfig::sdkLocation();
             const QString &targetSDK = AndroidManager::buildTargetSDK(m_currentTarget);
             const FilePath androidJar = sdkLocation / QString("platforms/%2/android.jar")
                                            .arg(targetSDK);
diff --git a/src/plugins/android/javaparser.cpp b/src/plugins/android/javaparser.cpp
index 72859bfdab3..65ddfba9ad6 100644
--- a/src/plugins/android/javaparser.cpp
+++ b/src/plugins/android/javaparser.cpp
@@ -62,7 +62,7 @@ OutputLineParser::Result JavaParser::handleLine(const QString &line, OutputForma
                      absoluteFilePath(file),
                      lineno);
     LinkSpecs linkSpecs;
-    addLinkSpecForAbsoluteFilePath(linkSpecs, task.file, task.line, match, 2);
+    addLinkSpecForAbsoluteFilePath(linkSpecs, task.file, task.line, task.column, match, 2);
     scheduleTask(task, 1);
     return {Status::Done, linkSpecs};
 }
diff --git a/src/plugins/android/splashscreencontainerwidget.cpp b/src/plugins/android/splashscreencontainerwidget.cpp
index e0e203121df..253dce0dd4a 100644
--- a/src/plugins/android/splashscreencontainerwidget.cpp
+++ b/src/plugins/android/splashscreencontainerwidget.cpp
@@ -73,7 +73,7 @@ static SplashScreenWidget *addWidgetToPage(QWidget *page,
                                            const QString &splashScreenPath,
                                            int scalingRatio, int maxScalingRatio,
                                            QHBoxLayout *pageLayout,
-                                           QVector<SplashScreenWidget *> &widgetContainer)
+                                           QList<SplashScreenWidget *> &widgetContainer)
 {
     auto splashScreenWidget = new SplashScreenWidget(page,
                                                      size,
@@ -90,9 +90,9 @@ static SplashScreenWidget *addWidgetToPage(QWidget *page,
 }
 
 static QWidget *createPage(TextEditor::TextEditorWidget *textEditorWidget,
-                           QVector<SplashScreenWidget *> &widgetContainer,
-                           QVector<SplashScreenWidget *> &portraitWidgetContainer,
-                           QVector<SplashScreenWidget *> &landscapeWidgetContainer,
+                           QList<SplashScreenWidget *> &widgetContainer,
+                           QList<SplashScreenWidget *> &portraitWidgetContainer,
+                           QList<SplashScreenWidget *> &landscapeWidgetContainer,
                            int scalingRatio,
                            const QSize &size,
                            const QSize &portraitSize,
diff --git a/src/plugins/android/splashscreencontainerwidget.h b/src/plugins/android/splashscreencontainerwidget.h
index deec77faadf..ef8f2f5b0a1 100644
--- a/src/plugins/android/splashscreencontainerwidget.h
+++ b/src/plugins/android/splashscreencontainerwidget.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QVector>
+#include <QList>
 #include <QStackedWidget>
 
 QT_BEGIN_NAMESPACE
@@ -48,9 +48,9 @@ private:
     void clearAll();
 
     TextEditor::TextEditorWidget *m_textEditorWidget = nullptr;
-    QVector<SplashScreenWidget *> m_imageWidgets;
-    QVector<SplashScreenWidget *> m_portraitImageWidgets;
-    QVector<SplashScreenWidget *> m_landscapeImageWidgets;
+    QList<SplashScreenWidget *> m_imageWidgets;
+    QList<SplashScreenWidget *> m_portraitImageWidgets;
+    QList<SplashScreenWidget *> m_landscapeImageWidgets;
     bool m_splashScreenSticky = false;
     QColor m_splashScreenBackgroundColor;
     QCheckBox *m_stickyCheck = nullptr;
diff --git a/src/plugins/appstatisticsmonitor/AppStatisticsMonitor.json.in b/src/plugins/appstatisticsmonitor/AppStatisticsMonitor.json.in
new file mode 100644
index 00000000000..26202be6843
--- /dev/null
+++ b/src/plugins/appstatisticsmonitor/AppStatisticsMonitor.json.in
@@ -0,0 +1,23 @@
+{
+    "Name" : "AppStatisticsMonitor",
+    "Version" : "${IDE_VERSION}",
+    "CompatVersion" : "${IDE_VERSION_COMPAT}",
+    "Experimental" : true,
+    "DisabledByDefault" : ${APPSTATISTICSMONITOR_DISABLEDBYDEFAULT},
+    "Vendor" : "The Qt Company Ltd",
+    "Copyright" : "(C) ${IDE_COPYRIGHT_YEAR} The Qt Company Ltd",
+    "License" : [ "Commercial Usage",
+                  "",
+                  "Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt 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.",
+                  "",
+                  "GNU General Public License Usage",
+                  "",
+                  "Alternatively, this plugin 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 plugin. 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."
+    ],
+    "Description" : "Visualize CPU and Memory consumption for running applications.",
+    "LongDescription" : [
+        "Select an application to monitor its performance in real-time."
+    ],
+    "Url" : "https://www.qt.io",
+    ${IDE_PLUGIN_DEPENDENCIES}
+}
diff --git a/src/plugins/appstatisticsmonitor/CMakeLists.txt b/src/plugins/appstatisticsmonitor/CMakeLists.txt
new file mode 100644
index 00000000000..1e00a0afab3
--- /dev/null
+++ b/src/plugins/appstatisticsmonitor/CMakeLists.txt
@@ -0,0 +1,42 @@
+cmake_minimum_required(VERSION 3.16)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake")
+
+project(AppStatisticMonitor)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+find_package(Qt6 COMPONENTS Charts QUIET)
+
+set(APPSTATISTICSMONITOR_DISABLEDBYDEFAULT "true")
+
+if (NOT QT_CREATOR_API_DEFINED)
+  # standalone build
+  set(DESTINATION DESTINATION .)
+  include(QtCreatorIDEBranding)
+  include(QtCreatorAPI)
+  qtc_handle_compiler_cache_support()
+
+  find_package(QtCreator COMPONENTS Core ProjectExplorer Utils REQUIRED)
+
+  set(APPSTATISTICSMONITOR_DISABLEDBYDEFAULT "false")
+endif()
+
+
+add_qtc_plugin(AppStatisticsMonitor
+  CONDITION TARGET Qt6::Charts
+  SKIP_TRANSLATION
+  DEPENDS Qt6::Charts QtCreator::Utils
+  PLUGIN_DEPENDS QtCreator::Core QtCreator::ProjectExplorer
+  SOURCES
+    appstatisticsmonitorplugin.cpp
+    chart.cpp chart.h
+    manager.cpp manager.h
+    idataprovider.h idataprovider.cpp
+)
+
diff --git a/src/plugins/appstatisticsmonitor/appstatisticsmonitor.qbs b/src/plugins/appstatisticsmonitor/appstatisticsmonitor.qbs
new file mode 100644
index 00000000000..177dd9d0a28
--- /dev/null
+++ b/src/plugins/appstatisticsmonitor/appstatisticsmonitor.qbs
@@ -0,0 +1,20 @@
+QtcPlugin {
+    name: "AppStatisticsMonitor"
+
+    Depends { name: "Core" }
+    Depends { name: "ProjectExplorer" }
+    Depends { name: "Qt.charts"; required: false }
+
+    condition: Qt.charts.present
+
+    files: [
+        "appstatisticsmonitorplugin.cpp",
+        "appstatisticsmonitortr.h",
+        "chart.h",
+        "chart.cpp",
+        "idataprovider.h",
+        "idataprovider.cpp",
+        "manager.h",
+        "manager.cpp",
+    ]
+}
diff --git a/src/plugins/appstatisticsmonitor/appstatisticsmonitorplugin.cpp b/src/plugins/appstatisticsmonitor/appstatisticsmonitorplugin.cpp
new file mode 100644
index 00000000000..e91822e1102
--- /dev/null
+++ b/src/plugins/appstatisticsmonitor/appstatisticsmonitorplugin.cpp
@@ -0,0 +1,32 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
+
+#include "manager.h"
+
+#include <extensionsystem/iplugin.h>
+
+#include <QString>
+
+namespace AppStatisticsMonitor::Internal {
+
+class AppStatisticsMonitorPlugin final : public ExtensionSystem::IPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "AppStatisticsMonitor.json")
+
+private:
+    void initialize() final;
+    std::unique_ptr<AppStatisticsMonitorManager> m_appstatisticsmonitorManager;
+    std::unique_ptr<AppStatisticsMonitorViewFactory> m_appstatisticsmonitorViewFactory;
+};
+
+void AppStatisticsMonitorPlugin::initialize()
+{
+    m_appstatisticsmonitorManager = std::make_unique<AppStatisticsMonitorManager>();
+    m_appstatisticsmonitorViewFactory = std::make_unique<AppStatisticsMonitorViewFactory>(
+        m_appstatisticsmonitorManager.get());
+}
+
+} // namespace AppStatisticsMonitor::Internal
+
+#include "appstatisticsmonitorplugin.moc"
diff --git a/src/plugins/appstatisticsmonitor/appstatisticsmonitortr.h b/src/plugins/appstatisticsmonitor/appstatisticsmonitortr.h
new file mode 100644
index 00000000000..fad1692e079
--- /dev/null
+++ b/src/plugins/appstatisticsmonitor/appstatisticsmonitortr.h
@@ -0,0 +1,15 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <QCoreApplication>
+
+namespace AppStatisticsMonitor {
+
+struct Tr
+{
+    Q_DECLARE_TR_FUNCTIONS(AppStatisticsMonitor)
+};
+
+} // namespace AppStatisticsMonitor
diff --git a/src/plugins/appstatisticsmonitor/chart.cpp b/src/plugins/appstatisticsmonitor/chart.cpp
new file mode 100644
index 00000000000..86e99283fa7
--- /dev/null
+++ b/src/plugins/appstatisticsmonitor/chart.cpp
@@ -0,0 +1,267 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
+
+#include "chart.h"
+
+#include <utils/theme/theme.h>
+
+#include <QAbstractAxis>
+#include <QChartView>
+#include <QDebug>
+#include <QPaintEvent>
+#include <QPainter>
+#include <QPen>
+#include <QPointF>
+#include <QRandomGenerator>
+#include <QSplineSeries>
+#include <QString>
+#include <QValueAxis>
+
+using namespace Utils;
+
+namespace AppStatisticsMonitor::Internal {
+
+static const int padding = 40;
+static const int numPadding = 10;
+static const QRectF dataRangeDefault = QRectF(0, 0, 5, 1);
+
+AppStatisticsMonitorChart::AppStatisticsMonitorChart(
+    const QString &name, QGraphicsItem *parent, Qt::WindowFlags wFlags)
+    : QChart(QChart::ChartTypeCartesian, parent, wFlags)
+    , m_series(new QLineSeries(this))
+    , m_axisX(new QValueAxis())
+    , m_axisY(new QValueAxis())
+    , m_point(0, 0)
+    , m_chartView(new QChartView(this))
+    , m_name(name)
+{
+    m_chartView->setMinimumHeight(200);
+    m_chartView->setMinimumWidth(400);
+    const QBrush brushTitle(creatorColor(Theme::Token_Text_Muted));
+    // const QBrush brush(creatorColor(Theme::Token_Background_Default)); left for the future
+    const QBrush brush(creatorColor(Theme::BackgroundColorNormal));
+    const QPen penBack(creatorColor(Theme::Token_Text_Muted));
+    const QPen penAxis(creatorColor(Theme::Token_Text_Muted));
+
+    setTitleBrush(brushTitle);
+    setBackgroundBrush(brush);
+    setBackgroundPen(penBack);
+    m_axisX->setLinePen(penAxis);
+    m_axisY->setLinePen(penAxis);
+    m_axisX->setLabelsColor(creatorColor(Theme::Token_Text_Muted));
+    m_axisY->setLabelsColor(creatorColor(Theme::Token_Text_Muted));
+    QPen pen(creatorColor(Theme::Token_Accent_Default));
+    pen.setWidth(2);
+    m_series->setPen(pen);
+
+    setTitle(m_name + " " + QString::number(m_point.y(), 'g', 4) + "%");
+    m_chartView->setRenderHint(QPainter::Antialiasing);
+    m_chartView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    addSeries(m_series);
+
+    addAxis(m_axisX, Qt::AlignBottom);
+    addAxis(m_axisY, Qt::AlignLeft);
+    m_series->attachAxis(m_axisX);
+    m_series->attachAxis(m_axisY);
+    m_axisX->applyNiceNumbers();
+    m_axisY->applyNiceNumbers();
+    legend()->hide();
+
+    clear();
+}
+
+QChartView *AppStatisticsMonitorChart::chartView()
+{
+    return m_chartView;
+}
+
+void AppStatisticsMonitorChart::addNewPoint(const QPointF &point)
+{
+    m_point = point;
+    if (m_axisY->max() < m_point.y())
+        m_axisY->setRange(0, qRound(m_point.y()) + 1);
+    m_axisX->setRange(0, qRound(m_point.x()) + 1);
+
+    setTitle(m_name + " " + QString::number(m_point.y(), 'g', 4) + "%");
+    m_series->append(m_point);
+}
+
+void AppStatisticsMonitorChart::loadNewProcessData(const QList<double> &data)
+{
+    clear();
+    QList<QPointF> points{{0, 0}};
+    int i = 0;
+    double max_y = 0;
+
+    for (double e : qAsConst(data)) {
+        points.push_back({double(++i), e});
+        max_y = qMax(max_y, e);
+    }
+
+    m_axisY->setRange(0, qRound(max_y) + 1);
+    m_axisX->setRange(0, data.size() + 1);
+
+    m_series->clear();
+    m_series->append(points);
+}
+
+void AppStatisticsMonitorChart::clear()
+{
+    m_axisX->setRange(0, 5);
+    m_axisY->setRange(0, 1);
+    m_series->clear();
+    m_series->append(0, 0);
+}
+
+double AppStatisticsMonitorChart::lastPointX() const
+{
+    return m_point.x();
+}
+
+//---------------------- Chart -----------------------
+
+Chart::Chart(const QString &name, QWidget *parent)
+    : QWidget(parent)
+    , m_name(name)
+{
+    setMinimumHeight(200);
+    setMinimumWidth(400);
+}
+
+void Chart::addNewPoint(const QPointF &point)
+{
+    m_points.append(point);
+    update();
+}
+
+void Chart::loadNewProcessData(const QList<double> &data)
+{
+    clear();
+    for (long i = 0; i < data.size(); ++i) {
+        m_points.append(QPointF(i + 1, data[i]));
+    }
+    update();
+}
+
+double Chart::lastPointX() const
+{
+    if (m_points.isEmpty())
+        return 0;
+    return m_points.last().x();
+}
+
+void Chart::clear()
+{
+    m_points.clear();
+    addNewPoint({0, 0});
+    update();
+}
+
+void Chart::paintEvent(QPaintEvent *event)
+{
+    Q_UNUSED(event);
+    QPainter painter(this);
+    // painter.fillRect(rect(), creatorColor(Theme::Token_Background_Default)); left for the future
+    painter.fillRect(rect(), creatorColor(Theme::BackgroundColorNormal));
+
+    // add the name of the chart in the middle of the widget width and on the top
+    painter.drawText(
+        rect(),
+        Qt::AlignHCenter | Qt::AlignTop,
+        m_name + QString::number(m_points.last().y(), 'g', 4) + "%");
+
+    const QRectF dataRange = calculateDataRange();
+    updateScalingFactors(dataRange);
+
+    for (double x = dataRange.left(); x <= dataRange.right(); x += m_xGridStep) {
+        double xPos = padding + (x - dataRange.left()) * m_xScale;
+        if (xPos < padding || xPos > width() - padding)
+            continue;
+        painter.setPen(creatorColor(Theme::Token_Foreground_Default));
+        painter.drawLine(xPos, padding, xPos, height() - padding);
+
+        painter.setPen(creatorColor(Theme::Token_Text_Muted));
+        painter.drawText(xPos, height() - numPadding, QString::number(x));
+    }
+
+    for (double y = dataRange.top(); y <= dataRange.bottom(); y += m_yGridStep) {
+        double yPos = height() - padding - (y - (int) dataRange.top()) * m_yScale;
+        if (yPos < padding || yPos > height() - padding)
+            continue;
+
+        painter.setPen(creatorColor(Theme::Token_Foreground_Default));
+        painter.drawLine(padding, yPos, width() - padding, yPos);
+
+        painter.setPen(creatorColor(Theme::Token_Text_Muted));
+        painter.drawText(numPadding, yPos, QString::number(y));
+    }
+
+    painter.setPen(creatorColor(Theme::Token_Foreground_Default));
+    painter.drawLine(padding, height() - padding, width() - padding, height() - padding); // X axis
+    painter.drawLine(padding, height() - padding, padding, padding); // Y axis
+
+    QPen pen(creatorColor(Theme::Token_Accent_Default));
+    pen.setWidth(2);
+    painter.setPen(pen);
+    painter.setRenderHint(QPainter::Antialiasing);
+    for (int i = 1; i < m_points.size(); ++i) {
+        QPointF startPoint(
+            padding + (m_points[i - 1].x() - dataRange.left()) * m_xScale,
+            height() - padding - (m_points[i - 1].y() - dataRange.top()) * m_yScale);
+        QPointF endPoint(
+            padding + (m_points[i].x() - dataRange.left()) * m_xScale,
+            height() - padding - (m_points[i].y() - dataRange.top()) * m_yScale);
+        painter.drawLine(startPoint, endPoint);
+    }
+}
+
+void Chart::addPoint()
+{
+    for (int i = 0; i < 10; ++i) {
+        double x = m_points.size();
+        double y = sin(x) + 10 * cos(x / 10) + 10;
+        m_points.append(QPointF(x, y));
+    }
+    update();
+}
+
+QRectF Chart::calculateDataRange() const
+{
+    QRectF dataRange = QRectF(0, 0, 0, 0);
+
+    if (m_points.isEmpty())
+        return dataRange;
+
+    for (const QPointF &point : m_points) {
+        dataRange.setLeft(qMin(dataRange.left(), point.x()));
+        dataRange.setRight(qMax(dataRange.right(), point.x()));
+
+        dataRange.setBottom(qMin(dataRange.bottom(), point.y()));
+        dataRange.setTop(qMax(dataRange.top(), point.y()));
+    }
+    dataRange.setRight(round(dataRange.right()) + 1);
+    dataRange.setTop(round(dataRange.top()) + 1);
+
+    dataRange = dataRange.united(dataRangeDefault);
+    return dataRange;
+}
+
+void Chart::updateScalingFactors(const QRectF &dataRange)
+{
+    const double xRange = dataRange.right() - dataRange.left();
+    double yRange = dataRange.bottom() - dataRange.top();
+    yRange = yRange == 0 ? dataRange.top() : yRange;
+
+    m_xGridStep = qRound(xRange / 10);
+    m_xGridStep = m_xGridStep == 0 ? 1 : m_xGridStep;
+
+    m_yGridStep = yRange / 5;
+    m_yGridStep = qRound(m_yGridStep * 10.0) / 10.0;
+    if (yRange > 10)
+        m_yGridStep = qRound(m_yGridStep);
+    m_yGridStep = qMax(m_yGridStep, 0.1);
+
+    m_xScale = (width() - 2 * padding) / xRange;
+    m_yScale = (height() - 2 * padding) / yRange;
+}
+} // namespace AppStatisticsMonitor::Internal
diff --git a/src/plugins/appstatisticsmonitor/chart.h b/src/plugins/appstatisticsmonitor/chart.h
new file mode 100644
index 00000000000..ed478061ce7
--- /dev/null
+++ b/src/plugins/appstatisticsmonitor/chart.h
@@ -0,0 +1,70 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
+#pragma once
+
+#include <QChart>
+#include <QList>
+#include <QPaintEvent>
+#include <QPointF>
+#include <QRectF>
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QChartView;
+class QLineSeries;
+class QValueAxis;
+QT_END_NAMESPACE
+
+namespace AppStatisticsMonitor::Internal {
+
+class AppStatisticsMonitorChart : public QChart
+{
+public:
+    AppStatisticsMonitorChart(
+        const QString &name, QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = {});
+
+    void addNewPoint(const QPointF &point);
+    void loadNewProcessData(const QList<double> &data);
+    double lastPointX() const;
+    void clear();
+    QChartView *chartView();
+
+private:
+    QLineSeries *m_series;
+    QStringList m_titles;
+    QValueAxis *m_axisX;
+    QValueAxis *m_axisY;
+    QPointF m_point;
+
+    QChartView *m_chartView;
+    QString m_name;
+};
+
+class Chart : public QWidget
+{
+public:
+    Chart(const QString &name, QWidget *parent = nullptr);
+
+    void addNewPoint(const QPointF &point);
+    void loadNewProcessData(const QList<double> &data);
+    double lastPointX() const;
+
+    void clear();
+
+private:
+    void paintEvent(QPaintEvent *event) override;
+    void addPoint();
+    QRectF calculateDataRange() const;
+    void updateScalingFactors(const QRectF &dataRange);
+
+private:
+    QList<QPointF> m_points;
+    QString m_name;
+
+    double m_xScale = 1;
+    double m_yScale = 1;
+    double m_xGridStep = 1;
+    double m_yGridStep = 1;
+};
+
+} // namespace AppStatisticsMonitor::Internal
diff --git a/src/plugins/appstatisticsmonitor/idataprovider.cpp b/src/plugins/appstatisticsmonitor/idataprovider.cpp
new file mode 100644
index 00000000000..23d443c76e2
--- /dev/null
+++ b/src/plugins/appstatisticsmonitor/idataprovider.cpp
@@ -0,0 +1,343 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
+
+#include "idataprovider.h"
+
+#include <utils/expected.h>
+#include <utils/fileutils.h>
+#include <utils/hostosinfo.h>
+
+#include <QByteArray>
+#include <QRegularExpression>
+#include <QString>
+
+#ifdef Q_OS_LINUX
+#include <unistd.h>
+#endif
+
+#ifdef Q_OS_WIN
+#include <windows.h>
+#include <psapi.h>
+#endif
+
+#ifdef Q_OS_MACOS
+#include <sys/types.h>
+#include <sys/proc_info.h>
+#include <sys/sysctl.h>
+
+#include <chrono>
+#include <unistd.h>
+#include <libproc.h>
+#include <mach/mach_time.h>
+#endif
+
+using namespace Utils;
+
+namespace AppStatisticsMonitor::Internal {
+
+IDataProvider::IDataProvider(qint64 pid, QObject *parent)
+    : QObject(parent)
+    , m_pid(pid)
+{
+    m_timer.setInterval(1000);
+    connect(&m_timer, &QTimer::timeout, this, [this] { handleTimeout(); });
+    m_timer.start();
+}
+
+void IDataProvider::handleTimeout()
+{
+    m_memoryConsumption.append(getMemoryConsumption());
+    m_cpuConsumption.append(getCpuConsumption());
+    emit newDataAvailable();
+}
+
+QList<double> IDataProvider::memoryConsumptionHistory() const
+{
+    return m_memoryConsumption;
+}
+
+QList<double> IDataProvider::cpuConsumptionHistory() const
+{
+    return m_cpuConsumption;
+}
+
+double IDataProvider::memoryConsumptionLast() const
+{
+    return m_memoryConsumption.isEmpty() ? 0 : m_memoryConsumption.last();
+}
+
+double IDataProvider::cpuConsumptionLast() const
+{
+    return m_cpuConsumption.isEmpty() ? 0 : m_cpuConsumption.last();
+}
+
+// ------------------------- LinuxDataProvider --------------------------------
+#ifdef Q_OS_LINUX
+class LinuxDataProvider : public IDataProvider
+{
+public:
+    LinuxDataProvider(qint64 pid, QObject *parent = nullptr)
+        : IDataProvider(pid, parent)
+    {}
+
+    double getMemoryConsumption()
+    {
+        const FilePath statusMemory = FilePath::fromString(
+            QStringLiteral("/proc/%1/status").arg(m_pid));
+        const expected_str<QByteArray> statusMemoryContent = statusMemory.fileContents();
+
+        if (!statusMemoryContent)
+            return 0;
+
+        int vmPeak = 0;
+        const static QRegularExpression numberRX(QLatin1String("[^0-9]+"));
+        for (const QByteArray &element : statusMemoryContent.value().split('\n')) {
+            if (element.startsWith("VmHWM")) {
+                const QString p = QString::fromUtf8(element);
+                vmPeak = p.split(numberRX, Qt::SkipEmptyParts)[0].toLong();
+            }
+        }
+
+        const FilePath meminfoFile("/proc/meminfo");
+        const expected_str<QByteArray> meminfoContent = meminfoFile.fileContents();
+        if (!meminfoContent)
+            return 0;
+
+        const auto meminfo = meminfoContent.value().split('\n');
+        if (meminfo.isEmpty())
+            return 0;
+
+        const auto parts = QString::fromUtf8(meminfo.front()).split(numberRX, Qt::SkipEmptyParts);
+        if (parts.isEmpty())
+            return 0;
+
+        return double(vmPeak) / parts[0].toDouble() * 100;
+    }
+
+    // Provides the CPU usage from the last request
+    double getCpuConsumption()
+    {
+        const FilePath status = FilePath::fromString(QStringLiteral("/proc/%1/stat").arg(m_pid));
+        const FilePath uptimeFile = FilePath::fromString(QStringLiteral("/proc/uptime"));
+        const double clkTck = static_cast<double>(sysconf(_SC_CLK_TCK));
+        const expected_str<QByteArray> statusFileContent = status.fileContents();
+        const expected_str<QByteArray> uptimeFileContent = uptimeFile.fileContents();
+
+        if (!statusFileContent.has_value() || !uptimeFileContent.has_value() || clkTck == 0)
+            return 0;
+
+        const QList<QByteArray> processStatus = statusFileContent.value().split(' ');
+        if (processStatus.isEmpty() || processStatus.size() < 22)
+            return 0;
+
+        const double uptime = uptimeFileContent.value().split(' ')[0].toDouble();
+
+        const double utime = processStatus[13].toDouble() / clkTck;
+        const double stime = processStatus[14].toDouble() / clkTck;
+        const double cutime = processStatus[15].toDouble() / clkTck;
+        const double cstime = processStatus[16].toDouble() / clkTck;
+        const double starttime = processStatus[21].toDouble() / clkTck;
+
+        // Calculate CPU usage for last request
+        const double currentTotalTime = utime + stime + cutime + cstime;
+
+        const double elapsed = uptime - starttime;
+        const double clicks = (currentTotalTime - m_lastTotalTime) * clkTck;
+        const double timeClicks = (elapsed - m_lastRequestStartTime) * clkTck;
+
+        m_lastTotalTime = currentTotalTime;
+        m_lastRequestStartTime = elapsed;
+
+        return timeClicks > 0 ? 100 * (clicks / timeClicks) : 0;
+    }
+
+    // Provides the usage all over the process lifetime
+    // Can be used in the future for the process lifetime statistics
+
+    // double LinuxDataProvider::getCpuConsumption()
+    // {
+    //     const FilePath status = FilePath::fromString(
+    //         QStringLiteral("/proc/%1/stat").arg(m_pid));
+    //     const FilePath uptimeFile = FilePath::fromString(QStringLiteral("/proc/uptime"));
+    //     const double clkTck = static_cast<double>(sysconf(_SC_CLK_TCK));
+
+    //     if (!status.fileContents().has_value() || !uptimeFile.fileContents().has_value() || clkTck == 0)
+    //         return 0;
+
+    //     const QVector<QByteArray> processStatus = status.fileContents().value().split(' ').toVector();
+    //     const double uptime = uptimeFile.fileContents().value().split(' ')[0].toDouble();
+
+    //     const double utime = processStatus[13].toDouble() / clkTck;
+    //     const double stime = processStatus[14].toDouble() / clkTck;
+    //     const double cutime = processStatus[15].toDouble() / clkTck;
+    //     const double cstime = processStatus[16].toDouble() / clkTck;
+    //     const double starttime = processStatus[21].toDouble() / clkTck;
+
+    //     const double elapsed = uptime - starttime;
+    //     const double usage_sec = utime + stime + cutime + cstime;
+    //     const double usage = 100 * usage_sec / elapsed;
+
+    //     return usage;
+    // }
+};
+
+#endif
+
+// ------------------------- WindowsDataProvider --------------------------------
+
+#ifdef Q_OS_WIN
+class WindowsDataProvider : public IDataProvider
+{
+public:
+    WindowsDataProvider(qint64 pid, QObject *parent = nullptr)
+        : IDataProvider(pid, parent)
+    {
+        MEMORYSTATUSEX memoryStatus;
+        memoryStatus.dwLength = sizeof(memoryStatus);
+        GlobalMemoryStatusEx(&memoryStatus);
+
+        m_totalMemory = memoryStatus.ullTotalPhys;
+    }
+
+    double getMemoryConsumption()
+    {
+        HANDLE process = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, m_pid);
+
+        PROCESS_MEMORY_COUNTERS pmc;
+        SIZE_T memoryUsed = 0;
+        if (GetProcessMemoryInfo(process, &pmc, sizeof(pmc))) {
+            memoryUsed = pmc.WorkingSetSize;
+            // Can be used in the future for the process lifetime statistics
+            //double memoryUsedMB = static_cast<double>(memoryUsed) / (1024.0 * 1024.0);
+        }
+
+        CloseHandle(process);
+        return static_cast<double>(memoryUsed) / static_cast<double>(m_totalMemory) * 100.0;
+    }
+
+    double getCpuConsumption()
+    {
+        ULARGE_INTEGER sysKernel, sysUser, procKernel, procUser;
+        HANDLE process = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, m_pid);
+
+        FILETIME creationTime, exitTime, kernelTime, userTime;
+        GetProcessTimes(process, &creationTime, &exitTime, &kernelTime, &userTime);
+        procKernel.LowPart = kernelTime.dwLowDateTime;
+        procKernel.HighPart = kernelTime.dwHighDateTime;
+        procUser.LowPart = userTime.dwLowDateTime;
+        procUser.HighPart = userTime.dwHighDateTime;
+
+        SYSTEMTIME sysTime;
+        GetSystemTime(&sysTime);
+        SystemTimeToFileTime(&sysTime, &kernelTime);
+        SystemTimeToFileTime(&sysTime, &userTime);
+        sysKernel.LowPart = kernelTime.dwLowDateTime;
+        sysKernel.HighPart = kernelTime.dwHighDateTime;
+        sysUser.LowPart = userTime.dwLowDateTime;
+        sysUser.HighPart = userTime.dwHighDateTime;
+
+        const double sysElapsedTime = sysKernel.QuadPart + sysUser.QuadPart
+                                      - m_lastSysKernel.QuadPart - m_lastSysUser.QuadPart;
+        const double procElapsedTime = procKernel.QuadPart + procUser.QuadPart
+                                       - m_lastProcKernel.QuadPart - m_lastProcUser.QuadPart;
+        const double cpuUsagePercent = (procElapsedTime / sysElapsedTime) * 100.0;
+
+        m_lastProcKernel = procKernel;
+        m_lastProcUser = procUser;
+        m_lastSysKernel = sysKernel;
+        m_lastSysUser = sysUser;
+
+        CloseHandle(process);
+        return cpuUsagePercent;
+    }
+
+private:
+    ULARGE_INTEGER m_lastSysKernel = {{0, 0}}, m_lastSysUser = {{0, 0}},
+                   m_lastProcKernel = {{0, 0}}, m_lastProcUser = {{0, 0}};
+
+    DWORDLONG m_totalMemory = 0;
+};
+#endif
+
+// ------------------------- MacDataProvider --------------------------------
+
+#ifdef Q_OS_MACOS
+class MacDataProvider : public IDataProvider
+{
+public:
+    MacDataProvider(qint64 pid, QObject *parent = nullptr)
+        : IDataProvider(pid, parent)
+    {}
+
+    double getCpuConsumption()
+    {
+        proc_taskallinfo taskAllInfo = {};
+
+        const int result
+            = proc_pidinfo(m_pid, PROC_PIDTASKALLINFO, 0, &taskAllInfo, sizeof(taskAllInfo));
+        if (result == -1) {
+            return 0;
+        }
+
+        mach_timebase_info_data_t sTimebase;
+        mach_timebase_info(&sTimebase);
+        double timebase_to_ns = (double) sTimebase.numer / (double) sTimebase.denom;
+
+        const double currentTotalCpuTime = ((double) taskAllInfo.ptinfo.pti_total_user
+                                            + (double) taskAllInfo.ptinfo.pti_total_system)
+                                           * timebase_to_ns / 1e9;
+
+        const double cpuUsageDelta = currentTotalCpuTime - m_prevCpuUsage;
+
+        const auto elapsedTime = std::chrono::steady_clock::now() - m_prevTime;
+        const double elapsedTimeSeconds
+            = std::chrono::duration_cast<std::chrono::milliseconds>(elapsedTime).count() / 1000.0;
+
+        m_prevCpuUsage = currentTotalCpuTime;
+        m_prevTime = std::chrono::steady_clock::now();
+
+        return (cpuUsageDelta / elapsedTimeSeconds) * 100.0;
+    }
+
+    double getTotalPhysicalMemory()
+    {
+        int mib[2];
+        size_t length;
+        long long physicalMemory;
+
+        mib[0] = CTL_HW;
+        mib[1] = HW_MEMSIZE;
+        length = sizeof(physicalMemory);
+        sysctl(mib, 2, &physicalMemory, &length, NULL, 0);
+
+        return physicalMemory;
+    }
+
+    double getMemoryConsumption()
+    {
+        proc_taskinfo taskInfo;
+        int result = proc_pidinfo(m_pid, PROC_PIDTASKINFO, 0, &taskInfo, sizeof(taskInfo));
+        if (result == -1)
+            return 0;
+
+        return (taskInfo.pti_resident_size / getTotalPhysicalMemory()) * 100.0;
+    }
+
+private:
+    std::chrono::steady_clock::time_point m_prevTime = std::chrono::steady_clock::now();
+    double m_prevCpuUsage = 0;
+};
+#endif
+
+IDataProvider *createDataProvider(qint64 pid)
+{
+#ifdef Q_OS_WIN
+    return new WindowsDataProvider(pid);
+#elif defined(Q_OS_MACOS)
+    return new MacDataProvider(pid);
+#else // Q_OS_LINUX
+    return new LinuxDataProvider(pid);
+#endif
+}
+
+} // namespace AppStatisticsMonitor::Internal
diff --git a/src/plugins/appstatisticsmonitor/idataprovider.h b/src/plugins/appstatisticsmonitor/idataprovider.h
new file mode 100644
index 00000000000..42e60ebb8bf
--- /dev/null
+++ b/src/plugins/appstatisticsmonitor/idataprovider.h
@@ -0,0 +1,44 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
+#pragma once
+
+#include <QList>
+#include <QObject>
+#include <QTimer>
+
+namespace AppStatisticsMonitor::Internal {
+
+class IDataProvider : public QObject
+{
+    Q_OBJECT
+public:
+    IDataProvider(qint64 pid, QObject *parent = nullptr);
+
+    QList<double> memoryConsumptionHistory() const;
+    QList<double> cpuConsumptionHistory() const;
+
+    double memoryConsumptionLast() const;
+    double cpuConsumptionLast() const;
+
+protected:
+    virtual double getMemoryConsumption() = 0;
+    virtual double getCpuConsumption() = 0;
+
+    QList<double> m_memoryConsumption;
+    QList<double> m_cpuConsumption;
+    qint64 m_pid;
+    double m_lastTotalTime;
+    double m_lastRequestStartTime;
+
+signals:
+    void newDataAvailable();
+
+private:
+    void handleTimeout();
+
+    QTimer m_timer;
+};
+
+IDataProvider *createDataProvider(qint64 pid);
+
+} // AppStatisticsMonitor::Internal
diff --git a/src/plugins/appstatisticsmonitor/manager.cpp b/src/plugins/appstatisticsmonitor/manager.cpp
new file mode 100644
index 00000000000..a0a08fd36a0
--- /dev/null
+++ b/src/plugins/appstatisticsmonitor/manager.cpp
@@ -0,0 +1,220 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
+
+#include "manager.h"
+
+#include "chart.h"
+#include "idataprovider.h"
+
+#include <coreplugin/session.h>
+
+#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/runcontrol.h>
+
+#include <QChartView>
+#include <QFormLayout>
+#include <QGraphicsItem>
+#include <QHash>
+
+using namespace ProjectExplorer;
+using namespace Utils;
+
+namespace AppStatisticsMonitor::Internal {
+
+class AppStatisticsMonitorView : public QWidget
+{
+public:
+    explicit AppStatisticsMonitorView(
+        AppStatisticsMonitorManager *appStatisticManager);
+
+    ~AppStatisticsMonitorView() override;
+
+private:
+    QComboBox *m_comboBox;
+
+    std::unique_ptr<AppStatisticsMonitorChart> m_chartMem;
+    std::unique_ptr<AppStatisticsMonitorChart> m_chartCpu;
+
+    AppStatisticsMonitorManager *m_manager;
+};
+
+AppStatisticsMonitorManager::AppStatisticsMonitorManager()
+{
+    connect(
+        ProjectExplorer::ProjectExplorerPlugin::instance(),
+        &ProjectExplorer::ProjectExplorerPlugin::runControlStarted,
+        this,
+        [this](RunControl *runControl) {
+            qint64 pid = runControl->applicationProcessHandle().pid();
+
+            m_pidNameMap[pid] = runControl->displayName();
+            m_rcPidMap[runControl] = pid;
+
+            m_currentDataProvider = createDataProvider(pid);
+            m_pidDataProviders.insert(pid, m_currentDataProvider);
+
+            emit appStarted(runControl->displayName(), pid);
+        });
+
+    connect(
+        ProjectExplorer::ProjectExplorerPlugin::instance(),
+        &ProjectExplorer::ProjectExplorerPlugin::runControlStoped,
+        this,
+        [this](RunControl *runControl) {
+            const auto pidIt = m_rcPidMap.constFind(runControl);
+            if (pidIt == m_rcPidMap.constEnd())
+                return;
+
+            const qint64 pid = pidIt.value();
+            m_rcPidMap.erase(pidIt);
+
+            m_pidNameMap.remove(pid);
+            delete m_pidDataProviders[pid];
+            m_pidDataProviders.remove(pid);
+            if (m_pidDataProviders.isEmpty())
+                setCurrentDataProvider(-1);
+            else
+                setCurrentDataProvider(m_pidDataProviders.keys().last());
+
+            emit appStoped(pid);
+        });
+}
+
+QString AppStatisticsMonitorManager::nameForPid(qint64 pid) const
+{
+    const auto pidIt = m_pidNameMap.constFind(pid);
+    if (pidIt == m_pidNameMap.constEnd())
+        return {};
+
+    return pidIt.value();
+}
+
+IDataProvider *AppStatisticsMonitorManager::currentDataProvider() const
+{
+    return m_currentDataProvider;
+}
+
+void AppStatisticsMonitorManager::setCurrentDataProvider(qint64 pid)
+{
+    m_currentDataProvider = nullptr;
+    const auto pidIt = m_pidDataProviders.constFind(pid);
+    if (pidIt == m_pidDataProviders.constEnd())
+        return;
+
+    m_currentDataProvider = pidIt.value();
+    connect(
+        m_currentDataProvider,
+        &IDataProvider::newDataAvailable,
+        this,
+        &AppStatisticsMonitorManager::newDataAvailable);
+}
+
+QHash<qint64, QString> AppStatisticsMonitorManager::pidNameMap() const
+{
+    return m_pidNameMap;
+}
+
+// AppStatisticsMonitorView
+AppStatisticsMonitorView::AppStatisticsMonitorView(AppStatisticsMonitorManager *appManager)
+    : m_manager(appManager)
+{
+    auto layout = new QVBoxLayout;
+    auto form = new QFormLayout;
+    setLayout(layout);
+
+    m_comboBox = new QComboBox(this);
+    form->addRow(m_comboBox);
+
+    m_chartMem = std::make_unique<AppStatisticsMonitorChart>(tr("Memory consumption"));
+    m_chartCpu = std::make_unique<AppStatisticsMonitorChart>(tr("CPU consumption"));
+
+    form->addRow(m_chartMem->chartView());
+    form->addRow(m_chartCpu->chartView());
+
+    layout->addLayout(form);
+
+    for (auto pidName : m_manager->pidNameMap().asKeyValueRange()) {
+        qint64 pid = pidName.first;
+        m_comboBox->addItem(pidName.second + " : " + QString::number(pid), pid);
+    }
+    m_comboBox->setCurrentIndex(m_comboBox->count() - 1);
+
+    m_chartCpu->clear();
+    m_chartMem->clear();
+
+    auto updateCharts = [this](int index) {
+        m_manager->setCurrentDataProvider(m_comboBox->itemData(index).toLongLong());
+        if (m_manager->currentDataProvider() != nullptr) {
+            const QList<double> &memConsumptionHistory
+                = m_manager->currentDataProvider()->memoryConsumptionHistory();
+            const QList<double> &cpuConsumptionHistory
+                = m_manager->currentDataProvider()->cpuConsumptionHistory();
+
+            m_chartMem->loadNewProcessData(memConsumptionHistory);
+            m_chartCpu->loadNewProcessData(cpuConsumptionHistory);
+        }
+    };
+
+    if (m_comboBox->count() != 0)
+        updateCharts(m_comboBox->currentIndex());
+
+    connect(m_comboBox, &QComboBox::currentIndexChanged, this, [updateCharts](int index) {
+        updateCharts(index);
+    });
+
+    connect(
+        m_manager,
+        &AppStatisticsMonitorManager::appStarted,
+        this,
+        [this](const QString &name, qint64 pid) {
+            if (pid != m_comboBox->currentData()) {
+                m_comboBox->addItem(name + " : " + QString::number(pid), pid);
+
+                m_chartMem->clear();
+                m_chartCpu->clear();
+
+                m_comboBox->setCurrentIndex(m_comboBox->count() - 1);
+            }
+        });
+
+    connect(m_manager, &AppStatisticsMonitorManager::appStoped, this, [this](qint64 pid) {
+        m_chartMem->addNewPoint({m_chartMem->lastPointX() + 1, 0});
+        m_chartCpu->addNewPoint({m_chartCpu->lastPointX() + 1, 0});
+
+        const int indx = m_comboBox->findData(pid);
+        if (indx != -1)
+            m_comboBox->removeItem(indx);
+    });
+
+    connect(m_manager, &AppStatisticsMonitorManager::newDataAvailable, this, [this] {
+        const IDataProvider *currentDataProvider = m_manager->currentDataProvider();
+        if (currentDataProvider != nullptr) {
+            m_chartMem->addNewPoint(
+                {(double) currentDataProvider->memoryConsumptionHistory().size(),
+                 currentDataProvider->memoryConsumptionLast()});
+            m_chartCpu->addNewPoint(
+                {(double) currentDataProvider->cpuConsumptionHistory().size(),
+                 currentDataProvider->cpuConsumptionLast()});
+        }
+    });
+}
+
+AppStatisticsMonitorView::~AppStatisticsMonitorView() = default;
+
+// AppStatisticsMonitorViewFactory
+AppStatisticsMonitorViewFactory::AppStatisticsMonitorViewFactory(
+    AppStatisticsMonitorManager *appStatisticManager)
+    : m_manager(appStatisticManager)
+{
+    setDisplayName(("AppStatisticsMonitor"));
+    setPriority(300);
+    setId("AppStatisticsMonitor");
+    setActivationSequence(QKeySequence("Alt+S"));
+}
+
+Core::NavigationView AppStatisticsMonitorViewFactory::createWidget()
+{
+    return {new AppStatisticsMonitorView(m_manager), {}};
+}
+
+} // namespace AppStatisticsMonitor::Internal
diff --git a/src/plugins/appstatisticsmonitor/manager.h b/src/plugins/appstatisticsmonitor/manager.h
new file mode 100644
index 00000000000..beba9cec721
--- /dev/null
+++ b/src/plugins/appstatisticsmonitor/manager.h
@@ -0,0 +1,60 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "chart.h"
+
+#include "idataprovider.h"
+
+#include <coreplugin/inavigationwidgetfactory.h>
+
+#include <QComboBox>
+#include <QList>
+#include <QMap>
+
+namespace Core { class IContext; }
+namespace ProjectExplorer { class RunControl; }
+
+namespace AppStatisticsMonitor::Internal {
+
+class AppStatisticsMonitorManager : public QObject
+{
+    Q_OBJECT
+public:
+    AppStatisticsMonitorManager();
+
+    QString nameForPid(qint64 pid) const;
+    QHash<qint64, QString> pidNameMap() const;
+
+    double memoryConsumption(qint64 pid) const;
+    double cpuConsumption(qint64 pid) const;
+
+    IDataProvider *currentDataProvider() const;
+    void setCurrentDataProvider(qint64 pid);
+
+signals:
+    void newDataAvailable();
+    void appStarted(const QString &name, qint64 pid);
+    void appStoped(qint64 pid);
+
+private:
+    QHash<qint64, QString> m_pidNameMap;
+    QHash<ProjectExplorer::RunControl *, int> m_rcPidMap;
+
+    QMap<qint64, IDataProvider *> m_pidDataProviders;
+    IDataProvider *m_currentDataProvider;
+};
+
+class AppStatisticsMonitorViewFactory : public Core::INavigationWidgetFactory
+{
+public:
+    AppStatisticsMonitorViewFactory(AppStatisticsMonitorManager *appStatisticManager);
+
+private:
+    Core::NavigationView createWidget() override;
+
+    AppStatisticsMonitorManager *m_manager;
+};
+
+} // namespace AppStatisticsMonitor::Internal
diff --git a/src/plugins/autotest/AutoTest.json.in b/src/plugins/autotest/AutoTest.json.in
index 230a9ee0f69..50a0aa7ef5d 100644
--- a/src/plugins/autotest/AutoTest.json.in
+++ b/src/plugins/autotest/AutoTest.json.in
@@ -12,7 +12,11 @@
 "",
 "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."
 ],
-"Description" : "Auto Test plugin.",
-"Url" : "http://www.qt.io",
+"Description" : "Create code based tests and build system based tests.",
+"LongDescription" : [
+    "Code based testing offers special handling for particular testing frameworks that strongly ties to the underlying code models or specialized parsers.",
+    "Build system based testing is independent from any testing frameworks. It retrieves information directly from the underlying build system and uses it or even the build system as such to execute the respective tests."
+],
+"Url" : "https://www.qt.io",
 ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/autotest/autotestplugin.cpp b/src/plugins/autotest/autotestplugin.cpp
index 2502b641464..c74ad31d277 100644
--- a/src/plugins/autotest/autotestplugin.cpp
+++ b/src/plugins/autotest/autotestplugin.cpp
@@ -472,6 +472,21 @@ void popupResultsPane()
         dd->m_resultsPane->popup(Core::IOutputPane::NoModeSwitch);
 }
 
+QString wildcardPatternFromString(const QString &original)
+{
+    QString pattern = original;
+    pattern.replace('\\', "\\\\");
+    pattern.replace('.', "\\.");
+    pattern.replace('^', "\\^").replace('$', "\\$");
+    pattern.replace('(', "\\(").replace(')', "\\)");
+    pattern.replace('[', "\\[").replace(']', "\\]");
+    pattern.replace('{', "\\{").replace('}', "\\}");
+    pattern.replace('+', "\\+");
+    pattern.replace('*', ".*");
+    pattern.replace('?', '.');
+    return pattern;
+}
+
 bool ChoicePair::matches(const ProjectExplorer::RunConfiguration *rc) const
 {
     return rc && rc->displayName() == displayName && rc->runnable().command.executable() == executable;
diff --git a/src/plugins/autotest/autotestplugin.h b/src/plugins/autotest/autotestplugin.h
index a70066813d9..a97c04c2741 100644
--- a/src/plugins/autotest/autotestplugin.h
+++ b/src/plugins/autotest/autotestplugin.h
@@ -33,6 +33,6 @@ void cacheRunConfigChoice(const QString &buildTargetKey, const ChoicePair &choic
 ChoicePair cachedChoiceFor(const QString &buildTargetKey);
 void clearChoiceCache();
 void popupResultsPane();
-
+QString wildcardPatternFromString(const QString &original);
 
 } // Autotest::Internal
diff --git a/src/plugins/autotest/ctest/ctesttool.cpp b/src/plugins/autotest/ctest/ctesttool.cpp
index 8b82953e2c4..69e75e6a018 100644
--- a/src/plugins/autotest/ctest/ctesttool.cpp
+++ b/src/plugins/autotest/ctest/ctesttool.cpp
@@ -34,6 +34,7 @@ CTestTool::CTestTool()
     setId("AutoTest.Framework.CTest");
     setDisplayName(Tr::tr("CTest"));
 
+    // clang-format off
     setLayouter([this] {
         return Row { Form {
             outputOnFail, br,
@@ -41,20 +42,21 @@ CTestTool::CTestTool()
             stopOnFailure, br,
             outputMode, br,
             Group {
-                title(Tr::tr("Repeat tests")),
-                repeat.groupChecker(),
+                title(Tr::tr("Repeat Tests")),
+                groupChecker(repeat.groupChecker()),
                 Row { repetitionMode, repetitionCount},
             }, br,
             Group {
-                title(Tr::tr("Run in parallel")),
-                parallel.groupChecker(),
+                title(Tr::tr("Run in Parallel")),
+                groupChecker(parallel.groupChecker()),
                 Column {
                     Row { jobs }, br,
-                    Row { testLoad, threshold}
+                    Row { testLoad, threshold }
                 }
             }
         }, st };
     });
+    // clang-format on
 
     outputOnFail.setSettingsKey("OutputOnFail");
     outputOnFail.setLabelText(Tr::tr("Output on failure"));
diff --git a/src/plugins/autotest/ctest/ctesttreeitem.cpp b/src/plugins/autotest/ctest/ctesttreeitem.cpp
index ad744bb5c87..2216a64cb20 100644
--- a/src/plugins/autotest/ctest/ctesttreeitem.cpp
+++ b/src/plugins/autotest/ctest/ctesttreeitem.cpp
@@ -87,9 +87,13 @@ QList<ITestConfiguration *> CTestTreeItem::testConfigurationsFor(const QStringLi
         return {};
 
     const ProjectExplorer::BuildSystem *buildSystem = target->buildSystem();
-    QStringList options{"--timeout", QString::number(testSettings().timeout() / 1000)};
+    QStringList options;
+    if (testSettings().useTimeout()) {
+        options << "--timeout"
+                << QString::number(testSettings().timeout() / 1000);
+    }
     options << theCTestTool().activeSettingsAsOptions();
-    CommandLine command = buildSystem->commandLineForTests(selected, options);
+    const CommandLine command = buildSystem->commandLineForTests(selected, options);
     if (command.executable().isEmpty())
         return {};
 
diff --git a/src/plugins/autotest/gtest/gtesttreeitem.cpp b/src/plugins/autotest/gtest/gtesttreeitem.cpp
index 8ece0e618ab..42b10020052 100644
--- a/src/plugins/autotest/gtest/gtesttreeitem.cpp
+++ b/src/plugins/autotest/gtest/gtesttreeitem.cpp
@@ -8,6 +8,7 @@
 #include "gtestframework.h"
 #include "gtestparser.h"
 #include "../autotesttr.h"
+#include "../autotestplugin.h"
 
 #include <cppeditor/cppmodelmanager.h>
 
@@ -56,20 +57,6 @@ TestTreeItem *GTestTreeItem::copyWithoutChildren()
     return copied;
 }
 
-static QString wildCardPattern(const QString &original)
-{
-    QString pattern = original;
-    pattern.replace('.', "\\.");
-    pattern.replace('$', "\\$");
-    pattern.replace('(', "\\(").replace(')', "\\)");
-    pattern.replace('[', "\\[").replace(']', "\\]");
-    pattern.replace('{', "\\{").replace('}', "\\}");
-    pattern.replace('+', "\\+");
-    pattern.replace('*', ".*");
-    pattern.replace('?', '.');
-    return pattern;
-}
-
 static bool matchesFilter(const QString &filter, const QString &fullTestName)
 {
     QStringList positive;
@@ -87,12 +74,12 @@ static bool matchesFilter(const QString &filter, const QString &fullTestName)
         testName.append('.');
 
     for (const QString &curr : negative) {
-        QRegularExpression regex(wildCardPattern(curr));
+        QRegularExpression regex(wildcardPatternFromString(curr));
         if (regex.match(testName).hasMatch())
             return false;
     }
     for (const QString &curr : positive) {
-        QRegularExpression regex(wildCardPattern(curr));
+        QRegularExpression regex(wildcardPatternFromString(curr));
         if (regex.match(testName).hasMatch())
             return true;
     }
diff --git a/src/plugins/autotest/projectsettingswidget.cpp b/src/plugins/autotest/projectsettingswidget.cpp
index c5a8b410596..01cbb33fd1d 100644
--- a/src/plugins/autotest/projectsettingswidget.cpp
+++ b/src/plugins/autotest/projectsettingswidget.cpp
@@ -6,6 +6,7 @@
 #include "autotestconstants.h"
 #include "autotestplugin.h"
 #include "autotesttr.h"
+#include "testcodeparser.h"
 #include "testprojectsettings.h"
 #include "testtreemodel.h"
 
@@ -13,10 +14,12 @@
 #include <projectexplorer/projectsettingswidget.h>
 
 #include <utils/algorithm.h>
+#include <utils/aspects.h>
 #include <utils/layoutbuilder.h>
 #include <utils/qtcassert.h>
 
 #include <QComboBox>
+#include <QPushButton>
 #include <QTimer>
 #include <QTreeWidget>
 
@@ -37,10 +40,13 @@ public:
 private:
     void populateFrameworks(const QHash<Autotest::ITestFramework *, bool> &frameworks,
                             const QHash<Autotest::ITestTool *, bool> &testTools);
+    void populatePathFilters(const QStringList &filters);
     void onActiveFrameworkChanged(QTreeWidgetItem *item, int column);
     TestProjectSettings *m_projectSettings;
     QTreeWidget *m_activeFrameworks = nullptr;
     QComboBox *m_runAfterBuild = nullptr;
+    Utils::BoolAspect m_applyFilter;
+    QTreeWidget *m_pathFilters = nullptr;
     QTimer m_syncTimer;
     int m_syncType = 0;
 };
@@ -59,7 +65,16 @@ ProjectTestSettingsWidget::ProjectTestSettingsWidget(Project *project)
     m_runAfterBuild->addItem(Tr::tr("All"));
     m_runAfterBuild->addItem(Tr::tr("Selected"));
     m_runAfterBuild->setCurrentIndex(int(m_projectSettings->runAfterBuild()));
+    m_applyFilter.setToolTip(Tr::tr("Apply path filters before scanning for tests."));
+    m_pathFilters = new QTreeWidget;
+    m_pathFilters->setHeaderHidden(true);
+    m_pathFilters->setRootIsDecorated(false);
+    QLabel *filterLabel = new QLabel(Tr::tr("Wildcard expressions for filtering:"), this);
+    QPushButton *addFilter = new QPushButton(Tr::tr("Add"), this);
+    QPushButton *removeFilter = new QPushButton(Tr::tr("Remove"), this);
+    removeFilter->setEnabled(false);
 
+    // clang-format off
     using namespace Layouting;
     Column {
         Widget {
@@ -67,7 +82,7 @@ ProjectTestSettingsWidget::ProjectTestSettingsWidget(Project *project)
             Column {
                 Row {
                     Group {
-                        title(Tr::tr("Active frameworks:")),
+                        title(Tr::tr("Active Test Frameworks")),
                         Column { m_activeFrameworks },
                     },
                     st,
@@ -77,18 +92,34 @@ ProjectTestSettingsWidget::ProjectTestSettingsWidget(Project *project)
                     m_runAfterBuild,
                     st,
                 },
-                noMargin(),
+                noMargin,
             },
         },
-        noMargin(),
+        Row { // explicitly outside of the global settings
+            Group {
+                title(Tr::tr("Limit Files to Path Patterns")),
+                groupChecker(m_applyFilter.groupChecker()),
+                Column {
+                    filterLabel,
+                    Row {
+                        Column { m_pathFilters },
+                        Column { addFilter, removeFilter, st },
+                    },
+                },
+            },
+        },
+        noMargin,
     }.attachTo(this);
+    // clang-format on
 
     generalWidget->setDisabled(m_projectSettings->useGlobalSettings());
 
     populateFrameworks(m_projectSettings->activeFrameworks(),
                        m_projectSettings->activeTestTools());
 
+    populatePathFilters(m_projectSettings->pathFilters());
     setUseGlobalSettings(m_projectSettings->useGlobalSettings());
+    m_applyFilter.setValue(m_projectSettings->limitToFilters());
     connect(this, &ProjectSettingsWidget::useGlobalSettingsChanged,
             this, [this, generalWidget](bool useGlobalSettings) {
                 generalWidget->setEnabled(!useGlobalSettings);
@@ -102,6 +133,56 @@ ProjectTestSettingsWidget::ProjectTestSettingsWidget(Project *project)
     connect(m_runAfterBuild, &QComboBox::currentIndexChanged, this, [this](int index) {
         m_projectSettings->setRunAfterBuild(RunAfterBuildMode(index));
     });
+
+    auto itemsToStringList = [this] {
+        QStringList items;
+        const QTreeWidgetItem *rootItem = m_pathFilters->invisibleRootItem();
+        for (int i = 0, count = rootItem->childCount(); i < count; ++i) {
+            auto expr = rootItem->child(i)->data(0, Qt::DisplayRole).toString();
+            items.append(expr);
+        }
+        return items;
+    };
+    auto triggerRescan = [] {
+        TestCodeParser *parser = TestTreeModel::instance()->parser();
+        parser->emitUpdateTestTree();
+    };
+
+    connect(&m_applyFilter, &Utils::BoolAspect::changed,
+            this, [this, triggerRescan] {
+        m_projectSettings->setLimitToFilter(m_applyFilter.value());
+        triggerRescan();
+    });
+    connect(m_pathFilters, &QTreeWidget::itemSelectionChanged,
+            this, [this, removeFilter] {
+        removeFilter->setEnabled(!m_pathFilters->selectedItems().isEmpty());
+    });
+    connect(m_pathFilters->model(), &QAbstractItemModel::dataChanged,
+            this, [this, itemsToStringList, triggerRescan]
+            (const QModelIndex &tl, const QModelIndex &br, const QList<int> &roles) {
+        if (!roles.contains(Qt::DisplayRole))
+            return;
+        if (tl != br)
+            return;
+        m_projectSettings->setPathFilters(itemsToStringList());
+        triggerRescan();
+    });
+    connect(addFilter, &QPushButton::clicked, this, [this] {
+        m_projectSettings->addPathFilter("*");
+        populatePathFilters(m_projectSettings->pathFilters());
+        const QTreeWidgetItem *root = m_pathFilters->invisibleRootItem();
+        QTreeWidgetItem *lastChild =  root->child(root->childCount() - 1);
+        const QModelIndex index = m_pathFilters->indexFromItem(lastChild, 0);
+        m_pathFilters->edit(index);
+    });
+    connect(removeFilter, &QPushButton::clicked, this, [this, itemsToStringList, triggerRescan] {
+        const QList<QTreeWidgetItem *> selected = m_pathFilters->selectedItems();
+        QTC_ASSERT(selected.size() == 1, return);
+        m_pathFilters->invisibleRootItem()->removeChild(selected.first());
+        delete selected.first();
+        m_projectSettings->setPathFilters(itemsToStringList());
+        triggerRescan();
+    });
     m_syncTimer.setSingleShot(true);
     connect(&m_syncTimer, &QTimer::timeout, this, [this] {
         auto testTreeModel = TestTreeModel::instance();
@@ -136,6 +217,16 @@ void ProjectTestSettingsWidget::populateFrameworks(const QHash<ITestFramework *,
         generateItem(it.key(), it.value());
 }
 
+void ProjectTestSettingsWidget::populatePathFilters(const QStringList &filters)
+{
+    m_pathFilters->clear();
+    for (const QString &filter : filters) {
+        auto item = new QTreeWidgetItem(m_pathFilters, {filter});
+        item->setData(0, Qt::ToolTipRole, filter);
+        item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable);
+    }
+}
+
 void ProjectTestSettingsWidget::onActiveFrameworkChanged(QTreeWidgetItem *item, int column)
 {
     auto id = Utils::Id::fromSetting(item->data(column, BaseIdRole));
diff --git a/src/plugins/autotest/qtest/qttest_utils.cpp b/src/plugins/autotest/qtest/qttest_utils.cpp
index 3717a563862..c052e583fda 100644
--- a/src/plugins/autotest/qtest/qttest_utils.cpp
+++ b/src/plugins/autotest/qtest/qttest_utils.cpp
@@ -137,9 +137,11 @@ Environment prepareBasicEnvironment(const Environment &env)
         result.set("QT_FORCE_STDERR_LOGGING", "1");
         result.set("QT_LOGGING_TO_CONSOLE", "1");
     }
-    const int timeout = testSettings().timeout();
-    if (timeout > 5 * 60 * 1000) // Qt5.5 introduced hard limit, Qt5.6.1 added env var to raise this
-        result.set("QTEST_FUNCTION_TIMEOUT", QString::number(timeout));
+    if (testSettings().useTimeout()) {
+        const int timeout = testSettings().timeout();
+        if (timeout > 5 * 60 * 1000) // Qt5.5 introduced hard limit, Qt5.6.1 added env var to raise this
+            result.set("QTEST_FUNCTION_TIMEOUT", QString::number(timeout));
+    }
     return result;
 }
 
diff --git a/src/plugins/autotest/qtest/qttesttreeitem.cpp b/src/plugins/autotest/qtest/qttesttreeitem.cpp
index 68b50be9079..00f8a0665ef 100644
--- a/src/plugins/autotest/qtest/qttesttreeitem.cpp
+++ b/src/plugins/autotest/qtest/qttesttreeitem.cpp
@@ -170,6 +170,34 @@ ITestConfiguration *QtTestTreeItem::testConfiguration() const
     return config;
 }
 
+struct FunctionLocation {
+    FunctionLocation(const QString &n, const Link &l, std::optional<Link> r = std::nullopt)
+        : name(n), declaration(l), registration(r) {}
+    QString name;
+    Link declaration;
+    std::optional<Link> registration;
+};
+
+static QStringList orderedTestCases(const QList<FunctionLocation> &original)
+{
+    auto compare = [](const Link &lhs, const Link &rhs) {
+        if (lhs.targetLine == rhs.targetLine)
+            return lhs.targetColumn - rhs.targetColumn;
+        return lhs.targetLine - rhs.targetLine;
+    };
+
+    QList<FunctionLocation> locations = original;
+    Utils::sort(locations, [compare](const FunctionLocation &lhs, const FunctionLocation &rhs) {
+        if (lhs.declaration.targetFilePath != rhs.declaration.targetFilePath)
+            return lhs.declaration.targetFilePath < rhs.declaration.targetFilePath;
+        if (auto diff = compare(lhs.declaration, rhs.declaration))
+            return diff < 0;
+        return compare(lhs.registration.value_or(Link{{}, INT_MAX, INT_MAX}),
+                       rhs.registration.value_or(Link{{}, INT_MAX, INT_MAX})) < 0;
+    });
+    return Utils::transform(locations, [](const FunctionLocation &loc) { return loc.name; });
+}
+
 static void fillTestConfigurationsFromCheckState(const TestTreeItem *item,
                                                  QList<ITestConfiguration *> &testConfigurations)
 {
@@ -190,21 +218,30 @@ static void fillTestConfigurationsFromCheckState(const TestTreeItem *item,
         testConfigurations << testConfig;
         return;
     case Qt::PartiallyChecked:
-        QStringList testCases;
+        // we need the location for keeping the order while running
+        // normal test function: declaration, data tag: location of registration
+        QList<FunctionLocation> testCases;
         item->forFirstLevelChildren([&testCases](ITestTreeItem *grandChild) {
             if (grandChild->checked() == Qt::Checked) {
-                testCases << grandChild->name();
+                TestTreeItem *funcItem = static_cast<TestTreeItem *>(grandChild);
+                const Link link(funcItem->filePath(), funcItem->line(), funcItem->column());
+                testCases << FunctionLocation(funcItem->name(), link);
             } else if (grandChild->checked() == Qt::PartiallyChecked) {
-                const QString funcName = grandChild->name();
-                grandChild->forFirstLevelChildren([&testCases, &funcName](ITestTreeItem *dataTag) {
-                    if (dataTag->checked() == Qt::Checked)
-                        testCases << funcName + ':' + dataTag->name();
+                TestTreeItem *funcItem = static_cast<TestTreeItem *>(grandChild);
+                grandChild->forFirstLevelChildren([&testCases, funcItem](ITestTreeItem *dataTag) {
+                    if (dataTag->checked() == Qt::Checked) {
+                        TestTreeItem *tagItem = static_cast<TestTreeItem *>(dataTag);
+                        const Link decl(funcItem->filePath(), funcItem->line(), funcItem->column());
+                        const Link reg(tagItem->filePath(), tagItem->line(), tagItem->column());
+                        testCases << FunctionLocation(funcItem->name() + ':' + tagItem->name(),
+                                                      decl, reg);
+                    }
                 });
             }
         });
 
         testConfig = new QtTestConfiguration(item->framework());
-        testConfig->setTestCases(testCases);
+        testConfig->setTestCases(orderedTestCases(testCases));
         testConfig->setProjectFile(item->proFile());
         testConfig->setProject(ProjectExplorer::ProjectManager::startupProject());
         testConfig->setInternalTargets(
@@ -222,14 +259,24 @@ static void collectFailedTestInfo(TestTreeItem *item, QList<ITestConfiguration *
         return;
     }
     QTC_ASSERT(item->type() == TestTreeItem::TestCase, return);
-    QStringList testCases;
+    // we need the location for keeping the order while running
+    // normal test function: declaration, data tag: location of registration
+    QList<FunctionLocation> testCases;
     item->forFirstLevelChildren([&testCases](ITestTreeItem *func) {
         if (func->type() == TestTreeItem::TestFunction && func->data(0, FailedRole).toBool()) {
-            testCases << func->name();
+            TestTreeItem *funcItem = static_cast<TestTreeItem *>(func);
+            const Link link(funcItem->filePath(), funcItem->line(), funcItem->column());
+            testCases << FunctionLocation(func->name(), link);
         } else {
-            func->forFirstLevelChildren([&testCases, func](ITestTreeItem *dataTag) {
-                if (dataTag->data(0, FailedRole).toBool())
-                    testCases << func->name() + ':' + dataTag->name();
+            TestTreeItem *funcItem = static_cast<TestTreeItem *>(func);
+            func->forFirstLevelChildren([&testCases, funcItem](ITestTreeItem *dataTag) {
+                if (dataTag->data(0, FailedRole).toBool()) {
+                    TestTreeItem *tagItem = static_cast<TestTreeItem *>(dataTag);
+                    const Link decl(funcItem->filePath(), funcItem->line(), funcItem->column());
+                    const Link reg(tagItem->filePath(), tagItem->line(), tagItem->column());
+                    testCases << FunctionLocation(funcItem->name() + ':' + dataTag->name(),
+                                                  decl, reg);
+                }
             });
         }
     });
@@ -237,7 +284,7 @@ static void collectFailedTestInfo(TestTreeItem *item, QList<ITestConfiguration *
         return;
 
     QtTestConfiguration *testConfig = new QtTestConfiguration(item->framework());
-    testConfig->setTestCases(testCases);
+    testConfig->setTestCases(orderedTestCases(testCases));
     testConfig->setProjectFile(item->proFile());
     testConfig->setProject(ProjectExplorer::ProjectManager::startupProject());
     testConfig->setInternalTargets(
@@ -307,20 +354,23 @@ QList<ITestConfiguration *> QtTestTreeItem::getTestConfigurationsForFile(const F
     if (!project || type() != Root)
         return result;
 
-    QHash<TestTreeItem *, QStringList> testFunctions;
+    QHash<TestTreeItem *, QList<FunctionLocation>> testFunctions;
     forAllChildItems([&testFunctions, &fileName](TestTreeItem *node) {
         if (node->type() == Type::TestFunction && node->filePath() == fileName) {
             QTC_ASSERT(node->parentItem(), return);
             TestTreeItem *testCase = node->parentItem();
             QTC_ASSERT(testCase->type() == Type::TestCase, return);
-            testFunctions[testCase] << node->name();
+
+            // we need the declaration location for keeping the order while running
+            const Link link(node->filePath(), node->line(), node->column());
+            testFunctions[testCase] << FunctionLocation(node->name(), link);
         }
     });
 
     for (auto it = testFunctions.cbegin(), end = testFunctions.cend(); it != end; ++it) {
         TestConfiguration *tc = static_cast<TestConfiguration *>(it.key()->testConfiguration());
         QTC_ASSERT(tc, continue);
-        tc->setTestCases(it.value());
+        tc->setTestCases(orderedTestCases(it.value()));
         result << tc;
     }
 
diff --git a/src/plugins/autotest/testcodeparser.cpp b/src/plugins/autotest/testcodeparser.cpp
index 9962a08c621..817768e176b 100644
--- a/src/plugins/autotest/testcodeparser.cpp
+++ b/src/plugins/autotest/testcodeparser.cpp
@@ -4,7 +4,9 @@
 #include "testcodeparser.h"
 
 #include "autotestconstants.h"
+#include "autotestplugin.h"
 #include "autotesttr.h"
+#include "testprojectsettings.h"
 #include "testsettings.h"
 #include "testtreemodel.h"
 
@@ -336,6 +338,38 @@ void TestCodeParser::scanForTests(const QSet<FilePath> &filePaths,
         emit requestRemoval(files);
     }
 
+    const TestProjectSettings *settings = projectSettings(project);
+    if (settings->limitToFilters()) {
+        qCDebug(LOG) << "Applying project path filters - currently" << files.size() << "files";
+        const QStringList filters = settings->pathFilters();
+        if (!filters.isEmpty()) {
+            // we cannot rely on QRegularExpression::fromWildcard() as we want handle paths
+            const QList<QRegularExpression> regexes
+                    = Utils::transform(filters, [] (const QString &filter) {
+                return QRegularExpression(wildcardPatternFromString(filter));
+            });
+
+            files = Utils::filtered(files, [&regexes](const FilePath &fn) {
+                for (const QRegularExpression &regex : regexes) {
+                    if (!regex.isValid()) {
+                        qCDebug(LOG) << "Skipping invalid pattern? Pattern:" << regex.pattern();
+                        continue;
+                    }
+                    if (regex.match(fn.path()).hasMatch())
+                        return true;
+                }
+                return false;
+            });
+        }
+        qCDebug(LOG) << "After applying filters" << files.size() << "files";
+
+        if (files.isEmpty()) {
+            qCDebug(LOG) << "No filter matched a file - canceling scan immediately";
+            onFinished(true);
+            return;
+        }
+    }
+
     QTC_ASSERT(!(isFullParse && files.isEmpty()), onFinished(true); return);
 
     // use only a single parser or all current active?
diff --git a/src/plugins/autotest/testnavigationwidget.cpp b/src/plugins/autotest/testnavigationwidget.cpp
index 435b510f85c..a8e1d98e051 100644
--- a/src/plugins/autotest/testnavigationwidget.cpp
+++ b/src/plugins/autotest/testnavigationwidget.cpp
@@ -88,8 +88,8 @@ TestNavigationWidget::TestNavigationWidget()
     m_view->setItemDelegate(new TestTreeItemDelegate(this));
 
     QPalette pal;
-    pal.setColor(QPalette::Window, creatorTheme()->color(Theme::InfoBarBackground));
-    pal.setColor(QPalette::WindowText, creatorTheme()->color(Theme::InfoBarText));
+    pal.setColor(QPalette::Window, creatorColor(Theme::InfoBarBackground));
+    pal.setColor(QPalette::WindowText, creatorColor(Theme::InfoBarText));
     m_missingFrameworksWidget = new QFrame;
     m_missingFrameworksWidget->setPalette(pal);
     m_missingFrameworksWidget->setAutoFillBackground(true);
diff --git a/src/plugins/autotest/testprojectsettings.cpp b/src/plugins/autotest/testprojectsettings.cpp
index 0b75dd9804c..a8ae11f6d5b 100644
--- a/src/plugins/autotest/testprojectsettings.cpp
+++ b/src/plugins/autotest/testprojectsettings.cpp
@@ -22,6 +22,8 @@ namespace Internal {
 static const char SK_ACTIVE_FRAMEWORKS[]        = "AutoTest.ActiveFrameworks";
 static const char SK_RUN_AFTER_BUILD[]          = "AutoTest.RunAfterBuild";
 static const char SK_CHECK_STATES[]             = "AutoTest.CheckStates";
+static const char SK_APPLY_FILTER[]             = "AutoTest.ApplyFilter";
+static const char SK_PATH_FILTERS[]             = "AutoTest.PathFilters";
 
 static Q_LOGGING_CATEGORY(LOG, "qtc.autotest.projectsettings", QtWarningMsg)
 
@@ -100,6 +102,8 @@ void TestProjectSettings::load()
     m_runAfterBuild = runAfterBuild.isValid() ? RunAfterBuildMode(runAfterBuild.toInt())
                                               : RunAfterBuildMode::None;
     m_checkStateCache.fromSettings(m_project->namedSettings(SK_CHECK_STATES).toMap());
+    m_limitToFilter = m_project->namedSettings(SK_APPLY_FILTER).toBool();
+    m_pathFilters = m_project->namedSettings(SK_PATH_FILTERS).toStringList();
 }
 
 void TestProjectSettings::save()
@@ -115,6 +119,8 @@ void TestProjectSettings::save()
     m_project->setNamedSettings(SK_ACTIVE_FRAMEWORKS, activeFrameworks);
     m_project->setNamedSettings(SK_RUN_AFTER_BUILD, int(m_runAfterBuild));
     m_project->setNamedSettings(SK_CHECK_STATES, m_checkStateCache.toSettings(Qt::Checked));
+    m_project->setNamedSettings(SK_APPLY_FILTER, m_limitToFilter);
+    m_project->setNamedSettings(SK_PATH_FILTERS, m_pathFilters);
 }
 
 } // namespace Internal
diff --git a/src/plugins/autotest/testprojectsettings.h b/src/plugins/autotest/testprojectsettings.h
index 09528e5aee7..29d126e38b8 100644
--- a/src/plugins/autotest/testprojectsettings.h
+++ b/src/plugins/autotest/testprojectsettings.h
@@ -31,15 +31,22 @@ public:
     QHash<ITestTool *, bool> activeTestTools() const { return m_activeTestTools; }
     void activateTestTool(const Utils::Id &id, bool activate);
     Internal::ItemDataCache<Qt::CheckState> *checkStateCache() { return &m_checkStateCache; }
+    bool limitToFilters() const { return m_limitToFilter; }
+    void setLimitToFilter(bool enable) { m_limitToFilter = enable; }
+    const QStringList pathFilters() const { return m_pathFilters; }
+    void setPathFilters(const QStringList &filters) { m_pathFilters = filters; }
+    void addPathFilter(const QString &filter) { m_pathFilters.append(filter); }
 private:
     void load();
     void save();
 
     ProjectExplorer::Project *m_project;
     bool m_useGlobalSettings = true;
+    bool m_limitToFilter = false;
     RunAfterBuildMode m_runAfterBuild = RunAfterBuildMode::None;
     QHash<ITestFramework *, bool> m_activeTestFrameworks;
     QHash<ITestTool *, bool> m_activeTestTools;
+    QStringList m_pathFilters;
     Internal::ItemDataCache<Qt::CheckState> m_checkStateCache;
 };
 
diff --git a/src/plugins/autotest/testresult.cpp b/src/plugins/autotest/testresult.cpp
index 75c3d45f6f2..e1a1c6bc8ad 100644
--- a/src/plugins/autotest/testresult.cpp
+++ b/src/plugins/autotest/testresult.cpp
@@ -135,33 +135,32 @@ QColor TestResult::colorForType(const ResultType type)
     if (type >= ResultType::INTERNAL_MESSAGES_BEGIN && type <= ResultType::INTERNAL_MESSAGES_END)
         return QColor("transparent");
 
-    const Theme *theme = creatorTheme();
     switch (type) {
     case ResultType::Pass:
-        return theme->color(Theme::OutputPanes_TestPassTextColor);
+        return creatorColor(Theme::OutputPanes_TestPassTextColor);
     case ResultType::Fail:
-        return theme->color(Theme::OutputPanes_TestFailTextColor);
+        return creatorColor(Theme::OutputPanes_TestFailTextColor);
     case ResultType::ExpectedFail:
-        return theme->color(Theme::OutputPanes_TestXFailTextColor);
+        return creatorColor(Theme::OutputPanes_TestXFailTextColor);
     case ResultType::UnexpectedPass:
-        return theme->color(Theme::OutputPanes_TestXPassTextColor);
+        return creatorColor(Theme::OutputPanes_TestXPassTextColor);
     case ResultType::Skip:
-        return theme->color(Theme::OutputPanes_TestSkipTextColor);
+        return creatorColor(Theme::OutputPanes_TestSkipTextColor);
     case ResultType::MessageDebug:
     case ResultType::MessageInfo:
-        return theme->color(Theme::OutputPanes_TestDebugTextColor);
+        return creatorColor(Theme::OutputPanes_TestDebugTextColor);
     case ResultType::MessageWarn:
-        return theme->color(Theme::OutputPanes_TestWarnTextColor);
+        return creatorColor(Theme::OutputPanes_TestWarnTextColor);
     case ResultType::MessageFatal:
     case ResultType::MessageSystem:
     case ResultType::MessageError:
-        return theme->color(Theme::OutputPanes_TestFatalTextColor);
+        return creatorColor(Theme::OutputPanes_TestFatalTextColor);
     case ResultType::BlacklistedPass:
     case ResultType::BlacklistedFail:
     case ResultType::BlacklistedXPass:
     case ResultType::BlacklistedXFail:
     default:
-        return theme->color(Theme::OutputPanes_StdOutTextColor);
+        return creatorColor(Theme::OutputPanes_StdOutTextColor);
     }
 }
 
diff --git a/src/plugins/autotest/testresultdelegate.cpp b/src/plugins/autotest/testresultdelegate.cpp
index 14fe1f646f9..8c9f11b2c79 100644
--- a/src/plugins/autotest/testresultdelegate.cpp
+++ b/src/plugins/autotest/testresultdelegate.cpp
@@ -53,13 +53,12 @@ void TestResultDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
     const TestResult testResult = resultFilterModel->testResult(index);
     QTC_ASSERT(testResult.isValid(), painter->restore(); return);
 
-    const QWidget *widget = dynamic_cast<const QWidget*>(painter->device());
-    QWindow *window = widget ? widget->window()->windowHandle() : nullptr;
-
     QIcon icon = index.data(Qt::DecorationRole).value<QIcon>();
-    if (!icon.isNull())
+    if (!icon.isNull()) {
         painter->drawPixmap(positions.left(), positions.top(),
-                            icon.pixmap(window, QSize(positions.iconSize(), positions.iconSize())));
+                            icon.pixmap(QSize(positions.iconSize(), positions.iconSize()),
+                                        painter->device()->devicePixelRatio()));
+    }
 
     TestResultItem *item = resultFilterModel->itemForIndex(index);
     QTC_ASSERT(item, painter->restore(); return);
diff --git a/src/plugins/autotest/testresultspane.cpp b/src/plugins/autotest/testresultspane.cpp
index aacc1808bfe..894107d5d4b 100644
--- a/src/plugins/autotest/testresultspane.cpp
+++ b/src/plugins/autotest/testresultspane.cpp
@@ -86,8 +86,8 @@ TestResultsPane::TestResultsPane(QObject *parent) :
     visualOutputWidget->setLayout(outputLayout);
 
     QPalette pal;
-    pal.setColor(QPalette::Window, creatorTheme()->color(Theme::InfoBarBackground));
-    pal.setColor(QPalette::WindowText, creatorTheme()->color(Theme::InfoBarText));
+    pal.setColor(QPalette::Window, creatorColor(Theme::InfoBarBackground));
+    pal.setColor(QPalette::WindowText, creatorColor(Theme::InfoBarText));
     m_summaryWidget = new QFrame;
     m_summaryWidget->setPalette(pal);
     m_summaryWidget->setAutoFillBackground(true);
diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp
index 29b7898835b..6c8f19c1bb1 100644
--- a/src/plugins/autotest/testrunner.cpp
+++ b/src/plugins/autotest/testrunner.cpp
@@ -23,7 +23,6 @@
 #include <projectexplorer/buildmanager.h>
 #include <projectexplorer/buildsystem.h>
 #include <projectexplorer/project.h>
-#include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorersettings.h>
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/runconfiguration.h>
@@ -169,11 +168,9 @@ void TestRunner::runTests(TestRunMode mode, const QList<ITestConfiguration *> &s
 
     m_skipTargetsCheck = false;
     m_runMode = mode;
-    const ProjectExplorerSettings projectExplorerSettings
-            = ProjectExplorerPlugin::projectExplorerSettings();
     if (mode != TestRunMode::RunAfterBuild
-            && projectExplorerSettings.buildBeforeDeploy != BuildBeforeRunMode::Off
-            && !projectExplorerSettings.saveBeforeBuild) {
+            && projectExplorerSettings().buildBeforeDeploy != BuildBeforeRunMode::Off
+            && !projectExplorerSettings().saveBeforeBuild) {
         if (!ProjectExplorerPlugin::saveModifiedFiles())
             return;
     }
@@ -203,7 +200,7 @@ void TestRunner::runTests(TestRunMode mode, const QList<ITestConfiguration *> &s
     m_targetConnect = connect(project, &Project::activeTargetChanged,
                               this, [this] { cancelCurrent(KitChanged); });
 
-    if (projectExplorerSettings.buildBeforeDeploy == BuildBeforeRunMode::Off
+    if (projectExplorerSettings().buildBeforeDeploy == BuildBeforeRunMode::Off
             || mode == TestRunMode::DebugWithoutDeploy
             || mode == TestRunMode::RunWithoutDeploy || mode == TestRunMode::RunAfterBuild) {
         runOrDebugTests();
@@ -386,7 +383,7 @@ void TestRunner::runTestsHelper()
         connect(testStorage->m_outputReader.get(), &TestOutputReader::newOutputLineAvailable,
                 TestResultsPane::instance(), &TestResultsPane::addOutputLine);
 
-        CommandLine command{config->testExecutable(), {}};
+        CommandLine command{config->testExecutable()};
         if (config->testBase()->type() == ITestBase::Framework) {
             TestConfiguration *current = static_cast<TestConfiguration *>(config);
             QStringList omitted;
@@ -415,8 +412,10 @@ void TestRunner::runTestsHelper()
         }
         process.setEnvironment(environment);
 
-        m_cancelTimer.setInterval(testSettings().timeout());
-        m_cancelTimer.start();
+        if (testSettings().useTimeout()) {
+            m_cancelTimer.setInterval(testSettings().timeout());
+            m_cancelTimer.start();
+        }
 
         qCInfo(runnerLog) << "Command:" << process.commandLine().executable();
         qCInfo(runnerLog) << "Arguments:" << process.commandLine().arguments();
diff --git a/src/plugins/autotest/testsettings.cpp b/src/plugins/autotest/testsettings.cpp
index 174773b757c..523a92499aa 100644
--- a/src/plugins/autotest/testsettings.cpp
+++ b/src/plugins/autotest/testsettings.cpp
@@ -33,13 +33,19 @@ TestSettings::TestSettings()
     scanThreadLimit.setSpecialValueText("Automatic");
     scanThreadLimit.setToolTip(Tr::tr("Number of worker threads used when scanning for tests."));
 
+    useTimeout.setSettingsKey("UseTimeout");
+    useTimeout.setDefaultValue(false);
+    useTimeout.setLabelText(Tr::tr("Timeout:"));
+    useTimeout.setToolTip(Tr::tr("Use a timeout while executing test cases."));
+
     timeout.setSettingsKey("Timeout");
     timeout.setDefaultValue(defaultTimeout);
     timeout.setRange(5000, 36'000'000); // 36 Mio ms = 36'000 s = 10 h
     timeout.setSuffix(Tr::tr(" s")); // we show seconds, but store milliseconds
     timeout.setDisplayScaleFactor(1000);
     timeout.setToolTip(Tr::tr("Timeout used when executing test cases. This will apply "
-                              "for each test case on its own, not the whole project."));
+                              "for each test case on its own, not the whole project. "
+                              "Overrides test framework or build system defaults."));
 
     omitInternalMsg.setSettingsKey("OmitInternal");
     omitInternalMsg.setDefaultValue(true);
@@ -106,6 +112,7 @@ TestSettings::TestSettings()
 
     fromSettings();
 
+    timeout.setEnabler(&useTimeout);
     resultDescriptionMaxSize.setEnabler(&limitResultDescription);
     popupOnFail.setEnabler(&popupOnFinish);
 }
diff --git a/src/plugins/autotest/testsettings.h b/src/plugins/autotest/testsettings.h
index d73f3d3454b..50df720462a 100644
--- a/src/plugins/autotest/testsettings.h
+++ b/src/plugins/autotest/testsettings.h
@@ -31,6 +31,7 @@ public:
     void fromSettings();
 
     Utils::IntegerAspect scanThreadLimit{this};
+    Utils::BoolAspect useTimeout{this};
     Utils::IntegerAspect timeout{this};
     Utils::BoolAspect omitInternalMsg{this};
     Utils::BoolAspect omitRunConfigWarn{this};
diff --git a/src/plugins/autotest/testsettingspage.cpp b/src/plugins/autotest/testsettingspage.cpp
index c11e2dfe318..1b2c7cbd6e0 100644
--- a/src/plugins/autotest/testsettingspage.cpp
+++ b/src/plugins/autotest/testsettingspage.cpp
@@ -50,8 +50,6 @@ private:
 
 TestSettingsWidget::TestSettingsWidget()
 {
-    auto timeoutLabel = new QLabel(Tr::tr("Timeout:"));
-    timeoutLabel->setToolTip(Tr::tr("Timeout used when executing each test case."));
     auto scanThreadLabel = new QLabel(Tr::tr("Scan threads:"));
     scanThreadLabel->setToolTip("Number of worker threads used when scanning for tests.");
 
@@ -77,7 +75,7 @@ TestSettingsWidget::TestSettingsWidget()
 
     PushButton resetChoicesButton {
         text(Tr::tr("Reset Cached Choices")),
-        tooltip(Tr::tr("Clear all cached choices of run configurations for "
+        Layouting::toolTip(Tr::tr("Clear all cached choices of run configurations for "
                        "tests where the executable could not be deduced.")),
         onClicked(&clearChoiceCache, this)
     };
@@ -98,7 +96,7 @@ TestSettingsWidget::TestSettingsWidget()
             s.displayApplication,
             s.processArgs,
             Row { Tr::tr("Automatically run"), s.runAfterBuild, st },
-            Row { timeoutLabel, s.timeout, st },
+            Row { s.useTimeout, s.timeout, st },
             Row { resetChoicesButton, st }
          }
     };
@@ -153,6 +151,8 @@ TestSettingsWidget::TestSettingsWidget()
         if (!changedIds.isEmpty())
             TestTreeModel::instance()->rebuild(changedIds);
     });
+
+    setOnCancel([] { Internal::testSettings().cancel(); });
 }
 
 enum TestBaseInfo
diff --git a/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.json.in b/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.json.in
index 399a70dd3a6..dfb233c23ae 100644
--- a/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.json.in
+++ b/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.json.in
@@ -14,7 +14,12 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Build Systems",
-    "Description" : "Autotools project integration.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Open Autotools-based projects in Qt Creator.",
+    "LongDescription" : [
+        "You also need:",
+            "- Autotools",
+            "- An Autotools-based project"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/axivion/Axivion.json.in b/src/plugins/axivion/Axivion.json.in
index 50958b9e9da..215b48595bd 100644
--- a/src/plugins/axivion/Axivion.json.in
+++ b/src/plugins/axivion/Axivion.json.in
@@ -15,7 +15,10 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Code Analyzer",
-    "Description" : "Integration of the axivion dashboard.",
+    "Description" : "Access an Axivion dashboard server.",
+    "LongDescription" : [
+        "Protect software from erosion with static code analysis, architecture analysis, and code-smells-detection."
+        ],
     "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/axivion/axivion.qrc b/src/plugins/axivion/axivion.qrc
index d1e41e3cdb3..96fafb01dd9 100644
--- a/src/plugins/axivion/axivion.qrc
+++ b/src/plugins/axivion/axivion.qrc
@@ -14,6 +14,8 @@
         <file>images/button-MV@2x.png</file>
         <file>images/button-SV.png</file>
         <file>images/button-SV@2x.png</file>
+        <file>images/nodata.png</file>
+        <file>images/nodata@2x.png</file>
         <file>images/sortAsc.png</file>
         <file>images/sortAsc@2x.png</file>
         <file>images/sortDesc.png</file>
diff --git a/src/plugins/axivion/axivionoutputpane.cpp b/src/plugins/axivion/axivionoutputpane.cpp
index d66468590bf..fa15362e32d 100644
--- a/src/plugins/axivion/axivionoutputpane.cpp
+++ b/src/plugins/axivion/axivionoutputpane.cpp
@@ -23,6 +23,7 @@
 #include <utils/qtcassert.h>
 #include <utils/basetreeview.h>
 #include <utils/utilsicons.h>
+#include <utils/overlaywidget.h>
 
 #include <QButtonGroup>
 #include <QClipboard>
@@ -34,6 +35,7 @@
 #include <QHeaderView>
 #include <QLabel>
 #include <QMenu>
+#include <QPainter>
 #include <QPushButton>
 #include <QScrollArea>
 #include <QStackedWidget>
@@ -49,6 +51,8 @@ using namespace Utils;
 
 namespace Axivion::Internal {
 
+void showIssuesFromDashboard(const QString &kind); // impl at bottom
+
 class DashboardWidget : public QScrollArea
 {
 public:
@@ -145,14 +149,24 @@ void DashboardWidget::updateUi()
         }
         return prefix;
     };
-    auto addValuesWidgets = [this, &toolTip](const QString &issueKind, qint64 total, qint64 added, qint64 removed, int row) {
+    auto linked = [](const QString &text, const QString &href, bool link) {
+        return link ? QString("<a href='%1'>%2</a>").arg(href).arg(text)
+                    : text;
+    };
+    auto addValuesWidgets = [this, &toolTip, &linked](const QString &issueKind, qint64 total,
+            qint64 added, qint64 removed, int row, bool link) {
         const QString currentToolTip = toolTip(issueKind);
         QLabel *label = new QLabel(issueKind, this);
         label->setToolTip(currentToolTip);
         m_gridLayout->addWidget(label, row, 0);
-        label = new QLabel(QString::number(total), this);
+        label = new QLabel(linked(QString::number(total), issueKind, link), this);
         label->setToolTip(currentToolTip);
         label->setAlignment(Qt::AlignRight);
+        if (link) {
+            connect(label, &QLabel::linkActivated, this, [](const QString &issueKind) {
+                showIssuesFromDashboard(issueKind);
+            });
+        }
         m_gridLayout->addWidget(label, row, 1);
         label = new QLabel(this);
         label->setPixmap(trendIcon(added, removed));
@@ -188,12 +202,12 @@ void DashboardWidget::updateUi()
                 allAdded += added;
                 qint64 removed = extract_value(counts, QStringLiteral("Removed"));
                 allRemoved += removed;
-                addValuesWidgets(issueCount.first, total, added, removed, row);
+                addValuesWidgets(issueCount.first, total, added, removed, row, true);
                 ++row;
             }
         }
     }
-    addValuesWidgets(Tr::tr("Total:"), allTotal, allAdded, allRemoved, row);
+    addValuesWidgets(Tr::tr("Total:"), allTotal, allAdded, allRemoved, row, false);
 }
 
 struct LinkWithColumns
@@ -242,7 +256,7 @@ public:
             if (!m_id.isEmpty())
                 fetchIssueInfo(m_id);
             return true;
-        } else if (role == BaseTreeView::ItemViewEventRole) {
+        } else if (role == BaseTreeView::ItemViewEventRole && !m_id.isEmpty()) {
             ItemViewEvent ev = value.value<ItemViewEvent>();
             if (ev.as<QContextMenuEvent>())
                 return issueListContextMenuEvent(ev);
@@ -252,8 +266,8 @@ public:
 
 private:
     const QString m_id;
-    QStringList m_data;
-    QStringList m_toolTips;
+    const QStringList m_data;
+    const QStringList m_toolTips;
     QList<LinkWithColumns> m_links;
 };
 
@@ -261,7 +275,7 @@ class IssuesWidget : public QScrollArea
 {
 public:
     explicit IssuesWidget(QWidget *parent = nullptr);
-    void updateUi();
+    void updateUi(const QString &kind);
 
     const std::optional<Dto::TableInfoDto> currentTableInfo() const { return m_currentTableInfo; }
     IssueListSearch searchFromUi() const;
@@ -274,6 +288,8 @@ private:
     void fetchTable();
     void fetchIssues(const IssueListSearch &search);
     void onFetchRequested(int startRow, int limit);
+    void showNoDataOverlay();
+    void hideNoDataOverlay();
 
     QString m_currentPrefix;
     QString m_currentProject;
@@ -294,6 +310,7 @@ private:
     QStringList m_userNames;
     QStringList m_versionDates;
     TaskTreeRunner m_taskTreeRunner;
+    OverlayWidget *m_noDataOverlay = nullptr;
 };
 
 IssuesWidget::IssuesWidget(QWidget *parent)
@@ -373,7 +390,7 @@ IssuesWidget::IssuesWidget(QWidget *parent)
     setWidgetResizable(true);
 }
 
-void IssuesWidget::updateUi()
+void IssuesWidget::updateUi(const QString &kind)
 {
     setFiltersEnabled(false);
     const std::optional<Dto::ProjectInfoDto> projectInfo = Internal::projectInfo();
@@ -387,11 +404,30 @@ void IssuesWidget::updateUi()
 
     setFiltersEnabled(true);
     // avoid refetching existing data
-    if (!m_currentPrefix.isEmpty() || m_issuesModel->rowCount())
+    if (kind.isEmpty() && (!m_currentPrefix.isEmpty() || m_issuesModel->rowCount()))
         return;
 
-    if (info.issueKinds.size())
-        m_currentPrefix = info.issueKinds.front().prefix;
+    if (!kind.isEmpty()) {
+        const int index
+                = Utils::indexOf( info.issueKinds, [kind](const Dto::IssueKindInfoDto &dto) {
+            return dto.prefix == kind; });
+        if (index != -1) {
+            m_currentPrefix = kind;
+            auto kindButton = m_typesButtonGroup->button(index + 1);
+            if (QTC_GUARD(kindButton))
+                kindButton->setChecked(true);
+            // reset filters - if kind is not empty we get triggered from dashboard overview
+            if (!m_userNames.isEmpty())
+                m_ownerFilter->setCurrentIndex(0);
+            m_pathGlobFilter->clear();
+            if (m_versionDates.size() > 1) {
+                m_versionStart->setCurrentIndex(m_versionDates.count() - 1);
+                m_versionEnd->setCurrentIndex(0);
+            }
+        }
+    }
+    if (m_currentPrefix.isEmpty())
+        m_currentPrefix = info.issueKinds.size() ? info.issueKinds.front().prefix : QString{};
     fetchTable();
 }
 
@@ -520,6 +556,8 @@ void IssuesWidget::addIssues(const Dto::IssueTableDto &dto, int startRow)
         items.append(it);
     }
     m_issuesModel->setItems(items);
+    if (items.isEmpty() && m_totalRowCount == 0)
+        showNoDataOverlay();
 }
 
 void IssuesWidget::onSearchParameterChanged()
@@ -677,6 +715,7 @@ void IssuesWidget::fetchTable()
 
 void IssuesWidget::fetchIssues(const IssueListSearch &search)
 {
+    hideNoDataOverlay();
     const auto issuesHandler = [this, startRow = search.offset](const Dto::IssueTableDto &dto) {
         addIssues(dto, startRow);
     };
@@ -696,6 +735,35 @@ void IssuesWidget::onFetchRequested(int startRow, int limit)
     fetchIssues(search);
 }
 
+void IssuesWidget::showNoDataOverlay()
+{
+    if (!m_noDataOverlay) {
+        QTC_ASSERT(m_issuesView, return);
+        m_noDataOverlay = new OverlayWidget(this);
+        m_noDataOverlay->setPaintFunction([](QWidget *that, QPainter &p, QPaintEvent *) {
+                static const QIcon icon = Icon({{":/axivion/images/nodata.png",
+                                                 Theme::IconsDisabledColor}},
+                                               Utils::Icon::Tint).icon();
+                QRect iconRect(0, 0, 32, 32);
+                iconRect.moveCenter(that->rect().center());
+                icon.paint(&p, iconRect);
+                p.save();
+                p.setPen(Utils::creatorColor(Theme::TextColorDisabled));
+                p.drawText(iconRect.bottomRight() + QPoint{10, p.fontMetrics().height() / 2 - 16},
+                           Tr::tr("No Data"));
+                p.restore();
+            });
+        m_noDataOverlay->attachToWidget(m_issuesView);
+    }
+    m_noDataOverlay->show();
+}
+
+void IssuesWidget::hideNoDataOverlay()
+{
+    if (m_noDataOverlay)
+        m_noDataOverlay->hide();
+}
+
 class AxivionOutputPane final : public IOutputPane
 {
 public:
@@ -713,7 +781,7 @@ public:
         m_outputWidget->addWidget(issuesWidget);
 
         QPalette pal = m_outputWidget->palette();
-        pal.setColor(QPalette::Window, creatorTheme()->color(Theme::Color::BackgroundColorNormal));
+        pal.setColor(QPalette::Window, creatorColor(Theme::Color::BackgroundColorNormal));
         m_outputWidget->setPalette(pal);
 
         m_showDashboard = new QToolButton(m_outputWidget);
@@ -730,12 +798,7 @@ public:
         m_showIssues->setIcon(Icons::ZOOM_TOOLBAR.icon());
         m_showIssues->setToolTip(Tr::tr("Search for issues"));
         m_showIssues->setCheckable(true);
-        connect(m_showIssues, &QToolButton::clicked, this, [this] {
-            QTC_ASSERT(m_outputWidget, return);
-            m_outputWidget->setCurrentIndex(1);
-            if (auto issues = static_cast<IssuesWidget *>(m_outputWidget->widget(1)))
-                issues->updateUi();
-        });
+        connect(m_showIssues, &QToolButton::clicked, this, [this] { handleShowIssues({}); });
         auto *butonGroup = new QButtonGroup(this);
         butonGroup->addButton(m_showDashboard);
         butonGroup->addButton(m_showIssues);
@@ -777,6 +840,14 @@ public:
     void goToNext() final {}
     void goToPrev() final {}
 
+    void handleShowIssues(const QString &kind)
+    {
+        QTC_ASSERT(m_outputWidget, return);
+        m_outputWidget->setCurrentIndex(1);
+        if (auto issues = static_cast<IssuesWidget *>(m_outputWidget->widget(1)))
+            issues->updateUi(kind);
+    }
+
     void updateDashboard()
     {
         if (auto dashboard = static_cast<DashboardWidget *>(m_outputWidget->widget(0))) {
@@ -803,35 +874,22 @@ public:
 
         QUrl issueBaseUrl = info->source.resolved(baseUri).resolved(issue);
         QUrl dashboardUrl = info->source.resolved(baseUri);
-        QUrlQuery baseQuery;
-        IssueListSearch search = issues->searchFromUi();
-        baseQuery.addQueryItem("kind", search.kind);
-        if (!search.versionStart.isEmpty())
-            baseQuery.addQueryItem("start", search.versionStart);
-        if (!search.versionEnd.isEmpty())
-            baseQuery.addQueryItem("end", search.versionEnd);
-        issueBaseUrl.setQuery(baseQuery);
-        if (!search.owner.isEmpty())
-            baseQuery.addQueryItem("user", search.owner);
-        if (!search.filter_path.isEmpty())
-            baseQuery.addQueryItem("filter_any path", search.filter_path);
-        if (!search.state.isEmpty())
-            baseQuery.addQueryItem("state", search.state);
-        dashboardUrl.setQuery(baseQuery);
+        const IssueListSearch search = issues->searchFromUi();
+        issueBaseUrl.setQuery(search.toUrlQuery(QueryMode::SimpleQuery));
+        dashboardUrl.setQuery(search.toUrlQuery(QueryMode::FilterQuery));
 
         QMenu *menu = new QMenu;
-        // FIXME Tr::tr() in before QC14
-        auto action = new QAction("Open issue in Dashboard", menu);
+        auto action = new QAction(Tr::tr("Open Issue in Dashboard"), menu);
         menu->addAction(action);
         QObject::connect(action, &QAction::triggered, menu, [issueBaseUrl] {
             QDesktopServices::openUrl(issueBaseUrl);
         });
-        action = new QAction("Open table in Dashboard", menu);
+        action = new QAction(Tr::tr("Open Table in Dashboard"), menu);
         QObject::connect(action, &QAction::triggered, menu, [dashboardUrl] {
             QDesktopServices::openUrl(dashboardUrl);
         });
         menu->addAction(action);
-        action = new QAction("Copy Dashboard link to clipboard", menu);
+        action = new QAction(Tr::tr("Copy Dashboard Link to Clipboard"), menu);
         QObject::connect(action, &QAction::triggered, menu, [dashboardUrl] {
             if (auto clipboard = QGuiApplication::clipboard())
                 clipboard->setText(dashboardUrl.toString());
@@ -873,4 +931,10 @@ static bool issueListContextMenuEvent(const ItemViewEvent &ev)
     return theAxivionOutputPane->handleContextMenu(issue, ev);
 }
 
+void showIssuesFromDashboard(const QString &kind)
+{
+    QTC_ASSERT(theAxivionOutputPane, return);
+    theAxivionOutputPane->handleShowIssues(kind);
+}
+
 } // Axivion::Internal
diff --git a/src/plugins/axivion/axivionplugin.cpp b/src/plugins/axivion/axivionplugin.cpp
index cd27cbbcb0c..e7bb3d176ed 100644
--- a/src/plugins/axivion/axivionplugin.cpp
+++ b/src/plugins/axivion/axivionplugin.cpp
@@ -19,7 +19,6 @@
 #include <coreplugin/navigationwidget.h>
 
 #include <extensionsystem/iplugin.h>
-#include <extensionsystem/pluginmanager.h>
 
 #include <projectexplorer/buildsystem.h>
 #include <projectexplorer/project.h>
@@ -106,6 +105,9 @@ QString anyToSimpleString(const Dto::Any &any)
         value = anyMap.find("name");
         if (value != anyMap.end())
             return anyToSimpleString(value->second);
+        value = anyMap.find("tag");
+        if (value != anyMap.end())
+            return anyToSimpleString(value->second);
     }
     return {};
 }
@@ -126,9 +128,9 @@ static QString escapeKey(const QString &string)
     return escaped.replace('\\', "\\\\").replace('@', "\\@");
 }
 
-static QString credentialKey()
+static QString credentialKey(const AxivionServer &server)
 {
-    return escapeKey(settings().server.username) + '@' + escapeKey(settings().server.dashboard);
+    return escapeKey(server.username) + '@' + escapeKey(server.dashboard);
 }
 
 template <typename DtoType>
@@ -167,39 +169,36 @@ static DashboardInfo toDashboardInfo(const GetDtoStorage<Dto::DashboardInfoDto>
     return {dashboardStorage.url, versionNumber, projects, projectUrls, infoDto.checkCredentialsUrl};
 }
 
-QString IssueListSearch::toQuery() const
+QUrlQuery IssueListSearch::toUrlQuery(QueryMode mode) const
 {
-    if (kind.isEmpty())
-        return {};
-    QString result;
-    result.append(QString("?kind=%1&offset=%2").arg(kind).arg(offset));
-    if (limit)
-        result.append(QString("&limit=%1").arg(limit));
-    // TODO other params
-    if (!versionStart.isEmpty()) {
-        result.append(QString("&start=%1").arg(
-            QString::fromUtf8(QUrl::toPercentEncoding(versionStart))));
-    }
-    if (!versionEnd.isEmpty()) {
-        result.append(QString("&end=%1").arg(
-            QString::fromUtf8(QUrl::toPercentEncoding(versionEnd))));
-    }
-    if (!owner.isEmpty()) {
-        result.append(QString("&user=%1").arg(
-            QString::fromUtf8((QUrl::toPercentEncoding(owner)))));
-    }
-    if (!filter_path.isEmpty()) {
-        result.append(QString("&filter_any path=%1").arg(
-            QString::fromUtf8(QUrl::toPercentEncoding(filter_path))));
-    }
+    QUrlQuery query;
+    QTC_ASSERT(!kind.isEmpty(), return query);
+    query.addQueryItem("kind", kind);
+    if (!versionStart.isEmpty())
+        query.addQueryItem("start", versionStart);
+    if (!versionEnd.isEmpty())
+        query.addQueryItem("end", versionEnd);
+    if (mode == QueryMode::SimpleQuery)
+        return query;
+
+    if (!owner.isEmpty())
+        query.addQueryItem("user", owner);
+    if (!filter_path.isEmpty())
+        query.addQueryItem("filter_any path", filter_path);
     if (!state.isEmpty())
-        result.append(QString("&state=%1").arg(state));
+        query.addQueryItem("state", state);
+    if (mode == QueryMode::FilterQuery)
+        return query;
+
+    QTC_CHECK(mode == QueryMode::FullQuery);
+    query.addQueryItem("offset", QString::number(offset));
+    if (limit)
+        query.addQueryItem("limit", QString::number(limit));
     if (computeTotalRowCount)
-        result.append("&computeTotalRowCount=true");
+        query.addQueryItem("computeTotalRowCount", "true");
     if (!sort.isEmpty())
-        result.append(QString("&sort=%1").arg(
-            QString::fromUtf8(QUrl::toPercentEncoding(sort))));
-    return result;
+        query.addQueryItem("sort", sort);
+    return query;
 }
 
 enum class ServerAccess { Unknown, NoAuthorization, WithAuthorization };
@@ -225,6 +224,9 @@ signals:
     void issueDetailsChanged(const QString &issueDetailsHtml);
 
 public:
+    // active id used for any network communication, defaults to settings' default
+    // set to projects settings' dashboard id on open project
+    Id m_dashboardServerId;
     // TODO: Should be set to Unknown on server address change in settings.
     ServerAccess m_serverAccess = ServerAccess::Unknown;
     // TODO: Should be cleared on username change in settings.
@@ -282,10 +284,10 @@ std::optional<Dto::ProjectInfoDto> projectInfo()
 
 // FIXME: extend to give some details?
 // FIXME: move when curl is no more in use?
-bool handleCertificateIssue()
+bool handleCertificateIssue(const Utils::Id &serverId)
 {
     QTC_ASSERT(dd, return false);
-    const QString serverHost = QUrl(settings().server.dashboard).host();
+    const QString serverHost = QUrl(settings().serverForId(serverId).dashboard).host();
     if (QMessageBox::question(ICore::dialogParent(), Tr::tr("Certificate Error"),
                               Tr::tr("Server certificate for %1 cannot be authenticated.\n"
                                      "Do you want to disable SSL verification for this server?\n"
@@ -294,7 +296,7 @@ bool handleCertificateIssue()
             != QMessageBox::Yes) {
         return false;
     }
-    settings().server.validateCert = false;
+    settings().disableCertificateValidation(serverId);
     settings().apply();
 
     return true;
@@ -310,6 +312,7 @@ AxivionPluginPrivate::AxivionPluginPrivate()
 
 void AxivionPluginPrivate::handleSslErrors(QNetworkReply *reply, const QList<QSslError> &errors)
 {
+    QTC_ASSERT(dd, return);
 #if QT_CONFIG(ssl)
     const QList<QSslError::SslError> accepted{
         QSslError::CertificateNotYetValid, QSslError::CertificateExpired,
@@ -318,7 +321,8 @@ void AxivionPluginPrivate::handleSslErrors(QNetworkReply *reply, const QList<QSs
     };
     if (Utils::allOf(errors,
                      [&accepted](const QSslError &e) { return accepted.contains(e.error()); })) {
-        if (!settings().server.validateCert || handleCertificateIssue())
+        const bool shouldValidate = settings().serverForId(dd->m_dashboardServerId).validateCert;
+        if (!shouldValidate || handleCertificateIssue(dd->m_dashboardServerId))
             reply->ignoreSslErrors(errors);
     }
 #else // ssl
@@ -352,14 +356,20 @@ void AxivionPluginPrivate::onStartupProjectChanged(Project *project)
         handleOpenedDocs();
     });
     const AxivionProjectSettings *projSettings = AxivionProjectSettings::projectSettings(m_project);
+    switchActiveDashboardId(projSettings->dashboardId());
     fetchProjectInfo(projSettings->dashboardProjectName());
 }
 
-static QUrl urlForProject(const QString &projectName)
+static QUrl constructUrl(const QString &projectName, const QString &subPath, const QUrlQuery &query)
 {
     if (!dd->m_dashboardInfo)
         return {};
-    return dd->m_dashboardInfo->source.resolved(QString("api/projects/")).resolved(projectName);
+    QUrl url = dd->m_dashboardInfo->source.resolved(QString("api/projects/" + projectName + '/'));
+    if (!subPath.isEmpty() && QTC_GUARD(!subPath.startsWith('/')))
+        url = url.resolved(subPath);
+    if (!query.isEmpty())
+        url.setQuery(query);
+    return url;
 }
 
 static constexpr int httpStatusCodeOk = 200;
@@ -491,7 +501,6 @@ static Group dtoRecipe(const Storage<DtoStorageType<DtoType>> &dtoStorage)
         const auto deserialize = [](QPromise<expected_str<DtoType>> &promise, const QByteArray &input) {
             promise.addResult(DtoType::deserializeExpected(input));
         };
-        task.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
         task.setConcurrentCallData(deserialize, **storage);
         return SetupResult::Continue;
     };
@@ -542,16 +551,17 @@ static void handleCredentialError(const CredentialQuery &credential)
 
 static Group authorizationRecipe()
 {
+    const Id serverId = dd->m_dashboardServerId;
     const Storage<QUrl> serverUrlStorage;
     const Storage<GetDtoStorage<Dto::DashboardInfoDto>> unauthorizedDashboardStorage;
     const auto onUnauthorizedGroupSetup = [serverUrlStorage, unauthorizedDashboardStorage] {
         unauthorizedDashboardStorage->url = *serverUrlStorage;
         return isServerAccessEstablished() ? SetupResult::StopWithSuccess : SetupResult::Continue;
     };
-    const auto onUnauthorizedDashboard = [unauthorizedDashboardStorage] {
+    const auto onUnauthorizedDashboard = [unauthorizedDashboardStorage, serverId] {
         if (unauthorizedDashboardStorage->dtoData) {
             const Dto::DashboardInfoDto &dashboardInfo = *unauthorizedDashboardStorage->dtoData;
-            const QString &username = settings().server.username;
+            const QString &username = settings().serverForId(serverId).username;
             if (username.isEmpty()
                 || (dashboardInfo.username && *dashboardInfo.username == username)) {
                 dd->m_serverAccess = ServerAccess::NoAuthorization;
@@ -568,10 +578,10 @@ static Group authorizationRecipe()
     const auto onCredentialLoopCondition = [](int) {
         return dd->m_serverAccess == ServerAccess::WithAuthorization && !dd->m_apiToken;
     };
-    const auto onGetCredentialSetup = [](CredentialQuery &credential) {
+    const auto onGetCredentialSetup = [serverId](CredentialQuery &credential) {
         credential.setOperation(CredentialOperation::Get);
         credential.setService(s_axivionKeychainService);
-        credential.setKey(credentialKey());
+        credential.setKey(credentialKey(settings().serverForId(serverId)));
     };
     const auto onGetCredentialDone = [](const CredentialQuery &credential, DoneWith result) {
         if (result == DoneWith::Success)
@@ -585,19 +595,21 @@ static Group authorizationRecipe()
 
     const Storage<QString> passwordStorage;
     const Storage<GetDtoStorage<Dto::DashboardInfoDto>> dashboardStorage;
-    const auto onPasswordGroupSetup = [serverUrlStorage, passwordStorage, dashboardStorage] {
+    const auto onPasswordGroupSetup
+            = [serverId, serverUrlStorage, passwordStorage, dashboardStorage] {
         if (dd->m_apiToken)
             return SetupResult::StopWithSuccess;
 
         bool ok = false;
+        const AxivionServer server = settings().serverForId(serverId);
         const QString text(Tr::tr("Enter the password for:\nDashboard: %1\nUser: %2")
-                               .arg(settings().server.dashboard, settings().server.username));
+                               .arg(server.dashboard, server.username));
         *passwordStorage = QInputDialog::getText(ICore::mainWindow(),
             Tr::tr("Axivion Server Password"), text, QLineEdit::Password, {}, &ok);
         if (!ok)
             return SetupResult::StopWithError;
 
-        const QString credential = settings().server.username + ':' + *passwordStorage;
+        const QString credential = server.username + ':' + *passwordStorage;
         dashboardStorage->credential = "Basic " + credential.toUtf8().toBase64();
         dashboardStorage->url = *serverUrlStorage;
         return SetupResult::Continue;
@@ -624,14 +636,14 @@ static Group authorizationRecipe()
         return SetupResult::Continue;
     };
 
-    const auto onSetCredentialSetup = [apiTokenStorage](CredentialQuery &credential) {
+    const auto onSetCredentialSetup = [apiTokenStorage, serverId](CredentialQuery &credential) {
         if (!apiTokenStorage->dtoData || !apiTokenStorage->dtoData->token)
             return SetupResult::StopWithSuccess;
 
         dd->m_apiToken = apiTokenStorage->dtoData->token->toUtf8();
         credential.setOperation(CredentialOperation::Set);
         credential.setService(s_axivionKeychainService);
-        credential.setKey(credentialKey());
+        credential.setKey(credentialKey(settings().serverForId(serverId)));
         credential.setData(*dd->m_apiToken);
         return SetupResult::Continue;
     };
@@ -651,7 +663,7 @@ static Group authorizationRecipe()
         dashboardStorage->url = *serverUrlStorage;
         return SetupResult::Continue;
     };
-    const auto onDeleteCredentialSetup = [dashboardStorage](CredentialQuery &credential) {
+    const auto onDeleteCredentialSetup = [dashboardStorage, serverId](CredentialQuery &credential) {
         if (dashboardStorage->dtoData) {
             dd->m_dashboardInfo = toDashboardInfo(*dashboardStorage);
             return SetupResult::StopWithSuccess;
@@ -661,13 +673,15 @@ static Group authorizationRecipe()
             .arg(Tr::tr("The stored ApiToken is not valid anymore, removing it.")));
         credential.setOperation(CredentialOperation::Delete);
         credential.setService(s_axivionKeychainService);
-        credential.setKey(credentialKey());
+        credential.setKey(credentialKey(settings().serverForId(serverId)));
         return SetupResult::Continue;
     };
 
     return {
         serverUrlStorage,
-        onGroupSetup([serverUrlStorage] { *serverUrlStorage = QUrl(settings().server.dashboard); }),
+        onGroupSetup([serverUrlStorage, serverId] {
+            *serverUrlStorage = QUrl(settings().serverForId(serverId).dashboard);
+        }),
         Group {
             unauthorizedDashboardStorage,
             onGroupSetup(onUnauthorizedGroupSetup),
@@ -765,12 +779,11 @@ Group issueTableRecipe(const IssueListSearch &search, const IssueTableHandler &h
 {
     QTC_ASSERT(dd->m_currentProjectInfo, return {}); // TODO: Call handler with unexpected?
 
-    const QString query = search.toQuery();
+    const QUrlQuery query = search.toUrlQuery(QueryMode::FullQuery);
     if (query.isEmpty())
         return {}; // TODO: Call handler with unexpected?
 
-    const QUrl url = urlForProject(dd->m_currentProjectInfo.value().name + '/')
-                         .resolved(QString("issues" + query));
+    const QUrl url = constructUrl(dd->m_currentProjectInfo.value().name, "issues", query);
     return fetchDataRecipe<Dto::IssueTableDto>(url, handler);
 }
 
@@ -780,8 +793,8 @@ Group lineMarkerRecipe(const FilePath &filePath, const LineMarkerHandler &handle
     QTC_ASSERT(!filePath.isEmpty(), return {}); // TODO: Call handler with unexpected?
 
     const QString fileName = QString::fromUtf8(QUrl::toPercentEncoding(filePath.path()));
-    const QUrl url = urlForProject(dd->m_currentProjectInfo.value().name + '/')
-                         .resolved(QString("files?filename=" + fileName));
+    const QUrlQuery query({{"filename", fileName}});
+    const QUrl url = constructUrl(dd->m_currentProjectInfo.value().name, "files", query);
     return fetchDataRecipe<Dto::FileViewDto>(url, handler);
 }
 
@@ -789,11 +802,9 @@ Group issueHtmlRecipe(const QString &issueId, const HtmlHandler &handler)
 {
     QTC_ASSERT(dd->m_currentProjectInfo, return {}); // TODO: Call handler with unexpected?
 
-    const QUrl url = urlForProject(dd->m_currentProjectInfo.value().name + '/')
-                         .resolved(QString("issues/"))
-                         .resolved(QString(issueId + '/'))
-                         .resolved(QString("properties"));
-
+    const QUrl url = constructUrl(dd->m_currentProjectInfo.value().name,
+                                  QString("issues/" + issueId + "/properties/"),
+                                  {});
     return fetchHtmlRecipe(url, handler);
 }
 
@@ -843,8 +854,8 @@ void AxivionPluginPrivate::fetchProjectInfo(const QString &projectName)
 
 Group tableInfoRecipe(const QString &prefix, const TableInfoHandler &handler)
 {
-    const QUrl url = urlForProject(dd->m_currentProjectInfo.value().name + '/')
-                         .resolved(QString("issues_meta?kind=" + prefix));
+    const QUrlQuery query({{"kind", prefix}});
+    const QUrl url = constructUrl(dd->m_currentProjectInfo.value().name, "issues_meta", query);
     return fetchDataRecipe<Dto::TableInfoDto>(url, handler);
 }
 
@@ -993,6 +1004,10 @@ public:
     {
         QTC_ASSERT(dd, return {});
         QTextBrowser *browser = new QTextBrowser;
+        const QString text = Tr::tr(
+                    "Search for issues inside the Axivion dashboard or request issue details for "
+                    "Axivion inline annotations to see them here.");
+        browser->setText("<p style='text-align:center'>" + text + "</p>");
         browser->setOpenLinks(false);
         NavigationView view;
         view.widget = browser;
@@ -1044,6 +1059,15 @@ void fetchIssueInfo(const QString &id)
     dd->fetchIssueInfo(id);
 }
 
+void switchActiveDashboardId(const Id &toDashboardId)
+{
+    QTC_ASSERT(dd, return);
+    dd->m_dashboardServerId = toDashboardId;
+    dd->m_serverAccess = ServerAccess::Unknown;
+    dd->m_apiToken.reset();
+    dd->m_dashboardInfo.reset();
+}
+
 const std::optional<DashboardInfo> currentDashboardInfo()
 {
     QTC_ASSERT(dd, return std::nullopt);
diff --git a/src/plugins/axivion/axivionplugin.h b/src/plugins/axivion/axivionplugin.h
index 059e950ecc4..1b25f7a781f 100644
--- a/src/plugins/axivion/axivionplugin.h
+++ b/src/plugins/axivion/axivionplugin.h
@@ -6,6 +6,7 @@
 #include "dashboard/dto.h"
 
 #include <utils/expected.h>
+#include <utils/id.h>
 
 #include <QHash>
 #include <QUrl>
@@ -25,6 +26,12 @@ namespace Axivion::Internal {
 
 constexpr int DefaultSearchLimit = 2048;
 
+enum class QueryMode {
+    SimpleQuery,            // just kind and version start and end
+    FilterQuery,            // + all filters if available
+    FullQuery               // + offset, limit, computeTotalRowCount
+};
+
 struct IssueListSearch
 {
     QString kind;
@@ -38,7 +45,7 @@ struct IssueListSearch
     int limit = DefaultSearchLimit;
     bool computeTotalRowCount = false;
 
-    QString toQuery() const;
+    QUrlQuery toUrlQuery(QueryMode mode) const;
 };
 
 class DashboardInfo
@@ -77,6 +84,7 @@ QIcon iconForIssue(const std::optional<Dto::IssueKind> &issueKind);
 QString anyToSimpleString(const Dto::Any &any);
 void fetchIssueInfo(const QString &id);
 
+void switchActiveDashboardId(const Utils::Id &toDashboardId);
 const std::optional<DashboardInfo> currentDashboardInfo();
 
 Utils::FilePath findFileForIssuePath(const Utils::FilePath &issuePath);
diff --git a/src/plugins/axivion/axivionprojectsettings.cpp b/src/plugins/axivion/axivionprojectsettings.cpp
index 023c251ea42..83969a62185 100644
--- a/src/plugins/axivion/axivionprojectsettings.cpp
+++ b/src/plugins/axivion/axivionprojectsettings.cpp
@@ -15,10 +15,12 @@
 
 #include <solutions/tasking/tasktreerunner.h>
 
+#include <utils/algorithm.h>
 #include <utils/infolabel.h>
 #include <utils/layoutbuilder.h>
 #include <utils/qtcassert.h>
 
+#include <QComboBox>
 #include <QPushButton>
 #include <QTreeWidget>
 #include <QVBoxLayout>
@@ -30,6 +32,7 @@ using namespace Utils;
 namespace Axivion::Internal {
 
 const char PSK_PROJECTNAME[] = "Axivion.ProjectName";
+const char PSK_DASHBOARDID[] = "Axivion.DashboardId";
 
 // AxivionProjectSettingsHandler
 
@@ -82,11 +85,15 @@ void AxivionProjectSettings::destroyProjectSettings()
 void AxivionProjectSettings::load()
 {
     m_dashboardProjectName = m_project->namedSettings(PSK_PROJECTNAME).toString();
+    m_dashboardId = Id::fromSetting(m_project->namedSettings(PSK_DASHBOARDID));
+    if (!m_dashboardId.isValid())
+        m_dashboardId = settings().defaultDashboardId();
 }
 
 void AxivionProjectSettings::save()
 {
     m_project->setNamedSettings(PSK_PROJECTNAME, m_dashboardProjectName);
+    m_project->setNamedSettings(PSK_DASHBOARDID, m_dashboardId.toSetting());
 }
 
 // AxivionProjectSettingsWidget
@@ -99,13 +106,16 @@ public:
 private:
     void fetchProjects();
     void onSettingsChanged();
+    void onServerChanged();
     void linkProject();
     void unlinkProject();
     void updateUi();
     void updateEnabledStates();
+    void updateServers();
 
     AxivionProjectSettings *m_projectSettings = nullptr;
     QLabel *m_linkedProject = nullptr;
+    QComboBox *m_dashboardServers = nullptr;
     QTreeWidget *m_dashboardProjects = nullptr;
     QPushButton *m_fetchProjects = nullptr;
     QPushButton *m_link = nullptr;
@@ -123,6 +133,10 @@ AxivionProjectSettingsWidget::AxivionProjectSettingsWidget(Project *project)
 
     m_linkedProject = new QLabel(this);
 
+    m_dashboardServers = new QComboBox(this);
+    m_dashboardServers->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+    updateServers();
+
     m_dashboardProjects = new QTreeWidget(this);
     m_dashboardProjects->setHeaderHidden(true);
     m_dashboardProjects->setRootIsDecorated(false);
@@ -141,6 +155,7 @@ AxivionProjectSettingsWidget::AxivionProjectSettingsWidget(Project *project)
     using namespace Layouting;
     Column {
         noMargin,
+        m_dashboardServers,
         m_linkedProject,
         Tr::tr("Dashboard projects:"),
         Core::ItemViewFind::createSearchableWrapper(m_dashboardProjects),
@@ -148,6 +163,8 @@ AxivionProjectSettingsWidget::AxivionProjectSettingsWidget(Project *project)
         Row { m_fetchProjects, m_link, m_unlink, st }
     }.attachTo(this);
 
+    connect(m_dashboardServers, &QComboBox::currentIndexChanged,
+            this, &AxivionProjectSettingsWidget::onServerChanged);
     connect(m_dashboardProjects, &QTreeWidget::itemSelectionChanged,
             this, &AxivionProjectSettingsWidget::updateEnabledStates);
     connect(m_fetchProjects, &QPushButton::clicked,
@@ -187,6 +204,23 @@ void AxivionProjectSettingsWidget::onSettingsChanged()
 {
     m_dashboardProjects->clear();
     m_infoLabel->setVisible(false);
+    // check if serverId vanished - reset to default
+    const Id serverId = settings().defaultDashboardId();
+    if (m_projectSettings->dashboardId() != serverId) {
+        m_projectSettings->setDashboardId(serverId);
+        switchActiveDashboardId(serverId);
+    }
+    updateServers();
+    updateUi();
+}
+
+void AxivionProjectSettingsWidget::onServerChanged()
+{
+    m_dashboardProjects->clear();
+    m_infoLabel->setVisible(false);
+    const Id id = m_dashboardServers->currentData().value<AxivionServer>().id;
+    m_projectSettings->setDashboardId(id);
+    switchActiveDashboardId(id);
     updateUi();
 }
 
@@ -222,11 +256,13 @@ void AxivionProjectSettingsWidget::updateUi()
 
 void AxivionProjectSettingsWidget::updateEnabledStates()
 {
-    const bool hasDashboardSettings = !settings().server.dashboard.isEmpty();
+    const bool hasDashboardSettings = !settings().serverForId(m_projectSettings->dashboardId())
+            .dashboard.isEmpty();
     const bool linked = !m_projectSettings->dashboardProjectName().isEmpty();
     const bool linkable = m_dashboardProjects->topLevelItemCount()
             && !m_dashboardProjects->selectedItems().isEmpty();
 
+    m_dashboardServers->setEnabled(!linked);
     m_fetchProjects->setEnabled(hasDashboardSettings);
     m_link->setEnabled(!linked && linkable);
     m_unlink->setEnabled(linked);
@@ -238,6 +274,20 @@ void AxivionProjectSettingsWidget::updateEnabledStates()
     }
 }
 
+void AxivionProjectSettingsWidget::updateServers()
+{
+    const QList<AxivionServer> available = settings().allAvailableServers();
+    m_dashboardServers->clear();
+    for (const AxivionServer &server : available)
+        m_dashboardServers->addItem(server.displayString(), QVariant::fromValue(server));
+    const Id id = m_projectSettings->dashboardId();
+    const int index = Utils::indexOf(available, [&id](const AxivionServer &s) {
+        return s.id == id;
+    });
+    if (index != -1)
+        m_dashboardServers->setCurrentIndex(index);
+}
+
 class AxivionProjectPanelFactory : public ProjectPanelFactory
 {
 public:
diff --git a/src/plugins/axivion/axivionprojectsettings.h b/src/plugins/axivion/axivionprojectsettings.h
index 7cbdfbbf472..7639213e877 100644
--- a/src/plugins/axivion/axivionprojectsettings.h
+++ b/src/plugins/axivion/axivionprojectsettings.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <utils/id.h>
+
 #include <QObject>
 
 namespace ProjectExplorer { class Project; }
@@ -16,6 +18,8 @@ public:
 
     void setDashboardProjectName(const QString &name) { m_dashboardProjectName = name; }
     QString dashboardProjectName() const { return m_dashboardProjectName; }
+    void setDashboardId(const Utils::Id &dashboardId) { m_dashboardId = dashboardId; }
+    Utils::Id dashboardId() const { return m_dashboardId; }
 
     static AxivionProjectSettings *projectSettings(ProjectExplorer::Project *project);
     static void destroyProjectSettings();
@@ -27,6 +31,8 @@ private:
 
     ProjectExplorer::Project *m_project = nullptr;
     QString m_dashboardProjectName;
+    // id of the dashboard in use for this project, or default from settings on initialization
+    Utils::Id m_dashboardId;
 };
 
 } // Axivion::Internal
diff --git a/src/plugins/axivion/axivionsettings.cpp b/src/plugins/axivion/axivionsettings.cpp
index 2af22e7cb9d..9100b7c4e99 100644
--- a/src/plugins/axivion/axivionsettings.cpp
+++ b/src/plugins/axivion/axivionsettings.cpp
@@ -8,14 +8,18 @@
 #include <coreplugin/dialogs/ioptionspage.h>
 #include <coreplugin/icore.h>
 
+#include <utils/algorithm.h>
 #include <utils/id.h>
 #include <utils/layoutbuilder.h>
 #include <utils/stringutils.h>
 
+#include <QComboBox>
 #include <QDialog>
 #include <QDialogButtonBox>
+#include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QMessageBox>
 #include <QPushButton>
 #include <QRegularExpression>
 #include <QUuid>
@@ -72,16 +76,19 @@ static FilePath tokensFilePath()
             .pathAppended("qtcreator/axivion.json");
 }
 
-static void writeTokenFile(const FilePath &filePath, const AxivionServer &server)
+static void writeTokenFile(const FilePath &filePath, const QList<AxivionServer> &servers)
 {
     QJsonDocument doc;
-    doc.setObject(server.toJson());
+    QJsonArray serverArray;
+    for (const AxivionServer &server : servers)
+        serverArray.append(server.toJson());
+    doc.setArray(serverArray);
     // FIXME error handling?
     filePath.writeFileContents(doc.toJson());
     filePath.setPermissions(QFile::ReadUser | QFile::WriteUser);
 }
 
-static AxivionServer readTokenFile(const FilePath &filePath)
+static QList<AxivionServer> readTokenFile(const FilePath &filePath)
 {
     if (!filePath.exists())
         return {};
@@ -89,9 +96,19 @@ static AxivionServer readTokenFile(const FilePath &filePath)
     if (!contents)
         return {};
     const QJsonDocument doc = QJsonDocument::fromJson(*contents);
-    if (!doc.isObject())
+    if (doc.isObject()) // old approach
+        return { AxivionServer::fromJson(doc.object()) };
+    if (!doc.isArray())
         return {};
-    return AxivionServer::fromJson(doc.object());
+
+    QList<AxivionServer> result;
+    const QJsonArray serverArray = doc.array();
+    for (const auto &serverValue : serverArray) {
+        if (!serverValue.isObject())
+            continue;
+        result.append(AxivionServer::fromJson(serverValue.toObject()));
+    }
+    return result;
 }
 
 // AxivionSetting
@@ -110,17 +127,62 @@ AxivionSettings::AxivionSettings()
     highlightMarks.setLabelText(Tr::tr("Highlight marks"));
     highlightMarks.setToolTip(Tr::tr("Marks issues on the scroll bar."));
     highlightMarks.setDefaultValue(false);
+    m_defaultServerId.setSettingsKey("DefaultDashboardId");
     AspectContainer::readSettings();
 
-    server = readTokenFile(tokensFilePath());
+    m_allServers = readTokenFile(tokensFilePath());
+
+    if (m_allServers.size() == 1 && m_defaultServerId().isEmpty()) // handle settings transition
+        m_defaultServerId.setValue(m_allServers.first().id.toString());
 }
 
 void AxivionSettings::toSettings() const
 {
-    writeTokenFile(tokensFilePath(), server);
+    writeTokenFile(tokensFilePath(), m_allServers);
     AspectContainer::writeSettings();
 }
 
+Id AxivionSettings::defaultDashboardId() const
+{
+    return Id::fromString(m_defaultServerId());
+}
+
+const AxivionServer AxivionSettings::defaultServer() const
+{
+    return serverForId(defaultDashboardId());
+}
+
+const AxivionServer AxivionSettings::serverForId(const Utils::Id &id) const
+{
+    return Utils::findOrDefault(m_allServers, [&id](const AxivionServer &server) {
+        return id == server.id;
+    });
+}
+
+void AxivionSettings::disableCertificateValidation(const Utils::Id &id)
+{
+    const int index = Utils::indexOf(m_allServers, [&id](const AxivionServer &server) {
+        return id == server.id;
+    });
+    if (index == -1)
+        return;
+
+    m_allServers[index].validateCert = false;
+}
+
+void AxivionSettings::updateDashboardServers(const QList<AxivionServer> &other)
+{
+    if (m_allServers == other)
+        return;
+
+    const Id oldDefault = defaultDashboardId();
+    if (!Utils::anyOf(other, [&oldDefault](const AxivionServer &s) { return s.id == oldDefault; }))
+        m_defaultServerId.setValue(other.isEmpty() ? QString{} : other.first().id.toString());
+
+    m_allServers = other;
+    emit changed(); // should we be more detailed? (id)
+}
+
 // AxivionSettingsPage
 
 // may allow some invalid, but does some minimal check for legality
@@ -149,8 +211,7 @@ static bool isUrlValid(const QString &in)
 class DashboardSettingsWidget : public QWidget
 {
 public:
-    enum Mode { Display, Edit };
-    explicit DashboardSettingsWidget(Mode m, QWidget *parent, QPushButton *ok = nullptr);
+    explicit DashboardSettingsWidget(QWidget *parent, QPushButton *ok = nullptr);
 
     AxivionServer dashboardServer() const;
     void setDashboardServer(const AxivionServer &server);
@@ -158,26 +219,23 @@ public:
     bool isValid() const;
 
 private:
-    Mode m_mode = Display;
     Id m_id;
     StringAspect m_dashboardUrl;
     StringAspect m_username;
     BoolAspect m_valid;
 };
 
-DashboardSettingsWidget::DashboardSettingsWidget(Mode mode, QWidget *parent, QPushButton *ok)
+DashboardSettingsWidget::DashboardSettingsWidget(QWidget *parent, QPushButton *ok)
     : QWidget(parent)
-    , m_mode(mode)
 {
-    auto labelStyle = mode == Display ? StringAspect::LabelDisplay : StringAspect::LineEditDisplay;
     m_dashboardUrl.setLabelText(Tr::tr("Dashboard URL:"));
-    m_dashboardUrl.setDisplayStyle(labelStyle);
+    m_dashboardUrl.setDisplayStyle(StringAspect::LineEditDisplay);
     m_dashboardUrl.setValidationFunction([](FancyLineEdit *edit, QString *) {
         return isUrlValid(edit->text());
     });
 
     m_username.setLabelText(Tr::tr("Username:"));
-    m_username.setDisplayStyle(labelStyle);
+    m_username.setDisplayStyle(StringAspect::LineEditDisplay);
     m_username.setPlaceHolderText(Tr::tr("User name"));
 
     using namespace Layouting;
@@ -188,15 +246,13 @@ DashboardSettingsWidget::DashboardSettingsWidget(Mode mode, QWidget *parent, QPu
         noMargin
     }.attachTo(this);
 
-    if (mode == Edit) {
-        QTC_ASSERT(ok, return);
-        auto checkValidity = [this, ok] {
-            m_valid.setValue(isValid());
-            ok->setEnabled(m_valid());
-        };
-        connect(&m_dashboardUrl, &BaseAspect::changed, this, checkValidity);
-        connect(&m_username, &BaseAspect::changed, this, checkValidity);
-    }
+    QTC_ASSERT(ok, return);
+    auto checkValidity = [this, ok] {
+        m_valid.setValue(isValid());
+        ok->setEnabled(m_valid());
+    };
+    connect(&m_dashboardUrl, &BaseAspect::changed, this, checkValidity);
+    connect(&m_username, &BaseAspect::changed, this, checkValidity);
 }
 
 AxivionServer DashboardSettingsWidget::dashboardServer() const
@@ -205,7 +261,7 @@ AxivionServer DashboardSettingsWidget::dashboardServer() const
     if (m_id.isValid())
         result.id = m_id;
     else
-        result.id = m_mode == Edit ? Id::fromName(QUuid::createUuid().toByteArray()) : m_id;
+        result.id = Id::fromName(QUuid::createUuid().toByteArray());
     result.dashboard = fixUrl(m_dashboardUrl());
     result.username = m_username();
     return result;
@@ -231,65 +287,124 @@ public:
     void apply() override;
 
 private:
-    void showEditServerDialog();
+    void showServerDialog(bool add);
+    void removeCurrentServerConfig();
+    void updateDashboardServers();
+    void updateEnabledStates();
 
-    DashboardSettingsWidget *m_dashboardDisplay = nullptr;
+    QComboBox *m_dashboardServers = nullptr;
     QPushButton *m_edit = nullptr;
+    QPushButton *m_remove = nullptr;
 };
 
 AxivionSettingsWidget::AxivionSettingsWidget()
 {
     using namespace Layouting;
 
-    m_dashboardDisplay = new DashboardSettingsWidget(DashboardSettingsWidget::Display, this);
-    m_dashboardDisplay->setDashboardServer(settings().server);
-    m_edit = new QPushButton(Tr::tr("Edit..."), this);
-    Column {
-        Row {
-            Form {
-                m_dashboardDisplay, br
-            }, st,
-            Column { m_edit },
-        },
-        Space(10), br,
-        Row { settings().highlightMarks }, st
-    }.attachTo(this);
+    m_dashboardServers = new QComboBox(this);
+    m_dashboardServers->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+    updateDashboardServers();
 
-    connect(m_edit, &QPushButton::clicked, this, &AxivionSettingsWidget::showEditServerDialog);
+    auto addButton = new QPushButton(Tr::tr("Add..."), this);
+    m_edit = new QPushButton(Tr::tr("Edit..."), this);
+    m_remove = new QPushButton(Tr::tr("Remove"), this);
+    Column{
+        Row{
+            Form{Tr::tr("Default dashboard server:"), m_dashboardServers, br},
+            st,
+            Column{addButton, m_edit, st, m_remove},
+        },
+        Space(10),
+        br,
+        Row{settings().highlightMarks},
+        st}
+        .attachTo(this);
+
+    connect(addButton, &QPushButton::clicked, this, [this] {
+        // add an empty item unconditionally
+        m_dashboardServers->addItem(Tr::tr("unset"), QVariant::fromValue(AxivionServer()));
+        m_dashboardServers->setCurrentIndex(m_dashboardServers->count() - 1);
+        showServerDialog(true);
+    });
+    connect(m_edit, &QPushButton::clicked, this, [this] { showServerDialog(false); });
+    connect(m_remove, &QPushButton::clicked,
+            this, &AxivionSettingsWidget::removeCurrentServerConfig);
+    updateEnabledStates();
 }
 
 void AxivionSettingsWidget::apply()
 {
-    settings().server = m_dashboardDisplay->dashboardServer();
-    emit settings().changed(); // ugly but needed
+    QList<AxivionServer> servers;
+    for (int i = 0, end = m_dashboardServers->count(); i < end; ++i)
+        servers.append(m_dashboardServers->itemData(i).value<AxivionServer>());
+    settings().updateDashboardServers(servers);
     settings().toSettings();
 }
 
-void AxivionSettingsWidget::showEditServerDialog()
+void AxivionSettingsWidget::updateDashboardServers()
 {
-    const AxivionServer old = m_dashboardDisplay->dashboardServer();
+    m_dashboardServers->clear();
+    for (const AxivionServer &server : settings().allAvailableServers())
+        m_dashboardServers->addItem(server.displayString(), QVariant::fromValue(server));
+}
+
+void AxivionSettingsWidget::updateEnabledStates()
+{
+    const bool enabled = m_dashboardServers->count();
+    m_edit->setEnabled(enabled);
+    m_remove->setEnabled(enabled);
+}
+
+void AxivionSettingsWidget::removeCurrentServerConfig()
+{
+    const QString config = m_dashboardServers->currentData().value<AxivionServer>().displayString();
+    if (QMessageBox::question(
+            ICore::dialogParent(),
+            Tr::tr("Remove Server Configuration"),
+            Tr::tr("Remove the server configuration \"%1\"?").arg(config))
+        != QMessageBox::Yes) {
+        return;
+    }
+    m_dashboardServers->removeItem(m_dashboardServers->currentIndex());
+    updateEnabledStates();
+}
+
+void AxivionSettingsWidget::showServerDialog(bool add)
+{
+    const AxivionServer old = m_dashboardServers->currentData().value<AxivionServer>();
     QDialog d;
-    d.setWindowTitle(Tr::tr("Edit Dashboard Configuration"));
+    d.setWindowTitle(add ? Tr::tr("Add Dashboard Configuration")
+                         : Tr::tr("Edit Dashboard Configuration"));
     QVBoxLayout *layout = new QVBoxLayout;
     auto buttons = new QDialogButtonBox(QDialogButtonBox::Cancel | QDialogButtonBox::Ok, this);
     auto ok = buttons->button(QDialogButtonBox::Ok);
-    auto dashboardWidget = new DashboardSettingsWidget(DashboardSettingsWidget::Edit, this, ok);
+    auto dashboardWidget = new DashboardSettingsWidget(this, ok);
     dashboardWidget->setDashboardServer(old);
     layout->addWidget(dashboardWidget);
-    ok->setEnabled(m_dashboardDisplay->isValid());
+    ok->setEnabled(dashboardWidget->isValid());
     connect(buttons->button(QDialogButtonBox::Cancel), &QPushButton::clicked, &d, &QDialog::reject);
     connect(ok, &QPushButton::clicked, &d, &QDialog::accept);
     layout->addWidget(buttons);
     d.setLayout(layout);
     d.resize(500, 200);
 
-    if (d.exec() != QDialog::Accepted)
+    if (d.exec() != QDialog::Accepted) {
+        if (add) { // if we canceled an add, remove the canceled item
+            m_dashboardServers->removeItem(m_dashboardServers->currentIndex());
+            updateEnabledStates();
+        }
         return;
+    }
     if (dashboardWidget->isValid()) {
         const AxivionServer server = dashboardWidget->dashboardServer();
-        if (server != old)
-            m_dashboardDisplay->setDashboardServer(server);
+        if (server != old) {
+            m_dashboardServers->setItemData(m_dashboardServers->currentIndex(),
+                                            QVariant::fromValue(server));
+            m_dashboardServers->setItemData(m_dashboardServers->currentIndex(),
+                                            server.displayString(), Qt::DisplayRole);
+        }
     }
+    updateEnabledStates();
 }
 
 // AxivionSettingsPage
diff --git a/src/plugins/axivion/axivionsettings.h b/src/plugins/axivion/axivionsettings.h
index 257b4056c56..4f10a197880 100644
--- a/src/plugins/axivion/axivionsettings.h
+++ b/src/plugins/axivion/axivionsettings.h
@@ -17,12 +17,15 @@ namespace Axivion::Internal {
 class AxivionServer
 {
 public:
+    QString displayString() const { return username + " @ " + dashboard; }
     bool operator==(const AxivionServer &other) const;
     bool operator!=(const AxivionServer &other) const;
 
     QJsonObject toJson() const;
     static AxivionServer fromJson(const QJsonObject &json);
 
+    // id starts empty == invalid; set to generated uuid on first apply of valid dashboard config,
+    // never changes afterwards
     Utils::Id id;
     QString dashboard;
     QString username;
@@ -37,8 +40,17 @@ public:
 
     void toSettings() const;
 
-    AxivionServer server; // shall we have more than one?
+    Utils::Id defaultDashboardId() const;
+    const AxivionServer defaultServer() const;
+    const AxivionServer serverForId(const Utils::Id &id) const;
+    void disableCertificateValidation(const Utils::Id &id);
+    const QList<AxivionServer> allAvailableServers() const { return m_allServers; };
+    void updateDashboardServers(const QList<AxivionServer> &other);
+
     Utils::BoolAspect highlightMarks{this};
+private:
+    Utils::StringAspect m_defaultServerId{this};
+    QList<AxivionServer> m_allServers;
 };
 
 AxivionSettings &settings();
diff --git a/src/plugins/axivion/dynamiclistmodel.cpp b/src/plugins/axivion/dynamiclistmodel.cpp
index 80419a32234..ecd8b361b2f 100644
--- a/src/plugins/axivion/dynamiclistmodel.cpp
+++ b/src/plugins/axivion/dynamiclistmodel.cpp
@@ -73,7 +73,7 @@ QVariant DynamicListModel::data(const QModelIndex &index, int role) const
     if (role == Qt::DisplayRole && index.column() == 0)
         return Tr::tr("Fetching..."); // TODO improve/customize?
     if (role == Qt::ForegroundRole && index.column() == 0)
-        return Utils::creatorTheme()->color(Utils::Theme::TextColorDisabled);
+        return Utils::creatorColor(Utils::Theme::TextColorDisabled);
     return {};
 }
 
diff --git a/src/plugins/axivion/images/nodata.png b/src/plugins/axivion/images/nodata.png
new file mode 100644
index 00000000000..23ebb5c416a
Binary files /dev/null and b/src/plugins/axivion/images/nodata.png differ
diff --git a/src/plugins/axivion/images/nodata@2x.png b/src/plugins/axivion/images/nodata@2x.png
new file mode 100644
index 00000000000..102e67b34a8
Binary files /dev/null and b/src/plugins/axivion/images/nodata@2x.png differ
diff --git a/src/plugins/baremetal/BareMetal.json.in b/src/plugins/baremetal/BareMetal.json.in
index 13bd9ba4ac9..f4a7ded8112 100644
--- a/src/plugins/baremetal/BareMetal.json.in
+++ b/src/plugins/baremetal/BareMetal.json.in
@@ -14,6 +14,12 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Device Support",
-    "Description" : "This plugin adds a target for bare metal development.",
+    "Description" : "Develop applications for bare metal devices.",
+    "LongDescription" : [
+        "Adds a target for bare metal development.",
+        "Connect devices with debug server providers to run, debug, and analyze applications built for them.",
+        "You also need:",
+            "- A toolchain for bare metal development"
+    ],
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp
index 7ce65d689ed..c31ed27dea6 100644
--- a/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp
@@ -151,7 +151,7 @@ QString EBlinkGdbServerProvider::channelString() const
 
 CommandLine EBlinkGdbServerProvider::command() const
 {
-    CommandLine cmd{m_executableFile, {}};
+    CommandLine cmd{m_executableFile};
     QStringList interFaceTypeStrings = {"swd", "jtag"};
 
     // Obligatorily -I
diff --git a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
index 3da6b06254f..773a2ac577f 100644
--- a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
@@ -138,11 +138,8 @@ bool GdbServerProvider::isValid() const
 bool GdbServerProvider::aboutToRun(DebuggerRunTool *runTool, QString &errorMessage) const
 {
     QTC_ASSERT(runTool, return false);
-    const RunControl *runControl = runTool->runControl();
-    const auto exeAspect = runControl->aspect<ExecutableAspect>();
-    QTC_ASSERT(exeAspect, return false);
-
-    const FilePath bin = FilePath::fromString(exeAspect->executable.path());
+    const ProcessRunData runnable = runTool->runControl()->runnable();
+    const FilePath bin = FilePath::fromString(runnable.command.executable().path());
     if (bin.isEmpty()) {
         errorMessage = Tr::tr("Cannot debug: Local executable is not set.");
         return false;
@@ -155,8 +152,7 @@ bool GdbServerProvider::aboutToRun(DebuggerRunTool *runTool, QString &errorMessa
 
     ProcessRunData inferior;
     inferior.command.setExecutable(bin);
-    if (const auto argAspect = runControl->aspect<ArgumentsAspect>())
-        inferior.command.setArguments(argAspect->arguments);
+    inferior.command.setArguments(runnable.command.arguments());
     runTool->setInferior(inferior);
     runTool->setSymbolFile(bin);
     runTool->setStartMode(AttachToRemoteServer);
diff --git a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp
index b94012c9dc7..96a94dc609c 100644
--- a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp
@@ -131,7 +131,7 @@ QString StLinkUtilGdbServerProvider::channelString() const
 
 CommandLine StLinkUtilGdbServerProvider::command() const
 {
-    CommandLine cmd{m_executableFile, {}};
+    CommandLine cmd{m_executableFile};
 
     if (m_extendedMode)
         cmd.addArg("--multi");
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
index f77a0ce0cfd..4dac9b654c4 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
@@ -168,11 +168,7 @@ QString UvscServerProvider::channelString() const
 bool UvscServerProvider::aboutToRun(DebuggerRunTool *runTool, QString &errorMessage) const
 {
     QTC_ASSERT(runTool, return false);
-    const RunControl *runControl = runTool->runControl();
-    const auto exeAspect = runControl->aspect<ExecutableAspect>();
-    QTC_ASSERT(exeAspect, return false);
-
-    const FilePath bin = exeAspect->executable;
+    const FilePath bin = runTool->runControl()->runnable().command.executable();
     if (bin.isEmpty()) {
         errorMessage = Tr::tr("Cannot debug: Local executable is not set.");
         return false;
@@ -210,10 +206,8 @@ ProjectExplorer::RunWorker *UvscServerProvider::targetRunner(RunControl *runCont
 {
     // Get uVision executable path.
     const ProcessRunData uv = DebuggerKitAspect::runnable(runControl->kit());
-    CommandLine server(uv.command.executable());
-    server.addArg("-j0");
-    server.addArg(QStringLiteral("-s%1").arg(m_channel.port()));
-
+    const CommandLine server{uv.command.executable(),
+                             {"-j0", QStringLiteral("-s%1").arg(m_channel.port())}};
     ProcessRunData r;
     r.command = server;
     return new UvscServerProviderRunner(runControl, r);
diff --git a/src/plugins/baremetal/iarewparser.cpp b/src/plugins/baremetal/iarewparser.cpp
index 23a1d10a1db..286cb0e1686 100644
--- a/src/plugins/baremetal/iarewparser.cpp
+++ b/src/plugins/baremetal/iarewparser.cpp
@@ -117,8 +117,8 @@ OutputLineParser::Result IarParser::parseWarningOrErrorOrFatalErrorDetailsMessag
     m_expectSnippet = false;
     m_expectFilePath = false;
     LinkSpecs linkSpecs;
-    addLinkSpecForAbsoluteFilePath(linkSpecs, m_lastTask.file, m_lastTask.line, match,
-                                   FilePathIndex);
+    addLinkSpecForAbsoluteFilePath(
+        linkSpecs, m_lastTask.file, m_lastTask.line, m_lastTask.column, match, FilePathIndex);
     return {Status::InProgress, linkSpecs};
 }
 
diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp
index ef804b0a8a2..d5029c78788 100644
--- a/src/plugins/baremetal/iarewtoolchain.cpp
+++ b/src/plugins/baremetal/iarewtoolchain.cpp
@@ -328,12 +328,11 @@ Toolchain::MacroInspectionRunner IarToolchain::createMacroInspectionRunner() con
 
     return [env, compiler, extraArgs, macrosCache, languageId]
             (const QStringList &flags) {
-        Q_UNUSED(flags)
-
-        Macros macros = dumpPredefinedMacros(compiler, extraArgs, languageId, env);
+        Macros macros = dumpPredefinedMacros(compiler, extraArgs + flags, languageId, env);
         macros.append({"__intrinsic", "", MacroType::Define});
         macros.append({"__nounwind", "", MacroType::Define});
         macros.append({"__noreturn", "", MacroType::Define});
+        macros.append({"__no_init", "", MacroType::Define});
         macros.append({"__packed", "", MacroType::Define});
         macros.append({"__spec_string", "", MacroType::Define});
         macros.append({"__constrange(__a,__b)", "", MacroType::Define});
diff --git a/src/plugins/baremetal/keilparser.cpp b/src/plugins/baremetal/keilparser.cpp
index 4ae0c6aa648..64bf64e46fd 100644
--- a/src/plugins/baremetal/keilparser.cpp
+++ b/src/plugins/baremetal/keilparser.cpp
@@ -62,8 +62,8 @@ OutputLineParser::Result KeilParser::parseArmWarningOrErrorDetailsMessage(const
     const QString descr = match.captured(DescriptionIndex);
     newTask(CompileTask(type, descr, absoluteFilePath(fileName), lineno));
     LinkSpecs linkSpecs;
-    addLinkSpecForAbsoluteFilePath(linkSpecs, m_lastTask.file, m_lastTask.line, match,
-                                   FilePathIndex);
+    addLinkSpecForAbsoluteFilePath(
+        linkSpecs, m_lastTask.file, m_lastTask.line, m_lastTask.column, match, FilePathIndex);
     return {Status::InProgress, linkSpecs};
 }
 
@@ -98,8 +98,8 @@ OutputLineParser::Result KeilParser::parseMcs51WarningOrErrorDetailsMessage1(con
                                                 match.captured(MessageTextIndex));
     newTask(CompileTask(type, descr, absoluteFilePath(fileName), lineno));
     LinkSpecs linkSpecs;
-    addLinkSpecForAbsoluteFilePath(linkSpecs, m_lastTask.file, m_lastTask.line, match,
-                                   FilePathIndex);
+    addLinkSpecForAbsoluteFilePath(
+        linkSpecs, m_lastTask.file, m_lastTask.line, m_lastTask.column, match, FilePathIndex);
     return {Status::InProgress, linkSpecs};
 }
 
@@ -119,8 +119,8 @@ OutputLineParser::Result KeilParser::parseMcs51WarningOrErrorDetailsMessage2(con
                                                 match.captured(MessageTextIndex));
     newTask(CompileTask(type, descr, absoluteFilePath(fileName), lineno));
     LinkSpecs linkSpecs;
-    addLinkSpecForAbsoluteFilePath(linkSpecs, m_lastTask.file, m_lastTask.line, match,
-                                   FilePathIndex);
+    addLinkSpecForAbsoluteFilePath(
+        linkSpecs, m_lastTask.file, m_lastTask.line, m_lastTask.column, match, FilePathIndex);
     return {Status::InProgress, linkSpecs};
 }
 
diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp
index 0ca7495c94c..bc260130b2b 100644
--- a/src/plugins/baremetal/keiltoolchain.cpp
+++ b/src/plugins/baremetal/keiltoolchain.cpp
@@ -246,11 +246,7 @@ static Macros dumpArmPredefinedMacros(const FilePath &compiler, const QStringLis
 {
     Process cpp;
     cpp.setEnvironment(env);
-
-    QStringList args = extraArgs;
-    args.push_back("-E");
-    args.push_back("--list-macros");
-    cpp.setCommand({compiler, args});
+    cpp.setCommand({compiler, {extraArgs, "-E", "--list-macros"}});
 
     cpp.runBlocking();
     if (cpp.result() != ProcessResult::FinishedWithSuccess) {
diff --git a/src/plugins/baremetal/sdccparser.cpp b/src/plugins/baremetal/sdccparser.cpp
index aa97173f85c..517f051390b 100644
--- a/src/plugins/baremetal/sdccparser.cpp
+++ b/src/plugins/baremetal/sdccparser.cpp
@@ -73,8 +73,8 @@ OutputLineParser::Result SdccParser::handleLine(const QString &line, OutputForma
         const QString descr = match.captured(MessageTextIndex);
         newTask(CompileTask(type, descr, absoluteFilePath(fileName), lineno));
         LinkSpecs linkSpecs;
-        addLinkSpecForAbsoluteFilePath(linkSpecs, m_lastTask.file, m_lastTask.line, match,
-                                       FilePathIndex);
+        addLinkSpecForAbsoluteFilePath(
+            linkSpecs, m_lastTask.file, m_lastTask.line, m_lastTask.column, match, FilePathIndex);
         return {Status::InProgress, linkSpecs};
     }
 
@@ -90,8 +90,8 @@ OutputLineParser::Result SdccParser::handleLine(const QString &line, OutputForma
         const QString descr = match.captured(MessageTextIndex);
         newTask(CompileTask(type, descr, absoluteFilePath(fileName), lineno));
         LinkSpecs linkSpecs;
-        addLinkSpecForAbsoluteFilePath(linkSpecs, m_lastTask.file, m_lastTask.line, match,
-                                       FilePathIndex);
+        addLinkSpecForAbsoluteFilePath(
+            linkSpecs, m_lastTask.file, m_lastTask.line, m_lastTask.column, match, FilePathIndex);
         return {Status::InProgress, linkSpecs};
     }
 
diff --git a/src/plugins/bazaar/Bazaar.json.in b/src/plugins/bazaar/Bazaar.json.in
index 82bb55661f6..4adb5553c94 100644
--- a/src/plugins/bazaar/Bazaar.json.in
+++ b/src/plugins/bazaar/Bazaar.json.in
@@ -13,7 +13,11 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Version Control",
-    "Description" : "Bazaar integration.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Access the Bazaar version control system.",
+    "LongDescription" : [
+        "You also need:",
+            "- Bazaar"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp
index 303b7e21c28..77cfd1545cf 100644
--- a/src/plugins/bazaar/bazaarclient.cpp
+++ b/src/plugins/bazaar/bazaarclient.cpp
@@ -147,8 +147,8 @@ void BazaarClient::annotate(const Utils::FilePath &workingDir, const QString &fi
 
 bool BazaarClient::isVcsDirectory(const FilePath &filePath) const
 {
-    return filePath.isDir()
-            && !filePath.fileName().compare(Constants::BAZAARREPO, HostOsInfo::fileNameCaseSensitivity());
+    return !filePath.fileName().compare(Constants::BAZAARREPO, HostOsInfo::fileNameCaseSensitivity())
+           && filePath.isDir();
 }
 
 FilePath BazaarClient::findTopLevelForFile(const FilePath &file) const
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index 590cfd23276..31d9c243906 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -884,7 +884,7 @@ bool BazaarPluginPrivate::managesFile(const FilePath &workingDirectory, const QS
 
 bool BazaarPluginPrivate::isConfigured() const
 {
-    const FilePath binary = settings().binaryPath();
+    const FilePath binary = settings().binaryPath.effectiveBinary();
     return !binary.isEmpty() && binary.isExecutableFile();
 }
 
@@ -947,24 +947,21 @@ VcsCommand *BazaarPluginPrivate::createInitialCheckoutCommand(const QString &url
                                                               const QString &localName,
                                                               const QStringList &extraArgs)
 {
-    QStringList args;
-    args << m_client.vcsCommandString(BazaarClient::CloneCommand)
-         << extraArgs << url << localName;
-
     Environment env = m_client.processEnvironment(baseDirectory);
     env.set("BZR_PROGRESS_BAR", "text");
     auto command = VcsBaseClient::createVcsCommand(this, baseDirectory, env);
-    command->addJob({m_client.vcsBinary(baseDirectory), args}, -1);
+    command->addJob({m_client.vcsBinary(baseDirectory),
+        {m_client.vcsCommandString(BazaarClient::CloneCommand), extraArgs, url, localName}}, -1);
     return command;
 }
 
 void BazaarPluginPrivate::changed(const QVariant &v)
 {
-    switch (v.type()) {
-    case QVariant::String:
+    switch (v.typeId()) {
+    case QMetaType::QString:
         emit repositoryChanged(FilePath::fromVariant(v));
         break;
-    case QVariant::StringList:
+    case QMetaType::QStringList:
         emit filesChanged(v.toStringList());
         break;
     default:
diff --git a/src/plugins/beautifier/Beautifier.json.in b/src/plugins/beautifier/Beautifier.json.in
index 79de488b617..c73bc074150 100644
--- a/src/plugins/beautifier/Beautifier.json.in
+++ b/src/plugins/beautifier/Beautifier.json.in
@@ -14,7 +14,13 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "C++",
-    "Description" : "Format source files with the help of beautifiers like AStyle, uncrustify or clang-format.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Apply indentation and style to source code files.",
+    "LongDescription" : [
+        "You also need one of the following tools:",
+            "- Artistic Style",
+            "- ClangFormat",
+            "- Uncrustify"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
index 2982ac267bc..a3aa30d78e9 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
+++ b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
@@ -221,9 +221,10 @@ public:
 
         setOnApply([&s, configurations] {
             s.customStyle.setValue(configurations->currentConfiguration());
-            settings().apply();
+            s.apply();
             s.save();
         });
+        setOnCancel([&s] { s.cancel(); });
 
         s.read();
 
diff --git a/src/plugins/beautifier/clangformat/clangformat.cpp b/src/plugins/beautifier/clangformat/clangformat.cpp
index 95de1965c3e..d964fe30b1b 100644
--- a/src/plugins/beautifier/clangformat/clangformat.cpp
+++ b/src/plugins/beautifier/clangformat/clangformat.cpp
@@ -270,7 +270,8 @@ public:
                 title(Tr::tr("Options")),
                 bindTo(&options),
                 Form {
-                    s.usePredefinedStyle.adoptButton(predefinedStyleButton), predefinedBlob, br,
+                    s.usePredefinedStyle.adoptButton(predefinedStyleButton),
+                    predefinedBlob, br,
                     customizedStyleButton, configurations,
                 },
             },
@@ -300,6 +301,7 @@ public:
             settings().apply();
             settings().save();
         });
+        setOnCancel([] { settings().cancel(); });
 
         s.read();
 
diff --git a/src/plugins/beautifier/generalsettings.cpp b/src/plugins/beautifier/generalsettings.cpp
index be80de39385..413e80698fb 100644
--- a/src/plugins/beautifier/generalsettings.cpp
+++ b/src/plugins/beautifier/generalsettings.cpp
@@ -50,7 +50,7 @@ GeneralSettings::GeneralSettings()
         return Column {
             Group {
                 title(Tr::tr("Automatic Formatting on File Save")),
-                autoFormatOnSave.groupChecker(),
+                groupChecker(autoFormatOnSave.groupChecker()),
                 Form {
                     autoFormatTools, br,
                     autoFormatMime, br,
diff --git a/src/plugins/beautifier/uncrustify/uncrustify.cpp b/src/plugins/beautifier/uncrustify/uncrustify.cpp
index 75bd5252ed9..a18371ff53b 100644
--- a/src/plugins/beautifier/uncrustify/uncrustify.cpp
+++ b/src/plugins/beautifier/uncrustify/uncrustify.cpp
@@ -225,6 +225,8 @@ public:
             settings().apply();
             s.save();
         });
+
+        setOnCancel([] { settings().cancel(); });
     }
 };
 
diff --git a/src/plugins/bineditor/BinEditor.json.in b/src/plugins/bineditor/BinEditor.json.in
index 5d05094b0f8..db1f9981df1 100644
--- a/src/plugins/bineditor/BinEditor.json.in
+++ b/src/plugins/bineditor/BinEditor.json.in
@@ -13,7 +13,8 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Qt Creator",
-    "Description" : "Binary editor component.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Edit binary files.",
+    "LongDescription" : [],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/boot2qt/Boot2Qt.json.in b/src/plugins/boot2qt/Boot2Qt.json.in
index 6ab0b2a7d60..ba7146da3d6 100644
--- a/src/plugins/boot2qt/Boot2Qt.json.in
+++ b/src/plugins/boot2qt/Boot2Qt.json.in
@@ -15,7 +15,13 @@
 ],
 
     "Category" : "Device Support",
-    "Description" : "Support for the Boot2Qt Device access using the Qt Debug Bridge.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Develop applications for Boot to Qt devices.",
+    "LongDescription" : [
+        "Connect devices with a USB cable, or a wired or wireless connection, depending on the device to run, debug, and analyze applications built for them.",
+        "You also need:",
+            "- Boot to Qt",
+            "- Build tools and other dependencies related to the development host"
+],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/boot2qt/device-detection/devicedetector.cpp b/src/plugins/boot2qt/device-detection/devicedetector.cpp
index abe06bc566b..bc4fbcee665 100644
--- a/src/plugins/boot2qt/device-detection/devicedetector.cpp
+++ b/src/plugins/boot2qt/device-detection/devicedetector.cpp
@@ -80,7 +80,7 @@ void DeviceDetector::handleDeviceEvent(QdbDeviceTracker::DeviceEventType eventTy
     DeviceManager * const dm = DeviceManager::instance();
 
     if (eventType == QdbDeviceTracker::NewDevice) {
-        const QString name = Tr::tr("Qt Debug Bridge device %1").arg(serial);
+        const QString name = Tr::tr("Boot to Qt device %1").arg(serial);
         QdbDevice::Ptr device = QdbDevice::create();
         device->setupId(IDevice::AutoDetected, deviceId);
         device->settings()->displayName.setValue(name);
diff --git a/src/plugins/boot2qt/qdbdevice.cpp b/src/plugins/boot2qt/qdbdevice.cpp
index 1ede480417b..581767be99d 100644
--- a/src/plugins/boot2qt/qdbdevice.cpp
+++ b/src/plugins/boot2qt/qdbdevice.cpp
@@ -88,9 +88,9 @@ private:
             }
             showMessage(errorString, true);
             if (!stdOut.isEmpty())
-                showMessage(Tr::tr("stdout was: \"%1\"").arg(stdOut));
+                showMessage(Tr::tr("stdout was: \"%1\".").arg(stdOut));
             if (!stdErr.isEmpty())
-                showMessage(Tr::tr("stderr was: \"%1\"").arg(stdErr));
+                showMessage(Tr::tr("stderr was: \"%1\".").arg(stdErr));
         } else {
             showMessage(Tr::tr("Commands on device \"%1\" finished successfully.")
                         .arg(m_deviceName));
@@ -107,11 +107,11 @@ private:
 
 QdbDevice::QdbDevice()
 {
-    setDisplayType(Tr::tr("Boot2Qt Device"));
+    setDisplayType(Tr::tr("Boot to Qt Device"));
     setType(Constants::QdbLinuxOsType);
 
     addDeviceAction({Tr::tr("Reboot Device"), [](const IDevice::Ptr &device, QWidget *) {
-        (void) new DeviceApplicationObserver(device, {device->filePath("reboot"), {}});
+        (void) new DeviceApplicationObserver(device, CommandLine{device->filePath("reboot")});
     }});
 
     addDeviceAction({Tr::tr("Restore Default App"), [](const IDevice::Ptr &device, QWidget *) {
@@ -218,7 +218,7 @@ public:
     QdbDeviceWizard(QWidget *parent)
         : QWizard(parent)
     {
-        setWindowTitle(Tr::tr("Boot2Qt Network Device Setup"));
+        setWindowTitle(Tr::tr("Boot to Qt Network Device Setup"));
         settingsPage.setCommitPage(true);
 
         enum { SettingsPageId };
@@ -253,7 +253,7 @@ public:
     QdbLinuxDeviceFactory()
         : IDeviceFactory(Constants::QdbLinuxOsType)
     {
-        setDisplayName(Tr::tr("Boot2Qt Device"));
+        setDisplayName(Tr::tr("Boot to Qt Device"));
         setCombinedIcon(":/qdb/images/qdbdevicesmall.png", ":/qdb/images/qdbdevice.png");
         setQuickCreationAllowed(true);
         setConstructionFunction(&QdbDevice::create);
diff --git a/src/plugins/boot2qt/qdbdevicedebugsupport.cpp b/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
index d9f3d647380..5de1c1fe231 100644
--- a/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
+++ b/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
@@ -298,6 +298,7 @@ public:
         setProduct<QdbDevicePerfProfilerSupport>();
         addSupportedRunMode("PerfRecorder");
         addSupportedDeviceType(Qdb::Constants::QdbLinuxOsType);
+        addSupportedRunConfig(Constants::QdbRunConfigurationId);
     }
 };
 
diff --git a/src/plugins/boot2qt/qdbplugin.cpp b/src/plugins/boot2qt/qdbplugin.cpp
index c0a5bb25ca8..522e9151c76 100644
--- a/src/plugins/boot2qt/qdbplugin.cpp
+++ b/src/plugins/boot2qt/qdbplugin.cpp
@@ -48,7 +48,7 @@ static void startFlashingWizard()
     if (HostOsInfo::isWindowsHost()) {
         if (Process::startDetached({"explorer.exe", {filePath.toUserOutput()}}))
             return;
-    } else if (Process::startDetached({filePath, {}})) {
+    } else if (Process::startDetached(CommandLine{filePath})) {
         return;
     }
     const QString message = Tr::tr("Flash wizard \"%1\" failed to start.");
@@ -106,7 +106,7 @@ public:
     {
         setConfigBaseId(Constants::QdbDeployConfigurationId);
         addSupportedTargetDeviceType(Constants::QdbLinuxOsType);
-        setDefaultDisplayName(Tr::tr("Deploy to Boot2Qt target"));
+        setDefaultDisplayName(Tr::tr("Deploy to Boot to Qt target"));
         setUseDeploymentDataView();
 
         addInitialStep(RemoteLinux::Constants::MakeInstallStepId, [](Target *target) {
diff --git a/src/plugins/boot2qt/qdbrunconfiguration.cpp b/src/plugins/boot2qt/qdbrunconfiguration.cpp
index e95c9562c48..66ca757bf9c 100644
--- a/src/plugins/boot2qt/qdbrunconfiguration.cpp
+++ b/src/plugins/boot2qt/qdbrunconfiguration.cpp
@@ -33,7 +33,7 @@ public:
     QdbRunConfiguration(Target *target, Id id)
         : RunConfiguration(target, id)
     {
-        setDefaultDisplayName(Tr::tr("Run on Boot2Qt Device"));
+        setDefaultDisplayName(Tr::tr("Run on Boot to Qt Device"));
 
         executable.setDeviceSelector(target, ExecutableAspect::RunDevice);
         executable.setSettingsKey("QdbRunConfig.RemoteExecutable");
@@ -87,7 +87,7 @@ private:
         Tasks tasks;
         if (executable().isEmpty()) {
             tasks << BuildSystemTask(Task::Warning, Tr::tr("The remote executable must be set "
-                                                           "in order to run on a Boot2Qt device."));
+                                                           "to run on a Boot to Qt device."));
         }
         return tasks;
     }
diff --git a/src/plugins/boot2qt/qdbutils.cpp b/src/plugins/boot2qt/qdbutils.cpp
index 922f0838f7a..e788717829e 100644
--- a/src/plugins/boot2qt/qdbutils.cpp
+++ b/src/plugins/boot2qt/qdbutils.cpp
@@ -65,7 +65,7 @@ QString overridingEnvironmentVariable(QdbTool tool)
 
 void showMessage(const QString &message, bool important)
 {
-    const QString fullMessage = Tr::tr("Boot2Qt: %1").arg(message);
+    const QString fullMessage = Tr::tr("Boot to Qt: %1").arg(message);
     if (important)
         Core::MessageManager::writeFlashing(fullMessage);
     else
diff --git a/src/plugins/clangcodemodel/ClangCodeModel.json.in b/src/plugins/clangcodemodel/ClangCodeModel.json.in
index 4702372b83b..56da5a325b8 100644
--- a/src/plugins/clangcodemodel/ClangCodeModel.json.in
+++ b/src/plugins/clangcodemodel/ClangCodeModel.json.in
@@ -13,7 +13,10 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "C++",
-    "Description" : "Clang Code Model plugin.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Use Clang code model instead of the built-in code model.",
+    "LongDescription" : [
+        "The code model is the part of an IDE that understands the programming language you are using to write your application. With it, Qt Creator can help you code faster and avoid errors."
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
index 28d00d84a28..62ef434a2e9 100644
--- a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
+++ b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
@@ -68,6 +68,7 @@ private:
 
 ClangCodeModelPlugin::~ClangCodeModelPlugin()
 {
+    m_generatorWatcher.cancel();
     m_generatorWatcher.waitForFinished();
 }
 
@@ -140,13 +141,18 @@ void ClangCodeModelPlugin::createCompilationDBAction()
 
     connect(&m_generatorWatcher, &QFutureWatcher<GenerateCompilationDbResult>::finished,
             this, [this] {
-        const GenerateCompilationDbResult result = m_generatorWatcher.result();
         QString message;
-        if (result.error.isEmpty()) {
-            message = Tr::tr("Clang compilation database generated at \"%1\".")
-                    .arg(QDir::toNativeSeparators(result.filePath));
+        if (m_generatorWatcher.future().resultCount()) {
+            const GenerateCompilationDbResult result = m_generatorWatcher.result();
+            if (result) {
+                message = Tr::tr("Clang compilation database generated at \"%1\".")
+                              .arg(result->toUserOutput());
+            } else {
+                message
+                    = Tr::tr("Generating Clang compilation database failed: %1").arg(result.error());
+            }
         } else {
-            message = Tr::tr("Generating Clang compilation database failed: %1").arg(result.error);
+            message = Tr::tr("Generating Clang compilation database canceled.");
         }
         MessageManager::writeFlashing(message);
         m_generateCompilationDBAction->setEnabled(true);
diff --git a/src/plugins/clangcodemodel/clangdclient.cpp b/src/plugins/clangcodemodel/clangdclient.cpp
index b36ff8a4258..19cd4bd5a91 100644
--- a/src/plugins/clangcodemodel/clangdclient.cpp
+++ b/src/plugins/clangcodemodel/clangdclient.cpp
@@ -46,6 +46,7 @@
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/kitaspects.h>
 #include <projectexplorer/project.h>
+#include <projectexplorer/projectnodes.h>
 #include <projectexplorer/projecttree.h>
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/target.h>
@@ -57,6 +58,7 @@
 #include <texteditor/texteditor.h>
 #include <utils/algorithm.h>
 #include <utils/async.h>
+#include <utils/clangutils.h>
 #include <utils/environment.h>
 #include <utils/fileutils.h>
 #include <utils/mimeconstants.h>
@@ -142,7 +144,7 @@ private:
         case Qt::ForegroundRole:
             if ((detail().endsWith("class") || detail().endsWith("struct"))
                 && range().end() == selectionRange().end()) {
-                return creatorTheme()->color(Theme::TextColorDisabled);
+                return creatorColor(Theme::TextColorDisabled);
             }
             break;
         }
@@ -207,12 +209,11 @@ static BaseClientInterface *clientInterface(Project *project, const Utils::FileP
                             "--clang-tidy=0"}};
     if (settings.workerThreadLimit() != 0)
         cmd.addArg("-j=" + QString::number(settings.workerThreadLimit()));
-    if (indexingEnabled && Utils::clangdVersion(clangdExePath) >= QVersionNumber(15)) {
+    if (indexingEnabled) {
         cmd.addArg("--background-index-priority="
                    + ClangdSettings::priorityToString(indexingPriority));
     }
-    if (Utils::clangdVersion(clangdExePath) >= QVersionNumber(16))
-        cmd.addArg("--rename-file-limit=0");
+    cmd.addArg("--rename-file-limit=0");
     if (!jsonDbDir.isEmpty())
         cmd.addArg("--compile-commands-dir=" + clangdExePath.withNewMappedPath(jsonDbDir).path());
     if (clangdLogServer().isDebugEnabled())
@@ -348,14 +349,13 @@ public:
 
     ClangdClient * const q;
     const CppEditor::ClangdSettings::Data settings;
-    ClangdFollowSymbol *followSymbol = nullptr;
+    QList<ClangdFollowSymbol *> followSymbolOps;
     ClangdSwitchDeclDef *switchDeclDef = nullptr;
     ClangdFindLocalReferences *findLocalRefs = nullptr;
     std::optional<QVersionNumber> versionNumber;
 
     QHash<TextDocument *, HighlightingData> highlightingData;
     QHash<Utils::FilePath, CppEditor::BaseEditorDocumentParser::Configuration> parserConfigs;
-    QHash<Utils::FilePath, Tasks> issuePaneEntries;
     QHash<Utils::FilePath, int> openedExtraFiles;
 
     VersionedDataCache<const TextDocument *, ClangdAstNode> astCache;
@@ -418,7 +418,8 @@ ClangdClient::ClangdClient(Project *project, const Utils::FilePath &jsonDbDir, c
         CppEditor::CompilerOptionsBuilder optionsBuilder = clangOptionsBuilder(
                     *CppEditor::CppModelManager::fallbackProjectPart(),
                     warningsConfigForProject(nullptr), includeDir, {});
-        const CppEditor::UsePrecompiledHeaders usePch = CppEditor::getPchUsage();
+        const CppEditor::UsePrecompiledHeaders usePch
+            = CppEditor::CppCodeModelSettings::usePrecompiledHeaders(nullptr);
         const QJsonArray projectPartOptions = fullProjectPartOptions(
                     optionsBuilder, globalClangOptions());
         const QJsonArray clangOptions = clangOptionsForFile({}, optionsBuilder.projectPart(),
@@ -500,8 +501,8 @@ ClangdClient::ClangdClient(Project *project, const Utils::FilePath &jsonDbDir, c
 
 ClangdClient::~ClangdClient()
 {
-    if (d->followSymbol)
-        d->followSymbol->clear();
+    for (ClangdFollowSymbol * const followSymbol : std::as_const(d->followSymbolOps))
+        followSymbol->clear();
     delete d;
 }
 
@@ -556,9 +557,7 @@ void ClangdClient::findUsages(const CppEditor::CursorInEditor &cursor,
     if (searchTerm.isEmpty())
         return;
 
-    if (replacement && versionNumber() >= QVersionNumber(16)
-        && Utils::qtcEnvironmentVariable("QTC_CLANGD_RENAMING") != "0") {
-
+    if (replacement && Utils::qtcEnvironmentVariable("QTC_CLANGD_RENAMING") != "0") {
         // If we have up-to-date highlighting data, we can prevent giving clangd
         // macros or namespaces to rename, which it can't cope with.
         // TODO: Fix this upstream for macros; see https://github.com/clangd/clangd/issues/729.
@@ -599,7 +598,7 @@ void ClangdClient::findUsages(const CppEditor::CursorInEditor &cursor,
         }
     }
 
-    const bool categorize = CppEditor::codeModelSettings()->categorizeFindReferences();
+    const bool categorize = CppEditor::CppCodeModelSettings::categorizeFindReferences();
 
     // If it's a "normal" symbol, go right ahead.
     if (searchTerm != "operator" && Utils::allOf(searchTerm, [](const QChar &c) {
@@ -688,30 +687,14 @@ const LanguageClient::Client::CustomInspectorTabs ClangdClient::createCustomInsp
 
 class ClangdDiagnosticManager : public LanguageClient::DiagnosticManager
 {
-    using LanguageClient::DiagnosticManager::DiagnosticManager;
-
-    ClangdClient *getClient() const { return qobject_cast<ClangdClient *>(client()); }
-
-    bool isCurrentDocument(const Utils::FilePath &filePath) const
+public:
+    ClangdDiagnosticManager(LanguageClient::Client *client)
+        : LanguageClient::DiagnosticManager(client)
     {
-        const IDocument * const doc = EditorManager::currentDocument();
-        return doc && doc->filePath() == filePath;
-    }
-
-    void showDiagnostics(const Utils::FilePath &filePath, int version) override
-    {
-        getClient()->clearTasks(filePath);
-        DiagnosticManager::showDiagnostics(filePath, version);
-        if (isCurrentDocument(filePath))
-            getClient()->switchIssuePaneEntries(filePath);
-    }
-
-    void hideDiagnostics(const Utils::FilePath &filePath) override
-    {
-        DiagnosticManager::hideDiagnostics(filePath);
-        if (isCurrentDocument(filePath))
-            TaskHub::clearTasks(Constants::TASK_CATEGORY_DIAGNOSTICS);
+        setTaskCategory(Constants::TASK_CATEGORY_DIAGNOSTICS);
+        setForceCreateTasks(false);
     }
+private:
 
     QList<Diagnostic> filteredDiagnostics(const QList<Diagnostic> &diagnostics) const override
     {
@@ -727,7 +710,18 @@ class ClangdDiagnosticManager : public LanguageClient::DiagnosticManager
                              const Diagnostic &diagnostic,
                              bool isProjectFile) const override
     {
-        return new ClangdTextMark(doc, diagnostic, isProjectFile, getClient());
+        return new ClangdTextMark(
+                    doc, diagnostic, isProjectFile, qobject_cast<ClangdClient *>(client()));
+    }
+
+    QString taskText(const Diagnostic &diagnostic) const override
+    {
+        QString text = diagnostic.message();
+        auto splitIndex = text.indexOf("\n\n");
+        if (splitIndex >= 0)
+            text.truncate(splitIndex);
+
+        return diagnosticCategoryPrefixRemoved(text);
     }
 };
 
@@ -771,6 +765,15 @@ QList<Text::Range> ClangdClient::additionalDocumentHighlights(
         qobject_cast<CppEditor::CppEditorWidget *>(editorWidget), cursor);
 }
 
+bool ClangdClient::shouldSendDidSave(const TextEditor::TextDocument *doc) const
+{
+    for (const Project * const p : ProjectManager::projects()) {
+        if (const Node * const n  = p->nodeForFilePath(doc->filePath()))
+            return n->asFileNode() && n->asFileNode()->fileType() == FileType::Header;
+    }
+    return CppEditor::ProjectFile::isHeader(doc->filePath());
+}
+
 RefactoringFilePtr ClangdClient::createRefactoringFile(const FilePath &filePath) const
 {
     return CppEditor::CppRefactoringChanges(CppEditor::CppModelManager::snapshot()).file(filePath);
@@ -919,8 +922,15 @@ void ClangdClient::updateParserConfig(const Utils::FilePath &filePath,
                                       CppEditor::ProjectFile::classify(filePath.toString()));
     const QJsonArray projectPartOptions = fullProjectPartOptions(
                 optionsBuilder, globalClangOptions());
-    addToCompilationDb(cdbChanges, *projectPart, CppEditor::getPchUsage(), projectPartOptions,
-                       filePath.parentDir(), file, optionsBuilder.isClStyle());
+    const auto cppSettings = CppEditor::CppCodeModelSettings::settingsForProject(
+        projectPart->topLevelProject);
+    addToCompilationDb(cdbChanges,
+                       *projectPart,
+                       cppSettings.usePrecompiledHeaders(),
+                       projectPartOptions,
+                       filePath.parentDir(),
+                       file,
+                       optionsBuilder.isClStyle());
     QJsonObject settings;
     addCompilationDb(settings, cdbChanges);
     DidChangeConfigurationParams configChangeParams;
@@ -929,24 +939,6 @@ void ClangdClient::updateParserConfig(const Utils::FilePath &filePath,
     emit configChanged();
 }
 
-void ClangdClient::switchIssuePaneEntries(const FilePath &filePath)
-{
-    TaskHub::clearTasks(Constants::TASK_CATEGORY_DIAGNOSTICS);
-    const Tasks tasks = d->issuePaneEntries.value(filePath);
-    for (const Task &t : tasks)
-        TaskHub::addTask(t);
-}
-
-void ClangdClient::addTask(const ProjectExplorer::Task &task)
-{
-    d->issuePaneEntries[task.file] << task;
-}
-
-void ClangdClient::clearTasks(const Utils::FilePath &filePath)
-{
-    d->issuePaneEntries[filePath].clear();
-}
-
 std::optional<bool> ClangdClient::hasVirtualFunctionAt(TextDocument *doc, int revision,
                                                          const Range &range)
 {
@@ -998,7 +990,7 @@ MessageId ClangdClient::requestSymbolInfo(const Utils::FilePath &filePath, const
 #ifdef WITH_TESTS
 ClangdFollowSymbol *ClangdClient::currentFollowSymbolOperation()
 {
-    return d->followSymbol;
+    return d->followSymbolOps.isEmpty() ? nullptr : d->followSymbolOps.first();
 }
 #endif
 
@@ -1013,8 +1005,21 @@ void ClangdClient::followSymbol(TextDocument *document,
 {
     QTC_ASSERT(documentOpen(document), openDocument(document));
 
-    if (d->followSymbol)
-        d->followSymbol->cancel();
+    const ClangdFollowSymbol::Origin origin
+        = CppEditor::CppCodeModelSettings::isInteractiveFollowSymbol()
+              ? ClangdFollowSymbol::Origin::User
+              : ClangdFollowSymbol::Origin::Code;
+    if (origin == ClangdFollowSymbol::Origin::User) {
+        for (auto it = d->followSymbolOps.begin(); it != d->followSymbolOps.end(); ) {
+            ClangdFollowSymbol * const followSymbol = *it;
+            if (followSymbol->isInteractive()) {
+                it = d->followSymbolOps.erase(it);
+                followSymbol->cancel();
+            } else {
+                ++it;
+            }
+        }
+    }
 
     const QTextCursor adjustedCursor = d->adjustedCursor(cursor, document);
     if (followTo == FollowTo::SymbolDef && !resolveTarget) {
@@ -1028,14 +1033,13 @@ void ClangdClient::followSymbol(TextDocument *document,
 
     qCDebug(clangdLog) << "follow symbol requested" << document->filePath()
                        << adjustedCursor.blockNumber() << adjustedCursor.positionInBlock();
-    auto clangdFollowSymbol = new ClangdFollowSymbol(this, adjustedCursor, editorWidget, document,
-                                                     callback, followTo, openInSplit);
+    auto clangdFollowSymbol = new ClangdFollowSymbol(this, origin, adjustedCursor, editorWidget,
+                                                     document, callback, followTo, openInSplit);
     connect(clangdFollowSymbol, &ClangdFollowSymbol::done, this, [this, clangdFollowSymbol] {
         clangdFollowSymbol->deleteLater();
-        if (clangdFollowSymbol == d->followSymbol)
-            d->followSymbol = nullptr;
+        d->followSymbolOps.removeOne(clangdFollowSymbol);
     });
-    d->followSymbol = clangdFollowSymbol;
+    d->followSymbolOps << clangdFollowSymbol;
 }
 
 void ClangdClient::switchDeclDef(TextDocument *document, const QTextCursor &cursor,
@@ -1528,7 +1532,7 @@ void ClangdClient::Private::handleSemanticTokens(TextDocument *doc,
         return;
     }
     force = force || isTesting;
-    const auto data = highlightingData.find(doc);
+    auto data = highlightingData.find(doc);
     if (data != highlightingData.end()) {
         if (!force && data->previousTokens.first == tokens
                 && data->previousTokens.second == version) {
@@ -1538,61 +1542,50 @@ void ClangdClient::Private::handleSemanticTokens(TextDocument *doc,
         data->previousTokens.first = tokens;
         data->previousTokens.second = version;
     } else {
-        highlightingData.insert(doc, {{tokens, version}, {}});
+        data = highlightingData.insert(doc, {{tokens, version}, {}});
     }
     for (const ExpandedSemanticToken &t : tokens)
         qCDebug(clangdLogHighlight()) << '\t' << t.line << t.column << t.length << t.type
                                       << t.modifiers;
 
-    const auto astHandler = [this, tokens, doc, version](const ClangdAstNode &ast, const MessageId &) {
-        FinalizingSubtaskTimer t(highlightingTimer);
-        if (!q->documentOpen(doc))
-            return;
-        if (version != q->documentVersion(doc->filePath())) {
-            qCInfo(clangdLogHighlight) << "AST not up to date; aborting highlighting procedure"
-                                        << version << q->documentVersion(doc->filePath());
-            return;
+    FinalizingSubtaskTimer ft(highlightingTimer);
+    if (!q->documentOpen(doc))
+        return;
+    if (version != q->documentVersion(doc->filePath())) {
+        qCInfo(clangdLogHighlight) << "AST not up to date; aborting highlighting procedure"
+                                   << version << q->documentVersion(doc->filePath());
+        return;
+    }
+
+    const auto runner = [tokens, filePath = doc->filePath(),
+                         text = doc->document()->toPlainText(),
+                         rev = doc->document()->revision(), this] {
+        try {
+            return Utils::asyncRun(doSemanticHighlighting, filePath, tokens, text,
+                                   rev, highlightingTimer);
+        } catch (const std::exception &e) {
+            qWarning() << "caught" << e.what() << "in main highlighting thread";
+            return QFuture<HighlightingResult>();
         }
-        if (clangdLogAst().isDebugEnabled())
-            ast.print();
-
-        const auto runner = [tokens, filePath = doc->filePath(),
-                             text = doc->document()->toPlainText(), ast,
-                             doc = QPointer(doc), rev = doc->document()->revision(),
-                             clangdVersion = q->versionNumber(),
-                             this] {
-            try {
-                return Utils::asyncRun(doSemanticHighlighting, filePath, tokens, text, ast, doc,
-                                       rev, clangdVersion, highlightingTimer);
-            } catch (const std::exception &e) {
-                qWarning() << "caught" << e.what() << "in main highlighting thread";
-                return QFuture<HighlightingResult>();
-            }
-        };
-
-        if (isTesting) {
-            const auto watcher = new QFutureWatcher<HighlightingResult>(q);
-            connect(watcher, &QFutureWatcher<HighlightingResult>::finished,
-                    q, [this, watcher, fp = doc->filePath()] {
-                emit q->highlightingResultsReady(watcher->future().results(), fp);
-                watcher->deleteLater();
-            });
-            watcher->setFuture(runner());
-            return;
-        }
-
-        auto &data = highlightingData[doc];
-        if (!data.highlighter)
-            data.highlighter = new CppEditor::SemanticHighlighter(doc);
-        else
-            data.highlighter->updateFormatMapFromFontSettings();
-        data.highlighter->setHighlightingRunner(runner);
-        data.highlighter->run();
     };
-    if (q->versionNumber().majorVersion() >= 17)
-        astHandler({}, {});
+
+    if (isTesting) {
+        const auto watcher = new QFutureWatcher<HighlightingResult>(q);
+        connect(watcher, &QFutureWatcher<HighlightingResult>::finished,
+                q, [this, watcher, fp = doc->filePath()] {
+            emit q->highlightingResultsReady(watcher->future().results(), fp);
+            watcher->deleteLater();
+        });
+        watcher->setFuture(runner());
+        return;
+    }
+
+    if (!data->highlighter)
+        data->highlighter = new CppEditor::SemanticHighlighter(doc);
     else
-        getAndHandleAst(doc, astHandler, AstCallbackMode::SyncIfPossible);
+        data->highlighter->updateFormatMapFromFontSettings();
+    data->highlighter->setHighlightingRunner(runner);
+    data->highlighter->run();
 }
 
 std::optional<QList<CodeAction> > ClangdDiagnostic::codeActions() const
diff --git a/src/plugins/clangcodemodel/clangdclient.h b/src/plugins/clangcodemodel/clangdclient.h
index fbe2a31bbc6..5a12c8f56d7 100644
--- a/src/plugins/clangcodemodel/clangdclient.h
+++ b/src/plugins/clangcodemodel/clangdclient.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <cppeditor/baseeditordocumentparser.h>
-#include <cppeditor/cppcodemodelsettings.h>
+#include <cppeditor/clangdsettings.h>
 #include <cppeditor/cursorineditor.h>
 #include <languageclient/client.h>
 #include <utils/link.h>
@@ -97,9 +97,6 @@ public:
 
     void updateParserConfig(const Utils::FilePath &filePath,
                             const CppEditor::BaseEditorDocumentParser::Configuration &config);
-    void switchIssuePaneEntries(const Utils::FilePath &filePath);
-    void addTask(const ProjectExplorer::Task &task);
-    void clearTasks(const Utils::FilePath &filePath);
     std::optional<bool> hasVirtualFunctionAt(TextEditor::TextDocument *doc, int revision,
                                                const LanguageServerProtocol::Range &range);
 
@@ -151,7 +148,7 @@ private:
     bool fileBelongsToProject(const Utils::FilePath &filePath) const override;
     QList<Utils::Text::Range> additionalDocumentHighlights(
         TextEditor::TextEditorWidget *editorWidget, const QTextCursor &cursor) override;
-
+    bool shouldSendDidSave(const TextEditor::TextDocument *doc) const override;
 
     class Private;
     class VirtualFunctionAssistProcessor;
diff --git a/src/plugins/clangcodemodel/clangdcompletion.cpp b/src/plugins/clangcodemodel/clangdcompletion.cpp
index 44520d324de..b781c564887 100644
--- a/src/plugins/clangcodemodel/clangdcompletion.cpp
+++ b/src/plugins/clangcodemodel/clangdcompletion.cpp
@@ -359,8 +359,14 @@ void ClangdCompletionItem::apply(TextDocumentManipulatorInterface &manipulator,
     }
 
     // Avoid inserting characters that are already there
+    // For include file completions, also consider a possibly pre-existing
+    // closing quote or angle bracket.
     QTextCursor cursor = manipulator.textCursorAt(rangeStart);
     cursor.movePosition(QTextCursor::EndOfWord);
+    if (kind == CompletionItemKind::File && !textToBeInserted.isEmpty()
+        && textToBeInserted.right(1) == manipulator.textAt(cursor.position(), 1)) {
+        cursor.setPosition(cursor.position() + 1);
+    }
     const QString textAfterCursor = manipulator.textAt(currentPos, cursor.position() - currentPos);
     if (currentPos < cursor.position()
             && textToBeInserted != textAfterCursor
diff --git a/src/plugins/clangcodemodel/clangdfollowsymbol.cpp b/src/plugins/clangcodemodel/clangdfollowsymbol.cpp
index 0da02cba330..29fa15fe8bb 100644
--- a/src/plugins/clangcodemodel/clangdfollowsymbol.cpp
+++ b/src/plugins/clangcodemodel/clangdfollowsymbol.cpp
@@ -73,10 +73,10 @@ private:
 class ClangdFollowSymbol::Private
 {
 public:
-    Private(ClangdFollowSymbol *q, ClangdClient *client, const QTextCursor &cursor,
+    Private(ClangdFollowSymbol *q, ClangdClient *client, Origin origin, const QTextCursor &cursor,
             CppEditorWidget *editorWidget, const FilePath &filePath, const LinkHandler &callback,
             bool openInSplit)
-        : q(q), client(client), cursor(cursor), editorWidget(editorWidget),
+        : q(q), client(client), origin(origin), cursor(cursor), editorWidget(editorWidget),
           uri(client->hostPathToServerUri(filePath)), callback(callback),
           virtualFuncAssistProvider(q),
           docRevision(editorWidget ? editorWidget->textDocument()->document()->revision() : -1),
@@ -94,6 +94,7 @@ public:
 
     ClangdFollowSymbol * const q;
     ClangdClient * const client;
+    const Origin origin;
     const QTextCursor cursor;
     const QPointer<CppEditor::CppEditorWidget> editorWidget;
     const DocumentUri uri;
@@ -117,11 +118,11 @@ public:
     bool done = false;
 };
 
-ClangdFollowSymbol::ClangdFollowSymbol(ClangdClient *client, const QTextCursor &cursor,
-        CppEditorWidget *editorWidget, TextDocument *document, const LinkHandler &callback,
-        FollowTo followTo, bool openInSplit)
+ClangdFollowSymbol::ClangdFollowSymbol(ClangdClient *client, Origin origin,
+        const QTextCursor &cursor, CppEditorWidget *editorWidget, TextDocument *document,
+        const LinkHandler &callback, FollowTo followTo, bool openInSplit)
     : QObject(client),
-      d(new Private(this, client, cursor, editorWidget, document->filePath(), callback,
+      d(new Private(this, client, origin, cursor, editorWidget, document->filePath(), callback,
                     openInSplit))
 {
     // Abort if the user does something else with the document in the meantime.
@@ -193,6 +194,11 @@ void ClangdFollowSymbol::clear()
     d->pendingGotoDefRequests.clear();
 }
 
+bool ClangdFollowSymbol::isInteractive() const
+{
+    return d->origin == Origin::User;
+}
+
 void ClangdFollowSymbol::emitDone(const Link &link)
 {
     if (d->done)
@@ -459,8 +465,6 @@ void ClangdFollowSymbol::Private::handleGotoImplementationResult(
     //         Make a symbol info request for each link to get the class names.
     //         Also get the AST for the base declaration, so we can find out whether it's
     //         pure virtual and mark it accordingly.
-    //         In addition, we need to follow all override links, because for these, clangd
-    //         gives us the declaration instead of the definition (until clangd 16).
     for (const Link &link : std::as_const(allLinks)) {
         if (!client->documentForFilePath(link.targetFilePath) && addOpenFile(link.targetFilePath))
             client->openExtraFile(link.targetFilePath);
@@ -487,42 +491,6 @@ void ClangdFollowSymbol::Private::handleGotoImplementationResult(
 
         if (link == defLink)
             continue;
-
-        if (client->versionNumber().majorVersion() >= 17)
-            continue;
-
-        const TextDocumentIdentifier doc(client->hostPathToServerUri(link.targetFilePath));
-        const TextDocumentPositionParams params(doc, pos);
-        GotoDefinitionRequest defReq(params);
-        defReq.setResponseCallback(
-            [this, link, transformLink, sentinel = QPointer(q), reqId = defReq.id()](
-                const GotoDefinitionRequest::Response &response) {
-                qCDebug(clangdLog) << "handling additional go to definition reply for"
-                                   << link.targetFilePath << link.targetLine;
-                if (!sentinel)
-                    return;
-                Link newLink;
-                if (std::optional<GotoResult> _result = response.result()) {
-                    const GotoResult result = _result.value();
-                    if (const auto ploc = std::get_if<Location>(&result)) {
-                        newLink = transformLink(*ploc);
-                    } else if (const auto plloc = std::get_if<QList<Location>>(&result)) {
-                        if (!plloc->isEmpty())
-                            newLink = transformLink(plloc->value(0));
-                    }
-                }
-                qCDebug(clangdLog) << "def link is" << newLink.targetFilePath << newLink.targetLine;
-                declDefMap.insert(link, newLink);
-                pendingGotoDefRequests.removeOne(reqId);
-                if (pendingSymbolInfoRequests.isEmpty() && pendingGotoDefRequests.isEmpty()
-                    && defLinkNode.isValid()) {
-                    handleDocumentInfoResults();
-                }
-            });
-        pendingGotoDefRequests << defReq.id();
-        qCDebug(clangdLog) << "sending additional go to definition request"
-                           << link.targetFilePath << link.targetLine;
-        client->sendMessage(defReq, ClangdClient::SendDocUpdates::Ignore);
     }
 
     const FilePath defLinkFilePath = defLink.targetFilePath;
diff --git a/src/plugins/clangcodemodel/clangdfollowsymbol.h b/src/plugins/clangcodemodel/clangdfollowsymbol.h
index 33cef520d88..539ae461bc2 100644
--- a/src/plugins/clangcodemodel/clangdfollowsymbol.h
+++ b/src/plugins/clangcodemodel/clangdfollowsymbol.h
@@ -23,7 +23,9 @@ class ClangdFollowSymbol : public QObject
 {
     Q_OBJECT
 public:
-    ClangdFollowSymbol(ClangdClient *client, const QTextCursor &cursor,
+    enum class Origin { User, Code };
+
+    ClangdFollowSymbol(ClangdClient *client, Origin origin, const QTextCursor &cursor,
                        CppEditor::CppEditorWidget *editorWidget,
                        TextEditor::TextDocument *document, const Utils::LinkHandler &callback,
                        FollowTo followTo, bool openInSplit);
@@ -31,6 +33,8 @@ public:
     void cancel();
     void clear();
 
+    bool isInteractive() const;
+
 signals:
     void done();
 
diff --git a/src/plugins/clangcodemodel/clangdlocatorfilters.cpp b/src/plugins/clangcodemodel/clangdlocatorfilters.cpp
index 469dfeec95f..5bf59150446 100644
--- a/src/plugins/clangcodemodel/clangdlocatorfilters.cpp
+++ b/src/plugins/clangcodemodel/clangdlocatorfilters.cpp
@@ -10,8 +10,6 @@
 #include <cppeditor/cppeditortr.h>
 #include <cppeditor/cpplocatorfilter.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <languageclient/currentdocumentsymbolsrequest.h>
 #include <languageclient/locatorfilter.h>
 
@@ -186,7 +184,6 @@ static LocatorMatcherTask currentDocumentMatcher()
     };
 
     const auto onFilterSetup = [=](Async<void> &async) {
-        async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
         async.setConcurrentCallData(filterCurrentResults, *storage, *resultStorage,
                                     TextDocument::currentTextDocument()->plainText());
     };
diff --git a/src/plugins/clangcodemodel/clangdquickfixes.h b/src/plugins/clangcodemodel/clangdquickfixes.h
index cdd22692667..088fb5e7be7 100644
--- a/src/plugins/clangcodemodel/clangdquickfixes.h
+++ b/src/plugins/clangcodemodel/clangdquickfixes.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <cppeditor/cppquickfix.h>
+#include <cppeditor/quickfixes/cppquickfix.h>
 #include <languageclient/languageclientquickfix.h>
 
 namespace ClangCodeModel {
diff --git a/src/plugins/clangcodemodel/clangdsemantichighlighting.cpp b/src/plugins/clangcodemodel/clangdsemantichighlighting.cpp
index c5bc3d72354..2b52ee4d143 100644
--- a/src/plugins/clangcodemodel/clangdsemantichighlighting.cpp
+++ b/src/plugins/clangcodemodel/clangdsemantichighlighting.cpp
@@ -28,117 +28,19 @@ using namespace TextEditor;
 namespace ClangCodeModel::Internal {
 Q_LOGGING_CATEGORY(clangdLogHighlight, "qtc.clangcodemodel.clangd.highlight", QtWarningMsg);
 
-// clangd reports also the #ifs, #elses and #endifs around the disabled code as disabled,
-// and not even in a consistent manner. We don't want this, so we have to clean up here.
-// But note that we require this behavior, as otherwise we would not be able to grey out
-// e.g. empty lines after an #ifdef, due to the lack of symbols.
-static QList<BlockRange> cleanupDisabledCode(HighlightingResults &results, const QTextDocument *doc,
-                                             const QString &docContent)
-{
-    QList<BlockRange> ifdefedOutRanges;
-    int rangeStartPos = -1;
-    for (auto it = results.begin(); it != results.end();) {
-        const bool wasIfdefedOut = rangeStartPos != -1;
-        const bool isIfDefedOut = it->textStyles.mainStyle == C_DISABLED_CODE;
-        if (!isIfDefedOut) {
-            if (wasIfdefedOut) {
-                const QTextBlock block = doc->findBlockByNumber(it->line - 1);
-                ifdefedOutRanges << BlockRange(rangeStartPos, block.position());
-                rangeStartPos = -1;
-            }
-            ++it;
-            continue;
-        }
-
-        if (!wasIfdefedOut)
-            rangeStartPos = doc->findBlockByNumber(it->line - 1).position();
-
-        // Does the current line contain a potential "ifdefed-out switcher"?
-        // If not, no state change is possible and we continue with the next line.
-        const auto isPreprocessorControlStatement = [&] {
-            const int pos = Utils::Text::positionInText(doc, it->line, it->column);
-            const QStringView content = subViewLen(docContent, pos, it->length).trimmed();
-            if (content.isEmpty() || content.first() != '#')
-                return false;
-            int offset = 1;
-            while (offset < content.size() && content.at(offset).isSpace())
-                ++offset;
-            if (offset == content.size())
-                return false;
-            const QStringView ppDirective = content.mid(offset);
-            return ppDirective.startsWith(QLatin1String("if"))
-                    || ppDirective.startsWith(QLatin1String("elif"))
-                    || ppDirective.startsWith(QLatin1String("else"))
-                    || ppDirective.startsWith(QLatin1String("endif"));
-        };
-        if (!isPreprocessorControlStatement()) {
-            ++it;
-            continue;
-        }
-
-        if (!wasIfdefedOut) {
-            // The #if or #else that starts disabled code should not be disabled.
-            const QTextBlock nextBlock = doc->findBlockByNumber(it->line);
-            rangeStartPos = nextBlock.isValid() ? nextBlock.position() : -1;
-            it = results.erase(it);
-            continue;
-        }
-
-        if (wasIfdefedOut && (it + 1 == results.end()
-                || (it + 1)->textStyles.mainStyle != C_DISABLED_CODE
-                || (it + 1)->line != it->line + 1)) {
-            // The #else or #endif that ends disabled code should not be disabled.
-            const QTextBlock block = doc->findBlockByNumber(it->line - 1);
-            ifdefedOutRanges << BlockRange(rangeStartPos, block.position());
-            rangeStartPos = -1;
-            it = results.erase(it);
-            continue;
-        }
-        ++it;
-    }
-
-    if (rangeStartPos != -1)
-        ifdefedOutRanges << BlockRange(rangeStartPos, doc->characterCount());
-
-    qCDebug(clangdLogHighlight) << "found" << ifdefedOutRanges.size() << "ifdefed-out ranges";
-    if (clangdLogHighlight().isDebugEnabled()) {
-        for (const BlockRange &r : std::as_const(ifdefedOutRanges))
-            qCDebug(clangdLogHighlight) << r.first() << r.last();
-    }
-
-    return ifdefedOutRanges;
-}
-
 class ExtraHighlightingResultsCollector
 {
 public:
-    ExtraHighlightingResultsCollector(QPromise<HighlightingResult> &promise,
-                                      HighlightingResults &results,
-                                      const Utils::FilePath &filePath, const ClangdAstNode &ast,
-                                      const QTextDocument *doc, const QString &docContent,
-                                      const QVersionNumber &clangdVersion);
+    ExtraHighlightingResultsCollector(HighlightingResults &results,
+                                      const Utils::FilePath &filePath,
+                                      const QTextDocument *doc, const QString &docContent);
 
     void collect();
 private:
-    static bool lessThan(const HighlightingResult &r1, const HighlightingResult &r2);
-    static int onlyIndexOf(const QStringView &text, const QStringView &subString, int from = 0);
-    int posForNodeStart(const ClangdAstNode &node) const;
-    int posForNodeEnd(const ClangdAstNode &node) const;
-    void insertResult(const HighlightingResult &result);
-    void insertResult(const ClangdAstNode &node, TextStyle style);
-    void insertAngleBracketInfo(int searchStart1, int searchEnd1, int searchStart2, int searchEnd2);
-    void setResultPosFromRange(HighlightingResult &result, const Range &range);
-    void collectFromNode(const ClangdAstNode &node);
-    void visitNode(const ClangdAstNode&node);
-
-    QPromise<HighlightingResult> &m_promise;
     HighlightingResults &m_results;
     const Utils::FilePath m_filePath;
-    const ClangdAstNode &m_ast;
     const QTextDocument * const m_doc;
     const QString &m_docContent;
-    const int m_clangdVersion;
-    ClangdAstNode::FileStatus m_currentFileStatus = ClangdAstNode::FileStatus::Unknown;
 };
 
 void doSemanticHighlighting(
@@ -146,10 +48,7 @@ void doSemanticHighlighting(
         const Utils::FilePath &filePath,
         const QList<ExpandedSemanticToken> &tokens,
         const QString &docContents,
-        const ClangdAstNode &ast,
-        const QPointer<TextDocument> &textDocument,
         int docRevision,
-        const QVersionNumber &clangdVersion,
         const TaskTimer &taskTimer)
 {
     ThreadedSubtaskTimer t("highlighting", taskTimer);
@@ -157,111 +56,6 @@ void doSemanticHighlighting(
         return;
 
     const QTextDocument doc(docContents);
-    const auto tokenRange = [&doc](const ExpandedSemanticToken &token) {
-        const Position startPos(token.line - 1, token.column - 1);
-        const Position endPos = startPos.withOffset(token.length, &doc);
-        return Range(startPos, endPos);
-    };
-    const int clangdMajorVersion = clangdVersion.majorVersion();
-    const auto isOutputParameter = [&ast, &tokenRange, clangdMajorVersion]
-            (const ExpandedSemanticToken &token) {
-        if (token.modifiers.contains(QLatin1String("usedAsMutableReference")))
-            return true;
-        if (token.modifiers.contains(QLatin1String("usedAsMutablePointer")))
-            return true;
-        if (clangdMajorVersion >= 16)
-            return false;
-        if (token.type != "variable" && token.type != "property" && token.type != "parameter")
-            return false;
-        const Range range = tokenRange(token);
-        const ClangdAstPath path = getAstPath(ast, range);
-        if (path.size() < 2)
-            return false;
-        if (token.type == "property"
-                && (path.rbegin()->kind() == "MemberInitializer"
-                    || path.rbegin()->kind() == "CXXConstruct")) {
-            return false;
-        }
-        if (path.rbegin()->hasConstType())
-            return false;
-        for (auto it = path.rbegin() + 1; it != path.rend(); ++it) {
-            if (it->kind() == "CXXConstruct" || it->kind() == "MemberInitializer")
-                return true;
-
-            if (it->kind() == "Call") {
-                // The first child is e.g. a called lambda or an object on which
-                // the call happens, and should not be highlighted as an output argument.
-                // If the call is not fully resolved (as in templates), we don't
-                // know whether the argument is passed as const or not.
-                if (it->arcanaContains("dependent type"))
-                    return false;
-                const QList<ClangdAstNode> children = it->children().value_or(QList<ClangdAstNode>());
-                return children.isEmpty()
-                        || (children.first().range() != (it - 1)->range()
-                        && children.first().kind() != "UnresolvedLookup");
-            }
-
-            // The token should get marked for e.g. lambdas, but not for assignment operators,
-            // where the user sees that it's being written.
-            if (it->kind() == "CXXOperatorCall") {
-                const QList<ClangdAstNode> children = it->children().value_or(QList<ClangdAstNode>());
-
-                // Child 1 is the call itself, Child 2 is the named entity on which the call happens
-                // (a lambda or a class instance), after that follow the actual call arguments.
-                if (children.size() < 2)
-                    return false;
-
-                // The call itself is never modifiable.
-                if (children.first().range() == range)
-                    return false;
-
-                // The callable is never displayed as an output parameter.
-                // TODO: A good argument can be made to display objects on which a non-const
-                //       operator or function is called as output parameters.
-                if (children.at(1).range().contains(range))
-                    return false;
-
-                QList<ClangdAstNode> firstChildTree{children.first()};
-                while (!firstChildTree.isEmpty()) {
-                    const ClangdAstNode n = firstChildTree.takeFirst();
-                    const QString detail = n.detail().value_or(QString());
-                    if (detail.startsWith("operator")) {
-                        return !detail.contains('=')
-                                && !detail.contains("++") && !detail.contains("--")
-                                && !detail.contains("<<") && !detail.contains(">>")
-                                && !detail.contains("*");
-                    }
-                    firstChildTree << n.children().value_or(QList<ClangdAstNode>());
-                }
-                return true;
-            }
-
-            if (it->kind() == "Lambda")
-                return false;
-            if (it->kind() == "BinaryOperator")
-                return false;
-            if (it->hasConstType())
-                return false;
-
-            if (it->kind() == "CXXMemberCall") {
-                if (it == path.rbegin())
-                    return false;
-                const QList<ClangdAstNode> children = it->children().value_or(QList<ClangdAstNode>());
-                QTC_ASSERT(!children.isEmpty(), return false);
-
-                // The called object is never displayed as an output parameter.
-                // TODO: A good argument can be made to display objects on which a non-const
-                //       operator or function is called as output parameters.
-                return (it - 1)->range() != children.first().range();
-            }
-
-            if (it->kind() == "Member" && it->arcanaContains("(")
-                    && !it->arcanaContains("bound member function type")) {
-                return false;
-            }
-        }
-        return false;
-    };
 
     const std::function<HighlightingResult(const ExpandedSemanticToken &)> toResult
             = [&](const ExpandedSemanticToken &token) {
@@ -278,40 +72,12 @@ void doSemanticHighlighting(
         } else if (token.type == "function" || token.type == "method") {
             styles.mainStyle = token.modifiers.contains(QLatin1String("virtual"))
                     ? C_VIRTUAL_METHOD : C_FUNCTION;
-            if (token.modifiers.contains("definition")) {
+            if (token.modifiers.contains("definition"))
                 styles.mixinStyles.push_back(C_FUNCTION_DEFINITION);
-            } else if (clangdMajorVersion < 16 && ast.isValid()) {
-                const ClangdAstPath path = getAstPath(ast, tokenRange(token));
-                if (path.length() > 1) {
-                    const ClangdAstNode declNode = path.at(path.length() - 2);
-                    if ((declNode.kind() == "Function" || declNode.kind() == "CXXMethod")
-                            && declNode.hasChildWithRole("statement")) {
-                        styles.mixinStyles.push_back(C_FUNCTION_DEFINITION);
-                    }
-                }
-            }
         } else if (token.type == "class") {
             styles.mainStyle = C_TYPE;
-            if (token.modifiers.contains("constructorOrDestructor")) {
+            if (token.modifiers.contains("constructorOrDestructor"))
                 styles.mainStyle = C_FUNCTION;
-            } else if (clangdMajorVersion < 16 && ast.isValid()) {
-                const ClangdAstPath path = getAstPath(ast, tokenRange(token));
-                if (!path.isEmpty()) {
-                    if (path.last().kind() == "CXXConstructor") {
-                        if (!path.last().arcanaContains("implicit"))
-                            styles.mainStyle = C_FUNCTION;
-                    } else if (path.last().kind() == "Record" && path.length() > 1) {
-                        const ClangdAstNode node = path.at(path.length() - 2);
-                        if (node.kind() == "CXXDestructor" && !node.arcanaContains("implicit")) {
-                            styles.mainStyle = C_FUNCTION;
-
-                            // https://github.com/clangd/clangd/issues/872
-                            if (node.role() == "declaration")
-                                styles.mixinStyles.push_back(C_DECLARATION);
-                        }
-                    }
-                }
-            }
         } else if (token.type == "comment") { // "comment" means code disabled via the preprocessor
             styles.mainStyle = C_DISABLED_CODE;
         } else if (token.type == "namespace") {
@@ -384,8 +150,10 @@ void doSemanticHighlighting(
                 styles.mainStyle = C_STATIC_MEMBER;
             }
         }
-        if (isOutputParameter(token))
+        if (token.modifiers.contains(QLatin1String("usedAsMutableReference"))
+            || token.modifiers.contains(QLatin1String("usedAsMutablePointer"))) {
             styles.mixinStyles.push_back(C_OUTPUT_ARGUMENT);
+        }
         return HighlightingResult(token.line, token.column, token.length, styles);
     };
 
@@ -398,24 +166,13 @@ void doSemanticHighlighting(
         }
     };
     auto results = QtConcurrent::blockingMapped<HighlightingResults>(tokens, safeToResult);
-    const bool handleInactiveCode = clangdMajorVersion < 17;
-    QList<BlockRange> ifdefedOutBlocks;
-    if (handleInactiveCode)
-        ifdefedOutBlocks = cleanupDisabledCode(results, &doc, docContents);
-    ExtraHighlightingResultsCollector(promise, results, filePath, ast, &doc, docContents,
-                                      clangdVersion).collect();
+    ExtraHighlightingResultsCollector(results, filePath, &doc, docContents).collect();
     Utils::erase(results, [](const HighlightingResult &res) {
         // QTCREATORBUG-28639
         return res.textStyles.mainStyle == C_TEXT && res.textStyles.mixinStyles.empty();
     });
     if (!promise.isCanceled()) {
         qCInfo(clangdLogHighlight) << "reporting" << results.size() << "highlighting results";
-        if (handleInactiveCode) {
-            QMetaObject::invokeMethod(textDocument, [textDocument, ifdefedOutBlocks, docRevision] {
-                    if (textDocument && textDocument->document()->revision() == docRevision)
-                        textDocument->setIfdefedOutBlocks(ifdefedOutBlocks);
-                }, Qt::QueuedConnection);
-        }
         QList<Range> virtualRanges;
         for (const HighlightingResult &r : results) {
             qCDebug(clangdLogHighlight)
@@ -440,11 +197,11 @@ void doSemanticHighlighting(
 }
 
 ExtraHighlightingResultsCollector::ExtraHighlightingResultsCollector(
-        QPromise<HighlightingResult> &promise, HighlightingResults &results,
-        const Utils::FilePath &filePath, const ClangdAstNode &ast, const QTextDocument *doc,
-        const QString &docContent, const QVersionNumber &clangdVersion)
-    : m_promise(promise), m_results(results), m_filePath(filePath), m_ast(ast), m_doc(doc),
-      m_docContent(docContent), m_clangdVersion(clangdVersion.majorVersion())
+        HighlightingResults &results,
+        const Utils::FilePath &filePath, const QTextDocument *doc,
+        const QString &docContent)
+    : m_results(results), m_filePath(filePath), m_doc(doc),
+      m_docContent(docContent)
 {
 }
 
@@ -469,497 +226,6 @@ void ExtraHighlightingResultsCollector::collect()
         for (const HighlightingResult &newRes : propHighlighter.highlight())
             m_results.insert(++i, newRes);
     }
-
-    if (!m_ast.isValid())
-        return;
-    QTC_ASSERT(m_clangdVersion < 17, return);
-    visitNode(m_ast);
-}
-
-bool ExtraHighlightingResultsCollector::lessThan(const HighlightingResult &r1,
-                                                 const HighlightingResult &r2)
-{
-    return r1.line < r2.line || (r1.line == r2.line && r1.column < r2.column)
-            || (r1.line == r2.line && r1.column == r2.column && r1.length < r2.length);
-}
-
-int ExtraHighlightingResultsCollector::onlyIndexOf(const QStringView &text,
-                                                   const QStringView &subString, int from)
-{
-    const int firstIndex = text.indexOf(subString, from);
-    if (firstIndex == -1)
-        return -1;
-    const int nextIndex = text.indexOf(subString, firstIndex + 1);
-
-    // The second condion deals with the off-by-one error in TemplateSpecialization nodes;
-    // see collectFromNode().
-    return nextIndex == -1 || nextIndex == firstIndex + 1 ? firstIndex : -1;
-}
-
-// Unfortunately, the exact position of a specific token is usually not
-// recorded in the AST, so if we need that, we have to search for it textually.
-// In corner cases, this might get sabotaged by e.g. comments, in which case we give up.
-int ExtraHighlightingResultsCollector::posForNodeStart(const ClangdAstNode &node) const
-{
-    return Utils::Text::positionInText(m_doc, node.range().start().line() + 1,
-                                       node.range().start().character() + 1);
-}
-
-int ExtraHighlightingResultsCollector::posForNodeEnd(const ClangdAstNode &node) const
-{
-    return Utils::Text::positionInText(m_doc, node.range().end().line() + 1,
-                                       node.range().end().character() + 1);
-}
-
-void ExtraHighlightingResultsCollector::insertResult(const HighlightingResult &result)
-{
-    if (!result.isValid()) // Some nodes don't have a range.
-        return;
-    const auto it = std::lower_bound(m_results.begin(), m_results.end(), result, lessThan);
-    if (it == m_results.end() || *it != result) {
-
-        // Prevent inserting expansions for function-like macros. For instance:
-        //     #define TEST() "blubb"
-        //     const char *s = TEST();
-        // The macro name is always shorter than the expansion and starts at the same
-        // location, so it should occur right before the insertion position.
-        if (it > m_results.begin() && (it - 1)->line == result.line
-                && (it - 1)->column == result.column
-                && (it - 1)->textStyles.mainStyle == C_MACRO) {
-            return;
-        }
-
-        // Bogus ranges; e.g. QTCREATORBUG-27601
-        if (it != m_results.end()) {
-            const int nextStartPos = Utils::Text::positionInText(m_doc, it->line, it->column);
-            const int resultEndPos = Utils::Text::positionInText(m_doc, result.line, result.column)
-                    + result.length;
-            if (resultEndPos > nextStartPos)
-                return;
-        }
-
-        qCDebug(clangdLogHighlight) << "adding additional highlighting result"
-                                    << result.line << result.column << result.length;
-        m_results.insert(it, result);
-        return;
-    }
-}
-
-void ExtraHighlightingResultsCollector::insertResult(const ClangdAstNode &node, TextStyle style)
-{
-    HighlightingResult result;
-    result.useTextSyles = true;
-    result.textStyles.mainStyle = style;
-    setResultPosFromRange(result, node.range());
-    insertResult(result);
-    return;
-}
-
-// For matching the "<" and ">" brackets of template declarations, specializations
-// and instantiations.
-void ExtraHighlightingResultsCollector::insertAngleBracketInfo(int searchStart1, int searchEnd1,
-                                                               int searchStart2, int searchEnd2)
-{
-    const int openingAngleBracketPos = onlyIndexOf(
-                subViewEnd(m_docContent, searchStart1, searchEnd1),
-                QStringView(QStringLiteral("<")));
-    if (openingAngleBracketPos == -1)
-        return;
-    const int absOpeningAngleBracketPos = searchStart1 + openingAngleBracketPos;
-    if (absOpeningAngleBracketPos > searchStart2)
-        searchStart2 = absOpeningAngleBracketPos + 1;
-    if (searchStart2 >= searchEnd2)
-        return;
-    const int closingAngleBracketPos = onlyIndexOf(
-                subViewEnd(m_docContent, searchStart2, searchEnd2),
-                QStringView(QStringLiteral(">")));
-    if (closingAngleBracketPos == -1)
-        return;
-
-    const int absClosingAngleBracketPos = searchStart2 + closingAngleBracketPos;
-    if (absOpeningAngleBracketPos > absClosingAngleBracketPos)
-        return;
-
-    HighlightingResult result;
-    result.useTextSyles = true;
-    result.textStyles.mainStyle = C_PUNCTUATION;
-    Utils::Text::convertPosition(m_doc, absOpeningAngleBracketPos, &result.line, &result.column);
-    ++result.column;
-    result.length = 1;
-    result.kind = CppEditor::SemanticHighlighter::AngleBracketOpen;
-    insertResult(result);
-    Utils::Text::convertPosition(m_doc, absClosingAngleBracketPos, &result.line, &result.column);
-    ++result.column;
-    result.kind = CppEditor::SemanticHighlighter::AngleBracketClose;
-    insertResult(result);
-}
-
-void ExtraHighlightingResultsCollector::setResultPosFromRange(HighlightingResult &result,
-                                                              const Range &range)
-{
-    if (!range.isValid())
-        return;
-    const Position startPos = range.start();
-    const Position endPos = range.end();
-    result.line = startPos.line() + 1;
-    result.column = startPos.character() + 1;
-    result.length = endPos.toPositionInDocument(m_doc) - startPos.toPositionInDocument(m_doc);
-}
-
-void ExtraHighlightingResultsCollector::collectFromNode(const ClangdAstNode &node)
-{
-    if (node.kind().endsWith("Literal"))
-        return;
-    if (node.role() == "type" && node.kind() == "Builtin")
-        return;
-
-    if (m_clangdVersion < 16 && node.role() == "attribute"
-            && (node.kind() == "Override" || node.kind() == "Final")) {
-        insertResult(node, C_KEYWORD);
-        return;
-    }
-
-    const bool isExpression = node.role() == "expression";
-    if (m_clangdVersion < 16 && isExpression && node.kind() == "Predefined") {
-        insertResult(node, C_LOCAL);
-        return;
-    }
-
-    const bool isDeclaration = node.role() == "declaration";
-    const int nodeStartPos = posForNodeStart(node);
-    const int nodeEndPos = posForNodeEnd(node);
-    const QList<ClangdAstNode> children = node.children().value_or(QList<ClangdAstNode>());
-
-    // Match question mark and colon in ternary operators.
-    if (m_clangdVersion < 16 && isExpression && node.kind() == "ConditionalOperator") {
-        if (children.size() != 3)
-            return;
-
-        // The question mark is between sub-expressions 1 and 2, the colon is between
-        // sub-expressions 2 and 3.
-        const int searchStartPosQuestionMark = posForNodeEnd(children.first());
-        const int searchEndPosQuestionMark = posForNodeStart(children.at(1));
-        QStringView content = subViewEnd(m_docContent, searchStartPosQuestionMark,
-                                         searchEndPosQuestionMark);
-        const int questionMarkPos = onlyIndexOf(content, QStringView(QStringLiteral("?")));
-        if (questionMarkPos == -1)
-            return;
-        const int searchStartPosColon = posForNodeEnd(children.at(1));
-        const int searchEndPosColon = posForNodeStart(children.at(2));
-        content = subViewEnd(m_docContent, searchStartPosColon, searchEndPosColon);
-        const int colonPos = onlyIndexOf(content, QStringView(QStringLiteral(":")));
-        if (colonPos == -1)
-            return;
-
-        const int absQuestionMarkPos = searchStartPosQuestionMark + questionMarkPos;
-        const int absColonPos = searchStartPosColon + colonPos;
-        if (absQuestionMarkPos > absColonPos)
-            return;
-
-        HighlightingResult result;
-        result.useTextSyles = true;
-        result.textStyles.mainStyle = C_PUNCTUATION;
-        result.textStyles.mixinStyles.push_back(C_OPERATOR);
-        Utils::Text::convertPosition(m_doc, absQuestionMarkPos, &result.line, &result.column);
-        ++result.column;
-        result.length = 1;
-        result.kind = CppEditor::SemanticHighlighter::TernaryIf;
-        insertResult(result);
-        Utils::Text::convertPosition(m_doc, absColonPos, &result.line, &result.column);
-        ++result.column;
-        result.kind = CppEditor::SemanticHighlighter::TernaryElse;
-        insertResult(result);
-        return;
-    }
-
-    if (isDeclaration && (node.kind() == "FunctionTemplate" || node.kind() == "ClassTemplate")) {
-        // The child nodes are the template parameters and and the function or class.
-        // The opening angle bracket is before the first child node, the closing angle
-        // bracket is before the function child node and after the last param node.
-        const QString classOrFunctionKind = QLatin1String(node.kind() == "FunctionTemplate"
-                                                          ? "Function" : "CXXRecord");
-        const auto functionOrClassIt = std::find_if(children.begin(), children.end(),
-                                                    [&classOrFunctionKind](const ClangdAstNode &n) {
-            return n.role() == "declaration" && n.kind() == classOrFunctionKind;
-        });
-        if (functionOrClassIt == children.end() || functionOrClassIt == children.begin())
-            return;
-        const int firstTemplateParamStartPos = posForNodeStart(children.first());
-        const int lastTemplateParamEndPos = posForNodeEnd(*(functionOrClassIt - 1));
-        const int functionOrClassStartPos = posForNodeStart(*functionOrClassIt);
-        insertAngleBracketInfo(nodeStartPos, firstTemplateParamStartPos,
-                               lastTemplateParamEndPos, functionOrClassStartPos);
-        return;
-    }
-
-    const auto isTemplateParamDecl = [](const ClangdAstNode &node) {
-        return node.isTemplateParameterDeclaration();
-    };
-    if (isDeclaration && node.kind() == "TypeAliasTemplate") {
-        // Children are one node of type TypeAlias and the template parameters.
-        // The opening angle bracket is before the first parameter and the closing
-        // angle bracket is after the last parameter.
-        // The TypeAlias node seems to appear first in the AST, even though lexically
-        // is comes after the parameters. We don't rely on the order here.
-        // Note that there is a second pair of angle brackets. That one is part of
-        // a TemplateSpecialization, which is handled further below.
-        const auto firstTemplateParam = std::find_if(children.begin(), children.end(),
-                                                     isTemplateParamDecl);
-        if (firstTemplateParam == children.end())
-            return;
-        const auto lastTemplateParam = std::find_if(children.rbegin(), children.rend(),
-                                                    isTemplateParamDecl);
-        QTC_ASSERT(lastTemplateParam != children.rend(), return);
-        const auto typeAlias = std::find_if(children.begin(), children.end(),
-                [](const ClangdAstNode &n) { return n.kind() == "TypeAlias"; });
-        if (typeAlias == children.end())
-            return;
-
-        const int firstTemplateParamStartPos = posForNodeStart(*firstTemplateParam);
-        const int lastTemplateParamEndPos = posForNodeEnd(*lastTemplateParam);
-        const int searchEndPos = posForNodeStart(*typeAlias);
-        insertAngleBracketInfo(nodeStartPos, firstTemplateParamStartPos,
-                               lastTemplateParamEndPos, searchEndPos);
-        return;
-    }
-
-    if (isDeclaration && node.kind() == "ClassTemplateSpecialization") {
-        // There is one child of kind TemplateSpecialization. The first pair
-        // of angle brackets comes before that.
-        if (children.size() == 1) {
-            const int childNodePos = posForNodeStart(children.first());
-            insertAngleBracketInfo(nodeStartPos, childNodePos, nodeStartPos, childNodePos);
-        }
-        return;
-    }
-
-    if (isDeclaration && node.kind() == "TemplateTemplateParm") {
-        // The child nodes are template arguments and template parameters.
-        // Arguments seem to appear before parameters in the AST, even though they
-        // come after them in the source code. We don't rely on the order here.
-        const auto firstTemplateParam = std::find_if(children.begin(), children.end(),
-                                                     isTemplateParamDecl);
-        if (firstTemplateParam == children.end())
-            return;
-        const auto lastTemplateParam = std::find_if(children.rbegin(), children.rend(),
-                                                    isTemplateParamDecl);
-        QTC_ASSERT(lastTemplateParam != children.rend(), return);
-        const auto templateArg = std::find_if(children.begin(), children.end(),
-                [](const ClangdAstNode &n) { return n.role() == "template argument"; });
-
-        const int firstTemplateParamStartPos = posForNodeStart(*firstTemplateParam);
-        const int lastTemplateParamEndPos = posForNodeEnd(*lastTemplateParam);
-        const int searchEndPos = templateArg == children.end()
-                ? nodeEndPos : posForNodeStart(*templateArg);
-        insertAngleBracketInfo(nodeStartPos, firstTemplateParamStartPos,
-                               lastTemplateParamEndPos, searchEndPos);
-        return;
-    }
-
-    // {static,dynamic,reinterpret}_cast<>().
-    if (isExpression && node.kind().startsWith("CXX") && node.kind().endsWith("Cast")) {
-        // First child is type, second child is expression.
-        // The opening angle bracket is before the first child, the closing angle bracket
-        // is between the two children.
-        if (children.size() == 2) {
-            insertAngleBracketInfo(nodeStartPos, posForNodeStart(children.first()),
-                                   posForNodeEnd(children.first()),
-                                   posForNodeStart(children.last()));
-        }
-        return;
-    }
-
-    if (node.kind() == "TemplateSpecialization") {
-        // First comes the template type, then the template arguments.
-        // The opening angle bracket is before the first template argument,
-        // the closing angle bracket is after the last template argument.
-        // The first child node has no range, so we start searching at the parent node.
-        if (children.size() >= 2) {
-            int searchStart2 = posForNodeEnd(children.last());
-            int searchEnd2 = nodeEndPos;
-
-            // There is a weird off-by-one error on the clang side: If there is a
-            // nested template instantiation *and* there is no space between
-            // the closing angle brackets, then the inner TemplateSpecialization node's range
-            // will extend one character too far, covering the outer's closing angle bracket.
-            // This is what we are correcting for here.
-            // This issue is tracked at https://github.com/clangd/clangd/issues/871.
-            if (searchStart2 == searchEnd2)
-                --searchStart2;
-            insertAngleBracketInfo(nodeStartPos, posForNodeStart(children.at(1)),
-                                   searchStart2, searchEnd2);
-        }
-        return;
-    }
-
-    if (!isExpression && !isDeclaration)
-        return;
-
-    if (m_clangdVersion >= 16)
-        return;
-
-    // Operators, overloaded ones in particular.
-    static const QString operatorPrefix = "operator";
-    QString detail = node.detail().value_or(QString());
-    const bool isCallToNew = node.kind() == "CXXNew";
-    const bool isCallToDelete = node.kind() == "CXXDelete";
-    const auto isProperOperator = [&] {
-        if (isCallToNew || isCallToDelete)
-            return true;
-        if (!detail.startsWith(operatorPrefix))
-            return false;
-        if (detail == operatorPrefix)
-            return false;
-        const QChar nextChar = detail.at(operatorPrefix.length());
-        return !nextChar.isLetterOrNumber() && nextChar != '_';
-    };
-    if (!isProperOperator())
-        return;
-
-    if (!isCallToNew && !isCallToDelete)
-        detail.remove(0, operatorPrefix.length());
-
-    if (node.kind() == "CXXConversion")
-        return;
-
-    HighlightingResult result;
-    result.useTextSyles = true;
-    const bool isOverloaded = isDeclaration || ((!isCallToNew && !isCallToDelete)
-                                                || node.arcanaContains("CXXMethod"));
-    result.textStyles.mainStyle = isCallToNew || isCallToDelete || detail.at(0).isSpace()
-              ? C_KEYWORD : C_PUNCTUATION;
-    result.textStyles.mixinStyles.push_back(C_OPERATOR);
-    if (isOverloaded)
-        result.textStyles.mixinStyles.push_back(C_OVERLOADED_OPERATOR);
-    if (isDeclaration)
-        result.textStyles.mixinStyles.push_back(C_DECLARATION);
-
-    const QStringView nodeText = subViewEnd(m_docContent, nodeStartPos, nodeEndPos);
-
-    if (isCallToNew || isCallToDelete) {
-        result.line = node.range().start().line() + 1;
-        result.column = node.range().start().character() + 1;
-        result.length = isCallToNew ? 3 : 6;
-        insertResult(result);
-        if (node.arcanaContains("array")) {
-            const int openingBracketOffset = nodeText.indexOf('[');
-            if (openingBracketOffset == -1)
-                return;
-            const int closingBracketOffset = nodeText.lastIndexOf(']');
-            if (closingBracketOffset == -1 || closingBracketOffset < openingBracketOffset)
-                return;
-
-            result.textStyles.mainStyle = C_PUNCTUATION;
-            result.length = 1;
-            Utils::Text::convertPosition(m_doc,
-                                         nodeStartPos + openingBracketOffset,
-                                         &result.line, &result.column);
-            ++result.column;
-            insertResult(result);
-            Utils::Text::convertPosition(m_doc,
-                                         nodeStartPos + closingBracketOffset,
-                                         &result.line, &result.column);
-            ++result.column;
-            insertResult(result);
-        }
-        return;
-    }
-
-    if (isExpression && (detail == QLatin1String("()") || detail == QLatin1String("[]"))) {
-        result.line = node.range().start().line() + 1;
-        result.column = node.range().start().character() + 1;
-        result.length = 1;
-        insertResult(result);
-        result.line = node.range().end().line() + 1;
-        result.column = node.range().end().character();
-        insertResult(result);
-        return;
-    }
-
-    const int opStringLen = detail.at(0).isSpace() ? detail.length() - 1 : detail.length();
-
-    // The simple case: Call to operator+, +=, * etc.
-    if (nodeEndPos - nodeStartPos == opStringLen) {
-        setResultPosFromRange(result, node.range());
-        insertResult(result);
-        return;
-    }
-
-    const int prefixOffset = nodeText.indexOf(operatorPrefix);
-    if (prefixOffset == -1)
-        return;
-
-    const bool isArray = detail == "[]";
-    const bool isCall = detail == "()";
-    const bool isArrayNew = detail == " new[]";
-    const bool isArrayDelete = detail == " delete[]";
-    const QStringView searchTerm = isArray || isCall
-            ? QStringView(detail).chopped(1) : isArrayNew || isArrayDelete
-              ? QStringView(detail).chopped(2) : detail;
-    const int opStringOffset = nodeText.indexOf(searchTerm, prefixOffset
-                                                + operatorPrefix.length());
-    if (opStringOffset == -1 || nodeText.indexOf(operatorPrefix, opStringOffset) != -1)
-        return;
-
-    const int opStringOffsetInDoc = nodeStartPos + opStringOffset
-            + detail.length() - opStringLen;
-    Utils::Text::convertPosition(m_doc, opStringOffsetInDoc, &result.line, &result.column);
-    ++result.column;
-    result.length = opStringLen;
-    if (isArray || isCall)
-        result.length = 1;
-    else if (isArrayNew || isArrayDelete)
-        result.length -= 2;
-    if (!isArray && !isCall)
-        insertResult(result);
-    if (!isArray && !isCall && !isArrayNew && !isArrayDelete)
-        return;
-
-    result.textStyles.mainStyle = C_PUNCTUATION;
-    result.length = 1;
-    const int openingParenOffset = nodeText.indexOf(
-                isCall ? '(' : '[', prefixOffset + operatorPrefix.length());
-    if (openingParenOffset == -1)
-        return;
-    const int closingParenOffset = nodeText.indexOf(isCall ? ')' : ']', openingParenOffset + 1);
-    if (closingParenOffset == -1 || closingParenOffset < openingParenOffset)
-        return;
-    Utils::Text::convertPosition(m_doc, nodeStartPos + openingParenOffset,
-                                 &result.line, &result.column);
-    ++result.column;
-    insertResult(result);
-    Utils::Text::convertPosition(m_doc, nodeStartPos + closingParenOffset,
-                                 &result.line, &result.column);
-    ++result.column;
-    insertResult(result);
-}
-
-void ExtraHighlightingResultsCollector::visitNode(const ClangdAstNode &node)
-{
-    if (m_promise.isCanceled())
-        return;
-    const ClangdAstNode::FileStatus prevFileStatus = m_currentFileStatus;
-    m_currentFileStatus = node.fileStatus(m_filePath);
-    if (m_currentFileStatus == ClangdAstNode::FileStatus::Unknown
-            && prevFileStatus != ClangdAstNode::FileStatus::Ours) {
-        m_currentFileStatus = prevFileStatus;
-    }
-    switch (m_currentFileStatus) {
-    case ClangdAstNode::FileStatus::Ours:
-    case ClangdAstNode::FileStatus::Unknown:
-        collectFromNode(node);
-        [[fallthrough]];
-    case ClangdAstNode::FileStatus::Foreign:
-    case ClangCodeModel::Internal::ClangdAstNode::FileStatus::Mixed: {
-        const auto children = node.children();
-        if (!children)
-            return;
-        for (const ClangdAstNode &childNode : *children)
-            visitNode(childNode);
-        break;
-    }
-    }
-    m_currentFileStatus = prevFileStatus;
 }
 
 class InactiveRegionsParams : public JsonObject
diff --git a/src/plugins/clangcodemodel/clangdsemantichighlighting.h b/src/plugins/clangcodemodel/clangdsemantichighlighting.h
index 285ba2323e7..b303f920f38 100644
--- a/src/plugins/clangcodemodel/clangdsemantichighlighting.h
+++ b/src/plugins/clangcodemodel/clangdsemantichighlighting.h
@@ -33,10 +33,7 @@ void doSemanticHighlighting(
         const Utils::FilePath &filePath,
         const QList<LanguageClient::ExpandedSemanticToken> &tokens,
         const QString &docContents,
-        const ClangdAstNode &ast,
-        const QPointer<TextEditor::TextDocument> &textDocument,
         int docRevision,
-        const QVersionNumber &clangdVersion,
         const TaskTimer &taskTimer
         );
 
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
index 83667dde05e..71ed49549df 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
@@ -18,6 +18,8 @@
 
 #include <languageclient/languageclientmanager.h>
 
+#include <projectexplorer/projectmanager.h>
+
 #include <texteditor/fontsettings.h>
 #include <texteditor/texteditor.h>
 #include <texteditor/texteditorconstants.h>
@@ -84,7 +86,12 @@ void ClangEditorDocumentProcessor::forceUpdate(TextEditor::TextDocument *doc)
 {
     if (const auto client = qobject_cast<ClangdClient *>(
             LanguageClient::LanguageClientManager::clientForDocument(doc))) {
-        client->documentContentsChanged(doc, 0, 0, 0);
+        const CppEditor::ClangdSettings settings(
+            CppEditor::ClangdProjectSettings(
+                ProjectExplorer::ProjectManager::projectForFile(doc->filePath()))
+                .settings());
+        if (settings.updateDependentSources())
+            client->documentContentsChanged(doc, 0, 0, 0);
     }
 }
 
diff --git a/src/plugins/clangcodemodel/clangfixitoperation.cpp b/src/plugins/clangcodemodel/clangfixitoperation.cpp
index e173592ec06..802bdd17bbb 100644
--- a/src/plugins/clangcodemodel/clangfixitoperation.cpp
+++ b/src/plugins/clangcodemodel/clangfixitoperation.cpp
@@ -71,10 +71,7 @@ QString ClangFixItOperation::firstRefactoringFileContent_forTestOnly() const
 void ClangFixItOperation::applyFixitsToFile(TextEditor::RefactoringFile &refactoringFile,
         const QList<ClangFixIt> fixIts)
 {
-    const Utils::ChangeSet changeSet = toChangeSet(refactoringFile, fixIts);
-
-    refactoringFile.setChangeSet(changeSet);
-    refactoringFile.apply();
+    refactoringFile.apply(toChangeSet(refactoringFile, fixIts));
 }
 
 Utils::ChangeSet ClangFixItOperation::toChangeSet(
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
index 3cf94e19c7c..f800979eaee 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
@@ -19,7 +19,7 @@
 #include <coreplugin/session.h>
 #include <coreplugin/vcsmanager.h>
 
-#include <cppeditor/cppcodemodelsettings.h>
+#include <cppeditor/clangdsettings.h>
 #include <cppeditor/cppeditorconstants.h>
 #include <cppeditor/cppeditorwidget.h>
 #include <cppeditor/cppfollowsymbolundercursor.h>
@@ -45,6 +45,7 @@
 #include <utils/algorithm.h>
 #include <utils/async.h>
 #include <utils/infobar.h>
+#include <utils/macroexpander.h>
 #include <utils/qtcassert.h>
 
 #include <QApplication>
@@ -424,9 +425,12 @@ void ClangModelManagerSupport::checkUnused(const Link &link, SearchResult *searc
                 CppModelManager::Backend::Builtin)->checkUnused(link, search, callback);
 }
 
-bool ClangModelManagerSupport::usesClangd(const TextEditor::TextDocument *document) const
+std::optional<QVersionNumber> ClangModelManagerSupport::usesClangd(
+    const TextEditor::TextDocument *document) const
 {
-    return clientForFile(document->filePath());
+    if (const auto client = clientForFile(document->filePath()))
+        return client->versionNumber();
+    return {};
 }
 
 BaseEditorDocumentProcessor *ClangModelManagerSupport::createEditorDocumentProcessor(
@@ -453,10 +457,8 @@ void ClangModelManagerSupport::onCurrentEditorChanged(IEditor *editor)
     const FilePath filePath = editor->document()->filePath();
     if (auto processor = ClangEditorDocumentProcessor::get(filePath)) {
         processor->semanticRehighlight();
-        if (const auto client = clientForFile(filePath)) {
+        if (const auto client = clientForFile(filePath))
             client->updateParserConfig(filePath, processor->parserConfig());
-            client->switchIssuePaneEntries(filePath);
-        }
     }
 }
 
@@ -469,17 +471,15 @@ void ClangModelManagerSupport::connectToWidgetsMarkContextMenuRequested(QWidget
     }
 }
 
-static FilePath getJsonDbDir(const Project *project)
+static FilePath getJsonDbDir(Project *project)
 {
-    static const QString dirName(".qtc_clangd");
-    if (!project) {
-        const QString sessionDirName = FileUtils::fileSystemFriendlyName(
-                    SessionManager::activeSession());
-        return ICore::userResourcePath() / dirName / sessionDirName; // TODO: Make configurable?
-    }
-    if (const Target * const target = project->activeTarget()) {
-        if (const BuildConfiguration * const bc = target->activeBuildConfiguration())
-            return bc->buildDirectory() / dirName;
+    if (!project)
+        return ClangdSettings::instance().sessionIndexPath(*globalMacroExpander());
+    if (const Target *const target = project->activeTarget()) {
+        if (const BuildConfiguration *const bc = target->activeBuildConfiguration()) {
+            return ClangdSettings(ClangdProjectSettings(project).settings())
+                .projectIndexPath(*bc->macroExpander());
+        }
     }
     return {};
 }
@@ -540,11 +540,15 @@ void ClangModelManagerSupport::updateLanguageClient(Project *project)
         generatorWatcher->deleteLater();
         if (!isProjectDataUpToDate(project, projectInfo, jsonDbDir))
             return;
-        const GenerateCompilationDbResult result = generatorWatcher->result();
-        if (!result.error.isEmpty()) {
+        if (generatorWatcher->future().resultCount() == 0) {
             MessageManager::writeDisrupting(
-                        Tr::tr("Cannot use clangd: Failed to generate compilation database:\n%1")
-                        .arg(result.error));
+                Tr::tr("Cannot use clangd: Generating compilation database canceled."));
+            return;
+        }
+        const GenerateCompilationDbResult result = generatorWatcher->result();
+        if (!result) {
+            MessageManager::writeDisrupting(Tr::tr("Cannot use clangd: "
+                "Failed to generate compilation database:\n%1").arg(result.error()));
             return;
         }
         Id previousId;
@@ -693,7 +697,7 @@ ClangdClient *ClangModelManagerSupport::clientWithProject(const Project *project
 void ClangModelManagerSupport::updateStaleIndexEntries()
 {
     QHash<FilePath, QDateTime> lastModifiedCache;
-    for (const Project * const project : ProjectManager::projects()) {
+    for (Project * const project : ProjectManager::projects()) {
         const FilePath jsonDbDir = getJsonDbDir(project);
         if (jsonDbDir.isEmpty())
             continue;
@@ -724,8 +728,8 @@ void ClangModelManagerSupport::updateStaleIndexEntries()
             const QDateTime sourceIndexedTime = indexFilesIt->minLastModifiedTime;
 
             bool rescan = false;
-            QSet<FilePath> allIncludes = snapshot.allIncludesForDocument(sourceFile);
-            for (const FilePath &includeFile : qAsConst(allIncludes)) {
+            const QSet<FilePath> allIncludes = snapshot.allIncludesForDocument(sourceFile);
+            for (const FilePath &includeFile : allIncludes) {
                 auto includeFileTimeIt = lastModifiedCache.find(includeFile);
                 if (includeFileTimeIt == lastModifiedCache.end()) {
                     includeFileTimeIt = lastModifiedCache.insert(includeFile,
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.h b/src/plugins/clangcodemodel/clangmodelmanagersupport.h
index 67fc12868cb..f1cb849202b 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.h
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.h
@@ -42,7 +42,7 @@ public:
 
     CppEditor::BaseEditorDocumentProcessor *createEditorDocumentProcessor(
                 TextEditor::TextDocument *baseTextDocument) override;
-    bool usesClangd(const TextEditor::TextDocument *document) const override;
+    std::optional<QVersionNumber> usesClangd(const TextEditor::TextDocument *document) const override;
 
     static QList<LanguageClient::Client *> clientsForOpenProjects();
     static ClangdClient *clientForProject(const ProjectExplorer::Project *project);
diff --git a/src/plugins/clangcodemodel/clangtextmark.cpp b/src/plugins/clangcodemodel/clangtextmark.cpp
index 80e2956021f..c2c8c88801b 100644
--- a/src/plugins/clangcodemodel/clangtextmark.cpp
+++ b/src/plugins/clangcodemodel/clangtextmark.cpp
@@ -12,11 +12,9 @@
 #include <coreplugin/icore.h>
 
 #include <cppeditor/clangdiagnosticconfigsmodel.h>
+#include <cppeditor/clangdsettings.h>
 #include <cppeditor/cppeditorconstants.h>
 #include <cppeditor/cpptoolsreuse.h>
-#include <cppeditor/cppcodemodelsettings.h>
-
-#include <projectexplorer/task.h>
 
 #include <utils/fadingindicator.h>
 #include <utils/qtcassert.h>
@@ -204,34 +202,6 @@ ClangDiagnostic convertDiagnostic(const ClangdDiagnostic &src,
     return target;
 }
 
-Task createTask(const ClangDiagnostic &diagnostic)
-{
-    Task::TaskType taskType = Task::TaskType::Unknown;
-    QIcon icon;
-
-    switch (diagnostic.severity) {
-    case ClangDiagnostic::Severity::Fatal:
-    case ClangDiagnostic::Severity::Error:
-        taskType = Task::TaskType::Error;
-        icon = ::Utils::Icons::CODEMODEL_ERROR.icon();
-        break;
-    case ClangDiagnostic::Severity::Warning:
-        taskType = Task::TaskType::Warning;
-        icon = ::Utils::Icons::CODEMODEL_WARNING.icon();
-        break;
-    default:
-        break;
-    }
-
-    return Task(taskType,
-                diagnosticCategoryPrefixRemoved(diagnostic.text),
-                diagnostic.location.targetFilePath,
-                diagnostic.location.targetLine,
-                Constants::TASK_CATEGORY_DIAGNOSTICS,
-                icon,
-                Task::NoOptions);
-}
-
 } // anonymous namespace
 
 ClangdTextMark::ClangdTextMark(TextEditor::TextDocument *doc,
@@ -258,7 +228,6 @@ ClangdTextMark::ClangdTextMark(TextEditor::TextDocument *doc,
         setLineAnnotation(diagnostic.message());
         setColor(isError ? Theme::CodeModel_Error_TextMarkColor
                          : Theme::CodeModel_Warning_TextMarkColor);
-        client->addTask(createTask(m_diagnostic));
     }
 
     setActionsProvider([diag = m_diagnostic] {
diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp
index a9b19fa2752..02af9d1b82f 100644
--- a/src/plugins/clangcodemodel/clangutils.cpp
+++ b/src/plugins/clangcodemodel/clangutils.cpp
@@ -9,8 +9,8 @@
 #include <coreplugin/idocument.h>
 #include <cppeditor/baseeditordocumentparser.h>
 #include <cppeditor/clangdiagnosticconfigsmodel.h>
+#include <cppeditor/clangdsettings.h>
 #include <cppeditor/compileroptionsbuilder.h>
-#include <cppeditor/cppcodemodelsettings.h>
 #include <cppeditor/cppmodelmanager.h>
 #include <cppeditor/cpptoolsreuse.h>
 #include <cppeditor/editordocumenthandle.h>
@@ -146,27 +146,27 @@ static QJsonObject createFileObject(const FilePath &buildDir,
     return fileObject;
 }
 
-GenerateCompilationDbResult generateCompilationDB(QList<ProjectInfo::ConstPtr> projectInfoList,
-                                                  FilePath baseDir,
-                                                  CompilationDbPurpose purpose,
-                                                  ClangDiagnosticConfig warningsConfig,
-                                                  QStringList projectOptions,
-                                                  FilePath clangIncludeDir)
+void generateCompilationDB(
+    QPromise<expected_str<FilePath>> &promise,
+    const QList<ProjectInfo::ConstPtr> &projectInfoList,
+    const FilePath &baseDir,
+    CompilationDbPurpose purpose,
+    const ClangDiagnosticConfig &warningsConfig,
+    const QStringList &projectOptions,
+    const FilePath &clangIncludeDir)
 {
-    QTC_ASSERT(!baseDir.isEmpty(), return GenerateCompilationDbResult(QString(),
-        Tr::tr("Could not retrieve build directory.")));
-    QTC_ASSERT(!projectInfoList.isEmpty(),
-               return GenerateCompilationDbResult(QString(), "Could not retrieve project info."));
+    QTC_ASSERT(!baseDir.isEmpty(),
+        promise.addResult(make_unexpected(Tr::tr("Could not retrieve build directory."))); return);
     QTC_CHECK(baseDir.ensureWritableDir());
     QFile compileCommandsFile(baseDir.pathAppended("compile_commands.json").toFSPathString());
     const bool fileOpened = compileCommandsFile.open(QIODevice::WriteOnly | QIODevice::Truncate);
     if (!fileOpened) {
-        return GenerateCompilationDbResult(QString(), Tr::tr("Could not create \"%1\": %2")
-                    .arg(compileCommandsFile.fileName(), compileCommandsFile.errorString()));
+        promise.addResult(make_unexpected(Tr::tr("Could not create \"%1\": %2")
+            .arg(compileCommandsFile.fileName(), compileCommandsFile.errorString())));
+        return;
     }
     compileCommandsFile.write("[");
 
-    const UsePrecompiledHeaders usePch = getPchUsage();
     const QJsonArray jsonProjectOptions = QJsonArray::fromStringList(projectOptions);
     for (const ProjectInfo::ConstPtr &projectInfo : std::as_const(projectInfoList)) {
         QTC_ASSERT(projectInfo, continue);
@@ -183,9 +183,17 @@ GenerateCompilationDbResult generateCompilationDB(QList<ProjectInfo::ConstPtr> p
                                                    jsonProjectOptions);
             }
             for (const ProjectFile &projFile : projectPart->files) {
-                const QJsonObject json = createFileObject(baseDir, args, *projectPart, projFile,
-                                                          purpose, ppOptions, usePch,
-                                                          optionsBuilder.isClStyle());
+                if (promise.isCanceled())
+                    return;
+                const QJsonObject json
+                    = createFileObject(baseDir,
+                                       args,
+                                       *projectPart,
+                                       projFile,
+                                       purpose,
+                                       ppOptions,
+                                       projectInfo->settings().usePrecompiledHeaders(),
+                                       optionsBuilder.isClStyle());
                 if (compileCommandsFile.size() > 1)
                     compileCommandsFile.write(",");
                 compileCommandsFile.write(QJsonDocument(json).toJson(QJsonDocument::Compact));
@@ -195,7 +203,7 @@ GenerateCompilationDbResult generateCompilationDB(QList<ProjectInfo::ConstPtr> p
 
     compileCommandsFile.write("]");
     compileCommandsFile.close();
-    return GenerateCompilationDbResult(compileCommandsFile.fileName(), QString());
+    promise.addResult(FilePath::fromUserInput(compileCommandsFile.fileName()));
 }
 
 FilePath currentCppEditorDocumentFilePath()
@@ -257,7 +265,6 @@ QString DiagnosticTextInfo::clazyCheckName(const QString &option)
     return option;
 }
 
-
 QJsonArray clangOptionsForFile(const ProjectFile &file, const ProjectPart &projectPart,
                                const QJsonArray &generalOptions, UsePrecompiledHeaders usePch,
                                bool clStyle)
diff --git a/src/plugins/clangcodemodel/clangutils.h b/src/plugins/clangcodemodel/clangutils.h
index 6b99be52e6d..d78dab72311 100644
--- a/src/plugins/clangcodemodel/clangutils.h
+++ b/src/plugins/clangcodemodel/clangutils.h
@@ -53,23 +53,16 @@ Utils::FilePath currentCppEditorDocumentFilePath();
 
 QString diagnosticCategoryPrefixRemoved(const QString &text);
 
-class GenerateCompilationDbResult
-{
-public:
-    GenerateCompilationDbResult() = default;
-    GenerateCompilationDbResult(const QString &filePath, const QString &error)
-        : filePath(filePath), error(error)
-    {}
-
-    QString filePath;
-    QString error;
-};
-
+using GenerateCompilationDbResult = Utils::expected_str<Utils::FilePath>;
 enum class CompilationDbPurpose { Project, CodeModel };
-GenerateCompilationDbResult generateCompilationDB(QList<CppEditor::ProjectInfo::ConstPtr> projectInfo,
-        Utils::FilePath baseDir, CompilationDbPurpose purpose,
-        CppEditor::ClangDiagnosticConfig warningsConfig, QStringList projectOptions,
-        Utils::FilePath clangIncludeDir);
+void generateCompilationDB(
+    QPromise<GenerateCompilationDbResult> &promise,
+    const QList<CppEditor::ProjectInfo::ConstPtr> &projectInfoList,
+    const Utils::FilePath &baseDir,
+    CompilationDbPurpose purpose,
+    const CppEditor::ClangDiagnosticConfig &warningsConfig,
+    const QStringList &projectOptions,
+    const Utils::FilePath &clangIncludeDir);
 
 class DiagnosticTextInfo
 {
diff --git a/src/plugins/clangcodemodel/test/clangdtests.cpp b/src/plugins/clangcodemodel/test/clangdtests.cpp
index d4dd092b837..84a155b5353 100644
--- a/src/plugins/clangcodemodel/test/clangdtests.cpp
+++ b/src/plugins/clangcodemodel/test/clangdtests.cpp
@@ -249,7 +249,7 @@ private:
 void ClangdTestFindReferences::initTestCase()
 {
     ClangdTest::initTestCase();
-    CppEditor::codeModelSettings()->setCategorizeFindReferences(true);
+    CppEditor::CppCodeModelSettings::setCategorizeFindReferences(true);
     connect(client(), &ClangdClient::foundReferences, this,
             [this](const SearchResultItems &results) {
         if (results.isEmpty())
@@ -1107,8 +1107,7 @@ void ClangdTestHighlighting::test_data()
     QTest::newRow("call to function pointer alias") << 344 << 5 << 344 << 13
         << QList<int>{C_TYPE} << 0;
     QTest::newRow("friend class declaration") << 350 << 18 << 350 << 27
-        << (client()->versionNumber().majorVersion() >= 16
-            ? QList<int>{C_TYPE, C_DECLARATION}: QList<int>{C_TYPE}) << 0;
+        << QList<int>{C_TYPE, C_DECLARATION} << 0;
     QTest::newRow("friend class reference") << 351 << 34 << 351 << 43
         << QList<int>{C_TYPE} << 0;
     QTest::newRow("function parameter of friend class type") << 351 << 45 << 351 << 50
@@ -1374,10 +1373,6 @@ void ClangdTestHighlighting::test_data()
         << QList<int>{C_PUNCTUATION} << int(CppEditor::SemanticHighlighter::AngleBracketClose);
     QTest::newRow("macro in struct") << 795 << 9 << 795 << 14
         << QList<int>{C_MACRO, C_DECLARATION} << 0;
-    if (client()->versionNumber() < QVersionNumber(17)) {
-        QTest::newRow("#ifdef'ed out code") << 800 << 1 << 800 << 17
-                                            << QList<int>{C_DISABLED_CODE} << 0;
-    }
     QTest::newRow("static function call (object)") << 819 << 5 << 819 << 6
         << QList<int>{C_LOCAL} << 0;
     QTest::newRow("static function call (argument)") << 819 << 18 << 819 << 19
@@ -2240,6 +2235,8 @@ public:
     ClangdTestIndirectChanges();
 
 private slots:
+    void initTestCase() override;
+    void cleanupTestCase();
     void test();
 };
 
@@ -2249,6 +2246,20 @@ ClangdTestIndirectChanges::ClangdTestIndirectChanges()
     setSourceFileNames({"main.cpp", "directheader.h", "indirectheader.h", "unrelatedheader.h"});
 }
 
+void ClangdTestIndirectChanges::initTestCase()
+{
+    CppEditor::ClangdSettings &settings = CppEditor::ClangdSettings::instance();
+    CppEditor::ClangdSettings::Data settingsData = settings.data();
+    settingsData.updateDependentSources = true;
+    settings.setData(settingsData, false);
+    ClangdTest::initTestCase();
+}
+
+void ClangdTestIndirectChanges::cleanupTestCase()
+{
+    CppEditor::ClangdSettings::instance().setData({}, false);
+}
+
 void ClangdTestIndirectChanges::test()
 {
     // Initially, everything is fine.
diff --git a/src/plugins/clangformat/ClangFormat.json.in b/src/plugins/clangformat/ClangFormat.json.in
index c444af0fcd6..d845aff6d18 100644
--- a/src/plugins/clangformat/ClangFormat.json.in
+++ b/src/plugins/clangformat/ClangFormat.json.in
@@ -13,7 +13,10 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "C++",
-    "Description" : "clang-format indentation plugin.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Indent and format C++ code.",
+    "LongDescription" : [
+            "ClangFormat is an alternative for the built-in indenter."
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/clangformat/clangformatbaseindenter.cpp b/src/plugins/clangformat/clangformatbaseindenter.cpp
index b491bd293f1..ee89619225c 100644
--- a/src/plugins/clangformat/clangformatbaseindenter.cpp
+++ b/src/plugins/clangformat/clangformatbaseindenter.cpp
@@ -34,6 +34,8 @@ using namespace std::chrono_literals;
 
 namespace ClangFormat {
 
+Q_LOGGING_CATEGORY(clangIndenterLog, "qtc.dbg.clangformat", QtWarningMsg)
+
 enum class ReplacementsToKeep { OnlyIndent, IndentAndBefore, All };
 
 static Internal::LlvmFileSystemAdapter llvmFileSystemAdapter = {};
@@ -166,6 +168,7 @@ enum class CharacterContext {
     LastAfterComma,
     NewStatementOrContinuation,
     IfOrElseWithoutScope,
+    BracketAfterFunctionCall,
     Unknown
 };
 
@@ -207,6 +210,21 @@ static bool comesDirectlyAfterIf(const QTextDocument *doc, int pos)
     return pos > 0 && doc->characterAt(pos) == 'f' && doc->characterAt(pos - 1) == 'i';
 }
 
+static bool startsWithKeyWord(const QString &keyWord, const QString &text)
+{
+    if (text.size() <= keyWord.size())
+        return false;
+
+    const QChar chAfter = text.at(keyWord.size());
+    return text.startsWith(keyWord) && !chAfter.isDigit() && !chAfter.isLetter() && chAfter != '_';
+}
+
+static bool startsWithKeyWords(const QString &text)
+{
+    return startsWithKeyWord("if", text) || startsWithKeyWord("while", text)
+           || startsWithKeyWord("for", text);
+}
+
 static CharacterContext characterContext(const QTextBlock &currentBlock)
 {
     QTextBlock previousNonEmptyBlock = reverseFindLastEmptyBlock(currentBlock);
@@ -217,6 +235,11 @@ static CharacterContext characterContext(const QTextBlock &currentBlock)
     if (prevLineText.isEmpty())
         return CharacterContext::NewStatementOrContinuation;
 
+    const QString currentBlockText = currentBlock.text().trimmed();
+    if ((currentBlockText.isEmpty() || currentBlockText.endsWith(")"))
+        && prevLineText.endsWith("{") && !startsWithKeyWords(currentBlockText))
+        return CharacterContext::BracketAfterFunctionCall;
+
     const QChar firstNonWhitespaceChar = findFirstNonWhitespaceCharacter(currentBlock);
     if (prevLineText.endsWith(',')) {
         if (firstNonWhitespaceChar == '}') {
@@ -266,6 +289,8 @@ static QByteArray dummyTextForContext(CharacterContext context, bool closingBrac
         return "a";
     case CharacterContext::IfOrElseWithoutScope:
         return ";";
+    case CharacterContext::BracketAfterFunctionCall:
+        return ";";
     case CharacterContext::NewStatementOrContinuation:
         return "/*//*/";
     case CharacterContext::Unknown:
@@ -296,6 +321,8 @@ static int forceIndentWithExtraText(QByteArray &buffer,
     int firstNonWhitespace = Utils::indexOf(blockText,
                                             [](const QChar &ch) { return !ch.isSpace(); });
     int utf8Offset = Text::utf8NthLineOffset(block.document(), buffer, block.blockNumber() + 1);
+    int utf8EndOfLineOffset = utf8Offset + blockText.length();
+
     if (firstNonWhitespace >= 0)
         utf8Offset += firstNonWhitespace;
     else
@@ -312,7 +339,9 @@ static int forceIndentWithExtraText(QByteArray &buffer,
         && nextBlockExistsAndEmpty(block)) {
         // If the next line is also empty it's safer to use a comment line.
         dummyText = "//";
-    } else if (firstNonWhitespace < 0 || closingParenBlock || closingBraceBlock) {
+    } else if (
+        firstNonWhitespace < 0 || closingParenBlock || closingBraceBlock
+        || charContext == CharacterContext::BracketAfterFunctionCall) {
         dummyText = dummyTextForContext(charContext, closingBraceBlock);
     }
 
@@ -327,6 +356,13 @@ static int forceIndentWithExtraText(QByteArray &buffer,
             extraLength += 3;
         }
     }
+
+    if (charContext == CharacterContext::BracketAfterFunctionCall) {
+        buffer.insert(utf8EndOfLineOffset + extraLength, dummyText);
+        extraLength += dummyText.length();
+        return extraLength;
+    }
+
     buffer.insert(utf8Offset + extraLength, dummyText);
     extraLength += dummyText.length();
 
@@ -551,6 +587,37 @@ ClangFormatBaseIndenter::~ClangFormatBaseIndenter()
     delete d;
 }
 
+static void printBuffer(QString str)
+{
+    for (const auto &line : str.split("\n")) {
+        qCDebug(clangIndenterLog) << line;
+    }
+}
+
+static void printDebugInfo(
+    const QByteArray &buffer,
+    clang::tooling::Replacements replacements,
+    const QString &additionalInfo)
+{
+    if (!clangIndenterLog().isInfoEnabled())
+        return;
+
+    QString str = QString::fromStdString(buffer.data());
+
+    if (replacements.empty()) {
+        std::string code = buffer.data();
+        llvm::Expected<std::string> code_new
+            = clang::tooling::applyAllReplacements(code, replacements);
+        if (!code_new)
+            return;
+
+        str = QString::fromStdString(code_new.get());
+    }
+    qCDebug(clangIndenterLog) << additionalInfo << str;
+
+    printBuffer(str);
+}
+
 ChangeSet ClangFormatBaseIndenterPrivate::replacements(QByteArray buffer,
                                                        const QTextBlock &startBlock,
                                                        const QTextBlock &endBlock,
@@ -584,6 +651,8 @@ ChangeSet ClangFormatBaseIndenterPrivate::replacements(QByteArray buffer,
         }
     }
 
+    printDebugInfo(buffer, {}, "before");
+
     if (replacementsToKeep != ReplacementsToKeep::IndentAndBefore || utf8Offset < rangeStart)
         rangeStart = utf8Offset;
 
@@ -594,6 +663,8 @@ ChangeSet ClangFormatBaseIndenterPrivate::replacements(QByteArray buffer,
     clang::tooling::Replacements clangReplacements = clang::format::reformat(
         style, buffer.data(), ranges, m_fileName->toFSPathString().toStdString(), &status);
 
+    printDebugInfo(buffer, clangReplacements, "after");
+
     clang::tooling::Replacements filtered;
     if (status.FormatComplete) {
         filtered = filteredReplacements(buffer,
@@ -602,6 +673,9 @@ ChangeSet ClangFormatBaseIndenterPrivate::replacements(QByteArray buffer,
                                         utf8Length,
                                         replacementsToKeep);
     }
+
+    printDebugInfo(buffer, filtered, "filtered");
+
     const bool canTryAgain = replacementsToKeep == ReplacementsToKeep::OnlyIndent
                              && typedChar == QChar::Null && !secondTry;
     if (canTryAgain && filtered.empty()) {
@@ -648,7 +722,7 @@ EditOperations ClangFormatBaseIndenter::format(const RangesInLines &rangesInLine
                                                                                  assumedFileName);
     auto changedCode = clang::tooling::applyAllReplacements(buffer.data(), clangReplacements);
     QTC_ASSERT(changedCode, {
-        qDebug() << QString::fromStdString(llvm::toString(changedCode.takeError()));
+        qCDebug(clangIndenterLog) << QString::fromStdString(llvm::toString(changedCode.takeError()));
         return {};
     });
     ranges = clang::tooling::calculateRangesAfterReplacements(clangReplacements, ranges);
@@ -724,12 +798,15 @@ void ClangFormatBaseIndenterPrivate::indent(const QTextCursor &cursor,
                                             const QChar &typedChar,
                                             int cursorPositionInEditor)
 {
+    const QString blockText = cursor.block().text().trimmed();
     if (cursor.hasSelection()) {
         indentBlocks(m_doc->findBlock(cursor.selectionStart()),
                      m_doc->findBlock(cursor.selectionEnd()),
                      typedChar,
                      cursorPositionInEditor);
-    } else {
+    } else if (
+        typedChar == QChar::Null || blockText.startsWith(typedChar) || blockText.endsWith(typedChar)
+        || blockText.isEmpty()) {
         indentBlocks(cursor.block(), cursor.block(), typedChar, cursorPositionInEditor);
     }
 }
@@ -884,12 +961,8 @@ const clang::format::FormatStyle &ClangFormatBaseIndenterPrivate::styleForFile()
         return m_cachedStyle.style;
     }
 
-    llvm::Expected<clang::format::FormatStyle> styleFromProjectFolder
-        = clang::format::getStyle("file",
-                                  m_fileName->toFSPathString().toStdString(),
-                                  "none",
-                                  "",
-                                  &llvmFileSystemAdapter);
+    llvm::Expected<clang::format::FormatStyle> styleFromProjectFolder = clang::format::getStyle(
+        "file", m_fileName->toFSPathString().toStdString(), "none", "", &llvmFileSystemAdapter, true);
 
     if (styleFromProjectFolder && !(*styleFromProjectFolder == clang::format::getNoStyle())) {
         addQtcStatementMacros(*styleFromProjectFolder);
diff --git a/src/plugins/clangformat/clangformatbaseindenter.h b/src/plugins/clangformat/clangformatbaseindenter.h
index cb8041cf439..e6512f78621 100644
--- a/src/plugins/clangformat/clangformatbaseindenter.h
+++ b/src/plugins/clangformat/clangformatbaseindenter.h
@@ -5,10 +5,14 @@
 
 #include <texteditor/indenter.h>
 
+#include <QLoggingCategory>
+
 namespace clang::format { struct FormatStyle; }
 
 namespace ClangFormat {
 
+Q_DECLARE_LOGGING_CATEGORY(clangIndenterLog)
+
 class ClangFormatBaseIndenter : public TextEditor::Indenter
 {
 public:
diff --git a/src/plugins/clangformat/clangformatconfigwidget.cpp b/src/plugins/clangformat/clangformatconfigwidget.cpp
index e9f49a5eeec..418769cbf12 100644
--- a/src/plugins/clangformat/clangformatconfigwidget.cpp
+++ b/src/plugins/clangformat/clangformatconfigwidget.cpp
@@ -214,7 +214,7 @@ void ClangFormatConfigWidget::initEditor(TextEditor::ICodeStylePreferences *code
             return;
         }
         m_clangFileIsCorrectText->show();
-        m_clangFileIsCorrectText->setText(Tr::tr("Warning: ") + success.error());
+        m_clangFileIsCorrectText->setText(Tr::tr("Warning:") + " " + success.error());
         m_clangFileIsCorrectText->setType(Utils::InfoLabel::Warning);
     });
 
@@ -326,28 +326,8 @@ void ClangFormatConfigWidget::apply()
     if (!m_editorWidget->isEnabled())
         return;
 
-    clang::format::FormatStyle currentSettingsStyle;
-    const Utils::expected_str<void> success
-        = parseConfigurationContent(m_editor->document()->contents().toStdString(),
-                                    currentSettingsStyle);
-
-    auto saveSettings = [this] {
-        QString errorString;
-        m_editor->document()->save(&errorString, m_config->filePath());
-    };
-
-    if (success) {
-        saveSettings();
-        return;
-    }
-
-    QMessageBox mBox;
-    mBox.setText(Tr::tr("The current ClangFormat (C++ > Code Style > ClangFormat) settings are not "
-                        "valid. Are you sure you want to apply them?"));
-    mBox.setStandardButtons(QMessageBox::No | QMessageBox::Yes);
-    mBox.setDefaultButton(QMessageBox::No);
-    if (mBox.exec() == QMessageBox::Yes)
-        saveSettings();
+    QString errorString;
+    m_editor->document()->save(&errorString, m_config->filePath());
 }
 
 TextEditor::CodeStyleEditorWidget *createClangFormatConfigWidget(
diff --git a/src/plugins/clangformat/clangformatglobalconfigwidget.cpp b/src/plugins/clangformat/clangformatglobalconfigwidget.cpp
index 4dc344601d7..052ed865151 100644
--- a/src/plugins/clangformat/clangformatglobalconfigwidget.cpp
+++ b/src/plugins/clangformat/clangformatglobalconfigwidget.cpp
@@ -26,6 +26,7 @@
 
 #include <QCheckBox>
 #include <QComboBox>
+#include <QGroupBox>
 #include <QLabel>
 #include <QSpinBox>
 
@@ -106,9 +107,10 @@ ClangFormatGlobalConfigWidget::ClangFormatGlobalConfigWidget(ICodeStylePreferenc
 
     QWidget *globalSettingsGroupBoxWidget = nullptr;
 
+    // clang-format off
     Group globalSettingsGroupBox {
         bindTo(&globalSettingsGroupBoxWidget),
-        title(Tr::tr("ClangFormat settings:")),
+        title(Tr::tr("ClangFormat Settings")),
         Column {
             m_useGlobalSettings,
             Form {
@@ -127,6 +129,7 @@ ClangFormatGlobalConfigWidget::ClangFormatGlobalConfigWidget(ICodeStylePreferenc
         globalSettingsGroupBox,
         noMargin
     }.attachTo(this);
+    // clang-format on
 
     initCheckBoxes();
     initIndentationOrFormattingCombobox();
@@ -253,8 +256,8 @@ void ClangFormatGlobalConfigWidget::initCurrentProjectLabel()
 
 bool ClangFormatGlobalConfigWidget::projectClangFormatFileExists()
 {
-    llvm::Expected<clang::format::FormatStyle> styleFromProjectFolder
-        = clang::format::getStyle("file", m_project->projectFilePath().path().toStdString(), "none");
+    llvm::Expected<clang::format::FormatStyle> styleFromProjectFolder = clang::format::getStyle(
+        "file", m_project->projectFilePath().path().toStdString(), "none", "", nullptr, true);
 
     return styleFromProjectFolder && !(*styleFromProjectFolder == clang::format::getNoStyle());
 }
diff --git a/src/plugins/clangformat/clangformatindenter.cpp b/src/plugins/clangformat/clangformatindenter.cpp
index 95d847150f0..fc213da18ce 100644
--- a/src/plugins/clangformat/clangformatindenter.cpp
+++ b/src/plugins/clangformat/clangformatindenter.cpp
@@ -33,7 +33,7 @@ namespace ClangFormat {
 
 static bool isBeautifierPluginActivated()
 {
-    const QVector<ExtensionSystem::PluginSpec *> specs = ExtensionSystem::PluginManager::plugins();
+    const ExtensionSystem::PluginSpecs specs = ExtensionSystem::PluginManager::plugins();
     return std::find_if(specs.begin(),
                         specs.end(),
                         [](ExtensionSystem::PluginSpec *spec) {
diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp
index 747c30c2a57..7beb062a45e 100644
--- a/src/plugins/clangformat/clangformatutils.cpp
+++ b/src/plugins/clangformat/clangformatutils.cpp
@@ -22,6 +22,7 @@
 #include <utils/expected.h>
 
 #include <QCryptographicHash>
+#include <QLoggingCategory>
 
 using namespace clang;
 using namespace format;
@@ -346,6 +347,7 @@ void addQtcStatementMacros(clang::format::FormatStyle &style)
                                                     "Q_GADGET",
                                                     "Q_GADGET_EXPORT",
                                                     "Q_INTERFACES",
+                                                    "Q_LOGGING_CATEGORY",
                                                     "Q_MOC_INCLUDE",
                                                     "Q_NAMESPACE",
                                                     "Q_NAMESPACE_EXPORT",
@@ -392,7 +394,8 @@ Utils::FilePath filePathToCurrentSettings(const TextEditor::ICodeStylePreference
 
 static QString s_errorMessage;
 Utils::expected_str<void> parseConfigurationContent(const std::string &fileContent,
-                                                    clang::format::FormatStyle &style)
+                                                    clang::format::FormatStyle &style,
+                                                    bool allowUnknownOptions)
 {
     auto diagHandler = [](const llvm::SMDiagnostic &diag, void * /*context*/) {
         s_errorMessage = QString::fromStdString(diag.getMessage().str()) + " "
@@ -401,11 +404,12 @@ Utils::expected_str<void> parseConfigurationContent(const std::string &fileConte
     };
 
     style.Language = clang::format::FormatStyle::LK_Cpp;
-    const std::error_code error = parseConfiguration(llvm::MemoryBufferRef(fileContent, "YAML"),
-                                                     &style,
-                                                     false,
-                                                     diagHandler,
-                                                     nullptr);
+    const std::error_code error = parseConfiguration(
+        llvm::MemoryBufferRef(fileContent, "YAML"),
+        &style,
+        allowUnknownOptions,
+        diagHandler,
+        nullptr);
 
     if (error)
         return make_unexpected(s_errorMessage);
@@ -416,7 +420,7 @@ Utils::expected_str<void> parseConfigurationFile(const Utils::FilePath &filePath
                                                  clang::format::FormatStyle &style)
 {
     return parseConfigurationContent(filePath.fileContents().value_or(QByteArray()).toStdString(),
-                                     style);
+                                     style, true);
 }
 
 } // namespace ClangFormat
diff --git a/src/plugins/clangformat/clangformatutils.h b/src/plugins/clangformat/clangformatutils.h
index 019414b11f5..bea4cdb8cb8 100644
--- a/src/plugins/clangformat/clangformatutils.h
+++ b/src/plugins/clangformat/clangformatutils.h
@@ -49,7 +49,8 @@ clang::format::FormatStyle currentQtStyle(const TextEditor::ICodeStylePreference
 Utils::FilePath filePathToCurrentSettings(const TextEditor::ICodeStylePreferences *codeStyle);
 
 Utils::expected_str<void> parseConfigurationContent(const std::string &fileContent,
-                                                    clang::format::FormatStyle &style);
+                                                    clang::format::FormatStyle &style,
+                                                    bool allowUnknownOptions = false);
 Utils::expected_str<void> parseConfigurationFile(const Utils::FilePath &filePath,
                                                  clang::format::FormatStyle &style);
 
diff --git a/src/plugins/clangformat/tests/clangformat-test.cpp b/src/plugins/clangformat/tests/clangformat-test.cpp
index 51f78f90aff..6e7cdd367be 100644
--- a/src/plugins/clangformat/tests/clangformat-test.cpp
+++ b/src/plugins/clangformat/tests/clangformat-test.cpp
@@ -111,6 +111,13 @@ private slots:
     void testIndentFunctionArgumentOnNewLine();
     void testIndentCommentOnNewLine();
     void testUtf8SymbolLine();
+    void testFunctionCallClosingParenthesis();
+    void testFunctionCallClosingParenthesisEmptyLine();
+    void testNoIndentationInMiddleOfLine();
+    void testIndentationInMiddleOfLine();
+    void testIndentationInTheBegginingOfLine();
+    void testIndentationReturnAfterIf();
+    void testIndentationReturnAfterIfSomthingFunction();
 
 private:
     void insertLines(const std::vector<QString> &lines);
@@ -833,6 +840,165 @@ void ClangFormatTest::testUtf8SymbolLine()
                                    "}"}));
 }
 
+void ClangFormatTest::testFunctionCallClosingParenthesis()
+{
+    insertLines(
+        {"class X {",
+         "public:",
+         "    QString add() const;",
+         "    QString sub() const;",
+         "};",
+         "",
+         "QString X::add() const",
+         "{",
+         "    return QString()",
+         "}",
+         "",
+         "QString X::sub() const",
+         "{}"});
+    m_indenter->indentBlock(m_doc->findBlockByNumber(8), ')', TextEditor::TabSettings());
+    QCOMPARE(
+        documentLines(),
+        (std::vector<QString>{
+            "class X {",
+            "public:",
+            "    QString add() const;",
+            "    QString sub() const;",
+            "};",
+            "",
+            "QString X::add() const",
+            "{",
+            "    return QString()",
+            "}",
+            "",
+            "QString X::sub() const",
+            "{}",
+        }));
+}
+
+void ClangFormatTest::testFunctionCallClosingParenthesisEmptyLine()
+{
+    insertLines(
+        {"class X {",
+         "public:",
+         "    QString add() const;",
+         "    QString sub() const;",
+         "};",
+         "",
+         "QString X::add() const",
+         "{",
+         "",
+         "    return QString()",
+         "}",
+         "",
+         "QString X::sub() const",
+         "{}"});
+    m_indenter->indentBlock(m_doc->findBlockByNumber(8), QChar::Null, TextEditor::TabSettings());
+    QCOMPARE(
+        documentLines(),
+        (std::vector<QString>{
+                              "class X {",
+                              "public:",
+                              "    QString add() const;",
+                              "    QString sub() const;",
+                              "};",
+                              "",
+                              "QString X::add() const",
+                              "{",
+                              "    ",
+                              "    return QString()",
+                              "}",
+                              "",
+                              "QString X::sub() const",
+                              "{}",
+                              }));
+}
+
+void ClangFormatTest::testNoIndentationInMiddleOfLine()
+{
+    insertLines({"int main()",
+                 "{",
+                 "    S s = {.i = 1}, .l = 2, .f = 3, .d = 4};",
+                 "    return 0;",
+                 "}"});
+    m_cursor->setPosition(30);
+    m_extendedIndenter->indent(*m_cursor, '}', TextEditor::TabSettings(), 30);
+    QCOMPARE(documentLines(),
+             (std::vector<QString>{"int main()",
+                                   "{",
+                                   "    S s = {.i = 1}, .l = 2, .f = 3, .d = 4};",
+                                   "    return 0;",
+                                   "}"}));
+}
+
+void ClangFormatTest::testIndentationInMiddleOfLine()
+{
+    insertLines({"int main()",
+                 "{",
+                 "    S s = {.i = 1,",
+                 ".l = 2, .f = 3, .d = 4};",
+                 "    return 0;",
+                 "}"});
+    m_cursor->setPosition(32);
+    m_extendedIndenter->indent(*m_cursor, QChar::Null, TextEditor::TabSettings(), 32);
+    QCOMPARE(documentLines(),
+             (std::vector<QString>{"int main()",
+                                   "{",
+                                   "    S s = {.i = 1,",
+                                   "           .l = 2, .f = 3, .d = 4};",
+                                   "    return 0;",
+                                   "}"}));
+}
+
+void ClangFormatTest::testIndentationInTheBegginingOfLine()
+{
+    insertLines({"int main()",
+                 "{",
+                 "    if () {",
+                 "          } else",
+                 "}"});
+    m_cursor->setPosition(35);
+    m_extendedIndenter->indent(*m_cursor, '}', TextEditor::TabSettings(), 35);
+    QCOMPARE(documentLines(),
+             (std::vector<QString>{"int main()",
+                                   "{",
+                                   "    if () {",
+                                   "    } else",
+                                   "}"}));
+}
+
+void ClangFormatTest::testIndentationReturnAfterIf()
+{
+    insertLines({"int main()",
+                 "{",
+                 "    if (true)",
+                 "    return 0;",
+                 "}"});
+    m_indenter->indent(*m_cursor, QChar::Null, TextEditor::TabSettings());
+    QCOMPARE(documentLines(),
+             (std::vector<QString>{"int main()",
+                                   "{",
+                                   "    if (true)",
+                                   "        return 0;",
+                                   "}"}));
+}
+
+void ClangFormatTest::testIndentationReturnAfterIfSomthingFunction()
+{
+    insertLines({"int main()",
+                 "{",
+                 "    if_somthing()",
+                 "    return 0;",
+                 "}"});
+    m_indenter->indent(*m_cursor, QChar::Null, TextEditor::TabSettings());
+    QCOMPARE(documentLines(),
+             (std::vector<QString>{"int main()",
+                                   "{",
+                                   "    if_somthing()",
+                                   "    return 0;",
+                                   "}"}));
+}
+
 QObject *createClangFormatTest()
 {
     return new ClangFormatTest;
diff --git a/src/plugins/clangtools/CMakeLists.txt b/src/plugins/clangtools/CMakeLists.txt
index c74b4702682..72b4dedd7cc 100644
--- a/src/plugins/clangtools/CMakeLists.txt
+++ b/src/plugins/clangtools/CMakeLists.txt
@@ -38,6 +38,7 @@ add_qtc_plugin(ClangTools
     documentquickfixfactory.cpp documentquickfixfactory.h
     executableinfo.cpp executableinfo.h
     filterdialog.cpp filterdialog.h
+    inlinesuppresseddiagnostics.cpp inlinesuppresseddiagnostics.h
     runsettingswidget.cpp runsettingswidget.h
     settingswidget.cpp settingswidget.h
     virtualfilesystemoverlay.cpp virtualfilesystemoverlay.h
diff --git a/src/plugins/clangtools/ClangTools.json.in b/src/plugins/clangtools/ClangTools.json.in
index d6d1280c404..a8c9c6d9ae7 100644
--- a/src/plugins/clangtools/ClangTools.json.in
+++ b/src/plugins/clangtools/ClangTools.json.in
@@ -13,7 +13,12 @@
                   "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."
     ],
     "Category" : "Code Analyzer",
-    "Description" : "ClangTools Plugin.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Find problems in C, C++, and Objective-C source code.",
+    "LongDescription" : [
+        "Use Clang Tools for static code analysis:",
+            "- Clang-Tidy has diagnostics and fixes for typical programming errors, such as style violations or interface misuse.",
+            "- Clazy helps Clang understand Qt semantics. It displays Qt related compiler warnings, ranging from unnecessary memory allocation to misuse of API and has refactoring actions for fixing some of the issues."
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/clangtools/clangfileinfo.h b/src/plugins/clangtools/clangfileinfo.h
index e9a71511607..bc54de3dc20 100644
--- a/src/plugins/clangtools/clangfileinfo.h
+++ b/src/plugins/clangtools/clangfileinfo.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <cppeditor/cppcodemodelsettings.h>
 #include <cppeditor/cppprojectfile.h>
 #include <cppeditor/projectpart.h>
 
@@ -19,9 +20,11 @@ public:
     FileInfo() = default;
     FileInfo(Utils::FilePath file,
              CppEditor::ProjectFile::Kind kind,
+             const CppEditor::CppCodeModelSettings &settings,
              CppEditor::ProjectPart::ConstPtr projectPart)
         : file(std::move(file))
         , kind(kind)
+        , settings(settings)
         , projectPart(projectPart)
     {}
 
@@ -31,6 +34,7 @@ public:
 
     Utils::FilePath file;
     CppEditor::ProjectFile::Kind kind;
+    CppEditor::CppCodeModelSettings settings;
     CppEditor::ProjectPart::ConstPtr projectPart;
 };
 using FileInfos = std::vector<FileInfo>;
diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp
index 15635fc2514..20ba1328cb5 100644
--- a/src/plugins/clangtools/clangtool.cpp
+++ b/src/plugins/clangtools/clangtool.cpp
@@ -136,8 +136,8 @@ public:
         setLayout(layout);
 
         QPalette pal;
-        pal.setColor(QPalette::Window, Utils::creatorTheme()->color(Theme::InfoBarBackground));
-        pal.setColor(QPalette::WindowText, Utils::creatorTheme()->color(Theme::InfoBarText));
+        pal.setColor(QPalette::Window, Utils::creatorColor(Theme::InfoBarBackground));
+        pal.setColor(QPalette::WindowText, Utils::creatorColor(Theme::InfoBarText));
         setPalette(pal);
 
         setAutoFillBackground(true);
@@ -277,7 +277,7 @@ public:
         diagnosticItem->setFixitOperations(replacements);
     }
 
-    void apply(ClangToolsDiagnosticModel *model)
+    void apply()
     {
         for (auto it = m_refactoringFileInfos.begin(); it != m_refactoringFileInfos.end(); ++it) {
             RefactoringFileInfo &fileInfo = it.value();
@@ -318,14 +318,12 @@ public:
             QVector<DiagnosticItem *> itemsInvalidated;
 
             fileInfo.file.setReplacements(ops);
-            model->removeWatchedPath(ops.first()->filePath);
             if (fileInfo.file.apply()) {
                 itemsApplied = itemsScheduled;
             } else {
                 itemsFailedToApply = itemsScheduled;
                 itemsInvalidated = itemsSchedulable;
             }
-            model->addWatchedPath(ops.first()->filePath);
 
             // Update DiagnosticItem state
             for (DiagnosticItem *diagnosticItem : std::as_const(itemsScheduled))
@@ -341,7 +339,8 @@ private:
     QMap<FilePath, RefactoringFileInfo> m_refactoringFileInfos;
 };
 
-static FileInfos sortedFileInfos(const QVector<ProjectPart::ConstPtr> &projectParts)
+static FileInfos sortedFileInfos(const CppCodeModelSettings &settings,
+                                 const QVector<ProjectPart::ConstPtr> &projectParts)
 {
     FileInfos fileInfos;
 
@@ -359,7 +358,7 @@ static FileInfos sortedFileInfos(const QVector<ProjectPart::ConstPtr> &projectPa
             if (file.active && (ProjectFile::isSource(file.kind)
                                 || ProjectFile::isHeader(file.kind))) {
                 ProjectFile::Kind sourceKind = ProjectFile::sourceKind(file.kind);
-                fileInfos.emplace_back(file.path, sourceKind, projectPart);
+                fileInfos.emplace_back(file.path, sourceKind, settings, projectPart);
             }
         }
     }
@@ -393,7 +392,7 @@ ClangTool::ClangTool(const QString &name, Id id, ClangToolType type)
     : m_name(name), m_perspective{id.toString(), name}, m_type(type)
 {
     setObjectName(name);
-    m_diagnosticModel = new ClangToolsDiagnosticModel(this);
+    m_diagnosticModel = new ClangToolsDiagnosticModel(type, this);
 
     auto action = new QAction(Tr::tr("Analyze Project with %1...").arg(name), this);
     action->setIcon(Utils::Icons::RUN_SELECTED_TOOLBAR.icon());
@@ -475,11 +474,10 @@ ClangTool::ClangTool(const QString &name, Id id, ClangToolType type)
 
     // Expand/Collapse
     action = new QAction(this);
-    action->setDisabled(true);
     action->setCheckable(true);
     action->setIcon(Utils::Icons::EXPAND_ALL_TOOLBAR.icon());
-    action->setToolTip(Tr::tr("Expand All"));
-    connect(action, &QAction::toggled, this, [this](bool checked){
+    m_expandCollapse = action;
+    const auto handleCollapseExpandToggled = [this](bool checked){
         if (checked) {
             m_expandCollapse->setToolTip(Tr::tr("Collapse All"));
             m_diagnosticView->expandAll();
@@ -487,8 +485,9 @@ ClangTool::ClangTool(const QString &name, Id id, ClangToolType type)
             m_expandCollapse->setToolTip(Tr::tr("Expand All"));
             m_diagnosticView->collapseAll();
         }
-    });
-    m_expandCollapse = action;
+    };
+    connect(action, &QAction::toggled, this, handleCollapseExpandToggled);
+    handleCollapseExpandToggled(action->isChecked());
 
     // Filter button
     action = m_showFilter = new QAction(this);
@@ -534,7 +533,7 @@ ClangTool::ClangTool(const QString &name, Id id, ClangToolType type)
             diagnosticItems += item;
         });
 
-        ApplyFixIts(diagnosticItems).apply(m_diagnosticModel);
+        ApplyFixIts(diagnosticItems).apply();
     });
 
     // Open Project Settings
@@ -901,7 +900,8 @@ FileInfos ClangTool::collectFileInfos(Project *project, FileSelection fileSelect
     const auto projectInfo = CppModelManager::projectInfo(project);
     QTC_ASSERT(projectInfo, return FileInfos());
 
-    const FileInfos allFileInfos = sortedFileInfos(projectInfo->projectParts());
+    const FileInfos allFileInfos = sortedFileInfos(projectInfo->settings(),
+                                                   projectInfo->projectParts());
 
     if (selectionType && *selectionType == FileSelectionType::AllFiles)
         return allFileInfos;
@@ -1242,8 +1242,32 @@ QSet<Diagnostic> ClangTool::diagnostics() const
 
 void ClangTool::onNewDiagnosticsAvailable(const Diagnostics &diagnostics, bool generateMarks)
 {
-    QTC_ASSERT(m_diagnosticModel, return);
+    const int oldLevel1RowCount = m_diagnosticModel->rowCount();
+    const auto getOldLastLevel1Index = [&] {
+        return m_diagnosticModel->index(oldLevel1RowCount - 1, 0);
+    };
+    const auto getLevel2RowCountForOldLastLevel1Index = [&] {
+        return oldLevel1RowCount == 0 ? -1 : m_diagnosticModel->rowCount(getOldLastLevel1Index());
+    };
+    const int oldLevel2RowCount = getLevel2RowCountForOldLastLevel1Index();
     m_diagnosticModel->addDiagnostics(diagnostics, generateMarks);
+    if (!m_expandCollapse->isChecked())
+        return;
+
+    // Now expand newly added items, both in existing file nodes and in newly added ones.
+    // We assume diagnostics arrive "in order", i.e. things are only ever added at the end
+    // (in the source model).
+    const int newLevel2RowCount = getLevel2RowCountForOldLastLevel1Index();
+    for (int i = oldLevel2RowCount; i < newLevel2RowCount; ++i) {
+        m_diagnosticView->expand(m_diagnosticFilterModel->mapFromSource(
+            m_diagnosticModel
+                ->index(i, 0, m_diagnosticFilterModel->mapFromSource(getOldLastLevel1Index()))));
+    }
+    const int newLevel1RowCount = m_diagnosticFilterModel->rowCount();
+    for (int i = oldLevel1RowCount; i < newLevel1RowCount; ++i) {
+        m_diagnosticView->expandRecursively(
+            m_diagnosticFilterModel->mapFromSource(m_diagnosticModel->index(i, 0)));
+    }
 }
 
 void ClangTool::updateForCurrentState()
@@ -1273,7 +1297,6 @@ void ClangTool::updateForCurrentState()
     m_goBack->setEnabled(issuesVisible > 0);
     m_goNext->setEnabled(issuesVisible > 0);
     m_clear->setEnabled(!isRunning);
-    m_expandCollapse->setEnabled(issuesVisible);
     m_loadExported->setEnabled(!isRunning);
     m_showFilter->setEnabled(issuesFound > 1);
 
diff --git a/src/plugins/clangtools/clangtoolrunner.cpp b/src/plugins/clangtools/clangtoolrunner.cpp
index 46fdf7c2730..08858a0498e 100644
--- a/src/plugins/clangtools/clangtoolrunner.cpp
+++ b/src/plugins/clangtools/clangtoolrunner.cpp
@@ -10,11 +10,11 @@
 #include <coreplugin/icore.h>
 
 #include <cppeditor/clangdiagnosticconfigsmodel.h>
+#include <cppeditor/compileroptionsbuilder.h>
+#include <cppeditor/cppcodemodelsettings.h>
 #include <cppeditor/cppprojectfile.h>
 #include <cppeditor/cpptoolsreuse.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/async.h>
 #include <utils/qtcprocess.h>
 #include <utils/qtcassert.h>
@@ -25,7 +25,6 @@
 #include <QFileInfo>
 #include <QLoggingCategory>
 
-
 static Q_LOGGING_CATEGORY(LOG, "qtc.clangtools.runner", QtWarningMsg)
 
 using namespace CppEditor;
@@ -49,7 +48,9 @@ AnalyzeUnit::AnalyzeUnit(const FileInfo &fileInfo,
                                           actualClangIncludeDir);
     file = fileInfo.file;
     arguments = extraClangToolsPrependOptions();
-    arguments.append(optionsBuilder.build(fileInfo.kind, CppEditor::getPchUsage()));
+    arguments.append(
+        optionsBuilder.build(fileInfo.kind,
+                             CppCodeModelSettings(fileInfo.settings).usePrecompiledHeaders()));
     arguments.append(extraClangToolsAppendOptions());
 }
 
@@ -161,13 +162,9 @@ GroupItem clangToolTask(const AnalyzeUnits &units,
         process.setWorkingDirectory(input.outputDirPath); // Current clang-cl puts log file into working dir.
 
         const ClangToolStorage &data = *storage;
-
-        const QStringList args = checksArguments(unit, input)
-                                 + mainToolArguments(data)
-                                 + QStringList{"--"}
-                                 + clangArguments(unit, input);
-        const CommandLine commandLine = {data.executable, args};
-
+        const CommandLine commandLine{data.executable, {checksArguments(unit, input),
+                                                        mainToolArguments(data), "--",
+                                                        clangArguments(unit, input)}};
         qCDebug(LOG).noquote() << "Starting" << commandLine.toUserOutput();
         process.setCommand(commandLine);
     };
@@ -206,7 +203,6 @@ GroupItem clangToolTask(const AnalyzeUnits &units,
         data.setConcurrentCallData(&parseDiagnostics,
                                    storage->outputFilePath,
                                    input.diagnosticsFilter);
-        data.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
     };
     const auto onReadDone = [storage, input, outputHandler, iterator](
                                 const Async<expected_str<Diagnostics>> &data, DoneWith result) {
diff --git a/src/plugins/clangtools/clangtools.qbs b/src/plugins/clangtools/clangtools.qbs
index 6afa5d026b1..bfbdaa177c7 100644
--- a/src/plugins/clangtools/clangtools.qbs
+++ b/src/plugins/clangtools/clangtools.qbs
@@ -32,7 +32,8 @@ QtcPlugin {
         "clangtool.h",
         "clangtoolrunner.cpp",
         "clangtoolrunner.h",
-        "clangtools_global.h", "clangtoolstr.h",
+        "clangtools_global.h",
+        "clangtoolstr.h",
         "clangtoolsconstants.h",
         "clangtoolsdiagnostic.cpp",
         "clangtoolsdiagnostic.h",
@@ -64,6 +65,8 @@ QtcPlugin {
         "executableinfo.h",
         "filterdialog.cpp",
         "filterdialog.h",
+        "inlinesuppresseddiagnostics.cpp",
+        "inlinesuppresseddiagnostics.h",
         "runsettingswidget.cpp",
         "runsettingswidget.h",
         "settingswidget.cpp",
diff --git a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
index 5445ce5491a..f4d03bed48b 100644
--- a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
+++ b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
@@ -8,6 +8,7 @@
 #include "clangtoolstr.h"
 #include "clangtoolsutils.h"
 #include "diagnosticmark.h"
+#include "inlinesuppresseddiagnostics.h"
 
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectmanager.h>
@@ -62,9 +63,10 @@ private:
     const int m_index = 0;
 };
 
-ClangToolsDiagnosticModel::ClangToolsDiagnosticModel(QObject *parent)
+ClangToolsDiagnosticModel::ClangToolsDiagnosticModel(CppEditor::ClangToolType type, QObject *parent)
     : ClangToolsDiagnosticModelBase(parent)
     , m_filesWatcher(std::make_unique<Utils::FileSystemWatcher>())
+    , m_type(type)
 {
     setRootItem(new Utils::StaticTreeItem(QString()));
     connectFileWatcher();
@@ -180,6 +182,17 @@ void ClangToolsDiagnosticModel::addWatchedPath(const Utils::FilePath &path)
     m_filesWatcher->addFile(path, Utils::FileSystemWatcher::WatchAllChanges);
 }
 
+std::unique_ptr<InlineSuppressedDiagnostics> ClangToolsDiagnosticModel::createInlineSuppressedDiagnostics()
+{
+    switch (m_type) {
+    case CppEditor::ClangToolType::Tidy:
+        return std::make_unique<InlineSuppressedClangTidyDiagnostics>();
+    case CppEditor::ClangToolType::Clazy:
+        return std::make_unique<InlineSuppressedClazyDiagnostics>();
+    }
+    QTC_ASSERT(false, return {});
+}
+
 static QString lineColumnString(const Debugger::DiagnosticLocation &location)
 {
     return QString("%1:%2").arg(QString::number(location.line), QString::number(location.column));
@@ -336,6 +349,18 @@ QVariant DiagnosticItem::data(int column, int role) const
                 return true;
             }
             break;
+        case ClangToolsDiagnosticModel::InlineSuppressableRole:
+            switch (m_fixitStatus) {
+            case FixitStatus::Applied:
+            case FixitStatus::FailedToApply:
+            case FixitStatus::Invalidated:
+                return false;
+            case FixitStatus::Scheduled:
+            case FixitStatus::NotAvailable:
+            case FixitStatus::NotScheduled:
+                return true;
+            }
+            break;
         case Qt::CheckStateRole: {
             switch (m_fixitStatus) {
             case FixitStatus::NotAvailable:
diff --git a/src/plugins/clangtools/clangtoolsdiagnosticmodel.h b/src/plugins/clangtools/clangtoolsdiagnosticmodel.h
index cf1a08aab16..e9a8998957b 100644
--- a/src/plugins/clangtools/clangtoolsdiagnosticmodel.h
+++ b/src/plugins/clangtools/clangtoolsdiagnosticmodel.h
@@ -29,6 +29,7 @@ namespace ClangTools {
 namespace Internal {
 
 class ClangToolsDiagnosticModel;
+class InlineSuppressedDiagnostics;
 
 class FilePathItem : public Utils::TreeItem
 {
@@ -90,7 +91,7 @@ class ClangToolsDiagnosticModel : public ClangToolsDiagnosticModelBase
     friend class DiagnosticItem;
 
 public:
-    ClangToolsDiagnosticModel(QObject *parent = nullptr);
+    ClangToolsDiagnosticModel(CppEditor::ClangToolType type, QObject *parent = nullptr);
 
     void addDiagnostics(const Diagnostics &diagnostics, bool generateMarks);
     QSet<Diagnostic> diagnostics() const;
@@ -100,6 +101,7 @@ public:
         TextRole,
         CheckBoxEnabledRole,
         DocumentationUrlRole,
+        InlineSuppressableRole,
     };
 
     QSet<QString> allChecks() const;
@@ -108,6 +110,8 @@ public:
     void removeWatchedPath(const Utils::FilePath &path);
     void addWatchedPath(const Utils::FilePath &path);
 
+    std::unique_ptr<InlineSuppressedDiagnostics> createInlineSuppressedDiagnostics();
+
 signals:
     void fixitStatusChanged(const QModelIndex &index, FixitStatus oldStatus, FixitStatus newStatus);
 
@@ -122,6 +126,7 @@ private:
     QSet<Diagnostic> m_diagnostics;
     std::map<QVector<ExplainingStep>, QVector<DiagnosticItem *>> stepsToItemsCache;
     std::unique_ptr<Utils::FileSystemWatcher> m_filesWatcher;
+    const CppEditor::ClangToolType m_type;
 };
 
 class FilterOptions {
diff --git a/src/plugins/clangtools/clangtoolsdiagnosticview.cpp b/src/plugins/clangtools/clangtoolsdiagnosticview.cpp
index ed264b603d8..47d891ae3bc 100644
--- a/src/plugins/clangtools/clangtoolsdiagnosticview.cpp
+++ b/src/plugins/clangtools/clangtoolsdiagnosticview.cpp
@@ -9,10 +9,14 @@
 #include "clangtoolstr.h"
 #include "clangtoolsutils.h"
 #include "diagnosticconfigswidget.h"
+#include "inlinesuppresseddiagnostics.h"
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/manhattanstyle.h>
 
+#include <cppeditor/cppmodelmanager.h>
+#include <cppeditor/cpprefactoringchanges.h>
+
 #include <debugger/analyzer/diagnosticlocation.h>
 
 #include <utils/algorithm.h>
@@ -24,6 +28,7 @@
 #include <QAction>
 #include <QApplication>
 #include <QDebug>
+#include <QHash>
 #include <QHeaderView>
 #include <QPainter>
 #include <QSet>
@@ -151,6 +156,10 @@ DiagnosticView::DiagnosticView(QWidget *parent)
     connect(m_suppressAction, &QAction::triggered,
             this, &DiagnosticView::suppressCurrentDiagnostic);
 
+    m_suppressInlineAction = new QAction(this);
+    connect(m_suppressInlineAction, &QAction::triggered,
+            this, &DiagnosticView::suppressCurrentDiagnosticInline);
+
     m_disableChecksAction = new QAction(this);
     connect(m_disableChecksAction, &QAction::triggered,
             this, &DiagnosticView::disableCheckForCurrentDiagnostic);
@@ -217,6 +226,100 @@ void DiagnosticView::suppressCurrentDiagnostic()
         filterModel->addSuppressedDiagnostics(diags);
 }
 
+void DiagnosticView::suppressCurrentDiagnosticInline()
+{
+    const QModelIndexList indexes = selectionModel()->selectedRows();
+
+    QHash<Utils::FilePath, QHash<int, QStringList>> diagnosticsPerFileAndLine;
+    SuppressedDiagnosticsList diags;
+    for (const QModelIndex &index : indexes) {
+        const Diagnostic diag = model()->data(index, ClangToolsDiagnosticModel::DiagnosticRole)
+                                    .value<Diagnostic>();
+        if (!diag.isValid())
+            continue;
+        const bool isApplicable
+            = model()->data(index, ClangToolsDiagnosticModel::InlineSuppressableRole).value<bool>();
+        if (!isApplicable)
+            continue;
+
+        diagnosticsPerFileAndLine[diag.location.filePath][diag.location.line] << diag.name;
+        diags << diag;
+    }
+
+    if (diags.isEmpty())
+        return;
+
+    const auto filterModel = static_cast<DiagnosticFilterModel *>(model());
+    const auto sourceModel = static_cast<ClangToolsDiagnosticModel *>(filterModel->sourceModel());
+    CppRefactoringChanges changes(CppModelManager::snapshot());
+
+    for (auto it = diagnosticsPerFileAndLine.cbegin(); it != diagnosticsPerFileAndLine.cend(); ++it) {
+        const CppRefactoringFilePtr refactoringFile = changes.cppFile(it.key());
+        Utils::ChangeSet changeSet;
+
+        for (auto it2 = it.value().cbegin(); it2 != it.value().cend(); ++it2) {
+            const int line = it2.key();
+            const QStringList diagNames = it2.value();
+            const auto suppressedDiags = sourceModel->createInlineSuppressedDiagnostics();
+            const QList<CPlusPlus::Token> tokensForLine = refactoringFile->tokensForLine(line);
+            int replaceStart = -1;
+            int replaceEnd = -1;
+            int insertStart = -1;
+            QString prefix;
+            QString suffix;
+            const QTextDocument * const doc = refactoringFile->document();
+            if (!tokensForLine.isEmpty() && tokensForLine.last().isComment()) {
+                CPlusPlus::Token trailingComment = tokensForLine.last();
+                CPlusPlus::TranslationUnit * const tu
+                    = refactoringFile->cppDocument()->translationUnit();
+                const int tokenStart = tu->getTokenPositionInDocument(trailingComment, doc);
+                const int tokenEnd = tu->getTokenEndPositionInDocument(trailingComment, doc);
+                suppressedDiags->fromString(refactoringFile->textOf(tokenStart, tokenEnd));
+                if (suppressedDiags->hasError())
+                    continue;
+                if (suppressedDiags->parsedStartOffset() != -1) {
+                    // There was a comment, and it already contained a suppression list.
+                    replaceStart = tokenStart + suppressedDiags->parsedStartOffset();
+                    replaceEnd = tokenStart + suppressedDiags->parsedEndOffset();
+                } else {
+                    // There was a comment without a suppression list.
+                    prefix = " ";
+                    switch (trailingComment.kind()) {
+                    case CPlusPlus::T_CPP_COMMENT:
+                    case CPlusPlus::T_CPP_DOXY_COMMENT:
+                        insertStart = tokenEnd;
+                        break;
+                    case CPlusPlus::T_COMMENT:
+                    case CPlusPlus::T_DOXY_COMMENT:
+                        insertStart = tokenEnd - 2;
+                        suffix = " ";
+                        break;
+                    default:
+                        QTC_CHECK(false);
+                    }
+                }
+            } else {
+                // There was no comment.
+                const QTextBlock b = doc->findBlockByNumber(line - 1);
+                insertStart = b.position() + b.length() - 1;
+                prefix = " // ";
+            }
+            for (const QString &diagName : diagNames)
+                suppressedDiags->addDiagnostic(diagName);
+            const QString newText = prefix + suppressedDiags->toString() + suffix;
+            if (replaceStart != -1) {
+                changeSet.replace(replaceStart, replaceEnd, newText);
+            } else {
+                QTC_CHECK(insertStart != -1);
+                changeSet.insert(insertStart, newText);
+            }
+        }
+        refactoringFile->apply(changeSet);
+    }
+
+    filterModel->addSuppressedDiagnostics(diags);
+}
+
 void DiagnosticView::disableCheckForCurrentDiagnostic()
 {
     std::set<QString> handledNames;
@@ -335,6 +438,9 @@ QList<QAction *> DiagnosticView::customActions() const
     m_suppressAction->setEnabled(isDiagnosticItem || hasMultiSelection);
     m_suppressAction->setText(hasMultiSelection ? Tr::tr("Suppress Selected Diagnostics")
                                                 : Tr::tr("Suppress This Diagnostic"));
+    m_suppressInlineAction->setEnabled(isDiagnosticItem || hasMultiSelection);
+    m_suppressInlineAction->setText(hasMultiSelection ? Tr::tr("Suppress Selected Diagnostics Inline")
+                                                      : Tr::tr("Suppress This Diagnostic Inline"));
     m_disableChecksAction->setEnabled(disableChecksEnabled());
     m_disableChecksAction->setText(hasMultiSelection ? Tr::tr("Disable These Checks")
                                                      : Tr::tr("Disable This Check"));
@@ -348,6 +454,7 @@ QList<QAction *> DiagnosticView::customActions() const
         m_filterOutCurrentKind,
         m_separator2,
         m_suppressAction,
+        m_suppressInlineAction,
         m_disableChecksAction
     };
 }
diff --git a/src/plugins/clangtools/clangtoolsdiagnosticview.h b/src/plugins/clangtools/clangtoolsdiagnosticview.h
index e0cdba95481..8bebd0cf5f3 100644
--- a/src/plugins/clangtools/clangtoolsdiagnosticview.h
+++ b/src/plugins/clangtools/clangtoolsdiagnosticview.h
@@ -39,6 +39,7 @@ private:
 
     void openEditorForCurrentIndex();
     void suppressCurrentDiagnostic();
+    void suppressCurrentDiagnosticInline();
     void disableCheckForCurrentDiagnostic();
     enum Direction { Next = 1, Previous = -1 };
     QModelIndex getIndex(const QModelIndex &index, Direction direction) const;
@@ -54,6 +55,7 @@ private:
     QAction *m_filterOutCurrentKind = nullptr;
 
     QAction *m_suppressAction = nullptr;
+    QAction *m_suppressInlineAction = nullptr;
     QAction *m_disableChecksAction = nullptr;
 
     QAction *m_separator = nullptr;
diff --git a/src/plugins/clangtools/clangtoolsplugin.cpp b/src/plugins/clangtools/clangtoolsplugin.cpp
index 26e6539e1f3..d0cea985b51 100644
--- a/src/plugins/clangtools/clangtoolsplugin.cpp
+++ b/src/plugins/clangtools/clangtoolsplugin.cpp
@@ -12,9 +12,10 @@
 #include "settingswidget.h"
 
 #ifdef WITH_TESTS
-#include "readexporteddiagnosticstest.h"
 #include "clangtoolspreconfiguredsessiontests.h"
 #include "clangtoolsunittests.h"
+#include "inlinesuppresseddiagnostics.h"
+#include "readexporteddiagnosticstest.h"
 #endif
 
 #include <utils/icon.h>
@@ -102,6 +103,7 @@ void ClangToolsPlugin::initialize()
             &ClangToolsPlugin::onCurrentEditorChanged);
 
 #ifdef WITH_TESTS
+    addTestCreator(createInlineSuppressedDiagnosticsTest);
     addTest<PreconfiguredSessionTests>();
     addTest<ClangToolsUnitTests>();
     addTest<ReadExportedDiagnosticsTest>();
diff --git a/src/plugins/clangtools/clangtoolssettings.cpp b/src/plugins/clangtools/clangtoolssettings.cpp
index 6699be10bdc..0441e93d6c8 100644
--- a/src/plugins/clangtools/clangtoolssettings.cpp
+++ b/src/plugins/clangtools/clangtoolssettings.cpp
@@ -28,7 +28,6 @@ const char parallelJobsKey[] = "ParallelJobs";
 const char preferConfigFileKey[] = "PreferConfigFile";
 const char buildBeforeAnalysisKey[] = "BuildBeforeAnalysis";
 const char analyzeOpenFilesKey[] = "AnalyzeOpenFiles";
-const char oldDiagnosticConfigIdKey[] = "diagnosticConfigId";
 
 static Id defaultDiagnosticId()
 {
@@ -98,82 +97,35 @@ ClangToolsSettings::ClangToolsSettings()
     setSettingsGroup(Constants::SETTINGS_ID);
 
     clangTidyExecutable.setSettingsKey("ClangTidyExecutable");
-
     clazyStandaloneExecutable.setSettingsKey("ClazyStandaloneExecutable");
 
+    enableLowerClazyLevels.setSettingsKey("EnableLowerClazyLevels");
+    enableLowerClazyLevels.setDefaultValue(true);
+
     readSettings();
 }
 
-static Store convertToMapFromVersionBefore410(QtcSettings *s)
-{
-    const char oldParallelJobsKey[] = "simultaneousProcesses";
-    const char oldBuildBeforeAnalysisKey[] = "buildBeforeAnalysis";
-
-    Store map;
-    map.insert(diagnosticConfigIdKey, s->value(oldDiagnosticConfigIdKey));
-    map.insert(parallelJobsKey, s->value(oldParallelJobsKey));
-    map.insert(buildBeforeAnalysisKey, s->value(oldBuildBeforeAnalysisKey));
-
-    s->remove(oldDiagnosticConfigIdKey);
-    s->remove(oldParallelJobsKey);
-    s->remove(oldBuildBeforeAnalysisKey);
-
-    return map;
-}
-
-ClangDiagnosticConfigs importDiagnosticConfigsFromCodeModel()
-{
-    const ClangDiagnosticConfigs configs = ClangdSettings::instance().customDiagnosticConfigs();
-
-    ClangDiagnosticConfigs tidyClazyConfigs;
-    ClangDiagnosticConfigs clangOnlyConfigs;
-    std::tie(tidyClazyConfigs, clangOnlyConfigs)
-        = Utils::partition(configs, [](const ClangDiagnosticConfig &config) {
-              return !config.checks(ClangToolType::Clazy).isEmpty()
-                     || (!config.checks(ClangToolType::Tidy).isEmpty()
-                         && config.checks(ClangToolType::Tidy) != "-*");
-          });
-    return tidyClazyConfigs;
-}
-
 void ClangToolsSettings::readSettings()
 {
-    // Transfer tidy/clazy configs from code model
-    bool write = false;
-    ClangDiagnosticConfigs importedConfigs = importDiagnosticConfigsFromCodeModel();
-    m_diagnosticConfigs.append(importedConfigs);
-    if (!importedConfigs.isEmpty())
-        write = true;
-
     AspectContainer::readSettings();
 
+    // TODO: The remaining things should be ready for aspectification now.
     QtcSettings *s = Core::ICore::settings();
     s->beginGroup(Constants::SETTINGS_ID);
     m_diagnosticConfigs.append(diagnosticConfigsFromSettings(s));
 
-    Store map;
-    if (!s->value(oldDiagnosticConfigIdKey).isNull()) {
-        map = convertToMapFromVersionBefore410(s);
-        write = true;
-    } else {
-        Store defaults;
-        defaults.insert(diagnosticConfigIdKey, defaultDiagnosticId().toSetting());
-        defaults.insert(parallelJobsKey, m_runSettings.parallelJobs());
-        defaults.insert(preferConfigFileKey, m_runSettings.preferConfigFile());
-        defaults.insert(buildBeforeAnalysisKey, m_runSettings.buildBeforeAnalysis());
-        defaults.insert(analyzeOpenFilesKey, m_runSettings.analyzeOpenFiles());
-        map = defaults;
-        for (Store::ConstIterator it = defaults.constBegin(); it != defaults.constEnd(); ++it)
-            map.insert(it.key(), s->value(it.key(), it.value()));
-    }
-
     // Run settings
+    Store map;
+    map.insert(diagnosticConfigIdKey,
+               s->value(diagnosticConfigIdKey, defaultDiagnosticId().toSetting()));
+    map.insert(parallelJobsKey, s->value(parallelJobsKey, m_runSettings.parallelJobs()));
+    map.insert(preferConfigFileKey, s->value(preferConfigFileKey, m_runSettings.preferConfigFile()));
+    map.insert(buildBeforeAnalysisKey,
+               s->value(buildBeforeAnalysisKey, m_runSettings.buildBeforeAnalysis()));
+    map.insert(analyzeOpenFilesKey, s->value(analyzeOpenFilesKey, m_runSettings.analyzeOpenFiles()));
     m_runSettings.fromMap(map);
 
     s->endGroup();
-
-    if (write)
-        writeSettings();
 }
 
 void ClangToolsSettings::writeSettings() const
@@ -230,7 +182,7 @@ VersionAndSuffix ClangToolsSettings::clangTidyVersion()
 
 QVersionNumber ClangToolsSettings::clazyVersion()
 {
-    return ClazyStandaloneInfo::getInfo(Internal::toolExecutable(ClangToolType::Clazy)).version;
+    return ClazyStandaloneInfo(Internal::toolExecutable(ClangToolType::Clazy)).version;
 }
 
 } // namespace Internal
diff --git a/src/plugins/clangtools/clangtoolssettings.h b/src/plugins/clangtools/clangtoolssettings.h
index 1c8656981df..eaaccc11883 100644
--- a/src/plugins/clangtools/clangtoolssettings.h
+++ b/src/plugins/clangtools/clangtoolssettings.h
@@ -71,6 +71,8 @@ public:
     Utils::FilePath executable(CppEditor::ClangToolType tool) const;
     void setExecutable(CppEditor::ClangToolType tool, const Utils::FilePath &path);
 
+    Utils::BoolAspect enableLowerClazyLevels{this};
+
     CppEditor::ClangDiagnosticConfigs diagnosticConfigs() const { return m_diagnosticConfigs; }
     void setDiagnosticConfigs(const CppEditor::ClangDiagnosticConfigs &configs)
     { m_diagnosticConfigs = configs; }
diff --git a/src/plugins/clangtools/diagnosticconfigswidget.cpp b/src/plugins/clangtools/diagnosticconfigswidget.cpp
index b787777f9d9..81aa6fb2305 100644
--- a/src/plugins/clangtools/diagnosticconfigswidget.cpp
+++ b/src/plugins/clangtools/diagnosticconfigswidget.cpp
@@ -10,7 +10,6 @@
 #include "clangtoolsutils.h"
 #include "executableinfo.h"
 
-#include <cppeditor/cppcodemodelsettings.h>
 #include <cppeditor/cppeditorconstants.h>
 #include <cppeditor/cpptoolsreuse.h>
 
@@ -1008,10 +1007,10 @@ DiagnosticConfigsWidget::DiagnosticConfigsWidget(const ClangDiagnosticConfigs &c
     connect(m_clazyChecks->enableLowerLevelsCheckBox, &QCheckBox::stateChanged, this, [this] {
         const bool enable = m_clazyChecks->enableLowerLevelsCheckBox->isChecked();
         m_clazyTreeModel->setEnableLowerLevels(enable);
-        codeModelSettings()->setEnableLowerClazyLevels(enable);
+        ClangToolsSettings::instance()->enableLowerClazyLevels.setValue(enable);
     });
     const Qt::CheckState checkEnableLowerClazyLevels
-        = codeModelSettings()->enableLowerClazyLevels() ? Qt::Checked : Qt::Unchecked;
+        = ClangToolsSettings::instance()->enableLowerClazyLevels.value() ? Qt::Checked : Qt::Unchecked;
     m_clazyChecks->enableLowerLevelsCheckBox->setCheckState(checkEnableLowerClazyLevels);
 
     m_tidyChecks = new TidyChecksWidget;
@@ -1263,7 +1262,7 @@ QString removeClangTidyCheck(const QString &checks, const QString &check)
 
 QString removeClazyCheck(const QString &checks, const QString &check)
 {
-    const ClazyStandaloneInfo clazyInfo = ClazyStandaloneInfo::getInfo(toolExecutable(ClangToolType::Clazy));
+    const ClazyStandaloneInfo clazyInfo = ClazyStandaloneInfo(toolExecutable(ClangToolType::Clazy));
     ClazyChecksTreeModel model(clazyInfo.supportedChecks);
     model.enableChecks(checks.split(',', Qt::SkipEmptyParts));
     const QModelIndex index = model.indexForName(check.mid(QString("clazy-").length()));
@@ -1314,7 +1313,7 @@ void disableChecks(const QList<Diagnostic> &diagnostics)
             if (config.clazyMode() == ClangDiagnosticConfig::ClazyMode::UseDefaultChecks) {
                 config.setClazyMode(ClangDiagnosticConfig::ClazyMode::UseCustomChecks);
                 const ClazyStandaloneInfo clazyInfo
-                        = ClazyStandaloneInfo::getInfo(toolExecutable(ClangToolType::Clazy));
+                        = ClazyStandaloneInfo(toolExecutable(ClangToolType::Clazy));
                 config.setChecks(ClangToolType::Clazy, clazyInfo.defaultChecks.join(','));
             }
             config.setChecks(ClangToolType::Clazy,
diff --git a/src/plugins/clangtools/diagnosticmark.cpp b/src/plugins/clangtools/diagnosticmark.cpp
index 90b4e19812d..9eba17965f4 100644
--- a/src/plugins/clangtools/diagnosticmark.cpp
+++ b/src/plugins/clangtools/diagnosticmark.cpp
@@ -20,48 +20,24 @@ using namespace Utils;
 namespace ClangTools {
 namespace Internal {
 
+static TextMarkCategory clangToolsCategory()
+{
+    return {Tr::tr("Clang Tools"), Id(Constants::DIAGNOSTIC_MARK_ID)};
+}
+
 DiagnosticMark::DiagnosticMark(const Diagnostic &diagnostic, TextDocument *document)
-    : TextMark(document,
-               diagnostic.location.line,
-               {Tr::tr("Clang Tools"), Id(Constants::DIAGNOSTIC_MARK_ID)})
+    : TextMark(document, diagnostic.location.line, clangToolsCategory())
     , m_diagnostic(diagnostic)
 {
-    setSettingsPage(Constants::SETTINGS_PAGE_ID);
-
-    const bool isError = diagnostic.type == "error" || diagnostic.type == "fatal";
-    setColor(isError ? Theme::CodeModel_Error_TextMarkColor : Theme::CodeModel_Warning_TextMarkColor);
-    setPriority(isError ? TextEditor::TextMark::HighPriority : TextEditor::TextMark::NormalPriority);
-    QIcon markIcon = diagnostic.icon();
-    setIcon(markIcon.isNull() ? Icons::CODEMODEL_WARNING.icon() : markIcon);
-    setToolTip(createDiagnosticToolTipString(diagnostic, std::nullopt, true));
-    setLineAnnotation(diagnostic.description);
-    setActionsProvider([diagnostic] {
-        // Copy to clipboard action
-        QList<QAction *> actions;
-        QAction *action = new QAction();
-        action->setIcon(Icon::fromTheme("edit-copy"));
-        action->setToolTip(Tr::tr("Copy to Clipboard"));
-        QObject::connect(action, &QAction::triggered, [diagnostic] {
-            const QString text = createFullLocationString(diagnostic.location)
-                                 + ": "
-                                 + diagnostic.description;
-            setClipboardAndSelection(text);
-        });
-        actions << action;
-
-        // Disable diagnostic action
-        action = new QAction();
-        action->setIcon(Icons::BROKEN.icon());
-        action->setToolTip(Tr::tr("Disable Diagnostic"));
-        QObject::connect(action, &QAction::triggered, [diagnostic] { disableChecks({diagnostic}); });
-        actions << action;
-        return actions;
-    });
+    initialize();
 }
 
 DiagnosticMark::DiagnosticMark(const Diagnostic &diagnostic)
-    : DiagnosticMark(diagnostic, TextDocument::textDocumentForFilePath(diagnostic.location.filePath))
-{}
+    : TextMark(diagnostic.location.filePath, diagnostic.location.line, clangToolsCategory())
+    , m_diagnostic(diagnostic)
+{
+    initialize();
+}
 
 void DiagnosticMark::disable()
 {
@@ -85,6 +61,41 @@ Diagnostic DiagnosticMark::diagnostic() const
     return m_diagnostic;
 }
 
+void DiagnosticMark::initialize()
+{
+    setSettingsPage(Constants::SETTINGS_PAGE_ID);
+
+    const bool isError = m_diagnostic.type == "error" || m_diagnostic.type == "fatal";
+    setColor(isError ? Theme::CodeModel_Error_TextMarkColor : Theme::CodeModel_Warning_TextMarkColor);
+    setPriority(isError ? TextEditor::TextMark::HighPriority : TextEditor::TextMark::NormalPriority);
+    QIcon markIcon = m_diagnostic.icon();
+    setIcon(markIcon.isNull() ? Icons::CODEMODEL_WARNING.icon() : markIcon);
+    setToolTip(createDiagnosticToolTipString(m_diagnostic, std::nullopt, true));
+    setLineAnnotation(m_diagnostic.description);
+    setActionsProvider([diagnostic = m_diagnostic] {
+        // Copy to clipboard action
+        QList<QAction *> actions;
+        QAction *action = new QAction();
+        action->setIcon(Icon::fromTheme("edit-copy"));
+        action->setToolTip(Tr::tr("Copy to Clipboard"));
+        QObject::connect(action, &QAction::triggered, [diagnostic] {
+            const QString text = createFullLocationString(diagnostic.location)
+            + ": "
+                + diagnostic.description;
+            setClipboardAndSelection(text);
+        });
+        actions << action;
+
+        // Disable diagnostic action
+        action = new QAction();
+        action->setIcon(Icons::BROKEN.icon());
+        action->setToolTip(Tr::tr("Disable Diagnostic"));
+        QObject::connect(action, &QAction::triggered, [diagnostic] { disableChecks({diagnostic}); });
+        actions << action;
+        return actions;
+    });
+}
+
 } // namespace Internal
 } // namespace ClangTools
 
diff --git a/src/plugins/clangtools/diagnosticmark.h b/src/plugins/clangtools/diagnosticmark.h
index 6d566739d42..7d2999e66ec 100644
--- a/src/plugins/clangtools/diagnosticmark.h
+++ b/src/plugins/clangtools/diagnosticmark.h
@@ -25,6 +25,7 @@ public:
     std::optional<CppEditor::ClangToolType> toolType;
 
 private:
+    void initialize();
     const Diagnostic m_diagnostic;
     bool m_enabled = true;
 };
diff --git a/src/plugins/clangtools/documentclangtoolrunner.cpp b/src/plugins/clangtools/documentclangtoolrunner.cpp
index d503f80d63b..1e3055cb48d 100644
--- a/src/plugins/clangtools/documentclangtoolrunner.cpp
+++ b/src/plugins/clangtools/documentclangtoolrunner.cpp
@@ -132,10 +132,12 @@ static FileInfo getFileInfo(const FilePath &file, Project *project)
             // found the best candidate, early return
             ProjectFile::Kind sourceKind = ProjectFile::sourceKind(projectFile.kind);
             if (projectPart->buildTargetType != BuildTargetType::Unknown)
-                return FileInfo(projectFile.path, sourceKind, projectPart);
+                return FileInfo(projectFile.path, sourceKind, projectInfo->settings(), projectPart);
             // found something but keep looking for better candidates
-            if (candidate.projectPart.isNull())
-                candidate = FileInfo(projectFile.path, sourceKind, projectPart);
+            if (candidate.projectPart.isNull()) {
+                candidate
+                    = FileInfo(projectFile.path, sourceKind, projectInfo->settings(), projectPart);
+            }
         }
     }
 
diff --git a/src/plugins/clangtools/documentquickfixfactory.h b/src/plugins/clangtools/documentquickfixfactory.h
index 98f45af46e3..6e99b1d345c 100644
--- a/src/plugins/clangtools/documentquickfixfactory.h
+++ b/src/plugins/clangtools/documentquickfixfactory.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <cppeditor/cppquickfix.h>
+#include <cppeditor/quickfixes/cppquickfix.h>
 
 namespace ClangTools {
 namespace Internal {
diff --git a/src/plugins/clangtools/executableinfo.cpp b/src/plugins/clangtools/executableinfo.cpp
index 0b5d649cf50..23dc807367d 100644
--- a/src/plugins/clangtools/executableinfo.cpp
+++ b/src/plugins/clangtools/executableinfo.cpp
@@ -6,6 +6,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
 
+#include <utils/datafromprocess.h>
 #include <utils/environment.h>
 #include <utils/qtcprocess.h>
 
@@ -21,27 +22,10 @@ using namespace Utils;
 namespace ClangTools {
 namespace Internal {
 
-static QString runExecutable(const Utils::CommandLine &commandLine, QueryFailMode queryFailMode)
+static void handleProcessError(const Process &p)
 {
-    if (commandLine.executable().isEmpty() || !commandLine.executable().toFileInfo().isExecutable())
-        return {};
-
-    Process cpp;
-    Environment env = Environment::systemEnvironment();
-    env.setupEnglishOutput();
-    cpp.setEnvironment(env);
-    cpp.setCommand(commandLine);
-
-    cpp.runBlocking();
-    if (cpp.result() != ProcessResult::FinishedWithSuccess
-            && (queryFailMode == QueryFailMode::Noisy
-            || cpp.result() != ProcessResult::FinishedWithError)) {
-        Core::MessageManager::writeFlashing(cpp.exitMessage());
-        Core::MessageManager::writeFlashing(QString::fromUtf8(cpp.allRawOutput()));
-        return {};
-    }
-
-    return cpp.cleanedStdOut();
+    Core::MessageManager::writeFlashing(p.exitMessage());
+    Core::MessageManager::writeFlashing(QString::fromUtf8(p.allRawOutput()));
 }
 
 static QStringList queryClangTidyChecks(const FilePath &executable,
@@ -51,47 +35,37 @@ static QStringList queryClangTidyChecks(const FilePath &executable,
     if (!checksArgument.isEmpty())
         arguments.prepend(checksArgument);
 
-    const CommandLine commandLine(executable, arguments);
-    QString output = runExecutable(commandLine, QueryFailMode::Noisy);
-    if (output.isEmpty())
-        return {};
-
     // Expected output is (clang-tidy 8.0):
     //   Enabled checks:
     //       abseil-duration-comparison
     //       abseil-duration-division
     //       abseil-duration-factory-float
     //       ...
+    static const auto parser = [](const QString &stdOut) -> std::optional<QStringList> {
+        QString output = stdOut;
+        QTextStream stream(&output);
+        QString line = stream.readLine();
+        if (!line.startsWith("Enabled checks:"))
+            return {};
+        QStringList checks;
+        while (!stream.atEnd()) {
+            const QString candidate = stream.readLine().trimmed();
+            if (!candidate.isEmpty())
+                checks << candidate;
+        }
+        return checks;
+    };
 
-    QTextStream stream(&output);
-    QString line = stream.readLine();
-    if (!line.startsWith("Enabled checks:"))
-        return {};
-
-    QStringList checks;
-    while (!stream.atEnd()) {
-        const QString candidate = stream.readLine().trimmed();
-        if (!candidate.isEmpty())
-            checks << candidate;
-    }
-
-    return checks;
+    DataFromProcess<QStringList>::Parameters params({executable, arguments}, parser);
+    params.environment.setupEnglishOutput();
+    params.errorHandler = handleProcessError;
+    if (const auto checks = DataFromProcess<QStringList>::getData(params))
+        return *checks;
+    return {};
 }
 
 static ClazyChecks querySupportedClazyChecks(const FilePath &executablePath)
 {
-    static const QString queryFlag = "-supported-checks-json";
-    QString jsonOutput = runExecutable(CommandLine(executablePath, {queryFlag}),
-                                       QueryFailMode::Noisy);
-
-    // Some clazy 1.6.x versions have a bug where they expect an argument after the
-    // option.
-    if (jsonOutput.isEmpty())
-        jsonOutput = runExecutable(CommandLine(executablePath, {queryFlag, "dummy"}),
-                                   QueryFailMode::Noisy);
-    if (jsonOutput.isEmpty())
-        return {};
-
     // Expected output is (clazy-standalone 1.6):
     //   {
     //       "available_categories" : ["readability", "qt4", "containers", ... ],
@@ -111,29 +85,40 @@ static ClazyChecks querySupportedClazyChecks(const FilePath &executablePath)
     //           ...
     //       ]
     //   }
+    static const auto parser = [](const QString &jsonOutput) -> std::optional<ClazyChecks> {
+        const QJsonDocument document = QJsonDocument::fromJson(jsonOutput.toUtf8());
+        if (document.isNull())
+            return {};
+        const QJsonArray checksArray = document.object()["checks"].toArray();
+        ClazyChecks infos;
+        for (const QJsonValue &item: checksArray) {
+            const QJsonObject checkObject = item.toObject();
+            ClazyCheck info;
+            info.name = checkObject["name"].toString().trimmed();
+            if (info.name.isEmpty())
+                continue;
+            info.level = checkObject["level"].toInt();
+            for (const QJsonValue &item : checkObject["categories"].toArray())
+                info.topics.append(item.toString().trimmed());
+            infos << info;
+        }
+        return infos;
+    };
 
-    ClazyChecks infos;
-
-    const QJsonDocument document = QJsonDocument::fromJson(jsonOutput.toUtf8());
-    if (document.isNull())
-        return {};
-    const QJsonArray checksArray = document.object()["checks"].toArray();
-
-    for (const QJsonValue &item: checksArray) {
-        const QJsonObject checkObject = item.toObject();
-
-        ClazyCheck info;
-        info.name = checkObject["name"].toString().trimmed();
-        if (info.name.isEmpty())
-            continue;
-        info.level = checkObject["level"].toInt();
-        for (const QJsonValue &item : checkObject["categories"].toArray())
-            info.topics.append(item.toString().trimmed());
-
-        infos << info;
+    static const QString queryFlag = "-supported-checks-json";
+    DataFromProcess<ClazyChecks>::Parameters params({executablePath, {queryFlag}}, parser);
+    params.environment.setupEnglishOutput();
+    params.errorHandler = handleProcessError;
+    auto checks = DataFromProcess<ClazyChecks>::getData(params);
+    if (!checks) {
+        // Some clazy 1.6.x versions have a bug where they expect an argument after the
+        // option.
+        params.commandLine = {executablePath, {queryFlag, "dummy"}};
+        checks = DataFromProcess<ClazyChecks>::getData(params);
     }
-
-    return infos;
+    if (checks)
+        return *checks;
+    return {};
 }
 
 ClangTidyInfo::ClangTidyInfo(const FilePath &executablePath)
@@ -141,76 +126,80 @@ ClangTidyInfo::ClangTidyInfo(const FilePath &executablePath)
     , supportedChecks(queryClangTidyChecks(executablePath, "-checks=*"))
 {}
 
-ClazyStandaloneInfo ClazyStandaloneInfo::getInfo(const FilePath &executablePath)
-{
-    const QDateTime timeStamp = executablePath.lastModified();
-    const auto it = cache.find(executablePath);
-    if (it == cache.end()) {
-        const ClazyStandaloneInfo info(executablePath);
-        cache.insert(executablePath, {timeStamp, info});
-        return info;
-    }
-    if (it->first != timeStamp) {
-        it->first = timeStamp;
-        it->second = ClazyStandaloneInfo::getInfo(executablePath);
-    }
-    return it->second;
-}
-
 ClazyStandaloneInfo::ClazyStandaloneInfo(const FilePath &executablePath)
     : defaultChecks(queryClangTidyChecks(executablePath, {})) // Yup, behaves as clang-tidy.
     , supportedChecks(querySupportedClazyChecks(executablePath))
 {
-    QString output = runExecutable({executablePath, {"--version"}}, QueryFailMode::Silent);
-    QTextStream stream(&output);
-    while (!stream.atEnd()) {
-        // It's just "clazy version " right now, but let's be prepared for someone adding a colon
-        // later on.
-        static const QStringList versionPrefixes{"clazy version ", "clazy version: "};
-        const QString line = stream.readLine().simplified();
-        for (const QString &prefix : versionPrefixes) {
-            if (line.startsWith(prefix)) {
-                version = QVersionNumber::fromString(line.mid(prefix.length()));
-                break;
+    static const auto parser = [](const QString &stdOut) -> std::optional<QVersionNumber> {
+        QString output = stdOut;
+        QTextStream stream(&output);
+        while (!stream.atEnd()) {
+            // It's just "clazy version " right now, but let's be prepared for someone
+            // adding a colon later on.
+            static const QStringList versionPrefixes{"clazy version ", "clazy version: "};
+            const QString line = stream.readLine().simplified();
+            for (const QString &prefix : versionPrefixes) {
+                if (line.startsWith(prefix))
+                    return QVersionNumber::fromString(line.mid(prefix.length()));
             }
         }
-    }
+        return {};
+    };
+    DataFromProcess<QVersionNumber>::Parameters params({{executablePath, {"--version"}}, parser});
+    params.environment.setupEnglishOutput();
+    if (const auto v = DataFromProcess<QVersionNumber>::getData(params))
+        version = *v;
 }
 
 static FilePath queryResourceDir(const FilePath &clangToolPath)
 {
-    QString output = runExecutable(CommandLine(clangToolPath, {"someFilePath", "--",
-                                                               "-print-resource-dir"}),
-                                   QueryFailMode::Silent);
-
     // Expected output is (clang-tidy 10):
     //   lib/clang/10.0.1
     //   Error while trying to load a compilation database:
     //   ...
+    const auto parser = [&clangToolPath](const QString &stdOut) -> std::optional<FilePath> {
+        QString output = stdOut;
+        QTextStream stream(&output);
+        const QString path = clangToolPath.parentDir().parentDir()
+                                 .pathAppended(stream.readLine()).toString();
+        const auto filePath = FilePath::fromUserInput(QDir::cleanPath(path));
+        if (filePath.exists())
+            return filePath;
+        return {};
+    };
 
-    // Parse
-    QTextStream stream(&output);
-    const QString path = clangToolPath.parentDir().parentDir()
-            .pathAppended(stream.readLine()).toString();
-    const auto filePath = FilePath::fromUserInput(QDir::cleanPath(path));
-    if (filePath.exists())
-        return filePath;
+    DataFromProcess<FilePath>::Parameters params({clangToolPath,
+                                                  {"someFilePath", "--", "-print-resource-dir"}},
+                                                 parser);
+    params.environment.setupEnglishOutput();
+    params.allowedResults << ProcessResult::FinishedWithError;
+    if (const auto filePath = DataFromProcess<FilePath>::getData(params))
+        return *filePath;
     return {};
 }
 
 QString queryVersion(const FilePath &clangToolPath, QueryFailMode failMode)
 {
-    QString output = runExecutable(CommandLine(clangToolPath, {"--version"}), failMode);
-    QTextStream stream(&output);
-    while (!stream.atEnd()) {
-        static const QStringList versionPrefixes{"LLVM version ", "clang version: "};
-        const QString line = stream.readLine().simplified();
-        for (const QString &prefix : versionPrefixes) {
-            auto idx = line.indexOf(prefix);
-            if (idx >= 0)
-                return line.mid(idx + prefix.length());
+    static const auto parser = [](const QString &stdOut) -> std::optional<QString> {
+        QString output = stdOut;
+        QTextStream stream(&output);
+        while (!stream.atEnd()) {
+            static const QStringList versionPrefixes{"LLVM version ", "clang version: "};
+            const QString line = stream.readLine().simplified();
+            for (const QString &prefix : versionPrefixes) {
+                auto idx = line.indexOf(prefix);
+                if (idx >= 0)
+                    return line.mid(idx + prefix.length());
+            }
         }
-    }
+        return {};
+    };
+    DataFromProcess<QString>::Parameters params({clangToolPath, {"--version"}}, parser);
+    params.environment.setupEnglishOutput();
+    if (failMode == QueryFailMode::Noisy)
+        params.errorHandler = handleProcessError;
+    if (const auto version = DataFromProcess<QString>::getData(params))
+        return *version;
     return {};
 }
 
@@ -233,7 +222,5 @@ QPair<FilePath, QString> getClangIncludeDirAndVersion(const FilePath &clangToolP
     return it.value();
 }
 
-QHash<Utils::FilePath, QPair<QDateTime, ClazyStandaloneInfo>> ClazyStandaloneInfo::cache;
-
 } // namespace Internal
 } // namespace ClangTools
diff --git a/src/plugins/clangtools/executableinfo.h b/src/plugins/clangtools/executableinfo.h
index cfa51b98b2c..5db586b5356 100644
--- a/src/plugins/clangtools/executableinfo.h
+++ b/src/plugins/clangtools/executableinfo.h
@@ -5,8 +5,6 @@
 
 #include <utils/filepath.h>
 
-#include <QDateTime>
-#include <QHash>
 #include <QPair>
 #include <QStringList>
 #include <QVector>
@@ -40,16 +38,11 @@ using ClazyChecks = QVector<ClazyCheck>;
 class ClazyStandaloneInfo
 {
 public:
-    static ClazyStandaloneInfo getInfo(const Utils::FilePath &executablePath);
+    ClazyStandaloneInfo(const Utils::FilePath &executablePath);
 
     QVersionNumber version;
     QStringList defaultChecks;
     ClazyChecks supportedChecks;
-
-private:
-    ClazyStandaloneInfo(const Utils::FilePath &executablePath);
-
-    static QHash<Utils::FilePath, QPair<QDateTime, ClazyStandaloneInfo>> cache;
 };
 
 } // namespace Internal
diff --git a/src/plugins/clangtools/inlinesuppresseddiagnostics.cpp b/src/plugins/clangtools/inlinesuppresseddiagnostics.cpp
new file mode 100644
index 00000000000..312e9213e52
--- /dev/null
+++ b/src/plugins/clangtools/inlinesuppresseddiagnostics.cpp
@@ -0,0 +1,294 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "inlinesuppresseddiagnostics.h"
+
+#include <utils/algorithm.h>
+#include <utils/qtcassert.h>
+
+#ifdef WITH_TESTS
+#include <QObject>
+#include <QtTest>
+#endif // WITH_TESTS
+
+namespace ClangTools::Internal {
+
+InlineSuppressedDiagnostics::~InlineSuppressedDiagnostics() = default;
+
+void InlineSuppressedDiagnostics::addDiagnostic(const QString &diag)
+{
+    if (!m_diagnostics.contains(diag)) {
+        m_diagnostics << diag;
+        m_diagnostics.sort();
+    }
+}
+
+void InlineSuppressedDiagnostics::fromString(const QString &input)
+{
+    try {
+        int tokenOffset = -1;
+        for (int i = 0; i < input.size(); ++i) {
+            const QChar c = input.at(i);
+            if (c.isSpace()) {
+                tokenOffset = -1;
+                continue;
+            }
+            if (tokenOffset == -1)
+                tokenOffset = i;
+            const int tokenPos = i - tokenOffset;
+            if (tokenPos >= m_startString.size() || m_startString.at(tokenPos) != input.at(i)) {
+                tokenOffset = -1;
+                continue;
+            }
+            if (tokenPos == m_startString.size() - 1) {
+                m_parsedStartOffset = tokenOffset;
+                fromStringImpl(QStringView(input).mid(m_parsedStartOffset + m_startString.size()));
+                break;
+            }
+        }
+    } catch (const ParseError &) {
+        m_parsedStartOffset = -1;
+        m_parsedEndOffset = -1;
+        m_parseError = true;
+    }
+}
+
+QString InlineSuppressedDiagnostics::toString() const
+{
+    QTC_ASSERT(!m_diagnostics.isEmpty(), return {});
+    if (m_parseError)
+        return {};
+    return toStringImpl();
+}
+
+void InlineSuppressedDiagnostics::parseDiagnostic(QStringView input, int &offset, const QString &prefix)
+{
+    QString diag;
+    while (offset < input.size()) {
+        const QChar c = input.at(offset);
+        if (!c.isLetterOrNumber() && c != '-')
+            break;
+        diag.append(c);
+        ++offset;
+    }
+    if (diag.isEmpty())
+        throw ParseError();
+    m_diagnostics << prefix + diag;
+}
+
+void InlineSuppressedClangTidyDiagnostics::fromStringImpl(QStringView input)
+{
+    int offset = 0;
+    const auto skipWhiteSpace = [&] {
+        for (; offset < input.size() && input.at(offset).isSpace(); ++offset)
+            ;
+    };
+    while (true) {
+        skipWhiteSpace();
+        parseDiagnostic(input, offset, {});
+        skipWhiteSpace();
+        if (offset == input.size())
+            throw ParseError();
+        const QChar c = input.at(offset);
+        if (c == ')') {
+            setEndOffset(parsedStartOffset() + startString().size() + offset + 1);
+            return;
+        }
+        if (c == ',') {
+            ++offset;
+            continue;
+        }
+        throw ParseError();
+    }
+}
+
+QString InlineSuppressedClangTidyDiagnostics::toStringImpl() const
+{
+    return "NOLINT(" + diagnostics().join(',') + ')';
+}
+
+void InlineSuppressedClazyDiagnostics::fromStringImpl(QStringView input)
+{
+    int offset = 0;
+    while (true) {
+        parseDiagnostic(input, offset, "clazy-");
+        if (offset == input.size())
+            break;
+        const QChar c = input.at(offset);
+        if (c == ',') {
+            ++offset;
+            continue;
+        }
+        if (c.isSpace())
+            break;
+        throw ParseError();
+    }
+    setEndOffset(parsedStartOffset() + startString().size() + offset);
+}
+
+QString InlineSuppressedClazyDiagnostics::toStringImpl() const
+{
+    return "clazy:exclude=" + Utils::transform(diagnostics(), [](const QString &diag) {
+                                  return diag.mid(6); // Remove "clazy-" prefix
+                              }).join(',');
+}
+
+#ifdef WITH_TESTS
+class InlineSuppressedDiagnosticsTest : public QObject
+{
+    Q_OBJECT
+private:
+    template<typename Diags> void testExcludedDiagnostics()
+    {
+        QFETCH(QString, input);
+        QFETCH(QStringList, additionalDiagnostics);
+        QFETCH(int, startOffset);
+        QFETCH(int, endOffset);
+        QFETCH(QString, output);
+        QFETCH(bool, error);
+
+        Diags diags;
+        diags.fromString(input);
+        for (const QString &diag : std::as_const(additionalDiagnostics))
+            diags.addDiagnostic(diag);
+        QCOMPARE(diags.parsedStartOffset(), startOffset);
+        QCOMPARE(diags.parsedEndOffset(), endOffset);
+        QCOMPARE(diags.toString(), output);
+        QCOMPARE(diags.hasError(), error);
+    }
+
+private slots:
+    void testClangTidyExcludedDiagnostics_data()
+    {
+        QTest::addColumn<QString>("input");
+        QTest::addColumn<QStringList>("additionalDiagnostics");
+        QTest::addColumn<int>("startOffset");
+        QTest::addColumn<int>("endOffset");
+        QTest::addColumn<QString>("output");
+        QTest::addColumn<bool>("error");
+
+        QTest::newRow("no offset, round-trip")
+            << QString("NOLINT(google-explicit-constructor, google-runtime-int)")
+            << QStringList() << 0 << 55
+            << QString("NOLINT(google-explicit-constructor,google-runtime-int)")
+            << false;
+        QTest::newRow("random other content, add some diags")
+            << QString("some prefix NOLINT(google-runtime-int) some suffix")
+            << QStringList{"modernize-concat-nested-namespaces", "misc-include-cleaner"} << 12 << 38
+            << QString("NOLINT(google-runtime-int,misc-include-cleaner,modernize-concat-nested-namespaces)")
+            << false;
+        QTest::newRow("create from empty input")
+            << QString()
+            << QStringList{"misc-include-cleaner"} << -1 << -1
+            << QString("NOLINT(misc-include-cleaner)")
+            << false;
+        QTest::newRow("create from irrelevant input")
+            << QString(" random content ")
+            << QStringList{"misc-include-cleaner"} << -1 << -1
+            << QString("NOLINT(misc-include-cleaner)")
+            << false;
+        QTest::newRow("missing closing parenthesis")
+            << QString("NOLINT(google-explicit-constructor, google-runtime-int")
+            << QStringList() << -1 << -1
+            << QString()
+            << true;
+        QTest::newRow("missing comma")
+            << QString("NOLINT(google-explicit-constructor google-runtime-int)")
+            << QStringList() << -1 << -1
+            << QString()
+            << true;
+        QTest::newRow("no diagnostics")
+            << QString("NOLINT()")
+            << QStringList() << -1 << -1
+            << QString()
+            << true;
+        QTest::newRow("empty diagnostic (start)")
+            << QString("NOLINT(,google-explicit-constructor,google-runtime-int)")
+            << QStringList() << -1 << -1
+            << QString()
+            << true;
+        QTest::newRow("empty diagnostic (middle)")
+            << QString("NOLINT(google-explicit-constructor,,google-runtime-int)")
+            << QStringList() << -1 << -1
+            << QString()
+            << true;
+        QTest::newRow("empty diagnostic (end)")
+            << QString("NOLINT(google-explicit-constructor,)")
+            << QStringList() << -1 << -1
+            << QString()
+            << true;
+    }
+
+    void testClangTidyExcludedDiagnostics()
+    {
+        testExcludedDiagnostics<InlineSuppressedClangTidyDiagnostics>();
+    }
+
+    void testClazyExcludedDiagnostics_data()
+    {
+        QTest::addColumn<QString>("input");
+        QTest::addColumn<QStringList>("additionalDiagnostics");
+        QTest::addColumn<int>("startOffset");
+        QTest::addColumn<int>("endOffset");
+        QTest::addColumn<QString>("output");
+        QTest::addColumn<bool>("error");
+
+        QTest::newRow("no offset, round-trip")
+            << QString("clazy:exclude=qstring-allocations,qenums")
+            << QStringList() << 0 << 40
+            << QString("clazy:exclude=qstring-allocations,qenums")
+            << false;
+        QTest::newRow("random other content, add some diags")
+            << QString("some prefix clazy:exclude=qstring-allocations some suffix")
+            << QStringList{"clazy-qgetenv", "clazy-qtmacros"} << 12 << 45
+            << QString("clazy:exclude=qgetenv,qstring-allocations,qtmacros")
+            << false;
+        QTest::newRow("create from empty input")
+            << QString()
+            << QStringList{"clazy-qgetenv"} << -1 << -1
+            << QString("clazy:exclude=qgetenv")
+            << false;
+        QTest::newRow("create from irrelevant input")
+            << QString(" random content ")
+            << QStringList{"clazy-qgetenv"} << -1 << -1
+            << QString("clazy:exclude=qgetenv")
+            << false;
+        QTest::newRow("missing comma")
+            << QString("clazy:exclude=qstring-allocations qenums")
+            << QStringList() << 0 << 33
+            << QString("clazy:exclude=qstring-allocations")
+            << false;
+        QTest::newRow("empty diagnostic (start)")
+            << QString("clazy:exclude=,qenums")
+            << QStringList() << -1 << -1
+            << QString()
+            << true;
+        QTest::newRow("empty diagnostic (middle)")
+            << QString("clazy:exclude=qstring-allocations,,qenums")
+            << QStringList() << -1 << -1
+            << QString()
+            << true;
+        QTest::newRow("empty diagnostic (end)")
+            << QString("clazy:exclude=qstring-allocations,qenums,")
+            << QStringList() << -1 << -1
+            << QString()
+            << true;
+    }
+
+    void testClazyExcludedDiagnostics()
+    {
+        testExcludedDiagnostics<InlineSuppressedClazyDiagnostics>();
+    }
+};
+
+QObject *createInlineSuppressedDiagnosticsTest()
+{
+    return new InlineSuppressedDiagnosticsTest;
+}
+#endif // WITH_TESTS
+
+} // namespace ClangTools::Internal
+
+#ifdef WITH_TESTS
+#include <inlinesuppresseddiagnostics.moc>
+#endif
diff --git a/src/plugins/clangtools/inlinesuppresseddiagnostics.h b/src/plugins/clangtools/inlinesuppresseddiagnostics.h
new file mode 100644
index 00000000000..e20f8a56d8f
--- /dev/null
+++ b/src/plugins/clangtools/inlinesuppresseddiagnostics.h
@@ -0,0 +1,73 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <QStringList>
+
+QT_BEGIN_NAMESPACE
+class QObject;
+QT_END_NAMESPACE
+
+namespace ClangTools::Internal {
+
+class InlineSuppressedDiagnostics
+{
+public:
+    virtual ~InlineSuppressedDiagnostics();
+    void addDiagnostic(const QString &diag);
+
+    int parsedStartOffset() const { return m_parsedStartOffset; }
+    int parsedEndOffset() const { return m_parsedEndOffset; }
+
+    void fromString(const QString &input);
+    QString toString() const;
+
+    bool hasError() const { return m_parseError; }
+
+protected:
+    class ParseError {};
+
+    InlineSuppressedDiagnostics(const QString &startString) : m_startString(startString) {};
+
+    const QString &startString() const { return m_startString; }
+    const QStringList &diagnostics() const { return m_diagnostics; }
+    void setEndOffset(int offset) { m_parsedEndOffset = offset; }
+    void parseDiagnostic(QStringView input, int &offset, const QString &prefix);
+
+private:
+    virtual void fromStringImpl(QStringView input) = 0;
+    virtual QString toStringImpl() const = 0;
+
+    const QString m_startString;
+    QStringList m_diagnostics;
+    int m_parsedStartOffset = -1;
+    int m_parsedEndOffset = -1;
+    bool m_parseError = false;
+};
+
+class InlineSuppressedClangTidyDiagnostics : public InlineSuppressedDiagnostics
+{
+public:
+    InlineSuppressedClangTidyDiagnostics() : InlineSuppressedDiagnostics("NOLINT(") {}
+
+private:
+    void fromStringImpl(QStringView input) override;
+    QString toStringImpl() const override;
+};
+
+class InlineSuppressedClazyDiagnostics : public InlineSuppressedDiagnostics
+{
+public:
+    InlineSuppressedClazyDiagnostics() : InlineSuppressedDiagnostics("clazy:exclude=") {}
+
+private:
+    void fromStringImpl(QStringView input) override;
+    QString toStringImpl() const override;
+};
+
+#ifdef WITH_TESTS
+QObject *createInlineSuppressedDiagnosticsTest();
+#endif
+
+} // namespace ClangTools::Internal
diff --git a/src/plugins/clangtools/runsettingswidget.cpp b/src/plugins/clangtools/runsettingswidget.cpp
index cd0dc6a1ee3..81a8b7c644a 100644
--- a/src/plugins/clangtools/runsettingswidget.cpp
+++ b/src/plugins/clangtools/runsettingswidget.cpp
@@ -85,7 +85,7 @@ static ClangDiagnosticConfigsWidget *createEditWidget(const ClangDiagnosticConfi
     return new DiagnosticConfigsWidget(configs,
                                        configToSelect,
                                        ClangTidyInfo(clangTidyPath),
-                                       ClazyStandaloneInfo::getInfo(clazyStandalonePath));
+                                       ClazyStandaloneInfo(clazyStandalonePath));
 }
 
 void RunSettingsWidget::fromSettings(const RunSettings &s)
diff --git a/src/plugins/clangtools/settingswidget.cpp b/src/plugins/clangtools/settingswidget.cpp
index 113373f57e0..4b686e61ac9 100644
--- a/src/plugins/clangtools/settingswidget.cpp
+++ b/src/plugins/clangtools/settingswidget.cpp
@@ -99,12 +99,12 @@ SettingsWidget::~SettingsWidget()
 
 FilePath SettingsWidget::clangTidyPath() const
 {
-    return m_clangTidyPathChooser->rawFilePath();
+    return m_clangTidyPathChooser->unexpandedFilePath();
 }
 
 FilePath SettingsWidget::clazyStandalonePath() const
 {
-    return m_clazyStandalonePathChooser->rawFilePath();
+    return m_clazyStandalonePathChooser->unexpandedFilePath();
 }
 
 // ClangToolsOptionsPage
diff --git a/src/plugins/classview/ClassView.json.in b/src/plugins/classview/ClassView.json.in
index 753824248b9..3368fc7375b 100644
--- a/src/plugins/classview/ClassView.json.in
+++ b/src/plugins/classview/ClassView.json.in
@@ -13,7 +13,8 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "C++",
-    "Description" : "Class View component.",
-    "Url" : "http://www.qt.io",
+    "Description" : "View the class hierarchy of currently open projects.",
+    "LongDescription" : [],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/clearcase/ClearCase.json.in b/src/plugins/clearcase/ClearCase.json.in
index 8bcfbb66bc0..c5a9722a2c0 100644
--- a/src/plugins/clearcase/ClearCase.json.in
+++ b/src/plugins/clearcase/ClearCase.json.in
@@ -15,8 +15,12 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Version Control",
-    "Description" : "ClearCase integration.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Access an IBM Rational ClearCase server.",
+    "LongDescription" : [
+        "You also need:",
+            "- ClearCase"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
 
     "Mimetypes" : [
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index bc4cc82958a..9fa1a06c8a5 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -2265,14 +2265,10 @@ void ClearCasePluginPrivate::diffGraphical(const QString &file1, const QString &
 QString ClearCasePluginPrivate::runExtDiff(const FilePath &workingDir, const QStringList &arguments,
                                            int timeOutS, QTextCodec *outputCodec)
 {
-    CommandLine diff("diff");
-    diff.addArgs(m_settings.diffArgs.split(' ', Qt::SkipEmptyParts));
-    diff.addArgs(arguments);
-
     Process process;
     process.setWorkingDirectory(workingDir);
     process.setCodec(outputCodec ? outputCodec : QTextCodec::codecForName("UTF-8"));
-    process.setCommand(diff);
+    process.setCommand({"diff", {m_settings.diffArgs.split(' ', Qt::SkipEmptyParts), arguments}});
     process.runBlocking(seconds(timeOutS), EventLoopMode::On);
     if (process.result() != ProcessResult::FinishedWithSuccess)
         return {};
diff --git a/src/plugins/clearcase/settingspage.cpp b/src/plugins/clearcase/settingspage.cpp
index 010d3d1e98e..713ef78c344 100644
--- a/src/plugins/clearcase/settingspage.cpp
+++ b/src/plugins/clearcase/settingspage.cpp
@@ -177,7 +177,7 @@ SettingsPageWidget::SettingsPageWidget()
 void SettingsPageWidget::apply()
 {
     ClearCaseSettings rc;
-    rc.ccCommand = commandPathChooser->rawFilePath().toString();
+    rc.ccCommand = commandPathChooser->unexpandedFilePath().toString();
     rc.ccBinaryPath = commandPathChooser->filePath();
     rc.timeOutS = timeOutSpinBox->value();
     rc.autoCheckOut = autoCheckOutCheckBox->isChecked();
diff --git a/src/plugins/cmakeprojectmanager/CMakeLists.txt b/src/plugins/cmakeprojectmanager/CMakeLists.txt
index 492d6284146..2c58b4f08b3 100644
--- a/src/plugins/cmakeprojectmanager/CMakeLists.txt
+++ b/src/plugins/cmakeprojectmanager/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_qtc_plugin(CMakeProjectManager
   PLUGIN_CLASS CMakeProjectPlugin
   DEPENDS QmlJS
-  PLUGIN_DEPENDS Core CppEditor ProjectExplorer TextEditor QtSupport
+  PLUGIN_DEPENDS Core CppEditor Debugger ProjectExplorer TextEditor QtSupport
   SYSTEM_INCLUDES 3dparty/cmake
   SOURCES
     builddirparameters.cpp builddirparameters.h
diff --git a/src/plugins/cmakeprojectmanager/CMakeProjectManager.json.in b/src/plugins/cmakeprojectmanager/CMakeProjectManager.json.in
index fc239c6a572..3a8cceda3e8 100644
--- a/src/plugins/cmakeprojectmanager/CMakeProjectManager.json.in
+++ b/src/plugins/cmakeprojectmanager/CMakeProjectManager.json.in
@@ -13,8 +13,14 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Build Systems",
-    "Description" : "CMake support.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Automate the configuration of build systems with CMake.",
+    "LongDescription" : [
+        "CMake controls the software compilation process by using simple configuration files, called CMakeLists.txt files.",
+        "You also need:",
+            "- CMake",
+        "Qt Online Installer installs a CMake version that you can use."
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
 
     "Mimetypes" : [
diff --git a/src/plugins/cmakeprojectmanager/builddirparameters.cpp b/src/plugins/cmakeprojectmanager/builddirparameters.cpp
index 71f6b820889..90f5f522299 100644
--- a/src/plugins/cmakeprojectmanager/builddirparameters.cpp
+++ b/src/plugins/cmakeprojectmanager/builddirparameters.cpp
@@ -26,6 +26,43 @@ namespace CMakeProjectManager::Internal {
 
 BuildDirParameters::BuildDirParameters() = default;
 
+static void updateCMakePathsFromQMake(QStringList &initialCMakeArguments)
+{
+    const CMakeConfigItem qmake = CMakeConfigItem::fromString(
+        Utils::findOrDefault(initialCMakeArguments, [](const QString &arg) {
+            return arg.startsWith("-DQT_QMAKE_EXECUTABLE");
+        }));
+    const FilePath qmakeFilePath = FilePath::fromUtf8(qmake.value);
+    if (qmakeFilePath.isEmpty())
+        return;
+
+    // ~Qt/6.x/platform/bin/qmake -> ~Qt/6.x/platform
+    const QByteArray qmakePrefixPath = qmakeFilePath.parentDir().parentDir().path().toUtf8();
+    const QByteArrayList cmakePathsVariables = {"CMAKE_PREFIX_PATH", "CMAKE_FIND_ROOT_PATH"};
+
+    for (const QByteArray &var : cmakePathsVariables) {
+        const QString varPrefix = QString("-D") + var;
+        auto it = std::find_if(
+            initialCMakeArguments.begin(),
+            initialCMakeArguments.end(),
+            [varPrefix](const QString &arg) { return arg.startsWith(varPrefix); });
+
+        if (it == initialCMakeArguments.end())
+            continue;
+
+        CMakeConfigItem cmakeVar = CMakeConfigItem::fromString(*it);
+        if (cmakeVar.isNull())
+            continue;
+
+        if (cmakeVar.value.isEmpty())
+            cmakeVar.value = qmakePrefixPath;
+        else
+            cmakeVar.value += ";" + qmakePrefixPath;
+
+        *it = cmakeVar.toString();
+    }
+}
+
 BuildDirParameters::BuildDirParameters(CMakeBuildSystem *buildSystem)
 {
     QTC_ASSERT(buildSystem, return);
@@ -40,6 +77,11 @@ BuildDirParameters::BuildDirParameters(CMakeBuildSystem *buildSystem)
                                                            });
     initialCMakeArguments = Utils::filtered(expandedArguments,
                                             [](const QString &s) { return !s.isEmpty(); });
+
+    const bool noQtInstallPrefix = expander->expand(QString("%{Qt:QT_INSTALL_PREFIX}")).isEmpty();
+    if (noQtInstallPrefix)
+        updateCMakePathsFromQMake(initialCMakeArguments);
+
     configurationChangesArguments = Utils::transform(buildSystem->configurationChangesArguments(),
                                                      [this](const QString &s) {
                                                          return expander->expand(s);
@@ -50,13 +92,13 @@ BuildDirParameters::BuildDirParameters(CMakeBuildSystem *buildSystem)
                                                 });
     const Target *t = bc->target();
     const Kit *k = t->kit();
-    const Project *p = t->project();
 
-    projectName = p->displayName();
+    project = t->project();
+    projectName = project->displayName();
 
     sourceDirectory = bc->sourceDirectory();
     if (sourceDirectory.isEmpty())
-        sourceDirectory = p->projectDirectory();
+        sourceDirectory = project->projectDirectory();
     buildDirectory = bc->buildDirectory();
 
     cmakeBuildType = buildSystem->cmakeBuildType();
diff --git a/src/plugins/cmakeprojectmanager/builddirparameters.h b/src/plugins/cmakeprojectmanager/builddirparameters.h
index f2648f7773c..b73993eb37c 100644
--- a/src/plugins/cmakeprojectmanager/builddirparameters.h
+++ b/src/plugins/cmakeprojectmanager/builddirparameters.h
@@ -15,6 +15,10 @@ class MacroExpander;
 class OutputLineParser;
 } // namespace Utils
 
+namespace ProjectExplorer {
+class Project;
+}
+
 namespace CMakeProjectManager::Internal {
 
 class CMakeBuildSystem;
@@ -29,6 +33,7 @@ public:
     CMakeTool *cmakeTool() const;
 
     QString projectName;
+    ProjectExplorer::Project *project = nullptr;
 
     Utils::FilePath sourceDirectory;
     Utils::FilePath buildDirectory;
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 762499aaf73..c3cae5ff62e 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -94,6 +94,14 @@ const char CMAKE_BUILD_TYPE[] = "CMake.Build.Type";
 const char CLEAR_SYSTEM_ENVIRONMENT_KEY[] = "CMake.Configure.ClearSystemEnvironment";
 const char USER_ENVIRONMENT_CHANGES_KEY[] = "CMake.Configure.UserEnvironmentChanges";
 const char BASE_ENVIRONMENT_KEY[] = "CMake.Configure.BaseEnvironment";
+const char GENERATE_QMLLS_INI_SETTING[] = "J.QtQuick/QmlJSEditor.GenerateQmllsIniFiles";
+
+const char CMAKE_TOOLCHAIN_FILE[] = "CMAKE_TOOLCHAIN_FILE";
+const char CMAKE_C_FLAGS_INIT[] = "CMAKE_C_FLAGS_INIT";
+const char CMAKE_CXX_FLAGS_INIT[] = "CMAKE_CXX_FLAGS_INIT";
+const char CMAKE_CXX_FLAGS[] = "CMAKE_CXX_FLAGS";
+const char CMAKE_CXX_FLAGS_DEBUG[] = "CMAKE_CXX_FLAGS_DEBUG";
+const char CMAKE_CXX_FLAGS_RELWITHDEBINFO[] = "CMAKE_CXX_FLAGS_RELWITHDEBINFO";
 
 namespace Internal {
 
@@ -127,6 +135,7 @@ private:
     void kitCMakeConfiguration();
     void updateConfigureDetailsWidgetsSummary(
         const QStringList &configurationArguments = QStringList());
+    void updatePackageManagerAutoSetup(CMakeConfig &initialList);
 
     CMakeBuildConfiguration *m_buildConfig;
     QTreeView *m_configView;
@@ -149,6 +158,7 @@ private:
 
     QPushButton *m_batchEditButton = nullptr;
     QPushButton *m_kitConfiguration = nullptr;
+    CMakeConfig m_configurationChanges;
 };
 
 static QModelIndex mapToSource(const QAbstractItemView *view, const QModelIndex &idx)
@@ -165,6 +175,16 @@ static QModelIndex mapToSource(const QAbstractItemView *view, const QModelIndex
     return result;
 }
 
+static CMakeConfigItem getPackageManagerAutoSetupParameter()
+{
+    const QByteArray key("CMAKE_PROJECT_INCLUDE_BEFORE");
+    const QByteArray value = QString(
+                                 "%{BuildConfig:BuildDirectory:NativeFilePath}/%1/auto-setup.cmake")
+                                 .arg(Constants::PACKAGE_MANAGER_DIR)
+                                 .toUtf8();
+    return CMakeConfigItem(key, CMakeConfigItem::FILEPATH, value);
+}
+
 CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc) :
     NamedWidget(Tr::tr("CMake")),
     m_buildConfig(bc),
@@ -296,7 +316,8 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
     m_batchEditButton->setToolTip(Tr::tr("Set or reset multiple values in the CMake configuration."));
 
     m_showAdvancedCheckBox = new QCheckBox(Tr::tr("Advanced"));
-    m_showAdvancedCheckBox->setChecked(settings().showAdvancedOptionsByDefault());
+    m_showAdvancedCheckBox->setChecked(
+        settings(m_buildConfig->project()).showAdvancedOptionsByDefault());
 
     connect(m_configView->selectionModel(), &QItemSelectionModel::selectionChanged,
             this, [this](const QItemSelection &, const QItemSelection &) {
@@ -341,7 +362,7 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
                 Column {
                     cmakeConfiguration,
                     Row {
-                        bc->initialCMakeArguments, br,
+                        bc->initialCMakeArguments,
                         bc->additionalCMakeOptions
                     },
                     m_reconfigureButton,
@@ -396,6 +417,11 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
         updateButtonState();
         m_showProgressTimer.stop();
         m_progressIndicator->hide();
+
+        if (!m_configurationChanges.isEmpty()) {
+            m_configModel->setBatchEditConfiguration(m_configurationChanges);
+            m_configurationChanges.clear();
+        }
         updateConfigurationStateSelection();
     });
 
@@ -482,8 +508,9 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
     connect(bs, &CMakeBuildSystem::warningOccurred,
             this, &CMakeBuildSettingsWidget::setWarning);
 
-    connect(bs, &CMakeBuildSystem::configurationChanged,
-            m_configModel, &ConfigModel::setBatchEditConfiguration);
+    connect(bs, &CMakeBuildSystem::configurationChanged, this, [this](const CMakeConfig &config) {
+        m_configurationChanges = config;
+    });
 
     updateFromKit();
     connect(m_buildConfig->target(), &Target::kitChanged,
@@ -585,11 +612,11 @@ void CMakeBuildSettingsWidget::reconfigureWithInitialParameters()
         Core::ICore::dialogParent(),
         Tr::tr("Re-configure with Initial Parameters"),
         Tr::tr("Clear CMake configuration and configure with initial parameters?"),
-        settings().askBeforeReConfigureInitialParams.askAgainCheckableDecider(),
+        settings(m_buildConfig->project()).askBeforeReConfigureInitialParams.askAgainCheckableDecider(),
         QMessageBox::Yes | QMessageBox::No,
         QMessageBox::Yes);
 
-    settings().writeSettings();
+    settings(m_buildConfig->project()).writeSettings();
 
     if (reply != QMessageBox::Yes)
         return;
@@ -602,10 +629,40 @@ void CMakeBuildSettingsWidget::reconfigureWithInitialParameters()
         m_buildConfig->cmakeBuildSystem()->runCMake();
 }
 
+void CMakeBuildSettingsWidget::updatePackageManagerAutoSetup(CMakeConfig &initialList)
+{
+    const bool usePackageManagerAutoSetup
+        = settings(m_buildConfig->project()).packageManagerAutoSetup();
+
+    const auto autoSetupParameter = getPackageManagerAutoSetupParameter();
+    auto it
+        = std::find_if(initialList.begin(), initialList.end(), [&autoSetupParameter](const CMakeConfigItem &item) {
+              return item.key == autoSetupParameter.key;
+          });
+    if (it != initialList.end()) {
+        if (!usePackageManagerAutoSetup && it->value == autoSetupParameter.value)
+            initialList.erase(it);
+    } else if (usePackageManagerAutoSetup) {
+        initialList.push_back(autoSetupParameter);
+    }
+}
+
 void CMakeBuildSettingsWidget::updateInitialCMakeArguments()
 {
     CMakeConfig initialList = m_buildConfig->initialCMakeArguments.cmakeConfiguration();
 
+    // set QT_QML_GENERATE_QMLLS_INI if it is enabled via the settings checkbox and if its not part
+    // of the initial CMake arguments yet
+    if (Core::ICore::settings()->value(GENERATE_QMLLS_INI_SETTING).toBool()) {
+        if (std::none_of(
+                initialList.constBegin(), initialList.constEnd(), [](const CMakeConfigItem &item) {
+                    return item.key == "QT_QML_GENERATE_QMLLS_INI";
+                })) {
+            initialList.append(
+                CMakeConfigItem("QT_QML_GENERATE_QMLLS_INI", CMakeConfigItem::BOOL, "ON"));
+        }
+    }
+
     for (const CMakeConfigItem &ci : m_buildConfig->cmakeBuildSystem()->configurationChanges()) {
         if (!ci.isInitial)
             continue;
@@ -623,6 +680,8 @@ void CMakeBuildSettingsWidget::updateInitialCMakeArguments()
         }
     }
 
+    updatePackageManagerAutoSetup(initialList);
+
     m_buildConfig->initialCMakeArguments.setCMakeConfiguration(initialList);
 
     // value() will contain only the unknown arguments (the non -D/-U arguments)
@@ -843,11 +902,11 @@ CMakeConfig CMakeBuildSettingsWidget::getQmlDebugCxxFlags()
     const bool enable = m_buildConfig->qmlDebugging() == TriState::Enabled;
 
     const CMakeConfig configList = m_buildConfig->cmakeBuildSystem()->configurationFromCMake();
-    const QByteArrayList cxxFlagsPrev{"CMAKE_CXX_FLAGS",
-                                      "CMAKE_CXX_FLAGS_DEBUG",
-                                      "CMAKE_CXX_FLAGS_RELWITHDEBINFO",
-                                      "CMAKE_CXX_FLAGS_INIT"};
-    const QByteArrayList cxxFlags{"CMAKE_CXX_FLAGS_INIT", "CMAKE_CXX_FLAGS"};
+    const QByteArrayList cxxFlagsPrev{CMAKE_CXX_FLAGS,
+                                      CMAKE_CXX_FLAGS_DEBUG,
+                                      CMAKE_CXX_FLAGS_RELWITHDEBINFO,
+                                      CMAKE_CXX_FLAGS_INIT};
+    const QByteArrayList cxxFlags{CMAKE_CXX_FLAGS_INIT, CMAKE_CXX_FLAGS};
     const QByteArray qmlDebug(QT_QML_DEBUG_PARAM);
 
     CMakeConfig changedConfig;
@@ -1100,7 +1159,8 @@ static bool isWindowsARM64(const Kit *k)
            && targetAbi.wordWidth() == 64;
 }
 
-static CommandLine defaultInitialCMakeCommand(const Kit *k, const QString &buildType)
+static CommandLine defaultInitialCMakeCommand(
+    const Kit *k, Project *project, const QString &buildType)
 {
     // Generator:
     CMakeTool *tool = CMakeKitAspect::cmakeTool(k);
@@ -1114,11 +1174,8 @@ static CommandLine defaultInitialCMakeCommand(const Kit *k, const QString &build
         cmd.addArg("-DCMAKE_BUILD_TYPE:STRING=" + buildType);
 
     // Package manager auto setup
-    if (settings().packageManagerAutoSetup()) {
-        cmd.addArg(QString("-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH="
-                           "%{BuildConfig:BuildDirectory:NativeFilePath}/%1/auto-setup.cmake")
-                       .arg(Constants::PACKAGE_MANAGER_DIR));
-    }
+    if (settings(project).packageManagerAutoSetup())
+        cmd.addArg(getPackageManagerAutoSetupParameter().toArgument());
 
     // Cross-compilation settings:
     if (!CMakeBuildConfiguration::isIos(k)) { // iOS handles this differently
@@ -1274,13 +1331,21 @@ static void addCMakeConfigurePresetToInitialArguments(QStringList &initialArgume
                 }
 
                 arg = argItem.toArgument();
-            } else if (argItem.key == "CMAKE_TOOLCHAIN_FILE") {
+            } else if (argItem.key == CMAKE_TOOLCHAIN_FILE) {
                 const FilePath argFilePath = FilePath::fromString(argItem.expandedValue(k));
                 const FilePath presetFilePath = FilePath::fromUserInput(
                     QString::fromUtf8(presetItem.value));
 
                 if (argFilePath != presetFilePath)
                     arg = presetItem.toArgument();
+            } else if (argItem.key == CMAKE_C_FLAGS_INIT || argItem.key == CMAKE_CXX_FLAGS_INIT) {
+                // Append the preset value with at the initial parameters value (e.g. QML Debugging)
+                if (argItem.expandedValue(k) != QString::fromUtf8(presetItem.value)) {
+                    argItem.value.append(" ");
+                    argItem.value.append(presetItem.value);
+
+                    arg = argItem.toArgument();
+                }
             } else if (argItem.expandedValue(k) != QString::fromUtf8(presetItem.value)) {
                 arg = presetItem.toArgument();
             }
@@ -1380,12 +1445,9 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
     buildTypeAspect.setDisplayStyle(StringAspect::LineEditDisplay);
     buildTypeAspect.setDefaultValue("Unknown");
 
-    initialCMakeArguments.setMacroExpanderProvider([this] { return macroExpander(); });
-
     additionalCMakeOptions.setSettingsKey("CMake.Additional.Options");
     additionalCMakeOptions.setLabelText(Tr::tr("Additional CMake <a href=\"options\">options</a>:"));
     additionalCMakeOptions.setDisplayStyle(StringAspect::LineEditDisplay);
-    additionalCMakeOptions.setMacroExpanderProvider([this] { return macroExpander(); });
 
     macroExpander()->registerVariable(DEVELOPMENT_TEAM_FLAG,
                                       Tr::tr("The CMake flag for the development team"),
@@ -1441,7 +1503,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
                                       ? extraInfoMap.value(CMAKE_BUILD_TYPE).toString()
                                       : info.typeName;
 
-        CommandLine cmd = defaultInitialCMakeCommand(k, buildType);
+        CommandLine cmd = defaultInitialCMakeCommand(k, target->project(), buildType);
         m_buildSystem->setIsMultiConfig(CMakeGeneratorKitAspect::isMultiConfigGenerator(k));
 
         // Android magic:
@@ -1530,7 +1592,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
         if (info.buildDirectory.isEmpty()) {
             setBuildDirectory(shadowBuildDirectory(target->project()->projectFilePath(),
                                                    k,
-                                                   info.typeName,
+                                                   info.displayName,
                                                    info.buildType));
         }
 
@@ -1542,7 +1604,13 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
                                   : TriState::Default);
 
         if (qt && qt->isQmlDebuggingSupported())
-            cmd.addArg("-DCMAKE_CXX_FLAGS_INIT:STRING=%{" + QLatin1String(QT_QML_DEBUG_FLAG) + "}");
+            cmd.addArg(
+                QLatin1String("-D") + CMAKE_CXX_FLAGS_INIT + ":STRING=%{" + QT_QML_DEBUG_FLAG + "}");
+
+        // QT_QML_GENERATE_QMLLS_INI, if enabled via the settings checkbox:
+        if (Core::ICore::settings()->value(GENERATE_QMLLS_INI_SETTING).toBool()) {
+            cmd.addArg("-DQT_QML_GENERATE_QMLLS_INI:BOOL=ON");
+        }
 
         CMakeProject *cmakeProject = static_cast<CMakeProject *>(target->project());
         configureEnv.setUserEnvironmentChanges(
@@ -1575,9 +1643,8 @@ FilePath CMakeBuildConfiguration::shadowBuildDirectory(const FilePath &projectFi
         return {};
 
     const QString projectName = projectFilePath.parentDir().fileName();
-    const FilePath projectDir = Project::projectDirectory(projectFilePath);
-    FilePath buildPath = buildDirectoryFromTemplate(projectDir, projectFilePath, projectName, k,
-                                                    bcName, buildType, "cmake");
+    FilePath buildPath = buildDirectoryFromTemplate(
+        projectFilePath.absolutePath(), projectFilePath, projectName, k, bcName, buildType, "cmake");
 
     if (CMakeGeneratorKitAspect::isMultiConfigGenerator(k)) {
         const QString path = buildPath.path();
@@ -1599,8 +1666,8 @@ bool CMakeBuildConfiguration::hasQmlDebugging(const CMakeConfig &config)
     // Determine QML debugging flags. This must match what we do in
     // CMakeBuildSettingsWidget::getQmlDebugCxxFlags()
     // such that in doubt we leave the QML Debugging setting at "Leave at default"
-    const QString cxxFlagsInit = config.stringValueOf("CMAKE_CXX_FLAGS_INIT");
-    const QString cxxFlags = config.stringValueOf("CMAKE_CXX_FLAGS");
+    const QString cxxFlagsInit = config.stringValueOf(CMAKE_CXX_FLAGS_INIT);
+    const QString cxxFlags = config.stringValueOf(CMAKE_CXX_FLAGS);
     return cxxFlagsInit.contains(QT_QML_DEBUG_PARAM) && cxxFlags.contains(QT_QML_DEBUG_PARAM);
 }
 
@@ -1888,8 +1955,6 @@ CMakeBuildConfigurationFactory::CMakeBuildConfigurationFactory()
     setBuildGenerator([](const Kit *k, const FilePath &projectPath, bool forSetup) {
         QList<BuildInfo> result;
 
-        FilePath path = forSetup ? Project::projectDirectory(projectPath) : projectPath;
-
         // Skip the default shadow build directories for build types if we have presets
         const CMakeConfigItem presetItem = CMakeConfigurationKitAspect::cmakePresetConfigItem(k);
         if (!presetItem.isNull())
@@ -1902,6 +1967,9 @@ CMakeBuildConfigurationFactory::CMakeBuildConfigurationFactory()
                                 k,
                                 info.typeName,
                                 info.buildType);
+            } else {
+                info.displayName.clear(); // ask for a name
+                info.buildDirectory.clear(); // This depends on the displayName
             }
             result << info;
         }
@@ -2023,7 +2091,7 @@ void CMakeBuildConfiguration::addToEnvironment(Utils::Environment &env) const
     if (tool && tool->cmakeExecutable().needsDevice())
         return;
 
-    const FilePath ninja = settings().ninjaPath();
+    const FilePath ninja = settings(nullptr).ninjaPath();
     if (!ninja.isEmpty())
         env.appendOrSetPath(ninja.isFile() ? ninja.parentDir() : ninja);
 }
@@ -2118,9 +2186,20 @@ void InitialCMakeArgumentsAspect::setAllValues(const QString &values, QStringLis
     if (!cmakeGenerator.isEmpty())
         arguments.append(cmakeGenerator);
 
-    m_cmakeConfiguration = CMakeConfig::fromArguments(arguments, additionalOptions);
-    for (CMakeConfigItem &ci : m_cmakeConfiguration)
+    CMakeConfig config = CMakeConfig::fromArguments(arguments, additionalOptions);
+    // Join CMAKE_CXX_FLAGS_INIT values if more entries are present, or skip the same
+    // values like CMAKE_EXE_LINKER_FLAGS_INIT coming from both C and CXX compilers
+    QHash<QByteArray, CMakeConfigItem> uniqueConfig;
+    for (CMakeConfigItem &ci : config) {
         ci.isInitial = true;
+        if (uniqueConfig.contains(ci.key)) {
+            if (uniqueConfig[ci.key].value != ci.value)
+                uniqueConfig[ci.key].value = uniqueConfig[ci.key].value + " " + ci.value;
+        } else {
+            uniqueConfig.insert(ci.key, ci);
+        }
+    }
+    m_cmakeConfiguration = uniqueConfig.values();
 
     // Display the unknown arguments in "Additional CMake Options"
     const QString additionalOptionsValue = ProcessArgs::joinArgs(additionalOptions);
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index 6663b311a42..aacd273f63e 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -436,10 +436,15 @@ CommandLine CMakeBuildStep::cmakeCommand() const
     CommandLine cmd{cmakeExecutable()};
 
     FilePath buildDirectory = ".";
-    if (buildConfiguration())
+    Project *project = nullptr;
+    if (buildConfiguration()) {
         buildDirectory = buildConfiguration()->buildDirectory();
+        project = buildConfiguration()->project();
+    }
 
-    cmd.addArgs({"--build", CMakeToolManager::mappedFilePath(buildDirectory).path()});
+    cmd.addArgs(
+        {"--build",
+         CMakeToolManager::mappedFilePath(project, buildDirectory).path()});
 
     cmd.addArg("--target");
     cmd.addArgs(Utils::transform(m_buildTargets, [this](const QString &s) {
@@ -600,7 +605,7 @@ QWidget *CMakeBuildStep::createConfigWidget()
     if (!isCleanStep() && !m_buildPreset.isEmpty())
         createAndAddEnvironmentWidgets(builder);
 
-    builder.addItem(Layouting::noMargin);
+    builder.setNoMargins();
     auto widget = builder.emerge();
 
     updateDetails();
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
index b2b042a2b0d..8a65c45b7f9 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -83,12 +83,17 @@ CMakeBuildSystem::CMakeBuildSystem(CMakeBuildConfiguration *bc)
 
         // Cache mime check result for speed up
         if (!isIgnored) {
-            auto it = m_mimeBinaryCache.find(mimeType.name());
-            if (it != m_mimeBinaryCache.end()) {
+            if (auto it = m_mimeBinaryCache.get<std::optional<bool>>(
+                    [mimeType](const QHash<QString, bool> &cache) -> std::optional<bool> {
+                        auto cache_it = cache.find(mimeType.name());
+                        if (cache_it != cache.end())
+                            return *cache_it;
+                        return {};
+                    })) {
                 isIgnored = *it;
             } else {
                 isIgnored = TreeScanner::isMimeBinary(mimeType, fn);
-                m_mimeBinaryCache[mimeType.name()] = isIgnored;
+                m_mimeBinaryCache.writeLocked()->insert(mimeType.name(), isIgnored);
             }
         }
 
@@ -394,12 +399,10 @@ static SnippetAndLocation generateSnippetAndLocationForSources(
 static expected_str<bool> insertSnippetSilently(const FilePath &cmakeFile,
                                                 const SnippetAndLocation &snippetLocation)
 {
-    BaseTextEditor *editor = qobject_cast<BaseTextEditor *>(
-        Core::EditorManager::openEditorAt({cmakeFile,
-                                           int(snippetLocation.line),
-                                           int(snippetLocation.column)},
-                                          Constants::CMAKE_EDITOR_ID,
-                                          Core::EditorManager::DoNotMakeVisible));
+    BaseTextEditor *editor = qobject_cast<BaseTextEditor *>(Core::EditorManager::openEditorAt(
+        {cmakeFile, int(snippetLocation.line), int(snippetLocation.column)},
+        Constants::CMAKE_EDITOR_ID,
+        Core::EditorManager::DoNotMakeVisible | Core::EditorManager::DoNotChangeCurrentEditor));
     if (!editor) {
         return make_unexpected("BaseTextEditor cannot be obtained for " + cmakeFile.toUserOutput()
                                + ":" + QString::number(snippetLocation.line) + ":"
@@ -637,6 +640,25 @@ bool CMakeBuildSystem::addTsFiles(Node *context, const FilePaths &filePaths, Fil
     return false;
 }
 
+static bool isGlobbingFunction(const cmListFile &cmakeListFile, const cmListFileFunction &func)
+{
+    // Check if the filename is part of globbing variable result
+    const auto globFunctions = std::get<0>(
+        Utils::partition(cmakeListFile.Functions, [](const auto &f) {
+            return f.LowerCaseName() == "file" && f.Arguments().size() > 2
+                   && (f.Arguments().front().Value == "GLOB"
+                       || f.Arguments().front().Value == "GLOB_RECURSE");
+        }));
+
+    const auto globVariables = Utils::transform<QSet>(globFunctions, [](const auto &func) {
+        return std::string("${") + func.Arguments()[1].Value + "}";
+    });
+
+    return Utils::anyOf(func.Arguments(), [globVariables](const auto &arg) {
+        return globVariables.contains(arg.Value);
+    });
+}
+
 bool CMakeBuildSystem::addSrcFiles(Node *context, const FilePaths &filePaths, FilePaths *notAdded)
 {
     if (notAdded)
@@ -665,26 +687,32 @@ bool CMakeBuildSystem::addSrcFiles(Node *context, const FilePaths &filePaths, Fi
             return false;
         }
 
-        const std::string target_name = function->Arguments().front().Value;
-        auto qtAddModule = [target_name](const auto &func) {
-            return (func.LowerCaseName() == "qt_add_qml_module"
-                    || func.LowerCaseName() == "qt6_add_qml_module")
-                    && func.Arguments().front().Value == target_name;
-        };
-        // Special case: when qt_add_executable and qt_add_qml_module use the same target name
-        // then qt_add_qml_module function should be used
-        function = findFunction(*cmakeListFile, qtAddModule).value_or(*function);
+        const bool haveGlobbing = isGlobbingFunction(cmakeListFile.value(), function.value());
+        n->setVisibleAfterAddFileAction(!haveGlobbing);
+        if (haveGlobbing && settings(project()).autorunCMake()) {
+            runCMake();
+        } else {
+            const std::string target_name = function->Arguments().front().Value;
+            auto qtAddModule = [target_name](const auto &func) {
+                return (func.LowerCaseName() == "qt_add_qml_module"
+                        || func.LowerCaseName() == "qt6_add_qml_module")
+                        && func.Arguments().front().Value == target_name;
+            };
+            // Special case: when qt_add_executable and qt_add_qml_module use the same target name
+            // then qt_add_qml_module function should be used
+            function = findFunction(*cmakeListFile, qtAddModule).value_or(*function);
 
-        const QString newSourceFiles = newFilesForFunction(function->LowerCaseName(),
-                                                           filePaths,
-                                                           n->filePath().canonicalPath());
+            const QString newSourceFiles = newFilesForFunction(function->LowerCaseName(),
+                                                               filePaths,
+                                                               n->filePath().canonicalPath());
 
-        const SnippetAndLocation snippetLocation = generateSnippetAndLocationForSources(
-                    newSourceFiles, *cmakeListFile, *function, targetName);
-        expected_str<bool> inserted = insertSnippetSilently(targetCMakeFile, snippetLocation);
-        if (!inserted) {
-            qCCritical(cmakeBuildSystemLog) << inserted.error();
-            return false;
+            const SnippetAndLocation snippetLocation = generateSnippetAndLocationForSources(
+                        newSourceFiles, *cmakeListFile, *function, targetName);
+            expected_str<bool> inserted = insertSnippetSilently(targetCMakeFile, snippetLocation);
+            if (!inserted) {
+                qCCritical(cmakeBuildSystemLog) << inserted.error();
+                return false;
+            }
         }
 
         if (notAdded)
@@ -765,22 +793,7 @@ CMakeBuildSystem::projectFileArgumentPosition(const QString &targetName, const Q
             return ProjectFileArgumentPosition{filePathArgument, targetCMakeFile, fileName};
         } else {
             // Check if the filename is part of globbing variable result
-            const auto globFunctions = std::get<0>(
-                Utils::partition(cmakeListFile->Functions, [](const auto &f) {
-                    return f.LowerCaseName() == "file" && f.Arguments().size() > 2
-                           && (f.Arguments().front().Value == "GLOB"
-                               || f.Arguments().front().Value == "GLOB_RECURSE");
-                }));
-
-            const auto globVariables = Utils::transform<QSet>(globFunctions, [](const auto &func) {
-                return std::string("${") + func.Arguments()[1].Value + "}";
-            });
-
-            const auto haveGlobbing = Utils::anyOf(func->Arguments(),
-                                                   [globVariables](const auto &arg) {
-                                                       return globVariables.contains(arg.Value);
-                                                   });
-
+            const auto haveGlobbing = isGlobbingFunction(cmakeListFile.value(), func.value());
             if (haveGlobbing) {
                 return ProjectFileArgumentPosition{filePathArgument,
                                                    targetCMakeFile,
@@ -828,6 +841,7 @@ RemovedFilesFromProject CMakeBuildSystem::removeFiles(Node *context,
         const FilePath projDir = n->filePath().canonicalPath();
         const QString targetName = n->buildKey();
 
+        bool haveGlobbing = false;
         for (const auto &file : filePaths) {
             const QString fileName
                 = file.canonicalPath().relativePathFrom(projDir).cleanPath().toString();
@@ -842,13 +856,19 @@ RemovedFilesFromProject CMakeBuildSystem::removeFiles(Node *context,
                     continue;
                 }
 
+                if (filePos.value().fromGlobbing) {
+                    haveGlobbing = true;
+                    continue;
+                }
+
                 BaseTextEditor *editor = qobject_cast<BaseTextEditor *>(
-                    Core::EditorManager::openEditorAt({filePos.value().cmakeFile,
-                                                       static_cast<int>(filePos.value().argumentPosition.Line),
-                                                       static_cast<int>(filePos.value().argumentPosition.Column
-                                                                        - 1)},
-                                                      Constants::CMAKE_EDITOR_ID,
-                                                      Core::EditorManager::DoNotMakeVisible));
+                    Core::EditorManager::openEditorAt(
+                        {filePos.value().cmakeFile,
+                         static_cast<int>(filePos.value().argumentPosition.Line),
+                         static_cast<int>(filePos.value().argumentPosition.Column - 1)},
+                        Constants::CMAKE_EDITOR_ID,
+                        Core::EditorManager::DoNotMakeVisible
+                            | Core::EditorManager::DoNotChangeCurrentEditor));
                 if (!editor) {
                     badFiles << file;
 
@@ -864,8 +884,7 @@ RemovedFilesFromProject CMakeBuildSystem::removeFiles(Node *context,
                 if (filePos->argumentPosition.Delim == cmListFileArgument::Quoted)
                     extraChars = 2;
 
-                if (!filePos.value().fromGlobbing)
-                    editor->replace(filePos.value().relativeFileName.length() + extraChars, "");
+                editor->replace(filePos.value().relativeFileName.length() + extraChars, "");
 
                 editor->editorWidget()->autoIndent();
                 if (!Core::DocumentManager::saveDocument(editor->document())) {
@@ -884,6 +903,9 @@ RemovedFilesFromProject CMakeBuildSystem::removeFiles(Node *context,
         if (notRemoved && !badFiles.isEmpty())
             *notRemoved = badFiles;
 
+        if (haveGlobbing && settings(project()).autorunCMake())
+            runCMake();
+
         return badFiles.isEmpty() ? RemovedFilesFromProject::Ok : RemovedFilesFromProject::Error;
     }
 
@@ -931,10 +953,6 @@ bool CMakeBuildSystem::renameFile(Node *context,
         const FilePath newRelPath = newFilePath.canonicalPath().relativePathFrom(projDir).cleanPath();
         const QString newRelPathName = newRelPath.toString();
 
-        // FilePath needs the file to exist on disk, the old file has already been renamed
-        const QString oldRelPathName
-            = newRelPath.parentDir().pathAppended(oldFilePath.fileName()).cleanPath().toString();
-
         const QString targetName = n->buildKey();
         const QString key
             = QStringList{projDir.path(), targetName, oldFilePath.path(), newFilePath.path()}.join(
@@ -948,39 +966,47 @@ bool CMakeBuildSystem::renameFile(Node *context,
             return false;
         }
 
+        bool haveGlobbing = false;
         do {
-            BaseTextEditor *editor = qobject_cast<BaseTextEditor *>(
-                Core::EditorManager::openEditorAt(
-                    {fileToRename->cmakeFile,
-                     static_cast<int>(fileToRename->argumentPosition.Line),
-                     static_cast<int>(fileToRename->argumentPosition.Column - 1)},
-                    Constants::CMAKE_EDITOR_ID,
-                    Core::EditorManager::DoNotMakeVisible));
-            if (!editor) {
-                qCCritical(cmakeBuildSystemLog).noquote()
-                    << "BaseTextEditor cannot be obtained for" << fileToRename->cmakeFile.path()
-                    << fileToRename->argumentPosition.Line
-                    << int(fileToRename->argumentPosition.Column);
-                return false;
-            }
+            if (!fileToRename->fromGlobbing) {
+                BaseTextEditor *editor = qobject_cast<BaseTextEditor *>(
+                    Core::EditorManager::openEditorAt(
+                        {fileToRename->cmakeFile,
+                         static_cast<int>(fileToRename->argumentPosition.Line),
+                         static_cast<int>(fileToRename->argumentPosition.Column - 1)},
+                        Constants::CMAKE_EDITOR_ID,
+                        Core::EditorManager::DoNotMakeVisible
+                            | Core::EditorManager::DoNotChangeCurrentEditor));
+                if (!editor) {
+                    qCCritical(cmakeBuildSystemLog).noquote()
+                        << "BaseTextEditor cannot be obtained for" << fileToRename->cmakeFile.path()
+                        << fileToRename->argumentPosition.Line
+                        << int(fileToRename->argumentPosition.Column);
+                    return false;
+                }
 
-            // If quotes were used for the source file, skip the starting quote
-            if (fileToRename->argumentPosition.Delim == cmListFileArgument::Quoted)
-                editor->setCursorPosition(editor->position() + 1);
+                // If quotes were used for the source file, skip the starting quote
+                if (fileToRename->argumentPosition.Delim == cmListFileArgument::Quoted)
+                    editor->setCursorPosition(editor->position() + 1);
 
-            if (!fileToRename->fromGlobbing)
                 editor->replace(fileToRename->relativeFileName.length(), newRelPathName);
 
-            editor->editorWidget()->autoIndent();
-            if (!Core::DocumentManager::saveDocument(editor->document())) {
-                qCCritical(cmakeBuildSystemLog).noquote()
-                    << "Changes to" << fileToRename->cmakeFile.path() << "could not be saved.";
-                return false;
+                editor->editorWidget()->autoIndent();
+                if (!Core::DocumentManager::saveDocument(editor->document())) {
+                    qCCritical(cmakeBuildSystemLog).noquote()
+                        << "Changes to" << fileToRename->cmakeFile.path() << "could not be saved.";
+                    return false;
+                }
+            } else {
+                haveGlobbing = true;
             }
 
             // Try the next occurrence. This can happen if set_source_file_properties is used
-            fileToRename = projectFileArgumentPosition(targetName, oldRelPathName);
-        } while (fileToRename);
+            fileToRename = projectFileArgumentPosition(targetName, fileToRename->relativeFileName);
+        } while (fileToRename && !fileToRename->fromGlobbing);
+
+        if (haveGlobbing && settings(project()).autorunCMake())
+            runCMake();
 
         return true;
     }
@@ -1204,7 +1230,9 @@ void CMakeBuildSystem::clearCMakeCache()
         m_parameters.buildDirectory / "CMakeFiles",
         m_parameters.buildDirectory / ".cmake/api/v1/reply",
         m_parameters.buildDirectory / ".cmake/api/v1/reply.prev",
-        m_parameters.buildDirectory / Constants::PACKAGE_MANAGER_DIR
+        m_parameters.buildDirectory / Constants::PACKAGE_MANAGER_DIR,
+        m_parameters.buildDirectory / "conan-dependencies",
+        m_parameters.buildDirectory / "vcpkg-dependencies"
     };
 
     for (const FilePath &path : pathsToDelete)
@@ -1460,6 +1488,11 @@ void CMakeBuildSystem::updateFallbackProjectData()
                                        Tr::tr("Scan \"%1\" project tree")
                                            .arg(project()->displayName()),
                                        "CMake.Scan.Tree");
+
+    // A failed configuration could be the result of an compiler update
+    // which then would cause CMake to fail. Make sure to offer an upgrade path
+    // to the new Kit compiler values.
+    updateInitialCMakeExpandableVars();
 }
 
 void CMakeBuildSystem::updateCMakeConfiguration(QString &errorMessage)
@@ -1641,7 +1674,7 @@ void CMakeBuildSystem::wireUpConnections()
     connect(project(), &Project::projectFileIsDirty, this, [this] {
         const bool isBuilding = BuildManager::isBuilding(project());
         if (buildConfiguration()->isActive() && !isParsing() && !isBuilding) {
-            if (settings().autorunCMake()) {
+            if (settings(project()).autorunCMake()) {
                 qCDebug(cmakeBuildSystemLog) << "Requesting parse due to dirty project file";
                 reparse(CMakeBuildSystem::REPARSE_FORCE_CMAKE_RUN);
             }
@@ -1970,6 +2003,9 @@ static FilePaths librarySearchPaths(const CMakeBuildSystem *bs, const QString &b
 
 const QList<BuildTargetInfo> CMakeBuildSystem::appTargets() const
 {
+    const CMakeConfig &cm = configurationFromCMake();
+    QString emulator = cm.stringValueOf("CMAKE_CROSSCOMPILING_EMULATOR");
+
     QList<BuildTargetInfo> appTargetList;
     const bool forAndroid = DeviceTypeKitAspect::deviceTypeId(kit())
                             == Android::Constants::ANDROID_DEVICE_TYPE;
@@ -1982,6 +2018,15 @@ const QList<BuildTargetInfo> CMakeBuildSystem::appTargets() const
 
             BuildTargetInfo bti;
             bti.displayName = ct.title;
+            if (ct.launchers.size() > 0)
+                bti.launchers = ct.launchers;
+            else if (!emulator.isEmpty()) {
+                // fallback for cmake < 3.29
+                QStringList args = emulator.split(";");
+                FilePath command = FilePath::fromString(args.takeFirst());
+                LauncherInfo launcherInfo = { "emulator", command, args };
+                bti.launchers.append(Launcher(launcherInfo, ct.sourceDirectory));
+            }
             bti.targetFilePath = ct.executable;
             bti.projectFilePath = ct.sourceDirectory.cleanPath();
             bti.workingDirectory = ct.workingDirectory;
@@ -2054,19 +2099,17 @@ const QList<TestCaseInfo> CMakeBuildSystem::testcasesInfo() const
 CommandLine CMakeBuildSystem::commandLineForTests(const QList<QString> &tests,
                                                   const QStringList &options) const
 {
-    QStringList args = options;
     const QSet<QString> testsSet = Utils::toSet(tests);
-    auto current = Utils::transform<QSet<QString>>(m_testNames, &TestCaseInfo::name);
+    const auto current = Utils::transform<QSet<QString>>(m_testNames, &TestCaseInfo::name);
     if (tests.isEmpty() || current == testsSet)
-        return {m_ctestPath, args};
+        return {m_ctestPath, options};
 
     QString testNumbers("0,0,0"); // start, end, stride
     for (const TestCaseInfo &info : m_testNames) {
         if (testsSet.contains(info.name))
             testNumbers += QString(",%1").arg(info.number);
     }
-    args << "-I" << testNumbers;
-    return {m_ctestPath, args};
+    return {m_ctestPath, {options, "-I", testNumbers}};
 }
 
 DeploymentData CMakeBuildSystem::deploymentDataFromFile() const
@@ -2285,6 +2328,18 @@ void CMakeBuildSystem::updateInitialCMakeExpandableVars()
         }
     }
 
+    // Handle MSVC C/C++ compiler update, by udating also the linker, otherwise projects
+    // will fail to compile by using a linker that doesn't exist
+    const FilePath cxxCompiler = config.filePathValueOf("CMAKE_CXX_COMPILER");
+    if (!cxxCompiler.isEmpty() && cxxCompiler.fileName() == "cl.exe") {
+        const FilePath linker = cm.filePathValueOf("CMAKE_LINKER");
+        if (!linker.exists())
+            config << CMakeConfigItem(
+                "CMAKE_LINKER",
+                CMakeConfigItem::FILEPATH,
+                cxxCompiler.parentDir().pathAppended(linker.fileName()).path().toUtf8());
+    }
+
     if (!config.isEmpty())
         emit configurationChanged(config);
 }
@@ -2300,11 +2355,14 @@ MakeInstallCommand CMakeBuildSystem::makeInstallCommand(const FilePath &installR
         installTarget = "INSTALL";
 
     FilePath buildDirectory = ".";
-    if (auto bc = buildConfiguration())
+    Project *project = nullptr;
+    if (auto bc = buildConfiguration()) {
         buildDirectory = bc->buildDirectory();
+        project = bc->project();
+    }
 
     cmd.command.addArg("--build");
-    cmd.command.addArg(CMakeToolManager::mappedFilePath(buildDirectory).path());
+    cmd.command.addArg(CMakeToolManager::mappedFilePath(project, buildDirectory).path());
     cmd.command.addArg("--target");
     cmd.command.addArg(installTarget);
 
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.h b/src/plugins/cmakeprojectmanager/cmakebuildsystem.h
index dd85a52e228..32966c64bbb 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.h
@@ -10,6 +10,7 @@
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildsystem.h>
 
+#include <utils/synchronizedvalue.h>
 #include <utils/temporarydirectory.h>
 
 namespace ProjectExplorer {
@@ -221,7 +222,7 @@ private:
 
     ProjectExplorer::TreeScanner m_treeScanner;
     std::shared_ptr<ProjectExplorer::FolderNode> m_allFiles;
-    QHash<QString, bool> m_mimeBinaryCache;
+    Utils::SynchronizedValue<QHash<QString, bool>> m_mimeBinaryCache;
 
     bool m_waitingForParse = false;
     bool m_combinedScanAndParseResult = false;
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildtarget.h b/src/plugins/cmakeprojectmanager/cmakebuildtarget.h
index d40729a3970..934070bdfd1 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildtarget.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildtarget.h
@@ -7,6 +7,7 @@
 
 #include <projectexplorer/projectmacro.h>
 #include <projectexplorer/projectnodes.h>
+#include <projectexplorer/runconfigurationaspects.h>
 
 #include <utils/fileutils.h>
 
@@ -30,6 +31,7 @@ class CMAKE_EXPORT CMakeBuildTarget
 public:
     QString title;
     Utils::FilePath executable; // TODO: rename to output?
+    QList<ProjectExplorer::Launcher> launchers;
     TargetType targetType = UtilityType;
     bool linksToQtGui = false;
     bool qtcRunnable = true;
diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
index 968d6260e70..c4e91031015 100644
--- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
@@ -26,7 +26,6 @@
 #include <texteditor/basehoverhandler.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>
-#include <texteditor/texteditoractionhandler.h>
 
 #include <utils/mimeconstants.h>
 #include <utils/textutils.h>
@@ -331,7 +330,8 @@ void CMakeEditorWidget::findLinkAt(const QTextCursor &cursor,
 
     if (auto project = ProjectTree::currentProject()) {
         buffer.replace("${CMAKE_SOURCE_DIR}", project->projectDirectory().path());
-        if (auto bs = ProjectTree::currentBuildSystem(); bs->buildConfiguration()) {
+        auto bs = ProjectTree::currentBuildSystem();
+        if (bs && bs->buildConfiguration()) {
             buffer.replace("${CMAKE_BINARY_DIR}", bs->buildConfiguration()->buildDirectory().path());
 
             // Get the path suffix from current source dir to project source dir and apply it
@@ -533,9 +533,9 @@ public:
         setCompletionAssistProvider(new CMakeFileCompletionAssistProvider);
         setAutoCompleterCreator([] { return new CMakeAutoCompleter; });
 
-        setEditorActionHandlers(TextEditorActionHandler::UnCommentSelection
-                                | TextEditorActionHandler::FollowSymbolUnderCursor
-                                | TextEditorActionHandler::Format);
+        setOptionalActionMask(OptionalActions::UnCommentSelection
+                                | OptionalActions::FollowSymbolUnderCursor
+                                | OptionalActions::Format);
 
         addHoverHandler(new CMakeHoverHandler);
 
diff --git a/src/plugins/cmakeprojectmanager/cmakeformatter.cpp b/src/plugins/cmakeprojectmanager/cmakeformatter.cpp
index 4cbd4d2d50e..c21b12a93aa 100644
--- a/src/plugins/cmakeprojectmanager/cmakeformatter.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeformatter.cpp
@@ -79,7 +79,7 @@ public:
                 Space(10),
                 Group {
                     title(Tr::tr("Automatic Formatting on File Save")),
-                    autoFormatOnSave.groupChecker(),
+                    groupChecker(autoFormatOnSave.groupChecker()),
                     // Conceptually, that's a Form, but this would look odd:
                     // xxxxxx [____]
                     //        [x] xxxxxxxxxxxxxx
diff --git a/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp b/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
index 00750f4d3c5..bfc66d763bb 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
@@ -97,6 +97,7 @@ public:
 
 private:
     QVariant defaultValue(const Kit *k) const;
+    bool isNinjaPresent(const Kit *k, const CMakeTool *tool) const;
 };
 
 class CMakeConfigurationKitAspectFactory : public KitAspectFactory
@@ -148,7 +149,7 @@ private:
     // KitAspectWidget interface
     void makeReadOnly() override { m_comboBox->setEnabled(false); }
 
-    void addToLayoutImpl(Layouting::LayoutItem &builder) override
+    void addToLayoutImpl(Layouting::Layout &builder) override
     {
         addMutableAction(m_comboBox);
         builder.addItem(m_comboBox);
@@ -376,7 +377,7 @@ private:
     // KitAspectWidget interface
     void makeReadOnly() override { m_changeButton->setEnabled(false); }
 
-    void addToLayoutImpl(Layouting::LayoutItem &parent) override
+    void addToLayoutImpl(Layouting::Layout &parent) override
     {
         addMutableAction(m_label);
         parent.addItem(m_label);
@@ -556,6 +557,17 @@ CMakeGeneratorKitAspectFactory::CMakeGeneratorKitAspectFactory()
     setDescription(Tr::tr("CMake generator defines how a project is built when using CMake.<br>"
                       "This setting is ignored when using other build systems."));
     setPriority(19000);
+
+    auto updateKits = [this] {
+        if (KitManager::isLoaded()) {
+            for (Kit *k : KitManager::kits())
+                fix(k);
+        }
+    };
+
+    //make sure the default value is set if a new default CMake is set
+    connect(CMakeToolManager::instance(), &CMakeToolManager::defaultCMakeChanged,
+            this, updateKits);
 }
 
 QString CMakeGeneratorKitAspect::generator(const Kit *k)
@@ -664,18 +676,7 @@ QVariant CMakeGeneratorKitAspectFactory::defaultValue(const Kit *k) const
         return g.matches("Ninja");
     });
     if (it != known.constEnd()) {
-        const bool hasNinja = [k, tool] {
-            if (Internal::settings().ninjaPath().isEmpty()) {
-                auto findNinja = [](const Environment &env) -> bool {
-                    return !env.searchInPath("ninja").isEmpty();
-                };
-                if (!findNinja(tool->filePath().deviceEnvironment()))
-                    return findNinja(k->buildEnvironment());
-            }
-            return true;
-        }();
-
-        if (hasNinja)
+        if (isNinjaPresent(k, tool))
             return GeneratorInfo("Ninja").toVariant();
     }
 
@@ -695,7 +696,7 @@ QVariant CMakeGeneratorKitAspectFactory::defaultValue(const Kit *k) const
                                   return g.matches("NMake Makefiles")
                                          || g.matches("NMake Makefiles JOM");
                               });
-            if (ProjectExplorerPlugin::projectExplorerSettings().useJom) {
+            if (projectExplorerSettings().useJom) {
                 it = std::find_if(known.constBegin(),
                                   known.constEnd(),
                                   [](const CMakeTool::Generator &g) {
@@ -725,6 +726,18 @@ QVariant CMakeGeneratorKitAspectFactory::defaultValue(const Kit *k) const
     return GeneratorInfo(it->name).toVariant();
 }
 
+bool CMakeGeneratorKitAspectFactory::isNinjaPresent(const Kit *k, const CMakeTool *tool) const
+{
+    if (Internal::settings(nullptr).ninjaPath().isEmpty()) {
+        auto findNinja = [](const Environment &env) -> bool {
+            return !env.searchInPath("ninja").isEmpty();
+        };
+        if (!findNinja(tool->filePath().deviceEnvironment()))
+            return findNinja(k->buildEnvironment());
+    }
+    return true;
+}
+
 Tasks CMakeGeneratorKitAspectFactory::validate(const Kit *k) const
 {
     CMakeTool *tool = CMakeKitAspect::cmakeTool(k);
@@ -783,7 +796,7 @@ void CMakeGeneratorKitAspectFactory::fix(Kit *k)
                            [info](const CMakeTool::Generator &g) {
         return g.matches(info.generator);
     });
-    if (it == known.constEnd()) {
+    if (it == known.constEnd() || (info.generator == "Ninja" && !isNinjaPresent(k, tool))) {
         GeneratorInfo dv;
         dv.fromVariant(defaultValue(k));
         setGeneratorInfo(k, dv);
@@ -800,7 +813,7 @@ void CMakeGeneratorKitAspectFactory::upgrade(Kit *k)
     QTC_ASSERT(k, return);
 
     const QVariant value = k->value(GENERATOR_ID);
-    if (value.type() != QVariant::Map) {
+    if (value.typeId() != QMetaType::QVariantMap) {
         GeneratorInfo info;
         const QString fullName = value.toString();
         const int pos = fullName.indexOf(" - ");
@@ -875,7 +888,7 @@ public:
 
 private:
     // KitAspectWidget interface
-    void addToLayoutImpl(Layouting::LayoutItem &parent) override
+    void addToLayoutImpl(Layouting::Layout &parent) override
     {
         addMutableAction(m_summaryLabel);
         parent.addItem(m_summaryLabel);
diff --git a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp
index 0964aae46c3..2445cf58b60 100644
--- a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp
@@ -35,8 +35,13 @@ static LocatorMatcherTasks cmakeMatchers(const BuildAcceptor &acceptor)
 
     const auto onSetup = [storage, acceptor] {
         const QString input = storage->input();
+        const QRegularExpression regexp
+            = ILocatorFilter::createRegExp(input, ILocatorFilter::caseSensitivity(input));
+        if (!regexp.isValid())
+            return;
+        LocatorFilterEntries entries[int(ILocatorFilter::MatchLevel::Count)];
+
         const QList<Project *> projects = ProjectManager::projects();
-        LocatorFilterEntries entries;
         for (Project *project : projects) {
             const auto cmakeProject = qobject_cast<const CMakeProject *>(project);
             if (!cmakeProject || !cmakeProject->activeTarget())
@@ -50,8 +55,8 @@ static LocatorMatcherTasks cmakeMatchers(const BuildAcceptor &acceptor)
             for (const CMakeBuildTarget &target : buildTargets) {
                 if (CMakeBuildSystem::filteredOutTarget(target))
                     continue;
-                const int index = target.title.indexOf(input, 0, Qt::CaseInsensitive);
-                if (index >= 0) {
+                const QRegularExpressionMatch match = regexp.match(target.title);
+                if (match.hasMatch()) {
                     const FilePath projectPath = cmakeProject->projectFilePath();
                     const QString displayName = target.title;
                     LocatorFilterEntry entry;
@@ -72,14 +77,21 @@ static LocatorMatcherTasks cmakeMatchers(const BuildAcceptor &acceptor)
                     } else {
                         entry.extraInfo = projectPath.shortNativePath();
                     }
-                    entry.highlightInfo = {index, int(input.length())};
+                    entry.highlightInfo = ILocatorFilter::highlightInfo(match);
                     entry.filePath = cmakeProject->projectFilePath();
-                    if (acceptor || realTarget)
-                        entries.append(entry);
+                    if (acceptor || realTarget) {
+                        if (match.capturedStart() == 0)
+                            entries[int(ILocatorFilter::MatchLevel::Best)].append(entry);
+                        else if (match.lastCapturedIndex() == 1)
+                            entries[int(ILocatorFilter::MatchLevel::Better)].append(entry);
+                        else
+                            entries[int(ILocatorFilter::MatchLevel::Good)].append(entry);
+                    }
                 }
             }
         }
-        storage->reportOutput(entries);
+        storage->reportOutput(
+            std::accumulate(std::begin(entries), std::end(entries), LocatorFilterEntries()));
     };
     return {{Sync(onSetup), storage}};
 }
diff --git a/src/plugins/cmakeprojectmanager/cmakeparser.cpp b/src/plugins/cmakeprojectmanager/cmakeparser.cpp
index 7da4e383911..c5c8c30d253 100644
--- a/src/plugins/cmakeprojectmanager/cmakeparser.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeparser.cpp
@@ -93,8 +93,8 @@ OutputLineParser::Result CMakeParser::handleLine(const QString &line, OutputForm
                                          match.captured(2).toInt());
             m_lines = 1;
             LinkSpecs linkSpecs;
-            addLinkSpecForAbsoluteFilePath(linkSpecs, m_lastTask.file, m_lastTask.line,
-                                           match, 1);
+            addLinkSpecForAbsoluteFilePath(
+                linkSpecs, m_lastTask.file, m_lastTask.line, m_lastTask.column, match, 1);
 
             m_errorOrWarningLine.file = m_lastTask.file;
             m_errorOrWarningLine.line = m_lastTask.line;
@@ -107,8 +107,8 @@ OutputLineParser::Result CMakeParser::handleLine(const QString &line, OutputForm
             m_lastTask = BuildSystemTask(Task::Error, QString(),
                                          absoluteFilePath(FilePath::fromUserInput(match.captured(1))));
             LinkSpecs linkSpecs;
-            addLinkSpecForAbsoluteFilePath(linkSpecs, m_lastTask.file, m_lastTask.line,
-                                           match, 1);
+            addLinkSpecForAbsoluteFilePath(
+                linkSpecs, m_lastTask.file, m_lastTask.line, m_lastTask.column, match, 1);
             m_lines = 1;
             return {Status::InProgress, linkSpecs};
         }
@@ -121,8 +121,8 @@ OutputLineParser::Result CMakeParser::handleLine(const QString &line, OutputForm
                                          match.captured(3).toInt());
             m_lines = 1;
             LinkSpecs linkSpecs;
-            addLinkSpecForAbsoluteFilePath(linkSpecs, m_lastTask.file, m_lastTask.line,
-                                           match, 1);
+            addLinkSpecForAbsoluteFilePath(
+                linkSpecs, m_lastTask.file, m_lastTask.line, m_lastTask.column, match, 1);
 
             m_errorOrWarningLine.file = m_lastTask.file;
             m_errorOrWarningLine.line = m_lastTask.line;
@@ -174,8 +174,13 @@ OutputLineParser::Result CMakeParser::handleLine(const QString &line, OutputForm
             m_lastTask.line = match.captured(1).toInt();
             m_expectTripleLineErrorData = LINE_DESCRIPTION;
             LinkSpecs linkSpecs;
-            addLinkSpecForAbsoluteFilePath(linkSpecs, m_lastTask.file, m_lastTask.line, 0,
-                                           match.capturedStart());
+            addLinkSpecForAbsoluteFilePath(
+                linkSpecs,
+                m_lastTask.file,
+                m_lastTask.line,
+                m_lastTask.column,
+                0,
+                match.capturedStart());
             return {Status::InProgress, linkSpecs};
         }
     case LINE_DESCRIPTION:
diff --git a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp
index 40cc41d64a5..3df6a6bbcb6 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp
@@ -20,6 +20,7 @@
 #include <extensionsystem/pluginmanager.h>
 
 #include <utils/algorithm.h>
+#include <utils/macroexpander.h>
 #include <utils/qtcprocess.h>
 #include <utils/processinfo.h>
 #include <utils/processinterface.h>
@@ -58,11 +59,15 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
 
     const FilePath cmakeExecutable = cmake->cmakeExecutable();
 
+    const QString mountHint = ::CMakeProjectManager::Tr::tr(
+        "You may need to add the project directory to the list of directories that are mounted by "
+        "the build device.");
+
     if (!cmakeExecutable.ensureReachable(parameters.sourceDirectory)) {
         const QString msg = ::CMakeProjectManager::Tr::tr(
                 "The source directory %1 is not reachable by the CMake executable %2.")
             .arg(parameters.sourceDirectory.displayName()).arg(cmakeExecutable.displayName());
-        BuildSystem::appendBuildSystemOutput(addCMakePrefix({QString(), msg}).join('\n'));
+        BuildSystem::appendBuildSystemOutput(addCMakePrefix({QString(), msg, mountHint}).join('\n'));
         emit finished(failedToStartExitCode);
         return;
     }
@@ -71,7 +76,7 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
         const QString msg = ::CMakeProjectManager::Tr::tr(
                 "The build directory %1 is not reachable by the CMake executable %2.")
             .arg(parameters.buildDirectory.displayName()).arg(cmakeExecutable.displayName());
-        BuildSystem::appendBuildSystemOutput(addCMakePrefix({QString(), msg}).join('\n'));
+        BuildSystem::appendBuildSystemOutput(addCMakePrefix({QString(), msg, mountHint}).join('\n'));
         emit finished(failedToStartExitCode);
         return;
     }
@@ -99,7 +104,7 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
     }
 
     // Copy the "package-manager" CMake code from the ${IDE:ResourcePath} to the build directory
-    if (settings().packageManagerAutoSetup()) {
+    if (settings(parameters.project).packageManagerAutoSetup()) {
         const FilePath localPackageManagerDir = buildDirectory.pathAppended(Constants::PACKAGE_MANAGER_DIR);
         const FilePath idePackageManagerDir = FilePath::fromString(
             parameters.expander->expand(QStringLiteral("%{IDE:ResourcePath}/package-manager")));
@@ -145,10 +150,11 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
     });
 
     CommandLine commandLine(cmakeExecutable);
-    commandLine.addArgs({"-S",
-                         CMakeToolManager::mappedFilePath(sourceDirectory).path(),
-                         "-B",
-                         CMakeToolManager::mappedFilePath(buildDirectory).path()});
+    commandLine.addArgs(
+        {"-S",
+         CMakeToolManager::mappedFilePath(parameters.project, sourceDirectory).path(),
+         "-B",
+         CMakeToolManager::mappedFilePath(parameters.project, buildDirectory).path()});
     commandLine.addArgs(arguments);
 
     TaskHub::clearTasks(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);
@@ -173,16 +179,9 @@ void CMakeProcess::stop()
 
 QString addCMakePrefix(const QString &str)
 {
-    auto qColorToAnsiCode = [] (const QColor &color) {
-        return QString::fromLatin1("\033[38;2;%1;%2;%3m")
-            .arg(color.red()).arg(color.green()).arg(color.blue());
-    };
-    static const QColor bgColor = creatorTheme()->color(Theme::BackgroundColorNormal);
-    static const QColor fgColor = creatorTheme()->color(Theme::TextColorNormal);
-    static const QColor grey = StyleHelper::mergedColors(fgColor, bgColor, 80);
-    static const QString prefixString = qColorToAnsiCode(grey) + Constants::OUTPUT_PREFIX
-                                        + qColorToAnsiCode(fgColor);
-    return QString("%1%2").arg(prefixString, str);
+    static const QString prefix
+        = ansiColoredText(Constants::OUTPUT_PREFIX, creatorColor(Theme::Token_Text_Muted));
+    return prefix + str;
 }
 
 QStringList addCMakePrefix(const QStringList &list)
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 9e119bba886..1fafbc7d930 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -34,6 +34,7 @@ namespace CMakeProjectManager {
 */
 CMakeProject::CMakeProject(const FilePath &fileName)
     : Project(Utils::Constants::CMAKE_MIMETYPE, fileName)
+    , m_settings(this, true)
 {
     setId(CMakeProjectManager::Constants::CMAKE_PROJECT_ID);
     setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));
@@ -120,6 +121,14 @@ Internal::PresetsData CMakeProject::combinePresets(Internal::PresetsData &cmakeP
         result.include = cmakeUserPresetsData.include;
     }
 
+    result.vendor = cmakePresetsData.vendor;
+    if (result.vendor) {
+        if (cmakeUserPresetsData.vendor)
+            result.vendor->insert(cmakeUserPresetsData.vendor.value());
+    } else {
+        result.vendor = cmakeUserPresetsData.vendor;
+    }
+
     auto combinePresetsInternal = [](auto &presetsHash,
                                      auto &presets,
                                      auto &userPresets,
@@ -232,6 +241,11 @@ void CMakeProject::setupBuildPresets(Internal::PresetsData &presetsData)
     }
 }
 
+Internal::CMakeSpecificSettings &CMakeProject::settings()
+{
+    return m_settings;
+}
+
 void CMakeProject::readPresets()
 {
     auto parsePreset = [](const Utils::FilePath &presetFile) -> Internal::PresetsData {
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.h b/src/plugins/cmakeprojectmanager/cmakeproject.h
index 6540dd4964d..832977c41a1 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.h
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "cmake_global.h"
+#include "cmakespecificsettings.h"
 #include "presetsparser.h"
 
 #include <projectexplorer/project.h>
@@ -34,6 +35,8 @@ public:
     void setOldPresetKits(const QList<ProjectExplorer::Kit *> &presetKits) const;
     QList<ProjectExplorer::Kit *> oldPresetKits() const;
 
+    Internal::CMakeSpecificSettings &settings();
+
 protected:
     bool setupTarget(ProjectExplorer::Target *t) final;
 
@@ -50,6 +53,7 @@ private:
 
     ProjectExplorer::Tasks m_issues;
     Internal::PresetsData m_presetsData;
+    Internal::CMakeSpecificSettings m_settings;
 };
 
 } // namespace CMakeProjectManager
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h b/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h
index 45c90a0b627..04922b6e9db 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h
@@ -11,6 +11,7 @@ const char RUN_CMAKE[] = "CMakeProject.RunCMake";
 const char RUN_CMAKE_PROFILER[] = "CMakeProject.RunCMakeProfiler";
 const char RUN_CMAKE_DEBUGGER[] = "CMakeProject.RunCMakeDebugger";
 const char CLEAR_CMAKE_CACHE[] = "CMakeProject.ClearCache";
+const char CLEAR_CMAKE_CACHE_CONTEXT_MENU[] = "CMakeProject.ClearCacheContextMenu";
 const char RESCAN_PROJECT[] = "CMakeProject.RescanProject";
 const char RUN_CMAKE_CONTEXT_MENU[] = "CMakeProject.RunCMakeContextMenu";
 const char BUILD_FILE_CONTEXT_MENU[] = "CMakeProject.BuildFileContextMenu";
@@ -40,10 +41,11 @@ const char CMAKE_BUILDCONFIGURATION_ID[] = "CMakeProjectManager.CMakeBuildConfig
 const char M_CONTEXT[] = "CMakeEditor.ContextMenu";
 
 namespace Settings {
-const char GENERAL_ID[] = "CMakeSpecifcSettings";
+const char GENERAL_ID[] = "CMakeSpecificSettings";
 const char TOOLS_ID[] = "K.CMake.Tools";
 const char FORMATTER_ID[] = "K.CMake.Formatter";
 const char CATEGORY[] = "K.CMake";
+const char USE_GLOBAL_SETTINGS[] = "UseGlobalSettings";
 } // namespace Settings
 
 // Snippets
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
index 6df1e7452d7..69511b0fc07 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
@@ -12,6 +12,9 @@
 #include "presetsmacros.h"
 
 #include <coreplugin/messagemanager.h>
+#include <debugger/debuggeritem.h>
+#include <debugger/debuggeritemmanager.h>
+#include <debugger/debuggerkitaspect.h>
 
 #include <projectexplorer/buildinfo.h>
 #include <projectexplorer/kitaspects.h>
@@ -30,7 +33,9 @@
 
 #include <QApplication>
 #include <QLoggingCategory>
+#include <QUuid>
 
+using namespace Debugger;
 using namespace ProjectExplorer;
 using namespace QtSupport;
 using namespace Utils;
@@ -60,6 +65,7 @@ struct DirectoryData
     FilePath sysroot;
     QtProjectImporter::QtVersionData qt;
     QVector<ToolchainDescription> toolchains;
+    QVariant debugger;
 };
 
 static FilePaths scanDirectory(const FilePath &path, const QString &prefix)
@@ -205,6 +211,79 @@ FilePaths CMakeProjectImporter::presetCandidates()
     return candidates;
 }
 
+class DebuggerCMakeExpander
+{
+    const PresetsDetails::ConfigurePreset &preset;
+    const Environment &env;
+    const FilePath &projectDirectory;
+
+public:
+    DebuggerCMakeExpander(
+        const PresetsDetails::ConfigurePreset &p, const Environment &e, const FilePath &projectDir)
+        : preset(p)
+        , env(e)
+        , projectDirectory(projectDir)
+    {}
+
+    QString expand(const QString &value) const
+    {
+        QString result{value};
+        CMakePresets::Macros::expand(preset, env, projectDirectory, result);
+        return result;
+    }
+
+    QVariantMap expand(const QVariantMap &map) const
+    {
+        QVariantMap result{map};
+        for (auto it = result.begin(); it != result.end(); ++it)
+            if (it->canConvert<QString>())
+                it->setValue(expand(it->toString()));
+        return result;
+    }
+};
+
+static QVariant findOrRegisterDebugger(
+    Environment &env, const PresetsDetails::ConfigurePreset &preset, const DebuggerCMakeExpander& expander)
+{
+    const QString debuggerKey("debugger");
+    if (!preset.vendor || !preset.vendor.value().contains(debuggerKey))
+        return {};
+
+    const QVariant debuggerVariant = preset.vendor.value().value(debuggerKey);
+    FilePath debuggerPath = FilePath::fromUserInput(expander.expand(debuggerVariant.toString()));
+    if (!debuggerPath.isEmpty()) {
+        if (debuggerPath.isRelativePath())
+            debuggerPath = env.searchInPath(debuggerPath.fileName());
+
+        const QString mainName = Tr::tr("CMake Preset (%1) %2 Debugger");
+        DebuggerItem debugger;
+        debugger.setCommand(debuggerPath);
+        debugger.setUnexpandedDisplayName(
+            mainName.arg(preset.name).arg(debuggerPath.completeBaseName()));
+        debugger.setAutoDetected(false);
+        QString errorMessage;
+        debugger.reinitializeFromFile(&errorMessage, &env);
+        if (!errorMessage.isEmpty())
+            qCWarning(cmInputLog()) << "Error reinitializing debugger" << debuggerPath.toString()
+                                    << "Error:" << errorMessage;
+
+        return DebuggerItemManager::registerDebugger(debugger);
+    } else {
+        auto debuggerMap = debuggerVariant.toMap();
+        if (debuggerMap.isEmpty())
+            return {};
+
+        // Manually create an Id, otrhewise the Kit will not have a debugger set
+        if (!debuggerMap.contains("Id"))
+            debuggerMap.insert("Id", QUuid::createUuid().toString());
+
+        auto store = storeFromMap(expander.expand(debuggerMap));
+        DebuggerItem debugger(store);
+
+        return DebuggerItemManager::registerDebugger(debugger);
+    }
+}
+
 Target *CMakeProjectImporter::preferredTarget(const QList<Target *> &possibleTargets)
 {
     for (Kit *kit : m_project->oldPresetKits()) {
@@ -835,6 +914,9 @@ QList<void *> CMakeProjectImporter::examineDirectory(const FilePath &importPath,
 
         data->hasQmlDebugging = CMakeBuildConfiguration::hasQmlDebugging(config);
 
+        data->debugger = findOrRegisterDebugger(
+            env, configurePreset, DebuggerCMakeExpander(configurePreset, env, projectDirectory()));
+
         QByteArrayList buildConfigurationTypes = {cache.valueOf("CMAKE_BUILD_TYPE")};
         if (buildConfigurationTypes.front().isEmpty()) {
             buildConfigurationTypes.clear();
@@ -1055,6 +1137,9 @@ Kit *CMakeProjectImporter::createKit(void *directoryData) const
         if (!data->cmakePreset.isEmpty())
             ensureBuildDirectory(*data, k);
 
+        if (data->debugger.isValid())
+            DebuggerKitAspect::setDebugger(k, data->debugger);
+
         qCInfo(cmInputLog) << "Temporary Kit created.";
     });
 }
@@ -1071,6 +1156,11 @@ const QList<BuildInfo> CMakeProjectImporter::buildInfoList(void *directoryData)
         && data->hasQmlDebugging)
         buildType = CMakeBuildConfigurationFactory::BuildTypeProfile;
     BuildInfo info = CMakeBuildConfigurationFactory::createBuildInfo(buildType);
+
+    // For CMake Presets use the provided build type if is not mapped to a known type
+    if (!data->cmakePreset.isEmpty() && info.buildType == BuildConfiguration::Unknown)
+        info.typeName = info.displayName = QString::fromUtf8(data->cmakeBuildType);
+
     info.buildDirectory = data->buildDirectory;
 
     QVariantMap config = info.extraInfo.toMap(); // new empty, or existing one from createBuildInfo
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
index ba13edbb32e..f3e512eebb0 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -18,6 +18,7 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/helpmanager.h>
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/modemanager.h>
 
@@ -41,6 +42,7 @@
 #include <utils/checkablemessagebox.h>
 #include <utils/utilsicons.h>
 
+#include <QDesktopServices>
 #include <QMessageBox>
 
 using namespace Core;
@@ -55,6 +57,9 @@ class CMakeManager final : public QObject
 public:
     CMakeManager();
 
+    static bool isCMakeUrl(const QUrl &url);
+    static void openCMakeUrl(const QUrl &url);
+
 private:
     void updateCmakeActions(Node *node);
     void clearCMakeCache(BuildSystem *buildSystem);
@@ -80,6 +85,29 @@ private:
     bool m_canDebugCMake = false;
 };
 
+bool CMakeManager::isCMakeUrl(const QUrl &url)
+{
+    const QString address = url.toString();
+    return address.startsWith("qthelp://org.cmake.");
+}
+
+void CMakeManager::openCMakeUrl(const QUrl &url)
+{
+    QString urlPrefix = "https://cmake.org/cmake/help/";
+
+    QRegularExpression version("^.*\\.([0-9])\\.([0-9]+)\\.[0-9]+$");
+    auto match = version.match(url.authority());
+    if (match.hasMatch())
+        urlPrefix.append(QString("v%1.%2").arg(match.captured(1)).arg(match.captured(2)));
+    else
+        urlPrefix.append("latest");
+
+    const QString address = url.toString();
+    const QString doc("/doc");
+    QDesktopServices::openUrl(
+        QUrl(urlPrefix + address.mid(address.lastIndexOf(doc) + doc.length())));
+}
+
 CMakeManager::CMakeManager()
 {
     namespace PEC = ProjectExplorer::Constants;
@@ -110,6 +138,14 @@ CMakeManager::CMakeManager()
         .addToContainer(PEC::M_PROJECTCONTEXT, PEC::G_PROJECT_BUILD)
         .addOnTriggered(this, [this] { runCMake(ProjectTree::currentBuildSystem()); });
 
+    ActionBuilder(this, Constants::CLEAR_CMAKE_CACHE_CONTEXT_MENU)
+        .setText(Tr::tr("Clear CMake Configuration"))
+        .setContext(projectContext)
+        .bindContextAction(&m_clearCMakeCacheAction)
+        .setCommandAttribute(Command::CA_Hide)
+        .addToContainer(PEC::M_PROJECTCONTEXT, PEC::G_PROJECT_REBUILD)
+        .addOnTriggered(this, [this] { clearCMakeCache(ProjectManager::startupBuildSystem()); });
+
     ActionBuilder(this, Constants::BUILD_FILE_CONTEXT_MENU)
         .setText(Tr::tr("Build"))
         .bindContextAction(&m_buildFileContextMenu)
@@ -313,12 +349,16 @@ void CMakeManager::enableBuildFileMenus(Node *node)
 
 void CMakeManager::reloadCMakePresets()
 {
+    CMakeProject *project = qobject_cast<CMakeProject *>(ProjectTree::currentProject());
+    if (!project)
+        return;
+
     QMessageBox::StandardButton clickedButton = CheckableMessageBox::question(
         Core::ICore::dialogParent(),
         Tr::tr("Reload CMake Presets"),
         Tr::tr("Re-generates the kits that were created for CMake presets. All manual "
                "modifications to the CMake project settings will be lost."),
-        settings().askBeforePresetsReload.askAgainCheckableDecider(),
+        settings(project).askBeforePresetsReload.askAgainCheckableDecider(),
         QMessageBox::Yes | QMessageBox::Cancel,
         QMessageBox::Yes,
         QMessageBox::Yes,
@@ -326,15 +366,11 @@ void CMakeManager::reloadCMakePresets()
             {QMessageBox::Yes, Tr::tr("Reload")},
         });
 
-    settings().writeSettings();
+    settings(project).writeSettings();
 
     if (clickedButton == QMessageBox::Cancel)
         return;
 
-    CMakeProject *project = static_cast<CMakeProject *>(ProjectTree::currentProject());
-    if (!project)
-        return;
-
     const QSet<QString> oldPresets = Utils::transform<QSet>(project->presetsData().configurePresets,
                                                             [](const auto &preset) {
                                                                 return preset.name;
@@ -450,4 +486,9 @@ void setupCMakeManager()
     static CMakeManager theCMakeManager;
 }
 
+void setupOnlineHelpManager()
+{
+    Core::HelpManager::addOnlineHelpHandler({CMakeManager::isCMakeUrl, CMakeManager::openCMakeUrl});
+}
+
 } // CMakeProjectManager::Internal
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
index ba3a025f130..42e6a1c4e31 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
@@ -6,5 +6,6 @@
 namespace CMakeProjectManager::Internal {
 
 void setupCMakeManager();
+void setupOnlineHelpManager();
 
 } // CMakeProjectManager::Internal
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
index 1cbaac7b6d6..98849a71f57 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
@@ -8,6 +8,7 @@ QtcPlugin {
 
     Depends { name: "Core" }
     Depends { name: "CppEditor" }
+    Depends { name: "Debugger" }
     Depends { name: "QmlJS" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
index 80c5e58c029..54f28f7b2ad 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
@@ -187,9 +187,16 @@ void CMakeTargetNode::setConfig(const CMakeConfig &config)
     m_config = config;
 }
 
+void CMakeTargetNode::setVisibleAfterAddFileAction(bool visibleAfterAddFileAction)
+{
+    m_visibleAfterAddFileAction = visibleAfterAddFileAction;
+}
+
 std::optional<FilePath> CMakeTargetNode::visibleAfterAddFileAction() const
 {
-    return filePath().pathAppended(Constants::CMAKE_LISTS_TXT);
+    if (m_visibleAfterAddFileAction)
+        return filePath().pathAppended(Constants::CMAKE_LISTS_TXT);
+    return std::nullopt;
 }
 
 void CMakeTargetNode::build()
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h
index 94cde6dfef1..57b180bbba3 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h
@@ -57,11 +57,14 @@ public:
     QVariant data(Utils::Id role) const override;
     void setConfig(const CMakeConfig &config);
 
+    void setVisibleAfterAddFileAction(bool visibleAfterAddFileAction);
+
 private:
     QString m_tooltip;
     Utils::FilePath m_buildDirectory;
     Utils::FilePath m_artifact;
     CMakeConfig m_config;
+    bool m_visibleAfterAddFileAction = true;
 };
 
 } // CMakeProjectManager::Internal
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
index 9c2a23dc061..f91c1438d24 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
@@ -105,6 +105,8 @@ class CMakeProjectPlugin final : public ExtensionSystem::IPlugin
     {
         // Delay the restoration to allow the devices to load first.
         QTimer::singleShot(0, this, [] { CMakeToolManager::restoreCMakeTools(); });
+
+        setupOnlineHelpManager();
     }
 
     void updateContextActions(ProjectExplorer::Node *node)
diff --git a/src/plugins/cmakeprojectmanager/cmakespecificsettings.cpp b/src/plugins/cmakeprojectmanager/cmakespecificsettings.cpp
index 28668b3567d..a56a66c533b 100644
--- a/src/plugins/cmakeprojectmanager/cmakespecificsettings.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakespecificsettings.cpp
@@ -1,30 +1,45 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
+#include "cmakeproject.h"
 #include "cmakespecificsettings.h"
 
 #include "cmakeprojectconstants.h"
 #include "cmakeprojectmanagertr.h"
 
-#include <coreplugin/icore.h>
 #include <coreplugin/dialogs/ioptionspage.h>
+#include <coreplugin/icore.h>
 
+#include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/projectimporter.h>
+#include <projectexplorer/projectpanelfactory.h>
 
 #include <utils/hostosinfo.h>
 #include <utils/layoutbuilder.h>
 
+#include <QVBoxLayout>
+
+using namespace ProjectExplorer;
 using namespace Utils;
 
 namespace CMakeProjectManager::Internal {
 
-CMakeSpecificSettings &settings()
+CMakeSpecificSettings &settings(Project *project)
 {
-    static CMakeSpecificSettings theSettings;
-    return theSettings;
+    static CMakeSpecificSettings theSettings(nullptr, false);
+    if (!project)
+        return theSettings;
+
+    CMakeProject *cmakeProject = qobject_cast<CMakeProject *>(project);
+    if (!cmakeProject || cmakeProject->settings().useGlobalSettings)
+        return theSettings;
+
+    return cmakeProject->settings();
 }
 
-CMakeSpecificSettings::CMakeSpecificSettings()
+CMakeSpecificSettings::CMakeSpecificSettings(Project *p, bool autoApply)
+    : project(p)
 {
     setLayouter([this] {
         using namespace Layouting;
@@ -43,8 +58,8 @@ CMakeSpecificSettings::CMakeSpecificSettings()
     // TODO: fixup of QTCREATORBUG-26289 , remove in Qt Creator 7 or so
     Core::ICore::settings()->remove("CMakeSpecificSettings/NinjaPath");
 
-    setSettingsGroup("CMakeSpecificSettings");
-    setAutoApply(false);
+    setSettingsGroup(Constants::Settings::GENERAL_ID);
+    setAutoApply(autoApply);
 
     autorunCMake.setSettingsKey("AutorunCMake");
     autorunCMake.setDefaultValue(true);
@@ -105,6 +120,58 @@ CMakeSpecificSettings::CMakeSpecificSettings()
         "Junctions are used for CMake configure, build and install operations."));
 
     readSettings();
+
+    if (project) {
+        // Re-read the settings. Reading in constructor is too early
+        connect(project, &Project::settingsLoaded, this, [this] { readSettings(); });
+
+        connect(project->projectImporter(), &ProjectImporter::cmakePresetsUpdated, this, [this] {
+            // clear settings first
+            Store data;
+            project->setNamedSettings(Constants::Settings::GENERAL_ID, variantFromStore(data));
+
+            readSettings();
+        });
+    }
+}
+
+void CMakeSpecificSettings::readSettings()
+{
+    if (!project) {
+        AspectContainer::readSettings();
+    } else {
+        Store data = storeFromVariant(project->namedSettings(Constants::Settings::GENERAL_ID));
+        if (data.isEmpty()) {
+            CMakeProject *cmakeProject = qobject_cast<CMakeProject *>(project);
+            if (cmakeProject && cmakeProject->presetsData().havePresets
+                && cmakeProject->presetsData().vendor) {
+                useGlobalSettings = false;
+                data = storeFromMap(cmakeProject->presetsData().vendor.value());
+                fromMap(data);
+
+                // Write the new loaded CMakePresets settings into .user file
+                writeSettings();
+            } else {
+                useGlobalSettings = true;
+                AspectContainer::readSettings();
+            }
+        } else {
+            useGlobalSettings = data.value(Constants::Settings::USE_GLOBAL_SETTINGS, true).toBool();
+            fromMap(data);
+        }
+    }
+}
+
+void CMakeSpecificSettings::writeSettings() const
+{
+    if (!project) {
+        AspectContainer::writeSettings();
+    } else {
+        Store data;
+        toMap(data);
+        data.insert(Constants::Settings::USE_GLOBAL_SETTINGS, useGlobalSettings);
+        project->setNamedSettings(Constants::Settings::GENERAL_ID, variantFromStore(data));
+    }
 }
 
 class CMakeSpecificSettingsPage final : public Core::IOptionsPage
@@ -117,10 +184,87 @@ public:
         setDisplayCategory("CMake");
         setCategory(Constants::Settings::CATEGORY);
         setCategoryIconPath(Constants::Icons::SETTINGS_CATEGORY);
-        setSettingsProvider([] { return &settings(); });
+        setSettingsProvider([] { return &settings(nullptr); });
     }
 };
 
 const CMakeSpecificSettingsPage settingsPage;
 
+class CMakeProjectSettingsWidget : public ProjectSettingsWidget
+{
+public:
+    explicit CMakeProjectSettingsWidget(Project *project)
+        : m_widget(new QWidget)
+        , m_project(qobject_cast<CMakeProject *>(project))
+        , m_displayedSettings(project, true)
+    {
+        setGlobalSettingsId(Constants::Settings::GENERAL_ID);
+
+        // Construct the widget layout from the aspect container
+        const auto layout = new QVBoxLayout(this);
+        layout->setContentsMargins(0, 0, 0, 0);
+        if (auto layouter = m_displayedSettings.layouter())
+            layouter().attachTo(m_widget);
+        layout->addWidget(m_widget);
+
+        setUseGlobalSettings(m_displayedSettings.useGlobalSettings);
+        m_widget->setEnabled(!useGlobalSettings());
+
+        if (m_project) {
+            connect(
+                this, &ProjectSettingsWidget::useGlobalSettingsChanged, this, [this](bool useGlobal) {
+                    m_widget->setEnabled(!useGlobal);
+                    m_displayedSettings.useGlobalSettings = useGlobal;
+                    m_displayedSettings.copyFrom(
+                        useGlobal ? settings(nullptr) : m_project->settings());
+
+                    m_project->settings().useGlobalSettings = useGlobal;
+                    m_project->settings().writeSettings();
+                });
+
+            // React on Global settings changes
+            connect(&settings(nullptr), &AspectContainer::changed, this, [this] {
+                if (m_displayedSettings.useGlobalSettings)
+                    m_displayedSettings.copyFrom(settings(nullptr));
+            });
+
+            // Reflect changes to the project settings in the displayed settings
+            connect(&m_project->settings(), &AspectContainer::changed, this, [this] {
+                if (!m_displayedSettings.useGlobalSettings)
+                    m_displayedSettings.copyFrom(m_project->settings());
+            });
+
+            // React on project settings changes in the "CMake" project settings
+            connect(&m_displayedSettings, &AspectContainer::changed, this, [this] {
+                if (!m_displayedSettings.useGlobalSettings) {
+                    m_project->settings().copyFrom(m_displayedSettings);
+                    m_project->settings().writeSettings();
+                }
+            });
+        } else {
+            // Only for CMake projects
+            setUseGlobalSettingsCheckBoxEnabled(false);
+        }
+    }
+
+    QWidget *m_widget = nullptr;
+    CMakeProject *m_project = nullptr;
+    CMakeSpecificSettings m_displayedSettings;
+};
+
+class CMakeProjectSettingsPanelFactory final : public ProjectPanelFactory
+{
+public:
+    CMakeProjectSettingsPanelFactory()
+    {
+        setPriority(120);
+        setDisplayName("CMake");
+        setCreateWidgetFunction([](Project *project) {
+            return new CMakeProjectSettingsWidget(project);
+        });
+    }
+};
+
+const CMakeProjectSettingsPanelFactory projectSettingsPane;
+
 } // CMakeProjectManager::Internal
diff --git a/src/plugins/cmakeprojectmanager/cmakespecificsettings.h b/src/plugins/cmakeprojectmanager/cmakespecificsettings.h
index cbec63dffe4..653234a889c 100644
--- a/src/plugins/cmakeprojectmanager/cmakespecificsettings.h
+++ b/src/plugins/cmakeprojectmanager/cmakespecificsettings.h
@@ -5,12 +5,20 @@
 
 #include <utils/aspects.h>
 
+namespace ProjectExplorer {
+class Project;
+}
+
 namespace CMakeProjectManager::Internal {
 
 class CMakeSpecificSettings final : public Utils::AspectContainer
 {
+    ProjectExplorer::Project *project{nullptr};
 public:
-    CMakeSpecificSettings();
+    CMakeSpecificSettings(ProjectExplorer::Project *project, bool autoApply);
+
+    void readSettings() final;
+    void writeSettings() const final;
 
     Utils::BoolAspect autorunCMake{this};
     Utils::FilePathAspect ninjaPath{this};
@@ -20,8 +28,10 @@ public:
     Utils::BoolAspect showSourceSubFolders{this};
     Utils::BoolAspect showAdvancedOptionsByDefault{this};
     Utils::BoolAspect useJunctionsForSourceAndBuildDirectories{this};
+
+    bool useGlobalSettings{true};
 };
 
-CMakeSpecificSettings &settings();
+CMakeSpecificSettings &settings(ProjectExplorer::Project *project);
 
 } // CMakeProjectManager::Internal
diff --git a/src/plugins/cmakeprojectmanager/cmaketool.cpp b/src/plugins/cmakeprojectmanager/cmaketool.cpp
index 4cb638659a1..444ff299f9a 100644
--- a/src/plugins/cmakeprojectmanager/cmaketool.cpp
+++ b/src/plugins/cmakeprojectmanager/cmaketool.cpp
@@ -36,7 +36,6 @@ static Q_LOGGING_CATEGORY(cmakeToolLog, "qtc.cmake.tool", QtWarningMsg);
 const char CMAKE_INFORMATION_ID[] = "Id";
 const char CMAKE_INFORMATION_COMMAND[] = "Binary";
 const char CMAKE_INFORMATION_DISPLAYNAME[] = "DisplayName";
-const char CMAKE_INFORMATION_AUTORUN[] = "AutoRun";
 const char CMAKE_INFORMATION_QCH_FILE_PATH[] = "QchFile";
 // obsolete since Qt Creator 5. Kept for backward compatibility
 const char CMAKE_INFORMATION_AUTO_CREATE_BUILD_DIRECTORY[] = "AutoCreateBuildDirectory";
@@ -113,7 +112,6 @@ CMakeTool::CMakeTool(const Store &map, bool fromSdk) :
               Id::fromSetting(map.value(CMAKE_INFORMATION_ID)))
 {
     m_displayName = map.value(CMAKE_INFORMATION_DISPLAYNAME).toString();
-    m_isAutoRun = map.value(CMAKE_INFORMATION_AUTORUN, true).toBool();
     m_autoCreateBuildDirectory = map.value(CMAKE_INFORMATION_AUTO_CREATE_BUILD_DIRECTORY, false).toBool();
     m_readerType = Internal::readerTypeFromString(
         map.value(CMAKE_INFORMATION_READERTYPE).toString());
@@ -183,7 +181,6 @@ Store CMakeTool::toMap() const
     data.insert(CMAKE_INFORMATION_ID, m_id.toSetting());
     data.insert(CMAKE_INFORMATION_COMMAND, m_executable.toString());
     data.insert(CMAKE_INFORMATION_QCH_FILE_PATH, m_qchFilePath.toString());
-    data.insert(CMAKE_INFORMATION_AUTORUN, m_isAutoRun);
     data.insert(CMAKE_INFORMATION_AUTO_CREATE_BUILD_DIRECTORY, m_autoCreateBuildDirectory);
     if (m_readerType)
         data.insert(CMAKE_INFORMATION_READERTYPE,
@@ -233,11 +230,6 @@ FilePath CMakeTool::cmakeExecutable(const FilePath &path)
     return resolvedPath;
 }
 
-bool CMakeTool::isAutoRun() const
-{
-    return m_isAutoRun;
-}
-
 QList<CMakeTool::Generator> CMakeTool::supportedGenerators() const
 {
     return isValid() ? m_introspection->m_generators : QList<CMakeTool::Generator>();
diff --git a/src/plugins/cmakeprojectmanager/cmaketool.h b/src/plugins/cmakeprojectmanager/cmaketool.h
index cf13ad49c5b..51012e699c2 100644
--- a/src/plugins/cmakeprojectmanager/cmaketool.h
+++ b/src/plugins/cmakeprojectmanager/cmaketool.h
@@ -79,8 +79,6 @@ public:
     Utils::Id id() const { return m_id; }
     Utils::Store toMap () const;
 
-    void setAutorun(bool autoRun) { m_isAutoRun = autoRun; }
-
     void setFilePath(const Utils::FilePath &executable);
     Utils::FilePath filePath() const;
     Utils::FilePath cmakeExecutable() const;
@@ -130,7 +128,6 @@ private:
     Utils::FilePath m_executable;
     Utils::FilePath m_qchFilePath;
 
-    bool m_isAutoRun = true;
     bool m_isAutoDetected = false;
     QString m_detectionSource;
     bool m_autoCreateBuildDirectory = false;
diff --git a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
index e20c3c58eba..fa184e016b3 100644
--- a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
@@ -342,15 +342,6 @@ void CMakeToolManager::restoreCMakeTools()
     updateDocumentation();
 
     emit m_instance->cmakeToolsLoaded();
-
-    // Store the default CMake tool "Autorun CMake" value globally
-    // TODO: Remove in Qt Creator 13
-    Internal::CMakeSpecificSettings &s = Internal::settings();
-    if (s.autorunCMake() == s.autorunCMake.defaultValue()) {
-        CMakeTool *cmake = defaultCMakeTool();
-        s.autorunCMake.setValue(cmake ? cmake->isAutoRun() : true);
-        s.writeSettings();
-    }
 }
 
 void CMakeToolManager::updateDocumentation()
@@ -445,7 +436,7 @@ QString CMakeToolManager::toolTipForRstHelpFile(const FilePath &helpFile)
     return tooltip;
 }
 
-FilePath CMakeToolManager::mappedFilePath(const FilePath &path)
+FilePath CMakeToolManager::mappedFilePath(Project *project, const FilePath &path)
 {
     if (!HostOsInfo::isWindowsHost())
         return path;
@@ -453,16 +444,14 @@ FilePath CMakeToolManager::mappedFilePath(const FilePath &path)
     if (path.needsDevice())
         return path;
 
-    auto project = ProjectManager::startupProject();
     auto environment = Environment::systemEnvironment();
     if (project)
         environment.modify(project->additionalEnvironment());
     const bool enableJunctions
-        = QVariant(
-              environment.value_or("QTC_CMAKE_USE_JUNCTIONS",
-                                   Internal::settings().useJunctionsForSourceAndBuildDirectories()
-                                       ? "1"
-                                       : "0"))
+        = QVariant(environment.value_or(
+                       "QTC_CMAKE_USE_JUNCTIONS",
+                       Internal::settings(project).useJunctionsForSourceAndBuildDirectories() ? "1"
+                                                                                              : "0"))
               .toBool();
 
     if (!enableJunctions)
diff --git a/src/plugins/cmakeprojectmanager/cmaketoolmanager.h b/src/plugins/cmakeprojectmanager/cmaketoolmanager.h
index 1836f36c860..0917c2739fa 100644
--- a/src/plugins/cmakeprojectmanager/cmaketoolmanager.h
+++ b/src/plugins/cmakeprojectmanager/cmaketoolmanager.h
@@ -14,6 +14,10 @@
 
 #include <memory>
 
+namespace ProjectExplorer {
+class Project;
+}
+
 namespace CMakeProjectManager {
 
 class CMAKE_EXPORT CMakeToolManager : public QObject
@@ -44,7 +48,7 @@ public:
 
     static QString toolTipForRstHelpFile(const Utils::FilePath &helpFile);
 
-    static Utils::FilePath mappedFilePath(const Utils::FilePath &path);
+    static Utils::FilePath mappedFilePath(ProjectExplorer::Project *project, const Utils::FilePath &path);
 
 public slots:
     QList<Utils::Id> autoDetectCMakeForDevice(const Utils::FilePaths &searchPaths,
diff --git a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp
index b877998a079..e8e5a8a64ea 100644
--- a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp
+++ b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp
@@ -174,14 +174,8 @@ void CMakeToolSettingsAccessor::saveCMakeTools(const QList<CMakeTool *> &cmakeTo
     data.insert(CMAKE_TOOL_DEFAULT_KEY, defaultId.toSetting());
 
     int count = 0;
-    const bool autoRun = settings().autorunCMake();
     for (CMakeTool *item : cmakeTools) {
         Utils::FilePath fi = item->cmakeExecutable();
-
-        // Gobal Autorun value will be set for all tools
-        // TODO: Remove in Qt Creator 13
-        item->setAutorun(autoRun);
-
         if (fi.needsDevice() || fi.isExecutableFile()) { // be graceful for device related stuff
             Store tmp = item->toMap();
             if (tmp.isEmpty())
diff --git a/src/plugins/cmakeprojectmanager/configmodel.cpp b/src/plugins/cmakeprojectmanager/configmodel.cpp
index 953486e2dad..287615650ca 100644
--- a/src/plugins/cmakeprojectmanager/configmodel.cpp
+++ b/src/plugins/cmakeprojectmanager/configmodel.cpp
@@ -570,8 +570,8 @@ QVariant ConfigModelTreeItem::data(int column, int role) const
             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);
+        return Utils::creatorColor(mismatch ? Utils::Theme::TextColorError
+                                            : Utils::Theme::TextColorNormal);
     };
 
     const QString value = currentValue();
diff --git a/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp b/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp
index c8db1a85cb6..d9e7a943c3d 100644
--- a/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp
+++ b/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp
@@ -94,8 +94,8 @@ void ConfigModelItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *
         ConfigModel::DataItem data = ConfigModel::dataItemFromIndex(index);
         if (data.type == ConfigModel::DataItem::FILE || data.type == ConfigModel::DataItem::DIRECTORY) {
             auto edit = static_cast<PathChooser *>(editor);
-            if (edit->rawFilePath().toString() != data.value)
-                model->setData(index, edit->rawFilePath().toString(), Qt::EditRole);
+            if (edit->unexpandedFilePath().toString() != data.value)
+                model->setData(index, edit->unexpandedFilePath().toString(), Qt::EditRole);
             return;
         } else if (!data.values.isEmpty()) {
             auto edit = static_cast<QComboBox *>(editor);
diff --git a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
index ec75a4d2356..c76af32e775 100644
--- a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
+++ b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
@@ -16,6 +16,7 @@
 
 #include <utils/algorithm.h>
 #include <utils/icon.h>
+#include <utils/fsengine/fileiconprovider.h>
 #include <utils/mimeconstants.h>
 #include <utils/mimeutils.h>
 #include <utils/qtcprocess.h>
@@ -209,8 +210,7 @@ static bool isChildOf(const FilePath &path, const FilePaths &prefixes)
 static CMakeBuildTarget toBuildTarget(const TargetDetails &t,
                                       const FilePath &sourceDirectory,
                                       const FilePath &buildDirectory,
-                                      bool relativeLibs,
-                                      const QSet<FilePath> &artifacts)
+                                      bool relativeLibs)
 {
     const FilePath currentBuildDir = buildDirectory.resolvePath(t.buildDir);
 
@@ -306,7 +306,6 @@ static CMakeBuildTarget toBuildTarget(const TargetDetails &t,
                 if (f.role == "libraries")
                     tmp = tmp.parentDir();
 
-                std::optional<QString> dllName;
                 if (buildDir.osType() == OsTypeWindows && (f.role == "libraries")) {
                     const auto partAsFilePath = FilePath::fromUserInput(part);
                     part = partAsFilePath.fileName();
@@ -314,24 +313,6 @@ static CMakeBuildTarget toBuildTarget(const TargetDetails &t,
                     // Skip object libraries on Windows. This case can happen with static qml plugins
                     if (part.endsWith(".obj") || part.endsWith(".o"))
                         continue;
-
-                    // Only consider dlls, not static libraries
-                    for (const QString &suffix :
-                         {QString(".lib"), QString(".dll.a"), QString(".a")}) {
-                        if (part.endsWith(suffix) && !dllName)
-                            dllName = part.chopped(suffix.length()).append(".dll");
-                    }
-
-                    // MinGW has libQt6Core.a -> Qt6Core.dll
-                    // but libFoo.dll.a was already handled above
-                    const QString mingwPrefix("lib");
-                    const QString mingwSuffix("a");
-                    const QString completeSuffix = partAsFilePath.completeSuffix();
-                    if (part.startsWith(mingwPrefix) && completeSuffix == mingwSuffix) {
-                        dllName = part.chopped(mingwSuffix.length() + 1/*the '.'*/)
-                                      .sliced(mingwPrefix.length())
-                                      .append(".dll");
-                    }
                 }
 
                 if (!tmp.isEmpty() && tmp.isDir()) {
@@ -340,23 +321,20 @@ static CMakeBuildTarget toBuildTarget(const TargetDetails &t,
                     // "/usr/local/lib" since these are usually in the standard search
                     // paths. There probably are more, but the naming schemes are arbitrary
                     // so we'd need to ask the linker ("ld --verbose | grep SEARCH_DIR").
-                    if (buildDir.osType() != OsTypeWindows
-                        && !isChildOf(tmp,
-                                      {"/lib", "/lib64", "/usr/lib", "/usr/lib64", "/usr/local/lib"}))
+                    if (buildDir.osType() == OsTypeWindows
+                        || !isChildOf(tmp,
+                                      {"/lib",
+                                       "/lib64",
+                                       "/usr/lib",
+                                       "/usr/lib64",
+                                       "/usr/local/lib"})) {
                         librarySeachPaths.append(tmp);
 
-                    if (buildDir.osType() == OsTypeWindows && dllName) {
-                        const auto validPath = [&artifacts](const FilePath& path) {
-                            return path.exists() || artifacts.contains(path);
-                        };
-                        if (validPath(tmp.pathAppended(*dllName)))
-                            librarySeachPaths.append(tmp);
-
                         // Libraries often have their import libs in ../lib and the
                         // actual dll files in ../bin on windows. Qt is one example of that.
-                        if (tmp.fileName() == "lib") {
+                        if (tmp.fileName() == "lib" && buildDir.osType() == OsTypeWindows) {
                             const FilePath path = tmp.parentDir().pathAppended("bin");
-                            if (path.isDir() && validPath(path.pathAppended(*dllName)))
+                            if (path.isDir())
                                 librarySeachPaths.append(path);
                         }
                     }
@@ -365,6 +343,22 @@ static CMakeBuildTarget toBuildTarget(const TargetDetails &t,
         }
         ct.libraryDirectories = filteredUnique(librarySeachPaths);
         qCInfo(cmakeLogger) << "libraryDirectories for target" << ct.title << ":" << ct.libraryDirectories;
+
+        // If there are start programs, there should also be an option to select none
+        if (!t.launcherInfos.isEmpty()) {
+            LauncherInfo info { "unused", Utils::FilePath(), QStringList() };
+            ct.launchers.append(Launcher(info, sourceDirectory));
+        }
+        // if there is a test and an emulator launcher, add the emulator and
+        // also a combination as the last entry, but not the "test" launcher
+        // as it will not work for cross-compiled executables
+        if (t.launcherInfos.size() == 2 && t.launcherInfos[0].type == "test" && t.launcherInfos[1].type == "emulator") {
+            ct.launchers.append(Launcher(t.launcherInfos[1], sourceDirectory));
+            ct.launchers.append(Launcher(t.launcherInfos[0], t.launcherInfos[1], sourceDirectory));
+        } else if (t.launcherInfos.size() == 1) {
+            Launcher launcher(t.launcherInfos[0], sourceDirectory);
+            ct.launchers.append(launcher);
+        }
     }
     return ct;
 }
@@ -375,17 +369,12 @@ static QList<CMakeBuildTarget> generateBuildTargets(const QFuture<void> &cancelF
                                                     const FilePath &buildDirectory,
                                                     bool relativeLibs)
 {
-    QSet<FilePath> artifacts;
-    for (const TargetDetails &t : input.targetDetails)
-        for (const FilePath &p: t.artifacts)
-            artifacts.insert(buildDirectory.resolvePath(p));
-
     QList<CMakeBuildTarget> result;
     result.reserve(input.targetDetails.size());
     for (const TargetDetails &t : input.targetDetails) {
         if (cancelFuture.isCanceled())
             return {};
-        result.append(toBuildTarget(t, sourceDirectory, buildDirectory, relativeLibs, artifacts));
+        result.append(toBuildTarget(t, sourceDirectory, buildDirectory, relativeLibs));
     }
     return result;
 }
@@ -639,7 +628,7 @@ static FolderNode *createSourceGroupNode(const QString &sourceGroupName,
             if (!existingNode) {
                 auto node = createCMakeVFolder(sourceDirectory, Node::DefaultFolderPriority + 5, p);
                 node->setListInProject(false);
-                node->setIcon([] { return Icon::fromTheme("edit-copy"); });
+                node->setIcon([] { return FileIconProvider::icon(QFileIconProvider::Folder); });
 
                 existingNode = node.get();
 
@@ -688,7 +677,23 @@ static void addCompileGroups(ProjectNode *targetRoot,
         if (isPchFile(buildDirectory, sourcePath) || isUnityFile(buildDirectory, sourcePath))
             node->setIsGenerated(true);
 
-        const bool showSourceFolders = settings().showSourceSubFolders()
+        // Hide some of the QML files that we not marked as generated by the Qt QML CMake code
+        const bool buildDirQmldirOrRcc = sourcePath.isChildOf(buildDirectory)
+                                         && (sourcePath.parentDir().fileName() == ".rcc"
+                                             || sourcePath.fileName() == "qmldir");
+        const bool otherDirQmldirOrMetatypes = !sourcePath.isChildOf(buildDirectory)
+                                               && !sourcePath.isChildOf(sourceDirectory)
+                                               && (sourcePath.parentDir().fileName() == "metatypes"
+                                                   || sourcePath.fileName() == "qmldir");
+        const bool buildDirPluginCpp = sourcePath.isChildOf(buildDirectory)
+                                       && td.type.endsWith("_LIBRARY")
+                                       && sourcePath.fileName().startsWith(td.name)
+                                       && sourcePath.fileName().endsWith("Plugin.cpp");
+
+        if (buildDirQmldirOrRcc || otherDirQmldirOrMetatypes || buildDirPluginCpp)
+            node->setIsGenerated(true);
+
+        const bool showSourceFolders = settings(targetRoot->getProject()).showSourceSubFolders()
                                        && defaultCMakeSourceGroupFolder(td.sourceGroups[si.sourceGroup]);
 
         // Where does the file node need to go?
@@ -702,7 +707,7 @@ static void addCompileGroups(ProjectNode *targetRoot,
     }
 
     for (size_t i = 0; i < sourceGroupFileNodes.size(); ++i) {
-        const bool showSourceFolders = settings().showSourceSubFolders()
+        const bool showSourceFolders = settings(targetRoot->getProject()).showSourceSubFolders()
                                        && defaultCMakeSourceGroupFolder(td.sourceGroups[i]);
 
         std::vector<std::unique_ptr<FileNode>> &current = sourceGroupFileNodes[i];
diff --git a/src/plugins/cmakeprojectmanager/fileapiparser.cpp b/src/plugins/cmakeprojectmanager/fileapiparser.cpp
index 560b43617d0..d9ea457600f 100644
--- a/src/plugins/cmakeprojectmanager/fileapiparser.cpp
+++ b/src/plugins/cmakeprojectmanager/fileapiparser.cpp
@@ -11,6 +11,7 @@
 #include <projectexplorer/rawprojectpart.h>
 
 #include <utils/algorithm.h>
+#include <utils/filepath.h>
 #include <utils/qtcassert.h>
 
 #include <QGuiApplication>
@@ -650,6 +651,19 @@ static TargetDetails extractTargetDetails(const QJsonObject &root, QString &erro
                                                             };
                                                         });
     }
+    {
+        const QJsonArray launchers = root.value("launchers").toArray();
+        if (launchers.size() > 0) {
+            t.launcherInfos = transform<QList>(launchers, [](const QJsonValue &v) {
+                const QJsonObject o = v.toObject();
+                QList<QString> arguments;
+                for (const QJsonValue &arg : o.value("arguments").toArray())
+                    arguments.append(arg.toString());
+                FilePath command = FilePath::fromString(o.value("command").toString());
+                return ProjectExplorer::LauncherInfo { o.value("type").toString(), command, arguments };
+            });
+        }
+    }
 
     return t;
 }
@@ -874,8 +888,10 @@ FileApiData FileApiParser::parseData(QPromise<std::shared_ptr<FileApiQtcData>> &
                                          errorMessage);
 
     if (codeModels.size() == 0) {
-        errorMessage = Tr::tr("CMake project configuration failed. No CMake configuration for "
-                              "build type \"%1\" found.")
+        //: General Messages refers to the output view
+        errorMessage = Tr::tr(
+                           "CMake project configuration failed. No CMake configuration for "
+                           "build type \"%1\" found. Check General Messages for more information.")
                            .arg(cmakeBuildType);
         return result;
     }
diff --git a/src/plugins/cmakeprojectmanager/fileapiparser.h b/src/plugins/cmakeprojectmanager/fileapiparser.h
index 9043d38c260..f6a59edae2a 100644
--- a/src/plugins/cmakeprojectmanager/fileapiparser.h
+++ b/src/plugins/cmakeprojectmanager/fileapiparser.h
@@ -197,6 +197,7 @@ public:
     QList<Utils::FilePath> artifacts;
     QString installPrefix;
     std::vector<InstallDestination> installDestination;
+    QList<ProjectExplorer::LauncherInfo> launcherInfos;
     std::optional<LinkInfo> link;
     std::optional<ArchiveInfo> archive;
     std::vector<DependencyInfo> dependencies;
diff --git a/src/plugins/cmakeprojectmanager/fileapireader.cpp b/src/plugins/cmakeprojectmanager/fileapireader.cpp
index d7dae6c8fcb..b859469cbc7 100644
--- a/src/plugins/cmakeprojectmanager/fileapireader.cpp
+++ b/src/plugins/cmakeprojectmanager/fileapireader.cpp
@@ -12,8 +12,6 @@
 
 #include <coreplugin/messagemanager.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <projectexplorer/projectexplorer.h>
 
 #include <utils/algorithm.h>
@@ -132,7 +130,8 @@ void FileApiReader::parse(bool forceCMakeRun,
     //  * A query file is newer than the reply file
     const bool hasArguments = !args.isEmpty();
     const bool replyFileMissing = !replyFile.exists();
-    const bool cmakeFilesChanged = m_parameters.cmakeTool() && settings().autorunCMake()
+    const bool cmakeFilesChanged = m_parameters.cmakeTool()
+                                   && settings(m_parameters.project).autorunCMake()
                                    && anyOf(m_cmakeFiles, [&replyFile](const CMakeFileInfo &info) {
                                           return !info.isGenerated
                                                  && info.path.lastModified() > replyFile.lastModified();
@@ -172,7 +171,7 @@ void FileApiReader::stop()
 
     if (m_future) {
         m_future->cancel();
-        ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(*m_future);
+        Utils::futureSynchronizer()->addFuture(*m_future);
     }
     m_future = {};
     m_isParsing = false;
@@ -332,7 +331,7 @@ void FileApiReader::makeBackupConfiguration(bool store)
 void FileApiReader::writeConfigurationIntoBuildDirectory(const QStringList &configurationArguments)
 {
     const FilePath buildDir = m_parameters.buildDirectory;
-    QTC_CHECK(buildDir.ensureWritableDir());
+    QTC_ASSERT_EXPECTED(buildDir.ensureWritableDir(), return);
 
     QByteArray contents;
     QStringList unknownOptions;
@@ -344,7 +343,7 @@ void FileApiReader::writeConfigurationIntoBuildDirectory(const QStringList &conf
             .toUtf8());
 
     const FilePath settingsFile = buildDir / "qtcsettings.cmake";
-    QTC_CHECK(settingsFile.writeFileContents(contents));
+    QTC_ASSERT_EXPECTED(settingsFile.writeFileContents(contents), return);
 }
 
 std::unique_ptr<CMakeProjectNode> FileApiReader::rootProjectNode()
diff --git a/src/plugins/cmakeprojectmanager/presetsmacros.cpp b/src/plugins/cmakeprojectmanager/presetsmacros.cpp
index b7496d0c412..cfc161b417e 100644
--- a/src/plugins/cmakeprojectmanager/presetsmacros.cpp
+++ b/src/plugins/cmakeprojectmanager/presetsmacros.cpp
@@ -139,11 +139,13 @@ void expand(const PresetType &preset, Environment &env, const FilePath &sourceDi
             return presetEnv.value(macroName);
         });
 
-        bool append = true;
+        enum Operation { set, appendOrSet, prependOrSet };
+        Operation op = set;
         if (key.compare("PATH", Qt::CaseInsensitive) == 0) {
+            op = appendOrSet;
             const int index = value.indexOf("$penv{PATH}", 0, Qt::CaseInsensitive);
             if (index != 0)
-                append = false;
+                op = prependOrSet;
             value.replace("$penv{PATH}", "", Qt::CaseInsensitive);
         }
 
@@ -154,10 +156,17 @@ void expand(const PresetType &preset, Environment &env, const FilePath &sourceDi
         // Make sure to expand the CMake macros also for environment variables
         expandAllButEnv(preset, sourceDirectory, value);
 
-        if (append)
+        switch (op) {
+        case set:
+            env.set(key, value);
+            break;
+        case appendOrSet:
             env.appendOrSet(key, value);
-        else
+            break;
+        case prependOrSet:
             env.prependOrSet(key, value);
+            break;
+        }
     });
 }
 
diff --git a/src/plugins/cmakeprojectmanager/presetsparser.cpp b/src/plugins/cmakeprojectmanager/presetsparser.cpp
index 3befe4d99d8..429c8958694 100644
--- a/src/plugins/cmakeprojectmanager/presetsparser.cpp
+++ b/src/plugins/cmakeprojectmanager/presetsparser.cpp
@@ -148,6 +148,30 @@ std::optional<PresetsDetails::Condition> parseCondition(const QJsonValue &jsonVa
     return condition;
 }
 
+bool parseVendor(const QJsonValue &jsonValue, std::optional<QVariantMap> &vendorSettings)
+{
+    // The whole section is optional
+    if (jsonValue.isUndefined())
+        return true;
+    if (!jsonValue.isObject())
+        return false;
+
+    const QJsonObject object = jsonValue.toObject();
+    const QJsonValue qtIo = object.value("qt.io/QtCreator/1.0");
+    if (qtIo.isUndefined())
+        return true;
+    if (!qtIo.isObject())
+        return false;
+
+    const QJsonObject qtIoObject = qtIo.toObject();
+    vendorSettings = QVariantMap();
+    for (const QString &settingKey : qtIoObject.keys()) {
+        const QJsonValue settingValue = qtIoObject.value(settingKey);
+        vendorSettings->insert(settingKey, settingValue.toVariant());
+    }
+    return true;
+}
+
 bool parseConfigurePresets(const QJsonValue &jsonValue,
                            QList<PresetsDetails::ConfigurePreset> &configurePresets,
                            const Utils::FilePath &fileDir)
@@ -188,6 +212,9 @@ bool parseConfigurePresets(const QJsonValue &jsonValue,
         if (object.contains("condition"))
             preset.condition = parseCondition(object.value("condition"));
 
+        if (object.contains("vendor"))
+            parseVendor(object.value("vendor"), preset.vendor);
+
         if (object.contains("displayName"))
             preset.displayName = object.value("displayName").toString();
         if (object.contains("description"))
@@ -378,6 +405,9 @@ bool parseBuildPresets(const QJsonValue &jsonValue,
         if (object.contains("condition"))
             preset.condition = parseCondition(object.value("condition"));
 
+        if (object.contains("vendor"))
+            parseVendor(object.value("vendor"), preset.vendor);
+
         if (object.contains("displayName"))
             preset.displayName = object.value("displayName").toString();
         if (object.contains("description"))
@@ -488,7 +518,7 @@ bool PresetsParser::parse(const Utils::FilePath &jsonFile, QString &errorMessage
                                m_presetsData.configurePresets,
                                jsonFile.parentDir())) {
         errorMessage = ::CMakeProjectManager::Tr::tr(
-                           "Invalid \"configurePresets\" section in %1 file")
+                           "Invalid \"configurePresets\" section in file \"%1\".")
                            .arg(jsonFile.fileName());
         return false;
     }
@@ -497,18 +527,24 @@ bool PresetsParser::parse(const Utils::FilePath &jsonFile, QString &errorMessage
     if (!parseBuildPresets(root.value("buildPresets"),
                            m_presetsData.buildPresets,
                            jsonFile.parentDir())) {
-        errorMessage = ::CMakeProjectManager::Tr::tr("Invalid \"buildPresets\" section in %1 file")
+        errorMessage = ::CMakeProjectManager::Tr::tr(
+                           "Invalid \"buildPresets\" section in file \"%1\".")
                            .arg(jsonFile.fileName());
         return false;
     }
 
+    // optional
+    if (!parseVendor(root.value("vendor"), m_presetsData.vendor)) {
+        errorMessage = ::CMakeProjectManager::Tr::tr("Invalid \"vendor\" section in file \"%1\".")
+                           .arg(jsonFile.fileName());
+    }
+
     return true;
 }
 
-static QHash<QString, QString> merge(const QHash<QString, QString> &first,
-                                     const QHash<QString, QString> &second)
+static QVariantMap merge(const QVariantMap &first, const QVariantMap &second)
 {
-    QHash<QString, QString> result = first;
+    QVariantMap result = first;
     for (auto it = second.constKeyValueBegin(); it != second.constKeyValueEnd(); ++it) {
         result[it->first] = it->second;
     }
diff --git a/src/plugins/cmakeprojectmanager/presetsparser.h b/src/plugins/cmakeprojectmanager/presetsparser.h
index 6df09014af3..cfbf5654895 100644
--- a/src/plugins/cmakeprojectmanager/presetsparser.h
+++ b/src/plugins/cmakeprojectmanager/presetsparser.h
@@ -94,7 +94,7 @@ public:
     std::optional<bool> hidden = false;
     std::optional<QStringList> inherits;
     std::optional<Condition> condition;
-    std::optional<QHash<QString, QString>> vendor;
+    std::optional<QVariantMap> vendor;
     std::optional<QString> displayName;
     std::optional<QString> description;
     std::optional<QString> generator;
@@ -120,7 +120,7 @@ public:
     std::optional<bool> hidden = false;
     std::optional<QStringList> inherits;
     std::optional<Condition> condition;
-    std::optional<QHash<QString, QString>> vendor;
+    std::optional<QVariantMap> vendor;
     std::optional<QString> displayName;
     std::optional<QString> description;
     std::optional<Utils::Environment> environment;
@@ -142,7 +142,7 @@ public:
     int version = 0;
     bool havePresets = false;
     QVersionNumber cmakeMinimimRequired;
-    QHash<QString, QString> vendor;
+    std::optional<QVariantMap> vendor;
     std::optional<QStringList> include;
     Utils::FilePath fileDir;
     QList<PresetsDetails::ConfigurePreset> configurePresets;
diff --git a/src/plugins/coco/Coco.json.in b/src/plugins/coco/Coco.json.in
index 01beb8c4984..74ad4d34688 100644
--- a/src/plugins/coco/Coco.json.in
+++ b/src/plugins/coco/Coco.json.in
@@ -13,7 +13,10 @@
                   "",
                   "Alternatively, this plugin 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 plugin. 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."
     ],
-    "Description" : "Squish Coco support. Squish Coco is a code coverage tool for Tcl, QML, C# and C/C++.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Access the Coco CoverageBrowser.",
+    "LongDescription" : [
+        "View the results from the Coco CoverageBrowser to make tests more efficient and complete."
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/compilationdatabaseprojectmanager/CompilationDatabaseProjectManager.json.in b/src/plugins/compilationdatabaseprojectmanager/CompilationDatabaseProjectManager.json.in
index 4842c3d73cc..a72026b8a46 100644
--- a/src/plugins/compilationdatabaseprojectmanager/CompilationDatabaseProjectManager.json.in
+++ b/src/plugins/compilationdatabaseprojectmanager/CompilationDatabaseProjectManager.json.in
@@ -14,8 +14,14 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Build Systems",
-    "Description" : "Compilation Database project support.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Open compilation databases as projects.",
+    "LongDescription" : [
+        "The JSON compilation database format replays single builds independently of the build system.",
+        "A compilation database is a list of files and the compiler flags that are used to compile the files. It feeds the code model with the necessary information for correctly parsing the code when you open a file for editing.",
+        "You also need:",
+            "- A compilation database"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
     "Mimetypes" : [
         "<?xml version='1.0'?>",
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
index ebe7ff44753..c7118690871 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
@@ -106,8 +106,10 @@ QString compilerPath(QString pathFlag)
 
 Toolchain *toolchainFromFlags(const Kit *kit, const QStringList &flags, const Utils::Id &language)
 {
+    Toolchain * const kitToolchain = ToolchainKitAspect::toolchain(kit, language);
+
     if (flags.empty())
-        return ToolchainKitAspect::toolchain(kit, language);
+        return kitToolchain;
 
     // Try exact compiler match.
     const Utils::FilePath compiler = Utils::FilePath::fromUserInput(compilerPath(flags.front()));
@@ -118,6 +120,8 @@ Toolchain *toolchainFromFlags(const Kit *kit, const QStringList &flags, const Ut
         return toolchain;
 
     Utils::Id compilerId = getCompilerId(compiler.fileName());
+    if (kitToolchain->isValid() && kitToolchain->typeId() == compilerId)
+        return kitToolchain;
     if ((toolchain = toolchainFromCompilerId(compilerId, language)))
         return toolchain;
 
@@ -126,13 +130,14 @@ Toolchain *toolchainFromFlags(const Kit *kit, const QStringList &flags, const Ut
         compilerId = Utils::HostOsInfo::isWindowsHost()
                 ? ProjectExplorer::Constants::CLANG_CL_TOOLCHAIN_TYPEID
                 : ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID;
+        if (kitToolchain->isValid() && kitToolchain->typeId() == compilerId)
+            return kitToolchain;
         if ((toolchain = toolchainFromCompilerId(compilerId, language)))
             return toolchain;
     }
 
-    toolchain = ToolchainKitAspect::toolchain(kit, language);
     qWarning() << "No matching toolchain found, use the default.";
-    return toolchain;
+    return kitToolchain;
 }
 
 void addDriverModeFlagIfNeeded(const Toolchain *toolchain,
@@ -332,7 +337,11 @@ CompilationDatabaseBuildSystem::CompilationDatabaseBuildSystem(Target *target)
             this, &CompilationDatabaseBuildSystem::updateDeploymentData);
 }
 
-CompilationDatabaseBuildSystem::~CompilationDatabaseBuildSystem() = default;
+CompilationDatabaseBuildSystem::~CompilationDatabaseBuildSystem()
+{
+    if (m_parser)
+        delete m_parser;
+}
 
 void CompilationDatabaseBuildSystem::triggerParsing()
 {
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseutils.h b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseutils.h
index df0d4c9c9fe..dd202efbf39 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseutils.h
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseutils.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <cppeditor/cppprojectfile.h>
+#include <utils/synchronizedvalue.h>
 
 #include <QHash>
 
@@ -29,7 +30,7 @@ public:
     QStringList extras;
 };
 
-using MimeBinaryCache = QHash<QString, bool>;
+using MimeBinaryCache = Utils::SynchronizedValue<QHash<QString, bool>>;
 
 QStringList filterFromFileName(const QStringList &flags, const QString &fileName);
 
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp
index 4ab893a9e6c..97ed389bc2b 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp
@@ -8,8 +8,6 @@
 
 #include <coreplugin/progressmanager/progressmanager.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <projectexplorer/treescanner.h>
 
 #include <utils/async.h>
@@ -132,6 +130,15 @@ CompilationDbParser::CompilationDbParser(const QString &projectName,
     });
 }
 
+CompilationDbParser::~CompilationDbParser()
+{
+    if (m_treeScanner && !m_treeScanner->isFinished()) {
+        auto future = m_treeScanner->future();
+        future.cancel();
+        future.waitForFinished();
+    }
+}
+
 void CompilationDbParser::start()
 {
     // Check hash first.
@@ -160,12 +167,17 @@ void CompilationDbParser::start()
 
             // Cache mime check result for speed up
             if (!isIgnored) {
-                auto it = m_mimeBinaryCache.find(mimeType.name());
-                if (it != m_mimeBinaryCache.end()) {
+                if (auto it = m_mimeBinaryCache.get<std::optional<bool>>(
+                        [mimeType](const QHash<QString, bool> &cache) -> std::optional<bool> {
+                            const auto cache_it = cache.find(mimeType.name());
+                            if (cache_it != cache.end())
+                                return *cache_it;
+                            return {};
+                        })) {
                     isIgnored = *it;
                 } else {
                     isIgnored = TreeScanner::isMimeBinary(mimeType, fn);
-                    m_mimeBinaryCache[mimeType.name()] = isIgnored;
+                    m_mimeBinaryCache.writeLocked()->insert(mimeType.name(), isIgnored);
                 }
             }
 
@@ -190,7 +202,7 @@ void CompilationDbParser::start()
                                    "CompilationDatabase.Parse");
     ++m_runningParserJobs;
     m_parserWatcher.setFuture(future);
-    ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(future);
+    Utils::futureSynchronizer()->addFuture(future);
 }
 
 void CompilationDbParser::stop()
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.h b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.h
index a06ba82581e..065dfbe129a 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.h
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.h
@@ -32,6 +32,7 @@ public:
                                  MimeBinaryCache &mimeBinaryCache,
                                  ProjectExplorer::BuildSystem::ParseGuard &&guard,
                                  QObject *parent = nullptr);
+    ~CompilationDbParser();
 
 
     void setPreviousProjectFileHash(const QByteArray &fileHash) { m_projectFileHash = fileHash; }
diff --git a/src/plugins/compilerexplorer/CompilerExplorer.json.in b/src/plugins/compilerexplorer/CompilerExplorer.json.in
index 108bd6a5df6..e7e0938fa86 100644
--- a/src/plugins/compilerexplorer/CompilerExplorer.json.in
+++ b/src/plugins/compilerexplorer/CompilerExplorer.json.in
@@ -15,7 +15,7 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Description" : "Integrates https://godbolt.org into Qt Creator.",
-    "Url" : "http://www.qt.io",
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
     "Mimetypes" : [
         "<?xml version='1.0'?>",
@@ -26,5 +26,6 @@
         "        <glob pattern='*.qtce'/>",
         "    </mime-type>",
         "</mime-info>"
-    ]
+    ],
+    "JsonWizardPaths" : [":/compilerexplorer/wizard/"]
 }
diff --git a/src/plugins/compilerexplorer/compilerexplorer.qrc b/src/plugins/compilerexplorer/compilerexplorer.qrc
index ea46de321c6..c4a75150d6e 100644
--- a/src/plugins/compilerexplorer/compilerexplorer.qrc
+++ b/src/plugins/compilerexplorer/compilerexplorer.qrc
@@ -4,5 +4,7 @@
     <file>wizard/cpp/file.qtce</file>
     <file>wizard/python/wizard.json</file>
     <file>wizard/python/file.qtce</file>
+    <file>wizard/qtcpp/file.qtce</file>
+    <file>wizard/qtcpp/wizard.json</file>
   </qresource>
 </RCC>
diff --git a/src/plugins/compilerexplorer/compilerexploreraspects.cpp b/src/plugins/compilerexplorer/compilerexploreraspects.cpp
index 9096b7dabeb..1c1a8e6b96c 100644
--- a/src/plugins/compilerexplorer/compilerexploreraspects.cpp
+++ b/src/plugins/compilerexplorer/compilerexploreraspects.cpp
@@ -91,7 +91,7 @@ void LibrarySelectionAspect::setVariantValue(const QVariant &value, Announcement
     setValue(map, howToAnnounce);
 }
 
-void LibrarySelectionAspect::addToLayout(Layouting::LayoutItem &parent)
+void LibrarySelectionAspect::addToLayout(Layouting::Layout &parent)
 {
     using namespace Layouting;
 
@@ -223,12 +223,12 @@ void LibrarySelectionAspect::addToLayout(Layouting::LayoutItem &parent)
     // clang-format off
     QStackedWidget *stack = static_cast<QStackedWidget*>(
         Stack {
-            noMargin,
             Row { noMargin, displayLabel, editBtn },
             Row { noMargin, nameCombo, versionCombo, clearBtn }
         }.emerge()
     );
     // clang-format on
+    stack->setContentsMargins({});
     connect(editBtn, &QPushButton::clicked, stack, [stack] { stack->setCurrentIndex(1); });
     connect(this, &LibrarySelectionAspect::returnToDisplay, stack, [stack] {
         stack->setCurrentIndex(0);
diff --git a/src/plugins/compilerexplorer/compilerexploreraspects.h b/src/plugins/compilerexplorer/compilerexploreraspects.h
index c89604b7aa1..bb2e86a2688 100644
--- a/src/plugins/compilerexplorer/compilerexploreraspects.h
+++ b/src/plugins/compilerexplorer/compilerexploreraspects.h
@@ -68,7 +68,7 @@ public:
 
     LibrarySelectionAspect(Utils::AspectContainer *container = nullptr);
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     using ResultCallback = std::function<void(QList<QStandardItem *>)>;
     using FillCallback = std::function<void(ResultCallback)>;
diff --git a/src/plugins/compilerexplorer/compilerexplorereditor.cpp b/src/plugins/compilerexplorer/compilerexplorereditor.cpp
index 651ee596205..1d00f8cb95c 100644
--- a/src/plugins/compilerexplorer/compilerexplorereditor.cpp
+++ b/src/plugins/compilerexplorer/compilerexplorereditor.cpp
@@ -18,7 +18,6 @@
 #include <texteditor/fontsettings.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/textmark.h>
 
@@ -53,6 +52,7 @@ using namespace std::chrono_literals;
 using namespace Aggregation;
 using namespace TextEditor;
 using namespace Utils;
+using namespace Core;
 
 namespace CompilerExplorer {
 
@@ -66,7 +66,11 @@ constexpr char SourceEditorHoverLine[] = "SourceEditor.HoveredLine";
 CodeEditorWidget::CodeEditorWidget(const std::shared_ptr<SourceSettings> &settings,
                                    QUndoStack *undoStack)
     : m_settings(settings)
-    , m_undoStack(undoStack){};
+    , m_undoStack(undoStack)
+{
+    connect(undoStack, &QUndoStack::canUndoChanged, this, [this]() { updateUndoRedoActions(); });
+    connect(undoStack, &QUndoStack::canRedoChanged, this, [this]() { updateUndoRedoActions(); });
+};
 
 void CodeEditorWidget::updateHighlighter()
 {
@@ -254,13 +258,13 @@ SourceEditorWidget::SourceEditorWidget(const std::shared_ptr<SourceSettings> &se
         settings->languageId,
         addCompilerButton,
         removeSourceButton,
-        customMargin({6, 0, 0, 0}), spacing(0),
+        customMargins(6, 0, 0, 0), spacing(0),
     }.attachTo(toolBar);
 
     Column {
         toolBar,
         m_codeEditor,
-        noMargin(), spacing(0),
+        noMargin, spacing(0),
     }.attachTo(this);
     // clang-format on
 
@@ -366,7 +370,6 @@ CompilerWidget::CompilerWidget(const std::shared_ptr<SourceSettings> &sourceSett
     connect(m_asmEditor, &AsmEditorWidget::gotFocus, this, &CompilerWidget::gotFocus);
 
     auto advButton = new QToolButton;
-    QSplitter *splitter{nullptr};
 
     auto advDlg = new QAction;
     advDlg->setIcon(Utils::Icons::SETTINGS_TOOLBAR.icon());
@@ -396,53 +399,51 @@ CompilerWidget::CompilerWidget(const std::shared_ptr<SourceSettings> &sourceSett
     });
 
     // clang-format off
-
     Row {
         m_compilerSettings->compiler,
         advButton,
         removeCompilerBtn,
-        customMargin({6, 0, 0, 0}), spacing(0),
+        customMargins(6, 0, 0, 0), spacing(0),
     }.attachTo(toolBar);
 
     Column {
         toolBar,
         Splitter {
-            bindTo(&splitter),
             m_asmEditor,
             createTerminal()
         },
-        noMargin(), spacing(0),
+        noMargin, spacing(0),
     }.attachTo(this);
     // clang-format on
 
     m_spinner = new SpinnerSolution::Spinner(SpinnerSolution::SpinnerSize::Large, this);
 }
 
-Core::SearchableTerminal *CompilerWidget::createTerminal()
+SearchableTerminal *CompilerWidget::createTerminal()
 {
-    m_resultTerminal = new Core::SearchableTerminal();
+    m_resultTerminal = new SearchableTerminal();
     m_resultTerminal->setAllowBlinkingCursor(false);
-    std::array<QColor, 20> colors{Utils::creatorTheme()->color(Utils::Theme::TerminalAnsi0),
-                                  Utils::creatorTheme()->color(Utils::Theme::TerminalAnsi1),
-                                  Utils::creatorTheme()->color(Utils::Theme::TerminalAnsi2),
-                                  Utils::creatorTheme()->color(Utils::Theme::TerminalAnsi3),
-                                  Utils::creatorTheme()->color(Utils::Theme::TerminalAnsi4),
-                                  Utils::creatorTheme()->color(Utils::Theme::TerminalAnsi5),
-                                  Utils::creatorTheme()->color(Utils::Theme::TerminalAnsi6),
-                                  Utils::creatorTheme()->color(Utils::Theme::TerminalAnsi7),
-                                  Utils::creatorTheme()->color(Utils::Theme::TerminalAnsi8),
-                                  Utils::creatorTheme()->color(Utils::Theme::TerminalAnsi9),
-                                  Utils::creatorTheme()->color(Utils::Theme::TerminalAnsi10),
-                                  Utils::creatorTheme()->color(Utils::Theme::TerminalAnsi11),
-                                  Utils::creatorTheme()->color(Utils::Theme::TerminalAnsi12),
-                                  Utils::creatorTheme()->color(Utils::Theme::TerminalAnsi13),
-                                  Utils::creatorTheme()->color(Utils::Theme::TerminalAnsi14),
-                                  Utils::creatorTheme()->color(Utils::Theme::TerminalAnsi15),
+    std::array<QColor, 20> colors{Utils::creatorColor(Utils::Theme::TerminalAnsi0),
+                                  Utils::creatorColor(Utils::Theme::TerminalAnsi1),
+                                  Utils::creatorColor(Utils::Theme::TerminalAnsi2),
+                                  Utils::creatorColor(Utils::Theme::TerminalAnsi3),
+                                  Utils::creatorColor(Utils::Theme::TerminalAnsi4),
+                                  Utils::creatorColor(Utils::Theme::TerminalAnsi5),
+                                  Utils::creatorColor(Utils::Theme::TerminalAnsi6),
+                                  Utils::creatorColor(Utils::Theme::TerminalAnsi7),
+                                  Utils::creatorColor(Utils::Theme::TerminalAnsi8),
+                                  Utils::creatorColor(Utils::Theme::TerminalAnsi9),
+                                  Utils::creatorColor(Utils::Theme::TerminalAnsi10),
+                                  Utils::creatorColor(Utils::Theme::TerminalAnsi11),
+                                  Utils::creatorColor(Utils::Theme::TerminalAnsi12),
+                                  Utils::creatorColor(Utils::Theme::TerminalAnsi13),
+                                  Utils::creatorColor(Utils::Theme::TerminalAnsi14),
+                                  Utils::creatorColor(Utils::Theme::TerminalAnsi15),
 
-                                  Utils::creatorTheme()->color(Utils::Theme::TerminalForeground),
-                                  Utils::creatorTheme()->color(Utils::Theme::TerminalBackground),
-                                  Utils::creatorTheme()->color(Utils::Theme::TerminalSelection),
-                                  Utils::creatorTheme()->color(Utils::Theme::TerminalFindMatch)};
+                                  Utils::creatorColor(Utils::Theme::TerminalForeground),
+                                  Utils::creatorColor(Utils::Theme::TerminalBackground),
+                                  Utils::creatorColor(Utils::Theme::TerminalSelection),
+                                  Utils::creatorColor(Utils::Theme::TerminalFindMatch)};
 
     m_resultTerminal->setColors(colors);
 
@@ -554,7 +555,7 @@ void CompilerWidget::doCompile()
             const QList<QTextEdit::ExtraSelection> links = m_asmDocument->setCompileResult(r);
             m_asmEditor->setExtraSelections(AsmEditorLinks, links);
         } catch (const std::exception &e) {
-            Core::MessageManager::writeDisrupting(
+            MessageManager::writeDisrupting(
                 Tr::tr("Failed to compile: \"%1\".").arg(QString::fromUtf8(e.what())));
         }
     });
@@ -564,12 +565,10 @@ void CompilerWidget::doCompile()
 
 EditorWidget::EditorWidget(const std::shared_ptr<JsonSettingsDocument> &document,
                            QUndoStack *undoStack,
-                           TextEditorActionHandler &actionHandler,
                            QWidget *parent)
     : Utils::FancyMainWindow(parent)
     , m_document(document)
     , m_undoStack(undoStack)
-    , m_actionHandler(actionHandler)
 {
     setContextMenuPolicy(Qt::NoContextMenu);
     setDockNestingEnabled(true);
@@ -589,10 +588,6 @@ EditorWidget::EditorWidget(const std::shared_ptr<JsonSettingsDocument> &document
             this,
             &EditorWidget::recreateEditors);
 
-    connect(this, &EditorWidget::gotFocus, this, [&actionHandler] {
-        actionHandler.updateCurrentEditor();
-    });
-
     setupHelpWidget();
 }
 
@@ -627,10 +622,6 @@ CompilerWidget *EditorWidget::addCompiler(const std::shared_ptr<SourceSettings>
                 sourceSettings->compilers.removeItem(compilerSettings->shared_from_this());
             });
 
-    connect(compiler, &CompilerWidget::gotFocus, this, [this] {
-        m_actionHandler.updateCurrentEditor();
-    });
-
     return compiler;
 }
 
@@ -669,10 +660,6 @@ void EditorWidget::addSourceEditor(const std::shared_ptr<SourceSettings> &source
         setupHelpWidget();
     });
 
-    connect(sourceEditor, &SourceEditorWidget::gotFocus, this, [this] {
-        m_actionHandler.updateCurrentEditor();
-    });
-
     dockWidget->setFeatures(QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetMovable);
     addDockWidget(Qt::LeftDockWidgetArea, dockWidget);
 
@@ -842,18 +829,25 @@ TextEditor::TextEditorWidget *EditorWidget::focusedEditorWidget() const
     return nullptr;
 }
 
-Editor::Editor(TextEditorActionHandler &actionHandler)
+Editor::Editor()
     : m_document(new JsonSettingsDocument(&m_undoStack))
 {
-    setContext(Core::Context(Constants::CE_EDITOR_ID));
-    setWidget(new EditorWidget(m_document, &m_undoStack, actionHandler));
+    setContext(Context(Constants::CE_EDITOR_ID));
+    setWidget(new EditorWidget(m_document, &m_undoStack));
 
-    connect(&m_undoStack, &QUndoStack::canUndoChanged, this, [&actionHandler] {
-        actionHandler.updateActions();
-    });
-    connect(&m_undoStack, &QUndoStack::canRedoChanged, this, [&actionHandler] {
-        actionHandler.updateActions();
-    });
+    m_undoAction = ActionBuilder(this, Core::Constants::UNDO)
+                       .setContext(m_context)
+                       .addOnTriggered([this] { m_undoStack.undo(); })
+                       .setScriptable(true)
+                       .contextAction();
+    m_redoAction = ActionBuilder(this, Core::Constants::REDO)
+                       .setContext(m_context)
+                       .addOnTriggered([this] { m_undoStack.redo(); })
+                       .setScriptable(true)
+                       .contextAction();
+
+    connect(&m_undoStack, &QUndoStack::canUndoChanged, m_undoAction, &QAction::setEnabled);
+    connect(&m_undoStack, &QUndoStack::canRedoChanged, m_redoAction, &QAction::setEnabled);
 }
 
 Editor::~Editor()
@@ -861,18 +855,6 @@ Editor::~Editor()
     delete widget();
 }
 
-static bool childHasFocus(QWidget *parent)
-{
-    if (parent->hasFocus())
-        return true;
-
-    for (QWidget *child : parent->findChildren<QWidget *>())
-        if (childHasFocus(child))
-            return true;
-
-    return false;
-}
-
 QWidget *Editor::toolBar()
 {
     if (!m_toolBar) {
@@ -909,65 +891,11 @@ QWidget *Editor::toolBar()
 }
 
 EditorFactory::EditorFactory()
-    : m_actionHandler(Constants::CE_EDITOR_ID,
-                      Constants::CE_EDITOR_ID,
-                      TextEditor::TextEditorActionHandler::None,
-                      [](Core::IEditor *editor) -> TextEditorWidget * {
-                          return static_cast<EditorWidget *>(editor->widget())->focusedEditorWidget();
-                      })
 {
     setId(Constants::CE_EDITOR_ID);
     setDisplayName(Tr::tr("Compiler Explorer Editor"));
     setMimeTypes({"application/compiler-explorer"});
-
-    auto undoStackFromEditor = [](Core::IEditor *editor) -> QUndoStack * {
-        if (!editor)
-            return nullptr;
-        return &static_cast<Editor *>(editor)->m_undoStack;
-    };
-
-    m_actionHandler.setCanUndoCallback([undoStackFromEditor](Core::IEditor *editor) {
-        if (auto undoStack = undoStackFromEditor(editor))
-            return undoStack->canUndo();
-        return false;
-    });
-
-    m_actionHandler.setCanRedoCallback([undoStackFromEditor](Core::IEditor *editor) {
-        if (auto undoStack = undoStackFromEditor(editor))
-            return undoStack->canRedo();
-        return false;
-    });
-
-    m_actionHandler.setUnhandledCallback(
-        [undoStackFromEditor](Utils::Id cmdId, Core::IEditor *editor) {
-            if (cmdId == TextEditor::Constants::INCREASE_FONT_SIZE) {
-                TextEditor::TextEditorSettings::instance()->increaseFontZoom();
-                return true;
-            } else if (cmdId == TextEditor::Constants::DECREASE_FONT_SIZE) {
-                TextEditor::TextEditorSettings::instance()->decreaseFontZoom();
-                return true;
-            }
-
-            if (cmdId != Core::Constants::UNDO && cmdId != Core::Constants::REDO)
-                return false;
-
-            if (!childHasFocus(editor->widget()))
-                return false;
-
-            QUndoStack *undoStack = undoStackFromEditor(editor);
-
-            if (!undoStack)
-                return false;
-
-            if (cmdId == Core::Constants::UNDO)
-                undoStack->undo();
-            else
-                undoStack->redo();
-
-            return true;
-        });
-
-    setEditorCreator([this]() { return new Editor(m_actionHandler); });
+    setEditorCreator([] { return new Editor; });
 }
 
 QList<QTextEdit::ExtraSelection> AsmDocument::setCompileResult(
diff --git a/src/plugins/compilerexplorer/compilerexplorereditor.h b/src/plugins/compilerexplorer/compilerexplorereditor.h
index c9c02e5215f..7aa7b185ef6 100644
--- a/src/plugins/compilerexplorer/compilerexplorereditor.h
+++ b/src/plugins/compilerexplorer/compilerexplorereditor.h
@@ -11,7 +11,6 @@
 #include <solutions/spinner/spinner.h>
 
 #include <texteditor/texteditor.h>
-#include <texteditor/texteditoractionhandler.h>
 
 #include <utils/fancymainwindow.h>
 
@@ -39,6 +38,9 @@ public:
     void undo() override { m_undoStack->undo(); }
     void redo() override { m_undoStack->redo(); }
 
+    bool isUndoAvailable() const override { return m_undoStack->canUndo(); }
+    bool isRedoAvailable() const override { return m_undoStack->canRedo(); }
+
     void focusInEvent(QFocusEvent *event) override
     {
         TextEditorWidget::focusInEvent(event);
@@ -77,6 +79,7 @@ public:
     {
         TextEditorWidget::focusInEvent(event);
         emit gotFocus();
+        updateUndoRedoActions();
     }
 
     void findLinkAt(const QTextCursor &,
@@ -87,6 +90,9 @@ public:
     void undo() override { m_undoStack->undo(); }
     void redo() override { m_undoStack->redo(); }
 
+    bool isUndoAvailable() const override { return m_undoStack->canUndo(); }
+    bool isRedoAvailable() const override { return m_undoStack->canRedo(); }
+
 protected:
     void mouseMoveEvent(QMouseEvent *event) override;
     void leaveEvent(QEvent *event) override;
@@ -223,7 +229,6 @@ class EditorWidget : public Utils::FancyMainWindow
 public:
     EditorWidget(const std::shared_ptr<JsonSettingsDocument> &document,
                  QUndoStack *undoStack,
-                 TextEditor::TextEditorActionHandler &actionHandler,
                  QWidget *parent = nullptr);
     ~EditorWidget() override;
 
@@ -253,7 +258,6 @@ protected:
 private:
     std::shared_ptr<JsonSettingsDocument> m_document;
     QUndoStack *m_undoStack;
-    TextEditor::TextEditorActionHandler &m_actionHandler;
 
     QList<QDockWidget *> m_compilerWidgets;
     QList<QDockWidget *> m_sourceWidgets;
@@ -262,7 +266,7 @@ private:
 class Editor : public Core::IEditor
 {
 public:
-    Editor(TextEditor::TextEditorActionHandler &actionHandler);
+    Editor();
     ~Editor();
 
     Core::IDocument *document() const override { return m_document.get(); }
@@ -271,6 +275,8 @@ public:
     std::shared_ptr<JsonSettingsDocument> m_document;
     QUndoStack m_undoStack;
     std::unique_ptr<QToolBar> m_toolBar;
+    QAction *m_undoAction = nullptr;
+    QAction *m_redoAction = nullptr;
 };
 
 class EditorFactory : public Core::IEditorFactory
@@ -279,8 +285,6 @@ public:
     EditorFactory();
 
 private:
-    TextEditor::TextEditorActionHandler m_actionHandler;
-
     QAction m_undoAction;
     QAction m_redoAction;
 };
diff --git a/src/plugins/compilerexplorer/compilerexplorerplugin.cpp b/src/plugins/compilerexplorer/compilerexplorerplugin.cpp
index c54c26a600f..48920561b4a 100644
--- a/src/plugins/compilerexplorer/compilerexplorerplugin.cpp
+++ b/src/plugins/compilerexplorer/compilerexplorerplugin.cpp
@@ -6,7 +6,6 @@
 #include "compilerexplorersettings.h"
 #include "compilerexplorertr.h"
 
-#include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
@@ -20,44 +19,38 @@
 
 #include <utils/fsengine/fileiconprovider.h>
 
-#include <QMenu>
-
 using namespace Core;
 using namespace Utils;
 
 namespace CompilerExplorer::Internal {
 
-class CompilerExplorerPlugin : public ExtensionSystem::IPlugin
+class CompilerExplorerPlugin final : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "CompilerExplorer.json")
 
 public:
-    void initialize() override
+    void initialize() final
     {
         static CompilerExplorer::EditorFactory ceEditorFactory;
 
         FileIconProvider::registerIconForMimeType(QIcon(":/compilerexplorer/logos/ce.ico"),
                                                   "application/compiler-explorer");
 
-        ProjectExplorer::JsonWizardFactory::addWizardPath(":/compilerexplorer/wizard/");
-
         const Id menuId = "Tools.CompilerExplorer";
-        ActionContainer *mtools = ActionManager::actionContainer(Core::Constants::M_TOOLS);
-        ActionContainer *mCompilerExplorer = ActionManager::createMenu(menuId);
-        QMenu *menu = mCompilerExplorer->menu();
-        menu->setTitle(Tr::tr("Compiler Explorer"));
-        mtools->addMenu(mCompilerExplorer);
+        MenuBuilder(menuId)
+            .setTitle(Tr::tr("Compiler Explorer"))
+            .addToContainer(Core::Constants::M_TOOLS);
 
-        ActionBuilder openAction(this, "CompilerExplorer.CompilerExplorerAction");
-        openAction.setText(Tr::tr("Open Compiler Explorer"));
-        openAction.addToContainer(menuId);
-        openAction.addOnTriggered(this, [] {
-            QString name = "Compiler Explorer $";
-            Core::EditorManager::openEditorWithContents(Constants::CE_EDITOR_ID,
-                                                        &name,
-                                                        settings().defaultDocument().toUtf8());
-        });
+        ActionBuilder(this, "CompilerExplorer.CompilerExplorerAction")
+            .setText(Tr::tr("Open Compiler Explorer"))
+            .addToContainer(menuId)
+            .addOnTriggered(this, [] {
+                QString name = "Compiler Explorer $";
+                EditorManager::openEditorWithContents(Constants::CE_EDITOR_ID,
+                                                      &name,
+                                                      settings().defaultDocument().toUtf8());
+            });
     }
 };
 
diff --git a/src/plugins/compilerexplorer/wizard/qtcpp/file.qtce b/src/plugins/compilerexplorer/wizard/qtcpp/file.qtce
new file mode 100644
index 00000000000..896dacbbfe3
--- /dev/null
+++ b/src/plugins/compilerexplorer/wizard/qtcpp/file.qtce
@@ -0,0 +1,18 @@
+{
+    "Sources": [
+        {
+            "Compilers": [
+                {
+                    "ExecuteCode": true,
+                    "Id": "clang_trunk",
+                    "Libraries": {
+                        "pcre2": "1042",
+                        "qt": "660"
+                    },
+                    "Options": "-O3"
+                }
+            ],
+            "Source": "#include <QString>\\n#include <QDebug>\\n\\nint main() {\\n  QString msg = \\"Hello World!\\";\\n  qDebug() << msg;\\n  return 0;\\n}"
+        }
+    ]
+}
diff --git a/src/plugins/compilerexplorer/wizard/qtcpp/wizard.json b/src/plugins/compilerexplorer/wizard/qtcpp/wizard.json
new file mode 100644
index 00000000000..e0d6edab85a
--- /dev/null
+++ b/src/plugins/compilerexplorer/wizard/qtcpp/wizard.json
@@ -0,0 +1,37 @@
+{
+    "version": 1,
+    "supportedProjectTypes": [],
+    "id": "QTCE.QtCppSource",
+    "category": "U.CompilerExplorer",
+    "trDescription": "Creates an example CompilerExplorer setup for C++ with Qt Libraries.",
+    "trDisplayName": "Compiler Explorer Qt & C++ Source",
+    "trDisplayCategory": "Compiler Explorer",
+    "icon": ":/compilerexplorer/logos/ce.ico",
+    "iconKind": "Plain",
+    "options": {
+        "key": "DefaultSuffix",
+        "value": "%{JS: Util.preferredSuffix('application/compiler-explorer')}"
+    },
+    "pages": [
+        {
+            "trDisplayName": "Location",
+            "trShortTitle": "Location",
+            "typeId": "File"
+        },
+        {
+            "trDisplayName": "Project Management",
+            "trShortTitle": "Summary",
+            "typeId": "Summary"
+        }
+    ],
+    "generators": [
+        {
+            "typeId": "File",
+            "data": {
+                "source": "file.qtce",
+                "target": "%{JS: Util.fileName(value('TargetPath'), value('DefaultSuffix'))}",
+                "openInEditor": true
+            }
+        }
+    ]
+}
diff --git a/src/plugins/conan/Conan.json.in b/src/plugins/conan/Conan.json.in
index b81813c0a6f..78d1e8d8f7a 100644
--- a/src/plugins/conan/Conan.json.in
+++ b/src/plugins/conan/Conan.json.in
@@ -13,7 +13,11 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Experimental" : true,
-    "Description" : "Conan integration.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Integrate C or C++ libraries into projects.",
+    "LongDescription" : [
+        "You also need:",
+            "- Conan"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/copilot/Copilot.json.in b/src/plugins/copilot/Copilot.json.in
index 81f326770d4..788f26f2e18 100644
--- a/src/plugins/copilot/Copilot.json.in
+++ b/src/plugins/copilot/Copilot.json.in
@@ -13,7 +13,12 @@
                   "",
                   "Alternatively, this plugin 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 plugin. 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."
     ],
-    "Description" : "Copilot support",
-    "Url" : "http://www.qt.io",
+    "Description" : "View suggestions from GitHub Copilot in code editor.",
+    "LongDescription" : [
+        "You also need:",
+            "- An active GitHub Copilot subscription",
+            "- GitHub Copilot Neovim plugin installed (requires Node.js)"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/copilot/copilotsettings.cpp b/src/plugins/copilot/copilotsettings.cpp
index 9ddfa4edfbb..81fd4c3b126 100644
--- a/src/plugins/copilot/copilotsettings.cpp
+++ b/src/plugins/copilot/copilotsettings.cpp
@@ -37,6 +37,8 @@ CopilotSettings &settings()
     return settings;
 }
 
+static const QString entryPointFileName = QStringLiteral("language-server.js");
+
 CopilotSettings::CopilotSettings()
 {
     setAutoApply(false);
@@ -50,18 +52,22 @@ CopilotSettings::CopilotSettings()
         // Vim, Linux/macOS:
         FilePath::fromUserInput("~/.vim/pack/github/start/copilot.vim/dist/agent.js"),
         FilePath::fromUserInput("~/.vim/pack/github/start/copilot.vim/copilot/dist/agent.js"),
+        FilePath::fromUserInput("~/.vim/pack/github/start/copilot.vim/dist/language-server.js"),
 
         // Neovim, Linux/macOS:
         FilePath::fromUserInput("~/.config/nvim/pack/github/start/copilot.vim/dist/agent.js"),
         FilePath::fromUserInput("~/.config/nvim/pack/github/start/copilot.vim/copilot/dist/agent.js"),
+        FilePath::fromUserInput("~/.config/nvim/pack/github/start/copilot.vim/dist/language-server.js"),
 
         // Vim, Windows (PowerShell command):
         FilePath::fromUserInput("~/vimfiles/pack/github/start/copilot.vim/dist/agent.js"),
         FilePath::fromUserInput("~/vimfiles/pack/github/start/copilot.vim/copilot/dist/agent.js"),
+        FilePath::fromUserInput("~/vimfiles/pack/github/start/copilot.vim/dist/language-server.js"),
 
         // Neovim, Windows (PowerShell command):
         FilePath::fromUserInput("~/AppData/Local/nvim/pack/github/start/copilot.vim/dist/agent.js"),
-        FilePath::fromUserInput("~/AppData/Local/nvim/pack/github/start/copilot.vim/copilot/dist/agent.js")
+        FilePath::fromUserInput("~/AppData/Local/nvim/pack/github/start/copilot.vim/copilot/dist/agent.js"),
+        FilePath::fromUserInput("~/AppData/Local/nvim/pack/github/start/copilot.vim/dist/language-server.js")
     };
     // clang-format on
 
@@ -81,13 +87,16 @@ CopilotSettings::CopilotSettings()
     distPath.setExpectedKind(PathChooser::File);
     distPath.setDefaultPathValue(distFromVim);
     distPath.setSettingsKey("Copilot.DistPath");
-    distPath.setLabelText(Tr::tr("Path to agent.js:"));
+    //: %1 is the filename of the copilot language server
+    distPath.setLabelText(Tr::tr("Path to %1:").arg(entryPointFileName));
     distPath.setHistoryCompleter("Copilot.DistPath.History");
-    distPath.setDisplayName(Tr::tr("Agent.js path"));
-    //: %1 is the URL to copilot.vim getting started
-    distPath.setToolTip(Tr::tr("Select path to agent.js in Copilot Neovim plugin. See "
+    //: %1 is the filename of the copilot language server
+    distPath.setDisplayName(Tr::tr("%1 path").arg(entryPointFileName));
+    //: %1 is the URL to copilot.vim getting started, %2 is the filename of the copilot language server
+    distPath.setToolTip(Tr::tr("Select path to %2 in Copilot Neovim plugin. See "
                                "%1 for installation instructions.")
-                            .arg("https://github.com/github/copilot.vim#getting-started"));
+                            .arg("https://github.com/github/copilot.vim#getting-started")
+                            .arg(entryPointFileName));
 
     autoComplete.setDisplayName(Tr::tr("Auto Request"));
     autoComplete.setSettingsKey("Copilot.Autocomplete");
@@ -168,41 +177,39 @@ CopilotSettings::CopilotSettings()
     setLayouter([this] {
         using namespace Layouting;
 
-        auto warningLabel = new QLabel;
-        warningLabel->setWordWrap(true);
-        warningLabel->setTextInteractionFlags(
-            Qt::LinksAccessibleByMouse | Qt::LinksAccessibleByKeyboard | Qt::TextSelectableByMouse);
-        warningLabel->setText(
-            Tr::tr("Enabling %1 is subject to your agreement and abidance with your applicable "
-                   "%1 terms. It is your responsibility to know and accept the requirements and "
-                   "parameters of using tools like %1. This may include, but is not limited to, "
-                   "ensuring you have the rights to allow %1 access to your code, as well as "
-                   "understanding any implications of your use of %1 and suggestions produced "
-                   "(like copyright, accuracy, etc.).")
-                .arg("Copilot"));
-
-        auto authWidget = new AuthWidget();
-
-        auto helpLabel = new QLabel();
-        helpLabel->setTextFormat(Qt::MarkdownText);
-        helpLabel->setWordWrap(true);
-        helpLabel->setTextInteractionFlags(
-            Qt::LinksAccessibleByMouse | Qt::LinksAccessibleByKeyboard | Qt::TextSelectableByMouse);
-        helpLabel->setOpenExternalLinks(true);
-        connect(helpLabel, &QLabel::linkHovered, [](const QString &link) {
-            QToolTip::showText(QCursor::pos(), link);
-        });
-
         // clang-format off
-        helpLabel->setText(Tr::tr(
-            "The Copilot plugin requires node.js and the Copilot neovim plugin. "
-            "If you install the neovim plugin as described in %1, "
-            "the plugin will find the agent.js file automatically.\n\n"
-            "Otherwise you need to specify the path to the %2 "
-            "file from the Copilot neovim plugin.",
-            "Markdown text for the copilot instruction label")
-                           .arg("[README.md](https://github.com/github/copilot.vim)")
-                           .arg("[agent.js](https://github.com/github/copilot.vim/tree/release/dist)"));
+
+        Label warningLabel {
+            wordWrap(true),
+            textInteractionFlags(
+                Qt::LinksAccessibleByMouse | Qt::LinksAccessibleByKeyboard | Qt::TextSelectableByMouse),
+            text(Tr::tr("Enabling %1 is subject to your agreement and abidance with your applicable "
+                 "%1 terms. It is your responsibility to know and accept the requirements and "
+                 "parameters of using tools like %1. This may include, but is not limited to, "
+                 "ensuring you have the rights to allow %1 access to your code, as well as "
+                 "understanding any implications of your use of %1 and suggestions produced "
+                 "(like copyright, accuracy, etc.).")
+                       .arg("Copilot")),
+        };
+
+        Label helpLabel {
+            textFormat(Qt::MarkdownText),
+            wordWrap(true),
+            textInteractionFlags(
+                Qt::LinksAccessibleByMouse | Qt::LinksAccessibleByKeyboard | Qt::TextSelectableByMouse),
+            openExternalLinks(true),
+            onLinkHovered([](const QString &link) { QToolTip::showText(QCursor::pos(), link); }, this),
+            text(Tr::tr(
+                "The Copilot plugin requires node.js and the Copilot neovim plugin. "
+                "If you install the neovim plugin as described in %1, "
+                "the plugin will find the %3 file automatically.\n\n"
+                "Otherwise you need to specify the path to the %2 "
+                "file from the Copilot neovim plugin.",
+                "Markdown text for the copilot instruction label")
+                       .arg("[README.md](https://github.com/github/copilot.vim)")
+                       .arg("[language-server.js](https://github.com/github/copilot.vim/tree/release/dist)")
+                       .arg(entryPointFileName)),
+        };
 
         return Column {
             Group {
@@ -213,7 +220,7 @@ CopilotSettings::CopilotSettings()
                 }
             },
             Form {
-                authWidget, br,
+                new AuthWidget, br,
                 enableCopilot, br,
                 nodeJsPath, br,
                 distPath, br,
diff --git a/src/plugins/coreplugin/Core.json.in b/src/plugins/coreplugin/Core.json.in
index 8f121d61a3f..aa99a3a586c 100644
--- a/src/plugins/coreplugin/Core.json.in
+++ b/src/plugins/coreplugin/Core.json.in
@@ -15,7 +15,7 @@
     ],
     "Category" : "Core",
     "Description" : "The core plugin for the Qt IDE.",
-    "Url" : "http://www.qt.io",
+    "Url" : "https://www.qt.io",
     "Arguments" : [
         {
             "Name" : "-color",
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
index 9176ad5660d..b9bbf23f85f 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
@@ -875,7 +875,7 @@ void ActionManagerPrivate::readUserSettings(Id id, Command *cmd)
     settings->beginGroup(kKeyboardSettingsKeyV2);
     if (settings->contains(id.toKey())) {
         const QVariant v = settings->value(id.toKey());
-        if (QMetaType::Type(v.type()) == QMetaType::QStringList) {
+        if (v.typeId() == QMetaType::QStringList) {
             cmd->setKeySequences(Utils::transform<QList>(v.toStringList(), [](const QString &s) {
                 return QKeySequence::fromString(s);
             }));
diff --git a/src/plugins/coreplugin/actionsfilter.cpp b/src/plugins/coreplugin/actionsfilter.cpp
index 93efa1dd2cc..8b5f23df71f 100644
--- a/src/plugins/coreplugin/actionsfilter.cpp
+++ b/src/plugins/coreplugin/actionsfilter.cpp
@@ -10,8 +10,6 @@
 #include "icore.h"
 #include "locator/locatormanager.h"
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/algorithm.h>
 #include <utils/async.h>
 #include <utils/fuzzymatcher.h>
@@ -192,7 +190,6 @@ LocatorMatcherTasks ActionsFilter::matchers()
             storage->reportOutput(m_entries);
             return SetupResult::StopWithSuccess;
         }
-        async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
         async.setConcurrentCallData(matches, *storage, m_entries);
         return SetupResult::Continue;
     };
diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h
index a259717ba89..049ce35dec5 100644
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -119,6 +119,7 @@ const char GOTOPREVINHISTORY[]     = "QtCreator.GotoPreviousInHistory";
 const char GO_BACK[]               = "QtCreator.GoBack";
 const char GO_FORWARD[]            = "QtCreator.GoForward";
 const char GOTOLASTEDIT[]          = "QtCreator.GotoLastEdit";
+const char REOPEN_CLOSED_EDITOR[]  = "QtCreator.ReopenClosedEditor";
 const char ABOUT_QTCREATOR[]       = "QtCreator.AboutQtCreator";
 const char ABOUT_PLUGINS[]         = "QtCreator.AboutPlugins";
 const char CHANGE_LOG[]            = "QtCreator.ChangeLog";
@@ -144,7 +145,8 @@ const char G_HELP[]                = "QtCreator.Group.Help";
 // File menu groups
 const char G_FILE_NEW[]            = "QtCreator.Group.File.New";
 const char G_FILE_OPEN[]           = "QtCreator.Group.File.Open";
-const char G_FILE_SESSION[]         = "QtCreator.Group.File.Recent";
+const char G_FILE_RECENT[]        = "QtCreator.Group.File.Recent";
+const char G_FILE_SESSION[]        = "QtCreator.Group.File.Session";
 const char G_FILE_PROJECT[]        = "QtCreator.Group.File.Project";
 const char G_FILE_SAVE[]           = "QtCreator.Group.File.Save";
 const char G_FILE_EXPORT[]         = "QtCreator.Group.File.Export";
diff --git a/src/plugins/coreplugin/corejsextensions.cpp b/src/plugins/coreplugin/corejsextensions.cpp
index 28f4790c2b6..05c3ea82e52 100644
--- a/src/plugins/coreplugin/corejsextensions.cpp
+++ b/src/plugins/coreplugin/corejsextensions.cpp
@@ -29,6 +29,11 @@ QString UtilsJsExtension::qtCreatorVersion() const
     return appInfo().displayVersion;
 }
 
+QString UtilsJsExtension::qtCreatorIdeVersion() const
+{
+    return QCoreApplication::applicationVersion();
+}
+
 QString UtilsJsExtension::toNativeSeparators(const QString &in) const
 {
     return QDir::toNativeSeparators(in);
diff --git a/src/plugins/coreplugin/corejsextensions.h b/src/plugins/coreplugin/corejsextensions.h
index 13dc81ccfd9..1ca8685fdb3 100644
--- a/src/plugins/coreplugin/corejsextensions.h
+++ b/src/plugins/coreplugin/corejsextensions.h
@@ -20,6 +20,7 @@ public:
     // General information
     Q_INVOKABLE QString qtVersion() const;
     Q_INVOKABLE QString qtCreatorVersion() const;
+    Q_INVOKABLE QString qtCreatorIdeVersion() const;
 
     // File name conversions:
     Q_INVOKABLE QString toNativeSeparators(const QString &in) const;
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp
index c5623134814..0777bd20422 100644
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -251,10 +251,17 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
     expander->registerVariable("HostOs:ExecutableSuffix",
                                Tr::tr("The platform executable suffix."),
                                [] { return QString(Utils::HostOsInfo::withExecutableSuffix("")); });
+    expander->registerFileVariables("IDE:Executable",
+                               Tr::tr("The path to the running %1 itself.").arg(QGuiApplication::applicationDisplayName()),
+                               []() { return FilePath::fromUserInput(QCoreApplication::applicationFilePath()); });
     expander->registerVariable("IDE:ResourcePath",
                                Tr::tr("The directory where %1 finds its pre-installed resources.")
                                    .arg(QGuiApplication::applicationDisplayName()),
                                [] { return ICore::resourcePath().toString(); });
+    expander->registerVariable("IDE:UserResourcePath",
+                               Tr::tr("The directory where %1 puts custom user data.")
+                                   .arg(QGuiApplication::applicationDisplayName()),
+                               [] { return ICore::userResourcePath().toString(); });
     expander->registerPrefix("CurrentDate:", Tr::tr("The current date (QDate formatstring)."),
                              [](const QString &fmt) { return QDate::currentDate().toString(fmt); });
     expander->registerPrefix("CurrentTime:", Tr::tr("The current time (QTime formatstring)."),
diff --git a/src/plugins/coreplugin/designmode.cpp b/src/plugins/coreplugin/designmode.cpp
index cb5a6129df5..f69e3d0e030 100644
--- a/src/plugins/coreplugin/designmode.cpp
+++ b/src/plugins/coreplugin/designmode.cpp
@@ -25,6 +25,18 @@
 
 using namespace Utils;
 
+/*!
+    \class Core::DesignMode
+    \inmodule QtCreator
+
+    \brief The DesignMode class implements the mode for the Design mode, which is
+    for example used by \QMLD and \QD.
+
+    Other plugins can register themselves with registerDesignWidget(),
+    giving a list of MIME types that the editor understands, as well as an instance
+    to the main editor widget itself.
+*/
+
 namespace Core {
 
 struct DesignEditorInfo
diff --git a/src/plugins/coreplugin/designmode.h b/src/plugins/coreplugin/designmode.h
index 1f90d08dc5a..7a656353e40 100644
--- a/src/plugins/coreplugin/designmode.h
+++ b/src/plugins/coreplugin/designmode.h
@@ -12,13 +12,6 @@ class FancyMainWindow;
 namespace Core {
 class IEditor;
 
-/**
-  * A global mode for Design pane - used by Bauhaus (QML Designer) and
-  * Qt Designer. Other plugins can register themselves by registerDesignWidget()
-  * and giving a list of mimetypes that the editor understands, as well as an instance
-  * to the main editor widget itself.
-  */
-
 class CORE_EXPORT DesignMode final : public IMode
 {
     Q_OBJECT
diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
index 76ff935975d..2141ef61c2e 100644
--- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
+++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
@@ -563,7 +563,7 @@ ExternalToolConfig::ExternalToolConfig()
 
     Form {
         Tr::tr("Description:"), m_description, br,
-        Tr::tr("Executable:"), m_executable, br,
+        Tr::tr("Executable:", "noun"), m_executable, br,
         Tr::tr("Arguments:"), m_arguments, br,
         Tr::tr("Working directory:"), m_workingDirectory, br,
         outputLabel, m_outputBehavior, br,
@@ -700,12 +700,12 @@ void ExternalToolConfig::updateItem(const QModelIndex &index)
     tool->setDescription(m_description->text());
     FilePaths executables = tool->executables();
     if (executables.size() > 0)
-        executables[0] = m_executable->rawFilePath();
+        executables[0] = m_executable->unexpandedFilePath();
     else
-        executables << m_executable->rawFilePath();
+        executables << m_executable->unexpandedFilePath();
     tool->setExecutables(executables);
     tool->setArguments(m_arguments->text());
-    tool->setWorkingDirectory(m_workingDirectory->rawFilePath());
+    tool->setWorkingDirectory(m_workingDirectory->unexpandedFilePath());
     tool->setBaseEnvironmentProviderId(Id::fromSetting(m_baseEnvironment->currentData()));
     tool->setEnvironmentUserChanges(m_environment);
     tool->setOutputHandling(ExternalTool::OutputHandling(m_outputBehavior->currentIndex()));
diff --git a/src/plugins/coreplugin/dialogs/filepropertiesdialog.cpp b/src/plugins/coreplugin/dialogs/filepropertiesdialog.cpp
index de3362a408f..2a480ff17b5 100644
--- a/src/plugins/coreplugin/dialogs/filepropertiesdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/filepropertiesdialog.cpp
@@ -79,7 +79,7 @@ FilePropertiesDialog::FilePropertiesDialog(const FilePath &filePath, QWidget *pa
             Tr::tr("Last modified:"), m_lastModified, br,
             Tr::tr("Readable:"), m_readable, br,
             Tr::tr("Writable:"), m_writable, br,
-            Tr::tr("Executable:"), m_executable, br,
+            Tr::tr("Executable:", "adjective"), m_executable, br,
             Tr::tr("Symbolic link:"), m_symLink, br
         },
         buttonBox
diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.cpp b/src/plugins/coreplugin/dialogs/ioptionspage.cpp
index 6c2970ca45d..d4bc7276e2d 100644
--- a/src/plugins/coreplugin/dialogs/ioptionspage.cpp
+++ b/src/plugins/coreplugin/dialogs/ioptionspage.cpp
@@ -29,6 +29,7 @@ class IOptionsPageWidgetPrivate
 {
 public:
     std::function<void()> m_onApply;
+    std::function<void()> m_onCancel;
     std::function<void()> m_onFinish;
 };
 
@@ -104,6 +105,11 @@ void IOptionsPageWidget::setOnApply(const std::function<void()> &func)
     d->m_onApply = func;
 }
 
+void IOptionsPageWidget::setOnCancel(const std::function<void()> &func)
+{
+    d->m_onCancel = func;
+}
+
 /*!
     Sets the function that is called by default on finish to \a func.
 */
@@ -122,6 +128,12 @@ void IOptionsPageWidget::apply()
         d->m_onApply();
 }
 
+void IOptionsPageWidget::cancel()
+{
+    if (d->m_onCancel)
+        d->m_onCancel();
+}
+
 /*!
     Calls the finish function, if set.
     \sa setOnFinish
@@ -260,6 +272,19 @@ void IOptionsPage::apply()
     }
 }
 
+void IOptionsPage::cancel()
+{
+    if (auto widget = qobject_cast<IOptionsPageWidget *>(d->m_widget))
+         widget->cancel();
+
+    if (d->m_settingsProvider) {
+         AspectContainer *container = d->m_settingsProvider();
+         QTC_ASSERT(container, return);
+         if (container->isDirty())
+            container->cancel();
+    }
+}
+
 /*!
     Called directly before the \uicontrol Options dialog closes. Here you should
     delete the widget that was created in widget() to free resources.
diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h
index bb0886dd67a..618cbc80322 100644
--- a/src/plugins/coreplugin/dialogs/ioptionspage.h
+++ b/src/plugins/coreplugin/dialogs/ioptionspage.h
@@ -27,11 +27,13 @@ public:
     IOptionsPageWidget();
     ~IOptionsPageWidget();
     void setOnApply(const std::function<void()> &func);
+    void setOnCancel(const std::function<void()> &func);
     void setOnFinish(const std::function<void()> &func);
 
 protected:
     friend class IOptionsPage;
     virtual void apply();
+    virtual void cancel();
     virtual void finish();
 
 private:
@@ -59,6 +61,7 @@ public:
 
     virtual QWidget *widget();
     virtual void apply();
+    virtual void cancel();
     virtual void finish();
 
     virtual bool matches(const QRegularExpression &regexp) const;
diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
index 6dfd9106eb5..74fe67d8175 100644
--- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
@@ -594,11 +594,13 @@ void SettingsDialog::createGui()
     QWidget *emptyWidget = new QWidget(this);
     m_stackedLayout->addWidget(emptyWidget); // no category selected, for example when filtering
 
-    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok |
-                                                       QDialogButtonBox::Apply |
-                                                       QDialogButtonBox::Cancel);
-    connect(buttonBox->button(QDialogButtonBox::Apply), &QAbstractButton::clicked,
-            this, &SettingsDialog::apply);
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(
+        QDialogButtonBox::Ok | QDialogButtonBox::Apply | QDialogButtonBox::Cancel);
+    connect(
+        buttonBox->button(QDialogButtonBox::Apply),
+        &QAbstractButton::clicked,
+        this,
+        &SettingsDialog::apply);
 
     connect(buttonBox, &QDialogButtonBox::accepted, this, &SettingsDialog::accept);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &SettingsDialog::reject);
@@ -744,8 +746,10 @@ void SettingsDialog::reject()
         return;
     m_finished = true;
     disconnectTabWidgets();
-    for (IOptionsPage *page : std::as_const(m_pages))
+    for (IOptionsPage *page : std::as_const(m_pages)) {
+        page->cancel();
         page->finish();
+    }
     done(QDialog::Rejected);
 }
 
@@ -786,7 +790,7 @@ bool SettingsDialog::execDialog()
             ICore::settings()->setValueWithDefault(kPreferenceDialogSize, size(), initialSize);
             // make sure that the current "single" instance is deleted
             // we can't delete right away, since we still access the m_applied member
-            deleteLater();
+            QMetaObject::invokeMethod(this, [this] { deleteLater(); }, Qt::QueuedConnection);
         });
     }
 
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
index 4f7c0fb0067..4c7de88fd9b 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
@@ -30,6 +30,7 @@
 #include <QLineEdit>
 #include <QPointer>
 #include <QPushButton>
+#include <QTimer>
 #include <QTreeWidgetItem>
 
 #include <array>
@@ -341,7 +342,7 @@ ShortcutInput::ShortcutInput()
     QPalette palette = m_warningLabel->palette();
     palette.setColor(QPalette::Active,
                      QPalette::WindowText,
-                     Utils::creatorTheme()->color(Utils::Theme::TextColorError));
+                     Utils::creatorColor(Utils::Theme::TextColorError));
     m_warningLabel->setPalette(palette);
     connect(m_warningLabel, &QLabel::linkActivated, this, &ShortcutInput::showConflictsRequested);
 
@@ -420,6 +421,7 @@ private:
     QGridLayout *m_shortcutLayout;
     std::vector<std::unique_ptr<ShortcutInput>> m_shortcutInputs;
     QPointer<QPushButton> m_addButton = nullptr;
+    QTimer m_updateTimer;
 };
 
 ShortcutSettingsWidget::ShortcutSettingsWidget()
@@ -428,7 +430,12 @@ ShortcutSettingsWidget::ShortcutSettingsWidget()
     setTargetHeader(Tr::tr("Shortcut"));
     setResetVisible(true);
 
+    m_updateTimer.setSingleShot(true);
+    m_updateTimer.setInterval(100);
+
     connect(ActionManager::instance(), &ActionManager::commandListChanged,
+            &m_updateTimer, qOverload<>(&QTimer::start));
+    connect(&m_updateTimer, &QTimer::timeout,
             this, &ShortcutSettingsWidget::initialize);
     connect(this, &ShortcutSettingsWidget::currentCommandChanged,
             this, &ShortcutSettingsWidget::handleCurrentCommandChanged);
@@ -718,15 +725,15 @@ bool ShortcutSettingsWidget::markCollisions(ShortcutItem *item, int index)
             }
             if (currentIsConflicting) {
                 currentItem->m_item->setForeground(2,
-                                                   Utils::creatorTheme()->color(
-                                                       Utils::Theme::TextColorError));
+                                                   Utils::creatorColor(
+                                                   Utils::Theme::TextColorError));
                 hasCollision = true;
             }
         }
     }
     item->m_item->setForeground(2,
                                 hasCollision
-                                    ? Utils::creatorTheme()->color(Utils::Theme::TextColorError)
+                                    ? Utils::creatorColor(Utils::Theme::TextColorError)
                                     : commandList()->palette().windowText());
     return hasCollision;
 }
diff --git a/src/plugins/coreplugin/editormanager/editorarea.cpp b/src/plugins/coreplugin/editormanager/editorarea.cpp
index 2b47988c3b3..cb311320cde 100644
--- a/src/plugins/coreplugin/editormanager/editorarea.cpp
+++ b/src/plugins/coreplugin/editormanager/editorarea.cpp
@@ -48,6 +48,11 @@ IDocument *EditorArea::currentDocument() const
     return m_currentDocument;
 }
 
+EditorView *EditorArea::currentView() const
+{
+    return m_currentView;
+}
+
 void EditorArea::focusChanged(QWidget *old, QWidget *now)
 {
     Q_UNUSED(old)
@@ -104,5 +109,10 @@ void EditorArea::updateCloseSplitButton()
         v->setCloseSplitEnabled(false);
 }
 
+void EditorArea::hideEvent(QHideEvent *)
+{
+    emit hidden();
+}
+
 } // Internal
 } // Core
diff --git a/src/plugins/coreplugin/editormanager/editorarea.h b/src/plugins/coreplugin/editormanager/editorarea.h
index 30cf25ba775..f4cc6e62c2f 100644
--- a/src/plugins/coreplugin/editormanager/editorarea.h
+++ b/src/plugins/coreplugin/editormanager/editorarea.h
@@ -22,15 +22,18 @@ public:
     ~EditorArea() override;
 
     IDocument *currentDocument() const;
+    EditorView *currentView() const;
 
 signals:
     void windowTitleNeedsUpdate();
+    void hidden();
 
 private:
     void focusChanged(QWidget *old, QWidget *now);
     void setCurrentView(EditorView *view);
     void updateCurrentEditor(IEditor *editor);
     void updateCloseSplitButton();
+    void hideEvent(QHideEvent *) override;
 
     IContext *m_context;
     QPointer<EditorView> m_currentView;
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index ac6bd5c8f63..c8ef2a4f1ab 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -596,6 +596,14 @@ void EditorManagerPrivate::init()
     goForward.addToContainer(Constants::M_WINDOW, Constants::G_WINDOW_NAVIGATE);
     goForward.addOnTriggered(this, &EditorManager::goForwardInNavigationHistory);
 
+    // Reopen last closed document
+    ActionBuilder reopenLastClosedDocument(this, Constants::REOPEN_CLOSED_EDITOR);
+    reopenLastClosedDocument.setText(::Core::Tr::tr("Reopen Last Closed Document"));
+    reopenLastClosedDocument.bindContextAction(&m_reopenLastClosedDocumenAction);
+    reopenLastClosedDocument.setContext(editDesignContext);
+    reopenLastClosedDocument.addToContainer(Constants::M_WINDOW, Constants::G_WINDOW_NAVIGATE);
+    reopenLastClosedDocument.addOnTriggered(this, &EditorManagerPrivate::reopenLastClosedDocument);
+
     // Go to last edit
     ActionBuilder gotoLastEdit(this, Constants::GOTOLASTEDIT);
     gotoLastEdit.setText(::Core::Tr::tr("Go to Last Edit"));
@@ -687,9 +695,8 @@ void EditorManagerPrivate::init()
     mainEditorArea->hide();
     connect(mainEditorArea, &EditorArea::windowTitleNeedsUpdate,
             this, &EditorManagerPrivate::updateWindowTitle);
-    connect(mainEditorArea, &QObject::destroyed, this, &EditorManagerPrivate::editorAreaDestroyed);
-    m_editorAreas.append(mainEditorArea);
-    m_currentView = mainEditorArea->view();
+    addEditorArea(mainEditorArea);
+    setCurrentView(mainEditorArea->view());
 
     updateActions();
 
@@ -723,6 +730,14 @@ void EditorManagerPrivate::init()
             IEditor *editor = EditorManager::currentEditor();
             return editor ? editor->widget()->mapToGlobal(QPoint(0, 0)).y() : 0;
                                                });
+
+    connect(
+        DocumentManager::instance(),
+        &DocumentManager::allDocumentsRenamed,
+        d,
+        [](const FilePath &from, const FilePath &to) {
+            EditorManagerPrivate::handleFileRenamed(from, to);
+        });
 }
 
 void EditorManagerPrivate::extensionsInitialized()
@@ -999,7 +1014,7 @@ IEditor *EditorManagerPrivate::openEditorWith(const FilePath &filePath, Id edito
 IEditor *EditorManagerPrivate::activateEditorForDocument(EditorView *view, IDocument *document,
                                                          EditorManager::OpenEditorFlags flags)
 {
-    Q_ASSERT(view);
+    QTC_ASSERT(view, return nullptr);
     IEditor *editor = view->editorForDocument(document);
     if (!editor) {
         const QList<IEditor*> editors = DocumentModel::editorsForDocument(document);
@@ -1073,8 +1088,9 @@ void EditorManagerPrivate::doEscapeKeyFocusMoveMagic()
         return;
     QWidget *focus = QApplication::focusWidget();
     EditorView *editorView = currentEditorView();
-    bool editorViewActive = (focus && focus == editorView->focusWidget());
-    bool editorViewVisible = editorView->isVisible();
+    QTC_CHECK(editorView);
+    bool editorViewActive = (editorView && focus && focus == editorView->focusWidget());
+    bool editorViewVisible = editorView && editorView->isVisible();
 
     bool stuffHidden = false;
     FindToolBarPlaceHolder *findPane = FindToolBarPlaceHolder::getCurrent();
@@ -1414,7 +1430,7 @@ IEditor *EditorManagerPrivate::duplicateEditor(IEditor *editor)
 IEditor *EditorManagerPrivate::activateEditor(EditorView *view, IEditor *editor,
                                               EditorManager::OpenEditorFlags flags)
 {
-    Q_ASSERT(view);
+    QTC_ASSERT(view, return nullptr);
 
     if (!editor)
         return nullptr;
@@ -1454,7 +1470,6 @@ bool EditorManagerPrivate::activateEditorForEntry(EditorView *view, DocumentMode
     if (!entry) { // no document
         view->setCurrentEditor(nullptr);
         setCurrentView(view);
-        setCurrentEditor(nullptr);
         return false;
     }
     IDocument *document = entry->document;
@@ -1630,11 +1645,6 @@ bool EditorManagerPrivate::closeEditors(const QList<IEditor*> &editors, CloseFla
                                     flags = EditorManager::DoNotSwitchToDesignMode;
                                 activateEditorForDocument(view, document, flags);
                             }
-                        } else {
-                            // no documents left - set current view since view->removeEditor can
-                            // trigger a focus change, context change, and updateActions, which
-                            // requests the current EditorView
-                            setCurrentView(currentView);
                         }
                     }
                 }
@@ -1645,12 +1655,10 @@ bool EditorManagerPrivate::closeEditors(const QList<IEditor*> &editors, CloseFla
 
     emit m_instance->editorsClosed(Utils::toList(acceptedEditors));
 
-    if (focusView) {
+    if (focusView)
         activateView(focusView);
-    } else {
+    else
         setCurrentView(currentView);
-        setCurrentEditor(currentView->currentEditor());
-    }
 
     qDeleteAll(acceptedEditors);
 
@@ -1665,14 +1673,8 @@ bool EditorManagerPrivate::closeEditors(const QList<IEditor*> &editors, CloseFla
 void EditorManagerPrivate::activateView(EditorView *view)
 {
     QTC_ASSERT(view, return);
-    QWidget *focusWidget;
-    if (IEditor *editor = view->currentEditor()) {
-        setCurrentEditor(editor, true);
-        focusWidget = editor->widget();
-    } else {
-        setCurrentView(view);
-        focusWidget = view;
-    }
+    setCurrentView(view);
+    QWidget *focusWidget = view->currentEditor() ? view->currentEditor()->widget() : view;
     focusWidget->setFocus();
     ICore::raiseWindow(focusWidget);
 }
@@ -1699,46 +1701,69 @@ int EditorManagerPrivate::visibleDocumentsCount()
     return visibleDocuments.count();
 }
 
+static void setView(QList<QPointer<EditorView>> &list, EditorView *view)
+{
+    // remove view from the list, as well as any deleted views
+    Utils::erase(list, [view](QPointer<EditorView> v) { return !v || v == view; });
+    list.prepend(view);
+}
+
 void EditorManagerPrivate::setCurrentEditor(IEditor *editor, bool ignoreNavigationHistory)
 {
-    if (editor)
-        setCurrentView(nullptr);
+    IEditor *previousEditor = d->m_currentEditor;
+    EditorView *previousView = d->m_currentView.isEmpty() ? nullptr : d->m_currentView.constFirst();
+    EditorView *view = editor ? viewForEditor(editor) : previousView;
 
-    if (d->m_currentEditor == editor)
-        return;
+    if (editor != previousEditor) {
+        emit m_instance->currentEditorAboutToChange(d->m_currentEditor);
 
-    emit m_instance->currentEditorAboutToChange(d->m_currentEditor);
+        if (d->m_currentEditor && !ignoreNavigationHistory)
+            EditorManager::addCurrentPositionToNavigationHistory();
 
-    if (d->m_currentEditor && !ignoreNavigationHistory)
-        EditorManager::addCurrentPositionToNavigationHistory();
-
-    d->m_currentEditor = editor;
-    if (editor) {
-        if (EditorView *view = viewForEditor(editor))
-            view->setCurrentEditor(editor);
+        d->m_currentEditor = editor;
         // update global history
-        EditorView::updateEditorHistory(editor, d->m_globalHistory);
+        if (editor)
+            EditorView::updateEditorHistory(editor, d->m_globalHistory);
     }
+
+    if (QTC_GUARD(view)) { // we should always have a view
+        setView(d->m_currentView, view);
+        view->setCurrentEditor(editor);
+    }
+
     updateActions();
-    emit m_instance->currentEditorChanged(editor);
+
+    if (QTC_GUARD(!d->m_currentView.isEmpty()) && d->m_currentView.constFirst() != previousView)
+        emit d->currentViewChanged();
+    if (d->m_currentEditor != previousEditor)
+        emit m_instance->currentEditorChanged(d->m_currentEditor);
 }
 
 void EditorManagerPrivate::setCurrentView(EditorView *view)
 {
-    if (view == d->m_currentView)
-        return;
+    QTC_ASSERT(view, return); // we should always have a view
+    // currentView can empty if and only if we are currently initializing and setting
+    // the main editor area's view as the current one
+    if (d->m_currentView.isEmpty() || view != d->m_currentView.constFirst()) {
+        EditorView *previousView = d->m_currentView.isEmpty() ? nullptr
+                                                              : d->m_currentView.constFirst();
+        setView(d->m_currentView, view);
 
-    EditorView *old = d->m_currentView;
-    d->m_currentView = view;
+        if (previousView)
+            previousView->update();
+        if (d->m_currentView.constFirst())
+            view->update();
 
-    if (old)
-        old->update();
-    if (view)
-        view->update();
+        emit d->currentViewChanged();
+    }
+
+    setCurrentEditor(view->currentEditor());
 }
 
 EditorArea *EditorManagerPrivate::findEditorArea(const EditorView *view, int *areaIndex)
 {
+    if (!view)
+        return nullptr;
     SplitterOrView *current = view->parentSplitterOrView();
     while (current) {
         if (auto area = qobject_cast<EditorArea *>(current)) {
@@ -1825,14 +1850,45 @@ void EditorManagerPrivate::deleteEditors(const QList<IEditor *> &editors)
 EditorWindow *EditorManagerPrivate::createEditorWindow()
 {
     auto win = new EditorWindow;
-    EditorArea *area = win->editorArea();
+    addEditorArea(win->editorArea());
+    return win;
+}
+
+void EditorManagerPrivate::addEditorArea(EditorArea *area)
+{
     d->m_editorAreas.append(area);
     connect(area, &QObject::destroyed, d, &EditorManagerPrivate::editorAreaDestroyed);
-    return win;
+    connect(
+        area,
+        &EditorArea::hidden,
+        d,
+        [area = QPointer<EditorArea>(area)] {
+            // The connection is queued, because the hiding might be very short term, e.g.
+            // when switching between Edit and Debug modes. Check if it is still hidden.
+            const auto isReallyVisibile = [](QWidget *w) {
+                return w && w->isVisible() && !w->window()->isMinimized();
+            };
+            if (isReallyVisibile(area))
+                return;
+            // In case the hidden editor area has the current view, look for a view
+            // that is not hidden, iterating through the history of current views.
+            // This could be the first==current view (which results in a no-op).
+            for (const QPointer<EditorView> &view : d->m_currentView) {
+                if (isReallyVisibile(view)) {
+                    setCurrentView(view);
+                    return;
+                }
+            }
+            // If we didn't find a better view, so be it
+        },
+        Qt::QueuedConnection);
+    connect(area, &SplitterOrView::splitStateChanged, d, &EditorManagerPrivate::viewCountChanged);
+    emit d->viewCountChanged();
 }
 
 void EditorManagerPrivate::splitNewWindow(EditorView *view)
 {
+    QTC_ASSERT(view, return);
     IEditor *editor = view->currentEditor();
     IEditor *newEditor = nullptr;
     const QByteArray state = editor ? editor->saveState() : QByteArray();
@@ -1887,6 +1943,52 @@ void EditorManagerPrivate::updateAutoSave()
         d->m_autoSaveTimer->stop();
 }
 
+void EditorManagerPrivate::handleFileRenamed(
+    const Utils::FilePath &originalFilePath, const Utils::FilePath &newFilePath, Id originalType)
+{
+    if (!originalType.isValid()) {
+        // check if the file is open in an editor, if not, nothing to do
+        const QList<IEditor *> editorsOpenForFile = DocumentModel::editorsForFilePath(newFilePath);
+        if (editorsOpenForFile.isEmpty())
+            return;
+        originalType = editorsOpenForFile.first()->document()->id();
+    }
+
+    // If the MIME type changed, it might make more sense to re-open the file
+    // in a different editor type. (Things like undo history are not transferred then though.)
+    // If the original editor was not the default editor, try to stay with that, though.
+    // E.g. if a .md file is open in the base text editor, and then renamed to .cpp,
+    // just stay with the base text editor, because that was not the default editor and is
+    // still a valid editor for the new MIME type.
+    const MimeType originalMt = Utils::mimeTypeForFile(originalFilePath);
+    const MimeType newMt = Utils::mimeTypeForFile(newFilePath);
+    if (newMt != originalMt) {
+        const EditorFactories originalFactories = Utils::filtered(
+            IEditorFactory::preferredEditorTypes(originalFilePath),
+            &IEditorFactory::isInternalEditor);
+        const bool originalIsDefault = originalFactories.isEmpty()
+                                           ? true
+                                           : originalFactories.first()->id() == originalType;
+
+        const EditorFactories newFactories = Utils::filtered(
+            IEditorFactory::preferredEditorTypes(newFilePath), &IEditorFactory::isInternalEditor);
+        const Id newDefault = newFactories.isEmpty() ? Id() : newFactories.first()->id();
+        const bool defaultIsDifferent = newDefault != originalType;
+        const auto newContainsOriginal = [originalType, newFactories] {
+            return Utils::contains(newFactories, [originalType](IEditorFactory *f) {
+                return f->id() == originalType;
+            });
+        };
+
+        if ((originalIsDefault && defaultIsDifferent)
+            || (!originalIsDefault && !newContainsOriginal())) {
+            QMetaObject::invokeMethod(m_instance, [newFilePath] {
+                EditorManagerPrivate::openEditorWith(newFilePath, {});
+            });
+        }
+    }
+}
+
 void EditorManagerPrivate::updateMakeWritableWarning()
 {
     IDocument *document = EditorManager::currentDocument();
@@ -1981,6 +2083,7 @@ void EditorManagerPrivate::updateActions()
     EditorView *view  = currentEditorView();
     d->m_goBackAction->setEnabled(view ? view->canGoBack() : false);
     d->m_goForwardAction->setEnabled(view ? view->canGoForward() : false);
+    d->m_reopenLastClosedDocumenAction->setEnabled(view ? view->canReopen() : false);
 
     SplitterOrView *viewParent = (view ? view->parentSplitterOrView() : nullptr);
     SplitterOrView *parentSplitter = (viewParent ? viewParent->findParentSplitter() : nullptr);
@@ -2061,6 +2164,7 @@ void EditorManagerPrivate::gotoNextDocHistory()
         dialog->selectNextEditor();
     } else {
         EditorView *view = currentEditorView();
+        QTC_ASSERT(view, return);
         dialog->setEditors(d->m_globalHistory, view);
         dialog->selectNextEditor();
         showPopupOrSelectDocument();
@@ -2074,6 +2178,7 @@ void EditorManagerPrivate::gotoPreviousDocHistory()
         dialog->selectPreviousEditor();
     } else {
         EditorView *view = currentEditorView();
+        QTC_ASSERT(view, return);
         dialog->setEditors(d->m_globalHistory, view);
         dialog->selectPreviousEditor();
         showPopupOrSelectDocument();
@@ -2082,14 +2187,15 @@ void EditorManagerPrivate::gotoPreviousDocHistory()
 
 void EditorManagerPrivate::gotoLastEditLocation()
 {
-    currentEditorView()->goToEditLocation(d->m_globalLastEditLocation);
+    EditorView *view = currentEditorView();
+    QTC_ASSERT(view, return);
+    view->goToEditLocation(d->m_globalLastEditLocation);
 }
 
 void EditorManagerPrivate::gotoNextSplit()
 {
     EditorView *view = currentEditorView();
-    if (!view)
-        return;
+    QTC_ASSERT(view, return);
     EditorView *nextView = view->findNextView();
     if (!nextView) {
         // we are in the "last" view in this editor area
@@ -2111,8 +2217,7 @@ void EditorManagerPrivate::gotoNextSplit()
 void EditorManagerPrivate::gotoPreviousSplit()
 {
     EditorView *view = currentEditorView();
-    if (!view)
-        return;
+    QTC_ASSERT(view, return);
     EditorView *prevView = view->findPreviousView();
     if (!prevView) {
         // we are in the "first" view in this editor area
@@ -2131,6 +2236,22 @@ void EditorManagerPrivate::gotoPreviousSplit()
         activateView(prevView);
 }
 
+void EditorManagerPrivate::addClosedDocumentToCloseHistory(IEditor *editor)
+{
+    EditorView *view = EditorManagerPrivate::viewForEditor(editor);
+    QTC_ASSERT(view, return);
+    view->addClosedEditorToCloseHistory(editor);
+    EditorManagerPrivate::updateActions();
+}
+
+void EditorManagerPrivate::reopenLastClosedDocument()
+{
+    EditorView *view = EditorManagerPrivate::currentEditorView();
+    QTC_ASSERT(view, return);
+    view->reopenLastClosedDocument();
+    EditorManagerPrivate::updateActions();
+}
+
 void EditorManagerPrivate::makeCurrentEditorWritable()
 {
     if (IDocument* doc = EditorManager::currentDocument())
@@ -2191,31 +2312,33 @@ void EditorManagerPrivate::editorAreaDestroyed(QObject *area)
         }
     }
     // check if the destroyed editor area had the current view or current editor
-    if (d->m_currentEditor || (d->m_currentView && d->m_currentView->parentSplitterOrView() != area))
-        return;
-    // we need to set a new current editor or view
-    if (!newActiveArea) {
-        // some window managers behave weird and don't activate another window
-        // or there might be a Qt Creator toplevel activated that doesn't have editor windows
-        newActiveArea = d->m_editorAreas.first();
-    }
+    if (!currentEditorView()) {
+        // we need to set a new current editor or view
+        if (!newActiveArea) {
+            // some window managers behave weird and don't activate another window
+            // or there might be a Qt Creator toplevel activated that doesn't have editor windows
+            newActiveArea = d->m_editorAreas.first();
+        }
 
-    // check if the focusWidget points to some view
-    SplitterOrView *focusSplitterOrView = nullptr;
-    QWidget *candidate = newActiveArea->focusWidget();
-    while (candidate && candidate != newActiveArea) {
-        if ((focusSplitterOrView = qobject_cast<SplitterOrView *>(candidate)))
-            break;
-        candidate = candidate->parentWidget();
+        // check if the focusWidget points to some view
+        SplitterOrView *focusSplitterOrView = nullptr;
+        QWidget *candidate = newActiveArea->focusWidget();
+        while (candidate && candidate != newActiveArea) {
+            if ((focusSplitterOrView = qobject_cast<SplitterOrView *>(candidate)))
+                break;
+            candidate = candidate->parentWidget();
+        }
+        // focusWidget might have been 0
+        if (!focusSplitterOrView)
+            focusSplitterOrView = newActiveArea->findFirstView()->parentSplitterOrView();
+        QTC_ASSERT(focusSplitterOrView, focusSplitterOrView = newActiveArea);
+        EditorView *focusView
+            = focusSplitterOrView->findFirstView(); // can be just focusSplitterOrView
+        QTC_ASSERT(focusView, focusView = newActiveArea->findFirstView());
+        if (QTC_GUARD(focusView))
+            EditorManagerPrivate::activateView(focusView);
     }
-    // focusWidget might have been 0
-    if (!focusSplitterOrView)
-        focusSplitterOrView = newActiveArea->findFirstView()->parentSplitterOrView();
-    QTC_ASSERT(focusSplitterOrView, focusSplitterOrView = newActiveArea);
-    EditorView *focusView = focusSplitterOrView->findFirstView(); // can be just focusSplitterOrView
-    QTC_ASSERT(focusView, focusView = newActiveArea->findFirstView());
-    QTC_ASSERT(focusView, return);
-    EditorManagerPrivate::activateView(focusView);
+    emit viewCountChanged();
 }
 
 void EditorManagerPrivate::autoSave()
@@ -2380,8 +2503,9 @@ bool EditorManagerPrivate::saveDocumentAs(IDocument *document)
     if (!document)
         return false;
 
-    const FilePath absoluteFilePath = DocumentManager::getSaveAsFileName(document);
+    const FilePath originalFilePath = document->filePath();
 
+    const FilePath absoluteFilePath = DocumentManager::getSaveAsFileName(document);
     if (absoluteFilePath.isEmpty())
         return false;
 
@@ -2397,12 +2521,6 @@ bool EditorManagerPrivate::saveDocumentAs(IDocument *document)
     const bool success = DocumentManager::saveDocument(document, absoluteFilePath);
     document->checkPermissions();
 
-    // TODO: There is an issue to be treated here. The new file might be of a different mime
-    // type than the original and thus require a different editor. An alternative strategy
-    // would be to close the current editor and open a new appropriate one, but this is not
-    // a good way out either (also the undo stack would be lost). Perhaps the best is to
-    // re-think part of the editors design.
-
     if (success) {
         // if document had been temporary before (scratch buffer) - remove the temporary flag
         document->setTemporary(false);
@@ -2412,6 +2530,8 @@ bool EditorManagerPrivate::saveDocumentAs(IDocument *document)
     }
 
     updateActions();
+
+    handleFileRenamed(originalFilePath, document->filePath(), document->id());
     return success;
 }
 
@@ -2557,24 +2677,8 @@ void EditorManagerPrivate::setCurrentEditorFromContextChange()
 
 EditorView *EditorManagerPrivate::currentEditorView()
 {
-    EditorView *view = d->m_currentView;
-    if (!view) {
-        if (d->m_currentEditor) {
-            view = EditorManagerPrivate::viewForEditor(d->m_currentEditor);
-            QTC_ASSERT(view, view = d->m_editorAreas.first()->findFirstView());
-        }
-        QTC_CHECK(view);
-        if (!view) { // should not happen, we should always have either currentview or currentdocument
-            for (const EditorArea *area : std::as_const(d->m_editorAreas)) {
-                if (area->window()->isActiveWindow()) {
-                    view = area->findFirstView();
-                    break;
-                }
-            }
-            QTC_ASSERT(view, view = d->m_editorAreas.first()->findFirstView());
-        }
-    }
-    return view;
+    QTC_ASSERT(d->m_currentView.size() > 0, return nullptr);
+    return d->m_currentView.constFirst();
 }
 
 QList<EditorView *> EditorManagerPrivate::allEditorViews()
@@ -2595,6 +2699,14 @@ QList<EditorView *> EditorManagerPrivate::allEditorViews()
     return views;
 }
 
+bool EditorManagerPrivate::hasMoreThanOneview()
+{
+    if (d->m_editorAreas.size() > 1)
+        return true;
+    QTC_ASSERT(d->m_editorAreas.size() > 0, return false);
+    return d->m_editorAreas.constFirst()->isSplitter();
+}
+
 /*!
     Returns the pointer to the instance. Only use for connecting to signals.
 */
@@ -2944,6 +3056,9 @@ bool EditorManager::closeDocuments(const QList<DocumentModel::Entry *> &entries)
 */
 bool EditorManager::closeEditors(const QList<IEditor*> &editorsToClose, bool askAboutModifiedEditors)
 {
+    for (IEditor *editor : editorsToClose)
+        EditorManagerPrivate::addClosedDocumentToCloseHistory(editor);
+
     return EditorManagerPrivate::closeEditors(editorsToClose,
                                               askAboutModifiedEditors ? EditorManagerPrivate::CloseFlag::CloseWithAsking
                                                                       : EditorManagerPrivate::CloseFlag::CloseWithoutAsking);
@@ -3345,7 +3460,9 @@ bool EditorManager::closeDocuments(const QList<IDocument *> &documents, bool ask
 */
 void EditorManager::addCurrentPositionToNavigationHistory(const QByteArray &saveState)
 {
-    EditorManagerPrivate::currentEditorView()->addCurrentPositionToNavigationHistory(saveState);
+    EditorView *view = EditorManagerPrivate::currentEditorView();
+    QTC_ASSERT(view, return);
+    view->addCurrentPositionToNavigationHistory(saveState);
     EditorManagerPrivate::updateActions();
 }
 
@@ -3355,18 +3472,7 @@ void EditorManager::addCurrentPositionToNavigationHistory(const QByteArray &save
 */
 void EditorManager::setLastEditLocation(const IEditor* editor)
 {
-    IDocument *document = editor->document();
-    if (!document)
-        return;
-
-    const QByteArray &state = editor->saveState();
-    EditLocation location;
-    location.document = document;
-    location.filePath = document->filePath();
-    location.id = document->id();
-    location.state = state;
-
-    d->m_globalLastEditLocation = location;
+    d->m_globalLastEditLocation = EditLocation::forEditor(editor);
 }
 
 /*!
@@ -3378,7 +3484,9 @@ void EditorManager::setLastEditLocation(const IEditor* editor)
 */
 void EditorManager::cutForwardNavigationHistory()
 {
-    EditorManagerPrivate::currentEditorView()->cutForwardNavigationHistory();
+    EditorView *view = EditorManagerPrivate::currentEditorView();
+    QTC_ASSERT(view, return);
+    view->cutForwardNavigationHistory();
     EditorManagerPrivate::updateActions();
 }
 
@@ -3390,9 +3498,10 @@ void EditorManager::cutForwardNavigationHistory()
 */
 void EditorManager::goBackInNavigationHistory()
 {
-    EditorManagerPrivate::currentEditorView()->goBackInNavigationHistory();
+    EditorView *view = EditorManagerPrivate::currentEditorView();
+    QTC_ASSERT(view, return);
+    view->goBackInNavigationHistory();
     EditorManagerPrivate::updateActions();
-    return;
 }
 
 /*!
@@ -3403,7 +3512,9 @@ void EditorManager::goBackInNavigationHistory()
 */
 void EditorManager::goForwardInNavigationHistory()
 {
-    EditorManagerPrivate::currentEditorView()->goForwardInNavigationHistory();
+    EditorView *view = EditorManagerPrivate::currentEditorView();
+    QTC_ASSERT(view, return);
+    view->goForwardInNavigationHistory();
     EditorManagerPrivate::updateActions();
 }
 
@@ -3573,9 +3684,9 @@ void EditorManager::showEditorStatusBar(const QString &id,
                                         QObject *object,
                                         const std::function<void()> &function)
 {
-
-    EditorManagerPrivate::currentEditorView()->showEditorStatusBar(
-                id, infoText, buttonText, object, function);
+    EditorView *view = EditorManagerPrivate::currentEditorView();
+    QTC_ASSERT(view, return);
+    view->showEditorStatusBar(id, infoText, buttonText, object, function);
 }
 
 /*!
@@ -3584,6 +3695,8 @@ void EditorManager::showEditorStatusBar(const QString &id,
 void EditorManager::hideEditorStatusBar(const QString &id)
 {
     // TODO: what if the current editor view betwenn show and hideEditorStatusBar changed?
+    EditorView *view = EditorManagerPrivate::currentEditorView();
+    QTC_ASSERT(view, return);
     EditorManagerPrivate::currentEditorView()->hideEditorStatusBar(id);
 }
 
@@ -3637,8 +3750,7 @@ void EditorManager::splitSideBySide()
 void EditorManager::gotoOtherSplit()
 {
     EditorView *view = EditorManagerPrivate::currentEditorView();
-    if (!view)
-        return;
+    QTC_ASSERT(view, return);
     EditorView *nextView = view->findNextView();
     if (!nextView) {
         // we are in the "last" view in this editor area
diff --git a/src/plugins/coreplugin/editormanager/editormanager_p.h b/src/plugins/coreplugin/editormanager/editormanager_p.h
index dba39035838..34a67457219 100644
--- a/src/plugins/coreplugin/editormanager/editormanager_p.h
+++ b/src/plugins/coreplugin/editormanager/editormanager_p.h
@@ -61,6 +61,7 @@ public:
     static EditorArea *mainEditorArea();
     static EditorView *currentEditorView();
     static QList<EditorView *> allEditorViews();
+    static bool hasMoreThanOneview();
     static void setCurrentEditor(IEditor *editor, bool ignoreNavigationHistory = false);
     static IEditor *openEditor(EditorView *view,
                                const Utils::FilePath &filePath,
@@ -100,6 +101,7 @@ public:
                                            Qt::CaseSensitivity sensitivity);
 
     static EditorWindow *createEditorWindow();
+    static void addEditorArea(EditorArea *area);
     static void splitNewWindow(Internal::EditorView *view);
     static void closeView(Internal::EditorView *view);
     static const QList<IEditor *> emptyView(Internal::EditorView *view);
@@ -117,6 +119,13 @@ public:
 
     static void updateAutoSave();
 
+    static void handleFileRenamed(
+        const Utils::FilePath &originalFilePath,
+        const Utils::FilePath &newFilePath,
+        Utils::Id originalType = {});
+
+    static void addClosedDocumentToCloseHistory(IEditor *editor);
+
 public slots:
     static bool saveDocument(Core::IDocument *document);
     static bool saveDocumentAs(Core::IDocument *document);
@@ -126,11 +135,15 @@ public slots:
     static void gotoPreviousSplit();
     static void gotoNextSplit();
 
+    static void reopenLastClosedDocument();
+
     void handleDocumentStateChange(Core::IDocument *document);
     void editorAreaDestroyed(QObject *area);
 
 signals:
     void placeholderTextChanged(const QString &text);
+    void currentViewChanged();
+    void viewCountChanged();
 
 private:
     static void gotoNextDocHistory();
@@ -192,7 +205,7 @@ private:
     QList<EditorArea *> m_editorAreas;
     QPointer<IEditor> m_currentEditor;
     QPointer<IEditor> m_scheduledCurrentEditor;
-    QPointer<EditorView> m_currentView;
+    QList<QPointer<EditorView>> m_currentView;
     QTimer *m_autoSaveTimer = nullptr;
 
     // actions
@@ -207,6 +220,7 @@ private:
     QAction *m_gotoPreviousDocHistoryAction = nullptr;
     QAction *m_goBackAction = nullptr;
     QAction *m_goForwardAction = nullptr;
+    QAction *m_reopenLastClosedDocumenAction = nullptr;
     QAction *m_gotoLastEditAction = nullptr;
     QAction *m_splitAction = nullptr;
     QAction *m_splitSideBySideAction = nullptr;
diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp
index 6aa20510cb4..21146d47b45 100644
--- a/src/plugins/coreplugin/editormanager/editorview.cpp
+++ b/src/plugins/coreplugin/editormanager/editorview.cpp
@@ -14,10 +14,11 @@
 
 #include <utils/algorithm.h>
 #include <utils/infobar.h>
-#include <utils/qtcassert.h>
-#include <utils/theme/theme.h>
 #include <utils/layoutbuilder.h>
 #include <utils/link.h>
+#include <utils/overlaywidget.h>
+#include <utils/qtcassert.h>
+#include <utils/theme/theme.h>
 #include <utils/utilsicons.h>
 
 #include <QFileInfo>
@@ -38,14 +39,16 @@ namespace Core::Internal {
 
 // EditorView
 
-EditorView::EditorView(SplitterOrView *parentSplitterOrView, QWidget *parent) :
-    QWidget(parent),
-    m_parentSplitterOrView(parentSplitterOrView),
-    m_toolBar(new EditorToolBar(this)),
-    m_container(new QStackedWidget(this)),
-    m_infoBarDisplay(new InfoBarDisplay(this)),
-    m_statusHLine(Layouting::createHr(this)),
-    m_statusWidget(new QFrame(this))
+EditorView::EditorView(SplitterOrView *parentSplitterOrView, QWidget *parent)
+    : QWidget(parent)
+    , m_parentSplitterOrView(parentSplitterOrView)
+    , m_toolBar(new EditorToolBar(this))
+    , m_container(new QStackedWidget(this))
+    , m_infoBarDisplay(new InfoBarDisplay(this))
+    , m_statusHLine(Layouting::createHr(this))
+    , m_statusWidget(new QFrame(this))
+    , m_backMenu(new QMenu(this))
+    , m_forwardMenu(new QMenu(this))
 {
     auto tl = new QVBoxLayout(this);
     tl->setSpacing(0);
@@ -66,6 +69,8 @@ EditorView::EditorView(SplitterOrView *parentSplitterOrView, QWidget *parent) :
         connect(m_toolBar, &EditorToolBar::splitNewWindowClicked, this, &EditorView::splitNewWindow);
         connect(m_toolBar, &EditorToolBar::closeSplitClicked, this, &EditorView::closeSplit);
         m_toolBar->setMenuProvider([this](QMenu *menu) { fillListContextMenu(menu); });
+        m_toolBar->setGoBackMenu(m_backMenu);
+        m_toolBar->setGoForwardMenu(m_forwardMenu);
         tl->addWidget(m_toolBar);
     }
 
@@ -125,6 +130,33 @@ EditorView::EditorView(SplitterOrView *parentSplitterOrView, QWidget *parent) :
             this, &EditorView::openDroppedFiles);
 
     updateNavigatorActions();
+
+    auto currentViewOverlay = new OverlayWidget;
+    currentViewOverlay->attachToWidget(this);
+    currentViewOverlay->setAttribute(Qt::WA_OpaquePaintEvent);
+    currentViewOverlay->setResizeFunction([this](QWidget *w, const QSize &) {
+        const QRect toolbarRect = m_toolBar->geometry();
+        w->setGeometry(toolbarRect.x(), toolbarRect.bottom() - 1, toolbarRect.width(), 2);
+    });
+    currentViewOverlay->setPaintFunction([](QWidget *w, QPainter &p, QPaintEvent *) {
+        p.fillRect(w->rect(), w->palette().color(QPalette::Highlight));
+    });
+    currentViewOverlay->setVisible(false);
+    const auto updateCurrentViewOverlay = [this, currentViewOverlay] {
+        currentViewOverlay->setVisible(
+            EditorManagerPrivate::hasMoreThanOneview()
+            && EditorManagerPrivate::currentEditorView() == this);
+    };
+    connect(
+        EditorManagerPrivate::instance(),
+        &EditorManagerPrivate::currentViewChanged,
+        currentViewOverlay,
+        updateCurrentViewOverlay);
+    connect(
+        EditorManagerPrivate::instance(),
+        &EditorManagerPrivate::viewCountChanged,
+        currentViewOverlay,
+        updateCurrentViewOverlay);
 }
 
 EditorView::~EditorView() = default;
@@ -232,22 +264,17 @@ bool EditorView::canGoBack() const
     return m_currentNavigationHistoryPosition > 0;
 }
 
+bool EditorView::canReopen() const
+{
+    return !m_closedEditorHistory.isEmpty();
+}
+
 void EditorView::updateEditorHistory(IEditor *editor, QList<EditLocation> &history)
 {
-    if (!editor)
-        return;
-    IDocument *document = editor->document();
+    IDocument *document = editor ? editor->document() : nullptr;
+    QTC_ASSERT(document, return);
 
-    if (!document)
-        return;
-
-    QByteArray state = editor->saveState();
-
-    EditLocation location;
-    location.document = document;
-    location.filePath = document->filePath();
-    location.id = document->id();
-    location.state = state;
+    const auto location = EditLocation::forEditor(editor);
 
     for (int i = 0; i < history.size(); ++i) {
         const EditLocation &item = history.at(i);
@@ -275,11 +302,11 @@ void EditorView::paintEvent(QPaintEvent *)
 
     QRect rect = m_container->geometry();
     if (creatorTheme()->flag(Theme::FlatToolBars)) {
-        painter.fillRect(rect, creatorTheme()->color(Theme::EditorPlaceholderColor));
+        painter.fillRect(rect, creatorColor(Theme::EditorPlaceholderColor));
     } else {
         painter.setRenderHint(QPainter::Antialiasing, true);
         painter.setPen(Qt::NoPen);
-        painter.setBrush(creatorTheme()->color(Theme::EditorPlaceholderColor));
+        painter.setBrush(creatorColor(Theme::EditorPlaceholderColor));
         const int r = 3;
         painter.drawRoundedRect(rect.adjusted(r , r, -r, -r), r * 2, r * 2);
     }
@@ -463,24 +490,11 @@ constexpr int navigationHistorySize = 100;
 void EditorView::addCurrentPositionToNavigationHistory(const QByteArray &saveState)
 {
     IEditor *editor = currentEditor();
-    if (!editor)
-        return;
-    IDocument *document = editor->document();
 
-    if (!document)
+    if (!editor || !editor->document())
         return;
 
-    QByteArray state;
-    if (saveState.isNull())
-        state = editor->saveState();
-    else
-        state = saveState;
-
-    EditLocation location;
-    location.document = document;
-    location.filePath = document->filePath();
-    location.id = document->id();
-    location.state = state;
+    const auto location = EditLocation::forEditor(editor, saveState);
     m_currentNavigationHistoryPosition = qMin(m_currentNavigationHistoryPosition, m_navigationHistory.size()); // paranoia
     m_navigationHistory.insert(m_currentNavigationHistoryPosition, location);
     ++m_currentNavigationHistoryPosition;
@@ -496,6 +510,21 @@ void EditorView::addCurrentPositionToNavigationHistory(const QByteArray &saveSta
     updateNavigatorActions();
 }
 
+void EditorView::addClosedEditorToCloseHistory(IEditor *editor)
+{
+    static const int MAX_ITEMS = 20;
+
+    if (!editor || !editor->document())
+        return;
+
+    EditLocation location = EditLocation::forEditor(editor);
+
+    m_closedEditorHistory.push_back(location);
+
+    if (m_closedEditorHistory.size() > MAX_ITEMS)
+        m_closedEditorHistory.removeFirst();
+}
+
 void EditorView::cutForwardNavigationHistory()
 {
     while (m_currentNavigationHistoryPosition < m_navigationHistory.size() - 1)
@@ -504,6 +533,33 @@ void EditorView::cutForwardNavigationHistory()
 
 void EditorView::updateNavigatorActions()
 {
+    static const int MAX_ITEMS = 20;
+    QString lastDisplay;
+    m_backMenu->clear();
+    int count = 0;
+    for (int i = m_currentNavigationHistoryPosition - 1; i >= 0; i--) {
+        const EditLocation &loc = m_navigationHistory.at(i);
+        if (!loc.displayName().isEmpty() && loc.displayName() != lastDisplay) {
+            lastDisplay = loc.displayName();
+            m_backMenu->addAction(lastDisplay, this, [this, i] { goToNavigationHistory(i); });
+            ++count;
+            if (count >= MAX_ITEMS)
+                break;
+        }
+    }
+    lastDisplay.clear();
+    m_forwardMenu->clear();
+    count = 0;
+    for (int i = m_currentNavigationHistoryPosition + 1; i < m_navigationHistory.size(); i++) {
+        const EditLocation &loc = m_navigationHistory.at(i);
+        if (!loc.displayName().isEmpty() && loc.displayName() != lastDisplay) {
+            lastDisplay = loc.displayName();
+            m_forwardMenu->addAction(lastDisplay, this, [this, i] { goToNavigationHistory(i); });
+            ++count;
+            if (count >= MAX_ITEMS)
+                break;
+        }
+    }
     m_toolBar->setCanGoBack(canGoBack());
     m_toolBar->setCanGoForward(canGoForward());
 }
@@ -524,7 +580,6 @@ void EditorView::updateCurrentPositionInNavigationHistory()
     if (!editor || !editor->document())
         return;
 
-    IDocument *document = editor->document();
     EditLocation *location;
     if (m_currentNavigationHistoryPosition < m_navigationHistory.size()) {
         location = &m_navigationHistory[m_currentNavigationHistoryPosition];
@@ -532,10 +587,7 @@ void EditorView::updateCurrentPositionInNavigationHistory()
         m_navigationHistory.append(EditLocation());
         location = &m_navigationHistory[m_navigationHistory.size()-1];
     }
-    location->document = document;
-    location->filePath = document->filePath();
-    location->id = document->id();
-    location->state = editor->saveState();
+    *location = EditLocation::forEditor(editor);
 }
 
 static bool fileNameWasRemoved(const FilePath &filePath)
@@ -543,31 +595,45 @@ static bool fileNameWasRemoved(const FilePath &filePath)
     return !filePath.isEmpty() && !filePath.exists();
 }
 
+bool EditorView::openEditorFromNavigationHistory(int index)
+{
+    EditLocation location = m_navigationHistory.at(index);
+    IEditor *editor = nullptr;
+    if (location.document) {
+        editor = EditorManagerPrivate::activateEditorForDocument(
+            this, location.document, EditorManager::IgnoreNavigationHistory);
+    }
+    if (!editor) {
+        if (fileNameWasRemoved(location.filePath))
+            return false;
+        editor = EditorManagerPrivate::openEditor(
+            this, location.filePath, location.id, EditorManager::IgnoreNavigationHistory);
+        if (!editor)
+            return false;
+    }
+    editor->restoreState(location.state);
+    return true;
+}
+
+void EditorView::goToNavigationHistory(int index)
+{
+    if (index >= m_navigationHistory.size())
+        return;
+    updateCurrentPositionInNavigationHistory();
+    if (!openEditorFromNavigationHistory(index))
+        m_navigationHistory.removeAt(index);
+    m_currentNavigationHistoryPosition = index;
+    updateNavigatorActions();
+}
+
 void EditorView::goBackInNavigationHistory()
 {
     updateCurrentPositionInNavigationHistory();
     while (m_currentNavigationHistoryPosition > 0) {
         --m_currentNavigationHistoryPosition;
-        EditLocation location = m_navigationHistory.at(m_currentNavigationHistoryPosition);
-        IEditor *editor = nullptr;
-        if (location.document) {
-            editor = EditorManagerPrivate::activateEditorForDocument(this, location.document,
-                                        EditorManager::IgnoreNavigationHistory);
-        }
-        if (!editor) {
-            if (fileNameWasRemoved(location.filePath)) {
-                m_navigationHistory.removeAt(m_currentNavigationHistoryPosition);
-                continue;
-            }
-            editor = EditorManagerPrivate::openEditor(this, location.filePath, location.id,
-                                    EditorManager::IgnoreNavigationHistory);
-            if (!editor) {
-                m_navigationHistory.removeAt(m_currentNavigationHistoryPosition);
-                continue;
-            }
-        }
-        editor->restoreState(location.state);
-        break;
+        if (openEditorFromNavigationHistory(m_currentNavigationHistoryPosition))
+            break;
+        m_navigationHistory.removeAt(m_currentNavigationHistoryPosition);
     }
     updateNavigatorActions();
 }
@@ -579,32 +645,22 @@ void EditorView::goForwardInNavigationHistory()
         return;
     ++m_currentNavigationHistoryPosition;
     while (m_currentNavigationHistoryPosition < m_navigationHistory.size()) {
-        IEditor *editor = nullptr;
-        EditLocation location = m_navigationHistory.at(m_currentNavigationHistoryPosition);
-        if (location.document) {
-            editor = EditorManagerPrivate::activateEditorForDocument(this, location.document,
-                                                                     EditorManager::IgnoreNavigationHistory);
-        }
-        if (!editor) {
-            if (fileNameWasRemoved(location.filePath)) {
-                m_navigationHistory.removeAt(m_currentNavigationHistoryPosition);
-                continue;
-            }
-            editor = EditorManagerPrivate::openEditor(this, location.filePath, location.id,
-                                                      EditorManager::IgnoreNavigationHistory);
-            if (!editor) {
-                m_navigationHistory.removeAt(m_currentNavigationHistoryPosition);
-                continue;
-            }
-        }
-        editor->restoreState(location.state);
-        break;
+        if (openEditorFromNavigationHistory(m_currentNavigationHistoryPosition))
+            break;
+        m_navigationHistory.removeAt(m_currentNavigationHistoryPosition);
     }
     if (m_currentNavigationHistoryPosition >= m_navigationHistory.size())
         m_currentNavigationHistoryPosition = qMax<int>(m_navigationHistory.size() - 1, 0);
     updateNavigatorActions();
 }
 
+void EditorView::reopenLastClosedDocument()
+{
+    if (m_closedEditorHistory.isEmpty())
+        return;
+    goToEditLocation(m_closedEditorHistory.takeLast());
+}
+
 void EditorView::goToEditLocation(const EditLocation &location)
 {
     IEditor *editor = nullptr;
@@ -1005,4 +1061,29 @@ EditLocation EditLocation::load(const QByteArray &data)
     return loc;
 }
 
+EditLocation EditLocation::forEditor(const IEditor *editor, const QByteArray &saveState)
+{
+    QTC_ASSERT(editor, return EditLocation());
+
+    IDocument *document = editor->document();
+    QTC_ASSERT(document, return EditLocation());
+
+    const QByteArray &state = saveState.isEmpty() ? editor->saveState() : saveState;
+
+    EditLocation location;
+    location.document = document;
+    location.filePath = document->filePath();
+    location.id = document->id();
+    location.state = state;
+
+    return location;
+}
+
+QString EditLocation::displayName() const
+{
+    if (document)
+        return document->displayName();
+    return filePath.fileName();
+}
+
 } // Core::Internal
diff --git a/src/plugins/coreplugin/editormanager/editorview.h b/src/plugins/coreplugin/editormanager/editorview.h
index 6a81a7b4b73..374c6df21fa 100644
--- a/src/plugins/coreplugin/editormanager/editorview.h
+++ b/src/plugins/coreplugin/editormanager/editorview.h
@@ -40,6 +40,9 @@ class EditLocation
 public:
     QByteArray save() const;
     static EditLocation load(const QByteArray &data);
+    static EditLocation forEditor(const IEditor *editor, const QByteArray &saveState = {});
+
+    QString displayName() const;
 
     QPointer<IDocument> document;
     Utils::FilePath filePath;
@@ -82,13 +85,17 @@ public:
 
     bool canGoForward() const;
     bool canGoBack() const;
+    bool canReopen() const;
 
     void goBackInNavigationHistory();
     void goForwardInNavigationHistory();
 
+    void reopenLastClosedDocument();
+
     void goToEditLocation(const EditLocation &location);
 
     void addCurrentPositionToNavigationHistory(const QByteArray &saveState = QByteArray());
+    void addClosedEditorToCloseHistory(IEditor *editor);
     void cutForwardNavigationHistory();
 
     QList<EditLocation> editorHistory() const { return m_editorHistory; }
@@ -124,6 +131,8 @@ private:
     void checkProjectLoaded(IEditor *editor);
 
     void updateCurrentPositionInNavigationHistory();
+    bool openEditorFromNavigationHistory(int index);
+    void goToNavigationHistory(int index);
 
     SplitterOrView *m_parentSplitterOrView;
     EditorToolBar *m_toolBar;
@@ -140,7 +149,10 @@ private:
     QLabel *m_emptyViewLabel;
 
     QList<EditLocation> m_navigationHistory;
+    QMenu *m_backMenu;
+    QMenu *m_forwardMenu;
     QList<EditLocation> m_editorHistory;
+    QList<EditLocation> m_closedEditorHistory;
     int m_currentNavigationHistoryPosition = 0;
 };
 
diff --git a/src/plugins/coreplugin/editormanager/ieditorfactory.cpp b/src/plugins/coreplugin/editormanager/ieditorfactory.cpp
index 22aa24e7377..0c0fc17a204 100644
--- a/src/plugins/coreplugin/editormanager/ieditorfactory.cpp
+++ b/src/plugins/coreplugin/editormanager/ieditorfactory.cpp
@@ -4,6 +4,7 @@
 #include "ieditorfactory.h"
 #include "ieditorfactory_p.h"
 #include "editormanager.h"
+#include "../coreconstants.h"
 
 #include <utils/algorithm.h>
 #include <utils/mimeconstants.h>
@@ -16,15 +17,14 @@ namespace Core {
 
 /* Find the one best matching the mimetype passed in.
  * Recurse over the parent classes of the mimetype to find them. */
-template<class EditorTypeLike>
 static void mimeTypeFactoryLookup(const Utils::MimeType &mimeType,
-                                  const QList<EditorTypeLike *> &allFactories,
-                                  QList<EditorTypeLike *> *list)
+                                  const QList<IEditorFactory *> &allFactories,
+                                  QList<IEditorFactory *> *list)
 {
-    QSet<EditorTypeLike *> matches;
+    QSet<IEditorFactory *> matches;
     Utils::visitMimeParents(mimeType, [&](const Utils::MimeType &mt) -> bool {
         // check for matching factories
-        for (EditorTypeLike *factory : allFactories) {
+        for (IEditorFactory *factory : allFactories) {
             if (!matches.contains(factory)) {
                 const QStringList mimeTypes = factory->mimeTypes();
                 for (const QString &mimeName : mimeTypes) {
@@ -37,6 +37,14 @@ static void mimeTypeFactoryLookup(const Utils::MimeType &mimeType,
         }
         return true; // continue
     });
+    // Always offer the plain text editor as a fallback for the case that the mime type
+    // is not detected correctly.
+    if (auto plainTextEditorFactory = Utils::findOrDefault(
+            allFactories,
+            Utils::equal(&IEditorFactory::id, Utils::Id(Constants::K_DEFAULT_TEXT_EDITOR_ID)))) {
+        if (!matches.contains(plainTextEditorFactory))
+            list->append(plainTextEditorFactory);
+    }
 }
 
 /*!
diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
index d59f49bf803..172b54570e1 100644
--- a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
@@ -161,17 +161,39 @@ void OpenEditorsWindow::setVisible(bool visible)
 bool OpenEditorsWindow::eventFilter(QObject *obj, QEvent *e)
 {
     if (obj == m_editorView) {
-        if (e->type() == QEvent::KeyPress) {
+        if (e->type() == QEvent::ShortcutOverride) {
             auto ke = static_cast<QKeyEvent*>(e);
-            if (ke->key() == Qt::Key_Escape) {
-                setVisible(false);
+            switch (ke->key()) {
+            case Qt::Key_Up:
+            case Qt::Key_P:
+                e->accept();
+                return true;
+            case Qt::Key_Down:
+            case Qt::Key_N:
+                e->accept();
                 return true;
             }
-            if (ke->key() == Qt::Key_Return
-                    || ke->key() == Qt::Key_Enter) {
+        }
+        if (e->type() == QEvent::KeyPress) {
+            auto ke = static_cast<QKeyEvent*>(e);
+            switch (ke->key()) {
+            case Qt::Key_Up:
+            case Qt::Key_P:
+                selectNextEditor();
+                return true;
+            case Qt::Key_Down:
+            case Qt::Key_N:
+                selectPreviousEditor();
+                return true;
+            case Qt::Key_Escape:
+                setVisible(false);
+                return true;
+            case Qt::Key_Return:
+            case Qt::Key_Enter:
                 selectEditor(m_editorView->currentItem());
                 return true;
             }
+
         } else if (e->type() == QEvent::KeyRelease) {
             auto ke = static_cast<QKeyEvent*>(e);
             if (ke->modifiers() == 0
diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index ee4d912d85c..5675cae0eb3 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -39,6 +39,24 @@ enum {
 
 namespace Core {
 
+class ButtonWithMenu : public QToolButton
+{
+public:
+    ButtonWithMenu(QWidget *parent = nullptr)
+        : QToolButton(parent)
+    {}
+
+protected:
+    void mousePressEvent(QMouseEvent *e) override
+    {
+        if (e->button() == Qt::RightButton) {
+            showMenu();
+            return;
+        }
+        QToolButton::mousePressEvent(e);
+    }
+};
+
 struct EditorToolBarPrivate
 {
     explicit EditorToolBarPrivate(QWidget *parent, EditorToolBar *q);
@@ -51,8 +69,8 @@ struct EditorToolBarPrivate
     EditorToolBar::MenuProvider m_menuProvider;
     QAction *m_goBackAction;
     QAction *m_goForwardAction;
-    QToolButton *m_backButton;
-    QToolButton *m_forwardButton;
+    ButtonWithMenu *m_backButton;
+    ButtonWithMenu *m_forwardButton;
     QToolButton *m_splitButton;
     QAction *m_horizontalSplitAction;
     QAction *m_verticalSplitAction;
@@ -68,27 +86,27 @@ struct EditorToolBarPrivate
     bool m_isStandalone;
 };
 
-EditorToolBarPrivate::EditorToolBarPrivate(QWidget *parent, EditorToolBar *q) :
-    m_editorList(new QComboBox(q)),
-    m_closeEditorButton(new QToolButton(q)),
-    m_lockButton(new QToolButton(q)),
-    m_dragHandle(new QToolButton(q)),
-    m_dragHandleMenu(nullptr),
-    m_goBackAction(new QAction(Utils::Icons::PREV_TOOLBAR.icon(), Tr::tr("Go Back"), parent)),
-    m_goForwardAction(new QAction(Utils::Icons::NEXT_TOOLBAR.icon(), Tr::tr("Go Forward"), parent)),
-    m_backButton(new QToolButton(q)),
-    m_forwardButton(new QToolButton(q)),
-    m_splitButton(new QToolButton(q)),
-    m_horizontalSplitAction(new QAction(Utils::Icons::SPLIT_HORIZONTAL.icon(),
-                                        Tr::tr("Split"), parent)),
-    m_verticalSplitAction(new QAction(Utils::Icons::SPLIT_VERTICAL.icon(),
-                                      Tr::tr("Split Side by Side"), parent)),
-    m_splitNewWindowAction(new QAction(Tr::tr("Open in New Window"), parent)),
-    m_closeSplitButton(new QToolButton(q)),
-    m_activeToolBar(nullptr),
-    m_toolBarPlaceholder(new QWidget(q)),
-    m_defaultToolBar(new QWidget(q)),
-    m_isStandalone(false)
+EditorToolBarPrivate::EditorToolBarPrivate(QWidget *parent, EditorToolBar *q)
+    : m_editorList(new QComboBox(q))
+    , m_closeEditorButton(new QToolButton(q))
+    , m_lockButton(new QToolButton(q))
+    , m_dragHandle(new QToolButton(q))
+    , m_dragHandleMenu(nullptr)
+    , m_goBackAction(new QAction(Utils::Icons::PREV_TOOLBAR.icon(), Tr::tr("Go Back"), parent))
+    , m_goForwardAction(new QAction(Utils::Icons::NEXT_TOOLBAR.icon(), Tr::tr("Go Forward"), parent))
+    , m_backButton(new ButtonWithMenu(q))
+    , m_forwardButton(new ButtonWithMenu(q))
+    , m_splitButton(new QToolButton(q))
+    , m_horizontalSplitAction(
+          new QAction(Utils::Icons::SPLIT_HORIZONTAL.icon(), Tr::tr("Split"), parent))
+    , m_verticalSplitAction(
+          new QAction(Utils::Icons::SPLIT_VERTICAL.icon(), Tr::tr("Split Side by Side"), parent))
+    , m_splitNewWindowAction(new QAction(Tr::tr("Open in New Window"), parent))
+    , m_closeSplitButton(new QToolButton(q))
+    , m_activeToolBar(nullptr)
+    , m_toolBarPlaceholder(new QWidget(q))
+    , m_defaultToolBar(new QWidget(q))
+    , m_isStandalone(false)
 {
 }
 
@@ -175,9 +193,13 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
        menu.exec(d->m_editorList->mapToGlobal(p));
     });
     connect(d->m_dragHandleMenu, &QMenu::aboutToShow, this, [this] {
-       d->m_dragHandleMenu->clear();
        fillListContextMenu(d->m_dragHandleMenu);
     });
+    connect(d->m_dragHandleMenu, &QMenu::aboutToHide, this, [this] {
+        // Remove actions from context menu, to avoid any shortcuts set on them
+        // for the display in the menu interfering with global actions
+        d->m_dragHandleMenu->clear();
+    });
     connect(d->m_lockButton, &QAbstractButton::clicked, this, &EditorToolBar::makeEditorWritable);
     connect(d->m_closeEditorButton, &QAbstractButton::clicked,
             this, &EditorToolBar::closeEditor, Qt::QueuedConnection);
@@ -347,6 +369,16 @@ void EditorToolBar::setCanGoForward(bool canGoForward)
     d->m_goForwardAction->setEnabled(canGoForward);
 }
 
+void EditorToolBar::setGoBackMenu(QMenu *menu)
+{
+    d->m_backButton->setMenu(menu);
+}
+
+void EditorToolBar::setGoForwardMenu(QMenu *menu)
+{
+    d->m_forwardButton->setMenu(menu);
+}
+
 void EditorToolBar::updateActionShortcuts()
 {
     d->m_closeEditorButton->setToolTip(ActionManager::command(Constants::CLOSE)->stringWithAppendedShortcut(Tr::tr("Close Document")));
diff --git a/src/plugins/coreplugin/editortoolbar.h b/src/plugins/coreplugin/editortoolbar.h
index a2aa089da7c..72925c0fd63 100644
--- a/src/plugins/coreplugin/editortoolbar.h
+++ b/src/plugins/coreplugin/editortoolbar.h
@@ -19,10 +19,13 @@ class IDocument;
 
 struct EditorToolBarPrivate;
 
-/**
-  * Fakes an IEditor-like toolbar for design mode widgets such as Qt Designer and Bauhaus.
-  * Creates a combobox for open files and lock and close buttons on the right.
-  */
+/*!
+    \class Core::EditorToolBar
+    \inmodule QtCreator
+
+    Implements the editor toolbar for editor views and for design mode widgets such as
+    \QD and \QMLD. Creates a combobox for open files and lock and close buttons on the right.
+*/
 class CORE_EXPORT EditorToolBar : public Utils::StyledBar
 {
     Q_OBJECT
@@ -56,6 +59,8 @@ public:
     void setNavigationVisible(bool isVisible);
     void setCanGoBack(bool canGoBack);
     void setCanGoForward(bool canGoForward);
+    void setGoBackMenu(QMenu *menu);
+    void setGoForwardMenu(QMenu *menu);
     void removeToolbarForEditor(IEditor *editor);
     void setCloseSplitEnabled(bool enable);
     void setCloseSplitIcon(const QIcon &icon);
diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp
index 7197236100d..9a873b1af32 100644
--- a/src/plugins/coreplugin/fancyactionbar.cpp
+++ b/src/plugins/coreplugin/fancyactionbar.cpp
@@ -141,7 +141,7 @@ void FancyToolButton::paintEvent(QPaintEvent *event)
         && m_fader > 0 && isEnabled() && !isDown() && !isChecked()) {
         painter.save();
         if (creatorTheme()->flag(Theme::FlatToolBars)) {
-            const QColor hoverColor = creatorTheme()->color(Theme::FancyToolButtonHoverColor);
+            const QColor hoverColor = creatorColor(Theme::FancyToolButtonHoverColor);
             QColor fadedHoverColor = hoverColor;
             fadedHoverColor.setAlpha(int(m_fader * hoverColor.alpha()));
             painter.fillRect(rect(), fadedHoverColor);
@@ -152,7 +152,7 @@ void FancyToolButton::paintEvent(QPaintEvent *event)
         painter.restore();
     } else if (isDown() || isChecked()) {
         painter.save();
-        const QColor selectedColor = creatorTheme()->color(Theme::FancyToolButtonSelectedColor);
+        const QColor selectedColor = creatorColor(Theme::FancyToolButtonSelectedColor);
         if (creatorTheme()->flag(Theme::FlatToolBars)) {
             painter.fillRect(rect(), selectedColor);
         } else {
@@ -200,8 +200,8 @@ void FancyToolButton::paintEvent(QPaintEvent *event)
                             - QPoint(iconRect.width() / 2, iconRect.height() / 2);
         textOffset = textOffset - QPoint(0, lineHeight + 3);
         const QRectF r(0, textOffset.y(), rect().width(), lineHeight);
-        painter.setPen(creatorTheme()->color(isEnabled() ? Theme::PanelTextColorLight
-                                                         : Theme::IconsDisabledColor));
+        painter.setPen(creatorColor(isEnabled() ? Theme::PanelTextColorLight
+                                                : Theme::IconsDisabledColor));
 
         // draw project name
         const int margin = 6;
@@ -227,12 +227,12 @@ void FancyToolButton::paintEvent(QPaintEvent *event)
 
         // draw the two text lines for the build configuration
         painter.setPen(
-            creatorTheme()->color(isEnabled()
-                                      // Intentionally using the "Unselected" colors,
-                                      // because the text color won't change in the pressed
-                                      // state as they would do on the mode buttons.
-                                      ? Theme::FancyTabWidgetEnabledUnselectedTextColor
-                                      : Theme::FancyTabWidgetDisabledUnselectedTextColor));
+                    creatorColor(isEnabled()
+                                 // Intentionally using the "Unselected" colors,
+                                 // because the text color won't change in the pressed
+                                 // state as they would do on the mode buttons.
+                                 ? Theme::FancyTabWidgetEnabledUnselectedTextColor
+                                 : Theme::FancyTabWidgetDisabledUnselectedTextColor));
 
         for (int i = 0; i < 2; ++i) {
             const QString &buildConfigText = splitBuildConfiguration[i];
@@ -264,7 +264,7 @@ void FancyActionBar::paintEvent(QPaintEvent *event)
         // this paints the background of the bottom portion of the
         // left tab bar
         painter.fillRect(event->rect(), StyleHelper::baseColor());
-        painter.setPen(creatorTheme()->color(Theme::FancyToolBarSeparatorColor));
+        painter.setPen(creatorColor(Theme::FancyToolBarSeparatorColor));
         painter.drawLine(borderRect.topLeft(), borderRect.topRight());
     } else {
         painter.setPen(StyleHelper::sidebarShadow());
@@ -320,7 +320,7 @@ void FancyToolButton::hoverOverlay(QPainter *painter, const QRect &spanRect)
         overlay.fill(Qt::transparent);
         overlay.setDevicePixelRatio(dpr);
 
-        const QColor hoverColor = creatorTheme()->color(Theme::FancyToolButtonHoverColor);
+        const QColor hoverColor = creatorColor(Theme::FancyToolButtonHoverColor);
         const QRect rect(QPoint(), logicalSize);
         const QRectF borderRect = QRectF(rect).adjusted(0.5, 0.5, -0.5, -0.5);
 
diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp
index 39b0eaccb7c..18d4603e19e 100644
--- a/src/plugins/coreplugin/fancytabwidget.cpp
+++ b/src/plugins/coreplugin/fancytabwidget.cpp
@@ -196,10 +196,7 @@ void FancyTabBar::mousePressEvent(QMouseEvent *event)
                         emit currentAboutToChange(index);
                         m_currentIndex = index;
                         update();
-                        // update tab bar before showing widget
-                        QMetaObject::invokeMethod(this, [this] {
-                            emit currentChanged(m_currentIndex);
-                        }, Qt::QueuedConnection);
+                        emit currentChanged(m_currentIndex);
                     }
                 }
             }
@@ -275,7 +272,7 @@ static void paintIcon(QPainter *painter, const QRect &rect,
         painter->setOpacity(1.0);
         QRect accentRect = rect;
         accentRect.setWidth(2);
-        painter->fillRect(accentRect, creatorTheme()->color(Theme::IconsBaseColor));
+        painter->fillRect(accentRect, creatorColor(Theme::IconsBaseColor));
     }
 }
 
@@ -305,16 +302,16 @@ static void paintIconAndText(QPainter *painter, const QRect &rect,
     if (selected && creatorTheme()->flag(Theme::FlatToolBars)) {
         QRect accentRect = rect;
         accentRect.setWidth(2);
-        painter->fillRect(accentRect, creatorTheme()->color(Theme::IconsBaseColor));
+        painter->fillRect(accentRect, creatorColor(Theme::IconsBaseColor));
     }
     if (enabled) {
         painter->setPen(
-            selected ? creatorTheme()->color(Theme::FancyTabWidgetEnabledSelectedTextColor)
-                     : creatorTheme()->color(Theme::FancyTabWidgetEnabledUnselectedTextColor));
+            selected ? creatorColor(Theme::FancyTabWidgetEnabledSelectedTextColor)
+                     : creatorColor(Theme::FancyTabWidgetEnabledUnselectedTextColor));
     } else {
         painter->setPen(
-            selected ? creatorTheme()->color(Theme::FancyTabWidgetDisabledSelectedTextColor)
-                     : creatorTheme()->color(Theme::FancyTabWidgetDisabledUnselectedTextColor));
+            selected ? creatorColor(Theme::FancyTabWidgetDisabledSelectedTextColor)
+                     : creatorColor(Theme::FancyTabWidgetDisabledUnselectedTextColor));
     }
 
     painter->translate(0, -1);
@@ -341,7 +338,7 @@ void FancyTabBar::paintTab(QPainter *painter, int tabIndex) const
     if (selected) {
         if (creatorTheme()->flag(Theme::FlatToolBars)) {
             // background color of a fancy tab that is active
-            painter->fillRect(rect, creatorTheme()->color(Theme::FancyTabBarSelectedBackgroundColor));
+            painter->fillRect(rect, creatorColor(Theme::FancyTabBarSelectedBackgroundColor));
         } else {
             paintSelectedTabBackground(painter, rect);
         }
@@ -352,7 +349,7 @@ void FancyTabBar::paintTab(QPainter *painter, int tabIndex) const
         painter->save();
         painter->setOpacity(fader);
         if (creatorTheme()->flag(Theme::FlatToolBars))
-            painter->fillRect(rect, creatorTheme()->color(Theme::FancyToolButtonHoverColor));
+            painter->fillRect(rect, creatorColor(Theme::FancyToolButtonHoverColor));
         else
             FancyToolButton::hoverOverlay(painter, rect);
         painter->restore();
@@ -464,7 +461,7 @@ FancyTabWidget::FancyTabWidget(QWidget *parent)
     QVBoxLayout *vlayout;
 
     using namespace Layouting;
-    Row { fancyButton, noMargin() }.attachTo(bar);
+    Row { fancyButton, noMargin }.attachTo(bar);
     Row {
         Widget {
             bindTo(&m_selectionWidget),
@@ -474,13 +471,13 @@ FancyTabWidget::FancyTabWidget(QWidget *parent)
                 st,
                 Widget {
                     bindTo(&m_cornerWidgetContainer),
-                    Column { st, spacing(0), noMargin() },
+                    Column { st, spacing(0), noMargin },
                 },
-                spacing(0),  noMargin(),
+                spacing(0), noMargin,
             },
         },
         Column { bindTo(&vlayout), m_modesStack, m_statusBar, spacing(0) },
-        spacing(1), noMargin(),
+        spacing(1), noMargin,
     }.attachTo(this);
 
     m_selectionWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
diff --git a/src/plugins/coreplugin/fileutils.cpp b/src/plugins/coreplugin/fileutils.cpp
index f7c7d4a759c..e05375393da 100644
--- a/src/plugins/coreplugin/fileutils.cpp
+++ b/src/plugins/coreplugin/fileutils.cpp
@@ -174,7 +174,7 @@ void FileUtils::removeFiles(const FilePaths &filePaths, bool deleteFromFS)
 bool FileUtils::renameFile(const FilePath &orgFilePath, const FilePath &newFilePath,
                            HandleIncludeGuards handleGuards)
 {
-    if (orgFilePath == newFilePath)
+    if (orgFilePath.equalsCaseSensitive(newFilePath))
         return false;
 
     const FilePath dir = orgFilePath.absolutePath();
diff --git a/src/plugins/coreplugin/find/findplugin.cpp b/src/plugins/coreplugin/find/findplugin.cpp
index 0e5ef38be8b..56042cb478c 100644
--- a/src/plugins/coreplugin/find/findplugin.cpp
+++ b/src/plugins/coreplugin/find/findplugin.cpp
@@ -3,12 +3,6 @@
 
 #include "findplugin.h"
 
-#include "currentdocumentfind.h"
-#include "findtoolbar.h"
-#include "findtoolwindow.h"
-#include "ifindfilter.h"
-#include "searchresultwindow.h"
-#include "textfindconstants.h"
 #include "../actionmanager/actioncontainer.h"
 #include "../actionmanager/actionmanager.h"
 #include "../actionmanager/command.h"
@@ -16,6 +10,13 @@
 #include "../coreplugintr.h"
 #include "../icontext.h"
 #include "../icore.h"
+#include "../session.h"
+#include "currentdocumentfind.h"
+#include "findtoolbar.h"
+#include "findtoolwindow.h"
+#include "ifindfilter.h"
+#include "searchresultwindow.h"
+#include "textfindconstants.h"
 
 #include <extensionsystem/pluginmanager.h>
 
@@ -75,6 +76,10 @@ public:
 
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
+    void restore(const Store &s);
+    Store save() const;
+
+    // TODO deprecated since QtC 14.0
     void writeSettings(QtcSettings *settings) const;
     void readSettings(QtcSettings *settings);
 
@@ -105,6 +110,41 @@ static Utils::Key completionSettingsArrayPrefix() { return "FindCompletions"; }
 static Utils::Key completionSettingsTextKey() { return "Text"; }
 static Utils::Key completionSettingsFlagsKey() { return "Flags"; }
 
+void CompletionModel::restore(const Store &s)
+{
+    beginResetModel();
+    const QStringList texts = s.value(completionSettingsTextKey()).toStringList();
+    const QList<FindFlags> flags
+        = transform(s.value(completionSettingsFlagsKey()).toList(), [](const QVariant &v) {
+              return FindFlags(v.toInt());
+          });
+    const int size = texts.size();
+    m_entries.clear();
+    m_entries.reserve(size);
+    for (int i = 0; i < size; ++i) {
+        CompletionEntry entry;
+        entry.text = texts.at(i);
+        entry.findFlags = i < flags.size() ? flags.at(i) : FindFlags();
+        if (!entry.text.isEmpty())
+            m_entries.append(entry);
+    }
+    endResetModel();
+}
+
+Store CompletionModel::save() const
+{
+    if (m_entries.isEmpty())
+        return {};
+    const QStringList texts = transform(m_entries, [](const CompletionEntry &e) { return e.text; });
+    const QVariantList flags = transform(m_entries, [](const CompletionEntry &e) {
+        return QVariant::fromValue(int(e.findFlags));
+    });
+    Store s;
+    s.insert(completionSettingsTextKey(), texts);
+    s.insert(completionSettingsFlagsKey(), flags);
+    return s;
+}
+
 void CompletionModel::writeSettings(QtcSettings *settings) const
 {
     if (m_entries.isEmpty()) {
@@ -215,13 +255,20 @@ void Find::initialize()
     d->m_findDialog = new Internal::FindToolWindow;
     d->m_searchResultWindow = new SearchResultWindow(d->m_findDialog);
     ExtensionSystem::PluginManager::addObject(d->m_searchResultWindow);
+
     QObject::connect(ICore::instance(), &ICore::saveSettingsRequested, d, &FindPrivate::writeSettings);
+    QObject::connect(
+        SessionManager::instance(),
+        &SessionManager::aboutToSaveSession,
+        d,
+        &FindPrivate::writeSettings);
+    QObject::connect(
+        SessionManager::instance(), &SessionManager::sessionLoaded, d, &FindPrivate::readSettings);
 }
 
 void Find::extensionsInitialized()
 {
     d->setupFilterMenuItems();
-    d->readSettings();
 }
 
 void Find::aboutToShutdown()
@@ -369,6 +416,8 @@ bool Find::hasFindFlag(FindFlag flag)
 
 void FindPrivate::writeSettings()
 {
+    // TODO for backwards compatibility
+    // deprecated since QtC 14.0
     QtcSettings *settings = ICore::settings();
     settings->beginGroup("Find");
     settings->setValueWithDefault("Backward", bool(m_findFlags & FindBackward), false);
@@ -384,26 +433,70 @@ void FindPrivate::writeSettings()
     m_findToolBar->writeSettings();
     m_findDialog->writeSettings();
     m_searchResultWindow->writeSettings();
+
+    // save in session
+    Store s;
+    if (m_findFlags & FindBackward)
+        s.insert("Backward", true);
+    if (m_findFlags & FindCaseSensitively)
+        s.insert("CaseSensitively", true);
+    if (m_findFlags & FindWholeWords)
+        s.insert("WholeWords", true);
+    if (m_findFlags & FindRegularExpression)
+        s.insert("RegularExpression", true);
+    if (m_findFlags & FindPreserveCase)
+        s.insert("PreserveCase", true);
+    const Store completion = m_findCompletionModel.save();
+    if (!completion.isEmpty())
+        s.insert("FindCompletions", variantFromStore(completion));
+    if (!m_replaceCompletions.isEmpty())
+        s.insert("ReplaceStrings", m_replaceCompletions);
+    const Store toolbar = m_findToolBar->save();
+    if (!toolbar.isEmpty())
+        s.insert("ToolBar", variantFromStore(toolbar));
+    const Store advanced = m_findDialog->save();
+    if (!advanced.isEmpty())
+        s.insert("AdvancedSearch", variantFromStore(advanced));
+    SessionManager::setValue("Find", variantFromStore(s));
 }
 
 void FindPrivate::readSettings()
 {
-    QtcSettings *settings = ICore::settings();
-    settings->beginGroup("Find");
-    {
-        QSignalBlocker blocker(m_instance);
-        Find::setBackward(settings->value("Backward", false).toBool());
-        Find::setCaseSensitive(settings->value("CaseSensitively", false).toBool());
-        Find::setWholeWord(settings->value("WholeWords", false).toBool());
-        Find::setRegularExpression(settings->value("RegularExpression", false).toBool());
-        Find::setPreserveCase(settings->value("PreserveCase", false).toBool());
+    const Store s = storeFromVariant(SessionManager::value("Find"));
+    if (s.isEmpty() && SessionManager::isDefaultVirgin()) {
+        // TODO compatibility path when opening Qt Creator
+        // TODO deprecated since QtC 14.0
+        QtcSettings *settings = ICore::settings();
+        settings->beginGroup("Find");
+        {
+            QSignalBlocker blocker(m_instance);
+            Find::setBackward(settings->value("Backward", false).toBool());
+            Find::setCaseSensitive(settings->value("CaseSensitively", false).toBool());
+            Find::setWholeWord(settings->value("WholeWords", false).toBool());
+            Find::setRegularExpression(settings->value("RegularExpression", false).toBool());
+            Find::setPreserveCase(settings->value("PreserveCase", false).toBool());
+        }
+        m_findCompletionModel.readSettings(settings);
+        m_replaceCompletions = settings->value("ReplaceStrings").toStringList();
+        m_replaceCompletionModel.setStringList(m_replaceCompletions);
+        settings->endGroup();
+        m_findToolBar->readSettings();
+        m_findDialog->readSettings();
+    } else if (!s.empty()) {
+        {
+            QSignalBlocker blocker(m_instance);
+            Find::setBackward(s.value("Backward", false).toBool());
+            Find::setCaseSensitive(s.value("CaseSensitively", false).toBool());
+            Find::setWholeWord(s.value("WholeWords", false).toBool());
+            Find::setRegularExpression(s.value("RegularExpression", false).toBool());
+            Find::setPreserveCase(s.value("PreserveCase", false).toBool());
+        }
+        m_findCompletionModel.restore(storeFromVariant(s.value("FindCompletions")));
+        m_replaceCompletions = s.value("ReplaceStrings").toStringList();
+        m_replaceCompletionModel.setStringList(m_replaceCompletions);
+        m_findToolBar->restore(storeFromVariant(s.value("ToolBar")));
+        m_findDialog->restore(storeFromVariant(s.value("AdvancedSearch")));
     }
-    m_findCompletionModel.readSettings(settings);
-    m_replaceCompletions = settings->value("ReplaceStrings").toStringList();
-    m_replaceCompletionModel.setStringList(m_replaceCompletions);
-    settings->endGroup();
-    m_findToolBar->readSettings();
-    m_findDialog->readSettings();
     emit m_instance->findFlagsChanged(); // would have been done in the setXXX methods above
 }
 
diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp
index 4460367896a..0111093c27d 100644
--- a/src/plugins/coreplugin/find/findtoolbar.cpp
+++ b/src/plugins/coreplugin/find/findtoolbar.cpp
@@ -160,15 +160,6 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
     setProperty(StyleHelper::C_TOP_BORDER, true);
     setSingleRow(false);
 
-    QWidget::setTabOrder(m_findEdit, m_replaceEdit);
-    QWidget::setTabOrder(m_replaceEdit, m_findPreviousButton);
-    QWidget::setTabOrder(m_findPreviousButton, m_findNextButton);
-    QWidget::setTabOrder(m_findNextButton, m_replaceButton);
-    QWidget::setTabOrder(m_replaceButton, m_replaceNextButton);
-    QWidget::setTabOrder(m_replaceNextButton, m_replaceAllButton);
-    QWidget::setTabOrder(m_replaceAllButton, m_advancedButton);
-    QWidget::setTabOrder(m_advancedButton, m_close);
-
     connect(m_findEdit, &Utils::FancyLineEdit::editingFinished,
             this, &FindToolBar::invokeResetIncrementalSearch);
     connect(m_findEdit, &Utils::FancyLineEdit::textChanged,
@@ -447,6 +438,17 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
     connect(&m_findStepTimer, &QTimer::timeout, this, &FindToolBar::invokeFindStep);
 
     setLightColoredIcon(isLightColored());
+
+    QWidget::setTabOrder(m_findEdit->button(FancyLineEdit::Left), m_findEdit);
+    QWidget::setTabOrder(m_findEdit, m_replaceEdit);
+    QWidget::setTabOrder(m_replaceEdit, m_findPreviousButton);
+    QWidget::setTabOrder(m_findPreviousButton, m_findNextButton);
+    QWidget::setTabOrder(m_findNextButton, m_selectAllButton);
+    QWidget::setTabOrder(m_selectAllButton, m_replaceButton);
+    QWidget::setTabOrder(m_replaceButton, m_replaceNextButton);
+    QWidget::setTabOrder(m_replaceNextButton, m_replaceAllButton);
+    QWidget::setTabOrder(m_replaceAllButton, m_advancedButton);
+    QWidget::setTabOrder(m_advancedButton, m_close);
 }
 
 FindToolBar::~FindToolBar() = default;
@@ -1024,29 +1026,45 @@ void FindToolBar::selectAll()
     }
 }
 
-bool FindToolBar::focusNextPrevChild(bool next)
-{
-    QAbstractButton *optionsButton = m_findEdit->button(Utils::FancyLineEdit::Left);
-    // close tab order
-    if (next && m_advancedButton->hasFocus())
-        optionsButton->setFocus(Qt::TabFocusReason);
-    else if (next && optionsButton->hasFocus())
-        m_findEdit->setFocus(Qt::TabFocusReason);
-    else if (!next && optionsButton->hasFocus())
-        m_advancedButton->setFocus(Qt::TabFocusReason);
-    else if (!next && m_findEdit->hasFocus())
-        optionsButton->setFocus(Qt::TabFocusReason);
-    else
-        return Utils::StyledBar::focusNextPrevChild(next);
-    return true;
-}
-
 void FindToolBar::resizeEvent(QResizeEvent *event)
 {
     Q_UNUSED(event)
     QMetaObject::invokeMethod(this, &FindToolBar::updateToolBar, Qt::QueuedConnection);
 }
 
+void FindToolBar::restore(const Store &s)
+{
+    FindFlags flags;
+    if (s.value("Backward", false).toBool())
+        flags |= FindBackward;
+    if (s.value("CaseSensitively", false).toBool())
+        flags |= FindCaseSensitively;
+    if (s.value("WholeWords", false).toBool())
+        flags |= FindWholeWords;
+    if (s.value("RegularExpression", false).toBool())
+        flags |= FindRegularExpression;
+    if (s.value("PreserveCase", false).toBool())
+        flags |= FindPreserveCase;
+    m_findFlags = flags;
+    findFlagsChanged();
+}
+
+Store FindToolBar::save() const
+{
+    Store s;
+    if (m_findFlags & FindBackward)
+        s.insert("Backward", true);
+    if (m_findFlags & FindCaseSensitively)
+        s.insert("CaseSensitively", true);
+    if (m_findFlags & FindWholeWords)
+        s.insert("WholeWords", true);
+    if (m_findFlags & FindRegularExpression)
+        s.insert("RegularExpression", true);
+    if (m_findFlags & FindPreserveCase)
+        s.insert("PreserveCase", true);
+    return s;
+}
+
 void FindToolBar::writeSettings()
 {
     Utils::QtcSettings *settings = ICore::settings();
diff --git a/src/plugins/coreplugin/find/findtoolbar.h b/src/plugins/coreplugin/find/findtoolbar.h
index baca57597ca..e5ddbf8c75c 100644
--- a/src/plugins/coreplugin/find/findtoolbar.h
+++ b/src/plugins/coreplugin/find/findtoolbar.h
@@ -6,6 +6,7 @@
 #include "currentdocumentfind.h"
 
 #include <utils/id.h>
+#include <utils/store.h>
 #include <utils/styledbar.h>
 
 #include <QTimer>
@@ -18,7 +19,9 @@ class QSpacerItem;
 class QToolButton;
 QT_END_NAMESPACE
 
-namespace Utils { class FancyLineEdit; }
+namespace Utils {
+class FancyLineEdit;
+} // namespace Utils
 
 namespace Core {
 
@@ -43,6 +46,10 @@ public:
     explicit FindToolBar(CurrentDocumentFind *currentDocumentFind);
     ~FindToolBar() override;
 
+    void restore(const Utils::Store &s);
+    Utils::Store save() const;
+
+    // TODO deprecated since QtC 14.0
     void readSettings();
     void writeSettings();
 
@@ -57,7 +64,6 @@ public slots:
     void setBackward(bool backward);
 
 protected:
-    bool focusNextPrevChild(bool next) override;
     void resizeEvent(QResizeEvent *event) override;
 
 private:
diff --git a/src/plugins/coreplugin/find/findtoolwindow.cpp b/src/plugins/coreplugin/find/findtoolwindow.cpp
index a239d310be6..bc8e241dd40 100644
--- a/src/plugins/coreplugin/find/findtoolwindow.cpp
+++ b/src/plugins/coreplugin/find/findtoolwindow.cpp
@@ -346,6 +346,30 @@ void FindToolWindow::replace()
     filter->replaceAll(term, Find::findFlags());
 }
 
+void FindToolWindow::restore(const Utils::Store &s)
+{
+    const QString currentFilter = s.value("CurrentFilter").toString();
+    for (int i = 0; i < m_filters.size(); ++i) {
+        IFindFilter *filter = m_filters.at(i);
+        filter->restore(storeFromVariant(s.value(filter->id().toUtf8())));
+        if (filter->id() == currentFilter)
+            setCurrentFilterIndex(i);
+    }
+}
+
+Store FindToolWindow::save() const
+{
+    Store s;
+    if (m_currentFilter && (m_filters.isEmpty() || m_filters.first() != m_currentFilter))
+        s.insert("CurrentFilter", m_currentFilter->id());
+    for (IFindFilter *filter : std::as_const(m_filters)) {
+        const Store store = filter->save();
+        if (!store.isEmpty())
+            s.insert(filter->id().toUtf8(), variantFromStore(store));
+    }
+    return s;
+}
+
 void FindToolWindow::writeSettings()
 {
     Utils::QtcSettings *settings = ICore::settings();
diff --git a/src/plugins/coreplugin/find/findtoolwindow.h b/src/plugins/coreplugin/find/findtoolwindow.h
index 91b045295a3..77226a6b435 100644
--- a/src/plugins/coreplugin/find/findtoolwindow.h
+++ b/src/plugins/coreplugin/find/findtoolwindow.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <utils/store.h>
+
 #include <QList>
 #include <QWidget>
 
@@ -33,6 +35,11 @@ public:
 
     void setFindText(const QString &text);
     void setCurrentFilter(IFindFilter *filter);
+
+    void restore(const Utils::Store &s);
+    Utils::Store save() const;
+
+    // TODO deprecated since QtC 14.0
     void readSettings();
     void writeSettings();
 
diff --git a/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp b/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp
index a88b8e4fba5..dc45883b91a 100644
--- a/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp
+++ b/src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp
@@ -193,7 +193,7 @@ void HighlightScrollBarOverlay::drawHighlights(QPainter *painter,
     for (const QMap<Utils::Theme::Color, QMap<int, int>> &colors : std::as_const(m_highlightCache)) {
         const auto itColorEnd = colors.constEnd();
         for (auto itColor = colors.constBegin(); itColor != itColorEnd; ++itColor) {
-            const QColor &color = creatorTheme()->color(itColor.key());
+            const QColor &color = creatorColor(itColor.key());
             const QMap<int, int> &positions = itColor.value();
             const auto itPosEnd = positions.constEnd();
             const auto firstPos = int(docStart / lineHeight);
diff --git a/src/plugins/coreplugin/find/ifindfilter.cpp b/src/plugins/coreplugin/find/ifindfilter.cpp
index 49a891e659f..eca6c4f2a91 100644
--- a/src/plugins/coreplugin/find/ifindfilter.cpp
+++ b/src/plugins/coreplugin/find/ifindfilter.cpp
@@ -6,6 +6,8 @@
 #include "../coreicons.h"
 #include "../coreplugintr.h"
 
+#include <utils/qtcsettings.h>
+
 #include <QApplication>
 #include <QKeySequence>
 #include <QPainter>
@@ -177,18 +179,6 @@ using namespace Utils;
     dialog. It will be reparented and deleted by the find plugin.
 */
 
-/*!
-    \fn void Core::IFindFilter::writeSettings(Utils::QtcSettings *settings)
-    Called at shutdown to write the state of the additional options
-    for this find filter to the \a settings.
-*/
-
-/*!
-    \fn void Core::IFindFilter::readSettings(Utils::QtcSettings *settings)
-    Called at startup to read the state of the additional options
-    for this find filter from the \a settings.
-*/
-
 /*!
     \fn void Core::IFindFilter::enabledChanged(bool enabled)
 
@@ -264,6 +254,60 @@ FindFlags IFindFilter::supportedFindFlags() const
          | FindWholeWords;
 }
 
+/*!
+    Returns a Store with the find filter's settings to store
+    in the session. Default values should not be saved.
+    The default implementation returns an empty store.
+
+    \sa restore()
+*/
+Store IFindFilter::save() const
+{
+    return {};
+}
+
+/*!
+    Restores the find filter's settings from the Store \a s.
+    Settings that are not present in the store should be reset to
+    the default.
+    The default implementation does nothing.
+
+    \sa save()
+*/
+void IFindFilter::restore([[maybe_unused]] const Utils::Store &s) {}
+
+/*!
+    Called at shutdown to write the state of the additional options
+    for this find filter to the \a settings.
+
+    \deprecated [14.0] Implement save() instead.
+*/
+void IFindFilter::writeSettings(Utils::QtcSettings *settings)
+{
+    settings->remove(settingsKey()); // make sure defaults are removed
+    storeToSettings(settingsKey(), settings, save());
+}
+
+/*!
+    Called at startup to read the state of the additional options
+    for this find filter from the \a settings.
+
+    \deprecated [14.0] Implement restore() instead.
+*/
+void IFindFilter::readSettings(Utils::QtcSettings *settings)
+{
+    restore(storeFromSettings(settingsKey(), settings));
+}
+
+/*!
+    \internal
+    \deprecated [14.0]
+*/
+QByteArray IFindFilter::settingsKey() const
+{
+    return id().toUtf8();
+}
+
 /*!
     Returns icons for the find flags \a flags.
 */
diff --git a/src/plugins/coreplugin/find/ifindfilter.h b/src/plugins/coreplugin/find/ifindfilter.h
index 2d6325eda01..a76dd2808f9 100644
--- a/src/plugins/coreplugin/find/ifindfilter.h
+++ b/src/plugins/coreplugin/find/ifindfilter.h
@@ -6,6 +6,7 @@
 #include "../core_global.h"
 
 #include <utils/filesearch.h>
+#include <utils/store.h>
 
 QT_BEGIN_NAMESPACE
 class QWidget;
@@ -42,8 +43,13 @@ public:
     { Q_UNUSED(txt) Q_UNUSED(findFlags) }
 
     virtual QWidget *createConfigWidget() { return nullptr; }
-    virtual void writeSettings(Utils::QtcSettings *settings) { Q_UNUSED(settings) }
-    virtual void readSettings(Utils::QtcSettings *settings) { Q_UNUSED(settings) }
+    virtual Utils::Store save() const;
+    virtual void restore(const Utils::Store &s);
+
+    // deprecated in 14.0
+    virtual void writeSettings(Utils::QtcSettings *settings);
+    virtual void readSettings(Utils::QtcSettings *settings);
+    virtual QByteArray settingsKey() const;
 
     static QPixmap pixmapForFindFlags(Utils::FindFlags flags);
     static QString descriptionForFindFlags(Utils::FindFlags flags);
diff --git a/src/plugins/coreplugin/find/searchresultwidget.cpp b/src/plugins/coreplugin/find/searchresultwidget.cpp
index c7827e6118e..e206fb3879c 100644
--- a/src/plugins/coreplugin/find/searchresultwidget.cpp
+++ b/src/plugins/coreplugin/find/searchresultwidget.cpp
@@ -67,8 +67,8 @@ SearchResultWidget::SearchResultWidget(QWidget *parent) :
 
     QFrame *topWidget = new QFrame;
     QPalette pal;
-    pal.setColor(QPalette::Window,     creatorTheme()->color(Theme::InfoBarBackground));
-    pal.setColor(QPalette::WindowText, creatorTheme()->color(Theme::InfoBarText));
+    pal.setColor(QPalette::Window,     creatorColor(Theme::InfoBarBackground));
+    pal.setColor(QPalette::WindowText, creatorColor(Theme::InfoBarText));
     topWidget->setPalette(pal);
     if (creatorTheme()->flag(Theme::DrawSearchResultWidgetFrame)) {
         topWidget->setFrameStyle(QFrame::Panel | QFrame::Raised);
diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp
index 71cfacbb402..1ff36dc8051 100644
--- a/src/plugins/coreplugin/generalsettings.cpp
+++ b/src/plugins/coreplugin/generalsettings.cpp
@@ -240,7 +240,7 @@ void GeneralSettingsWidget::fillLanguageBox() const
         if (hasQmFilesForLocale(locale, creatorTrPath.toString())) {
             QLocale tmpLocale(locale);
             QString languageItem = QLocale::languageToString(tmpLocale.language()) + QLatin1String(" (")
-                                   + QLocale::countryToString(tmpLocale.country()) + QLatin1Char(')');
+                                   + QLocale::territoryToString(tmpLocale.territory()) + QLatin1Char(')');
             m_languageBox->addItem(languageItem, locale);
             if (locale == currentLocale)
                 m_languageBox->setCurrentIndex(m_languageBox->count() - 1);
diff --git a/src/plugins/coreplugin/helpmanager.cpp b/src/plugins/coreplugin/helpmanager.cpp
index 01fc7eff478..9f694c28025 100644
--- a/src/plugins/coreplugin/helpmanager.cpp
+++ b/src/plugins/coreplugin/helpmanager.cpp
@@ -103,5 +103,11 @@ void setBlockedDocumentation(const QStringList &fileNames)
         m_instance->setBlockedDocumentation(fileNames);
 }
 
+void addOnlineHelpHandler(const OnlineHelpHandler &handler)
+{
+    if (checkInstance())
+        m_instance->addOnlineHelpHandler(handler);
+}
+
 } // HelpManager
 } // Core
diff --git a/src/plugins/coreplugin/helpmanager.h b/src/plugins/coreplugin/helpmanager.h
index 55d449e696b..2d24116d234 100644
--- a/src/plugins/coreplugin/helpmanager.h
+++ b/src/plugins/coreplugin/helpmanager.h
@@ -48,5 +48,11 @@ CORE_EXPORT QByteArray fileData(const QUrl &url);
 CORE_EXPORT void showHelpUrl(const QUrl &url, HelpViewerLocation location = HelpModeAlways);
 CORE_EXPORT void showHelpUrl(const QString &url, HelpViewerLocation location = HelpModeAlways);
 
+struct CORE_EXPORT OnlineHelpHandler {
+    std::function<bool(QUrl)> handlesUrl;
+    std::function<void(QUrl)> openUrl;
+};
+CORE_EXPORT void addOnlineHelpHandler(const OnlineHelpHandler &handler);
+
 } // HelpManager
 } // Core
diff --git a/src/plugins/coreplugin/helpmanager_implementation.h b/src/plugins/coreplugin/helpmanager_implementation.h
index 798a5a340ed..d3b097f1f82 100644
--- a/src/plugins/coreplugin/helpmanager_implementation.h
+++ b/src/plugins/coreplugin/helpmanager_implementation.h
@@ -23,6 +23,7 @@ public:
     virtual QMultiMap<QString, QUrl> linksForKeyword(const QString &keyword) = 0;
     virtual QByteArray fileData(const QUrl &url) = 0;
     virtual void showHelpUrl(const QUrl &url, HelpViewerLocation location = HelpModeAlways) = 0;
+    virtual void addOnlineHelpHandler(const OnlineHelpHandler &handler) = 0;
 };
 
 } // HelpManager
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index 1d2d2ea222b..2c8bbea1cfd 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -54,9 +54,9 @@
 #include <utils/checkablemessagebox.h>
 #include <utils/dropsupport.h>
 #include <utils/environment.h>
-#include <utils/fileutils.h>
 #include <utils/fsengine/fileiconprovider.h>
 #include <utils/fsengine/fsengine.h>
+#include <utils/guiutils.h>
 #include <utils/historycompleter.h>
 #include <utils/hostosinfo.h>
 #include <utils/mimeutils.h>
@@ -302,7 +302,6 @@ public:
     WindowSupport *m_windowSupport = nullptr;
     EditorManager *m_editorManager = nullptr;
     ExternalToolManager *m_externalToolManager = nullptr;
-    MessageManager *m_messageManager = nullptr;
     ProgressManagerPrivate *m_progressManager = nullptr;
     JsExpander *m_jsExpander = nullptr;
     VcsManager *m_vcsManager = nullptr;
@@ -315,7 +314,7 @@ public:
 
     QList<IContext *> m_activeContext;
 
-    std::unordered_map<QWidget *, IContext *> m_contextWidgets;
+    std::unordered_map<QWidget *, QList<IContext *>> m_contextWidgets;
 
     ShortcutSettings *m_shortcutSettings = nullptr;
     ToolSettings *m_toolSettings = nullptr;
@@ -398,7 +397,7 @@ ICore::ICore()
         QCoreApplication::exit(exitCode);
     });
 
-    Utils::FileUtils::setDialogParentGetter(&ICore::dialogParent);
+    Utils::setDialogParentGetter(&ICore::dialogParent);
 
     d->m_progressManager->init(); // needs the status bar manager
     MessageManager::init();
@@ -835,16 +834,18 @@ QString ICore::versionString()
 }
 
 /*!
-    Returns the top level IContext of the current context, or \c nullptr if
+    Returns a list IContexts for the current top level context widget, or an empty list if
     there is none.
 
     \sa updateAdditionalContexts()
     \sa addContextObject()
     \sa {The Action Manager and Commands}
 */
-IContext *ICore::currentContextObject()
+QList<IContext *> ICore::currentContextObjects()
 {
-    return d->m_activeContext.isEmpty() ? nullptr : d->m_activeContext.first();
+    if (d->m_activeContext.isEmpty())
+        return {};
+    return d->m_contextWidgets[d->m_activeContext.first()->widget()];
 }
 
 /*!
@@ -855,8 +856,7 @@ IContext *ICore::currentContextObject()
 */
 QWidget *ICore::currentContextWidget()
 {
-    IContext *context = currentContextObject();
-    return context ? context->widget() : nullptr;
+    return d->m_activeContext.isEmpty() ? nullptr : d->m_activeContext.first()->widget();
 }
 
 /*!
@@ -1069,6 +1069,8 @@ QString uiConfigInformation()
     QTC_ADD_UIELEMENT_FONT(Body2);
     QTC_ADD_UIELEMENT_FONT(ButtonMedium);
     QTC_ADD_UIELEMENT_FONT(ButtonSmall);
+    QTC_ADD_UIELEMENT_FONT(LabelMedium);
+    QTC_ADD_UIELEMENT_FONT(LabelSmall);
     QTC_ADD_UIELEMENT_FONT(CaptionStrong);
     QTC_ADD_UIELEMENT_FONT(Caption);
     QTC_ADD_UIELEMENT_FONT(IconStandard);
@@ -1405,7 +1407,6 @@ void ICorePrivate::init()
     m_rightNavigationWidget = new NavigationWidget(m_toggleRightSideBarAction, Side::Right);
     m_rightPaneWidget = new RightPaneWidget();
 
-    m_messageManager = new MessageManager;
     m_editorManager = new EditorManager(this);
     m_externalToolManager = new ExternalToolManager();
 
@@ -1464,8 +1465,7 @@ ICorePrivate::~ICorePrivate()
 
     delete m_externalToolManager;
     m_externalToolManager = nullptr;
-    delete m_messageManager;
-    m_messageManager = nullptr;
+    MessageManager::destroy();
     delete m_shortcutSettings;
     m_shortcutSettings = nullptr;
     delete m_toolSettings;
@@ -1534,8 +1534,10 @@ void ICore::extensionsInitialized()
 void ICore::aboutToShutdown()
 {
     disconnect(qApp, &QApplication::focusChanged, d, &ICorePrivate::updateFocusWidget);
-    for (auto contextPair : d->m_contextWidgets)
-        disconnect(contextPair.second, &QObject::destroyed, d->m_mainwindow, nullptr);
+    for (auto contextsPair : d->m_contextWidgets) {
+        for (auto context : contextsPair.second)
+            disconnect(context, &QObject::destroyed, d->m_mainwindow, nullptr);
+    }
     d->m_activeContext.clear();
     d->m_mainwindow->hide();
 }
@@ -1638,6 +1640,7 @@ void ICorePrivate::registerDefaultContainers()
     filemenu->menu()->setTitle(Tr::tr("&File"));
     filemenu->appendGroup(Constants::G_FILE_NEW);
     filemenu->appendGroup(Constants::G_FILE_OPEN);
+    filemenu->appendGroup(Constants::G_FILE_RECENT);
     filemenu->appendGroup(Constants::G_FILE_SESSION);
     filemenu->appendGroup(Constants::G_FILE_PROJECT);
     filemenu->appendGroup(Constants::G_FILE_SAVE);
@@ -1794,7 +1797,7 @@ void ICorePrivate::registerDefaultActions()
 
     // File->Recent Files Menu
     ActionContainer *ac = ActionManager::createMenu(Constants::M_FILE_RECENTFILES);
-    mfile->addMenu(ac, Constants::G_FILE_OPEN);
+    mfile->addMenu(ac, Constants::G_FILE_RECENT);
     ac->menu()->setTitle(Tr::tr("Recent &Files"));
     ac->setOnAllDisabledBehavior(ActionContainer::Show);
 
@@ -2290,13 +2293,14 @@ void ICore::openFileWith()
 }
 
 /*!
-    Returns the registered IContext instance for the specified \a widget,
+    Returns all registered IContext instance for the specified \a widget,
     if any.
 */
-IContext *ICore::contextObject(QWidget *widget)
+QList<IContext *> ICore::contextObjects(QWidget *widget)
 {
-    const auto it = d->m_contextWidgets.find(widget);
-    return it == d->m_contextWidgets.end() ? nullptr : it->second;
+    if (auto it = d->m_contextWidgets.find(widget); it != d->m_contextWidgets.end())
+        return it->second;
+    return {};
 }
 
 /*!
@@ -2315,11 +2319,7 @@ void ICore::addContextObject(IContext *context)
 {
     if (!context)
         return;
-    QWidget *widget = context->widget();
-    if (d->m_contextWidgets.find(widget) != d->m_contextWidgets.end())
-        return;
-
-    d->m_contextWidgets.insert({widget, context});
+    d->m_contextWidgets[context->widget()].append(context);
     connect(context, &QObject::destroyed, m_core, [context] { removeContextObject(context); });
 }
 
@@ -2340,15 +2340,19 @@ void ICore::removeContextObject(IContext *context)
 
     disconnect(context, &QObject::destroyed, m_core, nullptr);
 
-    const auto it = std::find_if(d->m_contextWidgets.cbegin(),
-                                 d->m_contextWidgets.cend(),
-                                 [context](const std::pair<QWidget *, IContext *> &v) {
-                                     return v.second == context;
-                                 });
-    if (it == d->m_contextWidgets.cend())
+    auto it = std::find_if(
+        d->m_contextWidgets.begin(),
+        d->m_contextWidgets.end(),
+        [context](const std::pair<QWidget *, QList<IContext *>> &v) {
+            return v.second.contains(context);
+        });
+    if (it == d->m_contextWidgets.end())
         return;
 
-    d->m_contextWidgets.erase(it);
+    it->second.removeAll(context);
+    if (it->second.isEmpty())
+        d->m_contextWidgets.erase(it);
+
     if (d->m_activeContext.removeAll(context) > 0)
         d->updateContextObject(d->m_activeContext);
 }
@@ -2364,15 +2368,8 @@ void ICorePrivate::updateFocusWidget(QWidget *old, QWidget *now)
         return;
 
     QList<IContext *> newContext;
-    if (QWidget *p = QApplication::focusWidget()) {
-        IContext *context = nullptr;
-        while (p) {
-            context = ICore::contextObject(p);
-            if (context)
-                newContext.append(context);
-            p = p->parentWidget();
-        }
-    }
+    for (QWidget *p = QApplication::focusWidget(); p; p = p->parentWidget())
+        newContext.append(ICore::contextObjects(p));
 
     // ignore toplevels that define no context, like popups without parent
     if (!newContext.isEmpty() || QApplication::focusWidget() == m_mainwindow->focusWidget())
diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h
index 378a1663e7d..74a59e8c808 100644
--- a/src/plugins/coreplugin/icore.h
+++ b/src/plugins/coreplugin/icore.h
@@ -87,9 +87,9 @@ public:
     static void raiseWindow(QWidget *widget);
     static void raiseMainWindow();
 
-    static IContext *currentContextObject();
+    static QList<IContext *> currentContextObjects();
     static QWidget *currentContextWidget();
-    static IContext *contextObject(QWidget *widget);
+    static QList<IContext *> contextObjects(QWidget *widget);
     static void updateAdditionalContexts(const Context &remove, const Context &add,
                                          ContextPriority priority = ContextPriority::Low);
     static void addAdditionalContext(const Context &context,
diff --git a/src/plugins/coreplugin/images/mode_design_mask.png b/src/plugins/coreplugin/images/mode_design_mask.png
index 42013edf352..2cd54a4c0c4 100644
Binary files a/src/plugins/coreplugin/images/mode_design_mask.png and b/src/plugins/coreplugin/images/mode_design_mask.png differ
diff --git a/src/plugins/coreplugin/images/mode_design_mask@2x.png b/src/plugins/coreplugin/images/mode_design_mask@2x.png
index 2aef9018a8a..a52d6274f0c 100644
Binary files a/src/plugins/coreplugin/images/mode_design_mask@2x.png and b/src/plugins/coreplugin/images/mode_design_mask@2x.png differ
diff --git a/src/plugins/coreplugin/images/mode_edit_mask.png b/src/plugins/coreplugin/images/mode_edit_mask.png
index 51197249c0a..b2a455b77b2 100644
Binary files a/src/plugins/coreplugin/images/mode_edit_mask.png and b/src/plugins/coreplugin/images/mode_edit_mask.png differ
diff --git a/src/plugins/coreplugin/images/mode_edit_mask@2x.png b/src/plugins/coreplugin/images/mode_edit_mask@2x.png
index 389ac6dc4e3..28bfd901983 100644
Binary files a/src/plugins/coreplugin/images/mode_edit_mask@2x.png and b/src/plugins/coreplugin/images/mode_edit_mask@2x.png differ
diff --git a/src/plugins/coreplugin/iwizardfactory.cpp b/src/plugins/coreplugin/iwizardfactory.cpp
index 09e551b2157..544c25a17e1 100644
--- a/src/plugins/coreplugin/iwizardfactory.cpp
+++ b/src/plugins/coreplugin/iwizardfactory.cpp
@@ -127,6 +127,7 @@ QAction *s_inspectWizardAction = nullptr;
 bool s_areFactoriesLoaded = false;
 bool s_isWizardRunning = false;
 QWidget *s_currentWizard = nullptr;
+static QSet<Id> s_plugins;
 
 // NewItemDialog reopening data:
 class NewItemDialogData
@@ -385,8 +386,7 @@ void IWizardFactory::destroyFeatureProvider()
 
 void IWizardFactory::clearWizardFactories()
 {
-    if (!s_areFactoriesLoaded)
-        return;
+    s_plugins.clear();
 
     for (IWizardFactory *factory : std::as_const(s_allFactories))
         ActionManager::unregisterAction(factory->m_action, actionId(factory));
@@ -399,16 +399,15 @@ void IWizardFactory::clearWizardFactories()
 
 QSet<Id> IWizardFactory::pluginFeatures()
 {
-    static QSet<Id> plugins;
-    if (plugins.isEmpty()) {
+    if (s_plugins.isEmpty()) {
         // Implicitly create a feature for each plugin loaded:
-        const QVector<ExtensionSystem::PluginSpec *> pluginVector = ExtensionSystem::PluginManager::plugins();
+        const ExtensionSystem::PluginSpecs pluginVector = ExtensionSystem::PluginManager::plugins();
         for (const ExtensionSystem::PluginSpec *s : pluginVector) {
             if (s->state() == ExtensionSystem::PluginSpec::Running)
-                plugins.insert(Id::fromString(s->name()));
+                s_plugins.insert(Id::fromString(s->name()));
         }
     }
-    return plugins;
+    return s_plugins;
 }
 
 QSet<Id> IWizardFactory::availableFeatures(Id platformId)
@@ -465,7 +464,7 @@ static QIcon iconWithText(const QIcon &icon, const QString &text)
         font.setPixelSize(fontSize);
         font.setStretch(85);
         QPainter p(&pixmap);
-        p.setPen(Utils::creatorTheme()->color(Theme::PanelTextColorDark));
+        p.setPen(Utils::creatorColor(Theme::PanelTextColorDark));
         p.setFont(font);
         QTextOption textOption(Qt::AlignHCenter | Qt::AlignBottom);
         textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
diff --git a/src/plugins/coreplugin/locator/directoryfilter.cpp b/src/plugins/coreplugin/locator/directoryfilter.cpp
index 8d0c3c85fd7..23b853682d3 100644
--- a/src/plugins/coreplugin/locator/directoryfilter.cpp
+++ b/src/plugins/coreplugin/locator/directoryfilter.cpp
@@ -6,8 +6,6 @@
 #include "locator.h"
 #include "../coreplugintr.h"
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/algorithm.h>
 #include <utils/async.h>
 #include <utils/fileutils.h>
@@ -41,7 +39,7 @@ const char kFilesKey[] = "files";
 const char kExclusionFiltersKey[] = "exclusionFilters";
 
 const QStringList kFiltersDefault = {"*.h", "*.cpp", "*.ui", "*.qrc"};
-const QStringList kExclusionFiltersDefault = {"*/.git/*", "*/.cvs/*", "*/.svn/*"};
+const QStringList kExclusionFiltersDefault = {"*/.git/*", "*/.cvs/*", "*/.svn/*", "*/build/*"};
 
 static QString defaultDisplayName()
 {
@@ -89,7 +87,6 @@ DirectoryFilter::DirectoryFilter(Id id)
         return SetupResult::StopWithSuccess; // Group stops, skips async task
     };
     const auto onSetup = [this](Async<FilePaths> &async) {
-        async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
         async.setConcurrentCallData(&refresh, m_directories, m_filters, m_exclusionFilters,
                                     displayName());
     };
@@ -150,42 +147,6 @@ void DirectoryFilter::restoreState(const QJsonObject &object)
             .toArray(QJsonArray::fromStringList(kExclusionFiltersDefault)));
 }
 
-void DirectoryFilter::restoreState(const QByteArray &state)
-{
-    if (isOldSetting(state)) {
-        // TODO read old settings, remove some time after Qt Creator 4.15
-        QString name;
-        QStringList directories;
-        QString shortcut;
-        bool defaultFilter;
-        QStringList files;
-
-        QDataStream in(state);
-        in >> name;
-        in >> directories;
-        in >> m_filters;
-        in >> shortcut;
-        in >> defaultFilter;
-        in >> files;
-        m_cache.setFilePaths(FileUtils::toFilePathList(files));
-        if (!in.atEnd()) // Qt Creator 4.3 and later
-            in >> m_exclusionFilters;
-        else
-            m_exclusionFilters.clear();
-
-        if (m_isCustomFilter) {
-            m_directories = Utils::transform(directories, [](const QString &d) {
-                return FilePath::fromString(d);
-            });
-        }
-        setDisplayName(name);
-        setShortcutString(shortcut);
-        setIncludedByDefault(defaultFilter);
-    } else {
-        ILocatorFilter::restoreState(state);
-    }
-}
-
 class DirectoryFilterOptions : public QDialog
 {
 public:
diff --git a/src/plugins/coreplugin/locator/directoryfilter.h b/src/plugins/coreplugin/locator/directoryfilter.h
index 452a1b20e75..8300d03d464 100644
--- a/src/plugins/coreplugin/locator/directoryfilter.h
+++ b/src/plugins/coreplugin/locator/directoryfilter.h
@@ -12,7 +12,6 @@ class CORE_EXPORT DirectoryFilter : public ILocatorFilter
 {
 public:
     DirectoryFilter(Utils::Id id);
-    void restoreState(const QByteArray &state) override;
     bool openConfigDialog(QWidget *parent, bool &needsRefresh) override;
 
 protected:
diff --git a/src/plugins/coreplugin/locator/filesystemfilter.cpp b/src/plugins/coreplugin/locator/filesystemfilter.cpp
index 00890829b45..6b484635e40 100644
--- a/src/plugins/coreplugin/locator/filesystemfilter.cpp
+++ b/src/plugins/coreplugin/locator/filesystemfilter.cpp
@@ -10,8 +10,6 @@
 #include "../vcsmanager.h"
 #include "locatormanager.h"
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/algorithm.h>
 #include <utils/async.h>
 #include <utils/checkablemessagebox.h>
@@ -312,7 +310,6 @@ LocatorMatcherTasks FileSystemFilter::matchers()
 
     const auto onSetup = [storage, includeHidden = m_includeHidden, shortcut = shortcutString()]
         (Async<void> &async) {
-        async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
         async.setConcurrentCallData(matches, *storage, shortcut,
                                     DocumentManager::fileDialogInitialDirectory(), includeHidden);
     };
@@ -392,25 +389,4 @@ void FileSystemFilter::restoreState(const QJsonObject &object)
     m_includeHidden = object.value(kIncludeHiddenKey).toBool(s_includeHiddenDefault);
 }
 
-void FileSystemFilter::restoreState(const QByteArray &state)
-{
-    if (isOldSetting(state)) {
-        // TODO read old settings, remove some time after Qt Creator 4.15
-        QDataStream in(state);
-        in >> m_includeHidden;
-
-        // An attempt to prevent setting this on old configuration
-        if (!in.atEnd()) {
-            QString shortcut;
-            bool defaultFilter;
-            in >> shortcut;
-            in >> defaultFilter;
-            setShortcutString(shortcut);
-            setIncludedByDefault(defaultFilter);
-        }
-    } else {
-        ILocatorFilter::restoreState(state);
-    }
-}
-
 } // namespace Core::Internal
diff --git a/src/plugins/coreplugin/locator/filesystemfilter.h b/src/plugins/coreplugin/locator/filesystemfilter.h
index 3dfac11b3a5..74198ec9aea 100644
--- a/src/plugins/coreplugin/locator/filesystemfilter.h
+++ b/src/plugins/coreplugin/locator/filesystemfilter.h
@@ -11,7 +11,6 @@ class FileSystemFilter : public ILocatorFilter
 {
 public:
     FileSystemFilter();
-    void restoreState(const QByteArray &state) final;
     bool openConfigDialog(QWidget *parent, bool &needsRefresh) final;
 
 protected:
diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.cpp b/src/plugins/coreplugin/locator/ilocatorfilter.cpp
index e9a999d536d..6a32b294a3d 100644
--- a/src/plugins/coreplugin/locator/ilocatorfilter.cpp
+++ b/src/plugins/coreplugin/locator/ilocatorfilter.cpp
@@ -5,8 +5,6 @@
 
 #include "../coreplugintr.h"
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <solutions/tasking/tasktreerunner.h>
 
 #include <utils/algorithm.h>
@@ -239,98 +237,6 @@ private:
     QList<std::optional<LocatorFilterEntries>> m_outputData;
 };
 
-// This instance of this object is created by LocatorMatcher tree.
-// It starts a separate thread which collects and deduplicates the results reported
-// by LocatorStorage instances. The ResultsCollector is started as a first task in
-// LocatorMatcher and runs in parallel to all the filters started by LocatorMatcher.
-// When all the results are reported (the expected number of reports is set with setFilterCount()),
-// the ResultsCollector finishes. The intermediate results are reported with
-// serialOutputDataReady() signal.
-// The object of ResultsCollector is registered in Tasking namespace under the
-// ResultsCollectorTask name.
-class ResultsCollector : public QObject
-{
-    Q_OBJECT
-
-public:
-    ~ResultsCollector();
-    void setFilterCount(int count);
-    void start();
-
-    bool isRunning() const { return m_watcher.get(); }
-
-    std::shared_ptr<ResultsDeduplicator> deduplicator() const { return m_deduplicator; }
-
-signals:
-    void serialOutputDataReady(const LocatorFilterEntries &serialOutputData);
-    void done();
-
-private:
-    int m_filterCount = 0;
-    std::unique_ptr<QFutureWatcher<LocatorFilterEntries>> m_watcher;
-    std::shared_ptr<ResultsDeduplicator> m_deduplicator;
-};
-
-ResultsCollector::~ResultsCollector()
-{
-    if (!isRunning())
-        return;
-
-    m_deduplicator->cancel();
-    if (ExtensionSystem::PluginManager::futureSynchronizer()) {
-        ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(m_watcher->future());
-        return;
-    }
-    m_watcher->future().waitForFinished();
-}
-
-void ResultsCollector::setFilterCount(int count)
-{
-    QTC_ASSERT(!isRunning(), return);
-    QTC_ASSERT(count >= 0, return);
-
-    m_filterCount = count;
-}
-
-void ResultsCollector::start()
-{
-    QTC_ASSERT(!m_watcher, return);
-    QTC_ASSERT(!isRunning(), return);
-    if (m_filterCount == 0) {
-        emit done();
-        return;
-    }
-
-    m_deduplicator.reset(new ResultsDeduplicator(m_filterCount));
-    m_watcher.reset(new QFutureWatcher<LocatorFilterEntries>);
-    connect(m_watcher.get(), &QFutureWatcherBase::resultReadyAt, this, [this](int index) {
-        emit serialOutputDataReady(m_watcher->resultAt(index));
-    });
-    connect(m_watcher.get(), &QFutureWatcherBase::finished, this, [this] {
-        emit done();
-        m_watcher.release()->deleteLater();
-        m_deduplicator.reset();
-    });
-
-    // TODO: When filterCount == 1, deliver results directly and finish?
-    auto deduplicate = [](QPromise<LocatorFilterEntries> &promise,
-                          const std::shared_ptr<ResultsDeduplicator> &deduplicator) {
-        deduplicator->run(promise);
-    };
-    m_watcher->setFuture(Utils::asyncRun(deduplicate, m_deduplicator));
-}
-
-class ResultsCollectorTaskAdapter : public TaskAdapter<ResultsCollector>
-{
-public:
-    ResultsCollectorTaskAdapter() {
-        connect(task(), &ResultsCollector::done, this, [this] { emit done(DoneResult::Success); });
-    }
-    void start() final { task()->start(); }
-};
-
-using ResultsCollectorTask = CustomTask<ResultsCollectorTaskAdapter>;
-
 class LocatorStoragePrivate
 {
 public:
@@ -427,58 +333,60 @@ void LocatorMatcher::start()
     QTC_ASSERT(!isRunning(), return);
     d->m_output = {};
 
-    struct CollectorStorage
-    {
-        ResultsCollector *m_collector = nullptr;
-    };
-    Storage<CollectorStorage> collectorStorage;
-
     const int filterCount = d->m_tasks.size();
-    const auto onCollectorSetup = [this, filterCount, collectorStorage](ResultsCollector &collector) {
-        collectorStorage->m_collector = &collector;
-        collector.setFilterCount(filterCount);
-        connect(&collector, &ResultsCollector::serialOutputDataReady,
-                this, [this](const LocatorFilterEntries &serialOutputData) {
+    if (filterCount <= 0)
+        return;
+
+    struct ResultsCollector
+    {
+        ~ResultsCollector() {
+            if (m_deduplicator)
+                m_deduplicator->cancel();
+        }
+        std::shared_ptr<ResultsDeduplicator> m_deduplicator;
+    };
+
+    const Storage<ResultsCollector> collectorStorage;
+    const LoopList iterator(d->m_tasks);
+
+    const auto onCollectorSetup = [this, filterCount, collectorStorage](
+                                      Async<LocatorFilterEntries> &async) {
+        const std::shared_ptr<ResultsDeduplicator> deduplicator(new ResultsDeduplicator(filterCount));
+        collectorStorage->m_deduplicator = deduplicator;
+        Async<LocatorFilterEntries> *asyncPtr = &async;
+        connect(asyncPtr, &AsyncBase::resultReadyAt, this, [this, asyncPtr](int index) {
+            const LocatorFilterEntries serialOutputData = asyncPtr->resultAt(index);
             d->m_output += serialOutputData;
             emit serialOutputDataReady(serialOutputData);
         });
+        // TODO: When filterCount == 1, deliver results directly and finish?
+        async.setConcurrentCallData(&ResultsDeduplicator::run, deduplicator);
     };
-    const auto onCollectorDone = [collectorStorage] {
-        collectorStorage->m_collector = nullptr;
-    };
+    const auto onCollectorDone = [collectorStorage] { collectorStorage->m_deduplicator->cancel(); };
 
-    QList<GroupItem> parallelTasks {parallelLimit(d->m_parallelLimit)};
-
-    const auto onSetup = [this, collectorStorage](const Storage<LocatorStorage> &storage,
-                                                    int index) {
-        return [this, collectorStorage, storage, index] {
-            ResultsCollector *collector = collectorStorage->m_collector;
-            QTC_ASSERT(collector, return);
-            *storage = std::make_shared<LocatorStoragePrivate>(d->m_input, index,
-                                                               collector->deduplicator());
+    const auto onTaskTreeSetup = [iterator, input = d->m_input, collectorStorage](TaskTree &taskTree) {
+        const std::shared_ptr<ResultsDeduplicator> deduplicator = collectorStorage->m_deduplicator;
+        const Storage<LocatorStorage> storage = iterator->storage;
+        const auto onSetup = [storage, input, index = iterator.iteration(), deduplicator] {
+            *storage = std::make_shared<LocatorStoragePrivate>(input, index, deduplicator);
         };
-    };
-
-    int index = 0;
-    for (const LocatorMatcherTask &task : std::as_const(d->m_tasks)) {
-        const auto storage = task.storage;
-        const Group group {
+        taskTree.setRecipe({
             finishAllAndSuccess,
             storage,
-            onGroupSetup(onSetup(storage, index)),
-            onGroupDone([storage] { storage->finalize(); }),
-            task.task
-        };
-        parallelTasks << group;
-        ++index;
-    }
+            onGroupSetup(onSetup),
+            iterator->task,
+            onGroupDone([storage] { storage->finalize(); })
+        });
+    };
 
     const Group root {
         parallel,
         collectorStorage,
-        ResultsCollectorTask(onCollectorSetup, onCollectorDone),
+        AsyncTask<LocatorFilterEntries>(onCollectorSetup, onCollectorDone),
         Group {
-            parallelTasks
+            parallelLimit(d->m_parallelLimit),
+            iterator,
+            TaskTreeTask(onTaskTreeSetup)
         }
     };
     d->m_taskTreeRunner.start(root, {}, [this](DoneWith result) {
@@ -671,15 +579,6 @@ void ILocatorFilter::restoreState(const QByteArray &state)
         setShortcutString(obj.value(kShortcutStringKey).toString(m_defaultShortcut));
         setIncludedByDefault(obj.value(kIncludedByDefaultKey).toBool(m_defaultIncludedByDefault));
         restoreState(obj);
-    } else {
-        // TODO read old settings, remove some time after Qt Creator 4.15
-        m_shortcut = m_defaultShortcut;
-        m_includedByDefault = m_defaultIncludedByDefault;
-
-        // TODO this reads legacy settings from Qt Creator < 4.15
-        QDataStream in(state);
-        in >> m_shortcut;
-        in >> m_includedByDefault;
     }
 }
 
@@ -1060,17 +959,6 @@ void ILocatorFilter::restoreState(const QJsonObject &object)
     Q_UNUSED(object)
 }
 
-/*!
-    Returns if \a state must be restored via pre-4.15 settings reading.
-*/
-bool ILocatorFilter::isOldSetting(const QByteArray &state)
-{
-    if (state.isEmpty())
-        return false;
-    const QJsonDocument doc = QJsonDocument::fromJson(state);
-    return !doc.isObject();
-}
-
 /*!
     \enum Core::ILocatorFilter::Priority
 
@@ -1484,7 +1372,6 @@ LocatorMatcherTask LocatorFileCache::matcher() const
                                              // no provider is set or it returned empty generator
         that->bumpExecutionId();
 
-        async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
         async.setConcurrentCallData(&filter, *storage, *that);
         return SetupResult::Continue;
     };
@@ -1509,5 +1396,3 @@ LocatorMatcherTask LocatorFileCache::matcher() const
 }
 
 } // Core
-
-#include "ilocatorfilter.moc"
diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.h b/src/plugins/coreplugin/locator/ilocatorfilter.h
index 4a4bcc5c0e3..368f0313814 100644
--- a/src/plugins/coreplugin/locator/ilocatorfilter.h
+++ b/src/plugins/coreplugin/locator/ilocatorfilter.h
@@ -226,8 +226,8 @@ public:
     std::optional<QString> defaultSearchText() const;
     void setDefaultSearchText(const QString &defaultSearchText);
 
-    virtual QByteArray saveState() const;
-    virtual void restoreState(const QByteArray &state);
+    QByteArray saveState() const;
+    void restoreState(const QByteArray &state);
 
     virtual bool openConfigDialog(QWidget *parent, bool &needsRefresh);
     bool isConfigurable() const;
@@ -272,8 +272,6 @@ protected:
     void setRefreshRecipe(const std::optional<Tasking::GroupItem> &recipe);
     std::optional<Tasking::GroupItem> refreshRecipe() const;
 
-    static bool isOldSetting(const QByteArray &state);
-
 private:
     virtual LocatorMatcherTasks matchers() = 0;
 
diff --git a/src/plugins/coreplugin/locator/locator.cpp b/src/plugins/coreplugin/locator/locator.cpp
index 55aa984c08d..563a1d6010c 100644
--- a/src/plugins/coreplugin/locator/locator.cpp
+++ b/src/plugins/coreplugin/locator/locator.cpp
@@ -166,6 +166,7 @@ void Locator::loadSettings()
     const Settings def;
     DB::beginGroup(settingsGroup);
     m_refreshTimer.setInterval(minutes(DB::value("RefreshInterval", 60).toInt()));
+    m_relativePaths = DB::value("RelativePaths", false).toBool();
     m_settings.useCenteredPopup = DB::value(kUseCenteredPopup, def.useCenteredPopup).toBool();
 
     for (ILocatorFilter *filter : std::as_const(m_filters)) {
@@ -294,6 +295,7 @@ void Locator::saveSettings() const
     DB::beginGroup("Locator");
     DB::remove(QString());
     DB::setValue("RefreshInterval", refreshInterval());
+    DB::setValue("RelativePaths", relativePaths());
     DB::setValueWithDefault(kUseCenteredPopup, m_settings.useCenteredPopup, def.useCenteredPopup);
     for (ILocatorFilter *filter : m_filters) {
         if (!m_customFilters.contains(filter) && filter->id().isValid()) {
@@ -363,6 +365,16 @@ void Locator::setRefreshInterval(int interval)
     m_refreshTimer.start();
 }
 
+bool Locator::relativePaths() const
+{
+    return m_relativePaths;
+}
+
+void Locator::setRelativePaths(bool use)
+{
+    m_relativePaths = use;
+}
+
 bool Locator::useCenteredPopupForShortcut()
 {
     return m_instance->m_settings.useCenteredPopup;
diff --git a/src/plugins/coreplugin/locator/locator.h b/src/plugins/coreplugin/locator/locator.h
index cee26782a6f..6cc69c6f9a6 100644
--- a/src/plugins/coreplugin/locator/locator.h
+++ b/src/plugins/coreplugin/locator/locator.h
@@ -40,6 +40,8 @@ public:
     void setCustomFilters(QList<ILocatorFilter *> f);
     int refreshInterval() const;
     void setRefreshInterval(int interval);
+    bool relativePaths() const;
+    void setRelativePaths(bool use);
 
     static bool useCenteredPopupForShortcut();
     static void setUseCenteredPopupForShortcut(bool center);
@@ -73,6 +75,7 @@ private:
     QTimer m_refreshTimer;
     Tasking::TaskTreeRunner m_taskTreeRunner;
     QList<ILocatorFilter *> m_refreshingFilters;
+    bool m_relativePaths = false;
 };
 
 } // namespace Internal
diff --git a/src/plugins/coreplugin/locator/locatorsettingspage.cpp b/src/plugins/coreplugin/locator/locatorsettingspage.cpp
index 8f549cb1138..dffe60501c4 100644
--- a/src/plugins/coreplugin/locator/locatorsettingspage.cpp
+++ b/src/plugins/coreplugin/locator/locatorsettingspage.cpp
@@ -21,6 +21,7 @@
 #include <utils/treemodel.h>
 
 #include <QAbstractTextDocumentLayout>
+#include <QCheckBox>
 #include <QHash>
 #include <QHeaderView>
 #include <QLabel>
@@ -213,21 +214,13 @@ void RichTextDelegate::paint(QPainter *painter,
     m_doc.setHtml(options.text);
     m_doc.setTextWidth(options.rect.width());
     options.text = "";
-    options.widget->style()->drawControl(QStyle::CE_ItemViewItem, &options, painter);
+    options.widget->style()->drawControl(QStyle::CE_ItemViewItem, &options, painter, options.widget);
     painter->translate(options.rect.left(), options.rect.top());
     QRect clip(0, 0, options.rect.width(), options.rect.height());
     QAbstractTextDocumentLayout::PaintContext paintContext;
     paintContext.palette = options.palette;
     painter->setClipRect(clip);
     paintContext.clip = clip;
-    if (qobject_cast<const QAbstractItemView *>(options.widget)->selectionModel()->isSelected(index)) {
-        QAbstractTextDocumentLayout::Selection selection;
-        selection.cursor = QTextCursor(&m_doc);
-        selection.cursor.select(QTextCursor::Document);
-        selection.format.setBackground(options.palette.brush(QPalette::Highlight));
-        selection.format.setForeground(options.palette.brush(QPalette::HighlightedText));
-        paintContext.selections << selection;
-    }
     m_doc.documentLayout()->draw(painter, paintContext);
     painter->restore();
 }
@@ -273,6 +266,10 @@ public:
         m_refreshInterval->setSingleStep(5);
         m_refreshInterval->setValue(60);
 
+        m_relativePaths = new QCheckBox(Tr::tr("Show Paths in Relation to Active Project"));
+        m_relativePaths->setToolTip(
+            Tr::tr("Locator filters show relative paths to the active project when possible."));
+
         auto filterEdit = new FancyLineEdit;
         filterEdit->setFiltering(true);
 
@@ -315,13 +312,14 @@ public:
 
         Column buttons{addButton, m_removeButton, m_editButton, st};
 
-        Grid{filterEdit,
-             br,
-             m_filterList,
-             buttons,
-             br,
-             Span(2, Row{refreshIntervalLabel, m_refreshInterval, st})}
-            .attachTo(this);
+        // clang-format off
+        Grid {
+            filterEdit, br,
+            m_filterList, buttons, br,
+            Span(2, Row{refreshIntervalLabel, m_refreshInterval, st}), br,
+            Span(2, Row{m_relativePaths, st})
+        }.attachTo(this);
+        // clang-format on
 
         connect(filterEdit, &FancyLineEdit::filterChanged, this, &LocatorSettingsWidget::setFilter);
         connect(m_filterList->selectionModel(),
@@ -355,6 +353,7 @@ public:
         addButton->setMenu(addMenu);
 
         m_refreshInterval->setValue(m_plugin->refreshInterval());
+        m_relativePaths->setChecked(m_plugin->relativePaths());
         saveFilterStates();
     }
 
@@ -376,6 +375,7 @@ private:
     QPushButton *m_removeButton;
     QPushButton *m_editButton;
     QSpinBox *m_refreshInterval;
+    QCheckBox *m_relativePaths;
     Locator *m_plugin = nullptr;
     Utils::TreeModel<> *m_model = nullptr;
     QSortFilterProxyModel *m_proxyModel = nullptr;
@@ -399,6 +399,7 @@ void LocatorSettingsWidget::apply()
     m_plugin->setFilters(m_filters);
     m_plugin->setCustomFilters(m_customFilters);
     m_plugin->setRefreshInterval(m_refreshInterval->value());
+    m_plugin->setRelativePaths(m_relativePaths->isChecked());
     requestRefresh();
     m_plugin->saveSettings();
     saveFilterStates();
diff --git a/src/plugins/coreplugin/locator/locatorwidget.cpp b/src/plugins/coreplugin/locator/locatorwidget.cpp
index 6b008ccc13a..c5444344a69 100644
--- a/src/plugins/coreplugin/locator/locatorwidget.cpp
+++ b/src/plugins/coreplugin/locator/locatorwidget.cpp
@@ -57,8 +57,8 @@ public:
 
     LocatorModel(QObject *parent = nullptr)
         : QAbstractListModel(parent)
-        , m_backgroundColor(Utils::creatorTheme()->color(Theme::TextColorHighlightBackground))
-        , m_foregroundColor(Utils::creatorTheme()->color(Theme::TextColorNormal))
+        , m_backgroundColor(Utils::creatorColor(Theme::TextColorHighlightBackground))
+        , m_foregroundColor(Utils::creatorColor(Theme::TextColorNormal))
     {}
 
     void clear();
@@ -162,8 +162,13 @@ QVariant LocatorModel::data(const QModelIndex &index, int role) const
     case Qt::DisplayRole:
         if (index.column() == DisplayNameColumn)
             return m_entries.at(index.row()).displayName;
-        else if (index.column() == ExtraInfoColumn)
-            return m_entries.at(index.row()).extraInfo;
+        if (index.column() == ExtraInfoColumn) {
+            if (Locator::instance()->relativePaths()) {
+                return ICore::pathRelativeToActiveProject(FilePath::fromUserInput(m_entries.at(index.row()).extraInfo)).toUserOutput();
+            } else {
+                return m_entries.at(index.row()).extraInfo;
+            }
+        }
         break;
     case Qt::ToolTipRole: {
         const LocatorFilterEntry &entry = m_entries.at(index.row());
diff --git a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp b/src/plugins/coreplugin/locator/opendocumentsfilter.cpp
index 719de23098b..ede24d5b892 100644
--- a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp
+++ b/src/plugins/coreplugin/locator/opendocumentsfilter.cpp
@@ -6,8 +6,6 @@
 #include "../coreplugintr.h"
 #include "../editormanager/documentmodel.h"
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/algorithm.h>
 #include <utils/async.h>
 #include <utils/link.h>
@@ -77,7 +75,6 @@ LocatorMatcherTasks OpenDocumentsFilter::matchers()
     const auto onSetup = [storage](Async<void> &async) {
         const QList<Entry> editorsData = Utils::transform(DocumentModel::entries(),
             [](const DocumentModel::Entry *e) { return Entry{e->filePath(), e->displayName()}; });
-        async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
         async.setConcurrentCallData(matchEditors, *storage, editorsData);
     };
 
diff --git a/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp b/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp
index b360ad595db..bcc685c9532 100644
--- a/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp
+++ b/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp
@@ -6,8 +6,6 @@
 #include "../coreplugintr.h"
 #include "../messagemanager.h"
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/algorithm.h>
 #include <utils/async.h>
 #include <utils/commandline.h>
@@ -198,7 +196,6 @@ LocatorMatcherTasks SpotlightLocatorFilter::matchers()
                            ? insensArgs : sensArgs;
         const CommandLine cmd(FilePath::fromString(command), expander->expand(args),
                               CommandLine::Raw);
-        async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
         async.setConcurrentCallData(matches, *storage, cmd, sortResults);
         return SetupResult::Continue;
     };
@@ -223,7 +220,7 @@ bool SpotlightLocatorFilter::openConfigDialog(QWidget *parent, bool &needsRefres
     caseSensitiveArgumentsEdit->setText(m_caseSensitiveArguments);
     auto sortResults = new QCheckBox(Tr::tr("Sort results"));
     sortResults->setChecked(m_sortResults);
-    layout->addRow(Tr::tr("Executable:"), commandEdit);
+    layout->addRow(Tr::tr("Executable:", "noun"), commandEdit);
     layout->addRow(Tr::tr("Arguments:"), argumentsEdit);
     layout->addRow(Tr::tr("Case sensitive:"), caseSensitiveArgumentsEdit);
     layout->addRow({}, sortResults);
@@ -234,7 +231,7 @@ bool SpotlightLocatorFilter::openConfigDialog(QWidget *parent, bool &needsRefres
     chooser->addSupportedWidget(caseSensitiveArgumentsEdit);
     const bool accepted = ILocatorFilter::openConfigDialog(parent, &configWidget);
     if (accepted) {
-        m_command = commandEdit->rawFilePath().toString();
+        m_command = commandEdit->unexpandedFilePath().toString();
         m_arguments = argumentsEdit->text();
         m_caseSensitiveArguments = caseSensitiveArgumentsEdit->text();
         m_sortResults = sortResults->isChecked();
diff --git a/src/plugins/coreplugin/locator/urllocatorfilter.cpp b/src/plugins/coreplugin/locator/urllocatorfilter.cpp
index 1c67d9e0328..7457f0907cc 100644
--- a/src/plugins/coreplugin/locator/urllocatorfilter.cpp
+++ b/src/plugins/coreplugin/locator/urllocatorfilter.cpp
@@ -207,34 +207,6 @@ void UrlLocatorFilter::restoreState(const QJsonObject &object)
                                     &QVariant::toString);
 }
 
-void UrlLocatorFilter::restoreState(const QByteArray &state)
-{
-    if (isOldSetting(state)) {
-        // TODO read old settings, remove some time after Qt Creator 4.15
-        QDataStream in(state);
-
-        QString value;
-        in >> value;
-        m_remoteUrls = value.split('^', Qt::SkipEmptyParts);
-
-        QString shortcut;
-        in >> shortcut;
-        setShortcutString(shortcut);
-
-        bool defaultFilter;
-        in >> defaultFilter;
-        setIncludedByDefault(defaultFilter);
-
-        if (!in.atEnd()) {
-            QString name;
-            in >> name;
-            setDisplayName(name);
-        }
-    } else {
-        ILocatorFilter::restoreState(state);
-    }
-}
-
 bool UrlLocatorFilter::openConfigDialog(QWidget *parent, bool &needsRefresh)
 {
     Q_UNUSED(needsRefresh)
diff --git a/src/plugins/coreplugin/locator/urllocatorfilter.h b/src/plugins/coreplugin/locator/urllocatorfilter.h
index 18535569c5b..cc579034792 100644
--- a/src/plugins/coreplugin/locator/urllocatorfilter.h
+++ b/src/plugins/coreplugin/locator/urllocatorfilter.h
@@ -24,7 +24,6 @@ public:
     UrlLocatorFilter(Utils::Id id);
     UrlLocatorFilter(const QString &displayName, Utils::Id id);
 
-    void restoreState(const QByteArray &state) final;
     bool openConfigDialog(QWidget *parent, bool &needsRefresh) final;
 
     void addDefaultUrl(const QString &urlTemplate);
diff --git a/src/plugins/coreplugin/loggingviewer.cpp b/src/plugins/coreplugin/loggingviewer.cpp
index d6aad897148..427b0a064c3 100644
--- a/src/plugins/coreplugin/loggingviewer.cpp
+++ b/src/plugins/coreplugin/loggingviewer.cpp
@@ -715,7 +715,7 @@ LoggingViewManagerWidget::LoggingViewManagerWidget(QWidget *parent)
         Splitter {
             bindTo(&splitter),
             Column {
-                noMargin(),
+                noMargin,
                 Row {
                     spacing(0),
                     save,
@@ -729,7 +729,7 @@ LoggingViewManagerWidget::LoggingViewManagerWidget(QWidget *parent)
                 m_logView
             },
             Column {
-                noMargin(),
+                noMargin,
                 Row {
                     qtInternal,
                     filterEdit,
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index 37bdbc6ae78..7a51c633782 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -191,14 +191,6 @@ QRect ManhattanStyle::subControlRect(
         SubControl subControl,
         const QWidget *widget) const
 {
-#if QT_VERSION < QT_VERSION_CHECK(6, 2, 5)
-    // Workaround for QTBUG-101581, can be removed when building with Qt 6.2.5 or higher
-    if (control == CC_ScrollBar) {
-        const auto scrollbar = qstyleoption_cast<const QStyleOptionSlider *>(option);
-        if (scrollbar && qint64(scrollbar->maximum) - scrollbar->minimum > INT_MAX)
-            return QRect(); // breaks the scrollbar, but avoids the crash
-    }
-#endif
     return QProxyStyle::subControlRect(control, option, subControl, widget);
 }
 
@@ -277,15 +269,15 @@ void ManhattanStyle::unpolish(QApplication *app)
 
 QPalette panelPalette(const QPalette &oldPalette, bool lightColored = false)
 {
-    QColor color = creatorTheme()->color(lightColored ? Theme::PanelTextColorDark
-                                                      : Theme::PanelTextColorLight);
+    QColor color = creatorColor(lightColored ? Theme::PanelTextColorDark
+                                             : Theme::PanelTextColorLight);
     QPalette pal = oldPalette;
     pal.setBrush(QPalette::All, QPalette::WindowText, color);
     pal.setBrush(QPalette::All, QPalette::ButtonText, color);
     if (lightColored)
         color.setAlpha(100);
     else
-        color = creatorTheme()->color(Theme::IconsDisabledColor);
+        color = creatorColor(Theme::IconsDisabledColor);
     pal.setBrush(QPalette::Disabled, QPalette::WindowText, color);
     pal.setBrush(QPalette::Disabled, QPalette::ButtonText, color);
     return pal;
@@ -336,7 +328,7 @@ void ManhattanStyle::polish(QWidget *widget)
             QPalette palette = panelPalette(widget->palette(), isLightColored);
             if (!isLightColored)
                 palette.setBrush(QPalette::All, QPalette::WindowText,
-                                 creatorTheme()->color(Theme::ComboBoxTextColor));
+                                 creatorColor(Theme::ComboBoxTextColor));
             widget->setPalette(palette);
             widget->setMaximumHeight(height - 2);
             widget->setAttribute(Qt::WA_Hover);
@@ -458,9 +450,9 @@ static void drawPrimitiveTweakedForDarkTheme(QStyle::PrimitiveElement element,
     const bool isSunken = option->state & QStyle::State_Sunken;
 
     const QColor frameColor = isEnabled ? option->palette.color(QPalette::Mid).darker(132)
-                                        : creatorTheme()->color(Theme::BackgroundColorDisabled);
+                                        : creatorColor(Theme::BackgroundColorDisabled);
     const QColor indicatorColor = isEnabled ? option->palette.color(QPalette::Mid).darker(90)
-                                            : creatorTheme()->color(Theme::BackgroundColorDisabled);
+                                            : creatorColor(Theme::BackgroundColorDisabled);
     const QColor bgColor = isSunken ? option->palette.color(QPalette::Mid).darker()
                                     : option->palette.color(QPalette::Window);
     const QColor hlColor = option->palette.color(QPalette::Highlight);
@@ -571,16 +563,15 @@ static void drawPrimitiveTweakedForDarkTheme(QStyle::PrimitiveElement element,
         break;
     }
     case QStyle::PE_IndicatorTabClose: {
-        QWindow *window = widget ? widget->window()->windowHandle() : nullptr;
+        const qreal devicePixelRatio = painter->device()->devicePixelRatio();
         QRect iconRect = QRect(0, 0, 16, 16);
         iconRect.moveCenter(option->rect.center());
         const QIcon::Mode mode = !isEnabled ? QIcon::Disabled : QIcon::Normal;
         const static QIcon closeIcon = Utils::Icons::CLOSE_FOREGROUND.icon();
         if (option->state & QStyle::State_MouseOver && widget)
             widget->style()->drawPrimitive(QStyle::PE_PanelButtonCommand, option, painter, widget);
-        const int devicePixelRatio = widget ? widget->devicePixelRatio() : 1;
         const QPixmap iconPx =
-                closeIcon.pixmap(window, iconRect.size() * devicePixelRatio, mode);
+                closeIcon.pixmap(iconRect.size() * devicePixelRatio, devicePixelRatio, mode);
         painter->drawPixmap(iconRect, iconPx);
         break;
     }
@@ -621,7 +612,7 @@ void ManhattanStyle::drawPrimitiveForPanelWidget(PrimitiveElement element,
     QRect rect = option->rect;
     switch (element) {
     case PE_IndicatorDockWidgetResizeHandle:
-        painter->fillRect(option->rect, creatorTheme()->color(Theme::DockWidgetResizeHandleColor));
+        painter->fillRect(option->rect, creatorColor(Theme::DockWidgetResizeHandleColor));
         break;
     case PE_FrameDockWidget:
         QCommonStyle::drawPrimitive(element, option, painter, widget);
@@ -639,7 +630,7 @@ void ManhattanStyle::drawPrimitiveForPanelWidget(PrimitiveElement element,
                     painter->setOpacity(0.75);
                 QBrush baseBrush = option->palette.base();
                 if (widget && qobject_cast<const QSpinBox *>(widget->parentWidget()))
-                    baseBrush = creatorTheme()->color(Theme::DScontrolBackgroundDisabled);
+                    baseBrush = creatorColor(Theme::DScontrolBackgroundDisabled);
                 painter->fillRect(backgroundRect, baseBrush);
                 painter->restore();
             } else {
@@ -733,7 +724,7 @@ void ManhattanStyle::drawPrimitiveForPanelWidget(PrimitiveElement element,
                 painter->setPen(StyleHelper::sidebarShadow());
                 if (pressed) {
                     StyleHelper::drawPanelBgRect(
-                        painter, rect, creatorTheme()->color(Theme::FancyToolButtonSelectedColor));
+                        painter, rect, creatorColor(Theme::FancyToolButtonSelectedColor));
                     if (StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyleCompact
                         && !creatorTheme()->flag(Theme::FlatToolBars)) {
                         const QRectF borderRect = QRectF(rect).adjusted(0.5, 0.5, -0.5, -0.5);
@@ -744,13 +735,13 @@ void ManhattanStyle::drawPrimitiveForPanelWidget(PrimitiveElement element,
                 } else if (option->state & State_Enabled && option->state & State_MouseOver) {
                     if (widget->property(StyleHelper::C_TOOLBAR_ACTIONWIDGET).toBool()) {
                         painter->save();
-                        painter->setBrush(creatorTheme()->color(Theme::FancyToolButtonHoverColor));
+                        painter->setBrush(creatorColor(Theme::FancyToolButtonHoverColor));
                         painter->drawRoundedRect(rect, 5, 5);
                         painter->restore();
                     } else {
                         StyleHelper::drawPanelBgRect(painter,
                                                      rect,
-                                                     creatorTheme()->color(
+                                                     creatorColor(
                                                          Theme::FancyToolButtonHoverColor));
                     }
                 }
@@ -876,9 +867,8 @@ void ManhattanStyle::drawControl(
             const bool enabled = mbi->state & State_Enabled;
             QStyleOptionMenuItem item = *mbi;
             item.rect = mbi->rect;
-            const QColor color = creatorTheme()->color(enabled
-                                                       ? Theme::MenuItemTextColorNormal
-                                                       : Theme::MenuItemTextColorDisabled);
+            const QColor color = creatorColor(enabled ? Theme::MenuItemTextColorNormal
+                                                      : Theme::MenuItemTextColorDisabled);
             if (color.isValid()) {
                 QPalette pal = mbi->palette;
                 pal.setBrush(QPalette::Text, color);
@@ -905,24 +895,23 @@ void ManhattanStyle::drawControl(
             item.rect = mbi->rect;
             QPalette pal = mbi->palette;
             pal.setBrush(QPalette::ButtonText, dis
-                ? creatorTheme()->color(Theme::MenuBarItemTextColorDisabled)
-                : creatorTheme()->color(Theme::MenuBarItemTextColorNormal));
+                ? creatorColor(Theme::MenuBarItemTextColorDisabled)
+                : creatorColor(Theme::MenuBarItemTextColorNormal));
             item.palette = pal;
             QCommonStyle::drawControl(element, &item, painter, widget);
 
             if (act) {
                 // Fill|
                 const QColor fillColor = StyleHelper::alphaBlendedColors(
-                            StyleHelper::baseColor(), creatorTheme()->color(Theme::FancyToolButtonHoverColor));
+                            StyleHelper::baseColor(), creatorColor(Theme::FancyToolButtonHoverColor));
                 painter->fillRect(option->rect, fillColor);
 
                 QPalette pal = mbi->palette;
                 uint alignment = Qt::AlignCenter | Qt::TextShowMnemonic | Qt::TextDontClip | Qt::TextSingleLine;
                 if (!styleHint(SH_UnderlineShortcut, mbi, widget))
                     alignment |= Qt::TextHideMnemonic;
-                pal.setBrush(QPalette::Text, creatorTheme()->color(dis
-                                                                   ? Theme::IconsDisabledColor
-                                                                   : Theme::PanelTextColorLight));
+                pal.setBrush(QPalette::Text, creatorColor(dis ? Theme::IconsDisabledColor
+                                                              : Theme::PanelTextColorLight));
                 drawItemText(painter, item.rect, alignment, pal, !dis, mbi->text, QPalette::Text);
             }
         }
@@ -989,7 +978,7 @@ void ManhattanStyle::drawControl(
                 }
                 painter->setPen((option->state & State_Enabled)
                                   ? option->palette.color(QPalette::WindowText)
-                                  : creatorTheme()->color(Theme::IconsDisabledColor));
+                                  : creatorColor(Theme::IconsDisabledColor));
                 painter->drawText(editRect.adjusted(1, 0, -1, 0), Qt::AlignLeft | Qt::AlignVCenter, text);
 
                 painter->restore();
@@ -1080,7 +1069,7 @@ void ManhattanStyle::drawControl(
                     // toolbar should draw the top or bottom outline
                     // (needed for the find toolbar for instance)
                     const QColor hightLight = creatorTheme()->flag(Theme::FlatToolBars)
-                            ? creatorTheme()->color(Theme::FancyToolBarSeparatorColor)
+                            ? creatorColor(Theme::FancyToolBarSeparatorColor)
                             : StyleHelper::sidebarHighlight();
                     const QColor borderColor = drawLightColored
                             ? QColor(255, 255, 255, 180) : hightLight;
@@ -1166,7 +1155,7 @@ void ManhattanStyle::drawComplexControl(ComplexControl control, const QStyleOpti
             label.palette = panelPalette(option->palette, lightColored(widget));
             if (widget && widget->property(StyleHelper::C_HIGHLIGHT_WIDGET).toBool()) {
                 label.palette.setColor(QPalette::ButtonText,
-                                       creatorTheme()->color(Theme::IconsWarningToolBarColor));
+                                       creatorColor(Theme::IconsWarningToolBarColor));
             }
             int fw = pixelMetric(PM_DefaultFrameWidth, option, widget);
             label.rect = button.adjusted(fw, fw, -fw, -fw);
@@ -1278,7 +1267,7 @@ void ManhattanStyle::drawButtonSeparator(QPainter *painter, const QRect &rect, b
     const QRectF borderRect = QRectF(rect).adjusted(0.5, 0.5, -0.5, -0.5);
     if (creatorTheme()->flag(Theme::FlatToolBars)) {
         const int margin = 3;
-        painter->setPen(creatorTheme()->color(Theme::FancyToolBarSeparatorColor));
+        painter->setPen(creatorColor(Theme::FancyToolBarSeparatorColor));
         painter->drawLine(borderRect.topRight() + QPointF(0, margin),
                           borderRect.bottomRight() - QPointF(0, margin));
     } else {
diff --git a/src/plugins/coreplugin/messagemanager.cpp b/src/plugins/coreplugin/messagemanager.cpp
index 4eca635b84d..d8e723ecf2c 100644
--- a/src/plugins/coreplugin/messagemanager.cpp
+++ b/src/plugins/coreplugin/messagemanager.cpp
@@ -5,121 +5,88 @@
 
 #include "messageoutputwindow.h"
 
-#include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
 
 #include <QFont>
-#include <QThread>
-#include <QTime>
+
+#include <memory>
 
 /*!
-    \class Core::MessageManager
+    \namespace Core::MessageManager
     \inheaderfile coreplugin/messagemanager.h
     \ingroup mainclasses
     \inmodule QtCreator
 
-    \brief The MessageManager class is used to post messages in the
+    \brief The MessageManager namespace is used to post messages in the
     \uicontrol{General Messages} pane.
 */
 
-namespace Core {
+namespace Core::MessageManager {
 
-static MessageManager *m_instance = nullptr;
-static Internal::MessageOutputWindow *m_messageOutputWindow = nullptr;
-
-/*!
-    \internal
-*/
-MessageManager *MessageManager::instance()
-{
-    return m_instance;
-}
+static std::unique_ptr<Internal::MessageOutputWindow> s_messageOutputWindow;
 
 enum class Flag { Silent, Flash, Disrupt };
 
 static void showOutputPane(Flag flags)
 {
-    QTC_ASSERT(m_messageOutputWindow, return);
-
+    QTC_ASSERT(s_messageOutputWindow, return);
     switch (flags) {
-    case Core::Flag::Silent:
+    case Flag::Silent:
         break;
-    case Core::Flag::Flash:
-        m_messageOutputWindow->flash();
+    case Flag::Flash:
+        s_messageOutputWindow->flash();
         break;
-    case Core::Flag::Disrupt:
-        m_messageOutputWindow->popup(IOutputPane::ModeSwitch | IOutputPane::WithFocus);
+    case Flag::Disrupt:
+        s_messageOutputWindow->popup(IOutputPane::ModeSwitch | IOutputPane::WithFocus);
         break;
     }
 }
 
 static void doWrite(const QString &text, Flag flags)
 {
-    QTC_ASSERT(m_messageOutputWindow, return);
-
+    QTC_ASSERT(s_messageOutputWindow, return);
     showOutputPane(flags);
-    m_messageOutputWindow->append(text + '\n');
+    s_messageOutputWindow->append(text + '\n');
 }
 
-static void write(const QString &text, Flag flags)
+static void writeImpl(const QString &text, Flag flags)
 {
-    QTC_ASSERT(m_instance, return);
-    if (QThread::currentThread() == m_instance->thread())
-        doWrite(text, flags);
-    else
-        QMetaObject::invokeMethod(m_instance, [text, flags] {
-            doWrite(text, flags);
-        }, Qt::QueuedConnection);
+    QTC_ASSERT(s_messageOutputWindow, return);
+    QMetaObject::invokeMethod(s_messageOutputWindow.get(), [text, flags] { doWrite(text, flags); });
 }
 
 /*!
     \internal
 */
-MessageManager::MessageManager()
+void init()
 {
-    m_instance = this;
-    m_messageOutputWindow = nullptr;
+    s_messageOutputWindow.reset(new Internal::MessageOutputWindow);
 }
 
 /*!
     \internal
 */
-MessageManager::~MessageManager()
+void destroy()
 {
-    if (m_messageOutputWindow) {
-        ExtensionSystem::PluginManager::removeObject(m_messageOutputWindow);
-        delete m_messageOutputWindow;
-    }
-    m_instance = nullptr;
+    s_messageOutputWindow.reset();
 }
 
 /*!
     \internal
 */
-void MessageManager::init()
+void setFont(const QFont &font)
 {
-    m_messageOutputWindow = new Internal::MessageOutputWindow;
-    ExtensionSystem::PluginManager::addObject(m_messageOutputWindow);
+    QTC_ASSERT(s_messageOutputWindow, return);
+    s_messageOutputWindow->setFont(font);
 }
 
 /*!
     \internal
 */
-void MessageManager::setFont(const QFont &font)
+void setWheelZoomEnabled(bool enabled)
 {
-    QTC_ASSERT(m_messageOutputWindow, return);
-
-    m_messageOutputWindow->setFont(font);
-}
-
-/*!
-    \internal
-*/
-void MessageManager::setWheelZoomEnabled(bool enabled)
-{
-    QTC_ASSERT(m_messageOutputWindow, return);
-
-    m_messageOutputWindow->setWheelZoomEnabled(enabled);
+    QTC_ASSERT(s_messageOutputWindow, return);
+    s_messageOutputWindow->setWheelZoomEnabled(enabled);
 }
 
 /*!
@@ -132,9 +99,9 @@ void MessageManager::setWheelZoomEnabled(bool enabled)
     \sa writeFlashing()
     \sa writeDisrupting()
 */
-void MessageManager::writeSilently(const QString &message)
+void writeSilently(const QString &message)
 {
-    Core::write(message, Flag::Silent);
+    writeImpl(message, Flag::Silent);
 }
 
 /*!
@@ -149,9 +116,9 @@ void MessageManager::writeSilently(const QString &message)
     \sa writeSilently()
     \sa writeDisrupting()
 */
-void MessageManager::writeFlashing(const QString &message)
+void writeFlashing(const QString &message)
 {
-    Core::write(message, Flag::Flash);
+    writeImpl(message, Flag::Flash);
 }
 
 /*!
@@ -164,15 +131,15 @@ void MessageManager::writeFlashing(const QString &message)
     \sa writeSilently()
     \sa writeFlashing()
 */
-void MessageManager::writeDisrupting(const QString &message)
+void writeDisrupting(const QString &message)
 {
-    Core::write(message, Flag::Disrupt);
+    writeImpl(message, Flag::Disrupt);
 }
 
 /*!
     \overload writeSilently()
 */
-void MessageManager::writeSilently(const QStringList &messages)
+void writeSilently(const QStringList &messages)
 {
     writeSilently(messages.join('\n'));
 }
@@ -180,7 +147,7 @@ void MessageManager::writeSilently(const QStringList &messages)
 /*!
     \overload writeFlashing()
 */
-void MessageManager::writeFlashing(const QStringList &messages)
+void writeFlashing(const QStringList &messages)
 {
     writeFlashing(messages.join('\n'));
 }
@@ -188,9 +155,9 @@ void MessageManager::writeFlashing(const QStringList &messages)
 /*!
     \overload writeDisrupting()
 */
-void MessageManager::writeDisrupting(const QStringList &messages)
+void writeDisrupting(const QStringList &messages)
 {
     writeDisrupting(messages.join('\n'));
 }
 
-} // namespace Core
+} // namespace Core::MessageManager
diff --git a/src/plugins/coreplugin/messagemanager.h b/src/plugins/coreplugin/messagemanager.h
index 98eb0635a12..87a4b6f6499 100644
--- a/src/plugins/coreplugin/messagemanager.h
+++ b/src/plugins/coreplugin/messagemanager.h
@@ -5,49 +5,26 @@
 
 #include "core_global.h"
 
-#include <QMetaType>
-#include <QObject>
+#include <QStringList>
 
 QT_BEGIN_NAMESPACE
 class QFont;
 QT_END_NAMESPACE
 
-namespace Core {
+namespace Core::MessageManager {
 
-class ICore;
+CORE_EXPORT void setFont(const QFont &font);
+CORE_EXPORT void setWheelZoomEnabled(bool enabled);
 
-namespace Internal {
-class ICorePrivate;
-class MainWindow;
-}
+CORE_EXPORT void writeSilently(const QString &message);
+CORE_EXPORT void writeFlashing(const QString &message);
+CORE_EXPORT void writeDisrupting(const QString &message);
 
-class CORE_EXPORT MessageManager : public QObject
-{
-    Q_OBJECT
+CORE_EXPORT void writeSilently(const QStringList &messages);
+CORE_EXPORT void writeFlashing(const QStringList &messages);
+CORE_EXPORT void writeDisrupting(const QStringList &messages);
 
-public:
-    static MessageManager *instance();
+void init();
+void destroy();
 
-    static void setFont(const QFont &font);
-    static void setWheelZoomEnabled(bool enabled);
-
-    static void writeSilently(const QString &message);
-    static void writeFlashing(const QString &message);
-    static void writeDisrupting(const QString &message);
-
-    static void writeSilently(const QStringList &messages);
-    static void writeFlashing(const QStringList &messages);
-    static void writeDisrupting(const QStringList &messages);
-
-private:
-    MessageManager();
-    ~MessageManager() override;
-
-    static void init();
-
-    friend class ICore;
-    friend class Internal::ICorePrivate;
-    friend class Internal::MainWindow;
-};
-
-} // namespace Core
+} // namespace Core::MessageManager
diff --git a/src/plugins/coreplugin/minisplitter.cpp b/src/plugins/coreplugin/minisplitter.cpp
index cdf6d16d8e2..56adc7a6084 100644
--- a/src/plugins/coreplugin/minisplitter.cpp
+++ b/src/plugins/coreplugin/minisplitter.cpp
@@ -138,7 +138,7 @@ void MiniSplitterHandle::resizeEvent(QResizeEvent *event)
 void MiniSplitterHandle::paintEvent(QPaintEvent *event)
 {
     QPainter painter(this);
-    const QColor color = Utils::creatorTheme()->color(
+    const QColor color = Utils::creatorColor(
                 m_lightColored ? Utils::Theme::FancyToolBarSeparatorColor
                                : Utils::Theme::SplitterColor);
     painter.fillRect(event->rect(), color);
diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp
index c93ebe9a361..c03dd3250cf 100644
--- a/src/plugins/coreplugin/modemanager.cpp
+++ b/src/plugins/coreplugin/modemanager.cpp
@@ -311,9 +311,8 @@ void ModeManager::currentTabChanged(int index)
     if (!mode)
         return;
 
-    // FIXME: This hardcoded context update is required for the Debug and Edit modes, since
-    // they use the editor widget, which is already a context widget so the main window won't
-    // go further up the parent tree to find the mode context.
+    // Set the mode's context regardless of focus widget.
+    // Whenever a mode is active, it's Context is active.
     ICore::updateAdditionalContexts(d->m_addedContexts, mode->context());
     d->m_addedContexts = mode->context();
 
diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp
index 48ba6224182..a36b55a9021 100644
--- a/src/plugins/coreplugin/outputpanemanager.cpp
+++ b/src/plugins/coreplugin/outputpanemanager.cpp
@@ -410,18 +410,18 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
         m_opToolBarWidgets,
         minMaxButton,
         closeButton,
-        spacing(0), noMargin(),
+        spacing(0), noMargin,
     }.attachTo(toolBar);
 
     Column {
         toolBar,
         m_outputWidgetPane,
         new FindToolBarPlaceHolder(this),
-        spacing(0), noMargin(),
+        spacing(0), noMargin,
     }.attachTo(this);
 
     Row {
-        spacing(creatorTheme()->flag(Theme::FlatToolBars) ? 9 : 4), customMargin({5, 0, 0, 0}),
+        spacing(creatorTheme()->flag(Theme::FlatToolBars) ? 9 : 4), customMargins(5, 0, 0, 0),
     }.attachTo(m_buttonsWidget);
 
     StatusBarManager::addStatusBarWidget(m_buttonsWidget, StatusBarManager::Second);
@@ -503,7 +503,7 @@ void OutputPaneManager::initialize()
 
         QWidget *toolButtonsContainer = new QWidget(m_instance->m_opToolBarWidgets);
         using namespace Layouting;
-        Row toolButtonsRow { spacing(0), noMargin() };
+        Row toolButtonsRow { spacing(0), noMargin };
         const QList<QWidget *> toolBarWidgets = outPane->toolBarWidgets();
         for (QWidget *toolButton : toolBarWidgets)
             toolButtonsRow.addItem(toolButton);
@@ -940,7 +940,7 @@ void OutputPaneToggleButton::paintEvent(QPaintEvent*)
             c = Theme::BackgroundColorSelected;
 
         if (c != Theme::BackgroundColorDark)
-            StyleHelper::drawPanelBgRect(&p, bgRect(rect()), creatorTheme()->color(c));
+            StyleHelper::drawPanelBgRect(&p, bgRect(rect()), creatorColor(c));
     } else {
         const QImage *image = nullptr;
         if (isDown()) {
@@ -974,7 +974,7 @@ void OutputPaneToggleButton::paintEvent(QPaintEvent*)
 
     if (m_flashTimer->state() == QTimeLine::Running)
     {
-        QColor c = creatorTheme()->color(Theme::OutputPaneButtonFlashColor);
+        QColor c = creatorColor(Theme::OutputPaneButtonFlashColor);
         c.setAlpha (m_flashTimer->currentFrame());
         if (creatorTheme()->flag(Theme::FlatToolBars))
             StyleHelper::drawPanelBgRect(&p, bgRect(rect()), c);
@@ -983,10 +983,10 @@ void OutputPaneToggleButton::paintEvent(QPaintEvent*)
     }
 
     p.setFont(font());
-    p.setPen(creatorTheme()->color(Theme::OutputPaneToggleButtonTextColorChecked));
+    p.setPen(creatorColor(Theme::OutputPaneToggleButtonTextColorChecked));
     p.drawText((numberAreaWidth() - numberWidth) / 2, baseLine, m_number);
     if (!isChecked())
-        p.setPen(creatorTheme()->color(Theme::OutputPaneToggleButtonTextColorUnchecked));
+        p.setPen(creatorColor(Theme::OutputPaneToggleButtonTextColorUnchecked));
     int leftPart = numberAreaWidth() + buttonBorderWidth;
     int labelWidth = 0;
     if (!m_badgeNumberLabel.text().isEmpty()) {
@@ -1083,15 +1083,15 @@ void BadgeLabel::paint(QPainter *p, int x, int y, bool isChecked)
     const QRectF rect(QRect(QPoint(x, y), m_size));
     p->save();
 
-    p->setBrush(creatorTheme()->color(isChecked? Theme::BadgeLabelBackgroundColorChecked
-                                               : Theme::BadgeLabelBackgroundColorUnchecked));
+    p->setBrush(creatorColor(isChecked? Theme::BadgeLabelBackgroundColorChecked
+                                      : Theme::BadgeLabelBackgroundColorUnchecked));
     p->setPen(Qt::NoPen);
     p->setRenderHint(QPainter::Antialiasing, true);
     p->drawRoundedRect(rect, m_padding, m_padding, Qt::AbsoluteSize);
 
     p->setFont(m_font);
-    p->setPen(creatorTheme()->color(isChecked ? Theme::BadgeLabelTextColorChecked
-                                              : Theme::BadgeLabelTextColorUnchecked));
+    p->setPen(creatorColor(isChecked ? Theme::BadgeLabelTextColorChecked
+                                     : Theme::BadgeLabelTextColorUnchecked));
     p->drawText(rect, Qt::AlignCenter, m_text);
 
     p->restore();
diff --git a/src/plugins/coreplugin/outputwindow.cpp b/src/plugins/coreplugin/outputwindow.cpp
index 7e32bcc807d..4183a8457ca 100644
--- a/src/plugins/coreplugin/outputwindow.cpp
+++ b/src/plugins/coreplugin/outputwindow.cpp
@@ -20,6 +20,7 @@
 #include <QCursor>
 #include <QElapsedTimer>
 #include <QHash>
+#include <QMenu>
 #include <QMimeData>
 #include <QPair>
 #include <QPointer>
@@ -72,6 +73,8 @@ public:
     QTimer scrollTimer;
     QElapsedTimer lastMessage;
     QHash<unsigned int, QPair<int, int>> taskPositions;
+    //: default file name suggested for saving text from output views
+    QString outputFileNameHint{::Core::Tr::tr("output.txt")};
 };
 
 } // namespace Internal
@@ -195,6 +198,8 @@ void OutputWindow::handleLink(const QPoint &pos)
         d->formatter.handleLink(href);
 }
 
+void OutputWindow::adaptContextMenu(QMenu *, const QPoint &) {}
+
 void OutputWindow::mouseReleaseEvent(QMouseEvent *e)
 {
     if (d->linksActive && d->mouseButtonPressed == Qt::LeftButton)
@@ -279,6 +284,28 @@ void OutputWindow::wheelEvent(QWheelEvent *e)
     updateMicroFocus();
 }
 
+void OutputWindow::contextMenuEvent(QContextMenuEvent *event)
+{
+    QMenu *menu = createStandardContextMenu(event->pos());
+    menu->setAttribute(Qt::WA_DeleteOnClose);
+
+    adaptContextMenu(menu, event->pos());
+
+    menu->addSeparator();
+    QAction *saveAction = menu->addAction(Tr::tr("Save Contents..."));
+    connect(saveAction, &QAction::triggered, this, [this] {
+        QFileDialog::saveFileContent(toPlainText().toUtf8(), d->outputFileNameHint);
+    });
+    saveAction->setEnabled(!document()->isEmpty());
+
+    menu->addSeparator();
+    QAction *clearAction = menu->addAction(Tr::tr("Clear"));
+    connect(clearAction, &QAction::triggered, this, [this] { clear(); });
+    clearAction->setEnabled(!document()->isEmpty());
+
+    menu->popup(event->globalPos());
+}
+
 void OutputWindow::setBaseFont(const QFont &newFont)
 {
     float zoom = fontZoom();
@@ -350,6 +377,11 @@ void OutputWindow::updateFilterProperties(
     filterNewContent();
 }
 
+void OutputWindow::setOutputFileNameHint(const QString &fileName)
+{
+    d->outputFileNameHint = fileName;
+}
+
 void OutputWindow::filterNewContent()
 {
     QTextBlock lastBlock = document()->findBlockByNumber(d->lastFilteredBlockNumber);
@@ -366,16 +398,12 @@ void OutputWindow::filterNewContent()
             lastBlock.setVisible(d->filterText.isEmpty()
                                  || regExp.match(lastBlock.text()).hasMatch() != invert);
     } else {
-        if (d->filterMode.testFlag(OutputWindow::FilterModeFlag::CaseSensitive)) {
-            for (; lastBlock != document()->end(); lastBlock = lastBlock.next())
-                lastBlock.setVisible(d->filterText.isEmpty()
-                                     || lastBlock.text().contains(d->filterText) != invert);
-        } else {
-            for (; lastBlock != document()->end(); lastBlock = lastBlock.next()) {
-                lastBlock.setVisible(d->filterText.isEmpty() || lastBlock.text().toLower()
-                                     .contains(d->filterText.toLower()) != invert);
-            }
-        }
+        const auto cs = d->filterMode.testFlag(OutputWindow::FilterModeFlag::CaseSensitive)
+                            ? Qt::CaseSensitive : Qt::CaseInsensitive;
+
+        for (; lastBlock != document()->end(); lastBlock = lastBlock.next())
+            lastBlock.setVisible(d->filterText.isEmpty()
+                                 || lastBlock.text().contains(d->filterText, cs) != invert);
     }
 
     d->lastFilteredBlockNumber = document()->lastBlock().blockNumber();
diff --git a/src/plugins/coreplugin/outputwindow.h b/src/plugins/coreplugin/outputwindow.h
index 83681a988e4..cd44e5678e9 100644
--- a/src/plugins/coreplugin/outputwindow.h
+++ b/src/plugins/coreplugin/outputwindow.h
@@ -67,6 +67,8 @@ public:
             bool regexp,
             bool isInverted);
 
+    void setOutputFileNameHint(const QString &fileName);
+
 signals:
     void wheelZoom();
 
@@ -75,6 +77,7 @@ public slots:
 
 protected:
     virtual void handleLink(const QPoint &pos);
+    virtual void adaptContextMenu(QMenu *menu, const QPoint &pos);
 
 private:
     QMimeData *createMimeDataFromSelection() const override;
@@ -85,6 +88,7 @@ private:
     void resizeEvent(QResizeEvent *e) override;
     void showEvent(QShowEvent *) override;
     void wheelEvent(QWheelEvent *e) override;
+    void contextMenuEvent(QContextMenuEvent *event) override;
 
     using QPlainTextEdit::setFont; // call setBaseFont instead, which respects the zoom factor
     void enableUndoRedo();
diff --git a/src/plugins/coreplugin/plugindialog.cpp b/src/plugins/coreplugin/plugindialog.cpp
index 05d63aedc78..edca2360b33 100644
--- a/src/plugins/coreplugin/plugindialog.cpp
+++ b/src/plugins/coreplugin/plugindialog.cpp
@@ -98,7 +98,7 @@ void PluginDialog::closeDialog()
 
 void PluginDialog::showInstallWizard()
 {
-    if (PluginInstallWizard::exec())
+    if (executePluginInstallWizard())
         m_isRestartRequired = true;
 }
 
diff --git a/src/plugins/coreplugin/plugininstallwizard.cpp b/src/plugins/coreplugin/plugininstallwizard.cpp
index 0ff62b13ff5..84c90c43043 100644
--- a/src/plugins/coreplugin/plugininstallwizard.cpp
+++ b/src/plugins/coreplugin/plugininstallwizard.cpp
@@ -71,7 +71,6 @@ static FilePath pluginInstallPath(bool installIntoApplication)
 }
 
 namespace Core {
-namespace Internal {
 
 class SourcePage : public WizardPage
 {
@@ -145,7 +144,7 @@ struct ArchiveIssue
 // Async. Result is set if any issue was found.
 void checkContents(QPromise<ArchiveIssue> &promise, const FilePath &tempDir)
 {
-    PluginSpec *coreplugin = PluginManager::specForPlugin(CorePlugin::instance());
+    PluginSpec *coreplugin = PluginManager::specForPlugin(Internal::CorePlugin::instance());
 
     // look for plugin
     QDirIterator it(tempDir.path(), libraryNameFilter(), QDir::Files | QDir::NoSymLinks,
@@ -154,16 +153,16 @@ void checkContents(QPromise<ArchiveIssue> &promise, const FilePath &tempDir)
         if (promise.isCanceled())
             return;
         it.next();
-        PluginSpec *spec = PluginSpec::read(it.filePath());
+        expected_str<PluginSpec *> spec = readCppPluginSpec(FilePath::fromUserInput(it.filePath()));
         if (spec) {
             // Is a Qt Creator plugin. Let's see if we find a Core dependency and check the
             // version
-            const QVector<PluginDependency> dependencies = spec->dependencies();
+            const QVector<PluginDependency> dependencies = (*spec)->dependencies();
             const auto found = std::find_if(dependencies.constBegin(), dependencies.constEnd(),
                 [coreplugin](const PluginDependency &d) { return d.name == coreplugin->name(); });
             if (found == dependencies.constEnd())
                 return;
-            if (coreplugin->provides(found->name, found->version))
+            if ((*spec)->provides(coreplugin, *found))
                 return;
             promise.addResult(
                 ArchiveIssue{Tr::tr("Plugin requires an incompatible version of %1 (%2).")
@@ -242,7 +241,6 @@ public:
                 return SetupResult::StopWithError;
 
             async.setConcurrentCallData(checkContents, m_tempDir->path());
-            async.setFutureSynchronizer(PluginManager::futureSynchronizer());
             return SetupResult::Continue;
         };
         const auto onCheckerDone = [this](const Async<ArchiveIssue> &async) {
@@ -398,15 +396,19 @@ static bool copyPluginFile(const FilePath &src, const FilePath &dest)
     return true;
 }
 
-bool PluginInstallWizard::exec()
+bool executePluginInstallWizard(const FilePath &archive)
 {
     Wizard wizard(ICore::dialogParent());
     wizard.setWindowTitle(Tr::tr("Install Plugin"));
 
     Data data;
 
-    auto filePage = new SourcePage(&data, &wizard);
-    wizard.addPage(filePage);
+    if (archive.isEmpty()) {
+        auto filePage = new SourcePage(&data, &wizard);
+        wizard.addPage(filePage);
+    } else {
+        data.sourcePath = archive;
+    }
 
     auto checkArchivePage = new CheckArchivePage(&data, &wizard);
     wizard.addPage(checkArchivePage);
@@ -423,11 +425,12 @@ bool PluginInstallWizard::exec()
             return copyPluginFile(data.sourcePath, installPath);
         } else {
             QString error;
+            FileUtils::CopyAskingForOverwrite copy(ICore::dialogParent(),
+                                              postCopyOperation());
             if (!FileUtils::copyRecursively(data.extractedPath,
                                             installPath,
                                             &error,
-                                            FileUtils::CopyAskingForOverwrite(ICore::dialogParent(),
-                                                                              postCopyOperation()))) {
+                                            copy())) {
                 QMessageBox::warning(ICore::dialogParent(),
                                      Tr::tr("Failed to Copy Plugin Files"),
                                      error);
@@ -439,5 +442,4 @@ bool PluginInstallWizard::exec()
     return false;
 }
 
-} // namespace Internal
 } // namespace Core
diff --git a/src/plugins/coreplugin/plugininstallwizard.h b/src/plugins/coreplugin/plugininstallwizard.h
index 6f9b80af8a5..c5b1fb5d654 100644
--- a/src/plugins/coreplugin/plugininstallwizard.h
+++ b/src/plugins/coreplugin/plugininstallwizard.h
@@ -3,16 +3,14 @@
 
 #pragma once
 
+#include "core_global.h"
+
+#include <utils/filepath.h>
+
 #include <QCoreApplication>
 
 namespace Core {
-namespace Internal {
 
-class PluginInstallWizard
-{
-public:
-    static bool exec();
-};
+CORE_EXPORT bool executePluginInstallWizard(const Utils::FilePath &archive = {});
 
-} // namespace Internal
 } // namespace Core
diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.cpp b/src/plugins/coreplugin/progressmanager/futureprogress.cpp
index 62459bcfea1..c798575af23 100644
--- a/src/plugins/coreplugin/progressmanager/futureprogress.cpp
+++ b/src/plugins/coreplugin/progressmanager/futureprogress.cpp
@@ -308,7 +308,7 @@ void FutureProgress::paintEvent(QPaintEvent *)
     QPainter p(this);
     if (creatorTheme()->flag(Theme::FlatToolBars)) {
         p.fillRect(rect(), StyleHelper::baseColor());
-        p.fillRect(rect(), creatorTheme()->color(Theme::FancyToolButtonSelectedColor));
+        p.fillRect(rect(), creatorColor(Theme::FancyToolButtonSelectedColor));
     } else {
         QLinearGradient grad = StyleHelper::statusBarGradient(rect());
         p.fillRect(rect(), grad);
diff --git a/src/plugins/coreplugin/progressmanager/progressbar.cpp b/src/plugins/coreplugin/progressmanager/progressbar.cpp
index e63a21efdd3..5047fa66003 100644
--- a/src/plugins/coreplugin/progressmanager/progressbar.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressbar.cpp
@@ -245,7 +245,7 @@ void ProgressBar::paintEvent(QPaintEvent *)
         textRect.setHeight(fm.height() + 4);
 
         p.setFont(fnt);
-        p.setPen(creatorTheme()->color(Theme::ProgressBarTitleColor));
+        p.setPen(creatorColor(Theme::ProgressBarTitleColor));
         p.drawText(textRect, alignment | Qt::AlignBottom, elidedtitle);
 
         if (!m_subtitle.isEmpty()) {
@@ -255,7 +255,7 @@ void ProgressBar::paintEvent(QPaintEvent *)
             subtextRect.moveTop(progressY + progressHeight);
 
             p.setFont(fnt);
-            p.setPen(creatorTheme()->color(Theme::ProgressBarTitleColor));
+            p.setPen(creatorColor(Theme::ProgressBarTitleColor));
             p.drawText(subtextRect, alignment | Qt::AlignBottom, elidedsubtitle);
         }
     }
@@ -274,12 +274,11 @@ void ProgressBar::paintEvent(QPaintEvent *)
         themeColor = Theme::ProgressBarColorError;
     else if (m_finished)
         themeColor = Theme::ProgressBarColorFinished;
-    const QColor c = creatorTheme()->color(themeColor);
+    const QColor c = creatorColor(themeColor);
 
     //draw the progress bar
     if (creatorTheme()->flag(Theme::FlatToolBars)) {
-        p.fillRect(rect.adjusted(2, 2, -2, -2),
-                   creatorTheme()->color(Theme::ProgressBarBackgroundColor));
+        p.fillRect(rect.adjusted(2, 2, -2, -2), creatorColor(Theme::ProgressBarBackgroundColor));
         p.fillRect(inner, c);
     } else {
         const static QImage bar(StyleHelper::dpiSpecificImageFile(
diff --git a/src/plugins/coreplugin/session.cpp b/src/plugins/coreplugin/session.cpp
index 921046ffed4..4cb088b3ff7 100644
--- a/src/plugins/coreplugin/session.cpp
+++ b/src/plugins/coreplugin/session.cpp
@@ -30,8 +30,9 @@
 
 #include <QAction>
 #include <QActionGroup>
-#include <QFutureInterface>
+#include <QCoreApplication>
 #include <QDebug>
+#include <QFutureInterface>
 #include <QMenu>
 #include <QMessageBox>
 #include <QPushButton>
diff --git a/src/plugins/coreplugin/statusbarmanager.cpp b/src/plugins/coreplugin/statusbarmanager.cpp
index c590b3f29ef..e85996b053a 100644
--- a/src/plugins/coreplugin/statusbarmanager.cpp
+++ b/src/plugins/coreplugin/statusbarmanager.cpp
@@ -156,13 +156,9 @@ StatusBarContext::StatusBarContext(QObject *parent)
 
 Context StatusBarContext::context() const
 {
-    IMode *currentMode = ModeManager::currentMode();
-    QWidget *modeWidget = currentMode ? currentMode->widget() : nullptr;
-    if (modeWidget) {
-        if (IContext *context = ICore::contextObject(modeWidget))
-            return context->context();
-    }
-    return Context();
+    if (IMode *currentMode = ModeManager::currentMode())
+        return currentMode->context();
+    return {};
 }
 
 } // Core
diff --git a/src/plugins/coreplugin/systemsettings.cpp b/src/plugins/coreplugin/systemsettings.cpp
index d06d14f8dab..37a2075e1b4 100644
--- a/src/plugins/coreplugin/systemsettings.cpp
+++ b/src/plugins/coreplugin/systemsettings.cpp
@@ -129,7 +129,7 @@ SystemSettings::SystemSettings()
     reloadSetting.addOption(Tr::tr("Always Ask"));
     reloadSetting.addOption(Tr::tr("Reload All Unchanged Editors"));
     reloadSetting.addOption(Tr::tr("Ignore Modifications"));
-    reloadSetting.setDefaultValue(IDocument::AlwaysAsk);
+    reloadSetting.setDefaultValue(IDocument::ReloadUnmodified);
     reloadSetting.setLabelText(Tr::tr("When files are externally modified:"));
 
     askBeforeExit.setSettingsKey("AskBeforeExit");
diff --git a/src/plugins/coreplugin/welcomepagehelper.cpp b/src/plugins/coreplugin/welcomepagehelper.cpp
index c2b28c1f83e..b8ab8c8e3bd 100644
--- a/src/plugins/coreplugin/welcomepagehelper.cpp
+++ b/src/plugins/coreplugin/welcomepagehelper.cpp
@@ -41,7 +41,7 @@ using namespace StyleHelper::SpacingTokens;
 
 static QColor themeColor(Theme::Color role)
 {
-    return creatorTheme()->color(role);
+    return creatorColor(role);
 }
 
 namespace WelcomePageHelpers {
@@ -51,7 +51,7 @@ void setBackgroundColor(QWidget *widget, Theme::Color colorRole)
     QPalette palette = creatorTheme()->palette();
     const QPalette::ColorRole role = QPalette::Window;
     palette.setBrush(role, {});
-    palette.setColor(role, creatorTheme()->color(colorRole));
+    palette.setColor(role, creatorColor(colorRole));
     widget->setPalette(palette);
     widget->setBackgroundRole(role);
     widget->setAutoFillBackground(true);
@@ -118,6 +118,10 @@ static const TextFormat &buttonTF(Button::Role role, WidgetState state)
     static const TextFormat smallLinkHoveredTF
         {Theme::Token_Text_Accent, smallLinkDefaultTF.uiElement,
          smallLinkDefaultTF.drawTextFlags};
+    static const TextFormat tagDefaultTF
+        {Theme::Token_Text_Muted, StyleHelper::UiElement::UiElementLabelMedium};
+    static const TextFormat tagHoverTF
+        {Theme::Token_Text_Default, tagDefaultTF.uiElement};
 
     switch (role) {
     case Button::MediumPrimary: return mediumPrimaryTF;
@@ -128,6 +132,8 @@ static const TextFormat &buttonTF(Button::Role role, WidgetState state)
                                              : smallListCheckedTF;
     case Button::SmallLink: return (state == WidgetStateDefault) ? smallLinkDefaultTF
                                              : smallLinkHoveredTF;
+    case Button::Tag: return (state == WidgetStateDefault) ? tagDefaultTF
+                                             : tagHoverTF;
     }
     return mediumPrimaryTF;
 }
@@ -195,29 +201,36 @@ void Button::paintEvent(QPaintEvent *event)
     switch (m_role) {
     case MediumPrimary:
     case SmallPrimary: {
-        const QBrush fill(creatorTheme()->color(isDown()
-                                                    ? Theme::Token_Accent_Subtle
-                                                    : hovered ? Theme::Token_Accent_Muted
-                                                              : Theme::Token_Accent_Default));
+        const QBrush fill(creatorColor(isDown()
+                                       ? Theme::Token_Accent_Subtle
+                                       : hovered ? Theme::Token_Accent_Muted
+                                                 : Theme::Token_Accent_Default));
         drawCardBackground(&p, bgR, fill, QPen(Qt::NoPen), brRectRounding);
         break;
     }
     case MediumSecondary:
     case SmallSecondary: {
-        const QPen outline(creatorTheme()->color(Theme::Token_Text_Default), hovered ? 2 : 1);
+        const QPen outline(creatorColor(Theme::Token_Text_Default), hovered ? 2 : 1);
         drawCardBackground(&p, bgR, QBrush(Qt::NoBrush), outline, brRectRounding);
         break;
     }
     case SmallList: {
         if (isChecked() || hovered) {
-            const QBrush fill(creatorTheme()->color(isChecked() ? Theme::Token_Foreground_Muted
-                                                                : Theme::Token_Foreground_Subtle));
+            const QBrush fill(creatorColor(isChecked() ? Theme::Token_Foreground_Muted
+                                                       : Theme::Token_Foreground_Subtle));
             drawCardBackground(&p, bgR, fill, QPen(Qt::NoPen), brRectRounding);
         }
         break;
     }
     case SmallLink:
         break;
+    case Tag: {
+        const QBrush fill(hovered ? creatorColor(Theme::Token_Foreground_Subtle)
+                                  : QBrush(Qt::NoBrush));
+        const QPen outline(hovered ? QPen(Qt::NoPen) : creatorColor(Theme::Token_Stroke_Subtle));
+        drawCardBackground(&p, bgR, fill, outline, brRectRounding);
+        break;
+    }
     }
 
     if (!m_pixmap.isNull()) {
@@ -244,6 +257,10 @@ void Button::setPixmap(const QPixmap &pixmap)
 
 void Button::updateMargins()
 {
+    if (m_role == Tag) {
+        setContentsMargins(HPaddingXs, VPaddingXxs, HPaddingXs, VPaddingXxs);
+        return;
+    }
     const bool tokenSizeS = m_role == MediumPrimary || m_role == MediumSecondary
                             || m_role == SmallList || m_role == SmallLink;
     const int gap = tokenSizeS ? HGapS : HGapXs;
@@ -281,7 +298,7 @@ constexpr TextFormat searchBoxPlaceholderTF
 
 static const QPixmap &searchBoxIcon()
 {
-    static const QPixmap icon = Icon({{FilePath::fromString(":/core/images/search"),
+    static const QPixmap icon = Icon({{FilePath::fromString(":/core/images/search.png"),
                                        Theme::Token_Text_Muted}}, Icon::Tint).pixmap();
     return icon;
 }
@@ -329,11 +346,11 @@ void SearchBox::leaveEvent(QEvent *event)
 
 static void paintCommonBackground(QPainter *p, const QRectF &rect, const QWidget *widget)
 {
-    const QBrush fill(creatorTheme()->color(Theme::Token_Background_Muted));
+    const QBrush fill(creatorColor(Theme::Token_Background_Muted));
     const Theme::Color c = widget->hasFocus() ? Theme::Token_Stroke_Strong :
                                widget->underMouse() ? Theme::Token_Stroke_Muted
                                                     : Theme::Token_Stroke_Subtle;
-    const QPen pen(creatorTheme()->color(c));
+    const QPen pen(creatorColor(c));
     drawCardBackground(p, rect, fill, pen);
 }
 
@@ -366,7 +383,7 @@ constexpr TextFormat ComboBoxTf
 
 static const QPixmap &comboBoxIcon()
 {
-    static const QPixmap icon = Icon({{FilePath::fromString(":/core/images/expandarrow"),
+    static const QPixmap icon = Icon({{FilePath::fromString(":/core/images/expandarrow.png"),
                                        ComboBoxTf.themeColor}}, Icon::Tint).pixmap();
     return icon;
 }
@@ -1203,7 +1220,7 @@ ListModel *SectionedGridView::addSection(const Section &section, const QList<Lis
         st,
         seeAllLink,
         Space(ExVPaddingGapXl),
-        customMargin({0, ExPaddingGapL, 0, VPaddingL}),
+        customMargins(0, ExPaddingGapL, 0, VPaddingL),
     }.emerge();
     m_sectionLabels.append(sectionLabel);
     auto scrollArea = qobject_cast<QScrollArea *>(widget(0));
@@ -1274,7 +1291,7 @@ void SectionedGridView::zoomInSection(const Section &section)
         st,
         backLink,
         Space(ExVPaddingGapXl),
-        customMargin({0, ExPaddingGapL, 0, VPaddingL}),
+        customMargins(0, ExPaddingGapL, 0, VPaddingL),
     }.emerge();
 
     auto gridView = new GridView(zoomedInWidget);
diff --git a/src/plugins/coreplugin/welcomepagehelper.h b/src/plugins/coreplugin/welcomepagehelper.h
index c32e803029e..e1c9199cfe4 100644
--- a/src/plugins/coreplugin/welcomepagehelper.h
+++ b/src/plugins/coreplugin/welcomepagehelper.h
@@ -31,11 +31,12 @@ namespace WelcomePageHelpers {
 
 constexpr QSize WelcomeThumbnailSize(214, 160);
 
-class CORE_EXPORT TextFormat {
+class CORE_EXPORT TextFormat
+{
 public:
     QColor color() const
     {
-        return Utils::creatorTheme()->color(themeColor);
+        return Utils::creatorColor(themeColor);
     }
 
     QFont font(bool underlined = false) const
@@ -79,6 +80,7 @@ public:
         SmallSecondary,
         SmallList,
         SmallLink,
+        Tag,
     };
 
     explicit Button(const QString &text, Role role, QWidget *parent = nullptr);
diff --git a/src/plugins/cpaster/CodePaster.json.in b/src/plugins/cpaster/CodePaster.json.in
index af6025becbb..f5239abe2b5 100644
--- a/src/plugins/cpaster/CodePaster.json.in
+++ b/src/plugins/cpaster/CodePaster.json.in
@@ -12,7 +12,10 @@
                   "",
                   "Alternatively, this plugin 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 plugin. 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."
     ],
-    "Description" : "Codepaster plugin for pushing/fetching diff from server.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Access code-pasting services.",
+    "LongDescription" : [
+        "Paste snippets of text, such as code or diffs, to a server or fetch them from the server."
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/cppcheck/Cppcheck.json.in b/src/plugins/cppcheck/Cppcheck.json.in
index f2206e0fcae..47c0804bc64 100644
--- a/src/plugins/cppcheck/Cppcheck.json.in
+++ b/src/plugins/cppcheck/Cppcheck.json.in
@@ -14,7 +14,11 @@
                   "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."
     ],
     "Category" : "Code Analyzer",
-    "Description" : "Cppcheck static analyzer tool integration. See http://cppcheck.sourceforge.net.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Find errors in C++ code with static analysis.",
+    "LongDescription" : [
+        "You also need:",
+            "- cppcheck"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/cppcheck/cppcheckmanualrundialog.cpp b/src/plugins/cppcheck/cppcheckmanualrundialog.cpp
index 35a057ccffd..9ba540f50fd 100644
--- a/src/plugins/cppcheck/cppcheckmanualrundialog.cpp
+++ b/src/plugins/cppcheck/cppcheckmanualrundialog.cpp
@@ -19,10 +19,12 @@
 
 namespace Cppcheck::Internal {
 
-ManualRunDialog::ManualRunDialog(const ProjectExplorer::Project *project)
+ManualRunDialog::ManualRunDialog(const ProjectExplorer::Project *project,
+                                 CppcheckSettings *settings)
     : m_model(new ProjectExplorer::SelectableFilesFromDirModel(this))
 {
     QTC_ASSERT(project, return );
+    QTC_ASSERT(settings, return);
 
     setWindowTitle(Tr::tr("Cppcheck Run Configuration"));
 
@@ -52,7 +54,7 @@ ManualRunDialog::ManualRunDialog(const ProjectExplorer::Project *project)
         analyzeButton->setEnabled(m_model->hasCheckedFiles());
     });
 
-    auto optionsWidget = settings().layouter()().emerge();
+    auto optionsWidget = settings->layouter()().emerge();
 
     auto layout = new QVBoxLayout(this);
     layout->addWidget(optionsWidget);
diff --git a/src/plugins/cppcheck/cppcheckmanualrundialog.h b/src/plugins/cppcheck/cppcheckmanualrundialog.h
index 76206578e34..1f9c91e576a 100644
--- a/src/plugins/cppcheck/cppcheckmanualrundialog.h
+++ b/src/plugins/cppcheck/cppcheckmanualrundialog.h
@@ -17,10 +17,12 @@ class SelectableFilesFromDirModel;
 
 namespace Cppcheck::Internal {
 
+class CppcheckSettings;
+
 class ManualRunDialog : public QDialog
 {
 public:
-    explicit ManualRunDialog(const ProjectExplorer::Project *project);
+    explicit ManualRunDialog(const ProjectExplorer::Project *project, CppcheckSettings *settings);
 
     Utils::FilePaths filePaths() const;
     QSize sizeHint() const override;
diff --git a/src/plugins/cppcheck/cppcheckplugin.cpp b/src/plugins/cppcheck/cppcheckplugin.cpp
index 30ee2c2d67c..341b25db029 100644
--- a/src/plugins/cppcheck/cppcheckplugin.cpp
+++ b/src/plugins/cppcheck/cppcheckplugin.cpp
@@ -40,6 +40,7 @@ class CppcheckPluginPrivate final : public QObject
 {
 public:
     explicit CppcheckPluginPrivate();
+    ~CppcheckPluginPrivate();
 
     CppcheckTextMarkManager marks;
     CppcheckTool tool{marks, Constants::CHECK_PROGRESS_ID};
@@ -49,16 +50,19 @@ public:
     Utils::Perspective perspective{Constants::PERSPECTIVE_ID, ::Cppcheck::Tr::tr("Cppcheck")};
 
     Action *manualRunAction = nullptr;
+    QHash<Project *, CppcheckSettings *> projectSettings;
 
     void startManualRun();
     void updateManualRunAction();
+    void saveProjectSettings(Project *project);
+    void loadProjectSettings(Project *project);
 };
 
 CppcheckPluginPrivate::CppcheckPluginPrivate()
 {
-    tool.updateOptions();
+    tool.updateOptions(settings());
     connect(&settings(), &AspectContainer::changed, this, [this] {
-        tool.updateOptions();
+        tool.updateOptions(settings());
         trigger.recheck();
     });
 
@@ -104,6 +108,29 @@ CppcheckPluginPrivate::CppcheckPluginPrivate()
                 action, &QAction::setEnabled);
         perspective.addToolBarAction(action);
     }
+    connect(ProjectManager::instance(), &ProjectManager::startupProjectChanged,
+            this, [this](Project *project) {
+        if (!project)
+            return;
+        CppcheckSettings *settings = projectSettings.value(project, nullptr);
+        if (!settings) {
+            settings = new CppcheckSettings;
+            settings->readSettings();
+            settings->setAutoApply(true);
+            connect(project, &Project::aboutToSaveSettings,
+                    this, [this, project]{ saveProjectSettings(project); });
+            connect(project, &Project::settingsLoaded,
+                    this, [this, project]{ loadProjectSettings(project); });
+            projectSettings.insert(project, settings);
+            loadProjectSettings(project);
+        }
+    });
+}
+
+CppcheckPluginPrivate::~CppcheckPluginPrivate()
+{
+    qDeleteAll(projectSettings);
+    projectSettings.clear();
 }
 
 void CppcheckPluginPrivate::startManualRun()
@@ -112,9 +139,9 @@ void CppcheckPluginPrivate::startManualRun()
     if (!project)
         return;
 
-    manualRunTool.updateOptions();
-
-    ManualRunDialog dialog(project);
+    CppcheckSettings *settings = projectSettings.value(project, nullptr);
+    QTC_ASSERT(settings, return);
+    ManualRunDialog dialog(project, settings);
     if (dialog.exec() == ManualRunDialog::Rejected)
         return;
 
@@ -125,7 +152,7 @@ void CppcheckPluginPrivate::startManualRun()
         return;
 
     manualRunTool.setProject(project);
-    manualRunTool.updateOptions();
+    manualRunTool.updateOptions(*settings);
     manualRunTool.check(files);
     perspective.select();
 }
@@ -140,6 +167,30 @@ void CppcheckPluginPrivate::updateManualRunAction()
     manualRunAction->setEnabled(canRun);
 }
 
+void CppcheckPluginPrivate::saveProjectSettings(Project *project)
+{
+    QTC_ASSERT(project, return);
+    CppcheckSettings *settings = projectSettings.value(project, nullptr);
+    QTC_ASSERT(settings, return);
+
+    Store store;
+    settings->toMap(store);
+    project->setNamedSettings("CppcheckManual", Utils::variantFromStore(store));
+}
+
+void CppcheckPluginPrivate::loadProjectSettings(Project *project)
+{
+    QTC_ASSERT(project, return);
+    CppcheckSettings *settings = projectSettings.value(project, nullptr);
+    QTC_ASSERT(settings, return);
+
+    const QVariant variant = project->namedSettings("CppcheckManual");
+    if (!variant.isValid())
+        return;
+    Store store = Utils::storeFromVariant(project->namedSettings("CppcheckManual"));
+    settings->fromMap(store);
+}
+
 class CppcheckPlugin final : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
diff --git a/src/plugins/cppcheck/cppcheckrunner.cpp b/src/plugins/cppcheck/cppcheckrunner.cpp
index cf8633c8ddf..bcf663e46e2 100644
--- a/src/plugins/cppcheck/cppcheckrunner.cpp
+++ b/src/plugins/cppcheck/cppcheckrunner.cpp
@@ -113,16 +113,17 @@ void CppcheckRunner::checkQueued()
     if (m_queue.isEmpty() || !m_binary.isExecutableFile())
         return;
 
+    CommandLine commandLine{m_binary, m_arguments, CommandLine::Raw};
     FilePaths files = m_queue.begin().value();
-    QString arguments = m_arguments + ' ' + m_queue.begin().key();
+    commandLine.addArgs(m_queue.begin().key(), CommandLine::Raw);
     m_currentFiles.clear();
-    int argumentsLength = arguments.length();
+    int argumentsLength = commandLine.arguments().length();
     while (!files.isEmpty()) {
-        argumentsLength += files.first().toString().size() + 1; // +1 for separator
+        argumentsLength += files.first().toString().size() + 3; // +1 for separator +2 for quotes
         if (argumentsLength >= m_maxArgumentsLength)
             break;
         m_currentFiles.push_back(files.first());
-        arguments += ' ' + files.first().toString();
+        commandLine.addArg(files.first().toString());
         files.pop_front();
     }
 
@@ -131,7 +132,7 @@ void CppcheckRunner::checkQueued()
     else
         m_queue.begin().value() = files;
 
-    m_process.setCommand(CommandLine(m_binary, arguments, CommandLine::Raw));
+    m_process.setCommand(commandLine);
     m_process.start();
 }
 
@@ -140,7 +141,7 @@ void CppcheckRunner::handleDone()
     if (m_process.result() == ProcessResult::FinishedWithSuccess)
         m_tool.finishParsing();
     else
-        Core::MessageManager::writeSilently(m_process.exitMessage());
+        m_tool.finishWithFail(m_process.exitMessage());
 
     m_currentFiles.clear();
     m_process.close();
diff --git a/src/plugins/cppcheck/cppchecksettings.cpp b/src/plugins/cppcheck/cppchecksettings.cpp
index 142d3ac236f..144ed112f36 100644
--- a/src/plugins/cppcheck/cppchecksettings.cpp
+++ b/src/plugins/cppcheck/cppchecksettings.cpp
@@ -111,7 +111,7 @@ CppcheckSettings::CppcheckSettings()
     readSettings();
 }
 
-std::function<Layouting::LayoutItem()> CppcheckSettings::layouter()
+std::function<Layouting::Layout()> CppcheckSettings::layouter()
 {
     return [this] {
         using namespace Layouting;
diff --git a/src/plugins/cppcheck/cppchecksettings.h b/src/plugins/cppcheck/cppchecksettings.h
index 8842b2b65f2..c5b4a78a676 100644
--- a/src/plugins/cppcheck/cppchecksettings.h
+++ b/src/plugins/cppcheck/cppchecksettings.h
@@ -14,7 +14,7 @@ class CppcheckSettings final : public Utils::AspectContainer
 public:
     CppcheckSettings();
 
-    std::function<Layouting::LayoutItem()> layouter();
+    std::function<Layouting::Layout()> layouter();
 
     Utils::FilePathAspect binary{this};
     Utils::BoolAspect warning{this};
diff --git a/src/plugins/cppcheck/cppchecktool.cpp b/src/plugins/cppcheck/cppchecktool.cpp
index 5bfcf941a3f..e91e5a2ca05 100644
--- a/src/plugins/cppcheck/cppchecktool.cpp
+++ b/src/plugins/cppcheck/cppchecktool.cpp
@@ -39,10 +39,10 @@ CppcheckTool::CppcheckTool(CppcheckDiagnosticManager &manager, const Id &progres
 
 CppcheckTool::~CppcheckTool() = default;
 
-void CppcheckTool::updateOptions()
+void CppcheckTool::updateOptions(const CppcheckSettings &settings)
 {
     m_filters.clear();
-    for (const QString &pattern : settings().ignoredPatterns().split(',')) {
+    for (const QString &pattern : settings.ignoredPatterns().split(',')) {
         const QString trimmedPattern = pattern.trimmed();
         if (trimmedPattern.isEmpty())
             continue;
@@ -52,56 +52,54 @@ void CppcheckTool::updateOptions()
             m_filters.push_back(re);
     }
 
-    updateArguments();
+    updateArguments(settings);
 }
 
 void CppcheckTool::setProject(ProjectExplorer::Project *project)
 {
     m_project = project;
-    updateArguments();
+    updateArguments(settings());
 }
 
-void CppcheckTool::updateArguments()
+void CppcheckTool::updateArguments(const CppcheckSettings &settings)
 {
     if (!m_project)
         return;
 
     m_cachedAdditionalArguments.clear();
 
-    CppcheckSettings &s = settings();
-
     QStringList arguments;
-    if (!s.customArguments().isEmpty()) {
+    if (!settings.customArguments().isEmpty()) {
         Utils::MacroExpander *expander = Utils::globalMacroExpander();
-        const QString expanded = expander->expand(s.customArguments());
+        const QString expanded = expander->expand(settings.customArguments());
         arguments.push_back(expanded);
     }
 
-    if (s.warning())
+    if (settings.warning())
         arguments.push_back("--enable=warning");
-    if (s.style())
+    if (settings.style())
         arguments.push_back("--enable=style");
-    if (s.performance())
+    if (settings.performance())
         arguments.push_back("--enable=performance");
-    if (s.portability())
+    if (settings.portability())
         arguments.push_back("--enable=portability");
-    if (s.information())
+    if (settings.information())
         arguments.push_back("--enable=information");
-    if (s.unusedFunction())
+    if (settings.unusedFunction())
         arguments.push_back("--enable=unusedFunction");
-    if (s.missingInclude())
+    if (settings.missingInclude())
         arguments.push_back("--enable=missingInclude");
-    if (s.inconclusive())
+    if (settings.inconclusive())
         arguments.push_back("--inconclusive");
-    if (s.forceDefines())
+    if (settings.forceDefines())
         arguments.push_back("--force");
 
-    if (!s.unusedFunction() && !s.customArguments().contains("-j "))
+    if (!settings.unusedFunction() && !settings.customArguments().contains("-j "))
         arguments.push_back("-j " + QString::number(QThread::idealThreadCount()));
 
     arguments.push_back("--template=\"{file},{line},{severity},{id},{message}\"");
 
-    m_runner->reconfigure(s.binary(), arguments.join(' '));
+    m_runner->reconfigure(settings.binary.effectiveBinary(), arguments.join(' '));
 }
 
 QStringList CppcheckTool::additionalArguments(const CppEditor::ProjectPart &part) const
@@ -304,4 +302,12 @@ void CppcheckTool::finishParsing()
     m_progress->reportFinished();
 }
 
+void CppcheckTool::finishWithFail(const QString &exitMessage)
+{
+    if (!exitMessage.isEmpty())
+        Core::MessageManager::writeSilently(exitMessage);
+    QTC_ASSERT(m_progress, return);
+    m_progress->cancelAndFinish();
+}
+
 } // Cppcheck::Internal
diff --git a/src/plugins/cppcheck/cppchecktool.h b/src/plugins/cppcheck/cppchecktool.h
index d14485fd5e8..cf36bb18525 100644
--- a/src/plugins/cppcheck/cppchecktool.h
+++ b/src/plugins/cppcheck/cppchecktool.h
@@ -24,6 +24,7 @@ namespace Cppcheck::Internal {
 
 class CppcheckRunner;
 class CppcheckDiagnosticManager;
+class CppcheckSettings;
 
 class CppcheckTool final : public QObject
 {
@@ -33,7 +34,7 @@ public:
     CppcheckTool(CppcheckDiagnosticManager &manager, const Utils::Id &progressId);
     ~CppcheckTool() override;
 
-    void updateOptions();
+    void updateOptions(const CppcheckSettings &settings);
     void setProject(ProjectExplorer::Project *project);
     void check(const Utils::FilePaths &files);
     void stop(const Utils::FilePaths &files);
@@ -42,9 +43,10 @@ public:
     void parseOutputLine(const QString &line);
     void parseErrorLine(const QString &line);
     void finishParsing();
+    void finishWithFail(const QString &exitMessage);
 
 private:
-    void updateArguments();
+    void updateArguments(const CppcheckSettings &settings);
     void addToQueue(const Utils::FilePaths &files, const CppEditor::ProjectPart &part);
     QStringList additionalArguments(const CppEditor::ProjectPart &part) const;
 
diff --git a/src/plugins/cppeditor/CMakeLists.txt b/src/plugins/cppeditor/CMakeLists.txt
index ec5ad89cea3..aef17fe4e31 100644
--- a/src/plugins/cppeditor/CMakeLists.txt
+++ b/src/plugins/cppeditor/CMakeLists.txt
@@ -23,7 +23,6 @@ add_qtc_plugin(CppEditor
     cppcodemodelinspectordialog.cpp cppcodemodelinspectordialog.h
     cppcodemodelinspectordumper.cpp cppcodemodelinspectordumper.h
     cppcodemodelsettings.cpp cppcodemodelsettings.h
-    cppcodemodelsettingspage.cpp cppcodemodelsettingspage.h
     cppcodestylepreferences.cpp cppcodestylepreferences.h
     cppcodestylepreferencesfactory.cpp cppcodestylepreferencesfactory.h
     cppcodestylesettings.cpp cppcodestylesettings.h
@@ -54,7 +53,6 @@ add_qtc_plugin(CppEditor
     cppincludehierarchy.cpp cppincludehierarchy.h
     cppincludesfilter.cpp cppincludesfilter.h
     cppindexingsupport.cpp cppindexingsupport.h
-    cppinsertvirtualmethods.cpp cppinsertvirtualmethods.h
     cpplocalrenaming.cpp cpplocalrenaming.h
     cpplocalsymbols.cpp cpplocalsymbols.h
     cpplocatordata.cpp cpplocatordata.h
@@ -72,14 +70,6 @@ add_qtc_plugin(CppEditor
     cppprojectpartchooser.cpp cppprojectpartchooser.h
     cppprojectupdater.cpp cppprojectupdater.h
     cppqtstyleindenter.cpp cppqtstyleindenter.h
-    cppquickfix.cpp cppquickfix.h
-    cppquickfixassistant.cpp cppquickfixassistant.h
-    cppquickfixes.cpp cppquickfixes.h
-    cppquickfixprojectsettings.cpp cppquickfixprojectsettings.h
-    cppquickfixprojectsettingswidget.cpp cppquickfixprojectsettingswidget.h
-    cppquickfixsettings.cpp cppquickfixsettings.h
-    cppquickfixsettingspage.cpp cppquickfixsettingspage.h
-    cppquickfixsettingswidget.cpp cppquickfixsettingswidget.h
     cpprefactoringchanges.cpp cpprefactoringchanges.h
     cppselectionchanger.cpp cppselectionchanger.h
     cppsemanticinfo.h
@@ -93,6 +83,7 @@ add_qtc_plugin(CppEditor
     cppvirtualfunctionassistprovider.cpp cppvirtualfunctionassistprovider.h
     cppvirtualfunctionproposalitem.cpp cppvirtualfunctionproposalitem.h
     cppworkingcopy.cpp cppworkingcopy.h
+    clangdsettings.cpp clangdsettings.h
     cursorineditor.h
     doxygengenerator.cpp doxygengenerator.h
     editordocumenthandle.cpp editordocumenthandle.h
@@ -104,6 +95,39 @@ add_qtc_plugin(CppEditor
     insertionpointlocator.cpp insertionpointlocator.h
     projectinfo.cpp projectinfo.h
     projectpart.cpp projectpart.h
+    quickfixes/assigntolocalvariable.cpp quickfixes/assigntolocalvariable.h
+    quickfixes/bringidentifierintoscope.cpp quickfixes/bringidentifierintoscope.h
+    quickfixes/completeswitchstatement.cpp quickfixes/completeswitchstatement.h
+    quickfixes/convertnumericliteral.cpp quickfixes/convertnumericliteral.h
+    quickfixes/convertqt4connect.cpp quickfixes/convertqt4connect.h
+    quickfixes/convertstringliteral.cpp quickfixes/convertstringliteral.h
+    quickfixes/converttocamelcase.cpp quickfixes/converttocamelcase.h
+    quickfixes/converttometamethodcall.cpp quickfixes/converttometamethodcall.h
+    quickfixes/cppcodegenerationquickfixes.cpp quickfixes/cppcodegenerationquickfixes.h
+    quickfixes/cppinsertvirtualmethods.cpp quickfixes/cppinsertvirtualmethods.h
+    quickfixes/cppquickfix.cpp quickfixes/cppquickfix.h
+    quickfixes/cppquickfixassistant.cpp quickfixes/cppquickfixassistant.h
+    quickfixes/cppquickfixhelpers.h quickfixes/cppquickfixhelpers.cpp
+    quickfixes/cppquickfixprojectsettings.cpp quickfixes/cppquickfixprojectsettings.h
+    quickfixes/cppquickfixprojectsettingswidget.cpp quickfixes/cppquickfixprojectsettingswidget.h
+    quickfixes/cppquickfixsettings.cpp quickfixes/cppquickfixsettings.h
+    quickfixes/cppquickfixsettingspage.cpp quickfixes/cppquickfixsettingspage.h
+    quickfixes/cppquickfixsettingswidget.cpp quickfixes/cppquickfixsettingswidget.h
+    quickfixes/convertfromandtopointer.cpp quickfixes/convertfromandtopointer.h
+    quickfixes/createdeclarationfromuse.cpp quickfixes/createdeclarationfromuse.h
+    quickfixes/extractfunction.cpp quickfixes/extractfunction.h
+    quickfixes/extractliteralasparameter.cpp quickfixes/extractliteralasparameter.h
+    quickfixes/insertfunctiondefinition.cpp quickfixes/insertfunctiondefinition.h
+    quickfixes/logicaloperationquickfixes.cpp quickfixes/logicaloperationquickfixes.h
+    quickfixes/moveclasstoownfile.cpp quickfixes/moveclasstoownfile.h
+    quickfixes/movefunctiondefinition.cpp quickfixes/movefunctiondefinition.h
+    quickfixes/rearrangeparamdeclarationlist.cpp quickfixes/rearrangeparamdeclarationlist.h
+    quickfixes/reformatpointerdeclaration.cpp quickfixes/reformatpointerdeclaration.h
+    quickfixes/removeusingnamespace.cpp quickfixes/removeusingnamespace.h
+    quickfixes/rewritecomment.cpp quickfixes/rewritecomment.cpp
+    quickfixes/rewritecontrolstatements.cpp quickfixes/rewritecontrolstatements.h
+    quickfixes/splitsimpledeclaration.cpp quickfixes/splitsimpledeclaration.h
+    quickfixes/synchronizememberfunctionorder.cpp quickfixes/synchronizememberfunctionorder.h
     resourcepreviewhoverhandler.cpp resourcepreviewhoverhandler.h
     searchsymbols.cpp searchsymbols.h
     semantichighlighter.cpp semantichighlighter.h
@@ -112,7 +136,7 @@ add_qtc_plugin(CppEditor
     typehierarchybuilder.cpp typehierarchybuilder.h
     wrappablelineedit.cpp wrappablelineedit.h
    EXPLICIT_MOC
-     cppquickfixsettingswidget.h
+     quickfixes/cppquickfixsettingswidget.h
 )
 
 extend_qtc_plugin(CppEditor
@@ -127,7 +151,6 @@ extend_qtc_plugin(CppEditor
     cpplocatorfilter_test.cpp cpplocatorfilter_test.h
     cppmodelmanager_test.cpp cppmodelmanager_test.h
     cpppointerdeclarationformatter_test.cpp cpppointerdeclarationformatter_test.h
-    cppquickfix_test.cpp cppquickfix_test.h
     cpprenaming_test.cpp cpprenaming_test.h
     cppsourceprocessertesthelper.cpp cppsourceprocessertesthelper.h
     cppsourceprocessor_test.cpp cppsourceprocessor_test.h
@@ -137,9 +160,10 @@ extend_qtc_plugin(CppEditor
     followsymbol_switchmethoddecldef_test.cpp followsymbol_switchmethoddecldef_test.h
     modelmanagertesthelper.cpp modelmanagertesthelper.h
     projectinfo_test.cpp projectinfo_test.h
+    quickfixes/cppquickfix_test.cpp quickfixes/cppquickfix_test.h
     symbolsearcher_test.cpp symbolsearcher_test.h
     typehierarchybuilder_test.cpp typehierarchybuilder_test.h
   EXPLICIT_MOC
     cppdoxygen_test.h
-    cppquickfix_test.h
+    quickfixes/cppquickfix_test.h
 )
diff --git a/src/plugins/cppeditor/CppEditor.json.in b/src/plugins/cppeditor/CppEditor.json.in
index 0e9d50eb4b3..9244161993a 100644
--- a/src/plugins/cppeditor/CppEditor.json.in
+++ b/src/plugins/cppeditor/CppEditor.json.in
@@ -13,8 +13,9 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "C++",
-    "Description" : "C/C++ editor component.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Edit C++ source and header files.",
+    "LongDescription" : [],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
 
     "Mimetypes" : [
diff --git a/src/plugins/cppeditor/baseeditordocumentprocessor.cpp b/src/plugins/cppeditor/baseeditordocumentprocessor.cpp
index f48c5a710be..e2c600681dd 100644
--- a/src/plugins/cppeditor/baseeditordocumentprocessor.cpp
+++ b/src/plugins/cppeditor/baseeditordocumentprocessor.cpp
@@ -27,7 +27,8 @@ namespace CppEditor {
 BaseEditorDocumentProcessor::BaseEditorDocumentProcessor(QTextDocument *textDocument,
                                                          const Utils::FilePath &filePath)
     : m_filePath(filePath),
-      m_textDocument(textDocument)
+      m_textDocument(textDocument),
+      m_settings(CppCodeModelSettings::settingsForFile(filePath))
 {
 }
 
@@ -35,9 +36,11 @@ BaseEditorDocumentProcessor::~BaseEditorDocumentProcessor() = default;
 
 void BaseEditorDocumentProcessor::run(bool projectsUpdated)
 {
-    const Utils::Language languagePreference = codeModelSettings()->interpretAmbigiousHeadersAsCHeaders()
-            ? Utils::Language::C
-            : Utils::Language::Cxx;
+    if (projectsUpdated)
+        m_settings = CppCodeModelSettings::settingsForFile(m_filePath);
+
+    const Utils::Language languagePreference
+        = m_settings.interpretAmbigiousHeadersAsC ? Utils::Language::C : Utils::Language::Cxx;
 
     runImpl({CppModelManager::workingCopy(),
              ProjectExplorer::ProjectManager::startupProject(),
diff --git a/src/plugins/cppeditor/baseeditordocumentprocessor.h b/src/plugins/cppeditor/baseeditordocumentprocessor.h
index 78c0f55aabc..c825dc7a84a 100644
--- a/src/plugins/cppeditor/baseeditordocumentprocessor.h
+++ b/src/plugins/cppeditor/baseeditordocumentprocessor.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "baseeditordocumentparser.h"
+#include "cppcodemodelsettings.h"
 #include "cppcursorinfo.h"
 #include "cppeditor_global.h"
 #include "cppsemanticinfo.h"
@@ -72,6 +73,7 @@ public:
     virtual QFuture<CursorInfo> cursorInfo(const CursorInfoParams &params) = 0;
 
     const Utils::FilePath &filePath() const { return m_filePath; }
+    const CppCodeModelSettings &settings() const { return m_settings; }
 
 signals:
     // Signal interface to implement
@@ -102,6 +104,7 @@ private:
 private:
     Utils::FilePath m_filePath;
     QTextDocument *m_textDocument;
+    CppCodeModelSettings m_settings;
 };
 
 } // namespace CppEditor
diff --git a/src/plugins/cppeditor/builtineditordocumentprocessor.cpp b/src/plugins/cppeditor/builtineditordocumentprocessor.cpp
index b934d1e7aed..33f415fe6be 100644
--- a/src/plugins/cppeditor/builtineditordocumentprocessor.cpp
+++ b/src/plugins/cppeditor/builtineditordocumentprocessor.cpp
@@ -143,16 +143,15 @@ QList<TextEditor::BlockRange> toTextEditorBlocks(
 
 BuiltinEditorDocumentProcessor::BuiltinEditorDocumentProcessor(TextEditor::TextDocument *document)
     : BaseEditorDocumentProcessor(document->document(), document->filePath())
-    , m_parser(new BuiltinEditorDocumentParser(document->filePath(), indexerFileSizeLimitInMb()))
+    , m_parser(new BuiltinEditorDocumentParser(document->filePath(),
+                                               settings().effectiveIndexerFileSizeLimitInMb()))
     , m_codeWarningsUpdated(false)
     , m_semanticHighlighter(new SemanticHighlighter(document))
 {
     using namespace Internal;
 
-    const CppCodeModelSettings *cms = &cppCodeModelSettings();
-
     BaseEditorDocumentParser::Configuration config = m_parser->configuration();
-    config.usePrecompiledHeaders = cms->pchUsage() != CppCodeModelSettings::PchUse_None;
+    config.usePrecompiledHeaders = settings().pchUsage != CppCodeModelSettings::PchUse_None;
     m_parser->setConfiguration(config);
 
     m_semanticHighlighter->setHighlightingRunner(
diff --git a/src/plugins/cppeditor/clangdiagnosticconfigsselectionwidget.cpp b/src/plugins/cppeditor/clangdiagnosticconfigsselectionwidget.cpp
index 3a3ceacad4e..8cdc803f462 100644
--- a/src/plugins/cppeditor/clangdiagnosticconfigsselectionwidget.cpp
+++ b/src/plugins/cppeditor/clangdiagnosticconfigsselectionwidget.cpp
@@ -90,11 +90,7 @@ void ClangDiagnosticConfigsSelectionWidget::onButtonClicked()
     connect(buttonsBox, &QDialogButtonBox::accepted, &dialog, &QDialog::accept);
     connect(buttonsBox, &QDialogButtonBox::rejected, &dialog, &QDialog::reject);
 
-    const bool previousEnableLowerClazyLevels = codeModelSettings()->enableLowerClazyLevels();
     if (dialog.exec() == QDialog::Accepted) {
-        if (previousEnableLowerClazyLevels != codeModelSettings()->enableLowerClazyLevels())
-            codeModelSettings()->toSettings(Core::ICore::settings());
-
         m_diagnosticConfigsModel = ClangDiagnosticConfigsModel(widget->configs());
         m_currentConfigId = widget->currentConfig().id();
         m_button->setText(widget->currentConfig().displayName());
diff --git a/src/plugins/cppeditor/clangdsettings.cpp b/src/plugins/cppeditor/clangdsettings.cpp
new file mode 100644
index 00000000000..78cce6df1c0
--- /dev/null
+++ b/src/plugins/cppeditor/clangdsettings.cpp
@@ -0,0 +1,1050 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "clangdsettings.h"
+
+#include "clangdiagnosticconfigsmodel.h"
+#include "clangdiagnosticconfigsselectionwidget.h"
+#include "clangdiagnosticconfigswidget.h"
+#include "cppeditorconstants.h"
+#include "cppeditortr.h"
+#include "cpptoolsreuse.h"
+
+#include <coreplugin/dialogs/ioptionspage.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/session.h>
+#include <projectexplorer/project.h>
+#include <projectexplorer/projectpanelfactory.h>
+#include <projectexplorer/projectsettingswidget.h>
+#include <utils/clangutils.h>
+#include <utils/itemviews.h>
+#include <utils/layoutbuilder.h>
+#include <utils/macroexpander.h>
+#include <utils/qtcprocess.h>
+#include <utils/variablechooser.h>
+
+#include <QCheckBox>
+#include <QDesktopServices>
+#include <QFormLayout>
+#include <QGroupBox>
+#include <QGuiApplication>
+#include <QInputDialog>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QStandardPaths>
+#include <QStringListModel>
+#include <QTimer>
+#include <QVBoxLayout>
+#include <QVersionNumber>
+
+#include <limits>
+
+using namespace ProjectExplorer;
+using namespace Utils;
+
+namespace CppEditor {
+
+static FilePath g_defaultClangdFilePath;
+static FilePath fallbackClangdFilePath()
+{
+    if (g_defaultClangdFilePath.exists())
+        return g_defaultClangdFilePath;
+    return Environment::systemEnvironment().searchInPath("clangd");
+}
+
+static Id initialClangDiagnosticConfigId() { return Constants::CPP_CLANG_DIAG_CONFIG_BUILDSYSTEM; }
+
+static Key clangdSettingsKey() { return "ClangdSettings"; }
+static Key useClangdKey() { return "UseClangdV7"; }
+static Key clangdPathKey() { return "ClangdPath"; }
+static Key clangdIndexingKey() { return "ClangdIndexing"; }
+static Key clangdProjectIndexPathKey() { return "ClangdProjectIndexPath"; }
+static Key clangdSessionIndexPathKey() { return "ClangdSessionIndexPath"; }
+static Key clangdIndexingPriorityKey() { return "ClangdIndexingPriority"; }
+static Key clangdHeaderSourceSwitchModeKey() { return "ClangdHeaderSourceSwitchMode"; }
+static Key clangdCompletionRankingModelKey() { return "ClangdCompletionRankingModel"; }
+static Key clangdHeaderInsertionKey() { return "ClangdHeaderInsertion"; }
+static Key clangdThreadLimitKey() { return "ClangdThreadLimit"; }
+static Key clangdDocumentThresholdKey() { return "ClangdDocumentThreshold"; }
+static Key clangdSizeThresholdEnabledKey() { return "ClangdSizeThresholdEnabled"; }
+static Key clangdSizeThresholdKey() { return "ClangdSizeThreshold"; }
+static Key useGlobalSettingsKey() { return "useGlobalSettings"; }
+static Key clangdblockIndexingSettingsKey() { return "blockIndexing"; }
+static Key sessionsWithOneClangdKey() { return "SessionsWithOneClangd"; }
+static Key diagnosticConfigIdKey() { return "diagnosticConfigId"; }
+static Key checkedHardwareKey() { return "checkedHardware"; }
+static Key completionResultsKey() { return "completionResults"; }
+static Key updateDependentSourcesKey() { return "updateDependentSources"; }
+
+QString ClangdSettings::priorityToString(const IndexingPriority &priority)
+{
+    switch (priority) {
+    case IndexingPriority::Background: return "background";
+    case IndexingPriority::Normal: return "normal";
+    case IndexingPriority::Low: return "low";
+    case IndexingPriority::Off: return {};
+    }
+    return {};
+}
+
+QString ClangdSettings::priorityToDisplayString(const IndexingPriority &priority)
+{
+    switch (priority) {
+    case IndexingPriority::Background: return Tr::tr("Background Priority");
+    case IndexingPriority::Normal: return Tr::tr("Normal Priority");
+    case IndexingPriority::Low: return Tr::tr("Low Priority");
+    case IndexingPriority::Off: return Tr::tr("Off");
+    }
+    return {};
+}
+
+QString ClangdSettings::headerSourceSwitchModeToDisplayString(HeaderSourceSwitchMode mode)
+{
+    switch (mode) {
+    case HeaderSourceSwitchMode::BuiltinOnly: return Tr::tr("Use Built-in Only");
+    case HeaderSourceSwitchMode::ClangdOnly: return Tr::tr("Use Clangd Only");
+    case HeaderSourceSwitchMode::Both: return Tr::tr("Try Both");
+    }
+    return {};
+}
+
+QString ClangdSettings::rankingModelToCmdLineString(CompletionRankingModel model)
+{
+    switch (model) {
+    case CompletionRankingModel::Default: break;
+    case CompletionRankingModel::DecisionForest: return "decision_forest";
+    case CompletionRankingModel::Heuristics: return "heuristics";
+    }
+    QTC_ASSERT(false, return {});
+}
+
+QString ClangdSettings::rankingModelToDisplayString(CompletionRankingModel model)
+{
+    switch (model) {
+    case CompletionRankingModel::Default: return Tr::tr("Default");
+    case CompletionRankingModel::DecisionForest: return Tr::tr("Decision Forest");
+    case CompletionRankingModel::Heuristics: return Tr::tr("Heuristics");
+    }
+    QTC_ASSERT(false, return {});
+}
+
+QString ClangdSettings::defaultProjectIndexPathTemplate()
+{
+    return QDir::toNativeSeparators("%{BuildConfig:BuildDirectory:FilePath}/.qtc_clangd");
+}
+
+QString ClangdSettings::defaultSessionIndexPathTemplate()
+{
+    return QDir::toNativeSeparators("%{IDE:UserResourcePath}/.qtc_clangd/%{Session:FileBaseName}");
+}
+
+ClangdSettings &ClangdSettings::instance()
+{
+    static ClangdSettings settings;
+    return settings;
+}
+
+ClangdSettings::ClangdSettings()
+{
+    loadSettings();
+    const auto sessionMgr = Core::SessionManager::instance();
+    connect(sessionMgr, &Core::SessionManager::sessionRemoved, this, [this](const QString &name) {
+        m_data.sessionsWithOneClangd.removeOne(name);
+    });
+    connect(sessionMgr,
+            &Core::SessionManager::sessionRenamed,
+            this,
+            [this](const QString &oldName, const QString &newName) {
+                const auto index = m_data.sessionsWithOneClangd.indexOf(oldName);
+                if (index != -1)
+                    m_data.sessionsWithOneClangd[index] = newName;
+            });
+}
+
+bool ClangdSettings::useClangd() const
+{
+    return m_data.useClangd && clangdVersion(clangdFilePath()) >= minimumClangdVersion();
+}
+
+void ClangdSettings::setUseClangd(bool use) { instance().m_data.useClangd = use; }
+
+void ClangdSettings::setUseClangdAndSave(bool use)
+{
+    setUseClangd(use);
+    instance().saveSettings();
+}
+
+bool ClangdSettings::hardwareFulfillsRequirements()
+{
+    instance().m_data.haveCheckedHardwareReqirements = true;
+    instance().saveSettings();
+    const quint64 minRam = quint64(12) * 1024 * 1024 * 1024;
+    const std::optional<quint64> totalRam = Utils::HostOsInfo::totalMemoryInstalledInBytes();
+    return !totalRam || *totalRam >= minRam;
+}
+
+bool ClangdSettings::haveCheckedHardwareRequirements()
+{
+    return instance().data().haveCheckedHardwareReqirements;
+}
+
+void ClangdSettings::setDefaultClangdPath(const FilePath &filePath)
+{
+    g_defaultClangdFilePath = filePath;
+}
+
+void ClangdSettings::setCustomDiagnosticConfigs(const ClangDiagnosticConfigs &configs)
+{
+    if (instance().customDiagnosticConfigs() == configs)
+        return;
+    instance().m_data.customDiagnosticConfigs = configs;
+    instance().saveSettings();
+}
+
+FilePath ClangdSettings::clangdFilePath() const
+{
+    if (!m_data.executableFilePath.isEmpty())
+        return m_data.executableFilePath;
+    return fallbackClangdFilePath();
+}
+
+FilePath ClangdSettings::projectIndexPath(const MacroExpander &expander) const
+{
+    return FilePath::fromUserInput(expander.expand(m_data.projectIndexPathTemplate));
+}
+
+FilePath ClangdSettings::sessionIndexPath(const MacroExpander &expander) const
+{
+    return FilePath::fromUserInput(expander.expand(m_data.sessionIndexPathTemplate));
+}
+
+bool ClangdSettings::sizeIsOkay(const FilePath &fp) const
+{
+    return !sizeThresholdEnabled() || sizeThresholdInKb() * 1024 >= fp.fileSize();
+}
+
+ClangDiagnosticConfigs ClangdSettings::customDiagnosticConfigs() const
+{
+    return m_data.customDiagnosticConfigs;
+}
+
+Id ClangdSettings::diagnosticConfigId() const
+{
+    if (!diagnosticConfigsModel().hasConfigWithId(m_data.diagnosticConfigId))
+        return initialClangDiagnosticConfigId();
+    return m_data.diagnosticConfigId;
+}
+
+ClangDiagnosticConfig ClangdSettings::diagnosticConfig() const
+{
+    return diagnosticConfigsModel(customDiagnosticConfigs()).configWithId(diagnosticConfigId());
+}
+
+ClangdSettings::Granularity ClangdSettings::granularity() const
+{
+    if (m_data.sessionsWithOneClangd.contains(Core::SessionManager::activeSession()))
+        return Granularity::Session;
+    return Granularity::Project;
+}
+
+void ClangdSettings::setData(const Data &data, bool saveAndEmitSignal)
+{
+    if (this == &instance() && data != m_data) {
+        m_data = data;
+        if (saveAndEmitSignal) {
+            saveSettings();
+            emit changed();
+        }
+    }
+}
+
+static FilePath getClangHeadersPathFromClang(const FilePath &clangdFilePath)
+{
+    const FilePath clangFilePath = clangdFilePath.absolutePath().pathAppended("clang")
+                                       .withExecutableSuffix();
+    if (!clangFilePath.exists())
+        return {};
+    Process clang;
+    clang.setCommand({clangFilePath, {"-print-resource-dir"}});
+    clang.start();
+    if (!clang.waitForFinished())
+        return {};
+    const FilePath resourceDir = FilePath::fromUserInput(QString::fromLocal8Bit(
+        clang.rawStdOut().trimmed()));
+    if (resourceDir.isEmpty() || !resourceDir.exists())
+        return {};
+    const FilePath includeDir = resourceDir.pathAppended("include");
+    if (!includeDir.exists())
+        return {};
+    return includeDir;
+}
+
+static FilePath getClangHeadersPath(const FilePath &clangdFilePath)
+{
+    const FilePath headersPath = getClangHeadersPathFromClang(clangdFilePath);
+    if (!headersPath.isEmpty())
+        return headersPath;
+
+    const QVersionNumber version = Utils::clangdVersion(clangdFilePath);
+    QTC_ASSERT(!version.isNull(), return {});
+    static const QStringList libDirs{"lib", "lib64"};
+    const QStringList versionStrings{QString::number(version.majorVersion()), version.toString()};
+    for (const QString &libDir : libDirs) {
+        for (const QString &versionString : versionStrings) {
+            const FilePath includePath = clangdFilePath.absolutePath().parentDir()
+                                             .pathAppended(libDir).pathAppended("clang")
+                                             .pathAppended(versionString).pathAppended("include");
+            if (includePath.exists())
+                return includePath;
+        }
+    }
+    QTC_CHECK(false);
+    return {};
+}
+
+FilePath ClangdSettings::clangdIncludePath() const
+{
+    QTC_ASSERT(useClangd(), return {});
+    FilePath clangdPath = clangdFilePath();
+    QTC_ASSERT(!clangdPath.isEmpty() && clangdPath.exists(), return {});
+    static QHash<FilePath, FilePath> headersPathCache;
+    const auto it = headersPathCache.constFind(clangdPath);
+    if (it != headersPathCache.constEnd())
+        return *it;
+    const FilePath headersPath = getClangHeadersPath(clangdPath);
+    if (!headersPath.isEmpty())
+        headersPathCache.insert(clangdPath, headersPath);
+    return headersPath;
+}
+
+FilePath ClangdSettings::clangdUserConfigFilePath()
+{
+    return FilePath::fromString(
+               QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation))
+           / "clangd/config.yaml";
+}
+
+void ClangdSettings::loadSettings()
+{
+    const auto settings = Core::ICore::settings();
+
+    m_data.fromMap(Utils::storeFromSettings(clangdSettingsKey(), settings));
+
+    settings->beginGroup(Constants::CPPEDITOR_SETTINGSGROUP);
+    m_data.customDiagnosticConfigs = diagnosticConfigsFromSettings(settings);
+
+    // Pre-8.0 compat
+    static const Key oldKey("ClangDiagnosticConfig");
+    const QVariant configId = settings->value(oldKey);
+    if (configId.isValid()) {
+        m_data.diagnosticConfigId = Id::fromSetting(configId);
+        settings->setValue(oldKey, {});
+    }
+
+    settings->endGroup();
+}
+
+void ClangdSettings::saveSettings()
+{
+    const auto settings = Core::ICore::settings();
+    const ClangdSettings::Data defaultData;
+    Utils::storeToSettingsWithDefault(clangdSettingsKey(),
+                                      settings,
+                                      m_data.toMap(),
+                                      defaultData.toMap());
+    settings->beginGroup(Constants::CPPEDITOR_SETTINGSGROUP);
+    diagnosticConfigsToSettings(settings, m_data.customDiagnosticConfigs);
+    settings->endGroup();
+}
+
+#ifdef WITH_TESTS
+void ClangdSettings::setClangdFilePath(const FilePath &filePath)
+{
+    instance().m_data.executableFilePath = filePath;
+}
+#endif
+
+ClangdProjectSettings::ClangdProjectSettings(Project *project) : m_project(project)
+{
+    loadSettings();
+}
+
+ClangdSettings::Data ClangdProjectSettings::settings() const
+{
+    const ClangdSettings::Data globalData = ClangdSettings::instance().data();
+    ClangdSettings::Data data = globalData;
+    if (!m_useGlobalSettings) {
+        data = m_customSettings;
+        // This property is global by definition.
+        data.sessionsWithOneClangd = ClangdSettings::instance().data().sessionsWithOneClangd;
+
+        // This list exists only once.
+        data.customDiagnosticConfigs = ClangdSettings::instance().data().customDiagnosticConfigs;
+    }
+    if (m_blockIndexing)
+        data.indexingPriority = ClangdSettings::IndexingPriority::Off;
+    return data;
+}
+
+void ClangdProjectSettings::setSettings(const ClangdSettings::Data &data)
+{
+    m_customSettings = data;
+    saveSettings();
+    ClangdSettings::setCustomDiagnosticConfigs(data.customDiagnosticConfigs);
+    emit ClangdSettings::instance().changed();
+}
+
+void ClangdProjectSettings::setUseGlobalSettings(bool useGlobal)
+{
+    m_useGlobalSettings = useGlobal;
+    saveSettings();
+    emit ClangdSettings::instance().changed();
+}
+
+void ClangdProjectSettings::setDiagnosticConfigId(Utils::Id configId)
+{
+    m_customSettings.diagnosticConfigId = configId;
+    saveSettings();
+    emit ClangdSettings::instance().changed();
+}
+
+void ClangdProjectSettings::blockIndexing()
+{
+    if (m_blockIndexing)
+        return;
+    m_blockIndexing = true;
+    saveSettings();
+    emit ClangdSettings::instance().changed();
+}
+
+void ClangdProjectSettings::unblockIndexing()
+{
+    if (!m_blockIndexing)
+        return;
+    m_blockIndexing = false;
+    saveSettings();
+    // Do not emit changed here since that would restart clients with blocked indexing
+}
+
+void ClangdProjectSettings::loadSettings()
+{
+    if (!m_project)
+        return;
+    const Store data = storeFromVariant(m_project->namedSettings(clangdSettingsKey()));
+    m_useGlobalSettings = data.value(useGlobalSettingsKey(), true).toBool();
+    m_blockIndexing = data.value(clangdblockIndexingSettingsKey(), false).toBool();
+    if (!m_useGlobalSettings)
+        m_customSettings.fromMap(data);
+}
+
+void ClangdProjectSettings::saveSettings()
+{
+    if (!m_project)
+        return;
+    Store data;
+    if (!m_useGlobalSettings)
+        data = m_customSettings.toMap();
+    data.insert(useGlobalSettingsKey(), m_useGlobalSettings);
+    data.insert(clangdblockIndexingSettingsKey(), m_blockIndexing);
+    m_project->setNamedSettings(clangdSettingsKey(), variantFromStore(data));
+}
+
+Store ClangdSettings::Data::toMap() const
+{
+    Store map;
+
+    map.insert(useClangdKey(), useClangd);
+
+    map.insert(clangdPathKey(),
+               executableFilePath != fallbackClangdFilePath() ? executableFilePath.toString()
+                                                              : QString());
+
+    map.insert(clangdIndexingKey(), indexingPriority != IndexingPriority::Off);
+    map.insert(clangdIndexingPriorityKey(), int(indexingPriority));
+    map.insert(clangdProjectIndexPathKey(), projectIndexPathTemplate);
+    map.insert(clangdSessionIndexPathKey(), sessionIndexPathTemplate);
+    map.insert(clangdHeaderSourceSwitchModeKey(), int(headerSourceSwitchMode));
+    map.insert(clangdCompletionRankingModelKey(), int(completionRankingModel));
+    map.insert(clangdHeaderInsertionKey(), autoIncludeHeaders);
+    map.insert(clangdThreadLimitKey(), workerThreadLimit);
+    map.insert(clangdDocumentThresholdKey(), documentUpdateThreshold);
+    map.insert(clangdSizeThresholdEnabledKey(), sizeThresholdEnabled);
+    map.insert(clangdSizeThresholdKey(), sizeThresholdInKb);
+    map.insert(sessionsWithOneClangdKey(), sessionsWithOneClangd);
+    map.insert(diagnosticConfigIdKey(), diagnosticConfigId.toSetting());
+    map.insert(checkedHardwareKey(), haveCheckedHardwareReqirements);
+    map.insert(completionResultsKey(), completionResults);
+    map.insert(updateDependentSourcesKey(), updateDependentSources);
+    return map;
+}
+
+void ClangdSettings::Data::fromMap(const Store &map)
+{
+    useClangd = map.value(useClangdKey(), true).toBool();
+    executableFilePath = FilePath::fromString(map.value(clangdPathKey()).toString());
+    indexingPriority = IndexingPriority(
+        map.value(clangdIndexingPriorityKey(), int(this->indexingPriority)).toInt());
+    const auto it = map.find(clangdIndexingKey());
+    if (it != map.end() && !it->toBool())
+        indexingPriority = IndexingPriority::Off;
+    projectIndexPathTemplate
+        = map.value(clangdProjectIndexPathKey(), defaultProjectIndexPathTemplate()).toString();
+    sessionIndexPathTemplate
+        = map.value(clangdSessionIndexPathKey(), defaultSessionIndexPathTemplate()).toString();
+    headerSourceSwitchMode = HeaderSourceSwitchMode(map.value(clangdHeaderSourceSwitchModeKey(),
+                                                              int(headerSourceSwitchMode)).toInt());
+    completionRankingModel = CompletionRankingModel(map.value(clangdCompletionRankingModelKey(),
+                                                              int(completionRankingModel)).toInt());
+    autoIncludeHeaders = map.value(clangdHeaderInsertionKey(), false).toBool();
+    workerThreadLimit = map.value(clangdThreadLimitKey(), 0).toInt();
+    documentUpdateThreshold = map.value(clangdDocumentThresholdKey(), 500).toInt();
+    sizeThresholdEnabled = map.value(clangdSizeThresholdEnabledKey(), false).toBool();
+    sizeThresholdInKb = map.value(clangdSizeThresholdKey(), 1024).toLongLong();
+    sessionsWithOneClangd = map.value(sessionsWithOneClangdKey()).toStringList();
+    diagnosticConfigId = Id::fromSetting(map.value(diagnosticConfigIdKey(),
+                                                   initialClangDiagnosticConfigId().toSetting()));
+    haveCheckedHardwareReqirements = map.value(checkedHardwareKey(), false).toBool();
+    updateDependentSources = map.value(updateDependentSourcesKey(), false).toBool();
+    completionResults = map.value(completionResultsKey(), defaultCompletionResults()).toInt();
+}
+
+int ClangdSettings::Data::defaultCompletionResults()
+{
+    // Default clangd --limit-results value is 100
+    bool ok = false;
+    const int userValue = qtcEnvironmentVariableIntValue("QTC_CLANGD_COMPLETION_RESULTS", &ok);
+    return ok ? userValue : 100;
+}
+
+namespace Internal {
+class ClangdSettingsWidget final : public QWidget
+{
+    Q_OBJECT
+
+public:
+    ClangdSettingsWidget(const ClangdSettings::Data &settingsData, bool isForProject);
+
+    ClangdSettings::Data settingsData() const;
+
+signals:
+    void settingsDataChanged();
+
+private:
+    QCheckBox m_useClangdCheckBox;
+    QComboBox m_indexingComboBox;
+    Utils::FancyLineEdit m_projectIndexPathTemplateLineEdit;
+    Utils::FancyLineEdit m_sessionIndexPathTemplateLineEdit;
+    QComboBox m_headerSourceSwitchComboBox;
+    QComboBox m_completionRankingModelComboBox;
+    QCheckBox m_autoIncludeHeadersCheckBox;
+    QCheckBox m_updateDependentSourcesCheckBox;
+    QCheckBox m_sizeThresholdCheckBox;
+    QSpinBox m_threadLimitSpinBox;
+    QSpinBox m_documentUpdateThreshold;
+    QSpinBox m_sizeThresholdSpinBox;
+    QSpinBox m_completionResults;
+    Utils::PathChooser m_clangdChooser;
+    Utils::InfoLabel m_versionWarningLabel;
+    ClangDiagnosticConfigsSelectionWidget *m_configSelectionWidget = nullptr;
+    QGroupBox *m_sessionsGroupBox = nullptr;
+    QStringListModel m_sessionsModel;
+};
+
+ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsData,
+                                           bool isForProject)
+{
+    const ClangdSettings settings(settingsData);
+    const QString indexingToolTip = Tr::tr(
+        "<p>If background indexing is enabled, global symbol searches will yield more accurate "
+        "results, at the cost of additional CPU load when the project is first opened. The "
+        "indexing result is persisted in the project's build directory. If you disable background "
+        "indexing, a faster, but less accurate, built-in indexer is used instead. The thread "
+        "priority for building the background index can be adjusted since clangd 15.</p>"
+        "<p>Background Priority: Minimum priority, runs on idle CPUs. May leave 'performance' "
+        "cores unused.</p>"
+        "<p>Normal Priority: Reduced priority compared to interactive work.</p>"
+        "<p>Low Priority: Same priority as other clangd work.</p>");
+    const QString projectIndexPathToolTip = Tr::tr(
+        "The location of the per-project clangd index.<p>"
+        "This is also where the compile_commands.json file will go.");
+    const QString sessionIndexPathToolTip = Tr::tr(
+        "The location of the per-session clangd index.<p>"
+        "This is also where the compile_commands.json file will go.");
+    const QString headerSourceSwitchToolTip = Tr::tr(
+        "<p>The C/C++ backend to use for switching between header and source files.</p>"
+        "<p>While the clangd implementation has more capabilities than the built-in "
+        "code model, it tends to find false positives.</p>"
+        "<p>When \"Try Both\" is selected, clangd is used only if the built-in variant "
+        "does not find anything.</p>");
+    using RankingModel = ClangdSettings::CompletionRankingModel;
+    const QString completionRankingModelToolTip = Tr::tr(
+                                                      "<p>Which model clangd should use to rank possible completions.</p>"
+                                                      "<p>This determines the order of candidates in the combo box when doing code completion.</p>"
+                                                      "<p>The \"%1\" model used by default results from (pre-trained) machine learning and "
+                                                      "provides superior results on average.</p>"
+                                                      "<p>If you feel that its suggestions stray too much from your expectations for your "
+                                                      "code base, you can try switching to the hand-crafted \"%2\" model.</p>").arg(
+                                                          ClangdSettings::rankingModelToDisplayString(RankingModel::DecisionForest),
+                                                          ClangdSettings::rankingModelToDisplayString(RankingModel::Heuristics));
+    const QString workerThreadsToolTip = Tr::tr(
+        "Number of worker threads used by clangd. Background indexing also uses this many "
+        "worker threads.");
+    const QString autoIncludeToolTip = Tr::tr(
+        "Controls whether clangd may insert header files as part of symbol completion.");
+    const QString updateDependentSourcesToolTip = Tr::tr(
+        "<p>Controls whether when editing a header file, clangd should re-parse all source files "
+        "including that header.</p>"
+        "<p>Note that enabling this option can cause considerable CPU load when editing widely "
+        "included headers.</p>"
+        "<p>If this option is disabled, the dependent source files are only re-parsed when the "
+        "header file is saved.</p>");
+    const QString documentUpdateToolTip
+        //: %1 is the application name (Qt Creator)
+        = Tr::tr("Defines the amount of time %1 waits before sending document changes to the "
+                 "server.\n"
+                 "If the document changes again while waiting, this timeout resets.")
+              .arg(QGuiApplication::applicationDisplayName());
+    const QString sizeThresholdToolTip = Tr::tr(
+        "Files greater than this will not be opened as documents in clangd.\n"
+        "The built-in code model will handle highlighting, completion and so on.");
+    const QString completionResultToolTip = Tr::tr(
+        "The maximum number of completion results returned by clangd.");
+
+    m_useClangdCheckBox.setText(Tr::tr("Use clangd"));
+    m_useClangdCheckBox.setChecked(settings.useClangd());
+    m_clangdChooser.setExpectedKind(Utils::PathChooser::ExistingCommand);
+    m_clangdChooser.setFilePath(settings.clangdFilePath());
+    m_clangdChooser.setAllowPathFromDevice(true);
+    m_clangdChooser.setEnabled(m_useClangdCheckBox.isChecked());
+    m_clangdChooser.setCommandVersionArguments({"--version"});
+    using Priority = ClangdSettings::IndexingPriority;
+    for (Priority prio : {Priority::Off, Priority::Background, Priority::Low, Priority::Normal}) {
+        m_indexingComboBox.addItem(ClangdSettings::priorityToDisplayString(prio), int(prio));
+        if (prio == settings.indexingPriority())
+            m_indexingComboBox.setCurrentIndex(m_indexingComboBox.count() - 1);
+    }
+    m_indexingComboBox.setToolTip(indexingToolTip);
+    m_projectIndexPathTemplateLineEdit.setText(settings.data().projectIndexPathTemplate);
+    m_sessionIndexPathTemplateLineEdit.setText(settings.data().sessionIndexPathTemplate);
+    using SwitchMode = ClangdSettings::HeaderSourceSwitchMode;
+    for (SwitchMode mode : {SwitchMode::BuiltinOnly, SwitchMode::ClangdOnly, SwitchMode::Both}) {
+        m_headerSourceSwitchComboBox.addItem(
+            ClangdSettings::headerSourceSwitchModeToDisplayString(mode), int(mode));
+        if (mode == settings.headerSourceSwitchMode())
+            m_headerSourceSwitchComboBox.setCurrentIndex(
+                m_headerSourceSwitchComboBox.count() - 1);
+    }
+    m_headerSourceSwitchComboBox.setToolTip(headerSourceSwitchToolTip);
+    for (RankingModel model : {RankingModel::Default, RankingModel::DecisionForest,
+                               RankingModel::Heuristics}) {
+        m_completionRankingModelComboBox.addItem(
+            ClangdSettings::rankingModelToDisplayString(model), int(model));
+        if (model == settings.completionRankingModel())
+            m_completionRankingModelComboBox.setCurrentIndex(
+                m_completionRankingModelComboBox.count() - 1);
+    }
+    m_completionRankingModelComboBox.setToolTip(completionRankingModelToolTip);
+
+    m_autoIncludeHeadersCheckBox.setText(Tr::tr("Insert header files on completion"));
+    m_autoIncludeHeadersCheckBox.setChecked(settings.autoIncludeHeaders());
+    m_autoIncludeHeadersCheckBox.setToolTip(autoIncludeToolTip);
+    m_updateDependentSourcesCheckBox.setText(Tr::tr("Update dependent sources"));
+    m_updateDependentSourcesCheckBox.setChecked(settings.updateDependentSources());
+    m_updateDependentSourcesCheckBox.setToolTip(updateDependentSourcesToolTip);
+    m_threadLimitSpinBox.setValue(settings.workerThreadLimit());
+    m_threadLimitSpinBox.setSpecialValueText(Tr::tr("Automatic"));
+    m_threadLimitSpinBox.setToolTip(workerThreadsToolTip);
+    m_documentUpdateThreshold.setMinimum(50);
+    m_documentUpdateThreshold.setMaximum(10000);
+    m_documentUpdateThreshold.setValue(settings.documentUpdateThreshold());
+    m_documentUpdateThreshold.setSingleStep(100);
+    m_documentUpdateThreshold.setSuffix(" ms");
+    m_documentUpdateThreshold.setToolTip(documentUpdateToolTip);
+    m_sizeThresholdCheckBox.setText(Tr::tr("Ignore files greater than"));
+    m_sizeThresholdCheckBox.setChecked(settings.sizeThresholdEnabled());
+    m_sizeThresholdCheckBox.setToolTip(sizeThresholdToolTip);
+    m_sizeThresholdSpinBox.setMinimum(1);
+    m_sizeThresholdSpinBox.setMaximum(std::numeric_limits<int>::max());
+    m_sizeThresholdSpinBox.setSuffix(" KB");
+    m_sizeThresholdSpinBox.setValue(settings.sizeThresholdInKb());
+    m_sizeThresholdSpinBox.setToolTip(sizeThresholdToolTip);
+
+    const auto completionResultsLabel = new QLabel(Tr::tr("Completion results:"));
+    completionResultsLabel->setToolTip(completionResultToolTip);
+    m_completionResults.setMinimum(0);
+    m_completionResults.setMaximum(std::numeric_limits<int>::max());
+    m_completionResults.setValue(settings.completionResults());
+    m_completionResults.setToolTip(completionResultToolTip);
+    m_completionResults.setSpecialValueText(Tr::tr("No limit"));
+
+    const auto layout = new QVBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->addWidget(&m_useClangdCheckBox);
+
+    const auto formLayout = new QFormLayout;
+    const auto chooserLabel = new QLabel(Tr::tr("Path to executable:"));
+    formLayout->addRow(chooserLabel, &m_clangdChooser);
+    formLayout->addRow(QString(), &m_versionWarningLabel);
+
+    const auto indexingPriorityLayout = new QHBoxLayout;
+    indexingPriorityLayout->addWidget(&m_indexingComboBox);
+    indexingPriorityLayout->addStretch(1);
+    const auto indexingPriorityLabel = new QLabel(Tr::tr("Background indexing:"));
+    indexingPriorityLabel->setToolTip(indexingToolTip);
+    formLayout->addRow(indexingPriorityLabel, indexingPriorityLayout);
+
+    for (const auto &[text, edit, toolTip, defaultValue] :
+         {std::make_tuple(Tr::tr("Per-project index location:"),
+                          &m_projectIndexPathTemplateLineEdit,
+                          projectIndexPathToolTip,
+                          ClangdSettings::defaultProjectIndexPathTemplate()),
+          std::make_tuple(Tr::tr("Per-session index location:"),
+                          &m_sessionIndexPathTemplateLineEdit,
+                          sessionIndexPathToolTip,
+                          ClangdSettings::defaultSessionIndexPathTemplate())}) {
+        if (isForProject && edit == &m_sessionIndexPathTemplateLineEdit)
+            continue;
+
+        const auto chooser = new Utils::VariableChooser(edit);
+        chooser->addSupportedWidget(edit);
+        chooser->addMacroExpanderProvider([] { return Utils::globalMacroExpander(); });
+
+        const auto resetButton = new QPushButton(Tr::tr("Reset"));
+        connect(resetButton, &QPushButton::clicked, [e = edit, v = defaultValue] { e->setText(v); });
+        const auto layout = new QHBoxLayout;
+        const auto label = new QLabel(text);
+        label->setToolTip(toolTip);
+        edit->setToolTip(toolTip);
+        layout->addWidget(edit);
+        layout->addWidget(resetButton);
+        formLayout->addRow(label, layout);
+    }
+
+    const auto headerSourceSwitchLayout = new QHBoxLayout;
+    headerSourceSwitchLayout->addWidget(&m_headerSourceSwitchComboBox);
+    headerSourceSwitchLayout->addStretch(1);
+    const auto headerSourceSwitchLabel = new QLabel(Tr::tr("Header/source switch mode:"));
+    headerSourceSwitchLabel->setToolTip(headerSourceSwitchToolTip);
+    formLayout->addRow(headerSourceSwitchLabel, headerSourceSwitchLayout);
+
+    const auto threadLimitLayout = new QHBoxLayout;
+    threadLimitLayout->addWidget(&m_threadLimitSpinBox);
+    threadLimitLayout->addStretch(1);
+    const auto threadLimitLabel = new QLabel(Tr::tr("Worker thread count:"));
+    threadLimitLabel->setToolTip(workerThreadsToolTip);
+    formLayout->addRow(threadLimitLabel, threadLimitLayout);
+
+    formLayout->addRow(QString(), &m_autoIncludeHeadersCheckBox);
+    formLayout->addRow(QString(), &m_updateDependentSourcesCheckBox);
+    const auto limitResultsLayout = new QHBoxLayout;
+    limitResultsLayout->addWidget(&m_completionResults);
+    limitResultsLayout->addStretch(1);
+    formLayout->addRow(completionResultsLabel, limitResultsLayout);
+
+    const auto completionRankingModelLayout = new QHBoxLayout;
+    completionRankingModelLayout->addWidget(&m_completionRankingModelComboBox);
+    completionRankingModelLayout->addStretch(1);
+    const auto completionRankingModelLabel = new QLabel(Tr::tr("Completion ranking model:"));
+    completionRankingModelLabel->setToolTip(completionRankingModelToolTip);
+    formLayout->addRow(completionRankingModelLabel, completionRankingModelLayout);
+
+    const auto documentUpdateThresholdLayout = new QHBoxLayout;
+    documentUpdateThresholdLayout->addWidget(&m_documentUpdateThreshold);
+    documentUpdateThresholdLayout->addStretch(1);
+    const auto documentUpdateThresholdLabel = new QLabel(Tr::tr("Document update threshold:"));
+    documentUpdateThresholdLabel->setToolTip(documentUpdateToolTip);
+    formLayout->addRow(documentUpdateThresholdLabel, documentUpdateThresholdLayout);
+    const auto sizeThresholdLayout = new QHBoxLayout;
+    sizeThresholdLayout->addWidget(&m_sizeThresholdSpinBox);
+    sizeThresholdLayout->addStretch(1);
+    formLayout->addRow(&m_sizeThresholdCheckBox, sizeThresholdLayout);
+
+    m_configSelectionWidget = new ClangDiagnosticConfigsSelectionWidget(formLayout);
+    m_configSelectionWidget->refresh(
+        diagnosticConfigsModel(settings.customDiagnosticConfigs()),
+        settings.diagnosticConfigId(),
+        [](const ClangDiagnosticConfigs &configs, const Utils::Id &configToSelect) {
+            return new CppEditor::ClangDiagnosticConfigsWidget(configs, configToSelect);
+        });
+
+    layout->addLayout(formLayout);
+    if (!isForProject) {
+        m_sessionsModel.setStringList(settingsData.sessionsWithOneClangd);
+        m_sessionsModel.sort(0);
+        m_sessionsGroupBox = new QGroupBox(Tr::tr("Sessions with a Single Clangd Instance"));
+        const auto sessionsView = new Utils::ListView;
+        sessionsView->setModel(&m_sessionsModel);
+        sessionsView->setToolTip(
+            Tr::tr("By default, Qt Creator runs one clangd process per project.\n"
+                   "If you have sessions with tightly coupled projects that should be\n"
+                   "managed by the same clangd process, add them here."));
+        const auto outerSessionsLayout = new QHBoxLayout;
+        const auto innerSessionsLayout = new QHBoxLayout(m_sessionsGroupBox);
+        const auto buttonsLayout = new QVBoxLayout;
+        const auto addButton = new QPushButton(Tr::tr("Add ..."));
+        const auto removeButton = new QPushButton(Tr::tr("Remove"));
+        buttonsLayout->addWidget(addButton);
+        buttonsLayout->addWidget(removeButton);
+        buttonsLayout->addStretch(1);
+        innerSessionsLayout->addWidget(sessionsView);
+        innerSessionsLayout->addLayout(buttonsLayout);
+        outerSessionsLayout->addWidget(m_sessionsGroupBox);
+        outerSessionsLayout->addStretch(1);
+
+        const auto separator = new QFrame;
+        separator->setFrameShape(QFrame::HLine);
+        layout->addWidget(separator);
+        layout->addLayout(outerSessionsLayout);
+
+        const auto updateRemoveButtonState = [removeButton, sessionsView] {
+            removeButton->setEnabled(sessionsView->selectionModel()->hasSelection());
+        };
+        connect(sessionsView->selectionModel(), &QItemSelectionModel::selectionChanged,
+                this, updateRemoveButtonState);
+        updateRemoveButtonState();
+        connect(removeButton, &QPushButton::clicked, this, [this, sessionsView] {
+            const QItemSelection selection = sessionsView->selectionModel()->selection();
+            QTC_ASSERT(!selection.isEmpty(), return);
+            m_sessionsModel.removeRow(selection.indexes().first().row());
+        });
+
+        connect(addButton, &QPushButton::clicked, this, [this, sessionsView] {
+            QInputDialog dlg(sessionsView);
+            QStringList sessions = Core::SessionManager::sessions();
+            QStringList currentSessions = m_sessionsModel.stringList();
+            for (const QString &s : std::as_const(currentSessions))
+                sessions.removeOne(s);
+            if (sessions.isEmpty())
+                return;
+            sessions.sort();
+            dlg.setLabelText(Tr::tr("Choose a session:"));
+            dlg.setComboBoxItems(sessions);
+            if (dlg.exec() == QDialog::Accepted) {
+                currentSessions << dlg.textValue();
+                m_sessionsModel.setStringList(currentSessions);
+                m_sessionsModel.sort(0);
+            }
+        });
+    }
+
+    const auto configFilesHelpLabel = new QLabel;
+    configFilesHelpLabel->setText(Tr::tr("Additional settings are available via "
+                                         "<a href=\"https://clangd.llvm.org/config\"> clangd configuration files</a>.<br>"
+                                         "User-specific settings go <a href=\"%1\">here</a>, "
+                                         "project-specific settings can be configured by putting a .clangd file into "
+                                         "the project source tree.")
+                                      .arg(ClangdSettings::clangdUserConfigFilePath().toUserOutput()));
+    configFilesHelpLabel->setWordWrap(true);
+    connect(configFilesHelpLabel, &QLabel::linkHovered, configFilesHelpLabel, &QLabel::setToolTip);
+    connect(configFilesHelpLabel, &QLabel::linkActivated, [](const QString &link) {
+        if (link.startsWith("https"))
+            QDesktopServices::openUrl(link);
+        else
+            Core::EditorManager::openEditor(Utils::FilePath::fromString(link));
+    });
+    layout->addWidget(Layouting::createHr());
+    layout->addWidget(configFilesHelpLabel);
+
+    layout->addStretch(1);
+
+    static const auto setWidgetsEnabled = [](QLayout *layout, bool enabled, const auto &f) -> void {
+        for (int i = 0; i < layout->count(); ++i) {
+            if (QWidget * const w = layout->itemAt(i)->widget())
+                w->setEnabled(enabled);
+            else if (QLayout * const l = layout->itemAt(i)->layout())
+                f(l, enabled, f);
+        }
+    };
+    const auto toggleEnabled = [this, formLayout](const bool checked) {
+        setWidgetsEnabled(formLayout, checked, setWidgetsEnabled);
+        if (m_sessionsGroupBox)
+            m_sessionsGroupBox->setEnabled(checked);
+    };
+    connect(&m_useClangdCheckBox, &QCheckBox::toggled, toggleEnabled);
+    toggleEnabled(m_useClangdCheckBox.isChecked());
+    m_threadLimitSpinBox.setEnabled(m_useClangdCheckBox.isChecked());
+
+    m_versionWarningLabel.setType(Utils::InfoLabel::Warning);
+    const auto updateWarningLabel = [this] {
+        class WarningLabelSetter {
+        public:
+            WarningLabelSetter(QLabel &label) : m_label(label) { m_label.clear(); }
+            ~WarningLabelSetter() { m_label.setVisible(!m_label.text().isEmpty()); }
+            void setWarning(const QString &text) { m_label.setText(text); }
+        private:
+            QLabel &m_label;
+        };
+        WarningLabelSetter labelSetter(m_versionWarningLabel);
+
+        if (!m_clangdChooser.isValid())
+            return;
+        const Utils::FilePath clangdPath = m_clangdChooser.filePath();
+        QString errorMessage;
+        if (!Utils::checkClangdVersion(clangdPath, &errorMessage))
+            labelSetter.setWarning(errorMessage);
+    };
+    connect(&m_clangdChooser, &Utils::PathChooser::textChanged, this, updateWarningLabel);
+    connect(&m_clangdChooser, &Utils::PathChooser::validChanged, this, updateWarningLabel);
+    updateWarningLabel();
+
+    connect(&m_useClangdCheckBox, &QCheckBox::toggled,
+            this, &ClangdSettingsWidget::settingsDataChanged);
+    connect(&m_indexingComboBox, &QComboBox::currentIndexChanged,
+            this, &ClangdSettingsWidget::settingsDataChanged);
+    connect(&m_projectIndexPathTemplateLineEdit, &QLineEdit::textChanged,
+            this, &ClangdSettingsWidget::settingsDataChanged);
+    connect(&m_sessionIndexPathTemplateLineEdit, &QLineEdit::textChanged,
+            this, &ClangdSettingsWidget::settingsDataChanged);
+    connect(&m_headerSourceSwitchComboBox, &QComboBox::currentIndexChanged,
+            this, &ClangdSettingsWidget::settingsDataChanged);
+    connect(&m_completionRankingModelComboBox, &QComboBox::currentIndexChanged,
+            this, &ClangdSettingsWidget::settingsDataChanged);
+    connect(&m_autoIncludeHeadersCheckBox, &QCheckBox::toggled,
+            this, &ClangdSettingsWidget::settingsDataChanged);
+    connect(&m_updateDependentSourcesCheckBox, &QCheckBox::toggled,
+            this, &ClangdSettingsWidget::settingsDataChanged);
+    connect(&m_threadLimitSpinBox, &QSpinBox::valueChanged,
+            this, &ClangdSettingsWidget::settingsDataChanged);
+    connect(&m_sizeThresholdCheckBox, &QCheckBox::toggled,
+            this, &ClangdSettingsWidget::settingsDataChanged);
+    connect(&m_sizeThresholdSpinBox, &QSpinBox::valueChanged,
+            this, &ClangdSettingsWidget::settingsDataChanged);
+    connect(&m_documentUpdateThreshold, &QSpinBox::valueChanged,
+            this, &ClangdSettingsWidget::settingsDataChanged);
+    connect(&m_clangdChooser, &Utils::PathChooser::textChanged,
+            this, &ClangdSettingsWidget::settingsDataChanged);
+    connect(m_configSelectionWidget, &ClangDiagnosticConfigsSelectionWidget::changed,
+            this, &ClangdSettingsWidget::settingsDataChanged);
+    connect(&m_completionResults, &QSpinBox::valueChanged,
+            this, &ClangdSettingsWidget::settingsDataChanged);
+}
+
+ClangdSettings::Data ClangdSettingsWidget::settingsData() const
+{
+    ClangdSettings::Data data;
+    data.useClangd = m_useClangdCheckBox.isChecked();
+    data.executableFilePath = m_clangdChooser.filePath();
+    data.indexingPriority = ClangdSettings::IndexingPriority(
+        m_indexingComboBox.currentData().toInt());
+    data.projectIndexPathTemplate = m_projectIndexPathTemplateLineEdit.text();
+    data.sessionIndexPathTemplate = m_sessionIndexPathTemplateLineEdit.text();
+    data.headerSourceSwitchMode = ClangdSettings::HeaderSourceSwitchMode(
+        m_headerSourceSwitchComboBox.currentData().toInt());
+    data.completionRankingModel = ClangdSettings::CompletionRankingModel(
+        m_completionRankingModelComboBox.currentData().toInt());
+    data.autoIncludeHeaders = m_autoIncludeHeadersCheckBox.isChecked();
+    data.updateDependentSources = m_updateDependentSourcesCheckBox.isChecked();
+    data.workerThreadLimit = m_threadLimitSpinBox.value();
+    data.documentUpdateThreshold = m_documentUpdateThreshold.value();
+    data.sizeThresholdEnabled = m_sizeThresholdCheckBox.isChecked();
+    data.sizeThresholdInKb = m_sizeThresholdSpinBox.value();
+    data.sessionsWithOneClangd = m_sessionsModel.stringList();
+    data.customDiagnosticConfigs = m_configSelectionWidget->customConfigs();
+    data.diagnosticConfigId = m_configSelectionWidget->currentConfigId();
+    data.completionResults = m_completionResults.value();
+    return data;
+}
+
+class ClangdSettingsPageWidget final : public Core::IOptionsPageWidget
+{
+public:
+    ClangdSettingsPageWidget() : m_widget(ClangdSettings::instance().data(), false)
+    {
+        const auto layout = new QVBoxLayout(this);
+        layout->addWidget(&m_widget);
+    }
+
+private:
+    void apply() final { ClangdSettings::instance().setData(m_widget.settingsData()); }
+
+    ClangdSettingsWidget m_widget;
+};
+
+class ClangdSettingsPage final : public Core::IOptionsPage
+{
+public:
+    ClangdSettingsPage()
+    {
+        setId(Constants::CPP_CLANGD_SETTINGS_ID);
+        setDisplayName(Tr::tr("Clangd"));
+        setCategory(Constants::CPP_SETTINGS_CATEGORY);
+        setWidgetCreator([] { return new ClangdSettingsPageWidget; });
+    }
+};
+
+void setupClangdSettingsPage()
+{
+    static ClangdSettingsPage theClangdSettingsPage;
+}
+
+class ClangdProjectSettingsWidget : public ProjectSettingsWidget
+{
+public:
+    ClangdProjectSettingsWidget(const ClangdProjectSettings &settings)
+        : m_settings(settings), m_widget(settings.settings(), true)
+    {
+        setGlobalSettingsId(Constants::CPP_CLANGD_SETTINGS_ID);
+        const auto layout = new QVBoxLayout(this);
+        layout->setContentsMargins(0, 0, 0, 0);
+        layout->addWidget(&m_widget);
+
+        const auto updateGlobalSettingsCheckBox = [this] {
+            if (ClangdSettings::instance().granularity() == ClangdSettings::Granularity::Session) {
+                setUseGlobalSettingsCheckBoxEnabled(false);
+                setUseGlobalSettings(true);
+            } else {
+                setUseGlobalSettingsCheckBoxEnabled(true);
+                setUseGlobalSettings(m_settings.useGlobalSettings());
+            }
+            m_widget.setEnabled(!useGlobalSettings());
+        };
+
+        updateGlobalSettingsCheckBox();
+        connect(&ClangdSettings::instance(), &ClangdSettings::changed,
+                this, updateGlobalSettingsCheckBox);
+
+        connect(this, &ProjectSettingsWidget::useGlobalSettingsChanged, this,
+                [this](bool checked) {
+                    m_widget.setEnabled(!checked);
+                    m_settings.setUseGlobalSettings(checked);
+                    if (!checked)
+                        m_settings.setSettings(m_widget.settingsData());
+                });
+
+        const auto timer = new QTimer(this);
+        timer->setSingleShot(true);
+        timer->setInterval(5000);
+        connect(timer, &QTimer::timeout, this, [this] {
+            m_settings.setSettings(m_widget.settingsData());
+        });
+        connect(&m_widget, &ClangdSettingsWidget::settingsDataChanged,
+                timer, qOverload<>(&QTimer::start));
+    }
+
+private:
+    ClangdProjectSettings m_settings;
+    ClangdSettingsWidget m_widget;
+};
+
+class ClangdProjectSettingsPanelFactory final : public ProjectPanelFactory
+{
+public:
+    ClangdProjectSettingsPanelFactory()
+    {
+        setPriority(100);
+        setDisplayName(Tr::tr("Clangd"));
+        setCreateWidgetFunction([](Project *project) {
+            return new ClangdProjectSettingsWidget(project);
+        });
+    }
+};
+
+void setupClangdProjectSettingsPanel()
+{
+    static ClangdProjectSettingsPanelFactory theClangdProjectSettingsPanelFactory;
+}
+
+} // namespace Internal
+} // namespace CppEditor
+
+#include <clangdsettings.moc>
diff --git a/src/plugins/cppeditor/clangdsettings.h b/src/plugins/cppeditor/clangdsettings.h
new file mode 100644
index 00000000000..e4fb22f5527
--- /dev/null
+++ b/src/plugins/cppeditor/clangdsettings.h
@@ -0,0 +1,170 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "clangdiagnosticconfig.h"
+#include "cppeditor_global.h"
+
+#include <utils/filepath.h>
+#include <utils/store.h>
+
+namespace ProjectExplorer { class Project; }
+namespace Utils { class MacroExpander; }
+
+namespace CppEditor {
+
+// TODO: Can we move this to ClangCodeModel?
+class CPPEDITOR_EXPORT ClangdSettings : public QObject
+{
+    Q_OBJECT
+public:
+    enum class IndexingPriority { Off, Background, Normal, Low, };
+    enum class HeaderSourceSwitchMode { BuiltinOnly, ClangdOnly, Both };
+    enum class CompletionRankingModel { Default, DecisionForest, Heuristics };
+
+    static QString priorityToString(const IndexingPriority &priority);
+    static QString priorityToDisplayString(const IndexingPriority &priority);
+    static QString headerSourceSwitchModeToDisplayString(HeaderSourceSwitchMode mode);
+    static QString rankingModelToCmdLineString(CompletionRankingModel model);
+    static QString rankingModelToDisplayString(CompletionRankingModel model);
+    static QString defaultProjectIndexPathTemplate();
+    static QString defaultSessionIndexPathTemplate();
+
+    class CPPEDITOR_EXPORT Data
+    {
+    public:
+        Utils::Store toMap() const;
+        void fromMap(const Utils::Store &map);
+
+        friend bool operator==(const Data &s1, const Data &s2)
+        {
+            return s1.useClangd == s2.useClangd
+                   && s1.executableFilePath == s2.executableFilePath
+                   && s1.projectIndexPathTemplate == s2.projectIndexPathTemplate
+                   && s1.sessionIndexPathTemplate == s2.sessionIndexPathTemplate
+                   && s1.sessionsWithOneClangd == s2.sessionsWithOneClangd
+                   && s1.customDiagnosticConfigs == s2.customDiagnosticConfigs
+                   && s1.diagnosticConfigId == s2.diagnosticConfigId
+                   && s1.workerThreadLimit == s2.workerThreadLimit
+                   && s1.indexingPriority == s2.indexingPriority
+                   && s1.headerSourceSwitchMode == s2.headerSourceSwitchMode
+                   && s1.completionRankingModel == s2.completionRankingModel
+                   && s1.autoIncludeHeaders == s2.autoIncludeHeaders
+                   && s1.documentUpdateThreshold == s2.documentUpdateThreshold
+                   && s1.sizeThresholdEnabled == s2.sizeThresholdEnabled
+                   && s1.sizeThresholdInKb == s2.sizeThresholdInKb
+                   && s1.haveCheckedHardwareReqirements == s2.haveCheckedHardwareReqirements
+                   && s1.updateDependentSources == s2.updateDependentSources
+                   && s1.completionResults == s2.completionResults;
+        }
+        friend bool operator!=(const Data &s1, const Data &s2) { return !(s1 == s2); }
+
+        Utils::FilePath executableFilePath;
+        QStringList sessionsWithOneClangd;
+        ClangDiagnosticConfigs customDiagnosticConfigs;
+        Utils::Id diagnosticConfigId;
+
+        int workerThreadLimit = 0;
+        int documentUpdateThreshold = 500;
+        qint64 sizeThresholdInKb = 1024;
+        bool useClangd = true;
+        IndexingPriority indexingPriority = IndexingPriority::Low;
+        QString projectIndexPathTemplate = defaultProjectIndexPathTemplate();
+        QString sessionIndexPathTemplate = defaultSessionIndexPathTemplate();
+        HeaderSourceSwitchMode headerSourceSwitchMode = HeaderSourceSwitchMode::Both;
+        CompletionRankingModel completionRankingModel = CompletionRankingModel::Default;
+        bool autoIncludeHeaders = false;
+        bool sizeThresholdEnabled = false;
+        bool haveCheckedHardwareReqirements = false;
+        bool updateDependentSources = false;
+        int completionResults = defaultCompletionResults();
+
+    private:
+        static int defaultCompletionResults();
+    };
+
+    ClangdSettings(const Data &data) : m_data(data) {}
+
+    static ClangdSettings &instance();
+    bool useClangd() const;
+    static void setUseClangd(bool use);
+    static void setUseClangdAndSave(bool use);
+
+    static bool hardwareFulfillsRequirements();
+    static bool haveCheckedHardwareRequirements();
+
+    static void setDefaultClangdPath(const Utils::FilePath &filePath);
+    static void setCustomDiagnosticConfigs(const ClangDiagnosticConfigs &configs);
+    Utils::FilePath clangdFilePath() const;
+    IndexingPriority indexingPriority() const { return m_data.indexingPriority; }
+    Utils::FilePath projectIndexPath(const Utils::MacroExpander &expander) const;
+    Utils::FilePath sessionIndexPath(const Utils::MacroExpander &expander) const;
+    HeaderSourceSwitchMode headerSourceSwitchMode() const { return m_data.headerSourceSwitchMode; }
+    CompletionRankingModel completionRankingModel() const { return m_data.completionRankingModel; }
+    bool autoIncludeHeaders() const { return m_data.autoIncludeHeaders; }
+    bool updateDependentSources() const { return m_data.updateDependentSources; }
+    int workerThreadLimit() const { return m_data.workerThreadLimit; }
+    int documentUpdateThreshold() const { return m_data.documentUpdateThreshold; }
+    qint64 sizeThresholdInKb() const { return m_data.sizeThresholdInKb; }
+    bool sizeThresholdEnabled() const { return m_data.sizeThresholdEnabled; }
+    int completionResults() const { return m_data.completionResults; }
+    bool sizeIsOkay(const Utils::FilePath &fp) const;
+    ClangDiagnosticConfigs customDiagnosticConfigs() const;
+    Utils::Id diagnosticConfigId() const;
+    ClangDiagnosticConfig diagnosticConfig() const;
+
+    enum class Granularity { Project, Session };
+    Granularity granularity() const;
+
+    void setData(const Data &data, bool saveAndEmitSignal = true);
+    Data data() const { return m_data; }
+
+    Utils::FilePath clangdIncludePath() const;
+    static Utils::FilePath clangdUserConfigFilePath();
+
+#ifdef WITH_TESTS
+    static void setClangdFilePath(const Utils::FilePath &filePath);
+#endif
+
+signals:
+    void changed();
+
+private:
+    ClangdSettings();
+
+    void loadSettings();
+    void saveSettings();
+
+    Data m_data;
+};
+
+class CPPEDITOR_EXPORT ClangdProjectSettings
+{
+public:
+    ClangdProjectSettings(ProjectExplorer::Project *project);
+
+    ClangdSettings::Data settings() const;
+    void setSettings(const ClangdSettings::Data &data);
+    bool useGlobalSettings() const { return m_useGlobalSettings; }
+    void setUseGlobalSettings(bool useGlobal);
+    void setDiagnosticConfigId(Utils::Id configId);
+    void blockIndexing();
+    void unblockIndexing();
+
+private:
+    void loadSettings();
+    void saveSettings();
+
+    ProjectExplorer::Project * const m_project;
+    ClangdSettings::Data m_customSettings;
+    bool m_useGlobalSettings = true;
+    bool m_blockIndexing = false;
+};
+
+namespace Internal {
+void setupClangdProjectSettingsPanel();
+void setupClangdSettingsPage();
+}
+
+} // namespace CppEditor
diff --git a/src/plugins/cppeditor/compileroptionsbuilder.cpp b/src/plugins/cppeditor/compileroptionsbuilder.cpp
index be40b9c914f..8bd1219a5d2 100644
--- a/src/plugins/cppeditor/compileroptionsbuilder.cpp
+++ b/src/plugins/cppeditor/compileroptionsbuilder.cpp
@@ -692,8 +692,7 @@ void CompilerOptionsBuilder::addIncludeDirOptionForPath(const HeaderPath &path)
     if (path.type == HeaderPathType::BuiltIn) {
         systemPath = true;
     } else if (path.type == HeaderPathType::System) {
-        if (m_useSystemHeader == UseSystemHeader::Yes)
-            systemPath = true;
+        systemPath = true;
     } else {
         // ProjectExplorer::HeaderPathType::User
         if (m_useSystemHeader == UseSystemHeader::Yes && m_projectPart.hasProject()
@@ -900,8 +899,8 @@ void CompilerOptionsBuilder::evaluateCompilerFlags()
             continue;
         }
 
-        // GCC option that clang doesn't know.
-        if (option.contains("direct-extern-access"))
+        // GCC options that clang doesn't know.
+        if (option.contains("direct-extern-access") || option == "-fnothrow-opt")
             continue;
 
         // These were already parsed into ProjectPart::includedFiles.
diff --git a/src/plugins/cppeditor/compileroptionsbuilder.h b/src/plugins/cppeditor/compileroptionsbuilder.h
index 3a8c1446a52..3c72dee2c64 100644
--- a/src/plugins/cppeditor/compileroptionsbuilder.h
+++ b/src/plugins/cppeditor/compileroptionsbuilder.h
@@ -9,7 +9,7 @@
 
 namespace CppEditor {
 
-enum class UsePrecompiledHeaders : char { Yes, No };
+enum class UsePrecompiledHeaders { Yes, No };
 enum class UseSystemHeader : char { Yes, No };
 enum class UseTweakedHeaderPaths : char { Yes, Tools, No };
 enum class UseToolchainMacros : char { Yes, No };
diff --git a/src/plugins/cppeditor/compileroptionsbuilder_test.cpp b/src/plugins/cppeditor/compileroptionsbuilder_test.cpp
index ed53ef99229..81cade277c3 100644
--- a/src/plugins/cppeditor/compileroptionsbuilder_test.cpp
+++ b/src/plugins/cppeditor/compileroptionsbuilder_test.cpp
@@ -196,7 +196,7 @@ void CompilerOptionsBuilderTest::testHeaderPathOptionsOrder()
 
     QCOMPARE(compilerOptionsBuilder.options(),
              (QStringList{"-nostdinc", "-nostdinc++", "-I" + t.toNative("/tmp/path"),
-                         "-I" + t.toNative("/tmp/system_path"), "-isystem", t.toNative("/dummy"),
+                          "-isystem", t.toNative("/tmp/system_path"), "-isystem", t.toNative("/dummy"),
                           "-isystem", t.toNative("/tmp/builtin_path")}));
 }
 
@@ -212,9 +212,9 @@ void CompilerOptionsBuilderTest::testHeaderPathOptionsOrderMsvc()
 
     QCOMPARE(compilerOptionsBuilder.options(),
              (QStringList{"-nostdinc", "-nostdinc++", "-I" + t.toNative("/tmp/path"),
-                            "-I" + t.toNative("/tmp/system_path"), "/clang:-isystem",
-                          "/clang:" + t.toNative("/dummy"), "/clang:-isystem",
-                          "/clang:" + t.toNative("/tmp/builtin_path")}));
+                          "/clang:-isystem", "/clang:" + t.toNative("/tmp/system_path"),
+                          "/clang:-isystem", "/clang:" + t.toNative("/dummy"),
+                          "/clang:-isystem", "/clang:" + t.toNative("/tmp/builtin_path")}));
 }
 
 void CompilerOptionsBuilderTest::testUseSystemHeader()
@@ -239,7 +239,7 @@ void CompilerOptionsBuilderTest::testNoClangHeadersPath()
     t.compilerOptionsBuilder->addHeaderPathOptions();
 
     QCOMPARE(t.compilerOptionsBuilder->options(),
-             (QStringList{"-I" + t.toNative("/tmp/path"), "-I" + t.toNative("/tmp/system_path")}));
+             (QStringList{"-I" + t.toNative("/tmp/path"), "-isystem", t.toNative("/tmp/system_path")}));
 }
 
 void CompilerOptionsBuilderTest::testClangHeadersAndCppIncludePathsOrderMacOs()
@@ -260,7 +260,7 @@ void CompilerOptionsBuilderTest::testClangHeadersAndCppIncludePathsOrderMacOs()
 
     QCOMPARE(compilerOptionsBuilder.options(),
              (QStringList{"-nostdinc", "-nostdinc++", "-I" + t.toNative("/tmp/path"),
-                          "-I" + t.toNative("/tmp/system_path"),
+                          "-isystem", t.toNative("/tmp/system_path"),
                           "-isystem", t.toNative("/usr/include/c++/4.2.1"),
                           "-isystem", t.toNative("/usr/include/c++/4.2.1/backward"),
                           "-isystem", t.toNative("/usr/local/include"),
@@ -599,7 +599,7 @@ void CompilerOptionsBuilderTest::testBuildAllOptions()
                           wrappedQtHeadersPath,         // contains -I already
                           wrappedQtCoreHeadersPath,     // contains -I already
                           "-I" + t.toNative("/tmp/path"),
-                          "-I" + t.toNative("/tmp/system_path"),
+                          "-isystem", t.toNative("/tmp/system_path"),
                           "-isystem", t.toNative("/dummy"),
                           "-isystem", t.toNative("/tmp/builtin_path")}));
 }
@@ -628,7 +628,7 @@ void CompilerOptionsBuilderTest::testBuildAllOptionsMsvc()
                           wrappedQtHeadersPath,         // contains -I already
                           wrappedQtCoreHeadersPath,     // contains -I already
                           "-I" + t.toNative("/tmp/path"),
-                          "-I" + t.toNative("/tmp/system_path"),
+                          "/clang:-isystem", "/clang:" + t.toNative("/tmp/system_path"),
                           "/clang:-isystem", "/clang:" + t.toNative("/dummy"),
                           "/clang:-isystem", "/clang:" + t.toNative("/tmp/builtin_path")}));
 }
@@ -659,7 +659,7 @@ void CompilerOptionsBuilderTest::testBuildAllOptionsMsvcWithExceptions()
                           wrappedQtHeadersPath,             // contains -I already
                           wrappedQtCoreHeadersPath,         // contains -I already
                           "-I" + t.toNative("/tmp/path"),
-                          "-I" + t.toNative("/tmp/system_path"),
+                          "/clang:-isystem", "/clang:" + t.toNative("/tmp/system_path"),
                           "/clang:-isystem", "/clang:" + t.toNative("/dummy"),
                           "/clang:-isystem", "/clang:" + t.toNative("/tmp/builtin_path")}));
 }
diff --git a/src/plugins/cppeditor/cppautocompleter.cpp b/src/plugins/cppeditor/cppautocompleter.cpp
index 07101318628..e5560e9d969 100644
--- a/src/plugins/cppeditor/cppautocompleter.cpp
+++ b/src/plugins/cppeditor/cppautocompleter.cpp
@@ -6,7 +6,6 @@
 #include <cplusplus/MatchingText.h>
 
 #include <texteditor/tabsettings.h>
-#include <texteditor/syntaxhighlighterrunner.h>
 
 #include <QTextBlock>
 #include <QTextCursor>
@@ -17,6 +16,7 @@
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <texteditor/icodestylepreferences.h>
+#include <texteditor/syntaxhighlighter.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>
 #include <texteditor/texteditorsettings.h>
@@ -276,9 +276,9 @@ void AutoCompleterTest::testAutoComplete()
 
     TextEditor::BaseTextEditor *cppEditor = creteCppEditor(text);
     QVERIFY(cppEditor);
-    QTRY_VERIFY(cppEditor->textDocument()->syntaxHighlighterRunner()->syntaxInfoUpdated());
+    QTRY_VERIFY(cppEditor->textDocument()->syntaxHighlighter()->syntaxHighlighterUpToDate());
     QTextCursor tc = openEditor(cppEditor);
-    QTRY_VERIFY(cppEditor->textDocument()->syntaxHighlighterRunner()->syntaxInfoUpdated());
+    QTRY_VERIFY(cppEditor->textDocument()->syntaxHighlighter()->syntaxHighlighterUpToDate());
 
     QVERIFY(!tc.isNull());
 
@@ -339,9 +339,9 @@ void AutoCompleterTest::testSurroundWithSelection()
     const QScopeGuard cleanup([] { Core::EditorManager::closeAllEditors(false); });
     TextEditor::BaseTextEditor *cppEditor = creteCppEditor(text);
     QVERIFY(cppEditor);
-    QTRY_VERIFY(cppEditor->textDocument()->syntaxHighlighterRunner()->syntaxInfoUpdated());
+    QTRY_VERIFY(cppEditor->textDocument()->syntaxHighlighter()->syntaxHighlighterUpToDate());
     QTextCursor tc = openEditor(cppEditor);
-    QTRY_VERIFY(cppEditor->textDocument()->syntaxHighlighterRunner()->syntaxInfoUpdated());
+    QTRY_VERIFY(cppEditor->textDocument()->syntaxHighlighter()->syntaxHighlighterUpToDate());
 
     QVERIFY(!tc.isNull());
 
@@ -376,9 +376,9 @@ void AutoCompleterTest::testAutoBackspace()
     const QScopeGuard cleanup([] { Core::EditorManager::closeAllEditors(false); });
     TextEditor::BaseTextEditor *cppEditor = creteCppEditor(text);
     QVERIFY(cppEditor);
-    QTRY_VERIFY(cppEditor->textDocument()->syntaxHighlighterRunner()->syntaxInfoUpdated());
+    QTRY_VERIFY(cppEditor->textDocument()->syntaxHighlighter()->syntaxHighlighterUpToDate());
     QTextCursor tc = openEditor(cppEditor);
-    QTRY_VERIFY(cppEditor->textDocument()->syntaxHighlighterRunner()->syntaxInfoUpdated());
+    QTRY_VERIFY(cppEditor->textDocument()->syntaxHighlighter()->syntaxHighlighterUpToDate());
 
     QVERIFY(!tc.isNull());
 
@@ -420,9 +420,9 @@ void AutoCompleterTest::testInsertParagraph()
     const QScopeGuard cleanup([] { Core::EditorManager::closeAllEditors(false); });
     TextEditor::BaseTextEditor *cppEditor = creteCppEditor(text);
     QVERIFY(cppEditor);
-    QTRY_VERIFY(cppEditor->textDocument()->syntaxHighlighterRunner()->syntaxInfoUpdated());
+    QTRY_VERIFY(cppEditor->textDocument()->syntaxHighlighter()->syntaxHighlighterUpToDate());
     QTextCursor tc = openEditor(cppEditor);
-    QTRY_VERIFY(cppEditor->textDocument()->syntaxHighlighterRunner()->syntaxInfoUpdated());
+    QTRY_VERIFY(cppEditor->textDocument()->syntaxHighlighter()->syntaxHighlighterUpToDate());
 
     QVERIFY(!tc.isNull());
 
diff --git a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp
index 0133292703d..3a82a411326 100644
--- a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp
+++ b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp
@@ -111,7 +111,8 @@ void BuiltinModelManagerSupport::followSymbol(const CursorInEditor &data,
     SymbolFinder finder;
     m_followSymbol->findLink(data, processLinkCallback,
             resolveTarget, CppModelManager::snapshot(),
-            data.editorWidget()->semanticInfo().doc, &finder, inNextSplit);
+            data.editorWidget() ? data.editorWidget()->semanticInfo().doc : data.cppDocument(),
+            &finder, inNextSplit);
 }
 
 void BuiltinModelManagerSupport::followSymbolToType(const CursorInEditor &data,
diff --git a/src/plugins/cppeditor/cppcodeformatter.cpp b/src/plugins/cppeditor/cppcodeformatter.cpp
index e0e22fc6fe1..85c841e2c72 100644
--- a/src/plugins/cppeditor/cppcodeformatter.cpp
+++ b/src/plugins/cppeditor/cppcodeformatter.cpp
@@ -152,6 +152,12 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block)
             case T_GREATER_GREATER: break;
             case T_LBRACKET: break;
             case T_NAMESPACE:   leave(); enter(namespace_start); break;
+            case T_IDENTIFIER:
+                if (isStatementMacroOrEquivalent()) {
+                    enter(qt_like_macro);
+                    break;
+                }
+                [[fallthrough]];
             default:            tryExpression(true); break;
             } break;
 
@@ -205,7 +211,7 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block)
             case T_IDENTIFIER:          // '&', id, 'this' are allowed both in the capture list and subscribtion
             case T_AMPER:
             case T_THIS:        break;
-            default:            leave(); leave(); tryExpression(m_currentState.at(m_currentState.size() - 1).type == declaration_start); break;
+            default:            tryExpression(m_currentState.at(m_currentState.size() - 2).type == declaration_start); break;
                                         // any other symbol allowed only in subscribtion operator
             } break;
 
@@ -272,7 +278,16 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block)
             case T_SEMICOLON:   leave(true); break;
             case T_LBRACE:      enter(brace_list_open); break;
             case T_RBRACE:      leave(true); continue;
-            case T_RPAREN:      leave(); break;
+            case T_RPAREN:
+                leave();
+                if (m_currentState.top().type == qt_like_macro && m_currentState.size() > 1
+                    && m_currentState.at(m_currentState.size() - 2).type == declaration_start) {
+                    leave();
+                    leave();
+                } else if (m_currentState.top().type == catch_statement) {
+                    turnInto(substatement);
+                }
+                break;
             default:            tryExpression(); break;
             } break;
 
@@ -401,6 +416,11 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block)
             default:            leave(true); continue;
             } break;
 
+        case catch_statement:
+            switch (kind) {
+            case T_LPAREN:      enter(arglist_open); break;
+            } break;
+
         case for_statement_paren_open:
             enter(for_statement_init); continue;
 
@@ -754,6 +774,16 @@ void CodeFormatter::correctIndentation(const QTextBlock &block)
     adjustIndent(m_tokens, lexerState, &m_indentDepth, &m_paddingDepth);
 }
 
+bool CodeFormatter::isStatementMacroOrEquivalent() const
+{
+    const QStringView tokenText = currentTokenText();
+    return tokenText.startsWith(QLatin1String("Q_"))
+           || tokenText.startsWith(QLatin1String("QT_"))
+           || tokenText.startsWith(QLatin1String("QML_"))
+           || tokenText.startsWith(QLatin1String("QDOC_"))
+           || m_statementMacros.contains(tokenText);
+}
+
 bool CodeFormatter::tryExpression(bool alsoExpression)
 {
     int newState = -1;
@@ -838,11 +868,7 @@ bool CodeFormatter::tryDeclaration()
         return true;
     case T_IDENTIFIER:
         if (m_tokenIndex == 0) {
-            const QStringView tokenText = currentTokenText();
-            if (tokenText.startsWith(QLatin1String("Q_"))
-                    || tokenText.startsWith(QLatin1String("QT_"))
-                    || tokenText.startsWith(QLatin1String("QML_"))
-                    || tokenText.startsWith(QLatin1String("QDOC_"))) {
+            if (isStatementMacroOrEquivalent()) {
                 enter(qt_like_macro);
                 return true;
             }
@@ -946,6 +972,12 @@ bool CodeFormatter::tryStatement()
         enter(do_statement);
         enter(substatement);
         return true;
+    case T_TRY:
+        enter(substatement);
+        return true;
+    case T_CATCH:
+        enter(catch_statement);
+        return true;
     case T_CASE:
     case T_DEFAULT:
         enter(case_start);
@@ -1118,6 +1150,7 @@ QtStyleCodeFormatter::QtStyleCodeFormatter(const TabSettings &tabSettings,
     , m_styleSettings(settings)
 {
     setTabSize(tabSettings.m_tabSize);
+    setStatementMacros(m_styleSettings.statementMacros);
 }
 
 void QtStyleCodeFormatter::setTabSettings(const TabSettings &tabSettings)
@@ -1129,6 +1162,7 @@ void QtStyleCodeFormatter::setTabSettings(const TabSettings &tabSettings)
 void QtStyleCodeFormatter::setCodeStyleSettings(const CppCodeStyleSettings &settings)
 {
     m_styleSettings = settings;
+    setStatementMacros(m_styleSettings.statementMacros);
 }
 
 void QtStyleCodeFormatter::saveBlockData(QTextBlock *block, const BlockData &data) const
diff --git a/src/plugins/cppeditor/cppcodeformatter.h b/src/plugins/cppeditor/cppcodeformatter.h
index 828fec763b0..f3d69422ee0 100644
--- a/src/plugins/cppeditor/cppcodeformatter.h
+++ b/src/plugins/cppeditor/cppcodeformatter.h
@@ -40,6 +40,7 @@ public:
     void indentForNewLineAfter(const QTextBlock &block, int *indent, int *padding);
 
     void setTabSize(int tabSize);
+    void setStatementMacros(const QStringList &macros) { m_statementMacros = macros; }
 
     void invalidateCache(QTextDocument *document);
 
@@ -118,6 +119,8 @@ public: // must be public to make Q_GADGET introspection work
         for_statement_condition, // The condition part of the for statement
         for_statement_expression, // The expression part of the for statement
 
+        catch_statement,
+
         switch_statement, // After 'switch' token
         case_start, // after a 'case' or 'default' token
         case_cont, // after the colon in a case/default
@@ -208,6 +211,8 @@ private:
     void leave(bool statementDone = false);
     void correctIndentation(const QTextBlock &block);
 
+    bool isStatementMacroOrEquivalent() const;
+
 private:
     static QStack<State> initialState();
 
@@ -224,6 +229,7 @@ private:
     int m_paddingDepth = 0;
 
     int m_tabSize = 4;
+    QStringList m_statementMacros;
 
     friend class Internal::CppCodeFormatterData;
 };
diff --git a/src/plugins/cppeditor/cppcodegen_test.cpp b/src/plugins/cppeditor/cppcodegen_test.cpp
index 468e7039303..b48ffa77bad 100644
--- a/src/plugins/cppeditor/cppcodegen_test.cpp
+++ b/src/plugins/cppeditor/cppcodegen_test.cpp
@@ -261,7 +261,7 @@ void CodegenTest::testProtectedBetweenPublicAndPrivate()
     Should insert at line 18, column 1, with "private slots:\n" as prefix and "\n"
     as suffix.
 
-    This is the typical Qt Designer case, with test-input like what the integration
+    This is the typical \QD case, with test-input like what the integration
     generates.
  */
 void CodegenTest::testQtdesignerIntegration()
diff --git a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
index 542edbd57a7..56c62dfca07 100644
--- a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
+++ b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
@@ -1445,11 +1445,11 @@ CppCodeModelInspectorDialog::CppCodeModelInspectorDialog(QWidget *parent)
         Tab("&Defines",
             Column {
                 Group {
-                    title("Toolchain Defines"),
+                    title(QString("Toolchain Defines")),
                     Column { m_partToolchainDefinesEdit },
                 },
                 Group {
-                    title("Project Defines"),
+                    title(QString("Project Defines")),
                     Column { m_partProjectDefinesEdit },
                 }
             }
diff --git a/src/plugins/cppeditor/cppcodemodelsettings.cpp b/src/plugins/cppeditor/cppcodemodelsettings.cpp
index ae34e5ddbbf..5dde29a49cf 100644
--- a/src/plugins/cppeditor/cppcodemodelsettings.cpp
+++ b/src/plugins/cppeditor/cppcodemodelsettings.cpp
@@ -3,611 +3,461 @@
 
 #include "cppcodemodelsettings.h"
 
-#include "clangdiagnosticconfigsmodel.h"
+#include "compileroptionsbuilder.h"
 #include "cppeditorconstants.h"
 #include "cppeditortr.h"
-#include "cpptoolsreuse.h"
+#include "cppmodelmanager.h"
 
+#include <coreplugin/dialogs/ioptionspage.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/session.h>
 
 #include <projectexplorer/project.h>
+#include <projectexplorer/projectmanager.h>
+#include <projectexplorer/projectpanelfactory.h>
+#include <projectexplorer/projectsettingswidget.h>
 
 #include <utils/algorithm.h>
 #include <utils/hostosinfo.h>
+#include <utils/layoutbuilder.h>
 #include <utils/macroexpander.h>
-#include <utils/qtcprocess.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcsettings.h>
+#include <utils/store.h>
 
+#include <QCheckBox>
 #include <QDateTime>
+#include <QDir>
 #include <QHash>
 #include <QPair>
+#include <QPlainTextEdit>
 #include <QSettings>
-#include <QStandardPaths>
+#include <QSpinBox>
+#include <QTimer>
+#include <QVBoxLayout>
 
+using namespace ProjectExplorer;
 using namespace Utils;
 
-namespace CppEditor {
 
-static Id initialClangDiagnosticConfigId() { return Constants::CPP_CLANG_DIAG_CONFIG_BUILDSYSTEM; }
-static CppCodeModelSettings::PCHUsage initialPchUsage()
-    { return CppCodeModelSettings::PchUse_BuildSystem; }
-static Key enableLowerClazyLevelsKey() { return "enableLowerClazyLevels"; }
+namespace CppEditor {
+namespace {
+class CppCodeModelProjectSettings
+{
+public:
+    CppCodeModelProjectSettings(ProjectExplorer::Project *project);
+
+    CppCodeModelSettings settings() const;
+    void setSettings(const CppCodeModelSettings &settings);
+    void forceCustomSettingsSettings(const CppCodeModelSettings &settings);
+    bool useGlobalSettings() const { return m_useGlobalSettings; }
+    void setUseGlobalSettings(bool useGlobal);
+
+private:
+    void loadSettings();
+    void saveSettings();
+
+    ProjectExplorer::Project * const m_project;
+    CppCodeModelSettings m_customSettings;
+    bool m_useGlobalSettings = true;
+};
+} // namespace
+
 static Key pchUsageKey() { return Constants::CPPEDITOR_MODEL_MANAGER_PCH_USAGE; }
 static Key interpretAmbiguousHeadersAsCHeadersKey()
     { return Constants::CPPEDITOR_INTERPRET_AMBIGIUOUS_HEADERS_AS_C_HEADERS; }
+static Key enableIndexingKey() { return "EnableIndexing"; }
 static Key skipIndexingBigFilesKey() { return Constants::CPPEDITOR_SKIP_INDEXING_BIG_FILES; }
 static Key ignoreFilesKey() { return Constants::CPPEDITOR_IGNORE_FILES; }
 static Key ignorePatternKey() { return Constants::CPPEDITOR_IGNORE_PATTERN; }
 static Key useBuiltinPreprocessorKey() { return Constants::CPPEDITOR_USE_BUILTIN_PREPROCESSOR; }
 static Key indexerFileSizeLimitKey() { return Constants::CPPEDITOR_INDEXER_FILE_SIZE_LIMIT; }
+static Key useGlobalSettingsKey() { return "useGlobalSettings"; }
 
-static Key clangdSettingsKey() { return "ClangdSettings"; }
-static Key useClangdKey() { return "UseClangdV7"; }
-static Key clangdPathKey() { return "ClangdPath"; }
-static Key clangdIndexingKey() { return "ClangdIndexing"; }
-static Key clangdIndexingPriorityKey() { return "ClangdIndexingPriority"; }
-static Key clangdHeaderSourceSwitchModeKey() { return "ClangdHeaderSourceSwitchMode"; }
-static Key clangdCompletionRankingModelKey() { return "ClangdCompletionRankingModel"; }
-static Key clangdHeaderInsertionKey() { return "ClangdHeaderInsertion"; }
-static Key clangdThreadLimitKey() { return "ClangdThreadLimit"; }
-static Key clangdDocumentThresholdKey() { return "ClangdDocumentThreshold"; }
-static Key clangdSizeThresholdEnabledKey() { return "ClangdSizeThresholdEnabled"; }
-static Key clangdSizeThresholdKey() { return "ClangdSizeThreshold"; }
-static Key clangdUseGlobalSettingsKey() { return "useGlobalSettings"; }
-static Key clangdblockIndexingSettingsKey() { return "blockIndexing"; }
-static Key sessionsWithOneClangdKey() { return "SessionsWithOneClangd"; }
-static Key diagnosticConfigIdKey() { return "diagnosticConfigId"; }
-static Key checkedHardwareKey() { return "checkedHardware"; }
-static Key completionResultsKey() { return "completionResults"; }
-
-static FilePath g_defaultClangdFilePath;
-static FilePath fallbackClangdFilePath()
+bool operator==(const CppEditor::CppCodeModelSettings &s1,
+                const CppEditor::CppCodeModelSettings &s2)
 {
-    if (g_defaultClangdFilePath.exists())
-        return g_defaultClangdFilePath;
-    return Environment::systemEnvironment().searchInPath("clangd");
+    return s1.pchUsage == s2.pchUsage
+           && s1.interpretAmbigiousHeadersAsC == s2.interpretAmbigiousHeadersAsC
+           && s1.enableIndexing == s2.enableIndexing
+           && s1.skipIndexingBigFiles == s2.skipIndexingBigFiles
+           && s1.useBuiltinPreprocessor == s2.useBuiltinPreprocessor
+           && s1.indexerFileSizeLimitInMb == s2.indexerFileSizeLimitInMb
+           && s1.m_categorizeFindReferences == s2.m_categorizeFindReferences
+           && s1.interactiveFollowSymbol == s2.interactiveFollowSymbol
+           && s1.ignoreFiles == s2.ignoreFiles && s1.ignorePattern == s2.ignorePattern;
 }
 
-CppCodeModelSettings::CppCodeModelSettings()
+Store CppCodeModelSettings::toMap() const
 {
-    fromSettings(Core::ICore::settings());
+    Store store;
+    store.insert(pchUsageKey(), pchUsage);
+    store.insert(interpretAmbiguousHeadersAsCHeadersKey(), interpretAmbigiousHeadersAsC);
+    store.insert(enableIndexingKey(), enableIndexing);
+    store.insert(skipIndexingBigFilesKey(), skipIndexingBigFiles);
+    store.insert(ignoreFilesKey(), ignoreFiles);
+    store.insert(ignorePatternKey(), ignorePattern);
+    store.insert(useBuiltinPreprocessorKey(), useBuiltinPreprocessor);
+    store.insert(indexerFileSizeLimitKey(), indexerFileSizeLimitInMb);
+    return store;
+}
+
+void CppCodeModelSettings::fromMap(const Utils::Store &store)
+{
+    const CppCodeModelSettings def;
+    pchUsage = static_cast<PCHUsage>(store.value(pchUsageKey(), def.pchUsage).toInt());
+    interpretAmbigiousHeadersAsC
+        = store.value(interpretAmbiguousHeadersAsCHeadersKey(), def.interpretAmbigiousHeadersAsC)
+              .toBool();
+    enableIndexing = store.value(enableIndexingKey(), def.enableIndexing).toBool();
+    skipIndexingBigFiles
+        = store.value(skipIndexingBigFilesKey(), def.skipIndexingBigFiles).toBool();
+    ignoreFiles = store.value(ignoreFilesKey(), def.ignoreFiles).toBool();
+    ignorePattern = store.value(ignorePatternKey(), def.ignorePattern).toString();
+    useBuiltinPreprocessor
+        = store.value(useBuiltinPreprocessorKey(), def.useBuiltinPreprocessor).toBool();
+    indexerFileSizeLimitInMb
+        = store.value(indexerFileSizeLimitKey(), def.indexerFileSizeLimitInMb).toInt();
 }
 
 void CppCodeModelSettings::fromSettings(QtcSettings *s)
 {
-    s->beginGroup(Constants::CPPEDITOR_SETTINGSGROUP);
-
-    setEnableLowerClazyLevels(s->value(enableLowerClazyLevelsKey(), true).toBool());
-
-    const QVariant pchUsageVariant = s->value(pchUsageKey(), initialPchUsage());
-    setPCHUsage(static_cast<PCHUsage>(pchUsageVariant.toInt()));
-
-    const QVariant interpretAmbiguousHeadersAsCHeaders
-            = s->value(interpretAmbiguousHeadersAsCHeadersKey(), false);
-    setInterpretAmbigiousHeadersAsCHeaders(interpretAmbiguousHeadersAsCHeaders.toBool());
-
-    const QVariant skipIndexingBigFiles = s->value(skipIndexingBigFilesKey(), true);
-    setSkipIndexingBigFiles(skipIndexingBigFiles.toBool());
-
-    const QVariant ignoreFiles = s->value(ignoreFilesKey(), false);
-    setIgnoreFiles(ignoreFiles.toBool());
-
-    const QVariant ignorePattern = s->value(ignorePatternKey(), "");
-    setIgnorePattern(ignorePattern.toString());
-
-    setUseBuiltinPreprocessor(s->value(useBuiltinPreprocessorKey(), true).toBool());
-
-    const QVariant indexerFileSizeLimit = s->value(indexerFileSizeLimitKey(), 5);
-    setIndexerFileSizeLimitInMb(indexerFileSizeLimit.toInt());
-
-    s->endGroup();
-
-    emit changed();
+    fromMap(storeFromSettings(Constants::CPPEDITOR_SETTINGSGROUP, s));
 }
 
 void CppCodeModelSettings::toSettings(QtcSettings *s)
 {
-    s->beginGroup(Constants::CPPEDITOR_SETTINGSGROUP);
-
-    s->setValue(enableLowerClazyLevelsKey(), enableLowerClazyLevels());
-    s->setValue(pchUsageKey(), pchUsage());
-
-    s->setValue(interpretAmbiguousHeadersAsCHeadersKey(), interpretAmbigiousHeadersAsCHeaders());
-    s->setValue(skipIndexingBigFilesKey(), skipIndexingBigFiles());
-    s->setValue(ignoreFilesKey(), ignoreFiles());
-    s->setValue(ignorePatternKey(), QVariant(ignorePattern()));
-    s->setValue(useBuiltinPreprocessorKey(), useBuiltinPreprocessor());
-    s->setValue(indexerFileSizeLimitKey(), indexerFileSizeLimitInMb());
-
-    s->endGroup();
-
-    emit changed();
+    storeToSettingsWithDefault(
+        Constants::CPPEDITOR_SETTINGSGROUP, s, toMap(), CppCodeModelSettings().toMap());
 }
 
-CppCodeModelSettings::PCHUsage CppCodeModelSettings::pchUsage() const
+CppCodeModelSettings &CppCodeModelSettings::globalInstance()
 {
-    return m_pchUsage;
-}
-
-void CppCodeModelSettings::setPCHUsage(CppCodeModelSettings::PCHUsage pchUsage)
-{
-    m_pchUsage = pchUsage;
-}
-
-bool CppCodeModelSettings::interpretAmbigiousHeadersAsCHeaders() const
-{
-    return m_interpretAmbigiousHeadersAsCHeaders;
-}
-
-void CppCodeModelSettings::setInterpretAmbigiousHeadersAsCHeaders(bool yesno)
-{
-    m_interpretAmbigiousHeadersAsCHeaders = yesno;
-}
-
-bool CppCodeModelSettings::skipIndexingBigFiles() const
-{
-    return m_skipIndexingBigFiles;
-}
-
-void CppCodeModelSettings::setSkipIndexingBigFiles(bool yesno)
-{
-    m_skipIndexingBigFiles = yesno;
-}
-
-int CppCodeModelSettings::indexerFileSizeLimitInMb() const
-{
-    return m_indexerFileSizeLimitInMB;
-}
-
-void CppCodeModelSettings::setIndexerFileSizeLimitInMb(int sizeInMB)
-{
-    m_indexerFileSizeLimitInMB = sizeInMB;
-}
-
-bool CppCodeModelSettings::ignoreFiles() const
-{
-   return m_ignoreFiles;
-}
-
-void CppCodeModelSettings::setIgnoreFiles(bool ignoreFiles)
-{
-    m_ignoreFiles = ignoreFiles;
-}
-
-QString CppCodeModelSettings::ignorePattern() const
-{
-   return m_ignorePattern;
-}
-
-void CppCodeModelSettings::setIgnorePattern(const QString& ignorePattern)
-{
-    m_ignorePattern = ignorePattern;
-}
-
-
-bool CppCodeModelSettings::enableLowerClazyLevels() const
-{
-    return m_enableLowerClazyLevels;
-}
-
-void CppCodeModelSettings::setEnableLowerClazyLevels(bool yesno)
-{
-    m_enableLowerClazyLevels = yesno;
-}
-
-
-QString ClangdSettings::priorityToString(const IndexingPriority &priority)
-{
-    switch (priority) {
-    case IndexingPriority::Background: return "background";
-    case IndexingPriority::Normal: return "normal";
-    case IndexingPriority::Low: return "low";
-    case IndexingPriority::Off: return {};
-    }
-    return {};
-}
-
-QString ClangdSettings::priorityToDisplayString(const IndexingPriority &priority)
-{
-    switch (priority) {
-    case IndexingPriority::Background: return Tr::tr("Background Priority");
-    case IndexingPriority::Normal: return Tr::tr("Normal Priority");
-    case IndexingPriority::Low: return Tr::tr("Low Priority");
-    case IndexingPriority::Off: return Tr::tr("Off");
-    }
-    return {};
-}
-
-QString ClangdSettings::headerSourceSwitchModeToDisplayString(HeaderSourceSwitchMode mode)
-{
-    switch (mode) {
-    case HeaderSourceSwitchMode::BuiltinOnly: return Tr::tr("Use Built-in Only");
-    case HeaderSourceSwitchMode::ClangdOnly: return Tr::tr("Use Clangd Only");
-    case HeaderSourceSwitchMode::Both: return Tr::tr("Try Both");
-    }
-    return {};
-}
-
-QString ClangdSettings::rankingModelToCmdLineString(CompletionRankingModel model)
-{
-    switch (model) {
-    case CompletionRankingModel::Default: break;
-    case CompletionRankingModel::DecisionForest: return "decision_forest";
-    case CompletionRankingModel::Heuristics: return "heuristics";
-    }
-    QTC_ASSERT(false, return {});
-}
-
-QString ClangdSettings::rankingModelToDisplayString(CompletionRankingModel model)
-{
-    switch (model) {
-    case CompletionRankingModel::Default: return Tr::tr("Default");
-    case CompletionRankingModel::DecisionForest: return Tr::tr("Decision Forest");
-    case CompletionRankingModel::Heuristics: return Tr::tr("Heuristics");
-    }
-    QTC_ASSERT(false, return {});
-}
-
-ClangdSettings &ClangdSettings::instance()
-{
-    static ClangdSettings settings;
-    return settings;
-}
-
-ClangdSettings::ClangdSettings()
-{
-    loadSettings();
-    const auto sessionMgr = Core::SessionManager::instance();
-    connect(sessionMgr, &Core::SessionManager::sessionRemoved, this, [this](const QString &name) {
-        m_data.sessionsWithOneClangd.removeOne(name);
-    });
-    connect(sessionMgr,
-            &Core::SessionManager::sessionRenamed,
-            this,
-            [this](const QString &oldName, const QString &newName) {
-                const auto index = m_data.sessionsWithOneClangd.indexOf(oldName);
-                if (index != -1)
-                    m_data.sessionsWithOneClangd[index] = newName;
-            });
-}
-
-bool ClangdSettings::useClangd() const
-{
-    return m_data.useClangd && clangdVersion(clangdFilePath()) >= minimumClangdVersion();
-}
-
-void ClangdSettings::setUseClangd(bool use) { instance().m_data.useClangd = use; }
-
-void ClangdSettings::setUseClangdAndSave(bool use)
-{
-    setUseClangd(use);
-    instance().saveSettings();
-}
-
-bool ClangdSettings::hardwareFulfillsRequirements()
-{
-    instance().m_data.haveCheckedHardwareReqirements = true;
-    instance().saveSettings();
-    const quint64 minRam = quint64(12) * 1024 * 1024 * 1024;
-    const std::optional<quint64> totalRam = Utils::HostOsInfo::totalMemoryInstalledInBytes();
-    return !totalRam || *totalRam >= minRam;
-}
-
-bool ClangdSettings::haveCheckedHardwareRequirements()
-{
-    return instance().data().haveCheckedHardwareReqirements;
-}
-
-void ClangdSettings::setDefaultClangdPath(const FilePath &filePath)
-{
-    g_defaultClangdFilePath = filePath;
-}
-
-void ClangdSettings::setCustomDiagnosticConfigs(const ClangDiagnosticConfigs &configs)
-{
-    if (instance().customDiagnosticConfigs() == configs)
-        return;
-    instance().m_data.customDiagnosticConfigs = configs;
-    instance().saveSettings();
-}
-
-FilePath ClangdSettings::clangdFilePath() const
-{
-    if (!m_data.executableFilePath.isEmpty())
-        return m_data.executableFilePath;
-    return fallbackClangdFilePath();
-}
-
-bool ClangdSettings::sizeIsOkay(const Utils::FilePath &fp) const
-{
-    return !sizeThresholdEnabled() || sizeThresholdInKb() * 1024 >= fp.fileSize();
-}
-
-ClangDiagnosticConfigs ClangdSettings::customDiagnosticConfigs() const
-{
-    return m_data.customDiagnosticConfigs;
-}
-
-Id ClangdSettings::diagnosticConfigId() const
-{
-    if (!diagnosticConfigsModel().hasConfigWithId(m_data.diagnosticConfigId))
-        return initialClangDiagnosticConfigId();
-    return m_data.diagnosticConfigId;
-}
-
-ClangDiagnosticConfig ClangdSettings::diagnosticConfig() const
-{
-    return diagnosticConfigsModel(customDiagnosticConfigs()).configWithId(diagnosticConfigId());
-}
-
-ClangdSettings::Granularity ClangdSettings::granularity() const
-{
-    if (m_data.sessionsWithOneClangd.contains(Core::SessionManager::activeSession()))
-        return Granularity::Session;
-    return Granularity::Project;
-}
-
-void ClangdSettings::setData(const Data &data)
-{
-    if (this == &instance() && data != m_data) {
-        m_data = data;
-        saveSettings();
-        emit changed();
-    }
-}
-
-static FilePath getClangHeadersPathFromClang(const FilePath &clangdFilePath)
-{
-    const FilePath clangFilePath = clangdFilePath.absolutePath().pathAppended("clang")
-            .withExecutableSuffix();
-    if (!clangFilePath.exists())
-        return {};
-    Process clang;
-    clang.setCommand({clangFilePath, {"-print-resource-dir"}});
-    clang.start();
-    if (!clang.waitForFinished())
-        return {};
-    const FilePath resourceDir = FilePath::fromUserInput(QString::fromLocal8Bit(
-            clang.rawStdOut().trimmed()));
-    if (resourceDir.isEmpty() || !resourceDir.exists())
-        return {};
-    const FilePath includeDir = resourceDir.pathAppended("include");
-    if (!includeDir.exists())
-        return {};
-    return includeDir;
-}
-
-static FilePath getClangHeadersPath(const FilePath &clangdFilePath)
-{
-    const FilePath headersPath = getClangHeadersPathFromClang(clangdFilePath);
-    if (!headersPath.isEmpty())
-        return headersPath;
-
-    const QVersionNumber version = Utils::clangdVersion(clangdFilePath);
-    QTC_ASSERT(!version.isNull(), return {});
-    static const QStringList libDirs{"lib", "lib64"};
-    const QStringList versionStrings{QString::number(version.majorVersion()), version.toString()};
-    for (const QString &libDir : libDirs) {
-        for (const QString &versionString : versionStrings) {
-            const FilePath includePath = clangdFilePath.absolutePath().parentDir()
-                                             .pathAppended(libDir).pathAppended("clang")
-                                             .pathAppended(versionString).pathAppended("include");
-            if (includePath.exists())
-                return includePath;
-        }
-    }
-    QTC_CHECK(false);
-    return {};
-}
-
-FilePath ClangdSettings::clangdIncludePath() const
-{
-    QTC_ASSERT(useClangd(), return {});
-    FilePath clangdPath = clangdFilePath();
-    QTC_ASSERT(!clangdPath.isEmpty() && clangdPath.exists(), return {});
-    static QHash<FilePath, FilePath> headersPathCache;
-    const auto it = headersPathCache.constFind(clangdPath);
-    if (it != headersPathCache.constEnd())
-        return *it;
-    const FilePath headersPath = getClangHeadersPath(clangdPath);
-    if (!headersPath.isEmpty())
-        headersPathCache.insert(clangdPath, headersPath);
-    return headersPath;
-}
-
-FilePath ClangdSettings::clangdUserConfigFilePath()
-{
-    return FilePath::fromString(
-                QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation))
-            / "clangd/config.yaml";
-}
-
-void ClangdSettings::loadSettings()
-{
-    const auto settings = Core::ICore::settings();
-
-    m_data.fromMap(Utils::storeFromSettings(clangdSettingsKey(), settings));
-
-    settings->beginGroup(Constants::CPPEDITOR_SETTINGSGROUP);
-    m_data.customDiagnosticConfigs = diagnosticConfigsFromSettings(settings);
-
-    // Pre-8.0 compat
-    static const Key oldKey("ClangDiagnosticConfig");
-    const QVariant configId = settings->value(oldKey);
-    if (configId.isValid()) {
-        m_data.diagnosticConfigId = Id::fromSetting(configId);
-        settings->setValue(oldKey, {});
-    }
-
-    settings->endGroup();
-}
-
-void ClangdSettings::saveSettings()
-{
-    const auto settings = Core::ICore::settings();
-    const ClangdSettings::Data defaultData;
-    Utils::storeToSettingsWithDefault(clangdSettingsKey(),
-                                      settings,
-                                      m_data.toMap(),
-                                      defaultData.toMap());
-    settings->beginGroup(Constants::CPPEDITOR_SETTINGSGROUP);
-    diagnosticConfigsToSettings(settings, m_data.customDiagnosticConfigs);
-    settings->endGroup();
-}
-
-#ifdef WITH_TESTS
-void ClangdSettings::setClangdFilePath(const FilePath &filePath)
-{
-    instance().m_data.executableFilePath = filePath;
-}
-#endif
-
-ClangdProjectSettings::ClangdProjectSettings(ProjectExplorer::Project *project) : m_project(project)
-{
-    loadSettings();
-}
-
-ClangdSettings::Data ClangdProjectSettings::settings() const
-{
-    const ClangdSettings::Data globalData = ClangdSettings::instance().data();
-    ClangdSettings::Data data = globalData;
-    if (!m_useGlobalSettings) {
-        data = m_customSettings;
-    // This property is global by definition.
-    data.sessionsWithOneClangd = ClangdSettings::instance().data().sessionsWithOneClangd;
-
-    // This list exists only once.
-    data.customDiagnosticConfigs = ClangdSettings::instance().data().customDiagnosticConfigs;
-}
-    if (m_blockIndexing)
-        data.indexingPriority = ClangdSettings::IndexingPriority::Off;
-    return data;
-}
-
-void ClangdProjectSettings::setSettings(const ClangdSettings::Data &data)
-{
-    m_customSettings = data;
-    saveSettings();
-    ClangdSettings::setCustomDiagnosticConfigs(data.customDiagnosticConfigs);
-    emit ClangdSettings::instance().changed();
-}
-
-void ClangdProjectSettings::setUseGlobalSettings(bool useGlobal)
-{
-    m_useGlobalSettings = useGlobal;
-    saveSettings();
-    emit ClangdSettings::instance().changed();
-}
-
-void ClangdProjectSettings::setDiagnosticConfigId(Utils::Id configId)
-{
-    m_customSettings.diagnosticConfigId = configId;
-    saveSettings();
-    emit ClangdSettings::instance().changed();
-}
-
-void ClangdProjectSettings::blockIndexing()
-{
-    if (m_blockIndexing)
-        return;
-    m_blockIndexing = true;
-    saveSettings();
-    emit ClangdSettings::instance().changed();
-}
-
-void ClangdProjectSettings::unblockIndexing()
-{
-    if (!m_blockIndexing)
-        return;
-    m_blockIndexing = false;
-    saveSettings();
-    // Do not emit changed here since that would restart clients with blocked indexing
-}
-
-void ClangdProjectSettings::loadSettings()
-{
-    if (!m_project)
-        return;
-    const Store data = storeFromVariant(m_project->namedSettings(clangdSettingsKey()));
-    m_useGlobalSettings = data.value(clangdUseGlobalSettingsKey(), true).toBool();
-    m_blockIndexing = data.value(clangdblockIndexingSettingsKey(), false).toBool();
-    if (!m_useGlobalSettings)
-        m_customSettings.fromMap(data);
-}
-
-void ClangdProjectSettings::saveSettings()
-{
-    if (!m_project)
-        return;
-    Store data;
-    if (!m_useGlobalSettings)
-        data = m_customSettings.toMap();
-    data.insert(clangdUseGlobalSettingsKey(), m_useGlobalSettings);
-    data.insert(clangdblockIndexingSettingsKey(), m_blockIndexing);
-    m_project->setNamedSettings(clangdSettingsKey(), variantFromStore(data));
-}
-
-Store ClangdSettings::Data::toMap() const
-{
-    Store map;
-    map.insert(useClangdKey(), useClangd);
-    map.insert(clangdPathKey(),
-               executableFilePath != fallbackClangdFilePath() ? executableFilePath.toString()
-                                                              : QString());
-    map.insert(clangdIndexingKey(), indexingPriority != IndexingPriority::Off);
-    map.insert(clangdIndexingPriorityKey(), int(indexingPriority));
-    map.insert(clangdHeaderSourceSwitchModeKey(), int(headerSourceSwitchMode));
-    map.insert(clangdCompletionRankingModelKey(), int(completionRankingModel));
-    map.insert(clangdHeaderInsertionKey(), autoIncludeHeaders);
-    map.insert(clangdThreadLimitKey(), workerThreadLimit);
-    map.insert(clangdDocumentThresholdKey(), documentUpdateThreshold);
-    map.insert(clangdSizeThresholdEnabledKey(), sizeThresholdEnabled);
-    map.insert(clangdSizeThresholdKey(), sizeThresholdInKb);
-    map.insert(sessionsWithOneClangdKey(), sessionsWithOneClangd);
-    map.insert(diagnosticConfigIdKey(), diagnosticConfigId.toSetting());
-    map.insert(checkedHardwareKey(), true);
-    map.insert(completionResultsKey(), completionResults);
-    return map;
-}
-
-void ClangdSettings::Data::fromMap(const Store &map)
-{
-    useClangd = map.value(useClangdKey(), true).toBool();
-    executableFilePath = FilePath::fromString(map.value(clangdPathKey()).toString());
-    indexingPriority = IndexingPriority(
-        map.value(clangdIndexingPriorityKey(), int(this->indexingPriority)).toInt());
-    const auto it = map.find(clangdIndexingKey());
-    if (it != map.end() && !it->toBool())
-        indexingPriority = IndexingPriority::Off;
-    headerSourceSwitchMode = HeaderSourceSwitchMode(map.value(clangdHeaderSourceSwitchModeKey(),
-                                                              int(headerSourceSwitchMode)).toInt());
-    completionRankingModel = CompletionRankingModel(map.value(clangdCompletionRankingModelKey(),
-                                                              int(completionRankingModel)).toInt());
-    autoIncludeHeaders = map.value(clangdHeaderInsertionKey(), false).toBool();
-    workerThreadLimit = map.value(clangdThreadLimitKey(), 0).toInt();
-    documentUpdateThreshold = map.value(clangdDocumentThresholdKey(), 500).toInt();
-    sizeThresholdEnabled = map.value(clangdSizeThresholdEnabledKey(), false).toBool();
-    sizeThresholdInKb = map.value(clangdSizeThresholdKey(), 1024).toLongLong();
-    sessionsWithOneClangd = map.value(sessionsWithOneClangdKey()).toStringList();
-    diagnosticConfigId = Id::fromSetting(map.value(diagnosticConfigIdKey(),
-                                                   initialClangDiagnosticConfigId().toSetting()));
-    haveCheckedHardwareReqirements = map.value(checkedHardwareKey(), false).toBool();
-    completionResults = map.value(completionResultsKey(), defaultCompletionResults()).toInt();
-}
-
-int ClangdSettings::Data::defaultCompletionResults()
-{
-    // Default clangd --limit-results value is 100
-    bool ok = false;
-    const int userValue = qtcEnvironmentVariableIntValue("QTC_CLANGD_COMPLETION_RESULTS", &ok);
-    return ok ? userValue : 100;
-}
-
-CppCodeModelSettings &cppCodeModelSettings()
-{
-    static CppCodeModelSettings theCppCodeModelSettings;
+    static CppCodeModelSettings theCppCodeModelSettings(Core::ICore::settings());
     return theCppCodeModelSettings;
 }
 
+CppCodeModelSettings CppCodeModelSettings::settingsForProject(const ProjectExplorer::Project *project)
+{
+    return {CppCodeModelProjectSettings(const_cast<ProjectExplorer::Project *>(project)).settings()};
+}
+
+CppCodeModelSettings CppCodeModelSettings::settingsForProject(const Utils::FilePath &projectFile)
+{
+    return settingsForProject(ProjectManager::projectWithProjectFilePath(projectFile));
+}
+
+CppCodeModelSettings CppCodeModelSettings::settingsForFile(const Utils::FilePath &file)
+{
+    return settingsForProject(ProjectManager::projectForFile(file));
+}
+
+bool CppCodeModelSettings::hasCustomSettings(const ProjectExplorer::Project *project)
+{
+    return !CppCodeModelProjectSettings(const_cast<ProjectExplorer::Project *>(project))
+                .useGlobalSettings();
+}
+
+void CppCodeModelSettings::setSettingsForProject(
+    ProjectExplorer::Project *project, const CppCodeModelSettings &settings)
+{
+    CppCodeModelProjectSettings pSettings(project);
+    pSettings.forceCustomSettingsSettings(settings);
+}
+
+void CppCodeModelSettings::setGlobal(const CppCodeModelSettings &settings)
+{
+    if (globalInstance() == settings)
+        return;
+
+    globalInstance() = settings;
+    globalInstance().toSettings(Core::ICore::settings());
+    CppModelManager::handleSettingsChange(nullptr);
+}
+
+CppCodeModelSettings::PCHUsage CppCodeModelSettings::pchUsageForProject(const Project *project)
+{
+    return CppCodeModelSettings::settingsForProject(project).pchUsage;
+}
+
+UsePrecompiledHeaders CppCodeModelSettings::usePrecompiledHeaders() const
+{
+    return pchUsage == CppCodeModelSettings::PchUse_None ? UsePrecompiledHeaders::No
+                                                         : UsePrecompiledHeaders::Yes;
+}
+
+UsePrecompiledHeaders CppCodeModelSettings::usePrecompiledHeaders(const Project *project)
+{
+    return CppCodeModelSettings::settingsForProject(project).usePrecompiledHeaders();
+}
+
+int CppCodeModelSettings::effectiveIndexerFileSizeLimitInMb() const
+{
+    return skipIndexingBigFiles ? indexerFileSizeLimitInMb : -1;
+}
+
+bool CppCodeModelSettings::categorizeFindReferences()
+{
+    return globalInstance().m_categorizeFindReferences;
+}
+
+void CppCodeModelSettings::setCategorizeFindReferences(bool categorize)
+{
+    globalInstance().m_categorizeFindReferences = categorize;
+}
+
+bool CppCodeModelSettings::isInteractiveFollowSymbol()
+{
+    return globalInstance().interactiveFollowSymbol;
+}
+
+void CppCodeModelSettings::setInteractiveFollowSymbol(bool interactive)
+{
+    globalInstance().interactiveFollowSymbol = interactive;
+}
+
+CppCodeModelProjectSettings::CppCodeModelProjectSettings(ProjectExplorer::Project *project)
+    : m_project(project)
+{
+    loadSettings();
+}
+
+CppCodeModelSettings CppCodeModelProjectSettings::settings() const
+{
+    return m_useGlobalSettings ? CppCodeModelSettings::global() : m_customSettings;
+}
+
+void CppCodeModelProjectSettings::setSettings(const CppCodeModelSettings &settings)
+{
+    m_customSettings = settings;
+    saveSettings();
+    CppModelManager::handleSettingsChange(m_project);
+}
+
+void CppCodeModelProjectSettings::forceCustomSettingsSettings(const CppCodeModelSettings &settings)
+{
+    m_useGlobalSettings = false;
+    setSettings(settings);
+}
+
+void CppCodeModelProjectSettings::setUseGlobalSettings(bool useGlobal)
+{
+    m_useGlobalSettings = useGlobal;
+    saveSettings();
+    CppModelManager::handleSettingsChange(m_project);
+}
+
+void CppCodeModelProjectSettings::loadSettings()
+{
+    if (!m_project)
+        return;
+    const Store data = storeFromVariant(m_project->namedSettings(Constants::CPPEDITOR_SETTINGSGROUP));
+    m_useGlobalSettings = data.value(useGlobalSettingsKey(), true).toBool();
+    m_customSettings.fromMap(data);
+}
+
+void CppCodeModelProjectSettings::saveSettings()
+{
+    if (!m_project)
+        return;
+    Store data = m_customSettings.toMap();
+    data.insert(useGlobalSettingsKey(), m_useGlobalSettings);
+    m_project->setNamedSettings(Constants::CPPEDITOR_SETTINGSGROUP, variantFromStore(data));
+}
+
+namespace Internal {
+
+class CppCodeModelSettingsWidget final : public Core::IOptionsPageWidget
+{
+    Q_OBJECT
+public:
+    CppCodeModelSettingsWidget(const CppCodeModelSettings &settings);
+    CppCodeModelSettings settings() const;
+
+signals:
+    void settingsDataChanged();
+
+private:
+    void apply() final { CppCodeModelSettings::setGlobal(settings()); }
+
+    QCheckBox *m_interpretAmbiguousHeadersAsCHeaders;
+    QCheckBox *m_ignorePchCheckBox;
+    QCheckBox *m_useBuiltinPreprocessorCheckBox;
+    QCheckBox *m_enableIndexingCheckBox;
+    QCheckBox *m_skipIndexingBigFilesCheckBox;
+    QSpinBox *m_bigFilesLimitSpinBox;
+    QCheckBox *m_ignoreFilesCheckBox;
+    QPlainTextEdit *m_ignorePatternTextEdit;
+};
+
+CppCodeModelSettingsWidget::CppCodeModelSettingsWidget(const CppCodeModelSettings &settings)
+{
+    m_interpretAmbiguousHeadersAsCHeaders
+        = new QCheckBox(Tr::tr("Interpret ambiguous headers as C headers"));
+
+    m_enableIndexingCheckBox = new QCheckBox(Tr::tr("Enable indexing"));
+    m_enableIndexingCheckBox->setChecked(settings.enableIndexing);
+    m_enableIndexingCheckBox->setToolTip(Tr::tr(
+        "Indexing should almost always be kept enabled, as disabling it will severely limit the "
+        "capabilities of the code model."));
+
+    m_skipIndexingBigFilesCheckBox = new QCheckBox(Tr::tr("Do not index files greater than"));
+    m_skipIndexingBigFilesCheckBox->setChecked(settings.skipIndexingBigFiles);
+
+    m_bigFilesLimitSpinBox = new QSpinBox;
+    m_bigFilesLimitSpinBox->setSuffix(Tr::tr("MB"));
+    m_bigFilesLimitSpinBox->setRange(1, 500);
+    m_bigFilesLimitSpinBox->setValue(settings.indexerFileSizeLimitInMb);
+
+    m_ignoreFilesCheckBox = new QCheckBox(Tr::tr("Ignore files"));
+    m_ignoreFilesCheckBox->setToolTip(
+        "<html><head/><body><p>"
+        + Tr::tr("Ignore files that match these wildcard patterns, one wildcard per line.")
+        + "</p></body></html>");
+
+    m_ignoreFilesCheckBox->setChecked(settings.ignoreFiles);
+    m_ignorePatternTextEdit = new QPlainTextEdit(settings.ignorePattern);
+    m_ignorePatternTextEdit->setToolTip(m_ignoreFilesCheckBox->toolTip());
+    m_ignorePatternTextEdit->setEnabled(m_ignoreFilesCheckBox->isChecked());
+
+    connect(m_ignoreFilesCheckBox, &QCheckBox::stateChanged, this, [this] {
+        m_ignorePatternTextEdit->setEnabled(m_ignoreFilesCheckBox->isChecked());
+    });
+
+    m_ignorePchCheckBox = new QCheckBox(Tr::tr("Ignore precompiled headers"));
+    m_ignorePchCheckBox->setToolTip(Tr::tr(
+        "<html><head/><body><p>When precompiled headers are not ignored, the parsing for code "
+        "completion and semantic highlighting will process the precompiled header before "
+        "processing any file.</p></body></html>"));
+
+    m_useBuiltinPreprocessorCheckBox = new QCheckBox(Tr::tr("Use built-in preprocessor to show "
+                                                            "pre-processed files"));
+    m_useBuiltinPreprocessorCheckBox->setToolTip
+        (Tr::tr("Uncheck this to invoke the actual compiler "
+                "to show a pre-processed source file in the editor."));
+
+    m_interpretAmbiguousHeadersAsCHeaders->setChecked(settings.interpretAmbigiousHeadersAsC);
+    m_ignorePchCheckBox->setChecked(settings.pchUsage == CppCodeModelSettings::PchUse_None);
+    m_useBuiltinPreprocessorCheckBox->setChecked(settings.useBuiltinPreprocessor);
+
+    using namespace Layouting;
+
+    Column {
+        Group {
+            title(Tr::tr("General")),
+            Column {
+                   m_interpretAmbiguousHeadersAsCHeaders,
+                   m_ignorePchCheckBox,
+                   m_useBuiltinPreprocessorCheckBox,
+                   m_enableIndexingCheckBox,
+                   Row { m_skipIndexingBigFilesCheckBox, m_bigFilesLimitSpinBox, st },
+                   Row { Column { m_ignoreFilesCheckBox, st }, m_ignorePatternTextEdit },
+                   }
+        },
+        st
+    }.attachTo(this);
+
+    for (const QCheckBox *const b : {m_interpretAmbiguousHeadersAsCHeaders,
+                                     m_ignorePchCheckBox,
+                                     m_enableIndexingCheckBox,
+                                     m_useBuiltinPreprocessorCheckBox,
+                                     m_skipIndexingBigFilesCheckBox,
+                                     m_ignoreFilesCheckBox}) {
+        connect(b, &QCheckBox::toggled, this, &CppCodeModelSettingsWidget::settingsDataChanged);
+    }
+    connect(m_bigFilesLimitSpinBox, &QSpinBox::valueChanged,
+            this, &CppCodeModelSettingsWidget::settingsDataChanged);
+
+    const auto timer = new QTimer(this);
+    timer->setSingleShot(true);
+    timer->setInterval(1000);
+    connect(timer, &QTimer::timeout, this, &CppCodeModelSettingsWidget::settingsDataChanged);
+    connect(m_ignorePatternTextEdit, &QPlainTextEdit::textChanged,
+            timer, qOverload<>(&QTimer::start));
+}
+
+CppCodeModelSettings CppCodeModelSettingsWidget::settings() const
+{
+    CppCodeModelSettings settings;
+    settings.interpretAmbigiousHeadersAsC = m_interpretAmbiguousHeadersAsCHeaders->isChecked();
+    settings.enableIndexing = m_enableIndexingCheckBox->isChecked();
+    settings.skipIndexingBigFiles = m_skipIndexingBigFilesCheckBox->isChecked();
+    settings.useBuiltinPreprocessor = m_useBuiltinPreprocessorCheckBox->isChecked();
+    settings.ignoreFiles = m_ignoreFilesCheckBox->isChecked();
+    settings.ignorePattern = m_ignorePatternTextEdit->toPlainText();
+    settings.indexerFileSizeLimitInMb = m_bigFilesLimitSpinBox->value();
+    settings.pchUsage = m_ignorePchCheckBox->isChecked() ? CppCodeModelSettings::PchUse_None
+                                                         : CppCodeModelSettings::PchUse_BuildSystem;
+    return settings;
+}
+
+class CppCodeModelSettingsPage final : public Core::IOptionsPage
+{
+public:
+    CppCodeModelSettingsPage()
+    {
+        setId(Constants::CPP_CODE_MODEL_SETTINGS_ID);
+        setDisplayName(Tr::tr("Code Model"));
+        setCategory(Constants::CPP_SETTINGS_CATEGORY);
+        setDisplayCategory(Tr::tr("C++"));
+        setCategoryIconPath(":/projectexplorer/images/settingscategory_cpp.png");
+        setWidgetCreator(
+            [] { return new CppCodeModelSettingsWidget(CppCodeModelSettings::global()); });
+    }
+};
+
+void setupCppCodeModelSettingsPage()
+{
+    static CppCodeModelSettingsPage theCppCodeModelSettingsPage;
+}
+
+class CppCodeModelProjectSettingsWidget : public ProjectSettingsWidget
+{
+public:
+    CppCodeModelProjectSettingsWidget(const CppCodeModelProjectSettings &settings)
+        : m_settings(settings), m_widget(settings.settings())
+    {
+        setGlobalSettingsId(Constants::CPP_CODE_MODEL_SETTINGS_ID);
+        const auto layout = new QVBoxLayout(this);
+        layout->setContentsMargins(0, 0, 0, 0);
+        layout->addWidget(&m_widget);
+
+        setUseGlobalSettings(m_settings.useGlobalSettings());
+        m_widget.setEnabled(!useGlobalSettings());
+        connect(this, &ProjectSettingsWidget::useGlobalSettingsChanged, this,
+                [this](bool checked) {
+                    m_widget.setEnabled(!checked);
+                    m_settings.setUseGlobalSettings(checked);
+                    if (!checked)
+                        m_settings.setSettings(m_widget.settings());
+                });
+
+        connect(&m_widget, &CppCodeModelSettingsWidget::settingsDataChanged,
+                this, [this] { m_settings.setSettings(m_widget.settings()); });
+    }
+
+private:
+    CppCodeModelProjectSettings m_settings;
+    CppCodeModelSettingsWidget m_widget;
+};
+
+class CppCodeModelProjectSettingsPanelFactory final : public ProjectPanelFactory
+{
+public:
+    CppCodeModelProjectSettingsPanelFactory()
+    {
+        setPriority(100);
+        setDisplayName(Tr::tr("C++ Code Model"));
+        setCreateWidgetFunction([](Project *project) {
+            return new CppCodeModelProjectSettingsWidget(project);
+        });
+    }
+};
+void setupCppCodeModelProjectSettingsPanel()
+{
+    static CppCodeModelProjectSettingsPanelFactory factory;
+}
+
+} // namespace Internal
 } // namespace CppEditor
+
+#include <cppcodemodelsettings.moc>
diff --git a/src/plugins/cppeditor/cppcodemodelsettings.h b/src/plugins/cppeditor/cppcodemodelsettings.h
index fe2e625c070..9f2f3d1718d 100644
--- a/src/plugins/cppeditor/cppcodemodelsettings.h
+++ b/src/plugins/cppeditor/cppcodemodelsettings.h
@@ -3,216 +3,93 @@
 
 #pragma once
 
-#include "clangdiagnosticconfig.h"
 #include "cppeditor_global.h"
 
-#include <utils/clangutils.h>
-#include <utils/filepath.h>
-#include <utils/id.h>
 #include <utils/store.h>
-#include <utils/qtcsettings.h>
-
-#include <QObject>
-#include <QStringList>
-#include <QVersionNumber>
 
 namespace ProjectExplorer { class Project; }
+namespace Utils {
+class FilePath;
+class QtcSettings;
+}
 
 namespace CppEditor {
+enum class UsePrecompiledHeaders;
 
-class CPPEDITOR_EXPORT CppCodeModelSettings : public QObject
+class CPPEDITOR_EXPORT CppCodeModelSettings
 {
-    Q_OBJECT
-
 public:
     enum PCHUsage {
         PchUse_None = 1,
         PchUse_BuildSystem = 2
     };
 
-public:
-    CppCodeModelSettings();
+    CppCodeModelSettings() = default;
+    CppCodeModelSettings(const Utils::Store &store) { fromMap(store); }
 
-    void fromSettings(Utils::QtcSettings *s);
-    void toSettings(Utils::QtcSettings *s);
-
-public:
-    bool enableLowerClazyLevels() const;
-    void setEnableLowerClazyLevels(bool yesno);
-
-    PCHUsage pchUsage() const;
-    void setPCHUsage(PCHUsage pchUsage);
-
-    bool interpretAmbigiousHeadersAsCHeaders() const;
-    void setInterpretAmbigiousHeadersAsCHeaders(bool yesno);
-
-    bool skipIndexingBigFiles() const;
-    void setSkipIndexingBigFiles(bool yesno);
-
-    bool useBuiltinPreprocessor() const { return m_useBuiltinPreprocessor; }
-    void setUseBuiltinPreprocessor(bool useBuiltin) { m_useBuiltinPreprocessor = useBuiltin; }
-
-    int indexerFileSizeLimitInMb() const;
-    void setIndexerFileSizeLimitInMb(int sizeInMB);
-
-    void setCategorizeFindReferences(bool categorize) { m_categorizeFindReferences = categorize; }
-    bool categorizeFindReferences() const { return m_categorizeFindReferences; }
-
-    bool ignoreFiles() const;
-    void setIgnoreFiles(bool ignoreFiles);
-    QString ignorePattern() const;
-    void setIgnorePattern(const QString& ignorePattern);
-
-signals:
-    void clangDiagnosticConfigsInvalidated(const QVector<Utils::Id> &configId);
-    void changed();
-
-private:
-    PCHUsage m_pchUsage = PchUse_BuildSystem;
-    bool m_interpretAmbigiousHeadersAsCHeaders = false;
-    bool m_skipIndexingBigFiles = true;
-    bool m_useBuiltinPreprocessor = true;
-    int m_indexerFileSizeLimitInMB = 5;
-    bool m_enableLowerClazyLevels = true; // For UI behavior only
-    bool m_categorizeFindReferences = false; // Ephemeral!
-    bool m_ignoreFiles = false;
-    QString m_ignorePattern;
-};
-
-class CPPEDITOR_EXPORT ClangdSettings : public QObject
-{
-    Q_OBJECT
-public:
-    enum class IndexingPriority { Off, Background, Normal, Low, };
-    enum class HeaderSourceSwitchMode { BuiltinOnly, ClangdOnly, Both };
-    enum class CompletionRankingModel { Default, DecisionForest, Heuristics };
-
-    static QString priorityToString(const IndexingPriority &priority);
-    static QString priorityToDisplayString(const IndexingPriority &priority);
-    static QString headerSourceSwitchModeToDisplayString(HeaderSourceSwitchMode mode);
-    static QString rankingModelToCmdLineString(CompletionRankingModel model);
-    static QString rankingModelToDisplayString(CompletionRankingModel model);
-
-    class CPPEDITOR_EXPORT Data
+    friend bool operator==(const CppCodeModelSettings &s1, const CppCodeModelSettings &s2);
+    friend bool operator!=(const CppCodeModelSettings &s1, const CppCodeModelSettings &s2)
     {
-    public:
-        Utils::Store toMap() const;
-        void fromMap(const Utils::Store &map);
+        return !(s1 == s2);
+    }
 
-        friend bool operator==(const Data &s1, const Data &s2)
-        {
-            return s1.useClangd == s2.useClangd
-                    && s1.executableFilePath == s2.executableFilePath
-                    && s1.sessionsWithOneClangd == s2.sessionsWithOneClangd
-                    && s1.customDiagnosticConfigs == s2.customDiagnosticConfigs
-                    && s1.diagnosticConfigId == s2.diagnosticConfigId
-                    && s1.workerThreadLimit == s2.workerThreadLimit
-                    && s1.indexingPriority == s2.indexingPriority
-                    && s1.headerSourceSwitchMode == s2.headerSourceSwitchMode
-                    && s1.completionRankingModel == s2.completionRankingModel
-                    && s1.autoIncludeHeaders == s2.autoIncludeHeaders
-                    && s1.documentUpdateThreshold == s2.documentUpdateThreshold
-                    && s1.sizeThresholdEnabled == s2.sizeThresholdEnabled
-                    && s1.sizeThresholdInKb == s2.sizeThresholdInKb
-                    && s1.haveCheckedHardwareReqirements == s2.haveCheckedHardwareReqirements
-                    && s1.completionResults == s2.completionResults;
-        }
-        friend bool operator!=(const Data &s1, const Data &s2) { return !(s1 == s2); }
+    Utils::Store toMap() const;
+    void fromMap(const Utils::Store &store);
 
-        static int defaultCompletionResults();
+    static CppCodeModelSettings settingsForProject(const ProjectExplorer::Project *project);
+    static CppCodeModelSettings settingsForProject(const Utils::FilePath &projectFile);
+    static CppCodeModelSettings settingsForFile(const Utils::FilePath &file);
+    static bool hasCustomSettings(const ProjectExplorer::Project *project);
+    static void setSettingsForProject(ProjectExplorer::Project *project,
+                                      const CppCodeModelSettings &settings);
 
-        Utils::FilePath executableFilePath;
-        QStringList sessionsWithOneClangd;
-        ClangDiagnosticConfigs customDiagnosticConfigs;
-        Utils::Id diagnosticConfigId;
-        int workerThreadLimit = 0;
-        int documentUpdateThreshold = 500;
-        qint64 sizeThresholdInKb = 1024;
-        bool useClangd = true;
-        IndexingPriority indexingPriority = IndexingPriority::Low;
-        HeaderSourceSwitchMode headerSourceSwitchMode = HeaderSourceSwitchMode::Both;
-        CompletionRankingModel completionRankingModel = CompletionRankingModel::Default;
-        bool autoIncludeHeaders = false;
-        bool sizeThresholdEnabled = false;
-        bool haveCheckedHardwareReqirements = false;
-        int completionResults = defaultCompletionResults();
-    };
+    static const CppCodeModelSettings &global() { return globalInstance(); }
+    static void setGlobal(const CppCodeModelSettings &settings);
 
-    ClangdSettings(const Data &data) : m_data(data) {}
+    static PCHUsage pchUsageForProject(const ProjectExplorer::Project *project);
+    UsePrecompiledHeaders usePrecompiledHeaders() const;
+    static UsePrecompiledHeaders usePrecompiledHeaders(const ProjectExplorer::Project *project);
 
-    static ClangdSettings &instance();
-    bool useClangd() const;
-    static void setUseClangd(bool use);
-    static void setUseClangdAndSave(bool use);
+    int effectiveIndexerFileSizeLimitInMb() const;
 
-    static bool hardwareFulfillsRequirements();
-    static bool haveCheckedHardwareRequirements();
+    static bool categorizeFindReferences();
+    static void setCategorizeFindReferences(bool categorize);
 
-    static void setDefaultClangdPath(const Utils::FilePath &filePath);
-    static void setCustomDiagnosticConfigs(const ClangDiagnosticConfigs &configs);
-    Utils::FilePath clangdFilePath() const;
-    IndexingPriority indexingPriority() const { return m_data.indexingPriority; }
-    HeaderSourceSwitchMode headerSourceSwitchMode() const { return m_data.headerSourceSwitchMode; }
-    CompletionRankingModel completionRankingModel() const { return m_data.completionRankingModel; }
-    bool autoIncludeHeaders() const { return m_data.autoIncludeHeaders; }
-    int workerThreadLimit() const { return m_data.workerThreadLimit; }
-    int documentUpdateThreshold() const { return m_data.documentUpdateThreshold; }
-    qint64 sizeThresholdInKb() const { return m_data.sizeThresholdInKb; }
-    bool sizeThresholdEnabled() const { return m_data.sizeThresholdEnabled; }
-    int completionResults() const { return m_data.completionResults; }
-    bool sizeIsOkay(const Utils::FilePath &fp) const;
-    ClangDiagnosticConfigs customDiagnosticConfigs() const;
-    Utils::Id diagnosticConfigId() const;
-    ClangDiagnosticConfig diagnosticConfig() const;
+    static bool isInteractiveFollowSymbol();
+    static void setInteractiveFollowSymbol(bool interactive);
 
-    enum class Granularity { Project, Session };
-    Granularity granularity() const;
+    QString ignorePattern;
+    PCHUsage pchUsage = PchUse_BuildSystem;
+    int indexerFileSizeLimitInMb = 5;
+    bool interpretAmbigiousHeadersAsC = false;
+    bool skipIndexingBigFiles = true;
+    bool useBuiltinPreprocessor = true;
+    bool ignoreFiles = false;
+    bool enableIndexing = true;
 
-    void setData(const Data &data);
-    Data data() const { return m_data; }
-
-    Utils::FilePath clangdIncludePath() const;
-    static Utils::FilePath clangdUserConfigFilePath();
-
-#ifdef WITH_TESTS
-    static void setClangdFilePath(const Utils::FilePath &filePath);
-#endif
-
-signals:
-    void changed();
+    // Ephemeral!
+    bool m_categorizeFindReferences = false;
+    bool interactiveFollowSymbol = true;
 
 private:
-    ClangdSettings();
+    CppCodeModelSettings(Utils::QtcSettings *s) { fromSettings(s); }
+    static CppCodeModelSettings &globalInstance();
 
-    void loadSettings();
-    void saveSettings();
-
-    Data m_data;
+    void toSettings(Utils::QtcSettings *s);
+    void fromSettings(Utils::QtcSettings *s);
 };
 
-class CPPEDITOR_EXPORT ClangdProjectSettings
+namespace Internal {
+void setupCppCodeModelSettingsPage();
+void setupCppCodeModelProjectSettingsPanel();
+
+class NonInteractiveFollowSymbolMarker
 {
 public:
-    ClangdProjectSettings(ProjectExplorer::Project *project);
-
-    ClangdSettings::Data settings() const;
-    void setSettings(const ClangdSettings::Data &data);
-    bool useGlobalSettings() const { return m_useGlobalSettings; }
-    void setUseGlobalSettings(bool useGlobal);
-    void setDiagnosticConfigId(Utils::Id configId);
-    void blockIndexing();
-    void unblockIndexing();
-
-private:
-    void loadSettings();
-    void saveSettings();
-
-    ProjectExplorer::Project * const m_project;
-    ClangdSettings::Data m_customSettings;
-    bool m_useGlobalSettings = true;
-    bool m_blockIndexing = false;
+    NonInteractiveFollowSymbolMarker() { CppCodeModelSettings::setInteractiveFollowSymbol(false); }
+    ~NonInteractiveFollowSymbolMarker() { CppCodeModelSettings::setInteractiveFollowSymbol(true); }
 };
 
-CppCodeModelSettings &cppCodeModelSettings();
+} // namespace Internal
 
 } // namespace CppEditor
diff --git a/src/plugins/cppeditor/cppcodemodelsettingspage.cpp b/src/plugins/cppeditor/cppcodemodelsettingspage.cpp
deleted file mode 100644
index bc47a78c9df..00000000000
--- a/src/plugins/cppeditor/cppcodemodelsettingspage.cpp
+++ /dev/null
@@ -1,674 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "cppcodemodelsettingspage.h"
-
-#include "clangdiagnosticconfigsselectionwidget.h"
-#include "clangdiagnosticconfigswidget.h"
-#include "cppcodemodelsettings.h"
-#include "cppeditorconstants.h"
-#include "cppeditortr.h"
-#include "cpptoolsreuse.h"
-
-#include <coreplugin/dialogs/ioptionspage.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/session.h>
-
-#include <projectexplorer/projectpanelfactory.h>
-#include <projectexplorer/projectsettingswidget.h>
-
-#include <utils/algorithm.h>
-#include <utils/infolabel.h>
-#include <utils/itemviews.h>
-#include <utils/layoutbuilder.h>
-#include <utils/pathchooser.h>
-#include <utils/qtcassert.h>
-
-#include <QCheckBox>
-#include <QComboBox>
-#include <QDesktopServices>
-#include <QFormLayout>
-#include <QGroupBox>
-#include <QGuiApplication>
-#include <QInputDialog>
-#include <QPushButton>
-#include <QSpinBox>
-#include <QStringListModel>
-#include <QTextBlock>
-#include <QTextStream>
-#include <QVBoxLayout>
-#include <QVersionNumber>
-
-#include <limits>
-
-using namespace ProjectExplorer;
-
-namespace CppEditor::Internal {
-
-class CppCodeModelSettingsWidget final : public Core::IOptionsPageWidget
-{
-public:
-    CppCodeModelSettingsWidget();
-
-private:
-    void apply() final;
-
-    bool applyGeneralWidgetsToSettings() const;
-
-    CppCodeModelSettings *m_settings = nullptr;
-    QCheckBox *m_interpretAmbiguousHeadersAsCHeaders;
-    QCheckBox *m_ignorePchCheckBox;
-    QCheckBox *m_useBuiltinPreprocessorCheckBox;
-    QCheckBox *m_skipIndexingBigFilesCheckBox;
-    QSpinBox *m_bigFilesLimitSpinBox;
-    QCheckBox *m_ignoreFilesCheckBox;
-    QPlainTextEdit *m_ignorePatternTextEdit;
-};
-
-CppCodeModelSettingsWidget::CppCodeModelSettingsWidget()
-    : m_settings(&cppCodeModelSettings())
-{
-    m_interpretAmbiguousHeadersAsCHeaders
-        = new QCheckBox(Tr::tr("Interpret ambiguous headers as C headers"));
-
-    m_skipIndexingBigFilesCheckBox = new QCheckBox(Tr::tr("Do not index files greater than"));
-    m_skipIndexingBigFilesCheckBox->setChecked(m_settings->skipIndexingBigFiles());
-
-    m_bigFilesLimitSpinBox = new QSpinBox;
-    m_bigFilesLimitSpinBox->setSuffix(Tr::tr("MB"));
-    m_bigFilesLimitSpinBox->setRange(1, 500);
-    m_bigFilesLimitSpinBox->setValue(m_settings->indexerFileSizeLimitInMb());
-
-    m_ignoreFilesCheckBox = new QCheckBox(Tr::tr("Ignore files"));
-    m_ignoreFilesCheckBox->setToolTip(
-        "<html><head/><body><p>"
-        + Tr::tr("Ignore files that match these wildcard patterns, one wildcard per line.")
-        + "</p></body></html>");
-
-    m_ignoreFilesCheckBox->setChecked(m_settings->ignoreFiles());
-    m_ignorePatternTextEdit = new QPlainTextEdit(m_settings->ignorePattern());
-    m_ignorePatternTextEdit->setToolTip(m_ignoreFilesCheckBox->toolTip());
-    m_ignorePatternTextEdit->setEnabled(m_ignoreFilesCheckBox->isChecked());
-
-    connect(m_ignoreFilesCheckBox, &QCheckBox::stateChanged, this, [this] {
-       m_ignorePatternTextEdit->setEnabled(m_ignoreFilesCheckBox->isChecked());
-    });
-
-    m_ignorePchCheckBox = new QCheckBox(Tr::tr("Ignore precompiled headers"));
-    m_ignorePchCheckBox->setToolTip(Tr::tr(
-        "<html><head/><body><p>When precompiled headers are not ignored, the parsing for code "
-        "completion and semantic highlighting will process the precompiled header before "
-        "processing any file.</p></body></html>"));
-
-    m_useBuiltinPreprocessorCheckBox = new QCheckBox(Tr::tr("Use built-in preprocessor to show "
-                                                            "pre-processed files"));
-    m_useBuiltinPreprocessorCheckBox->setToolTip
-            (Tr::tr("Uncheck this to invoke the actual compiler "
-                    "to show a pre-processed source file in the editor."));
-
-    m_interpretAmbiguousHeadersAsCHeaders->setChecked(
-                m_settings->interpretAmbigiousHeadersAsCHeaders());
-
-    m_ignorePchCheckBox->setChecked(m_settings->pchUsage() == CppCodeModelSettings::PchUse_None);
-    m_useBuiltinPreprocessorCheckBox->setChecked(m_settings->useBuiltinPreprocessor());
-
-    using namespace Layouting;
-
-    Column {
-        Group {
-            title(Tr::tr("General")),
-            Column {
-                m_interpretAmbiguousHeadersAsCHeaders,
-                m_ignorePchCheckBox,
-                m_useBuiltinPreprocessorCheckBox,
-                Row { m_skipIndexingBigFilesCheckBox, m_bigFilesLimitSpinBox, st },
-                Row { Column { m_ignoreFilesCheckBox, st }, m_ignorePatternTextEdit },
-            }
-        },
-        st
-    }.attachTo(this);
-}
-
-void CppCodeModelSettingsWidget::apply()
-{
-    if (applyGeneralWidgetsToSettings())
-        m_settings->toSettings(Core::ICore::settings());
-}
-
-bool CppCodeModelSettingsWidget::applyGeneralWidgetsToSettings() const
-{
-    bool settingsChanged = false;
-
-    const bool newInterpretAmbiguousHeaderAsCHeaders
-            = m_interpretAmbiguousHeadersAsCHeaders->isChecked();
-    if (m_settings->interpretAmbigiousHeadersAsCHeaders()
-            != newInterpretAmbiguousHeaderAsCHeaders) {
-        m_settings->setInterpretAmbigiousHeadersAsCHeaders(newInterpretAmbiguousHeaderAsCHeaders);
-        settingsChanged = true;
-    }
-
-    const bool newSkipIndexingBigFiles = m_skipIndexingBigFilesCheckBox->isChecked();
-    if (m_settings->skipIndexingBigFiles() != newSkipIndexingBigFiles) {
-        m_settings->setSkipIndexingBigFiles(newSkipIndexingBigFiles);
-        settingsChanged = true;
-    }
-    const bool newUseBuiltinPreprocessor = m_useBuiltinPreprocessorCheckBox->isChecked();
-    if (m_settings->useBuiltinPreprocessor() != newUseBuiltinPreprocessor) {
-        m_settings->setUseBuiltinPreprocessor(newUseBuiltinPreprocessor);
-        settingsChanged = true;
-    }
-    const bool ignoreFiles = m_ignoreFilesCheckBox->isChecked();
-    if (m_settings->ignoreFiles() != ignoreFiles) {
-        m_settings->setIgnoreFiles(ignoreFiles);
-        settingsChanged = true;
-    }
-    const QString ignorePattern = m_ignorePatternTextEdit->toPlainText();
-    if (m_settings->ignorePattern() != ignorePattern) {
-        m_settings->setIgnorePattern(ignorePattern);
-        settingsChanged = true;
-    }
-    const int newFileSizeLimit = m_bigFilesLimitSpinBox->value();
-    if (m_settings->indexerFileSizeLimitInMb() != newFileSizeLimit) {
-        m_settings->setIndexerFileSizeLimitInMb(newFileSizeLimit);
-        settingsChanged = true;
-    }
-
-    const bool newIgnorePch = m_ignorePchCheckBox->isChecked();
-    const bool previousIgnorePch = m_settings->pchUsage() == CppCodeModelSettings::PchUse_None;
-    if (newIgnorePch != previousIgnorePch) {
-        const CppCodeModelSettings::PCHUsage pchUsage = m_ignorePchCheckBox->isChecked()
-                ? CppCodeModelSettings::PchUse_None
-                : CppCodeModelSettings::PchUse_BuildSystem;
-        m_settings->setPCHUsage(pchUsage);
-        settingsChanged = true;
-    }
-
-    return settingsChanged;
-}
-
-class CppCodeModelSettingsPage final : public Core::IOptionsPage
-{
-public:
-    CppCodeModelSettingsPage()
-    {
-        setId(Constants::CPP_CODE_MODEL_SETTINGS_ID);
-        setDisplayName(Tr::tr("Code Model"));
-        setCategory(Constants::CPP_SETTINGS_CATEGORY);
-        setDisplayCategory(Tr::tr("C++"));
-        setCategoryIconPath(":/projectexplorer/images/settingscategory_cpp.png");
-        setWidgetCreator([] { return new CppCodeModelSettingsWidget; });
-    }
-};
-
-void setupCppCodeModelSettings()
-{
-    static CppCodeModelSettingsPage theCppCodeModelSettingsPage;
-}
-
-class ClangdSettingsWidget final : public QWidget
-{
-    Q_OBJECT
-
-public:
-    ClangdSettingsWidget(const ClangdSettings::Data &settingsData, bool isForProject);
-
-    ClangdSettings::Data settingsData() const;
-
-signals:
-    void settingsDataChanged();
-
-private:
-    QCheckBox m_useClangdCheckBox;
-    QComboBox m_indexingComboBox;
-    QComboBox m_headerSourceSwitchComboBox;
-    QComboBox m_completionRankingModelComboBox;
-    QCheckBox m_autoIncludeHeadersCheckBox;
-    QCheckBox m_sizeThresholdCheckBox;
-    QSpinBox m_threadLimitSpinBox;
-    QSpinBox m_documentUpdateThreshold;
-    QSpinBox m_sizeThresholdSpinBox;
-    QSpinBox m_completionResults;
-    Utils::PathChooser m_clangdChooser;
-    Utils::InfoLabel m_versionWarningLabel;
-    ClangDiagnosticConfigsSelectionWidget *m_configSelectionWidget = nullptr;
-    QGroupBox *m_sessionsGroupBox = nullptr;
-    QStringListModel m_sessionsModel;
-};
-
-ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsData,
-                                           bool isForProject)
-{
-    const ClangdSettings settings(settingsData);
-    const QString indexingToolTip = Tr::tr(
-        "<p>If background indexing is enabled, global symbol searches will yield more accurate "
-        "results, at the cost of additional CPU load when the project is first opened. The "
-        "indexing result is persisted in the project's build directory. If you disable background "
-        "indexing, a faster, but less accurate, built-in indexer is used instead. The thread "
-        "priority for building the background index can be adjusted since clangd 15.</p>"
-        "<p>Background Priority: Minimum priority, runs on idle CPUs. May leave 'performance' "
-        "cores unused.</p>"
-        "<p>Normal Priority: Reduced priority compared to interactive work.</p>"
-        "<p>Low Priority: Same priority as other clangd work.</p>");
-    const QString headerSourceSwitchToolTip = Tr::tr(
-        "<p>The C/C++ backend to use for switching between header and source files.</p>"
-        "<p>While the clangd implementation has more capabilities than the built-in "
-        "code model, it tends to find false positives.</p>"
-        "<p>When \"Try Both\" is selected, clangd is used only if the built-in variant "
-        "does not find anything.</p>");
-    using RankingModel = ClangdSettings::CompletionRankingModel;
-    const QString completionRankingModelToolTip = Tr::tr(
-        "<p>Which model clangd should use to rank possible completions.</p>"
-        "<p>This determines the order of candidates in the combo box when doing code completion.</p>"
-        "<p>The \"%1\" model used by default results from (pre-trained) machine learning and "
-        "provides superior results on average.</p>"
-        "<p>If you feel that its suggestions stray too much from your expectations for your "
-        "code base, you can try switching to the hand-crafted \"%2\" model.</p>").arg(
-            ClangdSettings::rankingModelToDisplayString(RankingModel::DecisionForest),
-            ClangdSettings::rankingModelToDisplayString(RankingModel::Heuristics));
-    const QString workerThreadsToolTip = Tr::tr(
-        "Number of worker threads used by clangd. Background indexing also uses this many "
-        "worker threads.");
-    const QString autoIncludeToolTip = Tr::tr(
-        "Controls whether clangd may insert header files as part of symbol completion.");
-    const QString documentUpdateToolTip
-        //: %1 is the application name (Qt Creator)
-        = Tr::tr("Defines the amount of time %1 waits before sending document changes to the "
-                 "server.\n"
-                 "If the document changes again while waiting, this timeout resets.")
-              .arg(QGuiApplication::applicationDisplayName());
-    const QString sizeThresholdToolTip = Tr::tr(
-        "Files greater than this will not be opened as documents in clangd.\n"
-        "The built-in code model will handle highlighting, completion and so on.");
-    const QString completionResultToolTip = Tr::tr(
-        "The maximum number of completion results returned by clangd.");
-
-    m_useClangdCheckBox.setText(Tr::tr("Use clangd"));
-    m_useClangdCheckBox.setChecked(settings.useClangd());
-    m_clangdChooser.setExpectedKind(Utils::PathChooser::ExistingCommand);
-    m_clangdChooser.setFilePath(settings.clangdFilePath());
-    m_clangdChooser.setAllowPathFromDevice(true);
-    m_clangdChooser.setEnabled(m_useClangdCheckBox.isChecked());
-    m_clangdChooser.setCommandVersionArguments({"--version"});
-    using Priority = ClangdSettings::IndexingPriority;
-    for (Priority prio : {Priority::Off, Priority::Background, Priority::Low, Priority::Normal}) {
-        m_indexingComboBox.addItem(ClangdSettings::priorityToDisplayString(prio), int(prio));
-        if (prio == settings.indexingPriority())
-            m_indexingComboBox.setCurrentIndex(m_indexingComboBox.count() - 1);
-    }
-    m_indexingComboBox.setToolTip(indexingToolTip);
-    using SwitchMode = ClangdSettings::HeaderSourceSwitchMode;
-    for (SwitchMode mode : {SwitchMode::BuiltinOnly, SwitchMode::ClangdOnly, SwitchMode::Both}) {
-        m_headerSourceSwitchComboBox.addItem(
-            ClangdSettings::headerSourceSwitchModeToDisplayString(mode), int(mode));
-        if (mode == settings.headerSourceSwitchMode())
-            m_headerSourceSwitchComboBox.setCurrentIndex(
-                m_headerSourceSwitchComboBox.count() - 1);
-    }
-    m_headerSourceSwitchComboBox.setToolTip(headerSourceSwitchToolTip);
-    for (RankingModel model : {RankingModel::Default, RankingModel::DecisionForest,
-                               RankingModel::Heuristics}) {
-        m_completionRankingModelComboBox.addItem(
-            ClangdSettings::rankingModelToDisplayString(model), int(model));
-        if (model == settings.completionRankingModel())
-            m_completionRankingModelComboBox.setCurrentIndex(
-                m_completionRankingModelComboBox.count() - 1);
-    }
-    m_completionRankingModelComboBox.setToolTip(completionRankingModelToolTip);
-
-    m_autoIncludeHeadersCheckBox.setText(Tr::tr("Insert header files on completion"));
-    m_autoIncludeHeadersCheckBox.setChecked(settings.autoIncludeHeaders());
-    m_autoIncludeHeadersCheckBox.setToolTip(autoIncludeToolTip);
-    m_threadLimitSpinBox.setValue(settings.workerThreadLimit());
-    m_threadLimitSpinBox.setSpecialValueText(Tr::tr("Automatic"));
-    m_threadLimitSpinBox.setToolTip(workerThreadsToolTip);
-    m_documentUpdateThreshold.setMinimum(50);
-    m_documentUpdateThreshold.setMaximum(10000);
-    m_documentUpdateThreshold.setValue(settings.documentUpdateThreshold());
-    m_documentUpdateThreshold.setSingleStep(100);
-    m_documentUpdateThreshold.setSuffix(" ms");
-    m_documentUpdateThreshold.setToolTip(documentUpdateToolTip);
-    m_sizeThresholdCheckBox.setText(Tr::tr("Ignore files greater than"));
-    m_sizeThresholdCheckBox.setChecked(settings.sizeThresholdEnabled());
-    m_sizeThresholdCheckBox.setToolTip(sizeThresholdToolTip);
-    m_sizeThresholdSpinBox.setMinimum(1);
-    m_sizeThresholdSpinBox.setMaximum(std::numeric_limits<int>::max());
-    m_sizeThresholdSpinBox.setSuffix(" KB");
-    m_sizeThresholdSpinBox.setValue(settings.sizeThresholdInKb());
-    m_sizeThresholdSpinBox.setToolTip(sizeThresholdToolTip);
-
-    const auto completionResultsLabel = new QLabel(Tr::tr("Completion results:"));
-    completionResultsLabel->setToolTip(completionResultToolTip);
-    m_completionResults.setMinimum(0);
-    m_completionResults.setMaximum(std::numeric_limits<int>::max());
-    m_completionResults.setValue(settings.completionResults());
-    m_completionResults.setToolTip(completionResultToolTip);
-    m_completionResults.setSpecialValueText(Tr::tr("No limit"));
-
-    const auto layout = new QVBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-    layout->addWidget(&m_useClangdCheckBox);
-
-    const auto formLayout = new QFormLayout;
-    const auto chooserLabel = new QLabel(Tr::tr("Path to executable:"));
-    formLayout->addRow(chooserLabel, &m_clangdChooser);
-    formLayout->addRow(QString(), &m_versionWarningLabel);
-
-    const auto indexingPriorityLayout = new QHBoxLayout;
-    indexingPriorityLayout->addWidget(&m_indexingComboBox);
-    indexingPriorityLayout->addStretch(1);
-    const auto indexingPriorityLabel = new QLabel(Tr::tr("Background indexing:"));
-    indexingPriorityLabel->setToolTip(indexingToolTip);
-    formLayout->addRow(indexingPriorityLabel, indexingPriorityLayout);
-
-    const auto headerSourceSwitchLayout = new QHBoxLayout;
-    headerSourceSwitchLayout->addWidget(&m_headerSourceSwitchComboBox);
-    headerSourceSwitchLayout->addStretch(1);
-    const auto headerSourceSwitchLabel = new QLabel(Tr::tr("Header/source switch mode:"));
-    headerSourceSwitchLabel->setToolTip(headerSourceSwitchToolTip);
-    formLayout->addRow(headerSourceSwitchLabel, headerSourceSwitchLayout);
-
-    const auto threadLimitLayout = new QHBoxLayout;
-    threadLimitLayout->addWidget(&m_threadLimitSpinBox);
-    threadLimitLayout->addStretch(1);
-    const auto threadLimitLabel = new QLabel(Tr::tr("Worker thread count:"));
-    threadLimitLabel->setToolTip(workerThreadsToolTip);
-    formLayout->addRow(threadLimitLabel, threadLimitLayout);
-
-    formLayout->addRow(QString(), &m_autoIncludeHeadersCheckBox);
-    const auto limitResultsLayout = new QHBoxLayout;
-    limitResultsLayout->addWidget(&m_completionResults);
-    limitResultsLayout->addStretch(1);
-    formLayout->addRow(completionResultsLabel, limitResultsLayout);
-
-    const auto completionRankingModelLayout = new QHBoxLayout;
-    completionRankingModelLayout->addWidget(&m_completionRankingModelComboBox);
-    completionRankingModelLayout->addStretch(1);
-    const auto completionRankingModelLabel = new QLabel(Tr::tr("Completion ranking model:"));
-    completionRankingModelLabel->setToolTip(completionRankingModelToolTip);
-    formLayout->addRow(completionRankingModelLabel, completionRankingModelLayout);
-
-    const auto documentUpdateThresholdLayout = new QHBoxLayout;
-    documentUpdateThresholdLayout->addWidget(&m_documentUpdateThreshold);
-    documentUpdateThresholdLayout->addStretch(1);
-    const auto documentUpdateThresholdLabel = new QLabel(Tr::tr("Document update threshold:"));
-    documentUpdateThresholdLabel->setToolTip(documentUpdateToolTip);
-    formLayout->addRow(documentUpdateThresholdLabel, documentUpdateThresholdLayout);
-    const auto sizeThresholdLayout = new QHBoxLayout;
-    sizeThresholdLayout->addWidget(&m_sizeThresholdSpinBox);
-    sizeThresholdLayout->addStretch(1);
-    formLayout->addRow(&m_sizeThresholdCheckBox, sizeThresholdLayout);
-
-    m_configSelectionWidget = new ClangDiagnosticConfigsSelectionWidget(formLayout);
-    m_configSelectionWidget->refresh(
-                diagnosticConfigsModel(settings.customDiagnosticConfigs()),
-                settings.diagnosticConfigId(),
-                [](const ClangDiagnosticConfigs &configs, const Utils::Id &configToSelect) {
-                    return new CppEditor::ClangDiagnosticConfigsWidget(configs, configToSelect);
-                });
-
-    layout->addLayout(formLayout);
-    if (!isForProject) {
-        m_sessionsModel.setStringList(settingsData.sessionsWithOneClangd);
-        m_sessionsModel.sort(0);
-        m_sessionsGroupBox = new QGroupBox(Tr::tr("Sessions with a single clangd instance"));
-        const auto sessionsView = new Utils::ListView;
-        sessionsView->setModel(&m_sessionsModel);
-        sessionsView->setToolTip(
-                    Tr::tr("By default, Qt Creator runs one clangd process per project.\n"
-                       "If you have sessions with tightly coupled projects that should be\n"
-                       "managed by the same clangd process, add them here."));
-        const auto outerSessionsLayout = new QHBoxLayout;
-        const auto innerSessionsLayout = new QHBoxLayout(m_sessionsGroupBox);
-        const auto buttonsLayout = new QVBoxLayout;
-        const auto addButton = new QPushButton(Tr::tr("Add ..."));
-        const auto removeButton = new QPushButton(Tr::tr("Remove"));
-        buttonsLayout->addWidget(addButton);
-        buttonsLayout->addWidget(removeButton);
-        buttonsLayout->addStretch(1);
-        innerSessionsLayout->addWidget(sessionsView);
-        innerSessionsLayout->addLayout(buttonsLayout);
-        outerSessionsLayout->addWidget(m_sessionsGroupBox);
-        outerSessionsLayout->addStretch(1);
-
-        const auto separator = new QFrame;
-        separator->setFrameShape(QFrame::HLine);
-        layout->addWidget(separator);
-        layout->addLayout(outerSessionsLayout);
-
-        const auto updateRemoveButtonState = [removeButton, sessionsView] {
-            removeButton->setEnabled(sessionsView->selectionModel()->hasSelection());
-        };
-        connect(sessionsView->selectionModel(), &QItemSelectionModel::selectionChanged,
-                this, updateRemoveButtonState);
-        updateRemoveButtonState();
-        connect(removeButton, &QPushButton::clicked, this, [this, sessionsView] {
-            const QItemSelection selection = sessionsView->selectionModel()->selection();
-            QTC_ASSERT(!selection.isEmpty(), return);
-            m_sessionsModel.removeRow(selection.indexes().first().row());
-        });
-
-        connect(addButton, &QPushButton::clicked, this, [this, sessionsView] {
-            QInputDialog dlg(sessionsView);
-            QStringList sessions = Core::SessionManager::sessions();
-            QStringList currentSessions = m_sessionsModel.stringList();
-            for (const QString &s : std::as_const(currentSessions))
-                sessions.removeOne(s);
-            if (sessions.isEmpty())
-                return;
-            sessions.sort();
-            dlg.setLabelText(Tr::tr("Choose a session:"));
-            dlg.setComboBoxItems(sessions);
-            if (dlg.exec() == QDialog::Accepted) {
-                currentSessions << dlg.textValue();
-                m_sessionsModel.setStringList(currentSessions);
-                m_sessionsModel.sort(0);
-            }
-        });
-    }
-
-    const auto configFilesHelpLabel = new QLabel;
-    configFilesHelpLabel->setText(Tr::tr("Additional settings are available via "
-            "<a href=\"https://clangd.llvm.org/config\"> clangd configuration files</a>.<br>"
-            "User-specific settings go <a href=\"%1\">here</a>, "
-            "project-specific settings can be configured by putting a .clangd file into "
-            "the project source tree.")
-                .arg(ClangdSettings::clangdUserConfigFilePath().toUserOutput()));
-    configFilesHelpLabel->setWordWrap(true);
-    connect(configFilesHelpLabel, &QLabel::linkHovered, configFilesHelpLabel, &QLabel::setToolTip);
-    connect(configFilesHelpLabel, &QLabel::linkActivated, [](const QString &link) {
-        if (link.startsWith("https"))
-            QDesktopServices::openUrl(link);
-        else
-            Core::EditorManager::openEditor(Utils::FilePath::fromString(link));
-    });
-    layout->addWidget(Layouting::createHr());
-    layout->addWidget(configFilesHelpLabel);
-
-    layout->addStretch(1);
-
-    static const auto setWidgetsEnabled = [](QLayout *layout, bool enabled, const auto &f) -> void {
-        for (int i = 0; i < layout->count(); ++i) {
-            if (QWidget * const w = layout->itemAt(i)->widget())
-                w->setEnabled(enabled);
-            else if (QLayout * const l = layout->itemAt(i)->layout())
-                f(l, enabled, f);
-        }
-    };
-    const auto toggleEnabled = [this, formLayout](const bool checked) {
-        setWidgetsEnabled(formLayout, checked, setWidgetsEnabled);
-        if (m_sessionsGroupBox)
-            m_sessionsGroupBox->setEnabled(checked);
-    };
-    connect(&m_useClangdCheckBox, &QCheckBox::toggled, toggleEnabled);
-    toggleEnabled(m_useClangdCheckBox.isChecked());
-    m_threadLimitSpinBox.setEnabled(m_useClangdCheckBox.isChecked());
-
-    m_versionWarningLabel.setType(Utils::InfoLabel::Warning);
-    const auto updateWarningLabel = [this] {
-        class WarningLabelSetter {
-        public:
-            WarningLabelSetter(QLabel &label) : m_label(label) { m_label.clear(); }
-            ~WarningLabelSetter() { m_label.setVisible(!m_label.text().isEmpty()); }
-            void setWarning(const QString &text) { m_label.setText(text); }
-        private:
-            QLabel &m_label;
-        };
-        WarningLabelSetter labelSetter(m_versionWarningLabel);
-
-        if (!m_clangdChooser.isValid())
-            return;
-        const Utils::FilePath clangdPath = m_clangdChooser.filePath();
-        QString errorMessage;
-        if (!Utils::checkClangdVersion(clangdPath, &errorMessage))
-            labelSetter.setWarning(errorMessage);
-    };
-    connect(&m_clangdChooser, &Utils::PathChooser::textChanged, this, updateWarningLabel);
-    connect(&m_clangdChooser, &Utils::PathChooser::validChanged, this, updateWarningLabel);
-    updateWarningLabel();
-
-    connect(&m_useClangdCheckBox, &QCheckBox::toggled,
-            this, &ClangdSettingsWidget::settingsDataChanged);
-    connect(&m_indexingComboBox, &QComboBox::currentIndexChanged,
-            this, &ClangdSettingsWidget::settingsDataChanged);
-    connect(&m_headerSourceSwitchComboBox, &QComboBox::currentIndexChanged,
-            this, &ClangdSettingsWidget::settingsDataChanged);
-    connect(&m_completionRankingModelComboBox, &QComboBox::currentIndexChanged,
-            this, &ClangdSettingsWidget::settingsDataChanged);
-    connect(&m_autoIncludeHeadersCheckBox, &QCheckBox::toggled,
-            this, &ClangdSettingsWidget::settingsDataChanged);
-    connect(&m_threadLimitSpinBox, &QSpinBox::valueChanged,
-            this, &ClangdSettingsWidget::settingsDataChanged);
-    connect(&m_sizeThresholdCheckBox, &QCheckBox::toggled,
-            this, &ClangdSettingsWidget::settingsDataChanged);
-    connect(&m_sizeThresholdSpinBox, &QSpinBox::valueChanged,
-            this, &ClangdSettingsWidget::settingsDataChanged);
-    connect(&m_documentUpdateThreshold, &QSpinBox::valueChanged,
-            this, &ClangdSettingsWidget::settingsDataChanged);
-    connect(&m_clangdChooser, &Utils::PathChooser::textChanged,
-            this, &ClangdSettingsWidget::settingsDataChanged);
-    connect(m_configSelectionWidget, &ClangDiagnosticConfigsSelectionWidget::changed,
-            this, &ClangdSettingsWidget::settingsDataChanged);
-    connect(&m_completionResults, &QSpinBox::valueChanged,
-            this, &ClangdSettingsWidget::settingsDataChanged);
-}
-
-ClangdSettings::Data ClangdSettingsWidget::settingsData() const
-{
-    ClangdSettings::Data data;
-    data.useClangd = m_useClangdCheckBox.isChecked();
-    data.executableFilePath = m_clangdChooser.filePath();
-    data.indexingPriority = ClangdSettings::IndexingPriority(
-        m_indexingComboBox.currentData().toInt());
-    data.headerSourceSwitchMode = ClangdSettings::HeaderSourceSwitchMode(
-        m_headerSourceSwitchComboBox.currentData().toInt());
-    data.completionRankingModel = ClangdSettings::CompletionRankingModel(
-        m_completionRankingModelComboBox.currentData().toInt());
-    data.autoIncludeHeaders = m_autoIncludeHeadersCheckBox.isChecked();
-    data.workerThreadLimit = m_threadLimitSpinBox.value();
-    data.documentUpdateThreshold = m_documentUpdateThreshold.value();
-    data.sizeThresholdEnabled = m_sizeThresholdCheckBox.isChecked();
-    data.sizeThresholdInKb = m_sizeThresholdSpinBox.value();
-    data.sessionsWithOneClangd = m_sessionsModel.stringList();
-    data.customDiagnosticConfigs = m_configSelectionWidget->customConfigs();
-    data.diagnosticConfigId = m_configSelectionWidget->currentConfigId();
-    data.completionResults = m_completionResults.value();
-    return data;
-}
-
-class ClangdSettingsPageWidget final : public Core::IOptionsPageWidget
-{
-public:
-    ClangdSettingsPageWidget() : m_widget(ClangdSettings::instance().data(), false)
-    {
-        const auto layout = new QVBoxLayout(this);
-        layout->addWidget(&m_widget);
-    }
-
-private:
-    void apply() final { ClangdSettings::instance().setData(m_widget.settingsData()); }
-
-    ClangdSettingsWidget m_widget;
-};
-
-class ClangdSettingsPage final : public Core::IOptionsPage
-{
-public:
-    ClangdSettingsPage()
-    {
-        setId(Constants::CPP_CLANGD_SETTINGS_ID);
-        setDisplayName(Tr::tr("Clangd"));
-        setCategory(Constants::CPP_SETTINGS_CATEGORY);
-        setWidgetCreator([] { return new ClangdSettingsPageWidget; });
-    }
-};
-
-void setupClangdSettingsPage()
-{
-    static ClangdSettingsPage theClangdSettingsPage;
-}
-
-class ClangdProjectSettingsWidget : public ProjectSettingsWidget
-{
-public:
-    ClangdProjectSettingsWidget(const ClangdProjectSettings &settings)
-        : m_settings(settings), m_widget(settings.settings(), true)
-    {
-        setGlobalSettingsId(Constants::CPP_CLANGD_SETTINGS_ID);
-        const auto layout = new QVBoxLayout(this);
-        layout->setContentsMargins(0, 0, 0, 0);
-        layout->addWidget(&m_widget);
-
-        const auto updateGlobalSettingsCheckBox = [this] {
-            if (ClangdSettings::instance().granularity() == ClangdSettings::Granularity::Session) {
-                setUseGlobalSettingsCheckBoxEnabled(false);
-                setUseGlobalSettings(true);
-            } else {
-                setUseGlobalSettingsCheckBoxEnabled(true);
-                setUseGlobalSettings(m_settings.useGlobalSettings());
-            }
-            m_widget.setEnabled(!useGlobalSettings());
-        };
-
-        updateGlobalSettingsCheckBox();
-        connect(&ClangdSettings::instance(), &ClangdSettings::changed,
-                this, updateGlobalSettingsCheckBox);
-
-        connect(this, &ProjectSettingsWidget::useGlobalSettingsChanged, this,
-                [this](bool checked) {
-                    m_widget.setEnabled(!checked);
-                    m_settings.setUseGlobalSettings(checked);
-                    if (!checked)
-                        m_settings.setSettings(m_widget.settingsData());
-                });
-
-        connect(&m_widget, &ClangdSettingsWidget::settingsDataChanged, this, [this] {
-            m_settings.setSettings(m_widget.settingsData());
-        });
-    }
-
-private:
-    ClangdProjectSettings m_settings;
-    ClangdSettingsWidget m_widget;
-};
-
-class ClangdProjectSettingsPanelFactory final : public ProjectPanelFactory
-{
-public:
-    ClangdProjectSettingsPanelFactory()
-    {
-        setPriority(100);
-        setDisplayName(Tr::tr("Clangd"));
-        setCreateWidgetFunction([](Project *project) {
-            return new ClangdProjectSettingsWidget(project);
-        });
-    }
-};
-
-void setupClangdProjectSettingsPanel()
-{
-    static ClangdProjectSettingsPanelFactory theClangdProjectSettingsPanelFactory;
-}
-
-} // CppEditor::Internal
-
-#include "cppcodemodelsettingspage.moc"
diff --git a/src/plugins/cppeditor/cppcodemodelsettingspage.h b/src/plugins/cppeditor/cppcodemodelsettingspage.h
deleted file mode 100644
index 35a6bc51110..00000000000
--- a/src/plugins/cppeditor/cppcodemodelsettingspage.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-namespace CppEditor::Internal {
-
-void setupCppCodeModelSettings();
-void setupClangdProjectSettingsPanel();
-void setupClangdSettingsPage();
-
-} // CppEditor::Internal
diff --git a/src/plugins/cppeditor/cppcodestylesettings.cpp b/src/plugins/cppeditor/cppcodestylesettings.cpp
index 733f066eaca..5499005c62b 100644
--- a/src/plugins/cppeditor/cppcodestylesettings.cpp
+++ b/src/plugins/cppeditor/cppcodestylesettings.cpp
@@ -17,6 +17,7 @@
 
 #include <utils/qtcassert.h>
 
+static const char statementMacrosKey[] = "StatementMacros";
 static const char indentBlockBracesKey[] = "IndentBlockBraces";
 static const char indentBlockBodyKey[] = "IndentBlockBody";
 static const char indentClassBracesKey[] = "IndentClassBraces";
@@ -50,6 +51,7 @@ CppCodeStyleSettings::CppCodeStyleSettings() = default;
 Store CppCodeStyleSettings::toMap() const
 {
     return {
+        {statementMacrosKey, statementMacros},
         {indentBlockBracesKey, indentBlockBraces},
         {indentBlockBodyKey, indentBlockBody},
         {indentClassBracesKey, indentClassBraces},
@@ -76,6 +78,7 @@ Store CppCodeStyleSettings::toMap() const
 
 void CppCodeStyleSettings::fromMap(const Store &map)
 {
+    statementMacros = map.value(statementMacrosKey, statementMacros).toStringList();
     indentBlockBraces = map.value(indentBlockBracesKey, indentBlockBraces).toBool();
     indentBlockBody = map.value(indentBlockBodyKey, indentBlockBody).toBool();
     indentClassBraces = map.value(indentClassBracesKey, indentClassBraces).toBool();
@@ -128,6 +131,7 @@ bool CppCodeStyleSettings::equals(const CppCodeStyleSettings &rhs) const
            && bindStarToRightSpecifier == rhs.bindStarToRightSpecifier
            && extraPaddingForConditionsIfConfusingAlign == rhs.extraPaddingForConditionsIfConfusingAlign
            && alignAssignments == rhs.alignAssignments
+           && statementMacros == rhs.statementMacros
            && preferGetterNameWithoutGetPrefix == rhs.preferGetterNameWithoutGetPrefix
 #ifdef WITH_TESTS
            && forceFormatting == rhs.forceFormatting
diff --git a/src/plugins/cppeditor/cppcodestylesettings.h b/src/plugins/cppeditor/cppcodestylesettings.h
index 8369df099e8..a798ca7434d 100644
--- a/src/plugins/cppeditor/cppcodestylesettings.h
+++ b/src/plugins/cppeditor/cppcodestylesettings.h
@@ -18,6 +18,7 @@ class CPPEDITOR_EXPORT CppCodeStyleSettings
 public:
     CppCodeStyleSettings();
 
+    QStringList statementMacros;
     bool indentBlockBraces = false;
     bool indentBlockBody = true;
     bool indentClassBraces = false;
diff --git a/src/plugins/cppeditor/cppcodestylesettingspage.cpp b/src/plugins/cppeditor/cppcodestylesettingspage.cpp
index ba0fc189417..2364dee8145 100644
--- a/src/plugins/cppeditor/cppcodestylesettingspage.cpp
+++ b/src/plugins/cppeditor/cppcodestylesettingspage.cpp
@@ -163,8 +163,9 @@ public:
         , m_bindStarToRightSpecifier(createCheckBox(Tr::tr("Right const/volatile"),
                                                     Tr::tr("This does not apply to references.")))
         , m_tabSettingsWidget(new TabSettingsWidget)
+        , m_statementMacros(new QPlainTextEdit)
     {
-        QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
+        QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
         sizePolicy.setHorizontalStretch(0);
         sizePolicy.setVerticalStretch(0);
         sizePolicy.setHeightForWidth(m_tabSettingsWidget->sizePolicy().hasHeightForWidth());
@@ -241,11 +242,27 @@ public:
             }
         };
 
+        sizePolicy.setVerticalPolicy(QSizePolicy::Preferred);
+        m_statementMacros->setToolTip(
+            Tr::tr("Macros that can be used as statements without a trailing semicolon."));
+        m_statementMacros->setSizePolicy(sizePolicy);
+        // clang-format off
+        const Group statementMacrosGroup {
+            title(Tr::tr("Statement Macros")),
+            Column { m_statementMacros}
+        };
+        // clang-format on
+        QObject::connect(m_statementMacros, &QPlainTextEdit::textChanged, q, [this] {
+            m_handlingStatementMacroChange = true;
+            q->slotCodeStyleSettingsChanged();
+            m_handlingStatementMacroChange = false;
+        });
+
         Row {
             TabWidget {
                 bindTo(&m_categoryTab),
                 Tab { Tr::tr("General"),
-                    Row { Column { m_tabSettingsWidget, st }, createPreview(0) }
+                    Row { Column { m_tabSettingsWidget, statementMacrosGroup }, createPreview(0) }
                 },
                 Tab { Tr::tr("Content"), Row { contentGroup, createPreview(1) } },
                 Tab { Tr::tr("Braces"), Row { bracesGroup, createPreview(2) } },
@@ -310,6 +327,8 @@ public:
 
     QTabWidget *m_categoryTab = nullptr;
     TabSettingsWidget *m_tabSettingsWidget = nullptr;
+    QPlainTextEdit * const m_statementMacros;
+    bool m_handlingStatementMacroChange = false;
 };
 
 CppCodeStylePreferencesWidget::CppCodeStylePreferencesWidget(QWidget *parent)
@@ -361,6 +380,10 @@ CppCodeStyleSettings CppCodeStylePreferencesWidget::cppCodeStyleSettings() const
 {
     CppCodeStyleSettings set;
 
+    set.statementMacros
+        = Utils::transform(d->m_statementMacros->toPlainText().trimmed().split('\n',
+                                                                               Qt::SkipEmptyParts),
+                           [](const QString &line) { return line.trimmed(); });
     set.indentBlockBraces = d->m_indentBlockBraces->isChecked();
     set.indentBlockBody = d->m_indentBlockBody->isChecked();
     set.indentClassBraces = d->m_indentClassBraces->isChecked();
@@ -399,6 +422,8 @@ void CppCodeStylePreferencesWidget::setCodeStyleSettings(const CppCodeStyleSetti
 {
     const bool wasBlocked = m_blockUpdates;
     m_blockUpdates = true;
+    if (!d->m_handlingStatementMacroChange)
+        d->m_statementMacros->setPlainText(s.statementMacros.join('\n'));
     d->m_indentBlockBraces->setChecked(s.indentBlockBraces);
     d->m_indentBlockBody->setChecked(s.indentBlockBody);
     d->m_indentClassBraces->setChecked(s.indentClassBraces);
diff --git a/src/plugins/cppeditor/cppcompletion_test.cpp b/src/plugins/cppeditor/cppcompletion_test.cpp
index cf8b163ab4e..6f152c65a6e 100644
--- a/src/plugins/cppeditor/cppcompletion_test.cpp
+++ b/src/plugins/cppeditor/cppcompletion_test.cpp
@@ -10,7 +10,7 @@
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <texteditor/codeassist/iassistproposal.h>
-#include <texteditor/syntaxhighlighterrunner.h>
+#include <texteditor/syntaxhighlighter.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>
 
@@ -146,12 +146,10 @@ public:
         TextEditor::BaseTextEditor *cppEditor = qobject_cast<TextEditor::BaseTextEditor *>(m_editor);
         if (!cppEditor)
             return false;
-        if (cppEditor->textDocument()->syntaxHighlighterRunner()->syntaxInfoUpdated())
+        if (cppEditor->textDocument()->syntaxHighlighter()->syntaxHighlighterUpToDate())
             return true;
         return ::CppEditor::Tests::waitForSignalOrTimeout(
-            cppEditor->textDocument()->syntaxHighlighterRunner(),
-            &SyntaxHighlighterRunner::highlightingFinished,
-            5000);
+            cppEditor->textDocument()->syntaxHighlighter(), &SyntaxHighlighter::finished, 5000);
     }
 
 private:
@@ -2891,6 +2889,16 @@ void CompletionTest::testCompletionMemberAccessOperator_data()
         ) << _("p->") << QStringList({"S", "m"})
         << false
         << false;
+    QTest::newRow("dot to arrow: template + reference + double typedef")
+        << _("template <typename T> struct C {\n"
+             "    using ref = T &;\n"
+             "    ref operator[](int i);\n"
+             "};\n"
+             "struct S { int m; };\n"
+             "template<typename T> using CS = C<T>;\n"
+             "CS<S *> v;\n"
+             "@\n")
+        << _("v[0].") << QStringList({"S", "m"}) << false << true;
 }
 
 } // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/cppdoxygen_test.cpp b/src/plugins/cppeditor/cppdoxygen_test.cpp
index 2d85345303a..8ef6a6fff0f 100644
--- a/src/plugins/cppeditor/cppdoxygen_test.cpp
+++ b/src/plugins/cppeditor/cppdoxygen_test.cpp
@@ -488,7 +488,7 @@ void DoxygenTest::runTest(const QByteArray &original,
     //    testDocument.m_editorWidget->unfoldAll();
     testDocument.m_editor->setCursorPosition(testDocument.m_cursorPosition);
 
-    TestCase::waitForRehighlightedSemanticDocument(testDocument.m_editorWidget);
+    QVERIFY(TestCase::waitForRehighlightedSemanticDocument(testDocument.m_editorWidget));
 
     // Send 'ENTER' key press
     QKeyEvent event(QEvent::KeyPress, Qt::Key_Enter, Qt::NoModifier);
diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs
index b684b0e0eac..c563c760971 100644
--- a/src/plugins/cppeditor/cppeditor.qbs
+++ b/src/plugins/cppeditor/cppeditor.qbs
@@ -45,6 +45,8 @@ QtcPlugin {
         "clangdiagnosticconfigsselectionwidget.h",
         "clangdiagnosticconfigswidget.cpp",
         "clangdiagnosticconfigswidget.h",
+        "clangdsettings.cpp",
+        "clangdsettings.h",
         "compileroptionsbuilder.cpp",
         "compileroptionsbuilder.h",
         "cppautocompleter.cpp",
@@ -63,8 +65,6 @@ QtcPlugin {
         "cppcodemodelinspectordumper.h",
         "cppcodemodelsettings.cpp",
         "cppcodemodelsettings.h",
-        "cppcodemodelsettingspage.cpp",
-        "cppcodemodelsettingspage.h",
         "cppcodestylepreferences.cpp",
         "cppcodestylepreferences.h",
         "cppcodestylepreferencesfactory.cpp",
@@ -119,8 +119,6 @@ QtcPlugin {
         "cppincludesfilter.h",
         "cppindexingsupport.cpp",
         "cppindexingsupport.h",
-        "cppinsertvirtualmethods.cpp",
-        "cppinsertvirtualmethods.h",
         "cpplocalrenaming.cpp",
         "cpplocalrenaming.h",
         "cpplocalsymbols.cpp",
@@ -153,22 +151,6 @@ QtcPlugin {
         "cppprojectinfogenerator.h",
         "cppprojectupdater.cpp",
         "cppprojectupdater.h",
-        "cppquickfix.cpp",
-        "cppquickfix.h",
-        "cppquickfixassistant.cpp",
-        "cppquickfixassistant.h",
-        "cppquickfixes.cpp",
-        "cppquickfixes.h",
-        "cppquickfixprojectsettings.cpp",
-        "cppquickfixprojectsettings.h",
-        "cppquickfixprojectsettingswidget.cpp",
-        "cppquickfixprojectsettingswidget.h",
-        "cppquickfixsettings.cpp",
-        "cppquickfixsettings.h",
-        "cppquickfixsettingspage.cpp",
-        "cppquickfixsettingspage.h",
-        "cppquickfixsettingswidget.cpp",
-        "cppquickfixsettingswidget.h",
         "cppqtstyleindenter.cpp",
         "cppqtstyleindenter.h",
         "cpprefactoringchanges.cpp",
@@ -233,6 +215,79 @@ QtcPlugin {
         "wrappablelineedit.h",
     ]
 
+    Group {
+        name: "Quickfixes"
+        prefix: "quickfixes/"
+        files: [
+            "assigntolocalvariable.cpp",
+            "assigntolocalvariable.h",
+            "bringidentifierintoscope.cpp",
+            "bringidentifierintoscope.h",
+            "completeswitchstatement.cpp",
+            "completeswitchstatement.h",
+            "convertfromandtopointer.cpp",
+            "convertfromandtopointer.h",
+            "convertnumericliteral.cpp",
+            "convertnumericliteral.h",
+            "convertqt4connect.cpp",
+            "convertqt4connect.h",
+            "convertstringliteral.cpp",
+            "convertstringliteral.h",
+            "converttocamelcase.cpp",
+            "converttocamelcase.h",
+            "converttometamethodcall.cpp",
+            "converttometamethodcall.h",
+            "cppcodegenerationquickfixes.cpp",
+            "cppcodegenerationquickfixes.h",
+            "cppinsertvirtualmethods.cpp",
+            "cppinsertvirtualmethods.h",
+            "cppquickfix.cpp",
+            "cppquickfix.h",
+            "cppquickfixassistant.cpp",
+            "cppquickfixassistant.h",
+            "cppquickfixhelpers.cpp",
+            "cppquickfixhelpers.h",
+            "cppquickfixprojectsettings.cpp",
+            "cppquickfixprojectsettings.h",
+            "cppquickfixprojectsettingswidget.cpp",
+            "cppquickfixprojectsettingswidget.h",
+            "cppquickfixsettings.cpp",
+            "cppquickfixsettings.h",
+            "cppquickfixsettingspage.cpp",
+            "cppquickfixsettingspage.h",
+            "cppquickfixsettingswidget.cpp",
+            "cppquickfixsettingswidget.h",
+            "createdeclarationfromuse.cpp",
+            "createdeclarationfromuse.h",
+            "extractfunction.cpp",
+            "extractfunction.h",
+            "extractliteralasparameter.cpp",
+            "extractliteralasparameter.h",
+            "insertfunctiondefinition.cpp",
+            "insertfunctiondefinition.h",
+            "logicaloperationquickfixes.cpp",
+            "logicaloperationquickfixes.h",
+            "moveclasstoownfile.cpp",
+            "moveclasstoownfile.h",
+            "movefunctiondefinition.cpp",
+            "movefunctiondefinition.h",
+            "rearrangeparamdeclarationlist.cpp",
+            "rearrangeparamdeclarationlist.h",
+            "reformatpointerdeclaration.cpp",
+            "reformatpointerdeclaration.h",
+            "removeusingnamespace.cpp",
+            "removeusingnamespace.h",
+            "rewritecomment.cpp",
+            "rewritecomment.h",
+            "rewritecontrolstatements.cpp",
+            "rewritecontrolstatements.h",
+            "splitsimpledeclaration.cpp",
+            "splitsimpledeclaration.h",
+            "synchronizememberfunctionorder.cpp",
+            "synchronizememberfunctionorder.h",
+        ]
+    }
+
     Group {
         name: "TestCase"
         condition: qtc.withPluginTests || qtc.withAutotests
@@ -244,6 +299,16 @@ QtcPlugin {
 
     QtcTestFiles {
         cpp.defines: outer.concat(['SRCDIR="' + FileInfo.path(filePath) + '"'])
+
+        Group {
+            name: "Quickfix tests"
+            prefix: "quickfixes/"
+            files: [
+                "cppquickfix_test.cpp",
+                "cppquickfix_test.h",
+            ]
+        }
+
         files: [
             "compileroptionsbuilder_test.cpp",
             "compileroptionsbuilder_test.h",
@@ -263,8 +328,6 @@ QtcPlugin {
             "cppmodelmanager_test.h",
             "cpppointerdeclarationformatter_test.cpp",
             "cpppointerdeclarationformatter_test.h",
-            "cppquickfix_test.cpp",
-            "cppquickfix_test.h",
             "cpprenaming_test.cpp",
             "cpprenaming_test.h",
             "cppsourceprocessor_test.cpp",
diff --git a/src/plugins/cppeditor/cppeditor.qrc b/src/plugins/cppeditor/cppeditor.qrc
index c28111d21e6..3a5ace117d3 100644
--- a/src/plugins/cppeditor/cppeditor.qrc
+++ b/src/plugins/cppeditor/cppeditor.qrc
@@ -4,5 +4,58 @@
         <file>images/dark_qt_h.png</file>
         <file>images/dark_qt_c.png</file>
         <file>testcases/highlightingtestcase.cpp</file>
+        <file>testcases/move-class/complex/complex.pro</file>
+        <file>testcases/move-class/complex/main.cpp</file>
+        <file>testcases/move-class/complex/main.cpp_expected</file>
+        <file>testcases/move-class/complex/theclass.cpp_expected</file>
+        <file>testcases/move-class/complex/theheader.h</file>
+        <file>testcases/move-class/complex/theheader.h_expected</file>
+        <file>testcases/move-class/complex/thesource.cpp</file>
+        <file>testcases/move-class/complex/thesource.cpp_expected</file>
+        <file>testcases/move-class/complex/complex.pro_expected</file>
+        <file>testcases/move-class/nested/main.cpp</file>
+        <file>testcases/move-class/nested/nested.pro</file>
+        <file>testcases/move-class/match1/match1.pro</file>
+        <file>testcases/move-class/match1/TheClass.h</file>
+        <file>testcases/move-class/match2/match2.pro</file>
+        <file>testcases/move-class/match2/theclass.h</file>
+        <file>testcases/move-class/match3/match3.pro</file>
+        <file>testcases/move-class/match3/the_class.h</file>
+        <file>testcases/move-class/single/single.pro</file>
+        <file>testcases/move-class/single/theheader.h</file>
+        <file>testcases/move-class/header-only/header-only.pro</file>
+        <file>testcases/move-class/header-only/header-only.pro_expected</file>
+        <file>testcases/move-class/header-only/theclass.h_expected</file>
+        <file>testcases/move-class/header-only/theheader.h</file>
+        <file>testcases/move-class/header-only/thesource.cpp</file>
+        <file>testcases/move-class/header-only/theheader.h_expected</file>
+        <file>testcases/move-class/header-only/thesource.cpp_expected</file>
+        <file>testcases/move-class/decl-in-source/decl-in-source.pro</file>
+        <file>testcases/move-class/decl-in-source/decl-in-source.pro_expected</file>
+        <file>testcases/move-class/decl-in-source/theclass.h_expected</file>
+        <file>testcases/move-class/decl-in-source/thesource.cpp</file>
+        <file>testcases/move-class/decl-in-source/thesource.cpp_expected</file>
+        <file>testcases/move-class/template/template.pro</file>
+        <file>testcases/move-class/template/template.pro_expected</file>
+        <file>testcases/move-class/template/theclass.h_expected</file>
+        <file>testcases/move-class/template/theheader.h</file>
+        <file>testcases/move-class/template/theheader.h_expected</file>
+        <file>testcases/move-class/complex/theclass.h_expected</file>
+        <file>testcases/reorder-member-impls/different-locations/different-locations.pro</file>
+        <file>testcases/reorder-member-impls/different-locations/header.h</file>
+        <file>testcases/reorder-member-impls/different-locations/header.h_expected</file>
+        <file>testcases/reorder-member-impls/different-locations/impl1.cpp</file>
+        <file>testcases/reorder-member-impls/different-locations/impl1.cpp_expected</file>
+        <file>testcases/reorder-member-impls/different-locations/impl2.cpp</file>
+        <file>testcases/reorder-member-impls/different-locations/impl2.cpp_expected</file>
+        <file>testcases/reorder-member-impls/already-sorted/already-sorted.pro</file>
+        <file>testcases/reorder-member-impls/already-sorted/header.h</file>
+        <file>testcases/reorder-member-impls/no-out-of-line/header.h</file>
+        <file>testcases/reorder-member-impls/no-out-of-line/no-out-of-line.pro</file>
+        <file>testcases/reorder-member-impls/already-sorted/header.h_expected</file>
+        <file>testcases/reorder-member-impls/no-out-of-line/header.h_expected</file>
+        <file>testcases/reorder-member-impls/templates/header.h</file>
+        <file>testcases/reorder-member-impls/templates/header.h_expected</file>
+        <file>testcases/reorder-member-impls/templates/templates.pro</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/cppeditor/cppeditorconstants.h b/src/plugins/cppeditor/cppeditorconstants.h
index 1c5cffee98f..1d4c0cc18b4 100644
--- a/src/plugins/cppeditor/cppeditorconstants.h
+++ b/src/plugins/cppeditor/cppeditorconstants.h
@@ -22,9 +22,6 @@ const char M_REFACTORING_MENU_INSERTION_POINT[] = "CppEditor.RefactorGroup";
 const char UPDATE_CODEMODEL[] = "CppEditor.UpdateCodeModel";
 const char INSPECT_CPP_CODEMODEL[] = "CppEditor.InspectCppCodeModel";
 
-const char TYPE_HIERARCHY_ID[] = "CppEditor.TypeHierarchy";
-const char OPEN_TYPE_HIERARCHY[] = "CppEditor.OpenTypeHierarchy";
-
 const char INCLUDE_HIERARCHY_ID[] = "CppEditor.IncludeHierarchy";
 const char OPEN_INCLUDE_HIERARCHY[] = "CppEditor.OpenIncludeHierarchy";
 
diff --git a/src/plugins/cppeditor/cppeditordocument.cpp b/src/plugins/cppeditor/cppeditordocument.cpp
index badd02b751b..1f5adc4baa5 100644
--- a/src/plugins/cppeditor/cppeditordocument.cpp
+++ b/src/plugins/cppeditor/cppeditordocument.cpp
@@ -11,7 +11,7 @@
 #include "cppeditorconstants.h"
 #include "cppeditortr.h"
 #include "cpphighlighter.h"
-#include "cppquickfixassistant.h"
+#include "quickfixes/cppquickfixassistant.h"
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/session.h>
@@ -20,7 +20,6 @@
 #include <texteditor/storagesettings.h>
 #include <texteditor/textdocumentlayout.h>
 #include <texteditor/texteditorsettings.h>
-#include <texteditor/syntaxhighlighterrunner.h>
 
 #include <utils/infobar.h>
 #include <utils/mimeconstants.h>
@@ -164,7 +163,7 @@ QByteArray CppEditorDocument::contentsText() const
 
 void CppEditorDocument::applyFontSettings()
 {
-    if (TextEditor::SyntaxHighlighterRunner *highlighter = syntaxHighlighterRunner())
+    if (TextEditor::SyntaxHighlighter *highlighter = syntaxHighlighter())
         highlighter->clearAllExtraFormats(); // Clear all additional formats since they may have changed
     TextDocument::applyFontSettings(); // rehighlights and updates additional formats
     if (m_processor)
@@ -408,7 +407,7 @@ BaseEditorDocumentProcessor *CppEditorDocument::processor()
         connect(m_processor.data(), &BaseEditorDocumentProcessor::cppDocumentUpdated, this,
                 [this](const CPlusPlus::Document::Ptr document) {
                     // Update syntax highlighter
-                    if (SyntaxHighlighterRunner *highlighter = syntaxHighlighterRunner())
+                    if (SyntaxHighlighter *highlighter = syntaxHighlighter())
                         highlighter->setLanguageFeaturesFlags(document->languageFeatures().flags);
 
                     m_overviewModel.update(usesClangd() ? nullptr : document);
@@ -475,7 +474,7 @@ bool CppEditorDocument::saveImpl(QString *errorString, const FilePath &filePath,
 
 bool CppEditorDocument::usesClangd() const
 {
-    return CppModelManager::usesClangd(this);
+    return CppModelManager::usesClangd(this).has_value();
 }
 
 void CppEditorDocument::onDiagnosticsChanged(const FilePath &fileName, const QString &kind)
diff --git a/src/plugins/cppeditor/cppeditoroutline.cpp b/src/plugins/cppeditor/cppeditoroutline.cpp
index d630a7ad1c6..9739bd50b4a 100644
--- a/src/plugins/cppeditor/cppeditoroutline.cpp
+++ b/src/plugins/cppeditor/cppeditoroutline.cpp
@@ -37,20 +37,17 @@ enum { UpdateOutlineIntervalInMs = 500 };
 using namespace Core;
 using namespace Utils;
 
-namespace {
+namespace CppEditor::Internal {
 
-class OutlineProxyModel : public QSortFilterProxyModel
+class OutlineProxyModel final : public QSortFilterProxyModel
 {
-    Q_OBJECT
-
 public:
-    OutlineProxyModel(CppEditor::Internal::OutlineModel &sourceModel, QObject *parent)
+    OutlineProxyModel(OutlineModel &sourceModel, QObject *parent)
         : QSortFilterProxyModel(parent)
         , m_sourceModel(sourceModel)
-    {
-    }
+    {}
 
-    bool filterAcceptsRow(int sourceRow,const QModelIndex &sourceParent) const override
+    bool filterAcceptsRow(int sourceRow,const QModelIndex &sourceParent) const final
     {
         // Ignore generated symbols, e.g. by macro expansion (Q_OBJECT)
         const QModelIndex sourceIndex = m_sourceModel.index(sourceRow, 0, sourceParent);
@@ -63,19 +60,6 @@ private:
     CppEditor::Internal::OutlineModel &m_sourceModel;
 };
 
-QTimer *newSingleShotTimer(QObject *parent, int msInternal, const QString &objectName)
-{
-    auto *timer = new QTimer(parent);
-    timer->setObjectName(objectName);
-    timer->setSingleShot(true);
-    timer->setInterval(msInternal);
-    return timer;
-}
-
-} // anonymous namespace
-
-namespace CppEditor::Internal {
-
 static Key sortEditorDocumentOutlineKey()
 {
     return Key(Constants::CPPEDITOR_SETTINGSGROUP)
@@ -101,7 +85,7 @@ static void setSortedEditorDocumentOutline(bool sorted)
 CppEditorOutline::CppEditorOutline(CppEditorWidget *editorWidget)
     : QObject(editorWidget)
     , m_editorWidget(editorWidget)
-    , m_combo(new Utils::TreeViewComboBox)
+    , m_combo(new TreeViewComboBox)
 {
     m_model = &editorWidget->cppEditorDocument()->outlineModel();
     m_proxyModel = new OutlineProxyModel(*m_model, this);
@@ -134,9 +118,13 @@ CppEditorOutline::CppEditorOutline(CppEditorWidget *editorWidget)
     connect(m_combo, &QComboBox::currentIndexChanged, this, &CppEditorOutline::updateToolTip);
 
     connect(m_model, &OutlineModel::modelReset, this, &CppEditorOutline::updateNow);
+
     // Set up timers
-    m_updateIndexTimer = newSingleShotTimer(this, UpdateOutlineIntervalInMs,
-                                            QLatin1String("CppEditorOutline::m_updateIndexTimer"));
+    m_updateIndexTimer = new QTimer(this);
+    m_updateIndexTimer->setObjectName("CppEditorOutline::m_updateIndexTimer");
+    m_updateIndexTimer->setSingleShot(true);
+    m_updateIndexTimer->setInterval(UpdateOutlineIntervalInMs);
+
     connect(m_updateIndexTimer, &QTimer::timeout, this, &CppEditorOutline::updateIndexNow);
 }
 
@@ -191,16 +179,14 @@ void CppEditorOutline::gotoSymbolInEditor()
     const QModelIndex modelIndex = m_combo->view()->currentIndex();
     const QModelIndex sourceIndex = m_proxyModel->mapToSource(modelIndex);
 
-    const Utils::Link link = m_model->linkFromIndex(sourceIndex);
+    const Link link = m_model->linkFromIndex(sourceIndex);
     if (!link.hasValidTarget())
         return;
 
-    Core::EditorManager::cutForwardNavigationHistory();
-    Core::EditorManager::addCurrentPositionToNavigationHistory();
+    EditorManager::cutForwardNavigationHistory();
+    EditorManager::addCurrentPositionToNavigationHistory();
     m_editorWidget->gotoLine(link.targetLine, link.targetColumn, true, true);
     emit m_editorWidget->activateEditor();
 }
 
 } // namespace CppEditor::Internal
-
-#include <cppeditoroutline.moc>
diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp
index c9185e372c1..bd8d7331711 100644
--- a/src/plugins/cppeditor/cppeditorplugin.cpp
+++ b/src/plugins/cppeditor/cppeditorplugin.cpp
@@ -1,10 +1,10 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
+#include "clangdsettings.h"
 #include "cppautocompleter.h"
 #include "cppcodemodelinspectordialog.h"
 #include "cppcodemodelsettings.h"
-#include "cppcodemodelsettingspage.h"
 #include "cppcodestylesettingspage.h"
 #include "cppeditorconstants.h"
 #include "cppeditordocument.h"
@@ -16,12 +16,12 @@
 #include "cppmodelmanager.h"
 #include "cppoutline.h"
 #include "cppprojectupdater.h"
-#include "cppquickfixes.h"
-#include "cppquickfixprojectsettingswidget.h"
-#include "cppquickfixsettingspage.h"
 #include "cpptoolsreuse.h"
 #include "cpptoolssettings.h"
 #include "cpptypehierarchy.h"
+#include "quickfixes/cppquickfix.h"
+#include "quickfixes/cppquickfixprojectsettingswidget.h"
+#include "quickfixes/cppquickfixsettingspage.h"
 #include "resourcepreviewhoverhandler.h"
 
 #ifdef WITH_TESTS
@@ -31,12 +31,10 @@
 #include "cppdoxygen_test.h"
 #include "cpphighlighter.h"
 #include "cppincludehierarchy_test.h"
-#include "cppinsertvirtualmethods.h"
 #include "cpplocalsymbols_test.h"
 #include "cpplocatorfilter_test.h"
 #include "cppmodelmanager_test.h"
 #include "cpppointerdeclarationformatter_test.h"
-#include "cppquickfix_test.h"
 #include "cpprenaming_test.h"
 #include "cppsourceprocessor_test.h"
 #include "cppuseselections_test.h"
@@ -70,11 +68,11 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/projecttree.h>
+#include <projectexplorer/rawprojectpart.h>
 
 #include <texteditor/colorpreviewhoverhandler.h>
 #include <texteditor/snippets/snippetprovider.h>
 #include <texteditor/texteditor.h>
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorconstants.h>
 
 #include <utils/algorithm.h>
@@ -138,13 +136,14 @@ public:
         setCodeFoldingSupported(true);
         setParenthesesMatchingEnabled(true);
 
-        setEditorActionHandlers(TextEditorActionHandler::Format
-                                | TextEditorActionHandler::UnCommentSelection
-                                | TextEditorActionHandler::UnCollapseAll
-                                | TextEditorActionHandler::FollowSymbolUnderCursor
-                                | TextEditorActionHandler::FollowTypeUnderCursor
-                                | TextEditorActionHandler::RenameSymbol
-                                | TextEditorActionHandler::FindUsage);
+        setOptionalActionMask(OptionalActions::Format
+                                | OptionalActions::UnCommentSelection
+                                | OptionalActions::UnCollapseAll
+                                | OptionalActions::FollowSymbolUnderCursor
+                                | OptionalActions::FollowTypeUnderCursor
+                                | OptionalActions::RenameSymbol
+                                | OptionalActions::TypeHierarchy
+                                | OptionalActions::FindUsage);
     }
 };
 
@@ -176,7 +175,7 @@ class CppEditorPlugin final : public ExtensionSystem::IPlugin
 public:
     ~CppEditorPlugin() final
     {
-        destroyCppQuickFixes();
+        destroyCppQuickFixFactories();
         delete d;
         d = nullptr;
     }
@@ -201,7 +200,10 @@ void CppEditorPlugin::initialize()
     d = new CppEditorPluginPrivate;
 
     setupCppQuickFixSettings();
-    setupCppCodeModelSettings();
+    setupCppCodeModelSettingsPage();
+    provideCppSettingsRetriever([](const Project *p) {
+        return CppCodeModelSettings::settingsForProject(p).toMap();
+    });
     setupCppOutline();
     setupCppCodeStyleSettings();
     setupCppProjectUpdater();
@@ -210,7 +212,7 @@ void CppEditorPlugin::initialize()
 
     setupMenus();
     registerVariables();
-    createCppQuickFixes();
+    createCppQuickFixFactories();
     registerTests();
 
     SnippetProvider::registerGroup(Constants::CPP_SNIPPETS_GROUP_ID, Tr::tr("C++", "SnippetProvider"),
@@ -225,7 +227,8 @@ void CppEditorPlugin::initialize()
 void CppEditorPlugin::extensionsInitialized()
 {
     setupCppQuickFixProjectPanel();
-    setupCppFileSettings();
+    setupCppFileSettings(*this);
+    setupCppCodeModelProjectSettingsPanel();
 
     if (CppModelManager::isClangCodeModelActive()) {
         setupClangdProjectSettingsPanel();
@@ -348,9 +351,9 @@ void CppEditorPlugin::addPerSymbolActions()
     findRefsCategorized.addToContainers(menus, Constants::G_SYMBOL);
     findRefsCategorized.addOnTriggered(this, [] {
         if (const auto w = currentCppEditorWidget()) {
-            codeModelSettings()->setCategorizeFindReferences(true);
+            CppCodeModelSettings::setCategorizeFindReferences(true);
             w->findUsages();
-            codeModelSettings()->setCategorizeFindReferences(false);
+            CppCodeModelSettings::setCategorizeFindReferences(false);
         }
     });
 
@@ -358,6 +361,7 @@ void CppEditorPlugin::addPerSymbolActions()
 
     setupCppTypeHierarchy();
 
+    addSymbolActionToMenus(TextEditor::Constants::OPEN_TYPE_HIERARCHY);
     addSymbolActionToMenus(TextEditor::Constants::OPEN_CALL_HIERARCHY);
 
     // Refactoring sub-menu
@@ -508,8 +512,6 @@ void CppEditorPlugin::registerTests()
     addTest<Tests::FileAndTokenActionsTest>();
     addTest<Tests::FollowSymbolTest>();
     addTest<Tests::IncludeHierarchyTest>();
-    addTest<Tests::InsertVirtualMethodsTest>();
-    addTest<Tests::QuickfixTest>();
     addTest<Tests::GlobalRenamingTest>();
     addTest<Tests::SelectionsTest>();
 #endif
diff --git a/src/plugins/cppeditor/cppeditorwidget.cpp b/src/plugins/cppeditor/cppeditorwidget.cpp
index 5882c8d1647..609b35051c4 100644
--- a/src/plugins/cppeditor/cppeditorwidget.cpp
+++ b/src/plugins/cppeditor/cppeditorwidget.cpp
@@ -14,11 +14,11 @@
 #include "cpplocalrenaming.h"
 #include "cppmodelmanager.h"
 #include "cpppreprocessordialog.h"
-#include "cppquickfixassistant.h"
 #include "cppselectionchanger.h"
 #include "cppsemanticinfo.h"
 #include "cppuseselectionsupdater.h"
 #include "doxygengenerator.h"
+#include "quickfixes/cppquickfixassistant.h"
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
@@ -623,6 +623,7 @@ void CppEditorWidget::renameUsages(const QString &replacement, QTextCursor curso
         const CursorInEditor cursorInEditor{cursor, textDocument()->filePath(), this, textDocument()};
         CppModelManager::globalRename(cursorInEditor, replacement);
     };
+    NonInteractiveFollowSymbolMarker niMarker;
     CppModelManager::followSymbol(CursorInEditor{cursor,
                                                  textDocument()->filePath(),
                                                  this,
diff --git a/src/plugins/cppeditor/cppfilesettingspage.cpp b/src/plugins/cppeditor/cppfilesettingspage.cpp
index 3579e0b5f21..b9c64965a68 100644
--- a/src/plugins/cppeditor/cppfilesettingspage.cpp
+++ b/src/plugins/cppeditor/cppfilesettingspage.cpp
@@ -6,15 +6,19 @@
 #include "cppeditortr.h"
 #include "cppheadersource.h"
 
+#include <extensionsystem/iplugin.h>
+
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>
 
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectpanelfactory.h>
 
+#include <utils/aspects.h>
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/layoutbuilder.h>
+#include <utils/macroexpander.h>
 #include <utils/mimeconstants.h>
 #include <utils/mimeutils.h>
 #include <utils/pathchooser.h>
@@ -29,10 +33,30 @@
 #include <QTextStream>
 #include <QVBoxLayout>
 
+#ifdef WITH_TESTS
+#include <QtTest>
+#endif
+
 using namespace ProjectExplorer;
 using namespace Utils;
 
 namespace CppEditor::Internal {
+namespace {
+class HeaderGuardExpander : public MacroExpander
+{
+public:
+    HeaderGuardExpander(const FilePath &filePath) : m_filePath(filePath)
+    {
+        setDisplayName(Tr::tr("Header File Variables"));
+        registerFileVariables("Header", Tr::tr("Header file"), [this] {
+            return m_filePath;
+        });
+    }
+
+private:
+    const FilePath m_filePath;
+};
+} // namespace
 
 const char projectSettingsKeyC[] = "CppEditorFileNames";
 const char useGlobalKeyC[] = "UseGlobal";
@@ -44,6 +68,7 @@ const char headerSearchPathsKeyC[] = "HeaderSearchPaths";
 const char sourceSearchPathsKeyC[] = "SourceSearchPaths";
 const char headerPragmaOnceC[] = "HeaderPragmaOnce";
 const char licenseTemplatePathKeyC[] = "LicenseTemplate";
+const char headerGuardTemplateKeyC[] = "HeaderGuardTemplate";
 
 const char *licenseTemplateTemplate = QT_TRANSLATE_NOOP("QtC::CppEditor",
 "/**************************************************************************\n"
@@ -67,6 +92,7 @@ void CppFileSettings::toSettings(QtcSettings *s) const
     s->setValueWithDefault(headerPragmaOnceC, headerPragmaOnce, def.headerPragmaOnce);
     s->setValueWithDefault(licenseTemplatePathKeyC, licenseTemplatePath.toSettings(),
                            def.licenseTemplatePath.toSettings());
+    s->setValueWithDefault(headerGuardTemplateKeyC, headerGuardTemplate, def.headerGuardTemplate);
     s->endGroup();
 }
 
@@ -84,6 +110,7 @@ void CppFileSettings::fromSettings(QtcSettings *s)
     headerPragmaOnce = s->value(headerPragmaOnceC, def.headerPragmaOnce).toBool();
     licenseTemplatePath = FilePath::fromSettings(s->value(licenseTemplatePathKeyC,
                                                           def.licenseTemplatePath.toSettings()));
+    headerGuardTemplate = s->value(headerGuardTemplateKeyC, def.headerGuardTemplate).toString();
     s->endGroup();
 }
 
@@ -124,6 +151,7 @@ bool CppFileSettings::equals(const CppFileSettings &rhs) const
            && sourceSuffix == rhs.sourceSuffix
            && headerSearchPaths == rhs.headerSearchPaths
            && sourceSearchPaths == rhs.sourceSearchPaths
+           && headerGuardTemplate == rhs.headerGuardTemplate
            && licenseTemplatePath == rhs.licenseTemplatePath;
 }
 
@@ -237,6 +265,11 @@ QString CppFileSettings::licenseTemplate() const
     return license;
 }
 
+QString CppFileSettings::headerGuard(const Utils::FilePath &headerFilePath) const
+{
+    return HeaderGuardExpander(headerFilePath).expand(headerGuardTemplate);
+}
+
 // ------------------ CppFileSettingsWidget
 
 class CppFileSettingsWidget final : public Core::IOptionsPageWidget
@@ -269,6 +302,8 @@ private:
     QLineEdit *m_sourcePrefixesEdit = nullptr;
     QCheckBox *m_lowerCaseFileNamesCheckBox = nullptr;
     PathChooser *m_licenseTemplatePathChooser = nullptr;
+    StringAspect m_headerGuardAspect;
+    HeaderGuardExpander m_headerGuardExpander{{}};
 };
 
 CppFileSettingsWidget::CppFileSettingsWidget(CppFileSettings *settings)
@@ -276,7 +311,7 @@ CppFileSettingsWidget::CppFileSettingsWidget(CppFileSettings *settings)
     , m_headerSuffixComboBox(new QComboBox)
     , m_headerSearchPathsEdit(new QLineEdit)
     , m_headerPrefixesEdit(new QLineEdit)
-    , m_headerPragmaOnceCheckBox(new QCheckBox(Tr::tr("Use \"#pragma once\" instead of \"#ifndef\" guards")))
+    , m_headerPragmaOnceCheckBox(new QCheckBox(Tr::tr("Use \"#pragma once\" instead")))
     , m_sourceSuffixComboBox(new QComboBox)
     , m_sourceSearchPathsEdit(new QLineEdit)
     , m_sourcePrefixesEdit(new QLineEdit)
@@ -301,6 +336,8 @@ CppFileSettingsWidget::CppFileSettingsWidget(CppFileSettings *settings)
     m_sourcePrefixesEdit->setToolTip(Tr::tr("Comma-separated list of source prefixes.\n"
         "\n"
         "These prefixes are used in addition to current file name on Switch Header/Source."));
+    m_headerGuardAspect.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
+    m_headerGuardAspect.setMacroExpander(&m_headerGuardExpander);
 
     using namespace Layouting;
 
@@ -311,8 +348,8 @@ CppFileSettingsWidget::CppFileSettingsWidget(CppFileSettings *settings)
                 Tr::tr("&Suffix:"), m_headerSuffixComboBox, st, br,
                 Tr::tr("S&earch paths:"), m_headerSearchPathsEdit, br,
                 Tr::tr("&Prefixes:"), m_headerPrefixesEdit, br,
-                Tr::tr("Include guards"), m_headerPragmaOnceCheckBox
-            }
+                Tr::tr("Include guard template:"), m_headerPragmaOnceCheckBox, m_headerGuardAspect
+            },
         },
         Group {
             title(Tr::tr("Sources")),
@@ -361,12 +398,21 @@ CppFileSettingsWidget::CppFileSettingsWidget(CppFileSettings *settings)
             this, &CppFileSettingsWidget::userChange);
     connect(m_sourcePrefixesEdit, &QLineEdit::textEdited,
             this, &CppFileSettingsWidget::userChange);
-    connect(m_headerPragmaOnceCheckBox, &QCheckBox::stateChanged,
-            this, &CppFileSettingsWidget::userChange);
     connect(m_lowerCaseFileNamesCheckBox, &QCheckBox::stateChanged,
             this, &CppFileSettingsWidget::userChange);
     connect(m_licenseTemplatePathChooser, &PathChooser::textChanged,
             this, &CppFileSettingsWidget::userChange);
+    const auto updateHeaderGuardAspectState = [this] {
+        m_headerGuardAspect.setEnabled(!m_headerPragmaOnceCheckBox->isChecked());
+    };
+    connect(m_headerPragmaOnceCheckBox, &QCheckBox::stateChanged,
+            this, [this, updateHeaderGuardAspectState] {
+        updateHeaderGuardAspectState();
+        emit userChange();
+    });
+    connect(&m_headerGuardAspect, &StringAspect::changed,
+            this, &CppFileSettingsWidget::userChange);
+    updateHeaderGuardAspectState();
 }
 
 FilePath CppFileSettingsWidget::licenseTemplatePath() const
@@ -417,6 +463,7 @@ void CppFileSettingsWidget::setSettings(const CppFileSettings &s)
     m_headerSearchPathsEdit->setText(s.headerSearchPaths.join(comma));
     m_sourceSearchPathsEdit->setText(s.sourceSearchPaths.join(comma));
     setLicenseTemplatePath(s.licenseTemplatePath);
+    m_headerGuardAspect.setValue(s.headerGuardTemplate);
 }
 
 CppFileSettings CppFileSettingsWidget::currentSettings() const
@@ -431,6 +478,7 @@ CppFileSettings CppFileSettingsWidget::currentSettings() const
     rc.headerSearchPaths = trimmedPaths(m_headerSearchPathsEdit->text());
     rc.sourceSearchPaths = trimmedPaths(m_sourceSearchPathsEdit->text());
     rc.licenseTemplatePath = licenseTemplatePath();
+    rc.headerGuardTemplate = m_headerGuardAspect.value();
     return rc;
 }
 
@@ -536,6 +584,8 @@ void CppFileSettingsForProject::loadSettings()
                                                  m_customSettings.lowerCaseFiles).toBool();
     m_customSettings.headerPragmaOnce = data.value(headerPragmaOnceC,
                                                    m_customSettings.headerPragmaOnce).toBool();
+    m_customSettings.headerGuardTemplate
+        = data.value(headerGuardTemplateKeyC, m_customSettings.headerGuardTemplate).toString();
     m_customSettings.licenseTemplatePath
         = FilePath::fromSettings(data.value(licenseTemplatePathKeyC,
                                             m_customSettings.licenseTemplatePath.toSettings()));
@@ -560,6 +610,7 @@ void CppFileSettingsForProject::saveSettings()
     data.insert(sourceSearchPathsKeyC, m_customSettings.sourceSearchPaths);
     data.insert(Constants::LOWERCASE_CPPFILES_KEY, m_customSettings.lowerCaseFiles);
     data.insert(headerPragmaOnceC, m_customSettings.headerPragmaOnce);
+    data.insert(headerGuardTemplateKeyC, m_customSettings.headerGuardTemplate);
     data.insert(licenseTemplatePathKeyC, m_customSettings.licenseTemplatePath.toSettings());
     m_project->setNamedSettings(projectSettingsKeyC, data);
 }
@@ -631,16 +682,6 @@ public:
     }
 };
 
-void setupCppFileSettings()
-{
-    static CppFileSettingsProjectPanelFactory theCppFileSettingsProjectPanelFactory;
-
-    static CppFileSettingsPage theCppFileSettingsPage;
-
-    globalCppFileSettings().fromSettings(Core::ICore::settings());
-    globalCppFileSettings().addMimeInitializer();
-}
-
 CppFileSettings &globalCppFileSettings()
 {
     // This is the global instance. There could be more.
@@ -653,6 +694,61 @@ CppFileSettings cppFileSettingsForProject(ProjectExplorer::Project *project)
     return CppFileSettingsForProject(project).settings();
 }
 
+#ifdef WITH_TESTS
+namespace {
+class CppFileSettingsTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testHeaderGuard_data()
+    {
+        QTest::addColumn<QString>("guardTemplate");
+        QTest::addColumn<QString>("headerFile");
+        QTest::addColumn<QString>("expectedGuard");
+
+        QTest::newRow("default template, .h")
+            << QString() << QString("/tmp/header.h") << QString("HEADER_H");
+        QTest::newRow("default template, .hpp")
+            << QString() << QString("/tmp/header.hpp") << QString("HEADER_HPP");
+        QTest::newRow("default template, two extensions")
+            << QString() << QString("/tmp/header.in.h") << QString("HEADER_IN_H");
+        QTest::newRow("non-default template")
+            << QString("%{JS: '%{Header:FilePath}'.toUpperCase().replace(/[.]/, '_').replace(/[/]/g, '_')}")
+            << QString("/tmp/header.h") << QString("_TMP_HEADER_H");
+    }
+
+    void testHeaderGuard()
+    {
+        QFETCH(QString, guardTemplate);
+        QFETCH(QString, headerFile);
+        QFETCH(QString, expectedGuard);
+
+        CppFileSettings settings;
+        if (!guardTemplate.isEmpty())
+            settings.headerGuardTemplate = guardTemplate;
+        QCOMPARE(settings.headerGuard(FilePath::fromUserInput(headerFile)), expectedGuard);
+    }
+};
+} // namespace
+#endif // WITH_TESTS
+
+void setupCppFileSettings(ExtensionSystem::IPlugin &plugin)
+{
+    static CppFileSettingsProjectPanelFactory theCppFileSettingsProjectPanelFactory;
+
+    static CppFileSettingsPage theCppFileSettingsPage;
+
+    globalCppFileSettings().fromSettings(Core::ICore::settings());
+    globalCppFileSettings().addMimeInitializer();
+
+#ifdef WITH_TESTS
+    plugin.addTestCreator([] { return new CppFileSettingsTest; });
+#else
+    Q_UNUSED(plugin)
+#endif
+}
+
 } // namespace CppEditor::Internal
 
 #include <cppfilesettingspage.moc>
diff --git a/src/plugins/cppeditor/cppfilesettingspage.h b/src/plugins/cppeditor/cppfilesettingspage.h
index 5915b5383cf..044ac6fb450 100644
--- a/src/plugins/cppeditor/cppfilesettingspage.h
+++ b/src/plugins/cppeditor/cppfilesettingspage.h
@@ -9,6 +9,7 @@
 
 #include <QDir>
 
+namespace ExtensionSystem { class IPlugin; }
 namespace ProjectExplorer { class Project; }
 
 namespace CppEditor::Internal {
@@ -28,6 +29,7 @@ public:
                                      QDir::toNativeSeparators("../Src"),
                                      ".."};
     Utils::FilePath licenseTemplatePath;
+    QString headerGuardTemplate = "%{JS: '%{Header:FileName}'.toUpperCase().replace(/[.]/g, '_')}";
     bool headerPragmaOnce = false;
     bool lowerCaseFiles = Constants::LOWERCASE_CPPFILES_DEFAULT;
 
@@ -39,6 +41,9 @@ public:
     // Convenience to return a license template completely formatted.
     QString licenseTemplate() const;
 
+    // Expanded headerGuardTemplate.
+    QString headerGuard(const Utils::FilePath &headerFilePath) const;
+
     bool equals(const CppFileSettings &rhs) const;
     bool operator==(const CppFileSettings &s) const { return equals(s); }
     bool operator!=(const CppFileSettings &s) const { return !equals(s); }
@@ -48,6 +53,6 @@ CppFileSettings &globalCppFileSettings();
 
 CppFileSettings cppFileSettingsForProject(ProjectExplorer::Project *project);
 
-void setupCppFileSettings();
+void setupCppFileSettings(ExtensionSystem::IPlugin &plugin);
 
 } // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/cppfindreferences.cpp b/src/plugins/cppeditor/cppfindreferences.cpp
index 25b3e110d53..35c9400e9ad 100644
--- a/src/plugins/cppeditor/cppfindreferences.cpp
+++ b/src/plugins/cppeditor/cppfindreferences.cpp
@@ -388,7 +388,7 @@ void CppFindReferences::findUsages(CPlusPlus::Symbol *symbol,
     search->setTextToReplace(replacement);
     if (callback)
         search->makeNonInteractive(callback);
-    if (codeModelSettings()->categorizeFindReferences())
+    if (CppCodeModelSettings::categorizeFindReferences())
         search->setFilter(new CppSearchResultFilter);
     setupSearch(search);
     search->setSearchAgainSupported(true);
@@ -397,7 +397,7 @@ void CppFindReferences::findUsages(CPlusPlus::Symbol *symbol,
     CppFindReferencesParameters parameters;
     parameters.symbolId = fullIdForSymbol(symbol);
     parameters.symbolFilePath = symbol->filePath();
-    parameters.categorize = codeModelSettings()->categorizeFindReferences();
+    parameters.categorize = CppCodeModelSettings::categorizeFindReferences();
     parameters.preferLowerCaseFileNames = preferLowerCaseFileNames(
         ProjectManager::projectForFile(symbol->filePath()));
 
@@ -408,7 +408,7 @@ void CppFindReferences::findUsages(CPlusPlus::Symbol *symbol,
     }
 
     search->setUserData(QVariant::fromValue(parameters));
-    findAll_helper(search, symbol, context, codeModelSettings()->categorizeFindReferences());
+    findAll_helper(search, symbol, context, CppCodeModelSettings::categorizeFindReferences());
 }
 
 void CppFindReferences::renameUsages(CPlusPlus::Symbol *symbol,
diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
index e489045f351..e6722206df2 100644
--- a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
+++ b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
@@ -8,8 +8,8 @@
 #include "cppeditortr.h"
 #include "cppeditorwidget.h"
 #include "cpplocalsymbols.h"
-#include "cppquickfixassistant.h"
 #include "cpptoolsreuse.h"
+#include "quickfixes/cppquickfixassistant.h"
 #include "symbolfinder.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
@@ -21,8 +21,6 @@
 #include <cplusplus/Overview.h>
 #include <cplusplus/TypeOfExpression.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <texteditor/refactoroverlay.h>
 #include <texteditor/texteditorconstants.h>
 
@@ -239,7 +237,7 @@ void FunctionDeclDefLinkFinder::startFindLinkAt(
     m_watcher.reset(new QFutureWatcher<std::shared_ptr<FunctionDeclDefLink> >());
     connect(m_watcher.get(), &QFutureWatcherBase::finished, this, &FunctionDeclDefLinkFinder::onFutureDone);
     m_watcher->setFuture(Utils::asyncRun(findLinkHelper, result, refactoringChanges));
-    ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(m_watcher->future());
+    Utils::futureSynchronizer()->addFuture(m_watcher->future());
 }
 
 bool FunctionDeclDefLink::isValid() const
@@ -269,13 +267,11 @@ void FunctionDeclDefLink::apply(CppEditorWidget *editor, bool jumpToMatch)
     const int targetStart = newTargetFile->position(targetLine, targetColumn);
     const int targetEnd = targetStart + targetInitial.size();
     if (targetInitial == newTargetFile->textOf(targetStart, targetEnd)) {
-        const ChangeSet changeset = changes(snapshot, targetStart);
-        newTargetFile->setChangeSet(changeset);
         if (jumpToMatch) {
             const int jumpTarget = newTargetFile->position(targetFunction->line(), targetFunction->column());
             newTargetFile->setOpenEditor(true, jumpTarget);
         }
-        newTargetFile->apply();
+        newTargetFile->apply(changes(snapshot, targetStart));
     } else {
         ToolTip::show(editor->toolTipPosition(linkSelection),
                       Tr::tr("Target file was changed, could not apply changes"));
diff --git a/src/plugins/cppeditor/cpphighlighter.cpp b/src/plugins/cppeditor/cpphighlighter.cpp
index becebd11886..ff8ebc53d3b 100644
--- a/src/plugins/cppeditor/cpphighlighter.cpp
+++ b/src/plugins/cppeditor/cpphighlighter.cpp
@@ -81,11 +81,14 @@ void CppHighlighter::highlightBlock(const QString &text)
         return;
     }
 
-    const int firstNonSpace = tokens.first().utf16charsBegin();
-
     // Keep "semantic parentheses".
-    Parentheses parentheses = Utils::filtered(TextDocumentLayout::parentheses(currentBlock()),
-            [](const Parenthesis &p) { return p.source.isValid(); });
+    Parentheses parentheses;
+    if (TextBlockUserData *userData = TextDocumentLayout::textUserData(currentBlock())) {
+        parentheses = Utils::filtered(userData->parentheses(), [](const Parenthesis &p) {
+            return p.source.isValid();
+        });
+    }
+
     const auto insertParen = [&parentheses](const Parenthesis &p) { insertSorted(parentheses, p); };
     parentheses.reserve(5);
 
@@ -116,9 +119,16 @@ void CppHighlighter::highlightBlock(const QString &text)
             if (tk.is(T_LBRACE)) {
                 ++braceDepth;
 
-                // if a folding block opens at the beginning of a line, treat the entire line
-                // as if it were inside the folding block
-                if (tk.utf16charsBegin() == firstNonSpace) {
+                // if a folding block opens at the beginning of a line, treat the line before
+                // as if it were inside the folding block except if it is a comment or the line does
+                // end with ;
+                const int firstNonSpace = tokens.first().utf16charsBegin();
+                const QString prevBlockText = currentBlock().previous().isValid()
+                                                  ? currentBlock().previous().text().trimmed()
+                                                  : QString();
+                if (!prevBlockText.isEmpty() && !prevBlockText.startsWith("//")
+                    && !prevBlockText.endsWith("*/") && !prevBlockText.endsWith(";")
+                    && tk.utf16charsBegin() == firstNonSpace) {
                     ++foldingIndent;
                     TextDocumentLayout::userData(currentBlock())->setFoldingStartIncluded(true);
                 }
@@ -235,7 +245,8 @@ void CppHighlighter::highlightBlock(const QString &text)
     // if the block is ifdefed out, we only store the parentheses, but
 
     // do not adjust the brace depth.
-    if (TextDocumentLayout::ifdefedOut(currentBlock())) {
+    if (TextBlockUserData *userData = TextDocumentLayout::textUserData(currentBlock());
+            userData && userData->ifdefedOut()) {
         braceDepth = initialBraceDepth;
         foldingIndent = initialBraceDepth;
     }
@@ -647,6 +658,32 @@ void CppHighlighterTest::testParentheses()
     QCOMPARE(TextDocumentLayout::parentheses(block).count(), expectedParenCount);
 }
 
+void CppHighlighterTest::testFoldingIndent_data()
+{
+    QTest::addColumn<int>("line");
+    QTest::addColumn<int>("expectedFoldingIndent");
+    QTest::addColumn<int>("expectedFoldingIndentNextLine");
+
+    QTest::newRow("braces after one line comment") << 52 << 0 << 1;
+    QTest::newRow("braces after multiline comment") << 59 << 0 << 1;
+    QTest::newRow("braces after completed line") << 67 << 1 << 2;
+}
+
+void CppHighlighterTest::testFoldingIndent()
+{
+    QFETCH(int, line);
+    QFETCH(int, expectedFoldingIndent);
+    QFETCH(int, expectedFoldingIndentNextLine);
+
+    QTextBlock block = m_doc.findBlockByNumber(line - 1);
+    QVERIFY(block.isValid());
+    QCOMPARE(TextDocumentLayout::foldingIndent(block), expectedFoldingIndent);
+
+    QTextBlock nextBlock = m_doc.findBlockByNumber(line);
+    QVERIFY(nextBlock.isValid());
+    QCOMPARE(TextDocumentLayout::foldingIndent(nextBlock), expectedFoldingIndentNextLine);
+}
+
 } // namespace Internal
 #endif // WITH_TESTS
 
diff --git a/src/plugins/cppeditor/cpphighlighter.h b/src/plugins/cppeditor/cpphighlighter.h
index 5a6af63adaf..70fe8525c2c 100644
--- a/src/plugins/cppeditor/cpphighlighter.h
+++ b/src/plugins/cppeditor/cpphighlighter.h
@@ -54,6 +54,8 @@ private slots:
     void test();
     void testParentheses_data();
     void testParentheses();
+    void testFoldingIndent_data();
+    void testFoldingIndent();
 
 private:
     QTextDocument m_doc;
diff --git a/src/plugins/cppeditor/cppindexingsupport.cpp b/src/plugins/cppeditor/cppindexingsupport.cpp
index 3a418a5b782..73e3fafff32 100644
--- a/src/plugins/cppeditor/cppindexingsupport.cpp
+++ b/src/plugins/cppeditor/cppindexingsupport.cpp
@@ -5,6 +5,7 @@
 
 #include "builtineditordocumentparser.h"
 #include "cppchecksymbols.h"
+#include "cppcodemodelsettings.h"
 #include "cppeditorconstants.h"
 #include "cppeditortr.h"
 #include "cppsourceprocessor.h"
@@ -44,7 +45,6 @@ public:
     ProjectExplorer::HeaderPaths headerPaths;
     WorkingCopy workingCopy;
     QSet<QString> sourceFiles;
-    int indexerFileSizeLimitInMb = -1;
 };
 
 class WriteTaskFileForDiagnostics
@@ -161,7 +161,6 @@ static void indexFindErrors(QPromise<void> &promise, const ParseParams params)
 static void index(QPromise<void> &promise, const ParseParams params)
 {
     QScopedPointer<Internal::CppSourceProcessor> sourceProcessor(CppModelManager::createSourceProcessor());
-    sourceProcessor->setFileSizeLimitInMb(params.indexerFileSizeLimitInMb);
     sourceProcessor->setHeaderPaths(params.headerPaths);
     sourceProcessor->setWorkingCopy(params.workingCopy);
 
@@ -220,21 +219,22 @@ static void index(QPromise<void> &promise, const ParseParams params)
     qCDebug(indexerLog) << "Indexing finished.";
 }
 
-static void parse(QPromise<void> &promise, const ParseParams &params)
+static void parse(
+    QPromise<void> &promise,
+    const std::function<QSet<QString>()> &sourceFiles,
+    const ProjectExplorer::HeaderPaths &headerPaths,
+    const WorkingCopy &workingCopy)
 {
-    const QSet<QString> &files = params.sourceFiles;
-    if (files.isEmpty())
-        return;
-
-    promise.setProgressRange(0, files.size());
+    ParseParams params{headerPaths, workingCopy, sourceFiles()};
+    promise.setProgressRange(0, params.sourceFiles.size());
 
     if (CppIndexingSupport::isFindErrorsIndexingActive())
         indexFindErrors(promise, params);
     else
         index(promise, params);
 
-    promise.setProgressValue(files.size());
-    CppModelManager::finishedRefreshingSourceFiles(files);
+    promise.setProgressValue(params.sourceFiles.size());
+    CppModelManager::finishedRefreshingSourceFiles(params.sourceFiles);
 }
 
 } // anonymous namespace
@@ -301,19 +301,19 @@ bool CppIndexingSupport::isFindErrorsIndexingActive()
     return Utils::qtcEnvironmentVariable("QTC_FIND_ERRORS_INDEXING") == "1";
 }
 
-QFuture<void> CppIndexingSupport::refreshSourceFiles(const QSet<QString> &sourceFiles,
-                                                     CppModelManager::ProgressNotificationMode mode)
+QFuture<void> CppIndexingSupport::refreshSourceFiles(
+    const std::function<QSet<QString>()> &sourceFiles,
+    CppModelManager::ProgressNotificationMode mode)
 {
-    ParseParams params;
-    params.indexerFileSizeLimitInMb = indexerFileSizeLimitInMb();
-    params.headerPaths = CppModelManager::headerPaths();
-    params.workingCopy = CppModelManager::workingCopy();
-    params.sourceFiles = sourceFiles;
-
-    QFuture<void> result = Utils::asyncRun(CppModelManager::sharedThreadPool(), parse, params);
+    QFuture<void> result = Utils::asyncRun(
+        CppModelManager::sharedThreadPool(),
+        parse,
+        sourceFiles,
+        CppModelManager::headerPaths(),
+        CppModelManager::workingCopy());
     m_synchronizer.addFuture(result);
 
-    if (mode == CppModelManager::ForcedProgressNotification || sourceFiles.count() > 1) {
+    if (mode == CppModelManager::ForcedProgressNotification) {
         Core::ProgressManager::addTask(result, Tr::tr("Parsing C/C++ Files"),
                                        CppEditor::Constants::TASK_INDEX);
     }
diff --git a/src/plugins/cppeditor/cppindexingsupport.h b/src/plugins/cppeditor/cppindexingsupport.h
index c04eb8ba76f..f32498fa5e4 100644
--- a/src/plugins/cppeditor/cppindexingsupport.h
+++ b/src/plugins/cppeditor/cppindexingsupport.h
@@ -11,6 +11,8 @@
 
 #include <QFuture>
 
+#include <functional>
+
 namespace Utils { class SearchResultItem; }
 
 namespace CppEditor {
@@ -59,8 +61,10 @@ class CPPEDITOR_EXPORT CppIndexingSupport
 public:
     static bool isFindErrorsIndexingActive();
 
-    QFuture<void> refreshSourceFiles(const QSet<QString> &sourceFiles,
-                                     CppModelManager::ProgressNotificationMode mode);
+    QFuture<void> refreshSourceFiles(
+        const std::function<QSet<QString>()> &sourceFiles,
+        CppModelManager::ProgressNotificationMode mode);
+
 private:
     Utils::FutureSynchronizer m_synchronizer;
 };
diff --git a/src/plugins/cppeditor/cpplocatorfilter.cpp b/src/plugins/cppeditor/cpplocatorfilter.cpp
index 8fab8f4dcd7..7526d3dc9f9 100644
--- a/src/plugins/cppeditor/cpplocatorfilter.cpp
+++ b/src/plugins/cppeditor/cpplocatorfilter.cpp
@@ -11,8 +11,6 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/algorithm.h>
 #include <utils/async.h>
 #include <utils/fuzzymatcher.h>
@@ -108,7 +106,6 @@ LocatorMatcherTask locatorMatcher(IndexItem::ItemType type, const EntryFromIndex
     Storage<LocatorStorage> storage;
 
     const auto onSetup = [=](Async<void> &async) {
-        async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
         async.setConcurrentCallData(matchesFor, *storage, type, converter);
     };
     return {AsyncTask<void>(onSetup), storage};
@@ -306,7 +303,6 @@ LocatorMatcherTask currentDocumentMatcher()
     Storage<LocatorStorage> storage;
 
     const auto onSetup = [=](Async<void> &async) {
-        async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
         async.setConcurrentCallData(matchesForCurrentDocument, *storage, currentFileName());
     };
     return {AsyncTask<void>(onSetup), storage};
diff --git a/src/plugins/cppeditor/cppmodelmanager.cpp b/src/plugins/cppeditor/cppmodelmanager.cpp
index bd5100b1b54..801fb519e03 100644
--- a/src/plugins/cppeditor/cppmodelmanager.cpp
+++ b/src/plugins/cppeditor/cppmodelmanager.cpp
@@ -77,6 +77,7 @@
 #include <QDebug>
 #include <QDir>
 #include <QFutureWatcher>
+#include <QHash>
 #include <QMutexLocker>
 #include <QReadLocker>
 #include <QReadWriteLock>
@@ -89,6 +90,7 @@
 #include <QWriteLocker>
 
 #include <memory>
+#include <unordered_map>
 
 #if defined(QTCREATOR_WITH_DUMP_AST) && defined(Q_CC_GNU)
 #define WITH_AST_DUMP
@@ -407,7 +409,7 @@ void CppModelManager::showPreprocessedFile(bool inNextSplit)
         saveAndOpen(outFilePath, content.append(preprocessedDoc->utf8Source()), inNextSplit);
     };
 
-    if (codeModelSettings()->useBuiltinPreprocessor()) {
+    if (CppCodeModelSettings::settingsForFile(filePath).useBuiltinPreprocessor) {
         useBuiltinPreprocessor();
         return;
     }
@@ -551,7 +553,7 @@ using FindUnusedActionsEnabledSwitcherPtr = std::shared_ptr<FindUnusedActionsEna
 
 static void checkNextFunctionForUnused(
         const QPointer<SearchResult> &search,
-        const std::shared_ptr<QFutureInterface<bool>> &findRefsFuture,
+        const std::shared_ptr<QFutureInterface<void>> &findRefsFuture,
         const FindUnusedActionsEnabledSwitcherPtr &actionsSwitcher)
 {
     if (!search || findRefsFuture->isCanceled())
@@ -648,14 +650,14 @@ void CppModelManager::findUnusedFunctions(const FilePath &folder)
             Utils::transform<QVariantList>(links, [](const Link &l) { return QVariant::fromValue(l);
         }));
         search->setUserData(remainingAndActiveLinks);
-        const auto findRefsFuture = std::make_shared<QFutureInterface<bool>>();
+        const auto findRefsFuture = std::make_shared<QFutureInterface<void>>();
         FutureProgress *const progress = ProgressManager::addTask(findRefsFuture->future(),
                                                           Tr::tr("Finding Unused Functions"),
                                                           "CppEditor.FindUnusedFunctions");
         connect(progress,
                 &FutureProgress::canceled,
                 search,
-                [search, future = std::weak_ptr<QFutureInterface<bool>>(findRefsFuture)] {
+                [search, future = std::weak_ptr<QFutureInterface<void>>(findRefsFuture)] {
             search->finishSearch(true);
             if (const auto f = future.lock()) {
                 f->cancel();
@@ -1301,16 +1303,19 @@ CppLocatorData *CppModelManager::locatorData()
     return &d->m_locatorData;
 }
 
-static QSet<QString> filteredFilesRemoved(const QSet<QString> &files, int fileSizeLimitInMb,
-                                          bool ignoreFiles,
-                                          const QString& ignorePattern)
+static QSet<QString> filteredFilesRemoved(const QSet<QString> &files,
+                                          const CppCodeModelSettings &settings)
 {
-    if (fileSizeLimitInMb <= 0 && !ignoreFiles)
+    if (!settings.enableIndexing)
+        return {};
+
+    const int fileSizeLimitInMb = settings.effectiveIndexerFileSizeLimitInMb();
+    if (fileSizeLimitInMb <= 0 && !settings.ignoreFiles)
         return files;
 
     QSet<QString> result;
     QList<QRegularExpression> regexes;
-    const QStringList wildcards = ignorePattern.split('\n');
+    const QStringList wildcards = settings.ignorePattern.split('\n');
 
     for (const QString &wildcard : wildcards)
         regexes.append(QRegularExpression::fromWildcard(wildcard, Qt::CaseInsensitive,
@@ -1321,15 +1326,12 @@ static QSet<QString> filteredFilesRemoved(const QSet<QString> &files, int fileSi
         if (fileSizeLimitInMb > 0 && fileSizeExceedsLimit(filePath, fileSizeLimitInMb))
             continue;
         bool skip = false;
-        if (ignoreFiles) {
+        if (settings.ignoreFiles) {
             for (const QRegularExpression &rx: std::as_const(regexes)) {
                 QRegularExpressionMatch match = rx.match(filePath.absoluteFilePath().path());
                 if (match.hasMatch()) {
-                    const QString msg = Tr::tr("C++ Indexer: Skipping file \"%1\" "
-                                               "because its path matches the ignore pattern.")
-                                    .arg(filePath.displayName());
-                    QMetaObject::invokeMethod(MessageManager::instance(),
-                                              [msg] { MessageManager::writeSilently(msg); });
+                    MessageManager::writeSilently(Tr::tr("C++ Indexer: Skipping file \"%1\" "
+                        "because its path matches the ignore pattern.").arg(filePath.displayName()));
                     skip = true;
                     break;
                 }
@@ -1349,11 +1351,25 @@ QFuture<void> CppModelManager::updateSourceFiles(const QSet<FilePath> &sourceFil
     if (sourceFiles.isEmpty() || !d->m_indexerEnabled)
         return QFuture<void>();
 
-    const QSet<QString> filteredFiles = filteredFilesRemoved(transform(sourceFiles, &FilePath::toString),
-                                                             indexerFileSizeLimitInMb(),
-                                                             codeModelSettings()->ignoreFiles(),
-                                                             codeModelSettings()->ignorePattern());
+    std::unordered_map<Project *, QSet<QString>> sourcesPerProject;
+    for (const FilePath &fp : sourceFiles)
+        sourcesPerProject[ProjectManager::projectForFile(fp)] << fp.toString();
+    std::vector<std::pair<QSet<QString>, CppCodeModelSettings>> sourcesAndSettings;
+    for (const auto &it : sourcesPerProject) {
+        sourcesAndSettings
+            .emplace_back(it.second, CppCodeModelSettings::settingsForProject(it.first));
+    }
 
+    const auto filteredFiles = [sourcesAndSettings = std::move(sourcesAndSettings)] {
+        QSet<QString> result;
+        for (const auto &it : sourcesAndSettings)
+            result.unite(filteredFilesRemoved(it.first, it.second));
+        return result;
+    };
+
+    // "ReservedProgressNotification" should be shown if there is more than one source file.
+    if (sourceFiles.size() > 1)
+        mode = ForcedProgressNotification;
     return d->m_internalIndexingSupport->refreshSourceFiles(filteredFiles, mode);
 }
 
@@ -1378,14 +1394,20 @@ ProjectInfo::ConstPtr CppModelManager::projectInfo(Project *project)
 void CppModelManager::removeProjectInfoFilesAndIncludesFromSnapshot(const ProjectInfo &projectInfo)
 {
     QMutexLocker snapshotLocker(&d->m_snapshotMutex);
+    QStringList removedFiles;
     for (const ProjectPart::ConstPtr &projectPart : projectInfo.projectParts()) {
         for (const ProjectFile &cxxFile : std::as_const(projectPart->files)) {
             const QSet<FilePath> filePaths = d->m_snapshot.allIncludesForDocument(cxxFile.path);
-            for (const FilePath &filePath : filePaths)
+            for (const FilePath &filePath : filePaths) {
                 d->m_snapshot.remove(filePath);
+                removedFiles << filePath.toString();
+            }
             d->m_snapshot.remove(cxxFile.path);
+            removedFiles << cxxFile.path.toString();
         }
     }
+
+    emit m_instance->aboutToRemoveFiles(removedFiles);
 }
 
 const QList<CppEditorDocumentHandle *> CppModelManager::cppEditorDocuments()
@@ -1714,7 +1736,7 @@ bool CppModelManager::isCppEditor(IEditor *editor)
     return editor->context().contains(ProjectExplorer::Constants::CXX_LANGUAGE_ID);
 }
 
-bool CppModelManager::usesClangd(const TextEditor::TextDocument *document)
+std::optional<QVersionNumber> CppModelManager::usesClangd(const TextEditor::TextDocument *document)
 {
     return d->m_activeModelManagerSupport->usesClangd(document);
 }
@@ -1864,20 +1886,29 @@ QSet<QString> CppModelManager::internalTargets(const FilePath &filePath)
 //       the renamings yet, i.e. they still refer to the old file paths.
 void CppModelManager::renameIncludes(const QList<std::pair<FilePath, FilePath>> &oldAndNewPaths)
 {
+    using IncludingFile = std::pair<FilePath, FilePath>; // old and new path; might be identical
+    struct RewriteCandidate {
+        FilePath oldHeaderFilePath;
+        FilePath newHeaderFilePath;
+        QString oldHeaderFileName;
+        QString newHeaderFileName;
+        int includeLine;
+        bool isUiHeader;
+    };
+    QHash<IncludingFile, QList<RewriteCandidate>> rewriteCandidates;
+
+    const Snapshot theSnapshot = snapshot();
     for (const auto &[oldFilePath, newFilePath] : oldAndNewPaths) {
         if (oldFilePath.isEmpty() || newFilePath.isEmpty())
             continue;
 
-        // We just want to handle renamings so return when the file was actually moved.
-        if (oldFilePath.absolutePath() != newFilePath.absolutePath())
-            continue;
-
-        const TextEditor::PlainRefactoringFileFactory changes;
-
         QString oldFileName = oldFilePath.fileName();
         QString newFileName = newFilePath.fileName();
         const bool isUiFile = oldFilePath.suffix() == "ui" && newFilePath.suffix() == "ui";
+        const bool moved = oldFilePath.absolutePath() != newFilePath.absolutePath();
         if (isUiFile) {
+            if (moved)
+                return; // This is out of scope.
             oldFileName = "ui_" + oldFilePath.baseName() + ".h";
             newFileName = "ui_" + newFilePath.baseName() + ".h";
         }
@@ -1896,7 +1927,8 @@ void CppModelManager::renameIncludes(const QList<std::pair<FilePath, FilePath>>
         if (isUiFile && !productNodeForUiFile)
             continue;
 
-        const QList<Snapshot::IncludeLocation> locations = snapshot().includeLocationsOfDocument(
+        // Handle locations where this file is included.
+        const QList<Snapshot::IncludeLocation> locations = theSnapshot.includeLocationsOfDocument(
             isUiFile ? FilePath::fromString(oldFileName) : oldFilePath);
         for (const Snapshot::IncludeLocation &loc : locations) {
             const FilePath includingFileOld = loc.first->filePath();
@@ -1913,18 +1945,72 @@ void CppModelManager::renameIncludes(const QList<std::pair<FilePath, FilePath>>
             if (isUiFile && getProductNode(includingFileOld) != productNodeForUiFile)
                 continue;
 
-            TextEditor::RefactoringFilePtr file = changes.file(includingFileNew);
-            const QTextBlock &block = file->document()->findBlockByNumber(loc.second - 1);
-            const int replaceStart = block.text().indexOf(oldFileName);
-            if (replaceStart > -1) {
-                ChangeSet changeSet;
+            rewriteCandidates[std::make_pair(includingFileOld, includingFileNew)].append(
+                {oldFilePath, newFilePath, oldFileName, newFileName, loc.second, isUiFile});
+        }
+
+        // Handle the includes of this file: If its location changed, its own local includes
+        // need to get adapted as well.
+        if (isUiFile || !moved)
+            continue;
+        const CPlusPlus::Document::Ptr cppDoc = theSnapshot.document(oldFilePath);
+        if (!cppDoc)
+            continue;
+        const auto key = std::make_pair(oldFilePath, newFilePath);
+        for (const CPlusPlus::Document::Include &include : cppDoc->resolvedIncludes()) {
+            const FilePath oldHeaderPath = include.resolvedFileName();
+            const QString oldHeaderName = oldHeaderPath.fileName();
+            const bool isUiHeader = oldHeaderName.startsWith("ui_") && oldHeaderName.endsWith(".h");
+            if (!isUiHeader && include.type() != CPlusPlus::Client::IncludeLocal)
+                continue;
+            FilePath newHeaderPath = oldHeaderPath;
+            for (const auto &pathPair : oldAndNewPaths) {
+                if (oldHeaderPath == pathPair.first) {
+                    newHeaderPath = pathPair.second;
+                    break;
+                }
+            }
+            rewriteCandidates[key].append(
+                {oldHeaderPath,
+                 newHeaderPath,
+                 oldHeaderName,
+                 newHeaderPath.fileName(),
+                 include.line(),
+                 isUiHeader});
+        }
+    }
+
+    const TextEditor::PlainRefactoringFileFactory changes;
+    for (auto it = rewriteCandidates.cbegin(); it != rewriteCandidates.cend(); ++it) {
+        const FilePath &includingFileOld = it.key().first;
+        const FilePath &includingFileNew = it.key().second;
+        TextEditor::RefactoringFilePtr file = changes.file(includingFileNew);
+        ChangeSet changeSet;
+        for (const RewriteCandidate &candidate : it.value()) {
+            const QTextBlock &block = file->document()->findBlockByNumber(
+                candidate.includeLine - 1);
+            const FilePath relPathOld = FilePath::fromString(FilePath::calcRelativePath(
+                candidate.oldHeaderFilePath.toString(), includingFileOld.parentDir().toString()));
+            const FilePath relPathNew = FilePath::fromString(FilePath::calcRelativePath(
+                candidate.newHeaderFilePath.toString(), includingFileNew.parentDir().toString()));
+            int replaceStart = block.text().indexOf(relPathOld.toString());
+            QString oldString;
+            QString newString;
+            if (candidate.isUiHeader || replaceStart == -1) {
+                replaceStart = block.text().indexOf(candidate.oldHeaderFileName);
+                oldString = candidate.oldHeaderFileName;
+                newString = candidate.newHeaderFileName;
+            } else {
+                oldString = relPathOld.toString();
+                newString = relPathNew.toString();
+            }
+            if (replaceStart > -1 && oldString != newString) {
                 changeSet.replace(block.position() + replaceStart,
-                                  block.position() + replaceStart + oldFileName.length(),
-                                  newFileName);
-                file->setChangeSet(changeSet);
-                file->apply();
+                                  block.position() + replaceStart + oldString.length(),
+                                  newString);
             }
         }
+        file->apply(changeSet);
     }
 }
 
@@ -1990,6 +2076,21 @@ void CppModelManager::onCoreAboutToClose()
     d->m_enableGC = false;
 }
 
+void CppModelManager::handleSettingsChange(Project *project)
+{
+    ProjectInfoList info;
+    if (project)
+        info << projectInfo(project);
+    else
+        info << projectInfos();
+    for (const ProjectInfo::ConstPtr &pi : std::as_const(info)) {
+        const CppCodeModelSettings newSettings = CppCodeModelSettings::settingsForProject(
+            pi->projectFilePath());
+        if (pi->settings() != newSettings)
+            updateProjectInfo(ProjectInfo::cloneWithNewSettings(pi, newSettings));
+    }
+}
+
 void CppModelManager::setupFallbackProjectPart()
 {
     ToolchainInfo tcInfo;
diff --git a/src/plugins/cppeditor/cppmodelmanager.h b/src/plugins/cppeditor/cppmodelmanager.h
index 0fe9e151ae4..c22a8a9da0b 100644
--- a/src/plugins/cppeditor/cppmodelmanager.h
+++ b/src/plugins/cppeditor/cppmodelmanager.h
@@ -19,9 +19,11 @@
 #include <QFuture>
 #include <QObject>
 #include <QStringList>
+#include <QVersionNumber>
 
 #include <functional>
 #include <memory>
+#include <optional>
 #include <utility>
 
 namespace Core {
@@ -108,6 +110,8 @@ public:
     static QFuture<void> updateProjectInfo(const ProjectInfo::ConstPtr &newProjectInfo,
                                            const QSet<Utils::FilePath> &additionalFiles = {});
 
+    static void handleSettingsChange(ProjectExplorer::Project *project);
+
     /// \return The project part with the given project file
     static ProjectPart::ConstPtr projectPartForId(const QString &projectPartId);
     /// \return All project parts that mention the given file name as one of the sources/headers.
@@ -132,7 +136,7 @@ public:
     static void emitAbstractEditorSupportRemoved(const QString &filePath);
 
     static bool isCppEditor(Core::IEditor *editor);
-    static bool usesClangd(const TextEditor::TextDocument *document);
+    static std::optional<QVersionNumber> usesClangd(const TextEditor::TextDocument *document);
     static bool isClangCodeModelActive();
 
     static QSet<AbstractEditorSupport*> abstractEditorSupports();
diff --git a/src/plugins/cppeditor/cppmodelmanager_test.cpp b/src/plugins/cppeditor/cppmodelmanager_test.cpp
index 9e72a224b9f..21351659a91 100644
--- a/src/plugins/cppeditor/cppmodelmanager_test.cpp
+++ b/src/plugins/cppeditor/cppmodelmanager_test.cpp
@@ -17,8 +17,10 @@
 
 #include <cplusplus/LookupContext.h>
 
+#include <projectexplorer/kitmanager.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectmanager.h>
+#include <projectexplorer/projectnodes.h>
 
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
@@ -27,6 +29,8 @@
 #include <QScopeGuard>
 #include <QtTest>
 
+#include <memory>
+
 #define VERIFY_DOCUMENT_REVISION(document, expectedRevision) \
     QVERIFY(document); \
     QCOMPARE(document->revision(), expectedRevision);
@@ -39,6 +43,7 @@ using CPlusPlus::Document;
 // FIXME: Clean up the namespaces
 using CppEditor::Tests::ModelManagerTestHelper;
 using CppEditor::Tests::ProjectOpenerAndCloser;
+using CppEditor::Tests::SourceFilesRefreshGuard;
 using CppEditor::Tests::TemporaryCopiedDir;
 using CppEditor::Tests::TemporaryDir;
 using CppEditor::Tests::TestCase;
@@ -964,53 +969,145 @@ void ModelManagerTest::testUpdateEditorsAfterProjectUpdate()
     QCOMPARE(documentBProjectPart->topLevelProject, pi->projectFilePath());
 }
 
+void ModelManagerTest::testRenameIncludes_data()
+{
+    QTest::addColumn<QString>("oldRelPath");
+    QTest::addColumn<QString>("newRelPath");
+    QTest::addColumn<bool>("successExpected");
+
+    QTest::addRow("rename in place 1")
+        << "subdir1/header1.h" << "subdir1/header1_renamed.h" << true;
+    QTest::addRow("rename in place 2")
+        << "subdir2/header2.h" << "subdir2/header2_renamed.h" << true;
+    QTest::addRow("rename in place 3") << "header.h" << "header_renamed.h" << true;
+    QTest::addRow("move up") << "subdir1/header1.h" << "header1_moved.h" << true;
+    QTest::addRow("move up (breaks build)") << "subdir2/header2.h" << "header2_moved.h" << false;
+    QTest::addRow("move down") << "header.h" << "subdir1/header_moved.h" << true;
+    QTest::addRow("move across") << "subdir1/header1.h" << "subdir2/header1_moved.h" << true;
+    QTest::addRow("move across (breaks build)")
+        << "subdir2/header2.h" << "subdir1/header2_moved.h" << false;
+}
+
 void ModelManagerTest::testRenameIncludes()
 {
-    struct ModelManagerGCHelper {
-        ~ModelManagerGCHelper() { CppModelManager::GC(); }
-    } GCHelper;
-    Q_UNUSED(GCHelper) // do not warn about being unused
-
+    // Set up project.
     TemporaryDir tmpDir;
     QVERIFY(tmpDir.isValid());
+    const MyTestDataDir sourceDir("testdata_renameheaders");
+    const FilePath srcFilePath = FilePath::fromString(sourceDir.path());
+    const FilePath projectDir = tmpDir.filePath().pathAppended(srcFilePath.fileName());
+    const auto copyResult = srcFilePath.copyRecursively(projectDir);
+    if (!copyResult)
+        qDebug() << copyResult.error();
+    QVERIFY(copyResult);
+    Kit * const kit  = Utils::findOr(KitManager::kits(), nullptr, [](const Kit *k) {
+        return k->isValid() && !k->hasWarning() && k->value("QtSupport.QtInformation").isValid();
+    });
+    if (!kit)
+        QSKIP("The test requires at least one valid kit with a valid Qt");
+    const FilePath projectFile = projectDir.pathAppended(projectDir.fileName() + ".pro");
+    SourceFilesRefreshGuard refreshGuard;
+    ProjectOpenerAndCloser projectMgr;
+    const ProjectInfo::ConstPtr projectInfo = projectMgr.open(projectFile, true, kit);
+    QVERIFY(projectInfo);
+    QVERIFY(refreshGuard.wait());
 
-    const QDir workingDir(tmpDir.path());
-    const QStringList fileNames = {"foo.h", "foo.cpp", "main.cpp"};
-    const FilePath oldHeader = FilePath::fromString(workingDir.filePath("foo.h"));
-    const FilePath newHeader = FilePath::fromString(workingDir.filePath("bar.h"));
-    const MyTestDataDir testDir(_("testdata_project1"));
-
-    // Copy test files to a temporary directory
-    QSet<FilePath> sourceFiles;
-    for (const QString &fileName : std::as_const(fileNames)) {
-        const QString &file = workingDir.filePath(fileName);
-        QVERIFY(QFile::copy(testDir.file(fileName), file));
-        // Saving source file names for the model manager update,
-        // so we can update just the relevant files.
-        if (ProjectFile::classify(file) == ProjectFile::CXXSource)
-            sourceFiles.insert(FilePath::fromString(file));
-    }
-
-    // Update the c++ model manager and check for the old includes
-    CppModelManager::updateSourceFiles(sourceFiles).waitForFinished();
-    QCoreApplication::processEvents();
+    // Verify initial code model state.
+    const auto makeAbs = [&](const QStringList &relPaths) {
+        return Utils::transform<QSet<FilePath>>(relPaths, [&](const QString &relPath) {
+            return projectDir.pathAppended(relPath);
+        });
+    };
+    const QSet<FilePath> allSources = makeAbs({"main.cpp", "subdir1/file1.cpp", "subdir2/file2.cpp"});
+    const QSet<FilePath> allHeaders = makeAbs({"header.h", "subdir1/header1.h", "subdir2/header2.h"});
+    QCOMPARE(projectInfo->sourceFiles(), allSources + allHeaders);
     CPlusPlus::Snapshot snapshot = CppModelManager::snapshot();
-    for (const FilePath &sourceFile : std::as_const(sourceFiles)) {
-        QCOMPARE(snapshot.allIncludesForDocument(sourceFile), QSet<FilePath>{oldHeader});
+    for (const FilePath &srcFile : allSources) {
+        QCOMPARE(snapshot.allIncludesForDocument(srcFile), allHeaders);
     }
 
-    // Renaming the header
+    // Rename the header.
+    QFETCH(QString, oldRelPath);
+    QFETCH(QString, newRelPath);
+    QFETCH(bool, successExpected);
+    const FilePath oldHeader = projectDir.pathAppended(oldRelPath);
+    const FilePath newHeader = projectDir.pathAppended(newRelPath);
+    refreshGuard.reset();
     QVERIFY(ProjectExplorerPlugin::renameFile(oldHeader, newHeader));
 
-    // Update the c++ model manager again and check for the new includes
-    CppModelManager::updateSourceFiles(sourceFiles).waitForFinished();
-    QCoreApplication::processEvents();
+    // Verify new code model state.
+    QVERIFY(refreshGuard.wait());
+    QSet<FilePath> incompleteNewHeadersSet = allHeaders;
+    incompleteNewHeadersSet.remove(oldHeader);
+    QSet<FilePath> completeNewHeadersSet = incompleteNewHeadersSet;
+    completeNewHeadersSet << newHeader;
+
     snapshot = CppModelManager::snapshot();
-    for (const FilePath &sourceFile : std::as_const(sourceFiles)) {
-        QCOMPARE(snapshot.allIncludesForDocument(sourceFile), QSet<FilePath>{newHeader});
+    for (const FilePath &srcFile : allSources) {
+        const QSet<FilePath> &expectedHeaders = srcFile.fileName() == "main.cpp" && !successExpected
+            ? incompleteNewHeadersSet : completeNewHeadersSet;
+        QCOMPARE(snapshot.allIncludesForDocument(srcFile), expectedHeaders);
     }
 }
 
+void ModelManagerTest::testMoveIncludingSources_data()
+{
+    QTest::addColumn<QString>("oldRelPath");
+    QTest::addColumn<QString>("newRelPath");
+
+    QTest::addRow("move up") << "subdir1/file1.cpp" << "file1_moved.cpp";
+    QTest::addRow("move down") << "main.cpp" << "subdir1/main.cpp";
+    QTest::addRow("move across") << "subdir1/file1.cpp" << "subdir2/file1_moved.cpp";
+}
+
+void ModelManagerTest::testMoveIncludingSources()
+{
+    QFETCH(QString, oldRelPath);
+    QFETCH(QString, newRelPath);
+
+    // Set up project.
+    TemporaryDir tmpDir;
+    QVERIFY(tmpDir.isValid());
+    const MyTestDataDir sourceDir("testdata_renameheaders");
+    const FilePath srcFilePath = FilePath::fromString(sourceDir.path());
+    const FilePath projectDir = tmpDir.filePath().pathAppended(srcFilePath.fileName());
+    const auto copyResult = srcFilePath.copyRecursively(projectDir);
+    if (!copyResult)
+        qDebug() << copyResult.error();
+    QVERIFY(copyResult);
+    Kit * const kit  = Utils::findOr(KitManager::kits(), nullptr, [](const Kit *k) {
+        return k->isValid() && !k->hasWarning() && k->value("QtSupport.QtInformation").isValid();
+    });
+    if (!kit)
+        QSKIP("The test requires at least one valid kit with a valid Qt");
+    SourceFilesRefreshGuard refreshGuard;
+    const FilePath projectFile = projectDir.pathAppended(projectDir.fileName() + ".pro");
+    ProjectOpenerAndCloser projectMgr;
+    QVERIFY(projectMgr.open(projectFile, true, kit));
+    QVERIFY(refreshGuard.wait());
+
+    // Verify initial code model state.
+    const auto makeAbs = [&](const QStringList &relPaths) {
+        return Utils::transform<QSet<FilePath>>(relPaths, [&](const QString &relPath) {
+            return projectDir.pathAppended(relPath);
+        });
+    };
+    const FilePath oldSource = projectDir.pathAppended(oldRelPath);
+    QVERIFY(oldSource.exists());
+    const QSet<FilePath> includedHeaders = makeAbs(
+        {"header.h", "subdir1/header1.h", "subdir2/header2.h"});
+    QCOMPARE(CppModelManager::snapshot().allIncludesForDocument(oldSource), includedHeaders);
+
+    // Rename the source file.
+    refreshGuard.reset();
+    const FilePath newSource = projectDir.pathAppended(newRelPath);
+    QVERIFY(ProjectExplorerPlugin::renameFile(oldSource, newSource, projectMgr.projects().first()));
+
+    // Verify new code model state.
+    QVERIFY(refreshGuard.wait());
+    QCOMPARE(CppModelManager::snapshot().allIncludesForDocument(newSource), includedHeaders);
+}
+
 void ModelManagerTest::testRenameIncludesInEditor()
 {
     struct ModelManagerGCHelper {
@@ -1174,4 +1271,260 @@ void ModelManagerTest::testDocumentsAndRevisions()
     VERIFY_DOCUMENT_REVISION(CppModelManager::document(filePath2), 4U);
 }
 
+void ModelManagerTest::testSettingsChanges()
+{
+    ModelManagerTestHelper helper;
+
+    int refreshCount = 0;
+    QSet<QString> refreshedFiles;
+    connect(CppModelManager::instance(), &CppModelManager::sourceFilesRefreshed,
+            &helper, [&](const QSet<QString> &files) {
+        ++refreshCount;
+        refreshedFiles.unite(files);
+    });
+    const auto waitForRefresh = [] {
+        return ::CppEditor::Tests::waitForSignalOrTimeout(CppModelManager::instance(),
+                                                          &CppModelManager::sourceFilesRefreshed,
+                                                          5000);
+    };
+
+    const auto setupProjectNodes = [](Project &p, const ProjectFiles &projectFiles) {
+        auto rootNode = std::make_unique<ProjectNode>(p.projectFilePath());
+        for (const ProjectFile &sourceFile : projectFiles) {
+            rootNode->addNestedNode(std::make_unique<FileNode>(sourceFile.path,
+                                                               sourceFile.isHeader()
+                                                               ? FileType::Header
+                                                                   : FileType::Source));
+        }
+        p.setRootProjectNode(std::move(rootNode));
+    };
+
+    // Set up projects.
+    const MyTestDataDir p1Dir("testdata_project1");
+    const FilePaths p1Files
+        = Utils::transform({"baz.h", "baz2.h", "baz3.h", "foo.cpp", "foo.h", "main.cpp"},
+                           [&](const QString &fn) { return p1Dir.filePath(fn); });
+    const ProjectFiles p1ProjectFiles = Utils::transform(p1Files, [](const FilePath &fp) {
+        return ProjectFile(fp, ProjectFile::classify(fp.toString()));
+    });
+    Project * const p1 = helper.createProject("testdata_project1", FilePath::fromString("p1.pro"));
+    setupProjectNodes(*p1, p1ProjectFiles);
+    RawProjectPart rpp1;
+    const auto part1 = ProjectPart::create(p1->projectFilePath(), rpp1, {}, p1ProjectFiles);
+    const auto pi1 = ProjectInfo::create(ProjectUpdateInfo(p1, KitInfo(nullptr), {}, {}), {part1});
+    const auto p1Sources = Utils::transform<QSet<QString>>(p1Files, &FilePath::toString);
+    CppModelManager::updateProjectInfo(pi1);
+
+    const MyTestDataDir p2Dir("testdata_project2");
+    const FilePaths p2Files
+        = Utils::transform({"bar.h", "bar.cpp", "foobar2000.h", "foobar4000.h", "main.cpp"},
+                           [&](const QString &fn) { return p1Dir.filePath(fn); });
+    const ProjectFiles p2ProjectFiles = Utils::transform(p2Files, [](const FilePath &fp) {
+        return ProjectFile(fp, ProjectFile::classify(fp.toString()));
+    });
+    Project * const p2 = helper.createProject("testdata_project2", FilePath::fromString("p2.pro"));
+    setupProjectNodes(*p2, p2ProjectFiles);
+    RawProjectPart rpp2;
+    const auto part2 = ProjectPart::create(p2->projectFilePath(), rpp2, {}, p2ProjectFiles);
+    const auto pi2 = ProjectInfo::create(ProjectUpdateInfo(p2, KitInfo(nullptr), {}, {}), {part2});
+    const auto p2Sources = Utils::transform<QSet<QString>>(p2Files, &FilePath::toString);
+    CppModelManager::updateProjectInfo(pi2);
+
+    // Initial check: Have all files been indexed?
+    while (refreshCount < 2)
+        QVERIFY(waitForRefresh());
+    const auto allSources = p1Sources + p2Sources;
+    QCOMPARE(refreshedFiles, allSources);
+
+    // Switch first project from global to local settings. Nothing should get re-indexed,
+    // as the default values are the same.
+    refreshCount = 0;
+    refreshedFiles.clear();
+    QVERIFY(!CppCodeModelSettings::hasCustomSettings(p1));
+    CppCodeModelSettings p1Settings = CppCodeModelSettings::settingsForProject(p1);
+    CppCodeModelSettings::setSettingsForProject(p1, p1Settings);
+    QVERIFY(CppCodeModelSettings::hasCustomSettings(p1));
+    QCOMPARE(refreshCount, 0);
+    QVERIFY(!waitForRefresh());
+
+    // Change global settings. Only the second project should get re-indexed, as the first one
+    // has its own settings, which are still the same.
+    CppCodeModelSettings globalSettings = CppCodeModelSettings::settingsForProject(nullptr);
+    globalSettings.indexerFileSizeLimitInMb = 1;
+    CppCodeModelSettings::setGlobal(globalSettings);
+    if (refreshCount == 0)
+        QVERIFY(waitForRefresh());
+    QVERIFY(!waitForRefresh());
+    QCOMPARE(refreshedFiles, p2Sources);
+
+    // Change first project's settings. Only this project should get re-indexed.
+    refreshCount = 0;
+    refreshedFiles.clear();
+    p1Settings.ignoreFiles = true;
+    p1Settings.ignorePattern = "baz3.h";
+    CppCodeModelSettings::setSettingsForProject(p1, p1Settings);
+    if (refreshCount == 0)
+        QVERIFY(waitForRefresh());
+    QVERIFY(!waitForRefresh());
+    QSet<QString> filteredP1Sources = p1Sources;
+    filteredP1Sources -= p1Dir.filePath("baz3.h").toString();
+    QCOMPARE(refreshedFiles, filteredP1Sources);
+}
+
+static bool True = true;
+static bool False = false;
+
+void ModelManagerTest::testOptionalIndexing_data()
+{
+    QTest::addColumn<bool>("enableGlobally");
+    QTest::addColumn<bool *>("enableForP1");
+    QTest::addColumn<bool *>("enableForP2");
+    QTest::addColumn<bool>("foo1Present");
+    QTest::addColumn<bool>("foo2Present");
+
+    QTest::addRow("globally disabled, no custom settings")
+        << false << (bool *) nullptr << (bool *) nullptr << false << false;
+    QTest::addRow("globally disabled, redundantly disabled for project 2")
+        << false << (bool *) nullptr << &False << false << false;
+    QTest::addRow("globally disabled, enabled for project 2")
+        << false << (bool *) nullptr << &True << false << true;
+    QTest::addRow("globally disabled, redundantly disabled for project 1")
+        << false << &False << (bool *) nullptr << false << false;
+    QTest::addRow("globally disabled, redundantly disabled for both projects")
+        << false << &False << &False << false << false;
+    QTest::addRow("globally disabled, redundantly disabled for project 1, enabled for project 2")
+        << false << &False << &True << false << true;
+    QTest::addRow("globally disabled, enabled for project 1")
+        << false << &True << (bool *) nullptr << true << false;
+    QTest::addRow("globally disabled, enabled for project 1, redundantly disabled for project 2")
+        << false << &True << &False << true << false;
+    QTest::addRow("globally disabled, enabled for both project")
+        << false << &True << &True << true << true;
+    QTest::addRow("globally enabled, no custom settings")
+        << true << (bool *) nullptr << (bool *) nullptr << true << true ;
+    QTest::addRow("globally enabled, disabled for project 2")
+        << true << (bool *) nullptr << &False << true << false;
+    QTest::addRow("globally enabled, redundantly enabled for project 2")
+        << true << (bool *) nullptr << &True << true << true;
+    QTest::addRow("globally enabled, disabled for project 1")
+        << true << &False << (bool *) nullptr << false << true;
+    QTest::addRow("globally enabled, disabled for both projects")
+        << true << &False << &False << false << false;
+    QTest::addRow("globally enabled, disabled for project 1, redundantly enabled for project 2")
+        << true << &False << &True << false << true;
+    QTest::addRow("globally enabled, redundantly enabled for project 1")
+        << true << &True << (bool *) nullptr << true << true;
+    QTest::addRow("globally enabled, redundantly enabled for project 1, disabled for project 2")
+        << true << &True << &False << true << false;
+    QTest::addRow("globally enabled, redundantly enabled for both projects")
+        << true << &True << &True << true << true;
+}
+
+void ModelManagerTest::testOptionalIndexing()
+{
+    if (CppModelManager::isClangCodeModelActive())
+        QSKIP("Test only makes sense with built-in locators");
+
+    QFETCH(bool, enableGlobally);
+    QFETCH(bool *, enableForP1);
+    QFETCH(bool *, enableForP2);
+    QFETCH(bool, foo1Present);
+    QFETCH(bool, foo2Present);
+
+    // Apply global setting, if necessary. Needs to be reverted in the end.
+    class TempIndexingDisabler {
+    public:
+        TempIndexingDisabler(bool enable)
+        {
+            if (!enable)
+                reset(false);
+        }
+        ~TempIndexingDisabler() { reset(true); }
+    private:
+        void reset(bool enable)
+        {
+            CppCodeModelSettings settings = CppCodeModelSettings::global();
+            settings.enableIndexing = enable;
+            CppCodeModelSettings::setGlobal(settings);
+        }
+    };
+    const TempIndexingDisabler disabler(enableGlobally);
+
+    // Set up projects.
+    TemporaryDir tmpDir;
+    QVERIFY(tmpDir.isValid());
+    const MyTestDataDir sourceDir("testdata_optionalindexing");
+    const FilePath srcFilePath = FilePath::fromString(sourceDir.path());
+    const FilePath projectDir = tmpDir.filePath().pathAppended(srcFilePath.fileName());
+    const auto copyResult = srcFilePath.copyRecursively(projectDir);
+    if (!copyResult)
+        qDebug() << copyResult.error();
+    QVERIFY(copyResult);
+    Kit * const kit  = Utils::findOr(KitManager::kits(), nullptr, [](const Kit *k) {
+        return k->isValid() && !k->hasWarning() && k->value("QtSupport.QtInformation").isValid();
+    });
+    if (!kit)
+        QSKIP("The test requires at least one valid kit with a valid Qt");
+    const FilePath p1ProjectFile = projectDir.pathAppended("lib1.pro");
+    auto projectMgr = std::make_unique<ProjectOpenerAndCloser>();
+    SourceFilesRefreshGuard refreshGuard;
+    QVERIFY(projectMgr->open(p1ProjectFile, true, kit));
+    QVERIFY(refreshGuard.wait());
+    refreshGuard.reset();
+    Project *p1 = projectMgr->projects().first();
+    const FilePath p2ProjectFile = projectDir.pathAppended("lib2.pro");
+    QVERIFY(projectMgr->open(p2ProjectFile, true, kit));
+    QVERIFY(refreshGuard.wait());
+    refreshGuard.reset();
+    Project *p2 = projectMgr->projects().last();
+
+    const auto applyProjectSpecificSettings = [&](Project *p, bool *enable) {
+        if (!enable)
+            return;
+        refreshGuard.reset();
+        CppCodeModelSettings settings = CppCodeModelSettings::settingsForProject(p);
+        settings.enableIndexing = *enable;
+        CppCodeModelSettings::setSettingsForProject(p, settings);
+        if (*enable != enableGlobally)
+            QVERIFY(refreshGuard.wait());
+    };
+    applyProjectSpecificSettings(p1, enableForP1);
+    applyProjectSpecificSettings(p2, enableForP2);
+
+    // Compare locator results to expectations.
+    Core::LocatorFilterEntries entries = Core::LocatorMatcher::runBlocking(
+        Core::LocatorMatcher::matchers(Core::MatcherType::Functions), "foo");
+    const auto hasEntry = [&](const QString &name) {
+        return Utils::contains(entries, [&](const Core::LocatorFilterEntry &e) {
+            return e.displayName == name + "()";
+        });
+    };
+    QCOMPARE(hasEntry("foo1"), foo1Present);
+    QCOMPARE(hasEntry("foo2"), foo2Present);
+
+    // Close and re-open projects, then check again, to see whether the settings persisted
+    // and are taking effect.
+    projectMgr.reset(nullptr);
+    projectMgr.reset(new ProjectOpenerAndCloser);
+    refreshGuard.reset();
+    QVERIFY(projectMgr->open(p1ProjectFile, true, kit));
+    p1 = projectMgr->projects().first();
+    QCOMPARE(
+        CppCodeModelSettings::settingsForProject(p1).enableIndexing,
+        enableForP1 ? *enableForP1 : enableGlobally);
+    QVERIFY(refreshGuard.wait());
+    refreshGuard.reset();
+    QVERIFY(projectMgr->open(p2ProjectFile, true, kit));
+    p2 = projectMgr->projects().last();
+    QCOMPARE(
+        CppCodeModelSettings::settingsForProject(p2).enableIndexing,
+        enableForP2 ? *enableForP2 : enableGlobally);
+    QVERIFY(refreshGuard.wait());
+
+    entries = Core::LocatorMatcher::runBlocking(
+        Core::LocatorMatcher::matchers(Core::MatcherType::Functions), "foo");
+    QCOMPARE(hasEntry("foo1"), foo1Present);
+    QCOMPARE(hasEntry("foo2"), foo2Present);
+}
+
 } // CppEditor::Internal
diff --git a/src/plugins/cppeditor/cppmodelmanager_test.h b/src/plugins/cppeditor/cppmodelmanager_test.h
index 939c0f4cca4..bca0753fa95 100644
--- a/src/plugins/cppeditor/cppmodelmanager_test.h
+++ b/src/plugins/cppeditor/cppmodelmanager_test.h
@@ -28,9 +28,15 @@ private slots:
     void testDefinesPerEditor();
     void testUpdateEditorsAfterProjectUpdate();
     void testPrecompiledHeaders();
+    void testRenameIncludes_data();
     void testRenameIncludes();
+    void testMoveIncludingSources_data();
+    void testMoveIncludingSources();
     void testRenameIncludesInEditor();
     void testDocumentsAndRevisions();
+    void testSettingsChanges();
+    void testOptionalIndexing_data();
+    void testOptionalIndexing();
 };
 
 } // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/cppmodelmanagersupport.h b/src/plugins/cppeditor/cppmodelmanagersupport.h
index c2c463df59a..ca90d6758b7 100644
--- a/src/plugins/cppeditor/cppmodelmanagersupport.h
+++ b/src/plugins/cppeditor/cppmodelmanagersupport.h
@@ -9,7 +9,10 @@
 
 #include <utils/link.h>
 
+#include <QVersionNumber>
+
 #include <functional>
+#include <optional>
 
 namespace Core { class SearchResult; }
 namespace TextEditor {
@@ -31,7 +34,10 @@ public:
 
     virtual BaseEditorDocumentProcessor *createEditorDocumentProcessor(
                 TextEditor::TextDocument *baseTextDocument) = 0;
-    virtual bool usesClangd(const TextEditor::TextDocument *) const { return false; }
+    virtual std::optional<QVersionNumber> usesClangd(const TextEditor::TextDocument *) const
+    {
+        return {};
+    }
 
     virtual void followSymbol(const CursorInEditor &data,
                               const Utils::LinkHandler &processLinkCallback,
diff --git a/src/plugins/cppeditor/cppoutlinemodel.cpp b/src/plugins/cppeditor/cppoutlinemodel.cpp
index c03236f274e..6cd11c6df54 100644
--- a/src/plugins/cppeditor/cppoutlinemodel.cpp
+++ b/src/plugins/cppeditor/cppoutlinemodel.cpp
@@ -117,7 +117,7 @@ public:
                 return false;
             };
             if (isFwdDecl())
-                return Utils::creatorTheme()->color(Utils::Theme::TextColorDisabled);
+                return Utils::creatorColor(Utils::Theme::TextColorDisabled);
             return TreeItem::data(column, role);
         }
 
diff --git a/src/plugins/cppeditor/cppprojectupdater.cpp b/src/plugins/cppeditor/cppprojectupdater.cpp
index a4ddbd49f68..80ab1ad6cd5 100644
--- a/src/plugins/cppeditor/cppprojectupdater.cpp
+++ b/src/plugins/cppeditor/cppprojectupdater.cpp
@@ -12,30 +12,45 @@
 
 #include <projectexplorer/extracompiler.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/projectupdater.h>
+#include <projectexplorer/rawprojectpart.h>
+
+#include <solutions/tasking/tasktreerunner.h>
 
 #include <utils/algorithm.h>
 #include <utils/async.h>
+#include <utils/futuresynchronizer.h>
 #include <utils/qtcassert.h>
 
 using namespace ProjectExplorer;
 using namespace Tasking;
 using namespace Utils;
 
-namespace CppEditor {
+namespace CppEditor::Internal {
+
+class CppProjectUpdater final : public ProjectUpdater
+{
+public:
+    void update(const ProjectUpdateInfo &projectUpdateInfo,
+                const QList<ExtraCompiler *> &extraCompilers) final;
+    void cancel() final;
+
+private:
+    FutureSynchronizer m_futureSynchronizer;
+    TaskTreeRunner m_taskTreeRunner;
+};
 
 void CppProjectUpdater::update(const ProjectUpdateInfo &projectUpdateInfo,
-                               const QList<ProjectExplorer::ExtraCompiler *> &extraCompilers)
+                               const QList<ExtraCompiler *> &extraCompilers)
 {
     // Stop previous update.
     cancel();
 
-    const QList<QPointer<ProjectExplorer::ExtraCompiler>> compilers =
+    const QList<QPointer<ExtraCompiler>> compilers =
         Utils::transform(extraCompilers, [](ExtraCompiler *compiler) {
             return QPointer<ExtraCompiler>(compiler);
         });
 
-    using namespace ProjectExplorer;
-
     // Run the project info generator in a worker thread and continue if that one is finished.
     const auto infoGenerator = [=](QPromise<ProjectInfo::ConstPtr> &promise) {
         ProjectUpdateInfo fullProjectUpdateInfo = projectUpdateInfo;
@@ -45,7 +60,6 @@ void CppProjectUpdater::update(const ProjectUpdateInfo &projectUpdateInfo,
         promise.addResult(generator.generate(promise));
     };
 
-    using namespace Tasking;
     struct UpdateStorage {
         ProjectInfo::ConstPtr projectInfo = nullptr;
     };
@@ -112,4 +126,4 @@ void setupCppProjectUpdater()
     static CppProjectUpdaterFactory theCppProjectUpdaterFactory;
 }
 
-} // namespace CppEditor
+} //  CppEditor::Internal
diff --git a/src/plugins/cppeditor/cppprojectupdater.h b/src/plugins/cppeditor/cppprojectupdater.h
index 1057feaed6a..19c7c038e30 100644
--- a/src/plugins/cppeditor/cppprojectupdater.h
+++ b/src/plugins/cppeditor/cppprojectupdater.h
@@ -3,34 +3,8 @@
 
 #pragma once
 
-#include "cppeditor_global.h"
-
-#include <projectexplorer/projectupdater.h>
-#include <projectexplorer/rawprojectpart.h>
-
-#include <solutions/tasking/tasktreerunner.h>
-
-#include <utils/futuresynchronizer.h>
-
-namespace ProjectExplorer { class ExtraCompiler; }
-
-namespace CppEditor {
-
-class CPPEDITOR_EXPORT CppProjectUpdater final
-    : public QObject, public ProjectExplorer::ProjectUpdater
-{
-    Q_OBJECT
-
-public:
-    void update(const ProjectExplorer::ProjectUpdateInfo &projectUpdateInfo,
-                const QList<ProjectExplorer::ExtraCompiler *> &extraCompilers) override;
-    void cancel() override;
-
-private:
-    Utils::FutureSynchronizer m_futureSynchronizer;
-    Tasking::TaskTreeRunner m_taskTreeRunner;
-};
+namespace CppEditor::Internal {
 
 void setupCppProjectUpdater();
 
-} // namespace CppEditor
+} // CppEditor::Internal
diff --git a/src/plugins/cppeditor/cppquickfix.cpp b/src/plugins/cppeditor/cppquickfix.cpp
deleted file mode 100644
index 0741c842bad..00000000000
--- a/src/plugins/cppeditor/cppquickfix.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "cppquickfix.h"
-
-#include "cppquickfixassistant.h"
-#include "cpprefactoringchanges.h"
-
-using namespace CPlusPlus;
-using namespace TextEditor;
-
-namespace CppEditor::Internal {
-
-const QStringList magicQObjectFunctions()
-{
-    static QStringList list{"metaObject", "qt_metacast", "qt_metacall", "qt_static_metacall"};
-    return list;
-}
-
-CppQuickFixOperation::CppQuickFixOperation(const CppQuickFixInterface &interface, int priority)
-    : QuickFixOperation(priority), CppQuickFixInterface(interface)
-{}
-
-CppQuickFixOperation::~CppQuickFixOperation() = default;
-
-} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/cppquickfix_test.cpp b/src/plugins/cppeditor/cppquickfix_test.cpp
deleted file mode 100644
index ac9766414d2..00000000000
--- a/src/plugins/cppeditor/cppquickfix_test.cpp
+++ /dev/null
@@ -1,9496 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "cppquickfix_test.h"
-
-#include "cppcodestylepreferences.h"
-#include "cppeditorwidget.h"
-#include "cppmodelmanager.h"
-#include "cppquickfixassistant.h"
-#include "cppquickfixes.h"
-#include "cppquickfixsettings.h"
-#include "cppsourceprocessertesthelper.h"
-#include "cpptoolssettings.h"
-
-#include <utils/fileutils.h>
-
-#include <QDebug>
-#include <QDir>
-#include <QtTest>
-
-/*!
-    Tests for quick-fixes.
- */
-using namespace Core;
-using namespace CPlusPlus;
-using namespace TextEditor;
-using namespace Utils;
-
-using CppEditor::Tests::TemporaryDir;
-using CppEditor::Tests::Internal::TestIncludePaths;
-
-typedef QByteArray _;
-
-namespace CppEditor::Internal::Tests {
-typedef QList<TestDocumentPtr> QuickFixTestDocuments;
-}
-Q_DECLARE_METATYPE(CppEditor::Internal::Tests::QuickFixTestDocuments)
-
-namespace CppEditor {
-namespace Internal {
-namespace Tests {
-
-/// Tests the offered operations provided by a given CppQuickFixFactory
-class QuickFixOfferedOperationsTest : public BaseQuickFixTestCase
-{
-public:
-    QuickFixOfferedOperationsTest(const QList<TestDocumentPtr> &testDocuments,
-                                  CppQuickFixFactory *factory,
-                                  const ProjectExplorer::HeaderPaths &headerPaths
-                                    = ProjectExplorer::HeaderPaths(),
-                                  const QStringList &expectedOperations = QStringList());
-};
-
-QList<TestDocumentPtr> singleDocument(const QByteArray &original,
-                                                const QByteArray &expected)
-{
-    return {CppTestDocument::create("file.cpp", original, expected)};
-}
-
-BaseQuickFixTestCase::BaseQuickFixTestCase(const QList<TestDocumentPtr> &testDocuments,
-                                           const ProjectExplorer::HeaderPaths &headerPaths,
-                                           const QByteArray &clangFormatSettings)
-    : m_testDocuments(testDocuments)
-    , m_cppCodeStylePreferences(0)
-    , m_restoreHeaderPaths(false)
-{
-    QVERIFY(succeededSoFar());
-    m_succeededSoFar = false;
-
-    // Check if there is exactly one cursor marker
-    unsigned cursorMarkersCount = 0;
-    for (const TestDocumentPtr &document : std::as_const(m_testDocuments)) {
-        if (document->hasCursorMarker())
-            ++cursorMarkersCount;
-    }
-    QVERIFY2(cursorMarkersCount == 1, "Exactly one cursor marker is allowed.");
-
-    // Write documents to disk
-    m_temporaryDirectory.reset(new TemporaryDir);
-    QVERIFY(m_temporaryDirectory->isValid());
-    for (const TestDocumentPtr &document : std::as_const(m_testDocuments)) {
-        if (QFileInfo(document->m_fileName).isRelative())
-            document->setBaseDirectory(m_temporaryDirectory->path());
-        document->writeToDisk();
-    }
-
-    // Create .clang-format file
-    if (!clangFormatSettings.isEmpty())
-        m_temporaryDirectory->createFile(".clang-format", clangFormatSettings);
-
-    // Set appropriate include paths
-    if (!headerPaths.isEmpty()) {
-        m_restoreHeaderPaths = true;
-        m_headerPathsToRestore = CppModelManager::headerPaths();
-        CppModelManager::setHeaderPaths(headerPaths);
-    }
-
-    // Update Code Model
-    QSet<FilePath> filePaths;
-    for (const TestDocumentPtr &document : std::as_const(m_testDocuments))
-        filePaths << document->filePath();
-    QVERIFY(parseFiles(filePaths));
-
-    // Open Files
-    for (const TestDocumentPtr &document : std::as_const(m_testDocuments)) {
-        QVERIFY(openCppEditor(document->filePath(), &document->m_editor,
-                              &document->m_editorWidget));
-        closeEditorAtEndOfTestCase(document->m_editor);
-
-        // Set cursor position
-        if (document->hasCursorMarker()) {
-            if (document->hasAnchorMarker()) {
-                document->m_editor->setCursorPosition(document->m_anchorPosition);
-                document->m_editor->select(document->m_cursorPosition);
-            } else {
-                document->m_editor->setCursorPosition(document->m_cursorPosition);
-            }
-        } else {
-            document->m_editor->setCursorPosition(0);
-        }
-
-        // Rehighlight
-        waitForRehighlightedSemanticDocument(document->m_editorWidget);
-    }
-
-    // Enforce the default cpp code style, so we are independent of config file settings.
-    // This is needed by e.g. the GenerateGetterSetter quick fix.
-    m_cppCodeStylePreferences = CppToolsSettings::cppCodeStyle();
-    QVERIFY(m_cppCodeStylePreferences);
-    m_cppCodeStylePreferencesOriginalDelegateId = m_cppCodeStylePreferences->currentDelegateId();
-    m_cppCodeStylePreferences->setCurrentDelegate("qt");
-
-    // Find the document having the cursor marker
-    for (const TestDocumentPtr &document : std::as_const(m_testDocuments)) {
-        if (document->hasCursorMarker()){
-            m_documentWithMarker = document;
-            break;
-        }
-    }
-
-    QVERIFY(m_documentWithMarker);
-    m_succeededSoFar = true;
-}
-
-BaseQuickFixTestCase::~BaseQuickFixTestCase()
-{
-    // Restore default cpp code style
-    if (m_cppCodeStylePreferences)
-        m_cppCodeStylePreferences->setCurrentDelegate(m_cppCodeStylePreferencesOriginalDelegateId);
-
-    // Restore include paths
-    if (m_restoreHeaderPaths)
-        CppModelManager::setHeaderPaths(m_headerPathsToRestore);
-
-    // Remove created files from file system
-    for (const TestDocumentPtr &testDocument : std::as_const(m_testDocuments))
-        QVERIFY(testDocument->filePath().removeFile());
-}
-
-/// Leading whitespace is not removed, so we can check if the indetation ranges
-/// have been set correctly by the quick-fix.
-static QString &removeTrailingWhitespace(QString &input)
-{
-    const QStringList lines = input.split(QLatin1Char('\n'));
-    input.resize(0);
-    for (int i = 0, total = lines.size(); i < total; ++i) {
-        QString line = lines.at(i);
-        while (line.length() > 0) {
-            QChar lastChar = line[line.length() - 1];
-            if (lastChar == QLatin1Char(' ') || lastChar == QLatin1Char('\t'))
-                line.chop(1);
-            else
-                break;
-        }
-        input.append(line);
-
-        const bool isLastLine = i == lines.size() - 1;
-        if (!isLastLine)
-            input.append(QLatin1Char('\n'));
-    }
-    return input;
-}
-
-QuickFixOperationTest::QuickFixOperationTest(const QList<TestDocumentPtr> &testDocuments,
-                                             CppQuickFixFactory *factory,
-                                             const ProjectExplorer::HeaderPaths &headerPaths,
-                                             int operationIndex,
-                                             const QByteArray &expectedFailMessage,
-                                             const QByteArray &clangFormatSettings)
-    : BaseQuickFixTestCase(testDocuments, headerPaths, clangFormatSettings)
-{
-    if (factory->hasClangdReplacement() && CppModelManager::isClangCodeModelActive())
-        return;
-
-    QVERIFY(succeededSoFar());
-
-    // Perform operation if there is one
-    CppQuickFixInterface quickFixInterface(m_documentWithMarker->m_editorWidget, ExplicitlyInvoked);
-    QuickFixOperations operations;
-    factory->match(quickFixInterface, operations);
-    if (operations.isEmpty()) {
-        QEXPECT_FAIL("CompleteSwitchCaseStatement_QTCREATORBUG-25998", "FIXME", Abort);
-        QVERIFY(testDocuments.first()->m_expectedSource.isEmpty());
-        return;
-    }
-
-    QVERIFY(operationIndex < operations.size());
-    const QuickFixOperation::Ptr operation = operations.at(operationIndex);
-    operation->perform();
-
-    // Compare all files
-    for (const TestDocumentPtr &testDocument : std::as_const(m_testDocuments)) {
-        // Check
-        QString result = testDocument->m_editorWidget->document()->toPlainText();
-        removeTrailingWhitespace(result);
-        QEXPECT_FAIL("escape string literal: raw string literal", "FIXME", Continue);
-        QEXPECT_FAIL("escape string literal: unescape adjacent literals", "FIXME", Continue);
-        if (!expectedFailMessage.isEmpty())
-            QEXPECT_FAIL("", expectedFailMessage.data(), Continue);
-        else if (result != testDocument->m_expectedSource) {
-            qDebug() << "---" << testDocument->m_expectedSource;
-            qDebug() << "+++" << result;
-        }
-        QCOMPARE(result, testDocument->m_expectedSource);
-
-        // Undo the change
-        for (int i = 0; i < 100; ++i)
-            testDocument->m_editorWidget->undo();
-        result = testDocument->m_editorWidget->document()->toPlainText();
-        QCOMPARE(result, testDocument->m_source);
-    }
-}
-
-void QuickFixOperationTest::run(const QList<TestDocumentPtr> &testDocuments,
-                                CppQuickFixFactory *factory,
-                                const QString &headerPath,
-                                int operationIndex)
-{
-    ProjectExplorer::HeaderPaths headerPaths;
-    headerPaths.push_back(ProjectExplorer::HeaderPath::makeUser(headerPath));
-    QuickFixOperationTest(testDocuments, factory, headerPaths, operationIndex);
-}
-
-QuickFixOfferedOperationsTest::QuickFixOfferedOperationsTest(
-        const QList<TestDocumentPtr> &testDocuments,
-        CppQuickFixFactory *factory,
-        const ProjectExplorer::HeaderPaths &headerPaths,
-        const QStringList &expectedOperations)
-    : BaseQuickFixTestCase(testDocuments, headerPaths)
-{
-    // Get operations
-    CppQuickFixInterface quickFixInterface(m_documentWithMarker->m_editorWidget, ExplicitlyInvoked);
-    QuickFixOperations actualOperations;
-    factory->match(quickFixInterface, actualOperations);
-
-    // Convert to QStringList
-    QStringList actualOperationsAsStringList;
-    for (const QuickFixOperation::Ptr &operation : std::as_const(actualOperations))
-        actualOperationsAsStringList << operation->description();
-
-    QCOMPARE(actualOperationsAsStringList, expectedOperations);
-}
-
-/// Delegates directly to AddIncludeForUndefinedIdentifierOp for easier testing.
-class AddIncludeForUndefinedIdentifierTestFactory : public CppQuickFixFactory
-{
-public:
-    AddIncludeForUndefinedIdentifierTestFactory(const QString &include)
-        : m_include(include) {}
-
-    void doMatch(const CppQuickFixInterface &cppQuickFixInterface, QuickFixOperations &result) override
-    {
-        result << new AddIncludeForUndefinedIdentifierOp(cppQuickFixInterface, 0, m_include);
-    }
-
-private:
-    const QString m_include;
-};
-
-class AddForwardDeclForUndefinedIdentifierTestFactory : public CppQuickFixFactory
-{
-public:
-    AddForwardDeclForUndefinedIdentifierTestFactory(const QString &className, int symbolPos)
-        : m_className(className), m_symbolPos(symbolPos) {}
-
-    void doMatch(const CppQuickFixInterface &cppQuickFixInterface, QuickFixOperations &result) override
-    {
-        result << new AddForwardDeclForUndefinedIdentifierOp(cppQuickFixInterface, 0,
-                                                             m_className, m_symbolPos);
-    }
-
-private:
-    const QString m_className;
-    const int m_symbolPos;
-};
-
-} // namespace Tests
-} // namespace Internal
-
-typedef QSharedPointer<CppQuickFixFactory> CppQuickFixFactoryPtr;
-
-} // namespace CppEditor
-
-namespace CppEditor::Internal::Tests {
-
-class QuickFixSettings
-{
-    const CppQuickFixSettings original = *CppQuickFixSettings::instance();
-
-public:
-    CppQuickFixSettings *operator->() { return CppQuickFixSettings::instance(); }
-    ~QuickFixSettings() { *CppQuickFixSettings::instance() = original; }
-};
-
-void QuickfixTest::testGeneric_data()
-{
-    QTest::addColumn<CppQuickFixFactoryPtr>("factory");
-    QTest::addColumn<QByteArray>("original");
-    QTest::addColumn<QByteArray>("expected");
-
-    // Checks: All enum values are added as case statements for a blank switch.
-    QTest::newRow("CompleteSwitchCaseStatement_basic1")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "enum EnumType { V1, V2 };\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    EnumType t;\n"
-        "    @switch (t) {\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        "enum EnumType { V1, V2 };\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    EnumType t;\n"
-        "    switch (t) {\n"
-        "    case V1:\n"
-        "        break;\n"
-        "    case V2:\n"
-        "        break;\n"
-        "    }\n"
-        "}\n"
-    );
-
-    // Same as above for enum class.
-    QTest::newRow("CompleteSwitchCaseStatement_basic1_enum class")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "enum class EnumType { V1, V2 };\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    EnumType t;\n"
-        "    @switch (t) {\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        "enum class EnumType { V1, V2 };\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    EnumType t;\n"
-        "    switch (t) {\n"
-        "    case EnumType::V1:\n"
-        "        break;\n"
-        "    case EnumType::V2:\n"
-        "        break;\n"
-        "    }\n"
-        "}\n"
-    );
-
-    // Same as above with the cursor somewhere in the body.
-    QTest::newRow("CompleteSwitchCaseStatement_basic1_enum class, cursor in the body")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "enum class EnumType { V1, V2 };\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    EnumType t;\n"
-        "    switch (t) {\n"
-        "    @}\n"
-        "}\n"
-        ) << _(
-        "enum class EnumType { V1, V2 };\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    EnumType t;\n"
-        "    switch (t) {\n"
-        "    case EnumType::V1:\n"
-        "        break;\n"
-        "    case EnumType::V2:\n"
-        "        break;\n"
-        "    }\n"
-        "}\n"
-    );
-
-    // Checks: All enum values are added as case statements for a blank switch when
-    //         the variable is declared alongside the enum definition.
-    QTest::newRow("CompleteSwitchCaseStatement_basic1_enum_with_declaration")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "enum EnumType { V1, V2 } t;\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    @switch (t) {\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        "enum EnumType { V1, V2 } t;\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    switch (t) {\n"
-        "    case V1:\n"
-        "        break;\n"
-        "    case V2:\n"
-        "        break;\n"
-        "    }\n"
-        "}\n"
-    );
-
-    // Same as above for enum class.
-    QTest::newRow("CompleteSwitchCaseStatement_basic1_enum_with_declaration_enumClass")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "enum class EnumType { V1, V2 } t;\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    @switch (t) {\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        "enum class EnumType { V1, V2 } t;\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    switch (t) {\n"
-        "    case EnumType::V1:\n"
-        "        break;\n"
-        "    case EnumType::V2:\n"
-        "        break;\n"
-        "    }\n"
-        "}\n"
-    );
-
-    // Checks: All enum values are added as case statements for a blank switch
-    //         for anonymous enums.
-    QTest::newRow("CompleteSwitchCaseStatement_basic1_anonymous_enum")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "enum { V1, V2 } t;\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    @switch (t) {\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        "enum { V1, V2 } t;\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    switch (t) {\n"
-        "    case V1:\n"
-        "        break;\n"
-        "    case V2:\n"
-        "        break;\n"
-        "    }\n"
-        "}\n"
-    );
-
-    // Checks: All enum values are added as case statements for a blank switch with a default case.
-    QTest::newRow("CompleteSwitchCaseStatement_basic2")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "enum EnumType { V1, V2 };\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    EnumType t;\n"
-        "    @switch (t) {\n"
-        "    default:\n"
-        "    break;\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        "enum EnumType { V1, V2 };\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    EnumType t;\n"
-        "    switch (t) {\n"
-        "    case V1:\n"
-        "        break;\n"
-        "    case V2:\n"
-        "        break;\n"
-        "    default:\n"
-        "    break;\n"
-        "    }\n"
-        "}\n"
-    );
-
-    // Same as above for enum class.
-    QTest::newRow("CompleteSwitchCaseStatement_basic2_enumClass")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "enum class EnumType { V1, V2 };\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    EnumType t;\n"
-        "    @switch (t) {\n"
-        "    default:\n"
-        "    break;\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        "enum class EnumType { V1, V2 };\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    EnumType t;\n"
-        "    switch (t) {\n"
-        "    case EnumType::V1:\n"
-        "        break;\n"
-        "    case EnumType::V2:\n"
-        "        break;\n"
-        "    default:\n"
-        "    break;\n"
-        "    }\n"
-        "}\n"
-    );
-
-    // Checks: Enum type in class is found.
-    QTest::newRow("CompleteSwitchCaseStatement_enumTypeInClass")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "struct C { enum EnumType { V1, V2 }; };\n"
-        "\n"
-        "void f(C::EnumType t) {\n"
-        "    @switch (t) {\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        "struct C { enum EnumType { V1, V2 }; };\n"
-        "\n"
-        "void f(C::EnumType t) {\n"
-        "    switch (t) {\n"
-        "    case C::V1:\n"
-        "        break;\n"
-        "    case C::V2:\n"
-        "        break;\n"
-        "    }\n"
-        "}\n"
-    );
-
-    // Same as above for enum class.
-    QTest::newRow("CompleteSwitchCaseStatement_enumClassInClass")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "struct C { enum class EnumType { V1, V2 }; };\n"
-        "\n"
-        "void f(C::EnumType t) {\n"
-        "    @switch (t) {\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        "struct C { enum class EnumType { V1, V2 }; };\n"
-        "\n"
-        "void f(C::EnumType t) {\n"
-        "    switch (t) {\n"
-        "    case C::EnumType::V1:\n"
-        "        break;\n"
-        "    case C::EnumType::V2:\n"
-        "        break;\n"
-        "    }\n"
-        "}\n"
-    );
-
-    // Checks: Enum type in namespace is found.
-    QTest::newRow("CompleteSwitchCaseStatement_enumTypeInNamespace")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "namespace N { enum EnumType { V1, V2 }; };\n"
-        "\n"
-        "void f(N::EnumType t) {\n"
-        "    @switch (t) {\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        "namespace N { enum EnumType { V1, V2 }; };\n"
-        "\n"
-        "void f(N::EnumType t) {\n"
-        "    switch (t) {\n"
-        "    case N::V1:\n"
-        "        break;\n"
-        "    case N::V2:\n"
-        "        break;\n"
-        "    }\n"
-        "}\n"
-    );
-
-    // Same as above for enum class.
-    QTest::newRow("CompleteSwitchCaseStatement_enumClassInNamespace")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "namespace N { enum class EnumType { V1, V2 }; };\n"
-        "\n"
-        "void f(N::EnumType t) {\n"
-        "    @switch (t) {\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        "namespace N { enum class EnumType { V1, V2 }; };\n"
-        "\n"
-        "void f(N::EnumType t) {\n"
-        "    switch (t) {\n"
-        "    case N::EnumType::V1:\n"
-        "        break;\n"
-        "    case N::EnumType::V2:\n"
-        "        break;\n"
-        "    }\n"
-        "}\n"
-    );
-
-    // Checks: The missing enum value is added.
-    QTest::newRow("CompleteSwitchCaseStatement_oneValueMissing")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "enum EnumType { V1, V2 };\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    EnumType t;\n"
-        "    @switch (t) {\n"
-        "    case V2:\n"
-        "        break;\n"
-        "    default:\n"
-        "        break;\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        "enum EnumType { V1, V2 };\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    EnumType t;\n"
-        "    switch (t) {\n"
-        "    case V1:\n"
-        "        break;\n"
-        "    case V2:\n"
-        "        break;\n"
-        "    default:\n"
-        "        break;\n"
-        "    }\n"
-        "}\n"
-    );
-
-    // Checks: Same as above for enum class.
-    QTest::newRow("CompleteSwitchCaseStatement_oneValueMissing_enumClass")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "enum class EnumType { V1, V2 };\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    EnumType t;\n"
-        "    @switch (t) {\n"
-        "    case EnumType::V2:\n"
-        "        break;\n"
-        "    default:\n"
-        "        break;\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        "enum class EnumType { V1, V2 };\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    EnumType t;\n"
-        "    switch (t) {\n"
-        "    case EnumType::V1:\n"
-        "        break;\n"
-        "    case EnumType::V2:\n"
-        "        break;\n"
-        "    default:\n"
-        "        break;\n"
-        "    }\n"
-        "}\n"
-    );
-
-    // Checks: Find the correct enum type despite there being a declaration with the same name.
-    QTest::newRow("CompleteSwitchCaseStatement_QTCREATORBUG10366_1")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "enum test { TEST_1, TEST_2 };\n"
-        "\n"
-        "void f() {\n"
-        "    enum test test;\n"
-        "    @switch (test) {\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        "enum test { TEST_1, TEST_2 };\n"
-        "\n"
-        "void f() {\n"
-        "    enum test test;\n"
-        "    switch (test) {\n"
-        "    case TEST_1:\n"
-        "        break;\n"
-        "    case TEST_2:\n"
-        "        break;\n"
-        "    }\n"
-        "}\n"
-    );
-
-    // Same as above for enum class.
-    QTest::newRow("CompleteSwitchCaseStatement_QTCREATORBUG10366_1_enumClass")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "enum class test { TEST_1, TEST_2 };\n"
-        "\n"
-        "void f() {\n"
-        "    enum test test;\n"
-        "    @switch (test) {\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        "enum class test { TEST_1, TEST_2 };\n"
-        "\n"
-        "void f() {\n"
-        "    enum test test;\n"
-        "    switch (test) {\n"
-        "    case test::TEST_1:\n"
-        "        break;\n"
-        "    case test::TEST_2:\n"
-        "        break;\n"
-        "    }\n"
-        "}\n"
-    );
-
-    // Checks: Find the correct enum type despite there being a declaration with the same name.
-    QTest::newRow("CompleteSwitchCaseStatement_QTCREATORBUG10366_2")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "enum test1 { Wrong11, Wrong12 };\n"
-        "enum test { Right1, Right2 };\n"
-        "enum test2 { Wrong21, Wrong22 };\n"
-        "\n"
-        "int main() {\n"
-        "    enum test test;\n"
-        "    @switch (test) {\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        "enum test1 { Wrong11, Wrong12 };\n"
-        "enum test { Right1, Right2 };\n"
-        "enum test2 { Wrong21, Wrong22 };\n"
-        "\n"
-        "int main() {\n"
-        "    enum test test;\n"
-        "    switch (test) {\n"
-        "    case Right1:\n"
-        "        break;\n"
-        "    case Right2:\n"
-        "        break;\n"
-        "    }\n"
-        "}\n"
-    );
-
-    // Same as above for enum class.
-    QTest::newRow("CompleteSwitchCaseStatement_QTCREATORBUG10366_2_enumClass")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "enum class test1 { Wrong11, Wrong12 };\n"
-        "enum class test { Right1, Right2 };\n"
-        "enum class test2 { Wrong21, Wrong22 };\n"
-        "\n"
-        "int main() {\n"
-        "    enum test test;\n"
-        "    @switch (test) {\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        "enum class test1 { Wrong11, Wrong12 };\n"
-        "enum class test { Right1, Right2 };\n"
-        "enum class test2 { Wrong21, Wrong22 };\n"
-        "\n"
-        "int main() {\n"
-        "    enum test test;\n"
-        "    switch (test) {\n"
-        "    case test::Right1:\n"
-        "        break;\n"
-        "    case test::Right2:\n"
-        "        break;\n"
-        "    }\n"
-        "}\n"
-    );
-
-    // Checks: Do not crash on incomplete case statetement.
-    QTest::newRow("CompleteSwitchCaseStatement_doNotCrashOnIncompleteCase")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "enum E {};\n"
-        "void f(E o)\n"
-        "{\n"
-        "    @switch (o)\n"
-        "    {\n"
-        "    case\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        ""
-    );
-
-    // Same as above for enum class.
-    QTest::newRow("CompleteSwitchCaseStatement_doNotCrashOnIncompleteCase_enumClass")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "enum class E {};\n"
-        "void f(E o)\n"
-        "{\n"
-        "    @switch (o)\n"
-        "    {\n"
-        "    case\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        ""
-    );
-
-    // Checks: complete switch statement where enum is goes via a template type parameter
-    QTest::newRow("CompleteSwitchCaseStatement_QTCREATORBUG-24752")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "enum E {EA, EB};\n"
-        "template<typename T> struct S {\n"
-        "    static T theType() { return T(); }\n"
-        "};\n"
-        "int main() {\n"
-        "    @switch (S<E>::theType()) {\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        "enum E {EA, EB};\n"
-        "template<typename T> struct S {\n"
-        "    static T theType() { return T(); }\n"
-        "};\n"
-        "int main() {\n"
-        "    switch (S<E>::theType()) {\n"
-        "    case EA:\n"
-        "        break;\n"
-        "    case EB:\n"
-        "        break;\n"
-        "    }\n"
-        "}\n"
-    );
-
-    // Same as above for enum class.
-    QTest::newRow("CompleteSwitchCaseStatement_QTCREATORBUG-24752_enumClass")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "enum class E {A, B};\n"
-        "template<typename T> struct S {\n"
-        "    static T theType() { return T(); }\n"
-        "};\n"
-        "int main() {\n"
-        "    @switch (S<E>::theType()) {\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        "enum class E {A, B};\n"
-        "template<typename T> struct S {\n"
-        "    static T theType() { return T(); }\n"
-        "};\n"
-        "int main() {\n"
-        "    switch (S<E>::theType()) {\n"
-        "    case E::A:\n"
-        "        break;\n"
-        "    case E::B:\n"
-        "        break;\n"
-        "    }\n"
-        "}\n"
-    );
-
-    // Checks: Complete switch statement where enum is return type of a template function
-    //         which is outside the scope of the return value.
-    // TODO: Type minimization.
-    QTest::newRow("CompleteSwitchCaseStatement_QTCREATORBUG-25998")
-        << CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
-        "template <typename T> T enumCast(int value) { return static_cast<T>(value); }\n"
-        "class Test {\n"
-        "    enum class E { V1, V2 };"
-        "    void func(int i) {\n"
-        "        @switch (enumCast<E>(i)) {\n"
-        "        }\n"
-        "    }\n"
-        "};\n"
-        ) << _(
-        "template <typename T> T enumCast(int value) { return static_cast<T>(value); }\n"
-        "class Test {\n"
-        "    enum class E { V1, V2 };"
-        "    void func(int i) {\n"
-        "        switch (enumCast<E>(i)) {\n"
-        "        case Test::E::V1:\n"
-        "            break;\n"
-        "        case Test::E::V2:\n"
-        "            break;\n"
-        "        }\n"
-        "    }\n"
-        "};\n"
-    );
-
-    // Checks: No special treatment for reference to non const.
-
-    // Check: Quick fix is not triggered on a member function.
-    QTest::newRow("GenerateGetterSetter_notTriggeringOnMemberFunction")
-        << CppQuickFixFactoryPtr(new GenerateGetterSetter)
-        << _("class Something { void @f(); };\n") << _();
-
-    // Check: Quick fix is not triggered on an member array;
-    QTest::newRow("GenerateGetterSetter_notTriggeringOnMemberArray")
-        << CppQuickFixFactoryPtr(new GenerateGetterSetter)
-        << _("class Something { void @a[10]; };\n") << _();
-
-    QTest::newRow("MoveDeclarationOutOfIf_ifOnly")
-        << CppQuickFixFactoryPtr(new MoveDeclarationOutOfIf) << _(
-        "void f()\n"
-        "{\n"
-        "    if (Foo *@foo = g())\n"
-        "        h();\n"
-        "}\n"
-        ) << _(
-        "void f()\n"
-        "{\n"
-        "    Foo *foo = g();\n"
-        "    if (foo)\n"
-        "        h();\n"
-        "}\n"
-    );
-
-    QTest::newRow("MoveDeclarationOutOfIf_ifElse")
-        << CppQuickFixFactoryPtr(new MoveDeclarationOutOfIf) << _(
-        "void f()\n"
-        "{\n"
-        "    if (Foo *@foo = g())\n"
-        "        h();\n"
-        "    else\n"
-        "        i();\n"
-        "}\n"
-        ) << _(
-        "void f()\n"
-        "{\n"
-        "    Foo *foo = g();\n"
-        "    if (foo)\n"
-        "        h();\n"
-        "    else\n"
-        "        i();\n"
-        "}\n"
-    );
-
-    QTest::newRow("MoveDeclarationOutOfIf_ifElseIf")
-        << CppQuickFixFactoryPtr(new MoveDeclarationOutOfIf) << _(
-        "void f()\n"
-        "{\n"
-        "    if (Foo *foo = g()) {\n"
-        "        if (Bar *@bar = x()) {\n"
-        "            h();\n"
-        "            j();\n"
-        "        }\n"
-        "    } else {\n"
-        "        i();\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        "void f()\n"
-        "{\n"
-        "    if (Foo *foo = g()) {\n"
-        "        Bar *bar = x();\n"
-        "        if (bar) {\n"
-        "            h();\n"
-        "            j();\n"
-        "        }\n"
-        "    } else {\n"
-        "        i();\n"
-        "    }\n"
-        "}\n"
-    );
-
-    QTest::newRow("MoveDeclarationOutOfWhile_singleWhile")
-        << CppQuickFixFactoryPtr(new MoveDeclarationOutOfWhile) << _(
-        "void f()\n"
-        "{\n"
-        "    while (Foo *@foo = g())\n"
-        "        j();\n"
-        "}\n"
-        ) << _(
-        "void f()\n"
-        "{\n"
-        "    Foo *foo;\n"
-        "    while ((foo = g()) != 0)\n"
-        "        j();\n"
-        "}\n"
-    );
-
-    QTest::newRow("MoveDeclarationOutOfWhile_whileInWhile")
-        << CppQuickFixFactoryPtr(new MoveDeclarationOutOfWhile) << _(
-        "void f()\n"
-        "{\n"
-        "    while (Foo *foo = g()) {\n"
-        "        while (Bar *@bar = h()) {\n"
-        "            i();\n"
-        "            j();\n"
-        "        }\n"
-        "    }\n"
-        "}\n"
-        ) << _(
-        "void f()\n"
-        "{\n"
-        "    while (Foo *foo = g()) {\n"
-        "        Bar *bar;\n"
-        "        while ((bar = h()) != 0) {\n"
-        "            i();\n"
-        "            j();\n"
-        "        }\n"
-        "    }\n"
-        "}\n"
-    );
-
-    // Check: Just a basic test since the main functionality is tested in
-    // cpppointerdeclarationformatter_test.cpp
-    QTest::newRow("ReformatPointerDeclaration")
-        << CppQuickFixFactoryPtr(new ReformatPointerDeclaration)
-        << _("char@*s;")
-        << _("char *s;");
-
-    // Check from source file: If there is no header file, insert the definition after the class.
-    QByteArray original =
-        "struct Foo\n"
-        "{\n"
-        "    Foo();@\n"
-        "};\n";
-
-    QTest::newRow("InsertDefFromDecl_basic")
-        << CppQuickFixFactoryPtr(new InsertDefFromDecl) << original
-           << original + _(
-        "\n"
-        "Foo::Foo()\n"
-        "{\n\n"
-        "}\n"
-    );
-
-    QTest::newRow("InsertDefFromDecl_freeFunction")
-        << CppQuickFixFactoryPtr(new InsertDefFromDecl)
-        << _("void free()@;\n")
-        << _(
-        "void free()\n"
-        "{\n\n"
-        "}\n"
-    );
-
-    // Check not triggering when it is a statement
-    QTest::newRow("InsertDefFromDecl_notTriggeringStatement")
-        << CppQuickFixFactoryPtr(new InsertDefFromDecl) << _(
-            "class Foo {\n"
-            "public:\n"
-            "    Foo() {}\n"
-            "};\n"
-            "void freeFunc() {\n"
-            "    Foo @f();"
-            "}\n"
-        ) << _();
-
-    // Check: Add local variable for a free function.
-    QTest::newRow("AssignToLocalVariable_freeFunction")
-        << CppQuickFixFactoryPtr(new AssignToLocalVariable) << _(
-        "int foo() {return 1;}\n"
-        "void bar() {fo@o();}\n"
-        ) << _(
-        "int foo() {return 1;}\n"
-        "void bar() {auto localFoo = foo();}\n"
-    );
-
-    // Check: Add local variable for a member function.
-    QTest::newRow("AssignToLocalVariable_memberFunction")
-        << CppQuickFixFactoryPtr(new AssignToLocalVariable) << _(
-        "class Foo {public: int* fooFunc();}\n"
-        "void bar() {\n"
-        "    Foo *f = new Foo;\n"
-        "    @f->fooFunc();\n"
-        "}\n"
-        ) << _(
-        "class Foo {public: int* fooFunc();}\n"
-        "void bar() {\n"
-        "    Foo *f = new Foo;\n"
-        "    auto localFooFunc = f->fooFunc();\n"
-        "}\n"
-    );
-
-    // Check: Add local variable for a member function, cursor in the middle (QTCREATORBUG-10355)
-    QTest::newRow("AssignToLocalVariable_memberFunction2ndGrade1")
-        << CppQuickFixFactoryPtr(new AssignToLocalVariable) << _(
-        "struct Foo {int* func();};\n"
-        "struct Baz {Foo* foo();};\n"
-        "void bar() {\n"
-        "    Baz *b = new Baz;\n"
-        "    b->foo@()->func();\n"
-        "}"
-        ) << _(
-        "struct Foo {int* func();};\n"
-        "struct Baz {Foo* foo();};\n"
-        "void bar() {\n"
-        "    Baz *b = new Baz;\n"
-        "    auto localFunc = b->foo()->func();\n"
-        "}"
-    );
-
-    // Check: Add local variable for a member function, cursor on function call (QTCREATORBUG-10355)
-    QTest::newRow("AssignToLocalVariable_memberFunction2ndGrade2")
-        << CppQuickFixFactoryPtr(new AssignToLocalVariable) << _(
-        "struct Foo {int* func();};\n"
-        "struct Baz {Foo* foo();};\n"
-        "void bar() {\n"
-        "    Baz *b = new Baz;\n"
-        "    b->foo()->f@unc();\n"
-        "}"
-        ) << _(
-        "struct Foo {int* func();};\n"
-        "struct Baz {Foo* foo();};\n"
-        "void bar() {\n"
-        "    Baz *b = new Baz;\n"
-        "    auto localFunc = b->foo()->func();\n"
-        "}"
-    );
-
-    // Check: Add local variable for a static member function.
-    QTest::newRow("AssignToLocalVariable_staticMemberFunction")
-        << CppQuickFixFactoryPtr(new AssignToLocalVariable) << _(
-        "class Foo {public: static int* fooFunc();}\n"
-        "void bar() {\n"
-        "    Foo::fooF@unc();\n"
-        "}"
-        ) << _(
-        "class Foo {public: static int* fooFunc();}\n"
-        "void bar() {\n"
-        "    auto localFooFunc = Foo::fooFunc();\n"
-        "}"
-    );
-
-    // Check: Add local variable for a new Expression.
-    QTest::newRow("AssignToLocalVariable_newExpression")
-        << CppQuickFixFactoryPtr(new AssignToLocalVariable) << _(
-        "class Foo {}\n"
-        "void bar() {\n"
-        "    new Fo@o;\n"
-        "}"
-        ) << _(
-        "class Foo {}\n"
-        "void bar() {\n"
-        "    auto localFoo = new Foo;\n"
-        "}"
-    );
-
-    // Check: No trigger for function inside member initialization list.
-    QTest::newRow("AssignToLocalVariable_noInitializationList")
-        << CppQuickFixFactoryPtr(new AssignToLocalVariable) << _(
-        "class Foo\n"
-        "{\n"
-        "    public: Foo : m_i(fooF@unc()) {}\n"
-        "    int fooFunc() {return 2;}\n"
-        "    int m_i;\n"
-        "};\n"
-        ) << _();
-
-    // Check: No trigger for void functions.
-    QTest::newRow("AssignToLocalVariable_noVoidFunction")
-        << CppQuickFixFactoryPtr(new AssignToLocalVariable) << _(
-        "void foo() {}\n"
-        "void bar() {fo@o();}"
-        ) << _();
-
-    // Check: No trigger for void member functions.
-    QTest::newRow("AssignToLocalVariable_noVoidMemberFunction")
-        << CppQuickFixFactoryPtr(new AssignToLocalVariable) << _(
-        "class Foo {public: void fooFunc();}\n"
-        "void bar() {\n"
-        "    Foo *f = new Foo;\n"
-        "    @f->fooFunc();\n"
-        "}"
-        ) << _();
-
-    // Check: No trigger for void static member functions.
-    QTest::newRow("AssignToLocalVariable_noVoidStaticMemberFunction")
-        << CppQuickFixFactoryPtr(new AssignToLocalVariable) << _(
-        "class Foo {public: static void fooFunc();}\n"
-        "void bar() {\n"
-        "    Foo::fo@oFunc();\n"
-        "}"
-        ) << _();
-
-    // Check: No trigger for functions in expressions.
-    QTest::newRow("AssignToLocalVariable_noFunctionInExpression")
-        << CppQuickFixFactoryPtr(new AssignToLocalVariable) << _(
-        "int foo(int a) {return a;}\n"
-        "int bar() {return 1;}"
-        "void baz() {foo(@bar() + bar());}"
-        ) << _();
-
-    // Check: No trigger for functions in functions. (QTCREATORBUG-9510)
-    QTest::newRow("AssignToLocalVariable_noFunctionInFunction")
-        << CppQuickFixFactoryPtr(new AssignToLocalVariable) << _(
-        "int foo(int a, int b) {return a + b;}\n"
-        "int bar(int a) {return a;}\n"
-        "void baz() {\n"
-        "    int a = foo(ba@r(), bar());\n"
-        "}\n"
-        ) << _();
-
-    // Check: No trigger for functions in return statements (classes).
-    QTest::newRow("AssignToLocalVariable_noReturnClass1")
-        << CppQuickFixFactoryPtr(new AssignToLocalVariable) << _(
-        "class Foo {public: static void fooFunc();}\n"
-        "Foo* bar() {\n"
-        "    return new Fo@o;\n"
-        "}"
-        ) << _();
-
-    // Check: No trigger for functions in return statements (classes). (QTCREATORBUG-9525)
-    QTest::newRow("AssignToLocalVariable_noReturnClass2")
-        << CppQuickFixFactoryPtr(new AssignToLocalVariable) << _(
-        "class Foo {public: int fooFunc();}\n"
-        "int bar() {\n"
-        "    return (new Fo@o)->fooFunc();\n"
-        "}"
-        ) << _();
-
-    // Check: No trigger for functions in return statements (functions).
-    QTest::newRow("AssignToLocalVariable_noReturnFunc1")
-        << CppQuickFixFactoryPtr(new AssignToLocalVariable) << _(
-        "class Foo {public: int fooFunc();}\n"
-        "int bar() {\n"
-        "    return Foo::fooFu@nc();\n"
-        "}"
-        ) << _();
-
-    // Check: No trigger for functions in return statements (functions). (QTCREATORBUG-9525)
-    QTest::newRow("AssignToLocalVariable_noReturnFunc2")
-        << CppQuickFixFactoryPtr(new AssignToLocalVariable) << _(
-        "int bar() {\n"
-        "    return list.firs@t().foo;\n"
-        "}\n"
-        ) << _();
-
-    // Check: No trigger for functions which does not match in signature.
-    QTest::newRow("AssignToLocalVariable_noSignatureMatch")
-        << CppQuickFixFactoryPtr(new AssignToLocalVariable) << _(
-        "int someFunc(int);\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    some@Func();\n"
-        "}"
-        ) << _();
-
-    QTest::newRow("ExtractLiteralAsParameter_freeFunction")
-        << CppQuickFixFactoryPtr(new ExtractLiteralAsParameter) << _(
-        "void foo(const char *a, long b = 1)\n"
-        "{return 1@56 + 123 + 156;}\n"
-        ) << _(
-        "void foo(const char *a, long b = 1, int newParameter = 156)\n"
-        "{return newParameter + 123 + newParameter;}\n"
-    );
-
-    QTest::newRow("ExtractLiteralAsParameter_memberFunction")
-        << CppQuickFixFactoryPtr(new ExtractLiteralAsParameter) << _(
-        "class Narf {\n"
-        "public:\n"
-        "    int zort();\n"
-        "};\n\n"
-        "int Narf::zort()\n"
-        "{ return 15@5 + 1; }\n"
-        ) << _(
-        "class Narf {\n"
-        "public:\n"
-        "    int zort(int newParameter = 155);\n"
-        "};\n\n"
-        "int Narf::zort(int newParameter)\n"
-        "{ return newParameter + 1; }\n"
-    );
-
-    QTest::newRow("ExtractLiteralAsParameter_memberFunctionInline")
-        << CppQuickFixFactoryPtr(new ExtractLiteralAsParameter) << _(
-        "class Narf {\n"
-        "public:\n"
-        "    int zort()\n"
-        "    { return 15@5 + 1; }\n"
-        "};\n"
-        ) << _(
-        "class Narf {\n"
-        "public:\n"
-        "    int zort(int newParameter = 155)\n"
-        "    { return newParameter + 1; }\n"
-        "};\n"
-    );
-
-    // Check: optimize postcrement
-    QTest::newRow("OptimizeForLoop_postcrement")
-        << CppQuickFixFactoryPtr(new OptimizeForLoop)
-        << _("void foo() {f@or (int i = 0; i < 3; i++) {}}\n")
-        << _("void foo() {for (int i = 0; i < 3; ++i) {}}\n");
-
-    // Check: optimize condition
-    QTest::newRow("OptimizeForLoop_condition")
-        << CppQuickFixFactoryPtr(new OptimizeForLoop)
-        << _("void foo() {f@or (int i = 0; i < 3 + 5; ++i) {}}\n")
-        << _("void foo() {for (int i = 0, total = 3 + 5; i < total; ++i) {}}\n");
-
-    // Check: optimize fliped condition
-    QTest::newRow("OptimizeForLoop_flipedCondition")
-        << CppQuickFixFactoryPtr(new OptimizeForLoop)
-        << _("void foo() {f@or (int i = 0; 3 + 5 > i; ++i) {}}\n")
-        << _("void foo() {for (int i = 0, total = 3 + 5; total > i; ++i) {}}\n");
-
-    // Check: if "total" used, create other name.
-    QTest::newRow("OptimizeForLoop_alterVariableName")
-        << CppQuickFixFactoryPtr(new OptimizeForLoop)
-        << _("void foo() {f@or (int i = 0, total = 0; i < 3 + 5; ++i) {}}\n")
-        << _("void foo() {for (int i = 0, total = 0, totalX = 3 + 5; i < totalX; ++i) {}}\n");
-
-    // Check: optimize postcrement and condition
-    QTest::newRow("OptimizeForLoop_optimizeBoth")
-        << CppQuickFixFactoryPtr(new OptimizeForLoop)
-        << _("void foo() {f@or (int i = 0; i < 3 + 5; i++) {}}\n")
-        << _("void foo() {for (int i = 0, total = 3 + 5; i < total; ++i) {}}\n");
-
-    // Check: empty initializier
-    QTest::newRow("OptimizeForLoop_emptyInitializer")
-        << CppQuickFixFactoryPtr(new OptimizeForLoop)
-        << _("int i; void foo() {f@or (; i < 3 + 5; ++i) {}}\n")
-        << _("int i; void foo() {for (int total = 3 + 5; i < total; ++i) {}}\n");
-
-    // Check: wrong initializier type -> no trigger
-    QTest::newRow("OptimizeForLoop_wrongInitializer")
-        << CppQuickFixFactoryPtr(new OptimizeForLoop)
-        << _("int i; void foo() {f@or (double a = 0; i < 3 + 5; ++i) {}}\n")
-        << _();
-
-    // Check: No trigger when numeric
-    QTest::newRow("OptimizeForLoop_noTriggerNumeric1")
-        << CppQuickFixFactoryPtr(new OptimizeForLoop)
-        << _("void foo() {fo@r (int i = 0; i < 3; ++i) {}}\n")
-        << _();
-
-    // Check: No trigger when numeric
-    QTest::newRow("OptimizeForLoop_noTriggerNumeric2")
-        << CppQuickFixFactoryPtr(new OptimizeForLoop)
-        << _("void foo() {fo@r (int i = 0; i < -3; ++i) {}}\n")
-        << _();
-
-    // Escape String Literal as UTF-8 (no-trigger)
-    QTest::newRow("EscapeStringLiteral_notrigger")
-            << CppQuickFixFactoryPtr(new EscapeStringLiteral)
-            << _("const char *notrigger = \"@abcdef \\a\\n\\\\\";\n")
-            << _();
-
-    // Escape String Literal as UTF-8
-    QTest::newRow("EscapeStringLiteral")
-            << CppQuickFixFactoryPtr(new EscapeStringLiteral)
-            << _("const char *utf8 = \"@\xe3\x81\x82\xe3\x81\x84\";\n")
-            << _("const char *utf8 = \"\\xe3\\x81\\x82\\xe3\\x81\\x84\";\n");
-
-    // Unescape String Literal as UTF-8 (from hexdecimal escape sequences)
-    QTest::newRow("UnescapeStringLiteral_hex")
-            << CppQuickFixFactoryPtr(new EscapeStringLiteral)
-            << _("const char *hex_escaped = \"@\\xe3\\x81\\x82\\xe3\\x81\\x84\";\n")
-            << _("const char *hex_escaped = \"\xe3\x81\x82\xe3\x81\x84\";\n");
-
-    // Unescape String Literal as UTF-8 (from octal escape sequences)
-    QTest::newRow("UnescapeStringLiteral_oct")
-            << CppQuickFixFactoryPtr(new EscapeStringLiteral)
-            << _("const char *oct_escaped = \"@\\343\\201\\202\\343\\201\\204\";\n")
-            << _("const char *oct_escaped = \"\xe3\x81\x82\xe3\x81\x84\";\n");
-
-    // Unescape String Literal as UTF-8 (triggered but no change)
-    QTest::newRow("UnescapeStringLiteral_noconv")
-            << CppQuickFixFactoryPtr(new EscapeStringLiteral)
-            << _("const char *escaped_ascii = \"@\\x1b\";\n")
-            << _("const char *escaped_ascii = \"\\x1b\";\n");
-
-    // Unescape String Literal as UTF-8 (no conversion because of invalid utf-8)
-    QTest::newRow("UnescapeStringLiteral_invalid")
-            << CppQuickFixFactoryPtr(new EscapeStringLiteral)
-            << _("const char *escaped = \"@\\xe3\\x81\";\n")
-            << _("const char *escaped = \"\\xe3\\x81\";\n");
-
-    QTest::newRow("ConvertFromPointer")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _("void foo() {\n"
-             "    QString *@str;\n"
-             "    if (!str->isEmpty())\n"
-             "        str->clear();\n"
-             "    f1(*str);\n"
-             "    f2(str);\n"
-             "}\n")
-        << _("void foo() {\n"
-             "    QString str;\n"
-             "    if (!str.isEmpty())\n"
-             "        str.clear();\n"
-             "    f1(str);\n"
-             "    f2(&str);\n"
-             "}\n");
-
-    QTest::newRow("ConvertToPointer")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _("void foo() {\n"
-             "    QString @str;\n"
-             "    if (!str.isEmpty())\n"
-             "        str.clear();\n"
-             "    f1(str);\n"
-             "    f2(&str);\n"
-             "}\n")
-        << _("void foo() {\n"
-             "    QString *str = new QString;\n"
-             "    if (!str->isEmpty())\n"
-             "        str->clear();\n"
-             "    f1(*str);\n"
-             "    f2(str);\n"
-             "}\n");
-
-    QTest::newRow("ConvertReferenceToPointer")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _("void foo() {\n"
-             "    QString narf;"
-             "    QString &@str = narf;\n"
-             "    if (!str.isEmpty())\n"
-             "        str.clear();\n"
-             "    f1(str);\n"
-             "    f2(&str);\n"
-             "}\n")
-        << _("void foo() {\n"
-             "    QString narf;"
-             "    QString *str = &narf;\n"
-             "    if (!str->isEmpty())\n"
-             "        str->clear();\n"
-             "    f1(*str);\n"
-             "    f2(str);\n"
-             "}\n");
-
-    QTest::newRow("ConvertFromPointer_withInitializer")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _("void foo() {\n"
-             "    QString *@str = new QString(QLatin1String(\"schnurz\"));\n"
-             "    if (!str->isEmpty())\n"
-             "        str->clear();\n"
-             "}\n")
-        << _("void foo() {\n"
-             "    QString str(QLatin1String(\"schnurz\"));\n"
-             "    if (!str.isEmpty())\n"
-             "        str.clear();\n"
-             "}\n");
-
-    QTest::newRow("ConvertFromPointer_withBareInitializer")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _("void foo() {\n"
-             "    QString *@str = new QString;\n"
-             "    if (!str->isEmpty())\n"
-             "        str->clear();\n"
-             "}\n")
-        << _("void foo() {\n"
-             "    QString str;\n"
-             "    if (!str.isEmpty())\n"
-             "        str.clear();\n"
-             "}\n");
-
-    QTest::newRow("ConvertFromPointer_withEmptyInitializer")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _("void foo() {\n"
-             "    QString *@str = new QString();\n"
-             "    if (!str->isEmpty())\n"
-             "        str->clear();\n"
-             "}\n")
-        << _("void foo() {\n"
-             "    QString str;\n"
-             "    if (!str.isEmpty())\n"
-             "        str.clear();\n"
-             "}\n");
-
-    QTest::newRow("ConvertFromPointer_structWithPointer")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _("struct Bar{ QString *str; };\n"
-             "void foo() {\n"
-             "    Bar *@bar = new Bar;\n"
-             "    bar->str = new QString;\n"
-             "    delete bar->str;\n"
-             "    delete bar;\n"
-             "}\n")
-        << _("struct Bar{ QString *str; };\n"
-             "void foo() {\n"
-             "    Bar bar;\n"
-             "    bar.str = new QString;\n"
-             "    delete bar.str;\n"
-             "    // delete bar;\n"
-             "}\n");
-
-    QTest::newRow("ConvertToPointer_withInitializer")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _("void foo() {\n"
-             "    QString @str = QLatin1String(\"narf\");\n"
-             "    if (!str.isEmpty())\n"
-             "        str.clear();\n"
-             "}\n")
-        << _("void foo() {\n"
-             "    QString *str = new QString(QLatin1String(\"narf\"));\n"
-             "    if (!str->isEmpty())\n"
-             "        str->clear();\n"
-             "}\n");
-
-    QTest::newRow("ConvertToPointer_withParenInitializer")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _("void foo() {\n"
-             "    QString @str(QLatin1String(\"narf\"));\n"
-             "    if (!str.isEmpty())\n"
-             "        str.clear();\n"
-             "}\n")
-        << _("void foo() {\n"
-             "    QString *str = new QString(QLatin1String(\"narf\"));\n"
-             "    if (!str->isEmpty())\n"
-             "        str->clear();\n"
-             "}\n");
-
-    QTest::newRow("ConvertToPointer_noTriggerRValueRefs")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _("void foo(Narf &&@narf) {}\n")
-        << _();
-
-    QTest::newRow("ConvertToPointer_noTriggerGlobal")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _("int @global;\n")
-        << _();
-
-    QTest::newRow("ConvertToPointer_noTriggerClassMember")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _("struct C { int @member; };\n")
-        << _();
-
-    QTest::newRow("ConvertToPointer_noTriggerClassMember2")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _("void f() { struct C { int @member; }; }\n")
-        << _();
-
-    QTest::newRow("ConvertToPointer_functionOfFunctionLocalClass")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _("void f() {\n"
-             "    struct C {\n"
-             "        void g() { int @member; }\n"
-             "    };\n"
-             "}\n")
-        << _("void f() {\n"
-             "    struct C {\n"
-             "        void g() { int *member; }\n"
-             "    };\n"
-             "}\n");
-
-    QTest::newRow("ConvertToPointer_redeclaredVariable_block")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _("void foo() {\n"
-             "    QString @str;\n"
-             "    str.clear();\n"
-             "    {\n"
-             "        QString str;\n"
-             "        str.clear();\n"
-             "    }\n"
-             "    f1(str);\n"
-             "}\n")
-        << _("void foo() {\n"
-             "    QString *str = new QString;\n"
-             "    str->clear();\n"
-             "    {\n"
-             "        QString str;\n"
-             "        str.clear();\n"
-             "    }\n"
-             "    f1(*str);\n"
-             "}\n");
-
-    QTest::newRow("ConvertAutoFromPointer")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _("void foo() {\n"
-             "    auto @str = new QString(QLatin1String(\"foo\"));\n"
-             "    if (!str->isEmpty())\n"
-             "        str->clear();\n"
-             "    f1(*str);\n"
-             "    f2(str);\n"
-             "}\n")
-        << _("void foo() {\n"
-             "    auto str = QString(QLatin1String(\"foo\"));\n"
-             "    if (!str.isEmpty())\n"
-             "        str.clear();\n"
-             "    f1(str);\n"
-             "    f2(&str);\n"
-             "}\n");
-
-    QTest::newRow("ConvertAutoFromPointer2")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _("void foo() {\n"
-             "    auto *@str = new QString;\n"
-             "    if (!str->isEmpty())\n"
-             "        str->clear();\n"
-             "    f1(*str);\n"
-             "    f2(str);\n"
-             "}\n")
-        << _("void foo() {\n"
-             "    auto str = QString();\n"
-             "    if (!str.isEmpty())\n"
-             "        str.clear();\n"
-             "    f1(str);\n"
-             "    f2(&str);\n"
-             "}\n");
-
-    QTest::newRow("ConvertAutoToPointer")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _("void foo() {\n"
-             "    auto @str = QString(QLatin1String(\"foo\"));\n"
-             "    if (!str.isEmpty())\n"
-             "        str.clear();\n"
-             "    f1(str);\n"
-             "    f2(&str);\n"
-             "}\n")
-        << _("void foo() {\n"
-             "    auto @str = new QString(QLatin1String(\"foo\"));\n"
-             "    if (!str->isEmpty())\n"
-             "        str->clear();\n"
-             "    f1(*str);\n"
-             "    f2(str);\n"
-             "}\n");
-
-    QTest::newRow("ConvertToPointerWithMacro")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _("#define BAR bar\n"
-             "void func()\n"
-             "{\n"
-             "    int @foo = 42;\n"
-             "    int bar;\n"
-             "    BAR = foo;\n"
-             "}\n")
-        << _("#define BAR bar\n"
-             "void func()\n"
-             "{\n"
-             "    int *foo = 42;\n"
-             "    int bar;\n"
-             "    BAR = *foo;\n"
-             "}\n");
-
-    QString testObjAndFunc = "struct Object\n"
-                             "{\n"
-                             "    Object(%1){}\n"
-                             "};\n"
-                             "void func()\n"
-                             "{\n"
-                             "    %2\n"
-                             "}\n";
-
-    QTest::newRow("ConvertToStack1_QTCREATORBUG23181")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _(testObjAndFunc.arg("int").arg("Object *@obj = new Object(0);").toUtf8())
-        << _(testObjAndFunc.arg("int").arg("Object obj(0);").toUtf8());
-
-    QTest::newRow("ConvertToStack2_QTCREATORBUG23181")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _(testObjAndFunc.arg("int").arg("Object *@obj = new Object{0};").toUtf8())
-        << _(testObjAndFunc.arg("int").arg("Object obj{0};").toUtf8());
-
-    QTest::newRow("ConvertToPointer1_QTCREATORBUG23181")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _(testObjAndFunc.arg("").arg("Object @obj;").toUtf8())
-        << _(testObjAndFunc.arg("").arg("Object *obj = new Object;").toUtf8());
-
-    QTest::newRow("ConvertToPointer2_QTCREATORBUG23181")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _(testObjAndFunc.arg("").arg("Object @obj();").toUtf8())
-        << _(testObjAndFunc.arg("").arg("Object *obj = new Object();").toUtf8());
-
-    QTest::newRow("ConvertToPointer3_QTCREATORBUG23181")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _(testObjAndFunc.arg("").arg("Object @obj{};").toUtf8())
-        << _(testObjAndFunc.arg("").arg("Object *obj = new Object{};").toUtf8());
-
-    QTest::newRow("ConvertToPointer4_QTCREATORBUG23181")
-        << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
-        << _(testObjAndFunc.arg("int").arg("Object @obj(0);").toUtf8())
-        << _(testObjAndFunc.arg("int").arg("Object *obj = new Object(0);").toUtf8());
-
-    QTest::newRow("InsertQtPropertyMembers_noTriggerInvalidCode")
-        << CppQuickFixFactoryPtr(new InsertQtPropertyMembers)
-        << _("class C { @Q_PROPERTY(typeid foo READ foo) };\n")
-        << _();
-
-    QTest::newRow("convert to camel case: normal")
-        << CppQuickFixFactoryPtr(new ConvertToCamelCase(true))
-        << _("void @lower_case_function();\n")
-        << _("void lowerCaseFunction();\n");
-    QTest::newRow("convert to camel case: already camel case")
-        << CppQuickFixFactoryPtr(new ConvertToCamelCase(true))
-        << _("void @camelCaseFunction();\n")
-        << _();
-    QTest::newRow("convert to camel case: no underscores (lower case)")
-        << CppQuickFixFactoryPtr(new ConvertToCamelCase(true))
-        << _("void @lowercasefunction();\n")
-        << _();
-    QTest::newRow("convert to camel case: no underscores (upper case)")
-        << CppQuickFixFactoryPtr(new ConvertToCamelCase(true))
-        << _("void @UPPERCASEFUNCTION();\n")
-        << _();
-    QTest::newRow("convert to camel case: non-applicable underscore")
-        << CppQuickFixFactoryPtr(new ConvertToCamelCase(true))
-        << _("void @m_a_member;\n")
-        << _("void m_aMember;\n");
-    QTest::newRow("convert to camel case: upper case")
-        << CppQuickFixFactoryPtr(new ConvertToCamelCase(true))
-        << _("void @UPPER_CASE_FUNCTION();\n")
-        << _("void upperCaseFunction();\n");
-    QTest::newRow("convert to camel case: partially camel case already")
-        << CppQuickFixFactoryPtr(new ConvertToCamelCase(true))
-        << _("void mixed@_andCamelCase();\n")
-        << _("void mixedAndCamelCase();\n");
-    QTest::newRow("convert to camel case: wild mix")
-        << CppQuickFixFactoryPtr(new ConvertToCamelCase(true))
-        << _("void @WhAt_TODO_hErE();\n")
-        << _("void WhAtTODOHErE();\n");
-    QTest::newRow("escape string literal: simple case")
-        << CppQuickFixFactoryPtr(new EscapeStringLiteral)
-        << _(R"(const char *str = @"àxyz";)")
-        << _(R"(const char *str = "\xc3\xa0xyz";)");
-    QTest::newRow("escape string literal: simple case reverse")
-        << CppQuickFixFactoryPtr(new EscapeStringLiteral)
-        << _(R"(const char *str = @"\xc3\xa0xyz";)")
-        << _(R"(const char *str = "àxyz";)");
-    QTest::newRow("escape string literal: raw string literal")
-        << CppQuickFixFactoryPtr(new EscapeStringLiteral)
-        << _(R"x(const char *str = @R"(àxyz)";)x")
-        << _(R"x(const char *str = R"(\xc3\xa0xyz)";)x");
-    QTest::newRow("escape string literal: splitting required")
-        << CppQuickFixFactoryPtr(new EscapeStringLiteral)
-        << _(R"(const char *str = @"àf23бgб1";)")
-        << _(R"(const char *str = "\xc3\xa0""f23\xd0\xb1g\xd0\xb1""1";)");
-    QTest::newRow("escape string literal: unescape adjacent literals")
-        << CppQuickFixFactoryPtr(new EscapeStringLiteral)
-        << _(R"(const char *str = @"\xc3\xa0""f23\xd0\xb1g\xd0\xb1""1";)")
-        << _(R"(const char *str = "àf23бgб1";)");
-    QTest::newRow("AddLocalDeclaration_QTCREATORBUG-26004")
-        << CppQuickFixFactoryPtr(new AddDeclarationForUndeclaredIdentifier)
-        << _("void func() {\n"
-             "    QStringList list;\n"
-             "    @it = list.cbegin();\n"
-             "}\n")
-        << _("void func() {\n"
-             "    QStringList list;\n"
-             "    auto it = list.cbegin();\n"
-             "}\n");
-}
-
-void QuickfixTest::testGeneric()
-{
-    QFETCH(CppQuickFixFactoryPtr, factory);
-    QFETCH(QByteArray, original);
-    QFETCH(QByteArray, expected);
-
-    QuickFixOperationTest(singleDocument(original, expected), factory.data());
-}
-
-void QuickfixTest::testGenerateGetterSetterNamespaceHandlingCreate_data()
-{
-    QTest::addColumn<QByteArrayList>("headers");
-    QTest::addColumn<QByteArrayList>("sources");
-
-    QByteArray originalSource;
-    QByteArray expectedSource;
-
-    const QByteArray originalHeader =
-            "namespace N1 {\n"
-            "namespace N2 {\n"
-            "class Something\n"
-            "{\n"
-            "    int @it;\n"
-            "};\n"
-            "}\n"
-            "}\n";
-    const QByteArray expectedHeader =
-            "namespace N1 {\n"
-            "namespace N2 {\n"
-            "class Something\n"
-            "{\n"
-            "    int it;\n"
-            "\n"
-            "public:\n"
-            "    int getIt() const;\n"
-            "    void setIt(int value);\n"
-            "};\n"
-            "}\n"
-            "}\n";
-
-    originalSource = "#include \"file.h\"\n";
-    expectedSource =
-            "#include \"file.h\"\n\n\n"
-            "namespace N1 {\n"
-            "namespace N2 {\n"
-            "int Something::getIt() const\n"
-            "{\n"
-            "    return it;\n"
-            "}\n"
-            "\n"
-            "void Something::setIt(int value)\n"
-            "{\n"
-            "    it = value;\n"
-            "}\n\n"
-            "}\n"
-            "}\n";
-    QTest::addRow("insert new namespaces")
-            << QByteArrayList{originalHeader, expectedHeader}
-            << QByteArrayList{originalSource, expectedSource};
-
-    originalSource =
-            "#include \"file.h\"\n"
-            "namespace N2 {} // decoy\n";
-    expectedSource =
-            "#include \"file.h\"\n"
-            "namespace N2 {} // decoy\n\n\n"
-            "namespace N1 {\n"
-            "namespace N2 {\n"
-            "int Something::getIt() const\n"
-            "{\n"
-            "    return it;\n"
-            "}\n"
-            "\n"
-            "void Something::setIt(int value)\n"
-            "{\n"
-            "    it = value;\n"
-            "}\n\n"
-            "}\n"
-            "}\n";
-    QTest::addRow("insert new namespaces (with decoy)")
-            << QByteArrayList{originalHeader, expectedHeader}
-            << QByteArrayList{originalSource, expectedSource};
-
-    originalSource = "#include \"file.h\"\n"
-                     "namespace N2 {} // decoy\n"
-                     "namespace {\n"
-                     "namespace N1 {\n"
-                     "namespace {\n"
-                     "}\n"
-                     "}\n"
-                     "}\n";
-    expectedSource = "#include \"file.h\"\n"
-                     "namespace N2 {} // decoy\n"
-                     "namespace {\n"
-                     "namespace N1 {\n"
-                     "namespace {\n"
-                     "}\n"
-                     "}\n"
-                     "}\n"
-                     "\n"
-                     "\n"
-                     "namespace N1 {\n"
-                     "namespace N2 {\n"
-                     "int Something::getIt() const\n"
-                     "{\n"
-                     "    return it;\n"
-                     "}\n"
-                     "\n"
-                     "void Something::setIt(int value)\n"
-                     "{\n"
-                     "    it = value;\n"
-                     "}\n"
-                     "\n"
-                     "}\n"
-                     "}\n";
-    QTest::addRow("insert inner namespace (with decoy and unnamed)")
-        << QByteArrayList{originalHeader, expectedHeader}
-        << QByteArrayList{originalSource, expectedSource};
-
-    const QByteArray unnamedOriginalHeader = "namespace {\n" + originalHeader + "}\n";
-    const QByteArray unnamedExpectedHeader = "namespace {\n" + expectedHeader + "}\n";
-
-    originalSource = "#include \"file.h\"\n"
-                     "namespace N2 {} // decoy\n"
-                     "namespace {\n"
-                     "namespace N1 {\n"
-                     "namespace {\n"
-                     "}\n"
-                     "}\n"
-                     "}\n";
-    expectedSource = "#include \"file.h\"\n"
-                     "namespace N2 {} // decoy\n"
-                     "namespace {\n"
-                     "namespace N1 {\n"
-                     "\n"
-                     "namespace N2 {\n"
-                     "int Something::getIt() const\n"
-                     "{\n"
-                     "    return it;\n"
-                     "}\n"
-                     "\n"
-                     "void Something::setIt(int value)\n"
-                     "{\n"
-                     "    it = value;\n"
-                     "}\n"
-                     "\n"
-                     "}\n"
-                     "\n"
-                     "namespace {\n"
-                     "}\n"
-                     "}\n"
-                     "}\n";
-    QTest::addRow("insert inner namespace in unnamed (with decoy)")
-        << QByteArrayList{unnamedOriginalHeader, unnamedExpectedHeader}
-        << QByteArrayList{originalSource, expectedSource};
-
-    originalSource =
-            "#include \"file.h\"\n"
-            "namespace N1 {\n"
-            "namespace N2 {\n"
-            "namespace N3 {\n"
-            "}\n"
-            "}\n"
-            "}\n";
-    expectedSource =
-            "#include \"file.h\"\n"
-            "namespace N1 {\n"
-            "namespace N2 {\n"
-            "namespace N3 {\n"
-            "}\n\n"
-            "int Something::getIt() const\n"
-            "{\n"
-            "    return it;\n"
-            "}\n"
-            "\n"
-            "void Something::setIt(int value)\n"
-            "{\n"
-            "    it = value;\n"
-            "}\n\n"
-            "}\n"
-            "}\n";
-    QTest::addRow("all namespaces already present")
-            << QByteArrayList{originalHeader, expectedHeader}
-            << QByteArrayList{originalSource, expectedSource};
-
-    originalSource = "#include \"file.h\"\n"
-                     "namespace N1 {\n"
-                     "using namespace N2::N3;\n"
-                     "using namespace N2;\n"
-                     "using namespace N2;\n"
-                     "using namespace N3;\n"
-                     "}\n";
-    expectedSource = "#include \"file.h\"\n"
-                     "namespace N1 {\n"
-                     "using namespace N2::N3;\n"
-                     "using namespace N2;\n"
-                     "using namespace N2;\n"
-                     "using namespace N3;\n"
-                     "\n"
-                     "int Something::getIt() const\n"
-                     "{\n"
-                     "    return it;\n"
-                     "}\n"
-                     "\n"
-                     "void Something::setIt(int value)\n"
-                     "{\n"
-                     "    it = value;\n"
-                     "}\n\n"
-                     "}\n";
-    QTest::addRow("namespaces present and using namespace")
-        << QByteArrayList{originalHeader, expectedHeader}
-        << QByteArrayList{originalSource, expectedSource};
-
-    originalSource = "#include \"file.h\"\n"
-                     "using namespace N1::N2::N3;\n"
-                     "using namespace N1::N2;\n"
-                     "namespace N1 {\n"
-                     "using namespace N3;\n"
-                     "}\n";
-    expectedSource = "#include \"file.h\"\n"
-                     "using namespace N1::N2::N3;\n"
-                     "using namespace N1::N2;\n"
-                     "namespace N1 {\n"
-                     "using namespace N3;\n"
-                     "\n"
-                     "int Something::getIt() const\n"
-                     "{\n"
-                     "    return it;\n"
-                     "}\n"
-                     "\n"
-                     "void Something::setIt(int value)\n"
-                     "{\n"
-                     "    it = value;\n"
-                     "}\n"
-                     "\n"
-                     "}\n";
-    QTest::addRow("namespaces present and outer using namespace")
-        << QByteArrayList{originalHeader, expectedHeader}
-        << QByteArrayList{originalSource, expectedSource};
-
-    originalSource = "#include \"file.h\"\n"
-                     "using namespace N1;\n"
-                     "using namespace N2;\n"
-                     "namespace N3 {\n"
-                     "}\n";
-    expectedSource = "#include \"file.h\"\n"
-                     "using namespace N1;\n"
-                     "using namespace N2;\n"
-                     "namespace N3 {\n"
-                     "}\n"
-                     "\n"
-                     "int Something::getIt() const\n"
-                     "{\n"
-                     "    return it;\n"
-                     "}\n"
-                     "\n"
-                     "void Something::setIt(int value)\n"
-                     "{\n"
-                     "    it = value;\n"
-                     "}\n";
-    QTest::addRow("namespaces present and outer using namespace")
-        << QByteArrayList{originalHeader, expectedHeader}
-        << QByteArrayList{originalSource, expectedSource};
-}
-
-void QuickfixTest::testGenerateGetterSetterNamespaceHandlingCreate()
-{
-    QFETCH(QByteArrayList, headers);
-    QFETCH(QByteArrayList, sources);
-
-    QList<TestDocumentPtr> testDocuments(
-        {CppTestDocument::create("file.h", headers.at(0), headers.at(1)),
-         CppTestDocument::create("file.cpp", sources.at(0), sources.at(1))});
-
-    QuickFixSettings s;
-    s->cppFileNamespaceHandling = CppQuickFixSettings::MissingNamespaceHandling::CreateMissing;
-    s->setterParameterNameTemplate = "value";
-    s->getterNameTemplate = "get<Name>";
-    s->setterInCppFileFrom = 1;
-    s->getterInCppFileFrom = 1;
-    GenerateGetterSetter factory;
-    QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 2);
-}
-
-void QuickfixTest::testGenerateGetterSetterNamespaceHandlingAddUsing_data()
-{
-    QTest::addColumn<QByteArrayList>("headers");
-    QTest::addColumn<QByteArrayList>("sources");
-
-    QByteArray originalSource;
-    QByteArray expectedSource;
-
-    const QByteArray originalHeader = "namespace N1 {\n"
-                                      "namespace N2 {\n"
-                                      "class Something\n"
-                                      "{\n"
-                                      "    int @it;\n"
-                                      "};\n"
-                                      "}\n"
-                                      "}\n";
-    const QByteArray expectedHeader = "namespace N1 {\n"
-                                      "namespace N2 {\n"
-                                      "class Something\n"
-                                      "{\n"
-                                      "    int it;\n"
-                                      "\n"
-                                      "public:\n"
-                                      "    void setIt(int value);\n"
-                                      "};\n"
-                                      "}\n"
-                                      "}\n";
-
-    originalSource = "#include \"file.h\"\n";
-    expectedSource = "#include \"file.h\"\n\n"
-                     "using namespace N1::N2;\n"
-                     "void Something::setIt(int value)\n"
-                     "{\n"
-                     "    it = value;\n"
-                     "}\n";
-    QTest::addRow("add using namespaces") << QByteArrayList{originalHeader, expectedHeader}
-                                          << QByteArrayList{originalSource, expectedSource};
-
-    const QByteArray unnamedOriginalHeader = "namespace {\n" + originalHeader + "}\n";
-    const QByteArray unnamedExpectedHeader = "namespace {\n" + expectedHeader + "}\n";
-
-    originalSource = "#include \"file.h\"\n"
-                     "namespace N2 {} // decoy\n"
-                     "namespace {\n"
-                     "namespace N1 {\n"
-                     "namespace {\n"
-                     "}\n"
-                     "}\n"
-                     "}\n";
-    expectedSource = "#include \"file.h\"\n"
-                     "namespace N2 {} // decoy\n"
-                     "namespace {\n"
-                     "namespace N1 {\n"
-                     "using namespace N2;\n"
-                     "void Something::setIt(int value)\n"
-                     "{\n"
-                     "    it = value;\n"
-                     "}\n"
-                     "namespace {\n"
-                     "}\n"
-                     "}\n"
-                     "}\n";
-    QTest::addRow("insert using namespace into unnamed nested (with decoy)")
-        << QByteArrayList{unnamedOriginalHeader, unnamedExpectedHeader}
-        << QByteArrayList{originalSource, expectedSource};
-
-    originalSource = "#include \"file.h\"\n";
-    expectedSource = "#include \"file.h\"\n\n"
-                     "using namespace N1::N2;\n"
-                     "void Something::setIt(int value)\n"
-                     "{\n"
-                     "    it = value;\n"
-                     "}\n";
-    QTest::addRow("insert using namespace into unnamed")
-        << QByteArrayList{unnamedOriginalHeader, unnamedExpectedHeader}
-        << QByteArrayList{originalSource, expectedSource};
-
-    originalSource = "#include \"file.h\"\n"
-                     "namespace N2 {} // decoy\n"
-                     "namespace {\n"
-                     "namespace N1 {\n"
-                     "namespace {\n"
-                     "}\n"
-                     "}\n"
-                     "}\n";
-    expectedSource = "#include \"file.h\"\n"
-                     "namespace N2 {} // decoy\n"
-                     "namespace {\n"
-                     "namespace N1 {\n"
-                     "namespace {\n"
-                     "}\n"
-                     "}\n"
-                     "}\n"
-                     "\n"
-                     "using namespace N1::N2;\n"
-                     "void Something::setIt(int value)\n"
-                     "{\n"
-                     "    it = value;\n"
-                     "}\n";
-    QTest::addRow("insert using namespace (with decoy)")
-        << QByteArrayList{originalHeader, expectedHeader}
-        << QByteArrayList{originalSource, expectedSource};
-}
-
-void QuickfixTest::testGenerateGetterSetterNamespaceHandlingAddUsing()
-{
-    QFETCH(QByteArrayList, headers);
-    QFETCH(QByteArrayList, sources);
-
-    QList<TestDocumentPtr> testDocuments(
-        {CppTestDocument::create("file.h", headers.at(0), headers.at(1)),
-         CppTestDocument::create("file.cpp", sources.at(0), sources.at(1))});
-
-    QuickFixSettings s;
-    s->cppFileNamespaceHandling = CppQuickFixSettings::MissingNamespaceHandling::AddUsingDirective;
-    s->setterParameterNameTemplate = "value";
-    s->setterInCppFileFrom = 1;
-
-    if (std::strstr(QTest::currentDataTag(), "unnamed nested") != nullptr)
-        QSKIP("TODO"); // FIXME
-    GenerateGetterSetter factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testGenerateGetterSetterNamespaceHandlingFullyQualify_data()
-{
-    QTest::addColumn<QByteArrayList>("headers");
-    QTest::addColumn<QByteArrayList>("sources");
-
-    QByteArray originalSource;
-    QByteArray expectedSource;
-
-    const QByteArray originalHeader = "namespace N1 {\n"
-                                      "namespace N2 {\n"
-                                      "class Something\n"
-                                      "{\n"
-                                      "    int @it;\n"
-                                      "};\n"
-                                      "}\n"
-                                      "}\n";
-    const QByteArray expectedHeader = "namespace N1 {\n"
-                                      "namespace N2 {\n"
-                                      "class Something\n"
-                                      "{\n"
-                                      "    int it;\n"
-                                      "\n"
-                                      "public:\n"
-                                      "    void setIt(int value);\n"
-                                      "};\n"
-                                      "}\n"
-                                      "}\n";
-
-    originalSource = "#include \"file.h\"\n";
-    expectedSource = "#include \"file.h\"\n\n"
-                     "void N1::N2::Something::setIt(int value)\n"
-                     "{\n"
-                     "    it = value;\n"
-                     "}\n";
-    QTest::addRow("fully qualify") << QByteArrayList{originalHeader, expectedHeader}
-                                   << QByteArrayList{originalSource, expectedSource};
-
-    originalSource = "#include \"file.h\"\n"
-                     "namespace N2 {} // decoy\n";
-    expectedSource = "#include \"file.h\"\n"
-                     "namespace N2 {} // decoy\n"
-                     "\n"
-                     "void N1::N2::Something::setIt(int value)\n"
-                     "{\n"
-                     "    it = value;\n"
-                     "}\n";
-    QTest::addRow("fully qualify (with decoy)") << QByteArrayList{originalHeader, expectedHeader}
-                                                << QByteArrayList{originalSource, expectedSource};
-
-    originalSource = "#include \"file.h\"\n"
-                     "namespace N2 {} // decoy\n"
-                     "namespace {\n"
-                     "namespace N1 {\n"
-                     "namespace {\n"
-                     "}\n"
-                     "}\n"
-                     "}\n";
-    expectedSource = "#include \"file.h\"\n"
-                     "namespace N2 {} // decoy\n"
-                     "namespace {\n"
-                     "namespace N1 {\n"
-                     "namespace {\n"
-                     "}\n"
-                     "}\n"
-                     "}\n"
-                     "\n"
-                     "void N1::N2::Something::setIt(int value)\n"
-                     "{\n"
-                     "    it = value;\n"
-                     "}\n";
-    QTest::addRow("qualify in inner namespace (with decoy)")
-        << QByteArrayList{originalHeader, expectedHeader}
-        << QByteArrayList{originalSource, expectedSource};
-
-    const QByteArray unnamedOriginalHeader = "namespace {\n" + originalHeader + "}\n";
-    const QByteArray unnamedExpectedHeader = "namespace {\n" + expectedHeader + "}\n";
-
-    originalSource = "#include \"file.h\"\n"
-                     "namespace N2 {} // decoy\n"
-                     "namespace {\n"
-                     "namespace N1 {\n"
-                     "namespace {\n"
-                     "}\n"
-                     "}\n"
-                     "}\n";
-    expectedSource = "#include \"file.h\"\n"
-                     "namespace N2 {} // decoy\n"
-                     "namespace {\n"
-                     "namespace N1 {\n"
-                     "void N2::Something::setIt(int value)\n"
-                     "{\n"
-                     "    it = value;\n"
-                     "}\n"
-                     "namespace {\n"
-                     "}\n"
-                     "}\n"
-                     "}\n";
-    QTest::addRow("qualify in inner namespace unnamed nested (with decoy)")
-        << QByteArrayList{unnamedOriginalHeader, unnamedExpectedHeader}
-        << QByteArrayList{originalSource, expectedSource};
-
-    originalSource = "#include \"file.h\"\n";
-    expectedSource = "#include \"file.h\"\n\n"
-                     "void N1::N2::Something::setIt(int value)\n"
-                     "{\n"
-                     "    it = value;\n"
-                     "}\n";
-    QTest::addRow("qualify in unnamed namespace")
-        << QByteArrayList{unnamedOriginalHeader, unnamedExpectedHeader}
-        << QByteArrayList{originalSource, expectedSource};
-}
-
-void QuickfixTest::testGenerateGetterSetterNamespaceHandlingFullyQualify()
-{
-    QFETCH(QByteArrayList, headers);
-    QFETCH(QByteArrayList, sources);
-
-    QList<TestDocumentPtr> testDocuments(
-        {CppTestDocument::create("file.h", headers.at(0), headers.at(1)),
-         CppTestDocument::create("file.cpp", sources.at(0), sources.at(1))});
-
-    QuickFixSettings s;
-    s->cppFileNamespaceHandling = CppQuickFixSettings::MissingNamespaceHandling::RewriteType;
-    s->setterParameterNameTemplate = "value";
-    s->setterInCppFileFrom = 1;
-
-    if (std::strstr(QTest::currentDataTag(), "unnamed nested") != nullptr)
-        QSKIP("TODO"); // FIXME
-    GenerateGetterSetter factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testGenerateGetterSetterCustomNames_data()
-{
-    QTest::addColumn<QByteArrayList>("headers");
-    QTest::addColumn<int>("operation");
-
-    QByteArray originalSource;
-    QByteArray expectedSource;
-
-    // Check if right names are created
-    originalSource = R"-(
-class Test {
-    int m_fooBar_test@;
-};
-)-";
-    expectedSource = R"-(
-class Test {
-    int m_fooBar_test;
-
-public:
-    int give_me_foo_bar_test() const
-    {
-        return m_fooBar_test;
-    }
-    void Seet_FooBar_test(int New_Foo_Bar_Test)
-    {
-        if (m_fooBar_test == New_Foo_Bar_Test)
-            return;
-        m_fooBar_test = New_Foo_Bar_Test;
-        emit newFooBarTestValue();
-    }
-    void set_fooBarTest_toDefault()
-    {
-        Seet_FooBar_test({}); // TODO: Adapt to use your actual default value
-    }
-
-signals:
-    void newFooBarTestValue();
-
-private:
-    Q_PROPERTY(int fooBar_test READ give_me_foo_bar_test WRITE Seet_FooBar_test RESET set_fooBarTest_toDefault NOTIFY newFooBarTestValue FINAL)
-};
-)-";
-    QTest::addRow("create right names") << QByteArrayList{originalSource, expectedSource} << 4;
-
-    // Check if not triggered with custom names
-    originalSource = R"-(
-class Test {
-    int m_fooBar_test@;
-
-public:
-    int give_me_foo_bar_test() const
-    {
-        return m_fooBar_test;
-    }
-    void Seet_FooBar_test(int New_Foo_Bar_Test)
-    {
-        if (m_fooBar_test == New_Foo_Bar_Test)
-            return;
-        m_fooBar_test = New_Foo_Bar_Test;
-        emit newFooBarTestValue();
-    }
-    void set_fooBarTest_toDefault()
-    {
-        Seet_FooBar_test({}); // TODO: Adapt to use your actual default value
-    }
-
-signals:
-    void newFooBarTestValue();
-
-private:
-    Q_PROPERTY(int fooBar_test READ give_me_foo_bar_test WRITE Seet_FooBar_test RESET set_fooBarTest_toDefault NOTIFY newFooBarTestValue FINAL)
-};
-)-";
-    expectedSource = "";
-    QTest::addRow("everything already exists") << QByteArrayList{originalSource, expectedSource} << 4;
-
-    // create from Q_PROPERTY with custom names
-    originalSource = R"-(
-class Test {
-    Q_PROPER@TY(int fooBar_test READ give_me_foo_bar_test WRITE Seet_FooBar_test RESET set_fooBarTest_toDefault NOTIFY newFooBarTestValue FINAL)
-
-public:
-    int give_me_foo_bar_test() const
-    {
-        return mem_fooBar_test;
-    }
-    void Seet_FooBar_test(int New_Foo_Bar_Test)
-    {
-        if (mem_fooBar_test == New_Foo_Bar_Test)
-            return;
-        mem_fooBar_test = New_Foo_Bar_Test;
-        emit newFooBarTestValue();
-    }
-    void set_fooBarTest_toDefault()
-    {
-        Seet_FooBar_test({}); // TODO: Adapt to use your actual default value
-    }
-
-signals:
-    void newFooBarTestValue();
-};
-)-";
-    expectedSource = R"-(
-class Test {
-    Q_PROPERTY(int fooBar_test READ give_me_foo_bar_test WRITE Seet_FooBar_test RESET set_fooBarTest_toDefault NOTIFY newFooBarTestValue FINAL)
-
-public:
-    int give_me_foo_bar_test() const
-    {
-        return mem_fooBar_test;
-    }
-    void Seet_FooBar_test(int New_Foo_Bar_Test)
-    {
-        if (mem_fooBar_test == New_Foo_Bar_Test)
-            return;
-        mem_fooBar_test = New_Foo_Bar_Test;
-        emit newFooBarTestValue();
-    }
-    void set_fooBarTest_toDefault()
-    {
-        Seet_FooBar_test({}); // TODO: Adapt to use your actual default value
-    }
-
-signals:
-    void newFooBarTestValue();
-private:
-    int mem_fooBar_test;
-};
-)-";
-    QTest::addRow("create only member variable")
-        << QByteArrayList{originalSource, expectedSource} << 0;
-
-    // create from Q_PROPERTY with custom names
-    originalSource = R"-(
-class Test {
-    Q_PROPE@RTY(int fooBar_test READ give_me_foo_bar_test WRITE Seet_FooBar_test RESET set_fooBarTest_toDefault NOTIFY newFooBarTestValue FINAL)
-    int mem_fooBar_test;
-public:
-};
-)-";
-    expectedSource = R"-(
-class Test {
-    Q_PROPERTY(int fooBar_test READ give_me_foo_bar_test WRITE Seet_FooBar_test RESET set_fooBarTest_toDefault NOTIFY newFooBarTestValue FINAL)
-    int mem_fooBar_test;
-public:
-    int give_me_foo_bar_test() const
-    {
-        return mem_fooBar_test;
-    }
-    void Seet_FooBar_test(int New_Foo_Bar_Test)
-    {
-        if (mem_fooBar_test == New_Foo_Bar_Test)
-            return;
-        mem_fooBar_test = New_Foo_Bar_Test;
-        emit newFooBarTestValue();
-    }
-    void set_fooBarTest_toDefault()
-    {
-        Seet_FooBar_test({}); // TODO: Adapt to use your actual default value
-    }
-signals:
-    void newFooBarTestValue();
-};
-)-";
-    QTest::addRow("create methods with given member variable")
-        << QByteArrayList{originalSource, expectedSource} << 0;
-}
-
-void QuickfixTest::testGenerateGetterSetterCustomNames()
-{
-    QFETCH(QByteArrayList, headers);
-    QFETCH(int, operation);
-
-    QList<TestDocumentPtr> testDocuments(
-        {CppTestDocument::create("file.h", headers.at(0), headers.at(1))});
-
-    QuickFixSettings s;
-    s->setterInCppFileFrom = 0;
-    s->getterInCppFileFrom = 0;
-    s->setterNameTemplate = "Seet_<Name>";
-    s->getterNameTemplate = "give_me_<snake>";
-    s->signalNameTemplate = "new<Camel>Value";
-    s->setterParameterNameTemplate = "New_<Snake>";
-    s->resetNameTemplate = "set_<camel>_toDefault";
-    s->memberVariableNameTemplate = "mem_<name>";
-    if (operation == 0) {
-        InsertQtPropertyMembers factory;
-        QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), operation);
-    } else {
-        GenerateGetterSetter factory;
-        QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), operation);
-    }
-}
-
-void QuickfixTest::testGenerateGetterSetterValueTypes_data()
-{
-    QTest::addColumn<QByteArrayList>("headers");
-    QTest::addColumn<int>("operation");
-
-    QByteArray originalSource;
-    QByteArray expectedSource;
-
-    // int should be a value type
-    originalSource = R"-(
-class Test {
-    int i@;
-};
-)-";
-    expectedSource = R"-(
-class Test {
-    int i;
-
-public:
-    int getI() const
-    {
-        return i;
-    }
-};
-)-";
-    QTest::addRow("int") << QByteArrayList{originalSource, expectedSource} << 1;
-
-    // return type should be only int without const
-    originalSource = R"-(
-class Test {
-    const int i@;
-};
-)-";
-    expectedSource = R"-(
-class Test {
-    const int i;
-
-public:
-    int getI() const
-    {
-        return i;
-    }
-};
-)-";
-    QTest::addRow("const int") << QByteArrayList{originalSource, expectedSource} << 0;
-
-    // float should be a value type
-    originalSource = R"-(
-class Test {
-    float f@;
-};
-)-";
-    expectedSource = R"-(
-class Test {
-    float f;
-
-public:
-    float getF() const
-    {
-        return f;
-    }
-};
-)-";
-    QTest::addRow("float") << QByteArrayList{originalSource, expectedSource} << 1;
-
-    // pointer should be a value type
-    originalSource = R"-(
-class Test {
-    void* v@;
-};
-)-";
-    expectedSource = R"-(
-class Test {
-    void* v;
-
-public:
-    void *getV() const
-    {
-        return v;
-    }
-};
-)-";
-    QTest::addRow("pointer") << QByteArrayList{originalSource, expectedSource} << 1;
-
-    // reference should be a value type (setter is const ref)
-    originalSource = R"-(
-class Test {
-    int& r@;
-};
-)-";
-    expectedSource = R"-(
-class Test {
-    int& r;
-
-public:
-    int &getR() const
-    {
-        return r;
-    }
-    void setR(const int &newR)
-    {
-        r = newR;
-    }
-};
-)-";
-    QTest::addRow("reference to value type") << QByteArrayList{originalSource, expectedSource} << 2;
-
-    // reference should be a value type
-    originalSource = R"-(
-using bar = int;
-class Test {
-    bar i@;
-};
-)-";
-    expectedSource = R"-(
-using bar = int;
-class Test {
-    bar i;
-
-public:
-    bar getI() const
-    {
-        return i;
-    }
-};
-)-";
-    QTest::addRow("value type through using") << QByteArrayList{originalSource, expectedSource} << 1;
-
-    // enum should be a value type
-    originalSource = R"-(
-enum Foo{V1, V2};
-class Test {
-    Foo e@;
-};
-)-";
-    expectedSource = R"-(
-enum Foo{V1, V2};
-class Test {
-    Foo e;
-
-public:
-    Foo getE() const
-    {
-        return e;
-    }
-};
-)-";
-    QTest::addRow("enum") << QByteArrayList{originalSource, expectedSource} << 1;
-
-    // class should not be a value type
-    originalSource = R"-(
-class NoVal{};
-class Test {
-    NoVal n@;
-};
-)-";
-    expectedSource = R"-(
-class NoVal{};
-class Test {
-    NoVal n;
-
-public:
-    const NoVal &getN() const
-    {
-        return n;
-    }
-};
-)-";
-    QTest::addRow("class") << QByteArrayList{originalSource, expectedSource} << 1;
-
-    // custom classes can be a value type
-    originalSource = R"-(
-class Value{};
-class Test {
-    Value v@;
-};
-)-";
-    expectedSource = R"-(
-class Value{};
-class Test {
-    Value v;
-
-public:
-    Value getV() const
-    {
-        return v;
-    }
-};
-)-";
-    QTest::addRow("value class") << QByteArrayList{originalSource, expectedSource} << 1;
-
-    // custom classes (in namespace) can be a value type
-    originalSource = R"-(
-namespace N1{
-class Value{};
-}
-class Test {
-    N1::Value v@;
-};
-)-";
-    expectedSource = R"-(
-namespace N1{
-class Value{};
-}
-class Test {
-    N1::Value v;
-
-public:
-    N1::Value getV() const
-    {
-        return v;
-    }
-};
-)-";
-    QTest::addRow("value class in namespace") << QByteArrayList{originalSource, expectedSource} << 1;
-
-    // custom template class can be a value type
-    originalSource = R"-(
-template<typename T>
-class Value{};
-class Test {
-    Value<int> v@;
-};
-)-";
-    expectedSource = R"-(
-template<typename T>
-class Value{};
-class Test {
-    Value<int> v;
-
-public:
-    Value<int> getV() const
-    {
-        return v;
-    }
-};
-)-";
-    QTest::addRow("value template class") << QByteArrayList{originalSource, expectedSource} << 1;
-}
-
-void QuickfixTest::testGenerateGetterSetterValueTypes()
-{
-    QFETCH(QByteArrayList, headers);
-    QFETCH(int, operation);
-
-    QList<TestDocumentPtr> testDocuments(
-        {CppTestDocument::create("file.h", headers.at(0), headers.at(1))});
-
-    QuickFixSettings s;
-    s->setterInCppFileFrom = 0;
-    s->getterInCppFileFrom = 0;
-    s->getterNameTemplate = "get<Name>";
-    s->valueTypes << "Value";
-    s->returnByConstRef = true;
-
-    GenerateGetterSetter factory;
-    QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), operation);
-}
-
-/// Checks: Use template for a custom type
-void QuickfixTest::testGenerateGetterSetterCustomTemplate()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    const _ customTypeDecl = R"--(
-namespace N1 {
-namespace N2 {
-struct test{};
-}
-template<typename T>
-struct custom {
-    void assign(const custom<T>&);
-    bool equals(const custom<T>&);
-    T* get();
-};
-)--";
-    // Header File
-    original = customTypeDecl + R"--(
-class Foo
-{
-public:
-    custom<N2::test> bar@;
-};
-})--";
-    expected = customTypeDecl + R"--(
-class Foo
-{
-public:
-    custom<N2::test> bar@;
-    N2::test *getBar() const;
-    void setBar(const custom<N2::test> &newBar);
-signals:
-    void barChanged(N2::test *bar);
-private:
-    Q_PROPERTY(N2::test *bar READ getBar NOTIFY barChanged FINAL)
-};
-})--";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original = "";
-    expected = R"-(
-using namespace N1;
-N2::test *Foo::getBar() const
-{
-    return bar.get();
-}
-
-void Foo::setBar(const custom<N2::test> &newBar)
-{
-    if (bar.equals(newBar))
-        return;
-    bar.assign(newBar);
-    emit barChanged(bar.get());
-}
-)-";
-
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    QuickFixSettings s;
-    s->cppFileNamespaceHandling = CppQuickFixSettings::MissingNamespaceHandling::AddUsingDirective;
-    s->getterNameTemplate = "get<Name>";
-    s->getterInCppFileFrom = 1;
-    s->signalWithNewValue = true;
-    CppQuickFixSettings::CustomTemplate t;
-    t.types.append("custom");
-    t.equalComparison = "<cur>.equals(<new>)";
-    t.returnExpression = "<cur>.get()";
-    t.returnType = "<T> *";
-    t.assignment = "<cur>.assign(<new>)";
-    s->customTemplates.push_back(t);
-
-    GenerateGetterSetter factory;
-    QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 5);
-}
-
-/// Checks: if the setter parameter name is the same as the member variable name, this-> is needed
-void QuickfixTest::testGenerateGetterSetterNeedThis()
-{
-    QList<TestDocumentPtr> testDocuments;
-
-    // Header File
-    const QByteArray original = R"-(
-class Foo {
-    int bar@;
-public:
-};
-)-";
-    const QByteArray expected = R"-(
-class Foo {
-    int bar@;
-public:
-    void setBar(int bar)
-    {
-        this->bar = bar;
-    }
-};
-)-";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    QuickFixSettings s;
-    s->setterParameterNameTemplate = "<name>";
-    s->setterInCppFileFrom = 0;
-
-    GenerateGetterSetter factory;
-    QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 0);
-}
-
-void QuickfixTest::testGenerateGetterSetterOfferedFixes_data()
-{
-    QTest::addColumn<QByteArray>("header");
-    QTest::addColumn<QStringList>("offered");
-
-    QByteArray header;
-    QStringList offered;
-    const QString setter = QStringLiteral("Generate Setter");
-    const QString getter = QStringLiteral("Generate Getter");
-    const QString getset = QStringLiteral("Generate Getter and Setter");
-    const QString constQandMissing = QStringLiteral(
-        "Generate Constant Q_PROPERTY and Missing Members");
-    const QString qAndResetAndMissing = QStringLiteral(
-        "Generate Q_PROPERTY and Missing Members with Reset Function");
-    const QString qAndMissing = QStringLiteral("Generate Q_PROPERTY and Missing Members");
-    const QStringList all{setter, getter, getset, constQandMissing, qAndResetAndMissing, qAndMissing};
-
-    header = R"-(
-class Foo {
-    static int bar@;
-};
-)-";
-    offered = QStringList{setter, getter, getset, constQandMissing};
-    QTest::addRow("static") << header << offered;
-
-    header = R"-(
-class Foo {
-    static const int bar@;
-};
-)-";
-    offered = QStringList{getter, constQandMissing};
-    QTest::addRow("const static") << header << offered;
-
-    header = R"-(
-class Foo {
-    const int bar@;
-};
-)-";
-    offered = QStringList{getter, constQandMissing};
-    QTest::addRow("const") << header << offered;
-
-    header = R"-(
-class Foo {
-    const int bar@;
-    int getBar() const;
-};
-)-";
-    offered = QStringList{constQandMissing};
-    QTest::addRow("const + getter") << header << offered;
-
-    header = R"-(
-class Foo {
-    const int bar@;
-    int getBar() const;
-    void setBar(int value);
-};
-)-";
-    offered = QStringList{};
-    QTest::addRow("const + getter + setter") << header << offered;
-
-    header = R"-(
-class Foo {
-    const int* bar@;
-};
-)-";
-    offered = all;
-    QTest::addRow("pointer to const") << header << offered;
-
-    header = R"-(
-class Foo {
-    int bar@;
-public:
-    int bar();
-};
-)-";
-    offered = QStringList{setter, constQandMissing, qAndResetAndMissing, qAndMissing};
-    QTest::addRow("existing getter") << header << offered;
-
-    header = R"-(
-class Foo {
-    int bar@;
-public:
-    set setBar(int);
-};
-)-";
-    offered = QStringList{getter};
-    QTest::addRow("existing setter") << header << offered;
-
-    header = R"-(
-class Foo {
-    int bar@;
-signals:
-    void barChanged(int);
-};
-)-";
-    offered = QStringList{setter, getter, getset, qAndResetAndMissing, qAndMissing};
-    QTest::addRow("existing signal (no const Q_PROPERTY)") << header << offered;
-
-    header = R"-(
-class Foo {
-    int m_bar@;
-    Q_PROPERTY(int bar)
-};
-)-";
-    offered = QStringList{}; // user should use "InsertQPropertyMembers", no duplicated code
-    QTest::addRow("existing Q_PROPERTY") << header << offered;
-}
-
-void QuickfixTest::testGenerateGetterSetterOfferedFixes()
-{
-    QFETCH(QByteArray, header);
-    QFETCH(QStringList, offered);
-
-    QList<TestDocumentPtr> testDocuments(
-        {CppTestDocument::create("file.h", header, header)});
-
-    GenerateGetterSetter factory;
-    QuickFixOfferedOperationsTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), offered);
-}
-
-void QuickfixTest::testGenerateGetterSetterGeneralTests_data()
-{
-    QTest::addColumn<int>("operation");
-    QTest::addColumn<QByteArray>("original");
-    QTest::addColumn<QByteArray>("expected");
-
-    QTest::newRow("GenerateGetterSetter_referenceToNonConst")
-        << 2
-        << _("\n"
-             "class Something\n"
-             "{\n"
-             "    int &it@;\n"
-             "};\n")
-        << _("\n"
-             "class Something\n"
-             "{\n"
-             "    int &it;\n"
-             "\n"
-             "public:\n"
-             "    int &getIt() const;\n"
-             "    void setIt(const int &it);\n"
-             "};\n"
-             "\n"
-             "int &Something::getIt() const\n"
-             "{\n"
-             "    return it;\n"
-             "}\n"
-             "\n"
-             "void Something::setIt(const int &it)\n"
-             "{\n"
-             "    this->it = it;\n"
-             "}\n");
-
-    // Checks: No special treatment for reference to const.
-    QTest::newRow("GenerateGetterSetter_referenceToConst")
-        << 2
-        << _("\n"
-             "class Something\n"
-             "{\n"
-             "    const int &it@;\n"
-             "};\n")
-        << _("\n"
-             "class Something\n"
-             "{\n"
-             "    const int &it;\n"
-             "\n"
-             "public:\n"
-             "    const int &getIt() const;\n"
-             "    void setIt(const int &it);\n"
-             "};\n"
-             "\n"
-             "const int &Something::getIt() const\n"
-             "{\n"
-             "    return it;\n"
-             "}\n"
-             "\n"
-             "void Something::setIt(const int &it)\n"
-             "{\n"
-             "    this->it = it;\n"
-             "}\n");
-
-    // Checks:
-    // 1. Setter: Setter is a static function.
-    // 2. Getter: Getter is a static, non const function.
-    QTest::newRow("GenerateGetterSetter_staticMember")
-        << 2
-        << _("\n"
-             "class Something\n"
-             "{\n"
-             "    static int @m_member;\n"
-             "};\n")
-        << _("\n"
-             "class Something\n"
-             "{\n"
-             "    static int m_member;\n"
-             "\n"
-             "public:\n"
-             "    static int member();\n"
-             "    static void setMember(int member);\n"
-             "};\n"
-             "\n"
-             "int Something::member()\n"
-             "{\n"
-             "    return m_member;\n"
-             "}\n"
-             "\n"
-             "void Something::setMember(int member)\n"
-             "{\n"
-             "    m_member = member;\n"
-             "}\n");
-
-    // Check: Check if it works on the second declarator
-    // clang-format off
-    QTest::newRow("GenerateGetterSetter_secondDeclarator") << 2
-        << _("\n"
-            "class Something\n"
-            "{\n"
-            "    int *foo, @it;\n"
-            "};\n")
-        << _("\n"
-            "class Something\n"
-            "{\n"
-            "    int *foo, it;\n"
-            "\n"
-            "public:\n"
-            "    int getIt() const;\n"
-            "    void setIt(int it);\n"
-            "};\n"
-            "\n"
-            "int Something::getIt() const\n"
-            "{\n"
-            "    return it;\n"
-            "}\n"
-            "\n"
-            "void Something::setIt(int it)\n"
-            "{\n"
-            "    this->it = it;\n"
-            "}\n");
-    // clang-format on
-
-    // Check: Quick fix is offered for "int *@it;" ('@' denotes the text cursor position)
-    QTest::newRow("GenerateGetterSetter_triggeringRightAfterPointerSign")
-        << 2
-        << _("\n"
-             "class Something\n"
-             "{\n"
-             "    int *@it;\n"
-             "};\n")
-        << _("\n"
-             "class Something\n"
-             "{\n"
-             "    int *it;\n"
-             "\n"
-             "public:\n"
-             "    int *getIt() const;\n"
-             "    void setIt(int *it);\n"
-             "};\n"
-             "\n"
-             "int *Something::getIt() const\n"
-             "{\n"
-             "    return it;\n"
-             "}\n"
-             "\n"
-             "void Something::setIt(int *it)\n"
-             "{\n"
-             "    this->it = it;\n"
-             "}\n");
-
-    // Checks if "m_" is recognized as "m" with the postfix "_" and not simply as "m_" prefix.
-    QTest::newRow("GenerateGetterSetter_recognizeMasVariableName")
-        << 2
-        << _("\n"
-             "class Something\n"
-             "{\n"
-             "    int @m_;\n"
-             "};\n")
-        << _("\n"
-             "class Something\n"
-             "{\n"
-             "    int m_;\n"
-             "\n"
-             "public:\n"
-             "    int m() const;\n"
-             "    void setM(int m);\n"
-             "};\n"
-             "\n"
-             "int Something::m() const\n"
-             "{\n"
-             "    return m_;\n"
-             "}\n"
-             "\n"
-             "void Something::setM(int m)\n"
-             "{\n"
-             "    m_ = m;\n"
-             "}\n");
-
-    // Checks if "m" followed by an upper character is recognized as a prefix
-    QTest::newRow("GenerateGetterSetter_recognizeMFollowedByCapital")
-        << 2
-        << _("\n"
-             "class Something\n"
-             "{\n"
-             "    int @mFoo;\n"
-             "};\n")
-        << _("\n"
-             "class Something\n"
-             "{\n"
-             "    int mFoo;\n"
-             "\n"
-             "public:\n"
-             "    int foo() const;\n"
-             "    void setFoo(int foo);\n"
-             "};\n"
-             "\n"
-             "int Something::foo() const\n"
-             "{\n"
-             "    return mFoo;\n"
-             "}\n"
-             "\n"
-             "void Something::setFoo(int foo)\n"
-             "{\n"
-             "    mFoo = foo;\n"
-             "}\n");
-}
-void QuickfixTest::testGenerateGetterSetterGeneralTests()
-{
-    QFETCH(int, operation);
-    QFETCH(QByteArray, original);
-    QFETCH(QByteArray, expected);
-
-    QuickFixSettings s;
-    s->setterParameterNameTemplate = "<name>";
-    s->getterInCppFileFrom = 1;
-    s->setterInCppFileFrom = 1;
-
-    GenerateGetterSetter factory;
-    QuickFixOperationTest(singleDocument(original, expected),
-                          &factory,
-                          ProjectExplorer::HeaderPaths(),
-                          operation);
-}
-/// Checks: Only generate getter
-void QuickfixTest::testGenerateGetterSetterOnlyGetter()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "class Foo\n"
-        "{\n"
-        "public:\n"
-        "    int bar@;\n"
-        "};\n";
-    expected =
-        "class Foo\n"
-        "{\n"
-        "public:\n"
-        "    int bar@;\n"
-        "    int getBar() const;\n"
-        "};\n";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original.resize(0);
-    expected =
-        "\n"
-        "int Foo::getBar() const\n"
-        "{\n"
-        "    return bar;\n"
-        "}\n";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    QuickFixSettings s;
-    s->getterInCppFileFrom = 1;
-    s->getterNameTemplate = "get<Name>";
-    GenerateGetterSetter factory;
-    QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 1);
-}
-
-/// Checks: Only generate setter
-void QuickfixTest::testGenerateGetterSetterOnlySetter()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-    QuickFixSettings s;
-    s->setterAsSlot = true; // To be ignored, as we don't have QObjects here.
-
-    // Header File
-    original =
-        "class Foo\n"
-        "{\n"
-        "public:\n"
-        "    int bar@;\n"
-        "};\n";
-    expected =
-        "class Foo\n"
-        "{\n"
-        "public:\n"
-        "    int bar@;\n"
-        "    void setBar(int value);\n"
-        "};\n";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original.resize(0);
-    expected =
-        "\n"
-        "void Foo::setBar(int value)\n"
-        "{\n"
-        "    bar = value;\n"
-        "}\n";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    s->setterInCppFileFrom = 1;
-    s->setterParameterNameTemplate = "value";
-
-    GenerateGetterSetter factory;
-    QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 0);
-}
-
-void QuickfixTest::testGenerateGetterSetterAnonymousClass()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-    QuickFixSettings s;
-    s->setterInCppFileFrom = 1;
-    s->setterParameterNameTemplate = "value";
-
-    // Header File
-    original = R"(
-    class {
-        int @m_foo;
-    } bar;
-)";
-    expected = R"(
-    class {
-        int m_foo;
-
-    public:
-        int foo() const
-        {
-            return m_foo;
-        }
-        void setFoo(int value)
-        {
-            if (m_foo == value)
-                return;
-            m_foo = value;
-            emit fooChanged();
-        }
-        void resetFoo()
-        {
-            setFoo({}); // TODO: Adapt to use your actual default defaultValue
-        }
-
-    signals:
-        void fooChanged();
-
-    private:
-        Q_PROPERTY(int foo READ foo WRITE setFoo RESET resetFoo NOTIFY fooChanged FINAL)
-    } bar;
-)";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    testDocuments << CppTestDocument::create("file.cpp", {}, {});
-
-    GenerateGetterSetter factory;
-    QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 4);
-}
-
-void QuickfixTest::testGenerateGetterSetterInlineInHeaderFile()
-{
-    QList<TestDocumentPtr> testDocuments;
-    const QByteArray original = R"-(
-class Foo {
-public:
-    int bar@;
-};
-)-";
-    const QByteArray expected = R"-(
-class Foo {
-public:
-    int bar;
-    int getBar() const;
-    void setBar(int value);
-    void resetBar();
-signals:
-    void barChanged();
-private:
-    Q_PROPERTY(int bar READ getBar WRITE setBar RESET resetBar NOTIFY barChanged FINAL)
-};
-
-inline int Foo::getBar() const
-{
-    return bar;
-}
-
-inline void Foo::setBar(int value)
-{
-    if (bar == value)
-        return;
-    bar = value;
-    emit barChanged();
-}
-
-inline void Foo::resetBar()
-{
-    setBar({}); // TODO: Adapt to use your actual default defaultValue
-}
-)-";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    QuickFixSettings s;
-    s->setterOutsideClassFrom = 1;
-    s->getterOutsideClassFrom = 1;
-    s->setterParameterNameTemplate = "value";
-    s->getterNameTemplate = "get<Name>";
-
-    GenerateGetterSetter factory;
-    QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 4);
-}
-
-void QuickfixTest::testGenerateGetterSetterOnlySetterHeaderFileWithIncludeGuard()
-{
-    QList<TestDocumentPtr> testDocuments;
-    const QByteArray     original =
-            "#ifndef FILE__H__DECLARED\n"
-            "#define FILE__H__DECLARED\n"
-            "class Foo\n"
-            "{\n"
-            "public:\n"
-            "    int bar@;\n"
-            "};\n"
-            "#endif\n";
-    const QByteArray expected =
-            "#ifndef FILE__H__DECLARED\n"
-            "#define FILE__H__DECLARED\n"
-            "class Foo\n"
-            "{\n"
-            "public:\n"
-            "    int bar@;\n"
-            "    void setBar(int value);\n"
-            "};\n\n"
-            "inline void Foo::setBar(int value)\n"
-            "{\n"
-            "    bar = value;\n"
-            "}\n"
-            "#endif\n";
-
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    QuickFixSettings s;
-    s->setterOutsideClassFrom = 1;
-    s->setterParameterNameTemplate = "value";
-
-    GenerateGetterSetter factory;
-    QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 0);
-}
-
-void QuickfixTest::testGenerateGetterFunctionAsTemplateArg()
-{
-    QList<TestDocumentPtr> testDocuments;
-    const QByteArray original = R"(
-template<typename T> class TS {};
-template<typename T, typename U> class TS<T(U)> {};
-
-class S2 {
-    TS<int(int)> @member;
-};
-)";
-    const QByteArray expected = R"(
-template<typename T> class TS {};
-template<typename T, typename U> class TS<T(U)> {};
-
-class S2 {
-    TS<int(int)> member;
-
-public:
-    const TS<int (int)> &getMember() const
-    {
-        return member;
-    }
-};
-)";
-
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    QuickFixSettings s;
-    s->getterOutsideClassFrom = 0;
-    s->getterInCppFileFrom = 0;
-    s->getterNameTemplate = "get<Name>";
-    s->returnByConstRef = true;
-
-    GenerateGetterSetter factory;
-    QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 1);
-}
-
-class CppCodeStyleSettingsChanger {
-public:
-    CppCodeStyleSettingsChanger(const CppCodeStyleSettings &settings);
-    ~CppCodeStyleSettingsChanger(); // Restore original
-
-    static CppCodeStyleSettings currentSettings();
-
-private:
-    void setSettings(const CppCodeStyleSettings &settings);
-
-    CppCodeStyleSettings m_originalSettings;
-};
-
-CppCodeStyleSettingsChanger::CppCodeStyleSettingsChanger(const CppCodeStyleSettings &settings)
-{
-    m_originalSettings = currentSettings();
-    setSettings(settings);
-}
-
-CppCodeStyleSettingsChanger::~CppCodeStyleSettingsChanger()
-{
-    setSettings(m_originalSettings);
-}
-
-void CppCodeStyleSettingsChanger::setSettings(const CppCodeStyleSettings &settings)
-{
-    QVariant variant;
-    variant.setValue(settings);
-
-    CppToolsSettings::cppCodeStyle()->currentDelegate()->setValue(variant);
-}
-
-CppCodeStyleSettings CppCodeStyleSettingsChanger::currentSettings()
-{
-    return CppToolsSettings::cppCodeStyle()->currentDelegate()->value().value<CppCodeStyleSettings>();
-}
-
-void QuickfixTest::testGenerateGettersSetters_data()
-{
-    QTest::addColumn<QByteArray>("original");
-    QTest::addColumn<QByteArray>("expected");
-
-    const QByteArray onlyReset = R"(
-class Foo {
-public:
-    int bar() const;
-    void setBar(int bar);
-private:
-    int m_bar;
-@};)";
-
-    const QByteArray onlyResetAfter = R"(
-class @Foo {
-public:
-    int bar() const;
-    void setBar(int bar);
-    void resetBar();
-
-private:
-    int m_bar;
-};
-inline void Foo::resetBar()
-{
-    setBar({}); // TODO: Adapt to use your actual default defaultValue
-}
-)";
-    QTest::addRow("only reset") << onlyReset << onlyResetAfter;
-
-    const QByteArray withCandidates = R"(
-class @Foo {
-public:
-    int bar() const;
-    void setBar(int bar) { m_bar = bar; }
-
-    int getBar2() const;
-
-    int m_alreadyPublic;
-
-private:
-    friend void distraction();
-    class AnotherDistraction {};
-    enum EvenMoreDistraction { val1, val2 };
-
-    int m_bar;
-    int bar2_;
-    QString bar3;
-};)";
-    const QByteArray after = R"(
-class Foo {
-public:
-    int bar() const;
-    void setBar(int bar) { m_bar = bar; }
-
-    int getBar2() const;
-
-    int m_alreadyPublic;
-
-    void resetBar();
-    void setBar2(int value);
-    void resetBar2();
-    const QString &getBar3() const;
-    void setBar3(const QString &value);
-    void resetBar3();
-
-signals:
-    void bar2Changed();
-    void bar3Changed();
-
-private:
-    friend void distraction();
-    class AnotherDistraction {};
-    enum EvenMoreDistraction { val1, val2 };
-
-    int m_bar;
-    int bar2_;
-    QString bar3;
-    Q_PROPERTY(int bar2 READ getBar2 WRITE setBar2 RESET resetBar2 NOTIFY bar2Changed FINAL)
-    Q_PROPERTY(QString bar3 READ getBar3 WRITE setBar3 RESET resetBar3 NOTIFY bar3Changed FINAL)
-};
-inline void Foo::resetBar()
-{
-    setBar({}); // TODO: Adapt to use your actual default defaultValue
-}
-
-inline void Foo::setBar2(int value)
-{
-    if (bar2_ == value)
-        return;
-    bar2_ = value;
-    emit bar2Changed();
-}
-
-inline void Foo::resetBar2()
-{
-    setBar2({}); // TODO: Adapt to use your actual default defaultValue
-}
-
-inline const QString &Foo::getBar3() const
-{
-    return bar3;
-}
-
-inline void Foo::setBar3(const QString &value)
-{
-    if (bar3 == value)
-        return;
-    bar3 = value;
-    emit bar3Changed();
-}
-
-inline void Foo::resetBar3()
-{
-    setBar3({}); // TODO: Adapt to use your actual default defaultValue
-}
-)";
-    QTest::addRow("with candidates") << withCandidates << after;
-}
-
-void QuickfixTest::testGenerateGettersSetters()
-{
-    class TestFactory : public GenerateGettersSettersForClass
-    {
-    public:
-        TestFactory() { setTest(); }
-    };
-
-    QFETCH(QByteArray, original);
-    QFETCH(QByteArray, expected);
-
-    QuickFixSettings s;
-    s->getterNameTemplate = "get<Name>";
-    s->setterParameterNameTemplate = "value";
-    s->setterOutsideClassFrom = 1;
-    s->getterOutsideClassFrom = 1;
-    s->returnByConstRef = true;
-
-    TestFactory factory;
-    QuickFixOperationTest({CppTestDocument::create("file.h", original, expected)}, &factory);
-}
-
-void QuickfixTest::testInsertQtPropertyMembers_data()
-{
-    QTest::addColumn<QByteArray>("original");
-    QTest::addColumn<QByteArray>("expected");
-
-    QTest::newRow("InsertQtPropertyMembers")
-        << _("struct QObject { void connect(); }\n"
-             "struct XmarksTheSpot : public QObject {\n"
-             "    @Q_PROPERTY(int it READ getIt WRITE setIt RESET resetIt NOTIFY itChanged)\n"
-             "};\n")
-        << _("struct QObject { void connect(); }\n"
-             "struct XmarksTheSpot : public QObject {\n"
-             "    Q_PROPERTY(int it READ getIt WRITE setIt RESET resetIt NOTIFY itChanged)\n"
-             "\n"
-             "public:\n"
-             "    int getIt() const;\n"
-             "\n"
-             "public slots:\n"
-             "    void setIt(int it)\n"
-             "    {\n"
-             "        if (m_it == it)\n"
-             "            return;\n"
-             "        m_it = it;\n"
-             "        emit itChanged(m_it);\n"
-             "    }\n"
-             "    void resetIt()\n"
-             "    {\n"
-             "        setIt({}); // TODO: Adapt to use your actual default value\n"
-             "    }\n"
-             "\n"
-             "signals:\n"
-             "    void itChanged(int it);\n"
-             "\n"
-             "private:\n"
-             "    int m_it;\n"
-             "};\n"
-             "\n"
-             "int XmarksTheSpot::getIt() const\n"
-             "{\n"
-             "    return m_it;\n"
-             "}\n");
-
-    QTest::newRow("InsertQtPropertyMembersResetWithoutSet")
-        << _("struct QObject { void connect(); }\n"
-             "struct XmarksTheSpot : public QObject {\n"
-             "    @Q_PROPERTY(int it READ getIt RESET resetIt NOTIFY itChanged)\n"
-             "};\n")
-        << _("struct QObject { void connect(); }\n"
-             "struct XmarksTheSpot : public QObject {\n"
-             "    Q_PROPERTY(int it READ getIt RESET resetIt NOTIFY itChanged)\n"
-             "\n"
-             "public:\n"
-             "    int getIt() const;\n"
-             "\n"
-             "public slots:\n"
-             "    void resetIt()\n"
-             "    {\n"
-             "        static int defaultValue{}; // TODO: Adapt to use your actual default "
-             "value\n"
-             "        if (m_it == defaultValue)\n"
-             "            return;\n"
-             "        m_it = defaultValue;\n"
-             "        emit itChanged(m_it);\n"
-             "    }\n"
-             "\n"
-             "signals:\n"
-             "    void itChanged(int it);\n"
-             "\n"
-             "private:\n"
-             "    int m_it;\n"
-             "};\n"
-             "\n"
-             "int XmarksTheSpot::getIt() const\n"
-             "{\n"
-             "    return m_it;\n"
-             "}\n");
-
-    QTest::newRow("InsertQtPropertyMembersResetWithoutSetAndNotify")
-        << _("struct QObject { void connect(); }\n"
-             "struct XmarksTheSpot : public QObject {\n"
-             "    @Q_PROPERTY(int it READ getIt RESET resetIt)\n"
-             "};\n")
-        << _("struct QObject { void connect(); }\n"
-             "struct XmarksTheSpot : public QObject {\n"
-             "    Q_PROPERTY(int it READ getIt RESET resetIt)\n"
-             "\n"
-             "public:\n"
-             "    int getIt() const;\n"
-             "\n"
-             "public slots:\n"
-             "    void resetIt()\n"
-             "    {\n"
-             "        static int defaultValue{}; // TODO: Adapt to use your actual default "
-             "value\n"
-             "        m_it = defaultValue;\n"
-             "    }\n"
-             "\n"
-             "private:\n"
-             "    int m_it;\n"
-             "};\n"
-             "\n"
-             "int XmarksTheSpot::getIt() const\n"
-             "{\n"
-             "    return m_it;\n"
-             "}\n");
-
-    QTest::newRow("InsertQtPropertyMembersPrivateBeforePublic")
-        << _("struct QObject { void connect(); }\n"
-             "class XmarksTheSpot : public QObject {\n"
-             "private:\n"
-             "    @Q_PROPERTY(int it READ getIt WRITE setIt NOTIFY itChanged)\n"
-             "public:\n"
-             "    void find();\n"
-             "};\n")
-        << _("struct QObject { void connect(); }\n"
-             "class XmarksTheSpot : public QObject {\n"
-             "private:\n"
-             "    Q_PROPERTY(int it READ getIt WRITE setIt NOTIFY itChanged)\n"
-             "    int m_it;\n"
-             "\n"
-             "public:\n"
-             "    void find();\n"
-             "    int getIt() const;\n"
-             "public slots:\n"
-             "    void setIt(int it)\n"
-             "    {\n"
-             "        if (m_it == it)\n"
-             "            return;\n"
-             "        m_it = it;\n"
-             "        emit itChanged(m_it);\n"
-             "    }\n"
-             "signals:\n"
-             "    void itChanged(int it);\n"
-             "};\n"
-             "\n"
-             "int XmarksTheSpot::getIt() const\n"
-             "{\n"
-             "    return m_it;\n"
-             "}\n");
-}
-
-void QuickfixTest::testInsertQtPropertyMembers()
-{
-    QFETCH(QByteArray, original);
-    QFETCH(QByteArray, expected);
-
-    QuickFixSettings s;
-    s->setterAsSlot = true;
-    s->setterInCppFileFrom = 0;
-    s->setterParameterNameTemplate = "<name>";
-    s->signalWithNewValue = true;
-
-    InsertQtPropertyMembers factory;
-    QuickFixOperationTest({CppTestDocument::create("file.cpp", original, expected)}, &factory);
-}
-
-void QuickfixTest::testInsertMemberFromUse_data()
-{
-    QTest::addColumn<QByteArray>("original");
-    QTest::addColumn<QByteArray>("expected");
-
-    QByteArray original;
-    QByteArray expected;
-
-    original =
-            "class C {\n"
-            "public:\n"
-            "    C(int x) : @m_x(x) {}\n"
-            "private:\n"
-            "    int m_y;\n"
-            "};\n";
-    expected =
-            "class C {\n"
-            "public:\n"
-            "    C(int x) : m_x(x) {}\n"
-            "private:\n"
-            "    int m_y;\n"
-            "    int m_x;\n"
-            "};\n";
-    QTest::addRow("inline constructor") << original << expected;
-
-    original =
-        "class C {\n"
-        "public:\n"
-        "    C(int x, double d);\n"
-        "private:\n"
-        "    int m_x;\n"
-        "};\n"
-        "C::C(int x, double d) : m_x(x), @m_d(d)\n";
-    expected =
-        "class C {\n"
-        "public:\n"
-        "    C(int x, double d);\n"
-        "private:\n"
-        "    int m_x;\n"
-        "    double m_d;\n"
-        "};\n"
-        "C::C(int x, double d) : m_x(x), m_d(d)\n";
-    QTest::addRow("out-of-line constructor") << original << expected;
-
-    original =
-            "class C {\n"
-            "public:\n"
-            "    C(int x) : @m_x(x) {}\n"
-            "private:\n"
-            "    int m_x;\n"
-            "};\n";
-    expected = "";
-    QTest::addRow("member already present") << original << expected;
-
-    original =
-            "int func() { return 0; }\n"
-            "class C {\n"
-            "public:\n"
-            "    C() : @m_x(func()) {}\n"
-            "private:\n"
-            "    int m_y;\n"
-            "};\n";
-    expected =
-            "int func() { return 0; }\n"
-            "class C {\n"
-            "public:\n"
-            "    C() : m_x(func()) {}\n"
-            "private:\n"
-            "    int m_y;\n"
-            "    int m_x;\n"
-            "};\n";
-    QTest::addRow("initialization via function call") << original << expected;
-
-    original =
-        "struct S {\n\n};\n"
-        "class C {\n"
-        "public:\n"
-        "    void setValue(int v) { m_s.@value = v; }\n"
-        "private:\n"
-        "    S m_s;\n"
-        "};\n";
-    expected =
-        "struct S {\n\n"
-        "    int value;\n"
-        "};\n"
-        "class C {\n"
-        "public:\n"
-        "    void setValue(int v) { m_s.value = v; }\n"
-        "private:\n"
-        "    S m_s;\n"
-        "};\n";
-    QTest::addRow("add member to other struct") << original << expected;
-
-    original =
-        "struct S {\n\n};\n"
-        "class C {\n"
-        "public:\n"
-        "    void setValue(int v) { S::@value = v; }\n"
-        "};\n";
-    expected =
-        "struct S {\n\n"
-        "    static int value;\n"
-        "};\n"
-        "class C {\n"
-        "public:\n"
-        "    void setValue(int v) { S::value = v; }\n"
-        "};\n";
-    QTest::addRow("add static member to other struct (explicit)") << original << expected;
-
-    original =
-        "struct S {\n\n};\n"
-        "class C {\n"
-        "public:\n"
-        "    void setValue(int v) { m_s.@value = v; }\n"
-        "private:\n"
-        "    static S m_s;\n"
-        "};\n";
-    expected =
-        "struct S {\n\n"
-        "    static int value;\n"
-        "};\n"
-        "class C {\n"
-        "public:\n"
-        "    void setValue(int v) { m_s.value = v; }\n"
-        "private:\n"
-        "    static S m_s;\n"
-        "};\n";
-    QTest::addRow("add static member to other struct (implicit)") << original << expected;
-
-    original =
-        "class C {\n"
-        "public:\n"
-        "    void setValue(int v);\n"
-        "};\n"
-        "void C::setValue(int v) { this->@m_value = v; }\n";
-    expected =
-        "class C {\n"
-        "public:\n"
-        "    void setValue(int v);\n"
-        "private:\n"
-        "    int m_value;\n"
-        "};\n"
-        "void C::setValue(int v) { this->@m_value = v; }\n";
-    QTest::addRow("add member to this (explicit)") << original << expected;
-
-    original =
-        "class C {\n"
-        "public:\n"
-        "    void setValue(int v) { @m_value = v; }\n"
-        "};\n";
-    expected =
-        "class C {\n"
-        "public:\n"
-        "    void setValue(int v) { m_value = v; }\n"
-        "private:\n"
-        "    int m_value;\n"
-        "};\n";
-    QTest::addRow("add member to this (implicit)") << original << expected;
-
-    original =
-        "class C {\n"
-        "public:\n"
-        "    static void setValue(int v) { @m_value = v; }\n"
-        "};\n";
-    expected =
-        "class C {\n"
-        "public:\n"
-        "    static void setValue(int v) { m_value = v; }\n"
-        "private:\n"
-        "    static int m_value;\n"
-        "};\n";
-    QTest::addRow("add static member to this (inline)") << original << expected;
-
-    original =
-        "class C {\n"
-        "public:\n"
-        "    static void setValue(int v);\n"
-        "};\n"
-        "void C::setValue(int v) { @m_value = v; }\n";
-    expected =
-        "class C {\n"
-        "public:\n"
-        "    static void setValue(int v);\n"
-        "private:\n"
-        "    static int m_value;\n"
-        "};\n"
-        "void C::setValue(int v) { @m_value = v; }\n";
-    QTest::addRow("add static member to this (non-inline)") << original << expected;
-
-    original =
-        "struct S {\n\n};\n"
-        "class C {\n"
-        "public:\n"
-        "    void setValue(int v) { m_s.@setValue(v); }\n"
-        "private:\n"
-        "    S m_s;\n"
-        "};\n";
-    expected =
-        "struct S {\n\n"
-        "    void setValue(int);\n"
-        "};\n"
-        "class C {\n"
-        "public:\n"
-        "    void setValue(int v) { m_s.setValue(v); }\n"
-        "private:\n"
-        "    S m_s;\n"
-        "};\n";
-    QTest::addRow("add member function to other struct") << original << expected;
-
-    original =
-        "struct S {\n\n};\n"
-        "class C {\n"
-        "public:\n"
-        "    void setValue(int v) { S::@setValue(v); }\n"
-        "};\n";
-    expected =
-        "struct S {\n\n"
-        "    static void setValue(int);\n"
-        "};\n"
-        "class C {\n"
-        "public:\n"
-        "    void setValue(int v) { S::setValue(v); }\n"
-        "};\n";
-    QTest::addRow("add static member function to other struct (explicit)") << original << expected;
-
-    original =
-        "struct S {\n\n};\n"
-        "class C {\n"
-        "public:\n"
-        "    void setValue(int v) { m_s.@setValue(v); }\n"
-        "private:\n"
-        "    static S m_s;\n"
-        "};\n";
-    expected =
-        "struct S {\n\n"
-        "    static void setValue(int);\n"
-        "};\n"
-        "class C {\n"
-        "public:\n"
-        "    void setValue(int v) { m_s.setValue(v); }\n"
-        "private:\n"
-        "    static S m_s;\n"
-        "};\n";
-    QTest::addRow("add static member function to other struct (implicit)") << original << expected;
-
-    original =
-        "class C {\n"
-        "public:\n"
-        "    void setValue(int v);\n"
-        "};\n"
-        "void C::setValue(int v) { this->@setValueInternal(v); }\n";
-    expected =
-        "class C {\n"
-        "public:\n"
-        "    void setValue(int v);\n"
-        "private:\n"
-        "    void setValueInternal(int);\n"
-        "};\n"
-        "void C::setValue(int v) { this->setValueInternal(v); }\n";
-    QTest::addRow("add member function to this (explicit)") << original << expected;
-
-    original =
-        "class C {\n"
-        "public:\n"
-        "    void setValue(int v) { @setValueInternal(v); }\n"
-        "};\n";
-    expected =
-        "class C {\n"
-        "public:\n"
-        "    void setValue(int v) { setValueInternal(v); }\n"
-        "private:\n"
-        "    void setValueInternal(int);\n"
-        "};\n";
-    QTest::addRow("add member function to this (implicit)") << original << expected;
-
-    original =
-        "class C {\n"
-        "public:\n"
-        "    int value() const { return @valueInternal(); }\n"
-        "};\n";
-    expected =
-        "class C {\n"
-        "public:\n"
-        "    int value() const { return valueInternal(); }\n"
-        "private:\n"
-        "    int valueInternal() const;\n"
-        "};\n";
-    QTest::addRow("add const member function to this (implicit)") << original << expected;
-
-    original =
-        "class C {\n"
-        "public:\n"
-        "    static int value() { int i = @valueInternal(); return i; }\n"
-        "};\n";
-    expected =
-        "class C {\n"
-        "public:\n"
-        "    static int value() { int i = @valueInternal(); return i; }\n"
-        "private:\n"
-        "    static int valueInternal();\n"
-        "};\n";
-    QTest::addRow("add static member function to this (inline)") << original << expected;
-
-    original =
-        "class C {\n"
-        "public:\n"
-        "    static int value();\n"
-        "};\n"
-        "int C::value() { return @valueInternal(); }\n";
-    expected =
-        "class C {\n"
-        "public:\n"
-        "    static int value();\n"
-        "private:\n"
-        "    static int valueInternal();\n"
-        "};\n"
-        "int C::value() { return valueInternal(); }\n";
-    QTest::addRow("add static member function to this (non-inline)") << original << expected;
-}
-
-void QuickfixTest::testInsertMemberFromUse()
-{
-    QFETCH(QByteArray, original);
-    QFETCH(QByteArray, expected);
-
-    QList<TestDocumentPtr> testDocuments({
-        CppTestDocument::create("file.h", original, expected)
-    });
-
-    AddDeclarationForUndeclaredIdentifier factory;
-    factory.setMembersOnly();
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-/// Check if definition is inserted right after class for insert definition outside
-void QuickfixTest::testInsertDefFromDeclAfterClass()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "class Foo\n"
-        "{\n"
-        "    Foo();\n"
-        "    void a@();\n"
-        "};\n"
-        "\n"
-        "class Bar {};\n";
-    expected =
-        "class Foo\n"
-        "{\n"
-        "    Foo();\n"
-        "    void a();\n"
-        "};\n"
-        "\n"
-        "inline void Foo::a()\n"
-        "{\n\n}\n"
-        "\n"
-        "class Bar {};\n";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"file.h\"\n"
-        "\n"
-        "Foo::Foo()\n"
-        "{\n\n"
-        "}\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 1);
-}
-
-/// Check from header file: If there is a source file, insert the definition in the source file.
-/// Case: Source file is empty.
-void QuickfixTest::testInsertDefFromDeclHeaderSourceBasic1()
-{
-    QList<TestDocumentPtr> testDocuments;
-
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "struct Foo\n"
-        "{\n"
-        "    Foo()@;\n"
-        "};\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original.resize(0);
-    expected =
-        "\n"
-        "Foo::Foo()\n"
-        "{\n\n"
-        "}\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-/// Check from header file: If there is a source file, insert the definition in the source file.
-/// Case: Source file is not empty.
-void QuickfixTest::testInsertDefFromDeclHeaderSourceBasic2()
-{
-    QList<TestDocumentPtr> testDocuments;
-
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original = "void f(const std::vector<int> &v)@;\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-            "#include \"file.h\"\n"
-            "\n"
-            "int x;\n"
-            ;
-    expected =
-            "#include \"file.h\"\n"
-            "\n"
-            "int x;\n"
-            "\n"
-            "void f(const std::vector<int> &v)\n"
-            "{\n"
-            "\n"
-            "}\n"
-            ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-/// Check from source file: Insert in source file, not header file.
-void QuickfixTest::testInsertDefFromDeclHeaderSourceBasic3()
-{
-    QList<TestDocumentPtr> testDocuments;
-
-    QByteArray original;
-    QByteArray expected;
-
-    // Empty Header File
-    testDocuments << CppTestDocument::create("file.h", "", "");
-
-    // Source File
-    original =
-        "struct Foo\n"
-        "{\n"
-        "    Foo()@;\n"
-        "};\n";
-    expected = original +
-        "\n"
-        "Foo::Foo()\n"
-        "{\n\n"
-        "}\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-/// Check from header file: If the class is in a namespace, the added function definition
-/// name must be qualified accordingly.
-void QuickfixTest::testInsertDefFromDeclHeaderSourceNamespace1()
-{
-    QList<TestDocumentPtr> testDocuments;
-
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "namespace N {\n"
-        "struct Foo\n"
-        "{\n"
-        "    Foo()@;\n"
-        "};\n"
-        "}\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original.resize(0);
-    expected =
-        "\n"
-        "N::Foo::Foo()\n"
-        "{\n\n"
-        "}\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-/// Check from header file: If the class is in namespace N and the source file has a
-/// "using namespace N" line, the function definition name must be qualified accordingly.
-void QuickfixTest::testInsertDefFromDeclHeaderSourceNamespace2()
-{
-    QList<TestDocumentPtr> testDocuments;
-
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "namespace N {\n"
-        "struct Foo\n"
-        "{\n"
-        "    Foo()@;\n"
-        "};\n"
-        "}\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-            "#include \"file.h\"\n"
-            "using namespace N;\n"
-            ;
-    expected = original +
-            "\n"
-            "Foo::Foo()\n"
-            "{\n\n"
-            "}\n"
-            ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-/// Check definition insert inside class
-void QuickfixTest::testInsertDefFromDeclInsideClass()
-{
-    const QByteArray original =
-        "class Foo {\n"
-        "    void b@ar();\n"
-        "};";
-    const QByteArray expected =
-        "class Foo {\n"
-        "    void bar()\n"
-        "    {\n\n"
-        "    }\n"
-        "};";
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory, ProjectExplorer::HeaderPaths(),
-                          1);
-}
-
-/// Check not triggering when definition exists
-void QuickfixTest::testInsertDefFromDeclNotTriggeringWhenDefinitionExists()
-{
-    const QByteArray original =
-            "class Foo {\n"
-            "    void b@ar();\n"
-            "};\n"
-            "void Foo::bar() {}\n";
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(singleDocument(original, ""), &factory, ProjectExplorer::HeaderPaths(), 1);
-}
-
-/// Find right implementation file.
-void QuickfixTest::testInsertDefFromDeclFindRightImplementationFile()
-{
-    QList<TestDocumentPtr> testDocuments;
-
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "struct Foo\n"
-        "{\n"
-        "    Foo();\n"
-        "    void a();\n"
-        "    void b@();\n"
-        "};\n"
-        "}\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File #1
-    original =
-            "#include \"file.h\"\n"
-            "\n"
-            "Foo::Foo()\n"
-            "{\n\n"
-            "}\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-
-    // Source File #2
-    original =
-            "#include \"file.h\"\n"
-            "\n"
-            "void Foo::a()\n"
-            "{\n\n"
-            "}\n";
-    expected = original +
-            "\n"
-            "void Foo::b()\n"
-            "{\n\n"
-            "}\n";
-    testDocuments << CppTestDocument::create("file2.cpp", original, expected);
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-/// Ignore generated functions declarations when looking at the surrounding
-/// functions declarations in order to find the right implementation file.
-void QuickfixTest::testInsertDefFromDeclIgnoreSurroundingGeneratedDeclarations()
-{
-    QList<TestDocumentPtr> testDocuments;
-
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "#define DECLARE_HIDDEN_FUNCTION void hidden();\n"
-        "struct Foo\n"
-        "{\n"
-        "    void a();\n"
-        "    DECLARE_HIDDEN_FUNCTION\n"
-        "    void b@();\n"
-        "};\n"
-        "}\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File #1
-    original =
-            "#include \"file.h\"\n"
-            "\n"
-            "void Foo::a()\n"
-            "{\n\n"
-            "}\n";
-    expected =
-            "#include \"file.h\"\n"
-            "\n"
-            "void Foo::a()\n"
-            "{\n\n"
-            "}\n"
-            "\n"
-            "void Foo::b()\n"
-            "{\n\n"
-            "}\n";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    // Source File #2
-    original =
-            "#include \"file.h\"\n"
-            "\n"
-            "void Foo::hidden()\n"
-            "{\n\n"
-            "}\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("file2.cpp", original, expected);
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-/// Check if whitespace is respected for operator functions
-void QuickfixTest::testInsertDefFromDeclRespectWsInOperatorNames1()
-{
-    QByteArray original =
-        "class Foo\n"
-        "{\n"
-        "    Foo &opera@tor =();\n"
-        "};\n";
-    QByteArray expected =
-        "class Foo\n"
-        "{\n"
-        "    Foo &operator =();\n"
-        "};\n"
-        "\n"
-        "Foo &Foo::operator =()\n"
-        "{\n"
-        "\n"
-        "}\n";
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-}
-
-/// Check if whitespace is respected for operator functions
-void QuickfixTest::testInsertDefFromDeclRespectWsInOperatorNames2()
-{
-    QByteArray original =
-        "class Foo\n"
-        "{\n"
-        "    Foo &opera@tor=();\n"
-        "};\n";
-    QByteArray expected =
-        "class Foo\n"
-        "{\n"
-        "    Foo &operator=();\n"
-        "};\n"
-        "\n"
-        "Foo &Foo::operator=()\n"
-        "{\n"
-        "\n"
-        "}\n";
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-}
-
-/// Check that the noexcept exception specifier is transferred
-void QuickfixTest::testInsertDefFromDeclNoexceptSpecifier()
-{
-    QByteArray original =
-        "class Foo\n"
-        "{\n"
-        "    void @foo() noexcept(false);\n"
-        "};\n";
-    QByteArray expected =
-        "class Foo\n"
-        "{\n"
-        "    void foo() noexcept(false);\n"
-        "};\n"
-        "\n"
-        "void Foo::foo() noexcept(false)\n"
-        "{\n"
-        "\n"
-        "}\n";
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-}
-
-/// Check if a function like macro use is not separated by the function to insert
-/// Case: Macro preceded by preproceesor directives and declaration.
-void QuickfixTest::testInsertDefFromDeclMacroUsesAtEndOfFile1()
-{
-    QList<TestDocumentPtr> testDocuments;
-
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original = "void f()@;\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-            "#include \"file.h\"\n"
-            "#define MACRO(X) X x;\n"
-            "int lala;\n"
-            "\n"
-            "MACRO(int)\n"
-            ;
-    expected =
-            "#include \"file.h\"\n"
-            "#define MACRO(X) X x;\n"
-            "int lala;\n"
-            "\n"
-            "\n"
-            "\n"
-            "void f()\n"
-            "{\n"
-            "\n"
-            "}\n"
-            "\n"
-            "MACRO(int)\n"
-            ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-/// Check if a function like macro use is not separated by the function to insert
-/// Case: Marco preceded only by preprocessor directives.
-void QuickfixTest::testInsertDefFromDeclMacroUsesAtEndOfFile2()
-{
-    QList<TestDocumentPtr> testDocuments;
-
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original = "void f()@;\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-            "#include \"file.h\"\n"
-            "#define MACRO(X) X x;\n"
-            "\n"
-            "MACRO(int)\n"
-            ;
-    expected =
-            "#include \"file.h\"\n"
-            "#define MACRO(X) X x;\n"
-            "\n"
-            "\n"
-            "\n"
-            "void f()\n"
-            "{\n"
-            "\n"
-            "}\n"
-            "\n"
-            "MACRO(int)\n"
-            ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-/// Check if insertion happens before syntactically erroneous statements at end of file.
-void QuickfixTest::testInsertDefFromDeclErroneousStatementAtEndOfFile()
-{
-    QList<TestDocumentPtr> testDocuments;
-
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original = "void f()@;\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-            "#include \"file.h\"\n"
-            "\n"
-            "MissingSemicolon(int)\n"
-            ;
-    expected =
-            "#include \"file.h\"\n"
-            "\n"
-            "\n"
-            "\n"
-            "void f()\n"
-            "{\n"
-            "\n"
-            "}\n"
-            "\n"
-            "MissingSemicolon(int)\n"
-            ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-/// Check: Respect rvalue references
-void QuickfixTest::testInsertDefFromDeclRvalueReference()
-{
-    QList<TestDocumentPtr> testDocuments;
-
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original = "void f(Foo &&)@;\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original = "";
-    expected =
-            "\n"
-            "void f(Foo &&)\n"
-            "{\n"
-            "\n"
-            "}\n"
-            ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testInsertDefFromDeclFunctionTryBlock()
-{
-    QList<TestDocumentPtr> testDocuments;
-
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original = R"(
-struct Foo {
-    void tryCatchFunc();
-    void @otherFunc();
-};
-)";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original = R"(
-#include "file.h"
-
-void Foo::tryCatchFunc() try {} catch (...) {}
-)";
-    expected = R"(
-#include "file.h"
-
-void Foo::tryCatchFunc() try {} catch (...) {}
-
-void Foo::otherFunc()
-{
-
-}
-)";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testInsertDefFromDeclUsingDecl()
-{
-    QList<TestDocumentPtr> testDocuments;
-
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original = R"(
-namespace N { struct S; }
-using N::S;
-
-void @func(const S &s);
-)";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original = R"(
-#include "file.h"
-)";
-    expected = R"(
-#include "file.h"
-
-void func(const S &s)
-{
-
-}
-)";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(testDocuments, &factory);
-
-    testDocuments.clear();
-    original = R"(
-namespace N1 {
-namespace N2 { struct S; }
-using N2::S;
-}
-
-void @func(const N1::S &s);
-)";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original = R"(
-#include "file.h"
-)";
-    expected = R"(
-#include "file.h"
-
-void func(const N1::S &s)
-{
-
-}
-)";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QuickFixOperationTest(testDocuments, &factory);
-
-    // No using declarations here, but the code model has one. No idea why.
-    testDocuments.clear();
-    original = R"(
-class B {};
-class D : public B {
-    @D();
-};
-)";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original = R"(
-#include "file.h"
-)";
-    expected = R"(
-#include "file.h"
-
-D::D()
-{
-
-}
-)";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QuickFixOperationTest(testDocuments, &factory);
-
-    testDocuments.clear();
-    original = R"(
-namespace ns1 { template<typename T> class span {}; }
-
-namespace ns {
-using ns1::span;
-class foo
-{
-    void @bar(ns::span<int>);
-};
-}
-)";
-    expected = R"(
-namespace ns1 { template<typename T> class span {}; }
-
-namespace ns {
-using ns1::span;
-class foo
-{
-    void bar(ns::span<int>);
-};
-
-void foo::bar(ns::span<int>)
-{
-
-}
-
-}
-)";
-    // TODO: Unneeded namespace gets inserted in RewriteName::visit(const QualifiedNameId *)
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-/// Find right implementation file. (QTCREATORBUG-10728)
-void QuickfixTest::testInsertDefFromDeclFindImplementationFile()
-{
-    QList<TestDocumentPtr> testDocuments;
-
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-            "class Foo {\n"
-            "    void bar();\n"
-            "    void ba@z();\n"
-            "};\n"
-            "\n"
-            "void Foo::bar()\n"
-            "{}\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-            "#include \"file.h\"\n"
-            ;
-    expected =
-            "#include \"file.h\"\n"
-            "\n"
-            "void Foo::baz()\n"
-            "{\n"
-            "\n"
-            "}\n"
-            ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testInsertDefFromDeclUnicodeIdentifier()
-{
-    QList<TestDocumentPtr> testDocuments;
-
-    QByteArray original;
-    QByteArray expected;
-
-    //
-    // The following "non-latin1" code points are used in the tests:
-    //
-    //   U+00FC  - 2 code units in UTF8, 1 in UTF16 - LATIN SMALL LETTER U WITH DIAERESIS
-    //   U+4E8C  - 3 code units in UTF8, 1 in UTF16 - CJK UNIFIED IDEOGRAPH-4E8C
-    //   U+10302 - 4 code units in UTF8, 2 in UTF16 - OLD ITALIC LETTER KE
-    //
-
-#define UNICODE_U00FC "\xc3\xbc"
-#define UNICODE_U4E8C "\xe4\xba\x8c"
-#define UNICODE_U10302 "\xf0\x90\x8c\x82"
-#define TEST_UNICODE_IDENTIFIER UNICODE_U00FC UNICODE_U4E8C UNICODE_U10302
-
-    original =
-            "class Foo {\n"
-            "    void @" TEST_UNICODE_IDENTIFIER "();\n"
-            "};\n";
-            ;
-    expected = original;
-    expected +=
-            "\n"
-            "void Foo::" TEST_UNICODE_IDENTIFIER "()\n"
-            "{\n"
-            "\n"
-            "}\n";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-#undef UNICODE_U00FC
-#undef UNICODE_U4E8C
-#undef UNICODE_U10302
-#undef TEST_UNICODE_IDENTIFIER
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testInsertDefFromDeclTemplateClass()
-{
-    QByteArray original =
-        "template<class T>\n"
-        "class Foo\n"
-        "{\n"
-        "    void fun@c1();\n"
-        "    void func2();\n"
-        "};\n\n"
-        "template<class T>\n"
-        "void Foo<T>::func2() {}\n";
-    QByteArray expected =
-        "template<class T>\n"
-        "class Foo\n"
-        "{\n"
-        "    void func1();\n"
-        "    void func2();\n"
-        "};\n\n"
-        "template<class T>\n"
-        "void Foo<T>::func1()\n"
-        "{\n"
-        "\n"
-        "}\n\n"
-        "template<class T>\n"
-        "void Foo<T>::func2() {}\n";
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-}
-
-void QuickfixTest::testInsertDefFromDeclTemplateClassWithValueParam()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original =
-        "template<typename T, int size> struct MyArray {};\n"
-        "MyArray<int, 1> @foo();";
-    QByteArray expected = original;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    original = "#include \"file.h\"\n";
-    expected =
-        "#include \"file.h\"\n\n"
-        "MyArray<int, 1> foo()\n"
-        "{\n\n"
-        "}\n";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testInsertDefFromDeclTemplateFunction()
-{
-    QByteArray original =
-        "class Foo\n"
-        "{\n"
-        "    template<class T>\n"
-        "    void fun@c();\n"
-        "};\n";
-    QByteArray expected =
-        "class Foo\n"
-        "{\n"
-        "    template<class T>\n"
-        "    void fun@c();\n"
-        "};\n"
-        "\n"
-        "template<class T>\n"
-        "void Foo::func()\n"
-        "{\n"
-        "\n"
-        "}\n";
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-}
-
-void QuickfixTest::testInsertDefFromDeclTemplateClassAndTemplateFunction()
-{
-    QByteArray original =
-        "template<class T>"
-        "class Foo\n"
-        "{\n"
-        "    template<class U>\n"
-        "    T fun@c(U u);\n"
-        "};\n";
-    QByteArray expected =
-        "template<class T>"
-        "class Foo\n"
-        "{\n"
-        "    template<class U>\n"
-        "    T fun@c(U u);\n"
-        "};\n"
-        "\n"
-        "template<class T>\n"
-        "template<class U>\n"
-        "T Foo<T>::func(U u)\n"
-        "{\n"
-        "\n"
-        "}\n";
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-}
-
-void QuickfixTest::testInsertDefFromDeclTemplateClassAndFunctionInsideNamespace()
-{
-    QByteArray original =
-        "namespace N {\n"
-        "template<class T>"
-        "class Foo\n"
-        "{\n"
-        "    template<class U>\n"
-        "    T fun@c(U u);\n"
-        "};\n"
-        "}\n";
-    QByteArray expected =
-        "namespace N {\n"
-        "template<class T>"
-        "class Foo\n"
-        "{\n"
-        "    template<class U>\n"
-        "    T fun@c(U u);\n"
-        "};\n"
-        "\n"
-        "template<class T>\n"
-        "template<class U>\n"
-        "T Foo<T>::func(U u)\n"
-        "{\n"
-        "\n"
-        "}\n"
-        "\n"
-        "}\n";
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-}
-
-void QuickfixTest::testInsertDefFromDeclFunctionWithSignedUnsignedArgument()
-{
-    QByteArray original;
-    QByteArray expected;
-    InsertDefFromDecl factory;
-
-    original =R"--(
-class myclass
-{
-    myc@lass(QVector<signed> g);
-    myclass(QVector<unsigned> g);
-}
-)--";
-    expected =R"--(
-class myclass
-{
-    myclass(QVector<signed> g);
-    myclass(QVector<unsigned> g);
-}
-
-myclass::myclass(QVector<signed int> g)
-{
-
-}
-)--";
-
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-
-    original =R"--(
-class myclass
-{
-    myclass(QVector<signed> g);
-    myc@lass(QVector<unsigned> g);
-}
-)--";
-    expected =R"--(
-class myclass
-{
-    myclass(QVector<signed> g);
-    myclass(QVector<unsigned> g);
-}
-
-myclass::myclass(QVector<unsigned int> g)
-{
-
-}
-)--";
-
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-
-    original =R"--(
-class myclass
-{
-    unsigned f@oo(unsigned);
-}
-)--";
-    expected =R"--(
-class myclass
-{
-    unsigned foo(unsigned);
-}
-
-unsigned int myclass::foo(unsigned int)
-{
-
-}
-)--";
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-
-    original =R"--(
-class myclass
-{
-    signed f@oo(signed);
-}
-)--";
-    expected =R"--(
-class myclass
-{
-    signed foo(signed);
-}
-
-signed int myclass::foo(signed int)
-{
-
-}
-)--";
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-}
-
-void QuickfixTest::testInsertDefFromDeclNotTriggeredForFriendFunc()
-{
-    const QByteArray contents =
-        "class Foo\n"
-        "{\n"
-        "    friend void f@unc();\n"
-        "};\n"
-        "\n";
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(singleDocument(contents, ""), &factory);
-}
-
-void QuickfixTest::testInsertDefFromDeclMinimalFunctionParameterType()
-{
-    QList<TestDocumentPtr> testDocuments;
-
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original = R"(
-class C {
-    typedef int A;
-    A @foo(A);
-};
-)";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original = R"(
-#include "file.h"
-)";
-    expected = R"(
-#include "file.h"
-
-C::A C::foo(A)
-{
-
-}
-)";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(testDocuments, &factory);
-
-    testDocuments.clear();
-    // Header File
-    original = R"(
-namespace N {
-    struct S;
-    S @foo(const S &s);
-};
-)";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original = R"(
-#include "file.h"
-)";
-    expected = R"(
-#include "file.h"
-
-N::S N::foo(const S &s)
-{
-
-}
-)";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testInsertDefFromDeclAliasTemplateAsReturnType()
-{
-    QList<TestDocumentPtr> testDocuments;
-
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original = R"(
-struct foo {
-    struct foo2 {
-        template <typename T> using MyType = T;
-        MyType<int> @bar();
-    };
-};
-)";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original = R"(
-#include "file.h"
-)";
-    expected = R"(
-#include "file.h"
-
-foo::foo2::MyType<int> foo::foo2::bar()
-{
-
-}
-)";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    InsertDefFromDecl factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testInsertDefsFromDecls_data()
-{
-    QTest::addColumn<QByteArrayList>("headers");
-    QTest::addColumn<QByteArrayList>("sources");
-    QTest::addColumn<int>("mode");
-
-    QByteArray origHeader = R"(
-namespace N {
-class @C
-{
-public:
-    friend void ignoredFriend();
-    void ignoredImplemented() {};
-    void ignoredImplemented2(); // Below
-    void ignoredImplemented3(); // In cpp file
-    void funcNotSelected();
-    void funcInline();
-    void funcBelow();
-    void funcCppFile();
-
-signals:
-    void ignoredSignal();
-};
-
-inline void C::ignoredImplemented2() {}
-
-} // namespace N)";
-    QByteArray origSource = R"(
-#include "file.h"
-
-namespace N {
-
-void C::ignoredImplemented3() {}
-
-} // namespace N)";
-
-    QByteArray expectedHeader = R"(
-namespace N {
-class C
-{
-public:
-    friend void ignoredFriend();
-    void ignoredImplemented() {};
-    void ignoredImplemented2(); // Below
-    void ignoredImplemented3(); // In cpp file
-    void funcNotSelected();
-    void funcInline()
-    {
-
-    }
-    void funcBelow();
-    void funcCppFile();
-
-signals:
-    void ignoredSignal();
-};
-
-inline void C::ignoredImplemented2() {}
-
-inline void C::funcBelow()
-{
-
-}
-
-} // namespace N)";
-    QByteArray expectedSource = R"(
-#include "file.h"
-
-namespace N {
-
-void C::ignoredImplemented3() {}
-
-void C::funcCppFile()
-{
-
-}
-
-} // namespace N)";
-    QTest::addRow("normal case")
-            << QByteArrayList{origHeader, expectedHeader}
-            << QByteArrayList{origSource, expectedSource}
-            << int(InsertDefsFromDecls::Mode::Alternating);
-    QTest::addRow("aborted dialog")
-            << QByteArrayList{origHeader, origHeader}
-            << QByteArrayList{origSource, origSource}
-            << int(InsertDefsFromDecls::Mode::Off);
-
-    origHeader = R"(
-        namespace N {
-        class @C
-        {
-        public:
-            friend void ignoredFriend();
-            void ignoredImplemented() {};
-            void ignoredImplemented2(); // Below
-            void ignoredImplemented3(); // In cpp file
-
-        signals:
-            void ignoredSignal();
-        };
-
-        inline void C::ignoredImplemented2() {}
-
-        } // namespace N)";
-    QTest::addRow("no candidates")
-            << QByteArrayList{origHeader, origHeader}
-            << QByteArrayList{origSource, origSource}
-            << int(InsertDefsFromDecls::Mode::Alternating);
-
-    origHeader = R"(
-        namespace N {
-        class @C
-        {
-        public:
-            friend void ignoredFriend();
-            void ignoredImplemented() {};
-
-        signals:
-            void ignoredSignal();
-        };
-        } // namespace N)";
-    QTest::addRow("no member functions")
-            << QByteArrayList{origHeader, ""}
-            << QByteArrayList{origSource, ""}
-            << int(InsertDefsFromDecls::Mode::Alternating);
-}
-
-void QuickfixTest::testInsertDefsFromDecls()
-{
-    QFETCH(QByteArrayList, headers);
-    QFETCH(QByteArrayList, sources);
-    QFETCH(int, mode);
-
-    QList<TestDocumentPtr> testDocuments({
-        CppTestDocument::create("file.h", headers.at(0), headers.at(1)),
-        CppTestDocument::create("file.cpp", sources.at(0), sources.at(1))});
-    InsertDefsFromDecls factory;
-    factory.setMode(static_cast<InsertDefsFromDecls::Mode>(mode));
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testInsertAndFormatDefsFromDecls()
-{
-    if (!isClangFormatPresent())
-        QSKIP("This test reqires ClangFormat");
-
-    const QByteArray origHeader = R"(
-class @C
-{
-public:
-    void func1 (int const &i);
-    void func2 (double const d);
-};
-)";
-    const QByteArray origSource = R"(
-#include "file.h"
-)";
-
-    const QByteArray expectedSource = R"(
-#include "file.h"
-
-void C::func1 (int const &i)
-{
-
-}
-
-void C::func2 (double const d)
-{
-
-}
-)";
-
-    const QByteArray clangFormatSettings = R"(
-BreakBeforeBraces: Allman
-QualifierAlignment: Right
-SpaceBeforeParens: Always
-)";
-
-    const QList<TestDocumentPtr> testDocuments({
-        CppTestDocument::create("file.h", origHeader, origHeader),
-        CppTestDocument::create("file.cpp", origSource, expectedSource)});
-    InsertDefsFromDecls factory;
-    factory.setMode(InsertDefsFromDecls::Mode::Impl);
-    CppCodeStylePreferences * const prefs = CppToolsSettings::cppCodeStyle();
-    const CppCodeStyleSettings settings = prefs->codeStyleSettings();
-    CppCodeStyleSettings tempSettings = settings;
-    tempSettings.forceFormatting = true;
-    prefs->setCodeStyleSettings(tempSettings);
-    QuickFixOperationTest(testDocuments, &factory, {}, {}, {}, clangFormatSettings);
-    prefs->setCodeStyleSettings(settings);
-}
-
-QList<TestDocumentPtr> singleHeader(const QByteArray &original, const QByteArray &expected)
-{
-    return {CppTestDocument::create("file.h", original, expected)};
-}
-
-void QuickfixTest::testInsertDefOutsideFromDeclTemplateClassAndTemplateFunction()
-{
-    QByteArray original =
-        "template<class T>"
-        "class Foo\n"
-        "{\n"
-        "    template<class U>\n"
-        "    void fun@c();\n"
-        "};\n";
-    QByteArray expected =
-        "template<class T>"
-        "class Foo\n"
-        "{\n"
-        "    template<class U>\n"
-        "    void fun@c();\n"
-        "};\n"
-        "\n"
-        "template<class T>\n"
-        "template<class U>\n"
-        "inline void Foo<T>::func()\n"
-        "{\n"
-        "\n"
-        "}\n";
-
-    InsertDefFromDecl factory;
-    factory.m_defPosOutsideClass = true;
-    QuickFixOperationTest(singleHeader(original, expected), &factory);
-}
-
-void QuickfixTest::testInsertDefOutsideFromDeclTemplateClass()
-{
-    QByteArray original =
-        "template<class T>"
-        "class Foo\n"
-        "{\n"
-        "    void fun@c();\n"
-        "};\n";
-    QByteArray expected =
-        "template<class T>"
-        "class Foo\n"
-        "{\n"
-        "    void fun@c();\n"
-        "};\n"
-        "\n"
-        "template<class T>\n"
-        "inline void Foo<T>::func()\n"
-        "{\n"
-        "\n"
-        "}\n";
-
-    InsertDefFromDecl factory;
-    factory.m_defPosOutsideClass = true;
-    QuickFixOperationTest(singleHeader(original, expected), &factory);
-}
-
-void QuickfixTest::testInsertDefOutsideFromDeclTemplateFunction()
-{
-    QByteArray original =
-        "class Foo\n"
-        "{\n"
-        "    template<class U>\n"
-        "    void fun@c();\n"
-        "};\n";
-    QByteArray expected =
-        "class Foo\n"
-        "{\n"
-        "    template<class U>\n"
-        "    void fun@c();\n"
-        "};\n"
-        "\n"
-        "template<class U>\n"
-        "inline void Foo::func()\n"
-        "{\n"
-        "\n"
-        "}\n";
-
-    InsertDefFromDecl factory;
-    factory.m_defPosOutsideClass = true;
-    QuickFixOperationTest(singleHeader(original, expected), &factory);
-}
-
-void QuickfixTest::testInsertDefOutsideFromDeclFunction()
-{
-    QByteArray original =
-        "class Foo\n"
-        "{\n"
-        "    void fun@c();\n"
-        "};\n";
-    QByteArray expected =
-        "class Foo\n"
-        "{\n"
-        "    void fun@c();\n"
-        "};\n"
-        "\n"
-        "inline void Foo::func()\n"
-        "{\n"
-        "\n"
-        "}\n";
-
-    InsertDefFromDecl factory;
-    factory.m_defPosOutsideClass = true;
-    QuickFixOperationTest(singleHeader(original, expected), &factory);
-}
-
-// Function for one of InsertDeclDef section cases
-void insertToSectionDeclFromDef(const QByteArray &section, int sectionIndex)
-{
-    QList<TestDocumentPtr> testDocuments;
-
-    QByteArray original;
-    QByteArray expected;
-    QByteArray sectionString = section + ":\n";
-    if (sectionIndex == 4)
-        sectionString.clear();
-
-    // Header File
-    original =
-        "class Foo\n"
-        "{\n"
-        "};\n";
-    expected =
-        "class Foo\n"
-        "{\n"
-        + sectionString +
-        "    Foo();\n"
-        "@};\n";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"file.h\"\n"
-        "\n"
-        "Foo::Foo@()\n"
-        "{\n"
-        "}\n"
-        ;
-    expected = original;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    InsertDeclFromDef factory;
-    QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), sectionIndex);
-}
-
-/// Check from source file: Insert in header file.
-void QuickfixTest::testInsertDeclFromDef()
-{
-    insertToSectionDeclFromDef("public", 0);
-    insertToSectionDeclFromDef("public slots", 1);
-    insertToSectionDeclFromDef("protected", 2);
-    insertToSectionDeclFromDef("protected slots", 3);
-    insertToSectionDeclFromDef("private", 4);
-    insertToSectionDeclFromDef("private slots", 5);
-}
-
-void QuickfixTest::testInsertDeclFromDefTemplateFuncTypename()
-{
-    QByteArray original =
-        "class Foo\n"
-        "{\n"
-        "};\n"
-        "\n"
-        "template<class T>\n"
-        "void Foo::fu@nc() {}\n";
-
-    QByteArray expected =
-        "class Foo\n"
-        "{\n"
-        "public:\n"
-        "    template<class T>\n"
-        "    void func();\n"
-        "};\n"
-        "\n"
-        "template<class T>\n"
-        "void Foo::fu@nc() {}\n";
-
-    InsertDeclFromDef factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory, {}, 0);
-}
-
-void QuickfixTest::testInsertDeclFromDefTemplateFuncInt()
-{
-    QByteArray original =
-            "class Foo\n"
-            "{\n"
-            "};\n"
-            "\n"
-            "template<int N>\n"
-            "void Foo::fu@nc() {}\n";
-
-    QByteArray expected =
-            "class Foo\n"
-            "{\n"
-            "public:\n"
-            "    template<int N>\n"
-            "    void func();\n"
-            "};\n"
-            "\n"
-            "template<int N>\n"
-            "void Foo::fu@nc() {}\n";
-
-    InsertDeclFromDef factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory, {}, 0);
-}
-
-void QuickfixTest::testInsertDeclFromDefTemplateReturnType()
-{
-    QByteArray original =
-            "class Foo\n"
-            "{\n"
-            "};\n"
-            "\n"
-            "std::vector<int> Foo::fu@nc() const {}\n";
-
-    QByteArray expected =
-            "class Foo\n"
-            "{\n"
-            "public:\n"
-            "    std::vector<int> func() const;\n"
-            "};\n"
-            "\n"
-            "std::vector<int> Foo::func() const {}\n";
-
-    InsertDeclFromDef factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory, {}, 0);
-}
-
-void QuickfixTest::testInsertDeclFromDefNotTriggeredForTemplateFunc()
-{
-    QByteArray contents =
-        "class Foo\n"
-        "{\n"
-        "    template<class T>\n"
-        "    void func();\n"
-        "};\n"
-        "\n"
-        "template<class T>\n"
-        "void Foo::fu@nc() {}\n";
-
-    InsertDeclFromDef factory;
-    QuickFixOperationTest(singleDocument(contents, ""), &factory);
-}
-
-void QuickfixTest::testAddIncludeForUndefinedIdentifier_data()
-{
-    QTest::addColumn<QString>("headerPath");
-    QTest::addColumn<QuickFixTestDocuments>("testDocuments");
-    QTest::addColumn<int>("refactoringOperationIndex");
-    QTest::addColumn<QString>("includeForTestFactory");
-
-    const int firstRefactoringOperation = 0;
-    const int secondRefactoringOperation = 1;
-
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    // -------------------------------------------------------------------------------------------
-
-    // Header File
-    original = "class Foo {};\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("afile.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"header.h\"\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    Fo@o foo;\n"
-        "}\n"
-        ;
-    expected =
-        "#include \"afile.h\"\n"
-        "#include \"header.h\"\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    Foo foo;\n"
-        "}\n"
-        ;
-    testDocuments << CppTestDocument::create("afile.cpp", original, expected);
-    QTest::newRow("onSimpleName")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    // Header File
-    original = "namespace N { class Foo {}; }\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("afile.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"header.h\"\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    N::Fo@o foo;\n"
-        "}\n"
-        ;
-    expected =
-        "#include \"afile.h\"\n"
-        "#include \"header.h\"\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    N::Foo foo;\n"
-        "}\n"
-        ;
-    testDocuments << CppTestDocument::create("afile.cpp", original, expected);
-    QTest::newRow("onNameOfQualifiedName")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    // Header File
-    original = "namespace N { class Foo {}; }\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("afile.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"header.h\"\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    @N::Foo foo;\n"
-        "}\n"
-        ;
-    expected =
-        "#include \"afile.h\"\n"
-        "#include \"header.h\"\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    N::Foo foo;\n"
-        "}\n"
-        ;
-    testDocuments << CppTestDocument::create("afile.cpp", original, expected);
-    QTest::newRow("onBaseOfQualifiedName")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    // Header File
-    original = "class Foo { static void bar() {} };\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("afile.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"header.h\"\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    @Foo::bar();\n"
-        "}\n"
-        ;
-    expected =
-        "#include \"afile.h\"\n"
-        "#include \"header.h\"\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    Foo::bar();\n"
-        "}\n"
-        ;
-    testDocuments << CppTestDocument::create("afile.cpp", original, expected);
-    QTest::newRow("onBaseOfQualifiedClassName")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    // Header File
-    original = "template <typename T> class Foo { static void bar() {} };\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("afile.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"header.h\"\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    @Foo<int>::bar();\n"
-        "}\n"
-        ;
-    expected =
-        "#include \"afile.h\"\n"
-        "#include \"header.h\"\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    Foo<int>::bar();\n"
-        "}\n"
-        ;
-    testDocuments << CppTestDocument::create("afile.cpp", original, expected);
-    QTest::newRow("onBaseOfQualifiedTemplateClassName")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    // Header File
-    original = "namespace N { template <typename T> class Foo {}; }\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("afile.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"header.h\"\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    @N::Foo<Bar> foo;\n"
-        "}\n"
-        ;
-    expected =
-        "#include \"afile.h\"\n"
-        "#include \"header.h\"\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    N::Foo<Bar> foo;\n"
-        "}\n"
-        ;
-    testDocuments << CppTestDocument::create("afile.cpp", original, expected);
-    QTest::newRow("onTemplateName")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    // Header File
-    original = "namespace N { template <typename T> class Foo {}; }\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("afile.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"header.h\"\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    N::Bar<@Foo> foo;\n"
-        "}\n"
-        ;
-    expected =
-        "#include \"afile.h\"\n"
-        "#include \"header.h\"\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    N::Bar<Foo> foo;\n"
-        "}\n"
-        ;
-    testDocuments << CppTestDocument::create("afile.cpp", original, expected);
-    QTest::newRow("onTemplateNameInsideArguments")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    // Header File
-    original = "class Foo {};\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("afile.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"header.h\"\n"
-        "\n"
-        "class Foo;\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    @Foo foo;\n"
-        "}\n"
-        ;
-    expected =
-        "#include \"afile.h\"\n"
-        "#include \"header.h\"\n"
-        "\n"
-        "class Foo;\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    Foo foo;\n"
-        "}\n"
-        ;
-    testDocuments << CppTestDocument::create("afile.cpp", original, expected);
-    QTest::newRow("withForwardDeclaration")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    // Header File
-    original = "template<class T> class Foo {};\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("afile.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"header.h\"\n"
-        "\n"
-        "template<class T> class Foo;\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    @Foo foo;\n"
-        "}\n"
-        ;
-    expected =
-        "#include \"afile.h\"\n"
-        "#include \"header.h\"\n"
-        "\n"
-        "template<class T> class Foo;\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    Foo foo;\n"
-        "}\n"
-        ;
-    testDocuments << CppTestDocument::create("afile.cpp", original, expected);
-    QTest::newRow("withForwardDeclaration2")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    // Header File
-    original = "template<class T> class QMyClass {};\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("qmyclass.h", original, expected);
-
-    // Forward Header File
-    original = "#include \"qmyclass.h\"\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("QMyClass", original, expected);
-
-    // Source File
-    original =
-        "#include \"header.h\"\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    @QMyClass c;\n"
-        "}\n"
-        ;
-    expected =
-        "#include \"QMyClass\"\n"
-        "#include \"header.h\"\n"
-        "\n"
-        "void f()\n"
-        "{\n"
-        "    QMyClass c;\n"
-        "}\n"
-        ;
-    testDocuments << CppTestDocument::create("afile.cpp", original, expected);
-    QTest::newRow("withForwardHeader")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << secondRefactoringOperation << "";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    original =
-        "void @f();\n"
-        "#include \"file.moc\";\n"
-        ;
-    expected =
-        "#include \"file.h\"\n"
-        "\n"
-        "void f();\n"
-        "#include \"file.moc\";\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QTest::newRow("insertingIgnoreMoc")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "\"file.h\"";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    original =
-        "#include \"y.h\"\n"
-        "#include \"z.h\"\n"
-        "\n@"
-        ;
-    expected =
-        "#include \"file.h\"\n"
-        "#include \"y.h\"\n"
-        "#include \"z.h\"\n"
-        "\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QTest::newRow("insertingSortingTop")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "\"file.h\"";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    original =
-        "#include \"a.h\"\n"
-        "#include \"z.h\"\n"
-        "\n@"
-        ;
-    expected =
-        "#include \"a.h\"\n"
-        "#include \"file.h\"\n"
-        "#include \"z.h\"\n"
-        "\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QTest::newRow("insertingSortingMiddle")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "\"file.h\"";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    original =
-        "#include \"a.h\"\n"
-        "#include \"b.h\"\n"
-        "\n@"
-        ;
-    expected =
-        "#include \"a.h\"\n"
-        "#include \"b.h\"\n"
-        "#include \"file.h\"\n"
-        "\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QTest::newRow("insertingSortingBottom")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "\"file.h\"";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    original =
-        "#include \"b.h\"\n"
-        "#include \"a.h\"\n"
-        "\n@"
-        ;
-    expected =
-        "#include \"b.h\"\n"
-        "#include \"a.h\"\n"
-        "#include \"file.h\"\n"
-        "\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QTest::newRow("inserting_appendToUnsorted")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "\"file.h\"";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    original =
-        "#include <a.h>\n"
-        "#include <b.h>\n"
-        "\n@"
-        ;
-    expected =
-        "#include \"file.h\"\n"
-        "\n"
-        "#include <a.h>\n"
-        "#include <b.h>\n"
-        "\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QTest::newRow("inserting_firstLocalIncludeAtFront")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "\"file.h\"";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    original =
-        "#include \"a.h\"\n"
-        "#include \"b.h\"\n"
-        "\n"
-        "void @f();\n"
-        ;
-    expected =
-        "#include \"a.h\"\n"
-        "#include \"b.h\"\n"
-        "\n"
-        "#include <file.h>\n"
-        "\n"
-        "void f();\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QTest::newRow("firstGlobalIncludeAtBack")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "<file.h>";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    original =
-        "#include \"prefixa.h\"\n"
-        "#include \"prefixb.h\"\n"
-        "\n"
-        "#include \"foo.h\"\n"
-        "\n@"
-        ;
-    expected =
-        "#include \"prefixa.h\"\n"
-        "#include \"prefixb.h\"\n"
-        "#include \"prefixc.h\"\n"
-        "\n"
-        "#include \"foo.h\"\n"
-        "\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QTest::newRow("inserting_preferGroupWithLongerMatchingPrefix")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "\"prefixc.h\"";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    original =
-        "#include \"lib/file.h\"\n"
-        "#include \"lib/fileother.h\"\n"
-        "\n@"
-        ;
-    expected =
-        "#include \"lib/file.h\"\n"
-        "#include \"lib/fileother.h\"\n"
-        "\n"
-        "#include \"file.h\"\n"
-        "\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QTest::newRow("inserting_newGroupIfOnlyDifferentIncludeDirs")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "\"file.h\"";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    original =
-        "#include <lib/file.h>\n"
-        "#include <otherlib/file.h>\n"
-        "#include <utils/file.h>\n"
-        "\n@"
-        ;
-    expected =
-        "#include <firstlib/file.h>\n"
-        "#include <lib/file.h>\n"
-        "#include <otherlib/file.h>\n"
-        "#include <utils/file.h>\n"
-        "\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QTest::newRow("inserting_mixedDirsSorted")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "<firstlib/file.h>";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    original =
-        "#include <otherlib/file.h>\n"
-        "#include <lib/file.h>\n"
-        "#include <utils/file.h>\n"
-        "\n@"
-        ;
-    expected =
-        "#include <otherlib/file.h>\n"
-        "#include <lib/file.h>\n"
-        "#include <utils/file.h>\n"
-        "#include <lastlib/file.h>\n"
-        "\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QTest::newRow("inserting_mixedDirsUnsorted")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "<lastlib/file.h>";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    original =
-        "#include \"a.h\"\n"
-        "#include <global.h>\n"
-        "\n@"
-        ;
-    expected =
-        "#include \"a.h\"\n"
-        "#include \"z.h\"\n"
-        "#include <global.h>\n"
-        "\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QTest::newRow("inserting_mixedIncludeTypes1")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "\"z.h\"";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    original =
-        "#include \"z.h\"\n"
-        "#include <global.h>\n"
-        "\n@"
-        ;
-    expected =
-        "#include \"a.h\"\n"
-        "#include \"z.h\"\n"
-        "#include <global.h>\n"
-        "\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QTest::newRow("inserting_mixedIncludeTypes2")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "\"a.h\"";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    original =
-        "#include \"z.h\"\n"
-        "#include <global.h>\n"
-        "\n@"
-        ;
-    expected =
-        "#include \"z.h\"\n"
-        "#include \"lib/file.h\"\n"
-        "#include <global.h>\n"
-        "\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QTest::newRow("inserting_mixedIncludeTypes3")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "\"lib/file.h\"";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    original =
-        "#include \"z.h\"\n"
-        "#include <global.h>\n"
-        "\n@"
-        ;
-    expected =
-        "#include \"z.h\"\n"
-        "#include <global.h>\n"
-        "#include <lib/file.h>\n"
-        "\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QTest::newRow("inserting_mixedIncludeTypes4")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "<lib/file.h>";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    original =
-        "void @f();\n"
-        ;
-    expected =
-        "#include \"file.h\"\n"
-        "\n"
-        "void f();\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QTest::newRow("inserting_noinclude")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "\"file.h\"";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    original =
-        "#ifndef FOO_H\n"
-        "#define FOO_H\n"
-        "void @f();\n"
-        "#endif\n"
-        ;
-    expected =
-        "#ifndef FOO_H\n"
-        "#define FOO_H\n"
-        "\n"
-        "#include \"file.h\"\n"
-        "\n"
-        "void f();\n"
-        "#endif\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QTest::newRow("inserting_onlyIncludeGuard")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "\"file.h\"";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    original =
-        "\n"
-        "// comment\n"
-        "\n"
-        "void @f();\n"
-        ;
-    expected =
-        "\n"
-        "// comment\n"
-        "\n"
-        "#include \"file.h\"\n"
-        "\n"
-        "void @f();\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QTest::newRow("inserting_veryFirstIncludeCppStyleCommentOnTop")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "\"file.h\"";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    original =
-        "\n"
-        "/*\n"
-        " comment\n"
-        " */\n"
-        "\n"
-        "void @f();\n"
-        ;
-    expected =
-        "\n"
-        "/*\n"
-        " comment\n"
-        " */\n"
-        "\n"
-        "#include \"file.h\"\n"
-        "\n"
-        "void @f();\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QTest::newRow("inserting_veryFirstIncludeCStyleCommentOnTop")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "\"file.h\"";
-    testDocuments.clear();
-
-    // -------------------------------------------------------------------------------------------
-
-    original =
-        "@QDir dir;\n"
-        ;
-    expected =
-        "#include <QDir>\n"
-        "\n"
-        "QDir dir;\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QTest::newRow("inserting_checkQSomethingInQtIncludePaths")
-            << TestIncludePaths::globalQtCoreIncludePath()
-            << testDocuments << firstRefactoringOperation << "";
-    testDocuments.clear();
-
-    original =
-        "std::s@tring s;\n"
-        ;
-    expected =
-        "#include <string>\n"
-        "\n"
-        "std::string s;\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    QTest::newRow("inserting_std::string")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "";
-    testDocuments.clear();
-
-    original = "class A{};";
-    testDocuments << CppTestDocument::create("a.h", original, original);
-    original = "class B{};";
-    testDocuments << CppTestDocument::create("b.h", original, original);
-    original =
-            "#include \"b.h\"\n"
-            "@A a;\n"
-            "B b;";
-    expected =
-            "#include \"b.h\"\n\n"
-            "#include \"a.h\"\n"
-            "A a;\n"
-            "B b;";
-    testDocuments << CppTestDocument::create("b.cpp", original, expected);
-    QTest::newRow("preserve first header")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "";
-    testDocuments.clear();
-
-    original = "class C{};";
-    testDocuments << CppTestDocument::create("c.h", original, original);
-    original = "class B{};";
-    testDocuments << CppTestDocument::create("b.h", original, original);
-    original =
-            "#include \"c.h\"\n"
-            "C c;\n"
-            "@B b;";
-    expected =
-            "#include \"b.h\"\n"
-            "#include \"c.h\"\n"
-            "C c;\n"
-            "B b;";
-    testDocuments << CppTestDocument::create("x.cpp", original, expected);
-    QTest::newRow("do not preserve first header")
-            << TestIncludePaths::globalIncludePath()
-            << testDocuments << firstRefactoringOperation << "";
-    testDocuments.clear();
-}
-
-void QuickfixTest::testAddIncludeForUndefinedIdentifier()
-{
-    QFETCH(QString, headerPath);
-    QFETCH(QuickFixTestDocuments, testDocuments);
-    QFETCH(int, refactoringOperationIndex);
-    QFETCH(QString, includeForTestFactory);
-
-    TemporaryDir temporaryDir;
-    QVERIFY(temporaryDir.isValid());
-    for (const TestDocumentPtr &testDocument : std::as_const(testDocuments))
-        testDocument->setBaseDirectory(temporaryDir.path());
-
-    QScopedPointer<CppQuickFixFactory> factory;
-    if (includeForTestFactory.isEmpty())
-        factory.reset(new AddIncludeForUndefinedIdentifier);
-    else
-        factory.reset(new AddIncludeForUndefinedIdentifierTestFactory(includeForTestFactory));
-
-    QuickFixOperationTest::run(testDocuments, factory.data(), headerPath,
-                               refactoringOperationIndex);
-}
-
-void QuickfixTest::testAddIncludeForUndefinedIdentifierNoDoubleQtHeaderInclude()
-{
-    TemporaryDir temporaryDir;
-    QVERIFY(temporaryDir.isValid());
-
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    const QByteArray base = temporaryDir.path().toUtf8();
-
-    // This file makes the QDir definition available so that locator finds it.
-    original = expected = "#include <QDir>\n"
-                          "void avoidBeingRecognizedAsForwardingHeader();";
-    testDocuments << CppTestDocument::create(base + "/fileUsingQDir.cpp", original, expected);
-
-    original = expected = "@QDir dir;\n";
-    testDocuments << CppTestDocument::create(base + "/fileWantsToUseQDir.cpp", original, expected);
-
-    AddIncludeForUndefinedIdentifier factory;
-    const QStringList expectedOperations = QStringList("Add #include <QDir>");
-    QuickFixOfferedOperationsTest(testDocuments, &factory, ProjectExplorer::toUserHeaderPaths(
-            QStringList{TestIncludePaths::globalQtCoreIncludePath()}), expectedOperations);
-}
-
-void QuickfixTest::testAddForwardDeclForUndefinedIdentifier_data()
-{
-    QTest::addColumn<QuickFixTestDocuments>("testDocuments");
-    QTest::addColumn<QString>("symbol");
-    QTest::addColumn<int>("symbolPos");
-
-    QByteArray original;
-    QByteArray expected;
-
-    original =
-        "#pragma once\n"
-        "\n"
-        "void f(const Blu@bb &b)\n"
-        "{\n"
-        "}\n"
-        ;
-    expected =
-        "#pragma once\n"
-        "\n"
-        "\n"
-        "class Blubb;\n"
-        "void f(const Blubb &b)\n"
-        "{\n"
-        "}\n"
-        ;
-    QTest::newRow("unqualified symbol")
-            << QuickFixTestDocuments{CppTestDocument::create("theheader.h", original, expected)}
-            << "Blubb" << original.indexOf('@');
-
-    original =
-        "#pragma once\n"
-        "\n"
-        "namespace NS {\n"
-        "class C;\n"
-        "}\n"
-        "void f(const NS::Blu@bb &b)\n"
-        "{\n"
-        "}\n"
-        ;
-    expected =
-        "#pragma once\n"
-        "\n"
-        "namespace NS {\n"
-        "\n"
-        "class Blubb;\n"
-        "class C;\n"
-        "}\n"
-        "void f(const NS::Blubb &b)\n"
-        "{\n"
-        "}\n"
-        ;
-    QTest::newRow("qualified symbol, full namespace present")
-            << QuickFixTestDocuments{CppTestDocument::create("theheader.h", original, expected)}
-            << "NS::Blubb" << original.indexOf('@');
-
-    original =
-        "#pragma once\n"
-        "\n"
-        "namespace NS {\n"
-        "class C;\n"
-        "}\n"
-        "void f(const NS::NS2::Blu@bb &b)\n"
-        "{\n"
-        "}\n"
-        ;
-    expected =
-        "#pragma once\n"
-        "\n"
-        "namespace NS {\n"
-        "\n"
-        "namespace NS2 { class Blubb; }\n"
-        "class C;\n"
-        "}\n"
-        "void f(const NS::NS2::Blubb &b)\n"
-        "{\n"
-        "}\n"
-        ;
-    QTest::newRow("qualified symbol, partial namespace present")
-            << QuickFixTestDocuments{CppTestDocument::create("theheader.h", original, expected)}
-            << "NS::NS2::Blubb" << original.indexOf('@');
-
-    original =
-        "#pragma once\n"
-        "\n"
-        "namespace NS {\n"
-        "class C;\n"
-        "}\n"
-        "void f(const NS2::Blu@bb &b)\n"
-        "{\n"
-        "}\n"
-        ;
-    expected =
-        "#pragma once\n"
-        "\n"
-        "\n"
-        "namespace NS2 { class Blubb; }\n"
-        "namespace NS {\n"
-        "class C;\n"
-        "}\n"
-        "void f(const NS2::Blubb &b)\n"
-        "{\n"
-        "}\n"
-        ;
-    QTest::newRow("qualified symbol, other namespace present")
-            << QuickFixTestDocuments{CppTestDocument::create("theheader.h", original, expected)}
-            << "NS2::Blubb" << original.indexOf('@');
-
-    original =
-        "#pragma once\n"
-        "\n"
-        "void f(const NS2::Blu@bb &b)\n"
-        "{\n"
-        "}\n"
-        ;
-    expected =
-        "#pragma once\n"
-        "\n"
-        "\n"
-        "namespace NS2 { class Blubb; }\n"
-        "void f(const NS2::Blubb &b)\n"
-        "{\n"
-        "}\n"
-        ;
-    QTest::newRow("qualified symbol, no namespace present")
-            << QuickFixTestDocuments{CppTestDocument::create("theheader.h", original, expected)}
-            << "NS2::Blubb" << original.indexOf('@');
-
-    original =
-        "#pragma once\n"
-        "\n"
-        "void f(const NS2::Blu@bb &b)\n"
-        "{\n"
-        "}\n"
-        "namespace NS2 {}\n"
-        ;
-    expected =
-        "#pragma once\n"
-        "\n"
-        "\n"
-        "namespace NS2 { class Blubb; }\n"
-        "void f(const NS2::Blubb &b)\n"
-        "{\n"
-        "}\n"
-        "namespace NS2 {}\n"
-        ;
-    QTest::newRow("qualified symbol, existing namespace after symbol")
-            << QuickFixTestDocuments{CppTestDocument::create("theheader.h", original, expected)}
-            << "NS2::Blubb" << original.indexOf('@');
-}
-
-void QuickfixTest::testAddForwardDeclForUndefinedIdentifier()
-{
-    QFETCH(QuickFixTestDocuments, testDocuments);
-    QFETCH(QString, symbol);
-    QFETCH(int, symbolPos);
-
-    TemporaryDir temporaryDir;
-    QVERIFY(temporaryDir.isValid());
-    testDocuments.first()->setBaseDirectory(temporaryDir.path());
-
-    QScopedPointer<CppQuickFixFactory> factory(
-                new AddForwardDeclForUndefinedIdentifierTestFactory(symbol, symbolPos));
-    QuickFixOperationTest::run({testDocuments}, factory.data(), ".", 0);
-}
-
-/// Check: Move definition from header to cpp.
-void QuickfixTest::testMoveFuncDefOutsideMemberFuncToCpp()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "class Foo {\n"
-        "  inline int numbe@r() const\n"
-        "  {\n"
-        "    return 5;\n"
-        "  }\n"
-        "\n"
-        "    void bar();\n"
-        "};\n";
-    expected =
-        "class Foo {\n"
-        "  int number() const;\n"
-        "\n"
-        "    void bar();\n"
-        "};\n";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"file.h\"\n";
-    expected =
-        "#include \"file.h\"\n"
-        "\n"
-        "int Foo::number() const\n"
-        "{\n"
-        "    return 5;\n"
-        "}\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testMoveFuncDefOutsideMemberFuncToCppStatic()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "class Foo {\n"
-        "  static inline int numbe@r() const\n"
-        "  {\n"
-        "    return 5;\n"
-        "  }\n"
-        "\n"
-        "    void bar();\n"
-        "};\n";
-    expected =
-        "class Foo {\n"
-        "  static int number() const;\n"
-        "\n"
-        "    void bar();\n"
-        "};\n";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"file.h\"\n";
-    expected =
-        "#include \"file.h\"\n"
-        "\n"
-        "int Foo::number() const\n"
-        "{\n"
-        "    return 5;\n"
-        "}\n";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testMoveFuncDefOutsideMemberFuncToCppWithInlinePartOfName()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "class Foo {\n"
-        "  static inline int numbe@r_inline () const\n"
-        "  {\n"
-        "    return 5;\n"
-        "  }\n"
-        "\n"
-        "    void bar();\n"
-        "};\n";
-    expected =
-        "class Foo {\n"
-        "  static int number_inline () const;\n"
-        "\n"
-        "    void bar();\n"
-        "};\n";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"file.h\"\n";
-    expected =
-        "#include \"file.h\"\n"
-        "\n"
-        "int Foo::number_inline() const\n"
-        "{\n"
-        "    return 5;\n"
-        "}\n";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testMoveFuncDefOutsideMixedQualifiers()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original = R"(
-struct Base {
-    virtual auto func() const && noexcept -> void = 0;
-};
-struct Derived : public Base {
-    auto @func() const && noexcept -> void override {}
-};)";
-    expected = R"(
-struct Base {
-    virtual auto func() const && noexcept -> void = 0;
-};
-struct Derived : public Base {
-    auto func() const && noexcept -> void override;
-};)";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original = "#include \"file.h\"\n";
-    expected = R"DELIM(#include "file.h"
-
-auto Derived::func() const && noexcept -> void {}
-)DELIM";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testMoveFuncDefOutsideMemberFuncToCppInsideNS()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "namespace SomeNamespace {\n"
-        "class Foo {\n"
-        "  int ba@r()\n"
-        "  {\n"
-        "    return 5;\n"
-        "  }\n"
-        "};\n"
-        "}\n";
-    expected =
-        "namespace SomeNamespace {\n"
-        "class Foo {\n"
-        "  int ba@r();\n"
-        "};\n"
-        "}\n";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"file.h\"\n"
-        "namespace SomeNamespace {\n"
-        "\n"
-        "}\n";
-    expected =
-        "#include \"file.h\"\n"
-        "namespace SomeNamespace {\n"
-        "\n"
-        "int Foo::bar()\n"
-        "{\n"
-        "    return 5;\n"
-        "}\n"
-        "\n"
-        "}\n";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-/// Check: Move definition outside class
-void QuickfixTest::testMoveFuncDefOutsideMemberFuncOutside1()
-{
-    QByteArray original =
-        "class Foo {\n"
-        "    void f1();\n"
-        "    inline int f2@() const\n"
-        "    {\n"
-        "        return 1;\n"
-        "    }\n"
-        "    void f3();\n"
-        "    void f4();\n"
-        "};\n"
-        "\n"
-        "void Foo::f4() {}\n";
-    QByteArray expected =
-        "class Foo {\n"
-        "    void f1();\n"
-        "    int f2@() const;\n"
-        "    void f3();\n"
-        "    void f4();\n"
-        "};\n"
-        "\n"
-        "int Foo::f2() const\n"
-        "{\n"
-        "    return 1;\n"
-        "}\n"
-        "\n"
-        "void Foo::f4() {}\n";
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-}
-
-/// Check: Move definition outside class
-void QuickfixTest::testMoveFuncDefOutsideMemberFuncOutside2()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "class Foo {\n"
-        "    void f1();\n"
-        "    int f2@()\n"
-        "    {\n"
-        "        return 1;\n"
-        "    }\n"
-        "    void f3();\n"
-        "};\n";
-    expected =
-        "class Foo {\n"
-        "    void f1();\n"
-        "    int f2();\n"
-        "    void f3();\n"
-        "};\n"
-        "\n"
-        "inline int Foo::f2()\n"
-        "{\n"
-        "    return 1;\n"
-        "}\n";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"file.h\"\n"
-        "void Foo::f1() {}\n"
-        "void Foo::f3() {}\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 1);
-}
-
-/// Check: Move definition from header to cpp (with namespace).
-void QuickfixTest::testMoveFuncDefOutsideMemberFuncToCppNS()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "namespace MyNs {\n"
-        "class Foo {\n"
-        "  inline int numbe@r() const\n"
-        "  {\n"
-        "    return 5;\n"
-        "  }\n"
-        "};\n"
-        "}\n";
-    expected =
-        "namespace MyNs {\n"
-        "class Foo {\n"
-        "  int number() const;\n"
-        "};\n"
-        "}\n";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"file.h\"\n";
-    expected =
-        "#include \"file.h\"\n"
-        "\n"
-        "int MyNs::Foo::number() const\n"
-        "{\n"
-        "    return 5;\n"
-        "}\n";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-/// Check: Move definition from header to cpp (with namespace + using).
-void QuickfixTest::testMoveFuncDefOutsideMemberFuncToCppNSUsing()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "namespace MyNs {\n"
-        "class Foo {\n"
-        "  inline int numbe@r() const\n"
-        "  {\n"
-        "    return 5;\n"
-        "  }\n"
-        "};\n"
-        "}\n";
-    expected =
-        "namespace MyNs {\n"
-        "class Foo {\n"
-        "  int number() const;\n"
-        "};\n"
-        "}\n";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"file.h\"\n"
-        "using namespace MyNs;\n";
-    expected =
-        "#include \"file.h\"\n"
-        "using namespace MyNs;\n"
-        "\n"
-        "int Foo::number() const\n"
-        "{\n"
-        "    return 5;\n"
-        "}\n";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-/// Check: Move definition outside class with Namespace
-void QuickfixTest::testMoveFuncDefOutsideMemberFuncOutsideWithNs()
-{
-    QByteArray original =
-        "namespace MyNs {\n"
-        "class Foo {\n"
-        "    inline int numbe@r() const\n"
-        "    {\n"
-        "        return 5;\n"
-        "    }\n"
-        "};}\n";
-    QByteArray expected =
-        "namespace MyNs {\n"
-        "class Foo {\n"
-        "    int number() const;\n"
-        "};\n"
-        "\n"
-        "int Foo::number() const\n"
-        "{\n"
-        "    return 5;\n"
-        "}\n"
-        "\n}\n";
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-}
-
-/// Check: Move free function from header to cpp.
-void QuickfixTest::testMoveFuncDefOutsideFreeFuncToCpp()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "int numbe@r() const\n"
-        "{\n"
-        "    return 5;\n"
-        "}\n";
-    expected =
-        "int number() const;\n"
-         ;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"file.h\"\n";
-    expected =
-        "#include \"file.h\"\n"
-        "\n"
-        "int number() const\n"
-        "{\n"
-        "    return 5;\n"
-        "}\n";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-/// Check: Move free function from header to cpp (with namespace).
-void QuickfixTest::testMoveFuncDefOutsideFreeFuncToCppNS()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "namespace MyNamespace {\n"
-        "int numbe@r() const\n"
-        "{\n"
-        "    return 5;\n"
-        "}\n"
-        "}\n";
-    expected =
-        "namespace MyNamespace {\n"
-        "int number() const;\n"
-        "}\n";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"file.h\"\n";
-    expected =
-        "#include \"file.h\"\n"
-        "\n"
-        "int MyNamespace::number() const\n"
-        "{\n"
-        "    return 5;\n"
-        "}\n";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-/// Check: Move Ctor with member initialization list (QTCREATORBUG-9157).
-void QuickfixTest::testMoveFuncDefOutsideCtorWithInitialization1()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "class Foo {\n"
-        "public:\n"
-        "    Fo@o() : a(42), b(3.141) {}\n"
-        "private:\n"
-        "    int a;\n"
-        "    float b;\n"
-        "};\n";
-    expected =
-        "class Foo {\n"
-        "public:\n"
-        "    Foo();\n"
-        "private:\n"
-        "    int a;\n"
-        "    float b;\n"
-        "};\n";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original ="#include \"file.h\"\n";
-    expected =
-        "#include \"file.h\"\n"
-        "\n"
-        "Foo::Foo() : a(42), b(3.141) {}\n"
-       ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-/// Check: Move Ctor with member initialization list (QTCREATORBUG-9462).
-void QuickfixTest::testMoveFuncDefOutsideCtorWithInitialization2()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "class Foo\n"
-        "{\n"
-        "public:\n"
-        "    Fo@o() : member(2)\n"
-        "    {\n"
-        "    }\n"
-        "\n"
-        "    int member;\n"
-        "};\n";
-
-    expected =
-        "class Foo\n"
-        "{\n"
-        "public:\n"
-        "    Foo();\n"
-        "\n"
-        "    int member;\n"
-        "};\n";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original ="#include \"file.h\"\n";
-    expected =
-        "#include \"file.h\"\n"
-        "\n"
-        "Foo::Foo() : member(2)\n"
-        "{\n"
-        "}\n"
-       ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-/// Check if definition is inserted right after class for move definition outside
-void QuickfixTest::testMoveFuncDefOutsideAfterClass()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "class Foo\n"
-        "{\n"
-        "    Foo();\n"
-        "    void a@() {}\n"
-        "};\n"
-        "\n"
-        "class Bar {};\n";
-    expected =
-        "class Foo\n"
-        "{\n"
-        "    Foo();\n"
-        "    void a();\n"
-        "};\n"
-        "\n"
-        "inline void Foo::a() {}\n"
-        "\n"
-        "class Bar {};\n";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"file.h\"\n"
-        "\n"
-        "Foo::Foo()\n"
-        "{\n\n"
-        "}\n";
-    expected = original;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 1);
-}
-
-/// Check if whitespace is respected for operator functions
-void QuickfixTest::testMoveFuncDefOutsideRespectWsInOperatorNames1()
-{
-    QByteArray original =
-        "class Foo\n"
-        "{\n"
-        "    Foo &opera@tor =() {}\n"
-        "};\n";
-    QByteArray expected =
-        "class Foo\n"
-        "{\n"
-        "    Foo &operator =();\n"
-        "};\n"
-        "\n"
-        "Foo &Foo::operator =() {}\n"
-       ;
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-}
-
-/// Check if whitespace is respected for operator functions
-void QuickfixTest::testMoveFuncDefOutsideRespectWsInOperatorNames2()
-{
-    QByteArray original =
-        "class Foo\n"
-        "{\n"
-        "    Foo &opera@tor=() {}\n"
-        "};\n";
-    QByteArray expected =
-        "class Foo\n"
-        "{\n"
-        "    Foo &operator=();\n"
-        "};\n"
-        "\n"
-        "Foo &Foo::operator=() {}\n"
-       ;
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-}
-
-void QuickfixTest::testMoveFuncDefOutsideMacroUses()
-{
-    QByteArray original =
-        "#define CONST const\n"
-        "#define VOLATILE volatile\n"
-        "class Foo\n"
-        "{\n"
-        "    int fu@nc(int a, int b) CONST VOLATILE\n"
-        "    {\n"
-        "        return 42;\n"
-        "    }\n"
-        "};\n";
-    QByteArray expected =
-        "#define CONST const\n"
-        "#define VOLATILE volatile\n"
-        "class Foo\n"
-        "{\n"
-        "    int func(int a, int b) CONST VOLATILE;\n"
-        "};\n"
-        "\n"
-        "\n"
-        // const volatile become lowercase: QTCREATORBUG-12620
-        "int Foo::func(int a, int b) const volatile\n"
-        "{\n"
-        "    return 42;\n"
-        "}\n"
-       ;
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory,
-                          ProjectExplorer::HeaderPaths(), 0, "QTCREATORBUG-12314");
-}
-
-void QuickfixTest::testMoveFuncDefOutsideTemplate()
-{
-    QByteArray original =
-        "template<class T>\n"
-        "class Foo { void fu@nc() {} };\n";
-    QByteArray expected =
-        "template<class T>\n"
-        "class Foo { void fu@nc(); };\n"
-        "\n"
-        "template<class T>\n"
-        "void Foo<T>::func() {}\n";
-       ;
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-}
-
-void QuickfixTest::testMoveFuncDefOutsideMemberFunctionTemplate()
-{
-    const QByteArray original = R"(
-struct S {
-    template<typename In>
-    void @foo(In in) { (void)in; }
-};
-)";
-    const QByteArray expected = R"(
-struct S {
-    template<typename In>
-    void foo(In in);
-};
-
-template<typename In>
-void S::foo(In in) { (void)in; }
-)";
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-}
-
-void QuickfixTest::testMoveFuncDefOutsideTemplateSpecializedClass()
-{
-    QByteArray original = R"(
-template<typename T> class base {};
-template<>
-class base<int>
-{
-public:
-    void @bar() {}
-};
-)";
-    QByteArray expected = R"(
-template<typename T> class base {};
-template<>
-class base<int>
-{
-public:
-    void bar();
-};
-
-void base<int>::bar() {}
-)";
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-}
-
-void QuickfixTest::testMoveFuncDefOutsideUnnamedTemplate()
-{
-    QByteArray original =
-        "template<typename T, typename>\n"
-        "class Foo { void fu@nc() {} };\n";
-    QByteArray expected =
-        "template<typename T, typename>\n"
-        "class Foo { void fu@nc(); };\n"
-        "\n"
-        "template<typename T, typename T2>\n"
-        "void Foo<T, T2>::func() {}\n";
-       ;
-
-    MoveFuncDefOutside factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-}
-
-void QuickfixTest::testMoveFuncDefToDecl_data()
-{
-    QTest::addColumn<QByteArrayList>("headers");
-    QTest::addColumn<QByteArrayList>("sources");
-
-    QByteArray originalHeader;
-    QByteArray expectedHeader;
-    QByteArray originalSource;
-    QByteArray expectedSource;
-
-    originalHeader =
-        "class Foo {\n"
-        "    inline int @number() const;\n"
-        "};\n";
-    expectedHeader =
-        "class Foo {\n"
-        "    inline int number() const {return 5;}\n"
-        "};\n";
-    originalSource =
-        "#include \"file.h\"\n"
-        "\n"
-        "int Foo::num@ber() const {return 5;}\n";
-    expectedSource =
-        "#include \"file.h\"\n"
-        "\n\n";
-    QTest::newRow("member function, two files") << QByteArrayList{originalHeader, expectedHeader}
-                                                << QByteArrayList{originalSource, expectedSource};
-
-    originalSource =
-        "class Foo {\n"
-        "  inline int @number() const;\n"
-        "};\n"
-        "\n"
-        "int Foo::num@ber() const\n"
-        "{\n"
-        "    return 5;\n"
-        "}\n";
-
-    expectedSource =
-        "class Foo {\n"
-        "    inline int number() const\n"
-        "    {\n"
-        "        return 5;\n"
-        "    }\n"
-        "};\n\n\n";
-    QTest::newRow("member function, one file") << QByteArrayList()
-                                               << QByteArrayList{originalSource, expectedSource};
-
-    originalHeader =
-        "namespace MyNs {\n"
-        "class Foo {\n"
-        "  inline int @number() const;\n"
-        "};\n"
-        "}\n";
-    expectedHeader =
-        "namespace MyNs {\n"
-        "class Foo {\n"
-        "    inline int number() const\n"
-        "    {\n"
-        "        return 5;\n"
-        "    }\n"
-        "};\n"
-        "}\n";
-    originalSource =
-        "#include \"file.h\"\n"
-        "\n"
-        "int MyNs::Foo::num@ber() const\n"
-        "{\n"
-        "    return 5;\n"
-        "}\n";
-    expectedSource = "#include \"file.h\"\n\n\n";
-    QTest::newRow("member function, two files, namespace")
-            << QByteArrayList{originalHeader, expectedHeader}
-            << QByteArrayList{originalSource, expectedSource};
-
-    originalHeader =
-        "namespace MyNs {\n"
-        "class Foo {\n"
-        "  inline int numbe@r() const;\n"
-        "};\n"
-        "}\n";
-    expectedHeader =
-        "namespace MyNs {\n"
-        "class Foo {\n"
-        "    inline int number() const\n"
-        "    {\n"
-        "        return 5;\n"
-        "    }\n"
-        "};\n"
-        "}\n";
-    originalSource =
-        "#include \"file.h\"\n"
-        "using namespace MyNs;\n"
-        "\n"
-        "int Foo::num@ber() const\n"
-        "{\n"
-        "    return 5;\n"
-        "}\n";
-    expectedSource =
-        "#include \"file.h\"\n"
-        "using namespace MyNs;\n"
-        "\n\n";
-    QTest::newRow("member function, two files, namespace with using-directive")
-            << QByteArrayList{originalHeader, expectedHeader}
-            << QByteArrayList{originalSource, expectedSource};
-
-    originalSource =
-        "namespace MyNs {\n"
-        "class Foo {\n"
-        "  inline int @number() const;\n"
-        "};\n"
-        "\n"
-        "int Foo::numb@er() const\n"
-        "{\n"
-        "    return 5;\n"
-        "}"
-        "\n}\n";
-    expectedSource =
-        "namespace MyNs {\n"
-        "class Foo {\n"
-        "    inline int number() const\n"
-        "    {\n"
-        "        return 5;\n"
-        "    }\n"
-        "};\n\n\n}\n";
-
-    QTest::newRow("member function, one file, namespace")
-            << QByteArrayList() << QByteArrayList{originalSource, expectedSource};
-
-    originalHeader = "int nu@mber() const;\n";
-    expectedHeader =
-        "inline int number() const\n"
-        "{\n"
-        "    return 5;\n"
-        "}\n";
-    originalSource =
-        "#include \"file.h\"\n"
-        "\n"
-        "\n"
-        "int numb@er() const\n"
-        "{\n"
-        "    return 5;\n"
-        "}\n";
-    expectedSource = "#include \"file.h\"\n\n\n\n";
-    QTest::newRow("free function") << QByteArrayList{originalHeader, expectedHeader}
-                                   << QByteArrayList{originalSource, expectedSource};
-
-    originalHeader =
-        "namespace MyNamespace {\n"
-        "int n@umber() const;\n"
-        "}\n";
-    expectedHeader =
-        "namespace MyNamespace {\n"
-        "inline int number() const\n"
-        "{\n"
-        "    return 5;\n"
-        "}\n"
-        "}\n";
-    originalSource =
-        "#include \"file.h\"\n"
-        "\n"
-        "int MyNamespace::nu@mber() const\n"
-        "{\n"
-        "    return 5;\n"
-        "}\n";
-    expectedSource =
-        "#include \"file.h\"\n"
-        "\n\n";
-    QTest::newRow("free function, namespace") << QByteArrayList{originalHeader, expectedHeader}
-                                              << QByteArrayList{originalSource, expectedSource};
-
-    originalHeader =
-        "class Foo {\n"
-        "public:\n"
-        "    Fo@o();\n"
-        "private:\n"
-        "    int a;\n"
-        "    float b;\n"
-        "};\n";
-    expectedHeader =
-        "class Foo {\n"
-        "public:\n"
-        "    Foo() : a(42), b(3.141) {}\n"
-        "private:\n"
-        "    int a;\n"
-        "    float b;\n"
-        "};\n";
-    originalSource =
-        "#include \"file.h\"\n"
-        "\n"
-        "Foo::F@oo() : a(42), b(3.141) {}"
-        ;
-    expectedSource ="#include \"file.h\"\n\n";
-    QTest::newRow("constructor") << QByteArrayList{originalHeader, expectedHeader}
-                                 << QByteArrayList{originalSource, expectedSource};
-
-    originalSource =
-        "struct Foo\n"
-        "{\n"
-        "    void f@oo();\n"
-        "} bar;\n"
-        "void Foo::fo@o()\n"
-        "{\n"
-        "    return;\n"
-        "}";
-    expectedSource =
-        "struct Foo\n"
-        "{\n"
-        "    void foo()\n"
-        "    {\n"
-        "        return;\n"
-        "    }\n"
-        "} bar;\n";
-    QTest::newRow("QTCREATORBUG-10303") << QByteArrayList()
-                                        << QByteArrayList{originalSource, expectedSource};
-
-    originalSource =
-        "struct Base {\n"
-        "    virtual int foo() = 0;\n"
-        "};\n"
-        "struct Derived : Base {\n"
-        "    int @foo() override;\n"
-        "};\n"
-        "\n"
-        "int Derived::fo@o()\n"
-        "{\n"
-        "    return 5;\n"
-        "}\n";
-    expectedSource =
-        "struct Base {\n"
-        "    virtual int foo() = 0;\n"
-        "};\n"
-        "struct Derived : Base {\n"
-        "    int foo() override\n"
-        "    {\n"
-        "        return 5;\n"
-        "    }\n"
-        "};\n\n\n";
-    QTest::newRow("overridden virtual") << QByteArrayList()
-                                        << QByteArrayList{originalSource, expectedSource};
-
-    originalSource =
-        "template<class T>\n"
-        "class Foo { void @func(); };\n"
-        "\n"
-        "template<class T>\n"
-        "void Foo<T>::fu@nc() {}\n";
-    expectedSource =
-        "template<class T>\n"
-        "class Foo { void fu@nc() {} };\n\n\n";
-    QTest::newRow("class template") << QByteArrayList()
-                                    << QByteArrayList{originalSource, expectedSource};
-
-    originalSource =
-        "class Foo\n"
-        "{\n"
-        "    template<class T>\n"
-        "    void @func();\n"
-        "};\n"
-        "\n"
-        "template<class T>\n"
-        "void Foo::fu@nc() {}\n";
-    expectedSource =
-        "class Foo\n"
-        "{\n"
-        "    template<class T>\n"
-        "    void func() {}\n"
-        "};\n\n\n";
-    QTest::newRow("function template") << QByteArrayList()
-                                       << QByteArrayList{originalSource, expectedSource};
-}
-
-void QuickfixTest::testMoveFuncDefToDecl()
-{
-    QFETCH(QByteArrayList, headers);
-    QFETCH(QByteArrayList, sources);
-
-    QVERIFY(headers.isEmpty() || headers.size() == 2);
-    QVERIFY(sources.size() == 2);
-
-    QByteArray &declDoc = !headers.empty() ? headers.first() : sources.first();
-    const int declCursorPos = declDoc.indexOf('@');
-    QVERIFY(declCursorPos != -1);
-    const int defCursorPos = sources.first().lastIndexOf('@');
-    QVERIFY(defCursorPos != -1);
-    QVERIFY(declCursorPos != defCursorPos);
-
-    declDoc.remove(declCursorPos, 1);
-    QList<TestDocumentPtr> testDocuments;
-    if (!headers.isEmpty())
-        testDocuments << CppTestDocument::create("file.h", headers.first(), headers.last());
-    testDocuments << CppTestDocument::create("file.cpp", sources.first(), sources.last());
-
-    MoveFuncDefToDeclPush pushFactory;
-    QuickFixOperationTest(testDocuments, &pushFactory);
-
-    declDoc.insert(declCursorPos, '@');
-    sources.first().remove(defCursorPos, 1);
-    testDocuments.clear();
-    if (!headers.isEmpty())
-        testDocuments << CppTestDocument::create("file.h", headers.first(), headers.last());
-    testDocuments << CppTestDocument::create("file.cpp", sources.first(), sources.last());
-
-    MoveFuncDefToDeclPull pullFactory;
-    QuickFixOperationTest(testDocuments, &pullFactory);
-}
-
-void QuickfixTest::testMoveFuncDefToDeclMacroUses()
-{
-    QByteArray original =
-        "#define CONST const\n"
-        "#define VOLATILE volatile\n"
-        "class Foo\n"
-        "{\n"
-        "    int func(int a, int b) CONST VOLATILE;\n"
-        "};\n"
-        "\n"
-        "\n"
-        "int Foo::fu@nc(int a, int b) CONST VOLATILE"
-        "{\n"
-        "    return 42;\n"
-        "}\n";
-    QByteArray expected =
-        "#define CONST const\n"
-        "#define VOLATILE volatile\n"
-        "class Foo\n"
-        "{\n"
-        "    int func(int a, int b) CONST VOLATILE\n"
-        "    {\n"
-        "        return 42;\n"
-        "    }\n"
-        "};\n\n\n\n";
-
-    MoveFuncDefToDeclPush factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory,
-                          ProjectExplorer::HeaderPaths(), 0, "QTCREATORBUG-12314");
-}
-
-/// Check: Move all definitions from header to cpp.
-void QuickfixTest::testMoveAllFuncDefOutsideMemberFuncToCpp()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "class Foo {@\n"
-        "  int numberA() const\n"
-        "  {\n"
-        "    return 5;\n"
-        "  }\n"
-        "  int numberB() const\n"
-        "  {\n"
-        "    return 5;\n"
-        "  }\n"
-        "};\n";
-    expected =
-        "class Foo {\n"
-        "  int numberA() const;\n"
-        "  int numberB() const;\n"
-        "};\n";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"file.h\"\n";
-    expected =
-        "#include \"file.h\"\n"
-        "\n"
-        "int Foo::numberA() const\n"
-        "{\n"
-        "    return 5;\n"
-        "}\n"
-        "\n"
-        "int Foo::numberB() const\n"
-        "{\n"
-        "    return 5;\n"
-        "}\n"
-        ;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    MoveAllFuncDefOutside factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-/// Check: Move all definition outside class
-void QuickfixTest::testMoveAllFuncDefOutsideMemberFuncOutside()
-{
-    QByteArray original =
-        "class F@oo {\n"
-        "    int f1()\n"
-        "    {\n"
-        "        return 1;\n"
-        "    }\n"
-        "    int f2() const\n"
-        "    {\n"
-        "        return 2;\n"
-        "    }\n"
-        "};\n";
-    QByteArray expected =
-        "class Foo {\n"
-        "    int f1();\n"
-        "    int f2() const;\n"
-        "};\n"
-        "\n"
-        "int Foo::f1()\n"
-        "{\n"
-        "    return 1;\n"
-        "}\n"
-        "\n"
-        "int Foo::f2() const\n"
-        "{\n"
-        "    return 2;\n"
-        "}\n";
-
-    MoveAllFuncDefOutside factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-}
-
-/// Check: Move all definition outside class
-void QuickfixTest::testMoveAllFuncDefOutsideDoNotTriggerOnBaseClass()
-{
-    QByteArray original =
-        "class Bar;\n"
-        "class Foo : public Ba@r {\n"
-        "    int f1()\n"
-        "    {\n"
-        "        return 1;\n"
-        "    }\n"
-        "};\n";
-
-    MoveAllFuncDefOutside factory;
-    QuickFixOperationTest(singleDocument(original, ""), &factory);
-}
-
-/// Check: Move all definition outside class
-void QuickfixTest::testMoveAllFuncDefOutsideClassWithBaseClass()
-{
-    QByteArray original =
-        "class Bar;\n"
-        "class Fo@o : public Bar {\n"
-        "    int f1()\n"
-        "    {\n"
-        "        return 1;\n"
-        "    }\n"
-        "};\n";
-    QByteArray expected =
-        "class Bar;\n"
-        "class Foo : public Bar {\n"
-        "    int f1();\n"
-        "};\n"
-        "\n"
-        "int Foo::f1()\n"
-        "{\n"
-        "    return 1;\n"
-        "}\n";
-
-    MoveAllFuncDefOutside factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-}
-
-/// Check: Do not take macro expanded code into account (QTCREATORBUG-13900)
-void QuickfixTest::testMoveAllFuncDefOutsideIgnoreMacroCode()
-{
-    QByteArray original =
-        "#define FAKE_Q_OBJECT int bar() {return 5;}\n"
-        "class Fo@o {\n"
-        "    FAKE_Q_OBJECT\n"
-        "    int f1()\n"
-        "    {\n"
-        "        return 1;\n"
-        "    }\n"
-        "};\n";
-    QByteArray expected =
-        "#define FAKE_Q_OBJECT int bar() {return 5;}\n"
-        "class Foo {\n"
-        "    FAKE_Q_OBJECT\n"
-        "    int f1();\n"
-        "};\n"
-        "\n"
-        "int Foo::f1()\n"
-        "{\n"
-        "    return 1;\n"
-        "}\n";
-
-    MoveAllFuncDefOutside factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-}
-
-void QuickfixTest::testAssignToLocalVariableTemplates()
-{
-
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "template <typename T>\n"
-        "class List {\n"
-        "public:\n"
-        "    T first();"
-        "};\n"
-        ;
-    expected = original;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"file.h\"\n"
-        "void foo() {\n"
-        "    List<int> list;\n"
-        "    li@st.first();\n"
-        "}\n";
-    expected =
-        "#include \"file.h\"\n"
-        "void foo() {\n"
-        "    List<int> list;\n"
-        "    auto localFirst = list.first();\n"
-        "}\n";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    AssignToLocalVariable factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testExtractFunction_data()
-{
-    QTest::addColumn<QByteArray>("original");
-    QTest::addColumn<QByteArray>("expected");
-
-    QTest::newRow("basic")
-        << _("// Documentation for f\n"
-             "void f()\n"
-             "{\n"
-             "    @{start}g();@{end}\n"
-             "}\n")
-        << _("inline void extracted()\n"
-             "{\n"
-             "    g();\n"
-             "}\n"
-             "\n"
-             "// Documentation for f\n"
-             "void f()\n"
-             "{\n"
-             "    extracted();\n"
-             "}\n");
-
-    QTest::newRow("class function")
-        << _("class Foo\n"
-             "{\n"
-             "private:\n"
-             "    void bar();\n"
-             "};\n\n"
-             "void Foo::bar()\n"
-             "{\n"
-             "    @{start}g();@{end}\n"
-             "}\n")
-        << _("class Foo\n"
-             "{\n"
-             "public:\n"
-             "    void extracted();\n\n"
-             "private:\n"
-             "    void bar();\n"
-             "};\n\n"
-             "inline void Foo::extracted()\n"
-             "{\n"
-             "    g();\n"
-             "}\n\n"
-             "void Foo::bar()\n"
-             "{\n"
-             "    extracted();\n"
-             "}\n");
-
-    QTest::newRow("class in namespace")
-        << _("namespace NS {\n"
-             "class C {\n"
-             "    void f(C &c);\n"
-             "};\n"
-             "}\n"
-             "void NS::C::f(NS::C &c)\n"
-             "{\n"
-             "    @{start}C *c2 = &c;@{end}\n"
-             "}\n")
-        << _("namespace NS {\n"
-             "class C {\n"
-             "    void f(C &c);\n"
-             "\n"
-             "public:\n"
-             "    void extracted(NS::C &c);\n" // TODO: Remove non-required qualification
-             "};\n"
-             "}\n"
-             "inline void NS::C::extracted(NS::C &c)\n"
-             "{\n"
-             "    C *c2 = &c;\n"
-             "}\n"
-             "\n"
-             "void NS::C::f(NS::C &c)\n"
-             "{\n"
-             "    extracted(c);\n"
-             "}\n");
-
-    QTest::newRow("if-block")
-            << _("inline void func()\n"
-                 "{\n"
-                 "    int dummy = 0;\n"
-                 "    @{start}if@{end} (dummy < 10) {\n"
-                 "        ++dummy;\n"
-                 "    }\n"
-                 "}\n")
-            << _("inline void extracted(int dummy)\n"
-                 "{\n"
-                 "    if (dummy < 10) {\n"
-                 "        ++dummy;\n"
-                 "    }\n"
-                 "}\n\n"
-                 "inline void func()\n"
-                 "{\n"
-                 "    int dummy = 0;\n"
-                 "    extracted(dummy);\n"
-                 "}\n");
-}
-
-void QuickfixTest::testExtractFunction()
-{
-    QFETCH(QByteArray, original);
-    QFETCH(QByteArray, expected);
-
-    QList<TestDocumentPtr> testDocuments;
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    ExtractFunction factory([]() { return QLatin1String("extracted"); });
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testExtractLiteralAsParameterTypeDeduction_data()
-{
-    QTest::addColumn<QByteArray>("typeString");
-    QTest::addColumn<QByteArray>("literal");
-    QTest::newRow("int")
-            << QByteArray("int ") << QByteArray("156");
-    QTest::newRow("unsigned int")
-            << QByteArray("unsigned int ") << QByteArray("156u");
-    QTest::newRow("long")
-            << QByteArray("long ") << QByteArray("156l");
-    QTest::newRow("unsigned long")
-            << QByteArray("unsigned long ") << QByteArray("156ul");
-    QTest::newRow("long long")
-            << QByteArray("long long ") << QByteArray("156ll");
-    QTest::newRow("unsigned long long")
-            << QByteArray("unsigned long long ") << QByteArray("156ull");
-    QTest::newRow("float")
-            << QByteArray("float ") << QByteArray("3.14159f");
-    QTest::newRow("double")
-            << QByteArray("double ") << QByteArray("3.14159");
-    QTest::newRow("long double")
-            << QByteArray("long double ") << QByteArray("3.14159L");
-    QTest::newRow("bool")
-            << QByteArray("bool ") << QByteArray("true");
-    QTest::newRow("bool")
-            << QByteArray("bool ") << QByteArray("false");
-    QTest::newRow("char")
-            << QByteArray("char ") << QByteArray("'X'");
-    QTest::newRow("wchar_t")
-            << QByteArray("wchar_t ") << QByteArray("L'X'");
-    QTest::newRow("char16_t")
-            << QByteArray("char16_t ") << QByteArray("u'X'");
-    QTest::newRow("char32_t")
-            << QByteArray("char32_t ") << QByteArray("U'X'");
-    QTest::newRow("const char *")
-            << QByteArray("const char *") << QByteArray("\"narf\"");
-    QTest::newRow("const wchar_t *")
-            << QByteArray("const wchar_t *") << QByteArray("L\"narf\"");
-    QTest::newRow("const char16_t *")
-            << QByteArray("const char16_t *") << QByteArray("u\"narf\"");
-    QTest::newRow("const char32_t *")
-            << QByteArray("const char32_t *") << QByteArray("U\"narf\"");
-}
-
-void QuickfixTest::testExtractLiteralAsParameterTypeDeduction()
-{
-    QFETCH(QByteArray, typeString);
-    QFETCH(QByteArray, literal);
-    const QByteArray original = QByteArray("void foo() {return @") + literal + QByteArray(";}\n");
-    const QByteArray expected = QByteArray("void foo(") + typeString + QByteArray("newParameter = ")
-            + literal + QByteArray(") {return newParameter;}\n");
-
-    if (literal == "3.14159") {
-        qWarning("Literal 3.14159 is wrongly reported as int. Skipping.");
-        return;
-    } else if (literal == "3.14159L") {
-        qWarning("Literal 3.14159L is wrongly reported as long. Skipping.");
-        return;
-    }
-
-    ExtractLiteralAsParameter factory;
-    QuickFixOperationTest(singleDocument(original, expected), &factory);
-}
-
-void QuickfixTest::testExtractLiteralAsParameterFreeFunctionSeparateFiles()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "void foo(const char *a, long b = 1);\n";
-    expected =
-        "void foo(const char *a, long b = 1, int newParameter = 156);\n";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-        "void foo(const char *a, long b)\n"
-        "{return 1@56 + 123 + 156;}\n";
-    expected =
-        "void foo(const char *a, long b, int newParameter)\n"
-        "{return newParameter + 123 + newParameter;}\n";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    ExtractLiteralAsParameter factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testExtractLiteralAsParameterMemberFunctionSeparateFiles()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    QByteArray expected;
-
-    // Header File
-    original =
-        "class Narf {\n"
-        "public:\n"
-        "    int zort();\n"
-        "};\n";
-    expected =
-        "class Narf {\n"
-        "public:\n"
-        "    int zort(int newParameter = 155);\n"
-        "};\n";
-    testDocuments << CppTestDocument::create("file.h", original, expected);
-
-    // Source File
-    original =
-        "#include \"file.h\"\n\n"
-        "int Narf::zort()\n"
-        "{ return 15@5 + 1; }\n";
-    expected =
-        "#include \"file.h\"\n\n"
-        "int Narf::zort(int newParameter)\n"
-        "{ return newParameter + 1; }\n";
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    ExtractLiteralAsParameter factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testExtractLiteralAsParameterNotTriggeringForInvalidCode()
-{
-    QList<TestDocumentPtr> testDocuments;
-    QByteArray original;
-    original =
-        "T(\"test\")\n"
-        "{\n"
-        "    const int i = @14;\n"
-        "}\n";
-    testDocuments << CppTestDocument::create("file.cpp", original, "");
-
-    ExtractLiteralAsParameter factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testAddCurlyBraces()
-{
-    QList<TestDocumentPtr> testDocuments;
-    const QByteArray original = R"delim(
-void MyObject::f()
-{
-    @if (true)
-        emit mySig();
-}
-)delim";
-    const QByteArray expected = R"delim(
-void MyObject::f()
-{
-    if (true) {
-        emit mySig();
-    }
-}
-)delim";
-
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-    AddBracesToIf factory;
-    QuickFixOperationTest(testDocuments, &factory);
-
-}
-
-void QuickfixTest::testConvertQt4ConnectConnectOutOfClass()
-{
-    QByteArray prefix =
-        "class QObject {};\n"
-        "class TestClass : public QObject\n"
-        "{\n"
-        "public:\n"
-        "    void setProp(int) {}\n"
-        "    void sigFoo(int) {}\n"
-        "};\n"
-        "\n"
-        "int foo()\n"
-        "{\n";
-
-    QByteArray suffix = "\n}\n";
-
-    QByteArray original = prefix
-          + "    TestClass obj;\n"
-            "    conne@ct(&obj, SIGNAL(sigFoo(int)), &obj, SLOT(setProp(int)));"
-          + suffix;
-
-    QByteArray expected = prefix
-          + "    TestClass obj;\n"
-            "    connect(&obj, &TestClass::sigFoo, &obj, &TestClass::setProp);"
-          + suffix;
-
-    QList<TestDocumentPtr> testDocuments;
-    testDocuments << CppTestDocument::create("file.cpp", original, expected);
-
-    ConvertQt4Connect factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testConvertQt4ConnectConnectWithinClass_data()
-{
-    QTest::addColumn<QByteArray>("original");
-    QTest::addColumn<QByteArray>("expected");
-
-    QTest::newRow("four-args-connect")
-            << QByteArray("conne@ct(this, SIGNAL(sigFoo(int)), this, SLOT(setProp(int)));")
-            << QByteArray("connect(this, &TestClass::sigFoo, this, &TestClass::setProp);");
-
-    QTest::newRow("four-args-disconnect")
-            << QByteArray("disconne@ct(this, SIGNAL(sigFoo(int)), this, SLOT(setProp(int)));")
-            << QByteArray("disconnect(this, &TestClass::sigFoo, this, &TestClass::setProp);");
-
-    QTest::newRow("three-args-connect")
-            << QByteArray("conne@ct(this, SIGNAL(sigFoo(int)), SLOT(setProp(int)));")
-            << QByteArray("connect(this, &TestClass::sigFoo, this, &TestClass::setProp);");
-
-    QTest::newRow("template-value")
-            << QByteArray("Pointer<TestClass> p;\n"
-                          "conne@ct(p.t, SIGNAL(sigFoo(int)), p.t, SLOT(setProp(int)));")
-            << QByteArray("Pointer<TestClass> p;\n"
-                          "connect(p.t, &TestClass::sigFoo, p.t, &TestClass::setProp);");
-
-    QTest::newRow("implicit-pointer")
-            << QByteArray("Pointer<TestClass> p;\n"
-                          "conne@ct(p, SIGNAL(sigFoo(int)), p, SLOT(setProp(int)));")
-            << QByteArray("Pointer<TestClass> p;\n"
-                          "connect(p.data(), &TestClass::sigFoo, p.data(), &TestClass::setProp);");
-}
-
-void QuickfixTest::testConvertQt4ConnectConnectWithinClass()
-{
-    QFETCH(QByteArray, original);
-    QFETCH(QByteArray, expected);
-
-    QByteArray prefix =
-        "template<class T>\n"
-        "struct Pointer\n"
-        "{\n"
-        "    T *t;\n"
-        "    operator T*() const { return t; }\n"
-        "    T *data() const { return t; }\n"
-        "};\n"
-        "class QObject {};\n"
-        "class TestClass : public QObject\n"
-        "{\n"
-        "public:\n"
-        "    void setProp(int) {}\n"
-        "    void sigFoo(int) {}\n"
-        "    void setupSignals();\n"
-        "};\n"
-        "\n"
-        "int TestClass::setupSignals()\n"
-        "{\n";
-
-    QByteArray suffix = "\n}\n";
-
-    QList<TestDocumentPtr> testDocuments;
-    testDocuments << CppTestDocument::create("file.cpp",
-                                              prefix + original + suffix,
-                                              prefix + expected + suffix);
-
-    ConvertQt4Connect factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testConvertQt4ConnectDifferentNamespace()
-{
-    const QByteArray prefix =
-        "namespace NsA {\n"
-        "class ClassA : public QObject\n"
-        "{\n"
-        "  static ClassA *instance();\n"
-        "signals:\n"
-        "  void sig();\n"
-        "};\n"
-        "}\n"
-        "\n"
-        "namespace NsB {\n"
-        "class ClassB : public QObject\n"
-        "{\n"
-        "  void slot();\n"
-        "  void connector() {\n";
-
-    const QByteArray suffix = "  }\n};\n}";
-
-    const QByteArray original = "co@nnect(NsA::ClassA::instance(), SIGNAL(sig()),\n"
-                                "        this, SLOT(slot()));\n";
-    const QByteArray expected = "connect(NsA::ClassA::instance(), &NsA::ClassA::sig,\n"
-                                "        this, &ClassB::slot);\n";
-    QList<TestDocumentPtr> testDocuments;
-    testDocuments << CppTestDocument::create("file.cpp",
-                                              prefix + original + suffix,
-                                              prefix + expected + suffix);
-
-    ConvertQt4Connect factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testRemoveUsingNamespace_data()
-{
-    QTest::addColumn<QByteArray>("header1");
-    QTest::addColumn<QByteArray>("header2");
-    QTest::addColumn<QByteArray>("header3");
-    QTest::addColumn<QByteArray>("expected1");
-    QTest::addColumn<QByteArray>("expected2");
-    QTest::addColumn<QByteArray>("expected3");
-    QTest::addColumn<int>("operation");
-
-    const QByteArray header1 = "namespace std{\n"
-                               "    template<typename T>\n"
-                               "    class vector{};\n"
-                               "    namespace chrono{\n"
-                               "        using seconds = int;\n"
-                               "    }\n"
-                               "}\n"
-                               "using namespace std;\n"
-                               "namespace test{\n"
-                               "    class vector{\n"
-                               "       std::vector<int> ints;\n"
-                               "    };\n"
-                               "}\n";
-    const QByteArray header2 = "#include \"header1.h\"\n"
-                               "using foo = test::vector;\n"
-                               "using namespace std;\n"
-                               "using namespace test;\n"
-                               "vector<int> others;\n";
-
-    const QByteArray header3 = "#include \"header2.h\"\n"
-                               "using namespace std;\n"
-                               "using namespace chrono;\n"
-                               "namespace test{\n"
-                               "   vector vec;\n"
-                               "   seconds t;\n"
-                               "}\n"
-                               "void scope(){\n"
-                               "    for (;;) {\n"
-                               "        using namespace std;\n"
-                               "        vector<int> fori;\n"
-                               "    }\n"
-                               "    vector<int> no;\n"
-                               "    using namespace std;\n"
-                               "    vector<int> _no_change;\n"
-                               "}\n"
-                               "foo foos;\n";
-
-    QByteArray h3 = "#include \"header2.h\"\n"
-                    "using namespace s@td;\n"
-                    "using namespace chrono;\n"
-                    "namespace test{\n"
-                    "   vector vec;\n"
-                    "   seconds t;\n"
-                    "}\n"
-                    "void scope(){\n"
-                    "    for (;;) {\n"
-                    "        using namespace std;\n"
-                    "        vector<int> fori;\n"
-                    "    }\n"
-                    "    vector<int> no;\n"
-                    "    using namespace std;\n"
-                    "    vector<int> _no_change;\n"
-                    "}\n"
-                    "foo foos;\n";
-
-    // like header1 but without "using namespace std;\n"
-    QByteArray expected1 = "namespace std{\n"
-                           "    template<typename T>\n"
-                           "    class vector{};\n"
-                           "    namespace chrono{\n"
-                           "        using seconds = int;\n"
-                           "    }\n"
-                           "}\n"
-                           "namespace test{\n"
-                           "    class vector{\n"
-                           "       std::vector<int> ints;\n"
-                           "    };\n"
-                           "}\n";
-
-    // like header2 but without "using namespace std;\n" and with std::vector
-    QByteArray expected2 = "#include \"header1.h\"\n"
-                           "using foo = test::vector;\n"
-                           "using namespace test;\n"
-                           "std::vector<int> others;\n";
-
-    QByteArray expected3 = "#include \"header2.h\"\n"
-                           "using namespace std::chrono;\n"
-                           "namespace test{\n"
-                           "   vector vec;\n"
-                           "   seconds t;\n"
-                           "}\n"
-                           "void scope(){\n"
-                           "    for (;;) {\n"
-                           "        using namespace std;\n"
-                           "        vector<int> fori;\n"
-                           "    }\n"
-                           "    std::vector<int> no;\n"
-                           "    using namespace std;\n"
-                           "    vector<int> _no_change;\n"
-                           "}\n"
-                           "foo foos;\n";
-
-    QTest::newRow("remove only in one file local")
-        << header1 << header2 << h3 << header1 << header2 << expected3 << 0;
-    QTest::newRow("remove only in one file globally")
-        << header1 << header2 << h3 << expected1 << expected2 << expected3 << 1;
-
-    QByteArray h2 = "#include \"header1.h\"\n"
-                    "using foo = test::vector;\n"
-                    "using namespace s@td;\n"
-                    "using namespace test;\n"
-                    "vector<int> others;\n";
-
-    QTest::newRow("remove across two files only this")
-        << header1 << h2 << header3 << header1 << expected2 << header3 << 0;
-    QTest::newRow("remove across two files globally1")
-        << header1 << h2 << header3 << expected1 << expected2 << expected3 << 1;
-
-    QByteArray h1 = "namespace std{\n"
-                    "    template<typename T>\n"
-                    "    class vector{};\n"
-                    "    namespace chrono{\n"
-                    "        using seconds = int;\n"
-                    "    }\n"
-                    "}\n"
-                    "using namespace s@td;\n"
-                    "namespace test{\n"
-                    "    class vector{\n"
-                    "       std::vector<int> ints;\n"
-                    "    };\n"
-                    "}\n";
-
-    QTest::newRow("remove across tree files only this")
-        << h1 << header2 << header3 << expected1 << header2 << header3 << 0;
-    QTest::newRow("remove across tree files globally")
-        << h1 << header2 << header3 << expected1 << expected2 << expected3 << 1;
-
-    expected3 = "#include \"header2.h\"\n"
-                "using namespace std::chrono;\n"
-                "namespace test{\n"
-                "   vector vec;\n"
-                "   seconds t;\n"
-                "}\n"
-                "void scope(){\n"
-                "    for (;;) {\n"
-                "        using namespace s@td;\n"
-                "        vector<int> fori;\n"
-                "    }\n"
-                "    std::vector<int> no;\n"
-                "    using namespace std;\n"
-                "    vector<int> _no_change;\n"
-                "}\n"
-                "foo foos;\n";
-
-    QByteArray expected3_new = "#include \"header2.h\"\n"
-                               "using namespace std::chrono;\n"
-                               "namespace test{\n"
-                               "   vector vec;\n"
-                               "   seconds t;\n"
-                               "}\n"
-                               "void scope(){\n"
-                               "    for (;;) {\n"
-                               "        std::vector<int> fori;\n"
-                               "    }\n"
-                               "    std::vector<int> no;\n"
-                               "    using namespace std;\n"
-                               "    vector<int> _no_change;\n"
-                               "}\n"
-                               "foo foos;\n";
-
-    QTest::newRow("scoped remove")
-        << expected1 << expected2 << expected3 << expected1 << expected2 << expected3_new << 0;
-
-    h2 = "#include \"header1.h\"\n"
-         "using foo = test::vector;\n"
-         "using namespace std;\n"
-         "using namespace t@est;\n"
-         "vector<int> others;\n";
-    expected2 = "#include \"header1.h\"\n"
-                "using foo = test::vector;\n"
-                "using namespace std;\n"
-                "vector<int> others;\n";
-
-    QTest::newRow("existing namespace")
-        << header1 << h2 << header3 << header1 << expected2 << header3 << 1;
-
-    // test: remove using directive at global scope in every file
-    h1 = "using namespace tes@t;";
-    h2 = "using namespace test;";
-    h3 = "using namespace test;";
-
-    expected1 = expected2 = expected3 = "";
-    QTest::newRow("global scope remove in every file")
-        << h1 << h2 << h3 << expected1 << expected2 << expected3 << 1;
-
-    // test: dont print inline namespaces
-    h1 = R"--(
-namespace test {
-  inline namespace test {
-    class Foo{
-      void foo1();
-      void foo2();
-    };
-    inline int TEST = 42;
-  }
-}
-)--";
-    h2 = R"--(
-#include "header1.h"
-using namespace tes@t;
-)--";
-    h3 = R"--(
-#include "header2.h"
-Foo f1;
-test::Foo f2;
-using T1 = Foo;
-using T2 = test::Foo;
-int i1 = TEST;
-int i2 = test::TEST;
-void Foo::foo1(){};
-void test::Foo::foo2(){};
-)--";
-
-    expected1 = h1;
-    expected2 = R"--(
-#include "header1.h"
-)--";
-    expected3 = R"--(
-#include "header2.h"
-test::Foo f1;
-test::Foo f2;
-using T1 = test::Foo;
-using T2 = test::Foo;
-int i1 = test::TEST;
-int i2 = test::TEST;
-void test::Foo::foo1(){};
-void test::Foo::foo2(){};
-)--";
-    QTest::newRow("don't insert inline namespaces")
-        << h1 << h2 << h3 << expected1 << expected2 << expected3 << 0;
-}
-
-void QuickfixTest::testRemoveUsingNamespace()
-{
-    QFETCH(QByteArray, header1);
-    QFETCH(QByteArray, header2);
-    QFETCH(QByteArray, header3);
-    QFETCH(QByteArray, expected1);
-    QFETCH(QByteArray, expected2);
-    QFETCH(QByteArray, expected3);
-    QFETCH(int, operation);
-
-    QList<TestDocumentPtr> testDocuments;
-    testDocuments << CppTestDocument::create("header1.h", header1, expected1);
-    testDocuments << CppTestDocument::create("header2.h", header2, expected2);
-    testDocuments << CppTestDocument::create("header3.h", header3, expected3);
-
-    RemoveUsingNamespace factory;
-    QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), operation);
-}
-
-void QuickfixTest::testRemoveUsingNamespaceSimple_data()
-{
-    QTest::addColumn<QByteArray>("header");
-    QTest::addColumn<QByteArray>("expected");
-
-    const QByteArray common = R"--(
-namespace N{
-    template<typename T>
-    struct vector{
-        using iterator = T*;
-    };
-    using int_vector = vector<int>;
-}
-)--";
-    const QByteArray header = common + R"--(
-using namespace N@;
-int_vector ints;
-int_vector::iterator intIter;
-using vec = vector<int>;
-vec::iterator it;
-)--";
-    const QByteArray expected = common + R"--(
-N::int_vector ints;
-N::int_vector::iterator intIter;
-using vec = N::vector<int>;
-vec::iterator it;
-)--";
-
-    QTest::newRow("nested typedefs with Namespace") << header << expected;
-}
-
-void QuickfixTest::testRemoveUsingNamespaceSimple()
-{
-    QFETCH(QByteArray, header);
-    QFETCH(QByteArray, expected);
-
-    QList<TestDocumentPtr> testDocuments;
-    testDocuments << CppTestDocument::create("header.h", header, expected);
-
-    RemoveUsingNamespace factory;
-    QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths());
-}
-
-void QuickfixTest::testRemoveUsingNamespaceDifferentSymbols()
-{
-    QByteArray header = "namespace test{\n"
-                        "  struct foo{\n"
-                        "    foo();\n"
-                        "    void bar();\n"
-                        "  };\n"
-                        "  void func();\n"
-                        "  enum E {E1, E2};\n"
-                        "  int bar;\n"
-                        "}\n"
-                        "using namespace t@est;\n"
-                        "foo::foo(){}\n"
-                        "void foo::bar(){}\n"
-                        "void test(){\n"
-                        "  int i = bar * 4;\n"
-                        "  E val = E1;\n"
-                        "  auto p = &foo::bar;\n"
-                        "  func()\n"
-                        "}\n";
-    QByteArray expected = "namespace test{\n"
-                          "  struct foo{\n"
-                          "    foo();\n"
-                          "    void bar();\n"
-                          "  };\n"
-                          "  void func();\n"
-                          "  enum E {E1, E2};\n"
-                          "  int bar;\n"
-                          "}\n"
-                          "test::foo::foo(){}\n"
-                          "void test::foo::bar(){}\n"
-                          "void test(){\n"
-                          "  int i = test::bar * 4;\n"
-                          "  test::E val = test::E1;\n"
-                          "  auto p = &test::foo::bar;\n"
-                          "  test::func()\n"
-                          "}\n";
-
-    QList<TestDocumentPtr> testDocuments;
-    testDocuments << CppTestDocument::create("file.h", header, expected);
-    RemoveUsingNamespace factory;
-    QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 0);
-}
-
-enum ConstructorLocation { Inside, Outside, CppGenNamespace, CppGenUsingDirective, CppRewriteType };
-
-void QuickfixTest::testGenerateConstructor_data()
-{
-    QTest::addColumn<QByteArray>("original_header");
-    QTest::addColumn<QByteArray>("expected_header");
-    QTest::addColumn<QByteArray>("original_source");
-    QTest::addColumn<QByteArray>("expected_source");
-    QTest::addColumn<int>("location");
-    const int Inside = ConstructorLocation::Inside;
-    const int Outside = ConstructorLocation::Outside;
-    const int CppGenNamespace = ConstructorLocation::CppGenNamespace;
-    const int CppGenUsingDirective = ConstructorLocation::CppGenUsingDirective;
-    const int CppRewriteType = ConstructorLocation::CppRewriteType;
-
-    QByteArray header = R"--(
-class@ Foo{
-    int test;
-    static int s;
-};
-)--";
-    QByteArray expected = R"--(
-class Foo{
-    int test;
-    static int s;
-public:
-    Foo(int test) : test(test)
-    {}
-};
-)--";
-    QTest::newRow("ignore static") << header << expected << QByteArray() << QByteArray() << Inside;
-
-    header = R"--(
-class@ Foo{
-    CustomType test;
-};
-)--";
-    expected = R"--(
-class Foo{
-    CustomType test;
-public:
-    Foo(CustomType test) : test(std::move(test))
-    {}
-};
-)--";
-    QTest::newRow("Move custom value types")
-        << header << expected << QByteArray() << QByteArray() << Inside;
-
-    header = R"--(
-class@ Foo{
-    int test;
-protected:
-    Foo() = default;
-};
-)--";
-    expected = R"--(
-class Foo{
-    int test;
-public:
-    Foo(int test) : test(test)
-    {}
-
-protected:
-    Foo() = default;
-};
-)--";
-
-    QTest::newRow("new section before existing")
-        << header << expected << QByteArray() << QByteArray() << Inside;
-
-    header = R"--(
-class@ Foo{
-    int test;
-};
-)--";
-    expected = R"--(
-class Foo{
-    int test;
-public:
-    Foo(int test) : test(test)
-    {}
-};
-)--";
-    QTest::newRow("new section at end")
-        << header << expected << QByteArray() << QByteArray() << Inside;
-
-    header = R"--(
-class@ Foo{
-    int test;
-public:
-    /**
-     * Random comment
-     */
-    Foo(int i, int i2);
-};
-)--";
-    expected = R"--(
-class Foo{
-    int test;
-public:
-    Foo(int test) : test(test)
-    {}
-    /**
-     * Random comment
-     */
-    Foo(int i, int i2);
-};
-)--";
-    QTest::newRow("in section before")
-        << header << expected << QByteArray() << QByteArray() << Inside;
-
-    header = R"--(
-class@ Foo{
-    int test;
-public:
-    Foo() = default;
-};
-)--";
-    expected = R"--(
-class Foo{
-    int test;
-public:
-    Foo() = default;
-    Foo(int test) : test(test)
-    {}
-};
-)--";
-    QTest::newRow("in section after")
-        << header << expected << QByteArray() << QByteArray() << Inside;
-
-    header = R"--(
-class@ Foo{
-    int test1;
-    int test2;
-    int test3;
-public:
-};
-)--";
-    expected = R"--(
-class Foo{
-    int test1;
-    int test2;
-    int test3;
-public:
-    Foo(int test2, int test3, int test1) : test1(test1),
-        test2(test2),
-        test3(test3)
-    {}
-};
-)--";
-    // No worry, that is not the default behavior.
-    // Move first member to the back when testing with 3 or more members
-    QTest::newRow("changed parameter order")
-        << header << expected << QByteArray() << QByteArray() << Inside;
-
-    header = R"--(
-class@ Foo{
-    int test;
-    int di_test;
-public:
-};
-)--";
-    expected = R"--(
-class Foo{
-    int test;
-    int di_test;
-public:
-    Foo(int test, int di_test = 42) : test(test),
-        di_test(di_test)
-    {}
-};
-)--";
-    QTest::newRow("default parameters")
-        << header << expected << QByteArray() << QByteArray() << Inside;
-
-    header = R"--(
-struct Bar{
-    Bar(int i);
-};
-class@ Foo : public Bar{
-    int test;
-public:
-};
-)--";
-    expected = R"--(
-struct Bar{
-    Bar(int i);
-};
-class Foo : public Bar{
-    int test;
-public:
-    Foo(int test, int i) : Bar(i),
-        test(test)
-    {}
-};
-)--";
-    QTest::newRow("parent constructor")
-        << header << expected << QByteArray() << QByteArray() << Inside;
-
-    header = R"--(
-struct Bar{
-    Bar(int use_i = 6);
-};
-class@ Foo : public Bar{
-    int test;
-public:
-};
-)--";
-    expected = R"--(
-struct Bar{
-    Bar(int use_i = 6);
-};
-class Foo : public Bar{
-    int test;
-public:
-    Foo(int test, int use_i = 6) : Bar(use_i),
-        test(test)
-    {}
-};
-)--";
-    QTest::newRow("parent constructor with default")
-        << header << expected << QByteArray() << QByteArray() << Inside;
-
-    header = R"--(
-struct Bar{
-    Bar(int use_i = L'A', int use_i2 = u8"B");
-};
-class@ Foo : public Bar{
-public:
-};
-)--";
-    expected = R"--(
-struct Bar{
-    Bar(int use_i = L'A', int use_i2 = u8"B");
-};
-class Foo : public Bar{
-public:
-    Foo(int use_i = L'A', int use_i2 = u8"B") : Bar(use_i, use_i2)
-    {}
-};
-)--";
-    QTest::newRow("parent constructor with char/string default value")
-        << header << expected << QByteArray() << QByteArray() << Inside;
-
-    const QByteArray common = R"--(
-namespace N{
-    template<typename T>
-    struct vector{
-    };
-}
-)--";
-    header = common + R"--(
-namespace M{
-enum G{g};
-class@ Foo{
-    N::vector<G> g;
-    enum E{e}e;
-public:
-};
-}
-)--";
-
-    expected = common + R"--(
-namespace M{
-enum G{g};
-class@ Foo{
-    N::vector<G> g;
-    enum E{e}e;
-public:
-    Foo(const N::vector<G> &g, E e);
-};
-
-Foo::Foo(const N::vector<G> &g, Foo::E e) : g(g),
-    e(e)
-{}
-
-}
-)--";
-    QTest::newRow("source: right type outside class ")
-        << QByteArray() << QByteArray() << header << expected << Outside;
-    expected = common + R"--(
-namespace M{
-enum G{g};
-class@ Foo{
-    N::vector<G> g;
-    enum E{e}e;
-public:
-    Foo(const N::vector<G> &g, E e);
-};
-}
-
-
-inline M::Foo::Foo(const N::vector<M::G> &g, M::Foo::E e) : g(g),
-    e(e)
-{}
-
-)--";
-    QTest::newRow("header: right type outside class ")
-        << header << expected << QByteArray() << QByteArray() << Outside;
-
-    expected = common + R"--(
-namespace M{
-enum G{g};
-class@ Foo{
-    N::vector<G> g;
-    enum E{e}e;
-public:
-    Foo(const N::vector<G> &g, E e);
-};
-}
-)--";
-    const QByteArray source = R"--(
-#include "file.h"
-)--";
-    QByteArray expected_source = R"--(
-#include "file.h"
-
-
-namespace M {
-Foo::Foo(const N::vector<G> &g, Foo::E e) : g(g),
-    e(e)
-{}
-
-}
-)--";
-    QTest::newRow("source: right type inside namespace")
-        << header << expected << source << expected_source << CppGenNamespace;
-
-    expected_source = R"--(
-#include "file.h"
-
-using namespace M;
-Foo::Foo(const N::vector<G> &g, Foo::E e) : g(g),
-    e(e)
-{}
-)--";
-    QTest::newRow("source: right type with using directive")
-        << header << expected << source << expected_source << CppGenUsingDirective;
-
-    expected_source = R"--(
-#include "file.h"
-
-M::Foo::Foo(const N::vector<M::G> &g, M::Foo::E e) : g(g),
-    e(e)
-{}
-)--";
-    QTest::newRow("source: right type while rewritung types")
-        << header << expected << source << expected_source << CppRewriteType;
-}
-
-void QuickfixTest::testGenerateConstructor()
-{
-    class TestFactory : public GenerateConstructor
-    {
-    public:
-        TestFactory() { setTest(); }
-    };
-
-    QFETCH(QByteArray, original_header);
-    QFETCH(QByteArray, expected_header);
-    QFETCH(QByteArray, original_source);
-    QFETCH(QByteArray, expected_source);
-    QFETCH(int, location);
-
-    QuickFixSettings s;
-    s->valueTypes << "CustomType";
-    using L = ConstructorLocation;
-    if (location == L::Inside) {
-        s->setterInCppFileFrom = -1;
-        s->setterOutsideClassFrom = -1;
-    } else if (location == L::Outside) {
-        s->setterInCppFileFrom = -1;
-        s->setterOutsideClassFrom = 1;
-    } else if (location >= L::CppGenNamespace && location <= L::CppRewriteType) {
-        s->setterInCppFileFrom = 1;
-        s->setterOutsideClassFrom = -1;
-        using Handling = CppQuickFixSettings::MissingNamespaceHandling;
-        if (location == L::CppGenNamespace)
-            s->cppFileNamespaceHandling = Handling::CreateMissing;
-        else if (location == L::CppGenUsingDirective)
-            s->cppFileNamespaceHandling = Handling::AddUsingDirective;
-        else if (location == L::CppRewriteType)
-            s->cppFileNamespaceHandling = Handling::RewriteType;
-    } else {
-        QFAIL("location is none of the values of the ConstructorLocation enum");
-    }
-
-    QList<TestDocumentPtr> testDocuments;
-    testDocuments << CppTestDocument::create("file.h", original_header, expected_header);
-    testDocuments << CppTestDocument::create("file.cpp", original_source, expected_source);
-    TestFactory factory;
-    QuickFixOperationTest(testDocuments, &factory);
-}
-
-void QuickfixTest::testChangeCommentType_data()
-{
-    QTest::addColumn<QString>("input");
-    QTest::addColumn<QString>("expectedOutput");
-
-    QTest::newRow("C -> C++ / no selection / single line") << R"(
-int var1;
-/* Other comment, unaffected */
-/* Our @comment */
-/* Another unaffected comment */
-int var2;)" << R"(
-int var1;
-/* Other comment, unaffected */
-// Our comment
-/* Another unaffected comment */
-int var2;)";
-
-    QTest::newRow("C -> C++ / no selection / multi-line / preserved header and footer") << R"(
-/****************************************************
- * some info
- * more @info
- ***************************************************/)" << R"(
-/////////////////////////////////////////////////////
-// some info
-// more info
-/////////////////////////////////////////////////////)";
-
-    QTest::newRow("C -> C++ / no selection / multi-line / non-preserved header and footer") << R"(
-/*
- * some info
- * more @info
- */)" << R"(
-// some info
-// more info
-)";
-
-    QTest::newRow("C -> C++ / no selection / qdoc") << R"(
-/*!
-    \qmlproperty string Type::element.name
-    \qmlproperty int Type::element.id
-
-    \brief Holds the @element name and id.
-*/)" << R"(
-//! \qmlproperty string Type::element.name
-//! \qmlproperty @int Type::element.id
-//!
-//! \brief Holds the element name and id.
-)";
-
-    QTest::newRow("C -> C++ / no selection / doxygen") << R"(
-/*! \class Test
-    \brief A test class.
-
-    A more detailed @class description.
-*/)" << R"(
-//! \class Test
-//! \brief A test class.
-//!
-//! A more detailed class description.
-)";
-
-    QTest::newRow("C -> C++ / selection / single line") << R"(
-int var1;
-/* Other comment, unaffected */
-@{start}/* Our comment */@{end}
-/* Another unaffected comment */
-int var2;)" << R"(
-int var1;
-/* Other comment, unaffected */
-// Our comment
-/* Another unaffected comment */
-int var2;)";
-
-    QTest::newRow("C -> C++ / selection / multi-line / preserved header and footer") << R"(
-/****************************************************
- * @{start}some info
- * more info@{end}
- ***************************************************/)" << R"(
-/////////////////////////////////////////////////////
-// some info
-// more info
-/////////////////////////////////////////////////////)";
-
-    QTest::newRow("C -> C++ / selection / multi-line / non-preserved header and footer") << R"(
-/*@{start}
- * some in@{end}fo
- * more info
- */)" << R"(
-// some info
-// more info
-)";
-
-    QTest::newRow("C -> C++ / selection / qdoc") << R"(
-/*!@{start}
-    \qmlproperty string Type::element.name
-    \qmlproperty int Type::element.id
-
-    \brief Holds the element name and id.
-*/@{end})" << R"(
-//! \qmlproperty string Type::element.name
-//! \qmlproperty int Type::element.id
-//!
-//! \brief Holds the element name and id.
-)";
-
-    QTest::newRow("C -> C++ / selection / doxygen") << R"(
-/** Expand envi@{start}ronment variables in a string.
- *
- * Environment variables are accepted in the @{end}following forms:
- * $SOMEVAR, ${SOMEVAR} on Unix and %SOMEVAR% on Windows.
- * No escapes and quoting are supported.
- * If a variable is not found, it is not substituted.
- */)" << R"(
-//! Expand environment variables in a string.
-//!
-//! Environment variables are accepted in the following forms:
-//! $SOMEVAR, ${SOMEVAR} on Unix and %SOMEVAR% on Windows.
-//! No escapes and quoting are supported.
-//! If a variable is not found, it is not substituted.
-)";
-
-    QTest::newRow("C -> C++ / selection / multiple comments") << R"(
-@{start}/* Affected comment */
-/* Another affected comment */
-/* A third affected comment */@{end}
-/* An unaffected comment */)" << R"(
-// Affected comment
-// Another affected comment
-// A third affected comment
-/* An unaffected comment */)";
-
-    // FIXME: Remove adjacent newline along with last block
-    // FIXME: Use CppRefactoringFile to auto-indent continuation lines?
-    QTest::newRow("C -> C++, indented") << R"(
-struct S {
-    /*
-     * @This is an
-     * indented comment.
-     */
-    void func();
-)" << R"(
-struct S {
-    // This is an
-// indented comment.
-
-    void func();
-)";
-
-    QTest::newRow("C++ -> C / no selection / single line") << R"(
-// Other comment, unaffected
-// Our @comment
-// Another unaffected comment)" << R"(
-// Other comment, unaffected
-/* Our comment */
-// Another unaffected comment)";
-
-    QTest::newRow("C++ -> C / selection / single line") << R"(
-// Other comment, unaffected
-@{start}// Our comment@{end}
-// Another unaffected comment)" << R"(
-// Other comment, unaffected
-/* Our comment */
-// Another unaffected comment)";
-
-    QTest::newRow("C++ -> C / selection / multi-line / preserved header and footer") << R"(
-@{start}/////////////////////////////////////////////////////
-// some info
-// more info
-/////////////////////////////////////////////////////@{end})" << R"(
-/****************************************************/
-/* some info                                        */
-/* more info                                        */
-/****************************************************/)";
-
-    QTest::newRow("C++ -> C / selection / qdoc") << R"(
-@{start}//! \qmlproperty string Type::element.name
-//! \qmlproperty int Type::element.id
-//!
-//! \brief Holds the element name and id.@{end}
-)" << R"(
-/*!
-    \qmlproperty string Type::element.name
-    \qmlproperty int Type::element.id
-
-    \brief Holds the element name and id.
-*/
-)";
-
-    QTest::newRow("C++ -> C / selection / doxygen") << R"(
-@{start}//! \class Test
-//! \brief A test class.
-//!
-//! A more detailed class description.@{end}
-)" << R"(
-/*!
-    \class Test
-    \brief A test class.
-
-    A more detailed class description.
-*/
-)";
-}
-
-void QuickfixTest::testChangeCommentType()
-{
-    QFETCH(QString, input);
-    QFETCH(QString, expectedOutput);
-
-    ConvertCommentStyle factory;
-    QuickFixOperationTest(
-        {CppTestDocument::create("file.h", input.toUtf8(), expectedOutput.toUtf8())},
-        &factory);
-}
-
-void QuickfixTest::testMoveComments_data()
-{
-    QTest::addColumn<QByteArrayList>("headers");
-    QTest::addColumn<QByteArrayList>("sources");
-
-    const QByteArrayList headersFuncDecl2Def{R"(
-// Function comment
-void @aFunction();
-)", R"(
-void aFunction();
-)"};
-    const QByteArrayList sourcesFuncDecl2Def{R"(
-#include "file.h"
-
-void aFunction() {}
-)", R"(
-#include "file.h"
-
-// Function comment
-void aFunction() {}
-)"};
-    QTest::newRow("function: from decl to def") << headersFuncDecl2Def << sourcesFuncDecl2Def;
-
-    const QByteArrayList headersFuncDef2Decl{R"(
-void aFunction();
-)", R"(
-/* function */
-/* comment */
-void aFunction();
-)"};
-    const QByteArrayList sourcesFuncDef2Decl{R"(
-#include "file.h"
-
-/* function */
-/* comment */
-void a@Function() {}
-)", R"(
-#include "file.h"
-
-void aFunction() {}
-)"};
-    QTest::newRow("function: from def to decl") << headersFuncDef2Decl << sourcesFuncDef2Decl;
-
-    const QByteArrayList headersFuncNoDef{R"(
-// Function comment
-void @aFunction();
-)", R"(
-// Function comment
-void aFunction();
-)"};
-    QTest::newRow("function: no def") << headersFuncNoDef << QByteArrayList();
-
-    const QByteArrayList headersFuncNoDecl{R"(
-// Function comment
-inline void @aFunction() {}
-)", R"(
-// Function comment
-inline void aFunction() {}
-)"};
-    QTest::newRow("function: no decl") << headersFuncNoDecl << QByteArrayList();
-
-    const QByteArrayList headersFuncTemplateDecl2Def{R"(
-// Function comment
-template<typename T> T @aFunction();
-
-template<typename T> inline T aFunction() { return T(); }
-)", R"(
-template<typename T> T aFunction();
-
-// Function comment
-template<typename T> inline T aFunction() { return T(); }
-)"};
-    QTest::newRow("function template: from decl to def") << headersFuncTemplateDecl2Def
-                                                         << QByteArrayList();
-
-    const QByteArrayList headersFuncTemplateDef2Decl{R"(
-template<typename T> T aFunction();
-
-// Function comment
-template<typename T> inline T @aFunction() { return T(); }
-)", R"(
-// Function comment
-template<typename T> T aFunction();
-
-template<typename T> inline T aFunction() { return T(); }
-)"};
-    QTest::newRow("function template: from def to decl") << headersFuncTemplateDef2Decl
-                                                         << QByteArrayList();
-
-    const QByteArrayList headersMemberDecl2Def{R"(
-class C {
-    /**
-      * \brief Foo::aMember
-      */
-    void @aMember();
-)", R"(
-class C {
-    void aMember();
-)"};
-    const QByteArrayList sourcesMemberDecl2Def{R"(
-#include "file.h"
-
-void C::aMember() {}
-)", R"(
-#include "file.h"
-
-/**
-  * \brief Foo::aMember
-  */
-void C::aMember() {}
-)"};
-    QTest::newRow("member function: from decl to def") << headersMemberDecl2Def
-                                                       << sourcesMemberDecl2Def;
-
-    const QByteArrayList headersMemberDef2Decl{R"(
-class C {
-    void aMember();
-)", R"(
-class C {
-    /**
-      * \brief Foo::aMember
-      */
-    void aMember();
-)"};
-    const QByteArrayList sourcesMemberDef2Decl{R"(
-#include "file.h"
-
-/**
-  * \brief Foo::aMember
-  */
-void C::aMember() {@}
-)", R"(
-#include "file.h"
-
-void C::aMember() {}
-)"};
-    QTest::newRow("member function: from def to decl") << headersMemberDef2Decl
-                                                       << sourcesMemberDef2Decl;
-}
-
-void QuickfixTest::testMoveComments()
-{
-    QFETCH(QByteArrayList, headers);
-    QFETCH(QByteArrayList, sources);
-
-    QList<TestDocumentPtr> documents;
-    QCOMPARE(headers.size(), 2);
-    documents << CppTestDocument::create("file.h", headers.at(0), headers.at(1));
-    if (!sources.isEmpty()) {
-        QCOMPARE(sources.size(), 2);
-        documents << CppTestDocument::create("file.cpp", sources.at(0), sources.at(1));
-    }
-    MoveFunctionComments factory;
-    QByteArray failMessage;
-    if (QByteArray(QTest::currentDataTag()) == "function template: from def to decl")
-        failMessage = "decl/def switch doesn't work for templates";
-    QuickFixOperationTest(documents, &factory, {}, {}, failMessage);
-}
-
-} // namespace CppEditor::Internal::Tests
diff --git a/src/plugins/cppeditor/cppquickfix_test.h b/src/plugins/cppeditor/cppquickfix_test.h
deleted file mode 100644
index ee64b9f10d4..00000000000
--- a/src/plugins/cppeditor/cppquickfix_test.h
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include "cppquickfix.h"
-#include "cpptoolstestcase.h"
-
-#include <projectexplorer/headerpath.h>
-
-#include <QByteArray>
-#include <QList>
-#include <QObject>
-#include <QSharedPointer>
-#include <QStringList>
-
-namespace TextEditor { class QuickFixOperation; }
-
-namespace CppEditor {
-class CppCodeStylePreferences;
-
-namespace Internal {
-namespace Tests {
-
-class BaseQuickFixTestCase : public CppEditor::Tests::TestCase
-{
-public:
-    /// Exactly one QuickFixTestDocument must contain the cursor position marker '@'
-    /// or "@{start}" and "@{end}"
-    BaseQuickFixTestCase(const QList<TestDocumentPtr> &testDocuments,
-                         const ProjectExplorer::HeaderPaths &headerPaths,
-                         const QByteArray &clangFormatSettings = {});
-
-    ~BaseQuickFixTestCase();
-
-protected:
-    TestDocumentPtr m_documentWithMarker;
-    QList<TestDocumentPtr> m_testDocuments;
-
-private:
-    QScopedPointer<CppEditor::Tests::TemporaryDir> m_temporaryDirectory;
-
-    CppCodeStylePreferences *m_cppCodeStylePreferences;
-    QByteArray m_cppCodeStylePreferencesOriginalDelegateId;
-
-    ProjectExplorer::HeaderPaths m_headerPathsToRestore;
-    bool m_restoreHeaderPaths;
-};
-
-/// Tests a concrete QuickFixOperation of a given CppQuickFixFactory
-class QuickFixOperationTest : public BaseQuickFixTestCase
-{
-public:
-    QuickFixOperationTest(const QList<TestDocumentPtr> &testDocuments,
-                          CppQuickFixFactory *factory,
-                          const ProjectExplorer::HeaderPaths &headerPaths
-                            = ProjectExplorer::HeaderPaths(),
-                          int operationIndex = 0,
-                          const QByteArray &expectedFailMessage = {},
-                          const QByteArray &clangFormatSettings = {});
-
-    static void run(const QList<TestDocumentPtr> &testDocuments,
-                    CppQuickFixFactory *factory,
-                    const QString &headerPath,
-                    int operationIndex = 0);
-};
-
-QList<TestDocumentPtr> singleDocument(const QByteArray &original,
-                                                const QByteArray &expected);
-
-class QuickfixTest : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void testGeneric_data();
-    void testGeneric();
-
-    void testGenerateGetterSetterNamespaceHandlingCreate_data();
-    void testGenerateGetterSetterNamespaceHandlingCreate();
-    void testGenerateGetterSetterNamespaceHandlingAddUsing_data();
-    void testGenerateGetterSetterNamespaceHandlingAddUsing();
-    void testGenerateGetterSetterNamespaceHandlingFullyQualify_data();
-    void testGenerateGetterSetterNamespaceHandlingFullyQualify();
-    void testGenerateGetterSetterCustomNames_data();
-    void testGenerateGetterSetterCustomNames();
-    void testGenerateGetterSetterValueTypes_data();
-    void testGenerateGetterSetterValueTypes();
-    void testGenerateGetterSetterCustomTemplate();
-    void testGenerateGetterSetterNeedThis();
-    void testGenerateGetterSetterOfferedFixes_data();
-    void testGenerateGetterSetterOfferedFixes();
-    void testGenerateGetterSetterGeneralTests_data();
-    void testGenerateGetterSetterGeneralTests();
-    void testGenerateGetterSetterOnlyGetter();
-    void testGenerateGetterSetterOnlySetter();
-    void testGenerateGetterSetterAnonymousClass();
-    void testGenerateGetterSetterInlineInHeaderFile();
-    void testGenerateGetterSetterOnlySetterHeaderFileWithIncludeGuard();
-    void testGenerateGetterFunctionAsTemplateArg();
-    void testGenerateGettersSetters_data();
-    void testGenerateGettersSetters();
-
-    void testInsertQtPropertyMembers_data();
-    void testInsertQtPropertyMembers();
-
-    void testInsertMemberFromUse_data();
-    void testInsertMemberFromUse();
-
-    void testConvertQt4ConnectConnectOutOfClass();
-    void testConvertQt4ConnectConnectWithinClass_data();
-    void testConvertQt4ConnectConnectWithinClass();
-    void testConvertQt4ConnectDifferentNamespace();
-
-    void testInsertDefFromDeclAfterClass();
-    void testInsertDefFromDeclHeaderSourceBasic1();
-    void testInsertDefFromDeclHeaderSourceBasic2();
-    void testInsertDefFromDeclHeaderSourceBasic3();
-    void testInsertDefFromDeclHeaderSourceNamespace1();
-    void testInsertDefFromDeclHeaderSourceNamespace2();
-    void testInsertDefFromDeclInsideClass();
-    void testInsertDefFromDeclNotTriggeringWhenDefinitionExists();
-    void testInsertDefFromDeclFindRightImplementationFile();
-    void testInsertDefFromDeclIgnoreSurroundingGeneratedDeclarations();
-    void testInsertDefFromDeclRespectWsInOperatorNames1();
-    void testInsertDefFromDeclRespectWsInOperatorNames2();
-    void testInsertDefFromDeclNoexceptSpecifier();
-    void testInsertDefFromDeclMacroUsesAtEndOfFile1();
-    void testInsertDefFromDeclMacroUsesAtEndOfFile2();
-    void testInsertDefFromDeclErroneousStatementAtEndOfFile();
-    void testInsertDefFromDeclRvalueReference();
-    void testInsertDefFromDeclFunctionTryBlock();
-    void testInsertDefFromDeclUsingDecl();
-    void testInsertDefFromDeclFindImplementationFile();
-    void testInsertDefFromDeclUnicodeIdentifier();
-    void testInsertDefFromDeclTemplateClass();
-    void testInsertDefFromDeclTemplateClassWithValueParam();
-    void testInsertDefFromDeclTemplateFunction();
-    void testInsertDefFromDeclTemplateClassAndTemplateFunction();
-    void testInsertDefFromDeclTemplateClassAndFunctionInsideNamespace();
-    void testInsertDefFromDeclFunctionWithSignedUnsignedArgument();
-    void testInsertDefFromDeclNotTriggeredForFriendFunc();
-    void testInsertDefFromDeclMinimalFunctionParameterType();
-    void testInsertDefFromDeclAliasTemplateAsReturnType();
-    void testInsertDefsFromDecls_data();
-    void testInsertDefsFromDecls();
-    void testInsertAndFormatDefsFromDecls();
-
-    void testInsertDefOutsideFromDeclTemplateClassAndTemplateFunction();
-    void testInsertDefOutsideFromDeclTemplateClass();
-    void testInsertDefOutsideFromDeclTemplateFunction();
-    void testInsertDefOutsideFromDeclFunction();
-
-    void testInsertDeclFromDef();
-    void testInsertDeclFromDefTemplateFuncTypename();
-    void testInsertDeclFromDefTemplateFuncInt();
-    void testInsertDeclFromDefTemplateReturnType();
-    void testInsertDeclFromDefNotTriggeredForTemplateFunc();
-
-    void testAddIncludeForUndefinedIdentifier_data();
-    void testAddIncludeForUndefinedIdentifier();
-    void testAddIncludeForUndefinedIdentifierNoDoubleQtHeaderInclude();
-
-    void testAddForwardDeclForUndefinedIdentifier_data();
-    void testAddForwardDeclForUndefinedIdentifier();
-
-    void testMoveFuncDefOutsideMemberFuncToCpp();
-    void testMoveFuncDefOutsideMemberFuncToCppInsideNS();
-    void testMoveFuncDefOutsideMemberFuncOutside1();
-    void testMoveFuncDefOutsideMemberFuncOutside2();
-    void testMoveFuncDefOutsideMemberFuncToCppNS();
-    void testMoveFuncDefOutsideMemberFuncToCppNSUsing();
-    void testMoveFuncDefOutsideMemberFuncOutsideWithNs();
-    void testMoveFuncDefOutsideFreeFuncToCpp();
-    void testMoveFuncDefOutsideFreeFuncToCppNS();
-    void testMoveFuncDefOutsideCtorWithInitialization1();
-    void testMoveFuncDefOutsideCtorWithInitialization2();
-    void testMoveFuncDefOutsideAfterClass();
-    void testMoveFuncDefOutsideRespectWsInOperatorNames1();
-    void testMoveFuncDefOutsideRespectWsInOperatorNames2();
-    void testMoveFuncDefOutsideMacroUses();
-    void testMoveFuncDefOutsideTemplate();
-    void testMoveFuncDefOutsideMemberFunctionTemplate();
-    void testMoveFuncDefOutsideTemplateSpecializedClass();
-    void testMoveFuncDefOutsideUnnamedTemplate();
-    void testMoveFuncDefOutsideMemberFuncToCppStatic();
-    void testMoveFuncDefOutsideMemberFuncToCppWithInlinePartOfName();
-    void testMoveFuncDefOutsideMixedQualifiers();
-
-    void testMoveAllFuncDefOutsideMemberFuncToCpp();
-    void testMoveAllFuncDefOutsideMemberFuncOutside();
-    void testMoveAllFuncDefOutsideDoNotTriggerOnBaseClass();
-    void testMoveAllFuncDefOutsideClassWithBaseClass();
-    void testMoveAllFuncDefOutsideIgnoreMacroCode();
-
-    void testMoveFuncDefToDecl_data();
-    void testMoveFuncDefToDecl();
-
-    void testMoveFuncDefToDeclMacroUses();
-
-    void testAssignToLocalVariableTemplates();
-
-    void testExtractFunction_data();
-    void testExtractFunction();
-
-    void testExtractLiteralAsParameterTypeDeduction_data();
-    void testExtractLiteralAsParameterTypeDeduction();
-    void testExtractLiteralAsParameterFreeFunctionSeparateFiles();
-    void testExtractLiteralAsParameterMemberFunctionSeparateFiles();
-    void testExtractLiteralAsParameterNotTriggeringForInvalidCode();
-
-    void testAddCurlyBraces();
-
-    void testRemoveUsingNamespace_data();
-    void testRemoveUsingNamespace();
-    void testRemoveUsingNamespaceSimple_data();
-    void testRemoveUsingNamespaceSimple();
-    void testRemoveUsingNamespaceDifferentSymbols();
-
-    void testGenerateConstructor_data();
-    void testGenerateConstructor();
-
-    void testChangeCommentType_data();
-    void testChangeCommentType();
-
-    void testMoveComments_data();
-    void testMoveComments();
-};
-
-} // namespace Tests
-} // namespace Internal
-} // namespace CppEditor
diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
deleted file mode 100644
index 3465066c7fc..00000000000
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ /dev/null
@@ -1,9879 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "cppquickfixes.h"
-
-#include "baseeditordocumentprocessor.h"
-#include "cppcodestylesettings.h"
-#include "cppeditordocument.h"
-#include "cppeditortr.h"
-#include "cppeditorwidget.h"
-#include "cppfunctiondecldeflink.h"
-#include "cppinsertvirtualmethods.h"
-#include "cpplocatordata.h"
-#include "cpppointerdeclarationformatter.h"
-#include "cppquickfixassistant.h"
-#include "cppquickfixprojectsettings.h"
-#include "cpprefactoringchanges.h"
-#include "cpptoolsreuse.h"
-#include "includeutils.h"
-#include "indexitem.h"
-#include "insertionpointlocator.h"
-#include "symbolfinder.h"
-
-#include <coreplugin/icore.h>
-#include <coreplugin/messagebox.h>
-
-#include <cplusplus/ASTPath.h>
-#include <cplusplus/CPlusPlusForwardDeclarations.h>
-#include <cplusplus/CppRewriter.h>
-#include <cplusplus/declarationcomments.h>
-#include <cplusplus/NamePrettyPrinter.h>
-#include <cplusplus/TypeOfExpression.h>
-#include <cplusplus/TypePrettyPrinter.h>
-
-#include <extensionsystem/pluginmanager.h>
-
-#include <projectexplorer/editorconfiguration.h>
-#include <projectexplorer/projectnodes.h>
-#include <projectexplorer/projecttree.h>
-#include <projectexplorer/projectmanager.h>
-
-#include <texteditor/tabsettings.h>
-
-#include <utils/algorithm.h>
-#include <utils/basetreeview.h>
-#include <utils/layoutbuilder.h>
-#include <utils/fancylineedit.h>
-#include <utils/fileutils.h>
-#include <utils/qtcassert.h>
-#include <utils/treemodel.h>
-
-#ifdef WITH_TESTS
-#include <QAbstractItemModelTester>
-#endif
-#include <QApplication>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QDialog>
-#include <QDialogButtonBox>
-#include <QDir>
-#include <QFileInfo>
-#include <QFormLayout>
-#include <QGridLayout>
-#include <QHash>
-#include <QHeaderView>
-#include <QInputDialog>
-#include <QMimeData>
-#include <QPair>
-#include <QProxyStyle>
-#include <QPushButton>
-#include <QRegularExpression>
-#include <QSharedPointer>
-#include <QStack>
-#include <QStyledItemDelegate>
-#include <QTableView>
-#include <QTextCodec>
-#include <QTextCursor>
-#include <QVBoxLayout>
-
-#include <bitset>
-#include <cctype>
-#include <functional>
-#include <limits>
-#include <vector>
-
-using namespace CPlusPlus;
-using namespace TextEditor;
-using namespace Utils;
-
-namespace CppEditor {
-
-static QList<CppQuickFixFactory *> g_cppQuickFixFactories;
-
-CppQuickFixFactory::CppQuickFixFactory()
-{
-    g_cppQuickFixFactories.append(this);
-}
-
-CppQuickFixFactory::~CppQuickFixFactory()
-{
-    g_cppQuickFixFactories.removeOne(this);
-}
-
-void CppQuickFixFactory::match(const Internal::CppQuickFixInterface &interface,
-                               QuickFixOperations &result)
-{
-    if (m_hasClangdReplacement
-            && CppModelManager::usesClangd(interface.currentFile()->editor()->textDocument())) {
-        return;
-    }
-
-    doMatch(interface, result);
-}
-
-const QList<CppQuickFixFactory *> &CppQuickFixFactory::cppQuickFixFactories()
-{
-    return g_cppQuickFixFactories;
-}
-
-namespace Internal {
-
-QString inlinePrefix(const FilePath &targetFile, const std::function<bool()> &extraCondition = {})
-{
-    if (ProjectFile::isHeader(ProjectFile::classify(targetFile.path()))
-            && (!extraCondition || extraCondition())) {
-        return "inline ";
-    }
-    return {};
-}
-
-// In the following anonymous namespace all functions are collected, which could be of interest for
-// different quick fixes.
-namespace {
-
-enum DefPos {
-    DefPosInsideClass,
-    DefPosOutsideClass,
-    DefPosImplementationFile
-};
-
-
-inline bool isQtStringLiteral(const QByteArray &id)
-{
-    return id == "QLatin1String" || id == "QLatin1Literal" || id == "QStringLiteral"
-           || id == "QByteArrayLiteral";
-}
-
-inline bool isQtStringTranslation(const QByteArray &id)
-{
-    return id == "tr" || id == "trUtf8" || id == "translate" || id == "QT_TRANSLATE_NOOP";
-}
-
-Class *isMemberFunction(const LookupContext &context, Function *function)
-{
-    QTC_ASSERT(function, return nullptr);
-
-    Scope *enclosingScope = function->enclosingScope();
-    while (!(enclosingScope->asNamespace() || enclosingScope->asClass()))
-        enclosingScope = enclosingScope->enclosingScope();
-    QTC_ASSERT(enclosingScope != nullptr, return nullptr);
-
-    const Name *functionName = function->name();
-    if (!functionName)
-        return nullptr;
-
-    if (!functionName->asQualifiedNameId())
-        return nullptr; // trying to add a declaration for a global function
-
-    const QualifiedNameId *q = functionName->asQualifiedNameId();
-    if (!q->base())
-        return nullptr;
-
-    if (ClassOrNamespace *binding = context.lookupType(q->base(), enclosingScope)) {
-        const QList<Symbol *> symbols = binding->symbols();
-        for (Symbol *s : symbols) {
-            if (Class *matchingClass = s->asClass())
-                return matchingClass;
-        }
-    }
-
-    return nullptr;
-}
-
-Namespace *isNamespaceFunction(const LookupContext &context, Function *function)
-{
-    QTC_ASSERT(function, return nullptr);
-    if (isMemberFunction(context, function))
-        return nullptr;
-
-    Scope *enclosingScope = function->enclosingScope();
-    while (!(enclosingScope->asNamespace() || enclosingScope->asClass()))
-        enclosingScope = enclosingScope->enclosingScope();
-    QTC_ASSERT(enclosingScope != nullptr, return nullptr);
-
-    const Name *functionName = function->name();
-    if (!functionName)
-        return nullptr;
-
-    // global namespace
-    if (!functionName->asQualifiedNameId()) {
-        const QList<Symbol *> symbols = context.globalNamespace()->symbols();
-        for (Symbol *s : symbols) {
-            if (Namespace *matchingNamespace = s->asNamespace())
-                return matchingNamespace;
-        }
-        return nullptr;
-    }
-
-    const QualifiedNameId *q = functionName->asQualifiedNameId();
-    if (!q->base())
-        return nullptr;
-
-    if (ClassOrNamespace *binding = context.lookupType(q->base(), enclosingScope)) {
-        const QList<Symbol *> symbols = binding->symbols();
-        for (Symbol *s : symbols) {
-            if (Namespace *matchingNamespace = s->asNamespace())
-                return matchingNamespace;
-        }
-    }
-
-    return nullptr;
-}
-
-// Given include is e.g. "afile.h" or <afile.h> (quotes/angle brackets included!).
-void insertNewIncludeDirective(const QString &include, CppRefactoringFilePtr file,
-                               const Document::Ptr &cppDocument)
-{
-    // Find optimal position
-    unsigned newLinesToPrepend = 0;
-    unsigned newLinesToAppend = 0;
-    const int insertLine = lineForNewIncludeDirective(file->filePath(), file->document(),
-                                                      cppDocument, IgnoreMocIncludes, AutoDetect,
-                                                      include,
-                                                      &newLinesToPrepend, &newLinesToAppend);
-    QTC_ASSERT(insertLine >= 1, return);
-    const int insertPosition = file->position(insertLine, 1);
-    QTC_ASSERT(insertPosition >= 0, return);
-
-    // Construct text to insert
-    const QString includeLine = QLatin1String("#include ") + include + QLatin1Char('\n');
-    QString prependedNewLines, appendedNewLines;
-    while (newLinesToAppend--)
-        appendedNewLines += QLatin1String("\n");
-    while (newLinesToPrepend--)
-        prependedNewLines += QLatin1String("\n");
-    const QString textToInsert = prependedNewLines + includeLine + appendedNewLines;
-
-    // Insert
-    ChangeSet changes;
-    changes.insert(insertPosition, textToInsert);
-    file->setChangeSet(changes);
-    file->apply();
-}
-
-bool nameIncludesOperatorName(const Name *name)
-{
-    return name->asOperatorNameId()
-        || (name->asQualifiedNameId() && name->asQualifiedNameId()->name()->asOperatorNameId());
-}
-
-QString memberBaseName(const QString &name)
-{
-    const auto validName = [](const QString &name) {
-        return !name.isEmpty() && !name.at(0).isDigit();
-    };
-    QString baseName = name;
-
-    CppQuickFixSettings *settings = CppQuickFixProjectsSettings::getQuickFixSettings(
-        ProjectExplorer::ProjectTree::currentProject());
-    const QString &nameTemplate = settings->memberVariableNameTemplate;
-    const QString prefix = nameTemplate.left(nameTemplate.indexOf('<'));
-    const QString postfix = nameTemplate.mid(nameTemplate.lastIndexOf('>') + 1);
-    if (name.startsWith(prefix) && name.endsWith(postfix)) {
-        const QString base = name.mid(prefix.length(), name.length() - postfix.length());
-        if (validName(base))
-            return base;
-    }
-
-    // Remove leading and trailing "_"
-    while (baseName.startsWith(QLatin1Char('_')))
-        baseName.remove(0, 1);
-    while (baseName.endsWith(QLatin1Char('_')))
-        baseName.chop(1);
-    if (baseName != name && validName(baseName))
-        return baseName;
-
-    // If no leading/trailing "_": remove "m_" and "m" prefix
-    if (baseName.startsWith(QLatin1String("m_"))) {
-        baseName.remove(0, 2);
-    } else if (baseName.startsWith(QLatin1Char('m')) && baseName.length() > 1
-               && baseName.at(1).isUpper()) {
-        baseName.remove(0, 1);
-        baseName[0] = baseName.at(0).toLower();
-    }
-
-    return validName(baseName) ? baseName : name;
-}
-
-// Returns a non-null value if and only if the cursor is on the name of a (proper) class
-// declaration or at some place inside the body of a class declaration that does not
-// correspond to an AST of its own, i.e. on "empty space".
-ClassSpecifierAST *astForClassOperations(const CppQuickFixInterface &interface)
-{
-    const QList<AST *> &path = interface.path();
-    if (path.isEmpty())
-        return nullptr;
-    if (const auto classSpec = path.last()->asClassSpecifier()) // Cursor inside class decl?
-        return classSpec;
-
-    // Cursor on a class name?
-    if (path.size() < 2)
-        return nullptr;
-    const SimpleNameAST * const nameAST = path.at(path.size() - 1)->asSimpleName();
-    if (!nameAST || !interface.isCursorOn(nameAST))
-       return nullptr;
-    if (const auto classSpec = path.at(path.size() - 2)->asClassSpecifier())
-        return classSpec;
-    return nullptr;
-}
-
-QString nameString(const NameAST *name)
-{
-    return CppCodeStyleSettings::currentProjectCodeStyleOverview().prettyName(name->name);
-}
-
-// FIXME: Needs to consider the scope at the insertion site.
-QString declFromExpr(const TypeOrExpr &typeOrExpr, const CallAST *call, const NameAST *varName,
-                     const Snapshot &snapshot, const LookupContext &context,
-                     const CppRefactoringFilePtr &file, bool makeConst)
-{
-    const auto getTypeFromUser = [varName, call]() -> QString {
-        if (call)
-            return {};
-        const QString typeFromUser = QInputDialog::getText(Core::ICore::dialogParent(),
-                                                           Tr::tr("Provide the type"),
-                                                           Tr::tr("Data type:"), QLineEdit::Normal);
-        if (!typeFromUser.isEmpty())
-            return typeFromUser + ' ' + nameString(varName);
-        return {};
-    };
-    const auto getTypeOfExpr = [&](const ExpressionAST *expr) -> FullySpecifiedType {
-        TypeOfExpression typeOfExpression;
-        typeOfExpression.init(file->cppDocument(), snapshot, context.bindings());
-        Scope *scope = file->scopeAt(expr->firstToken());
-        const QList<LookupItem> result = typeOfExpression(
-            file->textOf(expr).toUtf8(), scope, TypeOfExpression::Preprocess);
-        if (result.isEmpty())
-            return {};
-
-        SubstitutionEnvironment env;
-        env.setContext(context);
-        env.switchScope(result.first().scope());
-        ClassOrNamespace *con = typeOfExpression.context().lookupType(scope);
-        if (!con)
-            con = typeOfExpression.context().globalNamespace();
-        UseMinimalNames q(con);
-        env.enter(&q);
-
-        Control *control = context.bindings()->control().get();
-        return rewriteType(result.first().type(), &env, control);
-    };
-
-    const Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
-    const FullySpecifiedType type = std::holds_alternative<FullySpecifiedType>(typeOrExpr)
-        ? std::get<FullySpecifiedType>(typeOrExpr)
-        : getTypeOfExpr(std::get<const ExpressionAST *>(typeOrExpr));
-    if (!call)
-        return type.isValid() ? oo.prettyType(type, varName->name) : getTypeFromUser();
-
-    Function func(file->cppDocument()->translationUnit(), 0, varName->name);
-    func.setConst(makeConst);
-    for (ExpressionListAST *it = call->expression_list; it; it = it->next) {
-        Argument * const arg = new Argument(nullptr, 0, nullptr);
-        arg->setType(getTypeOfExpr(it->value));
-        func.addMember(arg);
-    }
-    return oo.prettyType(type) + ' ' + oo.prettyType(func.type(), varName->name);
-}
-
-} // anonymous namespace
-
-namespace {
-
-class InverseLogicalComparisonOp: public CppQuickFixOperation
-{
-public:
-    InverseLogicalComparisonOp(const CppQuickFixInterface &interface,
-                               int priority,
-                               BinaryExpressionAST *binary,
-                               Kind invertToken)
-        : CppQuickFixOperation(interface, priority)
-        , binary(binary)
-    {
-        Token tok;
-        tok.f.kind = invertToken;
-        replacement = QLatin1String(tok.spell());
-
-        // check for enclosing nested expression
-        if (priority - 1 >= 0)
-            nested = interface.path()[priority - 1]->asNestedExpression();
-
-        // check for ! before parentheses
-        if (nested && priority - 2 >= 0) {
-            negation = interface.path()[priority - 2]->asUnaryExpression();
-            if (negation && !interface.currentFile()->tokenAt(negation->unary_op_token).is(T_EXCLAIM))
-                negation = nullptr;
-        }
-    }
-
-    QString description() const override
-    {
-        return Tr::tr("Rewrite Using %1").arg(replacement);
-    }
-
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-
-        ChangeSet changes;
-        if (negation) {
-            // can't remove parentheses since that might break precedence
-            changes.remove(currentFile->range(negation->unary_op_token));
-        } else if (nested) {
-            changes.insert(currentFile->startOf(nested), QLatin1String("!"));
-        } else {
-            changes.insert(currentFile->startOf(binary), QLatin1String("!("));
-            changes.insert(currentFile->endOf(binary), QLatin1String(")"));
-        }
-        changes.replace(currentFile->range(binary->binary_op_token), replacement);
-        currentFile->setChangeSet(changes);
-        currentFile->apply();
-    }
-
-private:
-    BinaryExpressionAST *binary = nullptr;
-    NestedExpressionAST *nested = nullptr;
-    UnaryExpressionAST *negation = nullptr;
-
-    QString replacement;
-};
-
-} // anonymous namespace
-
-void InverseLogicalComparison::doMatch(const CppQuickFixInterface &interface,
-                                       QuickFixOperations &result)
-{
-    CppRefactoringFilePtr file = interface.currentFile();
-
-    const QList<AST *> &path = interface.path();
-    if (path.isEmpty())
-        return;
-    int index = path.size() - 1;
-    BinaryExpressionAST *binary = path.at(index)->asBinaryExpression();
-    if (!binary)
-        return;
-    if (!interface.isCursorOn(binary->binary_op_token))
-        return;
-
-    Kind invertToken;
-    switch (file->tokenAt(binary->binary_op_token).kind()) {
-    case T_LESS_EQUAL:
-        invertToken = T_GREATER;
-        break;
-    case T_LESS:
-        invertToken = T_GREATER_EQUAL;
-        break;
-    case T_GREATER:
-        invertToken = T_LESS_EQUAL;
-        break;
-    case T_GREATER_EQUAL:
-        invertToken = T_LESS;
-        break;
-    case T_EQUAL_EQUAL:
-        invertToken = T_EXCLAIM_EQUAL;
-        break;
-    case T_EXCLAIM_EQUAL:
-        invertToken = T_EQUAL_EQUAL;
-        break;
-    default:
-        return;
-    }
-
-    result << new InverseLogicalComparisonOp(interface, index, binary, invertToken);
-}
-
-namespace {
-
-class FlipLogicalOperandsOp: public CppQuickFixOperation
-{
-public:
-    FlipLogicalOperandsOp(const CppQuickFixInterface &interface, int priority,
-                          BinaryExpressionAST *binary, QString replacement)
-        : CppQuickFixOperation(interface)
-        , binary(binary)
-        , replacement(replacement)
-    {
-        setPriority(priority);
-    }
-
-    QString description() const override
-    {
-        if (replacement.isEmpty())
-            return Tr::tr("Swap Operands");
-        else
-            return Tr::tr("Rewrite Using %1").arg(replacement);
-    }
-
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-
-        ChangeSet changes;
-        changes.flip(currentFile->range(binary->left_expression),
-                     currentFile->range(binary->right_expression));
-        if (!replacement.isEmpty())
-            changes.replace(currentFile->range(binary->binary_op_token), replacement);
-
-        currentFile->setChangeSet(changes);
-        currentFile->apply();
-    }
-
-private:
-    BinaryExpressionAST *binary;
-    QString replacement;
-};
-
-} // anonymous namespace
-
-void FlipLogicalOperands::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-    if (path.isEmpty())
-        return;
-    CppRefactoringFilePtr file = interface.currentFile();
-
-    int index = path.size() - 1;
-    BinaryExpressionAST *binary = path.at(index)->asBinaryExpression();
-    if (!binary)
-        return;
-    if (!interface.isCursorOn(binary->binary_op_token))
-        return;
-
-    Kind flipToken;
-    switch (file->tokenAt(binary->binary_op_token).kind()) {
-    case T_LESS_EQUAL:
-        flipToken = T_GREATER_EQUAL;
-        break;
-    case T_LESS:
-        flipToken = T_GREATER;
-        break;
-    case T_GREATER:
-        flipToken = T_LESS;
-        break;
-    case T_GREATER_EQUAL:
-        flipToken = T_LESS_EQUAL;
-        break;
-    case T_EQUAL_EQUAL:
-    case T_EXCLAIM_EQUAL:
-    case T_AMPER_AMPER:
-    case T_PIPE_PIPE:
-        flipToken = T_EOF_SYMBOL;
-        break;
-    default:
-        return;
-    }
-
-    QString replacement;
-    if (flipToken != T_EOF_SYMBOL) {
-        Token tok;
-        tok.f.kind = flipToken;
-        replacement = QLatin1String(tok.spell());
-    }
-
-    result << new FlipLogicalOperandsOp(interface, index, binary, replacement);
-}
-
-namespace {
-
-class RewriteLogicalAndOp: public CppQuickFixOperation
-{
-public:
-    std::shared_ptr<ASTPatternBuilder> mk;
-    UnaryExpressionAST *left;
-    UnaryExpressionAST *right;
-    BinaryExpressionAST *pattern;
-
-    RewriteLogicalAndOp(const CppQuickFixInterface &interface)
-        : CppQuickFixOperation(interface)
-        , mk(new ASTPatternBuilder)
-    {
-        left = mk->UnaryExpression();
-        right = mk->UnaryExpression();
-        pattern = mk->BinaryExpression(left, right);
-    }
-
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-
-        ChangeSet changes;
-        changes.replace(currentFile->range(pattern->binary_op_token), QLatin1String("||"));
-        changes.remove(currentFile->range(left->unary_op_token));
-        changes.remove(currentFile->range(right->unary_op_token));
-        const int start = currentFile->startOf(pattern);
-        const int end = currentFile->endOf(pattern);
-        changes.insert(start, QLatin1String("!("));
-        changes.insert(end, QLatin1String(")"));
-
-        currentFile->setChangeSet(changes);
-        currentFile->apply();
-    }
-};
-
-} // anonymous namespace
-
-void RewriteLogicalAnd::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    BinaryExpressionAST *expression = nullptr;
-    const QList<AST *> &path = interface.path();
-    CppRefactoringFilePtr file = interface.currentFile();
-
-    int index = path.size() - 1;
-    for (; index != -1; --index) {
-        expression = path.at(index)->asBinaryExpression();
-        if (expression)
-            break;
-    }
-
-    if (!expression)
-        return;
-
-    if (!interface.isCursorOn(expression->binary_op_token))
-        return;
-
-    QSharedPointer<RewriteLogicalAndOp> op(new RewriteLogicalAndOp(interface));
-
-    ASTMatcher matcher;
-
-    if (expression->match(op->pattern, &matcher) &&
-            file->tokenAt(op->pattern->binary_op_token).is(T_AMPER_AMPER) &&
-            file->tokenAt(op->left->unary_op_token).is(T_EXCLAIM) &&
-            file->tokenAt(op->right->unary_op_token).is(T_EXCLAIM)) {
-        op->setDescription(Tr::tr("Rewrite Condition Using ||"));
-        op->setPriority(index);
-        result.append(op);
-    }
-}
-
-static bool checkDeclarationForSplit(SimpleDeclarationAST *declaration)
-{
-    if (!declaration->semicolon_token)
-        return false;
-
-    if (!declaration->decl_specifier_list)
-        return false;
-
-    for (SpecifierListAST *it = declaration->decl_specifier_list; it; it = it->next) {
-        SpecifierAST *specifier = it->value;
-        if (specifier->asEnumSpecifier() || specifier->asClassSpecifier())
-            return false;
-    }
-
-    return declaration->declarator_list && declaration->declarator_list->next;
-}
-
-namespace {
-
-class SplitSimpleDeclarationOp: public CppQuickFixOperation
-{
-public:
-    SplitSimpleDeclarationOp(const CppQuickFixInterface &interface, int priority,
-                             SimpleDeclarationAST *decl)
-        : CppQuickFixOperation(interface, priority)
-        , declaration(decl)
-    {
-        setDescription(Tr::tr("Split Declaration"));
-    }
-
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-
-        ChangeSet changes;
-
-        SpecifierListAST *specifiers = declaration->decl_specifier_list;
-        int declSpecifiersStart = currentFile->startOf(specifiers->firstToken());
-        int declSpecifiersEnd = currentFile->endOf(specifiers->lastToken() - 1);
-        int insertPos = currentFile->endOf(declaration->semicolon_token);
-
-        DeclaratorAST *prevDeclarator = declaration->declarator_list->value;
-
-        for (DeclaratorListAST *it = declaration->declarator_list->next; it; it = it->next) {
-            DeclaratorAST *declarator = it->value;
-
-            changes.insert(insertPos, QLatin1String("\n"));
-            changes.copy(declSpecifiersStart, declSpecifiersEnd, insertPos);
-            changes.insert(insertPos, QLatin1String(" "));
-            changes.move(currentFile->range(declarator), insertPos);
-            changes.insert(insertPos, QLatin1String(";"));
-
-            const int prevDeclEnd = currentFile->endOf(prevDeclarator);
-            changes.remove(prevDeclEnd, currentFile->startOf(declarator));
-
-            prevDeclarator = declarator;
-        }
-
-        currentFile->setChangeSet(changes);
-        currentFile->apply();
-    }
-
-private:
-    SimpleDeclarationAST *declaration;
-};
-
-} // anonymous namespace
-
-void SplitSimpleDeclaration::doMatch(const CppQuickFixInterface &interface,
-                                     QuickFixOperations &result)
-{
-    CoreDeclaratorAST *core_declarator = nullptr;
-    const QList<AST *> &path = interface.path();
-    CppRefactoringFilePtr file = interface.currentFile();
-    const int cursorPosition = file->cursor().selectionStart();
-
-    for (int index = path.size() - 1; index != -1; --index) {
-        AST *node = path.at(index);
-
-        if (CoreDeclaratorAST *coreDecl = node->asCoreDeclarator()) {
-            core_declarator = coreDecl;
-        } else if (SimpleDeclarationAST *simpleDecl = node->asSimpleDeclaration()) {
-            if (checkDeclarationForSplit(simpleDecl)) {
-                SimpleDeclarationAST *declaration = simpleDecl;
-
-                const int startOfDeclSpecifier = file->startOf(declaration->decl_specifier_list->firstToken());
-                const int endOfDeclSpecifier = file->endOf(declaration->decl_specifier_list->lastToken() - 1);
-
-                if (cursorPosition >= startOfDeclSpecifier && cursorPosition <= endOfDeclSpecifier) {
-                    // the AST node under cursor is a specifier.
-                    result << new SplitSimpleDeclarationOp(interface, index, declaration);
-                    return;
-                }
-
-                if (core_declarator && interface.isCursorOn(core_declarator)) {
-                    // got a core-declarator under the text cursor.
-                    result << new SplitSimpleDeclarationOp(interface, index, declaration);
-                    return;
-                }
-            }
-
-            return;
-        }
-    }
-}
-
-namespace {
-
-class AddBracesToIfOp: public CppQuickFixOperation
-{
-public:
-    AddBracesToIfOp(const CppQuickFixInterface &interface, int priority,
-                    const IfStatementAST *statement)
-        : CppQuickFixOperation(interface, priority)
-        , _statement(statement)
-    {
-        setDescription(Tr::tr("Add Curly Braces"));
-    }
-
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-
-        ChangeSet changes;
-
-        const int start = currentFile->endOf(_statement->rparen_token);
-        changes.insert(start, QLatin1String(" {"));
-
-        const int end = currentFile->endOf(_statement->statement->lastToken() - 1);
-        changes.insert(end, QLatin1String("\n}"));
-
-        currentFile->setChangeSet(changes);
-        currentFile->apply();
-    }
-
-private:
-    const IfStatementAST * const _statement;
-};
-
-} // anonymous namespace
-
-void AddBracesToIf::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-    if (path.isEmpty())
-        return;
-
-    // show when we're on the 'if' of an if statement
-    int index = path.size() - 1;
-    IfStatementAST *ifStatement = path.at(index)->asIfStatement();
-    if (ifStatement && interface.isCursorOn(ifStatement->if_token) && ifStatement->statement
-        && !ifStatement->statement->asCompoundStatement()) {
-        result << new AddBracesToIfOp(interface, index, ifStatement);
-        return;
-    }
-
-    // or if we're on the statement contained in the if
-    // ### This may not be such a good idea, consider nested ifs...
-    for (; index != -1; --index) {
-        IfStatementAST *ifStatement = path.at(index)->asIfStatement();
-        if (ifStatement && ifStatement->statement
-            && interface.isCursorOn(ifStatement->statement)
-            && !ifStatement->statement->asCompoundStatement()) {
-            result << new AddBracesToIfOp(interface, index, ifStatement);
-            return;
-        }
-    }
-
-    // ### This could very well be extended to the else branch
-    // and other nodes entirely.
-}
-
-namespace {
-
-class MoveDeclarationOutOfIfOp: public CppQuickFixOperation
-{
-public:
-    MoveDeclarationOutOfIfOp(const CppQuickFixInterface &interface)
-        : CppQuickFixOperation(interface)
-    {
-        setDescription(Tr::tr("Move Declaration out of Condition"));
-
-        reset();
-    }
-
-    void reset()
-    {
-        condition = mk.Condition();
-        pattern = mk.IfStatement(condition);
-    }
-
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-
-        ChangeSet changes;
-
-        changes.copy(currentFile->range(core), currentFile->startOf(condition));
-
-        int insertPos = currentFile->startOf(pattern);
-        changes.move(currentFile->range(condition), insertPos);
-        changes.insert(insertPos, QLatin1String(";\n"));
-
-        currentFile->setChangeSet(changes);
-        currentFile->apply();
-    }
-
-    ASTMatcher matcher;
-    ASTPatternBuilder mk;
-    ConditionAST *condition = nullptr;
-    IfStatementAST *pattern = nullptr;
-    CoreDeclaratorAST *core = nullptr;
-};
-
-} // anonymous namespace
-
-void MoveDeclarationOutOfIf::doMatch(const CppQuickFixInterface &interface,
-                                     QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-    using Ptr = QSharedPointer<MoveDeclarationOutOfIfOp>;
-    Ptr op(new MoveDeclarationOutOfIfOp(interface));
-
-    int index = path.size() - 1;
-    for (; index != -1; --index) {
-        if (IfStatementAST *statement = path.at(index)->asIfStatement()) {
-            if (statement->match(op->pattern, &op->matcher) && op->condition->declarator) {
-                DeclaratorAST *declarator = op->condition->declarator;
-                op->core = declarator->core_declarator;
-                if (!op->core)
-                    return;
-
-                if (interface.isCursorOn(op->core)) {
-                    op->setPriority(index);
-                    result.append(op);
-                    return;
-                }
-
-                op->reset();
-            }
-        }
-    }
-}
-
-namespace {
-
-class MoveDeclarationOutOfWhileOp: public CppQuickFixOperation
-{
-public:
-    MoveDeclarationOutOfWhileOp(const CppQuickFixInterface &interface)
-        : CppQuickFixOperation(interface)
-    {
-        setDescription(Tr::tr("Move Declaration out of Condition"));
-        reset();
-    }
-
-    void reset()
-    {
-        condition = mk.Condition();
-        pattern = mk.WhileStatement(condition);
-    }
-
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-
-        ChangeSet changes;
-
-        changes.insert(currentFile->startOf(condition), QLatin1String("("));
-        changes.insert(currentFile->endOf(condition), QLatin1String(") != 0"));
-
-        int insertPos = currentFile->startOf(pattern);
-        const int conditionStart = currentFile->startOf(condition);
-        changes.move(conditionStart, currentFile->startOf(core), insertPos);
-        changes.copy(currentFile->range(core), insertPos);
-        changes.insert(insertPos, QLatin1String(";\n"));
-
-        currentFile->setChangeSet(changes);
-        currentFile->apply();
-    }
-
-    ASTMatcher matcher;
-    ASTPatternBuilder mk;
-    ConditionAST *condition = nullptr;
-    WhileStatementAST *pattern = nullptr;
-    CoreDeclaratorAST *core = nullptr;
-};
-
-} // anonymous namespace
-
-void MoveDeclarationOutOfWhile::doMatch(const CppQuickFixInterface &interface,
-                                        QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-    QSharedPointer<MoveDeclarationOutOfWhileOp> op(new MoveDeclarationOutOfWhileOp(interface));
-
-    int index = path.size() - 1;
-    for (; index != -1; --index) {
-        if (WhileStatementAST *statement = path.at(index)->asWhileStatement()) {
-            if (statement->match(op->pattern, &op->matcher) && op->condition->declarator) {
-                DeclaratorAST *declarator = op->condition->declarator;
-                op->core = declarator->core_declarator;
-
-                if (!op->core)
-                    return;
-
-                if (!declarator->equal_token)
-                    return;
-
-                if (!declarator->initializer)
-                    return;
-
-                if (interface.isCursorOn(op->core)) {
-                    op->setPriority(index);
-                    result.append(op);
-                    return;
-                }
-
-                op->reset();
-            }
-        }
-    }
-}
-
-namespace {
-
-class SplitIfStatementOp: public CppQuickFixOperation
-{
-public:
-    SplitIfStatementOp(const CppQuickFixInterface &interface, int priority,
-                       IfStatementAST *pattern, BinaryExpressionAST *condition)
-        : CppQuickFixOperation(interface, priority)
-        , pattern(pattern)
-        , condition(condition)
-    {
-        setDescription(Tr::tr("Split if Statement"));
-    }
-
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-
-        const Token binaryToken = currentFile->tokenAt(condition->binary_op_token);
-
-        if (binaryToken.is(T_AMPER_AMPER))
-            splitAndCondition(currentFile);
-        else
-            splitOrCondition(currentFile);
-    }
-
-    void splitAndCondition(CppRefactoringFilePtr currentFile) const
-    {
-        ChangeSet changes;
-
-        int startPos = currentFile->startOf(pattern);
-        changes.insert(startPos, QLatin1String("if ("));
-        changes.move(currentFile->range(condition->left_expression), startPos);
-        changes.insert(startPos, QLatin1String(") {\n"));
-
-        const int lExprEnd = currentFile->endOf(condition->left_expression);
-        changes.remove(lExprEnd, currentFile->startOf(condition->right_expression));
-        changes.insert(currentFile->endOf(pattern), QLatin1String("\n}"));
-
-        currentFile->setChangeSet(changes);
-        currentFile->apply();
-    }
-
-    void splitOrCondition(CppRefactoringFilePtr currentFile) const
-    {
-        ChangeSet changes;
-
-        StatementAST *ifTrueStatement = pattern->statement;
-        CompoundStatementAST *compoundStatement = ifTrueStatement->asCompoundStatement();
-
-        int insertPos = currentFile->endOf(ifTrueStatement);
-        if (compoundStatement)
-            changes.insert(insertPos, QLatin1String(" "));
-        else
-            changes.insert(insertPos, QLatin1String("\n"));
-        changes.insert(insertPos, QLatin1String("else if ("));
-
-        const int rExprStart = currentFile->startOf(condition->right_expression);
-        changes.move(rExprStart, currentFile->startOf(pattern->rparen_token), insertPos);
-        changes.insert(insertPos, QLatin1String(")"));
-
-        const int rParenEnd = currentFile->endOf(pattern->rparen_token);
-        changes.copy(rParenEnd, currentFile->endOf(pattern->statement), insertPos);
-
-        const int lExprEnd = currentFile->endOf(condition->left_expression);
-        changes.remove(lExprEnd, currentFile->startOf(condition->right_expression));
-
-        currentFile->setChangeSet(changes);
-        currentFile->apply();
-    }
-
-private:
-    IfStatementAST *pattern;
-    BinaryExpressionAST *condition;
-};
-
-} // anonymous namespace
-
-void SplitIfStatement::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    IfStatementAST *pattern = nullptr;
-    const QList<AST *> &path = interface.path();
-
-    int index = path.size() - 1;
-    for (; index != -1; --index) {
-        AST *node = path.at(index);
-        if (IfStatementAST *stmt = node->asIfStatement()) {
-            pattern = stmt;
-            break;
-        }
-    }
-
-    if (!pattern || !pattern->statement)
-        return;
-
-    unsigned splitKind = 0;
-    for (++index; index < path.size(); ++index) {
-        AST *node = path.at(index);
-        BinaryExpressionAST *condition = node->asBinaryExpression();
-        if (!condition)
-            return;
-
-        Token binaryToken = interface.currentFile()->tokenAt(condition->binary_op_token);
-
-        // only accept a chain of ||s or &&s - no mixing
-        if (!splitKind) {
-            splitKind = binaryToken.kind();
-            if (splitKind != T_AMPER_AMPER && splitKind != T_PIPE_PIPE)
-                return;
-            // we can't reliably split &&s in ifs with an else branch
-            if (splitKind == T_AMPER_AMPER && pattern->else_statement)
-                return;
-        } else if (splitKind != binaryToken.kind()) {
-            return;
-        }
-
-        if (interface.isCursorOn(condition->binary_op_token)) {
-            result << new SplitIfStatementOp(interface, index, pattern, condition);
-            return;
-        }
-    }
-}
-
-/* Analze a string/character literal like "x", QLatin1String("x") and return the literal
- * (StringLiteral or NumericLiteral for characters) and its type
- * and the enclosing function (QLatin1String, tr...) */
-
-enum StringLiteralType { TypeString, TypeObjCString, TypeChar, TypeNone };
-
-enum ActionFlags {
-    EncloseInQLatin1CharAction = 0x1,
-    EncloseInQLatin1StringAction = 0x2,
-    EncloseInQStringLiteralAction = 0x4,
-    EncloseInQByteArrayLiteralAction = 0x8,
-    EncloseActionMask = EncloseInQLatin1CharAction | EncloseInQLatin1StringAction
-                        | EncloseInQStringLiteralAction | EncloseInQByteArrayLiteralAction,
-    TranslateTrAction = 0x10,
-    TranslateQCoreApplicationAction = 0x20,
-    TranslateNoopAction = 0x40,
-    TranslationMask = TranslateTrAction | TranslateQCoreApplicationAction | TranslateNoopAction,
-    RemoveObjectiveCAction = 0x100,
-    ConvertEscapeSequencesToCharAction = 0x200,
-    ConvertEscapeSequencesToStringAction = 0x400,
-    SingleQuoteAction = 0x800,
-    DoubleQuoteAction = 0x1000
-};
-
-/* Convert single-character string literals into character literals with some
- * special cases "a" --> 'a', "'" --> '\'', "\n" --> '\n', "\"" --> '"'. */
-static QByteArray stringToCharEscapeSequences(const QByteArray &content)
-{
-    if (content.size() == 1)
-        return content.at(0) == '\'' ? QByteArray("\\'") : content;
-    if (content.size() == 2 && content.at(0) == '\\')
-        return content == "\\\"" ? QByteArray(1, '"') : content;
-    return QByteArray();
-}
-
-/* Convert character literal into a string literal with some special cases
- * 'a' -> "a", '\n' -> "\n", '\'' --> "'", '"' --> "\"". */
-static QByteArray charToStringEscapeSequences(const QByteArray &content)
-{
-    if (content.size() == 1)
-        return content.at(0) == '"' ? QByteArray("\\\"") : content;
-    if (content.size() == 2)
-        return content == "\\'" ? QByteArray("'") : content;
-    return QByteArray();
-}
-
-static QString msgQtStringLiteralDescription(const QString &replacement)
-{
-    return Tr::tr("Enclose in %1(...)").arg(replacement);
-}
-
-static QString stringLiteralReplacement(unsigned actions)
-{
-    if (actions & EncloseInQLatin1CharAction)
-        return QLatin1String("QLatin1Char");
-    if (actions & EncloseInQLatin1StringAction)
-        return QLatin1String("QLatin1String");
-    if (actions & EncloseInQStringLiteralAction)
-        return QLatin1String("QStringLiteral");
-    if (actions & EncloseInQByteArrayLiteralAction)
-        return QLatin1String("QByteArrayLiteral");
-    if (actions & TranslateTrAction)
-        return QLatin1String("tr");
-    if (actions & TranslateQCoreApplicationAction)
-        return QLatin1String("QCoreApplication::translate");
-    if (actions & TranslateNoopAction)
-        return QLatin1String("QT_TRANSLATE_NOOP");
-    return QString();
-}
-
-static ExpressionAST *analyzeStringLiteral(const QList<AST *> &path,
-                                           const CppRefactoringFilePtr &file, StringLiteralType *type,
-                                           QByteArray *enclosingFunction = nullptr,
-                                           CallAST **enclosingFunctionCall = nullptr)
-{
-    *type = TypeNone;
-    if (enclosingFunction)
-        enclosingFunction->clear();
-    if (enclosingFunctionCall)
-        *enclosingFunctionCall = nullptr;
-
-    if (path.isEmpty())
-        return nullptr;
-
-    ExpressionAST *literal = path.last()->asExpression();
-    if (literal) {
-        if (literal->asStringLiteral()) {
-            // Check for Objective C string (@"bla")
-            const QChar firstChar = file->charAt(file->startOf(literal));
-            *type = firstChar == QLatin1Char('@') ? TypeObjCString : TypeString;
-        } else if (NumericLiteralAST *numericLiteral = literal->asNumericLiteral()) {
-            // character ('c') constants are numeric.
-            if (file->tokenAt(numericLiteral->literal_token).is(T_CHAR_LITERAL))
-                *type = TypeChar;
-        }
-    }
-
-    if (*type != TypeNone && enclosingFunction && path.size() > 1) {
-        if (CallAST *call = path.at(path.size() - 2)->asCall()) {
-            if (call->base_expression) {
-                if (IdExpressionAST *idExpr = call->base_expression->asIdExpression()) {
-                    if (SimpleNameAST *functionName = idExpr->name->asSimpleName()) {
-                        *enclosingFunction = file->tokenAt(functionName->identifier_token).identifier->chars();
-                        if (enclosingFunctionCall)
-                            *enclosingFunctionCall = call;
-                    }
-                }
-            }
-        }
-    }
-    return literal;
-}
-
-namespace {
-
-/// Operation performs the operations of type ActionFlags passed in as actions.
-class WrapStringLiteralOp : public CppQuickFixOperation
-{
-public:
-    WrapStringLiteralOp(const CppQuickFixInterface &interface, int priority,
-                        unsigned actions, const QString &description, ExpressionAST *literal,
-                        const QString &translationContext = QString())
-        : CppQuickFixOperation(interface, priority), m_actions(actions), m_literal(literal),
-          m_translationContext(translationContext)
-    {
-        setDescription(description);
-    }
-
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-
-        ChangeSet changes;
-
-        const int startPos = currentFile->startOf(m_literal);
-        const int endPos = currentFile->endOf(m_literal);
-
-        // kill leading '@'. No need to adapt endPos, that is done by ChangeSet
-        if (m_actions & RemoveObjectiveCAction)
-            changes.remove(startPos, startPos + 1);
-
-        // Fix quotes
-        if (m_actions & (SingleQuoteAction | DoubleQuoteAction)) {
-            const QString newQuote((m_actions & SingleQuoteAction)
-                                   ? QLatin1Char('\'') : QLatin1Char('"'));
-            changes.replace(startPos, startPos + 1, newQuote);
-            changes.replace(endPos - 1, endPos, newQuote);
-        }
-
-        // Convert single character strings into character constants
-        if (m_actions & ConvertEscapeSequencesToCharAction) {
-            StringLiteralAST *stringLiteral = m_literal->asStringLiteral();
-            QTC_ASSERT(stringLiteral, return ;);
-            const QByteArray oldContents(currentFile->tokenAt(stringLiteral->literal_token).identifier->chars());
-            const QByteArray newContents = stringToCharEscapeSequences(oldContents);
-            QTC_ASSERT(!newContents.isEmpty(), return ;);
-            if (oldContents != newContents)
-                changes.replace(startPos + 1, endPos -1, QString::fromLatin1(newContents));
-        }
-
-        // Convert character constants into strings constants
-        if (m_actions & ConvertEscapeSequencesToStringAction) {
-            NumericLiteralAST *charLiteral = m_literal->asNumericLiteral(); // char 'c' constants are numerical.
-            QTC_ASSERT(charLiteral, return ;);
-            const QByteArray oldContents(currentFile->tokenAt(charLiteral->literal_token).identifier->chars());
-            const QByteArray newContents = charToStringEscapeSequences(oldContents);
-            QTC_ASSERT(!newContents.isEmpty(), return ;);
-            if (oldContents != newContents)
-                changes.replace(startPos + 1, endPos -1, QString::fromLatin1(newContents));
-        }
-
-        // Enclose in literal or translation function, macro.
-        if (m_actions & (EncloseActionMask | TranslationMask)) {
-            changes.insert(endPos, QString(QLatin1Char(')')));
-            QString leading = stringLiteralReplacement(m_actions);
-            leading += QLatin1Char('(');
-            if (m_actions
-                    & (TranslateQCoreApplicationAction | TranslateNoopAction)) {
-                leading += QLatin1Char('"');
-                leading += m_translationContext;
-                leading += QLatin1String("\", ");
-            }
-            changes.insert(startPos, leading);
-        }
-
-        currentFile->setChangeSet(changes);
-        currentFile->apply();
-    }
-
-private:
-    const unsigned m_actions;
-    ExpressionAST *m_literal;
-    const QString m_translationContext;
-};
-
-} // anonymous namespace
-
-void WrapStringLiteral::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    StringLiteralType type = TypeNone;
-    QByteArray enclosingFunction;
-    const QList<AST *> &path = interface.path();
-    CppRefactoringFilePtr file = interface.currentFile();
-    ExpressionAST *literal = analyzeStringLiteral(path, file, &type, &enclosingFunction);
-    if (!literal || type == TypeNone)
-        return;
-    if ((type == TypeChar && enclosingFunction == "QLatin1Char")
-        || isQtStringLiteral(enclosingFunction)
-        || isQtStringTranslation(enclosingFunction))
-        return;
-
-    const int priority = path.size() - 1; // very high priority
-    if (type == TypeChar) {
-        unsigned actions = EncloseInQLatin1CharAction;
-        QString description = msgQtStringLiteralDescription(stringLiteralReplacement(actions));
-        result << new WrapStringLiteralOp(interface, priority, actions, description, literal);
-        if (NumericLiteralAST *charLiteral = literal->asNumericLiteral()) {
-            const QByteArray contents(file->tokenAt(charLiteral->literal_token).identifier->chars());
-            if (!charToStringEscapeSequences(contents).isEmpty()) {
-                actions = DoubleQuoteAction | ConvertEscapeSequencesToStringAction;
-                description = Tr::tr("Convert to String Literal");
-                result << new WrapStringLiteralOp(interface, priority, actions,
-                                                  description, literal);
-            }
-        }
-    } else {
-        const unsigned objectiveCActions = type == TypeObjCString ?
-                                           unsigned(RemoveObjectiveCAction) : 0u;
-        unsigned actions = 0;
-        if (StringLiteralAST *stringLiteral = literal->asStringLiteral()) {
-            const QByteArray contents(file->tokenAt(stringLiteral->literal_token).identifier->chars());
-            if (!stringToCharEscapeSequences(contents).isEmpty()) {
-                actions = EncloseInQLatin1CharAction | SingleQuoteAction
-                          | ConvertEscapeSequencesToCharAction | objectiveCActions;
-                QString description =
-                    Tr::tr("Convert to Character Literal and Enclose in QLatin1Char(...)");
-                result << new WrapStringLiteralOp(interface, priority, actions,
-                                                  description, literal);
-                actions &= ~EncloseInQLatin1CharAction;
-                description = Tr::tr("Convert to Character Literal");
-                result << new WrapStringLiteralOp(interface, priority, actions,
-                                                  description, literal);
-            }
-        }
-        actions = EncloseInQLatin1StringAction | objectiveCActions;
-        result << new WrapStringLiteralOp(interface, priority, actions,
-                                          msgQtStringLiteralDescription(stringLiteralReplacement(actions)), literal);
-        actions = EncloseInQStringLiteralAction | objectiveCActions;
-        result << new WrapStringLiteralOp(interface, priority, actions,
-                                          msgQtStringLiteralDescription(stringLiteralReplacement(actions)), literal);
-        actions = EncloseInQByteArrayLiteralAction | objectiveCActions;
-        result << new WrapStringLiteralOp(interface, priority, actions,
-                                          msgQtStringLiteralDescription(stringLiteralReplacement(actions)), literal);
-    }
-}
-
-void TranslateStringLiteral::doMatch(const CppQuickFixInterface &interface,
-                                     QuickFixOperations &result)
-{
-    // Initialize
-    StringLiteralType type = TypeNone;
-    QByteArray enclosingFunction;
-    const QList<AST *> &path = interface.path();
-    CppRefactoringFilePtr file = interface.currentFile();
-    ExpressionAST *literal = analyzeStringLiteral(path, file, &type, &enclosingFunction);
-    if (!literal || type != TypeString
-       || isQtStringLiteral(enclosingFunction) || isQtStringTranslation(enclosingFunction))
-        return;
-
-    QString trContext;
-
-    std::shared_ptr<Control> control = interface.context().bindings()->control();
-    const Name *trName = control->identifier("tr");
-
-    // Check whether we are in a function:
-    const QString description = Tr::tr("Mark as Translatable");
-    for (int i = path.size() - 1; i >= 0; --i) {
-        if (FunctionDefinitionAST *definition = path.at(i)->asFunctionDefinition()) {
-            Function *function = definition->symbol;
-            ClassOrNamespace *b = interface.context().lookupType(function);
-            if (b) {
-                // Do we have a tr function?
-                const QList<LookupItem> items = b->find(trName);
-                for (const LookupItem &r : items) {
-                    Symbol *s = r.declaration();
-                    if (s->type()->asFunctionType()) {
-                        // no context required for tr
-                        result << new WrapStringLiteralOp(interface, path.size() - 1,
-                                                          TranslateTrAction,
-                                                          description, literal);
-                        return;
-                    }
-                }
-            }
-            // We need to do a QCA::translate, so we need a context.
-            // Use fully qualified class name:
-            Overview oo;
-            const QList<const Name *> names = LookupContext::path(function);
-            for (const Name *n : names) {
-                if (!trContext.isEmpty())
-                    trContext.append(QLatin1String("::"));
-                trContext.append(oo.prettyName(n));
-            }
-            // ... or global if none available!
-            if (trContext.isEmpty())
-                trContext = QLatin1String("GLOBAL");
-            result << new WrapStringLiteralOp(interface, path.size() - 1,
-                                              TranslateQCoreApplicationAction,
-                                              description, literal, trContext);
-            return;
-        }
-    }
-
-    // We need to use Q_TRANSLATE_NOOP
-    result << new WrapStringLiteralOp(interface, path.size() - 1,
-                                      TranslateNoopAction,
-                                      description, literal, trContext);
-}
-
-namespace {
-
-class ConvertCStringToNSStringOp: public CppQuickFixOperation
-{
-public:
-    ConvertCStringToNSStringOp(const CppQuickFixInterface &interface, int priority,
-                               StringLiteralAST *stringLiteral, CallAST *qlatin1Call)
-        : CppQuickFixOperation(interface, priority)
-        , stringLiteral(stringLiteral)
-        , qlatin1Call(qlatin1Call)
-    {
-        setDescription(Tr::tr("Convert to Objective-C String Literal"));
-    }
-
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-
-        ChangeSet changes;
-
-        if (qlatin1Call) {
-            changes.replace(currentFile->startOf(qlatin1Call), currentFile->startOf(stringLiteral),
-                            QLatin1String("@"));
-            changes.remove(currentFile->endOf(stringLiteral), currentFile->endOf(qlatin1Call));
-        } else {
-            changes.insert(currentFile->startOf(stringLiteral), QLatin1String("@"));
-        }
-
-        currentFile->setChangeSet(changes);
-        currentFile->apply();
-    }
-
-private:
-    StringLiteralAST *stringLiteral;
-    CallAST *qlatin1Call;
-};
-
-} // anonymous namespace
-
-void ConvertCStringToNSString::doMatch(const CppQuickFixInterface &interface,
-                                       QuickFixOperations &result)
-{
-    CppRefactoringFilePtr file = interface.currentFile();
-
-    if (!interface.editor()->cppEditorDocument()->isObjCEnabled())
-        return;
-
-    StringLiteralType type = TypeNone;
-    QByteArray enclosingFunction;
-    CallAST *qlatin1Call;
-    const QList<AST *> &path = interface.path();
-    ExpressionAST *literal = analyzeStringLiteral(path, file, &type, &enclosingFunction,
-                                                  &qlatin1Call);
-    if (!literal || type != TypeString)
-        return;
-    if (!isQtStringLiteral(enclosingFunction))
-        qlatin1Call = nullptr;
-
-    result << new ConvertCStringToNSStringOp(interface, path.size() - 1, literal->asStringLiteral(),
-                                             qlatin1Call);
-}
-
-namespace {
-
-class ConvertNumericLiteralOp: public CppQuickFixOperation
-{
-public:
-    ConvertNumericLiteralOp(const CppQuickFixInterface &interface, int start, int end,
-                            const QString &replacement)
-        : CppQuickFixOperation(interface)
-        , start(start)
-        , end(end)
-        , replacement(replacement)
-    {}
-
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-
-        ChangeSet changes;
-        changes.replace(start, end, replacement);
-        currentFile->setChangeSet(changes);
-        currentFile->apply();
-    }
-
-private:
-    int start, end;
-    QString replacement;
-};
-
-} // anonymous namespace
-
-void ConvertNumericLiteral::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-    CppRefactoringFilePtr file = interface.currentFile();
-
-    if (path.isEmpty())
-        return;
-
-    NumericLiteralAST *literal = path.last()->asNumericLiteral();
-
-    if (!literal)
-        return;
-
-    Token token = file->tokenAt(literal->asNumericLiteral()->literal_token);
-    if (!token.is(T_NUMERIC_LITERAL))
-        return;
-    const NumericLiteral *numeric = token.number;
-    if (numeric->isDouble() || numeric->isFloat())
-        return;
-
-    // remove trailing L or U and stuff
-    const char * const spell = numeric->chars();
-    int numberLength = numeric->size();
-    while (numberLength > 0 && !std::isxdigit(spell[numberLength - 1]))
-        --numberLength;
-    if (numberLength < 1)
-        return;
-
-    // convert to number
-    bool valid;
-    ulong value = 0;
-    const QString x = QString::fromUtf8(spell).left(numberLength);
-    if (x.startsWith("0b", Qt::CaseInsensitive))
-        value = x.mid(2).toULong(&valid, 2);
-    else
-        value = x.toULong(&valid, 0);
-
-    if (!valid)
-        return;
-
-    const int priority = path.size() - 1; // very high priority
-    const int start = file->startOf(literal);
-    const char * const str = numeric->chars();
-
-    const bool isBinary = numberLength > 2 && str[0] == '0' && (str[1] == 'b' || str[1] == 'B');
-    const bool isOctal = numberLength >= 2 && str[0] == '0' && str[1] >= '0' && str[1] <= '7';
-    const bool isDecimal = !(isBinary || isOctal || numeric->isHex());
-
-    if (!numeric->isHex()) {
-        /*
-          Convert integer literal to hex representation.
-          Replace
-            0b100000
-            32
-            040
-          With
-            0x20
-
-        */
-        const QString replacement = QString::asprintf("0x%lX", value);
-        auto op = new ConvertNumericLiteralOp(interface, start, start + numberLength, replacement);
-        op->setDescription(Tr::tr("Convert to Hexadecimal"));
-        op->setPriority(priority);
-        result << op;
-    }
-
-    if (!isOctal) {
-        /*
-          Convert integer literal to octal representation.
-          Replace
-            0b100000
-            32
-            0x20
-          With
-            040
-        */
-        const QString replacement = QString::asprintf("0%lo", value);
-        auto op = new ConvertNumericLiteralOp(interface, start, start + numberLength, replacement);
-        op->setDescription(Tr::tr("Convert to Octal"));
-        op->setPriority(priority);
-        result << op;
-    }
-
-    if (!isDecimal) {
-        /*
-          Convert integer literal to decimal representation.
-          Replace
-            0b100000
-            0x20
-            040
-           With
-            32
-        */
-        const QString replacement = QString::asprintf("%lu", value);
-        auto op = new ConvertNumericLiteralOp(interface, start, start + numberLength, replacement);
-        op->setDescription(Tr::tr("Convert to Decimal"));
-        op->setPriority(priority);
-        result << op;
-    }
-
-    if (!isBinary) {
-        /*
-          Convert integer literal to binary representation.
-          Replace
-            32
-            0x20
-            040
-          With
-            0b100000
-        */
-        QString replacement = "0b";
-        if (value == 0) {
-            replacement.append('0');
-        } else {
-            std::bitset<std::numeric_limits<decltype (value)>::digits> b(value);
-            QRegularExpression re("^[0]*");
-            replacement.append(QString::fromStdString(b.to_string()).remove(re));
-        }
-        auto op = new ConvertNumericLiteralOp(interface, start, start + numberLength, replacement);
-        op->setDescription(Tr::tr("Convert to Binary"));
-        op->setPriority(priority);
-        result << op;
-    }
-}
-
-namespace {
-
-class AddLocalDeclarationOp: public CppQuickFixOperation
-{
-public:
-    AddLocalDeclarationOp(const CppQuickFixInterface &interface,
-                          int priority,
-                          const BinaryExpressionAST *binaryAST,
-                          const SimpleNameAST *simpleNameAST)
-        : CppQuickFixOperation(interface, priority)
-        , binaryAST(binaryAST)
-        , simpleNameAST(simpleNameAST)
-    {
-        setDescription(Tr::tr("Add Local Declaration"));
-    }
-
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-        QString declaration = getDeclaration();
-
-        if (!declaration.isEmpty()) {
-            ChangeSet changes;
-            changes.replace(currentFile->startOf(binaryAST),
-                            currentFile->endOf(simpleNameAST),
-                            declaration);
-            currentFile->setChangeSet(changes);
-            currentFile->apply();
-        }
-    }
-
-private:
-    QString getDeclaration()
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-        Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
-        const auto settings = CppQuickFixProjectsSettings::getQuickFixSettings(
-                    ProjectExplorer::ProjectTree::currentProject());
-
-        if (currentFile->cppDocument()->languageFeatures().cxx11Enabled && settings->useAuto)
-            return "auto " + oo.prettyName(simpleNameAST->name);
-        return declFromExpr(binaryAST->right_expression, nullptr, simpleNameAST, snapshot(),
-                            context(), currentFile, false);
-    }
-
-    const BinaryExpressionAST *binaryAST;
-    const SimpleNameAST *simpleNameAST;
-};
-
-} // anonymous namespace
-
-namespace {
-
-class ConvertToCamelCaseOp: public CppQuickFixOperation
-{
-public:
-    ConvertToCamelCaseOp(const CppQuickFixInterface &interface, const QString &name,
-                         const AST *nameAst, bool test)
-        : CppQuickFixOperation(interface, -1)
-        , m_name(name)
-        , m_nameAst(nameAst)
-        , m_isAllUpper(name.isUpper())
-        , m_test(test)
-    {
-        setDescription(Tr::tr("Convert to Camel Case"));
-    }
-
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-
-        QString newName = m_isAllUpper ? m_name.toLower() : m_name;
-        for (int i = 1; i < newName.length(); ++i) {
-            const QChar c = newName.at(i);
-            if (c.isUpper() && m_isAllUpper) {
-                newName[i] = c.toLower();
-            } else if (i < newName.length() - 1 && isConvertibleUnderscore(newName, i)) {
-                newName.remove(i, 1);
-                newName[i] = newName.at(i).toUpper();
-            }
-        }
-        if (m_test) {
-            ChangeSet changeSet;
-            changeSet.replace(currentFile->range(m_nameAst), newName);
-            currentFile->setChangeSet(changeSet);
-            currentFile->apply();
-        } else {
-            editor()->renameUsages(newName);
-        }
-    }
-
-    static bool isConvertibleUnderscore(const QString &name, int pos)
-    {
-        return name.at(pos) == QLatin1Char('_') && name.at(pos+1).isLetter()
-                && !(pos == 1 && name.at(0) == QLatin1Char('m'));
-    }
-
-private:
-    const QString m_name;
-    const AST * const m_nameAst;
-    const bool m_isAllUpper;
-    const bool m_test;
-};
-
-} // anonymous namespace
-
-void ConvertToCamelCase::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-
-    if (path.isEmpty())
-        return;
-
-    AST * const ast = path.last();
-    const Name *name = nullptr;
-    const AST *astForName = nullptr;
-    if (const NameAST * const nameAst = ast->asName()) {
-        if (nameAst->name && nameAst->name->asNameId()) {
-            astForName = nameAst;
-            name = nameAst->name;
-        }
-    } else if (const NamespaceAST * const namespaceAst = ast->asNamespace()) {
-        astForName = namespaceAst;
-        name = namespaceAst->symbol->name();
-    }
-
-    if (!name)
-        return;
-
-    QString nameString = QString::fromUtf8(name->identifier()->chars());
-    if (nameString.length() < 3)
-        return;
-    for (int i = 1; i < nameString.length() - 1; ++i) {
-        if (ConvertToCamelCaseOp::isConvertibleUnderscore(nameString, i)) {
-            result << new ConvertToCamelCaseOp(interface, nameString, astForName, m_test);
-            return;
-        }
-    }
-}
-
-AddIncludeForUndefinedIdentifierOp::AddIncludeForUndefinedIdentifierOp(
-        const CppQuickFixInterface &interface, int priority, const QString &include)
-    : CppQuickFixOperation(interface, priority)
-    , m_include(include)
-{
-    setDescription(Tr::tr("Add #include %1").arg(m_include));
-}
-
-void AddIncludeForUndefinedIdentifierOp::perform()
-{
-    CppRefactoringChanges refactoring(snapshot());
-    CppRefactoringFilePtr file = refactoring.cppFile(filePath());
-
-    insertNewIncludeDirective(m_include, file, semanticInfo().doc);
-}
-
-AddForwardDeclForUndefinedIdentifierOp::AddForwardDeclForUndefinedIdentifierOp(
-        const CppQuickFixInterface &interface,
-        int priority,
-        const QString &fqClassName,
-        int symbolPos)
-    : CppQuickFixOperation(interface, priority), m_className(fqClassName), m_symbolPos(symbolPos)
-{
-    setDescription(Tr::tr("Add forward declaration for %1").arg(m_className));
-}
-
-void AddForwardDeclForUndefinedIdentifierOp::perform()
-{
-    const QStringList parts = m_className.split("::");
-    QTC_ASSERT(!parts.isEmpty(), return);
-    const QStringList namespaces = parts.mid(0, parts.length() - 1);
-
-    CppRefactoringChanges refactoring(snapshot());
-    CppRefactoringFilePtr file = refactoring.cppFile(filePath());
-
-    NSVisitor visitor(file.data(), namespaces, m_symbolPos);
-    visitor.accept(file->cppDocument()->translationUnit()->ast());
-    const auto stringToInsert = [&visitor, symbol = parts.last()] {
-        QString s = "\n";
-        for (const QString &ns : visitor.remainingNamespaces())
-            s += "namespace " + ns + " { ";
-        s += "class " + symbol + ';';
-        for (int i = 0; i < visitor.remainingNamespaces().size(); ++i)
-            s += " }";
-        return s;
-    };
-
-    int insertPos = 0;
-
-    // Find the position to insert:
-    //   If we have a matching namespace, we do the insertion there.
-    //   If we don't have a matching namespace, but there is another namespace in the file,
-    //   we assume that to be a good position for our insertion.
-    //   Otherwise, do the insertion after the last include that comes before the use of the symbol.
-    //   If there is no such include, do the insertion before the first token.
-    if (visitor.enclosingNamespace()) {
-        insertPos = file->startOf(visitor.enclosingNamespace()->linkage_body) + 1;
-    } else if (visitor.firstNamespace()) {
-        insertPos = file->startOf(visitor.firstNamespace());
-    } else {
-        const QTextCursor tc = file->document()->find(
-                    QRegularExpression("^\\s*#include .*$"),
-                    m_symbolPos,
-                    QTextDocument::FindBackward | QTextDocument::FindCaseSensitively);
-        if (!tc.isNull())
-            insertPos = tc.position() + 1;
-        else if (visitor.firstToken())
-            insertPos = file->startOf(visitor.firstToken());
-    }
-
-    QString insertion = stringToInsert();
-    if (file->charAt(insertPos - 1) != QChar::ParagraphSeparator)
-        insertion.prepend('\n');
-    if (file->charAt(insertPos) != QChar::ParagraphSeparator)
-        insertion.append('\n');
-    ChangeSet s;
-    s.insert(insertPos, insertion);
-    file->setChangeSet(s);
-    file->apply();
-}
-
-namespace {
-
-QString findShortestInclude(const QString currentDocumentFilePath,
-                            const QString candidateFilePath,
-                            const ProjectExplorer::HeaderPaths &headerPaths)
-{
-    QString result;
-
-    const QFileInfo fileInfo(candidateFilePath);
-
-    if (fileInfo.path() == QFileInfo(currentDocumentFilePath).path()) {
-        result = QLatin1Char('"') + fileInfo.fileName() + QLatin1Char('"');
-    } else {
-        for (const ProjectExplorer::HeaderPath &headerPath : headerPaths) {
-            if (!candidateFilePath.startsWith(headerPath.path))
-                continue;
-            QString relativePath = candidateFilePath.mid(headerPath.path.size());
-            if (!relativePath.isEmpty() && relativePath.at(0) == QLatin1Char('/'))
-                relativePath = relativePath.mid(1);
-            if (result.isEmpty() || relativePath.size() + 2 < result.size())
-                result = QLatin1Char('<') + relativePath + QLatin1Char('>');
-        }
-    }
-
-    return result;
-}
-
-QString findMatchingInclude(const QString &className,
-                            const ProjectExplorer::HeaderPaths &headerPaths)
-{
-    const QStringList candidateFileNames{className, className + ".h", className + ".hpp",
-                className.toLower(), className.toLower() + ".h", className.toLower() + ".hpp"};
-    for (const QString &fileName : candidateFileNames) {
-        for (const ProjectExplorer::HeaderPath &headerPath : headerPaths) {
-            const QString headerPathCandidate = headerPath.path + QLatin1Char('/') + fileName;
-            const QFileInfo fileInfo(headerPathCandidate);
-            if (fileInfo.exists() && fileInfo.isFile())
-                return '<' + fileName + '>';
-        }
-    }
-    return {};
-}
-
-ProjectExplorer::HeaderPaths relevantHeaderPaths(const QString &filePath)
-{
-    ProjectExplorer::HeaderPaths headerPaths;
-
-    const QList<ProjectPart::ConstPtr> projectParts = CppModelManager::projectPart(filePath);
-    if (projectParts.isEmpty()) { // Not part of any project, better use all include paths than none
-        headerPaths += CppModelManager::headerPaths();
-    } else {
-        for (const ProjectPart::ConstPtr &part : projectParts)
-            headerPaths += part->headerPaths;
-    }
-
-    return headerPaths;
-}
-
-NameAST *nameUnderCursor(const QList<AST *> &path)
-{
-    if (path.isEmpty())
-        return nullptr;
-
-    NameAST *nameAst = nullptr;
-    for (int i = path.size() - 1; i >= 0; --i) {
-        AST * const ast = path.at(i);
-        if (SimpleNameAST *simpleName = ast->asSimpleName()) {
-            nameAst = simpleName;
-        } else if (TemplateIdAST *templateId = ast->asTemplateId()) {
-            nameAst = templateId;
-        } else if (nameAst && ast->asNamedTypeSpecifier()) {
-            break; // Stop at "Foo" for "N::Bar<@Foo>"
-        } else if (QualifiedNameAST *qualifiedName = ast->asQualifiedName()) {
-            nameAst = qualifiedName;
-            break;
-        }
-    }
-
-    return nameAst;
-}
-
-enum class LookupResult { Declared, ForwardDeclared, NotDeclared };
-LookupResult lookUpDefinition(const CppQuickFixInterface &interface, const NameAST *nameAst)
-{
-    QTC_ASSERT(nameAst && nameAst->name, return LookupResult::NotDeclared);
-
-    // Find the enclosing scope
-    int line, column;
-    const Document::Ptr doc = interface.semanticInfo().doc;
-    doc->translationUnit()->getTokenPosition(nameAst->firstToken(), &line, &column);
-    Scope *scope = doc->scopeAt(line, column);
-    if (!scope)
-        return LookupResult::NotDeclared;
-
-    // Try to find the class/template definition
-    const Name *name = nameAst->name;
-    const QList<LookupItem> results = interface.context().lookup(name, scope);
-    LookupResult best = LookupResult::NotDeclared;
-    for (const LookupItem &item : results) {
-        if (Symbol *declaration = item.declaration()) {
-            if (declaration->asClass())
-                return LookupResult::Declared;
-            if (declaration->asForwardClassDeclaration()) {
-                best = LookupResult::ForwardDeclared;
-                continue;
-            }
-            if (Template *templ = declaration->asTemplate()) {
-                if (Symbol *declaration = templ->declaration()) {
-                    if (declaration->asClass())
-                        return LookupResult::Declared;
-                    if (declaration->asForwardClassDeclaration()) {
-                        best = LookupResult::ForwardDeclared;
-                        continue;
-                    }
-                }
-            }
-            return LookupResult::Declared;
-        }
-    }
-
-    return best;
-}
-
-QString templateNameAsString(const TemplateNameId *templateName)
-{
-    const Identifier *id = templateName->identifier();
-    return QString::fromUtf8(id->chars(), id->size());
-}
-
-Snapshot forwardingHeaders(const CppQuickFixInterface &interface)
-{
-    Snapshot result;
-
-    const Snapshot docs = interface.snapshot();
-    for (Document::Ptr doc : docs) {
-        if (doc->globalSymbolCount() == 0 && doc->resolvedIncludes().size() == 1)
-            result.insert(doc);
-    }
-
-    return result;
-}
-
-QList<IndexItem::Ptr> matchName(const Name *name, QString *className)
-{
-    if (!name)
-        return {};
-
-    QString simpleName;
-    QList<IndexItem::Ptr> matches;
-    CppLocatorData *locatorData = CppModelManager::locatorData();
-    const Overview oo;
-    if (const QualifiedNameId *qualifiedName = name->asQualifiedNameId()) {
-        const Name *name = qualifiedName->name();
-        if (const TemplateNameId *templateName = name->asTemplateNameId()) {
-            *className = templateNameAsString(templateName);
-        } else {
-            simpleName = oo.prettyName(name);
-            *className = simpleName;
-            matches = locatorData->findSymbols(IndexItem::Class, *className);
-            if (matches.isEmpty()) {
-                if (const Name *name = qualifiedName->base()) {
-                    if (const TemplateNameId *templateName = name->asTemplateNameId())
-                        *className = templateNameAsString(templateName);
-                    else
-                        *className = oo.prettyName(name);
-                }
-            }
-        }
-    } else if (const TemplateNameId *templateName = name->asTemplateNameId()) {
-        *className = templateNameAsString(templateName);
-    } else {
-        *className = oo.prettyName(name);
-    }
-
-    if (matches.isEmpty())
-        matches = locatorData->findSymbols(IndexItem::Class, *className);
-
-    if (matches.isEmpty() && !simpleName.isEmpty())
-        *className = simpleName;
-
-    return matches;
-}
-
-} // anonymous namespace
-
-void AddIncludeForUndefinedIdentifier::doMatch(const CppQuickFixInterface &interface,
-                                               QuickFixOperations &result)
-{
-    const NameAST *nameAst = nameUnderCursor(interface.path());
-    if (!nameAst || !nameAst->name)
-        return;
-
-    const LookupResult lookupResult = lookUpDefinition(interface, nameAst);
-    if (lookupResult == LookupResult::Declared)
-        return;
-
-    QString className;
-    const QString currentDocumentFilePath = interface.semanticInfo().doc->filePath().toString();
-    const ProjectExplorer::HeaderPaths headerPaths = relevantHeaderPaths(currentDocumentFilePath);
-    FilePaths headers;
-
-    const QList<IndexItem::Ptr> matches = matchName(nameAst->name, &className);
-    // Find an include file through the locator
-    if (!matches.isEmpty()) {
-        QList<IndexItem::Ptr> indexItems;
-        const Snapshot forwardHeaders = forwardingHeaders(interface);
-        for (const IndexItem::Ptr &info : matches) {
-            if (!info || info->symbolName() != className)
-                continue;
-            indexItems << info;
-
-            Snapshot localForwardHeaders = forwardHeaders;
-            localForwardHeaders.insert(interface.snapshot().document(info->filePath()));
-            FilePaths headerAndItsForwardingHeaders;
-            headerAndItsForwardingHeaders << info->filePath();
-            headerAndItsForwardingHeaders += localForwardHeaders.filesDependingOn(info->filePath());
-
-            for (const FilePath &header : std::as_const(headerAndItsForwardingHeaders)) {
-                const QString include = findShortestInclude(currentDocumentFilePath,
-                                                            header.toString(),
-                                                            headerPaths);
-                if (include.size() > 2) {
-                    const QString headerFileName = info->filePath().fileName();
-                    QTC_ASSERT(!headerFileName.isEmpty(), break);
-
-                    int priority = 0;
-                    if (headerFileName == className)
-                        priority = 2;
-                    else if (headerFileName.at(1).isUpper())
-                        priority = 1;
-
-                    result << new AddIncludeForUndefinedIdentifierOp(interface, priority,
-                                                                     include);
-                    headers << header;
-                }
-            }
-        }
-
-        if (lookupResult == LookupResult::NotDeclared && indexItems.size() == 1) {
-            QString qualifiedName = Overview().prettyName(nameAst->name);
-            if (qualifiedName.startsWith("::"))
-                qualifiedName.remove(0, 2);
-            if (indexItems.first()->scopedSymbolName().endsWith(qualifiedName)) {
-                const ProjectExplorer::Node * const node = ProjectExplorer::ProjectTree
-                        ::nodeForFile(interface.filePath());
-                ProjectExplorer::FileType fileType = node && node->asFileNode()
-                        ? node->asFileNode()->fileType() : ProjectExplorer::FileType::Unknown;
-                if (fileType == ProjectExplorer::FileType::Unknown
-                        && ProjectFile::isHeader(ProjectFile::classify(interface.filePath().toString()))) {
-                    fileType = ProjectExplorer::FileType::Header;
-                }
-                if (fileType == ProjectExplorer::FileType::Header) {
-                    result << new AddForwardDeclForUndefinedIdentifierOp(
-                                  interface, 0, indexItems.first()->scopedSymbolName(),
-                                  interface.currentFile()->startOf(nameAst));
-                }
-            }
-        }
-    }
-
-    if (className.isEmpty())
-        return;
-
-    // Fallback: Check the include paths for files that look like candidates
-    //           for the given name.
-    if (!Utils::contains(headers,
-            [&className](const Utils::FilePath &fp) { return fp.fileName() == className; })) {
-        const QString include = findMatchingInclude(className, headerPaths);
-        const auto matcher = [&include](const QuickFixOperation::Ptr &o) {
-            const auto includeOp = o.dynamicCast<AddIncludeForUndefinedIdentifierOp>();
-            return includeOp && includeOp->include() == include;
-        };
-        if (!include.isEmpty() && !Utils::contains(result, matcher))
-            result << new AddIncludeForUndefinedIdentifierOp(interface, 1, include);
-    }
-}
-
-namespace {
-
-class RearrangeParamDeclarationListOp: public CppQuickFixOperation
-{
-public:
-    enum Target { TargetPrevious, TargetNext };
-
-    RearrangeParamDeclarationListOp(const CppQuickFixInterface &interface, AST *currentParam,
-                                    AST *targetParam, Target target)
-        : CppQuickFixOperation(interface)
-        , m_currentParam(currentParam)
-        , m_targetParam(targetParam)
-    {
-        QString targetString;
-        if (target == TargetPrevious)
-            targetString = Tr::tr("Switch with Previous Parameter");
-        else
-            targetString = Tr::tr("Switch with Next Parameter");
-        setDescription(targetString);
-    }
-
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-
-        int targetEndPos = currentFile->endOf(m_targetParam);
-        ChangeSet changes;
-        changes.flip(currentFile->startOf(m_currentParam), currentFile->endOf(m_currentParam),
-                     currentFile->startOf(m_targetParam), targetEndPos);
-        currentFile->setChangeSet(changes);
-        currentFile->setOpenEditor(false, targetEndPos);
-        currentFile->apply();
-    }
-
-private:
-    AST *m_currentParam;
-    AST *m_targetParam;
-};
-
-} // anonymous namespace
-
-void RearrangeParamDeclarationList::doMatch(const CppQuickFixInterface &interface,
-                                          QuickFixOperations &result)
-{
-    const QList<AST *> path = interface.path();
-
-    ParameterDeclarationAST *paramDecl = nullptr;
-    int index = path.size() - 1;
-    for (; index != -1; --index) {
-        paramDecl = path.at(index)->asParameterDeclaration();
-        if (paramDecl)
-            break;
-    }
-
-    if (index < 1)
-        return;
-
-    ParameterDeclarationClauseAST *paramDeclClause = path.at(index-1)->asParameterDeclarationClause();
-    QTC_ASSERT(paramDeclClause && paramDeclClause->parameter_declaration_list, return);
-
-    ParameterDeclarationListAST *paramListNode = paramDeclClause->parameter_declaration_list;
-    ParameterDeclarationListAST *prevParamListNode = nullptr;
-    while (paramListNode) {
-        if (paramDecl == paramListNode->value)
-            break;
-        prevParamListNode = paramListNode;
-        paramListNode = paramListNode->next;
-    }
-
-    if (!paramListNode)
-        return;
-
-    if (prevParamListNode)
-        result << new RearrangeParamDeclarationListOp(interface, paramListNode->value,
-                                                      prevParamListNode->value, RearrangeParamDeclarationListOp::TargetPrevious);
-    if (paramListNode->next)
-        result << new RearrangeParamDeclarationListOp(interface, paramListNode->value,
-                                                      paramListNode->next->value, RearrangeParamDeclarationListOp::TargetNext);
-}
-
-namespace {
-
-class ReformatPointerDeclarationOp: public CppQuickFixOperation
-{
-public:
-    ReformatPointerDeclarationOp(const CppQuickFixInterface &interface, const ChangeSet change)
-        : CppQuickFixOperation(interface)
-        , m_change(change)
-    {
-        QString description;
-        if (m_change.operationList().size() == 1) {
-            description = Tr::tr(
-                        "Reformat to \"%1\"").arg(m_change.operationList().constFirst().text());
-        } else { // > 1
-            description = Tr::tr("Reformat Pointers or References");
-        }
-        setDescription(description);
-    }
-
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-        currentFile->setChangeSet(m_change);
-        currentFile->apply();
-    }
-
-private:
-    ChangeSet m_change;
-};
-
-/// Filter the results of ASTPath.
-/// The resulting list contains the supported AST types only once.
-/// For this, the results of ASTPath are iterated in reverse order.
-class ReformatPointerDeclarationASTPathResultsFilter
-{
-public:
-    QList<AST*> filter(const QList<AST*> &astPathList)
-    {
-        QList<AST*> filtered;
-
-        for (int i = astPathList.size() - 1; i >= 0; --i) {
-            AST *ast = astPathList.at(i);
-
-            if (!m_hasSimpleDeclaration && ast->asSimpleDeclaration()) {
-                m_hasSimpleDeclaration = true;
-                filtered.append(ast);
-            } else if (!m_hasFunctionDefinition && ast->asFunctionDefinition()) {
-                m_hasFunctionDefinition = true;
-                filtered.append(ast);
-            } else if (!m_hasParameterDeclaration && ast->asParameterDeclaration()) {
-                m_hasParameterDeclaration = true;
-                filtered.append(ast);
-            } else if (!m_hasIfStatement && ast->asIfStatement()) {
-                m_hasIfStatement = true;
-                filtered.append(ast);
-            } else if (!m_hasWhileStatement && ast->asWhileStatement()) {
-                m_hasWhileStatement = true;
-                filtered.append(ast);
-            } else if (!m_hasForStatement && ast->asForStatement()) {
-                m_hasForStatement = true;
-                filtered.append(ast);
-            } else if (!m_hasForeachStatement && ast->asForeachStatement()) {
-                m_hasForeachStatement = true;
-                filtered.append(ast);
-            }
-        }
-
-        return filtered;
-    }
-
-private:
-    bool m_hasSimpleDeclaration = false;
-    bool m_hasFunctionDefinition = false;
-    bool m_hasParameterDeclaration = false;
-    bool m_hasIfStatement = false;
-    bool m_hasWhileStatement = false;
-    bool m_hasForStatement = false;
-    bool m_hasForeachStatement = false;
-};
-
-} // anonymous namespace
-
-void ReformatPointerDeclaration::doMatch(const CppQuickFixInterface &interface,
-                                       QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-    CppRefactoringFilePtr file = interface.currentFile();
-
-    Overview overview = CppCodeStyleSettings::currentProjectCodeStyleOverview();
-    overview.showArgumentNames = true;
-    overview.showReturnTypes = true;
-
-    const QTextCursor cursor = file->cursor();
-    ChangeSet change;
-    PointerDeclarationFormatter formatter(file, overview,
-        PointerDeclarationFormatter::RespectCursor);
-
-    if (cursor.hasSelection()) {
-        // This will no work always as expected since this function is only called if
-        // interface-path() is not empty. If the user selects the whole document via
-        // ctrl-a and there is an empty line in the end, then the cursor is not on
-        // any AST and therefore no quick fix will be triggered.
-        change = formatter.format(file->cppDocument()->translationUnit()->ast());
-        if (!change.isEmpty())
-            result << new ReformatPointerDeclarationOp(interface, change);
-    } else {
-        const QList<AST *> suitableASTs
-            = ReformatPointerDeclarationASTPathResultsFilter().filter(path);
-        for (AST *ast : suitableASTs) {
-            change = formatter.format(ast);
-            if (!change.isEmpty()) {
-                result << new ReformatPointerDeclarationOp(interface, change);
-                return;
-            }
-        }
-    }
-}
-
-namespace {
-
-class CaseStatementCollector : public ASTVisitor
-{
-public:
-    CaseStatementCollector(Document::Ptr document, const Snapshot &snapshot,
-                           Scope *scope)
-        : ASTVisitor(document->translationUnit()),
-        document(document),
-        scope(scope)
-    {
-        typeOfExpression.init(document, snapshot);
-    }
-
-    QStringList operator ()(AST *ast)
-    {
-        values.clear();
-        foundCaseStatementLevel = false;
-        accept(ast);
-        return values;
-    }
-
-    bool preVisit(AST *ast) override {
-        if (CaseStatementAST *cs = ast->asCaseStatement()) {
-            foundCaseStatementLevel = true;
-            if (ExpressionAST *csExpression = cs->expression) {
-                if (ExpressionAST *expression = csExpression->asIdExpression()) {
-                    QList<LookupItem> candidates = typeOfExpression(expression, document, scope);
-                    if (!candidates.isEmpty() && candidates.first().declaration()) {
-                        Symbol *decl = candidates.first().declaration();
-                        values << prettyPrint.prettyName(LookupContext::fullyQualifiedName(decl));
-                    }
-                }
-            }
-            return true;
-        } else if (foundCaseStatementLevel) {
-            return false;
-        }
-        return true;
-    }
-
-    Overview prettyPrint;
-    bool foundCaseStatementLevel = false;
-    QStringList values;
-    TypeOfExpression typeOfExpression;
-    Document::Ptr document;
-    Scope *scope;
-};
-
-class CompleteSwitchCaseStatementOp: public CppQuickFixOperation
-{
-public:
-    CompleteSwitchCaseStatementOp(const CppQuickFixInterface &interface,
-              int priority, CompoundStatementAST *compoundStatement, const QStringList &values)
-        : CppQuickFixOperation(interface, priority)
-        , compoundStatement(compoundStatement)
-        , values(values)
-    {
-        setDescription(Tr::tr("Complete Switch Statement"));
-    }
-
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-
-        ChangeSet changes;
-        int start = currentFile->endOf(compoundStatement->lbrace_token);
-        changes.insert(start, QLatin1String("\ncase ")
-                       + values.join(QLatin1String(":\nbreak;\ncase "))
-                       + QLatin1String(":\nbreak;"));
-        currentFile->setChangeSet(changes);
-        currentFile->apply();
-    }
-
-    CompoundStatementAST *compoundStatement;
-    QStringList values;
-};
-
-static Enum *findEnum(const QList<LookupItem> &results, const LookupContext &ctxt)
-{
-    for (const LookupItem &result : results) {
-        const FullySpecifiedType fst = result.type();
-
-        Type *type = result.declaration() ? result.declaration()->type().type()
-                                          : fst.type();
-
-        if (!type)
-            continue;
-        if (Enum *e = type->asEnumType())
-            return e;
-        if (const NamedType *namedType = type->asNamedType()) {
-            if (ClassOrNamespace *con = ctxt.lookupType(namedType->name(), result.scope())) {
-                QList<Enum *> enums = con->unscopedEnums();
-                const QList<Symbol *> symbols = con->symbols();
-                for (Symbol * const s : symbols) {
-                    if (const auto e = s->asEnum())
-                        enums << e;
-                }
-                const Name *referenceName = namedType->name();
-                if (const QualifiedNameId *qualifiedName = referenceName->asQualifiedNameId())
-                    referenceName = qualifiedName->name();
-                for (Enum *e : std::as_const(enums)) {
-                    if (const Name *candidateName = e->name()) {
-                        if (candidateName->match(referenceName))
-                            return e;
-                    }
-                }
-            }
-        }
-    }
-
-    return nullptr;
-}
-
-Enum *conditionEnum(const CppQuickFixInterface &interface, SwitchStatementAST *statement)
-{
-    Block *block = statement->symbol;
-    Scope *scope = interface.semanticInfo().doc->scopeAt(block->line(), block->column());
-    TypeOfExpression typeOfExpression;
-    typeOfExpression.setExpandTemplates(true);
-    typeOfExpression.init(interface.semanticInfo().doc, interface.snapshot());
-    const QList<LookupItem> results = typeOfExpression(statement->condition,
-                                                       interface.semanticInfo().doc,
-                                                       scope);
-
-    return findEnum(results, typeOfExpression.context());
-}
-
-} // anonymous namespace
-
-void CompleteSwitchCaseStatement::doMatch(const CppQuickFixInterface &interface,
-                                          QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-
-    if (path.isEmpty())
-        return;
-
-    // look for switch statement
-    for (int depth = path.size() - 1; depth >= 0; --depth) {
-        AST *ast = path.at(depth);
-        SwitchStatementAST *switchStatement = ast->asSwitchStatement();
-        if (switchStatement) {
-            if (!switchStatement->statement || !switchStatement->symbol)
-                return;
-            CompoundStatementAST *compoundStatement = switchStatement->statement->asCompoundStatement();
-            if (!compoundStatement) // we ignore pathologic case "switch (t) case A: ;"
-                return;
-            // look if the condition's type is an enum
-            if (Enum *e = conditionEnum(interface, switchStatement)) {
-                // check the possible enum values
-                QStringList values;
-                Overview prettyPrint;
-                for (int i = 0; i < e->memberCount(); ++i) {
-                    if (Declaration *decl = e->memberAt(i)->asDeclaration())
-                        values << prettyPrint.prettyName(LookupContext::fullyQualifiedName(decl));
-                }
-                // Get the used values
-                Block *block = switchStatement->symbol;
-                CaseStatementCollector caseValues(interface.semanticInfo().doc, interface.snapshot(),
-                                                  interface.semanticInfo().doc->scopeAt(block->line(), block->column()));
-                const QStringList usedValues = caseValues(switchStatement);
-                // save the values that would be added
-                for (const QString &usedValue : usedValues)
-                    values.removeAll(usedValue);
-                if (!values.isEmpty())
-                    result << new CompleteSwitchCaseStatementOp(interface, depth,
-                                                                compoundStatement, values);
-                return;
-            }
-
-            return;
-        }
-    }
-}
-
-namespace {
-
-class InsertDeclOperation: public CppQuickFixOperation
-{
-public:
-    InsertDeclOperation(const CppQuickFixInterface &interface,
-                        const FilePath &targetFilePath, const Class *targetSymbol,
-                        InsertionPointLocator::AccessSpec xsSpec, const QString &decl, int priority)
-        : CppQuickFixOperation(interface, priority)
-        , m_targetFilePath(targetFilePath)
-        , m_targetSymbol(targetSymbol)
-        , m_xsSpec(xsSpec)
-        , m_decl(decl)
-    {
-        setDescription(Tr::tr("Add %1 Declaration")
-                       .arg(InsertionPointLocator::accessSpecToString(xsSpec)));
-    }
-
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-
-        InsertionPointLocator locator(refactoring);
-        const InsertionLocation loc = locator.methodDeclarationInClass(
-                    m_targetFilePath, m_targetSymbol, m_xsSpec);
-        QTC_ASSERT(loc.isValid(), return);
-
-        CppRefactoringFilePtr targetFile = refactoring.cppFile(m_targetFilePath);
-        int targetPosition = targetFile->position(loc.line(), loc.column());
-
-        ChangeSet target;
-        target.insert(targetPosition, loc.prefix() + m_decl);
-        targetFile->setChangeSet(target);
-        targetFile->setOpenEditor(true, targetPosition);
-        targetFile->apply();
-    }
-
-    static QString generateDeclaration(const Function *function);
-
-private:
-    FilePath m_targetFilePath;
-    const Class *m_targetSymbol;
-    InsertionPointLocator::AccessSpec m_xsSpec;
-    QString m_decl;
-};
-
-class DeclOperationFactory
-{
-public:
-    DeclOperationFactory(const CppQuickFixInterface &interface, const FilePath &filePath,
-                         const Class *matchingClass, const QString &decl)
-        : m_interface(interface)
-        , m_filePath(filePath)
-        , m_matchingClass(matchingClass)
-        , m_decl(decl)
-    {}
-
-    QuickFixOperation *operator()(InsertionPointLocator::AccessSpec xsSpec, int priority)
-    {
-        return new InsertDeclOperation(m_interface, m_filePath, m_matchingClass, xsSpec, m_decl, priority);
-    }
-
-private:
-    const CppQuickFixInterface &m_interface;
-    const FilePath &m_filePath;
-    const Class *m_matchingClass;
-    const QString &m_decl;
-};
-
-} // anonymous namespace
-
-void InsertDeclFromDef::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-    CppRefactoringFilePtr file = interface.currentFile();
-
-    FunctionDefinitionAST *funDef = nullptr;
-    int idx = 0;
-    for (; idx < path.size(); ++idx) {
-        AST *node = path.at(idx);
-        if (idx > 1) {
-            if (DeclaratorIdAST *declId = node->asDeclaratorId()) {
-                if (file->isCursorOn(declId)) {
-                    if (FunctionDefinitionAST *candidate = path.at(idx - 2)->asFunctionDefinition()) {
-                        funDef = candidate;
-                        break;
-                    }
-                }
-            }
-        }
-
-        if (node->asClassSpecifier())
-            return;
-    }
-
-    if (!funDef || !funDef->symbol)
-        return;
-
-    Function *fun = funDef->symbol;
-    if (Class *matchingClass = isMemberFunction(interface.context(), fun)) {
-        const QualifiedNameId *qName = fun->name()->asQualifiedNameId();
-        for (Symbol *symbol = matchingClass->find(qName->identifier());
-             symbol; symbol = symbol->next()) {
-            Symbol *s = symbol;
-            if (fun->enclosingScope()->asTemplate()) {
-                if (const Template *templ = s->type()->asTemplateType()) {
-                    if (Symbol *decl = templ->declaration()) {
-                        if (decl->type()->asFunctionType())
-                            s = decl;
-                    }
-                }
-            }
-            if (!s->name()
-                    || !qName->identifier()->match(s->identifier())
-                    || !s->type()->asFunctionType())
-                continue;
-
-            if (s->type().match(fun->type())) {
-                // Declaration exists.
-                return;
-            }
-        }
-        const FilePath fileName = matchingClass->filePath();
-        const QString decl = InsertDeclOperation::generateDeclaration(fun);
-
-        // Add several possible insertion locations for declaration
-        DeclOperationFactory operation(interface, fileName, matchingClass, decl);
-
-        result << operation(InsertionPointLocator::Public, 5)
-            << operation(InsertionPointLocator::PublicSlot, 4)
-            << operation(InsertionPointLocator::Protected, 3)
-            << operation(InsertionPointLocator::ProtectedSlot, 2)
-            << operation(InsertionPointLocator::Private, 1)
-            << operation(InsertionPointLocator::PrivateSlot, 0);
-    }
-}
-
-QString InsertDeclOperation::generateDeclaration(const Function *function)
-{
-    Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
-    oo.showFunctionSignatures = true;
-    oo.showReturnTypes = true;
-    oo.showArgumentNames = true;
-    oo.showEnclosingTemplate = true;
-
-    QString decl;
-    decl += oo.prettyType(function->type(), function->unqualifiedName());
-    decl += QLatin1String(";\n");
-
-    return decl;
-}
-
-namespace {
-
-class InsertDefOperation: public CppQuickFixOperation
-{
-public:
-    // Make sure that either loc is valid or targetFileName is not empty.
-    InsertDefOperation(const CppQuickFixInterface &interface,
-                       Declaration *decl, DeclaratorAST *declAST, const InsertionLocation &loc,
-                       const DefPos defpos, const FilePath &targetFileName = {},
-                       bool freeFunction = false)
-        : CppQuickFixOperation(interface, 0)
-        , m_decl(decl)
-        , m_declAST(declAST)
-        , m_loc(loc)
-        , m_defpos(defpos)
-        , m_targetFilePath(targetFileName)
-    {
-        if (m_defpos == DefPosImplementationFile) {
-            const FilePath declFile = decl->filePath();
-            const FilePath targetFile =  m_loc.isValid() ? m_loc.filePath() : m_targetFilePath;
-            const FilePath resolved = targetFile.relativePathFrom(declFile.parentDir());
-            setPriority(2);
-            setDescription(Tr::tr("Add Definition in %1").arg(resolved.displayName()));
-        } else if (freeFunction) {
-            setDescription(Tr::tr("Add Definition Here"));
-        } else if (m_defpos == DefPosInsideClass) {
-            setDescription(Tr::tr("Add Definition Inside Class"));
-        } else if (m_defpos == DefPosOutsideClass) {
-            setPriority(1);
-            setDescription(Tr::tr("Add Definition Outside Class"));
-        }
-    }
-
-    static void insertDefinition(
-            const CppQuickFixOperation *op,
-            InsertionLocation loc,
-            DefPos defPos,
-            DeclaratorAST *declAST,
-            Declaration *decl,
-            const FilePath &targetFilePath,
-            ChangeSet *changeSet = nullptr)
-    {
-        CppRefactoringChanges refactoring(op->snapshot());
-        if (!loc.isValid())
-            loc = insertLocationForMethodDefinition(decl, true, NamespaceHandling::Ignore,
-                                                      refactoring, targetFilePath);
-        QTC_ASSERT(loc.isValid(), return);
-
-        CppRefactoringFilePtr targetFile = refactoring.cppFile(loc.filePath());
-        Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
-        oo.showFunctionSignatures = true;
-        oo.showReturnTypes = true;
-        oo.showArgumentNames = true;
-        oo.showEnclosingTemplate = true;
-
-        // What we really want is to show template parameters for the class, but not for the
-        // function, but we cannot express that. This is an approximation that will work
-        // as long as either the surrounding class or the function is not a template.
-        oo.showTemplateParameters = decl->enclosingClass()
-                && decl->enclosingClass()->enclosingTemplate();
-
-        if (defPos == DefPosInsideClass) {
-            const int targetPos = targetFile->position(loc.line(), loc.column());
-            ChangeSet localChangeSet;
-            ChangeSet * const target = changeSet ? changeSet : &localChangeSet;
-            target->replace(targetPos - 1, targetPos, QLatin1String("\n {\n\n}")); // replace ';'
-
-            if (!changeSet) {
-                targetFile->setChangeSet(*target);
-                targetFile->setOpenEditor(true, targetPos);
-                targetFile->apply();
-
-                // Move cursor inside definition
-                QTextCursor c = targetFile->cursor();
-                c.setPosition(targetPos);
-                c.movePosition(QTextCursor::Down);
-                c.movePosition(QTextCursor::EndOfLine);
-                op->editor()->setTextCursor(c);
-            }
-        } else {
-            // make target lookup context
-            Document::Ptr targetDoc = targetFile->cppDocument();
-            Scope *targetScope = targetDoc->scopeAt(loc.line(), loc.column());
-
-            // Correct scope in case of a function try-block. See QTCREATORBUG-14661.
-            if (targetScope && targetScope->asBlock()) {
-                if (Class * const enclosingClass = targetScope->enclosingClass())
-                    targetScope = enclosingClass;
-                else
-                    targetScope = targetScope->enclosingNamespace();
-            }
-
-            LookupContext targetContext(targetDoc, op->snapshot());
-            ClassOrNamespace *targetCoN = targetContext.lookupType(targetScope);
-            if (!targetCoN)
-                targetCoN = targetContext.globalNamespace();
-
-            // setup rewriting to get minimally qualified names
-            SubstitutionEnvironment env;
-            env.setContext(op->context());
-            env.switchScope(decl->enclosingScope());
-            UseMinimalNames q(targetCoN);
-            env.enter(&q);
-            Control *control = op->context().bindings()->control().get();
-
-            // rewrite the function type
-            const FullySpecifiedType tn = rewriteType(decl->type(), &env, control);
-
-            // rewrite the function name
-            if (nameIncludesOperatorName(decl->name())) {
-                CppRefactoringFilePtr file = refactoring.cppFile(op->filePath());
-                const QString operatorNameText = file->textOf(declAST->core_declarator);
-                oo.includeWhiteSpaceInOperatorName = operatorNameText.contains(QLatin1Char(' '));
-            }
-            const QString name = oo.prettyName(LookupContext::minimalName(decl, targetCoN,
-                                                                          control));
-
-            const QString inlinePref = inlinePrefix(targetFilePath, [defPos] {
-                return defPos == DefPosOutsideClass;
-            });
-
-            const QString prettyType = oo.prettyType(tn, name);
-
-            QString input = prettyType;
-            int index = 0;
-            while (input.startsWith("template")) {
-                QRegularExpression templateRegex("template\\s*<[^>]*>");
-                QRegularExpressionMatch match = templateRegex.match(input);
-                if (match.hasMatch()) {
-                    index += match.captured().size() + 1;
-                    input = input.mid(match.captured().size() + 1);
-                }
-            }
-
-            QString defText = prettyType;
-            defText.insert(index, inlinePref);
-            defText += QLatin1String("\n{\n\n}");
-
-            ChangeSet localChangeSet;
-            ChangeSet * const target = changeSet ? changeSet : &localChangeSet;
-            const int targetPos = targetFile->position(loc.line(), loc.column());
-            target->insert(targetPos,  loc.prefix() + defText + loc.suffix());
-
-            if (!changeSet) {
-                targetFile->setChangeSet(*target);
-                targetFile->setOpenEditor(true, targetPos);
-                targetFile->apply();
-
-                // Move cursor inside definition
-                QTextCursor c = targetFile->cursor();
-                c.setPosition(targetPos);
-                c.movePosition(QTextCursor::Down, QTextCursor::MoveAnchor,
-                               loc.prefix().count(QLatin1String("\n")) + 2);
-                c.movePosition(QTextCursor::EndOfLine);
-                if (defPos == DefPosImplementationFile) {
-                    if (targetFile->editor())
-                        targetFile->editor()->setTextCursor(c);
-                } else {
-                    op->editor()->setTextCursor(c);
-                }
-            }
-        }
-    }
-
-private:
-    void perform() override
-    {
-        insertDefinition(this, m_loc, m_defpos, m_declAST, m_decl, m_targetFilePath);
-    }
-
-    Declaration *m_decl;
-    DeclaratorAST *m_declAST;
-    InsertionLocation m_loc;
-    const DefPos m_defpos;
-    const FilePath m_targetFilePath;
-};
-
-} // anonymous namespace
-
-void InsertDefFromDecl::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-
-    int idx = path.size() - 1;
-    for (; idx >= 0; --idx) {
-        AST *node = path.at(idx);
-        if (SimpleDeclarationAST *simpleDecl = node->asSimpleDeclaration()) {
-            if (idx > 0 && path.at(idx - 1)->asStatement())
-                return;
-            if (simpleDecl->symbols && !simpleDecl->symbols->next) {
-                if (Symbol *symbol = simpleDecl->symbols->value) {
-                    if (Declaration *decl = symbol->asDeclaration()) {
-                        if (Function *func = decl->type()->asFunctionType()) {
-                            if (func->isSignal() || func->isPureVirtual() || func->isFriend())
-                                return;
-
-                            // Check if there is already a definition
-                            SymbolFinder symbolFinder;
-                            if (symbolFinder.findMatchingDefinition(decl, interface.snapshot(),
-                                                                    true)) {
-                                return;
-                            }
-
-                            // Insert Position: Implementation File
-                            DeclaratorAST *declAST = simpleDecl->declarator_list->value;
-                            InsertDefOperation *op = nullptr;
-                            ProjectFile::Kind kind = ProjectFile::classify(interface.filePath().toString());
-                            const bool isHeaderFile = ProjectFile::isHeader(kind);
-                            if (isHeaderFile) {
-                                CppRefactoringChanges refactoring(interface.snapshot());
-                                InsertionPointLocator locator(refactoring);
-                                // find appropriate implementation file, but do not use this
-                                // location, because insertLocationForMethodDefinition() should
-                                // be used in perform() to get consistent insert positions.
-                                for (const InsertionLocation &location :
-                                     locator.methodDefinition(decl, false, {})) {
-                                    if (!location.isValid())
-                                        continue;
-
-                                    const FilePath filePath = location.filePath();
-                                    if (ProjectFile::isHeader(ProjectFile::classify(filePath.path()))) {
-                                        const FilePath source = correspondingHeaderOrSource(filePath);
-                                        if (!source.isEmpty()) {
-                                            op = new InsertDefOperation(interface, decl, declAST,
-                                                                        InsertionLocation(),
-                                                                        DefPosImplementationFile,
-                                                                        source);
-                                        }
-                                    } else {
-                                        op = new InsertDefOperation(interface, decl, declAST,
-                                                                    InsertionLocation(),
-                                                                    DefPosImplementationFile,
-                                                                    filePath);
-                                    }
-
-                                    if (op)
-                                        result << op;
-                                    break;
-                                }
-                            }
-
-                            // Determine if we are dealing with a free function
-                            const bool isFreeFunction = func->enclosingClass() == nullptr;
-
-                            // Insert Position: Outside Class
-                            if (!isFreeFunction || m_defPosOutsideClass) {
-                                result << new InsertDefOperation(interface, decl, declAST,
-                                                                 InsertionLocation(),
-                                                                 DefPosOutsideClass,
-                                                                 interface.filePath());
-                            }
-
-                            // Insert Position: Inside Class
-                            // Determine insert location direct after the declaration.
-                            int line, column;
-                            const CppRefactoringFilePtr file = interface.currentFile();
-                            file->lineAndColumn(file->endOf(simpleDecl), &line, &column);
-                            const InsertionLocation loc
-                                    = InsertionLocation(interface.filePath(), QString(),
-                                                        QString(), line, column);
-                            result << new InsertDefOperation(interface, decl, declAST, loc,
-                                                             DefPosInsideClass, FilePath(),
-                                                             isFreeFunction);
-
-                            return;
-                        }
-                    }
-                }
-            }
-            break;
-        }
-    }
-}
-
-class InsertMemberFromInitializationOp : public CppQuickFixOperation
-{
-public:
-    InsertMemberFromInitializationOp(
-        const CppQuickFixInterface &interface,
-        const Class *theClass,
-        const NameAST *memberName,
-        const TypeOrExpr &typeOrExpr,
-        const CallAST *call,
-        InsertionPointLocator::AccessSpec accessSpec,
-        bool makeStatic,
-        bool makeConst)
-        : CppQuickFixOperation(interface),
-          m_class(theClass), m_memberName(memberName), m_typeOrExpr(typeOrExpr), m_call(call),
-          m_accessSpec(accessSpec), m_makeStatic(makeStatic), m_makeConst(makeConst)
-    {
-        if (call)
-            setDescription(Tr::tr("Add Member Function \"%1\"").arg(nameString(memberName)));
-        else
-            setDescription(Tr::tr("Add Class Member \"%1\"").arg(nameString(memberName)));
-    }
-
-private:
-    void perform() override
-    {
-        QString decl = declFromExpr(m_typeOrExpr, m_call, m_memberName, snapshot(), context(),
-                                    currentFile(), m_makeConst);
-        if (decl.isEmpty())
-            return;
-        if (m_makeStatic)
-            decl.prepend("static ");
-
-        const CppRefactoringChanges refactoring(snapshot());
-        const InsertionPointLocator locator(refactoring);
-        const FilePath filePath = FilePath::fromUtf8(m_class->fileName());
-        const InsertionLocation loc = locator.methodDeclarationInClass(
-                    filePath, m_class, m_accessSpec);
-        QTC_ASSERT(loc.isValid(), return);
-
-        CppRefactoringFilePtr targetFile = refactoring.cppFile(filePath);
-        const int targetPosition = targetFile->position(loc.line(), loc.column());
-        ChangeSet target;
-        target.insert(targetPosition, loc.prefix() + decl + ";\n");
-        targetFile->setChangeSet(target);
-        targetFile->apply();
-    }
-
-    const Class * const m_class;
-    const NameAST * const m_memberName;
-    const TypeOrExpr m_typeOrExpr;
-    const CallAST * m_call;
-    const InsertionPointLocator::AccessSpec m_accessSpec;
-    const bool m_makeStatic;
-    const bool m_makeConst;
-};
-
-void AddDeclarationForUndeclaredIdentifier::doMatch(const CppQuickFixInterface &interface,
-                                                    QuickFixOperations &result)
-{
-    // Are we on a name?
-    const QList<AST *> &path = interface.path();
-    if (path.isEmpty())
-        return;
-    if (!path.last()->asSimpleName())
-        return;
-
-    // Special case: Member initializer.
-    if (!checkForMemberInitializer(interface, result))
-        return;
-
-    // Are we inside a function?
-    const FunctionDefinitionAST *func = nullptr;
-    for (auto it = path.rbegin(); !func && it != path.rend(); ++it)
-        func = (*it)->asFunctionDefinition();
-    if (!func)
-        return;
-
-    // Is this name declared somewhere already?
-    const CursorInEditor cursorInEditor(interface.cursor(), interface.filePath(),
-                                        interface.editor(), interface.editor()->textDocument());
-    const auto followSymbolFallback = [&](const Link &link) {
-        if (!link.hasValidTarget())
-            collectOperations(interface, result);
-    };
-    CppModelManager::followSymbol(cursorInEditor, followSymbolFallback, false, false,
-                                  FollowSymbolMode::Exact,
-                                  CppModelManager::Backend::Builtin);
-}
-
-void AddDeclarationForUndeclaredIdentifier::collectOperations(
-    const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-    const CppRefactoringFilePtr &file = interface.currentFile();
-    for (int index = path.size() - 1; index != -1; --index) {
-        if (const auto call = path.at(index)->asCall())
-            return handleCall(call, interface, result);
-
-        // We only trigger if the identifier appears on the left-hand side of an
-        // assignment expression.
-        const auto binExpr = path.at(index)->asBinaryExpression();
-        if (!binExpr)
-            continue;
-        if (!binExpr->left_expression || !binExpr->right_expression
-            || file->tokenAt(binExpr->binary_op_token).kind() != T_EQUAL
-            || !interface.isCursorOn(binExpr->left_expression)) {
-            return;
-        }
-
-        // In the case of "a.|b = c", find out the type of a, locate the class declaration
-        // and add a member b there.
-        if (const auto memberAccess = binExpr->left_expression->asMemberAccess()) {
-            if (interface.isCursorOn(memberAccess->member_name)
-                && memberAccess->member_name == path.last()) {
-                maybeAddMember(interface, file->scopeAt(memberAccess->firstToken()),
-                               file->textOf(memberAccess->base_expression).toUtf8(),
-                               binExpr->right_expression, nullptr, result);
-            }
-            return;
-        }
-
-        const auto idExpr = binExpr->left_expression->asIdExpression();
-        if (!idExpr || !idExpr->name)
-            return;
-
-        // In the case of "A::|b = c", add a static member b to A.
-        if (const auto qualName = idExpr->name->asQualifiedName()) {
-            return maybeAddStaticMember(interface, qualName, binExpr->right_expression, nullptr,
-                                        result);
-        }
-
-        // For an unqualified access, offer a local declaration and, if we are
-        // in a member function, a member declaration.
-        if (const auto simpleName = idExpr->name->asSimpleName()) {
-            if (!m_membersOnly)
-                result << new AddLocalDeclarationOp(interface, index, binExpr, simpleName);
-            maybeAddMember(interface, file->scopeAt(idExpr->firstToken()), "this",
-                           binExpr->right_expression, nullptr, result);
-            return;
-        }
-    }
-}
-
-void AddDeclarationForUndeclaredIdentifier::handleCall(
-    const CallAST *call, const CppQuickFixInterface &interface,
-    TextEditor::QuickFixOperations &result)
-{
-    if (!call->base_expression)
-        return;
-
-    // In order to find out the return type, we need to check the context of the call.
-    // If it is a statement expression, the type is void, if it's a binary expression,
-    // we assume the type of the other side of the expression, if it's a return statement,
-    // we use the return type of the surrounding function, and if it's a declaration,
-    // we use the type of the variable. Other cases are not supported.
-    const QList<AST *> &path = interface.path();
-    const CppRefactoringFilePtr &file = interface.currentFile();
-    TypeOrExpr returnTypeOrExpr;
-    for (auto it = path.rbegin(); it != path.rend(); ++it) {
-        if ((*it)->asCompoundStatement())
-            return;
-        if ((*it)->asExpressionStatement()) {
-            returnTypeOrExpr = FullySpecifiedType(new VoidType);
-            break;
-        }
-        if (const auto binExpr = (*it)->asBinaryExpression()) {
-            returnTypeOrExpr = interface.isCursorOn(binExpr->left_expression)
-                                 ? binExpr->right_expression : binExpr->left_expression;
-            break;
-        }
-        if (const auto returnExpr = (*it)->asReturnStatement()) {
-            for (auto it2 = std::next(it); it2 != path.rend(); ++it2) {
-                if (const auto func = (*it2)->asFunctionDefinition()) {
-                    if (!func->symbol)
-                        return;
-                    returnTypeOrExpr = func->symbol->returnType();
-                    break;
-                }
-            }
-            break;
-        }
-        if (const auto declarator = (*it)->asDeclarator()) {
-            if (!interface.isCursorOn(declarator->initializer))
-                return;
-            const auto decl = (*std::next(it))->asSimpleDeclaration();
-            if (!decl || !decl->symbols)
-                return;
-            if (!decl->symbols->value->type().isValid())
-                return;
-            returnTypeOrExpr = decl->symbols->value->type();
-            break;
-        }
-    }
-
-    if (std::holds_alternative<const ExpressionAST *>(returnTypeOrExpr)
-        && !std::get<const ExpressionAST *>(returnTypeOrExpr)) {
-        return;
-    }
-
-    // a.f()
-    if (const auto memberAccess = call->base_expression->asMemberAccess()) {
-        if (!interface.isCursorOn(memberAccess->member_name))
-            return;
-        maybeAddMember(
-            interface, file->scopeAt(call->firstToken()),
-            file->textOf(memberAccess->base_expression).toUtf8(), returnTypeOrExpr, call, result);
-    }
-
-    const auto idExpr = call->base_expression->asIdExpression();
-    if (!idExpr || !idExpr->name)
-        return;
-
-    // A::f()
-    if (const auto qualName = idExpr->name->asQualifiedName())
-        return maybeAddStaticMember(interface, qualName, returnTypeOrExpr, call, result);
-
-    // f()
-    if (const auto simpleName = idExpr->name->asSimpleName()) {
-        maybeAddMember(interface, file->scopeAt(idExpr->firstToken()), "this",
-                       returnTypeOrExpr, call, result);
-    }
-}
-
-bool AddDeclarationForUndeclaredIdentifier::checkForMemberInitializer(
-    const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-    const int size = path.size();
-    if (size < 4)
-        return true;
-    const MemInitializerAST * const memInitializer = path.at(size - 2)->asMemInitializer();
-    if (!memInitializer)
-        return true;
-    if (!path.at(size - 3)->asCtorInitializer())
-        return true;
-    const FunctionDefinitionAST * ctor = path.at(size - 4)->asFunctionDefinition();
-    if (!ctor)
-        return false;
-
-    // Now find the class.
-    const Class *theClass = nullptr;
-    if (size > 4) {
-        const ClassSpecifierAST * const classSpec = path.at(size - 5)->asClassSpecifier();
-        if (classSpec) // Inline constructor. We get the class directly.
-            theClass = classSpec->symbol;
-    }
-    if (!theClass) {
-        // Out-of-line constructor. We need to find the class.
-        SymbolFinder finder;
-        const QList<Declaration *> matches = finder.findMatchingDeclaration(
-            LookupContext(interface.currentFile()->cppDocument(), interface.snapshot()),
-            ctor->symbol);
-        if (!matches.isEmpty())
-            theClass = matches.first()->enclosingClass();
-    }
-
-    if (!theClass)
-        return false;
-
-    const SimpleNameAST * const name = path.at(size - 1)->asSimpleName();
-    QTC_ASSERT(name, return false);
-
-    // Check whether the member exists already.
-    if (theClass->find(interface.currentFile()->cppDocument()->translationUnit()->identifier(
-            name->identifier_token))) {
-        return false;
-    }
-
-    result << new InsertMemberFromInitializationOp(
-        interface, theClass, memInitializer->name->asSimpleName(), memInitializer->expression,
-        nullptr, InsertionPointLocator::Private, false, false);
-    return false;
-}
-
-void AddDeclarationForUndeclaredIdentifier::maybeAddMember(
-    const CppQuickFixInterface &interface, Scope *scope, const QByteArray &classTypeExpr,
-    const TypeOrExpr &typeOrExpr, const CallAST *call, TextEditor::QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-
-    TypeOfExpression typeOfExpression;
-    typeOfExpression.init(interface.semanticInfo().doc, interface.snapshot(),
-                          interface.context().bindings());
-    const QList<LookupItem> lhsTypes = typeOfExpression(
-        classTypeExpr, scope,
-        TypeOfExpression::Preprocess);
-    if (lhsTypes.isEmpty())
-        return;
-
-    const Type *type = lhsTypes.first().type().type();
-    if (!type)
-        return;
-    if (type->asPointerType()) {
-        type = type->asPointerType()->elementType().type();
-        if (!type)
-            return;
-    }
-    const auto namedType = type->asNamedType();
-    if (!namedType)
-        return;
-    const ClassOrNamespace * const classOrNamespace
-        = interface.context().lookupType(namedType->name(), scope);
-    if (!classOrNamespace || !classOrNamespace->rootClass())
-        return;
-
-    const Class * const theClass = classOrNamespace->rootClass();
-    bool needsStatic = lhsTypes.first().type().isStatic();
-
-    // If the base expression refers to the same class that the member function is in,
-    // then we want to insert a private member, otherwise a public one.
-    const FunctionDefinitionAST *func = nullptr;
-    for (auto it = path.rbegin(); !func && it != path.rend(); ++it)
-        func = (*it)->asFunctionDefinition();
-    QTC_ASSERT(func, return);
-    InsertionPointLocator::AccessSpec accessSpec = InsertionPointLocator::Public;
-    for (int i = 0; i < theClass->memberCount(); ++i) {
-        if (theClass->memberAt(i) == func->symbol) {
-            accessSpec = InsertionPointLocator::Private;
-            needsStatic = func->symbol->isStatic();
-            break;
-        }
-    }
-    if (accessSpec == InsertionPointLocator::Public) {
-        QList<Declaration *> decls;
-        QList<Declaration *> dummy;
-        SymbolFinder().findMatchingDeclaration(interface.context(), func->symbol, &decls,
-                                               &dummy, &dummy);
-        for (const Declaration * const decl : std::as_const(decls)) {
-            for (int i = 0; i < theClass->memberCount(); ++i) {
-                if (theClass->memberAt(i) == decl) {
-                    accessSpec = InsertionPointLocator::Private;
-                    needsStatic = decl->isStatic();
-                    break;
-                }
-            }
-            if (accessSpec == InsertionPointLocator::Private)
-                break;
-        }
-    }
-    result << new InsertMemberFromInitializationOp(interface, theClass, path.last()->asName(),
-                                                   typeOrExpr, call, accessSpec, needsStatic,
-                                                   func->symbol->isConst());
-}
-
-void AddDeclarationForUndeclaredIdentifier::maybeAddStaticMember(
-    const CppQuickFixInterface &interface, const QualifiedNameAST *qualName,
-    const TypeOrExpr &typeOrExpr, const CallAST *call, TextEditor::QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-
-    if (!interface.isCursorOn(qualName->unqualified_name))
-        return;
-    if (qualName->unqualified_name != path.last())
-        return;
-    if (!qualName->nested_name_specifier_list)
-        return;
-
-    const NameAST * const topLevelName
-        = qualName->nested_name_specifier_list->value->class_or_namespace_name;
-    if (!topLevelName)
-        return;
-    ClassOrNamespace * const classOrNamespace = interface.context().lookupType(
-        topLevelName->name, interface.currentFile()->scopeAt(qualName->firstToken()));
-    if (!classOrNamespace)
-        return;
-    QList<const Name *> otherNames;
-    for (auto it = qualName->nested_name_specifier_list->next; it; it = it->next) {
-        if (!it->value || !it->value->class_or_namespace_name)
-            return;
-        otherNames << it->value->class_or_namespace_name->name;
-    }
-
-    const Class *theClass = nullptr;
-    if (!otherNames.isEmpty()) {
-        const Symbol * const symbol = classOrNamespace->lookupInScope(otherNames);
-        if (!symbol)
-            return;
-        theClass = symbol->asClass();
-    } else {
-        theClass = classOrNamespace->rootClass();
-    }
-    if (theClass) {
-        result << new InsertMemberFromInitializationOp(
-            interface, theClass, path.last()->asName(), typeOrExpr, call,
-            InsertionPointLocator::Public, true, false);
-    }
-}
-
-class MemberFunctionImplSetting
-{
-public:
-    Symbol *func = nullptr;
-    DefPos defPos = DefPosImplementationFile;
-};
-using MemberFunctionImplSettings = QList<MemberFunctionImplSetting>;
-
-class AddImplementationsDialog : public QDialog
-{
-public:
-    AddImplementationsDialog(const QList<Symbol *> &candidates, const FilePath &implFile)
-        : QDialog(Core::ICore::dialogParent()), m_candidates(candidates)
-    {
-        setWindowTitle(Tr::tr("Member Function Implementations"));
-
-        const auto defaultImplTargetComboBox = new QComboBox;
-        QStringList implTargetStrings{Tr::tr("None"), Tr::tr("Inline"), Tr::tr("Outside Class")};
-        if (!implFile.isEmpty())
-            implTargetStrings.append(implFile.fileName());
-        defaultImplTargetComboBox->insertItems(0, implTargetStrings);
-        connect(defaultImplTargetComboBox, &QComboBox::currentIndexChanged, this,
-                [this](int index) {
-            for (int i = 0; i < m_implTargetBoxes.size(); ++i) {
-                if (!m_candidates.at(i)->type()->asFunctionType()->isPureVirtual())
-                    static_cast<QComboBox *>(m_implTargetBoxes.at(i))->setCurrentIndex(index);
-            }
-        });
-        const auto defaultImplTargetLayout = new QHBoxLayout;
-        defaultImplTargetLayout->addWidget(new QLabel(Tr::tr("Default implementation location:")));
-        defaultImplTargetLayout->addWidget(defaultImplTargetComboBox);
-
-        const auto candidatesLayout = new QGridLayout;
-        Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
-        oo.showFunctionSignatures = true;
-        oo.showReturnTypes = true;
-        for (int i = 0; i < m_candidates.size(); ++i) {
-            const Function * const func = m_candidates.at(i)->type()->asFunctionType();
-            QTC_ASSERT(func, continue);
-            const auto implTargetComboBox = new QComboBox;
-            m_implTargetBoxes.append(implTargetComboBox);
-            implTargetComboBox->insertItems(0, implTargetStrings);
-            if (func->isPureVirtual())
-                implTargetComboBox->setCurrentIndex(0);
-            candidatesLayout->addWidget(new QLabel(oo.prettyType(func->type(), func->name())),
-                                        i, 0);
-            candidatesLayout->addWidget(implTargetComboBox, i, 1);
-        }
-
-        const auto buttonBox
-                = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-        connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
-        connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
-
-        defaultImplTargetComboBox->setCurrentIndex(implTargetStrings.size() - 1);
-        const auto mainLayout = new QVBoxLayout(this);
-        mainLayout->addLayout(defaultImplTargetLayout);
-        mainLayout->addWidget(Layouting::createHr(this));
-        mainLayout->addLayout(candidatesLayout);
-        mainLayout->addWidget(buttonBox);
-    }
-
-    MemberFunctionImplSettings settings() const
-    {
-        QTC_ASSERT(m_candidates.size() == m_implTargetBoxes.size(), return {});
-        MemberFunctionImplSettings settings;
-        for (int i = 0; i < m_candidates.size(); ++i) {
-            MemberFunctionImplSetting setting;
-            const int index = m_implTargetBoxes.at(i)->currentIndex();
-            const bool addImplementation = index != 0;
-            if (!addImplementation)
-                continue;
-            setting.func = m_candidates.at(i);
-            setting.defPos = static_cast<DefPos>(index - 1);
-            settings << setting;
-        }
-        return settings;
-    }
-
-private:
-    const QList<Symbol *> m_candidates;
-    QList<QComboBox *> m_implTargetBoxes;
-};
-
-class InsertDefsOperation: public CppQuickFixOperation
-{
-public:
-    InsertDefsOperation(const CppQuickFixInterface &interface)
-        : CppQuickFixOperation(interface)
-    {
-        setDescription(Tr::tr("Create Implementations for Member Functions"));
-
-        m_classAST = astForClassOperations(interface);
-        if (!m_classAST)
-            return;
-        const Class * const theClass = m_classAST->symbol;
-        if (!theClass)
-            return;
-
-        // Collect all member functions.
-        for (auto it = theClass->memberBegin(); it != theClass->memberEnd(); ++it) {
-            Symbol * const s = *it;
-            if (!s->identifier() || !s->type() || !s->asDeclaration() || s->asFunction())
-                continue;
-            Function * const func = s->type()->asFunctionType();
-            if (!func || func->isSignal() || func->isFriend())
-                continue;
-            Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
-            oo.showFunctionSignatures = true;
-            if (magicQObjectFunctions().contains(oo.prettyName(func->name())))
-                continue;
-            m_declarations << s;
-        }
-    }
-
-    bool isApplicable() const { return !m_declarations.isEmpty(); }
-    void setMode(InsertDefsFromDecls::Mode mode) { m_mode = mode; }
-
-private:
-    void perform() override
-    {
-        QList<Symbol *> unimplemented;
-        SymbolFinder symbolFinder;
-        for (Symbol * const s : std::as_const(m_declarations)) {
-            if (!symbolFinder.findMatchingDefinition(s, snapshot()))
-                unimplemented << s;
-        }
-        if (unimplemented.isEmpty())
-            return;
-
-        CppRefactoringChanges refactoring(snapshot());
-        const bool isHeaderFile = ProjectFile::isHeader(ProjectFile::classify(filePath().toString()));
-        FilePath cppFile; // Only set if the class is defined in a header file.
-        if (isHeaderFile) {
-            InsertionPointLocator locator(refactoring);
-            for (const InsertionLocation &location
-                 : locator.methodDefinition(unimplemented.first(), false, {})) {
-                if (!location.isValid())
-                    continue;
-                const FilePath filePath = location.filePath();
-                if (ProjectFile::isHeader(ProjectFile::classify(filePath.path()))) {
-                    const FilePath source = correspondingHeaderOrSource(filePath);
-                    if (!source.isEmpty())
-                        cppFile = source;
-                } else {
-                    cppFile = filePath;
-                }
-                break;
-            }
-        }
-
-        MemberFunctionImplSettings settings;
-        switch (m_mode) {
-        case InsertDefsFromDecls::Mode::User: {
-            AddImplementationsDialog dlg(unimplemented, cppFile);
-            if (dlg.exec() == QDialog::Accepted)
-                settings = dlg.settings();
-            break;
-        }
-        case InsertDefsFromDecls::Mode::Impl: {
-            for (Symbol * const func : std::as_const(unimplemented)) {
-                MemberFunctionImplSetting setting;
-                setting.func = func;
-                setting.defPos = DefPosImplementationFile;
-                settings << setting;
-            }
-            break;
-        }
-        case InsertDefsFromDecls::Mode::Alternating: {
-            int defPos = DefPosImplementationFile;
-            const auto incDefPos = [&defPos] {
-                defPos = (defPos + 1) % (DefPosImplementationFile + 2);
-            };
-            for (Symbol * const func : std::as_const(unimplemented)) {
-                incDefPos();
-                if (defPos > DefPosImplementationFile)
-                    continue;
-                MemberFunctionImplSetting setting;
-                setting.func = func;
-                setting.defPos = static_cast<DefPos>(defPos);
-                settings << setting;
-            }
-            break;
-        }
-        case InsertDefsFromDecls::Mode::Off:
-            break;
-        }
-
-        if (settings.isEmpty())
-            return;
-
-        class DeclFinder : public ASTVisitor
-        {
-        public:
-            DeclFinder(const CppRefactoringFile *file, const Symbol *func)
-                : ASTVisitor(file->cppDocument()->translationUnit()), m_func(func) {}
-
-            SimpleDeclarationAST *decl() const { return m_decl; }
-
-        private:
-            bool visit(SimpleDeclarationAST *decl) override
-            {
-                if (m_decl)
-                    return false;
-                if (decl->symbols && decl->symbols->value == m_func)
-                    m_decl = decl;
-                return !m_decl;
-            }
-
-            const Symbol * const m_func;
-            SimpleDeclarationAST *m_decl = nullptr;
-        };
-
-        QHash<FilePath, ChangeSet> changeSets;
-        for (const MemberFunctionImplSetting &setting : std::as_const(settings)) {
-            DeclFinder finder(currentFile().data(), setting.func);
-            finder.accept(m_classAST);
-            QTC_ASSERT(finder.decl(), continue);
-            InsertionLocation loc;
-            const FilePath targetFilePath = setting.defPos == DefPosImplementationFile
-                    ? cppFile : filePath();
-            QTC_ASSERT(!targetFilePath.isEmpty(), continue);
-            if (setting.defPos == DefPosInsideClass) {
-                int line, column;
-                currentFile()->lineAndColumn(currentFile()->endOf(finder.decl()), &line, &column);
-                loc = InsertionLocation(filePath(), QString(), QString(), line, column);
-            }
-            ChangeSet &changeSet = changeSets[targetFilePath];
-            InsertDefOperation::insertDefinition(
-                        this, loc, setting.defPos, finder.decl()->declarator_list->value,
-                        setting.func->asDeclaration(),targetFilePath, &changeSet);
-        }
-        for (auto it = changeSets.cbegin(); it != changeSets.cend(); ++it) {
-            const CppRefactoringFilePtr file = refactoring.cppFile(it.key());
-            file->setChangeSet(it.value());
-            file->apply();
-        }
-    }
-
-    ClassSpecifierAST *m_classAST = nullptr;
-    InsertDefsFromDecls::Mode m_mode;
-    QList<Symbol *> m_declarations;
-};
-
-
-void InsertDefsFromDecls::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    const auto op = QSharedPointer<InsertDefsOperation>::create(interface);
-    op->setMode(m_mode);
-    if (op->isApplicable())
-        result << op;
-}
-
-namespace {
-
-std::optional<FullySpecifiedType> getFirstTemplateParameter(const Name *name)
-{
-    if (const QualifiedNameId *qualifiedName = name->asQualifiedNameId())
-        return getFirstTemplateParameter(qualifiedName->name());
-
-    if (const TemplateNameId *templateName = name->asTemplateNameId()) {
-        if (templateName->templateArgumentCount() > 0)
-            return templateName->templateArgumentAt(0).type();
-    }
-    return {};
-}
-
-std::optional<FullySpecifiedType> getFirstTemplateParameter(Type *type)
-{
-    if (NamedType *namedType = type->asNamedType())
-        return getFirstTemplateParameter(namedType->name());
-
-    return {};
-}
-
-std::optional<FullySpecifiedType> getFirstTemplateParameter(FullySpecifiedType type)
-{
-    return getFirstTemplateParameter(type.type());
-}
-
-QString symbolAtDifferentLocation(const CppQuickFixInterface &interface,
-                                  Symbol *symbol,
-                                  const CppRefactoringFilePtr &targetFile,
-                                  InsertionLocation targetLocation)
-{
-    QTC_ASSERT(symbol, return QString());
-    Scope *scopeAtInsertPos = targetFile->cppDocument()->scopeAt(targetLocation.line(),
-                                                                 targetLocation.column());
-
-    LookupContext cppContext(targetFile->cppDocument(), interface.snapshot());
-    ClassOrNamespace *cppCoN = cppContext.lookupType(scopeAtInsertPos);
-    if (!cppCoN)
-        cppCoN = cppContext.globalNamespace();
-    SubstitutionEnvironment env;
-    env.setContext(interface.context());
-    env.switchScope(symbol->enclosingScope());
-    UseMinimalNames q(cppCoN);
-    env.enter(&q);
-    Control *control = interface.context().bindings()->control().get();
-    Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
-    return oo.prettyName(LookupContext::minimalName(symbol, cppCoN, control));
-}
-
-FullySpecifiedType typeAtDifferentLocation(const CppQuickFixInterface &interface,
-                                           FullySpecifiedType type,
-                                           Scope *originalScope,
-                                           const CppRefactoringFilePtr &targetFile,
-                                           InsertionLocation targetLocation,
-                                           const QStringList &newNamespaceNamesAtLoc = {})
-{
-    Scope *scopeAtInsertPos = targetFile->cppDocument()->scopeAt(targetLocation.line(),
-                                                                 targetLocation.column());
-    for (const QString &nsName : newNamespaceNamesAtLoc) {
-        const QByteArray utf8Name = nsName.toUtf8();
-        Control *control = targetFile->cppDocument()->control();
-        const Name *name = control->identifier(utf8Name.data(), utf8Name.size());
-        Namespace *ns = control->newNamespace(0, name);
-        ns->setEnclosingScope(scopeAtInsertPos);
-        scopeAtInsertPos = ns;
-    }
-    LookupContext cppContext(targetFile->cppDocument(), interface.snapshot());
-    ClassOrNamespace *cppCoN = cppContext.lookupType(scopeAtInsertPos);
-    if (!cppCoN)
-        cppCoN = cppContext.globalNamespace();
-    SubstitutionEnvironment env;
-    env.setContext(interface.context());
-    env.switchScope(originalScope);
-    UseMinimalNames q(cppCoN);
-    env.enter(&q);
-    Control *control = interface.context().bindings()->control().get();
-    return rewriteType(type, &env, control);
-}
-
-struct ExistingGetterSetterData
-{
-    Class *clazz = nullptr;
-    Declaration *declarationSymbol = nullptr;
-    QString getterName;
-    QString setterName;
-    QString resetName;
-    QString signalName;
-    QString qPropertyName;
-    QString memberVariableName;
-    Document::Ptr doc;
-
-    int computePossibleFlags() const;
-};
-
-class GetterSetterRefactoringHelper
-{
-public:
-    GetterSetterRefactoringHelper(CppQuickFixOperation *operation,
-                                  const FilePath &filePath,
-                                  Class *clazz)
-        : m_operation(operation)
-        , m_changes(m_operation->snapshot())
-        , m_locator(m_changes)
-        , m_headerFile(m_changes.cppFile(filePath))
-        , m_sourceFile([&] {
-            FilePath cppFilePath = correspondingHeaderOrSource(filePath, &m_isHeaderHeaderFile);
-            if (!m_isHeaderHeaderFile || !cppFilePath.exists()) {
-                // there is no "source" file
-                return m_headerFile;
-            } else {
-                return m_changes.cppFile(cppFilePath);
-            }
-        }())
-        , m_class(clazz)
-    {}
-
-    void performGeneration(ExistingGetterSetterData data, int generationFlags);
-
-    void applyChanges()
-    {
-        const auto classLayout = {
-            InsertionPointLocator::Public,
-            InsertionPointLocator::PublicSlot,
-            InsertionPointLocator::Signals,
-            InsertionPointLocator::Protected,
-            InsertionPointLocator::ProtectedSlot,
-            InsertionPointLocator::PrivateSlot,
-            InsertionPointLocator::Private,
-        };
-        for (auto spec : classLayout) {
-            const auto iter = m_headerFileCode.find(spec);
-            if (iter != m_headerFileCode.end()) {
-                const InsertionLocation loc = headerLocationFor(spec);
-                m_headerFile->setOpenEditor(true, m_headerFile->position(loc.line(), loc.column()));
-                insertAndIndent(m_headerFile, loc, *iter);
-            }
-        }
-        if (!m_sourceFileCode.isEmpty() && m_sourceFileInsertionPoint.isValid()) {
-            m_sourceFile->setOpenEditor(true, m_sourceFile->position(
-                                            m_sourceFileInsertionPoint.line(),
-                                            m_sourceFileInsertionPoint.column()));
-            insertAndIndent(m_sourceFile, m_sourceFileInsertionPoint, m_sourceFileCode);
-        }
-
-        if (!m_headerFileChangeSet.isEmpty()) {
-            m_headerFile->setChangeSet(m_headerFileChangeSet);
-            m_headerFile->apply();
-        }
-        if (!m_sourceFileChangeSet.isEmpty()) {
-            m_sourceFile->setChangeSet(m_sourceFileChangeSet);
-            m_sourceFile->apply();
-        }
-    }
-
-    bool hasSourceFile() const { return m_headerFile != m_sourceFile; }
-
-protected:
-    void insertAndIndent(const RefactoringFilePtr &file,
-                         const InsertionLocation &loc,
-                         const QString &text)
-    {
-        int targetPosition = file->position(loc.line(), loc.column());
-        ChangeSet &changeSet = file == m_headerFile ? m_headerFileChangeSet : m_sourceFileChangeSet;
-        changeSet.insert(targetPosition, loc.prefix() + text + loc.suffix());
-    }
-
-    FullySpecifiedType makeConstRef(FullySpecifiedType type)
-    {
-        type.setConst(true);
-        return m_operation->currentFile()->cppDocument()->control()->referenceType(type, false);
-    }
-
-    FullySpecifiedType addConstToReference(FullySpecifiedType type)
-    {
-        if (ReferenceType *ref = type.type()->asReferenceType()) {
-            FullySpecifiedType elemType = ref->elementType();
-            if (elemType.isConst())
-                return type;
-            elemType.setConst(true);
-            return m_operation->currentFile()->cppDocument()->control()->referenceType(elemType,
-                                                                                       false);
-        }
-        return type;
-    }
-
-    QString symbolAt(Symbol *symbol,
-                     const CppRefactoringFilePtr &targetFile,
-                     InsertionLocation targetLocation)
-    {
-        return symbolAtDifferentLocation(*m_operation, symbol, targetFile, targetLocation);
-    }
-
-    FullySpecifiedType typeAt(FullySpecifiedType type,
-                              Scope *originalScope,
-                              const CppRefactoringFilePtr &targetFile,
-                              InsertionLocation targetLocation,
-                              const QStringList &newNamespaceNamesAtLoc = {})
-    {
-        return typeAtDifferentLocation(*m_operation,
-                                       type,
-                                       originalScope,
-                                       targetFile,
-                                       targetLocation,
-                                       newNamespaceNamesAtLoc);
-    }
-
-    /**
-     * @brief checks if the type in the enclosing scope in the header is a value type
-     * @param type a type in the m_headerFile
-     * @param enclosingScope the enclosing scope
-     * @param customValueType if not nullptr set to true when value type comes
-     * from CppQuickFixSettings::isValueType
-     * @return true if it is a pointer, enum, integer, floating point, reference, custom value type
-     */
-    bool isValueType(FullySpecifiedType type, Scope *enclosingScope, bool *customValueType = nullptr)
-    {
-        if (customValueType)
-            *customValueType = false;
-        // a type is a value type if it is one of the following
-        const auto isTypeValueType = [](const FullySpecifiedType &t) {
-            return t->asPointerType() || t->asEnumType() || t->asIntegerType() || t->asFloatType()
-                   || t->asReferenceType();
-        };
-        if (type->asNamedType()) {
-            // we need a recursive search and a lookup context
-            LookupContext context(m_headerFile->cppDocument(), m_changes.snapshot());
-            auto isValueType = [settings = m_settings,
-                                &customValueType,
-                                &context,
-                                &isTypeValueType](const Name *name,
-                                                  Scope *scope,
-                                                  auto &isValueType) {
-                // maybe the type is a custom value type by name
-                if (const Identifier *id = name->identifier()) {
-                    if (settings->isValueType(QString::fromUtf8(id->chars(), id->size()))) {
-                        if (customValueType)
-                            *customValueType = true;
-                        return true;
-                    }
-                }
-                // search for the type declaration
-                QList<LookupItem> localLookup = context.lookup(name, scope);
-                for (auto &&i : localLookup) {
-                    if (isTypeValueType(i.type()))
-                        return true;
-                    if (i.type()->asNamedType()) { // check if we have to search recursively
-                        const Name *newName = i.type()->asNamedType()->name();
-                        Scope *newScope = i.declaration()->enclosingScope();
-                        if (Matcher::match(newName, name)
-                                && Matcher::match(newScope->name(), scope->name())) {
-                            continue; // we have found the start location of the search
-                        }
-                        return isValueType(newName, newScope, isValueType);
-                    }
-                    return false;
-                }
-                return false;
-            };
-            // start recursion
-            return isValueType(type->asNamedType()->name(), enclosingScope, isValueType);
-        }
-        return isTypeValueType(type);
-    }
-
-    bool isValueType(Symbol *symbol, bool *customValueType = nullptr)
-    {
-        return isValueType(symbol->type(), symbol->enclosingScope(), customValueType);
-    }
-
-    void addHeaderCode(InsertionPointLocator::AccessSpec spec, QString code)
-    {
-        QString &existing = m_headerFileCode[spec];
-        existing += code;
-        if (!existing.endsWith('\n'))
-            existing += '\n';
-    }
-
-    InsertionLocation headerLocationFor(InsertionPointLocator::AccessSpec spec)
-    {
-        const auto insertionPoint = m_headerInsertionPoints.find(spec);
-        if (insertionPoint != m_headerInsertionPoints.end())
-            return *insertionPoint;
-        const InsertionLocation loc = m_locator.methodDeclarationInClass(
-                    m_headerFile->filePath(), m_class, spec,
-                    InsertionPointLocator::ForceAccessSpec::Yes);
-        m_headerInsertionPoints.insert(spec, loc);
-        return loc;
-    }
-
-    InsertionLocation sourceLocationFor(Symbol *symbol, QStringList *insertedNamespaces = nullptr)
-    {
-        if (m_sourceFileInsertionPoint.isValid())
-            return m_sourceFileInsertionPoint;
-        m_sourceFileInsertionPoint
-            = insertLocationForMethodDefinition(symbol,
-                                                false,
-                                                m_settings->createMissingNamespacesinCppFile()
-                                                    ? NamespaceHandling::CreateMissing
-                                                    : NamespaceHandling::Ignore,
-                                                m_changes,
-                                                m_sourceFile->filePath(),
-                                                insertedNamespaces);
-        if (m_settings->addUsingNamespaceinCppFile()) {
-            // check if we have to insert a using namespace ...
-            auto requiredNamespaces = getNamespaceNames(
-                symbol->asClass() ? symbol : symbol->enclosingClass());
-            NSCheckerVisitor visitor(m_sourceFile.get(),
-                                     requiredNamespaces,
-                                     m_sourceFile->position(m_sourceFileInsertionPoint.line(),
-                                                            m_sourceFileInsertionPoint.column()));
-            visitor.accept(m_sourceFile->cppDocument()->translationUnit()->ast());
-            if (insertedNamespaces)
-                insertedNamespaces->clear();
-            if (auto rns = visitor.remainingNamespaces(); !rns.empty()) {
-                QString ns = "using namespace ";
-                for (auto &n : rns) {
-                    if (!n.isEmpty()) { // we have to ignore unnamed namespaces
-                        ns += n;
-                        ns += "::";
-                        if (insertedNamespaces)
-                            insertedNamespaces->append(n);
-                    }
-                }
-                ns.resize(ns.size() - 2); // remove last '::'
-                ns += ";\n";
-                const auto &loc = m_sourceFileInsertionPoint;
-                m_sourceFileInsertionPoint = InsertionLocation(loc.filePath(),
-                                                               loc.prefix() + ns,
-                                                               loc.suffix(),
-                                                               loc.line(),
-                                                               loc.column());
-            }
-        }
-        return m_sourceFileInsertionPoint;
-    }
-
-    void addSourceFileCode(QString code)
-    {
-        while (!m_sourceFileCode.isEmpty() && !m_sourceFileCode.endsWith("\n\n"))
-            m_sourceFileCode += '\n';
-        m_sourceFileCode += code;
-    }
-
-protected:
-    CppQuickFixOperation *const m_operation;
-    const CppRefactoringChanges m_changes;
-    const InsertionPointLocator m_locator;
-    const CppRefactoringFilePtr m_headerFile;
-    bool m_isHeaderHeaderFile = false; // the "header" (where the class is defined) can be a source file
-    const CppRefactoringFilePtr m_sourceFile;
-    CppQuickFixSettings *const m_settings = CppQuickFixProjectsSettings::getQuickFixSettings(
-        ProjectExplorer::ProjectTree::currentProject());
-    Class *const m_class;
-
-private:
-    ChangeSet m_headerFileChangeSet;
-    ChangeSet m_sourceFileChangeSet;
-    QMap<InsertionPointLocator::AccessSpec, InsertionLocation> m_headerInsertionPoints;
-    InsertionLocation m_sourceFileInsertionPoint;
-    QString m_sourceFileCode;
-    QMap<InsertionPointLocator::AccessSpec, QString> m_headerFileCode;
-};
-
-class GenerateGetterSetterOp : public CppQuickFixOperation
-{
-public:
-    enum GenerateFlag {
-        GenerateGetter = 1 << 0,
-        GenerateSetter = 1 << 1,
-        GenerateSignal = 1 << 2,
-        GenerateMemberVariable = 1 << 3,
-        GenerateReset = 1 << 4,
-        GenerateProperty = 1 << 5,
-        GenerateConstantProperty = 1 << 6,
-        HaveExistingQProperty = 1 << 7,
-        Invalid = -1,
-    };
-
-    GenerateGetterSetterOp(const CppQuickFixInterface &interface,
-                           ExistingGetterSetterData data,
-                           int generateFlags,
-                           int priority,
-                           const QString &description)
-        : CppQuickFixOperation(interface)
-        , m_generateFlags(generateFlags)
-        , m_data(data)
-    {
-        setDescription(description);
-        setPriority(priority);
-    }
-
-    static void generateQuickFixes(QuickFixOperations &results,
-                                   const CppQuickFixInterface &interface,
-                                   const ExistingGetterSetterData &data,
-                                   const int possibleFlags)
-    {
-        // flags can have the value HaveExistingQProperty or a combination of all other values
-        // of the enum 'GenerateFlag'
-        int p = 0;
-        if (possibleFlags & HaveExistingQProperty) {
-            const QString desc = Tr::tr("Generate Missing Q_PROPERTY Members");
-            results << new GenerateGetterSetterOp(interface, data, possibleFlags, ++p, desc);
-        } else {
-            if (possibleFlags & GenerateSetter) {
-                const QString desc = Tr::tr("Generate Setter");
-                results << new GenerateGetterSetterOp(interface, data, GenerateSetter, ++p, desc);
-            }
-            if (possibleFlags & GenerateGetter) {
-                const QString desc = Tr::tr("Generate Getter");
-                results << new GenerateGetterSetterOp(interface, data, GenerateGetter, ++p, desc);
-            }
-            if (possibleFlags & GenerateGetter && possibleFlags & GenerateSetter) {
-                const QString desc = Tr::tr("Generate Getter and Setter");
-                const int flags = GenerateGetter | GenerateSetter;
-                results << new GenerateGetterSetterOp(interface, data, flags, ++p, desc);
-            }
-
-            if (possibleFlags & GenerateConstantProperty) {
-                const QString desc = Tr::tr("Generate Constant Q_PROPERTY and Missing Members");
-                const int flags = possibleFlags & ~(GenerateSetter | GenerateSignal | GenerateReset);
-                results << new GenerateGetterSetterOp(interface, data, flags, ++p, desc);
-            }
-            if (possibleFlags & GenerateProperty) {
-                if (possibleFlags & GenerateReset) {
-                    const QString desc = Tr::tr(
-                        "Generate Q_PROPERTY and Missing Members with Reset Function");
-                    const int flags = possibleFlags & ~GenerateConstantProperty;
-                    results << new GenerateGetterSetterOp(interface, data, flags, ++p, desc);
-                }
-                const QString desc = Tr::tr("Generate Q_PROPERTY and Missing Members");
-                const int flags = possibleFlags & ~GenerateConstantProperty & ~GenerateReset;
-                results << new GenerateGetterSetterOp(interface, data, flags, ++p, desc);
-            }
-        }
-    }
-
-    void perform() override
-    {
-        GetterSetterRefactoringHelper helper(this, currentFile()->filePath(), m_data.clazz);
-        helper.performGeneration(m_data, m_generateFlags);
-        helper.applyChanges();
-    }
-
-private:
-    int m_generateFlags;
-    ExistingGetterSetterData m_data;
-};
-
-int ExistingGetterSetterData::computePossibleFlags() const
-{
-    const bool isConst = declarationSymbol->type().isConst();
-    const bool isStatic = declarationSymbol->type().isStatic();
-    using Flag = GenerateGetterSetterOp::GenerateFlag;
-    int generateFlags = 0;
-    if (getterName.isEmpty())
-        generateFlags |= Flag::GenerateGetter;
-    if (!isConst) {
-        if (resetName.isEmpty())
-            generateFlags |= Flag::GenerateReset;
-        if (!isStatic && signalName.isEmpty() && setterName.isEmpty())
-            generateFlags |= Flag::GenerateSignal;
-        if (setterName.isEmpty())
-            generateFlags |= Flag::GenerateSetter;
-    }
-    if (!isStatic) {
-        const bool hasSignal = !signalName.isEmpty() || generateFlags & Flag::GenerateSignal;
-        if (!isConst && hasSignal)
-            generateFlags |= Flag::GenerateProperty;
-    }
-    if (setterName.isEmpty() && signalName.isEmpty())
-        generateFlags |= Flag::GenerateConstantProperty;
-    return generateFlags;
-}
-
-void GetterSetterRefactoringHelper::performGeneration(ExistingGetterSetterData data, int generateFlags)
-{
-    using Flag = GenerateGetterSetterOp::GenerateFlag;
-
-    if (generateFlags & Flag::GenerateGetter && data.getterName.isEmpty()) {
-        data.getterName = m_settings->getGetterName(data.qPropertyName);
-        if (data.getterName == data.memberVariableName) {
-            data.getterName = "get" + data.memberVariableName.left(1).toUpper()
-                              + data.memberVariableName.mid(1);
-        }
-    }
-    if (generateFlags & Flag::GenerateSetter && data.setterName.isEmpty())
-        data.setterName = m_settings->getSetterName(data.qPropertyName);
-    if (generateFlags & Flag::GenerateSignal && data.signalName.isEmpty())
-        data.signalName = m_settings->getSignalName(data.qPropertyName);
-    if (generateFlags & Flag::GenerateReset && data.resetName.isEmpty())
-        data.resetName = m_settings->getResetName(data.qPropertyName);
-
-    FullySpecifiedType memberVariableType = data.declarationSymbol->type();
-    memberVariableType.setConst(false);
-    const bool isMemberVariableStatic = memberVariableType.isStatic();
-    memberVariableType.setStatic(false);
-    Overview overview = CppCodeStyleSettings::currentProjectCodeStyleOverview();
-    overview.showTemplateParameters = false;
-    // TODO does not work with using. e.g. 'using foo = std::unique_ptr<int>'
-    // TODO must be fully qualified
-    auto getSetTemplate = m_settings->findGetterSetterTemplate(overview.prettyType(memberVariableType));
-    overview.showTemplateParameters = true;
-
-    // Ok... - If a type is a Named type we have to search recusive for the real type
-    const bool isValueType = this->isValueType(memberVariableType,
-                                               data.declarationSymbol->enclosingScope());
-    const FullySpecifiedType parameterType = isValueType ? memberVariableType
-                                                         : makeConstRef(memberVariableType);
-
-    QString baseName = memberBaseName(data.memberVariableName);
-    if (baseName.isEmpty())
-        baseName = data.memberVariableName;
-
-    const QString parameterName = m_settings->getSetterParameterName(baseName);
-    if (parameterName == data.memberVariableName)
-        data.memberVariableName = "this->" + data.memberVariableName;
-
-    getSetTemplate.replacePlaceholders(data.memberVariableName, parameterName);
-
-    using Pattern = CppQuickFixSettings::GetterSetterTemplate;
-    std::optional<FullySpecifiedType> returnTypeTemplateParameter;
-    if (getSetTemplate.returnTypeTemplate.has_value()) {
-        QString returnTypeTemplate = getSetTemplate.returnTypeTemplate.value();
-        if (returnTypeTemplate.contains(Pattern::TEMPLATE_PARAMETER_PATTERN)) {
-            returnTypeTemplateParameter = getFirstTemplateParameter(data.declarationSymbol->type());
-            if (!returnTypeTemplateParameter.has_value())
-                return; // Maybe report error to the user
-        }
-    }
-    const FullySpecifiedType returnTypeHeader = [&] {
-        if (!getSetTemplate.returnTypeTemplate.has_value())
-            return m_settings->returnByConstRef ? parameterType : memberVariableType;
-        QString typeTemplate = getSetTemplate.returnTypeTemplate.value();
-        if (returnTypeTemplateParameter.has_value())
-            typeTemplate.replace(Pattern::TEMPLATE_PARAMETER_PATTERN,
-                                 overview.prettyType(returnTypeTemplateParameter.value()));
-        if (typeTemplate.contains(Pattern::TYPE_PATTERN))
-            typeTemplate.replace(Pattern::TYPE_PATTERN,
-                                 overview.prettyType(data.declarationSymbol->type()));
-        Control *control = m_operation->currentFile()->cppDocument()->control();
-        std::string utf8TypeName = typeTemplate.toUtf8().toStdString();
-        return FullySpecifiedType(control->namedType(control->identifier(utf8TypeName.c_str())));
-    }();
-
-    // getter declaration
-    if (generateFlags & Flag::GenerateGetter) {
-        // maybe we added 'this->' to memberVariableName because of a collision with parameterName
-        // but here the 'this->' is not needed
-        const QString returnExpression = QString{getSetTemplate.returnExpression}.replace("this->",
-                                                                                          "");
-        QString getterInClassDeclaration = overview.prettyType(returnTypeHeader, data.getterName)
-                                           + QLatin1String("()");
-        if (isMemberVariableStatic)
-            getterInClassDeclaration.prepend(QLatin1String("static "));
-        else
-            getterInClassDeclaration += QLatin1String(" const");
-        getterInClassDeclaration.prepend(m_settings->getterAttributes + QLatin1Char(' '));
-
-        auto getterLocation = m_settings->determineGetterLocation(1);
-        // if we have an anonymous class we must add code inside the class
-        if (data.clazz->name()->asAnonymousNameId())
-            getterLocation = CppQuickFixSettings::FunctionLocation::InsideClass;
-
-        if (getterLocation == CppQuickFixSettings::FunctionLocation::InsideClass) {
-            getterInClassDeclaration += QLatin1String("\n{\nreturn ") + returnExpression
-                                        + QLatin1String(";\n}\n");
-        } else {
-            getterInClassDeclaration += QLatin1String(";\n");
-        }
-        addHeaderCode(InsertionPointLocator::Public, getterInClassDeclaration);
-        if (getterLocation == CppQuickFixSettings::FunctionLocation::CppFile && !hasSourceFile())
-            getterLocation = CppQuickFixSettings::FunctionLocation::OutsideClass;
-
-        if (getterLocation != CppQuickFixSettings::FunctionLocation::InsideClass) {
-            const auto getReturnTypeAt = [&](CppRefactoringFilePtr targetFile,
-                                             InsertionLocation targetLoc) {
-                if (getSetTemplate.returnTypeTemplate.has_value()) {
-                    QString returnType = getSetTemplate.returnTypeTemplate.value();
-                    if (returnTypeTemplateParameter.has_value()) {
-                        const QString templateTypeName = overview.prettyType(typeAt(
-                            returnTypeTemplateParameter.value(), data.clazz, targetFile, targetLoc));
-                        returnType.replace(Pattern::TEMPLATE_PARAMETER_PATTERN, templateTypeName);
-                    }
-                    if (returnType.contains(Pattern::TYPE_PATTERN)) {
-                        const QString declarationType = overview.prettyType(
-                            typeAt(memberVariableType, data.clazz, targetFile, targetLoc));
-                        returnType.replace(Pattern::TYPE_PATTERN, declarationType);
-                    }
-                    Control *control = m_operation->currentFile()->cppDocument()->control();
-                    std::string utf8String = returnType.toUtf8().toStdString();
-                    return FullySpecifiedType(
-                        control->namedType(control->identifier(utf8String.c_str())));
-                } else {
-                    FullySpecifiedType returnType = typeAt(memberVariableType,
-                                                           data.clazz,
-                                                           targetFile,
-                                                           targetLoc);
-                    if (m_settings->returnByConstRef && !isValueType)
-                        return makeConstRef(returnType);
-                    return returnType;
-                }
-            };
-            const QString constSpec = isMemberVariableStatic ? QLatin1String("")
-                                                             : QLatin1String(" const");
-            if (getterLocation == CppQuickFixSettings::FunctionLocation::CppFile) {
-                InsertionLocation loc = sourceLocationFor(data.declarationSymbol);
-                FullySpecifiedType returnType;
-                QString clazz;
-                if (m_settings->rewriteTypesinCppFile()) {
-                    returnType = getReturnTypeAt(m_sourceFile, loc);
-                    clazz = symbolAt(data.clazz, m_sourceFile, loc);
-                } else {
-                    returnType = returnTypeHeader;
-                    const Identifier *identifier = data.clazz->name()->identifier();
-                    clazz = QString::fromUtf8(identifier->chars(), identifier->size());
-                }
-                const QString code = overview.prettyType(returnType, clazz + "::" + data.getterName)
-                                     + "()" + constSpec + "\n{\nreturn " + returnExpression + ";\n}";
-                addSourceFileCode(code);
-            } else if (getterLocation == CppQuickFixSettings::FunctionLocation::OutsideClass) {
-                InsertionLocation loc
-                    = insertLocationForMethodDefinition(data.declarationSymbol,
-                                                        false,
-                                                        NamespaceHandling::Ignore,
-                                                        m_changes,
-                                                        m_headerFile->filePath());
-                const FullySpecifiedType returnType = getReturnTypeAt(m_headerFile, loc);
-                const QString clazz = symbolAt(data.clazz, m_headerFile, loc);
-                QString code = overview.prettyType(returnType, clazz + "::" + data.getterName)
-                               + "()" + constSpec + "\n{\nreturn " + returnExpression + ";\n}";
-                if (m_isHeaderHeaderFile)
-                    code.prepend("inline ");
-                insertAndIndent(m_headerFile, loc, code);
-            }
-        }
-    }
-
-    // setter declaration
-    InsertionPointLocator::AccessSpec setterAccessSpec = InsertionPointLocator::Public;
-    if (m_settings->setterAsSlot) {
-        const QByteArray connectName = "connect";
-        const Identifier connectId(connectName.data(), connectName.size());
-        const QList<LookupItem> items = m_operation->context().lookup(&connectId, data.clazz);
-        for (const LookupItem &item : items) {
-            if (item.declaration() && item.declaration()->enclosingClass()
-                    && overview.prettyName(item.declaration()->enclosingClass()->name())
-                    == "QObject") {
-                setterAccessSpec = InsertionPointLocator::PublicSlot;
-                break;
-            }
-        }
-    }
-    const auto createSetterBodyWithSignal = [this, &getSetTemplate, &data] {
-        QString body;
-        QTextStream setter(&body);
-        setter << "if (" << getSetTemplate.equalComparison << ")\nreturn;\n";
-
-        setter << getSetTemplate.assignment << ";\n";
-        if (m_settings->signalWithNewValue)
-            setter << "emit " << data.signalName << "(" << getSetTemplate.returnExpression << ");\n";
-        else
-            setter << "emit " << data.signalName << "();\n";
-
-        return body;
-    };
-    if (generateFlags & Flag::GenerateSetter) {
-        QString headerDeclaration = "void " + data.setterName + '('
-                                    + overview.prettyType(addConstToReference(parameterType),
-                                                          parameterName)
-                                    + ")";
-        if (isMemberVariableStatic)
-            headerDeclaration.prepend("static ");
-        QString body = "\n{\n";
-        if (data.signalName.isEmpty())
-            body += getSetTemplate.assignment + ";\n";
-        else
-            body += createSetterBodyWithSignal();
-
-        body += "}";
-
-        auto setterLocation = m_settings->determineSetterLocation(body.count('\n') - 2);
-        // if we have an anonymous class we must add code inside the class
-        if (data.clazz->name()->asAnonymousNameId())
-            setterLocation = CppQuickFixSettings::FunctionLocation::InsideClass;
-
-        if (setterLocation == CppQuickFixSettings::FunctionLocation::CppFile && !hasSourceFile())
-            setterLocation = CppQuickFixSettings::FunctionLocation::OutsideClass;
-
-        if (setterLocation == CppQuickFixSettings::FunctionLocation::InsideClass) {
-            headerDeclaration += body;
-        } else {
-            headerDeclaration += ";\n";
-            if (setterLocation == CppQuickFixSettings::FunctionLocation::CppFile) {
-                InsertionLocation loc = sourceLocationFor(data.declarationSymbol);
-                QString clazz;
-                FullySpecifiedType newParameterType = parameterType;
-                if (m_settings->rewriteTypesinCppFile()) {
-                    newParameterType = typeAt(memberVariableType, data.clazz, m_sourceFile, loc);
-                    if (!isValueType)
-                        newParameterType = makeConstRef(newParameterType);
-                    clazz = symbolAt(data.clazz, m_sourceFile, loc);
-                } else {
-                    const Identifier *identifier = data.clazz->name()->identifier();
-                    clazz = QString::fromUtf8(identifier->chars(), identifier->size());
-                }
-                newParameterType = addConstToReference(newParameterType);
-                const QString code = "void " + clazz + "::" + data.setterName + '('
-                                     + overview.prettyType(newParameterType, parameterName) + ')'
-                                     + body;
-                addSourceFileCode(code);
-            } else if (setterLocation == CppQuickFixSettings::FunctionLocation::OutsideClass) {
-                InsertionLocation loc
-                    = insertLocationForMethodDefinition(data.declarationSymbol,
-                                                        false,
-                                                        NamespaceHandling::Ignore,
-                                                        m_changes,
-                                                        m_headerFile->filePath());
-
-                FullySpecifiedType newParameterType = typeAt(data.declarationSymbol->type(),
-                                                             data.clazz,
-                                                             m_headerFile,
-                                                             loc);
-                if (!isValueType)
-                    newParameterType = makeConstRef(newParameterType);
-                newParameterType = addConstToReference(newParameterType);
-                QString clazz = symbolAt(data.clazz, m_headerFile, loc);
-
-                QString code = "void " + clazz + "::" + data.setterName + '('
-                               + overview.prettyType(newParameterType, parameterName) + ')' + body;
-                if (m_isHeaderHeaderFile)
-                    code.prepend("inline ");
-                insertAndIndent(m_headerFile, loc, code);
-            }
-        }
-        addHeaderCode(setterAccessSpec, headerDeclaration);
-    }
-
-    // reset declaration
-    if (generateFlags & Flag::GenerateReset) {
-        QString headerDeclaration = "void " + data.resetName + "()";
-        if (isMemberVariableStatic)
-            headerDeclaration.prepend("static ");
-        QString body = "\n{\n";
-        if (!data.setterName.isEmpty()) {
-            body += data.setterName + "({}); // TODO: Adapt to use your actual default value\n";
-        } else {
-            body += "static $TYPE defaultValue{}; "
-                    "// TODO: Adapt to use your actual default value\n";
-            if (data.signalName.isEmpty())
-                body += getSetTemplate.assignment + ";\n";
-            else
-                body += createSetterBodyWithSignal();
-        }
-        body += "}";
-
-        // the template use <parameterName> as new value name, but we want to use 'defaultValue'
-        body.replace(QRegularExpression("\\b" + parameterName + "\\b"), "defaultValue");
-        // body.count('\n') - 2 : do not count the 2 at start
-        auto resetLocation = m_settings->determineSetterLocation(body.count('\n') - 2);
-        // if we have an anonymous class we must add code inside the class
-        if (data.clazz->name()->asAnonymousNameId())
-            resetLocation = CppQuickFixSettings::FunctionLocation::InsideClass;
-
-        if (resetLocation == CppQuickFixSettings::FunctionLocation::CppFile && !hasSourceFile())
-            resetLocation = CppQuickFixSettings::FunctionLocation::OutsideClass;
-
-        if (resetLocation == CppQuickFixSettings::FunctionLocation::InsideClass) {
-            headerDeclaration += body.replace("$TYPE", overview.prettyType(memberVariableType));
-        } else {
-            headerDeclaration += ";\n";
-            if (resetLocation == CppQuickFixSettings::FunctionLocation::CppFile) {
-                const InsertionLocation loc = sourceLocationFor(data.declarationSymbol);
-                QString clazz;
-                FullySpecifiedType type = memberVariableType;
-                if (m_settings->rewriteTypesinCppFile()) {
-                    type = typeAt(memberVariableType, data.clazz, m_sourceFile, loc);
-                    clazz = symbolAt(data.clazz, m_sourceFile, loc);
-                } else {
-                    const Identifier *identifier = data.clazz->name()->identifier();
-                    clazz = QString::fromUtf8(identifier->chars(), identifier->size());
-                }
-                const QString code = "void " + clazz + "::" + data.resetName + "()"
-                                     + body.replace("$TYPE", overview.prettyType(type));
-                addSourceFileCode(code);
-            } else if (resetLocation == CppQuickFixSettings::FunctionLocation::OutsideClass) {
-                const InsertionLocation loc = insertLocationForMethodDefinition(
-                    data.declarationSymbol,
-                    false,
-                    NamespaceHandling::Ignore,
-                    m_changes,
-                    m_headerFile->filePath());
-                const FullySpecifiedType type = typeAt(data.declarationSymbol->type(),
-                                                       data.clazz,
-                                                       m_headerFile,
-                                                       loc);
-                const QString clazz = symbolAt(data.clazz, m_headerFile, loc);
-                QString code = "void " + clazz + "::" + data.resetName + "()"
-                               + body.replace("$TYPE", overview.prettyType(type));
-                if (m_isHeaderHeaderFile)
-                    code.prepend("inline ");
-                insertAndIndent(m_headerFile, loc, code);
-            }
-        }
-        addHeaderCode(setterAccessSpec, headerDeclaration);
-    }
-
-    // signal declaration
-    if (generateFlags & Flag::GenerateSignal) {
-        const auto &parameter = overview.prettyType(returnTypeHeader, data.qPropertyName);
-        const QString newValue = m_settings->signalWithNewValue ? parameter : QString();
-        const QString declaration = QString("void %1(%2);\n").arg(data.signalName, newValue);
-        addHeaderCode(InsertionPointLocator::Signals, declaration);
-    }
-
-    // member variable
-    if (generateFlags & Flag::GenerateMemberVariable) {
-        QString storageDeclaration = overview.prettyType(memberVariableType, data.memberVariableName);
-        if (memberVariableType->asPointerType()
-            && m_operation->semanticInfo().doc->translationUnit()->languageFeatures().cxx11Enabled) {
-            storageDeclaration.append(" = nullptr");
-        }
-        storageDeclaration.append(";\n");
-        addHeaderCode(InsertionPointLocator::Private, storageDeclaration);
-    }
-
-    // Q_PROPERTY
-    if (generateFlags & Flag::GenerateProperty || generateFlags & Flag::GenerateConstantProperty) {
-        // Use the returnTypeHeader as base because of custom types in getSetTemplates.
-        // Remove const reference from type.
-        FullySpecifiedType type = returnTypeHeader;
-        if (ReferenceType *ref = type.type()->asReferenceType())
-            type = ref->elementType();
-        type.setConst(false);
-
-        QString propertyDeclaration = QLatin1String("Q_PROPERTY(")
-                                      + overview.prettyType(type,
-                                                            memberBaseName(data.memberVariableName));
-        bool needMember = false;
-        if (data.getterName.isEmpty())
-            needMember = true;
-        else
-            propertyDeclaration += QLatin1String(" READ ") + data.getterName;
-        if (generateFlags & Flag::GenerateConstantProperty) {
-            if (needMember)
-                propertyDeclaration += QLatin1String(" MEMBER ") + data.memberVariableName;
-            propertyDeclaration.append(QLatin1String(" CONSTANT"));
-        } else {
-            if (data.setterName.isEmpty()) {
-                needMember = true;
-            } else if (!getSetTemplate.returnTypeTemplate.has_value()) {
-                // if the return type of the getter and then Q_PROPERTY is different than
-                // the setter type, we should not add WRITE to the Q_PROPERTY
-                propertyDeclaration.append(QLatin1String(" WRITE ")).append(data.setterName);
-            }
-            if (needMember)
-                propertyDeclaration += QLatin1String(" MEMBER ") + data.memberVariableName;
-            if (!data.resetName.isEmpty())
-                propertyDeclaration += QLatin1String(" RESET ") + data.resetName;
-            propertyDeclaration.append(QLatin1String(" NOTIFY ")).append(data.signalName);
-        }
-
-        propertyDeclaration.append(QLatin1String(" FINAL)\n"));
-        addHeaderCode(InsertionPointLocator::Private, propertyDeclaration);
-    }
-}
-
-QStringList toStringList(const QList<Symbol *> names)
-{
-    QStringList list;
-    list.reserve(names.size());
-    for (const auto symbol : names) {
-        const Identifier *const id = symbol->identifier();
-        list << QString::fromUtf8(id->chars(), id->size());
-    }
-    return list;
-}
-
-void findExistingFunctions(ExistingGetterSetterData &existing, QStringList memberFunctionNames)
-{
-    const CppQuickFixSettings *settings = CppQuickFixProjectsSettings::getQuickFixSettings(
-        ProjectExplorer::ProjectTree::currentProject());
-    const QString lowerBaseName = memberBaseName(existing.memberVariableName).toLower();
-    const QStringList getterNames{lowerBaseName,
-                                  "get_" + lowerBaseName,
-                                  "get" + lowerBaseName,
-                                  "is_" + lowerBaseName,
-                                  "is" + lowerBaseName,
-                                  settings->getGetterName(lowerBaseName)};
-    const QStringList setterNames{"set_" + lowerBaseName,
-                                  "set" + lowerBaseName,
-                                  settings->getSetterName(lowerBaseName)};
-    const QStringList resetNames{"reset_" + lowerBaseName,
-                                 "reset" + lowerBaseName,
-                                 settings->getResetName(lowerBaseName)};
-    const QStringList signalNames{lowerBaseName + "_changed",
-                                  lowerBaseName + "changed",
-                                  settings->getSignalName(lowerBaseName)};
-    for (const auto &memberFunctionName : memberFunctionNames) {
-        const QString lowerName = memberFunctionName.toLower();
-        if (getterNames.contains(lowerName))
-            existing.getterName = memberFunctionName;
-        else if (setterNames.contains(lowerName))
-            existing.setterName = memberFunctionName;
-        else if (resetNames.contains(lowerName))
-            existing.resetName = memberFunctionName;
-        else if (signalNames.contains(lowerName))
-            existing.signalName = memberFunctionName;
-    }
-}
-
-QList<Symbol *> getMemberFunctions(const Class *clazz)
-{
-    QList<Symbol *> memberFunctions;
-    for (auto it = clazz->memberBegin(); it != clazz->memberEnd(); ++it) {
-        Symbol *const s = *it;
-        if (!s->identifier() || !s->type())
-            continue;
-        if ((s->asDeclaration() && s->type()->asFunctionType()) || s->asFunction())
-            memberFunctions << s;
-    }
-    return memberFunctions;
-}
-
-} // anonymous namespace
-
-void GenerateGetterSetter::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    ExistingGetterSetterData existing;
-
-    const QList<AST *> &path = interface.path();
-    // We expect something like
-    // [0] TranslationUnitAST
-    // [1] NamespaceAST
-    // [2] LinkageBodyAST
-    // [3] SimpleDeclarationAST
-    // [4] ClassSpecifierAST
-    // [5] SimpleDeclarationAST
-    // [6] DeclaratorAST
-    // [7] DeclaratorIdAST
-    // [8] SimpleNameAST
-
-    const int n = path.size();
-    if (n < 6)
-        return;
-
-    int i = 1;
-    const auto variableNameAST = path.at(n - i++)->asSimpleName();
-    const auto declaratorId = path.at(n - i++)->asDeclaratorId();
-    // DeclaratorAST might be preceded by PointerAST, e.g. for the case
-    // "class C { char *@s; };", where '@' denotes the text cursor position.
-    auto declarator = path.at(n - i++)->asDeclarator();
-    if (!declarator) {
-        --i;
-        if (path.at(n - i++)->asPointer()) {
-            if (n < 7)
-                return;
-            declarator = path.at(n - i++)->asDeclarator();
-        }
-        if (!declarator)
-            return;
-    }
-    const auto variableDecl = path.at(n - i++)->asSimpleDeclaration();
-    const auto classSpecifier = path.at(n - i++)->asClassSpecifier();
-    const auto classDecl = path.at(n - i++)->asSimpleDeclaration();
-
-    if (!(variableNameAST && declaratorId && variableDecl && classSpecifier && classDecl))
-        return;
-
-    // Do not get triggered on member functconstions and arrays
-    if (declarator->postfix_declarator_list) {
-        return;
-    }
-
-    // Construct getter and setter names
-    const Name *variableName = variableNameAST->name;
-    if (!variableName) {
-        return;
-    }
-    const Identifier *variableId = variableName->identifier();
-    if (!variableId) {
-        return;
-    }
-    existing.memberVariableName = QString::fromUtf8(variableId->chars(), variableId->size());
-
-    // Find the right symbol (for typeName) in the simple declaration
-    Symbol *symbol = nullptr;
-    const List<Symbol *> *symbols = variableDecl->symbols;
-    QTC_ASSERT(symbols, return );
-    for (; symbols; symbols = symbols->next) {
-        Symbol *s = symbols->value;
-        if (const Name *name = s->name()) {
-            if (const Identifier *id = name->identifier()) {
-                const QString symbolName = QString::fromUtf8(id->chars(), id->size());
-                if (symbolName == existing.memberVariableName) {
-                    symbol = s;
-                    break;
-                }
-            }
-        }
-    }
-    if (!symbol) {
-        // no type can be determined
-        return;
-    }
-    if (!symbol->asDeclaration()) {
-        return;
-    }
-    existing.declarationSymbol = symbol->asDeclaration();
-
-    existing.clazz = classSpecifier->symbol;
-    if (!existing.clazz)
-        return;
-
-    auto file = interface.currentFile();
-    // check if a Q_PROPERTY exist
-    const QString baseName = memberBaseName(existing.memberVariableName);
-    // eg: we have 'int m_test' and now 'Q_PROPERTY(int foo WRITE setTest MEMBER m_test NOTIFY tChanged)'
-    for (auto it = classSpecifier->member_specifier_list; it; it = it->next) {
-        if (it->value->asQtPropertyDeclaration()) {
-            auto propDecl = it->value->asQtPropertyDeclaration();
-            // iterator over 'READ ...', ...
-            auto p = propDecl->property_declaration_item_list;
-            // first check, if we have a MEMBER and the member is equal to the baseName
-            for (; p; p = p->next) {
-                const char *tokenString = file->tokenAt(p->value->item_name_token).spell();
-                if (!qstrcmp(tokenString, "MEMBER")) {
-                    if (baseName == file->textOf(p->value->expression))
-                        return;
-                }
-            }
-            // no MEMBER, but maybe the property name is the same
-            const QString propertyName = file->textOf(propDecl->property_name);
-            // we compare the baseName. e.g. 'test' instead of 'm_test'
-            if (propertyName == baseName)
-                return; // TODO Maybe offer quick fix "Add missing Q_PROPERTY Members"
-        }
-    }
-
-    findExistingFunctions(existing, toStringList(getMemberFunctions(existing.clazz)));
-    existing.qPropertyName = memberBaseName(existing.memberVariableName);
-
-    const int possibleFlags = existing.computePossibleFlags();
-    GenerateGetterSetterOp::generateQuickFixes(result, interface, existing, possibleFlags);
-}
-
-class MemberInfo
-{
-public:
-    MemberInfo(ExistingGetterSetterData data, int possibleFlags)
-        : data(data)
-        , possibleFlags(possibleFlags)
-    {}
-
-    ExistingGetterSetterData data;
-    int possibleFlags;
-    int requestedFlags = 0;
-};
-using GetterSetterCandidates = std::vector<MemberInfo>;
-
-class CandidateTreeItem : public TreeItem
-{
-public:
-    enum Column {
-        NameColumn,
-        GetterColumn,
-        SetterColumn,
-        SignalColumn,
-        ResetColumn,
-        QPropertyColumn,
-        ConstantQPropertyColumn
-    };
-    using Flag = GenerateGetterSetterOp::GenerateFlag;
-    constexpr static Flag ColumnFlag[] = {
-        Flag::Invalid,
-        Flag::GenerateGetter,
-        Flag::GenerateSetter,
-        Flag::GenerateSignal,
-        Flag::GenerateReset,
-        Flag::GenerateProperty,
-        Flag::GenerateConstantProperty,
-    };
-
-    CandidateTreeItem(MemberInfo *memberInfo)
-        : m_memberInfo(memberInfo)
-    {}
-
-private:
-    QVariant data(int column, int role) const override
-    {
-        if (role == Qt::DisplayRole && column == NameColumn)
-            return m_memberInfo->data.memberVariableName;
-        if (role == Qt::CheckStateRole && column > 0
-            && column <= static_cast<int>(std::size(ColumnFlag))) {
-            return m_memberInfo->requestedFlags & ColumnFlag[column] ? Qt::Checked : Qt::Unchecked;
-        }
-        return {};
-    }
-
-    bool setData(int column, const QVariant &data, int role) override
-    {
-        if (column < 1 || column > static_cast<int>(std::size(ColumnFlag)))
-            return false;
-        if (role != Qt::CheckStateRole)
-            return false;
-        if (!(m_memberInfo->possibleFlags & ColumnFlag[column]))
-            return false;
-        const bool nowChecked = data.toInt() == Qt::Checked;
-        if (nowChecked)
-            m_memberInfo->requestedFlags |= ColumnFlag[column];
-        else
-            m_memberInfo->requestedFlags &= ~ColumnFlag[column];
-
-        if (nowChecked) {
-            if (column == QPropertyColumn) {
-                m_memberInfo->requestedFlags |= Flag::GenerateGetter;
-                m_memberInfo->requestedFlags |= Flag::GenerateSetter;
-                m_memberInfo->requestedFlags |= Flag::GenerateSignal;
-                m_memberInfo->requestedFlags &= ~Flag::GenerateConstantProperty;
-            } else if (column == ConstantQPropertyColumn) {
-                m_memberInfo->requestedFlags |= Flag::GenerateGetter;
-                m_memberInfo->requestedFlags &= ~Flag::GenerateSetter;
-                m_memberInfo->requestedFlags &= ~Flag::GenerateSignal;
-                m_memberInfo->requestedFlags &= ~Flag::GenerateReset;
-                m_memberInfo->requestedFlags &= ~Flag::GenerateProperty;
-            } else if (column == SetterColumn || column == SignalColumn || column == ResetColumn) {
-                m_memberInfo->requestedFlags &= ~Flag::GenerateConstantProperty;
-            }
-        } else {
-            if (column == SignalColumn)
-                m_memberInfo->requestedFlags &= ~Flag::GenerateProperty;
-        }
-        for (int i = 0; i < 16; ++i) {
-            const bool allowed = m_memberInfo->possibleFlags & (1 << i);
-            if (!allowed)
-                m_memberInfo->requestedFlags &= ~(1 << i); // clear bit
-        }
-        update();
-        return true;
-    }
-
-    Qt::ItemFlags flags(int column) const override
-    {
-        if (column == NameColumn)
-            return Qt::ItemIsEnabled;
-        if (column < 1 || column > static_cast<int>(std::size(ColumnFlag)))
-            return {};
-        if (m_memberInfo->possibleFlags & ColumnFlag[column])
-            return Qt::ItemIsEnabled | Qt::ItemIsUserCheckable;
-        return {};
-    }
-
-    MemberInfo *const m_memberInfo;
-};
-
-class GenerateGettersSettersDialog : public QDialog
-{
-    static constexpr CandidateTreeItem::Column CheckBoxColumn[4]
-        = {CandidateTreeItem::Column::GetterColumn,
-           CandidateTreeItem::Column::SetterColumn,
-           CandidateTreeItem::Column::SignalColumn,
-           CandidateTreeItem::Column::QPropertyColumn};
-
-public:
-    GenerateGettersSettersDialog(const GetterSetterCandidates &candidates)
-        : QDialog()
-        , m_candidates(candidates)
-    {
-        using Flags = GenerateGetterSetterOp::GenerateFlag;
-        setWindowTitle(Tr::tr("Getters and Setters"));
-        const auto model = new TreeModel<TreeItem, CandidateTreeItem>(this);
-        model->setHeader(QStringList({
-            Tr::tr("Member"),
-            Tr::tr("Getter"),
-            Tr::tr("Setter"),
-            Tr::tr("Signal"),
-            Tr::tr("Reset"),
-            Tr::tr("QProperty"),
-            Tr::tr("Constant QProperty"),
-        }));
-        for (MemberInfo &candidate : m_candidates)
-            model->rootItem()->appendChild(new CandidateTreeItem(&candidate));
-        const auto view = new BaseTreeView(this);
-        view->setModel(model);
-        int optimalWidth = 0;
-        for (int i = 0; i < model->columnCount(QModelIndex{}); ++i) {
-            view->resizeColumnToContents(i);
-            optimalWidth += view->columnWidth(i);
-        }
-
-        const auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-        connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
-        connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
-
-        const auto setCheckStateForAll = [model](int column, int checkState) {
-            for (int i = 0; i < model->rowCount(); ++i)
-                model->setData(model->index(i, column), checkState, Qt::CheckStateRole);
-        };
-        const auto preventPartiallyChecked = [](QCheckBox *checkbox) {
-            if (checkbox->checkState() == Qt::PartiallyChecked)
-                checkbox->setCheckState(Qt::Checked);
-        };
-        using Column = CandidateTreeItem::Column;
-        const auto createConnections = [this, setCheckStateForAll, preventPartiallyChecked](
-                                           QCheckBox *checkbox, Column column) {
-            connect(checkbox, &QCheckBox::stateChanged, this, [setCheckStateForAll, column](int state) {
-                if (state != Qt::PartiallyChecked)
-                    setCheckStateForAll(column, state);
-            });
-            connect(checkbox, &QCheckBox::clicked, this, [checkbox, preventPartiallyChecked] {
-                preventPartiallyChecked(checkbox);
-            });
-        };
-        std::array<QCheckBox *, 4> checkBoxes = {};
-
-        static_assert(std::size(CheckBoxColumn) == checkBoxes.size(),
-                      "Must contain the same number of elements");
-        for (std::size_t i = 0; i < checkBoxes.size(); ++i) {
-            if (Utils::anyOf(candidates, [i](const MemberInfo &mi) {
-                    return mi.possibleFlags & CandidateTreeItem::ColumnFlag[CheckBoxColumn[i]];
-                })) {
-                const Column column = CheckBoxColumn[i];
-                if (column == Column::GetterColumn)
-                    checkBoxes[i] = new QCheckBox(Tr::tr("Create getters for all members"));
-                else if (column == Column::SetterColumn)
-                    checkBoxes[i] = new QCheckBox(Tr::tr("Create setters for all members"));
-                else if (column == Column::SignalColumn)
-                    checkBoxes[i] = new QCheckBox(Tr::tr("Create signals for all members"));
-                else if (column == Column::QPropertyColumn)
-                    checkBoxes[i] = new QCheckBox(Tr::tr("Create Q_PROPERTY for all members"));
-
-                createConnections(checkBoxes[i], column);
-            }
-        }
-        connect(model, &QAbstractItemModel::dataChanged, this, [this, checkBoxes] {
-            const auto countExisting = [this](Flags flag) {
-                return Utils::count(m_candidates, [flag](const MemberInfo &mi) {
-                    return !(mi.possibleFlags & flag);
-                });
-            };
-            const auto countRequested = [this](Flags flag) {
-                return Utils::count(m_candidates, [flag](const MemberInfo &mi) {
-                    return mi.requestedFlags & flag;
-                });
-            };
-            const auto countToState = [this](int requestedCount, int alreadyExistsCount) {
-                if (requestedCount == 0)
-                    return Qt::Unchecked;
-                if (int(m_candidates.size()) - requestedCount == alreadyExistsCount)
-                    return Qt::Checked;
-                return Qt::PartiallyChecked;
-            };
-            for (std::size_t i = 0; i < checkBoxes.size(); ++i) {
-                if (checkBoxes[i]) {
-                    const Flags flag = CandidateTreeItem::ColumnFlag[CheckBoxColumn[i]];
-                    checkBoxes[i]->setCheckState(
-                        countToState(countRequested(flag), countExisting(flag)));
-                }
-            }
-        });
-
-        const auto mainLayout = new QVBoxLayout(this);
-        mainLayout->addWidget(new QLabel(Tr::tr("Select the getters and setters "
-                                                "to be created.")));
-        for (auto checkBox : checkBoxes) {
-            if (checkBox)
-                mainLayout->addWidget(checkBox);
-        }
-        mainLayout->addWidget(view);
-        mainLayout->addWidget(buttonBox);
-        int left, right;
-        mainLayout->getContentsMargins(&left, nullptr, &right, nullptr);
-        optimalWidth += left + right;
-        resize(optimalWidth, mainLayout->sizeHint().height());
-    }
-
-    GetterSetterCandidates candidates() const { return m_candidates; }
-
-private:
-    GetterSetterCandidates m_candidates;
-};
-
-class GenerateGettersSettersOperation : public CppQuickFixOperation
-{
-public:
-    GenerateGettersSettersOperation(const CppQuickFixInterface &interface)
-        : CppQuickFixOperation(interface)
-    {
-        setDescription(Tr::tr("Create Getter and Setter Member Functions"));
-
-        m_classAST = astForClassOperations(interface);
-        if (!m_classAST)
-            return;
-        Class * const theClass = m_classAST->symbol;
-        if (!theClass)
-            return;
-
-        // Go through all data members and try to find out whether they have getters and/or setters.
-        QList<Symbol *> dataMembers;
-        QList<Symbol *> memberFunctions;
-        for (auto it = theClass->memberBegin(); it != theClass->memberEnd(); ++it) {
-            Symbol *const s = *it;
-            if (!s->identifier() || !s->type() || s->type().isTypedef())
-                continue;
-            if ((s->asDeclaration() && s->type()->asFunctionType()) || s->asFunction())
-                memberFunctions << s;
-            else if (s->asDeclaration() && (s->isPrivate() || s->isProtected()))
-                dataMembers << s;
-        }
-
-        auto file = interface.currentFile();
-        QStringList qPropertyNames; // name after MEMBER or name of the property
-        for (auto it = m_classAST->member_specifier_list; it; it = it->next) {
-            if (it->value->asQtPropertyDeclaration()) {
-                auto propDecl = it->value->asQtPropertyDeclaration();
-                // iterator over 'READ ...', ... and check if we have a MEMBER
-                for (auto p = propDecl->property_declaration_item_list; p; p = p->next) {
-                    const char *tokenString = file->tokenAt(p->value->item_name_token).spell();
-                    if (!qstrcmp(tokenString, "MEMBER"))
-                        qPropertyNames << file->textOf(p->value->expression);
-                }
-                // no MEMBER, but maybe the property name is the same
-                qPropertyNames << file->textOf(propDecl->property_name);
-            }
-        }
-        const QStringList memberFunctionsAsStrings = toStringList(memberFunctions);
-
-        for (Symbol *const member : std::as_const(dataMembers)) {
-            ExistingGetterSetterData existing;
-            existing.memberVariableName = QString::fromUtf8(member->identifier()->chars(),
-                                                            member->identifier()->size());
-            existing.declarationSymbol = member->asDeclaration();
-            existing.clazz = theClass;
-
-            // check if a Q_PROPERTY exist
-            const QString baseName = memberBaseName(existing.memberVariableName);
-            if (qPropertyNames.contains(baseName)
-                || qPropertyNames.contains(existing.memberVariableName))
-                continue;
-
-            findExistingFunctions(existing, memberFunctionsAsStrings);
-            existing.qPropertyName = baseName;
-
-            int possibleFlags = existing.computePossibleFlags();
-            if (possibleFlags == 0)
-                continue;
-            m_candidates.emplace_back(existing, possibleFlags);
-        }
-    }
-
-    GetterSetterCandidates candidates() const { return m_candidates; }
-    bool isApplicable() const { return !m_candidates.empty(); }
-
-    void setGetterSetterData(const GetterSetterCandidates &data)
-    {
-        m_candidates = data;
-        m_hasData = true;
-    }
-
-private:
-    void perform() override
-    {
-        if (!m_hasData) {
-            GenerateGettersSettersDialog dlg(m_candidates);
-            if (dlg.exec() == QDialog::Rejected)
-                return;
-            m_candidates = dlg.candidates();
-        }
-        if (m_candidates.empty())
-            return;
-        GetterSetterRefactoringHelper helper(this,
-                                             currentFile()->filePath(),
-                                             m_candidates.front().data.clazz);
-        for (MemberInfo &mi : m_candidates) {
-            if (mi.requestedFlags != 0) {
-                helper.performGeneration(mi.data, mi.requestedFlags);
-            }
-        }
-        helper.applyChanges();
-    }
-
-    GetterSetterCandidates m_candidates;
-    const ClassSpecifierAST *m_classAST = nullptr;
-    bool m_hasData = false;
-};
-
-void GenerateGettersSettersForClass::doMatch(const CppQuickFixInterface &interface,
-                                             QuickFixOperations &result)
-{
-    const auto op = QSharedPointer<GenerateGettersSettersOperation>::create(interface);
-    if (!op->isApplicable())
-        return;
-    if (m_test) {
-        GetterSetterCandidates candidates = op->candidates();
-        for (MemberInfo &mi : candidates) {
-            mi.requestedFlags = mi.possibleFlags;
-            using Flag = GenerateGetterSetterOp::GenerateFlag;
-            mi.requestedFlags &= ~Flag::GenerateConstantProperty;
-        }
-        op->setGetterSetterData(candidates);
-    }
-    result << op;
-}
-
-
-namespace {
-
-class ExtractFunctionOptions
-{
-public:
-    static bool isValidFunctionName(const QString &name)
-    {
-        return !name.isEmpty() && isValidIdentifier(name);
-    }
-
-    bool hasValidFunctionName() const
-    {
-        return isValidFunctionName(funcName);
-    }
-
-    QString funcName;
-    InsertionPointLocator::AccessSpec access = InsertionPointLocator::Public;
-};
-
-class ExtractFunctionOperation : public CppQuickFixOperation
-{
-public:
-    ExtractFunctionOperation(const CppQuickFixInterface &interface,
-                    int extractionStart,
-                    int extractionEnd,
-                    FunctionDefinitionAST *refFuncDef,
-                    Symbol *funcReturn,
-                    QList<QPair<QString, QString> > relevantDecls,
-                    ExtractFunction::FunctionNameGetter functionNameGetter
-                             = ExtractFunction::FunctionNameGetter())
-        : CppQuickFixOperation(interface)
-        , m_extractionStart(extractionStart)
-        , m_extractionEnd(extractionEnd)
-        , m_refFuncDef(refFuncDef)
-        , m_funcReturn(funcReturn)
-        , m_relevantDecls(relevantDecls)
-        , m_functionNameGetter(functionNameGetter)
-    {
-        setDescription(Tr::tr("Extract Function"));
-    }
-
-    void perform() override
-    {
-        QTC_ASSERT(!m_funcReturn || !m_relevantDecls.isEmpty(), return);
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-
-        ExtractFunctionOptions options;
-        if (m_functionNameGetter)
-            options.funcName = m_functionNameGetter();
-        else
-            options = getOptions();
-
-        if (!options.hasValidFunctionName())
-            return;
-        const QString &funcName = options.funcName;
-
-        Function *refFunc = m_refFuncDef->symbol;
-
-        // We don't need to rewrite the type for declarations made inside the reference function,
-        // since their scope will remain the same. Then we preserve the original spelling style.
-        // However, we must do so for the return type in the definition.
-        SubstitutionEnvironment env;
-        env.setContext(context());
-        env.switchScope(refFunc);
-        ClassOrNamespace *targetCoN = context().lookupType(refFunc->enclosingScope());
-        if (!targetCoN)
-            targetCoN = context().globalNamespace();
-        UseMinimalNames subs(targetCoN);
-        env.enter(&subs);
-
-        Overview printer = CppCodeStyleSettings::currentProjectCodeStyleOverview();
-        Control *control = context().bindings()->control().get();
-        QString funcDef;
-        QString funcDecl; // We generate a declaration only in the case of a member function.
-        QString funcCall;
-
-        Class *matchingClass = isMemberFunction(context(), refFunc);
-
-        // Write return type.
-        if (!m_funcReturn) {
-            funcDef.append(QLatin1String("void "));
-            if (matchingClass)
-                funcDecl.append(QLatin1String("void "));
-        } else {
-            const FullySpecifiedType &fullType = rewriteType(m_funcReturn->type(), &env, control);
-            funcDef.append(printer.prettyType(fullType) + QLatin1Char(' '));
-            funcDecl.append(printer.prettyType(m_funcReturn->type()) + QLatin1Char(' '));
-        }
-
-        // Write class qualification, if any.
-        if (matchingClass) {
-            const Scope *current = matchingClass;
-            QVector<const Name *> classes{matchingClass->name()};
-            while (current->enclosingScope()->asClass()) {
-                current = current->enclosingScope()->asClass();
-                classes.prepend(current->name());
-            }
-            while (current->enclosingScope() && current->enclosingScope()->asNamespace()) {
-                current = current->enclosingScope()->asNamespace();
-                if (current->name())
-                    classes.prepend(current->name());
-            }
-            for (const Name *n : classes) {
-                const Name *name = rewriteName(n, &env, control);
-                funcDef.append(printer.prettyName(name));
-                funcDef.append(QLatin1String("::"));
-            }
-        }
-
-        // Write the extracted function itself and its call.
-        funcDef.append(funcName);
-        if (matchingClass)
-            funcDecl.append(funcName);
-        funcCall.append(funcName);
-        funcDef.append(QLatin1Char('('));
-        if (matchingClass)
-            funcDecl.append(QLatin1Char('('));
-        funcCall.append(QLatin1Char('('));
-        for (int i = m_funcReturn ? 1 : 0; i < m_relevantDecls.length(); ++i) {
-            QPair<QString, QString> p = m_relevantDecls.at(i);
-            funcCall.append(p.first);
-            funcDef.append(p.second);
-            if (matchingClass)
-                funcDecl.append(p.second);
-            if (i < m_relevantDecls.length() - 1) {
-                funcCall.append(QLatin1String(", "));
-                funcDef.append(QLatin1String(", "));
-                if (matchingClass)
-                    funcDecl.append(QLatin1String(", "));
-            }
-        }
-        funcDef.append(QLatin1Char(')'));
-        if (matchingClass)
-            funcDecl.append(QLatin1Char(')'));
-        funcCall.append(QLatin1Char(')'));
-        if (refFunc->isConst()) {
-            funcDef.append(QLatin1String(" const"));
-            funcDecl.append(QLatin1String(" const"));
-        }
-        funcDef.append(QLatin1String("\n{\n"));
-        QString extract = currentFile->textOf(m_extractionStart, m_extractionEnd);
-        extract.replace(QChar::ParagraphSeparator, QLatin1String("\n"));
-        if (!extract.endsWith(QLatin1Char('\n')) && m_funcReturn)
-            extract.append(QLatin1Char('\n'));
-        funcDef.append(extract);
-        if (matchingClass)
-            funcDecl.append(QLatin1String(";\n"));
-        if (m_funcReturn) {
-            funcDef.append(QLatin1String("\nreturn ")
-                        + m_relevantDecls.at(0).first
-                        + QLatin1Char(';'));
-            funcCall.prepend(m_relevantDecls.at(0).second + QLatin1String(" = "));
-        }
-        funcDef.append(QLatin1String("\n}\n\n"));
-        funcDef.replace(QChar::ParagraphSeparator, QLatin1String("\n"));
-        funcDef.prepend(inlinePrefix(currentFile->filePath()));
-        funcCall.append(QLatin1Char(';'));
-
-        // Do not insert right between the function and an associated comment.
-        int position = currentFile->startOf(m_refFuncDef);
-        const QList<Token> functionDoc = commentsForDeclaration(
-            m_refFuncDef->symbol, m_refFuncDef, *currentFile->document(),
-            currentFile->cppDocument());
-        if (!functionDoc.isEmpty()) {
-            position = currentFile->cppDocument()->translationUnit()->getTokenPositionInDocument(
-                functionDoc.first(), currentFile->document());
-        }
-
-        ChangeSet change;
-        change.insert(position, funcDef);
-        change.replace(m_extractionStart, m_extractionEnd, funcCall);
-        currentFile->setChangeSet(change);
-        currentFile->apply();
-
-        // Write declaration, if necessary.
-        if (matchingClass) {
-            InsertionPointLocator locator(refactoring);
-            const FilePath filePath = FilePath::fromUtf8(matchingClass->fileName());
-            const InsertionLocation &location =
-                    locator.methodDeclarationInClass(filePath, matchingClass, options.access);
-            CppRefactoringFilePtr declFile = refactoring.cppFile(filePath);
-            change.clear();
-            position = declFile->position(location.line(), location.column());
-            change.insert(position, location.prefix() + funcDecl + location.suffix());
-            declFile->setChangeSet(change);
-            declFile->apply();
-        }
-    }
-
-    ExtractFunctionOptions getOptions() const
-    {
-        QDialog dlg(Core::ICore::dialogParent());
-        dlg.setWindowTitle(Tr::tr("Extract Function Refactoring"));
-        auto layout = new QFormLayout(&dlg);
-
-        auto funcNameEdit = new FancyLineEdit;
-        funcNameEdit->setValidationFunction([](FancyLineEdit *edit, QString *) {
-            return ExtractFunctionOptions::isValidFunctionName(edit->text());
-        });
-        layout->addRow(Tr::tr("Function name"), funcNameEdit);
-
-        auto accessCombo = new QComboBox;
-        accessCombo->addItem(
-                    InsertionPointLocator::accessSpecToString(InsertionPointLocator::Public),
-                    InsertionPointLocator::Public);
-        accessCombo->addItem(
-                    InsertionPointLocator::accessSpecToString(InsertionPointLocator::PublicSlot),
-                    InsertionPointLocator::PublicSlot);
-        accessCombo->addItem(
-                    InsertionPointLocator::accessSpecToString(InsertionPointLocator::Protected),
-                    InsertionPointLocator::Protected);
-        accessCombo->addItem(
-                    InsertionPointLocator::accessSpecToString(InsertionPointLocator::ProtectedSlot),
-                    InsertionPointLocator::ProtectedSlot);
-        accessCombo->addItem(
-                    InsertionPointLocator::accessSpecToString(InsertionPointLocator::Private),
-                    InsertionPointLocator::Private);
-        accessCombo->addItem(
-                    InsertionPointLocator::accessSpecToString(InsertionPointLocator::PrivateSlot),
-                    InsertionPointLocator::PrivateSlot);
-        layout->addRow(Tr::tr("Access"), accessCombo);
-
-        auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-        QObject::connect(buttonBox, &QDialogButtonBox::accepted, &dlg, &QDialog::accept);
-        QObject::connect(buttonBox, &QDialogButtonBox::rejected, &dlg, &QDialog::reject);
-        QPushButton *ok = buttonBox->button(QDialogButtonBox::Ok);
-        ok->setEnabled(false);
-        QObject::connect(funcNameEdit, &Utils::FancyLineEdit::validChanged,
-                         ok, &QPushButton::setEnabled);
-        layout->addWidget(buttonBox);
-
-        if (dlg.exec() == QDialog::Accepted) {
-            ExtractFunctionOptions options;
-            options.funcName = funcNameEdit->text();
-            options.access = static_cast<InsertionPointLocator::AccessSpec>(accessCombo->
-                                                                           currentData().toInt());
-            return options;
-        }
-        return ExtractFunctionOptions();
-    }
-
-    int m_extractionStart;
-    int m_extractionEnd;
-    FunctionDefinitionAST *m_refFuncDef;
-    Symbol *m_funcReturn;
-    QList<QPair<QString, QString> > m_relevantDecls;
-    ExtractFunction::FunctionNameGetter m_functionNameGetter;
-};
-
-QPair<QString, QString> assembleDeclarationData(const QString &specifiers, DeclaratorAST *decltr,
-                                                const CppRefactoringFilePtr &file,
-                                                const Overview &printer)
-{
-    QTC_ASSERT(decltr, return (QPair<QString, QString>()));
-    if (decltr->core_declarator
-            && decltr->core_declarator->asDeclaratorId()
-            && decltr->core_declarator->asDeclaratorId()->name) {
-        QString decltrText = file->textOf(file->startOf(decltr),
-                                          file->endOf(decltr->core_declarator));
-        if (!decltrText.isEmpty()) {
-            const QString &name = printer.prettyName(
-                    decltr->core_declarator->asDeclaratorId()->name->name);
-            QString completeDecl = specifiers;
-            if (!decltrText.contains(QLatin1Char(' ')))
-                completeDecl.append(QLatin1Char(' ') + decltrText);
-            else
-                completeDecl.append(decltrText);
-            return {name, completeDecl};
-        }
-    }
-    return QPair<QString, QString>();
-}
-
-class FunctionExtractionAnalyser : public ASTVisitor
-{
-public:
-    FunctionExtractionAnalyser(TranslationUnit *unit,
-                               const int selStart,
-                               const int selEnd,
-                               const CppRefactoringFilePtr &file,
-                               const Overview &printer)
-        : ASTVisitor(unit)
-        , m_done(false)
-        , m_failed(false)
-        , m_selStart(selStart)
-        , m_selEnd(selEnd)
-        , m_extractionStart(0)
-        , m_extractionEnd(0)
-        , m_file(file)
-        , m_printer(printer)
-    {}
-
-    bool operator()(FunctionDefinitionAST *refFunDef)
-    {
-        accept(refFunDef);
-
-        if (!m_failed && m_extractionStart == m_extractionEnd)
-            m_failed = true;
-
-        return !m_failed;
-    }
-
-    bool preVisit(AST *) override
-    {
-        return !m_done;
-    }
-
-    void statement(StatementAST *stmt)
-    {
-        if (!stmt)
-            return;
-
-        const int stmtStart = m_file->startOf(stmt);
-        const int stmtEnd = m_file->endOf(stmt);
-
-        if (stmtStart >= m_selEnd
-                || (m_extractionStart && stmtEnd > m_selEnd)) {
-            m_done = true;
-            return;
-        }
-
-        if (stmtStart >= m_selStart && !m_extractionStart)
-            m_extractionStart = stmtStart;
-        if (stmtEnd > m_extractionEnd && m_extractionStart)
-            m_extractionEnd = stmtEnd;
-
-        accept(stmt);
-    }
-
-    bool visit(CaseStatementAST *stmt) override
-    {
-        statement(stmt->statement);
-        return false;
-    }
-
-    bool visit(CompoundStatementAST *stmt) override
-    {
-        for (StatementListAST *it = stmt->statement_list; it; it = it->next) {
-            statement(it->value);
-            if (m_done)
-                break;
-        }
-        return false;
-    }
-
-    bool visit(DoStatementAST *stmt) override
-    {
-        statement(stmt->statement);
-        return false;
-    }
-
-    bool visit(ForeachStatementAST *stmt) override
-    {
-        statement(stmt->statement);
-        return false;
-    }
-
-    bool visit(RangeBasedForStatementAST *stmt) override
-    {
-        statement(stmt->statement);
-        return false;
-    }
-
-    bool visit(ForStatementAST *stmt) override
-    {
-        statement(stmt->initializer);
-        if (!m_done)
-            statement(stmt->statement);
-        return false;
-    }
-
-    bool visit(IfStatementAST *stmt) override
-    {
-        statement(stmt->statement);
-        if (!m_done)
-            statement(stmt->else_statement);
-        return false;
-    }
-
-    bool visit(TryBlockStatementAST *stmt) override
-    {
-        statement(stmt->statement);
-        for (CatchClauseListAST *it = stmt->catch_clause_list; it; it = it->next) {
-            statement(it->value);
-            if (m_done)
-                break;
-        }
-        return false;
-    }
-
-    bool visit(WhileStatementAST *stmt) override
-    {
-        statement(stmt->statement);
-        return false;
-    }
-
-    bool visit(DeclarationStatementAST *declStmt) override
-    {
-        // We need to collect the declarations we see before the extraction or even inside it.
-        // They might need to be used as either a parameter or return value. Actually, we could
-        // still obtain their types from the local uses, but it's good to preserve the original
-        // typing style.
-        if (declStmt
-                && declStmt->declaration
-                && declStmt->declaration->asSimpleDeclaration()) {
-            SimpleDeclarationAST *simpleDecl = declStmt->declaration->asSimpleDeclaration();
-            if (simpleDecl->decl_specifier_list
-                    && simpleDecl->declarator_list) {
-                const QString &specifiers =
-                        m_file->textOf(m_file->startOf(simpleDecl),
-                                     m_file->endOf(simpleDecl->decl_specifier_list->lastValue()));
-                for (DeclaratorListAST *decltrList = simpleDecl->declarator_list;
-                     decltrList;
-                     decltrList = decltrList->next) {
-                    const QPair<QString, QString> p =
-                        assembleDeclarationData(specifiers, decltrList->value, m_file, m_printer);
-                    if (!p.first.isEmpty())
-                        m_knownDecls.insert(p.first, p.second);
-                }
-            }
-        }
-
-        return false;
-    }
-
-    bool visit(ReturnStatementAST *) override
-    {
-        if (m_extractionStart) {
-            m_done = true;
-            m_failed = true;
-        }
-
-        return false;
-    }
-
-    bool m_done;
-    bool m_failed;
-    const int m_selStart;
-    const int m_selEnd;
-    int m_extractionStart;
-    int m_extractionEnd;
-    QHash<QString, QString> m_knownDecls;
-    CppRefactoringFilePtr m_file;
-    const Overview &m_printer;
-};
-
-} // anonymous namespace
-
-ExtractFunction::ExtractFunction(FunctionNameGetter functionNameGetter)
-    : m_functionNameGetter(functionNameGetter)
-{
-}
-
-void ExtractFunction::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    const CppRefactoringFilePtr file = interface.currentFile();
-
-    // TODO: Fix upstream and uncomment; see QTCREATORBUG-28030.
-//    if (CppModelManager::usesClangd(file->editor()->textDocument())
-//            && file->cppDocument()->languageFeatures().cxxEnabled) {
-//        return;
-//    }
-
-    QTextCursor cursor = file->cursor();
-    if (!cursor.hasSelection())
-        return;
-
-    const QList<AST *> &path = interface.path();
-    FunctionDefinitionAST *refFuncDef = nullptr; // The "reference" function, which we will extract from.
-    for (int i = path.size() - 1; i >= 0; --i) {
-        refFuncDef = path.at(i)->asFunctionDefinition();
-        if (refFuncDef)
-            break;
-    }
-
-    if (!refFuncDef
-            || !refFuncDef->function_body
-            || !refFuncDef->function_body->asCompoundStatement()
-            || !refFuncDef->function_body->asCompoundStatement()->statement_list
-            || !refFuncDef->symbol
-            || !refFuncDef->symbol->name()
-            || refFuncDef->symbol->enclosingScope()->asTemplate() /* TODO: Templates... */) {
-        return;
-    }
-
-    // Adjust selection ends.
-    int selStart = cursor.selectionStart();
-    int selEnd = cursor.selectionEnd();
-    if (selStart > selEnd)
-        std::swap(selStart, selEnd);
-
-    Overview printer;
-
-    // Analyze the content to be extracted, which consists of determining the statements
-    // which are complete and collecting the declarations seen.
-    FunctionExtractionAnalyser analyser(interface.semanticInfo().doc->translationUnit(),
-                                        selStart, selEnd,
-                                        file,
-                                        printer);
-    if (!analyser(refFuncDef))
-        return;
-
-    // We also need to collect the declarations of the parameters from the reference function.
-    QSet<QString> refFuncParams;
-    if (refFuncDef->declarator->postfix_declarator_list
-            && refFuncDef->declarator->postfix_declarator_list->value
-            && refFuncDef->declarator->postfix_declarator_list->value->asFunctionDeclarator()) {
-        FunctionDeclaratorAST *funcDecltr =
-            refFuncDef->declarator->postfix_declarator_list->value->asFunctionDeclarator();
-        if (funcDecltr->parameter_declaration_clause
-                && funcDecltr->parameter_declaration_clause->parameter_declaration_list) {
-            for (ParameterDeclarationListAST *it =
-                    funcDecltr->parameter_declaration_clause->parameter_declaration_list;
-                 it;
-                 it = it->next) {
-                ParameterDeclarationAST *paramDecl = it->value->asParameterDeclaration();
-                if (paramDecl->declarator) {
-                    const QString &specifiers =
-                            file->textOf(file->startOf(paramDecl),
-                                         file->endOf(paramDecl->type_specifier_list->lastValue()));
-                    const QPair<QString, QString> &p =
-                            assembleDeclarationData(specifiers, paramDecl->declarator,
-                                                    file, printer);
-                    if (!p.first.isEmpty()) {
-                        analyser.m_knownDecls.insert(p.first, p.second);
-                        refFuncParams.insert(p.first);
-                    }
-                }
-            }
-        }
-    }
-
-    // Identify what would be parameters for the new function and its return value, if any.
-    Symbol *funcReturn = nullptr;
-    QList<QPair<QString, QString> > relevantDecls;
-    const SemanticInfo::LocalUseMap localUses = interface.semanticInfo().localUses;
-    for (auto it = localUses.cbegin(), end = localUses.cend(); it != end; ++it) {
-        bool usedBeforeExtraction = false;
-        bool usedAfterExtraction = false;
-        bool usedInsideExtraction = false;
-        const QList<SemanticInfo::Use> &uses = it.value();
-        for (const SemanticInfo::Use &use : uses) {
-            if (use.isInvalid())
-                continue;
-
-            const int position = file->position(use.line, use.column);
-            if (position < analyser.m_extractionStart)
-                usedBeforeExtraction = true;
-            else if (position >= analyser.m_extractionEnd)
-                usedAfterExtraction = true;
-            else
-                usedInsideExtraction = true;
-        }
-
-        const QString &name = printer.prettyName(it.key()->name());
-
-        if ((usedBeforeExtraction && usedInsideExtraction)
-                || (usedInsideExtraction && refFuncParams.contains(name))) {
-            QTC_ASSERT(analyser.m_knownDecls.contains(name), return);
-            relevantDecls.push_back({name, analyser.m_knownDecls.value(name)});
-        }
-
-        // We assume that the first use of a local corresponds to its declaration.
-        if (usedInsideExtraction && usedAfterExtraction && !usedBeforeExtraction) {
-            if (!funcReturn) {
-                QTC_ASSERT(analyser.m_knownDecls.contains(name), return);
-                // The return, if any, is stored as the first item in the list.
-                relevantDecls.push_front({name, analyser.m_knownDecls.value(name)});
-                funcReturn = it.key();
-            } else {
-                // Would require multiple returns. (Unless we do fancy things, as pointed below.)
-                return;
-            }
-        }
-    }
-
-    // The current implementation doesn't try to be too smart since it preserves the original form
-    // of the declarations. This might be or not the desired effect. An improvement would be to
-    // let the user somehow customize the function interface.
-    result << new ExtractFunctionOperation(interface,
-                                           analyser.m_extractionStart,
-                                           analyser.m_extractionEnd,
-                                           refFuncDef, funcReturn, relevantDecls,
-                                           m_functionNameGetter);
-}
-
-namespace {
-
-struct ReplaceLiteralsResult
-{
-    Token token;
-    QString literalText;
-};
-
-template <class T>
-class ReplaceLiterals : private ASTVisitor
-{
-public:
-    ReplaceLiterals(const CppRefactoringFilePtr &file, ChangeSet *changes, T *literal)
-        : ASTVisitor(file->cppDocument()->translationUnit()), m_file(file), m_changes(changes),
-          m_literal(literal)
-    {
-        m_result.token = m_file->tokenAt(literal->firstToken());
-        m_literalTokenText = m_result.token.spell();
-        m_result.literalText = QLatin1String(m_literalTokenText);
-        if (m_result.token.isCharLiteral()) {
-            m_result.literalText.prepend(QLatin1Char('\''));
-            m_result.literalText.append(QLatin1Char('\''));
-            if (m_result.token.kind() == T_WIDE_CHAR_LITERAL)
-                m_result.literalText.prepend(QLatin1Char('L'));
-            else if (m_result.token.kind() == T_UTF16_CHAR_LITERAL)
-                m_result.literalText.prepend(QLatin1Char('u'));
-            else if (m_result.token.kind() == T_UTF32_CHAR_LITERAL)
-                m_result.literalText.prepend(QLatin1Char('U'));
-        } else if (m_result.token.isStringLiteral()) {
-            m_result.literalText.prepend(QLatin1Char('"'));
-            m_result.literalText.append(QLatin1Char('"'));
-            if (m_result.token.kind() == T_WIDE_STRING_LITERAL)
-                m_result.literalText.prepend(QLatin1Char('L'));
-            else if (m_result.token.kind() == T_UTF16_STRING_LITERAL)
-                m_result.literalText.prepend(QLatin1Char('u'));
-            else if (m_result.token.kind() == T_UTF32_STRING_LITERAL)
-                m_result.literalText.prepend(QLatin1Char('U'));
-        }
-    }
-
-    ReplaceLiteralsResult apply(AST *ast)
-    {
-        ast->accept(this);
-        return m_result;
-    }
-
-private:
-    bool visit(T *ast) override
-    {
-        if (ast != m_literal
-                && strcmp(m_file->tokenAt(ast->firstToken()).spell(), m_literalTokenText) != 0) {
-            return true;
-        }
-        int start, end;
-        m_file->startAndEndOf(ast->firstToken(), &start, &end);
-        m_changes->replace(start, end, QLatin1String("newParameter"));
-        return true;
-    }
-
-    const CppRefactoringFilePtr &m_file;
-    ChangeSet *m_changes;
-    T *m_literal;
-    const char *m_literalTokenText;
-    ReplaceLiteralsResult m_result;
-};
-
-class ExtractLiteralAsParameterOp : public CppQuickFixOperation
-{
-public:
-    ExtractLiteralAsParameterOp(const CppQuickFixInterface &interface, int priority,
-                                ExpressionAST *literal, FunctionDefinitionAST *function)
-        : CppQuickFixOperation(interface, priority),
-          m_literal(literal),
-          m_functionDefinition(function)
-    {
-        setDescription(Tr::tr("Extract Constant as Function Parameter"));
-    }
-
-    struct FoundDeclaration
-    {
-        FunctionDeclaratorAST *ast = nullptr;
-        CppRefactoringFilePtr file;
-    };
-
-    FoundDeclaration findDeclaration(const CppRefactoringChanges &refactoring,
-                                     FunctionDefinitionAST *ast)
-    {
-        FoundDeclaration result;
-        Function *func = ast->symbol;
-        if (Class *matchingClass = isMemberFunction(context(), func)) {
-            // Dealing with member functions
-            const QualifiedNameId *qName = func->name()->asQualifiedNameId();
-            for (Symbol *s = matchingClass->find(qName->identifier()); s; s = s->next()) {
-                if (!s->name()
-                        || !qName->identifier()->match(s->identifier())
-                        || !s->type()->asFunctionType()
-                        || !s->type().match(func->type())
-                        || s->asFunction()) {
-                    continue;
-                }
-
-                const FilePath declFilePath = matchingClass->filePath();
-                result.file = refactoring.cppFile(declFilePath);
-                ASTPath astPath(result.file->cppDocument());
-                const QList<AST *> path = astPath(s->line(), s->column());
-                SimpleDeclarationAST *simpleDecl = nullptr;
-                for (AST *node : path) {
-                    simpleDecl = node->asSimpleDeclaration();
-                    if (simpleDecl) {
-                        if (simpleDecl->symbols && !simpleDecl->symbols->next) {
-                            result.ast = functionDeclarator(simpleDecl);
-                            return result;
-                        }
-                    }
-                }
-
-                if (simpleDecl)
-                    break;
-            }
-        } else if (Namespace *matchingNamespace = isNamespaceFunction(context(), func)) {
-            // Dealing with free functions and inline member functions.
-            bool isHeaderFile;
-            FilePath declFilePath = correspondingHeaderOrSource(filePath(), &isHeaderFile);
-            if (!declFilePath.exists())
-                return FoundDeclaration();
-            result.file = refactoring.cppFile(declFilePath);
-            if (!result.file)
-                return FoundDeclaration();
-            const LookupContext lc(result.file->cppDocument(), snapshot());
-            const QList<LookupItem> candidates = lc.lookup(func->name(), matchingNamespace);
-            for (const LookupItem &candidate : candidates) {
-                if (Symbol *s = candidate.declaration()) {
-                    if (s->asDeclaration()) {
-                        ASTPath astPath(result.file->cppDocument());
-                        const QList<AST *> path = astPath(s->line(), s->column());
-                        for (AST *node : path) {
-                            SimpleDeclarationAST *simpleDecl = node->asSimpleDeclaration();
-                            if (simpleDecl) {
-                                result.ast = functionDeclarator(simpleDecl);
-                                return result;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    void perform() override
-    {
-        FunctionDeclaratorAST *functionDeclaratorOfDefinition
-                = functionDeclarator(m_functionDefinition);
-        const CppRefactoringChanges refactoring(snapshot());
-        const CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-        deduceTypeNameOfLiteral(currentFile->cppDocument());
-
-        ChangeSet changes;
-        if (NumericLiteralAST *concreteLiteral = m_literal->asNumericLiteral()) {
-            m_literalInfo = ReplaceLiterals<NumericLiteralAST>(currentFile, &changes,
-                                                               concreteLiteral)
-                    .apply(m_functionDefinition->function_body);
-        } else if (StringLiteralAST *concreteLiteral = m_literal->asStringLiteral()) {
-            m_literalInfo = ReplaceLiterals<StringLiteralAST>(currentFile, &changes,
-                                                              concreteLiteral)
-                    .apply(m_functionDefinition->function_body);
-        } else if (BoolLiteralAST *concreteLiteral = m_literal->asBoolLiteral()) {
-            m_literalInfo = ReplaceLiterals<BoolLiteralAST>(currentFile, &changes,
-                                                            concreteLiteral)
-                    .apply(m_functionDefinition->function_body);
-        }
-        const FoundDeclaration functionDeclaration
-                = findDeclaration(refactoring, m_functionDefinition);
-        appendFunctionParameter(functionDeclaratorOfDefinition, currentFile, &changes,
-                !functionDeclaration.ast);
-        if (functionDeclaration.ast) {
-            if (currentFile->filePath() != functionDeclaration.file->filePath()) {
-                ChangeSet declChanges;
-                appendFunctionParameter(functionDeclaration.ast, functionDeclaration.file, &declChanges,
-                                        true);
-                functionDeclaration.file->setChangeSet(declChanges);
-                functionDeclaration.file->apply();
-            } else {
-                appendFunctionParameter(functionDeclaration.ast, currentFile, &changes,
-                                        true);
-            }
-        }
-        currentFile->setChangeSet(changes);
-        currentFile->apply();
-        QTextCursor c = currentFile->cursor();
-        c.setPosition(c.position() - parameterName().length());
-        editor()->setTextCursor(c);
-        editor()->renameSymbolUnderCursor();
-    }
-
-private:
-    bool hasParameters(FunctionDeclaratorAST *ast) const
-    {
-        return ast->parameter_declaration_clause
-                && ast->parameter_declaration_clause->parameter_declaration_list
-                && ast->parameter_declaration_clause->parameter_declaration_list->value;
-    }
-
-    void deduceTypeNameOfLiteral(const Document::Ptr &document)
-    {
-        TypeOfExpression typeOfExpression;
-        typeOfExpression.init(document, snapshot());
-        Overview overview;
-        Scope *scope = m_functionDefinition->symbol->enclosingScope();
-        const QList<LookupItem> items = typeOfExpression(m_literal, document, scope);
-        if (!items.isEmpty())
-            m_typeName = overview.prettyType(items.first().type());
-    }
-
-    static QString parameterName() { return QLatin1String("newParameter"); }
-
-    QString parameterDeclarationTextToInsert(FunctionDeclaratorAST *ast) const
-    {
-        QString str;
-        if (hasParameters(ast))
-            str = QLatin1String(", ");
-        str += m_typeName;
-        if (!m_typeName.endsWith(QLatin1Char('*')))
-                str += QLatin1Char(' ');
-        str += parameterName();
-        return str;
-    }
-
-    FunctionDeclaratorAST *functionDeclarator(SimpleDeclarationAST *ast) const
-    {
-        for (DeclaratorListAST *decls = ast->declarator_list; decls; decls = decls->next) {
-            FunctionDeclaratorAST * const functionDeclaratorAST = functionDeclarator(decls->value);
-            if (functionDeclaratorAST)
-                return functionDeclaratorAST;
-        }
-        return nullptr;
-    }
-
-    FunctionDeclaratorAST *functionDeclarator(DeclaratorAST *ast) const
-    {
-        for (PostfixDeclaratorListAST *pds = ast->postfix_declarator_list; pds; pds = pds->next) {
-            FunctionDeclaratorAST *funcdecl = pds->value->asFunctionDeclarator();
-            if (funcdecl)
-                return funcdecl;
-        }
-        return nullptr;
-    }
-
-    FunctionDeclaratorAST *functionDeclarator(FunctionDefinitionAST *ast) const
-    {
-        return functionDeclarator(ast->declarator);
-    }
-
-    void appendFunctionParameter(FunctionDeclaratorAST *ast, const CppRefactoringFileConstPtr &file,
-               ChangeSet *changes, bool addDefaultValue)
-    {
-        if (!ast)
-            return;
-        if (m_declarationInsertionString.isEmpty())
-            m_declarationInsertionString = parameterDeclarationTextToInsert(ast);
-        QString insertion = m_declarationInsertionString;
-        if (addDefaultValue)
-            insertion += QLatin1String(" = ") + m_literalInfo.literalText;
-        changes->insert(file->startOf(ast->rparen_token), insertion);
-    }
-
-    ExpressionAST *m_literal;
-    FunctionDefinitionAST *m_functionDefinition;
-    QString m_typeName;
-    QString m_declarationInsertionString;
-    ReplaceLiteralsResult m_literalInfo;
-};
-
-} // anonymous namespace
-
-void ExtractLiteralAsParameter::doMatch(const CppQuickFixInterface &interface,
-        QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-    if (path.count() < 2)
-        return;
-
-    AST * const lastAst = path.last();
-    ExpressionAST *literal;
-    if (!((literal = lastAst->asNumericLiteral())
-          || (literal = lastAst->asStringLiteral())
-          || (literal = lastAst->asBoolLiteral()))) {
-            return;
-    }
-
-    FunctionDefinitionAST *function;
-    int i = path.count() - 2;
-    while (!(function = path.at(i)->asFunctionDefinition())) {
-        // Ignore literals in lambda expressions for now.
-        if (path.at(i)->asLambdaExpression())
-            return;
-        if (--i < 0)
-            return;
-    }
-
-    PostfixDeclaratorListAST * const declaratorList = function->declarator->postfix_declarator_list;
-    if (!declaratorList)
-        return;
-    if (FunctionDeclaratorAST *declarator = declaratorList->value->asFunctionDeclarator()) {
-        if (declarator->parameter_declaration_clause
-                && declarator->parameter_declaration_clause->dot_dot_dot_token) {
-            // Do not handle functions with ellipsis parameter.
-            return;
-        }
-    }
-
-    const int priority = path.size() - 1;
-    result << new ExtractLiteralAsParameterOp(interface, priority, literal, function);
-}
-
-namespace {
-
-class ConvertFromAndToPointerOp : public CppQuickFixOperation
-{
-public:
-    enum Mode { FromPointer, FromVariable, FromReference };
-
-    ConvertFromAndToPointerOp(const CppQuickFixInterface &interface, int priority, Mode mode,
-                              bool isAutoDeclaration,
-                              const SimpleDeclarationAST *simpleDeclaration,
-                              const DeclaratorAST *declaratorAST,
-                              const SimpleNameAST *identifierAST,
-                              Symbol *symbol)
-        : CppQuickFixOperation(interface, priority)
-        , m_mode(mode)
-        , m_isAutoDeclaration(isAutoDeclaration)
-        , m_simpleDeclaration(simpleDeclaration)
-        , m_declaratorAST(declaratorAST)
-        , m_identifierAST(identifierAST)
-        , m_symbol(symbol)
-        , m_refactoring(snapshot())
-        , m_file(m_refactoring.cppFile(filePath()))
-        , m_document(interface.semanticInfo().doc)
-    {
-        setDescription(
-                mode == FromPointer
-                ? Tr::tr("Convert to Stack Variable")
-                : Tr::tr("Convert to Pointer"));
-    }
-
-    void perform() override
-    {
-        ChangeSet changes;
-
-        switch (m_mode) {
-        case FromPointer:
-            removePointerOperator(changes);
-            convertToStackVariable(changes);
-            break;
-        case FromReference:
-            removeReferenceOperator(changes);
-            Q_FALLTHROUGH();
-        case FromVariable:
-            convertToPointer(changes);
-            break;
-        }
-
-        m_file->setChangeSet(changes);
-        m_file->apply();
-    }
-
-private:
-    void removePointerOperator(ChangeSet &changes) const
-    {
-        if (!m_declaratorAST->ptr_operator_list)
-            return;
-        PointerAST *ptrAST = m_declaratorAST->ptr_operator_list->value->asPointer();
-        QTC_ASSERT(ptrAST, return);
-        const int pos = m_file->startOf(ptrAST->star_token);
-        changes.remove(pos, pos + 1);
-    }
-
-    void removeReferenceOperator(ChangeSet &changes) const
-    {
-        ReferenceAST *refAST = m_declaratorAST->ptr_operator_list->value->asReference();
-        QTC_ASSERT(refAST, return);
-        const int pos = m_file->startOf(refAST->reference_token);
-        changes.remove(pos, pos + 1);
-    }
-
-    void removeNewExpression(ChangeSet &changes, NewExpressionAST *newExprAST) const
-    {
-        ExpressionListAST *exprlist = nullptr;
-        if (newExprAST->new_initializer) {
-            if (ExpressionListParenAST *ast = newExprAST->new_initializer->asExpressionListParen())
-                exprlist = ast->expression_list;
-            else if (BracedInitializerAST *ast = newExprAST->new_initializer->asBracedInitializer())
-                exprlist = ast->expression_list;
-        }
-
-        if (exprlist) {
-            // remove 'new' keyword and type before initializer
-            changes.remove(m_file->startOf(newExprAST->new_token),
-                           m_file->startOf(newExprAST->new_initializer));
-
-            changes.remove(m_file->endOf(m_declaratorAST->equal_token - 1),
-                           m_file->startOf(m_declaratorAST->equal_token + 1));
-        } else {
-            // remove the whole new expression
-            changes.remove(m_file->endOf(m_identifierAST->firstToken()),
-                           m_file->startOf(newExprAST->lastToken()));
-        }
-    }
-
-    void removeNewKeyword(ChangeSet &changes, NewExpressionAST *newExprAST) const
-    {
-        // remove 'new' keyword before initializer
-        changes.remove(m_file->startOf(newExprAST->new_token),
-                       m_file->startOf(newExprAST->new_type_id));
-    }
-
-    void convertToStackVariable(ChangeSet &changes) const
-    {
-        // Handle the initializer.
-        if (m_declaratorAST->initializer) {
-            if (NewExpressionAST *newExpression = m_declaratorAST->initializer->asNewExpression()) {
-                if (m_isAutoDeclaration) {
-                    if (!newExpression->new_initializer)
-                        changes.insert(m_file->endOf(newExpression), QStringLiteral("()"));
-                    removeNewKeyword(changes, newExpression);
-                } else {
-                    removeNewExpression(changes, newExpression);
-                }
-            }
-        }
-
-        // Fix all occurrences of the identifier in this function.
-        ASTPath astPath(m_document);
-        const QList<SemanticInfo::Use> uses = semanticInfo().localUses.value(m_symbol);
-        for (const SemanticInfo::Use &use : uses) {
-            const QList<AST *> path = astPath(use.line, use.column);
-            AST *idAST = path.last();
-            bool declarationFound = false;
-            bool starFound = false;
-            int ampersandPos = 0;
-            bool memberAccess = false;
-            bool deleteCall = false;
-
-            for (int i = path.count() - 2; i >= 0; --i) {
-                if (path.at(i) == m_declaratorAST) {
-                    declarationFound = true;
-                    break;
-                }
-                if (MemberAccessAST *memberAccessAST = path.at(i)->asMemberAccess()) {
-                    if (m_file->tokenAt(memberAccessAST->access_token).kind() != T_ARROW)
-                        continue;
-                    int pos = m_file->startOf(memberAccessAST->access_token);
-                    changes.replace(pos, pos + 2, QLatin1String("."));
-                    memberAccess = true;
-                    break;
-                } else if (DeleteExpressionAST *deleteAST = path.at(i)->asDeleteExpression()) {
-                    const int pos = m_file->startOf(deleteAST->delete_token);
-                    changes.insert(pos, QLatin1String("// "));
-                    deleteCall = true;
-                    break;
-                } else if (UnaryExpressionAST *unaryExprAST = path.at(i)->asUnaryExpression()) {
-                    const Token tk = m_file->tokenAt(unaryExprAST->unary_op_token);
-                    if (tk.kind() == T_STAR) {
-                        if (!starFound) {
-                            int pos = m_file->startOf(unaryExprAST->unary_op_token);
-                            changes.remove(pos, pos + 1);
-                        }
-                        starFound = true;
-                    } else if (tk.kind() == T_AMPER) {
-                        ampersandPos = m_file->startOf(unaryExprAST->unary_op_token);
-                    }
-                } else if (PointerAST *ptrAST = path.at(i)->asPointer()) {
-                    if (!starFound) {
-                        const int pos = m_file->startOf(ptrAST->star_token);
-                        changes.remove(pos, pos);
-                    }
-                    starFound = true;
-                } else if (path.at(i)->asFunctionDefinition()) {
-                    break;
-                }
-            }
-            if (!declarationFound && !starFound && !memberAccess && !deleteCall) {
-                if (ampersandPos) {
-                    changes.insert(ampersandPos, QLatin1String("&("));
-                    changes.insert(m_file->endOf(idAST->firstToken()), QLatin1String(")"));
-                } else {
-                    changes.insert(m_file->startOf(idAST), QLatin1String("&"));
-                }
-            }
-        }
-    }
-
-    QString typeNameOfDeclaration() const
-    {
-        if (!m_simpleDeclaration
-                || !m_simpleDeclaration->decl_specifier_list
-                || !m_simpleDeclaration->decl_specifier_list->value) {
-            return QString();
-        }
-        NamedTypeSpecifierAST *namedType
-                = m_simpleDeclaration->decl_specifier_list->value->asNamedTypeSpecifier();
-        if (!namedType)
-            return QString();
-
-        Overview overview;
-        return overview.prettyName(namedType->name->name);
-    }
-
-    void insertNewExpression(ChangeSet &changes, ExpressionAST *ast) const
-    {
-        const QString typeName = typeNameOfDeclaration();
-        if (CallAST *callAST = ast->asCall()) {
-            if (typeName.isEmpty()) {
-                changes.insert(m_file->startOf(callAST), QLatin1String("new "));
-            } else {
-                changes.insert(m_file->startOf(callAST),
-                               QLatin1String("new ") + typeName + QLatin1Char('('));
-                changes.insert(m_file->startOf(callAST->lastToken()), QLatin1String(")"));
-            }
-        } else {
-            if (typeName.isEmpty())
-                return;
-            changes.insert(m_file->startOf(ast), QLatin1String(" = new ") + typeName);
-        }
-    }
-
-    void insertNewExpression(ChangeSet &changes) const
-    {
-        const QString typeName = typeNameOfDeclaration();
-        if (typeName.isEmpty())
-            return;
-        changes.insert(m_file->endOf(m_identifierAST->firstToken()),
-                       QLatin1String(" = new ") + typeName);
-    }
-
-    void convertToPointer(ChangeSet &changes) const
-    {
-        // Handle initializer.
-        if (m_declaratorAST->initializer) {
-            if (IdExpressionAST *idExprAST = m_declaratorAST->initializer->asIdExpression()) {
-                changes.insert(m_file->startOf(idExprAST), QLatin1String("&"));
-            } else if (CallAST *callAST = m_declaratorAST->initializer->asCall()) {
-                insertNewExpression(changes, callAST);
-            } else if (ExpressionListParenAST *exprListAST = m_declaratorAST->initializer
-                                                                 ->asExpressionListParen()) {
-                insertNewExpression(changes, exprListAST);
-            } else if (BracedInitializerAST *bracedInitializerAST = m_declaratorAST->initializer
-                                                                        ->asBracedInitializer()) {
-                insertNewExpression(changes, bracedInitializerAST);
-            }
-        } else {
-            insertNewExpression(changes);
-        }
-
-        // Fix all occurrences of the identifier in this function.
-        ASTPath astPath(m_document);
-        const QList<SemanticInfo::Use> uses = semanticInfo().localUses.value(m_symbol);
-        for (const SemanticInfo::Use &use : uses) {
-            const QList<AST *> path = astPath(use.line, use.column);
-            AST *idAST = path.last();
-            bool insertStar = true;
-            for (int i = path.count() - 2; i >= 0; --i) {
-                if (m_isAutoDeclaration && path.at(i) == m_declaratorAST) {
-                    insertStar = false;
-                    break;
-                }
-                if (MemberAccessAST *memberAccessAST = path.at(i)->asMemberAccess()) {
-                    const int pos = m_file->startOf(memberAccessAST->access_token);
-                    changes.replace(pos, pos + 1, QLatin1String("->"));
-                    insertStar = false;
-                    break;
-                } else if (UnaryExpressionAST *unaryExprAST = path.at(i)->asUnaryExpression()) {
-                    if (m_file->tokenAt(unaryExprAST->unary_op_token).kind() == T_AMPER) {
-                        const int pos = m_file->startOf(unaryExprAST->unary_op_token);
-                        changes.remove(pos, pos + 1);
-                        insertStar = false;
-                        break;
-                    }
-                } else if (path.at(i)->asFunctionDefinition()) {
-                    break;
-                }
-            }
-            if (insertStar)
-                changes.insert(m_file->startOf(idAST), QLatin1String("*"));
-        }
-    }
-
-    const Mode m_mode;
-    const bool m_isAutoDeclaration;
-    const SimpleDeclarationAST * const m_simpleDeclaration;
-    const DeclaratorAST * const m_declaratorAST;
-    const SimpleNameAST * const m_identifierAST;
-    Symbol * const m_symbol;
-    const CppRefactoringChanges m_refactoring;
-    const CppRefactoringFilePtr m_file;
-    const Document::Ptr m_document;
-};
-
-} // anonymous namespace
-
-void ConvertFromAndToPointer::doMatch(const CppQuickFixInterface &interface,
-                                      QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-    if (path.count() < 2)
-        return;
-    SimpleNameAST *identifier = path.last()->asSimpleName();
-    if (!identifier)
-        return;
-    SimpleDeclarationAST *simpleDeclaration = nullptr;
-    DeclaratorAST *declarator = nullptr;
-    bool isFunctionLocal = false;
-    bool isClassLocal = false;
-    ConvertFromAndToPointerOp::Mode mode = ConvertFromAndToPointerOp::FromVariable;
-    for (int i = path.count() - 2; i >= 0; --i) {
-        AST *ast = path.at(i);
-        if (!declarator && (declarator = ast->asDeclarator()))
-            continue;
-        if (!simpleDeclaration && (simpleDeclaration = ast->asSimpleDeclaration()))
-            continue;
-        if (declarator && simpleDeclaration) {
-            if (ast->asClassSpecifier()) {
-                isClassLocal = true;
-            } else if (ast->asFunctionDefinition() && !isClassLocal) {
-                isFunctionLocal = true;
-                break;
-            }
-        }
-    }
-    if (!isFunctionLocal || !simpleDeclaration || !declarator)
-        return;
-
-    Symbol *symbol = nullptr;
-    for (List<Symbol *> *lst = simpleDeclaration->symbols; lst; lst = lst->next) {
-        if (lst->value->name() == identifier->name) {
-            symbol = lst->value;
-            break;
-        }
-    }
-    if (!symbol)
-        return;
-
-    bool isAutoDeclaration = false;
-    if (symbol->storage() == Symbol::Auto) {
-        // For auto variables we must deduce the type from the initializer.
-        if (!declarator->initializer)
-            return;
-
-        isAutoDeclaration = true;
-        TypeOfExpression typeOfExpression;
-        typeOfExpression.init(interface.semanticInfo().doc, interface.snapshot());
-        typeOfExpression.setExpandTemplates(true);
-        CppRefactoringFilePtr file = interface.currentFile();
-        Scope *scope = file->scopeAt(declarator->firstToken());
-        QList<LookupItem> result = typeOfExpression(file->textOf(declarator->initializer).toUtf8(),
-                                                    scope, TypeOfExpression::Preprocess);
-        if (!result.isEmpty() && result.first().type()->asPointerType())
-            mode = ConvertFromAndToPointerOp::FromPointer;
-    } else if (declarator->ptr_operator_list) {
-        for (PtrOperatorListAST *ops = declarator->ptr_operator_list; ops; ops = ops->next) {
-            if (ops != declarator->ptr_operator_list) {
-                // Bail out on more complex pointer types (e.g. pointer of pointer,
-                // or reference of pointer).
-                return;
-            }
-            if (ops->value->asPointer())
-                mode = ConvertFromAndToPointerOp::FromPointer;
-            else if (ops->value->asReference())
-                mode = ConvertFromAndToPointerOp::FromReference;
-        }
-    }
-
-    const int priority = path.size() - 1;
-    result << new ConvertFromAndToPointerOp(interface, priority, mode, isAutoDeclaration,
-                                            simpleDeclaration, declarator, identifier, symbol);
-}
-
-namespace {
-
-void extractNames(const CppRefactoringFilePtr &file,
-                  QtPropertyDeclarationAST *qtPropertyDeclaration,
-                  ExistingGetterSetterData &data)
-{
-    QtPropertyDeclarationItemListAST *it = qtPropertyDeclaration->property_declaration_item_list;
-    for (; it; it = it->next) {
-        const char *tokenString = file->tokenAt(it->value->item_name_token).spell();
-        if (!qstrcmp(tokenString, "READ")) {
-            data.getterName = file->textOf(it->value->expression);
-        } else if (!qstrcmp(tokenString, "WRITE")) {
-            data.setterName = file->textOf(it->value->expression);
-        } else if (!qstrcmp(tokenString, "RESET")) {
-            data.resetName = file->textOf(it->value->expression);
-        } else if (!qstrcmp(tokenString, "NOTIFY")) {
-            data.signalName = file->textOf(it->value->expression);
-        } else if (!qstrcmp(tokenString, "MEMBER")) {
-            data.memberVariableName = file->textOf(it->value->expression);
-        }
-    }
-}
-
-} // anonymous namespace
-
-void InsertQtPropertyMembers::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    using Flag = GenerateGetterSetterOp::GenerateFlag;
-    ExistingGetterSetterData existing;
-    // check for Q_PROPERTY
-
-    const QList<AST *> &path = interface.path();
-    if (path.isEmpty())
-        return;
-
-    AST *const ast = path.last();
-    QtPropertyDeclarationAST *qtPropertyDeclaration = ast->asQtPropertyDeclaration();
-    if (!qtPropertyDeclaration || !qtPropertyDeclaration->type_id)
-        return;
-
-    ClassSpecifierAST *klass = nullptr;
-    for (int i = path.size() - 2; i >= 0; --i) {
-        klass = path.at(i)->asClassSpecifier();
-        if (klass)
-            break;
-    }
-    if (!klass)
-        return;
-    existing.clazz = klass->symbol;
-
-    CppRefactoringFilePtr file = interface.currentFile();
-    const QString propertyName = file->textOf(qtPropertyDeclaration->property_name);
-    existing.qPropertyName = propertyName;
-    extractNames(file, qtPropertyDeclaration, existing);
-
-    Control *control = interface.currentFile()->cppDocument()->control();
-
-    existing.declarationSymbol = control->newDeclaration(ast->firstToken(),
-                                                         qtPropertyDeclaration->property_name->name);
-    existing.declarationSymbol->setVisibility(Symbol::Private);
-    existing.declarationSymbol->setEnclosingScope(existing.clazz);
-
-    {
-        // create a 'right' Type Object
-        // if we have Q_PROPERTY(int test ...) then we only get a NamedType for 'int', but we want
-        // a IntegerType. So create a new dummy file with a dummy declaration to get the right
-        // object
-        QByteArray type = file->textOf(qtPropertyDeclaration->type_id).toUtf8();
-        QByteArray newSource = file->document()
-                                   ->toPlainText()
-                                   .insert(file->startOf(qtPropertyDeclaration),
-                                           QString::fromUtf8(type + " __dummy;\n"))
-                                   .toUtf8();
-
-        Document::Ptr doc = interface.snapshot().preprocessedDocument(newSource, "___quickfix.h");
-        if (!doc->parse(Document::ParseTranlationUnit))
-            return;
-        doc->check();
-        class TypeFinder : public ASTVisitor
-        {
-        public:
-            FullySpecifiedType type;
-            TypeFinder(TranslationUnit *u)
-                : ASTVisitor(u)
-            {}
-            bool visit(SimpleDeclarationAST *ast) override
-            {
-                if (ast->symbols && !ast->symbols->next) {
-                    const Name *name = ast->symbols->value->name();
-                    if (name && name->asNameId() && name->asNameId()->identifier()) {
-                        const Identifier *id = name->asNameId()->identifier();
-                        if (QString::fromUtf8(id->chars(), id->size()) == "__dummy")
-                            type = ast->symbols->value->type();
-                    }
-                }
-                return true;
-            }
-        };
-        TypeFinder finder(doc->translationUnit());
-        finder.accept(doc->translationUnit()->ast());
-        if (finder.type.type()->isUndefinedType())
-            return;
-        existing.declarationSymbol->setType(finder.type);
-        existing.doc = doc; // to hold type
-    }
-    // check which methods are already there
-    const bool haveFixMemberVariableName = !existing.memberVariableName.isEmpty();
-    int generateFlags = Flag::GenerateMemberVariable;
-    if (!existing.resetName.isEmpty())
-        generateFlags |= Flag::GenerateReset;
-    if (!existing.setterName.isEmpty())
-        generateFlags |= Flag::GenerateSetter;
-    if (!existing.getterName.isEmpty())
-        generateFlags |= Flag::GenerateGetter;
-    if (!existing.signalName.isEmpty())
-        generateFlags |= Flag::GenerateSignal;
-    Overview overview;
-    for (int i = 0; i < existing.clazz->memberCount(); ++i) {
-        Symbol *member = existing.clazz->memberAt(i);
-        FullySpecifiedType type = member->type();
-        if (member->asFunction() || (type.isValid() && type->asFunctionType())) {
-            const QString name = overview.prettyName(member->name());
-            if (name == existing.getterName)
-                generateFlags &= ~Flag::GenerateGetter;
-            else if (name == existing.setterName)
-                generateFlags &= ~Flag::GenerateSetter;
-            else if (name == existing.resetName)
-                generateFlags &= ~Flag::GenerateReset;
-            else if (name == existing.signalName)
-                generateFlags &= ~Flag::GenerateSignal;
-        } else if (member->asDeclaration()) {
-            const QString name = overview.prettyName(member->name());
-            if (haveFixMemberVariableName) {
-                if (name == existing.memberVariableName) {
-                    generateFlags &= ~Flag::GenerateMemberVariable;
-                }
-            } else {
-                const QString baseName = memberBaseName(name);
-                if (existing.qPropertyName == baseName) {
-                    existing.memberVariableName = name;
-                    generateFlags &= ~Flag::GenerateMemberVariable;
-                }
-            }
-        }
-    }
-    if (generateFlags & Flag::GenerateMemberVariable) {
-        CppQuickFixSettings *settings = CppQuickFixProjectsSettings::getQuickFixSettings(
-            ProjectExplorer::ProjectTree::currentProject());
-        existing.memberVariableName = settings->getMemberVariableName(existing.qPropertyName);
-    }
-    if (generateFlags == 0) {
-        // everything is already there
-        return;
-    }
-    generateFlags |= Flag::HaveExistingQProperty;
-    GenerateGetterSetterOp::generateQuickFixes(result, interface, existing, generateFlags);
-}
-
-namespace {
-
-class ApplyDeclDefLinkOperation : public CppQuickFixOperation
-{
-public:
-    explicit ApplyDeclDefLinkOperation(const CppQuickFixInterface &interface,
-            const std::shared_ptr<FunctionDeclDefLink> &link)
-        : CppQuickFixOperation(interface, 100)
-        , m_link(link)
-    {}
-
-    void perform() override
-    {
-        if (editor()->declDefLink() == m_link)
-            editor()->applyDeclDefLinkChanges(/*don't jump*/false);
-    }
-
-protected:
-    virtual void performChanges(const CppRefactoringFilePtr &, const CppRefactoringChanges &)
-    { /* never called since perform is overridden */ }
-
-private:
-    std::shared_ptr<FunctionDeclDefLink> m_link;
-};
-
-} // anonymous namespace
-
-void ApplyDeclDefLinkChanges::doMatch(const CppQuickFixInterface &interface,
-                                      QuickFixOperations &result)
-{
-    std::shared_ptr<FunctionDeclDefLink> link = interface.editor()->declDefLink();
-    if (!link || !link->isMarkerVisible())
-        return;
-
-    auto op = new ApplyDeclDefLinkOperation(interface, link);
-    op->setDescription(Tr::tr("Apply Function Signature Changes"));
-    result << op;
-}
-
-namespace {
-
-QString definitionSignature(const CppQuickFixInterface *assist,
-                            FunctionDefinitionAST *functionDefinitionAST,
-                            CppRefactoringFilePtr &baseFile,
-                            CppRefactoringFilePtr &targetFile,
-                            Scope *scope)
-{
-    QTC_ASSERT(assist, return QString());
-    QTC_ASSERT(functionDefinitionAST, return QString());
-    QTC_ASSERT(scope, return QString());
-    Function *func = functionDefinitionAST->symbol;
-    QTC_ASSERT(func, return QString());
-
-    LookupContext cppContext(targetFile->cppDocument(), assist->snapshot());
-    ClassOrNamespace *cppCoN = cppContext.lookupType(scope);
-    if (!cppCoN)
-        cppCoN = cppContext.globalNamespace();
-    SubstitutionEnvironment env;
-    env.setContext(assist->context());
-    env.switchScope(func->enclosingScope());
-    UseMinimalNames q(cppCoN);
-    env.enter(&q);
-    Control *control = assist->context().bindings()->control().get();
-    Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
-    oo.showFunctionSignatures = true;
-    oo.showReturnTypes = true;
-    oo.showArgumentNames = true;
-    oo.showEnclosingTemplate = true;
-    oo.showTemplateParameters = true;
-    oo.trailingReturnType = functionDefinitionAST->declarator
-            && functionDefinitionAST->declarator->postfix_declarator_list
-            && functionDefinitionAST->declarator->postfix_declarator_list->value
-            && functionDefinitionAST->declarator->postfix_declarator_list
-                    ->value->asFunctionDeclarator()
-            && functionDefinitionAST->declarator->postfix_declarator_list
-                    ->value->asFunctionDeclarator()->trailing_return_type;
-    const Name *name = func->name();
-    if (name && nameIncludesOperatorName(name)) {
-        CoreDeclaratorAST *coreDeclarator = functionDefinitionAST->declarator->core_declarator;
-        const QString operatorNameText = baseFile->textOf(coreDeclarator);
-        oo.includeWhiteSpaceInOperatorName = operatorNameText.contains(QLatin1Char(' '));
-    }
-    const QString nameText = oo.prettyName(LookupContext::minimalName(func, cppCoN, control));
-    oo.showTemplateParameters = false;
-    const FullySpecifiedType tn = rewriteType(func->type(), &env, control);
-
-    return oo.prettyType(tn, nameText);
-}
-
-class MoveFuncDefRefactoringHelper
-{
-public:
-    enum MoveType {
-        MoveOutside,
-        MoveToCppFile,
-        MoveOutsideMemberToCppFile
-    };
-
-    MoveFuncDefRefactoringHelper(CppQuickFixOperation *operation, MoveType type,
-                                 const FilePath &fromFile, const FilePath &toFile)
-        : m_operation(operation), m_type(type), m_changes(m_operation->snapshot())
-    {
-        m_fromFile = m_changes.cppFile(fromFile);
-        m_toFile = (m_type == MoveOutside) ? m_fromFile : m_changes.cppFile(toFile);
-    }
-
-    void performMove(FunctionDefinitionAST *funcAST)
-    {
-        // Determine file, insert position and scope
-        InsertionLocation l = insertLocationForMethodDefinition(
-                    funcAST->symbol, false, NamespaceHandling::Ignore,
-                    m_changes, m_toFile->filePath());
-        const QString prefix = l.prefix();
-        const QString suffix = l.suffix();
-        const int insertPos = m_toFile->position(l.line(), l.column());
-        Scope *scopeAtInsertPos = m_toFile->cppDocument()->scopeAt(l.line(), l.column());
-
-        // construct definition
-        const QString funcDec = inlinePrefix(m_toFile->filePath(), [this] { return m_type == MoveOutside; })
-                + definitionSignature(m_operation, funcAST, m_fromFile, m_toFile,
-                                      scopeAtInsertPos);
-        QString funcDef = prefix + funcDec;
-        const int startPosition = m_fromFile->endOf(funcAST->declarator);
-        const int endPosition = m_fromFile->endOf(funcAST);
-        funcDef += m_fromFile->textOf(startPosition, endPosition);
-        funcDef += suffix;
-
-        // insert definition at new position
-        m_toFileChangeSet.insert(insertPos, funcDef);
-        m_toFile->setOpenEditor(true, insertPos);
-
-        // remove definition from fromFile
-        if (m_type == MoveOutsideMemberToCppFile) {
-            m_fromFileChangeSet.remove(m_fromFile->range(funcAST));
-        } else {
-            QString textFuncDecl = m_fromFile->textOf(funcAST);
-            textFuncDecl.truncate(startPosition - m_fromFile->startOf(funcAST));
-            if (textFuncDecl.left(7) == QLatin1String("inline "))
-                textFuncDecl = textFuncDecl.mid(7);
-            else
-                textFuncDecl.replace(" inline ", QLatin1String(" "));
-            textFuncDecl = textFuncDecl.trimmed() + QLatin1Char(';');
-            m_fromFileChangeSet.replace(m_fromFile->range(funcAST), textFuncDecl);
-        }
-    }
-
-    void applyChanges()
-    {
-        if (!m_toFileChangeSet.isEmpty()) {
-            m_toFile->setChangeSet(m_toFileChangeSet);
-            m_toFile->apply();
-        }
-        if (!m_fromFileChangeSet.isEmpty()) {
-            m_fromFile->setChangeSet(m_fromFileChangeSet);
-            m_fromFile->apply();
-        }
-    }
-
-private:
-    CppQuickFixOperation *m_operation;
-    MoveType m_type;
-    CppRefactoringChanges m_changes;
-    CppRefactoringFilePtr m_fromFile;
-    CppRefactoringFilePtr m_toFile;
-    ChangeSet m_fromFileChangeSet;
-    ChangeSet m_toFileChangeSet;
-};
-
-class MoveFuncDefOutsideOp : public CppQuickFixOperation
-{
-public:
-    MoveFuncDefOutsideOp(const CppQuickFixInterface &interface,
-                         MoveFuncDefRefactoringHelper::MoveType type,
-                         FunctionDefinitionAST *funcDef, const FilePath &cppFilePath)
-        : CppQuickFixOperation(interface, 0)
-        , m_funcDef(funcDef)
-        , m_type(type)
-        , m_cppFilePath(cppFilePath)
-        , m_headerFilePath(funcDef->symbol->filePath())
-    {
-        if (m_type == MoveFuncDefRefactoringHelper::MoveOutside) {
-            setDescription(Tr::tr("Move Definition Outside Class"));
-        } else {
-            const FilePath resolved = m_cppFilePath.relativePathFrom(m_headerFilePath.parentDir());
-            setDescription(Tr::tr("Move Definition to %1").arg(resolved.displayName()));
-        }
-    }
-
-    void perform() override
-    {
-        MoveFuncDefRefactoringHelper helper(this, m_type, m_headerFilePath, m_cppFilePath);
-        helper.performMove(m_funcDef);
-        helper.applyChanges();
-    }
-
-private:
-    FunctionDefinitionAST *m_funcDef;
-    MoveFuncDefRefactoringHelper::MoveType m_type;
-    const FilePath m_cppFilePath;
-    const FilePath m_headerFilePath;
-};
-
-} // anonymous namespace
-
-void MoveFuncDefOutside::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-    SimpleDeclarationAST *classAST = nullptr;
-    FunctionDefinitionAST *funcAST = nullptr;
-    bool moveOutsideMemberDefinition = false;
-
-    const int pathSize = path.size();
-    for (int idx = 1; idx < pathSize; ++idx) {
-        if ((funcAST = path.at(idx)->asFunctionDefinition())) {
-            // check cursor position
-            if (idx != pathSize - 1  // Do not allow "void a() @ {..."
-                    && funcAST->function_body
-                    && !interface.isCursorOn(funcAST->function_body)) {
-                if (path.at(idx - 1)->asTranslationUnit()) { // normal function
-                    if (idx + 3 < pathSize && path.at(idx + 3)->asQualifiedName()) // Outside member
-                        moveOutsideMemberDefinition = true;                        // definition
-                    break;
-                }
-
-                if (idx > 1) {
-                    if ((classAST = path.at(idx - 2)->asSimpleDeclaration())) // member function
-                        break;
-                    if (path.at(idx - 2)->asNamespace())  // normal function in namespace
-                        break;
-                }
-                if (idx > 2 && path.at(idx - 1)->asTemplateDeclaration()) {
-                    if ((classAST = path.at(idx - 3)->asSimpleDeclaration())) // member template
-                        break;
-                }
-            }
-            funcAST = nullptr;
-        }
-    }
-
-    if (!funcAST || !funcAST->symbol)
-        return;
-
-    bool isHeaderFile = false;
-    const FilePath cppFileName = correspondingHeaderOrSource(interface.filePath(), &isHeaderFile);
-
-    if (isHeaderFile && !cppFileName.isEmpty()) {
-        const MoveFuncDefRefactoringHelper::MoveType type = moveOutsideMemberDefinition
-                ? MoveFuncDefRefactoringHelper::MoveOutsideMemberToCppFile
-                : MoveFuncDefRefactoringHelper::MoveToCppFile;
-        result << new MoveFuncDefOutsideOp(interface, type, funcAST, cppFileName);
-    }
-
-    if (classAST)
-        result << new MoveFuncDefOutsideOp(interface, MoveFuncDefRefactoringHelper::MoveOutside,
-                                           funcAST, FilePath());
-
-    return;
-}
-
-namespace {
-
-class MoveAllFuncDefOutsideOp : public CppQuickFixOperation
-{
-public:
-    MoveAllFuncDefOutsideOp(const CppQuickFixInterface &interface,
-                            MoveFuncDefRefactoringHelper::MoveType type,
-                            ClassSpecifierAST *classDef, const FilePath &cppFileName)
-        : CppQuickFixOperation(interface, 0)
-        , m_type(type)
-        , m_classDef(classDef)
-        , m_cppFilePath(cppFileName)
-        , m_headerFilePath(classDef->symbol->filePath())
-    {
-        if (m_type == MoveFuncDefRefactoringHelper::MoveOutside) {
-            setDescription(Tr::tr("Definitions Outside Class"));
-        } else {
-            const FilePath resolved = m_cppFilePath.relativePathFrom(m_headerFilePath.parentDir());
-            setDescription(Tr::tr("Move All Function Definitions to %1")
-                           .arg(resolved.displayName()));
-        }
-    }
-
-    void perform() override
-    {
-        MoveFuncDefRefactoringHelper helper(this, m_type, m_headerFilePath, m_cppFilePath);
-        for (DeclarationListAST *it = m_classDef->member_specifier_list; it; it = it->next) {
-            if (FunctionDefinitionAST *funcAST = it->value->asFunctionDefinition()) {
-                if (funcAST->symbol && !funcAST->symbol->isGenerated())
-                    helper.performMove(funcAST);
-            }
-        }
-        helper.applyChanges();
-    }
-
-private:
-    MoveFuncDefRefactoringHelper::MoveType m_type;
-    ClassSpecifierAST *m_classDef;
-    const FilePath m_cppFilePath;
-    const FilePath m_headerFilePath;
-};
-
-} // anonymous namespace
-
-void MoveAllFuncDefOutside::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    ClassSpecifierAST * const classAST = astForClassOperations(interface);
-    if (!classAST)
-        return;
-
-    // Determine if the class has at least one function definition
-    bool classContainsFunctions = false;
-    for (DeclarationListAST *it = classAST->member_specifier_list; it; it = it->next) {
-        if (FunctionDefinitionAST *funcAST = it->value->asFunctionDefinition()) {
-            if (funcAST->symbol && !funcAST->symbol->isGenerated()) {
-                classContainsFunctions = true;
-                break;
-            }
-        }
-    }
-    if (!classContainsFunctions)
-        return;
-
-    bool isHeaderFile = false;
-    const FilePath cppFileName = correspondingHeaderOrSource(interface.filePath(), &isHeaderFile);
-    if (isHeaderFile && !cppFileName.isEmpty()) {
-        result << new MoveAllFuncDefOutsideOp(interface,
-                                              MoveFuncDefRefactoringHelper::MoveToCppFile,
-                                              classAST, cppFileName);
-    }
-    result << new MoveAllFuncDefOutsideOp(interface, MoveFuncDefRefactoringHelper::MoveOutside,
-                                          classAST, FilePath());
-}
-
-namespace {
-
-class MoveFuncDefToDeclOp : public CppQuickFixOperation
-{
-public:
-    enum Type { Push, Pull };
-    MoveFuncDefToDeclOp(const CppQuickFixInterface &interface,
-                        const FilePath &fromFilePath, const FilePath &toFilePath,
-                        FunctionDefinitionAST *funcAst, Function *func, const QString &declText,
-                        const ChangeSet::Range &fromRange,
-                        const ChangeSet::Range &toRange,
-                        Type type)
-        : CppQuickFixOperation(interface, 0)
-        , m_fromFilePath(fromFilePath)
-        , m_toFilePath(toFilePath)
-        , m_funcAST(funcAst)
-        , m_func(func)
-        , m_declarationText(declText)
-        , m_fromRange(fromRange)
-        , m_toRange(toRange)
-    {
-        if (type == Type::Pull) {
-            setDescription(Tr::tr("Move Definition Here"));
-        } else if (m_toFilePath == m_fromFilePath) {
-            setDescription(Tr::tr("Move Definition to Class"));
-        } else {
-            const FilePath resolved = m_toFilePath.relativePathFrom(m_fromFilePath.parentDir());
-            setDescription(Tr::tr("Move Definition to %1").arg(resolved.displayName()));
-        }
-    }
-
-private:
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr fromFile = refactoring.cppFile(m_fromFilePath);
-        CppRefactoringFilePtr toFile = refactoring.cppFile(m_toFilePath);
-
-        ensureFuncDefAstAndRange(*fromFile);
-        if (!m_funcAST)
-            return;
-
-        const QString wholeFunctionText = m_declarationText
-                + fromFile->textOf(fromFile->endOf(m_funcAST->declarator),
-                                   fromFile->endOf(m_funcAST->function_body));
-
-        // Replace declaration with function and delete old definition
-        ChangeSet toTarget;
-        toTarget.replace(m_toRange, wholeFunctionText);
-        if (m_toFilePath == m_fromFilePath)
-            toTarget.remove(m_fromRange);
-        toFile->setChangeSet(toTarget);
-        toFile->setOpenEditor(true, m_toRange.start);
-        toFile->apply();
-        if (m_toFilePath != m_fromFilePath) {
-            ChangeSet fromTarget;
-            fromTarget.remove(m_fromRange);
-            fromFile->setChangeSet(fromTarget);
-            fromFile->apply();
-        }
-    }
-
-    void ensureFuncDefAstAndRange(CppRefactoringFile &defFile)
-    {
-        if (m_funcAST) {
-            QTC_CHECK(m_fromRange.end > m_fromRange.start);
-            return;
-        }
-        QTC_ASSERT(m_func, return);
-        const QList<AST *> astPath = ASTPath(defFile.cppDocument())(m_func->line(),
-                                                                    m_func->column());
-        if (astPath.isEmpty())
-            return;
-        for (auto it = std::rbegin(astPath); it != std::rend(astPath); ++it) {
-            m_funcAST = (*it)->asFunctionDefinition();
-            if (!m_funcAST)
-                continue;
-            AST *astForRange = m_funcAST;
-            const auto prev = std::next(it);
-            if (prev != std::rend(astPath)) {
-                if (const auto templAst = (*prev)->asTemplateDeclaration())
-                    astForRange = templAst;
-            }
-            m_fromRange = defFile.range(astForRange);
-            return;
-        }
-    }
-
-    const FilePath m_fromFilePath;
-    const FilePath m_toFilePath;
-    FunctionDefinitionAST *m_funcAST;
-    Function *m_func;
-    const QString m_declarationText;
-    ChangeSet::Range m_fromRange;
-    const ChangeSet::Range m_toRange;
-};
-
-} // anonymous namespace
-
-void MoveFuncDefToDeclPush::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-    AST *completeDefAST = nullptr;
-    FunctionDefinitionAST *funcAST = nullptr;
-
-    const int pathSize = path.size();
-    for (int idx = 1; idx < pathSize; ++idx) {
-        if ((funcAST = path.at(idx)->asFunctionDefinition())) {
-            AST *enclosingAST = path.at(idx - 1);
-            if (enclosingAST->asClassSpecifier())
-                return;
-
-            // check cursor position
-            if (idx != pathSize - 1  // Do not allow "void a() @ {..."
-                    && funcAST->function_body
-                    && !interface.isCursorOn(funcAST->function_body)) {
-                completeDefAST = enclosingAST->asTemplateDeclaration() ? enclosingAST : funcAST;
-                break;
-            }
-            funcAST = nullptr;
-        }
-    }
-
-    if (!funcAST || !funcAST->symbol)
-        return;
-
-    const CppRefactoringChanges refactoring(interface.snapshot());
-    const CppRefactoringFilePtr defFile = refactoring.cppFile(interface.filePath());
-    const ChangeSet::Range defRange = defFile->range(completeDefAST);
-
-    // Determine declaration (file, range, text);
-    ChangeSet::Range declRange;
-    QString declText;
-    FilePath declFilePath;
-
-    Function *func = funcAST->symbol;
-    if (Class *matchingClass = isMemberFunction(interface.context(), func)) {
-        // Dealing with member functions
-        const QualifiedNameId *qName = func->name()->asQualifiedNameId();
-        for (Symbol *symbol = matchingClass->find(qName->identifier());
-             symbol; symbol = symbol->next()) {
-            Symbol *s = symbol;
-            if (func->enclosingScope()->asTemplate()) {
-                if (const Template *templ = s->type()->asTemplateType()) {
-                    if (Symbol *decl = templ->declaration()) {
-                        if (decl->type()->asFunctionType())
-                                s = decl;
-                    }
-                }
-            }
-            if (!s->name()
-                    || !qName->identifier()->match(s->identifier())
-                    || !s->type()->asFunctionType()
-                    || !s->type().match(func->type())
-                    || s->asFunction()) {
-                continue;
-            }
-
-            declFilePath = matchingClass->filePath();
-            const CppRefactoringFilePtr declFile = refactoring.cppFile(declFilePath);
-            ASTPath astPath(declFile->cppDocument());
-            const QList<AST *> path = astPath(s->line(), s->column());
-            for (int idx = path.size() - 1; idx > 0; --idx) {
-                AST *node = path.at(idx);
-                if (SimpleDeclarationAST *simpleDecl = node->asSimpleDeclaration()) {
-                    if (simpleDecl->symbols && !simpleDecl->symbols->next) {
-                        declRange = declFile->range(simpleDecl);
-                        declText = declFile->textOf(simpleDecl);
-                        declText.remove(-1, 1); // remove ';' from declaration text
-                        break;
-                    }
-                }
-            }
-
-            if (!declText.isEmpty())
-                break;
-        }
-    } else if (Namespace *matchingNamespace = isNamespaceFunction(interface.context(), func)) {
-        // Dealing with free functions
-        bool isHeaderFile = false;
-        declFilePath = correspondingHeaderOrSource(interface.filePath(), &isHeaderFile);
-        if (isHeaderFile)
-            return;
-
-        const CppRefactoringFilePtr declFile = refactoring.cppFile(declFilePath);
-        const LookupContext lc(declFile->cppDocument(), interface.snapshot());
-        const QList<LookupItem> candidates = lc.lookup(func->name(), matchingNamespace);
-        for (const LookupItem &candidate : candidates) {
-            if (Symbol *s = candidate.declaration()) {
-                if (s->asDeclaration()) {
-                    ASTPath astPath(declFile->cppDocument());
-                    const QList<AST *> path = astPath(s->line(), s->column());
-                    for (AST *node : path) {
-                        if (SimpleDeclarationAST *simpleDecl = node->asSimpleDeclaration()) {
-                            declRange = declFile->range(simpleDecl);
-                            declText = declFile->textOf(simpleDecl);
-                            declText.remove(-1, 1); // remove ';' from declaration text
-                            break;
-                        }
-                    }
-                }
-            }
-
-            if (!declText.isEmpty()) {
-                declText.prepend(inlinePrefix(declFilePath));
-                break;
-            }
-        }
-    }
-
-    if (!declFilePath.isEmpty() && !declText.isEmpty())
-        result << new MoveFuncDefToDeclOp(interface,
-                                          interface.filePath(),
-                                          declFilePath,
-                                          funcAST, func, declText,
-                                          defRange, declRange, MoveFuncDefToDeclOp::Push);
-}
-
-void MoveFuncDefToDeclPull::doMatch(const CppQuickFixInterface &interface,
-                                    QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-    for (auto it = std::rbegin(path); it != std::rend(path); ++it) {
-        SimpleDeclarationAST * const simpleDecl = (*it)->asSimpleDeclaration();
-        if (!simpleDecl)
-            continue;
-        const auto prev = std::next(it);
-        if (prev != std::rend(path) && (*prev)->asStatement())
-            return;
-        if (!simpleDecl->symbols || !simpleDecl->symbols->value || simpleDecl->symbols->next)
-            return;
-        Declaration * const decl = simpleDecl->symbols->value->asDeclaration();
-        if (!decl)
-            return;
-        Function * const funcDecl = decl->type()->asFunctionType();
-        if (!funcDecl)
-            return;
-        if (funcDecl->isSignal() || funcDecl->isPureVirtual() || funcDecl->isFriend())
-            return;
-
-        // Is there a definition?
-        SymbolFinder symbolFinder;
-        Function * const funcDef = symbolFinder.findMatchingDefinition(decl, interface.snapshot(),
-                                                                       true);
-        if (!funcDef)
-            return;
-
-        QString declText = interface.currentFile()->textOf(simpleDecl);
-        declText.chop(1); // semicolon
-        declText.prepend(inlinePrefix(interface.filePath(), [funcDecl] {
-            return !funcDecl->enclosingScope()->asClass();
-        }));
-        result << new MoveFuncDefToDeclOp(interface, funcDef->filePath(), decl->filePath(), nullptr,
-                                          funcDef, declText, {},
-                                          interface.currentFile()->range(simpleDecl),
-                                          MoveFuncDefToDeclOp::Pull);
-        return;
-    }
-}
-
-
-namespace {
-
-class AssignToLocalVariableOperation : public CppQuickFixOperation
-{
-public:
-    explicit AssignToLocalVariableOperation(const CppQuickFixInterface &interface,
-                                            const int insertPos, const AST *ast, const Name *name)
-        : CppQuickFixOperation(interface)
-        , m_insertPos(insertPos)
-        , m_ast(ast)
-        , m_name(name)
-        , m_oo(CppCodeStyleSettings::currentProjectCodeStyleOverview())
-        , m_originalName(m_oo.prettyName(m_name))
-        , m_file(CppRefactoringChanges(snapshot()).cppFile(filePath()))
-    {
-        setDescription(Tr::tr("Assign to Local Variable"));
-    }
-
-private:
-    void perform() override
-    {
-        QString type = deduceType();
-        if (type.isEmpty())
-            return;
-        const int origNameLength = m_originalName.length();
-        const QString varName = constructVarName();
-        const QString insertString = type.replace(type.length() - origNameLength, origNameLength,
-                                                  varName + QLatin1String(" = "));
-        ChangeSet changes;
-        changes.insert(m_insertPos, insertString);
-        m_file->setChangeSet(changes);
-        m_file->apply();
-
-        // move cursor to new variable name
-        QTextCursor c = m_file->cursor();
-        c.setPosition(m_insertPos + insertString.length() - varName.length() - 3);
-        c.movePosition(QTextCursor::EndOfWord, QTextCursor::KeepAnchor);
-        editor()->setTextCursor(c);
-    }
-
-    QString deduceType() const
-    {
-        const auto settings = CppQuickFixProjectsSettings::getQuickFixSettings(
-                    ProjectExplorer::ProjectTree::currentProject());
-        if (m_file->cppDocument()->languageFeatures().cxx11Enabled && settings->useAuto)
-            return "auto " + m_originalName;
-
-        TypeOfExpression typeOfExpression;
-        typeOfExpression.init(semanticInfo().doc, snapshot(), context().bindings());
-        typeOfExpression.setExpandTemplates(true);
-        Scope * const scope = m_file->scopeAt(m_ast->firstToken());
-        const QList<LookupItem> result = typeOfExpression(m_file->textOf(m_ast).toUtf8(),
-                                                          scope, TypeOfExpression::Preprocess);
-        if (result.isEmpty())
-            return {};
-
-        SubstitutionEnvironment env;
-        env.setContext(context());
-        env.switchScope(result.first().scope());
-        ClassOrNamespace *con = typeOfExpression.context().lookupType(scope);
-        if (!con)
-            con = typeOfExpression.context().globalNamespace();
-        UseMinimalNames q(con);
-        env.enter(&q);
-
-        Control *control = context().bindings()->control().get();
-        FullySpecifiedType type = rewriteType(result.first().type(), &env, control);
-
-        return m_oo.prettyType(type, m_name);
-    }
-
-    QString constructVarName() const
-    {
-        QString newName = m_originalName;
-        if (newName.startsWith(QLatin1String("get"), Qt::CaseInsensitive)
-                && newName.length() > 3
-                && newName.at(3).isUpper()) {
-            newName.remove(0, 3);
-            newName.replace(0, 1, newName.at(0).toLower());
-        } else if (newName.startsWith(QLatin1String("to"), Qt::CaseInsensitive)
-                   && newName.length() > 2
-                   && newName.at(2).isUpper()) {
-            newName.remove(0, 2);
-            newName.replace(0, 1, newName.at(0).toLower());
-        } else {
-            newName.replace(0, 1, newName.at(0).toUpper());
-            newName.prepend(QLatin1String("local"));
-        }
-        return newName;
-    }
-
-    const int m_insertPos;
-    const AST * const m_ast;
-    const Name * const m_name;
-    const Overview m_oo;
-    const QString m_originalName;
-    const CppRefactoringFilePtr m_file;
-};
-
-} // anonymous namespace
-
-void AssignToLocalVariable::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-    AST *outerAST = nullptr;
-    SimpleNameAST *nameAST = nullptr;
-
-    for (int i = path.size() - 3; i >= 0; --i) {
-        if (CallAST *callAST = path.at(i)->asCall()) {
-            if (!interface.isCursorOn(callAST))
-                return;
-            if (i - 2 >= 0) {
-                const int idx = i - 2;
-                if (path.at(idx)->asSimpleDeclaration())
-                    return;
-                if (path.at(idx)->asExpressionStatement())
-                    return;
-                if (path.at(idx)->asMemInitializer())
-                    return;
-                if (path.at(idx)->asCall()) { // Fallback if we have a->b()->c()...
-                    --i;
-                    continue;
-                }
-            }
-            for (int a = i - 1; a > 0; --a) {
-                if (path.at(a)->asBinaryExpression())
-                    return;
-                if (path.at(a)->asReturnStatement())
-                    return;
-                if (path.at(a)->asCall())
-                    return;
-            }
-
-            if (MemberAccessAST *member = path.at(i + 1)->asMemberAccess()) { // member
-                if (NameAST *name = member->member_name)
-                    nameAST = name->asSimpleName();
-            } else if (QualifiedNameAST *qname = path.at(i + 2)->asQualifiedName()) { // static or
-                nameAST = qname->unqualified_name->asSimpleName();                    // func in ns
-            } else { // normal
-                nameAST = path.at(i + 2)->asSimpleName();
-            }
-
-            if (nameAST) {
-                outerAST = callAST;
-                break;
-            }
-        } else if (NewExpressionAST *newexp = path.at(i)->asNewExpression()) {
-            if (!interface.isCursorOn(newexp))
-                return;
-            if (i - 2 >= 0) {
-                const int idx = i - 2;
-                if (path.at(idx)->asSimpleDeclaration())
-                    return;
-                if (path.at(idx)->asExpressionStatement())
-                    return;
-                if (path.at(idx)->asMemInitializer())
-                    return;
-            }
-            for (int a = i - 1; a > 0; --a) {
-                if (path.at(a)->asReturnStatement())
-                    return;
-                if (path.at(a)->asCall())
-                    return;
-            }
-
-            if (NamedTypeSpecifierAST *ts = path.at(i + 2)->asNamedTypeSpecifier()) {
-                nameAST = ts->name->asSimpleName();
-                outerAST = newexp;
-                break;
-            }
-        }
-    }
-
-    if (outerAST && nameAST) {
-        const CppRefactoringFilePtr file = interface.currentFile();
-        QList<LookupItem> items;
-        TypeOfExpression typeOfExpression;
-        typeOfExpression.init(interface.semanticInfo().doc, interface.snapshot(),
-                              interface.context().bindings());
-        typeOfExpression.setExpandTemplates(true);
-
-        // If items are empty, AssignToLocalVariableOperation will fail.
-        items = typeOfExpression(file->textOf(outerAST).toUtf8(),
-                                 file->scopeAt(outerAST->firstToken()),
-                                 TypeOfExpression::Preprocess);
-        if (items.isEmpty())
-            return;
-
-        if (CallAST *callAST = outerAST->asCall()) {
-            items = typeOfExpression(file->textOf(callAST->base_expression).toUtf8(),
-                                     file->scopeAt(callAST->base_expression->firstToken()),
-                                     TypeOfExpression::Preprocess);
-        } else {
-            items = typeOfExpression(file->textOf(nameAST).toUtf8(),
-                                     file->scopeAt(nameAST->firstToken()),
-                                     TypeOfExpression::Preprocess);
-        }
-
-        for (const LookupItem &item : std::as_const(items)) {
-            if (!item.declaration())
-                continue;
-
-            if (Function *func = item.declaration()->asFunction()) {
-                if (func->isSignal() || func->returnType()->asVoidType())
-                    return;
-            } else if (Declaration *dec = item.declaration()->asDeclaration()) {
-                if (Function *func = dec->type()->asFunctionType()) {
-                    if (func->isSignal() || func->returnType()->asVoidType())
-                      return;
-                }
-            }
-
-            const Name *name = nameAST->name;
-            const int insertPos = interface.currentFile()->startOf(outerAST);
-            result << new AssignToLocalVariableOperation(interface, insertPos, outerAST, name);
-            return;
-        }
-    }
-}
-
-namespace {
-
-class OptimizeForLoopOperation: public CppQuickFixOperation
-{
-public:
-    OptimizeForLoopOperation(const CppQuickFixInterface &interface, const ForStatementAST *forAst,
-                             const bool optimizePostcrement, const ExpressionAST *expression,
-                             const FullySpecifiedType &type)
-        : CppQuickFixOperation(interface)
-        , m_forAst(forAst)
-        , m_optimizePostcrement(optimizePostcrement)
-        , m_expression(expression)
-        , m_type(type)
-    {
-        setDescription(Tr::tr("Optimize for-Loop"));
-    }
-
-    void perform() override
-    {
-        QTC_ASSERT(m_forAst, return);
-
-        const Utils::FilePath filePath = currentFile()->filePath();
-        const CppRefactoringChanges refactoring(snapshot());
-        const CppRefactoringFilePtr file = refactoring.cppFile(filePath);
-        ChangeSet change;
-
-        // Optimize post (in|de)crement operator to pre (in|de)crement operator
-        if (m_optimizePostcrement && m_forAst->expression) {
-            PostIncrDecrAST *incrdecr = m_forAst->expression->asPostIncrDecr();
-            if (incrdecr && incrdecr->base_expression && incrdecr->incr_decr_token) {
-                change.flip(file->range(incrdecr->base_expression),
-                            file->range(incrdecr->incr_decr_token));
-            }
-        }
-
-        // Optimize Condition
-        int renamePos = -1;
-        if (m_expression) {
-            QString varName = QLatin1String("total");
-
-            if (file->textOf(m_forAst->initializer).length() == 1) {
-                Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
-                const QString typeAndName = oo.prettyType(m_type, varName);
-                renamePos = file->endOf(m_forAst->initializer) - 1 + typeAndName.length();
-                change.insert(file->endOf(m_forAst->initializer) - 1, // "-1" because of ";"
-                              typeAndName + QLatin1String(" = ") + file->textOf(m_expression));
-            } else {
-                // Check if varName is already used
-                if (DeclarationStatementAST *ds = m_forAst->initializer->asDeclarationStatement()) {
-                    if (DeclarationAST *decl = ds->declaration) {
-                        if (SimpleDeclarationAST *sdecl = decl->asSimpleDeclaration()) {
-                            for (;;) {
-                                bool match = false;
-                                for (DeclaratorListAST *it = sdecl->declarator_list; it;
-                                     it = it->next) {
-                                    if (file->textOf(it->value->core_declarator) == varName) {
-                                        varName += QLatin1Char('X');
-                                        match = true;
-                                        break;
-                                    }
-                                }
-                                if (!match)
-                                    break;
-                            }
-                        }
-                    }
-                }
-
-                renamePos = file->endOf(m_forAst->initializer) + 1;
-                change.insert(file->endOf(m_forAst->initializer) - 1, // "-1" because of ";"
-                              QLatin1String(", ") + varName + QLatin1String(" = ")
-                              + file->textOf(m_expression));
-            }
-
-            ChangeSet::Range exprRange(file->startOf(m_expression), file->endOf(m_expression));
-            change.replace(exprRange, varName);
-        }
-
-        file->setChangeSet(change);
-        file->apply();
-
-        // Select variable name and trigger symbol rename
-        if (renamePos != -1) {
-            QTextCursor c = file->cursor();
-            c.setPosition(renamePos);
-            editor()->setTextCursor(c);
-            editor()->renameSymbolUnderCursor();
-            c.select(QTextCursor::WordUnderCursor);
-            editor()->setTextCursor(c);
-        }
-    }
-
-private:
-    const ForStatementAST *m_forAst;
-    const bool m_optimizePostcrement;
-    const ExpressionAST *m_expression;
-    const FullySpecifiedType m_type;
-};
-
-} // anonymous namespace
-
-void OptimizeForLoop::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    const QList<AST *> path = interface.path();
-    ForStatementAST *forAst = nullptr;
-    if (!path.isEmpty())
-        forAst = path.last()->asForStatement();
-    if (!forAst || !interface.isCursorOn(forAst))
-        return;
-
-    // Check for optimizing a postcrement
-    const CppRefactoringFilePtr file = interface.currentFile();
-    bool optimizePostcrement = false;
-    if (forAst->expression) {
-        if (PostIncrDecrAST *incrdecr = forAst->expression->asPostIncrDecr()) {
-            const Token t = file->tokenAt(incrdecr->incr_decr_token);
-            if (t.is(T_PLUS_PLUS) || t.is(T_MINUS_MINUS))
-                optimizePostcrement = true;
-        }
-    }
-
-    // Check for optimizing condition
-    bool optimizeCondition = false;
-    FullySpecifiedType conditionType;
-    ExpressionAST *conditionExpression = nullptr;
-    if (forAst->initializer && forAst->condition) {
-        if (BinaryExpressionAST *binary = forAst->condition->asBinaryExpression()) {
-            // Get the expression against which we should evaluate
-            IdExpressionAST *conditionId = binary->left_expression->asIdExpression();
-            if (conditionId) {
-                conditionExpression = binary->right_expression;
-            } else {
-                conditionId = binary->right_expression->asIdExpression();
-                conditionExpression = binary->left_expression;
-            }
-
-            if (conditionId && conditionExpression
-                    && !(conditionExpression->asNumericLiteral()
-                         || conditionExpression->asStringLiteral()
-                         || conditionExpression->asIdExpression()
-                         || conditionExpression->asUnaryExpression())) {
-                // Determine type of for initializer
-                FullySpecifiedType initializerType;
-                if (DeclarationStatementAST *stmt = forAst->initializer->asDeclarationStatement()) {
-                    if (stmt->declaration) {
-                        if (SimpleDeclarationAST *decl = stmt->declaration->asSimpleDeclaration()) {
-                            if (decl->symbols) {
-                                if (Symbol *symbol = decl->symbols->value)
-                                    initializerType = symbol->type();
-                            }
-                        }
-                    }
-                }
-
-                // Determine type of for condition
-                TypeOfExpression typeOfExpression;
-                typeOfExpression.init(interface.semanticInfo().doc, interface.snapshot(),
-                                      interface.context().bindings());
-                typeOfExpression.setExpandTemplates(true);
-                Scope *scope = file->scopeAt(conditionId->firstToken());
-                const QList<LookupItem> conditionItems = typeOfExpression(
-                            conditionId, interface.semanticInfo().doc, scope);
-                if (!conditionItems.isEmpty())
-                    conditionType = conditionItems.first().type();
-
-                if (conditionType.isValid()
-                        && (file->textOf(forAst->initializer) == QLatin1String(";")
-                            || initializerType == conditionType)) {
-                    optimizeCondition = true;
-                }
-            }
-        }
-    }
-
-    if (optimizePostcrement || optimizeCondition) {
-        result << new OptimizeForLoopOperation(interface, forAst, optimizePostcrement,
-                                               optimizeCondition ? conditionExpression : nullptr,
-                                               conditionType);
-    }
-}
-
-namespace {
-
-class EscapeStringLiteralOperation: public CppQuickFixOperation
-{
-public:
-    EscapeStringLiteralOperation(const CppQuickFixInterface &interface,
-                                 ExpressionAST *literal, bool escape)
-        : CppQuickFixOperation(interface)
-        , m_literal(literal)
-        , m_escape(escape)
-    {
-        if (m_escape) {
-            setDescription(Tr::tr("Escape String Literal as UTF-8"));
-        } else {
-            setDescription(Tr::tr("Unescape String Literal as UTF-8"));
-        }
-    }
-
-private:
-    static inline bool isDigit(quint8 ch, int base)
-    {
-        if (base == 8)
-            return ch >= '0' && ch < '8';
-        if (base == 16)
-            return isxdigit(ch);
-        return false;
-    }
-
-    static QByteArrayList escapeString(const QByteArray &contents)
-    {
-        QByteArrayList newContents;
-        QByteArray chunk;
-        bool wasEscaped = false;
-        for (const quint8 c : contents) {
-            const bool needsEscape = !isascii(c) || !isprint(c);
-            if (!needsEscape && wasEscaped && std::isxdigit(c) && !chunk.isEmpty()) {
-                newContents << chunk;
-                chunk.clear();
-            }
-            if (needsEscape)
-                chunk += QByteArray("\\x") + QByteArray::number(c, 16).rightJustified(2, '0');
-            else
-                chunk += c;
-            wasEscaped = needsEscape;
-        }
-        if (!chunk.isEmpty())
-            newContents << chunk;
-        return newContents;
-    }
-
-    static QByteArray unescapeString(const QByteArray &contents)
-    {
-        QByteArray newContents;
-        const int len = contents.length();
-        for (int i = 0; i < len; ++i) {
-            quint8 c = contents.at(i);
-            if (c == '\\' && i < len - 1) {
-                int idx = i + 1;
-                quint8 ch = contents.at(idx);
-                int base = 0;
-                int maxlen = 0;
-                if (isDigit(ch, 8)) {
-                    base = 8;
-                    maxlen = 3;
-                } else if ((ch == 'x' || ch == 'X') && idx < len - 1) {
-                    base = 16;
-                    maxlen = 2;
-                    ch = contents.at(++idx);
-                }
-                if (base > 0) {
-                    QByteArray buf;
-                    while (isDigit(ch, base) && idx < len && buf.length() < maxlen) {
-                        buf += ch;
-                        ++idx;
-                        if (idx == len)
-                            break;
-                        ch = contents.at(idx);
-                    }
-                    if (!buf.isEmpty()) {
-                        bool ok;
-                        uint value = buf.toUInt(&ok, base);
-                        // Don't unescape isascii() && !isprint()
-                        if (ok && (!isascii(value) || isprint(value))) {
-                            newContents += value;
-                            i = idx - 1;
-                            continue;
-                        }
-                    }
-                }
-                newContents += c;
-                c = contents.at(++i);
-            }
-            newContents += c;
-        }
-        return newContents;
-    }
-
-    // QuickFixOperation interface
-public:
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-
-        const int startPos = currentFile->startOf(m_literal);
-        const int endPos = currentFile->endOf(m_literal);
-
-        StringLiteralAST *stringLiteral = m_literal->asStringLiteral();
-        QTC_ASSERT(stringLiteral, return);
-        const QByteArray oldContents(currentFile->tokenAt(stringLiteral->literal_token).
-                                     identifier->chars());
-        QByteArrayList newContents;
-        if (m_escape)
-            newContents = escapeString(oldContents);
-        else
-            newContents = {unescapeString(oldContents)};
-
-        if (newContents.isEmpty()
-                || (newContents.size() == 1 && newContents.first() == oldContents)) {
-            return;
-        }
-
-        QTextCodec *utf8codec = QTextCodec::codecForName("UTF-8");
-        QScopedPointer<QTextDecoder> decoder(utf8codec->makeDecoder());
-        ChangeSet changes;
-
-        bool replace = true;
-        for (const QByteArray &chunk : std::as_const(newContents)) {
-            const QString str = decoder->toUnicode(chunk);
-            const QByteArray utf8buf = str.toUtf8();
-            if (!utf8codec->canEncode(str) || chunk != utf8buf)
-                return;
-            if (replace)
-                changes.replace(startPos + 1, endPos - 1, str);
-            else
-                changes.insert(endPos, "\"" + str + "\"");
-            replace = false;
-        }
-        currentFile->setChangeSet(changes);
-        currentFile->apply();
-    }
-
-private:
-    ExpressionAST *m_literal;
-    bool m_escape;
-};
-
-} // anonymous namespace
-
-void EscapeStringLiteral::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-    if (path.isEmpty())
-        return;
-
-    AST * const lastAst = path.last();
-    ExpressionAST *literal = lastAst->asStringLiteral();
-    if (!literal)
-        return;
-
-    StringLiteralAST *stringLiteral = literal->asStringLiteral();
-    CppRefactoringFilePtr file = interface.currentFile();
-    const QByteArray contents(file->tokenAt(stringLiteral->literal_token).identifier->chars());
-
-    bool canEscape = false;
-    bool canUnescape = false;
-    for (int i = 0; i < contents.length(); ++i) {
-        quint8 c = contents.at(i);
-        if (!isascii(c) || !isprint(c)) {
-            canEscape = true;
-        } else if (c == '\\' && i < contents.length() - 1) {
-            c = contents.at(++i);
-            if ((c >= '0' && c < '8') || c == 'x' || c == 'X')
-                canUnescape = true;
-        }
-    }
-
-    if (canEscape)
-        result << new EscapeStringLiteralOperation(interface, literal, true);
-
-    if (canUnescape)
-        result << new EscapeStringLiteralOperation(interface, literal, false);
-}
-
-
-namespace {
-
-class ConvertQt4ConnectOperation: public CppQuickFixOperation
-{
-public:
-    ConvertQt4ConnectOperation(const CppQuickFixInterface &interface, const ChangeSet &changes)
-        : CppQuickFixOperation(interface, 1), m_changes(changes)
-    {
-        setDescription(Tr::tr("Convert connect() to Qt 5 Style"));
-    }
-
-private:
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-        currentFile->setChangeSet(m_changes);
-        currentFile->apply();
-    }
-
-    const ChangeSet m_changes;
-};
-
-Symbol *skipForwardDeclarations(const QList<Symbol *> &symbols)
-{
-    for (Symbol *symbol : symbols) {
-        if (!symbol->type()->asForwardClassDeclarationType())
-            return symbol;
-    }
-
-    return nullptr;
-}
-
-bool findRawAccessFunction(Class *klass, PointerType *pointerType, QString *objAccessFunction)
-{
-    QList<Function *> candidates;
-    for (auto it = klass->memberBegin(), end = klass->memberEnd(); it != end; ++it) {
-        if (Function *func = (*it)->asFunction()) {
-            const Name *funcName = func->name();
-            if (!funcName->asOperatorNameId()
-                    && !funcName->asConversionNameId()
-                    && func->returnType().type() == pointerType
-                    && func->isConst()
-                    && func->argumentCount() == 0) {
-                candidates << func;
-            }
-        }
-    }
-    const Name *funcName = nullptr;
-    switch (candidates.size()) {
-    case 0:
-        return false;
-    case 1:
-        funcName = candidates.first()->name();
-        break;
-    default:
-        // Multiple candidates - prefer a function named data
-        for (Function *func : std::as_const(candidates)) {
-            if (!strcmp(func->name()->identifier()->chars(), "data")) {
-                funcName = func->name();
-                break;
-            }
-        }
-        if (!funcName)
-            funcName = candidates.first()->name();
-    }
-    const Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
-    *objAccessFunction = QLatin1Char('.') + oo.prettyName(funcName) + QLatin1String("()");
-    return true;
-}
-
-PointerType *determineConvertedType(NamedType *namedType, const LookupContext &context,
-                                    Scope *scope, QString *objAccessFunction)
-{
-    if (!namedType)
-        return nullptr;
-    if (ClassOrNamespace *binding = context.lookupType(namedType->name(), scope)) {
-        if (Symbol *objectClassSymbol = skipForwardDeclarations(binding->symbols())) {
-            if (Class *klass = objectClassSymbol->asClass()) {
-                for (auto it = klass->memberBegin(), end = klass->memberEnd(); it != end; ++it) {
-                    if (Function *func = (*it)->asFunction()) {
-                        if (const ConversionNameId *conversionName =
-                                func->name()->asConversionNameId()) {
-                            if (PointerType *type = conversionName->type()->asPointerType()) {
-                                if (findRawAccessFunction(klass, type, objAccessFunction))
-                                    return type;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    return nullptr;
-}
-
-Class *senderOrReceiverClass(const CppQuickFixInterface &interface,
-                             const CppRefactoringFilePtr &file,
-                             const ExpressionAST *objectPointerAST,
-                             Scope *objectPointerScope,
-                             QString *objAccessFunction)
-{
-    const LookupContext &context = interface.context();
-
-    QByteArray objectPointerExpression;
-    if (objectPointerAST)
-        objectPointerExpression = file->textOf(objectPointerAST).toUtf8();
-    else
-        objectPointerExpression = "this";
-
-    TypeOfExpression toe;
-    toe.setExpandTemplates(true);
-    toe.init(interface.semanticInfo().doc, interface.snapshot(), context.bindings());
-    const QList<LookupItem> objectPointerExpressions = toe(objectPointerExpression,
-                                                           objectPointerScope, TypeOfExpression::Preprocess);
-    QTC_ASSERT(!objectPointerExpressions.isEmpty(), return nullptr);
-
-    Type *objectPointerTypeBase = objectPointerExpressions.first().type().type();
-    QTC_ASSERT(objectPointerTypeBase, return nullptr);
-
-    PointerType *objectPointerType = objectPointerTypeBase->asPointerType();
-    if (!objectPointerType) {
-        objectPointerType = determineConvertedType(objectPointerTypeBase->asNamedType(), context,
-                                               objectPointerScope, objAccessFunction);
-    }
-    QTC_ASSERT(objectPointerType, return nullptr);
-
-    Type *objectTypeBase = objectPointerType->elementType().type(); // Dereference
-    QTC_ASSERT(objectTypeBase, return nullptr);
-
-    NamedType *objectType = objectTypeBase->asNamedType();
-    QTC_ASSERT(objectType, return nullptr);
-
-    ClassOrNamespace *objectClassCON = context.lookupType(objectType->name(), objectPointerScope);
-    if (!objectClassCON) {
-        objectClassCON = objectPointerExpressions.first().binding();
-        QTC_ASSERT(objectClassCON, return nullptr);
-    }
-    QTC_ASSERT(!objectClassCON->symbols().isEmpty(), return nullptr);
-
-    Symbol *objectClassSymbol = skipForwardDeclarations(objectClassCON->symbols());
-    QTC_ASSERT(objectClassSymbol, return nullptr);
-
-    return objectClassSymbol->asClass();
-}
-
-bool findConnectReplacement(const CppQuickFixInterface &interface,
-                            const ExpressionAST *objectPointerAST,
-                            const QtMethodAST *methodAST,
-                            const CppRefactoringFilePtr &file,
-                            QString *replacement,
-                            QString *objAccessFunction)
-{
-    // Get name of method
-    if (!methodAST->declarator || !methodAST->declarator->core_declarator)
-        return false;
-
-    DeclaratorIdAST *methodDeclIdAST = methodAST->declarator->core_declarator->asDeclaratorId();
-    if (!methodDeclIdAST)
-        return false;
-
-    NameAST *methodNameAST = methodDeclIdAST->name;
-    if (!methodNameAST)
-        return false;
-
-    // Lookup object pointer type
-    Scope *scope = file->scopeAt(methodAST->firstToken());
-    Class *objectClass = senderOrReceiverClass(interface, file, objectPointerAST, scope,
-                                               objAccessFunction);
-    QTC_ASSERT(objectClass, return false);
-
-    // Look up member function in call, including base class members.
-    const LookupContext &context = interface.context();
-    const QList<LookupItem> methodResults = context.lookup(methodNameAST->name, objectClass);
-    if (methodResults.isEmpty())
-        return false; // Maybe mis-spelled signal/slot name
-
-    Scope *baseClassScope = methodResults.at(0).scope(); // FIXME: Handle overloads
-    QTC_ASSERT(baseClassScope, return false);
-
-    Class *classOfMethod = baseClassScope->asClass(); // Declaration point of signal/slot
-    QTC_ASSERT(classOfMethod, return false);
-
-    Symbol *method = methodResults.at(0).declaration();
-    QTC_ASSERT(method, return false);
-
-    // Minimize qualification
-    Control *control = context.bindings()->control().get();
-    ClassOrNamespace *functionCON = context.lookupParent(scope);
-    const Name *shortName = LookupContext::minimalName(method, functionCON, control);
-    if (!shortName->asQualifiedNameId())
-        shortName = control->qualifiedNameId(classOfMethod->name(), shortName);
-
-    const Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
-    *replacement = QLatin1Char('&') + oo.prettyName(shortName);
-    return true;
-}
-
-bool onConnectOrDisconnectCall(AST *ast, const ExpressionListAST **arguments)
-{
-    if (!ast)
-        return false;
-
-    CallAST *call = ast->asCall();
-    if (!call)
-        return false;
-
-    if (!call->base_expression)
-        return false;
-
-    const IdExpressionAST *idExpr = call->base_expression->asIdExpression();
-    if (!idExpr || !idExpr->name || !idExpr->name->name)
-        return false;
-
-    const ExpressionListAST *args = call->expression_list;
-    if (!arguments)
-        return false;
-
-    const Identifier *id = idExpr->name->name->identifier();
-    if (!id)
-        return false;
-
-    const QByteArray name(id->chars(), id->size());
-    if (name != "connect" && name != "disconnect")
-        return false;
-
-    if (arguments)
-        *arguments = args;
-    return true;
-}
-
-// Might modify arg* output arguments even if false is returned.
-bool collectConnectArguments(const ExpressionListAST *arguments,
-                             const ExpressionAST **arg1, const QtMethodAST **arg2,
-                             const ExpressionAST **arg3, const QtMethodAST **arg4)
-{
-    if (!arguments || !arg1 || !arg2 || !arg3 || !arg4)
-        return false;
-
-    *arg1 = arguments->value;
-    arguments = arguments->next;
-    if (!arg1 || !arguments)
-        return false;
-
-    *arg2 = arguments->value->asQtMethod();
-    arguments = arguments->next;
-    if (!*arg2 || !arguments)
-        return false;
-
-    *arg3 = arguments->value;
-    if (!*arg3)
-        return false;
-
-    // Take care of three-arg version, with 'this' receiver.
-    if (QtMethodAST *receiverMethod = arguments->value->asQtMethod()) {
-        *arg3 = nullptr; // Means 'this'
-        *arg4 = receiverMethod;
-        return true;
-    }
-
-    arguments = arguments->next;
-    if (!arguments)
-        return false;
-
-    *arg4 = arguments->value->asQtMethod();
-    if (!*arg4)
-        return false;
-
-    return true;
-}
-
-} // anonynomous namespace
-
-void ConvertQt4Connect::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-
-    for (int i = path.size(); --i >= 0; ) {
-        const ExpressionListAST *arguments;
-        if (!onConnectOrDisconnectCall(path.at(i), &arguments))
-            continue;
-
-        const ExpressionAST *arg1, *arg3;
-        const QtMethodAST *arg2, *arg4;
-        if (!collectConnectArguments(arguments, &arg1, &arg2, &arg3, &arg4))
-            continue;
-
-        const CppRefactoringFilePtr file = interface.currentFile();
-
-        QString newSignal;
-        QString senderAccessFunc;
-        if (!findConnectReplacement(interface, arg1, arg2, file, &newSignal, &senderAccessFunc))
-            continue;
-
-        QString newMethod;
-        QString receiverAccessFunc;
-        if (!findConnectReplacement(interface, arg3, arg4, file, &newMethod, &receiverAccessFunc))
-            continue;
-
-        ChangeSet changes;
-        changes.replace(file->endOf(arg1), file->endOf(arg1), senderAccessFunc);
-        changes.replace(file->startOf(arg2), file->endOf(arg2), newSignal);
-        if (!arg3)
-            newMethod.prepend(QLatin1String("this, "));
-        else
-            changes.replace(file->endOf(arg3), file->endOf(arg3), receiverAccessFunc);
-        changes.replace(file->startOf(arg4), file->endOf(arg4), newMethod);
-
-        result << new ConvertQt4ConnectOperation(interface, changes);
-        return;
-    }
-}
-
-void ExtraRefactoringOperations::doMatch(const CppQuickFixInterface &interface,
-                                         QuickFixOperations &result)
-{
-    const auto processor = CppModelManager::cppEditorDocumentProcessor(interface.filePath());
-    if (processor) {
-        const auto clangFixItOperations = processor->extraRefactoringOperations(interface);
-        result.append(clangFixItOperations);
-    }
-}
-
-namespace {
-
-/**
- * @brief The NameCounter class counts the parts of a name. E.g. 2 for std::vector or 1 for variant
- */
-class NameCounter : private NameVisitor
-{
-public:
-    int count(const Name *name)
-    {
-        counter = 0;
-        accept(name);
-        return counter;
-    }
-
-private:
-    void visit(const Identifier *) override { ++counter; }
-    void visit(const DestructorNameId *) override { ++counter; }
-    void visit(const TemplateNameId *) override { ++counter; }
-    void visit(const QualifiedNameId *name) override
-    {
-        if (name->base())
-            accept(name->base());
-        accept(name->name());
-    }
-    int counter;
-};
-
-/**
- * @brief getBaseName returns the base name of a qualified name or nullptr.
- * E.g.: foo::bar => foo; bar => bar
- * @param name The Name, maybe qualified
- * @return The base name of the qualified name or nullptr
- */
-const Identifier *getBaseName(const Name *name)
-{
-    class GetBaseName : public NameVisitor
-    {
-        void visit(const Identifier *name) override { baseName = name; }
-        void visit(const QualifiedNameId *name) override
-        {
-            if (name->base())
-                accept(name->base());
-            else
-                accept(name->name());
-        }
-
-    public:
-        const Identifier *baseName = nullptr;
-    };
-    GetBaseName getter;
-    getter.accept(name);
-    return getter.baseName;
-}
-
-/**
- * @brief countNames counts the parts of the Name.
- * E.g. if the name is std::vector, the function returns 2, if the name is variant, returns 1
- * @param name The name that should be counted
- * @return the number of parts of the name
- */
-int countNames(const Name *name)
-{
-    return NameCounter{}.count(name);
-}
-
-/**
- * @brief removeLine removes the whole line in which the ast node is located if there are otherwise only whitespaces
- * @param file The file in which the AST node is located
- * @param ast The ast node
- * @param changeSet The ChangeSet of the file
- */
-void removeLine(const CppRefactoringFile *file, AST *ast, ChangeSet &changeSet)
-{
-    RefactoringFile::Range range = file->range(ast);
-    --range.start;
-    while (range.start >= 0) {
-        QChar current = file->charAt(range.start);
-        if (!current.isSpace()) {
-            ++range.start;
-            break;
-        }
-        if (current == QChar::ParagraphSeparator)
-            break;
-        --range.start;
-    }
-    range.start = std::max(0, range.start);
-    while (range.end < file->document()->characterCount()) {
-        QChar current = file->charAt(range.end);
-        if (!current.isSpace())
-            break;
-        if (current == QChar::ParagraphSeparator)
-            break;
-        ++range.end;
-    }
-    range.end = std::min(file->document()->characterCount(), range.end);
-    const bool newLineStart = file->charAt(range.start) == QChar::ParagraphSeparator;
-    const bool newLineEnd = file->charAt(range.end) == QChar::ParagraphSeparator;
-    if (!newLineEnd && newLineStart)
-        ++range.start;
-    changeSet.remove(range);
-}
-
-/**
- * @brief The RemoveNamespaceVisitor class removes a using namespace and rewrites all types that
- * are in the namespace if needed
- */
-class RemoveNamespaceVisitor : public ASTVisitor
-{
-public:
-    constexpr static int SearchGlobalUsingDirectivePos = std::numeric_limits<int>::max();
-    RemoveNamespaceVisitor(const CppRefactoringFile *file,
-                           const Snapshot &snapshot,
-                           const Name *namespace_,
-                           int symbolPos,
-                           bool removeAllAtGlobalScope)
-        : ASTVisitor(file->cppDocument()->translationUnit())
-        , m_file(file)
-        , m_snapshot(snapshot)
-        , m_namespace(namespace_)
-        , m_missingNamespace(toString(namespace_) + "::")
-        , m_context(m_file->cppDocument(), m_snapshot)
-        , m_symbolPos(symbolPos)
-        , m_removeAllAtGlobalScope(removeAllAtGlobalScope)
-
-    {}
-
-    const ChangeSet &getChanges() { return m_changeSet; }
-
-    /**
-     * @brief isGlobalUsingNamespace return true if the using namespace that should be removed
-     * is not scoped and other files that include this file will also use the using namespace
-     * @return true if using namespace statement is global and not scoped, false otherwise
-     */
-    bool isGlobalUsingNamespace() const { return m_parentNode == nullptr; }
-
-    /**
-     * @brief foundGlobalUsingNamespace return true if removeAllAtGlobalScope is false and
-     * another using namespace is found at the global scope, so that other files that include this
-     * file don't have to be processed
-     * @return true if there was a 'global' second using namespace in this file and
-     * removeAllAtGlobalScope is false
-     */
-    bool foundGlobalUsingNamespace() const { return m_foundNamespace; }
-
-private:
-    bool preVisit(AST *ast) override
-    {
-        if (!m_start) {
-            if (ast->asTranslationUnit())
-                return true;
-            if (UsingDirectiveAST *usingDirective = ast->asUsingDirective()) {
-                if (nameEqual(usingDirective->name->name, m_namespace)) {
-                    if (m_symbolPos == SearchGlobalUsingDirectivePos) {
-                        // we have found a global using directive, so lets start
-                        m_start = true;
-                        removeLine(m_file, ast, m_changeSet);
-                        return false;
-                    }
-                    // ignore the using namespace that should be removed
-                    if (m_file->endOf(ast) != m_symbolPos) {
-                        if (m_removeAllAtGlobalScope)
-                            removeLine(m_file, ast, m_changeSet);
-                        else
-                            m_done = true;
-                    }
-                }
-            }
-            // if the end of the ast is before we should start, we are not interested in the node
-            if (m_file->endOf(ast) <= m_symbolPos)
-                return false;
-
-            if (m_file->startOf(ast) > m_symbolPos)
-                m_start = true;
-        }
-        return !m_foundNamespace && !m_done;
-    }
-
-    bool visit(NamespaceAST *ast) override
-    {
-        if (m_start && nameEqual(m_namespace, ast->symbol->name()))
-            return false;
-
-        return m_start;
-    }
-
-    // scopes for using namespace statements:
-    bool visit(LinkageBodyAST *ast) override { return visitNamespaceScope(ast); }
-    bool visit(CompoundStatementAST *ast) override { return visitNamespaceScope(ast); }
-    bool visitNamespaceScope(AST *ast)
-    {
-        ++m_namespaceScopeCounter;
-        if (!m_start)
-            m_parentNode = ast;
-        return true;
-    }
-
-    void endVisit(LinkageBodyAST *ast) override { endVisitNamespaceScope(ast); }
-    void endVisit(CompoundStatementAST *ast) override { endVisitNamespaceScope(ast); }
-    void endVisitNamespaceScope(AST *ast)
-    {
-        --m_namespaceScopeCounter;
-        m_foundNamespace = false;
-        // if we exit the scope of the using namespace we are done
-        if (ast == m_parentNode)
-            m_done = true;
-    }
-
-    bool visit(UsingDirectiveAST *ast) override
-    {
-        if (nameEqual(ast->name->name, m_namespace)) {
-            if (m_removeAllAtGlobalScope && m_namespaceScopeCounter == 0)
-                removeLine(m_file, ast, m_changeSet);
-            else
-                m_foundNamespace = true;
-            return false;
-        }
-        return handleAstWithLongestName(ast);
-    }
-
-    bool visit(DeclaratorIdAST *ast) override
-    {
-        // e.g. we have the following code and get the following Lookup items:
-        // namespace test {
-        //   struct foo { // 1. item with test::foo
-        //     foo();     // 2. item with test::foo::foo
-        //   };
-        // }
-        // using namespace foo;
-        // foo::foo() { ... } // 3. item with foo::foo
-        // Our current name is foo::foo so we have to match with the 2. item / longest name
-        return handleAstWithLongestName(ast);
-    }
-
-    template<typename AST>
-    bool handleAstWithLongestName(AST *ast)
-    {
-        if (m_start) {
-            Scope *scope = m_file->scopeAt(ast->firstToken());
-            const QList<LookupItem> localLookup = m_context.lookup(ast->name->name, scope);
-            QList<const Name *> longestName;
-            for (const LookupItem &item : localLookup) {
-                QList<const Name *> names
-                    = m_context.fullyQualifiedName(item.declaration(),
-                                                   LookupContext::HideInlineNamespaces);
-                if (names.length() > longestName.length())
-                    longestName = names;
-            }
-            const int currentNameCount = countNames(ast->name->name);
-            const bool needNew = needMissingNamespaces(std::move(longestName), currentNameCount);
-            if (needNew)
-                insertMissingNamespace(ast);
-        }
-        return false;
-    }
-
-    bool visit(NamedTypeSpecifierAST *ast) override { return handleAstWithName(ast); }
-
-    bool visit(IdExpressionAST *ast) override { return handleAstWithName(ast); }
-
-    template<typename AST>
-    bool handleAstWithName(AST *ast)
-    {
-        if (m_start) {
-            Scope *scope = m_file->scopeAt(ast->firstToken());
-            const Name *wantToLookup = ast->name->name;
-            // first check if the base name is a typedef. Consider the following example:
-            // using namespace std;
-            // using vec = std::vector<int>;
-            // vec::iterator it; // we have to lookup 'vec' and not iterator (would result in
-            //   std::vector<int>::iterator => std::vec::iterator, which is wrong)
-            const Name *baseName = getBaseName(wantToLookup);
-            QList<LookupItem> typedefCandidates = m_context.lookup(baseName, scope);
-            if (!typedefCandidates.isEmpty()) {
-                if (typedefCandidates.front().declaration()->isTypedef())
-                    wantToLookup = baseName;
-            }
-
-            const QList<LookupItem> lookups = m_context.lookup(wantToLookup, scope);
-            if (!lookups.empty()) {
-                QList<const Name *> fullName
-                    = m_context.fullyQualifiedName(lookups.first().declaration(),
-                                                   LookupContext::HideInlineNamespaces);
-                const int currentNameCount = countNames(wantToLookup);
-                const bool needNamespace = needMissingNamespaces(std::move(fullName),
-                                                                 currentNameCount);
-                if (needNamespace)
-                    insertMissingNamespace(ast);
-            }
-        }
-        return true;
-    }
-
-    template<typename AST>
-    void insertMissingNamespace(AST *ast)
-    {
-        DestructorNameAST *destructorName = ast->name->asDestructorName();
-        if (destructorName)
-            m_changeSet.insert(m_file->startOf(destructorName->unqualified_name), m_missingNamespace);
-        else
-            m_changeSet.insert(m_file->startOf(ast->name), m_missingNamespace);
-        m_changeSet.operationList().last().setFormat1(false);
-    }
-
-    bool needMissingNamespaces(QList<const Name *> &&fullName, int currentNameCount)
-    {
-        if (currentNameCount > fullName.length())
-            return false;
-
-        // eg. fullName = std::vector, currentName = vector => result should be std
-        fullName.erase(fullName.end() - currentNameCount, fullName.end());
-        if (fullName.empty())
-            return false;
-        return nameEqual(m_namespace, fullName.last());
-    }
-
-    static bool nameEqual(const Name *name1, const Name *name2)
-    {
-        return Matcher::match(name1, name2);
-    }
-
-    QString toString(const Name *id)
-    {
-        const Identifier *identifier = id->asNameId();
-        QTC_ASSERT(identifier, return {});
-        return QString::fromUtf8(identifier->chars(), identifier->size());
-    }
-
-    const CppRefactoringFile *const m_file;
-    const Snapshot &m_snapshot;
-
-    const Name *m_namespace;          // the name of the namespace that should be removed
-    const QString m_missingNamespace; // that should be added if a type was using the namespace
-    LookupContext m_context;
-    ChangeSet m_changeSet;
-    const int m_symbolPos; // the end position of the start symbol
-    bool m_done = false;
-    bool m_start = false;
-    // true if a using namespace was found at a scope and the scope should be left
-    bool m_foundNamespace = false;
-    bool m_removeAllAtGlobalScope;
-    // the scope where the using namespace that should be removed is valid
-    AST *m_parentNode = nullptr;
-    int m_namespaceScopeCounter = 0;
-};
-
-class RemoveUsingNamespaceOperation : public CppQuickFixOperation
-{
-    struct Node
-    {
-        Document::Ptr document;
-        bool hasGlobalUsingDirective = false;
-        int unprocessedParents;
-        std::vector<std::reference_wrapper<Node>> includes;
-        std::vector<std::reference_wrapper<Node>> includedBy;
-        Node() = default;
-        Node(const Node &) = delete;
-        Node(Node &&) = delete;
-    };
-
-public:
-    RemoveUsingNamespaceOperation(const CppQuickFixInterface &interface,
-                                  UsingDirectiveAST *usingDirective,
-                                  bool removeAllAtGlobalScope)
-        : CppQuickFixOperation(interface, 1)
-        , m_usingDirective(usingDirective)
-        , m_removeAllAtGlobalScope(removeAllAtGlobalScope)
-    {
-        const QString name = Overview{}.prettyName(usingDirective->name->name);
-        if (m_removeAllAtGlobalScope) {
-            setDescription(Tr::tr(
-                               "Remove All Occurrences of \"using namespace %1\" in Global Scope "
-                               "and Adjust Type Names Accordingly")
-                               .arg(name));
-        } else {
-            setDescription(Tr::tr("Remove \"using namespace %1\" and "
-                                  "Adjust Type Names Accordingly")
-                               .arg(name));
-        }
-    }
-
-private:
-    std::map<Utils::FilePath, Node> buildIncludeGraph(CppRefactoringChanges &refactoring)
-    {
-        using namespace ProjectExplorer;
-        using namespace Utils;
-
-        const Snapshot &s = refactoring.snapshot();
-        std::map<Utils::FilePath, Node> includeGraph;
-
-        auto handleFile = [&](const FilePath &filePath, Document::Ptr doc, auto shouldHandle) {
-            Node &node = includeGraph[filePath];
-            node.document = doc;
-            for (const Document::Include &include : doc->resolvedIncludes()) {
-                const FilePath filePath = include.resolvedFileName();
-                if (shouldHandle(filePath)) {
-                    Node &includedNode = includeGraph[filePath];
-                    includedNode.includedBy.push_back(node);
-                    node.includes.push_back(includedNode);
-                }
-            }
-        };
-
-        if (const Project *project = ProjectManager::projectForFile(filePath())) {
-            const FilePaths files = project->files(ProjectExplorer::Project::SourceFiles);
-            QSet<FilePath> projectFiles(files.begin(), files.end());
-            for (const auto &file : files) {
-                const Document::Ptr doc = s.document(file);
-                if (!doc)
-                    continue;
-                handleFile(file, doc, [&](const FilePath &file) {
-                    return projectFiles.contains(file);
-                });
-            }
-        } else {
-            for (auto i = s.begin(); i != s.end(); ++i) {
-                if (ProjectFile::classify(i.key().toString()) != ProjectFile::Unsupported) {
-                    handleFile(i.key(), i.value(), [](const FilePath &file) {
-                        return ProjectFile::classify(file.toString()) != ProjectFile::Unsupported;
-                    });
-                }
-            }
-        }
-        for (auto &[_, node] : includeGraph) {
-            Q_UNUSED(_)
-            node.unprocessedParents = static_cast<int>(node.includes.size());
-        }
-        return includeGraph;
-    }
-
-    void removeAllUsingsAtGlobalScope(CppRefactoringChanges &refactoring)
-    {
-        auto includeGraph = buildIncludeGraph(refactoring);
-        std::vector<std::reference_wrapper<Node>> nodesWithProcessedParents;
-        for (auto &[_, node] : includeGraph) {
-            Q_UNUSED(_)
-            if (!node.unprocessedParents)
-                nodesWithProcessedParents.push_back(node);
-        }
-        while (!nodesWithProcessedParents.empty()) {
-            Node &node = nodesWithProcessedParents.back();
-            nodesWithProcessedParents.pop_back();
-            CppRefactoringFilePtr file = refactoring.cppFile(node.document->filePath());
-            const bool parentHasUsing = Utils::anyOf(node.includes, &Node::hasGlobalUsingDirective);
-            const int startPos = parentHasUsing
-                                     ? 0
-                                     : RemoveNamespaceVisitor::SearchGlobalUsingDirectivePos;
-            const bool noGlobalUsing = refactorFile(file, refactoring.snapshot(), startPos);
-            node.hasGlobalUsingDirective = !noGlobalUsing || parentHasUsing;
-
-            for (Node &subNode : node.includedBy) {
-                --subNode.unprocessedParents;
-                if (subNode.unprocessedParents == 0)
-                    nodesWithProcessedParents.push_back(subNode);
-            }
-        }
-    }
-
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-        if (m_removeAllAtGlobalScope) {
-            removeAllUsingsAtGlobalScope(refactoring);
-        } else if (refactorFile(currentFile,
-                                refactoring.snapshot(),
-                                currentFile->endOf(m_usingDirective),
-                                true)) {
-            processIncludes(refactoring, filePath());
-        }
-
-        for (auto &file : std::as_const(m_changes))
-            file->apply();
-    }
-
-    /**
-     * @brief refactorFile remove using namespace xyz in the given file and rewrite types
-     * @param file The file that should be processed
-     * @param snapshot The snapshot to work on
-     * @param startSymbol start processing after this index
-     * @param removeUsing if the using directive is in this file, remove it
-     * @return true if the using statement is global and there is no other global using namespace
-     */
-    bool refactorFile(CppRefactoringFilePtr &file,
-                      const Snapshot &snapshot,
-                      int startSymbol,
-                      bool removeUsing = false)
-    {
-        RemoveNamespaceVisitor visitor(file.get(),
-                                       snapshot,
-                                       m_usingDirective->name->name,
-                                       startSymbol,
-                                       m_removeAllAtGlobalScope);
-        visitor.accept(file->cppDocument()->translationUnit()->ast());
-        Utils::ChangeSet changes = visitor.getChanges();
-        if (removeUsing)
-            removeLine(file.get(), m_usingDirective, changes);
-        if (!changes.isEmpty()) {
-            file->setChangeSet(changes);
-            // apply changes at the end, otherwise the symbol finder will fail to resolve symbols if
-            // the using namespace is missing
-            m_changes.insert(file);
-        }
-        return visitor.isGlobalUsingNamespace() && !visitor.foundGlobalUsingNamespace();
-    }
-
-    void processIncludes(CppRefactoringChanges &refactoring, const FilePath &filePath)
-    {
-        QList<Snapshot::IncludeLocation>
-            includeLocationsOfDocument = refactoring.snapshot().includeLocationsOfDocument(filePath);
-        for (Snapshot::IncludeLocation &loc : includeLocationsOfDocument) {
-            if (!Utils::insert(m_processed, loc.first))
-                continue;
-
-            CppRefactoringFilePtr file = refactoring.cppFile(loc.first->filePath());
-            const bool noGlobalUsing = refactorFile(file,
-                                                    refactoring.snapshot(),
-                                                    file->position(loc.second, 1));
-            if (noGlobalUsing)
-                processIncludes(refactoring, loc.first->filePath());
-        }
-    }
-
-    QSet<Document::Ptr> m_processed;
-    QSet<CppRefactoringFilePtr> m_changes;
-
-    UsingDirectiveAST *m_usingDirective;
-    bool m_removeAllAtGlobalScope;
-};
-} // namespace
-
-void RemoveUsingNamespace::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    const QList<AST *> &path = interface.path();
-    // We expect something like
-    // [0] TranslationUnitAST
-    // ...
-    // [] UsingDirectiveAST : if activated at 'using namespace'
-    // [] NameAST (optional): if activated at the name e.g. 'std'
-    int n = path.size() - 1;
-    if (n <= 0)
-        return;
-    if (path.last()->asName())
-        --n;
-    UsingDirectiveAST *usingDirective = path.at(n)->asUsingDirective();
-    if (usingDirective && usingDirective->name->name->asNameId()) {
-        result << new RemoveUsingNamespaceOperation(interface, usingDirective, false);
-        const bool isHeader = ProjectFile::isHeader(ProjectFile::classify(interface.filePath().toString()));
-        if (isHeader && path.at(n - 1)->asTranslationUnit()) // using namespace at global scope
-            result << new RemoveUsingNamespaceOperation(interface, usingDirective, true);
-    }
-}
-
-namespace {
-
-struct ParentClassConstructorInfo;
-
-class ConstructorMemberInfo
-{
-public:
-    ConstructorMemberInfo(const QString &name, Symbol *symbol, int numberOfMember)
-        : memberVariableName(name)
-        , parameterName(memberBaseName(name))
-        , symbol(symbol)
-        , type(symbol->type())
-        , numberOfMember(numberOfMember)
-    {}
-    ConstructorMemberInfo(const QString &memberName,
-                          const QString &paramName,
-                          const QString &defaultValue,
-                          Symbol *symbol,
-                          const ParentClassConstructorInfo *parentClassConstructor)
-        : parentClassConstructor(parentClassConstructor)
-        , memberVariableName(memberName)
-        , parameterName(paramName)
-        , defaultValue(defaultValue)
-        , init(defaultValue.isEmpty())
-        , symbol(symbol)
-        , type(symbol->type())
-    {}
-    const ParentClassConstructorInfo *parentClassConstructor = nullptr;
-    QString memberVariableName;
-    QString parameterName;
-    QString defaultValue;
-    bool init = true;
-    bool customValueType; // for the generation later
-    Symbol *symbol; // for the right type later
-    FullySpecifiedType type;
-    int numberOfMember; // first member, second member, ...
-};
-
-class ConstructorParams : public QAbstractTableModel
-{
-    Q_OBJECT
-    std::list<ConstructorMemberInfo> candidates;
-    std::vector<ConstructorMemberInfo *> infos;
-
-    void validateOrder()
-    {
-        // parameters with default values must be at the end
-        bool foundWithDefault = false;
-        for (auto info : infos) {
-            if (info->init) {
-                if (foundWithDefault && info->defaultValue.isEmpty()) {
-                    emit validOrder(false);
-                    return;
-                }
-                foundWithDefault |= !info->defaultValue.isEmpty();
-            }
-        }
-        emit validOrder(true);
-    }
-
-public:
-    enum Column { ShouldInitColumn, MemberNameColumn, ParameterNameColumn, DefaultValueColumn };
-    template<typename... _Args>
-    void emplaceBackParameter(_Args &&...__args)
-    {
-        candidates.emplace_back(std::forward<_Args>(__args)...);
-        infos.push_back(&candidates.back());
-    }
-    const std::vector<ConstructorMemberInfo *> &getInfos() const { return infos; }
-    void addRow(ConstructorMemberInfo *info)
-    {
-        beginInsertRows({}, rowCount(), rowCount());
-        infos.push_back(info);
-        endInsertRows();
-        validateOrder();
-    }
-    void removeRow(ConstructorMemberInfo *info)
-    {
-        for (auto iter = infos.begin(); iter != infos.end(); ++iter) {
-            if (*iter == info) {
-                const auto index = iter - infos.begin();
-                beginRemoveRows({}, index, index);
-                infos.erase(iter);
-                endRemoveRows();
-                validateOrder();
-                return;
-            }
-        }
-    }
-
-    int selectedCount() const
-    {
-        return Utils::count(infos, [](const ConstructorMemberInfo *mi) {
-            return mi->init && !mi->parentClassConstructor;
-        });
-    }
-    int memberCount() const
-    {
-        return Utils::count(infos, [](const ConstructorMemberInfo *mi) {
-            return !mi->parentClassConstructor;
-        });
-    }
-
-    int rowCount(const QModelIndex & /*parent*/ = {}) const override { return int(infos.size()); }
-    int columnCount(const QModelIndex & /*parent*/ = {}) const override { return 4; }
-    QVariant data(const QModelIndex &index, int role) const override
-    {
-        if (index.row() < 0 || index.row() >= rowCount())
-            return {};
-        if (role == Qt::CheckStateRole && index.column() == ShouldInitColumn
-            && !infos[index.row()]->parentClassConstructor)
-            return infos[index.row()]->init ? Qt::Checked : Qt::Unchecked;
-        if (role == Qt::DisplayRole && index.column() == MemberNameColumn)
-            return infos[index.row()]->memberVariableName;
-        if ((role == Qt::DisplayRole || role == Qt::EditRole)
-            && index.column() == ParameterNameColumn)
-            return infos[index.row()]->parameterName;
-        if ((role == Qt::DisplayRole || role == Qt::EditRole)
-            && index.column() == DefaultValueColumn)
-            return infos[index.row()]->defaultValue;
-        if ((role == Qt::ToolTipRole) && index.column() > 0)
-            return Overview{}.prettyType(infos[index.row()]->symbol->type());
-        return {};
-    }
-    bool setData(const QModelIndex &index, const QVariant &value, int role) override
-    {
-        if (index.column() == ShouldInitColumn && role == Qt::CheckStateRole) {
-            if (infos[index.row()]->parentClassConstructor)
-                return false;
-            infos[index.row()]->init = value.toInt() == Qt::Checked;
-            emit dataChanged(this->index(index.row(), 0), this->index(index.row(), columnCount()));
-            validateOrder();
-            return true;
-        }
-        if (index.column() == ParameterNameColumn && role == Qt::EditRole) {
-            infos[index.row()]->parameterName = value.toString();
-            return true;
-        }
-        if (index.column() == DefaultValueColumn && role == Qt::EditRole) {
-            infos[index.row()]->defaultValue = value.toString();
-            validateOrder();
-            return true;
-        }
-        return false;
-    }
-    Qt::DropActions supportedDropActions() const override { return Qt::MoveAction; }
-    Qt::ItemFlags flags(const QModelIndex &index) const override
-    {
-        if (!index.isValid())
-            return Qt::ItemIsSelectable | Qt::ItemIsDropEnabled;
-
-        Qt::ItemFlags f{};
-        if (infos[index.row()]->init) {
-            f |= Qt::ItemIsDragEnabled;
-            f |= Qt::ItemIsSelectable;
-        }
-
-        if (index.column() == ShouldInitColumn && !infos[index.row()]->parentClassConstructor)
-            return f | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable;
-        if (!infos[index.row()]->init)
-            return f;
-        if (index.column() == MemberNameColumn)
-            return f | Qt::ItemIsEnabled;
-        if (index.column() == ParameterNameColumn || index.column() == DefaultValueColumn)
-            return f | Qt::ItemIsEnabled | Qt::ItemIsEditable;
-        return {};
-    }
-
-    QVariant headerData(int section, Qt::Orientation orientation, int role) const override
-    {
-        if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
-            switch (section) {
-            case ShouldInitColumn:
-                return Tr::tr("Initialize in Constructor");
-            case MemberNameColumn:
-                return Tr::tr("Member Name");
-            case ParameterNameColumn:
-                return Tr::tr("Parameter Name");
-            case DefaultValueColumn:
-                return Tr::tr("Default Value");
-            }
-        }
-        return {};
-    }
-    bool dropMimeData(const QMimeData *data,
-                      Qt::DropAction /*action*/,
-                      int row,
-                      int /*column*/,
-                      const QModelIndex & /*parent*/) override
-    {
-        if (row == -1)
-            row = rowCount();
-        bool ok;
-        int sourceRow = data->data("application/x-qabstractitemmodeldatalist").toInt(&ok);
-        if (ok) {
-            if (sourceRow == row || row == sourceRow + 1)
-                return false;
-            beginMoveRows({}, sourceRow, sourceRow, {}, row);
-            infos.insert(infos.begin() + row, infos.at(sourceRow));
-            if (row < sourceRow)
-                ++sourceRow;
-            infos.erase(infos.begin() + sourceRow);
-            validateOrder();
-            return true;
-        }
-        return false;
-    }
-
-    QMimeData *mimeData(const QModelIndexList &indexes) const override
-    {
-        for (const auto &i : indexes) {
-            if (!i.isValid())
-                continue;
-            auto data = new QMimeData();
-            data->setData("application/x-qabstractitemmodeldatalist",
-                          QString::number(i.row()).toLatin1());
-            return data;
-        }
-        return nullptr;
-    }
-
-    class TableViewStyle : public QProxyStyle
-    {
-    public:
-        TableViewStyle(QStyle *style)
-            : QProxyStyle(style)
-        {}
-
-        void drawPrimitive(PrimitiveElement element,
-                           const QStyleOption *option,
-                           QPainter *painter,
-                           const QWidget *widget) const override
-        {
-            if (element == QStyle::PE_IndicatorItemViewItemDrop && !option->rect.isNull()) {
-                QStyleOption opt(*option);
-                opt.rect.setLeft(0);
-                if (widget)
-                    opt.rect.setRight(widget->width());
-                QProxyStyle::drawPrimitive(element, &opt, painter, widget);
-                return;
-            }
-            QProxyStyle::drawPrimitive(element, option, painter, widget);
-        }
-    };
-signals:
-    void validOrder(bool valid);
-};
-
-class TopMarginDelegate : public QStyledItemDelegate
-{
-public:
-    TopMarginDelegate(QObject *parent = nullptr)
-        : QStyledItemDelegate(parent)
-    {}
-
-    void paint(QPainter *painter,
-               const QStyleOptionViewItem &option,
-               const QModelIndex &index) const override
-    {
-        Q_ASSERT(index.isValid());
-        QStyleOptionViewItem opt = option;
-        initStyleOption(&opt, index);
-        const QWidget *widget = option.widget;
-        QStyle *style = widget ? widget->style() : QApplication::style();
-        if (opt.rect.height() > 20)
-            opt.rect.adjust(0, 5, 0, 0);
-        style->drawControl(QStyle::CE_ItemViewItem, &opt, painter, widget);
-    }
-};
-
-struct ParentClassConstructorParameter : public ConstructorMemberInfo
-{
-    QString originalDefaultValue;
-    QString declaration; // displayed in the treeView
-    ParentClassConstructorParameter(const QString &name,
-                                    const QString &defaultValue,
-                                    Symbol *symbol,
-                                    const ParentClassConstructorInfo *parentClassConstructor);
-
-    ParentClassConstructorParameter(const ParentClassConstructorParameter &) = delete;
-    ParentClassConstructorParameter(ParentClassConstructorParameter &&) = default;
-};
-
-struct ParentClassConstructorInfo
-{
-    ParentClassConstructorInfo(const QString &name, ConstructorParams &model)
-        : className(name)
-        , model(model)
-    {}
-    bool useInConstructor = false;
-    const QString className;
-    QString declaration;
-    std::vector<ParentClassConstructorParameter> parameters;
-    ConstructorParams &model;
-
-    ParentClassConstructorInfo(const ParentClassConstructorInfo &) = delete;
-    ParentClassConstructorInfo(ParentClassConstructorInfo &&) = default;
-
-    void addParameter(ParentClassConstructorParameter &param) { model.addRow(&param); }
-    void removeParameter(ParentClassConstructorParameter &param) { model.removeRow(&param); }
-    void removeAllParameters()
-    {
-        for (auto &param : parameters)
-            model.removeRow(&param);
-    }
-};
-
-ParentClassConstructorParameter::ParentClassConstructorParameter(
-    const QString &name,
-    const QString &defaultValue,
-    Symbol *symbol,
-    const ParentClassConstructorInfo *parentClassConstructor)
-    : ConstructorMemberInfo(parentClassConstructor->className + "::" + name,
-                            name,
-                            defaultValue,
-                            symbol,
-                            parentClassConstructor)
-    , originalDefaultValue(defaultValue)
-    , declaration(Overview{}.prettyType(symbol->type(), name)
-                  + (defaultValue.isEmpty() ? QString{} : " = " + defaultValue))
-{}
-
-using ParentClassConstructors = std::vector<ParentClassConstructorInfo>;
-
-class ParentClassesModel : public QAbstractItemModel
-{
-    ParentClassConstructors &constructors;
-
-public:
-    ParentClassesModel(QObject *parent, ParentClassConstructors &constructors)
-        : QAbstractItemModel(parent)
-        , constructors(constructors)
-    {}
-    QModelIndex index(int row, int column, const QModelIndex &parent = {}) const override
-    {
-        if (!parent.isValid())
-            return createIndex(row, column, nullptr);
-        if (parent.internalPointer())
-            return {};
-        auto index = createIndex(row, column, &constructors.at(parent.row()));
-        return index;
-    }
-    QModelIndex parent(const QModelIndex &index) const override
-    {
-        if (!index.isValid())
-            return {};
-        auto *parent = static_cast<ParentClassConstructorInfo *>(index.internalPointer());
-        if (!parent)
-            return {};
-        int i = 0;
-        for (const auto &info : constructors) {
-            if (&info == parent)
-                return createIndex(i, 0, nullptr);
-            ++i;
-        }
-        return {};
-    }
-    int rowCount(const QModelIndex &parent = {}) const override
-    {
-        if (!parent.isValid())
-            return static_cast<int>(constructors.size());
-        auto info = static_cast<ParentClassConstructorInfo *>(parent.internalPointer());
-        if (!info)
-            return static_cast<int>(constructors.at(parent.row()).parameters.size());
-        return 0;
-    }
-    int columnCount(const QModelIndex & /*parent*/ = {}) const override { return 1; }
-    QVariant data(const QModelIndex &index, int role) const override
-    {
-        if (!index.isValid())
-            return {};
-        auto info = static_cast<ParentClassConstructorInfo *>(index.internalPointer());
-
-        if (info) {
-            const auto &parameter = info->parameters.at(index.row());
-            if (role == Qt::CheckStateRole)
-                return parameter.init ? Qt::Checked : Qt::Unchecked;
-            if (role == Qt::DisplayRole)
-                return parameter.declaration;
-            return {};
-        }
-        const auto &constructor = constructors.at(index.row());
-        if (role == Qt::CheckStateRole)
-            return constructor.useInConstructor ? Qt::PartiallyChecked : Qt::Unchecked;
-        if (role == Qt::DisplayRole)
-            return constructor.declaration;
-
-        // Highlight the selected items
-        if (role == Qt::FontRole && constructor.useInConstructor) {
-            QFont font = QApplication::font();
-            font.setBold(true);
-            return font;
-        }
-        // Create a margin between sets of constructors for base classes
-        if (role == Qt::SizeHintRole && index.row() > 0
-            && constructor.className != constructors.at(index.row() - 1).className) {
-            return QSize(-1, 25);
-        }
-        return {};
-    }
-    bool setData(const QModelIndex &index, const QVariant &value, int /*role*/) override
-    {
-        if (index.isValid() && index.column() == 0) {
-            auto info = static_cast<ParentClassConstructorInfo *>(index.internalPointer());
-            if (info) {
-                const bool nowUse = value.toBool();
-                auto &param = info->parameters.at(index.row());
-                param.init = nowUse;
-                if (nowUse)
-                    info->addParameter(param);
-                else
-                    info->removeParameter(param);
-                return true;
-            }
-            auto &newConstructor = constructors.at(index.row());
-            // You have to select a base class constructor
-            if (newConstructor.useInConstructor)
-                return false;
-            auto c = std::find_if(constructors.begin(), constructors.end(), [&](const auto &c) {
-                return c.className == newConstructor.className && c.useInConstructor;
-            });
-            QTC_ASSERT(c == constructors.end(), return false;);
-            c->useInConstructor = false;
-            newConstructor.useInConstructor = true;
-            emit dataChanged(this->index(index.row(), 0), this->index(index.row(), columnCount()));
-            auto parentIndex = this->index(index.row(), 0);
-            emit dataChanged(this->index(0, 0, parentIndex),
-                             this->index(rowCount(parentIndex), columnCount()));
-            const int oldIndex = c - constructors.begin();
-            emit dataChanged(this->index(oldIndex, 0), this->index(oldIndex, columnCount()));
-            parentIndex = this->index(oldIndex, 0);
-            emit dataChanged(this->index(0, 0, parentIndex),
-                             this->index(rowCount(parentIndex), columnCount()));
-            // update other table
-            c->removeAllParameters();
-            for (auto &p : newConstructor.parameters)
-                if (p.init)
-                    newConstructor.addParameter(p);
-            return true;
-        }
-        return false;
-    }
-    QVariant headerData(int section, Qt::Orientation orientation, int role) const override
-    {
-        if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
-            switch (section) {
-            case 0:
-                return Tr::tr("Base Class Constructors");
-            }
-        }
-        return {};
-    }
-    Qt::ItemFlags flags(const QModelIndex &index) const override
-    {
-        if (index.isValid()) {
-            Qt::ItemFlags f;
-            auto info = static_cast<ParentClassConstructorInfo *>(index.internalPointer());
-            if (!info || info->useInConstructor) {
-                f |= Qt::ItemIsEnabled;
-            }
-            f |= Qt::ItemIsUserCheckable;
-
-            return f;
-        }
-        return {};
-    }
-};
-
-class GenerateConstructorDialog : public QDialog
-{
-public:
-    GenerateConstructorDialog(ConstructorParams *constructorParamsModel,
-                              ParentClassConstructors &constructors)
-    {
-        setWindowTitle(Tr::tr("Constructor"));
-
-        const auto treeModel = new ParentClassesModel(this, constructors);
-        const auto treeView = new QTreeView(this);
-        treeView->setModel(treeModel);
-        treeView->setItemDelegate(new TopMarginDelegate(this));
-        treeView->expandAll();
-
-        const auto view = new QTableView(this);
-        view->setModel(constructorParamsModel);
-        int optimalWidth = 0;
-        for (int i = 0; i < constructorParamsModel->columnCount(QModelIndex{}); ++i) {
-            view->resizeColumnToContents(i);
-            optimalWidth += view->columnWidth(i);
-        }
-        view->resizeRowsToContents();
-        view->verticalHeader()->setDefaultSectionSize(view->rowHeight(0));
-        view->setSelectionBehavior(QAbstractItemView::SelectRows);
-        view->setSelectionMode(QAbstractItemView::SingleSelection);
-        view->setDragEnabled(true);
-        view->setDropIndicatorShown(true);
-        view->setDefaultDropAction(Qt::MoveAction);
-        view->setDragDropMode(QAbstractItemView::InternalMove);
-        view->setDragDropOverwriteMode(false);
-        view->horizontalHeader()->setStretchLastSection(true);
-        view->setStyle(new ConstructorParams::TableViewStyle(view->style()));
-
-        const auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-        connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
-        connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
-
-        const auto errorLabel = new QLabel(
-            Tr::tr("Parameters without default value must come before parameters with default value."));
-        errorLabel->setStyleSheet("color: #ff0000");
-        errorLabel->setVisible(false);
-        QSizePolicy labelSizePolicy = errorLabel->sizePolicy();
-        labelSizePolicy.setRetainSizeWhenHidden(true);
-        errorLabel->setSizePolicy(labelSizePolicy);
-        connect(constructorParamsModel, &ConstructorParams::validOrder, this,
-                [errorLabel, button = buttonBox->button(QDialogButtonBox::Ok)](bool valid) {
-                    button->setEnabled(valid);
-                    errorLabel->setVisible(!valid);
-                });
-
-        // setup select all/none checkbox
-        QCheckBox *const checkBox = new QCheckBox(Tr::tr("Initialize all members"));
-        checkBox->setChecked(true);
-        connect(checkBox, &QCheckBox::stateChanged, this,
-                [model = constructorParamsModel](int state) {
-            if (state != Qt::PartiallyChecked) {
-                for (int i = 0; i < model->rowCount(); ++i)
-                    model->setData(model->index(i, ConstructorParams::ShouldInitColumn),
-                                   state,
-                                   Qt::CheckStateRole);
-            }
-        });
-        connect(checkBox, &QCheckBox::clicked, this, [checkBox] {
-            if (checkBox->checkState() == Qt::PartiallyChecked)
-                checkBox->setCheckState(Qt::Checked);
-        });
-        connect(constructorParamsModel,
-                &QAbstractItemModel::dataChanged,
-                this,
-                [model = constructorParamsModel, checkBox] {
-                    const auto state = [model, selectedCount = model->selectedCount()]() {
-                        if (selectedCount == 0)
-                            return Qt::Unchecked;
-                        if (static_cast<int>(model->memberCount() == selectedCount))
-                            return Qt::Checked;
-                        return Qt::PartiallyChecked;
-                    }();
-                    checkBox->setCheckState(state);
-                });
-
-        using A = InsertionPointLocator::AccessSpec;
-        auto accessCombo = new QComboBox;
-        connect(accessCombo, &QComboBox::currentIndexChanged, this, [this, accessCombo] {
-            const auto data = accessCombo->currentData();
-            m_accessSpec = static_cast<A>(data.toInt());
-        });
-        for (auto a : {A::Public, A::Protected, A::Private})
-            accessCombo->addItem(InsertionPointLocator::accessSpecToString(a), a);
-        const auto row = new QHBoxLayout();
-        row->addWidget(new QLabel(Tr::tr("Access") + ":"));
-        row->addWidget(accessCombo);
-        row->addSpacerItem(new QSpacerItem(1, 1, QSizePolicy::Expanding, QSizePolicy::Minimum));
-
-        const auto mainLayout = new QVBoxLayout(this);
-        mainLayout->addWidget(
-            new QLabel(Tr::tr("Select the members to be initialized in the constructor.\n"
-                              "Use drag and drop to change the order of the parameters.")));
-        mainLayout->addLayout(row);
-        mainLayout->addWidget(checkBox);
-        mainLayout->addWidget(view);
-        mainLayout->addWidget(treeView);
-        mainLayout->addWidget(errorLabel);
-        mainLayout->addWidget(buttonBox);
-        int left, right;
-        mainLayout->getContentsMargins(&left, nullptr, &right, nullptr);
-        optimalWidth += left + right;
-        resize(optimalWidth, mainLayout->sizeHint().height());
-    }
-
-    InsertionPointLocator::AccessSpec accessSpec() const { return m_accessSpec; }
-
-private:
-    InsertionPointLocator::AccessSpec m_accessSpec;
-};
-
-class GenerateConstructorOperation : public CppQuickFixOperation
-{
-public:
-    GenerateConstructorOperation(const CppQuickFixInterface &interface)
-        : CppQuickFixOperation(interface)
-    {
-        setDescription(Tr::tr("Generate Constructor"));
-
-        m_classAST = astForClassOperations(interface);
-        if (!m_classAST)
-            return;
-        Class *const theClass = m_classAST->symbol;
-        if (!theClass)
-            return;
-
-        // Go through all members and find member variable declarations
-        int memberCounter = 0;
-        for (auto it = theClass->memberBegin(); it != theClass->memberEnd(); ++it) {
-            Symbol *const s = *it;
-            if (!s->identifier() || !s->type() || s->type().isTypedef())
-                continue;
-            if ((s->asDeclaration() && s->type()->asFunctionType()) || s->asFunction())
-                continue;
-            if (s->asDeclaration() && (s->isPrivate() || s->isProtected()) && !s->isStatic()) {
-                const auto name = QString::fromUtf8(s->identifier()->chars(),
-                                                    s->identifier()->size());
-                parameterModel.emplaceBackParameter(name, s, memberCounter++);
-            }
-        }
-        Overview o = CppCodeStyleSettings::currentProjectCodeStyleOverview();
-        o.showArgumentNames = true;
-        o.showReturnTypes = true;
-        o.showDefaultArguments = true;
-        o.showTemplateParameters = true;
-        o.showFunctionSignatures = true;
-        LookupContext context(currentFile()->cppDocument(), interface.snapshot());
-        for (BaseClass *bc : theClass->baseClasses()) {
-            const QString className = o.prettyName(bc->name());
-
-            ClassOrNamespace *localLookupType = context.lookupType(bc);
-            QList<LookupItem> localLookup = localLookupType->lookup(bc->name());
-            for (auto &li : localLookup) {
-                Symbol *d = li.declaration();
-                if (!d->asClass())
-                    continue;
-                for (auto i = d->asClass()->memberBegin(); i != d->asClass()->memberEnd(); ++i) {
-                    Symbol *s = *i;
-                    if (s->isProtected() || s->isPublic()) {
-                        if (s->name()->match(d->name())) {
-                            // we have found a constructor
-                            Function *func = s->type().type()->asFunctionType();
-                            if (!func)
-                                continue;
-                            const bool isFirst = parentClassConstructors.empty()
-                                                 || parentClassConstructors.back().className
-                                                        != className;
-                            parentClassConstructors.emplace_back(className, parameterModel);
-                            ParentClassConstructorInfo &constructor = parentClassConstructors.back();
-                            constructor.declaration = className + o.prettyType(func->type());
-                            constructor.declaration.replace("std::__1::__get_nullptr_t()",
-                                                            "nullptr");
-                            constructor.useInConstructor = isFirst;
-                            for (auto arg = func->memberBegin(); arg != func->memberEnd(); ++arg) {
-                                Symbol *param = *arg;
-                                Argument *argument = param->asArgument();
-                                if (!argument) // can also be a block
-                                    continue;
-                                const QString name = o.prettyName(param->name());
-                                const StringLiteral *ini = argument->initializer();
-                                QString defaultValue;
-                                if (ini)
-                                    defaultValue = QString::fromUtf8(ini->chars(), ini->size())
-                                                       .replace("std::__1::__get_nullptr_t()",
-                                                                "nullptr");
-                                constructor.parameters.emplace_back(name,
-                                                                    defaultValue,
-                                                                    param,
-                                                                    &constructor);
-                                // do not show constructors like QObject(QObjectPrivate & dd, ...)
-                                ReferenceType *ref = param->type()->asReferenceType();
-                                if (ref && name == "dd") {
-                                    auto type = o.prettyType(ref->elementType());
-                                    if (type.startsWith("Q") && type.endsWith("Private")) {
-                                        parentClassConstructors.pop_back();
-                                        break;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        // add params to parameter lists
-        for (auto &c : parentClassConstructors)
-            if (c.useInConstructor)
-                for (auto &p : c.parameters)
-                    if (p.init)
-                        c.addParameter(p);
-    }
-
-    bool isApplicable() const
-    {
-        return parameterModel.rowCount() > 0
-               || Utils::anyOf(parentClassConstructors,
-                               [](const auto &parent) { return !parent.parameters.empty(); });
-    }
-
-    void setTest(bool isTest = true) { m_test = isTest; }
-
-private:
-    void perform() override
-    {
-        auto infos = parameterModel.getInfos();
-
-        InsertionPointLocator::AccessSpec accessSpec = InsertionPointLocator::Public;
-        if (!m_test) {
-            GenerateConstructorDialog dlg(&parameterModel, parentClassConstructors);
-            if (dlg.exec() == QDialog::Rejected)
-                return;
-            accessSpec = dlg.accessSpec();
-            infos = parameterModel.getInfos();
-        } else {
-#ifdef WITH_TESTS
-            ParentClassesModel model(nullptr, parentClassConstructors);
-            QAbstractItemModelTester tester(&model);
-#endif
-            if (infos.size() >= 3) {
-                // if we are testing and have 3 or more members => change the order
-                // move first element to the back
-                infos.push_back(infos[0]);
-                infos.erase(infos.begin());
-            }
-            for (auto info : infos) {
-                if (info->memberVariableName.startsWith("di_"))
-                    info->defaultValue = "42";
-            }
-            for (auto &c : parentClassConstructors) {
-                if (c.useInConstructor) {
-                    for (auto &p : c.parameters) {
-                        if (!p.init && p.parameterName.startsWith("use_")) {
-                            infos.push_back(&p);
-                            p.init = true;
-                        }
-                    }
-                }
-            }
-        }
-        if (infos.empty())
-            return;
-        struct GenerateConstructorRefactoringHelper : public GetterSetterRefactoringHelper
-        {
-            const ClassSpecifierAST *m_classAST;
-            InsertionPointLocator::AccessSpec m_accessSpec;
-            GenerateConstructorRefactoringHelper(CppQuickFixOperation *operation,
-                                                 const FilePath &filePath,
-                                                 Class *clazz,
-                                                 const ClassSpecifierAST *classAST,
-                                                 InsertionPointLocator::AccessSpec accessSpec)
-                : GetterSetterRefactoringHelper(operation, filePath, clazz)
-                , m_classAST(classAST)
-                , m_accessSpec(accessSpec)
-            {}
-            void generateConstructor(std::vector<ConstructorMemberInfo *> members,
-                                     const ParentClassConstructors &parentClassConstructors)
-            {
-                auto constructorLocation = m_settings->determineSetterLocation(int(members.size()));
-                if (constructorLocation == CppQuickFixSettings::FunctionLocation::CppFile
-                    && !hasSourceFile())
-                    constructorLocation = CppQuickFixSettings::FunctionLocation::OutsideClass;
-
-                Overview overview = CppCodeStyleSettings::currentProjectCodeStyleOverview();
-                overview.showTemplateParameters = true;
-
-                InsertionLocation implLoc;
-                QString implCode;
-                CppRefactoringFilePtr implFile;
-                QString className = overview.prettyName(m_class->name());
-                QStringList insertedNamespaces;
-                if (constructorLocation == CppQuickFixSettings::FunctionLocation::CppFile) {
-                    implLoc = sourceLocationFor(m_class, &insertedNamespaces);
-                    implFile = m_sourceFile;
-                    if (m_settings->rewriteTypesinCppFile())
-                        implCode = symbolAt(m_class, m_sourceFile, implLoc);
-                    else
-                        implCode = className;
-                    implCode += "::" + className + "(";
-                } else if (constructorLocation
-                           == CppQuickFixSettings::FunctionLocation::OutsideClass) {
-                    implLoc = insertLocationForMethodDefinition(m_class,
-                                                                false,
-                                                                NamespaceHandling::Ignore,
-                                                                m_changes,
-                                                                m_headerFile->filePath(),
-                                                                &insertedNamespaces);
-                    implFile = m_headerFile;
-                    implCode = symbolAt(m_class, m_headerFile, implLoc);
-                    implCode += "::" + className + "(";
-                }
-
-                QString inClassDeclaration = overview.prettyName(m_class->name()) + "(";
-                QString constructorBody = members.empty() ? QString(") {}") : QString(") : ");
-                for (auto &member : members) {
-                    if (isValueType(member->symbol, &member->customValueType))
-                        member->type.setConst(false);
-                    else
-                        member->type = makeConstRef(member->type);
-
-                    inClassDeclaration += overview.prettyType(member->type, member->parameterName);
-                    if (!member->defaultValue.isEmpty())
-                        inClassDeclaration += " = " + member->defaultValue;
-                    inClassDeclaration += ", ";
-                    if (implFile) {
-                        FullySpecifiedType type = typeAt(member->type,
-                                                         m_class,
-                                                         implFile,
-                                                         implLoc,
-                                                         insertedNamespaces);
-                        implCode += overview.prettyType(type, member->parameterName) + ", ";
-                    }
-                }
-                Utils::sort(members, &ConstructorMemberInfo::numberOfMember);
-                // first, do the base classes
-                for (const auto &parent : parentClassConstructors) {
-                    if (!parent.useInConstructor)
-                        continue;
-                    // Check if we really need a constructor
-                    if (Utils::anyOf(parent.parameters, [](const auto &param) {
-                            return param.init || param.originalDefaultValue.isEmpty();
-                        })) {
-                        int defaultAtEndCount = 0;
-                        for (auto i = parent.parameters.crbegin(); i != parent.parameters.crend();
-                             ++i) {
-                            if (i->init || i->originalDefaultValue.isEmpty())
-                                break;
-                            ++defaultAtEndCount;
-                        }
-                        const int numberOfParameters = static_cast<int>(parent.parameters.size())
-                                                       - defaultAtEndCount;
-                        constructorBody += parent.className + "(";
-                        int counter = 0;
-                        for (const auto &param : parent.parameters) {
-                            if (++counter > numberOfParameters)
-                                break;
-                            if (param.init) {
-                                if (param.customValueType)
-                                    constructorBody += "std::move(" + param.parameterName + ')';
-                                else
-                                    constructorBody += param.parameterName;
-                            } else if (!param.originalDefaultValue.isEmpty())
-                                constructorBody += param.originalDefaultValue;
-                            else
-                                constructorBody += "/* insert value */";
-                            constructorBody += ", ";
-                        }
-                        constructorBody.resize(constructorBody.length() - 2);
-                        constructorBody += "),\n";
-                    }
-                }
-                for (auto &member : members) {
-                    if (member->parentClassConstructor)
-                        continue;
-                    QString param = member->parameterName;
-                    if (member->customValueType)
-                        param = "std::move(" + member->parameterName + ')';
-                    constructorBody += member->memberVariableName + '(' + param + "),\n";
-                }
-                if (!members.empty()) {
-                    inClassDeclaration.resize(inClassDeclaration.length() - 2);
-                    constructorBody.remove(constructorBody.length() - 2, 1); // ..),\n => ..)\n
-                    constructorBody += "{}";
-                    if (!implCode.isEmpty())
-                        implCode.resize(implCode.length() - 2);
-                }
-                implCode += constructorBody;
-
-                if (constructorLocation == CppQuickFixSettings::FunctionLocation::InsideClass)
-                    inClassDeclaration += constructorBody;
-                else
-                    inClassDeclaration += QLatin1String(");");
-
-                TranslationUnit *tu = m_headerFile->cppDocument()->translationUnit();
-                insertAndIndent(m_headerFile,
-                                m_locator.constructorDeclarationInClass(tu,
-                                                                        m_classAST,
-                                                                        m_accessSpec,
-                                                                        int(members.size())),
-                                inClassDeclaration);
-
-                if (constructorLocation == CppQuickFixSettings::FunctionLocation::CppFile) {
-                    addSourceFileCode(implCode);
-                } else if (constructorLocation
-                           == CppQuickFixSettings::FunctionLocation::OutsideClass) {
-                    if (m_isHeaderHeaderFile)
-                        implCode.prepend("inline ");
-                    insertAndIndent(m_headerFile, implLoc, implCode);
-                }
-            }
-        };
-        GenerateConstructorRefactoringHelper helper(this,
-                                                    currentFile()->filePath(),
-                                                    m_classAST->symbol,
-                                                    m_classAST,
-                                                    accessSpec);
-
-        auto members = Utils::filtered(infos, [](const auto mi) {
-            return mi->init || mi->parentClassConstructor;
-        });
-        helper.generateConstructor(std::move(members), parentClassConstructors);
-        helper.applyChanges();
-    }
-
-    ConstructorParams parameterModel;
-    ParentClassConstructors parentClassConstructors;
-    const ClassSpecifierAST *m_classAST = nullptr;
-    bool m_test = false;
-};
-} // namespace
-void GenerateConstructor::doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result)
-{
-    const auto op = QSharedPointer<GenerateConstructorOperation>::create(interface);
-    if (!op->isApplicable())
-        return;
-    op->setTest(m_test);
-    result << op;
-}
-
-namespace {
-class ConvertCommentStyleOp : public CppQuickFixOperation
-{
-public:
-    ConvertCommentStyleOp(const CppQuickFixInterface &interface, const QList<Token> &tokens,
-                          Kind kind)
-        : CppQuickFixOperation(interface),
-          m_tokens(tokens),
-          m_kind(kind),
-          m_wasCxxStyle(m_kind == T_CPP_COMMENT || m_kind == T_CPP_DOXY_COMMENT),
-          m_isDoxygen(m_kind == T_DOXY_COMMENT || m_kind == T_CPP_DOXY_COMMENT)
-    {
-        setDescription(m_wasCxxStyle ? Tr::tr("Convert Comment to C-Style")
-                                     : Tr::tr("Convert Comment to C++-Style"));
-    }
-
-private:
-    // Turns every line of a C-style comment into a C++-style comment and vice versa.
-    // For C++ -> C, we use one /* */ comment block per line. However, doxygen
-    // requires a single comment, so there we just replace the prefix with whitespace and
-    // add the start and end comment in extra lines.
-    // For cosmetic reasons, we offer some convenience functionality:
-    //   - Turn /***** ... into ////// ... and vice versa
-    //   - With C -> C++, remove leading asterisks.
-    //   - With C -> C++, remove the first and last line of a block if they have no content
-    //     other than the comment start and end characters.
-    //   - With C++ -> C, try to align the end comment characters.
-    // These are obviously heuristics; we do not guarantee perfect results for everybody.
-    // We also don't second-guess the users's selection: E.g. if there is an empty
-    // line between the tokens, then it's not the same doxygen comment, but we merge
-    // it anyway in C++ to C mode.
-    void perform() override
-    {
-        TranslationUnit * const tu = currentFile()->cppDocument()->translationUnit();
-        const QString newCommentStart = getNewCommentStart();
-        ChangeSet changeSet;
-        int endCommentColumn = -1;
-        const QChar oldFillChar = m_wasCxxStyle ? '/' : '*';
-        const QChar newFillChar = m_wasCxxStyle ? '*' : '/';
-
-        for (const Token &token : m_tokens) {
-            const int startPos = tu->getTokenPositionInDocument(token, textDocument());
-            const int endPos = tu->getTokenEndPositionInDocument(token, textDocument());
-
-            if (m_wasCxxStyle && m_isDoxygen) {
-                // Replace "///" characters with whitespace (to keep alignment).
-                // The insertion of "/*" and "*/" is done once after the loop.
-                changeSet.replace(startPos, startPos + 3, "   ");
-                continue;
-            }
-
-            const QTextBlock firstBlock = textDocument()->findBlock(startPos);
-            const QTextBlock lastBlock = textDocument()->findBlock(endPos);
-            for (QTextBlock block = firstBlock; block.isValid() && block.position() <= endPos;
-                 block = block.next()) {
-                const QString &blockText = block.text();
-                const int firstColumn = block == firstBlock ? startPos - block.position() : 0;
-                const int endColumn = block == lastBlock ? endPos - block.position()
-                                                         : block.length();
-
-                // Returns true if the current line looks like "/********/" or "//////////",
-                // as is often the case at the start and end of comment blocks.
-                const auto fillChecker = [&] {
-                    if (m_isDoxygen)
-                        return false;
-                    QString textToCheck = blockText;
-                    if (block == firstBlock)
-                        textToCheck.remove(0, 1);
-                    if (block == lastBlock)
-                        textToCheck.chop(block.length() - endColumn);
-                    return Utils::allOf(textToCheck, [oldFillChar](const QChar &c)
-                                        { return c == oldFillChar || c == ' ';
-                    }) && textToCheck.count(oldFillChar) > 2;
-                };
-
-                // Returns the index of the first character of actual comment content,
-                // as opposed to visual stuff like slashes, stars or whitespace.
-                const auto indexOfActualContent = [&] {
-                    const int offset = block == firstBlock ? firstColumn + newCommentStart.length()
-                                                           : firstColumn;
-
-                    for (int i = offset, lastFillChar = -1; i < blockText.length(); ++i) {
-                        if (blockText.at(i) == oldFillChar) {
-                            lastFillChar = i;
-                            continue;
-                        }
-                        if (!blockText.at(i).isSpace())
-                            return lastFillChar + 1;
-                    }
-                    return -1;
-                };
-
-                if (fillChecker()) {
-                    const QString replacement = QString(endColumn - 1 - firstColumn, newFillChar);
-                    changeSet.replace(block.position() + firstColumn,
-                                      block.position() + endColumn - 1,
-                                      replacement);
-                    if (m_wasCxxStyle) {
-                        changeSet.replace(block.position() + firstColumn,
-                                          block.position() + firstColumn + 1, "/");
-                        changeSet.insert(block.position() + endColumn - 1, "*");
-                        endCommentColumn = endColumn - 1;
-                    }
-                    continue;
-                }
-
-                // Remove leading noise or even the entire block, if applicable.
-                const bool blockIsRemovable = (block == firstBlock || block == lastBlock)
-                                              && firstBlock != lastBlock;
-                const auto removeBlock = [&] {
-                    changeSet.remove(block.position() + firstColumn, block.position() + endColumn);
-                };
-                const int contentIndex = indexOfActualContent();
-                int removed = 0;
-                if (contentIndex == -1) {
-                    if (blockIsRemovable) {
-                        removeBlock();
-                        continue;
-                    } else if (!m_wasCxxStyle) {
-                        changeSet.replace(block.position() + firstColumn,
-                                          block.position() + endColumn - 1, newCommentStart);
-                        continue;
-                    }
-                } else if (block == lastBlock && contentIndex == endColumn - 1) {
-                    if (blockIsRemovable) {
-                        removeBlock();
-                        break;
-                    }
-                } else {
-                    changeSet.remove(block.position() + firstColumn,
-                                     block.position() + firstColumn + contentIndex);
-                    removed = contentIndex;
-                }
-
-                if (block == firstBlock) {
-                    changeSet.replace(startPos, startPos + newCommentStart.length(),
-                                      newCommentStart);
-                } else {
-                    // If the line starts with enough whitespace, replace it with the
-                    // comment start characters, so we don't move the content to the right
-                    // unnecessarily. Otherwise, insert the comment start characters.
-                    if (blockText.startsWith(QString(newCommentStart.size() + removed + 1, ' '))) {
-                        changeSet.replace(block.position(),
-                                          block.position() + newCommentStart.length(),
-                                          newCommentStart);
-                    } else {
-                        changeSet.insert(block.position(), newCommentStart);
-                    }
-                }
-
-                if (block == lastBlock) {
-                    if (m_wasCxxStyle) {
-                        // This is for proper alignment of the end comment character.
-                        if (endCommentColumn != -1) {
-                            const int endCommentPos = block.position() + endCommentColumn;
-                            if (endPos < endCommentPos)
-                                changeSet.insert(endPos, QString(endCommentPos - endPos - 1, ' '));
-                        }
-                        changeSet.insert(endPos, " */");
-                    } else {
-                        changeSet.remove(endPos - 2, endPos);
-                    }
-                }
-            }
-        }
-
-        if (m_wasCxxStyle && m_isDoxygen) {
-            const int startPos = tu->getTokenPositionInDocument(m_tokens.first(), textDocument());
-            const int endPos = tu->getTokenEndPositionInDocument(m_tokens.last(), textDocument());
-            changeSet.insert(startPos, "/*!\n");
-            changeSet.insert(endPos, "\n*/");
-        }
-
-        changeSet.apply(textDocument());
-    }
-
-    QString getNewCommentStart() const
-    {
-        if (m_wasCxxStyle) {
-            if (m_isDoxygen)
-                return "/*!";
-            return "/*";
-        }
-        if (m_isDoxygen)
-            return "//!";
-        return "//";
-    }
-
-    const QList<Token> m_tokens;
-    const Kind m_kind;
-    const bool m_wasCxxStyle;
-    const bool m_isDoxygen;
-};
-} // namespace
-
-void ConvertCommentStyle::doMatch(const CppQuickFixInterface &interface,
-                                  TextEditor::QuickFixOperations &result)
-{
-    // If there's a selection, then it must entirely consist of comment tokens.
-    // If there's no selection, the cursor must be on a comment.
-    const QList<Token> &cursorTokens = interface.currentFile()->tokensForCursor();
-    if (cursorTokens.empty())
-        return;
-    if (!cursorTokens.front().isComment())
-        return;
-
-    // All tokens must be the same kind of comment, but we make an exception for doxygen comments
-    // that start with "///", as these are often not intended to be doxygen. For our purposes,
-    // we treat them as normal comments.
-    const auto effectiveKind = [&interface](const Token &token) {
-        if (token.kind() != T_CPP_DOXY_COMMENT)
-            return token.kind();
-        TranslationUnit * const tu = interface.currentFile()->cppDocument()->translationUnit();
-        const int startPos = tu->getTokenPositionInDocument(token, interface.textDocument());
-        const QString commentStart = interface.textAt(startPos, 3);
-        return commentStart == "///" ? T_CPP_COMMENT : T_CPP_DOXY_COMMENT;
-    };
-    const Kind kind = effectiveKind(cursorTokens.first());
-    for (int i = 1; i < cursorTokens.count(); ++i) {
-        if (effectiveKind(cursorTokens.at(i)) != kind)
-            return;
-    }
-
-    // Ok, all tokens are of same(ish) comment type, offer quickfix.
-    result << new ConvertCommentStyleOp(interface, cursorTokens, kind);
-}
-
-namespace {
-class MoveFunctionCommentsOp : public CppQuickFixOperation
-{
-public:
-    enum class Direction { ToDecl, ToDef };
-    MoveFunctionCommentsOp(const CppQuickFixInterface &interface, const Symbol *symbol,
-                           const QList<Token> &commentTokens, Direction direction)
-        : CppQuickFixOperation(interface), m_symbol(symbol), m_commentTokens(commentTokens)
-    {
-        setDescription(direction == Direction::ToDecl
-                           ? Tr::tr("Move Function Documentation to Declaration")
-                           : Tr::tr("Move Function Documentation to Definition"));
-    }
-
-private:
-    void perform() override
-    {
-        const auto textDoc = const_cast<QTextDocument *>(currentFile()->document());
-        const int pos = currentFile()->cppDocument()->translationUnit()->getTokenPositionInDocument(
-            m_symbol->sourceLocation(), textDoc);
-        QTextCursor cursor(textDoc);
-        cursor.setPosition(pos);
-        const CursorInEditor cursorInEditor(cursor, currentFile()->filePath(), editor(),
-                                            editor()->textDocument());
-        const auto callback = [symbolLoc = m_symbol->toLink(), comments = m_commentTokens]
-            (const Link &link) {
-            moveComments(link, symbolLoc, comments);
-        };
-        CppModelManager::followSymbol(cursorInEditor, callback, true, false,
-                                      FollowSymbolMode::Exact);
-    }
-
-    static void moveComments(const Link &targetLoc, const Link &symbolLoc,
-                             const QList<Token> &comments)
-    {
-        if (!targetLoc.hasValidTarget() || targetLoc.hasSameLocation(symbolLoc))
-            return;
-
-        CppRefactoringChanges changes(CppModelManager::snapshot());
-        const CppRefactoringFilePtr sourceFile = changes.cppFile(symbolLoc.targetFilePath);
-        const CppRefactoringFilePtr targetFile
-            = targetLoc.targetFilePath == symbolLoc.targetFilePath
-                  ? sourceFile
-                  : changes.cppFile(targetLoc.targetFilePath);
-        const Document::Ptr &targetCppDoc = targetFile->cppDocument();
-        const QList<AST *> targetAstPath = ASTPath(targetCppDoc)(
-            targetLoc.targetLine, targetLoc.targetColumn + 1);
-        if (targetAstPath.isEmpty())
-            return;
-        const AST *targetDeclAst = nullptr;
-        for (auto it = std::next(std::rbegin(targetAstPath));
-             it != std::rend(targetAstPath); ++it) {
-            AST * const node = *it;
-            if (node->asDeclaration()) {
-                targetDeclAst = node;
-                continue;
-            }
-            if (targetDeclAst)
-                break;
-        }
-        if (!targetDeclAst)
-            return;
-        const int insertionPos = targetCppDoc->translationUnit()->getTokenPositionInDocument(
-            targetDeclAst->firstToken(), targetFile->document());
-        const TranslationUnit * const sourceTu = sourceFile->cppDocument()->translationUnit();
-        const int sourceCommentStartPos = sourceTu->getTokenPositionInDocument(
-            comments.first(), sourceFile->document());
-        const int sourceCommentEndPos = sourceTu->getTokenEndPositionInDocument(
-            comments.last(), sourceFile->document());
-
-        // Manually adjust indentation, as both our built-in indenter and ClangFormat
-        // are unreliable with regards to comment continuation lines.
-        auto tabSettings = [](CppRefactoringFilePtr file) {
-            if (auto editor = file->editor())
-                return editor->textDocument()->tabSettings();
-            return ProjectExplorer::actualTabSettings(file->filePath(), nullptr);
-        };
-        const TabSettings &sts = tabSettings(sourceFile);
-        const TabSettings &tts = tabSettings(targetFile);
-        const QTextBlock insertionBlock = targetFile->document()->findBlock(insertionPos);
-        const int insertionColumn = tts.columnAt(insertionBlock.text(),
-                                                 insertionPos - insertionBlock.position());
-        const QTextBlock removalBlock = sourceFile->document()->findBlock(sourceCommentStartPos);
-        const QTextBlock removalBlockEnd = sourceFile->document()->findBlock(sourceCommentEndPos);
-        const int removalColumn = sts.columnAt(removalBlock.text(),
-                                               sourceCommentStartPos - removalBlock.position());
-        const int columnOffset = insertionColumn - removalColumn;
-        QString functionDoc;
-        if (columnOffset != 0) {
-            for (QTextBlock block = removalBlock;
-                 block.isValid() && block != removalBlockEnd.next();
-                 block = block.next()) {
-                QString text = block.text() + QChar::ParagraphSeparator;
-                if (block == removalBlockEnd)
-                    text = text.left(sourceCommentEndPos - block.position());
-                if (block == removalBlock) {
-                    text = text.mid(sourceCommentStartPos - block.position());
-                } else {
-                    int lineIndentColumn = sts.indentationColumn(text) + columnOffset;
-                    text.replace(0,
-                                 TabSettings::firstNonSpace(text),
-                                 tts.indentationString(0, lineIndentColumn, 0, insertionBlock));
-                }
-                functionDoc += text;
-            }
-        } else {
-            functionDoc = sourceFile->textOf(sourceCommentStartPos, sourceCommentEndPos);
-        }
-
-        // Remove comment plus leading and trailing whitespace, including trailing newline.
-        const auto removeAtSource = [&](ChangeSet &changeSet) {
-            int removalPos = sourceCommentStartPos;
-            const QChar newline(QChar::ParagraphSeparator);
-            while (true) {
-                const int prev = removalPos - 1;
-                if (prev < 0)
-                    break;
-                const QChar prevChar = sourceFile->charAt(prev);
-                if (!prevChar.isSpace() || prevChar == newline)
-                    break;
-                removalPos = prev;
-            }
-            int removalEndPos = sourceCommentEndPos;
-            while (true) {
-                if (removalEndPos == sourceFile->document()->characterCount())
-                    break;
-                const QChar nextChar = sourceFile->charAt(removalEndPos);
-                if (!nextChar.isSpace())
-                    break;
-                ++removalEndPos;
-                if (nextChar == newline)
-                    break;
-            }
-            changeSet.remove(removalPos, removalEndPos);
-        };
-
-        ChangeSet targetChangeSet;
-        targetChangeSet.insert(insertionPos, functionDoc);
-        targetChangeSet.insert(insertionPos, "\n");
-        targetChangeSet.insert(insertionPos, QString(insertionColumn, ' '));
-        if (targetFile == sourceFile)
-            removeAtSource(targetChangeSet);
-        targetFile->setChangeSet(targetChangeSet);
-        const bool targetFileSuccess = targetFile->apply();
-        if (targetFile == sourceFile || !targetFileSuccess)
-            return;
-        ChangeSet sourceChangeSet;
-        removeAtSource(sourceChangeSet);
-        sourceFile->setChangeSet(sourceChangeSet);
-        sourceFile->apply();
-    }
-
-    const Symbol * const m_symbol;
-    const QList<Token> m_commentTokens;
-};
-} // namespace
-
-void MoveFunctionComments::doMatch(const CppQuickFixInterface &interface,
-                                   TextEditor::QuickFixOperations &result)
-{
-    const QList<AST *> &astPath = interface.path();
-    if (astPath.isEmpty())
-        return;
-    const Symbol *symbol = nullptr;
-    MoveFunctionCommentsOp::Direction direction = MoveFunctionCommentsOp::Direction::ToDecl;
-    for (auto it = std::next(std::rbegin(astPath)); it != std::rend(astPath); ++it) {
-        if (const auto func = (*it)->asFunctionDefinition()) {
-            symbol = func->symbol;
-            direction = MoveFunctionCommentsOp::Direction::ToDecl;
-            break;
-        }
-        const auto decl = (*it)->asSimpleDeclaration();
-        if (!decl || !decl->declarator_list)
-            continue;
-        for (auto it = decl->declarator_list->begin();
-             !symbol && it != decl->declarator_list->end(); ++it) {
-            PostfixDeclaratorListAST * const funcDecls = (*it)->postfix_declarator_list;
-            if (!funcDecls)
-                continue;
-            for (auto it = funcDecls->begin(); it != funcDecls->end(); ++it) {
-                if (const auto func = (*it)->asFunctionDeclarator()) {
-                    symbol = func->symbol;
-                    direction = MoveFunctionCommentsOp::Direction::ToDef;
-                    break;
-                }
-            }
-        }
-
-    }
-    if (!symbol)
-        return;
-
-    if (const QList<Token> commentTokens = commentsForDeclaration(
-            symbol, *interface.textDocument(), interface.currentFile()->cppDocument());
-        !commentTokens.isEmpty()) {
-        result << new MoveFunctionCommentsOp(interface, symbol, commentTokens, direction);
-    }
-}
-
-void createCppQuickFixes()
-{
-    new AddIncludeForUndefinedIdentifier;
-
-    new FlipLogicalOperands;
-    new InverseLogicalComparison;
-    new RewriteLogicalAnd;
-
-    new ConvertToCamelCase;
-
-    new ConvertCStringToNSString;
-    new ConvertNumericLiteral;
-    new TranslateStringLiteral;
-    new WrapStringLiteral;
-
-    new MoveDeclarationOutOfIf;
-    new MoveDeclarationOutOfWhile;
-
-    new SplitIfStatement;
-    new SplitSimpleDeclaration;
-
-    new AddBracesToIf;
-    new RearrangeParamDeclarationList;
-    new ReformatPointerDeclaration;
-
-    new CompleteSwitchCaseStatement;
-    new InsertQtPropertyMembers;
-    new ConvertQt4Connect;
-
-    new ApplyDeclDefLinkChanges;
-    new ConvertFromAndToPointer;
-    new ExtractFunction;
-    new ExtractLiteralAsParameter;
-    new GenerateGetterSetter;
-    new GenerateGettersSettersForClass;
-    new InsertDeclFromDef;
-    new InsertDefFromDecl;
-    new AddDeclarationForUndeclaredIdentifier;
-    new InsertDefsFromDecls;
-
-    new MoveFuncDefOutside;
-    new MoveAllFuncDefOutside;
-    new MoveFuncDefToDeclPush;
-    new MoveFuncDefToDeclPull;
-
-    new AssignToLocalVariable;
-
-    new InsertVirtualMethods;
-
-    new OptimizeForLoop;
-
-    new EscapeStringLiteral;
-
-    new ExtraRefactoringOperations;
-
-    new RemoveUsingNamespace;
-    new GenerateConstructor;
-    new ConvertCommentStyle;
-    new MoveFunctionComments;
-}
-
-void destroyCppQuickFixes()
-{
-    for (int i = g_cppQuickFixFactories.size(); --i >= 0; )
-        delete g_cppQuickFixFactories.at(i);
-}
-
-} // namespace Internal
-} // namespace CppEditor
-
-#include "cppquickfixes.moc"
diff --git a/src/plugins/cppeditor/cppquickfixes.h b/src/plugins/cppeditor/cppquickfixes.h
deleted file mode 100644
index 953cfa5468e..00000000000
--- a/src/plugins/cppeditor/cppquickfixes.h
+++ /dev/null
@@ -1,621 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include "cppquickfix.h"
-
-#include <variant>
-
-///
-/// Adding New Quick Fixes
-///
-/// When adding new Quick Fixes, make sure that the doMatch() function is "cheap".
-/// Otherwise, since the match() functions are also called to generate context menu
-/// entries, the user might experience a delay opening the context menu.
-///
-
-namespace CppEditor {
-namespace Internal {
-using TypeOrExpr = std::variant<const CPlusPlus::ExpressionAST *, CPlusPlus::FullySpecifiedType>;
-
-void createCppQuickFixes();
-void destroyCppQuickFixes();
-
-class ExtraRefactoringOperations : public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
-};
-
-/*!
-  Adds an include for an undefined identifier or only forward declared identifier.
-
-  Activates on: the undefined identifier
-*/
-class AddIncludeForUndefinedIdentifier : public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
-};
-
-// Exposed for tests
-class AddIncludeForUndefinedIdentifierOp: public CppQuickFixOperation
-{
-public:
-    AddIncludeForUndefinedIdentifierOp(const CppQuickFixInterface &interface, int priority,
-                                       const QString &include);
-    void perform() override;
-
-    QString include() const { return m_include; }
-
-private:
-    QString m_include;
-};
-
-class AddForwardDeclForUndefinedIdentifierOp: public CppQuickFixOperation
-{
-public:
-    AddForwardDeclForUndefinedIdentifierOp(const CppQuickFixInterface &interface, int priority,
-                                           const QString &fqClassName, int symbolPos);
-private:
-    void perform() override;
-
-    const QString m_className;
-    const int m_symbolPos;
-};
-
-/*!
-  Rewrite
-    a op b
-
-  As
-    b flipop a
-
-  Activates on: <= < > >= == != && ||
-*/
-class FlipLogicalOperands: public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
-};
-
-/*!
-  Rewrite
-    a op b -> !(a invop b)
-    (a op b) -> !(a invop b)
-    !(a op b) -> (a invob b)
-
-  Activates on: <= < > >= == !=
-*/
-class InverseLogicalComparison: public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
-};
-
-/*!
-  Rewrite
-    !a && !b
-
-  As
-    !(a || b)
-
-  Activates on: &&
-*/
-class RewriteLogicalAnd: public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
-};
-
-/*!
-  Replace
-     "abcd"
-     QLatin1String("abcd")
-     QLatin1Literal("abcd")
-
-  With
-     @"abcd"
-
-  Activates on: the string literal, if the file type is a Objective-C(++) file.
-*/
-class ConvertCStringToNSString: public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
-};
-
-/*!
-  Base class for converting numeric literals between decimal, octal and hex.
-  Does the base check for the specific ones and parses the number.
-
-  Test cases:
-    0xFA0Bu;
-    0X856A;
-    298.3;
-    199;
-    074;
-    199L;
-    074L;
-    -199;
-    -017;
-    0783; // invalid octal
-    0; // border case, allow only hex<->decimal
-
-  Activates on: numeric literals
-*/
-class ConvertNumericLiteral: public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
-};
-
-/*!
-  Replace
-    "abcd"
-
-  With
-    tr("abcd") or
-    QCoreApplication::translate("CONTEXT", "abcd") or
-    QT_TRANSLATE_NOOP("GLOBAL", "abcd")
-
-  depending on what is available.
-
-  Activates on: the string literal
-*/
-class TranslateStringLiteral: public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
-};
-
-/*!
-  Replace
-    "abcd"  -> QLatin1String("abcd")
-    @"abcd" -> QLatin1String("abcd") (Objective C)
-    'a'     -> QLatin1Char('a')
-    'a'     -> "a"
-    "a"     -> 'a' or QLatin1Char('a') (Single character string constants)
-    "\n"    -> '\n', QLatin1Char('\n')
-
-  Except if they are already enclosed in
-    QLatin1Char, QT_TRANSLATE_NOOP, tr,
-    trUtf8, QLatin1Literal, QLatin1String
-
-  Activates on: the string or character literal
-*/
-
-class WrapStringLiteral: public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
-};
-
-/*!
-  Turns "an_example_symbol" into "anExampleSymbol" and
-  "AN_EXAMPLE_SYMBOL" into "AnExampleSymbol".
-
-  Activates on: identifiers
-*/
-class ConvertToCamelCase : public CppQuickFixFactory
-{
-public:
-    ConvertToCamelCase(bool test = false) : CppQuickFixFactory(), m_test(test) {}
-
-    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
-
-private:
-    const bool m_test;
-};
-
-/*!
-  Replace
-    if (Type name = foo()) {...}
-
-  With
-    Type name = foo();
-    if (name) {...}
-
-  Activates on: the name of the introduced variable
-*/
-class MoveDeclarationOutOfIf: public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
-};
-
-/*!
-  Replace
-    while (Type name = foo()) {...}
-
-  With
-    Type name;
-    while ((name = foo()) != 0) {...}
-
-  Activates on: the name of the introduced variable
-*/
-class MoveDeclarationOutOfWhile: public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
-};
-
-/*!
-  Replace
-     if (something && something_else) {
-     }
-
-  with
-     if (something)
-        if (something_else) {
-        }
-     }
-
-  and
-    if (something || something_else)
-      x;
-
-  with
-    if (something)
-      x;
-    else if (something_else)
-      x;
-
-    Activates on: && or ||
-*/
-class SplitIfStatement: public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
-};
-
-/*!
-  Rewrite
-    int *a, b;
-
-  As
-    int *a;
-    int b;
-
-  Activates on: the type or the variable names.
-*/
-class SplitSimpleDeclaration: public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
-};
-
-/*!
-  Add curly braces to a if statement that doesn't already contain a
-  compound statement. I.e.
-
-  if (a)
-      b;
-  becomes
-  if (a) {
-      b;
-  }
-
-  Activates on: the if
-*/
-class AddBracesToIf: public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
-};
-
-/*!
-  Switches places of the parameter declaration under cursor
-  with the next or the previous one in the parameter declaration list
-
-  Activates on: parameter declarations
-*/
-class RearrangeParamDeclarationList : public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
-};
-
-/*!
-  Reformats a pointer, reference or rvalue reference type/declaration.
-
-  Works also with selections (except when the cursor is not on any AST).
-
-  Activates on: simple declarations, parameters and return types of function
-                declarations and definitions, control flow statements (if,
-                while, for, foreach) with declarations.
-*/
-class ReformatPointerDeclaration : public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
-};
-
-/*!
-  Adds missing case statements for "switch (enumVariable)"
- */
-class CompleteSwitchCaseStatement: public CppQuickFixFactory
-{
-public:
-    CompleteSwitchCaseStatement() { setHasClangdReplacement(); }
-
-private:
-    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
-};
-
-/*!
-  Adds a declarations to a definition
- */
-class InsertDeclFromDef: public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
-};
-
-/*!
-  Adds a definition for a declaration.
- */
-class InsertDefFromDecl: public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
-    bool m_defPosOutsideClass = false;
-};
-
-class AddDeclarationForUndeclaredIdentifier : public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface,
-               TextEditor::QuickFixOperations &result) override;
-
-#ifdef WITH_TESTS
-    void setMembersOnly() { m_membersOnly = true; }
-#endif
-
-private:
-    void collectOperations(const CppQuickFixInterface &interface,
-                           TextEditor::QuickFixOperations &result);
-    void handleCall(const CPlusPlus::CallAST *call, const CppQuickFixInterface &interface,
-                    TextEditor::QuickFixOperations &result);
-
-    // Returns whether to still do other checks.
-    bool checkForMemberInitializer(const CppQuickFixInterface &interface,
-                                   TextEditor::QuickFixOperations &result);
-
-    void maybeAddMember(const CppQuickFixInterface &interface, CPlusPlus::Scope *scope,
-                        const QByteArray &classTypeExpr, const TypeOrExpr &typeOrExpr,
-                        const CPlusPlus::CallAST *call, TextEditor::QuickFixOperations &result);
-
-    void maybeAddStaticMember(
-        const CppQuickFixInterface &interface, const CPlusPlus::QualifiedNameAST *qualName,
-        const TypeOrExpr &typeOrExpr, const CPlusPlus::CallAST *call,
-        TextEditor::QuickFixOperations &result);
-
-    bool m_membersOnly = false;
-};
-
-/*!
-  Adds a definition for any number of member function declarations.
- */
-class InsertDefsFromDecls : public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface,
-                 TextEditor::QuickFixOperations &result) override;
-
-    enum class Mode {
-            Off,         // Testing: simulates user canceling the dialog
-            Impl,        // Testing: simulates user choosing cpp file for every function
-            Alternating, // Testing: simulates user choosing a different DefPos for every function
-            User         // Normal interactive mode
-    };
-    void setMode(Mode mode) { m_mode = mode; }
-
-private:
-    Mode m_mode = Mode::User;
-};
-
-/*!
-  Extracts the selected code and puts it to a function
- */
-class ExtractFunction : public CppQuickFixFactory
-{
-public:
-    using FunctionNameGetter = std::function<QString()>;
-
-    ExtractFunction(FunctionNameGetter functionNameGetter = FunctionNameGetter());
-    void doMatch(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
-
-private:
-    FunctionNameGetter m_functionNameGetter; // For tests to avoid GUI pop-up.
-};
-
-/*!
-  Extracts the selected constant and converts it to a parameter of the current function.
-
-  Activates on numeric, bool, character, or string literal in the function body.
- */
-class ExtractLiteralAsParameter : public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
-};
-
-/*!
-  Converts the selected variable to a pointer if it is a stack variable or reference, or vice versa.
-
-  Activates on variable declarations.
- */
-class ConvertFromAndToPointer : public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
-};
-
-/*!
-  Adds getter and setter functions for a member variable
- */
-class GenerateGetterSetter : public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
-};
-
-/*!
-  Adds getter and setter functions for several member variables
- */
-class GenerateGettersSettersForClass : public CppQuickFixFactory
-{
-protected:
-    void setTest() { m_test = true; }
-
-private:
-    void doMatch(const CppQuickFixInterface &interface,
-                 TextEditor::QuickFixOperations &result) override;
-
-    bool m_test = false;
-};
-
-/*!
-  Adds missing members for a Q_PROPERTY
- */
-class InsertQtPropertyMembers : public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
-};
-
-/*!
-  Converts a Qt 4 QObject::connect() to Qt 5 style.
- */
-class ConvertQt4Connect : public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
-};
-
-/*!
- Applies function signature changes
- */
-class ApplyDeclDefLinkChanges: public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
-};
-
-/*!
- Moves the definition of a member function outside the class or moves the definition of a member
- function or a normal function to the implementation file.
- */
-class MoveFuncDefOutside: public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
-};
-
-/*!
- Moves all member function definitions outside the class or to the implementation file.
- */
-class MoveAllFuncDefOutside: public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
-};
-
-/*!
- Moves the definition of a function to its declaration, with the cursor on the definition.
- */
-class MoveFuncDefToDeclPush : public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
-};
-
-/*!
- Moves the definition of a function to its declaration, with the cursor on the declaration.
- */
-class MoveFuncDefToDeclPull : public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
-};
-
-/*!
-  Assigns the return value of a function call or a new expression to a local variable
- */
-class AssignToLocalVariable : public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
-};
-
-/*!
-  Optimizes a for loop to avoid permanent condition check and forces to use preincrement
-  or predecrement operators in the expression of the for loop.
- */
-class OptimizeForLoop : public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
-};
-
-/*!
-  Escapes or unescapes a string literal as UTF-8.
-
-  Escapes non-ASCII characters in a string literal to hexadecimal escape sequences.
-  Unescapes octal or hexadecimal escape sequences in a string literal.
-  String literals are handled as UTF-8 even if file's encoding is not UTF-8.
- */
-class EscapeStringLiteral : public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
-};
-
-/*!
-  Removes a using directive (using namespace xyz).
-
-*/
-class RemoveUsingNamespace : public CppQuickFixFactory
-{
-public:
-    RemoveUsingNamespace() { setHasClangdReplacement(); }
-
-private:
-    void doMatch(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
-};
-
-/*!
-  Generate constructor
- */
-class GenerateConstructor : public CppQuickFixFactory
-{
-protected:
-    void setTest() { m_test = true; }
-
-private:
-    void doMatch(const CppQuickFixInterface &interface,
-               TextEditor::QuickFixOperations &result) override;
-
-    bool m_test = false;
-};
-
-//! Converts C-style to C++-style comments and vice versa
-class ConvertCommentStyle : public CppQuickFixFactory
-{
-private:
-    void doMatch(const CppQuickFixInterface &interface,
-               TextEditor::QuickFixOperations &result) override;
-};
-
-//! Moves function documentation between declaration and implementation.
-class MoveFunctionComments : public CppQuickFixFactory
-{
-private:
-    void doMatch(const CppQuickFixInterface &interface,
-                 TextEditor::QuickFixOperations &result) override;
-};
-
-} // namespace Internal
-} // namespace CppEditor
diff --git a/src/plugins/cppeditor/cpprefactoringchanges.cpp b/src/plugins/cppeditor/cpprefactoringchanges.cpp
index fd6ce277c9e..d9e5a1c8831 100644
--- a/src/plugins/cppeditor/cpprefactoringchanges.cpp
+++ b/src/plugins/cppeditor/cpprefactoringchanges.cpp
@@ -4,6 +4,8 @@
 #include "cpprefactoringchanges.h"
 
 #include "cppeditorconstants.h"
+#include "cppeditorwidget.h"
+#include "cppsemanticinfo.h"
 #include "cppworkingcopy.h"
 
 #include <projectexplorer/editorconfiguration.h>
@@ -19,6 +21,7 @@
 
 #include <utility>
 
+using namespace Core;
 using namespace CPlusPlus;
 using namespace Utils;
 
@@ -41,10 +44,15 @@ CppRefactoringChanges::CppRefactoringChanges(const Snapshot &snapshot)
 {
 }
 
-CppRefactoringFilePtr CppRefactoringChanges::file(TextEditor::TextEditorWidget *editor, const Document::Ptr &document)
+CppRefactoringFilePtr CppRefactoringChanges::file(
+    TextEditor::TextEditorWidget *editor, const Document::Ptr &document)
 {
     CppRefactoringFilePtr result(new CppRefactoringFile(editor));
     result->setCppDocument(document);
+    if (const auto cppEditorWidget = qobject_cast<CppEditorWidget *>(editor)) {
+        result->m_data = QSharedPointer<CppRefactoringChangesData>::create(
+            cppEditorWidget->semanticInfo().snapshot);
+    }
     return result;
 }
 
@@ -55,6 +63,18 @@ TextEditor::RefactoringFilePtr CppRefactoringChanges::file(const FilePath &fileP
 
 CppRefactoringFilePtr CppRefactoringChanges::cppFile(const Utils::FilePath &filePath) const
 {
+    // Prefer documents from editors, as these are already parsed and up to date with regards to
+    // unsaved changes.
+    const QList<IEditor *> editors = DocumentModel::editorsForFilePath(filePath);
+    for (IEditor *editor : editors) {
+        if (const auto textEditor = qobject_cast<TextEditor::BaseTextEditor *>(editor)) {
+            if (const auto editorWidget = qobject_cast<CppEditorWidget *>(
+                    textEditor->editorWidget())) {
+                return file(editorWidget, editorWidget->semanticInfo().doc);
+            }
+        }
+    }
+
     return CppRefactoringFilePtr(new CppRefactoringFile(filePath, m_data));
 }
 
@@ -144,13 +164,23 @@ bool CppRefactoringFile::isCursorOn(const AST *ast) const
 
 QList<Token> CppRefactoringFile::tokensForCursor() const
 {
-    QTextCursor c = cursor();
-    int pos = c.selectionStart();
-    int endPos = c.selectionEnd();
+    return tokensForCursor(cursor());
+}
+
+QList<Token> CppRefactoringFile::tokensForCursor(const QTextCursor &cursor) const
+{
+    int pos = cursor.selectionStart();
+    int endPos = cursor.selectionEnd();
     if (pos > endPos)
         std::swap(pos, endPos);
 
-    const std::vector<Token> &allTokens = m_cppDocument->translationUnit()->allTokens();
+    // Skip whitespace.
+    while (pos < endPos && document()->characterAt(pos).isSpace())
+        ++pos;
+    while (endPos > pos && document()->characterAt(endPos).isSpace())
+        --endPos;
+
+    const std::vector<Token> &allTokens = cppDocument()->translationUnit()->allTokens();
     const int firstIndex = tokenIndexForPosition(allTokens, pos, 0);
     if (firstIndex == -1)
         return {};
@@ -167,6 +197,14 @@ QList<Token> CppRefactoringFile::tokensForCursor() const
     return result;
 }
 
+QList<Token> CppRefactoringFile::tokensForLine(int line) const
+{
+    const QTextBlock block = document()->findBlockByNumber(line - 1);
+    QTextCursor cursor(block);
+    cursor.select(QTextCursor::BlockUnderCursor);
+    return tokensForCursor(cursor);
+}
+
 ChangeSet::Range CppRefactoringFile::range(unsigned tokenIndex) const
 {
     const Token &token = tokenAt(tokenIndex);
@@ -183,6 +221,9 @@ ChangeSet::Range CppRefactoringFile::range(const AST *ast) const
 
 int CppRefactoringFile::startOf(unsigned index) const
 {
+    if (const auto loc = expansionLoc(index))
+        return loc->first;
+
     int line, column;
     cppDocument()->translationUnit()->getPosition(tokenAt(index).utf16charsBegin(), &line, &column);
     return document()->findBlockByNumber(line - 1).position() + column - 1;
@@ -191,15 +232,14 @@ int CppRefactoringFile::startOf(unsigned index) const
 int CppRefactoringFile::startOf(const AST *ast) const
 {
     QTC_ASSERT(ast, return 0);
-    int firstToken = ast->firstToken();
-    const int lastToken = ast->lastToken();
-    while (tokenAt(firstToken).generated() && firstToken < lastToken)
-        ++firstToken;
-    return startOf(firstToken);
+    return startOf(ast->firstToken());
 }
 
 int CppRefactoringFile::endOf(unsigned index) const
 {
+    if (const auto loc = expansionLoc(index))
+        return loc->first + loc->second;
+
     int line, column;
     cppDocument()->translationUnit()->getPosition(tokenAt(index).utf16charsEnd(), &line, &column);
     return document()->findBlockByNumber(line - 1).position() + column - 1;
@@ -210,14 +250,17 @@ int CppRefactoringFile::endOf(const AST *ast) const
     QTC_ASSERT(ast, return 0);
     int lastToken = ast->lastToken() - 1;
     QTC_ASSERT(lastToken >= 0, return -1);
-    const int firstToken = ast->firstToken();
-    while (tokenAt(lastToken).generated() && lastToken > firstToken)
-        --lastToken;
     return endOf(lastToken);
 }
 
 void CppRefactoringFile::startAndEndOf(unsigned index, int *start, int *end) const
 {
+    if (const auto loc = expansionLoc(index)) {
+        *start = loc->first;
+        *end = loc->first + loc->second;
+        return;
+    }
+
     int line, column;
     Token token(tokenAt(index));
     cppDocument()->translationUnit()->getPosition(token.utf16charsBegin(), &line, &column);
@@ -225,6 +268,13 @@ void CppRefactoringFile::startAndEndOf(unsigned index, int *start, int *end) con
     *end = *start + token.utf16chars();
 }
 
+std::optional<std::pair<int, int> > CppRefactoringFile::expansionLoc(unsigned int index) const
+{
+    if (!tokenAt(index).expanded())
+        return {};
+    return cppDocument()->translationUnit()->getExpansionPosition(index);
+}
+
 QString CppRefactoringFile::textOf(const AST *ast) const
 {
     return textOf(startOf(ast), endOf(ast));
@@ -250,7 +300,7 @@ Id CppRefactoringFile::indenterId() const
 int CppRefactoringFile::tokenIndexForPosition(const std::vector<CPlusPlus::Token> &tokens,
                                               int pos, int startIndex) const
 {
-    const TranslationUnit * const tu = m_cppDocument->translationUnit();
+    const TranslationUnit * const tu = cppDocument()->translationUnit();
 
     // Binary search
     for (int l = startIndex, u = int(tokens.size()) - 1; l <= u; ) {
diff --git a/src/plugins/cppeditor/cpprefactoringchanges.h b/src/plugins/cppeditor/cpprefactoringchanges.h
index 9a9cb09dc14..957d02674c7 100644
--- a/src/plugins/cppeditor/cpprefactoringchanges.h
+++ b/src/plugins/cppeditor/cpprefactoringchanges.h
@@ -11,6 +11,8 @@
 
 #include <texteditor/refactoringchanges.h>
 
+#include <optional>
+
 namespace CppEditor {
 class CppRefactoringChanges;
 class CppRefactoringFile;
@@ -30,7 +32,6 @@ public:
     bool isCursorOn(unsigned tokenIndex) const;
     bool isCursorOn(const CPlusPlus::AST *ast) const;
 
-    Range range(int start, int end) const;
     Range range(unsigned tokenIndex) const;
     Range range(const CPlusPlus::AST *ast) const;
 
@@ -43,7 +44,11 @@ public:
 
     void startAndEndOf(unsigned index, int *start, int *end) const;
 
+    std::optional<std::pair<int, int>> expansionLoc(unsigned index) const;
+
     QList<CPlusPlus::Token> tokensForCursor() const;
+    QList<CPlusPlus::Token> tokensForCursor(const QTextCursor &cursor) const;
+    QList<CPlusPlus::Token> tokensForLine(int line) const;
 
     using TextEditor::RefactoringFile::textOf;
     QString textOf(const CPlusPlus::AST *ast) const;
diff --git a/src/plugins/cppeditor/cpprenaming_test.cpp b/src/plugins/cppeditor/cpprenaming_test.cpp
index 2827434be55..a31d00fa072 100644
--- a/src/plugins/cppeditor/cpprenaming_test.cpp
+++ b/src/plugins/cppeditor/cpprenaming_test.cpp
@@ -5,7 +5,7 @@
 
 #include "cppeditorwidget.h"
 #include "cppmodelmanager.h"
-#include "cppquickfix_test.h"
+#include "quickfixes/cppquickfix_test.h"
 
 #include <texteditor/texteditor.h>
 
diff --git a/src/plugins/cppeditor/cppsemanticinfoupdater.cpp b/src/plugins/cppeditor/cppsemanticinfoupdater.cpp
index e398c14b861..f9e13df0825 100644
--- a/src/plugins/cppeditor/cppsemanticinfoupdater.cpp
+++ b/src/plugins/cppeditor/cppsemanticinfoupdater.cpp
@@ -9,8 +9,6 @@
 #include <cplusplus/CppDocument.h>
 #include <cplusplus/TranslationUnit.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/async.h>
 #include <utils/futuresynchronizer.h>
 #include <utils/qtcassert.h>
@@ -143,7 +141,7 @@ void SemanticInfoUpdater::updateDetached(const SemanticInfo::Source &source)
     });
     const auto future = Utils::asyncRun(CppModelManager::sharedThreadPool(), doUpdate, source);
     d->m_watcher->setFuture(future);
-    ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(future);
+    Utils::futureSynchronizer()->addFuture(future);
 }
 
 SemanticInfo SemanticInfoUpdater::semanticInfo() const
diff --git a/src/plugins/cppeditor/cppsourceprocessor.cpp b/src/plugins/cppeditor/cppsourceprocessor.cpp
index 4cdc6962416..7796c5d2ab1 100644
--- a/src/plugins/cppeditor/cppsourceprocessor.cpp
+++ b/src/plugins/cppeditor/cppsourceprocessor.cpp
@@ -56,11 +56,11 @@ inline QByteArray generateFingerPrint(const QList<CPlusPlus::Macro> &definedMacr
         } else {
             static const QByteArray def("#define ");
             hash.addData(macro.name());
-            hash.addData(" ", 1);
+            hash.addData(QByteArrayView(" ", 1));
             hash.addData(def);
             hash.addData(macro.definitionText());
         }
-        hash.addData("\n", 1);
+        hash.addData(QByteArrayView("\n", 1));
     }
     return hash.result();
 }
diff --git a/src/plugins/cppeditor/cpptoolsjsextension.cpp b/src/plugins/cppeditor/cpptoolsjsextension.cpp
index 607744eec1b..c3ed6e6286e 100644
--- a/src/plugins/cppeditor/cpptoolsjsextension.cpp
+++ b/src/plugins/cppeditor/cpptoolsjsextension.cpp
@@ -42,7 +42,7 @@ static QString fileName(const QString &path, const QString &extension)
 
 QString CppToolsJsExtension::headerGuard(const QString &in) const
 {
-    return Utils::headerGuard(in);
+    return fileSettings().headerGuard(Utils::FilePath::fromString(in));
 }
 
 QString CppToolsJsExtension::licenseTemplate() const
@@ -98,11 +98,6 @@ QString CppToolsJsExtension::classToFileName(const QString &klass, const QString
     return finalPath + name + ext;
 }
 
-QString CppToolsJsExtension::classToHeaderGuard(const QString &klass, const QString &extension) const
-{
-    return Utils::headerGuard(fileName(className(klass), extension), namespaces(klass));
-}
-
 QString CppToolsJsExtension::openNamespaces(const QString &klass) const
 {
     QString result;
diff --git a/src/plugins/cppeditor/cpptoolsjsextension.h b/src/plugins/cppeditor/cpptoolsjsextension.h
index 593f9536411..3b74ebde703 100644
--- a/src/plugins/cppeditor/cpptoolsjsextension.h
+++ b/src/plugins/cppeditor/cpptoolsjsextension.h
@@ -39,7 +39,6 @@ public:
     // Fix the filename casing as configured in C++/File Naming:
     Q_INVOKABLE QString classToFileName(const QString &klass,
                                         const QString &extension) const;
-    Q_INVOKABLE QString classToHeaderGuard(const QString &klass, const QString &extension) const;
     Q_INVOKABLE QString openNamespaces(const QString &klass) const;
     Q_INVOKABLE QString closeNamespaces(const QString &klass) const;
     Q_INVOKABLE bool hasQObjectParent(const QString &klassName) const;
diff --git a/src/plugins/cppeditor/cpptoolsreuse.cpp b/src/plugins/cppeditor/cpptoolsreuse.cpp
index 6555010c8f4..7be177c2c1b 100644
--- a/src/plugins/cppeditor/cpptoolsreuse.cpp
+++ b/src/plugins/cppeditor/cpptoolsreuse.cpp
@@ -4,6 +4,7 @@
 #include "cpptoolsreuse.h"
 
 #include "clangdiagnosticconfigsmodel.h"
+#include "clangdsettings.h"
 #include "cppautocompleter.h"
 #include "cppcanonicalsymbol.h"
 #include "cppcodemodelsettings.h"
@@ -14,9 +15,9 @@
 #include "cppfilesettingspage.h"
 #include "cpphighlighter.h"
 #include "cppqtstyleindenter.h"
-#include "cppquickfixassistant.h"
 #include "cpprefactoringchanges.h"
 #include "projectinfo.h"
+#include "quickfixes/cppquickfixassistant.h"
 
 #include <coreplugin/documentmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
@@ -357,20 +358,9 @@ CppCompletionAssistProcessor *getCppCompletionAssistProcessor()
     return new Internal::InternalCppCompletionAssistProcessor();
 }
 
-CppCodeModelSettings *codeModelSettings()
+QString deriveHeaderGuard(const Utils::FilePath &filePath, ProjectExplorer::Project *project)
 {
-    return &cppCodeModelSettings();
-}
-
-int indexerFileSizeLimitInMb()
-{
-    const CppCodeModelSettings *settings = codeModelSettings();
-    QTC_ASSERT(settings, return -1);
-
-    if (settings->skipIndexingBigFiles())
-        return settings->indexerFileSizeLimitInMb();
-
-    return -1;
+    return Internal::cppFileSettingsForProject(project).headerGuard(filePath);
 }
 
 bool fileSizeExceedsLimit(const FilePath &filePath, int sizeLimitInMb)
@@ -380,26 +370,13 @@ bool fileSizeExceedsLimit(const FilePath &filePath, int sizeLimitInMb)
 
     const qint64 fileSizeInMB = filePath.fileSize() / (1000 * 1000);
     if (fileSizeInMB > sizeLimitInMb) {
-        const QString msg = Tr::tr("C++ Indexer: Skipping file \"%1\" because it is too big.")
-                        .arg(filePath.displayName());
-
-        QMetaObject::invokeMethod(Core::MessageManager::instance(),
-                                  [msg]() { Core::MessageManager::writeSilently(msg); });
-
+        Core::MessageManager::writeSilently(Tr::tr("C++ Indexer: Skipping file \"%1\" because "
+                                                   "it is too big.").arg(filePath.displayName()));
         return true;
     }
-
     return false;
 }
 
-UsePrecompiledHeaders getPchUsage()
-{
-    const CppCodeModelSettings *cms = codeModelSettings();
-    if (cms->pchUsage() == CppCodeModelSettings::PchUse_None)
-        return UsePrecompiledHeaders::No;
-    return UsePrecompiledHeaders::Yes;
-}
-
 static void addBuiltinConfigs(ClangDiagnosticConfigsModel &model)
 {
     ClangDiagnosticConfig config;
diff --git a/src/plugins/cppeditor/cpptoolsreuse.h b/src/plugins/cppeditor/cpptoolsreuse.h
index 89bf8961976..71aabab08df 100644
--- a/src/plugins/cppeditor/cpptoolsreuse.h
+++ b/src/plugins/cppeditor/cpptoolsreuse.h
@@ -6,7 +6,6 @@
 #include "cppeditor_global.h"
 
 #include "clangdiagnosticconfig.h"
-#include "compileroptionsbuilder.h"
 #include "projectpart.h"
 
 #include <texteditor/quickfix.h>
@@ -65,6 +64,9 @@ quickFixOperations(const TextEditor::AssistInterface *interface);
 
 CppCompletionAssistProcessor CPPEDITOR_EXPORT *getCppCompletionAssistProcessor();
 
+QString CPPEDITOR_EXPORT
+deriveHeaderGuard(const Utils::FilePath &filePath, ProjectExplorer::Project *project);
+
 enum class CacheUsage { ReadWrite, ReadOnly };
 
 Utils::FilePath CPPEDITOR_EXPORT correspondingHeaderOrSource(
@@ -73,14 +75,11 @@ Utils::FilePath CPPEDITOR_EXPORT correspondingHeaderOrSource(
 
 void CPPEDITOR_EXPORT openEditor(const Utils::FilePath &filePath, bool inNextSplit,
                                  Utils::Id editorId = {});
-class CppCodeModelSettings;
-CppCodeModelSettings CPPEDITOR_EXPORT *codeModelSettings();
 
 QString CPPEDITOR_EXPORT preferredCxxHeaderSuffix(ProjectExplorer::Project *project);
 QString CPPEDITOR_EXPORT preferredCxxSourceSuffix(ProjectExplorer::Project *project);
 bool CPPEDITOR_EXPORT preferLowerCaseFileNames(ProjectExplorer::Project *project);
 
-
 QList<Utils::Text::Range> CPPEDITOR_EXPORT symbolOccurrencesInText(
     const QTextDocument &doc, QStringView text, int offset, const QString &symbolName);
 Utils::SearchResultItems CPPEDITOR_EXPORT
@@ -88,9 +87,6 @@ symbolOccurrencesInDeclarationComments(const Utils::SearchResultItems &symbolOcc
 QList<Utils::Text::Range> CPPEDITOR_EXPORT symbolOccurrencesInDeclarationComments(
     CppEditorWidget *editorWidget, const QTextCursor &cursor);
 
-UsePrecompiledHeaders CPPEDITOR_EXPORT getPchUsage();
-
-int indexerFileSizeLimitInMb();
 bool fileSizeExceedsLimit(const Utils::FilePath &filePath, int sizeLimitInMb);
 
 ProjectExplorer::Project CPPEDITOR_EXPORT *projectForProjectInfo(const ProjectInfo &info);
diff --git a/src/plugins/cppeditor/cpptoolstestcase.cpp b/src/plugins/cppeditor/cpptoolstestcase.cpp
index b0151e7a813..3ac2feeca38 100644
--- a/src/plugins/cppeditor/cpptoolstestcase.cpp
+++ b/src/plugins/cppeditor/cpptoolstestcase.cpp
@@ -26,7 +26,7 @@
 #include <texteditor/codeassist/iassistproposal.h>
 #include <texteditor/codeassist/iassistproposalmodel.h>
 #include <texteditor/storagesettings.h>
-#include <texteditor/syntaxhighlighterrunner.h>
+#include <texteditor/syntaxhighlighter.h>
 #include <texteditor/texteditor.h>
 
 #include <utils/environment.h>
@@ -238,8 +238,8 @@ bool TestCase::openCppEditor(const FilePath &filePath, TextEditor::BaseTextEdito
                 [e] {
                     return e->editorWidget()
                         ->textDocument()
-                        ->syntaxHighlighterRunner()
-                        ->syntaxInfoUpdated();
+                        ->syntaxHighlighter()
+                        ->syntaxHighlighterUpToDate();
                 },
                 5000))
             return false;
@@ -295,10 +295,18 @@ bool TestCase::waitForProcessedEditorDocument(const FilePath &filePath, int time
     return waitForProcessedEditorDocument_internal(editorDocument, timeOutInMs);
 }
 
-CPlusPlus::Document::Ptr TestCase::waitForRehighlightedSemanticDocument(CppEditorWidget *editorWidget)
+CPlusPlus::Document::Ptr TestCase::waitForRehighlightedSemanticDocument(
+    CppEditorWidget *editorWidget, int timeoutInMs)
 {
-    while (!editorWidget->isSemanticInfoValid())
+    QElapsedTimer timer;
+    timer.start();
+
+    while (!editorWidget->isSemanticInfoValid()) {
+        if (timer.elapsed() >= timeoutInMs)
+            return {};
         QCoreApplication::processEvents();
+        QThread::msleep(20);
+    }
     return editorWidget->semanticInfo().doc;
 }
 
@@ -510,4 +518,19 @@ int clangdIndexingTimeout()
     return intervalAsInt;
 }
 
+SourceFilesRefreshGuard::SourceFilesRefreshGuard()
+{
+    connect(CppModelManager::instance(), &CppModelManager::sourceFilesRefreshed, this, [this] {
+        m_refreshed = true;
+    });
+}
+
+bool SourceFilesRefreshGuard::wait()
+{
+    for (int i = 0; i < 10 && !m_refreshed; ++i) {
+        CppEditor::Tests::waitForSignalOrTimeout(
+            CppModelManager::instance(), &CppModelManager::sourceFilesRefreshed, 1000);
+    }
+    return m_refreshed;
+}
 } // namespace CppEditor::Tests
diff --git a/src/plugins/cppeditor/cpptoolstestcase.h b/src/plugins/cppeditor/cpptoolstestcase.h
index 99969621b3e..6439075efbd 100644
--- a/src/plugins/cppeditor/cpptoolstestcase.h
+++ b/src/plugins/cppeditor/cpptoolstestcase.h
@@ -140,7 +140,7 @@ public:
             const Utils::FilePath &filePath, int timeOutInMs = 5000);
 
     static CPlusPlus::Document::Ptr waitForRehighlightedSemanticDocument(
-            CppEditorWidget *editorWidget);
+        CppEditorWidget *editorWidget, int timeoutInMs = defaultTimeOutInMs);
 
     enum { defaultTimeOutInMs = 30 * 1000 /*= 30 secs*/ };
     static bool waitUntilProjectIsFullyOpened(ProjectExplorer::Project *project,
@@ -171,6 +171,8 @@ public:
             bool configureAsExampleProject = false,
             ProjectExplorer::Kit *kit = nullptr);
 
+    QList<ProjectExplorer::Project *> projects() const { return m_openProjects; };
+
 private:
     QList<ProjectExplorer::Project *> m_openProjects;
 };
@@ -203,5 +205,17 @@ private:
     TemporaryCopiedDir();
 };
 
+class SourceFilesRefreshGuard : public QObject
+{
+public:
+    SourceFilesRefreshGuard();
+
+    void reset() { m_refreshed = false; }
+    bool wait();
+
+private:
+    bool m_refreshed = false;
+};
+
 } // namespace Tests
 } // namespace CppEditor
diff --git a/src/plugins/cppeditor/cpptypehierarchy.cpp b/src/plugins/cppeditor/cpptypehierarchy.cpp
index 57b3e95f1a7..ab4bc0525e8 100644
--- a/src/plugins/cppeditor/cpptypehierarchy.cpp
+++ b/src/plugins/cppeditor/cpptypehierarchy.cpp
@@ -4,6 +4,7 @@
 #include "cpptypehierarchy.h"
 
 #include "cppeditorconstants.h"
+#include "cppeditordocument.h"
 #include "cppeditortr.h"
 #include "cppeditorwidget.h"
 #include "cppelementevaluator.h"
@@ -11,11 +12,10 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/find/itemviewfind.h>
-#include <coreplugin/inavigationwidgetfactory.h>
-#include <coreplugin/navigationwidget.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 
 #include <texteditor/texteditor.h>
+#include <texteditor/typehierarchy.h>
 
 #include <utils/algorithm.h>
 #include <utils/delegates.h>
@@ -53,7 +53,7 @@ public:
     QMimeData *mimeData(const QModelIndexList &indexes) const override;
 };
 
-class CppTypeHierarchyWidget : public QWidget
+class CppTypeHierarchyWidget : public TextEditor::TypeHierarchyWidget
 {
 public:
     CppTypeHierarchyWidget();
@@ -61,6 +61,8 @@ public:
     void perform();
 
 private:
+    void reload() override { perform(); }
+
     void displayHierarchy();
     typedef QList<CppClass> CppClass::*HierarchyMember;
     void performFromExpression(const QString &expression, const FilePath &filePath);
@@ -87,6 +89,7 @@ private:
     ProgressIndicator *m_progressIndicator = nullptr;
     QString m_oldClass;
     bool m_showOldClass = false;
+    int m_runningIndexers = 0;
 };
 
 enum ItemRole {
@@ -197,10 +200,22 @@ CppTypeHierarchyWidget::CppTypeHierarchyWidget()
 
     connect(&m_futureWatcher, &QFutureWatcher<void>::finished,
             this, &CppTypeHierarchyWidget::displayHierarchy);
+
+    connect(ProgressManager::instance(), &ProgressManager::taskStarted, [this](Id type) {
+        if (type == Constants::TASK_INDEX)
+            ++m_runningIndexers;
+    });
+    connect(ProgressManager::instance(), &ProgressManager::allTasksFinished, [this](Id type) {
+        if (type == Constants::TASK_INDEX)
+            --m_runningIndexers;
+    });
 }
 
 void CppTypeHierarchyWidget::perform()
 {
+    if (m_runningIndexers > 0)
+        return;
+
     if (m_future.isRunning())
         m_future.cancel();
 
@@ -397,47 +412,19 @@ QMimeData *CppTypeHierarchyModel::mimeData(const QModelIndexList &indexes) const
 
 // CppTypeHierarchyFactory
 
-class CppTypeHierarchyFactory final : public INavigationWidgetFactory
+class CppTypeHierarchyFactory final : public TextEditor::TypeHierarchyWidgetFactory
 {
-public:
-    CppTypeHierarchyFactory()
+    TextEditor::TypeHierarchyWidget *createWidget(Core::IEditor *editor) final
     {
-        setDisplayName(Tr::tr("Type Hierarchy"));
-        setPriority(700);
-        setId(Constants::TYPE_HIERARCHY_ID);
+        const auto textEditor = qobject_cast<TextEditor::BaseTextEditor *>(editor);
+        if (!textEditor)
+            return nullptr;
+        const auto cppDoc = qobject_cast<CppEditorDocument *>(textEditor->textDocument());
+        if (!cppDoc || cppDoc->usesClangd())
+            return nullptr;
 
-        ActionBuilder openTypeHierarchy(this, Constants::OPEN_TYPE_HIERARCHY);
-        openTypeHierarchy.setText(Tr::tr("Open Type Hierarchy"));
-        openTypeHierarchy.setContext(Context(Constants::CPPEDITOR_ID));
-        openTypeHierarchy.bindContextAction(&m_openTypeHierarchyAction);
-        openTypeHierarchy.setDefaultKeySequence(Tr::tr("Meta+Shift+T"), Tr::tr("Ctrl+Shift+T"));
-        openTypeHierarchy.addToContainers({Constants::M_TOOLS_CPP, Constants::M_CONTEXT},
-                                          Constants::G_SYMBOL);
-
-        connect(m_openTypeHierarchyAction, &QAction::triggered, this, [] {
-            NavigationWidget::activateSubWidget(Constants::TYPE_HIERARCHY_ID, Side::Left);
-        });
-
-        connect(ProgressManager::instance(), &ProgressManager::taskStarted, [this](Id type) {
-            if (type == Constants::TASK_INDEX)
-                m_openTypeHierarchyAction->setEnabled(false);
-        });
-        connect(ProgressManager::instance(), &ProgressManager::allTasksFinished, [this](Id type) {
-            if (type == Constants::TASK_INDEX)
-                m_openTypeHierarchyAction->setEnabled(true);
-        });
+        return new CppTypeHierarchyWidget;
     }
-
-    NavigationView createWidget() final
-    {
-        auto w = new CppTypeHierarchyWidget;
-        connect(m_openTypeHierarchyAction, &QAction::triggered, w, &CppTypeHierarchyWidget::perform);
-        w->perform();
-
-        return {w, {}};
-    }
-
-    QAction *m_openTypeHierarchyAction = nullptr;
 };
 
 static CppTypeHierarchyFactory &cppTypeHierarchyFactory()
@@ -446,11 +433,6 @@ static CppTypeHierarchyFactory &cppTypeHierarchyFactory()
     return theCppTypeHierarchyFactory;
 }
 
-void openCppTypeHierarchy()
-{
-    cppTypeHierarchyFactory().m_openTypeHierarchyAction->trigger();
-}
-
 void setupCppTypeHierarchy()
 {
     (void) cppTypeHierarchyFactory(); // Trigger instantiation
diff --git a/src/plugins/cppeditor/cpptypehierarchy.h b/src/plugins/cppeditor/cpptypehierarchy.h
index c6c99f214f7..ffe7edbc134 100644
--- a/src/plugins/cppeditor/cpptypehierarchy.h
+++ b/src/plugins/cppeditor/cpptypehierarchy.h
@@ -4,8 +4,5 @@
 #pragma once
 
 namespace CppEditor::Internal {
-
-void openCppTypeHierarchy();
 void setupCppTypeHierarchy();
-
 } // CppEditor::Internal
diff --git a/src/plugins/cppeditor/cppuseselections_test.cpp b/src/plugins/cppeditor/cppuseselections_test.cpp
index 460e502c8fe..85ed9be442e 100644
--- a/src/plugins/cppeditor/cppuseselections_test.cpp
+++ b/src/plugins/cppeditor/cppuseselections_test.cpp
@@ -77,7 +77,7 @@ UseSelectionsTestCase::UseSelectionsTestCase(CppTestDocument &testFile,
     closeEditorAtEndOfTestCase(testFile.m_editor);
 
     testFile.m_editor->setCursorPosition(testFile.m_cursorPosition);
-    waitForRehighlightedSemanticDocument(m_editorWidget);
+    QVERIFY(waitForRehighlightedSemanticDocument(m_editorWidget));
 
     bool hasTimedOut;
     const SelectionList selections = waitForUseSelections(&hasTimedOut);
diff --git a/src/plugins/cppeditor/cppuseselectionsupdater.cpp b/src/plugins/cppeditor/cppuseselectionsupdater.cpp
index 67fb6d7a1bc..bf1eabd1534 100644
--- a/src/plugins/cppeditor/cppuseselectionsupdater.cpp
+++ b/src/plugins/cppeditor/cppuseselectionsupdater.cpp
@@ -7,8 +7,6 @@
 #include "cppeditorwidget.h"
 #include "cppmodelmanager.h"
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/futuresynchronizer.h>
 #include <utils/qtcassert.h>
 #include <utils/textutils.h>
@@ -75,7 +73,7 @@ CppUseSelectionsUpdater::RunnerInfo CppUseSelectionsUpdater::update(CallType cal
         m_runnerWordStartPosition = params.textCursor.position();
 
         m_runnerWatcher->setFuture(cppEditorDocument->cursorInfo(params));
-        ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(m_runnerWatcher->future());
+        Utils::futureSynchronizer()->addFuture(m_runnerWatcher->future());
         return RunnerInfo::Started;
     } else { // synchronous case
         abortSchedule();
diff --git a/src/plugins/cppeditor/cursorineditor.h b/src/plugins/cppeditor/cursorineditor.h
index 46dd4b2b2ac..77c853f97bd 100644
--- a/src/plugins/cppeditor/cursorineditor.h
+++ b/src/plugins/cppeditor/cursorineditor.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <cplusplus/CppDocument.h>
 #include <utils/fileutils.h>
 #include <utils/link.h>
 
@@ -22,15 +23,18 @@ class CursorInEditor
 {
 public:
     CursorInEditor(const QTextCursor &cursor, const Utils::FilePath &filePath,
-                 CppEditorWidget *editorWidget = nullptr,
-                 TextEditor::TextDocument *textDocument = nullptr)
+                   CppEditorWidget *editorWidget = nullptr,
+                   TextEditor::TextDocument *textDocument = nullptr,
+                   const CPlusPlus::Document::Ptr &cppDocument = {})
         : m_cursor(cursor)
         , m_filePath(filePath)
         , m_editorWidget(editorWidget)
         , m_textDocument(textDocument)
+        , m_cppDocument(cppDocument)
     {}
     CppEditorWidget *editorWidget() const { return m_editorWidget; }
     TextEditor::TextDocument *textDocument() const { return m_textDocument; }
+    CPlusPlus::Document::Ptr cppDocument() const { return m_cppDocument; }
     const QTextCursor &cursor() const { return m_cursor; }
     const Utils::FilePath &filePath() const { return m_filePath; }
 private:
@@ -38,6 +42,7 @@ private:
     Utils::FilePath m_filePath;
     CppEditorWidget *m_editorWidget = nullptr;
     TextEditor::TextDocument * const m_textDocument;
+    const CPlusPlus::Document::Ptr m_cppDocument;
 };
 
 } // namespace CppEditor
diff --git a/src/plugins/cppeditor/fileandtokenactions_test.cpp b/src/plugins/cppeditor/fileandtokenactions_test.cpp
index f341cc1808d..9e9a7a2f29f 100644
--- a/src/plugins/cppeditor/fileandtokenactions_test.cpp
+++ b/src/plugins/cppeditor/fileandtokenactions_test.cpp
@@ -4,20 +4,20 @@
 #include "fileandtokenactions_test.h"
 
 #include "cppeditorwidget.h"
-#include "cppquickfix.h"
-#include "cppquickfixassistant.h"
-#include "cppinsertvirtualmethods.h"
 #include "cppmodelmanager.h"
 #include "cpptoolstestcase.h"
-#include "cpptypehierarchy.h"
 #include "cppworkingcopy.h"
 #include "projectinfo.h"
+#include "quickfixes/cppquickfix.h"
+#include "quickfixes/cppquickfixassistant.h"
+#include "quickfixes/cppinsertvirtualmethods.h"
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>
+#include <texteditor/typehierarchy.h>
 
 #include <cplusplus/CppDocument.h>
 #include <cplusplus/TranslationUnit.h>
@@ -164,7 +164,7 @@ TestActionsTestCase::TestActionsTestCase(const Actions &tokenActions, const Acti
         QVERIFY(CppModelManager::workingCopy().get(filePath));
 
         // Rehighlight
-        waitForRehighlightedSemanticDocument(editorWidget);
+        QVERIFY(waitForRehighlightedSemanticDocument(editorWidget));
 
         // Run all file actions
         executeActionsOnEditorWidget(editorWidget, fileActions);
@@ -383,7 +383,7 @@ public:
 
 void OpenTypeHierarchyTokenAction::run(CppEditorWidget *)
 {
-    openCppTypeHierarchy();
+    TextEditor::openTypeHierarchy();
     QApplication::processEvents();
 }
 
diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
index 9bef50b0b8a..3d19a84b758 100644
--- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
+++ b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
@@ -3,6 +3,7 @@
 
 #include "followsymbol_switchmethoddecldef_test.h"
 
+#include "clangdsettings.h"
 #include "cppcodemodelsettings.h"
 #include "cppeditorwidget.h"
 #include "cppfollowsymbolundercursor.h"
@@ -309,7 +310,7 @@ F2TestCase::F2TestCase(CppEditorAction action,
 
         // Rehighlight
         if (!useClangd)
-            waitForRehighlightedSemanticDocument(testFile->m_editorWidget);
+            QVERIFY(waitForRehighlightedSemanticDocument(testFile->m_editorWidget));
     }
 
     // Activate editor of initial test file
diff --git a/src/plugins/cppeditor/projectinfo.cpp b/src/plugins/cppeditor/projectinfo.cpp
index 57466d1cd95..9561310f323 100644
--- a/src/plugins/cppeditor/projectinfo.cpp
+++ b/src/plugins/cppeditor/projectinfo.cpp
@@ -19,6 +19,12 @@ ProjectInfo::ConstPtr ProjectInfo::create(const ProjectExplorer::ProjectUpdateIn
     return ConstPtr(new ProjectInfo(updateInfo, projectParts));
 }
 
+ProjectInfo::ConstPtr ProjectInfo::cloneWithNewSettings(const ConstPtr &pi,
+                                                        const CppCodeModelSettings &settings)
+{
+    return ConstPtr(new ProjectInfo(pi, settings));
+}
+
 bool ProjectInfo::operator ==(const ProjectInfo &other) const
 {
     return m_projectName == other.m_projectName
@@ -27,6 +33,7 @@ bool ProjectInfo::operator ==(const ProjectInfo &other) const
         && m_projectParts == other.m_projectParts
         && m_headerPaths == other.m_headerPaths
         && m_sourceFiles == other.m_sourceFiles
+        && m_settings == other.m_settings
         && m_defines == other.m_defines;
 }
 
@@ -42,7 +49,8 @@ bool ProjectInfo::definesChanged(const ProjectInfo &other) const
 
 bool ProjectInfo::configurationChanged(const ProjectInfo &other) const
 {
-    return definesChanged(other) || m_headerPaths != other.m_headerPaths;
+    return definesChanged(other) || m_headerPaths != other.m_headerPaths
+        || m_settings != other.settings();
 }
 
 bool ProjectInfo::configurationOrFilesChanged(const ProjectInfo &other) const
@@ -89,7 +97,20 @@ ProjectInfo::ProjectInfo(const ProjectExplorer::ProjectUpdateInfo &updateInfo,
       m_buildRoot(updateInfo.buildRoot),
       m_headerPaths(getHeaderPaths(projectParts)),
       m_sourceFiles(getSourceFiles(projectParts)),
-      m_defines(getDefines(projectParts))
+      m_defines(getDefines(projectParts)),
+      m_settings(updateInfo.cppSettings)
+{
+}
+
+ProjectInfo::ProjectInfo(const ConstPtr &pi, const CppCodeModelSettings &settings)
+    : m_projectParts(pi->projectParts()),
+    m_projectName(pi->projectName()),
+    m_projectFilePath(pi->projectFilePath()),
+    m_buildRoot(pi->buildRoot()),
+    m_headerPaths(pi->m_headerPaths),
+    m_sourceFiles(pi->sourceFiles()),
+    m_defines(pi->m_defines),
+    m_settings(settings)
 {
 }
 
diff --git a/src/plugins/cppeditor/projectinfo.h b/src/plugins/cppeditor/projectinfo.h
index 26f92eb6a7f..3b18c7ae6fd 100644
--- a/src/plugins/cppeditor/projectinfo.h
+++ b/src/plugins/cppeditor/projectinfo.h
@@ -5,6 +5,7 @@
 
 #include "cppeditor_global.h"
 
+#include "cppcodemodelsettings.h"
 #include "projectpart.h"
 
 #include <projectexplorer/project.h>
@@ -28,6 +29,8 @@ public:
     using ConstPtr = std::shared_ptr<const ProjectInfo>;
     static ConstPtr create(const ProjectExplorer::ProjectUpdateInfo &updateInfo,
                            const QVector<ProjectPart::ConstPtr> &projectParts);
+    static ConstPtr cloneWithNewSettings(const ProjectInfo::ConstPtr &pi,
+                                         const CppCodeModelSettings &settings);
 
     const QVector<ProjectPart::ConstPtr> &projectParts() const { return m_projectParts; }
     const QSet<Utils::FilePath> &sourceFiles() const { return m_sourceFiles; }
@@ -35,6 +38,7 @@ public:
     Utils::FilePath projectFilePath() const { return m_projectFilePath; }
     Utils::FilePath projectRoot() const { return m_projectFilePath.parentDir(); }
     Utils::FilePath buildRoot() const { return m_buildRoot; }
+    const CppCodeModelSettings &settings() const { return m_settings; }
 
     // Comparisons
     bool operator ==(const ProjectInfo &other) const;
@@ -46,6 +50,7 @@ public:
 private:
     ProjectInfo(const ProjectExplorer::ProjectUpdateInfo &updateInfo,
                 const QVector<ProjectPart::ConstPtr> &projectParts);
+    ProjectInfo(const ProjectInfo::ConstPtr &pi, const CppCodeModelSettings &settings);
 
     const QVector<ProjectPart::ConstPtr> m_projectParts;
     const QString m_projectName;
@@ -54,6 +59,7 @@ private:
     const ProjectExplorer::HeaderPaths m_headerPaths;
     const QSet<Utils::FilePath> m_sourceFiles;
     const ProjectExplorer::Macros m_defines;
+    const CppCodeModelSettings m_settings;
 };
 
 using ProjectInfoList = QList<ProjectInfo::ConstPtr>;
diff --git a/src/plugins/cppeditor/projectpart.cpp b/src/plugins/cppeditor/projectpart.cpp
index 680723750f8..24f9dc42e85 100644
--- a/src/plugins/cppeditor/projectpart.cpp
+++ b/src/plugins/cppeditor/projectpart.cpp
@@ -12,6 +12,7 @@
 #include <QTextStream>
 
 using namespace ProjectExplorer;
+using namespace Utils;
 
 namespace CppEditor {
 
@@ -115,6 +116,32 @@ static QStringList getIncludedFiles(const RawProjectPart &rpp, const RawProjectP
     return !rpp.includedFiles.isEmpty() ? rpp.includedFiles : flags.includedFiles;
 }
 
+static QStringList getExtraCodeModelFlags(const RawProjectPart &rpp, const ProjectFiles &files)
+{
+    if (!Utils::anyOf(files, [](const ProjectFile &f) { return f.kind == ProjectFile::CudaSource; }))
+        return {};
+
+    Utils::FilePath cudaPath;
+    for (const HeaderPath &hp : rpp.headerPaths) {
+        if (hp.type == HeaderPathType::BuiltIn)
+            continue;
+        if (!hp.path.endsWith("/include"))
+            continue;
+        const Utils::FilePath includeDir = Utils::FilePath::fromString(hp.path);
+        if (!includeDir.pathAppended("cuda.h").exists())
+            continue;
+        for (FilePath dir = includeDir.parentDir(); cudaPath.isEmpty() && !dir.isRootPath();
+             dir = dir.parentDir()) {
+            if (dir.pathAppended("nvvm").exists())
+                cudaPath = dir;
+        }
+        break;
+    }
+    if (!cudaPath.isEmpty())
+        return {"--cuda-path=" + cudaPath.toUserOutput()};
+    return {};
+}
+
 ProjectPart::ProjectPart(const Utils::FilePath &topLevelProject,
                          const RawProjectPart &rpp,
                          const QString &displayName,
@@ -149,7 +176,7 @@ ProjectPart::ProjectPart(const Utils::FilePath &topLevelProject,
       toolchainInstallDir(tcInfo.installDir),
       compilerFilePath(tcInfo.compilerFilePath),
       warningFlags(flags.warningFlags),
-      extraCodeModelFlags(tcInfo.extraCodeModelFlags),
+      extraCodeModelFlags(tcInfo.extraCodeModelFlags + getExtraCodeModelFlags(rpp, files)),
       compilerFlags(flags.commandLineFlags),
       m_macroReport(getToolchainMacros(flags, tcInfo, language)),
       languageFeatures(deriveLanguageFeatures())
diff --git a/src/plugins/cppeditor/quickfixes/assigntolocalvariable.cpp b/src/plugins/cppeditor/quickfixes/assigntolocalvariable.cpp
new file mode 100644
index 00000000000..ae63681dc26
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/assigntolocalvariable.cpp
@@ -0,0 +1,510 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "assigntolocalvariable.h"
+
+#include "../cppcodestylesettings.h"
+#include "../cppeditortr.h"
+#include "../cppeditorwidget.h"
+#include "../cpprefactoringchanges.h"
+#include "cppquickfix.h"
+#include "cppquickfixprojectsettings.h"
+
+#include <cplusplus/CppRewriter.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/TypeOfExpression.h>
+#include <projectexplorer/projecttree.h>
+
+#ifdef WITH_TESTS
+#include "cppquickfix_test.h"
+#include <QtTest>
+#endif
+
+using namespace CPlusPlus;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+
+class AssignToLocalVariableOperation : public CppQuickFixOperation
+{
+public:
+    explicit AssignToLocalVariableOperation(const CppQuickFixInterface &interface,
+                                            const int insertPos, const AST *ast, const Name *name)
+        : CppQuickFixOperation(interface)
+        , m_insertPos(insertPos)
+        , m_ast(ast)
+        , m_name(name)
+        , m_oo(CppCodeStyleSettings::currentProjectCodeStyleOverview())
+        , m_originalName(m_oo.prettyName(m_name))
+        , m_file(interface.currentFile())
+    {
+        setDescription(Tr::tr("Assign to Local Variable"));
+    }
+
+private:
+    void perform() override
+    {
+        QString type = deduceType();
+        if (type.isEmpty())
+            return;
+        const int origNameLength = m_originalName.length();
+        const QString varName = constructVarName();
+        const QString insertString = type.replace(type.length() - origNameLength, origNameLength,
+                                                  varName + QLatin1String(" = "));
+        m_file->apply(ChangeSet::makeInsert(m_insertPos, insertString));
+
+        // move cursor to new variable name
+        QTextCursor c = m_file->cursor();
+        c.setPosition(m_insertPos + insertString.length() - varName.length() - 3);
+        c.movePosition(QTextCursor::EndOfWord, QTextCursor::KeepAnchor);
+        editor()->setTextCursor(c);
+    }
+
+    QString deduceType() const
+    {
+        const auto settings = CppQuickFixProjectsSettings::getQuickFixSettings(
+            ProjectExplorer::ProjectTree::currentProject());
+        if (m_file->cppDocument()->languageFeatures().cxx11Enabled && settings->useAuto)
+            return "auto " + m_originalName;
+
+        TypeOfExpression typeOfExpression;
+        typeOfExpression.init(semanticInfo().doc, snapshot(), context().bindings());
+        typeOfExpression.setExpandTemplates(true);
+        Scope * const scope = m_file->scopeAt(m_ast->firstToken());
+        const QList<LookupItem> result = typeOfExpression(m_file->textOf(m_ast).toUtf8(),
+                                                          scope, TypeOfExpression::Preprocess);
+        if (result.isEmpty())
+            return {};
+
+        SubstitutionEnvironment env;
+        env.setContext(context());
+        env.switchScope(result.first().scope());
+        ClassOrNamespace *con = typeOfExpression.context().lookupType(scope);
+        if (!con)
+            con = typeOfExpression.context().globalNamespace();
+        UseMinimalNames q(con);
+        env.enter(&q);
+
+        Control *control = context().bindings()->control().get();
+        FullySpecifiedType type = rewriteType(result.first().type(), &env, control);
+
+        return m_oo.prettyType(type, m_name);
+    }
+
+    QString constructVarName() const
+    {
+        QString newName = m_originalName;
+        if (newName.startsWith(QLatin1String("get"), Qt::CaseInsensitive)
+            && newName.length() > 3
+            && newName.at(3).isUpper()) {
+            newName.remove(0, 3);
+            newName.replace(0, 1, newName.at(0).toLower());
+        } else if (newName.startsWith(QLatin1String("to"), Qt::CaseInsensitive)
+                   && newName.length() > 2
+                   && newName.at(2).isUpper()) {
+            newName.remove(0, 2);
+            newName.replace(0, 1, newName.at(0).toLower());
+        } else {
+            newName.replace(0, 1, newName.at(0).toUpper());
+            newName.prepend(QLatin1String("local"));
+        }
+        return newName;
+    }
+
+    const int m_insertPos;
+    const AST * const m_ast;
+    const Name * const m_name;
+    const Overview m_oo;
+    const QString m_originalName;
+    const CppRefactoringFilePtr m_file;
+};
+
+//! Assigns the return value of a function call or a new expression to a local variable
+class AssignToLocalVariable : public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const QList<AST *> &path = interface.path();
+        AST *outerAST = nullptr;
+        SimpleNameAST *nameAST = nullptr;
+
+        for (int i = path.size() - 3; i >= 0; --i) {
+            if (CallAST *callAST = path.at(i)->asCall()) {
+                if (!interface.isCursorOn(callAST))
+                    return;
+                if (i - 2 >= 0) {
+                    const int idx = i - 2;
+                    if (path.at(idx)->asSimpleDeclaration())
+                        return;
+                    if (path.at(idx)->asExpressionStatement())
+                        return;
+                    if (path.at(idx)->asMemInitializer())
+                        return;
+                    if (path.at(idx)->asCall()) { // Fallback if we have a->b()->c()...
+                        --i;
+                        continue;
+                    }
+                }
+                for (int a = i - 1; a > 0; --a) {
+                    if (path.at(a)->asBinaryExpression())
+                        return;
+                    if (path.at(a)->asReturnStatement())
+                        return;
+                    if (path.at(a)->asCall())
+                        return;
+                }
+
+                if (MemberAccessAST *member = path.at(i + 1)->asMemberAccess()) { // member
+                    if (NameAST *name = member->member_name)
+                        nameAST = name->asSimpleName();
+                } else if (QualifiedNameAST *qname = path.at(i + 2)->asQualifiedName()) { // static or
+                    nameAST = qname->unqualified_name->asSimpleName();                    // func in ns
+                } else { // normal
+                    nameAST = path.at(i + 2)->asSimpleName();
+                }
+
+                if (nameAST) {
+                    outerAST = callAST;
+                    break;
+                }
+            } else if (NewExpressionAST *newexp = path.at(i)->asNewExpression()) {
+                if (!interface.isCursorOn(newexp))
+                    return;
+                if (i - 2 >= 0) {
+                    const int idx = i - 2;
+                    if (path.at(idx)->asSimpleDeclaration())
+                        return;
+                    if (path.at(idx)->asExpressionStatement())
+                        return;
+                    if (path.at(idx)->asMemInitializer())
+                        return;
+                }
+                for (int a = i - 1; a > 0; --a) {
+                    if (path.at(a)->asReturnStatement())
+                        return;
+                    if (path.at(a)->asCall())
+                        return;
+                }
+
+                if (NamedTypeSpecifierAST *ts = path.at(i + 2)->asNamedTypeSpecifier()) {
+                    nameAST = ts->name->asSimpleName();
+                    outerAST = newexp;
+                    break;
+                }
+            }
+        }
+
+        if (outerAST && nameAST) {
+            const CppRefactoringFilePtr file = interface.currentFile();
+            QList<LookupItem> items;
+            TypeOfExpression typeOfExpression;
+            typeOfExpression.init(interface.semanticInfo().doc, interface.snapshot(),
+                                  interface.context().bindings());
+            typeOfExpression.setExpandTemplates(true);
+
+            // If items are empty, AssignToLocalVariableOperation will fail.
+            items = typeOfExpression(file->textOf(outerAST).toUtf8(),
+                                     file->scopeAt(outerAST->firstToken()),
+                                     TypeOfExpression::Preprocess);
+            if (items.isEmpty())
+                return;
+
+            if (CallAST *callAST = outerAST->asCall()) {
+                items = typeOfExpression(file->textOf(callAST->base_expression).toUtf8(),
+                                         file->scopeAt(callAST->base_expression->firstToken()),
+                                         TypeOfExpression::Preprocess);
+            } else {
+                items = typeOfExpression(file->textOf(nameAST).toUtf8(),
+                                         file->scopeAt(nameAST->firstToken()),
+                                         TypeOfExpression::Preprocess);
+            }
+
+            for (const LookupItem &item : std::as_const(items)) {
+                if (!item.declaration())
+                    continue;
+
+                if (Function *func = item.declaration()->asFunction()) {
+                    if (func->isSignal() || func->returnType()->asVoidType())
+                        return;
+                } else if (Declaration *dec = item.declaration()->asDeclaration()) {
+                    if (Function *func = dec->type()->asFunctionType()) {
+                        if (func->isSignal() || func->returnType()->asVoidType())
+                            return;
+                    }
+                }
+
+                const Name *name = nameAST->name;
+                const int insertPos = interface.currentFile()->startOf(outerAST);
+                result << new AssignToLocalVariableOperation(interface, insertPos, outerAST, name);
+                return;
+            }
+        }
+    }
+};
+
+#ifdef WITH_TESTS
+using namespace Tests;
+
+class AssignToLocalVariableTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testTemplates()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "template <typename T>\n"
+            "class List {\n"
+            "public:\n"
+            "    T first();"
+            "};\n"
+            ;
+        expected = original;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"file.h\"\n"
+            "void foo() {\n"
+            "    List<int> list;\n"
+            "    li@st.first();\n"
+            "}\n";
+        expected =
+            "#include \"file.h\"\n"
+            "void foo() {\n"
+            "    List<int> list;\n"
+            "    auto localFirst = list.first();\n"
+            "}\n";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        AssignToLocalVariable factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    void test_data()
+    {
+        QTest::addColumn<QByteArray>("original");
+        QTest::addColumn<QByteArray>("expected");
+
+        // Check: Add local variable for a free function.
+        QTest::newRow("freeFunction")
+            << QByteArray(
+                   "int foo() {return 1;}\n"
+                   "void bar() {fo@o();}\n")
+            << QByteArray(
+                   "int foo() {return 1;}\n"
+                   "void bar() {auto localFoo = foo();}\n");
+
+        // Check: Add local variable for a member function.
+        QTest::newRow("memberFunction")
+            << QByteArray(
+                   "class Foo {public: int* fooFunc();}\n"
+                   "void bar() {\n"
+                   "    Foo *f = new Foo;\n"
+                   "    @f->fooFunc();\n"
+                   "}\n")
+            << QByteArray(
+                   "class Foo {public: int* fooFunc();}\n"
+                   "void bar() {\n"
+                   "    Foo *f = new Foo;\n"
+                   "    auto localFooFunc = f->fooFunc();\n"
+                   "}\n");
+
+        // Check: Add local variable for a member function, cursor in the middle (QTCREATORBUG-10355)
+        QTest::newRow("memberFunction2ndGrade1")
+            << QByteArray(
+                   "struct Foo {int* func();};\n"
+                   "struct Baz {Foo* foo();};\n"
+                   "void bar() {\n"
+                   "    Baz *b = new Baz;\n"
+                   "    b->foo@()->func();\n"
+                   "}")
+            << QByteArray(
+                   "struct Foo {int* func();};\n"
+                   "struct Baz {Foo* foo();};\n"
+                   "void bar() {\n"
+                   "    Baz *b = new Baz;\n"
+                   "    auto localFunc = b->foo()->func();\n"
+                   "}");
+
+        // Check: Add local variable for a member function, cursor on function call (QTCREATORBUG-10355)
+        QTest::newRow("memberFunction2ndGrade2")
+            << QByteArray(
+                   "struct Foo {int* func();};\n"
+                   "struct Baz {Foo* foo();};\n"
+                   "void bar() {\n"
+                   "    Baz *b = new Baz;\n"
+                   "    b->foo()->f@unc();\n"
+                   "}")
+            << QByteArray(
+                   "struct Foo {int* func();};\n"
+                   "struct Baz {Foo* foo();};\n"
+                   "void bar() {\n"
+                   "    Baz *b = new Baz;\n"
+                   "    auto localFunc = b->foo()->func();\n"
+                   "}");
+
+        // Check: Add local variable for a static member function.
+        QTest::newRow("staticMemberFunction")
+            << QByteArray(
+                   "class Foo {public: static int* fooFunc();}\n"
+                   "void bar() {\n"
+                   "    Foo::fooF@unc();\n"
+                   "}")
+            << QByteArray(
+                   "class Foo {public: static int* fooFunc();}\n"
+                   "void bar() {\n"
+                   "    auto localFooFunc = Foo::fooFunc();\n"
+                   "}");
+
+        // Check: Add local variable for a new Expression.
+        QTest::newRow("newExpression")
+            << QByteArray(
+                   "class Foo {}\n"
+                   "void bar() {\n"
+                   "    new Fo@o;\n"
+                   "}")
+            << QByteArray(
+                   "class Foo {}\n"
+                   "void bar() {\n"
+                   "    auto localFoo = new Foo;\n"
+                   "}");
+
+        // Check: No trigger for function inside member initialization list.
+        QTest::newRow("noInitializationList")
+            << QByteArray(
+                   "class Foo\n"
+                   "{\n"
+                   "    public: Foo : m_i(fooF@unc()) {}\n"
+                   "    int fooFunc() {return 2;}\n"
+                   "    int m_i;\n"
+                   "};\n")
+            << QByteArray();
+
+        // Check: No trigger for void functions.
+        QTest::newRow("noVoidFunction")
+            << QByteArray(
+                   "void foo() {}\n"
+                   "void bar() {fo@o();}")
+            << QByteArray();
+
+        // Check: No trigger for void member functions.
+        QTest::newRow("noVoidMemberFunction")
+            << QByteArray(
+                   "class Foo {public: void fooFunc();}\n"
+                   "void bar() {\n"
+                   "    Foo *f = new Foo;\n"
+                   "    @f->fooFunc();\n"
+                   "}")
+            << QByteArray();
+
+        // Check: No trigger for void static member functions.
+        QTest::newRow("noVoidStaticMemberFunction")
+            << QByteArray(
+                   "class Foo {public: static void fooFunc();}\n"
+                   "void bar() {\n"
+                   "    Foo::fo@oFunc();\n"
+                   "}")
+            << QByteArray();
+
+        // Check: No trigger for functions in expressions.
+        QTest::newRow("noFunctionInExpression")
+            << QByteArray(
+                   "int foo(int a) {return a;}\n"
+                   "int bar() {return 1;}"
+                   "void baz() {foo(@bar() + bar());}")
+            << QByteArray();
+
+        // Check: No trigger for functions in functions. (QTCREATORBUG-9510)
+        QTest::newRow("noFunctionInFunction")
+            << QByteArray(
+                   "int foo(int a, int b) {return a + b;}\n"
+                   "int bar(int a) {return a;}\n"
+                   "void baz() {\n"
+                   "    int a = foo(ba@r(), bar());\n"
+                   "}\n")
+            << QByteArray();
+
+        // Check: No trigger for functions in return statements (classes).
+        QTest::newRow("noReturnClass1")
+            << QByteArray(
+                   "class Foo {public: static void fooFunc();}\n"
+                   "Foo* bar() {\n"
+                   "    return new Fo@o;\n"
+                   "}")
+            << QByteArray();
+
+        // Check: No trigger for functions in return statements (classes). (QTCREATORBUG-9525)
+        QTest::newRow("noReturnClass2")
+            << QByteArray(
+                   "class Foo {public: int fooFunc();}\n"
+                   "int bar() {\n"
+                   "    return (new Fo@o)->fooFunc();\n"
+                   "}")
+            << QByteArray();
+
+        // Check: No trigger for functions in return statements (functions).
+        QTest::newRow("noReturnFunc1")
+            << QByteArray(
+                   "class Foo {public: int fooFunc();}\n"
+                   "int bar() {\n"
+                   "    return Foo::fooFu@nc();\n"
+                   "}")
+            << QByteArray();
+
+        // Check: No trigger for functions in return statements (functions). (QTCREATORBUG-9525)
+        QTest::newRow("noReturnFunc2")
+            << QByteArray(
+                   "int bar() {\n"
+                   "    return list.firs@t().foo;\n"
+                   "}\n")
+            << QByteArray();
+
+        // Check: No trigger for functions which does not match in signature.
+        QTest::newRow("noSignatureMatch")
+            << QByteArray(
+                   "int someFunc(int);\n"
+                   "\n"
+                   "void f()\n"
+                   "{\n"
+                   "    some@Func();\n"
+                   "}")
+            << QByteArray();
+    }
+
+    void test()
+    {
+        QFETCH(QByteArray, original);
+        QFETCH(QByteArray, expected);
+        AssignToLocalVariable factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+};
+
+QObject *AssignToLocalVariable::createTest() { return new AssignToLocalVariableTest; }
+
+#endif // WITH_TESTS
+} // namespace
+
+void registerAssignToLocalVariableQuickfix()
+{
+    CppQuickFixFactory::registerFactory<AssignToLocalVariable>();
+}
+
+} // namespace CppEditor::Internal
+
+#ifdef WITH_TESTS
+#include <assigntolocalvariable.moc>
+#endif
diff --git a/src/plugins/cppeditor/quickfixes/assigntolocalvariable.h b/src/plugins/cppeditor/quickfixes/assigntolocalvariable.h
new file mode 100644
index 00000000000..d8cd793c9f3
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/assigntolocalvariable.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerAssignToLocalVariableQuickfix();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/bringidentifierintoscope.cpp b/src/plugins/cppeditor/quickfixes/bringidentifierintoscope.cpp
new file mode 100644
index 00000000000..3c4df4cb76e
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/bringidentifierintoscope.cpp
@@ -0,0 +1,1497 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "bringidentifierintoscope.h"
+
+#include "../cppeditortr.h"
+#include "../cpplocatordata.h"
+#include "../cppprojectfile.h"
+#include "../cpprefactoringchanges.h"
+#include "../indexitem.h"
+#include "cppquickfix.h"
+#include "cppquickfixhelpers.h"
+
+#include <cplusplus/Overview.h>
+#include <projectexplorer/projectnodes.h>
+#include <projectexplorer/projecttree.h>
+#include <texteditor/quickfix.h>
+
+#ifdef WITH_TESTS
+#include "../cppsourceprocessertesthelper.h"
+#include "../cpptoolstestcase.h"
+#include "cppquickfix_test.h"
+#include <QtTest>
+#endif
+
+using namespace CPlusPlus;
+using namespace ProjectExplorer;
+using namespace Utils;
+
+#ifdef WITH_TESTS
+namespace CppEditor::Internal::Tests {
+typedef QList<TestDocumentPtr> QuickFixTestDocuments;
+}
+Q_DECLARE_METATYPE(CppEditor::Internal::Tests::QuickFixTestDocuments)
+#endif
+
+namespace CppEditor::Internal {
+namespace {
+
+static QString findShortestInclude(
+    const QString currentDocumentFilePath,
+    const QString candidateFilePath,
+    const HeaderPaths &headerPaths)
+{
+    QString result;
+
+    const QFileInfo fileInfo(candidateFilePath);
+
+    if (fileInfo.path() == QFileInfo(currentDocumentFilePath).path()) {
+        result = QLatin1Char('"') + fileInfo.fileName() + QLatin1Char('"');
+    } else {
+        for (const HeaderPath &headerPath : headerPaths) {
+            if (!candidateFilePath.startsWith(headerPath.path))
+                continue;
+            QString relativePath = candidateFilePath.mid(headerPath.path.size());
+            if (!relativePath.isEmpty() && relativePath.at(0) == QLatin1Char('/'))
+                relativePath = relativePath.mid(1);
+            if (result.isEmpty() || relativePath.size() + 2 < result.size())
+                result = QLatin1Char('<') + relativePath + QLatin1Char('>');
+        }
+    }
+
+    return result;
+}
+
+static QString findMatchingInclude(const QString &className, const HeaderPaths &headerPaths)
+{
+    const QStringList candidateFileNames{
+        className,
+        className + ".h",
+        className + ".hpp",
+        className.toLower(),
+        className.toLower() + ".h",
+        className.toLower() + ".hpp"};
+    for (const QString &fileName : candidateFileNames) {
+        for (const HeaderPath &headerPath : headerPaths) {
+            const QString headerPathCandidate = headerPath.path + QLatin1Char('/') + fileName;
+            const QFileInfo fileInfo(headerPathCandidate);
+            if (fileInfo.exists() && fileInfo.isFile())
+                return '<' + fileName + '>';
+        }
+    }
+    return {};
+}
+
+static HeaderPaths relevantHeaderPaths(const QString &filePath)
+{
+    HeaderPaths headerPaths;
+
+    const QList<ProjectPart::ConstPtr> projectParts = CppModelManager::projectPart(filePath);
+    if (projectParts.isEmpty()) { // Not part of any project, better use all include paths than none
+        headerPaths += CppModelManager::headerPaths();
+    } else {
+        for (const ProjectPart::ConstPtr &part : projectParts)
+            headerPaths += part->headerPaths;
+    }
+
+    return headerPaths;
+}
+
+static NameAST *nameUnderCursor(const QList<AST *> &path)
+{
+    if (path.isEmpty())
+        return nullptr;
+
+    NameAST *nameAst = nullptr;
+    for (int i = path.size() - 1; i >= 0; --i) {
+        AST * const ast = path.at(i);
+        if (SimpleNameAST *simpleName = ast->asSimpleName()) {
+            nameAst = simpleName;
+        } else if (TemplateIdAST *templateId = ast->asTemplateId()) {
+            nameAst = templateId;
+        } else if (nameAst && ast->asNamedTypeSpecifier()) {
+            break; // Stop at "Foo" for "N::Bar<@Foo>"
+        } else if (QualifiedNameAST *qualifiedName = ast->asQualifiedName()) {
+            nameAst = qualifiedName;
+            break;
+        }
+    }
+
+    return nameAst;
+}
+
+enum class LookupResult { Declared, ForwardDeclared, NotDeclared };
+static LookupResult lookUpDefinition(const CppQuickFixInterface &interface, const NameAST *nameAst)
+{
+    QTC_ASSERT(nameAst && nameAst->name, return LookupResult::NotDeclared);
+
+    // Find the enclosing scope
+    int line, column;
+    const Document::Ptr doc = interface.semanticInfo().doc;
+    doc->translationUnit()->getTokenPosition(nameAst->firstToken(), &line, &column);
+    Scope *scope = doc->scopeAt(line, column);
+    if (!scope)
+        return LookupResult::NotDeclared;
+
+    // Try to find the class/template definition
+    const Name *name = nameAst->name;
+    const QList<LookupItem> results = interface.context().lookup(name, scope);
+    LookupResult best = LookupResult::NotDeclared;
+    for (const LookupItem &item : results) {
+        if (Symbol *declaration = item.declaration()) {
+            if (declaration->asClass())
+                return LookupResult::Declared;
+            if (declaration->asForwardClassDeclaration()) {
+                best = LookupResult::ForwardDeclared;
+                continue;
+            }
+            if (Template *templ = declaration->asTemplate()) {
+                if (Symbol *declaration = templ->declaration()) {
+                    if (declaration->asClass())
+                        return LookupResult::Declared;
+                    if (declaration->asForwardClassDeclaration()) {
+                        best = LookupResult::ForwardDeclared;
+                        continue;
+                    }
+                }
+            }
+            return LookupResult::Declared;
+        }
+    }
+
+    return best;
+}
+
+static QString templateNameAsString(const TemplateNameId *templateName)
+{
+    const Identifier *id = templateName->identifier();
+    return QString::fromUtf8(id->chars(), id->size());
+}
+
+static Snapshot forwardingHeaders(const CppQuickFixInterface &interface)
+{
+    Snapshot result;
+
+    const Snapshot docs = interface.snapshot();
+    for (Document::Ptr doc : docs) {
+        if (doc->globalSymbolCount() == 0 && doc->resolvedIncludes().size() == 1)
+            result.insert(doc);
+    }
+
+    return result;
+}
+
+static QList<IndexItem::Ptr> matchName(const Name *name, QString *className)
+{
+    if (!name)
+        return {};
+
+    QString simpleName;
+    QList<IndexItem::Ptr> matches;
+    CppLocatorData *locatorData = CppModelManager::locatorData();
+    const Overview oo;
+    if (const QualifiedNameId *qualifiedName = name->asQualifiedNameId()) {
+        const Name *name = qualifiedName->name();
+        if (const TemplateNameId *templateName = name->asTemplateNameId()) {
+            *className = templateNameAsString(templateName);
+        } else {
+            simpleName = oo.prettyName(name);
+            *className = simpleName;
+            matches = locatorData->findSymbols(IndexItem::Class, *className);
+            if (matches.isEmpty()) {
+                if (const Name *name = qualifiedName->base()) {
+                    if (const TemplateNameId *templateName = name->asTemplateNameId())
+                        *className = templateNameAsString(templateName);
+                    else
+                        *className = oo.prettyName(name);
+                }
+            }
+        }
+    } else if (const TemplateNameId *templateName = name->asTemplateNameId()) {
+        *className = templateNameAsString(templateName);
+    } else {
+        *className = oo.prettyName(name);
+    }
+
+    if (matches.isEmpty())
+        matches = locatorData->findSymbols(IndexItem::Class, *className);
+
+    if (matches.isEmpty() && !simpleName.isEmpty())
+        *className = simpleName;
+
+    return matches;
+}
+
+class AddIncludeForUndefinedIdentifierOp : public CppQuickFixOperation
+{
+public:
+    AddIncludeForUndefinedIdentifierOp(const CppQuickFixInterface &interface, int priority,
+                                       const QString &include);
+    void perform() override;
+
+    QString include() const { return m_include; }
+
+private:
+    QString m_include;
+};
+
+class AddForwardDeclForUndefinedIdentifierOp : public CppQuickFixOperation
+{
+public:
+    AddForwardDeclForUndefinedIdentifierOp(const CppQuickFixInterface &interface, int priority,
+                                           const QString &fqClassName, int symbolPos);
+private:
+    void perform() override
+    {
+        const QStringList parts = m_className.split("::");
+        QTC_ASSERT(!parts.isEmpty(), return);
+        const QStringList namespaces = parts.mid(0, parts.length() - 1);
+
+        CppRefactoringFilePtr file = currentFile();
+
+        NSVisitor visitor(file.data(), namespaces, m_symbolPos);
+        visitor.accept(file->cppDocument()->translationUnit()->ast());
+        const auto stringToInsert = [&visitor, symbol = parts.last()] {
+            QString s = "\n";
+            for (const QString &ns : visitor.remainingNamespaces())
+                s += "namespace " + ns + " { ";
+            s += "class " + symbol + ';';
+            for (int i = 0; i < visitor.remainingNamespaces().size(); ++i)
+                s += " }";
+            return s;
+        };
+
+        int insertPos = 0;
+
+        // Find the position to insert:
+        //   If we have a matching namespace, we do the insertion there.
+        //   If we don't have a matching namespace, but there is another namespace in the file,
+        //   we assume that to be a good position for our insertion.
+        //   Otherwise, do the insertion after the last include that comes before the use of the symbol.
+        //   If there is no such include, do the insertion before the first token.
+        if (visitor.enclosingNamespace()) {
+            insertPos = file->startOf(visitor.enclosingNamespace()->linkage_body) + 1;
+        } else if (visitor.firstNamespace()) {
+            insertPos = file->startOf(visitor.firstNamespace());
+        } else {
+            const QTextCursor tc = file->document()->find(
+                QRegularExpression("^\\s*#include .*$"),
+                m_symbolPos,
+                QTextDocument::FindBackward | QTextDocument::FindCaseSensitively);
+            if (!tc.isNull())
+                insertPos = tc.position() + 1;
+            else if (visitor.firstToken())
+                insertPos = file->startOf(visitor.firstToken());
+        }
+
+        QString insertion = stringToInsert();
+        if (file->charAt(insertPos - 1) != QChar::ParagraphSeparator)
+            insertion.prepend('\n');
+        if (file->charAt(insertPos) != QChar::ParagraphSeparator)
+            insertion.append('\n');
+        file->apply(ChangeSet::makeInsert(insertPos, insertion));
+    }
+
+    const QString m_className;
+    const int m_symbolPos;
+};
+
+AddIncludeForUndefinedIdentifierOp::AddIncludeForUndefinedIdentifierOp(
+    const CppQuickFixInterface &interface, int priority, const QString &include)
+    : CppQuickFixOperation(interface, priority)
+    , m_include(include)
+{
+    setDescription(Tr::tr("Add #include %1").arg(m_include));
+}
+
+void AddIncludeForUndefinedIdentifierOp::perform()
+{
+    CppRefactoringFilePtr file = currentFile();
+
+    ChangeSet changes;
+    insertNewIncludeDirective(m_include, file, semanticInfo().doc, changes);
+    file->apply(changes);
+}
+
+AddForwardDeclForUndefinedIdentifierOp::AddForwardDeclForUndefinedIdentifierOp(
+    const CppQuickFixInterface &interface,
+    int priority,
+    const QString &fqClassName,
+    int symbolPos)
+    : CppQuickFixOperation(interface, priority), m_className(fqClassName), m_symbolPos(symbolPos)
+{
+    setDescription(Tr::tr("Add Forward Declaration for %1").arg(m_className));
+}
+
+/*!
+  Adds an include for an undefined identifier or only forward declared identifier.
+  Activates on: the undefined identifier
+*/
+class AddIncludeForUndefinedIdentifier : public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const NameAST *nameAst = nameUnderCursor(interface.path());
+        if (!nameAst || !nameAst->name)
+            return;
+
+        const LookupResult lookupResult = lookUpDefinition(interface, nameAst);
+        if (lookupResult == LookupResult::Declared)
+            return;
+
+        QString className;
+        const QString currentDocumentFilePath = interface.semanticInfo().doc->filePath().toString();
+        const HeaderPaths headerPaths = relevantHeaderPaths(currentDocumentFilePath);
+        FilePaths headers;
+
+        const QList<IndexItem::Ptr> matches = matchName(nameAst->name, &className);
+        // Find an include file through the locator
+        if (!matches.isEmpty()) {
+            QList<IndexItem::Ptr> indexItems;
+            const Snapshot forwardHeaders = forwardingHeaders(interface);
+            for (const IndexItem::Ptr &info : matches) {
+                if (!info || info->symbolName() != className)
+                    continue;
+                indexItems << info;
+
+                Snapshot localForwardHeaders = forwardHeaders;
+                localForwardHeaders.insert(interface.snapshot().document(info->filePath()));
+                FilePaths headerAndItsForwardingHeaders;
+                headerAndItsForwardingHeaders << info->filePath();
+                headerAndItsForwardingHeaders += localForwardHeaders.filesDependingOn(info->filePath());
+
+                for (const FilePath &header : std::as_const(headerAndItsForwardingHeaders)) {
+                    const QString include = findShortestInclude(currentDocumentFilePath,
+                                                                header.toString(),
+                                                                headerPaths);
+                    if (include.size() > 2) {
+                        const QString headerFileName = info->filePath().fileName();
+                        QTC_ASSERT(!headerFileName.isEmpty(), break);
+
+                        int priority = 0;
+                        if (headerFileName == className)
+                            priority = 2;
+                        else if (headerFileName.at(1).isUpper())
+                            priority = 1;
+
+                        result << new AddIncludeForUndefinedIdentifierOp(interface, priority,
+                                                                         include);
+                        headers << header;
+                    }
+                }
+            }
+
+            if (lookupResult == LookupResult::NotDeclared && indexItems.size() == 1) {
+                QString qualifiedName = Overview().prettyName(nameAst->name);
+                if (qualifiedName.startsWith("::"))
+                    qualifiedName.remove(0, 2);
+                if (indexItems.first()->scopedSymbolName().endsWith(qualifiedName)) {
+                    const Node * const node = ProjectTree::nodeForFile(interface.filePath());
+                    FileType fileType = node && node->asFileNode() ? node->asFileNode()->fileType()
+                                                                   : FileType::Unknown;
+                    if (fileType == FileType::Unknown
+                        && ProjectFile::isHeader(ProjectFile::classify(interface.filePath().toString()))) {
+                        fileType = FileType::Header;
+                    }
+                    if (fileType == FileType::Header) {
+                        result << new AddForwardDeclForUndefinedIdentifierOp(
+                            interface, 0, indexItems.first()->scopedSymbolName(),
+                            interface.currentFile()->startOf(nameAst));
+                    }
+                }
+            }
+        }
+
+        if (className.isEmpty())
+            return;
+
+        // Fallback: Check the include paths for files that look like candidates
+        //           for the given name.
+        if (!Utils::contains(headers,
+                             [&className](const FilePath &fp) { return fp.fileName() == className; })) {
+            const QString include = findMatchingInclude(className, headerPaths);
+            const auto matcher = [&include](const TextEditor::QuickFixOperation::Ptr &o) {
+                const auto includeOp = o.dynamicCast<AddIncludeForUndefinedIdentifierOp>();
+                return includeOp && includeOp->include() == include;
+            };
+            if (!include.isEmpty() && !contains(result, matcher))
+                result << new AddIncludeForUndefinedIdentifierOp(interface, 1, include);
+        }
+    }
+};
+
+#ifdef WITH_TESTS
+using namespace Tests;
+using namespace ::CppEditor::Tests;
+using namespace ::CppEditor::Tests::Internal; // FIXME: Get rid of this nonsense namespace
+
+/// Delegates directly to AddIncludeForUndefinedIdentifierOp for easier testing.
+class AddIncludeForUndefinedIdentifierTestFactory : public CppQuickFixFactory
+{
+public:
+    AddIncludeForUndefinedIdentifierTestFactory(const QString &include)
+        : m_include(include) {}
+
+    void doMatch(const CppQuickFixInterface &cppQuickFixInterface, QuickFixOperations &result) override
+    {
+        result << new AddIncludeForUndefinedIdentifierOp(cppQuickFixInterface, 0, m_include);
+    }
+
+private:
+    const QString m_include;
+};
+
+class AddForwardDeclForUndefinedIdentifierTestFactory : public CppQuickFixFactory
+{
+public:
+    AddForwardDeclForUndefinedIdentifierTestFactory(const QString &className, int symbolPos)
+        : m_className(className), m_symbolPos(symbolPos) {}
+
+    void doMatch(const CppQuickFixInterface &cppQuickFixInterface, QuickFixOperations &result) override
+    {
+        result << new AddForwardDeclForUndefinedIdentifierOp(cppQuickFixInterface, 0,
+                                                             m_className, m_symbolPos);
+    }
+
+private:
+    const QString m_className;
+    const int m_symbolPos;
+};
+
+class BringIdentifierIntoScopeTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testAddIncludeForUndefinedIdentifier_data()
+    {
+        QTest::addColumn<QString>("headerPath");
+        QTest::addColumn<QuickFixTestDocuments>("testDocuments");
+        QTest::addColumn<int>("refactoringOperationIndex");
+        QTest::addColumn<QString>("includeForTestFactory");
+
+        const int firstRefactoringOperation = 0;
+        const int secondRefactoringOperation = 1;
+
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        // -------------------------------------------------------------------------------------------
+
+        // Header File
+        original = "class Foo {};\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("afile.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"header.h\"\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "    Fo@o foo;\n"
+            "}\n"
+            ;
+        expected =
+            "#include \"afile.h\"\n"
+            "#include \"header.h\"\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "    Foo foo;\n"
+            "}\n"
+            ;
+        testDocuments << CppTestDocument::create("afile.cpp", original, expected);
+        QTest::newRow("onSimpleName")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        // Header File
+        original = "namespace N { class Foo {}; }\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("afile.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"header.h\"\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "    N::Fo@o foo;\n"
+            "}\n"
+            ;
+        expected =
+            "#include \"afile.h\"\n"
+            "#include \"header.h\"\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "    N::Foo foo;\n"
+            "}\n"
+            ;
+        testDocuments << CppTestDocument::create("afile.cpp", original, expected);
+        QTest::newRow("onNameOfQualifiedName")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        // Header File
+        original = "namespace N { class Foo {}; }\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("afile.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"header.h\"\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "    @N::Foo foo;\n"
+            "}\n"
+            ;
+        expected =
+            "#include \"afile.h\"\n"
+            "#include \"header.h\"\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "    N::Foo foo;\n"
+            "}\n"
+            ;
+        testDocuments << CppTestDocument::create("afile.cpp", original, expected);
+        QTest::newRow("onBaseOfQualifiedName")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        // Header File
+        original = "class Foo { static void bar() {} };\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("afile.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"header.h\"\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "    @Foo::bar();\n"
+            "}\n"
+            ;
+        expected =
+            "#include \"afile.h\"\n"
+            "#include \"header.h\"\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "    Foo::bar();\n"
+            "}\n"
+            ;
+        testDocuments << CppTestDocument::create("afile.cpp", original, expected);
+        QTest::newRow("onBaseOfQualifiedClassName")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        // Header File
+        original = "template <typename T> class Foo { static void bar() {} };\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("afile.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"header.h\"\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "    @Foo<int>::bar();\n"
+            "}\n"
+            ;
+        expected =
+            "#include \"afile.h\"\n"
+            "#include \"header.h\"\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "    Foo<int>::bar();\n"
+            "}\n"
+            ;
+        testDocuments << CppTestDocument::create("afile.cpp", original, expected);
+        QTest::newRow("onBaseOfQualifiedTemplateClassName")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        // Header File
+        original = "namespace N { template <typename T> class Foo {}; }\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("afile.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"header.h\"\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "    @N::Foo<Bar> foo;\n"
+            "}\n"
+            ;
+        expected =
+            "#include \"afile.h\"\n"
+            "#include \"header.h\"\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "    N::Foo<Bar> foo;\n"
+            "}\n"
+            ;
+        testDocuments << CppTestDocument::create("afile.cpp", original, expected);
+        QTest::newRow("onTemplateName")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        // Header File
+        original = "namespace N { template <typename T> class Foo {}; }\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("afile.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"header.h\"\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "    N::Bar<@Foo> foo;\n"
+            "}\n"
+            ;
+        expected =
+            "#include \"afile.h\"\n"
+            "#include \"header.h\"\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "    N::Bar<Foo> foo;\n"
+            "}\n"
+            ;
+        testDocuments << CppTestDocument::create("afile.cpp", original, expected);
+        QTest::newRow("onTemplateNameInsideArguments")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        // Header File
+        original = "class Foo {};\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("afile.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"header.h\"\n"
+            "\n"
+            "class Foo;\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "    @Foo foo;\n"
+            "}\n"
+            ;
+        expected =
+            "#include \"afile.h\"\n"
+            "#include \"header.h\"\n"
+            "\n"
+            "class Foo;\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "    Foo foo;\n"
+            "}\n"
+            ;
+        testDocuments << CppTestDocument::create("afile.cpp", original, expected);
+        QTest::newRow("withForwardDeclaration")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        // Header File
+        original = "template<class T> class Foo {};\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("afile.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"header.h\"\n"
+            "\n"
+            "template<class T> class Foo;\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "    @Foo foo;\n"
+            "}\n"
+            ;
+        expected =
+            "#include \"afile.h\"\n"
+            "#include \"header.h\"\n"
+            "\n"
+            "template<class T> class Foo;\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "    Foo foo;\n"
+            "}\n"
+            ;
+        testDocuments << CppTestDocument::create("afile.cpp", original, expected);
+        QTest::newRow("withForwardDeclaration2")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        // Header File
+        original = "template<class T> class QMyClass {};\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("qmyclass.h", original, expected);
+
+        // Forward Header File
+        original = "#include \"qmyclass.h\"\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("QMyClass", original, expected);
+
+        // Source File
+        original =
+            "#include \"header.h\"\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "    @QMyClass c;\n"
+            "}\n"
+            ;
+        expected =
+            "#include \"QMyClass\"\n"
+            "#include \"header.h\"\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "    QMyClass c;\n"
+            "}\n"
+            ;
+        testDocuments << CppTestDocument::create("afile.cpp", original, expected);
+        QTest::newRow("withForwardHeader")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << secondRefactoringOperation << "";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        original =
+            "void @f();\n"
+            "#include \"file.moc\";\n"
+            ;
+        expected =
+            "#include \"file.h\"\n"
+            "\n"
+            "void f();\n"
+            "#include \"file.moc\";\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QTest::newRow("insertingIgnoreMoc")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "\"file.h\"";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        original =
+            "#include \"y.h\"\n"
+            "#include \"z.h\"\n"
+            "\n@"
+            ;
+        expected =
+            "#include \"file.h\"\n"
+            "#include \"y.h\"\n"
+            "#include \"z.h\"\n"
+            "\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QTest::newRow("insertingSortingTop")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "\"file.h\"";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        original =
+            "#include \"a.h\"\n"
+            "#include \"z.h\"\n"
+            "\n@"
+            ;
+        expected =
+            "#include \"a.h\"\n"
+            "#include \"file.h\"\n"
+            "#include \"z.h\"\n"
+            "\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QTest::newRow("insertingSortingMiddle")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "\"file.h\"";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        original =
+            "#include \"a.h\"\n"
+            "#include \"b.h\"\n"
+            "\n@"
+            ;
+        expected =
+            "#include \"a.h\"\n"
+            "#include \"b.h\"\n"
+            "#include \"file.h\"\n"
+            "\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QTest::newRow("insertingSortingBottom")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "\"file.h\"";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        original =
+            "#include \"b.h\"\n"
+            "#include \"a.h\"\n"
+            "\n@"
+            ;
+        expected =
+            "#include \"b.h\"\n"
+            "#include \"a.h\"\n"
+            "#include \"file.h\"\n"
+            "\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QTest::newRow("inserting_appendToUnsorted")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "\"file.h\"";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        original =
+            "#include <a.h>\n"
+            "#include <b.h>\n"
+            "\n@"
+            ;
+        expected =
+            "#include \"file.h\"\n"
+            "\n"
+            "#include <a.h>\n"
+            "#include <b.h>\n"
+            "\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QTest::newRow("inserting_firstLocalIncludeAtFront")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "\"file.h\"";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        original =
+            "#include \"a.h\"\n"
+            "#include \"b.h\"\n"
+            "\n"
+            "void @f();\n"
+            ;
+        expected =
+            "#include \"a.h\"\n"
+            "#include \"b.h\"\n"
+            "\n"
+            "#include <file.h>\n"
+            "\n"
+            "void f();\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QTest::newRow("firstGlobalIncludeAtBack")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "<file.h>";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        original =
+            "#include \"prefixa.h\"\n"
+            "#include \"prefixb.h\"\n"
+            "\n"
+            "#include \"foo.h\"\n"
+            "\n@"
+            ;
+        expected =
+            "#include \"prefixa.h\"\n"
+            "#include \"prefixb.h\"\n"
+            "#include \"prefixc.h\"\n"
+            "\n"
+            "#include \"foo.h\"\n"
+            "\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QTest::newRow("inserting_preferGroupWithLongerMatchingPrefix")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "\"prefixc.h\"";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        original =
+            "#include \"lib/file.h\"\n"
+            "#include \"lib/fileother.h\"\n"
+            "\n@"
+            ;
+        expected =
+            "#include \"lib/file.h\"\n"
+            "#include \"lib/fileother.h\"\n"
+            "\n"
+            "#include \"file.h\"\n"
+            "\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QTest::newRow("inserting_newGroupIfOnlyDifferentIncludeDirs")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "\"file.h\"";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        original =
+            "#include <lib/file.h>\n"
+            "#include <otherlib/file.h>\n"
+            "#include <utils/file.h>\n"
+            "\n@"
+            ;
+        expected =
+            "#include <firstlib/file.h>\n"
+            "#include <lib/file.h>\n"
+            "#include <otherlib/file.h>\n"
+            "#include <utils/file.h>\n"
+            "\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QTest::newRow("inserting_mixedDirsSorted")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "<firstlib/file.h>";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        original =
+            "#include <otherlib/file.h>\n"
+            "#include <lib/file.h>\n"
+            "#include <utils/file.h>\n"
+            "\n@"
+            ;
+        expected =
+            "#include <otherlib/file.h>\n"
+            "#include <lib/file.h>\n"
+            "#include <utils/file.h>\n"
+            "#include <lastlib/file.h>\n"
+            "\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QTest::newRow("inserting_mixedDirsUnsorted")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "<lastlib/file.h>";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        original =
+            "#include \"a.h\"\n"
+            "#include <global.h>\n"
+            "\n@"
+            ;
+        expected =
+            "#include \"a.h\"\n"
+            "#include \"z.h\"\n"
+            "#include <global.h>\n"
+            "\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QTest::newRow("inserting_mixedIncludeTypes1")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "\"z.h\"";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        original =
+            "#include \"z.h\"\n"
+            "#include <global.h>\n"
+            "\n@"
+            ;
+        expected =
+            "#include \"a.h\"\n"
+            "#include \"z.h\"\n"
+            "#include <global.h>\n"
+            "\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QTest::newRow("inserting_mixedIncludeTypes2")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "\"a.h\"";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        original =
+            "#include \"z.h\"\n"
+            "#include <global.h>\n"
+            "\n@"
+            ;
+        expected =
+            "#include \"z.h\"\n"
+            "#include \"lib/file.h\"\n"
+            "#include <global.h>\n"
+            "\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QTest::newRow("inserting_mixedIncludeTypes3")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "\"lib/file.h\"";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        original =
+            "#include \"z.h\"\n"
+            "#include <global.h>\n"
+            "\n@"
+            ;
+        expected =
+            "#include \"z.h\"\n"
+            "#include <global.h>\n"
+            "#include <lib/file.h>\n"
+            "\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QTest::newRow("inserting_mixedIncludeTypes4")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "<lib/file.h>";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        original =
+            "void @f();\n"
+            ;
+        expected =
+            "#include \"file.h\"\n"
+            "\n"
+            "void f();\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QTest::newRow("inserting_noinclude")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "\"file.h\"";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        original =
+            "#ifndef FOO_H\n"
+            "#define FOO_H\n"
+            "void @f();\n"
+            "#endif\n"
+            ;
+        expected =
+            "#ifndef FOO_H\n"
+            "#define FOO_H\n"
+            "\n"
+            "#include \"file.h\"\n"
+            "\n"
+            "void f();\n"
+            "#endif\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QTest::newRow("inserting_onlyIncludeGuard")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "\"file.h\"";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        original =
+            "\n"
+            "// comment\n"
+            "\n"
+            "void @f();\n"
+            ;
+        expected =
+            "\n"
+            "// comment\n"
+            "\n"
+            "#include \"file.h\"\n"
+            "\n"
+            "void @f();\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QTest::newRow("inserting_veryFirstIncludeCppStyleCommentOnTop")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "\"file.h\"";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        original =
+            "\n"
+            "/*\n"
+            " comment\n"
+            " */\n"
+            "\n"
+            "void @f();\n"
+            ;
+        expected =
+            "\n"
+            "/*\n"
+            " comment\n"
+            " */\n"
+            "\n"
+            "#include \"file.h\"\n"
+            "\n"
+            "void @f();\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QTest::newRow("inserting_veryFirstIncludeCStyleCommentOnTop")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "\"file.h\"";
+        testDocuments.clear();
+
+        // -------------------------------------------------------------------------------------------
+
+        original =
+            "@QDir dir;\n"
+            ;
+        expected =
+            "#include <QDir>\n"
+            "\n"
+            "QDir dir;\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QTest::newRow("inserting_checkQSomethingInQtIncludePaths")
+            << TestIncludePaths::globalQtCoreIncludePath()
+            << testDocuments << firstRefactoringOperation << "";
+        testDocuments.clear();
+
+        original =
+            "std::s@tring s;\n"
+            ;
+        expected =
+            "#include <string>\n"
+            "\n"
+            "std::string s;\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QTest::newRow("inserting_std::string")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "";
+        testDocuments.clear();
+
+        original = "class A{};";
+        testDocuments << CppTestDocument::create("a.h", original, original);
+        original = "class B{};";
+        testDocuments << CppTestDocument::create("b.h", original, original);
+        original =
+            "#include \"b.h\"\n"
+            "@A a;\n"
+            "B b;";
+        expected =
+            "#include \"b.h\"\n\n"
+            "#include \"a.h\"\n"
+            "A a;\n"
+            "B b;";
+        testDocuments << CppTestDocument::create("b.cpp", original, expected);
+        QTest::newRow("preserve first header")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "";
+        testDocuments.clear();
+
+        original = "class C{};";
+        testDocuments << CppTestDocument::create("c.h", original, original);
+        original = "class B{};";
+        testDocuments << CppTestDocument::create("b.h", original, original);
+        original =
+            "#include \"c.h\"\n"
+            "C c;\n"
+            "@B b;";
+        expected =
+            "#include \"b.h\"\n"
+            "#include \"c.h\"\n"
+            "C c;\n"
+            "B b;";
+        testDocuments << CppTestDocument::create("x.cpp", original, expected);
+        QTest::newRow("do not preserve first header")
+            << TestIncludePaths::globalIncludePath()
+            << testDocuments << firstRefactoringOperation << "";
+        testDocuments.clear();
+    }
+
+    void testAddIncludeForUndefinedIdentifier()
+    {
+        QFETCH(QString, headerPath);
+        QFETCH(QuickFixTestDocuments, testDocuments);
+        QFETCH(int, refactoringOperationIndex);
+        QFETCH(QString, includeForTestFactory);
+
+        TemporaryDir temporaryDir;
+        QVERIFY(temporaryDir.isValid());
+        for (const TestDocumentPtr &testDocument : std::as_const(testDocuments))
+            testDocument->setBaseDirectory(temporaryDir.path());
+
+        QScopedPointer<CppQuickFixFactory> factory;
+        if (includeForTestFactory.isEmpty())
+            factory.reset(new AddIncludeForUndefinedIdentifier);
+        else
+            factory.reset(new AddIncludeForUndefinedIdentifierTestFactory(includeForTestFactory));
+
+        QuickFixOperationTest::run(testDocuments, factory.data(), headerPath,
+                                   refactoringOperationIndex);
+    }
+
+    void testAddIncludeForUndefinedIdentifierNoDoubleQtHeaderInclude()
+    {
+        TemporaryDir temporaryDir;
+        QVERIFY(temporaryDir.isValid());
+
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        const QByteArray base = temporaryDir.path().toUtf8();
+
+        // This file makes the QDir definition available so that locator finds it.
+        original = expected = "#include <QDir>\n"
+                              "void avoidBeingRecognizedAsForwardingHeader();";
+        testDocuments << CppTestDocument::create(base + "/fileUsingQDir.cpp", original, expected);
+
+        original = expected = "@QDir dir;\n";
+        testDocuments << CppTestDocument::create(base + "/fileWantsToUseQDir.cpp", original, expected);
+
+        AddIncludeForUndefinedIdentifier factory;
+        const QStringList expectedOperations = QStringList("Add #include <QDir>");
+        QuickFixOfferedOperationsTest(
+            testDocuments,
+            &factory,
+            ProjectExplorer::toUserHeaderPaths(
+                QStringList{TestIncludePaths::globalQtCoreIncludePath()}),
+            expectedOperations);
+    }
+
+    void testAddForwardDeclForUndefinedIdentifier_data()
+    {
+        QTest::addColumn<QuickFixTestDocuments>("testDocuments");
+        QTest::addColumn<QString>("symbol");
+        QTest::addColumn<int>("symbolPos");
+
+        QByteArray original;
+        QByteArray expected;
+
+        original =
+            "#pragma once\n"
+            "\n"
+            "void f(const Blu@bb &b)\n"
+            "{\n"
+            "}\n"
+            ;
+        expected =
+            "#pragma once\n"
+            "\n"
+            "\n"
+            "class Blubb;\n"
+            "void f(const Blubb &b)\n"
+            "{\n"
+            "}\n"
+            ;
+        QTest::newRow("unqualified symbol")
+            << QuickFixTestDocuments{CppTestDocument::create("theheader.h", original, expected)}
+            << "Blubb" << original.indexOf('@');
+
+        original =
+            "#pragma once\n"
+            "\n"
+            "namespace NS {\n"
+            "class C;\n"
+            "}\n"
+            "void f(const NS::Blu@bb &b)\n"
+            "{\n"
+            "}\n"
+            ;
+        expected =
+            "#pragma once\n"
+            "\n"
+            "namespace NS {\n"
+            "\n"
+            "class Blubb;\n"
+            "class C;\n"
+            "}\n"
+            "void f(const NS::Blubb &b)\n"
+            "{\n"
+            "}\n"
+            ;
+        QTest::newRow("qualified symbol, full namespace present")
+            << QuickFixTestDocuments{CppTestDocument::create("theheader.h", original, expected)}
+            << "NS::Blubb" << original.indexOf('@');
+
+        original =
+            "#pragma once\n"
+            "\n"
+            "namespace NS {\n"
+            "class C;\n"
+            "}\n"
+            "void f(const NS::NS2::Blu@bb &b)\n"
+            "{\n"
+            "}\n"
+            ;
+        expected =
+            "#pragma once\n"
+            "\n"
+            "namespace NS {\n"
+            "\n"
+            "namespace NS2 { class Blubb; }\n"
+            "class C;\n"
+            "}\n"
+            "void f(const NS::NS2::Blubb &b)\n"
+            "{\n"
+            "}\n"
+            ;
+        QTest::newRow("qualified symbol, partial namespace present")
+            << QuickFixTestDocuments{CppTestDocument::create("theheader.h", original, expected)}
+            << "NS::NS2::Blubb" << original.indexOf('@');
+
+        original =
+            "#pragma once\n"
+            "\n"
+            "namespace NS {\n"
+            "class C;\n"
+            "}\n"
+            "void f(const NS2::Blu@bb &b)\n"
+            "{\n"
+            "}\n"
+            ;
+        expected =
+            "#pragma once\n"
+            "\n"
+            "\n"
+            "namespace NS2 { class Blubb; }\n"
+            "namespace NS {\n"
+            "class C;\n"
+            "}\n"
+            "void f(const NS2::Blubb &b)\n"
+            "{\n"
+            "}\n"
+            ;
+        QTest::newRow("qualified symbol, other namespace present")
+            << QuickFixTestDocuments{CppTestDocument::create("theheader.h", original, expected)}
+            << "NS2::Blubb" << original.indexOf('@');
+
+        original =
+            "#pragma once\n"
+            "\n"
+            "void f(const NS2::Blu@bb &b)\n"
+            "{\n"
+            "}\n"
+            ;
+        expected =
+            "#pragma once\n"
+            "\n"
+            "\n"
+            "namespace NS2 { class Blubb; }\n"
+            "void f(const NS2::Blubb &b)\n"
+            "{\n"
+            "}\n"
+            ;
+        QTest::newRow("qualified symbol, no namespace present")
+            << QuickFixTestDocuments{CppTestDocument::create("theheader.h", original, expected)}
+            << "NS2::Blubb" << original.indexOf('@');
+
+        original =
+            "#pragma once\n"
+            "\n"
+            "void f(const NS2::Blu@bb &b)\n"
+            "{\n"
+            "}\n"
+            "namespace NS2 {}\n"
+            ;
+        expected =
+            "#pragma once\n"
+            "\n"
+            "\n"
+            "namespace NS2 { class Blubb; }\n"
+            "void f(const NS2::Blubb &b)\n"
+            "{\n"
+            "}\n"
+            "namespace NS2 {}\n"
+            ;
+        QTest::newRow("qualified symbol, existing namespace after symbol")
+            << QuickFixTestDocuments{CppTestDocument::create("theheader.h", original, expected)}
+            << "NS2::Blubb" << original.indexOf('@');
+    }
+
+    void testAddForwardDeclForUndefinedIdentifier()
+    {
+        QFETCH(QuickFixTestDocuments, testDocuments);
+        QFETCH(QString, symbol);
+        QFETCH(int, symbolPos);
+
+        TemporaryDir temporaryDir;
+        QVERIFY(temporaryDir.isValid());
+        testDocuments.first()->setBaseDirectory(temporaryDir.path());
+
+        QScopedPointer<CppQuickFixFactory> factory(
+            new AddForwardDeclForUndefinedIdentifierTestFactory(symbol, symbolPos));
+        QuickFixOperationTest::run({testDocuments}, factory.data(), ".", 0);
+    }
+};
+
+QObject *AddIncludeForUndefinedIdentifier::createTest()
+{
+    return new BringIdentifierIntoScopeTest;
+}
+
+#endif // WITH_TESTS
+} // namespace
+
+void registerBringIdentifierIntoScopeQuickfixes()
+{
+    CppQuickFixFactory::registerFactory<AddIncludeForUndefinedIdentifier>();
+}
+
+} // namespace CppEditor::Internal
+
+#ifdef WITH_TESTS
+#include <bringidentifierintoscope.moc>
+#endif
diff --git a/src/plugins/cppeditor/quickfixes/bringidentifierintoscope.h b/src/plugins/cppeditor/quickfixes/bringidentifierintoscope.h
new file mode 100644
index 00000000000..b2f8bbe5d61
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/bringidentifierintoscope.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerBringIdentifierIntoScopeQuickfixes();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/completeswitchstatement.cpp b/src/plugins/cppeditor/quickfixes/completeswitchstatement.cpp
new file mode 100644
index 00000000000..15b8e592edb
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/completeswitchstatement.cpp
@@ -0,0 +1,793 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "completeswitchstatement.h"
+
+#include "../cppeditortr.h"
+#include "../cpprefactoringchanges.h"
+#include "cppquickfix.h"
+
+#include <cplusplus/Overview.h>
+#include <cplusplus/TypeOfExpression.h>
+
+#ifdef WITH_TESTS
+#include "cppquickfix_test.h"
+#include <QtTest>
+#endif
+
+using namespace CPlusPlus;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+
+class CaseStatementCollector : public ASTVisitor
+{
+public:
+    CaseStatementCollector(Document::Ptr document, const Snapshot &snapshot,
+                           Scope *scope)
+        : ASTVisitor(document->translationUnit()),
+        document(document),
+        scope(scope)
+    {
+        typeOfExpression.init(document, snapshot);
+    }
+
+    QStringList operator ()(AST *ast)
+    {
+        values.clear();
+        foundCaseStatementLevel = false;
+        accept(ast);
+        return values;
+    }
+
+    bool preVisit(AST *ast) override {
+        if (CaseStatementAST *cs = ast->asCaseStatement()) {
+            foundCaseStatementLevel = true;
+            if (ExpressionAST *csExpression = cs->expression) {
+                if (ExpressionAST *expression = csExpression->asIdExpression()) {
+                    QList<LookupItem> candidates = typeOfExpression(expression, document, scope);
+                    if (!candidates.isEmpty() && candidates.first().declaration()) {
+                        Symbol *decl = candidates.first().declaration();
+                        values << prettyPrint.prettyName(LookupContext::fullyQualifiedName(decl));
+                    }
+                }
+            }
+            return true;
+        } else if (foundCaseStatementLevel) {
+            return false;
+        }
+        return true;
+    }
+
+    Overview prettyPrint;
+    bool foundCaseStatementLevel = false;
+    QStringList values;
+    TypeOfExpression typeOfExpression;
+    Document::Ptr document;
+    Scope *scope;
+};
+
+class CompleteSwitchCaseStatementOp: public CppQuickFixOperation
+{
+public:
+    CompleteSwitchCaseStatementOp(const CppQuickFixInterface &interface,
+                                  int priority, CompoundStatementAST *compoundStatement, const QStringList &values)
+        : CppQuickFixOperation(interface, priority)
+        , compoundStatement(compoundStatement)
+        , values(values)
+    {
+        setDescription(Tr::tr("Complete Switch Statement"));
+    }
+
+    void perform() override
+    {
+        currentFile()->apply(ChangeSet::makeInsert(
+            currentFile()->endOf(compoundStatement->lbrace_token),
+            QLatin1String("\ncase ") + values.join(QLatin1String(":\nbreak;\ncase "))
+                + QLatin1String(":\nbreak;")));
+    }
+
+    CompoundStatementAST *compoundStatement;
+    QStringList values;
+};
+
+static Enum *findEnum(const QList<LookupItem> &results, const LookupContext &ctxt)
+{
+    for (const LookupItem &result : results) {
+        const FullySpecifiedType fst = result.type();
+
+        Type *type = result.declaration() ? result.declaration()->type().type()
+                                          : fst.type();
+
+        if (!type)
+            continue;
+        if (Enum *e = type->asEnumType())
+            return e;
+        if (const NamedType *namedType = type->asNamedType()) {
+            if (ClassOrNamespace *con = ctxt.lookupType(namedType->name(), result.scope())) {
+                QList<Enum *> enums = con->unscopedEnums();
+                const QList<Symbol *> symbols = con->symbols();
+                for (Symbol * const s : symbols) {
+                    if (const auto e = s->asEnum())
+                        enums << e;
+                }
+                const Name *referenceName = namedType->name();
+                if (const QualifiedNameId *qualifiedName = referenceName->asQualifiedNameId())
+                    referenceName = qualifiedName->name();
+                for (Enum *e : std::as_const(enums)) {
+                    if (const Name *candidateName = e->name()) {
+                        if (candidateName->match(referenceName))
+                            return e;
+                    }
+                }
+            }
+        }
+    }
+
+    return nullptr;
+}
+
+Enum *conditionEnum(const CppQuickFixInterface &interface, SwitchStatementAST *statement)
+{
+    Block *block = statement->symbol;
+    Scope *scope = interface.semanticInfo().doc->scopeAt(block->line(), block->column());
+    TypeOfExpression typeOfExpression;
+    typeOfExpression.setExpandTemplates(true);
+    typeOfExpression.init(interface.semanticInfo().doc, interface.snapshot());
+    const QList<LookupItem> results = typeOfExpression(statement->condition,
+                                                       interface.semanticInfo().doc,
+                                                       scope);
+
+    return findEnum(results, typeOfExpression.context());
+}
+
+//! Adds missing case statements for "switch (enumVariable)"
+class CompleteSwitchStatement: public CppQuickFixFactory
+{
+public:
+    CompleteSwitchStatement() { setClangdReplacement({12}); }
+#ifdef WITH_TESTS
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const QList<AST *> &path = interface.path();
+
+        if (path.isEmpty())
+            return;
+
+        // look for switch statement
+        for (int depth = path.size() - 1; depth >= 0; --depth) {
+            AST *ast = path.at(depth);
+            SwitchStatementAST *switchStatement = ast->asSwitchStatement();
+            if (switchStatement) {
+                if (!switchStatement->statement || !switchStatement->symbol)
+                    return;
+                CompoundStatementAST *compoundStatement = switchStatement->statement->asCompoundStatement();
+                if (!compoundStatement) // we ignore pathologic case "switch (t) case A: ;"
+                    return;
+                // look if the condition's type is an enum
+                if (Enum *e = conditionEnum(interface, switchStatement)) {
+                    // check the possible enum values
+                    QStringList values;
+                    Overview prettyPrint;
+                    for (int i = 0; i < e->memberCount(); ++i) {
+                        if (Declaration *decl = e->memberAt(i)->asDeclaration())
+                            values << prettyPrint.prettyName(LookupContext::fullyQualifiedName(decl));
+                    }
+                    // Get the used values
+                    Block *block = switchStatement->symbol;
+                    CaseStatementCollector caseValues(interface.semanticInfo().doc, interface.snapshot(),
+                                                      interface.semanticInfo().doc->scopeAt(block->line(), block->column()));
+                    const QStringList usedValues = caseValues(switchStatement);
+                    // save the values that would be added
+                    for (const QString &usedValue : usedValues)
+                        values.removeAll(usedValue);
+                    if (!values.isEmpty())
+                        result << new CompleteSwitchCaseStatementOp(interface, depth,
+                                                                    compoundStatement, values);
+                    return;
+                }
+
+                return;
+            }
+        }
+    }
+};
+
+#ifdef WITH_TESTS
+using namespace Tests;
+
+class CompleteSwitchStatementTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test_data()
+    {
+        QTest::addColumn<QByteArray>("original");
+        QTest::addColumn<QByteArray>("expected");
+
+        using QByteArray = QByteArray;
+
+        // Checks: All enum values are added as case statements for a blank switch.
+        QTest::newRow("basic1")
+            << QByteArray(
+                   "enum EnumType { V1, V2 };\n"
+                   "\n"
+                   "void f()\n"
+                   "{\n"
+                   "    EnumType t;\n"
+                   "    @switch (t) {\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray(
+                   "enum EnumType { V1, V2 };\n"
+                   "\n"
+                   "void f()\n"
+                   "{\n"
+                   "    EnumType t;\n"
+                   "    switch (t) {\n"
+                   "    case V1:\n"
+                   "        break;\n"
+                   "    case V2:\n"
+                   "        break;\n"
+                   "    }\n"
+                   "}\n");
+
+        // Same as above for enum class.
+        QTest::newRow("basic1_enum class")
+            << QByteArray(
+                   "enum class EnumType { V1, V2 };\n"
+                   "\n"
+                   "void f()\n"
+                   "{\n"
+                   "    EnumType t;\n"
+                   "    @switch (t) {\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray(
+                   "enum class EnumType { V1, V2 };\n"
+                   "\n"
+                   "void f()\n"
+                   "{\n"
+                   "    EnumType t;\n"
+                   "    switch (t) {\n"
+                   "    case EnumType::V1:\n"
+                   "        break;\n"
+                   "    case EnumType::V2:\n"
+                   "        break;\n"
+                   "    }\n"
+                   "}\n");
+
+        // Same as above with the cursor somewhere in the body.
+        QTest::newRow("basic1_enum class, cursor in the body")
+            << QByteArray(
+                   "enum class EnumType { V1, V2 };\n"
+                   "\n"
+                   "void f()\n"
+                   "{\n"
+                   "    EnumType t;\n"
+                   "    switch (t) {\n"
+                   "    @}\n"
+                   "}\n")
+            << QByteArray(
+                   "enum class EnumType { V1, V2 };\n"
+                   "\n"
+                   "void f()\n"
+                   "{\n"
+                   "    EnumType t;\n"
+                   "    switch (t) {\n"
+                   "    case EnumType::V1:\n"
+                   "        break;\n"
+                   "    case EnumType::V2:\n"
+                   "        break;\n"
+                   "    }\n"
+                   "}\n");
+
+        // Checks: All enum values are added as case statements for a blank switch when
+        //         the variable is declared alongside the enum definition.
+        QTest::newRow("basic1_enum_with_declaration")
+            << QByteArray(
+                   "enum EnumType { V1, V2 } t;\n"
+                   "\n"
+                   "void f()\n"
+                   "{\n"
+                   "    @switch (t) {\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray(
+                   "enum EnumType { V1, V2 } t;\n"
+                   "\n"
+                   "void f()\n"
+                   "{\n"
+                   "    switch (t) {\n"
+                   "    case V1:\n"
+                   "        break;\n"
+                   "    case V2:\n"
+                   "        break;\n"
+                   "    }\n"
+                   "}\n");
+
+        // Same as above for enum class.
+        QTest::newRow("basic1_enum_with_declaration_enumClass")
+            << QByteArray(
+                   "enum class EnumType { V1, V2 } t;\n"
+                   "\n"
+                   "void f()\n"
+                   "{\n"
+                   "    @switch (t) {\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray(
+                   "enum class EnumType { V1, V2 } t;\n"
+                   "\n"
+                   "void f()\n"
+                   "{\n"
+                   "    switch (t) {\n"
+                   "    case EnumType::V1:\n"
+                   "        break;\n"
+                   "    case EnumType::V2:\n"
+                   "        break;\n"
+                   "    }\n"
+                   "}\n");
+
+        // Checks: All enum values are added as case statements for a blank switch
+        //         for anonymous enums.
+        QTest::newRow("basic1_anonymous_enum")
+            << QByteArray(
+                   "enum { V1, V2 } t;\n"
+                   "\n"
+                   "void f()\n"
+                   "{\n"
+                   "    @switch (t) {\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray(
+                   "enum { V1, V2 } t;\n"
+                   "\n"
+                   "void f()\n"
+                   "{\n"
+                   "    switch (t) {\n"
+                   "    case V1:\n"
+                   "        break;\n"
+                   "    case V2:\n"
+                   "        break;\n"
+                   "    }\n"
+                   "}\n");
+
+        // Checks: All enum values are added as case statements for a blank switch with a default case.
+        QTest::newRow("basic2")
+            << QByteArray(
+                   "enum EnumType { V1, V2 };\n"
+                   "\n"
+                   "void f()\n"
+                   "{\n"
+                   "    EnumType t;\n"
+                   "    @switch (t) {\n"
+                   "    default:\n"
+                   "    break;\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray(
+                   "enum EnumType { V1, V2 };\n"
+                   "\n"
+                   "void f()\n"
+                   "{\n"
+                   "    EnumType t;\n"
+                   "    switch (t) {\n"
+                   "    case V1:\n"
+                   "        break;\n"
+                   "    case V2:\n"
+                   "        break;\n"
+                   "    default:\n"
+                   "    break;\n"
+                   "    }\n"
+                   "}\n");
+
+        // Same as above for enum class.
+        QTest::newRow("basic2_enumClass")
+            << QByteArray(
+                   "enum class EnumType { V1, V2 };\n"
+                   "\n"
+                   "void f()\n"
+                   "{\n"
+                   "    EnumType t;\n"
+                   "    @switch (t) {\n"
+                   "    default:\n"
+                   "    break;\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray(
+                   "enum class EnumType { V1, V2 };\n"
+                   "\n"
+                   "void f()\n"
+                   "{\n"
+                   "    EnumType t;\n"
+                   "    switch (t) {\n"
+                   "    case EnumType::V1:\n"
+                   "        break;\n"
+                   "    case EnumType::V2:\n"
+                   "        break;\n"
+                   "    default:\n"
+                   "    break;\n"
+                   "    }\n"
+                   "}\n");
+
+        // Checks: Enum type in class is found.
+        QTest::newRow("enumTypeInClass")
+            << QByteArray(
+                   "struct C { enum EnumType { V1, V2 }; };\n"
+                   "\n"
+                   "void f(C::EnumType t) {\n"
+                   "    @switch (t) {\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray(
+                   "struct C { enum EnumType { V1, V2 }; };\n"
+                   "\n"
+                   "void f(C::EnumType t) {\n"
+                   "    switch (t) {\n"
+                   "    case C::V1:\n"
+                   "        break;\n"
+                   "    case C::V2:\n"
+                   "        break;\n"
+                   "    }\n"
+                   "}\n");
+
+        // Same as above for enum class.
+        QTest::newRow("enumClassInClass")
+            << QByteArray(
+                   "struct C { enum class EnumType { V1, V2 }; };\n"
+                   "\n"
+                   "void f(C::EnumType t) {\n"
+                   "    @switch (t) {\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray(
+                   "struct C { enum class EnumType { V1, V2 }; };\n"
+                   "\n"
+                   "void f(C::EnumType t) {\n"
+                   "    switch (t) {\n"
+                   "    case C::EnumType::V1:\n"
+                   "        break;\n"
+                   "    case C::EnumType::V2:\n"
+                   "        break;\n"
+                   "    }\n"
+                   "}\n");
+
+        // Checks: Enum type in namespace is found.
+        QTest::newRow("enumTypeInNamespace")
+            << QByteArray(
+                   "namespace N { enum EnumType { V1, V2 }; };\n"
+                   "\n"
+                   "void f(N::EnumType t) {\n"
+                   "    @switch (t) {\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray(
+                   "namespace N { enum EnumType { V1, V2 }; };\n"
+                   "\n"
+                   "void f(N::EnumType t) {\n"
+                   "    switch (t) {\n"
+                   "    case N::V1:\n"
+                   "        break;\n"
+                   "    case N::V2:\n"
+                   "        break;\n"
+                   "    }\n"
+                   "}\n");
+
+        // Same as above for enum class.
+        QTest::newRow("enumClassInNamespace")
+            << QByteArray(
+                   "namespace N { enum class EnumType { V1, V2 }; };\n"
+                   "\n"
+                   "void f(N::EnumType t) {\n"
+                   "    @switch (t) {\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray(
+                   "namespace N { enum class EnumType { V1, V2 }; };\n"
+                   "\n"
+                   "void f(N::EnumType t) {\n"
+                   "    switch (t) {\n"
+                   "    case N::EnumType::V1:\n"
+                   "        break;\n"
+                   "    case N::EnumType::V2:\n"
+                   "        break;\n"
+                   "    }\n"
+                   "}\n");
+
+        // Checks: The missing enum value is added.
+        QTest::newRow("oneValueMissing")
+            << QByteArray(
+                   "enum EnumType { V1, V2 };\n"
+                   "\n"
+                   "void f()\n"
+                   "{\n"
+                   "    EnumType t;\n"
+                   "    @switch (t) {\n"
+                   "    case V2:\n"
+                   "        break;\n"
+                   "    default:\n"
+                   "        break;\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray(
+                   "enum EnumType { V1, V2 };\n"
+                   "\n"
+                   "void f()\n"
+                   "{\n"
+                   "    EnumType t;\n"
+                   "    switch (t) {\n"
+                   "    case V1:\n"
+                   "        break;\n"
+                   "    case V2:\n"
+                   "        break;\n"
+                   "    default:\n"
+                   "        break;\n"
+                   "    }\n"
+                   "}\n");
+
+        // Checks: Same as above for enum class.
+        QTest::newRow("oneValueMissing_enumClass")
+            << QByteArray(
+                   "enum class EnumType { V1, V2 };\n"
+                   "\n"
+                   "void f()\n"
+                   "{\n"
+                   "    EnumType t;\n"
+                   "    @switch (t) {\n"
+                   "    case EnumType::V2:\n"
+                   "        break;\n"
+                   "    default:\n"
+                   "        break;\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray(
+                   "enum class EnumType { V1, V2 };\n"
+                   "\n"
+                   "void f()\n"
+                   "{\n"
+                   "    EnumType t;\n"
+                   "    switch (t) {\n"
+                   "    case EnumType::V1:\n"
+                   "        break;\n"
+                   "    case EnumType::V2:\n"
+                   "        break;\n"
+                   "    default:\n"
+                   "        break;\n"
+                   "    }\n"
+                   "}\n");
+
+        // Checks: Find the correct enum type despite there being a declaration with the same name.
+        QTest::newRow("QTCREATORBUG10366_1")
+            << QByteArray(
+                   "enum test { TEST_1, TEST_2 };\n"
+                   "\n"
+                   "void f() {\n"
+                   "    enum test test;\n"
+                   "    @switch (test) {\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray(
+                   "enum test { TEST_1, TEST_2 };\n"
+                   "\n"
+                   "void f() {\n"
+                   "    enum test test;\n"
+                   "    switch (test) {\n"
+                   "    case TEST_1:\n"
+                   "        break;\n"
+                   "    case TEST_2:\n"
+                   "        break;\n"
+                   "    }\n"
+                   "}\n");
+
+        // Same as above for enum class.
+        QTest::newRow("QTCREATORBUG10366_1_enumClass")
+            << QByteArray(
+                   "enum class test { TEST_1, TEST_2 };\n"
+                   "\n"
+                   "void f() {\n"
+                   "    enum test test;\n"
+                   "    @switch (test) {\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray(
+                   "enum class test { TEST_1, TEST_2 };\n"
+                   "\n"
+                   "void f() {\n"
+                   "    enum test test;\n"
+                   "    switch (test) {\n"
+                   "    case test::TEST_1:\n"
+                   "        break;\n"
+                   "    case test::TEST_2:\n"
+                   "        break;\n"
+                   "    }\n"
+                   "}\n");
+
+        // Checks: Find the correct enum type despite there being a declaration with the same name.
+        QTest::newRow("QTCREATORBUG10366_2")
+            << QByteArray(
+                   "enum test1 { Wrong11, Wrong12 };\n"
+                   "enum test { Right1, Right2 };\n"
+                   "enum test2 { Wrong21, Wrong22 };\n"
+                   "\n"
+                   "int main() {\n"
+                   "    enum test test;\n"
+                   "    @switch (test) {\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray(
+                   "enum test1 { Wrong11, Wrong12 };\n"
+                   "enum test { Right1, Right2 };\n"
+                   "enum test2 { Wrong21, Wrong22 };\n"
+                   "\n"
+                   "int main() {\n"
+                   "    enum test test;\n"
+                   "    switch (test) {\n"
+                   "    case Right1:\n"
+                   "        break;\n"
+                   "    case Right2:\n"
+                   "        break;\n"
+                   "    }\n"
+                   "}\n");
+
+        // Same as above for enum class.
+        QTest::newRow("QTCREATORBUG10366_2_enumClass")
+            << QByteArray(
+                   "enum class test1 { Wrong11, Wrong12 };\n"
+                   "enum class test { Right1, Right2 };\n"
+                   "enum class test2 { Wrong21, Wrong22 };\n"
+                   "\n"
+                   "int main() {\n"
+                   "    enum test test;\n"
+                   "    @switch (test) {\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray(
+                   "enum class test1 { Wrong11, Wrong12 };\n"
+                   "enum class test { Right1, Right2 };\n"
+                   "enum class test2 { Wrong21, Wrong22 };\n"
+                   "\n"
+                   "int main() {\n"
+                   "    enum test test;\n"
+                   "    switch (test) {\n"
+                   "    case test::Right1:\n"
+                   "        break;\n"
+                   "    case test::Right2:\n"
+                   "        break;\n"
+                   "    }\n"
+                   "}\n");
+
+        // Checks: Do not crash on incomplete case statetement.
+        QTest::newRow("doNotCrashOnIncompleteCase")
+            << QByteArray(
+                   "enum E {};\n"
+                   "void f(E o)\n"
+                   "{\n"
+                   "    @switch (o)\n"
+                   "    {\n"
+                   "    case\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray();
+
+        // Same as above for enum class.
+        QTest::newRow("doNotCrashOnIncompleteCase_enumClass")
+            << QByteArray(
+                   "enum class E {};\n"
+                   "void f(E o)\n"
+                   "{\n"
+                   "    @switch (o)\n"
+                   "    {\n"
+                   "    case\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray();
+
+        // Checks: complete switch statement where enum is goes via a template type parameter
+        QTest::newRow("QTCREATORBUG-24752")
+            << QByteArray(
+                   "enum E {EA, EB};\n"
+                   "template<typename T> struct S {\n"
+                   "    static T theType() { return T(); }\n"
+                   "};\n"
+                   "int main() {\n"
+                   "    @switch (S<E>::theType()) {\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray(
+                   "enum E {EA, EB};\n"
+                   "template<typename T> struct S {\n"
+                   "    static T theType() { return T(); }\n"
+                   "};\n"
+                   "int main() {\n"
+                   "    switch (S<E>::theType()) {\n"
+                   "    case EA:\n"
+                   "        break;\n"
+                   "    case EB:\n"
+                   "        break;\n"
+                   "    }\n"
+                   "}\n");
+
+        // Same as above for enum class.
+        QTest::newRow("QTCREATORBUG-24752_enumClass")
+            << QByteArray(
+                   "enum class E {A, B};\n"
+                   "template<typename T> struct S {\n"
+                   "    static T theType() { return T(); }\n"
+                   "};\n"
+                   "int main() {\n"
+                   "    @switch (S<E>::theType()) {\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray(
+                   "enum class E {A, B};\n"
+                   "template<typename T> struct S {\n"
+                   "    static T theType() { return T(); }\n"
+                   "};\n"
+                   "int main() {\n"
+                   "    switch (S<E>::theType()) {\n"
+                   "    case E::A:\n"
+                   "        break;\n"
+                   "    case E::B:\n"
+                   "        break;\n"
+                   "    }\n"
+                   "}\n");
+
+        // Checks: Complete switch statement where enum is return type of a template function
+        //         which is outside the scope of the return value.
+        // TODO: Type minimization.
+        QTest::newRow("QTCREATORBUG-25998")
+            << QByteArray(
+                   "template <typename T> T enumCast(int value) { return static_cast<T>(value); }\n"
+                   "class Test {\n"
+                   "    enum class E { V1, V2 };"
+                   "    void func(int i) {\n"
+                   "        @switch (enumCast<E>(i)) {\n"
+                   "        }\n"
+                   "    }\n"
+                   "};\n")
+            << QByteArray(
+                   "template <typename T> T enumCast(int value) { return static_cast<T>(value); }\n"
+                   "class Test {\n"
+                   "    enum class E { V1, V2 };"
+                   "    void func(int i) {\n"
+                   "        switch (enumCast<E>(i)) {\n"
+                   "        case Test::E::V1:\n"
+                   "            break;\n"
+                   "        case Test::E::V2:\n"
+                   "            break;\n"
+                   "        }\n"
+                   "    }\n"
+                   "};\n");
+    }
+
+    void test()
+    {
+        QFETCH(QByteArray, original);
+        QFETCH(QByteArray, expected);
+        CompleteSwitchStatement factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+};
+
+QObject *CompleteSwitchStatement::createTest() { return new CompleteSwitchStatementTest; }
+
+#endif // WITH_TESTS
+} // namespace
+
+void registerCompleteSwitchStatementQuickfix()
+{
+    CppQuickFixFactory::registerFactory<CompleteSwitchStatement>();
+}
+
+} // namespace CppEditor::Internal
+
+#ifdef WITH_TESTS
+#include <completeswitchstatement.moc>
+#endif
diff --git a/src/plugins/cppeditor/quickfixes/completeswitchstatement.h b/src/plugins/cppeditor/quickfixes/completeswitchstatement.h
new file mode 100644
index 00000000000..dc2293b1b24
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/completeswitchstatement.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerCompleteSwitchStatementQuickfix();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/convertfromandtopointer.cpp b/src/plugins/cppeditor/quickfixes/convertfromandtopointer.cpp
new file mode 100644
index 00000000000..5eea005200e
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/convertfromandtopointer.cpp
@@ -0,0 +1,704 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "convertfromandtopointer.h"
+
+#include "../cppeditortr.h"
+#include "../cpprefactoringchanges.h"
+#include "cppquickfix.h"
+
+#include <cplusplus/ASTPath.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/TypeOfExpression.h>
+
+#ifdef WITH_TESTS
+#include "cppquickfix_test.h"
+#include <QtTest>
+#endif
+
+using namespace CPlusPlus;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+
+class ConvertFromAndToPointerOp : public CppQuickFixOperation
+{
+public:
+    enum Mode { FromPointer, FromVariable, FromReference };
+
+    ConvertFromAndToPointerOp(const CppQuickFixInterface &interface, int priority, Mode mode,
+                              bool isAutoDeclaration,
+                              const SimpleDeclarationAST *simpleDeclaration,
+                              const DeclaratorAST *declaratorAST,
+                              const SimpleNameAST *identifierAST,
+                              Symbol *symbol)
+        : CppQuickFixOperation(interface, priority)
+        , m_mode(mode)
+        , m_isAutoDeclaration(isAutoDeclaration)
+        , m_simpleDeclaration(simpleDeclaration)
+        , m_declaratorAST(declaratorAST)
+        , m_identifierAST(identifierAST)
+        , m_symbol(symbol)
+        , m_refactoring(snapshot())
+        , m_file(currentFile())
+        , m_document(interface.semanticInfo().doc)
+    {
+        setDescription(
+            mode == FromPointer
+                ? Tr::tr("Convert to Stack Variable")
+                : Tr::tr("Convert to Pointer"));
+    }
+
+    void perform() override
+    {
+        ChangeSet changes;
+
+        switch (m_mode) {
+        case FromPointer:
+            removePointerOperator(changes);
+            convertToStackVariable(changes);
+            break;
+        case FromReference:
+            removeReferenceOperator(changes);
+            Q_FALLTHROUGH();
+        case FromVariable:
+            convertToPointer(changes);
+            break;
+        }
+
+        m_file->apply(changes);
+    }
+
+private:
+    void removePointerOperator(ChangeSet &changes) const
+    {
+        if (!m_declaratorAST->ptr_operator_list)
+            return;
+        PointerAST *ptrAST = m_declaratorAST->ptr_operator_list->value->asPointer();
+        QTC_ASSERT(ptrAST, return);
+        const int pos = m_file->startOf(ptrAST->star_token);
+        changes.remove(pos, pos + 1);
+    }
+
+    void removeReferenceOperator(ChangeSet &changes) const
+    {
+        ReferenceAST *refAST = m_declaratorAST->ptr_operator_list->value->asReference();
+        QTC_ASSERT(refAST, return);
+        const int pos = m_file->startOf(refAST->reference_token);
+        changes.remove(pos, pos + 1);
+    }
+
+    void removeNewExpression(ChangeSet &changes, NewExpressionAST *newExprAST) const
+    {
+        ExpressionListAST *exprlist = nullptr;
+        if (newExprAST->new_initializer) {
+            if (ExpressionListParenAST *ast = newExprAST->new_initializer->asExpressionListParen())
+                exprlist = ast->expression_list;
+            else if (BracedInitializerAST *ast = newExprAST->new_initializer->asBracedInitializer())
+                exprlist = ast->expression_list;
+        }
+
+        if (exprlist) {
+            // remove 'new' keyword and type before initializer
+            changes.remove(m_file->startOf(newExprAST->new_token),
+                           m_file->startOf(newExprAST->new_initializer));
+
+            changes.remove(m_file->endOf(m_declaratorAST->equal_token - 1),
+                           m_file->startOf(m_declaratorAST->equal_token + 1));
+        } else {
+            // remove the whole new expression
+            changes.remove(m_file->endOf(m_identifierAST->firstToken()),
+                           m_file->startOf(newExprAST->lastToken()));
+        }
+    }
+
+    void removeNewKeyword(ChangeSet &changes, NewExpressionAST *newExprAST) const
+    {
+        // remove 'new' keyword before initializer
+        changes.remove(m_file->startOf(newExprAST->new_token),
+                       m_file->startOf(newExprAST->new_type_id));
+    }
+
+    void convertToStackVariable(ChangeSet &changes) const
+    {
+        // Handle the initializer.
+        if (m_declaratorAST->initializer) {
+            if (NewExpressionAST *newExpression = m_declaratorAST->initializer->asNewExpression()) {
+                if (m_isAutoDeclaration) {
+                    if (!newExpression->new_initializer)
+                        changes.insert(m_file->endOf(newExpression), QStringLiteral("()"));
+                    removeNewKeyword(changes, newExpression);
+                } else {
+                    removeNewExpression(changes, newExpression);
+                }
+            }
+        }
+
+        // Fix all occurrences of the identifier in this function.
+        ASTPath astPath(m_document);
+        const QList<SemanticInfo::Use> uses = semanticInfo().localUses.value(m_symbol);
+        for (const SemanticInfo::Use &use : uses) {
+            const QList<AST *> path = astPath(use.line, use.column);
+            AST *idAST = path.last();
+            bool declarationFound = false;
+            bool starFound = false;
+            int ampersandPos = 0;
+            bool memberAccess = false;
+            bool deleteCall = false;
+
+            for (int i = path.count() - 2; i >= 0; --i) {
+                if (path.at(i) == m_declaratorAST) {
+                    declarationFound = true;
+                    break;
+                }
+                if (MemberAccessAST *memberAccessAST = path.at(i)->asMemberAccess()) {
+                    if (m_file->tokenAt(memberAccessAST->access_token).kind() != T_ARROW)
+                        continue;
+                    int pos = m_file->startOf(memberAccessAST->access_token);
+                    changes.replace(pos, pos + 2, QLatin1String("."));
+                    memberAccess = true;
+                    break;
+                } else if (DeleteExpressionAST *deleteAST = path.at(i)->asDeleteExpression()) {
+                    const int pos = m_file->startOf(deleteAST->delete_token);
+                    changes.insert(pos, QLatin1String("// "));
+                    deleteCall = true;
+                    break;
+                } else if (UnaryExpressionAST *unaryExprAST = path.at(i)->asUnaryExpression()) {
+                    const Token tk = m_file->tokenAt(unaryExprAST->unary_op_token);
+                    if (tk.kind() == T_STAR) {
+                        if (!starFound) {
+                            int pos = m_file->startOf(unaryExprAST->unary_op_token);
+                            changes.remove(pos, pos + 1);
+                        }
+                        starFound = true;
+                    } else if (tk.kind() == T_AMPER) {
+                        ampersandPos = m_file->startOf(unaryExprAST->unary_op_token);
+                    }
+                } else if (PointerAST *ptrAST = path.at(i)->asPointer()) {
+                    if (!starFound) {
+                        const int pos = m_file->startOf(ptrAST->star_token);
+                        changes.remove(pos, pos);
+                    }
+                    starFound = true;
+                } else if (path.at(i)->asFunctionDefinition()) {
+                    break;
+                }
+            }
+            if (!declarationFound && !starFound && !memberAccess && !deleteCall) {
+                if (ampersandPos) {
+                    changes.insert(ampersandPos, QLatin1String("&("));
+                    changes.insert(m_file->endOf(idAST->firstToken()), QLatin1String(")"));
+                } else {
+                    changes.insert(m_file->startOf(idAST), QLatin1String("&"));
+                }
+            }
+        }
+    }
+
+    QString typeNameOfDeclaration() const
+    {
+        if (!m_simpleDeclaration
+            || !m_simpleDeclaration->decl_specifier_list
+            || !m_simpleDeclaration->decl_specifier_list->value) {
+            return QString();
+        }
+        NamedTypeSpecifierAST *namedType
+            = m_simpleDeclaration->decl_specifier_list->value->asNamedTypeSpecifier();
+        if (!namedType)
+            return QString();
+
+        Overview overview;
+        return overview.prettyName(namedType->name->name);
+    }
+
+    void insertNewExpression(ChangeSet &changes, ExpressionAST *ast) const
+    {
+        const QString typeName = typeNameOfDeclaration();
+        if (CallAST *callAST = ast->asCall()) {
+            if (typeName.isEmpty()) {
+                changes.insert(m_file->startOf(callAST), QLatin1String("new "));
+            } else {
+                changes.insert(m_file->startOf(callAST),
+                               QLatin1String("new ") + typeName + QLatin1Char('('));
+                changes.insert(m_file->startOf(callAST->lastToken()), QLatin1String(")"));
+            }
+        } else {
+            if (typeName.isEmpty())
+                return;
+            changes.insert(m_file->startOf(ast), QLatin1String(" = new ") + typeName);
+        }
+    }
+
+    void insertNewExpression(ChangeSet &changes) const
+    {
+        const QString typeName = typeNameOfDeclaration();
+        if (typeName.isEmpty())
+            return;
+        changes.insert(m_file->endOf(m_identifierAST->firstToken()),
+                       QLatin1String(" = new ") + typeName);
+    }
+
+    void convertToPointer(ChangeSet &changes) const
+    {
+        // Handle initializer.
+        if (m_declaratorAST->initializer) {
+            if (IdExpressionAST *idExprAST = m_declaratorAST->initializer->asIdExpression()) {
+                changes.insert(m_file->startOf(idExprAST), QLatin1String("&"));
+            } else if (CallAST *callAST = m_declaratorAST->initializer->asCall()) {
+                insertNewExpression(changes, callAST);
+            } else if (ExpressionListParenAST *exprListAST = m_declaratorAST->initializer
+                                                                 ->asExpressionListParen()) {
+                insertNewExpression(changes, exprListAST);
+            } else if (BracedInitializerAST *bracedInitializerAST = m_declaratorAST->initializer
+                                                                        ->asBracedInitializer()) {
+                insertNewExpression(changes, bracedInitializerAST);
+            }
+        } else {
+            insertNewExpression(changes);
+        }
+
+        // Fix all occurrences of the identifier in this function.
+        ASTPath astPath(m_document);
+        const QList<SemanticInfo::Use> uses = semanticInfo().localUses.value(m_symbol);
+        for (const SemanticInfo::Use &use : uses) {
+            const QList<AST *> path = astPath(use.line, use.column);
+            AST *idAST = path.last();
+            bool insertStar = true;
+            for (int i = path.count() - 2; i >= 0; --i) {
+                if (m_isAutoDeclaration && path.at(i) == m_declaratorAST) {
+                    insertStar = false;
+                    break;
+                }
+                if (MemberAccessAST *memberAccessAST = path.at(i)->asMemberAccess()) {
+                    const int pos = m_file->startOf(memberAccessAST->access_token);
+                    changes.replace(pos, pos + 1, QLatin1String("->"));
+                    insertStar = false;
+                    break;
+                } else if (UnaryExpressionAST *unaryExprAST = path.at(i)->asUnaryExpression()) {
+                    if (m_file->tokenAt(unaryExprAST->unary_op_token).kind() == T_AMPER) {
+                        const int pos = m_file->startOf(unaryExprAST->unary_op_token);
+                        changes.remove(pos, pos + 1);
+                        insertStar = false;
+                        break;
+                    }
+                } else if (path.at(i)->asFunctionDefinition()) {
+                    break;
+                }
+            }
+            if (insertStar)
+                changes.insert(m_file->startOf(idAST), QLatin1String("*"));
+        }
+    }
+
+    const Mode m_mode;
+    const bool m_isAutoDeclaration;
+    const SimpleDeclarationAST * const m_simpleDeclaration;
+    const DeclaratorAST * const m_declaratorAST;
+    const SimpleNameAST * const m_identifierAST;
+    Symbol * const m_symbol;
+    const CppRefactoringChanges m_refactoring;
+    const CppRefactoringFilePtr m_file;
+    const Document::Ptr m_document;
+};
+
+/*!
+  Converts the selected variable to a pointer if it is a stack variable or reference, or vice versa.
+  Activates on variable declarations.
+ */
+class ConvertFromAndToPointer : public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const QList<AST *> &path = interface.path();
+        if (path.count() < 2)
+            return;
+        SimpleNameAST *identifier = path.last()->asSimpleName();
+        if (!identifier)
+            return;
+        SimpleDeclarationAST *simpleDeclaration = nullptr;
+        DeclaratorAST *declarator = nullptr;
+        bool isFunctionLocal = false;
+        bool isClassLocal = false;
+        ConvertFromAndToPointerOp::Mode mode = ConvertFromAndToPointerOp::FromVariable;
+        for (int i = path.count() - 2; i >= 0; --i) {
+            AST *ast = path.at(i);
+            if (!declarator && (declarator = ast->asDeclarator()))
+                continue;
+            if (!simpleDeclaration && (simpleDeclaration = ast->asSimpleDeclaration()))
+                continue;
+            if (declarator && simpleDeclaration) {
+                if (ast->asClassSpecifier()) {
+                    isClassLocal = true;
+                } else if (ast->asFunctionDefinition() && !isClassLocal) {
+                    isFunctionLocal = true;
+                    break;
+                }
+            }
+        }
+        if (!isFunctionLocal || !simpleDeclaration || !declarator)
+            return;
+
+        Symbol *symbol = nullptr;
+        for (List<Symbol *> *lst = simpleDeclaration->symbols; lst; lst = lst->next) {
+            if (lst->value->name() == identifier->name) {
+                symbol = lst->value;
+                break;
+            }
+        }
+        if (!symbol)
+            return;
+
+        bool isAutoDeclaration = false;
+        if (symbol->storage() == Symbol::Auto) {
+            // For auto variables we must deduce the type from the initializer.
+            if (!declarator->initializer)
+                return;
+
+            isAutoDeclaration = true;
+            TypeOfExpression typeOfExpression;
+            typeOfExpression.init(interface.semanticInfo().doc, interface.snapshot());
+            typeOfExpression.setExpandTemplates(true);
+            CppRefactoringFilePtr file = interface.currentFile();
+            Scope *scope = file->scopeAt(declarator->firstToken());
+            QList<LookupItem> result = typeOfExpression(file->textOf(declarator->initializer).toUtf8(),
+                                                        scope, TypeOfExpression::Preprocess);
+            if (!result.isEmpty() && result.first().type()->asPointerType())
+                mode = ConvertFromAndToPointerOp::FromPointer;
+        } else if (declarator->ptr_operator_list) {
+            for (PtrOperatorListAST *ops = declarator->ptr_operator_list; ops; ops = ops->next) {
+                if (ops != declarator->ptr_operator_list) {
+                    // Bail out on more complex pointer types (e.g. pointer of pointer,
+                    // or reference of pointer).
+                    return;
+                }
+                if (ops->value->asPointer())
+                    mode = ConvertFromAndToPointerOp::FromPointer;
+                else if (ops->value->asReference())
+                    mode = ConvertFromAndToPointerOp::FromReference;
+            }
+        }
+
+        const int priority = path.size() - 1;
+        result << new ConvertFromAndToPointerOp(interface, priority, mode, isAutoDeclaration,
+                                                simpleDeclaration, declarator, identifier, symbol);
+    }
+};
+
+#ifdef WITH_TESTS
+using namespace Tests;
+
+class ConvertFromAndToPointerTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test_data()
+    {
+        QTest::addColumn<QByteArray>("original");
+        QTest::addColumn<QByteArray>("expected");
+
+        QTest::newRow("ConvertFromPointer")
+            << QByteArray("void foo() {\n"
+                 "    QString *@str;\n"
+                 "    if (!str->isEmpty())\n"
+                 "        str->clear();\n"
+                 "    f1(*str);\n"
+                 "    f2(str);\n"
+                 "}\n")
+            << QByteArray("void foo() {\n"
+                 "    QString str;\n"
+                 "    if (!str.isEmpty())\n"
+                 "        str.clear();\n"
+                 "    f1(str);\n"
+                 "    f2(&str);\n"
+                 "}\n");
+
+        QTest::newRow("ConvertToPointer")
+            << QByteArray("void foo() {\n"
+                 "    QString @str;\n"
+                 "    if (!str.isEmpty())\n"
+                 "        str.clear();\n"
+                 "    f1(str);\n"
+                 "    f2(&str);\n"
+                 "}\n")
+            << QByteArray("void foo() {\n"
+                 "    QString *str = new QString;\n"
+                 "    if (!str->isEmpty())\n"
+                 "        str->clear();\n"
+                 "    f1(*str);\n"
+                 "    f2(str);\n"
+                 "}\n");
+
+        QTest::newRow("ConvertReferenceToPointer")
+            << QByteArray("void foo() {\n"
+                 "    QString narf;"
+                 "    QString &@str = narf;\n"
+                 "    if (!str.isEmpty())\n"
+                 "        str.clear();\n"
+                 "    f1(str);\n"
+                 "    f2(&str);\n"
+                 "}\n")
+            << QByteArray("void foo() {\n"
+                 "    QString narf;"
+                 "    QString *str = &narf;\n"
+                 "    if (!str->isEmpty())\n"
+                 "        str->clear();\n"
+                 "    f1(*str);\n"
+                 "    f2(str);\n"
+                 "}\n");
+
+        QTest::newRow("ConvertFromPointer_withInitializer")
+            << QByteArray("void foo() {\n"
+                 "    QString *@str = new QString(QLatin1String(\"schnurz\"));\n"
+                 "    if (!str->isEmpty())\n"
+                 "        str->clear();\n"
+                 "}\n")
+            << QByteArray("void foo() {\n"
+                 "    QString str(QLatin1String(\"schnurz\"));\n"
+                 "    if (!str.isEmpty())\n"
+                 "        str.clear();\n"
+                 "}\n");
+
+        QTest::newRow("ConvertFromPointer_withBareInitializer")
+            << QByteArray("void foo() {\n"
+                 "    QString *@str = new QString;\n"
+                 "    if (!str->isEmpty())\n"
+                 "        str->clear();\n"
+                 "}\n")
+            << QByteArray("void foo() {\n"
+                 "    QString str;\n"
+                 "    if (!str.isEmpty())\n"
+                 "        str.clear();\n"
+                 "}\n");
+
+        QTest::newRow("ConvertFromPointer_withEmptyInitializer")
+            << QByteArray("void foo() {\n"
+                 "    QString *@str = new QString();\n"
+                 "    if (!str->isEmpty())\n"
+                 "        str->clear();\n"
+                 "}\n")
+            << QByteArray("void foo() {\n"
+                 "    QString str;\n"
+                 "    if (!str.isEmpty())\n"
+                 "        str.clear();\n"
+                 "}\n");
+
+        QTest::newRow("ConvertFromPointer_structWithPointer")
+            << QByteArray("struct Bar{ QString *str; };\n"
+                 "void foo() {\n"
+                 "    Bar *@bar = new Bar;\n"
+                 "    bar->str = new QString;\n"
+                 "    delete bar->str;\n"
+                 "    delete bar;\n"
+                 "}\n")
+            << QByteArray("struct Bar{ QString *str; };\n"
+                 "void foo() {\n"
+                 "    Bar bar;\n"
+                 "    bar.str = new QString;\n"
+                 "    delete bar.str;\n"
+                 "    // delete bar;\n"
+                 "}\n");
+
+        QTest::newRow("ConvertToPointer_withInitializer")
+            << QByteArray("void foo() {\n"
+                 "    QString @str = QLatin1String(\"narf\");\n"
+                 "    if (!str.isEmpty())\n"
+                 "        str.clear();\n"
+                 "}\n")
+            << QByteArray("void foo() {\n"
+                 "    QString *str = new QString(QLatin1String(\"narf\"));\n"
+                 "    if (!str->isEmpty())\n"
+                 "        str->clear();\n"
+                 "}\n");
+
+        QTest::newRow("ConvertToPointer_withParenInitializer")
+            << QByteArray("void foo() {\n"
+                 "    QString @str(QLatin1String(\"narf\"));\n"
+                 "    if (!str.isEmpty())\n"
+                 "        str.clear();\n"
+                 "}\n")
+            << QByteArray("void foo() {\n"
+                 "    QString *str = new QString(QLatin1String(\"narf\"));\n"
+                 "    if (!str->isEmpty())\n"
+                 "        str->clear();\n"
+                 "}\n");
+
+        QTest::newRow("ConvertToPointer_noTriggerRValueRefs")
+            << QByteArray("void foo(Narf &&@narf) {}\n")
+            << QByteArray();
+
+        QTest::newRow("ConvertToPointer_noTriggerGlobal")
+            << QByteArray("int @global;\n")
+            << QByteArray();
+
+        QTest::newRow("ConvertToPointer_noTriggerClassMember")
+            << QByteArray("struct C { int @member; };\n")
+            << QByteArray();
+
+        QTest::newRow("ConvertToPointer_noTriggerClassMember2")
+            << QByteArray("void f() { struct C { int @member; }; }\n")
+            << QByteArray();
+
+        QTest::newRow("ConvertToPointer_functionOfFunctionLocalClass")
+            << QByteArray("void f() {\n"
+                 "    struct C {\n"
+                 "        void g() { int @member; }\n"
+                 "    };\n"
+                 "}\n")
+            << QByteArray("void f() {\n"
+                 "    struct C {\n"
+                 "        void g() { int *member; }\n"
+                 "    };\n"
+                 "}\n");
+
+        QTest::newRow("ConvertToPointer_redeclaredVariable_block")
+            << QByteArray("void foo() {\n"
+                 "    QString @str;\n"
+                 "    str.clear();\n"
+                 "    {\n"
+                 "        QString str;\n"
+                 "        str.clear();\n"
+                 "    }\n"
+                 "    f1(str);\n"
+                 "}\n")
+            << QByteArray("void foo() {\n"
+                 "    QString *str = new QString;\n"
+                 "    str->clear();\n"
+                 "    {\n"
+                 "        QString str;\n"
+                 "        str.clear();\n"
+                 "    }\n"
+                 "    f1(*str);\n"
+                 "}\n");
+
+        QTest::newRow("ConvertAutoFromPointer")
+            << QByteArray("void foo() {\n"
+                 "    auto @str = new QString(QLatin1String(\"foo\"));\n"
+                 "    if (!str->isEmpty())\n"
+                 "        str->clear();\n"
+                 "    f1(*str);\n"
+                 "    f2(str);\n"
+                 "}\n")
+            << QByteArray("void foo() {\n"
+                 "    auto str = QString(QLatin1String(\"foo\"));\n"
+                 "    if (!str.isEmpty())\n"
+                 "        str.clear();\n"
+                 "    f1(str);\n"
+                 "    f2(&str);\n"
+                 "}\n");
+
+        QTest::newRow("ConvertAutoFromPointer2")
+            << QByteArray("void foo() {\n"
+                 "    auto *@str = new QString;\n"
+                 "    if (!str->isEmpty())\n"
+                 "        str->clear();\n"
+                 "    f1(*str);\n"
+                 "    f2(str);\n"
+                 "}\n")
+            << QByteArray("void foo() {\n"
+                 "    auto str = QString();\n"
+                 "    if (!str.isEmpty())\n"
+                 "        str.clear();\n"
+                 "    f1(str);\n"
+                 "    f2(&str);\n"
+                 "}\n");
+
+        QTest::newRow("ConvertAutoToPointer")
+            << QByteArray("void foo() {\n"
+                 "    auto @str = QString(QLatin1String(\"foo\"));\n"
+                 "    if (!str.isEmpty())\n"
+                 "        str.clear();\n"
+                 "    f1(str);\n"
+                 "    f2(&str);\n"
+                 "}\n")
+            << QByteArray("void foo() {\n"
+                 "    auto @str = new QString(QLatin1String(\"foo\"));\n"
+                 "    if (!str->isEmpty())\n"
+                 "        str->clear();\n"
+                 "    f1(*str);\n"
+                 "    f2(str);\n"
+                 "}\n");
+
+        QTest::newRow("ConvertToPointerWithMacro")
+            << QByteArray("#define BAR bar\n"
+                 "void func()\n"
+                 "{\n"
+                 "    int @foo = 42;\n"
+                 "    int bar;\n"
+                 "    BAR = foo;\n"
+                 "}\n")
+            << QByteArray("#define BAR bar\n"
+                 "void func()\n"
+                 "{\n"
+                 "    int *foo = 42;\n"
+                 "    int bar;\n"
+                 "    BAR = *foo;\n"
+                 "}\n");
+
+        QString testObjAndFunc = "struct Object\n"
+                                 "{\n"
+                                 "    Object(%1){}\n"
+                                 "};\n"
+                                 "void func()\n"
+                                 "{\n"
+                                 "    %2\n"
+                                 "}\n";
+
+        QTest::newRow("ConvertToStack1_QTCREATORBUG23181")
+            << QByteArray(testObjAndFunc.arg("int").arg("Object *@obj = new Object(0);").toUtf8())
+            << QByteArray(testObjAndFunc.arg("int").arg("Object obj(0);").toUtf8());
+
+        QTest::newRow("ConvertToStack2_QTCREATORBUG23181")
+            << QByteArray(testObjAndFunc.arg("int").arg("Object *@obj = new Object{0};").toUtf8())
+            << QByteArray(testObjAndFunc.arg("int").arg("Object obj{0};").toUtf8());
+
+        QTest::newRow("ConvertToPointer1_QTCREATORBUG23181")
+            << QByteArray(testObjAndFunc.arg("").arg("Object @obj;").toUtf8())
+            << QByteArray(testObjAndFunc.arg("").arg("Object *obj = new Object;").toUtf8());
+
+        QTest::newRow("ConvertToPointer2_QTCREATORBUG23181")
+            << QByteArray(testObjAndFunc.arg("").arg("Object @obj();").toUtf8())
+            << QByteArray(testObjAndFunc.arg("").arg("Object *obj = new Object();").toUtf8());
+
+        QTest::newRow("ConvertToPointer3_QTCREATORBUG23181")
+            << QByteArray(testObjAndFunc.arg("").arg("Object @obj{};").toUtf8())
+            << QByteArray(testObjAndFunc.arg("").arg("Object *obj = new Object{};").toUtf8());
+
+        QTest::newRow("ConvertToPointer4_QTCREATORBUG23181")
+            << QByteArray(testObjAndFunc.arg("int").arg("Object @obj(0);").toUtf8())
+            << QByteArray(testObjAndFunc.arg("int").arg("Object *obj = new Object(0);").toUtf8());
+
+
+    }
+
+    void test()
+    {
+        QFETCH(QByteArray, original);
+        QFETCH(QByteArray, expected);
+        ConvertFromAndToPointer factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+};
+
+QObject *ConvertFromAndToPointer::createTest() { return new ConvertFromAndToPointerTest; }
+
+#endif // WITH_TESTS
+} // namespace
+
+void registerConvertFromAndToPointerQuickfix()
+{
+    CppQuickFixFactory::registerFactory<ConvertFromAndToPointer>();
+}
+
+} // namespace CppEditor::Internal
+
+#ifdef WITH_TESTS
+#include <convertfromandtopointer.moc>
+#endif
diff --git a/src/plugins/cppeditor/quickfixes/convertfromandtopointer.h b/src/plugins/cppeditor/quickfixes/convertfromandtopointer.h
new file mode 100644
index 00000000000..0deb6c0da93
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/convertfromandtopointer.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerConvertFromAndToPointerQuickfix();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/convertnumericliteral.cpp b/src/plugins/cppeditor/quickfixes/convertnumericliteral.cpp
new file mode 100644
index 00000000000..6fb5becf348
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/convertnumericliteral.cpp
@@ -0,0 +1,199 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "convertnumericliteral.h"
+
+#include "../cppeditortr.h"
+#include "../cpprefactoringchanges.h"
+#include "cppquickfix.h"
+
+#include <bitset>
+
+using namespace CPlusPlus;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+
+class ConvertNumericLiteralOp: public CppQuickFixOperation
+{
+public:
+    ConvertNumericLiteralOp(const CppQuickFixInterface &interface, int start, int end,
+                            const QString &replacement)
+        : CppQuickFixOperation(interface)
+        , start(start)
+        , end(end)
+        , replacement(replacement)
+    {}
+
+    void perform() override
+    {
+        currentFile()->apply(ChangeSet::makeReplace(start, end, replacement));
+    }
+
+private:
+    int start, end;
+    QString replacement;
+};
+
+/*!
+  Base class for converting numeric literals between decimal, octal and hex.
+  Does the base check for the specific ones and parses the number.
+
+  Test cases:
+    0xFA0Bu;
+    0X856A;
+    298.3;
+    199;
+    074;
+    199L;
+    074L;
+    -199;
+    -017;
+    0783; // invalid octal
+    0; // border case, allow only hex<->decimal
+
+  Activates on: numeric literals
+*/
+class ConvertNumericLiteral : public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest() { return new QObject; }
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const QList<AST *> &path = interface.path();
+        CppRefactoringFilePtr file = interface.currentFile();
+
+        if (path.isEmpty())
+            return;
+
+        NumericLiteralAST *literal = path.last()->asNumericLiteral();
+
+        if (!literal)
+            return;
+
+        Token token = file->tokenAt(literal->asNumericLiteral()->literal_token);
+        if (!token.is(T_NUMERIC_LITERAL))
+            return;
+        const NumericLiteral *numeric = token.number;
+        if (numeric->isDouble() || numeric->isFloat())
+            return;
+
+        // remove trailing L or U and stuff
+        const char * const spell = numeric->chars();
+        int numberLength = numeric->size();
+        while (numberLength > 0 && !std::isxdigit(spell[numberLength - 1]))
+            --numberLength;
+        if (numberLength < 1)
+            return;
+
+        // convert to number
+        bool valid;
+        ulong value = 0;
+        const QString x = QString::fromUtf8(spell).left(numberLength);
+        if (x.startsWith("0b", Qt::CaseInsensitive))
+            value = x.mid(2).toULong(&valid, 2);
+        else
+            value = x.toULong(&valid, 0);
+
+        if (!valid)
+            return;
+
+        const int priority = path.size() - 1; // very high priority
+        const int start = file->startOf(literal);
+        const char * const str = numeric->chars();
+
+        const bool isBinary = numberLength > 2 && str[0] == '0' && (str[1] == 'b' || str[1] == 'B');
+        const bool isOctal = numberLength >= 2 && str[0] == '0' && str[1] >= '0' && str[1] <= '7';
+        const bool isDecimal = !(isBinary || isOctal || numeric->isHex());
+
+        if (!numeric->isHex()) {
+            /*
+          Convert integer literal to hex representation.
+          Replace
+            0b100000
+            32
+            040
+          With
+            0x20
+
+        */
+            const QString replacement = QString::asprintf("0x%lX", value);
+            auto op = new ConvertNumericLiteralOp(interface, start, start + numberLength, replacement);
+            op->setDescription(Tr::tr("Convert to Hexadecimal"));
+            op->setPriority(priority);
+            result << op;
+        }
+
+        if (!isOctal) {
+            /*
+          Convert integer literal to octal representation.
+          Replace
+            0b100000
+            32
+            0x20
+          With
+            040
+        */
+            const QString replacement = QString::asprintf("0%lo", value);
+            auto op = new ConvertNumericLiteralOp(interface, start, start + numberLength, replacement);
+            op->setDescription(Tr::tr("Convert to Octal"));
+            op->setPriority(priority);
+            result << op;
+        }
+
+        if (!isDecimal) {
+            /*
+          Convert integer literal to decimal representation.
+          Replace
+            0b100000
+            0x20
+            040
+           With
+            32
+        */
+            const QString replacement = QString::asprintf("%lu", value);
+            auto op = new ConvertNumericLiteralOp(interface, start, start + numberLength, replacement);
+            op->setDescription(Tr::tr("Convert to Decimal"));
+            op->setPriority(priority);
+            result << op;
+        }
+
+        if (!isBinary) {
+            /*
+          Convert integer literal to binary representation.
+          Replace
+            32
+            0x20
+            040
+          With
+            0b100000
+        */
+            QString replacement = "0b";
+            if (value == 0) {
+                replacement.append('0');
+            } else {
+                std::bitset<std::numeric_limits<decltype (value)>::digits> b(value);
+                QRegularExpression re("^[0]*");
+                replacement.append(QString::fromStdString(b.to_string()).remove(re));
+            }
+            auto op = new ConvertNumericLiteralOp(interface, start, start + numberLength, replacement);
+            op->setDescription(Tr::tr("Convert to Binary"));
+            op->setPriority(priority);
+            result << op;
+        }
+    }
+};
+
+} // namespace
+
+void registerConvertNumericLiteralQuickfix()
+{
+    CppQuickFixFactory::registerFactory<ConvertNumericLiteral>();
+}
+
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/convertnumericliteral.h b/src/plugins/cppeditor/quickfixes/convertnumericliteral.h
new file mode 100644
index 00000000000..4158807c689
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/convertnumericliteral.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerConvertNumericLiteralQuickfix();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/convertqt4connect.cpp b/src/plugins/cppeditor/quickfixes/convertqt4connect.cpp
new file mode 100644
index 00000000000..b9f08e90216
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/convertqt4connect.cpp
@@ -0,0 +1,505 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "convertqt4connect.h"
+
+#include "../cppcodestylesettings.h"
+#include "../cppeditortr.h"
+#include "../cpprefactoringchanges.h"
+#include "cppquickfix.h"
+
+#include <cplusplus/Overview.h>
+#include <cplusplus/TypeOfExpression.h>
+
+#ifdef WITH_TESTS
+#include "cppquickfix_test.h"
+#include <QtTest>
+#endif
+
+using namespace CPlusPlus;
+using namespace TextEditor;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+
+class ConvertQt4ConnectOperation: public CppQuickFixOperation
+{
+public:
+    ConvertQt4ConnectOperation(const CppQuickFixInterface &interface, const ChangeSet &changes)
+        : CppQuickFixOperation(interface, 1), m_changes(changes)
+    {
+        setDescription(Tr::tr("Convert connect() to Qt 5 Style"));
+    }
+
+private:
+    void perform() override
+    {
+        currentFile()->apply(m_changes);
+    }
+
+    const ChangeSet m_changes;
+};
+
+static Symbol *skipForwardDeclarations(const QList<Symbol *> &symbols)
+{
+    for (Symbol *symbol : symbols) {
+        if (!symbol->type()->asForwardClassDeclarationType())
+            return symbol;
+    }
+
+    return nullptr;
+}
+
+static bool findRawAccessFunction(Class *klass, PointerType *pointerType, QString *objAccessFunction)
+{
+    QList<Function *> candidates;
+    for (auto it = klass->memberBegin(), end = klass->memberEnd(); it != end; ++it) {
+        if (Function *func = (*it)->asFunction()) {
+            const Name *funcName = func->name();
+            if (!funcName->asOperatorNameId()
+                && !funcName->asConversionNameId()
+                && func->returnType().type() == pointerType
+                && func->isConst()
+                && func->argumentCount() == 0) {
+                candidates << func;
+            }
+        }
+    }
+    const Name *funcName = nullptr;
+    switch (candidates.size()) {
+    case 0:
+        return false;
+    case 1:
+        funcName = candidates.first()->name();
+        break;
+    default:
+        // Multiple candidates - prefer a function named data
+        for (Function *func : std::as_const(candidates)) {
+            if (!strcmp(func->name()->identifier()->chars(), "data")) {
+                funcName = func->name();
+                break;
+            }
+        }
+        if (!funcName)
+            funcName = candidates.first()->name();
+    }
+    const Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
+    *objAccessFunction = QLatin1Char('.') + oo.prettyName(funcName) + QLatin1String("()");
+    return true;
+}
+
+static PointerType *determineConvertedType(
+    NamedType *namedType, const LookupContext &context, Scope *scope, QString *objAccessFunction)
+{
+    if (!namedType)
+        return nullptr;
+    if (ClassOrNamespace *binding = context.lookupType(namedType->name(), scope)) {
+        if (Symbol *objectClassSymbol = skipForwardDeclarations(binding->symbols())) {
+            if (Class *klass = objectClassSymbol->asClass()) {
+                for (auto it = klass->memberBegin(), end = klass->memberEnd(); it != end; ++it) {
+                    if (Function *func = (*it)->asFunction()) {
+                        if (const ConversionNameId *conversionName =
+                            func->name()->asConversionNameId()) {
+                            if (PointerType *type = conversionName->type()->asPointerType()) {
+                                if (findRawAccessFunction(klass, type, objAccessFunction))
+                                    return type;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    return nullptr;
+}
+
+static Class *senderOrReceiverClass(
+    const CppQuickFixInterface &interface,
+    const CppRefactoringFilePtr &file,
+    const ExpressionAST *objectPointerAST,
+    Scope *objectPointerScope,
+    QString *objAccessFunction)
+{
+    const LookupContext &context = interface.context();
+
+    QByteArray objectPointerExpression;
+    if (objectPointerAST)
+        objectPointerExpression = file->textOf(objectPointerAST).toUtf8();
+    else
+        objectPointerExpression = "this";
+
+    TypeOfExpression toe;
+    toe.setExpandTemplates(true);
+    toe.init(interface.semanticInfo().doc, interface.snapshot(), context.bindings());
+    const QList<LookupItem> objectPointerExpressions = toe(objectPointerExpression,
+                                                           objectPointerScope, TypeOfExpression::Preprocess);
+    QTC_ASSERT(!objectPointerExpressions.isEmpty(), return nullptr);
+
+    Type *objectPointerTypeBase = objectPointerExpressions.first().type().type();
+    QTC_ASSERT(objectPointerTypeBase, return nullptr);
+
+    PointerType *objectPointerType = objectPointerTypeBase->asPointerType();
+    if (!objectPointerType) {
+        objectPointerType = determineConvertedType(objectPointerTypeBase->asNamedType(), context,
+                                                   objectPointerScope, objAccessFunction);
+    }
+    QTC_ASSERT(objectPointerType, return nullptr);
+
+    Type *objectTypeBase = objectPointerType->elementType().type(); // Dereference
+    QTC_ASSERT(objectTypeBase, return nullptr);
+
+    NamedType *objectType = objectTypeBase->asNamedType();
+    QTC_ASSERT(objectType, return nullptr);
+
+    ClassOrNamespace *objectClassCON = context.lookupType(objectType->name(), objectPointerScope);
+    if (!objectClassCON) {
+        objectClassCON = objectPointerExpressions.first().binding();
+        QTC_ASSERT(objectClassCON, return nullptr);
+    }
+    QTC_ASSERT(!objectClassCON->symbols().isEmpty(), return nullptr);
+
+    Symbol *objectClassSymbol = skipForwardDeclarations(objectClassCON->symbols());
+    QTC_ASSERT(objectClassSymbol, return nullptr);
+
+    return objectClassSymbol->asClass();
+}
+
+static bool findConnectReplacement(
+    const CppQuickFixInterface &interface,
+    const ExpressionAST *objectPointerAST,
+    const QtMethodAST *methodAST,
+    const CppRefactoringFilePtr &file,
+    QString *replacement,
+    QString *objAccessFunction)
+{
+    // Get name of method
+    if (!methodAST->declarator || !methodAST->declarator->core_declarator)
+        return false;
+
+    DeclaratorIdAST *methodDeclIdAST = methodAST->declarator->core_declarator->asDeclaratorId();
+    if (!methodDeclIdAST)
+        return false;
+
+    NameAST *methodNameAST = methodDeclIdAST->name;
+    if (!methodNameAST)
+        return false;
+
+    // Lookup object pointer type
+    Scope *scope = file->scopeAt(methodAST->firstToken());
+    Class *objectClass = senderOrReceiverClass(interface, file, objectPointerAST, scope,
+                                               objAccessFunction);
+    QTC_ASSERT(objectClass, return false);
+
+    // Look up member function in call, including base class members.
+    const LookupContext &context = interface.context();
+    const QList<LookupItem> methodResults = context.lookup(methodNameAST->name, objectClass);
+    if (methodResults.isEmpty())
+        return false; // Maybe mis-spelled signal/slot name
+
+    Scope *baseClassScope = methodResults.at(0).scope(); // FIXME: Handle overloads
+    QTC_ASSERT(baseClassScope, return false);
+
+    Class *classOfMethod = baseClassScope->asClass(); // Declaration point of signal/slot
+    QTC_ASSERT(classOfMethod, return false);
+
+    Symbol *method = methodResults.at(0).declaration();
+    QTC_ASSERT(method, return false);
+
+    // Minimize qualification
+    Control *control = context.bindings()->control().get();
+    ClassOrNamespace *functionCON = context.lookupParent(scope);
+    const Name *shortName = LookupContext::minimalName(method, functionCON, control);
+    if (!shortName->asQualifiedNameId())
+        shortName = control->qualifiedNameId(classOfMethod->name(), shortName);
+
+    const Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
+    *replacement = QLatin1Char('&') + oo.prettyName(shortName);
+    return true;
+}
+
+static bool onConnectOrDisconnectCall(AST *ast, const ExpressionListAST **arguments)
+{
+    if (!ast)
+        return false;
+
+    CallAST *call = ast->asCall();
+    if (!call)
+        return false;
+
+    if (!call->base_expression)
+        return false;
+
+    const IdExpressionAST *idExpr = call->base_expression->asIdExpression();
+    if (!idExpr || !idExpr->name || !idExpr->name->name)
+        return false;
+
+    const ExpressionListAST *args = call->expression_list;
+    if (!arguments)
+        return false;
+
+    const Identifier *id = idExpr->name->name->identifier();
+    if (!id)
+        return false;
+
+    const QByteArray name(id->chars(), id->size());
+    if (name != "connect" && name != "disconnect")
+        return false;
+
+    if (arguments)
+        *arguments = args;
+    return true;
+}
+
+// Might modify arg* output arguments even if false is returned.
+static bool collectConnectArguments(
+    const ExpressionListAST *arguments,
+    const ExpressionAST **arg1,
+    const QtMethodAST **arg2,
+    const ExpressionAST **arg3,
+    const QtMethodAST **arg4)
+{
+    if (!arguments || !arg1 || !arg2 || !arg3 || !arg4)
+        return false;
+
+    *arg1 = arguments->value;
+    arguments = arguments->next;
+    if (!arg1 || !arguments)
+        return false;
+
+    *arg2 = arguments->value->asQtMethod();
+    arguments = arguments->next;
+    if (!*arg2 || !arguments)
+        return false;
+
+    *arg3 = arguments->value;
+    if (!*arg3)
+        return false;
+
+    // Take care of three-arg version, with 'this' receiver.
+    if (QtMethodAST *receiverMethod = arguments->value->asQtMethod()) {
+        *arg3 = nullptr; // Means 'this'
+        *arg4 = receiverMethod;
+        return true;
+    }
+
+    arguments = arguments->next;
+    if (!arguments)
+        return false;
+
+    *arg4 = arguments->value->asQtMethod();
+    if (!*arg4)
+        return false;
+
+    return true;
+}
+
+//! Converts a Qt 4 QObject::connect() to Qt 5 style.
+class ConvertQt4Connect : public CppQuickFixFactory
+{
+public:
+#ifdef WITH_TESTS
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const QList<AST *> &path = interface.path();
+
+        for (int i = path.size(); --i >= 0; ) {
+            const ExpressionListAST *arguments;
+            if (!onConnectOrDisconnectCall(path.at(i), &arguments))
+                continue;
+
+            const ExpressionAST *arg1, *arg3;
+            const QtMethodAST *arg2, *arg4;
+            if (!collectConnectArguments(arguments, &arg1, &arg2, &arg3, &arg4))
+                continue;
+
+            const CppRefactoringFilePtr file = interface.currentFile();
+
+            QString newSignal;
+            QString senderAccessFunc;
+            if (!findConnectReplacement(interface, arg1, arg2, file, &newSignal, &senderAccessFunc))
+                continue;
+
+            QString newMethod;
+            QString receiverAccessFunc;
+            if (!findConnectReplacement(interface, arg3, arg4, file, &newMethod, &receiverAccessFunc))
+                continue;
+
+            ChangeSet changes;
+            changes.replace(file->endOf(arg1), file->endOf(arg1), senderAccessFunc);
+            changes.replace(file->startOf(arg2), file->endOf(arg2), newSignal);
+            if (!arg3)
+                newMethod.prepend(QLatin1String("this, "));
+            else
+                changes.replace(file->endOf(arg3), file->endOf(arg3), receiverAccessFunc);
+            changes.replace(file->startOf(arg4), file->endOf(arg4), newMethod);
+
+            result << new ConvertQt4ConnectOperation(interface, changes);
+            return;
+        }
+    }
+};
+
+#ifdef WITH_TESTS
+using namespace Tests;
+class ConvertQt4ConnectTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testOutOfClass()
+    {
+        QByteArray prefix =
+            "class QObject {};\n"
+            "class TestClass : public QObject\n"
+            "{\n"
+            "public:\n"
+            "    void setProp(int) {}\n"
+            "    void sigFoo(int) {}\n"
+            "};\n"
+            "\n"
+            "int foo()\n"
+            "{\n";
+
+        QByteArray suffix = "\n}\n";
+
+        QByteArray original = prefix
+                              + "    TestClass obj;\n"
+                                "    conne@ct(&obj, SIGNAL(sigFoo(int)), &obj, SLOT(setProp(int)));"
+                              + suffix;
+
+        QByteArray expected = prefix
+                              + "    TestClass obj;\n"
+                                "    connect(&obj, &TestClass::sigFoo, &obj, &TestClass::setProp);"
+                              + suffix;
+
+        QList<TestDocumentPtr> testDocuments;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        ConvertQt4Connect factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    void testWithinClass_data()
+    {
+        QTest::addColumn<QByteArray>("original");
+        QTest::addColumn<QByteArray>("expected");
+
+        QTest::newRow("four-args-connect")
+            << QByteArray("conne@ct(this, SIGNAL(sigFoo(int)), this, SLOT(setProp(int)));")
+            << QByteArray("connect(this, &TestClass::sigFoo, this, &TestClass::setProp);");
+
+        QTest::newRow("four-args-disconnect")
+            << QByteArray("disconne@ct(this, SIGNAL(sigFoo(int)), this, SLOT(setProp(int)));")
+            << QByteArray("disconnect(this, &TestClass::sigFoo, this, &TestClass::setProp);");
+
+        QTest::newRow("three-args-connect")
+            << QByteArray("conne@ct(this, SIGNAL(sigFoo(int)), SLOT(setProp(int)));")
+            << QByteArray("connect(this, &TestClass::sigFoo, this, &TestClass::setProp);");
+
+        QTest::newRow("template-value")
+            << QByteArray("Pointer<TestClass> p;\n"
+                          "conne@ct(p.t, SIGNAL(sigFoo(int)), p.t, SLOT(setProp(int)));")
+            << QByteArray("Pointer<TestClass> p;\n"
+                          "connect(p.t, &TestClass::sigFoo, p.t, &TestClass::setProp);");
+
+        QTest::newRow("implicit-pointer")
+            << QByteArray("Pointer<TestClass> p;\n"
+                          "conne@ct(p, SIGNAL(sigFoo(int)), p, SLOT(setProp(int)));")
+            << QByteArray("Pointer<TestClass> p;\n"
+                          "connect(p.data(), &TestClass::sigFoo, p.data(), &TestClass::setProp);");
+    }
+
+    void testWithinClass()
+    {
+        QFETCH(QByteArray, original);
+        QFETCH(QByteArray, expected);
+
+        QByteArray prefix =
+            "template<class T>\n"
+            "struct Pointer\n"
+            "{\n"
+            "    T *t;\n"
+            "    operator T*() const { return t; }\n"
+            "    T *data() const { return t; }\n"
+            "};\n"
+            "class QObject {};\n"
+            "class TestClass : public QObject\n"
+            "{\n"
+            "public:\n"
+            "    void setProp(int) {}\n"
+            "    void sigFoo(int) {}\n"
+            "    void setupSignals();\n"
+            "};\n"
+            "\n"
+            "int TestClass::setupSignals()\n"
+            "{\n";
+
+        QByteArray suffix = "\n}\n";
+
+        QList<TestDocumentPtr> testDocuments;
+        testDocuments << CppTestDocument::create("file.cpp",
+                                                 prefix + original + suffix,
+                                                 prefix + expected + suffix);
+
+        ConvertQt4Connect factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    void testDifferentNamespace()
+    {
+        const QByteArray prefix =
+            "namespace NsA {\n"
+            "class ClassA : public QObject\n"
+            "{\n"
+            "  static ClassA *instance();\n"
+            "signals:\n"
+            "  void sig();\n"
+            "};\n"
+            "}\n"
+            "\n"
+            "namespace NsB {\n"
+            "class ClassB : public QObject\n"
+            "{\n"
+            "  void slot();\n"
+            "  void connector() {\n";
+
+        const QByteArray suffix = "  }\n};\n}";
+
+        const QByteArray original = "co@nnect(NsA::ClassA::instance(), SIGNAL(sig()),\n"
+                                    "        this, SLOT(slot()));\n";
+        const QByteArray expected = "connect(NsA::ClassA::instance(), &NsA::ClassA::sig,\n"
+                                    "        this, &ClassB::slot);\n";
+        QList<TestDocumentPtr> testDocuments;
+        testDocuments << CppTestDocument::create("file.cpp",
+                                                 prefix + original + suffix,
+                                                 prefix + expected + suffix);
+
+        ConvertQt4Connect factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+};
+
+QObject *ConvertQt4Connect::createTest()
+{
+    return new ConvertQt4ConnectTest;
+}
+#endif // WITH_TESTS
+
+} // namespace
+
+void registerConvertQt4ConnectQuickfix()
+{
+    CppQuickFixFactory::registerFactory<ConvertQt4Connect>();
+}
+
+} // namespace CppEditor::Internal
+
+#ifdef WITH_TESTS
+#include <convertqt4connect.moc>
+#endif
diff --git a/src/plugins/cppeditor/quickfixes/convertqt4connect.h b/src/plugins/cppeditor/quickfixes/convertqt4connect.h
new file mode 100644
index 00000000000..e96bd8f1068
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/convertqt4connect.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerConvertQt4ConnectQuickfix();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/convertstringliteral.cpp b/src/plugins/cppeditor/quickfixes/convertstringliteral.cpp
new file mode 100644
index 00000000000..eff4b3a9ae6
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/convertstringliteral.cpp
@@ -0,0 +1,746 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "convertstringliteral.h"
+
+#include "../cppeditordocument.h"
+#include "../cppeditortr.h"
+#include "../cppeditorwidget.h"
+#include "../cpprefactoringchanges.h"
+#include "cppquickfix.h"
+
+#include <QTextDecoder>
+
+#ifdef WITH_TESTS
+#include "cppquickfix_test.h"
+#include <QtTest>
+#endif
+
+using namespace CPlusPlus;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+
+enum StringLiteralType { TypeString, TypeObjCString, TypeChar, TypeNone };
+
+enum ActionFlags {
+    EncloseInQLatin1CharAction = 0x1,
+    EncloseInQLatin1StringAction = 0x2,
+    EncloseInQStringLiteralAction = 0x4,
+    EncloseInQByteArrayLiteralAction = 0x8,
+    EncloseActionMask = EncloseInQLatin1CharAction | EncloseInQLatin1StringAction
+                        | EncloseInQStringLiteralAction | EncloseInQByteArrayLiteralAction,
+    TranslateTrAction = 0x10,
+    TranslateQCoreApplicationAction = 0x20,
+    TranslateNoopAction = 0x40,
+    TranslationMask = TranslateTrAction | TranslateQCoreApplicationAction | TranslateNoopAction,
+    RemoveObjectiveCAction = 0x100,
+    ConvertEscapeSequencesToCharAction = 0x200,
+    ConvertEscapeSequencesToStringAction = 0x400,
+    SingleQuoteAction = 0x800,
+    DoubleQuoteAction = 0x1000
+};
+
+static bool isQtStringLiteral(const QByteArray &id)
+{
+    return id == "QLatin1String" || id == "QLatin1Literal" || id == "QStringLiteral"
+           || id == "QByteArrayLiteral";
+}
+
+static bool isQtStringTranslation(const QByteArray &id)
+{
+    return id == "tr" || id == "trUtf8" || id == "translate" || id == "QT_TRANSLATE_NOOP";
+}
+
+/* Convert single-character string literals into character literals with some
+ * special cases "a" --> 'a', "'" --> '\'', "\n" --> '\n', "\"" --> '"'. */
+static QByteArray stringToCharEscapeSequences(const QByteArray &content)
+{
+    if (content.size() == 1)
+        return content.at(0) == '\'' ? QByteArray("\\'") : content;
+    if (content.size() == 2 && content.at(0) == '\\')
+        return content == "\\\"" ? QByteArray(1, '"') : content;
+    return QByteArray();
+}
+
+/* Convert character literal into a string literal with some special cases
+ * 'a' -> "a", '\n' -> "\n", '\'' --> "'", '"' --> "\"". */
+static QByteArray charToStringEscapeSequences(const QByteArray &content)
+{
+    if (content.size() == 1)
+        return content.at(0) == '"' ? QByteArray("\\\"") : content;
+    if (content.size() == 2)
+        return content == "\\'" ? QByteArray("'") : content;
+    return QByteArray();
+}
+
+static QString msgQtStringLiteralDescription(const QString &replacement)
+{
+    return Tr::tr("Enclose in %1(...)").arg(replacement);
+}
+
+static QString stringLiteralReplacement(unsigned actions)
+{
+    if (actions & EncloseInQLatin1CharAction)
+        return QLatin1String("QLatin1Char");
+    if (actions & EncloseInQLatin1StringAction)
+        return QLatin1String("QLatin1String");
+    if (actions & EncloseInQStringLiteralAction)
+        return QLatin1String("QStringLiteral");
+    if (actions & EncloseInQByteArrayLiteralAction)
+        return QLatin1String("QByteArrayLiteral");
+    if (actions & TranslateTrAction)
+        return QLatin1String("tr");
+    if (actions & TranslateQCoreApplicationAction)
+        return QLatin1String("QCoreApplication::translate");
+    if (actions & TranslateNoopAction)
+        return QLatin1String("QT_TRANSLATE_NOOP");
+    return QString();
+}
+
+static ExpressionAST *analyzeStringLiteral(const QList<AST *> &path,
+                                           const CppRefactoringFilePtr &file, StringLiteralType *type,
+                                           QByteArray *enclosingFunction = nullptr,
+                                           CallAST **enclosingFunctionCall = nullptr)
+{
+    *type = TypeNone;
+    if (enclosingFunction)
+        enclosingFunction->clear();
+    if (enclosingFunctionCall)
+        *enclosingFunctionCall = nullptr;
+
+    if (path.isEmpty())
+        return nullptr;
+
+    ExpressionAST *literal = path.last()->asExpression();
+    if (literal) {
+        if (literal->asStringLiteral()) {
+            // Check for Objective C string (@"bla")
+            const QChar firstChar = file->charAt(file->startOf(literal));
+            *type = firstChar == QLatin1Char('@') ? TypeObjCString : TypeString;
+        } else if (NumericLiteralAST *numericLiteral = literal->asNumericLiteral()) {
+            // character ('c') constants are numeric.
+            if (file->tokenAt(numericLiteral->literal_token).is(T_CHAR_LITERAL))
+                *type = TypeChar;
+        }
+    }
+
+    if (*type != TypeNone && enclosingFunction && path.size() > 1) {
+        if (CallAST *call = path.at(path.size() - 2)->asCall()) {
+            if (call->base_expression) {
+                if (IdExpressionAST *idExpr = call->base_expression->asIdExpression()) {
+                    if (SimpleNameAST *functionName = idExpr->name->asSimpleName()) {
+                        *enclosingFunction = file->tokenAt(functionName->identifier_token).identifier->chars();
+                        if (enclosingFunctionCall)
+                            *enclosingFunctionCall = call;
+                    }
+                }
+            }
+        }
+    }
+    return literal;
+}
+
+class EscapeStringLiteralOperation: public CppQuickFixOperation
+{
+public:
+    EscapeStringLiteralOperation(const CppQuickFixInterface &interface,
+                                 ExpressionAST *literal, bool escape)
+        : CppQuickFixOperation(interface)
+        , m_literal(literal)
+        , m_escape(escape)
+    {
+        if (m_escape) {
+            setDescription(Tr::tr("Escape String Literal as UTF-8"));
+        } else {
+            setDescription(Tr::tr("Unescape String Literal as UTF-8"));
+        }
+    }
+
+private:
+    static inline bool isDigit(quint8 ch, int base)
+    {
+        if (base == 8)
+            return ch >= '0' && ch < '8';
+        if (base == 16)
+            return isxdigit(ch);
+        return false;
+    }
+
+    static QByteArrayList escapeString(const QByteArray &contents)
+    {
+        QByteArrayList newContents;
+        QByteArray chunk;
+        bool wasEscaped = false;
+        for (const quint8 c : contents) {
+            const bool needsEscape = !isascii(c) || !isprint(c);
+            if (!needsEscape && wasEscaped && std::isxdigit(c) && !chunk.isEmpty()) {
+                newContents << chunk;
+                chunk.clear();
+            }
+            if (needsEscape)
+                chunk += QByteArray("\\x") + QByteArray::number(c, 16).rightJustified(2, '0');
+            else
+                chunk += c;
+            wasEscaped = needsEscape;
+        }
+        if (!chunk.isEmpty())
+            newContents << chunk;
+        return newContents;
+    }
+
+    static QByteArray unescapeString(const QByteArray &contents)
+    {
+        QByteArray newContents;
+        const int len = contents.length();
+        for (int i = 0; i < len; ++i) {
+            quint8 c = contents.at(i);
+            if (c == '\\' && i < len - 1) {
+                int idx = i + 1;
+                quint8 ch = contents.at(idx);
+                int base = 0;
+                int maxlen = 0;
+                if (isDigit(ch, 8)) {
+                    base = 8;
+                    maxlen = 3;
+                } else if ((ch == 'x' || ch == 'X') && idx < len - 1) {
+                    base = 16;
+                    maxlen = 2;
+                    ch = contents.at(++idx);
+                }
+                if (base > 0) {
+                    QByteArray buf;
+                    while (isDigit(ch, base) && idx < len && buf.length() < maxlen) {
+                        buf += ch;
+                        ++idx;
+                        if (idx == len)
+                            break;
+                        ch = contents.at(idx);
+                    }
+                    if (!buf.isEmpty()) {
+                        bool ok;
+                        uint value = buf.toUInt(&ok, base);
+                        // Don't unescape isascii() && !isprint()
+                        if (ok && (!isascii(value) || isprint(value))) {
+                            newContents += value;
+                            i = idx - 1;
+                            continue;
+                        }
+                    }
+                }
+                newContents += c;
+                c = contents.at(++i);
+            }
+            newContents += c;
+        }
+        return newContents;
+    }
+
+    // QuickFixOperation interface
+public:
+    void perform() override
+    {
+        const int startPos = currentFile()->startOf(m_literal);
+        const int endPos = currentFile()->endOf(m_literal);
+
+        StringLiteralAST *stringLiteral = m_literal->asStringLiteral();
+        QTC_ASSERT(stringLiteral, return);
+        const QByteArray oldContents(currentFile()->tokenAt(stringLiteral->literal_token).
+                                     identifier->chars());
+        QByteArrayList newContents;
+        if (m_escape)
+            newContents = escapeString(oldContents);
+        else
+            newContents = {unescapeString(oldContents)};
+
+        if (newContents.isEmpty()
+            || (newContents.size() == 1 && newContents.first() == oldContents)) {
+            return;
+        }
+
+        QTextCodec *utf8codec = QTextCodec::codecForName("UTF-8");
+        QScopedPointer<QTextDecoder> decoder(utf8codec->makeDecoder());
+        ChangeSet changes;
+
+        bool replace = true;
+        for (const QByteArray &chunk : std::as_const(newContents)) {
+            const QString str = decoder->toUnicode(chunk);
+            const QByteArray utf8buf = str.toUtf8();
+            if (!utf8codec->canEncode(str) || chunk != utf8buf)
+                return;
+            if (replace)
+                changes.replace(startPos + 1, endPos - 1, str);
+            else
+                changes.insert(endPos, "\"" + str + "\"");
+            replace = false;
+        }
+        currentFile()->apply(changes);
+    }
+
+private:
+    ExpressionAST *m_literal;
+    bool m_escape;
+};
+
+/// Operation performs the operations of type ActionFlags passed in as actions.
+class WrapStringLiteralOp : public CppQuickFixOperation
+{
+public:
+    WrapStringLiteralOp(const CppQuickFixInterface &interface, int priority,
+                        unsigned actions, const QString &description, ExpressionAST *literal,
+                        const QString &translationContext = QString())
+        : CppQuickFixOperation(interface, priority), m_actions(actions), m_literal(literal),
+        m_translationContext(translationContext)
+    {
+        setDescription(description);
+    }
+
+    void perform() override
+    {
+        ChangeSet changes;
+
+        const int startPos = currentFile()->startOf(m_literal);
+        const int endPos = currentFile()->endOf(m_literal);
+
+        // kill leading '@'. No need to adapt endPos, that is done by ChangeSet
+        if (m_actions & RemoveObjectiveCAction)
+            changes.remove(startPos, startPos + 1);
+
+        // Fix quotes
+        if (m_actions & (SingleQuoteAction | DoubleQuoteAction)) {
+            const QString newQuote((m_actions & SingleQuoteAction)
+                                       ? QLatin1Char('\'') : QLatin1Char('"'));
+            changes.replace(startPos, startPos + 1, newQuote);
+            changes.replace(endPos - 1, endPos, newQuote);
+        }
+
+        // Convert single character strings into character constants
+        if (m_actions & ConvertEscapeSequencesToCharAction) {
+            StringLiteralAST *stringLiteral = m_literal->asStringLiteral();
+            QTC_ASSERT(stringLiteral, return ;);
+            const QByteArray oldContents(currentFile()->tokenAt(stringLiteral->literal_token).identifier->chars());
+            const QByteArray newContents = stringToCharEscapeSequences(oldContents);
+            QTC_ASSERT(!newContents.isEmpty(), return ;);
+            if (oldContents != newContents)
+                changes.replace(startPos + 1, endPos -1, QString::fromLatin1(newContents));
+        }
+
+        // Convert character constants into strings constants
+        if (m_actions & ConvertEscapeSequencesToStringAction) {
+            NumericLiteralAST *charLiteral = m_literal->asNumericLiteral(); // char 'c' constants are numerical.
+            QTC_ASSERT(charLiteral, return ;);
+            const QByteArray oldContents(currentFile()->tokenAt(charLiteral->literal_token).identifier->chars());
+            const QByteArray newContents = charToStringEscapeSequences(oldContents);
+            QTC_ASSERT(!newContents.isEmpty(), return ;);
+            if (oldContents != newContents)
+                changes.replace(startPos + 1, endPos -1, QString::fromLatin1(newContents));
+        }
+
+        // Enclose in literal or translation function, macro.
+        if (m_actions & (EncloseActionMask | TranslationMask)) {
+            changes.insert(endPos, QString(QLatin1Char(')')));
+            QString leading = stringLiteralReplacement(m_actions);
+            leading += QLatin1Char('(');
+            if (m_actions
+                & (TranslateQCoreApplicationAction | TranslateNoopAction)) {
+                leading += QLatin1Char('"');
+                leading += m_translationContext;
+                leading += QLatin1String("\", ");
+            }
+            changes.insert(startPos, leading);
+        }
+
+        currentFile()->apply(changes);
+    }
+
+private:
+    const unsigned m_actions;
+    ExpressionAST *m_literal;
+    const QString m_translationContext;
+};
+
+class ConvertCStringToNSStringOp: public CppQuickFixOperation
+{
+public:
+    ConvertCStringToNSStringOp(const CppQuickFixInterface &interface, int priority,
+                               StringLiteralAST *stringLiteral, CallAST *qlatin1Call)
+        : CppQuickFixOperation(interface, priority)
+        , stringLiteral(stringLiteral)
+        , qlatin1Call(qlatin1Call)
+    {
+        setDescription(Tr::tr("Convert to Objective-C String Literal"));
+    }
+
+    void perform() override
+    {
+        ChangeSet changes;
+
+        if (qlatin1Call) {
+            changes.replace(currentFile()->startOf(qlatin1Call), currentFile()->startOf(stringLiteral),
+                            QLatin1String("@"));
+            changes.remove(currentFile()->endOf(stringLiteral), currentFile()->endOf(qlatin1Call));
+        } else {
+            changes.insert(currentFile()->startOf(stringLiteral), QLatin1String("@"));
+        }
+
+        currentFile()->apply(changes);
+    }
+
+private:
+    StringLiteralAST *stringLiteral;
+    CallAST *qlatin1Call;
+};
+
+/*!
+  Replace
+     "abcd"
+     QLatin1String("abcd")
+     QLatin1Literal("abcd")
+
+  With
+     @"abcd"
+
+  Activates on: the string literal, if the file type is a Objective-C(++) file.
+*/
+class ConvertCStringToNSString: public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        CppRefactoringFilePtr file = interface.currentFile();
+
+        if (!interface.editor()->cppEditorDocument()->isObjCEnabled())
+            return;
+
+        StringLiteralType type = TypeNone;
+        QByteArray enclosingFunction;
+        CallAST *qlatin1Call;
+        const QList<AST *> &path = interface.path();
+        ExpressionAST *literal = analyzeStringLiteral(path, file, &type, &enclosingFunction,
+                                                      &qlatin1Call);
+        if (!literal || type != TypeString)
+            return;
+        if (!isQtStringLiteral(enclosingFunction))
+            qlatin1Call = nullptr;
+
+        result << new ConvertCStringToNSStringOp(interface, path.size() - 1, literal->asStringLiteral(),
+                                                 qlatin1Call);
+    }
+};
+
+/*!
+  Replace
+    "abcd"
+
+  With
+    tr("abcd") or
+    QCoreApplication::translate("CONTEXT", "abcd") or
+    QT_TRANSLATE_NOOP("GLOBAL", "abcd")
+
+  depending on what is available.
+
+  Activates on: the string literal
+*/
+class TranslateStringLiteral: public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        // Initialize
+        StringLiteralType type = TypeNone;
+        QByteArray enclosingFunction;
+        const QList<AST *> &path = interface.path();
+        CppRefactoringFilePtr file = interface.currentFile();
+        ExpressionAST *literal = analyzeStringLiteral(path, file, &type, &enclosingFunction);
+        if (!literal || type != TypeString
+            || isQtStringLiteral(enclosingFunction) || isQtStringTranslation(enclosingFunction))
+            return;
+
+        QString trContext;
+
+        std::shared_ptr<Control> control = interface.context().bindings()->control();
+        const Name *trName = control->identifier("tr");
+
+        // Check whether we are in a function:
+        const QString description = Tr::tr("Mark as Translatable");
+        for (int i = path.size() - 1; i >= 0; --i) {
+            if (FunctionDefinitionAST *definition = path.at(i)->asFunctionDefinition()) {
+                Function *function = definition->symbol;
+                ClassOrNamespace *b = interface.context().lookupType(function);
+                if (b) {
+                    // Do we have a tr function?
+                    const QList<LookupItem> items = b->find(trName);
+                    for (const LookupItem &r : items) {
+                        Symbol *s = r.declaration();
+                        if (s->type()->asFunctionType()) {
+                            // no context required for tr
+                            result << new WrapStringLiteralOp(interface, path.size() - 1,
+                                                              TranslateTrAction,
+                                                              description, literal);
+                            return;
+                        }
+                    }
+                }
+                // We need to do a QCA::translate, so we need a context.
+                // Use fully qualified class name:
+                Overview oo;
+                const QList<const Name *> names = LookupContext::path(function);
+                for (const Name *n : names) {
+                    if (!trContext.isEmpty())
+                        trContext.append(QLatin1String("::"));
+                    trContext.append(oo.prettyName(n));
+                }
+                // ... or global if none available!
+                if (trContext.isEmpty())
+                    trContext = QLatin1String("GLOBAL");
+                result << new WrapStringLiteralOp(interface, path.size() - 1,
+                                                  TranslateQCoreApplicationAction,
+                                                  description, literal, trContext);
+                return;
+            }
+        }
+
+        // We need to use Q_TRANSLATE_NOOP
+        result << new WrapStringLiteralOp(interface, path.size() - 1,
+                                          TranslateNoopAction,
+                                          description, literal, trContext);
+    }
+};
+
+/*!
+  Replace
+    "abcd"  -> QLatin1String("abcd")
+    @"abcd" -> QLatin1String("abcd") (Objective C)
+    'a'     -> QLatin1Char('a')
+    'a'     -> "a"
+    "a"     -> 'a' or QLatin1Char('a') (Single character string constants)
+    "\n"    -> '\n', QLatin1Char('\n')
+
+  Except if they are already enclosed in
+    QLatin1Char, QT_TRANSLATE_NOOP, tr,
+    trUtf8, QLatin1Literal, QLatin1String
+
+  Activates on: the string or character literal
+*/
+
+class WrapStringLiteral: public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        StringLiteralType type = TypeNone;
+        QByteArray enclosingFunction;
+        const QList<AST *> &path = interface.path();
+        CppRefactoringFilePtr file = interface.currentFile();
+        ExpressionAST *literal = analyzeStringLiteral(path, file, &type, &enclosingFunction);
+        if (!literal || type == TypeNone)
+            return;
+        if ((type == TypeChar && enclosingFunction == "QLatin1Char")
+            || isQtStringLiteral(enclosingFunction)
+            || isQtStringTranslation(enclosingFunction))
+            return;
+
+        const int priority = path.size() - 1; // very high priority
+        if (type == TypeChar) {
+            unsigned actions = EncloseInQLatin1CharAction;
+            QString description = msgQtStringLiteralDescription(stringLiteralReplacement(actions));
+            result << new WrapStringLiteralOp(interface, priority, actions, description, literal);
+            if (NumericLiteralAST *charLiteral = literal->asNumericLiteral()) {
+                const QByteArray contents(file->tokenAt(charLiteral->literal_token).identifier->chars());
+                if (!charToStringEscapeSequences(contents).isEmpty()) {
+                    actions = DoubleQuoteAction | ConvertEscapeSequencesToStringAction;
+                    description = Tr::tr("Convert to String Literal");
+                    result << new WrapStringLiteralOp(interface, priority, actions,
+                                                      description, literal);
+                }
+            }
+        } else {
+            const unsigned objectiveCActions = type == TypeObjCString ?
+                                                   unsigned(RemoveObjectiveCAction) : 0u;
+            unsigned actions = 0;
+            if (StringLiteralAST *stringLiteral = literal->asStringLiteral()) {
+                const QByteArray contents(file->tokenAt(stringLiteral->literal_token).identifier->chars());
+                if (!stringToCharEscapeSequences(contents).isEmpty()) {
+                    actions = EncloseInQLatin1CharAction | SingleQuoteAction
+                              | ConvertEscapeSequencesToCharAction | objectiveCActions;
+                    QString description =
+                        Tr::tr("Convert to Character Literal and Enclose in QLatin1Char(...)");
+                    result << new WrapStringLiteralOp(interface, priority, actions,
+                                                      description, literal);
+                    actions &= ~EncloseInQLatin1CharAction;
+                    description = Tr::tr("Convert to Character Literal");
+                    result << new WrapStringLiteralOp(interface, priority, actions,
+                                                      description, literal);
+                }
+            }
+            actions = EncloseInQLatin1StringAction | objectiveCActions;
+            result << new WrapStringLiteralOp(interface, priority, actions,
+                                              msgQtStringLiteralDescription(stringLiteralReplacement(actions)), literal);
+            actions = EncloseInQStringLiteralAction | objectiveCActions;
+            result << new WrapStringLiteralOp(interface, priority, actions,
+                                              msgQtStringLiteralDescription(stringLiteralReplacement(actions)), literal);
+            actions = EncloseInQByteArrayLiteralAction | objectiveCActions;
+            result << new WrapStringLiteralOp(interface, priority, actions,
+                                              msgQtStringLiteralDescription(stringLiteralReplacement(actions)), literal);
+        }
+    }
+};
+
+/*!
+  Escapes or unescapes a string literal as UTF-8.
+
+  Escapes non-ASCII characters in a string literal to hexadecimal escape sequences.
+  Unescapes octal or hexadecimal escape sequences in a string literal.
+  String literals are handled as UTF-8 even if file's encoding is not UTF-8.
+ */
+class EscapeStringLiteral : public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override
+    {
+        const QList<AST *> &path = interface.path();
+        if (path.isEmpty())
+            return;
+
+        AST * const lastAst = path.last();
+        ExpressionAST *literal = lastAst->asStringLiteral();
+        if (!literal)
+            return;
+
+        StringLiteralAST *stringLiteral = literal->asStringLiteral();
+        CppRefactoringFilePtr file = interface.currentFile();
+        const QByteArray contents(file->tokenAt(stringLiteral->literal_token).identifier->chars());
+
+        bool canEscape = false;
+        bool canUnescape = false;
+        for (int i = 0; i < contents.length(); ++i) {
+            quint8 c = contents.at(i);
+            if (!isascii(c) || !isprint(c)) {
+                canEscape = true;
+            } else if (c == '\\' && i < contents.length() - 1) {
+                c = contents.at(++i);
+                if ((c >= '0' && c < '8') || c == 'x' || c == 'X')
+                    canUnescape = true;
+            }
+        }
+
+        if (canEscape)
+            result << new EscapeStringLiteralOperation(interface, literal, true);
+
+        if (canUnescape)
+            result << new EscapeStringLiteralOperation(interface, literal, false);
+    }
+};
+
+#ifdef WITH_TESTS
+using namespace Tests;
+
+class EscapeStringLiteralTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test_data()
+    {
+        QTest::addColumn<QByteArray>("original");
+        QTest::addColumn<QByteArray>("expected");
+
+        // Escape String Literal as UTF-8 (no-trigger)
+        QTest::newRow("EscapeStringLiteral_notrigger")
+            << QByteArray("const char *notrigger = \"@abcdef \\a\\n\\\\\";\n")
+            << QByteArray();
+
+        // Escape String Literal as UTF-8
+        QTest::newRow("EscapeStringLiteral")
+            << QByteArray("const char *utf8 = \"@\xe3\x81\x82\xe3\x81\x84\";\n")
+            << QByteArray("const char *utf8 = \"\\xe3\\x81\\x82\\xe3\\x81\\x84\";\n");
+
+        // Unescape String Literal as UTF-8 (from hexdecimal escape sequences)
+        QTest::newRow("UnescapeStringLiteral_hex")
+            << QByteArray("const char *hex_escaped = \"@\\xe3\\x81\\x82\\xe3\\x81\\x84\";\n")
+            << QByteArray("const char *hex_escaped = \"\xe3\x81\x82\xe3\x81\x84\";\n");
+
+        // Unescape String Literal as UTF-8 (from octal escape sequences)
+        QTest::newRow("UnescapeStringLiteral_oct")
+            << QByteArray("const char *oct_escaped = \"@\\343\\201\\202\\343\\201\\204\";\n")
+            << QByteArray("const char *oct_escaped = \"\xe3\x81\x82\xe3\x81\x84\";\n");
+
+        // Unescape String Literal as UTF-8 (triggered but no change)
+        QTest::newRow("UnescapeStringLiteral_noconv")
+            << QByteArray("const char *escaped_ascii = \"@\\x1b\";\n")
+            << QByteArray("const char *escaped_ascii = \"\\x1b\";\n");
+
+        // Unescape String Literal as UTF-8 (no conversion because of invalid utf-8)
+        QTest::newRow("UnescapeStringLiteral_invalid")
+            << QByteArray("const char *escaped = \"@\\xe3\\x81\";\n")
+            << QByteArray("const char *escaped = \"\\xe3\\x81\";\n");
+
+        QTest::newRow("escape string literal: simple case")
+            << QByteArray(R"(const char *str = @"àxyz";)")
+            << QByteArray(R"(const char *str = "\xc3\xa0xyz";)");
+        QTest::newRow("escape string literal: simple case reverse")
+            << QByteArray(R"(const char *str = @"\xc3\xa0xyz";)")
+            << QByteArray(R"(const char *str = "àxyz";)");
+        QTest::newRow("escape string literal: raw string literal")
+            << QByteArray(R"x(const char *str = @R"(àxyz)";)x")
+            << QByteArray(R"x(const char *str = R"(\xc3\xa0xyz)";)x");
+        QTest::newRow("escape string literal: splitting required")
+            << QByteArray(R"(const char *str = @"àf23бgб1";)")
+            << QByteArray(R"(const char *str = "\xc3\xa0""f23\xd0\xb1g\xd0\xb1""1";)");
+        QTest::newRow("escape string literal: unescape adjacent literals")
+            << QByteArray(R"(const char *str = @"\xc3\xa0""f23\xd0\xb1g\xd0\xb1""1";)")
+            << QByteArray(R"(const char *str = "àf23бgб1";)");
+    }
+
+    void test()
+    {
+        QFETCH(QByteArray, original);
+        QFETCH(QByteArray, expected);
+
+        EscapeStringLiteral factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+};
+
+QObject *EscapeStringLiteral::createTest() { return new EscapeStringLiteralTest; }
+QObject *ConvertCStringToNSString::createTest() { return new QObject; }
+QObject *WrapStringLiteral::createTest() { return new QObject; }
+QObject *TranslateStringLiteral::createTest() { return new QObject; }
+
+#endif // WITH_TESTS
+} // namespace
+
+void registerConvertStringLiteralQuickfixes()
+{
+    CppQuickFixFactory::registerFactory<ConvertCStringToNSString>();
+    CppQuickFixFactory::registerFactory<EscapeStringLiteral>();
+    CppQuickFixFactory::registerFactory<TranslateStringLiteral>();
+    CppQuickFixFactory::registerFactory<WrapStringLiteral>();
+}
+
+} // namespace CppEditor::Internal
+
+#ifdef WITH_TESTS
+#include <convertstringliteral.moc>
+#endif
diff --git a/src/plugins/cppeditor/quickfixes/convertstringliteral.h b/src/plugins/cppeditor/quickfixes/convertstringliteral.h
new file mode 100644
index 00000000000..16cefacae02
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/convertstringliteral.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerConvertStringLiteralQuickfixes();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/converttocamelcase.cpp b/src/plugins/cppeditor/quickfixes/converttocamelcase.cpp
new file mode 100644
index 00000000000..c597a29c115
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/converttocamelcase.cpp
@@ -0,0 +1,184 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "converttocamelcase.h"
+
+#include "../cppeditortr.h"
+#include "../cppeditorwidget.h"
+#include "../cpprefactoringchanges.h"
+#include "cppquickfix.h"
+
+#ifdef WITH_TESTS
+#include "cppquickfix_test.h"
+#include <QtTest>
+#endif
+
+using namespace CPlusPlus;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+
+class ConvertToCamelCaseOp: public CppQuickFixOperation
+{
+public:
+    ConvertToCamelCaseOp(const CppQuickFixInterface &interface, const QString &name,
+                         const AST *nameAst, bool test)
+        : CppQuickFixOperation(interface, -1)
+        , m_name(name)
+        , m_nameAst(nameAst)
+        , m_isAllUpper(name.isUpper())
+        , m_test(test)
+    {
+        setDescription(Tr::tr("Convert to Camel Case"));
+    }
+
+    static bool isConvertibleUnderscore(const QString &name, int pos)
+    {
+        return name.at(pos) == QLatin1Char('_') && name.at(pos+1).isLetter()
+               && !(pos == 1 && name.at(0) == QLatin1Char('m'));
+    }
+
+private:
+    void perform() override
+    {
+        QString newName = m_isAllUpper ? m_name.toLower() : m_name;
+        for (int i = 1; i < newName.length(); ++i) {
+            const QChar c = newName.at(i);
+            if (c.isUpper() && m_isAllUpper) {
+                newName[i] = c.toLower();
+            } else if (i < newName.length() - 1 && isConvertibleUnderscore(newName, i)) {
+                newName.remove(i, 1);
+                newName[i] = newName.at(i).toUpper();
+            }
+        }
+        if (m_test)
+            currentFile()->apply(ChangeSet::makeReplace(currentFile()->range(m_nameAst), newName));
+        else
+            editor()->renameUsages(newName);
+    }
+
+    const QString m_name;
+    const AST * const m_nameAst;
+    const bool m_isAllUpper;
+    const bool m_test;
+};
+
+/*!
+  Turns "an_example_symbol" into "anExampleSymbol" and
+  "AN_EXAMPLE_SYMBOL" into "AnExampleSymbol".
+
+  Activates on: identifiers
+*/
+class ConvertToCamelCase : public CppQuickFixFactory
+{
+public:
+    ConvertToCamelCase(bool test = false) : m_test(test) {}
+
+#ifdef WITH_TESTS
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const QList<AST *> &path = interface.path();
+
+        if (path.isEmpty())
+            return;
+
+        AST * const ast = path.last();
+        const Name *name = nullptr;
+        const AST *astForName = nullptr;
+        if (const NameAST * const nameAst = ast->asName()) {
+            if (nameAst->name && nameAst->name->asNameId()) {
+                astForName = nameAst;
+                name = nameAst->name;
+            }
+        } else if (const NamespaceAST * const namespaceAst = ast->asNamespace()) {
+            astForName = namespaceAst;
+            name = namespaceAst->symbol->name();
+        }
+
+        if (!name)
+            return;
+
+        QString nameString = QString::fromUtf8(name->identifier()->chars());
+        if (nameString.length() < 3)
+            return;
+        for (int i = 1; i < nameString.length() - 1; ++i) {
+            if (ConvertToCamelCaseOp::isConvertibleUnderscore(nameString, i)) {
+                result << new ConvertToCamelCaseOp(interface, nameString, astForName, m_test);
+                return;
+            }
+        }
+    }
+
+    const bool m_test;
+};
+
+#ifdef WITH_TESTS
+using namespace Tests;
+
+class ConvertToCamelCaseTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test_data()
+    {
+        QTest::addColumn<QByteArray>("original");
+        QTest::addColumn<QByteArray>("expected");
+
+        using QByteArray = QByteArray;
+
+        QTest::newRow("convert to camel case: normal")
+            << QByteArray("void @lower_case_function();\n")
+            << QByteArray("void lowerCaseFunction();\n");
+        QTest::newRow("convert to camel case: already camel case")
+            << QByteArray("void @camelCaseFunction();\n")
+            << QByteArray();
+        QTest::newRow("convert to camel case: no underscores (lower case)")
+            << QByteArray("void @lowercasefunction();\n")
+            << QByteArray();
+        QTest::newRow("convert to camel case: no underscores (upper case)")
+            << QByteArray("void @UPPERCASEFUNCTION();\n")
+            << QByteArray();
+        QTest::newRow("convert to camel case: non-applicable underscore")
+            << QByteArray("void @m_a_member;\n")
+            << QByteArray("void m_aMember;\n");
+        QTest::newRow("convert to camel case: upper case")
+            << QByteArray("void @UPPER_CASE_FUNCTION();\n")
+            << QByteArray("void upperCaseFunction();\n");
+        QTest::newRow("convert to camel case: partially camel case already")
+            << QByteArray("void mixed@_andCamelCase();\n")
+            << QByteArray("void mixedAndCamelCase();\n");
+        QTest::newRow("convert to camel case: wild mix")
+            << QByteArray("void @WhAt_TODO_hErE();\n")
+            << QByteArray("void WhAtTODOHErE();\n");
+    }
+
+    void test()
+    {
+        QFETCH(QByteArray, original);
+        QFETCH(QByteArray, expected);
+        ConvertToCamelCase factory(true);
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+};
+
+QObject *ConvertToCamelCase::createTest() { return new ConvertToCamelCaseTest; }
+
+#endif // WITH_TESTS
+} // namespace
+
+void registerConvertToCamelCaseQuickfix()
+{
+    CppQuickFixFactory::registerFactory<ConvertToCamelCase>();
+}
+
+} // namespace CppEditor::Internal
+
+#ifdef WITH_TESTS
+#include <converttocamelcase.moc>
+#endif
diff --git a/src/plugins/cppeditor/quickfixes/converttocamelcase.h b/src/plugins/cppeditor/quickfixes/converttocamelcase.h
new file mode 100644
index 00000000000..2d7acb08f73
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/converttocamelcase.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerConvertToCamelCaseQuickfix();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/converttometamethodcall.cpp b/src/plugins/cppeditor/quickfixes/converttometamethodcall.cpp
new file mode 100644
index 00000000000..9d94808fbf8
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/converttometamethodcall.cpp
@@ -0,0 +1,273 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "converttometamethodcall.h"
+
+#include "../cppeditortr.h"
+#include "../cpprefactoringchanges.h"
+#include "cppquickfix.h"
+#include "cppquickfixhelpers.h"
+
+#include <cplusplus/ASTPath.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/TypeOfExpression.h>
+
+#ifdef WITH_TESTS
+#include "cppquickfix_test.h"
+#include <QtTest>
+#endif
+
+using namespace CPlusPlus;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+
+class ConvertToMetaMethodCallOp : public CppQuickFixOperation
+{
+public:
+    ConvertToMetaMethodCallOp(const CppQuickFixInterface &interface, CallAST *callAst)
+        : CppQuickFixOperation(interface), m_callAst(callAst)
+    {
+        setDescription(Tr::tr("Convert Function Call to Qt Meta-Method Invocation"));
+    }
+
+private:
+    void perform() override
+    {
+        // Construct the argument list.
+        Overview ov;
+        QStringList arguments;
+        for (ExpressionListAST *it = m_callAst->expression_list; it; it = it->next) {
+            if (!it->value)
+                return;
+            const FullySpecifiedType argType
+                = typeOfExpr(it->value, currentFile(), snapshot(), context());
+            if (!argType.isValid())
+                return;
+            arguments << QString::fromUtf8("Q_ARG(%1, %2)")
+                             .arg(ov.prettyType(argType), currentFile()->textOf(it->value));
+        }
+        QString argsString = arguments.join(", ");
+        if (!argsString.isEmpty())
+            argsString.prepend(", ");
+
+        // Construct the replace string.
+        const auto memberAccessAst = m_callAst->base_expression->asMemberAccess();
+        QTC_ASSERT(memberAccessAst, return);
+        QString baseExpr = currentFile()->textOf(memberAccessAst->base_expression);
+        const FullySpecifiedType baseExprType
+            = typeOfExpr(memberAccessAst->base_expression, currentFile(), snapshot(), context());
+        if (!baseExprType.isValid())
+            return;
+        if (!baseExprType->asPointerType())
+            baseExpr.prepend('&');
+        const QString functionName = currentFile()->textOf(memberAccessAst->member_name);
+        const QString qMetaObject = "QMetaObject";
+        const QString newCall = QString::fromUtf8("%1::invokeMethod(%2, \"%3\"%4)")
+                                    .arg(qMetaObject, baseExpr, functionName, argsString);
+
+        // Determine the start and end positions of the replace operation.
+        // If the call is preceded by an "emit" keyword, that one has to be removed as well.
+        int firstToken = m_callAst->firstToken();
+        if (firstToken > 0)
+            switch (semanticInfo().doc->translationUnit()->tokenKind(firstToken - 1)) {
+            case T_EMIT: case T_Q_EMIT: --firstToken; break;
+            default: break;
+            }
+        const TranslationUnit *const tu = semanticInfo().doc->translationUnit();
+        const int startPos = tu->getTokenPositionInDocument(firstToken, textDocument());
+        const int endPos = tu->getTokenPositionInDocument(m_callAst->lastToken(), textDocument());
+
+        // Replace the old call with the new one.
+        ChangeSet changes;
+        changes.replace(startPos, endPos, newCall);
+
+        // Insert include for QMetaObject, if necessary.
+        const Identifier qMetaObjectId(qPrintable(qMetaObject), qMetaObject.size());
+        Scope * const scope = currentFile()->scopeAt(firstToken);
+        const QList<LookupItem> results = context().lookup(&qMetaObjectId, scope);
+        bool isDeclared = false;
+        for (const LookupItem &item : results) {
+            if (Symbol *declaration = item.declaration(); declaration && declaration->asClass()) {
+                isDeclared = true;
+                break;
+            }
+        }
+        if (!isDeclared) {
+            insertNewIncludeDirective('<' + qMetaObject + '>', currentFile(), semanticInfo().doc,
+                                      changes);
+        }
+
+        // Apply the changes.
+        currentFile()->apply(changes);
+    }
+
+    const CallAST * const m_callAst;
+};
+
+//! Converts a normal function call into a meta method invocation, if the functions is
+//! marked as invokable.
+class ConvertToMetaMethodCall : public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest();
+#endif
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const Document::Ptr &cppDoc = interface.currentFile()->cppDocument();
+        const QList<AST *> path = ASTPath(cppDoc)(interface.cursor());
+        if (path.isEmpty())
+            return;
+
+        // Are we on a member function call?
+        CallAST *callAst = nullptr;
+        for (auto it = path.crbegin(); it != path.crend(); ++it) {
+            if ((callAst = (*it)->asCall()))
+                break;
+        }
+        if (!callAst || !callAst->base_expression)
+            return;
+        ExpressionAST *baseExpr = nullptr;
+        const NameAST *nameAst = nullptr;
+        if (const MemberAccessAST * const ast = callAst->base_expression->asMemberAccess()) {
+            baseExpr = ast->base_expression;
+            nameAst = ast->member_name;
+        }
+        if (!baseExpr || !nameAst || !nameAst->name)
+            return;
+
+        // Locate called function and check whether it is invokable.
+        Scope *scope = cppDoc->globalNamespace();
+        for (auto it = path.crbegin(); it != path.crend(); ++it) {
+            if (const CompoundStatementAST * const stmtAst = (*it)->asCompoundStatement()) {
+                scope = stmtAst->symbol;
+                break;
+            }
+        }
+        const LookupContext context(cppDoc, interface.snapshot());
+        TypeOfExpression exprType;
+        exprType.setExpandTemplates(true);
+        exprType.init(cppDoc, interface.snapshot());
+        const QList<LookupItem> typeMatches = exprType(callAst->base_expression, cppDoc, scope);
+        for (const LookupItem &item : typeMatches) {
+            if (const auto func = item.type()->asFunctionType(); func && func->methodKey()) {
+                result << new ConvertToMetaMethodCallOp(interface, callAst);
+                return;
+            }
+        }
+    }
+};
+
+#ifdef WITH_TESTS
+using namespace Tests;
+
+class ConvertToMetaMethodCallTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test_data()
+    {
+        QTest::addColumn<QByteArray>("input");
+        QTest::addColumn<QByteArray>("expected");
+
+        // ^ marks the cursor locations.
+        // $ marks the replacement regions.
+        // The quoted string in the comment is the data tag.
+        // The rest of the comment is the replacement string.
+        const QByteArray allCases = R"(
+class C {
+public:
+    C() {
+        $this->^aSignal()$; // "signal from region on pointer to object" QMetaObject::invokeMethod(this, "aSignal")
+        C c;
+        $c.^aSignal()$; // "signal from region on object value" QMetaObject::invokeMethod(&c, "aSignal")
+        $(new C)->^aSignal()$; // "signal from region on expression" QMetaObject::invokeMethod((new C), "aSignal")
+        $emit this->^aSignal()$; // "signal from region, with emit" QMetaObject::invokeMethod(this, "aSignal")
+        $Q_EMIT this->^aSignal()$; // "signal from region, with Q_EMIT" QMetaObject::invokeMethod(this, "aSignal")
+        $this->^aSlot()$; // "slot from region" QMetaObject::invokeMethod(this, "aSlot")
+        $this->^noArgs()$; // "Q_SIGNAL, no arguments" QMetaObject::invokeMethod(this, "noArgs")
+        $this->^oneArg(0)$; // "Q_SLOT, one argument" QMetaObject::invokeMethod(this, "oneArg", Q_ARG(int, 0))
+        $this->^twoArgs(0, c)$; // "Q_INVOKABLE, two arguments" QMetaObject::invokeMethod(this, "twoArgs", Q_ARG(int, 0), Q_ARG(C, c))
+        this->^notInvokable(); // "not invokable"
+    }
+
+signals:
+    void aSignal();
+
+private slots:
+    void aSlot();
+
+private:
+    Q_SIGNAL void noArgs();
+    Q_SLOT void oneArg(int index);
+    Q_INVOKABLE void twoArgs(int index, const C &value);
+    void notInvokable();
+};
+)";
+
+        qsizetype nextCursor = allCases.indexOf('^');
+        while (nextCursor != -1) {
+            const int commentStart = allCases.indexOf("//", nextCursor);
+            QVERIFY(commentStart != -1);
+            const int tagStart = allCases.indexOf('"', commentStart + 2);
+            QVERIFY(tagStart != -1);
+            const int tagEnd = allCases.indexOf('"', tagStart + 1);
+            QVERIFY(tagEnd != -1);
+            QByteArray input = allCases;
+            QByteArray output = allCases;
+            input.replace(nextCursor, 1, "@");
+            const QByteArray tag = allCases.mid(tagStart + 1, tagEnd - tagStart - 1);
+            const int prevNewline = allCases.lastIndexOf('\n', nextCursor);
+            const int regionStart = allCases.lastIndexOf('$', nextCursor);
+            bool hasReplacement = false;
+            if (regionStart != -1 && regionStart > prevNewline) {
+                const int regionEnd = allCases.indexOf('$', regionStart + 1);
+                QVERIFY(regionEnd != -1);
+                const int nextNewline = allCases.indexOf('\n', tagEnd);
+                QVERIFY(nextNewline != -1);
+                const QByteArray replacement
+                    = allCases.mid(tagEnd + 1, nextNewline - tagEnd - 1).trimmed();
+                output.replace(regionStart, regionEnd - regionStart, replacement);
+                hasReplacement = true;
+            }
+            static const auto matcher = [](char c) { return c == '^' || c == '$'; };
+            input.removeIf(matcher);
+            if (hasReplacement) {
+                output.removeIf(matcher);
+                output.prepend("#include <QMetaObject>\n\n");
+            } else {
+                output.clear();
+            }
+            QTest::newRow(tag.data()) << input << output;
+            nextCursor = allCases.indexOf('^', nextCursor + 1);
+        }
+    }
+
+    void test()
+    {
+        QFETCH(QByteArray, input);
+        QFETCH(QByteArray, expected);
+        ConvertToMetaMethodCall factory;
+        QuickFixOperationTest({CppTestDocument::create("file.cpp", input, expected)}, &factory);
+    }
+};
+
+QObject *ConvertToMetaMethodCall::createTest() { return new ConvertToMetaMethodCallTest; }
+
+#endif // WITH_TESTS
+} // namespace
+
+void registerConvertToMetaMethodCallQuickfix()
+{
+    CppQuickFixFactory::registerFactory<ConvertToMetaMethodCall>();
+}
+
+} // namespace CppEditor::Internal
+
+#ifdef WITH_TESTS
+#include <converttometamethodcall.moc>
+#endif
diff --git a/src/plugins/cppeditor/quickfixes/converttometamethodcall.h b/src/plugins/cppeditor/quickfixes/converttometamethodcall.h
new file mode 100644
index 00000000000..e6c309ad134
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/converttometamethodcall.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerConvertToMetaMethodCallQuickfix();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/cppcodegenerationquickfixes.cpp b/src/plugins/cppeditor/quickfixes/cppcodegenerationquickfixes.cpp
new file mode 100644
index 00000000000..7adf62cb815
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/cppcodegenerationquickfixes.cpp
@@ -0,0 +1,5067 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "cppcodegenerationquickfixes.h"
+
+#include "../cppcodestylesettings.h"
+#include "../cppeditortr.h"
+#include "../cpprefactoringchanges.h"
+#include "../insertionpointlocator.h"
+#include "cppquickfix.h"
+#include "cppquickfixhelpers.h"
+#include "cppquickfixprojectsettings.h"
+#include "cppquickfixsettings.h"
+
+#include <cplusplus/Overview.h>
+#include <cplusplus/CppRewriter.h>
+#include <projectexplorer/projecttree.h>
+#include <utils/basetreeview.h>
+#include <utils/treemodel.h>
+
+#include <QApplication>
+#include <QCheckBox>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QMimeData>
+#include <QPushButton>
+#include <QProxyStyle>
+#include <QStyledItemDelegate>
+#include <QTableView>
+#include <QTreeView>
+
+#ifdef WITH_TESTS
+#include "cppquickfix_test.h"
+#include <QAbstractItemModelTester>
+#include <QtTest>
+#endif
+
+using namespace CPlusPlus;
+using namespace ProjectExplorer;
+using namespace TextEditor;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+
+static QStringList toStringList(const QList<Symbol *> names)
+{
+    QStringList list;
+    list.reserve(names.size());
+    for (const auto symbol : names) {
+        const Identifier *const id = symbol->identifier();
+        list << QString::fromUtf8(id->chars(), id->size());
+    }
+    return list;
+}
+
+static QList<Symbol *> getMemberFunctions(const Class *clazz)
+{
+    QList<Symbol *> memberFunctions;
+    for (auto it = clazz->memberBegin(); it != clazz->memberEnd(); ++it) {
+        Symbol *const s = *it;
+        if (!s->identifier() || !s->type())
+            continue;
+        if ((s->asDeclaration() && s->type()->asFunctionType()) || s->asFunction())
+            memberFunctions << s;
+    }
+    return memberFunctions;
+}
+
+static QString symbolAtDifferentLocation(
+    const CppQuickFixInterface &interface,
+    Symbol *symbol,
+    const CppRefactoringFilePtr &targetFile,
+    InsertionLocation targetLocation)
+{
+    QTC_ASSERT(symbol, return QString());
+    Scope *scopeAtInsertPos = targetFile->cppDocument()->scopeAt(targetLocation.line(),
+                                                                 targetLocation.column());
+
+    LookupContext cppContext(targetFile->cppDocument(), interface.snapshot());
+    ClassOrNamespace *cppCoN = cppContext.lookupType(scopeAtInsertPos);
+    if (!cppCoN)
+        cppCoN = cppContext.globalNamespace();
+    SubstitutionEnvironment env;
+    env.setContext(interface.context());
+    env.switchScope(symbol->enclosingScope());
+    UseMinimalNames q(cppCoN);
+    env.enter(&q);
+    Control *control = interface.context().bindings()->control().get();
+    Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
+    return oo.prettyName(LookupContext::minimalName(symbol, cppCoN, control));
+}
+
+static FullySpecifiedType typeAtDifferentLocation(
+    const CppQuickFixInterface &interface,
+    FullySpecifiedType type,
+    Scope *originalScope,
+    const CppRefactoringFilePtr &targetFile,
+    InsertionLocation targetLocation,
+    const QStringList &newNamespaceNamesAtLoc = {})
+{
+    Scope *scopeAtInsertPos = targetFile->cppDocument()->scopeAt(targetLocation.line(),
+                                                                 targetLocation.column());
+    for (const QString &nsName : newNamespaceNamesAtLoc) {
+        const QByteArray utf8Name = nsName.toUtf8();
+        Control *control = targetFile->cppDocument()->control();
+        const Name *name = control->identifier(utf8Name.data(), utf8Name.size());
+        Namespace *ns = control->newNamespace(0, name);
+        ns->setEnclosingScope(scopeAtInsertPos);
+        scopeAtInsertPos = ns;
+    }
+    LookupContext cppContext(targetFile->cppDocument(), interface.snapshot());
+    ClassOrNamespace *cppCoN = cppContext.lookupType(scopeAtInsertPos);
+    if (!cppCoN)
+        cppCoN = cppContext.globalNamespace();
+    SubstitutionEnvironment env;
+    env.setContext(interface.context());
+    env.switchScope(originalScope);
+    UseMinimalNames q(cppCoN);
+    env.enter(&q);
+    Control *control = interface.context().bindings()->control().get();
+    return rewriteType(type, &env, control);
+}
+
+static QString memberBaseName(const QString &name)
+{
+    const auto validName = [](const QString &name) {
+        return !name.isEmpty() && !name.at(0).isDigit();
+    };
+    QString baseName = name;
+
+    CppQuickFixSettings *settings = CppQuickFixProjectsSettings::getQuickFixSettings(
+        ProjectExplorer::ProjectTree::currentProject());
+    const QString &nameTemplate = settings->memberVariableNameTemplate;
+    const QString prefix = nameTemplate.left(nameTemplate.indexOf('<'));
+    const QString postfix = nameTemplate.mid(nameTemplate.lastIndexOf('>') + 1);
+    if (name.startsWith(prefix) && name.endsWith(postfix)) {
+        const QString base = name.mid(prefix.length(), name.length() - postfix.length());
+        if (validName(base))
+            return base;
+    }
+
+    // Remove leading and trailing "_"
+    while (baseName.startsWith(QLatin1Char('_')))
+        baseName.remove(0, 1);
+    while (baseName.endsWith(QLatin1Char('_')))
+        baseName.chop(1);
+    if (baseName != name && validName(baseName))
+        return baseName;
+
+    // If no leading/trailing "_": remove "m_" and "m" prefix
+    if (baseName.startsWith(QLatin1String("m_"))) {
+        baseName.remove(0, 2);
+    } else if (baseName.startsWith(QLatin1Char('m')) && baseName.length() > 1
+               && baseName.at(1).isUpper()) {
+        baseName.remove(0, 1);
+        baseName[0] = baseName.at(0).toLower();
+    }
+
+    return validName(baseName) ? baseName : name;
+}
+
+static std::optional<FullySpecifiedType> getFirstTemplateParameter(const Name *name)
+{
+    if (const QualifiedNameId *qualifiedName = name->asQualifiedNameId())
+        return getFirstTemplateParameter(qualifiedName->name());
+
+    if (const TemplateNameId *templateName = name->asTemplateNameId()) {
+        if (templateName->templateArgumentCount() > 0)
+            return templateName->templateArgumentAt(0).type();
+    }
+    return {};
+}
+
+static std::optional<FullySpecifiedType> getFirstTemplateParameter(Type *type)
+{
+    if (NamedType *namedType = type->asNamedType())
+        return getFirstTemplateParameter(namedType->name());
+
+    return {};
+}
+
+static std::optional<FullySpecifiedType> getFirstTemplateParameter(FullySpecifiedType type)
+{
+    return getFirstTemplateParameter(type.type());
+}
+
+struct ExistingGetterSetterData
+{
+    Class *clazz = nullptr;
+    Declaration *declarationSymbol = nullptr;
+    QString getterName;
+    QString setterName;
+    QString resetName;
+    QString signalName;
+    QString qPropertyName;
+    QString memberVariableName;
+    Document::Ptr doc;
+
+    int computePossibleFlags() const;
+};
+
+// FIXME: Should be a member?
+static void findExistingFunctions(ExistingGetterSetterData &existing, QStringList memberFunctionNames)
+{
+    const CppQuickFixSettings *settings = CppQuickFixProjectsSettings::getQuickFixSettings(
+        ProjectExplorer::ProjectTree::currentProject());
+    const QString lowerBaseName = memberBaseName(existing.memberVariableName).toLower();
+    const QStringList getterNames{lowerBaseName,
+                                  "get_" + lowerBaseName,
+                                  "get" + lowerBaseName,
+                                  "is_" + lowerBaseName,
+                                  "is" + lowerBaseName,
+                                  settings->getGetterName(lowerBaseName)};
+    const QStringList setterNames{"set_" + lowerBaseName,
+                                  "set" + lowerBaseName,
+                                  settings->getSetterName(lowerBaseName)};
+    const QStringList resetNames{"reset_" + lowerBaseName,
+                                 "reset" + lowerBaseName,
+                                 settings->getResetName(lowerBaseName)};
+    const QStringList signalNames{lowerBaseName + "_changed",
+                                  lowerBaseName + "changed",
+                                  settings->getSignalName(lowerBaseName)};
+    for (const auto &memberFunctionName : memberFunctionNames) {
+        const QString lowerName = memberFunctionName.toLower();
+        if (getterNames.contains(lowerName))
+            existing.getterName = memberFunctionName;
+        else if (setterNames.contains(lowerName))
+            existing.setterName = memberFunctionName;
+        else if (resetNames.contains(lowerName))
+            existing.resetName = memberFunctionName;
+        else if (signalNames.contains(lowerName))
+            existing.signalName = memberFunctionName;
+    }
+}
+
+static void extractNames(const CppRefactoringFilePtr &file,
+                  QtPropertyDeclarationAST *qtPropertyDeclaration,
+                  ExistingGetterSetterData &data)
+{
+    QtPropertyDeclarationItemListAST *it = qtPropertyDeclaration->property_declaration_item_list;
+    for (; it; it = it->next) {
+        const char *tokenString = file->tokenAt(it->value->item_name_token).spell();
+        if (!qstrcmp(tokenString, "READ")) {
+            data.getterName = file->textOf(it->value->expression);
+        } else if (!qstrcmp(tokenString, "WRITE")) {
+            data.setterName = file->textOf(it->value->expression);
+        } else if (!qstrcmp(tokenString, "RESET")) {
+            data.resetName = file->textOf(it->value->expression);
+        } else if (!qstrcmp(tokenString, "NOTIFY")) {
+            data.signalName = file->textOf(it->value->expression);
+        } else if (!qstrcmp(tokenString, "MEMBER")) {
+            data.memberVariableName = file->textOf(it->value->expression);
+        }
+    }
+}
+
+class GetterSetterRefactoringHelper
+{
+public:
+    GetterSetterRefactoringHelper(CppQuickFixOperation *operation, Class *clazz)
+        : m_operation(operation)
+        , m_changes(m_operation->snapshot())
+        , m_locator(m_changes)
+        , m_headerFile(operation->currentFile())
+        , m_sourceFile([&] {
+            FilePath cppFilePath = correspondingHeaderOrSource(m_headerFile->filePath(),
+                                                               &m_isHeaderHeaderFile);
+            if (!m_isHeaderHeaderFile || !cppFilePath.exists()) {
+                // there is no "source" file
+                return m_headerFile;
+            } else {
+                return m_changes.cppFile(cppFilePath);
+            }
+        }())
+        , m_class(clazz)
+    {}
+
+    void performGeneration(ExistingGetterSetterData data, int generationFlags);
+
+    void applyChanges()
+    {
+        const auto classLayout = {
+            InsertionPointLocator::Public,
+            InsertionPointLocator::PublicSlot,
+            InsertionPointLocator::Signals,
+            InsertionPointLocator::Protected,
+            InsertionPointLocator::ProtectedSlot,
+            InsertionPointLocator::PrivateSlot,
+            InsertionPointLocator::Private,
+        };
+        for (auto spec : classLayout) {
+            const auto iter = m_headerFileCode.find(spec);
+            if (iter != m_headerFileCode.end()) {
+                const InsertionLocation loc = headerLocationFor(spec);
+                m_headerFile->setOpenEditor(true, m_headerFile->position(loc.line(), loc.column()));
+                insertAndIndent(m_headerFile, loc, *iter);
+            }
+        }
+        if (!m_sourceFileCode.isEmpty() && m_sourceFileInsertionPoint.isValid()) {
+            m_sourceFile->setOpenEditor(true, m_sourceFile->position(
+                                                  m_sourceFileInsertionPoint.line(),
+                                                  m_sourceFileInsertionPoint.column()));
+            insertAndIndent(m_sourceFile, m_sourceFileInsertionPoint, m_sourceFileCode);
+        }
+
+        m_headerFile->apply(m_headerFileChangeSet);
+        m_sourceFile->apply(m_sourceFileChangeSet);
+    }
+
+    bool hasSourceFile() const { return m_headerFile != m_sourceFile; }
+
+protected:
+    void insertAndIndent(const RefactoringFilePtr &file,
+                         const InsertionLocation &loc,
+                         const QString &text)
+    {
+        int targetPosition = file->position(loc.line(), loc.column());
+        ChangeSet &changeSet = file == m_headerFile ? m_headerFileChangeSet : m_sourceFileChangeSet;
+        changeSet.insert(targetPosition, loc.prefix() + text + loc.suffix());
+    }
+
+    FullySpecifiedType makeConstRef(FullySpecifiedType type)
+    {
+        type.setConst(true);
+        return m_operation->currentFile()->cppDocument()->control()->referenceType(type, false);
+    }
+
+    FullySpecifiedType addConstToReference(FullySpecifiedType type)
+    {
+        if (ReferenceType *ref = type.type()->asReferenceType()) {
+            FullySpecifiedType elemType = ref->elementType();
+            if (elemType.isConst())
+                return type;
+            elemType.setConst(true);
+            return m_operation->currentFile()->cppDocument()->control()->referenceType(elemType,
+                                                                                       false);
+        }
+        return type;
+    }
+
+    QString symbolAt(Symbol *symbol,
+                     const CppRefactoringFilePtr &targetFile,
+                     InsertionLocation targetLocation)
+    {
+        return symbolAtDifferentLocation(*m_operation, symbol, targetFile, targetLocation);
+    }
+
+    FullySpecifiedType typeAt(FullySpecifiedType type,
+                              Scope *originalScope,
+                              const CppRefactoringFilePtr &targetFile,
+                              InsertionLocation targetLocation,
+                              const QStringList &newNamespaceNamesAtLoc = {})
+    {
+        return typeAtDifferentLocation(*m_operation,
+                                       type,
+                                       originalScope,
+                                       targetFile,
+                                       targetLocation,
+                                       newNamespaceNamesAtLoc);
+    }
+
+    /**
+     * @brief checks if the type in the enclosing scope in the header is a value type
+     * @param type a type in the m_headerFile
+     * @param enclosingScope the enclosing scope
+     * @param customValueType if not nullptr set to true when value type comes
+     * from CppQuickFixSettings::isValueType
+     * @return true if it is a pointer, enum, integer, floating point, reference, custom value type
+     */
+    bool isValueType(FullySpecifiedType type, Scope *enclosingScope, bool *customValueType = nullptr)
+    {
+        if (customValueType)
+            *customValueType = false;
+        // a type is a value type if it is one of the following
+        const auto isTypeValueType = [](const FullySpecifiedType &t) {
+            return t->asPointerType() || t->asEnumType() || t->asIntegerType() || t->asFloatType()
+                   || t->asReferenceType();
+        };
+        if (type->asNamedType()) {
+            // we need a recursive search and a lookup context
+            LookupContext context(m_headerFile->cppDocument(), m_changes.snapshot());
+            auto isValueType = [settings = m_settings,
+                                &customValueType,
+                                &context,
+                                &isTypeValueType](const Name *name,
+                                                  Scope *scope,
+                                                  auto &isValueType) {
+                // maybe the type is a custom value type by name
+                if (const Identifier *id = name->identifier()) {
+                    if (settings->isValueType(QString::fromUtf8(id->chars(), id->size()))) {
+                        if (customValueType)
+                            *customValueType = true;
+                        return true;
+                    }
+                }
+                // search for the type declaration
+                QList<LookupItem> localLookup = context.lookup(name, scope);
+                for (auto &&i : localLookup) {
+                    if (isTypeValueType(i.type()))
+                        return true;
+                    if (i.type()->asNamedType()) { // check if we have to search recursively
+                        const Name *newName = i.type()->asNamedType()->name();
+                        Scope *newScope = i.declaration()->enclosingScope();
+                        if (Matcher::match(newName, name)
+                            && Matcher::match(newScope->name(), scope->name())) {
+                            continue; // we have found the start location of the search
+                        }
+                        return isValueType(newName, newScope, isValueType);
+                    }
+                    return false;
+                }
+                return false;
+            };
+            // start recursion
+            return isValueType(type->asNamedType()->name(), enclosingScope, isValueType);
+        }
+        return isTypeValueType(type);
+    }
+
+    bool isValueType(Symbol *symbol, bool *customValueType = nullptr)
+    {
+        return isValueType(symbol->type(), symbol->enclosingScope(), customValueType);
+    }
+
+    void addHeaderCode(InsertionPointLocator::AccessSpec spec, QString code)
+    {
+        QString &existing = m_headerFileCode[spec];
+        existing += code;
+        if (!existing.endsWith('\n'))
+            existing += '\n';
+    }
+
+    InsertionLocation headerLocationFor(InsertionPointLocator::AccessSpec spec)
+    {
+        const auto insertionPoint = m_headerInsertionPoints.find(spec);
+        if (insertionPoint != m_headerInsertionPoints.end())
+            return *insertionPoint;
+        const InsertionLocation loc = m_locator.methodDeclarationInClass(
+            m_headerFile->filePath(), m_class, spec,
+            InsertionPointLocator::ForceAccessSpec::Yes);
+        m_headerInsertionPoints.insert(spec, loc);
+        return loc;
+    }
+
+    InsertionLocation sourceLocationFor(Symbol *symbol, QStringList *insertedNamespaces = nullptr)
+    {
+        if (m_sourceFileInsertionPoint.isValid())
+            return m_sourceFileInsertionPoint;
+        m_sourceFileInsertionPoint
+            = insertLocationForMethodDefinition(symbol,
+                                                false,
+                                                m_settings->createMissingNamespacesinCppFile()
+                                                    ? NamespaceHandling::CreateMissing
+                                                    : NamespaceHandling::Ignore,
+                                                m_changes,
+                                                m_sourceFile->filePath(),
+                                                insertedNamespaces);
+        if (m_settings->addUsingNamespaceinCppFile()) {
+            // check if we have to insert a using namespace ...
+            auto requiredNamespaces = getNamespaceNames(
+                symbol->asClass() ? symbol : symbol->enclosingClass());
+            NSCheckerVisitor visitor(m_sourceFile.get(),
+                                     requiredNamespaces,
+                                     m_sourceFile->position(m_sourceFileInsertionPoint.line(),
+                                                            m_sourceFileInsertionPoint.column()));
+            visitor.accept(m_sourceFile->cppDocument()->translationUnit()->ast());
+            if (insertedNamespaces)
+                insertedNamespaces->clear();
+            if (auto rns = visitor.remainingNamespaces(); !rns.empty()) {
+                QString ns = "using namespace ";
+                for (auto &n : rns) {
+                    if (!n.isEmpty()) { // we have to ignore unnamed namespaces
+                        ns += n;
+                        ns += "::";
+                        if (insertedNamespaces)
+                            insertedNamespaces->append(n);
+                    }
+                }
+                ns.resize(ns.size() - 2); // remove last '::'
+                ns += ";\n";
+                const auto &loc = m_sourceFileInsertionPoint;
+                m_sourceFileInsertionPoint = InsertionLocation(loc.filePath(),
+                                                               loc.prefix() + ns,
+                                                               loc.suffix(),
+                                                               loc.line(),
+                                                               loc.column());
+            }
+        }
+        return m_sourceFileInsertionPoint;
+    }
+
+    void addSourceFileCode(QString code)
+    {
+        while (!m_sourceFileCode.isEmpty() && !m_sourceFileCode.endsWith("\n\n"))
+            m_sourceFileCode += '\n';
+        m_sourceFileCode += code;
+    }
+
+protected:
+    CppQuickFixOperation *const m_operation;
+    const CppRefactoringChanges m_changes;
+    const InsertionPointLocator m_locator;
+    const CppRefactoringFilePtr m_headerFile;
+    bool m_isHeaderHeaderFile = false; // the "header" (where the class is defined) can be a source file
+    const CppRefactoringFilePtr m_sourceFile;
+    CppQuickFixSettings *const m_settings = CppQuickFixProjectsSettings::getQuickFixSettings(
+        ProjectTree::currentProject());
+    Class *const m_class;
+
+private:
+    ChangeSet m_headerFileChangeSet;
+    ChangeSet m_sourceFileChangeSet;
+    QMap<InsertionPointLocator::AccessSpec, InsertionLocation> m_headerInsertionPoints;
+    InsertionLocation m_sourceFileInsertionPoint;
+    QString m_sourceFileCode;
+    QMap<InsertionPointLocator::AccessSpec, QString> m_headerFileCode;
+};
+
+struct ParentClassConstructorInfo;
+
+class ConstructorMemberInfo
+{
+public:
+    ConstructorMemberInfo(const QString &name, Symbol *symbol, int numberOfMember)
+        : memberVariableName(name)
+        , parameterName(memberBaseName(name))
+        , symbol(symbol)
+        , type(symbol->type())
+        , numberOfMember(numberOfMember)
+    {}
+    ConstructorMemberInfo(const QString &memberName,
+                          const QString &paramName,
+                          const QString &defaultValue,
+                          Symbol *symbol,
+                          const ParentClassConstructorInfo *parentClassConstructor)
+        : parentClassConstructor(parentClassConstructor)
+        , memberVariableName(memberName)
+        , parameterName(paramName)
+        , defaultValue(defaultValue)
+        , init(defaultValue.isEmpty())
+        , symbol(symbol)
+        , type(symbol->type())
+    {}
+    const ParentClassConstructorInfo *parentClassConstructor = nullptr;
+    QString memberVariableName;
+    QString parameterName;
+    QString defaultValue;
+    bool init = true;
+    bool customValueType; // for the generation later
+    Symbol *symbol; // for the right type later
+    FullySpecifiedType type;
+    int numberOfMember; // first member, second member, ...
+};
+
+class ConstructorParams : public QAbstractTableModel
+{
+    Q_OBJECT
+    std::list<ConstructorMemberInfo> candidates;
+    std::vector<ConstructorMemberInfo *> infos;
+
+    void validateOrder()
+    {
+        // parameters with default values must be at the end
+        bool foundWithDefault = false;
+        for (auto info : infos) {
+            if (info->init) {
+                if (foundWithDefault && info->defaultValue.isEmpty()) {
+                    emit validOrder(false);
+                    return;
+                }
+                foundWithDefault |= !info->defaultValue.isEmpty();
+            }
+        }
+        emit validOrder(true);
+    }
+
+public:
+    enum Column { ShouldInitColumn, MemberNameColumn, ParameterNameColumn, DefaultValueColumn };
+    template<typename... _Args>
+    void emplaceBackParameter(_Args &&...__args)
+    {
+        candidates.emplace_back(std::forward<_Args>(__args)...);
+        infos.push_back(&candidates.back());
+    }
+    const std::vector<ConstructorMemberInfo *> &getInfos() const { return infos; }
+    void addRow(ConstructorMemberInfo *info)
+    {
+        beginInsertRows({}, rowCount(), rowCount());
+        infos.push_back(info);
+        endInsertRows();
+        validateOrder();
+    }
+    void removeRow(ConstructorMemberInfo *info)
+    {
+        for (auto iter = infos.begin(); iter != infos.end(); ++iter) {
+            if (*iter == info) {
+                const auto index = iter - infos.begin();
+                beginRemoveRows({}, index, index);
+                infos.erase(iter);
+                endRemoveRows();
+                validateOrder();
+                return;
+            }
+        }
+    }
+
+    int selectedCount() const
+    {
+        return Utils::count(infos, [](const ConstructorMemberInfo *mi) {
+            return mi->init && !mi->parentClassConstructor;
+        });
+    }
+    int memberCount() const
+    {
+        return Utils::count(infos, [](const ConstructorMemberInfo *mi) {
+            return !mi->parentClassConstructor;
+        });
+    }
+
+    int rowCount(const QModelIndex & /*parent*/ = {}) const override { return int(infos.size()); }
+    int columnCount(const QModelIndex & /*parent*/ = {}) const override { return 4; }
+    QVariant data(const QModelIndex &index, int role) const override
+    {
+        if (index.row() < 0 || index.row() >= rowCount())
+            return {};
+        if (role == Qt::CheckStateRole && index.column() == ShouldInitColumn
+            && !infos[index.row()]->parentClassConstructor)
+            return infos[index.row()]->init ? Qt::Checked : Qt::Unchecked;
+        if (role == Qt::DisplayRole && index.column() == MemberNameColumn)
+            return infos[index.row()]->memberVariableName;
+        if ((role == Qt::DisplayRole || role == Qt::EditRole)
+            && index.column() == ParameterNameColumn)
+            return infos[index.row()]->parameterName;
+        if ((role == Qt::DisplayRole || role == Qt::EditRole)
+            && index.column() == DefaultValueColumn)
+            return infos[index.row()]->defaultValue;
+        if ((role == Qt::ToolTipRole) && index.column() > 0)
+            return Overview{}.prettyType(infos[index.row()]->symbol->type());
+        return {};
+    }
+    bool setData(const QModelIndex &index, const QVariant &value, int role) override
+    {
+        if (index.column() == ShouldInitColumn && role == Qt::CheckStateRole) {
+            if (infos[index.row()]->parentClassConstructor)
+                return false;
+            infos[index.row()]->init = value.toInt() == Qt::Checked;
+            emit dataChanged(this->index(index.row(), 0), this->index(index.row(), columnCount()));
+            validateOrder();
+            return true;
+        }
+        if (index.column() == ParameterNameColumn && role == Qt::EditRole) {
+            infos[index.row()]->parameterName = value.toString();
+            return true;
+        }
+        if (index.column() == DefaultValueColumn && role == Qt::EditRole) {
+            infos[index.row()]->defaultValue = value.toString();
+            validateOrder();
+            return true;
+        }
+        return false;
+    }
+    Qt::DropActions supportedDropActions() const override { return Qt::MoveAction; }
+    Qt::ItemFlags flags(const QModelIndex &index) const override
+    {
+        if (!index.isValid())
+            return Qt::ItemIsSelectable | Qt::ItemIsDropEnabled;
+
+        Qt::ItemFlags f{};
+        if (infos[index.row()]->init) {
+            f |= Qt::ItemIsDragEnabled;
+            f |= Qt::ItemIsSelectable;
+        }
+
+        if (index.column() == ShouldInitColumn && !infos[index.row()]->parentClassConstructor)
+            return f | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable;
+        if (!infos[index.row()]->init)
+            return f;
+        if (index.column() == MemberNameColumn)
+            return f | Qt::ItemIsEnabled;
+        if (index.column() == ParameterNameColumn || index.column() == DefaultValueColumn)
+            return f | Qt::ItemIsEnabled | Qt::ItemIsEditable;
+        return {};
+    }
+
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const override
+    {
+        if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
+            switch (section) {
+            case ShouldInitColumn:
+                return Tr::tr("Initialize in Constructor");
+            case MemberNameColumn:
+                return Tr::tr("Member Name");
+            case ParameterNameColumn:
+                return Tr::tr("Parameter Name");
+            case DefaultValueColumn:
+                return Tr::tr("Default Value");
+            }
+        }
+        return {};
+    }
+    bool dropMimeData(const QMimeData *data,
+                      Qt::DropAction /*action*/,
+                      int row,
+                      int /*column*/,
+                      const QModelIndex & /*parent*/) override
+    {
+        if (row == -1)
+            row = rowCount();
+        bool ok;
+        int sourceRow = data->data("application/x-qabstractitemmodeldatalist").toInt(&ok);
+        if (ok) {
+            if (sourceRow == row || row == sourceRow + 1)
+                return false;
+            beginMoveRows({}, sourceRow, sourceRow, {}, row);
+            infos.insert(infos.begin() + row, infos.at(sourceRow));
+            if (row < sourceRow)
+                ++sourceRow;
+            infos.erase(infos.begin() + sourceRow);
+            validateOrder();
+            return true;
+        }
+        return false;
+    }
+
+    QMimeData *mimeData(const QModelIndexList &indexes) const override
+    {
+        for (const auto &i : indexes) {
+            if (!i.isValid())
+                continue;
+            auto data = new QMimeData();
+            data->setData("application/x-qabstractitemmodeldatalist",
+                          QString::number(i.row()).toLatin1());
+            return data;
+        }
+        return nullptr;
+    }
+
+    class TableViewStyle : public QProxyStyle
+    {
+    public:
+        TableViewStyle(QStyle *style)
+            : QProxyStyle(style)
+        {}
+
+        void drawPrimitive(PrimitiveElement element,
+                           const QStyleOption *option,
+                           QPainter *painter,
+                           const QWidget *widget) const override
+        {
+            if (element == QStyle::PE_IndicatorItemViewItemDrop && !option->rect.isNull()) {
+                QStyleOption opt(*option);
+                opt.rect.setLeft(0);
+                if (widget)
+                    opt.rect.setRight(widget->width());
+                QProxyStyle::drawPrimitive(element, &opt, painter, widget);
+                return;
+            }
+            QProxyStyle::drawPrimitive(element, option, painter, widget);
+        }
+    };
+signals:
+    void validOrder(bool valid);
+};
+
+class TopMarginDelegate : public QStyledItemDelegate
+{
+public:
+    TopMarginDelegate(QObject *parent = nullptr)
+        : QStyledItemDelegate(parent)
+    {}
+
+    void paint(QPainter *painter,
+               const QStyleOptionViewItem &option,
+               const QModelIndex &index) const override
+    {
+        Q_ASSERT(index.isValid());
+        QStyleOptionViewItem opt = option;
+        initStyleOption(&opt, index);
+        const QWidget *widget = option.widget;
+        QStyle *style = widget ? widget->style() : QApplication::style();
+        if (opt.rect.height() > 20)
+            opt.rect.adjust(0, 5, 0, 0);
+        style->drawControl(QStyle::CE_ItemViewItem, &opt, painter, widget);
+    }
+};
+
+struct ParentClassConstructorParameter : public ConstructorMemberInfo
+{
+    QString originalDefaultValue;
+    QString declaration; // displayed in the treeView
+    ParentClassConstructorParameter(const QString &name,
+                                    const QString &defaultValue,
+                                    Symbol *symbol,
+                                    const ParentClassConstructorInfo *parentClassConstructor);
+
+    ParentClassConstructorParameter(const ParentClassConstructorParameter &) = delete;
+    ParentClassConstructorParameter(ParentClassConstructorParameter &&) = default;
+};
+
+struct ParentClassConstructorInfo
+{
+    ParentClassConstructorInfo(const QString &name, ConstructorParams &model)
+        : className(name)
+        , model(model)
+    {}
+    bool useInConstructor = false;
+    const QString className;
+    QString declaration;
+    std::vector<ParentClassConstructorParameter> parameters;
+    ConstructorParams &model;
+
+    ParentClassConstructorInfo(const ParentClassConstructorInfo &) = delete;
+    ParentClassConstructorInfo(ParentClassConstructorInfo &&) = default;
+
+    void addParameter(ParentClassConstructorParameter &param) { model.addRow(&param); }
+    void removeParameter(ParentClassConstructorParameter &param) { model.removeRow(&param); }
+    void removeAllParameters()
+    {
+        for (auto &param : parameters)
+            model.removeRow(&param);
+    }
+};
+
+ParentClassConstructorParameter::ParentClassConstructorParameter(
+    const QString &name,
+    const QString &defaultValue,
+    Symbol *symbol,
+    const ParentClassConstructorInfo *parentClassConstructor)
+    : ConstructorMemberInfo(parentClassConstructor->className + "::" + name,
+                            name,
+                            defaultValue,
+                            symbol,
+                            parentClassConstructor)
+    , originalDefaultValue(defaultValue)
+    , declaration(Overview{}.prettyType(symbol->type(), name)
+                  + (defaultValue.isEmpty() ? QString{} : " = " + defaultValue))
+{}
+
+using ParentClassConstructors = std::vector<ParentClassConstructorInfo>;
+
+class ParentClassesModel : public QAbstractItemModel
+{
+    ParentClassConstructors &constructors;
+
+public:
+    ParentClassesModel(QObject *parent, ParentClassConstructors &constructors)
+        : QAbstractItemModel(parent)
+        , constructors(constructors)
+    {}
+    QModelIndex index(int row, int column, const QModelIndex &parent = {}) const override
+    {
+        if (!parent.isValid())
+            return createIndex(row, column, nullptr);
+        if (parent.internalPointer())
+            return {};
+        auto index = createIndex(row, column, &constructors.at(parent.row()));
+        return index;
+    }
+    QModelIndex parent(const QModelIndex &index) const override
+    {
+        if (!index.isValid())
+            return {};
+        auto *parent = static_cast<ParentClassConstructorInfo *>(index.internalPointer());
+        if (!parent)
+            return {};
+        int i = 0;
+        for (const auto &info : constructors) {
+            if (&info == parent)
+                return createIndex(i, 0, nullptr);
+            ++i;
+        }
+        return {};
+    }
+    int rowCount(const QModelIndex &parent = {}) const override
+    {
+        if (!parent.isValid())
+            return static_cast<int>(constructors.size());
+        auto info = static_cast<ParentClassConstructorInfo *>(parent.internalPointer());
+        if (!info)
+            return static_cast<int>(constructors.at(parent.row()).parameters.size());
+        return 0;
+    }
+    int columnCount(const QModelIndex & /*parent*/ = {}) const override { return 1; }
+    QVariant data(const QModelIndex &index, int role) const override
+    {
+        if (!index.isValid())
+            return {};
+        auto info = static_cast<ParentClassConstructorInfo *>(index.internalPointer());
+
+        if (info) {
+            const auto &parameter = info->parameters.at(index.row());
+            if (role == Qt::CheckStateRole)
+                return parameter.init ? Qt::Checked : Qt::Unchecked;
+            if (role == Qt::DisplayRole)
+                return parameter.declaration;
+            return {};
+        }
+        const auto &constructor = constructors.at(index.row());
+        if (role == Qt::CheckStateRole)
+            return constructor.useInConstructor ? Qt::PartiallyChecked : Qt::Unchecked;
+        if (role == Qt::DisplayRole)
+            return constructor.declaration;
+
+        // Highlight the selected items
+        if (role == Qt::FontRole && constructor.useInConstructor) {
+            QFont font = QApplication::font();
+            font.setBold(true);
+            return font;
+        }
+        // Create a margin between sets of constructors for base classes
+        if (role == Qt::SizeHintRole && index.row() > 0
+            && constructor.className != constructors.at(index.row() - 1).className) {
+            return QSize(-1, 25);
+        }
+        return {};
+    }
+    bool setData(const QModelIndex &index, const QVariant &value, int /*role*/) override
+    {
+        if (index.isValid() && index.column() == 0) {
+            auto info = static_cast<ParentClassConstructorInfo *>(index.internalPointer());
+            if (info) {
+                const bool nowUse = value.toBool();
+                auto &param = info->parameters.at(index.row());
+                param.init = nowUse;
+                if (nowUse)
+                    info->addParameter(param);
+                else
+                    info->removeParameter(param);
+                return true;
+            }
+            auto &newConstructor = constructors.at(index.row());
+            // You have to select a base class constructor
+            if (newConstructor.useInConstructor)
+                return false;
+            auto c = std::find_if(constructors.begin(), constructors.end(), [&](const auto &c) {
+                return c.className == newConstructor.className && c.useInConstructor;
+            });
+            QTC_ASSERT(c == constructors.end(), return false;);
+            c->useInConstructor = false;
+            newConstructor.useInConstructor = true;
+            emit dataChanged(this->index(index.row(), 0), this->index(index.row(), columnCount()));
+            auto parentIndex = this->index(index.row(), 0);
+            emit dataChanged(this->index(0, 0, parentIndex),
+                             this->index(rowCount(parentIndex), columnCount()));
+            const int oldIndex = c - constructors.begin();
+            emit dataChanged(this->index(oldIndex, 0), this->index(oldIndex, columnCount()));
+            parentIndex = this->index(oldIndex, 0);
+            emit dataChanged(this->index(0, 0, parentIndex),
+                             this->index(rowCount(parentIndex), columnCount()));
+            // update other table
+            c->removeAllParameters();
+            for (auto &p : newConstructor.parameters)
+                if (p.init)
+                    newConstructor.addParameter(p);
+            return true;
+        }
+        return false;
+    }
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const override
+    {
+        if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
+            switch (section) {
+            case 0:
+                return Tr::tr("Base Class Constructors");
+            }
+        }
+        return {};
+    }
+    Qt::ItemFlags flags(const QModelIndex &index) const override
+    {
+        if (index.isValid()) {
+            Qt::ItemFlags f;
+            auto info = static_cast<ParentClassConstructorInfo *>(index.internalPointer());
+            if (!info || info->useInConstructor) {
+                f |= Qt::ItemIsEnabled;
+            }
+            f |= Qt::ItemIsUserCheckable;
+
+            return f;
+        }
+        return {};
+    }
+};
+
+class GenerateConstructorDialog : public QDialog
+{
+public:
+    GenerateConstructorDialog(ConstructorParams *constructorParamsModel,
+                              ParentClassConstructors &constructors)
+    {
+        setWindowTitle(Tr::tr("Constructor"));
+
+        const auto treeModel = new ParentClassesModel(this, constructors);
+        const auto treeView = new QTreeView(this);
+        treeView->setModel(treeModel);
+        treeView->setItemDelegate(new TopMarginDelegate(this));
+        treeView->expandAll();
+
+        const auto view = new QTableView(this);
+        view->setModel(constructorParamsModel);
+        int optimalWidth = 0;
+        for (int i = 0; i < constructorParamsModel->columnCount(QModelIndex{}); ++i) {
+            view->resizeColumnToContents(i);
+            optimalWidth += view->columnWidth(i);
+        }
+        view->resizeRowsToContents();
+        view->verticalHeader()->setDefaultSectionSize(view->rowHeight(0));
+        view->setSelectionBehavior(QAbstractItemView::SelectRows);
+        view->setSelectionMode(QAbstractItemView::SingleSelection);
+        view->setDragEnabled(true);
+        view->setDropIndicatorShown(true);
+        view->setDefaultDropAction(Qt::MoveAction);
+        view->setDragDropMode(QAbstractItemView::InternalMove);
+        view->setDragDropOverwriteMode(false);
+        view->horizontalHeader()->setStretchLastSection(true);
+        view->setStyle(new ConstructorParams::TableViewStyle(view->style()));
+
+        const auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+        connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+        connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+
+        const auto errorLabel = new QLabel(
+            Tr::tr("Parameters without default value must come before parameters with default value."));
+        errorLabel->setStyleSheet("color: #ff0000");
+        errorLabel->setVisible(false);
+        QSizePolicy labelSizePolicy = errorLabel->sizePolicy();
+        labelSizePolicy.setRetainSizeWhenHidden(true);
+        errorLabel->setSizePolicy(labelSizePolicy);
+        connect(constructorParamsModel, &ConstructorParams::validOrder, this,
+                [errorLabel, button = buttonBox->button(QDialogButtonBox::Ok)](bool valid) {
+                    button->setEnabled(valid);
+                    errorLabel->setVisible(!valid);
+                });
+
+        // setup select all/none checkbox
+        QCheckBox *const checkBox = new QCheckBox(Tr::tr("Initialize all members"));
+        checkBox->setChecked(true);
+        connect(checkBox, &QCheckBox::stateChanged, this,
+                [model = constructorParamsModel](int state) {
+                    if (state != Qt::PartiallyChecked) {
+                        for (int i = 0; i < model->rowCount(); ++i)
+                            model->setData(model->index(i, ConstructorParams::ShouldInitColumn),
+                                           state,
+                                           Qt::CheckStateRole);
+                    }
+                });
+        connect(checkBox, &QCheckBox::clicked, this, [checkBox] {
+            if (checkBox->checkState() == Qt::PartiallyChecked)
+                checkBox->setCheckState(Qt::Checked);
+        });
+        connect(constructorParamsModel,
+                &QAbstractItemModel::dataChanged,
+                this,
+                [model = constructorParamsModel, checkBox] {
+                    const auto state = [model, selectedCount = model->selectedCount()]() {
+                        if (selectedCount == 0)
+                            return Qt::Unchecked;
+                        if (static_cast<int>(model->memberCount() == selectedCount))
+                            return Qt::Checked;
+                        return Qt::PartiallyChecked;
+                    }();
+                    checkBox->setCheckState(state);
+                });
+
+        using A = InsertionPointLocator::AccessSpec;
+        auto accessCombo = new QComboBox;
+        connect(accessCombo, &QComboBox::currentIndexChanged, this, [this, accessCombo] {
+            const auto data = accessCombo->currentData();
+            m_accessSpec = static_cast<A>(data.toInt());
+        });
+        for (auto a : {A::Public, A::Protected, A::Private})
+            accessCombo->addItem(InsertionPointLocator::accessSpecToString(a), a);
+        const auto row = new QHBoxLayout();
+        row->addWidget(new QLabel(Tr::tr("Access") + ":"));
+        row->addWidget(accessCombo);
+        row->addSpacerItem(new QSpacerItem(1, 1, QSizePolicy::Expanding, QSizePolicy::Minimum));
+
+        const auto mainLayout = new QVBoxLayout(this);
+        mainLayout->addWidget(
+            new QLabel(Tr::tr("Select the members to be initialized in the constructor.\n"
+                              "Use drag and drop to change the order of the parameters.")));
+        mainLayout->addLayout(row);
+        mainLayout->addWidget(checkBox);
+        mainLayout->addWidget(view);
+        mainLayout->addWidget(treeView);
+        mainLayout->addWidget(errorLabel);
+        mainLayout->addWidget(buttonBox);
+        int left, right;
+        mainLayout->getContentsMargins(&left, nullptr, &right, nullptr);
+        optimalWidth += left + right;
+        resize(optimalWidth, mainLayout->sizeHint().height());
+    }
+
+    InsertionPointLocator::AccessSpec accessSpec() const { return m_accessSpec; }
+
+private:
+    InsertionPointLocator::AccessSpec m_accessSpec;
+};
+
+class MemberInfo
+{
+public:
+    MemberInfo(ExistingGetterSetterData data, int possibleFlags)
+        : data(data)
+        , possibleFlags(possibleFlags)
+    {}
+
+    ExistingGetterSetterData data;
+    int possibleFlags;
+    int requestedFlags = 0;
+};
+using GetterSetterCandidates = std::vector<MemberInfo>;
+
+class GenerateConstructorOperation : public CppQuickFixOperation
+{
+public:
+    GenerateConstructorOperation(const CppQuickFixInterface &interface)
+        : CppQuickFixOperation(interface)
+    {
+        setDescription(Tr::tr("Generate Constructor"));
+
+        m_classAST = astForClassOperations(interface);
+        if (!m_classAST)
+            return;
+        Class *const theClass = m_classAST->symbol;
+        if (!theClass)
+            return;
+
+        // Go through all members and find member variable declarations
+        int memberCounter = 0;
+        for (auto it = theClass->memberBegin(); it != theClass->memberEnd(); ++it) {
+            Symbol *const s = *it;
+            if (!s->identifier() || !s->type() || s->type().isTypedef())
+                continue;
+            if ((s->asDeclaration() && s->type()->asFunctionType()) || s->asFunction())
+                continue;
+            if (s->asDeclaration() && (s->isPrivate() || s->isProtected()) && !s->isStatic()) {
+                const auto name = QString::fromUtf8(s->identifier()->chars(),
+                                                    s->identifier()->size());
+                parameterModel.emplaceBackParameter(name, s, memberCounter++);
+            }
+        }
+        Overview o = CppCodeStyleSettings::currentProjectCodeStyleOverview();
+        o.showArgumentNames = true;
+        o.showReturnTypes = true;
+        o.showDefaultArguments = true;
+        o.showTemplateParameters = true;
+        o.showFunctionSignatures = true;
+        LookupContext context(currentFile()->cppDocument(), interface.snapshot());
+        for (BaseClass *bc : theClass->baseClasses()) {
+            const QString className = o.prettyName(bc->name());
+
+            ClassOrNamespace *localLookupType = context.lookupType(bc);
+            QList<LookupItem> localLookup = localLookupType->lookup(bc->name());
+            for (auto &li : localLookup) {
+                Symbol *d = li.declaration();
+                if (!d->asClass())
+                    continue;
+                for (auto i = d->asClass()->memberBegin(); i != d->asClass()->memberEnd(); ++i) {
+                    Symbol *s = *i;
+                    if (s->isProtected() || s->isPublic()) {
+                        if (s->name()->match(d->name())) {
+                            // we have found a constructor
+                            Function *func = s->type().type()->asFunctionType();
+                            if (!func)
+                                continue;
+                            const bool isFirst = parentClassConstructors.empty()
+                                                 || parentClassConstructors.back().className
+                                                        != className;
+                            parentClassConstructors.emplace_back(className, parameterModel);
+                            ParentClassConstructorInfo &constructor = parentClassConstructors.back();
+                            constructor.declaration = className + o.prettyType(func->type());
+                            constructor.declaration.replace("std::__1::__get_nullptr_t()",
+                                                            "nullptr");
+                            constructor.useInConstructor = isFirst;
+                            for (auto arg = func->memberBegin(); arg != func->memberEnd(); ++arg) {
+                                Symbol *param = *arg;
+                                Argument *argument = param->asArgument();
+                                if (!argument) // can also be a block
+                                    continue;
+                                const QString name = o.prettyName(param->name());
+                                const StringLiteral *ini = argument->initializer();
+                                QString defaultValue;
+                                if (ini)
+                                    defaultValue = QString::fromUtf8(ini->chars(), ini->size())
+                                                       .replace("std::__1::__get_nullptr_t()",
+                                                                "nullptr");
+                                constructor.parameters.emplace_back(name,
+                                                                    defaultValue,
+                                                                    param,
+                                                                    &constructor);
+                                // do not show constructors like QObject(QObjectPrivate & dd, ...)
+                                ReferenceType *ref = param->type()->asReferenceType();
+                                if (ref && name == "dd") {
+                                    auto type = o.prettyType(ref->elementType());
+                                    if (type.startsWith("Q") && type.endsWith("Private")) {
+                                        parentClassConstructors.pop_back();
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // add params to parameter lists
+        for (auto &c : parentClassConstructors)
+            if (c.useInConstructor)
+                for (auto &p : c.parameters)
+                    if (p.init)
+                        c.addParameter(p);
+    }
+
+    bool isApplicable() const
+    {
+        return parameterModel.rowCount() > 0
+               || Utils::anyOf(parentClassConstructors,
+                               [](const auto &parent) { return !parent.parameters.empty(); });
+    }
+
+    void setTest(bool isTest = true) { m_test = isTest; }
+
+private:
+    void perform() override
+    {
+        auto infos = parameterModel.getInfos();
+
+        InsertionPointLocator::AccessSpec accessSpec = InsertionPointLocator::Public;
+        if (!m_test) {
+            GenerateConstructorDialog dlg(&parameterModel, parentClassConstructors);
+            if (dlg.exec() == QDialog::Rejected)
+                return;
+            accessSpec = dlg.accessSpec();
+            infos = parameterModel.getInfos();
+        } else {
+#ifdef WITH_TESTS
+            ParentClassesModel model(nullptr, parentClassConstructors);
+            QAbstractItemModelTester tester(&model);
+#endif
+            if (infos.size() >= 3) {
+                // if we are testing and have 3 or more members => change the order
+                // move first element to the back
+                infos.push_back(infos[0]);
+                infos.erase(infos.begin());
+            }
+            for (auto info : infos) {
+                if (info->memberVariableName.startsWith("di_"))
+                    info->defaultValue = "42";
+            }
+            for (auto &c : parentClassConstructors) {
+                if (c.useInConstructor) {
+                    for (auto &p : c.parameters) {
+                        if (!p.init && p.parameterName.startsWith("use_")) {
+                            infos.push_back(&p);
+                            p.init = true;
+                        }
+                    }
+                }
+            }
+        }
+        if (infos.empty())
+            return;
+        struct GenerateConstructorRefactoringHelper : public GetterSetterRefactoringHelper
+        {
+            const ClassSpecifierAST *m_classAST;
+            InsertionPointLocator::AccessSpec m_accessSpec;
+            GenerateConstructorRefactoringHelper(CppQuickFixOperation *operation,
+                                                 Class *clazz,
+                                                 const ClassSpecifierAST *classAST,
+                                                 InsertionPointLocator::AccessSpec accessSpec)
+                : GetterSetterRefactoringHelper(operation, clazz)
+                , m_classAST(classAST)
+                , m_accessSpec(accessSpec)
+            {}
+            void generateConstructor(std::vector<ConstructorMemberInfo *> members,
+                                     const ParentClassConstructors &parentClassConstructors)
+            {
+                auto constructorLocation = m_settings->determineSetterLocation(int(members.size()));
+                if (constructorLocation == CppQuickFixSettings::FunctionLocation::CppFile
+                    && !hasSourceFile())
+                    constructorLocation = CppQuickFixSettings::FunctionLocation::OutsideClass;
+
+                Overview overview = CppCodeStyleSettings::currentProjectCodeStyleOverview();
+                overview.showTemplateParameters = true;
+
+                InsertionLocation implLoc;
+                QString implCode;
+                CppRefactoringFilePtr implFile;
+                QString className = overview.prettyName(m_class->name());
+                QStringList insertedNamespaces;
+                if (constructorLocation == CppQuickFixSettings::FunctionLocation::CppFile) {
+                    implLoc = sourceLocationFor(m_class, &insertedNamespaces);
+                    implFile = m_sourceFile;
+                    if (m_settings->rewriteTypesinCppFile())
+                        implCode = symbolAt(m_class, m_sourceFile, implLoc);
+                    else
+                        implCode = className;
+                    implCode += "::" + className + "(";
+                } else if (constructorLocation
+                           == CppQuickFixSettings::FunctionLocation::OutsideClass) {
+                    implLoc = insertLocationForMethodDefinition(m_class,
+                                                                false,
+                                                                NamespaceHandling::Ignore,
+                                                                m_changes,
+                                                                m_headerFile->filePath(),
+                                                                &insertedNamespaces);
+                    implFile = m_headerFile;
+                    implCode = symbolAt(m_class, m_headerFile, implLoc);
+                    implCode += "::" + className + "(";
+                }
+
+                QString inClassDeclaration = overview.prettyName(m_class->name()) + "(";
+                QString constructorBody = members.empty() ? QString(") {}") : QString(") : ");
+                for (auto &member : members) {
+                    if (isValueType(member->symbol, &member->customValueType))
+                        member->type.setConst(false);
+                    else
+                        member->type = makeConstRef(member->type);
+
+                    inClassDeclaration += overview.prettyType(member->type, member->parameterName);
+                    if (!member->defaultValue.isEmpty())
+                        inClassDeclaration += " = " + member->defaultValue;
+                    inClassDeclaration += ", ";
+                    if (implFile) {
+                        FullySpecifiedType type = typeAt(member->type,
+                                                         m_class,
+                                                         implFile,
+                                                         implLoc,
+                                                         insertedNamespaces);
+                        implCode += overview.prettyType(type, member->parameterName) + ", ";
+                    }
+                }
+                Utils::sort(members, &ConstructorMemberInfo::numberOfMember);
+                // first, do the base classes
+                for (const auto &parent : parentClassConstructors) {
+                    if (!parent.useInConstructor)
+                        continue;
+                    // Check if we really need a constructor
+                    if (Utils::anyOf(parent.parameters, [](const auto &param) {
+                            return param.init || param.originalDefaultValue.isEmpty();
+                        })) {
+                        int defaultAtEndCount = 0;
+                        for (auto i = parent.parameters.crbegin(); i != parent.parameters.crend();
+                             ++i) {
+                            if (i->init || i->originalDefaultValue.isEmpty())
+                                break;
+                            ++defaultAtEndCount;
+                        }
+                        const int numberOfParameters = static_cast<int>(parent.parameters.size())
+                                                       - defaultAtEndCount;
+                        constructorBody += parent.className + "(";
+                        int counter = 0;
+                        for (const auto &param : parent.parameters) {
+                            if (++counter > numberOfParameters)
+                                break;
+                            if (param.init) {
+                                if (param.customValueType)
+                                    constructorBody += "std::move(" + param.parameterName + ')';
+                                else
+                                    constructorBody += param.parameterName;
+                            } else if (!param.originalDefaultValue.isEmpty())
+                                constructorBody += param.originalDefaultValue;
+                            else
+                                constructorBody += "/* insert value */";
+                            constructorBody += ", ";
+                        }
+                        constructorBody.resize(constructorBody.length() - 2);
+                        constructorBody += "),\n";
+                    }
+                }
+                for (auto &member : members) {
+                    if (member->parentClassConstructor)
+                        continue;
+                    QString param = member->parameterName;
+                    if (member->customValueType)
+                        param = "std::move(" + member->parameterName + ')';
+                    constructorBody += member->memberVariableName + '(' + param + "),\n";
+                }
+                if (!members.empty()) {
+                    inClassDeclaration.resize(inClassDeclaration.length() - 2);
+                    constructorBody.remove(constructorBody.length() - 2, 1); // ..),\n => ..)\n
+                    constructorBody += "{}";
+                    if (!implCode.isEmpty())
+                        implCode.resize(implCode.length() - 2);
+                }
+                implCode += constructorBody;
+
+                if (constructorLocation == CppQuickFixSettings::FunctionLocation::InsideClass)
+                    inClassDeclaration += constructorBody;
+                else
+                    inClassDeclaration += QLatin1String(");");
+
+                TranslationUnit *tu = m_headerFile->cppDocument()->translationUnit();
+                insertAndIndent(m_headerFile,
+                                m_locator.constructorDeclarationInClass(tu,
+                                                                        m_classAST,
+                                                                        m_accessSpec,
+                                                                        int(members.size())),
+                                inClassDeclaration);
+
+                if (constructorLocation == CppQuickFixSettings::FunctionLocation::CppFile) {
+                    addSourceFileCode(implCode);
+                } else if (constructorLocation
+                           == CppQuickFixSettings::FunctionLocation::OutsideClass) {
+                    if (m_isHeaderHeaderFile)
+                        implCode.prepend("inline ");
+                    insertAndIndent(m_headerFile, implLoc, implCode);
+                }
+            }
+        };
+        GenerateConstructorRefactoringHelper helper(this,
+                                                    m_classAST->symbol,
+                                                    m_classAST,
+                                                    accessSpec);
+
+        auto members = Utils::filtered(infos, [](const auto mi) {
+            return mi->init || mi->parentClassConstructor;
+        });
+        helper.generateConstructor(std::move(members), parentClassConstructors);
+        helper.applyChanges();
+    }
+
+    ConstructorParams parameterModel;
+    ParentClassConstructors parentClassConstructors;
+    const ClassSpecifierAST *m_classAST = nullptr;
+    bool m_test = false;
+};
+
+class GenerateGetterSetterOp : public CppQuickFixOperation
+{
+public:
+    enum GenerateFlag {
+        GenerateGetter = 1 << 0,
+        GenerateSetter = 1 << 1,
+        GenerateSignal = 1 << 2,
+        GenerateMemberVariable = 1 << 3,
+        GenerateReset = 1 << 4,
+        GenerateProperty = 1 << 5,
+        GenerateConstantProperty = 1 << 6,
+        HaveExistingQProperty = 1 << 7,
+        Invalid = -1,
+    };
+
+    GenerateGetterSetterOp(const CppQuickFixInterface &interface,
+                           ExistingGetterSetterData data,
+                           int generateFlags,
+                           int priority,
+                           const QString &description)
+        : CppQuickFixOperation(interface)
+        , m_generateFlags(generateFlags)
+        , m_data(data)
+    {
+        setDescription(description);
+        setPriority(priority);
+    }
+
+    static void generateQuickFixes(QuickFixOperations &results,
+                                   const CppQuickFixInterface &interface,
+                                   const ExistingGetterSetterData &data,
+                                   const int possibleFlags)
+    {
+        // flags can have the value HaveExistingQProperty or a combination of all other values
+        // of the enum 'GenerateFlag'
+        int p = 0;
+        if (possibleFlags & HaveExistingQProperty) {
+            const QString desc = Tr::tr("Generate Missing Q_PROPERTY Members");
+            results << new GenerateGetterSetterOp(interface, data, possibleFlags, ++p, desc);
+        } else {
+            if (possibleFlags & GenerateSetter) {
+                const QString desc = Tr::tr("Generate Setter");
+                results << new GenerateGetterSetterOp(interface, data, GenerateSetter, ++p, desc);
+            }
+            if (possibleFlags & GenerateGetter) {
+                const QString desc = Tr::tr("Generate Getter");
+                results << new GenerateGetterSetterOp(interface, data, GenerateGetter, ++p, desc);
+            }
+            if (possibleFlags & GenerateGetter && possibleFlags & GenerateSetter) {
+                const QString desc = Tr::tr("Generate Getter and Setter");
+                const int flags = GenerateGetter | GenerateSetter;
+                results << new GenerateGetterSetterOp(interface, data, flags, ++p, desc);
+            }
+
+            if (possibleFlags & GenerateConstantProperty) {
+                const QString desc = Tr::tr("Generate Constant Q_PROPERTY and Missing Members");
+                const int flags = possibleFlags & ~(GenerateSetter | GenerateSignal | GenerateReset);
+                results << new GenerateGetterSetterOp(interface, data, flags, ++p, desc);
+            }
+            if (possibleFlags & GenerateProperty) {
+                if (possibleFlags & GenerateReset) {
+                    const QString desc = Tr::tr(
+                        "Generate Q_PROPERTY and Missing Members with Reset Function");
+                    const int flags = possibleFlags & ~GenerateConstantProperty;
+                    results << new GenerateGetterSetterOp(interface, data, flags, ++p, desc);
+                }
+                const QString desc = Tr::tr("Generate Q_PROPERTY and Missing Members");
+                const int flags = possibleFlags & ~GenerateConstantProperty & ~GenerateReset;
+                results << new GenerateGetterSetterOp(interface, data, flags, ++p, desc);
+            }
+        }
+    }
+
+    void perform() override
+    {
+        GetterSetterRefactoringHelper helper(this, m_data.clazz);
+        helper.performGeneration(m_data, m_generateFlags);
+        helper.applyChanges();
+    }
+
+private:
+    int m_generateFlags;
+    ExistingGetterSetterData m_data;
+};
+
+class CandidateTreeItem : public TreeItem
+{
+public:
+    enum Column {
+        NameColumn,
+        GetterColumn,
+        SetterColumn,
+        SignalColumn,
+        ResetColumn,
+        QPropertyColumn,
+        ConstantQPropertyColumn
+    };
+    using Flag = GenerateGetterSetterOp::GenerateFlag;
+    constexpr static Flag ColumnFlag[] = {
+        Flag::Invalid,
+        Flag::GenerateGetter,
+        Flag::GenerateSetter,
+        Flag::GenerateSignal,
+        Flag::GenerateReset,
+        Flag::GenerateProperty,
+        Flag::GenerateConstantProperty,
+    };
+
+    CandidateTreeItem(MemberInfo *memberInfo)
+        : m_memberInfo(memberInfo)
+    {}
+
+private:
+    QVariant data(int column, int role) const override
+    {
+        if (role == Qt::DisplayRole && column == NameColumn)
+            return m_memberInfo->data.memberVariableName;
+        if (role == Qt::CheckStateRole && column > 0
+            && column <= static_cast<int>(std::size(ColumnFlag))) {
+            return m_memberInfo->requestedFlags & ColumnFlag[column] ? Qt::Checked : Qt::Unchecked;
+        }
+        return {};
+    }
+
+    bool setData(int column, const QVariant &data, int role) override
+    {
+        if (column < 1 || column > static_cast<int>(std::size(ColumnFlag)))
+            return false;
+        if (role != Qt::CheckStateRole)
+            return false;
+        if (!(m_memberInfo->possibleFlags & ColumnFlag[column]))
+            return false;
+        const bool nowChecked = data.toInt() == Qt::Checked;
+        if (nowChecked)
+            m_memberInfo->requestedFlags |= ColumnFlag[column];
+        else
+            m_memberInfo->requestedFlags &= ~ColumnFlag[column];
+
+        if (nowChecked) {
+            if (column == QPropertyColumn) {
+                m_memberInfo->requestedFlags |= Flag::GenerateGetter;
+                m_memberInfo->requestedFlags |= Flag::GenerateSetter;
+                m_memberInfo->requestedFlags |= Flag::GenerateSignal;
+                m_memberInfo->requestedFlags &= ~Flag::GenerateConstantProperty;
+            } else if (column == ConstantQPropertyColumn) {
+                m_memberInfo->requestedFlags |= Flag::GenerateGetter;
+                m_memberInfo->requestedFlags &= ~Flag::GenerateSetter;
+                m_memberInfo->requestedFlags &= ~Flag::GenerateSignal;
+                m_memberInfo->requestedFlags &= ~Flag::GenerateReset;
+                m_memberInfo->requestedFlags &= ~Flag::GenerateProperty;
+            } else if (column == SetterColumn || column == SignalColumn || column == ResetColumn) {
+                m_memberInfo->requestedFlags &= ~Flag::GenerateConstantProperty;
+            }
+        } else {
+            if (column == SignalColumn)
+                m_memberInfo->requestedFlags &= ~Flag::GenerateProperty;
+        }
+        for (int i = 0; i < 16; ++i) {
+            const bool allowed = m_memberInfo->possibleFlags & (1 << i);
+            if (!allowed)
+                m_memberInfo->requestedFlags &= ~(1 << i); // clear bit
+        }
+        update();
+        return true;
+    }
+
+    Qt::ItemFlags flags(int column) const override
+    {
+        if (column == NameColumn)
+            return Qt::ItemIsEnabled;
+        if (column < 1 || column > static_cast<int>(std::size(ColumnFlag)))
+            return {};
+        if (m_memberInfo->possibleFlags & ColumnFlag[column])
+            return Qt::ItemIsEnabled | Qt::ItemIsUserCheckable;
+        return {};
+    }
+
+    MemberInfo *const m_memberInfo;
+};
+
+class GenerateGettersSettersDialog : public QDialog
+{
+    static constexpr CandidateTreeItem::Column CheckBoxColumn[4]
+        = {CandidateTreeItem::Column::GetterColumn,
+           CandidateTreeItem::Column::SetterColumn,
+           CandidateTreeItem::Column::SignalColumn,
+           CandidateTreeItem::Column::QPropertyColumn};
+
+public:
+    GenerateGettersSettersDialog(const GetterSetterCandidates &candidates)
+        : QDialog()
+        , m_candidates(candidates)
+    {
+        using Flags = GenerateGetterSetterOp::GenerateFlag;
+        setWindowTitle(Tr::tr("Getters and Setters"));
+        const auto model = new TreeModel<TreeItem, CandidateTreeItem>(this);
+        model->setHeader(QStringList({
+            Tr::tr("Member"),
+            Tr::tr("Getter"),
+            Tr::tr("Setter"),
+            Tr::tr("Signal"),
+            Tr::tr("Reset"),
+            Tr::tr("QProperty"),
+            Tr::tr("Constant QProperty"),
+        }));
+        for (MemberInfo &candidate : m_candidates)
+            model->rootItem()->appendChild(new CandidateTreeItem(&candidate));
+        const auto view = new BaseTreeView(this);
+        view->setModel(model);
+        int optimalWidth = 0;
+        for (int i = 0; i < model->columnCount(QModelIndex{}); ++i) {
+            view->resizeColumnToContents(i);
+            optimalWidth += view->columnWidth(i);
+        }
+
+        const auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+        connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+        connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+
+        const auto setCheckStateForAll = [model](int column, int checkState) {
+            for (int i = 0; i < model->rowCount(); ++i)
+                model->setData(model->index(i, column), checkState, Qt::CheckStateRole);
+        };
+        const auto preventPartiallyChecked = [](QCheckBox *checkbox) {
+            if (checkbox->checkState() == Qt::PartiallyChecked)
+                checkbox->setCheckState(Qt::Checked);
+        };
+        using Column = CandidateTreeItem::Column;
+        const auto createConnections = [this, setCheckStateForAll, preventPartiallyChecked](
+                                           QCheckBox *checkbox, Column column) {
+            connect(checkbox, &QCheckBox::stateChanged, this, [setCheckStateForAll, column](int state) {
+                if (state != Qt::PartiallyChecked)
+                    setCheckStateForAll(column, state);
+            });
+            connect(checkbox, &QCheckBox::clicked, this, [checkbox, preventPartiallyChecked] {
+                preventPartiallyChecked(checkbox);
+            });
+        };
+        std::array<QCheckBox *, 4> checkBoxes = {};
+
+        static_assert(std::size(CheckBoxColumn) == checkBoxes.size(),
+                      "Must contain the same number of elements");
+        for (std::size_t i = 0; i < checkBoxes.size(); ++i) {
+            if (Utils::anyOf(candidates, [i](const MemberInfo &mi) {
+                    return mi.possibleFlags & CandidateTreeItem::ColumnFlag[CheckBoxColumn[i]];
+                })) {
+                const Column column = CheckBoxColumn[i];
+                if (column == Column::GetterColumn)
+                    checkBoxes[i] = new QCheckBox(Tr::tr("Create getters for all members"));
+                else if (column == Column::SetterColumn)
+                    checkBoxes[i] = new QCheckBox(Tr::tr("Create setters for all members"));
+                else if (column == Column::SignalColumn)
+                    checkBoxes[i] = new QCheckBox(Tr::tr("Create signals for all members"));
+                else if (column == Column::QPropertyColumn)
+                    checkBoxes[i] = new QCheckBox(Tr::tr("Create Q_PROPERTY for all members"));
+
+                createConnections(checkBoxes[i], column);
+            }
+        }
+        connect(model, &QAbstractItemModel::dataChanged, this, [this, checkBoxes] {
+            const auto countExisting = [this](Flags flag) {
+                return Utils::count(m_candidates, [flag](const MemberInfo &mi) {
+                    return !(mi.possibleFlags & flag);
+                });
+            };
+            const auto countRequested = [this](Flags flag) {
+                return Utils::count(m_candidates, [flag](const MemberInfo &mi) {
+                    return mi.requestedFlags & flag;
+                });
+            };
+            const auto countToState = [this](int requestedCount, int alreadyExistsCount) {
+                if (requestedCount == 0)
+                    return Qt::Unchecked;
+                if (int(m_candidates.size()) - requestedCount == alreadyExistsCount)
+                    return Qt::Checked;
+                return Qt::PartiallyChecked;
+            };
+            for (std::size_t i = 0; i < checkBoxes.size(); ++i) {
+                if (checkBoxes[i]) {
+                    const Flags flag = CandidateTreeItem::ColumnFlag[CheckBoxColumn[i]];
+                    checkBoxes[i]->setCheckState(
+                        countToState(countRequested(flag), countExisting(flag)));
+                }
+            }
+        });
+
+        const auto mainLayout = new QVBoxLayout(this);
+        mainLayout->addWidget(new QLabel(Tr::tr("Select the getters and setters "
+                                                "to be created.")));
+        for (auto checkBox : checkBoxes) {
+            if (checkBox)
+                mainLayout->addWidget(checkBox);
+        }
+        mainLayout->addWidget(view);
+        mainLayout->addWidget(buttonBox);
+        int left, right;
+        mainLayout->getContentsMargins(&left, nullptr, &right, nullptr);
+        optimalWidth += left + right;
+        resize(optimalWidth, mainLayout->sizeHint().height());
+    }
+
+    GetterSetterCandidates candidates() const { return m_candidates; }
+
+private:
+    GetterSetterCandidates m_candidates;
+};
+
+class GenerateGettersSettersOperation : public CppQuickFixOperation
+{
+public:
+    GenerateGettersSettersOperation(const CppQuickFixInterface &interface)
+        : CppQuickFixOperation(interface)
+    {
+        setDescription(Tr::tr("Create Getter and Setter Member Functions"));
+
+        m_classAST = astForClassOperations(interface);
+        if (!m_classAST)
+            return;
+        Class * const theClass = m_classAST->symbol;
+        if (!theClass)
+            return;
+
+        // Go through all data members and try to find out whether they have getters and/or setters.
+        QList<Symbol *> dataMembers;
+        QList<Symbol *> memberFunctions;
+        for (auto it = theClass->memberBegin(); it != theClass->memberEnd(); ++it) {
+            Symbol *const s = *it;
+            if (!s->identifier() || !s->type() || s->type().isTypedef())
+                continue;
+            if ((s->asDeclaration() && s->type()->asFunctionType()) || s->asFunction())
+                memberFunctions << s;
+            else if (s->asDeclaration() && (s->isPrivate() || s->isProtected()))
+                dataMembers << s;
+        }
+
+        auto file = interface.currentFile();
+        QStringList qPropertyNames; // name after MEMBER or name of the property
+        for (auto it = m_classAST->member_specifier_list; it; it = it->next) {
+            if (it->value->asQtPropertyDeclaration()) {
+                auto propDecl = it->value->asQtPropertyDeclaration();
+                // iterator over 'READ ...', ... and check if we have a MEMBER
+                for (auto p = propDecl->property_declaration_item_list; p; p = p->next) {
+                    const char *tokenString = file->tokenAt(p->value->item_name_token).spell();
+                    if (!qstrcmp(tokenString, "MEMBER"))
+                        qPropertyNames << file->textOf(p->value->expression);
+                }
+                // no MEMBER, but maybe the property name is the same
+                qPropertyNames << file->textOf(propDecl->property_name);
+            }
+        }
+        const QStringList memberFunctionsAsStrings = toStringList(memberFunctions);
+
+        for (Symbol *const member : std::as_const(dataMembers)) {
+            ExistingGetterSetterData existing;
+            existing.memberVariableName = QString::fromUtf8(member->identifier()->chars(),
+                                                            member->identifier()->size());
+            existing.declarationSymbol = member->asDeclaration();
+            existing.clazz = theClass;
+
+            // check if a Q_PROPERTY exist
+            const QString baseName = memberBaseName(existing.memberVariableName);
+            if (qPropertyNames.contains(baseName)
+                || qPropertyNames.contains(existing.memberVariableName))
+                continue;
+
+            findExistingFunctions(existing, memberFunctionsAsStrings);
+            existing.qPropertyName = baseName;
+
+            int possibleFlags = existing.computePossibleFlags();
+            if (possibleFlags == 0)
+                continue;
+            m_candidates.emplace_back(existing, possibleFlags);
+        }
+    }
+
+    GetterSetterCandidates candidates() const { return m_candidates; }
+    bool isApplicable() const { return !m_candidates.empty(); }
+
+    void setGetterSetterData(const GetterSetterCandidates &data)
+    {
+        m_candidates = data;
+        m_hasData = true;
+    }
+
+private:
+    void perform() override
+    {
+        if (!m_hasData) {
+            GenerateGettersSettersDialog dlg(m_candidates);
+            if (dlg.exec() == QDialog::Rejected)
+                return;
+            m_candidates = dlg.candidates();
+        }
+        if (m_candidates.empty())
+            return;
+        GetterSetterRefactoringHelper helper(this, m_candidates.front().data.clazz);
+        for (MemberInfo &mi : m_candidates) {
+            if (mi.requestedFlags != 0) {
+                helper.performGeneration(mi.data, mi.requestedFlags);
+            }
+        }
+        helper.applyChanges();
+    }
+
+    GetterSetterCandidates m_candidates;
+    const ClassSpecifierAST *m_classAST = nullptr;
+    bool m_hasData = false;
+};
+
+int ExistingGetterSetterData::computePossibleFlags() const
+{
+    const bool isConst = declarationSymbol->type().isConst();
+    const bool isStatic = declarationSymbol->type().isStatic();
+    using Flag = GenerateGetterSetterOp::GenerateFlag;
+    int generateFlags = 0;
+    if (getterName.isEmpty())
+        generateFlags |= Flag::GenerateGetter;
+    if (!isConst) {
+        if (resetName.isEmpty())
+            generateFlags |= Flag::GenerateReset;
+        if (!isStatic && signalName.isEmpty() && setterName.isEmpty())
+            generateFlags |= Flag::GenerateSignal;
+        if (setterName.isEmpty())
+            generateFlags |= Flag::GenerateSetter;
+    }
+    if (!isStatic) {
+        const bool hasSignal = !signalName.isEmpty() || generateFlags & Flag::GenerateSignal;
+        if (!isConst && hasSignal)
+            generateFlags |= Flag::GenerateProperty;
+    }
+    if (setterName.isEmpty() && signalName.isEmpty())
+        generateFlags |= Flag::GenerateConstantProperty;
+    return generateFlags;
+}
+
+void GetterSetterRefactoringHelper::performGeneration(ExistingGetterSetterData data, int generateFlags)
+{
+    using Flag = GenerateGetterSetterOp::GenerateFlag;
+
+    if (generateFlags & Flag::GenerateGetter && data.getterName.isEmpty()) {
+        data.getterName = m_settings->getGetterName(data.qPropertyName);
+        if (data.getterName == data.memberVariableName) {
+            data.getterName = "get" + data.memberVariableName.left(1).toUpper()
+                              + data.memberVariableName.mid(1);
+        }
+    }
+    if (generateFlags & Flag::GenerateSetter && data.setterName.isEmpty())
+        data.setterName = m_settings->getSetterName(data.qPropertyName);
+    if (generateFlags & Flag::GenerateSignal && data.signalName.isEmpty())
+        data.signalName = m_settings->getSignalName(data.qPropertyName);
+    if (generateFlags & Flag::GenerateReset && data.resetName.isEmpty())
+        data.resetName = m_settings->getResetName(data.qPropertyName);
+
+    FullySpecifiedType memberVariableType = data.declarationSymbol->type();
+    memberVariableType.setConst(false);
+    const bool isMemberVariableStatic = memberVariableType.isStatic();
+    memberVariableType.setStatic(false);
+    Overview overview = CppCodeStyleSettings::currentProjectCodeStyleOverview();
+    overview.showTemplateParameters = false;
+    // TODO does not work with using. e.g. 'using foo = std::unique_ptr<int>'
+    // TODO must be fully qualified
+    auto getSetTemplate = m_settings->findGetterSetterTemplate(overview.prettyType(memberVariableType));
+    overview.showTemplateParameters = true;
+
+    // Ok... - If a type is a Named type we have to search recusive for the real type
+    const bool isValueType = this->isValueType(memberVariableType,
+                                               data.declarationSymbol->enclosingScope());
+    const FullySpecifiedType parameterType = isValueType ? memberVariableType
+                                                         : makeConstRef(memberVariableType);
+
+    QString baseName = memberBaseName(data.memberVariableName);
+    if (baseName.isEmpty())
+        baseName = data.memberVariableName;
+
+    const QString parameterName = m_settings->getSetterParameterName(baseName);
+    if (parameterName == data.memberVariableName)
+        data.memberVariableName = "this->" + data.memberVariableName;
+
+    getSetTemplate.replacePlaceholders(data.memberVariableName, parameterName);
+
+    using Pattern = CppQuickFixSettings::GetterSetterTemplate;
+    std::optional<FullySpecifiedType> returnTypeTemplateParameter;
+    if (getSetTemplate.returnTypeTemplate.has_value()) {
+        QString returnTypeTemplate = getSetTemplate.returnTypeTemplate.value();
+        if (returnTypeTemplate.contains(Pattern::TEMPLATE_PARAMETER_PATTERN)) {
+            returnTypeTemplateParameter = getFirstTemplateParameter(data.declarationSymbol->type());
+            if (!returnTypeTemplateParameter.has_value())
+                return; // Maybe report error to the user
+        }
+    }
+    const FullySpecifiedType returnTypeHeader = [&] {
+        if (!getSetTemplate.returnTypeTemplate.has_value())
+            return m_settings->returnByConstRef ? parameterType : memberVariableType;
+        QString typeTemplate = getSetTemplate.returnTypeTemplate.value();
+        if (returnTypeTemplateParameter.has_value())
+            typeTemplate.replace(Pattern::TEMPLATE_PARAMETER_PATTERN,
+                                 overview.prettyType(returnTypeTemplateParameter.value()));
+        if (typeTemplate.contains(Pattern::TYPE_PATTERN))
+            typeTemplate.replace(Pattern::TYPE_PATTERN,
+                                 overview.prettyType(data.declarationSymbol->type()));
+        Control *control = m_operation->currentFile()->cppDocument()->control();
+        std::string utf8TypeName = typeTemplate.toUtf8().toStdString();
+        return FullySpecifiedType(control->namedType(control->identifier(utf8TypeName.c_str())));
+    }();
+
+    // getter declaration
+    if (generateFlags & Flag::GenerateGetter) {
+        // maybe we added 'this->' to memberVariableName because of a collision with parameterName
+        // but here the 'this->' is not needed
+        const QString returnExpression = QString{getSetTemplate.returnExpression}.replace("this->",
+                                                                                          "");
+        QString getterInClassDeclaration = overview.prettyType(returnTypeHeader, data.getterName)
+                                           + QLatin1String("()");
+        if (isMemberVariableStatic)
+            getterInClassDeclaration.prepend(QLatin1String("static "));
+        else
+            getterInClassDeclaration += QLatin1String(" const");
+        getterInClassDeclaration.prepend(m_settings->getterAttributes + QLatin1Char(' '));
+
+        auto getterLocation = m_settings->determineGetterLocation(1);
+        // if we have an anonymous class we must add code inside the class
+        if (data.clazz->name()->asAnonymousNameId())
+            getterLocation = CppQuickFixSettings::FunctionLocation::InsideClass;
+
+        if (getterLocation == CppQuickFixSettings::FunctionLocation::InsideClass) {
+            getterInClassDeclaration += QLatin1String("\n{\nreturn ") + returnExpression
+                                        + QLatin1String(";\n}\n");
+        } else {
+            getterInClassDeclaration += QLatin1String(";\n");
+        }
+        addHeaderCode(InsertionPointLocator::Public, getterInClassDeclaration);
+        if (getterLocation == CppQuickFixSettings::FunctionLocation::CppFile && !hasSourceFile())
+            getterLocation = CppQuickFixSettings::FunctionLocation::OutsideClass;
+
+        if (getterLocation != CppQuickFixSettings::FunctionLocation::InsideClass) {
+            const auto getReturnTypeAt = [&](CppRefactoringFilePtr targetFile,
+                                             InsertionLocation targetLoc) {
+                if (getSetTemplate.returnTypeTemplate.has_value()) {
+                    QString returnType = getSetTemplate.returnTypeTemplate.value();
+                    if (returnTypeTemplateParameter.has_value()) {
+                        const QString templateTypeName = overview.prettyType(typeAt(
+                            returnTypeTemplateParameter.value(), data.clazz, targetFile, targetLoc));
+                        returnType.replace(Pattern::TEMPLATE_PARAMETER_PATTERN, templateTypeName);
+                    }
+                    if (returnType.contains(Pattern::TYPE_PATTERN)) {
+                        const QString declarationType = overview.prettyType(
+                            typeAt(memberVariableType, data.clazz, targetFile, targetLoc));
+                        returnType.replace(Pattern::TYPE_PATTERN, declarationType);
+                    }
+                    Control *control = m_operation->currentFile()->cppDocument()->control();
+                    std::string utf8String = returnType.toUtf8().toStdString();
+                    return FullySpecifiedType(
+                        control->namedType(control->identifier(utf8String.c_str())));
+                } else {
+                    FullySpecifiedType returnType = typeAt(memberVariableType,
+                                                           data.clazz,
+                                                           targetFile,
+                                                           targetLoc);
+                    if (m_settings->returnByConstRef && !isValueType)
+                        return makeConstRef(returnType);
+                    return returnType;
+                }
+            };
+            const QString constSpec = isMemberVariableStatic ? QLatin1String("")
+                                                             : QLatin1String(" const");
+            if (getterLocation == CppQuickFixSettings::FunctionLocation::CppFile) {
+                InsertionLocation loc = sourceLocationFor(data.declarationSymbol);
+                FullySpecifiedType returnType;
+                QString clazz;
+                if (m_settings->rewriteTypesinCppFile()) {
+                    returnType = getReturnTypeAt(m_sourceFile, loc);
+                    clazz = symbolAt(data.clazz, m_sourceFile, loc);
+                } else {
+                    returnType = returnTypeHeader;
+                    const Identifier *identifier = data.clazz->name()->identifier();
+                    clazz = QString::fromUtf8(identifier->chars(), identifier->size());
+                }
+                const QString code = overview.prettyType(returnType, clazz + "::" + data.getterName)
+                                     + "()" + constSpec + "\n{\nreturn " + returnExpression + ";\n}";
+                addSourceFileCode(code);
+            } else if (getterLocation == CppQuickFixSettings::FunctionLocation::OutsideClass) {
+                InsertionLocation loc
+                    = insertLocationForMethodDefinition(data.declarationSymbol,
+                                                        false,
+                                                        NamespaceHandling::Ignore,
+                                                        m_changes,
+                                                        m_headerFile->filePath());
+                const FullySpecifiedType returnType = getReturnTypeAt(m_headerFile, loc);
+                const QString clazz = symbolAt(data.clazz, m_headerFile, loc);
+                QString code = overview.prettyType(returnType, clazz + "::" + data.getterName)
+                               + "()" + constSpec + "\n{\nreturn " + returnExpression + ";\n}";
+                if (m_isHeaderHeaderFile)
+                    code.prepend("inline ");
+                insertAndIndent(m_headerFile, loc, code);
+            }
+        }
+    }
+
+    // setter declaration
+    InsertionPointLocator::AccessSpec setterAccessSpec = InsertionPointLocator::Public;
+    if (m_settings->setterAsSlot) {
+        const QByteArray connectName = "connect";
+        const Identifier connectId(connectName.data(), connectName.size());
+        const QList<LookupItem> items = m_operation->context().lookup(&connectId, data.clazz);
+        for (const LookupItem &item : items) {
+            if (item.declaration() && item.declaration()->enclosingClass()
+                && overview.prettyName(item.declaration()->enclosingClass()->name())
+                       == "QObject") {
+                setterAccessSpec = InsertionPointLocator::PublicSlot;
+                break;
+            }
+        }
+    }
+    const auto createSetterBodyWithSignal = [this, &getSetTemplate, &data] {
+        QString body;
+        QTextStream setter(&body);
+        setter << "if (" << getSetTemplate.equalComparison << ")\nreturn;\n";
+
+        setter << getSetTemplate.assignment << ";\n";
+        if (m_settings->signalWithNewValue)
+            setter << "emit " << data.signalName << "(" << getSetTemplate.returnExpression << ");\n";
+        else
+            setter << "emit " << data.signalName << "();\n";
+
+        return body;
+    };
+    if (generateFlags & Flag::GenerateSetter) {
+        QString headerDeclaration = "void " + data.setterName + '('
+                                    + overview.prettyType(addConstToReference(parameterType),
+                                                          parameterName)
+                                    + ")";
+        if (isMemberVariableStatic)
+            headerDeclaration.prepend("static ");
+        QString body = "\n{\n";
+        if (data.signalName.isEmpty())
+            body += getSetTemplate.assignment + ";\n";
+        else
+            body += createSetterBodyWithSignal();
+
+        body += "}";
+
+        auto setterLocation = m_settings->determineSetterLocation(body.count('\n') - 2);
+        // if we have an anonymous class we must add code inside the class
+        if (data.clazz->name()->asAnonymousNameId())
+            setterLocation = CppQuickFixSettings::FunctionLocation::InsideClass;
+
+        if (setterLocation == CppQuickFixSettings::FunctionLocation::CppFile && !hasSourceFile())
+            setterLocation = CppQuickFixSettings::FunctionLocation::OutsideClass;
+
+        if (setterLocation == CppQuickFixSettings::FunctionLocation::InsideClass) {
+            headerDeclaration += body;
+        } else {
+            headerDeclaration += ";\n";
+            if (setterLocation == CppQuickFixSettings::FunctionLocation::CppFile) {
+                InsertionLocation loc = sourceLocationFor(data.declarationSymbol);
+                QString clazz;
+                FullySpecifiedType newParameterType = parameterType;
+                if (m_settings->rewriteTypesinCppFile()) {
+                    newParameterType = typeAt(memberVariableType, data.clazz, m_sourceFile, loc);
+                    if (!isValueType)
+                        newParameterType = makeConstRef(newParameterType);
+                    clazz = symbolAt(data.clazz, m_sourceFile, loc);
+                } else {
+                    const Identifier *identifier = data.clazz->name()->identifier();
+                    clazz = QString::fromUtf8(identifier->chars(), identifier->size());
+                }
+                newParameterType = addConstToReference(newParameterType);
+                const QString code = "void " + clazz + "::" + data.setterName + '('
+                                     + overview.prettyType(newParameterType, parameterName) + ')'
+                                     + body;
+                addSourceFileCode(code);
+            } else if (setterLocation == CppQuickFixSettings::FunctionLocation::OutsideClass) {
+                InsertionLocation loc
+                    = insertLocationForMethodDefinition(data.declarationSymbol,
+                                                        false,
+                                                        NamespaceHandling::Ignore,
+                                                        m_changes,
+                                                        m_headerFile->filePath());
+
+                FullySpecifiedType newParameterType = typeAt(data.declarationSymbol->type(),
+                                                             data.clazz,
+                                                             m_headerFile,
+                                                             loc);
+                if (!isValueType)
+                    newParameterType = makeConstRef(newParameterType);
+                newParameterType = addConstToReference(newParameterType);
+                QString clazz = symbolAt(data.clazz, m_headerFile, loc);
+
+                QString code = "void " + clazz + "::" + data.setterName + '('
+                               + overview.prettyType(newParameterType, parameterName) + ')' + body;
+                if (m_isHeaderHeaderFile)
+                    code.prepend("inline ");
+                insertAndIndent(m_headerFile, loc, code);
+            }
+        }
+        addHeaderCode(setterAccessSpec, headerDeclaration);
+    }
+
+    // reset declaration
+    if (generateFlags & Flag::GenerateReset) {
+        QString headerDeclaration = "void " + data.resetName + "()";
+        if (isMemberVariableStatic)
+            headerDeclaration.prepend("static ");
+        QString body = "\n{\n";
+        if (!data.setterName.isEmpty()) {
+            body += data.setterName + "({}); // TODO: Adapt to use your actual default value\n";
+        } else {
+            body += "static $TYPE defaultValue{}; "
+                    "// TODO: Adapt to use your actual default value\n";
+            if (data.signalName.isEmpty())
+                body += getSetTemplate.assignment + ";\n";
+            else
+                body += createSetterBodyWithSignal();
+        }
+        body += "}";
+
+        // the template use <parameterName> as new value name, but we want to use 'defaultValue'
+        body.replace(QRegularExpression("\\b" + parameterName + "\\b"), "defaultValue");
+        // body.count('\n') - 2 : do not count the 2 at start
+        auto resetLocation = m_settings->determineSetterLocation(body.count('\n') - 2);
+        // if we have an anonymous class we must add code inside the class
+        if (data.clazz->name()->asAnonymousNameId())
+            resetLocation = CppQuickFixSettings::FunctionLocation::InsideClass;
+
+        if (resetLocation == CppQuickFixSettings::FunctionLocation::CppFile && !hasSourceFile())
+            resetLocation = CppQuickFixSettings::FunctionLocation::OutsideClass;
+
+        if (resetLocation == CppQuickFixSettings::FunctionLocation::InsideClass) {
+            headerDeclaration += body.replace("$TYPE", overview.prettyType(memberVariableType));
+        } else {
+            headerDeclaration += ";\n";
+            if (resetLocation == CppQuickFixSettings::FunctionLocation::CppFile) {
+                const InsertionLocation loc = sourceLocationFor(data.declarationSymbol);
+                QString clazz;
+                FullySpecifiedType type = memberVariableType;
+                if (m_settings->rewriteTypesinCppFile()) {
+                    type = typeAt(memberVariableType, data.clazz, m_sourceFile, loc);
+                    clazz = symbolAt(data.clazz, m_sourceFile, loc);
+                } else {
+                    const Identifier *identifier = data.clazz->name()->identifier();
+                    clazz = QString::fromUtf8(identifier->chars(), identifier->size());
+                }
+                const QString code = "void " + clazz + "::" + data.resetName + "()"
+                                     + body.replace("$TYPE", overview.prettyType(type));
+                addSourceFileCode(code);
+            } else if (resetLocation == CppQuickFixSettings::FunctionLocation::OutsideClass) {
+                const InsertionLocation loc = insertLocationForMethodDefinition(
+                    data.declarationSymbol,
+                    false,
+                    NamespaceHandling::Ignore,
+                    m_changes,
+                    m_headerFile->filePath());
+                const FullySpecifiedType type = typeAt(data.declarationSymbol->type(),
+                                                       data.clazz,
+                                                       m_headerFile,
+                                                       loc);
+                const QString clazz = symbolAt(data.clazz, m_headerFile, loc);
+                QString code = "void " + clazz + "::" + data.resetName + "()"
+                               + body.replace("$TYPE", overview.prettyType(type));
+                if (m_isHeaderHeaderFile)
+                    code.prepend("inline ");
+                insertAndIndent(m_headerFile, loc, code);
+            }
+        }
+        addHeaderCode(setterAccessSpec, headerDeclaration);
+    }
+
+    // signal declaration
+    if (generateFlags & Flag::GenerateSignal) {
+        const auto &parameter = overview.prettyType(returnTypeHeader, data.qPropertyName);
+        const QString newValue = m_settings->signalWithNewValue ? parameter : QString();
+        const QString declaration = QString("void %1(%2);\n").arg(data.signalName, newValue);
+        addHeaderCode(InsertionPointLocator::Signals, declaration);
+    }
+
+    // member variable
+    if (generateFlags & Flag::GenerateMemberVariable) {
+        QString storageDeclaration = overview.prettyType(memberVariableType, data.memberVariableName);
+        if (memberVariableType->asPointerType()
+            && m_operation->semanticInfo().doc->translationUnit()->languageFeatures().cxx11Enabled) {
+            storageDeclaration.append(" = nullptr");
+        }
+        storageDeclaration.append(";\n");
+        addHeaderCode(InsertionPointLocator::Private, storageDeclaration);
+    }
+
+    // Q_PROPERTY
+    if (generateFlags & Flag::GenerateProperty || generateFlags & Flag::GenerateConstantProperty) {
+        // Use the returnTypeHeader as base because of custom types in getSetTemplates.
+        // Remove const reference from type.
+        FullySpecifiedType type = returnTypeHeader;
+        if (ReferenceType *ref = type.type()->asReferenceType())
+            type = ref->elementType();
+        type.setConst(false);
+
+        QString propertyDeclaration = QLatin1String("Q_PROPERTY(")
+                                      + overview.prettyType(type,
+                                                            memberBaseName(data.memberVariableName));
+        bool needMember = false;
+        if (data.getterName.isEmpty())
+            needMember = true;
+        else
+            propertyDeclaration += QLatin1String(" READ ") + data.getterName;
+        if (generateFlags & Flag::GenerateConstantProperty) {
+            if (needMember)
+                propertyDeclaration += QLatin1String(" MEMBER ") + data.memberVariableName;
+            propertyDeclaration.append(QLatin1String(" CONSTANT"));
+        } else {
+            if (data.setterName.isEmpty()) {
+                needMember = true;
+            } else if (!getSetTemplate.returnTypeTemplate.has_value()) {
+                // if the return type of the getter and then Q_PROPERTY is different than
+                // the setter type, we should not add WRITE to the Q_PROPERTY
+                propertyDeclaration.append(QLatin1String(" WRITE ")).append(data.setterName);
+            }
+            if (needMember)
+                propertyDeclaration += QLatin1String(" MEMBER ") + data.memberVariableName;
+            if (!data.resetName.isEmpty())
+                propertyDeclaration += QLatin1String(" RESET ") + data.resetName;
+            propertyDeclaration.append(QLatin1String(" NOTIFY ")).append(data.signalName);
+        }
+
+        propertyDeclaration.append(QLatin1String(" FINAL)\n"));
+        addHeaderCode(InsertionPointLocator::Private, propertyDeclaration);
+    }
+}
+
+//! Generate constructor
+class GenerateConstructor : public CppQuickFixFactory
+{
+public:
+#ifdef WITH_TESTS
+    static QObject* createTest();
+#endif
+
+protected:
+    void setTest() { m_test = true; }
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const auto op = QSharedPointer<GenerateConstructorOperation>::create(interface);
+        if (!op->isApplicable())
+            return;
+        op->setTest(m_test);
+        result << op;
+    }
+
+    bool m_test = false;
+};
+
+//! Adds getter and setter functions for a member variable
+class GenerateGetterSetter : public CppQuickFixFactory
+{
+public:
+#ifdef WITH_TESTS
+    static QObject* createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        ExistingGetterSetterData existing;
+
+        const QList<AST *> &path = interface.path();
+        // We expect something like
+        // [0] TranslationUnitAST
+        // [1] NamespaceAST
+        // [2] LinkageBodyAST
+        // [3] SimpleDeclarationAST
+        // [4] ClassSpecifierAST
+        // [5] SimpleDeclarationAST
+        // [6] DeclaratorAST
+        // [7] DeclaratorIdAST
+        // [8] SimpleNameAST
+
+        const int n = path.size();
+        if (n < 6)
+            return;
+
+        int i = 1;
+        const auto variableNameAST = path.at(n - i++)->asSimpleName();
+        const auto declaratorId = path.at(n - i++)->asDeclaratorId();
+        // DeclaratorAST might be preceded by PointerAST, e.g. for the case
+        // "class C { char *@s; };", where '@' denotes the text cursor position.
+        auto declarator = path.at(n - i++)->asDeclarator();
+        if (!declarator) {
+            --i;
+            if (path.at(n - i++)->asPointer()) {
+                if (n < 7)
+                    return;
+                declarator = path.at(n - i++)->asDeclarator();
+            }
+            if (!declarator)
+                return;
+        }
+        const auto variableDecl = path.at(n - i++)->asSimpleDeclaration();
+        const auto classSpecifier = path.at(n - i++)->asClassSpecifier();
+        const auto classDecl = path.at(n - i++)->asSimpleDeclaration();
+
+        if (!(variableNameAST && declaratorId && variableDecl && classSpecifier && classDecl))
+            return;
+
+        // Do not get triggered on member functconstions and arrays
+        if (declarator->postfix_declarator_list) {
+            return;
+        }
+
+        // Construct getter and setter names
+        const Name *variableName = variableNameAST->name;
+        if (!variableName) {
+            return;
+        }
+        const Identifier *variableId = variableName->identifier();
+        if (!variableId) {
+            return;
+        }
+        existing.memberVariableName = QString::fromUtf8(variableId->chars(), variableId->size());
+
+        // Find the right symbol (for typeName) in the simple declaration
+        Symbol *symbol = nullptr;
+        const List<Symbol *> *symbols = variableDecl->symbols;
+        QTC_ASSERT(symbols, return );
+        for (; symbols; symbols = symbols->next) {
+            Symbol *s = symbols->value;
+            if (const Name *name = s->name()) {
+                if (const Identifier *id = name->identifier()) {
+                    const QString symbolName = QString::fromUtf8(id->chars(), id->size());
+                    if (symbolName == existing.memberVariableName) {
+                        symbol = s;
+                        break;
+                    }
+                }
+            }
+        }
+        if (!symbol) {
+            // no type can be determined
+            return;
+        }
+        if (!symbol->asDeclaration()) {
+            return;
+        }
+        existing.declarationSymbol = symbol->asDeclaration();
+
+        existing.clazz = classSpecifier->symbol;
+        if (!existing.clazz)
+            return;
+
+        auto file = interface.currentFile();
+        // check if a Q_PROPERTY exist
+        const QString baseName = memberBaseName(existing.memberVariableName);
+        // eg: we have 'int m_test' and now 'Q_PROPERTY(int foo WRITE setTest MEMBER m_test NOTIFY tChanged)'
+        for (auto it = classSpecifier->member_specifier_list; it; it = it->next) {
+            if (it->value->asQtPropertyDeclaration()) {
+                auto propDecl = it->value->asQtPropertyDeclaration();
+                // iterator over 'READ ...', ...
+                auto p = propDecl->property_declaration_item_list;
+                // first check, if we have a MEMBER and the member is equal to the baseName
+                for (; p; p = p->next) {
+                    const char *tokenString = file->tokenAt(p->value->item_name_token).spell();
+                    if (!qstrcmp(tokenString, "MEMBER")) {
+                        if (baseName == file->textOf(p->value->expression))
+                            return;
+                    }
+                }
+                // no MEMBER, but maybe the property name is the same
+                const QString propertyName = file->textOf(propDecl->property_name);
+                // we compare the baseName. e.g. 'test' instead of 'm_test'
+                if (propertyName == baseName)
+                    return; // TODO Maybe offer quick fix "Add missing Q_PROPERTY Members"
+            }
+        }
+
+        findExistingFunctions(existing, toStringList(getMemberFunctions(existing.clazz)));
+        existing.qPropertyName = memberBaseName(existing.memberVariableName);
+
+        const int possibleFlags = existing.computePossibleFlags();
+        GenerateGetterSetterOp::generateQuickFixes(result, interface, existing, possibleFlags);
+    }
+};
+
+//! Adds getter and setter functions for several member variables
+class GenerateGettersSettersForClass : public CppQuickFixFactory
+{
+public:
+#ifdef WITH_TESTS
+    static QObject* createTest();
+#endif
+
+protected:
+    void setTest() { m_test = true; }
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const auto op = QSharedPointer<GenerateGettersSettersOperation>::create(interface);
+        if (!op->isApplicable())
+            return;
+        if (m_test) {
+            GetterSetterCandidates candidates = op->candidates();
+            for (MemberInfo &mi : candidates) {
+                mi.requestedFlags = mi.possibleFlags;
+                using Flag = GenerateGetterSetterOp::GenerateFlag;
+                mi.requestedFlags &= ~Flag::GenerateConstantProperty;
+            }
+            op->setGetterSetterData(candidates);
+        }
+        result << op;
+    }
+
+    bool m_test = false;
+};
+
+//! Adds missing members for a Q_PROPERTY
+class InsertQtPropertyMembers : public CppQuickFixFactory
+{
+public:
+#ifdef WITH_TESTS
+    static QObject* createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        using Flag = GenerateGetterSetterOp::GenerateFlag;
+        ExistingGetterSetterData existing;
+        // check for Q_PROPERTY
+
+        const QList<AST *> &path = interface.path();
+        if (path.isEmpty())
+            return;
+
+        AST *const ast = path.last();
+        QtPropertyDeclarationAST *qtPropertyDeclaration = ast->asQtPropertyDeclaration();
+        if (!qtPropertyDeclaration || !qtPropertyDeclaration->type_id)
+            return;
+
+        ClassSpecifierAST *klass = nullptr;
+        for (int i = path.size() - 2; i >= 0; --i) {
+            klass = path.at(i)->asClassSpecifier();
+            if (klass)
+                break;
+        }
+        if (!klass)
+            return;
+        existing.clazz = klass->symbol;
+
+        CppRefactoringFilePtr file = interface.currentFile();
+        const QString propertyName = file->textOf(qtPropertyDeclaration->property_name);
+        existing.qPropertyName = propertyName;
+        extractNames(file, qtPropertyDeclaration, existing);
+
+        Control *control = interface.currentFile()->cppDocument()->control();
+
+        existing.declarationSymbol = control->newDeclaration(ast->firstToken(),
+                                                             qtPropertyDeclaration->property_name->name);
+        existing.declarationSymbol->setVisibility(Symbol::Private);
+        existing.declarationSymbol->setEnclosingScope(existing.clazz);
+
+        {
+            // create a 'right' Type Object
+            // if we have Q_PROPERTY(int test ...) then we only get a NamedType for 'int', but we want
+            // a IntegerType. So create a new dummy file with a dummy declaration to get the right
+            // object
+            QByteArray type = file->textOf(qtPropertyDeclaration->type_id).toUtf8();
+            QByteArray newSource = file->document()
+                                       ->toPlainText()
+                                       .insert(file->startOf(qtPropertyDeclaration),
+                                               QString::fromUtf8(type + " __dummy;\n"))
+                                       .toUtf8();
+
+            Document::Ptr doc = interface.snapshot().preprocessedDocument(newSource, "___quickfix.h");
+            if (!doc->parse(Document::ParseTranlationUnit))
+                return;
+            doc->check();
+            class TypeFinder : public ASTVisitor
+            {
+            public:
+                FullySpecifiedType type;
+                TypeFinder(TranslationUnit *u)
+                    : ASTVisitor(u)
+                {}
+                bool visit(SimpleDeclarationAST *ast) override
+                {
+                    if (ast->symbols && !ast->symbols->next) {
+                        const Name *name = ast->symbols->value->name();
+                        if (name && name->asNameId() && name->asNameId()->identifier()) {
+                            const Identifier *id = name->asNameId()->identifier();
+                            if (QString::fromUtf8(id->chars(), id->size()) == "__dummy")
+                                type = ast->symbols->value->type();
+                        }
+                    }
+                    return true;
+                }
+            };
+            TypeFinder finder(doc->translationUnit());
+            finder.accept(doc->translationUnit()->ast());
+            if (finder.type.type()->isUndefinedType())
+                return;
+            existing.declarationSymbol->setType(finder.type);
+            existing.doc = doc; // to hold type
+        }
+        // check which methods are already there
+        const bool haveFixMemberVariableName = !existing.memberVariableName.isEmpty();
+        int generateFlags = Flag::GenerateMemberVariable;
+        if (!existing.resetName.isEmpty())
+            generateFlags |= Flag::GenerateReset;
+        if (!existing.setterName.isEmpty())
+            generateFlags |= Flag::GenerateSetter;
+        if (!existing.getterName.isEmpty())
+            generateFlags |= Flag::GenerateGetter;
+        if (!existing.signalName.isEmpty())
+            generateFlags |= Flag::GenerateSignal;
+        Overview overview;
+        for (int i = 0; i < existing.clazz->memberCount(); ++i) {
+            Symbol *member = existing.clazz->memberAt(i);
+            FullySpecifiedType type = member->type();
+            if (member->asFunction() || (type.isValid() && type->asFunctionType())) {
+                const QString name = overview.prettyName(member->name());
+                if (name == existing.getterName)
+                    generateFlags &= ~Flag::GenerateGetter;
+                else if (name == existing.setterName)
+                    generateFlags &= ~Flag::GenerateSetter;
+                else if (name == existing.resetName)
+                    generateFlags &= ~Flag::GenerateReset;
+                else if (name == existing.signalName)
+                    generateFlags &= ~Flag::GenerateSignal;
+            } else if (member->asDeclaration()) {
+                const QString name = overview.prettyName(member->name());
+                if (haveFixMemberVariableName) {
+                    if (name == existing.memberVariableName) {
+                        generateFlags &= ~Flag::GenerateMemberVariable;
+                    }
+                } else {
+                    const QString baseName = memberBaseName(name);
+                    if (existing.qPropertyName == baseName) {
+                        existing.memberVariableName = name;
+                        generateFlags &= ~Flag::GenerateMemberVariable;
+                    }
+                }
+            }
+        }
+        if (generateFlags & Flag::GenerateMemberVariable) {
+            CppQuickFixSettings *settings = CppQuickFixProjectsSettings::getQuickFixSettings(
+                ProjectExplorer::ProjectTree::currentProject());
+            existing.memberVariableName = settings->getMemberVariableName(existing.qPropertyName);
+        }
+        if (generateFlags == 0) {
+            // everything is already there
+            return;
+        }
+        generateFlags |= Flag::HaveExistingQProperty;
+        GenerateGetterSetterOp::generateQuickFixes(result, interface, existing, generateFlags);
+    }
+};
+
+
+#ifdef WITH_TESTS
+using namespace Tests;
+
+class GenerateGetterSetterTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testNamespaceHandlingCreate_data()
+    {
+        QTest::addColumn<QByteArrayList>("headers");
+        QTest::addColumn<QByteArrayList>("sources");
+
+        QByteArray originalSource;
+        QByteArray expectedSource;
+
+        const QByteArray originalHeader =
+                "namespace N1 {\n"
+                "namespace N2 {\n"
+                "class Something\n"
+                "{\n"
+                "    int @it;\n"
+                "};\n"
+                "}\n"
+                "}\n";
+        const QByteArray expectedHeader =
+                "namespace N1 {\n"
+                "namespace N2 {\n"
+                "class Something\n"
+                "{\n"
+                "    int it;\n"
+                "\n"
+                "public:\n"
+                "    int getIt() const;\n"
+                "    void setIt(int value);\n"
+                "};\n"
+                "}\n"
+                "}\n";
+
+        originalSource = "#include \"file.h\"\n";
+        expectedSource =
+                "#include \"file.h\"\n\n\n"
+                "namespace N1 {\n"
+                "namespace N2 {\n"
+                "int Something::getIt() const\n"
+                "{\n"
+                "    return it;\n"
+                "}\n"
+                "\n"
+                "void Something::setIt(int value)\n"
+                "{\n"
+                "    it = value;\n"
+                "}\n\n"
+                "}\n"
+                "}\n";
+        QTest::addRow("insert new namespaces")
+                << QByteArrayList{originalHeader, expectedHeader}
+                << QByteArrayList{originalSource, expectedSource};
+
+        originalSource =
+                "#include \"file.h\"\n"
+                "namespace N2 {} // decoy\n";
+        expectedSource =
+                "#include \"file.h\"\n"
+                "namespace N2 {} // decoy\n\n\n"
+                "namespace N1 {\n"
+                "namespace N2 {\n"
+                "int Something::getIt() const\n"
+                "{\n"
+                "    return it;\n"
+                "}\n"
+                "\n"
+                "void Something::setIt(int value)\n"
+                "{\n"
+                "    it = value;\n"
+                "}\n\n"
+                "}\n"
+                "}\n";
+        QTest::addRow("insert new namespaces (with decoy)")
+                << QByteArrayList{originalHeader, expectedHeader}
+                << QByteArrayList{originalSource, expectedSource};
+
+        originalSource = "#include \"file.h\"\n"
+                         "namespace N2 {} // decoy\n"
+                         "namespace {\n"
+                         "namespace N1 {\n"
+                         "namespace {\n"
+                         "}\n"
+                         "}\n"
+                         "}\n";
+        expectedSource = "#include \"file.h\"\n"
+                         "namespace N2 {} // decoy\n"
+                         "namespace {\n"
+                         "namespace N1 {\n"
+                         "namespace {\n"
+                         "}\n"
+                         "}\n"
+                         "}\n"
+                         "\n"
+                         "\n"
+                         "namespace N1 {\n"
+                         "namespace N2 {\n"
+                         "int Something::getIt() const\n"
+                         "{\n"
+                         "    return it;\n"
+                         "}\n"
+                         "\n"
+                         "void Something::setIt(int value)\n"
+                         "{\n"
+                         "    it = value;\n"
+                         "}\n"
+                         "\n"
+                         "}\n"
+                         "}\n";
+        QTest::addRow("insert inner namespace (with decoy and unnamed)")
+            << QByteArrayList{originalHeader, expectedHeader}
+            << QByteArrayList{originalSource, expectedSource};
+
+        const QByteArray unnamedOriginalHeader = "namespace {\n" + originalHeader + "}\n";
+        const QByteArray unnamedExpectedHeader = "namespace {\n" + expectedHeader + "}\n";
+
+        originalSource = "#include \"file.h\"\n"
+                         "namespace N2 {} // decoy\n"
+                         "namespace {\n"
+                         "namespace N1 {\n"
+                         "namespace {\n"
+                         "}\n"
+                         "}\n"
+                         "}\n";
+        expectedSource = "#include \"file.h\"\n"
+                         "namespace N2 {} // decoy\n"
+                         "namespace {\n"
+                         "namespace N1 {\n"
+                         "\n"
+                         "namespace N2 {\n"
+                         "int Something::getIt() const\n"
+                         "{\n"
+                         "    return it;\n"
+                         "}\n"
+                         "\n"
+                         "void Something::setIt(int value)\n"
+                         "{\n"
+                         "    it = value;\n"
+                         "}\n"
+                         "\n"
+                         "}\n"
+                         "\n"
+                         "namespace {\n"
+                         "}\n"
+                         "}\n"
+                         "}\n";
+        QTest::addRow("insert inner namespace in unnamed (with decoy)")
+            << QByteArrayList{unnamedOriginalHeader, unnamedExpectedHeader}
+            << QByteArrayList{originalSource, expectedSource};
+
+        originalSource =
+                "#include \"file.h\"\n"
+                "namespace N1 {\n"
+                "namespace N2 {\n"
+                "namespace N3 {\n"
+                "}\n"
+                "}\n"
+                "}\n";
+        expectedSource =
+                "#include \"file.h\"\n"
+                "namespace N1 {\n"
+                "namespace N2 {\n"
+                "namespace N3 {\n"
+                "}\n\n"
+                "int Something::getIt() const\n"
+                "{\n"
+                "    return it;\n"
+                "}\n"
+                "\n"
+                "void Something::setIt(int value)\n"
+                "{\n"
+                "    it = value;\n"
+                "}\n\n"
+                "}\n"
+                "}\n";
+        QTest::addRow("all namespaces already present")
+                << QByteArrayList{originalHeader, expectedHeader}
+                << QByteArrayList{originalSource, expectedSource};
+
+        originalSource = "#include \"file.h\"\n"
+                         "namespace N1 {\n"
+                         "using namespace N2::N3;\n"
+                         "using namespace N2;\n"
+                         "using namespace N2;\n"
+                         "using namespace N3;\n"
+                         "}\n";
+        expectedSource = "#include \"file.h\"\n"
+                         "namespace N1 {\n"
+                         "using namespace N2::N3;\n"
+                         "using namespace N2;\n"
+                         "using namespace N2;\n"
+                         "using namespace N3;\n"
+                         "\n"
+                         "int Something::getIt() const\n"
+                         "{\n"
+                         "    return it;\n"
+                         "}\n"
+                         "\n"
+                         "void Something::setIt(int value)\n"
+                         "{\n"
+                         "    it = value;\n"
+                         "}\n\n"
+                         "}\n";
+        QTest::addRow("namespaces present and using namespace")
+            << QByteArrayList{originalHeader, expectedHeader}
+            << QByteArrayList{originalSource, expectedSource};
+
+        originalSource = "#include \"file.h\"\n"
+                         "using namespace N1::N2::N3;\n"
+                         "using namespace N1::N2;\n"
+                         "namespace N1 {\n"
+                         "using namespace N3;\n"
+                         "}\n";
+        expectedSource = "#include \"file.h\"\n"
+                         "using namespace N1::N2::N3;\n"
+                         "using namespace N1::N2;\n"
+                         "namespace N1 {\n"
+                         "using namespace N3;\n"
+                         "\n"
+                         "int Something::getIt() const\n"
+                         "{\n"
+                         "    return it;\n"
+                         "}\n"
+                         "\n"
+                         "void Something::setIt(int value)\n"
+                         "{\n"
+                         "    it = value;\n"
+                         "}\n"
+                         "\n"
+                         "}\n";
+        QTest::addRow("namespaces present and outer using namespace")
+            << QByteArrayList{originalHeader, expectedHeader}
+            << QByteArrayList{originalSource, expectedSource};
+
+        originalSource = "#include \"file.h\"\n"
+                         "using namespace N1;\n"
+                         "using namespace N2;\n"
+                         "namespace N3 {\n"
+                         "}\n";
+        expectedSource = "#include \"file.h\"\n"
+                         "using namespace N1;\n"
+                         "using namespace N2;\n"
+                         "namespace N3 {\n"
+                         "}\n"
+                         "\n"
+                         "int Something::getIt() const\n"
+                         "{\n"
+                         "    return it;\n"
+                         "}\n"
+                         "\n"
+                         "void Something::setIt(int value)\n"
+                         "{\n"
+                         "    it = value;\n"
+                         "}\n";
+        QTest::addRow("namespaces present and outer using namespace")
+            << QByteArrayList{originalHeader, expectedHeader}
+            << QByteArrayList{originalSource, expectedSource};
+    }
+
+    void testNamespaceHandlingCreate()
+    {
+        QFETCH(QByteArrayList, headers);
+        QFETCH(QByteArrayList, sources);
+
+        QList<TestDocumentPtr> testDocuments(
+            {CppTestDocument::create("file.h", headers.at(0), headers.at(1)),
+             CppTestDocument::create("file.cpp", sources.at(0), sources.at(1))});
+
+        QuickFixSettings s;
+        s->cppFileNamespaceHandling = CppQuickFixSettings::MissingNamespaceHandling::CreateMissing;
+        s->setterParameterNameTemplate = "value";
+        s->getterNameTemplate = "get<Name>";
+        s->setterInCppFileFrom = 1;
+        s->getterInCppFileFrom = 1;
+        GenerateGetterSetter factory;
+        QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 2);
+    }
+
+    void testNamespaceHandlingAddUsing_data()
+    {
+        QTest::addColumn<QByteArrayList>("headers");
+        QTest::addColumn<QByteArrayList>("sources");
+
+        QByteArray originalSource;
+        QByteArray expectedSource;
+
+        const QByteArray originalHeader = "namespace N1 {\n"
+                                          "namespace N2 {\n"
+                                          "class Something\n"
+                                          "{\n"
+                                          "    int @it;\n"
+                                          "};\n"
+                                          "}\n"
+                                          "}\n";
+        const QByteArray expectedHeader = "namespace N1 {\n"
+                                          "namespace N2 {\n"
+                                          "class Something\n"
+                                          "{\n"
+                                          "    int it;\n"
+                                          "\n"
+                                          "public:\n"
+                                          "    void setIt(int value);\n"
+                                          "};\n"
+                                          "}\n"
+                                          "}\n";
+
+        originalSource = "#include \"file.h\"\n";
+        expectedSource = "#include \"file.h\"\n\n"
+                         "using namespace N1::N2;\n"
+                         "void Something::setIt(int value)\n"
+                         "{\n"
+                         "    it = value;\n"
+                         "}\n";
+        QTest::addRow("add using namespaces") << QByteArrayList{originalHeader, expectedHeader}
+                                              << QByteArrayList{originalSource, expectedSource};
+
+        const QByteArray unnamedOriginalHeader = "namespace {\n" + originalHeader + "}\n";
+        const QByteArray unnamedExpectedHeader = "namespace {\n" + expectedHeader + "}\n";
+
+        originalSource = "#include \"file.h\"\n"
+                         "namespace N2 {} // decoy\n"
+                         "namespace {\n"
+                         "namespace N1 {\n"
+                         "namespace {\n"
+                         "}\n"
+                         "}\n"
+                         "}\n";
+        expectedSource = "#include \"file.h\"\n"
+                         "namespace N2 {} // decoy\n"
+                         "namespace {\n"
+                         "namespace N1 {\n"
+                         "using namespace N2;\n"
+                         "void Something::setIt(int value)\n"
+                         "{\n"
+                         "    it = value;\n"
+                         "}\n"
+                         "namespace {\n"
+                         "}\n"
+                         "}\n"
+                         "}\n";
+        QTest::addRow("insert using namespace into unnamed nested (with decoy)")
+            << QByteArrayList{unnamedOriginalHeader, unnamedExpectedHeader}
+            << QByteArrayList{originalSource, expectedSource};
+
+        originalSource = "#include \"file.h\"\n";
+        expectedSource = "#include \"file.h\"\n\n"
+                         "using namespace N1::N2;\n"
+                         "void Something::setIt(int value)\n"
+                         "{\n"
+                         "    it = value;\n"
+                         "}\n";
+        QTest::addRow("insert using namespace into unnamed")
+            << QByteArrayList{unnamedOriginalHeader, unnamedExpectedHeader}
+            << QByteArrayList{originalSource, expectedSource};
+
+        originalSource = "#include \"file.h\"\n"
+                         "namespace N2 {} // decoy\n"
+                         "namespace {\n"
+                         "namespace N1 {\n"
+                         "namespace {\n"
+                         "}\n"
+                         "}\n"
+                         "}\n";
+        expectedSource = "#include \"file.h\"\n"
+                         "namespace N2 {} // decoy\n"
+                         "namespace {\n"
+                         "namespace N1 {\n"
+                         "namespace {\n"
+                         "}\n"
+                         "}\n"
+                         "}\n"
+                         "\n"
+                         "using namespace N1::N2;\n"
+                         "void Something::setIt(int value)\n"
+                         "{\n"
+                         "    it = value;\n"
+                         "}\n";
+        QTest::addRow("insert using namespace (with decoy)")
+            << QByteArrayList{originalHeader, expectedHeader}
+            << QByteArrayList{originalSource, expectedSource};
+    }
+
+    void testNamespaceHandlingAddUsing()
+    {
+        QFETCH(QByteArrayList, headers);
+        QFETCH(QByteArrayList, sources);
+
+        QList<TestDocumentPtr> testDocuments(
+            {CppTestDocument::create("file.h", headers.at(0), headers.at(1)),
+             CppTestDocument::create("file.cpp", sources.at(0), sources.at(1))});
+
+        QuickFixSettings s;
+        s->cppFileNamespaceHandling = CppQuickFixSettings::MissingNamespaceHandling::AddUsingDirective;
+        s->setterParameterNameTemplate = "value";
+        s->setterInCppFileFrom = 1;
+
+        if (std::strstr(QTest::currentDataTag(), "unnamed nested") != nullptr)
+            QSKIP("TODO"); // FIXME
+        GenerateGetterSetter factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    void testNamespaceHandlingFullyQualify_data()
+    {
+        QTest::addColumn<QByteArrayList>("headers");
+        QTest::addColumn<QByteArrayList>("sources");
+
+        QByteArray originalSource;
+        QByteArray expectedSource;
+
+        const QByteArray originalHeader = "namespace N1 {\n"
+                                          "namespace N2 {\n"
+                                          "class Something\n"
+                                          "{\n"
+                                          "    int @it;\n"
+                                          "};\n"
+                                          "}\n"
+                                          "}\n";
+        const QByteArray expectedHeader = "namespace N1 {\n"
+                                          "namespace N2 {\n"
+                                          "class Something\n"
+                                          "{\n"
+                                          "    int it;\n"
+                                          "\n"
+                                          "public:\n"
+                                          "    void setIt(int value);\n"
+                                          "};\n"
+                                          "}\n"
+                                          "}\n";
+
+        originalSource = "#include \"file.h\"\n";
+        expectedSource = "#include \"file.h\"\n\n"
+                         "void N1::N2::Something::setIt(int value)\n"
+                         "{\n"
+                         "    it = value;\n"
+                         "}\n";
+        QTest::addRow("fully qualify") << QByteArrayList{originalHeader, expectedHeader}
+                                       << QByteArrayList{originalSource, expectedSource};
+
+        originalSource = "#include \"file.h\"\n"
+                         "namespace N2 {} // decoy\n";
+        expectedSource = "#include \"file.h\"\n"
+                         "namespace N2 {} // decoy\n"
+                         "\n"
+                         "void N1::N2::Something::setIt(int value)\n"
+                         "{\n"
+                         "    it = value;\n"
+                         "}\n";
+        QTest::addRow("fully qualify (with decoy)") << QByteArrayList{originalHeader, expectedHeader}
+                                                    << QByteArrayList{originalSource, expectedSource};
+
+        originalSource = "#include \"file.h\"\n"
+                         "namespace N2 {} // decoy\n"
+                         "namespace {\n"
+                         "namespace N1 {\n"
+                         "namespace {\n"
+                         "}\n"
+                         "}\n"
+                         "}\n";
+        expectedSource = "#include \"file.h\"\n"
+                         "namespace N2 {} // decoy\n"
+                         "namespace {\n"
+                         "namespace N1 {\n"
+                         "namespace {\n"
+                         "}\n"
+                         "}\n"
+                         "}\n"
+                         "\n"
+                         "void N1::N2::Something::setIt(int value)\n"
+                         "{\n"
+                         "    it = value;\n"
+                         "}\n";
+        QTest::addRow("qualify in inner namespace (with decoy)")
+            << QByteArrayList{originalHeader, expectedHeader}
+            << QByteArrayList{originalSource, expectedSource};
+
+        const QByteArray unnamedOriginalHeader = "namespace {\n" + originalHeader + "}\n";
+        const QByteArray unnamedExpectedHeader = "namespace {\n" + expectedHeader + "}\n";
+
+        originalSource = "#include \"file.h\"\n"
+                         "namespace N2 {} // decoy\n"
+                         "namespace {\n"
+                         "namespace N1 {\n"
+                         "namespace {\n"
+                         "}\n"
+                         "}\n"
+                         "}\n";
+        expectedSource = "#include \"file.h\"\n"
+                         "namespace N2 {} // decoy\n"
+                         "namespace {\n"
+                         "namespace N1 {\n"
+                         "void N2::Something::setIt(int value)\n"
+                         "{\n"
+                         "    it = value;\n"
+                         "}\n"
+                         "namespace {\n"
+                         "}\n"
+                         "}\n"
+                         "}\n";
+        QTest::addRow("qualify in inner namespace unnamed nested (with decoy)")
+            << QByteArrayList{unnamedOriginalHeader, unnamedExpectedHeader}
+            << QByteArrayList{originalSource, expectedSource};
+
+        originalSource = "#include \"file.h\"\n";
+        expectedSource = "#include \"file.h\"\n\n"
+                         "void N1::N2::Something::setIt(int value)\n"
+                         "{\n"
+                         "    it = value;\n"
+                         "}\n";
+        QTest::addRow("qualify in unnamed namespace")
+            << QByteArrayList{unnamedOriginalHeader, unnamedExpectedHeader}
+            << QByteArrayList{originalSource, expectedSource};
+    }
+
+    void testNamespaceHandlingFullyQualify()
+    {
+        QFETCH(QByteArrayList, headers);
+        QFETCH(QByteArrayList, sources);
+
+        QList<TestDocumentPtr> testDocuments(
+            {CppTestDocument::create("file.h", headers.at(0), headers.at(1)),
+             CppTestDocument::create("file.cpp", sources.at(0), sources.at(1))});
+
+        QuickFixSettings s;
+        s->cppFileNamespaceHandling = CppQuickFixSettings::MissingNamespaceHandling::RewriteType;
+        s->setterParameterNameTemplate = "value";
+        s->setterInCppFileFrom = 1;
+
+        if (std::strstr(QTest::currentDataTag(), "unnamed nested") != nullptr)
+            QSKIP("TODO"); // FIXME
+        GenerateGetterSetter factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    void testCustomNames_data()
+    {
+        QTest::addColumn<QByteArrayList>("headers");
+        QTest::addColumn<int>("operation");
+
+        QByteArray originalSource;
+        QByteArray expectedSource;
+
+        // Check if right names are created
+        originalSource = R"-(
+    class Test {
+        int m_fooBar_test@;
+    };
+)-";
+        expectedSource = R"-(
+    class Test {
+        int m_fooBar_test;
+
+    public:
+        int give_me_foo_bar_test() const
+        {
+            return m_fooBar_test;
+        }
+        void Seet_FooBar_test(int New_Foo_Bar_Test)
+        {
+            if (m_fooBar_test == New_Foo_Bar_Test)
+                return;
+            m_fooBar_test = New_Foo_Bar_Test;
+            emit newFooBarTestValue();
+        }
+        void set_fooBarTest_toDefault()
+        {
+            Seet_FooBar_test({}); // TODO: Adapt to use your actual default value
+        }
+
+    signals:
+        void newFooBarTestValue();
+
+    private:
+        Q_PROPERTY(int fooBar_test READ give_me_foo_bar_test WRITE Seet_FooBar_test RESET set_fooBarTest_toDefault NOTIFY newFooBarTestValue FINAL)
+    };
+)-";
+        QTest::addRow("create right names") << QByteArrayList{originalSource, expectedSource} << 4;
+
+        // Check if not triggered with custom names
+        originalSource = R"-(
+    class Test {
+        int m_fooBar_test@;
+
+    public:
+        int give_me_foo_bar_test() const
+        {
+            return m_fooBar_test;
+        }
+        void Seet_FooBar_test(int New_Foo_Bar_Test)
+        {
+            if (m_fooBar_test == New_Foo_Bar_Test)
+                return;
+            m_fooBar_test = New_Foo_Bar_Test;
+            emit newFooBarTestValue();
+        }
+        void set_fooBarTest_toDefault()
+        {
+            Seet_FooBar_test({}); // TODO: Adapt to use your actual default value
+        }
+
+    signals:
+        void newFooBarTestValue();
+
+    private:
+        Q_PROPERTY(int fooBar_test READ give_me_foo_bar_test WRITE Seet_FooBar_test RESET set_fooBarTest_toDefault NOTIFY newFooBarTestValue FINAL)
+    };
+)-";
+        expectedSource = "";
+        QTest::addRow("everything already exists") << QByteArrayList{originalSource, expectedSource} << 4;
+
+        // create from Q_PROPERTY with custom names
+        originalSource = R"-(
+    class Test {
+        Q_PROPER@TY(int fooBar_test READ give_me_foo_bar_test WRITE Seet_FooBar_test RESET set_fooBarTest_toDefault NOTIFY newFooBarTestValue FINAL)
+
+    public:
+        int give_me_foo_bar_test() const
+        {
+            return mem_fooBar_test;
+        }
+        void Seet_FooBar_test(int New_Foo_Bar_Test)
+        {
+            if (mem_fooBar_test == New_Foo_Bar_Test)
+                return;
+            mem_fooBar_test = New_Foo_Bar_Test;
+            emit newFooBarTestValue();
+        }
+        void set_fooBarTest_toDefault()
+        {
+            Seet_FooBar_test({}); // TODO: Adapt to use your actual default value
+        }
+
+    signals:
+        void newFooBarTestValue();
+    };
+)-";
+        expectedSource = R"-(
+    class Test {
+        Q_PROPERTY(int fooBar_test READ give_me_foo_bar_test WRITE Seet_FooBar_test RESET set_fooBarTest_toDefault NOTIFY newFooBarTestValue FINAL)
+
+    public:
+        int give_me_foo_bar_test() const
+        {
+            return mem_fooBar_test;
+        }
+        void Seet_FooBar_test(int New_Foo_Bar_Test)
+        {
+            if (mem_fooBar_test == New_Foo_Bar_Test)
+                return;
+            mem_fooBar_test = New_Foo_Bar_Test;
+            emit newFooBarTestValue();
+        }
+        void set_fooBarTest_toDefault()
+        {
+            Seet_FooBar_test({}); // TODO: Adapt to use your actual default value
+        }
+
+    signals:
+        void newFooBarTestValue();
+    private:
+        int mem_fooBar_test;
+    };
+)-";
+        QTest::addRow("create only member variable")
+            << QByteArrayList{originalSource, expectedSource} << 0;
+
+        // create from Q_PROPERTY with custom names
+        originalSource = R"-(
+    class Test {
+        Q_PROPE@RTY(int fooBar_test READ give_me_foo_bar_test WRITE Seet_FooBar_test RESET set_fooBarTest_toDefault NOTIFY newFooBarTestValue FINAL)
+        int mem_fooBar_test;
+    public:
+    };
+)-";
+        expectedSource = R"-(
+    class Test {
+        Q_PROPERTY(int fooBar_test READ give_me_foo_bar_test WRITE Seet_FooBar_test RESET set_fooBarTest_toDefault NOTIFY newFooBarTestValue FINAL)
+        int mem_fooBar_test;
+    public:
+        int give_me_foo_bar_test() const
+        {
+            return mem_fooBar_test;
+        }
+        void Seet_FooBar_test(int New_Foo_Bar_Test)
+        {
+            if (mem_fooBar_test == New_Foo_Bar_Test)
+                return;
+            mem_fooBar_test = New_Foo_Bar_Test;
+            emit newFooBarTestValue();
+        }
+        void set_fooBarTest_toDefault()
+        {
+            Seet_FooBar_test({}); // TODO: Adapt to use your actual default value
+        }
+    signals:
+        void newFooBarTestValue();
+    };
+)-";
+        QTest::addRow("create methods with given member variable")
+            << QByteArrayList{originalSource, expectedSource} << 0;
+    }
+
+    void testCustomNames()
+    {
+        QFETCH(QByteArrayList, headers);
+        QFETCH(int, operation);
+
+        QList<TestDocumentPtr> testDocuments(
+            {CppTestDocument::create("file.h", headers.at(0), headers.at(1))});
+
+        QuickFixSettings s;
+        s->setterInCppFileFrom = 0;
+        s->getterInCppFileFrom = 0;
+        s->setterNameTemplate = "Seet_<Name>";
+        s->getterNameTemplate = "give_me_<snake>";
+        s->signalNameTemplate = "new<Camel>Value";
+        s->setterParameterNameTemplate = "New_<Snake>";
+        s->resetNameTemplate = "set_<camel>_toDefault";
+        s->memberVariableNameTemplate = "mem_<name>";
+        if (operation == 0) {
+            InsertQtPropertyMembers factory;
+            QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), operation);
+        } else {
+            GenerateGetterSetter factory;
+            QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), operation);
+        }
+    }
+
+    void testValueTypes_data()
+    {
+        QTest::addColumn<QByteArrayList>("headers");
+        QTest::addColumn<int>("operation");
+
+        QByteArray originalSource;
+        QByteArray expectedSource;
+
+        // int should be a value type
+        originalSource = R"-(
+    class Test {
+        int i@;
+    };
+)-";
+        expectedSource = R"-(
+    class Test {
+        int i;
+
+    public:
+        int getI() const
+        {
+            return i;
+        }
+    };
+)-";
+        QTest::addRow("int") << QByteArrayList{originalSource, expectedSource} << 1;
+
+        // return type should be only int without const
+        originalSource = R"-(
+    class Test {
+        const int i@;
+    };
+)-";
+        expectedSource = R"-(
+    class Test {
+        const int i;
+
+    public:
+        int getI() const
+        {
+            return i;
+        }
+    };
+)-";
+        QTest::addRow("const int") << QByteArrayList{originalSource, expectedSource} << 0;
+
+        // float should be a value type
+        originalSource = R"-(
+    class Test {
+        float f@;
+    };
+)-";
+        expectedSource = R"-(
+    class Test {
+        float f;
+
+    public:
+        float getF() const
+        {
+            return f;
+        }
+    };
+)-";
+        QTest::addRow("float") << QByteArrayList{originalSource, expectedSource} << 1;
+
+        // pointer should be a value type
+        originalSource = R"-(
+    class Test {
+        void* v@;
+    };
+)-";
+        expectedSource = R"-(
+    class Test {
+        void* v;
+
+    public:
+        void *getV() const
+        {
+            return v;
+        }
+    };
+)-";
+        QTest::addRow("pointer") << QByteArrayList{originalSource, expectedSource} << 1;
+
+        // reference should be a value type (setter is const ref)
+        originalSource = R"-(
+    class Test {
+        int& r@;
+    };
+)-";
+        expectedSource = R"-(
+    class Test {
+        int& r;
+
+    public:
+        int &getR() const
+        {
+            return r;
+        }
+        void setR(const int &newR)
+        {
+            r = newR;
+        }
+    };
+)-";
+        QTest::addRow("reference to value type") << QByteArrayList{originalSource, expectedSource} << 2;
+
+        // reference should be a value type
+        originalSource = R"-(
+    using bar = int;
+    class Test {
+        bar i@;
+    };
+)-";
+        expectedSource = R"-(
+    using bar = int;
+    class Test {
+        bar i;
+
+    public:
+        bar getI() const
+        {
+            return i;
+        }
+    };
+)-";
+        QTest::addRow("value type through using") << QByteArrayList{originalSource, expectedSource} << 1;
+
+        // enum should be a value type
+        originalSource = R"-(
+    enum Foo{V1, V2};
+    class Test {
+        Foo e@;
+    };
+)-";
+        expectedSource = R"-(
+    enum Foo{V1, V2};
+    class Test {
+        Foo e;
+
+    public:
+        Foo getE() const
+        {
+            return e;
+        }
+    };
+)-";
+        QTest::addRow("enum") << QByteArrayList{originalSource, expectedSource} << 1;
+
+        // class should not be a value type
+        originalSource = R"-(
+    class NoVal{};
+    class Test {
+        NoVal n@;
+    };
+)-";
+        expectedSource = R"-(
+    class NoVal{};
+    class Test {
+        NoVal n;
+
+    public:
+        const NoVal &getN() const
+        {
+            return n;
+        }
+    };
+)-";
+        QTest::addRow("class") << QByteArrayList{originalSource, expectedSource} << 1;
+
+        // custom classes can be a value type
+        originalSource = R"-(
+    class Value{};
+    class Test {
+        Value v@;
+    };
+)-";
+        expectedSource = R"-(
+    class Value{};
+    class Test {
+        Value v;
+
+    public:
+        Value getV() const
+        {
+            return v;
+        }
+    };
+)-";
+        QTest::addRow("value class") << QByteArrayList{originalSource, expectedSource} << 1;
+
+        // custom classes (in namespace) can be a value type
+        originalSource = R"-(
+    namespace N1{
+    class Value{};
+    }
+    class Test {
+        N1::Value v@;
+    };
+)-";
+        expectedSource = R"-(
+    namespace N1{
+    class Value{};
+    }
+    class Test {
+        N1::Value v;
+
+    public:
+        N1::Value getV() const
+        {
+            return v;
+        }
+    };
+)-";
+        QTest::addRow("value class in namespace") << QByteArrayList{originalSource, expectedSource} << 1;
+
+        // custom template class can be a value type
+        originalSource = R"-(
+    template<typename T>
+    class Value{};
+    class Test {
+        Value<int> v@;
+    };
+)-";
+        expectedSource = R"-(
+    template<typename T>
+    class Value{};
+    class Test {
+        Value<int> v;
+
+    public:
+        Value<int> getV() const
+        {
+            return v;
+        }
+    };
+)-";
+        QTest::addRow("value template class") << QByteArrayList{originalSource, expectedSource} << 1;
+    }
+
+    void testValueTypes()
+    {
+        QFETCH(QByteArrayList, headers);
+        QFETCH(int, operation);
+
+        QList<TestDocumentPtr> testDocuments(
+            {CppTestDocument::create("file.h", headers.at(0), headers.at(1))});
+
+        QuickFixSettings s;
+        s->setterInCppFileFrom = 0;
+        s->getterInCppFileFrom = 0;
+        s->getterNameTemplate = "get<Name>";
+        s->valueTypes << "Value";
+        s->returnByConstRef = true;
+
+        GenerateGetterSetter factory;
+        QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), operation);
+    }
+
+    /// Checks: Use template for a custom type
+    void testCustomTemplate()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        const QByteArray customTypeDecl = R"--(
+namespace N1 {
+namespace N2 {
+struct test{};
+}
+template<typename T>
+struct custom {
+    void assign(const custom<T>&);
+    bool equals(const custom<T>&);
+    T* get();
+};
+)--";
+        // Header File
+        original = customTypeDecl + R"--(
+class Foo
+{
+public:
+    custom<N2::test> bar@;
+};
+})--";
+        expected = customTypeDecl + R"--(
+class Foo
+{
+public:
+    custom<N2::test> bar@;
+    N2::test *getBar() const;
+    void setBar(const custom<N2::test> &newBar);
+signals:
+    void barChanged(N2::test *bar);
+private:
+    Q_PROPERTY(N2::test *bar READ getBar NOTIFY barChanged FINAL)
+};
+})--";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original = "";
+        expected = R"-(
+using namespace N1;
+N2::test *Foo::getBar() const
+{
+    return bar.get();
+}
+
+void Foo::setBar(const custom<N2::test> &newBar)
+{
+    if (bar.equals(newBar))
+        return;
+    bar.assign(newBar);
+    emit barChanged(bar.get());
+}
+)-";
+
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        QuickFixSettings s;
+        s->cppFileNamespaceHandling = CppQuickFixSettings::MissingNamespaceHandling::AddUsingDirective;
+        s->getterNameTemplate = "get<Name>";
+        s->getterInCppFileFrom = 1;
+        s->signalWithNewValue = true;
+        CppQuickFixSettings::CustomTemplate t;
+        t.types.append("custom");
+        t.equalComparison = "<cur>.equals(<new>)";
+        t.returnExpression = "<cur>.get()";
+        t.returnType = "<T> *";
+        t.assignment = "<cur>.assign(<new>)";
+        s->customTemplates.push_back(t);
+
+        GenerateGetterSetter factory;
+        QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 5);
+    }
+
+    /// Checks: if the setter parameter name is the same as the member variable name, this-> is needed
+    void testNeedThis()
+    {
+        QList<TestDocumentPtr> testDocuments;
+
+        // Header File
+        const QByteArray original = R"-(
+    class Foo {
+        int bar@;
+    public:
+    };
+)-";
+        const QByteArray expected = R"-(
+    class Foo {
+        int bar@;
+    public:
+        void setBar(int bar)
+        {
+            this->bar = bar;
+        }
+    };
+)-";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        QuickFixSettings s;
+        s->setterParameterNameTemplate = "<name>";
+        s->setterInCppFileFrom = 0;
+
+        GenerateGetterSetter factory;
+        QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 0);
+    }
+
+    void testOfferedFixes_data()
+    {
+        QTest::addColumn<QByteArray>("header");
+        QTest::addColumn<QStringList>("offered");
+
+        QByteArray header;
+        QStringList offered;
+        const QString setter = QStringLiteral("Generate Setter");
+        const QString getter = QStringLiteral("Generate Getter");
+        const QString getset = QStringLiteral("Generate Getter and Setter");
+        const QString constQandMissing = QStringLiteral(
+            "Generate Constant Q_PROPERTY and Missing Members");
+        const QString qAndResetAndMissing = QStringLiteral(
+            "Generate Q_PROPERTY and Missing Members with Reset Function");
+        const QString qAndMissing = QStringLiteral("Generate Q_PROPERTY and Missing Members");
+        const QStringList all{setter, getter, getset, constQandMissing, qAndResetAndMissing, qAndMissing};
+
+        header = R"-(
+    class Foo {
+        static int bar@;
+    };
+)-";
+        offered = QStringList{setter, getter, getset, constQandMissing};
+        QTest::addRow("static") << header << offered;
+
+        header = R"-(
+    class Foo {
+        static const int bar@;
+    };
+)-";
+        offered = QStringList{getter, constQandMissing};
+        QTest::addRow("const static") << header << offered;
+
+        header = R"-(
+    class Foo {
+        const int bar@;
+    };
+)-";
+        offered = QStringList{getter, constQandMissing};
+        QTest::addRow("const") << header << offered;
+
+        header = R"-(
+    class Foo {
+        const int bar@;
+        int getBar() const;
+    };
+)-";
+        offered = QStringList{constQandMissing};
+        QTest::addRow("const + getter") << header << offered;
+
+        header = R"-(
+    class Foo {
+        const int bar@;
+        int getBar() const;
+        void setBar(int value);
+    };
+)-";
+        offered = QStringList{};
+        QTest::addRow("const + getter + setter") << header << offered;
+
+        header = R"-(
+    class Foo {
+        const int* bar@;
+    };
+)-";
+        offered = all;
+        QTest::addRow("pointer to const") << header << offered;
+
+        header = R"-(
+    class Foo {
+        int bar@;
+    public:
+        int bar();
+    };
+)-";
+        offered = QStringList{setter, constQandMissing, qAndResetAndMissing, qAndMissing};
+        QTest::addRow("existing getter") << header << offered;
+
+        header = R"-(
+    class Foo {
+        int bar@;
+    public:
+        set setBar(int);
+    };
+)-";
+        offered = QStringList{getter};
+        QTest::addRow("existing setter") << header << offered;
+
+        header = R"-(
+    class Foo {
+        int bar@;
+    signals:
+        void barChanged(int);
+    };
+)-";
+        offered = QStringList{setter, getter, getset, qAndResetAndMissing, qAndMissing};
+        QTest::addRow("existing signal (no const Q_PROPERTY)") << header << offered;
+
+        header = R"-(
+    class Foo {
+        int m_bar@;
+        Q_PROPERTY(int bar)
+    };
+)-";
+        offered = QStringList{}; // user should use "InsertQPropertyMembers", no duplicated code
+        QTest::addRow("existing Q_PROPERTY") << header << offered;
+    }
+
+    void testOfferedFixes()
+    {
+        QFETCH(QByteArray, header);
+        QFETCH(QStringList, offered);
+
+        QList<TestDocumentPtr> testDocuments(
+            {CppTestDocument::create("file.h", header, header)});
+
+        GenerateGetterSetter factory;
+        QuickFixOfferedOperationsTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), offered);
+    }
+
+    void testGeneral_data()
+    {
+        QTest::addColumn<int>("operation");
+        QTest::addColumn<QByteArray>("original");
+        QTest::addColumn<QByteArray>("expected");
+
+        QTest::newRow("GenerateGetterSetter_referenceToNonConst")
+            << 2
+            << QByteArray("\n"
+                 "class Something\n"
+                 "{\n"
+                 "    int &it@;\n"
+                 "};\n")
+            << QByteArray("\n"
+                 "class Something\n"
+                 "{\n"
+                 "    int &it;\n"
+                 "\n"
+                 "public:\n"
+                 "    int &getIt() const;\n"
+                 "    void setIt(const int &it);\n"
+                 "};\n"
+                 "\n"
+                 "int &Something::getIt() const\n"
+                 "{\n"
+                 "    return it;\n"
+                 "}\n"
+                 "\n"
+                 "void Something::setIt(const int &it)\n"
+                 "{\n"
+                 "    this->it = it;\n"
+                 "}\n");
+
+        // Checks: No special treatment for reference to const.
+        QTest::newRow("GenerateGetterSetter_referenceToConst")
+            << 2
+            << QByteArray("\n"
+                 "class Something\n"
+                 "{\n"
+                 "    const int &it@;\n"
+                 "};\n")
+            << QByteArray("\n"
+                 "class Something\n"
+                 "{\n"
+                 "    const int &it;\n"
+                 "\n"
+                 "public:\n"
+                 "    const int &getIt() const;\n"
+                 "    void setIt(const int &it);\n"
+                 "};\n"
+                 "\n"
+                 "const int &Something::getIt() const\n"
+                 "{\n"
+                 "    return it;\n"
+                 "}\n"
+                 "\n"
+                 "void Something::setIt(const int &it)\n"
+                 "{\n"
+                 "    this->it = it;\n"
+                 "}\n");
+
+        // Checks:
+        // 1. Setter: Setter is a static function.
+        // 2. Getter: Getter is a static, non const function.
+        QTest::newRow("GenerateGetterSetter_staticMember")
+            << 2
+            << QByteArray("\n"
+                 "class Something\n"
+                 "{\n"
+                 "    static int @m_member;\n"
+                 "};\n")
+            << QByteArray("\n"
+                 "class Something\n"
+                 "{\n"
+                 "    static int m_member;\n"
+                 "\n"
+                 "public:\n"
+                 "    static int member();\n"
+                 "    static void setMember(int member);\n"
+                 "};\n"
+                 "\n"
+                 "int Something::member()\n"
+                 "{\n"
+                 "    return m_member;\n"
+                 "}\n"
+                 "\n"
+                 "void Something::setMember(int member)\n"
+                 "{\n"
+                 "    m_member = member;\n"
+                 "}\n");
+
+        // Check: Check if it works on the second declarator
+        // clang-format off
+        QTest::newRow("GenerateGetterSetter_secondDeclarator") << 2
+            << QByteArray("\n"
+                "class Something\n"
+                "{\n"
+                "    int *foo, @it;\n"
+                "};\n")
+            << QByteArray("\n"
+                "class Something\n"
+                "{\n"
+                "    int *foo, it;\n"
+                "\n"
+                "public:\n"
+                "    int getIt() const;\n"
+                "    void setIt(int it);\n"
+                "};\n"
+                "\n"
+                "int Something::getIt() const\n"
+                "{\n"
+                "    return it;\n"
+                "}\n"
+                "\n"
+                "void Something::setIt(int it)\n"
+                "{\n"
+                "    this->it = it;\n"
+                "}\n");
+        // clang-format on
+
+        // Check: Quick fix is offered for "int *@it;" ('@' denotes the text cursor position)
+        QTest::newRow("GenerateGetterSetter_triggeringRightAfterPointerSign")
+            << 2
+            << QByteArray("\n"
+                 "class Something\n"
+                 "{\n"
+                 "    int *@it;\n"
+                 "};\n")
+            << QByteArray("\n"
+                 "class Something\n"
+                 "{\n"
+                 "    int *it;\n"
+                 "\n"
+                 "public:\n"
+                 "    int *getIt() const;\n"
+                 "    void setIt(int *it);\n"
+                 "};\n"
+                 "\n"
+                 "int *Something::getIt() const\n"
+                 "{\n"
+                 "    return it;\n"
+                 "}\n"
+                 "\n"
+                 "void Something::setIt(int *it)\n"
+                 "{\n"
+                 "    this->it = it;\n"
+                 "}\n");
+
+        // Checks if "m_" is recognized as "m" with the postfix "_" and not simply as "m_" prefix.
+        QTest::newRow("GenerateGetterSetter_recognizeMasVariableName")
+            << 2
+            << QByteArray("\n"
+                 "class Something\n"
+                 "{\n"
+                 "    int @m_;\n"
+                 "};\n")
+            << QByteArray("\n"
+                 "class Something\n"
+                 "{\n"
+                 "    int m_;\n"
+                 "\n"
+                 "public:\n"
+                 "    int m() const;\n"
+                 "    void setM(int m);\n"
+                 "};\n"
+                 "\n"
+                 "int Something::m() const\n"
+                 "{\n"
+                 "    return m_;\n"
+                 "}\n"
+                 "\n"
+                 "void Something::setM(int m)\n"
+                 "{\n"
+                 "    m_ = m;\n"
+                 "}\n");
+
+        // Checks if "m" followed by an upper character is recognized as a prefix
+        QTest::newRow("GenerateGetterSetter_recognizeMFollowedByCapital")
+            << 2
+            << QByteArray("\n"
+                 "class Something\n"
+                 "{\n"
+                 "    int @mFoo;\n"
+                 "};\n")
+            << QByteArray("\n"
+                 "class Something\n"
+                 "{\n"
+                 "    int mFoo;\n"
+                 "\n"
+                 "public:\n"
+                 "    int foo() const;\n"
+                 "    void setFoo(int foo);\n"
+                 "};\n"
+                 "\n"
+                 "int Something::foo() const\n"
+                 "{\n"
+                 "    return mFoo;\n"
+                 "}\n"
+                 "\n"
+                 "void Something::setFoo(int foo)\n"
+                 "{\n"
+                 "    mFoo = foo;\n"
+                 "}\n");
+    }
+
+    void testGeneral()
+    {
+        QFETCH(int, operation);
+        QFETCH(QByteArray, original);
+        QFETCH(QByteArray, expected);
+
+        QuickFixSettings s;
+        s->setterParameterNameTemplate = "<name>";
+        s->getterInCppFileFrom = 1;
+        s->setterInCppFileFrom = 1;
+
+        GenerateGetterSetter factory;
+        QuickFixOperationTest(singleDocument(original, expected),
+                              &factory,
+                              ProjectExplorer::HeaderPaths(),
+                              operation);
+    }
+
+    /// Checks: Only generate getter
+    void testOnlyGetter()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "class Foo\n"
+            "{\n"
+            "public:\n"
+            "    int bar@;\n"
+            "};\n";
+        expected =
+            "class Foo\n"
+            "{\n"
+            "public:\n"
+            "    int bar@;\n"
+            "    int getBar() const;\n"
+            "};\n";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original.resize(0);
+        expected =
+            "\n"
+            "int Foo::getBar() const\n"
+            "{\n"
+            "    return bar;\n"
+            "}\n";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        QuickFixSettings s;
+        s->getterInCppFileFrom = 1;
+        s->getterNameTemplate = "get<Name>";
+        GenerateGetterSetter factory;
+        QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 1);
+    }
+
+    /// Checks: Only generate setter
+    void testOnlySetter()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+        QuickFixSettings s;
+        s->setterAsSlot = true; // To be ignored, as we don't have QObjects here.
+
+        // Header File
+        original =
+            "class Foo\n"
+            "{\n"
+            "public:\n"
+            "    int bar@;\n"
+            "};\n";
+        expected =
+            "class Foo\n"
+            "{\n"
+            "public:\n"
+            "    int bar@;\n"
+            "    void setBar(int value);\n"
+            "};\n";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original.resize(0);
+        expected =
+            "\n"
+            "void Foo::setBar(int value)\n"
+            "{\n"
+            "    bar = value;\n"
+            "}\n";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        s->setterInCppFileFrom = 1;
+        s->setterParameterNameTemplate = "value";
+
+        GenerateGetterSetter factory;
+        QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 0);
+    }
+
+    void testAnonymousClass()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+        QuickFixSettings s;
+        s->setterInCppFileFrom = 1;
+        s->setterParameterNameTemplate = "value";
+
+        // Header File
+        original = R"(
+        class {
+            int @m_foo;
+        } bar;
+)";
+        expected = R"(
+        class {
+            int m_foo;
+
+        public:
+            int foo() const
+            {
+                return m_foo;
+            }
+            void setFoo(int value)
+            {
+                if (m_foo == value)
+                    return;
+                m_foo = value;
+                emit fooChanged();
+            }
+            void resetFoo()
+            {
+                setFoo({}); // TODO: Adapt to use your actual default defaultValue
+            }
+
+        signals:
+            void fooChanged();
+
+        private:
+            Q_PROPERTY(int foo READ foo WRITE setFoo RESET resetFoo NOTIFY fooChanged FINAL)
+        } bar;
+)";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        testDocuments << CppTestDocument::create("file.cpp", {}, {});
+
+        GenerateGetterSetter factory;
+        QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 4);
+    }
+
+    void testInlineInHeaderFile()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        const QByteArray original = R"-(
+    class Foo {
+    public:
+        int bar@;
+    };
+)-";
+        const QByteArray expected = R"-(
+    class Foo {
+    public:
+        int bar;
+        int getBar() const;
+        void setBar(int value);
+        void resetBar();
+    signals:
+        void barChanged();
+    private:
+        Q_PROPERTY(int bar READ getBar WRITE setBar RESET resetBar NOTIFY barChanged FINAL)
+    };
+
+    inline int Foo::getBar() const
+    {
+        return bar;
+    }
+
+    inline void Foo::setBar(int value)
+    {
+        if (bar == value)
+            return;
+        bar = value;
+        emit barChanged();
+    }
+
+    inline void Foo::resetBar()
+    {
+        setBar({}); // TODO: Adapt to use your actual default defaultValue
+    }
+)-";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        QuickFixSettings s;
+        s->setterOutsideClassFrom = 1;
+        s->getterOutsideClassFrom = 1;
+        s->setterParameterNameTemplate = "value";
+        s->getterNameTemplate = "get<Name>";
+
+        GenerateGetterSetter factory;
+        QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 4);
+    }
+
+    void testOnlySetterHeaderFileWithIncludeGuard()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        const QByteArray     original =
+                "#ifndef FILE__H__DECLARED\n"
+                "#define FILE__H__DECLARED\n"
+                "class Foo\n"
+                "{\n"
+                "public:\n"
+                "    int bar@;\n"
+                "};\n"
+                "#endif\n";
+        const QByteArray expected =
+                "#ifndef FILE__H__DECLARED\n"
+                "#define FILE__H__DECLARED\n"
+                "class Foo\n"
+                "{\n"
+                "public:\n"
+                "    int bar@;\n"
+                "    void setBar(int value);\n"
+                "};\n\n"
+                "inline void Foo::setBar(int value)\n"
+                "{\n"
+                "    bar = value;\n"
+                "}\n"
+                "#endif\n";
+
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        QuickFixSettings s;
+        s->setterOutsideClassFrom = 1;
+        s->setterParameterNameTemplate = "value";
+
+        GenerateGetterSetter factory;
+        QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 0);
+    }
+
+    void testFunctionAsTemplateArg()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        const QByteArray original = R"(
+    template<typename T> class TS {};
+    template<typename T, typename U> class TS<T(U)> {};
+
+    class S2 {
+        TS<int(int)> @member;
+    };
+)";
+        const QByteArray expected = R"(
+    template<typename T> class TS {};
+    template<typename T, typename U> class TS<T(U)> {};
+
+    class S2 {
+        TS<int(int)> member;
+
+    public:
+        const TS<int (int)> &getMember() const
+        {
+            return member;
+        }
+    };
+)";
+
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        QuickFixSettings s;
+        s->getterOutsideClassFrom = 0;
+        s->getterInCppFileFrom = 0;
+        s->getterNameTemplate = "get<Name>";
+        s->returnByConstRef = true;
+
+        GenerateGetterSetter factory;
+        QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 1);
+    }
+
+    void testNotTriggeringOnMemberFunction()
+    {
+        const QByteArray input = "class Something { void @f(); };\n";
+        GenerateGetterSetter factory;
+        QuickFixOperationTest({CppTestDocument::create("file.h", input, {})}, &factory);
+    }
+
+    void testNotTriggeringOnMemberArray()
+    {
+        const QByteArray input = "class Something { void @a[10]; };\n";
+        GenerateGetterSetter factory;
+        QuickFixOperationTest({CppTestDocument::create("file.h", input, {})}, &factory);
+    }
+};
+
+class GenerateGettersSettersTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test_data()
+    {
+        QTest::addColumn<QByteArray>("original");
+        QTest::addColumn<QByteArray>("expected");
+
+        const QByteArray onlyReset = R"(
+    class Foo {
+    public:
+        int bar() const;
+        void setBar(int bar);
+    private:
+        int m_bar;
+    @};)";
+
+        const QByteArray onlyResetAfter = R"(
+    class @Foo {
+    public:
+        int bar() const;
+        void setBar(int bar);
+        void resetBar();
+
+    private:
+        int m_bar;
+    };
+    inline void Foo::resetBar()
+    {
+        setBar({}); // TODO: Adapt to use your actual default defaultValue
+    }
+)";
+        QTest::addRow("only reset") << onlyReset << onlyResetAfter;
+
+        const QByteArray withCandidates = R"(
+    class @Foo {
+    public:
+        int bar() const;
+        void setBar(int bar) { m_bar = bar; }
+
+        int getBar2() const;
+
+        int m_alreadyPublic;
+
+    private:
+        friend void distraction();
+        class AnotherDistraction {};
+        enum EvenMoreDistraction { val1, val2 };
+
+        int m_bar;
+        int bar2_;
+        QString bar3;
+    };)";
+        const QByteArray after = R"(
+    class Foo {
+    public:
+        int bar() const;
+        void setBar(int bar) { m_bar = bar; }
+
+        int getBar2() const;
+
+        int m_alreadyPublic;
+
+        void resetBar();
+        void setBar2(int value);
+        void resetBar2();
+        const QString &getBar3() const;
+        void setBar3(const QString &value);
+        void resetBar3();
+
+    signals:
+        void bar2Changed();
+        void bar3Changed();
+
+    private:
+        friend void distraction();
+        class AnotherDistraction {};
+        enum EvenMoreDistraction { val1, val2 };
+
+        int m_bar;
+        int bar2_;
+        QString bar3;
+        Q_PROPERTY(int bar2 READ getBar2 WRITE setBar2 RESET resetBar2 NOTIFY bar2Changed FINAL)
+        Q_PROPERTY(QString bar3 READ getBar3 WRITE setBar3 RESET resetBar3 NOTIFY bar3Changed FINAL)
+    };
+    inline void Foo::resetBar()
+    {
+        setBar({}); // TODO: Adapt to use your actual default defaultValue
+    }
+
+    inline void Foo::setBar2(int value)
+    {
+        if (bar2_ == value)
+            return;
+        bar2_ = value;
+        emit bar2Changed();
+    }
+
+    inline void Foo::resetBar2()
+    {
+        setBar2({}); // TODO: Adapt to use your actual default defaultValue
+    }
+
+    inline const QString &Foo::getBar3() const
+    {
+        return bar3;
+    }
+
+    inline void Foo::setBar3(const QString &value)
+    {
+        if (bar3 == value)
+            return;
+        bar3 = value;
+        emit bar3Changed();
+    }
+
+    inline void Foo::resetBar3()
+    {
+        setBar3({}); // TODO: Adapt to use your actual default defaultValue
+    }
+)";
+        QTest::addRow("with candidates") << withCandidates << after;
+    }
+
+    void test()
+    {
+        class TestFactory : public GenerateGettersSettersForClass
+        {
+        public:
+            TestFactory() { setTest(); }
+        };
+
+        QFETCH(QByteArray, original);
+        QFETCH(QByteArray, expected);
+
+        QuickFixSettings s;
+        s->getterNameTemplate = "get<Name>";
+        s->setterParameterNameTemplate = "value";
+        s->setterOutsideClassFrom = 1;
+        s->getterOutsideClassFrom = 1;
+        s->returnByConstRef = true;
+
+        TestFactory factory;
+        QuickFixOperationTest({CppTestDocument::create("file.h", original, expected)}, &factory);
+    }
+};
+
+class InsertQtPropertyMembersTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test_data()
+    {
+        QTest::addColumn<QByteArray>("original");
+        QTest::addColumn<QByteArray>("expected");
+
+        QTest::newRow("InsertQtPropertyMembers")
+            << QByteArray("struct QObject { void connect(); }\n"
+                 "struct XmarksTheSpot : public QObject {\n"
+                 "    @Q_PROPERTY(int it READ getIt WRITE setIt RESET resetIt NOTIFY itChanged)\n"
+                 "};\n")
+            << QByteArray("struct QObject { void connect(); }\n"
+                 "struct XmarksTheSpot : public QObject {\n"
+                 "    Q_PROPERTY(int it READ getIt WRITE setIt RESET resetIt NOTIFY itChanged)\n"
+                 "\n"
+                 "public:\n"
+                 "    int getIt() const;\n"
+                 "\n"
+                 "public slots:\n"
+                 "    void setIt(int it)\n"
+                 "    {\n"
+                 "        if (m_it == it)\n"
+                 "            return;\n"
+                 "        m_it = it;\n"
+                 "        emit itChanged(m_it);\n"
+                 "    }\n"
+                 "    void resetIt()\n"
+                 "    {\n"
+                 "        setIt({}); // TODO: Adapt to use your actual default value\n"
+                 "    }\n"
+                 "\n"
+                 "signals:\n"
+                 "    void itChanged(int it);\n"
+                 "\n"
+                 "private:\n"
+                 "    int m_it;\n"
+                 "};\n"
+                 "\n"
+                 "int XmarksTheSpot::getIt() const\n"
+                 "{\n"
+                 "    return m_it;\n"
+                 "}\n");
+
+        QTest::newRow("InsertQtPropertyMembersResetWithoutSet")
+            << QByteArray("struct QObject { void connect(); }\n"
+                 "struct XmarksTheSpot : public QObject {\n"
+                 "    @Q_PROPERTY(int it READ getIt RESET resetIt NOTIFY itChanged)\n"
+                 "};\n")
+            << QByteArray("struct QObject { void connect(); }\n"
+                 "struct XmarksTheSpot : public QObject {\n"
+                 "    Q_PROPERTY(int it READ getIt RESET resetIt NOTIFY itChanged)\n"
+                 "\n"
+                 "public:\n"
+                 "    int getIt() const;\n"
+                 "\n"
+                 "public slots:\n"
+                 "    void resetIt()\n"
+                 "    {\n"
+                 "        static int defaultValue{}; // TODO: Adapt to use your actual default "
+                 "value\n"
+                 "        if (m_it == defaultValue)\n"
+                 "            return;\n"
+                 "        m_it = defaultValue;\n"
+                 "        emit itChanged(m_it);\n"
+                 "    }\n"
+                 "\n"
+                 "signals:\n"
+                 "    void itChanged(int it);\n"
+                 "\n"
+                 "private:\n"
+                 "    int m_it;\n"
+                 "};\n"
+                 "\n"
+                 "int XmarksTheSpot::getIt() const\n"
+                 "{\n"
+                 "    return m_it;\n"
+                 "}\n");
+
+        QTest::newRow("InsertQtPropertyMembersResetWithoutSetAndNotify")
+            << QByteArray("struct QObject { void connect(); }\n"
+                 "struct XmarksTheSpot : public QObject {\n"
+                 "    @Q_PROPERTY(int it READ getIt RESET resetIt)\n"
+                 "};\n")
+            << QByteArray("struct QObject { void connect(); }\n"
+                 "struct XmarksTheSpot : public QObject {\n"
+                 "    Q_PROPERTY(int it READ getIt RESET resetIt)\n"
+                 "\n"
+                 "public:\n"
+                 "    int getIt() const;\n"
+                 "\n"
+                 "public slots:\n"
+                 "    void resetIt()\n"
+                 "    {\n"
+                 "        static int defaultValue{}; // TODO: Adapt to use your actual default "
+                 "value\n"
+                 "        m_it = defaultValue;\n"
+                 "    }\n"
+                 "\n"
+                 "private:\n"
+                 "    int m_it;\n"
+                 "};\n"
+                 "\n"
+                 "int XmarksTheSpot::getIt() const\n"
+                 "{\n"
+                 "    return m_it;\n"
+                 "}\n");
+
+        QTest::newRow("InsertQtPropertyMembersPrivateBeforePublic")
+            << QByteArray("struct QObject { void connect(); }\n"
+                 "class XmarksTheSpot : public QObject {\n"
+                 "private:\n"
+                 "    @Q_PROPERTY(int it READ getIt WRITE setIt NOTIFY itChanged)\n"
+                 "public:\n"
+                 "    void find();\n"
+                 "};\n")
+            << QByteArray("struct QObject { void connect(); }\n"
+                 "class XmarksTheSpot : public QObject {\n"
+                 "private:\n"
+                 "    Q_PROPERTY(int it READ getIt WRITE setIt NOTIFY itChanged)\n"
+                 "    int m_it;\n"
+                 "\n"
+                 "public:\n"
+                 "    void find();\n"
+                 "    int getIt() const;\n"
+                 "public slots:\n"
+                 "    void setIt(int it)\n"
+                 "    {\n"
+                 "        if (m_it == it)\n"
+                 "            return;\n"
+                 "        m_it = it;\n"
+                 "        emit itChanged(m_it);\n"
+                 "    }\n"
+                 "signals:\n"
+                 "    void itChanged(int it);\n"
+                 "};\n"
+                 "\n"
+                 "int XmarksTheSpot::getIt() const\n"
+                 "{\n"
+                 "    return m_it;\n"
+                 "}\n");
+    }
+
+    void test()
+    {
+        QFETCH(QByteArray, original);
+        QFETCH(QByteArray, expected);
+
+        QuickFixSettings s;
+        s->setterAsSlot = true;
+        s->setterInCppFileFrom = 0;
+        s->setterParameterNameTemplate = "<name>";
+        s->signalWithNewValue = true;
+
+        InsertQtPropertyMembers factory;
+        QuickFixOperationTest({CppTestDocument::create("file.cpp", original, expected)}, &factory);
+    }
+
+    void testNotTriggeringOnInvalidCode()
+    {
+        const QByteArray input = "class C { @Q_PROPERTY(typeid foo READ foo) };\n";
+        InsertQtPropertyMembers factory;
+        QuickFixOperationTest({CppTestDocument::create("file.h", input, {})}, &factory);
+    }
+};
+
+class GenerateConstructorTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test_data()
+    {
+        QTest::addColumn<QByteArray>("original_header");
+        QTest::addColumn<QByteArray>("expected_header");
+        QTest::addColumn<QByteArray>("original_source");
+        QTest::addColumn<QByteArray>("expected_source");
+        QTest::addColumn<int>("location");
+        const int Inside = ConstructorLocation::Inside;
+        const int Outside = ConstructorLocation::Outside;
+        const int CppGenNamespace = ConstructorLocation::CppGenNamespace;
+        const int CppGenUsingDirective = ConstructorLocation::CppGenUsingDirective;
+        const int CppRewriteType = ConstructorLocation::CppRewriteType;
+
+        QByteArray header = R"--(
+class@ Foo{
+    int test;
+    static int s;
+};
+)--";
+        QByteArray expected = R"--(
+class Foo{
+    int test;
+    static int s;
+public:
+    Foo(int test) : test(test)
+    {}
+};
+)--";
+        QTest::newRow("ignore static") << header << expected << QByteArray() << QByteArray() << Inside;
+
+        header = R"--(
+class@ Foo{
+    CustomType test;
+};
+)--";
+        expected = R"--(
+class Foo{
+    CustomType test;
+public:
+    Foo(CustomType test) : test(std::move(test))
+    {}
+};
+)--";
+        QTest::newRow("Move custom value types")
+            << header << expected << QByteArray() << QByteArray() << Inside;
+
+        header = R"--(
+class@ Foo{
+    int test;
+protected:
+    Foo() = default;
+};
+)--";
+        expected = R"--(
+class Foo{
+    int test;
+public:
+    Foo(int test) : test(test)
+    {}
+
+protected:
+    Foo() = default;
+};
+)--";
+
+        QTest::newRow("new section before existing")
+            << header << expected << QByteArray() << QByteArray() << Inside;
+
+        header = R"--(
+class@ Foo{
+    int test;
+};
+)--";
+        expected = R"--(
+class Foo{
+    int test;
+public:
+    Foo(int test) : test(test)
+    {}
+};
+)--";
+        QTest::newRow("new section at end")
+            << header << expected << QByteArray() << QByteArray() << Inside;
+
+        header = R"--(
+class@ Foo{
+    int test;
+public:
+    /**
+     * Random comment
+     */
+    Foo(int i, int i2);
+};
+)--";
+        expected = R"--(
+class Foo{
+    int test;
+public:
+    Foo(int test) : test(test)
+    {}
+    /**
+     * Random comment
+     */
+    Foo(int i, int i2);
+};
+)--";
+        QTest::newRow("in section before")
+            << header << expected << QByteArray() << QByteArray() << Inside;
+
+        header = R"--(
+class@ Foo{
+    int test;
+public:
+    Foo() = default;
+};
+)--";
+        expected = R"--(
+class Foo{
+    int test;
+public:
+    Foo() = default;
+    Foo(int test) : test(test)
+    {}
+};
+)--";
+        QTest::newRow("in section after")
+            << header << expected << QByteArray() << QByteArray() << Inside;
+
+        header = R"--(
+class@ Foo{
+    int test1;
+    int test2;
+    int test3;
+public:
+};
+)--";
+        expected = R"--(
+class Foo{
+    int test1;
+    int test2;
+    int test3;
+public:
+    Foo(int test2, int test3, int test1) : test1(test1),
+        test2(test2),
+        test3(test3)
+    {}
+};
+)--";
+        // No worry, that is not the default behavior.
+        // Move first member to the back when testing with 3 or more members
+        QTest::newRow("changed parameter order")
+            << header << expected << QByteArray() << QByteArray() << Inside;
+
+        header = R"--(
+class@ Foo{
+    int test;
+    int di_test;
+public:
+};
+)--";
+        expected = R"--(
+class Foo{
+    int test;
+    int di_test;
+public:
+    Foo(int test, int di_test = 42) : test(test),
+        di_test(di_test)
+    {}
+};
+)--";
+        QTest::newRow("default parameters")
+            << header << expected << QByteArray() << QByteArray() << Inside;
+
+        header = R"--(
+struct Bar{
+    Bar(int i);
+};
+class@ Foo : public Bar{
+    int test;
+public:
+};
+)--";
+        expected = R"--(
+struct Bar{
+    Bar(int i);
+};
+class Foo : public Bar{
+    int test;
+public:
+    Foo(int test, int i) : Bar(i),
+        test(test)
+    {}
+};
+)--";
+        QTest::newRow("parent constructor")
+            << header << expected << QByteArray() << QByteArray() << Inside;
+
+        header = R"--(
+struct Bar{
+    Bar(int use_i = 6);
+};
+class@ Foo : public Bar{
+    int test;
+public:
+};
+)--";
+        expected = R"--(
+struct Bar{
+    Bar(int use_i = 6);
+};
+class Foo : public Bar{
+    int test;
+public:
+    Foo(int test, int use_i = 6) : Bar(use_i),
+        test(test)
+    {}
+};
+)--";
+        QTest::newRow("parent constructor with default")
+            << header << expected << QByteArray() << QByteArray() << Inside;
+
+        header = R"--(
+struct Bar{
+    Bar(int use_i = L'A', int use_i2 = u8"B");
+};
+class@ Foo : public Bar{
+public:
+};
+)--";
+        expected = R"--(
+struct Bar{
+    Bar(int use_i = L'A', int use_i2 = u8"B");
+};
+class Foo : public Bar{
+public:
+    Foo(int use_i = L'A', int use_i2 = u8"B") : Bar(use_i, use_i2)
+    {}
+};
+)--";
+        QTest::newRow("parent constructor with char/string default value")
+            << header << expected << QByteArray() << QByteArray() << Inside;
+
+        const QByteArray common = R"--(
+namespace N{
+    template<typename T>
+    struct vector{
+    };
+}
+)--";
+        header = common + R"--(
+namespace M{
+enum G{g};
+class@ Foo{
+    N::vector<G> g;
+    enum E{e}e;
+public:
+};
+}
+)--";
+
+        expected = common + R"--(
+namespace M{
+enum G{g};
+class@ Foo{
+    N::vector<G> g;
+    enum E{e}e;
+public:
+    Foo(const N::vector<G> &g, E e);
+};
+
+Foo::Foo(const N::vector<G> &g, Foo::E e) : g(g),
+    e(e)
+{}
+
+}
+)--";
+        QTest::newRow("source: right type outside class ")
+            << QByteArray() << QByteArray() << header << expected << Outside;
+        expected = common + R"--(
+namespace M{
+enum G{g};
+class@ Foo{
+    N::vector<G> g;
+    enum E{e}e;
+public:
+    Foo(const N::vector<G> &g, E e);
+};
+}
+
+
+inline M::Foo::Foo(const N::vector<M::G> &g, M::Foo::E e) : g(g),
+    e(e)
+{}
+
+)--";
+        QTest::newRow("header: right type outside class ")
+            << header << expected << QByteArray() << QByteArray() << Outside;
+
+        expected = common + R"--(
+namespace M{
+enum G{g};
+class@ Foo{
+    N::vector<G> g;
+    enum E{e}e;
+public:
+    Foo(const N::vector<G> &g, E e);
+};
+}
+)--";
+        const QByteArray source = R"--(
+#include "file.h"
+)--";
+        QByteArray expected_source = R"--(
+#include "file.h"
+
+
+namespace M {
+Foo::Foo(const N::vector<G> &g, Foo::E e) : g(g),
+    e(e)
+{}
+
+}
+)--";
+        QTest::newRow("source: right type inside namespace")
+            << header << expected << source << expected_source << CppGenNamespace;
+
+        expected_source = R"--(
+#include "file.h"
+
+using namespace M;
+Foo::Foo(const N::vector<G> &g, Foo::E e) : g(g),
+    e(e)
+{}
+)--";
+        QTest::newRow("source: right type with using directive")
+            << header << expected << source << expected_source << CppGenUsingDirective;
+
+        expected_source = R"--(
+#include "file.h"
+
+M::Foo::Foo(const N::vector<M::G> &g, M::Foo::E e) : g(g),
+    e(e)
+{}
+)--";
+        QTest::newRow("source: right type while rewritung types")
+            << header << expected << source << expected_source << CppRewriteType;
+
+    }
+
+    void test()
+    {
+        class TestFactory : public GenerateConstructor
+        {
+        public:
+            TestFactory() { setTest(); }
+        };
+
+        QFETCH(QByteArray, original_header);
+        QFETCH(QByteArray, expected_header);
+        QFETCH(QByteArray, original_source);
+        QFETCH(QByteArray, expected_source);
+        QFETCH(int, location);
+
+        QuickFixSettings s;
+        s->valueTypes << "CustomType";
+        using L = ConstructorLocation;
+        if (location == L::Inside) {
+            s->setterInCppFileFrom = -1;
+            s->setterOutsideClassFrom = -1;
+        } else if (location == L::Outside) {
+            s->setterInCppFileFrom = -1;
+            s->setterOutsideClassFrom = 1;
+        } else if (location >= L::CppGenNamespace && location <= L::CppRewriteType) {
+            s->setterInCppFileFrom = 1;
+            s->setterOutsideClassFrom = -1;
+            using Handling = CppQuickFixSettings::MissingNamespaceHandling;
+            if (location == L::CppGenNamespace)
+                s->cppFileNamespaceHandling = Handling::CreateMissing;
+            else if (location == L::CppGenUsingDirective)
+                s->cppFileNamespaceHandling = Handling::AddUsingDirective;
+            else if (location == L::CppRewriteType)
+                s->cppFileNamespaceHandling = Handling::RewriteType;
+        } else {
+            QFAIL("location is none of the values of the ConstructorLocation enum");
+        }
+
+        QList<TestDocumentPtr> testDocuments;
+        testDocuments << CppTestDocument::create("file.h", original_header, expected_header);
+        testDocuments << CppTestDocument::create("file.cpp", original_source, expected_source);
+        TestFactory factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+private:
+    enum ConstructorLocation { Inside, Outside, CppGenNamespace, CppGenUsingDirective, CppRewriteType };
+};
+
+QObject *GenerateGetterSetter::createTest()
+{
+    return new GenerateGetterSetterTest;
+}
+
+QObject *GenerateGettersSettersForClass::createTest()
+{
+    return new GenerateGettersSettersTest;
+}
+
+QObject *InsertQtPropertyMembers::createTest()
+{
+    return new InsertQtPropertyMembersTest;
+}
+
+QObject *GenerateConstructor::createTest()
+{
+    return new GenerateConstructorTest;
+}
+
+#endif // WITH_TESTS
+
+} // namespace
+
+void registerCodeGenerationQuickfixes()
+{
+    CppQuickFixFactory::registerFactory<GenerateGetterSetter>();
+    CppQuickFixFactory::registerFactory<GenerateGettersSettersForClass>();
+    CppQuickFixFactory::registerFactory<GenerateConstructor>();
+    CppQuickFixFactory::registerFactory<InsertQtPropertyMembers>();
+}
+
+} // namespace CppEditor::Internal
+
+#include <cppcodegenerationquickfixes.moc>
diff --git a/src/plugins/cppeditor/quickfixes/cppcodegenerationquickfixes.h b/src/plugins/cppeditor/quickfixes/cppcodegenerationquickfixes.h
new file mode 100644
index 00000000000..3cef95c7c1c
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/cppcodegenerationquickfixes.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerCodeGenerationQuickfixes();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp b/src/plugins/cppeditor/quickfixes/cppinsertvirtualmethods.cpp
similarity index 98%
rename from src/plugins/cppeditor/cppinsertvirtualmethods.cpp
rename to src/plugins/cppeditor/quickfixes/cppinsertvirtualmethods.cpp
index b34977cfd88..1a2ee5ab878 100644
--- a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp
+++ b/src/plugins/cppeditor/quickfixes/cppinsertvirtualmethods.cpp
@@ -3,12 +3,13 @@
 
 #include "cppinsertvirtualmethods.h"
 
-#include "cppcodestylesettings.h"
-#include "cppeditortr.h"
+#include "../cppcodestylesettings.h"
+#include "../cppeditortr.h"
+#include "../cpptoolsreuse.h"
+#include "../functionutils.h"
+#include "../insertionpointlocator.h"
 #include "cppquickfixassistant.h"
-#include "cpptoolsreuse.h"
-#include "functionutils.h"
-#include "insertionpointlocator.h"
+#include "cppquickfixhelpers.h"
 
 #include <coreplugin/icore.h>
 #include <texteditor/fontsettings.h>
@@ -116,6 +117,11 @@ public:
     QSortFilterProxyModel *classFunctionFilterModel;
 };
 
+void registerInsertVirtualMethodsQuickfix()
+{
+    CppQuickFixFactory::registerFactory<InsertVirtualMethods>();
+}
+
 } // namespace Internal
 } // namespace CppEditor
 
@@ -761,8 +767,7 @@ public:
         printer.showTemplateParameters = true;
         Utils::ChangeSet headerChangeSet;
         const CppRefactoringChanges refactoring(snapshot());
-        const Utils::FilePath filePath = currentFile()->filePath();
-        const CppRefactoringFilePtr headerFile = refactoring.cppFile(filePath);
+        const CppRefactoringFilePtr headerFile = currentFile();
         const LookupContext targetContext(headerFile->cppDocument(), snapshot());
 
         const Class *targetClass = m_classAST->symbol;
@@ -862,9 +867,8 @@ public:
 
         // Write header file
         if (!headerChangeSet.isEmpty()) {
-            headerFile->setChangeSet(headerChangeSet);
             headerFile->setOpenEditor(true, m_insertPosDecl);
-            headerFile->apply();
+            headerFile->apply(headerChangeSet);
         }
 
         // Insert in implementation file
@@ -915,10 +919,7 @@ public:
                 implementationChangeSet.insert(insertPos,  QLatin1String("\n\n") + defText);
             }
 
-            if (!implementationChangeSet.isEmpty()) {
-                implementationFile->setChangeSet(implementationChangeSet);
-                implementationFile->apply();
-            }
+            implementationFile->apply(implementationChangeSet);
         }
     }
 
@@ -1269,6 +1270,17 @@ public:
     void saveSettings() override { }
 };
 
+class InsertVirtualMethodsTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test_data();
+    void test();
+    void testImplementationFile();
+    void testBaseClassInNamespace();
+};
+
 void InsertVirtualMethodsTest::test_data()
 {
     QTest::addColumn<InsertVirtualMethodsDialog::ImplementationMode>("implementationMode");
@@ -1969,6 +1981,11 @@ InsertVirtualMethods *InsertVirtualMethods::createTestFactory()
                                         InsertVirtualMethodsDialog::ModeOutsideClass, true, false));
 }
 
+QObject *InsertVirtualMethods::createTest()
+{
+    return new Tests::InsertVirtualMethodsTest;
+}
+
 #endif // WITH_TESTS
 
 } // namespace Internal
diff --git a/src/plugins/cppeditor/cppinsertvirtualmethods.h b/src/plugins/cppeditor/quickfixes/cppinsertvirtualmethods.h
similarity index 73%
rename from src/plugins/cppeditor/cppinsertvirtualmethods.h
rename to src/plugins/cppeditor/quickfixes/cppinsertvirtualmethods.h
index 7116efde1d3..ffb749a71ec 100644
--- a/src/plugins/cppeditor/cppinsertvirtualmethods.h
+++ b/src/plugins/cppeditor/quickfixes/cppinsertvirtualmethods.h
@@ -19,6 +19,7 @@ public:
     void doMatch(const CppQuickFixInterface &interface,
                  TextEditor::QuickFixOperations &result) override;
 #ifdef WITH_TESTS
+    static QObject *createTest();
     static InsertVirtualMethods *createTestFactory();
 #endif
 
@@ -26,20 +27,7 @@ private:
     InsertVirtualMethodsDialog *m_dialog;
 };
 
-#ifdef WITH_TESTS
-namespace Tests {
-class InsertVirtualMethodsTest : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void test_data();
-    void test();
-    void testImplementationFile();
-    void testBaseClassInNamespace();
-};
-} // namespace Tests
-#endif // WITH_TESTS
+void registerInsertVirtualMethodsQuickfix();
 
 } // namespace Internal
 } // namespace CppEditor
diff --git a/src/plugins/cppeditor/quickfixes/cppquickfix.cpp b/src/plugins/cppeditor/quickfixes/cppquickfix.cpp
new file mode 100644
index 00000000000..a4052db83ec
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/cppquickfix.cpp
@@ -0,0 +1,187 @@
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "cppquickfix.h"
+
+#include "../baseeditordocumentprocessor.h"
+#include "../cppeditortr.h"
+#include "../cppeditorwidget.h"
+#include "../cppfunctiondecldeflink.h"
+#include "../cpprefactoringchanges.h"
+#include "assigntolocalvariable.h"
+#include "bringidentifierintoscope.h"
+#include "completeswitchstatement.h"
+#include "convertfromandtopointer.h"
+#include "convertnumericliteral.h"
+#include "convertqt4connect.h"
+#include "convertstringliteral.h"
+#include "converttocamelcase.h"
+#include "converttometamethodcall.h"
+#include "cppcodegenerationquickfixes.h"
+#include "cppinsertvirtualmethods.h"
+#include "cppquickfixassistant.h"
+#include "createdeclarationfromuse.h"
+#include "extractfunction.h"
+#include "extractliteralasparameter.h"
+#include "insertfunctiondefinition.h"
+#include "logicaloperationquickfixes.h"
+#include "moveclasstoownfile.h"
+#include "movefunctiondefinition.h"
+#include "rearrangeparamdeclarationlist.h"
+#include "reformatpointerdeclaration.h"
+#include "removeusingnamespace.h"
+#include "rewritecomment.h"
+#include "rewritecontrolstatements.h"
+#include "splitsimpledeclaration.h"
+#include "synchronizememberfunctionorder.h"
+
+#include <extensionsystem/pluginmanager.h>
+#include <extensionsystem/pluginspec.h>
+
+using namespace CPlusPlus;
+using namespace TextEditor;
+
+namespace CppEditor {
+namespace Internal {
+namespace {
+
+class ApplyDeclDefLinkOperation : public CppQuickFixOperation
+{
+public:
+    explicit ApplyDeclDefLinkOperation(const CppQuickFixInterface &interface,
+                                       const std::shared_ptr<FunctionDeclDefLink> &link)
+        : CppQuickFixOperation(interface, 100)
+        , m_link(link)
+    {}
+
+    void perform() override
+    {
+        if (editor()->declDefLink() == m_link)
+            editor()->applyDeclDefLinkChanges(/*don't jump*/false);
+    }
+
+private:
+    std::shared_ptr<FunctionDeclDefLink> m_link;
+};
+
+class ExtraRefactoringOperations : public CppQuickFixFactory
+{
+public:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const auto processor = CppModelManager::cppEditorDocumentProcessor(interface.filePath());
+        if (processor) {
+            const auto clangFixItOperations = processor->extraRefactoringOperations(interface);
+            result.append(clangFixItOperations);
+        }
+    }
+};
+
+//! Applies function signature changes
+class ApplyDeclDefLinkChanges: public CppQuickFixFactory
+{
+public:
+    void doMatch(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override
+    {
+        std::shared_ptr<FunctionDeclDefLink> link = interface.editor()->declDefLink();
+        if (!link || !link->isMarkerVisible())
+            return;
+
+        auto op = new ApplyDeclDefLinkOperation(interface, link);
+        op->setDescription(Tr::tr("Apply Function Signature Changes"));
+        result << op;
+    }
+};
+
+} // namespace
+
+static ExtensionSystem::IPlugin *getCppEditor()
+{
+    using namespace ExtensionSystem;
+    for (PluginSpec * const spec : PluginManager::plugins()) {
+        if (spec->name() == "CppEditor")
+            return spec->plugin();
+    }
+    QTC_ASSERT(false, return nullptr);
+}
+
+CppQuickFixOperation::~CppQuickFixOperation() = default;
+
+void createCppQuickFixFactories()
+{
+    new ApplyDeclDefLinkChanges;
+    new ExtraRefactoringOperations;
+
+    registerAssignToLocalVariableQuickfix();
+    registerBringIdentifierIntoScopeQuickfixes();
+    registerCodeGenerationQuickfixes();
+    registerCompleteSwitchStatementQuickfix();
+    registerConvertFromAndToPointerQuickfix();
+    registerConvertNumericLiteralQuickfix();
+    registerConvertQt4ConnectQuickfix();
+    registerConvertStringLiteralQuickfixes();
+    registerConvertToCamelCaseQuickfix();
+    registerConvertToMetaMethodCallQuickfix();
+    registerCreateDeclarationFromUseQuickfixes();
+    registerExtractFunctionQuickfix();
+    registerExtractLiteralAsParameterQuickfix();
+    registerInsertFunctionDefinitionQuickfixes();
+    registerInsertVirtualMethodsQuickfix();
+    registerLogicalOperationQuickfixes();
+    registerMoveClassToOwnFileQuickfix();
+    registerMoveFunctionDefinitionQuickfixes();
+    registerRearrangeParamDeclarationListQuickfix();
+    registerReformatPointerDeclarationQuickfix();
+    registerRemoveUsingNamespaceQuickfix();
+    registerRewriteCommentQuickfixes();
+    registerRewriteControlStatementQuickfixes();
+    registerSplitSimpleDeclarationQuickfix();
+    registerSynchronizeMemberFunctionOrderQuickfix();
+}
+
+static QList<CppQuickFixFactory *> g_cppQuickFixFactories;
+
+void destroyCppQuickFixFactories()
+{
+    for (int i = g_cppQuickFixFactories.size(); --i >= 0; )
+        delete g_cppQuickFixFactories.at(i);
+}
+
+} // namespace Internal
+
+CppQuickFixFactory::CppQuickFixFactory()
+{
+    Internal::g_cppQuickFixFactories.append(this);
+}
+
+CppQuickFixFactory::~CppQuickFixFactory()
+{
+    Internal::g_cppQuickFixFactories.removeOne(this);
+}
+
+ExtensionSystem::IPlugin *CppQuickFixFactory::cppEditor()
+{
+    static ExtensionSystem::IPlugin * const plugin = Internal::getCppEditor();
+    return plugin;
+}
+
+void CppQuickFixFactory::match(const Internal::CppQuickFixInterface &interface,
+                               QuickFixOperations &result)
+{
+    if (m_clangdReplacement) {
+        if (const auto clangdVersion = CppModelManager::usesClangd(
+                interface.currentFile()->editor()->textDocument());
+            clangdVersion && clangdVersion >= m_clangdReplacement) {
+            return;
+        }
+    }
+
+    doMatch(interface, result);
+}
+
+const QList<CppQuickFixFactory *> &CppQuickFixFactory::cppQuickFixFactories()
+{
+    return Internal::g_cppQuickFixFactories;
+}
+
+} // namespace CppEditor
diff --git a/src/plugins/cppeditor/cppquickfix.h b/src/plugins/cppeditor/quickfixes/cppquickfix.h
similarity index 61%
rename from src/plugins/cppeditor/cppquickfix.h
rename to src/plugins/cppeditor/quickfixes/cppquickfix.h
index eab753ad6bd..3d654661bc6 100644
--- a/src/plugins/cppeditor/cppquickfix.h
+++ b/src/plugins/cppeditor/quickfixes/cppquickfix.h
@@ -3,27 +3,34 @@
 
 #pragma once
 
-#include "cppeditor_global.h"
+#include "../cppeditor_global.h"
 #include "cppquickfixassistant.h"
 
+#include <extensionsystem/iplugin.h>
 #include <texteditor/quickfix.h>
 
+#include <QVersionNumber>
+
+#include <optional>
+
 namespace CppEditor {
 namespace Internal {
 class CppQuickFixInterface;
 
-// These are generated functions that should not be offered in quickfixes.
-const QStringList magicQObjectFunctions();
-
 class CppQuickFixOperation
     : public TextEditor::QuickFixOperation,
       public Internal::CppQuickFixInterface
 {
 public:
-    explicit CppQuickFixOperation(const CppQuickFixInterface &interface, int priority = -1);
+    explicit CppQuickFixOperation(const CppQuickFixInterface &interface, int priority = -1)
+        : QuickFixOperation(priority), CppQuickFixInterface(interface)
+    {}
     ~CppQuickFixOperation() override;
 };
 
+void createCppQuickFixFactories();
+void destroyCppQuickFixFactories();
+
 } // namespace Internal
 
 /*!
@@ -52,18 +59,31 @@ public:
 
     static const QList<CppQuickFixFactory *> &cppQuickFixFactories();
 
-    bool hasClangdReplacement() const { return m_hasClangdReplacement; }
-    void setHasClangdReplacement() { m_hasClangdReplacement = true; }
+    std::optional<QVersionNumber> clangdReplacement() const { return m_clangdReplacement; }
+    void setClangdReplacement(const QVersionNumber &version) { m_clangdReplacement = version; }
+
+    template<class Factory> static void registerFactory()
+    {
+        new Factory;
+#ifdef WITH_TESTS
+        cppEditor()->addTestCreator(Factory::createTest);
+#endif
+    }
 
 private:
     /*!
-        Implement this function to doMatch and create the appropriate
+        Implement this function to match and create the appropriate
         CppQuickFixOperation objects.
+        Make sure that the function is "cheap". Otherwise, since the match()
+        functions are also called to generate context menu entries,
+        the user might experience a delay opening the context menu.
      */
     virtual void doMatch(const Internal::CppQuickFixInterface &interface,
                          QuickFixOperations &result) = 0;
 
-    bool m_hasClangdReplacement = false;
+    static ExtensionSystem::IPlugin *cppEditor();
+
+    std::optional<QVersionNumber> m_clangdReplacement;
 };
 
 } // namespace CppEditor
diff --git a/src/plugins/cppeditor/quickfixes/cppquickfix_test.cpp b/src/plugins/cppeditor/quickfixes/cppquickfix_test.cpp
new file mode 100644
index 00000000000..f487764101b
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/cppquickfix_test.cpp
@@ -0,0 +1,251 @@
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "cppquickfix_test.h"
+
+#include "../cppcodestylepreferences.h"
+#include "../cppeditorwidget.h"
+#include "../cppmodelmanager.h"
+#include "../cppsourceprocessertesthelper.h"
+#include "../cpptoolssettings.h"
+#include "cppquickfixassistant.h"
+
+#include <projectexplorer/kitmanager.h>
+#include <projectexplorer/projectexplorer.h>
+#include <texteditor/textdocument.h>
+#include <utils/fileutils.h>
+
+#include <QDebug>
+#include <QDir>
+#include <QtTest>
+
+/*!
+    Tests for quick-fixes.
+ */
+using namespace Core;
+using namespace CPlusPlus;
+using namespace ProjectExplorer;
+using namespace TextEditor;
+using namespace Utils;
+
+using CppEditor::Tests::TemporaryDir;
+using CppEditor::Tests::Internal::TestIncludePaths;
+
+namespace CppEditor {
+namespace Internal {
+namespace Tests {
+
+QList<TestDocumentPtr> singleDocument(const QByteArray &original,
+                                                const QByteArray &expected)
+{
+    return {CppTestDocument::create("file.cpp", original, expected)};
+}
+
+BaseQuickFixTestCase::BaseQuickFixTestCase(const QList<TestDocumentPtr> &testDocuments,
+                                           const ProjectExplorer::HeaderPaths &headerPaths,
+                                           const QByteArray &clangFormatSettings)
+    : m_testDocuments(testDocuments)
+    , m_cppCodeStylePreferences(0)
+    , m_restoreHeaderPaths(false)
+{
+    QVERIFY(succeededSoFar());
+    m_succeededSoFar = false;
+
+    // Check if there is exactly one cursor marker
+    unsigned cursorMarkersCount = 0;
+    for (const TestDocumentPtr &document : std::as_const(m_testDocuments)) {
+        if (document->hasCursorMarker())
+            ++cursorMarkersCount;
+    }
+    QVERIFY2(cursorMarkersCount == 1, "Exactly one cursor marker is allowed.");
+
+    // Write documents to disk
+    m_temporaryDirectory.reset(new TemporaryDir);
+    QVERIFY(m_temporaryDirectory->isValid());
+    for (const TestDocumentPtr &document : std::as_const(m_testDocuments)) {
+        if (QFileInfo(document->m_fileName).isRelative())
+            document->setBaseDirectory(m_temporaryDirectory->path());
+        document->writeToDisk();
+    }
+
+    // Create .clang-format file
+    if (!clangFormatSettings.isEmpty())
+        m_temporaryDirectory->createFile(".clang-format", clangFormatSettings);
+
+    // Set appropriate include paths
+    if (!headerPaths.isEmpty()) {
+        m_restoreHeaderPaths = true;
+        m_headerPathsToRestore = CppModelManager::headerPaths();
+        CppModelManager::setHeaderPaths(headerPaths);
+    }
+
+    // Update Code Model
+    QSet<FilePath> filePaths;
+    for (const TestDocumentPtr &document : std::as_const(m_testDocuments))
+        filePaths << document->filePath();
+    QVERIFY(parseFiles(filePaths));
+
+    // Open Files
+    for (const TestDocumentPtr &document : std::as_const(m_testDocuments)) {
+        QVERIFY(openCppEditor(document->filePath(), &document->m_editor,
+                              &document->m_editorWidget));
+        closeEditorAtEndOfTestCase(document->m_editor);
+
+        // Set cursor position
+        if (document->hasCursorMarker()) {
+            if (document->hasAnchorMarker()) {
+                document->m_editor->setCursorPosition(document->m_anchorPosition);
+                document->m_editor->select(document->m_cursorPosition);
+            } else {
+                document->m_editor->setCursorPosition(document->m_cursorPosition);
+            }
+        } else {
+            document->m_editor->setCursorPosition(0);
+        }
+
+        // Rehighlight
+        QVERIFY(waitForRehighlightedSemanticDocument(document->m_editorWidget));
+    }
+
+    // Enforce the default cpp code style, so we are independent of config file settings.
+    // This is needed by e.g. the GenerateGetterSetter quick fix.
+    m_cppCodeStylePreferences = CppToolsSettings::cppCodeStyle();
+    QVERIFY(m_cppCodeStylePreferences);
+    m_cppCodeStylePreferencesOriginalDelegateId = m_cppCodeStylePreferences->currentDelegateId();
+    m_cppCodeStylePreferences->setCurrentDelegate("qt");
+
+    // Find the document having the cursor marker
+    for (const TestDocumentPtr &document : std::as_const(m_testDocuments)) {
+        if (document->hasCursorMarker()){
+            m_documentWithMarker = document;
+            break;
+        }
+    }
+
+    QVERIFY(m_documentWithMarker);
+    m_succeededSoFar = true;
+}
+
+BaseQuickFixTestCase::~BaseQuickFixTestCase()
+{
+    // Restore default cpp code style
+    if (m_cppCodeStylePreferences)
+        m_cppCodeStylePreferences->setCurrentDelegate(m_cppCodeStylePreferencesOriginalDelegateId);
+
+    // Restore include paths
+    if (m_restoreHeaderPaths)
+        CppModelManager::setHeaderPaths(m_headerPathsToRestore);
+
+    // Remove created files from file system
+    for (const TestDocumentPtr &testDocument : std::as_const(m_testDocuments))
+        QVERIFY(testDocument->filePath().removeFile());
+}
+
+QuickFixOfferedOperationsTest::QuickFixOfferedOperationsTest(
+        const QList<TestDocumentPtr> &testDocuments,
+        CppQuickFixFactory *factory,
+        const ProjectExplorer::HeaderPaths &headerPaths,
+        const QStringList &expectedOperations)
+    : BaseQuickFixTestCase(testDocuments, headerPaths)
+{
+    // Get operations
+    CppQuickFixInterface quickFixInterface(m_documentWithMarker->m_editorWidget, ExplicitlyInvoked);
+    QuickFixOperations actualOperations;
+    factory->match(quickFixInterface, actualOperations);
+
+    // Convert to QStringList
+    QStringList actualOperationsAsStringList;
+    for (const QuickFixOperation::Ptr &operation : std::as_const(actualOperations))
+        actualOperationsAsStringList << operation->description();
+
+    QCOMPARE(actualOperationsAsStringList, expectedOperations);
+}
+
+/// Leading whitespace is not removed, so we can check if the indetation ranges
+/// have been set correctly by the quick-fix.
+static QString &removeTrailingWhitespace(QString &input)
+{
+    const QStringList lines = input.split(QLatin1Char('\n'));
+    input.resize(0);
+    for (int i = 0, total = lines.size(); i < total; ++i) {
+        QString line = lines.at(i);
+        while (line.length() > 0) {
+            QChar lastChar = line[line.length() - 1];
+            if (lastChar == QLatin1Char(' ') || lastChar == QLatin1Char('\t'))
+                line.chop(1);
+            else
+                break;
+        }
+        input.append(line);
+
+        const bool isLastLine = i == lines.size() - 1;
+        if (!isLastLine)
+            input.append(QLatin1Char('\n'));
+    }
+    return input;
+}
+
+QuickFixOperationTest::QuickFixOperationTest(const QList<TestDocumentPtr> &testDocuments,
+                                             CppQuickFixFactory *factory,
+                                             const ProjectExplorer::HeaderPaths &headerPaths,
+                                             int operationIndex,
+                                             const QByteArray &expectedFailMessage,
+                                             const QByteArray &clangFormatSettings)
+    : BaseQuickFixTestCase(testDocuments, headerPaths, clangFormatSettings)
+{
+    if (factory->clangdReplacement() && CppModelManager::isClangCodeModelActive())
+        return;
+
+    QVERIFY(succeededSoFar());
+
+    // Perform operation if there is one
+    CppQuickFixInterface quickFixInterface(m_documentWithMarker->m_editorWidget, ExplicitlyInvoked);
+    QuickFixOperations operations;
+    factory->match(quickFixInterface, operations);
+    if (operations.isEmpty()) {
+        QEXPECT_FAIL("QTCREATORBUG-25998", "FIXME", Abort);
+        QVERIFY(testDocuments.first()->m_expectedSource.isEmpty());
+        return;
+    }
+
+    QVERIFY(operationIndex < operations.size());
+    const QuickFixOperation::Ptr operation = operations.at(operationIndex);
+    operation->perform();
+
+    // Compare all files
+    for (const TestDocumentPtr &testDocument : std::as_const(m_testDocuments)) {
+        // Check
+        QString result = testDocument->m_editorWidget->document()->toPlainText();
+        removeTrailingWhitespace(result);
+        QEXPECT_FAIL("escape string literal: raw string literal", "FIXME", Continue);
+        QEXPECT_FAIL("escape string literal: unescape adjacent literals", "FIXME", Continue);
+        if (!expectedFailMessage.isEmpty())
+            QEXPECT_FAIL("", expectedFailMessage.data(), Continue);
+        else if (result != testDocument->m_expectedSource) {
+            qDebug() << "---" << testDocument->m_expectedSource;
+            qDebug() << "+++" << result;
+        }
+        QCOMPARE(result, testDocument->m_expectedSource);
+
+        // Undo the change
+        for (int i = 0; i < 100; ++i)
+            testDocument->m_editorWidget->undo();
+        result = testDocument->m_editorWidget->document()->toPlainText();
+        QCOMPARE(result, testDocument->m_source);
+    }
+}
+
+void QuickFixOperationTest::run(const QList<TestDocumentPtr> &testDocuments,
+                                CppQuickFixFactory *factory,
+                                const QString &headerPath,
+                                int operationIndex)
+{
+    ProjectExplorer::HeaderPaths headerPaths;
+    headerPaths.push_back(ProjectExplorer::HeaderPath::makeUser(headerPath));
+    QuickFixOperationTest(testDocuments, factory, headerPaths, operationIndex);
+}
+
+} // namespace Tests
+} // namespace Internal
+} // namespace CppEditor
+
diff --git a/src/plugins/cppeditor/quickfixes/cppquickfix_test.h b/src/plugins/cppeditor/quickfixes/cppquickfix_test.h
new file mode 100644
index 00000000000..b1990629706
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/cppquickfix_test.h
@@ -0,0 +1,94 @@
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "../cpptoolstestcase.h"
+#include "cppquickfix.h"
+#include "cppquickfixsettings.h"
+
+#include <projectexplorer/headerpath.h>
+
+#include <QByteArray>
+#include <QList>
+#include <QObject>
+#include <QSharedPointer>
+#include <QStringList>
+
+namespace TextEditor { class QuickFixOperation; }
+
+namespace CppEditor {
+class CppCodeStylePreferences;
+
+namespace Internal {
+namespace Tests {
+
+class QuickFixSettings
+{
+    const CppQuickFixSettings original = *CppQuickFixSettings::instance();
+
+public:
+    CppQuickFixSettings *operator->() { return CppQuickFixSettings::instance(); }
+    ~QuickFixSettings() { *CppQuickFixSettings::instance() = original; }
+};
+
+class BaseQuickFixTestCase : public CppEditor::Tests::TestCase
+{
+public:
+    /// Exactly one QuickFixTestDocument must contain the cursor position marker '@'
+    /// or "@{start}" and "@{end}"
+    BaseQuickFixTestCase(const QList<TestDocumentPtr> &testDocuments,
+                         const ProjectExplorer::HeaderPaths &headerPaths,
+                         const QByteArray &clangFormatSettings = {});
+
+    ~BaseQuickFixTestCase();
+
+protected:
+    TestDocumentPtr m_documentWithMarker;
+    QList<TestDocumentPtr> m_testDocuments;
+
+private:
+    QScopedPointer<CppEditor::Tests::TemporaryDir> m_temporaryDirectory;
+
+    CppCodeStylePreferences *m_cppCodeStylePreferences;
+    QByteArray m_cppCodeStylePreferencesOriginalDelegateId;
+
+    ProjectExplorer::HeaderPaths m_headerPathsToRestore;
+    bool m_restoreHeaderPaths;
+};
+
+/// Tests the offered operations provided by a given CppQuickFixFactory
+class QuickFixOfferedOperationsTest : public BaseQuickFixTestCase
+{
+public:
+    QuickFixOfferedOperationsTest(const QList<TestDocumentPtr> &testDocuments,
+                                  CppQuickFixFactory *factory,
+                                  const ProjectExplorer::HeaderPaths &headerPaths
+                                  = ProjectExplorer::HeaderPaths(),
+                                  const QStringList &expectedOperations = QStringList());
+};
+
+/// Tests a concrete QuickFixOperation of a given CppQuickFixFactory
+class QuickFixOperationTest : public BaseQuickFixTestCase
+{
+public:
+    QuickFixOperationTest(const QList<TestDocumentPtr> &testDocuments,
+                          CppQuickFixFactory *factory,
+                          const ProjectExplorer::HeaderPaths &headerPaths
+                            = ProjectExplorer::HeaderPaths(),
+                          int operationIndex = 0,
+                          const QByteArray &expectedFailMessage = {},
+                          const QByteArray &clangFormatSettings = {});
+
+    static void run(const QList<TestDocumentPtr> &testDocuments,
+                    CppQuickFixFactory *factory,
+                    const QString &headerPath,
+                    int operationIndex = 0);
+};
+
+QList<TestDocumentPtr> singleDocument(const QByteArray &original,
+                                                const QByteArray &expected);
+
+} // namespace Tests
+} // namespace Internal
+} // namespace CppEditor
diff --git a/src/plugins/cppeditor/cppquickfixassistant.cpp b/src/plugins/cppeditor/quickfixes/cppquickfixassistant.cpp
similarity index 97%
rename from src/plugins/cppeditor/cppquickfixassistant.cpp
rename to src/plugins/cppeditor/quickfixes/cppquickfixassistant.cpp
index 1456ce56042..834abaed8ab 100644
--- a/src/plugins/cppeditor/cppquickfixassistant.cpp
+++ b/src/plugins/cppeditor/quickfixes/cppquickfixassistant.cpp
@@ -3,10 +3,10 @@
 
 #include "cppquickfixassistant.h"
 
-#include "cppeditorwidget.h"
-#include "cppmodelmanager.h"
+#include "../cppeditorwidget.h"
+#include "../cppmodelmanager.h"
+#include "../cpprefactoringchanges.h"
 #include "cppquickfix.h"
-#include "cpprefactoringchanges.h"
 
 #include <texteditor/codeassist/genericproposal.h>
 #include <texteditor/codeassist/iassistprocessor.h>
diff --git a/src/plugins/cppeditor/cppquickfixassistant.h b/src/plugins/cppeditor/quickfixes/cppquickfixassistant.h
similarity index 97%
rename from src/plugins/cppeditor/cppquickfixassistant.h
rename to src/plugins/cppeditor/quickfixes/cppquickfixassistant.h
index 63a37f715a7..db818c923cd 100644
--- a/src/plugins/cppeditor/cppquickfixassistant.h
+++ b/src/plugins/cppeditor/quickfixes/cppquickfixassistant.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "cppsemanticinfo.h"
+#include "../cppsemanticinfo.h"
 
 #include <texteditor/codeassist/assistinterface.h>
 #include <texteditor/codeassist/iassistprovider.h>
diff --git a/src/plugins/cppeditor/quickfixes/cppquickfixhelpers.cpp b/src/plugins/cppeditor/quickfixes/cppquickfixhelpers.cpp
new file mode 100644
index 00000000000..eb67b928dbd
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/cppquickfixhelpers.cpp
@@ -0,0 +1,199 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "cppquickfixhelpers.h"
+
+#include "../cppcodestylesettings.h"
+#include "../cppprojectfile.h"
+#include "../includeutils.h"
+#include "cppquickfixassistant.h"
+
+#include <cplusplus/CppRewriter.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/TypeOfExpression.h>
+
+using namespace CPlusPlus;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+
+void insertNewIncludeDirective(
+    const QString &include,
+    CppRefactoringFilePtr file,
+    const Document::Ptr &cppDocument,
+    ChangeSet &changes)
+{
+    // Find optimal position
+    unsigned newLinesToPrepend = 0;
+    unsigned newLinesToAppend = 0;
+    const int insertLine = lineForNewIncludeDirective(
+        file->filePath(),
+        file->document(),
+        cppDocument,
+        IgnoreMocIncludes,
+        AutoDetect,
+        include,
+        &newLinesToPrepend,
+        &newLinesToAppend);
+    QTC_ASSERT(insertLine >= 1, return);
+    const int insertPosition = file->position(insertLine, 1);
+    QTC_ASSERT(insertPosition >= 0, return);
+
+    // Construct text to insert
+    const QString includeLine = QLatin1String("#include ") + include + QLatin1Char('\n');
+    QString prependedNewLines, appendedNewLines;
+    while (newLinesToAppend--)
+        appendedNewLines += QLatin1String("\n");
+    while (newLinesToPrepend--)
+        prependedNewLines += QLatin1String("\n");
+    const QString textToInsert = prependedNewLines + includeLine + appendedNewLines;
+
+    // Insert
+    changes.insert(insertPosition, textToInsert);
+}
+
+ClassSpecifierAST *astForClassOperations(const CppQuickFixInterface &interface)
+{
+    const QList<AST *> &path = interface.path();
+    if (path.isEmpty())
+        return nullptr;
+    if (const auto classSpec = path.last()->asClassSpecifier()) // Cursor inside class decl?
+        return classSpec;
+
+    // Cursor on a class name?
+    if (path.size() < 2)
+        return nullptr;
+    const SimpleNameAST * const nameAST = path.at(path.size() - 1)->asSimpleName();
+    if (!nameAST || !interface.isCursorOn(nameAST))
+        return nullptr;
+    if (const auto classSpec = path.at(path.size() - 2)->asClassSpecifier())
+        return classSpec;
+    return nullptr;
+}
+
+bool nameIncludesOperatorName(const Name *name)
+{
+    return name->asOperatorNameId()
+           || (name->asQualifiedNameId() && name->asQualifiedNameId()->name()->asOperatorNameId());
+}
+
+QString inlinePrefix(const FilePath &targetFile, const std::function<bool()> &extraCondition)
+{
+    if (ProjectFile::isHeader(ProjectFile::classify(targetFile.path()))
+        && (!extraCondition || extraCondition())) {
+        return "inline ";
+    }
+    return {};
+}
+
+Class *isMemberFunction(const CPlusPlus::LookupContext &context, CPlusPlus::Function *function)
+{
+    QTC_ASSERT(function, return nullptr);
+
+    Scope *enclosingScope = function->enclosingScope();
+    while (!(enclosingScope->asNamespace() || enclosingScope->asClass()))
+        enclosingScope = enclosingScope->enclosingScope();
+    QTC_ASSERT(enclosingScope != nullptr, return nullptr);
+
+    const Name *functionName = function->name();
+    if (!functionName)
+        return nullptr;
+
+    if (!functionName->asQualifiedNameId())
+        return nullptr; // trying to add a declaration for a global function
+
+    const QualifiedNameId *q = functionName->asQualifiedNameId();
+    if (!q->base())
+        return nullptr;
+
+    if (ClassOrNamespace *binding = context.lookupType(q->base(), enclosingScope)) {
+        const QList<Symbol *> symbols = binding->symbols();
+        for (Symbol *s : symbols) {
+            if (Class *matchingClass = s->asClass())
+                return matchingClass;
+        }
+    }
+
+    return nullptr;
+}
+
+CPlusPlus::Namespace *isNamespaceFunction(
+    const CPlusPlus::LookupContext &context, CPlusPlus::Function *function)
+{
+    QTC_ASSERT(function, return nullptr);
+    if (isMemberFunction(context, function))
+        return nullptr;
+
+    Scope *enclosingScope = function->enclosingScope();
+    while (!(enclosingScope->asNamespace() || enclosingScope->asClass()))
+        enclosingScope = enclosingScope->enclosingScope();
+    QTC_ASSERT(enclosingScope != nullptr, return nullptr);
+
+    const Name *functionName = function->name();
+    if (!functionName)
+        return nullptr;
+
+    // global namespace
+    if (!functionName->asQualifiedNameId()) {
+        const QList<Symbol *> symbols = context.globalNamespace()->symbols();
+        for (Symbol *s : symbols) {
+            if (Namespace *matchingNamespace = s->asNamespace())
+                return matchingNamespace;
+        }
+        return nullptr;
+    }
+
+    const QualifiedNameId *q = functionName->asQualifiedNameId();
+    if (!q->base())
+        return nullptr;
+
+    if (ClassOrNamespace *binding = context.lookupType(q->base(), enclosingScope)) {
+        const QList<Symbol *> symbols = binding->symbols();
+        for (Symbol *s : symbols) {
+            if (Namespace *matchingNamespace = s->asNamespace())
+                return matchingNamespace;
+        }
+    }
+
+    return nullptr;
+}
+
+QString nameString(const CPlusPlus::NameAST *name)
+{
+    return CppCodeStyleSettings::currentProjectCodeStyleOverview().prettyName(name->name);
+}
+
+CPlusPlus::FullySpecifiedType typeOfExpr(
+    const ExpressionAST *expr,
+    const CppRefactoringFilePtr &file,
+    const Snapshot &snapshot,
+    const LookupContext &context)
+{
+    TypeOfExpression typeOfExpression;
+    typeOfExpression.init(file->cppDocument(), snapshot, context.bindings());
+    Scope *scope = file->scopeAt(expr->firstToken());
+    const QList<LookupItem> result
+        = typeOfExpression(file->textOf(expr).toUtf8(), scope, TypeOfExpression::Preprocess);
+    if (result.isEmpty())
+        return {};
+
+    SubstitutionEnvironment env;
+    env.setContext(context);
+    env.switchScope(result.first().scope());
+    ClassOrNamespace *con = typeOfExpression.context().lookupType(scope);
+    if (!con)
+        con = typeOfExpression.context().globalNamespace();
+    UseMinimalNames q(con);
+    env.enter(&q);
+
+    Control *control = context.bindings()->control().get();
+    return rewriteType(result.first().type(), &env, control);
+}
+
+const QStringList magicQObjectFunctions()
+{
+    static QStringList list{"metaObject", "qt_metacast", "qt_metacall", "qt_static_metacall"};
+    return list;
+}
+
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/cppquickfixhelpers.h b/src/plugins/cppeditor/quickfixes/cppquickfixhelpers.h
new file mode 100644
index 00000000000..b083fdb0d84
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/cppquickfixhelpers.h
@@ -0,0 +1,47 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "../cpprefactoringchanges.h"
+
+#include <QStringList>
+
+namespace CppEditor::Internal {
+class CppQuickFixInterface;
+
+// These are generated functions that should not be offered in quickfixes.
+const QStringList magicQObjectFunctions();
+
+// Given include is e.g. "afile.h" or <afile.h> (quotes/angle brackets included!).
+void insertNewIncludeDirective(
+    const QString &include,
+    CppRefactoringFilePtr file,
+    const CPlusPlus::Document::Ptr &cppDocument,
+    Utils::ChangeSet &changes);
+
+// Returns a non-null value if and only if the cursor is on the name of a (proper) class
+// declaration or at some place inside the body of a class declaration that does not
+// correspond to an AST of its own, i.e. on "empty space".
+CPlusPlus::ClassSpecifierAST *astForClassOperations(const CppQuickFixInterface &interface);
+
+bool nameIncludesOperatorName(const CPlusPlus::Name *name);
+
+QString inlinePrefix(const Utils::FilePath &targetFile,
+                     const std::function<bool()> &extraCondition = {});
+
+CPlusPlus::Class *isMemberFunction(
+    const CPlusPlus::LookupContext &context, CPlusPlus::Function *function);
+
+CPlusPlus::Namespace *isNamespaceFunction(
+    const CPlusPlus::LookupContext &context, CPlusPlus::Function *function);
+
+QString nameString(const CPlusPlus::NameAST *name);
+
+CPlusPlus::FullySpecifiedType typeOfExpr(
+    const CPlusPlus::ExpressionAST *expr,
+    const CppRefactoringFilePtr &file,
+    const CPlusPlus::Snapshot &snapshot,
+    const CPlusPlus::LookupContext &context);
+
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/cppquickfixprojectsettings.cpp b/src/plugins/cppeditor/quickfixes/cppquickfixprojectsettings.cpp
similarity index 98%
rename from src/plugins/cppeditor/cppquickfixprojectsettings.cpp
rename to src/plugins/cppeditor/quickfixes/cppquickfixprojectsettings.cpp
index 3f3f4bc366b..03131034331 100644
--- a/src/plugins/cppeditor/cppquickfixprojectsettings.cpp
+++ b/src/plugins/cppeditor/quickfixes/cppquickfixprojectsettings.cpp
@@ -3,8 +3,8 @@
 
 #include "cppquickfixprojectsettings.h"
 
-#include "cppeditorconstants.h"
-#include "cppeditortr.h"
+#include "../cppeditorconstants.h"
+#include "../cppeditortr.h"
 
 #include <coreplugin/icore.h>
 
diff --git a/src/plugins/cppeditor/cppquickfixprojectsettings.h b/src/plugins/cppeditor/quickfixes/cppquickfixprojectsettings.h
similarity index 100%
rename from src/plugins/cppeditor/cppquickfixprojectsettings.h
rename to src/plugins/cppeditor/quickfixes/cppquickfixprojectsettings.h
diff --git a/src/plugins/cppeditor/cppquickfixprojectsettingswidget.cpp b/src/plugins/cppeditor/quickfixes/cppquickfixprojectsettingswidget.cpp
similarity index 98%
rename from src/plugins/cppeditor/cppquickfixprojectsettingswidget.cpp
rename to src/plugins/cppeditor/quickfixes/cppquickfixprojectsettingswidget.cpp
index feb9777e45b..8046d80a601 100644
--- a/src/plugins/cppeditor/cppquickfixprojectsettingswidget.cpp
+++ b/src/plugins/cppeditor/quickfixes/cppquickfixprojectsettingswidget.cpp
@@ -3,8 +3,8 @@
 
 #include "cppquickfixprojectsettingswidget.h"
 
-#include "cppeditorconstants.h"
-#include "cppeditortr.h"
+#include "../cppeditorconstants.h"
+#include "../cppeditortr.h"
 #include "cppquickfixprojectsettings.h"
 #include "cppquickfixsettingswidget.h"
 
diff --git a/src/plugins/cppeditor/cppquickfixprojectsettingswidget.h b/src/plugins/cppeditor/quickfixes/cppquickfixprojectsettingswidget.h
similarity index 100%
rename from src/plugins/cppeditor/cppquickfixprojectsettingswidget.h
rename to src/plugins/cppeditor/quickfixes/cppquickfixprojectsettingswidget.h
diff --git a/src/plugins/cppeditor/cppquickfixsettings.cpp b/src/plugins/cppeditor/quickfixes/cppquickfixsettings.cpp
similarity index 99%
rename from src/plugins/cppeditor/cppquickfixsettings.cpp
rename to src/plugins/cppeditor/quickfixes/cppquickfixsettings.cpp
index 4ce10822678..e08de44675f 100644
--- a/src/plugins/cppeditor/cppquickfixsettings.cpp
+++ b/src/plugins/cppeditor/quickfixes/cppquickfixsettings.cpp
@@ -3,8 +3,8 @@
 
 #include "cppquickfixsettings.h"
 
-#include "cppcodestylesettings.h"
-#include "cppeditorconstants.h"
+#include "../cppcodestylesettings.h"
+#include "../cppeditorconstants.h"
 
 #include <coreplugin/icore.h>
 
diff --git a/src/plugins/cppeditor/cppquickfixsettings.h b/src/plugins/cppeditor/quickfixes/cppquickfixsettings.h
similarity index 100%
rename from src/plugins/cppeditor/cppquickfixsettings.h
rename to src/plugins/cppeditor/quickfixes/cppquickfixsettings.h
diff --git a/src/plugins/cppeditor/cppquickfixsettingspage.cpp b/src/plugins/cppeditor/quickfixes/cppquickfixsettingspage.cpp
similarity index 92%
rename from src/plugins/cppeditor/cppquickfixsettingspage.cpp
rename to src/plugins/cppeditor/quickfixes/cppquickfixsettingspage.cpp
index 4e1297f5c2e..5933694bbc8 100644
--- a/src/plugins/cppeditor/cppquickfixsettingspage.cpp
+++ b/src/plugins/cppeditor/quickfixes/cppquickfixsettingspage.cpp
@@ -3,8 +3,8 @@
 
 #include "cppquickfixsettingspage.h"
 
-#include "cppeditorconstants.h"
-#include "cppeditortr.h"
+#include "../cppeditorconstants.h"
+#include "../cppeditortr.h"
 #include "cppquickfixsettingswidget.h"
 
 #include <coreplugin/dialogs/ioptionspage.h>
diff --git a/src/plugins/cppeditor/cppquickfixsettingspage.h b/src/plugins/cppeditor/quickfixes/cppquickfixsettingspage.h
similarity index 100%
rename from src/plugins/cppeditor/cppquickfixsettingspage.h
rename to src/plugins/cppeditor/quickfixes/cppquickfixsettingspage.h
diff --git a/src/plugins/cppeditor/cppquickfixsettingswidget.cpp b/src/plugins/cppeditor/quickfixes/cppquickfixsettingswidget.cpp
similarity index 99%
rename from src/plugins/cppeditor/cppquickfixsettingswidget.cpp
rename to src/plugins/cppeditor/quickfixes/cppquickfixsettingswidget.cpp
index c589a26b9d2..67213105bc4 100644
--- a/src/plugins/cppeditor/cppquickfixsettingswidget.cpp
+++ b/src/plugins/cppeditor/quickfixes/cppquickfixsettingswidget.cpp
@@ -3,7 +3,7 @@
 
 #include "cppquickfixsettingswidget.h"
 
-#include "cppeditortr.h"
+#include "../cppeditortr.h"
 #include "cppquickfixsettings.h"
 
 #include <utils/layoutbuilder.h>
@@ -215,6 +215,7 @@ e.g. name = "m_test_foo_":
 
     using namespace Layouting;
 
+    // clang-format off
     Grid {
         empty, ulLabel(Tr::tr("Generate Setters")), ulLabel(Tr::tr("Generate Getters")), br,
         Tr::tr("Inside class:"), Tr::tr("Default"), Tr::tr("Default"), br,
@@ -274,7 +275,7 @@ e.g. name = "m_test_foo_":
             },
         },
         Group {
-            title(Tr::tr("Value types:")),
+            title(Tr::tr("Value Types")),
             Row {
                 m_valueTypes,
                 Column { pushButton_addValueType, pushButton_removeValueType, st, },
@@ -282,6 +283,7 @@ e.g. name = "m_test_foo_":
         },
         m_returnByConstRefCheckBox,
     }.attachTo(this);
+    // clang-format on
 
     // connect controls to settingsChanged signal
     auto then = [this] {
diff --git a/src/plugins/cppeditor/cppquickfixsettingswidget.h b/src/plugins/cppeditor/quickfixes/cppquickfixsettingswidget.h
similarity index 100%
rename from src/plugins/cppeditor/cppquickfixsettingswidget.h
rename to src/plugins/cppeditor/quickfixes/cppquickfixsettingswidget.h
diff --git a/src/plugins/cppeditor/quickfixes/createdeclarationfromuse.cpp b/src/plugins/cppeditor/quickfixes/createdeclarationfromuse.cpp
new file mode 100644
index 00000000000..a0e8ad21417
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/createdeclarationfromuse.cpp
@@ -0,0 +1,1208 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "createdeclarationfromuse.h"
+
+#include "../cppcodestylesettings.h"
+#include "../cppeditortr.h"
+#include "../cppeditorwidget.h"
+#include "../cpprefactoringchanges.h"
+#include "../insertionpointlocator.h"
+#include "../symbolfinder.h"
+#include "cppquickfix.h"
+#include "cppquickfixhelpers.h"
+#include "cppquickfixprojectsettings.h"
+
+#include <coreplugin/icore.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/TypeOfExpression.h>
+#include <projectexplorer/projecttree.h>
+
+#include <QInputDialog>
+
+#ifdef WITH_TESTS
+#include "cppquickfix_test.h"
+#include <QtTest>
+#endif
+
+#include <variant>
+
+using namespace CPlusPlus;
+using namespace ProjectExplorer;
+using namespace TextEditor;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+
+using TypeOrExpr = std::variant<const CPlusPlus::ExpressionAST *, CPlusPlus::FullySpecifiedType>;
+
+// FIXME: Needs to consider the scope at the insertion site.
+static QString declFromExpr(
+    const TypeOrExpr &typeOrExpr,
+    const CallAST *call,
+    const NameAST *varName,
+    const Snapshot &snapshot,
+    const LookupContext &context,
+    const CppRefactoringFilePtr &file,
+    bool makeConst)
+{
+    const auto getTypeFromUser = [varName, call]() -> QString {
+        if (call)
+            return {};
+        const QString typeFromUser = QInputDialog::getText(
+            Core::ICore::dialogParent(),
+            Tr::tr("Provide the type"),
+            Tr::tr("Data type:"),
+            QLineEdit::Normal);
+        if (!typeFromUser.isEmpty())
+            return typeFromUser + ' ' + nameString(varName);
+        return {};
+    };
+    const auto getTypeOfExpr = [&](const ExpressionAST *expr) -> FullySpecifiedType {
+        return typeOfExpr(expr, file, snapshot, context);
+    };
+
+    const Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
+    const FullySpecifiedType type = std::holds_alternative<FullySpecifiedType>(typeOrExpr)
+                                        ? std::get<FullySpecifiedType>(typeOrExpr)
+                                        : getTypeOfExpr(std::get<const ExpressionAST *>(typeOrExpr));
+    if (!call)
+        return type.isValid() ? oo.prettyType(type, varName->name) : getTypeFromUser();
+
+    Function func(file->cppDocument()->translationUnit(), 0, varName->name);
+    func.setConst(makeConst);
+    for (ExpressionListAST *it = call->expression_list; it; it = it->next) {
+        Argument *const arg = new Argument(nullptr, 0, nullptr);
+        arg->setType(getTypeOfExpr(it->value));
+        func.addMember(arg);
+    }
+    return oo.prettyType(type) + ' ' + oo.prettyType(func.type(), varName->name);
+}
+
+
+
+
+class InsertDeclOperation: public CppQuickFixOperation
+{
+public:
+    InsertDeclOperation(const CppQuickFixInterface &interface,
+                        const FilePath &targetFilePath, const Class *targetSymbol,
+                        InsertionPointLocator::AccessSpec xsSpec, const QString &decl, int priority)
+        : CppQuickFixOperation(interface, priority)
+        , m_targetFilePath(targetFilePath)
+        , m_targetSymbol(targetSymbol)
+        , m_xsSpec(xsSpec)
+        , m_decl(decl)
+    {
+        setDescription(Tr::tr("Add %1 Declaration")
+                           .arg(InsertionPointLocator::accessSpecToString(xsSpec)));
+    }
+
+    void perform() override
+    {
+        CppRefactoringChanges refactoring(snapshot());
+
+        InsertionPointLocator locator(refactoring);
+        const InsertionLocation loc = locator.methodDeclarationInClass(
+            m_targetFilePath, m_targetSymbol, m_xsSpec);
+        QTC_ASSERT(loc.isValid(), return);
+
+        CppRefactoringFilePtr targetFile = refactoring.cppFile(m_targetFilePath);
+        int targetPosition = targetFile->position(loc.line(), loc.column());
+
+        ChangeSet target;
+        target.insert(targetPosition, loc.prefix() + m_decl);
+        targetFile->setOpenEditor(true, targetPosition);
+        targetFile->apply(target);
+    }
+
+    static QString generateDeclaration(const Function *function)
+    {
+        Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
+        oo.showFunctionSignatures = true;
+        oo.showReturnTypes = true;
+        oo.showArgumentNames = true;
+        oo.showEnclosingTemplate = true;
+
+        QString decl;
+        decl += oo.prettyType(function->type(), function->unqualifiedName());
+        decl += QLatin1String(";\n");
+
+        return decl;
+    }
+
+private:
+    FilePath m_targetFilePath;
+    const Class *m_targetSymbol;
+    InsertionPointLocator::AccessSpec m_xsSpec;
+    QString m_decl;
+};
+
+class DeclOperationFactory
+{
+public:
+    DeclOperationFactory(const CppQuickFixInterface &interface, const FilePath &filePath,
+                         const Class *matchingClass, const QString &decl)
+        : m_interface(interface)
+        , m_filePath(filePath)
+        , m_matchingClass(matchingClass)
+        , m_decl(decl)
+    {}
+
+    QuickFixOperation *operator()(InsertionPointLocator::AccessSpec xsSpec, int priority)
+    {
+        return new InsertDeclOperation(m_interface, m_filePath, m_matchingClass, xsSpec, m_decl, priority);
+    }
+
+private:
+    const CppQuickFixInterface &m_interface;
+    const FilePath &m_filePath;
+    const Class *m_matchingClass;
+    const QString &m_decl;
+};
+
+class InsertMemberFromInitializationOp : public CppQuickFixOperation
+{
+public:
+    InsertMemberFromInitializationOp(
+        const CppQuickFixInterface &interface,
+        const Class *theClass,
+        const NameAST *memberName,
+        const TypeOrExpr &typeOrExpr,
+        const CallAST *call,
+        InsertionPointLocator::AccessSpec accessSpec,
+        bool makeStatic,
+        bool makeConst)
+        : CppQuickFixOperation(interface),
+        m_class(theClass), m_memberName(memberName), m_typeOrExpr(typeOrExpr), m_call(call),
+        m_accessSpec(accessSpec), m_makeStatic(makeStatic), m_makeConst(makeConst)
+    {
+        if (call)
+            setDescription(Tr::tr("Add Member Function \"%1\"").arg(nameString(memberName)));
+        else
+            setDescription(Tr::tr("Add Class Member \"%1\"").arg(nameString(memberName)));
+    }
+
+private:
+    void perform() override
+    {
+        QString decl = declFromExpr(m_typeOrExpr, m_call, m_memberName, snapshot(), context(),
+                                    currentFile(), m_makeConst);
+        if (decl.isEmpty())
+            return;
+        if (m_makeStatic)
+            decl.prepend("static ");
+
+        const CppRefactoringChanges refactoring(snapshot());
+        const InsertionPointLocator locator(refactoring);
+        const FilePath filePath = FilePath::fromUtf8(m_class->fileName());
+        const InsertionLocation loc = locator.methodDeclarationInClass(
+            filePath, m_class, m_accessSpec);
+        QTC_ASSERT(loc.isValid(), return);
+
+        CppRefactoringFilePtr targetFile = refactoring.cppFile(filePath);
+        targetFile->apply(ChangeSet::makeInsert(
+            targetFile->position(loc.line(), loc.column()), loc.prefix() + decl + ";\n"));
+    }
+
+    const Class * const m_class;
+    const NameAST * const m_memberName;
+    const TypeOrExpr m_typeOrExpr;
+    const CallAST * m_call;
+    const InsertionPointLocator::AccessSpec m_accessSpec;
+    const bool m_makeStatic;
+    const bool m_makeConst;
+};
+
+class AddLocalDeclarationOp: public CppQuickFixOperation
+{
+public:
+    AddLocalDeclarationOp(const CppQuickFixInterface &interface,
+                          int priority,
+                          const BinaryExpressionAST *binaryAST,
+                          const SimpleNameAST *simpleNameAST)
+        : CppQuickFixOperation(interface, priority)
+        , binaryAST(binaryAST)
+        , simpleNameAST(simpleNameAST)
+    {
+        setDescription(Tr::tr("Add Local Declaration"));
+    }
+
+    void perform() override
+    {
+        QString declaration = getDeclaration();
+
+        if (!declaration.isEmpty()) {
+            currentFile()->apply(ChangeSet::makeReplace(
+                currentFile()->startOf(binaryAST),
+                currentFile()->endOf(simpleNameAST),
+                declaration));
+        }
+    }
+
+private:
+    QString getDeclaration()
+    {
+        Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
+        const auto settings = CppQuickFixProjectsSettings::getQuickFixSettings(
+            ProjectTree::currentProject());
+
+        if (currentFile()->cppDocument()->languageFeatures().cxx11Enabled && settings->useAuto)
+            return "auto " + oo.prettyName(simpleNameAST->name);
+        return declFromExpr(binaryAST->right_expression, nullptr, simpleNameAST, snapshot(),
+                            context(), currentFile(), false);
+    }
+
+    const BinaryExpressionAST *binaryAST;
+    const SimpleNameAST *simpleNameAST;
+};
+
+//! Adds a declarations to a definition
+class InsertDeclFromDef: public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const QList<AST *> &path = interface.path();
+        CppRefactoringFilePtr file = interface.currentFile();
+
+        FunctionDefinitionAST *funDef = nullptr;
+        int idx = 0;
+        for (; idx < path.size(); ++idx) {
+            AST *node = path.at(idx);
+            if (idx > 1) {
+                if (DeclaratorIdAST *declId = node->asDeclaratorId()) {
+                    if (file->isCursorOn(declId)) {
+                        if (FunctionDefinitionAST *candidate = path.at(idx - 2)->asFunctionDefinition()) {
+                            funDef = candidate;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if (node->asClassSpecifier())
+                return;
+        }
+
+        if (!funDef || !funDef->symbol)
+            return;
+
+        Function *fun = funDef->symbol;
+        if (Class *matchingClass = isMemberFunction(interface.context(), fun)) {
+            const QualifiedNameId *qName = fun->name()->asQualifiedNameId();
+            for (Symbol *symbol = matchingClass->find(qName->identifier());
+                 symbol; symbol = symbol->next()) {
+                Symbol *s = symbol;
+                if (fun->enclosingScope()->asTemplate()) {
+                    if (const Template *templ = s->type()->asTemplateType()) {
+                        if (Symbol *decl = templ->declaration()) {
+                            if (decl->type()->asFunctionType())
+                                s = decl;
+                        }
+                    }
+                }
+                if (!s->name()
+                    || !qName->identifier()->match(s->identifier())
+                    || !s->type()->asFunctionType())
+                    continue;
+
+                if (s->type().match(fun->type())) {
+                    // Declaration exists.
+                    return;
+                }
+            }
+            const FilePath fileName = matchingClass->filePath();
+            const QString decl = InsertDeclOperation::generateDeclaration(fun);
+
+            // Add several possible insertion locations for declaration
+            DeclOperationFactory operation(interface, fileName, matchingClass, decl);
+
+            result << operation(InsertionPointLocator::Public, 5)
+                   << operation(InsertionPointLocator::PublicSlot, 4)
+                   << operation(InsertionPointLocator::Protected, 3)
+                   << operation(InsertionPointLocator::ProtectedSlot, 2)
+                   << operation(InsertionPointLocator::Private, 1)
+                   << operation(InsertionPointLocator::PrivateSlot, 0);
+        }
+    }
+};
+
+class AddDeclarationForUndeclaredIdentifier : public CppQuickFixFactory
+{
+public:
+#ifdef WITH_TESTS
+    static QObject *createTest();
+    void setMembersOnly() { m_membersOnly = true; }
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        // Are we on a name?
+        const QList<AST *> &path = interface.path();
+        if (path.isEmpty())
+            return;
+        if (!path.last()->asSimpleName())
+            return;
+
+        // Special case: Member initializer.
+        if (!checkForMemberInitializer(interface, result))
+            return;
+
+        // Are we inside a function?
+        const FunctionDefinitionAST *func = nullptr;
+        for (auto it = path.rbegin(); !func && it != path.rend(); ++it)
+            func = (*it)->asFunctionDefinition();
+        if (!func)
+            return;
+
+        // Is this name declared somewhere already?
+        const CursorInEditor cursorInEditor(interface.cursor(), interface.filePath(),
+                                            interface.editor(), interface.editor()->textDocument());
+        const auto followSymbolFallback = [&](const Link &link) {
+            if (!link.hasValidTarget())
+                collectOperations(interface, result);
+        };
+        NonInteractiveFollowSymbolMarker niMarker;
+        CppModelManager::followSymbol(cursorInEditor, followSymbolFallback, false, false,
+                                      FollowSymbolMode::Exact,
+                                      CppModelManager::Backend::Builtin);
+    }
+
+    void collectOperations(const CppQuickFixInterface &interface,
+                           QuickFixOperations &result)
+    {
+        const QList<AST *> &path = interface.path();
+        const CppRefactoringFilePtr &file = interface.currentFile();
+        for (int index = path.size() - 1; index != -1; --index) {
+            if (const auto call = path.at(index)->asCall())
+                return handleCall(call, interface, result);
+
+            // We only trigger if the identifier appears on the left-hand side of an
+            // assignment expression.
+            const auto binExpr = path.at(index)->asBinaryExpression();
+            if (!binExpr)
+                continue;
+            if (!binExpr->left_expression || !binExpr->right_expression
+                || file->tokenAt(binExpr->binary_op_token).kind() != T_EQUAL
+                || !interface.isCursorOn(binExpr->left_expression)) {
+                return;
+            }
+
+            // In the case of "a.|b = c", find out the type of a, locate the class declaration
+            // and add a member b there.
+            if (const auto memberAccess = binExpr->left_expression->asMemberAccess()) {
+                if (interface.isCursorOn(memberAccess->member_name)
+                    && memberAccess->member_name == path.last()) {
+                    maybeAddMember(interface, file->scopeAt(memberAccess->firstToken()),
+                                   file->textOf(memberAccess->base_expression).toUtf8(),
+                                   binExpr->right_expression, nullptr, result);
+                }
+                return;
+            }
+
+            const auto idExpr = binExpr->left_expression->asIdExpression();
+            if (!idExpr || !idExpr->name)
+                return;
+
+            // In the case of "A::|b = c", add a static member b to A.
+            if (const auto qualName = idExpr->name->asQualifiedName()) {
+                return maybeAddStaticMember(interface, qualName, binExpr->right_expression, nullptr,
+                                            result);
+            }
+
+            // For an unqualified access, offer a local declaration and, if we are
+            // in a member function, a member declaration.
+            if (const auto simpleName = idExpr->name->asSimpleName()) {
+                if (!m_membersOnly)
+                    result << new AddLocalDeclarationOp(interface, index, binExpr, simpleName);
+                maybeAddMember(interface, file->scopeAt(idExpr->firstToken()), "this",
+                               binExpr->right_expression, nullptr, result);
+                return;
+            }
+        }
+    }
+
+    void handleCall(const CPlusPlus::CallAST *call, const CppQuickFixInterface &interface,
+                    QuickFixOperations &result)
+    {
+        if (!call->base_expression)
+            return;
+
+        // In order to find out the return type, we need to check the context of the call.
+        // If it is a statement expression, the type is void, if it's a binary expression,
+        // we assume the type of the other side of the expression, if it's a return statement,
+        // we use the return type of the surrounding function, and if it's a declaration,
+        // we use the type of the variable. Other cases are not supported.
+        const QList<AST *> &path = interface.path();
+        const CppRefactoringFilePtr &file = interface.currentFile();
+        TypeOrExpr returnTypeOrExpr;
+        for (auto it = path.rbegin(); it != path.rend(); ++it) {
+            if ((*it)->asCompoundStatement())
+                return;
+            if ((*it)->asExpressionStatement()) {
+                returnTypeOrExpr = FullySpecifiedType(new VoidType);
+                break;
+            }
+            if (const auto binExpr = (*it)->asBinaryExpression()) {
+                returnTypeOrExpr = interface.isCursorOn(binExpr->left_expression)
+                                       ? binExpr->right_expression : binExpr->left_expression;
+                break;
+            }
+            if ((*it)->asReturnStatement()) {
+                for (auto it2 = std::next(it); it2 != path.rend(); ++it2) {
+                    if (const auto func = (*it2)->asFunctionDefinition()) {
+                        if (!func->symbol)
+                            return;
+                        returnTypeOrExpr = func->symbol->returnType();
+                        break;
+                    }
+                }
+                break;
+            }
+            if (const auto declarator = (*it)->asDeclarator()) {
+                if (!interface.isCursorOn(declarator->initializer))
+                    return;
+                const auto decl = (*std::next(it))->asSimpleDeclaration();
+                if (!decl || !decl->symbols)
+                    return;
+                if (!decl->symbols->value->type().isValid())
+                    return;
+                returnTypeOrExpr = decl->symbols->value->type();
+                break;
+            }
+        }
+
+        if (std::holds_alternative<const ExpressionAST *>(returnTypeOrExpr)
+            && !std::get<const ExpressionAST *>(returnTypeOrExpr)) {
+            return;
+        }
+
+        // a.f()
+        if (const auto memberAccess = call->base_expression->asMemberAccess()) {
+            if (!interface.isCursorOn(memberAccess->member_name))
+                return;
+            maybeAddMember(
+                interface, file->scopeAt(call->firstToken()),
+                file->textOf(memberAccess->base_expression).toUtf8(), returnTypeOrExpr, call, result);
+        }
+
+        const auto idExpr = call->base_expression->asIdExpression();
+        if (!idExpr || !idExpr->name)
+            return;
+
+        // A::f()
+        if (const auto qualName = idExpr->name->asQualifiedName())
+            return maybeAddStaticMember(interface, qualName, returnTypeOrExpr, call, result);
+
+        // f()
+        if (idExpr->name->asSimpleName()) {
+            maybeAddMember(interface, file->scopeAt(idExpr->firstToken()), "this",
+                           returnTypeOrExpr, call, result);
+        }
+    }
+
+    // Returns whether to still do other checks.
+    bool checkForMemberInitializer(const CppQuickFixInterface &interface,
+                                   QuickFixOperations &result)
+    {
+        const QList<AST *> &path = interface.path();
+        const int size = path.size();
+        if (size < 4)
+            return true;
+        const MemInitializerAST * const memInitializer = path.at(size - 2)->asMemInitializer();
+        if (!memInitializer)
+            return true;
+        if (!path.at(size - 3)->asCtorInitializer())
+            return true;
+        const FunctionDefinitionAST * ctor = path.at(size - 4)->asFunctionDefinition();
+        if (!ctor)
+            return false;
+
+        // Now find the class.
+        const Class *theClass = nullptr;
+        if (size > 4) {
+            const ClassSpecifierAST * const classSpec = path.at(size - 5)->asClassSpecifier();
+            if (classSpec) // Inline constructor. We get the class directly.
+                theClass = classSpec->symbol;
+        }
+        if (!theClass) {
+            // Out-of-line constructor. We need to find the class.
+            SymbolFinder finder;
+            const QList<Declaration *> matches = finder.findMatchingDeclaration(
+                LookupContext(interface.currentFile()->cppDocument(), interface.snapshot()),
+                ctor->symbol);
+            if (!matches.isEmpty())
+                theClass = matches.first()->enclosingClass();
+        }
+
+        if (!theClass)
+            return false;
+
+        const SimpleNameAST * const name = path.at(size - 1)->asSimpleName();
+        QTC_ASSERT(name, return false);
+
+        // Check whether the member exists already.
+        if (theClass->find(interface.currentFile()->cppDocument()->translationUnit()->identifier(
+                name->identifier_token))) {
+            return false;
+        }
+
+        result << new InsertMemberFromInitializationOp(
+            interface, theClass, memInitializer->name->asSimpleName(), memInitializer->expression,
+            nullptr, InsertionPointLocator::Private, false, false);
+        return false;
+    }
+
+    void maybeAddMember(const CppQuickFixInterface &interface, CPlusPlus::Scope *scope,
+                        const QByteArray &classTypeExpr, const TypeOrExpr &typeOrExpr,
+                        const CPlusPlus::CallAST *call, QuickFixOperations &result)
+    {
+        const QList<AST *> &path = interface.path();
+
+        TypeOfExpression typeOfExpression;
+        typeOfExpression.init(interface.semanticInfo().doc, interface.snapshot(),
+                              interface.context().bindings());
+        const QList<LookupItem> lhsTypes = typeOfExpression(
+            classTypeExpr, scope,
+            TypeOfExpression::Preprocess);
+        if (lhsTypes.isEmpty())
+            return;
+
+        const Type *type = lhsTypes.first().type().type();
+        if (!type)
+            return;
+        if (type->asPointerType()) {
+            type = type->asPointerType()->elementType().type();
+            if (!type)
+                return;
+        }
+        const auto namedType = type->asNamedType();
+        if (!namedType)
+            return;
+        const ClassOrNamespace * const classOrNamespace
+            = interface.context().lookupType(namedType->name(), scope);
+        if (!classOrNamespace || !classOrNamespace->rootClass())
+            return;
+
+        const Class * const theClass = classOrNamespace->rootClass();
+        bool needsStatic = lhsTypes.first().type().isStatic();
+
+        // If the base expression refers to the same class that the member function is in,
+        // then we want to insert a private member, otherwise a public one.
+        const FunctionDefinitionAST *func = nullptr;
+        for (auto it = path.rbegin(); !func && it != path.rend(); ++it)
+            func = (*it)->asFunctionDefinition();
+        QTC_ASSERT(func, return);
+        InsertionPointLocator::AccessSpec accessSpec = InsertionPointLocator::Public;
+        for (int i = 0; i < theClass->memberCount(); ++i) {
+            if (theClass->memberAt(i) == func->symbol) {
+                accessSpec = InsertionPointLocator::Private;
+                needsStatic = func->symbol->isStatic();
+                break;
+            }
+        }
+        if (accessSpec == InsertionPointLocator::Public) {
+            QList<Declaration *> decls;
+            QList<Declaration *> dummy;
+            SymbolFinder().findMatchingDeclaration(interface.context(), func->symbol, &decls,
+                                                   &dummy, &dummy);
+            for (const Declaration * const decl : std::as_const(decls)) {
+                for (int i = 0; i < theClass->memberCount(); ++i) {
+                    if (theClass->memberAt(i) == decl) {
+                        accessSpec = InsertionPointLocator::Private;
+                        needsStatic = decl->isStatic();
+                        break;
+                    }
+                }
+                if (accessSpec == InsertionPointLocator::Private)
+                    break;
+            }
+        }
+        result << new InsertMemberFromInitializationOp(interface, theClass, path.last()->asName(),
+                                                       typeOrExpr, call, accessSpec, needsStatic,
+                                                       func->symbol->isConst());
+    }
+
+    void maybeAddStaticMember(
+        const CppQuickFixInterface &interface, const CPlusPlus::QualifiedNameAST *qualName,
+        const TypeOrExpr &typeOrExpr, const CPlusPlus::CallAST *call,
+        QuickFixOperations &result)
+    {
+        const QList<AST *> &path = interface.path();
+
+        if (!interface.isCursorOn(qualName->unqualified_name))
+            return;
+        if (qualName->unqualified_name != path.last())
+            return;
+        if (!qualName->nested_name_specifier_list)
+            return;
+
+        const NameAST * const topLevelName
+            = qualName->nested_name_specifier_list->value->class_or_namespace_name;
+        if (!topLevelName)
+            return;
+        ClassOrNamespace * const classOrNamespace = interface.context().lookupType(
+            topLevelName->name, interface.currentFile()->scopeAt(qualName->firstToken()));
+        if (!classOrNamespace)
+            return;
+        QList<const Name *> otherNames;
+        for (auto it = qualName->nested_name_specifier_list->next; it; it = it->next) {
+            if (!it->value || !it->value->class_or_namespace_name)
+                return;
+            otherNames << it->value->class_or_namespace_name->name;
+        }
+
+        const Class *theClass = nullptr;
+        if (!otherNames.isEmpty()) {
+            const Symbol * const symbol = classOrNamespace->lookupInScope(otherNames);
+            if (!symbol)
+                return;
+            theClass = symbol->asClass();
+        } else {
+            theClass = classOrNamespace->rootClass();
+        }
+        if (theClass) {
+            result << new InsertMemberFromInitializationOp(
+                interface, theClass, path.last()->asName(), typeOrExpr, call,
+                InsertionPointLocator::Public, true, false);
+        }
+    }
+
+    bool m_membersOnly = false;
+};
+
+#ifdef WITH_TESTS
+using namespace Tests;
+
+class AddDeclarationForUndeclaredIdentifierTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    // QTCREATORBUG-26004
+    void testLocalDeclFromUse()
+    {
+        const QByteArray original = "void func() {\n"
+                                    "    QStringList list;\n"
+                                    "    @it = list.cbegin();\n"
+                                    "}\n";
+        const QByteArray expected = "void func() {\n"
+                                    "    QStringList list;\n"
+                                    "    auto it = list.cbegin();\n"
+                                    "}\n";
+        AddDeclarationForUndeclaredIdentifier factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+    void testInsertMemberFromUse_data()
+    {
+        QTest::addColumn<QByteArray>("original");
+        QTest::addColumn<QByteArray>("expected");
+
+        QByteArray original;
+        QByteArray expected;
+
+        original =
+            "class C {\n"
+            "public:\n"
+            "    C(int x) : @m_x(x) {}\n"
+            "private:\n"
+            "    int m_y;\n"
+            "};\n";
+        expected =
+            "class C {\n"
+            "public:\n"
+            "    C(int x) : m_x(x) {}\n"
+            "private:\n"
+            "    int m_y;\n"
+            "    int m_x;\n"
+            "};\n";
+        QTest::addRow("inline constructor") << original << expected;
+
+        original =
+            "class C {\n"
+            "public:\n"
+            "    C(int x, double d);\n"
+            "private:\n"
+            "    int m_x;\n"
+            "};\n"
+            "C::C(int x, double d) : m_x(x), @m_d(d)\n";
+        expected =
+            "class C {\n"
+            "public:\n"
+            "    C(int x, double d);\n"
+            "private:\n"
+            "    int m_x;\n"
+            "    double m_d;\n"
+            "};\n"
+            "C::C(int x, double d) : m_x(x), m_d(d)\n";
+        QTest::addRow("out-of-line constructor") << original << expected;
+
+        original =
+            "class C {\n"
+            "public:\n"
+            "    C(int x) : @m_x(x) {}\n"
+            "private:\n"
+            "    int m_x;\n"
+            "};\n";
+        expected = "";
+        QTest::addRow("member already present") << original << expected;
+
+        original =
+            "int func() { return 0; }\n"
+            "class C {\n"
+            "public:\n"
+            "    C() : @m_x(func()) {}\n"
+            "private:\n"
+            "    int m_y;\n"
+            "};\n";
+        expected =
+            "int func() { return 0; }\n"
+            "class C {\n"
+            "public:\n"
+            "    C() : m_x(func()) {}\n"
+            "private:\n"
+            "    int m_y;\n"
+            "    int m_x;\n"
+            "};\n";
+        QTest::addRow("initialization via function call") << original << expected;
+
+        original =
+            "struct S {\n\n};\n"
+            "class C {\n"
+            "public:\n"
+            "    void setValue(int v) { m_s.@value = v; }\n"
+            "private:\n"
+            "    S m_s;\n"
+            "};\n";
+        expected =
+            "struct S {\n\n"
+            "    int value;\n"
+            "};\n"
+            "class C {\n"
+            "public:\n"
+            "    void setValue(int v) { m_s.value = v; }\n"
+            "private:\n"
+            "    S m_s;\n"
+            "};\n";
+        QTest::addRow("add member to other struct") << original << expected;
+
+        original =
+            "struct S {\n\n};\n"
+            "class C {\n"
+            "public:\n"
+            "    void setValue(int v) { S::@value = v; }\n"
+            "};\n";
+        expected =
+            "struct S {\n\n"
+            "    static int value;\n"
+            "};\n"
+            "class C {\n"
+            "public:\n"
+            "    void setValue(int v) { S::value = v; }\n"
+            "};\n";
+        QTest::addRow("add static member to other struct (explicit)") << original << expected;
+
+        original =
+            "struct S {\n\n};\n"
+            "class C {\n"
+            "public:\n"
+            "    void setValue(int v) { m_s.@value = v; }\n"
+            "private:\n"
+            "    static S m_s;\n"
+            "};\n";
+        expected =
+            "struct S {\n\n"
+            "    static int value;\n"
+            "};\n"
+            "class C {\n"
+            "public:\n"
+            "    void setValue(int v) { m_s.value = v; }\n"
+            "private:\n"
+            "    static S m_s;\n"
+            "};\n";
+        QTest::addRow("add static member to other struct (implicit)") << original << expected;
+
+        original =
+            "class C {\n"
+            "public:\n"
+            "    void setValue(int v);\n"
+            "};\n"
+            "void C::setValue(int v) { this->@m_value = v; }\n";
+        expected =
+            "class C {\n"
+            "public:\n"
+            "    void setValue(int v);\n"
+            "private:\n"
+            "    int m_value;\n"
+            "};\n"
+            "void C::setValue(int v) { this->@m_value = v; }\n";
+        QTest::addRow("add member to this (explicit)") << original << expected;
+
+        original =
+            "class C {\n"
+            "public:\n"
+            "    void setValue(int v) { @m_value = v; }\n"
+            "};\n";
+        expected =
+            "class C {\n"
+            "public:\n"
+            "    void setValue(int v) { m_value = v; }\n"
+            "private:\n"
+            "    int m_value;\n"
+            "};\n";
+        QTest::addRow("add member to this (implicit)") << original << expected;
+
+        original =
+            "class C {\n"
+            "public:\n"
+            "    static void setValue(int v) { @m_value = v; }\n"
+            "};\n";
+        expected =
+            "class C {\n"
+            "public:\n"
+            "    static void setValue(int v) { m_value = v; }\n"
+            "private:\n"
+            "    static int m_value;\n"
+            "};\n";
+        QTest::addRow("add static member to this (inline)") << original << expected;
+
+        original =
+            "class C {\n"
+            "public:\n"
+            "    static void setValue(int v);\n"
+            "};\n"
+            "void C::setValue(int v) { @m_value = v; }\n";
+        expected =
+            "class C {\n"
+            "public:\n"
+            "    static void setValue(int v);\n"
+            "private:\n"
+            "    static int m_value;\n"
+            "};\n"
+            "void C::setValue(int v) { @m_value = v; }\n";
+        QTest::addRow("add static member to this (non-inline)") << original << expected;
+
+        original =
+            "struct S {\n\n};\n"
+            "class C {\n"
+            "public:\n"
+            "    void setValue(int v) { m_s.@setValue(v); }\n"
+            "private:\n"
+            "    S m_s;\n"
+            "};\n";
+        expected =
+            "struct S {\n\n"
+            "    void setValue(int);\n"
+            "};\n"
+            "class C {\n"
+            "public:\n"
+            "    void setValue(int v) { m_s.setValue(v); }\n"
+            "private:\n"
+            "    S m_s;\n"
+            "};\n";
+        QTest::addRow("add member function to other struct") << original << expected;
+
+        original =
+            "struct S {\n\n};\n"
+            "class C {\n"
+            "public:\n"
+            "    void setValue(int v) { S::@setValue(v); }\n"
+            "};\n";
+        expected =
+            "struct S {\n\n"
+            "    static void setValue(int);\n"
+            "};\n"
+            "class C {\n"
+            "public:\n"
+            "    void setValue(int v) { S::setValue(v); }\n"
+            "};\n";
+        QTest::addRow("add static member function to other struct (explicit)") << original << expected;
+
+        original =
+            "struct S {\n\n};\n"
+            "class C {\n"
+            "public:\n"
+            "    void setValue(int v) { m_s.@setValue(v); }\n"
+            "private:\n"
+            "    static S m_s;\n"
+            "};\n";
+        expected =
+            "struct S {\n\n"
+            "    static void setValue(int);\n"
+            "};\n"
+            "class C {\n"
+            "public:\n"
+            "    void setValue(int v) { m_s.setValue(v); }\n"
+            "private:\n"
+            "    static S m_s;\n"
+            "};\n";
+        QTest::addRow("add static member function to other struct (implicit)") << original << expected;
+
+        original =
+            "class C {\n"
+            "public:\n"
+            "    void setValue(int v);\n"
+            "};\n"
+            "void C::setValue(int v) { this->@setValueInternal(v); }\n";
+        expected =
+            "class C {\n"
+            "public:\n"
+            "    void setValue(int v);\n"
+            "private:\n"
+            "    void setValueInternal(int);\n"
+            "};\n"
+            "void C::setValue(int v) { this->setValueInternal(v); }\n";
+        QTest::addRow("add member function to this (explicit)") << original << expected;
+
+        original =
+            "class C {\n"
+            "public:\n"
+            "    void setValue(int v) { @setValueInternal(v); }\n"
+            "};\n";
+        expected =
+            "class C {\n"
+            "public:\n"
+            "    void setValue(int v) { setValueInternal(v); }\n"
+            "private:\n"
+            "    void setValueInternal(int);\n"
+            "};\n";
+        QTest::addRow("add member function to this (implicit)") << original << expected;
+
+        original =
+            "class C {\n"
+            "public:\n"
+            "    int value() const { return @valueInternal(); }\n"
+            "};\n";
+        expected =
+            "class C {\n"
+            "public:\n"
+            "    int value() const { return valueInternal(); }\n"
+            "private:\n"
+            "    int valueInternal() const;\n"
+            "};\n";
+        QTest::addRow("add const member function to this (implicit)") << original << expected;
+
+        original =
+            "class C {\n"
+            "public:\n"
+            "    static int value() { int i = @valueInternal(); return i; }\n"
+            "};\n";
+        expected =
+            "class C {\n"
+            "public:\n"
+            "    static int value() { int i = @valueInternal(); return i; }\n"
+            "private:\n"
+            "    static int valueInternal();\n"
+            "};\n";
+        QTest::addRow("add static member function to this (inline)") << original << expected;
+
+        original =
+            "class C {\n"
+            "public:\n"
+            "    static int value();\n"
+            "};\n"
+            "int C::value() { return @valueInternal(); }\n";
+        expected =
+            "class C {\n"
+            "public:\n"
+            "    static int value();\n"
+            "private:\n"
+            "    static int valueInternal();\n"
+            "};\n"
+            "int C::value() { return valueInternal(); }\n";
+        QTest::addRow("add static member function to this (non-inline)") << original << expected;
+    }
+
+    void testInsertMemberFromUse()
+    {
+        QFETCH(QByteArray, original);
+        QFETCH(QByteArray, expected);
+
+        QList<TestDocumentPtr> testDocuments({
+            CppTestDocument::create("file.h", original, expected)
+        });
+
+        AddDeclarationForUndeclaredIdentifier factory;
+        factory.setMembersOnly();
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+};
+
+class InsertDeclFromDefTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    /// Check from source file: Insert in header file.
+    void test()
+    {
+        insertToSectionDeclFromDef("public", 0);
+        insertToSectionDeclFromDef("public slots", 1);
+        insertToSectionDeclFromDef("protected", 2);
+        insertToSectionDeclFromDef("protected slots", 3);
+        insertToSectionDeclFromDef("private", 4);
+        insertToSectionDeclFromDef("private slots", 5);
+    }
+
+    void testTemplateFuncTypename()
+    {
+        QByteArray original =
+            "class Foo\n"
+            "{\n"
+            "};\n"
+            "\n"
+            "template<class T>\n"
+            "void Foo::fu@nc() {}\n";
+
+        QByteArray expected =
+            "class Foo\n"
+            "{\n"
+            "public:\n"
+            "    template<class T>\n"
+            "    void func();\n"
+            "};\n"
+            "\n"
+            "template<class T>\n"
+            "void Foo::fu@nc() {}\n";
+
+        InsertDeclFromDef factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory, {}, 0);
+    }
+
+    void testTemplateFuncInt()
+    {
+        QByteArray original =
+            "class Foo\n"
+            "{\n"
+            "};\n"
+            "\n"
+            "template<int N>\n"
+            "void Foo::fu@nc() {}\n";
+
+        QByteArray expected =
+            "class Foo\n"
+            "{\n"
+            "public:\n"
+            "    template<int N>\n"
+            "    void func();\n"
+            "};\n"
+            "\n"
+            "template<int N>\n"
+            "void Foo::fu@nc() {}\n";
+
+        InsertDeclFromDef factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory, {}, 0);
+    }
+
+    void testTemplateReturnType()
+    {
+        QByteArray original =
+            "class Foo\n"
+            "{\n"
+            "};\n"
+            "\n"
+            "std::vector<int> Foo::fu@nc() const {}\n";
+
+        QByteArray expected =
+            "class Foo\n"
+            "{\n"
+            "public:\n"
+            "    std::vector<int> func() const;\n"
+            "};\n"
+            "\n"
+            "std::vector<int> Foo::func() const {}\n";
+
+        InsertDeclFromDef factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory, {}, 0);
+    }
+
+    void testNotTriggeredForTemplateFunc()
+    {
+        QByteArray contents =
+            "class Foo\n"
+            "{\n"
+            "    template<class T>\n"
+            "    void func();\n"
+            "};\n"
+            "\n"
+            "template<class T>\n"
+            "void Foo::fu@nc() {}\n";
+
+        InsertDeclFromDef factory;
+        QuickFixOperationTest(singleDocument(contents, ""), &factory);
+    }
+
+private:
+    // Function for one of InsertDeclDef section cases
+    void insertToSectionDeclFromDef(const QByteArray &section, int sectionIndex)
+    {
+        QList<TestDocumentPtr> testDocuments;
+
+        QByteArray original;
+        QByteArray expected;
+        QByteArray sectionString = section + ":\n";
+        if (sectionIndex == 4)
+            sectionString.clear();
+
+        // Header File
+        original =
+            "class Foo\n"
+            "{\n"
+            "};\n";
+        expected =
+            "class Foo\n"
+            "{\n"
+            + sectionString +
+            "    Foo();\n"
+            "@};\n";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"file.h\"\n"
+            "\n"
+            "Foo::Foo@()\n"
+            "{\n"
+            "}\n"
+            ;
+        expected = original;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        InsertDeclFromDef factory;
+        QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), sectionIndex);
+    }
+};
+
+QObject *AddDeclarationForUndeclaredIdentifier::createTest()
+{
+    return new AddDeclarationForUndeclaredIdentifierTest;
+}
+
+QObject *InsertDeclFromDef::createTest()
+{
+    return new InsertDeclFromDefTest;
+}
+
+#endif // WITH_TESTS
+} // namespace
+
+void registerCreateDeclarationFromUseQuickfixes()
+{
+    CppQuickFixFactory::registerFactory<InsertDeclFromDef>();
+    CppQuickFixFactory::registerFactory<AddDeclarationForUndeclaredIdentifier>();
+}
+
+} // namespace CppEditor::Internal
+
+#ifdef WITH_TESTS
+#include <createdeclarationfromuse.moc>
+#endif
diff --git a/src/plugins/cppeditor/quickfixes/createdeclarationfromuse.h b/src/plugins/cppeditor/quickfixes/createdeclarationfromuse.h
new file mode 100644
index 00000000000..d8452f5850d
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/createdeclarationfromuse.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerCreateDeclarationFromUseQuickfixes();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/extractfunction.cpp b/src/plugins/cppeditor/quickfixes/extractfunction.cpp
new file mode 100644
index 00000000000..46be84fa78e
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/extractfunction.cpp
@@ -0,0 +1,762 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "extractfunction.h"
+
+#include "../cppcodestylesettings.h"
+#include "../cppeditortr.h"
+#include "../cpprefactoringchanges.h"
+#include "../insertionpointlocator.h"
+#include "cppquickfix.h"
+#include "cppquickfixhelpers.h"
+
+#include <coreplugin/icore.h>
+#include <cplusplus/CppRewriter.h>
+#include <cplusplus/declarationcomments.h>
+#include <cplusplus/Overview.h>
+
+#include <QDialogButtonBox>
+#include <QFormLayout>
+#include <QPushButton>
+
+#include <functional>
+
+#ifdef WITH_TESTS
+#include "cppquickfix_test.h"
+#include <QTest>
+#endif
+
+using namespace CPlusPlus;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+using FunctionNameGetter = std::function<QString()>;
+
+class ExtractFunctionOptions
+{
+public:
+    static bool isValidFunctionName(const QString &name)
+    {
+        return !name.isEmpty() && isValidIdentifier(name);
+    }
+
+    bool hasValidFunctionName() const
+    {
+        return isValidFunctionName(funcName);
+    }
+
+    QString funcName;
+    InsertionPointLocator::AccessSpec access = InsertionPointLocator::Public;
+};
+
+class ExtractFunctionOperation : public CppQuickFixOperation
+{
+public:
+    ExtractFunctionOperation(
+        const CppQuickFixInterface &interface,
+        int extractionStart,
+        int extractionEnd,
+        FunctionDefinitionAST *refFuncDef,
+        Symbol *funcReturn,
+        QList<QPair<QString, QString>> relevantDecls,
+        FunctionNameGetter functionNameGetter = {})
+        : CppQuickFixOperation(interface)
+        , m_extractionStart(extractionStart)
+        , m_extractionEnd(extractionEnd)
+        , m_refFuncDef(refFuncDef)
+        , m_funcReturn(funcReturn)
+        , m_relevantDecls(relevantDecls)
+        , m_functionNameGetter(functionNameGetter)
+    {
+        setDescription(Tr::tr("Extract Function"));
+    }
+
+    void perform() override
+    {
+        QTC_ASSERT(!m_funcReturn || !m_relevantDecls.isEmpty(), return);
+
+        CppRefactoringChanges refactoring(snapshot());
+        ExtractFunctionOptions options;
+        if (m_functionNameGetter)
+            options.funcName = m_functionNameGetter();
+        else
+            options = getOptions();
+
+        if (!options.hasValidFunctionName())
+            return;
+        const QString &funcName = options.funcName;
+
+        Function *refFunc = m_refFuncDef->symbol;
+
+        // We don't need to rewrite the type for declarations made inside the reference function,
+        // since their scope will remain the same. Then we preserve the original spelling style.
+        // However, we must do so for the return type in the definition.
+        SubstitutionEnvironment env;
+        env.setContext(context());
+        env.switchScope(refFunc);
+        ClassOrNamespace *targetCoN = context().lookupType(refFunc->enclosingScope());
+        if (!targetCoN)
+            targetCoN = context().globalNamespace();
+        UseMinimalNames subs(targetCoN);
+        env.enter(&subs);
+
+        Overview printer = CppCodeStyleSettings::currentProjectCodeStyleOverview();
+        Control *control = context().bindings()->control().get();
+        QString funcDef;
+        QString funcDecl; // We generate a declaration only in the case of a member function.
+        QString funcCall;
+
+        Class *matchingClass = isMemberFunction(context(), refFunc);
+
+        // Write return type.
+        if (!m_funcReturn) {
+            funcDef.append(QLatin1String("void "));
+            if (matchingClass)
+                funcDecl.append(QLatin1String("void "));
+        } else {
+            const FullySpecifiedType &fullType = rewriteType(m_funcReturn->type(), &env, control);
+            funcDef.append(printer.prettyType(fullType) + QLatin1Char(' '));
+            funcDecl.append(printer.prettyType(m_funcReturn->type()) + QLatin1Char(' '));
+        }
+
+        // Write class qualification, if any.
+        if (matchingClass) {
+            const Scope *current = matchingClass;
+            QVector<const Name *> classes{matchingClass->name()};
+            while (current->enclosingScope()->asClass()) {
+                current = current->enclosingScope()->asClass();
+                classes.prepend(current->name());
+            }
+            while (current->enclosingScope() && current->enclosingScope()->asNamespace()) {
+                current = current->enclosingScope()->asNamespace();
+                if (current->name())
+                    classes.prepend(current->name());
+            }
+            for (const Name *n : classes) {
+                const Name *name = rewriteName(n, &env, control);
+                funcDef.append(printer.prettyName(name));
+                funcDef.append(QLatin1String("::"));
+            }
+        }
+
+        // Write the extracted function itself and its call.
+        funcDef.append(funcName);
+        if (matchingClass)
+            funcDecl.append(funcName);
+        funcCall.append(funcName);
+        funcDef.append(QLatin1Char('('));
+        if (matchingClass)
+            funcDecl.append(QLatin1Char('('));
+        funcCall.append(QLatin1Char('('));
+        for (int i = m_funcReturn ? 1 : 0; i < m_relevantDecls.length(); ++i) {
+            QPair<QString, QString> p = m_relevantDecls.at(i);
+            funcCall.append(p.first);
+            funcDef.append(p.second);
+            if (matchingClass)
+                funcDecl.append(p.second);
+            if (i < m_relevantDecls.length() - 1) {
+                funcCall.append(QLatin1String(", "));
+                funcDef.append(QLatin1String(", "));
+                if (matchingClass)
+                    funcDecl.append(QLatin1String(", "));
+            }
+        }
+        funcDef.append(QLatin1Char(')'));
+        if (matchingClass)
+            funcDecl.append(QLatin1Char(')'));
+        funcCall.append(QLatin1Char(')'));
+        if (refFunc->isConst()) {
+            funcDef.append(QLatin1String(" const"));
+            funcDecl.append(QLatin1String(" const"));
+        }
+        funcDef.append(QLatin1String("\n{\n"));
+        QString extract = currentFile()->textOf(m_extractionStart, m_extractionEnd);
+        extract.replace(QChar::ParagraphSeparator, QLatin1String("\n"));
+        if (!extract.endsWith(QLatin1Char('\n')) && m_funcReturn)
+            extract.append(QLatin1Char('\n'));
+        funcDef.append(extract);
+        if (matchingClass)
+            funcDecl.append(QLatin1String(";\n"));
+        if (m_funcReturn) {
+            funcDef.append(QLatin1String("\nreturn ")
+                           + m_relevantDecls.at(0).first
+                           + QLatin1Char(';'));
+            funcCall.prepend(m_relevantDecls.at(0).second + QLatin1String(" = "));
+        }
+        funcDef.append(QLatin1String("\n}\n\n"));
+        funcDef.replace(QChar::ParagraphSeparator, QLatin1String("\n"));
+        funcDef.prepend(inlinePrefix(currentFile()->filePath()));
+        funcCall.append(QLatin1Char(';'));
+
+        // Do not insert right between the function and an associated comment.
+        int position = currentFile()->startOf(m_refFuncDef);
+        const QList<Token> functionDoc = commentsForDeclaration(
+            m_refFuncDef->symbol, m_refFuncDef, *currentFile()->document(),
+            currentFile()->cppDocument());
+        if (!functionDoc.isEmpty()) {
+            position = currentFile()->cppDocument()->translationUnit()->getTokenPositionInDocument(
+                functionDoc.first(), currentFile()->document());
+        }
+
+        ChangeSet change;
+        change.insert(position, funcDef);
+        change.replace(m_extractionStart, m_extractionEnd, funcCall);
+        currentFile()->apply(change);
+
+        // Write declaration, if necessary.
+        if (matchingClass) {
+            InsertionPointLocator locator(refactoring);
+            const FilePath filePath = FilePath::fromUtf8(matchingClass->fileName());
+            const InsertionLocation &location =
+                locator.methodDeclarationInClass(filePath, matchingClass, options.access);
+            CppRefactoringFilePtr declFile = refactoring.cppFile(filePath);
+            declFile->apply(ChangeSet::makeInsert(
+                declFile->position(location.line(), location.column()),
+                location.prefix() + funcDecl + location.suffix()));
+        }
+    }
+
+    ExtractFunctionOptions getOptions() const
+    {
+        QDialog dlg(Core::ICore::dialogParent());
+        dlg.setWindowTitle(Tr::tr("Extract Function Refactoring"));
+        auto layout = new QFormLayout(&dlg);
+
+        auto funcNameEdit = new FancyLineEdit;
+        funcNameEdit->setValidationFunction([](FancyLineEdit *edit, QString *) {
+            return ExtractFunctionOptions::isValidFunctionName(edit->text());
+        });
+        layout->addRow(Tr::tr("Function name"), funcNameEdit);
+
+        auto accessCombo = new QComboBox;
+        accessCombo->addItem(
+            InsertionPointLocator::accessSpecToString(InsertionPointLocator::Public),
+            InsertionPointLocator::Public);
+        accessCombo->addItem(
+            InsertionPointLocator::accessSpecToString(InsertionPointLocator::PublicSlot),
+            InsertionPointLocator::PublicSlot);
+        accessCombo->addItem(
+            InsertionPointLocator::accessSpecToString(InsertionPointLocator::Protected),
+            InsertionPointLocator::Protected);
+        accessCombo->addItem(
+            InsertionPointLocator::accessSpecToString(InsertionPointLocator::ProtectedSlot),
+            InsertionPointLocator::ProtectedSlot);
+        accessCombo->addItem(
+            InsertionPointLocator::accessSpecToString(InsertionPointLocator::Private),
+            InsertionPointLocator::Private);
+        accessCombo->addItem(
+            InsertionPointLocator::accessSpecToString(InsertionPointLocator::PrivateSlot),
+            InsertionPointLocator::PrivateSlot);
+        layout->addRow(Tr::tr("Access"), accessCombo);
+
+        auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+        QObject::connect(buttonBox, &QDialogButtonBox::accepted, &dlg, &QDialog::accept);
+        QObject::connect(buttonBox, &QDialogButtonBox::rejected, &dlg, &QDialog::reject);
+        QPushButton *ok = buttonBox->button(QDialogButtonBox::Ok);
+        ok->setEnabled(false);
+        QObject::connect(funcNameEdit, &Utils::FancyLineEdit::validChanged,
+                         ok, &QPushButton::setEnabled);
+        layout->addWidget(buttonBox);
+
+        if (dlg.exec() == QDialog::Accepted) {
+            ExtractFunctionOptions options;
+            options.funcName = funcNameEdit->text();
+            options.access = static_cast<InsertionPointLocator::AccessSpec>(accessCombo->
+                                                                            currentData().toInt());
+            return options;
+        }
+        return ExtractFunctionOptions();
+    }
+
+    int m_extractionStart;
+    int m_extractionEnd;
+    FunctionDefinitionAST *m_refFuncDef;
+    Symbol *m_funcReturn;
+    QList<QPair<QString, QString> > m_relevantDecls;
+    FunctionNameGetter m_functionNameGetter;
+};
+
+static QPair<QString, QString> assembleDeclarationData(
+    const QString &specifiers,
+    DeclaratorAST *decltr,
+    const CppRefactoringFilePtr &file,
+    const Overview &printer)
+{
+    QTC_ASSERT(decltr, return (QPair<QString, QString>()));
+    if (decltr->core_declarator
+        && decltr->core_declarator->asDeclaratorId()
+        && decltr->core_declarator->asDeclaratorId()->name) {
+        QString decltrText = file->textOf(file->startOf(decltr),
+                                          file->endOf(decltr->core_declarator));
+        if (!decltrText.isEmpty()) {
+            const QString &name = printer.prettyName(
+                decltr->core_declarator->asDeclaratorId()->name->name);
+            QString completeDecl = specifiers;
+            if (!decltrText.contains(QLatin1Char(' ')))
+                completeDecl.append(QLatin1Char(' ') + decltrText);
+            else
+                completeDecl.append(decltrText);
+            return {name, completeDecl};
+        }
+    }
+    return QPair<QString, QString>();
+}
+
+class FunctionExtractionAnalyser : public ASTVisitor
+{
+public:
+    FunctionExtractionAnalyser(TranslationUnit *unit,
+                               const int selStart,
+                               const int selEnd,
+                               const CppRefactoringFilePtr &file,
+                               const Overview &printer)
+        : ASTVisitor(unit)
+        , m_done(false)
+        , m_failed(false)
+        , m_selStart(selStart)
+        , m_selEnd(selEnd)
+        , m_extractionStart(0)
+        , m_extractionEnd(0)
+        , m_file(file)
+        , m_printer(printer)
+    {}
+
+    bool operator()(FunctionDefinitionAST *refFunDef)
+    {
+        accept(refFunDef);
+
+        if (!m_failed && m_extractionStart == m_extractionEnd)
+            m_failed = true;
+
+        return !m_failed;
+    }
+
+    bool preVisit(AST *) override
+    {
+        return !m_done;
+    }
+
+    void statement(StatementAST *stmt)
+    {
+        if (!stmt)
+            return;
+
+        const int stmtStart = m_file->startOf(stmt);
+        const int stmtEnd = m_file->endOf(stmt);
+
+        if (stmtStart >= m_selEnd
+            || (m_extractionStart && stmtEnd > m_selEnd)) {
+            m_done = true;
+            return;
+        }
+
+        if (stmtStart >= m_selStart && !m_extractionStart)
+            m_extractionStart = stmtStart;
+        if (stmtEnd > m_extractionEnd && m_extractionStart)
+            m_extractionEnd = stmtEnd;
+
+        accept(stmt);
+    }
+
+    bool visit(CaseStatementAST *stmt) override
+    {
+        statement(stmt->statement);
+        return false;
+    }
+
+    bool visit(CompoundStatementAST *stmt) override
+    {
+        for (StatementListAST *it = stmt->statement_list; it; it = it->next) {
+            statement(it->value);
+            if (m_done)
+                break;
+        }
+        return false;
+    }
+
+    bool visit(DoStatementAST *stmt) override
+    {
+        statement(stmt->statement);
+        return false;
+    }
+
+    bool visit(ForeachStatementAST *stmt) override
+    {
+        statement(stmt->statement);
+        return false;
+    }
+
+    bool visit(RangeBasedForStatementAST *stmt) override
+    {
+        statement(stmt->statement);
+        return false;
+    }
+
+    bool visit(ForStatementAST *stmt) override
+    {
+        statement(stmt->initializer);
+        if (!m_done)
+            statement(stmt->statement);
+        return false;
+    }
+
+    bool visit(IfStatementAST *stmt) override
+    {
+        statement(stmt->statement);
+        if (!m_done)
+            statement(stmt->else_statement);
+        return false;
+    }
+
+    bool visit(TryBlockStatementAST *stmt) override
+    {
+        statement(stmt->statement);
+        for (CatchClauseListAST *it = stmt->catch_clause_list; it; it = it->next) {
+            statement(it->value);
+            if (m_done)
+                break;
+        }
+        return false;
+    }
+
+    bool visit(WhileStatementAST *stmt) override
+    {
+        statement(stmt->statement);
+        return false;
+    }
+
+    bool visit(DeclarationStatementAST *declStmt) override
+    {
+        // We need to collect the declarations we see before the extraction or even inside it.
+        // They might need to be used as either a parameter or return value. Actually, we could
+        // still obtain their types from the local uses, but it's good to preserve the original
+        // typing style.
+        if (declStmt
+            && declStmt->declaration
+            && declStmt->declaration->asSimpleDeclaration()) {
+            SimpleDeclarationAST *simpleDecl = declStmt->declaration->asSimpleDeclaration();
+            if (simpleDecl->decl_specifier_list
+                && simpleDecl->declarator_list) {
+                const QString &specifiers =
+                    m_file->textOf(m_file->startOf(simpleDecl),
+                                   m_file->endOf(simpleDecl->decl_specifier_list->lastValue()));
+                for (DeclaratorListAST *decltrList = simpleDecl->declarator_list;
+                     decltrList;
+                     decltrList = decltrList->next) {
+                    const QPair<QString, QString> p =
+                        assembleDeclarationData(specifiers, decltrList->value, m_file, m_printer);
+                    if (!p.first.isEmpty())
+                        m_knownDecls.insert(p.first, p.second);
+                }
+            }
+        }
+
+        return false;
+    }
+
+    bool visit(ReturnStatementAST *) override
+    {
+        if (m_extractionStart) {
+            m_done = true;
+            m_failed = true;
+        }
+
+        return false;
+    }
+
+    bool m_done;
+    bool m_failed;
+    const int m_selStart;
+    const int m_selEnd;
+    int m_extractionStart;
+    int m_extractionEnd;
+    QHash<QString, QString> m_knownDecls;
+    CppRefactoringFilePtr m_file;
+    const Overview &m_printer;
+};
+
+//! Extracts the selected code and puts it to a function
+class ExtractFunction : public CppQuickFixFactory
+{
+public:
+    ExtractFunction(FunctionNameGetter functionNameGetter = FunctionNameGetter())
+        : m_functionNameGetter(functionNameGetter)
+    {}
+
+#ifdef WITH_TESTS
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const CppRefactoringFilePtr file = interface.currentFile();
+
+        // TODO: Fix upstream and uncomment; see QTCREATORBUG-28030.
+        //    if (CppModelManager::usesClangd(file->editor()->textDocument())
+        //            && file->cppDocument()->languageFeatures().cxxEnabled) {
+        //        return;
+        //    }
+
+        QTextCursor cursor = file->cursor();
+        if (!cursor.hasSelection())
+            return;
+
+        const QList<AST *> &path = interface.path();
+        FunctionDefinitionAST *refFuncDef = nullptr; // The "reference" function, which we will extract from.
+        for (int i = path.size() - 1; i >= 0; --i) {
+            refFuncDef = path.at(i)->asFunctionDefinition();
+            if (refFuncDef)
+                break;
+        }
+
+        if (!refFuncDef
+            || !refFuncDef->function_body
+            || !refFuncDef->function_body->asCompoundStatement()
+            || !refFuncDef->function_body->asCompoundStatement()->statement_list
+            || !refFuncDef->symbol
+            || !refFuncDef->symbol->name()
+            || refFuncDef->symbol->enclosingScope()->asTemplate() /* TODO: Templates... */) {
+            return;
+        }
+
+        // Adjust selection ends.
+        int selStart = cursor.selectionStart();
+        int selEnd = cursor.selectionEnd();
+        if (selStart > selEnd)
+            std::swap(selStart, selEnd);
+
+        Overview printer;
+
+        // Analyze the content to be extracted, which consists of determining the statements
+        // which are complete and collecting the declarations seen.
+        FunctionExtractionAnalyser analyser(interface.semanticInfo().doc->translationUnit(),
+                                            selStart, selEnd,
+                                            file,
+                                            printer);
+        if (!analyser(refFuncDef))
+            return;
+
+        // We also need to collect the declarations of the parameters from the reference function.
+        QSet<QString> refFuncParams;
+        if (refFuncDef->declarator->postfix_declarator_list
+            && refFuncDef->declarator->postfix_declarator_list->value
+            && refFuncDef->declarator->postfix_declarator_list->value->asFunctionDeclarator()) {
+            FunctionDeclaratorAST *funcDecltr =
+                refFuncDef->declarator->postfix_declarator_list->value->asFunctionDeclarator();
+            if (funcDecltr->parameter_declaration_clause
+                && funcDecltr->parameter_declaration_clause->parameter_declaration_list) {
+                for (ParameterDeclarationListAST *it =
+                     funcDecltr->parameter_declaration_clause->parameter_declaration_list;
+                     it;
+                     it = it->next) {
+                    ParameterDeclarationAST *paramDecl = it->value->asParameterDeclaration();
+                    if (paramDecl->declarator) {
+                        const QString &specifiers =
+                            file->textOf(file->startOf(paramDecl),
+                                         file->endOf(paramDecl->type_specifier_list->lastValue()));
+                        const QPair<QString, QString> &p =
+                            assembleDeclarationData(specifiers, paramDecl->declarator,
+                                                    file, printer);
+                        if (!p.first.isEmpty()) {
+                            analyser.m_knownDecls.insert(p.first, p.second);
+                            refFuncParams.insert(p.first);
+                        }
+                    }
+                }
+            }
+        }
+
+        // Identify what would be parameters for the new function and its return value, if any.
+        Symbol *funcReturn = nullptr;
+        QList<QPair<QString, QString> > relevantDecls;
+        const SemanticInfo::LocalUseMap localUses = interface.semanticInfo().localUses;
+        for (auto it = localUses.cbegin(), end = localUses.cend(); it != end; ++it) {
+            bool usedBeforeExtraction = false;
+            bool usedAfterExtraction = false;
+            bool usedInsideExtraction = false;
+            const QList<SemanticInfo::Use> &uses = it.value();
+            for (const SemanticInfo::Use &use : uses) {
+                if (use.isInvalid())
+                    continue;
+
+                const int position = file->position(use.line, use.column);
+                if (position < analyser.m_extractionStart)
+                    usedBeforeExtraction = true;
+                else if (position >= analyser.m_extractionEnd)
+                    usedAfterExtraction = true;
+                else
+                    usedInsideExtraction = true;
+            }
+
+            const QString &name = printer.prettyName(it.key()->name());
+
+            if ((usedBeforeExtraction && usedInsideExtraction)
+                || (usedInsideExtraction && refFuncParams.contains(name))) {
+                QTC_ASSERT(analyser.m_knownDecls.contains(name), return);
+                relevantDecls.push_back({name, analyser.m_knownDecls.value(name)});
+            }
+
+            // We assume that the first use of a local corresponds to its declaration.
+            if (usedInsideExtraction && usedAfterExtraction && !usedBeforeExtraction) {
+                if (!funcReturn) {
+                    QTC_ASSERT(analyser.m_knownDecls.contains(name), return);
+                    // The return, if any, is stored as the first item in the list.
+                    relevantDecls.push_front({name, analyser.m_knownDecls.value(name)});
+                    funcReturn = it.key();
+                } else {
+                    // Would require multiple returns. (Unless we do fancy things, as pointed below.)
+                    return;
+                }
+            }
+        }
+
+        // The current implementation doesn't try to be too smart since it preserves the original form
+        // of the declarations. This might be or not the desired effect. An improvement would be to
+        // let the user somehow customize the function interface.
+        result << new ExtractFunctionOperation(interface,
+                                               analyser.m_extractionStart,
+                                               analyser.m_extractionEnd,
+                                               refFuncDef, funcReturn, relevantDecls,
+                                               m_functionNameGetter);
+    }
+
+private:
+    FunctionNameGetter m_functionNameGetter; // For tests to avoid GUI pop-up.
+};
+
+#ifdef WITH_TESTS
+using namespace Tests;
+
+class ExtractFunctionTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test_data()
+    {
+        QTest::addColumn<QByteArray>("original");
+        QTest::addColumn<QByteArray>("expected");
+
+        QTest::newRow("basic")
+            << QByteArray("// Documentation for f\n"
+                 "void f()\n"
+                 "{\n"
+                 "    @{start}g();@{end}\n"
+                 "}\n")
+            << QByteArray("inline void extracted()\n"
+                 "{\n"
+                 "    g();\n"
+                 "}\n"
+                 "\n"
+                 "// Documentation for f\n"
+                 "void f()\n"
+                 "{\n"
+                 "    extracted();\n"
+                 "}\n");
+
+        QTest::newRow("class function")
+            << QByteArray("class Foo\n"
+                 "{\n"
+                 "private:\n"
+                 "    void bar();\n"
+                 "};\n\n"
+                 "void Foo::bar()\n"
+                 "{\n"
+                 "    @{start}g();@{end}\n"
+                 "}\n")
+            << QByteArray("class Foo\n"
+                 "{\n"
+                 "public:\n"
+                 "    void extracted();\n\n"
+                 "private:\n"
+                 "    void bar();\n"
+                 "};\n\n"
+                 "inline void Foo::extracted()\n"
+                 "{\n"
+                 "    g();\n"
+                 "}\n\n"
+                 "void Foo::bar()\n"
+                 "{\n"
+                 "    extracted();\n"
+                 "}\n");
+
+        QTest::newRow("class in namespace")
+            << QByteArray("namespace NS {\n"
+                 "class C {\n"
+                 "    void f(C &c);\n"
+                 "};\n"
+                 "}\n"
+                 "void NS::C::f(NS::C &c)\n"
+                 "{\n"
+                 "    @{start}C *c2 = &c;@{end}\n"
+                 "}\n")
+            << QByteArray("namespace NS {\n"
+                 "class C {\n"
+                 "    void f(C &c);\n"
+                 "\n"
+                 "public:\n"
+                 "    void extracted(NS::C &c);\n" // TODO: Remove non-required qualification
+                 "};\n"
+                 "}\n"
+                 "inline void NS::C::extracted(NS::C &c)\n"
+                 "{\n"
+                 "    C *c2 = &c;\n"
+                 "}\n"
+                 "\n"
+                 "void NS::C::f(NS::C &c)\n"
+                 "{\n"
+                 "    extracted(c);\n"
+                 "}\n");
+
+        QTest::newRow("if-block")
+            << QByteArray("inline void func()\n"
+                 "{\n"
+                 "    int dummy = 0;\n"
+                 "    @{start}if@{end} (dummy < 10) {\n"
+                 "        ++dummy;\n"
+                 "    }\n"
+                 "}\n")
+            << QByteArray("inline void extracted(int dummy)\n"
+                 "{\n"
+                 "    if (dummy < 10) {\n"
+                 "        ++dummy;\n"
+                 "    }\n"
+                 "}\n\n"
+                 "inline void func()\n"
+                 "{\n"
+                 "    int dummy = 0;\n"
+                 "    extracted(dummy);\n"
+                 "}\n");
+    }
+
+    void test()
+    {
+        QFETCH(QByteArray, original);
+        QFETCH(QByteArray, expected);
+
+        QList<TestDocumentPtr> testDocuments;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        ExtractFunction factory([]() { return QLatin1String("extracted"); });
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+};
+
+QObject *ExtractFunction::createTest() { return new ExtractFunctionTest; }
+
+#endif // WITH_TESTS
+
+} // namespace
+
+void registerExtractFunctionQuickfix()
+{
+    CppQuickFixFactory::registerFactory<ExtractFunction>();
+}
+
+} // namespace CppEditor::Internal
+
+#ifdef WITH_TESTS
+#include <extractfunction.moc>
+#endif
diff --git a/src/plugins/cppeditor/quickfixes/extractfunction.h b/src/plugins/cppeditor/quickfixes/extractfunction.h
new file mode 100644
index 00000000000..b41cef59c24
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/extractfunction.h
@@ -0,0 +1,7 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+#pragma once
+
+namespace CppEditor::Internal {
+void registerExtractFunctionQuickfix();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/extractliteralasparameter.cpp b/src/plugins/cppeditor/quickfixes/extractliteralasparameter.cpp
new file mode 100644
index 00000000000..b5b23906e06
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/extractliteralasparameter.cpp
@@ -0,0 +1,560 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "extractliteralasparameter.h"
+
+#include "../cppeditortr.h"
+#include "../cppeditorwidget.h"
+#include "../cpprefactoringchanges.h"
+#include "cppquickfix.h"
+#include "cppquickfixhelpers.h"
+
+#include <cplusplus/ASTPath.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/TypeOfExpression.h>
+
+#ifdef WITH_TESTS
+#include "cppquickfix_test.h"
+#include <QtTest>
+#endif
+
+using namespace CPlusPlus;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+
+struct ReplaceLiteralsResult
+{
+    Token token;
+    QString literalText;
+};
+
+template <class T>
+class ReplaceLiterals : private ASTVisitor
+{
+public:
+    ReplaceLiterals(const CppRefactoringFilePtr &file, ChangeSet *changes, T *literal)
+        : ASTVisitor(file->cppDocument()->translationUnit()), m_file(file), m_changes(changes),
+        m_literal(literal)
+    {
+        m_result.token = m_file->tokenAt(literal->firstToken());
+        m_literalTokenText = m_result.token.spell();
+        m_result.literalText = QLatin1String(m_literalTokenText);
+        if (m_result.token.isCharLiteral()) {
+            m_result.literalText.prepend(QLatin1Char('\''));
+            m_result.literalText.append(QLatin1Char('\''));
+            if (m_result.token.kind() == T_WIDE_CHAR_LITERAL)
+                m_result.literalText.prepend(QLatin1Char('L'));
+            else if (m_result.token.kind() == T_UTF16_CHAR_LITERAL)
+                m_result.literalText.prepend(QLatin1Char('u'));
+            else if (m_result.token.kind() == T_UTF32_CHAR_LITERAL)
+                m_result.literalText.prepend(QLatin1Char('U'));
+        } else if (m_result.token.isStringLiteral()) {
+            m_result.literalText.prepend(QLatin1Char('"'));
+            m_result.literalText.append(QLatin1Char('"'));
+            if (m_result.token.kind() == T_WIDE_STRING_LITERAL)
+                m_result.literalText.prepend(QLatin1Char('L'));
+            else if (m_result.token.kind() == T_UTF16_STRING_LITERAL)
+                m_result.literalText.prepend(QLatin1Char('u'));
+            else if (m_result.token.kind() == T_UTF32_STRING_LITERAL)
+                m_result.literalText.prepend(QLatin1Char('U'));
+        }
+    }
+
+    ReplaceLiteralsResult apply(AST *ast)
+    {
+        ast->accept(this);
+        return m_result;
+    }
+
+private:
+    bool visit(T *ast) override
+    {
+        if (ast != m_literal
+            && strcmp(m_file->tokenAt(ast->firstToken()).spell(), m_literalTokenText) != 0) {
+            return true;
+        }
+        int start, end;
+        m_file->startAndEndOf(ast->firstToken(), &start, &end);
+        m_changes->replace(start, end, QLatin1String("newParameter"));
+        return true;
+    }
+
+    const CppRefactoringFilePtr &m_file;
+    ChangeSet *m_changes;
+    T *m_literal;
+    const char *m_literalTokenText;
+    ReplaceLiteralsResult m_result;
+};
+
+class ExtractLiteralAsParameterOp : public CppQuickFixOperation
+{
+public:
+    ExtractLiteralAsParameterOp(const CppQuickFixInterface &interface, int priority,
+                                ExpressionAST *literal, FunctionDefinitionAST *function)
+        : CppQuickFixOperation(interface, priority),
+        m_literal(literal),
+        m_functionDefinition(function)
+    {
+        setDescription(Tr::tr("Extract Constant as Function Parameter"));
+    }
+
+    struct FoundDeclaration
+    {
+        FunctionDeclaratorAST *ast = nullptr;
+        CppRefactoringFilePtr file;
+    };
+
+    FoundDeclaration findDeclaration(const CppRefactoringChanges &refactoring,
+                                     FunctionDefinitionAST *ast)
+    {
+        FoundDeclaration result;
+        Function *func = ast->symbol;
+        if (Class *matchingClass = isMemberFunction(context(), func)) {
+            // Dealing with member functions
+            const QualifiedNameId *qName = func->name()->asQualifiedNameId();
+            for (Symbol *s = matchingClass->find(qName->identifier()); s; s = s->next()) {
+                if (!s->name()
+                    || !qName->identifier()->match(s->identifier())
+                    || !s->type()->asFunctionType()
+                    || !s->type().match(func->type())
+                    || s->asFunction()) {
+                    continue;
+                }
+
+                const FilePath declFilePath = matchingClass->filePath();
+                result.file = refactoring.cppFile(declFilePath);
+                ASTPath astPath(result.file->cppDocument());
+                const QList<AST *> path = astPath(s->line(), s->column());
+                SimpleDeclarationAST *simpleDecl = nullptr;
+                for (AST *node : path) {
+                    simpleDecl = node->asSimpleDeclaration();
+                    if (simpleDecl) {
+                        if (simpleDecl->symbols && !simpleDecl->symbols->next) {
+                            result.ast = functionDeclarator(simpleDecl);
+                            return result;
+                        }
+                    }
+                }
+
+                if (simpleDecl)
+                    break;
+            }
+        } else if (Namespace *matchingNamespace = isNamespaceFunction(context(), func)) {
+            // Dealing with free functions and inline member functions.
+            bool isHeaderFile;
+            FilePath declFilePath = correspondingHeaderOrSource(filePath(), &isHeaderFile);
+            if (!declFilePath.exists())
+                return FoundDeclaration();
+            result.file = refactoring.cppFile(declFilePath);
+            if (!result.file)
+                return FoundDeclaration();
+            const LookupContext lc(result.file->cppDocument(), snapshot());
+            const QList<LookupItem> candidates = lc.lookup(func->name(), matchingNamespace);
+            for (const LookupItem &candidate : candidates) {
+                if (Symbol *s = candidate.declaration()) {
+                    if (s->asDeclaration()) {
+                        ASTPath astPath(result.file->cppDocument());
+                        const QList<AST *> path = astPath(s->line(), s->column());
+                        for (AST *node : path) {
+                            SimpleDeclarationAST *simpleDecl = node->asSimpleDeclaration();
+                            if (simpleDecl) {
+                                result.ast = functionDeclarator(simpleDecl);
+                                return result;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
+    void perform() override
+    {
+        FunctionDeclaratorAST *functionDeclaratorOfDefinition
+            = functionDeclarator(m_functionDefinition);
+        const CppRefactoringChanges refactoring(snapshot());
+        deduceTypeNameOfLiteral(currentFile()->cppDocument());
+
+        ChangeSet changes;
+        if (NumericLiteralAST *concreteLiteral = m_literal->asNumericLiteral()) {
+            m_literalInfo = ReplaceLiterals<NumericLiteralAST>(currentFile(), &changes,
+                                                               concreteLiteral)
+                                .apply(m_functionDefinition->function_body);
+        } else if (StringLiteralAST *concreteLiteral = m_literal->asStringLiteral()) {
+            m_literalInfo = ReplaceLiterals<StringLiteralAST>(currentFile(), &changes,
+                                                              concreteLiteral)
+                                .apply(m_functionDefinition->function_body);
+        } else if (BoolLiteralAST *concreteLiteral = m_literal->asBoolLiteral()) {
+            m_literalInfo = ReplaceLiterals<BoolLiteralAST>(currentFile(), &changes,
+                                                            concreteLiteral)
+                                .apply(m_functionDefinition->function_body);
+        }
+        const FoundDeclaration functionDeclaration
+            = findDeclaration(refactoring, m_functionDefinition);
+        appendFunctionParameter(functionDeclaratorOfDefinition, currentFile(), &changes,
+                                !functionDeclaration.ast);
+        if (functionDeclaration.ast) {
+            if (currentFile()->filePath() != functionDeclaration.file->filePath()) {
+                ChangeSet declChanges;
+                appendFunctionParameter(functionDeclaration.ast, functionDeclaration.file, &declChanges,
+                                        true);
+                functionDeclaration.file->apply(declChanges);
+            } else {
+                appendFunctionParameter(functionDeclaration.ast, currentFile(), &changes,
+                                        true);
+            }
+        }
+        currentFile()->apply(changes);
+        QTextCursor c = currentFile()->cursor();
+        c.setPosition(c.position() - parameterName().length());
+        editor()->setTextCursor(c);
+        editor()->renameSymbolUnderCursor();
+    }
+
+private:
+    bool hasParameters(FunctionDeclaratorAST *ast) const
+    {
+        return ast->parameter_declaration_clause
+               && ast->parameter_declaration_clause->parameter_declaration_list
+               && ast->parameter_declaration_clause->parameter_declaration_list->value;
+    }
+
+    void deduceTypeNameOfLiteral(const Document::Ptr &document)
+    {
+        TypeOfExpression typeOfExpression;
+        typeOfExpression.init(document, snapshot());
+        Overview overview;
+        Scope *scope = m_functionDefinition->symbol->enclosingScope();
+        const QList<LookupItem> items = typeOfExpression(m_literal, document, scope);
+        if (!items.isEmpty())
+            m_typeName = overview.prettyType(items.first().type());
+    }
+
+    static QString parameterName() { return QLatin1String("newParameter"); }
+
+    QString parameterDeclarationTextToInsert(FunctionDeclaratorAST *ast) const
+    {
+        QString str;
+        if (hasParameters(ast))
+            str = QLatin1String(", ");
+        str += m_typeName;
+        if (!m_typeName.endsWith(QLatin1Char('*')))
+            str += QLatin1Char(' ');
+        str += parameterName();
+        return str;
+    }
+
+    FunctionDeclaratorAST *functionDeclarator(SimpleDeclarationAST *ast) const
+    {
+        for (DeclaratorListAST *decls = ast->declarator_list; decls; decls = decls->next) {
+            FunctionDeclaratorAST * const functionDeclaratorAST = functionDeclarator(decls->value);
+            if (functionDeclaratorAST)
+                return functionDeclaratorAST;
+        }
+        return nullptr;
+    }
+
+    FunctionDeclaratorAST *functionDeclarator(DeclaratorAST *ast) const
+    {
+        for (PostfixDeclaratorListAST *pds = ast->postfix_declarator_list; pds; pds = pds->next) {
+            FunctionDeclaratorAST *funcdecl = pds->value->asFunctionDeclarator();
+            if (funcdecl)
+                return funcdecl;
+        }
+        return nullptr;
+    }
+
+    FunctionDeclaratorAST *functionDeclarator(FunctionDefinitionAST *ast) const
+    {
+        return functionDeclarator(ast->declarator);
+    }
+
+    void appendFunctionParameter(FunctionDeclaratorAST *ast, const CppRefactoringFileConstPtr &file,
+                                 ChangeSet *changes, bool addDefaultValue)
+    {
+        if (!ast)
+            return;
+        if (m_declarationInsertionString.isEmpty())
+            m_declarationInsertionString = parameterDeclarationTextToInsert(ast);
+        QString insertion = m_declarationInsertionString;
+        if (addDefaultValue)
+            insertion += QLatin1String(" = ") + m_literalInfo.literalText;
+        changes->insert(file->startOf(ast->rparen_token), insertion);
+    }
+
+    ExpressionAST *m_literal;
+    FunctionDefinitionAST *m_functionDefinition;
+    QString m_typeName;
+    QString m_declarationInsertionString;
+    ReplaceLiteralsResult m_literalInfo;
+};
+
+/*!
+  Extracts the selected constant and converts it to a parameter of the current function.
+  Activates on numeric, bool, character, or string literal in the function body.
+ */
+class ExtractLiteralAsParameter : public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const QList<AST *> &path = interface.path();
+        if (path.count() < 2)
+            return;
+
+        AST * const lastAst = path.last();
+        ExpressionAST *literal;
+        if (!((literal = lastAst->asNumericLiteral())
+              || (literal = lastAst->asStringLiteral())
+              || (literal = lastAst->asBoolLiteral()))) {
+            return;
+        }
+
+        FunctionDefinitionAST *function;
+        int i = path.count() - 2;
+        while (!(function = path.at(i)->asFunctionDefinition())) {
+            // Ignore literals in lambda expressions for now.
+            if (path.at(i)->asLambdaExpression())
+                return;
+            if (--i < 0)
+                return;
+        }
+
+        PostfixDeclaratorListAST * const declaratorList = function->declarator->postfix_declarator_list;
+        if (!declaratorList)
+            return;
+        if (FunctionDeclaratorAST *declarator = declaratorList->value->asFunctionDeclarator()) {
+            if (declarator->parameter_declaration_clause
+                && declarator->parameter_declaration_clause->dot_dot_dot_token) {
+                // Do not handle functions with ellipsis parameter.
+                return;
+            }
+        }
+
+        const int priority = path.size() - 1;
+        result << new ExtractLiteralAsParameterOp(interface, priority, literal, function);
+    }
+};
+
+#ifdef WITH_TESTS
+using namespace Tests;
+
+class ExtractLiteralAsParameterTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testTypeDeduction_data()
+    {
+        QTest::addColumn<QByteArray>("typeString");
+        QTest::addColumn<QByteArray>("literal");
+        QTest::newRow("int")
+            << QByteArray("int ") << QByteArray("156");
+        QTest::newRow("unsigned int")
+            << QByteArray("unsigned int ") << QByteArray("156u");
+        QTest::newRow("long")
+            << QByteArray("long ") << QByteArray("156l");
+        QTest::newRow("unsigned long")
+            << QByteArray("unsigned long ") << QByteArray("156ul");
+        QTest::newRow("long long")
+            << QByteArray("long long ") << QByteArray("156ll");
+        QTest::newRow("unsigned long long")
+            << QByteArray("unsigned long long ") << QByteArray("156ull");
+        QTest::newRow("float")
+            << QByteArray("float ") << QByteArray("3.14159f");
+        QTest::newRow("double")
+            << QByteArray("double ") << QByteArray("3.14159");
+        QTest::newRow("long double")
+            << QByteArray("long double ") << QByteArray("3.14159L");
+        QTest::newRow("bool")
+            << QByteArray("bool ") << QByteArray("true");
+        QTest::newRow("bool")
+            << QByteArray("bool ") << QByteArray("false");
+        QTest::newRow("char")
+            << QByteArray("char ") << QByteArray("'X'");
+        QTest::newRow("wchar_t")
+            << QByteArray("wchar_t ") << QByteArray("L'X'");
+        QTest::newRow("char16_t")
+            << QByteArray("char16_t ") << QByteArray("u'X'");
+        QTest::newRow("char32_t")
+            << QByteArray("char32_t ") << QByteArray("U'X'");
+        QTest::newRow("const char *")
+            << QByteArray("const char *") << QByteArray("\"narf\"");
+        QTest::newRow("const wchar_t *")
+            << QByteArray("const wchar_t *") << QByteArray("L\"narf\"");
+        QTest::newRow("const char16_t *")
+            << QByteArray("const char16_t *") << QByteArray("u\"narf\"");
+        QTest::newRow("const char32_t *")
+            << QByteArray("const char32_t *") << QByteArray("U\"narf\"");
+    }
+
+    void testTypeDeduction()
+    {
+        QFETCH(QByteArray, typeString);
+        QFETCH(QByteArray, literal);
+        const QByteArray original = QByteArray("void foo() {return @") + literal + QByteArray(";}\n");
+        const QByteArray expected = QByteArray("void foo(") + typeString + QByteArray("newParameter = ")
+                                    + literal + QByteArray(") {return newParameter;}\n");
+
+        if (literal == "3.14159") {
+            qWarning("Literal 3.14159 is wrongly reported as int. Skipping.");
+            return;
+        } else if (literal == "3.14159L") {
+            qWarning("Literal 3.14159L is wrongly reported as long. Skipping.");
+            return;
+        }
+
+        ExtractLiteralAsParameter factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+    void testFreeFunctionSeparateFiles()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "void foo(const char *a, long b = 1);\n";
+        expected =
+            "void foo(const char *a, long b = 1, int newParameter = 156);\n";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "void foo(const char *a, long b)\n"
+            "{return 1@56 + 123 + 156;}\n";
+        expected =
+            "void foo(const char *a, long b, int newParameter)\n"
+            "{return newParameter + 123 + newParameter;}\n";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        ExtractLiteralAsParameter factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    void testMemberFunctionSeparateFiles()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "class Narf {\n"
+            "public:\n"
+            "    int zort();\n"
+            "};\n";
+        expected =
+            "class Narf {\n"
+            "public:\n"
+            "    int zort(int newParameter = 155);\n"
+            "};\n";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"file.h\"\n\n"
+            "int Narf::zort()\n"
+            "{ return 15@5 + 1; }\n";
+        expected =
+            "#include \"file.h\"\n\n"
+            "int Narf::zort(int newParameter)\n"
+            "{ return newParameter + 1; }\n";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        ExtractLiteralAsParameter factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    void testNotTriggeringForInvalidCode()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        original =
+            "T(\"test\")\n"
+            "{\n"
+            "    const int i = @14;\n"
+            "}\n";
+        testDocuments << CppTestDocument::create("file.cpp", original, "");
+
+        ExtractLiteralAsParameter factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    void test_data()
+    {
+        QTest::addColumn<QByteArray>("original");
+        QTest::addColumn<QByteArray>("expected");
+
+        QTest::newRow("ExtractLiteralAsParameter_freeFunction")
+            << QByteArray(
+                   "void foo(const char *a, long b = 1)\n"
+                   "{return 1@56 + 123 + 156;}\n")
+            << QByteArray(
+                   "void foo(const char *a, long b = 1, int newParameter = 156)\n"
+                   "{return newParameter + 123 + newParameter;}\n");
+        QTest::newRow("ExtractLiteralAsParameter_memberFunction")
+            << QByteArray(
+                   "class Narf {\n"
+                   "public:\n"
+                   "    int zort();\n"
+                   "};\n\n"
+                   "int Narf::zort()\n"
+                   "{ return 15@5 + 1; }\n")
+            << QByteArray(
+                   "class Narf {\n"
+                   "public:\n"
+                   "    int zort(int newParameter = 155);\n"
+                   "};\n\n"
+                   "int Narf::zort(int newParameter)\n"
+                   "{ return newParameter + 1; }\n");
+        QTest::newRow("ExtractLiteralAsParameter_memberFunctionInline")
+            << QByteArray(
+                   "class Narf {\n"
+                   "public:\n"
+                   "    int zort()\n"
+                   "    { return 15@5 + 1; }\n"
+                   "};\n")
+            << QByteArray(
+                   "class Narf {\n"
+                   "public:\n"
+                   "    int zort(int newParameter = 155)\n"
+                   "    { return newParameter + 1; }\n"
+                   "};\n");
+    }
+
+    void test()
+    {
+        QFETCH(QByteArray, original);
+        QFETCH(QByteArray, expected);
+        ExtractLiteralAsParameter factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+};
+
+QObject *ExtractLiteralAsParameter::createTest() { return new ExtractLiteralAsParameterTest; }
+
+#endif // WITH_TESTS
+} // namespace
+
+void registerExtractLiteralAsParameterQuickfix()
+{
+    CppQuickFixFactory::registerFactory<ExtractLiteralAsParameter>();
+}
+
+} // namespace CppEditor::Internal
+
+#ifdef WITH_TESTS
+#include <extractliteralasparameter.moc>
+#endif
diff --git a/src/plugins/cppeditor/quickfixes/extractliteralasparameter.h b/src/plugins/cppeditor/quickfixes/extractliteralasparameter.h
new file mode 100644
index 00000000000..e6359f1602b
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/extractliteralasparameter.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerExtractLiteralAsParameterQuickfix();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/insertfunctiondefinition.cpp b/src/plugins/cppeditor/quickfixes/insertfunctiondefinition.cpp
new file mode 100644
index 00000000000..693b2c4a1d8
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/insertfunctiondefinition.cpp
@@ -0,0 +1,2123 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "insertfunctiondefinition.h"
+
+#include "../cppcodestylepreferences.h"
+#include "../cppcodestylesettings.h"
+#include "../cppeditortr.h"
+#include "../cppeditorwidget.h"
+#include "../cpprefactoringchanges.h"
+#include "../cpptoolssettings.h"
+#include "../insertionpointlocator.h"
+#include "../symbolfinder.h"
+#include "cppquickfix.h"
+#include "cppquickfixhelpers.h"
+
+#include <coreplugin/icore.h>
+#include <cplusplus/CppRewriter.h>
+#include <cplusplus/Overview.h>
+#include <utils/layoutbuilder.h>
+
+#include <QDialogButtonBox>
+#include <QGridLayout>
+#include <QHBoxLayout>
+
+#ifdef WITH_TESTS
+#include "cppquickfix_test.h"
+#include <QtTest>
+#endif
+
+using namespace CPlusPlus;
+using namespace TextEditor;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+
+enum DefPos {
+    DefPosInsideClass,
+    DefPosOutsideClass,
+    DefPosImplementationFile
+};
+
+enum class InsertDefsFromDeclsMode {
+    Off,         // Testing: simulates user canceling the dialog
+    Impl,        // Testing: simulates user choosing cpp file for every function
+    Alternating, // Testing: simulates user choosing a different DefPos for every function
+    User         // Normal interactive mode
+};
+
+class InsertDefOperation: public CppQuickFixOperation
+{
+public:
+    // Make sure that either loc is valid or targetFileName is not empty.
+    InsertDefOperation(const CppQuickFixInterface &interface,
+                       Declaration *decl, DeclaratorAST *declAST, const InsertionLocation &loc,
+                       const DefPos defpos, const FilePath &targetFileName = {},
+                       bool freeFunction = false)
+        : CppQuickFixOperation(interface, 0)
+        , m_decl(decl)
+        , m_declAST(declAST)
+        , m_loc(loc)
+        , m_defpos(defpos)
+        , m_targetFilePath(targetFileName)
+    {
+        if (m_defpos == DefPosImplementationFile) {
+            const FilePath declFile = decl->filePath();
+            const FilePath targetFile =  m_loc.isValid() ? m_loc.filePath() : m_targetFilePath;
+            const FilePath resolved = targetFile.relativePathFrom(declFile.parentDir());
+            setPriority(2);
+            setDescription(Tr::tr("Add Definition in %1").arg(resolved.displayName()));
+        } else if (freeFunction) {
+            setDescription(Tr::tr("Add Definition Here"));
+        } else if (m_defpos == DefPosInsideClass) {
+            setDescription(Tr::tr("Add Definition Inside Class"));
+        } else if (m_defpos == DefPosOutsideClass) {
+            setPriority(1);
+            setDescription(Tr::tr("Add Definition Outside Class"));
+        }
+    }
+
+    static void insertDefinition(
+        const CppQuickFixOperation *op,
+        InsertionLocation loc,
+        DefPos defPos,
+        DeclaratorAST *declAST,
+        Declaration *decl,
+        const FilePath &targetFilePath,
+        ChangeSet *changeSet = nullptr)
+    {
+        CppRefactoringChanges refactoring(op->snapshot());
+        if (!loc.isValid())
+            loc = insertLocationForMethodDefinition(decl, true, NamespaceHandling::Ignore,
+                                                    refactoring, targetFilePath);
+        QTC_ASSERT(loc.isValid(), return);
+
+        CppRefactoringFilePtr targetFile = refactoring.cppFile(loc.filePath());
+        Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
+        oo.showFunctionSignatures = true;
+        oo.showReturnTypes = true;
+        oo.showArgumentNames = true;
+        oo.showEnclosingTemplate = true;
+
+        // What we really want is to show template parameters for the class, but not for the
+        // function, but we cannot express that. This is an approximation that will work
+        // as long as either the surrounding class or the function is not a template.
+        oo.showTemplateParameters = decl->enclosingClass()
+                                    && decl->enclosingClass()->enclosingTemplate();
+
+        if (defPos == DefPosInsideClass) {
+            const int targetPos = targetFile->position(loc.line(), loc.column());
+            ChangeSet localChangeSet;
+            ChangeSet * const target = changeSet ? changeSet : &localChangeSet;
+            target->replace(targetPos - 1, targetPos, QLatin1String("\n {\n\n}")); // replace ';'
+
+            if (!changeSet) {
+                targetFile->setOpenEditor(true, targetPos);
+                targetFile->apply(*target);
+
+                // Move cursor inside definition
+                QTextCursor c = targetFile->cursor();
+                c.setPosition(targetPos);
+                c.movePosition(QTextCursor::Down);
+                c.movePosition(QTextCursor::EndOfLine);
+                op->editor()->setTextCursor(c);
+            }
+        } else {
+            // make target lookup context
+            Document::Ptr targetDoc = targetFile->cppDocument();
+            Scope *targetScope = targetDoc->scopeAt(loc.line(), loc.column());
+
+            // Correct scope in case of a function try-block. See QTCREATORBUG-14661.
+            if (targetScope && targetScope->asBlock()) {
+                if (Class * const enclosingClass = targetScope->enclosingClass())
+                    targetScope = enclosingClass;
+                else
+                    targetScope = targetScope->enclosingNamespace();
+            }
+
+            LookupContext targetContext(targetDoc, op->snapshot());
+            ClassOrNamespace *targetCoN = targetContext.lookupType(targetScope);
+            if (!targetCoN)
+                targetCoN = targetContext.globalNamespace();
+
+            // setup rewriting to get minimally qualified names
+            SubstitutionEnvironment env;
+            env.setContext(op->context());
+            env.switchScope(decl->enclosingScope());
+            UseMinimalNames q(targetCoN);
+            env.enter(&q);
+            Control *control = op->context().bindings()->control().get();
+
+            // rewrite the function type
+            const FullySpecifiedType tn = rewriteType(decl->type(), &env, control);
+
+            // rewrite the function name
+            if (nameIncludesOperatorName(decl->name())) {
+                const QString operatorNameText = op->currentFile()->textOf(declAST->core_declarator);
+                oo.includeWhiteSpaceInOperatorName = operatorNameText.contains(QLatin1Char(' '));
+            }
+            const QString name = oo.prettyName(LookupContext::minimalName(decl, targetCoN,
+                                                                          control));
+
+            const QString inlinePref = inlinePrefix(targetFilePath, [defPos] {
+                return defPos == DefPosOutsideClass;
+            });
+
+            const QString prettyType = oo.prettyType(tn, name);
+
+            QString input = prettyType;
+            int index = 0;
+            while (input.startsWith("template")) {
+                QRegularExpression templateRegex("template\\s*<[^>]*>");
+                QRegularExpressionMatch match = templateRegex.match(input);
+                if (match.hasMatch()) {
+                    index += match.captured().size() + 1;
+                    input = input.mid(match.captured().size() + 1);
+                }
+            }
+
+            QString defText = prettyType;
+            defText.insert(index, inlinePref);
+            defText += QLatin1String("\n{\n\n}");
+
+            ChangeSet localChangeSet;
+            ChangeSet * const target = changeSet ? changeSet : &localChangeSet;
+            const int targetPos = targetFile->position(loc.line(), loc.column());
+            target->insert(targetPos,  loc.prefix() + defText + loc.suffix());
+
+            if (!changeSet) {
+                targetFile->setOpenEditor(true, targetPos);
+                targetFile->apply(*target);
+
+                // Move cursor inside definition
+                QTextCursor c = targetFile->cursor();
+                c.setPosition(targetPos);
+                c.movePosition(QTextCursor::Down, QTextCursor::MoveAnchor,
+                               loc.prefix().count(QLatin1String("\n")) + 2);
+                c.movePosition(QTextCursor::EndOfLine);
+                if (defPos == DefPosImplementationFile) {
+                    if (targetFile->editor())
+                        targetFile->editor()->setTextCursor(c);
+                } else {
+                    op->editor()->setTextCursor(c);
+                }
+            }
+        }
+    }
+
+private:
+    void perform() override
+    {
+        insertDefinition(this, m_loc, m_defpos, m_declAST, m_decl, m_targetFilePath);
+    }
+
+    Declaration *m_decl;
+    DeclaratorAST *m_declAST;
+    InsertionLocation m_loc;
+    const DefPos m_defpos;
+    const FilePath m_targetFilePath;
+};
+
+class MemberFunctionImplSetting
+{
+public:
+    Symbol *func = nullptr;
+    DefPos defPos = DefPosImplementationFile;
+};
+using MemberFunctionImplSettings = QList<MemberFunctionImplSetting>;
+
+class AddImplementationsDialog : public QDialog
+{
+public:
+    AddImplementationsDialog(const QList<Symbol *> &candidates, const FilePath &implFile)
+        : QDialog(Core::ICore::dialogParent()), m_candidates(candidates)
+    {
+        setWindowTitle(Tr::tr("Member Function Implementations"));
+
+        const auto defaultImplTargetComboBox = new QComboBox;
+        QStringList implTargetStrings{Tr::tr("None"), Tr::tr("Inline"), Tr::tr("Outside Class")};
+        if (!implFile.isEmpty())
+            implTargetStrings.append(implFile.fileName());
+        defaultImplTargetComboBox->insertItems(0, implTargetStrings);
+        connect(defaultImplTargetComboBox, &QComboBox::currentIndexChanged, this,
+                [this](int index) {
+                    for (int i = 0; i < m_implTargetBoxes.size(); ++i) {
+                        if (!m_candidates.at(i)->type()->asFunctionType()->isPureVirtual())
+                            static_cast<QComboBox *>(m_implTargetBoxes.at(i))->setCurrentIndex(index);
+                    }
+                });
+        const auto defaultImplTargetLayout = new QHBoxLayout;
+        defaultImplTargetLayout->addWidget(new QLabel(Tr::tr("Default implementation location:")));
+        defaultImplTargetLayout->addWidget(defaultImplTargetComboBox);
+
+        const auto candidatesLayout = new QGridLayout;
+        Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
+        oo.showFunctionSignatures = true;
+        oo.showReturnTypes = true;
+        for (int i = 0; i < m_candidates.size(); ++i) {
+            const Function * const func = m_candidates.at(i)->type()->asFunctionType();
+            QTC_ASSERT(func, continue);
+            const auto implTargetComboBox = new QComboBox;
+            m_implTargetBoxes.append(implTargetComboBox);
+            implTargetComboBox->insertItems(0, implTargetStrings);
+            if (func->isPureVirtual())
+                implTargetComboBox->setCurrentIndex(0);
+            candidatesLayout->addWidget(new QLabel(oo.prettyType(func->type(), func->name())),
+                                        i, 0);
+            candidatesLayout->addWidget(implTargetComboBox, i, 1);
+        }
+
+        const auto buttonBox
+            = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+        connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+        connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+
+        defaultImplTargetComboBox->setCurrentIndex(implTargetStrings.size() - 1);
+        const auto mainLayout = new QVBoxLayout(this);
+        mainLayout->addLayout(defaultImplTargetLayout);
+        mainLayout->addWidget(Layouting::createHr(this));
+        mainLayout->addLayout(candidatesLayout);
+        mainLayout->addWidget(buttonBox);
+    }
+
+    MemberFunctionImplSettings settings() const
+    {
+        QTC_ASSERT(m_candidates.size() == m_implTargetBoxes.size(), return {});
+        MemberFunctionImplSettings settings;
+        for (int i = 0; i < m_candidates.size(); ++i) {
+            MemberFunctionImplSetting setting;
+            const int index = m_implTargetBoxes.at(i)->currentIndex();
+            const bool addImplementation = index != 0;
+            if (!addImplementation)
+                continue;
+            setting.func = m_candidates.at(i);
+            setting.defPos = static_cast<DefPos>(index - 1);
+            settings << setting;
+        }
+        return settings;
+    }
+
+private:
+    const QList<Symbol *> m_candidates;
+    QList<QComboBox *> m_implTargetBoxes;
+};
+
+class InsertDefsOperation: public CppQuickFixOperation
+{
+public:
+    InsertDefsOperation(const CppQuickFixInterface &interface) : CppQuickFixOperation(interface)
+    {
+        setDescription(Tr::tr("Create Implementations for Member Functions"));
+
+        m_classAST = astForClassOperations(interface);
+        if (!m_classAST)
+            return;
+        const Class * const theClass = m_classAST->symbol;
+        if (!theClass)
+            return;
+
+        // Collect all member functions.
+        for (auto it = theClass->memberBegin(); it != theClass->memberEnd(); ++it) {
+            Symbol * const s = *it;
+            if (!s->identifier() || !s->type() || !s->asDeclaration() || s->asFunction())
+                continue;
+            Function * const func = s->type()->asFunctionType();
+            if (!func || func->isSignal() || func->isFriend())
+                continue;
+            Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
+            oo.showFunctionSignatures = true;
+            if (magicQObjectFunctions().contains(oo.prettyName(func->name())))
+                continue;
+            m_declarations << s;
+        }
+    }
+
+    bool isApplicable() const { return !m_declarations.isEmpty(); }
+    void setMode(InsertDefsFromDeclsMode mode) { m_mode = mode; }
+
+private:
+    void perform() override
+    {
+        QList<Symbol *> unimplemented;
+        SymbolFinder symbolFinder;
+        for (Symbol * const s : std::as_const(m_declarations)) {
+            if (!symbolFinder.findMatchingDefinition(s, snapshot()))
+                unimplemented << s;
+        }
+        if (unimplemented.isEmpty())
+            return;
+
+        CppRefactoringChanges refactoring(snapshot());
+        const bool isHeaderFile = ProjectFile::isHeader(ProjectFile::classify(filePath().toString()));
+        FilePath cppFile; // Only set if the class is defined in a header file.
+        if (isHeaderFile) {
+            InsertionPointLocator locator(refactoring);
+            for (const InsertionLocation &location
+                 : locator.methodDefinition(unimplemented.first(), false, {})) {
+                if (!location.isValid())
+                    continue;
+                const FilePath filePath = location.filePath();
+                if (ProjectFile::isHeader(ProjectFile::classify(filePath.path()))) {
+                    const FilePath source = correspondingHeaderOrSource(filePath);
+                    if (!source.isEmpty())
+                        cppFile = source;
+                } else {
+                    cppFile = filePath;
+                }
+                break;
+            }
+        }
+
+        MemberFunctionImplSettings settings;
+        switch (m_mode) {
+        case InsertDefsFromDeclsMode::User: {
+            AddImplementationsDialog dlg(unimplemented, cppFile);
+            if (dlg.exec() == QDialog::Accepted)
+                settings = dlg.settings();
+            break;
+        }
+        case InsertDefsFromDeclsMode::Impl: {
+            for (Symbol * const func : std::as_const(unimplemented)) {
+                MemberFunctionImplSetting setting;
+                setting.func = func;
+                setting.defPos = DefPosImplementationFile;
+                settings << setting;
+            }
+            break;
+        }
+        case InsertDefsFromDeclsMode::Alternating: {
+            int defPos = DefPosImplementationFile;
+            const auto incDefPos = [&defPos] {
+                defPos = (defPos + 1) % (DefPosImplementationFile + 2);
+            };
+            for (Symbol * const func : std::as_const(unimplemented)) {
+                incDefPos();
+                if (defPos > DefPosImplementationFile)
+                    continue;
+                MemberFunctionImplSetting setting;
+                setting.func = func;
+                setting.defPos = static_cast<DefPos>(defPos);
+                settings << setting;
+            }
+            break;
+        }
+        case InsertDefsFromDeclsMode::Off:
+            break;
+        }
+
+        if (settings.isEmpty())
+            return;
+
+        class DeclFinder : public ASTVisitor
+        {
+        public:
+            DeclFinder(const CppRefactoringFile *file, const Symbol *func)
+                : ASTVisitor(file->cppDocument()->translationUnit()), m_func(func) {}
+
+            SimpleDeclarationAST *decl() const { return m_decl; }
+
+        private:
+            bool visit(SimpleDeclarationAST *decl) override
+            {
+                if (m_decl)
+                    return false;
+                if (decl->symbols && decl->symbols->value == m_func)
+                    m_decl = decl;
+                return !m_decl;
+            }
+
+            const Symbol * const m_func;
+            SimpleDeclarationAST *m_decl = nullptr;
+        };
+
+        QHash<FilePath, ChangeSet> changeSets;
+        for (const MemberFunctionImplSetting &setting : std::as_const(settings)) {
+            DeclFinder finder(currentFile().data(), setting.func);
+            finder.accept(m_classAST);
+            QTC_ASSERT(finder.decl(), continue);
+            InsertionLocation loc;
+            const FilePath targetFilePath = setting.defPos == DefPosImplementationFile
+                                                ? cppFile : filePath();
+            QTC_ASSERT(!targetFilePath.isEmpty(), continue);
+            if (setting.defPos == DefPosInsideClass) {
+                int line, column;
+                currentFile()->lineAndColumn(currentFile()->endOf(finder.decl()), &line, &column);
+                loc = InsertionLocation(filePath(), QString(), QString(), line, column);
+            }
+            ChangeSet &changeSet = changeSets[targetFilePath];
+            InsertDefOperation::insertDefinition(
+                this, loc, setting.defPos, finder.decl()->declarator_list->value,
+                setting.func->asDeclaration(),targetFilePath, &changeSet);
+        }
+        for (auto it = changeSets.cbegin(); it != changeSets.cend(); ++it)
+            refactoring.cppFile(it.key())->apply(it.value());
+    }
+
+    ClassSpecifierAST *m_classAST = nullptr;
+    InsertDefsFromDeclsMode m_mode = InsertDefsFromDeclsMode::User;
+    QList<Symbol *> m_declarations;
+};
+
+class InsertDefFromDecl: public CppQuickFixFactory
+{
+public:
+#ifdef WITH_TESTS
+    static QObject *createTest();
+#endif
+
+    void setOutside() { m_defPosOutsideClass = true; }
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const QList<AST *> &path = interface.path();
+
+        int idx = path.size() - 1;
+        for (; idx >= 0; --idx) {
+            AST *node = path.at(idx);
+            if (SimpleDeclarationAST *simpleDecl = node->asSimpleDeclaration()) {
+                if (idx > 0 && path.at(idx - 1)->asStatement())
+                    return;
+                if (simpleDecl->symbols && !simpleDecl->symbols->next) {
+                    if (Symbol *symbol = simpleDecl->symbols->value) {
+                        if (Declaration *decl = symbol->asDeclaration()) {
+                            if (Function *func = decl->type()->asFunctionType()) {
+                                if (func->isSignal() || func->isPureVirtual() || func->isFriend())
+                                    return;
+
+                                // Check if there is already a definition
+                                SymbolFinder symbolFinder;
+                                if (symbolFinder.findMatchingDefinition(decl, interface.snapshot(),
+                                                                        true)) {
+                                    return;
+                                }
+
+                                // Insert Position: Implementation File
+                                DeclaratorAST *declAST = simpleDecl->declarator_list->value;
+                                InsertDefOperation *op = nullptr;
+                                ProjectFile::Kind kind = ProjectFile::classify(interface.filePath().toString());
+                                const bool isHeaderFile = ProjectFile::isHeader(kind);
+                                if (isHeaderFile) {
+                                    CppRefactoringChanges refactoring(interface.snapshot());
+                                    InsertionPointLocator locator(refactoring);
+                                    // find appropriate implementation file, but do not use this
+                                    // location, because insertLocationForMethodDefinition() should
+                                    // be used in perform() to get consistent insert positions.
+                                    for (const InsertionLocation &location :
+                                         locator.methodDefinition(decl, false, {})) {
+                                        if (!location.isValid())
+                                            continue;
+
+                                        const FilePath filePath = location.filePath();
+                                        if (ProjectFile::isHeader(ProjectFile::classify(filePath.path()))) {
+                                            const FilePath source = correspondingHeaderOrSource(filePath);
+                                            if (!source.isEmpty()) {
+                                                op = new InsertDefOperation(interface, decl, declAST,
+                                                                            InsertionLocation(),
+                                                                            DefPosImplementationFile,
+                                                                            source);
+                                            }
+                                        } else {
+                                            op = new InsertDefOperation(interface, decl, declAST,
+                                                                        InsertionLocation(),
+                                                                        DefPosImplementationFile,
+                                                                        filePath);
+                                        }
+
+                                        if (op)
+                                            result << op;
+                                        break;
+                                    }
+                                }
+
+                                // Determine if we are dealing with a free function
+                                const bool isFreeFunction = func->enclosingClass() == nullptr;
+
+                                // Insert Position: Outside Class
+                                if (!isFreeFunction || m_defPosOutsideClass) {
+                                    result << new InsertDefOperation(interface, decl, declAST,
+                                                                     InsertionLocation(),
+                                                                     DefPosOutsideClass,
+                                                                     interface.filePath());
+                                }
+
+                                // Insert Position: Inside Class
+                                // Determine insert location direct after the declaration.
+                                int line, column;
+                                const CppRefactoringFilePtr file = interface.currentFile();
+                                file->lineAndColumn(file->endOf(simpleDecl), &line, &column);
+                                const InsertionLocation loc
+                                    = InsertionLocation(interface.filePath(), QString(),
+                                                        QString(), line, column);
+                                result << new InsertDefOperation(interface, decl, declAST, loc,
+                                                                 DefPosInsideClass, FilePath(),
+                                                                 isFreeFunction);
+
+                                return;
+                            }
+                        }
+                    }
+                }
+                break;
+            }
+        }
+    }
+
+    bool m_defPosOutsideClass = false;
+};
+
+//! Adds a definition for any number of member function declarations.
+class InsertDefsFromDecls : public CppQuickFixFactory
+{
+public:
+#ifdef WITH_TESTS
+    static QObject *createTest();
+#endif
+
+    void setMode(InsertDefsFromDeclsMode mode) { m_mode = mode; }
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const auto op = QSharedPointer<InsertDefsOperation>::create(interface);
+        op->setMode(m_mode);
+        if (op->isApplicable())
+            result << op;
+    }
+
+private:
+    InsertDefsFromDeclsMode m_mode = InsertDefsFromDeclsMode::User;
+};
+
+#ifdef WITH_TESTS
+using namespace Tests;
+
+static QList<TestDocumentPtr> singleHeader(const QByteArray &original, const QByteArray &expected)
+{
+    return {CppTestDocument::create("file.h", original, expected)};
+}
+
+class InsertDefFromDeclTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    /// Check if definition is inserted right after class for insert definition outside
+    void testAfterClass()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "class Foo\n"
+            "{\n"
+            "    Foo();\n"
+            "    void a@();\n"
+            "};\n"
+            "\n"
+            "class Bar {};\n";
+        expected =
+            "class Foo\n"
+            "{\n"
+            "    Foo();\n"
+            "    void a();\n"
+            "};\n"
+            "\n"
+            "inline void Foo::a()\n"
+            "{\n\n}\n"
+            "\n"
+            "class Bar {};\n";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"file.h\"\n"
+            "\n"
+            "Foo::Foo()\n"
+            "{\n\n"
+            "}\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 1);
+    }
+
+    /// Check from header file: If there is a source file, insert the definition in the source file.
+    /// Case: Source file is empty.
+    void testHeaderSourceBasic1()
+    {
+        QList<TestDocumentPtr> testDocuments;
+
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "struct Foo\n"
+            "{\n"
+            "    Foo()@;\n"
+            "};\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original.resize(0);
+        expected =
+            "\n"
+            "Foo::Foo()\n"
+            "{\n\n"
+            "}\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    /// Check from header file: If there is a source file, insert the definition in the source file.
+    /// Case: Source file is not empty.
+    void testHeaderSourceBasic2()
+    {
+        QList<TestDocumentPtr> testDocuments;
+
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original = "void f(const std::vector<int> &v)@;\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"file.h\"\n"
+            "\n"
+            "int x;\n"
+            ;
+        expected =
+            "#include \"file.h\"\n"
+            "\n"
+            "int x;\n"
+            "\n"
+            "void f(const std::vector<int> &v)\n"
+            "{\n"
+            "\n"
+            "}\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    /// Check from source file: Insert in source file, not header file.
+    void testHeaderSourceBasic3()
+    {
+        QList<TestDocumentPtr> testDocuments;
+
+        QByteArray original;
+        QByteArray expected;
+
+        // Empty Header File
+        testDocuments << CppTestDocument::create("file.h", "", "");
+
+        // Source File
+        original =
+            "struct Foo\n"
+            "{\n"
+            "    Foo()@;\n"
+            "};\n";
+        expected = original +
+                   "\n"
+                   "Foo::Foo()\n"
+                   "{\n\n"
+                   "}\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    /// Check from header file: If the class is in a namespace, the added function definition
+    /// name must be qualified accordingly.
+    void testHeaderSourceNamespace1()
+    {
+        QList<TestDocumentPtr> testDocuments;
+
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "namespace N {\n"
+            "struct Foo\n"
+            "{\n"
+            "    Foo()@;\n"
+            "};\n"
+            "}\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original.resize(0);
+        expected =
+            "\n"
+            "N::Foo::Foo()\n"
+            "{\n\n"
+            "}\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    /// Check from header file: If the class is in namespace N and the source file has a
+    /// "using namespace N" line, the function definition name must be qualified accordingly.
+    void testHeaderSourceNamespace2()
+    {
+        QList<TestDocumentPtr> testDocuments;
+
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "namespace N {\n"
+            "struct Foo\n"
+            "{\n"
+            "    Foo()@;\n"
+            "};\n"
+            "}\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"file.h\"\n"
+            "using namespace N;\n"
+            ;
+        expected = original +
+                   "\n"
+                   "Foo::Foo()\n"
+                   "{\n\n"
+                   "}\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    /// Check definition insert inside class
+    void testInsideClass()
+    {
+        const QByteArray original =
+            "class Foo {\n"
+            "    void b@ar();\n"
+            "};";
+        const QByteArray expected =
+            "class Foo {\n"
+            "    void bar()\n"
+            "    {\n\n"
+            "    }\n"
+            "};";
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory, ProjectExplorer::HeaderPaths(),
+                              1);
+    }
+
+    /// Check not triggering when definition exists
+    void testNotTriggeringWhenDefinitionExists()
+    {
+        const QByteArray original =
+            "class Foo {\n"
+            "    void b@ar();\n"
+            "};\n"
+            "void Foo::bar() {}\n";
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(singleDocument(original, ""), &factory, ProjectExplorer::HeaderPaths(), 1);
+    }
+
+    /// Find right implementation file.
+    void testFindRightImplementationFile()
+    {
+        QList<TestDocumentPtr> testDocuments;
+
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "struct Foo\n"
+            "{\n"
+            "    Foo();\n"
+            "    void a();\n"
+            "    void b@();\n"
+            "};\n"
+            "}\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File #1
+        original =
+            "#include \"file.h\"\n"
+            "\n"
+            "Foo::Foo()\n"
+            "{\n\n"
+            "}\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+
+        // Source File #2
+        original =
+            "#include \"file.h\"\n"
+            "\n"
+            "void Foo::a()\n"
+            "{\n\n"
+            "}\n";
+        expected = original +
+                   "\n"
+                   "void Foo::b()\n"
+                   "{\n\n"
+                   "}\n";
+        testDocuments << CppTestDocument::create("file2.cpp", original, expected);
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    /// Ignore generated functions declarations when looking at the surrounding
+    /// functions declarations in order to find the right implementation file.
+    void testIgnoreSurroundingGeneratedDeclarations()
+    {
+        QList<TestDocumentPtr> testDocuments;
+
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "#define DECLARE_HIDDEN_FUNCTION void hidden();\n"
+            "struct Foo\n"
+            "{\n"
+            "    void a();\n"
+            "    DECLARE_HIDDEN_FUNCTION\n"
+            "    void b@();\n"
+            "};\n"
+            "}\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File #1
+        original =
+            "#include \"file.h\"\n"
+            "\n"
+            "void Foo::a()\n"
+            "{\n\n"
+            "}\n";
+        expected =
+            "#include \"file.h\"\n"
+            "\n"
+            "void Foo::a()\n"
+            "{\n\n"
+            "}\n"
+            "\n"
+            "void Foo::b()\n"
+            "{\n\n"
+            "}\n";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        // Source File #2
+        original =
+            "#include \"file.h\"\n"
+            "\n"
+            "void Foo::hidden()\n"
+            "{\n\n"
+            "}\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("file2.cpp", original, expected);
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    /// Check if whitespace is respected for operator functions
+    void testRespectWsInOperatorNames1()
+    {
+        QByteArray original =
+            "class Foo\n"
+            "{\n"
+            "    Foo &opera@tor =();\n"
+            "};\n";
+        QByteArray expected =
+            "class Foo\n"
+            "{\n"
+            "    Foo &operator =();\n"
+            "};\n"
+            "\n"
+            "Foo &Foo::operator =()\n"
+            "{\n"
+            "\n"
+            "}\n";
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+    /// Check if whitespace is respected for operator functions
+    void testRespectWsInOperatorNames2()
+    {
+        QByteArray original =
+            "class Foo\n"
+            "{\n"
+            "    Foo &opera@tor=();\n"
+            "};\n";
+        QByteArray expected =
+            "class Foo\n"
+            "{\n"
+            "    Foo &operator=();\n"
+            "};\n"
+            "\n"
+            "Foo &Foo::operator=()\n"
+            "{\n"
+            "\n"
+            "}\n";
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+    /// Check that the noexcept exception specifier is transferred
+    void testNoexceptSpecifier()
+    {
+        QByteArray original =
+            "class Foo\n"
+            "{\n"
+            "    void @foo() noexcept(false);\n"
+            "};\n";
+        QByteArray expected =
+            "class Foo\n"
+            "{\n"
+            "    void foo() noexcept(false);\n"
+            "};\n"
+            "\n"
+            "void Foo::foo() noexcept(false)\n"
+            "{\n"
+            "\n"
+            "}\n";
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+    /// Check if a function like macro use is not separated by the function to insert
+    /// Case: Macro preceded by preproceesor directives and declaration.
+    void testMacroUsesAtEndOfFile1()
+    {
+        QList<TestDocumentPtr> testDocuments;
+
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original = "void f()@;\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"file.h\"\n"
+            "#define MACRO(X) X x;\n"
+            "int lala;\n"
+            "\n"
+            "MACRO(int)\n"
+            ;
+        expected =
+            "#include \"file.h\"\n"
+            "#define MACRO(X) X x;\n"
+            "int lala;\n"
+            "\n"
+            "\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "\n"
+            "}\n"
+            "\n"
+            "MACRO(int)\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    /// Check if a function like macro use is not separated by the function to insert
+    /// Case: Marco preceded only by preprocessor directives.
+    void testMacroUsesAtEndOfFile2()
+    {
+        QList<TestDocumentPtr> testDocuments;
+
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original = "void f()@;\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"file.h\"\n"
+            "#define MACRO(X) X x;\n"
+            "\n"
+            "MACRO(int)\n"
+            ;
+        expected =
+            "#include \"file.h\"\n"
+            "#define MACRO(X) X x;\n"
+            "\n"
+            "\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "\n"
+            "}\n"
+            "\n"
+            "MACRO(int)\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    /// Check if insertion happens before syntactically erroneous statements at end of file.
+    void testErroneousStatementAtEndOfFile()
+    {
+        QList<TestDocumentPtr> testDocuments;
+
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original = "void f()@;\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"file.h\"\n"
+            "\n"
+            "MissingSemicolon(int)\n"
+            ;
+        expected =
+            "#include \"file.h\"\n"
+            "\n"
+            "\n"
+            "\n"
+            "void f()\n"
+            "{\n"
+            "\n"
+            "}\n"
+            "\n"
+            "MissingSemicolon(int)\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    /// Check: Respect rvalue references
+    void testRvalueReference()
+    {
+        QList<TestDocumentPtr> testDocuments;
+
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original = "void f(Foo &&)@;\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original = "";
+        expected =
+            "\n"
+            "void f(Foo &&)\n"
+            "{\n"
+            "\n"
+            "}\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    void testFunctionTryBlock()
+    {
+        QList<TestDocumentPtr> testDocuments;
+
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original = R"(
+struct Foo {
+    void tryCatchFunc();
+    void @otherFunc();
+};
+)";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original = R"(
+#include "file.h"
+
+void Foo::tryCatchFunc() try {} catch (...) {}
+)";
+        expected = R"(
+#include "file.h"
+
+void Foo::tryCatchFunc() try {} catch (...) {}
+
+void Foo::otherFunc()
+{
+
+}
+)";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    void testUsingDecl()
+    {
+        QList<TestDocumentPtr> testDocuments;
+
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original = R"(
+namespace N { struct S; }
+using N::S;
+
+void @func(const S &s);
+)";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original = R"(
+#include "file.h"
+)";
+        expected = R"(
+#include "file.h"
+
+void func(const S &s)
+{
+
+}
+)";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(testDocuments, &factory);
+
+        testDocuments.clear();
+        original = R"(
+namespace N1 {
+namespace N2 { struct S; }
+using N2::S;
+}
+
+void @func(const N1::S &s);
+)";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original = R"(
+#include "file.h"
+)";
+        expected = R"(
+#include "file.h"
+
+void func(const N1::S &s)
+{
+
+}
+)";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QuickFixOperationTest(testDocuments, &factory);
+
+        // No using declarations here, but the code model has one. No idea why.
+        testDocuments.clear();
+        original = R"(
+class B {};
+class D : public B {
+    @D();
+};
+)";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original = R"(
+#include "file.h"
+)";
+        expected = R"(
+#include "file.h"
+
+D::D()
+{
+
+}
+)";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QuickFixOperationTest(testDocuments, &factory);
+
+        testDocuments.clear();
+        original = R"(
+namespace ns1 { template<typename T> class span {}; }
+
+namespace ns {
+using ns1::span;
+class foo
+{
+    void @bar(ns::span<int>);
+};
+}
+)";
+        expected = R"(
+namespace ns1 { template<typename T> class span {}; }
+
+namespace ns {
+using ns1::span;
+class foo
+{
+    void bar(ns::span<int>);
+};
+
+void foo::bar(ns::span<int>)
+{
+
+}
+
+}
+)";
+        // TODO: Unneeded namespace gets inserted in RewriteName::visit(const QualifiedNameId *)
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    /// Find right implementation file. (QTCREATORBUG-10728)
+    void testFindImplementationFile()
+    {
+        QList<TestDocumentPtr> testDocuments;
+
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "class Foo {\n"
+            "    void bar();\n"
+            "    void ba@z();\n"
+            "};\n"
+            "\n"
+            "void Foo::bar()\n"
+            "{}\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"file.h\"\n"
+            ;
+        expected =
+            "#include \"file.h\"\n"
+            "\n"
+            "void Foo::baz()\n"
+            "{\n"
+            "\n"
+            "}\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    void testUnicodeIdentifier()
+    {
+        QList<TestDocumentPtr> testDocuments;
+
+        QByteArray original;
+        QByteArray expected;
+
+//
+// The following "non-latin1" code points are used in the tests:
+//
+//   U+00FC  - 2 code units in UTF8, 1 in UTF16 - LATIN SMALL LETTER U WITH DIAERESIS
+//   U+4E8C  - 3 code units in UTF8, 1 in UTF16 - CJK UNIFIED IDEOGRAPH-4E8C
+//   U+10302 - 4 code units in UTF8, 2 in UTF16 - OLD ITALIC LETTER KE
+//
+
+#define UNICODE_U00FC "\xc3\xbc"
+#define UNICODE_U4E8C "\xe4\xba\x8c"
+#define UNICODE_U10302 "\xf0\x90\x8c\x82"
+#define TEST_UNICODE_IDENTIFIER UNICODE_U00FC UNICODE_U4E8C UNICODE_U10302
+
+        original =
+            "class Foo {\n"
+            "    void @" TEST_UNICODE_IDENTIFIER "();\n"
+            "};\n";
+        ;
+        expected = original;
+        expected +=
+            "\n"
+            "void Foo::" TEST_UNICODE_IDENTIFIER "()\n"
+            "{\n"
+            "\n"
+            "}\n";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+#undef UNICODE_U00FC
+#undef UNICODE_U4E8C
+#undef UNICODE_U10302
+#undef TEST_UNICODE_IDENTIFIER
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    void testTemplateClass()
+    {
+        QByteArray original =
+            "template<class T>\n"
+            "class Foo\n"
+            "{\n"
+            "    void fun@c1();\n"
+            "    void func2();\n"
+            "};\n\n"
+            "template<class T>\n"
+            "void Foo<T>::func2() {}\n";
+        QByteArray expected =
+            "template<class T>\n"
+            "class Foo\n"
+            "{\n"
+            "    void func1();\n"
+            "    void func2();\n"
+            "};\n\n"
+            "template<class T>\n"
+            "void Foo<T>::func1()\n"
+            "{\n"
+            "\n"
+            "}\n\n"
+            "template<class T>\n"
+            "void Foo<T>::func2() {}\n";
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+    void testTemplateClassWithValueParam()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original =
+            "template<typename T, int size> struct MyArray {};\n"
+            "MyArray<int, 1> @foo();";
+        QByteArray expected = original;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        original = "#include \"file.h\"\n";
+        expected =
+            "#include \"file.h\"\n\n"
+            "MyArray<int, 1> foo()\n"
+            "{\n\n"
+            "}\n";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    void testTemplateFunction()
+    {
+        QByteArray original =
+            "class Foo\n"
+            "{\n"
+            "    template<class T>\n"
+            "    void fun@c();\n"
+            "};\n";
+        QByteArray expected =
+            "class Foo\n"
+            "{\n"
+            "    template<class T>\n"
+            "    void fun@c();\n"
+            "};\n"
+            "\n"
+            "template<class T>\n"
+            "void Foo::func()\n"
+            "{\n"
+            "\n"
+            "}\n";
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+    void testTemplateClassAndTemplateFunction()
+    {
+        QByteArray original =
+            "template<class T>"
+            "class Foo\n"
+            "{\n"
+            "    template<class U>\n"
+            "    T fun@c(U u);\n"
+            "};\n";
+        QByteArray expected =
+            "template<class T>"
+            "class Foo\n"
+            "{\n"
+            "    template<class U>\n"
+            "    T fun@c(U u);\n"
+            "};\n"
+            "\n"
+            "template<class T>\n"
+            "template<class U>\n"
+            "T Foo<T>::func(U u)\n"
+            "{\n"
+            "\n"
+            "}\n";
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+    void testTemplateClassAndFunctionInsideNamespace()
+    {
+        QByteArray original =
+            "namespace N {\n"
+            "template<class T>"
+            "class Foo\n"
+            "{\n"
+            "    template<class U>\n"
+            "    T fun@c(U u);\n"
+            "};\n"
+            "}\n";
+        QByteArray expected =
+            "namespace N {\n"
+            "template<class T>"
+            "class Foo\n"
+            "{\n"
+            "    template<class U>\n"
+            "    T fun@c(U u);\n"
+            "};\n"
+            "\n"
+            "template<class T>\n"
+            "template<class U>\n"
+            "T Foo<T>::func(U u)\n"
+            "{\n"
+            "\n"
+            "}\n"
+            "\n"
+            "}\n";
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+    void testFunctionWithSignedUnsignedArgument()
+    {
+        QByteArray original;
+        QByteArray expected;
+        InsertDefFromDecl factory;
+
+        original =R"--(
+class myclass
+{
+    myc@lass(QVector<signed> g);
+    myclass(QVector<unsigned> g);
+}
+)--";
+        expected =R"--(
+class myclass
+{
+    myclass(QVector<signed> g);
+    myclass(QVector<unsigned> g);
+}
+
+myclass::myclass(QVector<signed int> g)
+{
+
+}
+)--";
+
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+
+        original =R"--(
+class myclass
+{
+    myclass(QVector<signed> g);
+    myc@lass(QVector<unsigned> g);
+}
+)--";
+        expected =R"--(
+class myclass
+{
+    myclass(QVector<signed> g);
+    myclass(QVector<unsigned> g);
+}
+
+myclass::myclass(QVector<unsigned int> g)
+{
+
+}
+)--";
+
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+
+        original =R"--(
+class myclass
+{
+    unsigned f@oo(unsigned);
+}
+)--";
+        expected =R"--(
+class myclass
+{
+    unsigned foo(unsigned);
+}
+
+unsigned int myclass::foo(unsigned int)
+{
+
+}
+)--";
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+
+        original =R"--(
+class myclass
+{
+    signed f@oo(signed);
+}
+)--";
+        expected =R"--(
+class myclass
+{
+    signed foo(signed);
+}
+
+signed int myclass::foo(signed int)
+{
+
+}
+)--";
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+    void testNotTriggeredForFriendFunc()
+    {
+        const QByteArray contents =
+            "class Foo\n"
+            "{\n"
+            "    friend void f@unc();\n"
+            "};\n"
+            "\n";
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(singleDocument(contents, ""), &factory);
+    }
+
+    void testMinimalFunctionParameterType()
+    {
+        QList<TestDocumentPtr> testDocuments;
+
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original = R"(
+class C {
+    typedef int A;
+    A @foo(A);
+};
+)";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original = R"(
+#include "file.h"
+)";
+        expected = R"(
+#include "file.h"
+
+C::A C::foo(A)
+{
+
+}
+)";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(testDocuments, &factory);
+
+        testDocuments.clear();
+        // Header File
+        original = R"(
+namespace N {
+    struct S;
+    S @foo(const S &s);
+};
+)";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original = R"(
+#include "file.h"
+)";
+        expected = R"(
+#include "file.h"
+
+N::S N::foo(const S &s)
+{
+
+}
+)";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    void testAliasTemplateAsReturnType()
+    {
+        QList<TestDocumentPtr> testDocuments;
+
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original = R"(
+struct foo {
+    struct foo2 {
+        template <typename T> using MyType = T;
+        MyType<int> @bar();
+    };
+};
+)";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original = R"(
+#include "file.h"
+)";
+        expected = R"(
+#include "file.h"
+
+foo::foo2::MyType<int> foo::foo2::bar()
+{
+
+}
+)";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    void test_data()
+    {
+        QTest::addColumn<QByteArray>("original");
+        QTest::addColumn<QByteArray>("expected");
+
+        // Check from source file: If there is no header file, insert the definition after the class.
+        QByteArray original =
+            "struct Foo\n"
+            "{\n"
+            "    Foo();@\n"
+            "};\n";
+        QByteArray expected = original +
+                                  "\n"
+                                  "Foo::Foo()\n"
+                                  "{\n\n"
+                                  "}\n";
+        QTest::newRow("basic") << original << expected;
+
+        original = "void free()@;\n";
+        expected = "void free()\n{\n\n}\n";
+        QTest::newRow("freeFunction") << original << expected;
+
+        original = "class Foo {\n"
+                   "public:\n"
+                   "    Foo() {}\n"
+                   "};\n"
+                   "void freeFunc() {\n"
+                   "    Foo @f();"
+                   "}\n";
+
+        // Check not triggering when it is a statement
+        QTest::newRow("notTriggeringStatement") << original << QByteArray();
+    }
+
+    void test()
+    {
+        QFETCH(QByteArray, original);
+        QFETCH(QByteArray, expected);
+
+        InsertDefFromDecl factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+    void testOutsideTemplateClassAndTemplateFunction()
+    {
+        QByteArray original =
+            "template<class T>"
+            "class Foo\n"
+            "{\n"
+            "    template<class U>\n"
+            "    void fun@c();\n"
+            "};\n";
+        QByteArray expected =
+            "template<class T>"
+            "class Foo\n"
+            "{\n"
+            "    template<class U>\n"
+            "    void fun@c();\n"
+            "};\n"
+            "\n"
+            "template<class T>\n"
+            "template<class U>\n"
+            "inline void Foo<T>::func()\n"
+            "{\n"
+            "\n"
+            "}\n";
+
+        InsertDefFromDecl factory;
+        factory.setOutside();
+        QuickFixOperationTest(singleHeader(original, expected), &factory);
+    }
+
+    void testOutsideTemplateClass()
+    {
+        QByteArray original =
+            "template<class T>"
+            "class Foo\n"
+            "{\n"
+            "    void fun@c();\n"
+            "};\n";
+        QByteArray expected =
+            "template<class T>"
+            "class Foo\n"
+            "{\n"
+            "    void fun@c();\n"
+            "};\n"
+            "\n"
+            "template<class T>\n"
+            "inline void Foo<T>::func()\n"
+            "{\n"
+            "\n"
+            "}\n";
+
+        InsertDefFromDecl factory;
+        factory.setOutside();
+        QuickFixOperationTest(singleHeader(original, expected), &factory);
+    }
+
+    void testOutsideTemplateFunction()
+    {
+        QByteArray original =
+            "class Foo\n"
+            "{\n"
+            "    template<class U>\n"
+            "    void fun@c();\n"
+            "};\n";
+        QByteArray expected =
+            "class Foo\n"
+            "{\n"
+            "    template<class U>\n"
+            "    void fun@c();\n"
+            "};\n"
+            "\n"
+            "template<class U>\n"
+            "inline void Foo::func()\n"
+            "{\n"
+            "\n"
+            "}\n";
+
+        InsertDefFromDecl factory;
+        factory.setOutside();
+        QuickFixOperationTest(singleHeader(original, expected), &factory);
+    }
+
+    void testOutsideFunction()
+    {
+        QByteArray original =
+            "class Foo\n"
+            "{\n"
+            "    void fun@c();\n"
+            "};\n";
+        QByteArray expected =
+            "class Foo\n"
+            "{\n"
+            "    void fun@c();\n"
+            "};\n"
+            "\n"
+            "inline void Foo::func()\n"
+            "{\n"
+            "\n"
+            "}\n";
+
+        InsertDefFromDecl factory;
+        factory.setOutside();
+        QuickFixOperationTest(singleHeader(original, expected), &factory);
+
+    }
+
+};
+
+class InsertDefsFromDeclsTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+
+    void test_data()
+    {
+        QTest::addColumn<QByteArrayList>("headers");
+        QTest::addColumn<QByteArrayList>("sources");
+        QTest::addColumn<int>("mode");
+
+        QByteArray origHeader = R"(
+namespace N {
+class @C
+{
+public:
+    friend void ignoredFriend();
+    void ignoredImplemented() {};
+    void ignoredImplemented2(); // Below
+    void ignoredImplemented3(); // In cpp file
+    void funcNotSelected();
+    void funcInline();
+    void funcBelow();
+    void funcCppFile();
+
+signals:
+    void ignoredSignal();
+};
+
+inline void C::ignoredImplemented2() {}
+
+} // namespace N)";
+        QByteArray origSource = R"(
+#include "file.h"
+
+namespace N {
+
+void C::ignoredImplemented3() {}
+
+} // namespace N)";
+
+        QByteArray expectedHeader = R"(
+namespace N {
+class C
+{
+public:
+    friend void ignoredFriend();
+    void ignoredImplemented() {};
+    void ignoredImplemented2(); // Below
+    void ignoredImplemented3(); // In cpp file
+    void funcNotSelected();
+    void funcInline()
+    {
+
+    }
+    void funcBelow();
+    void funcCppFile();
+
+signals:
+    void ignoredSignal();
+};
+
+inline void C::ignoredImplemented2() {}
+
+inline void C::funcBelow()
+{
+
+}
+
+} // namespace N)";
+        QByteArray expectedSource = R"(
+#include "file.h"
+
+namespace N {
+
+void C::ignoredImplemented3() {}
+
+void C::funcCppFile()
+{
+
+}
+
+} // namespace N)";
+        QTest::addRow("normal case")
+            << QByteArrayList{origHeader, expectedHeader}
+            << QByteArrayList{origSource, expectedSource}
+            << int(InsertDefsFromDeclsMode::Alternating);
+        QTest::addRow("aborted dialog")
+            << QByteArrayList{origHeader, origHeader}
+            << QByteArrayList{origSource, origSource}
+            << int(InsertDefsFromDeclsMode::Off);
+
+        origHeader = R"(
+        namespace N {
+        class @C
+        {
+        public:
+            friend void ignoredFriend();
+            void ignoredImplemented() {};
+            void ignoredImplemented2(); // Below
+            void ignoredImplemented3(); // In cpp file
+
+        signals:
+            void ignoredSignal();
+        };
+
+        inline void C::ignoredImplemented2() {}
+
+        } // namespace N)";
+        QTest::addRow("no candidates")
+            << QByteArrayList{origHeader, origHeader}
+            << QByteArrayList{origSource, origSource}
+            << int(InsertDefsFromDeclsMode::Alternating);
+
+        origHeader = R"(
+        namespace N {
+        class @C
+        {
+        public:
+            friend void ignoredFriend();
+            void ignoredImplemented() {};
+
+        signals:
+            void ignoredSignal();
+        };
+        } // namespace N)";
+        QTest::addRow("no member functions")
+            << QByteArrayList{origHeader, ""}
+            << QByteArrayList{origSource, ""}
+            << int(InsertDefsFromDeclsMode::Alternating);
+
+
+    }
+
+    void test()
+    {
+        QFETCH(QByteArrayList, headers);
+        QFETCH(QByteArrayList, sources);
+        QFETCH(int, mode);
+
+        QList<TestDocumentPtr> testDocuments(
+            {CppTestDocument::create("file.h", headers.at(0), headers.at(1)),
+             CppTestDocument::create("file.cpp", sources.at(0), sources.at(1))});
+        InsertDefsFromDecls factory;
+        factory.setMode(static_cast<InsertDefsFromDeclsMode>(mode));
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    void testInsertAndFormat()
+    {
+        if (!isClangFormatPresent())
+            QSKIP("This test reqires ClangFormat");
+
+        const QByteArray origHeader = R"(
+class @C
+{
+public:
+    void func1 (int const &i);
+    void func2 (double const d);
+};
+)";
+        const QByteArray origSource = R"(
+#include "file.h"
+)";
+
+        const QByteArray expectedSource = R"(
+#include "file.h"
+
+void C::func1 (int const &i)
+{
+
+}
+
+void C::func2 (double const d)
+{
+
+}
+)";
+
+        const QByteArray clangFormatSettings = R"(
+BreakBeforeBraces: Allman
+QualifierAlignment: Right
+SpaceBeforeParens: Always
+)";
+
+        const QList<TestDocumentPtr> testDocuments({
+                                                    CppTestDocument::create("file.h", origHeader, origHeader),
+                                                    CppTestDocument::create("file.cpp", origSource, expectedSource)});
+        InsertDefsFromDecls factory;
+        factory.setMode(InsertDefsFromDeclsMode::Impl);
+        CppCodeStylePreferences * const prefs = CppToolsSettings::cppCodeStyle();
+        const CppCodeStyleSettings settings = prefs->codeStyleSettings();
+        CppCodeStyleSettings tempSettings = settings;
+        tempSettings.forceFormatting = true;
+        prefs->setCodeStyleSettings(tempSettings);
+        QuickFixOperationTest(testDocuments, &factory, {}, {}, {}, clangFormatSettings);
+        prefs->setCodeStyleSettings(settings);
+    }
+};
+
+QObject *InsertDefFromDecl::createTest()
+{
+    return new InsertDefFromDeclTest;
+}
+
+QObject *InsertDefsFromDecls::createTest()
+{
+    return new InsertDefsFromDeclsTest;
+}
+
+#endif // WITH_TESTS
+} // namespace
+
+void registerInsertFunctionDefinitionQuickfixes()
+{
+    CppQuickFixFactory::registerFactory<InsertDefFromDecl>();
+    CppQuickFixFactory::registerFactory<InsertDefsFromDecls>();
+}
+
+} // namespace CppEditor::Internal
+
+#ifdef WITH_TESTS
+#include <insertfunctiondefinition.moc>
+#endif
diff --git a/src/plugins/cppeditor/quickfixes/insertfunctiondefinition.h b/src/plugins/cppeditor/quickfixes/insertfunctiondefinition.h
new file mode 100644
index 00000000000..77c4c87b6d4
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/insertfunctiondefinition.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerInsertFunctionDefinitionQuickfixes();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/logicaloperationquickfixes.cpp b/src/plugins/cppeditor/quickfixes/logicaloperationquickfixes.cpp
new file mode 100644
index 00000000000..05ad7540743
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/logicaloperationquickfixes.cpp
@@ -0,0 +1,381 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "logicaloperationquickfixes.h"
+
+#include "../cppeditortr.h"
+#include "../cpprefactoringchanges.h"
+#include "cppquickfix.h"
+
+#ifdef WITH_TESTS
+#include "cppquickfix_test.h"
+#include <QtTest>
+#endif
+
+using namespace CPlusPlus;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+
+class FlipLogicalOperandsOp : public CppQuickFixOperation
+{
+public:
+    FlipLogicalOperandsOp(const CppQuickFixInterface &interface, int priority,
+                          BinaryExpressionAST *binary, QString replacement)
+        : CppQuickFixOperation(interface)
+        , binary(binary)
+        , replacement(replacement)
+    {
+        setPriority(priority);
+    }
+
+    QString description() const override
+    {
+        if (replacement.isEmpty())
+            return Tr::tr("Swap Operands");
+        else
+            return Tr::tr("Rewrite Using %1").arg(replacement);
+    }
+
+    void perform() override
+    {
+        ChangeSet changes;
+        changes.flip(currentFile()->range(binary->left_expression),
+                     currentFile()->range(binary->right_expression));
+        if (!replacement.isEmpty())
+            changes.replace(currentFile()->range(binary->binary_op_token), replacement);
+
+        currentFile()->apply(changes);
+    }
+
+private:
+    BinaryExpressionAST *binary;
+    QString replacement;
+};
+
+class InverseLogicalComparisonOp : public CppQuickFixOperation
+{
+public:
+    InverseLogicalComparisonOp(const CppQuickFixInterface &interface,
+                               int priority,
+                               BinaryExpressionAST *binary,
+                               Kind invertToken)
+        : CppQuickFixOperation(interface, priority)
+        , binary(binary)
+    {
+        Token tok;
+        tok.f.kind = invertToken;
+        replacement = QLatin1String(tok.spell());
+
+        // check for enclosing nested expression
+        if (priority - 1 >= 0)
+            nested = interface.path()[priority - 1]->asNestedExpression();
+
+        // check for ! before parentheses
+        if (nested && priority - 2 >= 0) {
+            negation = interface.path()[priority - 2]->asUnaryExpression();
+            if (negation && !interface.currentFile()->tokenAt(negation->unary_op_token).is(T_EXCLAIM))
+                negation = nullptr;
+        }
+    }
+
+    QString description() const override
+    {
+        return Tr::tr("Rewrite Using %1").arg(replacement);
+    }
+
+    void perform() override
+    {
+        ChangeSet changes;
+        if (negation) {
+            // can't remove parentheses since that might break precedence
+            changes.remove(currentFile()->range(negation->unary_op_token));
+        } else if (nested) {
+            changes.insert(currentFile()->startOf(nested), QLatin1String("!"));
+        } else {
+            changes.insert(currentFile()->startOf(binary), QLatin1String("!("));
+            changes.insert(currentFile()->endOf(binary), QLatin1String(")"));
+        }
+        changes.replace(currentFile()->range(binary->binary_op_token), replacement);
+        currentFile()->apply(changes);
+    }
+
+private:
+    BinaryExpressionAST *binary = nullptr;
+    NestedExpressionAST *nested = nullptr;
+    UnaryExpressionAST *negation = nullptr;
+
+    QString replacement;
+};
+
+class RewriteLogicalAndOp : public CppQuickFixOperation
+{
+public:
+    std::shared_ptr<ASTPatternBuilder> mk;
+    UnaryExpressionAST *left;
+    UnaryExpressionAST *right;
+    BinaryExpressionAST *pattern;
+
+    RewriteLogicalAndOp(const CppQuickFixInterface &interface)
+        : CppQuickFixOperation(interface)
+        , mk(new ASTPatternBuilder)
+    {
+        left = mk->UnaryExpression();
+        right = mk->UnaryExpression();
+        pattern = mk->BinaryExpression(left, right);
+    }
+
+    void perform() override
+    {
+        ChangeSet changes;
+        changes.replace(currentFile()->range(pattern->binary_op_token), QLatin1String("||"));
+        changes.remove(currentFile()->range(left->unary_op_token));
+        changes.remove(currentFile()->range(right->unary_op_token));
+        const int start = currentFile()->startOf(pattern);
+        const int end = currentFile()->endOf(pattern);
+        changes.insert(start, QLatin1String("!("));
+        changes.insert(end, QLatin1String(")"));
+
+        currentFile()->apply(changes);
+    }
+};
+
+/*!
+  Rewrite
+    a op b
+
+  As
+    b flipop a
+
+  Activates on: <= < > >= == != && ||
+*/
+class FlipLogicalOperands : public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const QList<AST *> &path = interface.path();
+        if (path.isEmpty())
+            return;
+        CppRefactoringFilePtr file = interface.currentFile();
+
+        int index = path.size() - 1;
+        BinaryExpressionAST *binary = path.at(index)->asBinaryExpression();
+        if (!binary)
+            return;
+        if (!interface.isCursorOn(binary->binary_op_token))
+            return;
+
+        Kind flipToken;
+        switch (file->tokenAt(binary->binary_op_token).kind()) {
+        case T_LESS_EQUAL:
+            flipToken = T_GREATER_EQUAL;
+            break;
+        case T_LESS:
+            flipToken = T_GREATER;
+            break;
+        case T_GREATER:
+            flipToken = T_LESS;
+            break;
+        case T_GREATER_EQUAL:
+            flipToken = T_LESS_EQUAL;
+            break;
+        case T_EQUAL_EQUAL:
+        case T_EXCLAIM_EQUAL:
+        case T_AMPER_AMPER:
+        case T_PIPE_PIPE:
+            flipToken = T_EOF_SYMBOL;
+            break;
+        default:
+            return;
+        }
+
+        QString replacement;
+        if (flipToken != T_EOF_SYMBOL) {
+            Token tok;
+            tok.f.kind = flipToken;
+            replacement = QLatin1String(tok.spell());
+        }
+
+        result << new FlipLogicalOperandsOp(interface, index, binary, replacement);
+    }
+};
+
+/*!
+  Rewrite
+    a op b -> !(a invop b)
+    (a op b) -> !(a invop b)
+    !(a op b) -> (a invob b)
+
+  Activates on: <= < > >= == !=
+*/
+class InverseLogicalComparison : public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest() { return new QObject; }
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        CppRefactoringFilePtr file = interface.currentFile();
+
+        const QList<AST *> &path = interface.path();
+        if (path.isEmpty())
+            return;
+        int index = path.size() - 1;
+        BinaryExpressionAST *binary = path.at(index)->asBinaryExpression();
+        if (!binary)
+            return;
+        if (!interface.isCursorOn(binary->binary_op_token))
+            return;
+
+        Kind invertToken;
+        switch (file->tokenAt(binary->binary_op_token).kind()) {
+        case T_LESS_EQUAL:
+            invertToken = T_GREATER;
+            break;
+        case T_LESS:
+            invertToken = T_GREATER_EQUAL;
+            break;
+        case T_GREATER:
+            invertToken = T_LESS_EQUAL;
+            break;
+        case T_GREATER_EQUAL:
+            invertToken = T_LESS;
+            break;
+        case T_EQUAL_EQUAL:
+            invertToken = T_EXCLAIM_EQUAL;
+            break;
+        case T_EXCLAIM_EQUAL:
+            invertToken = T_EQUAL_EQUAL;
+            break;
+        default:
+            return;
+        }
+
+        result << new InverseLogicalComparisonOp(interface, index, binary, invertToken);
+    }
+};
+
+/*!
+  Rewrite
+    !a && !b
+
+  As
+    !(a || b)
+
+  Activates on: &&
+*/
+class RewriteLogicalAnd : public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest() { return new QObject; }
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        BinaryExpressionAST *expression = nullptr;
+        const QList<AST *> &path = interface.path();
+        CppRefactoringFilePtr file = interface.currentFile();
+
+        int index = path.size() - 1;
+        for (; index != -1; --index) {
+            expression = path.at(index)->asBinaryExpression();
+            if (expression)
+                break;
+        }
+
+        if (!expression)
+            return;
+
+        if (!interface.isCursorOn(expression->binary_op_token))
+            return;
+
+        QSharedPointer<RewriteLogicalAndOp> op(new RewriteLogicalAndOp(interface));
+
+        ASTMatcher matcher;
+
+        if (expression->match(op->pattern, &matcher) &&
+            file->tokenAt(op->pattern->binary_op_token).is(T_AMPER_AMPER) &&
+            file->tokenAt(op->left->unary_op_token).is(T_EXCLAIM) &&
+            file->tokenAt(op->right->unary_op_token).is(T_EXCLAIM)) {
+            op->setDescription(Tr::tr("Rewrite Condition Using ||"));
+            op->setPriority(index);
+            result.append(op);
+        }
+    }
+};
+
+#ifdef WITH_TESTS
+using namespace Tests;
+class FlipLogicalOperandsTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test_data()
+    {
+        QTest::addColumn<QByteArray>("original");
+        QTest::addColumn<QByteArray>("expected");
+
+        const auto makeDoc = [](const QString &expr) {
+            const QString pattern = "#define VALUE 7\n"
+                                    "int main() {\n"
+                                    "    if (%1)\n"
+                                    "        return 1;\n"
+                                    "}\n";
+            return pattern.arg(expr).toUtf8();
+        };
+
+        QTest::newRow("macro as left expr")
+            << makeDoc("VALUE @&& true")
+            << makeDoc("true && VALUE");
+        QTest::newRow("macro in left expr")
+            << makeDoc("(VALUE + 1) @&& true")
+            << makeDoc("true && (VALUE + 1)");
+        QTest::newRow("macro as right expr")
+            << makeDoc("false @|| VALUE")
+            << makeDoc("VALUE || false");
+        QTest::newRow("macro in right expr")
+            << makeDoc("false @|| (VALUE + 1)")
+            << makeDoc("(VALUE + 1) || false");
+    }
+
+    void test()
+    {
+        QFETCH(QByteArray, original);
+        QFETCH(QByteArray, expected);
+
+        FlipLogicalOperands factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+};
+
+QObject *FlipLogicalOperands::createTest() { return new FlipLogicalOperandsTest; }
+
+#endif // WITH_TESTS
+
+} // namespace
+
+void registerLogicalOperationQuickfixes()
+{
+    CppQuickFixFactory::registerFactory<FlipLogicalOperands>();
+    CppQuickFixFactory::registerFactory<InverseLogicalComparison>();
+    CppQuickFixFactory::registerFactory<RewriteLogicalAnd>();
+}
+
+} // namespace CppEditor::Internal
+
+#ifdef WITH_TESTS
+#include <logicaloperationquickfixes.moc>
+#endif
diff --git a/src/plugins/cppeditor/quickfixes/logicaloperationquickfixes.h b/src/plugins/cppeditor/quickfixes/logicaloperationquickfixes.h
new file mode 100644
index 00000000000..cf77bed8e0f
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/logicaloperationquickfixes.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerLogicalOperationQuickfixes();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/moveclasstoownfile.cpp b/src/plugins/cppeditor/quickfixes/moveclasstoownfile.cpp
new file mode 100644
index 00000000000..ada2027971e
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/moveclasstoownfile.cpp
@@ -0,0 +1,722 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "moveclasstoownfile.h"
+
+#include "../cppeditortr.h"
+#include "../cppeditorwidget.h"
+#include "../cppfilesettingspage.h"
+#include "../cpprefactoringchanges.h"
+#include "cppquickfix.h"
+#include "cppquickfixhelpers.h"
+
+#include <coreplugin/messagemanager.h>
+#include <cplusplus/ASTPath.h>
+#include <cplusplus/Overview.h>
+#include <projectexplorer/projectmanager.h>
+#include <projectexplorer/projectnodes.h>
+#include <utils/codegeneration.h>
+#include <utils/layoutbuilder.h>
+#include <utils/treemodel.h>
+#include <utils/treeviewcombobox.h>
+
+#include <QCheckBox>
+#include <QDialog>
+#include <QDialogButtonBox>
+
+#ifdef WITH_TESTS
+#include "../cpptoolstestcase.h"
+#include <coreplugin/editormanager/editormanager.h>
+#include <projectexplorer/kitmanager.h>
+#include <texteditor/textdocument.h>
+#include <QtTest>
+#endif // WITH_TESTS
+
+using namespace CPlusPlus;
+using namespace Core;
+using namespace ProjectExplorer;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+
+class MoveClassToOwnFileOp : public CppQuickFixOperation
+{
+public:
+    MoveClassToOwnFileOp(
+        const CppQuickFixInterface &interface,
+        AST *fullDecl,
+        ClassSpecifierAST *classAst,
+        const QList<Namespace *> &namespacePath,
+        bool interactive)
+        : CppQuickFixOperation(interface)
+        , m_state(std::make_shared<State>())
+    {
+        setDescription(Tr::tr("Move Class to a Dedicated Set of Source Files"));
+        m_state->originalFilePath = interface.currentFile()->filePath();
+        m_state->classAst = classAst;
+        m_state->namespacePath = namespacePath;
+        m_state->interactive = interactive;
+        PerFileState &perFileState = m_state->perFileState[interface.currentFile()->filePath()];
+        perFileState.refactoringFile = interface.currentFile();
+        perFileState.declarationsToMove << fullDecl;
+    }
+
+private:
+    struct PerFileState {
+        // We want to keep the relative order of moved code.
+        void insertSorted(AST *decl) {
+            declarationsToMove.insert(std::lower_bound(
+                                          declarationsToMove.begin(),
+                                          declarationsToMove.end(),
+                                          decl,
+                                          [](const AST *elem, const AST *value) {
+                                              return elem->firstToken() < value->firstToken();
+                                          }), decl);
+        }
+
+        CppRefactoringFilePtr refactoringFile;
+        QList<AST *> declarationsToMove;
+    };
+    struct State {
+        using Ptr = std::shared_ptr<State>;
+
+        FilePath originalFilePath;
+        AST *fullDecl = nullptr;
+        ClassSpecifierAST *classAst = nullptr;
+        QList<Namespace *> namespacePath;
+        Links lookupResults;
+        QMap<FilePath, PerFileState> perFileState; // A map for deterministic order of moved code.
+        CppRefactoringChanges factory{CppModelManager::snapshot()};
+        int remainingFollowSymbolOps = 0;
+        bool interactive = true;
+    };
+    class Dialog : public QDialog {
+    public:
+        Dialog(const FilePath &defaultHeaderFilePath, const FilePath &defaultSourceFilePath,
+               ProjectNode *defaultProjectNode)
+            : m_buttonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel)
+        {
+            ProjectNode * const rootNode = defaultProjectNode
+                                              ? defaultProjectNode->getProject()->rootProjectNode()
+                                              : nullptr;
+            if (rootNode) {
+                const auto projectRootItem = new NodeItem(rootNode);
+                buildTree(projectRootItem);
+                m_projectModel.rootItem()->appendChild(projectRootItem);
+            }
+            m_projectNodeComboBox.setModel(&m_projectModel);
+            if (defaultProjectNode) {
+                const auto matcher = [defaultProjectNode](TreeItem *item) {
+                    return static_cast<NodeItem *>(item)->node == defaultProjectNode;
+                };
+                TreeItem * const defaultItem = m_projectModel.rootItem()->findAnyChild(matcher);
+                if (defaultItem ) {
+                    QModelIndex index = m_projectModel.indexForItem(defaultItem);
+                    m_projectNodeComboBox.setCurrentIndex(index);
+                    while (index.isValid()) {
+                        m_projectNodeComboBox.view()->expand(index);
+                        index = index.parent();
+                    }
+                }
+
+            }
+            connect(&m_projectNodeComboBox, &QComboBox::currentIndexChanged,
+                    this, [this] {
+                        if (m_filesEdited)
+                            return;
+                        const auto newProjectNode = projectNode();
+                        QTC_ASSERT(newProjectNode, return);
+                        const FilePath baseDir = newProjectNode->directory();
+                        m_sourcePathChooser.setFilePath(
+                            baseDir.pathAppended(sourceFilePath().fileName()));
+                        m_headerPathChooser.setFilePath(
+                            baseDir.pathAppended(headerFilePath().fileName()));
+                        m_filesEdited = false;
+                    });
+
+            m_headerOnlyCheckBox.setText(Tr::tr("Header file only"));
+            m_headerOnlyCheckBox.setChecked(false);
+            connect(&m_headerOnlyCheckBox, &QCheckBox::toggled,
+                    this, [this](bool checked) { m_sourcePathChooser.setEnabled(!checked); });
+
+            m_headerPathChooser.setExpectedKind(PathChooser::SaveFile);
+            m_sourcePathChooser.setExpectedKind(PathChooser::SaveFile);
+            m_headerPathChooser.setFilePath(defaultHeaderFilePath);
+            m_sourcePathChooser.setFilePath(defaultSourceFilePath);
+            connect(&m_headerPathChooser, &PathChooser::textChanged,
+                    this, [this] { m_filesEdited = true; });
+            connect(&m_sourcePathChooser, &PathChooser::textChanged,
+                    this, [this] { m_filesEdited = true; });
+
+            connect(&m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+            connect(&m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+
+            using namespace Layouting;
+            Column {
+                Form {
+                    Tr::tr("Project:"), &m_projectNodeComboBox, br,
+                    &m_headerOnlyCheckBox, br,
+                    Tr::tr("Header file:"), &m_headerPathChooser, br,
+                    Tr::tr("Implementation file:"), &m_sourcePathChooser, br,
+                },
+                &m_buttonBox
+            }.attachTo(this);
+        }
+
+        ProjectNode *projectNode() const
+        {
+            const QVariant v = m_projectNodeComboBox.currentData(Qt::UserRole);
+            return v.isNull() ? nullptr : static_cast<ProjectNode *>(v.value<void *>());
+        }
+        bool createSourceFile() const { return !m_headerOnlyCheckBox.isChecked(); }
+        FilePath headerFilePath() const { return m_headerPathChooser.absoluteFilePath(); }
+        FilePath sourceFilePath() const { return m_sourcePathChooser.absoluteFilePath(); }
+
+    private:
+        struct NodeItem : public StaticTreeItem {
+            NodeItem(ProjectNode *node)
+                : StaticTreeItem({node->displayName()}, {node->directory().toUserOutput()})
+                , node(node)
+            {}
+            Qt::ItemFlags flags(int) const override
+            {
+                return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+            }
+            QVariant data(int column, int role) const override
+            {
+                if (role == Qt::UserRole)
+                    return QVariant::fromValue(static_cast<void *>(node));
+                return StaticTreeItem::data(column, role);
+            }
+
+            ProjectNode * const node;
+        };
+
+        void buildTree(NodeItem *parent)
+        {
+            for (Node * const node : parent->node->nodes()) {
+                if (const auto projNode = node->asProjectNode()) {
+                    const auto child = new NodeItem(projNode);
+                    buildTree(child);
+                    parent->appendChild(child);
+                }
+            }
+        }
+
+        TreeViewComboBox m_projectNodeComboBox;
+        QCheckBox m_headerOnlyCheckBox;
+        PathChooser m_headerPathChooser;
+        PathChooser m_sourcePathChooser;
+        QDialogButtonBox m_buttonBox;
+        TreeModel<> m_projectModel;
+        bool m_filesEdited = false;
+    };
+
+    void perform() override
+    {
+        collectImplementations(m_state->classAst->symbol, m_state);
+        if (m_state->remainingFollowSymbolOps == 0)
+            finish(m_state);
+    }
+
+    static CppRefactoringFilePtr getRefactoringFile(const FilePath &filePath, const State::Ptr &state)
+    {
+        CppRefactoringFilePtr &refactoringFile = state->perFileState[filePath].refactoringFile;
+        if (!refactoringFile)
+            refactoringFile = state->factory.cppFile(filePath);
+        return refactoringFile;
+    }
+
+    static void lookupSymbol(Symbol *symbol, const State::Ptr &state)
+    {
+        const CppRefactoringFilePtr refactoringFile = getRefactoringFile(symbol->filePath(), state);
+        const auto editorWidget = qobject_cast<CppEditorWidget *>(refactoringFile->editor());
+        QTextCursor cursor(refactoringFile->document()->begin());
+        TranslationUnit * const tu = refactoringFile->cppDocument()->translationUnit();
+        const int symbolPos = tu->getTokenPositionInDocument(symbol->sourceLocation(),
+                                                             refactoringFile->document());
+        cursor.setPosition(symbolPos);
+        const CursorInEditor cursorInEditor(
+            cursor,
+            symbol->filePath(),
+            editorWidget,
+            editorWidget ? editorWidget->textDocument() : nullptr,
+            refactoringFile->cppDocument());
+        const auto callback = [symbol, symbolPos, doc = cursor.document(), state](const Link &link) {
+            class FinishedChecker {
+            public:
+                FinishedChecker(const State::Ptr &state) : m_state(state) {}
+                ~FinishedChecker() {
+                    if (--m_state->remainingFollowSymbolOps == 0)
+                        finish(m_state);
+                };
+            private:
+                const State::Ptr &m_state;
+            } finishedChecker(state);
+            if (!link.hasValidTarget())
+                return;
+            if (symbol->filePath() == link.targetFilePath) {
+                const int linkPos = Text::positionInText(doc, link.targetLine,
+                                                         link.targetColumn + 1);
+                if (linkPos == symbolPos)
+                    return;
+            }
+            const CppRefactoringFilePtr refactoringFile
+                = getRefactoringFile(link.targetFilePath, state);
+            const QList<AST *> astPath = ASTPath(
+                refactoringFile->cppDocument())(link.targetLine, link.targetColumn);
+            const bool isTemplate = symbol->asTemplate();
+            const bool isFunction = symbol->type()->asFunctionType();
+            for (auto it = astPath.rbegin(); it != astPath.rend(); ++it) {
+                const bool match = isTemplate ? bool((*it)->asTemplateDeclaration())
+                                   : isFunction ? bool((*it)->asFunctionDefinition())
+                                                : bool((*it)->asSimpleDeclaration());
+                if (match) {
+                    // For member functions of class templates.
+                    if (isFunction) {
+                        const auto next = std::next(it);
+                        if (next != astPath.rend() && (*next)->asTemplateDeclaration())
+                            it = next;
+                    }
+                    state->perFileState[link.targetFilePath].insertSorted(*it);
+                    if (symbol->asForwardClassDeclaration()) {
+                        if (const auto classSpec = (*(it - 1))->asClassSpecifier();
+                            classSpec && classSpec->symbol) {
+                            collectImplementations(classSpec->symbol, state);
+                        }
+                    }
+                    break;
+                }
+            }
+        };
+        ++state->remainingFollowSymbolOps;
+
+        // Force queued execution, as the built-in editor can run the callback synchronously.
+        const auto followSymbol = [cursorInEditor, callback] {
+            NonInteractiveFollowSymbolMarker niMarker;
+            CppModelManager::followSymbol(
+                cursorInEditor, callback, true, false, FollowSymbolMode::Exact);
+        };
+        QMetaObject::invokeMethod(CppModelManager::instance(), followSymbol, Qt::QueuedConnection);
+    }
+
+    static void collectImplementations(Class *klass, const State::Ptr &state)
+    {
+        for (int i = 0; i < klass->memberCount(); ++i) {
+            Symbol * const member = klass->memberAt(i);
+            if (member->asForwardClassDeclaration() || member->asTemplate()) {
+                lookupSymbol(member, state);
+                continue;
+            }
+            const auto decl = member->asDeclaration();
+            if (!decl)
+                continue;
+            if (decl->type().type()->asFunctionType()) {
+                if (!decl->asFunction())
+                    lookupSymbol(member, state);
+            } else if (decl->isStatic() && !decl->type().isInline()) {
+                lookupSymbol(member, state);
+            }
+        }
+    }
+
+    static void finish(const State::Ptr &state)
+    {
+        Overview ov;
+        Project * const project = ProjectManager::projectForFile(state->originalFilePath);
+        const CppFileSettings fileSettings = cppFileSettingsForProject(project);
+        const auto constructDefaultFilePaths = [&] {
+            const QString className = ov.prettyName(state->classAst->symbol->name());
+            const QString baseFileName = fileSettings.lowerCaseFiles ? className.toLower() : className;
+            const QString headerFileName = baseFileName + '.' + fileSettings.headerSuffix;
+            const FilePath baseDir = state->originalFilePath.parentDir();
+            const FilePath headerFilePath = baseDir.pathAppended(headerFileName);
+            const QString sourceFileName = baseFileName + '.' + fileSettings.sourceSuffix;
+            const FilePath sourceFilePath = baseDir.pathAppended(sourceFileName);
+            return std::make_pair(headerFilePath, sourceFilePath);
+        };
+        auto [headerFilePath, sourceFilePath] = constructDefaultFilePaths();
+        bool mustCreateSourceFile = false;
+        bool mustNotCreateSourceFile = false;
+        ProjectNode *projectNode = nullptr;
+        if (project && project->rootProjectNode()) {
+            const Node * const origNode = project->nodeForFilePath(state->originalFilePath);
+            if (origNode)
+                projectNode = const_cast<Node *>(origNode)->managingProject();
+        }
+        if (state->interactive) {
+            Dialog dlg(headerFilePath, sourceFilePath, projectNode);
+            if (dlg.exec() != QDialog::Accepted)
+                return;
+            projectNode = dlg.projectNode();
+            headerFilePath = dlg.headerFilePath();
+            sourceFilePath = dlg.sourceFilePath();
+            mustCreateSourceFile = dlg.createSourceFile();
+            mustNotCreateSourceFile = !dlg.createSourceFile();
+        }
+        const auto fileListForDisplay = [](const FilePaths &files) {
+            return Utils::transform<QStringList>(files, [](const FilePath &fp) {
+                       return '"' + fp.toUserOutput() + '"';
+                   }).join(", ");
+        };
+        FilePaths existingFiles;
+        if (headerFilePath.exists())
+            existingFiles << headerFilePath;
+        if (!mustNotCreateSourceFile && sourceFilePath.exists())
+            existingFiles << sourceFilePath;
+        if (!existingFiles.isEmpty()) {
+            MessageManager::writeDisrupting(
+                Tr::tr("Refusing to overwrite the following files: %1\n")
+                    .arg(fileListForDisplay(existingFiles)));
+            return;
+        }
+        const QString headerFileName = headerFilePath.fileName();
+
+        QString headerContent;
+        QString sourceContent;
+        QList<QString *> commonContent{&headerContent};
+        if (!mustNotCreateSourceFile)
+            commonContent << &sourceContent;
+        for (QString *const content : std::as_const(commonContent)) {
+            content->append(fileSettings.licenseTemplate());
+            if (!content->isEmpty())
+                content->append('\n');
+        }
+        sourceContent.append('\n').append("#include \"").append(headerFileName).append("\"\n");
+        const QStringList namespaceNames
+            = Utils::transform<QStringList>(state->namespacePath, [&](const Namespace *ns) {
+                  return ov.prettyName(ns->name());
+              });
+        const QString headerGuard = fileSettings.headerGuard(headerFilePath);
+        if (fileSettings.headerPragmaOnce) {
+            headerContent.append("#pragma once\n");
+        } else {
+            headerContent.append("#ifndef " + headerGuard + "\n");
+            headerContent.append("#define " + headerGuard + "\n");
+        }
+        if (!namespaceNames.isEmpty()) {
+            for (QString *const content : std::as_const(commonContent)) {
+                content->append('\n');
+                for (const QString &ns : namespaceNames)
+                    content->append("namespace " + ns + " {\n");
+            }
+        }
+        bool hasSourceContent = false;
+        for (auto it = state->perFileState.begin(); it != state->perFileState.end(); ++it) {
+            if (it->declarationsToMove.isEmpty())
+                continue;
+            const CppRefactoringFilePtr refactoringFile = it->refactoringFile;
+            QTC_ASSERT(refactoringFile, continue);
+            const bool isDeclFile = refactoringFile->filePath() == state->originalFilePath;
+            ChangeSet changes;
+            if (isDeclFile) {
+                QString relInclude = headerFilePath.relativePathFrom(
+                                                       refactoringFile->filePath().parentDir()).toString();
+                if (!relInclude.isEmpty())
+                    relInclude.append('/');
+                relInclude.append('"').append(headerFileName).append('"');
+                insertNewIncludeDirective(relInclude, refactoringFile,
+                                          refactoringFile->cppDocument(), changes);
+            }
+            for (AST * const declToMove : std::as_const(it->declarationsToMove)) {
+                const ChangeSet::Range rangeToMove = refactoringFile->range(declToMove);
+                QString &content = isDeclFile || mustNotCreateSourceFile ? headerContent
+                                                                         : sourceContent;
+                if (&content == &sourceContent)
+                    hasSourceContent = true;
+                content.append('\n')
+                    .append(refactoringFile->textOf(rangeToMove))
+                    .append('\n');
+                changes.remove(rangeToMove);
+            }
+            refactoringFile->apply(changes);
+        }
+
+        if (!namespaceNames.isEmpty()) {
+            for (QString *const content : std::as_const(commonContent)) {
+                content->append('\n');
+                for (auto it = namespaceNames.rbegin(); it != namespaceNames.rend(); ++it)
+                    content->append("} // namespace " + *it + '\n');
+            }
+        }
+        if (!fileSettings.headerPragmaOnce)
+            headerContent.append("\n#endif // " + headerGuard + '\n');
+
+        headerFilePath.ensureExistingFile();
+        state->factory.cppFile(headerFilePath)->apply(ChangeSet::makeInsert(0, headerContent));
+        if (hasSourceContent || mustCreateSourceFile) {
+            sourceFilePath.ensureExistingFile();
+            state->factory.cppFile(sourceFilePath)->apply(ChangeSet::makeInsert(0, sourceContent));
+        }
+
+        if (!projectNode)
+            return;
+        FilePaths toAdd{headerFilePath};
+        if (hasSourceContent)
+            toAdd << sourceFilePath;
+        FilePaths notAdded;
+        projectNode->addFiles(toAdd, &notAdded);
+        if (!notAdded.isEmpty()) {
+            MessageManager::writeDisrupting(
+                Tr::tr("Failed to add to project file \"%1\": %2")
+                    .arg(projectNode->filePath().toUserOutput(), fileListForDisplay(notAdded)));
+        }
+
+        if (state->interactive)
+            EditorManager::openEditor(headerFilePath);
+    }
+
+    const State::Ptr m_state;
+};
+
+//! Move a class into a dedicates set of files.
+class MoveClassToOwnFile : public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    void setNonInteractive() { m_interactive = false; }
+    static QObject *createTest();
+#endif
+
+private:
+    // Applies if and only if:
+    //   - Class is not a nested class.
+    //   - Class name does not match file name via any of the usual transformations.
+    //   - There are other declarations in the same file.
+    void doMatch(const CppQuickFixInterface &interface,
+                 TextEditor::QuickFixOperations &result) override
+    {
+        ClassSpecifierAST * const classAst = astForClassOperations(interface);
+        if (!classAst || !classAst->symbol)
+            return;
+        AST *fullDecl = nullptr;
+        for (auto it = interface.path().rbegin(); it != interface.path().rend() && !fullDecl; ++it) {
+            if (*it == classAst && it != interface.path().rend() - 1) {
+                auto next = std::next(it);
+                fullDecl = (*next)->asSimpleDeclaration();
+                if (next != interface.path().rend() - 1) {
+                    next = std::next(next);
+                    if (const auto templ = (*next)->asTemplateDeclaration())
+                        fullDecl = templ;
+                }
+            }
+        }
+        if (!fullDecl)
+            return;
+
+        // Check file name.
+        const QString className = Overview().prettyName(classAst->symbol->name());
+        if (className.isEmpty())
+            return;
+        const QString lowerFileBaseName = interface.filePath().baseName().toLower();
+        if (lowerFileBaseName.contains(className.toLower()))
+            return;
+        QString underscoredClassName = className;
+        QChar curChar = underscoredClassName.at(0);
+        for (int i = 1; i < underscoredClassName.size(); ++i) {
+            const QChar prevChar = curChar;
+            curChar = underscoredClassName.at(i);
+            if (curChar.isUpper() && prevChar.isLetterOrNumber() && !prevChar.isUpper()) {
+                underscoredClassName.insert(i, '_');
+                ++i;
+            }
+        }
+        if (lowerFileBaseName.contains(underscoredClassName.toLower()))
+            return;
+
+        // Is there more than one class definition in the file?
+        AST * const ast = interface.currentFile()->cppDocument()->translationUnit()->ast();
+        if (!ast)
+            return;
+        DeclarationListAST * const topLevelDecls = ast->asTranslationUnit()->declaration_list;
+        if (!topLevelDecls)
+            return;
+        QList<Namespace *> namespacePath;
+        QList<Namespace *> currentNamespacePath;
+        bool foundOtherDecls = false;
+        bool foundSelf = false;
+        std::function<void(Namespace *)> collectSymbolsFromNamespace;
+        const auto handleSymbol = [&](Symbol *symbol) {
+            if (!symbol)
+                return;
+            if (const auto nsMember = symbol->asNamespace()) {
+                collectSymbolsFromNamespace(nsMember);
+                return;
+            }
+            if (symbol != classAst->symbol) {
+                if (!symbol->asForwardClassDeclaration())
+                    foundOtherDecls = true;
+                return;
+            }
+            QTC_ASSERT(symbol->asClass(), return);
+            foundSelf = true;
+            namespacePath = currentNamespacePath;
+        };
+        collectSymbolsFromNamespace = [&](Namespace *ns) {
+            currentNamespacePath << ns;
+            for (int i = 0; i < ns->memberCount() && (!foundSelf || !foundOtherDecls); ++i)
+                handleSymbol(ns->memberAt(i));
+            currentNamespacePath.removeLast();
+        };
+        for (DeclarationListAST *it = topLevelDecls; it && (!foundSelf || !foundOtherDecls);
+             it = it->next) {
+            DeclarationAST *decl = it->value;
+            if (!decl)
+                continue;
+            if (const auto templ = decl->asTemplateDeclaration())
+                decl = templ->declaration;
+            if (!decl)
+                continue;
+            if (const auto ns = decl->asNamespace(); ns && ns->symbol) {
+                collectSymbolsFromNamespace(ns->symbol);
+                continue;
+            }
+            if (const auto simpleDecl = decl->asSimpleDeclaration()) {
+                if (!simpleDecl->decl_specifier_list)
+                    continue;
+                for (SpecifierListAST *spec = simpleDecl->decl_specifier_list; spec; spec = spec->next) {
+                    if (!spec->value)
+                        continue;
+                    if (const auto klass = spec->value->asClassSpecifier())
+                        handleSymbol(klass->symbol);
+                    else if (!spec->value->asElaboratedTypeSpecifier()) // forward decl
+                        foundOtherDecls = true;
+                }
+            } else if (decl->asDeclaration()) {
+                foundOtherDecls = true;
+            }
+        }
+
+        if (foundSelf && foundOtherDecls) {
+            result << new MoveClassToOwnFileOp(
+                interface, fullDecl, classAst, namespacePath, m_interactive);
+        }
+    }
+
+    bool m_interactive = true;
+};
+
+#ifdef WITH_TESTS
+class MoveClassToOwnFileTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test_data()
+    {
+        QTest::addColumn<QString>("projectName");
+        QTest::addColumn<QString>("fileName");
+        QTest::addColumn<QString>("className");
+        QTest::addColumn<bool>("applicable");
+
+        QTest::newRow("nested") << "nested" << "main.cpp" << "Inner" << false;
+        QTest::newRow("file name match 1") << "match1" << "TheClass.h" << "TheClass" << false;
+        QTest::newRow("file name match 2") << "match2" << "theclass.h" << "TheClass" << false;
+        QTest::newRow("file name match 3") << "match3" << "the_class.h" << "TheClass" << false;
+        QTest::newRow("single") << "single" << "theheader.h" << "TheClass" << false;
+        QTest::newRow("complex") << "complex" << "theheader.h" << "TheClass" << true;
+        QTest::newRow("header only") << "header-only" << "theheader.h" << "TheClass" << true;
+        QTest::newRow("decl in source file") << "decl-in-source" << "thesource.cpp" << "TheClass" << true;
+        QTest::newRow("template") << "template" << "theheader.h" << "TheClass" << true;
+    }
+
+    void test()
+    {
+        QFETCH(QString, projectName);
+        QFETCH(QString, fileName);
+        QFETCH(QString, className);
+        QFETCH(bool, applicable);
+        using namespace CppEditor::Tests;
+        using namespace TextEditor;
+
+        // Set up project.
+        Kit * const kit  = Utils::findOr(KitManager::kits(), nullptr, [](const Kit *k) {
+            return k->isValid() && !k->hasWarning() && k->value("QtSupport.QtInformation").isValid();
+        });
+        if (!kit)
+            QSKIP("The test requires at least one valid kit with a valid Qt");
+        const auto projectDir = std::make_unique<TemporaryCopiedDir>(
+            ":/cppeditor/testcases/move-class/" + projectName);
+        SourceFilesRefreshGuard refreshGuard;
+        ProjectOpenerAndCloser projectMgr;
+        QVERIFY(projectMgr.open(projectDir->absolutePath(projectName + ".pro"), true, kit));
+        QVERIFY(refreshGuard.wait());
+
+        // Open header file and locate class.
+        const auto headerFilePath = projectDir->absolutePath(fileName);
+        QVERIFY2(headerFilePath.exists(), qPrintable(headerFilePath.toUserOutput()));
+        const auto editor = qobject_cast<BaseTextEditor *>(EditorManager::openEditor(headerFilePath));
+        QVERIFY(editor);
+        const auto doc = qobject_cast<TextEditor::TextDocument *>(editor->document());
+        QVERIFY(doc);
+        QTextCursor classCursor = doc->document()->find("class " + className);
+        QVERIFY(!classCursor.isNull());
+        editor->setCursorPosition(classCursor.position());
+        const auto editorWidget = qobject_cast<CppEditorWidget *>(editor->editorWidget());
+        QVERIFY(editorWidget);
+        QVERIFY(TestCase::waitForRehighlightedSemanticDocument(editorWidget));
+
+        // Query factory.
+        MoveClassToOwnFile factory;
+        factory.setNonInteractive();
+        CppQuickFixInterface quickFixInterface(editorWidget, ExplicitlyInvoked);
+        QuickFixOperations operations;
+        factory.match(quickFixInterface, operations);
+        QCOMPARE(operations.isEmpty(), !applicable);
+        if (!applicable)
+            return;
+        operations.first()->perform();
+        QVERIFY(waitForSignalOrTimeout(doc, &IDocument::saved, 30000));
+        QTest::qWait(1000);
+
+        // Compare all files.
+        const FileFilter filter({"*_expected"}, QDir::Files);
+        const FilePaths expectedDocuments = projectDir->filePath().dirEntries(filter);
+        QVERIFY(!expectedDocuments.isEmpty());
+        for (const FilePath &expected : expectedDocuments) {
+            static const QString suffix = "_expected";
+            const FilePath actual = expected.parentDir()
+                                        .pathAppended(expected.fileName().chopped(suffix.length()));
+            QVERIFY(actual.exists());
+            const auto actualContents = actual.fileContents();
+            QVERIFY(actualContents);
+            const auto expectedContents = expected.fileContents();
+            const QByteArrayList actualLines = actualContents->split('\n');
+            const QByteArrayList expectedLines = expectedContents->split('\n');
+            if (actualLines.size() != expectedLines.size()) {
+                qDebug().noquote().nospace() << "---\n" << *expectedContents << "EOF";
+                qDebug().noquote().nospace() << "+++\n" << *actualContents << "EOF";
+            }
+            QCOMPARE(actualLines.size(), expectedLines.size());
+            for (int i = 0; i < actualLines.size(); ++i) {
+                const QByteArray actualLine = actualLines.at(i);
+                const QByteArray expectedLine = expectedLines.at(i);
+                if (actualLine != expectedLine)
+                    qDebug() << "Unexpected content in line" << (i + 1) << "of file"
+                             << actual.fileName();
+                QCOMPARE(actualLine, expectedLine);
+            }
+        }
+    }
+};
+
+QObject *MoveClassToOwnFile::createTest()
+{
+    return new MoveClassToOwnFileTest;
+}
+
+#endif // WITH_TESTS
+
+} // namespace
+
+void registerMoveClassToOwnFileQuickfix()
+{
+    CppQuickFixFactory::registerFactory<MoveClassToOwnFile>();
+}
+
+} // namespace CppEditor::Internal
+
+#ifdef WITH_TESTS
+#include <moveclasstoownfile.moc>
+#endif
diff --git a/src/plugins/cppeditor/quickfixes/moveclasstoownfile.h b/src/plugins/cppeditor/quickfixes/moveclasstoownfile.h
new file mode 100644
index 00000000000..c46b0e5c3a1
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/moveclasstoownfile.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerMoveClassToOwnFileQuickfix();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/movefunctiondefinition.cpp b/src/plugins/cppeditor/quickfixes/movefunctiondefinition.cpp
new file mode 100644
index 00000000000..e6ec6a8b9f1
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/movefunctiondefinition.cpp
@@ -0,0 +1,1889 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "movefunctiondefinition.h"
+
+#include "../cppcodestylesettings.h"
+#include "../cppeditortr.h"
+#include "../cpprefactoringchanges.h"
+#include "../insertionpointlocator.h"
+#include "../symbolfinder.h"
+#include "cppquickfix.h"
+#include "cppquickfixhelpers.h"
+
+#include <cplusplus/ASTPath.h>
+#include <cplusplus/CppRewriter.h>
+#include <cplusplus/Overview.h>
+
+using namespace CPlusPlus;
+using namespace TextEditor;
+using namespace Utils;
+
+#ifdef WITH_TESTS
+#include "cppquickfix_test.h"
+#include <QtTest>
+#endif
+
+namespace CppEditor::Internal {
+namespace {
+
+static QString definitionSignature(
+    const CppQuickFixInterface *assist,
+    FunctionDefinitionAST *functionDefinitionAST,
+    CppRefactoringFilePtr &baseFile,
+    CppRefactoringFilePtr &targetFile,
+    Scope *scope)
+{
+    QTC_ASSERT(assist, return QString());
+    QTC_ASSERT(functionDefinitionAST, return QString());
+    QTC_ASSERT(scope, return QString());
+    Function *func = functionDefinitionAST->symbol;
+    QTC_ASSERT(func, return QString());
+
+    LookupContext cppContext(targetFile->cppDocument(), assist->snapshot());
+    ClassOrNamespace *cppCoN = cppContext.lookupType(scope);
+    if (!cppCoN)
+        cppCoN = cppContext.globalNamespace();
+    SubstitutionEnvironment env;
+    env.setContext(assist->context());
+    env.switchScope(func->enclosingScope());
+    UseMinimalNames q(cppCoN);
+    env.enter(&q);
+    Control *control = assist->context().bindings()->control().get();
+    Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
+    oo.showFunctionSignatures = true;
+    oo.showReturnTypes = true;
+    oo.showArgumentNames = true;
+    oo.showEnclosingTemplate = true;
+    oo.showTemplateParameters = true;
+    oo.trailingReturnType = functionDefinitionAST->declarator
+                            && functionDefinitionAST->declarator->postfix_declarator_list
+                            && functionDefinitionAST->declarator->postfix_declarator_list->value
+                            && functionDefinitionAST->declarator->postfix_declarator_list
+                                   ->value->asFunctionDeclarator()
+                            && functionDefinitionAST->declarator->postfix_declarator_list
+                                   ->value->asFunctionDeclarator()->trailing_return_type;
+    const Name *name = func->name();
+    if (name && nameIncludesOperatorName(name)) {
+        CoreDeclaratorAST *coreDeclarator = functionDefinitionAST->declarator->core_declarator;
+        const QString operatorNameText = baseFile->textOf(coreDeclarator);
+        oo.includeWhiteSpaceInOperatorName = operatorNameText.contains(QLatin1Char(' '));
+    }
+    const QString nameText = oo.prettyName(LookupContext::minimalName(func, cppCoN, control));
+    oo.showTemplateParameters = false;
+    const FullySpecifiedType tn = rewriteType(func->type(), &env, control);
+
+    return oo.prettyType(tn, nameText);
+}
+
+class MoveFuncDefRefactoringHelper
+{
+public:
+    enum MoveType {
+        MoveOutside,
+        MoveToCppFile,
+        MoveOutsideMemberToCppFile
+    };
+
+    MoveFuncDefRefactoringHelper(CppQuickFixOperation *operation, MoveType type,
+                                 const FilePath &toFile)
+        : m_operation(operation), m_type(type), m_changes(m_operation->snapshot())
+    {
+        m_fromFile = operation->currentFile();
+        m_toFile = (m_type == MoveOutside) ? m_fromFile : m_changes.cppFile(toFile);
+    }
+
+    void performMove(FunctionDefinitionAST *funcAST)
+    {
+        // Determine file, insert position and scope
+        InsertionLocation l = insertLocationForMethodDefinition(
+            funcAST->symbol, false, NamespaceHandling::Ignore,
+            m_changes, m_toFile->filePath());
+        const QString prefix = l.prefix();
+        const QString suffix = l.suffix();
+        const int insertPos = m_toFile->position(l.line(), l.column());
+        Scope *scopeAtInsertPos = m_toFile->cppDocument()->scopeAt(l.line(), l.column());
+
+        // construct definition
+        const QString funcDec = inlinePrefix(m_toFile->filePath(), [this] { return m_type == MoveOutside; })
+                                + definitionSignature(m_operation, funcAST, m_fromFile, m_toFile,
+                                                      scopeAtInsertPos);
+        QString funcDef = prefix + funcDec;
+        const int startPosition = m_fromFile->endOf(funcAST->declarator);
+        const int endPosition = m_fromFile->endOf(funcAST);
+        funcDef += m_fromFile->textOf(startPosition, endPosition);
+        funcDef += suffix;
+
+        // insert definition at new position
+        m_toFileChangeSet.insert(insertPos, funcDef);
+        m_toFile->setOpenEditor(true, insertPos);
+
+        // remove definition from fromFile
+        if (m_type == MoveOutsideMemberToCppFile) {
+            m_fromFileChangeSet.remove(m_fromFile->range(funcAST));
+        } else {
+            QString textFuncDecl = m_fromFile->textOf(funcAST);
+            textFuncDecl.truncate(startPosition - m_fromFile->startOf(funcAST));
+            if (textFuncDecl.left(7) == QLatin1String("inline "))
+                textFuncDecl = textFuncDecl.mid(7);
+            else
+                textFuncDecl.replace(" inline ", QLatin1String(" "));
+            textFuncDecl = textFuncDecl.trimmed() + QLatin1Char(';');
+            m_fromFileChangeSet.replace(m_fromFile->range(funcAST), textFuncDecl);
+        }
+    }
+
+    void applyChanges()
+    {
+        m_toFile->apply(m_toFileChangeSet);
+        m_fromFile->apply(m_fromFileChangeSet);
+    }
+
+private:
+    CppQuickFixOperation *m_operation;
+    MoveType m_type;
+    CppRefactoringChanges m_changes;
+    CppRefactoringFilePtr m_fromFile;
+    CppRefactoringFilePtr m_toFile;
+    ChangeSet m_fromFileChangeSet;
+    ChangeSet m_toFileChangeSet;
+};
+
+class MoveFuncDefOutsideOp : public CppQuickFixOperation
+{
+public:
+    MoveFuncDefOutsideOp(const CppQuickFixInterface &interface,
+                         MoveFuncDefRefactoringHelper::MoveType type,
+                         FunctionDefinitionAST *funcDef, const FilePath &cppFilePath)
+        : CppQuickFixOperation(interface, 0)
+        , m_funcDef(funcDef)
+        , m_type(type)
+        , m_cppFilePath(cppFilePath)
+    {
+        if (m_type == MoveFuncDefRefactoringHelper::MoveOutside) {
+            setDescription(Tr::tr("Move Definition Outside Class"));
+        } else {
+            const FilePath resolved = m_cppFilePath.relativePathFrom(filePath().parentDir());
+            setDescription(Tr::tr("Move Definition to %1").arg(resolved.displayName()));
+        }
+    }
+
+    void perform() override
+    {
+        MoveFuncDefRefactoringHelper helper(this, m_type, m_cppFilePath);
+        helper.performMove(m_funcDef);
+        helper.applyChanges();
+    }
+
+private:
+    FunctionDefinitionAST *m_funcDef;
+    MoveFuncDefRefactoringHelper::MoveType m_type;
+    const FilePath m_cppFilePath;
+};
+
+class MoveAllFuncDefOutsideOp : public CppQuickFixOperation
+{
+public:
+    MoveAllFuncDefOutsideOp(const CppQuickFixInterface &interface,
+                            MoveFuncDefRefactoringHelper::MoveType type,
+                            ClassSpecifierAST *classDef, const FilePath &cppFileName)
+        : CppQuickFixOperation(interface, 0)
+        , m_type(type)
+        , m_classDef(classDef)
+        , m_cppFilePath(cppFileName)
+    {
+        if (m_type == MoveFuncDefRefactoringHelper::MoveOutside) {
+            setDescription(Tr::tr("Definitions Outside Class"));
+        } else {
+            const FilePath resolved = m_cppFilePath.relativePathFrom(filePath().parentDir());
+            setDescription(Tr::tr("Move All Function Definitions to %1")
+                               .arg(resolved.displayName()));
+        }
+    }
+
+    void perform() override
+    {
+        MoveFuncDefRefactoringHelper helper(this, m_type, m_cppFilePath);
+        for (DeclarationListAST *it = m_classDef->member_specifier_list; it; it = it->next) {
+            if (FunctionDefinitionAST *funcAST = it->value->asFunctionDefinition()) {
+                if (funcAST->symbol && !funcAST->symbol->isGenerated())
+                    helper.performMove(funcAST);
+            }
+        }
+        helper.applyChanges();
+    }
+
+private:
+    MoveFuncDefRefactoringHelper::MoveType m_type;
+    ClassSpecifierAST *m_classDef;
+    const FilePath m_cppFilePath;
+};
+
+class MoveFuncDefToDeclOp : public CppQuickFixOperation
+{
+public:
+    enum Type { Push, Pull };
+    MoveFuncDefToDeclOp(const CppQuickFixInterface &interface,
+                        const FilePath &fromFilePath, const FilePath &toFilePath,
+                        FunctionDefinitionAST *funcAst, Function *func, const QString &declText,
+                        const ChangeSet::Range &fromRange,
+                        const ChangeSet::Range &toRange,
+                        Type type)
+        : CppQuickFixOperation(interface, 0)
+        , m_fromFilePath(fromFilePath)
+        , m_toFilePath(toFilePath)
+        , m_funcAST(funcAst)
+        , m_func(func)
+        , m_declarationText(declText)
+        , m_fromRange(fromRange)
+        , m_toRange(toRange)
+    {
+        if (type == Type::Pull) {
+            setDescription(Tr::tr("Move Definition Here"));
+        } else if (m_toFilePath == m_fromFilePath) {
+            setDescription(Tr::tr("Move Definition to Class"));
+        } else {
+            const FilePath resolved = m_toFilePath.relativePathFrom(m_fromFilePath.parentDir());
+            setDescription(Tr::tr("Move Definition to %1").arg(resolved.displayName()));
+        }
+    }
+
+private:
+    void perform() override
+    {
+        CppRefactoringChanges refactoring(snapshot());
+        CppRefactoringFilePtr fromFile = refactoring.cppFile(m_fromFilePath);
+        CppRefactoringFilePtr toFile = refactoring.cppFile(m_toFilePath);
+
+        ensureFuncDefAstAndRange(*fromFile);
+        if (!m_funcAST)
+            return;
+
+        const QString wholeFunctionText = m_declarationText
+                                          + fromFile->textOf(fromFile->endOf(m_funcAST->declarator),
+                                                             fromFile->endOf(m_funcAST->function_body));
+
+        // Replace declaration with function and delete old definition
+        ChangeSet toTarget;
+        toTarget.replace(m_toRange, wholeFunctionText);
+        if (m_toFilePath == m_fromFilePath)
+            toTarget.remove(m_fromRange);
+        toFile->setOpenEditor(true, m_toRange.start);
+        toFile->apply(toTarget);
+        if (m_toFilePath != m_fromFilePath)
+            fromFile->apply(ChangeSet::makeRemove(m_fromRange));
+    }
+
+    void ensureFuncDefAstAndRange(CppRefactoringFile &defFile)
+    {
+        if (m_funcAST) {
+            QTC_CHECK(m_fromRange.end > m_fromRange.start);
+            return;
+        }
+        QTC_ASSERT(m_func, return);
+        const QList<AST *> astPath = ASTPath(defFile.cppDocument())(m_func->line(),
+                                                                    m_func->column());
+        if (astPath.isEmpty())
+            return;
+        for (auto it = std::rbegin(astPath); it != std::rend(astPath); ++it) {
+            m_funcAST = (*it)->asFunctionDefinition();
+            if (!m_funcAST)
+                continue;
+            AST *astForRange = m_funcAST;
+            const auto prev = std::next(it);
+            if (prev != std::rend(astPath)) {
+                if (const auto templAst = (*prev)->asTemplateDeclaration())
+                    astForRange = templAst;
+            }
+            m_fromRange = defFile.range(astForRange);
+            return;
+        }
+    }
+
+    const FilePath m_fromFilePath;
+    const FilePath m_toFilePath;
+    FunctionDefinitionAST *m_funcAST;
+    Function *m_func;
+    const QString m_declarationText;
+    ChangeSet::Range m_fromRange;
+    const ChangeSet::Range m_toRange;
+};
+
+/*!
+ Moves the definition of a member function outside the class or moves the definition of a member
+ function or a normal function to the implementation file.
+ */
+class MoveFuncDefOutside : public CppQuickFixFactory
+{
+public:
+#ifdef WITH_TESTS
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const QList<AST *> &path = interface.path();
+        SimpleDeclarationAST *classAST = nullptr;
+        FunctionDefinitionAST *funcAST = nullptr;
+        bool moveOutsideMemberDefinition = false;
+
+        const int pathSize = path.size();
+        for (int idx = 1; idx < pathSize; ++idx) {
+            if ((funcAST = path.at(idx)->asFunctionDefinition())) {
+                // check cursor position
+                if (idx != pathSize - 1  // Do not allow "void a() @ {..."
+                    && funcAST->function_body
+                    && !interface.isCursorOn(funcAST->function_body)) {
+                    if (path.at(idx - 1)->asTranslationUnit()) { // normal function
+                        if (idx + 3 < pathSize && path.at(idx + 3)->asQualifiedName()) // Outside member
+                            moveOutsideMemberDefinition = true;                        // definition
+                        break;
+                    }
+
+                    if (idx > 1) {
+                        if ((classAST = path.at(idx - 2)->asSimpleDeclaration())) // member function
+                            break;
+                        if (path.at(idx - 2)->asNamespace())  // normal function in namespace
+                            break;
+                    }
+                    if (idx > 2 && path.at(idx - 1)->asTemplateDeclaration()) {
+                        if ((classAST = path.at(idx - 3)->asSimpleDeclaration())) // member template
+                            break;
+                    }
+                }
+                funcAST = nullptr;
+            }
+        }
+
+        if (!funcAST || !funcAST->symbol)
+            return;
+
+        bool isHeaderFile = false;
+        const FilePath cppFileName = correspondingHeaderOrSource(interface.filePath(), &isHeaderFile);
+
+        if (isHeaderFile && !cppFileName.isEmpty()) {
+            const MoveFuncDefRefactoringHelper::MoveType type = moveOutsideMemberDefinition
+                                                                    ? MoveFuncDefRefactoringHelper::MoveOutsideMemberToCppFile
+                                                                    : MoveFuncDefRefactoringHelper::MoveToCppFile;
+            result << new MoveFuncDefOutsideOp(interface, type, funcAST, cppFileName);
+        }
+
+        if (classAST)
+            result << new MoveFuncDefOutsideOp(interface, MoveFuncDefRefactoringHelper::MoveOutside,
+                                               funcAST, FilePath());
+
+        return;
+    }
+};
+
+//! Moves all member function definitions outside the class or to the implementation file.
+class MoveAllFuncDefOutside : public CppQuickFixFactory
+{
+public:
+#ifdef WITH_TESTS
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        ClassSpecifierAST * const classAST = astForClassOperations(interface);
+        if (!classAST)
+            return;
+
+        // Determine if the class has at least one function definition
+        bool classContainsFunctions = false;
+        for (DeclarationListAST *it = classAST->member_specifier_list; it; it = it->next) {
+            if (FunctionDefinitionAST *funcAST = it->value->asFunctionDefinition()) {
+                if (funcAST->symbol && !funcAST->symbol->isGenerated()) {
+                    classContainsFunctions = true;
+                    break;
+                }
+            }
+        }
+        if (!classContainsFunctions)
+            return;
+
+        bool isHeaderFile = false;
+        const FilePath cppFileName = correspondingHeaderOrSource(interface.filePath(), &isHeaderFile);
+        if (isHeaderFile && !cppFileName.isEmpty()) {
+            result << new MoveAllFuncDefOutsideOp(interface,
+                                                  MoveFuncDefRefactoringHelper::MoveToCppFile,
+                                                  classAST, cppFileName);
+        }
+        result << new MoveAllFuncDefOutsideOp(interface, MoveFuncDefRefactoringHelper::MoveOutside,
+                                              classAST, FilePath());
+    }
+};
+
+//! Moves the definition of a function to its declaration, with the cursor on the definition.
+class MoveFuncDefToDeclPush : public CppQuickFixFactory
+{
+public:
+#ifdef WITH_TESTS
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const QList<AST *> &path = interface.path();
+        AST *completeDefAST = nullptr;
+        FunctionDefinitionAST *funcAST = nullptr;
+
+        const int pathSize = path.size();
+        for (int idx = 1; idx < pathSize; ++idx) {
+            if ((funcAST = path.at(idx)->asFunctionDefinition())) {
+                AST *enclosingAST = path.at(idx - 1);
+                if (enclosingAST->asClassSpecifier())
+                    return;
+
+                // check cursor position
+                if (idx != pathSize - 1  // Do not allow "void a() @ {..."
+                    && funcAST->function_body
+                    && !interface.isCursorOn(funcAST->function_body)) {
+                    completeDefAST = enclosingAST->asTemplateDeclaration() ? enclosingAST : funcAST;
+                    break;
+                }
+                funcAST = nullptr;
+            }
+        }
+
+        if (!funcAST || !funcAST->symbol)
+            return;
+
+        const CppRefactoringChanges refactoring(interface.snapshot());
+        const CppRefactoringFilePtr defFile = interface.currentFile();
+        const ChangeSet::Range defRange = defFile->range(completeDefAST);
+
+        // Determine declaration (file, range, text);
+        ChangeSet::Range declRange;
+        QString declText;
+        FilePath declFilePath;
+
+        Function *func = funcAST->symbol;
+        if (Class *matchingClass = isMemberFunction(interface.context(), func)) {
+            // Dealing with member functions
+            const QualifiedNameId *qName = func->name()->asQualifiedNameId();
+            for (Symbol *symbol = matchingClass->find(qName->identifier());
+                 symbol; symbol = symbol->next()) {
+                Symbol *s = symbol;
+                if (func->enclosingScope()->asTemplate()) {
+                    if (const Template *templ = s->type()->asTemplateType()) {
+                        if (Symbol *decl = templ->declaration()) {
+                            if (decl->type()->asFunctionType())
+                                s = decl;
+                        }
+                    }
+                }
+                if (!s->name()
+                    || !qName->identifier()->match(s->identifier())
+                    || !s->type()->asFunctionType()
+                    || !s->type().match(func->type())
+                    || s->asFunction()) {
+                    continue;
+                }
+
+                declFilePath = matchingClass->filePath();
+                const CppRefactoringFilePtr declFile = refactoring.cppFile(declFilePath);
+                ASTPath astPath(declFile->cppDocument());
+                const QList<AST *> path = astPath(s->line(), s->column());
+                for (int idx = path.size() - 1; idx > 0; --idx) {
+                    AST *node = path.at(idx);
+                    if (SimpleDeclarationAST *simpleDecl = node->asSimpleDeclaration()) {
+                        if (simpleDecl->symbols && !simpleDecl->symbols->next) {
+                            declRange = declFile->range(simpleDecl);
+                            declText = declFile->textOf(simpleDecl);
+                            declText.remove(-1, 1); // remove ';' from declaration text
+                            break;
+                        }
+                    }
+                }
+
+                if (!declText.isEmpty())
+                    break;
+            }
+        } else if (Namespace *matchingNamespace = isNamespaceFunction(interface.context(), func)) {
+            // Dealing with free functions
+            bool isHeaderFile = false;
+            declFilePath = correspondingHeaderOrSource(interface.filePath(), &isHeaderFile);
+            if (isHeaderFile)
+                return;
+
+            const CppRefactoringFilePtr declFile = refactoring.cppFile(declFilePath);
+            const LookupContext lc(declFile->cppDocument(), interface.snapshot());
+            const QList<LookupItem> candidates = lc.lookup(func->name(), matchingNamespace);
+            for (const LookupItem &candidate : candidates) {
+                if (Symbol *s = candidate.declaration()) {
+                    if (s->asDeclaration()) {
+                        ASTPath astPath(declFile->cppDocument());
+                        const QList<AST *> path = astPath(s->line(), s->column());
+                        for (AST *node : path) {
+                            if (SimpleDeclarationAST *simpleDecl = node->asSimpleDeclaration()) {
+                                declRange = declFile->range(simpleDecl);
+                                declText = declFile->textOf(simpleDecl);
+                                declText.remove(-1, 1); // remove ';' from declaration text
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                if (!declText.isEmpty()) {
+                    declText.prepend(inlinePrefix(declFilePath));
+                    break;
+                }
+            }
+        }
+
+        if (!declFilePath.isEmpty() && !declText.isEmpty())
+            result << new MoveFuncDefToDeclOp(interface,
+                                              interface.filePath(),
+                                              declFilePath,
+                                              funcAST, func, declText,
+                                              defRange, declRange, MoveFuncDefToDeclOp::Push);
+    }
+};
+
+//! Moves the definition of a function to its declaration, with the cursor on the declaration.
+class MoveFuncDefToDeclPull : public CppQuickFixFactory
+{
+public:
+#ifdef WITH_TESTS
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const QList<AST *> &path = interface.path();
+        for (auto it = std::rbegin(path); it != std::rend(path); ++it) {
+            SimpleDeclarationAST * const simpleDecl = (*it)->asSimpleDeclaration();
+            if (!simpleDecl)
+                continue;
+            const auto prev = std::next(it);
+            if (prev != std::rend(path) && (*prev)->asStatement())
+                return;
+            if (!simpleDecl->symbols || !simpleDecl->symbols->value || simpleDecl->symbols->next)
+                return;
+            Declaration * const decl = simpleDecl->symbols->value->asDeclaration();
+            if (!decl)
+                return;
+            Function * const funcDecl = decl->type()->asFunctionType();
+            if (!funcDecl)
+                return;
+            if (funcDecl->isSignal() || funcDecl->isPureVirtual() || funcDecl->isFriend())
+                return;
+
+            // Is there a definition?
+            SymbolFinder symbolFinder;
+            Function * const funcDef = symbolFinder.findMatchingDefinition(decl, interface.snapshot(),
+                                                                          true);
+            if (!funcDef)
+                return;
+
+            QString declText = interface.currentFile()->textOf(simpleDecl);
+            declText.chop(1); // semicolon
+            declText.prepend(inlinePrefix(interface.filePath(), [funcDecl] {
+                return !funcDecl->enclosingScope()->asClass();
+            }));
+            result << new MoveFuncDefToDeclOp(interface, funcDef->filePath(), decl->filePath(), nullptr,
+                                              funcDef, declText, {},
+                                              interface.currentFile()->range(simpleDecl),
+                                              MoveFuncDefToDeclOp::Pull);
+            return;
+        }
+    }
+};
+
+#ifdef WITH_TESTS
+using namespace Tests;
+
+class MoveFuncDefOutsideTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    /// Check: Move definition from header to cpp.
+    void testMemberFuncToCpp()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "class Foo {\n"
+            "  inline int numbe@r() const\n"
+            "  {\n"
+            "    return 5;\n"
+            "  }\n"
+            "\n"
+            "    void bar();\n"
+            "};\n";
+        expected =
+            "class Foo {\n"
+            "  int number() const;\n"
+            "\n"
+            "    void bar();\n"
+            "};\n";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"file.h\"\n";
+        expected =
+            "#include \"file.h\"\n"
+            "\n"
+            "int Foo::number() const\n"
+            "{\n"
+            "    return 5;\n"
+            "}\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    void testMemberFuncToCppInsideNS()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "namespace SomeNamespace {\n"
+            "class Foo {\n"
+            "  int ba@r()\n"
+            "  {\n"
+            "    return 5;\n"
+            "  }\n"
+            "};\n"
+            "}\n";
+        expected =
+            "namespace SomeNamespace {\n"
+            "class Foo {\n"
+            "  int ba@r();\n"
+            "};\n"
+            "}\n";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"file.h\"\n"
+            "namespace SomeNamespace {\n"
+            "\n"
+            "}\n";
+        expected =
+            "#include \"file.h\"\n"
+            "namespace SomeNamespace {\n"
+            "\n"
+            "int Foo::bar()\n"
+            "{\n"
+            "    return 5;\n"
+            "}\n"
+            "\n"
+            "}\n";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    /// Check: Move definition outside class
+    void testMemberFuncOutside1()
+    {
+        QByteArray original =
+            "class Foo {\n"
+            "    void f1();\n"
+            "    inline int f2@() const\n"
+            "    {\n"
+            "        return 1;\n"
+            "    }\n"
+            "    void f3();\n"
+            "    void f4();\n"
+            "};\n"
+            "\n"
+            "void Foo::f4() {}\n";
+        QByteArray expected =
+            "class Foo {\n"
+            "    void f1();\n"
+            "    int f2@() const;\n"
+            "    void f3();\n"
+            "    void f4();\n"
+            "};\n"
+            "\n"
+            "int Foo::f2() const\n"
+            "{\n"
+            "    return 1;\n"
+            "}\n"
+            "\n"
+            "void Foo::f4() {}\n";
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+    /// Check: Move definition outside class
+    void testMemberFuncOutside2()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "class Foo {\n"
+            "    void f1();\n"
+            "    int f2@()\n"
+            "    {\n"
+            "        return 1;\n"
+            "    }\n"
+            "    void f3();\n"
+            "};\n";
+        expected =
+            "class Foo {\n"
+            "    void f1();\n"
+            "    int f2();\n"
+            "    void f3();\n"
+            "};\n"
+            "\n"
+            "inline int Foo::f2()\n"
+            "{\n"
+            "    return 1;\n"
+            "}\n";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"file.h\"\n"
+            "void Foo::f1() {}\n"
+            "void Foo::f3() {}\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 1);
+    }
+
+    /// Check: Move definition from header to cpp (with namespace).
+    void testMemberFuncToCppNS()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "namespace MyNs {\n"
+            "class Foo {\n"
+            "  inline int numbe@r() const\n"
+            "  {\n"
+            "    return 5;\n"
+            "  }\n"
+            "};\n"
+            "}\n";
+        expected =
+            "namespace MyNs {\n"
+            "class Foo {\n"
+            "  int number() const;\n"
+            "};\n"
+            "}\n";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"file.h\"\n";
+        expected =
+            "#include \"file.h\"\n"
+            "\n"
+            "int MyNs::Foo::number() const\n"
+            "{\n"
+            "    return 5;\n"
+            "}\n";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    /// Check: Move definition from header to cpp (with namespace + using).
+    void testMemberFuncToCppNSUsing()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "namespace MyNs {\n"
+            "class Foo {\n"
+            "  inline int numbe@r() const\n"
+            "  {\n"
+            "    return 5;\n"
+            "  }\n"
+            "};\n"
+            "}\n";
+        expected =
+            "namespace MyNs {\n"
+            "class Foo {\n"
+            "  int number() const;\n"
+            "};\n"
+            "}\n";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"file.h\"\n"
+            "using namespace MyNs;\n";
+        expected =
+            "#include \"file.h\"\n"
+            "using namespace MyNs;\n"
+            "\n"
+            "int Foo::number() const\n"
+            "{\n"
+            "    return 5;\n"
+            "}\n";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    /// Check: Move definition outside class with Namespace
+    void testMemberFuncOutsideWithNs()
+    {
+        QByteArray original =
+            "namespace MyNs {\n"
+            "class Foo {\n"
+            "    inline int numbe@r() const\n"
+            "    {\n"
+            "        return 5;\n"
+            "    }\n"
+            "};}\n";
+        QByteArray expected =
+            "namespace MyNs {\n"
+            "class Foo {\n"
+            "    int number() const;\n"
+            "};\n"
+            "\n"
+            "int Foo::number() const\n"
+            "{\n"
+            "    return 5;\n"
+            "}\n"
+            "\n}\n";
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+    /// Check: Move free function from header to cpp.
+    void testFreeFuncToCpp()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "int numbe@r() const\n"
+            "{\n"
+            "    return 5;\n"
+            "}\n";
+        expected =
+            "int number() const;\n"
+            ;
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"file.h\"\n";
+        expected =
+            "#include \"file.h\"\n"
+            "\n"
+            "int number() const\n"
+            "{\n"
+            "    return 5;\n"
+            "}\n";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    /// Check: Move free function from header to cpp (with namespace).
+    void testFreeFuncToCppNS()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "namespace MyNamespace {\n"
+            "int numbe@r() const\n"
+            "{\n"
+            "    return 5;\n"
+            "}\n"
+            "}\n";
+        expected =
+            "namespace MyNamespace {\n"
+            "int number() const;\n"
+            "}\n";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"file.h\"\n";
+        expected =
+            "#include \"file.h\"\n"
+            "\n"
+            "int MyNamespace::number() const\n"
+            "{\n"
+            "    return 5;\n"
+            "}\n";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    /// Check: Move Ctor with member initialization list (QTCREATORBUG-9157).
+    void testCtorWithInitialization1()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "class Foo {\n"
+            "public:\n"
+            "    Fo@o() : a(42), b(3.141) {}\n"
+            "private:\n"
+            "    int a;\n"
+            "    float b;\n"
+            "};\n";
+        expected =
+            "class Foo {\n"
+            "public:\n"
+            "    Foo();\n"
+            "private:\n"
+            "    int a;\n"
+            "    float b;\n"
+            "};\n";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original ="#include \"file.h\"\n";
+        expected =
+            "#include \"file.h\"\n"
+            "\n"
+            "Foo::Foo() : a(42), b(3.141) {}\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    /// Check: Move Ctor with member initialization list (QTCREATORBUG-9462).
+    void testCtorWithInitialization2()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "class Foo\n"
+            "{\n"
+            "public:\n"
+            "    Fo@o() : member(2)\n"
+            "    {\n"
+            "    }\n"
+            "\n"
+            "    int member;\n"
+            "};\n";
+
+        expected =
+            "class Foo\n"
+            "{\n"
+            "public:\n"
+            "    Foo();\n"
+            "\n"
+            "    int member;\n"
+            "};\n";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original ="#include \"file.h\"\n";
+        expected =
+            "#include \"file.h\"\n"
+            "\n"
+            "Foo::Foo() : member(2)\n"
+            "{\n"
+            "}\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    /// Check if definition is inserted right after class for move definition outside
+    void testAfterClass()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "class Foo\n"
+            "{\n"
+            "    Foo();\n"
+            "    void a@() {}\n"
+            "};\n"
+            "\n"
+            "class Bar {};\n";
+        expected =
+            "class Foo\n"
+            "{\n"
+            "    Foo();\n"
+            "    void a();\n"
+            "};\n"
+            "\n"
+            "inline void Foo::a() {}\n"
+            "\n"
+            "class Bar {};\n";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"file.h\"\n"
+            "\n"
+            "Foo::Foo()\n"
+            "{\n\n"
+            "}\n";
+        expected = original;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 1);
+    }
+
+    /// Check if whitespace is respected for operator functions
+    void testRespectWsInOperatorNames1()
+    {
+        QByteArray original =
+            "class Foo\n"
+            "{\n"
+            "    Foo &opera@tor =() {}\n"
+            "};\n";
+        QByteArray expected =
+            "class Foo\n"
+            "{\n"
+            "    Foo &operator =();\n"
+            "};\n"
+            "\n"
+            "Foo &Foo::operator =() {}\n"
+            ;
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+    /// Check if whitespace is respected for operator functions
+    void testRespectWsInOperatorNames2()
+    {
+        QByteArray original =
+            "class Foo\n"
+            "{\n"
+            "    Foo &opera@tor=() {}\n"
+            "};\n";
+        QByteArray expected =
+            "class Foo\n"
+            "{\n"
+            "    Foo &operator=();\n"
+            "};\n"
+            "\n"
+            "Foo &Foo::operator=() {}\n"
+            ;
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+    void testMacroUses()
+    {
+        QByteArray original =
+            "#define CONST const\n"
+            "#define VOLATILE volatile\n"
+            "class Foo\n"
+            "{\n"
+            "    int fu@nc(int a, int b) CONST VOLATILE\n"
+            "    {\n"
+            "        return 42;\n"
+            "    }\n"
+            "};\n";
+        QByteArray expected =
+            "#define CONST const\n"
+            "#define VOLATILE volatile\n"
+            "class Foo\n"
+            "{\n"
+            "    int func(int a, int b) CONST VOLATILE;\n"
+            "};\n"
+            "\n"
+            "\n"
+            // const volatile become lowercase: QTCREATORBUG-12620
+            "int Foo::func(int a, int b) const volatile\n"
+            "{\n"
+            "    return 42;\n"
+            "}\n"
+            ;
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory,
+                              ProjectExplorer::HeaderPaths(), 0, "QTCREATORBUG-12314");
+    }
+
+    void testTemplate()
+    {
+        QByteArray original =
+            "template<class T>\n"
+            "class Foo { void fu@nc() {} };\n";
+        QByteArray expected =
+            "template<class T>\n"
+            "class Foo { void fu@nc(); };\n"
+            "\n"
+            "template<class T>\n"
+            "void Foo<T>::func() {}\n";
+        ;
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+    void testMemberFunctionTemplate()
+    {
+        const QByteArray original = R"(
+struct S {
+    template<typename In>
+    void @foo(In in) { (void)in; }
+};
+)";
+        const QByteArray expected = R"(
+struct S {
+    template<typename In>
+    void foo(In in);
+};
+
+template<typename In>
+void S::foo(In in) { (void)in; }
+)";
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+    void testTemplateSpecializedClass()
+    {
+        QByteArray original = R"(
+template<typename T> class base {};
+template<>
+class base<int>
+{
+public:
+    void @bar() {}
+};
+)";
+        QByteArray expected = R"(
+template<typename T> class base {};
+template<>
+class base<int>
+{
+public:
+    void bar();
+};
+
+void base<int>::bar() {}
+)";
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+    void testUnnamedTemplate()
+    {
+        QByteArray original =
+            "template<typename T, typename>\n"
+            "class Foo { void fu@nc() {} };\n";
+        QByteArray expected =
+            "template<typename T, typename>\n"
+            "class Foo { void fu@nc(); };\n"
+            "\n"
+            "template<typename T, typename T2>\n"
+            "void Foo<T, T2>::func() {}\n";
+        ;
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+    void testMemberFuncToCppStatic()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "class Foo {\n"
+            "  static inline int numbe@r() const\n"
+            "  {\n"
+            "    return 5;\n"
+            "  }\n"
+            "\n"
+            "    void bar();\n"
+            "};\n";
+        expected =
+            "class Foo {\n"
+            "  static int number() const;\n"
+            "\n"
+            "    void bar();\n"
+            "};\n";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"file.h\"\n";
+        expected =
+            "#include \"file.h\"\n"
+            "\n"
+            "int Foo::number() const\n"
+            "{\n"
+            "    return 5;\n"
+            "}\n";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    void testMemberFuncToCppWithInlinePartOfName()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "class Foo {\n"
+            "  static inline int numbe@r_inline () const\n"
+            "  {\n"
+            "    return 5;\n"
+            "  }\n"
+            "\n"
+            "    void bar();\n"
+            "};\n";
+        expected =
+            "class Foo {\n"
+            "  static int number_inline () const;\n"
+            "\n"
+            "    void bar();\n"
+            "};\n";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"file.h\"\n";
+        expected =
+            "#include \"file.h\"\n"
+            "\n"
+            "int Foo::number_inline() const\n"
+            "{\n"
+            "    return 5;\n"
+            "}\n";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    void testMixedQualifiers()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original = R"(
+struct Base {
+    virtual auto func() const && noexcept -> void = 0;
+};
+struct Derived : public Base {
+    auto @func() const && noexcept -> void override {}
+};)";
+        expected = R"(
+struct Base {
+    virtual auto func() const && noexcept -> void = 0;
+};
+struct Derived : public Base {
+    auto func() const && noexcept -> void override;
+};)";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original = "#include \"file.h\"\n";
+        expected = R"DELIM(#include "file.h"
+
+auto Derived::func() const && noexcept -> void {}
+)DELIM";
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        MoveFuncDefOutside factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+};
+
+class MoveAllFuncDefOutsideTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testMemberFuncToCpp()
+    {
+        QList<TestDocumentPtr> testDocuments;
+        QByteArray original;
+        QByteArray expected;
+
+        // Header File
+        original =
+            "class Foo {@\n"
+            "  int numberA() const\n"
+            "  {\n"
+            "    return 5;\n"
+            "  }\n"
+            "  int numberB() const\n"
+            "  {\n"
+            "    return 5;\n"
+            "  }\n"
+            "};\n";
+        expected =
+            "class Foo {\n"
+            "  int numberA() const;\n"
+            "  int numberB() const;\n"
+            "};\n";
+        testDocuments << CppTestDocument::create("file.h", original, expected);
+
+        // Source File
+        original =
+            "#include \"file.h\"\n";
+        expected =
+            "#include \"file.h\"\n"
+            "\n"
+            "int Foo::numberA() const\n"
+            "{\n"
+            "    return 5;\n"
+            "}\n"
+            "\n"
+            "int Foo::numberB() const\n"
+            "{\n"
+            "    return 5;\n"
+            "}\n"
+            ;
+        testDocuments << CppTestDocument::create("file.cpp", original, expected);
+
+        MoveAllFuncDefOutside factory;
+        QuickFixOperationTest(testDocuments, &factory);
+    }
+
+    void testMemberFuncOutside()
+    {
+        QByteArray original =
+            "class F@oo {\n"
+            "    int f1()\n"
+            "    {\n"
+            "        return 1;\n"
+            "    }\n"
+            "    int f2() const\n"
+            "    {\n"
+            "        return 2;\n"
+            "    }\n"
+            "};\n";
+        QByteArray expected =
+            "class Foo {\n"
+            "    int f1();\n"
+            "    int f2() const;\n"
+            "};\n"
+            "\n"
+            "int Foo::f1()\n"
+            "{\n"
+            "    return 1;\n"
+            "}\n"
+            "\n"
+            "int Foo::f2() const\n"
+            "{\n"
+            "    return 2;\n"
+            "}\n";
+
+        MoveAllFuncDefOutside factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+    void testDoNotTriggerOnBaseClass()
+    {
+        QByteArray original =
+            "class Bar;\n"
+            "class Foo : public Ba@r {\n"
+            "    int f1()\n"
+            "    {\n"
+            "        return 1;\n"
+            "    }\n"
+            "};\n";
+
+        MoveAllFuncDefOutside factory;
+        QuickFixOperationTest(singleDocument(original, ""), &factory);
+    }
+
+    void testClassWithBaseClass()
+    {
+        QByteArray original =
+            "class Bar;\n"
+            "class Fo@o : public Bar {\n"
+            "    int f1()\n"
+            "    {\n"
+            "        return 1;\n"
+            "    }\n"
+            "};\n";
+        QByteArray expected =
+            "class Bar;\n"
+            "class Foo : public Bar {\n"
+            "    int f1();\n"
+            "};\n"
+            "\n"
+            "int Foo::f1()\n"
+            "{\n"
+            "    return 1;\n"
+            "}\n";
+
+        MoveAllFuncDefOutside factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+    /// Check: Do not take macro expanded code into account (QTCREATORBUG-13900)
+    void testIgnoreMacroCode()
+    {
+        QByteArray original =
+            "#define FAKE_Q_OBJECT int bar() {return 5;}\n"
+            "class Fo@o {\n"
+            "    FAKE_Q_OBJECT\n"
+            "    int f1()\n"
+            "    {\n"
+            "        return 1;\n"
+            "    }\n"
+            "};\n";
+        QByteArray expected =
+            "#define FAKE_Q_OBJECT int bar() {return 5;}\n"
+            "class Foo {\n"
+            "    FAKE_Q_OBJECT\n"
+            "    int f1();\n"
+            "};\n"
+            "\n"
+            "int Foo::f1()\n"
+            "{\n"
+            "    return 1;\n"
+            "}\n";
+
+        MoveAllFuncDefOutside factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+
+};
+
+class MoveFuncDefToDeclTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test_data()
+    {
+        QTest::addColumn<QByteArrayList>("headers");
+        QTest::addColumn<QByteArrayList>("sources");
+
+        QByteArray originalHeader;
+        QByteArray expectedHeader;
+        QByteArray originalSource;
+        QByteArray expectedSource;
+
+        originalHeader =
+            "class Foo {\n"
+            "    inline int @number() const;\n"
+            "};\n";
+        expectedHeader =
+            "class Foo {\n"
+            "    inline int number() const {return 5;}\n"
+            "};\n";
+        originalSource =
+            "#include \"file.h\"\n"
+            "\n"
+            "int Foo::num@ber() const {return 5;}\n";
+        expectedSource =
+            "#include \"file.h\"\n"
+            "\n\n";
+        QTest::newRow("member function, two files") << QByteArrayList{originalHeader, expectedHeader}
+                                                    << QByteArrayList{originalSource, expectedSource};
+
+        originalSource =
+            "class Foo {\n"
+            "  inline int @number() const;\n"
+            "};\n"
+            "\n"
+            "int Foo::num@ber() const\n"
+            "{\n"
+            "    return 5;\n"
+            "}\n";
+
+        expectedSource =
+            "class Foo {\n"
+            "    inline int number() const\n"
+            "    {\n"
+            "        return 5;\n"
+            "    }\n"
+            "};\n\n\n";
+        QTest::newRow("member function, one file") << QByteArrayList()
+                                                   << QByteArrayList{originalSource, expectedSource};
+
+        originalHeader =
+            "namespace MyNs {\n"
+            "class Foo {\n"
+            "  inline int @number() const;\n"
+            "};\n"
+            "}\n";
+        expectedHeader =
+            "namespace MyNs {\n"
+            "class Foo {\n"
+            "    inline int number() const\n"
+            "    {\n"
+            "        return 5;\n"
+            "    }\n"
+            "};\n"
+            "}\n";
+        originalSource =
+            "#include \"file.h\"\n"
+            "\n"
+            "int MyNs::Foo::num@ber() const\n"
+            "{\n"
+            "    return 5;\n"
+            "}\n";
+        expectedSource = "#include \"file.h\"\n\n\n";
+        QTest::newRow("member function, two files, namespace")
+            << QByteArrayList{originalHeader, expectedHeader}
+            << QByteArrayList{originalSource, expectedSource};
+
+        originalHeader =
+            "namespace MyNs {\n"
+            "class Foo {\n"
+            "  inline int numbe@r() const;\n"
+            "};\n"
+            "}\n";
+        expectedHeader =
+            "namespace MyNs {\n"
+            "class Foo {\n"
+            "    inline int number() const\n"
+            "    {\n"
+            "        return 5;\n"
+            "    }\n"
+            "};\n"
+            "}\n";
+        originalSource =
+            "#include \"file.h\"\n"
+            "using namespace MyNs;\n"
+            "\n"
+            "int Foo::num@ber() const\n"
+            "{\n"
+            "    return 5;\n"
+            "}\n";
+        expectedSource =
+            "#include \"file.h\"\n"
+            "using namespace MyNs;\n"
+            "\n\n";
+        QTest::newRow("member function, two files, namespace with using-directive")
+            << QByteArrayList{originalHeader, expectedHeader}
+            << QByteArrayList{originalSource, expectedSource};
+
+        originalSource =
+            "namespace MyNs {\n"
+            "class Foo {\n"
+            "  inline int @number() const;\n"
+            "};\n"
+            "\n"
+            "int Foo::numb@er() const\n"
+            "{\n"
+            "    return 5;\n"
+            "}"
+            "\n}\n";
+        expectedSource =
+            "namespace MyNs {\n"
+            "class Foo {\n"
+            "    inline int number() const\n"
+            "    {\n"
+            "        return 5;\n"
+            "    }\n"
+            "};\n\n\n}\n";
+
+        QTest::newRow("member function, one file, namespace")
+            << QByteArrayList() << QByteArrayList{originalSource, expectedSource};
+
+        originalHeader = "int nu@mber() const;\n";
+        expectedHeader =
+            "inline int number() const\n"
+            "{\n"
+            "    return 5;\n"
+            "}\n";
+        originalSource =
+            "#include \"file.h\"\n"
+            "\n"
+            "\n"
+            "int numb@er() const\n"
+            "{\n"
+            "    return 5;\n"
+            "}\n";
+        expectedSource = "#include \"file.h\"\n\n\n\n";
+        QTest::newRow("free function") << QByteArrayList{originalHeader, expectedHeader}
+                                       << QByteArrayList{originalSource, expectedSource};
+
+        originalHeader =
+            "namespace MyNamespace {\n"
+            "int n@umber() const;\n"
+            "}\n";
+        expectedHeader =
+            "namespace MyNamespace {\n"
+            "inline int number() const\n"
+            "{\n"
+            "    return 5;\n"
+            "}\n"
+            "}\n";
+        originalSource =
+            "#include \"file.h\"\n"
+            "\n"
+            "int MyNamespace::nu@mber() const\n"
+            "{\n"
+            "    return 5;\n"
+            "}\n";
+        expectedSource =
+            "#include \"file.h\"\n"
+            "\n\n";
+        QTest::newRow("free function, namespace") << QByteArrayList{originalHeader, expectedHeader}
+                                                  << QByteArrayList{originalSource, expectedSource};
+
+        originalHeader =
+            "class Foo {\n"
+            "public:\n"
+            "    Fo@o();\n"
+            "private:\n"
+            "    int a;\n"
+            "    float b;\n"
+            "};\n";
+        expectedHeader =
+            "class Foo {\n"
+            "public:\n"
+            "    Foo() : a(42), b(3.141) {}\n"
+            "private:\n"
+            "    int a;\n"
+            "    float b;\n"
+            "};\n";
+        originalSource =
+            "#include \"file.h\"\n"
+            "\n"
+            "Foo::F@oo() : a(42), b(3.141) {}"
+            ;
+        expectedSource ="#include \"file.h\"\n\n";
+        QTest::newRow("constructor") << QByteArrayList{originalHeader, expectedHeader}
+                                     << QByteArrayList{originalSource, expectedSource};
+
+        originalSource =
+            "struct Foo\n"
+            "{\n"
+            "    void f@oo();\n"
+            "} bar;\n"
+            "void Foo::fo@o()\n"
+            "{\n"
+            "    return;\n"
+            "}";
+        expectedSource =
+            "struct Foo\n"
+            "{\n"
+            "    void foo()\n"
+            "    {\n"
+            "        return;\n"
+            "    }\n"
+            "} bar;\n";
+        QTest::newRow("QTCREATORBUG-10303") << QByteArrayList()
+                                            << QByteArrayList{originalSource, expectedSource};
+
+        originalSource =
+            "struct Base {\n"
+            "    virtual int foo() = 0;\n"
+            "};\n"
+            "struct Derived : Base {\n"
+            "    int @foo() override;\n"
+            "};\n"
+            "\n"
+            "int Derived::fo@o()\n"
+            "{\n"
+            "    return 5;\n"
+            "}\n";
+        expectedSource =
+            "struct Base {\n"
+            "    virtual int foo() = 0;\n"
+            "};\n"
+            "struct Derived : Base {\n"
+            "    int foo() override\n"
+            "    {\n"
+            "        return 5;\n"
+            "    }\n"
+            "};\n\n\n";
+        QTest::newRow("overridden virtual") << QByteArrayList()
+                                            << QByteArrayList{originalSource, expectedSource};
+
+        originalSource =
+            "template<class T>\n"
+            "class Foo { void @func(); };\n"
+            "\n"
+            "template<class T>\n"
+            "void Foo<T>::fu@nc() {}\n";
+        expectedSource =
+            "template<class T>\n"
+            "class Foo { void fu@nc() {} };\n\n\n";
+        QTest::newRow("class template") << QByteArrayList()
+                                        << QByteArrayList{originalSource, expectedSource};
+
+        originalSource =
+            "class Foo\n"
+            "{\n"
+            "    template<class T>\n"
+            "    void @func();\n"
+            "};\n"
+            "\n"
+            "template<class T>\n"
+            "void Foo::fu@nc() {}\n";
+        expectedSource =
+            "class Foo\n"
+            "{\n"
+            "    template<class T>\n"
+            "    void func() {}\n"
+            "};\n\n\n";
+        QTest::newRow("function template") << QByteArrayList()
+                                           << QByteArrayList{originalSource, expectedSource};
+    }
+
+    void test()
+    {
+        QFETCH(QByteArrayList, headers);
+        QFETCH(QByteArrayList, sources);
+
+        QVERIFY(headers.isEmpty() || headers.size() == 2);
+        QVERIFY(sources.size() == 2);
+
+        QByteArray &declDoc = !headers.empty() ? headers.first() : sources.first();
+        const int declCursorPos = declDoc.indexOf('@');
+        QVERIFY(declCursorPos != -1);
+        const int defCursorPos = sources.first().lastIndexOf('@');
+        QVERIFY(defCursorPos != -1);
+        QVERIFY(declCursorPos != defCursorPos);
+
+        declDoc.remove(declCursorPos, 1);
+        QList<TestDocumentPtr> testDocuments;
+        if (!headers.isEmpty())
+            testDocuments << CppTestDocument::create("file.h", headers.first(), headers.last());
+        testDocuments << CppTestDocument::create("file.cpp", sources.first(), sources.last());
+
+        MoveFuncDefToDeclPush pushFactory;
+        QuickFixOperationTest(testDocuments, &pushFactory);
+
+        declDoc.insert(declCursorPos, '@');
+        sources.first().remove(defCursorPos, 1);
+        testDocuments.clear();
+        if (!headers.isEmpty())
+            testDocuments << CppTestDocument::create("file.h", headers.first(), headers.last());
+        testDocuments << CppTestDocument::create("file.cpp", sources.first(), sources.last());
+
+        MoveFuncDefToDeclPull pullFactory;
+        QuickFixOperationTest(testDocuments, &pullFactory);
+    }
+
+    void testMacroUses()
+    {
+        QByteArray original =
+            "#define CONST const\n"
+            "#define VOLATILE volatile\n"
+            "class Foo\n"
+            "{\n"
+            "    int func(int a, int b) CONST VOLATILE;\n"
+            "};\n"
+            "\n"
+            "\n"
+            "int Foo::fu@nc(int a, int b) CONST VOLATILE"
+            "{\n"
+            "    return 42;\n"
+            "}\n";
+        QByteArray expected =
+            "#define CONST const\n"
+            "#define VOLATILE volatile\n"
+            "class Foo\n"
+            "{\n"
+            "    int func(int a, int b) CONST VOLATILE\n"
+            "    {\n"
+            "        return 42;\n"
+            "    }\n"
+            "};\n\n\n\n";
+
+        MoveFuncDefToDeclPush factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory,
+                              ProjectExplorer::HeaderPaths(), 0, "QTCREATORBUG-12314");
+    }
+};
+
+QObject *MoveFuncDefOutside::createTest()
+{
+    return new MoveFuncDefOutsideTest;
+}
+
+QObject *MoveAllFuncDefOutside::createTest()
+{
+    return new MoveAllFuncDefOutsideTest;
+}
+
+QObject *MoveFuncDefToDeclPush::createTest()
+{
+    return new MoveFuncDefToDeclTest;
+}
+
+QObject *MoveFuncDefToDeclPull::createTest()
+{
+    return new QObject; // The test for the push factory handled both cases.
+}
+
+#endif // WITH_TESTS
+
+} // namespace
+
+void registerMoveFunctionDefinitionQuickfixes()
+{
+    CppQuickFixFactory::registerFactory<MoveFuncDefOutside>();
+    CppQuickFixFactory::registerFactory<MoveAllFuncDefOutside>();
+    CppQuickFixFactory::registerFactory<MoveFuncDefToDeclPush>();
+    CppQuickFixFactory::registerFactory<MoveFuncDefToDeclPull>();
+}
+
+} // namespace CppEditor::Internal
+
+#ifdef WITH_TESTS
+#include <movefunctiondefinition.moc>
+#endif
diff --git a/src/plugins/cppeditor/quickfixes/movefunctiondefinition.h b/src/plugins/cppeditor/quickfixes/movefunctiondefinition.h
new file mode 100644
index 00000000000..4c6e481ad49
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/movefunctiondefinition.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerMoveFunctionDefinitionQuickfixes();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/rearrangeparamdeclarationlist.cpp b/src/plugins/cppeditor/quickfixes/rearrangeparamdeclarationlist.cpp
new file mode 100644
index 00000000000..6917771a67b
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/rearrangeparamdeclarationlist.cpp
@@ -0,0 +1,121 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "rearrangeparamdeclarationlist.h"
+
+#include "../cppeditortr.h"
+#include "../cpprefactoringchanges.h"
+#include "cppquickfix.h"
+
+#ifdef WITH_TESTS
+#include <QObject>
+#endif
+
+using namespace CPlusPlus;
+
+namespace CppEditor::Internal {
+namespace {
+
+class RearrangeParamDeclarationListOp: public CppQuickFixOperation
+{
+public:
+    enum Target { TargetPrevious, TargetNext };
+
+    RearrangeParamDeclarationListOp(const CppQuickFixInterface &interface, AST *currentParam,
+                                    AST *targetParam, Target target)
+        : CppQuickFixOperation(interface)
+        , m_currentParam(currentParam)
+        , m_targetParam(targetParam)
+    {
+        QString targetString;
+        if (target == TargetPrevious)
+            targetString = Tr::tr("Switch with Previous Parameter");
+        else
+            targetString = Tr::tr("Switch with Next Parameter");
+        setDescription(targetString);
+    }
+
+    void perform() override
+    {
+        int targetEndPos = currentFile()->endOf(m_targetParam);
+        currentFile()->setOpenEditor(false, targetEndPos);
+        currentFile()->apply(Utils::ChangeSet::makeFlip(
+            currentFile()->startOf(m_currentParam),
+            currentFile()->endOf(m_currentParam),
+            currentFile()->startOf(m_targetParam),
+            targetEndPos));
+    }
+
+private:
+    AST *m_currentParam;
+    AST *m_targetParam;
+};
+
+
+/*!
+  Switches places of the parameter declaration under cursor
+  with the next or the previous one in the parameter declaration list
+
+  Activates on: parameter declarations
+*/
+class RearrangeParamDeclarationList : public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest() { return new QObject; }
+#endif
+
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const QList<AST *> path = interface.path();
+
+        ParameterDeclarationAST *paramDecl = nullptr;
+        int index = path.size() - 1;
+        for (; index != -1; --index) {
+            paramDecl = path.at(index)->asParameterDeclaration();
+            if (paramDecl)
+                break;
+        }
+
+        if (index < 1)
+            return;
+
+        ParameterDeclarationClauseAST *paramDeclClause
+            = path.at(index - 1)->asParameterDeclarationClause();
+        QTC_ASSERT(paramDeclClause && paramDeclClause->parameter_declaration_list, return);
+
+        ParameterDeclarationListAST *paramListNode = paramDeclClause->parameter_declaration_list;
+        ParameterDeclarationListAST *prevParamListNode = nullptr;
+        while (paramListNode) {
+            if (paramDecl == paramListNode->value)
+                break;
+            prevParamListNode = paramListNode;
+            paramListNode = paramListNode->next;
+        }
+
+        if (!paramListNode)
+            return;
+
+        if (prevParamListNode)
+            result << new RearrangeParamDeclarationListOp(
+                interface,
+                paramListNode->value,
+                prevParamListNode->value,
+                RearrangeParamDeclarationListOp::TargetPrevious);
+        if (paramListNode->next)
+            result << new RearrangeParamDeclarationListOp(
+                interface,
+                paramListNode->value,
+                paramListNode->next->value,
+                RearrangeParamDeclarationListOp::TargetNext);
+    }
+};
+
+} // namespace
+
+void registerRearrangeParamDeclarationListQuickfix()
+{
+    CppQuickFixFactory::registerFactory<RearrangeParamDeclarationList>();
+}
+
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/rearrangeparamdeclarationlist.h b/src/plugins/cppeditor/quickfixes/rearrangeparamdeclarationlist.h
new file mode 100644
index 00000000000..6fa78885d98
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/rearrangeparamdeclarationlist.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerRearrangeParamDeclarationListQuickfix();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/reformatpointerdeclaration.cpp b/src/plugins/cppeditor/quickfixes/reformatpointerdeclaration.cpp
new file mode 100644
index 00000000000..6a7ab4c2404
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/reformatpointerdeclaration.cpp
@@ -0,0 +1,186 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "reformatpointerdeclaration.h"
+
+#include "../cppcodestylesettings.h"
+#include "../cppeditortr.h"
+#include "../cpppointerdeclarationformatter.h"
+#include "../cpprefactoringchanges.h"
+#include "cppquickfix.h"
+
+#include <cplusplus/Overview.h>
+
+#ifdef WITH_TESTS
+#include "cppquickfix_test.h"
+#include <QtTest>
+#endif
+
+using namespace CPlusPlus;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+
+class ReformatPointerDeclarationOp: public CppQuickFixOperation
+{
+public:
+    ReformatPointerDeclarationOp(const CppQuickFixInterface &interface, const ChangeSet change)
+        : CppQuickFixOperation(interface)
+        , m_change(change)
+    {
+        QString description;
+        if (m_change.operationList().size() == 1) {
+            description = Tr::tr(
+                              "Reformat to \"%1\"").arg(m_change.operationList().constFirst().text());
+        } else { // > 1
+            description = Tr::tr("Reformat Pointers or References");
+        }
+        setDescription(description);
+    }
+
+    void perform() override
+    {
+        currentFile()->apply(m_change);
+    }
+
+private:
+    ChangeSet m_change;
+};
+
+/// Filter the results of ASTPath.
+/// The resulting list contains the supported AST types only once.
+/// For this, the results of ASTPath are iterated in reverse order.
+class ReformatPointerDeclarationASTPathResultsFilter
+{
+public:
+    QList<AST*> filter(const QList<AST*> &astPathList)
+    {
+        QList<AST*> filtered;
+
+        for (int i = astPathList.size() - 1; i >= 0; --i) {
+            AST *ast = astPathList.at(i);
+
+            if (!m_hasSimpleDeclaration && ast->asSimpleDeclaration()) {
+                m_hasSimpleDeclaration = true;
+                filtered.append(ast);
+            } else if (!m_hasFunctionDefinition && ast->asFunctionDefinition()) {
+                m_hasFunctionDefinition = true;
+                filtered.append(ast);
+            } else if (!m_hasParameterDeclaration && ast->asParameterDeclaration()) {
+                m_hasParameterDeclaration = true;
+                filtered.append(ast);
+            } else if (!m_hasIfStatement && ast->asIfStatement()) {
+                m_hasIfStatement = true;
+                filtered.append(ast);
+            } else if (!m_hasWhileStatement && ast->asWhileStatement()) {
+                m_hasWhileStatement = true;
+                filtered.append(ast);
+            } else if (!m_hasForStatement && ast->asForStatement()) {
+                m_hasForStatement = true;
+                filtered.append(ast);
+            } else if (!m_hasForeachStatement && ast->asForeachStatement()) {
+                m_hasForeachStatement = true;
+                filtered.append(ast);
+            }
+        }
+
+        return filtered;
+    }
+
+private:
+    bool m_hasSimpleDeclaration = false;
+    bool m_hasFunctionDefinition = false;
+    bool m_hasParameterDeclaration = false;
+    bool m_hasIfStatement = false;
+    bool m_hasWhileStatement = false;
+    bool m_hasForStatement = false;
+    bool m_hasForeachStatement = false;
+};
+
+/*!
+  Reformats a pointer, reference or rvalue reference type/declaration.
+
+  Works also with selections (except when the cursor is not on any AST).
+
+  Activates on: simple declarations, parameters and return types of function
+                declarations and definitions, control flow statements (if,
+                while, for, foreach) with declarations.
+*/
+class ReformatPointerDeclaration : public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const QList<AST *> &path = interface.path();
+        CppRefactoringFilePtr file = interface.currentFile();
+
+        Overview overview = CppCodeStyleSettings::currentProjectCodeStyleOverview();
+        overview.showArgumentNames = true;
+        overview.showReturnTypes = true;
+
+        const QTextCursor cursor = file->cursor();
+        ChangeSet change;
+        PointerDeclarationFormatter formatter(file, overview,
+                                              PointerDeclarationFormatter::RespectCursor);
+
+        if (cursor.hasSelection()) {
+            // This will no work always as expected since this function is only called if
+            // interface-path() is not empty. If the user selects the whole document via
+            // ctrl-a and there is an empty line in the end, then the cursor is not on
+            // any AST and therefore no quick fix will be triggered.
+            change = formatter.format(file->cppDocument()->translationUnit()->ast());
+            if (!change.isEmpty())
+                result << new ReformatPointerDeclarationOp(interface, change);
+        } else {
+            const QList<AST *> suitableASTs
+                = ReformatPointerDeclarationASTPathResultsFilter().filter(path);
+            for (AST *ast : suitableASTs) {
+                change = formatter.format(ast);
+                if (!change.isEmpty()) {
+                    result << new ReformatPointerDeclarationOp(interface, change);
+                    return;
+                }
+            }
+        }
+    }
+};
+
+#ifdef WITH_TESTS
+using namespace Tests;
+
+class ReformatPointerDeclarationTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test()
+    {
+        // Check: Just a basic test since the main functionality is tested in
+        // cpppointerdeclarationformatter_test.cpp
+        ReformatPointerDeclaration factory;
+        QuickFixOperationTest(
+            singleDocument(QByteArray("char@*s;"), QByteArray("char *s;")), &factory);
+    }
+};
+
+QObject *ReformatPointerDeclaration::createTest() { return new ReformatPointerDeclarationTest; }
+
+#endif // WITH_TESTS
+}
+
+void registerReformatPointerDeclarationQuickfix()
+{
+    CppQuickFixFactory::registerFactory<ReformatPointerDeclaration>();
+}
+
+} // namespace CppEditor::Internal
+
+#ifdef WITH_TESTS
+#include <reformatpointerdeclaration.moc>
+#endif
diff --git a/src/plugins/cppeditor/quickfixes/reformatpointerdeclaration.h b/src/plugins/cppeditor/quickfixes/reformatpointerdeclaration.h
new file mode 100644
index 00000000000..89bbe5cd778
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/reformatpointerdeclaration.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerReformatPointerDeclarationQuickfix();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/removeusingnamespace.cpp b/src/plugins/cppeditor/quickfixes/removeusingnamespace.cpp
new file mode 100644
index 00000000000..f889b14121a
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/removeusingnamespace.cpp
@@ -0,0 +1,957 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "removeusingnamespace.h"
+
+#include "../cppeditortr.h"
+#include "../cppprojectfile.h"
+#include "../cpprefactoringchanges.h"
+#include "cppquickfix.h"
+
+#include <cplusplus/Overview.h>
+#include <projectexplorer/projectmanager.h>
+
+#ifdef WITH_TESTS
+#include "cppquickfix_test.h"
+#include <QtTest>
+#endif
+
+using namespace CPlusPlus;
+using namespace ProjectExplorer;
+using namespace TextEditor;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+
+/**
+ * @brief The NameCounter class counts the parts of a name. E.g. 2 for std::vector or 1 for variant
+ */
+class NameCounter : private NameVisitor
+{
+public:
+    int count(const Name *name)
+    {
+        counter = 0;
+        accept(name);
+        return counter;
+    }
+
+private:
+    void visit(const Identifier *) override { ++counter; }
+    void visit(const DestructorNameId *) override { ++counter; }
+    void visit(const TemplateNameId *) override { ++counter; }
+    void visit(const QualifiedNameId *name) override
+    {
+        if (name->base())
+            accept(name->base());
+        accept(name->name());
+    }
+    int counter;
+};
+
+/**
+ * @brief getBaseName returns the base name of a qualified name or nullptr.
+ * E.g.: foo::bar => foo; bar => bar
+ * @param name The Name, maybe qualified
+ * @return The base name of the qualified name or nullptr
+ */
+const Identifier *getBaseName(const Name *name)
+{
+    class GetBaseName : public NameVisitor
+    {
+        void visit(const Identifier *name) override { baseName = name; }
+        void visit(const QualifiedNameId *name) override
+        {
+            if (name->base())
+                accept(name->base());
+            else
+                accept(name->name());
+        }
+
+    public:
+        const Identifier *baseName = nullptr;
+    };
+    GetBaseName getter;
+    getter.accept(name);
+    return getter.baseName;
+}
+
+/**
+ * @brief countNames counts the parts of the Name.
+ * E.g. if the name is std::vector, the function returns 2, if the name is variant, returns 1
+ * @param name The name that should be counted
+ * @return the number of parts of the name
+ */
+int countNames(const Name *name)
+{
+    return NameCounter{}.count(name);
+}
+
+/**
+ * @brief removeLine removes the whole line in which the ast node is located if there are otherwise only whitespaces
+ * @param file The file in which the AST node is located
+ * @param ast The ast node
+ * @param changeSet The ChangeSet of the file
+ */
+void removeLine(const CppRefactoringFile *file, AST *ast, ChangeSet &changeSet)
+{
+    RefactoringFile::Range range = file->range(ast);
+    --range.start;
+    while (range.start >= 0) {
+        QChar current = file->charAt(range.start);
+        if (!current.isSpace()) {
+            ++range.start;
+            break;
+        }
+        if (current == QChar::ParagraphSeparator)
+            break;
+        --range.start;
+    }
+    range.start = std::max(0, range.start);
+    while (range.end < file->document()->characterCount()) {
+        QChar current = file->charAt(range.end);
+        if (!current.isSpace())
+            break;
+        if (current == QChar::ParagraphSeparator)
+            break;
+        ++range.end;
+    }
+    range.end = std::min(file->document()->characterCount(), range.end);
+    const bool newLineStart = file->charAt(range.start) == QChar::ParagraphSeparator;
+    const bool newLineEnd = file->charAt(range.end) == QChar::ParagraphSeparator;
+    if (!newLineEnd && newLineStart)
+        ++range.start;
+    changeSet.remove(range);
+}
+
+/**
+ * @brief The RemoveNamespaceVisitor class removes a using namespace and rewrites all types that
+ * are in the namespace if needed
+ */
+class RemoveNamespaceVisitor : public ASTVisitor
+{
+public:
+    constexpr static int SearchGlobalUsingDirectivePos = std::numeric_limits<int>::max();
+    RemoveNamespaceVisitor(const CppRefactoringFile *file,
+                           const Snapshot &snapshot,
+                           const Name *namespace_,
+                           int symbolPos,
+                           bool removeAllAtGlobalScope)
+        : ASTVisitor(file->cppDocument()->translationUnit())
+        , m_file(file)
+        , m_snapshot(snapshot)
+        , m_namespace(namespace_)
+        , m_missingNamespace(toString(namespace_) + "::")
+        , m_context(m_file->cppDocument(), m_snapshot)
+        , m_symbolPos(symbolPos)
+        , m_removeAllAtGlobalScope(removeAllAtGlobalScope)
+
+    {}
+
+    const ChangeSet &getChanges() { return m_changeSet; }
+
+    /**
+     * @brief isGlobalUsingNamespace return true if the using namespace that should be removed
+     * is not scoped and other files that include this file will also use the using namespace
+     * @return true if using namespace statement is global and not scoped, false otherwise
+     */
+    bool isGlobalUsingNamespace() const { return m_parentNode == nullptr; }
+
+    /**
+     * @brief foundGlobalUsingNamespace return true if removeAllAtGlobalScope is false and
+     * another using namespace is found at the global scope, so that other files that include this
+     * file don't have to be processed
+     * @return true if there was a 'global' second using namespace in this file and
+     * removeAllAtGlobalScope is false
+     */
+    bool foundGlobalUsingNamespace() const { return m_foundNamespace; }
+
+private:
+    bool preVisit(AST *ast) override
+    {
+        if (!m_start) {
+            if (ast->asTranslationUnit())
+                return true;
+            if (UsingDirectiveAST *usingDirective = ast->asUsingDirective()) {
+                if (nameEqual(usingDirective->name->name, m_namespace)) {
+                    if (m_symbolPos == SearchGlobalUsingDirectivePos) {
+                        // we have found a global using directive, so lets start
+                        m_start = true;
+                        removeLine(m_file, ast, m_changeSet);
+                        return false;
+                    }
+                    // ignore the using namespace that should be removed
+                    if (m_file->endOf(ast) != m_symbolPos) {
+                        if (m_removeAllAtGlobalScope)
+                            removeLine(m_file, ast, m_changeSet);
+                        else
+                            m_done = true;
+                    }
+                }
+            }
+            // if the end of the ast is before we should start, we are not interested in the node
+            if (m_file->endOf(ast) <= m_symbolPos)
+                return false;
+
+            if (m_file->startOf(ast) > m_symbolPos)
+                m_start = true;
+        }
+        return !m_foundNamespace && !m_done;
+    }
+
+    bool visit(NamespaceAST *ast) override
+    {
+        if (m_start && nameEqual(m_namespace, ast->symbol->name()))
+            return false;
+
+        return m_start;
+    }
+
+    // scopes for using namespace statements:
+    bool visit(LinkageBodyAST *ast) override { return visitNamespaceScope(ast); }
+    bool visit(CompoundStatementAST *ast) override { return visitNamespaceScope(ast); }
+    bool visitNamespaceScope(AST *ast)
+    {
+        ++m_namespaceScopeCounter;
+        if (!m_start)
+            m_parentNode = ast;
+        return true;
+    }
+
+    void endVisit(LinkageBodyAST *ast) override { endVisitNamespaceScope(ast); }
+    void endVisit(CompoundStatementAST *ast) override { endVisitNamespaceScope(ast); }
+    void endVisitNamespaceScope(AST *ast)
+    {
+        --m_namespaceScopeCounter;
+        m_foundNamespace = false;
+        // if we exit the scope of the using namespace we are done
+        if (ast == m_parentNode)
+            m_done = true;
+    }
+
+    bool visit(UsingDirectiveAST *ast) override
+    {
+        if (nameEqual(ast->name->name, m_namespace)) {
+            if (m_removeAllAtGlobalScope && m_namespaceScopeCounter == 0)
+                removeLine(m_file, ast, m_changeSet);
+            else
+                m_foundNamespace = true;
+            return false;
+        }
+        return handleAstWithLongestName(ast);
+    }
+
+    bool visit(DeclaratorIdAST *ast) override
+    {
+        // e.g. we have the following code and get the following Lookup items:
+        // namespace test {
+        //   struct foo { // 1. item with test::foo
+        //     foo();     // 2. item with test::foo::foo
+        //   };
+        // }
+        // using namespace foo;
+        // foo::foo() { ... } // 3. item with foo::foo
+        // Our current name is foo::foo so we have to match with the 2. item / longest name
+        return handleAstWithLongestName(ast);
+    }
+
+    template<typename AST>
+    bool handleAstWithLongestName(AST *ast)
+    {
+        if (m_start) {
+            Scope *scope = m_file->scopeAt(ast->firstToken());
+            const QList<LookupItem> localLookup = m_context.lookup(ast->name->name, scope);
+            QList<const Name *> longestName;
+            for (const LookupItem &item : localLookup) {
+                QList<const Name *> names
+                    = m_context.fullyQualifiedName(item.declaration(),
+                                                   LookupContext::HideInlineNamespaces);
+                if (names.length() > longestName.length())
+                    longestName = names;
+            }
+            const int currentNameCount = countNames(ast->name->name);
+            const bool needNew = needMissingNamespaces(std::move(longestName), currentNameCount);
+            if (needNew)
+                insertMissingNamespace(ast);
+        }
+        return false;
+    }
+
+    bool visit(NamedTypeSpecifierAST *ast) override { return handleAstWithName(ast); }
+
+    bool visit(IdExpressionAST *ast) override { return handleAstWithName(ast); }
+
+    template<typename AST>
+    bool handleAstWithName(AST *ast)
+    {
+        if (m_start) {
+            Scope *scope = m_file->scopeAt(ast->firstToken());
+            const Name *wantToLookup = ast->name->name;
+            // first check if the base name is a typedef. Consider the following example:
+            // using namespace std;
+            // using vec = std::vector<int>;
+            // vec::iterator it; // we have to lookup 'vec' and not iterator (would result in
+            //   std::vector<int>::iterator => std::vec::iterator, which is wrong)
+            const Name *baseName = getBaseName(wantToLookup);
+            QList<LookupItem> typedefCandidates = m_context.lookup(baseName, scope);
+            if (!typedefCandidates.isEmpty()) {
+                if (typedefCandidates.front().declaration()->isTypedef())
+                    wantToLookup = baseName;
+            }
+
+            const QList<LookupItem> lookups = m_context.lookup(wantToLookup, scope);
+            if (!lookups.empty()) {
+                QList<const Name *> fullName
+                    = m_context.fullyQualifiedName(lookups.first().declaration(),
+                                                   LookupContext::HideInlineNamespaces);
+                const int currentNameCount = countNames(wantToLookup);
+                const bool needNamespace = needMissingNamespaces(std::move(fullName),
+                                                                 currentNameCount);
+                if (needNamespace)
+                    insertMissingNamespace(ast);
+            }
+        }
+        return true;
+    }
+
+    template<typename AST>
+    void insertMissingNamespace(AST *ast)
+    {
+        DestructorNameAST *destructorName = ast->name->asDestructorName();
+        if (destructorName)
+            m_changeSet.insert(m_file->startOf(destructorName->unqualified_name), m_missingNamespace);
+        else
+            m_changeSet.insert(m_file->startOf(ast->name), m_missingNamespace);
+        m_changeSet.operationList().last().setFormat1(false);
+    }
+
+    bool needMissingNamespaces(QList<const Name *> &&fullName, int currentNameCount)
+    {
+        if (currentNameCount > fullName.length())
+            return false;
+
+        // eg. fullName = std::vector, currentName = vector => result should be std
+        fullName.erase(fullName.end() - currentNameCount, fullName.end());
+        if (fullName.empty())
+            return false;
+        return nameEqual(m_namespace, fullName.last());
+    }
+
+    static bool nameEqual(const Name *name1, const Name *name2)
+    {
+        return Matcher::match(name1, name2);
+    }
+
+    QString toString(const Name *id)
+    {
+        const Identifier *identifier = id->asNameId();
+        QTC_ASSERT(identifier, return {});
+        return QString::fromUtf8(identifier->chars(), identifier->size());
+    }
+
+    const CppRefactoringFile *const m_file;
+    const Snapshot &m_snapshot;
+
+    const Name *m_namespace;          // the name of the namespace that should be removed
+    const QString m_missingNamespace; // that should be added if a type was using the namespace
+    LookupContext m_context;
+    ChangeSet m_changeSet;
+    const int m_symbolPos; // the end position of the start symbol
+    bool m_done = false;
+    bool m_start = false;
+    // true if a using namespace was found at a scope and the scope should be left
+    bool m_foundNamespace = false;
+    bool m_removeAllAtGlobalScope;
+    // the scope where the using namespace that should be removed is valid
+    AST *m_parentNode = nullptr;
+    int m_namespaceScopeCounter = 0;
+};
+
+class RemoveUsingNamespaceOperation : public CppQuickFixOperation
+{
+    struct Node
+    {
+        Document::Ptr document;
+        bool hasGlobalUsingDirective = false;
+        int unprocessedParents;
+        std::vector<std::reference_wrapper<Node>> includes;
+        std::vector<std::reference_wrapper<Node>> includedBy;
+        Node() = default;
+        Node(const Node &) = delete;
+        Node(Node &&) = delete;
+    };
+
+public:
+    RemoveUsingNamespaceOperation(const CppQuickFixInterface &interface,
+                                  UsingDirectiveAST *usingDirective,
+                                  bool removeAllAtGlobalScope)
+        : CppQuickFixOperation(interface, 1)
+        , m_usingDirective(usingDirective)
+        , m_removeAllAtGlobalScope(removeAllAtGlobalScope)
+    {
+        const QString name = Overview{}.prettyName(usingDirective->name->name);
+        if (m_removeAllAtGlobalScope) {
+            setDescription(Tr::tr(
+                               "Remove All Occurrences of \"using namespace %1\" in Global Scope "
+                               "and Adjust Type Names Accordingly")
+                               .arg(name));
+        } else {
+            setDescription(Tr::tr("Remove \"using namespace %1\" and "
+                                  "Adjust Type Names Accordingly")
+                               .arg(name));
+        }
+    }
+
+private:
+    std::map<Utils::FilePath, Node> buildIncludeGraph(CppRefactoringChanges &refactoring)
+    {
+        using namespace ProjectExplorer;
+        using namespace Utils;
+
+        const Snapshot &s = refactoring.snapshot();
+        std::map<Utils::FilePath, Node> includeGraph;
+
+        auto handleFile = [&](const FilePath &filePath, Document::Ptr doc, auto shouldHandle) {
+            Node &node = includeGraph[filePath];
+            node.document = doc;
+            for (const Document::Include &include : doc->resolvedIncludes()) {
+                const FilePath filePath = include.resolvedFileName();
+                if (shouldHandle(filePath)) {
+                    Node &includedNode = includeGraph[filePath];
+                    includedNode.includedBy.push_back(node);
+                    node.includes.push_back(includedNode);
+                }
+            }
+        };
+
+        if (const Project *project = ProjectManager::projectForFile(filePath())) {
+            const FilePaths files = project->files(ProjectExplorer::Project::SourceFiles);
+            QSet<FilePath> projectFiles(files.begin(), files.end());
+            for (const auto &file : files) {
+                const Document::Ptr doc = s.document(file);
+                if (!doc)
+                    continue;
+                handleFile(file, doc, [&](const FilePath &file) {
+                    return projectFiles.contains(file);
+                });
+            }
+        } else {
+            for (auto i = s.begin(); i != s.end(); ++i) {
+                if (ProjectFile::classify(i.key().toString()) != ProjectFile::Unsupported) {
+                    handleFile(i.key(), i.value(), [](const FilePath &file) {
+                        return ProjectFile::classify(file.toString()) != ProjectFile::Unsupported;
+                    });
+                }
+            }
+        }
+        for (auto &[_, node] : includeGraph) {
+            Q_UNUSED(_)
+            node.unprocessedParents = static_cast<int>(node.includes.size());
+        }
+        return includeGraph;
+    }
+
+    void removeAllUsingsAtGlobalScope(CppRefactoringChanges &refactoring)
+    {
+        auto includeGraph = buildIncludeGraph(refactoring);
+        std::vector<std::reference_wrapper<Node>> nodesWithProcessedParents;
+        for (auto &[_, node] : includeGraph) {
+            Q_UNUSED(_)
+            if (!node.unprocessedParents)
+                nodesWithProcessedParents.push_back(node);
+        }
+        while (!nodesWithProcessedParents.empty()) {
+            Node &node = nodesWithProcessedParents.back();
+            nodesWithProcessedParents.pop_back();
+            CppRefactoringFilePtr file = refactoring.cppFile(node.document->filePath());
+            const bool parentHasUsing = Utils::anyOf(node.includes, &Node::hasGlobalUsingDirective);
+            const int startPos = parentHasUsing
+                                     ? 0
+                                     : RemoveNamespaceVisitor::SearchGlobalUsingDirectivePos;
+            const bool noGlobalUsing = refactorFile(file, refactoring.snapshot(), startPos);
+            node.hasGlobalUsingDirective = !noGlobalUsing || parentHasUsing;
+
+            for (Node &subNode : node.includedBy) {
+                --subNode.unprocessedParents;
+                if (subNode.unprocessedParents == 0)
+                    nodesWithProcessedParents.push_back(subNode);
+            }
+        }
+    }
+
+    void perform() override
+    {
+        CppRefactoringChanges refactoring(snapshot());
+        if (m_removeAllAtGlobalScope) {
+            removeAllUsingsAtGlobalScope(refactoring);
+        } else if (refactorFile(currentFile(),
+                                refactoring.snapshot(),
+                                currentFile()->endOf(m_usingDirective),
+                                true)) {
+            processIncludes(refactoring, filePath());
+        }
+
+        for (auto &file : std::as_const(m_changes))
+            file->apply();
+    }
+
+    /**
+     * @brief refactorFile remove using namespace xyz in the given file and rewrite types
+     * @param file The file that should be processed
+     * @param snapshot The snapshot to work on
+     * @param startSymbol start processing after this index
+     * @param removeUsing if the using directive is in this file, remove it
+     * @return true if the using statement is global and there is no other global using namespace
+     */
+    bool refactorFile(const CppRefactoringFilePtr &file,
+                      const Snapshot &snapshot,
+                      int startSymbol,
+                      bool removeUsing = false)
+    {
+        RemoveNamespaceVisitor visitor(file.get(),
+                                       snapshot,
+                                       m_usingDirective->name->name,
+                                       startSymbol,
+                                       m_removeAllAtGlobalScope);
+        visitor.accept(file->cppDocument()->translationUnit()->ast());
+        Utils::ChangeSet changes = visitor.getChanges();
+        if (removeUsing)
+            removeLine(file.get(), m_usingDirective, changes);
+        if (!changes.isEmpty()) {
+            file->setChangeSet(changes);
+            // apply changes at the end, otherwise the symbol finder will fail to resolve symbols if
+            // the using namespace is missing
+            m_changes.insert(file);
+        }
+        return visitor.isGlobalUsingNamespace() && !visitor.foundGlobalUsingNamespace();
+    }
+
+    void processIncludes(CppRefactoringChanges &refactoring, const FilePath &filePath)
+    {
+        QList<Snapshot::IncludeLocation>
+            includeLocationsOfDocument = refactoring.snapshot().includeLocationsOfDocument(filePath);
+        for (Snapshot::IncludeLocation &loc : includeLocationsOfDocument) {
+            if (!Utils::insert(m_processed, loc.first))
+                continue;
+
+            CppRefactoringFilePtr file = refactoring.cppFile(loc.first->filePath());
+            const bool noGlobalUsing = refactorFile(file,
+                                                    refactoring.snapshot(),
+                                                    file->position(loc.second, 1));
+            if (noGlobalUsing)
+                processIncludes(refactoring, loc.first->filePath());
+        }
+    }
+
+    QSet<Document::Ptr> m_processed;
+    QSet<CppRefactoringFilePtr> m_changes;
+
+    UsingDirectiveAST *m_usingDirective;
+    bool m_removeAllAtGlobalScope;
+};
+
+//! Removes a using directive (using namespace xyz).
+class RemoveUsingNamespace : public CppQuickFixFactory
+{
+public:
+    RemoveUsingNamespace() { setClangdReplacement({10}); }
+#ifdef WITH_TESTS
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const QList<AST *> &path = interface.path();
+        // We expect something like
+        // [0] TranslationUnitAST
+        // ...
+        // [] UsingDirectiveAST : if activated at 'using namespace'
+        // [] NameAST (optional): if activated at the name e.g. 'std'
+        int n = path.size() - 1;
+        if (n <= 0)
+            return;
+        if (path.last()->asName())
+            --n;
+        UsingDirectiveAST *usingDirective = path.at(n)->asUsingDirective();
+        if (usingDirective && usingDirective->name->name->asNameId()) {
+            result << new RemoveUsingNamespaceOperation(interface, usingDirective, false);
+            const bool isHeader = ProjectFile::isHeader(ProjectFile::classify(interface.filePath().toString()));
+            if (isHeader && path.at(n - 1)->asTranslationUnit()) // using namespace at global scope
+                result << new RemoveUsingNamespaceOperation(interface, usingDirective, true);
+        }
+    }
+};
+
+#ifdef WITH_TESTS
+using namespace Tests;
+class RemoveUsingNamespaceTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test_data()
+    {
+        QTest::addColumn<QByteArray>("header1");
+        QTest::addColumn<QByteArray>("header2");
+        QTest::addColumn<QByteArray>("header3");
+        QTest::addColumn<QByteArray>("expected1");
+        QTest::addColumn<QByteArray>("expected2");
+        QTest::addColumn<QByteArray>("expected3");
+        QTest::addColumn<int>("operation");
+
+        const QByteArray header1 = "namespace std{\n"
+                                   "    template<typename T>\n"
+                                   "    class vector{};\n"
+                                   "    namespace chrono{\n"
+                                   "        using seconds = int;\n"
+                                   "    }\n"
+                                   "}\n"
+                                   "using namespace std;\n"
+                                   "namespace test{\n"
+                                   "    class vector{\n"
+                                   "       std::vector<int> ints;\n"
+                                   "    };\n"
+                                   "}\n";
+        const QByteArray header2 = "#include \"header1.h\"\n"
+                                   "using foo = test::vector;\n"
+                                   "using namespace std;\n"
+                                   "using namespace test;\n"
+                                   "vector<int> others;\n";
+
+        const QByteArray header3 = "#include \"header2.h\"\n"
+                                   "using namespace std;\n"
+                                   "using namespace chrono;\n"
+                                   "namespace test{\n"
+                                   "   vector vec;\n"
+                                   "   seconds t;\n"
+                                   "}\n"
+                                   "void scope(){\n"
+                                   "    for (;;) {\n"
+                                   "        using namespace std;\n"
+                                   "        vector<int> fori;\n"
+                                   "    }\n"
+                                   "    vector<int> no;\n"
+                                   "    using namespace std;\n"
+                                   "    vector<int> _no_change;\n"
+                                   "}\n"
+                                   "foo foos;\n";
+
+        QByteArray h3 = "#include \"header2.h\"\n"
+                        "using namespace s@td;\n"
+                        "using namespace chrono;\n"
+                        "namespace test{\n"
+                        "   vector vec;\n"
+                        "   seconds t;\n"
+                        "}\n"
+                        "void scope(){\n"
+                        "    for (;;) {\n"
+                        "        using namespace std;\n"
+                        "        vector<int> fori;\n"
+                        "    }\n"
+                        "    vector<int> no;\n"
+                        "    using namespace std;\n"
+                        "    vector<int> _no_change;\n"
+                        "}\n"
+                        "foo foos;\n";
+
+        // like header1 but without "using namespace std;\n"
+        QByteArray expected1 = "namespace std{\n"
+                               "    template<typename T>\n"
+                               "    class vector{};\n"
+                               "    namespace chrono{\n"
+                               "        using seconds = int;\n"
+                               "    }\n"
+                               "}\n"
+                               "namespace test{\n"
+                               "    class vector{\n"
+                               "       std::vector<int> ints;\n"
+                               "    };\n"
+                               "}\n";
+
+        // like header2 but without "using namespace std;\n" and with std::vector
+        QByteArray expected2 = "#include \"header1.h\"\n"
+                               "using foo = test::vector;\n"
+                               "using namespace test;\n"
+                               "std::vector<int> others;\n";
+
+        QByteArray expected3 = "#include \"header2.h\"\n"
+                               "using namespace std::chrono;\n"
+                               "namespace test{\n"
+                               "   vector vec;\n"
+                               "   seconds t;\n"
+                               "}\n"
+                               "void scope(){\n"
+                               "    for (;;) {\n"
+                               "        using namespace std;\n"
+                               "        vector<int> fori;\n"
+                               "    }\n"
+                               "    std::vector<int> no;\n"
+                               "    using namespace std;\n"
+                               "    vector<int> _no_change;\n"
+                               "}\n"
+                               "foo foos;\n";
+
+        QTest::newRow("remove only in one file local")
+            << header1 << header2 << h3 << header1 << header2 << expected3 << 0;
+        QTest::newRow("remove only in one file globally")
+            << header1 << header2 << h3 << expected1 << expected2 << expected3 << 1;
+
+        QByteArray h2 = "#include \"header1.h\"\n"
+                        "using foo = test::vector;\n"
+                        "using namespace s@td;\n"
+                        "using namespace test;\n"
+                        "vector<int> others;\n";
+
+        QTest::newRow("remove across two files only this")
+            << header1 << h2 << header3 << header1 << expected2 << header3 << 0;
+        QTest::newRow("remove across two files globally1")
+            << header1 << h2 << header3 << expected1 << expected2 << expected3 << 1;
+
+        QByteArray h1 = "namespace std{\n"
+                        "    template<typename T>\n"
+                        "    class vector{};\n"
+                        "    namespace chrono{\n"
+                        "        using seconds = int;\n"
+                        "    }\n"
+                        "}\n"
+                        "using namespace s@td;\n"
+                        "namespace test{\n"
+                        "    class vector{\n"
+                        "       std::vector<int> ints;\n"
+                        "    };\n"
+                        "}\n";
+
+        QTest::newRow("remove across tree files only this")
+            << h1 << header2 << header3 << expected1 << header2 << header3 << 0;
+        QTest::newRow("remove across tree files globally")
+            << h1 << header2 << header3 << expected1 << expected2 << expected3 << 1;
+
+        expected3 = "#include \"header2.h\"\n"
+                    "using namespace std::chrono;\n"
+                    "namespace test{\n"
+                    "   vector vec;\n"
+                    "   seconds t;\n"
+                    "}\n"
+                    "void scope(){\n"
+                    "    for (;;) {\n"
+                    "        using namespace s@td;\n"
+                    "        vector<int> fori;\n"
+                    "    }\n"
+                    "    std::vector<int> no;\n"
+                    "    using namespace std;\n"
+                    "    vector<int> _no_change;\n"
+                    "}\n"
+                    "foo foos;\n";
+
+        QByteArray expected3_new = "#include \"header2.h\"\n"
+                                   "using namespace std::chrono;\n"
+                                   "namespace test{\n"
+                                   "   vector vec;\n"
+                                   "   seconds t;\n"
+                                   "}\n"
+                                   "void scope(){\n"
+                                   "    for (;;) {\n"
+                                   "        std::vector<int> fori;\n"
+                                   "    }\n"
+                                   "    std::vector<int> no;\n"
+                                   "    using namespace std;\n"
+                                   "    vector<int> _no_change;\n"
+                                   "}\n"
+                                   "foo foos;\n";
+
+        QTest::newRow("scoped remove")
+            << expected1 << expected2 << expected3 << expected1 << expected2 << expected3_new << 0;
+
+        h2 = "#include \"header1.h\"\n"
+             "using foo = test::vector;\n"
+             "using namespace std;\n"
+             "using namespace t@est;\n"
+             "vector<int> others;\n";
+        expected2 = "#include \"header1.h\"\n"
+                    "using foo = test::vector;\n"
+                    "using namespace std;\n"
+                    "vector<int> others;\n";
+
+        QTest::newRow("existing namespace")
+            << header1 << h2 << header3 << header1 << expected2 << header3 << 1;
+
+        // test: remove using directive at global scope in every file
+        h1 = "using namespace tes@t;";
+        h2 = "using namespace test;";
+        h3 = "using namespace test;";
+
+        expected1 = expected2 = expected3 = "";
+        QTest::newRow("global scope remove in every file")
+            << h1 << h2 << h3 << expected1 << expected2 << expected3 << 1;
+
+        // test: dont print inline namespaces
+        h1 = R"--(
+namespace test {
+  inline namespace test {
+    class Foo{
+      void foo1();
+      void foo2();
+    };
+    inline int TEST = 42;
+  }
+}
+)--";
+        h2 = R"--(
+#include "header1.h"
+using namespace tes@t;
+)--";
+        h3 = R"--(
+#include "header2.h"
+Foo f1;
+test::Foo f2;
+using T1 = Foo;
+using T2 = test::Foo;
+int i1 = TEST;
+int i2 = test::TEST;
+void Foo::foo1(){};
+void test::Foo::foo2(){};
+)--";
+
+        expected1 = h1;
+        expected2 = R"--(
+#include "header1.h"
+)--";
+        expected3 = R"--(
+#include "header2.h"
+test::Foo f1;
+test::Foo f2;
+using T1 = test::Foo;
+using T2 = test::Foo;
+int i1 = test::TEST;
+int i2 = test::TEST;
+void test::Foo::foo1(){};
+void test::Foo::foo2(){};
+)--";
+        QTest::newRow("don't insert inline namespaces")
+            << h1 << h2 << h3 << expected1 << expected2 << expected3 << 0;
+    }
+
+    void test()
+    {
+        QFETCH(QByteArray, header1);
+        QFETCH(QByteArray, header2);
+        QFETCH(QByteArray, header3);
+        QFETCH(QByteArray, expected1);
+        QFETCH(QByteArray, expected2);
+        QFETCH(QByteArray, expected3);
+        QFETCH(int, operation);
+
+        QList<TestDocumentPtr> testDocuments;
+        testDocuments << CppTestDocument::create("header1.h", header1, expected1);
+        testDocuments << CppTestDocument::create("header2.h", header2, expected2);
+        testDocuments << CppTestDocument::create("header3.h", header3, expected3);
+
+        RemoveUsingNamespace factory;
+        QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), operation);
+    }
+
+    void testSimple_data()
+    {
+        QTest::addColumn<QByteArray>("header");
+        QTest::addColumn<QByteArray>("expected");
+
+        const QByteArray common = R"--(
+namespace N{
+    template<typename T>
+    struct vector{
+        using iterator = T*;
+    };
+    using int_vector = vector<int>;
+}
+)--";
+        const QByteArray header = common + R"--(
+using namespace N@;
+int_vector ints;
+int_vector::iterator intIter;
+using vec = vector<int>;
+vec::iterator it;
+)--";
+        const QByteArray expected = common + R"--(
+N::int_vector ints;
+N::int_vector::iterator intIter;
+using vec = N::vector<int>;
+vec::iterator it;
+)--";
+
+        QTest::newRow("nested typedefs with Namespace") << header << expected;
+    }
+
+    void testSimple()
+    {
+        QFETCH(QByteArray, header);
+        QFETCH(QByteArray, expected);
+
+        QList<TestDocumentPtr> testDocuments;
+        testDocuments << CppTestDocument::create("header.h", header, expected);
+
+        RemoveUsingNamespace factory;
+        QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths());
+    }
+
+    void testDifferentSymbols()
+    {
+        QByteArray header = "namespace test{\n"
+                            "  struct foo{\n"
+                            "    foo();\n"
+                            "    void bar();\n"
+                            "  };\n"
+                            "  void func();\n"
+                            "  enum E {E1, E2};\n"
+                            "  int bar;\n"
+                            "}\n"
+                            "using namespace t@est;\n"
+                            "foo::foo(){}\n"
+                            "void foo::bar(){}\n"
+                            "void test(){\n"
+                            "  int i = bar * 4;\n"
+                            "  E val = E1;\n"
+                            "  auto p = &foo::bar;\n"
+                            "  func()\n"
+                            "}\n";
+        QByteArray expected = "namespace test{\n"
+                              "  struct foo{\n"
+                              "    foo();\n"
+                              "    void bar();\n"
+                              "  };\n"
+                              "  void func();\n"
+                              "  enum E {E1, E2};\n"
+                              "  int bar;\n"
+                              "}\n"
+                              "test::foo::foo(){}\n"
+                              "void test::foo::bar(){}\n"
+                              "void test(){\n"
+                              "  int i = test::bar * 4;\n"
+                              "  test::E val = test::E1;\n"
+                              "  auto p = &test::foo::bar;\n"
+                              "  test::func()\n"
+                              "}\n";
+
+        QList<TestDocumentPtr> testDocuments;
+        testDocuments << CppTestDocument::create("file.h", header, expected);
+        RemoveUsingNamespace factory;
+        QuickFixOperationTest(testDocuments, &factory, ProjectExplorer::HeaderPaths(), 0);
+    }
+};
+
+QObject *RemoveUsingNamespace::createTest() { return new RemoveUsingNamespaceTest; }
+#endif // WITH_TESTS
+
+} // namespace
+
+void registerRemoveUsingNamespaceQuickfix()
+{
+    CppQuickFixFactory::registerFactory<RemoveUsingNamespace>();
+}
+
+} // namespace CppEditor::Internal
+
+#ifdef WITH_TESTS
+#include <removeusingnamespace.moc>
+#endif
diff --git a/src/plugins/cppeditor/quickfixes/removeusingnamespace.h b/src/plugins/cppeditor/quickfixes/removeusingnamespace.h
new file mode 100644
index 00000000000..149cbe4d09f
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/removeusingnamespace.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerRemoveUsingNamespaceQuickfix();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/rewritecomment.cpp b/src/plugins/cppeditor/quickfixes/rewritecomment.cpp
new file mode 100644
index 00000000000..3ac7fede2c5
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/rewritecomment.cpp
@@ -0,0 +1,878 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "rewritecomment.h"
+
+#include "../cppeditortr.h"
+#include "../cppeditorwidget.h"
+#include "../cpprefactoringchanges.h"
+#include "cppquickfix.h"
+
+#include <cplusplus/ASTPath.h>
+#include <cplusplus/declarationcomments.h>
+#include <projectexplorer/editorconfiguration.h>
+#include <texteditor/tabsettings.h>
+#include <texteditor/textdocument.h>
+
+#ifdef WITH_TESTS
+#include "cppquickfix_test.h"
+#include <QtTest>
+#endif
+
+using namespace CPlusPlus;
+using namespace TextEditor;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+
+class ConvertCommentStyleOp : public CppQuickFixOperation
+{
+public:
+    ConvertCommentStyleOp(const CppQuickFixInterface &interface, const QList<Token> &tokens,
+                          Kind kind)
+        : CppQuickFixOperation(interface),
+        m_tokens(tokens),
+        m_kind(kind),
+        m_wasCxxStyle(m_kind == T_CPP_COMMENT || m_kind == T_CPP_DOXY_COMMENT),
+        m_isDoxygen(m_kind == T_DOXY_COMMENT || m_kind == T_CPP_DOXY_COMMENT)
+    {
+        setDescription(m_wasCxxStyle ? Tr::tr("Convert Comment to C-Style")
+                                     : Tr::tr("Convert Comment to C++-Style"));
+    }
+
+private:
+    // Turns every line of a C-style comment into a C++-style comment and vice versa.
+    // For C++ -> C, we use one /* */ comment block per line. However, doxygen
+    // requires a single comment, so there we just replace the prefix with whitespace and
+    // add the start and end comment in extra lines.
+    // For cosmetic reasons, we offer some convenience functionality:
+    //   - Turn /***** ... into ////// ... and vice versa
+    //   - With C -> C++, remove leading asterisks.
+    //   - With C -> C++, remove the first and last line of a block if they have no content
+    //     other than the comment start and end characters.
+    //   - With C++ -> C, try to align the end comment characters.
+    // These are obviously heuristics; we do not guarantee perfect results for everybody.
+    // We also don't second-guess the users's selection: E.g. if there is an empty
+    // line between the tokens, then it's not the same doxygen comment, but we merge
+    // it anyway in C++ to C mode.
+    void perform() override
+    {
+        TranslationUnit * const tu = currentFile()->cppDocument()->translationUnit();
+        const QString newCommentStart = getNewCommentStart();
+        ChangeSet changeSet;
+        int endCommentColumn = -1;
+        const QChar oldFillChar = m_wasCxxStyle ? '/' : '*';
+        const QChar newFillChar = m_wasCxxStyle ? '*' : '/';
+
+        for (const Token &token : m_tokens) {
+            const int startPos = tu->getTokenPositionInDocument(token, textDocument());
+            const int endPos = tu->getTokenEndPositionInDocument(token, textDocument());
+
+            if (m_wasCxxStyle && m_isDoxygen) {
+                // Replace "///" characters with whitespace (to keep alignment).
+                // The insertion of "/*" and "*/" is done once after the loop.
+                changeSet.replace(startPos, startPos + 3, "   ");
+                continue;
+            }
+
+            const QTextBlock firstBlock = textDocument()->findBlock(startPos);
+            const QTextBlock lastBlock = textDocument()->findBlock(endPos);
+            for (QTextBlock block = firstBlock; block.isValid() && block.position() <= endPos;
+                 block = block.next()) {
+                const QString &blockText = block.text();
+                const int firstColumn = block == firstBlock ? startPos - block.position() : 0;
+                const int endColumn = block == lastBlock ? endPos - block.position()
+                                                         : block.length();
+
+                // Returns true if the current line looks like "/********/" or "//////////",
+                // as is often the case at the start and end of comment blocks.
+                const auto fillChecker = [&] {
+                    if (m_isDoxygen)
+                        return false;
+                    QString textToCheck = blockText;
+                    if (block == firstBlock)
+                        textToCheck.remove(0, 1);
+                    if (block == lastBlock)
+                        textToCheck.chop(block.length() - endColumn);
+                    return Utils::allOf(textToCheck, [oldFillChar](const QChar &c)
+                                        { return c == oldFillChar || c == ' ';
+                                        }) && textToCheck.count(oldFillChar) > 2;
+                };
+
+                // Returns the index of the first character of actual comment content,
+                // as opposed to visual stuff like slashes, stars or whitespace.
+                const auto indexOfActualContent = [&] {
+                    const int offset = block == firstBlock ? firstColumn + newCommentStart.length()
+                                                           : firstColumn;
+
+                    for (int i = offset, lastFillChar = -1; i < blockText.length(); ++i) {
+                        if (blockText.at(i) == oldFillChar) {
+                            lastFillChar = i;
+                            continue;
+                        }
+                        if (!blockText.at(i).isSpace())
+                            return lastFillChar + 1;
+                    }
+                    return -1;
+                };
+
+                if (fillChecker()) {
+                    const QString replacement = QString(endColumn - 1 - firstColumn, newFillChar);
+                    changeSet.replace(block.position() + firstColumn,
+                                      block.position() + endColumn - 1,
+                                      replacement);
+                    if (m_wasCxxStyle) {
+                        changeSet.replace(block.position() + firstColumn,
+                                          block.position() + firstColumn + 1, "/");
+                        changeSet.insert(block.position() + endColumn - 1, "*");
+                        endCommentColumn = endColumn - 1;
+                    }
+                    continue;
+                }
+
+                // Remove leading noise or even the entire block, if applicable.
+                const bool blockIsRemovable = (block == firstBlock || block == lastBlock)
+                                              && firstBlock != lastBlock;
+                const auto removeBlock = [&] {
+                    changeSet.remove(block.position() + firstColumn, block.position() + endColumn);
+                };
+                const int contentIndex = indexOfActualContent();
+                int removed = 0;
+                if (contentIndex == -1) {
+                    if (blockIsRemovable) {
+                        removeBlock();
+                        continue;
+                    } else if (!m_wasCxxStyle) {
+                        changeSet.replace(block.position() + firstColumn,
+                                          block.position() + endColumn - 1, newCommentStart);
+                        continue;
+                    }
+                } else if (block == lastBlock && contentIndex == endColumn - 1) {
+                    if (blockIsRemovable) {
+                        removeBlock();
+                        break;
+                    }
+                } else {
+                    changeSet.remove(block.position() + firstColumn,
+                                     block.position() + firstColumn + contentIndex);
+                    removed = contentIndex;
+                }
+
+                if (block == firstBlock) {
+                    changeSet.replace(startPos, startPos + newCommentStart.length(),
+                                      newCommentStart);
+                } else {
+                    // If the line starts with enough whitespace, replace it with the
+                    // comment start characters, so we don't move the content to the right
+                    // unnecessarily. Otherwise, insert the comment start characters.
+                    if (blockText.startsWith(QString(newCommentStart.size() + removed + 1, ' '))) {
+                        changeSet.replace(block.position(),
+                                          block.position() + newCommentStart.length(),
+                                          newCommentStart);
+                    } else {
+                        changeSet.insert(block.position(), newCommentStart);
+                    }
+                }
+
+                if (block == lastBlock) {
+                    if (m_wasCxxStyle) {
+                        // This is for proper alignment of the end comment character.
+                        if (endCommentColumn != -1) {
+                            const int endCommentPos = block.position() + endCommentColumn;
+                            if (endPos < endCommentPos)
+                                changeSet.insert(endPos, QString(endCommentPos - endPos - 1, ' '));
+                        }
+                        changeSet.insert(endPos, " */");
+                    } else {
+                        changeSet.remove(endPos - 2, endPos);
+                    }
+                }
+            }
+        }
+
+        if (m_wasCxxStyle && m_isDoxygen) {
+            const int startPos = tu->getTokenPositionInDocument(m_tokens.first(), textDocument());
+            const int endPos = tu->getTokenEndPositionInDocument(m_tokens.last(), textDocument());
+            changeSet.insert(startPos, "/*!\n");
+            changeSet.insert(endPos, "\n*/");
+        }
+
+        changeSet.apply(textDocument());
+    }
+
+    QString getNewCommentStart() const
+    {
+        if (m_wasCxxStyle) {
+            if (m_isDoxygen)
+                return "/*!";
+            return "/*";
+        }
+        if (m_isDoxygen)
+            return "//!";
+        return "//";
+    }
+
+    const QList<Token> m_tokens;
+    const Kind m_kind;
+    const bool m_wasCxxStyle;
+    const bool m_isDoxygen;
+};
+
+class MoveFunctionCommentsOp : public CppQuickFixOperation
+{
+public:
+    enum class Direction { ToDecl, ToDef };
+    MoveFunctionCommentsOp(const CppQuickFixInterface &interface, const Symbol *symbol,
+                           const QList<Token> &commentTokens, Direction direction)
+        : CppQuickFixOperation(interface), m_symbol(symbol), m_commentTokens(commentTokens)
+    {
+        setDescription(direction == Direction::ToDecl
+                           ? Tr::tr("Move Function Documentation to Declaration")
+                           : Tr::tr("Move Function Documentation to Definition"));
+    }
+
+private:
+    void perform() override
+    {
+        const CppRefactoringFilePtr file = currentFile();
+        const auto textDoc = const_cast<QTextDocument *>(file->document());
+        const int pos = file->cppDocument()->translationUnit()->getTokenPositionInDocument(
+            m_symbol->sourceLocation(), textDoc);
+        QTextCursor cursor(textDoc);
+        cursor.setPosition(pos);
+        const CursorInEditor cursorInEditor(cursor, file->filePath(), editor(),
+                                            editor()->textDocument());
+        const auto callback = [symbolLoc = m_symbol->toLink(), comments = m_commentTokens, file]
+            (const Link &link) {
+                moveComments(file, link, symbolLoc, comments);
+            };
+        NonInteractiveFollowSymbolMarker niMarker;
+        CppCodeModelSettings::setInteractiveFollowSymbol(false);
+        CppModelManager::followSymbol(cursorInEditor, callback, true, false,
+                                      FollowSymbolMode::Exact);
+    }
+
+    static void moveComments(
+        const CppRefactoringFilePtr &sourceFile,
+        const Link &targetLoc,
+        const Link &symbolLoc,
+        const QList<Token> &comments)
+    {
+        if (!targetLoc.hasValidTarget() || targetLoc.hasSameLocation(symbolLoc))
+            return;
+
+        CppRefactoringChanges changes(CppModelManager::snapshot());
+        const CppRefactoringFilePtr targetFile
+            = targetLoc.targetFilePath == symbolLoc.targetFilePath
+                  ? sourceFile
+                  : changes.cppFile(targetLoc.targetFilePath);
+        const Document::Ptr &targetCppDoc = targetFile->cppDocument();
+        const QList<AST *> targetAstPath = ASTPath(targetCppDoc)(
+            targetLoc.targetLine, targetLoc.targetColumn + 1);
+        if (targetAstPath.isEmpty())
+            return;
+        const AST *targetDeclAst = nullptr;
+        for (auto it = std::next(std::rbegin(targetAstPath));
+             it != std::rend(targetAstPath); ++it) {
+            AST * const node = *it;
+            if (node->asDeclaration()) {
+                targetDeclAst = node;
+                continue;
+            }
+            if (targetDeclAst)
+                break;
+        }
+        if (!targetDeclAst)
+            return;
+        const int insertionPos = targetCppDoc->translationUnit()->getTokenPositionInDocument(
+            targetDeclAst->firstToken(), targetFile->document());
+        const TranslationUnit * const sourceTu = sourceFile->cppDocument()->translationUnit();
+        const int sourceCommentStartPos = sourceTu->getTokenPositionInDocument(
+            comments.first(), sourceFile->document());
+        const int sourceCommentEndPos = sourceTu->getTokenEndPositionInDocument(
+            comments.last(), sourceFile->document());
+
+        // Manually adjust indentation, as both our built-in indenter and ClangFormat
+        // are unreliable with regards to comment continuation lines.
+        auto tabSettings = [](CppRefactoringFilePtr file) {
+            if (auto editor = file->editor())
+                return editor->textDocument()->tabSettings();
+            return ProjectExplorer::actualTabSettings(file->filePath(), nullptr);
+        };
+        const TabSettings &sts = tabSettings(sourceFile);
+        const TabSettings &tts = tabSettings(targetFile);
+        const QTextBlock insertionBlock = targetFile->document()->findBlock(insertionPos);
+        const int insertionColumn = tts.columnAt(insertionBlock.text(),
+                                                 insertionPos - insertionBlock.position());
+        const QTextBlock removalBlock = sourceFile->document()->findBlock(sourceCommentStartPos);
+        const QTextBlock removalBlockEnd = sourceFile->document()->findBlock(sourceCommentEndPos);
+        const int removalColumn = sts.columnAt(removalBlock.text(),
+                                               sourceCommentStartPos - removalBlock.position());
+        const int columnOffset = insertionColumn - removalColumn;
+        QString functionDoc;
+        if (columnOffset != 0) {
+            for (QTextBlock block = removalBlock;
+                 block.isValid() && block != removalBlockEnd.next();
+                 block = block.next()) {
+                QString text = block.text() + QChar::ParagraphSeparator;
+                if (block == removalBlockEnd)
+                    text = text.left(sourceCommentEndPos - block.position());
+                if (block == removalBlock) {
+                    text = text.mid(sourceCommentStartPos - block.position());
+                } else {
+                    int lineIndentColumn = sts.indentationColumn(text) + columnOffset;
+                    text.replace(0,
+                                 TabSettings::firstNonSpace(text),
+                                 tts.indentationString(0, lineIndentColumn, 0, insertionBlock));
+                }
+                functionDoc += text;
+            }
+        } else {
+            functionDoc = sourceFile->textOf(sourceCommentStartPos, sourceCommentEndPos);
+        }
+
+        // Remove comment plus leading and trailing whitespace, including trailing newline.
+        const auto removeAtSource = [&](ChangeSet &changeSet) {
+            int removalPos = sourceCommentStartPos;
+            const QChar newline(QChar::ParagraphSeparator);
+            while (true) {
+                const int prev = removalPos - 1;
+                if (prev < 0)
+                    break;
+                const QChar prevChar = sourceFile->charAt(prev);
+                if (!prevChar.isSpace() || prevChar == newline)
+                    break;
+                removalPos = prev;
+            }
+            int removalEndPos = sourceCommentEndPos;
+            while (true) {
+                if (removalEndPos == sourceFile->document()->characterCount())
+                    break;
+                const QChar nextChar = sourceFile->charAt(removalEndPos);
+                if (!nextChar.isSpace())
+                    break;
+                ++removalEndPos;
+                if (nextChar == newline)
+                    break;
+            }
+            changeSet.remove(removalPos, removalEndPos);
+        };
+
+        ChangeSet targetChangeSet;
+        targetChangeSet.insert(insertionPos, functionDoc);
+        targetChangeSet.insert(insertionPos, "\n");
+        targetChangeSet.insert(insertionPos, QString(insertionColumn, ' '));
+        if (targetFile == sourceFile)
+            removeAtSource(targetChangeSet);
+        const bool targetFileSuccess = targetFile->apply(targetChangeSet);
+        if (targetFile == sourceFile || !targetFileSuccess)
+            return;
+        ChangeSet sourceChangeSet;
+        removeAtSource(sourceChangeSet);
+        sourceFile->apply(sourceChangeSet);
+    }
+
+    const Symbol * const m_symbol;
+    const QList<Token> m_commentTokens;
+};
+
+//! Converts C-style to C++-style comments and vice versa
+class ConvertCommentStyle : public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject* createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface,
+                 TextEditor::QuickFixOperations &result) override
+    {
+        // If there's a selection, then it must entirely consist of comment tokens.
+        // If there's no selection, the cursor must be on a comment.
+        const QList<Token> &cursorTokens = interface.currentFile()->tokensForCursor();
+        if (cursorTokens.empty())
+            return;
+        if (!cursorTokens.front().isComment())
+            return;
+
+        // All tokens must be the same kind of comment, but we make an exception for doxygen comments
+        // that start with "///", as these are often not intended to be doxygen. For our purposes,
+        // we treat them as normal comments.
+        const auto effectiveKind = [&interface](const Token &token) {
+            if (token.kind() != T_CPP_DOXY_COMMENT)
+                return token.kind();
+            TranslationUnit * const tu = interface.currentFile()->cppDocument()->translationUnit();
+            const int startPos = tu->getTokenPositionInDocument(token, interface.textDocument());
+            const QString commentStart = interface.textAt(startPos, 3);
+            return commentStart == "///" ? T_CPP_COMMENT : T_CPP_DOXY_COMMENT;
+        };
+        const Kind kind = effectiveKind(cursorTokens.first());
+        for (int i = 1; i < cursorTokens.count(); ++i) {
+            if (effectiveKind(cursorTokens.at(i)) != kind)
+                return;
+        }
+
+        // Ok, all tokens are of same(ish) comment type, offer quickfix.
+        result << new ConvertCommentStyleOp(interface, cursorTokens, kind);
+    }
+};
+
+//! Moves function documentation between declaration and implementation.
+class MoveFunctionComments : public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject* createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface,
+                 TextEditor::QuickFixOperations &result) override
+    {
+        const QList<AST *> &astPath = interface.path();
+        if (astPath.isEmpty())
+            return;
+        const Symbol *symbol = nullptr;
+        MoveFunctionCommentsOp::Direction direction = MoveFunctionCommentsOp::Direction::ToDecl;
+        for (auto it = std::next(std::rbegin(astPath)); it != std::rend(astPath); ++it) {
+            if (const auto func = (*it)->asFunctionDefinition()) {
+                symbol = func->symbol;
+                direction = MoveFunctionCommentsOp::Direction::ToDecl;
+                break;
+            }
+            const auto decl = (*it)->asSimpleDeclaration();
+            if (!decl || !decl->declarator_list)
+                continue;
+            for (auto it = decl->declarator_list->begin();
+                 !symbol && it != decl->declarator_list->end(); ++it) {
+                PostfixDeclaratorListAST * const funcDecls = (*it)->postfix_declarator_list;
+                if (!funcDecls)
+                    continue;
+                for (auto it = funcDecls->begin(); it != funcDecls->end(); ++it) {
+                    if (const auto func = (*it)->asFunctionDeclarator()) {
+                        symbol = func->symbol;
+                        direction = MoveFunctionCommentsOp::Direction::ToDef;
+                        break;
+                    }
+                }
+            }
+
+        }
+        if (!symbol)
+            return;
+
+        if (const QList<Token> commentTokens = commentsForDeclaration(
+                symbol, *interface.textDocument(), interface.currentFile()->cppDocument());
+            !commentTokens.isEmpty()) {
+            result << new MoveFunctionCommentsOp(interface, symbol, commentTokens, direction);
+        }
+    }
+};
+
+#ifdef WITH_TESTS
+using namespace Tests;
+
+class ConvertCommentStyleTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test_data()
+    {
+        QTest::addColumn<QString>("input");
+        QTest::addColumn<QString>("expectedOutput");
+
+        QTest::newRow("C -> C++ / no selection / single line") << R"(
+int var1;
+/* Other comment, unaffected */
+/* Our @comment */
+/* Another unaffected comment */
+int var2;)" << R"(
+int var1;
+/* Other comment, unaffected */
+// Our comment
+/* Another unaffected comment */
+int var2;)";
+
+        QTest::newRow("C -> C++ / no selection / multi-line / preserved header and footer") << R"(
+/****************************************************
+ * some info
+ * more @info
+ ***************************************************/)" << R"(
+/////////////////////////////////////////////////////
+// some info
+// more info
+/////////////////////////////////////////////////////)";
+
+        QTest::newRow("C -> C++ / no selection / multi-line / non-preserved header and footer") << R"(
+/*
+ * some info
+ * more @info
+ */)" << R"(
+// some info
+// more info
+)";
+
+        QTest::newRow("C -> C++ / no selection / qdoc") << R"(
+/*!
+    \qmlproperty string Type::element.name
+    \qmlproperty int Type::element.id
+
+    \brief Holds the @element name and id.
+*/)" << R"(
+//! \qmlproperty string Type::element.name
+//! \qmlproperty @int Type::element.id
+//!
+//! \brief Holds the element name and id.
+)";
+
+        QTest::newRow("C -> C++ / no selection / doxygen") << R"(
+/*! \class Test
+    \brief A test class.
+
+    A more detailed @class description.
+*/)" << R"(
+//! \class Test
+//! \brief A test class.
+//!
+//! A more detailed class description.
+)";
+
+        QTest::newRow("C -> C++ / selection / single line") << R"(
+int var1;
+/* Other comment, unaffected */
+@{start}/* Our comment */@{end}
+/* Another unaffected comment */
+int var2;)" << R"(
+int var1;
+/* Other comment, unaffected */
+// Our comment
+/* Another unaffected comment */
+int var2;)";
+
+        QTest::newRow("C -> C++ / selection / multi-line / preserved header and footer") << R"(
+/****************************************************
+ * @{start}some info
+ * more info@{end}
+ ***************************************************/)" << R"(
+/////////////////////////////////////////////////////
+// some info
+// more info
+/////////////////////////////////////////////////////)";
+
+        QTest::newRow("C -> C++ / selection / multi-line / non-preserved header and footer") << R"(
+/*@{start}
+ * some in@{end}fo
+ * more info
+ */)" << R"(
+// some info
+// more info
+)";
+
+        QTest::newRow("C -> C++ / selection / qdoc") << R"(
+/*!@{start}
+    \qmlproperty string Type::element.name
+    \qmlproperty int Type::element.id
+
+    \brief Holds the element name and id.
+*/@{end})" << R"(
+//! \qmlproperty string Type::element.name
+//! \qmlproperty int Type::element.id
+//!
+//! \brief Holds the element name and id.
+)";
+
+        QTest::newRow("C -> C++ / selection / doxygen") << R"(
+/** Expand envi@{start}ronment variables in a string.
+ *
+ * Environment variables are accepted in the @{end}following forms:
+ * $SOMEVAR, ${SOMEVAR} on Unix and %SOMEVAR% on Windows.
+ * No escapes and quoting are supported.
+ * If a variable is not found, it is not substituted.
+ */)" << R"(
+//! Expand environment variables in a string.
+//!
+//! Environment variables are accepted in the following forms:
+//! $SOMEVAR, ${SOMEVAR} on Unix and %SOMEVAR% on Windows.
+//! No escapes and quoting are supported.
+//! If a variable is not found, it is not substituted.
+)";
+
+        QTest::newRow("C -> C++ / selection / multiple comments") << R"(
+@{start}/* Affected comment */
+/* Another affected comment */
+/* A third affected comment */@{end}
+/* An unaffected comment */)" << R"(
+// Affected comment
+// Another affected comment
+// A third affected comment
+/* An unaffected comment */)";
+
+        // FIXME: Remove adjacent newline along with last block
+        // FIXME: Use CppRefactoringFile to auto-indent continuation lines?
+        QTest::newRow("C -> C++, indented") << R"(
+struct S {
+    /*
+     * @This is an
+     * indented comment.
+     */
+    void func();
+)" << R"(
+struct S {
+    // This is an
+// indented comment.
+
+    void func();
+)";
+
+        QTest::newRow("C++ -> C / no selection / single line") << R"(
+// Other comment, unaffected
+// Our @comment
+// Another unaffected comment)" << R"(
+// Other comment, unaffected
+/* Our comment */
+// Another unaffected comment)";
+
+        QTest::newRow("C++ -> C / selection / single line") << R"(
+// Other comment, unaffected
+@{start}// Our comment@{end}
+// Another unaffected comment)" << R"(
+// Other comment, unaffected
+/* Our comment */
+// Another unaffected comment)";
+
+        QTest::newRow("C++ -> C / selection / multi-line / preserved header and footer") << R"(
+@{start}/////////////////////////////////////////////////////
+// some info
+// more info
+/////////////////////////////////////////////////////@{end})" << R"(
+/****************************************************/
+/* some info                                        */
+/* more info                                        */
+/****************************************************/)";
+
+        QTest::newRow("C++ -> C / selection / qdoc") << R"(
+@{start}//! \qmlproperty string Type::element.name
+//! \qmlproperty int Type::element.id
+//!
+//! \brief Holds the element name and id.@{end}
+)" << R"(
+/*!
+    \qmlproperty string Type::element.name
+    \qmlproperty int Type::element.id
+
+    \brief Holds the element name and id.
+*/
+)";
+
+        QTest::newRow("C++ -> C / selection / doxygen") << R"(
+@{start}//! \class Test
+//! \brief A test class.
+//!
+//! A more detailed class description.@{end}
+)" << R"(
+/*!
+    \class Test
+    \brief A test class.
+
+    A more detailed class description.
+*/
+)";
+    }
+
+    void test()
+    {
+        QFETCH(QString, input);
+        QFETCH(QString, expectedOutput);
+
+        ConvertCommentStyle factory;
+        QuickFixOperationTest(
+            {CppTestDocument::create("file.h", input.toUtf8(), expectedOutput.toUtf8())},
+            &factory);
+    }
+};
+
+class MoveFunctionCommentsTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test_data()
+    {
+        QTest::addColumn<QByteArrayList>("headers");
+        QTest::addColumn<QByteArrayList>("sources");
+
+        const QByteArrayList headersFuncDecl2Def{R"(
+// Function comment
+void @aFunction();
+)", R"(
+void aFunction();
+)"};
+        const QByteArrayList sourcesFuncDecl2Def{R"(
+#include "file.h"
+
+void aFunction() {}
+)", R"(
+#include "file.h"
+
+// Function comment
+void aFunction() {}
+)"};
+        QTest::newRow("function: from decl to def") << headersFuncDecl2Def << sourcesFuncDecl2Def;
+
+        const QByteArrayList headersFuncDef2Decl{R"(
+void aFunction();
+)", R"(
+/* function */
+/* comment */
+void aFunction();
+)"};
+        const QByteArrayList sourcesFuncDef2Decl{R"(
+#include "file.h"
+
+/* function */
+/* comment */
+void a@Function() {}
+)", R"(
+#include "file.h"
+
+void aFunction() {}
+)"};
+        QTest::newRow("function: from def to decl") << headersFuncDef2Decl << sourcesFuncDef2Decl;
+
+        const QByteArrayList headersFuncNoDef{R"(
+// Function comment
+void @aFunction();
+)", R"(
+// Function comment
+void aFunction();
+)"};
+        QTest::newRow("function: no def") << headersFuncNoDef << QByteArrayList();
+
+        const QByteArrayList headersFuncNoDecl{R"(
+// Function comment
+inline void @aFunction() {}
+)", R"(
+// Function comment
+inline void aFunction() {}
+)"};
+        QTest::newRow("function: no decl") << headersFuncNoDecl << QByteArrayList();
+
+        const QByteArrayList headersFuncTemplateDecl2Def{R"(
+// Function comment
+template<typename T> T @aFunction();
+
+template<typename T> inline T aFunction() { return T(); }
+)", R"(
+template<typename T> T aFunction();
+
+// Function comment
+template<typename T> inline T aFunction() { return T(); }
+)"};
+        QTest::newRow("function template: from decl to def") << headersFuncTemplateDecl2Def
+                                                             << QByteArrayList();
+
+        const QByteArrayList headersFuncTemplateDef2Decl{R"(
+template<typename T> T aFunction();
+
+// Function comment
+template<typename T> inline T @aFunction() { return T(); }
+)", R"(
+// Function comment
+template<typename T> T aFunction();
+
+template<typename T> inline T aFunction() { return T(); }
+)"};
+        QTest::newRow("function template: from def to decl") << headersFuncTemplateDef2Decl
+                                                             << QByteArrayList();
+
+        const QByteArrayList headersMemberDecl2Def{R"(
+class C {
+    /**
+      * \brief Foo::aMember
+      */
+    void @aMember();
+)", R"(
+class C {
+    void aMember();
+)"};
+        const QByteArrayList sourcesMemberDecl2Def{R"(
+#include "file.h"
+
+void C::aMember() {}
+)", R"(
+#include "file.h"
+
+/**
+  * \brief Foo::aMember
+  */
+void C::aMember() {}
+)"};
+        QTest::newRow("member function: from decl to def") << headersMemberDecl2Def
+                                                           << sourcesMemberDecl2Def;
+
+        const QByteArrayList headersMemberDef2Decl{R"(
+class C {
+    void aMember();
+)", R"(
+class C {
+    /**
+      * \brief Foo::aMember
+      */
+    void aMember();
+)"};
+        const QByteArrayList sourcesMemberDef2Decl{R"(
+#include "file.h"
+
+/**
+  * \brief Foo::aMember
+  */
+void C::aMember() {@}
+)", R"(
+#include "file.h"
+
+void C::aMember() {}
+)"};
+        QTest::newRow("member function: from def to decl") << headersMemberDef2Decl
+                                                           << sourcesMemberDef2Decl;
+    }
+
+    void test()
+    {
+        QFETCH(QByteArrayList, headers);
+        QFETCH(QByteArrayList, sources);
+
+        QList<TestDocumentPtr> documents;
+        QCOMPARE(headers.size(), 2);
+        documents << CppTestDocument::create("file.h", headers.at(0), headers.at(1));
+        if (!sources.isEmpty()) {
+            QCOMPARE(sources.size(), 2);
+            documents << CppTestDocument::create("file.cpp", sources.at(0), sources.at(1));
+        }
+        MoveFunctionComments factory;
+        QByteArray failMessage;
+        if (QByteArray(QTest::currentDataTag()) == "function template: from def to decl")
+            failMessage = "decl/def switch doesn't work for templates";
+        QuickFixOperationTest(documents, &factory, {}, {}, failMessage);
+    }
+};
+
+QObject * ConvertCommentStyle::createTest() { return new ConvertCommentStyleTest; }
+QObject * MoveFunctionComments::createTest() { return new MoveFunctionCommentsTest; }
+
+#endif
+} // namespace
+
+void registerRewriteCommentQuickfixes()
+{
+    CppQuickFixFactory::registerFactory<ConvertCommentStyle>();
+    CppQuickFixFactory::registerFactory<MoveFunctionComments>();
+}
+
+} // namespace CppEditor::Internal
+
+#ifdef WITH_TESTS
+#include <rewritecomment.moc>
+#endif
diff --git a/src/plugins/cppeditor/quickfixes/rewritecomment.h b/src/plugins/cppeditor/quickfixes/rewritecomment.h
new file mode 100644
index 00000000000..50ad0af415d
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/rewritecomment.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerRewriteCommentQuickfixes();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/rewritecontrolstatements.cpp b/src/plugins/cppeditor/quickfixes/rewritecontrolstatements.cpp
new file mode 100644
index 00000000000..2b9c2392df4
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/rewritecontrolstatements.cpp
@@ -0,0 +1,1323 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "rewritecontrolstatements.h"
+
+#include "../cppcodestylesettings.h"
+#include "../cppeditortr.h"
+#include "../cppeditorwidget.h"
+#include "../cpprefactoringchanges.h"
+#include "cppquickfix.h"
+
+#include <cplusplus/Overview.h>
+#include <cplusplus/TypeOfExpression.h>
+
+#ifdef WITH_TESTS
+#include "cppquickfix_test.h"
+#include <QTest>
+#endif
+
+using namespace CPlusPlus;
+using namespace TextEditor;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+
+template<typename Statement> Statement *asControlStatement(AST *node)
+{
+    if constexpr (std::is_same_v<Statement, IfStatementAST>)
+        return node->asIfStatement();
+    if constexpr (std::is_same_v<Statement, WhileStatementAST>)
+        return node->asWhileStatement();
+    if constexpr (std::is_same_v<Statement, ForStatementAST>)
+        return node->asForStatement();
+    if constexpr (std::is_same_v<Statement, RangeBasedForStatementAST>)
+        return node->asRangeBasedForStatement();
+    if constexpr (std::is_same_v<Statement, DoStatementAST>)
+        return node->asDoStatement();
+    return nullptr;
+}
+
+template<typename Statement>
+int triggerToken(const Statement *statement)
+{
+    if constexpr (std::is_same_v<Statement, IfStatementAST>)
+        return statement->if_token;
+    if constexpr (std::is_same_v<Statement, WhileStatementAST>)
+        return statement->while_token;
+    if constexpr (std::is_same_v<Statement, DoStatementAST>)
+        return statement->do_token;
+    if constexpr (std::is_same_v<Statement, ForStatementAST>
+                  || std::is_same_v<Statement, RangeBasedForStatementAST>) {
+        return statement->for_token;
+    }
+}
+
+template<typename Statement>
+int tokenToInsertOpeningBraceAfter(const Statement *statement)
+{
+    if constexpr (std::is_same_v<Statement, DoStatementAST>)
+        return statement->do_token;
+    return statement->rparen_token;
+}
+
+template<typename Statement> class AddBracesToControlStatementOp : public CppQuickFixOperation
+{
+public:
+    AddBracesToControlStatementOp(const CppQuickFixInterface &interface,
+                                  const QList<Statement *> &statements,
+                                  StatementAST *elseStatement,
+                                  int elseToken)
+        : CppQuickFixOperation(interface, 0)
+        , m_statements(statements), m_elseStatement(elseStatement), m_elseToken(elseToken)
+    {
+        setDescription(Tr::tr("Add Curly Braces"));
+    }
+
+    void perform() override
+    {
+        ChangeSet changes;
+        for (Statement * const statement : m_statements) {
+            const int start = currentFile()->endOf(tokenToInsertOpeningBraceAfter(statement));
+            changes.insert(start, QLatin1String(" {"));
+            if constexpr (std::is_same_v<Statement, DoStatementAST>) {
+                const int end = currentFile()->startOf(statement->while_token);
+                changes.insert(end, QLatin1String("} "));
+            } else if constexpr (std::is_same_v<Statement, IfStatementAST>) {
+                if (statement->else_statement) {
+                    changes.insert(currentFile()->startOf(statement->else_token), "} ");
+                } else {
+                    changes.insert(currentFile()->endOf(statement->statement->lastToken() - 1),
+                                   "\n}");
+                }
+
+            } else {
+                const int end = currentFile()->endOf(statement->statement->lastToken() - 1);
+                changes.insert(end, QLatin1String("\n}"));
+            }
+        }
+        if (m_elseStatement) {
+            changes.insert(currentFile()->endOf(m_elseToken), " {");
+            changes.insert(currentFile()->endOf(m_elseStatement->lastToken() - 1), "\n}");
+        }
+
+        currentFile()->setChangeSet(changes);
+        currentFile()->apply();
+    }
+
+private:
+    const QList<Statement *> m_statements;
+    StatementAST * const m_elseStatement;
+    const int m_elseToken;
+};
+
+template<typename Statement>
+bool checkControlStatementsHelper(const CppQuickFixInterface &interface, QuickFixOperations &result)
+{
+    Statement * const statement = asControlStatement<Statement>(interface.path().last());
+    if (!statement)
+        return false;
+
+    QList<Statement *> statements;
+    if (interface.isCursorOn(triggerToken(statement)) && statement->statement
+        && !statement->statement->asCompoundStatement()) {
+        statements << statement;
+    }
+
+    StatementAST *elseStmt = nullptr;
+    int elseToken = 0;
+    if constexpr (std::is_same_v<Statement, IfStatementAST>) {
+        IfStatementAST *currentIfStmt = statement;
+        for (elseStmt = currentIfStmt->else_statement, elseToken = currentIfStmt->else_token;
+             elseStmt && (currentIfStmt = elseStmt->asIfStatement());
+             elseStmt = currentIfStmt->else_statement, elseToken = currentIfStmt->else_token) {
+            if (currentIfStmt->statement && !currentIfStmt->statement->asCompoundStatement())
+                statements << currentIfStmt;
+        }
+        if (elseStmt && (elseStmt->asIfStatement() || elseStmt->asCompoundStatement())) {
+            elseStmt = nullptr;
+            elseToken = 0;
+        }
+    }
+
+    if (!statements.isEmpty() || elseStmt)
+        result << new AddBracesToControlStatementOp(interface, statements, elseStmt, elseToken);
+    return true;
+}
+
+template<typename ...Statements>
+void checkControlStatements(const CppQuickFixInterface &interface, QuickFixOperations &result)
+{
+    (... || checkControlStatementsHelper<Statements>(interface, result));
+}
+
+class MoveDeclarationOutOfIfOp: public CppQuickFixOperation
+{
+public:
+    MoveDeclarationOutOfIfOp(const CppQuickFixInterface &interface)
+        : CppQuickFixOperation(interface)
+    {
+        setDescription(Tr::tr("Move Declaration out of Condition"));
+
+        reset();
+    }
+
+    void reset()
+    {
+        condition = mk.Condition();
+        pattern = mk.IfStatement(condition);
+    }
+
+    void perform() override
+    {
+        ChangeSet changes;
+
+        changes.copy(currentFile()->range(core), currentFile()->startOf(condition));
+
+        int insertPos = currentFile()->startOf(pattern);
+        changes.move(currentFile()->range(condition), insertPos);
+        changes.insert(insertPos, QLatin1String(";\n"));
+
+        currentFile()->apply(changes);
+    }
+
+    ASTMatcher matcher;
+    ASTPatternBuilder mk;
+    ConditionAST *condition = nullptr;
+    IfStatementAST *pattern = nullptr;
+    CoreDeclaratorAST *core = nullptr;
+};
+
+class MoveDeclarationOutOfWhileOp: public CppQuickFixOperation
+{
+public:
+    MoveDeclarationOutOfWhileOp(const CppQuickFixInterface &interface)
+        : CppQuickFixOperation(interface)
+    {
+        setDescription(Tr::tr("Move Declaration out of Condition"));
+        reset();
+    }
+
+    void reset()
+    {
+        condition = mk.Condition();
+        pattern = mk.WhileStatement(condition);
+    }
+
+    void perform() override
+    {
+        ChangeSet changes;
+
+        changes.insert(currentFile()->startOf(condition), QLatin1String("("));
+        changes.insert(currentFile()->endOf(condition), QLatin1String(") != 0"));
+
+        int insertPos = currentFile()->startOf(pattern);
+        const int conditionStart = currentFile()->startOf(condition);
+        changes.move(conditionStart, currentFile()->startOf(core), insertPos);
+        changes.copy(currentFile()->range(core), insertPos);
+        changes.insert(insertPos, QLatin1String(";\n"));
+
+        currentFile()->apply(changes);
+    }
+
+    ASTMatcher matcher;
+    ASTPatternBuilder mk;
+    ConditionAST *condition = nullptr;
+    WhileStatementAST *pattern = nullptr;
+    CoreDeclaratorAST *core = nullptr;
+};
+
+class SplitIfStatementOp: public CppQuickFixOperation
+{
+public:
+    SplitIfStatementOp(const CppQuickFixInterface &interface, int priority,
+                       IfStatementAST *pattern, BinaryExpressionAST *condition)
+        : CppQuickFixOperation(interface, priority)
+        , pattern(pattern)
+        , condition(condition)
+    {
+        setDescription(Tr::tr("Split if Statement"));
+    }
+
+    void perform() override
+    {
+        const Token binaryToken = currentFile()->tokenAt(condition->binary_op_token);
+
+        if (binaryToken.is(T_AMPER_AMPER))
+            splitAndCondition();
+        else
+            splitOrCondition();
+    }
+
+    void splitAndCondition() const
+    {
+        ChangeSet changes;
+
+        int startPos = currentFile()->startOf(pattern);
+        changes.insert(startPos, QLatin1String("if ("));
+        changes.move(currentFile()->range(condition->left_expression), startPos);
+        changes.insert(startPos, QLatin1String(") {\n"));
+
+        const int lExprEnd = currentFile()->endOf(condition->left_expression);
+        changes.remove(lExprEnd, currentFile()->startOf(condition->right_expression));
+        changes.insert(currentFile()->endOf(pattern), QLatin1String("\n}"));
+
+        currentFile()->apply(changes);
+    }
+
+    void splitOrCondition() const
+    {
+        ChangeSet changes;
+
+        StatementAST *ifTrueStatement = pattern->statement;
+        CompoundStatementAST *compoundStatement = ifTrueStatement->asCompoundStatement();
+
+        int insertPos = currentFile()->endOf(ifTrueStatement);
+        if (compoundStatement)
+            changes.insert(insertPos, QLatin1String(" "));
+        else
+            changes.insert(insertPos, QLatin1String("\n"));
+        changes.insert(insertPos, QLatin1String("else if ("));
+
+        const int rExprStart = currentFile()->startOf(condition->right_expression);
+        changes.move(rExprStart, currentFile()->startOf(pattern->rparen_token), insertPos);
+        changes.insert(insertPos, QLatin1String(")"));
+
+        const int rParenEnd = currentFile()->endOf(pattern->rparen_token);
+        changes.copy(rParenEnd, currentFile()->endOf(pattern->statement), insertPos);
+
+        const int lExprEnd = currentFile()->endOf(condition->left_expression);
+        changes.remove(lExprEnd, currentFile()->startOf(condition->right_expression));
+
+        currentFile()->apply(changes);
+    }
+
+private:
+    IfStatementAST *pattern;
+    BinaryExpressionAST *condition;
+};
+
+class OptimizeForLoopOperation: public CppQuickFixOperation
+{
+public:
+    OptimizeForLoopOperation(const CppQuickFixInterface &interface, const ForStatementAST *forAst,
+                             const bool optimizePostcrement, const ExpressionAST *expression,
+                             const FullySpecifiedType &type)
+        : CppQuickFixOperation(interface)
+        , m_forAst(forAst)
+        , m_optimizePostcrement(optimizePostcrement)
+        , m_expression(expression)
+        , m_type(type)
+    {
+        setDescription(Tr::tr("Optimize for-Loop"));
+    }
+
+    void perform() override
+    {
+        QTC_ASSERT(m_forAst, return);
+
+        const CppRefactoringFilePtr file = currentFile();
+        ChangeSet change;
+
+        // Optimize post (in|de)crement operator to pre (in|de)crement operator
+        if (m_optimizePostcrement && m_forAst->expression) {
+            PostIncrDecrAST *incrdecr = m_forAst->expression->asPostIncrDecr();
+            if (incrdecr && incrdecr->base_expression && incrdecr->incr_decr_token) {
+                change.flip(file->range(incrdecr->base_expression),
+                            file->range(incrdecr->incr_decr_token));
+            }
+        }
+
+        // Optimize Condition
+        int renamePos = -1;
+        if (m_expression) {
+            QString varName = QLatin1String("total");
+
+            if (file->textOf(m_forAst->initializer).length() == 1) {
+                Overview oo = CppCodeStyleSettings::currentProjectCodeStyleOverview();
+                const QString typeAndName = oo.prettyType(m_type, varName);
+                renamePos = file->endOf(m_forAst->initializer) - 1 + typeAndName.length();
+                change.insert(file->endOf(m_forAst->initializer) - 1, // "-1" because of ";"
+                              typeAndName + QLatin1String(" = ") + file->textOf(m_expression));
+            } else {
+                // Check if varName is already used
+                if (DeclarationStatementAST *ds = m_forAst->initializer->asDeclarationStatement()) {
+                    if (DeclarationAST *decl = ds->declaration) {
+                        if (SimpleDeclarationAST *sdecl = decl->asSimpleDeclaration()) {
+                            for (;;) {
+                                bool match = false;
+                                for (DeclaratorListAST *it = sdecl->declarator_list; it;
+                                     it = it->next) {
+                                    if (file->textOf(it->value->core_declarator) == varName) {
+                                        varName += QLatin1Char('X');
+                                        match = true;
+                                        break;
+                                    }
+                                }
+                                if (!match)
+                                    break;
+                            }
+                        }
+                    }
+                }
+
+                renamePos = file->endOf(m_forAst->initializer) + 1;
+                change.insert(file->endOf(m_forAst->initializer) - 1, // "-1" because of ";"
+                              QLatin1String(", ") + varName + QLatin1String(" = ")
+                                  + file->textOf(m_expression));
+            }
+
+            ChangeSet::Range exprRange(file->startOf(m_expression), file->endOf(m_expression));
+            change.replace(exprRange, varName);
+        }
+
+        file->apply(change);
+
+        // Select variable name and trigger symbol rename
+        if (renamePos != -1) {
+            QTextCursor c = file->cursor();
+            c.setPosition(renamePos);
+            editor()->setTextCursor(c);
+            editor()->renameSymbolUnderCursor();
+            c.select(QTextCursor::WordUnderCursor);
+            editor()->setTextCursor(c);
+        }
+    }
+
+private:
+    const ForStatementAST *m_forAst;
+    const bool m_optimizePostcrement;
+    const ExpressionAST *m_expression;
+    const FullySpecifiedType m_type;
+};
+
+/*!
+  Replace
+    if (Type name = foo()) {...}
+
+  With
+    Type name = foo();
+    if (name) {...}
+
+  Activates on: the name of the introduced variable
+*/
+class MoveDeclarationOutOfIf: public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const QList<AST *> &path = interface.path();
+        using Ptr = QSharedPointer<MoveDeclarationOutOfIfOp>;
+        Ptr op(new MoveDeclarationOutOfIfOp(interface));
+
+        int index = path.size() - 1;
+        for (; index != -1; --index) {
+            if (IfStatementAST *statement = path.at(index)->asIfStatement()) {
+                if (statement->match(op->pattern, &op->matcher) && op->condition->declarator) {
+                    DeclaratorAST *declarator = op->condition->declarator;
+                    op->core = declarator->core_declarator;
+                    if (!op->core)
+                        return;
+
+                    if (interface.isCursorOn(op->core)) {
+                        op->setPriority(index);
+                        result.append(op);
+                        return;
+                    }
+
+                    op->reset();
+                }
+            }
+        }
+    }
+};
+
+/*!
+  Replace
+    while (Type name = foo()) {...}
+
+  With
+    Type name;
+    while ((name = foo()) != 0) {...}
+
+  Activates on: the name of the introduced variable
+*/
+class MoveDeclarationOutOfWhile: public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const QList<AST *> &path = interface.path();
+        QSharedPointer<MoveDeclarationOutOfWhileOp> op(new MoveDeclarationOutOfWhileOp(interface));
+
+        int index = path.size() - 1;
+        for (; index != -1; --index) {
+            if (WhileStatementAST *statement = path.at(index)->asWhileStatement()) {
+                if (statement->match(op->pattern, &op->matcher) && op->condition->declarator) {
+                    DeclaratorAST *declarator = op->condition->declarator;
+                    op->core = declarator->core_declarator;
+
+                    if (!op->core)
+                        return;
+
+                    if (!declarator->equal_token)
+                        return;
+
+                    if (!declarator->initializer)
+                        return;
+
+                    if (interface.isCursorOn(op->core)) {
+                        op->setPriority(index);
+                        result.append(op);
+                        return;
+                    }
+
+                    op->reset();
+                }
+            }
+        }
+    }
+};
+
+/*!
+  Replace
+     if (something && something_else) {
+     }
+
+  with
+     if (something)
+        if (something_else) {
+        }
+     }
+
+  and
+    if (something || something_else)
+      x;
+
+  with
+    if (something)
+      x;
+    else if (something_else)
+      x;
+
+    Activates on: && or ||
+*/
+class SplitIfStatement: public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest() { return new QObject; }
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        IfStatementAST *pattern = nullptr;
+        const QList<AST *> &path = interface.path();
+
+        int index = path.size() - 1;
+        for (; index != -1; --index) {
+            AST *node = path.at(index);
+            if (IfStatementAST *stmt = node->asIfStatement()) {
+                pattern = stmt;
+                break;
+            }
+        }
+
+        if (!pattern || !pattern->statement)
+            return;
+
+        unsigned splitKind = 0;
+        for (++index; index < path.size(); ++index) {
+            AST *node = path.at(index);
+            BinaryExpressionAST *condition = node->asBinaryExpression();
+            if (!condition)
+                return;
+
+            Token binaryToken = interface.currentFile()->tokenAt(condition->binary_op_token);
+
+            // only accept a chain of ||s or &&s - no mixing
+            if (!splitKind) {
+                splitKind = binaryToken.kind();
+                if (splitKind != T_AMPER_AMPER && splitKind != T_PIPE_PIPE)
+                    return;
+                // we can't reliably split &&s in ifs with an else branch
+                if (splitKind == T_AMPER_AMPER && pattern->else_statement)
+                    return;
+            } else if (splitKind != binaryToken.kind()) {
+                return;
+            }
+
+            if (interface.isCursorOn(condition->binary_op_token)) {
+                result << new SplitIfStatementOp(interface, index, pattern, condition);
+                return;
+            }
+        }
+    }
+};
+
+/*!
+  Add curly braces to a control statement that doesn't already contain a
+  compound statement. I.e.
+
+  if (a)
+      b;
+  becomes
+  if (a) {
+      b;
+  }
+
+  Activates on: the keyword
+*/
+class AddBracesToControlStatement : public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        if (interface.path().isEmpty())
+            return;
+        checkControlStatements<IfStatementAST,
+                               WhileStatementAST,
+                               ForStatementAST,
+                               RangeBasedForStatementAST,
+                               DoStatementAST>(interface, result);
+    }
+};
+
+/*!
+  Optimizes a for loop to avoid permanent condition check and forces to use preincrement
+  or predecrement operators in the expression of the for loop.
+ */
+class OptimizeForLoop : public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        const QList<AST *> path = interface.path();
+        ForStatementAST *forAst = nullptr;
+        if (!path.isEmpty())
+            forAst = path.last()->asForStatement();
+        if (!forAst || !interface.isCursorOn(forAst))
+            return;
+
+        // Check for optimizing a postcrement
+        const CppRefactoringFilePtr file = interface.currentFile();
+        bool optimizePostcrement = false;
+        if (forAst->expression) {
+            if (PostIncrDecrAST *incrdecr = forAst->expression->asPostIncrDecr()) {
+                const Token t = file->tokenAt(incrdecr->incr_decr_token);
+                if (t.is(T_PLUS_PLUS) || t.is(T_MINUS_MINUS))
+                    optimizePostcrement = true;
+            }
+        }
+
+        // Check for optimizing condition
+        bool optimizeCondition = false;
+        FullySpecifiedType conditionType;
+        ExpressionAST *conditionExpression = nullptr;
+        if (forAst->initializer && forAst->condition) {
+            if (BinaryExpressionAST *binary = forAst->condition->asBinaryExpression()) {
+                // Get the expression against which we should evaluate
+                IdExpressionAST *conditionId = binary->left_expression->asIdExpression();
+                if (conditionId) {
+                    conditionExpression = binary->right_expression;
+                } else {
+                    conditionId = binary->right_expression->asIdExpression();
+                    conditionExpression = binary->left_expression;
+                }
+
+                if (conditionId && conditionExpression
+                    && !(conditionExpression->asNumericLiteral()
+                         || conditionExpression->asStringLiteral()
+                         || conditionExpression->asIdExpression()
+                         || conditionExpression->asUnaryExpression())) {
+                    // Determine type of for initializer
+                    FullySpecifiedType initializerType;
+                    if (DeclarationStatementAST *stmt = forAst->initializer->asDeclarationStatement()) {
+                        if (stmt->declaration) {
+                            if (SimpleDeclarationAST *decl = stmt->declaration->asSimpleDeclaration()) {
+                                if (decl->symbols) {
+                                    if (Symbol *symbol = decl->symbols->value)
+                                        initializerType = symbol->type();
+                                }
+                            }
+                        }
+                    }
+
+                    // Determine type of for condition
+                    TypeOfExpression typeOfExpression;
+                    typeOfExpression.init(interface.semanticInfo().doc, interface.snapshot(),
+                                          interface.context().bindings());
+                    typeOfExpression.setExpandTemplates(true);
+                    Scope *scope = file->scopeAt(conditionId->firstToken());
+                    const QList<LookupItem> conditionItems = typeOfExpression(
+                        conditionId, interface.semanticInfo().doc, scope);
+                    if (!conditionItems.isEmpty())
+                        conditionType = conditionItems.first().type();
+
+                    if (conditionType.isValid()
+                        && (file->textOf(forAst->initializer) == QLatin1String(";")
+                            || initializerType == conditionType)) {
+                        optimizeCondition = true;
+                    }
+                }
+            }
+        }
+
+        if (optimizePostcrement || optimizeCondition) {
+            result << new OptimizeForLoopOperation(interface, forAst, optimizePostcrement,
+                                                   optimizeCondition ? conditionExpression : nullptr,
+                                                   conditionType);
+        }
+    }
+};
+
+#ifdef WITH_TESTS
+using namespace Tests;
+
+class MoveDeclarationOutOfIfTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test_data()
+    {
+        QTest::addColumn<QByteArray>("original");
+        QTest::addColumn<QByteArray>("expected");
+
+        QTest::newRow("ifOnly")
+            << QByteArray(
+                   "void f()\n"
+                   "{\n"
+                   "    if (Foo *@foo = g())\n"
+                   "        h();\n"
+                   "}\n")
+            << QByteArray(
+                   "void f()\n"
+                   "{\n"
+                   "    Foo *foo = g();\n"
+                   "    if (foo)\n"
+                   "        h();\n"
+                   "}\n");
+        QTest::newRow("ifElse")
+            << QByteArray(
+                   "void f()\n"
+                   "{\n"
+                   "    if (Foo *@foo = g())\n"
+                   "        h();\n"
+                   "    else\n"
+                   "        i();\n"
+                   "}\n")
+            << QByteArray(
+                   "void f()\n"
+                   "{\n"
+                   "    Foo *foo = g();\n"
+                   "    if (foo)\n"
+                   "        h();\n"
+                   "    else\n"
+                   "        i();\n"
+                   "}\n");
+
+        QTest::newRow("MoveDeclarationOutOfIf_ifElseIf")
+            << QByteArray(
+                   "void f()\n"
+                   "{\n"
+                   "    if (Foo *foo = g()) {\n"
+                   "        if (Bar *@bar = x()) {\n"
+                   "            h();\n"
+                   "            j();\n"
+                   "        }\n"
+                   "    } else {\n"
+                   "        i();\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray(
+                   "void f()\n"
+                   "{\n"
+                   "    if (Foo *foo = g()) {\n"
+                   "        Bar *bar = x();\n"
+                   "        if (bar) {\n"
+                   "            h();\n"
+                   "            j();\n"
+                   "        }\n"
+                   "    } else {\n"
+                   "        i();\n"
+                   "    }\n"
+                   "}\n");
+    }
+
+    void test()
+    {
+        QFETCH(QByteArray, original);
+        QFETCH(QByteArray, expected);
+        MoveDeclarationOutOfIf factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+};
+
+class MoveDeclarationOutOfWhileTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test_data()
+    {
+        QTest::addColumn<QByteArray>("original");
+        QTest::addColumn<QByteArray>("expected");
+
+        QTest::newRow("singleWhile")
+            << QByteArray(
+                   "void f()\n"
+                   "{\n"
+                   "    while (Foo *@foo = g())\n"
+                   "        j();\n"
+                   "}\n")
+            << QByteArray(
+                   "void f()\n"
+                   "{\n"
+                   "    Foo *foo;\n"
+                   "    while ((foo = g()) != 0)\n"
+                   "        j();\n"
+                   "}\n");
+        QTest::newRow("whileInWhile")
+            << QByteArray(
+                   "void f()\n"
+                   "{\n"
+                   "    while (Foo *foo = g()) {\n"
+                   "        while (Bar *@bar = h()) {\n"
+                   "            i();\n"
+                   "            j();\n"
+                   "        }\n"
+                   "    }\n"
+                   "}\n")
+            << QByteArray(
+                   "void f()\n"
+                   "{\n"
+                   "    while (Foo *foo = g()) {\n"
+                   "        Bar *bar;\n"
+                   "        while ((bar = h()) != 0) {\n"
+                   "            i();\n"
+                   "            j();\n"
+                   "        }\n"
+                   "    }\n"
+                   "}\n"
+                   );
+
+    }
+
+    void test()
+    {
+        QFETCH(QByteArray, original);
+        QFETCH(QByteArray, expected);
+        MoveDeclarationOutOfWhile factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+};
+
+class OptimizeForLoopTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test_data()
+    {
+        QTest::addColumn<QByteArray>("original");
+        QTest::addColumn<QByteArray>("expected");
+
+        // Check: optimize postcrement
+        QTest::newRow("OptimizeForLoop_postcrement")
+            << QByteArray("void foo() {f@or (int i = 0; i < 3; i++) {}}\n")
+            << QByteArray("void foo() {for (int i = 0; i < 3; ++i) {}}\n");
+
+        // Check: optimize condition
+        QTest::newRow("OptimizeForLoop_condition")
+            << QByteArray("void foo() {f@or (int i = 0; i < 3 + 5; ++i) {}}\n")
+            << QByteArray("void foo() {for (int i = 0, total = 3 + 5; i < total; ++i) {}}\n");
+
+        // Check: optimize fliped condition
+        QTest::newRow("OptimizeForLoop_flipedCondition")
+            << QByteArray("void foo() {f@or (int i = 0; 3 + 5 > i; ++i) {}}\n")
+            << QByteArray("void foo() {for (int i = 0, total = 3 + 5; total > i; ++i) {}}\n");
+
+        // Check: if "total" used, create other name.
+        QTest::newRow("OptimizeForLoop_alterVariableName")
+            << QByteArray("void foo() {f@or (int i = 0, total = 0; i < 3 + 5; ++i) {}}\n")
+            << QByteArray("void foo() {for (int i = 0, total = 0, totalX = 3 + 5; i < totalX; ++i) {}}\n");
+
+        // Check: optimize postcrement and condition
+        QTest::newRow("OptimizeForLoop_optimizeBoth")
+            << QByteArray("void foo() {f@or (int i = 0; i < 3 + 5; i++) {}}\n")
+            << QByteArray("void foo() {for (int i = 0, total = 3 + 5; i < total; ++i) {}}\n");
+
+        // Check: empty initializier
+        QTest::newRow("OptimizeForLoop_emptyInitializer")
+            << QByteArray("int i; void foo() {f@or (; i < 3 + 5; ++i) {}}\n")
+            << QByteArray("int i; void foo() {for (int total = 3 + 5; i < total; ++i) {}}\n");
+
+        // Check: wrong initializier type -> no trigger
+        QTest::newRow("OptimizeForLoop_wrongInitializer")
+            << QByteArray("int i; void foo() {f@or (double a = 0; i < 3 + 5; ++i) {}}\n")
+            << QByteArray();
+
+        // Check: No trigger when numeric
+        QTest::newRow("OptimizeForLoop_noTriggerNumeric1")
+            << QByteArray("void foo() {fo@r (int i = 0; i < 3; ++i) {}}\n")
+            << QByteArray();
+
+        // Check: No trigger when numeric
+        QTest::newRow("OptimizeForLoop_noTriggerNumeric2")
+            << QByteArray("void foo() {fo@r (int i = 0; i < -3; ++i) {}}\n")
+            << QByteArray();
+    }
+
+    void test()
+    {
+        QFETCH(QByteArray, original);
+        QFETCH(QByteArray, expected);
+        OptimizeForLoop factory;
+        QuickFixOperationTest(singleDocument(original, expected), &factory);
+    }
+};
+
+class AddBracesToControlStatementTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test_data()
+    {
+        QTest::addColumn<QByteArray>("original");
+        QTest::addColumn<QByteArray>("expected");
+
+        QByteArray original = R"delim(
+void MyObject::f()
+{
+    @if (true)
+        emit mySig();
+})delim";
+        QByteArray expected = R"delim(
+void MyObject::f()
+{
+    if (true) {
+        emit mySig();
+    }
+})delim";
+        QTest::newRow("if") << original << expected;
+
+        original = R"delim(
+void MyObject::f()
+{
+    @if (true)
+        emit mySig();
+    else
+        emit otherSig();
+})delim";
+        expected = R"delim(
+void MyObject::f()
+{
+    @if (true) {
+        emit mySig();
+    } else {
+        emit otherSig();
+    }
+})delim";
+        QTest::newRow("if with one else, unbraced") << original << expected;
+
+        original = R"delim(
+void MyObject::f()
+{
+    @if (true) {
+        emit mySig();
+    } else
+        emit otherSig();
+})delim";
+        expected = R"delim(
+void MyObject::f()
+{
+    @if (true) {
+        emit mySig();
+    } else {
+        emit otherSig();
+    }
+})delim";
+        QTest::newRow("if with one else, if braced") << original << expected;
+
+        original = R"delim(
+void MyObject::f()
+{
+    @if (true)
+        emit mySig();
+    else {
+        emit otherSig();
+    }
+})delim";
+        expected = R"delim(
+void MyObject::f()
+{
+    @if (true) {
+        emit mySig();
+    } else {
+        emit otherSig();
+    }
+})delim";
+        QTest::newRow("if with one else, else braced") << original << expected;
+
+        original = R"delim(
+void MyObject::f()
+{
+    @if (true) {
+        emit mySig();
+    } else {
+        emit otherSig();
+    }
+})delim";
+        expected.clear();
+        QTest::newRow("if with one else, both braced") << original << expected;
+
+        original = R"delim(
+void MyObject::f()
+{
+    @if (x == 1)
+        emit sig1();
+    else if (x == 2)
+        emit sig2();
+})delim";
+        expected = R"delim(
+void MyObject::f()
+{
+    if (x == 1) {
+        emit sig1();
+    } else if (x == 2) {
+        emit sig2();
+    }
+})delim";
+        QTest::newRow("if-else chain without final else, unbraced") << original << expected;
+
+        original = R"delim(
+void MyObject::f()
+{
+    @if (x == 1) {
+        emit sig1();
+    } else if (x == 2)
+        emit sig2();
+})delim";
+        expected = R"delim(
+void MyObject::f()
+{
+    if (x == 1) {
+        emit sig1();
+    } else if (x == 2) {
+        emit sig2();
+    }
+})delim";
+        QTest::newRow("if-else chain without final else, partially braced 1") << original << expected;
+
+        original = R"delim(
+void MyObject::f()
+{
+    @if (x == 1)
+        emit sig1();
+    else if (x == 2) {
+        emit sig2();
+    }
+})delim";
+        expected = R"delim(
+void MyObject::f()
+{
+    if (x == 1) {
+        emit sig1();
+    } else if (x == 2) {
+        emit sig2();
+    }
+})delim";
+        QTest::newRow("if-else chain without final else, partially braced 2") << original << expected;
+
+        original = R"delim(
+void MyObject::f()
+{
+    @if (x == 1) {
+        emit sig1();
+    } else if (x == 2) {
+        emit sig2();
+    }
+})delim";
+        expected.clear();
+        QTest::newRow("if-else chain without final else, fully braced") << original << expected;
+
+        original = R"delim(
+void MyObject::f()
+{
+    @if (x == 1)
+        emit sig1();
+    else if (x == 2)
+        emit sig2();
+    else if (x == 3)
+        emit sig3();
+    else
+        emit otherSig();
+})delim";
+        expected = R"delim(
+void MyObject::f()
+{
+    if (x == 1) {
+        emit sig1();
+    } else if (x == 2) {
+        emit sig2();
+    } else if (x == 3) {
+        emit sig3();
+    } else {
+        emit otherSig();
+    }
+})delim";
+        QTest::newRow("if-else chain, unbraced") << original << expected;
+
+        original = R"delim(
+void MyObject::f()
+{
+    @if (x == 1) {
+        emit sig1();
+    } else if (x == 2)
+        emit sig2();
+    else if (x == 3)
+        emit sig3();
+    else
+        emit otherSig();
+})delim";
+        expected = R"delim(
+void MyObject::f()
+{
+    if (x == 1) {
+        emit sig1();
+    } else if (x == 2) {
+        emit sig2();
+    } else if (x == 3) {
+        emit sig3();
+    } else {
+        emit otherSig();
+    }
+})delim";
+        QTest::newRow("if-else chain, partially braced 1") << original << expected;
+
+        original = R"delim(
+void MyObject::f()
+{
+    @if (x == 1)
+        emit sig1();
+    else if (x == 2) {
+        emit sig2();
+    } else if (x == 3)
+        emit sig3();
+    else
+        emit otherSig();
+})delim";
+        expected = R"delim(
+void MyObject::f()
+{
+    if (x == 1) {
+        emit sig1();
+    } else if (x == 2) {
+        emit sig2();
+    } else if (x == 3) {
+        emit sig3();
+    } else {
+        emit otherSig();
+    }
+})delim";
+        QTest::newRow("if-else chain, partially braced 2") << original << expected;
+
+        original = R"delim(
+void MyObject::f()
+{
+    @if (x == 1)
+        emit sig1();
+    else if (x == 2)
+        emit sig2();
+    else if (x == 3) {
+        emit sig3();
+    } else
+        emit otherSig();
+})delim";
+        expected = R"delim(
+void MyObject::f()
+{
+    if (x == 1) {
+        emit sig1();
+    } else if (x == 2) {
+        emit sig2();
+    } else if (x == 3) {
+        emit sig3();
+    } else {
+        emit otherSig();
+    }
+})delim";
+        QTest::newRow("if-else chain, partially braced 3") << original << expected;
+
+        original = R"delim(
+void MyObject::f()
+{
+    @if (x == 1)
+        emit sig1();
+    else if (x == 2)
+        emit sig2();
+    else if (x == 3)
+        emit sig3();
+    else {
+        emit otherSig();
+    }
+})delim";
+        expected = R"delim(
+void MyObject::f()
+{
+    if (x == 1) {
+        emit sig1();
+    } else if (x == 2) {
+        emit sig2();
+    } else if (x == 3) {
+        emit sig3();
+    } else {
+        emit otherSig();
+    }
+})delim";
+        QTest::newRow("if-else chain, partially braced 4") << original << expected;
+
+        original = R"delim(
+void MyObject::f()
+{
+    @if (x == 1) {
+        emit sig1();
+    } else if (x == 2) {
+        emit sig2();
+    } else if (x == 3) {
+        emit sig3();
+    } else {
+        emit otherSig();
+    }
+})delim";
+        expected.clear();
+        QTest::newRow("if-else chain, fully braced") << original << expected;
+
+        original = R"delim(
+void MyObject::f()
+{
+    @while (true)
+        emit mySig();
+})delim";
+        expected = R"delim(
+void MyObject::f()
+{
+    while (true) {
+        emit mySig();
+    }
+})delim";
+        QTest::newRow("while") << original << expected;
+
+        original = R"delim(
+void MyObject::f()
+{
+    @for (int i = 0; i < 10; ++i)
+        emit mySig();
+})delim";
+        expected = R"delim(
+void MyObject::f()
+{
+    for (int i = 0; i < 10; ++i) {
+        emit mySig();
+    }
+})delim";
+        QTest::newRow("for") << original << expected;
+
+        original = R"delim(
+void MyObject::f()
+{
+    @for (int i : list)
+        emit mySig();
+})delim";
+        expected = R"delim(
+void MyObject::f()
+{
+    for (int i : list) {
+        emit mySig();
+    }
+})delim";
+        QTest::newRow("range-based for") << original << expected;
+
+        original = R"delim(
+void MyObject::f()
+{
+    @do
+        emit mySig();
+    while (true);
+})delim";
+        expected = R"delim(
+void MyObject::f()
+{
+    do {
+        emit mySig();
+    } while (true);
+})delim";
+        QTest::newRow("do") << original << expected;
+
+        original = R"delim(
+void MyObject::f()
+{
+    @do {
+        emit mySig();
+    } while (true);
+})delim";
+        expected.clear();
+        QTest::newRow("already has braces") << original << expected;
+    }
+
+    void test()
+    {
+        QFETCH(QByteArray, original);
+        QFETCH(QByteArray, expected);
+
+        AddBracesToControlStatement factory;
+        QuickFixOperationTest({CppTestDocument::create("file.cpp", original, expected)}, &factory);
+    }
+};
+
+QObject *MoveDeclarationOutOfIf::createTest() { return new MoveDeclarationOutOfIfTest; }
+QObject *MoveDeclarationOutOfWhile::createTest() { return new MoveDeclarationOutOfWhileTest; }
+QObject *OptimizeForLoop::createTest() { return new OptimizeForLoopTest; }
+QObject *AddBracesToControlStatement::createTest() { return new AddBracesToControlStatementTest; }
+
+#endif // WITH_TESTS
+} // namespace
+
+void registerRewriteControlStatementQuickfixes()
+{
+    CppQuickFixFactory::registerFactory<AddBracesToControlStatement>();
+    CppQuickFixFactory::registerFactory<MoveDeclarationOutOfIf>();
+    CppQuickFixFactory::registerFactory<MoveDeclarationOutOfWhile>();
+    CppQuickFixFactory::registerFactory<OptimizeForLoop>();
+    CppQuickFixFactory::registerFactory<SplitIfStatement>();
+}
+
+} // namespace CppEditor::Internal
+
+#ifdef WITH_TESTS
+#include <rewritecontrolstatements.moc>
+#endif
diff --git a/src/plugins/cppeditor/quickfixes/rewritecontrolstatements.h b/src/plugins/cppeditor/quickfixes/rewritecontrolstatements.h
new file mode 100644
index 00000000000..d450708a4fd
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/rewritecontrolstatements.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerRewriteControlStatementQuickfixes();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/splitsimpledeclaration.cpp b/src/plugins/cppeditor/quickfixes/splitsimpledeclaration.cpp
new file mode 100644
index 00000000000..9d160d71ed3
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/splitsimpledeclaration.cpp
@@ -0,0 +1,140 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "splitsimpledeclaration.h"
+
+#include "../cppeditortr.h"
+#include "../cpprefactoringchanges.h"
+#include "cppquickfix.h"
+
+using namespace CPlusPlus;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+
+static bool checkDeclarationForSplit(SimpleDeclarationAST *declaration)
+{
+    if (!declaration->semicolon_token)
+        return false;
+
+    if (!declaration->decl_specifier_list)
+        return false;
+
+    for (SpecifierListAST *it = declaration->decl_specifier_list; it; it = it->next) {
+        SpecifierAST *specifier = it->value;
+        if (specifier->asEnumSpecifier() || specifier->asClassSpecifier())
+            return false;
+    }
+
+    return declaration->declarator_list && declaration->declarator_list->next;
+}
+
+class SplitSimpleDeclarationOp : public CppQuickFixOperation
+{
+public:
+    SplitSimpleDeclarationOp(const CppQuickFixInterface &interface, int priority,
+                             SimpleDeclarationAST *decl)
+        : CppQuickFixOperation(interface, priority)
+        , declaration(decl)
+    {
+        setDescription(Tr::tr("Split Declaration"));
+    }
+
+    void perform() override
+    {
+        ChangeSet changes;
+
+        SpecifierListAST *specifiers = declaration->decl_specifier_list;
+        int declSpecifiersStart = currentFile()->startOf(specifiers->firstToken());
+        int declSpecifiersEnd = currentFile()->endOf(specifiers->lastToken() - 1);
+        int insertPos = currentFile()->endOf(declaration->semicolon_token);
+
+        DeclaratorAST *prevDeclarator = declaration->declarator_list->value;
+
+        for (DeclaratorListAST *it = declaration->declarator_list->next; it; it = it->next) {
+            DeclaratorAST *declarator = it->value;
+
+            changes.insert(insertPos, QLatin1String("\n"));
+            changes.copy(declSpecifiersStart, declSpecifiersEnd, insertPos);
+            changes.insert(insertPos, QLatin1String(" "));
+            changes.move(currentFile()->range(declarator), insertPos);
+            changes.insert(insertPos, QLatin1String(";"));
+
+            const int prevDeclEnd = currentFile()->endOf(prevDeclarator);
+            changes.remove(prevDeclEnd, currentFile()->startOf(declarator));
+
+            prevDeclarator = declarator;
+        }
+
+        currentFile()->apply(changes);
+    }
+
+private:
+    SimpleDeclarationAST *declaration;
+};
+
+/*!
+  Rewrite
+    int *a, b;
+
+  As
+    int *a;
+    int b;
+
+  Activates on: the type or the variable names.
+*/
+class SplitSimpleDeclaration : public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest() { return new QObject; }
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        CoreDeclaratorAST *core_declarator = nullptr;
+        const QList<AST *> &path = interface.path();
+        CppRefactoringFilePtr file = interface.currentFile();
+        const int cursorPosition = file->cursor().selectionStart();
+
+        for (int index = path.size() - 1; index != -1; --index) {
+            AST *node = path.at(index);
+
+            if (CoreDeclaratorAST *coreDecl = node->asCoreDeclarator()) {
+                core_declarator = coreDecl;
+            } else if (SimpleDeclarationAST *simpleDecl = node->asSimpleDeclaration()) {
+                if (checkDeclarationForSplit(simpleDecl)) {
+                    SimpleDeclarationAST *declaration = simpleDecl;
+
+                    const int startOfDeclSpecifier = file->startOf(declaration->decl_specifier_list->firstToken());
+                    const int endOfDeclSpecifier = file->endOf(declaration->decl_specifier_list->lastToken() - 1);
+
+                    if (cursorPosition >= startOfDeclSpecifier && cursorPosition <= endOfDeclSpecifier) {
+                        // the AST node under cursor is a specifier.
+                        result << new SplitSimpleDeclarationOp(interface, index, declaration);
+                        return;
+                    }
+
+                    if (core_declarator && interface.isCursorOn(core_declarator)) {
+                        // got a core-declarator under the text cursor.
+                        result << new SplitSimpleDeclarationOp(interface, index, declaration);
+                        return;
+                    }
+                }
+
+                return;
+            }
+        }
+    }
+};
+
+} // namespace
+
+void registerSplitSimpleDeclarationQuickfix()
+{
+    CppQuickFixFactory::registerFactory<SplitSimpleDeclaration>();
+}
+
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/splitsimpledeclaration.h b/src/plugins/cppeditor/quickfixes/splitsimpledeclaration.h
new file mode 100644
index 00000000000..8c3100a9f46
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/splitsimpledeclaration.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerSplitSimpleDeclarationQuickfix();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/quickfixes/synchronizememberfunctionorder.cpp b/src/plugins/cppeditor/quickfixes/synchronizememberfunctionorder.cpp
new file mode 100644
index 00000000000..8429e6762f0
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/synchronizememberfunctionorder.cpp
@@ -0,0 +1,340 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "synchronizememberfunctionorder.h"
+
+#include "../cppeditortr.h"
+#include "../cppeditorwidget.h"
+#include "../cpprefactoringchanges.h"
+#include "cppquickfix.h"
+#include "cppquickfixhelpers.h"
+
+#include <coreplugin/editormanager/editormanager.h>
+#include <cplusplus/ASTPath.h>
+
+#include <QList>
+#include <QHash>
+
+#ifdef WITH_TESTS
+#include "cppquickfix_test.h"
+#include <projectexplorer/kitmanager.h>
+#include <texteditor/textdocument.h>
+#include <QtTest>
+#endif
+
+#include <memory>
+
+using namespace Core;
+using namespace CPlusPlus;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+
+class SynchronizeMemberFunctionOrderOp : public CppQuickFixOperation
+{
+public:
+    SynchronizeMemberFunctionOrderOp(
+        const CppQuickFixInterface &interface, const QList<Symbol *> &decls)
+        : CppQuickFixOperation(interface), m_state(std::make_shared<State>())
+    {
+        setDescription(
+            Tr::tr("Re-order Member Function Definitions According to Declaration Order"));
+        m_state->decls = decls;
+        m_state->currentFile = currentFile();
+    }
+
+private:
+    struct DefLocation {
+        Symbol *decl = nullptr;
+        Link defLoc;
+        bool operator==(const DefLocation &other) const
+        {
+            return decl == other.decl && defLoc == other.defLoc;
+        }
+    };
+    using DefLocations = QList<DefLocation>;
+    struct State {
+        using Ptr = std::shared_ptr<State>;
+
+        void insertSorted(Symbol *decl, const Link &link) {
+            DefLocations &dl = defLocations[link.targetFilePath];
+            DefLocation newElem{decl, link};
+            const auto cmp = [](const DefLocation &elem, const DefLocation &value) {
+                if (elem.defLoc.targetLine < value.defLoc.targetLine)
+                    return true;
+                if (elem.defLoc.targetLine > value.defLoc.targetLine)
+                    return false;
+                return elem.defLoc.targetColumn < value.defLoc.targetColumn;
+            };
+            dl.insert(std::lower_bound(dl.begin(), dl.end(), newElem, cmp), newElem);
+        }
+
+        QList<Symbol *> decls;
+        QHash<FilePath, DefLocations> defLocations;
+        CppRefactoringFilePtr currentFile;
+        int remainingFollowSymbolOps = 0;
+    };
+
+    void perform() override
+    {
+        for (Symbol * const decl : std::as_const(m_state->decls)) {
+            QTextCursor cursor(currentFile()->document()->begin());
+            TranslationUnit * const tu = currentFile()->cppDocument()->translationUnit();
+            const int declPos = tu->getTokenPositionInDocument(decl->sourceLocation(),
+                                                               currentFile()->document());
+            cursor.setPosition(declPos);
+            const CursorInEditor cursorInEditor(
+                cursor,
+                decl->filePath(),
+                qobject_cast<CppEditorWidget *>(currentFile()->editor()),
+                currentFile()->editor()->textDocument(),
+                currentFile()->cppDocument());
+
+            const auto callback = [decl, declPos, doc = cursor.document(), state = m_state](
+                                      const Link &link) {
+                class FinishedChecker
+                {
+                public:
+                    FinishedChecker(const State::Ptr &state) : m_state(state)
+                    {}
+                    ~FinishedChecker()
+                    {
+                        if (--m_state->remainingFollowSymbolOps == 0)
+                            finish(m_state);
+                    };
+                private:
+                    const State::Ptr &m_state;
+                } finishedChecker(state);
+
+                if (!link.hasValidTarget())
+                    return;
+                if (decl->filePath() == link.targetFilePath) {
+                    const int linkPos = Text::positionInText(doc, link.targetLine,
+                                                             link.targetColumn + 1);
+                    if (linkPos == declPos)
+                        return;
+                }
+                state->insertSorted(decl, link);
+            };
+
+            ++m_state->remainingFollowSymbolOps;
+
+            // Force queued execution, as the built-in editor can run the callback synchronously.
+            const auto followSymbol = [cursorInEditor, callback] {
+                NonInteractiveFollowSymbolMarker niMarker;
+                CppModelManager::followSymbol(
+                    cursorInEditor, callback, true, false, FollowSymbolMode::Exact);
+            };
+            QMetaObject::invokeMethod(CppModelManager::instance(), followSymbol, Qt::QueuedConnection);
+        }
+    }
+
+    static void finish(const State::Ptr &state)
+    {
+        CppRefactoringChanges factory{CppModelManager::snapshot()};
+
+        const auto findAstRange = [](const CppRefactoringFile &file, const Link &pos) {
+            const QList<AST *> astPath = ASTPath(
+                file.cppDocument())(pos.targetLine, pos.targetColumn + 1);
+            for (auto it = astPath.rbegin(); it != astPath.rend(); ++it) {
+                if (const auto funcDef = (*it)->asFunctionDefinition()) {
+                    AST *ast = funcDef;
+                    for (auto next = std::next(it);
+                         next != astPath.rend() && (*next)->asTemplateDeclaration();
+                         ++next) {
+                        ast = *next;
+                    }
+                    return file.range(ast);
+                }
+            }
+            return ChangeSet::Range();
+        };
+
+        for (auto it = state->defLocations.cbegin(); it != state->defLocations.cend(); ++it) {
+            const DefLocations &defLocsActualOrder = it.value();
+            const DefLocations defLocsExpectedOrder = Utils::sorted(
+                defLocsActualOrder, [](const DefLocation &loc1, const DefLocation &loc2) {
+                    return loc1.decl->sourceLocation() < loc2.decl->sourceLocation();
+                });
+            if (defLocsExpectedOrder == defLocsActualOrder)
+                continue;
+
+            CppRefactoringFilePtr file = it.key() == state->currentFile->filePath()
+                                             ? state->currentFile
+                                             : factory.cppFile(it.key());
+            ChangeSet changes;
+            for (int i = 0; i < defLocsActualOrder.size(); ++i) {
+                const DefLocation &actualLoc = defLocsActualOrder[i];
+                int expectedPos = -1;
+                for (int j = 0; j < defLocsExpectedOrder.size(); ++j) {
+                    if (defLocsExpectedOrder[j].decl == actualLoc.decl) {
+                        expectedPos = j;
+                        break;
+                    }
+                }
+                if (expectedPos == i)
+                    continue;
+                const ChangeSet::Range actualRange = findAstRange(*file, actualLoc.defLoc);
+                const ChangeSet::Range expectedRange
+                    = findAstRange(*file, defLocsActualOrder[expectedPos].defLoc);
+                if (actualRange.end > actualRange.start && expectedRange.end > expectedRange.start)
+                    changes.move(actualRange, expectedRange.start);
+            }
+            QTC_ASSERT(!changes.hadErrors(), continue);
+            file->setChangeSet(changes);
+            file->apply();
+        }
+    }
+
+    const State::Ptr m_state;
+};
+
+//! Ensures relative order of member function implementations is the same as declaration order.
+class SynchronizeMemberFunctionOrder : public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest();
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        ClassSpecifierAST * const classAst = astForClassOperations(interface);
+        if (!classAst || !classAst->symbol)
+            return;
+
+        QList<Symbol *> memberFunctions;
+        const TranslationUnit * const tu
+            = interface.currentFile()->cppDocument()->translationUnit();
+        for (int i = 0; i < classAst->symbol->memberCount(); ++i) {
+            Symbol *member = classAst->symbol->memberAt(i);
+
+            // Skip macros
+            if (tu->tokenAt(member->sourceLocation()).expanded())
+                continue;
+
+            if (const auto templ = member->asTemplate())
+                member = templ->declaration();
+            if (member->type()->asFunctionType() && !member->asFunction())
+                memberFunctions << member;
+        }
+        if (!memberFunctions.isEmpty())
+            result << new SynchronizeMemberFunctionOrderOp(interface, memberFunctions);
+    }
+};
+
+#ifdef WITH_TESTS
+using namespace Tests;
+
+class SynchronizeMemberFunctionOrderTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void test_data()
+    {
+        QTest::addColumn<QString>("projectName");
+        QTest::addColumn<bool>("expectChanges");
+
+        QTest::newRow("no out-of-line definitions") << "no-out-of-line" << false;
+        QTest::newRow("already sorted") << "already-sorted" << false;
+        QTest::newRow("different impl locations") << "different-locations" << true;
+        QTest::newRow("templates") << "templates" << true;
+    }
+
+    void test()
+    {
+        QFETCH(QString, projectName);
+        QFETCH(bool, expectChanges);
+        using namespace CppEditor::Tests;
+        using namespace ProjectExplorer;
+        using namespace TextEditor;
+
+        // Set up project.
+        Kit * const kit  = Utils::findOr(KitManager::kits(), nullptr, [](const Kit *k) {
+            return k->isValid() && !k->hasWarning() && k->value("QtSupport.QtInformation").isValid();
+        });
+        if (!kit)
+            QSKIP("The test requires at least one valid kit with a valid Qt");
+        const auto projectDir = std::make_unique<TemporaryCopiedDir>(
+            ":/cppeditor/testcases/reorder-member-impls/" + projectName);
+        SourceFilesRefreshGuard refreshGuard;
+        ProjectOpenerAndCloser projectMgr;
+        QVERIFY(projectMgr.open(projectDir->absolutePath(projectName + ".pro"), true, kit));
+        QVERIFY(refreshGuard.wait());
+
+        // Open header file and locate class.
+        const auto headerFilePath = projectDir->absolutePath("header.h");
+        QVERIFY2(headerFilePath.exists(), qPrintable(headerFilePath.toUserOutput()));
+        const auto editor = qobject_cast<BaseTextEditor *>(EditorManager::openEditor(headerFilePath));
+        QVERIFY(editor);
+        const auto doc = qobject_cast<TextEditor::TextDocument *>(editor->document());
+        QVERIFY(doc);
+        QTextCursor classCursor = doc->document()->find("struct S");
+        QVERIFY(!classCursor.isNull());
+        editor->setCursorPosition(classCursor.position());
+        const auto editorWidget = qobject_cast<CppEditorWidget *>(editor->editorWidget());
+        QVERIFY(editorWidget);
+        QVERIFY(TestCase::waitForRehighlightedSemanticDocument(editorWidget));
+
+        // Query factory.
+        SynchronizeMemberFunctionOrder factory;
+        CppQuickFixInterface quickFixInterface(editorWidget, ExplicitlyInvoked);
+        QuickFixOperations operations;
+        factory.match(quickFixInterface, operations);
+        operations.first()->perform();
+        if (expectChanges)
+            QVERIFY(waitForSignalOrTimeout(doc, &IDocument::saved, 30000));
+        QTest::qWait(1000);
+
+        // Compare all files.
+        const FileFilter filter({"*_expected"}, QDir::Files);
+        const FilePaths expectedDocuments = projectDir->filePath().dirEntries(filter);
+        QVERIFY(!expectedDocuments.isEmpty());
+        for (const FilePath &expected : expectedDocuments) {
+            static const QString suffix = "_expected";
+            const FilePath actual = expected.parentDir()
+                                        .pathAppended(expected.fileName().chopped(suffix.length()));
+            QVERIFY(actual.exists());
+            const auto actualContents = actual.fileContents();
+            QVERIFY(actualContents);
+            const auto expectedContents = expected.fileContents();
+            const QByteArrayList actualLines = actualContents->split('\n');
+            const QByteArrayList expectedLines = expectedContents->split('\n');
+            if (actualLines.size() != expectedLines.size()) {
+                qDebug().noquote().nospace() << "---\n" << *expectedContents << "EOF";
+                qDebug().noquote().nospace() << "+++\n" << *actualContents << "EOF";
+            }
+            QCOMPARE(actualLines.size(), expectedLines.size());
+            for (int i = 0; i < actualLines.size(); ++i) {
+                const QByteArray actualLine = actualLines.at(i);
+                const QByteArray expectedLine = expectedLines.at(i);
+                if (actualLine != expectedLine)
+                    qDebug() << "Unexpected content in line" << (i + 1) << "of file"
+                             << actual.fileName();
+                QCOMPARE(actualLine, expectedLine);
+            }
+        }
+    }
+};
+
+QObject *SynchronizeMemberFunctionOrder::createTest()
+{
+    return new SynchronizeMemberFunctionOrderTest;
+}
+
+#endif
+} // namespace
+
+void registerSynchronizeMemberFunctionOrderQuickfix()
+{
+    CppQuickFixFactory::registerFactory<SynchronizeMemberFunctionOrder>();
+}
+
+} // namespace CppEditor::Internal
+
+#ifdef WITH_TESTS
+#include <synchronizememberfunctionorder.moc>
+#endif
diff --git a/src/plugins/cppeditor/quickfixes/synchronizememberfunctionorder.h b/src/plugins/cppeditor/quickfixes/synchronizememberfunctionorder.h
new file mode 100644
index 00000000000..da6ad971dbb
--- /dev/null
+++ b/src/plugins/cppeditor/quickfixes/synchronizememberfunctionorder.h
@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerSynchronizeMemberFunctionOrderQuickfix();
+} // namespace CppEditor::Internal
diff --git a/src/plugins/cppeditor/semantichighlighter.cpp b/src/plugins/cppeditor/semantichighlighter.cpp
index d841ae19c4e..a2ae3becb79 100644
--- a/src/plugins/cppeditor/semantichighlighter.cpp
+++ b/src/plugins/cppeditor/semantichighlighter.cpp
@@ -8,7 +8,6 @@
 #include <texteditor/syntaxhighlighter.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/textdocumentlayout.h>
-#include <texteditor/syntaxhighlighterrunner.h>
 
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
@@ -67,12 +66,15 @@ void SemanticHighlighter::run()
 
 Parentheses SemanticHighlighter::getClearedParentheses(const QTextBlock &block)
 {
-    Parentheses parens = TextDocumentLayout::parentheses(block);
+    Parentheses parens;
+    if (TextBlockUserData *userData = TextDocumentLayout::textUserData(block))
+        parens = userData->parentheses();
     if (m_seenBlocks.insert(block.blockNumber()).second) {
         parens = Utils::filtered(parens, [](const Parenthesis &p) {
             return p.source != parenSource();
         });
     }
+
     return parens;
 }
 
@@ -107,7 +109,7 @@ void SemanticHighlighter::handleHighlighterResults()
     QElapsedTimer t;
     t.start();
 
-    SyntaxHighlighterRunner *highlighter = m_baseTextDocument->syntaxHighlighterRunner();
+    SyntaxHighlighter *highlighter = m_baseTextDocument->syntaxHighlighter();
     QTC_ASSERT(highlighter, return);
     incrementalApplyExtraAdditionalFormats(highlighter, m_watcher->future(), from, to, m_formatMap);
 
@@ -195,7 +197,7 @@ void SemanticHighlighter::onHighlighterFinished()
     t.start();
 
     if (!m_watcher->isCanceled() && documentRevision() == m_revision) {
-        SyntaxHighlighterRunner *highlighter = m_baseTextDocument->syntaxHighlighterRunner();
+        SyntaxHighlighter *highlighter = m_baseTextDocument->syntaxHighlighter();
         if (QTC_GUARD(highlighter)) {
             qCDebug(log) << "onHighlighterFinished() - clearing formats";
             clearExtraAdditionalFormatsUntilEnd(highlighter, m_watcher->future());
diff --git a/src/plugins/cppeditor/symbolsfindfilter.cpp b/src/plugins/cppeditor/symbolsfindfilter.cpp
index f53fd34c4d1..2888cf3604a 100644
--- a/src/plugins/cppeditor/symbolsfindfilter.cpp
+++ b/src/plugins/cppeditor/symbolsfindfilter.cpp
@@ -166,26 +166,30 @@ QWidget *SymbolsFindFilter::createConfigWidget()
     return new SymbolsFindFilterConfigWidget(this);
 }
 
-void SymbolsFindFilter::writeSettings(QtcSettings *settings)
+Store SymbolsFindFilter::save() const
 {
-    settings->beginGroup(SETTINGS_GROUP);
-    settings->setValue(SETTINGS_SYMBOLTYPES, int(m_symbolsToSearch));
-    settings->setValue(SETTINGS_SEARCHSCOPE, int(m_scope));
-    settings->endGroup();
+    Store s;
+    if (m_symbolsToSearch != SearchSymbols::AllTypes)
+        s.insert(SETTINGS_SYMBOLTYPES, int(m_symbolsToSearch));
+    if (m_scope != SymbolSearcher::SearchProjectsOnly)
+        s.insert(SETTINGS_SEARCHSCOPE, int(m_scope));
+    return s;
 }
 
-void SymbolsFindFilter::readSettings(QtcSettings *settings)
+void SymbolsFindFilter::restore(const Utils::Store &s)
 {
-    settings->beginGroup(SETTINGS_GROUP);
     m_symbolsToSearch = static_cast<SearchSymbols::SymbolTypes>(
-                settings->value(SETTINGS_SYMBOLTYPES, int(SearchSymbols::AllTypes)).toInt());
+        s.value(SETTINGS_SYMBOLTYPES, int(SearchSymbols::AllTypes)).toInt());
     m_scope = static_cast<SearchScope>(
-                settings->value(SETTINGS_SEARCHSCOPE,
-                                int(SymbolSearcher::SearchProjectsOnly)).toInt());
-    settings->endGroup();
+        s.value(SETTINGS_SEARCHSCOPE, int(SymbolSearcher::SearchProjectsOnly)).toInt());
     emit symbolsToSearchChanged();
 }
 
+QByteArray SymbolsFindFilter::settingsKey() const
+{
+    return SETTINGS_GROUP;
+}
+
 void SymbolsFindFilter::onTaskStarted(Id type)
 {
     if (type == Constants::TASK_INDEX) {
diff --git a/src/plugins/cppeditor/symbolsfindfilter.h b/src/plugins/cppeditor/symbolsfindfilter.h
index e9c997d219b..2513111cdc9 100644
--- a/src/plugins/cppeditor/symbolsfindfilter.h
+++ b/src/plugins/cppeditor/symbolsfindfilter.h
@@ -37,8 +37,8 @@ public:
     void findAll(const QString &txt, Utils::FindFlags findFlags) override;
 
     QWidget *createConfigWidget() override;
-    void writeSettings(Utils::QtcSettings *settings) override;
-    void readSettings(Utils::QtcSettings *settings) override;
+    Utils::Store save() const override;
+    void restore(const Utils::Store &s) override;
 
     void setSymbolsToSearch(const SearchSymbols::SymbolTypes &types) { m_symbolsToSearch = types; }
     SearchSymbols::SymbolTypes symbolsToSearch() const { return m_symbolsToSearch; }
@@ -46,6 +46,9 @@ public:
     void setSearchScope(SearchScope scope) { m_scope = scope; }
     SearchScope searchScope() const { return m_scope; }
 
+    // deprecated
+    QByteArray settingsKey() const override;
+
 signals:
     void symbolsToSearchChanged();
 
diff --git a/src/plugins/cppeditor/testcases/highlightingtestcase.cpp b/src/plugins/cppeditor/testcases/highlightingtestcase.cpp
index a9102ce4578..92b4e21a260 100644
--- a/src/plugins/cppeditor/testcases/highlightingtestcase.cpp
+++ b/src/plugins/cppeditor/testcases/highlightingtestcase.cpp
@@ -47,3 +47,24 @@ static void parenTest()
 
 const char* s7 = R"(
 ))";
+
+// comment
+{
+
+}
+
+/*
+ *
+ */
+{
+
+}
+
+static void parenTest2()
+{
+
+    parenTest();
+    {
+
+    }
+}
diff --git a/src/plugins/cppeditor/testcases/move-class/complex/complex.pro b/src/plugins/cppeditor/testcases/move-class/complex/complex.pro
new file mode 100644
index 00000000000..efdac1a69a8
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/complex/complex.pro
@@ -0,0 +1,2 @@
+HEADERS = theheader.h
+SOURCES = thesource.cpp main.cpp
diff --git a/src/plugins/cppeditor/testcases/move-class/complex/complex.pro_expected b/src/plugins/cppeditor/testcases/move-class/complex/complex.pro_expected
new file mode 100644
index 00000000000..9a7a0133635
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/complex/complex.pro_expected
@@ -0,0 +1,4 @@
+HEADERS = theheader.h \
+    theclass.h
+SOURCES = thesource.cpp main.cpp \
+    theclass.cpp
diff --git a/src/plugins/cppeditor/testcases/move-class/complex/main.cpp b/src/plugins/cppeditor/testcases/move-class/complex/main.cpp
new file mode 100644
index 00000000000..2934727d74f
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/complex/main.cpp
@@ -0,0 +1,11 @@
+#include "theheader.h"
+
+namespace Project {
+namespace Internal {
+bool TheClass::needsDefinition = true;
+}
+}
+
+int main()
+{
+}
diff --git a/src/plugins/cppeditor/testcases/move-class/complex/main.cpp_expected b/src/plugins/cppeditor/testcases/move-class/complex/main.cpp_expected
new file mode 100644
index 00000000000..10bdcd280ad
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/complex/main.cpp_expected
@@ -0,0 +1,11 @@
+#include "theheader.h"
+
+namespace Project {
+namespace Internal {
+
+}
+}
+
+int main()
+{
+}
diff --git a/src/plugins/cppeditor/testcases/move-class/complex/theclass.cpp_expected b/src/plugins/cppeditor/testcases/move-class/complex/theclass.cpp_expected
new file mode 100644
index 00000000000..5cb8bbb3753
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/complex/theclass.cpp_expected
@@ -0,0 +1,20 @@
+
+#include "theclass.h"
+
+namespace Project {
+namespace Internal {
+
+bool TheClass::needsDefinition = true;
+
+class TheClass::Private
+{
+    void func();
+    int m_member = 0;
+};
+
+void TheClass::defined() {}
+
+void TheClass::Private::func() {}
+
+} // namespace Internal
+} // namespace Project
diff --git a/src/plugins/cppeditor/testcases/move-class/complex/theclass.h_expected b/src/plugins/cppeditor/testcases/move-class/complex/theclass.h_expected
new file mode 100644
index 00000000000..12df0c76295
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/complex/theclass.h_expected
@@ -0,0 +1,29 @@
+#ifndef THECLASS_H
+#define THECLASS_H
+
+namespace Project {
+namespace Internal {
+
+class TheClass
+{
+public:
+    TheClass() = default;
+    
+    void defined();
+    void undefined();
+    
+    template<typename T> T defaultValue() const;
+private:
+    class Private;
+    class Undefined;
+    static inline bool doesNotNeedDefinition = true;
+    static bool needsDefinition;
+    int m_value = 0;
+};
+
+template<typename T> T TheClass::defaultValue() const { return T(); }
+
+} // namespace Internal
+} // namespace Project
+
+#endif // THECLASS_H
diff --git a/src/plugins/cppeditor/testcases/move-class/complex/theheader.h b/src/plugins/cppeditor/testcases/move-class/complex/theheader.h
new file mode 100644
index 00000000000..93f0d47a81f
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/complex/theheader.h
@@ -0,0 +1,30 @@
+#ifndef THE_HEADER_H
+#define THE_HEADER_H
+
+namespace Project {
+namespace Internal {
+
+class SomeClass {};
+class TheClass
+{
+public:
+    TheClass() = default;
+
+    void defined();
+    void undefined();
+
+    template<typename T> T defaultValue() const;
+private:
+    class Private;
+    class Undefined;
+    static inline bool doesNotNeedDefinition = true;
+    static bool needsDefinition;
+    int m_value = 0;
+};
+
+template<typename T> T TheClass::defaultValue() const { return T(); }
+
+}
+}
+
+#endif
diff --git a/src/plugins/cppeditor/testcases/move-class/complex/theheader.h_expected b/src/plugins/cppeditor/testcases/move-class/complex/theheader.h_expected
new file mode 100644
index 00000000000..65bf2ec7f4f
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/complex/theheader.h_expected
@@ -0,0 +1,18 @@
+#ifndef THE_HEADER_H
+#define THE_HEADER_H
+
+#include "theclass.h"
+
+
+namespace Project {
+namespace Internal {
+
+class SomeClass {};
+
+
+
+
+}
+}
+
+#endif
diff --git a/src/plugins/cppeditor/testcases/move-class/complex/thesource.cpp b/src/plugins/cppeditor/testcases/move-class/complex/thesource.cpp
new file mode 100644
index 00000000000..645b6a4b13b
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/complex/thesource.cpp
@@ -0,0 +1,19 @@
+#include "theheader.h"
+
+namespace Project {
+namespace Internal {
+
+static void someFunction() {}
+
+class TheClass::Private
+{
+    void func();
+    int m_member = 0;
+};
+
+void TheClass::defined() {}
+
+void TheClass::Private::func() {}
+
+}
+}
diff --git a/src/plugins/cppeditor/testcases/move-class/complex/thesource.cpp_expected b/src/plugins/cppeditor/testcases/move-class/complex/thesource.cpp_expected
new file mode 100644
index 00000000000..d84f1808085
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/complex/thesource.cpp_expected
@@ -0,0 +1,15 @@
+#include "theheader.h"
+
+namespace Project {
+namespace Internal {
+
+static void someFunction() {}
+
+
+
+
+
+
+
+}
+}
diff --git a/src/plugins/cppeditor/testcases/move-class/decl-in-source/decl-in-source.pro b/src/plugins/cppeditor/testcases/move-class/decl-in-source/decl-in-source.pro
new file mode 100644
index 00000000000..d527c86ef31
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/decl-in-source/decl-in-source.pro
@@ -0,0 +1,2 @@
+HEADERS = theheader.h
+SOURCES = thesource.cpp
diff --git a/src/plugins/cppeditor/testcases/move-class/decl-in-source/decl-in-source.pro_expected b/src/plugins/cppeditor/testcases/move-class/decl-in-source/decl-in-source.pro_expected
new file mode 100644
index 00000000000..969d1fdb802
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/decl-in-source/decl-in-source.pro_expected
@@ -0,0 +1,3 @@
+HEADERS = theheader.h \
+    theclass.h
+SOURCES = thesource.cpp
diff --git a/src/plugins/cppeditor/testcases/move-class/decl-in-source/theclass.h_expected b/src/plugins/cppeditor/testcases/move-class/decl-in-source/theclass.h_expected
new file mode 100644
index 00000000000..4af91c47e33
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/decl-in-source/theclass.h_expected
@@ -0,0 +1,11 @@
+#ifndef THECLASS_H
+#define THECLASS_H
+
+class TheClass
+{
+    void func();
+};
+
+void TheClass::func() {}
+
+#endif // THECLASS_H
diff --git a/src/plugins/cppeditor/testcases/move-class/decl-in-source/theheader.h b/src/plugins/cppeditor/testcases/move-class/decl-in-source/theheader.h
new file mode 100644
index 00000000000..9c0f94351f8
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/decl-in-source/theheader.h
@@ -0,0 +1,4 @@
+class SomeClass
+{
+    void func();
+};
diff --git a/src/plugins/cppeditor/testcases/move-class/decl-in-source/thesource.cpp b/src/plugins/cppeditor/testcases/move-class/decl-in-source/thesource.cpp
new file mode 100644
index 00000000000..79a76513095
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/decl-in-source/thesource.cpp
@@ -0,0 +1,8 @@
+#include "theheader.h"
+
+class TheClass
+{
+    void func();
+};
+void SomeClass::func() {}
+void TheClass::func() {}
diff --git a/src/plugins/cppeditor/testcases/move-class/decl-in-source/thesource.cpp_expected b/src/plugins/cppeditor/testcases/move-class/decl-in-source/thesource.cpp_expected
new file mode 100644
index 00000000000..e26225d719c
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/decl-in-source/thesource.cpp_expected
@@ -0,0 +1,6 @@
+#include "theclass.h"
+#include "theheader.h"
+
+
+void SomeClass::func() {}
+
diff --git a/src/plugins/cppeditor/testcases/move-class/header-only/header-only.pro b/src/plugins/cppeditor/testcases/move-class/header-only/header-only.pro
new file mode 100644
index 00000000000..d527c86ef31
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/header-only/header-only.pro
@@ -0,0 +1,2 @@
+HEADERS = theheader.h
+SOURCES = thesource.cpp
diff --git a/src/plugins/cppeditor/testcases/move-class/header-only/header-only.pro_expected b/src/plugins/cppeditor/testcases/move-class/header-only/header-only.pro_expected
new file mode 100644
index 00000000000..969d1fdb802
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/header-only/header-only.pro_expected
@@ -0,0 +1,3 @@
+HEADERS = theheader.h \
+    theclass.h
+SOURCES = thesource.cpp
diff --git a/src/plugins/cppeditor/testcases/move-class/header-only/theclass.h_expected b/src/plugins/cppeditor/testcases/move-class/header-only/theclass.h_expected
new file mode 100644
index 00000000000..9b1f655f3f1
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/header-only/theclass.h_expected
@@ -0,0 +1,10 @@
+#ifndef THECLASS_H
+#define THECLASS_H
+
+class TheClass {
+    void func();
+};
+
+void TheClass::func() {}
+
+#endif // THECLASS_H
diff --git a/src/plugins/cppeditor/testcases/move-class/header-only/theheader.h b/src/plugins/cppeditor/testcases/move-class/header-only/theheader.h
new file mode 100644
index 00000000000..131a6d42a64
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/header-only/theheader.h
@@ -0,0 +1,7 @@
+class SomeClass {
+    void func();
+};
+class TheClass {
+    void func();
+};
+void TheClass::func() {}
diff --git a/src/plugins/cppeditor/testcases/move-class/header-only/theheader.h_expected b/src/plugins/cppeditor/testcases/move-class/header-only/theheader.h_expected
new file mode 100644
index 00000000000..1cf9e1d06c3
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/header-only/theheader.h_expected
@@ -0,0 +1,7 @@
+#include "theclass.h"
+
+class SomeClass {
+    void func();
+};
+
+
diff --git a/src/plugins/cppeditor/testcases/move-class/header-only/thesource.cpp b/src/plugins/cppeditor/testcases/move-class/header-only/thesource.cpp
new file mode 100644
index 00000000000..d01e0845ab7
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/header-only/thesource.cpp
@@ -0,0 +1,3 @@
+#include "theheader.h"
+
+void SomeClass::func() {}
diff --git a/src/plugins/cppeditor/testcases/move-class/header-only/thesource.cpp_expected b/src/plugins/cppeditor/testcases/move-class/header-only/thesource.cpp_expected
new file mode 100644
index 00000000000..d01e0845ab7
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/header-only/thesource.cpp_expected
@@ -0,0 +1,3 @@
+#include "theheader.h"
+
+void SomeClass::func() {}
diff --git a/src/plugins/cppeditor/testcases/move-class/match1/TheClass.h b/src/plugins/cppeditor/testcases/move-class/match1/TheClass.h
new file mode 100644
index 00000000000..11b0cf15d1c
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/match1/TheClass.h
@@ -0,0 +1,2 @@
+class SomeClass {};
+class TheClass {};
diff --git a/src/plugins/cppeditor/testcases/move-class/match1/match1.pro b/src/plugins/cppeditor/testcases/move-class/match1/match1.pro
new file mode 100644
index 00000000000..72ccc46616b
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/match1/match1.pro
@@ -0,0 +1 @@
+HEADERS = TheClass.h
diff --git a/src/plugins/cppeditor/testcases/move-class/match2/match2.pro b/src/plugins/cppeditor/testcases/move-class/match2/match2.pro
new file mode 100644
index 00000000000..6f982e4f161
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/match2/match2.pro
@@ -0,0 +1 @@
+HEADERS = theclass.h
diff --git a/src/plugins/cppeditor/testcases/move-class/match2/theclass.h b/src/plugins/cppeditor/testcases/move-class/match2/theclass.h
new file mode 100644
index 00000000000..11b0cf15d1c
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/match2/theclass.h
@@ -0,0 +1,2 @@
+class SomeClass {};
+class TheClass {};
diff --git a/src/plugins/cppeditor/testcases/move-class/match3/match3.pro b/src/plugins/cppeditor/testcases/move-class/match3/match3.pro
new file mode 100644
index 00000000000..850a1138457
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/match3/match3.pro
@@ -0,0 +1 @@
+HEADERS = the_class.h
diff --git a/src/plugins/cppeditor/testcases/move-class/match3/the_class.h b/src/plugins/cppeditor/testcases/move-class/match3/the_class.h
new file mode 100644
index 00000000000..11b0cf15d1c
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/match3/the_class.h
@@ -0,0 +1,2 @@
+class SomeClass {};
+class TheClass {};
diff --git a/src/plugins/cppeditor/testcases/move-class/nested/main.cpp b/src/plugins/cppeditor/testcases/move-class/nested/main.cpp
new file mode 100644
index 00000000000..73fd1620faf
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/nested/main.cpp
@@ -0,0 +1,6 @@
+class SomeClass {};
+class Outer {
+    class Inner {};
+};
+
+int main() {}
diff --git a/src/plugins/cppeditor/testcases/move-class/nested/nested.pro b/src/plugins/cppeditor/testcases/move-class/nested/nested.pro
new file mode 100644
index 00000000000..bba41b9c127
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/nested/nested.pro
@@ -0,0 +1 @@
+SOURCES = main.cpp
diff --git a/src/plugins/cppeditor/testcases/move-class/single/single.pro b/src/plugins/cppeditor/testcases/move-class/single/single.pro
new file mode 100644
index 00000000000..77db8b92e42
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/single/single.pro
@@ -0,0 +1 @@
+HEADERS = theheader.h
diff --git a/src/plugins/cppeditor/testcases/move-class/single/theheader.h b/src/plugins/cppeditor/testcases/move-class/single/theheader.h
new file mode 100644
index 00000000000..5f7cd967308
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/single/theheader.h
@@ -0,0 +1,2 @@
+class Private;
+class TheClass {};
diff --git a/src/plugins/cppeditor/testcases/move-class/template/template.pro b/src/plugins/cppeditor/testcases/move-class/template/template.pro
new file mode 100644
index 00000000000..77db8b92e42
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/template/template.pro
@@ -0,0 +1 @@
+HEADERS = theheader.h
diff --git a/src/plugins/cppeditor/testcases/move-class/template/template.pro_expected b/src/plugins/cppeditor/testcases/move-class/template/template.pro_expected
new file mode 100644
index 00000000000..0ed81f00082
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/template/template.pro_expected
@@ -0,0 +1,2 @@
+HEADERS = theheader.h \
+    theclass.h
diff --git a/src/plugins/cppeditor/testcases/move-class/template/theclass.h_expected b/src/plugins/cppeditor/testcases/move-class/template/theclass.h_expected
new file mode 100644
index 00000000000..f9681cc796d
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/template/theclass.h_expected
@@ -0,0 +1,11 @@
+#ifndef THECLASS_H
+#define THECLASS_H
+
+template<typename T> class TheClass
+{
+    T defaultValue() const;
+};
+
+template<typename T> inline T TheClass<T>::defaultValue() const { return T(); }
+
+#endif // THECLASS_H
diff --git a/src/plugins/cppeditor/testcases/move-class/template/theheader.h b/src/plugins/cppeditor/testcases/move-class/template/theheader.h
new file mode 100644
index 00000000000..58f7a073722
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/template/theheader.h
@@ -0,0 +1,7 @@
+enum SomeEnum { E };
+template<typename T> class TheClass
+{
+    T defaultValue() const;
+};
+
+template<typename T> inline T TheClass<T>::defaultValue() const { return T(); }
diff --git a/src/plugins/cppeditor/testcases/move-class/template/theheader.h_expected b/src/plugins/cppeditor/testcases/move-class/template/theheader.h_expected
new file mode 100644
index 00000000000..20087c3199c
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/move-class/template/theheader.h_expected
@@ -0,0 +1,6 @@
+#include "theclass.h"
+
+enum SomeEnum { E };
+
+
+
diff --git a/src/plugins/cppeditor/testcases/reorder-member-impls/already-sorted/already-sorted.pro b/src/plugins/cppeditor/testcases/reorder-member-impls/already-sorted/already-sorted.pro
new file mode 100644
index 00000000000..70518012691
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/reorder-member-impls/already-sorted/already-sorted.pro
@@ -0,0 +1 @@
+HEADERS = header.h
diff --git a/src/plugins/cppeditor/testcases/reorder-member-impls/already-sorted/header.h b/src/plugins/cppeditor/testcases/reorder-member-impls/already-sorted/header.h
new file mode 100644
index 00000000000..c0d7e0caa77
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/reorder-member-impls/already-sorted/header.h
@@ -0,0 +1,9 @@
+struct S {
+    void firstFunction();
+    void secondFunction();
+    void thirdFunction();
+};
+
+void S::firstFunction() {}
+void S::secondFunction() {}
+void S::thirdFunction() {}
diff --git a/src/plugins/cppeditor/testcases/reorder-member-impls/already-sorted/header.h_expected b/src/plugins/cppeditor/testcases/reorder-member-impls/already-sorted/header.h_expected
new file mode 100644
index 00000000000..c0d7e0caa77
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/reorder-member-impls/already-sorted/header.h_expected
@@ -0,0 +1,9 @@
+struct S {
+    void firstFunction();
+    void secondFunction();
+    void thirdFunction();
+};
+
+void S::firstFunction() {}
+void S::secondFunction() {}
+void S::thirdFunction() {}
diff --git a/src/plugins/cppeditor/testcases/reorder-member-impls/different-locations/different-locations.pro b/src/plugins/cppeditor/testcases/reorder-member-impls/different-locations/different-locations.pro
new file mode 100644
index 00000000000..a8dd832020e
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/reorder-member-impls/different-locations/different-locations.pro
@@ -0,0 +1,2 @@
+SOURCES = impl1.cpp impl2.cpp
+HEADERS = header.h
diff --git a/src/plugins/cppeditor/testcases/reorder-member-impls/different-locations/header.h b/src/plugins/cppeditor/testcases/reorder-member-impls/different-locations/header.h
new file mode 100644
index 00000000000..15a428eb7cb
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/reorder-member-impls/different-locations/header.h
@@ -0,0 +1,15 @@
+struct S {
+    void firstFunction();
+    void secondFunction();
+    void thirdFunction() {}
+    void fourthFunction();
+    void fifthFunction();
+    void sixthFunction();
+    void seventhFunction();
+    void eighthFunction();
+    void ninthFunction();
+    void tenthFunction();
+};
+
+void S::tenthFunction() {}
+void S::fourthFunction() {}
diff --git a/src/plugins/cppeditor/testcases/reorder-member-impls/different-locations/header.h_expected b/src/plugins/cppeditor/testcases/reorder-member-impls/different-locations/header.h_expected
new file mode 100644
index 00000000000..eeec93f300a
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/reorder-member-impls/different-locations/header.h_expected
@@ -0,0 +1,15 @@
+struct S {
+    void firstFunction();
+    void secondFunction();
+    void thirdFunction() {}
+    void fourthFunction();
+    void fifthFunction();
+    void sixthFunction();
+    void seventhFunction();
+    void eighthFunction();
+    void ninthFunction();
+    void tenthFunction();
+};
+
+void S::fourthFunction() {}
+void S::tenthFunction() {}
diff --git a/src/plugins/cppeditor/testcases/reorder-member-impls/different-locations/impl1.cpp b/src/plugins/cppeditor/testcases/reorder-member-impls/different-locations/impl1.cpp
new file mode 100644
index 00000000000..816fef17796
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/reorder-member-impls/different-locations/impl1.cpp
@@ -0,0 +1,5 @@
+#include "header.h"
+
+void S::ninthFunction() {}
+void S::firstFunction() {}
+void S::secondFunction() {}
diff --git a/src/plugins/cppeditor/testcases/reorder-member-impls/different-locations/impl1.cpp_expected b/src/plugins/cppeditor/testcases/reorder-member-impls/different-locations/impl1.cpp_expected
new file mode 100644
index 00000000000..24d0f3a212b
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/reorder-member-impls/different-locations/impl1.cpp_expected
@@ -0,0 +1,5 @@
+#include "header.h"
+
+void S::firstFunction() {}
+void S::secondFunction() {}
+void S::ninthFunction() {}
diff --git a/src/plugins/cppeditor/testcases/reorder-member-impls/different-locations/impl2.cpp b/src/plugins/cppeditor/testcases/reorder-member-impls/different-locations/impl2.cpp
new file mode 100644
index 00000000000..f1040e089ec
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/reorder-member-impls/different-locations/impl2.cpp
@@ -0,0 +1,6 @@
+#include "header.h"
+
+void S::eighthFunction() {}
+void S::seventhFunction() {}
+void S::sixthFunction() {}
+void S::fifthFunction() {}
diff --git a/src/plugins/cppeditor/testcases/reorder-member-impls/different-locations/impl2.cpp_expected b/src/plugins/cppeditor/testcases/reorder-member-impls/different-locations/impl2.cpp_expected
new file mode 100644
index 00000000000..2b65df96a5a
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/reorder-member-impls/different-locations/impl2.cpp_expected
@@ -0,0 +1,6 @@
+#include "header.h"
+
+void S::fifthFunction() {}
+void S::sixthFunction() {}
+void S::seventhFunction() {}
+void S::eighthFunction() {}
diff --git a/src/plugins/cppeditor/testcases/reorder-member-impls/no-out-of-line/header.h b/src/plugins/cppeditor/testcases/reorder-member-impls/no-out-of-line/header.h
new file mode 100644
index 00000000000..cff89451279
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/reorder-member-impls/no-out-of-line/header.h
@@ -0,0 +1,5 @@
+struct S {
+    void firstFunction() {}
+    void secondFunction();
+    void thirdFunction() {}
+};
diff --git a/src/plugins/cppeditor/testcases/reorder-member-impls/no-out-of-line/header.h_expected b/src/plugins/cppeditor/testcases/reorder-member-impls/no-out-of-line/header.h_expected
new file mode 100644
index 00000000000..cff89451279
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/reorder-member-impls/no-out-of-line/header.h_expected
@@ -0,0 +1,5 @@
+struct S {
+    void firstFunction() {}
+    void secondFunction();
+    void thirdFunction() {}
+};
diff --git a/src/plugins/cppeditor/testcases/reorder-member-impls/no-out-of-line/no-out-of-line.pro b/src/plugins/cppeditor/testcases/reorder-member-impls/no-out-of-line/no-out-of-line.pro
new file mode 100644
index 00000000000..70518012691
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/reorder-member-impls/no-out-of-line/no-out-of-line.pro
@@ -0,0 +1 @@
+HEADERS = header.h
diff --git a/src/plugins/cppeditor/testcases/reorder-member-impls/templates/header.h b/src/plugins/cppeditor/testcases/reorder-member-impls/templates/header.h
new file mode 100644
index 00000000000..08b33a51d98
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/reorder-member-impls/templates/header.h
@@ -0,0 +1,10 @@
+template <typename T> struct S {
+    void firstFunction();
+    template<typename U> void secondFunction(U);
+    template<typename U> void irrelevantFunction(U) {}
+    void thirdFunction();
+};
+
+template<typename T> template<typename U> void S<T>::secondFunction(U) {}
+template<typename T> void S<T>::thirdFunction() {}
+template<typename T> void S<T>::firstFunction() {}
diff --git a/src/plugins/cppeditor/testcases/reorder-member-impls/templates/header.h_expected b/src/plugins/cppeditor/testcases/reorder-member-impls/templates/header.h_expected
new file mode 100644
index 00000000000..f182bbe62d4
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/reorder-member-impls/templates/header.h_expected
@@ -0,0 +1,10 @@
+template <typename T> struct S {
+    void firstFunction();
+    template<typename U> void secondFunction(U);
+    template<typename U> void irrelevantFunction(U) {}
+    void thirdFunction();
+};
+
+template<typename T> void S<T>::firstFunction() {}
+template<typename T> template<typename U> void S<T>::secondFunction(U) {}
+template<typename T> void S<T>::thirdFunction() {}
diff --git a/src/plugins/cppeditor/testcases/reorder-member-impls/templates/templates.pro b/src/plugins/cppeditor/testcases/reorder-member-impls/templates/templates.pro
new file mode 100644
index 00000000000..70518012691
--- /dev/null
+++ b/src/plugins/cppeditor/testcases/reorder-member-impls/templates/templates.pro
@@ -0,0 +1 @@
+HEADERS = header.h
diff --git a/src/plugins/ctfvisualizer/CtfVisualizer.json.in b/src/plugins/ctfvisualizer/CtfVisualizer.json.in
index 1b4b91a6d5a..1b6f891cb7e 100644
--- a/src/plugins/ctfvisualizer/CtfVisualizer.json.in
+++ b/src/plugins/ctfvisualizer/CtfVisualizer.json.in
@@ -13,7 +13,11 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Code Analyzer",
-    "Description" : "Chrome Trace Format Visualizer Plugin.",
+    "Description" : "View Chrome Trace Format (CTF) files.",
+    "LongDescription" : [
+        "You also need:",
+            "- CTF files (in Trace Event Format)"
+    ],
     "Url" : "https://www.kdab.com",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/ctfvisualizer/ctftimelinemodel.cpp b/src/plugins/ctfvisualizer/ctftimelinemodel.cpp
index 01288772760..2a2a8860120 100644
--- a/src/plugins/ctfvisualizer/ctftimelinemodel.cpp
+++ b/src/plugins/ctfvisualizer/ctftimelinemodel.cpp
@@ -29,7 +29,7 @@ CtfTimelineModel::CtfTimelineModel(Timeline::TimelineModelAggregator *parent,
 {
     updateName();
     setCollapsedRowCount(1);
-    setCategoryColor(colorByHue(qHash(pid)));
+    setCategoryColor(colorByHue(int(qHash(pid))));
     setHasMixedTypesInExpandedState(true);
 }
 
diff --git a/src/plugins/cvs/CVS.json.in b/src/plugins/cvs/CVS.json.in
index 6d2f92ea78a..0ac2a7283b4 100644
--- a/src/plugins/cvs/CVS.json.in
+++ b/src/plugins/cvs/CVS.json.in
@@ -13,9 +13,10 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Version Control",
-    "Description" : "CVS integration.",
+    "Description" : "Access the CVS open source version control system.",
+    "LongDescription" : [],
     "DisabledByDefault" : true,
-    "Url" : "http://www.qt.io",
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
 
     "Mimetypes" : [
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index 01c47b1646f..4d6a8e51789 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -333,13 +333,13 @@ Utils::Id CvsPluginPrivate::id() const
 
 bool CvsPluginPrivate::isVcsFileOrDirectory(const Utils::FilePath &filePath) const
 {
-    return filePath.isDir()
-            && !filePath.fileName().compare("CVS", Utils::HostOsInfo::fileNameCaseSensitivity());
+    return !filePath.fileName().compare("CVS", Utils::HostOsInfo::fileNameCaseSensitivity())
+           && filePath.isDir();
 }
 
 bool CvsPluginPrivate::isConfigured() const
 {
-    const FilePath binary = settings().binaryPath();
+    const FilePath binary = settings().binaryPath.effectiveBinary();
     if (binary.isEmpty())
         return false;
     QFileInfo fi = binary.toFileInfo();
diff --git a/src/plugins/debugger/CMakeLists.txt b/src/plugins/debugger/CMakeLists.txt
index 8f338dd9819..fc405a7fe3a 100644
--- a/src/plugins/debugger/CMakeLists.txt
+++ b/src/plugins/debugger/CMakeLists.txt
@@ -33,6 +33,7 @@ add_qtc_plugin(Debugger
     dap/dapclient.cpp dap/dapclient.h
     dap/dapengine.cpp dap/dapengine.h
     dap/gdbdapengine.cpp dap/gdbdapengine.h
+    dap/lldbdapengine.cpp dap/lldbdapengine.h
     dap/pydapengine.cpp dap/pydapengine.h
     debugger.qrc
     debugger_global.h
diff --git a/src/plugins/debugger/Debugger.json.in b/src/plugins/debugger/Debugger.json.in
index 06df0489d6c..c86d3988bf3 100644
--- a/src/plugins/debugger/Debugger.json.in
+++ b/src/plugins/debugger/Debugger.json.in
@@ -13,8 +13,14 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Qt Creator",
-    "Description" : "Debugger integration.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Debug applications with native debuggers.",
+    "LongDescription" : [
+        "Debug an application to see what happens inside it while it runs or when it crashes.",
+        "The debugger extension acts as an interface between the Qt Creator core and native debuggers.",
+        "You also need:",
+            "- A debugger"
+    ],
+    "Url" : "https://www.qt.io",
     "Arguments" : [
         {
             "Name" : "-debug",
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index a3f6cc2f11c..3d907d20be6 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -1637,6 +1637,8 @@ bool BreakHandler::contextMenuEvent(const ItemViewEvent &ev)
     //                     bp.setThreadSpec(threadId);
     //           });
 
+    menu->addSeparator();
+
     addAction(this, menu,
               selectedBreakpoints.size() > 1
                   ? breakpointsEnabled ? Tr::tr("Disable Selected Breakpoints") : Tr::tr("Enable Selected Breakpoints")
@@ -1651,6 +1653,37 @@ bool BreakHandler::contextMenuEvent(const ItemViewEvent &ev)
               }
     );
 
+    QList<Breakpoint> enabledBreakpoints;
+    QList<Breakpoint> disabledBreakpoints;
+    forItemsAtLevel<1>([&enabledBreakpoints, &disabledBreakpoints](Breakpoint bp) {
+        if (bp) {
+            if (bp->isEnabled())
+                enabledBreakpoints.append(bp);
+            else
+                disabledBreakpoints.append(bp);
+         }
+    });
+
+    addAction(this, menu, Tr::tr("Disable All Breakpoints"),
+              !enabledBreakpoints.isEmpty(),
+              [this, enabledBreakpoints] {
+        for (Breakpoint bp : enabledBreakpoints) {
+            if (GlobalBreakpoint gbp = bp->globalBreakpoint())
+                gbp->setEnabled(false, false);
+            requestBreakpointEnabling(bp, false);
+        }
+    });
+
+    addAction(this, menu, Tr::tr("Enable All Breakpoints"),
+              !disabledBreakpoints.isEmpty(),
+              [this, disabledBreakpoints] {
+        for (Breakpoint bp : disabledBreakpoints) {
+            if (GlobalBreakpoint gbp = bp->globalBreakpoint())
+                gbp->setEnabled(true, false);
+            requestBreakpointEnabling(bp, true);
+        }
+    });
+
     addAction(this, menu,
               selectedLocations.size() > 1
                   ? locationsEnabled ? Tr::tr("Disable Selected Locations") : Tr::tr("Enable Selected Locations")
@@ -2661,6 +2694,31 @@ bool BreakpointManager::contextMenuEvent(const ItemViewEvent &ev)
               }
     );
 
+    QList<GlobalBreakpoint> enabledBreakpoints;
+    QList<GlobalBreakpoint> disabledBreakpoints;
+    forItemsAtLevel<1>([&enabledBreakpoints, &disabledBreakpoints](GlobalBreakpoint gbp) {
+        if (gbp) {
+            if (gbp->isEnabled())
+                enabledBreakpoints.append(gbp);
+            else
+                disabledBreakpoints.append(gbp);
+         }
+    });
+
+    addAction(this, menu, Tr::tr("Disable All Breakpoints"),
+              !enabledBreakpoints.isEmpty(),
+              [enabledBreakpoints] {
+        for (GlobalBreakpoint gbp : enabledBreakpoints)
+            gbp->setEnabled(false);
+    });
+
+    addAction(this, menu, Tr::tr("Enable All Breakpoints"),
+              !disabledBreakpoints.isEmpty(),
+              [disabledBreakpoints] {
+        for (GlobalBreakpoint gbp : disabledBreakpoints)
+            gbp->setEnabled(true);
+    });
+
     menu->addSeparator();
 
     addAction(this, menu, Tr::tr("Delete All Breakpoints"),
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 44999e55618..840f78dfc93 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -282,7 +282,7 @@ void CdbEngine::setupEngine()
     DebuggerRunParameters sp = runParameters();
     if (terminal()) {
         m_effectiveStartMode = AttachToLocalProcess;
-        sp.inferior.command = CommandLine();
+        sp.inferior.command = {};
         sp.attachPID = ProcessHandle(terminal()->applicationPid());
         sp.startMode = AttachToLocalProcess;
         sp.useTerminal = false; // Force no terminal.
@@ -1042,6 +1042,8 @@ void CdbEngine::doUpdateLocals(const UpdateParameters &updateParameters)
         cmd.arg("partialvar", updateParameters.partialVariable);
         cmd.arg("qobjectnames", s.showQObjectNames());
         cmd.arg("timestamps", s.logTimeStamps());
+        cmd.arg("qtversion", runParameters().qtVersion);
+        cmd.arg("qtnamespace", runParameters().qtNamespace);
 
         StackFrame frame = stackHandler()->currentFrame();
         cmd.arg("context", frame.context);
@@ -2774,7 +2776,7 @@ void CdbEngine::setupScripting(const DebuggerResponse &response)
             showMessage("Reading " + codeFile.toUserOutput(), LogInput);
             runCommand({QString("module = types.ModuleType('%1')").arg(module), ScriptCommand});
             runCommand({QString("code = bytes.fromhex('%1').decode('utf-8')")
-                            .arg(QString::fromUtf8(code->toHex())), ScriptCommand | DebuggerCommand::Silent});
+                            .arg(QString::fromUtf8(code->toHex())), ScriptCommand | Silent});
             runCommand({QString("exec(code, module.__dict__)"), ScriptCommand});
             runCommand({QString("sys.modules['%1'] = module").arg(module), ScriptCommand});
             runCommand({QString("import %1").arg(module), ScriptCommand});
@@ -2798,7 +2800,7 @@ void CdbEngine::setupScripting(const DebuggerResponse &response)
     }
 
     const FilePath path = settings().extraDumperFile();
-    if (!path.isEmpty() && path.isReadableFile()) {
+    if (path.isReadableFile()) {
         DebuggerCommand cmd("theDumper.addDumperModule", ScriptCommand);
         cmd.arg("path", path.path());
         runCommand(cmd);
@@ -2809,10 +2811,6 @@ void CdbEngine::setupScripting(const DebuggerResponse &response)
             runCommand({command, ScriptCommand});
     }
 
-    DebuggerCommand cmd0("theDumper.setFallbackQtVersion", ScriptCommand);
-    cmd0.arg("version", runParameters().fallbackQtVersion);
-    runCommand(cmd0);
-
     runCommand({"theDumper.loadDumpers(None)", ScriptCommand,
                 [this](const DebuggerResponse &response) {
                     watchHandler()->addDumpers(response.data["result"]["dumpers"]);
diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h
index e5c50b8e413..dfb4a2664b2 100644
--- a/src/plugins/debugger/cdb/cdbengine.h
+++ b/src/plugins/debugger/cdb/cdbengine.h
@@ -108,6 +108,7 @@ private:
     };
     enum CommandFlags {
         NoFlags = 0,
+        Silent = DebuggerCommand::Silent,
         BuiltinCommand = DebuggerCommand::Silent << 1,
         ExtensionCommand = DebuggerCommand::Silent << 2,
         ScriptCommand = DebuggerCommand::Silent << 3
diff --git a/src/plugins/debugger/commonoptionspage.cpp b/src/plugins/debugger/commonoptionspage.cpp
index bb24d674a09..b7c56541b82 100644
--- a/src/plugins/debugger/commonoptionspage.cpp
+++ b/src/plugins/debugger/commonoptionspage.cpp
@@ -157,7 +157,7 @@ CommonSettings::CommonSettings()
         };
 
         return Column {
-            Group { title("Behavior"), Row { col1, col2, st } },
+            Group { title(Tr::tr("Behavior")), Row { col1, col2, st } },
             sourcePathMap,
             st
         };
@@ -266,7 +266,6 @@ LocalsAndExpressionsSettings::LocalsAndExpressionsSettings()
 
     extraDumperCommands.setSettingsKey(debugModeGroup, "GdbCustomDumperCommands");
     extraDumperCommands.setDisplayStyle(StringAspect::TextEditDisplay);
-    extraDumperCommands.setUseGlobalMacroExpander();
     extraDumperCommands.setToolTip("<html><head/><body><p>"
                         + Tr::tr("Python commands entered here will be executed after built-in "
                              "debugging helpers have been loaded and fully initialized. You can "
diff --git a/src/plugins/debugger/commonoptionspage.h b/src/plugins/debugger/commonoptionspage.h
index 5bf41af7a41..4d391280e81 100644
--- a/src/plugins/debugger/commonoptionspage.h
+++ b/src/plugins/debugger/commonoptionspage.h
@@ -25,7 +25,7 @@ public:
     void fromMap(const Utils::Store &map) override;
     void toMap(Utils::Store &map) const override;
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     void readSettings() override;
     void writeSettings() const override;
diff --git a/src/plugins/debugger/console/console.cpp b/src/plugins/debugger/console/console.cpp
index b1ee0dac83e..d7f3cb23343 100644
--- a/src/plugins/debugger/console/console.cpp
+++ b/src/plugins/debugger/console/console.cpp
@@ -27,6 +27,8 @@ const char SHOW_LOG[] = "showLog";
 const char SHOW_WARNING[] = "showWarning";
 const char SHOW_ERROR[] = "showError";
 
+using namespace Utils;
+
 namespace Debugger::Internal {
 
 /////////////////////////////////////////////////////////////////////
@@ -90,8 +92,8 @@ Console::Console()
     m_showDebug.setLabelText(Tr::tr("Show debug, log, and info messages."));
     m_showDebug.setToolTip(Tr::tr("Show debug, log, and info messages."));
     m_showDebug.setValue(true);
-    m_showDebug.action()->setIcon(Utils::Icons::INFO_TOOLBAR.icon());
-    connect(&m_showDebug, &Utils::BoolAspect::changed,
+    m_showDebug.setIcon(Icons::INFO_TOOLBAR.icon());
+    connect(&m_showDebug, &BoolAspect::changed,
             proxyModel, [this, proxyModel] { proxyModel->setShowLogs(m_showDebug()); });
     m_showDebugButton->setDefaultAction(m_showDebug.action());
 
@@ -102,8 +104,8 @@ Console::Console()
     m_showWarning.setLabelText(Tr::tr("Show warning messages."));
     m_showWarning.setToolTip(Tr::tr("Show warning messages."));
     m_showWarning.setValue(true);
-    m_showWarning.action()->setIcon(Utils::Icons::WARNING_TOOLBAR.icon());
-    connect(m_showWarning.action(), &QAction::toggled,
+    m_showWarning.setIcon(Icons::WARNING_TOOLBAR.icon());
+    connect(&m_showWarning, &BoolAspect::changed,
             proxyModel, [this, proxyModel] { proxyModel->setShowWarnings(m_showWarning()); });
     m_showWarningButton->setDefaultAction(m_showWarning.action());
 
@@ -114,8 +116,8 @@ Console::Console()
     m_showError.setLabelText(Tr::tr("Show error messages."));
     m_showError.setToolTip(Tr::tr("Show error messages."));
     m_showError.setValue(true);
-    m_showError.action()->setIcon(Utils::Icons::CRITICAL_TOOLBAR.icon());
-    connect(m_showError.action(), &QAction::toggled,
+    m_showError.setIcon(Icons::CRITICAL_TOOLBAR.icon());
+    connect(&m_showError, &BoolAspect::changed,
             proxyModel, [this, proxyModel] { proxyModel->setShowErrors(m_showError()); });
     m_showErrorButton->setDefaultAction(m_showError.action());
 
diff --git a/src/plugins/debugger/console/consoleitemdelegate.cpp b/src/plugins/debugger/console/consoleitemdelegate.cpp
index 8f76704b703..cd7ead6de8e 100644
--- a/src/plugins/debugger/console/consoleitemdelegate.cpp
+++ b/src/plugins/debugger/console/consoleitemdelegate.cpp
@@ -53,7 +53,6 @@ QColor ConsoleItemDelegate::drawBackground(QPainter *painter, const QRect &rect,
 void ConsoleItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
                                    const QModelIndex &index) const
 {
-    const Utils::Theme *theme = Utils::creatorTheme();
     QStyleOptionViewItem opt = option;
     initStyleOption(&opt, index);
     painter->save();
@@ -65,23 +64,23 @@ void ConsoleItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &o
                 ConsoleItem::TypeRole).toInt();
     switch (type) {
     case ConsoleItem::DebugType:
-        textColor = theme->color(Utils::Theme::OutputPanes_NormalMessageTextColor);
+        textColor = creatorColor(Utils::Theme::OutputPanes_NormalMessageTextColor);
         taskIcon = m_logIcon;
         break;
     case ConsoleItem::WarningType:
-        textColor = theme->color(Utils::Theme::OutputPanes_WarningMessageTextColor);
+        textColor = creatorColor(Utils::Theme::OutputPanes_WarningMessageTextColor);
         taskIcon = m_warningIcon;
         break;
     case ConsoleItem::ErrorType:
-        textColor = theme->color(Utils::Theme::OutputPanes_ErrorMessageTextColor);
+        textColor = creatorColor(Utils::Theme::OutputPanes_ErrorMessageTextColor);
         taskIcon = m_errorIcon;
         break;
     case ConsoleItem::InputType:
-        textColor = theme->color(Utils::Theme::TextColorNormal);
+        textColor = creatorColor(Utils::Theme::TextColorNormal);
         taskIcon = m_prompt;
         break;
     default:
-        textColor = theme->color(Utils::Theme::TextColorNormal);
+        textColor = creatorColor(Utils::Theme::TextColorNormal);
         break;
     }
 
diff --git a/src/plugins/debugger/console/consoleview.cpp b/src/plugins/debugger/console/consoleview.cpp
index d42f4ae9185..de68944e8f4 100644
--- a/src/plugins/debugger/console/consoleview.cpp
+++ b/src/plugins/debugger/console/consoleview.cpp
@@ -162,9 +162,8 @@ void ConsoleView::onRowActivated(const QModelIndex &index)
 
     const Utils::FilePath fp
         = m_finder.findFile(model()->data(index, ConsoleItem::FileRole).toString()).constFirst();
-    if (fp.exists() && fp.isFile() && fp.isReadableFile()) {
+    if (fp.isReadableFile())
         Core::EditorManager::openEditorAt({fp, model()->data(index, ConsoleItem::LineRole).toInt()});
-    }
 }
 
 void ConsoleView::copyToClipboard(const QModelIndex &index)
diff --git a/src/plugins/debugger/dap/dapclient.cpp b/src/plugins/debugger/dap/dapclient.cpp
index 00fe60da022..c7839d55822 100644
--- a/src/plugins/debugger/dap/dapclient.cpp
+++ b/src/plugins/debugger/dap/dapclient.cpp
@@ -237,6 +237,10 @@ void DapClient::emitSignals(const QJsonDocument &doc)
             type = DapResponseType::SetBreakpoints;
         } else if (command == "setFunctionBreakpoints") {
             type = DapResponseType::SetFunctionBreakpoints;
+        } else if (command == "attach") {
+            type = DapResponseType::Attach;
+        } else if (command == "launch") {
+            type = DapResponseType::Launch;
         }
         emit responseReady(type, ob);
         return;
diff --git a/src/plugins/debugger/dap/dapclient.h b/src/plugins/debugger/dap/dapclient.h
index 92acb0ddb1a..268e1e1f37f 100644
--- a/src/plugins/debugger/dap/dapclient.h
+++ b/src/plugins/debugger/dap/dapclient.h
@@ -54,6 +54,8 @@ enum class DapResponseType
     Evaluate,
     SetBreakpoints,
     SetFunctionBreakpoints,
+    Attach,
+    Launch,
     Unknown
 };
 
diff --git a/src/plugins/debugger/dap/dapengine.cpp b/src/plugins/debugger/dap/dapengine.cpp
index d2f94b9feeb..da659921c2e 100644
--- a/src/plugins/debugger/dap/dapengine.cpp
+++ b/src/plugins/debugger/dap/dapengine.cpp
@@ -6,6 +6,7 @@
 #include "cmakedapengine.h"
 #include "dapclient.h"
 #include "gdbdapengine.h"
+#include "lldbdapengine.h"
 #include "pydapengine.h"
 
 #include <debugger/breakhandler.h>
@@ -644,6 +645,7 @@ void DapEngine::readDapStandardError()
 void DapEngine::handleResponse(DapResponseType type, const QJsonObject &response)
 {
     const QString command = response.value("command").toString();
+    const bool success = response.value("success").toBool();
 
     switch (type) {
     case DapResponseType::Initialize:
@@ -674,7 +676,7 @@ void DapEngine::handleResponse(DapResponseType type, const QJsonObject &response
     case DapResponseType::StepIn:
     case DapResponseType::StepOut:
     case DapResponseType::StepOver:
-        if (response.value("success").toBool()) {
+        if (success) {
             showMessage(command, LogDebug);
             notifyInferiorRunOk();
         } else {
@@ -691,11 +693,21 @@ void DapEngine::handleResponse(DapResponseType type, const QJsonObject &response
     case DapResponseType::SetBreakpoints:
         handleBreakpointResponse(response);
         break;
+    case DapResponseType::Launch:
+        if (!success) {
+            notifyEngineRunFailed();
+            AsynchronousMessageBox::critical(
+                Tr::tr("Failed to Start Application"),
+                Tr::tr("\"%1\" could not be started. Error message: %2")
+                    .arg(runParameters().inferior.command.toUserOutput())
+                    .arg(response.value("message").toString()));
+        }
+        break;
     default:
         showMessage("UNKNOWN RESPONSE:" + command);
     };
 
-    if (response.contains("success") && !response.value("success").toBool()) {
+    if (!success) {
         showMessage(QString("DAP COMMAND FAILED: %1").arg(command));
         qCDebug(logCategory()) << "DAP COMMAND FAILED:" << command;
         return;
@@ -1058,6 +1070,8 @@ DebuggerEngine *createDapEngine(Utils::Id runMode)
         return new CMakeDapEngine;
     if (runMode == ProjectExplorer::Constants::DAP_GDB_DEBUG_RUN_MODE)
         return new GdbDapEngine;
+    if (runMode == ProjectExplorer::Constants::DAP_LLDB_DEBUG_RUN_MODE)
+        return new LldbDapEngine;
     if (runMode == ProjectExplorer::Constants::DAP_PY_DEBUG_RUN_MODE)
         return new PyDapEngine;
 
diff --git a/src/plugins/debugger/dap/lldbdapengine.cpp b/src/plugins/debugger/dap/lldbdapengine.cpp
new file mode 100644
index 00000000000..d767ab723ae
--- /dev/null
+++ b/src/plugins/debugger/dap/lldbdapengine.cpp
@@ -0,0 +1,241 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
+
+#include "lldbdapengine.h"
+
+#include "dapclient.h"
+
+#include <coreplugin/messagemanager.h>
+
+#include <debugger/debuggeractions.h>
+#include <debugger/debuggermainwindow.h>
+#include <debugger/debuggersourcepathmappingwidget.h>
+
+#include <utils/mimeconstants.h>
+#include <utils/mimeutils.h>
+#include <utils/temporarydirectory.h>
+
+#include <projectexplorer/buildconfiguration.h>
+#include <projectexplorer/buildsystem.h>
+#include <projectexplorer/projecttree.h>
+
+#include <QDebug>
+#include <QJsonArray>
+#include <QLocalSocket>
+#include <QVersionNumber>
+
+using namespace Core;
+using namespace Utils;
+
+namespace Debugger::Internal {
+
+// TODO: Same class as in gdbdapengine.cpp. Refactor into one place.
+class ProcessDataProvider : public IDataProvider
+{
+public:
+    ProcessDataProvider(const DebuggerRunParameters &rp,
+                        const CommandLine &cmd,
+                        QObject *parent = nullptr)
+        : IDataProvider(parent)
+        , m_runParameters(rp)
+        , m_cmd(cmd)
+    {
+        connect(&m_proc, &Process::started, this, &IDataProvider::started);
+        connect(&m_proc, &Process::done, this, &IDataProvider::done);
+        connect(&m_proc,
+                &Process::readyReadStandardOutput,
+                this,
+                &IDataProvider::readyReadStandardOutput);
+        connect(&m_proc,
+                &Process::readyReadStandardError,
+                this,
+                &IDataProvider::readyReadStandardError);
+    }
+
+    ~ProcessDataProvider()
+    {
+        m_proc.kill();
+        m_proc.waitForFinished();
+    }
+
+    void start() override
+    {
+        m_proc.setProcessMode(ProcessMode::Writer);
+        if (m_runParameters.debugger.workingDirectory.isDir())
+            m_proc.setWorkingDirectory(m_runParameters.debugger.workingDirectory);
+        m_proc.setEnvironment(m_runParameters.debugger.environment);
+        m_proc.setCommand(m_cmd);
+        m_proc.start();
+    }
+
+    bool isRunning() const override { return m_proc.isRunning(); }
+    void writeRaw(const QByteArray &data) override
+    {
+        if (m_proc.state() == QProcess::Running)
+            m_proc.writeRaw(data);
+    }
+    void kill() override { m_proc.kill(); }
+    QByteArray readAllStandardOutput() override { return m_proc.readAllStandardOutput().toUtf8(); }
+    QString readAllStandardError() override { return m_proc.readAllStandardError(); }
+    int exitCode() const override { return m_proc.exitCode(); }
+    QString executable() const override { return m_proc.commandLine().executable().toUserOutput(); }
+
+    QProcess::ExitStatus exitStatus() const override { return m_proc.exitStatus(); }
+    QProcess::ProcessError error() const override { return m_proc.error(); }
+    Utils::ProcessResult result() const override { return m_proc.result(); }
+    QString exitMessage() const override { return m_proc.exitMessage(); };
+
+private:
+    Utils::Process m_proc;
+    const DebuggerRunParameters m_runParameters;
+    const CommandLine m_cmd;
+};
+
+class LldbDapClient : public DapClient
+{
+public:
+    LldbDapClient(IDataProvider *provider, QObject *parent = nullptr)
+        : DapClient(provider, parent)
+    {}
+
+private:
+    const QLoggingCategory &logCategory() override
+    {
+        static const QLoggingCategory logCategory = QLoggingCategory("qtc.dbg.dapengine.lldb",
+                                                                     QtWarningMsg);
+        return logCategory;
+    }
+};
+
+LldbDapEngine::LldbDapEngine()
+    : DapEngine()
+{
+    setObjectName("LldbDapEngine");
+    setDebuggerName("LLDB");
+    setDebuggerType("DAP");
+}
+
+QJsonArray LldbDapEngine::sourceMap() const
+{
+    QJsonArray sourcePathMapping;
+    const SourcePathMap sourcePathMap
+        = mergePlatformQtPath(runParameters(), settings().sourcePathMap());
+    for (auto it = sourcePathMap.constBegin(), cend = sourcePathMap.constEnd(); it != cend; ++it) {
+        sourcePathMapping.append(QJsonArray{
+            {it.key(), expand(it.value())},
+        });
+    }
+    return sourcePathMapping;
+}
+
+QJsonArray LldbDapEngine::preRunCommands() const
+{
+    const QStringList lines = settings().gdbStartupCommands().split('\n')
+                              + runParameters().additionalStartupCommands.split('\n');
+    QJsonArray result;
+    for (const QString &line : lines) {
+        const QString trimmed = line.trimmed();
+        if (!trimmed.isEmpty() && !trimmed.startsWith('#'))
+            result.append(trimmed);
+    }
+    return result;
+}
+
+void LldbDapEngine::handleDapInitialize()
+{
+    // Documentation at:
+    // * https://github.com/llvm/llvm-project/tree/main/lldb/tools/lldb-dap#lldb-dap
+    // * https://github.com/llvm/llvm-project/blob/main/lldb/tools/lldb-dap/package.json
+
+    const DebuggerRunParameters &rp = runParameters();
+    const QJsonArray map = sourceMap();
+    const QJsonArray commands = preRunCommands();
+
+    if (!isLocalAttachEngine()) {
+        const QJsonArray env = QJsonArray::fromStringList(rp.inferior.environment.toStringList());
+        const QJsonArray args = QJsonArray::fromStringList(rp.inferior.command.splitArguments());
+
+        QJsonObject launchJson{
+            {"noDebug", false},
+            {"program", rp.inferior.command.executable().path()},
+            {"cwd", rp.inferior.workingDirectory.path()},
+            {"env", env},
+            {"__restart", ""},
+        };
+        if (!map.isEmpty())
+            launchJson.insert("sourceMap", map);
+        if (!commands.isEmpty())
+            launchJson.insert("preRunCommands", commands);
+        if (!args.isEmpty())
+            launchJson.insert("args", args);
+
+        m_dapClient->postRequest("launch", launchJson);
+
+        qCDebug(logCategory()) << "handleDapLaunch";
+        return;
+    }
+
+    QTC_ASSERT(state() == EngineRunRequested, qCDebug(logCategory()) << state());
+
+    QJsonObject attachJson{
+        {"program", rp.inferior.command.executable().path()},
+        {"pid", QString::number(rp.attachPID.pid())},
+        {"__restart", ""},
+    };
+    if (!map.isEmpty())
+        attachJson.insert("sourceMap", map);
+    if (!commands.isEmpty())
+        attachJson.insert("preRunCommands", commands);
+
+    m_dapClient->postRequest("attach", attachJson);
+
+    qCDebug(logCategory()) << "handleDapAttach";
+}
+
+bool LldbDapEngine::isLocalAttachEngine() const
+{
+    return runParameters().startMode == AttachToLocalProcess;
+}
+
+void LldbDapEngine::handleDapConfigurationDone()
+{
+    if (!isLocalAttachEngine()) {
+        DapEngine::handleDapConfigurationDone();
+        return;
+    }
+
+    notifyEngineRunAndInferiorRunOk();
+}
+
+void LldbDapEngine::setupEngine()
+{
+    QTC_ASSERT(state() == EngineSetupRequested, qCDebug(logCategory()) << state());
+
+    const DebuggerRunParameters &rp = runParameters();
+    CommandLine cmd{rp.debugger.command.executable()};
+
+    IDataProvider *dataProvider =  new ProcessDataProvider(rp, cmd, this);
+    m_dapClient = new LldbDapClient(dataProvider, this);
+
+    connectDataGeneratorSignals();
+    m_dapClient->dataProvider()->start();
+}
+
+bool LldbDapEngine::acceptsBreakpoint(const BreakpointParameters &bp) const
+{
+    const auto mimeType = Utils::mimeTypeForFile(bp.fileName);
+    return mimeType.matchesName(Utils::Constants::C_HEADER_MIMETYPE)
+           || mimeType.matchesName(Utils::Constants::C_SOURCE_MIMETYPE)
+           || mimeType.matchesName(Utils::Constants::CPP_HEADER_MIMETYPE)
+           || mimeType.matchesName(Utils::Constants::CPP_SOURCE_MIMETYPE)
+           || bp.type == BreakpointByFunction;
+}
+
+const QLoggingCategory &LldbDapEngine::logCategory()
+{
+    static const QLoggingCategory logCategory = QLoggingCategory("qtc.dbg.dapengine.lldb",
+                                                                 QtWarningMsg);
+    return logCategory;
+}
+
+} // namespace Debugger::Internal
diff --git a/src/plugins/debugger/dap/lldbdapengine.h b/src/plugins/debugger/dap/lldbdapengine.h
new file mode 100644
index 00000000000..0ebeb2d2ee1
--- /dev/null
+++ b/src/plugins/debugger/dap/lldbdapengine.h
@@ -0,0 +1,29 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "dapengine.h"
+
+namespace Debugger::Internal {
+
+class LldbDapEngine : public DapEngine
+{
+public:
+    LldbDapEngine();
+
+private:
+    void setupEngine() override;
+
+    void handleDapInitialize() override;
+    void handleDapConfigurationDone() override;
+
+    bool isLocalAttachEngine() const;
+    bool acceptsBreakpoint(const BreakpointParameters &bp) const override;
+    const QLoggingCategory &logCategory() override;
+
+    QJsonArray sourceMap() const;
+    QJsonArray preRunCommands() const;
+};
+
+} // Debugger::Internal
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index 3c5825eb627..ed54252ef72 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -123,6 +123,7 @@ QtcPlugin {
             "dapclient.cpp", "dapclient.h",
             "dapengine.cpp", "dapengine.h",
             "gdbdapengine.cpp", "gdbdapengine.h",
+            "lldbdapengine.cpp", "lldbdapengine.h",
             "pydapengine.cpp", "pydapengine.h",
         ]
     }
diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index 5c313d1be53..1110c4e5593 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -60,6 +60,7 @@ DebuggerSettings::DebuggerSettings() :
     intelFlavor{gdbSettings().intelFlavor},
     usePseudoTracepoints{gdbSettings().usePseudoTracepoints},
     useIndexCache{gdbSettings().useIndexCache},
+    useDebugInfoD{gdbSettings().useDebugInfoD},
     gdbStartupCommands{gdbSettings().gdbStartupCommands},
     gdbPostAttachCommands{gdbSettings().gdbPostAttachCommands},
     targetAsync{gdbSettings().targetAsync},
diff --git a/src/plugins/debugger/debuggeractions.h b/src/plugins/debugger/debuggeractions.h
index f20d60839b0..a9dbafff94e 100644
--- a/src/plugins/debugger/debuggeractions.h
+++ b/src/plugins/debugger/debuggeractions.h
@@ -48,6 +48,7 @@ public:
     Utils::BoolAspect &intelFlavor;
     Utils::BoolAspect &usePseudoTracepoints;
     Utils::BoolAspect &useIndexCache;
+    Utils::TriStateAspect &useDebugInfoD;
     Utils::StringAspect &gdbStartupCommands;
     Utils::StringAspect &gdbPostAttachCommands;
 
diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h
index 2011c3d7a3a..186e2120378 100644
--- a/src/plugins/debugger/debuggerconstants.h
+++ b/src/plugins/debugger/debuggerconstants.h
@@ -100,6 +100,8 @@ enum DebuggerEngineType
     GdbEngineType     = 0x001,
     CdbEngineType     = 0x004,
     LldbEngineType    = 0x100,
+    GdbDapEngineType  = 0x200,
+    LldbDapEngineType = 0x400,
     UvscEngineType    = 0x1000
 };
 
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 1aa77ae3ea3..0acda44b33b 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -553,8 +553,10 @@ void DebuggerEnginePrivate::setupViews()
         = new Perspective(perspectiveId, m_engine->displayName(), parentPerspectiveId, settingsId);
 
     m_progress.setProgressRange(0, 1000);
-    FutureProgress *fp = ProgressManager::addTask(m_progress.future(),
-        Tr::tr("Launching Debugger"), "Debugger.Launcher");
+    const QString msg = m_companionEngines.isEmpty()
+            ? Tr::tr("Launching Debugger")
+            : Tr::tr("Launching %1 Debugger").arg(m_debuggerName);
+    FutureProgress *fp = ProgressManager::addTask(m_progress.future(), msg, "Debugger.Launcher");
     connect(fp, &FutureProgress::canceled, m_engine, &DebuggerEngine::quitDebugger);
     m_progress.reportStarted();
 
@@ -2623,6 +2625,8 @@ bool DebuggerRunParameters::isCppDebugging() const
     return cppEngineType == GdbEngineType
         || cppEngineType == LldbEngineType
         || cppEngineType == CdbEngineType
+        || cppEngineType == GdbDapEngineType
+        || cppEngineType == LldbDapEngineType
         || cppEngineType == UvscEngineType;
 }
 
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index e82a386311d..b5e8a3cba8d 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -188,7 +188,8 @@ public:
 
     QStringList validationErrors;
 
-    int fallbackQtVersion = 0x50200;
+    int qtVersion = 0;
+    QString qtNamespace;
 
     // Common debugger constants.
     Utils::FilePath peripheralDescriptionFile;
diff --git a/src/plugins/debugger/debuggeritem.cpp b/src/plugins/debugger/debuggeritem.cpp
index c5b1bc7f6b6..9cd855c148e 100644
--- a/src/plugins/debugger/debuggeritem.cpp
+++ b/src/plugins/debugger/debuggeritem.cpp
@@ -147,27 +147,16 @@ void DebuggerItem::reinitializeFromFile(QString *error, Utils::Environment *cust
 
     Environment env = customEnv ? *customEnv : m_command.deviceEnvironment();
 
-    // Prevent calling lldb on Windows because the lldb from the llvm package is linked against
-    // python but does not contain a python dll.
-    const bool isAndroidNdkLldb = DebuggerItem::addAndroidLldbPythonEnv(m_command, env);
-    const FilePath qtcreatorLldb = Core::ICore::lldbExecutable(CLANG_BINDIR);
-    if (HostOsInfo::isWindowsHost() && m_command.fileName().startsWith("lldb") && !isAndroidNdkLldb
-        && qtcreatorLldb != m_command) {
-        QString errorMessage;
-        m_version = winGetDLLVersion(WinDLLFileVersion,
-                                     m_command.absoluteFilePath().path(),
-                                     &errorMessage);
-        m_engineType = LldbEngineType;
-        m_abis = Abi::abisOfBinary(m_command);
-        return;
-    }
-
     // QNX gdb unconditionally checks whether the QNX_TARGET env variable is
     // set and bails otherwise, even when it is not used by the specific
     // codepath triggered by the --version and --configuration arguments. The
     // hack below tricks it into giving us the information we want.
     env.set("QNX_TARGET", QString());
 
+    // On Windows, we need to prevent the Windows Error Reporting dialog from
+    // popping up when a candidate is missing required DLLs.
+    WindowsCrashDialogBlocker blocker;
+
     Process proc;
     proc.setEnvironment(env);
     proc.setCommand({m_command, {version}});
@@ -282,6 +271,10 @@ QString DebuggerItem::engineTypeName() const
         return QLatin1String("CDB");
     case LldbEngineType:
         return QLatin1String("LLDB");
+    case GdbDapEngineType:
+        return QLatin1String("GDB DAP");
+    case LldbDapEngineType:
+        return QLatin1String("LLDB DAP");
     case UvscEngineType:
         return QLatin1String("UVSC");
     default:
@@ -440,8 +433,11 @@ static DebuggerItem::MatchLevel matchSingle(const Abi &debuggerAbi, const Abi &t
             return matchOnMultiarch;
     }
 
-    if (debuggerAbi.wordWidth() == 64 && targetAbi.wordWidth() == 32)
-        return DebuggerItem::MatchesSomewhat;
+    if (debuggerAbi.wordWidth() == 64 && targetAbi.wordWidth() == 32) {
+        return HostOsInfo::isWindowsHost() && engineType == CdbEngineType
+                   ? DebuggerItem::MatchesPerfectly
+                   : DebuggerItem::MatchesSomewhat;
+    }
     if (debuggerAbi.wordWidth() != 0 && debuggerAbi.wordWidth() != targetAbi.wordWidth())
         return matchOnMultiarch;
 
diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp
index b547ddab01f..23dcee4ee6a 100644
--- a/src/plugins/debugger/debuggeritemmanager.cpp
+++ b/src/plugins/debugger/debuggeritemmanager.cpp
@@ -9,8 +9,6 @@
 #include <coreplugin/dialogs/ioptionspage.h>
 #include <coreplugin/icore.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/kitoptionspage.h>
 #include <projectexplorer/projectexplorerconstants.h>
@@ -381,7 +379,7 @@ DebuggerItemConfigWidget::DebuggerItemConfigWidget()
     // clang-format off
     using namespace Layouting;
     Form {
-        fieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow),
+        fieldGrowthPolicy(int(QFormLayout::AllNonFixedFieldsGrow)),
         Tr::tr("Name:"), m_displayNameLineEdit, br,
         Tr::tr("Path:"), m_binaryChooser, br,
         m_cdbLabel, br,
@@ -488,7 +486,7 @@ void DebuggerItemConfigWidget::binaryPathHasChanged()
                 tmp.reinitializeFromFile();
                 return tmp;
             }));
-            ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(m_updateWatcher.future());
+            Utils::futureSynchronizer()->addFuture(m_updateWatcher.future());
         } else {
             const DebuggerItem tmp;
             setAbis(tmp.abiNames());
@@ -551,8 +549,8 @@ void DebuggerItemModel::autoDetectCdbDebuggers()
 
     for (const QFileInfo &kitFolderFi : kitFolders) {
         const QString path = kitFolderFi.absoluteFilePath();
-        QStringList abis = {"x86", "x64"};
-        if (HostOsInfo::hostArchitecture() == HostOsInfo::HostArchitectureArm64)
+        QStringList abis = {"x64"};
+        if (HostOsInfo::hostArchitecture() == Utils::OsArchArm64)
             abis << "arm64";
         for (const QString &abi: abis) {
             const QFileInfo cdbBinary(path + "/Debuggers/" + abi + "/cdb.exe");
@@ -785,6 +783,12 @@ void DebuggerItemModel::readDebuggers(const FilePath &fileName, bool isSystem)
                                   .arg(item.command().toUserOutput(), item.id().toString(), fileName.toUserOutput());
                     continue;
                 }
+                if (item.engineType() == CdbEngineType
+                    && Abi::abisOfBinary(item.command()).value(0).wordWidth() == 32) {
+                    qWarning() << QString("32 bit CDB \"%1\" (%2) read from \"%3\" dropped since it is not supported anymore.")
+                                  .arg(item.command().toUserOutput(), item.id().toString(), fileName.toUserOutput());
+                    continue;
+                }
                 // FIXME: During startup, devices are not yet available, so we cannot check if the file still exists.
                 if (!item.command().needsDevice() && !item.command().isExecutableFile()) {
                     qWarning() << QString("DebuggerItem \"%1\" (%2) read from \"%3\" dropped since the command is not executable.")
diff --git a/src/plugins/debugger/debuggerkitaspect.cpp b/src/plugins/debugger/debuggerkitaspect.cpp
index 02f21c582a2..15a3e8827c1 100644
--- a/src/plugins/debugger/debuggerkitaspect.cpp
+++ b/src/plugins/debugger/debuggerkitaspect.cpp
@@ -66,7 +66,7 @@ public:
     }
 
 private:
-    void addToLayoutImpl(Layouting::LayoutItem &parent) override
+    void addToLayoutImpl(Layouting::Layout &parent) override
     {
         addMutableAction(m_comboBox);
         parent.addItem(m_comboBox);
@@ -329,7 +329,7 @@ public:
                 }
                 if (!item.detectionSource().isEmpty() && item.detectionSource() == k->autoDetectionSource())
                     level = DebuggerItem::MatchLevel(level + 2);
-            } else if (rawId.type() == QVariant::String) {
+            } else if (rawId.typeId() == QMetaType::QString) {
                 // New structure.
                 if (item.id() == rawId) {
                     // Detected by ID.
@@ -388,6 +388,15 @@ public:
         k->setValue(DebuggerKitAspect::id(), bestLevel != DebuggerItem::DoesNotMatch ? bestItem.id() : QVariant());
     }
 
+    void fix(Kit *k) override
+    {
+        const QVariant id = k->value(DebuggerKitAspect::id());
+        if (Utils::anyOf(DebuggerItemManager::debuggers(), Utils::equal(&DebuggerItem::id, id)))
+            return;
+        k->removeKeySilently(DebuggerKitAspect::id());
+        setup(k);
+    }
+
     KitAspect *createKitAspect(Kit *k) const override
     {
         return new Internal::DebuggerKitAspectImpl(k, this);
diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index 4ad44368168..c1f4b14028d 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -154,6 +154,18 @@ public:
     QHash<QString, PerspectiveState> m_lastTypePerspectiveStates;  // Perspective::settingsId() -> MainWindow::state()
 };
 
+class TweakedCombo : public QComboBox // ensures that all items of the popup are readable
+{
+public:
+    explicit TweakedCombo(QWidget *parent = nullptr) : QComboBox(parent) {}
+    void showPopup() override
+    {
+        QTC_ASSERT(view(), return);
+        view()->setMinimumWidth(view()->sizeHintForColumn(0));
+        QComboBox::showPopup();
+    }
+};
+
 DebuggerMainWindowPrivate::DebuggerMainWindowPrivate(DebuggerMainWindow *parent)
     : q(parent)
 {
@@ -164,7 +176,7 @@ DebuggerMainWindowPrivate::DebuggerMainWindowPrivate(DebuggerMainWindow *parent)
     m_statusLabel->setIndent(2 * QFontMetrics(q->font()).horizontalAdvance(QChar('x')));
     m_editorPlaceHolder = new EditorManagerPlaceHolder;
 
-    m_perspectiveChooser = new QComboBox;
+    m_perspectiveChooser = new TweakedCombo;
     m_perspectiveChooser->setObjectName("PerspectiveChooser");
     StyleHelper::setPanelWidget(m_perspectiveChooser);
     m_perspectiveChooser->setSizeAdjustPolicy(QComboBox::AdjustToContents);
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index d2647f3d7b9..527c6649209 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1224,6 +1224,7 @@ void DebuggerPluginPrivate::createDapDebuggerPerspective(QWidget *globalLogWindo
                        ProjectExplorer::Constants::DAP_CMAKE_DEBUG_RUN_MODE,
                        /*forceSkipDeploy=*/true},
         DapPerspective{Tr::tr("GDB Preset"), ProjectExplorer::Constants::DAP_GDB_DEBUG_RUN_MODE},
+        DapPerspective{Tr::tr("LLDB Preset"), ProjectExplorer::Constants::DAP_LLDB_DEBUG_RUN_MODE},
         DapPerspective{Tr::tr("Python Preset"), ProjectExplorer::Constants::DAP_PY_DEBUG_RUN_MODE},
     };
 
@@ -1993,7 +1994,7 @@ void DebuggerPluginPrivate::setInitialState()
 
 void DebuggerPluginPrivate::updateDebugWithoutDeployMenu()
 {
-    const bool state = ProjectExplorerPlugin::projectExplorerSettings().deployBeforeRun;
+    const bool state = projectExplorerSettings().deployBeforeRun;
     m_debugWithoutDeployAction.setVisible(state);
 }
 
diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
index cdbedf19e16..4bd1dec9675 100644
--- a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
+++ b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
@@ -72,7 +72,7 @@ DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(Target *target)
         details->setState(DetailsWidget::Expanded);
         auto innerPane = new QWidget;
         details->setWidget(innerPane);
-        builder.addItem(Layouting::noMargin);
+        builder.setNoMargins();
         builder.attachTo(innerPane);
 
         const auto setSummaryText = [this, details] {
@@ -116,15 +116,15 @@ DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(Target *target)
 
     m_cppAspect.setSettingsKey("RunConfiguration.UseCppDebugger");
     m_cppAspect.setLabelText(Tr::tr("C++ debugger:"));
-    m_cppAspect.setOptionTexts(Tr::tr("Enabled"), Tr::tr("Disabled"), Tr::tr("Automatic"));
+    m_cppAspect.setOptionText(TriState::DefaultValue, Tr::tr("Automatic"));
 
     m_qmlAspect.setSettingsKey("RunConfiguration.UseQmlDebugger");
     m_qmlAspect.setLabelText(Tr::tr("QML debugger:"));
-    m_qmlAspect.setOptionTexts(Tr::tr("Enabled"), Tr::tr("Disabled"), Tr::tr("Automatic"));
+    m_qmlAspect.setOptionText(TriState::DefaultValue, Tr::tr("Automatic"));
 
     m_pythonAspect.setSettingsKey("RunConfiguration.UsePythonDebugger");
     m_pythonAspect.setLabelText(Tr::tr("Python debugger:"));
-    m_pythonAspect.setOptionTexts(Tr::tr("Enabled"), Tr::tr("Disabled"), Tr::tr("Automatic"));
+    m_pythonAspect.setOptionText(TriState::DefaultValue, Tr::tr("Automatic"));
 
     // Make sure at least one of the debuggers is set to be active.
     connect(&m_cppAspect, &TriStateAspect::changed, this, [this] {
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index e26f5f85b8a..007d3464bb8 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -30,6 +30,8 @@
 #include <projectexplorer/taskhub.h>
 #include <projectexplorer/toolchain.h>
 
+#include <remotelinux/remotelinux_constants.h>
+
 #include <utils/algorithm.h>
 #include <utils/checkablemessagebox.h>
 #include <utils/environment.h>
@@ -497,6 +499,12 @@ void DebuggerRunTool::start()
             case LldbEngineType:
                 m_engines << createLldbEngine();
                 break;
+            case GdbDapEngineType:
+                m_engines << createDapEngine(ProjectExplorer::Constants::DAP_GDB_DEBUG_RUN_MODE);
+                break;
+            case LldbDapEngineType:
+                m_engines << createDapEngine(ProjectExplorer::Constants::DAP_LLDB_DEBUG_RUN_MODE);
+                break;
             case UvscEngineType:
                 m_engines << createUvscEngine();
                 break;
@@ -526,8 +534,8 @@ void DebuggerRunTool::start()
         return;
     }
 
-    if (auto interpreterAspect = runControl()->aspect<FilePathAspect>()) {
-        if (auto mainScriptAspect = runControl()->aspect<MainScriptAspect>()) {
+    if (auto interpreterAspect = runControl()->aspectData<FilePathAspect>()) {
+        if (auto mainScriptAspect = runControl()->aspectData<MainScriptAspect>()) {
             const FilePath mainScript = mainScriptAspect->filePath;
             const FilePath interpreter = interpreterAspect->filePath;
             if (!interpreter.isEmpty() && mainScript.endsWith(".py")) {
@@ -541,11 +549,11 @@ void DebuggerRunTool::start()
     for (auto engine : m_engines) {
         engine->setRunParameters(m_runParameters);
         engine->setRunId(d->runId);
-        engine->setRunTool(this);
         for (auto companion : m_engines) {
             if (companion != engine)
                 engine->addCompanionEngine(companion);
         }
+        engine->setRunTool(this);
         if (!first)
             engine->setSecondaryEngine();
         auto rc = runControl();
@@ -828,11 +836,11 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, AllowTerminal allowTerm
 
     m_runParameters.displayName = runControl->displayName();
 
-    if (auto symbolsAspect = runControl->aspect<SymbolFileAspect>())
+    if (auto symbolsAspect = runControl->aspectData<SymbolFileAspect>())
         m_runParameters.symbolFile = symbolsAspect->filePath;
-    if (auto terminalAspect = runControl->aspect<TerminalAspect>())
+    if (auto terminalAspect = runControl->aspectData<TerminalAspect>())
         m_runParameters.useTerminal = terminalAspect->useTerminal;
-    if (auto runAsRootAspect = runControl->aspect<RunAsRootAspect>())
+    if (auto runAsRootAspect = runControl->aspectData<RunAsRootAspect>())
         m_runParameters.runAsRoot = runAsRootAspect->value;
 
     Kit *kit = runControl->kit();
@@ -847,7 +855,7 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, AllowTerminal allowTerm
     if (QtSupport::QtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(kit))
         m_runParameters.qtSourceLocation = qtVersion->sourcePath();
 
-    if (auto aspect = runControl->aspect<DebuggerRunConfigurationAspect>()) {
+    if (auto aspect = runControl->aspectData<DebuggerRunConfigurationAspect>()) {
         if (!aspect->useCppDebugger)
             m_runParameters.cppEngineType = NoEngineType;
         m_runParameters.isQmlDebugging = aspect->useQmlDebugger;
@@ -896,7 +904,7 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, AllowTerminal allowTerm
 
     if (QtSupport::QtVersion *baseQtVersion = QtSupport::QtKitAspect::qtVersion(kit)) {
         const QVersionNumber qtVersion = baseQtVersion->qtVersion();
-        m_runParameters.fallbackQtVersion = 0x10000 * qtVersion.majorVersion()
+        m_runParameters.qtVersion = 0x10000 * qtVersion.majorVersion()
                                             + 0x100 * qtVersion.minorVersion()
                                             + qtVersion.microVersion();
     }
@@ -1060,7 +1068,15 @@ DebugServerRunner::DebugServerRunner(RunControl *runControl, DebugServerPortsGat
                     cmd.addArg("--multi");
                 if (m_pid.isValid())
                     cmd.addArg("--attach");
-                cmd.addArg(QString(":%1").arg(portsGatherer->gdbServer().port()));
+
+                const auto port = portsGatherer->gdbServer().port();
+                cmd.addArg(QString(":%1").arg(port));
+
+                if (runControl->device()->extraData(RemoteLinux::Constants::SshForwardDebugServerPort).toBool()) {
+                    addExtraData(RemoteLinux::Constants::SshForwardPort, port);
+                    addExtraData(RemoteLinux::Constants::DisableSharing, true);
+                }
+
                 if (m_pid.isValid())
                     cmd.addArg(QString::number(m_pid.pid()));
             }
@@ -1091,6 +1107,7 @@ DebuggerRunWorkerFactory::DebuggerRunWorkerFactory()
     addSupportedRunMode(ProjectExplorer::Constants::DEBUG_RUN_MODE);
     addSupportedRunMode(ProjectExplorer::Constants::DAP_CMAKE_DEBUG_RUN_MODE);
     addSupportedRunMode(ProjectExplorer::Constants::DAP_GDB_DEBUG_RUN_MODE);
+    addSupportedRunMode(ProjectExplorer::Constants::DAP_LLDB_DEBUG_RUN_MODE);
     addSupportedDeviceType(ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE);
     addSupportedDeviceType("DockerDeviceType");
 
diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
index be983cf584c..e8f231473b2 100644
--- a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
+++ b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
@@ -309,7 +309,7 @@ QString DebuggerSourcePathMappingWidget::editSourceField() const
 
 QString DebuggerSourcePathMappingWidget::editTargetField() const
 {
-    return m_targetChooser->rawFilePath().toString();
+    return m_targetChooser->unexpandedFilePath().toString();
 }
 
 void DebuggerSourcePathMappingWidget::setEditFieldMapping(const Mapping &m)
@@ -467,7 +467,7 @@ bool SourcePathMapAspect::isDirty()
     return m_internal != m_buffer;
 }
 
-void SourcePathMapAspect::addToLayout(Layouting::LayoutItem &parent)
+void SourcePathMapAspect::addToLayout(Layouting::Layout &parent)
 {
     QTC_CHECK(!d->m_widget);
     d->m_widget = createSubWidget<DebuggerSourcePathMappingWidget>();
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 08c572ae70c..41d26962c96 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -30,7 +30,9 @@
 #include <coreplugin/messagebox.h>
 
 #include <projectexplorer/devicesupport/idevice.h>
+#include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/projectmanager.h>
 #include <projectexplorer/taskhub.h>
 
 #include <utils/algorithm.h>
@@ -468,7 +470,7 @@ void GdbEngine::handleAsyncOutput(const QStringView asyncClass, const GdbMi &res
         Module module;
         module.startAddress = 0;
         module.endAddress = 0;
-        module.hostPath = Utils::FilePath::fromString(result["host-name"].data());
+        module.hostPath = Utils::FilePath::fromUserInput(result["host-name"].data());
         const QString target = result["target-name"].data();
         module.modulePath = runParameters().inferior.command.executable().withNewPath(target);
         module.moduleName = module.hostPath.baseName();
@@ -673,6 +675,8 @@ void GdbEngine::interruptInferior()
     } else {
         showStatusMessage(Tr::tr("Stop requested..."), 5000);
         showMessage("TRYING TO INTERRUPT INFERIOR");
+        // Ctrl+C events are only handled properly for console applications on Windows
+        // when gdb debugs a GUI application the CTRL+C events are not handled
         if (HostOsInfo::isWindowsHost() && !m_isQnxGdb) {
             IDevice::ConstPtr dev = device();
             QTC_ASSERT(dev, notifyInferiorStopFailed(); return);
@@ -1486,6 +1490,16 @@ void GdbEngine::handleShowVersion(const DebuggerResponse &response)
             runCommand({"set target-async off", ConsoleCommand});
 
         //runCommand("set build-id-verbose 2", ConsoleCommand);
+
+        if (m_gdbVersion >= 100100) {
+            const TriState useDebugInfoD = settings().useDebugInfoD();
+            if (useDebugInfoD == TriState::Enabled) {
+                runCommand({"set debuginfod verbose 1"});
+                runCommand({"set debuginfod enabled on"});
+            } else if (useDebugInfoD == TriState::Disabled) {
+                runCommand({"set debuginfod enabled off"});
+            }
+        }
     }
 }
 
@@ -2080,8 +2094,10 @@ QString GdbEngine::breakpointLocation(const BreakpointParameters &data)
         return addressSpec(data.address);
 
     BreakpointPathUsage usage = data.pathUsage;
-    if (usage == BreakpointPathUsageEngineDefault)
-        usage = BreakpointUseShortPath;
+    if (usage == BreakpointPathUsageEngineDefault) {
+        ProjectExplorer::Project *project = ProjectManager::projectForFile(data.fileName);
+        usage = project ? BreakpointUseFullPath : BreakpointUseShortPath;
+    }
 
     const QString fileName = usage == BreakpointUseFullPath
         ? data.fileName.path() : breakLocation(data.fileName);
@@ -2094,8 +2110,10 @@ QString GdbEngine::breakpointLocation(const BreakpointParameters &data)
 QString GdbEngine::breakpointLocation2(const BreakpointParameters &data)
 {
     BreakpointPathUsage usage = data.pathUsage;
-    if (usage == BreakpointPathUsageEngineDefault)
-        usage = BreakpointUseShortPath;
+    if (usage == BreakpointPathUsageEngineDefault) {
+        ProjectExplorer::Project *project = ProjectManager::projectForFile(data.fileName);
+        usage = project ? BreakpointUseFullPath : BreakpointUseShortPath;
+    }
 
     const QString fileName = usage == BreakpointUseFullPath
         ? data.fileName.path() : breakLocation(data.fileName);
@@ -4034,7 +4052,7 @@ void GdbEngine::handleGdbStarted()
     }
 
     const FilePath path = settings().extraDumperFile();
-    if (!path.isEmpty() && path.isReadableFile()) {
+    if (path.isReadableFile()) {
         DebuggerCommand cmd("addDumperModule");
         cmd.arg("path", path.path());
         runCommand(cmd);
@@ -4044,10 +4062,6 @@ void GdbEngine::handleGdbStarted()
     if (!commands.isEmpty())
         runCommand({commands});
 
-    DebuggerCommand cmd1("setFallbackQtVersion");
-    cmd1.arg("version", rp.fallbackQtVersion);
-    runCommand(cmd1);
-
     runCommand({"loadDumpers", CB(handlePythonSetup)});
 
     // Reload peripheral register description.
@@ -4317,7 +4331,7 @@ void GdbEngine::interruptLocalInferior(qint64 pid)
         proc.setEnvironment(env);
         proc.start();
         proc.waitForFinished();
-    } else if (interruptProcess(pid, GdbEngineType, &errorMessage)) {
+    } else if (interruptProcess(pid, &errorMessage)) {
         showMessage("Interrupted " + QString::number(pid));
     } else {
         showMessage(errorMessage, LogError);
@@ -5123,6 +5137,8 @@ void GdbEngine::doUpdateLocals(const UpdateParameters &params)
     cmd.arg("dyntype", s.useDynamicType());
     cmd.arg("qobjectnames", s.showQObjectNames());
     cmd.arg("timestamps", s.logTimeStamps());
+    cmd.arg("qtversion", runParameters().qtVersion);
+    cmd.arg("qtnamespace", runParameters().qtNamespace);
 
     StackFrame frame = stackHandler()->currentFrame();
     cmd.arg("context", frame.context);
diff --git a/src/plugins/debugger/gdb/gdbsettings.cpp b/src/plugins/debugger/gdb/gdbsettings.cpp
index a86021a9d25..08313c7c6ce 100644
--- a/src/plugins/debugger/gdb/gdbsettings.cpp
+++ b/src/plugins/debugger/gdb/gdbsettings.cpp
@@ -127,7 +127,6 @@ GdbSettings::GdbSettings()
 
     gdbStartupCommands.setSettingsKey(debugModeGroup, "GdbStartupCommands");
     gdbStartupCommands.setDisplayStyle(StringAspect::TextEditDisplay);
-    gdbStartupCommands.setUseGlobalMacroExpander();
     gdbStartupCommands.setToolTip("<html><head/><body><p>" + Tr::tr(
         "GDB commands entered here will be executed after "
         "GDB has been started, but before the debugged program is started or "
@@ -136,7 +135,6 @@ GdbSettings::GdbSettings()
 
     gdbPostAttachCommands.setSettingsKey(debugModeGroup, "GdbPostAttachCommands");
     gdbPostAttachCommands.setDisplayStyle(StringAspect::TextEditDisplay);
-    gdbPostAttachCommands.setUseGlobalMacroExpander();
     gdbPostAttachCommands.setToolTip("<html><head/><body><p>" + Tr::tr(
         "GDB commands entered here will be executed after "
         "GDB has successfully attached to remote targets.</p>"
@@ -166,6 +164,12 @@ GdbSettings::GdbSettings()
         "binary in the future."));
     useIndexCache.setDefaultValue(true);
 
+    useDebugInfoD.setSettingsKey("UseDebugInfoD");
+    useDebugInfoD.setLabelText(Tr::tr("Use debug info daemon"));
+    useDebugInfoD.setOptionText(TriState::DefaultValue, Tr::tr("Use system settings"));
+    useDebugInfoD.setToolTip(Tr::tr("Lets GDB attempt to automatically retrieve "
+                                    "debug information for system packages."));
+
     skipKnownFrames.setSettingsKey(debugModeGroup, "SkipKnownFrames");
     skipKnownFrames.setDisplayName(Tr::tr("Skip Known Frames"));
     skipKnownFrames.setLabelText(Tr::tr("Skip known frames when stepping"));
@@ -221,6 +225,7 @@ GdbSettings::GdbSettings()
                 intelFlavor,
                 usePseudoTracepoints,
                 useIndexCache,
+                Row { useDebugInfoD, st },
                 st
             }
         };
diff --git a/src/plugins/debugger/gdb/gdbsettings.h b/src/plugins/debugger/gdb/gdbsettings.h
index 73c2646e1ca..98b1bf78cb5 100644
--- a/src/plugins/debugger/gdb/gdbsettings.h
+++ b/src/plugins/debugger/gdb/gdbsettings.h
@@ -22,6 +22,7 @@ public:
     Utils::BoolAspect intelFlavor{this};
     Utils::BoolAspect usePseudoTracepoints{this};
     Utils::BoolAspect useIndexCache{this};
+    Utils::TriStateAspect useDebugInfoD{this};
     Utils::StringAspect gdbStartupCommands{this};
     Utils::StringAspect gdbPostAttachCommands{this};
 
diff --git a/src/plugins/debugger/images/debugger_continue_1_mask.png b/src/plugins/debugger/images/debugger_continue_1_mask.png
index 1f5c0c56551..c2196afa953 100644
Binary files a/src/plugins/debugger/images/debugger_continue_1_mask.png and b/src/plugins/debugger/images/debugger_continue_1_mask.png differ
diff --git a/src/plugins/debugger/images/debugger_continue_1_mask@2x.png b/src/plugins/debugger/images/debugger_continue_1_mask@2x.png
index e3e06daa9d2..c3cb2a62bec 100644
Binary files a/src/plugins/debugger/images/debugger_continue_1_mask@2x.png and b/src/plugins/debugger/images/debugger_continue_1_mask@2x.png differ
diff --git a/src/plugins/debugger/images/debugger_continue_2_mask.png b/src/plugins/debugger/images/debugger_continue_2_mask.png
index 8b83259ed13..ad34cf8e8ec 100644
Binary files a/src/plugins/debugger/images/debugger_continue_2_mask.png and b/src/plugins/debugger/images/debugger_continue_2_mask.png differ
diff --git a/src/plugins/debugger/images/debugger_continue_2_mask@2x.png b/src/plugins/debugger/images/debugger_continue_2_mask@2x.png
index 860f76ca187..b0d8ca27baa 100644
Binary files a/src/plugins/debugger/images/debugger_continue_2_mask@2x.png and b/src/plugins/debugger/images/debugger_continue_2_mask@2x.png differ
diff --git a/src/plugins/debugger/images/debugger_interrupt_mask.png b/src/plugins/debugger/images/debugger_interrupt_mask.png
index 52f4f275b9f..6961370069b 100644
Binary files a/src/plugins/debugger/images/debugger_interrupt_mask.png and b/src/plugins/debugger/images/debugger_interrupt_mask.png differ
diff --git a/src/plugins/debugger/images/debugger_interrupt_mask@2x.png b/src/plugins/debugger/images/debugger_interrupt_mask@2x.png
index c7794000177..dc4ae99aa0e 100644
Binary files a/src/plugins/debugger/images/debugger_interrupt_mask@2x.png and b/src/plugins/debugger/images/debugger_interrupt_mask@2x.png differ
diff --git a/src/plugins/debugger/images/debugger_stop_mask.png b/src/plugins/debugger/images/debugger_stop_mask.png
index d56a35f4857..4e0562ea142 100644
Binary files a/src/plugins/debugger/images/debugger_stop_mask.png and b/src/plugins/debugger/images/debugger_stop_mask.png differ
diff --git a/src/plugins/debugger/images/debugger_stop_mask@2x.png b/src/plugins/debugger/images/debugger_stop_mask@2x.png
index e69d67dfaf8..fb84f3ad793 100644
Binary files a/src/plugins/debugger/images/debugger_stop_mask@2x.png and b/src/plugins/debugger/images/debugger_stop_mask@2x.png differ
diff --git a/src/plugins/debugger/images/mode_debug_mask.png b/src/plugins/debugger/images/mode_debug_mask.png
index fe7b6819a5b..63954678400 100644
Binary files a/src/plugins/debugger/images/mode_debug_mask.png and b/src/plugins/debugger/images/mode_debug_mask.png differ
diff --git a/src/plugins/debugger/images/mode_debug_mask@2x.png b/src/plugins/debugger/images/mode_debug_mask@2x.png
index 5340947ec75..83b6893b532 100644
Binary files a/src/plugins/debugger/images/mode_debug_mask@2x.png and b/src/plugins/debugger/images/mode_debug_mask@2x.png differ
diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp
index 4b28cd21af8..e234aefc216 100644
--- a/src/plugins/debugger/lldb/lldbengine.cpp
+++ b/src/plugins/debugger/lldb/lldbengine.cpp
@@ -238,7 +238,7 @@ void LldbEngine::handleLldbStarted()
         executeCommand(commands);
 
     const FilePath path = settings().extraDumperFile();
-    if (!path.isEmpty() && path.isReadableFile()) {
+    if (path.isReadableFile()) {
         DebuggerCommand cmd("addDumperModule");
         cmd.arg("path", path.path());
         runCommand(cmd);
@@ -346,10 +346,6 @@ void LldbEngine::handleLldbStarted()
 
     cmd2.flags = Silent;
     runCommand(cmd2);
-
-    DebuggerCommand cmd0("setFallbackQtVersion");
-    cmd0.arg("version", rp.fallbackQtVersion);
-    runCommand(cmd0);
 }
 
 void LldbEngine::runEngine()
@@ -768,6 +764,8 @@ void LldbEngine::doUpdateLocals(const UpdateParameters &params)
     cmd.arg("partialvar", params.partialVariable);
     cmd.arg("qobjectnames", s.showQObjectNames());
     cmd.arg("timestamps", s.logTimeStamps());
+    cmd.arg("qtversion", runParameters().qtVersion);
+    cmd.arg("qtnamespace", runParameters().qtNamespace);
 
     StackFrame frame = stackHandler()->currentFrame();
     cmd.arg("context", frame.context);
diff --git a/src/plugins/debugger/loadcoredialog.cpp b/src/plugins/debugger/loadcoredialog.cpp
index 4c006199700..937c77b8e19 100644
--- a/src/plugins/debugger/loadcoredialog.cpp
+++ b/src/plugins/debugger/loadcoredialog.cpp
@@ -163,10 +163,10 @@ int AttachCoreDialog::exec()
 {
     connect(d->symbolFileName, &PathChooser::validChanged, this, &AttachCoreDialog::changed);
     connect(d->coreFileName, &PathChooser::validChanged, this, [this] {
-        coreFileChanged(d->coreFileName->rawFilePath());
+        coreFileChanged(d->coreFileName->unexpandedFilePath());
     });
     connect(d->coreFileName, &PathChooser::textChanged, this, [this] {
-        coreFileChanged(d->coreFileName->rawFilePath());
+        coreFileChanged(d->coreFileName->unexpandedFilePath());
     });
     connect(d->kitChooser, &KitChooser::currentIndexChanged, this, &AttachCoreDialog::changed);
     connect(d->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
diff --git a/src/plugins/debugger/logwindow.cpp b/src/plugins/debugger/logwindow.cpp
index 482f2605e77..a1ca5e30e88 100644
--- a/src/plugins/debugger/logwindow.cpp
+++ b/src/plugins/debugger/logwindow.cpp
@@ -101,26 +101,25 @@ private:
     {
         using Utils::Theme;
         QTextCharFormat format;
-        Theme *theme = Utils::creatorTheme();
         switch (channelForChar(text.isEmpty() ? QChar() : text.at(0))) {
             case LogInput:
-                format.setForeground(theme->color(Theme::Debugger_LogWindow_LogInput));
+                format.setForeground(creatorColor(Theme::Debugger_LogWindow_LogInput));
                 setFormat(1, text.size(), format);
                 break;
             case LogStatus:
-                format.setForeground(theme->color(Theme::Debugger_LogWindow_LogStatus));
+                format.setForeground(creatorColor(Theme::Debugger_LogWindow_LogStatus));
                 setFormat(1, text.size(), format);
                 break;
             case LogWarning:
-                format.setForeground(theme->color(Theme::OutputPanes_WarningMessageTextColor));
+                format.setForeground(creatorColor(Theme::OutputPanes_WarningMessageTextColor));
                 setFormat(1, text.size(), format);
                 break;
             case LogError:
-                format.setForeground(theme->color(Theme::OutputPanes_ErrorMessageTextColor));
+                format.setForeground(creatorColor(Theme::OutputPanes_ErrorMessageTextColor));
                 setFormat(1, text.size(), format);
                 break;
             case LogTime:
-                format.setForeground(theme->color(Theme::Debugger_LogWindow_LogTime));
+                format.setForeground(creatorColor(Theme::Debugger_LogWindow_LogTime));
                 setFormat(1, text.size(), format);
                 break;
             default:
@@ -152,11 +151,9 @@ public:
 private:
     void highlightBlock(const QString &text) override
     {
-        using Utils::Theme;
-        Theme *theme = Utils::creatorTheme();
         if (text.size() > 3 && text.at(2) == ':') {
             QTextCharFormat format;
-            format.setForeground(theme->color(Theme::Debugger_LogWindow_LogTime));
+            format.setForeground(creatorColor(Theme::Debugger_LogWindow_LogTime));
             setFormat(1, text.size(), format);
         }
     }
diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp
index e0bfa126f5a..657447f17e0 100644
--- a/src/plugins/debugger/pdb/pdbengine.cpp
+++ b/src/plugins/debugger/pdb/pdbengine.cpp
@@ -143,7 +143,7 @@ void PdbEngine::handlePdbStarted()
 void PdbEngine::interruptInferior()
 {
     QString error;
-    interruptProcess(m_proc.processId(), GdbEngineType, &error);
+    interruptProcess(m_proc.processId(), &error);
 }
 
 void PdbEngine::executeStepIn(bool)
diff --git a/src/plugins/debugger/procinterrupt.cpp b/src/plugins/debugger/procinterrupt.cpp
index 113fbeefc4f..0f104f3bfc0 100644
--- a/src/plugins/debugger/procinterrupt.cpp
+++ b/src/plugins/debugger/procinterrupt.cpp
@@ -23,128 +23,23 @@ static inline QString msgCannotInterrupt(qint64 pid, const QString &why)
 #    define PROCESS_SUSPEND_RESUME (0x0800)
 #endif // PROCESS_SUSPEND_RESUME
 
-static BOOL isWow64Process(HANDLE hproc)
-{
-    using LPFN_ISWOW64PROCESS = BOOL (WINAPI*)(HANDLE, PBOOL);
-
-    BOOL ret = false;
-
-    static LPFN_ISWOW64PROCESS fnIsWow64Process = NULL;
-    if (!fnIsWow64Process) {
-        if (HMODULE hModule = GetModuleHandle(L"kernel32.dll"))
-            fnIsWow64Process = reinterpret_cast<LPFN_ISWOW64PROCESS>(GetProcAddress(hModule, "IsWow64Process"));
-    }
-
-    if (!fnIsWow64Process) {
-        qWarning("Cannot retrieve symbol 'IsWow64Process'.");
-        return false;
-    }
-
-    if (!fnIsWow64Process(hproc, &ret)) {
-        qWarning("IsWow64Process() failed for %p: %s",
-                 hproc, qPrintable(Utils::winErrorMessage(GetLastError())));
-        return false;
-    }
-    return ret;
-}
-
 // Open the process and break into it
-bool Debugger::Internal::interruptProcess(qint64 pID, int engineType, QString *errorMessage, const bool engineExecutableIs64Bit)
+bool Debugger::Internal::interruptProcess(qint64 pID, QString *errorMessage)
 {
     bool ok = false;
     HANDLE inferior = NULL;
-    do {
-        const DWORD rights = PROCESS_QUERY_INFORMATION|PROCESS_SET_INFORMATION
-                |PROCESS_VM_OPERATION|PROCESS_VM_WRITE|PROCESS_VM_READ
-                |PROCESS_DUP_HANDLE|PROCESS_TERMINATE|PROCESS_CREATE_THREAD|PROCESS_SUSPEND_RESUME;
-        inferior = OpenProcess(rights, FALSE, DWORD(pID));
-        if (inferior == NULL) {
-            *errorMessage = QString::fromLatin1("Cannot open process %1: %2").
-                    arg(pID).arg(Utils::winErrorMessage(GetLastError()));
-            break;
-        }
+    const DWORD rights = PROCESS_QUERY_INFORMATION | PROCESS_SET_INFORMATION | PROCESS_VM_OPERATION
+                         | PROCESS_VM_WRITE | PROCESS_VM_READ | PROCESS_DUP_HANDLE
+                         | PROCESS_TERMINATE | PROCESS_CREATE_THREAD | PROCESS_SUSPEND_RESUME;
+    inferior = OpenProcess(rights, FALSE, DWORD(pID));
+    if (inferior == NULL) {
+        *errorMessage = QString::fromLatin1("Cannot open process %1: %2")
+                            .arg(pID)
+                            .arg(Utils::winErrorMessage(GetLastError()));
+    } else if (ok = DebugBreakProcess(inferior); !ok) {
+        *errorMessage = "DebugBreakProcess failed: " + Utils::winErrorMessage(GetLastError());
+    }
 
-        enum DebugBreakApi {
-            UseDebugBreakApi,
-            UseWin64Interrupt,
-            UseWin32Interrupt
-        };
-/*
-    Windows 64 bit has a 32 bit subsystem (WOW64) which makes it possible to run a
-    32 bit application inside a 64 bit environment.
-    When GDB is used DebugBreakProcess must be called from the same system (32/64 bit) running
-    the inferior. If CDB is used we could in theory break wow64 processes,
-    but the break is actually a wow64 breakpoint. CDB is configured to ignore these
-    breakpoints, because they also appear on module loading.
-    Therefore we need helper executables (win(32/64)interrupt.exe) on Windows 64 bit calling
-    DebugBreakProcess from the correct system.
-
-    DebugBreak matrix for windows
-
-    Api = UseDebugBreakApi
-    Win64 = UseWin64Interrupt
-    Win32 = UseWin32Interrupt
-    N/A = This configuration is not possible
-
-          | Windows 32bit   | Windows 64bit
-          | QtCreator 32bit | QtCreator 32bit                   | QtCreator 64bit
-          | Inferior 32bit  | Inferior 32bit  | Inferior 64bit  | Inferior 32bit  | Inferior 64bit |
-----------|-----------------|-----------------|-----------------|-----------------|----------------|
-CDB 32bit | Api             | Api             | NA              | Win32           | NA             |
-    64bit | NA              | Win64           | Win64           | Api             | Api            |
-----------|-----------------|-----------------|-----------------|-----------------|----------------|
-GDB 32bit | Api             | Api             | NA              | Win32           | NA             |
-    64bit | NA              | Api             | Win64           | Win32           | Api            |
-----------|-----------------|-----------------|-----------------|-----------------|----------------|
-
-*/
-
-        DebugBreakApi breakApi = UseDebugBreakApi;
-#ifdef Q_OS_WIN64
-        if ((engineType == GdbEngineType && isWow64Process(inferior))
-                || (engineType == CdbEngineType && !engineExecutableIs64Bit)) {
-            breakApi = UseWin32Interrupt;
-        }
-#else
-        if (isWow64Process(GetCurrentProcess())
-                && ((engineType == CdbEngineType && engineExecutableIs64Bit)
-                    || (engineType == GdbEngineType && !isWow64Process(inferior)))) {
-            breakApi = UseWin64Interrupt;
-        }
-#endif
-        if (breakApi == UseDebugBreakApi) {
-            ok = DebugBreakProcess(inferior);
-            if (!ok)
-                *errorMessage = "DebugBreakProcess failed: " + Utils::winErrorMessage(GetLastError());
-        } else {
-            const QString executable = breakApi == UseWin32Interrupt
-                    ? QCoreApplication::applicationDirPath() + "/win32interrupt.exe"
-                    : QCoreApplication::applicationDirPath() + "/win64interrupt.exe";
-            if (!QFileInfo::exists(executable)) {
-                *errorMessage = QString::fromLatin1(
-                                    "%1 does not exist. If you have built %2 "
-                                    "on your own, checkout "
-                                    "https://code.qt.io/cgit/qt-creator/binary-artifacts.git/.")
-                                    .arg(QDir::toNativeSeparators(executable),
-                                         QGuiApplication::applicationDisplayName());
-                break;
-            }
-            switch (QProcess::execute(executable, QStringList(QString::number(pID)))) {
-            case -2:
-                *errorMessage = QString::fromLatin1("Cannot start %1. Check src\\tools\\win64interrupt\\win64interrupt.c for more information.").
-                                arg(QDir::toNativeSeparators(executable));
-                break;
-            case 0:
-                ok = true;
-                break;
-            default:
-                *errorMessage = QDir::toNativeSeparators(executable)
-                                + " could not break the process.";
-                break;
-            }
-            break;
-        }
-    } while (false);
     if (inferior != NULL)
         CloseHandle(inferior);
     if (!ok)
@@ -159,8 +54,7 @@ GDB 32bit | Api             | Api             | NA              | Win32
 #include <errno.h>
 #include <string.h>
 
-bool Debugger::Internal::interruptProcess(qint64 pID, int /* engineType */,
-                                          QString *errorMessage, const bool /*engineExecutableIs64Bit*/)
+bool Debugger::Internal::interruptProcess(qint64 pID, QString *errorMessage)
 {
     if (pID <= 0) {
         *errorMessage = msgCannotInterrupt(pID, QString::fromLatin1("Invalid process id."));
diff --git a/src/plugins/debugger/procinterrupt.h b/src/plugins/debugger/procinterrupt.h
index c7872ed2e42..ef4d20300db 100644
--- a/src/plugins/debugger/procinterrupt.h
+++ b/src/plugins/debugger/procinterrupt.h
@@ -7,7 +7,6 @@
 
 namespace Debugger::Internal {
 
-bool interruptProcess(qint64 pID, int engineType, QString *errorMessage,
-                      const bool engineExecutableIs64Bit = false);
+bool interruptProcess(qint64 pID, QString *errorMessage);
 
 } // Debugger::Internal
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index dda927f0f17..489aaae7900 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -783,7 +783,7 @@ void QmlEngine::assignValueInDebugger(WatchItem *item,
     const QString &expression, const QVariant &editValue)
 {
     if (!expression.isEmpty()) {
-        QTC_CHECK(editValue.typeId() == QVariant::String);
+        QTC_CHECK(editValue.typeId() == QMetaType::QString);
         QVariant value;
         QString val = editValue.toString();
         if (item->type == "boolean")
@@ -861,7 +861,7 @@ static ConsoleItem *constructLogItemTree(const QVariant &result, const QString &
 
     QString text;
     ConsoleItem *item = nullptr;
-    if (result.typeId() == QVariant::Map) {
+    if (result.typeId() == QMetaType::QVariantMap) {
         if (key.isEmpty())
             text = "Object";
         else
@@ -885,7 +885,7 @@ static ConsoleItem *constructLogItemTree(const QVariant &result, const QString &
                 item->appendChild(child);
         }
 
-    } else if (result.typeId() == QVariant::List) {
+    } else if (result.typeId() == QMetaType::QVariantList) {
         if (key.isEmpty())
             text = "List";
         else
@@ -904,7 +904,7 @@ static ConsoleItem *constructLogItemTree(const QVariant &result, const QString &
             if (child)
                 item->appendChild(child);
         }
-    } else if (result.canConvert(QVariant::String)) {
+    } else if (result.canConvert(QMetaType(QMetaType::QString))) {
         item = new ConsoleItem(ConsoleItem::DefaultType, result.toString());
     } else {
         item = new ConsoleItem(ConsoleItem::DefaultType, "Unknown Value");
@@ -1356,9 +1356,9 @@ void QmlEnginePrivate::scripts(int types, const QList<int> ids, bool includeSour
     if (includeSource)
         cmd.arg(INCLUDESOURCE, includeSource);
 
-    if (filter.typeId() == QVariant::String)
+    if (filter.typeId() == QMetaType::QString)
         cmd.arg(FILTER, filter.toString());
-    else if (filter.typeId() == QVariant::Int)
+    else if (filter.typeId() == QMetaType::Int)
         cmd.arg(FILTER, filter.toInt());
     else
         QTC_CHECK(!filter.isValid());
@@ -2041,7 +2041,7 @@ StackFrame QmlEnginePrivate::extractStackFrame(const QVariant &bodyVal)
     }
 
     auto extractString = [this](const QVariant &item) {
-        return (item.typeId() == QVariant::String ? item : extractData(item).value).toString();
+        return (item.typeId() == QMetaType::QString ? item : extractData(item).value).toString();
     };
 
     stackFrame.function = extractString(body.value("func"));
diff --git a/src/plugins/debugger/qml/qmlinspectoragent.cpp b/src/plugins/debugger/qml/qmlinspectoragent.cpp
index 9e30d2ad838..2769d49cd60 100644
--- a/src/plugins/debugger/qml/qmlinspectoragent.cpp
+++ b/src/plugins/debugger/qml/qmlinspectoragent.cpp
@@ -220,7 +220,7 @@ void QmlInspectorAgent::onResult(quint32 queryId, const QVariant &value,
 
     if (m_objectTreeQueryIds.contains(queryId)) {
         m_objectTreeQueryIds.removeOne(queryId);
-        if (value.typeId() == QVariant::List) {
+        if (value.typeId() == QMetaType::QVariantList) {
             const QVariantList objList = value.toList();
             for (const QVariant &var : objList) {
                 // TODO: check which among the list is the actual
@@ -289,7 +289,7 @@ static void sortChildrenIfNecessary(WatchItem *propertiesWatch)
 static bool insertChildren(WatchItem *parent, const QVariant &value)
 {
     switch (value.typeId()) {
-    case QVariant::Map: {
+    case QMetaType::QVariantMap: {
         const QVariantMap map = value.toMap();
         for (auto it = map.begin(), end = map.end(); it != end; ++it) {
             auto child = new WatchItem;
@@ -303,7 +303,7 @@ static bool insertChildren(WatchItem *parent, const QVariant &value)
         sortChildrenIfNecessary(parent);
         return true;
     }
-    case QVariant::List: {
+    case QMetaType::QVariantList: {
         const QVariantList list = value.toList();
         for (int i = 0, end = list.size(); i != end; ++i) {
             auto child = new WatchItem;
diff --git a/src/plugins/debugger/terminal.cpp b/src/plugins/debugger/terminal.cpp
index e96e8b072d5..3ca2b004c20 100644
--- a/src/plugins/debugger/terminal.cpp
+++ b/src/plugins/debugger/terminal.cpp
@@ -175,7 +175,7 @@ void TerminalRunner::start()
     ProcessRunData stub = m_stubRunnable();
 
     bool runAsRoot = false;
-    if (auto runAsRootAspect = runControl()->aspect<RunAsRootAspect>())
+    if (auto runAsRootAspect = runControl()->aspectData<RunAsRootAspect>())
         runAsRoot = runAsRootAspect->value;
 
     m_stubProc = new Process(this);
diff --git a/src/plugins/debugger/watchdata.h b/src/plugins/debugger/watchdata.h
index 672ded5e7c6..914e92decfb 100644
--- a/src/plugins/debugger/watchdata.h
+++ b/src/plugins/debugger/watchdata.h
@@ -33,7 +33,7 @@ public:
     QString toToolTip() const;
 
     QVariant editValue() const;
-    int editType() const;
+    QMetaType::Type editType() const;
 
     static const qint64 InvalidId = -1;
     constexpr static char loadMoreName[] = "<load more>";
diff --git a/src/plugins/debugger/watchdelegatewidgets.cpp b/src/plugins/debugger/watchdelegatewidgets.cpp
index b9337f2eea7..ecaa0fda91e 100644
--- a/src/plugins/debugger/watchdelegatewidgets.cpp
+++ b/src/plugins/debugger/watchdelegatewidgets.cpp
@@ -189,25 +189,25 @@ void IntegerWatchLineEdit::setModelData(const QVariant &v)
         qDebug(">IntegerLineEdit::setModelData(%s, '%s'): base=%d, signed=%d, bigint=%d",
                v.typeName(), qPrintable(v.toString()),
                base(), isSigned(), isBigInt());
-    switch (v.type()) {
-    case QVariant::Int:
-    case QVariant::LongLong: {
+    switch (v.typeId()) {
+    case QMetaType::Int:
+    case QMetaType::LongLong: {
         const qint64 iv = v.toLongLong();
         setSigned(true);
         setText(QString::number(iv, base()));
     }
         break;
-    case QVariant::UInt:
-    case QVariant::ULongLong: {
+    case QMetaType::UInt:
+    case QMetaType::ULongLong: {
          const quint64 iv = v.toULongLong();
          setSigned(false);
          setText(QString::number(iv, base()));
         }
         break;
-    case QVariant::ByteArray:
+    case QMetaType::QByteArray:
         setNumberText(QString::fromLatin1(v.toByteArray()));
         break;
-    case QVariant::String:
+    case QMetaType::QString:
         setNumberText(v.toString());
         break;
     default:
@@ -243,12 +243,12 @@ void FloatWatchLineEdit::setModelData(const QVariant &v)
     if (debug)
         qDebug("FloatWatchLineEdit::setModelData(%s, '%s')",
                v.typeName(), qPrintable(v.toString()));
-    switch (v.type()) {
-    case QVariant::Double:
-    case QVariant::String:
+    switch (v.typeId()) {
+    case QMetaType::Double:
+    case QMetaType::QString:
         setText(v.toString());
         break;
-    case QVariant::ByteArray:
+    case QMetaType::QByteArray:
         setText(QString::fromLatin1(v.toByteArray()));
         break;
     default:
@@ -259,17 +259,17 @@ void FloatWatchLineEdit::setModelData(const QVariant &v)
     }
 }
 
-WatchLineEdit *WatchLineEdit::create(QVariant::Type t, QWidget *parent)
+WatchLineEdit *WatchLineEdit::create(QMetaType::Type typeId, QWidget *parent)
 {
-    switch (t) {
-    case QVariant::Bool:
-    case QVariant::Int:
-    case QVariant::UInt:
-    case QVariant::LongLong:
-    case QVariant::ULongLong:
+    switch (typeId) {
+    case QMetaType::Bool:
+    case QMetaType::Int:
+    case QMetaType::UInt:
+    case QMetaType::LongLong:
+    case QMetaType::ULongLong:
         return new IntegerWatchLineEdit(parent);
         break;
-    case QVariant::Double:
+    case QMetaType::Double:
         return new FloatWatchLineEdit(parent);
     default:
         break;
@@ -297,14 +297,14 @@ void BooleanComboBox::setModelData(const QVariant &v)
         qDebug("BooleanComboBox::setModelData(%s, '%s')", v.typeName(), qPrintable(v.toString()));
 
     bool value = false;
-    switch (v.type()) {
-    case QVariant::Bool:
+    switch (v.typeId()) {
+    case QMetaType::Bool:
         value = v.toBool();
         break;
-    case QVariant::Int:
-    case QVariant::UInt:
-    case QVariant::LongLong:
-    case QVariant::ULongLong:
+    case QMetaType::Int:
+    case QMetaType::UInt:
+    case QMetaType::LongLong:
+    case QMetaType::ULongLong:
         value = v.toInt() != 0;
         break;
     default:
diff --git a/src/plugins/debugger/watchdelegatewidgets.h b/src/plugins/debugger/watchdelegatewidgets.h
index 68b1dd24032..54b85c62574 100644
--- a/src/plugins/debugger/watchdelegatewidgets.h
+++ b/src/plugins/debugger/watchdelegatewidgets.h
@@ -27,7 +27,7 @@ public:
     virtual QVariant modelData() const;
     virtual void setModelData(const QVariant &);
 
-    static WatchLineEdit *create(QVariant::Type t, QWidget *parent = nullptr);
+    static WatchLineEdit *create(QMetaType::Type typeId, QWidget *parent = nullptr);
 };
 
 /* Watch delegate line edit for integer numbers based on quint64/qint64.
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 0cc67f54161..c5600cd9ee8 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -469,7 +469,6 @@ public:
 
     QSet<QString> m_expandedINames;
     QHash<QString, int> m_maxArrayCount;
-    QTimer m_requestUpdateTimer;
     QTimer m_localsWindowsTimer;
 
     QHash<QString, TypeInfo> m_reportedTypeInfo;
@@ -513,10 +512,6 @@ WatchModel::WatchModel(WatchHandler *handler, DebuggerEngine *engine)
     root->appendChild(m_tooltipRoot);
     setRootItem(root);
 
-    m_requestUpdateTimer.setSingleShot(true);
-    connect(&m_requestUpdateTimer, &QTimer::timeout,
-        this, &WatchModel::updateStarted);
-
     m_localsWindowsTimer.setSingleShot(true);
     m_localsWindowsTimer.setInterval(50);
     connect(&m_localsWindowsTimer, &QTimer::timeout, this, [this] {
@@ -849,33 +844,33 @@ static inline quint64 pointerValue(QString data)
 }
 
 // Return the type used for editing
-int WatchItem::editType() const
+QMetaType::Type WatchItem::editType() const
 {
     if (type == "bool")
-        return QVariant::Bool;
+        return QMetaType::Bool;
     if (isIntType(type))
-        return type.contains('u') ? QVariant::ULongLong : QVariant::LongLong;
+        return type.contains('u') ? QMetaType::ULongLong : QMetaType::LongLong;
     if (isFloatType(type))
-        return QVariant::Double;
+        return QMetaType::Double;
     // Check for pointers using hex values (0xAD00 "Hallo")
     if (isPointerType(type) && value.startsWith("0x"))
-        return QVariant::ULongLong;
-   return QVariant::String;
+        return QMetaType::ULongLong;
+   return QMetaType::QString;
 }
 
 // Convert to editable (see above)
 QVariant WatchItem::editValue() const
 {
     switch (editType()) {
-    case QVariant::Bool:
+    case QMetaType::Bool:
         return value != "0" && value != "false";
-    case QVariant::ULongLong:
+    case QMetaType::ULongLong:
         if (isPointerType(type)) // Fix pointer values (0xAD00 "Hallo" -> 0xAD00)
             return QVariant(pointerValue(value));
         return QVariant(value.toULongLong());
-    case QVariant::LongLong:
+    case QMetaType::LongLong:
         return QVariant(value.toLongLong());
-    case QVariant::Double:
+    case QMetaType::Double:
         return QVariant(value.toDouble());
     default:
         break;
@@ -983,7 +978,7 @@ static QColor valueColor(const WatchItem *item, int column)
                 color = Theme::Debugger_WatchItem_ValueChanged;
         }
     }
-    return creatorTheme()->color(color);
+    return creatorColor(color);
 }
 
 static DisplayFormats typeFormatList(const WatchItem *item)
@@ -2310,7 +2305,7 @@ void WatchHandler::notifyUpdateStarted(const UpdateParameters &updateParameters)
         }
     }
 
-    m_model->m_requestUpdateTimer.start(80);
+    emit m_model->updateStarted();
     m_model->m_contentsValid = false;
     updateLocalsWindow();
 }
@@ -2350,7 +2345,6 @@ void WatchHandler::notifyUpdateFinished()
     m_model->m_contentsValid = true;
     updateLocalsWindow();
     m_model->reexpandItems();
-    m_model->m_requestUpdateTimer.stop();
     emit m_model->updateFinished();
 }
 
@@ -2894,8 +2888,8 @@ public:
 
         // Value column: Custom editor. Apply integer-specific settings.
         if (index.column() == 1) {
-            auto editType = QVariant::Type(item->editType());
-            if (editType == QVariant::Bool)
+            const QMetaType::Type editType = item->editType();
+            if (editType == QMetaType::Bool)
                 return new BooleanComboBox(parent);
 
             WatchLineEdit *edit = WatchLineEdit::create(editType, parent);
diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp
index 4e95b04b6f5..a75e824d703 100644
--- a/src/plugins/debugger/watchwindow.cpp
+++ b/src/plugins/debugger/watchwindow.cpp
@@ -8,6 +8,7 @@
 #include "debuggertr.h"
 #include "watchhandler.h"
 
+#include <utils/algorithm.h>
 #include <utils/aspects.h>
 #include <utils/qtcassert.h>
 
@@ -29,6 +30,10 @@ WatchTreeView::WatchTreeView(WatchType type)
     setAcceptDrops(true);
     setDropIndicatorShown(true);
 
+    m_progressDelayTimer.setSingleShot(true);
+    m_progressDelayTimer.setInterval(80);
+    connect(&m_progressDelayTimer, &QTimer::timeout, this, &WatchTreeView::showProgressIndicator);
+
     connect(this, &QTreeView::expanded, this, &WatchTreeView::expandNode);
     connect(this, &QTreeView::collapsed, this, &WatchTreeView::collapseNode);
 
@@ -71,12 +76,10 @@ void WatchTreeView::setModel(QAbstractItemModel *model)
             this, &QAbstractItemView::setCurrentIndex);
     connect(watchModel, &WatchModelBase::itemIsExpanded,
             this, &WatchTreeView::handleItemIsExpanded);
-    if (m_type == LocalsType) {
-        connect(watchModel, &WatchModelBase::updateStarted,
-                this, &WatchTreeView::showProgressIndicator);
-        connect(watchModel, &WatchModelBase::updateFinished,
-                this, &WatchTreeView::hideProgressIndicator);
-    }
+    connect(watchModel, &WatchModelBase::updateStarted,
+            this, &WatchTreeView::handleUpdateStarted);
+    connect(watchModel, &WatchModelBase::updateFinished,
+            this, &WatchTreeView::handleUpdateFinished);
 
     updateTimeColumn();
 }
@@ -95,6 +98,39 @@ void WatchTreeView::handleItemIsExpanded(const QModelIndex &idx)
         expand(idx);
 }
 
+void WatchTreeView::handleUpdateStarted()
+{
+    m_selectedInames = Utils::transform(selectedIndexes(), [this](const QModelIndex &idx) {
+        return model()->data(idx, LocalsINameRole).toString();
+    });
+    m_currentIname = currentIndex().data(LocalsINameRole).toString();
+    if (m_type == LocalsType)
+        m_progressDelayTimer.start();
+}
+
+void WatchTreeView::handleUpdateFinished()
+{
+    m_progressDelayTimer.stop();
+    if (m_type == LocalsType)
+        hideProgressIndicator();
+
+    auto watchModel = qobject_cast<WatchModelBase *>(model());
+    QTC_ASSERT(watchModel, return);
+    QItemSelection selection;
+    QModelIndex currentIndex;
+    watchModel->forAllItems([&](Utils::TreeItem *item) {
+        const QModelIndex index = item->index();
+        const QString iName = index.data(LocalsINameRole).toString();
+        if (m_selectedInames.contains(iName))
+            selection.append(QItemSelectionRange(index));
+        if (iName == m_currentIname)
+            currentIndex = index;
+    });
+    selectionModel()->select(selection, QItemSelectionModel::Select);
+    if (currentIndex.isValid())
+        setCurrentIndex(currentIndex);
+}
+
 void WatchTreeView::reexpand(QTreeView *view, const QModelIndex &idx)
 {
     if (idx.data(LocalsExpandedRole).toBool()) {
diff --git a/src/plugins/debugger/watchwindow.h b/src/plugins/debugger/watchwindow.h
index 775ac372de8..0a2de549b17 100644
--- a/src/plugins/debugger/watchwindow.h
+++ b/src/plugins/debugger/watchwindow.h
@@ -5,6 +5,8 @@
 
 #include <utils/basetreeview.h>
 
+#include <QTimer>
+
 namespace Debugger {
 namespace Internal {
 
@@ -26,6 +28,8 @@ public:
     void watchExpression(const QString &exp);
     void watchExpression(const QString &exp, const QString &name);
     void handleItemIsExpanded(const QModelIndex &idx);
+    void handleUpdateStarted();
+    void handleUpdateFinished();
 
 signals:
     void currentIndexChanged(const QModelIndex &currentIndex);
@@ -42,6 +46,9 @@ private:
 
     WatchType m_type;
     int m_sliderPosition = 0;
+    QStringList m_selectedInames;
+    QString m_currentIname;
+    QTimer m_progressDelayTimer;
 };
 
 } // namespace Internal
diff --git a/src/plugins/designer/CMakeLists.txt b/src/plugins/designer/CMakeLists.txt
index c7b3cdac0d1..c8f84ffb2df 100644
--- a/src/plugins/designer/CMakeLists.txt
+++ b/src/plugins/designer/CMakeLists.txt
@@ -5,12 +5,12 @@ if(Qt6_VERSION VERSION_GREATER_EQUAL 6.7.0)
     {
         \"Name\" : \"-designer-qt-pluginpath\",
         \"Parameter\" : \"path\",
-        \"Description\" : \"Override the default search path for Qt Designer plugins\"
+        \"Description\" : \"Override the default search path for Qt Widgets Designer plugins\"
     },
     {
         \"Name\" : \"-designer-pluginpath\",
         \"Parameter\" : \"path\",
-        \"Description\" : \"Add a custom search path for Qt Designer plugins\"
+        \"Description\" : \"Add a custom search path for Qt Widgets Designer plugins\"
     }
     ],")
 else()
@@ -19,13 +19,13 @@ else()
     {
         \"Name\" : \"-designer-qt-pluginpath\",
         \"Parameter\" : \"path\",
-        \"Description\" : \"Override the default search path for Qt Designer plugins\"
+        \"Description\" : \"Override the default search path for Qt Widgets Designer plugins\"
     }
     ],")
 endif()
 
 add_qtc_plugin(Designer
-  PLUGIN_CLASS FormEditorPlugin
+  PLUGIN_CLASS DesignerPlugin
   CONDITION TARGET Qt::DesignerComponentsPrivate AND TARGET Qt::Designer
   DEPENDS designerintegrationv2
     Qt::Designer Qt::PrintSupport Qt::DesignerComponentsPrivate
diff --git a/src/plugins/designer/Designer.json.in b/src/plugins/designer/Designer.json.in
index 2d03527c30a..5f735730f70 100644
--- a/src/plugins/designer/Designer.json.in
+++ b/src/plugins/designer/Designer.json.in
@@ -13,8 +13,11 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Qt Creator",
-    "Description" : "Qt Designer integration.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Design Qt-widgets based UIs.",
+    "LongDescription" : [
+        "Create widgets and forms that are integrated with Qt C++ code."
+    ],
+    "Url" : "https://www.qt.io",
     ${DESIGNER_PLUGIN_ARGUMENTS}
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/designer/cpp/formclasswizarddialog.cpp b/src/plugins/designer/cpp/formclasswizarddialog.cpp
index cc912683f69..765bf470a0e 100644
--- a/src/plugins/designer/cpp/formclasswizarddialog.cpp
+++ b/src/plugins/designer/cpp/formclasswizarddialog.cpp
@@ -27,7 +27,7 @@ FormClassWizardDialog::FormClassWizardDialog(const Core::BaseFileWizardFactory *
     m_formPage(new FormTemplateWizardPage),
     m_classPage(new FormClassWizardPage)
 {
-    setWindowTitle(Tr::tr("Qt Designer Form Class"));
+    setWindowTitle(Tr::tr("Qt Widgets Designer Form Class"));
 
     setPage(FormPageId, m_formPage);
     setPage(ClassPageId, m_classPage);
diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs
index 7fb484226be..38cfa5aa0de 100644
--- a/src/plugins/designer/designer.qbs
+++ b/src/plugins/designer/designer.qbs
@@ -32,12 +32,12 @@ QtcPlugin {
         {\n\
             \"Name\" : \"-designer-qt-pluginpath\",\n\
             \"Parameter\" : \"path\",\n\
-            \"Description\" : \"Override the default search path for Qt Designer plugins\"\n\
+            \"Description\" : \"Override the default search path for Qt Widgets Designer plugins\"\n\
         },\n\
         {\n\
             \"Name\" : \"-designer-pluginpath\",\n\
             \"Parameter\" : \"path\",\n\
-            \"Description\" : \"Add a custom search path for Qt Designer plugins\"\n\
+            \"Description\" : \"Add a custom search path for Qt Widgets Designer plugins\"\n\
         }\n\
     ],"})
 
diff --git a/src/plugins/designer/designerplugin.cpp b/src/plugins/designer/designerplugin.cpp
index e355379727b..cc7b43a0a68 100644
--- a/src/plugins/designer/designerplugin.cpp
+++ b/src/plugins/designer/designerplugin.cpp
@@ -139,11 +139,13 @@ class DesignerPlugin final : public ExtensionSystem::IPlugin
             IWizardFactory *wizard = new FormClassWizard;
             wizard->setCategory(Core::Constants::WIZARD_CATEGORY_QT);
             wizard->setDisplayCategory(::Core::Tr::tr(Core::Constants::WIZARD_TR_CATEGORY_QT));
-            wizard->setDisplayName(Tr::tr("Qt Designer Form Class"));
+            wizard->setDisplayName(Tr::tr("Qt Widgets Designer Form Class"));
             wizard->setIcon({}, "ui/h");
             wizard->setId("C.FormClass");
-            wizard->setDescription(Tr::tr("Creates a Qt Designer form along with a matching class (C++ header and source file) "
-                                          "for implementation purposes. You can add the form and class to an existing Qt Widget Project."));
+            wizard->setDescription(Tr::tr("Creates a Qt Widgets Designer form along with a matching "
+                                          "class (C++ header and source file) "
+                                          "for implementation purposes. You can add the form and "
+                                          "class to an existing Qt Widget Project."));
 
             return wizard;
         });
diff --git a/src/plugins/designer/formeditor.cpp b/src/plugins/designer/formeditor.cpp
index 46afe017d02..dd99b4194fb 100644
--- a/src/plugins/designer/formeditor.cpp
+++ b/src/plugins/designer/formeditor.cpp
@@ -370,7 +370,7 @@ void FormEditorData::fullInit()
     initDesignerSubWindows();
     m_integration = new QtCreatorIntegration(m_formeditor, this);
     m_formeditor->setIntegration(m_integration);
-    // Connect Qt Designer help request to HelpManager.
+    // Connect Qt Widgets Designer help request to HelpManager.
     QObject::connect(m_integration, &QtCreatorIntegration::creatorHelpRequested,
                      HelpManager::Signals::instance(),
                      [](const QUrl &url) { HelpManager::showHelpUrl(url, HelpManager::HelpModeAlways); });
@@ -657,7 +657,7 @@ void FormEditorData::setupActions()
                   QString(), Core::Constants::G_DEFAULT_THREE);
 
     mformtools->addSeparator(m_contexts, Core::Constants::G_DEFAULT_THREE);
-    m_actionAboutPlugins = new QAction(Tr::tr("About Qt Designer Plugins..."), d);
+    m_actionAboutPlugins = new QAction(Tr::tr("About Qt Widgets Designer Plugins..."), d);
     addToolAction(m_actionAboutPlugins, m_contexts, "FormEditor.AboutPlugins", mformtools,
                   QString(), Core::Constants::G_DEFAULT_THREE);
     QObject::connect(m_actionAboutPlugins, &QAction::triggered,
@@ -707,7 +707,7 @@ ActionContainer *FormEditorData::createPreviewStyleMenu(QActionGroup *actionGrou
         QString name = menuId;
         name += dot;
         const QVariant data = a->data();
-        const bool isDeviceProfile = data.typeId() == QVariant::Int;
+        const bool isDeviceProfile = data.typeId() == QMetaType::Int;
         if (isDeviceProfile) {
             name += deviceProfilePrefix;
             name += dot;
diff --git a/src/plugins/designer/formeditor.h b/src/plugins/designer/formeditor.h
index e3bf9c8ebf3..0419789f5d8 100644
--- a/src/plugins/designer/formeditor.h
+++ b/src/plugins/designer/formeditor.h
@@ -35,7 +35,7 @@ namespace Internal {
   * This is based on the assumption that the Designer settings work with
   * no plugins loaded.
   *
-  * The form editor shows a read-only XML editor in edit mode and Qt Designer
+  * The form editor shows a read-only XML editor in edit mode and Qt Widgets Designer
   * in Design mode. */
 
 enum InitializationStage {
diff --git a/src/plugins/designer/formeditorstack.cpp b/src/plugins/designer/formeditorstack.cpp
index 1bccd341784..6631de9a4cc 100644
--- a/src/plugins/designer/formeditorstack.cpp
+++ b/src/plugins/designer/formeditorstack.cpp
@@ -24,6 +24,19 @@
 #include <QDebug>
 #include <QRect>
 
+/*!
+    \class Designer::Internal::FormEditorStack
+    \inmodule QtCreator
+    \internal
+
+    \brief The FormEditorStack class maintains a stack of \QD form windows embedded
+    into a scroll area and their associated XML editors.
+
+    Takes care of updating the XML editor once design mode is left.
+    Also updates the mainc ontainer resize handles when the active form
+    window changes.
+*/
+
 namespace Designer {
 namespace Internal {
 
diff --git a/src/plugins/designer/formeditorstack.h b/src/plugins/designer/formeditorstack.h
index 0f6425e96b6..125ae2940c5 100644
--- a/src/plugins/designer/formeditorstack.h
+++ b/src/plugins/designer/formeditorstack.h
@@ -20,11 +20,6 @@ namespace Core { class IEditor; }
 namespace Designer {
 namespace Internal {
 
-/* FormEditorStack: Maintains a stack of Qt Designer form windows embedded
- * into a scrollarea and their associated XML editors.
- * Takes care of updating the XML editor once design mode is left.
- * Also updates the maincontainer resize handles when the active form
- * window changes. */
 class FormEditorStack : public QStackedWidget
 {
     Q_OBJECT
diff --git a/src/plugins/designer/formtemplatewizardpage.cpp b/src/plugins/designer/formtemplatewizardpage.cpp
index 68e3fb17111..cfe02e52632 100644
--- a/src/plugins/designer/formtemplatewizardpage.cpp
+++ b/src/plugins/designer/formtemplatewizardpage.cpp
@@ -45,7 +45,7 @@ Utils::WizardPage *FormPageFactory::create(ProjectExplorer::JsonWizard *wizard,
 bool FormPageFactory::validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage)
 {
     QTC_ASSERT(canCreate(typeId), return false);
-    if (!data.isNull() && (data.type() != QVariant::Map || !data.toMap().isEmpty())) {
+    if (!data.isNull() && (data.typeId() != QMetaType::QVariantMap || !data.toMap().isEmpty())) {
         *errorMessage = ::ProjectExplorer::Tr::tr(
                     "\"data\" for a \"Form\" page needs to be unset or an empty object.");
         return false;
diff --git a/src/plugins/designer/formtemplatewizardpage.h b/src/plugins/designer/formtemplatewizardpage.h
index 96bcb2c74e4..40f04342214 100644
--- a/src/plugins/designer/formtemplatewizardpage.h
+++ b/src/plugins/designer/formtemplatewizardpage.h
@@ -24,7 +24,7 @@ public:
     bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) override;
 };
 
-// A wizard page embedding Qt Designer's QDesignerNewFormWidgetInterface
+// A wizard page embedding Qt Widgets Designer's QDesignerNewFormWidgetInterface
 // widget.
 
 // Sets FormContents property.
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp
index 267e0ddeeba..5e6d8900959 100644
--- a/src/plugins/designer/qtcreatorintegration.cpp
+++ b/src/plugins/designer/qtcreatorintegration.cpp
@@ -627,10 +627,7 @@ bool QtCreatorIntegration::navigateToSlot(const QString &objectName,
         const RefactoringFilePtr file = refactoring.file(location.filePath());
         const int insertionPos = Utils::Text::positionInText(file->document(),
                                                              location.line(), location.column());
-        ChangeSet changeSet;
-        changeSet.insert(insertionPos, definition);
-        file->setChangeSet(changeSet);
-        file->apply();
+        file->apply(ChangeSet::makeInsert(insertionPos, definition));
         const int indentationPos = file->document()->toPlainText().indexOf('}', insertionPos) - 1;
         QTextCursor cursor(editor->textDocument()->document());
         cursor.setPosition(indentationPos);
@@ -747,7 +744,8 @@ void QtCreatorIntegration::handleSymbolRenameStage2(
     // In the case of clangd, this entails doing a "virtual rename" on the TextDocument,
     // as the LanguageClient cannot be forced into taking a document and assuming a different
     // file path.
-    const bool usesClangd = CppEditor::CppModelManager::usesClangd(editorWidget->textDocument());
+    const bool usesClangd
+        = CppEditor::CppModelManager::usesClangd(editorWidget->textDocument()).has_value();
     if (usesClangd)
         editorWidget->textDocument()->setFilePath(uiHeader);
     editorWidget->textDocument()->setPlainText(QString::fromUtf8(virtualContent));
diff --git a/src/plugins/designer/qtdesignerformclasscodegenerator.cpp b/src/plugins/designer/qtdesignerformclasscodegenerator.cpp
index 677494658b4..d3937ff696d 100644
--- a/src/plugins/designer/qtdesignerformclasscodegenerator.cpp
+++ b/src/plugins/designer/qtdesignerformclasscodegenerator.cpp
@@ -8,6 +8,7 @@
 #include <extensionsystem/pluginmanager.h>
 #include <coreplugin/icore.h>
 #include <cppeditor/abstracteditorsupport.h>
+#include <cppeditor/cpptoolsreuse.h>
 #include <projectexplorer/projecttree.h>
 #include <qtsupport/codegenerator.h>
 #include <qtsupport/codegensettings.h>
@@ -75,7 +76,8 @@ bool QtDesignerFormClassCodeGenerator::generateCpp(const FormClassWizardParamete
     const QString sourceLicense = CppEditor::AbstractEditorSupport::licenseTemplate(
         project, FilePath::fromString(parameters.sourceFile), parameters.className);
     // Include guards
-    const QString guard = Utils::headerGuard(parameters.headerFile, namespaceList);
+    const QString guard
+        = CppEditor::deriveHeaderGuard(FilePath::fromString(parameters.headerFile), project);
 
     const QString uiInclude = "ui_" + QFileInfo(parameters.uiFile).completeBaseName() + ".h";
 
diff --git a/src/plugins/diffeditor/DiffEditor.json.in b/src/plugins/diffeditor/DiffEditor.json.in
index 8fc93667da0..4162632dfc4 100644
--- a/src/plugins/diffeditor/DiffEditor.json.in
+++ b/src/plugins/diffeditor/DiffEditor.json.in
@@ -12,7 +12,8 @@
                   "",
                   "Alternatively, this plugin 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 plugin. 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."
     ],
-    "Description" : "Diff editor component.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Compare two files or two versions of a file.",
+    "LongDescription" : [],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/diffeditor/diffeditorfactory.cpp b/src/plugins/diffeditor/diffeditorfactory.cpp
index 70537dd3f73..a3981ed49b1 100644
--- a/src/plugins/diffeditor/diffeditorfactory.cpp
+++ b/src/plugins/diffeditor/diffeditorfactory.cpp
@@ -7,8 +7,6 @@
 #include "diffeditordocument.h"
 #include "diffeditortr.h"
 
-#include "texteditor/texteditoractionhandler.h"
-
 #include <QCoreApplication>
 
 using namespace Core;
@@ -17,31 +15,7 @@ using namespace Utils;
 
 namespace DiffEditor::Internal {
 
-DiffEditorFactory::DiffEditorFactory() :
-    descriptionHandler {
-        Constants::DIFF_EDITOR_ID,
-        Constants::C_DIFF_EDITOR_DESCRIPTION,
-        TextEditorActionHandler::None,
-        [](IEditor *e) { return static_cast<DiffEditor *>(e)->descriptionWidget(); }
-    },
-    unifiedHandler {
-        Constants::DIFF_EDITOR_ID,
-        Constants::UNIFIED_VIEW_ID,
-        TextEditorActionHandler::None,
-        [](IEditor *e) { return static_cast<DiffEditor *>(e)->unifiedEditorWidget(); }
-    },
-    leftHandler {
-        Constants::DIFF_EDITOR_ID,
-        Id(Constants::SIDE_BY_SIDE_VIEW_ID).withSuffix(1),
-        TextEditorActionHandler::None,
-        [](IEditor *e) { return static_cast<DiffEditor *>(e)->sideEditorWidget(LeftSide); }
-    },
-    rightHandler {
-        Constants::DIFF_EDITOR_ID,
-        Id(Constants::SIDE_BY_SIDE_VIEW_ID).withSuffix(2),
-        TextEditorActionHandler::None,
-        [](Core::IEditor *e) { return static_cast<DiffEditor *>(e)->sideEditorWidget(RightSide); }
-    }
+DiffEditorFactory::DiffEditorFactory()
 {
     setId(Constants::DIFF_EDITOR_ID);
     setDisplayName(Tr::tr("Diff Editor"));
diff --git a/src/plugins/diffeditor/diffeditorfactory.h b/src/plugins/diffeditor/diffeditorfactory.h
index e39f0fc46fc..3c05e4af1ce 100644
--- a/src/plugins/diffeditor/diffeditorfactory.h
+++ b/src/plugins/diffeditor/diffeditorfactory.h
@@ -5,20 +5,12 @@
 
 #include <coreplugin/editormanager/ieditorfactory.h>
 
-#include <texteditor/texteditoractionhandler.h>
-
 namespace DiffEditor::Internal {
 
 class DiffEditorFactory : public Core::IEditorFactory
 {
 public:
     DiffEditorFactory();
-
-private:
-    TextEditor::TextEditorActionHandler descriptionHandler;
-    TextEditor::TextEditorActionHandler unifiedHandler;
-    TextEditor::TextEditorActionHandler leftHandler;
-    TextEditor::TextEditorActionHandler rightHandler;
 };
 
 } // namespace DiffEditor::Internal
diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp
index da2e4daaf21..22492b5123a 100644
--- a/src/plugins/diffeditor/diffeditorplugin.cpp
+++ b/src/plugins/diffeditor/diffeditorplugin.cpp
@@ -13,8 +13,6 @@
 #include <coreplugin/editormanager/documentmodel.h>
 #include <coreplugin/editormanager/editormanager.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <texteditor/textdocument.h>
 
 #include <utils/async.h>
@@ -121,7 +119,6 @@ DiffFilesController::DiffFilesController(IDocument *document)
             const auto onDiffSetup = [this, reloadInput = inputList.at(i)](Async<FileData> &async) {
                 async.setConcurrentCallData(
                     DiffFile(ignoreWhitespace(), contextLineCount()), reloadInput);
-                async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
             };
 
             const auto onDiffDone = [outputList, i](const Async<FileData> &async) {
diff --git a/src/plugins/diffeditor/selectabletexteditorwidget.cpp b/src/plugins/diffeditor/selectabletexteditorwidget.cpp
index bcb3ee0381d..af7ed7f3d16 100644
--- a/src/plugins/diffeditor/selectabletexteditorwidget.cpp
+++ b/src/plugins/diffeditor/selectabletexteditorwidget.cpp
@@ -91,12 +91,12 @@ DiffSelections SelectableTextEditorWidget::polishedSelections(const DiffSelectio
                 continue;
 
             int j = 0;
-            while (j < workingList.count()) {
+            while (j < workingList.size()) {
                 const DiffSelection existingSelection = workingList.takeAt(j);
                 const QList<DiffSelection> newSelection = subtractSelection(existingSelection, diffSelection);
-                for (int k = 0; k < newSelection.count(); k++)
+                for (int k = 0; k < newSelection.size(); k++)
                     workingList.insert(j + k, newSelection.at(k));
-                j += newSelection.count();
+                j += newSelection.size();
             }
             workingList.append(diffSelection);
         }
@@ -126,8 +126,8 @@ void SelectableTextEditorWidget::paintBlock(QPainter *painter,
             QTextLayout::FormatRange formatRange;
             formatRange.start = qMax(0, diffSelection.start);
             const int end = diffSelection.end < 0
-                    ? block.text().count() + 1
-                    : qMin(block.text().count(), diffSelection.end);
+                    ? block.text().size() + 1
+                    : qMin(block.text().size(), diffSelection.end);
 
             formatRange.length = end - formatRange.start;
             formatRange.format = *diffSelection.format;
diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
index ecdb87f80b5..65fde112c36 100644
--- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
+++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
@@ -12,8 +12,6 @@
 #include <coreplugin/minisplitter.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <texteditor/displaysettings.h>
 #include <texteditor/fontsettings.h>
 #include <texteditor/textdocument.h>
@@ -868,7 +866,6 @@ void SideBySideDiffEditorWidget::restoreState()
 void SideBySideDiffEditorWidget::showDiff()
 {
     m_asyncTask.reset(new Async<SideBySideShowResults>());
-    m_asyncTask->setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
     m_controller.setBusyShowing(true);
 
     connect(m_asyncTask.get(), &AsyncBase::done, this, [this] {
diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp
index 31d8e1b190a..0b34db53d97 100644
--- a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp
+++ b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp
@@ -10,8 +10,6 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <texteditor/fontsettings.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditorsettings.h>
@@ -451,7 +449,6 @@ void UnifiedDiffEditorWidget::showDiff()
     }
 
     m_asyncTask.reset(new Async<UnifiedShowResult>());
-    m_asyncTask->setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
     m_controller.setBusyShowing(true);
     connect(m_asyncTask.get(), &AsyncBase::done, this, [this] {
         if (m_asyncTask->isCanceled() || !m_asyncTask->isResultAvailable()) {
diff --git a/src/plugins/docker/Docker.json.in b/src/plugins/docker/Docker.json.in
index 6fc896f8032..4cbb6cbb9d9 100644
--- a/src/plugins/docker/Docker.json.in
+++ b/src/plugins/docker/Docker.json.in
@@ -13,7 +13,11 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Experimental" : true,
-    "Description" : "Basic support for Docker",
-    "Url" : "http://www.qt.io",
+    "Description" : "Create Docker devices from Docker images.",
+    "LongDescription" : [
+        "You also need:",
+            "- Docker CLI"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/docker/dockerapi.cpp b/src/plugins/docker/dockerapi.cpp
index 537b6c66f38..ccfaaf104c3 100644
--- a/src/plugins/docker/dockerapi.cpp
+++ b/src/plugins/docker/dockerapi.cpp
@@ -41,7 +41,7 @@ bool DockerApi::canConnect()
 
     bool result = false;
 
-    process.setCommand(CommandLine(dockerExe, QStringList{"info"}));
+    process.setCommand({dockerExe, {"info"}});
     connect(&process, &Process::done, [&process, &result] {
         qCInfo(dockerApiLog) << "'docker info' result:\n" << qPrintable(process.allOutput());
         if (process.result() == ProcessResult::FinishedWithSuccess)
@@ -54,6 +54,26 @@ bool DockerApi::canConnect()
     return result;
 }
 
+bool DockerApi::isContainerRunning(const QString &containerId)
+{
+    Process process;
+    FilePath dockerExe = dockerClient();
+    if (dockerExe.isEmpty() || !dockerExe.isExecutableFile())
+        return false;
+
+    process.setCommand(
+        CommandLine(dockerExe, QStringList{"inspect", "--format", "{{.State.Running}}", containerId}));
+    process.runBlocking();
+
+    if (process.result() == ProcessResult::FinishedWithSuccess) {
+        QString output = process.readAllStandardOutput().trimmed();
+        if (output == "true")
+            return true;
+    }
+
+    return false;
+}
+
 void DockerApi::checkCanConnect(bool async)
 {
     if (async) {
@@ -115,8 +135,7 @@ QFuture<Utils::expected_str<QList<Network>>> DockerApi::networks()
         if (dockerExe.isEmpty() || !dockerExe.isExecutableFile())
             return make_unexpected(Tr::tr("Docker executable not found"));
 
-        process.setCommand(
-            CommandLine(dockerExe, QStringList{"network", "ls", "--format", "{{json .}}"}));
+        process.setCommand({dockerExe, {"network", "ls", "--format", "{{json .}}"}});
         process.runBlocking();
 
         if (process.result() != ProcessResult::FinishedWithSuccess) {
diff --git a/src/plugins/docker/dockerapi.h b/src/plugins/docker/dockerapi.h
index 3e697654a3a..87301a98d1a 100644
--- a/src/plugins/docker/dockerapi.h
+++ b/src/plugins/docker/dockerapi.h
@@ -44,6 +44,8 @@ public:
     static void recheckDockerDaemon();
     QFuture<Utils::expected_str<QList<Network>>> networks();
 
+    bool isContainerRunning(const QString &containerId);
+
 signals:
     void dockerDaemonAvailableChanged();
 
diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp
index c54bd000ebe..464a76be982 100644
--- a/src/plugins/docker/dockerdevice.cpp
+++ b/src/plugins/docker/dockerdevice.cpp
@@ -341,8 +341,6 @@ public:
         return deviceSettings->clangdExecutable();
     }
 
-    bool addTemporaryMount(const FilePath &path, const FilePath &containerPath);
-
     QStringList createMountArgs() const;
 
     bool isImageAvailable() const;
@@ -350,14 +348,12 @@ public:
     DockerDevice *const q;
     DockerDeviceSettings *deviceSettings;
 
-    struct TemporaryMountInfo
+    struct MountPair
     {
         FilePath path;
         FilePath containerPath;
     };
 
-    QList<TemporaryMountInfo> m_temporaryMounts;
-
     QMutex m_shellMutex;
     std::unique_ptr<ContainerShell> m_shell;
 
@@ -609,7 +605,7 @@ DockerDevice::DockerDevice(std::unique_ptr<DockerDeviceSettings> deviceSettings)
         proc.setTerminalMode(TerminalMode::Detached);
         proc.setEnvironment(env);
         proc.setWorkingDirectory(workingDir);
-        proc.setCommand({*shell, {}});
+        proc.setCommand(CommandLine{*shell});
         proc.start();
 
         return {};
@@ -750,7 +746,7 @@ QString escapeMountPath(const FilePath &fp)
     return escapeMountPathUnix(fp);
 }
 
-QStringList toMountArg(const DockerDevicePrivate::TemporaryMountInfo &mi)
+QStringList toMountArg(const DockerDevicePrivate::MountPair &mi)
 {
     QString escapedPath;
     QString escapedContainerPath;
@@ -765,7 +761,7 @@ QStringList toMountArg(const DockerDevicePrivate::TemporaryMountInfo &mi)
     return QStringList{"--mount", mountArg};
 }
 
-expected_str<void> isValidMountInfo(const DockerDevicePrivate::TemporaryMountInfo &mi)
+expected_str<void> isValidMountInfo(const DockerDevicePrivate::MountPair &mi)
 {
     if (mi.path.needsDevice())
         return make_unexpected(QString("The path \"%1\" is not local.").arg(mi.path.toUserOutput()));
@@ -801,11 +797,11 @@ expected_str<void> isValidMountInfo(const DockerDevicePrivate::TemporaryMountInf
 QStringList DockerDevicePrivate::createMountArgs() const
 {
     QStringList cmds;
-    QList<TemporaryMountInfo> mounts = m_temporaryMounts;
+    QList<MountPair> mounts;
     for (const FilePath &m : deviceSettings->mounts())
         mounts.append({m, m});
 
-    for (const TemporaryMountInfo &mi : mounts) {
+    for (const MountPair &mi : mounts) {
         if (isValidMountInfo(mi))
             cmds += toMountArg(mi);
     }
@@ -1061,13 +1057,13 @@ expected_str<void> DockerDevicePrivate::fetchSystemEnviroment()
     QString stdErr;
 
     if (m_shell && m_shell->state() == DeviceShell::State::Succeeded) {
-        const RunResult result = runInShell({"env", {}});
+        const RunResult result = runInShell(CommandLine{"env"});
         const QString out = QString::fromUtf8(result.stdOut);
         m_cachedEnviroment = Environment(out.split('\n', Qt::SkipEmptyParts), q->osType());
         stdErr = QString::fromUtf8(result.stdErr);
     } else {
         Process proc;
-        proc.setCommand(withDockerExecCmd({"env", {}}));
+        proc.setCommand(withDockerExecCmd(CommandLine{"env"}));
         proc.start();
         proc.waitForFinished();
         const QString remoteOutput = proc.cleanedStdOut();
@@ -1307,33 +1303,6 @@ void DockerDeviceFactory::shutdownExistingDevices()
     }
 }
 
-bool DockerDevicePrivate::addTemporaryMount(const FilePath &path, const FilePath &containerPath)
-{
-    const bool alreadyAdded = anyOf(m_temporaryMounts,
-                                    [containerPath](const TemporaryMountInfo &info) {
-                                        return info.containerPath == containerPath;
-                                    });
-
-    if (alreadyAdded)
-        return false;
-
-    const bool alreadyManuallyAdded = anyOf(deviceSettings->mounts(),
-                                            [path](const FilePath &mount) { return mount == path; });
-
-    if (alreadyManuallyAdded)
-        return false;
-
-    const TemporaryMountInfo newMount{path, containerPath};
-
-    const expected_str<void> result = isValidMountInfo(newMount);
-    QTC_ASSERT_EXPECTED(result, return false);
-
-    qCDebug(dockerDeviceLog) << "Adding temporary mount:" << path;
-    m_temporaryMounts.append(newMount);
-    stopCurrentContainer(); // Force re-start with new mounts.
-    return true;
-}
-
 expected_str<Environment> DockerDevicePrivate::environment()
 {
     if (!m_cachedEnviroment) {
@@ -1364,13 +1333,6 @@ void DockerDevicePrivate::changeMounts(QStringList newMounts)
 expected_str<FilePath> DockerDevicePrivate::localSource(const FilePath &other) const
 {
     const auto devicePath = FilePath::fromString(other.path());
-    for (const TemporaryMountInfo &info : m_temporaryMounts) {
-        if (devicePath.isChildOf(info.containerPath)) {
-            const FilePath relativePath = devicePath.relativeChildPath(info.containerPath);
-            return info.path.pathAppended(relativePath.path());
-        }
-    }
-
     for (const FilePath &mount : deviceSettings->mounts()) {
         const FilePath mountPoint = mount;
         if (devicePath.isChildOf(mountPoint)) {
@@ -1395,22 +1357,10 @@ bool DockerDevicePrivate::ensureReachable(const FilePath &other)
             return true;
     }
 
-    for (const auto &[path, containerPath] : m_temporaryMounts) {
-        if (path.path() != containerPath.path())
-            continue;
-
-        if (path == other)
-            return true;
-
-        if (other.isChildOf(path))
-            return true;
-    }
-
     if (q->filePath(other.path()).exists())
         return false;
 
-    addTemporaryMount(other, other);
-    return true;
+    return false;
 }
 
 bool DockerDevice::prepareForBuild(const Target *target)
diff --git a/src/plugins/docker/dockerdevice.h b/src/plugins/docker/dockerdevice.h
index ee4334b55b6..e08a60cbc3c 100644
--- a/src/plugins/docker/dockerdevice.h
+++ b/src/plugins/docker/dockerdevice.h
@@ -68,6 +68,11 @@ public:
     Utils::FilePath rootPath() const override;
     Utils::FilePath filePath(const QString &pathOnDevice) const override;
 
+    bool canMount(const Utils::FilePath &filePath) const override
+    {
+        return !filePath.needsDevice() || filePath.isSameDevice(rootPath());
+    }
+
     bool handlesFile(const Utils::FilePath &filePath) const override;
     bool ensureReachable(const Utils::FilePath &other) const override;
     Utils::expected_str<Utils::FilePath> localSource(const Utils::FilePath &other) const override;
diff --git a/src/plugins/effectcomposer/EffectComposer.json.in b/src/plugins/effectcomposer/EffectComposer.json.in
index 48c6955796f..619fda7f014 100644
--- a/src/plugins/effectcomposer/EffectComposer.json.in
+++ b/src/plugins/effectcomposer/EffectComposer.json.in
@@ -3,13 +3,13 @@
     "Version" : "${IDE_VERSION}",
     "CompatVersion" : "${IDE_VERSION_COMPAT}",
     "Vendor" : "The Qt Company Ltd",
-    "Copyright" : "(C) $$QTCREATOR_COPYRIGHT_YEAR The Qt Company Ltd",
+    "Copyright" : "(C) ${IDE_COPYRIGHT_YEAR} The Qt Company Ltd",
     "License" : [ "Commercial Usage",
                   "",
                   "Licensees holding valid Qt Enterprise licenses may use this plugin in accordance with the Qt Enterprise License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and The Qt Company."
     ],
     "Description" : "Plugin for Effect Composer.",
-    "Url" : "http://www.qt.io",
+    "Url" : "https://www.qt.io",
     "DisabledByDefault" : true,
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/effectcomposer/effectcomposercontextobject.cpp b/src/plugins/effectcomposer/effectcomposercontextobject.cpp
index dd42092e72e..95ebe7a3670 100644
--- a/src/plugins/effectcomposer/effectcomposercontextobject.cpp
+++ b/src/plugins/effectcomposer/effectcomposercontextobject.cpp
@@ -39,9 +39,9 @@ QString EffectComposerContextObject::convertColorToString(const QVariant &color)
 {
     QString colorString;
     QColor theColor;
-    if (color.canConvert(QVariant::Color)) {
+    if (color.canConvert(QMetaType(QMetaType::QColor))) {
         theColor = color.value<QColor>();
-    } else if (color.canConvert(QVariant::Vector3D)) {
+    } else if (color.canConvert(QMetaType(QMetaType::QVector3D))) {
         auto vec = color.value<QVector3D>();
         theColor = QColor::fromRgbF(vec.x(), vec.y(), vec.z());
     }
diff --git a/src/plugins/emacskeys/EmacsKeys.json.in b/src/plugins/emacskeys/EmacsKeys.json.in
index ab3e1e5c26e..82c486ee7c5 100644
--- a/src/plugins/emacskeys/EmacsKeys.json.in
+++ b/src/plugins/emacskeys/EmacsKeys.json.in
@@ -28,6 +28,6 @@
         "",
         "Also it's worth mentioning that EmacsKeys plugin forces disabling of menu mnemonics by calling Qt's qt_set_sequence_auto_mnemonic function with false argument. Many of the english menu mnemonics get into the way of typical emacs keys, this includes: Alt+F (File), Alt+B (Build), Alt+W (Window). It's a temporary solution, it remains until there is a better one."
     ],
-    "Url" : "http://nosmileface.ru",
+    "Url" : "https://nosmileface.ru",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/extensionmanager/CMakeLists.txt b/src/plugins/extensionmanager/CMakeLists.txt
index 1afb628ff70..56236df9fb7 100644
--- a/src/plugins/extensionmanager/CMakeLists.txt
+++ b/src/plugins/extensionmanager/CMakeLists.txt
@@ -5,8 +5,20 @@ add_qtc_plugin(ExtensionManager
     extensionmanagerconstants.h
     extensionmanagerplugin.cpp
     extensionmanagertr.h
+    extensionmanagersettings.cpp
+    extensionmanagersettings.h
     extensionmanagerwidget.cpp
     extensionmanagerwidget.h
     extensionsbrowser.cpp
     extensionsbrowser.h
+    extensionsmodel.cpp
+    extensionsmodel.h
+)
+
+extend_qtc_plugin(ExtensionManager
+  CONDITION WITH_TESTS
+  SOURCES
+    extensionmanager_test.cpp
+    extensionmanager_test.h
+    extensionmanager_test.qrc
 )
diff --git a/src/plugins/extensionmanager/ExtensionManager.json.in b/src/plugins/extensionmanager/ExtensionManager.json.in
index 1dcc10805be..7e2056ebf5c 100644
--- a/src/plugins/extensionmanager/ExtensionManager.json.in
+++ b/src/plugins/extensionmanager/ExtensionManager.json.in
@@ -13,8 +13,9 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Core",
-    "Description" : "Extension Manager",
+    "Description" : "Manage ${IDE_DISPLAY_NAME} extensions.",
     "Experimental": true,
-    "Url" : "http://www.qt.io",
+    "DisabledByDefault": false,
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/extensionmanager/extensionmanager.qbs b/src/plugins/extensionmanager/extensionmanager.qbs
index 062bdfc6526..994d75f7366 100644
--- a/src/plugins/extensionmanager/extensionmanager.qbs
+++ b/src/plugins/extensionmanager/extensionmanager.qbs
@@ -4,15 +4,30 @@ QtcPlugin {
     name: "ExtensionManager"
 
     Depends { name: "Core" }
+    Depends { name: "Spinner" }
+    Depends { name: "Tasking" }
+    Depends { name: "Qt.network" }
 
     files: [
         "extensionmanager.qrc",
         "extensionmanagerconstants.h",
         "extensionmanagerplugin.cpp",
         "extensionmanagertr.h",
+        "extensionmanagersettings.cpp",
+        "extensionmanagersettings.h",
         "extensionmanagerwidget.cpp",
         "extensionmanagerwidget.h",
         "extensionsbrowser.cpp",
         "extensionsbrowser.h",
+        "extensionsmodel.cpp",
+        "extensionsmodel.h",
     ]
+
+    QtcTestFiles {
+        files: [
+            "extensionmanager_test.h",
+            "extensionmanager_test.cpp",
+            "extensionmanager_test.qrc",
+        ]
+    }
 }
diff --git a/src/plugins/extensionmanager/extensionmanager.qrc b/src/plugins/extensionmanager/extensionmanager.qrc
index cff16c156ff..b552aaf7b59 100644
--- a/src/plugins/extensionmanager/extensionmanager.qrc
+++ b/src/plugins/extensionmanager/extensionmanager.qrc
@@ -1,9 +1,15 @@
 <RCC>
     <qresource prefix="/extensionmanager">
+        <file>images/download.png</file>
+        <file>images/download@2x.png</file>
+        <file>images/extensionbig.png</file>
+        <file>images/extensionbig@2x.png</file>
         <file>images/extensionsmall.png</file>
         <file>images/extensionsmall@2x.png</file>
         <file>images/mode_extensionmanager_mask.png</file>
         <file>images/mode_extensionmanager_mask@2x.png</file>
+        <file>images/packbig.png</file>
+        <file>images/packbig@2x.png</file>
         <file>images/packsmall.png</file>
         <file>images/packsmall@2x.png</file>
     </qresource>
diff --git a/src/plugins/extensionmanager/extensionmanager_test.cpp b/src/plugins/extensionmanager/extensionmanager_test.cpp
new file mode 100644
index 00000000000..7c66644ad77
--- /dev/null
+++ b/src/plugins/extensionmanager/extensionmanager_test.cpp
@@ -0,0 +1,40 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "extensionmanager_test.h"
+
+#include "extensionsmodel.h"
+
+#include <utils/fileutils.h>
+
+#include <QTest>
+
+namespace ExtensionManager::Internal {
+
+class ExtensionsModelTest final : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testRepositoryJsonParser();
+};
+
+void ExtensionsModelTest::testRepositoryJsonParser()
+{
+    ExtensionsModel model;
+    model.setExtensionsJson(testData("defaultpacks"));
+}
+
+QObject *createExtensionsModelTest()
+{
+    return new ExtensionsModelTest;
+}
+
+QByteArray testData(const QString &id)
+{
+    return Utils::FileReader::fetchQrc(":/extensionmanager/testdata/" + id + ".json");
+}
+
+} // ExtensionManager::Internal
+
+#include "extensionmanager_test.moc"
diff --git a/src/plugins/extensionmanager/extensionmanager_test.h b/src/plugins/extensionmanager/extensionmanager_test.h
new file mode 100644
index 00000000000..e913688d0d4
--- /dev/null
+++ b/src/plugins/extensionmanager/extensionmanager_test.h
@@ -0,0 +1,14 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <QObject>
+
+namespace ExtensionManager::Internal {
+
+QObject *createExtensionsModelTest();
+
+QByteArray testData(const QString &id);
+
+} // namespace ExtensionManager::Internal
diff --git a/src/plugins/extensionmanager/extensionmanager_test.qrc b/src/plugins/extensionmanager/extensionmanager_test.qrc
new file mode 100644
index 00000000000..e7e934e5316
--- /dev/null
+++ b/src/plugins/extensionmanager/extensionmanager_test.qrc
@@ -0,0 +1,8 @@
+<RCC>
+    <qresource prefix="/extensionmanager">
+        <file>testdata/augmentedplugindata.json</file>
+        <file>testdata/defaultpacks.json</file>
+        <file>testdata/thirdpartyplugins.json</file>
+        <file>testdata/varieddata.json</file>
+    </qresource>
+</RCC>
diff --git a/src/plugins/extensionmanager/extensionmanagerplugin.cpp b/src/plugins/extensionmanager/extensionmanagerplugin.cpp
index 22dde816a9b..e51cb0cbdda 100644
--- a/src/plugins/extensionmanager/extensionmanagerplugin.cpp
+++ b/src/plugins/extensionmanager/extensionmanagerplugin.cpp
@@ -5,6 +5,9 @@
 
 #include "extensionmanagerconstants.h"
 #include "extensionmanagerwidget.h"
+#ifdef WITH_TESTS
+#include "extensionmanager_test.h"
+#endif // WITH_TESTS
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
@@ -15,7 +18,6 @@
 #include <coreplugin/imode.h>
 
 #include <extensionsystem/iplugin.h>
-#include <extensionsystem/pluginspec.h>
 
 #include <utils/icon.h>
 #include <utils/layoutbuilder.h>
@@ -24,7 +26,6 @@
 #include <QAction>
 #include <QMainWindow>
 
-using namespace ExtensionSystem;
 using namespace Core;
 using namespace Utils;
 
@@ -43,13 +44,13 @@ public:
                           Theme::IconsBaseColor}});
         const Icon FLAT_ACTIVE({{":/extensionmanager/images/mode_extensionmanager_mask.png",
                                  Theme::IconsModeWelcomeActiveColor}});
-        setIcon(Utils::Icon::modeIcon(FLAT, FLAT, FLAT_ACTIVE));
+        setIcon(Icon::modeIcon(FLAT, FLAT, FLAT_ACTIVE));
         setPriority(72);
 
         using namespace Layouting;
         auto widget = Column {
             new StyledBar,
-            new ExtensionManagerWidget,
+            createExtensionManagerWidget(),
             noMargin, spacing(0),
         }.emerge();
 
@@ -73,6 +74,10 @@ public:
     void initialize() final
     {
         m_mode = new ExtensionManagerMode;
+
+#ifdef WITH_TESTS
+        addTestCreator(createExtensionsModelTest);
+#endif // WITH_TESTS
     }
 
 private:
diff --git a/src/plugins/extensionmanager/extensionmanagersettings.cpp b/src/plugins/extensionmanager/extensionmanagersettings.cpp
new file mode 100644
index 00000000000..54f4920181c
--- /dev/null
+++ b/src/plugins/extensionmanager/extensionmanagersettings.cpp
@@ -0,0 +1,59 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "extensionmanagersettings.h"
+#include "extensionmanagertr.h"
+
+#include <coreplugin/coreconstants.h>
+#include <coreplugin/dialogs/ioptionspage.h>
+
+#include <utils/layoutbuilder.h>
+
+namespace ExtensionManager::Internal {
+
+ExtensionManagerSettings &settings()
+{
+    static ExtensionManagerSettings theExtensionManagerSettings;
+    return theExtensionManagerSettings;
+}
+
+ExtensionManagerSettings::ExtensionManagerSettings()
+{
+    setAutoApply(false);
+    setSettingsGroup("ExtensionManager");
+
+    externalRepoUrl.setDefaultValue("https://qc-extensions.qt.io");
+    externalRepoUrl.setReadOnly(true);
+
+    useExternalRepo.setSettingsKey("UseExternalRepo");
+    useExternalRepo.setLabelText(Tr::tr("Use external repository"));
+    useExternalRepo.setToolTip(Tr::tr("Repository: %1").arg(externalRepoUrl()));
+    useExternalRepo.setDefaultValue(false);
+
+    setLayouter([this] {
+        using namespace Layouting;
+
+        return Column {
+            useExternalRepo,
+            st
+        };
+    });
+
+    readSettings();
+}
+
+class ExtensionManagerSettingsPage : public Core::IOptionsPage
+{
+public:
+    ExtensionManagerSettingsPage()
+    {
+        setId("ExtensionManager");
+        setDisplayName(Tr::tr("Extensions"));
+        setCategory(Core::Constants::SETTINGS_CATEGORY_CORE);
+        setSettingsProvider([] { return &settings(); });
+    }
+};
+
+const ExtensionManagerSettingsPage settingsPage;
+
+} // ExtensionManager::Internal
diff --git a/src/plugins/extensionmanager/extensionmanagersettings.h b/src/plugins/extensionmanager/extensionmanagersettings.h
new file mode 100644
index 00000000000..ed6b2f2aec4
--- /dev/null
+++ b/src/plugins/extensionmanager/extensionmanagersettings.h
@@ -0,0 +1,21 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <utils/aspects.h>
+
+namespace ExtensionManager::Internal {
+
+class ExtensionManagerSettings final : public Utils::AspectContainer
+{
+public:
+    ExtensionManagerSettings();
+
+    Utils::StringAspect externalRepoUrl{this};
+    Utils::BoolAspect useExternalRepo{this};
+};
+
+ExtensionManagerSettings &settings();
+
+} // ExtensionManager::Internal
diff --git a/src/plugins/extensionmanager/extensionmanagerwidget.cpp b/src/plugins/extensionmanager/extensionmanagerwidget.cpp
index be7e0f92eec..429d9a241f3 100644
--- a/src/plugins/extensionmanager/extensionmanagerwidget.cpp
+++ b/src/plugins/extensionmanager/extensionmanagerwidget.cpp
@@ -3,32 +3,89 @@
 
 #include "extensionmanagerwidget.h"
 
-#include "extensionmanagerconstants.h"
 #include "extensionmanagertr.h"
 #include "extensionsbrowser.h"
+#include "extensionsmodel.h"
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icontext.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/iwelcomepage.h>
+#include <coreplugin/plugininstallwizard.h>
 #include <coreplugin/welcomepagehelper.h>
 
+#include <extensionsystem/pluginmanager.h>
 #include <extensionsystem/pluginspec.h>
+#include <extensionsystem/pluginview.h>
+
+#include <solutions/tasking/networkquery.h>
+#include <solutions/tasking/tasktree.h>
+#include <solutions/tasking/tasktreerunner.h>
 
 #include <utils/algorithm.h>
+#include <utils/fileutils.h>
+#include <utils/hostosinfo.h>
 #include <utils/icon.h>
+#include <utils/infolabel.h>
 #include <utils/layoutbuilder.h>
+#include <utils/networkaccessmanager.h>
 #include <utils/stylehelper.h>
+#include <utils/temporarydirectory.h>
 #include <utils/utilsicons.h>
 
 #include <QAction>
-#include <QTextBrowser>
+#include <QApplication>
+#include <QBuffer>
+#include <QCheckBox>
+#include <QHBoxLayout>
+#include <QImageReader>
+#include <QMessageBox>
+#include <QMovie>
+#include <QPainter>
+#include <QProgressDialog>
+#include <QScrollArea>
+#include <QSignalMapper>
 
 using namespace Core;
 using namespace Utils;
+using namespace StyleHelper;
+using namespace WelcomePageHelpers;
 
 namespace ExtensionManager::Internal {
 
+Q_LOGGING_CATEGORY(widgetLog, "qtc.extensionmanager.widget", QtWarningMsg)
+
+constexpr TextFormat h5TF
+    {Theme::Token_Text_Default, UiElement::UiElementH5};
+constexpr TextFormat h6TF
+    {h5TF.themeColor, UiElement::UiElementH6};
+constexpr TextFormat h6CapitalTF
+    {Theme::Token_Text_Muted, UiElement::UiElementH6Capital};
+constexpr TextFormat contentTF
+    {Theme::Token_Text_Default, UiElement::UiElementBody2};
+
+static QLabel *sectionTitle(const TextFormat &tf, const QString &title)
+{
+    QLabel *label = tfLabel(tf, true);
+    label->setText(title);
+    return label;
+};
+
+static QWidget *toScrollableColumn(QWidget *widget)
+{
+    widget->setContentsMargins(SpacingTokens::ExVPaddingGapXl, SpacingTokens::ExVPaddingGapXl,
+                               SpacingTokens::ExVPaddingGapXl, SpacingTokens::ExVPaddingGapXl);
+    widget->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum);
+
+    auto scrollArea = new QScrollArea;
+    scrollArea->setWidget(widget);
+    scrollArea->setWidgetResizable(true);
+    scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    scrollArea->setFrameStyle(QFrame::NoFrame);
+
+    return scrollArea;
+};
+
 class CollapsingWidget : public QWidget
 {
 public:
@@ -54,242 +111,649 @@ private:
     int m_width = 100;
 };
 
+class HeadingWidget : public QWidget
+{
+    static constexpr int dividerH = 16;
+
+    Q_OBJECT
+
+public:
+    explicit HeadingWidget(QWidget *parent = nullptr)
+        : QWidget(parent)
+    {
+        m_icon = new QLabel;
+        m_icon->setFixedSize(iconBgSizeBig);
+
+        static const TextFormat titleTF
+            {Theme::Token_Text_Default, UiElementH4};
+        static const TextFormat vendorTF
+            {Theme::Token_Text_Accent, UiElementLabelMedium};
+        static const TextFormat dlTF
+            {Theme::Token_Text_Muted, vendorTF.uiElement};
+        static const TextFormat detailsTF
+            {Theme::Token_Text_Default, UiElementBody2};
+
+        m_title = tfLabel(titleTF);
+        m_vendor = new Button({}, Button::SmallLink);
+        m_vendor->setContentsMargins({});
+        m_divider = new QLabel;
+        m_divider->setFixedSize(1, dividerH);
+        WelcomePageHelpers::setBackgroundColor(m_divider, dlTF.themeColor);
+        m_dlIcon = new QLabel;
+        const QPixmap dlIcon = Icon({{":/extensionmanager/images/download.png", dlTF.themeColor}},
+                                    Icon::Tint).pixmap();
+        m_dlIcon->setPixmap(dlIcon);
+        m_dlCount = tfLabel(dlTF);
+        m_dlCount->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
+        m_details = tfLabel(detailsTF);
+        installButton = new Button(Tr::tr("Install..."), Button::MediumPrimary);
+        installButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
+        installButton->hide();
+
+        using namespace Layouting;
+        Row {
+            m_icon,
+            Column {
+                m_title,
+                st,
+                Row {
+                    m_vendor,
+                    Widget {
+                        bindTo(&m_dlCountItems),
+                        Row {
+                            Space(SpacingTokens::HGapXs),
+                            m_divider,
+                            Space(SpacingTokens::HGapXs),
+                            m_dlIcon,
+                            Space(SpacingTokens::HGapXxs),
+                            m_dlCount,
+                            noMargin, spacing(0),
+                        },
+                    },
+                },
+                st,
+                m_details,
+                spacing(0),
+            },
+            Column {
+                installButton,
+                st,
+            },
+            noMargin, spacing(SpacingTokens::ExPaddingGapL),
+        }.attachTo(this);
+
+        setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum);
+        m_dlCountItems->setVisible(false);
+
+        connect(installButton, &QAbstractButton::pressed,
+                this, &HeadingWidget::pluginInstallationRequested);
+        connect(m_vendor, &QAbstractButton::pressed, this, [this]() {
+            emit vendorClicked(m_currentVendor);
+        });
+
+        update({});
+    }
+
+    void update(const QModelIndex &current)
+    {
+        if (!current.isValid())
+            return;
+
+        m_icon->setPixmap(itemIcon(current, SizeBig));
+
+        const QString name = current.data(RoleName).toString();
+        m_title->setText(name);
+
+        m_currentVendor = current.data(RoleVendor).toString();
+        m_vendor->setText(m_currentVendor);
+
+        const int dlCount = current.data(RoleDownloadCount).toInt();
+        const bool showDlCount = dlCount > 0;
+        if (showDlCount)
+            m_dlCount->setText(QString::number(dlCount));
+        m_dlCountItems->setVisible(showDlCount);
+
+        const auto pluginData = current.data(RolePlugins).value<PluginsData>();
+        if (current.data(RoleItemType).toInt() == ItemTypePack) {
+            const int pluginsCount = pluginData.count();
+            const QString details = Tr::tr("Pack contains %n plugins.", nullptr, pluginsCount);
+            m_details->setText(details);
+        } else {
+            m_details->setText({});
+        }
+
+        const ItemType itemType = current.data(RoleItemType).value<ItemType>();
+        const bool isPack = itemType == ItemTypePack;
+        const bool isRemotePlugin = !(isPack || pluginSpecForName(name));
+        installButton->setVisible(isRemotePlugin && !pluginData.empty());
+        if (installButton->isVisible())
+            installButton->setToolTip(pluginData.constFirst().second);
+    }
+
+signals:
+    void pluginInstallationRequested();
+    void vendorClicked(const QString &vendor);
+
+private:
+    QLabel *m_icon;
+    QLabel *m_title;
+    Button *m_vendor;
+    QLabel *m_divider;
+    QLabel *m_dlIcon;
+    QLabel *m_dlCount;
+    QWidget *m_dlCountItems;
+    QLabel *m_details;
+    QAbstractButton *installButton;
+    QString m_currentVendor;
+};
+
+class PluginStatusWidget : public QWidget
+{
+public:
+    explicit PluginStatusWidget(QWidget *parent = nullptr)
+        : QWidget(parent)
+    {
+        m_label = new InfoLabel;
+        m_checkBox = new QCheckBox(Tr::tr("Load on start"));
+        m_restartButton = new Button(Tr::tr("Restart Now"), Button::MediumPrimary);
+        m_restartButton->setVisible(false);
+        m_pluginView.hide();
+
+        using namespace Layouting;
+        Column {
+            m_label,
+            m_checkBox,
+            m_restartButton,
+        }.attachTo(this);
+
+        connect(m_checkBox, &QCheckBox::clicked, this, [this](bool checked) {
+            ExtensionSystem::PluginSpec *spec = pluginSpecForName(m_pluginName);
+            if (spec == nullptr)
+                return;
+            const bool doIt = m_pluginView.data().setPluginsEnabled({spec}, checked);
+            if (doIt) {
+                m_restartButton->show();
+                ExtensionSystem::PluginManager::writeSettings();
+            } else {
+                m_checkBox->setChecked(!checked);
+            }
+        });
+
+        connect(m_restartButton, &QAbstractButton::clicked,
+                ICore::instance(), &ICore::restart, Qt::QueuedConnection);
+
+        update();
+    }
+
+    void setPluginName(const QString &name)
+    {
+        m_pluginName = name;
+        update();
+    }
+
+private:
+    void update()
+    {
+        const ExtensionSystem::PluginSpec *spec = pluginSpecForName(m_pluginName);
+        setVisible(spec != nullptr);
+        if (spec == nullptr)
+            return;
+
+        if (spec->hasError()) {
+            m_label->setType(InfoLabel::Error);
+            m_label->setText(Tr::tr("Error"));
+        } else if (spec->state() == ExtensionSystem::PluginSpec::Running) {
+            m_label->setType(InfoLabel::Ok);
+            m_label->setText(Tr::tr("Loaded"));
+        } else {
+            m_label->setType(InfoLabel::NotOk);
+            m_label->setText(Tr::tr("Not loaded"));
+        }
+
+        m_checkBox->setChecked(spec->isRequired() || spec->isEnabledBySettings());
+        m_checkBox->setEnabled(!spec->isRequired());
+    }
+
+    InfoLabel *m_label;
+    QCheckBox *m_checkBox;
+    QAbstractButton *m_restartButton;
+    QString m_pluginName;
+    ExtensionSystem::PluginView m_pluginView{this};
+};
+
+class TagList : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit TagList(QWidget *parent = nullptr)
+        : QWidget(parent)
+    {
+        QHBoxLayout *layout = new QHBoxLayout(this);
+        setLayout(layout);
+        layout->setContentsMargins({});
+        m_signalMapper = new QSignalMapper(this);
+        connect(m_signalMapper, &QSignalMapper::mappedString, this, &TagList::tagSelected);
+    }
+
+    void setTags(const QStringList &tags)
+    {
+        if (m_container) {
+            delete m_container;
+            m_container = nullptr;
+        }
+
+        if (!tags.empty()) {
+            m_container = new QWidget(this);
+            layout()->addWidget(m_container);
+
+            using namespace Layouting;
+            Flow flow {};
+            flow.setNoMargins();
+            flow.setSpacing(SpacingTokens::HGapXs);
+
+            for (const QString &tag : tags) {
+                QAbstractButton *tagButton = new Button(tag, Button::Tag);
+                connect(tagButton, &QAbstractButton::clicked,
+                        m_signalMapper, qOverload<>(&QSignalMapper::map));
+                m_signalMapper->setMapping(tagButton, tag);
+                flow.addItem(tagButton);
+            }
+
+            flow.attachTo(m_container);
+        }
+
+        updateGeometry();
+    }
+
+signals:
+    void tagSelected(const QString &tag);
+
+private:
+    QWidget *m_container = nullptr;
+    QSignalMapper *m_signalMapper;
+};
+
+class ExtensionManagerWidget final : public Core::ResizeSignallingWidget
+{
+public:
+    ExtensionManagerWidget();
+
+private:
+    void updateView(const QModelIndex &current);
+    void fetchAndInstallPlugin(const QUrl &url);
+    void fetchAndDisplayImage(const QUrl &url);
+
+    QString m_currentItemName;
+    ExtensionsBrowser *m_extensionBrowser;
+    CollapsingWidget *m_secondaryDescriptionWidget;
+    HeadingWidget *m_headingWidget;
+    QWidget *m_primaryContent;
+    QWidget *m_secondaryContent;
+    QLabel *m_description;
+    QLabel *m_linksTitle;
+    QLabel *m_links;
+    QLabel *m_imageTitle;
+    QLabel *m_image;
+    QBuffer m_imageDataBuffer;
+    QMovie m_imageMovie;
+    QLabel *m_tagsTitle;
+    TagList *m_tags;
+    QLabel *m_platformsTitle;
+    QLabel *m_platforms;
+    QLabel *m_dependenciesTitle;
+    QLabel *m_dependencies;
+    QLabel *m_packExtensionsTitle;
+    QLabel *m_packExtensions;
+    PluginStatusWidget *m_pluginStatus;
+    PluginsData m_currentItemPlugins;
+    Tasking::TaskTreeRunner m_dlTaskTreeRunner;
+    Tasking::TaskTreeRunner m_imgTaskTreeRunner;
+};
+
 ExtensionManagerWidget::ExtensionManagerWidget()
 {
-    m_leftColumn = new ExtensionsBrowser;
-
+    m_extensionBrowser = new ExtensionsBrowser;
     auto descriptionColumns = new QWidget;
+    m_secondaryDescriptionWidget = new CollapsingWidget;
 
-    m_secondarDescriptionWidget = new CollapsingWidget;
-
-    m_primaryDescription = new QTextBrowser;
-    m_primaryDescription->setOpenExternalLinks(true);
-    m_primaryDescription->setFrameStyle(QFrame::NoFrame);
-
-    m_secondaryDescription = new QTextBrowser;
-    m_secondaryDescription->setFrameStyle(QFrame::NoFrame);
+    m_headingWidget = new HeadingWidget;
+    m_description = tfLabel(contentTF, false);
+    m_description->setWordWrap(true);
+    m_linksTitle = sectionTitle(h6CapitalTF, Tr::tr("More information"));
+    m_links = tfLabel(contentTF, false);
+    m_links->setOpenExternalLinks(true);
+    m_imageTitle = sectionTitle(h6CapitalTF, {});
+    m_image = new QLabel;
+    m_imageMovie.setDevice(&m_imageDataBuffer);
 
     using namespace Layouting;
+    auto primary = new QWidget;
+    const auto spL = spacing(SpacingTokens::VPaddingL);
+    Column {
+        m_description,
+        Column { m_linksTitle, m_links, spL },
+        Column { m_imageTitle, m_image, spL },
+        st,
+        noMargin, spacing(SpacingTokens::ExVPaddingGapXl),
+    }.attachTo(primary);
+    m_primaryContent = toScrollableColumn(primary);
+
+    m_tagsTitle = sectionTitle(h6TF, Tr::tr("Tags"));
+    m_tags = new TagList;
+    m_platformsTitle = sectionTitle(h6TF, Tr::tr("Platforms"));
+    m_platforms = tfLabel(contentTF, false);
+    m_dependenciesTitle = sectionTitle(h6TF, Tr::tr("Dependencies"));
+    m_dependencies = tfLabel(contentTF, false);
+    m_packExtensionsTitle = sectionTitle(h6TF, Tr::tr("Extensions in pack"));
+    m_packExtensions = tfLabel(contentTF, false);
+    m_pluginStatus = new PluginStatusWidget;
+
+    auto secondary = new QWidget;
+    const auto spXxs = spacing(SpacingTokens::VPaddingXxs);
+    Column {
+        sectionTitle(h6CapitalTF, Tr::tr("Extension details")),
+        Column {
+            Column { m_tagsTitle, m_tags, spXxs },
+            Column { m_platformsTitle, m_platforms, spXxs },
+            Column { m_dependenciesTitle, m_dependencies, spXxs },
+            Column { m_packExtensionsTitle, m_packExtensions, spXxs },
+            spacing(SpacingTokens::VPaddingL),
+        },
+        st,
+        noMargin, spacing(SpacingTokens::ExVPaddingGapXl),
+    }.attachTo(secondary);
+    m_secondaryContent = toScrollableColumn(secondary);
+
     Row {
         WelcomePageHelpers::createRule(Qt::Vertical),
-        m_secondaryDescription,
-        noMargin(), spacing(0),
-    }.attachTo(m_secondarDescriptionWidget);
+        Column {
+            m_secondaryContent,
+            m_pluginStatus,
+        },
+        noMargin, spacing(0),
+    }.attachTo(m_secondaryDescriptionWidget);
 
     Row {
         WelcomePageHelpers::createRule(Qt::Vertical),
         Row {
-            m_primaryDescription,
-            noMargin(),
+            Column {
+                Column {
+                    m_headingWidget,
+                    customMargins(SpacingTokens::ExVPaddingGapXl, SpacingTokens::ExVPaddingGapXl,
+                                  SpacingTokens::ExVPaddingGapXl, SpacingTokens::ExVPaddingGapXl),
+                },
+                m_primaryContent,
+            },
         },
-        m_secondarDescriptionWidget,
-        noMargin(), spacing(0),
+        m_secondaryDescriptionWidget,
+        noMargin, spacing(0),
     }.attachTo(descriptionColumns);
 
     Row {
-        Space(StyleHelper::SpacingTokens::ExVPaddingGapXl),
-        m_leftColumn,
+        Space(SpacingTokens::ExVPaddingGapXl),
+        m_extensionBrowser,
         descriptionColumns,
-        noMargin(), spacing(0),
+        noMargin, spacing(0),
     }.attachTo(this);
 
     WelcomePageHelpers::setBackgroundColor(this, Theme::Token_Background_Default);
 
-    connect(m_leftColumn, &ExtensionsBrowser::itemSelected,
+    connect(m_extensionBrowser, &ExtensionsBrowser::itemSelected,
             this, &ExtensionManagerWidget::updateView);
     connect(this, &ResizeSignallingWidget::resized, this, [this](const QSize &size) {
-        const int intendedLeftColumnWidth = size.width() - 580;
-        m_leftColumn->adjustToWidth(intendedLeftColumnWidth);
+        const int intendedBrowserColumnWidth = size.width() - 580;
+        m_extensionBrowser->adjustToWidth(intendedBrowserColumnWidth);
         const bool secondaryDescriptionVisible = size.width() > 970;
         const int secondaryDescriptionWidth = secondaryDescriptionVisible ? 264 : 0;
-        m_secondarDescriptionWidget->setWidth(secondaryDescriptionWidth);
+        m_secondaryDescriptionWidget->setWidth(secondaryDescriptionWidth);
     });
-    updateView({}, {});
+    connect(m_headingWidget, &HeadingWidget::pluginInstallationRequested, this, [this](){
+        fetchAndInstallPlugin(QUrl::fromUserInput(m_currentItemPlugins.constFirst().second));
+    });
+    connect(m_tags, &TagList::tagSelected, m_extensionBrowser, &ExtensionsBrowser::setFilter);
+    connect(m_headingWidget, &HeadingWidget::vendorClicked,
+            m_extensionBrowser, &ExtensionsBrowser::setFilter);
+
+    updateView({});
 }
 
-void ExtensionManagerWidget::updateView(const QModelIndex &current,
-                                        [[maybe_unused]] const QModelIndex &previous)
+void ExtensionManagerWidget::updateView(const QModelIndex &current)
 {
-    const QString h5Css =
-        StyleHelper::fontToCssProperties(StyleHelper::uiFont(StyleHelper::UiElementH5))
-        + "; margin-top: 28px;";
-    const QString h6Css =
-        StyleHelper::fontToCssProperties(StyleHelper::uiFont(StyleHelper::UiElementH6))
-        + "; margin-top: 28px;";
-    const QString h6CapitalCss =
-        StyleHelper::fontToCssProperties(StyleHelper::uiFont(StyleHelper::UiElementH6Capital))
-        + QString::fromLatin1("; color: %1;")
-              .arg(creatorTheme()->color(Theme::Token_Text_Muted).name());
-    const QString bodyStyle = QString::fromLatin1("color: %1; background-color: %2;"
-                                                  "margin-left: %3px; margin-right: %3px;")
-                                  .arg(creatorTheme()->color(Theme::Token_Text_Default).name())
-                                  .arg(creatorTheme()->color(Theme::Token_Background_Muted).name())
-                                  .arg(StyleHelper::SpacingTokens::ExVPaddingGapXl);
-    const QString htmlStart = QString(R"(
-        <html>
-        <body style="%1">
-    )").arg(bodyStyle);
-    const QString htmlEnd = QString(R"(
-        </body></html>
-    )");
+    m_headingWidget->update(current);
 
-    if (!current.isValid()) {
-        const QString emptyHtml = htmlStart + htmlEnd;
-        m_primaryDescription->setText(emptyHtml);
-        m_secondaryDescription->setText(emptyHtml);
+    const bool showContent = current.isValid();
+    m_primaryContent->setVisible(showContent);
+    m_secondaryContent->setVisible(showContent);
+    m_headingWidget->setVisible(showContent);
+    m_pluginStatus->setVisible(showContent);
+    if (!showContent)
         return;
-    }
 
-    const ItemData data = itemData(current);
-    const bool isPack = data.type == ItemTypePack;
-    const ExtensionSystem::PluginSpec *extension = data.plugins.first();
+    m_currentItemName = current.data().toString();
+    const bool isPack = current.data(RoleItemType) == ItemTypePack;
+    m_pluginStatus->setPluginName(isPack ? QString() : m_currentItemName);
+    m_currentItemPlugins = current.data(RolePlugins).value<PluginsData>();
+
+    auto toContentParagraph = [](const QString &text) {
+        const QString pHtml = QString::fromLatin1("<p style=\"margin-top:0;margin-bottom:0;"
+                                                  "line-height:%1px\">%2</p>")
+                                  .arg(contentTF.lineHeight()).arg(text);
+        return pHtml;
+    };
 
     {
-        const QString shortDescription =
-            isPack ? QLatin1String("Short description for pack ") + data.name
-                   : extension->description();
-        QString longDescription =
-            isPack ? QLatin1String("Some longer text that describes the purpose and functionality "
-                                   "of the extensions that are part of pack ") + data.name
-                   : extension->longDescription();
-        longDescription.replace("\n", "<br/>");
-        const QString location = isPack ? extension->location() : extension->filePath();
+        const TextData textData = current.data(RoleDescriptionText).value<TextData>();
+        const bool hasDescription = !textData.isEmpty();
+        if (hasDescription) {
+            const QString headerCssTemplate =
+                ";margin-top:%1;margin-bottom:%2;padding-top:0;padding-bottom:0;";
+            const QString h4Css = fontToCssProperties(uiFont(UiElementH4))
+                                  + headerCssTemplate.arg(0).arg(SpacingTokens::VGapL);
+            const QString h5Css = fontToCssProperties(uiFont(UiElementH5))
+                                  + headerCssTemplate.arg(SpacingTokens::ExVPaddingGapXl)
+                                        .arg(SpacingTokens::VGapL);
+            QString descriptionHtml;
+            for (const TextData::Type &text : textData) {
+                if (text.second.isEmpty())
+                    continue;
+                const QString paragraph =
+                    QString::fromLatin1("<div style=\"%1\">%2</div>%3")
+                        .arg(descriptionHtml.isEmpty() ? h4Css : h5Css)
+                        .arg(text.first)
+                        .arg(toContentParagraph(text.second.join("<br/>")));
+                descriptionHtml.append(paragraph);
+            }
+            descriptionHtml.prepend(QString::fromLatin1("<body style=\"color:%1;\">")
+                                        .arg(creatorColor(Theme::Token_Text_Default).name()));
+            descriptionHtml.append("</body>");
+            m_description->setText(descriptionHtml);
+        }
+        m_description->setVisible(hasDescription);
 
-        QString description = htmlStart;
+        const LinksData linksData = current.data(RoleDescriptionLinks).value<LinksData>();
+        const bool hasLinks = !linksData.isEmpty();
+        if (hasLinks) {
+            QString linksHtml;
+            const QStringList links = transform(linksData, [](const LinksData::Type &link) {
+                const QString anchor = link.first.isEmpty() ? link.second : link.first;
+                return QString::fromLatin1(R"(<a href="%1" style="color:%2">%3 &gt;</a>)")
+                    .arg(link.second)
+                    .arg(creatorColor(Theme::Token_Text_Accent).name())
+                    .arg(anchor);
+            });
+            linksHtml = links.join("<br/>");
+            m_links->setText(toContentParagraph(linksHtml));
+        }
+        m_linksTitle->setVisible(hasLinks);
+        m_links->setVisible(hasLinks);
 
-        description.append(QString(R"(
-            <div style="%1"><br/>%2</div>
-            <p>%3</p>
-        )").arg(h5Css)
-           .arg(shortDescription)
-           .arg(longDescription));
-
-        description.append(QString(R"(
-            <div style="%1">%2</div>
-            <p>%3</p>
-        )").arg(h6Css)
-           .arg(Tr::tr("Get started"))
-           .arg(Tr::tr("Install the extension from above. Installation starts automatically. "
-                       "You can always uninstall the extension afterwards.")));
-
-        description.append(QString(R"(
-            <div style="%1">%2</div>
-            <p>
-            <a href="%3">%4 &gt;</a>
-            <br/>
-            <a href="%5">%6 &gt;</a>
-            </p>
-        )").arg(h6Css)
-           .arg(Tr::tr("More information"))
-           .arg(Tr::tr("Online Documentation"))
-           .arg("https://doc.qt.io/qtcreator/")
-           .arg(Tr::tr("Tutorials"))
-           .arg("https://doc.qt.io/qtcreator/creator-tutorials.html"));
-
-        const QString examplesBoxCss =
-            QString::fromLatin1("height: 168px; background-color: %1; ")
-                .arg(creatorTheme()->color(Theme::Token_Background_Default).name());
-        description.append(QString(R"(
-            <div style="%1">%2</div>
-            <p style="%3">
-                <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
-            </p>
-        )").arg(h6CapitalCss)
-           .arg(Tr::tr("Examples"))
-           .arg(examplesBoxCss));
-
-        const QString captionStrongCss = StyleHelper::fontToCssProperties(
-            StyleHelper::uiFont(StyleHelper::UiElementCaptionStrong));
-        description.append(QString(R"(
-            <div style="%1">%2</div>
-            <p>
-                <table>
-                    <tr><td style="%3">%4</td><td>%5</td></tr>
-                    <tr><td style="%3">%6</td><td>%7</td></tr>
-                    <tr><td style="%3">%8</td><td>%9</td></tr>
-                </table>
-            </p>
-        )").arg(h6Css)
-           .arg(Tr::tr("Extension library details"))
-           .arg(captionStrongCss)
-           .arg(Tr::tr("Size"))
-           .arg("547 MB")
-           .arg(Tr::tr("Version"))
-           .arg(extension->version())
-           .arg(Tr::tr("Location"))
-           .arg(location));
-
-        description.append(htmlEnd);
-        m_primaryDescription->setText(description);
+        m_imgTaskTreeRunner.reset();
+        m_imageMovie.stop();
+        m_imageDataBuffer.close();
+        m_image->clear();
+        const ImagesData imagesData = current.data(RoleDescriptionImages).value<ImagesData>();
+        const bool hasImages = !imagesData.isEmpty();
+        if (hasImages) {
+            const ImagesData::Type &image = imagesData.constFirst(); // Only show one image
+            m_imageTitle->setText(image.first);
+            fetchAndDisplayImage(image.second);
+        }
+        m_imageTitle->setVisible(hasImages);
+        m_image->setVisible(hasImages);
     }
 
     {
-        QString description = htmlStart;
+        const QStringList tags = current.data(RoleTags).toStringList();
+        m_tags->setTags(tags);
+        const bool hasTags = !tags.isEmpty();
+        m_tagsTitle->setVisible(hasTags);
+        m_tags->setVisible(hasTags);
 
-        description.append(QString(R"(
-            <p style="%1"><br/>%2</p>
-        )").arg(h6CapitalCss)
-           .arg(Tr::tr("Extension details")));
+        const QStringList platforms = current.data(RolePlatforms).toStringList();
+        const bool hasPlatforms = !platforms.isEmpty();
+        if (hasPlatforms)
+            m_platforms->setText(toContentParagraph(platforms.join("<br/>")));
+        m_platformsTitle->setVisible(hasPlatforms);
+        m_platforms->setVisible(hasPlatforms);
 
-        description.append(QString(R"(
-            <div style="%1">%2</div>
-            <p>%3</p>
-        )").arg(h6Css)
-           .arg(Tr::tr("Released"))
-           .arg("23.5.2023"));
+        const QStringList dependencies = current.data(RoleDependencies).toStringList();
+        const bool hasDependencies = !dependencies.isEmpty();
+        if (hasDependencies)
+            m_dependencies->setText(toContentParagraph(dependencies.join("<br/>")));
+        m_dependenciesTitle->setVisible(hasDependencies);
+        m_dependencies->setVisible(hasDependencies);
 
-        const QString tagTemplate = QString(R"(
-            <td style="border: 1px solid %1; padding: 3px; ">%2</td>
-        )").arg(creatorTheme()->color(Theme::Token_Stroke_Subtle).name());
-        const QStringList tags = Utils::transform(data.tags,
-                                                  [&tagTemplate] (const QString &tag) {
-                                                      return tagTemplate.arg(tag);
-                                                  });
-        description.append(QString(R"(
-            <div style="%1">%2</div>
-            <p>%3</p>
-        )").arg(h6Css)
-           .arg(Tr::tr("Related tags"))
-           .arg(tags.join("&nbsp;")));
-
-        description.append(QString(R"(
-            <div style="%1">%2</div>
-            <p>
-                macOS<br/>
-                Windows<br/>
-                Linux
-            </p>
-        )").arg(h6Css)
-           .arg(Tr::tr("Platforms")));
-
-        QStringList dependencies;
-        for (const ExtensionSystem::PluginSpec *spec : data.plugins) {
-            dependencies.append(Utils::transform(spec->dependencies(),
-                                                 &ExtensionSystem::PluginDependency::toString));
+        const PluginsData plugins = current.data(RolePlugins).value<PluginsData>();
+        const bool hasExtensions = isPack && !plugins.isEmpty();
+        if (hasExtensions) {
+            const QStringList extensions = transform(plugins, &QPair<QString, QString>::first);
+            m_packExtensions->setText(toContentParagraph(extensions.join("<br/>")));
         }
-        dependencies.removeDuplicates();
-        dependencies.sort();
-        description.append(QString(R"(
-            <div style="%1">%2</div>
-            <p>%3</p>
-        )").arg(h6Css)
-           .arg(Tr::tr("Dependencies"))
-           .arg(dependencies.isEmpty() ? "-" : dependencies.join("<br/>")));
-
-        if (isPack) {
-            const QStringList extensions = Utils::transform(data.plugins,
-                                                            &ExtensionSystem::PluginSpec::name);
-            description.append(QString(R"(
-                <div style="%1">%2</div>
-                <p>%3</p>
-            )").arg(h6Css)
-           .arg(Tr::tr("Extensions in pack"))
-           .arg(extensions.join("<br/>")));
-        }
-
-        description.append(htmlEnd);
-        m_secondaryDescription->setText(description);
+        m_packExtensionsTitle->setVisible(hasExtensions);
+        m_packExtensions->setVisible(hasExtensions);
     }
 }
 
+void ExtensionManagerWidget::fetchAndInstallPlugin(const QUrl &url)
+{
+    using namespace Tasking;
+
+    struct StorageStruct
+    {
+        StorageStruct() {
+            progressDialog.reset(new QProgressDialog(
+                Tr::tr("Downloading..."), Tr::tr("Cancel"), 0, 0, ICore::dialogParent()));
+            progressDialog->setWindowTitle(Tr::tr("Download Extension"));
+            progressDialog->setWindowModality(Qt::ApplicationModal);
+            progressDialog->setFixedSize(progressDialog->sizeHint());
+            progressDialog->setAutoClose(false);
+            progressDialog->show(); // TODO: Should not be needed. Investigate possible QT_BUG
+        }
+        std::unique_ptr<QProgressDialog> progressDialog;
+        QByteArray packageData;
+        QUrl url;
+    };
+    Storage<StorageStruct> storage;
+
+    const auto onQuerySetup = [url, storage](NetworkQuery &query) {
+        storage->url = url;
+        query.setRequest(QNetworkRequest(url));
+        query.setNetworkAccessManager(NetworkAccessManager::instance());
+    };
+    const auto onQueryDone = [storage](const NetworkQuery &query, DoneWith result) {
+        storage->progressDialog->close();
+        if (result == DoneWith::Success) {
+            storage->packageData = query.reply()->readAll();
+        } else {
+            QMessageBox::warning(
+                ICore::dialogParent(),
+                Tr::tr("Download Error"),
+                Tr::tr("Cannot download extension") + "\n\n" + storage->url.toString() + "\n\n"
+                    + Tr::tr("Code: %1.").arg(query.reply()->error()));
+        }
+    };
+
+    const auto onPluginInstallation = [storage]() {
+        if (storage->packageData.isEmpty())
+            return;
+        const FilePath source = FilePath::fromUrl(storage->url);
+        TempFileSaver saver(TemporaryDirectory::masterDirectoryPath()
+                            + "/XXXXXX" + source.fileName());
+
+        saver.write(storage->packageData);
+        if (saver.finalize(ICore::dialogParent()))
+            executePluginInstallWizard(saver.filePath());;
+    };
+
+    Group group{
+        storage,
+        NetworkQueryTask{onQuerySetup, onQueryDone},
+        onGroupDone(onPluginInstallation),
+    };
+
+    m_dlTaskTreeRunner.start(group);
+}
+
+void ExtensionManagerWidget::fetchAndDisplayImage(const QUrl &url)
+{
+    using namespace Tasking;
+
+    struct StorageStruct
+    {
+        QByteArray imageData;
+        QUrl url;
+    };
+    Storage<StorageStruct> storage;
+
+    const auto onFetchSetup = [url, storage](NetworkQuery &query) {
+        storage->url = url;
+        query.setRequest(QNetworkRequest(url));
+        query.setNetworkAccessManager(NetworkAccessManager::instance());
+        qCDebug(widgetLog).noquote() << "Sending image request:" << url.toDisplayString();
+    };
+    const auto onFetchDone = [storage](const NetworkQuery &query, DoneWith result) {
+        qCDebug(widgetLog) << "Got image QNetworkReply:" << query.reply()->error();
+        if (result == DoneWith::Success)
+            storage->imageData = query.reply()->readAll();
+    };
+
+    const auto onShowImage = [storage, this]() {
+        if (storage->imageData.isEmpty())
+            return;
+        m_imageDataBuffer.setData(storage->imageData);
+        qCDebug(widgetLog).noquote() << "Image reponse size:"
+                                     << QLocale::system().formattedDataSize(
+                                            m_imageDataBuffer.size());
+        if (!m_imageDataBuffer.open(QIODevice::ReadOnly))
+            return;
+        QImageReader reader(&m_imageDataBuffer);
+        const bool animated = reader.supportsAnimation();
+        if (animated) {
+            m_image->setMovie(&m_imageMovie);
+            m_imageMovie.start();
+        } else {
+            const QPixmap pixmap = QPixmap::fromImage(reader.read());
+            m_image->setPixmap(pixmap);
+        }
+        qCDebug(widgetLog) << "Image dimensions:" << reader.size();
+        qCDebug(widgetLog) << "Image is animated:" << animated;
+    };
+
+    Group group{
+        storage,
+        NetworkQueryTask{onFetchSetup, onFetchDone},
+        onGroupDone(onShowImage),
+    };
+
+    m_imgTaskTreeRunner.start(group);
+}
+
+QWidget *createExtensionManagerWidget()
+{
+    return new ExtensionManagerWidget;
+}
+
 } // ExtensionManager::Internal
+
+#include "extensionmanagerwidget.moc"
diff --git a/src/plugins/extensionmanager/extensionmanagerwidget.h b/src/plugins/extensionmanager/extensionmanagerwidget.h
index efa2925e25f..721f5adc956 100644
--- a/src/plugins/extensionmanager/extensionmanagerwidget.h
+++ b/src/plugins/extensionmanager/extensionmanagerwidget.h
@@ -1,29 +1,10 @@
 // Copyright (C) 2023 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include <coreplugin/welcomepagehelper.h>
-
-QT_BEGIN_NAMESPACE
-class QTextBrowser;
-QT_END_NAMESPACE
+#include <QWidget>
 
 namespace ExtensionManager::Internal {
 
-class CollapsingWidget;
-class ExtensionsBrowser;
-
-class ExtensionManagerWidget final : public Core::ResizeSignallingWidget
-{
-public:
-    explicit ExtensionManagerWidget();
-
-private:
-    void updateView(const QModelIndex &current, [[maybe_unused]] const QModelIndex &previous);
-
-    ExtensionsBrowser *m_leftColumn;
-    CollapsingWidget *m_secondarDescriptionWidget;
-    QTextBrowser *m_primaryDescription;
-    QTextBrowser *m_secondaryDescription;
-};
+QWidget *createExtensionManagerWidget();
 
 } // ExtensionManager::Internal
diff --git a/src/plugins/extensionmanager/extensionsbrowser.cpp b/src/plugins/extensionmanager/extensionsbrowser.cpp
index d83c1ef3ee2..60d9be94df0 100644
--- a/src/plugins/extensionmanager/extensionsbrowser.cpp
+++ b/src/plugins/extensionmanager/extensionsbrowser.cpp
@@ -4,10 +4,17 @@
 #include "extensionsbrowser.h"
 
 #include "extensionmanagertr.h"
+#include "extensionsmodel.h"
+#include "extensionmanagersettings.h"
+
+#ifdef WITH_TESTS
+#include "extensionmanager_test.h"
+#endif // WITH_TESTS
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icontext.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/plugininstallwizard.h>
 #include <coreplugin/welcomepagehelper.h>
 
 #include <extensionsystem/iplugin.h>
@@ -15,303 +22,58 @@
 #include <extensionsystem/pluginview.h>
 #include <extensionsystem/pluginmanager.h>
 
+#include <solutions/spinner/spinner.h>
+#include <solutions/tasking/networkquery.h>
+#include <solutions/tasking/tasktree.h>
+#include <solutions/tasking/tasktreerunner.h>
+
+#include <utils/elidinglabel.h>
 #include <utils/fancylineedit.h>
+#include <utils/hostosinfo.h>
 #include <utils/icon.h>
 #include <utils/layoutbuilder.h>
+#include <utils/networkaccessmanager.h>
 #include <utils/stylehelper.h>
 
+#include <QApplication>
 #include <QItemDelegate>
 #include <QLabel>
 #include <QListView>
 #include <QMessageBox>
 #include <QPainter>
 #include <QPainterPath>
-#include <QStandardItemModel>
 #include <QStyle>
 
-using namespace ExtensionSystem;
 using namespace Core;
+using namespace ExtensionSystem;
 using namespace Utils;
+using namespace StyleHelper;
+using namespace SpacingTokens;
+using namespace WelcomePageHelpers;
 
 namespace ExtensionManager::Internal {
 
 Q_LOGGING_CATEGORY(browserLog, "qtc.extensionmanager.browser", QtWarningMsg)
 
-using PluginSpecList = QList<const PluginSpec *>;
-using Tags = QStringList;
-
-constexpr QSize itemSize = {330, 86};
-constexpr int gapSize = StyleHelper::SpacingTokens::ExVPaddingGapXl;
-constexpr QSize cellSize = {itemSize.width() + gapSize, itemSize.height() + gapSize};
-
-enum Role {
-    RoleName = Qt::UserRole,
-    RoleItemType,
-    RoleTags,
-    RolePluginSpecs,
-    RoleSearchText,
-};
-
-ItemData itemData(const QModelIndex &index)
-{
-    return {
-        index.data(RoleName).toString(),
-        index.data(RoleItemType).value<ItemType>(),
-        index.data(RoleTags).toStringList(),
-        index.data(RolePluginSpecs).value<PluginSpecList>(),
-    };
-}
-
-static QColor colorForExtensionName(const QString &name)
-{
-    const size_t hash = qHash(name);
-    return QColor::fromHsv(hash % 360, 180, 110);
-}
-
-static QStandardItemModel *extensionsModel()
-{
-    // The new extensions concept renames plugins to extensions and adds "packs" which are
-    // groups of extensions.
-    //
-    // TODO: The "meta data" here which is injected into the model is only a place holder that
-    // helps exploring the upcoming extensions concept.
-    //
-    // Before this loses the WIP prefix, we should at least have a concrete idea of how the data
-    // is structured and where it lives. Ideally, it continues to reside exclusively in the
-    // extension meta data.
-    //
-    // The grouping of extensions into packs could be done via extension tag. Extensions and will
-    // receive tags and if possible screen shots.
-    // Packs will also have a complete set of meta data. That could be an accumulation of the data
-    // of the contained extensions. Or simply the data from the "first" extension in a pack.
-
-    static const char tagBuildTools[] =             "Build Tools";
-    static const char tagCodeAnalyzing[] =          "Code Analyzing";
-    static const char tagConnectivity[] =           "Connectivity";
-    static const char tagCore[] =                   "Core";
-    static const char tagCpp[] =                    "C++";
-    static const char tagEditorConvenience[] =      "Editor Convenience";
-    static const char tagEditor[] =                 "Editor";
-    static const char tagEssentials[] =             "Essentials";
-    static const char tagGlsl[] =                   "GLSL";
-    static const char tagPackageManager[] =         "Package Manager";
-    static const char tagPlatformSupport[] =        "Platform Support";
-    static const char tagProgrammingLanguage[] =    "Programming Language";
-    static const char tagPython[] =                 "Python";
-    static const char tagQml[] =                    "QML";
-    static const char tagQuick[] =                  "Quick";
-    static const char tagService[] =                "Service";
-    static const char tagTestAutomation[] =         "Test Automation";
-    static const char tagUiEditor[] =               "Visual UI Editor" ;
-    static const char tagVersionControl[] =         "Version Control";
-    static const char tagVisualEditor[] =           "Visual editor";
-    static const char tagWidgets[] =                "Widgets";
-
-    static const char tagTagUndefined[] =           "Tag undefined";
-
-    static const struct {
-        const QString name;
-        const QStringList extensions;
-        const Tags tags;
-    } packs[] = {
-        {"Core",
-            {"Core", "Help", "ProjectExplorer", "TextEditor", "Welcome", "GenericProjectManager",
-             "QtSupport"},
-            {tagCore}
-        },
-        {"Core (from Installer)",
-            {"LicenseChecker", "Marketplace", "UpdateInfo"},
-            {tagCore}
-        },
-        {"Essentials",
-            {"Bookmarks", "BinEditor", "Debugger", "DiffEditor", "ImageViewer", "Macros",
-             "LanguageClient", "ResourceEditor"},
-            {tagEssentials}
-        },
-        {"C++ Language support",
-            {"ClangCodeModel", "ClangFormat", "ClassView", "CppEditor"},
-            {tagProgrammingLanguage, tagCpp}
-        },
-        {"QML Language Support (Qt Quick libraries)",
-            {"QmlJSEditor", "QmlJSTools", "QmlPreview", "QmlProfiler", "QmlProjectManager"},
-            {tagProgrammingLanguage, tagQml}
-        },
-        {"Visual QML UI Editor",
-            {"QmlDesigner", "QmlDesignerBase"},
-            {tagUiEditor, tagQml, tagQuick}
-        },
-        {"Visual C++ Widgets UI Editor",
-            {"Designer"},
-            {tagUiEditor, tagCpp, tagWidgets}
-        },
-    };
-
-    static const struct {
-        const QString name;
-        const Tags tags;
-    } extensions[] = {
-        {"GLSLEditor",                          {tagProgrammingLanguage, tagGlsl}},
-        {"Nim",                                 {tagProgrammingLanguage}},
-        {"Python",                              {tagProgrammingLanguage, tagPython}},
-        {"Haskell",                             {tagProgrammingLanguage}},
-
-        {"ModelEditor",                         {tagVisualEditor}},
-        {"ScxmlEditor",                         {tagVisualEditor}},
-
-        {"Bazaar",                              {tagVersionControl}},
-        {"CVS",                                 {tagVersionControl}},
-        {"ClearCase",                           {tagVersionControl}},
-        {"Fossil",                              {tagVersionControl}},
-        {"Git",                                 {tagVersionControl}},
-        {"Mercurial",                           {tagVersionControl}},
-        {"Perforce",                            {tagVersionControl}},
-        {"Subversion",                          {tagVersionControl}},
-        {"VcsBase",                             {tagVersionControl}},
-        {"GitLab",                              {tagVersionControl, tagService}},
-
-        {"AutoTest",                            {tagTestAutomation}},
-        {"Squish",                              {tagTestAutomation}},
-        {"Coco",                                {tagTestAutomation}},
-
-        {"Vcpkg",                               {tagPackageManager}},
-        {"Conan",                               {tagPackageManager}},
-
-        {"Copilot",                             {tagEditorConvenience}},
-        {"EmacsKeys",                           {tagEditorConvenience}},
-        {"FakeVim",                             {tagEditorConvenience}},
-        {"Terminal",                            {tagEditorConvenience}},
-        {"Todo",                                {tagEditorConvenience}},
-        {"CodePaster",                          {tagEditorConvenience}},
-        {"Beautifier",                          {tagEditorConvenience}},
-
-        {"SerialTerminal",                      {tagConnectivity}},
-
-        {"SilverSearcher",                      {tagEditor}},
-
-        {"AutotoolsProjectManager",             {tagBuildTools}},
-        {"CMakeProjectManager",                 {tagBuildTools}},
-        {"CompilationDatabaseProjectManager",   {tagBuildTools}},
-        {"IncrediBuild",                        {tagBuildTools}},
-        {"MesonProjectManager",                 {tagBuildTools}},
-        {"QbsProjectManager",                   {tagBuildTools}},
-        {"QmakeProjectManager",                 {tagBuildTools}},
-
-        {"Axivion",                             {tagCodeAnalyzing}},
-        {"ClangTools",                          {tagCodeAnalyzing}},
-        {"Cppcheck",                            {tagCodeAnalyzing}},
-        {"CtfVisualizer",                       {tagCodeAnalyzing}},
-        {"PerfProfiler",                        {tagCodeAnalyzing}},
-        {"Valgrind",                            {tagCodeAnalyzing}},
-
-        {"Android",                             {tagPlatformSupport}},
-        {"BareMetal",                           {tagPlatformSupport}},
-        {"Boot2Qt",                             {tagPlatformSupport}},
-        {"Ios",                                 {tagPlatformSupport}},
-        {"McuSupport",                          {tagPlatformSupport}},
-        {"Qnx",                                 {tagPlatformSupport}},
-        {"RemoteLinux",                         {tagPlatformSupport}},
-        {"SafeRenderer",                        {tagPlatformSupport}},
-        {"VxWorks",                             {tagPlatformSupport}},
-        {"WebAssembly",                         {tagPlatformSupport}},
-        {"Docker",                              {tagPlatformSupport}},
-
-        // Missing in Kimmo's excel sheet:
-        {"CompilerExplorer",                    {tagTagUndefined}},
-        {"ExtensionManager",                    {tagTagUndefined}},
-        {"ScreenRecorder",                      {tagTagUndefined}},
-    };
-
-    QList<QStandardItem*> items;
-    QStringList expectedExtensions;
-    QStringList unexpectedExtensions;
-    QHash<const QString, const PluginSpec*> installedPlugins;
-    for (const PluginSpec *ps : PluginManager::plugins()) {
-        installedPlugins.insert(ps->name(), ps);
-        unexpectedExtensions.append(ps->name());
-    }
-
-    const auto handleExtension = [&] (const ItemData &extension, bool addToBrowser) {
-        if (!installedPlugins.contains(extension.name)) {
-            expectedExtensions.append(extension.name);
-            return false;
-        }
-        unexpectedExtensions.removeOne(extension.name);
-
-        if (addToBrowser) {
-            QStandardItem *item = new QStandardItem;
-            const PluginSpecList pluginSpecs = {installedPlugins.value(extension.name)};
-            item->setData(ItemTypeExtension, RoleItemType);
-            item->setData(QVariant::fromValue(extension.tags), RoleTags);
-            item->setData(QVariant::fromValue<PluginSpecList>(pluginSpecs), RolePluginSpecs);
-            item->setData(extension.name, RoleName);
-            items.append(item);
-        }
-
-        return true;
-    };
-
-    const bool addPackedExtensionsToBrowser = true; // TODO: Determine how we want this. As setting?
-    for (const auto &pack : packs) {
-        PluginSpecList pluginSpecs;
-        for (const QString &extension : pack.extensions) {
-            const ItemData extensionData = {extension, {}, pack.tags, {}};
-            if (!handleExtension(extensionData, addPackedExtensionsToBrowser))
-                continue;
-            pluginSpecs.append(installedPlugins.value(extension));
-        }
-        if (pluginSpecs.isEmpty())
-            continue;
-
-        QStandardItem *item = new QStandardItem;
-        item->setData(ItemTypePack, RoleItemType);
-        item->setData(QVariant::fromValue(pack.tags), RoleTags);
-        item->setData(QVariant::fromValue<PluginSpecList>(pluginSpecs), RolePluginSpecs);
-        item->setData(pack.name, RoleName);
-        items.append(item);
-    }
-
-    for (const auto &extension : extensions) {
-        const ItemData extensionData = {extension.name, {}, extension.tags, {}};
-        handleExtension(extensionData, true);
-    }
-
-    QStandardItemModel *result = new QStandardItemModel;
-    for (auto item : items) {
-        QStringList searchTexts;
-        searchTexts.append(item->data(RoleName).toString());
-        searchTexts.append(item->data(RoleTags).toStringList());
-        const PluginSpecList pluginSpecs = item->data(RolePluginSpecs).value<PluginSpecList>();
-        for (auto pluginSpec : pluginSpecs) {
-            searchTexts.append(pluginSpec->name());
-            searchTexts.append(pluginSpec->description());
-            searchTexts.append(pluginSpec->longDescription());
-            searchTexts.append(pluginSpec->category());
-            searchTexts.append(pluginSpec->copyright());
-        }
-        searchTexts.removeDuplicates();
-        item->setData(searchTexts.join(" "), RoleSearchText);
-
-        item->setDragEnabled(false);
-        item->setEditable(false);
-
-        result->appendRow(item);
-    }
-
-    if (browserLog().isDebugEnabled()) {
-        if (!expectedExtensions.isEmpty())
-            qCDebug(browserLog) << "Expected extensions/plugins are not installed:"
-                              << expectedExtensions.join(", ");
-        if (!unexpectedExtensions.isEmpty())
-            qCDebug(browserLog) << "Unexpected extensions/plugins are installed:"
-                                << unexpectedExtensions.join(", ");
-    }
-
-    return result;
-}
+constexpr int gapSize = HGapL;
+constexpr int itemWidth = 330;
+constexpr int cellWidth = itemWidth + gapSize;
 
 class ExtensionItemDelegate : public QItemDelegate
 {
 public:
+    constexpr static QSize dividerS{1, 16};
+    constexpr static TextFormat itemNameTF
+        {Theme::Token_Text_Default, UiElement::UiElementH6};
+    constexpr static TextFormat countTF
+        {Theme::Token_Text_Default, UiElement::UiElementLabelSmall,
+         Qt::AlignCenter | Qt::TextDontClip};
+    constexpr static TextFormat vendorTF
+        {Theme::Token_Text_Muted, UiElement::UiElementLabelSmall,
+         Qt::AlignVCenter | Qt::TextDontClip};
+    constexpr static TextFormat tagsTF
+        {Theme::Token_Text_Default, UiElement::UiElementCaption};
+
     explicit ExtensionItemDelegate(QObject *parent = nullptr)
         : QItemDelegate(parent)
     {
@@ -320,190 +82,424 @@ public:
     void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index)
         const override
     {
+        // +---------------+-------+---------------+----------------------------------------------------------------------+---------------+---------+
+        // |               |       |               |                            (ExPaddingGapL)                           |               |         |
+        // |               |       |               +-------------------------------------------------------------+--------+               |         |
+        // |               |       |               |                          <itemName>                         |<status>|               |         |
+        // |               |       |               +-------------------------------------------------------------+--------+               |         |
+        // |               |       |               |                               (VGapXxs)                              |               |         |
+        // |               |       |               +--------+--------+--------------+--------+--------+---------+---------+               |         |
+        // |(ExPaddingGapL)|<icon> |(ExPaddingGapL)|<vendor>|(HGapXs)|<divider>(h16)|(HGapXs)|<dlIcon>|(HGapXxs)|<dlCount>|(ExPaddingGapL)|(gapSize)|
+        // |               |(50x50)|               +--------+--------+--------------+--------+--------+---------+---------+               |         |
+        // |               |       |               |                               (VGapXxs)                              |               |         |
+        // |               |       |               +----------------------------------------------------------------------+               |         |
+        // |               |       |               |                                <tags>                                |               |         |
+        // |               |       |               +----------------------------------------------------------------------+               |         |
+        // |               |       |               |                            (ExPaddingGapL)                           |               |         |
+        // +---------------+-------+---------------+----------------------------------------------------------------------+---------------+---------+
+        // |                                                                (gapSize)                                                               |
+        // +----------------------------------------------------------------------------------------------------------------------------------------+
+
+        const QRect bgRGlobal = option.rect.adjusted(0, 0, -gapSize, -gapSize);
+        const QRect bgR = bgRGlobal.translated(-option.rect.topLeft());
+
+        const int middleColumnW = bgR.width() - ExPaddingGapL - iconBgSizeSmall.width()
+                - ExPaddingGapL - ExPaddingGapL;
+
+        int x = bgR.x();
+        int y = bgR.y();
+        x += ExPaddingGapL;
+        const QRect iconBgR(x, y + (bgR.height() - iconBgSizeSmall.height()) / 2,
+                            iconBgSizeSmall.width(), iconBgSizeSmall.height());
+        x += iconBgSizeSmall.width() + ExPaddingGapL;
+        y += ExPaddingGapL;
+        const QRect itemNameR(x, y, middleColumnW, itemNameTF.lineHeight());
+        const QString itemName = index.data().toString();
+
+        y += itemNameR.height() + VGapXxs;
+        const QRect vendorRowR(x, y, middleColumnW, vendorRowHeight());
+        QRect vendorR = vendorRowR;
+
+        y += vendorRowR.height() + VGapXxs;
+        const QRect tagsR(x, y, middleColumnW, tagsTF.lineHeight());
+
+        QTC_CHECK(option.rect.height() - 1 == tagsR.bottom() + ExPaddingGapL + gapSize);
+
         painter->save();
         painter->setRenderHint(QPainter::Antialiasing);
+        painter->translate(bgRGlobal.topLeft());
 
-        const ItemData data = itemData(index);
-        const bool isPack = data.type == ItemTypePack;
-        const QRectF itemRect(option.rect.topLeft(), itemSize);
+        const bool isPack = index.data(RoleItemType) == ItemTypePack;
         {
             const bool selected = option.state & QStyle::State_Selected;
             const bool hovered = option.state & QStyle::State_MouseOver;
             const QColor fillColor =
-                creatorTheme()->color(hovered ? WelcomePageHelpers::cardHoverBackground
+                creatorColor(hovered ? WelcomePageHelpers::cardHoverBackground
                                               : WelcomePageHelpers::cardDefaultBackground);
             const QColor strokeColor =
-                creatorTheme()->color(selected ? Theme::Token_Stroke_Strong
+                creatorColor(selected ? Theme::Token_Stroke_Strong
                                       : hovered ? WelcomePageHelpers::cardHoverStroke
                                                 : WelcomePageHelpers::cardDefaultStroke);
-            WelcomePageHelpers::drawCardBackground(painter, itemRect, fillColor, strokeColor);
+            WelcomePageHelpers::drawCardBackground(painter, bgR, fillColor, strokeColor);
         }
         {
-            constexpr QRectF bigCircle(16, 16, 48, 48);
-            constexpr double gradientMargin = 0.14645;
-            const QRectF bigCircleLocal = bigCircle.translated(itemRect.topLeft());
-            QPainterPath bigCirclePath;
-            bigCirclePath.addEllipse(bigCircleLocal);
-            QLinearGradient gradient(bigCircleLocal.topLeft(), bigCircleLocal.bottomRight());
-            const QColor startColor = isPack ? qRgb(0x1e, 0x99, 0x6e)
-                                             : colorForExtensionName(data.name);
-            const QColor endColor = isPack ? qRgb(0x07, 0x6b, 0x6d) : startColor.lighter(150);
-            gradient.setColorAt(gradientMargin, startColor);
-            gradient.setColorAt(1 - gradientMargin, endColor);
-            painter->fillPath(bigCirclePath, gradient);
-
-            static const QIcon packIcon =
-                Icon({{":/extensionmanager/images/packsmall.png",
-                       Theme::Token_Text_Default}}, Icon::Tint).icon();
-            static const QIcon extensionIcon =
-                Icon({{":/extensionmanager/images/extensionsmall.png",
-                       Theme::Token_Text_Default}}, Icon::Tint).icon();
-            QRectF iconRect(0, 0, 32, 32);
-            iconRect.moveCenter(bigCircleLocal.center());
-            (isPack ? packIcon : extensionIcon).paint(painter, iconRect.toRect());
+            const QPixmap icon = itemIcon(index, SizeSmall);
+            painter->drawPixmap(iconBgR.topLeft(), icon);
         }
         if (isPack) {
-            constexpr QRectF smallCircle(47, 50, 18, 18);
-            constexpr qreal strokeWidth = 1;
-            constexpr qreal shrink = strokeWidth / 2;
-            constexpr QRectF smallCircleAdjusted = smallCircle.adjusted(shrink, shrink,
-                                                                        -shrink, -shrink);
-            const QRectF smallCircleLocal = smallCircleAdjusted.translated(itemRect.topLeft());
-            const QColor fillColor = creatorTheme()->color(Theme::Token_Foreground_Muted);
-            const QColor strokeColor = creatorTheme()->color(Theme::Token_Stroke_Subtle);
-            painter->setBrush(fillColor);
-            painter->setPen(strokeColor);
-            painter->drawEllipse(smallCircleLocal);
+            constexpr int circleSize = 18;
+            constexpr int circleOverlap = 3; // Protrusion from lower right corner of iconRect
+            const QRect smallCircle(iconBgR.right() + 1 + circleOverlap - circleSize,
+                                    iconBgR.bottom() + 1 + circleOverlap - circleSize,
+                                    circleSize, circleSize);
+            const QColor fillColor = creatorColor(Theme::Token_Foreground_Muted);
+            const QColor strokeColor = creatorColor(Theme::Token_Stroke_Subtle);
+            drawCardBackground(painter, smallCircle, fillColor, strokeColor, circleSize / 2);
 
-            painter->setFont(StyleHelper::uiFont(StyleHelper::UiElementCaptionStrong));
-            const QColor textColor = creatorTheme()->color(Theme::Token_Text_Default);
-            painter->setPen(textColor);
-            painter->drawText(smallCircleLocal, QString::number(data.plugins.count()),
-                              QTextOption(Qt::AlignCenter));
+            painter->setFont(countTF.font());
+            painter->setPen(countTF.color());
+            const PluginsData plugins = index.data(RolePlugins).value<PluginsData>();
+            painter->drawText(smallCircle, countTF.drawTextFlags, QString::number(plugins.count()));
         }
         {
-            constexpr int textX = 80;
-            constexpr int rightMargin = StyleHelper::SpacingTokens::ExVPaddingGapXl;
-            constexpr int maxTextWidth = itemSize.width() - textX - rightMargin;
-            constexpr Qt::TextElideMode elideMode = Qt::ElideRight;
+            painter->setPen(itemNameTF.color());
+            painter->setFont(itemNameTF.font());
+            const QString titleElided
+                = painter->fontMetrics().elidedText(itemName, Qt::ElideRight, itemNameR.width());
+            painter->drawText(itemNameR, itemNameTF.drawTextFlags, titleElided);
+        }
+        {
+            const QString vendor = index.data(RoleVendor).toString();
+            const QFontMetrics fm(vendorTF.font());
+            painter->setPen(vendorTF.color());
+            painter->setFont(vendorTF.font());
 
-            constexpr int titleY = 30;
-            const QPointF titleOrigin(itemRect.topLeft() + QPointF(textX, titleY));
-            painter->setPen(creatorTheme()->color(Theme::Token_Text_Default));
-            painter->setFont(StyleHelper::uiFont(StyleHelper::UiElementH6));
-            const QString titleElided = painter->fontMetrics().elidedText(
-                data.name, elideMode, maxTextWidth);
-            painter->drawText(titleOrigin, titleElided);
+            if (const int dlCount = index.data(RoleDownloadCount).toInt(); dlCount > 0) {
+                constexpr QSize dlIconS(16, 16);
+                const QString dlCountString = QString::number(dlCount);
+                const int dlCountW = fm.horizontalAdvance(dlCountString);
+                const int dlItemsW = HGapXs + dividerS.width() + HGapXs + dlIconS.width()
+                                     + HGapXxs + dlCountW;
+                const int vendorW = fm.horizontalAdvance(vendor);
+                vendorR.setWidth(qMin(middleColumnW - dlItemsW, vendorW));
 
-            constexpr int copyrightY = 52;
-            const QPointF copyrightOrigin(itemRect.topLeft() + QPointF(textX, copyrightY));
-            painter->setPen(creatorTheme()->color(Theme::Token_Text_Muted));
-            painter->setFont(StyleHelper::uiFont(StyleHelper::UiElementCaptionStrong));
-            const QString copyrightElided = painter->fontMetrics().elidedText(
-                data.plugins.first()->copyright(), elideMode, maxTextWidth);
-            painter->drawText(copyrightOrigin, copyrightElided);
+                QRect dividerR = vendorRowR;
+                dividerR.setLeft(vendorR.right() + HGapXs);
+                dividerR.setWidth(dividerS.width());
+                painter->fillRect(dividerR, vendorTF.color());
 
-            constexpr int tagsY = 70;
-            const QPointF tagsOrigin(itemRect.topLeft() + QPointF(textX, tagsY));
-            const QString tags = data.tags.join(", ");
-            painter->setPen(creatorTheme()->color(Theme::Token_Text_Default));
-            painter->setFont(StyleHelper::uiFont(StyleHelper::UiElementCaption));
-            const QString tagsElided = painter->fontMetrics().elidedText(
-                tags, elideMode, maxTextWidth);
-            painter->drawText(tagsOrigin, tagsElided);
+                QRect dlIconR = vendorRowR;
+                dlIconR.setLeft(dividerR.right() + HGapXs);
+                dlIconR.setWidth(dlIconS.width());
+                static const QIcon dlIcon = Icon({{":/extensionmanager/images/download.png",
+                                                   vendorTF.themeColor}}, Icon::Tint).icon();
+                dlIcon.paint(painter, dlIconR);
+
+                QRect dlCountR = vendorRowR;
+                dlCountR.setLeft(dlIconR.right() + HGapXxs);
+                painter->drawText(dlCountR, vendorTF.drawTextFlags, dlCountString);
+            }
+
+            const QString vendorElided = fm.elidedText(vendor, Qt::ElideRight, vendorR.width());
+            painter->drawText(vendorR, vendorTF.drawTextFlags, vendorElided);
+        }
+        {
+            const QStringList tagList = index.data(RoleTags).toStringList();
+            const QString tags = tagList.join(", ");
+            painter->setPen(tagsTF.color());
+            painter->setFont(tagsTF.font());
+            const QString tagsElided
+                = painter->fontMetrics().elidedText(tags, Qt::ElideRight, tagsR.width());
+            painter->drawText(tagsR, tagsTF.drawTextFlags, tagsElided);
         }
 
         painter->restore();
     }
 
+    static int vendorRowHeight()
+    {
+        return qMax(vendorTF.lineHeight(), dividerS.height());
+    }
+
     QSize sizeHint([[maybe_unused]] const QStyleOptionViewItem &option,
                    [[maybe_unused]] const QModelIndex &index) const override
     {
-        return cellSize;
+        const int middleColumnH =
+            itemNameTF.lineHeight()
+            + VGapXxs
+            + vendorRowHeight()
+            + VGapXxs
+            + tagsTF.lineHeight();
+        const int height =
+            ExPaddingGapL
+            + qMax(iconBgSizeSmall.height(), middleColumnH)
+            + ExPaddingGapL;
+        return {cellWidth, height + gapSize};
     }
 };
 
-ExtensionsBrowser::ExtensionsBrowser()
+class SortFilterProxyModel : public QSortFilterProxyModel
+{
+public:
+    SortFilterProxyModel(QObject *parent = nullptr);
+
+protected:
+    bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
+};
+
+SortFilterProxyModel::SortFilterProxyModel(QObject *parent)
+    : QSortFilterProxyModel(parent)
+{
+}
+
+bool SortFilterProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
+{
+    const ItemType leftType = left.data(RoleItemType).value<ItemType>();
+    const ItemType rightType = right.data(RoleItemType).value<ItemType>();
+    if (leftType != rightType)
+        return leftType < rightType;
+
+    const QString leftName = left.data(RoleName).toString();
+    const QString rightName = right.data(RoleName).toString();
+    return leftName < rightName;
+}
+
+class ExtensionsBrowserPrivate
+{
+public:
+    bool dataFetched = false;
+    ExtensionsModel *model;
+    QLineEdit *searchBox;
+    QListView *extensionsView;
+    QItemSelectionModel *selectionModel = nullptr;
+    SortFilterProxyModel *filterProxyModel;
+    int columnsCount = 2;
+    Tasking::TaskTreeRunner taskTreeRunner;
+    SpinnerSolution::Spinner *m_spinner;
+};
+
+ExtensionsBrowser::ExtensionsBrowser(QWidget *parent)
+    : QWidget(parent)
+    , d(new ExtensionsBrowserPrivate)
 {
     setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
 
-    auto manageLabel = new QLabel(Tr::tr("Manage Extensions"));
-    manageLabel->setFont(StyleHelper::uiFont(StyleHelper::UiElementH1));
+    static const TextFormat titleTF
+        {Theme::Token_Text_Default, UiElementH2};
+    QLabel *titleLabel = tfLabel(titleTF);
+    titleLabel->setText(Tr::tr("Manage Extensions"));
 
-    m_searchBox = new Core::SearchBox;
-    m_searchBox->setFixedWidth(itemSize.width());
+    d->searchBox = new SearchBox;
+    d->searchBox->setPlaceholderText(Tr::tr("Search"));
 
-    m_updateButton = new Button(Tr::tr("Install..."), Button::MediumPrimary);
+    d->model = new ExtensionsModel(this);
 
-    m_filterProxyModel = new QSortFilterProxyModel(this);
-    m_filterProxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
-    m_filterProxyModel->setFilterRole(RoleSearchText);
-    m_filterProxyModel->setSortRole(RoleItemType);
+    d->filterProxyModel = new SortFilterProxyModel(this);
+    d->filterProxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
+    d->filterProxyModel->setFilterRole(RoleSearchText);
+    d->filterProxyModel->setSortRole(RoleItemType);
+    d->filterProxyModel->setSourceModel(d->model);
 
-    m_extensionsView = new QListView;
-    m_extensionsView->setFrameStyle(QFrame::NoFrame);
-    m_extensionsView->setItemDelegate(new ExtensionItemDelegate(this));
-    m_extensionsView->setResizeMode(QListView::Adjust);
-    m_extensionsView->setSelectionMode(QListView::SingleSelection);
-    m_extensionsView->setUniformItemSizes(true);
-    m_extensionsView->setViewMode(QListView::IconMode);
-    m_extensionsView->setModel(m_filterProxyModel);
-    m_extensionsView->setMouseTracking(true);
+    d->extensionsView = new QListView;
+    d->extensionsView->setFrameStyle(QFrame::NoFrame);
+    d->extensionsView->setItemDelegate(new ExtensionItemDelegate(this));
+    d->extensionsView->setResizeMode(QListView::Adjust);
+    d->extensionsView->setSelectionMode(QListView::SingleSelection);
+    d->extensionsView->setUniformItemSizes(true);
+    d->extensionsView->setViewMode(QListView::IconMode);
+    d->extensionsView->setModel(d->filterProxyModel);
+    d->extensionsView->setMouseTracking(true);
 
     using namespace Layouting;
     Column {
-        Space(15),
-        manageLabel,
-        Space(15),
-        Row { m_searchBox, st, m_updateButton, Space(extraListViewWidth() + gapSize) },
-        Space(gapSize),
-        m_extensionsView,
-        noMargin(), spacing(0),
+        Column {
+            titleLabel,
+            customMargins(0, VPaddingM, 0, VPaddingM),
+        },
+        Row {
+            d->searchBox,
+            spacing(gapSize),
+            customMargins(0, VPaddingM, extraListViewWidth() + gapSize, VPaddingM),
+        },
+        Space(ExPaddingGapL),
+        d->extensionsView,
+        noMargin, spacing(0),
     }.attachTo(this);
 
     WelcomePageHelpers::setBackgroundColor(this, Theme::Token_Background_Default);
-    WelcomePageHelpers::setBackgroundColor(m_extensionsView, Theme::Token_Background_Default);
-    WelcomePageHelpers::setBackgroundColor(m_extensionsView->viewport(),
+    WelcomePageHelpers::setBackgroundColor(d->extensionsView, Theme::Token_Background_Default);
+    WelcomePageHelpers::setBackgroundColor(d->extensionsView->viewport(),
                                            Theme::Token_Background_Default);
 
-    auto updateModel = [this] {
-        m_model.reset(extensionsModel());
-        m_filterProxyModel->setSourceModel(m_model.data());
-        m_filterProxyModel->sort(0);
+    d->m_spinner = new SpinnerSolution::Spinner(SpinnerSolution::SpinnerSize::Large, this);
+    d->m_spinner->hide();
 
-        if (m_selectionModel == nullptr) {
-            m_selectionModel = new QItemSelectionModel(m_filterProxyModel, m_extensionsView);
-            m_extensionsView->setSelectionModel(m_selectionModel);
-            connect(m_extensionsView->selectionModel(), &QItemSelectionModel::currentChanged,
+    auto updateModel = [this] {
+        d->filterProxyModel->sort(0);
+
+        if (d->selectionModel == nullptr) {
+            d->selectionModel = new QItemSelectionModel(d->filterProxyModel,
+                                                          d->extensionsView);
+            d->extensionsView->setSelectionModel(d->selectionModel);
+            connect(d->extensionsView->selectionModel(), &QItemSelectionModel::currentChanged,
                     this, &ExtensionsBrowser::itemSelected);
         }
     };
 
-    connect(ExtensionSystem::PluginManager::instance(),
-            &ExtensionSystem::PluginManager::pluginsChanged, this, updateModel);
-    connect(m_searchBox, &QLineEdit::textChanged,
-            m_filterProxyModel, &QSortFilterProxyModel::setFilterWildcard);
+    connect(PluginManager::instance(), &PluginManager::pluginsChanged, this, updateModel);
+    connect(d->searchBox, &QLineEdit::textChanged,
+            d->filterProxyModel, &QSortFilterProxyModel::setFilterWildcard);
+}
+
+ExtensionsBrowser::~ExtensionsBrowser()
+{
+    delete d;
+}
+
+void ExtensionsBrowser::setFilter(const QString &filter)
+{
+    d->searchBox->setText(filter);
 }
 
 void ExtensionsBrowser::adjustToWidth(const int width)
 {
     const int widthForItems = width - extraListViewWidth();
-    m_columnsCount = qMax(1, qFloor(widthForItems / cellSize.width()));
-    m_updateButton->setVisible(m_columnsCount > 1);
+    d->columnsCount = qMax(1, qFloor(widthForItems / cellWidth));
     updateGeometry();
 }
 
 QSize ExtensionsBrowser::sizeHint() const
 {
-    const int columsWidth = m_columnsCount * cellSize.width();
+    const int columsWidth = d->columnsCount * cellWidth;
     return { columsWidth + extraListViewWidth(), 0};
 }
 
 int ExtensionsBrowser::extraListViewWidth() const
 {
     // TODO: Investigate "transient" scrollbar, just for this list view.
-    return m_extensionsView->style()->pixelMetric(QStyle::PM_ScrollBarExtent)
+    constexpr int extraPadding = qMax(0, ExVPaddingGapXl - gapSize);
+    return d->extensionsView->style()->pixelMetric(QStyle::PM_ScrollBarExtent)
+           + extraPadding
            + 1; // Needed
 }
 
+void ExtensionsBrowser::showEvent(QShowEvent *event)
+{
+    if (!d->dataFetched) {
+        d->dataFetched = true;
+        fetchExtensions();
+    }
+    QWidget::showEvent(event);
+}
+
+void ExtensionsBrowser::fetchExtensions()
+{
+#ifdef WITH_TESTS
+    // Uncomment for testing with local json data.
+    // Available: "augmentedplugindata", "defaultpacks", "varieddata", "thirdpartyplugins"
+    // d->model->setExtensionsJson(testData("defaultpacks")); return;
+#endif // WITH_TESTS
+
+    if (!settings().useExternalRepo()) {
+        d->model->setExtensionsJson({});
+        return;
+    }
+
+    using namespace Tasking;
+
+    const auto onQuerySetup = [this](NetworkQuery &query) {
+        const QString url = "%1/api/v1/search?request=";
+        const QString requestTemplate
+            = R"({"version":"%1","host_os":"%2","host_os_version":"%3","host_architecture":"%4","page_size":200})";
+        const QString request = url.arg(settings().externalRepoUrl()) + requestTemplate
+                                                    .arg(QCoreApplication::applicationVersion())
+                                                    .arg(osTypeToString(HostOsInfo::hostOs()))
+                                                    .arg(QSysInfo::productVersion())
+                                                    .arg(QSysInfo::currentCpuArchitecture());
+        query.setRequest(QNetworkRequest(QUrl::fromUserInput(request)));
+        query.setNetworkAccessManager(NetworkAccessManager::instance());
+        qCDebug(browserLog).noquote() << "Sending JSON request:" << request;
+        d->m_spinner->show();
+    };
+    const auto onQueryDone = [this](const NetworkQuery &query, DoneWith result) {
+        const QByteArray response = query.reply()->readAll();
+        qCDebug(browserLog).noquote() << "Got JSON QNetworkReply:" << query.reply()->error();
+        if (result == DoneWith::Success) {
+            qCDebug(browserLog).noquote() << "JSON response size:"
+                                          << QLocale::system().formattedDataSize(response.size());
+            d->model->setExtensionsJson(response);
+        } else {
+            qCDebug(browserLog).noquote() << response;
+            d->model->setExtensionsJson({});
+        }
+        d->m_spinner->hide();
+    };
+
+    Group group {
+        NetworkQueryTask{onQuerySetup, onQueryDone},
+    };
+
+    d->taskTreeRunner.start(group);
+}
+
+QLabel *tfLabel(const TextFormat &tf, bool singleLine)
+{
+    QLabel *label = singleLine ? new Utils::ElidingLabel : new QLabel;
+    if (singleLine)
+        label->setFixedHeight(tf.lineHeight());
+    label->setFont(tf.font());
+    label->setAlignment(Qt::Alignment(tf.drawTextFlags));
+    label->setTextInteractionFlags(Qt::TextSelectableByMouse);
+
+    QPalette pal = label->palette();
+    pal.setColor(QPalette::WindowText, tf.color());
+    label->setPalette(pal);
+
+    return label;
+}
+
+QPixmap itemIcon(const QModelIndex &index, Size size)
+{
+    const QSize iconBgS = size == SizeSmall ? iconBgSizeSmall : iconBgSizeBig;
+    const qreal dpr = qApp->devicePixelRatio();
+    QPixmap pixmap(iconBgS * dpr);
+    pixmap.fill(Qt::transparent);
+    pixmap.setDevicePixelRatio(dpr);
+    const QRect iconBgR(QPoint(), pixmap.deviceIndependentSize().toSize());
+
+    const PluginSpec *ps = pluginSpecForName(index.data(RoleName).toString());
+    const bool isEnabled = ps == nullptr || ps->isEffectivelyEnabled();
+    const QGradientStops gradientStops = {
+        {0, creatorColor(isEnabled ? Theme::Token_Gradient01_Start
+                                   : Theme::Token_Gradient02_Start)},
+        {1, creatorColor(isEnabled ? Theme::Token_Gradient01_End
+                                   : Theme::Token_Gradient02_End)},
+    };
+
+    const Theme::Color color = Theme::Token_Basic_White;
+    static const QIcon packS = Icon({{":/extensionmanager/images/packsmall.png", color}},
+                                    Icon::Tint).icon();
+    static const QIcon packB = Icon({{":/extensionmanager/images/packbig.png", color}},
+                                    Icon::Tint).icon();
+    static const QIcon extensionS = Icon({{":/extensionmanager/images/extensionsmall.png",
+                                           color}}, Icon::Tint).icon();
+    static const QIcon extensionB = Icon({{":/extensionmanager/images/extensionbig.png",
+                                           color}}, Icon::Tint).icon();
+    const ItemType itemType = index.data(RoleItemType).value<ItemType>();
+    const QIcon &icon = (itemType == ItemTypePack) ? (size == SizeSmall ? packS : packB)
+                                                   : (size == SizeSmall ? extensionS : extensionB);
+    const int iconRectRounding = 4;
+    const qreal iconOpacityDisabled = 0.6;
+
+    QPainter p(&pixmap);
+    QLinearGradient gradient(iconBgR.topRight(), iconBgR.bottomLeft());
+    gradient.setStops(gradientStops);
+    WelcomePageHelpers::drawCardBackground(&p, iconBgR, gradient, Qt::NoPen, iconRectRounding);
+    if (!isEnabled)
+        p.setOpacity(iconOpacityDisabled);
+    icon.paint(&p, iconBgR);
+
+    return pixmap;
+}
+
 } // ExtensionManager::Internal
diff --git a/src/plugins/extensionmanager/extensionsbrowser.h b/src/plugins/extensionmanager/extensionsbrowser.h
index 2daa2362ba0..f132f598810 100644
--- a/src/plugins/extensionmanager/extensionsbrowser.h
+++ b/src/plugins/extensionmanager/extensionsbrowser.h
@@ -3,66 +3,50 @@
 
 #pragma once
 
-#include <utils/theme/theme.h>
-
-#include <QStandardItemModel>
 #include <QWidget>
 
-QT_BEGIN_NAMESPACE
-class QAbstractButton;
-class QItemSelectionModel;
-class QLineEdit;
-class QListView;
-class QSortFilterProxyModel;
-QT_END_NAMESPACE
+QT_FORWARD_DECLARE_CLASS(QLabel)
 
-namespace ExtensionSystem
-{
-class PluginSpec;
+namespace Core::WelcomePageHelpers {
+class TextFormat;
 }
 
 namespace ExtensionManager::Internal {
 
-using PluginSpecList = QList<const ExtensionSystem::PluginSpec *>;
-using Tags = QStringList;
-
-enum ItemType {
-    ItemTypePack,
-    ItemTypeExtension,
-};
-
-struct ItemData {
-    const QString name;
-    const ItemType type = ItemTypeExtension;
-    const Tags tags;
-    const PluginSpecList plugins;
-};
-
-ItemData itemData(const QModelIndex &index);
-
 class ExtensionsBrowser final : public QWidget
 {
     Q_OBJECT
 
 public:
-    ExtensionsBrowser();
+    ExtensionsBrowser(QWidget *parent = nullptr);
+    ~ExtensionsBrowser();
+
+    void setFilter(const QString &filter);
 
     void adjustToWidth(const int width);
     QSize sizeHint() const override;
 
+    int extraListViewWidth() const; // Space for scrollbar, etc.
+
+    void showEvent(QShowEvent *event) override;
+
 signals:
     void itemSelected(const QModelIndex &current, const QModelIndex &previous);
 
 private:
-    int extraListViewWidth() const; // Space for scrollbar, etc.
+    void fetchExtensions();
 
-    QScopedPointer<QStandardItemModel> m_model;
-    QLineEdit *m_searchBox;
-    QAbstractButton *m_updateButton;
-    QListView *m_extensionsView;
-    QItemSelectionModel *m_selectionModel = nullptr;
-    QSortFilterProxyModel *m_filterProxyModel;
-    int m_columnsCount = 2;
+    class ExtensionsBrowserPrivate *d = nullptr;
 };
 
+QLabel *tfLabel(const Core::WelcomePageHelpers::TextFormat &tf, bool singleLine = true);
+
+constexpr static QSize iconBgSizeSmall{50, 50};
+constexpr static QSize iconBgSizeBig{68, 68};
+enum Size {
+    SizeSmall,
+    SizeBig,
+};
+QPixmap itemIcon(const QModelIndex &index, Size size);
+
 } // ExtensionManager::Internal
diff --git a/src/plugins/extensionmanager/extensionsmodel.cpp b/src/plugins/extensionmanager/extensionsmodel.cpp
new file mode 100644
index 00000000000..1e1f65553e1
--- /dev/null
+++ b/src/plugins/extensionmanager/extensionsmodel.cpp
@@ -0,0 +1,401 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "extensionsmodel.h"
+
+#include "utils/algorithm.h"
+
+#include <coreplugin/coreconstants.h>
+#include <coreplugin/icore.h>
+
+#include <extensionsystem/iplugin.h>
+#include <extensionsystem/pluginspec.h>
+#include <extensionsystem/pluginview.h>
+#include <extensionsystem/pluginmanager.h>
+
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QStandardItemModel>
+#include <QVersionNumber>
+
+using namespace ExtensionSystem;
+using namespace Core;
+using namespace Utils;
+
+namespace ExtensionManager::Internal {
+
+Q_LOGGING_CATEGORY(modelLog, "qtc.extensionmanager.model", QtWarningMsg)
+
+struct Dependency
+{
+    QString name;
+    QString version;
+};
+using Dependencies = QList<Dependency>;
+
+struct Plugin
+{
+    QString copyright;
+    Dependencies dependencies;
+    bool isInternal = false;
+    QString name;
+    QString packageUrl;
+    QString vendor;
+    QString version;
+};
+using Plugins = QList<Plugin>;
+
+struct Description {
+    ImagesData images;
+    LinksData links;
+    TextData text;
+};
+
+struct Extension {
+    QString copyright;
+    Description description;
+    int downloadCount = -1;
+    QString id;
+    QString license;
+    QString name;
+    QStringList platforms;
+    Plugins plugins;
+    qint64 size = 0;
+    QStringList tags;
+    ItemType type = ItemTypePack;
+    QString vendor;
+    QString version;
+};
+using Extensions = QList<Extension>;
+
+static const Dependencies dependenciesFromJson(const QJsonObject &obj)
+{
+    const QJsonArray dependenciesArray = obj.value("Dependencies").toArray();
+    Dependencies dependencies;
+    for (const QJsonValueConstRef &dependencyVal : dependenciesArray) {
+        const QJsonObject dependencyObj = dependencyVal.toObject();
+        const QJsonObject metaDataObj = dependencyObj.value("meta_data").toObject();
+        dependencies.append({
+            .name = metaDataObj.value("Name").toString(),
+            .version = metaDataObj.value("Version").toString(),
+        });
+    }
+
+    return dependencies;
+}
+
+static Plugin pluginFromJson(const QJsonObject &obj)
+{
+    const QJsonObject metaDataObj = obj.value("meta_data").toObject();
+
+    return {
+        .copyright = metaDataObj.value("Copyright").toString(),
+        .dependencies = dependenciesFromJson(metaDataObj),
+        .isInternal = obj.value("is_internal").toBool(false),
+        .name = metaDataObj.value("Name").toString(),
+        .packageUrl = obj.value("url").toString(),
+        .vendor = metaDataObj.value("Vendor").toString(),
+        .version = metaDataObj.value("Version").toString(),
+    };
+}
+
+static Description descriptionFromJson(const QJsonObject &obj)
+{
+    TextData descriptionText;
+    const QJsonArray paragraphsArray = obj.value("paragraphs").toArray();
+    for (const QJsonValueConstRef &paragraphVal : paragraphsArray) {
+        const QJsonObject &paragraphObj = paragraphVal.toObject();
+        const QJsonArray &textArray = paragraphObj.value("text").toArray();
+        QStringList textLines;
+        for (const QJsonValueConstRef &textVal : textArray)
+            textLines.append(textVal.toString());
+        descriptionText.append({
+            paragraphObj.value("header").toString(),
+            textLines,
+        });
+    }
+
+    LinksData links;
+    const QJsonArray linksArray = obj.value("links").toArray();
+    for (const QJsonValueConstRef &linkVal : linksArray) {
+        const QJsonObject &linkObj = linkVal.toObject();
+        links.append({
+            linkObj.value("link_text").toString(),
+            linkObj.value("url").toString(),
+        });
+    }
+
+    ImagesData images;
+    const QJsonArray imagesArray = obj.value("images").toArray();
+    for (const QJsonValueConstRef &imageVal : imagesArray) {
+        const QJsonObject &imageObj = imageVal.toObject();
+        images.append({
+            imageObj.value("image_label").toString(),
+            imageObj.value("url").toString(),
+        });
+    }
+
+    const Description description = {
+        .images = images,
+        .links = links,
+        .text = descriptionText,
+    };
+
+    return description;
+}
+
+static Extension extensionFromJson(const QJsonObject &obj)
+{
+    Plugins plugins;
+    const QJsonArray pluginsArray = obj.value("plugins").toArray();
+    for (const QJsonValueConstRef &pluginVal : pluginsArray)
+        plugins.append(pluginFromJson(pluginVal.toObject()));
+
+    QStringList tags;
+    const QJsonArray tagsArray = obj.value("tags").toArray();
+    for (const QJsonValueConstRef &tagVal : tagsArray)
+        tags.append(tagVal.toString());
+
+    QStringList platforms;
+    const QJsonArray platformsArray = obj.value("platforms").toArray();
+    for (const QJsonValueConstRef &platformsVal : platformsArray)
+        platforms.append(platformsVal.toString());
+
+    const QJsonObject descriptionObj = obj.value("description").toObject();
+    const Description description = descriptionFromJson(descriptionObj);
+
+    const Extension extension = {
+        .copyright = obj.value("copyright").toString(),
+        .description = description,
+        .downloadCount = obj.value("download_count").toInt(-1),
+        .id = obj.value("id").toString(),
+        .license = obj.value("license").toString(),
+        .name = obj.value("name").toString(),
+        .platforms = platforms,
+        .plugins = plugins,
+        .size = obj.value("total_size").toInteger(),
+        .tags = tags,
+        .type = obj.value("is_pack").toBool(true) ? ItemTypePack : ItemTypeExtension,
+        .vendor = obj.value("vendor").toString(),
+        .version = obj.value("version").toString(),
+    };
+
+    return extension;
+}
+
+static Extensions parseExtensionsRepoReply(const QByteArray &jsonData)
+{
+    // https://qc-extensions.qt.io/api-docs
+    Extensions parsedExtensions;
+    const QJsonObject jsonObj = QJsonDocument::fromJson(jsonData).object();
+    const QJsonArray items = jsonObj.value("items").toArray();
+    for (const QJsonValueConstRef &itemVal : items) {
+        const QJsonObject itemObj = itemVal.toObject();
+        const Extension extension = extensionFromJson(itemObj);
+        parsedExtensions.append(extension);
+    }
+    return parsedExtensions;
+}
+
+static Extension extensionFromPluginSpec(const PluginSpec *pluginSpec)
+{
+    const Dependencies dependencies = transform(pluginSpec->dependencies(),
+                                                [](const PluginDependency &pd) -> Dependency {
+        return {
+            .name = pd.name,
+            .version = pd.version,
+        };
+    });
+    const Plugin plugin = {
+        .copyright = pluginSpec->copyright(),
+        .dependencies = dependencies,
+        .name = pluginSpec->name(),
+        .packageUrl = {},
+        .vendor = pluginSpec->vendor(),
+        .version = pluginSpec->version(),
+    };
+
+    const QStringList lines = pluginSpec->description().split('\n', Qt::SkipEmptyParts)
+                              + pluginSpec->longDescription().split('\n', Qt::SkipEmptyParts);
+    const TextData text = {{ pluginSpec->name(), lines }};
+    LinksData links;
+    if (const QString url = pluginSpec->url(); !url.isEmpty())
+        links.append({{}, url});
+    const Description description = {
+        .images = {},
+        .links = links,
+        .text = text,
+    };
+
+    const QString platformsPattern = pluginSpec->platformSpecification().pattern();
+    const QStringList platforms = platformsPattern.isEmpty()
+                                      ? QStringList({"macOS", "Windows", "Linux"})
+                                      : QStringList(platformsPattern);
+
+    const Extension extension = {
+        .copyright = pluginSpec->copyright(),
+        .description = description,
+        .id = {},
+        .license = pluginSpec->license(),
+        .name = pluginSpec->name(),
+        .platforms = platforms,
+        .plugins = {plugin},
+        .tags = {},
+        .type = ItemTypeExtension,
+        .vendor = pluginSpec->vendor(),
+        .version = pluginSpec->version(),
+    };
+    return extension;
+}
+
+class ExtensionsModelPrivate
+{
+public:
+    void setExtensions(const Extensions &extensions);
+    void addUnlistedLocalExtensions();
+
+    Extensions extensions;
+};
+
+void ExtensionsModelPrivate::setExtensions(const Extensions &extensions)
+{
+    this->extensions = extensions;
+    qCDebug(modelLog) << "Number of extensions from JSON:" << this->extensions.count();
+    addUnlistedLocalExtensions();
+    qCDebug(modelLog) << "Number of extensions with added local ones:" << this->extensions.count();
+}
+
+void ExtensionsModelPrivate::addUnlistedLocalExtensions()
+{
+    const QStringList listedModelExtensions = transform(extensions, &Extension::name);
+    for (const PluginSpec *plugin : PluginManager::plugins())
+        if (!listedModelExtensions.contains(plugin->name()))
+            extensions.append(extensionFromPluginSpec(plugin));
+}
+
+ExtensionsModel::ExtensionsModel(QObject *parent)
+    : QAbstractListModel(parent)
+    , d(new ExtensionsModelPrivate)
+{
+}
+
+ExtensionsModel::~ExtensionsModel()
+{
+    delete d;
+}
+
+int ExtensionsModel::rowCount([[maybe_unused]] const QModelIndex &parent) const
+{
+    return d->extensions.count();
+}
+
+static QStringList dependenciesFromExtension(const Extension &extension)
+{
+    QStringList dependencies;
+    for (const Plugin &plugin : extension.plugins) {
+        for (const Dependency &dependency : plugin.dependencies) {
+            const QString withVersion = QString::fromLatin1("%1 (%2)").arg(dependency.name)
+            .arg(dependency.version);
+            dependencies.append(withVersion);
+        }
+    }
+    dependencies.sort();
+    dependencies.removeDuplicates();
+    return dependencies;
+}
+
+static QVariant dataFromExtension(const Extension &extension, int role)
+{
+    switch (role) {
+    case Qt::DisplayRole:
+    case RoleName:
+        return extension.name;
+    case RoleCopyright:
+        return !extension.copyright.isEmpty() ? extension.copyright : QVariant();
+    case RoleDependencies:
+        return dependenciesFromExtension(extension);
+    case RoleDescriptionImages:
+        return QVariant::fromValue(extension.description.images);
+    case RoleDescriptionLinks:
+        return QVariant::fromValue(extension.description.links);
+    case RoleDescriptionText:
+        return QVariant::fromValue(extension.description.text);
+    case RoleDownloadCount:
+        return extension.downloadCount;
+    case RoleId:
+        return extension.id;
+    case RoleItemType:
+        return extension.type;
+    case RoleLicense:
+        return extension.license;
+    case RoleLocation:
+        break;
+    case RolePlatforms:
+        return extension.platforms;
+    case RolePlugins: {
+        PluginsData plugins;
+        for (const Plugin &plugin : extension.plugins)
+            plugins.append(qMakePair(plugin.name, plugin.packageUrl));
+        return QVariant::fromValue(plugins);
+    }
+    case RoleSize:
+        return extension.size;
+    case RoleTags:
+        return extension.tags;
+    case RoleVendor:
+        return !extension.vendor.isEmpty() ? extension.vendor : QVariant();
+    case RoleVersion:
+        return !extension.version.isEmpty() ? extension.version : QVariant();
+    default:
+        break;
+    }
+    return {};
+}
+
+static QString searchText(const QModelIndex &index)
+{
+    QStringList searchTexts;
+    searchTexts.append(index.data(RoleName).toString());
+    searchTexts.append(index.data(RoleTags).toStringList());
+    for (const auto &data : index.data(RoleDescriptionText).value<TextData>()) {
+        searchTexts.append(data.first);
+        searchTexts.append(data.second);
+    }
+    searchTexts.append(index.data(RoleVendor).toString());
+    return searchTexts.join(" ");
+}
+
+QVariant ExtensionsModel::data(const QModelIndex &index, int role) const
+{
+    if (role == RoleSearchText)
+        return searchText(index);
+
+    const Extension &extension = d->extensions.at(index.row());
+    const QVariant extensionData = dataFromExtension(extension, role);
+    // If data is unavailable, retrieve it from the first contained plugin
+    if (extensionData.isNull() && !extension.plugins.isEmpty()) {
+        const QString firstPluginName = extension.plugins.constFirst().name;
+        const Extension firstPluginExtension =
+            findOrDefault(d->extensions, Utils::equal(&Extension::name, firstPluginName));
+        if (firstPluginExtension.name.isEmpty())
+            return {};
+        return dataFromExtension(firstPluginExtension, role);
+    }
+    return extensionData;
+}
+
+void ExtensionsModel::setExtensionsJson(const QByteArray &json)
+{
+    const Extensions extensions = parseExtensionsRepoReply(json);
+    beginResetModel();
+    d->setExtensions(extensions);
+    endResetModel();
+}
+
+PluginSpec *pluginSpecForName(const QString &pluginName)
+{
+    return findOrDefault(PluginManager::plugins(), equal(&PluginSpec::name, pluginName));
+}
+
+} // ExtensionManager::Internal
diff --git a/src/plugins/extensionmanager/extensionsmodel.h b/src/plugins/extensionmanager/extensionsmodel.h
new file mode 100644
index 00000000000..68e7f9ea846
--- /dev/null
+++ b/src/plugins/extensionmanager/extensionsmodel.h
@@ -0,0 +1,71 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <QAbstractListModel>
+
+namespace ExtensionSystem {
+class PluginSpec;
+}
+
+namespace ExtensionManager::Internal {
+
+using QPairList = QList<QPair<QString, QString> >;
+
+using ImagesData = QPairList; // { <caption, url>, ... }
+using LinksData = QPairList; // { <name, url>, ... }
+using PluginsData = QPairList; // { <name, url>, ... }
+using TextData = QList<QPair<QString, QStringList> >; // { <header, text>, ... }
+
+enum ItemType {
+    ItemTypePack,
+    ItemTypeExtension,
+};
+
+enum Role {
+    RoleName = Qt::UserRole,
+    RoleCopyright,
+    RoleDependencies,
+    RoleDescriptionImages,
+    RoleDescriptionLinks,
+    RoleDescriptionText,
+    RoleDownloadCount,
+    RoleId,
+    RoleItemType,
+    RoleLicense,
+    RoleLocation,
+    RolePlatforms,
+    RolePlugins,
+    RoleSearchText,
+    RoleSize,
+    RoleTags,
+    RoleVendor,
+    RoleVersion,
+};
+
+class ExtensionsModel : public QAbstractListModel
+{
+public:
+    ExtensionsModel(QObject *parent = nullptr);
+    ~ExtensionsModel();
+
+    int rowCount(const QModelIndex &parent = {}) const;
+    QVariant data(const QModelIndex &index, int role) const;
+
+    void setExtensionsJson(const QByteArray &json);
+
+private:
+    class ExtensionsModelPrivate *d = nullptr;
+};
+
+ExtensionSystem::PluginSpec *pluginSpecForName(const QString &pluginName);
+
+#ifdef WITH_TESTS
+QObject *createExtensionsModelTest();
+#endif
+
+} // ExtensionManager::Internal
+
+Q_DECLARE_METATYPE(ExtensionManager::Internal::QPairList)
+Q_DECLARE_METATYPE(ExtensionManager::Internal::TextData)
diff --git a/src/plugins/extensionmanager/images/download.png b/src/plugins/extensionmanager/images/download.png
new file mode 100644
index 00000000000..d328e062fcc
Binary files /dev/null and b/src/plugins/extensionmanager/images/download.png differ
diff --git a/src/plugins/extensionmanager/images/download@2x.png b/src/plugins/extensionmanager/images/download@2x.png
new file mode 100644
index 00000000000..404df01da06
Binary files /dev/null and b/src/plugins/extensionmanager/images/download@2x.png differ
diff --git a/src/plugins/extensionmanager/images/extensionbig.png b/src/plugins/extensionmanager/images/extensionbig.png
new file mode 100644
index 00000000000..6600ff9fb06
Binary files /dev/null and b/src/plugins/extensionmanager/images/extensionbig.png differ
diff --git a/src/plugins/extensionmanager/images/extensionbig@2x.png b/src/plugins/extensionmanager/images/extensionbig@2x.png
new file mode 100644
index 00000000000..f44905ebc56
Binary files /dev/null and b/src/plugins/extensionmanager/images/extensionbig@2x.png differ
diff --git a/src/plugins/extensionmanager/images/extensionsmall.png b/src/plugins/extensionmanager/images/extensionsmall.png
index 6cdb8df12c9..b3d270c5146 100644
Binary files a/src/plugins/extensionmanager/images/extensionsmall.png and b/src/plugins/extensionmanager/images/extensionsmall.png differ
diff --git a/src/plugins/extensionmanager/images/extensionsmall@2x.png b/src/plugins/extensionmanager/images/extensionsmall@2x.png
index f788b5565a8..414f7197ae8 100644
Binary files a/src/plugins/extensionmanager/images/extensionsmall@2x.png and b/src/plugins/extensionmanager/images/extensionsmall@2x.png differ
diff --git a/src/plugins/extensionmanager/images/packbig.png b/src/plugins/extensionmanager/images/packbig.png
new file mode 100644
index 00000000000..b69acad9770
Binary files /dev/null and b/src/plugins/extensionmanager/images/packbig.png differ
diff --git a/src/plugins/extensionmanager/images/packbig@2x.png b/src/plugins/extensionmanager/images/packbig@2x.png
new file mode 100644
index 00000000000..7fb684a9c2a
Binary files /dev/null and b/src/plugins/extensionmanager/images/packbig@2x.png differ
diff --git a/src/plugins/extensionmanager/images/packsmall.png b/src/plugins/extensionmanager/images/packsmall.png
index 7a1c5e09bc7..92c8ab99d6d 100644
Binary files a/src/plugins/extensionmanager/images/packsmall.png and b/src/plugins/extensionmanager/images/packsmall.png differ
diff --git a/src/plugins/extensionmanager/images/packsmall@2x.png b/src/plugins/extensionmanager/images/packsmall@2x.png
index a58632c756c..281ccd8207f 100644
Binary files a/src/plugins/extensionmanager/images/packsmall@2x.png and b/src/plugins/extensionmanager/images/packsmall@2x.png differ
diff --git a/src/plugins/extensionmanager/testdata/augmentedplugindata.json b/src/plugins/extensionmanager/testdata/augmentedplugindata.json
new file mode 100644
index 00000000000..32efe15b708
--- /dev/null
+++ b/src/plugins/extensionmanager/testdata/augmentedplugindata.json
@@ -0,0 +1,71 @@
+{
+  "items": [
+    {
+      "name": "ScreenRecorder",
+      "description": {
+        "paragraphs": [
+          {
+            "header": "Screen Recorder plugin",
+            "text": [
+              "With FFmpeg, you can record your screens and save the recordings as animated images or videos.",
+              "To record screens:",
+              "",
+              "- Select Tools > Screen Recording.",
+              "- Select to select the screen to record from and to set the recorded screen area.",
+              "- Select to start recording.",
+              "- Select when you are done recording.",
+              "- Select Crop and Trim to edit the recording.",
+              "- Select Export to save the recording as an animated image or a video."
+            ]
+          },
+          {
+            "header": "Set the screen and area to record",
+            "text": [
+              "Set the screen and the area to record in the Screen Recording Options dialog.",
+              "To select a screen and area:",
+              "",
+              "- In Display, select the display to record.",
+              "- In Recorded screen area, drag the guides to set the x and y coordinates of the starting point for the recording area, as well as the width and height of the area.",
+              "- Select OK to return to the Record Screen dialog."
+            ]
+          }
+        ],
+        "images": [
+          {
+            "image_label": "Create animated imges like this",
+            "url": "https://bugreports.qt.io/secure/attachment/156058/156058_DragAndCopyOnLinux.gif"
+          }
+        ],
+        "links": [
+          {
+            "link_text": "Documentation",
+            "url": "https://doc.qt.io/qtcreator/creator-how-to-record-screens.html"
+          },
+          {
+            "link_text": "Homepage",
+            "url": "https://www.qt.io/"
+          }
+        ]
+      },
+      "is_pack": false,
+      "plugins": [
+        {
+          "meta_data": {
+            "Name": "ScreenRecorder",
+            "Dependencies": [
+              {
+                "meta_data": {
+                  "Name": "Core",
+                  "Version": "13.0.2"
+                }
+              }
+            ],
+            "Version": "13.0.2"
+          }
+        }
+      ],
+      "tags": [ "Utility", "Docs" ],
+      "vendor": "The Qt Company Ltd"
+    }
+  ]
+}
diff --git a/src/plugins/extensionmanager/testdata/defaultpacks.json b/src/plugins/extensionmanager/testdata/defaultpacks.json
new file mode 100644
index 00000000000..d26b0a42c60
--- /dev/null
+++ b/src/plugins/extensionmanager/testdata/defaultpacks.json
@@ -0,0 +1,126 @@
+{
+  "items": [
+    {
+      "name": "Essentials",
+      "tags": [ "Essentials" ],
+      "platforms": [ "macOS", "Windows", "Linux" ],
+      "license": "os",
+      "is_pack": true,
+      "description": {
+        "paragraphs": [
+          {
+            "text": [
+              "Basic services, such as editing and debugging code, viewing images, and adding resources to applications."
+            ],
+            "header": "Get started"
+          }
+        ],
+        "links": [
+          {
+            "url": "https://doc.qt.io/qtcreator/creator-coding-navigating.html",
+            "link_text": "Online documentation"
+          }
+        ]
+      },
+      "plugins": [
+        { "meta_data": { "Name": "BinEditor" } },
+        { "meta_data": { "Name": "Debugger" } },
+        { "meta_data": { "Name": "DiffEditor" } },
+        { "meta_data": { "Name": "ImageViewer" } },
+        { "meta_data": { "Name": "Macros" } },
+        { "meta_data": { "Name": "LanguageClient" } },
+        { "meta_data": { "Name": "ResourceEditor" } }
+      ]
+    },
+
+    {
+      "name": "C++ Support",
+      "tags": [ "Programming Language", "C++" ],
+      "platforms": [ "macOS", "Windows", "Linux" ],
+      "license": "os",
+      "is_pack": true,
+      "description": {
+        "paragraphs": [
+          {
+            "text": [
+              "Tools for developing Qt C++ applications."
+            ],
+            "header": "Get started"
+          }
+        ]
+      },
+      "plugins": [
+        { "meta_data": { "Name": "ClangCodeModel" } },
+        { "meta_data": { "Name": "ClangFormat" } },
+        { "meta_data": { "Name": "ClassView" } },
+        { "meta_data": { "Name": "CppEditor" } }
+      ]
+    },
+
+    {
+      "name": "QML Support",
+      "tags": [ "Programming Language", "QML" ],
+      "platforms": [ "macOS", "Windows", "Linux" ],
+      "license": "os",
+      "is_pack": true,
+      "description": {
+        "paragraphs": [
+          {
+            "text": [
+              "Tools for developing Qt Quick applications."
+            ],
+            "header": "Get started"
+          }
+        ]
+      },
+      "plugins": [
+        { "meta_data": { "Name": "QmlJSEditor" } },
+        { "meta_data": { "Name": "QmlJSTools" } },
+        { "meta_data": { "Name": "QmlPreview" } },
+        { "meta_data": { "Name": "QmlProfiler" } }
+      ]
+    },
+
+    {
+      "name": "Visual QML Editor",
+      "tags": [ "Visual UI editor", "qml", "Quick" ],
+      "platforms": [ "macOS", "Windows", "Linux" ],
+      "license": "os",
+      "is_pack": true,
+      "description": {
+        "paragraphs": [
+          {
+            "text": [
+              "Tools for creating Qt Quick UIs."
+            ],
+            "header": "Get started"
+          }
+        ]
+      },
+      "plugins": [
+        { "meta_data": { "Name": "QmlDesigner" } }
+      ]
+    },
+
+    {
+      "name": "Visual Widget Editor",
+      "tags": [ "Visual UI editor", "C++", "Widgets" ],
+      "platforms": [ "macOS", "Windows", "Linux" ],
+      "license": "os",
+      "is_pack": true,
+      "description": {
+        "paragraphs": [
+          {
+            "text": [
+              "Visual tool for creating Qt widget-based UIs."
+            ],
+            "header": "Get started"
+          }
+        ]
+      },
+      "plugins": [
+        { "meta_data": { "Name": "Designer" } }
+      ]
+    }
+  ]
+}
diff --git a/src/plugins/extensionmanager/testdata/thirdpartyplugins.json b/src/plugins/extensionmanager/testdata/thirdpartyplugins.json
new file mode 100644
index 00000000000..910854a68f8
--- /dev/null
+++ b/src/plugins/extensionmanager/testdata/thirdpartyplugins.json
@@ -0,0 +1,38 @@
+{
+  "items": [
+    {
+      "name": "SpellChecker",
+      "tags": [ "Editor" ],
+      "platforms": [ "macOS", "Windows", "Linux" ],
+      "license": "os",
+      "is_pack": false,
+      "description": {
+        "paragraphs": [
+          {
+            "text": [
+                "Spellcheck comments in source files."
+            ],
+            "header": "Get started"
+          }
+        ],
+        "links": [
+          {
+            "url": "https://github.com/CJCombrink/SpellChecker-Plugin",
+            "link_text": "GitHub page"
+          }
+        ]
+      },
+      "plugins": [
+        {
+          "meta_data": {
+            "Name": "SpellChecker",
+            "Copyright": "(C) 2015 - 2024 Carel Combrink"
+          },
+          "url": "https://github.com/CJCombrink/SpellChecker-Plugin/releases/download/v3.6.0/SpellChecker-Plugin_QtC13.0.0_macos_x64.tar.gz"
+        }
+      ],
+      "vendor": "Carel Combrink",
+      "copyright": "(C) 2015 - 2024 Carel Combrink"
+    }
+  ]
+}
diff --git a/src/plugins/extensionmanager/testdata/varieddata.json b/src/plugins/extensionmanager/testdata/varieddata.json
new file mode 100644
index 00000000000..245d08ad844
--- /dev/null
+++ b/src/plugins/extensionmanager/testdata/varieddata.json
@@ -0,0 +1,76 @@
+{
+  "items": [
+    {
+      "name": "Few tags",
+      "tags": [ "Tag one", "Tag two"]
+    },
+
+    {
+      "name": "Many tags",
+      "tags": [ "Tag_01", "Tag_02", "Tag_03", "Tag_04", "Tag_05", "Tag_06", "Tag_07", "Tag_08", "Tag_09", "Tag_10", "Tag_11", "Tag_12", "Tag_13", "Tag_14", "Tag_15", "Tag_16", "Tag_17", "Tag_18", "Tag_19", "Tag_20", "Tag_21", "Tag_22", "Tag_23", "Tag_24", "Tag_25", "Tag_26", "Tag_27", "Tag_28", "Tag_29", "Tag_30", "And_a_very_long_tag_without_spaces", "Ok, a last long tag without spaces, but that sgould be enough"],
+      "description": {
+        "paragraphs": [
+          {
+            "text": [
+              "... and a few long ones"
+            ]
+          }
+        ]
+      }
+    },
+
+    {
+      "name": "One static image",
+      "description": {
+        "paragraphs": [
+          {
+            "text": [
+              "png"
+            ]
+          }
+        ],
+        "images": [
+          {
+            "image_label": "Screenshot",
+            "url": "https://bugreports.qt.io/secure/attachment/147354/VirtualNodesShownAsNotExisting.png"
+          }
+        ]
+      }
+    },
+
+    {
+      "name": "One animated image",
+      "description": {
+        "paragraphs": [
+          {
+            "text": [
+              "gif (animated)"
+            ]
+          }
+        ],
+        "images": [
+          {
+            "image_label": "Screencast",
+            "url": "https://bugreports.qt.io/secure/attachment/156058/156058_DragAndCopyOnLinux.gif"
+          }
+        ]
+      }
+    },
+
+    {
+      "name": "Vendor, no download count",
+      "vendor": "Vendor name"
+    },
+
+    {
+      "name": "No vendor, but download count",
+      "download_count": 12345
+    },
+
+    {
+      "name": "Vendor and download count",
+      "vendor": "Vendor name",
+      "download_count": 12345
+    }
+  ]
+}
diff --git a/src/plugins/fakevim/FakeVim.json.in b/src/plugins/fakevim/FakeVim.json.in
index 915b50331b3..1bb613fffc3 100644
--- a/src/plugins/fakevim/FakeVim.json.in
+++ b/src/plugins/fakevim/FakeVim.json.in
@@ -12,7 +12,8 @@
                   "",
                   "Alternatively, this plugin 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 plugin. 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."
     ],
-    "Description" : "VI-style keyboard navigation.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Run the main editor in a manner similar to the Vim editor.",
+    "LongDescription" : [],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/fakevim/fakevim_test.cpp b/src/plugins/fakevim/fakevim_test.cpp
index c81a40a2280..ac1f0a5797c 100644
--- a/src/plugins/fakevim/fakevim_test.cpp
+++ b/src/plugins/fakevim/fakevim_test.cpp
@@ -9,9 +9,9 @@
 #include "fakevimhandler.h"
 
 #include <coreplugin/editormanager/editormanager.h>
-#include <texteditor/texteditor.h>
+#include <texteditor/syntaxhighlighter.h>
 #include <texteditor/textdocument.h>
-#include <texteditor/syntaxhighlighterrunner.h>
+#include <texteditor/texteditor.h>
 
 #include <QtTest>
 #include <QTextEdit>
@@ -350,7 +350,7 @@ struct FakeVimTester::TestData
     void doCommand(const char *cmd) { doCommand(_(cmd)); }
     void doKeys(const QString &keys) {
         handler->handleInput(keys);
-        QTRY_VERIFY(editor()->textDocument()->syntaxHighlighterRunner()->syntaxInfoUpdated());
+        QTRY_VERIFY(editor()->textDocument()->syntaxHighlighter()->syntaxHighlighterUpToDate());
     }
     void doKeys(const char *keys) { doKeys(_(keys)); }
 
@@ -364,7 +364,7 @@ struct FakeVimTester::TestData
         else
             i = 0;
         editor()->document()->setPlainText(_(str));
-        QTRY_VERIFY(editor()->textDocument()->syntaxHighlighterRunner()->syntaxInfoUpdated());
+        QTRY_VERIFY(editor()->textDocument()->syntaxHighlighter()->syntaxHighlighterUpToDate());
         setPosition(i);
         QCOMPARE(position(), i);
     }
@@ -375,7 +375,7 @@ struct FakeVimTester::TestData
         QTextCursor tc = editor()->textCursor();
         tc.insertText(_(text));
         editor()->setTextCursor(tc);
-        QTRY_VERIFY(editor()->textDocument()->syntaxHighlighterRunner()->syntaxInfoUpdated());
+        QTRY_VERIFY(editor()->textDocument()->syntaxHighlighter()->syntaxHighlighterUpToDate());
     }
 
     // Simulate external position change.
diff --git a/src/plugins/fakevim/fakevimactions.cpp b/src/plugins/fakevim/fakevimactions.cpp
index 3fd3e9c31f4..35cdce0bafb 100644
--- a/src/plugins/fakevim/fakevimactions.cpp
+++ b/src/plugins/fakevim/fakevimactions.cpp
@@ -139,7 +139,7 @@ FakeVimSettings::FakeVimSettings()
                 startOfLine,
                 passKeys,
                 blinkingCursor,
-                HostOsInfo::isWindowsHost() ? LayoutItem(systemEncoding) : empty
+                If { HostOsInfo::isWindowsHost(), { systemEncoding } }
             },
             Column {
                 incSearch,
@@ -199,7 +199,7 @@ FakeVimSettings::FakeVimSettings()
                         autoIndent.setValue(true);
                         smartIndent.setValue(tps.m_autoIndent);
                         incSearch.setValue(true);
-                    }),
+                    }, this),
                 },
                 PushButton {
                     text(Tr::tr("Set Qt Style")),
@@ -213,7 +213,7 @@ FakeVimSettings::FakeVimSettings()
                         incSearch.setVolatileValue(true);
                         backspace.setVolatileValue(QString("indent,eol,start"));
                         passKeys.setVolatileValue(true);
-                    }),
+                    }, this),
                 },
                 PushButton {
                     text(Tr::tr("Set Plain Style")),
@@ -227,7 +227,7 @@ FakeVimSettings::FakeVimSettings()
                         incSearch.setVolatileValue(false);
                         backspace.setVolatileValue(QString());
                         passKeys.setVolatileValue(false);
-                    }),
+                    }, this),
                  },
                  st
             },
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index bf00f7715c3..29257505f21 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -943,11 +943,6 @@ Range::Range(int b, int e, RangeMode m)
     : beginPos(qMin(b, e)), endPos(qMax(b, e)), rangemode(m)
 {}
 
-QString Range::toString() const
-{
-    return QString("%1-%2 (mode: %3)").arg(beginPos).arg(endPos).arg(rangemode);
-}
-
 bool Range::isValid() const
 {
     return beginPos >= 0 && endPos >= 0;
@@ -959,10 +954,6 @@ QDebug operator<<(QDebug ts, const Range &range)
 }
 
 
-ExCommand::ExCommand(const QString &c, const QString &a, const Range &r)
-    : cmd(c), args(a), range(r)
-{}
-
 bool ExCommand::matches(const QString &min, const QString &full) const
 {
     return cmd.startsWith(min) && full.startsWith(cmd);
@@ -973,13 +964,6 @@ QDebug operator<<(QDebug ts, const ExCommand &cmd)
     return ts << cmd.cmd << ' ' << cmd.args << ' ' << cmd.range;
 }
 
-QDebug operator<<(QDebug ts, const QList<QTextEdit::ExtraSelection> &sels)
-{
-    for (const QTextEdit::ExtraSelection &sel : sels)
-        ts << "SEL: " << sel.cursor.anchor() << sel.cursor.position();
-    return ts;
-}
-
 QString quoteUnprintable(const QString &ba)
 {
     QString res;
@@ -6139,7 +6123,7 @@ bool FakeVimHandler::Private::handleExSetCommand(const ExCommand &cmd)
         FvBaseAspect *act = s.item(Utils::keyFromString(optionName));
         if (!act) {
             showMessage(MessageError, Tr::tr("Unknown option:") + ' ' + cmd.args);
-        } else if (act->defaultVariantValue().type() == QVariant::Bool) {
+        } else if (act->defaultVariantValue().typeId() == QMetaType::Bool) {
             bool oldValue = act->variantValue().toBool();
             if (printOption) {
                 showMessage(MessageInfo, QLatin1String(oldValue ? "" : "no")
diff --git a/src/plugins/fakevim/fakevimhandler.h b/src/plugins/fakevim/fakevimhandler.h
index 4532fa374cf..2809cb22918 100644
--- a/src/plugins/fakevim/fakevimhandler.h
+++ b/src/plugins/fakevim/fakevimhandler.h
@@ -27,7 +27,7 @@ struct Range
 {
     Range() = default;
     Range(int b, int e, RangeMode m = RangeCharMode);
-    QString toString() const;
+
     bool isValid() const;
 
     int beginPos = -1;
@@ -38,7 +38,6 @@ struct Range
 struct ExCommand
 {
     ExCommand() = default;
-    ExCommand(const QString &cmd, const QString &args = {}, const Range &range = {});
 
     bool matches(const QString &min, const QString &full) const;
 
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index a84598aec00..6909c4d35a7 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -1502,7 +1502,7 @@ void FakeVimPlugin::editorOpened(IEditor *editor)
 
     handler->modeChanged.set([tew, this, editor](bool insertMode) {
         HandlerAndData &handlerAndData = m_editorToHandler[editor];
-        if (!handlerAndData.handler->inFakeVimMode())
+        if (!handlerAndData.handler || !handlerAndData.handler->inFakeVimMode())
             return;
 
         // We don't want to show suggestions unless we are in insert mode.
@@ -1651,11 +1651,13 @@ void FakeVimPlugin::editorOpened(IEditor *editor)
             keepOnlyWindow();
         else if (key == "P" || key == "<C-P>")
             triggerAction(Core::Constants::GOTO_PREV_SPLIT);
-        else if (key == "S" || key == "<C-S>")
+        else if (key == "S" || key == "<C-S>") {
             triggerAction(Core::Constants::SPLIT);
-        else if (key == "V" || key == "<C-V>")
+            updateAllHightLights();
+        } else if (key == "V" || key == "<C-V>") {
             triggerAction(Core::Constants::SPLIT_SIDE_BY_SIDE);
-        else if (key == "W" || key == "<C-W>")
+            updateAllHightLights();
+        } else if (key == "W" || key == "<C-W>")
             triggerAction(Core::Constants::GOTO_NEXT_SPLIT);
         else if (key.contains("RIGHT") || key == "L" || key == "<S-L>" || key == "<C-L>")
             moveSomewhere(handler, &moveRightWeight, key == "<S-L>" ? -1 : count);
diff --git a/src/plugins/fossil/Fossil.json.in b/src/plugins/fossil/Fossil.json.in
index 61204143ba6..644998a6d15 100644
--- a/src/plugins/fossil/Fossil.json.in
+++ b/src/plugins/fossil/Fossil.json.in
@@ -14,7 +14,13 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Version Control",
-    "Description" : "Fossil SCM integration.",
-    "Url" : "http://www.qt.io",
-    ${IDE_PLUGIN_DEPENDENCIES}
+    "Description" : "Access the Fossil version control system.",
+    "LongDescription" : [
+    "You also need:",
+        "- Fossil"
+    ],
+    "Url" : "https://www.qt.io",
+    ${IDE_PLUGIN_DEPENDENCIES},
+
+    "JsonWizardPaths" : [":/fossil/wizard"]
 }
diff --git a/src/plugins/fossil/constants.h b/src/plugins/fossil/constants.h
index 558c8fc3ed4..fe0fcca2f3e 100644
--- a/src/plugins/fossil/constants.h
+++ b/src/plugins/fossil/constants.h
@@ -75,7 +75,4 @@ const char FSTATUS_UPDATED_BY_INTEGRATE[] = "Updated by Integrate";
 const char FSTATUS_RENAMED[] = "Renamed";
 const char FSTATUS_UNKNOWN[] = "Unknown";
 
-// Fossil Json Wizards
-const char WIZARD_PATH[] = ":/fossil/wizard";
-
 } // Fossil::Constants
diff --git a/src/plugins/fossil/fossilclient.cpp b/src/plugins/fossil/fossilclient.cpp
index 662785930d4..d80dc223cd6 100644
--- a/src/plugins/fossil/fossilclient.cpp
+++ b/src/plugins/fossil/fossilclient.cpp
@@ -742,9 +742,8 @@ void FossilClient::annotate(const FilePath &workingDir, const QString &file, int
 bool FossilClient::isVcsFileOrDirectory(const FilePath &filePath) const
 {
     // false for any dir or file other than fossil checkout db-file
-    return filePath.toFileInfo().isFile()
-           && !filePath.fileName().compare(Constants::FOSSILREPO,
-                                           HostOsInfo::fileNameCaseSensitivity());
+    return !filePath.fileName().compare(Constants::FOSSILREPO, HostOsInfo::fileNameCaseSensitivity())
+           && filePath.isFile();
 }
 
 FilePath FossilClient::findTopLevelForFile(const FilePath &file) const
@@ -766,7 +765,7 @@ unsigned int FossilClient::binaryVersion() const
     static unsigned int cachedBinaryVersion = 0;
     static FilePath cachedBinaryPath;
 
-    const FilePath currentBinaryPath = settings().binaryPath();
+    const FilePath currentBinaryPath = settings().binaryPath.effectiveBinary();
 
     if (currentBinaryPath.isEmpty())
         return 0;
diff --git a/src/plugins/fossil/fossilplugin.cpp b/src/plugins/fossil/fossilplugin.cpp
index ff6fa0fa3f4..9821607033f 100644
--- a/src/plugins/fossil/fossilplugin.cpp
+++ b/src/plugins/fossil/fossilplugin.cpp
@@ -217,7 +217,6 @@ FossilPluginPrivate::FossilPluginPrivate()
     m_commandLocator = new CommandLocator("Fossil", "fossil", "fossil", this);
     m_commandLocator->setDescription(Tr::tr("Triggers a Fossil version control operation."));
 
-    ProjectExplorer::JsonWizardFactory::addWizardPath(FilePath::fromString(Constants::WIZARD_PATH));
     JsExpander::registerGlobalObject("Fossil", [] { return new FossilJsExtension; });
 
     connect(&settings(), &AspectContainer::changed,
@@ -959,12 +958,9 @@ VcsCommand *FossilPluginPrivate::createInitialCheckoutCommand(const QString &sou
         //
         // So here we want Fossil to save the remote details when specified.
 
-        QStringList args;
-        args << fossilClient().vcsCommandString(FossilClient::CloneCommand)
-             << extraOptions
-             << sourceUrl
-             << fossilFileNative;
-        command->addJob({fossilClient().vcsBinary(checkoutPath), args}, -1);
+        command->addJob({fossilClient().vcsBinary(checkoutPath),
+            {fossilClient().vcsCommandString(FossilClient::CloneCommand), extraOptions,
+             sourceUrl, fossilFileNative}}, -1);
     }
 
     // check out the cloned repository file into the working copy directory;
@@ -978,15 +974,14 @@ VcsCommand *FossilPluginPrivate::createInitialCheckoutCommand(const QString &sou
     // set user default to admin user if specified
     if (!isLocalRepository
         && !adminUser.isEmpty()) {
-        const QStringList args({ "user", "default", adminUser, "--user", adminUser});
-        command->addJob({fossilClient().vcsBinary(checkoutPath), args}, -1);
+        command->addJob({fossilClient().vcsBinary(checkoutPath),
+                         {"user", "default", adminUser, "--user", adminUser}}, -1);
     }
 
     // turn-off autosync if requested
-    if (!isLocalRepository
-        && disableAutosync) {
-        const QStringList args({"settings", "autosync", "off"});
-        command->addJob({fossilClient().vcsBinary(checkoutPath), args}, -1);
+    if (!isLocalRepository && disableAutosync) {
+        command->addJob({fossilClient().vcsBinary(checkoutPath), {"settings", "autosync", "off"}},
+                        -1);
     }
 
     return command;
@@ -994,11 +989,11 @@ VcsCommand *FossilPluginPrivate::createInitialCheckoutCommand(const QString &sou
 
 void FossilPluginPrivate::changed(const QVariant &v)
 {
-    switch (v.type()) {
-    case QVariant::String:
+    switch (v.typeId()) {
+    case QMetaType::QString:
         emit repositoryChanged(FilePath::fromVariant(v));
         break;
-    case QVariant::StringList:
+    case QMetaType::QStringList:
         emit filesChanged(v.toStringList());
         break;
     default:
diff --git a/src/plugins/genericprojectmanager/GenericProjectManager.json.in b/src/plugins/genericprojectmanager/GenericProjectManager.json.in
index ec4eae552e8..40a4f88829a 100644
--- a/src/plugins/genericprojectmanager/GenericProjectManager.json.in
+++ b/src/plugins/genericprojectmanager/GenericProjectManager.json.in
@@ -14,7 +14,7 @@
     ],
     "Category" : "Build Systems",
     "Description" : "Generic support.",
-    "Url" : "http://www.qt.io",
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
 
     "Mimetypes" : [
diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
index 878794f81fc..ea522606e4c 100644
--- a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
+++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
@@ -62,7 +62,7 @@ public:
         setBuildGenerator([](const Kit *, const FilePath &projectPath, bool forSetup) {
             BuildInfo info;
             info.typeName = ProjectExplorer::Tr::tr("Build");
-            info.buildDirectory = forSetup ? Project::projectDirectory(projectPath) : projectPath;
+            info.buildDirectory = forSetup ? projectPath.absolutePath() : projectPath;
 
             if (forSetup)  {
                 //: The name of the build configuration created by default for a generic project.
diff --git a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
index eef322a1519..5070cf67cdd 100644
--- a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
@@ -9,7 +9,6 @@
 
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>
-#include <texteditor/texteditoractionhandler.h>
 
 using namespace TextEditor;
 
@@ -29,7 +28,7 @@ public:
         addMimeType("application/vnd.qtcreator.generic.cflags");
 
         setDocumentCreator([]() { return new TextDocument(Constants::FILES_EDITOR_ID); });
-        setEditorActionHandlers(TextEditorActionHandler::None);
+        setOptionalActionMask(OptionalActions::None);
     }
 };
 
diff --git a/src/plugins/git/Git.json.in b/src/plugins/git/Git.json.in
index db0663a8765..d02e2d75150 100644
--- a/src/plugins/git/Git.json.in
+++ b/src/plugins/git/Git.json.in
@@ -13,8 +13,12 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Version Control",
-    "Description" : "Git integration.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Access the Git version control system.",
+    "LongDescription" : [
+        "You also need:",
+            "- Git"
+    ],
+    "Url" : "https://www.qt.io",
     "Arguments" : [
         {
             "Name" : "-git-show",
diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp
index 24daa938297..1eb8ba7d65b 100644
--- a/src/plugins/git/changeselectiondialog.cpp
+++ b/src/plugins/git/changeselectiondialog.cpp
@@ -172,18 +172,16 @@ void ChangeSelectionDialog::acceptCommand(ChangeCommand command)
 //! Set commit message in details
 void ChangeSelectionDialog::setDetails()
 {
-    Theme *theme = creatorTheme();
-
     QPalette palette;
     if (m_process->result() == ProcessResult::FinishedWithSuccess) {
         m_detailsText->setPlainText(m_process->cleanedStdOut());
-        palette.setColor(QPalette::Text, theme->color(Theme::TextColorNormal));
+        palette.setColor(QPalette::Text, creatorColor(Theme::TextColorNormal));
         m_changeNumberEdit->setPalette(palette);
     } else if (m_process->result() == ProcessResult::StartFailed) {
         m_detailsText->setPlainText(Tr::tr("Error: Could not start Git."));
     } else {
         m_detailsText->setPlainText(Tr::tr("Error: Unknown reference"));
-        palette.setColor(QPalette::Text, theme->color(Theme::TextColorError));
+        palette.setColor(QPalette::Text, creatorColor(Theme::TextColorError));
         m_changeNumberEdit->setPalette(palette);
         enableButtons(false);
     }
diff --git a/src/plugins/git/gerrit/gerritoptionspage.cpp b/src/plugins/git/gerrit/gerritoptionspage.cpp
index 8954db43aa8..392a8f81461 100644
--- a/src/plugins/git/gerrit/gerritoptionspage.cpp
+++ b/src/plugins/git/gerrit/gerritoptionspage.cpp
@@ -63,8 +63,14 @@ public:
             Git::Tr::tr("P&rotocol:"), httpsCheckBox
         }.attachTo(this);
 
-        setOnApply([this, hostLineEdit, userLineEdit, sshChooser,
-                    curlChooser, portSpinBox, httpsCheckBox, onChanged] {
+        setOnApply([this,
+                    hostLineEdit,
+                    userLineEdit,
+                    sshChooser,
+                    curlChooser,
+                    portSpinBox,
+                    httpsCheckBox,
+                    onChanged] {
             GerritParameters newParameters;
             newParameters.server = GerritServer(hostLineEdit->text().trimmed(),
                                          static_cast<unsigned short>(portSpinBox->value()),
diff --git a/src/plugins/git/gerrit/gerritparameters.cpp b/src/plugins/git/gerrit/gerritparameters.cpp
index 781597e5e78..8aa9f73ca73 100644
--- a/src/plugins/git/gerrit/gerritparameters.cpp
+++ b/src/plugins/git/gerrit/gerritparameters.cpp
@@ -5,6 +5,7 @@
 #include "gerritplugin.h"
 
 #include <utils/commandline.h>
+#include <utils/datafromprocess.h>
 #include <utils/environment.h>
 #include <utils/hostosinfo.h>
 #include <utils/pathchooser.h>
@@ -70,8 +71,12 @@ void GerritParameters::setPortFlagBySshType()
 {
     bool isPlink = false;
     if (!ssh.isEmpty()) {
-        const QString version = PathChooser::toolVersion({ssh, {"-V"}});
-        isPlink = version.contains("plink", Qt::CaseInsensitive);
+        DataFromProcess<QString>::Parameters params({ssh, {"-V"}},
+                                                    [](const QString &output) { return output; });
+        using namespace std::chrono_literals;
+        params.timeout = 1s;
+        if (const auto version = DataFromProcess<QString>::getData(params))
+            isPlink = version->contains("plink", Qt::CaseInsensitive);
     }
     portFlag = QLatin1String(isPlink ? "-P" : defaultPortFlag);
 }
diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp
index acbf62c9ee0..02f7ecdb6b7 100644
--- a/src/plugins/git/gerrit/gerritpushdialog.cpp
+++ b/src/plugins/git/gerrit/gerritpushdialog.cpp
@@ -101,7 +101,7 @@ void GerritPushDialog::initRemoteBranches()
         int refBranchIndex = ref.indexOf('/');
         qint64 timeT = entries.at(1).left(entries.at(1).indexOf(' ')).toLongLong();
         BranchDate bd(ref.mid(refBranchIndex + 1), QDateTime::fromSecsSinceEpoch(timeT).date());
-        m_remoteBranches.insertMulti(ref.left(refBranchIndex), bd);
+        m_remoteBranches.insert(ref.left(refBranchIndex), bd);
     }
     m_remoteComboBox->updateRemotes(false);
 }
@@ -228,7 +228,7 @@ void GerritPushDialog::setChangeRange()
     const int currentRange = range.toInt();
     QPalette palette = QApplication::palette();
     if (currentRange > ReasonableDistance) {
-        const QColor errorColor = Utils::creatorTheme()->color(Utils::Theme::TextColorError);
+        const QColor errorColor = Utils::creatorColor(Utils::Theme::TextColorError);
         palette.setColor(QPalette::WindowText, errorColor);
         palette.setColor(QPalette::ButtonText, errorColor);
         labelText.append("\n" + Git::Tr::tr("Are you sure you selected the right target branch?"));
@@ -339,7 +339,7 @@ void GerritPushDialog::setRemoteBranches(bool includeOld)
             const QStringList remoteBranches =
                     gitClient().synchronousRepositoryBranches(remoteName, m_workingDir);
             for (const QString &branch : remoteBranches)
-                m_remoteBranches.insertMulti(remoteName, {branch, {}});
+                m_remoteBranches.insert(remoteName, {branch, {}});
             if (remoteBranches.isEmpty()) {
                 m_targetBranchComboBox->setEditable(true);
                 m_targetBranchComboBox->setToolTip(
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 296b790e2fe..5c605233594 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -69,8 +69,8 @@ const char graphOption[] = "--graph";
 const char decorateOption[] = "--decorate";
 const char showFormatC[] =
         "--pretty=format:commit %H%d%n"
-        "Author: %an <%ae>, %ad (%ar)%n"
-        "Committer: %cn <%ce>, %cd (%cr)%n"
+        "Author: %aN <%aE>, %ad (%ar)%n"
+        "Committer: %cN <%cE>, %cd (%cr)%n"
         "%n"
         "%B";
 
@@ -686,7 +686,7 @@ public:
                     "--pretty=format:"
                     "%C(%1)%h%Creset "
                     "%C(%2)%d%Creset "
-                    "%C(%3)%an%Creset "
+                    "%C(%3)%aN%Creset "
                     "%C(%4)%s%Creset "
                     "%C(%5)%ci%Creset"
                     ).arg(commitHash, decoration, authorName, commitSubject, commitDate);
@@ -696,7 +696,7 @@ public:
         if (gitHasRgbColors())
             graphArgs << formatArg;
         else
-            graphArgs << "--pretty=format:%h %d %an %s %ci";
+            graphArgs << "--pretty=format:%h %d %aN %s %ci";
 
         return graphArgs;
     }
@@ -1021,7 +1021,7 @@ static QStringList normalLogArguments()
     const QString logArgs = QStringLiteral(
                 "--pretty=format:"
                 "commit %C(%1)%H%Creset %C(%2)%d%Creset%n"
-                "Author: %C(%3)%an <%ae>%Creset%n"
+                "Author: %C(%3)%aN <%aE>%Creset%n"
                 "Date:   %C(%4)%cD %Creset%n%n"
                 "%C(%5)%w(0,4,4)%s%Creset%n%n%b"
                 ).arg(commitHash, decoration, authorName, commitDate, commitSubject);
@@ -1593,7 +1593,7 @@ QString GitClient::synchronousShortDescription(const FilePath &workingDirectory,
     const QString quoteReplacement = "_-_";
 
     // Short SHA1, author, subject
-    const QString defaultShortLogFormat = "%h (%an " + quoteReplacement + "%s";
+    const QString defaultShortLogFormat = "%h (%aN " + quoteReplacement + "%s";
     const int maxShortLogLength = 120;
 
     // Short SHA 1, author, subject
@@ -1626,7 +1626,7 @@ QString GitClient::synchronousCurrentLocalBranch(const FilePath &workingDirector
     if (!branch.isEmpty()) {
         const QString refsHeadsPrefix = "refs/heads/";
         if (branch.startsWith(refsHeadsPrefix)) {
-            branch.remove(0, refsHeadsPrefix.count());
+            branch.remove(0, refsHeadsPrefix.size());
             return branch;
         }
     }
@@ -2531,7 +2531,7 @@ bool GitClient::launchGitBash(const FilePath &workingDirectory)
         success = false;
     } else {
         const FilePath gitBash = git.absolutePath().parentDir() / "git-bash.exe";
-        success = Process::startDetached({gitBash, {}}, workingDirectory);
+        success = Process::startDetached(CommandLine{gitBash}, workingDirectory);
     }
 
     if (!success)
@@ -2569,7 +2569,7 @@ bool GitClient::readDataFromCommit(const FilePath &repoDirectory, const QString
                                    QString *commitTemplate)
 {
     // Get commit data as "SHA1<lf>author<lf>email<lf>message".
-    const QStringList arguments = {"log", "--max-count=1", "--pretty=format:%h\n%an\n%ae\n%B", commit};
+    const QStringList arguments = {"log", "--max-count=1", "--pretty=format:%h\n%aN\n%aE\n%B", commit};
     const CommandResult result = vcsSynchronousExec(repoDirectory, arguments, RunFlags::NoOutput);
 
     if (result.result() != ProcessResult::FinishedWithSuccess) {
@@ -3154,7 +3154,7 @@ void GitClient::push(const FilePath &workingDirectory, const QStringList &pushAr
             return;
 
         if (pushFailure == PushFailure::NonFastForward) {
-            const QColor warnColor = Utils::creatorTheme()->color(Theme::TextColorError);
+            const QColor warnColor = Utils::creatorColor(Theme::TextColorError);
             if (QMessageBox::question(
                     Core::ICore::dialogParent(), Tr::tr("Force Push"),
                     Tr::tr("Push failed. Would you like to force-push <span style=\"color:#%1\">"
diff --git a/src/plugins/git/gitgrep.cpp b/src/plugins/git/gitgrep.cpp
index 73feffd68f8..84bf26238f6 100644
--- a/src/plugins/git/gitgrep.cpp
+++ b/src/plugins/git/gitgrep.cpp
@@ -245,14 +245,15 @@ GitGrepParameters GitGrep::gitParameters() const
     return {m_treeLineEdit->text(), m_recurseSubmodules && m_recurseSubmodules->isChecked()};
 }
 
-void GitGrep::readSettings(QtcSettings *settings)
+void GitGrep::readSettings(const Store &s)
 {
-    m_treeLineEdit->setText(settings->value(GitGrepRef).toString());
+    m_treeLineEdit->setText(s.value(GitGrepRef).toString());
 }
 
-void GitGrep::writeSettings(QtcSettings *settings) const
+void GitGrep::writeSettings(Store &s) const
 {
-    settings->setValue(GitGrepRef, m_treeLineEdit->text());
+    if (!m_treeLineEdit->text().isEmpty())
+        s.insert(GitGrepRef, m_treeLineEdit->text());
 }
 
 SearchExecutor GitGrep::searchExecutor() const
diff --git a/src/plugins/git/gitgrep.h b/src/plugins/git/gitgrep.h
index bb6967eb675..4e5c75d97ab 100644
--- a/src/plugins/git/gitgrep.h
+++ b/src/plugins/git/gitgrep.h
@@ -24,8 +24,8 @@ public:
     QString title() const override;
     QString toolTip() const override;
     QWidget *widget() const override;
-    void readSettings(Utils::QtcSettings *settings) override;
-    void writeSettings(Utils::QtcSettings *settings) const override;
+    void readSettings(const Utils::Store &settings) override;
+    void writeSettings(Utils::Store &settings) const override;
     TextEditor::SearchExecutor searchExecutor() const override;
     TextEditor::EditorOpener editorOpener() const override;
 
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index af5b267101a..d238f7113eb 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -1766,13 +1766,11 @@ VcsCommand *GitPluginPrivate::createInitialCheckoutCommand(const QString &url,
                                                            const QString &localName,
                                                            const QStringList &extraArgs)
 {
-    QStringList args = {"clone", "--progress"};
-    args << extraArgs << url << localName;
-
     auto command = VcsBaseClient::createVcsCommand(this, baseDirectory,
                                                    gitClient().processEnvironment(baseDirectory));
     command->addFlags(RunFlags::SuppressStdErr);
-    command->addJob({gitClient().vcsBinary(baseDirectory), args}, -1);
+    command->addJob({gitClient().vcsBinary(baseDirectory),
+                     {"clone", "--progress", extraArgs, url, localName}}, -1);
     return command;
 }
 
diff --git a/src/plugins/git/gitsettings.cpp b/src/plugins/git/gitsettings.cpp
index 2e7f8bf2de4..f8056d9a00a 100644
--- a/src/plugins/git/gitsettings.cpp
+++ b/src/plugins/git/gitsettings.cpp
@@ -151,7 +151,7 @@ GitSettings::GitSettings()
 
             Group {
                 title(Tr::tr("Instant Blame")),
-                instantBlame.groupChecker(),
+                groupChecker(instantBlame.groupChecker()),
                 Row { instantBlameIgnoreSpaceChanges, instantBlameIgnoreLineMoves, st },
             },
 
diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp
index 3a968a1e86f..1e09d6ec9dc 100644
--- a/src/plugins/git/gitsubmiteditor.cpp
+++ b/src/plugins/git/gitsubmiteditor.cpp
@@ -11,7 +11,6 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/iversioncontrol.h>
 #include <coreplugin/progressmanager/progressmanager.h>
-#include <extensionsystem/pluginmanager.h>
 #include <utils/async.h>
 #include <utils/qtcassert.h>
 #include <vcsbase/submitfilemodel.h>
@@ -210,7 +209,7 @@ void GitSubmitEditor::updateFileModel()
     Core::ProgressManager::addTask(m_fetchWatcher.future(), Tr::tr("Refreshing Commit Data"),
                                    TASK_UPDATE_COMMIT);
 
-    ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(m_fetchWatcher.future());
+    Utils::futureSynchronizer()->addFuture(m_fetchWatcher.future());
 }
 
 void GitSubmitEditor::forceUpdateFileModel()
diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp
index c9b716df269..a6635104ea7 100644
--- a/src/plugins/git/gitsubmiteditorwidget.cpp
+++ b/src/plugins/git/gitsubmiteditorwidget.cpp
@@ -120,8 +120,7 @@ void GitSubmitEditorWidget::setPanelInfo(const GitSubmitEditorPanelInfo &info)
 {
     m_gitSubmitPanel->repositoryLabel->setText(info.repository.toUserOutput());
     if (info.branch.contains("(no branch)")) {
-        const QString errorColor =
-                Utils::creatorTheme()->color(Utils::Theme::TextColorError).name();
+        const QString errorColor = Utils::creatorColor(Utils::Theme::TextColorError).name();
         m_gitSubmitPanel->branchLabel->setText(QString::fromLatin1("<span style=\"color:%1\">%2</span>")
                                                 .arg(errorColor, Tr::tr("Detached HEAD")));
     } else {
diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp
index d0a102c9df4..138943ef2cc 100644
--- a/src/plugins/git/mergetool.cpp
+++ b/src/plugins/git/mergetool.cpp
@@ -35,9 +35,7 @@ MergeTool::MergeTool(QObject *parent) : QObject(parent)
 
 void MergeTool::start(const FilePath &workingDirectory, const QStringList &files)
 {
-    QStringList arguments;
-    arguments << "mergetool" << "-y" << files;
-    const CommandLine cmd = {gitClient().vcsBinary(workingDirectory), arguments};
+    const CommandLine cmd{gitClient().vcsBinary(workingDirectory), {"mergetool", "-y", files}};
     VcsOutputWindow::appendCommand(workingDirectory, cmd);
     m_process.setCommand(cmd);
     m_process.setWorkingDirectory(workingDirectory);
diff --git a/src/plugins/gitlab/GitLab.json.in b/src/plugins/gitlab/GitLab.json.in
index ad55a21d7c5..5d58885d608 100644
--- a/src/plugins/gitlab/GitLab.json.in
+++ b/src/plugins/gitlab/GitLab.json.in
@@ -13,7 +13,11 @@
 "",
 "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."
 ],
-"Description" : "GitLab plugin.",
-"Url" : "http://www.qt.io",
+"Description" : "Create connections to GitLab servers.",
+"LongDescription" : [
+    "You also need:",
+        "- GitLab account"
+],
+"Url" : "https://www.qt.io",
 ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/gitlab/gitlaboptionspage.cpp b/src/plugins/gitlab/gitlaboptionspage.cpp
index d550dd48452..181d5fba829 100644
--- a/src/plugins/gitlab/gitlaboptionspage.cpp
+++ b/src/plugins/gitlab/gitlaboptionspage.cpp
@@ -102,7 +102,7 @@ GitLabServerWidget::GitLabServerWidget(Mode m, QWidget *parent)
             m_token, br,
             m_port, br,
             m_secure,
-            m == Edit ? normalMargin : noMargin
+            m == Edit ? &Layout::setNormalMargins : &Layout::setNoMargins
         },
     }.attachTo(this);
 }
diff --git a/src/plugins/glsleditor/GLSLEditor.json.in b/src/plugins/glsleditor/GLSLEditor.json.in
index 54ef8d548bb..254c53a2cf2 100644
--- a/src/plugins/glsleditor/GLSLEditor.json.in
+++ b/src/plugins/glsleditor/GLSLEditor.json.in
@@ -13,8 +13,11 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Other Languages",
-    "Description" : "Editor for GLSL.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Create OpenGL fragment and vertex shaders.",
+    "LongDescription" : [
+        "Use the shaders to display hardware-accelerated 3D graphics alongside a more conventional UI."
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
 
     "Mimetypes" : [
diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp
index 36bba041372..a454057ce26 100644
--- a/src/plugins/glsleditor/glsleditor.cpp
+++ b/src/plugins/glsleditor/glsleditor.cpp
@@ -31,7 +31,6 @@
 #include <texteditor/textdocument.h>
 #include <texteditor/syntaxhighlighter.h>
 #include <texteditor/texteditor.h>
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorconstants.h>
 #include <texteditor/texteditorsettings.h>
 
@@ -466,9 +465,9 @@ public:
         setParenthesesMatchingEnabled(true);
         setCodeFoldingSupported(true);
 
-        setEditorActionHandlers(TextEditorActionHandler::Format
-                                | TextEditorActionHandler::UnCommentSelection
-                                | TextEditorActionHandler::UnCollapseAll);
+        setOptionalActionMask(OptionalActions::Format
+                                | OptionalActions::UnCommentSelection
+                                | OptionalActions::UnCollapseAll);
     }
 };
 
diff --git a/src/plugins/glsleditor/glslhighlighter.cpp b/src/plugins/glsleditor/glslhighlighter.cpp
index eae8419a049..a6da1d6221a 100644
--- a/src/plugins/glsleditor/glslhighlighter.cpp
+++ b/src/plugins/glsleditor/glslhighlighter.cpp
@@ -190,7 +190,8 @@ void GlslHighlighter::highlightBlock(const QString &text)
 
     // if the block is ifdefed out, we only store the parentheses, but
     // do not adjust the brace depth.
-    if (TextDocumentLayout::ifdefedOut(currentBlock())) {
+    if (TextBlockUserData *userData = TextDocumentLayout::textUserData(currentBlock());
+            userData && userData->ifdefedOut()) {
         braceDepth = initialBraceDepth;
         foldingIndent = initialBraceDepth;
     }
diff --git a/src/plugins/haskell/Haskell.json.in b/src/plugins/haskell/Haskell.json.in
index 9cdb34694a5..96147540a37 100644
--- a/src/plugins/haskell/Haskell.json.in
+++ b/src/plugins/haskell/Haskell.json.in
@@ -6,7 +6,8 @@
     "Vendor" : "Eike Ziller",
     "Copyright" : "(C) Eike Ziller",
     "License" : "MIT",
-    "Description" : "Haskell support",
+    "Description" : "Write source code in the Haskell language.",
+    "LongDescription" : [],
     "Url" : "https://haskell.org",
     ${IDE_PLUGIN_DEPENDENCIES},
 
@@ -19,5 +20,6 @@
         "        <glob pattern='*.cabal'/>",
         "    </mime-type>",
         "</mime-info>"
-    ]
+    ],
+    "JsonWizardPaths" : [ ":/haskell/share/wizards/" ]
 }
diff --git a/src/plugins/haskell/haskellbuildconfiguration.cpp b/src/plugins/haskell/haskellbuildconfiguration.cpp
index 1434833ff65..bb8ef948705 100644
--- a/src/plugins/haskell/haskellbuildconfiguration.cpp
+++ b/src/plugins/haskell/haskellbuildconfiguration.cpp
@@ -90,7 +90,7 @@ public:
                 &Utils::PathChooser::textChanged,
                 bc,
                 [bc, buildDirectoryInput](const QString &) {
-                    bc->setBuildDirectory(buildDirectoryInput->rawFilePath());
+                    bc->setBuildDirectory(buildDirectoryInput->unexpandedFilePath());
                 });
     }
 };
diff --git a/src/plugins/haskell/haskelleditorfactory.cpp b/src/plugins/haskell/haskelleditorfactory.cpp
index 89bf561b1f7..55f077a9f96 100644
--- a/src/plugins/haskell/haskelleditorfactory.cpp
+++ b/src/plugins/haskell/haskelleditorfactory.cpp
@@ -13,7 +13,6 @@
 
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/textindenter.h>
 
 #include <QAction>
@@ -42,8 +41,8 @@ public:
         setId(Constants::C_HASKELLEDITOR_ID);
         setDisplayName(::Core::Tr::tr("Haskell Editor"));
         addMimeType("text/x-haskell");
-        setEditorActionHandlers(TextEditorActionHandler::UnCommentSelection
-                              | TextEditorActionHandler::FollowSymbolUnderCursor);
+        setOptionalActionMask(
+                    OptionalActions::UnCommentSelection | OptionalActions::FollowSymbolUnderCursor);
         setDocumentCreator([] { return new TextDocument(Constants::C_HASKELLEDITOR_ID); });
         setIndenterCreator([](QTextDocument *doc) { return new TextIndenter(doc); });
         setEditorWidgetCreator(&createEditorWidget);
diff --git a/src/plugins/haskell/haskellplugin.cpp b/src/plugins/haskell/haskellplugin.cpp
index f8c32dc288d..1041bf4695e 100644
--- a/src/plugins/haskell/haskellplugin.cpp
+++ b/src/plugins/haskell/haskellplugin.cpp
@@ -39,8 +39,6 @@ public:
                                                    Tr::tr("Haskell", "SnippetProvider"));
 
         setupHaskellActions(this);
-
-        ProjectExplorer::JsonWizardFactory::addWizardPath(":/haskell/share/wizards/");
     }
 };
 
diff --git a/src/plugins/haskell/haskellproject.cpp b/src/plugins/haskell/haskellproject.cpp
index 01d652c49ef..4d05ded8901 100644
--- a/src/plugins/haskell/haskellproject.cpp
+++ b/src/plugins/haskell/haskellproject.cpp
@@ -54,7 +54,6 @@ public:
 
 private:
     void updateApplicationTargets();
-    void refresh();
 
 private:
     ParseGuard m_parseGuard;
diff --git a/src/plugins/helloworld/HelloWorld.json.in b/src/plugins/helloworld/HelloWorld.json.in
index bf6fa1587be..9438334fdd7 100644
--- a/src/plugins/helloworld/HelloWorld.json.in
+++ b/src/plugins/helloworld/HelloWorld.json.in
@@ -14,6 +14,6 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Description" : "Hello World sample plugin.",
-    "Url" : "http://www.qt.io",
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/help/Help.json.in b/src/plugins/help/Help.json.in
index e6ecc9eeb37..a6afd3a12a2 100644
--- a/src/plugins/help/Help.json.in
+++ b/src/plugins/help/Help.json.in
@@ -13,7 +13,11 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Core",
-    "Description" : "Help system.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Get help for Qt API and read Qt and other documentation.",
+    "LongDescription" : [
+    "You also need:",
+        "- Qt documentation as help files (.qch)"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp
index b0c22ca0f78..a87633a8408 100644
--- a/src/plugins/help/generalsettingspage.cpp
+++ b/src/plugins/help/generalsettingspage.cpp
@@ -63,7 +63,6 @@ private:
 
     QFont m_font;
     int m_fontZoom = 100;
-    QFontDatabase m_fontDatabase;
 
     QString m_homePage;
     int m_contextOption;
@@ -400,9 +399,9 @@ void GeneralSettingsPageWidget::exportBookmarks()
 void GeneralSettingsPageWidget::updateFontSizeSelector()
 {
     const QString &family = m_font.family();
-    const QString &fontStyle = m_fontDatabase.styleString(m_font);
+    const QString &fontStyle = QFontDatabase::styleString(m_font);
 
-    QList<int> pointSizes = m_fontDatabase.pointSizes(family, fontStyle);
+    QList<int> pointSizes = QFontDatabase::pointSizes(family, fontStyle);
     if (pointSizes.empty())
         pointSizes = QFontDatabase::standardSizes();
 
@@ -424,8 +423,8 @@ void GeneralSettingsPageWidget::updateFontSizeSelector()
 
 void GeneralSettingsPageWidget::updateFontStyleSelector()
 {
-    const QString &fontStyle = m_fontDatabase.styleString(m_font);
-    const QStringList &styles = m_fontDatabase.styles(m_font.family());
+    const QString &fontStyle = QFontDatabase::styleString(m_font);
+    const QStringList &styles = QFontDatabase::styles(m_font.family());
 
     QSignalBlocker blocker(styleComboBox);
     styleComboBox->clear();
diff --git a/src/plugins/help/helpindexfilter.cpp b/src/plugins/help/helpindexfilter.cpp
index c535fe31b02..2820c634a3d 100644
--- a/src/plugins/help/helpindexfilter.cpp
+++ b/src/plugins/help/helpindexfilter.cpp
@@ -10,7 +10,6 @@
 
 #include <coreplugin/helpmanager.h>
 #include <coreplugin/icore.h>
-#include <extensionsystem/pluginmanager.h>
 #include <utils/async.h>
 #include <utils/utilsicons.h>
 
@@ -95,7 +94,6 @@ LocatorMatcherTasks HelpIndexFilter::matchers()
         }
         const QStringList cache = m_lastEntry.isEmpty() || !storage->input().contains(m_lastEntry)
                                       ? m_allIndicesCache : m_lastIndicesCache;
-        async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
         async.setConcurrentCallData(matches, *storage, cache, m_icon);
     };
     const auto onDone = [this, storage](const Async<QStringList> &async) {
diff --git a/src/plugins/help/helpmanager.cpp b/src/plugins/help/helpmanager.cpp
index a117afd916a..eee8f8fcd47 100644
--- a/src/plugins/help/helpmanager.cpp
+++ b/src/plugins/help/helpmanager.cpp
@@ -2,14 +2,13 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "helpmanager.h"
+#include "localhelpmanager.h"
 
 #include "helptr.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/algorithm.h>
 #include <utils/async.h>
 #include <utils/filesystemwatcher.h>
@@ -140,7 +139,7 @@ void HelpManager::registerDocumentation(const QStringList &files)
     }
 
     QFuture<bool> future = Utils::asyncRun(&registerDocumentationNow, collectionFilePath(), files);
-    ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(future);
+    Utils::futureSynchronizer()->addFuture(future);
     Utils::onResultReady(future, this, [](bool docsChanged){
         if (docsChanged) {
             d->m_helpEngine->setupData();
@@ -203,7 +202,7 @@ void HelpManager::unregisterDocumentation(const QStringList &files)
 
     d->m_userRegisteredFiles.subtract(Utils::toSet(files));
     QFuture<bool> future = Utils::asyncRun(&unregisterDocumentationNow, collectionFilePath(), files);
-    ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(future);
+    Utils::futureSynchronizer()->addFuture(future);
     Utils::onResultReady(future, this, [](bool docsChanged){
         if (docsChanged) {
             d->m_helpEngine->setupData();
@@ -284,6 +283,11 @@ void HelpManager::showHelpUrl(const QUrl &url, Core::HelpManager::HelpViewerLoca
     emit m_instance->helpRequested(url, location);
 }
 
+void HelpManager::addOnlineHelpHandler(const Core::HelpManager::OnlineHelpHandler &handler)
+{
+    LocalHelpManager::addOnlineHelpHandler(handler);
+}
+
 QStringList HelpManager::registeredNamespaces()
 {
     QTC_ASSERT(!d->m_needsSetup, return {});
diff --git a/src/plugins/help/helpmanager.h b/src/plugins/help/helpmanager.h
index 5f0efe56200..8842586315f 100644
--- a/src/plugins/help/helpmanager.h
+++ b/src/plugins/help/helpmanager.h
@@ -57,6 +57,8 @@ public:
         const QUrl &url,
         Core::HelpManager::HelpViewerLocation location = Core::HelpManager::HelpModeAlways) override;
 
+    void addOnlineHelpHandler(const Core::HelpManager::OnlineHelpHandler &handler) override;
+
     static void setupHelpManager();
 
 signals:
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index e9706a3db18..c729ff575d3 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -102,6 +102,7 @@ public:
     void modeChanged(Id mode, Id old);
 
     void requestContextHelp();
+    void requestContextHelpFor(QList<QPointer<IContext>> contexts);
     void showContextHelp(const HelpItem &contextHelp);
     void activateIndex();
     void activateContents();
@@ -464,11 +465,32 @@ void HelpPluginPrivate::requestContextHelp()
     const HelpItem tipHelp = tipHelpValue.canConvert<HelpItem>()
                                  ? tipHelpValue.value<HelpItem>()
                                  : HelpItem(tipHelpValue.toString());
-    IContext *context = ICore::currentContextObject();
-    if (tipHelp.isEmpty() && context)
-        context->contextHelp([this](const HelpItem &item) { showContextHelp(item); });
-    else
+    const QList<IContext *> contexts = ICore::currentContextObjects();
+    if (contexts.isEmpty() && !tipHelp.isEmpty()) {
         showContextHelp(tipHelp);
+    } else {
+        requestContextHelpFor(Utils::transform(contexts, [](IContext *context) {
+            return QPointer<IContext>(context);
+        }));
+    }
+}
+
+void HelpPluginPrivate::requestContextHelpFor(QList<QPointer<IContext>> contexts)
+{
+    if (contexts.isEmpty())
+        return;
+    QPointer<IContext> context = contexts.takeFirst();
+    while (!context) {
+        if (contexts.isEmpty())
+            return;
+        context = contexts.takeFirst();
+    }
+    context->contextHelp([contexts, this](const HelpItem &item) {
+        if (!item.isEmpty())
+            showContextHelp(item);
+        else
+            requestContextHelpFor(contexts);
+    });
 }
 
 void HelpPluginPrivate::showContextHelp(const HelpItem &contextHelp)
@@ -485,8 +507,8 @@ void HelpPluginPrivate::showContextHelp(const HelpItem &contextHelp)
                                     "<font color=\"%3\">%5</font>"
                                     "</center></body></html>")
                                 .arg(Tr::tr("No Documentation"))
-                                .arg(creatorTheme()->color(Theme::BackgroundColorNormal).name())
-                                .arg(creatorTheme()->color(Theme::TextColorNormal).name())
+                                .arg(creatorColor(Theme::BackgroundColorNormal).name())
+                                .arg(creatorColor(Theme::TextColorNormal).name())
                                 .arg(contextHelp.helpIds().join(", "))
                                 .arg(Tr::tr("No documentation available.")));
         }
diff --git a/src/plugins/help/helpviewer.cpp b/src/plugins/help/helpviewer.cpp
index 323d9d3f854..01eed943b1b 100644
--- a/src/plugins/help/helpviewer.cpp
+++ b/src/plugins/help/helpviewer.cpp
@@ -136,6 +136,9 @@ bool HelpViewer::launchWithExternalApp(const QUrl &url)
         // QHelpEngineCore::findFile returns a valid url even though the file does not exist
         if (resolvedUrl.scheme() == "about" && resolvedUrl.path() == "blank")
             return false;
+        // fake items have no associated file - they are kind of virtual folders
+        if (resolvedUrl.fileName().isEmpty())
+            return false;
 
         const QString& path = resolvedUrl.path();
         if (!canOpenPage(path)) {
diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp
index 0aeb0b0fd8f..08f66b155cd 100644
--- a/src/plugins/help/helpwidget.cpp
+++ b/src/plugins/help/helpwidget.cpp
@@ -52,6 +52,24 @@ static const char kModeSideBarSettingsKey[] = "Help/ModeSideBar";
 namespace Help {
 namespace Internal {
 
+class ButtonWithMenu : public QToolButton
+{
+public:
+    ButtonWithMenu(QWidget *parent = nullptr)
+        : QToolButton(parent)
+    {}
+
+protected:
+    void mousePressEvent(QMouseEvent *e) override
+    {
+        if (e->button() == Qt::RightButton) {
+            showMenu();
+            return;
+        }
+        QToolButton::mousePressEvent(e);
+    }
+};
+
 OpenPagesModel::OpenPagesModel(HelpWidget *parent)
     : m_parent(parent)
 {}
@@ -282,7 +300,9 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
     m_backAction->setMenu(m_backMenu);
     cmd = Core::ActionManager::registerAction(m_backAction, Constants::HELP_PREVIOUS, context);
     cmd->setDefaultKeySequence(QKeySequence::Back);
-    button = Core::Command::toolButtonWithAppendedShortcut(m_backAction, cmd);
+    button = new ButtonWithMenu;
+    button->setDefaultAction(m_backAction);
+    cmd->augmentActionWithShortcutToolTip(m_backAction);
     button->setPopupMode(QToolButton::DelayedPopup);
     layout->addWidget(button);
 
@@ -293,7 +313,9 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
     m_forwardAction->setMenu(m_forwardMenu);
     cmd = Core::ActionManager::registerAction(m_forwardAction, Constants::HELP_NEXT, context);
     cmd->setDefaultKeySequence(QKeySequence::Forward);
-    button = Core::Command::toolButtonWithAppendedShortcut(m_forwardAction, cmd);
+    button = new ButtonWithMenu;
+    button->setDefaultAction(m_forwardAction);
+    cmd->augmentActionWithShortcutToolTip(m_forwardAction);
     button->setPopupMode(QToolButton::DelayedPopup);
     layout->addWidget(button);
 
diff --git a/src/plugins/help/images/mode_help_mask.png b/src/plugins/help/images/mode_help_mask.png
index 144871e8542..a6542695d2d 100644
Binary files a/src/plugins/help/images/mode_help_mask.png and b/src/plugins/help/images/mode_help_mask.png differ
diff --git a/src/plugins/help/images/mode_help_mask@2x.png b/src/plugins/help/images/mode_help_mask@2x.png
index 50f12d8e117..e50cb34fea4 100644
Binary files a/src/plugins/help/images/mode_help_mask@2x.png and b/src/plugins/help/images/mode_help_mask@2x.png differ
diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp
index 4bca01bf79c..738e3337a17 100644
--- a/src/plugins/help/localhelpmanager.cpp
+++ b/src/plugins/help/localhelpmanager.cpp
@@ -53,6 +53,8 @@ QHelpEngine* LocalHelpManager::m_guiEngine = nullptr;
 QMutex LocalHelpManager::m_bkmarkMutex;
 BookmarkManager* LocalHelpManager::m_bookmarkManager = nullptr;
 
+QList<Core::HelpManager::OnlineHelpHandler> LocalHelpManager::m_onlineHelpHandlerList;
+
 const char kHelpHomePageKey[] = "Help/HomePage";
 const char kFontFamilyKey[] = "Help/FallbackFontFamily";
 const char kFontStyleNameKey[] = "Help/FallbackFontStyleName";
@@ -86,7 +88,7 @@ static QString defaultFallbackFontFamily()
 
 static QString defaultFallbackFontStyleName(const QString &fontFamily)
 {
-    const QStringList styles = QFontDatabase().styles(fontFamily);
+    const QStringList styles = QFontDatabase::styles(fontFamily);
     QTC_ASSERT(!styles.isEmpty(), return QString("Regular"));
     return styles.first();
 }
@@ -96,6 +98,8 @@ LocalHelpManager::LocalHelpManager(QObject *parent)
 {
     m_instance = this;
     qRegisterMetaType<Help::Internal::LocalHelpManager::HelpData>("Help::Internal::LocalHelpManager::HelpData");
+
+    addOnlineHelpHandler({LocalHelpManager::isQtUrl, LocalHelpManager::openQtUrl});
 }
 
 LocalHelpManager::~LocalHelpManager()
@@ -507,6 +511,14 @@ QHelpFilterEngine *LocalHelpManager::filterEngine()
 }
 
 bool LocalHelpManager::canOpenOnlineHelp(const QUrl &url)
+{
+    return Utils::anyOf(
+        m_onlineHelpHandlerList, [url](const Core::HelpManager::OnlineHelpHandler &handler) {
+            return handler.handlesUrl(url);
+        });
+}
+
+bool LocalHelpManager::isQtUrl(const QUrl &url)
 {
     const QString address = url.toString();
     return address.startsWith("qthelp://org.qt-project.")
@@ -514,37 +526,50 @@ bool LocalHelpManager::canOpenOnlineHelp(const QUrl &url)
         || address.startsWith("qthelp://com.trolltech.");
 }
 
-bool LocalHelpManager::openOnlineHelp(const QUrl &url)
+void LocalHelpManager::openQtUrl(const QUrl &url)
 {
     static const QString unversionedLocalDomainName
         = QString("org.qt-project.%1").arg(Utils::appInfo().id);
 
-    if (canOpenOnlineHelp(url)) {
-        QString urlPrefix = "http://doc.qt.io/";
-        if (url.authority().startsWith(unversionedLocalDomainName)) {
-            urlPrefix.append(Utils::appInfo().id);
+    QString urlPrefix = "http://doc.qt.io/";
+    if (url.authority().startsWith(unversionedLocalDomainName)) {
+        urlPrefix.append(Utils::appInfo().id);
+    } else {
+        const auto host = url.host();
+        const auto dot = host.lastIndexOf('.');
+        if (dot < 0) {
+            urlPrefix.append("qt-5");
         } else {
-            const auto host = url.host();
-            const auto dot = host.lastIndexOf('.');
-            if (dot < 0) {
-                urlPrefix.append("qt-5");
+            const auto version = host.mid(dot + 1);
+            if (version.startsWith('6')) {
+                urlPrefix.append("qt-6");
             } else {
-                const auto version = host.mid(dot + 1);
-                if (version.startsWith('6')) {
-                    urlPrefix.append("qt-6");
-                } else {
-                    urlPrefix.append("qt-5");
-                }
+                urlPrefix.append("qt-5");
             }
         }
-        const QString address = url.toString();
-        QDesktopServices::openUrl(QUrl(urlPrefix + address.mid(address.lastIndexOf(QLatin1Char('/')))));
-        return true;
     }
-    return false;
+    const QString address = url.toString();
+    QDesktopServices::openUrl(QUrl(urlPrefix + address.mid(address.lastIndexOf(QLatin1Char('/')))));
+}
+
+bool LocalHelpManager::openOnlineHelp(const QUrl &url)
+{
+    return Utils::anyOf(
+        m_onlineHelpHandlerList, [url](const Core::HelpManager::OnlineHelpHandler &handler) {
+            if (handler.handlesUrl(url)) {
+                handler.openUrl(url);
+                return true;
+            }
+            return false;
+        });
 }
 
 QMultiMap<QString, QUrl> LocalHelpManager::linksForKeyword(const QString &keyword)
 {
     return HelpManager::linksForKeyword(&LocalHelpManager::helpEngine(), keyword, std::nullopt);
 }
+
+void LocalHelpManager::addOnlineHelpHandler(const Core::HelpManager::OnlineHelpHandler &handler)
+{
+    LocalHelpManager::m_onlineHelpHandlerList.push_back(handler);
+}
diff --git a/src/plugins/help/localhelpmanager.h b/src/plugins/help/localhelpmanager.h
index 5195e7f1b70..13a30555c12 100644
--- a/src/plugins/help/localhelpmanager.h
+++ b/src/plugins/help/localhelpmanager.h
@@ -101,9 +101,13 @@ public:
 
     static bool canOpenOnlineHelp(const QUrl &url);
     static bool openOnlineHelp(const QUrl &url);
+    static bool isQtUrl(const QUrl &url);
+    static void openQtUrl(const QUrl &url);
 
     static QMultiMap<QString, QUrl> linksForKeyword(const QString &keyword);
 
+    static void addOnlineHelpHandler(const Core::HelpManager::OnlineHelpHandler &handler);
+
 signals:
     void fallbackFontChanged(const QFont &font);
     void fontZoomChanged(int percentage);
@@ -121,6 +125,8 @@ private:
 
     static QMutex m_bkmarkMutex;
     static BookmarkManager *m_bookmarkManager;
+
+    static QList<Core::HelpManager::OnlineHelpHandler> m_onlineHelpHandlerList;
 };
 
 }   // Internal
diff --git a/src/plugins/imageviewer/ImageViewer.json.in b/src/plugins/imageviewer/ImageViewer.json.in
index 90ffbcc0c62..4b3e37cb9c8 100644
--- a/src/plugins/imageviewer/ImageViewer.json.in
+++ b/src/plugins/imageviewer/ImageViewer.json.in
@@ -12,8 +12,9 @@
                   "",
                   "Alternatively, this plugin 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 plugin. 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."
     ],
-    "Description" : "Image Viewer component.",
-    "Url" : "http://www.qt.io",
+    "Description" : "View images, and create pixmaps from SVG images.",
+    "LongDescription" : [],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
 
     "Mimetypes" : [
diff --git a/src/plugins/incredibuild/IncrediBuild.json.in b/src/plugins/incredibuild/IncrediBuild.json.in
index d7fb5f242b6..8874505ff5a 100644
--- a/src/plugins/incredibuild/IncrediBuild.json.in
+++ b/src/plugins/incredibuild/IncrediBuild.json.in
@@ -6,7 +6,7 @@
     "Vendor" : "IncrediBuild",
     "Copyright" : "(C) IncrediBuild",
     "Category" : "Build Systems",
-    "Url" : "http://www.IncrediBuild.com",
+    "Url" : "https://www.IncrediBuild.com",
     "License" : [ "Commercial Usage",
                   "",
                   "Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt 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.",
@@ -15,6 +15,10 @@
                   "",
                   "Alternatively, this plugin 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 plugin. 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."
     ],
-    "Description" : "Support for Incredibuild.",
+    "Description" : "Spend less time on building C++ code.",
+    "LongDescription" : [
+        "You also need:",
+            "- IncrediBuild Agent"
+    ],
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/incredibuild/buildconsolebuildstep.cpp b/src/plugins/incredibuild/buildconsolebuildstep.cpp
index 61b40a8b2f9..2b8bcd2185a 100644
--- a/src/plugins/incredibuild/buildconsolebuildstep.cpp
+++ b/src/plugins/incredibuild/buildconsolebuildstep.cpp
@@ -55,9 +55,12 @@ public:
     CommandBuilderAspect commandBuilder{this};
 
     TextDisplay t2{this, "<i>" + Tr::tr("Enter the appropriate arguments to your build command.")};
-    TextDisplay t3{this, "<i>" + Tr::tr("Make sure the build command's multi-job "
-                                        "parameter value is large enough "
-                                        "(such as -j200 for the JOM or Make build tools)")};
+    TextDisplay
+        t3{this,
+           "<i>"
+               + Tr::tr("Make sure the build command's multi-job "
+                        "parameter value is large enough "
+                        "(such as -j200 for the JOM or Make build tools).")};
     BoolAspect keepJobNum{this};
 
     TextDisplay t4{this, "<b>" + Tr::tr("IncrediBuild Distribution Control")};
@@ -187,7 +190,7 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id
 
     hideHeader.setSettingsKey("IncrediBuild.BuildConsole.HideHeader");
     hideHeader.setLabel(Tr::tr("Hide IncrediBuild Header in output:"));
-    hideHeader.setToolTip(Tr::tr("Suppresses IncrediBuild's header in the build output"));
+    hideHeader.setToolTip(Tr::tr("Suppresses IncrediBuild's header in the build output."));
 
     logLevel.setSettingsKey("IncrediBuild.BuildConsole.LogLevel");
     logLevel.setDisplayName(Tr::tr("Internal IncrediBuild logging level:"));
@@ -198,7 +201,7 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id
     logLevel.addOption("Detailed");
     logLevel.setToolTip(Tr::tr("Overrides the internal Incredibuild logging level for this build. "
                                "Does not affect output or any user accessible logging. Used mainly "
-                               "to troubleshoot issues with the help of IncrediBuild support"));
+                               "to troubleshoot issues with the help of IncrediBuild support."));
 
     setEnv.setSettingsKey("IncrediBuild.BuildConsole.SetEnv");
     setEnv.setLabelText(Tr::tr("Set an Environment Variable:"));
@@ -210,14 +213,14 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id
     stopOnError.setToolTip(Tr::tr("When specified, the execution will stop as soon as an error "
                                   "is encountered. This is the default behavior in "
                                   "\"Visual Studio\" builds, but not the default for "
-                                  "\"Make and Build tools\" or \"Dev Tools\" builds"));
+                                  "\"Make and Build tools\" or \"Dev Tools\" builds."));
 
     additionalArguments.setSettingsKey("IncrediBuild.BuildConsole.AdditionalArguments");
     additionalArguments.setLabelText(Tr::tr("Additional Arguments:"));
     additionalArguments.setDisplayStyle(StringAspect::LineEditDisplay);
     additionalArguments.setToolTip(Tr::tr("Add additional buildconsole arguments manually. "
                                           "The value of this field will be concatenated to the "
-                                          "final buildconsole command line"));
+                                          "final buildconsole command line."));
 
     openMonitor.setSettingsKey("IncrediBuild.BuildConsole.OpenMonitor");
     openMonitor.setLabel(Tr::tr("Open Build Monitor:"));
diff --git a/src/plugins/incredibuild/commandbuilderaspect.cpp b/src/plugins/incredibuild/commandbuilderaspect.cpp
index 99c29cd2692..83476af36ff 100644
--- a/src/plugins/incredibuild/commandbuilderaspect.cpp
+++ b/src/plugins/incredibuild/commandbuilderaspect.cpp
@@ -112,7 +112,7 @@ void CommandBuilderAspectPrivate::tryToMigrate()
     }
 }
 
-void CommandBuilderAspect::addToLayout(Layouting::LayoutItem &parent)
+void CommandBuilderAspect::addToLayout(Layouting::Layout &parent)
 {
     if (!d->commandBuilder) {
         d->commandBuilder = new QComboBox;
@@ -132,7 +132,7 @@ void CommandBuilderAspect::addToLayout(Layouting::LayoutItem &parent)
         d->makePathChooser->setBaseDirectory(PathChooser::homePath());
         d->makePathChooser->setHistoryCompleter("IncrediBuild.BuildConsole.MakeCommand.History");
         connect(d->makePathChooser, &PathChooser::rawPathChanged, this, [this] {
-            d->m_activeCommandBuilder->setCommand(d->makePathChooser->rawFilePath());
+            d->m_activeCommandBuilder->setCommand(d->makePathChooser->unexpandedFilePath());
             updateGui();
         });
     }
diff --git a/src/plugins/incredibuild/commandbuilderaspect.h b/src/plugins/incredibuild/commandbuilderaspect.h
index 3282a18415f..2035a1c3090 100644
--- a/src/plugins/incredibuild/commandbuilderaspect.h
+++ b/src/plugins/incredibuild/commandbuilderaspect.h
@@ -23,7 +23,7 @@ public:
     QString fullCommandFlag(bool keepJobNum) const;
 
 private:
-    void addToLayout(Layouting::LayoutItem &parent) final;
+    void addToLayout(Layouting::Layout &parent) final;
     void fromMap(const Utils::Store &map) final;
     void toMap(Utils::Store &map) const final;
 
diff --git a/src/plugins/incredibuild/ibconsolebuildstep.cpp b/src/plugins/incredibuild/ibconsolebuildstep.cpp
index c53ffad4552..8dd68baa601 100644
--- a/src/plugins/incredibuild/ibconsolebuildstep.cpp
+++ b/src/plugins/incredibuild/ibconsolebuildstep.cpp
@@ -34,9 +34,12 @@ public:
     BoolAspect keepJobNum{this};
 
     TextDisplay t2{this, "<i>" + Tr::tr("Enter the appropriate arguments to your build command.")};
-    TextDisplay t3{this, "<i>" + Tr::tr("Make sure the build command's "
-                                        "multi-job parameter value is large enough (such as "
-                                        "-j200 for the JOM or Make build tools)")};
+    TextDisplay
+        t3{this,
+           "<i>"
+               + Tr::tr("Make sure the build command's "
+                        "multi-job parameter value is large enough (such as "
+                        "-j200 for the JOM or Make build tools).")};
 
     TextDisplay t4{this, "<b>" + Tr::tr("IncrediBuild Distribution Control")};
 
diff --git a/src/plugins/insight/Insight.json.in b/src/plugins/insight/Insight.json.in
index 096cc0569f5..509cc361200 100644
--- a/src/plugins/insight/Insight.json.in
+++ b/src/plugins/insight/Insight.json.in
@@ -14,8 +14,13 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Qt Quick",
-    "Description" : "Qt Insight Support for Design Studio.",
+    "Description" : "Collect information about how an application is used.",
+    "LongDescription" : [
+        "Use Qt Insight with Qt Design Studio.",
+        "You also need:",
+            "- Qt Insight"
+    ],
     "DisabledByDefault" : true,
-    "Url" : "http://www.qt.io",
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/ios/CMakeLists.txt b/src/plugins/ios/CMakeLists.txt
index e6ec1665b2c..1b7256e43e5 100644
--- a/src/plugins/ios/CMakeLists.txt
+++ b/src/plugins/ios/CMakeLists.txt
@@ -2,7 +2,6 @@ add_qtc_plugin(Ios
   DEPENDS QmlDebug Qt::Xml
   PLUGIN_DEPENDS Core Debugger ProjectExplorer QmakeProjectManager CMakeProjectManager
   SOURCES
-    createsimulatordialog.cpp createsimulatordialog.h
     devicectlutils.cpp
     devicectlutils.h
     ios.qrc
@@ -23,8 +22,6 @@ add_qtc_plugin(Ios
     iostoolhandler.cpp iostoolhandler.h
     iostr.h
     simulatorcontrol.cpp simulatorcontrol.h
-    simulatorinfomodel.cpp simulatorinfomodel.h
-    simulatoroperationdialog.cpp simulatoroperationdialog.h
 )
 
 extend_qtc_plugin(Ios
diff --git a/src/plugins/ios/Ios.json.in b/src/plugins/ios/Ios.json.in
index 2b2e4bae777..d58f96bc076 100644
--- a/src/plugins/ios/Ios.json.in
+++ b/src/plugins/ios/Ios.json.in
@@ -14,7 +14,13 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Device Support",
-    "Description" : "Support for deployment to and execution on iOS Devices.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Develop applications for iOS devices.",
+    "LongDescription" : [
+        "Connect devices with USB or use the iOS simulator to run, debug, and analyze applications built for iOS.",
+        "You also need:",
+            "- Qt for iOS",
+            "- Xcode"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/ios/createsimulatordialog.cpp b/src/plugins/ios/createsimulatordialog.cpp
deleted file mode 100644
index bacba246f27..00000000000
--- a/src/plugins/ios/createsimulatordialog.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "createsimulatordialog.h"
-
-#include "iostr.h"
-#include "simulatorcontrol.h"
-
-#include <utils/algorithm.h>
-#include <utils/async.h>
-#include <utils/layoutbuilder.h>
-
-#include <QApplication>
-#include <QComboBox>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QLineEdit>
-#include <QPushButton>
-
-namespace Ios::Internal {
-
-CreateSimulatorDialog::CreateSimulatorDialog(QWidget *parent)
-    : QDialog(parent)
-{
-    resize(320, 160);
-    setWindowTitle(Tr::tr("Create Simulator"));
-
-    m_nameEdit = new QLineEdit(this);
-    m_deviceTypeCombo = new QComboBox(this);
-    m_runtimeCombo = new QComboBox(this);
-
-    auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
-    buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
-
-    using namespace Layouting;
-
-    Column {
-        Form {
-            Tr::tr("Simulator name:"), m_nameEdit, br,
-            Tr::tr("Device type:"), m_deviceTypeCombo, br,
-            Tr::tr("OS version:"), m_runtimeCombo, br,
-        },
-        buttonBox
-    }.attachTo(this);
-
-    connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
-    connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
-
-    const auto enableOk = [this, buttonBox] {
-        buttonBox->button(QDialogButtonBox::Ok)->setEnabled(
-                    !m_nameEdit->text().isEmpty() &&
-                    m_deviceTypeCombo->currentIndex() > 0 &&
-                    m_runtimeCombo->currentIndex() > 0);
-    };
-
-    connect(m_nameEdit, &QLineEdit::textChanged, this, enableOk);
-    connect(m_runtimeCombo, &QComboBox::currentIndexChanged, this, enableOk);
-    connect(m_deviceTypeCombo, &QComboBox::currentIndexChanged, this, [this, enableOk] {
-        populateRuntimes(m_deviceTypeCombo->currentData().value<DeviceTypeInfo>());
-        enableOk();
-    });
-
-    m_futureSync.addFuture(Utils::onResultReady(SimulatorControl::updateDeviceTypes(), this,
-                                                &CreateSimulatorDialog::populateDeviceTypes));
-
-    QFuture<QList<RuntimeInfo>> runtimesfuture = SimulatorControl::updateRuntimes();
-    Utils::onResultReady(runtimesfuture, this, [this](const QList<RuntimeInfo> &runtimes) {
-        m_runtimes = runtimes;
-    });
-    m_futureSync.addFuture(runtimesfuture);
-    populateRuntimes(DeviceTypeInfo());
-}
-
-CreateSimulatorDialog::~CreateSimulatorDialog() = default;
-
-/*!
-    Returns the simulator name entered by user.
- */
-QString CreateSimulatorDialog::name() const
-{
-    return m_nameEdit->text();
-}
-
-/*!
-    Returns the simulator runtime (OS version) selected by user.
-    Though the runtimes are filtered by the selected device type but the runtime camppatibility is
-    not checked. i.e. User can select the Runtime iOS 10.2 for iPhone 4 but the combination is not
-    possible as iOS 10.2 is not compatible with iPhone 4. In this case the command to create
-    simulator shall fail with an error message describing the compatibility.
- */
-RuntimeInfo CreateSimulatorDialog::runtime() const
-{
-    return m_runtimeCombo->currentData().value<RuntimeInfo>();
-}
-
-/*!
-    Returns the selected device type.
- */
-DeviceTypeInfo CreateSimulatorDialog::deviceType() const
-{
-    return m_deviceTypeCombo->currentData().value<DeviceTypeInfo>();
-}
-
-/*!
-    Populates the devices types. Similar device types are grouped together.
- */
-void CreateSimulatorDialog::populateDeviceTypes(const QList<DeviceTypeInfo> &deviceTypes)
-{
-    m_deviceTypeCombo->clear();
-    m_deviceTypeCombo->addItem(Tr::tr("None"));
-
-    if (deviceTypes.isEmpty())
-        return;
-
-    m_deviceTypeCombo->insertSeparator(1);
-
-    auto addItems = [this, deviceTypes](const QString &filter) {
-        const auto filteredTypes = Utils::filtered(deviceTypes, [filter](const DeviceTypeInfo &type){
-            return type.name.contains(filter, Qt::CaseInsensitive);
-        });
-        for (auto type : filteredTypes) {
-            m_deviceTypeCombo->addItem(type.name, QVariant::fromValue<DeviceTypeInfo>(type));
-        }
-        return filteredTypes.count();
-    };
-
-    if (addItems(QStringLiteral("iPhone")) > 0)
-        m_deviceTypeCombo->insertSeparator(m_deviceTypeCombo->count());
-    if (addItems(QStringLiteral("iPad")) > 0)
-        m_deviceTypeCombo->insertSeparator(m_deviceTypeCombo->count());
-    if (addItems(QStringLiteral("TV")) > 0)
-        m_deviceTypeCombo->insertSeparator(m_deviceTypeCombo->count());
-    addItems(QStringLiteral("Watch"));
-}
-
-/*!
-    Populates the available runtimes. Though the runtimes are filtered by the selected device type
-    but the runtime camppatibility is not checked. i.e. User can select the Runtime iOS 10.2 for
-    iPhone 4 but the combination is not possible as iOS 10.2 is not compatible with iPhone 4. In
-    this case the command to create simulator shall fail with an error message describing the
-    compatibility issue.
- */
-void CreateSimulatorDialog::populateRuntimes(const DeviceTypeInfo &deviceType)
-{
-    m_runtimeCombo->clear();
-    m_runtimeCombo->addItem(Tr::tr("None"));
-
-    if (deviceType.name.isEmpty())
-        return;
-
-    m_runtimeCombo->insertSeparator(1);
-
-    auto addItems = [this](const QString &filter) {
-        const auto filteredTypes = Utils::filtered(m_runtimes, [filter](const RuntimeInfo &runtime){
-            return runtime.name.contains(filter, Qt::CaseInsensitive);
-        });
-        for (auto runtime : filteredTypes) {
-            m_runtimeCombo->addItem(runtime.name, QVariant::fromValue<RuntimeInfo>(runtime));
-        }
-    };
-
-    if (deviceType.name.contains(QStringLiteral("iPhone")))
-        addItems(QStringLiteral("iOS"));
-    else if (deviceType.name.contains(QStringLiteral("iPad")))
-        addItems(QStringLiteral("iOS"));
-    else if (deviceType.name.contains(QStringLiteral("TV")))
-        addItems(QStringLiteral("tvOS"));
-    else if (deviceType.name.contains(QStringLiteral("Watch")))
-        addItems(QStringLiteral("watchOS"));
-}
-
-} // Ios::Internal
diff --git a/src/plugins/ios/createsimulatordialog.h b/src/plugins/ios/createsimulatordialog.h
deleted file mode 100644
index 9f269cc636e..00000000000
--- a/src/plugins/ios/createsimulatordialog.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <utils/futuresynchronizer.h>
-
-#include <QDialog>
-
-QT_BEGIN_NAMESPACE
-class QComboBox;
-class QLineEdit;
-QT_END_NAMESPACE
-
-namespace Ios::Internal {
-
-class DeviceTypeInfo;
-class RuntimeInfo;
-
-/*!
-    A dialog to select the iOS Device type and the runtime for a new
-    iOS simulator device.
- */
-class CreateSimulatorDialog : public QDialog
-{
-public:
-    explicit CreateSimulatorDialog(QWidget *parent = nullptr);
-    ~CreateSimulatorDialog() override;
-
-    QString name() const;
-    RuntimeInfo runtime() const;
-    DeviceTypeInfo deviceType() const;
-
-private:
-    void populateDeviceTypes(const QList<DeviceTypeInfo> &deviceTypes);
-    void populateRuntimes(const DeviceTypeInfo &deviceType);
-
-    QList<RuntimeInfo> m_runtimes;
-
-    QLineEdit *m_nameEdit;
-    QComboBox *m_deviceTypeCombo;
-    QComboBox *m_runtimeCombo;
-    Utils::FutureSynchronizer m_futureSync; // Keep me last
-};
-
-} // Ios::Internal
diff --git a/src/plugins/ios/devicectlutils.cpp b/src/plugins/ios/devicectlutils.cpp
index 7bbed859b27..667f1bc54a9 100644
--- a/src/plugins/ios/devicectlutils.cpp
+++ b/src/plugins/ios/devicectlutils.cpp
@@ -73,6 +73,7 @@ expected_str<QMap<QString, QString>> parseDeviceInfo(const QByteArray &rawOutput
             info[kOsVersion] = QLatin1String("%1 (%2)")
                                    .arg(device["deviceProperties"]["osVersionNumber"].toString(),
                                         device["deviceProperties"]["osBuildUpdate"].toString());
+            info[kProductType] = device["hardwareProperties"]["productType"].toString();
             info[kCpuArchitecture] = device["hardwareProperties"]["cpuType"]["name"].toString();
             info[kUniqueDeviceId] = udid;
             return info;
diff --git a/src/plugins/ios/devicectlutils.h b/src/plugins/ios/devicectlutils.h
index 106fee78a23..cb470cff29a 100644
--- a/src/plugins/ios/devicectlutils.h
+++ b/src/plugins/ios/devicectlutils.h
@@ -13,6 +13,7 @@ const char kDeviceName[] = "deviceName";
 const char kDeveloperStatus[] = "developerStatus";
 const char kDeviceConnected[] = "deviceConnected";
 const char kOsVersion[] = "osVersion";
+const char kProductType[] = "productType";
 const char kCpuArchitecture[] = "cpuArchitecture";
 const char kUniqueDeviceId[] = "uniqueDeviceId";
 const char vOff[] = "*off*";
diff --git a/src/plugins/ios/ios.qbs b/src/plugins/ios/ios.qbs
index fa81e1facd7..f07418443de 100644
--- a/src/plugins/ios/ios.qbs
+++ b/src/plugins/ios/ios.qbs
@@ -15,8 +15,6 @@ QtcPlugin {
     cpp.frameworks: base.concat(qbs.targetOS.contains("macos") ? ["CoreFoundation", "IOKit"] : [])
 
     files: [
-        "createsimulatordialog.cpp",
-        "createsimulatordialog.h",
         "devicectlutils.cpp",
         "devicectlutils.h",
         "ios.qrc",
@@ -51,9 +49,5 @@ QtcPlugin {
         "iostr.h",
         "simulatorcontrol.cpp",
         "simulatorcontrol.h",
-        "simulatorinfomodel.cpp",
-        "simulatorinfomodel.h",
-        "simulatoroperationdialog.cpp",
-        "simulatoroperationdialog.h",
     ]
 }
diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp
index ff995c6c2c7..6d7d559d488 100644
--- a/src/plugins/ios/iosconfigurations.cpp
+++ b/src/plugins/ios/iosconfigurations.cpp
@@ -12,8 +12,6 @@
 
 #include <coreplugin/icore.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <projectexplorer/kitaspects.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/devicesupport/devicemanager.h>
@@ -34,8 +32,8 @@
 
 #include <utils/algorithm.h>
 #include <utils/futuresynchronizer.h>
-#include <utils/qtcprocess.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 
 #include <QDir>
 #include <QDomDocument>
@@ -69,7 +67,6 @@ const bool IgnoreAllDevicesDefault = false;
 
 const char SettingsGroup[] = "IosConfigurations";
 const char ignoreAllDevicesKey[] = "IgnoreAllDevices";
-const char screenshotDirPathKey[] = "ScreeshotDirPath";
 
 const char provisioningTeamsTag[] = "IDEProvisioningTeams";
 const char freeTeamTag[] = "isFreeProvisioningTeam";
@@ -343,19 +340,6 @@ void IosConfigurations::setIgnoreAllDevices(bool ignoreDevices)
     }
 }
 
-void IosConfigurations::setScreenshotDir(const FilePath &path)
-{
-    if (m_instance->m_screenshotDir != path) {
-        m_instance->m_screenshotDir = path;
-        m_instance->save();
-    }
-}
-
-FilePath IosConfigurations::screenshotDir()
-{
-    return m_instance->m_screenshotDir;
-}
-
 FilePath IosConfigurations::developerPath()
 {
     return m_instance->m_developerPath;
@@ -366,20 +350,11 @@ QVersionNumber IosConfigurations::xcodeVersion()
     return m_instance->m_xcodeVersion;
 }
 
-static FilePath defaultScreenshotDirPath()
-{
-    return FilePath::fromUserInput(
-        QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).constFirst());
-}
-
 void IosConfigurations::save()
 {
     QtcSettings *settings = Core::ICore::settings();
     settings->beginGroup(SettingsGroup);
     settings->setValueWithDefault(ignoreAllDevicesKey, m_ignoreAllDevices, IgnoreAllDevicesDefault);
-    settings->setValueWithDefault(screenshotDirPathKey,
-                                  m_screenshotDir.toSettings(),
-                                  defaultScreenshotDirPath().toSettings());
     settings->endGroup();
 }
 
@@ -396,11 +371,6 @@ void IosConfigurations::load()
     QtcSettings *settings = Core::ICore::settings();
     settings->beginGroup(SettingsGroup);
     m_ignoreAllDevices = settings->value(ignoreAllDevicesKey, IgnoreAllDevicesDefault).toBool();
-    m_screenshotDir = FilePath::fromSettings(settings->value(screenshotDirPathKey));
-
-    if (!m_screenshotDir.isWritableDir())
-        m_screenshotDir = defaultScreenshotDirPath();
-
     settings->endGroup();
 }
 
@@ -414,8 +384,7 @@ void IosConfigurations::updateSimulators()
         dev = IDevice::ConstPtr(new IosSimulator(devId));
         devManager->addDevice(dev);
     }
-    ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(
-        SimulatorControl::updateAvailableSimulators(this));
+    Utils::futureSynchronizer()->addFuture(SimulatorControl::updateAvailableSimulators(this));
 }
 
 void IosConfigurations::setDeveloperPath(const FilePath &devPath)
diff --git a/src/plugins/ios/iosconfigurations.h b/src/plugins/ios/iosconfigurations.h
index 7b65f2f8e6b..953b872cd07 100644
--- a/src/plugins/ios/iosconfigurations.h
+++ b/src/plugins/ios/iosconfigurations.h
@@ -78,8 +78,6 @@ public:
     static void initialize();
     static bool ignoreAllDevices();
     static void setIgnoreAllDevices(bool ignoreDevices);
-    static void setScreenshotDir(const Utils::FilePath &path);
-    static Utils::FilePath screenshotDir();
     static Utils::FilePath developerPath();
     static QVersionNumber xcodeVersion();
     static Utils::FilePath lldbPath();
@@ -103,7 +101,6 @@ private:
     void loadProvisioningData(bool notify = true);
 
     Utils::FilePath m_developerPath;
-    Utils::FilePath m_screenshotDir;
     QVersionNumber m_xcodeVersion;
     bool m_ignoreAllDevices;
     QFileSystemWatcher *m_provisioningDataWatcher = nullptr;
diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp
index e81c263672b..0dd75896e06 100644
--- a/src/plugins/ios/iosdevice.cpp
+++ b/src/plugins/ios/iosdevice.cpp
@@ -92,8 +92,9 @@ public:
         Form {
             Tr::tr("Device name:"), iosDevice->deviceName(), br,
             Tr::tr("Identifier:"), iosDevice->uniqueInternalDeviceId(), br,
+            Tr::tr("Product type:"), iosDevice->productType(), br,
+            Tr::tr("CPU Architecture:"), iosDevice->cpuArchitecture(), br,
             Tr::tr("OS Version:"), iosDevice->osVersion(), br,
-            Tr::tr("CPU Architecture:"), iosDevice->cpuArchitecture(),
             noMargin
         }.attachTo(this);
         // clang-format on
@@ -193,6 +194,11 @@ QString IosDevice::osVersion() const
     return m_extraInfo.value(kOsVersion);
 }
 
+QString IosDevice::productType() const
+{
+    return m_extraInfo.value(kProductType);
+}
+
 QString IosDevice::cpuArchitecture() const
 {
     return m_extraInfo.value(kCpuArchitecture);
@@ -227,6 +233,7 @@ IosDeviceManager::TranslationMap IosDeviceManager::translationMap()
     tMap[QLatin1String("NO")]              = Tr::tr("no");
     tMap[QLatin1String("*unknown*")]       = Tr::tr("unknown");
     tMap[kOsVersion]                       = Tr::tr("OS version");
+    tMap[kProductType] = Tr::tr("Product type");
     translationMap = &tMap;
     return tMap;
 }
diff --git a/src/plugins/ios/iosdevice.h b/src/plugins/ios/iosdevice.h
index 62a7f2bb93a..b8ec2871347 100644
--- a/src/plugins/ios/iosdevice.h
+++ b/src/plugins/ios/iosdevice.h
@@ -37,6 +37,7 @@ public:
     QString uniqueDeviceID() const;
     QString uniqueInternalDeviceId() const;
     QString osVersion() const;
+    QString productType() const;
     QString cpuArchitecture() const;
     Utils::Port nextPort() const;
     Handler handler() const;
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp
index 676fb68724a..3fc8c75950f 100644
--- a/src/plugins/ios/iosrunconfiguration.cpp
+++ b/src/plugins/ios/iosrunconfiguration.cpp
@@ -21,10 +21,11 @@
 #include <projectexplorer/target.h>
 
 #include <utils/algorithm.h>
+#include <utils/async.h>
 #include <utils/filepath.h>
 #include <utils/layoutbuilder.h>
-#include <utils/qtcprocess.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 
 #include <QAction>
 #include <QApplication>
@@ -33,6 +34,7 @@
 #include <QLabel>
 #include <QLineEdit>
 #include <QList>
+#include <QPushButton>
 #include <QVariant>
 #include <QWidget>
 
@@ -335,19 +337,32 @@ IosDeviceTypeAspect::IosDeviceTypeAspect(AspectContainer *container, IosRunConfi
             this, &IosDeviceTypeAspect::deviceChanges);
 }
 
-void IosDeviceTypeAspect::addToLayout(Layouting::LayoutItem &parent)
+void IosDeviceTypeAspect::addToLayout(Layouting::Layout &parent)
 {
     m_deviceTypeComboBox = new QComboBox;
     m_deviceTypeComboBox->setModel(&m_deviceTypeModel);
 
     m_deviceTypeLabel = new QLabel(Tr::tr("Device type:"));
 
-    parent.addItems({m_deviceTypeLabel, m_deviceTypeComboBox});
+    m_updateButton = new QPushButton(Tr::tr("Update"));
+
+    parent.addItems({m_deviceTypeLabel, m_deviceTypeComboBox, m_updateButton, Layouting::st});
 
     updateValues();
 
     connect(m_deviceTypeComboBox, &QComboBox::currentIndexChanged,
             this, &IosDeviceTypeAspect::setDeviceTypeIndex);
+    connect(m_updateButton, &QPushButton::clicked, this, [this] {
+        m_updateButton->setEnabled(false);
+        Utils::onFinished(
+            QFuture<void>(SimulatorControl::updateAvailableSimulators(this)),
+            this,
+            [this](QFuture<void>) {
+                m_updateButton->setEnabled(true);
+                m_deviceTypeModel.clear();
+                updateValues();
+            });
+    });
 }
 
 void IosDeviceTypeAspect::setDeviceTypeIndex(int devIndex)
@@ -363,6 +378,7 @@ void IosDeviceTypeAspect::updateValues()
     bool showDeviceSelector = deviceType().type != IosDeviceType::IosDevice;
     m_deviceTypeLabel->setVisible(showDeviceSelector);
     m_deviceTypeComboBox->setVisible(showDeviceSelector);
+    m_updateButton->setVisible(showDeviceSelector);
     if (showDeviceSelector && m_deviceTypeModel.rowCount() == 0) {
         const QList<SimulatorInfo> devices = SimulatorControl::availableSimulators();
         for (const SimulatorInfo &device : devices) {
diff --git a/src/plugins/ios/iosrunconfiguration.h b/src/plugins/ios/iosrunconfiguration.h
index baef05cd1d2..4defcf36ee8 100644
--- a/src/plugins/ios/iosrunconfiguration.h
+++ b/src/plugins/ios/iosrunconfiguration.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include "iosconstants.h"
-#include "iosconfigurations.h"
 #include "iossimulator.h"
 
 #include <projectexplorer/runconfiguration.h>
@@ -12,9 +10,13 @@
 
 #include <utils/fileutils.h>
 
-#include <QComboBox>
 #include <QStandardItemModel>
 
+QT_BEGIN_NAMESPACE
+class QComboBox;
+class QPushButton;
+QT_END_NAMESPACE
+
 namespace Ios::Internal {
 
 class IosRunConfiguration;
@@ -29,7 +31,7 @@ public:
 
     void fromMap(const Utils::Store &map) override;
     void toMap(Utils::Store &map) const override;
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     IosDeviceType deviceType() const;
     void setDeviceType(const IosDeviceType &deviceType);
@@ -58,6 +60,7 @@ private:
     QStandardItemModel m_deviceTypeModel;
     QLabel *m_deviceTypeLabel = nullptr;
     QComboBox *m_deviceTypeComboBox = nullptr;
+    QPushButton *m_updateButton = nullptr;
 };
 
 class IosRunConfiguration : public ProjectExplorer::RunConfiguration
diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp
index 1999f7a8994..f2b59a46948 100644
--- a/src/plugins/ios/iosrunner.cpp
+++ b/src/plugins/ios/iosrunner.cpp
@@ -62,7 +62,7 @@ namespace Ios::Internal {
 
 static QString identifierForRunControl(RunControl *runControl)
 {
-    const IosDeviceTypeAspect::Data *data = runControl->aspect<IosDeviceTypeAspect>();
+    const IosDeviceTypeAspect::Data *data = runControl->aspectData<IosDeviceTypeAspect>();
     return data ? data->deviceType.identifier : QString();
 }
 
@@ -125,7 +125,7 @@ DeviceCtlRunner::DeviceCtlRunner(RunControl *runControl)
     : RunWorker(runControl)
 {
     setId("IosDeviceCtlRunner");
-    const IosDeviceTypeAspect::Data *data = runControl->aspect<IosDeviceTypeAspect>();
+    const IosDeviceTypeAspect::Data *data = runControl->aspectData<IosDeviceTypeAspect>();
     QTC_ASSERT(data, return);
     m_bundlePath = data->bundleDirectory;
     m_arguments = ProcessArgs::splitArgs(runControl->commandLine().arguments(), OsTypeMac);
@@ -222,11 +222,7 @@ GroupItem DeviceCtlRunner::killProcess(Storage<AppInfo> &appInfo)
                              QString::number(appInfo->processIdentifier)}});
         return SetupResult::Continue;
     };
-    const auto onDone = [] {
-        // we tried our best and don't care at this point
-        return DoneResult::Success;
-    };
-    return ProcessTask(onSetup, onDone);
+    return ProcessTask(onSetup, DoneResult::Success); // we tried our best and don't care at this point
 }
 
 GroupItem DeviceCtlRunner::launchTask(const QString &bundleIdentifier)
@@ -237,17 +233,17 @@ GroupItem DeviceCtlRunner::launchTask(const QString &bundleIdentifier)
             return SetupResult::StopWithError;
         }
         process.setCommand({FilePath::fromString("/usr/bin/xcrun"),
-                            QStringList{"devicectl",
-                                        "device",
-                                        "process",
-                                        "launch",
-                                        "--device",
-                                        m_device->uniqueInternalDeviceId(),
-                                        "--quiet",
-                                        "--json-output",
-                                        "-",
-                                        bundleIdentifier}
-                                + m_arguments});
+                            {"devicectl",
+                             "device",
+                             "process",
+                             "launch",
+                             "--device",
+                             m_device->uniqueInternalDeviceId(),
+                             "--quiet",
+                             "--json-output",
+                             "-",
+                             bundleIdentifier,
+                             m_arguments}});
         return SetupResult::Continue;
     };
     const auto onDone = [this](const Process &process, DoneWith result) {
@@ -447,7 +443,7 @@ IosRunner::IosRunner(RunControl *runControl)
 {
     setId("IosRunner");
     stopRunningRunControl(runControl);
-    const IosDeviceTypeAspect::Data *data = runControl->aspect<IosDeviceTypeAspect>();
+    const IosDeviceTypeAspect::Data *data = runControl->aspectData<IosDeviceTypeAspect>();
     QTC_ASSERT(data, return);
     m_bundleDir = data->bundleDirectory;
     m_device = DeviceKitAspect::device(runControl->kit());
@@ -813,14 +809,17 @@ void IosDebugSupport::start()
         setStartMode(AttachToRemoteProcess);
         setIosPlatform("remote-ios");
         const QString osVersion = dev->osVersion();
+        const QString productType = dev->productType();
         const QString cpuArchitecture = dev->cpuArchitecture();
-        const FilePaths symbolsPathCandidates = {
-            FilePath::fromString(QDir::homePath() + "/Library/Developer/Xcode/iOS DeviceSupport/"
-                                 + osVersion + " " + cpuArchitecture + "/Symbols"),
-            FilePath::fromString(QDir::homePath() + "/Library/Developer/Xcode/iOS DeviceSupport/"
-                                 + osVersion + "/Symbols"),
-            IosConfigurations::developerPath().pathAppended(
-                "Platforms/iPhoneOS.platform/DeviceSupport/" + osVersion + "/Symbols")};
+        const FilePath home = FilePath::fromString(QDir::homePath());
+        const FilePaths symbolsPathCandidates
+            = {home / "Library/Developer/Xcode/iOS DeviceSupport" / (productType + " " + osVersion)
+                   / "Symbols",
+               home / "Library/Developer/Xcode/iOS DeviceSupport"
+                   / (osVersion + " " + cpuArchitecture) / "Symbols",
+               home / "Library/Developer/Xcode/iOS DeviceSupport" / osVersion / "Symbols",
+               IosConfigurations::developerPath() / "Platforms/iPhoneOS.platform/DeviceSupport"
+                   / osVersion / "Symbols"};
         const FilePath deviceSdk = Utils::findOrDefault(symbolsPathCandidates, &FilePath::isDir);
 
         if (deviceSdk.isEmpty()) {
@@ -837,7 +836,7 @@ void IosDebugSupport::start()
         setIosPlatform("ios-simulator");
     }
 
-    const IosDeviceTypeAspect::Data *data = runControl()->aspect<IosDeviceTypeAspect>();
+    const IosDeviceTypeAspect::Data *data = runControl()->aspectData<IosDeviceTypeAspect>();
     QTC_ASSERT(data, reportFailure("Broken IosDeviceTypeAspect setup."); return);
 
     setRunControlName(data->applicationName);
diff --git a/src/plugins/ios/iossettingspage.cpp b/src/plugins/ios/iossettingspage.cpp
index 042dfca9af6..8c699ebc033 100644
--- a/src/plugins/ios/iossettingspage.cpp
+++ b/src/plugins/ios/iossettingspage.cpp
@@ -3,34 +3,17 @@
 
 #include "iossettingspage.h"
 
-#include "createsimulatordialog.h"
 #include "iosconfigurations.h"
 #include "iosconstants.h"
 #include "iostr.h"
-#include "simulatorcontrol.h"
-#include "simulatorinfomodel.h"
-#include "simulatoroperationdialog.h"
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
 #include <projectexplorer/projectexplorerconstants.h>
 
-#include <utils/algorithm.h>
-#include <utils/async.h>
 #include <utils/layoutbuilder.h>
-#include <utils/pathchooser.h>
 
 #include <QCheckBox>
-#include <QDateTime>
-#include <QGroupBox>
-#include <QHeaderView>
-#include <QInputDialog>
-#include <QLabel>
-#include <QMessageBox>
-#include <QPointer>
-#include <QPushButton>
-#include <QSortFilterProxyModel>
-#include <QTreeView>
 
 using namespace std::placeholders;
 
@@ -47,43 +30,10 @@ private:
 
     void saveSettings();
 
-    void onStart();
-    void onCreate();
-    void onReset();
-    void onRename();
-    void onDelete();
-    void onScreenshot();
-    void onSelectionChanged();
-
 private:
-    Utils::PathChooser *m_pathWidget;
-    QPushButton *m_startButton;
-    QPushButton *m_renameButton;
-    QPushButton *m_deleteButton;
-    QPushButton *m_resetButton;
-    QTreeView *m_deviceView;
     QCheckBox *m_deviceAskCheckBox;
 };
 
-const int simStartWarnCount = 4;
-
-static SimulatorInfoList selectedSimulators(const QTreeView *deviceTreeView)
-{
-    SimulatorInfoList list;
-    QItemSelectionModel *selectionModel = deviceTreeView->selectionModel();
-    for (QModelIndex index: selectionModel->selectedRows())
-        list << deviceTreeView->model()->data(index, Qt::UserRole).value<SimulatorInfo>();
-    return list;
-}
-
-static void onSimOperation(const SimulatorInfo &simInfo,
-                           SimulatorOperationDialog *dlg,
-                           const QString &contextStr,
-                           const SimulatorControl::Response &response)
-{
-    dlg->addMessage(simInfo, response, contextStr);
-}
-
 IosSettingsWidget::IosSettingsWidget()
 {
     setWindowTitle(Tr::tr("iOS Configuration"));
@@ -91,43 +41,14 @@ IosSettingsWidget::IosSettingsWidget()
     m_deviceAskCheckBox = new QCheckBox(Tr::tr("Ask about devices not in developer mode"));
     m_deviceAskCheckBox->setChecked(!IosConfigurations::ignoreAllDevices());
 
-    m_renameButton = new QPushButton(Tr::tr("Rename"));
-    m_renameButton->setEnabled(false);
-    m_renameButton->setToolTip(Tr::tr("Rename a simulator device."));
-
-    m_deleteButton = new QPushButton(Tr::tr("Delete"));
-    m_deleteButton->setEnabled(false);
-    m_deleteButton->setToolTip(Tr::tr("Delete simulator devices."));
-
-    m_resetButton = new QPushButton(Tr::tr("Reset"));
-    m_resetButton->setEnabled(false);
-    m_resetButton->setToolTip(Tr::tr("Reset contents and settings of simulator devices."));
-
-    auto createButton = new QPushButton(Tr::tr("Create"));
-    createButton->setToolTip(Tr::tr("Create a new simulator device."));
-
-    m_startButton = new QPushButton(Tr::tr("Start"));
-    m_startButton->setEnabled(false);
-    m_startButton->setToolTip(Tr::tr("Start simulator devices."));
-
-    auto proxyModel = new QSortFilterProxyModel(this);
-    proxyModel->setSourceModel(new SimulatorInfoModel(this));
-
-    m_deviceView = new QTreeView;
-    m_deviceView->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Expanding);
-    m_deviceView->setSelectionMode(QAbstractItemView::ExtendedSelection);
-    m_deviceView->setSelectionBehavior(QAbstractItemView::SelectRows);
-    m_deviceView->setSortingEnabled(true);
-    m_deviceView->setModel(proxyModel);
-    m_deviceView->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
-
-    m_pathWidget = new Utils::PathChooser;
-    m_pathWidget->setExpectedKind(Utils::PathChooser::ExistingDirectory);
-    m_pathWidget->lineEdit()->setReadOnly(true);
-    m_pathWidget->setFilePath(IosConfigurations::screenshotDir());
-    m_pathWidget->addButton(Tr::tr("Screenshot"), this,
-                            std::bind(&IosSettingsWidget::onScreenshot, this));
+    auto xcodeLabel = new QLabel(
+        Tr::tr("Configure available simulator devices in <a href=\"%1\">Xcode</a>.")
+            .arg("https://developer.apple.com/documentation/xcode/"
+                 "running-your-app-in-simulator-or-on-a-device/"
+                 "#Configure-the-list-of-simulated-devices"));
+    xcodeLabel->setOpenExternalLinks(true);
 
+    // clang-format off
     using namespace Layouting;
     Column {
         Group {
@@ -136,33 +57,11 @@ IosSettingsWidget::IosSettingsWidget()
         },
         Group {
             title(Tr::tr("Simulator")),
-            Column {
-                Row {
-                    m_deviceView,
-                    Column {
-                        createButton,
-                        st,  // FIXME: Better some fixed space?
-                        m_startButton,
-                        m_renameButton,
-                        m_resetButton,
-                        m_deleteButton,
-                        st
-                    },
-                },
-                hr,
-                Row { Tr::tr("Screenshot directory:"), m_pathWidget }
-            }
-        }
+            Row { xcodeLabel }
+        },
+        st
     }.attachTo(this);
-
-    connect(m_startButton, &QPushButton::clicked, this, &IosSettingsWidget::onStart);
-    connect(createButton, &QPushButton::clicked, this, &IosSettingsWidget::onCreate);
-    connect(m_renameButton, &QPushButton::clicked, this, &IosSettingsWidget::onRename);
-    connect(m_resetButton, &QPushButton::clicked, this, &IosSettingsWidget::onReset);
-    connect(m_deleteButton, &QPushButton::clicked, this, &IosSettingsWidget::onDelete);
-
-    connect(m_deviceView->selectionModel(), &QItemSelectionModel::selectionChanged,
-            this, &IosSettingsWidget::onSelectionChanged);
+    // clang-format on
 }
 
 IosSettingsWidget::~IosSettingsWidget() = default;
@@ -173,229 +72,9 @@ void IosSettingsWidget::apply()
     IosConfigurations::updateAutomaticKitList();
 }
 
-/*!
-    Called on start button click. Selected simulator devices are started. Multiple devices can be
-    started simultaneously provided they in shutdown state.
- */
-void IosSettingsWidget::onStart()
-{
-    const SimulatorInfoList simulatorInfoList = selectedSimulators(m_deviceView);
-    if (simulatorInfoList.isEmpty())
-        return;
-
-    if (simulatorInfoList.count() > simStartWarnCount) {
-        const QString message =
-            Tr::tr("You are trying to launch %n simulators simultaneously. This "
-                                       "will take significant system resources. Do you really want to "
-                                       "continue?", "", simulatorInfoList.count());
-        const int buttonCode = QMessageBox::warning(this, Tr::tr("Simulator Start"), message,
-                                                    QMessageBox::Ok | QMessageBox::Abort,
-                                                    QMessageBox::Abort);
-
-        if (buttonCode == QMessageBox::Abort)
-            return;
-    }
-
-    QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this);
-    statusDialog->setAttribute(Qt::WA_DeleteOnClose);
-    statusDialog->addMessage(Tr::tr("Starting %n simulator device(s)...", "", simulatorInfoList.count()),
-                             Utils::NormalMessageFormat);
-
-    QList<QFuture<void>> futureList;
-    for (const SimulatorInfo &info : simulatorInfoList) {
-        if (!info.isShutdown()) {
-            statusDialog->addMessage(Tr::tr("Cannot start simulator (%1, %2) in current state: %3.")
-                                         .arg(info.name)
-                                         .arg(info.runtimeName)
-                                         .arg(info.state),
-                                     Utils::StdErrFormat);
-        } else {
-            futureList << QFuture<void>(Utils::onResultReady(
-                SimulatorControl::startSimulator(info.identifier), this,
-                std::bind(onSimOperation, info, statusDialog, Tr::tr("simulator start"), _1)));
-        }
-    }
-
-    statusDialog->addFutures(futureList);
-    statusDialog->exec(); // Modal dialog returns only when all the operations are done or cancelled.
-}
-
-/*!
-    Called on create button click. User is presented with the create simulator dialog and with the
-    selected options a new device is created.
- */
-void IosSettingsWidget::onCreate()
-{
-    QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this);
-    statusDialog->setAttribute(Qt::WA_DeleteOnClose);
-    statusDialog->addMessage(Tr::tr("Creating simulator device..."), Utils::NormalMessageFormat);
-    const auto onSimulatorCreate = [statusDialog](const QString &name,
-                                                  const SimulatorControl::Response &response) {
-        if (response) {
-            statusDialog->addMessage(Tr::tr("Simulator device (%1) created.\nUDID: %2")
-                                         .arg(name)
-                                         .arg(response->simUdid),
-                                     Utils::StdOutFormat);
-        } else {
-            statusDialog->addMessage(Tr::tr("Simulator device (%1) creation failed.\nError: %2")
-                                         .arg(name)
-                                         .arg(response.error()),
-                                     Utils::StdErrFormat);
-        }
-    };
-
-    CreateSimulatorDialog createDialog(this);
-    if (createDialog.exec() == QDialog::Accepted) {
-        QFuture<void> f = QFuture<void>(Utils::onResultReady(SimulatorControl::createSimulator(
-                createDialog.name(), createDialog.deviceType(), createDialog.runtime()),
-                this, std::bind(onSimulatorCreate, createDialog.name(), _1)));
-        statusDialog->addFutures({ f });
-        statusDialog->exec(); // Modal dialog returns only when all the operations are done or cancelled.
-    }
-}
-
-/*!
-    Called on reset button click. Contents and settings of the selected devices are erased. Multiple
-    devices can be erased simultaneously provided they in shutdown state.
- */
-void IosSettingsWidget::onReset()
-{
-    const SimulatorInfoList simulatorInfoList = selectedSimulators(m_deviceView);
-    if (simulatorInfoList.isEmpty())
-        return;
-
-    const int userInput = QMessageBox::question(this, Tr::tr("Reset"),
-                                      Tr::tr("Do you really want to reset the contents and settings"
-                                             " of the %n selected device(s)?", "",
-                                             simulatorInfoList.count()));
-    if (userInput == QMessageBox::No)
-        return;
-
-    QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this);
-    statusDialog->setAttribute(Qt::WA_DeleteOnClose);
-    statusDialog->addMessage(Tr::tr("Resetting contents and settings..."),
-                             Utils::NormalMessageFormat);
-
-    QList<QFuture<void>> futureList;
-    for (const SimulatorInfo &info : simulatorInfoList) {
-        futureList << QFuture<void>(Utils::onResultReady(
-            SimulatorControl::resetSimulator(info.identifier), this,
-            std::bind(onSimOperation, info, statusDialog, Tr::tr("simulator reset"), _1)));
-    }
-
-    statusDialog->addFutures(futureList);
-    statusDialog->exec(); // Modal dialog returns only when all the operations are done or cancelled.
-}
-
-/*!
-    Called on rename button click. Selected device is renamed. Only one device can be renamed at a
-    time. Rename button is disabled on multi-selection.
- */
-void IosSettingsWidget::onRename()
-{
-    const SimulatorInfoList simulatorInfoList = selectedSimulators(m_deviceView);
-    if (simulatorInfoList.isEmpty() || simulatorInfoList.count() > 1)
-        return;
-
-    const SimulatorInfo &simInfo = simulatorInfoList.at(0);
-    const QString newName = QInputDialog::getText(this, Tr::tr("Rename %1").arg(simInfo.name),
-                                                  Tr::tr("Enter new name:"));
-    if (newName.isEmpty())
-        return;
-
-    QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this);
-    statusDialog->setAttribute(Qt::WA_DeleteOnClose);
-    statusDialog->addMessage(Tr::tr("Renaming simulator device..."), Utils::NormalMessageFormat);
-    QFuture<void> f = QFuture<void>(Utils::onResultReady(
-        SimulatorControl::renameSimulator(simInfo.identifier, newName), this,
-        std::bind(onSimOperation, simInfo, statusDialog, Tr::tr("simulator rename"), _1)));
-    statusDialog->addFutures({f});
-    statusDialog->exec(); // Modal dialog returns only when all the operations are done or cancelled.
-}
-
-/*!
-    Called on delete button click. Selected devices are deleted. Multiple devices can be deleted
-    simultaneously provided they in shutdown state.
- */
-void IosSettingsWidget::onDelete()
-{
-    const SimulatorInfoList simulatorInfoList = selectedSimulators(m_deviceView);
-    if (simulatorInfoList.isEmpty())
-        return;
-
-    const int userInput =
-        QMessageBox::question(this, Tr::tr("Delete Device"),
-                                    Tr::tr("Do you really want to delete the %n selected "
-                                           "device(s)?", "", simulatorInfoList.count()));
-    if (userInput == QMessageBox::No)
-        return;
-
-    QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this);
-    statusDialog->setAttribute(Qt::WA_DeleteOnClose);
-    statusDialog->addMessage(Tr::tr("Deleting %n simulator device(s)...", "", simulatorInfoList.count()),
-                             Utils::NormalMessageFormat);
-    QList<QFuture<void>> futureList;
-    for (const SimulatorInfo &info : simulatorInfoList) {
-        futureList << QFuture<void>(Utils::onResultReady(
-            SimulatorControl::deleteSimulator(info.identifier), this,
-            std::bind(onSimOperation, info, statusDialog, Tr::tr("simulator delete"), _1)));
-    }
-
-    statusDialog->addFutures(futureList);
-    statusDialog->exec(); // Modal dialog returns only when all the operations are done or cancelled.
-}
-
-/*!
-    Called on screenshot button click. Screenshot of the selected devices are saved to the selected
-    path. Screenshot from multiple devices can be taken simultaneously provided they in booted state.
- */
-void IosSettingsWidget::onScreenshot()
-{
-    const SimulatorInfoList simulatorInfoList = selectedSimulators(m_deviceView);
-    if (simulatorInfoList.isEmpty())
-        return;
-
-    const auto generatePath = [this](const SimulatorInfo &info) {
-        const QString fileName = QString("%1_%2_%3.png").arg(info.name).arg(info.runtimeName)
-                .arg(QDateTime::currentDateTime().toString("yyyy-MM-dd_HH-mm-ss-z")).replace(' ', '_');
-        return m_pathWidget->filePath().pathAppended(fileName).toString();
-    };
-
-    QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this);
-    statusDialog->setAttribute(Qt::WA_DeleteOnClose);
-    statusDialog->addMessage(Tr::tr("Capturing screenshots from %n device(s)...", "",
-                                    simulatorInfoList.count()), Utils::NormalMessageFormat);
-    QList<QFuture<void>> futureList;
-    for (const SimulatorInfo &info : simulatorInfoList) {
-        futureList << QFuture<void>(Utils::onResultReady(
-            SimulatorControl::takeSceenshot(info.identifier, generatePath(info)), this,
-            std::bind(onSimOperation, info, statusDialog, Tr::tr("simulator screenshot"), _1)));
-    }
-
-    statusDialog->addFutures(futureList);
-    statusDialog->exec(); // Modal dialog returns only when all the operations are done or cancelled.
-}
-
-void IosSettingsWidget::onSelectionChanged()
-{
-    const SimulatorInfoList infoList = selectedSimulators(m_deviceView);
-    const bool hasRunning = Utils::anyOf(infoList, [](const SimulatorInfo &info) {
-        return info.isBooted();
-    });
-    const bool hasShutdown = Utils::anyOf(infoList, [](const SimulatorInfo &info) {
-        return info.isShutdown();
-    });
-    m_startButton->setEnabled(hasShutdown);
-    m_deleteButton->setEnabled(hasShutdown);
-    m_resetButton->setEnabled(hasShutdown);
-    m_renameButton->setEnabled(infoList.count() == 1 && hasShutdown);
-    m_pathWidget->buttonAtIndex(1)->setEnabled(hasRunning); // Screenshot button
-}
-
 void IosSettingsWidget::saveSettings()
 {
     IosConfigurations::setIgnoreAllDevices(!m_deviceAskCheckBox->isChecked());
-    IosConfigurations::setScreenshotDir(m_pathWidget->filePath());
 }
 
 // IosSettingsPage
diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp
index 2f3fe4f288d..420e119e741 100644
--- a/src/plugins/ios/iostoolhandler.cpp
+++ b/src/plugins/ios/iostoolhandler.cpp
@@ -848,6 +848,16 @@ void IosSimulatorToolHandlerPrivate::installAppOnSimulator()
     futureSynchronizer.addFuture(Utils::onResultReady(installFuture, q, onResponseAppInstall));
 }
 
+#ifdef Q_OS_UNIX
+static void monitorPid(QPromise<void> &promise, qint64 pid)
+{
+    do {
+        // Poll every 1 sec to check whether the app is running.
+        QThread::msleep(1000);
+    } while (!promise.isCanceled() && kill(pid, 0) == 0);
+}
+#endif
+
 void IosSimulatorToolHandlerPrivate::launchAppOnSimulator(const QStringList &extraArgs)
 {
     const QString bundleId = SimulatorControl::bundleIdentifier(m_bundlePath);
@@ -871,21 +881,7 @@ void IosSimulatorToolHandlerPrivate::launchAppOnSimulator(const QStringList &ext
                         "Install Xcode 8 or later.").arg(bundleId));
     }
 
-    auto monitorPid = [this](QPromise<void> &promise, qint64 pid) {
-#ifdef Q_OS_UNIX
-        do {
-            // Poll every 1 sec to check whether the app is running.
-            QThread::msleep(1000);
-        } while (!promise.isCanceled() && kill(pid, 0) == 0);
-#else
-    Q_UNUSED(pid)
-#endif
-        // Future is cancelled if the app is stopped from the qt creator.
-        if (!promise.isCanceled())
-            stop(0);
-    };
-
-    auto onResponseAppLaunch = [this, captureConsole, monitorPid, stdoutFile, stderrFile](
+    auto onResponseAppLaunch = [this, captureConsole, stdoutFile, stderrFile](
                                    const SimulatorControl::Response &response) {
         if (response) {
             if (!isResponseValid(*response))
@@ -893,8 +889,15 @@ void IosSimulatorToolHandlerPrivate::launchAppOnSimulator(const QStringList &ext
             m_pid = response->inferiorPid;
             gotInferiorPid(m_bundlePath, m_deviceId, response->inferiorPid);
             didStartApp(m_bundlePath, m_deviceId, Ios::IosToolHandler::Success);
+#ifdef Q_OS_UNIX
             // Start monitoring app's life signs.
-            futureSynchronizer.addFuture(Utils::asyncRun(monitorPid, response->inferiorPid));
+            futureSynchronizer.addFuture(Utils::onFinished(
+                Utils::asyncRun(monitorPid, response->inferiorPid), q,
+                [this](const QFuture<void> &future) {
+                    if (!future.isCanceled())
+                        stop(0);
+                }));
+#endif
             if (captureConsole)
                 futureSynchronizer.addFuture(Utils::asyncRun(&LogTailFiles::exec, &outputLogger,
                                                              stdoutFile, stderrFile));
diff --git a/src/plugins/ios/simulatorcontrol.cpp b/src/plugins/ios/simulatorcontrol.cpp
index 4def4c0e471..b702767251e 100644
--- a/src/plugins/ios/simulatorcontrol.cpp
+++ b/src/plugins/ios/simulatorcontrol.cpp
@@ -86,20 +86,18 @@ static expected_str<void> runCommand(
 }
 
 static expected_str<void> runSimCtlCommand(
-    QStringList args,
+    const QStringList &args,
     QString *output,
     QString *allOutput = nullptr,
     std::function<bool()> shouldStop = [] { return false; })
 {
-    args.prepend("simctl");
-
     // Cache xcrun's path, as this function will be called often.
     static FilePath xcrun = FilePath::fromString("xcrun").searchInPath();
     if (xcrun.isEmpty())
         return make_unexpected(Tr::tr("Cannot find xcrun."));
     else if (!xcrun.isExecutableFile())
         return make_unexpected(Tr::tr("xcrun is not executable."));
-    return runCommand({xcrun, args}, output, allOutput, shouldStop);
+    return runCommand({xcrun, {"simctl", args}}, output, allOutput, shouldStop);
 }
 
 static expected_str<void> launchSimulator(const QString &simUdid, std::function<bool()> shouldStop)
diff --git a/src/plugins/ios/simulatorinfomodel.cpp b/src/plugins/ios/simulatorinfomodel.cpp
deleted file mode 100644
index dce56467134..00000000000
--- a/src/plugins/ios/simulatorinfomodel.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "simulatorinfomodel.h"
-
-#include "iostr.h"
-
-#include <utils/algorithm.h>
-#include <utils/async.h>
-
-#include <QTimer>
-
-namespace Ios::Internal {
-
-using namespace std::placeholders;
-
-const int colCount = 3;
-const int nameCol = 0;
-const int runtimeCol = 1;
-const int stateCol = 2;
-const int deviceUpdateInterval = 1000; // Update simulator state every 1 sec.
-
-SimulatorInfoModel::SimulatorInfoModel(QObject *parent) :
-    QAbstractItemModel(parent)
-{
-    requestSimulatorInfo();
-
-    auto updateTimer = new QTimer(this);
-    connect(updateTimer, &QTimer::timeout, this, &SimulatorInfoModel::requestSimulatorInfo);
-    updateTimer->setInterval(deviceUpdateInterval);
-    updateTimer->start();
-}
-
-QVariant SimulatorInfoModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid())
-        return {};
-
-    const SimulatorInfo &simInfo = m_simList[index.row()];
-    if (role == Qt::EditRole || role == Qt::DisplayRole) {
-        switch (index.column()) {
-        case nameCol:
-            return simInfo.name;
-        case runtimeCol:
-            return simInfo.runtimeName;
-        case stateCol:
-            return simInfo.state;
-        default:
-            return "";
-        }
-    } else if (role == Qt::ToolTipRole) {
-        return Tr::tr("UDID: %1").arg(simInfo.identifier);
-    } else if (role == Qt::UserRole) {
-        return QVariant::fromValue<SimulatorInfo>(simInfo);
-    }
-
-    return {};
-}
-
-int SimulatorInfoModel::rowCount(const QModelIndex &parent) const
-{
-    if (!parent.isValid())
-        return m_simList.count();
-    return 0;
-}
-
-int SimulatorInfoModel::columnCount(const QModelIndex &parent) const
-{
-    Q_UNUSED(parent)
-    return colCount;
-}
-
-QVariant SimulatorInfoModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-    if (orientation == Qt::Vertical || section > colCount)
-        return {};
-
-    if (role == Qt::DisplayRole) {
-        switch (section) {
-        case nameCol:
-            return Tr::tr("Simulator Name");
-        case runtimeCol:
-            return Tr::tr("Runtime");
-        case stateCol:
-            return Tr::tr("Current State");
-        default:
-            return {};
-        }
-    }
-
-    return {};
-}
-
-QModelIndex SimulatorInfoModel::index(int row, int column, const QModelIndex &parent) const
-{
-    return hasIndex(row, column, parent) ? createIndex(row, column) : QModelIndex();
-}
-
-QModelIndex SimulatorInfoModel::parent(const QModelIndex &) const
-{
-    return {};
-}
-
-void SimulatorInfoModel::requestSimulatorInfo()
-{
-    m_fetchFuture.flushFinishedFutures();
-    if (!m_fetchFuture.isEmpty())
-        return; // Ignore the request if the last request is still pending.
-
-    m_fetchFuture.addFuture(Utils::onResultReady(SimulatorControl::updateAvailableSimulators(this),
-                                                 this, &SimulatorInfoModel::populateSimulators));
-}
-
-void SimulatorInfoModel::populateSimulators(const SimulatorInfoList &simulatorList)
-{
-    if (m_simList.isEmpty() || m_simList.count() != simulatorList.count()) {
-        // Reset the model in case of addition or deletion.
-        beginResetModel();
-        m_simList = simulatorList;
-        endResetModel();
-    } else {
-        // update the rows with data chagne. e.g. state changes.
-        auto newItr = simulatorList.cbegin();
-        int start = -1, end = -1;
-        std::list<std::pair<int, int>> updatedIndexes;
-        for (auto itr = m_simList.cbegin(); itr < m_simList.cend(); ++itr, ++newItr) {
-            if (*itr == *newItr) {
-                if (end != -1)
-                    updatedIndexes.emplace_back(start, end - 1);
-                start = std::distance(m_simList.cbegin(), itr);
-                end = -1;
-            } else {
-                end = std::distance(m_simList.cbegin(), itr);
-            }
-        }
-        m_simList = simulatorList;
-        for (auto pair: updatedIndexes)
-            emit dataChanged(index(pair.first,0), index(pair.second, colCount - 1));
-    }
-}
-
-} // Ios::Internal
diff --git a/src/plugins/ios/simulatorinfomodel.h b/src/plugins/ios/simulatorinfomodel.h
deleted file mode 100644
index c5769000d32..00000000000
--- a/src/plugins/ios/simulatorinfomodel.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include "simulatorcontrol.h"
-
-#include <utils/futuresynchronizer.h>
-
-#include <QAbstractListModel>
-
-namespace Ios::Internal {
-
-using SimulatorInfoList = QList<SimulatorInfo>;
-
-class SimulatorInfoModel : public QAbstractItemModel
-{
-public:
-    SimulatorInfoModel(QObject *parent = nullptr);
-
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    int columnCount(const QModelIndex &parent) const override;
-    QVariant headerData(int section, Qt::Orientation orientation,
-                        int role = Qt::DisplayRole) const override;
-    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
-    QModelIndex parent(const QModelIndex &) const override;
-
-private:
-    void requestSimulatorInfo();
-    void populateSimulators(const SimulatorInfoList &simulatorList);
-
-    Utils::FutureSynchronizer m_fetchFuture;
-    SimulatorInfoList m_simList;
-};
-
-} // Ios::Internal
diff --git a/src/plugins/ios/simulatoroperationdialog.cpp b/src/plugins/ios/simulatoroperationdialog.cpp
deleted file mode 100644
index b260f503101..00000000000
--- a/src/plugins/ios/simulatoroperationdialog.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "simulatoroperationdialog.h"
-
-#include "iostr.h"
-
-#include <utils/layoutbuilder.h>
-#include <utils/outputformatter.h>
-#include <utils/qtcassert.h>
-
-#include <QDialogButtonBox>
-#include <QFutureWatcher>
-#include <QLoggingCategory>
-#include <QPlainTextEdit>
-#include <QProgressBar>
-#include <QPushButton>
-
-namespace Ios::Internal {
-
-static Q_LOGGING_CATEGORY(iosCommon, "qtc.ios.common", QtWarningMsg)
-
-SimulatorOperationDialog::SimulatorOperationDialog(QWidget *parent) :
-    // TODO: Maximize buttong only because of QTBUG-41932
-    QDialog(parent,Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMaximizeButtonHint)
-{
-    resize(580, 320);
-    setModal(true);
-    setWindowTitle(Tr::tr("Simulator Operation Status"));
-
-    auto messageEdit = new QPlainTextEdit;
-    messageEdit->setReadOnly(true);
-
-    m_progressBar = new QProgressBar;
-    m_progressBar->setMaximum(0);
-    m_progressBar->setValue(-1);
-
-    m_buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
-
-    m_formatter = new Utils::OutputFormatter;
-    m_formatter->setPlainTextEdit(messageEdit);
-
-    using namespace Layouting;
-
-    Column {
-        messageEdit,
-        m_progressBar,
-        m_buttonBox
-    }.attachTo(this);
-
-    connect(m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
-    connect(m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
-}
-
-SimulatorOperationDialog::~SimulatorOperationDialog()
-{
-    // Cancel all pending futures.
-    const auto futureWatchList = m_futureWatchList;
-    for (auto watcher : futureWatchList) {
-        if (!watcher->isFinished())
-            watcher->cancel();
-    }
-
-    // wait for futures to finish
-    for (auto watcher : futureWatchList) {
-        if (!watcher->isFinished())
-            watcher->waitForFinished();
-        delete watcher;
-    }
-
-    delete m_formatter;
-}
-
-void SimulatorOperationDialog::addFutures(const QList<QFuture<void> > &futureList)
-{
-    for (auto future : futureList) {
-        if (!future.isFinished() || !future.isCanceled()) {
-            auto watcher = new QFutureWatcher<void>;
-            connect(watcher, &QFutureWatcherBase::finished, this, [this, watcher] {
-                m_futureWatchList.removeAll(watcher);
-                watcher->deleteLater();
-                updateInputs();
-            });
-            watcher->setFuture(future);
-            m_futureWatchList << watcher;
-        }
-    }
-    updateInputs();
-}
-
-void SimulatorOperationDialog::addMessage(const QString &message, Utils::OutputFormat format)
-{
-    m_formatter->appendMessage(message + "\n\n", format);
-}
-
-void SimulatorOperationDialog::addMessage(const SimulatorInfo &siminfo,
-                                          const SimulatorControl::Response &response,
-                                          const QString &context)
-{
-    if (response) {
-        QTC_CHECK(siminfo.identifier == response->simUdid);
-        addMessage(Tr::tr("%1, %2\nOperation %3 completed successfully.").arg(siminfo.name)
-                   .arg(siminfo.runtimeName).arg(context), Utils::StdOutFormat);
-    } else {
-        QString erroMsg = response.error();
-        QString message = Tr::tr("%1, %2\nOperation %3 failed.\nUDID: %4\nError: %5").arg(siminfo.name)
-                .arg(siminfo.runtimeName).arg(context).arg(siminfo.identifier)
-                .arg(erroMsg.isEmpty() ? Tr::tr("Unknown") : erroMsg);
-        addMessage(message, Utils::StdErrFormat);
-        qCDebug(iosCommon) << message;
-    }
-}
-
-void SimulatorOperationDialog::updateInputs()
-{
-    bool enableOk = m_futureWatchList.isEmpty();
-    m_buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(!enableOk);
-    m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(enableOk);
-    if (enableOk) {
-        addMessage(Tr::tr("Done."), Utils::NormalMessageFormat);
-        m_progressBar->setMaximum(1); // Stop progress bar.
-    }
-}
-
-} // Ios::Internal
diff --git a/src/plugins/ios/simulatoroperationdialog.h b/src/plugins/ios/simulatoroperationdialog.h
deleted file mode 100644
index 46cbb3f787e..00000000000
--- a/src/plugins/ios/simulatoroperationdialog.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include "simulatorcontrol.h"
-
-#include <utils/outputformat.h>
-
-#include <QDialog>
-#include <QFuture>
-#include <QList>
-
-QT_BEGIN_NAMESPACE
-class QDialogButtonBox;
-class QProgressBar;
-QT_END_NAMESPACE
-
-namespace Utils { class OutputFormatter; }
-
-namespace Ios::Internal {
-
-class SimulatorOperationDialog : public QDialog
-{
-
-public:
-    explicit SimulatorOperationDialog(QWidget *parent = nullptr);
-    ~SimulatorOperationDialog() override;
-
-public:
-    void addFutures(const QList<QFuture<void> > &futureList);
-    void addMessage(const QString &message, Utils::OutputFormat format);
-    void addMessage(const SimulatorInfo &siminfo,
-                    const SimulatorControl::Response &response,
-                    const QString &context);
-
-private:
-    void updateInputs();
-
-    Utils::OutputFormatter *m_formatter = nullptr;
-
-    QList<QFutureWatcher<void> *> m_futureWatchList;
-    QProgressBar *m_progressBar;
-    QDialogButtonBox *m_buttonBox;
-};
-
-} // Ios::Internal
diff --git a/src/plugins/languageclient/CMakeLists.txt b/src/plugins/languageclient/CMakeLists.txt
index a74bc330267..b9a36e9c50c 100644
--- a/src/plugins/languageclient/CMakeLists.txt
+++ b/src/plugins/languageclient/CMakeLists.txt
@@ -8,7 +8,7 @@ add_qtc_plugin(LanguageClient
   PUBLIC_DEPENDS LanguageServerProtocol Qt::Core
   PLUGIN_DEPENDS ProjectExplorer Core TextEditor
   SOURCES
-    callhierarchy.cpp callhierarchy.h
+    callandtypehierarchy.cpp callandtypehierarchy.h
     client.cpp client.h
     clientrequest.cpp clientrequest.h
     currentdocumentsymbolsrequest.cpp currentdocumentsymbolsrequest.h
@@ -36,3 +36,5 @@ add_qtc_plugin(LanguageClient
     semantichighlightsupport.cpp semantichighlightsupport.h
     snippet.cpp snippet.h
 )
+
+add_subdirectory(lualanguageclient)
diff --git a/src/plugins/languageclient/LanguageClient.json.in b/src/plugins/languageclient/LanguageClient.json.in
index 8ccc43c725b..3c27e907cc8 100644
--- a/src/plugins/languageclient/LanguageClient.json.in
+++ b/src/plugins/languageclient/LanguageClient.json.in
@@ -13,8 +13,11 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Other Languages",
-    "Description" : "Language Server Protocol client component. See https://microsoft.github.io/language-server-protocol/overview for an overview on Language Servers.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Get code editing services.",
+    "LongDescription" : [
+        "Offers code completion, highlighting of the symbol under cursor, and jumping to the symbol definition, as well as diagnostics from the language server."
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
 
     "Mimetypes" : [
diff --git a/src/plugins/languageclient/callandtypehierarchy.cpp b/src/plugins/languageclient/callandtypehierarchy.cpp
new file mode 100644
index 00000000000..4b8f7117132
--- /dev/null
+++ b/src/plugins/languageclient/callandtypehierarchy.cpp
@@ -0,0 +1,514 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0
+
+#include "callandtypehierarchy.h"
+
+#include "languageclientmanager.h"
+#include "languageclienttr.h"
+
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/inavigationwidgetfactory.h>
+
+#include <languageserverprotocol/callhierarchy.h>
+#include <languageserverprotocol/typehierarchy.h>
+
+#include <texteditor/texteditor.h>
+#include <texteditor/typehierarchy.h>
+
+#include <utils/delegates.h>
+#include <utils/navigationtreeview.h>
+#include <utils/treemodel.h>
+#include <utils/utilsicons.h>
+
+#include <QLayout>
+#include <QToolButton>
+
+using namespace Utils;
+using namespace TextEditor;
+using namespace LanguageServerProtocol;
+
+namespace LanguageClient {
+
+namespace {
+enum {
+    AnnotationRole = Qt::UserRole + 1,
+    LinkRole
+};
+}
+
+template<class Item, class Params, class Request, class Result>
+class HierarchyItem : public TreeItem
+{
+public:
+    HierarchyItem(const Item &item, Client *client)
+        : m_item(item)
+        , m_client(client)
+    {}
+
+protected:
+    QVariant data(int column, int role) const override
+    {
+        switch (role) {
+        case Qt::DecorationRole:
+            if (hasTag(SymbolTag::Deprecated))
+                return Utils::Icons::WARNING.icon();
+            return symbolIcon(int(m_item.symbolKind()));
+        case Qt::DisplayRole:
+            return m_item.name();
+        case Qt::ToolTipRole:
+            if (hasTag(SymbolTag::Deprecated))
+                return Tr::tr("Deprecated");
+            return {};
+        case LinkRole: {
+            if (!m_client)
+                return QVariant();
+            const Position start = m_item.selectionRange().start();
+            return QVariant::fromValue(
+                Link(m_client->serverUriToHostPath(m_item.uri()), start.line() + 1, start.character()));
+        }
+        case AnnotationRole: {
+            QStringList result;
+            if (const std::optional<QString> detail = m_item.detail())
+                result << *detail;
+            if (childCount() > 0)
+                result << QString("[%1]").arg(childCount());
+            return result.isEmpty() ? QVariant() : QVariant(result.join(' '));
+        }
+        default:
+            return TreeItem::data(column, role);
+        }
+    }
+
+private:
+    bool canFetchMore() const override
+    {
+        if (m_client && !m_fetchedChildren)
+            const_cast<HierarchyItem*>(this)->fetchMore();
+        return false;
+    }
+
+    void fetchMore() override
+    {
+        m_fetchedChildren = true;
+        if (!m_client)
+            return;
+
+        Params params;
+        params.setItem(m_item);
+        Request request(params);
+        request.setResponseCallback(
+            [this](const typename Request::Response &response) {
+                const std::optional<LanguageClientArray<Result>> result = response.result();
+                if (result && !result->isNull()) {
+                    for (const Result &item : result->toList()) {
+                        if (item.isValid())
+                            appendChild(new HierarchyItem(getSourceItem(item), m_client));
+                    }
+                }
+            });
+        m_client->sendMessage(request);
+    }
+
+    Item getSourceItem(const Result &result)
+    {
+        if constexpr (std::is_same_v<Result, CallHierarchyIncomingCall>)
+            return result.from();
+        if constexpr (std::is_same_v<Result, CallHierarchyOutgoingCall>)
+            return result.to();
+        if constexpr (std::is_same_v<Result, TypeHierarchyItem>)
+            return result;
+    }
+
+    bool hasTag(const SymbolTag tag) const
+    {
+        if (const std::optional<QList<SymbolTag>> tags = m_item.symbolTags())
+            return tags->contains(tag);
+        return false;
+    }
+
+    const Item m_item;
+    bool m_fetchedChildren = false;
+    QPointer<Client> m_client;
+};
+
+class CallHierarchyIncomingItem : public HierarchyItem<CallHierarchyItem,
+                                                       CallHierarchyCallsParams,
+                                                       CallHierarchyIncomingCallsRequest,
+                                                       CallHierarchyIncomingCall>
+{
+public:
+    CallHierarchyIncomingItem(const LanguageServerProtocol::CallHierarchyItem &item, Client *client)
+        : HierarchyItem(item, client)
+    {}
+
+private:
+    QVariant data(int column, int role) const override
+    {
+        if (role == Qt::DisplayRole)
+            return Tr::tr("Incoming");
+        if (role == Qt::DecorationRole)
+            return {};
+        return HierarchyItem::data(column, role);
+    }
+};
+
+class CallHierarchyOutgoingItem : public HierarchyItem<CallHierarchyItem,
+                                                       CallHierarchyCallsParams,
+                                                       CallHierarchyOutgoingCallsRequest,
+                                                       CallHierarchyOutgoingCall>
+{
+public:
+    CallHierarchyOutgoingItem(const LanguageServerProtocol::CallHierarchyItem &item, Client *client)
+        : HierarchyItem(item, client)
+    {}
+
+private:
+    QVariant data(int column, int role) const override
+    {
+        if (role == Qt::DisplayRole)
+            return Tr::tr("Outgoing");
+        if (role == Qt::DecorationRole)
+            return {};
+        return HierarchyItem::data(column, role);
+    }
+};
+
+template<class Item> class HierarchyRootItem : public TreeItem
+{
+public:
+    HierarchyRootItem(const Item &item)
+        : m_item(item)
+    {}
+
+private:
+    QVariant data(int column, int role) const override
+    {
+        switch (role) {
+        case Qt::DecorationRole:
+            if (m_item.symbolTags().value_or(QList<SymbolTag>()).contains(SymbolTag::Deprecated))
+                return Utils::Icons::WARNING.icon();
+            return symbolIcon(int(m_item.symbolKind()));
+        case Qt::DisplayRole:
+            return m_item.name();
+        default:
+            return TreeItem::data(column, role);
+        }
+    }
+
+    const Item m_item;
+};
+
+
+class CallHierarchyRootItem : public HierarchyRootItem<LanguageServerProtocol::CallHierarchyItem>
+{
+public:
+    CallHierarchyRootItem(const LanguageServerProtocol::CallHierarchyItem &item, Client *client)
+        : HierarchyRootItem(item)
+    {
+        appendChild(new CallHierarchyIncomingItem(item, client));
+        appendChild(new CallHierarchyOutgoingItem(item, client));
+    }
+};
+
+class TypeHierarchyBasesItem : public HierarchyItem<TypeHierarchyItem,
+                                                    TypeHierarchyParams,
+                                                    TypeHierarchySupertypesRequest,
+                                                    TypeHierarchyItem>
+{
+public:
+    TypeHierarchyBasesItem(const LanguageServerProtocol::TypeHierarchyItem &item, Client *client)
+        : HierarchyItem(item, client)
+    {}
+
+private:
+    QVariant data(int column, int role) const override
+    {
+        if (role == Qt::DisplayRole)
+            return Tr::tr("Bases");
+        if (role == Qt::DecorationRole)
+            return {};
+        return HierarchyItem::data(column, role);
+    }
+};
+
+class TypeHierarchyDerivedItem : public HierarchyItem<TypeHierarchyItem,
+                                                      TypeHierarchyParams,
+                                                      TypeHierarchySubtypesRequest,
+                                                      TypeHierarchyItem>
+{
+public:
+    TypeHierarchyDerivedItem(const LanguageServerProtocol::TypeHierarchyItem &item, Client *client)
+        : HierarchyItem(item, client)
+    {}
+
+private:
+    QVariant data(int column, int role) const override
+    {
+        if (role == Qt::DisplayRole)
+            return Tr::tr("Derived");
+        if (role == Qt::DecorationRole)
+            return {};
+        return HierarchyItem::data(column, role);
+    }
+};
+
+class TypeHierarchyRootItem : public HierarchyRootItem<LanguageServerProtocol::TypeHierarchyItem>
+{
+public:
+    TypeHierarchyRootItem(const LanguageServerProtocol::TypeHierarchyItem &item, Client *client)
+        : HierarchyRootItem(item)
+    {
+        appendChild(new TypeHierarchyBasesItem(item, client));
+        appendChild(new TypeHierarchyDerivedItem(item, client));
+    }
+};
+
+class HierarchyWidgetHelper
+{
+public:
+    HierarchyWidgetHelper(QWidget *theWidget) : m_view(new NavigationTreeView(theWidget))
+    {
+        m_delegate.setDelimiter(" ");
+        m_delegate.setAnnotationRole(AnnotationRole);
+
+        m_view->setModel(&m_model);
+        m_view->setActivationMode(SingleClickActivation);
+        m_view->setItemDelegate(&m_delegate);
+        m_view->setUniformRowHeights(true);
+
+        theWidget->setLayout(new QVBoxLayout);
+        theWidget->layout()->addWidget(m_view);
+        theWidget->layout()->setContentsMargins(0, 0, 0, 0);
+        theWidget->layout()->setSpacing(0);
+
+        QObject::connect(m_view, &NavigationTreeView::activated,
+                         theWidget, [this](const QModelIndex &index) { onItemActivated(index); });
+        QObject::connect(m_view, &QTreeView::doubleClicked,
+                         theWidget, [this](const QModelIndex &index) { onItemDoubleClicked(index); });
+    }
+
+    void updateHierarchyAtCursorPosition()
+    {
+        m_model.clear();
+
+        BaseTextEditor *editor = BaseTextEditor::currentTextEditor();
+        if (!editor)
+            return;
+
+        Core::IDocument *document = editor->document();
+
+        Client *client = LanguageClientManager::clientForFilePath(document->filePath());
+        if (!client)
+            return;
+
+        TextDocumentPositionParams params;
+        params.setTextDocument(TextDocumentIdentifier(client->hostPathToServerUri(document->filePath())));
+        params.setPosition(Position(editor->editorWidget()->textCursor()));
+        sendRequest(client, params, document);
+    }
+
+protected:
+    void addItem(TreeItem *item)
+    {
+        m_model.rootItem()->appendChild(item);
+        m_view->expand(item->index());
+        item->forChildrenAtLevel(1, [&](const TreeItem *child) { m_view->expand(child->index()); });
+    }
+
+private:
+    virtual void sendRequest(Client *client, const TextDocumentPositionParams &params,
+                             const Core::IDocument *document) = 0;
+
+    void onItemDoubleClicked(const QModelIndex &index)
+    {
+        if (const auto link = index.data(LinkRole).value<Link>(); link.hasValidTarget())
+            updateHierarchyAtCursorPosition();
+    }
+
+    void onItemActivated(const QModelIndex &index)
+    {
+        const auto link = index.data(LinkRole).value<Utils::Link>();
+        if (link.hasValidTarget())
+            Core::EditorManager::openEditorAt(link);
+    }
+
+    AnnotatedItemDelegate m_delegate;
+    NavigationTreeView * const m_view;
+    TreeModel<TreeItem> m_model;
+};
+
+class CallHierarchy : public QWidget, public HierarchyWidgetHelper
+{
+public:
+    CallHierarchy() : HierarchyWidgetHelper(this)
+    {
+        connect(LanguageClientManager::instance(), &LanguageClientManager::openCallHierarchy,
+                this, [this] { updateHierarchyAtCursorPosition(); });
+    }
+
+private:
+    void sendRequest(Client *client, const TextDocumentPositionParams &params,
+                     const Core::IDocument *document) override
+    {
+        if (!supportsCallHierarchy(client, document))
+            return;
+
+        PrepareCallHierarchyRequest request(params);
+        request.setResponseCallback([this, client = QPointer<Client>(client)](
+                                        const PrepareCallHierarchyRequest::Response &response) {
+            handlePrepareResponse(client, response);
+        });
+        client->sendMessage(request);
+    }
+
+    void handlePrepareResponse(Client *client,
+                               const PrepareCallHierarchyRequest::Response &response)
+    {
+        if (!client)
+            return;
+        const std::optional<PrepareCallHierarchyRequest::Response::Error> error = response.error();
+        if (error)
+            client->log(*error);
+
+        const std::optional<LanguageClientArray<LanguageServerProtocol::CallHierarchyItem>>
+            result = response.result();
+        if (result && !result->isNull()) {
+            for (const LanguageServerProtocol::CallHierarchyItem &item : result->toList())
+                addItem(new CallHierarchyRootItem(item, client));
+        }
+    }
+};
+
+class TypeHierarchy : public TypeHierarchyWidget, public HierarchyWidgetHelper
+{
+public:
+    TypeHierarchy() : HierarchyWidgetHelper(this) {}
+
+private:
+    void reload() override
+    {
+        updateHierarchyAtCursorPosition();
+    }
+
+    void sendRequest(Client *client, const TextDocumentPositionParams &params,
+                     const Core::IDocument *document) override
+    {
+        if (!supportsTypeHierarchy(client, document))
+            return;
+
+        PrepareTypeHierarchyRequest request(params);
+        request.setResponseCallback([this, client = QPointer<Client>(client)](
+                                        const PrepareTypeHierarchyRequest::Response &response) {
+            handlePrepareResponse(client, response);
+        });
+        client->sendMessage(request);
+    }
+
+    void handlePrepareResponse(Client *client,
+                               const PrepareTypeHierarchyRequest::Response &response)
+    {
+        if (!client)
+            return;
+        const std::optional<PrepareTypeHierarchyRequest::Response::Error> error = response.error();
+        if (error)
+            client->log(*error);
+
+        const std::optional<LanguageClientArray<LanguageServerProtocol::TypeHierarchyItem>>
+            result = response.result();
+        if (result && !result->isNull()) {
+            for (const LanguageServerProtocol::TypeHierarchyItem &item : result->toList())
+                addItem(new TypeHierarchyRootItem(item, client));
+        }
+    }
+};
+
+class CallHierarchyFactory : public Core::INavigationWidgetFactory
+{
+public:
+    CallHierarchyFactory()
+    {
+        setDisplayName(Tr::tr("Call Hierarchy"));
+        setPriority(650);
+        setId(Constants::CALL_HIERARCHY_FACTORY_ID);
+    }
+
+    Core::NavigationView createWidget() final
+    {
+        auto h = new CallHierarchy;
+        h->updateHierarchyAtCursorPosition();
+
+        Icons::RELOAD_TOOLBAR.icon();
+        auto button = new QToolButton;
+        button->setIcon(Icons::RELOAD_TOOLBAR.icon());
+        button->setToolTip(::LanguageClient::Tr::tr(
+            "Reloads the call hierarchy for the symbol under cursor position."));
+        connect(button, &QToolButton::clicked, this, [h] { h->updateHierarchyAtCursorPosition(); });
+        return {h, {button}};
+    }
+};
+
+class TypeHierarchyFactory final : public TypeHierarchyWidgetFactory
+{
+    TypeHierarchyWidget *createWidget(Core::IEditor *editor) final
+    {
+        const auto textEditor = qobject_cast<BaseTextEditor *>(editor);
+        if (!textEditor)
+            return nullptr;
+
+        Client *const client = LanguageClientManager::clientForFilePath(
+            textEditor->document()->filePath());
+        if (!client || !supportsTypeHierarchy(client, textEditor->document()))
+            return nullptr;
+
+        return new TypeHierarchy;
+    }
+};
+
+void setupCallHierarchyFactory()
+{
+    static CallHierarchyFactory theCallHierarchyFactory;
+}
+
+static bool supportsHierarchy(
+    Client *client,
+    const Core::IDocument *document,
+    const QString &methodName,
+    const std::optional<std::variant<bool, WorkDoneProgressOptions>> &provider)
+{
+    std::optional<bool> registered = client->dynamicCapabilities().isRegistered(methodName);
+    bool supported = registered.value_or(false);
+    if (registered) {
+        if (supported) {
+            const QJsonValue &options = client->dynamicCapabilities().option(methodName);
+            const TextDocumentRegistrationOptions docOptions(options);
+            supported = docOptions.filterApplies(document->filePath(),
+                                                 Utils::mimeTypeForName(document->mimeType()));
+        }
+    } else {
+        supported = provider.has_value();
+    }
+    return supported;
+}
+
+bool supportsCallHierarchy(Client *client, const Core::IDocument *document)
+{
+    return supportsHierarchy(client,
+                             document,
+                             PrepareCallHierarchyRequest::methodName,
+                             client->capabilities().callHierarchyProvider());
+}
+
+void setupTypeHierarchyFactory()
+{
+    static TypeHierarchyFactory theTypeHierarchyFactory;
+}
+
+bool supportsTypeHierarchy(Client *client, const Core::IDocument *document)
+{
+    return supportsHierarchy(client,
+                             document,
+                             PrepareTypeHierarchyRequest::methodName,
+                             client->capabilities().typeHierarchyProvider());
+}
+
+} // namespace LanguageClient
diff --git a/src/plugins/languageclient/callhierarchy.h b/src/plugins/languageclient/callandtypehierarchy.h
similarity index 67%
rename from src/plugins/languageclient/callhierarchy.h
rename to src/plugins/languageclient/callandtypehierarchy.h
index 860919b2b97..b49684d65a9 100644
--- a/src/plugins/languageclient/callhierarchy.h
+++ b/src/plugins/languageclient/callandtypehierarchy.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #pragma once
@@ -12,4 +12,7 @@ class Client;
 void setupCallHierarchyFactory();
 bool supportsCallHierarchy(Client *client, const Core::IDocument *document);
 
+void setupTypeHierarchyFactory();
+bool supportsTypeHierarchy(Client *client, const Core::IDocument *document);
+
 } // namespace LanguageClient
diff --git a/src/plugins/languageclient/callhierarchy.cpp b/src/plugins/languageclient/callhierarchy.cpp
deleted file mode 100644
index 32023e6a98f..00000000000
--- a/src/plugins/languageclient/callhierarchy.cpp
+++ /dev/null
@@ -1,312 +0,0 @@
-// Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0
-
-#include "callhierarchy.h"
-
-#include "languageclientmanager.h"
-#include "languageclienttr.h"
-
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/inavigationwidgetfactory.h>
-
-#include <languageserverprotocol/callhierarchy.h>
-
-#include <texteditor/texteditor.h>
-
-#include <utils/delegates.h>
-#include <utils/navigationtreeview.h>
-#include <utils/treemodel.h>
-#include <utils/utilsicons.h>
-
-#include <QLayout>
-#include <QToolButton>
-
-using namespace Utils;
-using namespace TextEditor;
-using namespace LanguageServerProtocol;
-
-namespace LanguageClient {
-
-namespace {
-enum Direction { Incoming, Outgoing };
-
-enum {
-    AnnotationRole = Qt::UserRole + 1,
-    LinkRole
-};
-}
-
-class CallHierarchyItem : public TreeItem
-{
-public:
-    CallHierarchyItem(const LanguageServerProtocol::CallHierarchyItem &item,
-                      const Direction direction,
-                      Client *client)
-        : m_item(item)
-        , m_direction(direction)
-        , m_client(client)
-    {
-    }
-
-    QVariant data(int column, int role) const override
-    {
-        switch (role) {
-        case Qt::DecorationRole:
-            return symbolIcon(int(m_item.symbolKind()));
-        case Qt::DisplayRole:
-            return m_item.name();
-        case LinkRole: {
-            if (!m_client)
-                return QVariant();
-            const Position start = m_item.selectionRange().start();
-            return QVariant::fromValue(
-                Link(m_client->serverUriToHostPath(m_item.uri()), start.line() + 1, start.character()));
-        }
-        case AnnotationRole:
-            if (const std::optional<QString> detail = m_item.detail())
-                return *detail;
-            return {};
-        default:
-            return TreeItem::data(column, role);
-        }
-    }
-    bool canFetchMore() const override
-    {
-        return m_client && !m_fetchedChildren;
-    }
-
-    void fetchMore() override
-    {
-        m_fetchedChildren = true;
-        if (!m_client)
-            return;
-
-        CallHierarchyCallsParams params;
-        params.setItem(m_item);
-
-        if (m_direction == Incoming) {
-            CallHierarchyIncomingCallsRequest request(params);
-            request.setResponseCallback(
-                        [this](const CallHierarchyIncomingCallsRequest::Response &response) {
-                const std::optional<LanguageClientArray<CallHierarchyIncomingCall>> result
-                        = response.result();
-                if (result && !result->isNull()) {
-                    for (const CallHierarchyIncomingCall &item : result->toList()) {
-                        if (item.isValid())
-                            appendChild(new CallHierarchyItem(item.from(), m_direction, m_client));
-                    }
-                }
-                if (!hasChildren())
-                    update();
-            });
-            m_client->sendMessage(request);
-        } else {
-            CallHierarchyOutgoingCallsRequest request(params);
-            request.setResponseCallback(
-                        [this](const CallHierarchyOutgoingCallsRequest::Response &response) {
-                const std::optional<LanguageClientArray<CallHierarchyOutgoingCall>> result
-                        = response.result();
-                if (result && !result->isNull()) {
-                    for (const CallHierarchyOutgoingCall &item : result->toList()) {
-                        if (item.isValid())
-                            appendChild(new CallHierarchyItem(item.to(), m_direction, m_client));
-                    }
-                }
-                if (!hasChildren())
-                    update();
-                });
-            m_client->sendMessage(request);
-        }
-    }
-
-protected:
-    const LanguageServerProtocol::CallHierarchyItem m_item;
-    const Direction m_direction;
-    bool m_fetchedChildren = false;
-    QPointer<Client> m_client;
-};
-
-class CallHierarchyDirectionItem : public CallHierarchyItem
-{
-public:
-    CallHierarchyDirectionItem(const LanguageServerProtocol::CallHierarchyItem &item,
-                               const Direction direction,
-                               Client *client)
-        : CallHierarchyItem(item, direction, client)
-    {}
-
-    QVariant data(int column, int role) const override
-    {
-        if (role == Qt::DisplayRole)
-            return m_direction == Incoming ? Tr::tr("Incoming") : Tr::tr("Outgoing");
-        return CallHierarchyItem::data(column, role);
-    }
-};
-
-
-class CallHierarchyRootItem : public TreeItem
-{
-public:
-    CallHierarchyRootItem(const LanguageServerProtocol::CallHierarchyItem &item, Client *client)
-        : m_item(item)
-    {
-        appendChild(new CallHierarchyDirectionItem(m_item, Incoming, client));
-        appendChild(new CallHierarchyDirectionItem(m_item, Outgoing, client));
-    }
-
-    QVariant data(int column, int role) const override
-    {
-        switch (role) {
-        case Qt::DecorationRole:
-            return symbolIcon(int(m_item.symbolKind()));
-        case Qt::DisplayRole:
-            return m_item.name();
-        default:
-            return TreeItem::data(column, role);
-        }
-    }
-
-private:
-    const LanguageServerProtocol::CallHierarchyItem m_item;
-};
-
-class CallHierarchy : public QWidget
-{
-public:
-    CallHierarchy() : m_view(new NavigationTreeView(this))
-    {
-        m_delegate.setDelimiter(" ");
-        m_delegate.setAnnotationRole(AnnotationRole);
-
-        m_view->setModel(&m_model);
-        m_view->setActivationMode(SingleClickActivation);
-        m_view->setItemDelegate(&m_delegate);
-
-        setLayout(new QVBoxLayout);
-        layout()->addWidget(m_view);
-        layout()->setContentsMargins(0, 0, 0, 0);
-        layout()->setSpacing(0);
-
-        connect(m_view, &NavigationTreeView::activated, this, &CallHierarchy::onItemActivated);
-
-        connect(LanguageClientManager::instance(), &LanguageClientManager::openCallHierarchy,
-                this, &CallHierarchy::updateHierarchyAtCursorPosition);
-    }
-
-    void onItemActivated(const QModelIndex &index)
-    {
-        const auto link = index.data(LinkRole).value<Utils::Link>();
-        if (link.hasValidTarget())
-            Core::EditorManager::openEditorAt(link);
-    }
-
-    void updateHierarchyAtCursorPosition();
-    void handlePrepareResponse(Client *client,
-                               const PrepareCallHierarchyRequest::Response &response);
-
-    AnnotatedItemDelegate m_delegate;
-    NavigationTreeView *m_view;
-    TreeModel<TreeItem, CallHierarchyRootItem, CallHierarchyDirectionItem, CallHierarchyItem> m_model;
-};
-
-void CallHierarchy::updateHierarchyAtCursorPosition()
-{
-    m_model.clear();
-
-    BaseTextEditor *editor = BaseTextEditor::currentTextEditor();
-    if (!editor)
-        return;
-
-    Core::IDocument *document = editor->document();
-
-    Client *client = LanguageClientManager::clientForFilePath(document->filePath());
-    if (!client)
-        return;
-
-    if (!supportsCallHierarchy(client, document))
-        return;
-
-    TextDocumentPositionParams params;
-    params.setTextDocument(TextDocumentIdentifier(client->hostPathToServerUri(document->filePath())));
-    params.setPosition(Position(editor->editorWidget()->textCursor()));
-
-    PrepareCallHierarchyRequest request(params);
-    request.setResponseCallback([this, client = QPointer<Client>(client)](
-                                    const PrepareCallHierarchyRequest::Response &response) {
-        handlePrepareResponse(client, response);
-    });
-
-    client->sendMessage(request);
-}
-
-void CallHierarchy::handlePrepareResponse(Client *client,
-                                          const PrepareCallHierarchyRequest::Response &response)
-{
-    if (!client)
-        return;
-    const std::optional<PrepareCallHierarchyRequest::Response::Error> error = response.error();
-    if (error)
-        client->log(*error);
-
-    const std::optional<LanguageClientArray<LanguageServerProtocol::CallHierarchyItem>>
-        result = response.result();
-    if (result && !result->isNull()) {
-        for (const LanguageServerProtocol::CallHierarchyItem &item : result->toList()) {
-            auto newItem = new CallHierarchyRootItem(item, client);
-            m_model.rootItem()->appendChild(newItem);
-            m_view->expand(newItem->index());
-            newItem->forChildrenAtLevel(1, [&](const TreeItem *child) {
-                m_view->expand(child->index());
-            });
-        }
-    }
-}
-
-class CallHierarchyFactory final : public Core::INavigationWidgetFactory
-{
-public:
-    CallHierarchyFactory()
-    {
-        setDisplayName(Tr::tr("Call Hierarchy"));
-        setPriority(650);
-        setId(Constants::CALL_HIERARCHY_FACTORY_ID);
-    }
-
-    Core::NavigationView createWidget() final
-    {
-        auto h = new CallHierarchy;
-        h->updateHierarchyAtCursorPosition();
-
-        Icons::RELOAD_TOOLBAR.icon();
-        auto button = new QToolButton;
-        button->setIcon(Icons::RELOAD_TOOLBAR.icon());
-        button->setToolTip(::LanguageClient::Tr::tr("Reloads the call hierarchy for the symbol under cursor position."));
-        connect(button, &QToolButton::clicked, this, [h] { h->updateHierarchyAtCursorPosition(); });
-        return {h, {button}};
-    }
-};
-
-void setupCallHierarchyFactory()
-{
-    static CallHierarchyFactory theCallHierarchyFactory;
-}
-
-bool supportsCallHierarchy(Client *client, const Core::IDocument *document)
-{
-    const QString methodName = PrepareCallHierarchyRequest::methodName;
-    std::optional<bool> registered = client->dynamicCapabilities().isRegistered(methodName);
-    bool supported = registered.value_or(false);
-    if (registered) {
-        if (supported) {
-            const QJsonValue &options = client->dynamicCapabilities().option(methodName);
-            const TextDocumentRegistrationOptions docOptions(options);
-            supported = docOptions.filterApplies(document->filePath(),
-                                                 Utils::mimeTypeForName(document->mimeType()));
-        }
-    } else {
-        supported = client->capabilities().callHierarchyProvider().has_value();
-    }
-    return supported;
-}
-
-} // namespace LanguageClient
diff --git a/src/plugins/languageclient/client.cpp b/src/plugins/languageclient/client.cpp
index 1b16e9dfb00..4c2fcf101f6 100644
--- a/src/plugins/languageclient/client.cpp
+++ b/src/plugins/languageclient/client.cpp
@@ -3,7 +3,7 @@
 
 #include "client.h"
 
-#include "callhierarchy.h"
+#include "callandtypehierarchy.h"
 #include "diagnosticmanager.h"
 #include "documentsymbolcache.h"
 #include "languageclientcompletionassist.h"
@@ -49,7 +49,6 @@
 #include <texteditor/tabsettings.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorsettings.h>
 
 #include <utils/appinfo.h>
@@ -300,6 +299,12 @@ public:
 
     bool reset();
 
+    void setState(Client::State state)
+    {
+        m_state = state;
+        emit q->stateChanged(state);
+    }
+
     Client::State m_state = Client::Uninitialized;
     QHash<LanguageServerProtocol::MessageId,
           LanguageServerProtocol::ResponseHandler::Callback> m_responseHandlers;
@@ -437,6 +442,9 @@ static ClientCapabilities generateClientCapabilities()
          SymbolKind::EnumMember, SymbolKind::Struct,       SymbolKind::Event,
          SymbolKind::Operator,   SymbolKind::TypeParameter});
     symbolCapabilities.setSymbolKind(symbolKindCapabilities);
+    SymbolCapabilities::SymbolTagCapabilities symbolTagCapabilities;
+    symbolTagCapabilities.setValueSet({SymbolTag::Deprecated});
+    symbolCapabilities.setSymbolTag(symbolTagCapabilities);
     symbolCapabilities.setHierarchicalDocumentSymbolSupport(true);
     documentCapabilities.setDocumentSymbol(symbolCapabilities);
 
@@ -524,6 +532,7 @@ static ClientCapabilities generateClientCapabilities()
     tokens.setFormats({"relative"});
     documentCapabilities.setSemanticTokens(tokens);
     documentCapabilities.setCallHierarchy(allowDynamicRegistration);
+    documentCapabilities.setTypeHierarchy(allowDynamicRegistration);
     capabilities.setTextDocument(documentCapabilities);
 
     WindowClientClientCapabilities window;
@@ -566,7 +575,7 @@ void Client::initialize()
 
     // directly send content now otherwise the state check of sendContent would fail
     d->sendMessageNow(initRequest);
-    d->m_state = InitializeRequested;
+    d->setState(InitializeRequested);
 }
 
 void Client::shutdown()
@@ -578,7 +587,7 @@ void Client::shutdown()
         d->shutDownCallback(shutdownResponse);
     });
     sendMessage(shutdown);
-    d->m_state = ShutdownRequested;
+    d->setState(ShutdownRequested);
     d->m_shutdownTimer.start();
 }
 
@@ -732,7 +741,7 @@ void Client::openDocument(TextEditor::TextDocument *document)
 void Client::sendMessage(const JsonRpcMessage &message, SendDocUpdates sendUpdates,
                          Schedule semanticTokensSchedule)
 {
-    QScopeGuard guard([responseHandler = message.responseHandler()](){
+    QScopeGuard guard([this, responseHandler = message.responseHandler()](){
         if (responseHandler) {
             static ResponseError<std::nullptr_t> error;
             if (!error.isValid()) {
@@ -742,7 +751,9 @@ void Client::sendMessage(const JsonRpcMessage &message, SendDocUpdates sendUpdat
             QJsonObject response;
             response[idKey] = responseHandler->id;
             response[errorKey] = QJsonObject(error);
-            responseHandler->callback(JsonRpcMessage(response));
+            QMetaObject::invokeMethod(this, [callback = responseHandler->callback, response](){
+                callback(JsonRpcMessage(response));
+            }, Qt::QueuedConnection);
         }
     });
 
@@ -900,7 +911,8 @@ void ClientPrivate::requestDocumentHighlightsNow(TextEditor::TextEditorWidget *w
             = m_serverCapabilities.documentHighlightProvider();
         if (!provider.has_value())
             return;
-        if (std::holds_alternative<bool>(*provider) && !std::get<bool>(*provider))
+        const auto boolvalue = std::get_if<bool>(&*provider);
+        if (boolvalue && !*boolvalue)
             return;
     }
 
@@ -932,7 +944,8 @@ void ClientPrivate::requestDocumentHighlightsNow(TextEditor::TextEditorWidget *w
             const QTextCharFormat &format =
                 widget->textDocument()->fontSettings().toTextCharFormat(TextEditor::C_OCCURRENCES);
             QTextDocument *document = widget->document();
-            for (const auto &highlight : std::get<QList<DocumentHighlight>>(*result)) {
+            const auto highlights = std::get_if<QList<DocumentHighlight>>(&*result);
+            for (const auto &highlight : *highlights) {
                 QTextEdit::ExtraSelection selection{widget->textCursor(), format};
                 const int &start = highlight.range().start().toPositionInDocument(document);
                 const int &end = highlight.range().end().toPositionInDocument(document);
@@ -1001,15 +1014,17 @@ void Client::activateEditor(Core::IEditor *editor)
         d->requestDocumentHighlights(widget);
         uint optionalActions = widget->optionalActions();
         if (symbolSupport().supportsFindUsages(widget->textDocument()))
-            optionalActions |= TextEditor::TextEditorActionHandler::FindUsage;
+            optionalActions |= TextEditor::OptionalActions::FindUsage;
         if (symbolSupport().supportsRename(widget->textDocument()))
-            optionalActions |= TextEditor::TextEditorActionHandler::RenameSymbol;
+            optionalActions |= TextEditor::OptionalActions::RenameSymbol;
         if (symbolSupport().supportsFindLink(widget->textDocument(), LinkTarget::SymbolDef))
-            optionalActions |= TextEditor::TextEditorActionHandler::FollowSymbolUnderCursor;
+            optionalActions |= TextEditor::OptionalActions::FollowSymbolUnderCursor;
         if (symbolSupport().supportsFindLink(widget->textDocument(), LinkTarget::SymbolTypeDef))
-            optionalActions |= TextEditor::TextEditorActionHandler::FollowTypeUnderCursor;
+            optionalActions |= TextEditor::OptionalActions::FollowTypeUnderCursor;
         if (supportsCallHierarchy(this, textEditor->document()))
-            optionalActions |= TextEditor::TextEditorActionHandler::CallHierarchy;
+            optionalActions |= TextEditor::OptionalActions::CallHierarchy;
+        if (supportsTypeHierarchy(this, textEditor->document()))
+            optionalActions |= TextEditor::OptionalActions::TypeHierarchy;
         widget->setOptionalActions(optionalActions);
     }
 }
@@ -1166,7 +1181,7 @@ void Client::documentContentsSaved(TextEditor::TextDocument *document)
                 includeText = saveOptions->includeText().value_or(includeText);
         }
     }
-    if (!send)
+    if (!send || !shouldSendDidSave(document))
         return;
     DidSaveTextDocumentParams params(
                 TextDocumentIdentifier(hostPathToServerUri(document->filePath())));
@@ -1430,7 +1445,8 @@ void Client::requestCodeActions(const CodeActionRequest &request)
     } else {
         std::variant<bool, CodeActionOptions> provider
             = d->m_serverCapabilities.codeActionProvider().value_or(false);
-        if (!(std::holds_alternative<CodeActionOptions>(provider) || std::get<bool>(provider)))
+        const auto boolvalue = std::get_if<bool>(&provider);
+        if (boolvalue && !*boolvalue)
             return;
     }
 
@@ -1516,7 +1532,7 @@ void Client::projectClosed(ProjectExplorer::Project *project)
         if (d->m_state == Initialized) {
             LanguageClientManager::shutdownClient(this);
         } else {
-            d->m_state = Shutdown; // otherwise the manager would try to restart this server
+            d->setState(Shutdown); // otherwise the manager would try to restart this server
             emit finished();
         }
         d->m_project = nullptr;
@@ -1656,8 +1672,8 @@ bool Client::supportsDocumentSymbols(const TextEditor::TextDocument *doc) const
         = capabilities().documentSymbolProvider();
     if (!provider.has_value())
         return false;
-    if (std::holds_alternative<bool>(*provider))
-        return std::get<bool>(*provider);
+    if (const auto boolvalue = std::get_if<bool>(&*provider))
+        return *boolvalue;
     return true;
 }
 
@@ -1686,7 +1702,7 @@ bool ClientPrivate::reset()
     }
     m_restartCountResetTimer.start();
     --m_restartsLeft;
-    m_state = Client::Uninitialized;
+    setState(Client::Uninitialized);
     m_responseHandlers.clear();
     m_clientInterface->resetBuffer();
     updateOpenedEditorToolBars();
@@ -1713,7 +1729,7 @@ bool ClientPrivate::reset()
 void Client::setError(const QString &message)
 {
     log(message);
-    d->m_state = d->m_state < Initialized ? FailedToInitialize : Error;
+    d->setState(d->m_state < Initialized ? FailedToInitialize : Error);
 }
 
 ProgressManager *Client::progressManager()
@@ -1779,6 +1795,11 @@ const DynamicCapabilities &Client::dynamicCapabilities() const
     return d->m_dynamicCapabilities;
 }
 
+DynamicCapabilities &Client::dynamicCapabilities()
+{
+    return d->m_dynamicCapabilities;
+}
+
 DocumentSymbolCache *Client::documentSymbolCache()
 {
     return &d->m_documentSymbolCache;
@@ -2137,7 +2158,7 @@ void ClientPrivate::initializeCallback(const InitializeRequest::Response &initRe
                                                    QMessageBox::Retry | QMessageBox::Cancel,
                                                    QMessageBox::Retry);
                 if (result == QMessageBox::Retry) {
-                    m_state = Client::Uninitialized;
+                    setState(Client::Uninitialized);
                     q->initialize();
                     return;
                 }
@@ -2189,7 +2210,7 @@ void ClientPrivate::initializeCallback(const InitializeRequest::Response &initRe
         m_tokenSupport.setLegend(tokenProvider.legend());
 
     qCDebug(LOGLSPCLIENT) << "language server " << m_displayName << " initialized";
-    m_state = Client::Initialized;
+    setState(Client::Initialized);
     q->sendMessage(InitializeNotification(InitializedParams()));
 
     q->updateConfiguration(m_configuration);
@@ -2212,7 +2233,7 @@ void ClientPrivate::shutDownCallback(const ShutdownRequest::Response &shutdownRe
     // directly send content now otherwise the state check of sendContent would fail
     sendMessageNow(ExitNotification());
     qCDebug(LOGLSPCLIENT) << "language server " << m_displayName << " shutdown";
-    m_state = Client::Shutdown;
+    setState(Client::Shutdown);
     m_shutdownTimer.start();
 }
 
@@ -2228,10 +2249,10 @@ bool ClientPrivate::sendWorkspceFolderChanges() const
         if (auto folder = workspace->workspaceFolders()) {
             if (folder->supported().value_or(false)) {
                 // holds either the Id for deregistration or whether it is registered
-                auto notification = folder->changeNotifications().value_or(false);
-                return std::holds_alternative<QString>(notification)
-                       || (std::holds_alternative<bool>(notification)
-                           && std::get<bool>(notification));
+                const std::variant<QString, bool> notification
+                    = folder->changeNotifications().value_or(false);
+                const auto boolvalue = std::get_if<bool>(&notification);
+                return !boolvalue || *boolvalue;
             }
         }
     }
diff --git a/src/plugins/languageclient/client.h b/src/plugins/languageclient/client.h
index a881d178242..13e908b2d50 100644
--- a/src/plugins/languageclient/client.h
+++ b/src/plugins/languageclient/client.h
@@ -97,6 +97,7 @@ public:
     QString serverName() const;
     QString serverVersion() const;
     const DynamicCapabilities &dynamicCapabilities() const;
+    DynamicCapabilities &dynamicCapabilities();
     void registerCapabilities(const QList<LanguageServerProtocol::Registration> &registrations);
     void unregisterCapabilities(const QList<LanguageServerProtocol::Unregistration> &unregistrations);
 
@@ -214,6 +215,7 @@ signals:
     void documentUpdated(TextEditor::TextDocument *document);
     void workDone(const LanguageServerProtocol::ProgressToken &token);
     void shadowDocumentSwitched(const Utils::FilePath &filePath);
+    void stateChanged(State state);
     void finished();
 
 protected:
@@ -235,6 +237,7 @@ private:
                                       const Utils::FilePath &candidate);
     virtual QList<Utils::Text::Range> additionalDocumentHighlights(
         TextEditor::TextEditorWidget *, const QTextCursor &) { return {}; }
+    virtual bool shouldSendDidSave(const TextEditor::TextDocument *) const { return true; }
 };
 
 } // namespace LanguageClient
diff --git a/src/plugins/languageclient/clientrequest.cpp b/src/plugins/languageclient/clientrequest.cpp
index 4e221f1b9d4..bb853f80e4f 100644
--- a/src/plugins/languageclient/clientrequest.cpp
+++ b/src/plugins/languageclient/clientrequest.cpp
@@ -29,7 +29,8 @@ bool ClientWorkspaceSymbolRequest::preStartCheck()
         = client()->capabilities().workspaceSymbolProvider();
     if (!capability.has_value())
         return false;
-    if (std::holds_alternative<bool>(*capability) && !std::get<bool>(*capability))
+    const auto boolvalue = std::get_if<bool>(&*capability);
+    if (boolvalue && !*boolvalue)
         return false;
 
     return true;
diff --git a/src/plugins/languageclient/diagnosticmanager.cpp b/src/plugins/languageclient/diagnosticmanager.cpp
index dd58407f9e0..7fc4efb6ddc 100644
--- a/src/plugins/languageclient/diagnosticmanager.cpp
+++ b/src/plugins/languageclient/diagnosticmanager.cpp
@@ -4,11 +4,13 @@
 #include "diagnosticmanager.h"
 
 #include "client.h"
+#include "languageclientmanager.h"
 #include "languageclienttr.h"
 
 #include <coreplugin/editormanager/documentmodel.h>
 
 #include <projectexplorer/project.h>
+#include <projectexplorer/taskhub.h>
 
 #include <texteditor/fontsettings.h>
 #include <texteditor/textdocument.h>
@@ -23,8 +25,9 @@
 #include <QAction>
 
 using namespace LanguageServerProtocol;
-using namespace Utils;
+using namespace ProjectExplorer;
 using namespace TextEditor;
+using namespace Utils;
 
 namespace LanguageClient {
 
@@ -46,10 +49,56 @@ public:
     }
 };
 
-DiagnosticManager::DiagnosticManager(Client *client)
-    : m_client(client)
-    , m_extraSelectionsId(TextEditorWidget::CodeWarningsSelection)
+struct VersionedDiagnostics
 {
+    std::optional<int> version;
+    QList<LanguageServerProtocol::Diagnostic> diagnostics;
+};
+
+class Marks
+{
+public:
+    ~Marks() { qDeleteAll(marks); }
+    bool enabled = true;
+    QList<TextEditor::TextMark *> marks;
+};
+
+class DiagnosticManager::DiagnosticManagerPrivate
+{
+public:
+    DiagnosticManagerPrivate(Client *client)
+        : m_client(client)
+    {}
+
+    void showTasks(TextDocument *doc) {
+        if (!doc || m_client != LanguageClientManager::clientForDocument(doc))
+            return;
+        TaskHub::clearTasks(m_taskCategory);
+        const Tasks tasks = m_issuePaneEntries.value(doc->filePath());
+        for (const Task &t : tasks)
+            TaskHub::addTask(t);
+    }
+
+    QMap<FilePath, VersionedDiagnostics> m_diagnostics;
+    QMap<FilePath, Marks> m_marks;
+    Client *m_client;
+    QHash<FilePath, Tasks> m_issuePaneEntries;
+    Id m_extraSelectionsId = TextEditorWidget::CodeWarningsSelection;
+    bool m_forceCreateTasks = true;
+    Id m_taskCategory = Constants::TASK_CATEGORY_DIAGNOSTICS;
+};
+
+DiagnosticManager::DiagnosticManager(Client *client)
+    : d(std::make_unique<DiagnosticManagerPrivate>(client))
+{
+    auto updateCurrentEditor = [this](Core::IEditor *editor) {
+        if (editor)
+            d->showTasks(qobject_cast<TextDocument *>(editor->document()));
+    };
+    connect(Core::EditorManager::instance(),
+            &Core::EditorManager::currentEditorChanged,
+            this,
+            updateCurrentEditor);
 }
 
 DiagnosticManager::~DiagnosticManager()
@@ -62,16 +111,19 @@ void DiagnosticManager::setDiagnostics(const FilePath &filePath,
                                        const std::optional<int> &version)
 {
     hideDiagnostics(filePath);
-    m_diagnostics[filePath] = {version, filteredDiagnostics(diagnostics)};
+    d->m_diagnostics[filePath] = {version, filteredDiagnostics(diagnostics)};
 }
 
 void DiagnosticManager::hideDiagnostics(const Utils::FilePath &filePath)
 {
     if (auto doc = TextDocument::textDocumentForFilePath(filePath)) {
+        if (doc == TextDocument::currentTextDocument())
+            TaskHub::clearTasks(d->m_taskCategory);
         for (BaseTextEditor *editor : BaseTextEditor::textEditorsForDocument(doc))
-            editor->editorWidget()->setExtraSelections(m_extraSelectionsId, {});
+            editor->editorWidget()->setExtraSelections(d->m_extraSelectionsId, {});
     }
-    m_marks.remove(filePath);
+    d->m_marks.remove(filePath);
+    d->m_issuePaneEntries.remove(filePath);
 }
 
 QList<Diagnostic> DiagnosticManager::filteredDiagnostics(const QList<Diagnostic> &diagnostics) const
@@ -82,7 +134,7 @@ QList<Diagnostic> DiagnosticManager::filteredDiagnostics(const QList<Diagnostic>
 void DiagnosticManager::disableDiagnostics(TextEditor::TextDocument *document)
 {
 
-    Marks &marks = m_marks[document->filePath()];
+    Marks &marks = d->m_marks[document->filePath()];
     if (!marks.enabled)
         return;
     for (TextEditor::TextMark *mark : marks.marks)
@@ -92,13 +144,14 @@ void DiagnosticManager::disableDiagnostics(TextEditor::TextDocument *document)
 
 void DiagnosticManager::showDiagnostics(const FilePath &filePath, int version)
 {
+    d->m_issuePaneEntries.remove(filePath);
     if (TextDocument *doc = TextDocument::textDocumentForFilePath(filePath)) {
         QList<QTextEdit::ExtraSelection> extraSelections;
-        const VersionedDiagnostics &versionedDiagnostics = m_diagnostics.value(filePath);
+        const VersionedDiagnostics &versionedDiagnostics = d->m_diagnostics.value(filePath);
         if (versionedDiagnostics.version.value_or(version) == version
             && !versionedDiagnostics.diagnostics.isEmpty()) {
-            Marks &marks = m_marks[filePath];
-            const bool isProjectFile = m_client->fileBelongsToProject(filePath);
+            Marks &marks = d->m_marks[filePath];
+            const bool isProjectFile = d->m_client->fileBelongsToProject(filePath);
             for (const Diagnostic &diagnostic : versionedDiagnostics.diagnostics) {
                 const QTextEdit::ExtraSelection selection
                     = createDiagnosticSelection(diagnostic, doc->document());
@@ -106,23 +159,33 @@ void DiagnosticManager::showDiagnostics(const FilePath &filePath, int version)
                     extraSelections << selection;
                 if (TextEditor::TextMark *mark = createTextMark(doc, diagnostic, isProjectFile))
                     marks.marks.append(mark);
+                if (std::optional<Task> task = createTask(doc, diagnostic, isProjectFile))
+                    d->m_issuePaneEntries[filePath].append(*task);
             }
             if (!marks.marks.isEmpty())
                 emit textMarkCreated(filePath);
         }
 
         for (BaseTextEditor *editor : BaseTextEditor::textEditorsForDocument(doc))
-            editor->editorWidget()->setExtraSelections(m_extraSelectionsId, extraSelections);
+            editor->editorWidget()->setExtraSelections(d->m_extraSelectionsId, extraSelections);
+
+        if (doc == TextDocument::currentTextDocument())
+            d->showTasks(doc);
     }
 }
 
+Client *DiagnosticManager::client() const
+{
+    return d->m_client;
+}
+
 TextEditor::TextMark *DiagnosticManager::createTextMark(TextDocument *doc,
                                                         const Diagnostic &diagnostic,
                                                         bool /*isProjectFile*/) const
 {
     static const QIcon icon = Icon::fromTheme("edit-copy");
     static const QString tooltip = Tr::tr("Copy to Clipboard");
-    auto mark = new TextMark(doc, diagnostic, m_client);
+    auto mark = new TextMark(doc, diagnostic, d->m_client);
     mark->setActionsProvider([text = diagnostic.message()] {
         QAction *action = new QAction();
         action->setIcon(icon);
@@ -135,6 +198,56 @@ TextEditor::TextMark *DiagnosticManager::createTextMark(TextDocument *doc,
     return mark;
 }
 
+std::optional<Task> DiagnosticManager::createTask(
+        TextDocument *doc,
+        const LanguageServerProtocol::Diagnostic &diagnostic,
+        bool isProjectFile) const
+{
+    if (!isProjectFile && !d->m_forceCreateTasks)
+        return {};
+
+    Task::TaskType taskType = Task::TaskType::Unknown;
+    QIcon icon;
+
+    if (const std::optional<DiagnosticSeverity> severity = diagnostic.severity()) {
+        switch (*severity) {
+        case DiagnosticSeverity::Error:
+            taskType = Task::TaskType::Error;
+            icon = Icons::CODEMODEL_ERROR.icon();
+            break;
+        case DiagnosticSeverity::Warning:
+            taskType = Task::TaskType::Warning;
+            icon = Icons::CODEMODEL_WARNING.icon();
+            break;
+        default:
+            break;
+        }
+    }
+
+    return Task(taskType,
+                taskText(diagnostic),
+                doc->filePath(),
+                diagnostic.range().start().line(),
+                d->m_taskCategory,
+                icon,
+                Task::NoOptions);
+}
+
+QString DiagnosticManager::taskText(const LanguageServerProtocol::Diagnostic &diagnostic) const
+{
+    return diagnostic.message();
+}
+
+void DiagnosticManager::setTaskCategory(const Utils::Id &taskCategory)
+{
+    d->m_taskCategory = taskCategory;
+}
+
+void DiagnosticManager::setForceCreateTasks(bool forceCreateTasks)
+{
+    d->m_forceCreateTasks = forceCreateTasks;
+}
+
 QTextEdit::ExtraSelection DiagnosticManager::createDiagnosticSelection(
     const LanguageServerProtocol::Diagnostic &diagnostic, QTextDocument *textDocument) const
 {
@@ -153,13 +266,13 @@ QTextEdit::ExtraSelection DiagnosticManager::createDiagnosticSelection(
 void DiagnosticManager::setExtraSelectionsId(const Utils::Id &extraSelectionsId)
 {
     // this function should be called before any diagnostics are handled
-    QTC_CHECK(m_diagnostics.isEmpty());
-    m_extraSelectionsId = extraSelectionsId;
+    QTC_CHECK(d->m_diagnostics.isEmpty());
+    d->m_extraSelectionsId = extraSelectionsId;
 }
 
 void DiagnosticManager::forAllMarks(std::function<void (TextEditor::TextMark *)> func)
 {
-    for (const Marks &marks : std::as_const(m_marks)) {
+    for (const Marks &marks : std::as_const(d->m_marks)) {
         for (TextEditor::TextMark *mark : marks.marks)
             func(mark);
     }
@@ -167,18 +280,18 @@ void DiagnosticManager::forAllMarks(std::function<void (TextEditor::TextMark *)>
 
 void DiagnosticManager::clearDiagnostics()
 {
-    for (const Utils::FilePath &path : m_diagnostics.keys())
+    for (const Utils::FilePath &path : d->m_diagnostics.keys())
         hideDiagnostics(path);
-    m_diagnostics.clear();
-    QTC_ASSERT(m_marks.isEmpty(), m_marks.clear());
+    d->m_diagnostics.clear();
+    QTC_ASSERT(d->m_marks.isEmpty(), d->m_marks.clear());
 }
 
 QList<Diagnostic> DiagnosticManager::diagnosticsAt(const FilePath &filePath,
                                                    const QTextCursor &cursor) const
 {
-    const int documentRevision = m_client->documentVersion(filePath);
-    auto it = m_diagnostics.find(filePath);
-    if (it == m_diagnostics.end())
+    const int documentRevision = d->m_client->documentVersion(filePath);
+    auto it = d->m_diagnostics.find(filePath);
+    if (it == d->m_diagnostics.end())
         return {};
     if (documentRevision != it->version.value_or(documentRevision))
         return {};
@@ -193,10 +306,10 @@ bool DiagnosticManager::hasDiagnostic(const FilePath &filePath,
 {
     if (!doc)
         return false;
-    const auto it = m_diagnostics.find(filePath);
-    if (it == m_diagnostics.end())
+    const auto it = d->m_diagnostics.find(filePath);
+    if (it == d->m_diagnostics.end())
         return {};
-    const int revision = m_client->documentVersion(filePath);
+    const int revision = d->m_client->documentVersion(filePath);
     if (revision != it->version.value_or(revision))
         return false;
     return it->diagnostics.contains(diag);
@@ -205,18 +318,13 @@ bool DiagnosticManager::hasDiagnostic(const FilePath &filePath,
 bool DiagnosticManager::hasDiagnostics(const TextDocument *doc) const
 {
     const FilePath docPath = doc->filePath();
-    const auto it = m_diagnostics.find(docPath);
-    if (it == m_diagnostics.end())
+    const auto it = d->m_diagnostics.find(docPath);
+    if (it == d->m_diagnostics.end())
         return {};
-    const int revision = m_client->documentVersion(docPath);
+    const int revision = d->m_client->documentVersion(docPath);
     if (revision != it->version.value_or(revision))
         return false;
     return !it->diagnostics.isEmpty();
 }
 
-DiagnosticManager::Marks::~Marks()
-{
-    qDeleteAll(marks);
-}
-
 } // namespace LanguageClient
diff --git a/src/plugins/languageclient/diagnosticmanager.h b/src/plugins/languageclient/diagnosticmanager.h
index a4ad23e1b98..cb3798be133 100644
--- a/src/plugins/languageclient/diagnosticmanager.h
+++ b/src/plugins/languageclient/diagnosticmanager.h
@@ -9,7 +9,6 @@
 
 #include <utils/id.h>
 
-#include <QMap>
 #include <QTextEdit>
 
 #include <functional>
@@ -19,6 +18,8 @@ class TextDocument;
 class TextMark;
 }
 
+namespace ProjectExplorer { class Task; }
+
 namespace LanguageClient {
 
 class Client;
@@ -54,34 +55,30 @@ signals:
     void textMarkCreated(const Utils::FilePath &path);
 
 protected:
-    Client *client() const { return m_client; }
+    Client *client() const;
     virtual TextEditor::TextMark *createTextMark(TextEditor::TextDocument *doc,
                                                  const LanguageServerProtocol::Diagnostic &diagnostic,
                                                  bool isProjectFile) const;
+
+    virtual std::optional<ProjectExplorer::Task> createTask(
+        TextEditor::TextDocument *doc,
+        const LanguageServerProtocol::Diagnostic &diagnostic,
+        bool isProjectFile) const;
+    virtual QString taskText(const LanguageServerProtocol::Diagnostic &diagnostic) const;
+    void setTaskCategory(const Utils::Id &taskCategory);
+
+    // enables task creations for diagnostics outside of the clients project (default: on)
+    void setForceCreateTasks(bool forceCreateTasks);
+
     virtual QTextEdit::ExtraSelection createDiagnosticSelection(
         const LanguageServerProtocol::Diagnostic &diagnostic, QTextDocument *textDocument) const;
 
     void setExtraSelectionsId(const Utils::Id &extraSelectionsId);
 
     void forAllMarks(std::function<void (TextEditor::TextMark *)> func);
-
 private:
-    struct VersionedDiagnostics
-    {
-        std::optional<int> version;
-        QList<LanguageServerProtocol::Diagnostic> diagnostics;
-    };
-    QMap<Utils::FilePath, VersionedDiagnostics> m_diagnostics;
-    class Marks
-    {
-    public:
-        ~Marks();
-        bool enabled = true;
-        QList<TextEditor::TextMark *> marks;
-    };
-    QMap<Utils::FilePath, Marks> m_marks;
-    Client *m_client;
-    Utils::Id m_extraSelectionsId;
+    class DiagnosticManagerPrivate;
+    std::unique_ptr<DiagnosticManagerPrivate> d;
 };
 
 } // namespace LanguageClient
diff --git a/src/plugins/languageclient/dynamiccapabilities.h b/src/plugins/languageclient/dynamiccapabilities.h
index 076d578d8f3..13f8be74a6f 100644
--- a/src/plugins/languageclient/dynamiccapabilities.h
+++ b/src/plugins/languageclient/dynamiccapabilities.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include "languageclient_global.h"
+
 #include <languageserverprotocol/client.h>
 
 namespace LanguageClient {
@@ -21,7 +23,7 @@ public:
 
     void disable()
     {
-        m_enabled = true;
+        m_enabled = false;
         m_id.clear();
         m_options = QJsonValue();
     }
@@ -37,7 +39,7 @@ private:
 
 };
 
-class DynamicCapabilities
+class LANGUAGECLIENT_EXPORT DynamicCapabilities
 {
 public:
     DynamicCapabilities() = default;
diff --git a/src/plugins/languageclient/languageclient.qbs b/src/plugins/languageclient/languageclient.qbs
index 96a88629f0d..04c2f0f3264 100644
--- a/src/plugins/languageclient/languageclient.qbs
+++ b/src/plugins/languageclient/languageclient.qbs
@@ -15,8 +15,8 @@ QtcPlugin {
     Depends { name: "TextEditor" }
 
     files: [
-        "callhierarchy.cpp",
-        "callhierarchy.h",
+        "callandtypehierarchy.cpp",
+        "callandtypehierarchy.h",
         "client.cpp",
         "client.h",
         "clientrequest.cpp",
@@ -30,7 +30,8 @@ QtcPlugin {
         "dynamiccapabilities.cpp",
         "dynamiccapabilities.h",
         "languageclient.qrc",
-        "languageclient_global.h", "languageclienttr.h",
+        "languageclient_global.h",
+        "languageclienttr.h",
         "languageclientformatter.cpp",
         "languageclientformatter.h",
         "languageclienthoverhandler.cpp",
diff --git a/src/plugins/languageclient/languageclient_global.h b/src/plugins/languageclient/languageclient_global.h
index 2abb395d86e..cdcd1fb5ddc 100644
--- a/src/plugins/languageclient/languageclient_global.h
+++ b/src/plugins/languageclient/languageclient_global.h
@@ -41,6 +41,7 @@ const char LANGUAGECLIENT_WORKSPACE_METHOD_FILTER_DESCRIPTION[]
                         "Locates functions and methods in the language server workspace.");
 
 const char CALL_HIERARCHY_FACTORY_ID[] = "LanguageClient.CallHierarchy";
+const char TASK_CATEGORY_DIAGNOSTICS[] = "LanguageClient.DiagnosticTask";
 
 } // namespace Constants
 } // namespace LanguageClient
diff --git a/src/plugins/languageclient/languageclientcompletionassist.cpp b/src/plugins/languageclient/languageclientcompletionassist.cpp
index d6a2904fa4c..7486ca102c7 100644
--- a/src/plugins/languageclient/languageclientcompletionassist.cpp
+++ b/src/plugins/languageclient/languageclientcompletionassist.cpp
@@ -123,11 +123,11 @@ QString LanguageClientCompletionItem::detail() const
     if (auto _doc = m_item.documentation()) {
         auto doc = *_doc;
         QString detailDocText;
-        if (std::holds_alternative<QString>(doc)) {
-            detailDocText = std::get<QString>(doc);
-        } else if (std::holds_alternative<MarkupContent>(doc)) {
+        if (const auto s = std::get_if<QString>(&doc)) {
+            detailDocText = *s;
+        } else if (const auto m = std::get_if<MarkupContent>(&doc)) {
             // TODO markdown parser?
-            detailDocText = std::get<MarkupContent>(doc).content();
+            detailDocText = m->content();
         }
         if (!detailDocText.isEmpty())
             return detailDocText;
@@ -495,12 +495,10 @@ void LanguageClientCompletionAssistProcessor::handleCompletionResponse(
     }
 
     QList<CompletionItem> items;
-    if (std::holds_alternative<CompletionList>(*result)) {
-        const auto &list = std::get<CompletionList>(*result);
-        items = list.items().value_or(QList<CompletionItem>());
-    } else if (std::holds_alternative<QList<CompletionItem>>(*result)) {
-        items = std::get<QList<CompletionItem>>(*result);
-    }
+    if (const auto list = std::get_if<CompletionList>(&*result))
+        items = list->items().value_or(QList<CompletionItem>());
+    else if (const auto l = std::get_if<QList<CompletionItem>>(&*result))
+        items = *l;
     auto proposalItems = generateCompletionItems(items);
     if (!m_snippetsGroup.isEmpty()) {
         proposalItems << TextEditor::SnippetAssistCollector(m_snippetsGroup,
diff --git a/src/plugins/languageclient/languageclientformatter.cpp b/src/plugins/languageclient/languageclientformatter.cpp
index 52f35856af3..acebc3184ba 100644
--- a/src/plugins/languageclient/languageclientformatter.cpp
+++ b/src/plugins/languageclient/languageclientformatter.cpp
@@ -69,7 +69,8 @@ QFutureWatcher<ChangeSet> *LanguageClientFormatter::format(
             = m_client->capabilities().documentRangeFormattingProvider();
         if (!provider.has_value())
             return nullptr;
-        if (std::holds_alternative<bool>(*provider) && !std::get<bool>(*provider))
+        const auto boolvalue = std::get_if<bool>(&*provider);
+        if (boolvalue && !*boolvalue)
             return nullptr;
     }
     DocumentRangeFormattingParams params;
diff --git a/src/plugins/languageclient/languageclienthoverhandler.cpp b/src/plugins/languageclient/languageclienthoverhandler.cpp
index e878a62749b..429c89e511a 100644
--- a/src/plugins/languageclient/languageclienthoverhandler.cpp
+++ b/src/plugins/languageclient/languageclienthoverhandler.cpp
@@ -87,9 +87,8 @@ void HoverHandler::identifyMatch(TextEditor::TextEditorWidget *editorWidget,
 
     const std::optional<std::variant<bool, WorkDoneProgressOptions>> &provider
         = m_client->capabilities().hoverProvider();
-    bool sendMessage = provider.has_value();
-    if (sendMessage && std::holds_alternative<bool>(*provider))
-        sendMessage = std::get<bool>(*provider);
+    const bool *boolvalue = provider.has_value() ? std::get_if<bool>(&*provider) : nullptr;
+    bool sendMessage = provider.has_value() && (!boolvalue || *boolvalue);
     if (std::optional<bool> registered = m_client->dynamicCapabilities().isRegistered(
             HoverRequest::methodName)) {
         sendMessage = *registered;
diff --git a/src/plugins/languageclient/languageclientmanager.cpp b/src/plugins/languageclient/languageclientmanager.cpp
index ae3c52f8975..3022ba527d9 100644
--- a/src/plugins/languageclient/languageclientmanager.cpp
+++ b/src/plugins/languageclient/languageclientmanager.cpp
@@ -194,7 +194,7 @@ void LanguageClientManager::clientFinished(Client *client)
             openDocumentWithClient(document, nullptr);
     }
 
-    deleteClient(client);
+    deleteClient(client, unexpectedFinish);
     if (isShutdownFinished())
         emit managerInstance->shutdownFinished();
 }
@@ -234,7 +234,7 @@ void LanguageClientManager::shutdownClient(Client *client)
         deleteClient(client);
 }
 
-void LanguageClientManager::deleteClient(Client *client)
+void LanguageClientManager::deleteClient(Client *client, bool unexpected)
 {
     QTC_ASSERT(managerInstance, return);
     QTC_ASSERT(client, return);
@@ -252,7 +252,7 @@ void LanguageClientManager::deleteClient(Client *client)
     managerInstance->trackClientDeletion(client);
 
     if (!PluginManager::isShuttingDown())
-        emit instance()->clientRemoved(client);
+        emit instance()->clientRemoved(client, unexpected);
 }
 
 void LanguageClientManager::shutdown()
@@ -275,13 +275,14 @@ LanguageClientManager *LanguageClientManager::instance()
     return managerInstance;
 }
 
-QList<Client *> LanguageClientManager::clientsSupportingDocument(const TextEditor::TextDocument *doc)
+QList<Client *> LanguageClientManager::clientsSupportingDocument(
+    const TextEditor::TextDocument *doc, bool onlyReachable)
 {
     QTC_ASSERT(managerInstance, return {});
     QTC_ASSERT(doc, return {};);
-    return Utils::filtered(managerInstance->reachableClients(), [doc](Client *client) {
-        return client->isSupportedDocument(doc);
-    });
+    return Utils::filtered(
+        onlyReachable ? managerInstance->reachableClients() : managerInstance->m_clients,
+        [doc](Client *client) { return client->isSupportedDocument(doc); });
 }
 
 void LanguageClientManager::applySettings()
@@ -387,6 +388,7 @@ void LanguageClientManager::enableClientSettings(const QString &settingsId, bool
 QList<Client *> LanguageClientManager::clientsForSetting(const BaseSettings *setting)
 {
     QTC_ASSERT(managerInstance, return {});
+    QTC_ASSERT(setting, return {});
     auto instance = managerInstance;
     return instance->m_clientsForSetting.value(setting->m_id);
 }
diff --git a/src/plugins/languageclient/languageclientmanager.h b/src/plugins/languageclient/languageclientmanager.h
index c288ef453b3..a970ef66d27 100644
--- a/src/plugins/languageclient/languageclientmanager.h
+++ b/src/plugins/languageclient/languageclientmanager.h
@@ -41,14 +41,15 @@ public:
     static void restartClient(Client *client);
 
     static void shutdownClient(Client *client);
-    static void deleteClient(Client *client);
+    static void deleteClient(Client *client, bool unexpected = false);
 
     static void shutdown();
     static bool isShutdownFinished();
 
     static LanguageClientManager *instance();
 
-    static QList<Client *> clientsSupportingDocument(const TextEditor::TextDocument *doc);
+    static QList<Client *> clientsSupportingDocument(
+        const TextEditor::TextDocument *doc, bool onlyReachable = true);
 
     static void applySettings();
     static QList<BaseSettings *> currentSettings();
@@ -87,7 +88,7 @@ public slots:
 signals:
     void clientAdded(Client *client);
     void clientInitialized(Client *client);
-    void clientRemoved(Client *client);
+    void clientRemoved(Client *client, bool unexpected);
     void shutdownFinished();
     void openCallHierarchy();
 
diff --git a/src/plugins/languageclient/languageclientoutline.cpp b/src/plugins/languageclient/languageclientoutline.cpp
index 8c45513ce9f..30dea876882 100644
--- a/src/plugins/languageclient/languageclientoutline.cpp
+++ b/src/plugins/languageclient/languageclientoutline.cpp
@@ -228,10 +228,10 @@ void LanguageClientOutlineWidget::handleResponse(const DocumentUri &uri,
 {
     if (uri != m_uri)
         return;
-    if (std::holds_alternative<QList<SymbolInformation>>(result))
-        m_model.setInfo(std::get<QList<SymbolInformation>>(result));
-    else if (std::holds_alternative<QList<DocumentSymbol>>(result))
-        m_model.setInfo(std::get<QList<DocumentSymbol>>(result));
+    if (const auto i = std::get_if<QList<SymbolInformation>>(&result))
+        m_model.setInfo(*i);
+    else if (const auto s = std::get_if<QList<DocumentSymbol>>(&result))
+        m_model.setInfo(*s);
     else
         m_model.clear();
 
@@ -369,10 +369,10 @@ void OutlineComboBox::updateModel(const DocumentUri &resultUri, const DocumentSy
 {
     if (m_uri != resultUri)
         return;
-    if (std::holds_alternative<QList<SymbolInformation>>(result))
-        m_model.setInfo(std::get<QList<SymbolInformation>>(result));
-    else if (std::holds_alternative<QList<DocumentSymbol>>(result))
-        m_model.setInfo(std::get<QList<DocumentSymbol>>(result));
+    if (const auto i = std::get_if<QList<SymbolInformation>>(&result))
+        m_model.setInfo(*i);
+    else if (const auto s = std::get_if<QList<DocumentSymbol>>(&result))
+        m_model.setInfo(*s);
     else
         m_model.clear();
 
diff --git a/src/plugins/languageclient/languageclientplugin.cpp b/src/plugins/languageclient/languageclientplugin.cpp
index 83a15122537..a466a5b300a 100644
--- a/src/plugins/languageclient/languageclientplugin.cpp
+++ b/src/plugins/languageclient/languageclientplugin.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "callhierarchy.h"
+#include "callandtypehierarchy.h"
 #include "languageclientmanager.h"
 #include "languageclientoutline.h"
 #include "languageclientsettings.h"
@@ -14,6 +14,8 @@
 #include <extensionsystem/iplugin.h>
 #include <extensionsystem/pluginmanager.h>
 
+#include <projectexplorer/taskhub.h>
+
 #include <QAction>
 #include <QMenu>
 
@@ -43,6 +45,7 @@ void LanguageClientPlugin::initialize()
     using namespace Core;
 
     setupCallHierarchyFactory();
+    setupTypeHierarchyFactory();
     setupLanguageClientProjectPanel();
     setupLanguageClientManager(this);
 
@@ -58,6 +61,11 @@ void LanguageClientPlugin::initialize()
     inspectAction.setText(Tr::tr("Inspect Language Clients..."));
     inspectAction.addToContainer(Core::Constants::M_TOOLS_DEBUG);
     inspectAction.addOnTriggered(this, &LanguageClientManager::showInspector);
+
+    ProjectExplorer::TaskHub::addCategory(
+                {Constants::TASK_CATEGORY_DIAGNOSTICS,
+                 Tr::tr("Language Server Diagnostics"),
+                 Tr::tr("Issues provided by the Language Server in the current document.")});
 }
 
 void LanguageClientPlugin::extensionsInitialized()
diff --git a/src/plugins/languageclient/languageclientsettings.cpp b/src/plugins/languageclient/languageclientsettings.cpp
index 38c5a46159c..b9db9807174 100644
--- a/src/plugins/languageclient/languageclientsettings.cpp
+++ b/src/plugins/languageclient/languageclientsettings.cpp
@@ -25,6 +25,7 @@
 #include <utils/delegates.h>
 #include <utils/fancylineedit.h>
 #include <utils/jsontreeitem.h>
+#include <utils/layoutbuilder.h>
 #include <utils/macroexpander.h>
 #include <utils/mimeconstants.h>
 #include <utils/stringutils.h>
@@ -39,6 +40,7 @@
 #include <QDialogButtonBox>
 #include <QDir>
 #include <QFileInfo>
+#include <QFormLayout>
 #include <QGroupBox>
 #include <QHeaderView>
 #include <QJsonDocument>
@@ -184,6 +186,8 @@ LanguageClientSettingsPageWidget::LanguageClientSettingsPageWidget(LanguageClien
     auto addMenu = new QMenu(this);
     addMenu->clear();
     for (const ClientType &type : clientTypes()) {
+        if (!type.userAddable)
+            continue;
         auto action = new QAction(type.name, this);
         connect(action, &QAction::triggered, this, [this, id = type.id]() { addItem(id); });
         addMenu->addAction(action);
@@ -603,6 +607,27 @@ void LanguageClientSettings::init()
     LanguageClientManager::applySettings();
 }
 
+QList<Utils::Store> LanguageClientSettings::storesBySettingsType(Utils::Id settingsTypeId)
+{
+    QList<Utils::Store> result;
+
+    QtcSettings *settingsIn = Core::ICore::settings();
+    settingsIn->beginGroup(settingsGroupKey);
+
+    for (const QVariantList &varList :
+         {settingsIn->value(clientsKey).toList(), settingsIn->value(typedClientsKey).toList()}) {
+        for (const QVariant &var : varList) {
+            const Store store = storeFromVariant(var);
+            if (settingsTypeId == Id::fromSetting(store.value(typeIdKey)))
+                result << store;
+        }
+    }
+
+    settingsIn->endGroup();
+
+    return result;
+}
+
 QList<BaseSettings *> LanguageClientSettings::fromSettings(QtcSettings *settingsIn)
 {
     settingsIn->beginGroup(settingsGroupKey);
@@ -664,10 +689,21 @@ void LanguageClientSettings::toSettings(QtcSettings *settings,
     auto isStdioSetting = Utils::equal(&BaseSettings::m_settingsTypeId,
                                        Utils::Id(Constants::LANGUAGECLIENT_STDIO_SETTINGS_ID));
     auto [stdioSettings, typedSettings] = Utils::partition(languageClientSettings, isStdioSetting);
-    if (!stdioSettings.isEmpty())
-        settings->setValue(clientsKey, transform(stdioSettings));
-    if (!typedSettings.isEmpty())
-        settings->setValue(typedClientsKey, transform(typedSettings));
+    settings->setValue(clientsKey, transform(stdioSettings));
+
+    // write back typed settings for unregistered client types
+    QVariantList typedSettingsVariant;
+    for (const QVariant &var : settings->value(typedClientsKey).toList()) {
+        const Store map = storeFromVariant(var);
+        const Id typeId = Id::fromSetting(map.value(typeIdKey));
+        const QString id = map.value(idKey).toString();
+        if (typeId.isValid() && !clientTypes().contains(typeId)
+            && !Utils::anyOf(typedSettings, Utils::equal(&BaseSettings::m_id, id)))
+            typedSettingsVariant << var;
+    }
+
+    typedSettingsVariant << transform(typedSettings);
+    settings->setValue(typedClientsKey, typedSettingsVariant);
     settings->endGroup();
 }
 
@@ -784,71 +820,73 @@ static QString startupBehaviorString(BaseSettings::StartBehavior behavior)
     return {};
 }
 
-BaseSettingsWidget::BaseSettingsWidget(const BaseSettings *settings, QWidget *parent)
+BaseSettingsWidget::BaseSettingsWidget(const BaseSettings *settings, QWidget *parent,
+                                       Layouting::LayoutModifier additionalItems)
     : QWidget(parent)
     , m_name(new QLineEdit(settings->m_name, this))
     , m_mimeTypes(new QLabel(settings->m_languageFilter.mimeTypes.join(filterSeparator), this))
-    , m_filePattern(new QLineEdit(settings->m_languageFilter.filePattern.join(filterSeparator), this))
+    , m_filePattern(
+          new QLineEdit(settings->m_languageFilter.filePattern.join(filterSeparator), this))
     , m_startupBehavior(new QComboBox)
     , m_initializationOptions(new Utils::FancyLineEdit(this))
 {
-    int row = 0;
-    auto *mainLayout = new QGridLayout;
+    using namespace Layouting;
 
-    mainLayout->addWidget(new QLabel(Tr::tr("Name:")), row, 0);
-    mainLayout->addWidget(m_name, row, 1);
     auto chooser = new Utils::VariableChooser(this);
     chooser->addSupportedWidget(m_name);
+    chooser->addSupportedWidget(m_initializationOptions);
 
-    mainLayout->addWidget(new QLabel(Tr::tr("Language:")), ++row, 0);
-    auto mimeLayout = new QHBoxLayout;
-    mimeLayout->addWidget(m_mimeTypes);
-    mimeLayout->addStretch();
     auto addMimeTypeButton = new QPushButton(Tr::tr("Set MIME Types..."), this);
-    mimeLayout->addWidget(addMimeTypeButton);
-    mainLayout->addLayout(mimeLayout, row, 1);
+    connect(
+        addMimeTypeButton, &QPushButton::pressed, this, &BaseSettingsWidget::showAddMimeTypeDialog);
+
     m_filePattern->setPlaceholderText(Tr::tr("File pattern"));
     m_filePattern->setToolTip(
         Tr::tr("List of file patterns.\nExample: *.cpp%1*.h").arg(filterSeparator));
-    mainLayout->addWidget(m_filePattern, ++row, 1);
 
-    mainLayout->addWidget(new QLabel(Tr::tr("Startup behavior:")), ++row, 0);
     for (int behavior = 0; behavior < BaseSettings::LastSentinel ; ++behavior)
         m_startupBehavior->addItem(startupBehaviorString(BaseSettings::StartBehavior(behavior)));
     m_startupBehavior->setCurrentIndex(settings->m_startBehavior);
-    mainLayout->addWidget(m_startupBehavior, row, 1);
 
+    m_initializationOptions->setValidationFunction(
+        [](Utils::FancyLineEdit *edit, QString *errorMessage) {
+            const QString value = Utils::globalMacroExpander()->expand(edit->text());
 
-    connect(addMimeTypeButton, &QPushButton::pressed,
-            this, &BaseSettingsWidget::showAddMimeTypeDialog);
+            if (value.isEmpty())
+                return true;
 
-    mainLayout->addWidget(new QLabel(Tr::tr("Initialization options:")), ++row, 0);
-    mainLayout->addWidget(m_initializationOptions, row, 1);
-    chooser->addSupportedWidget(m_initializationOptions);
-    m_initializationOptions->setValidationFunction([](Utils::FancyLineEdit *edit, QString *errorMessage) {
-        const QString value = Utils::globalMacroExpander()->expand(edit->text());
+            QJsonParseError parseInfo;
+            const QJsonDocument json = QJsonDocument::fromJson(value.toUtf8(), &parseInfo);
 
-        if (value.isEmpty())
+            if (json.isNull()) {
+                if (errorMessage)
+                    *errorMessage = Tr::tr("Failed to parse JSON at %1: %2")
+                                        .arg(parseInfo.offset)
+                                        .arg(parseInfo.errorString());
+                return false;
+            }
             return true;
-
-        QJsonParseError parseInfo;
-        const QJsonDocument json = QJsonDocument::fromJson(value.toUtf8(), &parseInfo);
-
-        if (json.isNull()) {
-            if (errorMessage)
-                *errorMessage = Tr::tr("Failed to parse JSON at %1: %2")
-                    .arg(parseInfo.offset)
-                    .arg(parseInfo.errorString());
-            return false;
-        }
-        return true;
-    });
+        });
     m_initializationOptions->setText(settings->m_initializationOptions);
     m_initializationOptions->setPlaceholderText(Tr::tr("Language server-specific JSON to pass via "
                                                    "\"initializationOptions\" field of \"initialize\" "
                                                    "request."));
 
-    setLayout(mainLayout);
+    // clang-format off
+    auto form = Form {
+        Tr::tr("Name:"), m_name, br,
+        Tr::tr("Language:"), Row { m_mimeTypes, st, addMimeTypeButton }, br,
+        Tr::tr("File pattern:"), m_filePattern, br,
+        Tr::tr("Startup behavior:"), m_startupBehavior, br,
+        Tr::tr("Initialization options:"), m_initializationOptions, br
+
+    };
+
+    if (additionalItems)
+        additionalItems(&form);
+
+    form.attachTo(this);
+    // clang-format on
 }
 
 QString BaseSettingsWidget::name() const
@@ -969,15 +1007,17 @@ StdIOSettingsWidget::StdIOSettingsWidget(const StdIOSettings *settings, QWidget
     , m_executable(new Utils::PathChooser(this))
     , m_arguments(new QLineEdit(settings->m_arguments, this))
 {
-    auto mainLayout = qobject_cast<QGridLayout *>(layout());
-    QTC_ASSERT(mainLayout, return);
-    const int baseRows = mainLayout->rowCount();
-    mainLayout->addWidget(new QLabel(Tr::tr("Executable:")), baseRows, 0);
-    mainLayout->addWidget(m_executable, baseRows, 1);
-    mainLayout->addWidget(new QLabel(Tr::tr("Arguments:")), baseRows + 1, 0);
+    using namespace Layouting;
+
     m_executable->setExpectedKind(Utils::PathChooser::ExistingCommand);
     m_executable->setFilePath(settings->m_executable);
-    mainLayout->addWidget(m_arguments, baseRows + 1, 1);
+
+    auto mainLayout = qobject_cast<QFormLayout *>(layout());
+    QTC_ASSERT(mainLayout, return);
+    int row = mainLayout->rowCount();
+
+    mainLayout->insertRow(row++, Tr::tr("Executable:"), m_executable);
+    mainLayout->insertRow(row++, Tr::tr("Arguments:"), m_arguments);
 
     auto chooser = new Utils::VariableChooser(this);
     chooser->addSupportedWidget(m_arguments);
diff --git a/src/plugins/languageclient/languageclientsettings.h b/src/plugins/languageclient/languageclientsettings.h
index 867a0deb2ec..a6055577bc3 100644
--- a/src/plugins/languageclient/languageclientsettings.h
+++ b/src/plugins/languageclient/languageclientsettings.h
@@ -7,6 +7,8 @@
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
+#include <utils/layoutbuilder.h>
+
 #include <QAbstractItemModel>
 #include <QCoreApplication>
 #include <QJsonObject>
@@ -90,9 +92,6 @@ protected:
     BaseSettings(BaseSettings &&other) = default;
     BaseSettings &operator=(const BaseSettings &other) = default;
     BaseSettings &operator=(BaseSettings &&other) = default;
-
-private:
-    bool canStart(QList<const Core::IDocument *> documents) const;
 };
 
 class LANGUAGECLIENT_EXPORT StdIOSettings : public BaseSettings
@@ -127,6 +126,7 @@ struct ClientType {
     QString name;
     using SettingsGenerator = std::function<BaseSettings*()>;
     SettingsGenerator generator = nullptr;
+    bool userAddable = true;
 };
 
 class LANGUAGECLIENT_EXPORT LanguageClientSettings
@@ -137,6 +137,8 @@ public:
     static QList<BaseSettings *> pageSettings();
     static QList<BaseSettings *> changedSettings();
 
+    static QList<Utils::Store> storesBySettingsType(Utils::Id settingsTypeId);
+
     /**
      * must be called before the delayed initialize phase
      * otherwise the settings are not loaded correctly
@@ -154,7 +156,11 @@ class LANGUAGECLIENT_EXPORT BaseSettingsWidget : public QWidget
 {
     Q_OBJECT
 public:
-    explicit BaseSettingsWidget(const BaseSettings* settings, QWidget *parent = nullptr);
+    explicit BaseSettingsWidget(
+        const BaseSettings *settings,
+        QWidget *parent = nullptr,
+        Layouting::LayoutModifier additionalItems = {});
+
     ~BaseSettingsWidget() override = default;
 
     QString name() const;
diff --git a/src/plugins/languageclient/languageclientsymbolsupport.cpp b/src/plugins/languageclient/languageclientsymbolsupport.cpp
index 3a9a1b09705..71b41bbcbfa 100644
--- a/src/plugins/languageclient/languageclientsymbolsupport.cpp
+++ b/src/plugins/languageclient/languageclientsymbolsupport.cpp
@@ -100,9 +100,8 @@ static MessageId sendTextDocumentPositionParamsRequest(Client *client,
             sendMessage = supportedFile;
     } else {
         const auto provider = std::mem_fn(member)(serverCapability);
-        sendMessage = provider.has_value();
-        if (sendMessage && std::holds_alternative<bool>(*provider))
-            sendMessage = std::get<bool>(*provider);
+        const bool *boolvalue = provider.has_value() ? std::get_if<bool>(&*provider) : nullptr;
+        sendMessage = provider.has_value() && (!boolvalue || *boolvalue);
     }
     if (sendMessage) {
         client->sendMessage(request);
@@ -191,9 +190,8 @@ bool SymbolSupport::supportsFindLink(TextEditor::TextDocument *document, LinkTar
         else
             supported = m_client->isSupportedUri(uri);
     } else {
-        supported = provider.has_value();
-        if (supported && std::holds_alternative<bool>(*provider))
-            supported = std::get<bool>(*provider);
+        const bool *boolvalue = provider.has_value() ? std::get_if<bool>(&*provider) : nullptr;
+        supported = provider.has_value() && (!boolvalue || *boolvalue);
     }
     return supported;
 }
@@ -259,8 +257,8 @@ bool SymbolSupport::supportsFindUsages(TextEditor::TextDocument *document) const
             return false;
         }
     } else if (auto referencesProvider = m_client->capabilities().referencesProvider()) {
-        if (std::holds_alternative<bool>(*referencesProvider)) {
-            if (!std::get<bool>(*referencesProvider))
+        if (const auto b = std::get_if<bool>(&*referencesProvider)) {
+            if (!*b)
                 return false;
         }
     } else {
@@ -300,8 +298,9 @@ QStringList SymbolSupport::getFileContents(const Utils::FilePath &filePath)
 
 Utils::SearchResultItems generateSearchResultItems(
     const QMap<Utils::FilePath, QList<ItemData>> &rangesInDocument,
-    Core::SearchResult *search = nullptr,
-    bool limitToProjects = false)
+    Client *client,
+    Core::SearchResult *search,
+    bool limitToProjects)
 {
     Utils::SearchResultItems result;
     const bool renaming = search && search->supportsReplace();
@@ -321,8 +320,15 @@ Utils::SearchResultItems generateSearchResultItems(
         if (renaming && limitToProjects) {
             const ProjectExplorer::Node * const node
                 = ProjectExplorer::ProjectTree::nodeForFile(filePath);
-            item.setSelectForReplacement(node && !node->isGenerated());
-            if (node
+            if (node) {
+                item.setSelectForReplacement(!node->isGenerated());
+            } else {
+                item.setSelectForReplacement(
+                    client->project()
+                    && ProjectExplorer::ProjectManager::isInProjectSourceDir(
+                        filePath, *client->project()));
+            }
+            if (item.selectForReplacement()
                 && filePath.baseName().compare(oldSymbolName, Qt::CaseInsensitive) == 0) {
                 fileRenameCandidates << filePath;
             }
@@ -362,17 +368,17 @@ void filterFileAliases(ItemDataPerPath &itemDataPerPath)
 }
 
 Utils::SearchResultItems generateSearchResultItems(
-    const LanguageClientArray<Location> &locations, const DocumentUri::PathMapper &pathMapper)
+    const LanguageClientArray<Location> &locations, Client *client)
 {
     if (locations.isNull())
         return {};
     ItemDataPerPath rangesInDocument;
     for (const Location &location : locations.toList()) {
-        rangesInDocument[location.uri().toFilePath(pathMapper)]
+        rangesInDocument[location.uri().toFilePath(client->hostPathMapper())]
             << ItemData{SymbolSupport::convertRange(location.range()), {}};
     }
     filterFileAliases(rangesInDocument);
-    return generateSearchResultItems(rangesInDocument);
+    return generateSearchResultItems(rangesInDocument, client, nullptr, false);
 }
 
 void SymbolSupport::handleFindReferencesResponse(const FindReferencesRequest::Response &response,
@@ -388,7 +394,7 @@ void SymbolSupport::handleFindReferencesResponse(const FindReferencesRequest::Re
     if (result) {
         Core::SearchResult *search = Core::SearchResultWindow::instance()->startNewSearch(
             Tr::tr("Find References with %1 for:").arg(m_client->name()), "", wordUnderCursor);
-        search->addResults(generateSearchResultItems(*result, m_client->hostPathMapper()),
+        search->addResults(generateSearchResultItems(*result, m_client),
                            Core::SearchResult::AddOrdered);
         connect(search, &Core::SearchResult::activated, [](const Utils::SearchResultItem &item) {
             Core::EditorManager::openEditorAtSearchResult(item);
@@ -439,13 +445,11 @@ static bool supportsRename(Client *client,
         }
     }
     if (auto renameProvider = client->capabilities().renameProvider()) {
-        if (std::holds_alternative<bool>(*renameProvider)) {
-            if (!std::get<bool>(*renameProvider))
+        if (const auto b = std::get_if<bool>(&*renameProvider)) {
+            if (!*b)
                 return false;
-        } else if (std::holds_alternative<ServerCapabilities::RenameOptions>(*renameProvider)) {
-            prepareSupported = std::get<ServerCapabilities::RenameOptions>(*renameProvider)
-                                   .prepareProvider()
-                                   .value_or(false);
+        } else if (const auto opt = std::get_if<ServerCapabilities::RenameOptions>(&*renameProvider)) {
+            prepareSupported = opt->prepareProvider().value_or(false);
         }
     } else {
         return false;
@@ -516,19 +520,17 @@ void SymbolSupport::requestPrepareRename(TextEditor::TextDocument *document,
 
         const std::optional<PrepareRenameResult> &result = response.result();
         if (result.has_value()) {
-            if (std::holds_alternative<PlaceHolderResult>(*result)) {
-                auto placeHolderResult = std::get<PlaceHolderResult>(*result);
-                startRenameSymbol(params,
-                                  placeholder.isEmpty() ? placeHolderResult.placeHolder()
-                                                        : placeholder,
-                                  oldSymbolName,
-                                  callback,
-                                  preferLowerCaseFileNames);
-            } else if (std::holds_alternative<Range>(*result)) {
-                auto range = std::get<Range>(*result);
+            if (const auto placeHolderResult = std::get_if<PlaceHolderResult>(&*result)) {
+                startRenameSymbol(
+                    params,
+                    placeholder.isEmpty() ? placeHolderResult->placeHolder() : placeholder,
+                    oldSymbolName,
+                    callback,
+                    preferLowerCaseFileNames);
+            } else if (const auto range = std::get_if<Range>(&*result)) {
                 if (document) {
-                    const int start = range.start().toPositionInDocument(document->document());
-                    const int end = range.end().toPositionInDocument(document->document());
+                    const int start = range->start().toPositionInDocument(document->document());
+                    const int end = range->end().toPositionInDocument(document->document());
                     const QString reportedSymbolName = document->textAt(start, end - start);
                     startRenameSymbol(params,
                                       derivePlaceholder(reportedSymbolName, placeholder),
@@ -563,9 +565,9 @@ void SymbolSupport::requestRename(const TextDocumentPositionParams &positionPara
 }
 
 Utils::SearchResultItems generateReplaceItems(const WorkspaceEdit &edits,
+                                              Client *client,
                                               Core::SearchResult *search,
-                                              bool limitToProjects,
-                                              const DocumentUri::PathMapper &pathMapper)
+                                              bool limitToProjects)
 {
     Utils::SearchResultItems items;
     auto convertEdits = [](const QList<TextEdit> &edits) {
@@ -575,30 +577,27 @@ Utils::SearchResultItems generateReplaceItems(const WorkspaceEdit &edits,
     };
     ItemDataPerPath rangesInDocument;
     auto documentChanges = edits.documentChanges().value_or(QList<DocumentChange>());
+    const DocumentUri::PathMapper &pathMapper = client->hostPathMapper();
     if (!documentChanges.isEmpty()) {
         for (const DocumentChange &documentChange : std::as_const(documentChanges)) {
-            if (std::holds_alternative<TextDocumentEdit>(documentChange)) {
-                const TextDocumentEdit edit = std::get<TextDocumentEdit>(documentChange);
-                rangesInDocument[edit.textDocument().uri().toFilePath(pathMapper)] = convertEdits(
-                    edit.edits());
+            if (const auto edit = std::get_if<TextDocumentEdit>(&documentChange)) {
+                rangesInDocument[edit->textDocument().uri().toFilePath(pathMapper)] = convertEdits(
+                    edit->edits());
             } else {
                 Utils::SearchResultItem item;
 
-                if (std::holds_alternative<CreateFileOperation>(documentChange)) {
-                    auto op = std::get<CreateFileOperation>(documentChange);
-                    item.setLineText(op.message(pathMapper));
-                    item.setFilePath(op.uri().toFilePath(pathMapper));
-                    item.setUserData(QVariant(op));
-                } else if (std::holds_alternative<RenameFileOperation>(documentChange)) {
-                    auto op = std::get<RenameFileOperation>(documentChange);
-                    item.setLineText(op.message(pathMapper));
-                    item.setFilePath(op.oldUri().toFilePath(pathMapper));
-                    item.setUserData(QVariant(op));
-                } else if (std::holds_alternative<DeleteFileOperation>(documentChange)) {
-                    auto op = std::get<DeleteFileOperation>(documentChange);
-                    item.setLineText(op.message(pathMapper));
-                    item.setFilePath(op.uri().toFilePath(pathMapper));
-                    item.setUserData(QVariant(op));
+                if (const auto op = std::get_if<CreateFileOperation>(&documentChange)) {
+                    item.setLineText(op->message(pathMapper));
+                    item.setFilePath(op->uri().toFilePath(pathMapper));
+                    item.setUserData(QVariant(*op));
+                } else if (const auto op = std::get_if<RenameFileOperation>(&documentChange)) {
+                    item.setLineText(op->message(pathMapper));
+                    item.setFilePath(op->oldUri().toFilePath(pathMapper));
+                    item.setUserData(QVariant(*op));
+                } else if (const auto op = std::get_if<DeleteFileOperation>(&documentChange)) {
+                    item.setLineText(op->message(pathMapper));
+                    item.setFilePath(op->uri().toFilePath(pathMapper));
+                    item.setUserData(QVariant(*op));
                 }
 
                 items << item;
@@ -610,7 +609,7 @@ Utils::SearchResultItems generateReplaceItems(const WorkspaceEdit &edits,
             rangesInDocument[it.key().toFilePath(pathMapper)] = convertEdits(it.value());
     }
     filterFileAliases(rangesInDocument);
-    items += generateSearchResultItems(rangesInDocument, search, limitToProjects);
+    items += generateSearchResultItems(rangesInDocument, client, search, limitToProjects);
     return items;
 }
 
@@ -686,7 +685,7 @@ void SymbolSupport::handleRenameResponse(Core::SearchResult *search,
     const std::optional<WorkspaceEdit> &edits = response.result();
     if (edits.has_value()) {
         const Utils::SearchResultItems items = generateReplaceItems(
-            *edits, search, m_limitRenamingToProjects, m_client->hostPathMapper());
+            *edits, m_client, search, m_limitRenamingToProjects);
         search->addResults(items, Core::SearchResult::AddOrdered);
         if (m_renameResultsEnhancer) {
             Utils::SearchResultItems additionalItems = m_renameResultsEnhancer(items);
diff --git a/src/plugins/languageclient/languageclientutils.cpp b/src/plugins/languageclient/languageclientutils.cpp
index 3df7622548d..bd950004f91 100644
--- a/src/plugins/languageclient/languageclientutils.cpp
+++ b/src/plugins/languageclient/languageclientutils.cpp
@@ -97,8 +97,7 @@ bool applyTextEdits(const Client *client,
     if (edits.isEmpty())
         return true;
     const RefactoringFilePtr file = client->createRefactoringFile(filePath);
-    file->setChangeSet(editsToChangeSet(edits, file->document()));
-    return file->apply();
+    return file->apply(editsToChangeSet(edits, file->document()));
 }
 
 void applyTextEdit(TextDocumentManipulatorInterface &manipulator,
@@ -257,7 +256,7 @@ void updateEditorToolBar(Core::IEditor *editor)
             auto menu = new QMenu;
             auto clientsGroup = new QActionGroup(menu);
             clientsGroup->setExclusive(true);
-            for (auto client : LanguageClientManager::clientsSupportingDocument(document)) {
+            for (auto client : LanguageClientManager::clientsSupportingDocument(document, false)) {
                 auto action = clientsGroup->addAction(client->name());
                 auto reopen = [action, client = QPointer(client), document] {
                     if (!client)
@@ -267,6 +266,10 @@ void updateEditorToolBar(Core::IEditor *editor)
                 };
                 action->setCheckable(true);
                 action->setChecked(client == LanguageClientManager::clientForDocument(document));
+                action->setEnabled(client->reachable());
+                QObject::connect(client, &Client::stateChanged, action, [action, client] {
+                    action->setEnabled(client->reachable());
+                });
                 QObject::connect(action, &QAction::triggered, reopen);
             }
             menu->addActions(clientsGroup->actions());
@@ -349,13 +352,12 @@ bool applyDocumentChange(const Client *client, const DocumentChange &change)
     if (!client)
         return false;
 
-    if (std::holds_alternative<TextDocumentEdit>(change)) {
-        return applyTextDocumentEdit(client, std::get<TextDocumentEdit>(change));
-    } else if (std::holds_alternative<CreateFileOperation>(change)) {
-        const auto createOperation = std::get<CreateFileOperation>(change);
-        const FilePath filePath = createOperation.uri().toFilePath(client->hostPathMapper());
+    if (const auto e = std::get_if<TextDocumentEdit>(&change)) {
+        return applyTextDocumentEdit(client, *e);
+    } else if (const auto createOperation = std::get_if<CreateFileOperation>(&change)) {
+        const FilePath filePath = createOperation->uri().toFilePath(client->hostPathMapper());
         if (filePath.exists()) {
-            if (const std::optional<CreateFileOptions> options = createOperation.options()) {
+            if (const std::optional<CreateFileOptions> options = createOperation->options()) {
                 if (options->overwrite().value_or(false)) {
                     if (!filePath.removeFile())
                         return false;
@@ -365,16 +367,15 @@ bool applyDocumentChange(const Client *client, const DocumentChange &change)
             }
         }
         return filePath.ensureExistingFile();
-    } else if (std::holds_alternative<RenameFileOperation>(change)) {
-        const RenameFileOperation renameOperation = std::get<RenameFileOperation>(change);
-        const FilePath oldPath = renameOperation.oldUri().toFilePath(client->hostPathMapper());
+    } else if (const auto renameOperation = std::get_if<RenameFileOperation>(&change)) {
+        const FilePath oldPath = renameOperation->oldUri().toFilePath(client->hostPathMapper());
         if (!oldPath.exists())
             return false;
-        const FilePath newPath = renameOperation.newUri().toFilePath(client->hostPathMapper());
+        const FilePath newPath = renameOperation->newUri().toFilePath(client->hostPathMapper());
         if (oldPath == newPath)
             return true;
         if (newPath.exists()) {
-            if (const std::optional<CreateFileOptions> options = renameOperation.options()) {
+            if (const std::optional<CreateFileOptions> options = renameOperation->options()) {
                 if (options->overwrite().value_or(false)) {
                     if (!newPath.removeFile())
                         return false;
@@ -384,10 +385,9 @@ bool applyDocumentChange(const Client *client, const DocumentChange &change)
             }
         }
         return oldPath.renameFile(newPath);
-    } else if (std::holds_alternative<DeleteFileOperation>(change)) {
-        const auto deleteOperation = std::get<DeleteFileOperation>(change);
-        const FilePath filePath = deleteOperation.uri().toFilePath(client->hostPathMapper());
-        if (const std::optional<DeleteFileOptions> options = deleteOperation.options()) {
+    } else if (const auto deleteOperation = std::get_if<DeleteFileOperation>(&change)) {
+        const FilePath filePath = deleteOperation->uri().toFilePath(client->hostPathMapper());
+        if (const std::optional<DeleteFileOptions> options = deleteOperation->options()) {
             if (!filePath.exists())
                 return options->ignoreIfNotExists().value_or(false);
             if (filePath.isDir() && options->recursive().value_or(false))
diff --git a/src/plugins/languageclient/locatorfilter.cpp b/src/plugins/languageclient/locatorfilter.cpp
index ccebcd76799..4fb8cea19a2 100644
--- a/src/plugins/languageclient/locatorfilter.cpp
+++ b/src/plugins/languageclient/locatorfilter.cpp
@@ -8,8 +8,6 @@
 #include "languageclientmanager.h"
 #include "languageclienttr.h"
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/async.h>
 #include <utils/fuzzymatcher.h>
 
@@ -70,7 +68,6 @@ LocatorMatcherTask locatorMatcher(Client *client, int maxResultCount,
         const QList<SymbolInformation> results = *resultStorage;
         if (results.isEmpty())
             return SetupResult::StopWithSuccess;
-        async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
         async.setConcurrentCallData(filterResults, *storage, client, results, filter);
         return SetupResult::Continue;
     };
@@ -130,7 +127,6 @@ LocatorMatcherTask currentDocumentMatcher()
     };
 
     const auto onFilterSetup = [storage, resultStorage](Async<void> &async) {
-        async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
         async.setConcurrentCallData(filterCurrentResults, *storage, *resultStorage);
     };
 
diff --git a/src/plugins/languageclient/lualanguageclient/CMakeLists.txt b/src/plugins/languageclient/lualanguageclient/CMakeLists.txt
new file mode 100644
index 00000000000..3bccee08086
--- /dev/null
+++ b/src/plugins/languageclient/lualanguageclient/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_qtc_plugin(LuaLanguageClient
+  CONDITION TARGET Lua
+  PLUGIN_DEPENDS LanguageClient Lua
+  SOURCES
+    lualanguageclient.cpp
+)
diff --git a/src/plugins/languageclient/lualanguageclient/LuaLanguageClient.json.in b/src/plugins/languageclient/lualanguageclient/LuaLanguageClient.json.in
new file mode 100644
index 00000000000..0ac46c37638
--- /dev/null
+++ b/src/plugins/languageclient/lualanguageclient/LuaLanguageClient.json.in
@@ -0,0 +1,21 @@
+{
+    "Name" : "LuaLanguageClient",
+    "Version" : "${IDE_VERSION}",
+    "DisabledByDefault" : true,
+    "SoftLoadable" : true,
+    "CompatVersion" : "${IDE_VERSION_COMPAT}",
+    "Vendor" : "The Qt Company Ltd",
+    "Copyright" : "(C) ${IDE_COPYRIGHT_YEAR} The Qt Company Ltd",
+    "License" : [ "Commercial Usage",
+                  "",
+                  "Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt 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.",
+                  "",
+                  "GNU General Public License Usage",
+                  "",
+                  "Alternatively, this plugin 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 plugin. 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."
+    ],
+    "Category" : "Scripting",
+    "Description" : "Lua Language Client scripting support.",
+    "Url" : "https://www.qt.io",
+    ${IDE_PLUGIN_DEPENDENCIES}
+}
diff --git a/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp b/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp
new file mode 100644
index 00000000000..47b2f7599dc
--- /dev/null
+++ b/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp
@@ -0,0 +1,561 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include <coreplugin/editormanager/editormanager.h>
+
+#include <languageclient/languageclientinterface.h>
+#include <languageclient/languageclientmanager.h>
+#include <languageclient/languageclientsettings.h>
+#include <languageclient/languageclienttr.h>
+
+#include <lua/bindings/inheritance.h>
+#include <lua/luaengine.h>
+
+#include <extensionsystem/iplugin.h>
+#include <extensionsystem/pluginmanager.h>
+
+#include <projectexplorer/project.h>
+
+#include <utils/commandline.h>
+#include <utils/layoutbuilder.h>
+
+#include <QJsonDocument>
+
+using namespace Utils;
+using namespace Core;
+using namespace TextEditor;
+using namespace ProjectExplorer;
+
+namespace LanguageClient::Lua {
+
+static void registerLuaApi();
+
+class LuaClient : public LanguageClient::Client
+{
+    Q_OBJECT
+
+public:
+    Utils::Id m_settingsId;
+
+    LuaClient(BaseClientInterface *interface, Utils::Id settingsId)
+        : LanguageClient::Client(interface)
+        , m_settingsId(settingsId)
+    {}
+};
+
+class LuaLanguageClientPlugin final : public ExtensionSystem::IPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "LuaLanguageClient.json")
+
+public:
+    LuaLanguageClientPlugin() {}
+
+private:
+    void initialize() final { registerLuaApi(); }
+};
+
+class LuaLocalSocketClientInterface : public LocalSocketClientInterface
+{
+public:
+    LuaLocalSocketClientInterface(const CommandLine &cmd, const QString &serverName)
+        : LocalSocketClientInterface(serverName)
+        , m_cmd(cmd)
+        , m_logFile("lua-lspclient.XXXXXX.log")
+
+    {}
+
+    void startImpl() override
+    {
+        if (m_process) {
+            QTC_CHECK(!m_process->isRunning());
+            delete m_process;
+        }
+        m_process = new Process;
+        m_process->setProcessMode(ProcessMode::Writer);
+        connect(m_process,
+                &Process::readyReadStandardError,
+                this,
+                &LuaLocalSocketClientInterface::readError);
+        connect(m_process,
+                &Process::readyReadStandardOutput,
+                this,
+                &LuaLocalSocketClientInterface::readOutput);
+        connect(m_process, &Process::started, this, [this]() {
+            this->LocalSocketClientInterface::startImpl();
+            emit started();
+        });
+        connect(m_process, &Process::done, this, [this] {
+            if (m_process->result() != ProcessResult::FinishedWithSuccess)
+                emit error(QString("%1 (see logs in \"%2\")")
+                               .arg(m_process->exitMessage())
+                               .arg(m_logFile.fileName()));
+            emit finished();
+        });
+        m_logFile.write(
+            QString("Starting server: %1\nOutput:\n\n").arg(m_cmd.toUserOutput()).toUtf8());
+        m_process->setCommand(m_cmd);
+        m_process->setWorkingDirectory(m_workingDirectory);
+        if (m_env.hasChanges())
+            m_process->setEnvironment(m_env);
+        m_process->start();
+    }
+
+    void setWorkingDirectory(const FilePath &workingDirectory)
+    {
+        m_workingDirectory = workingDirectory;
+    }
+
+    FilePath serverDeviceTemplate() const override { return m_cmd.executable(); }
+
+    void readError()
+    {
+        QTC_ASSERT(m_process, return);
+
+        const QByteArray stdErr = m_process->readAllRawStandardError();
+        m_logFile.write(stdErr);
+    }
+
+    void readOutput()
+    {
+        QTC_ASSERT(m_process, return);
+        const QByteArray &out = m_process->readAllRawStandardOutput();
+        parseData(out);
+    }
+
+private:
+    Utils::CommandLine m_cmd;
+    Utils::FilePath m_workingDirectory;
+    Utils::Process *m_process = nullptr;
+    Utils::Environment m_env;
+    QTemporaryFile m_logFile;
+};
+
+class LuaClientWrapper;
+
+class LuaClientSettings : public BaseSettings
+{
+    std::weak_ptr<LuaClientWrapper> m_wrapper;
+
+public:
+    LuaClientSettings(const std::weak_ptr<LuaClientWrapper> &wrapper);
+    ~LuaClientSettings() override = default;
+
+    bool applyFromSettingsWidget(QWidget *widget) override;
+
+    Utils::Store toMap() const override;
+    void fromMap(const Utils::Store &map) override;
+
+    QWidget *createSettingsWidget(QWidget *parent = nullptr) const override;
+
+    BaseSettings *copy() const override { return new LuaClientSettings(*this); }
+
+protected:
+    Client *createClient(BaseClientInterface *interface) const final;
+
+    BaseClientInterface *createInterface(ProjectExplorer::Project *project) const override;
+};
+enum class TransportType { StdIO, LocalSocket };
+
+class LuaClientWrapper : public QObject
+{
+public:
+    TransportType m_transportType{TransportType::StdIO};
+    std::function<expected_str<void>(CommandLine &)> m_cmdLineCallback;
+    AspectContainer *m_aspects{nullptr};
+    QString m_name;
+    Utils::Id m_settingsTypeId;
+    QString m_initializationOptions;
+    CommandLine m_cmdLine;
+    QString m_serverName;
+    LanguageFilter m_languageFilter;
+    BaseSettings::StartBehavior m_startBehavior = BaseSettings::RequiresFile;
+
+    std::optional<sol::protected_function> m_onInstanceStart;
+    std::optional<sol::protected_function> m_startFailedCallback;
+    QMap<QString, sol::protected_function> m_messageCallbacks;
+
+    LuaClientSettings *m_settings{nullptr};
+
+public:
+    static BaseSettings::StartBehavior startBehaviorFromString(const QString &str)
+    {
+        if (str == "RequiresProject")
+            return BaseSettings::RequiresProject;
+        if (str == "RequiresFile")
+            return BaseSettings::RequiresFile;
+        if (str == "AlwaysOn")
+            return BaseSettings::AlwaysOn;
+
+        throw sol::error("Unknown start behavior: " + str.toStdString());
+    }
+
+    void setSettings(LuaClientSettings *settings) { m_settings = settings; }
+
+    LuaClientWrapper(const sol::table &options)
+    {
+        m_cmdLineCallback = addValue<CommandLine>(
+            options,
+            "cmd",
+            m_cmdLine,
+            [](const sol::protected_function_result &res) -> expected_str<CommandLine> {
+                if (res.get_type(0) != sol::type::table)
+                    return make_unexpected(QString("cmd callback did not return a table"));
+                return cmdFromTable(res.get<sol::table>());
+            });
+
+        m_name = options.get<QString>("name");
+        m_settingsTypeId = Utils::Id::fromString(QString("Lua_%1").arg(m_name));
+        m_serverName = options.get_or<QString>("serverName", "");
+
+        m_startBehavior = startBehaviorFromString(
+            options.get_or<QString>("startBehavior", "AlwaysOn"));
+
+        m_startFailedCallback = options.get<sol::protected_function>("onStartFailed");
+
+        QString transportType = options.get_or<QString>("transport", "stdio");
+        if (transportType == "stdio")
+            m_transportType = TransportType::StdIO;
+        else if (transportType == "localsocket")
+            m_transportType = TransportType::LocalSocket;
+        else
+            qWarning() << "Unknown transport type:" << transportType;
+
+        auto languageFilter = options.get<std::optional<sol::table>>("languageFilter");
+        if (languageFilter) {
+            auto patterns = languageFilter->get<std::optional<sol::table>>("patterns");
+            auto mimeTypes = languageFilter->get<std::optional<sol::table>>("mimeTypes");
+
+            if (patterns)
+                for (auto [_, v] : *patterns)
+                    m_languageFilter.filePattern.push_back(v.as<QString>());
+
+            if (mimeTypes)
+                for (auto [_, v] : *mimeTypes)
+                    m_languageFilter.mimeTypes.push_back(v.as<QString>());
+        }
+
+        auto initOptionsTable = options.get<sol::optional<sol::table>>("initializationOptions");
+        if (initOptionsTable) {
+            QJsonValue json = ::Lua::LuaEngine::toJson(*initOptionsTable);
+            QJsonDocument doc;
+            if (json.isArray()) {
+                doc.setArray(json.toArray());
+                m_initializationOptions = QString::fromUtf8(doc.toJson());
+            } else if (json.isObject()) {
+                doc.setObject(json.toObject());
+                m_initializationOptions = QString::fromUtf8(doc.toJson());
+            }
+        }
+        auto initOptionsString = options.get<sol::optional<QString>>("initializationOptions");
+        if (initOptionsString)
+            m_initializationOptions = *initOptionsString;
+
+        // get<sol::optional<>> because on MSVC, get_or(..., nullptr) fails to compile
+        m_aspects = options.get<sol::optional<AspectContainer *>>("settings").value_or(nullptr);
+
+        if (m_aspects) {
+            connect(m_aspects, &AspectContainer::applied, this, [this] {
+                updateOptions();
+                LanguageClientManager::applySettings();
+            });
+        }
+
+        connect(
+            LanguageClientManager::instance(),
+            &LanguageClientManager::clientInitialized,
+            this,
+            [this](Client *c) {
+                auto luaClient = qobject_cast<LuaClient *>(c);
+                if (luaClient && luaClient->m_settingsId == m_settingsTypeId && m_onInstanceStart) {
+                    QTC_CHECK(::Lua::LuaEngine::void_safe_call(*m_onInstanceStart, c));
+                    updateMessageCallbacks();
+                }
+            });
+
+        connect(
+            LanguageClientManager::instance(),
+            &LanguageClientManager::clientRemoved,
+            this,
+            &LuaClientWrapper::onClientRemoved);
+    }
+
+    void onClientRemoved(Client *c, bool unexpected)
+    {
+        auto luaClient = qobject_cast<LuaClient *>(c);
+        if (!luaClient || luaClient->m_settingsId != m_settingsTypeId)
+            return;
+
+        if (unexpected && m_startFailedCallback) {
+            QTC_CHECK_EXPECTED(::Lua::LuaEngine::void_safe_call(*m_startFailedCallback));
+        }
+    }
+
+    TransportType transportType() { return m_transportType; }
+
+    void applySettings()
+    {
+        if (m_aspects)
+            m_aspects->apply();
+
+        updateOptions();
+    }
+
+    void fromMap(const Utils::Store &map)
+    {
+        if (m_aspects)
+            m_aspects->fromMap(map);
+        updateOptions();
+    }
+
+    void toMap(Utils::Store &map) const
+    {
+        if (m_aspects)
+            m_aspects->toMap(map);
+    }
+
+    Layouting::LayoutModifier settingsLayout()
+    {
+        if (m_aspects)
+            return [this](Layouting::Layout *iface) { m_aspects->addToLayout(*iface); };
+        return {};
+    }
+
+    void registerMessageCallback(const QString &msg, const sol::function &callback)
+    {
+        m_messageCallbacks.insert(msg, callback);
+        updateMessageCallbacks();
+    }
+
+    void updateMessageCallbacks()
+    {
+        for (Client *c : LanguageClientManager::clientsForSetting(m_settings)) {
+            if (!c)
+                continue;
+            for (const auto &[msg, func] : m_messageCallbacks.asKeyValueRange()) {
+                c->registerCustomMethod(
+                    msg,
+                    [self = QPointer<LuaClientWrapper>(this),
+                     name = msg](const LanguageServerProtocol::JsonRpcMessage &m) {
+                        if (!self)
+                            return;
+
+                        auto func = self->m_messageCallbacks.value(name);
+                        auto table = ::Lua::LuaEngine::toTable(func.lua_state(), m.toJsonObject());
+                        auto result = func.call(table);
+                        if (!result.valid()) {
+                            qWarning() << "Error calling message callback for:" << name << ":"
+                                       << (result.get<sol::error>().what());
+                        }
+                    });
+            }
+        }
+    }
+
+    void sendMessage(const sol::table &message)
+    {
+        const QJsonValue messageValue = ::Lua::LuaEngine::toJson(message);
+        if (!messageValue.isObject())
+            throw sol::error("Message is not an object");
+        const LanguageServerProtocol::JsonRpcMessage jsonrpcmessage(messageValue.toObject());
+        for (Client *c : LanguageClientManager::clientsForSetting(m_settings)) {
+            if (c)
+                c->sendMessage(jsonrpcmessage);
+        }
+    }
+
+    void updateOptions()
+    {
+        if (m_cmdLineCallback) {
+            auto result = m_cmdLineCallback(m_cmdLine);
+            if (!result)
+                qWarning() << "Error applying option callback:" << result.error();
+        }
+    }
+
+    static CommandLine cmdFromTable(const sol::table &tbl)
+    {
+        CommandLine cmdLine;
+        cmdLine.setExecutable(FilePath::fromUserInput(tbl.get<QString>(1)));
+
+        for (size_t i = 2; i < tbl.size() + 1; i++)
+            cmdLine.addArg(tbl.get<QString>(i));
+
+        return cmdLine;
+    }
+
+    template<typename T>
+    std::function<expected_str<void>(T &)> addValue(
+        const sol::table &options,
+        const char *fieldName,
+        T &dest,
+        std::function<expected_str<T>(const sol::protected_function_result &)> transform)
+    {
+        auto fixed = options.get<sol::optional<sol::table>>(fieldName);
+        auto cb = options.get<sol::optional<sol::protected_function>>(fieldName);
+
+        if (fixed) {
+            dest = fixed.value().get<T>(1);
+        } else if (cb) {
+            std::function<expected_str<void>(T &)> callback =
+                [cb, transform](T &dest) -> expected_str<void> {
+                auto res = cb.value().call();
+                if (!res.valid()) {
+                    sol::error err = res;
+                    return Utils::make_unexpected(QString::fromLocal8Bit(err.what()));
+                }
+
+                expected_str<T> trResult = transform(res);
+                if (!trResult)
+                    return make_unexpected(trResult.error());
+
+                dest = *trResult;
+                return {};
+            };
+
+            QTC_CHECK_EXPECTED(callback(dest));
+            return callback;
+        }
+        return {};
+    }
+
+    BaseClientInterface *createInterface(ProjectExplorer::Project *project)
+    {
+        if (m_transportType == TransportType::StdIO) {
+            auto interface = new StdIOClientInterface;
+            interface->setCommandLine(m_cmdLine);
+            if (project)
+                interface->setWorkingDirectory(project->projectDirectory());
+            return interface;
+        } else if (m_transportType == TransportType::LocalSocket) {
+            if (m_serverName.isEmpty())
+                return nullptr;
+
+            auto interface = new LuaLocalSocketClientInterface(m_cmdLine, m_serverName);
+            if (project)
+                interface->setWorkingDirectory(project->projectDirectory());
+            return interface;
+        }
+        return nullptr;
+    }
+};
+
+LuaClientSettings::LuaClientSettings(const std::weak_ptr<LuaClientWrapper> &wrapper)
+    : m_wrapper(wrapper)
+{
+    if (auto w = m_wrapper.lock()) {
+        m_name = w->m_name;
+        m_settingsTypeId = w->m_settingsTypeId;
+        m_languageFilter = w->m_languageFilter;
+        m_initializationOptions = w->m_initializationOptions;
+        m_startBehavior = w->m_startBehavior;
+    }
+}
+
+bool LuaClientSettings::applyFromSettingsWidget(QWidget *widget)
+{
+    BaseSettings::applyFromSettingsWidget(widget);
+
+    if (auto w = m_wrapper.lock())
+        w->applySettings();
+
+    return true;
+}
+
+Utils::Store LuaClientSettings::toMap() const
+{
+    auto store = BaseSettings::toMap();
+    if (auto w = m_wrapper.lock())
+        w->toMap(store);
+    return store;
+}
+
+void LuaClientSettings::fromMap(const Utils::Store &map)
+{
+    BaseSettings::fromMap(map);
+    if (auto w = m_wrapper.lock()) {
+        w->m_name = m_name;
+        w->m_initializationOptions = m_initializationOptions;
+        w->m_languageFilter = m_languageFilter;
+        w->m_startBehavior = m_startBehavior;
+        w->fromMap(map);
+    }
+}
+
+QWidget *LuaClientSettings::createSettingsWidget(QWidget *parent) const
+{
+    using namespace Layouting;
+
+    if (auto w = m_wrapper.lock())
+        return new BaseSettingsWidget(this, parent, w->settingsLayout());
+
+    return new BaseSettingsWidget(this, parent);
+}
+
+Client *LuaClientSettings::createClient(BaseClientInterface *interface) const
+{
+    Client *client = new LuaClient(interface, m_settingsTypeId);
+    return client;
+}
+
+BaseClientInterface *LuaClientSettings::createInterface(ProjectExplorer::Project *project) const
+{
+    if (auto w = m_wrapper.lock())
+        return w->createInterface(project);
+
+    return nullptr;
+}
+
+static void registerLuaApi()
+{
+    ::Lua::LuaEngine::registerProvider("LSP", [](sol::state_view lua) -> sol::object {
+        sol::table result = lua.create_table();
+
+        auto wrapperClass = result.new_usertype<LuaClientWrapper>(
+            "Client",
+            "on_instance_start",
+            sol::property(
+                [](const LuaClientWrapper *c) -> sol::function {
+                    if (!c->m_onInstanceStart)
+                        return sol::lua_nil;
+                    return c->m_onInstanceStart.value();
+                },
+                [](LuaClientWrapper *c, const sol::function &f) { c->m_onInstanceStart = f; }),
+            "registerMessage",
+            &LuaClientWrapper::registerMessageCallback,
+            "sendMessage",
+            &LuaClientWrapper::sendMessage,
+            "create",
+            [](const sol::table &options) -> std::shared_ptr<LuaClientWrapper> {
+                auto luaClient = std::make_shared<LuaClientWrapper>(options);
+                auto client = new LuaClientSettings(luaClient);
+                luaClient->setSettings(client);
+
+                // The order is important!
+                // First restore the settings ...
+                const QList<Utils::Store> savedSettings
+                    = LanguageClientSettings::storesBySettingsType(luaClient->m_settingsTypeId);
+
+                if (!savedSettings.isEmpty())
+                    client->fromMap(savedSettings.first());
+
+                // ... then register the settings.
+                LanguageClientManager::registerClientSettings(client);
+
+                // and the client type.
+                ClientType type;
+                type.id = client->m_settingsTypeId;
+                type.name = luaClient->m_name;
+                type.userAddable = false;
+                LanguageClientSettings::registerClientType(type);
+
+                return luaClient;
+            });
+
+        return result;
+    });
+}
+
+} // namespace LanguageClient::Lua
+
+#include "lualanguageclient.moc"
diff --git a/src/plugins/languageclient/lualanguageclient/lualanguageclient.qbs b/src/plugins/languageclient/lualanguageclient/lualanguageclient.qbs
new file mode 100644
index 00000000000..88fc8ef6a8a
--- /dev/null
+++ b/src/plugins/languageclient/lualanguageclient/lualanguageclient.qbs
@@ -0,0 +1,14 @@
+QtcPlugin {
+    name: "LuaLanguageClient"
+
+    Depends { name: "Core" }
+    Depends { name: "LanguageClient" }
+    Depends { name: "Lua" }
+    Depends { name: "ProjectExplorer" }
+    Depends { name: "TextEditor" }
+    Depends { name: "Utils" }
+
+    files: [
+        "lualanguageclient.cpp",
+    ]
+}
diff --git a/src/plugins/languageclient/progressmanager.cpp b/src/plugins/languageclient/progressmanager.cpp
index 6b82d289dfc..4ef7d0b60d5 100644
--- a/src/plugins/languageclient/progressmanager.cpp
+++ b/src/plugins/languageclient/progressmanager.cpp
@@ -69,10 +69,10 @@ bool ProgressManager::isProgressEndMessage(const LanguageServerProtocol::Progres
 Utils::Id languageClientProgressId(const ProgressToken &token)
 {
     constexpr char k_LanguageClientProgressId[] = "LanguageClient.ProgressId.";
-    auto toString = [](const ProgressToken &token){
-        if (std::holds_alternative<int>(token))
-            return QString::number(std::get<int>(token));
-        return std::get<QString>(token);
+    auto toString = [](const ProgressToken &token) {
+        if (const auto i = std::get_if<int>(&token))
+            return QString::number(*i);
+        return *std::get_if<QString>(&token);
     };
     return Utils::Id(k_LanguageClientProgressId).withSuffix(toString(token));
 }
diff --git a/src/plugins/languageclient/semantichighlightsupport.cpp b/src/plugins/languageclient/semantichighlightsupport.cpp
index b7434de18e0..431d84279df 100644
--- a/src/plugins/languageclient/semantichighlightsupport.cpp
+++ b/src/plugins/languageclient/semantichighlightsupport.cpp
@@ -10,7 +10,7 @@
 #include <texteditor/syntaxhighlighter.h>
 #include <texteditor/texteditor.h>
 #include <texteditor/texteditorsettings.h>
-#include <texteditor/syntaxhighlighterrunner.h>
+#include <texteditor/syntaxhighlighter.h>
 #include <utils/algorithm.h>
 #include <utils/mimeutils.h>
 
@@ -183,7 +183,7 @@ void SemanticTokenSupport::queueDocumentReload(TextEditor::TextDocument *doc)
 void SemanticTokenSupport::clearHighlight(TextEditor::TextDocument *doc)
 {
     if (m_tokens.contains(doc->filePath())){
-        if (TextEditor::SyntaxHighlighterRunner *highlighter = doc->syntaxHighlighterRunner())
+        if (TextEditor::SyntaxHighlighter *highlighter = doc->syntaxHighlighter())
             highlighter->clearAllExtraFormats();
     }
 }
@@ -413,7 +413,7 @@ void SemanticTokenSupport::highlight(const Utils::FilePath &filePath, bool force
     TextDocument *doc = TextDocument::textDocumentForFilePath(filePath);
     if (!doc || LanguageClientManager::clientForDocument(doc) != m_client)
         return;
-    SyntaxHighlighterRunner *highlighter = doc->syntaxHighlighterRunner();
+    SyntaxHighlighter *highlighter = doc->syntaxHighlighter();
     if (!highlighter)
         return;
     const VersionedTokens versionedTokens = m_tokens.value(filePath);
diff --git a/src/plugins/languageclient/snippet.cpp b/src/plugins/languageclient/snippet.cpp
index 7a0fd211316..b401123ef86 100644
--- a/src/plugins/languageclient/snippet.cpp
+++ b/src/plugins/languageclient/snippet.cpp
@@ -251,11 +251,11 @@ void SnippetParsingTest::testSnippetParsing()
     QFETCH(Parts, parts);
 
     SnippetParseResult result = LanguageClient::parseSnippet(input);
-    QCOMPARE(std::holds_alternative<ParsedSnippet>(result), success);
+    const auto snippet = std::get_if<ParsedSnippet>(&result);
+    QCOMPARE(snippet != nullptr, success);
     if (!success)
         return;
 
-    ParsedSnippet snippet = std::get<ParsedSnippet>(result);
 
     auto rangesCompare = [&](const ParsedSnippet::Part &actual, const SnippetPart &expected) {
         QCOMPARE(actual.text, expected.text);
@@ -264,10 +264,10 @@ void SnippetParsingTest::testSnippetParsing()
         QCOMPARE(manglerId, expected.manglerId);
     };
 
-    QCOMPARE(snippet.parts.count(), parts.count());
+    QCOMPARE(snippet->parts.count(), parts.count());
 
     for (int i = 0; i < parts.count(); ++i)
-        rangesCompare(snippet.parts.at(i), parts.at(i));
+        rangesCompare(snippet->parts.at(i), parts.at(i));
 }
 
 QObject *createSnippetParsingTest()
diff --git a/src/plugins/lua/CMakeLists.txt b/src/plugins/lua/CMakeLists.txt
new file mode 100644
index 00000000000..8a3bb96dc11
--- /dev/null
+++ b/src/plugins/lua/CMakeLists.txt
@@ -0,0 +1,85 @@
+
+add_qtc_plugin(Lua
+  PLUGIN_DEPENDS Core
+  PUBLIC_DEPENDS lua546 sol2
+  PUBLIC_DEFINES LUA_AVAILABLE
+  SOURCES
+    wizards/wizards.qrc
+    bindings/action.cpp
+    bindings/async.cpp
+    bindings/core.cpp
+    bindings/fetch.cpp
+    bindings/gui.cpp
+    bindings/hook.cpp
+    bindings/inheritance.h
+    bindings/install.cpp
+    bindings/messagemanager.cpp
+    bindings/qtcprocess.cpp
+    bindings/settings.cpp
+    bindings/utils.cpp
+    luaengine.cpp
+    luaengine.h
+    luaplugin.cpp
+    luapluginspec.cpp
+    luapluginspec.h
+    luaqttypes.cpp
+    luaqttypes.h
+    luatr.h
+    meta/action.lua
+    meta/async.lua
+    meta/core.lua
+    meta/fetch.lua
+    meta/gui.lua
+    meta/install.lua
+    meta/lsp.lua
+    meta/messagemanager.lua
+    meta/process.lua
+    meta/qt.lua
+    meta/qtc.lua
+    meta/settings.lua
+    meta/simpletypes.lua
+    meta/utils.lua
+    meta/widgets.lua
+    # generateqtbindings.cpp # Use this if you need to generate some code.
+)
+
+qt_add_resources(Lua lua_images_rcc
+  PREFIX "/lua"
+  FILES
+    images/settingscategory_lua.png
+    images/settingscategory_lua@2x.png
+)
+
+set_source_files_properties(luauibindings.cpp PROPERTY SKIP_AUTOMOC ON PROPERTY SKIP_AUTOGEN ON)
+
+if (MSVC)
+    # Prevent fatal error C1128
+    set_property(SOURCE bindings/settings.cpp PROPERTY COMPILE_FLAGS /bigobj)
+endif()
+
+set(META_FILES
+  meta/action.lua
+  meta/async.lua
+  meta/core.lua
+  meta/fetch.lua
+  meta/gui.lua
+  meta/lsp.lua
+  meta/messagemanager.lua
+  meta/process.lua
+  meta/qt.lua
+  meta/qtc.lua
+  meta/settings.lua
+  meta/simpletypes.lua
+  meta/utils.lua
+  meta/widgets.lua
+)
+
+qtc_copy_to_builddir(copy_lua_meta_files
+  DESTINATION ${IDE_DATA_PATH}/lua
+  FILES ${META_FILES}
+)
+
+install(
+  FILES ${META_FILES}
+  DESTINATION ${IDE_DATA_PATH}/lua/meta
+)
diff --git a/src/plugins/lua/Lua.json.in b/src/plugins/lua/Lua.json.in
new file mode 100644
index 00000000000..68b54fd1add
--- /dev/null
+++ b/src/plugins/lua/Lua.json.in
@@ -0,0 +1,29 @@
+{
+    "Name" : "Lua",
+    "Version" : "${IDE_VERSION}",
+    "CompatVersion" : "${IDE_VERSION_COMPAT}",
+    "DisabledByDefault" : true,
+    "SoftLoadable" : true,
+    "Vendor" : "The Qt Company Ltd",
+    "Copyright" : "(C) ${IDE_COPYRIGHT_YEAR} The Qt Company Ltd",
+    "License" : [ "Commercial Usage",
+                  "",
+                  "Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt 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.",
+                  "",
+                  "GNU General Public License Usage",
+                  "",
+                  "Alternatively, this plugin 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 plugin. 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."
+    ],
+    "Category" : "Scripting",
+    "Description" : "Support for Lua based plugins.",
+    "Url" : "https://www.qt.io",
+    "JsonWizardPaths" : [":/lua/wizards"],
+    "Arguments" : [
+        {
+            "Name" : "-loadluaplugin",
+            "Parameter" : "path",
+            "Description" : "Load an additional lua plugin from the specified path"
+        }
+    ],
+    ${IDE_PLUGIN_DEPENDENCIES}
+}
diff --git a/src/plugins/lua/README.md b/src/plugins/lua/README.md
new file mode 100644
index 00000000000..2607d47f182
--- /dev/null
+++ b/src/plugins/lua/README.md
@@ -0,0 +1,115 @@
+# Lua Plugin
+
+## Introduction
+
+The Lua plugin provides support for writing plugins using the Lua scripting language.
+
+## Usage
+
+The plugin scans the normal plugin folders of Qt Creator
+`ExtensionSystem::PluginManager::pluginPaths()`. It loads scripts from any folder that contains
+a .lua script named the same as the folder.
+Whether or not the script is enabled is determined by the `disabledByDefault` field in the plugin
+table and the settings configured via the "About Plugins" dialog in Qt Creator.
+
+## Basic Lua plugin
+
+A Lua script needs to provide the following table to be considered a plugin:
+
+```lua
+-- myluaplugin/myluaplugin.lua
+return {
+    name = "MyLuaPlugin",
+    version = "1.0.0",
+    compatVersion = "1.0.0",
+    vendor = "The Qt Company",
+    category = "Language Client",
+    setup = function() print("Hello World!") end,
+
+    --- The following fields are optional
+    description = "My first lua plugin",
+    longDescription = [[
+A long description.
+Can contain newlines.
+    ]],
+    url = "https://www.qt.io",
+    license = "MIT",
+    revision = "rev1",
+    copyright = "2024",
+    experimental = true,
+    disabledByDefault = false,
+
+    dependencies = {
+        { name="Core", version = "14.0.0" }
+    },
+} --[[@as QtcPlugin]]
+```
+
+Your base file needs to be named the same as the folder its contained in.
+It must only return the plugin specification table and not execute or require any other code.
+Use `require` to load other files from within the setup function.
+
+```lua
+-- myluaplugin/myluaplugin.lua
+return {
+    -- ... required fields omitted ..
+    setup = function() require 'init'.setup() end,
+} --[[@as QtcPlugin]]
+
+-- myluaplugin/init.lua
+local function setup()
+    print("Hello from Lua!")
+end
+
+return {
+    setup = setup,
+}
+```
+
+The `require` function will search for files as such:
+
+```
+my-lua-plugin/?.lua
+```
+
+## Lua <=> C++ bindings
+
+The Lua plugin provides the [sol2](https://github.com/ThePhD/sol2) library to bind C++ code to Lua.
+sol2 is well [documented here](https://sol2.rtfd.io).
+
+## Lua Language Server
+
+To make developing plugins easier, we provide a meta file [qtc.lua](meta/qtc.lua) that describes
+what functions and classes are available in the Lua plugin. If you add bindings yourself
+please add them to this file. The [.luarc.json](../../.luarc.json) file contains the configuration
+for the [Lua Language Server](https://luals.github.io/) and will automatically load the `qtc.lua` file.
+
+## Coroutines
+
+A lot of Qt Creator functions will take some time to complete. To not block the main thread during
+that time, we make heavy use of lua coroutines. Functions that need a coroutine to work are documented
+as such, lets take for example `qtc.waitms(ms)`. This function will wait for `ms` milliseconds and
+then return. To use it you need to call it using the async module from a running coroutine:
+
+```lua
+local a = require 'async'
+local function myFunction()
+    a.wait(qtc.waitms(1000))
+    print("Hello from Lua!")
+end
+
+local function setup()
+    a.sync(myFunction)()
+end
+```
+
+The waitms function will immediately yield, which will suspend the execution of `myFunction` **AND**
+make the `a.sync(myFunction)()` return.
+
+Once the internal timer is triggered, the C++ code will resume `myFunction` and it will continue to
+print the message. `myFunction` will then return and the coroutine will be "dead", meaning it cannot
+be resumed again. You can of course create a new coroutine and call `myFunction` again.
+
+## Contributing
+
+Contributions to the Lua plugin are welcome. Please read the contributing guide for more information.
diff --git a/src/plugins/lua/bindings/ASYNC-LICENSE.txt b/src/plugins/lua/bindings/ASYNC-LICENSE.txt
new file mode 100644
index 00000000000..609bb2e52b1
--- /dev/null
+++ b/src/plugins/lua/bindings/ASYNC-LICENSE.txt
@@ -0,0 +1,22 @@
+
+MIT License
+
+Copyright (c) 2020 whocares
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/src/plugins/lua/bindings/action.cpp b/src/plugins/lua/bindings/action.cpp
new file mode 100644
index 00000000000..c8052a785f4
--- /dev/null
+++ b/src/plugins/lua/bindings/action.cpp
@@ -0,0 +1,69 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "../luaengine.h"
+
+#include <coreplugin/actionmanager/actionmanager.h>
+
+using namespace Utils;
+
+namespace Lua::Internal {
+
+void addActionModule()
+{
+    LuaEngine::registerProvider("Action", [](sol::state_view lua) -> sol::object {
+        sol::table result = lua.create_table();
+
+        result.new_enum("CommandAttribute",
+                        "CA_Hide",
+                        Core::Command::CA_Hide,
+                        "CA_UpdateText",
+                        Core::Command::CA_UpdateText,
+                        "CA_UpdateIcon",
+                        Core::Command::CA_UpdateIcon,
+                        "CA_NonConfigurable",
+                        Core::Command::CA_NonConfigurable);
+
+        result["create"] = [parent = std::make_unique<QObject>()](
+                               const std::string &actionId, const sol::table &options) mutable {
+            Core::ActionBuilder b(parent.get(), Id::fromString(QString::fromStdString(actionId)));
+
+            for (const auto &[k, v] : options) {
+                QString key = k.as<QString>();
+
+                if (key == "context")
+                    b.setContext(Id::fromString(v.as<QString>()));
+                else if (key == "onTrigger")
+                    b.addOnTriggered([f = v.as<sol::function>()]() {
+                        auto res = Lua::LuaEngine::void_safe_call(f);
+                        QTC_CHECK_EXPECTED(res);
+                    });
+                else if (key == "text")
+                    b.setText(v.as<QString>());
+                else if (key == "iconText")
+                    b.setIconText(v.as<QString>());
+                else if (key == "toolTip")
+                    b.setToolTip(v.as<QString>());
+                else if (key == "commandAttributes")
+                    b.setCommandAttribute((Core::Command::CommandAttribute) v.as<int>());
+                else if (key == "commandDescription")
+                    b.setCommandDescription(v.as<QString>());
+                else if (key == "defaultKeySequence")
+                    b.setDefaultKeySequence(QKeySequence(v.as<QString>()));
+                else if (key == "defaultKeySequences") {
+                    sol::table t = v.as<sol::table>();
+                    QList<QKeySequence> sequences;
+                    sequences.reserve(t.size());
+                    for (const auto &[_, v] : t)
+                        sequences.push_back(QKeySequence(v.as<QString>()));
+                    b.setDefaultKeySequences(sequences);
+                } else
+                    throw std::runtime_error("Unknown key: " + key.toStdString());
+            }
+        };
+
+        return result;
+    });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/bindings/async.cpp b/src/plugins/lua/bindings/async.cpp
new file mode 100644
index 00000000000..8d7d4f47501
--- /dev/null
+++ b/src/plugins/lua/bindings/async.cpp
@@ -0,0 +1,99 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "../luaengine.h"
+
+namespace Lua::Internal {
+
+static const char *async_source = R"(
+-- From: https://github.com/ms-jpq/lua-async-await
+-- Licensed under MIT
+local co = coroutine
+-- use with wrap
+local pong = function(func, callback)
+    assert(type(func) == "function", "type error :: expected func")
+    local thread = co.create(func)
+    local step = nil
+    step = function(...)
+        local stat, ret = co.resume(thread, ...)
+        if not stat then
+            print(ret)
+            print(debug.traceback(thread))
+        end
+        assert(stat, ret)
+        if co.status(thread) == "dead" then
+            (callback or function() end)(ret)
+        else
+            assert(type(ret) == "function", "type error :: expected func")
+            ret(step)
+        end
+    end
+    step()
+end
+-- use with pong, creates thunk factory
+local wrap = function(func)
+    assert(type(func) == "function", "type error :: expected func")
+    local factory = function(...)
+        local params = { ... }
+        local thunk = function(step)
+            table.insert(params, step)
+            return func(table.unpack(params))
+        end
+        return thunk
+    end
+    return factory
+end
+-- many thunks -> single thunk
+local join = function(thunks)
+    local len = #thunks
+    local done = 0
+    local acc = {}
+
+    local thunk = function(step)
+        if len == 0 then
+            return step()
+        end
+        for i, tk in ipairs(thunks) do
+            assert(type(tk) == "function", "thunk must be function")
+            local callback = function(...)
+                acc[i] = ...
+                done = done + 1
+                if done == len then
+                    step(acc)
+                end
+            end
+            tk(callback)
+        end
+    end
+    return thunk
+end
+-- sugar over coroutine
+local await = function(defer)
+    local _, isMain = coroutine.running()
+    assert(not isMain, "a.wait was called outside of a running coroutine. You need to start one using a.sync(my_function)() first")
+    assert(type(defer) == "function", "type error :: expected func :: was: " .. type(defer))
+    return co.yield(defer)
+end
+local await_all = function(defer)
+    local _, isMain = coroutine.running()
+    assert(not isMain, "a.wait_all was called outside of a running coroutine. You need to start one using a.sync(my_function)() first")
+    assert(type(defer) == "table", "type error :: expected table")
+    return co.yield(join(defer))
+end
+return {
+    sync = wrap(pong),
+    wait = await,
+    wait_all = await_all,
+    wrap = wrap,
+}
+)";
+
+void addAsyncModule()
+{
+    LuaEngine::registerProvider("async", [](sol::state_view lua) -> sol::object {
+        sol::protected_function_result res = lua.script(async_source, "async.cpp");
+        return res.get<sol::table>(0);
+    });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/bindings/core.cpp b/src/plugins/lua/bindings/core.cpp
new file mode 100644
index 00000000000..18bafa7b313
--- /dev/null
+++ b/src/plugins/lua/bindings/core.cpp
@@ -0,0 +1,46 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "../luaengine.h"
+
+#include <coreplugin/generatedfile.h>
+
+using namespace Core;
+
+namespace Lua::Internal {
+
+void addCoreModule()
+{
+    LuaEngine::registerProvider("Core", [](sol::state_view lua) -> sol::object {
+        sol::table core = lua.create_table();
+
+        auto generatedFileType = core.new_usertype<GeneratedFile>(
+            "GeneratedFile",
+            "filePath",
+            sol::property(&GeneratedFile::filePath, &GeneratedFile::setFilePath),
+            "contents",
+            sol::property(&GeneratedFile::contents, &GeneratedFile::setContents),
+            "attributes",
+            sol::property([](GeneratedFile *f) -> int { return f->attributes().toInt(); },
+                          [](GeneratedFile *f, int flags) {
+                              f->setAttributes(GeneratedFile::Attributes::fromInt(flags));
+                          }),
+            "isBinary",
+            sol::property(&GeneratedFile::isBinary, &GeneratedFile::setBinary));
+
+        // clang-format off
+        generatedFileType["Attribute"] = lua.create_table_with(
+            "OpenEditorAttribute", GeneratedFile::OpenEditorAttribute,
+            "OpenProjectAttribute", GeneratedFile::OpenProjectAttribute,
+            "CustomGeneratorAttribute", GeneratedFile::CustomGeneratorAttribute,
+            "KeepExistingFileAttribute", GeneratedFile::KeepExistingFileAttribute,
+            "ForceOverwrite", GeneratedFile::ForceOverwrite,
+            "TemporaryFile", GeneratedFile::TemporaryFile
+        );
+        // clang-format on
+
+        return core;
+    });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/bindings/fetch.cpp b/src/plugins/lua/bindings/fetch.cpp
new file mode 100644
index 00000000000..6f5fd535612
--- /dev/null
+++ b/src/plugins/lua/bindings/fetch.cpp
@@ -0,0 +1,325 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "../luaengine.h"
+#include "../luaqttypes.h"
+#include "../luatr.h"
+
+#include <coreplugin/dialogs/ioptionspage.h>
+#include <coreplugin/icore.h>
+
+#include <utils/aspects.h>
+#include <utils/infobar.h>
+#include <utils/layoutbuilder.h>
+#include <utils/networkaccessmanager.h>
+#include <utils/stylehelper.h>
+
+#include <QApplication>
+#include <QCheckBox>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QMessageBox>
+#include <QMetaEnum>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+
+namespace Lua::Internal {
+
+static QString opToString(QNetworkAccessManager::Operation op)
+{
+    switch (op) {
+    case QNetworkAccessManager::HeadOperation:
+        return "HEAD";
+    case QNetworkAccessManager::GetOperation:
+        return "GET";
+    case QNetworkAccessManager::PutOperation:
+        return "PUT";
+    case QNetworkAccessManager::PostOperation:
+        return "POST";
+
+    case QNetworkAccessManager::DeleteOperation:
+        return "DELETE";
+    case QNetworkAccessManager::CustomOperation:
+        return "CUSTOM";
+    default:
+        return "UNKNOWN";
+    }
+}
+
+void addFetchModule()
+{
+    class Module : Utils::AspectContainer
+    {
+        Utils::StringListAspect pluginsAllowedToFetch{this};
+        Utils::StringListAspect pluginsNotAllowedToFetch{this};
+
+        class LuaOptionsPage : public Core::IOptionsPage
+        {
+        public:
+            LuaOptionsPage(Module *module)
+            {
+                setId("BB.Lua.Fetch");
+                setDisplayName(Tr::tr("Network Access"));
+                setCategory("ZY.Lua");
+                setDisplayCategory("Lua");
+                setCategoryIconPath(":/lua/images/settingscategory_lua.png");
+                setSettingsProvider(
+                    [module] { return static_cast<Utils::AspectContainer *>(module); });
+            }
+        };
+
+        LuaOptionsPage settingsPage{this};
+
+    public:
+        Module()
+        {
+            setSettingsGroup("Lua.Fetch");
+
+            pluginsAllowedToFetch.setSettingsKey("pluginsAllowedToFetch");
+            pluginsAllowedToFetch.setLabelText("Plugins allowed to fetch data from the internet");
+            pluginsAllowedToFetch.setToolTip(
+                "List of plugins that are allowed to fetch data from the internet");
+            pluginsAllowedToFetch.setUiAllowAdding(false);
+            pluginsAllowedToFetch.setUiAllowEditing(false);
+
+            pluginsNotAllowedToFetch.setSettingsKey("pluginsNotAllowedToFetch");
+            pluginsNotAllowedToFetch.setLabelText(
+                "Plugins not allowed to fetch data from the internet");
+            pluginsNotAllowedToFetch.setToolTip(
+                "List of plugins that are not allowed to fetch data from the internet");
+            pluginsNotAllowedToFetch.setUiAllowAdding(false);
+            pluginsNotAllowedToFetch.setUiAllowEditing(false);
+
+            setLayouter([this] {
+                using namespace Layouting;
+                // clang-format off
+                return Form {
+                    pluginsAllowedToFetch, br,
+                    pluginsNotAllowedToFetch, br,
+                };
+                // clang-format on
+            });
+
+            readSettings();
+        }
+
+        ~Module() { writeSettings(); }
+
+        enum class IsAllowed { Yes, No, NeedsToAsk };
+
+        IsAllowed isAllowedToFetch(const QString &pluginName) const
+        {
+            if (pluginsAllowedToFetch().contains(pluginName))
+                return IsAllowed::Yes;
+            if (pluginsNotAllowedToFetch().contains(pluginName))
+                return IsAllowed::No;
+            return IsAllowed::NeedsToAsk;
+        }
+
+        void setAllowedToFetch(const QString &pluginName, IsAllowed allowed)
+        {
+            if (allowed == IsAllowed::Yes)
+                pluginsAllowedToFetch.appendValue(pluginName);
+            else if (allowed == IsAllowed::No)
+                pluginsNotAllowedToFetch.appendValue(pluginName);
+
+            if (allowed == IsAllowed::Yes)
+                pluginsNotAllowedToFetch.removeValue(pluginName);
+            else if (allowed == IsAllowed::No)
+                pluginsAllowedToFetch.removeValue(pluginName);
+        }
+    };
+
+    std::shared_ptr<Module> module = std::make_shared<Module>();
+
+    LuaEngine::registerProvider("Fetch", [mod = std::move(module)](sol::state_view lua) -> sol::object {
+        const ScriptPluginSpec *pluginSpec = lua.get<ScriptPluginSpec *>("PluginSpec");
+
+        sol::table async = lua.script("return require('async')", "_fetch_").get<sol::table>();
+        sol::function wrap = async["wrap"];
+
+        sol::table fetch = lua.create_table();
+
+        auto networkReplyType = lua.new_usertype<QNetworkReply>(
+            "QNetworkReply",
+            "error",
+            sol::property([](QNetworkReply *self) -> int { return self->error(); }),
+            "readAll",
+            [](QNetworkReply *r) { return r->readAll().toStdString(); },
+            "__tostring",
+            [](QNetworkReply *r) {
+                return QString("QNetworkReply(%1 \"%2\") => %3")
+                    .arg(opToString(r->operation()))
+                    .arg(r->url().toString())
+                    .arg(r->error());
+            });
+
+        auto checkPermission = [mod,
+                                pluginName = pluginSpec->name,
+                                guard = pluginSpec->connectionGuard.get()](
+                                   QString url,
+                                   std::function<void()> fetch,
+                                   std::function<void()> notAllowed) {
+            auto isAllowed = mod->isAllowedToFetch(pluginName);
+            if (isAllowed == Module::IsAllowed::Yes) {
+                fetch();
+                return;
+            }
+
+            if (isAllowed == Module::IsAllowed::No) {
+                notAllowed();
+                return;
+            }
+
+            if (QApplication::activeModalWidget()) {
+                // We are already showing a modal dialog,
+                // so we have to use a QMessageBox instead of the info bar
+                auto msgBox = new QMessageBox(
+                    QMessageBox::Question,
+                    Tr::tr("Allow Internet Access"),
+                    Tr::tr("Allow the extension \"%1\" to fetch from the following URL:\n%2")
+                        .arg(pluginName)
+                        .arg(url),
+                    QMessageBox::Yes | QMessageBox::No,
+                    Core::ICore::dialogParent());
+                msgBox->setCheckBox(new QCheckBox(Tr::tr("Remember choice")));
+
+                QObject::connect(
+                    msgBox, &QMessageBox::accepted, guard, [mod, fetch, pluginName, msgBox]() {
+                        if (msgBox->checkBox()->isChecked())
+                            mod->setAllowedToFetch(pluginName, Module::IsAllowed::Yes);
+                        fetch();
+                    });
+
+                QObject::connect(
+                    msgBox, &QMessageBox::rejected, guard, [mod, notAllowed, pluginName, msgBox]() {
+                        if (msgBox->checkBox()->isChecked())
+                            mod->setAllowedToFetch(pluginName, Module::IsAllowed::No);
+                        notAllowed();
+                    });
+
+                msgBox->show();
+
+                return;
+            }
+
+            Utils::InfoBarEntry entry{
+                Utils::Id::fromString("Fetch" + pluginName),
+                Tr::tr("Allow the extension \"%1\" to fetch data from the internet?")
+                    .arg(pluginName)};
+            entry.setDetailsWidgetCreator([pluginName, url] {
+                const QString markdown = Tr::tr("Allow the extension \"%1\" to fetch data"
+                                                "from the following URL:\n\n")
+                                             .arg("**" + pluginName + "**")
+                                         + QString("* [%1](%1)").arg(url);
+
+                QLabel *list = new QLabel();
+                list->setTextFormat(Qt::TextFormat::MarkdownText);
+                list->setText(markdown);
+                list->setMargin(Utils::StyleHelper::SpacingTokens::ExPaddingGapS);
+                return list;
+            });
+            entry.addCustomButton(Tr::tr("Always Allow"), [mod, pluginName, fetch]() {
+                mod->setAllowedToFetch(pluginName, Module::IsAllowed::Yes);
+                Core::ICore::infoBar()->removeInfo(Utils::Id::fromString("Fetch" + pluginName));
+                fetch();
+            });
+            entry.addCustomButton(Tr::tr("Allow Once"), [pluginName, fetch]() {
+                Core::ICore::infoBar()->removeInfo(Utils::Id::fromString("Fetch" + pluginName));
+                fetch();
+            });
+
+            entry.setCancelButtonInfo(Tr::tr("Deny"), [mod, notAllowed, pluginName]() {
+                Core::ICore::infoBar()->removeInfo(Utils::Id::fromString("Fetch" + pluginName));
+                mod->setAllowedToFetch(pluginName, Module::IsAllowed::No);
+                notAllowed();
+            });
+            Core::ICore::infoBar()->addInfo(entry);
+        };
+
+        fetch["fetch_cb"] = [checkPermission,
+                             pluginName = pluginSpec->name,
+                             guard = pluginSpec->connectionGuard.get(),
+                             mod](
+                                const sol::table &options,
+                                const sol::function &callback,
+                                const sol::this_state &thisState) {
+            auto url = options.get<QString>("url");
+            auto actualFetch = [guard, url, options, callback, thisState]() {
+                auto method = (options.get_or<QString>("method", "GET")).toLower();
+                auto headers = options.get_or<sol::table>("headers", {});
+                auto data = options.get_or<QString>("body", {});
+                bool convertToTable
+                    = options.get<std::optional<bool>>("convertToTable").value_or(false);
+
+                QNetworkRequest request((QUrl(url)));
+                if (headers && !headers.empty()) {
+                    for (const auto &[k, v] : headers)
+                        request.setRawHeader(k.as<QString>().toUtf8(), v.as<QString>().toUtf8());
+                }
+
+                QNetworkReply *reply = nullptr;
+                if (method == "get")
+                    reply = Utils::NetworkAccessManager::instance()->get(request);
+                else if (method == "post")
+                    reply = Utils::NetworkAccessManager::instance()->post(request, data.toUtf8());
+                else
+                    throw std::runtime_error("Unknown method: " + method.toStdString());
+
+                if (convertToTable) {
+                    QObject::connect(
+                        reply, &QNetworkReply::finished, guard, [reply, thisState, callback]() {
+                            reply->deleteLater();
+
+                            if (reply->error() != QNetworkReply::NoError) {
+                                callback(QString("%1 (%2):\n%3")
+                                             .arg(reply->errorString())
+                                             .arg(QString::fromLatin1(
+                                                 QMetaEnum::fromType<QNetworkReply::NetworkError>()
+                                                     .valueToKey(reply->error())))
+                                             .arg(QString::fromUtf8(reply->readAll())));
+                                return;
+                            }
+
+                            QByteArray data = reply->readAll();
+                            QJsonParseError error;
+                            QJsonDocument doc = QJsonDocument::fromJson(data, &error);
+                            if (error.error != QJsonParseError::NoError) {
+                                callback(error.errorString());
+                                return;
+                            }
+                            if (doc.isObject()) {
+                                callback(LuaEngine::toTable(thisState, doc.object()));
+                            } else if (doc.isArray()) {
+                                callback(LuaEngine::toTable(thisState, doc.array()));
+                            } else {
+                                sol::state_view lua(thisState);
+                                callback(lua.create_table());
+                            }
+                        });
+
+                } else {
+                    QObject::connect(
+                        reply, &QNetworkReply::finished, guard, [reply, callback]() {
+                            // We don't want the network reply to be deleted by the manager, but
+                            // by the Lua GC
+                            reply->setParent(nullptr);
+                            callback(std::unique_ptr<QNetworkReply>(reply));
+                        });
+                }
+            };
+
+            checkPermission(url, actualFetch, [callback, pluginName]() {
+                callback(Tr::tr("Fetching is not allowed for the extension \"%1\". (You can edit "
+                                "permissions in Preferences > Lua.)")
+                             .arg(pluginName));
+            });
+        };
+
+        fetch["fetch"] = wrap(fetch["fetch_cb"]);
+
+        return fetch;
+    });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/bindings/gui.cpp b/src/plugins/lua/bindings/gui.cpp
new file mode 100644
index 00000000000..d34848ebc2f
--- /dev/null
+++ b/src/plugins/lua/bindings/gui.cpp
@@ -0,0 +1,400 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "../luaengine.h"
+
+#include "inheritance.h"
+
+#include <utils/aspects.h>
+#include <utils/layoutbuilder.h>
+
+using namespace Layouting;
+using namespace Utils;
+
+namespace Lua::Internal {
+
+template<class T>
+static void processChildren(T *item, const sol::table &children)
+{
+    for (size_t i = 1; i <= children.size(); ++i) {
+        const auto &child = children[i];
+        if (child.is<Layout *>()) {
+            if (Layout *layout = child.get<Layout *>())
+                item->addItem(*layout);
+            else
+                item->addItem("ERROR");
+        } else if (child.is<Widget *>()) {
+            if (Widget *widget = child.get<Widget *>())
+                item->addItem(*widget);
+            else
+                item->addItem("ERROR");
+        } else if (child.is<BaseAspect>()) {
+            child.get<BaseAspect *>()->addToLayout(*item);
+        } else if (child.is<QString>()) {
+            item->addItem(child.get<QString>());
+        } else if (child.is<sol::function>()) {
+            const sol::function f = child.get<sol::function>();
+            auto res = LuaEngine::void_safe_call(f, item);
+            QTC_ASSERT_EXPECTED(res, continue);
+        } else if (child.is<Span>()) {
+            const Span &span = child.get<Span>();
+            item->addItem(span);
+        } else if (child.is<Space>()) {
+            const Space &space = child.get<Space>();
+            item->addItem(space);
+        } else if (child.is<Stretch>()) {
+            const Stretch &stretch = child.get<Stretch>();
+            item->addItem(stretch);
+        } else {
+            qWarning() << "Incompatible object added to layout item: " << (int) child.get_type()
+                       << " (expected LayoutItem, Aspect or function returning LayoutItem)";
+        }
+    }
+}
+
+template<class T>
+static std::unique_ptr<T> construct(const sol::table &children)
+{
+    std::unique_ptr<T> item(new T({}));
+    processChildren(item.get(), children);
+    return item;
+}
+
+template<class T>
+void constructWidget(std::unique_ptr<T> &widget, const sol::table &children)
+{
+    widget->setWindowTitle(children.get_or<QString>("windowTitle", ""));
+    widget->setToolTip(children.get_or<QString>("toolTip", ""));
+
+    for (size_t i = 1; i <= children.size(); ++i) {
+        const auto &child = children[i];
+        if (child.is<Layout>())
+            widget->setLayout(*child.get<Layout *>());
+    }
+}
+
+#define HAS_MEM_FUNC(func, name) \
+    template<typename T, typename Sign> \
+    struct name \
+    { \
+        typedef char yes[1]; \
+        typedef char no[2]; \
+        template<typename U, U> \
+        struct type_check; \
+        template<typename _1> \
+        static yes &chk(type_check<Sign, &_1::func> *); \
+        template<typename> \
+        static no &chk(...); \
+        static bool const value = sizeof(chk<T>(0)) == sizeof(yes); \
+    }
+
+HAS_MEM_FUNC(onTextChanged, hasOnTextChanged);
+HAS_MEM_FUNC(onClicked, hasOnClicked);
+HAS_MEM_FUNC(setText, hasSetText);
+HAS_MEM_FUNC(setTitle, hasSetTitle);
+HAS_MEM_FUNC(setValue, hasSetValue);
+HAS_MEM_FUNC(setSize, hasSetSize);
+
+template<class T>
+void setProperties(std::unique_ptr<T> &item, const sol::table &children, QObject *guard)
+{
+    if constexpr (hasSetSize<T, void (T::*)(int, int)>::value) {
+        sol::optional<sol::table> size = children.get<sol::optional<sol::table>>("size");
+        if (size) {
+            if (size->size() == 2)
+                item->setSize(size->get<int>(1), size->get<int>(2));
+            else
+                throw sol::error("size must have exactly two elements");
+        }
+    }
+
+    if constexpr (hasOnTextChanged<T, void (T::*)(const QString &)>::value) {
+        sol::optional<sol::protected_function> onTextChanged
+            = children.get<sol::optional<sol::protected_function>>("onTextChanged");
+        if (onTextChanged) {
+            item->onTextChanged(
+                [f = *onTextChanged](const QString &text) {
+                    auto res = LuaEngine::void_safe_call(f, text);
+                    QTC_CHECK_EXPECTED(res);
+                },
+                guard);
+        }
+    }
+    if constexpr (hasOnClicked<T, void (T::*)(const std::function<void()> &, QObject *guard)>::value) {
+        sol::optional<sol::protected_function> onClicked
+            = children.get<sol::optional<sol::protected_function>>("onClicked");
+        if (onClicked) {
+            item->onClicked(
+                [f = *onClicked]() {
+                    auto res = LuaEngine::void_safe_call(f);
+                    QTC_CHECK_EXPECTED(res);
+                },
+                guard);
+        }
+    }
+    if constexpr (hasSetText<T, void (T::*)(const QString &)>::value) {
+        item->setText(children.get_or<QString>("text", ""));
+    }
+    if constexpr (hasSetTitle<T, void (T::*)(const QString &)>::value) {
+        item->setTitle(children.get_or<QString>("title", ""));
+    }
+    if constexpr (hasSetValue<T, void (T::*)(int)>::value) {
+        sol::optional<int> value = children.get<sol::optional<int>>("value");
+        if (value)
+            item->setValue(*value);
+    }
+}
+
+template<class T>
+std::unique_ptr<T> constructWidgetType(const sol::table &children, QObject *guard)
+{
+    std::unique_ptr<T> item(new T({}));
+    constructWidget(item, children);
+    setProperties(item, children, guard);
+    return item;
+}
+
+std::unique_ptr<Tab> constructTabFromTable(const sol::table &children)
+{
+    if (children.size() != 2)
+        throw sol::error("Tab must have exactly two children");
+
+    auto tabName = children[1];
+    if (tabName.get_type() != sol::type::string)
+        throw sol::error("Tab name (first argument) must be a string");
+
+    const auto &layout = children[2];
+    if (!layout.is<Layout *>())
+        throw sol::error("Tab child (second argument) must be a Layout");
+
+    std::unique_ptr<Tab> item = std::make_unique<Tab>(tabName, *layout.get<Layout *>());
+    return item;
+}
+
+std::unique_ptr<Tab> constructTab(const QString &tabName, const Layout &layout)
+{
+    std::unique_ptr<Tab> item = std::make_unique<Tab>(tabName, layout);
+    return item;
+}
+
+std::unique_ptr<Span> constructSpanFromTable(const sol::table &children)
+{
+    if (children.size() != 2)
+        throw sol::error("Span must have exactly two children");
+
+    auto spanSize = children[1];
+    if (spanSize.get_type() != sol::type::number)
+        throw sol::error("Span size (first argument) must be a number");
+
+    const auto &layout = children[2];
+    if (!layout.is<Layout *>())
+        throw sol::error("Span child (second argument) must be a Layout");
+
+    std::unique_ptr<Span> item = std::make_unique<Span>(spanSize, *layout.get<Layout *>());
+    return item;
+}
+
+std::unique_ptr<Span> constructSpan(int n, const Layout &layout)
+{
+    std::unique_ptr<Span> item = std::make_unique<Span>(n, layout);
+    return item;
+}
+
+std::unique_ptr<TabWidget> constructTabWidget(const sol::table &children, QObject *guard)
+{
+    std::unique_ptr<TabWidget> item(new TabWidget({}));
+    setProperties(item, children, guard);
+    for (size_t i = 1; i <= children.size(); ++i) {
+        const auto &child = children[i];
+        if (child.is<Tab *>())
+            addToTabWidget(item.get(), *child.get<Tab *>());
+    }
+    return item;
+}
+
+std::unique_ptr<Splitter> constructSplitter(const sol::table &children)
+{
+    std::unique_ptr<Splitter> item(new Splitter({}));
+    constructWidget(item, children);
+
+    for (size_t i = 1; i <= children.size(); ++i) {
+        const auto &child = children[i];
+        if (child.is<Layout *>()) {
+            addToSplitter(item.get(), *child.get<Layout *>());
+        } else if (child.is<Widget *>()) {
+            addToSplitter(item.get(), *child.get<Widget *>());
+        } else {
+            qWarning() << "Incompatible object added to Splitter: " << (int) child.get_type()
+                       << " (expected Layout or Widget)";
+        }
+    }
+    return item;
+}
+
+void addGuiModule()
+{
+    LuaEngine::registerProvider("Gui", [](sol::state_view l) -> sol::object {
+        const ScriptPluginSpec *pluginSpec = l.get<ScriptPluginSpec *>("PluginSpec");
+        QObject *guard = pluginSpec->connectionGuard.get();
+
+        sol::table gui = l.create_table();
+
+        gui.new_usertype<Span>(
+            "Span", sol::call_constructor, sol::factories(&constructSpan, &constructSpanFromTable));
+
+        gui.new_usertype<Space>("Space", sol::call_constructor, sol::constructors<Space(int)>());
+
+        gui.new_usertype<Stretch>("Stretch", sol::call_constructor, sol::constructors<Stretch(int)>());
+
+        // Layouts
+        gui.new_usertype<Layout>(
+            "Layout",
+            sol::call_constructor,
+            sol::factories(&construct<Layout>),
+            "show",
+            &Layout::show,
+            sol::base_classes,
+            sol::bases<Object, Thing>());
+
+        gui.new_usertype<Form>(
+            "Form",
+            sol::call_constructor,
+            sol::factories(&construct<Form>),
+            sol::base_classes,
+            sol::bases<Layout, Object, Thing>());
+
+        gui.new_usertype<Column>(
+            "Column",
+            sol::call_constructor,
+            sol::factories(&construct<Column>),
+            sol::base_classes,
+            sol::bases<Layout, Object, Thing>());
+
+        gui.new_usertype<Row>(
+            "Row",
+            sol::call_constructor,
+            sol::factories(&construct<Row>),
+            sol::base_classes,
+            sol::bases<Layout, Object, Thing>());
+        gui.new_usertype<Flow>(
+            "Flow",
+            sol::call_constructor,
+            sol::factories(&construct<Flow>),
+            sol::base_classes,
+            sol::bases<Layout, Object, Thing>());
+        gui.new_usertype<Grid>(
+            "Grid",
+            sol::call_constructor,
+            sol::factories(&construct<Grid>),
+            sol::base_classes,
+            sol::bases<Layout, Object, Thing>());
+
+        // Widgets
+        gui.new_usertype<PushButton>(
+            "PushButton",
+            sol::call_constructor,
+            sol::factories([guard](const sol::table &children) {
+                return constructWidgetType<PushButton>(children, guard);
+            }),
+            sol::base_classes,
+            sol::bases<Widget, Object, Thing>());
+
+        gui.new_usertype<Label>(
+            "Label",
+            sol::call_constructor,
+            sol::factories([guard](const sol::table &children) {
+                return constructWidgetType<Label>(children, guard);
+            }),
+            sol::base_classes,
+            sol::bases<Widget, Object, Thing>());
+
+        gui.new_usertype<Widget>(
+            "Widget",
+            sol::call_constructor,
+            sol::factories([guard](const sol::table &children) {
+                return constructWidgetType<Widget>(children, guard);
+            }),
+            "show",
+            &Widget::show,
+            sol::base_classes,
+            sol::bases<Object, Thing>());
+
+        gui.new_usertype<Stack>(
+            "Stack",
+            sol::call_constructor,
+            sol::factories([guard](const sol::table &children) {
+                return constructWidgetType<Stack>(children, guard);
+            }),
+            sol::base_classes,
+            sol::bases<Widget, Object, Thing>());
+
+        gui.new_usertype<Tab>(
+            "Tab",
+            sol::call_constructor,
+            sol::factories(&constructTab, &constructTabFromTable),
+            sol::base_classes,
+            sol::bases<Widget, Object, Thing>());
+
+        gui.new_usertype<TextEdit>(
+            "TextEdit",
+            sol::call_constructor,
+            sol::factories([guard](const sol::table &children) {
+                return constructWidgetType<TextEdit>(children, guard);
+            }),
+            sol::base_classes,
+            sol::bases<Widget, Object, Thing>());
+
+        gui.new_usertype<SpinBox>(
+            "SpinBox",
+            sol::call_constructor,
+            sol::factories([guard](const sol::table &children) {
+                return constructWidgetType<SpinBox>(children, guard);
+            }),
+            sol::base_classes,
+            sol::bases<Widget, Object, Thing>());
+        gui.new_usertype<Splitter>(
+            "Splitter",
+            sol::call_constructor,
+            sol::factories(&constructSplitter),
+            sol::base_classes,
+            sol::bases<Widget, Object, Thing>());
+        gui.new_usertype<ToolBar>(
+            "ToolBar",
+            sol::call_constructor,
+            sol::factories([guard](const sol::table &children) {
+                return constructWidgetType<ToolBar>(children, guard);
+            }),
+            sol::base_classes,
+            sol::bases<Widget, Object, Thing>());
+        gui.new_usertype<TabWidget>(
+            "TabWidget",
+            sol::call_constructor,
+            sol::factories([guard](const sol::table &children) {
+                return constructTabWidget(children, guard);
+            }),
+            sol::base_classes,
+            sol::bases<Widget, Object, Thing>());
+
+        gui.new_usertype<Group>(
+            "Group",
+            sol::call_constructor,
+            sol::factories([guard](const sol::table &children) {
+                return constructWidgetType<Group>(children, guard);
+            }),
+            sol::base_classes,
+            sol::bases<Widget, Object, Thing>());
+
+        gui["br"] = &br;
+        gui["st"] = &st;
+        gui["empty"] = &empty;
+        gui["hr"] = &hr;
+        gui["noMargin"] = &noMargin;
+        gui["normalMargin"] = &normalMargin;
+        gui["withFormAlignment"] = &withFormAlignment;
+        gui["spacing"] = &spacing;
+
+        return gui;
+    });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/bindings/hook.cpp b/src/plugins/lua/bindings/hook.cpp
new file mode 100644
index 00000000000..b626a83308f
--- /dev/null
+++ b/src/plugins/lua/bindings/hook.cpp
@@ -0,0 +1,71 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "../luaengine.h"
+
+#include <coreplugin/editormanager/editormanager.h>
+
+namespace Lua {
+
+class Hook : public QObject
+{
+    Q_OBJECT
+
+public:
+    Hook(QObject *source);
+
+signals:
+    void trigger(sol::table &args);
+};
+
+Hook::Hook(QObject *source)
+    : QObject(source)
+{}
+
+namespace Internal {
+
+void addHookModule()
+{
+    LuaEngine::autoRegister([](sol::state_view lua) {
+        auto connection = lua.new_usertype<QMetaObject::Connection>("QMetaConnection",
+                                                                    sol::no_constructor);
+
+        auto hook = lua.new_usertype<Hook>(
+            "Hook",
+            sol::no_constructor,
+            "connect",
+            [](Hook *hook, const sol::function &func) -> QMetaObject::Connection {
+                QMetaObject::Connection con
+                    = QObject::connect(hook, &Hook::trigger, [func](sol::table args) {
+                          auto res = LuaEngine::void_safe_call(func, args);
+                          QTC_CHECK_EXPECTED(res);
+                      });
+                return con;
+            },
+            "disconnect",
+            [](Hook *, QMetaObject::Connection con) { QObject::disconnect(con); });
+    });
+
+    LuaEngine::registerHook("editors.documentOpened", [](const sol::protected_function &func) {
+        QObject::connect(
+            Core::EditorManager::instance(),
+            &Core::EditorManager::documentOpened,
+            [func](Core::IDocument *document) {
+                QTC_CHECK_EXPECTED(LuaEngine::void_safe_call(func, document));
+            });
+    });
+    LuaEngine::registerHook("editors.documentClosed", [](const sol::protected_function &func) {
+        QObject::connect(
+            Core::EditorManager::instance(),
+            &Core::EditorManager::documentClosed,
+            [func](Core::IDocument *document) {
+                QTC_CHECK_EXPECTED(LuaEngine::void_safe_call(func, document));
+            });
+    });
+}
+
+} // namespace Internal
+
+} // namespace Lua
+
+#include "hook.moc"
diff --git a/src/plugins/lua/bindings/inheritance.h b/src/plugins/lua/bindings/inheritance.h
new file mode 100644
index 00000000000..5e6703e75f0
--- /dev/null
+++ b/src/plugins/lua/bindings/inheritance.h
@@ -0,0 +1,131 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <sol/forward.hpp>
+
+namespace Lua::Internal {
+class LuaAspectContainer;
+}
+
+namespace Utils {
+class AspectContainer;
+class BoolAspect;
+class ColorAspect;
+class SelectionAspect;
+class MultiSelectionAspect;
+class StringAspect;
+class FilePathAspect;
+class IntegerAspect;
+class DoubleAspect;
+class StringListAspect;
+class FilePathListAspect;
+class IntegersAspect;
+class StringSelectionAspect;
+class ToggleAspect;
+class TriStateAspect;
+class TextDisplay;
+class AspectList;
+class BaseAspect;
+} // namespace Utils
+
+SOL_BASE_CLASSES(::Lua::Internal::LuaAspectContainer, Utils::AspectContainer, Utils::BaseAspect);
+
+SOL_BASE_CLASSES(Utils::BoolAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::ColorAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::SelectionAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::MultiSelectionAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::StringAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::FilePathAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::IntegerAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::DoubleAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::StringListAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::FilePathListAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::IntegersAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::StringSelectionAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::ToggleAspect, Utils::BoolAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::TriStateAspect, Utils::SelectionAspect, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::TextDisplay, Utils::BaseAspect);
+SOL_BASE_CLASSES(Utils::AspectList, Utils::BaseAspect);
+
+SOL_DERIVED_CLASSES(Utils::AspectContainer, Lua::Internal::LuaAspectContainer);
+
+SOL_DERIVED_CLASSES(
+    Utils::BaseAspect,
+    Utils::AspectContainer,
+    Utils::BoolAspect,
+    Utils::ColorAspect,
+    Utils::SelectionAspect,
+    Utils::MultiSelectionAspect,
+    Utils::StringAspect,
+    Utils::FilePathAspect,
+    Utils::IntegerAspect,
+    Utils::DoubleAspect,
+    Utils::StringListAspect,
+    Utils::FilePathListAspect,
+    Utils::IntegersAspect,
+    Utils::StringSelectionAspect,
+    Utils::ToggleAspect,
+    Utils::TriStateAspect,
+    Utils::TextDisplay,
+    Utils::AspectList);
+
+namespace Layouting {
+class Object;
+
+class Layout;
+class Column;
+class Flow;
+class Form;
+class Grid;
+
+class Widget;
+class Group;
+class PushButton;
+class Row;
+class SpinBox;
+class Splitter;
+class Stack;
+class Tab;
+class TabWidget;
+class TextEdit;
+class ToolBar;
+} // namespace Layouting
+
+SOL_BASE_CLASSES(Layouting::Layout, Layouting::Object);
+SOL_BASE_CLASSES(Layouting::Column, Layouting::Layout);
+SOL_BASE_CLASSES(Layouting::Row, Layouting::Layout);
+SOL_BASE_CLASSES(Layouting::Flow, Layouting::Layout);
+SOL_BASE_CLASSES(Layouting::Grid, Layouting::Layout);
+SOL_BASE_CLASSES(Layouting::Form, Layouting::Layout);
+SOL_BASE_CLASSES(Layouting::Widget, Layouting::Object);
+SOL_BASE_CLASSES(Layouting::Stack, Layouting::Widget);
+SOL_BASE_CLASSES(Layouting::Tab, Layouting::Widget);
+SOL_BASE_CLASSES(Layouting::Group, Layouting::Widget);
+SOL_BASE_CLASSES(Layouting::TextEdit, Layouting::Widget);
+SOL_BASE_CLASSES(Layouting::PushButton, Layouting::Widget);
+SOL_BASE_CLASSES(Layouting::SpinBox, Layouting::Widget);
+SOL_BASE_CLASSES(Layouting::Splitter, Layouting::Widget);
+SOL_BASE_CLASSES(Layouting::ToolBar, Layouting::Widget);
+SOL_BASE_CLASSES(Layouting::TabWidget, Layouting::Widget);
+
+SOL_DERIVED_CLASSES(
+    Layouting::Object,
+    Layouting::Layout,
+    Layouting::Column,
+    Layouting::Row,
+    Layouting::Flow,
+    Layouting::Grid,
+    Layouting::Form,
+    Layouting::Widget,
+    Layouting::Stack,
+    Layouting::Tab,
+    Layouting::Group,
+    Layouting::TextEdit,
+    Layouting::PushButton,
+    Layouting::SpinBox,
+    Layouting::Splitter,
+    Layouting::ToolBar,
+    Layouting::TabWidget);
+
diff --git a/src/plugins/lua/bindings/install.cpp b/src/plugins/lua/bindings/install.cpp
new file mode 100644
index 00000000000..076cf63b9fa
--- /dev/null
+++ b/src/plugins/lua/bindings/install.cpp
@@ -0,0 +1,392 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "../luaengine.h"
+#include "../luatr.h"
+
+#include <coreplugin/icore.h>
+#include <coreplugin/progressmanager/progressmanager.h>
+#include <coreplugin/progressmanager/taskprogress.h>
+
+#include <solutions/tasking/networkquery.h>
+#include <solutions/tasking/tasktree.h>
+
+#include <utils/algorithm.h>
+#include <utils/infobar.h>
+#include <utils/networkaccessmanager.h>
+#include <utils/stylehelper.h>
+#include <utils/unarchiver.h>
+
+#include <QApplication>
+#include <QJsonDocument>
+#include <QLabel>
+#include <QMessageBox>
+#include <QTemporaryFile>
+#include <QtConcurrent>
+
+using namespace Core;
+using namespace Tasking;
+using namespace Utils;
+
+namespace Lua::Internal {
+
+expected_str<QJsonDocument> getPackageInfo(const FilePath &appDataPath)
+{
+    const FilePath packageInfoPath = appDataPath / "package.json";
+
+    if (!packageInfoPath.exists())
+        return QJsonDocument();
+
+    expected_str<QByteArray> json = packageInfoPath.fileContents();
+    if (!json)
+        return make_unexpected(json.error());
+
+    if (json->isEmpty())
+        return QJsonDocument();
+
+    QJsonParseError error;
+    QJsonDocument doc(QJsonDocument::fromJson(*json, &error));
+    if (error.error != QJsonParseError::NoError)
+        return make_unexpected(error.errorString());
+
+    if (!doc.isObject())
+        return make_unexpected(Tr::tr("Package info is not an object."));
+
+    return doc;
+}
+
+expected_str<QJsonObject> getInstalledPackageInfo(const FilePath &appDataPath, const QString &name)
+{
+    auto packageDoc = getPackageInfo(appDataPath);
+    if (!packageDoc)
+        return make_unexpected(packageDoc.error());
+
+    QJsonObject root = packageDoc->object();
+
+    if (root.contains(name)) {
+        QJsonValue v = root[name];
+        if (!v.isObject())
+            return make_unexpected(Tr::tr("Installed package info is not an object."));
+        return v.toObject();
+    }
+
+    return QJsonObject();
+}
+
+expected_str<QJsonDocument> getOrCreatePackageInfo(const FilePath &appDataPath)
+{
+    expected_str<QJsonDocument> doc = getPackageInfo(appDataPath);
+    if (doc && doc->isObject())
+        return doc;
+
+    QJsonObject obj;
+    return QJsonDocument(obj);
+}
+
+expected_str<void> savePackageInfo(const FilePath &appDataPath, const QJsonDocument &doc)
+{
+    if (!appDataPath.ensureWritableDir())
+        return make_unexpected(Tr::tr("Cannot create app data directory."));
+
+    const FilePath packageInfoPath = appDataPath / "package.json";
+    return packageInfoPath.writeFileContents(doc.toJson())
+        .transform_error([](const QString &error) {
+            return Tr::tr("Cannot write to package info: %1").arg(error);
+        })
+        .transform([](qint64) { return; });
+}
+
+struct InstallOptions
+{
+    QUrl url;
+    QString name;
+    QString version;
+};
+
+size_t qHash(const InstallOptions &item, size_t seed = 0)
+{
+    return qHash(item.url, seed) ^ qHash(item.name, seed) ^ qHash(item.version, seed);
+}
+
+static FilePath destination(const FilePath &appDataPath, const InstallOptions &options)
+{
+    return appDataPath / "packages" / options.name / options.version;
+}
+
+static Group installRecipe(
+    const FilePath &appDataPath,
+    const QList<InstallOptions> &installOptions,
+    const sol::protected_function &callback)
+{
+    Storage<QFile> storage;
+
+    const LoopList<InstallOptions> installOptionsIt(installOptions);
+
+    const auto emitResult = [callback](const QString &error = QString()) {
+        if (error.isEmpty()) {
+            LuaEngine::void_safe_call(callback, true);
+            return DoneResult::Success;
+        }
+        LuaEngine::void_safe_call(callback, false, error);
+        return DoneResult::Error;
+    };
+
+    const auto onDownloadSetup = [installOptionsIt](NetworkQuery &query) {
+        query.setRequest(QNetworkRequest(installOptionsIt->url));
+        query.setNetworkAccessManager(NetworkAccessManager::instance());
+        return SetupResult::Continue;
+    };
+
+    const auto onDownloadDone = [emitResult, storage](const NetworkQuery &query, DoneWith result) {
+        if (result == DoneWith::Error)
+            return emitResult(query.reply()->errorString());
+        if (result == DoneWith::Cancel)
+            return DoneResult::Error;
+
+        QNetworkReply *reply = query.reply();
+        const auto size = reply->size();
+        const auto written = storage->write(reply->readAll());
+        if (written != size)
+            return emitResult(Tr::tr("Cannot write to temporary file."));
+        storage->close();
+        return DoneResult::Success;
+    };
+
+    const auto onUnarchiveSetup =
+        [appDataPath, installOptionsIt, storage, emitResult](Unarchiver &unarchiver) {
+            const auto sourceAndCommand = Unarchiver::sourceAndCommand(
+                FilePath::fromUserInput(storage->fileName()));
+
+            if (!sourceAndCommand) {
+                emitResult(sourceAndCommand.error());
+                return SetupResult::StopWithError;
+            }
+            unarchiver.setGZipFileDestName(installOptionsIt->name);
+            unarchiver.setSourceAndCommand(*sourceAndCommand);
+            unarchiver.setDestDir(destination(appDataPath, *installOptionsIt));
+            return SetupResult::Continue;
+        };
+
+    const auto onUnarchiverDone = [appDataPath, installOptionsIt, emitResult](DoneWith result) {
+        if (result == DoneWith::Error)
+            return emitResult(Tr::tr("Unarchiving failed."));
+        if (result == DoneWith::Cancel)
+            return DoneResult::Error;
+
+        const FilePath destDir = destination(appDataPath, *installOptionsIt);
+        const FilePath binary = destDir / installOptionsIt->name;
+
+        if (binary.isFile())
+            binary.setPermissions(QFile::ExeUser | QFile::ExeGroup | QFile::ExeOther);
+
+        expected_str<QJsonDocument> doc = getOrCreatePackageInfo(appDataPath);
+        if (!doc)
+            return emitResult(doc.error());
+
+        QJsonObject obj = doc->object();
+        QJsonObject installedPackage;
+        installedPackage["version"] = installOptionsIt->version;
+        installedPackage["name"] = installOptionsIt->name;
+        installedPackage["path"] = destDir.toFSPathString();
+        obj[installOptionsIt->name] = installedPackage;
+
+        expected_str<void> res = savePackageInfo(appDataPath, QJsonDocument(obj));
+        if (!res)
+            return emitResult(res.error());
+        return DoneResult::Success;
+    };
+
+    return Group{
+        storage,
+        parallelIdealThreadCountLimit,
+        installOptionsIt,
+        Group{
+            onGroupSetup([emitResult, storage, installOptionsIt] {
+                const QString fileName = installOptionsIt->url.fileName();
+                const QString ext = fileName.mid(fileName.indexOf('.'));
+                {
+                    QTemporaryFile tempFile(QDir::tempPath() + "/XXXXXX" + ext);
+                    tempFile.setAutoRemove(false);
+                    tempFile.open();
+                    (*storage).setFileName(tempFile.fileName());
+                }
+
+                if (!storage->open(QIODevice::WriteOnly)) {
+                    emitResult(Tr::tr("Cannot open temporary file."));
+                    return SetupResult::StopWithError;
+                }
+                return SetupResult::Continue;
+            }),
+            NetworkQueryTask(onDownloadSetup, onDownloadDone),
+            UnarchiverTask(onUnarchiveSetup, onUnarchiverDone),
+            onGroupDone([storage, emitResult] { storage->remove(); }),
+        },
+        onGroupDone([emitResult](DoneWith result) {
+            if (result == DoneWith::Cancel)
+                emitResult("Installation was canceled");
+            else if (result == DoneWith::Success)
+                emitResult();
+        }),
+    };
+}
+
+void addInstallModule()
+{
+    class State
+    {
+    public:
+        State() = default;
+        State(const State &) {}
+        ~State()
+        {
+            for (auto tree : m_trees)
+                delete tree;
+        }
+
+        TaskTree *createTree()
+        {
+            auto tree = new TaskTree();
+            m_trees.append(tree);
+            QObject::connect(tree, &TaskTree::done, tree, &QObject::deleteLater);
+            return tree;
+        };
+
+    private:
+        QList<QPointer<TaskTree>> m_trees;
+    };
+
+    LuaEngine::registerProvider(
+        "Install", [state = State()](sol::state_view lua) mutable -> sol::object {
+            sol::table async
+                = lua.script("return require('async')", "_install_async_").get<sol::table>();
+            sol::function wrap = async["wrap"];
+
+            sol::table install = lua.create_table();
+            const ScriptPluginSpec *pluginSpec = lua.get<ScriptPluginSpec *>("PluginSpec");
+
+            install["packageInfo"] =
+                [pluginSpec](const QString &name, sol::this_state l) -> sol::optional<sol::table> {
+                expected_str<QJsonObject> obj
+                    = getInstalledPackageInfo(pluginSpec->appDataPath, name);
+                if (!obj)
+                    throw sol::error(obj.error().toStdString());
+
+                return sol::table::create_with(
+                    l.lua_state(),
+                    "name",
+                    obj->value("name").toString(),
+                    "version",
+                    obj->value("version").toString(),
+                    "path",
+                    FilePath::fromUserInput(obj->value("path").toString()));
+            };
+
+            install["install_cb"] =
+                [pluginSpec, &state](
+                    const QString &msg,
+                    const sol::table &installOptions,
+                    const sol::function &callback) {
+                    QList<InstallOptions> installOptionsList;
+                    if (installOptions.size() > 0) {
+                        for (const auto &pair : installOptions) {
+                            const sol::object &value = pair.second;
+                            if (value.get_type() != sol::type::table)
+                                throw sol::error("Install options must be a table");
+                            const sol::table &table = value.as<sol::table>();
+                            const QString name = table["name"];
+                            const QUrl url = QUrl::fromUserInput(table["url"]);
+                            if (url.scheme() != "https")
+                                throw sol::error("Only HTTPS is supported");
+
+                            const QString version = table["version"];
+                            installOptionsList.append({url, name, version});
+                        }
+                    } else {
+                        const QString name = installOptions["name"];
+                        const QUrl url = QUrl::fromUserInput(installOptions["url"]);
+                        const QString version = installOptions["version"];
+                        if (url.scheme() != "https")
+                            throw sol::error("Only HTTPS is supported");
+                        installOptionsList.append({url, name, version});
+                    }
+
+                    auto install = [&state, pluginSpec, installOptionsList, callback]() {
+                        auto tree = state.createTree();
+
+                        auto progress = new TaskProgress(tree);
+                        progress->setDisplayName(Tr::tr("Installing package(s) %1").arg("..."));
+
+                        tree->setRecipe(
+                            installRecipe(pluginSpec->appDataPath, installOptionsList, callback));
+                        tree->start();
+                    };
+
+                    auto denied = [callback]() { callback(false, "User denied installation"); };
+
+                    if (QApplication::activeModalWidget()) {
+                        auto msgBox = new QMessageBox(
+                            QMessageBox::Question,
+                            Tr::tr("Install Package"),
+                            msg,
+                            QMessageBox::Yes | QMessageBox::No,
+                            Core::ICore::dialogParent());
+
+                        const QString details
+                            = Tr::tr("The extension \"%1\" wants to install the following "
+                                     "package(s):\n\n")
+                                  .arg(pluginSpec->name)
+                              + Utils::transform(installOptionsList, [](const InstallOptions &options) {
+                                    //: %1 = package name, %2 = version, %3 = URL
+                                    return QString("* %1 - %2 (from: %3)")
+                                        .arg(options.name, options.version, options.url.toString());
+                                }).join("\n");
+
+                        msgBox->setDetailedText(details);
+
+                        auto guard = pluginSpec->connectionGuard.get();
+                        QObject::connect(msgBox, &QMessageBox::accepted, guard, install);
+                        QObject::connect(msgBox, &QMessageBox::rejected, guard, denied);
+
+                        msgBox->show();
+                        return;
+                    }
+
+                    const Utils::Id infoBarId = Utils::Id::fromString(
+                        "Install" + pluginSpec->name + QString::number(qHash(installOptionsList)));
+
+                    InfoBarEntry entry(infoBarId, msg, InfoBarEntry::GlobalSuppression::Enabled);
+
+                    entry.addCustomButton(Tr::tr("Install"), [install, infoBarId]() {
+                        install();
+                        Core::ICore::infoBar()->removeInfo(infoBarId);
+                    });
+
+                    entry.setCancelButtonInfo(denied);
+
+                    const QString details
+                        = Tr::tr("The extension \"%1\" wants to install the following "
+                                 "package(s):\n\n")
+                              .arg("**" + pluginSpec->name + "**") // markdown bold
+                          + Utils::transform(installOptionsList, [](const InstallOptions &options) {
+                                //: Markdown list item: %1 = package name, %2 = version, %3 = URL
+                                return Tr::tr("* %1 - %2 (from: [%3](%3))")
+                                    .arg(options.name, options.version, options.url.toString());
+                            }).join("\n");
+
+                    entry.setDetailsWidgetCreator([details]() -> QWidget * {
+                        QLabel *list = new QLabel();
+                        list->setTextFormat(Qt::TextFormat::MarkdownText);
+                        list->setText(details);
+                        list->setMargin(StyleHelper::SpacingTokens::ExPaddingGapS);
+                        return list;
+                    });
+                    Core::ICore::infoBar()->addInfo(entry);
+                };
+
+            install["install"] = wrap(install["install_cb"]);
+
+            return install;
+        });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/bindings/messagemanager.cpp b/src/plugins/lua/bindings/messagemanager.cpp
new file mode 100644
index 00000000000..f6b8e874ad3
--- /dev/null
+++ b/src/plugins/lua/bindings/messagemanager.cpp
@@ -0,0 +1,29 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "../luaengine.h"
+
+#include <coreplugin/messagemanager.h>
+
+namespace Lua::Internal {
+
+void addMessageManagerModule()
+{
+    LuaEngine::registerProvider("MessageManager", [](sol::state_view lua) -> sol::object {
+        sol::table mm = lua.create_table();
+
+        mm.set_function("writeFlashing", [](const sol::variadic_args &vargs) {
+            Core::MessageManager::writeFlashing(LuaEngine::variadicToStringList(vargs).join(""));
+        });
+        mm.set_function("writeDisrupting", [](const sol::variadic_args &vargs) {
+            Core::MessageManager::writeDisrupting(LuaEngine::variadicToStringList(vargs).join(""));
+        });
+        mm.set_function("writeSilently", [](const sol::variadic_args &vargs) {
+            Core::MessageManager::writeSilently(LuaEngine::variadicToStringList(vargs).join(""));
+        });
+
+        return mm;
+    });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/bindings/qtcprocess.cpp b/src/plugins/lua/bindings/qtcprocess.cpp
new file mode 100644
index 00000000000..ff2726a96ef
--- /dev/null
+++ b/src/plugins/lua/bindings/qtcprocess.cpp
@@ -0,0 +1,53 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "../luaengine.h"
+
+#include <utils/environment.h>
+#include <utils/qtcprocess.h>
+
+using namespace Utils;
+
+namespace Lua::Internal {
+
+void addProcessModule()
+{
+    LuaEngine::registerProvider("Process", [](sol::state_view lua) -> sol::object {
+        const ScriptPluginSpec *pluginSpec = lua.get<ScriptPluginSpec *>("PluginSpec");
+
+        sol::table async = lua.script("return require('async')", "_process_").get<sol::table>();
+        sol::function wrap = async["wrap"];
+
+        sol::table process = lua.create_table();
+
+        process["runInTerminal_cb"] =
+            [guard
+             = pluginSpec->connectionGuard.get()](const QString &cmdline, const sol::function &cb) {
+                Process *p = new Process;
+                p->setTerminalMode(TerminalMode::Run);
+                p->setCommand(CommandLine::fromUserInput((cmdline)));
+                p->setEnvironment(Environment::systemEnvironment());
+
+                QObject::connect(p, &Process::done, guard, [p, cb]() { cb(p->exitCode()); });
+            };
+
+        process["commandOutput_cb"] =
+            [guard
+             = pluginSpec->connectionGuard.get()](const QString &cmdline, const sol::function &cb) {
+                Process *p = new Process;
+                p->setCommand(CommandLine::fromUserInput((cmdline)));
+                p->setEnvironment(Environment::systemEnvironment());
+
+                QObject::connect(p, &Process::done, guard, [p, cb]() { cb(p->allOutput()); });
+
+                p->start();
+            };
+
+        process["runInTerminal"] = wrap(process["runInTerminal_cb"]);
+        process["commandOutput"] = wrap(process["commandOutput_cb"]);
+
+        return process;
+    });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/bindings/settings.cpp b/src/plugins/lua/bindings/settings.cpp
new file mode 100644
index 00000000000..241b1970c63
--- /dev/null
+++ b/src/plugins/lua/bindings/settings.cpp
@@ -0,0 +1,541 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "../luaengine.h"
+
+#include <utils/aspects.h>
+#include <utils/environment.h>
+#include <utils/layoutbuilder.h>
+
+#include <coreplugin/dialogs/ioptionspage.h>
+
+using namespace Utils;
+
+namespace Lua::Internal {
+
+class LuaAspectContainer : public AspectContainer
+{
+public:
+    using AspectContainer::AspectContainer;
+
+    sol::object dynamic_get(const std::string &key)
+    {
+        auto it = m_entries.find(key);
+        if (it == m_entries.cend()) {
+            return sol::lua_nil;
+        }
+        return it->second;
+    }
+
+    void dynamic_set(const std::string &key, const sol::stack_object &value)
+    {
+        if (!value.is<BaseAspect>())
+            throw std::runtime_error("AspectContainer can only contain BaseAspect instances");
+
+        registerAspect(value.as<BaseAspect *>(), false);
+
+        auto it = m_entries.find(key);
+        if (it == m_entries.cend()) {
+            m_entries.insert(it, {std::move(key), std::move(value)});
+        } else {
+            std::pair<const std::string, sol::object> &kvp = *it;
+            sol::object &entry = kvp.second;
+            entry = sol::object(std::move(value));
+        }
+    }
+
+    size_t size() const { return m_entries.size(); }
+
+public:
+    std::unordered_map<std::string, sol::object> m_entries;
+};
+
+std::unique_ptr<LuaAspectContainer> aspectContainerCreate(const sol::table &options)
+{
+    auto container = std::make_unique<LuaAspectContainer>();
+
+    for (const auto &[k, v] : options) {
+        if (k.is<std::string>()) {
+            std::string key = k.as<std::string>();
+            if (key == "autoApply") {
+                container->setAutoApply(v.as<bool>());
+            } else if (key == "layouter") {
+                if (v.is<sol::function>())
+                    container->setLayouter(
+                        [func = v.as<sol::function>()]() -> Layouting::Layout {
+                            auto res = Lua::LuaEngine::safe_call<Layouting::Layout>(func);
+                            QTC_ASSERT_EXPECTED(res, return {});
+                            return *res;
+                        });
+            } else {
+                container->m_entries[key] = v;
+                if (v.is<BaseAspect>()) {
+                    container->registerAspect(v.as<BaseAspect *>());
+                }
+            }
+        }
+    }
+
+    container->readSettings();
+
+    return container;
+}
+
+void baseAspectCreate(BaseAspect *aspect, const std::string &key, const sol::object &value)
+{
+    if (key == "settingsKey")
+        aspect->setSettingsKey(keyFromString(value.as<QString>()));
+    else if (key == "displayName")
+        aspect->setDisplayName(value.as<QString>());
+    else if (key == "labelText")
+        aspect->setLabelText(value.as<QString>());
+    else if (key == "toolTip")
+        aspect->setToolTip(value.as<QString>());
+    else if (key == "onValueChanged") {
+        QObject::connect(aspect, &BaseAspect::changed, aspect, [func = value.as<sol::function>()]() {
+            Lua::LuaEngine::void_safe_call(func);
+        });
+    } else if (key == "onVolatileValueChanged") {
+        QObject::connect(aspect,
+                         &BaseAspect::volatileValueChanged,
+                         aspect,
+                         [func = value.as<sol::function>()]() {
+                             Lua::LuaEngine::void_safe_call(func);
+                         });
+    } else if (key == "enabler")
+        aspect->setEnabler(value.as<BoolAspect *>());
+    else
+        qWarning() << "Unknown key:" << key.c_str();
+}
+
+template<class T>
+void typedAspectCreate(T *aspect, const std::string &key, const sol::object &value)
+{
+    if (key == "defaultValue")
+        aspect->setDefaultValue(value.as<typename T::valueType>());
+    else if (key == "value")
+        aspect->setValue(value.as<typename T::valueType>());
+    else
+        baseAspectCreate(aspect, key, value);
+}
+
+template<>
+void typedAspectCreate(StringAspect *aspect, const std::string &key, const sol::object &value)
+{
+    if (key == "displayStyle")
+        aspect->setDisplayStyle((StringAspect::DisplayStyle) value.as<int>());
+    else if (key == "historyId")
+        aspect->setHistoryCompleter(value.as<QString>().toLocal8Bit());
+    else if (key == "valueAcceptor")
+        aspect->setValueAcceptor([func = value.as<sol::function>()](const QString &oldValue,
+                                                                    const QString &newValue)
+                                     -> std::optional<QString> {
+            auto res = Lua::LuaEngine::safe_call<std::optional<QString>>(func, oldValue, newValue);
+            QTC_ASSERT_EXPECTED(res, return std::nullopt);
+            return *res;
+        });
+    else if (key == "showToolTipOnLabel")
+        aspect->setShowToolTipOnLabel(value.as<bool>());
+    else if (key == "displayFilter")
+        aspect->setDisplayFilter([func = value.as<sol::function>()](const QString &value) {
+            auto res = Lua::LuaEngine::safe_call<QString>(func, value);
+            QTC_ASSERT_EXPECTED(res, return value);
+            return *res;
+        });
+    else if (key == "placeHolderText")
+        aspect->setPlaceHolderText(value.as<QString>());
+    else if (key == "acceptRichText")
+        aspect->setAcceptRichText(value.as<bool>());
+    else if (key == "autoApplyOnEditingFinished")
+        aspect->setAutoApplyOnEditingFinished(value.as<bool>());
+    else if (key == "elideMode")
+        aspect->setElideMode((Qt::TextElideMode) value.as<int>());
+    else
+        typedAspectCreate(static_cast<TypedAspect<QString> *>(aspect), key, value);
+}
+
+template<>
+void typedAspectCreate(FilePathAspect *aspect, const std::string &key, const sol::object &value)
+{
+    if (key == "defaultPath")
+        aspect->setDefaultPathValue(value.as<FilePath>());
+    else if (key == "historyId")
+        aspect->setHistoryCompleter(value.as<QString>().toLocal8Bit());
+    else if (key == "promptDialogFilter")
+        aspect->setPromptDialogFilter(value.as<QString>());
+    else if (key == "promptDialogTitle")
+        aspect->setPromptDialogTitle(value.as<QString>());
+    else if (key == "commandVersionArguments")
+        aspect->setCommandVersionArguments(value.as<QStringList>());
+    else if (key == "allowPathFromDevice")
+        aspect->setAllowPathFromDevice(value.as<bool>());
+    else if (key == "validatePlaceHolder")
+        aspect->setValidatePlaceHolder(value.as<bool>());
+    else if (key == "openTerminalHandler")
+        aspect->setOpenTerminalHandler([func = value.as<sol::function>()]() {
+            auto res = Lua::LuaEngine::void_safe_call(func);
+            QTC_CHECK_EXPECTED(res);
+        });
+    else if (key == "expectedKind")
+        aspect->setExpectedKind((PathChooser::Kind) value.as<int>());
+    else if (key == "environment")
+        aspect->setEnvironment(value.as<Environment>());
+    else if (key == "baseFileName")
+        aspect->setBaseFileName(value.as<FilePath>());
+    else if (key == "valueAcceptor")
+        aspect->setValueAcceptor([func = value.as<sol::function>()](const QString &oldValue,
+                                                                    const QString &newValue)
+                                     -> std::optional<QString> {
+            auto res = Lua::LuaEngine::safe_call<std::optional<QString>>(func, oldValue, newValue);
+            QTC_ASSERT_EXPECTED(res, return std::nullopt);
+            return *res;
+        });
+    else if (key == "showToolTipOnLabel")
+        aspect->setShowToolTipOnLabel(value.as<bool>());
+    else if (key == "autoApplyOnEditingFinished")
+        aspect->setAutoApplyOnEditingFinished(value.as<bool>());
+    /*else if (key == "validationFunction")
+        aspect->setValidationFunction(
+            [func = value.as<sol::function>()](const QString &path) {
+                return func.call<std::optional<QString>>(path);
+            });
+    */
+    else if (key == "displayFilter")
+        aspect->setDisplayFilter([func = value.as<sol::function>()](const QString &path) {
+            auto res = Lua::LuaEngine::safe_call<QString>(func, path);
+            QTC_ASSERT_EXPECTED(res, return path);
+            return *res;
+        });
+    else if (key == "placeHolderText")
+        aspect->setPlaceHolderText(value.as<QString>());
+    else
+        typedAspectCreate(static_cast<TypedAspect<QString> *>(aspect), key, value);
+}
+
+template<>
+void typedAspectCreate(BoolAspect *aspect, const std::string &key, const sol::object &value)
+{
+    if (key == "labelPlacement") {
+        aspect->setLabelPlacement((BoolAspect::LabelPlacement) value.as<int>());
+    } else {
+        typedAspectCreate(static_cast<TypedAspect<bool> *>(aspect), key, value);
+    }
+}
+
+template<class T>
+std::unique_ptr<T> createAspectFromTable(
+    const sol::table &options, const std::function<void(T *, const std::string &, sol::object)> &f)
+{
+    auto aspect = std::make_unique<T>();
+
+    for (const auto &[k, v] : options) {
+        if (k.template is<std::string>()) {
+            f(aspect.get(), k.template as<std::string>(), v);
+        }
+    }
+
+    return aspect;
+}
+
+template<class T>
+void addTypedAspectBaseBindings(sol::table &lua)
+{
+    lua.new_usertype<TypedAspect<T>>("TypedAspect<bool>",
+                                     "value",
+                                     sol::property(&TypedAspect<T>::value,
+                                                   [](TypedAspect<T> *a, const T &v) {
+                                                       a->setValue(v);
+                                                   }),
+                                     "volatileValue",
+                                     sol::property(&TypedAspect<T>::volatileValue,
+                                                   [](TypedAspect<T> *a, const T &v) {
+                                                       a->setVolatileValue(v);
+                                                   }),
+                                     "defaultValue",
+                                     sol::property(&TypedAspect<T>::defaultValue),
+                                     sol::base_classes,
+                                     sol::bases<BaseAspect>());
+}
+
+template<class T>
+sol::usertype<T> addTypedAspect(sol::table &lua, const QString &name)
+{
+    addTypedAspectBaseBindings<typename T::valueType>(lua);
+
+    return lua.new_usertype<T>(
+        name,
+        "create",
+        [](const sol::table &options) {
+            return createAspectFromTable<T>(options, &typedAspectCreate<T>);
+        },
+        sol::base_classes,
+        sol::bases<TypedAspect<typename T::valueType>, BaseAspect>());
+}
+
+void addSettingsModule()
+{
+    LuaEngine::registerProvider("Settings", [](sol::state_view l) -> sol::object {
+        sol::table settings = l.create_table();
+
+        settings.new_usertype<BaseAspect>("Aspect", "apply", &BaseAspect::apply);
+
+        settings.new_usertype<LuaAspectContainer>("AspectContainer",
+                                                  "create",
+                                                  &aspectContainerCreate,
+                                                  "apply",
+                                                  &LuaAspectContainer::apply,
+                                                  sol::meta_function::index,
+                                                  &LuaAspectContainer::dynamic_get,
+                                                  sol::meta_function::new_index,
+                                                  &LuaAspectContainer::dynamic_set,
+                                                  sol::meta_function::length,
+                                                  &LuaAspectContainer::size,
+                                                  sol::base_classes,
+                                                  sol::bases<AspectContainer, BaseAspect>());
+
+        addTypedAspect<BoolAspect>(settings, "BoolAspect");
+        addTypedAspect<ColorAspect>(settings, "ColorAspect");
+        addTypedAspect<SelectionAspect>(settings, "SelectionAspect");
+        addTypedAspect<MultiSelectionAspect>(settings, "MultiSelectionAspect");
+        addTypedAspect<StringAspect>(settings, "StringAspect");
+
+        auto filePathAspectType = addTypedAspect<FilePathAspect>(settings, "FilePathAspect");
+        filePathAspectType.set(
+            "setValue",
+            sol::overload(
+                [](FilePathAspect &self, const QString &value) {
+                    self.setValue(FilePath::fromUserInput(value));
+                },
+                [](FilePathAspect &self, const FilePath &value) { self.setValue(value); }));
+        filePathAspectType.set("expandedValue", sol::property(&FilePathAspect::expandedValue));
+        filePathAspectType.set(
+            "defaultPath",
+            sol::property(
+                [](FilePathAspect &self) { return FilePath::fromUserInput(self.defaultValue()); },
+                &FilePathAspect::setDefaultPathValue));
+
+        addTypedAspect<IntegerAspect>(settings, "IntegerAspect");
+        addTypedAspect<DoubleAspect>(settings, "DoubleAspect");
+        addTypedAspect<StringListAspect>(settings, "StringListAspect");
+        addTypedAspect<FilePathListAspect>(settings, "FilePathListAspect");
+        addTypedAspect<IntegersAspect>(settings, "IntegersAspect");
+        addTypedAspect<StringSelectionAspect>(settings, "StringSelectionAspect");
+
+        settings.new_usertype<ToggleAspect>(
+            "ToggleAspect",
+            "create",
+            [](const sol::table &options) {
+                return createAspectFromTable<ToggleAspect>(
+                    options,
+                    [](ToggleAspect *aspect, const std::string &key, const sol::object &value) {
+                        if (key == "offIcon")
+                            aspect->setOffIcon(QIcon(value.as<QString>()));
+                        else if (key == "offTooltip")
+                            aspect->setOffTooltip(value.as<QString>());
+                        else if (key == "onIcon")
+                            aspect->setOnIcon(QIcon(value.as<QString>()));
+                        else if (key == "onTooltip")
+                            aspect->setOnTooltip(value.as<QString>());
+                        else if (key == "onText")
+                            aspect->setOnText(value.as<QString>());
+                        else if (key == "offText")
+                            aspect->setOffText(value.as<QString>());
+                        else
+                            typedAspectCreate(aspect, key, value);
+                    });
+            },
+            "action",
+            &ToggleAspect::action,
+            sol::base_classes,
+            sol::bases<BoolAspect, TypedAspect<bool>, BaseAspect>());
+
+        static auto triStateFromString = [](const QString &str) -> TriState {
+            const QString l = str.toLower();
+            if (l == "enabled")
+                return TriState::Enabled;
+            else if (l == "disabled")
+                return TriState::Disabled;
+            else if (l == "default")
+                return TriState::Default;
+            else
+                return TriState::Default;
+        };
+
+        static auto triStateToString = [](TriState state) -> QString {
+            if (state == TriState::Enabled)
+                return "enabled";
+            else if (state == TriState::Disabled)
+                return "disabled";
+            return "default";
+        };
+
+        settings.new_usertype<TriStateAspect>(
+            "TriStateAspect",
+            "create",
+            [](const sol::table &options) {
+                return createAspectFromTable<TriStateAspect>(
+                    options,
+                    [](TriStateAspect *aspect, const std::string &key, const sol::object &value) {
+                        if (key == "defaultValue")
+                            aspect->setDefaultValue(triStateFromString(value.as<QString>()));
+                        else if (key == "value")
+                            aspect->setValue(triStateFromString(value.as<QString>()));
+                        else
+                            baseAspectCreate(aspect, key, value);
+                    });
+            },
+            "value",
+            sol::property(
+                [](TriStateAspect *a) { return triStateToString(a->value()); },
+                [](TriStateAspect *a, const QString &v) { a->setValue(triStateFromString(v)); }),
+            "volatileValue",
+            sol::property(
+                [](TriStateAspect *a) {
+                    return triStateToString(TriState::fromInt(a->volatileValue()));
+                },
+                [](TriStateAspect *a, const QString &v) {
+                    a->setVolatileValue(triStateFromString(v).toInt());
+                }),
+            "defaultValue",
+            sol::property([](TriStateAspect *a) { return triStateToString(a->defaultValue()); }),
+            sol::base_classes,
+            sol::bases<SelectionAspect, TypedAspect<int>, BaseAspect>());
+
+        settings.new_usertype<TextDisplay>(
+            "TextDisplay",
+            "create",
+            [](const sol::table &options) {
+                return createAspectFromTable<TextDisplay>(
+                    options,
+                    [](TextDisplay *aspect, const std::string &key, const sol::object &value) {
+                        if (key == "text") {
+                            aspect->setText(value.as<QString>());
+                        } else if (key == "iconType") {
+                            const QString type = value.as<QString>().toLower();
+
+                            if (type.isEmpty() || type == "None")
+                                aspect->setIconType(Utils::InfoLabel::InfoType::None);
+                            else if (type == "information")
+                                aspect->setIconType(Utils::InfoLabel::InfoType::Information);
+                            else if (type == "warning")
+                                aspect->setIconType(Utils::InfoLabel::InfoType::Warning);
+                            else if (type == "error")
+                                aspect->setIconType(Utils::InfoLabel::InfoType::Error);
+                            else if (type == "ok")
+                                aspect->setIconType(Utils::InfoLabel::InfoType::Ok);
+                            else if (type == "notok")
+                                aspect->setIconType(Utils::InfoLabel::InfoType::NotOk);
+                            else
+                                aspect->setIconType(Utils::InfoLabel::InfoType::None);
+                        } else {
+                            baseAspectCreate(aspect, key, value);
+                        }
+                    });
+            },
+            sol::base_classes,
+            sol::bases<BaseAspect>());
+
+        settings.new_usertype<AspectList>(
+            "AspectList",
+            "create",
+            [](const sol::table &options) {
+                return createAspectFromTable<AspectList>(
+                    options,
+                    [](AspectList *aspect, const std::string &key, const sol::object &value) {
+                        if (key == "createItemFunction") {
+                            aspect->setCreateItemFunction([func = value.as<sol::function>()]()
+                                                              -> std::shared_ptr<BaseAspect> {
+                                auto res = Lua::LuaEngine::safe_call<std::shared_ptr<BaseAspect>>(
+                                    func);
+                                QTC_ASSERT_EXPECTED(res, return nullptr);
+                                return *res;
+                            });
+                        } else if (key == "onItemAdded") {
+                            aspect->setItemAddedCallback([func = value.as<sol::function>()](
+                                                             std::shared_ptr<BaseAspect> item) {
+                                auto res = Lua::LuaEngine::void_safe_call(func, item);
+                                QTC_CHECK_EXPECTED(res);
+                            });
+                        } else if (key == "onItemRemoved") {
+                            aspect->setItemRemovedCallback([func = value.as<sol::function>()](
+                                                               std::shared_ptr<BaseAspect> item) {
+                                auto res = Lua::LuaEngine::void_safe_call(func, item);
+                                QTC_CHECK_EXPECTED(res);
+                            });
+                        } else {
+                            baseAspectCreate(aspect, key, value);
+                        }
+                    });
+            },
+            "createAndAddItem",
+            &AspectList::createAndAddItem,
+            "foreach",
+            [](AspectList *a, const sol::function &clbk) {
+                a->forEachItem<BaseAspect>([clbk](std::shared_ptr<BaseAspect> item) {
+                    auto res = Lua::LuaEngine::void_safe_call(clbk, item);
+                    QTC_CHECK_EXPECTED(res);
+                });
+            },
+            "enumerate",
+            [](AspectList *a, const sol::function &clbk) {
+                a->forEachItem<BaseAspect>([clbk](std::shared_ptr<BaseAspect> item, int idx) {
+                    auto res = Lua::LuaEngine::void_safe_call(clbk, item, idx);
+                    QTC_CHECK_EXPECTED(res);
+                });
+            },
+            sol::base_classes,
+            sol::bases<BaseAspect>());
+
+        class OptionsPage : public Core::IOptionsPage
+        {
+        public:
+            OptionsPage(const sol::table &options)
+            {
+                setId(Id::fromString(options.get<QString>("id")));
+                setDisplayName(options.get<QString>("displayName"));
+                setCategory(Id::fromString(options.get<QString>("categoryId")));
+                setDisplayCategory(options.get<QString>("displayCategory"));
+                setCategoryIconPath(
+                    FilePath::fromUserInput(options.get<QString>("categoryIconPath")));
+                AspectContainer *container = options.get<AspectContainer *>("aspectContainer");
+                setSettingsProvider([container]() { return container; });
+            }
+        };
+
+        settings.new_usertype<OptionsPage>("OptionsPage", "create", [](const sol::table &options) {
+            return std::make_unique<OptionsPage>(options);
+        });
+
+        // clang-format off
+        settings["StringDisplayStyle"] = l.create_table_with(
+            "Label", StringAspect::DisplayStyle::LabelDisplay,
+            "LineEdit", StringAspect::DisplayStyle::LineEditDisplay,
+            "TextEdit", StringAspect::DisplayStyle::TextEditDisplay,
+            "PasswordLineEdit", StringAspect::DisplayStyle::PasswordLineEditDisplay
+        );
+
+        settings["CheckBoxPlacement"] = l.create_table_with(
+            "Top", CheckBoxPlacement::Top,
+            "Right", CheckBoxPlacement::Right
+        );
+        settings["Kind"] = l.create_table_with(
+            "ExistingDirectory", PathChooser::Kind::ExistingDirectory,
+            "Directory", PathChooser::Kind::Directory,
+            "File", PathChooser::Kind::File,
+            "SaveFile", PathChooser::Kind::SaveFile,
+            "ExistingCommand", PathChooser::Kind::ExistingCommand,
+            "Command", PathChooser::Kind::Command,
+            "Any", PathChooser::Kind::Any
+        );
+        settings["LabelPlacement"] = l.create_table_with(
+            "AtCheckBox", BoolAspect::LabelPlacement::AtCheckBox,
+            "Compact", BoolAspect::LabelPlacement::Compact,
+            "InExtraLabel", BoolAspect::LabelPlacement::InExtraLabel
+        );
+        // clang-format on
+
+        return settings;
+    });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/bindings/utils.cpp b/src/plugins/lua/bindings/utils.cpp
new file mode 100644
index 00000000000..2ed5a4601e5
--- /dev/null
+++ b/src/plugins/lua/bindings/utils.cpp
@@ -0,0 +1,164 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "../luaengine.h"
+#include "../luaqttypes.h"
+
+#include <utils/async.h>
+#include <utils/futuresynchronizer.h>
+#include <utils/hostosinfo.h>
+
+#include <QTimer>
+
+using namespace Utils;
+
+namespace Lua::Internal {
+
+void addUtilsModule()
+{
+    LuaEngine::registerProvider(
+        "Utils",
+        [futureSync = Utils::FutureSynchronizer()](sol::state_view lua) mutable -> sol::object {
+            const ScriptPluginSpec *pluginSpec = lua.get<ScriptPluginSpec *>("PluginSpec");
+
+            auto async = lua.script("return require('async')", "_utils_").get<sol::table>();
+
+            sol::table utils = lua.create_table();
+
+            utils.set_function("waitms_cb", [guard = pluginSpec->connectionGuard.get()](int ms, const sol::function &cb) {
+                QTimer::singleShot(ms, guard, [cb]() { cb(); });
+            });
+
+            auto dirEntries_cb =
+                [&futureSync, guard = pluginSpec->connectionGuard.get()](
+                    const FilePath &p, const sol::table &options, const sol::function &cb) {
+                    const QStringList nameFilters = options.get_or<QStringList>("nameFilters", {});
+                    QDir::Filters fileFilters
+                        = (QDir::Filters) options.get_or<int>("fileFilters", QDir::NoFilter);
+                    QDirIterator::IteratorFlags flags
+                        = (QDirIterator::IteratorFlags)
+                              options.get_or<int>("flags", QDirIterator::NoIteratorFlags);
+
+                    FileFilter filter(nameFilters, fileFilters, flags);
+
+                    QFuture<FilePath> future = Utils::asyncRun(
+                        [p, filter](QPromise<FilePath> &promise) {
+                            p.iterateDirectory(
+                                [&promise](const FilePath &item) {
+                                    if (promise.isCanceled())
+                                        return IterationPolicy::Stop;
+
+                                    promise.addResult(item);
+                                    return IterationPolicy::Continue;
+                                },
+                                filter);
+                        });
+
+                    futureSync.addFuture<FilePath>(future);
+
+                    Utils::onFinished<FilePath>(future, guard, [cb](const QFuture<FilePath> &future) {
+                        cb(future.results());
+                    });
+                };
+
+            auto searchInPath_cb = [&futureSync,
+                                    guard = pluginSpec->connectionGuard
+                                                .get()](const FilePath &p, const sol::function &cb) {
+                QFuture<FilePath> future = Utils::asyncRun(
+                    [p](QPromise<FilePath> &promise) { promise.addResult(p.searchInPath()); });
+
+                futureSync.addFuture<FilePath>(future);
+
+                Utils::onFinished<FilePath>(future, guard, [cb](const QFuture<FilePath> &future) {
+                    cb(future.result());
+                });
+            };
+
+            utils.set_function("__dirEntries_cb__", dirEntries_cb);
+            utils.set_function("__searchInPath_cb__", searchInPath_cb);
+
+            sol::function wrap = async["wrap"].get<sol::function>();
+
+            utils["waitms"] = wrap(utils["waitms_cb"]);
+
+            auto hostOsInfoType = utils.new_usertype<HostOsInfo>("HostOsInfo");
+            hostOsInfoType["isWindowsHost"] = &HostOsInfo::isWindowsHost;
+            hostOsInfoType["isMacHost"] = &HostOsInfo::isMacHost;
+            hostOsInfoType["isLinuxHost"] = &HostOsInfo::isLinuxHost;
+            hostOsInfoType["os"] = sol::var([]() {
+                if (HostOsInfo::isMacHost())
+                    return "mac";
+                else if (HostOsInfo::isLinuxHost())
+                    return "linux";
+                else if (HostOsInfo::isWindowsHost())
+                    return "windows";
+                else
+                    return "unknown";
+            }());
+            hostOsInfoType["architecture"] = sol::var([]() {
+                switch (HostOsInfo::hostArchitecture()) {
+                case OsArchUnknown:
+                    return "unknown";
+                case OsArchX86:
+                    return "x86";
+                case OsArchAMD64:
+                    return "x86_64";
+                case OsArchItanium:
+                    return "itanium";
+                case OsArchArm:
+                    return "arm";
+                case OsArchArm64:
+                    return "arm64";
+                default:
+                    return "unknown";
+                }
+            }());
+
+            sol::usertype<FilePath> filePathType = utils.new_usertype<FilePath>(
+                "FilePath",
+                sol::call_constructor,
+                sol::constructors<FilePath()>(),
+                sol::meta_function::to_string,
+                &FilePath::toUserOutput,
+                "fromUserInput",
+                &FilePath::fromUserInput,
+                "exists",
+                &FilePath::exists,
+                "resolveSymlinks",
+                &FilePath::resolveSymlinks,
+                "isExecutableFile",
+                &FilePath::isExecutableFile,
+                "isDir",
+                &FilePath::isDir,
+                "nativePath",
+                &FilePath::nativePath,
+                "toUserOutput",
+                &FilePath::toUserOutput,
+                "fileName",
+                &FilePath::fileName,
+                "currentWorkingPath",
+                &FilePath::currentWorkingPath,
+                "parentDir",
+                &FilePath::parentDir,
+                "suffix",
+                &FilePath::suffix,
+                "completeSuffix",
+                &FilePath::completeSuffix,
+                "isAbsolutePath",
+                &FilePath::isAbsolutePath,
+                "resolvePath",
+                sol::overload(
+                    [](const FilePath &p, const QString &path) { return p.resolvePath(path); },
+                    [](const FilePath &p, const FilePath &path) { return p.resolvePath(path); }));
+
+            utils["FilePath"]["dirEntries_cb"] = utils["__dirEntries_cb__"];
+            utils["FilePath"]["dirEntries"] = wrap(utils["__dirEntries_cb__"]);
+
+            utils["FilePath"]["searchInPath_cb"] = utils["__searchInPath_cb__"];
+            utils["FilePath"]["searchInPath"] = wrap(utils["__searchInPath_cb__"]);
+
+            return utils;
+        });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/generateqtbindings.cpp b/src/plugins/lua/generateqtbindings.cpp
new file mode 100644
index 00000000000..c7ed25dfd8e
--- /dev/null
+++ b/src/plugins/lua/generateqtbindings.cpp
@@ -0,0 +1,401 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "lua_global.h"
+
+#include "luaapiregistry.h"
+#include "luaengine.h"
+
+#include <utils/layoutbuilder.h>
+
+#include <QAbstractButton>
+#include <QAbstractSlider>
+#include <QAbstractSpinBox>
+#include <QCalendarWidget>
+#include <QComboBox>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QDockWidget>
+#include <QElapsedTimer>
+#include <QFocusFrame>
+#include <QFrame>
+#include <QGroupBox>
+#include <QKeySequenceEdit>
+#include <QLineEdit>
+#include <QMainWindow>
+#include <QMdiSubWindow>
+#include <QMenu>
+#include <QMenuBar>
+#include <QMetaProperty>
+#include <QProgressBar>
+#include <QRubberBand>
+#include <QSizeGrip>
+#include <QSplashScreen>
+#include <QSplitterHandle>
+#include <QStatusBar>
+#include <QTabBar>
+#include <QTabWidget>
+#include <QToolBar>
+#include <QWizardPage>
+
+#include <fstream>
+#include <iostream>
+#include <valarray>
+
+namespace Lua::Internal {
+
+QStringList baseClasses(const QMetaObject *metaObject)
+{
+    QStringList bases;
+    const QMetaObject *base = metaObject;
+    while ((base = base->superClass())) {
+        bases << QString::fromLocal8Bit(base->className());
+    }
+    return bases;
+}
+
+bool isBaseClassProperty(QString name, const QMetaObject *metaObject)
+{
+    const QMetaObject *base = metaObject;
+    while ((base = base->superClass())) {
+        for (int i = 0; i < base->propertyCount(); ++i) {
+            QMetaProperty p = base->property(i);
+            if (QString::fromLocal8Bit(p.name()) == name)
+                return true;
+        }
+    }
+    return false;
+}
+
+template<class T>
+QString createQObjectRegisterCode()
+{
+    // Add new types here when you've added "sol_lua_check, sol_lua_get and sol_lua_push" for them.
+    // clang-format off
+    static const QStringList whiteListedTypes = {
+        "bool", "int", "double", "float",
+        "QString", "QRect"};
+    // clang-format on
+
+    auto &metaObject = T::staticMetaObject;
+    auto className = QString::fromLocal8Bit(metaObject.className());
+
+    QStringList parts = {};
+
+    // properties
+    for (int i = 0; i < metaObject.propertyCount(); ++i) {
+        QMetaProperty p = metaObject.property(i);
+        QMetaType t = p.metaType();
+        QString typeName = QString::fromLocal8Bit(t.name());
+        QString propName = QString::fromLocal8Bit(p.name());
+        if (isBaseClassProperty(propName, &metaObject))
+            continue;
+
+        if (!p.isEnumType() && !whiteListedTypes.contains(typeName)) {
+            qDebug() << "Skipping" << p.name() << "of type" << typeName
+                     << "as it is not whitelisted";
+            continue;
+        }
+
+        QString propTemplate
+            = QString("    \"%1\",\nsol::property(").arg(QString::fromLocal8Bit(p.name()));
+
+        if (p.isReadable()) {
+            QString readTemplate;
+
+            if (p.isEnumType()) {
+                readTemplate = QString(R"([](const %1 *obj) -> const char * {
+                    auto p = %1::staticMetaObject.property(%2);
+                    int v = p.read(obj).toInt();
+                    return p.enumerator().valueToKey(v);
+            })")
+                                   .arg(className)
+                                   .arg(i);
+
+            } else {
+                readTemplate = QString(R"([](const %1 *obj) -> %2 {
+    return qvariant_cast<%2>(
+        %1::staticMetaObject.property(%3).read(obj));
+    })")
+                                   .arg(className)
+                                   .arg(typeName)
+                                   .arg(i);
+            }
+
+            propTemplate += readTemplate;
+        }
+
+        if (p.isWritable()) {
+            QString writeTemplate = ",\n";
+
+            if (p.isEnumType()) {
+                writeTemplate += QString(R"([](%1 *obj, const char *v) {
+                    auto p = %1::staticMetaObject.property(%2);
+                    int i = p.enumerator().keyToValue(v);
+                    p.write(obj, i);
+            })")
+                                     .arg(className)
+                                     .arg(i);
+
+            } else {
+                writeTemplate += QString(R"([](%1 *obj, %2 v) {
+    %1::staticMetaObject.property(%3).write(obj, QVariant::fromValue(v));
+    })")
+                                     .arg(className)
+                                     .arg(typeName)
+                                     .arg(i);
+            }
+
+            propTemplate += writeTemplate;
+        }
+
+        propTemplate += ")";
+
+        parts << propTemplate;
+    }
+
+    // Methods
+
+    /*for (int i = 0; i < metaObject.methodCount(); i++) {
+        QMetaMethod m = metaObject.method(i);
+        QString methodTemplate;
+        if (m.methodType() == QMetaMethod::Signal) {
+            QString name = QString::fromLocal8Bit(m.name());
+            name[0] = name[0].toUpper();
+            name = "on" + name;
+
+            methodTemplate = QString("    \"%1\",\n").arg(name);
+
+
+
+        } else if (m.methodType() == QMetaMethod::Slot) {
+        } else if (m.methodType() == QMetaMethod::Method) {
+        } else if (m.methodType() == QMetaMethod::Constructor) {
+        } else {
+            qDebug() << "Unknown method type" << m.methodType();
+        }
+
+        templateString += methodTemplate;
+    }*/
+
+    // Generate base classes
+    if (metaObject.superClass()) {
+        parts << QString("sol::base_classes,\nsol::bases<%1>()")
+                     .arg(baseClasses(&metaObject).join(','));
+    }
+
+    const QString registerFunctionTemplate = QString(R"(
+static void register%1Bindings(sol::state &lua) {
+    lua.new_usertype<%1>("%1",
+                         %2
+    );
+}
+    )")
+                                                 .arg(className)
+                                                 .arg(parts.join(",\n"));
+
+    return registerFunctionTemplate;
+}
+
+template<class... Classes>
+QStringList createQObjectRegisterCodes()
+{
+    QStringList result;
+    ((result << createQObjectRegisterCode<Classes>()), ...);
+    return result;
+}
+
+template<class... Classes>
+QStringList createRegisterCalls()
+{
+    QStringList result;
+    ((result << QString("register%1Bindings(lua);")
+                    .arg(QString::fromLocal8Bit(Classes::staticMetaObject.className()))),
+     ...);
+    return result;
+}
+
+template<class... Classes>
+QStringList createIncludeCalls()
+{
+    QStringList result;
+    ((result << QString("#include <%1>")
+                    .arg(QString::fromLocal8Bit(Classes::staticMetaObject.className()))),
+     ...);
+    return result;
+}
+
+template<class... Classes>
+QString createBindings()
+{
+    QStringList registerFunctions = createQObjectRegisterCodes<Classes...>();
+
+    QString finalFunction = QString(R"(
+void registerUiBindings() {
+    auto &lua = LuaEngine::instance().lua();
+    %1
+}
+    )")
+                                .arg(createRegisterCalls<Classes...>().join('\n'));
+
+    return QString(R"(
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "lua_global.h"
+#include "luaengine.h"
+
+#include <QMetaProperty>
+
+%1
+
+namespace Lua::Internal
+{
+    %2
+
+    %3
+}
+    )")
+        .arg(createIncludeCalls<Classes...>().join('\n'))
+        .arg(registerFunctions.join('\n'))
+        .arg(finalFunction);
+}
+
+void createWidgetBindings()
+{
+    std::ofstream out("/tmp/bindings.cpp", std::ios::out | std::ios::trunc);
+
+    out << createBindings<QObject,
+                          QWidget,
+                          QDialog,
+                          QAbstractButton,
+                          QAbstractSlider,
+                          QAbstractSpinBox,
+                          QCalendarWidget,
+                          QComboBox,
+                          QDialogButtonBox,
+                          QDockWidget,
+                          QFocusFrame,
+                          QFrame,
+                          QGroupBox,
+                          QKeySequenceEdit,
+                          QLineEdit,
+                          QMainWindow,
+                          QMdiSubWindow,
+                          QMenu,
+                          QMenuBar,
+                          QProgressBar,
+                          QRubberBand,
+                          QSizeGrip,
+                          QSplashScreen,
+                          QSplitterHandle,
+                          QStatusBar,
+                          QTabBar,
+                          QTabWidget,
+                          QToolBar,
+                          QWizardPage>()
+               .toStdString()
+        << std::endl;
+
+    qDebug() << "Done!";
+}
+
+template<typename... T>
+std::valarray<QString> createTypeBinding(QString typeName, QString fieldTypeName, T... fields)
+{
+    QString cppTemplateStr = R"(
+// %1
+bool sol_lua_check(sol::types<%1>,
+                   lua_State *L,
+                   int index,
+                   std::function<sol::check_handler_type> handler,
+                   sol::stack::record &tracking)
+{ return sol::stack::check<sol::table>(L, index, handler, tracking); }
+%1 sol_lua_get(sol::types<%1>, lua_State *L, int index, sol::stack::record &tracking)
+{
+    sol::state_view lua(L);
+    sol::table table = sol::stack::get<sol::table>(L, index, tracking);
+    return %2;
+}
+int sol_lua_push(sol::types<%1>, lua_State *L, const %1 &value)
+{
+    sol::state_view lua(L);
+    sol::table table = lua.create_table();
+    %3;
+    return sol::stack::push(L, table);
+}
+)";
+
+    QString headerTemplateStr = R"(SOL_CONVERSION_FUNCTIONS(%1)
+)";
+
+    auto createField = [&](const std::pair<QString, QString> &field) {
+        return QString("table.get_or<%1, const char *, %1>(\"%2\", %3)")
+            .arg(fieldTypeName)
+            .arg(field.first)
+            .arg(field.second);
+    };
+    QString createTypeFromTable = QString("%1(%2)").arg(typeName).arg(
+        QStringList{createField(fields)...}.join(','));
+
+    QString createTableFromType
+        = QString("table.set(%1)")
+              .arg(QStringList{QString(R"("%1", value.%1())").arg(fields.first)...}.join(','));
+
+    return {cppTemplateStr.arg(typeName).arg(createTypeFromTable).arg(createTableFromType),
+            headerTemplateStr.arg(typeName)};
+}
+
+void createTypeBindings()
+{
+    std::valarray<QString> code = {"", R"(
+#define SOL_CONVERSION_FUNCTIONS(TYPE) \
+    bool LUA_EXPORT sol_lua_check(sol::types<TYPE>, \
+                                  lua_State *L, \
+                                  int index, \
+                                  std::function<sol::check_handler_type> handler, \
+                                  sol::stack::record &tracking); \
+    TYPE LUA_EXPORT sol_lua_get(sol::types<TYPE>, \
+                                lua_State *L, \
+                                int index, \
+                                sol::stack::record &tracking); \
+    int LUA_EXPORT sol_lua_push(sol::types<TYPE>, lua_State *L, const TYPE &rect);
+
+    SOL_CONVERSION_FUNCTIONS(QString)
+
+)"};
+
+    using T = std::pair<QString, QString>;
+
+    code += createTypeBinding("QRect",
+                              "int",
+                              T{"x", "0"},
+                              T{"y", "0"},
+                              T{"width", "0"},
+                              T{"height", "0"});
+    code += createTypeBinding("QSize", "int", T{"width", "0"}, T{"height", "0"});
+    code += createTypeBinding("QPoint", "int", T{"x", "0"}, T{"y", "0"});
+
+    code += createTypeBinding("QRectF",
+                              "qreal",
+                              T{"x", "0.0"},
+                              T{"y", "0.0"},
+                              T{"width", "0.0"},
+                              T{"height", "0.0"});
+    code += createTypeBinding("QSizeF", "qreal", T{"width", "0.0"}, T{"height", "0.0"});
+    code += createTypeBinding("QPointF", "qreal", T{"x", "0.0"}, T{"y", "0.0"});
+
+    code += createTypeBinding("QColor",
+                              "int",
+                              T{"red", "0"},
+                              T{"green", "0"},
+                              T{"blue", "0"},
+                              T{"alpha", "255"});
+
+    code[1] += "\n#undef SOL_CONVERSION_FUNCTIONS\n";
+
+    qDebug().noquote() << code[0];
+    qDebug().noquote() << code[1];
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/images/settingscategory_lua.png b/src/plugins/lua/images/settingscategory_lua.png
new file mode 100644
index 00000000000..7f1b6808fea
Binary files /dev/null and b/src/plugins/lua/images/settingscategory_lua.png differ
diff --git a/src/plugins/lua/images/settingscategory_lua@2x.png b/src/plugins/lua/images/settingscategory_lua@2x.png
new file mode 100644
index 00000000000..a70400124db
Binary files /dev/null and b/src/plugins/lua/images/settingscategory_lua@2x.png differ
diff --git a/src/plugins/lua/lua.qbs b/src/plugins/lua/lua.qbs
new file mode 100644
index 00000000000..f9689e208f2
--- /dev/null
+++ b/src/plugins/lua/lua.qbs
@@ -0,0 +1,101 @@
+import qbs 1.0
+
+QtcPlugin {
+    name: "Lua"
+
+    Depends { name: "Core" }
+    Depends { name: "Qt"; submodules: ["network", "widgets"] }
+
+    Depends { name: "lua546" }
+    Depends { name: "sol2" }
+
+    files: [
+        // "generateqtbindings.cpp", // use this if you need to generate some code
+        "lua_global.h",
+        "luaengine.cpp",
+        "luaengine.h",
+        "luaplugin.cpp",
+        "luapluginspec.cpp",
+        "luapluginspec.h",
+        "luaqttypes.cpp",
+        "luaqttypes.h",
+        "luatr.h",
+        "luauibindings.cpp",
+        "wizards/wizards.qrc",
+    ]
+
+    Group {
+        name: "Bindings"
+        prefix: "bindings/"
+
+        files: [
+            "action.cpp",
+            "async.cpp",
+            "core.cpp",
+            "fetch.cpp",
+            "gui.cpp",
+            "hook.cpp",
+            "inheritance.h",
+            "install.cpp",
+            "messagemanager.cpp",
+            "qtcprocess.cpp",
+            "settings.cpp",
+            "utils.cpp",
+        ]
+
+        Properties {
+            condition: qbs.toolchain.contains("msvc")
+            cpp.cxxFlags: "/bigobj"
+        }
+
+        Properties {
+            condition: qbs.toolchain.contains("mingw")
+            cpp.cxxFlags: "-Wa,-mbig-obj"
+        }
+    }
+
+    Group {
+        name: "Meta"
+        prefix: "meta/"
+
+        files: [
+            "action.lua",
+            "async.lua",
+            "core.lua",
+            "fetch.lua",
+            "gui.lua",
+            "install.lua",
+            "lsp.lua",
+            "messagemanager.lua",
+            "process.lua",
+            "qt.lua",
+            "qtc.lua",
+            "settings.lua",
+            "simpletypes.lua",
+            "utils.lua",
+            "widgets.lua",
+        ]
+        qbs.install: true
+        qbs.installDir: qtc.ide_data_path + "/lua/meta/"
+    }
+
+    Group {
+        name: "Meta-Backup"
+        prefix: "metabackup/"
+        files: [
+            "qobject.lua",
+        ]
+    }
+
+    Group {
+        name: "Lua images rcc"
+        Qt.core.resourcePrefix: "lua/images/"
+        fileTags: "qt.core.resource_data"
+        files: "images/**"
+    }
+
+    Export {
+        Depends { name: "sol2" }
+        Depends { name: "lua546" }
+    }
+}
diff --git a/src/plugins/lua/lua_global.h b/src/plugins/lua/lua_global.h
new file mode 100644
index 00000000000..e786361010c
--- /dev/null
+++ b/src/plugins/lua/lua_global.h
@@ -0,0 +1,14 @@
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <qglobal.h>
+
+#if defined(LUA_LIBRARY)
+#  define LUA_EXPORT Q_DECL_EXPORT
+#elif defined(LUA_STATIC_LIBRARY) // Abuse single files for manual tests
+#  define LUA_EXPORT
+#else
+#  define LUA_EXPORT Q_DECL_IMPORT
+#endif
diff --git a/src/plugins/lua/luaengine.cpp b/src/plugins/lua/luaengine.cpp
new file mode 100644
index 00000000000..babfac698d5
--- /dev/null
+++ b/src/plugins/lua/luaengine.cpp
@@ -0,0 +1,386 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "luaengine.h"
+
+#include "luapluginspec.h"
+#include "luatr.h"
+
+#include <coreplugin/icore.h>
+#include <coreplugin/messagemanager.h>
+
+#include <utils/algorithm.h>
+#include <utils/lua.h>
+#include <utils/stringutils.h>
+#include <utils/theme/theme.h>
+
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QStandardPaths>
+
+using namespace Utils;
+
+namespace Lua {
+
+class LuaInterfaceImpl : public Utils::LuaInterface
+{
+    LuaEngine *m_engine;
+
+public:
+    LuaInterfaceImpl(LuaEngine *engine)
+        : m_engine(engine)
+    {
+        Utils::setLuaInterface(this);
+    }
+    ~LuaInterfaceImpl() override { Utils::setLuaInterface(nullptr); }
+
+    expected_str<std::unique_ptr<LuaState>> runScript(
+        const QString &script, const QString &name) override
+    {
+        return m_engine->runScript(script, name);
+    }
+};
+
+class LuaEnginePrivate
+{
+public:
+    LuaEnginePrivate() {}
+
+    QHash<QString, LuaEngine::PackageProvider> m_providers;
+    QList<std::function<void(sol::state_view)>> m_autoProviders;
+
+    QMap<QString, std::function<void(sol::function)>> m_hooks;
+
+    std::unique_ptr<LuaInterfaceImpl> m_luaInterface;
+};
+
+static LuaEngine *s_instance = nullptr;
+
+LuaEngine &LuaEngine::instance()
+{
+    Q_ASSERT(s_instance);
+    return *s_instance;
+}
+
+LuaEngine::LuaEngine()
+    : d(new LuaEnginePrivate())
+{
+    s_instance = this;
+    d->m_luaInterface.reset(new LuaInterfaceImpl(this));
+}
+
+LuaEngine::~LuaEngine()
+{
+    s_instance = nullptr;
+}
+
+class LuaStateImpl : public Utils::LuaState
+{
+public:
+    sol::state lua;
+};
+
+// Runs the gives script in a new Lua state. The returned Object manages the lifetime of the state.
+std::unique_ptr<Utils::LuaState> LuaEngine::runScript(const QString &script, const QString &name)
+{
+    std::unique_ptr<LuaStateImpl> opaque = std::make_unique<LuaStateImpl>();
+
+    opaque->lua.open_libraries(
+        sol::lib::base,
+        sol::lib::bit32,
+        sol::lib::coroutine,
+        sol::lib::debug,
+        sol::lib::io,
+        sol::lib::math,
+        sol::lib::os,
+        sol::lib::package,
+        sol::lib::string,
+        sol::lib::table,
+        sol::lib::utf8);
+
+    opaque->lua["print"] = [prefix = name, printToOutputPane = true](sol::variadic_args va) {
+        const QString msg = variadicToStringList(va).join("\t");
+
+        qDebug().noquote() << "[" << prefix << "]" << msg;
+        if (printToOutputPane) {
+            static const QString p
+                = ansiColoredText("[" + prefix + "]", creatorColor(Theme::Token_Text_Muted));
+            Core::MessageManager::writeSilently(QString("%1 %2").arg(p, msg));
+        }
+    };
+
+    opaque->lua.new_usertype<ScriptPluginSpec>(
+        "PluginSpec", sol::no_constructor, "name", sol::property([](ScriptPluginSpec &self) {
+            return self.name;
+        }));
+
+    opaque->lua["PluginSpec"] = ScriptPluginSpec{name, {}, std::make_unique<QObject>()};
+
+    for (const auto &[name, func] : d->m_providers.asKeyValueRange()) {
+        opaque->lua["package"]["preload"][name.toStdString()] =
+            [func = func](const sol::this_state &s) { return func(s); };
+    }
+
+    for (const auto &func : d->m_autoProviders)
+        func(opaque->lua);
+
+    auto result
+        = opaque->lua
+              .safe_script(script.toStdString(), sol::script_pass_on_error, name.toStdString());
+
+    if (!result.valid()) {
+        sol::error err = result;
+        qWarning() << "Failed to run script" << name << ":" << QString::fromUtf8(err.what());
+        Core::MessageManager::writeFlashing(
+            Tr::tr("Failed to run script %1: %2").arg(name, QString::fromUtf8(err.what())));
+    }
+
+    return opaque;
+}
+
+void LuaEngine::registerProvider(const QString &packageName, const PackageProvider &provider)
+{
+    QTC_ASSERT(!instance().d->m_providers.contains(packageName), return);
+    instance().d->m_providers[packageName] = provider;
+}
+
+void LuaEngine::autoRegister(const std::function<void(sol::state_view)> &registerFunction)
+{
+    instance().d->m_autoProviders.append(registerFunction);
+}
+
+void LuaEngine::registerHook(QString name, const std::function<void(sol::function)> &hook)
+{
+    instance().d->m_hooks.insert("." + name, hook);
+}
+
+expected_str<void> LuaEngine::connectHooks(
+    sol::state_view lua, const sol::table &table, const QString &path)
+{
+    for (const auto &[k, v] : table) {
+        if (v.get_type() == sol::type::table) {
+            return connectHooks(lua, v.as<sol::table>(), QStringList{path, k.as<QString>()}.join("."));
+        } else if (v.get_type() == sol::type::function) {
+            QString hookName = QStringList{path, k.as<QString>()}.join(".");
+            auto it = d->m_hooks.find(hookName);
+            if (it == d->m_hooks.end())
+                return make_unexpected(Tr::tr("No hook with the name \"%1\" found.").arg(hookName));
+            else
+                it.value()(v.as<sol::function>());
+        }
+    }
+
+    return {};
+}
+
+expected_str<LuaPluginSpec *> LuaEngine::loadPlugin(const Utils::FilePath &path)
+{
+    auto contents = path.fileContents();
+    if (!contents)
+        return make_unexpected(contents.error());
+
+    sol::state lua;
+
+    auto result = lua.safe_script(
+        std::string_view(contents->data(), contents->size()),
+        sol::script_pass_on_error,
+        path.fileName().toUtf8().constData());
+
+    if (!result.valid()) {
+        sol::error err = result;
+        return make_unexpected(QString(QString::fromUtf8(err.what())));
+    }
+
+    if (result.get_type() != sol::type::table)
+        return make_unexpected(QString("Script did not return a table"));
+
+    sol::table pluginInfo = result.get<sol::table>();
+    if (!pluginInfo.valid())
+        return make_unexpected(QString("Script did not return a table with plugin info"));
+    return LuaPluginSpec::create(path, pluginInfo);
+}
+
+expected_str<sol::protected_function> LuaEngine::prepareSetup(
+    sol::state_view lua, const LuaPluginSpec &pluginSpec)
+{
+    auto contents = pluginSpec.filePath().fileContents();
+    if (!contents)
+        return make_unexpected(contents.error());
+
+    // TODO: Only open libraries requested by the plugin
+    lua.open_libraries(
+        sol::lib::base,
+        sol::lib::bit32,
+        sol::lib::coroutine,
+        sol::lib::debug,
+        sol::lib::io,
+        sol::lib::math,
+        sol::lib::os,
+        sol::lib::package,
+        sol::lib::string,
+        sol::lib::table,
+        sol::lib::utf8);
+
+    const bool printToOutputPane = pluginSpec.printToOutputPane();
+    const QString prefix = pluginSpec.filePath().fileName();
+    lua["print"] = [prefix, printToOutputPane](sol::variadic_args va) {
+        const QString msg = variadicToStringList(va).join("\t");
+
+        qDebug().noquote() << "[" << prefix << "]" << msg;
+        if (printToOutputPane) {
+            static const QString p
+                = ansiColoredText("[" + prefix + "]", creatorColor(Theme::Token_Text_Muted));
+            Core::MessageManager::writeSilently(QString("%1 %2").arg(p, msg));
+        }
+    };
+
+    const QString searchPath = (pluginSpec.location() / "?.lua").toUserOutput();
+    lua["package"]["path"] = searchPath.toStdString();
+
+    const FilePath appDataPath = Core::ICore::userResourcePath() / "plugin-data" / "lua"
+                                 / pluginSpec.location().fileName();
+
+    lua.new_usertype<ScriptPluginSpec>(
+        "PluginSpec", sol::no_constructor, "name", sol::property([](ScriptPluginSpec &self) {
+            return self.name;
+        }));
+
+    lua["PluginSpec"]
+        = ScriptPluginSpec{pluginSpec.name(), appDataPath, std::make_unique<QObject>()};
+
+    // TODO: only register what the plugin requested
+    for (const auto &[name, func] : d->m_providers.asKeyValueRange()) {
+        lua["package"]["preload"][name.toStdString()] = [func = func](const sol::this_state &s) {
+            return func(s);
+        };
+    }
+
+    for (const auto &func : d->m_autoProviders)
+        func(lua);
+
+    sol::protected_function_result result = lua.safe_script(
+        std::string_view(contents->data(), contents->size()),
+        sol::script_pass_on_error,
+        pluginSpec.filePath().fileName().toUtf8().constData());
+
+    auto pluginTable = result.get<sol::optional<sol::table>>();
+    if (!pluginTable)
+        return make_unexpected(Tr::tr("Script did not return a table."));
+
+    auto hookTable = pluginTable->get<sol::optional<sol::table>>("hooks");
+
+    if (hookTable) {
+        auto connectResult = connectHooks(lua, *hookTable, {});
+        if (!connectResult)
+            return make_unexpected(connectResult.error());
+    }
+
+    auto setupFunction = pluginTable->get_or<sol::function>("setup", {});
+
+    if (!setupFunction)
+        return make_unexpected(Tr::tr("Extension info table did not contain a setup function."));
+
+    return setupFunction;
+}
+
+bool LuaEngine::isCoroutine(lua_State *state)
+{
+    bool ismain = lua_pushthread(state) == 1;
+    return !ismain;
+}
+
+template<typename KeyType>
+static void setFromJson(sol::table &t, KeyType k, const QJsonValue &v)
+{
+    if (v.isDouble())
+        t[k] = v.toDouble();
+    else if (v.isBool())
+        t[k] = v.toBool();
+    else if (v.isString())
+        t[k] = v.toString();
+    else if (v.isObject())
+        t[k] = LuaEngine::toTable(t.lua_state(), v);
+    else if (v.isArray())
+        t[k] = LuaEngine::toTable(t.lua_state(), v);
+}
+
+sol::table LuaEngine::toTable(const sol::state_view &lua, const QJsonValue &v)
+{
+    sol::table table(lua, sol::create);
+
+    if (v.isObject()) {
+        QJsonObject o = v.toObject();
+        for (auto it = o.constBegin(); it != o.constEnd(); ++it)
+            setFromJson(table, it.key(), it.value());
+    } else if (v.isArray()) {
+        int i = 1;
+        for (const auto &v : v.toArray())
+            setFromJson(table, i++, v);
+    }
+
+    return table;
+}
+
+QJsonValue toJsonValue(const sol::object &object);
+
+QJsonValue toJsonValue(const sol::table &table)
+{
+    if (table.get<std::optional<sol::object>>(1)) {
+        // Is Array
+        QJsonArray arr;
+
+        for (size_t i = 0; i < table.size(); ++i) {
+            std::optional<sol::object> v = table.get<std::optional<sol::object>>(i + 1);
+            if (!v)
+                continue;
+            arr.append(toJsonValue(*v));
+        }
+
+        return arr;
+    }
+
+    // Is Object
+    QJsonObject obj;
+    for (const auto &[k, v] : table)
+        obj[k.as<QString>()] = toJsonValue(v);
+
+    return obj;
+}
+
+QJsonValue toJsonValue(const sol::object &object)
+{
+    switch (object.get_type()) {
+    case sol::type::lua_nil:
+        return {};
+    case sol::type::boolean:
+        return object.as<bool>();
+    case sol::type::number:
+        return object.as<double>();
+    case sol::type::string:
+        return object.as<QString>();
+    case sol::type::table:
+        return toJsonValue(object.as<sol::table>());
+    default:
+        return {};
+    }
+}
+
+QJsonValue LuaEngine::toJson(const sol::table &table)
+{
+    return toJsonValue(table);
+}
+
+QStringList LuaEngine::variadicToStringList(const sol::variadic_args &vargs)
+{
+    QStringList strings;
+    for (size_t i = 1, n = vargs.size(); i <= n; i++) {
+        size_t l;
+        const char *s = luaL_tolstring(vargs.lua_state(), int(i), &l);
+        if (s != nullptr)
+            strings.append(QString::fromUtf8(s, l));
+    }
+
+    return strings;
+}
+
+} // namespace Lua
diff --git a/src/plugins/lua/luaengine.h b/src/plugins/lua/luaengine.h
new file mode 100644
index 00000000000..7c8bbda7c89
--- /dev/null
+++ b/src/plugins/lua/luaengine.h
@@ -0,0 +1,121 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "lua_global.h"
+
+#include <extensionsystem/iplugin.h>
+#include <extensionsystem/pluginspec.h>
+
+#include <utils/expected.h>
+#include <utils/filepath.h>
+#include <utils/lua.h>
+
+#include <sol/sol.hpp>
+
+// this needs to be included after sol/sol.hpp!
+#include "luaqttypes.h"
+
+#include <QJsonValue>
+
+#include <memory>
+
+namespace Lua {
+class LuaEnginePrivate;
+class LuaPluginSpec;
+
+namespace Internal {
+class LuaPlugin;
+}
+
+struct CoroutineState
+{
+    bool isMainThread;
+};
+
+struct ScriptPluginSpec
+{
+    QString name;
+    Utils::FilePath appDataPath;
+    std::unique_ptr<QObject> connectionGuard;
+};
+
+class LUA_EXPORT LuaEngine final : public QObject
+{
+    friend class Internal::LuaPlugin;
+
+protected:
+    LuaEngine();
+
+public:
+    using PackageProvider = std::function<sol::object(sol::state_view)>;
+
+    ~LuaEngine() override;
+    static LuaEngine &instance();
+
+    Utils::expected_str<LuaPluginSpec *> loadPlugin(const Utils::FilePath &path);
+    Utils::expected_str<sol::protected_function> prepareSetup(
+        sol::state_view lua, const LuaPluginSpec &pluginSpec);
+
+    static void registerProvider(const QString &packageName, const PackageProvider &provider);
+    static void autoRegister(const std::function<void(sol::state_view)> &registerFunction);
+    static void registerHook(QString name, const std::function<void(sol::function)> &hookProvider);
+
+    static bool isCoroutine(lua_State *state);
+
+    static sol::table toTable(const sol::state_view &lua, const QJsonValue &v);
+    static QJsonValue toJson(const sol::table &t);
+
+    template<class T>
+    static void checkKey(const sol::table &table, const QString &key)
+    {
+        if (table[key].template is<T>())
+            return;
+        if (!table[key].valid())
+            throw sol::error("Expected " + key.toStdString() + " to be defined");
+        throw sol::error(
+            "Expected " + key.toStdString() + " to be of type " + sol::detail::demangle<T>());
+    }
+
+    static QStringList variadicToStringList(const sol::variadic_args &vargs);
+
+    template<typename R, typename... Args>
+    static Utils::expected_str<R> safe_call(const sol::protected_function &function, Args &&...args)
+    {
+        sol::protected_function_result result = function(std::forward<Args>(args)...);
+        if (!result.valid()) {
+            sol::error err = result;
+            return Utils::make_unexpected(QString::fromLocal8Bit(err.what()));
+        }
+        try {
+            return result.get<R>();
+        } catch (std::runtime_error &e) {
+            return Utils::make_unexpected(QString::fromLocal8Bit(e.what()));
+        }
+    }
+
+    template<typename... Args>
+    static Utils::expected_str<void> void_safe_call(
+        const sol::protected_function &function, Args &&...args)
+    {
+        sol::protected_function_result result = function(std::forward<Args>(args)...);
+        if (!result.valid()) {
+            sol::error err = result;
+            return Utils::make_unexpected(QString::fromLocal8Bit(err.what()));
+        }
+        return {};
+    }
+
+    // Runs the given script in a new Lua state. The returned Object manages the lifetime of the state.
+    std::unique_ptr<Utils::LuaState> runScript(const QString &script, const QString &name);
+
+protected:
+    Utils::expected_str<void> connectHooks(
+        sol::state_view lua, const sol::table &table, const QString &path);
+
+private:
+    std::unique_ptr<LuaEnginePrivate> d;
+};
+
+} // namespace Lua
diff --git a/src/plugins/lua/luaplugin.cpp b/src/plugins/lua/luaplugin.cpp
new file mode 100644
index 00000000000..11a3bbedbfb
--- /dev/null
+++ b/src/plugins/lua/luaplugin.cpp
@@ -0,0 +1,123 @@
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "luaengine.h"
+#include "luapluginspec.h"
+#include "luatr.h"
+
+#include <coreplugin/icore.h>
+#include <coreplugin/jsexpander.h>
+#include <coreplugin/messagemanager.h>
+
+#include <extensionsystem/iplugin.h>
+#include <extensionsystem/pluginmanager.h>
+
+#include <utils/algorithm.h>
+
+#include <QDebug>
+
+using namespace Core;
+using namespace Utils;
+using namespace ExtensionSystem;
+
+namespace Lua::Internal {
+
+void addAsyncModule();
+void addFetchModule();
+void addActionModule();
+void addUtilsModule();
+void addMessageManagerModule();
+void addProcessModule();
+void addSettingsModule();
+void addGuiModule();
+void addQtModule();
+void addCoreModule();
+void addHookModule();
+void addInstallModule();
+
+class LuaJsExtension : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit LuaJsExtension(QObject *parent = nullptr)
+        : QObject(parent)
+    {}
+
+    Q_INVOKABLE QString metaFolder() const
+    {
+        return Core::ICore::resourcePath("lua/meta").toFSPathString();
+    }
+};
+
+class LuaPlugin : public IPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Lua.json")
+
+private:
+    std::unique_ptr<LuaEngine> m_luaEngine;
+
+public:
+    LuaPlugin() {}
+    ~LuaPlugin() override = default;
+
+    void initialize() final
+    {
+        m_luaEngine.reset(new LuaEngine());
+
+        addAsyncModule();
+        addFetchModule();
+        addActionModule();
+        addUtilsModule();
+        addMessageManagerModule();
+        addProcessModule();
+        addSettingsModule();
+        addGuiModule();
+        addQtModule();
+        addCoreModule();
+        addHookModule();
+        addInstallModule();
+
+        Core::JsExpander::registerGlobalObject("Lua", [] { return new LuaJsExtension(); });
+    }
+
+    bool delayedInitialize() final
+    {
+        scanForPlugins(PluginManager::pluginPaths());
+        return true;
+    }
+
+    void scanForPlugins(const FilePaths &pluginPaths)
+    {
+        QSet<PluginSpec *> plugins;
+        for (const FilePath &path : pluginPaths) {
+            FilePaths folders = path.dirEntries(FileFilter({}, QDir::Dirs | QDir::NoDotAndDotDot));
+
+            for (const FilePath &folder : folders) {
+                const FilePath script = folder / (folder.baseName() + ".lua");
+                if (!script.exists())
+                    continue;
+
+                const expected_str<LuaPluginSpec *> result = m_luaEngine->loadPlugin(script);
+
+                if (!result) {
+                    qWarning() << "Failed to load plugin" << script << ":" << result.error();
+                    MessageManager::writeFlashing(Tr::tr("Failed to load plugin %1: %2")
+                                                      .arg(script.toUserOutput())
+                                                      .arg(result.error()));
+                    continue;
+                }
+
+                plugins.insert(*result);
+            }
+        }
+
+        PluginManager::addPlugins({plugins.begin(), plugins.end()});
+        PluginManager::loadPluginsAtRuntime(plugins);
+    }
+};
+
+} // namespace Lua::Internal
+
+#include "luaplugin.moc"
diff --git a/src/plugins/lua/luapluginspec.cpp b/src/plugins/lua/luapluginspec.cpp
new file mode 100644
index 00000000000..f00e48936bc
--- /dev/null
+++ b/src/plugins/lua/luapluginspec.cpp
@@ -0,0 +1,158 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "luapluginspec.h"
+
+#include "luaengine.h"
+#include "luatr.h"
+
+#include <extensionsystem/extensionsystemtr.h>
+
+#include <utils/algorithm.h>
+#include <utils/appinfo.h>
+#include <utils/expected.h>
+
+#include <QJsonDocument>
+#include <QLoggingCategory>
+
+Q_LOGGING_CATEGORY(luaPluginSpecLog, "qtc.lua.pluginspec", QtWarningMsg)
+
+using namespace ExtensionSystem;
+using namespace Utils;
+
+namespace Lua {
+
+class LuaScriptPluginPrivate
+{
+public:
+    QString name;
+    QList<QString> cppDepends;
+    sol::function setup;
+    sol::environment pluginEnvironment;
+};
+
+class LuaPluginSpecPrivate
+{
+public:
+    FilePath pluginScriptPath;
+    bool printToOutputPane = false;
+    std::unique_ptr<sol::state> activeLuaState;
+};
+
+LuaPluginSpec::LuaPluginSpec()
+    : d(new LuaPluginSpecPrivate())
+{}
+
+expected_str<LuaPluginSpec *> LuaPluginSpec::create(const FilePath &filePath, sol::table pluginTable)
+{
+    std::unique_ptr<LuaPluginSpec> pluginSpec(new LuaPluginSpec());
+
+    if (!pluginTable.get_or<sol::function>("setup", {}))
+        return make_unexpected(QString("Plugin info table did not contain a setup function"));
+
+    QJsonValue v = LuaEngine::toJson(pluginTable);
+    if (luaPluginSpecLog().isDebugEnabled()) {
+        qCDebug(luaPluginSpecLog).noquote()
+            << "Plugin info table:" << QJsonDocument(v.toObject()).toJson(QJsonDocument::Indented);
+    }
+
+    QJsonObject obj = v.toObject();
+    obj["SoftLoadable"] = true;
+
+    auto r = pluginSpec->PluginSpec::readMetaData(obj);
+    if (!r)
+        return make_unexpected(r.error());
+
+    pluginSpec->setFilePath(filePath);
+    pluginSpec->setLocation(filePath.parentDir());
+
+    pluginSpec->d->pluginScriptPath = filePath;
+    pluginSpec->d->printToOutputPane = pluginTable.get_or("printToOutputPane", false);
+
+    return pluginSpec.release();
+}
+
+ExtensionSystem::IPlugin *LuaPluginSpec::plugin() const
+{
+    return nullptr;
+}
+
+bool LuaPluginSpec::provides(PluginSpec *spec, const PluginDependency &dependency) const
+{
+    if (QString::compare(dependency.name, spec->name(), Qt::CaseInsensitive) != 0)
+        return false;
+
+    // Since we first released the lua support with Qt Creator 14.0.0, but the internal version
+    // number was still 13.0.82, we needed to special case this version.
+    if (versionCompare(dependency.version, "14.0.0") <= 0)
+        return true;
+
+    return (versionCompare(spec->version(), dependency.version) >= 0);
+}
+
+// LuaPluginSpec::For internal use {}
+bool LuaPluginSpec::loadLibrary()
+{
+    // We are actually already loaded, but we need to set the state to loaded as well.
+    // We cannot set it earlier as it is used as a state machine that would break for earlier steps.
+    setState(PluginSpec::State::Loaded);
+    return true;
+}
+bool LuaPluginSpec::initializePlugin()
+{
+    QTC_ASSERT(!d->activeLuaState, return false);
+
+    std::unique_ptr<sol::state> activeLuaState = std::make_unique<sol::state>();
+
+    expected_str<sol::protected_function> setupResult
+        = LuaEngine::instance().prepareSetup(*activeLuaState, *this);
+
+    if (!setupResult) {
+        setError(Lua::Tr::tr("Cannot prepare extension setup: %1").arg(setupResult.error()));
+        return false;
+    }
+
+    auto result = setupResult->call();
+
+    if (result.get_type() == sol::type::boolean && result.get<bool>() == false) {
+        setError(Lua::Tr::tr("Extension setup function returned false."));
+        return false;
+    } else if (result.get_type() == sol::type::string) {
+        std::string error = result.get<sol::error>().what();
+        if (!error.empty()) {
+            setError(Lua::Tr::tr("Extension setup function returned error: %1")
+                         .arg(QString::fromStdString(error)));
+            return false;
+        }
+    }
+
+    d->activeLuaState = std::move(activeLuaState);
+
+    setState(PluginSpec::State::Initialized);
+    return true;
+}
+
+bool LuaPluginSpec::initializeExtensions()
+{
+    setState(PluginSpec::State::Running);
+    return true;
+}
+
+bool LuaPluginSpec::delayedInitialize()
+{
+    return true;
+}
+ExtensionSystem::IPlugin::ShutdownFlag LuaPluginSpec::stop()
+{
+    d->activeLuaState->stack_clear();
+    return ExtensionSystem::IPlugin::ShutdownFlag::SynchronousShutdown;
+}
+
+void LuaPluginSpec::kill() {}
+
+bool LuaPluginSpec::printToOutputPane() const
+{
+    return d->printToOutputPane;
+}
+
+} // namespace Lua
diff --git a/src/plugins/lua/luapluginspec.h b/src/plugins/lua/luapluginspec.h
new file mode 100644
index 00000000000..ff042416669
--- /dev/null
+++ b/src/plugins/lua/luapluginspec.h
@@ -0,0 +1,62 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "sol/forward.hpp"
+
+#include <extensionsystem/iplugin.h>
+#include <extensionsystem/pluginspec.h>
+
+#include <utils/expected.h>
+#include <utils/filepath.h>
+
+#include <QString>
+
+namespace Lua {
+class LuaScriptPluginPrivate;
+class LuaPluginSpecPrivate;
+
+class LuaScriptPlugin : public ExtensionSystem::IPlugin
+{
+public:
+    LuaScriptPlugin() = delete;
+    LuaScriptPlugin(const LuaScriptPlugin &other);
+    LuaScriptPlugin(const std::shared_ptr<LuaScriptPluginPrivate> &d);
+
+    QString name() const;
+    QStringList cppDependencies() const;
+    void setup() const;
+
+private:
+    std::shared_ptr<LuaScriptPluginPrivate> d;
+};
+
+class LuaPluginSpec : public ExtensionSystem::PluginSpec
+{
+    std::unique_ptr<LuaPluginSpecPrivate> d;
+
+    LuaPluginSpec();
+
+public:
+    static Utils::expected_str<LuaPluginSpec *> create(
+        const Utils::FilePath &filePath, sol::table pluginTable);
+
+    ExtensionSystem::IPlugin *plugin() const override;
+
+    bool provides(
+        PluginSpec *spec, const ExtensionSystem::PluginDependency &dependency) const override;
+
+    // For internal use only
+    bool loadLibrary() override;
+    bool initializePlugin() override;
+    bool initializeExtensions() override;
+    bool delayedInitialize() override;
+    ExtensionSystem::IPlugin::ShutdownFlag stop() override;
+    void kill() override;
+
+public:
+    bool printToOutputPane() const;
+};
+
+} // namespace Lua
diff --git a/src/plugins/lua/luaqttypes.cpp b/src/plugins/lua/luaqttypes.cpp
new file mode 100644
index 00000000000..ad57e830629
--- /dev/null
+++ b/src/plugins/lua/luaqttypes.cpp
@@ -0,0 +1,314 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "luaengine.h"
+
+// This defines the conversion from QString to lua_string and vice versa
+bool sol_lua_check(sol::types<QString>,
+                   lua_State *L,
+                   int index,
+                   std::function<sol::check_handler_type> handler,
+                   sol::stack::record &tracking)
+{
+    // use sol's method for checking specifically for a string
+    return sol::stack::check<const char *>(L, index, handler, tracking);
+}
+
+QString sol_lua_get(sol::types<QString>, lua_State *L, int index, sol::stack::record &tracking)
+{
+    const char *str = sol::stack::get<const char *>(L, index, tracking);
+    return QString::fromLocal8Bit(str);
+}
+
+int sol_lua_push(sol::types<QString>, lua_State *L, const QString &qStr)
+{
+    // create table
+    sol::state_view lua(L);
+    // use base sol method to push the string
+    int amount = sol::stack::push(L, qStr.toLocal8Bit().data());
+    // return # of things pushed onto stack
+    return amount;
+}
+
+// QRect
+bool sol_lua_check(sol::types<QRect>,
+                   lua_State *L,
+                   int index,
+                   std::function<sol::check_handler_type> handler,
+                   sol::stack::record &tracking)
+{
+    return sol::stack::check<sol::table>(L, index, handler, tracking);
+}
+QRect sol_lua_get(sol::types<QRect>, lua_State *L, int index, sol::stack::record &tracking)
+{
+    sol::state_view lua(L);
+    sol::table table = sol::stack::get<sol::table>(L, index, tracking);
+    return QRect(table.get_or<int, const char *, int>("x", 0),
+                 table.get_or<int, const char *, int>("y", 0),
+                 table.get_or<int, const char *, int>("width", 0),
+                 table.get_or<int, const char *, int>("height", 0));
+}
+int sol_lua_push(sol::types<QRect>, lua_State *L, const QRect &value)
+{
+    sol::state_view lua(L);
+    sol::table table = lua.create_table();
+    table.set("x", value.x(), "y", value.y(), "width", value.width(), "height", value.height());
+    return sol::stack::push(L, table);
+}
+
+// QSize
+bool sol_lua_check(sol::types<QSize>,
+                   lua_State *L,
+                   int index,
+                   std::function<sol::check_handler_type> handler,
+                   sol::stack::record &tracking)
+{
+    return sol::stack::check<sol::table>(L, index, handler, tracking);
+}
+QSize sol_lua_get(sol::types<QSize>, lua_State *L, int index, sol::stack::record &tracking)
+{
+    sol::state_view lua(L);
+    sol::table table = sol::stack::get<sol::table>(L, index, tracking);
+    return QSize(table.get_or<int, const char *, int>("width", 0),
+                 table.get_or<int, const char *, int>("height", 0));
+}
+int sol_lua_push(sol::types<QSize>, lua_State *L, const QSize &value)
+{
+    sol::state_view lua(L);
+    sol::table table = lua.create_table();
+    table.set("width", value.width(), "height", value.height());
+    return sol::stack::push(L, table);
+}
+
+// QPoint
+bool sol_lua_check(sol::types<QPoint>,
+                   lua_State *L,
+                   int index,
+                   std::function<sol::check_handler_type> handler,
+                   sol::stack::record &tracking)
+{
+    return sol::stack::check<sol::table>(L, index, handler, tracking);
+}
+QPoint sol_lua_get(sol::types<QPoint>, lua_State *L, int index, sol::stack::record &tracking)
+{
+    sol::state_view lua(L);
+    sol::table table = sol::stack::get<sol::table>(L, index, tracking);
+    return QPoint(table.get_or<int, const char *, int>("x", 0),
+                  table.get_or<int, const char *, int>("y", 0));
+}
+int sol_lua_push(sol::types<QPoint>, lua_State *L, const QPoint &value)
+{
+    sol::state_view lua(L);
+    sol::table table = lua.create_table();
+    table.set("x", value.x(), "y", value.y());
+    return sol::stack::push(L, table);
+}
+
+// QRectF
+bool sol_lua_check(sol::types<QRectF>,
+                   lua_State *L,
+                   int index,
+                   std::function<sol::check_handler_type> handler,
+                   sol::stack::record &tracking)
+{
+    return sol::stack::check<sol::table>(L, index, handler, tracking);
+}
+QRectF sol_lua_get(sol::types<QRectF>, lua_State *L, int index, sol::stack::record &tracking)
+{
+    sol::state_view lua(L);
+    sol::table table = sol::stack::get<sol::table>(L, index, tracking);
+    return QRectF(table.get_or<qreal, const char *, qreal>("x", 0.0),
+                  table.get_or<qreal, const char *, qreal>("y", 0.0),
+                  table.get_or<qreal, const char *, qreal>("width", 0.0),
+                  table.get_or<qreal, const char *, qreal>("height", 0.0));
+}
+int sol_lua_push(sol::types<QRectF>, lua_State *L, const QRectF &value)
+{
+    sol::state_view lua(L);
+    sol::table table = lua.create_table();
+    table.set("x", value.x(), "y", value.y(), "width", value.width(), "height", value.height());
+    return sol::stack::push(L, table);
+}
+
+// QSizeF
+bool sol_lua_check(sol::types<QSizeF>,
+                   lua_State *L,
+                   int index,
+                   std::function<sol::check_handler_type> handler,
+                   sol::stack::record &tracking)
+{
+    return sol::stack::check<sol::table>(L, index, handler, tracking);
+}
+QSizeF sol_lua_get(sol::types<QSizeF>, lua_State *L, int index, sol::stack::record &tracking)
+{
+    sol::state_view lua(L);
+    sol::table table = sol::stack::get<sol::table>(L, index, tracking);
+    return QSizeF(table.get_or<qreal, const char *, qreal>("width", 0.0),
+                  table.get_or<qreal, const char *, qreal>("height", 0.0));
+}
+int sol_lua_push(sol::types<QSizeF>, lua_State *L, const QSizeF &value)
+{
+    sol::state_view lua(L);
+    sol::table table = lua.create_table();
+    table.set("width", value.width(), "height", value.height());
+    return sol::stack::push(L, table);
+}
+
+// QPointF
+bool sol_lua_check(sol::types<QPointF>,
+                   lua_State *L,
+                   int index,
+                   std::function<sol::check_handler_type> handler,
+                   sol::stack::record &tracking)
+{
+    return sol::stack::check<sol::table>(L, index, handler, tracking);
+}
+QPointF sol_lua_get(sol::types<QPointF>, lua_State *L, int index, sol::stack::record &tracking)
+{
+    sol::state_view lua(L);
+    sol::table table = sol::stack::get<sol::table>(L, index, tracking);
+    return QPointF(table.get_or<qreal, const char *, qreal>("x", 0.0),
+                   table.get_or<qreal, const char *, qreal>("y", 0.0));
+}
+int sol_lua_push(sol::types<QPointF>, lua_State *L, const QPointF &value)
+{
+    sol::state_view lua(L);
+    sol::table table = lua.create_table();
+    table.set("x", value.x(), "y", value.y());
+    return sol::stack::push(L, table);
+}
+
+// QColor
+bool sol_lua_check(sol::types<QColor>,
+                   lua_State *L,
+                   int index,
+                   std::function<sol::check_handler_type> handler,
+                   sol::stack::record &tracking)
+{
+    return sol::stack::check<sol::table>(L, index, handler, tracking);
+}
+QColor sol_lua_get(sol::types<QColor>, lua_State *L, int index, sol::stack::record &tracking)
+{
+    sol::state_view lua(L);
+    sol::table table = sol::stack::get<sol::table>(L, index, tracking);
+    return QColor(table.get_or<int, const char *, int>("red", 0),
+                  table.get_or<int, const char *, int>("green", 0),
+                  table.get_or<int, const char *, int>("blue", 0),
+                  table.get_or<int, const char *, int>("alpha", 255));
+}
+int sol_lua_push(sol::types<QColor>, lua_State *L, const QColor &value)
+{
+    sol::state_view lua(L);
+    sol::table table = lua.create_table();
+    table.set("red",
+              value.red(),
+              "green",
+              value.green(),
+              "blue",
+              value.blue(),
+              "alpha",
+              value.alpha());
+    return sol::stack::push(L, table);
+}
+
+// QStringList
+bool sol_lua_check(sol::types<QStringList>,
+                   lua_State *L,
+                   int index,
+                   std::function<sol::check_handler_type> handler,
+                   sol::stack::record &tracking)
+{
+    return sol::stack::check<sol::table>(L, index, handler, tracking);
+}
+QStringList sol_lua_get(sol::types<QStringList>,
+                        lua_State *L,
+                        int index,
+                        sol::stack::record &tracking)
+{
+    QStringList result;
+    sol::state_view lua(L);
+    sol::table table = sol::stack::get<sol::table>(L, index, tracking);
+    for (size_t i = 1; i < table.size() + 1; i++) {
+        result.append(table.get<QString>(i));
+    }
+    return result;
+}
+int sol_lua_push(sol::types<QStringList>, lua_State *L, const QStringList &value)
+{
+    sol::state_view lua(L);
+    sol::table table = lua.create_table();
+    for (const QString &str : value)
+        table.add(str);
+    return sol::stack::push(L, table);
+}
+
+namespace Lua::Internal {
+void addQtModule()
+{
+    LuaEngine::registerProvider("Qt", [](sol::state_view lua) {
+        sol::table qt(lua, sol::create);
+
+        // clang-format off
+        qt["TextElideMode"] = lua.create_table_with(
+            "ElideLeft", Qt::ElideLeft,
+            "ElideRight", Qt::ElideRight,
+            "ElideMiddle", Qt::ElideMiddle,
+            "ElideNone", Qt::ElideNone
+        );
+
+        qt["QDirIterator"] = lua.create_table_with(
+            "IteratorFlag", lua.create_table_with(
+                "NoIteratorFlags", QDirIterator::NoIteratorFlags,
+                "FollowSymlinks", QDirIterator::FollowSymlinks,
+                "Subdirectories", QDirIterator::Subdirectories
+            )
+        );
+
+        qt["QDir"] = lua.create_table_with(
+            // QDir::Filters
+            "Filters", lua.create_table_with(
+                "Dirs", QDir::Dirs,
+                "Files", QDir::Files,
+                "Drives", QDir::Drives,
+                "NoSymLinks", QDir::NoSymLinks,
+                "AllEntries", QDir::AllEntries,
+                "TypeMask", QDir::TypeMask,
+                "Readable", QDir::Readable,
+                "Writable", QDir::Writable,
+                "Executable", QDir::Executable,
+                "PermissionMask", QDir::PermissionMask,
+                "Modified", QDir::Modified,
+                "Hidden", QDir::Hidden,
+                "System", QDir::System,
+                "AccessMask", QDir::AccessMask,
+                "AllDirs", QDir::AllDirs,
+                "CaseSensitive", QDir::CaseSensitive,
+                "NoDot", QDir::NoDot,
+                "NoDotDot", QDir::NoDotDot,
+                "NoDotAndDotDot", QDir::NoDotAndDotDot,
+                "NoFilter", QDir::NoFilter
+            ),
+
+            // QDir::SortFlag
+            "SortFlags", lua.create_table_with(
+                "Name", QDir::Name,
+                "Time", QDir::Time,
+                "Size", QDir::Size,
+                "Unsorted", QDir::Unsorted,
+                "SortByMask", QDir::SortByMask,
+                "DirsFirst", QDir::DirsFirst,
+                "Reversed", QDir::Reversed,
+                "IgnoreCase", QDir::IgnoreCase,
+                "DirsLast", QDir::DirsLast,
+                "LocaleAware", QDir::LocaleAware,
+                "Type", QDir::Type,
+                "NoSort", QDir::NoSort
+            )
+        );
+        // clang-format on
+
+        return qt;
+    });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/luaqttypes.h b/src/plugins/lua/luaqttypes.h
new file mode 100644
index 00000000000..9df10e1a029
--- /dev/null
+++ b/src/plugins/lua/luaqttypes.h
@@ -0,0 +1,39 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+// DO NOT INCLUDE THIS YOURSELF!!1!
+
+#include "lua_global.h"
+
+#include <QColor>
+#include <QList>
+#include <QRect>
+#include <QString>
+
+#define SOL_CONVERSION_FUNCTIONS(TYPE) \
+    bool LUA_EXPORT sol_lua_check(sol::types<TYPE>, \
+                                  lua_State *L, \
+                                  int index, \
+                                  std::function<sol::check_handler_type> handler, \
+                                  sol::stack::record &tracking); \
+    TYPE LUA_EXPORT sol_lua_get(sol::types<TYPE>, \
+                                lua_State *L, \
+                                int index, \
+                                sol::stack::record &tracking); \
+    int LUA_EXPORT sol_lua_push(sol::types<TYPE>, lua_State *L, const TYPE &rect);
+
+SOL_CONVERSION_FUNCTIONS(QString)
+
+SOL_CONVERSION_FUNCTIONS(QRect)
+SOL_CONVERSION_FUNCTIONS(QSize)
+SOL_CONVERSION_FUNCTIONS(QPoint)
+SOL_CONVERSION_FUNCTIONS(QRectF)
+SOL_CONVERSION_FUNCTIONS(QSizeF)
+SOL_CONVERSION_FUNCTIONS(QPointF)
+SOL_CONVERSION_FUNCTIONS(QColor)
+
+SOL_CONVERSION_FUNCTIONS(QStringList)
+
+#undef SOL_CONVERSION_FUNCTIONS
diff --git a/src/plugins/lua/luatr.h b/src/plugins/lua/luatr.h
new file mode 100644
index 00000000000..0c5fb4acad8
--- /dev/null
+++ b/src/plugins/lua/luatr.h
@@ -0,0 +1,15 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <QCoreApplication>
+
+namespace Lua {
+
+struct Tr
+{
+    Q_DECLARE_TR_FUNCTIONS(QtC::Lua)
+};
+
+} // namespace Lua
diff --git a/src/plugins/lua/luauibindings.cpp b/src/plugins/lua/luauibindings.cpp
new file mode 100644
index 00000000000..3c99085bda1
--- /dev/null
+++ b/src/plugins/lua/luauibindings.cpp
@@ -0,0 +1,141 @@
+
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "luaengine.h"
+#include "luaqttypes.h"
+
+#include <QMetaProperty>
+
+#include <QDialog>
+
+namespace Lua::Internal {
+
+template<class T = QObject>
+sol::object qobject_index_get(const sol::this_state &s, QObject *obj, const char *key)
+{
+    auto &metaObject = T::staticMetaObject;
+    int iProp = metaObject.indexOfProperty(key);
+    if (iProp != -1) {
+        QMetaProperty p = metaObject.property(iProp);
+
+        if (p.isEnumType()) {
+            int v = p.read(obj).toInt();
+            return sol::make_object(s.lua_state(), p.enumerator().valueToKey(v));
+        }
+
+#define LUA_VALUE_FROM_PROPERTY(VARIANT_TYPE, TYPE) \
+    case VARIANT_TYPE: { \
+        TYPE r = qvariant_cast<TYPE>(p.read(obj)); \
+        return sol::make_object(s.lua_state(), r); \
+    }
+
+        switch (p.type()) {
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::Rect, QRect)
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::Size, QSize)
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::Point, QPoint)
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::RectF, QRectF)
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::SizeF, QSizeF)
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::PointF, QPointF)
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::Color, QColor)
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::Bool, bool)
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::Int, int)
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::Double, double)
+            LUA_VALUE_FROM_PROPERTY(QVariant::Type::String, QString)
+        default:
+            break;
+        }
+    }
+
+    for (int i = 0; i < metaObject.methodCount(); i++) {
+        QMetaMethod method = metaObject.method(i);
+        if (method.methodType() != QMetaMethod::Signal && method.name() == key) {
+            if (method.parameterCount() == 0) {
+                return sol::make_object(s.lua_state(),
+                                        [obj, i]() { obj->metaObject()->method(i).invoke(obj); });
+            }
+        }
+    }
+
+    return sol::lua_nil;
+}
+
+template<class T>
+void qobject_index_set(QObject *obj, const char *key, sol::stack_object value)
+{
+    auto &metaObject = T::staticMetaObject;
+    int iProp = metaObject.indexOfProperty(key);
+    if (iProp == -1)
+        return;
+
+    QMetaProperty p = metaObject.property(iProp);
+
+    if (p.isEnumType()) {
+        int v = p.enumerator().keyToValue(value.as<const char *>());
+        p.write(obj, v);
+    } else {
+#define SET_PROPERTY_FROM_LUA(VARIANT_TYPE, TYPE) \
+    case VARIANT_TYPE: { \
+        TYPE r = value.as<TYPE>(); \
+        p.write(obj, QVariant::fromValue(r)); \
+        break; \
+    }
+
+        switch (p.type()) {
+            SET_PROPERTY_FROM_LUA(QVariant::Type::Rect, QRect)
+            SET_PROPERTY_FROM_LUA(QVariant::Type::Size, QSize)
+            SET_PROPERTY_FROM_LUA(QVariant::Type::Point, QPoint)
+            SET_PROPERTY_FROM_LUA(QVariant::Type::RectF, QRectF)
+            SET_PROPERTY_FROM_LUA(QVariant::Type::SizeF, QSizeF)
+            SET_PROPERTY_FROM_LUA(QVariant::Type::PointF, QPointF)
+            SET_PROPERTY_FROM_LUA(QVariant::Type::Color, QColor)
+            SET_PROPERTY_FROM_LUA(QVariant::Type::Bool, bool)
+            SET_PROPERTY_FROM_LUA(QVariant::Type::Int, int)
+            SET_PROPERTY_FROM_LUA(QVariant::Type::Double, double)
+            SET_PROPERTY_FROM_LUA(QVariant::Type::String, QString)
+        default:
+            break;
+        }
+    }
+}
+
+template<class T>
+size_t qobject_index_size(QObject *)
+{
+    return 0;
+}
+
+template<class T, class... Bases>
+sol::usertype<T> runtimeObject(sol::state_view lua)
+{
+    auto &metaObject = T::staticMetaObject;
+    auto className = metaObject.className();
+
+    return lua.new_usertype<T>(
+        className,
+        sol::call_constructor,
+        sol::constructors<T>(),
+        sol::meta_function::index,
+        [](sol::this_state s, T *obj, const char *key) { return qobject_index_get<T>(s, obj, key); },
+        sol::meta_function::new_index,
+        [](T *obj, const char *key, sol::stack_object value) {
+            qobject_index_set<T>(obj, key, value);
+        },
+        sol::meta_function::length,
+        [](T *obj) { return qobject_index_size<T>(obj); },
+        sol::base_classes,
+        sol::bases<Bases...>());
+}
+
+void registerUiBindings()
+{
+    LuaEngine::registerProvider("Qt.Gui", [](sol::state_view lua) {
+        runtimeObject<QObject>(lua);
+        runtimeObject<QWidget, QObject>(lua);
+        runtimeObject<QDialog, QWidget, QObject>(lua);
+
+        return sol::object{};
+    });
+}
+
+} // namespace Lua::Internal
diff --git a/src/plugins/lua/meta/action.lua b/src/plugins/lua/meta/action.lua
new file mode 100644
index 00000000000..48a1f49594b
--- /dev/null
+++ b/src/plugins/lua/meta/action.lua
@@ -0,0 +1,34 @@
+---@meta Action
+
+local action = {}
+
+---@enum CommandAttributes
+action.CommandAttribute = {
+    ---Hide the command from the menu.
+    CA_Hide = 1,
+    ---Update the text of the command.
+    CA_UpdateText = 2,
+    ---Update the icon of the command.
+    CA_UpdateIcon = 4,
+    ---The command cannot be configured.
+    CA_NonConfigurable = 8,
+}
+
+---@class ActionOptions
+---@field context? string The context in which the action is available.
+---@field text? string The text to display for the action.
+---@field iconText? string The icon text to display for the action.
+---@field toolTip? string The tooltip to display for the action.
+---@field onTrigger? function The callback to call when the action is triggered.
+---@field commandAttributes? CommandAttributes The attributes of the action.
+---@field commandDescription? string The description of the command.
+---@field defaultKeySequence? string The default key sequence for the action.
+---@field defaultKeySequences? string[] The default key sequences for the action.
+local ActionOptions = {}
+
+---Creates a new Action.
+---@param id string The id of the action.
+---@param options ActionOptions
+function action.create(id, options) end
+
+return action
diff --git a/src/plugins/lua/meta/async.lua b/src/plugins/lua/meta/async.lua
new file mode 100644
index 00000000000..fee1f1a48f7
--- /dev/null
+++ b/src/plugins/lua/meta/async.lua
@@ -0,0 +1,62 @@
+---@meta async
+
+local async = {}
+
+
+---Wraps the provided function so it can be started in another thread.
+---
+--- Example:
+--- ```lua
+--- local a = require("async")
+--- local u = require("Utils")
+---
+--- function asyncFunction()
+---   a.wait(u.waitms(500))
+--- end
+---
+--- a.sync(asyncFunction)()
+--- ```
+---@param func function The function to call from the new thread.
+function async.sync(func) end
+
+---@async
+---Calls an async function and waits for it to finish. **Must** be called from async.sync().
+---
+--- Example:
+--- ```lua
+--- local a = require("async")
+--- local u = require("Utils")
+---
+--- function asyncFunction()
+---   a.wait(u.waitms(500))
+---   a.wait(u.waitms(1000))
+--- end
+---
+--- a.sync(asyncFunction)()
+--- ```
+---@param func any The function to call and wait for its result.
+---@return any any The result of the function.
+function async.wait(func) end
+
+---@async
+---Calls multiple async functions and waits for all of them to finish. **Must** be called from async.sync().
+---
+--- Example:
+--- ```lua
+--- local a = require("async")
+--- local u = require("Utils")
+---
+--- function asyncFunction()
+---   a.wait_all {
+---     u.waitms(500),
+---     u.waitms(1000),
+---   }
+--- end
+---
+--- a.sync(asyncFunction)()
+--- ```
+---@param funcs table The functions to call and wait for.
+---@return table table The result of each of the functions as an array.
+function async.wait_all(funcs) end
+
+return async
diff --git a/src/plugins/lua/meta/core.lua b/src/plugins/lua/meta/core.lua
new file mode 100644
index 00000000000..3ad61a2d1dd
--- /dev/null
+++ b/src/plugins/lua/meta/core.lua
@@ -0,0 +1,26 @@
+---@meta Core
+
+Core = {}
+
+---@enum Attribute
+Core.GeneratedFile.Attribute = {
+    OpenEditorAttribute = 0,
+    OpenProjectAttribute = 0,
+    CustomGeneratorAttribute = 0,
+    KeepExistingFileAttribute = 0,
+    ForceOverwrite = 0,
+    TemporaryFile = 0,
+}
+
+---@class GeneratedFile
+---@field filePath FilePath
+---@field contents string
+---@field isBinary boolean
+---@field attributes Attribute A combination of Attribute.
+Core.GeneratedFile = {}
+
+---Create a new GeneratedFile.
+---@return GeneratedFile
+function Core.GeneratedFile.new() end
+
+return Core;
diff --git a/src/plugins/lua/meta/fetch.lua b/src/plugins/lua/meta/fetch.lua
new file mode 100644
index 00000000000..ada2b07d4ae
--- /dev/null
+++ b/src/plugins/lua/meta/fetch.lua
@@ -0,0 +1,30 @@
+---@meta Fetch
+local Fetch = {}
+
+---A network reply from fetch.
+---@class QNetworkReply
+---@field error integer The error code of the reply or 0 if no error.
+local QNetworkReply = {}
+
+---Returns the data of the reply.
+---@return string
+function QNetworkReply:readAll() end
+
+---Fetches a url. Call `a.wait` on the returned value to get the result.
+---@param options FetchOptions
+---@return table|QNetworkReply|string
+function Fetch.fetch(options) end
+
+--@param options FetchOptions
+--@param callback function The callback to call when the fetch is done.
+function Fetch.fetch_cb(options, callback) end
+
+---@class FetchOptions
+---@field url string The url to fetch.
+---@field method? string The method to use (GET, POST, ...), default is GET.
+---@field headers? table The headers to send.
+---@field body? string The body to send.
+---@field convertToTable? boolean If true, the resulting data will expect JSON and converted it to a table.
+local FetchOptions = {}
+
+return Fetch
diff --git a/src/plugins/lua/meta/gui.lua b/src/plugins/lua/meta/gui.lua
new file mode 100644
index 00000000000..ac3df927809
--- /dev/null
+++ b/src/plugins/lua/meta/gui.lua
@@ -0,0 +1,175 @@
+---@meta Gui
+
+local gui = {}
+
+---The base class of all ui related classes.
+---@class Object
+gui.Object = {}
+
+---The base class of all gui layout classes.
+---@class Layout : Object
+gui.Layout = {}
+
+---The base class of all widget classes, an empty widget itself.
+---@class Widget : Object
+gui.Widget = {}
+
+---@param children Layout
+---@return Widget
+function gui.Widget(children) end
+
+---Column layout
+---@class Column : Layout
+local column = {}
+
+---@param children Layout|string|BaseAspect|function
+---@return Column
+function gui.Column(children) end
+
+---A group box with a title.
+---@class Group : Widget
+local group = {}
+
+---@return Group
+function gui.Group(children) end
+
+---Row layout.
+---@class Row : Layout
+local row = {}
+
+---@param children Layout|string|BaseAspect|function
+---@return Row
+function gui.Row(children) end
+
+---Flow layout.
+---@class Flow : Layout
+local flow = {}
+
+---@param children Layout|string|BaseAspect|function
+---@return Flow
+function gui.Flow(children) end
+
+---Grid layout.
+---@class Grid : Layout
+local grid = {}
+
+---@param children Layout|string|BaseAspect|function
+---@return Grid
+function gui.Grid(children) end
+
+---Form layout.
+---@class Form : Layout
+local form = {}
+
+---@param children Layout|string|BaseAspect|function
+---@return Form
+function gui.Form(children) end
+
+
+---A stack of multiple widgets.
+---@class Stack : Widget
+local stack = {}
+
+---@param children Layout|string|BaseAspect|function
+---@return Stack
+function gui.Stack(children) end
+
+---A Tab widget.
+---@class Tab : Widget
+local tab = {}
+
+---@param children Layout|string|BaseAspect|function
+---@return Tab
+function gui.Tab(children) end
+
+---A Multiline text edit.
+---@class TextEdit : Widget
+local textEdit = {}
+
+---@param children Layout|string|BaseAspect|function
+---@return TextEdit
+function gui.TextEdit(children) end
+
+---@class PushButton : Widget
+local pushButton = {}
+
+---@param children Layout|string|BaseAspect|function
+---@return PushButton
+function gui.PushButton(children) end
+
+---@class Label : LayoutItem
+local label = {}
+
+---@param children LayoutItem|string|BaseAspect|function
+---@return Label
+function gui.Label(children) end
+
+---@class SpinBox : Widget
+local spinBox = {}
+
+---@param children Layout|string|BaseAspect|function
+---@return SpinBox
+function gui.SpinBox(children) end
+
+---@class Splitter : Widget
+local splitter = {}
+
+---@param children Layout|string|BaseAspect|function
+---@return Splitter
+function gui.Splitter(children) end
+
+---@class ToolBar : Widget
+local toolBar = {}
+
+---@param children Layout|string|BaseAspect|function
+---@return ToolBar
+function gui.ToolBar(children) end
+
+---@class TabWidget : Widget
+local tabWidget = {}
+
+---@param children Layout|string|BaseAspect|function
+---@return TabWidget
+function gui.TabWidget(children) end
+
+---@param name string
+---@param child Layout|string|BaseAspect|function
+---@return TabWidget
+function gui.TabWidget(name, child) end
+---A "Line break" in the gui.
+function gui.br() end
+
+---A "Stretch" in the layout.
+function gui.st() end
+
+---An empty grid cell in a grid layout.
+function gui.empty() end
+
+---A horizontal line in the layout.
+function gui.hr() end
+
+---Clears the margin of the layout.
+function gui.noMargin() end
+
+---Sets the margin of the layout to the default value.
+function gui.normalMargin() end
+
+---Sets the alignment of a Grid layout according to the Form layout rules.
+function gui.withFormAlignment() end
+
+---Sets the size of the parent object if possible.
+function gui.resize(width, height) end
+
+---Sets the spacing of the gui.
+function gui.spacing(spacing) end
+
+---Sets the field growth policy of the gui.
+function gui.fieldGrowthPolicy(policy) end
+
+---Sets the onClicked handler of the parent object if possible.
+function gui.onClicked(f) end
+
+---Sets the onTextChanged handler of the parent object if possible.
+function gui.onTextChanged(f) end
+
+return gui
diff --git a/src/plugins/lua/meta/install.lua b/src/plugins/lua/meta/install.lua
new file mode 100644
index 00000000000..427c0d51765
--- /dev/null
+++ b/src/plugins/lua/meta/install.lua
@@ -0,0 +1,29 @@
+---@meta Install
+
+local Install = {}
+
+---@class PackageInfo
+---@field name string The name of the package.
+---@field version string The version of the package.
+---@field path FilePath The path to the package.
+
+local PackageInfo = {}
+---@class InstallOptions
+---@field name string The name of the package to install.
+---@field url string The url to fetch the package from.
+---@field version string The version of the package to install.
+local InstallOptions = {}
+
+---Install something
+---@param msg string The message to display to the user asking for permission to install.
+---@param options InstallOptions|[InstallOptions] The options to install.
+---@return boolean Result Whether the installation was successful.
+---@return string Error The error message if the installation failed.
+function Install.install(msg, options) end
+
+---Get the package info
+---@param name any The name of the package.
+---@return PackageInfo
+function Install.packageInfo(name) end
+
+return Install
diff --git a/src/plugins/lua/meta/lsp.lua b/src/plugins/lua/meta/lsp.lua
new file mode 100644
index 00000000000..b0a34e7cd7e
--- /dev/null
+++ b/src/plugins/lua/meta/lsp.lua
@@ -0,0 +1,40 @@
+---@meta LSP.
+
+local lsp = {}
+
+---@class ClientOptions
+---@field name string The name under which to register the language server.
+---@field cmd function|string[] The command to start the language server, or a function returning a string[].
+---@field transport? "stdio"|"localsocket" Defaults to stdio.
+---@field serverName? string The socket path when transport == "localsocket".
+---@field languageFilter LanguageFilter The language filter deciding which files to open with the language server.
+---@field startBehavior? "AlwaysOn"|"RequiresFile"|"RequiresProject"
+---@field initializationOptions? table|string The initialization options to pass to the language server, either a JSON string, or a table.
+---@field settings? AspectContainer
+---@field onStartFailed? function This callback is called when client failed to start.
+local ClientOptions = {}
+
+---@class LanguageFilter
+---@field patterns? string[] The file patterns supported by the language server.
+---@field mimeTypes? string[] The mime types supported by the language server.
+local LanguageFilter = {}
+
+---@class Client
+---@field on_instance_start function The callback to call when a language client starts.
+lsp.Client = {}
+
+---@param msg string The name of the message to handle.
+---@param callback function The callback to call when the message is received.
+---Registers a message handler for the message named 'msg'.
+function lsp.Client:registerMessage(msg, callback) end
+
+---@param msg table the message to send.
+---Sends a message to the language server.
+function lsp.Client:sendMessage(msg, callback) end
+
+---Creates a new Language Client.
+---@param options ClientOptions
+---@return Client
+function lsp.Client.create(options) end
+
+return lsp
diff --git a/src/plugins/lua/meta/messagemanager.lua b/src/plugins/lua/meta/messagemanager.lua
new file mode 100644
index 00000000000..5bd6d92ed5e
--- /dev/null
+++ b/src/plugins/lua/meta/messagemanager.lua
@@ -0,0 +1,17 @@
+---@meta MessageManager
+
+local messagemanager = {}
+
+---Writes a message to the Output pane.
+---@param ... any
+function messagemanager.writeSilently(...) end
+
+---Writes a message to the Output pane and flashes the pane if its not open.
+---@param ... any
+function messagemanager.writeFlashing(...) end
+
+---Writes a message to the Output pane and opens the pane if its not open.
+---@param ... any
+function messagemanager.writeDisrupting(...) end
+
+return messagemanager
diff --git a/src/plugins/lua/meta/process.lua b/src/plugins/lua/meta/process.lua
new file mode 100644
index 00000000000..e15d71996ae
--- /dev/null
+++ b/src/plugins/lua/meta/process.lua
@@ -0,0 +1,17 @@
+---@meta Process
+
+local process = {}
+
+---@async
+---Runs a command in a terminal, has to be called from a coroutine!
+---@param cmd string The command to run.
+---@return number exitCode The exit code of the command.
+function process.runInTerminal(cmd) end
+
+---@async
+---Runs a command and returns the output!
+---@param cmd string The command to run.
+---@return string output The output of the command.
+function process.commandOutput(cmd) end
+
+return process
diff --git a/src/plugins/lua/meta/qt.lua b/src/plugins/lua/meta/qt.lua
new file mode 100644
index 00000000000..7d446bce628
--- /dev/null
+++ b/src/plugins/lua/meta/qt.lua
@@ -0,0 +1,66 @@
+---@meta Qt
+
+--- The values in enums here do not matter, as they are defined by the C++ code.
+
+local qt = {}
+
+---@enum TextElideMode
+qt.TextElideMode = {
+    ElideLeft = 0,
+    ElideRight = 0,
+    ElideMiddle = 0,
+    ElideNone = 0,
+}
+
+qt.QDir = {
+    ---@enum Filters
+    Filters = {
+        Dirs = 0,
+        Files = 0,
+        Drives = 0,
+        NoSymLinks = 0,
+        AllEntries = 0,
+        TypeMask = 0,
+        Readable = 0,
+        Writable = 0,
+        Executable = 0,
+        PermissionMask = 0,
+        Modified = 0,
+        Hidden = 0,
+        System = 0,
+        AccessMask = 0,
+        AllDirs = 0,
+        CaseSensitive = 0,
+        NoDot = 0,
+        NoDotDot = 0,
+        NoDotAndDotDot = 0,
+        NoFilter = 0,
+    },
+
+    ---@enum SortFlags
+    SortFlags = {
+        Name = 0,
+        Time = 0,
+        Size = 0,
+        Unsorted = 0,
+        SortByMask = 0,
+        DirsFirst = 0,
+        Reversed = 0,
+        IgnoreCase = 0,
+        DirsLast = 0,
+        LocaleAware = 0,
+        Type = 0,
+        NoSort = 0,
+    }
+}
+
+qt.QDirIterator = {
+    ---@enum IteratorFlag
+    IteratorFlag = {
+        NoIteratorFlags = 0,
+        FollowSymlinks = 0,
+        Subdirectories = 0,
+    }
+}
+
+return qt
diff --git a/src/plugins/lua/meta/qtc.lua b/src/plugins/lua/meta/qtc.lua
new file mode 100644
index 00000000000..c4b1a10bea0
--- /dev/null
+++ b/src/plugins/lua/meta/qtc.lua
@@ -0,0 +1,43 @@
+---@meta
+
+---The global qtc object defined in the Lua plugin.
+---@class qtc
+Qtc = {}
+
+---@class (exact) QtcPlugin
+---@field Name string The name of the plugin.
+---@field Version string The version of the plugin. (`major.minor.patch`)
+---@field CompatVersion string The lowest previous version of the plugin that this one is compatible to. (`major.minor.patch`)
+---@field Vendor string The vendor of the plugin.
+---@field Category string The category of the plugin.
+---@field Dependencies? QtcPluginDependency[] The dependencies of the plugin.
+---@field Description? string A short one line description of the plugin.
+---@field LongDescription? string A long description of the plugin. Can contain newlines.
+---@field Url? string The url of the plugin.
+---@field License? string The license text of the plugin.
+---@field Revision? string The revision of the plugin.
+---@field Copyright? string The copyright of the plugin.
+---@field Experimental? boolean Whether the plugin is experimental or not. ( Default: true )
+---@field DisabledByDefault? boolean Whether the plugin is disabled by default or not. ( Default: true )
+---@field setup function The setup function of the plugin.
+---@field hooks? Hooks The hooks of the plugin.
+---@field Mimetypes? string XML MIME-info for registering additional or adapting built-in MIME types.
+---@field JsonWizardPaths? string[] A list of paths relative to the plugin location or paths to the Qt resource system that are searched for template-based wizards.
+---@field printToOutputPane? boolean Whether the `print(...)` function should print to the output pane or not. ( Default: false )
+QtcPlugin = {}
+
+---@class QtcPluginDependency
+---@field Name string The name of the dependency.
+---@field Version string The version of the dependency. (`major.minor.patch`)
+---@field Required? "required"|"optional"|"test" Whether the dependency is required or not. (Default: "required")
+QtcPluginDependency = {}
+
+
+---@class EditorHooks
+---@field documentOpened function function(document)
+---@field documentClosed function function(document)
+EditorHooks = {}
+
+---@class Hooks
+---@field editors? EditorHooks
+Hooks = {}
diff --git a/src/plugins/lua/meta/settings.lua b/src/plugins/lua/meta/settings.lua
new file mode 100644
index 00000000000..6cf32d8ef2b
--- /dev/null
+++ b/src/plugins/lua/meta/settings.lua
@@ -0,0 +1,187 @@
+---@meta Settings
+
+---@module 'Qt'
+
+local settings = {}
+
+---The base class of all aspects
+---@class BaseAspect
+settings.BaseAspect = {}
+
+---Applies the changes from its volatileValue to its value.
+function settings.BaseAspect:apply() end
+
+---@class AspectCreate
+---@field settingsKey? string The settings key of the aspect.
+---@field displayName? string The display name of the aspect.
+---@field labelText? string The label text of the aspect.
+---@field toolTip? string The tool tip of the aspect.
+---@field enabler? BoolAspect Enable / Disable this aspect based on the state of the `enabler`.
+---@field onValueChanged? function () Called when the value of the aspect changes.
+---@field onVolatileValueChanged? function () Called when the volatile value of the aspect changes.
+local AspectCreate = {}
+
+---The base class of most typed aspects.
+---@generic T
+---@class TypedAspect<T> : BaseAspect
+---@field value `T` The value of the aspect.
+---@field volatileValue `T` The temporary value of the aspect.
+---@field defaultValue `T` The default value of the aspect.
+local TypedAspect = {}
+
+---@generic T
+---@class TypedAspectCreate<T> : AspectCreate
+---@field defaultValue `T` The default value of the aspect.
+local TypedAspectCreate = {}
+
+---A container for aspects.
+---@class AspectContainer : BaseAspect
+settings.AspectContainer = {}
+
+---Options for creating an AspectContainer.
+---@class AspectContainerCreate
+---@field autoApply? boolean Whether the aspects should be applied automatically or not.
+AspectContainerCreate = {}
+
+
+---Create a new AspectContainer.
+---@param options AspectContainerCreate
+---@return AspectContainer
+function settings.AspectContainer.create(options) end
+
+---A aspect containing a boolean value.
+---@class BoolAspect : TypedAspect<boolean>
+settings.BoolAspect = {}
+
+---@enum LabelPlacement
+settings.LabelPlacement = {
+    AtCheckBox = 0,
+    Compact = 0,
+    InExtraLabel = 0
+};
+---@class BoolAspectCreate : TypedAspectCreate<boolean>
+---@field labelPlacement? LabelPlacement:
+BoolAspectCreate = {}
+
+---Create a new BoolAspect.
+---@param options BoolAspectCreate
+---@return BoolAspect
+function settings.BoolAspect.create(options) end
+
+settings.ColorAspect = {}
+function settings.ColorAspect.create(options) end
+
+settings.SelectionAspect = {}
+function settings.SelectionAspect.create(options) end
+
+settings.MultiSelectionAspect = {}
+function settings.MultiSelectionAspect.create(options) end
+
+---@enum StringDisplayStyle
+settings.StringDisplayStyle = {
+    Label = 0,
+    LineEdit = 0,
+    TextEdit = 0,
+    PasswordLineEdit = 0,
+};
+
+---@class StringAspectCreate : TypedAspectCreate<string>
+---@field displayStyle? StringDisplayStyle The display type of the aspect.
+---@field historyId? string The history id of the aspect.
+---@field valueAcceptor? function string (oldvalue: string, newValue: string)
+---@field showToolTipOnLabel? boolean
+---@field displayFilter? function string (value: string)
+---@field placeHolderText? string
+---@field acceptRichText? boolean
+---@field autoApplyOnEditingFinished? boolean
+---@field elideMode? Qt.TextElideMode The elide mode of the aspect.
+StringAspectCreate = {}
+
+---@class StringAspect : TypedAspect<string>
+settings.StringAspect = {}
+
+---Create a new StringAspect
+---@param options StringAspectCreate
+function settings.StringAspect.create(options) end
+
+---@enum Kind
+settings.Kind = {
+    ExistingDirectory = 0,
+    Directory = 0,
+    File = 0,
+    SaveFile = 0,
+    ExistingCommand = 0,
+    Command = 0,
+    Any = 0
+};
+
+---@class FilePathAspectCreate
+---@field expectedKind? Kind The kind of path we want to select.
+---@field historyId? string The history id of the aspect.
+---@field defaultPath? FilePath The default path of the aspect.
+---@field promptDialogFilter? string
+---@field promptDialogTitle? string
+---@field commandVersionArguments? string[]
+---@field allowPathFromDevice? boolean
+---@field validatePlaceHolder? boolean
+---@field openTerminalHandler? function
+---@field environment? Environment
+---@field baseFileName? FilePath
+---@field valueAcceptor? function string (oldvalue: string, newValue: string)
+---@field showToolTipOnLabel?  boolean
+---@field autoApplyOnEditingFinished? boolean
+---@field validationFunction? function
+---@field displayFilter? function string (value: string)
+---@field placeHolderText? string
+FilePathAspectCreate = {}
+
+---@class FilePathAspect
+---@field expandedValue FilePath The expanded value of the aspect.
+---@field defaultPath FilePath The default path of the aspect.
+settings.FilePathAspect = {}
+
+---Create a new FilePathAspect
+---@param options FilePathAspectCreate : TypedAspectCreate<string>
+---@return FilePathAspect
+function settings.FilePathAspect.create(options) end
+
+---Set the value of the aspect
+---@param value string|FilePath The value to set.
+function settings.FilePathAspect:setValue(value) end
+
+settings.IntegerAspect = {}
+function settings.IntegerAspect.create(options) end
+
+settings.DoubleAspect = {}
+function settings.DoubleAspect.create(options) end
+
+settings.StringListAspect = {}
+function settings.StringListAspect.create(options) end
+
+settings.FilePathListAspect = {}
+function settings.FilePathListAspect.create(options) end
+
+settings.IntegersAspect = {}
+function settings.IntegersAspect.create(options) end
+
+settings.StringSelectionAspect = {}
+function settings.StringSelectionAspect.create(options) end
+
+---@class OptionsPage
+settings.OptionsPage = {}
+
+---@class OptionsPageCreate
+---@field id string
+---@field displayName string
+---@field categoryId string
+---@field displayCategory string
+---@field categoryIconPath string
+---@field aspectContainer AspectContainer
+OptionsPageCreate = {}
+
+---Creates a new OptionsPage.
+---@param options OptionsPageCreate
+---@return OptionsPage
+function settings.OptionsPage.create(options) end
+
+return settings
diff --git a/src/plugins/lua/meta/simpletypes.lua b/src/plugins/lua/meta/simpletypes.lua
new file mode 100644
index 00000000000..5071efa9119
--- /dev/null
+++ b/src/plugins/lua/meta/simpletypes.lua
@@ -0,0 +1,36 @@
+---@meta
+
+---@class QRect
+---@field x integer The x position of the rectangle.
+---@field y integer The y position of the rectangle.
+---@field width integer The width of the rectangle.
+---@field height integer The height of the rectangle.
+QRect = {}
+
+---@class QSize
+---@field width integer The width of the size.
+---@field height integer The height of the size.
+QSize = {}
+
+---@class QPoint
+---@field x integer The x position of the point.
+---@field y integer The y position of the point.
+QPoint = {}
+
+
+---@class QPointF
+---@field x number The x position of the floating point.
+---@field y number The y position of the floating point.
+QPointF = {}
+
+---@class QSizeF
+---@field width number The width of the floating point size.
+---@field height number The height of the floating point size.
+QSizeF = {}
+
+---@class QRectF
+---@field x number The x position of the floating point rectangle.
+---@field y number The y position of the floating point rectangle.
+---@field width number The width of the floating point rectangle.
+---@field height number The height of the floating point rectangle.
+QRectF = {}
diff --git a/src/plugins/lua/meta/utils.lua b/src/plugins/lua/meta/utils.lua
new file mode 100644
index 00000000000..51e74ea1033
--- /dev/null
+++ b/src/plugins/lua/meta/utils.lua
@@ -0,0 +1,103 @@
+---@meta Utils
+
+local utils = {}
+
+---Suspends the current coroutine for the given amount of milliseconds. Call `a.wait` on the returned value to get the result.
+---@param ms number The amount of milliseconds to wait.
+function utils.waitms(ms) end
+
+---Calls the callback after the given amount of milliseconds.
+---@param ms number The amount of milliseconds to wait.
+---@param callback function The callback to call.
+function utils.waitms_cb(ms, callback) end
+
+---@class FilePath
+utils.FilePath = {}
+
+---@param path string The path to convert.
+---@return FilePath The converted path.
+---Convert and clean a path, returning a FilePath object.
+function utils.FilePath.fromUserInput(path) end
+
+---@return FilePath The new absolute path.
+---Searches for the path inside the PATH environment variable. Call `a.wait` on the returned value to get the result.
+function utils.FilePath:searchInPath() end
+
+---@class (exact) DirEntriesOptions
+---@field nameFilters? string[] The name filters to use (e.g. "*.lua"), defaults to all files.
+---@field fileFilters? integer The filters to use (combination of QDir.Filters.*), defaults to QDir.Filters.NoFilter.
+---@field flags? integer The iterator flags (combination of QDirIterator.Flags.*), defaults to QDirIterator.Flags.NoIteratorFlags.
+
+---Returns all entries in the directory. Call `a.wait` on the returned value to get the result.
+---@param options DirEntriesOptions
+---@return FilePath[]
+function utils.FilePath:dirEntries(options) end
+
+---Returns the FilePath as it should be displayed to the user.
+---@return string
+function utils.FilePath:toUserOutput() end
+
+---Returns whether the target exists.
+---@return boolean
+function utils.FilePath:exists() end
+
+---Returns whether the target is a file and executable.
+---@return boolean
+function utils.FilePath:isExecutableFile() end
+
+---Returns the path portion of FilePath as a string in the hosts native format.
+---@return string
+function utils.FilePath:nativePath() end
+
+---Returns the last part of the path.
+---@return string
+function utils.FilePath:fileName() end
+
+---Returns the current working path of Qt Creator.
+---@return FilePath
+function utils.FilePath.currentWorkingPath() end
+
+---Returns a new FilePath with the given tail appended.
+---@param tail string|FilePath The tail to append.
+---@return FilePath
+function utils.FilePath:resolvePath(tail) end
+
+---Returns the parent directory of the path.
+---@return FilePath
+function utils.FilePath:parentDir() end
+
+---If the path targets a symlink, this function returns the target of the symlink.
+---@return FilePath resolvedPath The resolved path.
+function utils.FilePath:resolveSymlinks() end
+
+---Returns the suffix of the paths (e.g. "test.ui.qml" -> ".qml").
+---@return string
+function utils.FilePath:suffix() end
+
+---Returns the complete suffix of the paths (e.g. "test.ui.qml" -> "ui.qml").
+---@return string
+function utils.FilePath:completeSuffix() end
+
+---Returns whether the path is absolute.
+---@return boolean
+function utils.FilePath:isAbsolutePath() end
+
+---@class HostOsInfo
+---@field os "mac"|"windows"|"linux" The current host operating system.
+---@field architecture "unknown"|"x86"|"x86_64"|"itanium"|"arm"|"arm64" The current host architecture.
+utils.HostOsInfo = {}
+
+---Returns whether the host operating system is windows.
+---@return boolean
+function utils.HostOsInfo.isWindowsHost() end
+
+---Returns whether the host operating system is mac.
+---@return boolean
+function utils.HostOsInfo.isMacHost() end
+
+---Returns whether the host operating system is linux.
+---@return boolean
+function utils.HostOsInfo.isLinuxHost() end
+
+
+return utils
diff --git a/src/plugins/lua/meta/widgets.lua b/src/plugins/lua/meta/widgets.lua
new file mode 100644
index 00000000000..3f28bd49e9d
--- /dev/null
+++ b/src/plugins/lua/meta/widgets.lua
@@ -0,0 +1,111 @@
+---@meta Widgets
+
+local widgets = {}
+
+---A QWidget, see https://doc.qt.io/qt-6/QWidget.html
+---@class QWidget : QObject
+---@field acceptDrops boolean
+---@field accessibleDescription string
+---@field accessibleName string
+---@field autoFillBackground boolean
+---@field baseSize QSize
+---@field childrenRect QRect
+---@field childrenRegion QRegion
+---@field contextMenuPolicy QtContextMenuPolicy
+---@field cursor QCursor
+---@field enabled boolean
+---@field focus boolean
+---@field focusPolicy QtFocusPolicy
+---@field font QFont
+---@field frameGeometry QRect
+---@field frameSize QSize
+---@field fullScreen boolean
+---@field geometry QRect
+---@field height integer
+---@field inputMethodHints QtInputMethodHints
+---@field isActiveWindow boolean
+---@field layoutDirection QtLayoutDirection
+---@field locale QLocale
+---@field maximized boolean
+---@field maximumHeight integer
+---@field maximumSize QSize
+---@field maximumWidth integer
+---@field minimized boolean
+---@field minimumHeight integer
+---@field minimumSize QSize
+---@field minimumSizeHint QSize
+---@field minimumWidth integer
+---@field modal boolean
+---@field mouseTracking boolean
+---@field normalGeometry QRect
+---@field palette QPalette
+---@field pos QPoint
+---@field rect QRect
+---@field size QSize
+---@field sizeHint QSize
+---@field sizeIncrement QSize
+---@field sizePolicy QSizePolicy
+---@field statusTip string
+---@field styleSheet string
+---@field tabletTracking boolean
+---@field toolTip string
+---@field toolTipDuration integer
+---@field updatesEnabled boolean
+---@field visible boolean
+---@field whatsThis string
+---@field width integer
+---@field windowFilePath string
+---@field windowFlags QtWindowFlags
+---@field windowIcon QIcon
+---@field windowModality QtWindowModality
+---@field windowModified boolean
+---@field windowOpacity double
+---@field windowTitle string
+---@field x integer
+---@field y integer
+widgets.QWidget = {}
+
+---@return boolean
+function widgets.QWidget:close() end
+
+function widgets.QWidget:hide() end
+
+function widgets.QWidget:lower() end
+
+function widgets.QWidget:raise() end
+
+function widgets.QWidget:repaint() end
+
+function widgets.QWidget:setDisabled(disable) end
+
+function widgets.QWidget:setEnabled(enabled) end
+
+function widgets.QWidget:setFocus() end
+
+function widgets.QWidget:setHidden(hidden) end
+
+function widgets.QWidget:setStyleSheet(styleSheet) end
+
+function widgets.QWidget:setVisible(visible) end
+
+function widgets.QWidget:setWindowModified(modified) end
+
+function widgets.QWidget:setWindowTitle(title) end
+
+function widgets.QWidget:show() end
+
+function widgets.QWidget:showFullScreen() end
+
+function widgets.QWidget:showMaximized() end
+
+function widgets.QWidget:showMinimized() end
+
+function widgets.QWidget:showNormal() end
+
+function widgets.QWidget:update() end
+
+---A QDialog, see https://doc.qt.io/qt-6/qdialog.html
+---@class QDialog : QWidget
+widgets.QDialog = {}
+
+return widgets
diff --git a/src/plugins/lua/metabackup/qobject.lua b/src/plugins/lua/metabackup/qobject.lua
new file mode 100644
index 00000000000..4584fc6a9f2
--- /dev/null
+++ b/src/plugins/lua/metabackup/qobject.lua
@@ -0,0 +1,6 @@
+---@meta
+
+---A QObject, see https://doc.qt.io/qt-6/qobject.html
+---@class QObject
+---@field objectName string
+QObject = {}
diff --git a/src/plugins/lua/wizards/luafile/script.lua b/src/plugins/lua/wizards/luafile/script.lua
new file mode 100644
index 00000000000..7df869a15e7
--- /dev/null
+++ b/src/plugins/lua/wizards/luafile/script.lua
@@ -0,0 +1 @@
+print("Hello, World!")
diff --git a/src/plugins/lua/wizards/luafile/wizard.json b/src/plugins/lua/wizards/luafile/wizard.json
new file mode 100644
index 00000000000..eb1a0863d00
--- /dev/null
+++ b/src/plugins/lua/wizards/luafile/wizard.json
@@ -0,0 +1,41 @@
+{
+    "version": 1,
+    "supportedProjectTypes": [],
+    "id": "Q.Lua",
+    "category": "R.Lua",
+    "trDescription": "Creates a simple lua file.",
+    "trDisplayName": "Lua Script",
+    "trDisplayCategory": "Lua",
+    "iconText": "ts",
+    "enabled": "%{JS: value('Plugins').indexOf('Lua') >= 0}",
+    "options": [
+        {
+            "key": "DefaultSuffix",
+            "value": "%{JS: Util.preferredSuffix('text/x-lua')}"
+        }
+    ],
+    "pages": [
+        {
+            "trDisplayName": "Location",
+            "trShortTitle": "Location",
+            "typeId": "File"
+        },
+        {
+            "trDisplayName": "Project Management",
+            "trShortTitle": "Summary",
+            "typeId": "Summary"
+        }
+    ],
+    "generators": [
+        {
+            "typeId": "File",
+            "data": [
+                {
+                    "source": "script.lua",
+                    "target": "%{JS: Util.fileName(value('TargetPath'), value('DefaultSuffix'))}",
+                    "openInEditor": true
+                }
+            ]
+        }
+    ]
+}
diff --git a/src/plugins/lua/wizards/plugin/.luarc.json b/src/plugins/lua/wizards/plugin/.luarc.json
new file mode 100644
index 00000000000..00b63f41f20
--- /dev/null
+++ b/src/plugins/lua/wizards/plugin/.luarc.json
@@ -0,0 +1,9 @@
+{
+    "workspace.library": [
+        "%{JS: Lua.metaFolder()}"
+    ],
+    "hint.paramName": "Literal",
+    "hint.enable": true,
+    "hint.await": true,
+    "hint.arrayIndex": "Disable"
+}
diff --git a/src/plugins/lua/wizards/plugin/icon.png b/src/plugins/lua/wizards/plugin/icon.png
new file mode 100644
index 00000000000..11ccac86ddd
Binary files /dev/null and b/src/plugins/lua/wizards/plugin/icon.png differ
diff --git a/src/plugins/lua/wizards/plugin/icon@2x.png b/src/plugins/lua/wizards/plugin/icon@2x.png
new file mode 100644
index 00000000000..49a2ad834e9
Binary files /dev/null and b/src/plugins/lua/wizards/plugin/icon@2x.png differ
diff --git a/src/plugins/lua/wizards/plugin/init.lua.tpl b/src/plugins/lua/wizards/plugin/init.lua.tpl
new file mode 100644
index 00000000000..2e4203e2c8e
--- /dev/null
+++ b/src/plugins/lua/wizards/plugin/init.lua.tpl
@@ -0,0 +1,7 @@
+local function setup()
+    print("Hello from Lua!")
+end
+
+return {
+    setup = setup
+}
diff --git a/src/plugins/lua/wizards/plugin/plugin.lua.tpl b/src/plugins/lua/wizards/plugin/plugin.lua.tpl
new file mode 100644
index 00000000000..67d6e2966dd
--- /dev/null
+++ b/src/plugins/lua/wizards/plugin/plugin.lua.tpl
@@ -0,0 +1,23 @@
+return {
+    Name = "%{ProjectName}",
+    Version = "1.0.0",
+    CompatVersion = "1.0.0",
+    Vendor = "%{VendorName}",
+    Copyright = "%{Copyright}",
+    License = "%{License}",
+    Category = "My Plugins",
+    Description = "%{Description}",
+    Url = "%{Url}",
+    Experimental = true,
+    DisabledByDefault = false,
+    LongDescription = [[
+This plugin provides some functionality.
+You can describe it more here.
+    ]],
+    Dependencies = {
+        { Name = "Lua",  Version = "%{JS: Util.qtCreatorIdeVersion()}" },
+    },
+    setup = function()
+        require 'init'.setup()
+    end
+} --[[@as QtcPlugin]]
diff --git a/src/plugins/lua/wizards/plugin/project.json b/src/plugins/lua/wizards/plugin/project.json
new file mode 100644
index 00000000000..b13f0e967ff
--- /dev/null
+++ b/src/plugins/lua/wizards/plugin/project.json
@@ -0,0 +1,17 @@
+{
+    "$schema": "https://download.qt.io/official_releases/qtcreator/latest/installer_source/jsonschemas/project.json",
+    "files.exclude": [".qtcreator/project.json.user"],
+    "targets": [
+        {
+            "name": "Qt Creator",
+            "executable": "%\{IDE:Executable:FilePath\}",
+            "arguments": [
+                "-tcs",
+                "-load",
+                "Lua",
+                "-pluginpath",
+                "%\{ActiveProject:ProjectDirectory\}"
+            ]
+        }
+    ]
+}
diff --git a/src/plugins/lua/wizards/plugin/wizard.json b/src/plugins/lua/wizards/plugin/wizard.json
new file mode 100644
index 00000000000..d96a35c7d0e
--- /dev/null
+++ b/src/plugins/lua/wizards/plugin/wizard.json
@@ -0,0 +1,148 @@
+{
+    "version": 1,
+    "supportedProjectTypes": [
+        "ProjectExplorer.WorkspaceProject"
+    ],
+    "id": "R.QtCreatorLuaPlugin",
+    "category": "G.Library",
+    "trDescription": "Creates a custom Qt Creator Lua plugin.",
+    "trDisplayName": "Qt Creator Lua Plugin",
+    "trDisplayCategory": "Library",
+    "icon": "icon.png",
+    "iconKind": "Themed",
+    "featuresRequired": [],
+    "options": [
+        {
+            "key": "ProjectFile",
+            "value": "%{ProjectDirectory}/.qtcreator/project.json"
+        },
+        {
+            "key": "PluginSpecFile",
+            "value": "%{JS: Util.fileName(value('PluginName').toLowerCase(), Util.preferredSuffix('text/x-lua'))}"
+        },
+        {
+            "key": "SrcFileName",
+            "value": "init.lua"
+        }
+    ],
+    "pages": [
+        {
+            "trDisplayName": "Project Location",
+            "trShortTitle": "Location",
+            "typeId": "Project",
+            "data": {
+                "trDescription": "This wizard creates a custom Qt Creator lua plugin."
+            }
+        },
+        {
+            "trDisplayName": "Define Project Details",
+            "trShortTitle": "Details",
+            "typeId": "Fields",
+            "data": [
+                {
+                    "name": "ClassPageDescription",
+                    "type": "Label",
+                    "data": {
+                        "trText": "Specify details about your custom Qt Creator lua plugin.",
+                        "wordWrap": true
+                    }
+                },
+                {
+                    "name": "PluginName",
+                    "trDisplayName": "Plugin name:",
+                    "mandatory": true,
+                    "type": "LineEdit",
+                    "data": {
+                        "validator": "[a-zA-Z_][a-zA-Z_0-9]*",
+                        "text": "%{JS: value('ProjectName').charAt(0).toUpperCase() + value('ProjectName').slice(1)}"
+                    }
+                },
+                {
+                    "name": "VendorName",
+                    "persistenceKey": "VendorName",
+                    "trDisplayName": "Vendor name:",
+                    "mandatory": true,
+                    "type": "LineEdit",
+                    "data": {
+                        "trText": "MyCompany"
+                    }
+                },
+                {
+                    "name": "Copyright",
+                    "trDisplayName": "Copyright:",
+                    "mandatory": true,
+                    "type": "LineEdit",
+                    "data": {
+                        "trText": "(C) %{VendorName}"
+                    }
+                },
+                {
+                    "name": "License",
+                    "trDisplayName": "License:",
+                    "mandatory": true,
+                    "type": "LineEdit",
+                    "data": {
+                        "trText": "Put short license information here"
+                    }
+                },
+                {
+                    "name": "Description",
+                    "trDisplayName": "Description:",
+                    "mandatory": true,
+                    "type": "LineEdit",
+                    "data": {
+                        "trText": "Put a short description of your plugin here"
+                    }
+                },
+                {
+                    "name": "Url",
+                    "persistenceKey": "VendorUrl",
+                    "trDisplayName": "URL:",
+                    "mandatory": true,
+                    "type": "LineEdit",
+                    "data": {
+                        "text": "https://www.%{JS: encodeURIComponent(value('VendorName').toLowerCase())}.com"
+                    }
+                }
+            ]
+        },
+        {
+            "trDisplayName": "Kit Selection",
+            "trShortTitle": "Kits",
+            "typeId": "Kits",
+            "enabled": "%{JS: !value('IsSubproject')}",
+            "data": {
+                "projectFilePath": "%{ProjectFile}"
+            }
+        },
+        {
+            "trDisplayName": "Project Management",
+            "trShortTitle": "Summary",
+            "typeId": "Summary"
+        }
+    ],
+    "generators": [
+        {
+            "typeId": "File",
+            "data": [
+                {
+                    "source": "project.json",
+                    "target": "%{ProjectFile}",
+                    "openAsProject": true
+                },
+                {
+                    "source": "init.lua.tpl",
+                    "target": "%{PluginName}/%{SrcFileName}"
+                },
+                {
+                    "source": ".luarc.json"
+                },
+                {
+                    "source": "plugin.lua.tpl",
+                    "target": "%{PluginName}/%{PluginSpecFile}",
+                    "openInEditor": true
+                }
+            ]
+        }
+    ]
+}
diff --git a/src/plugins/lua/wizards/wizards.qrc b/src/plugins/lua/wizards/wizards.qrc
new file mode 100644
index 00000000000..076550cb4a6
--- /dev/null
+++ b/src/plugins/lua/wizards/wizards.qrc
@@ -0,0 +1,13 @@
+<RCC>
+  <qresource prefix="/lua/wizards">
+    <file>luafile/wizard.json</file>
+    <file>luafile/script.lua</file>
+    <file>plugin/init.lua.tpl</file>
+    <file>plugin/plugin.lua.tpl</file>
+    <file>plugin/project.json</file>
+    <file>plugin/wizard.json</file>
+    <file>plugin/.luarc.json</file>
+    <file>plugin/icon.png</file>
+    <file>plugin/icon@2x.png</file>
+  </qresource>
+</RCC>
diff --git a/src/plugins/macros/Macros.json.in b/src/plugins/macros/Macros.json.in
index 1c5d949c1c2..32740b0f7ac 100644
--- a/src/plugins/macros/Macros.json.in
+++ b/src/plugins/macros/Macros.json.in
@@ -12,7 +12,10 @@
                   "",
                   "Alternatively, this plugin 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 plugin. 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."
     ],
-    "Description" : "Macros in text editors.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Record and play macros in text editors.",
+    "LongDescription" : [
+        "When you have a file open in the code editor, you can record a keyboard sequence as a macro. You can then play the macro to repeat the sequence. You can save the latest macro and assign a keyboard shortcut for running it or run it from the locator."
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/marketplace/Marketplace.json.in b/src/plugins/marketplace/Marketplace.json.in
index 1122b40a67a..5d529715878 100644
--- a/src/plugins/marketplace/Marketplace.json.in
+++ b/src/plugins/marketplace/Marketplace.json.in
@@ -12,7 +12,8 @@
 "",
 "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."
 ],
-"Description" : "Qt Marketplace plugin.",
-"Url" : "http://www.qt.io",
+"Description" : "Install applications from Qt Marketplace.",
+"LongDescription" : [],
+"Url" : "https://www.qt.io",
 ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/marketplace/qtmarketplacewelcomepage.cpp b/src/plugins/marketplace/qtmarketplacewelcomepage.cpp
index e315ce7efb9..954eb55f144 100644
--- a/src/plugins/marketplace/qtmarketplacewelcomepage.cpp
+++ b/src/plugins/marketplace/qtmarketplacewelcomepage.cpp
@@ -62,11 +62,12 @@ public:
         Column {
             Row {
                 m_searcher,
-                customMargin({0, 0, ExVPaddingGapXl, 0}),
+                m_errorLabel,
+                customMargins(0, 0, ExVPaddingGapXl, 0),
             },
             m_sectionedProducts,
             spacing(VPaddingL),
-            customMargin({ExVPaddingGapXl, ExVPaddingGapXl, 0, 0}),
+            customMargins(ExVPaddingGapXl, ExVPaddingGapXl, 0, 0),
         }.attachTo(this);
 
         connect(m_sectionedProducts, &SectionedProducts::toggleProgressIndicator,
diff --git a/src/plugins/mcusupport/McuSupport.json.in b/src/plugins/mcusupport/McuSupport.json.in
index 94586c932e8..80eb3b4eada 100644
--- a/src/plugins/mcusupport/McuSupport.json.in
+++ b/src/plugins/mcusupport/McuSupport.json.in
@@ -14,7 +14,14 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Device Support",
-    "Description" : "Helper for MCU related projects.",
-    "Url" : "http://www.qt.io",
-    ${IDE_PLUGIN_DEPENDENCIES}
+    "Description" : "Develop for microcontrollers.",
+    "LongDescription" : [
+        "Use subsets of QML and Qt Quick Controls to create user interfaces for devices that are powered by microcontrollers (MCU).",
+        "You also need:",
+            "- Qt for MCUs"
+    ],
+    "Url" : "https://www.qt.io",
+    ${IDE_PLUGIN_DEPENDENCIES},
+
+    "JsonWizardPaths" : [":/mcusupport/wizards/"]
 }
diff --git a/src/plugins/mcusupport/mcubuildstep.cpp b/src/plugins/mcusupport/mcubuildstep.cpp
index 102ee306fef..786b363d38f 100644
--- a/src/plugins/mcusupport/mcubuildstep.cpp
+++ b/src/plugins/mcusupport/mcubuildstep.cpp
@@ -67,12 +67,12 @@ DeployMcuProcessStep::DeployMcuProcessStep(ProjectExplorer::BuildStepList *bc, I
     , m_tmpDir()
 {
     if (!buildSystem()) {
-        showError(QmlProjectManager::Tr::tr("Failed to find valid build system"));
+        showError(QmlProjectManager::Tr::tr("Cannot find a valid build system."));
         return;
     }
 
     if (!m_tmpDir.isValid()) {
-        showError(QmlProjectManager::Tr::tr("Failed to create valid build directory"));
+        showError(QmlProjectManager::Tr::tr("Cannot create a valid build directory."));
         return;
     }
 
@@ -193,7 +193,7 @@ void MCUBuildStepFactory::updateDeployStep(ProjectExplorer::Target *target, bool
             stepList->appendStep(DeployMcuProcessStep::id);
         } else {
             DeployMcuProcessStep::showError(
-                QmlProjectManager::Tr::tr("Failed to find valid Qt for MCUs kit"));
+                QmlProjectManager::Tr::tr("Cannot find a valid Qt for MCUs kit."));
         }
     } else {
         if (!step)
diff --git a/src/plugins/mcusupport/mcukitaspect.cpp b/src/plugins/mcusupport/mcukitaspect.cpp
index 8d497f209dd..7e75288b4f9 100644
--- a/src/plugins/mcusupport/mcukitaspect.cpp
+++ b/src/plugins/mcusupport/mcukitaspect.cpp
@@ -24,7 +24,7 @@ public:
 
     void makeReadOnly() override {}
     void refresh() override {}
-    void addToLayoutImpl(Layouting::LayoutItem &) override {}
+    void addToLayoutImpl(Layouting::Layout &) override {}
 };
 
 Utils::Id McuDependenciesKitAspect::id()
@@ -78,7 +78,7 @@ public:
         const QVariant checkFormat = kit->value(McuDependenciesKitAspect::id());
         if (!checkFormat.isValid() || checkFormat.isNull())
             return result;
-        if (!checkFormat.canConvert(QVariant::List))
+        if (!checkFormat.canConvert(QMetaType(QMetaType::QVariantList)))
             return {BuildSystemTask(Task::Error, Tr::tr("The MCU dependencies setting value is invalid."))};
 
         // check paths defined in cmake variables for given dependencies exist
@@ -105,7 +105,7 @@ public:
         QTC_ASSERT(kit, return );
 
         const QVariant variant = kit->value(McuDependenciesKitAspect::id());
-        if (!variant.isNull() && !variant.canConvert(QVariant::List)) {
+        if (!variant.isNull() && !variant.canConvert(QMetaType(QMetaType::QVariantList))) {
             qWarning("Kit \"%s\" has a wrong mcu dependencies value set.",
                      qPrintable(kit->displayName()));
             McuDependenciesKitAspect::setDependencies(kit, Utils::EnvironmentItems());
diff --git a/src/plugins/mcusupport/mcupackage.cpp b/src/plugins/mcusupport/mcupackage.cpp
index 2ff913c680e..20ee020ae32 100644
--- a/src/plugins/mcusupport/mcupackage.cpp
+++ b/src/plugins/mcusupport/mcupackage.cpp
@@ -43,11 +43,11 @@ McuPackage::McuPackage(const SettingsHandler::Ptr &settingsHandler,
                        const McuPackageVersionDetector *versionDetector,
                        const bool addToSystemPath,
                        const Utils::PathChooser::Kind &valueType,
-                       const bool useNewestVersionKey)
+                       const bool allowNewerVersionKey)
     : settingsHandler(settingsHandler)
     , m_label(label)
     , m_detectionPaths(detectionPaths)
-    , m_settingsKey(settingsHandler->getVersionedKey(settingsKey, QSettings::SystemScope, versions, useNewestVersionKey))
+    , m_settingsKey(settingsKey)
     , m_versionDetector(versionDetector)
     , m_versions(versions)
     , m_cmakeVariableName(cmakeVarName)
@@ -56,8 +56,18 @@ McuPackage::McuPackage(const SettingsHandler::Ptr &settingsHandler,
     , m_addToSystemPath(addToSystemPath)
     , m_valueType(valueType)
 {
-    m_defaultPath = settingsHandler->getPath(m_settingsKey, QSettings::SystemScope, defaultPath);
-    m_path = settingsHandler->getPath(m_settingsKey, QSettings::UserScope, m_defaultPath);
+    // The installer writes versioned keys as well as the plain key as found in the kits.
+    // Use the versioned key in case the plain key was removed by an uninstall operation
+    const Utils::Key versionedKey = settingsHandler->getVersionedKey(settingsKey,
+                                                                     QSettings::SystemScope,
+                                                                     versions,
+                                                                     allowNewerVersionKey);
+    m_defaultPath = settingsHandler->getPath(versionedKey, QSettings::SystemScope, defaultPath);
+    m_path = settingsHandler->getPath(m_settingsKey, QSettings::UserScope, "");
+    // The user settings may have been written with a versioned key in older versions of QtCreator
+    if (m_path.isEmpty()) {
+        m_path = settingsHandler->getPath(versionedKey, QSettings::UserScope, m_defaultPath);
+    }
     if (m_path.isEmpty()) {
         m_path = FilePath::fromUserInput(qtcEnvironmentVariable(m_environmentVariableName));
     }
@@ -304,7 +314,7 @@ QWidget *McuPackage::widget()
     QObject::connect(this, &McuPackage::statusChanged, widget, [this] { updateStatusUi(); });
 
     QObject::connect(m_fileChooser, &PathChooser::textChanged, this, [this] {
-        setPath(m_fileChooser->rawFilePath());
+        setPath(m_fileChooser->unexpandedFilePath());
     });
 
     connect(this, &McuPackage::changed, m_fileChooser, [this] {
@@ -559,6 +569,10 @@ QVariant McuToolchainPackage::debuggerId() const
     switch (m_type) {
     case ToolchainType::ArmGcc: {
         sub = QString::fromLatin1("bin/arm-none-eabi-gdb-py");
+        const FilePath command = (path() / sub).withExecutableSuffix();
+        if (!command.exists()) {
+            sub = QString::fromLatin1("bin/arm-none-eabi-gdb");
+        }
         displayName = Tr::tr("Arm GDB at %1");
         engineType = Debugger::GdbEngineType;
         break;
diff --git a/src/plugins/mcusupport/mcupackage.h b/src/plugins/mcusupport/mcupackage.h
index a74c08bcf2d..7b9ef646506 100644
--- a/src/plugins/mcusupport/mcupackage.h
+++ b/src/plugins/mcusupport/mcupackage.h
@@ -41,7 +41,7 @@ public:
                const bool addToPath = false,
                const Utils::PathChooser::Kind &valueType
                = Utils::PathChooser::Kind::ExistingDirectory,
-               const bool useNewestVersionKey = false);
+               const bool allowNewerVersionKey = false);
 
     ~McuPackage() override = default;
 
diff --git a/src/plugins/mcusupport/mcusupportoptionspage.cpp b/src/plugins/mcusupport/mcusupportoptionspage.cpp
index 1383c737e71..d2269a40b51 100644
--- a/src/plugins/mcusupport/mcusupportoptionspage.cpp
+++ b/src/plugins/mcusupport/mcusupportoptionspage.cpp
@@ -320,7 +320,7 @@ void McuSupportOptionsWidget::apply()
 
     QMessageBox warningPopup(QMessageBox::Icon::Warning,
                              Tr::tr("Warning"),
-                             Tr::tr("Unable to apply changes in Devices > MCU."),
+                             Tr::tr("Cannot apply changes in Devices > MCU."),
                              QMessageBox::Ok,
                              this);
 
diff --git a/src/plugins/mcusupport/mcusupportplugin.cpp b/src/plugins/mcusupport/mcusupportplugin.cpp
index d9a4aeeeb50..938dcb233a4 100644
--- a/src/plugins/mcusupport/mcusupportplugin.cpp
+++ b/src/plugins/mcusupport/mcusupportplugin.cpp
@@ -262,7 +262,6 @@ void McuSupportPlugin::initialize()
 
     dd->m_options.registerQchFiles();
     dd->m_options.registerExamples();
-    ProjectExplorer::JsonWizardFactory::addWizardPath(":/mcusupport/wizards/");
 
 #if defined(WITH_TESTS) && defined(GOOGLE_TEST_IS_FOUND)
     addTest<Test::McuSupportTest>();
diff --git a/src/plugins/mcusupport/mcusupportrunconfiguration.cpp b/src/plugins/mcusupport/mcusupportrunconfiguration.cpp
index 9e936c4faeb..260b908c854 100644
--- a/src/plugins/mcusupport/mcusupportrunconfiguration.cpp
+++ b/src/plugins/mcusupport/mcusupportrunconfiguration.cpp
@@ -81,7 +81,7 @@ public:
     {
         setStartModifier([this, runControl] {
             const Target *target = runControl->target();
-            setCommandLine({cmakeFilePath(target), runControl->aspect<StringAspect>()->value,
+            setCommandLine({cmakeFilePath(target), runControl->aspectData<StringAspect>()->value,
                             CommandLine::Raw});
             setWorkingDirectory(target->activeBuildConfiguration()->buildDirectory());
             setEnvironment(target->activeBuildConfiguration()->environment());
diff --git a/src/plugins/mcusupport/settingshandler.cpp b/src/plugins/mcusupport/settingshandler.cpp
index 1ecec030b45..939ba125d1c 100644
--- a/src/plugins/mcusupport/settingshandler.cpp
+++ b/src/plugins/mcusupport/settingshandler.cpp
@@ -105,12 +105,24 @@ FilePath SettingsHandler::getPath(const Key &settingsKey,
 
 bool SettingsHandler::write(const Key &settingsKey,
                             const FilePath &path,
-                            const FilePath &defaultPath) const
+                            const FilePath &maybeDefaultPath) const
 {
     const FilePath savedPath = packagePathFromSettings(settingsKey,
                                                        *Core::ICore::settings(QSettings::UserScope),
-                                                       defaultPath);
+                                                       maybeDefaultPath);
     const Key key = Key(Constants::SETTINGS_GROUP) + '/' + Constants::SETTINGS_KEY_PACKAGE_PREFIX + settingsKey;
+
+    FilePath defaultPath = maybeDefaultPath;
+    if (path == maybeDefaultPath) {
+        // If the installer has overwritten the non-versioned key with an older version than the
+        // newest versioned key, and the user wants to manually return to the newest installed
+        // version, the defaultPath will match the desired path, and the settings object will
+        // assume it can simply remove the key instead of writing a new value to it.
+        // To work around this, pretend like the default value is the value found from the global scope
+        defaultPath = packagePathFromSettings(settingsKey,
+                                              *Core::ICore::settings(QSettings::SystemScope),
+                                              maybeDefaultPath);;
+    }
     Core::ICore::settings()->setValueWithDefault(key,
                                                  path.toUserOutput(),
                                                  defaultPath.toUserOutput());
diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp
index d523d6a4bf1..74e98a0ec41 100644
--- a/src/plugins/mcusupport/test/unittest.cpp
+++ b/src/plugins/mcusupport/test/unittest.cpp
@@ -75,6 +75,7 @@ using ProjectExplorer::ToolchainManager;
 
 using testing::_;
 using testing::Return;
+using testing::Between;
 
 namespace {
 const char empty[]{""};
@@ -506,6 +507,7 @@ void McuSupportTest::init()
 
 void McuSupportTest::cleanup()
 {
+    QVERIFY(settingsMockPtr.get());
     QVERIFY(testing::Mock::VerifyAndClearExpectations(settingsMockPtr.get()));
     QVERIFY(testing::Mock::VerifyAndClearExpectations(freeRtosPackage));
     QVERIFY(testing::Mock::VerifyAndClearExpectations(sdkPackage));
@@ -854,7 +856,7 @@ void McuSupportTest::test_useFallbackPathForToolchainWhenPathFromSettingsIsNotAv
     McuTargetDescription::Toolchain toolchainDescription{armGcc, {}, compilerDescription, {}};
 
     EXPECT_CALL(*settingsMockPtr, getPath(Key{armGccDirectorySetting}, _, FilePath{fallbackDir}))
-        .Times(2)
+        .Times(Between(2,3))
         .WillRepeatedly(Return(FilePath{fallbackDir}));
 
     McuToolchainPackage *toolchain = targetFactory.createToolchain(toolchainDescription);
@@ -1559,7 +1561,7 @@ void McuSupportTest::test_legacy_createThirdPartyPackage()
     QFETCH(QString, detectionPath);
 
     EXPECT_CALL(*settingsMockPtr, getPath(Key{setting}, _, _))
-        .Times(2)
+        .Times(Between(2,3))
         .WillRepeatedly(Return(FilePath::fromUserInput(defaultPath)));
 
     McuPackagePtr thirdPartyPackage{creator()};
@@ -1644,7 +1646,7 @@ void McuSupportTest::test_createThirdPartyPackage()
         .WillOnce(Return(FilePath::fromUserInput(defaultPath)));
 
     EXPECT_CALL(*settingsMockPtr, getPath(Key{setting}, QSettings::UserScope, _))
-        .Times(testing::AtMost(1))
+        .Times(testing::AtMost(2))
         .WillOnce(Return(FilePath::fromUserInput(path)));
 
     auto [targets, packages] = targetFactory.createTargets(targetDescription, sdkPackagePtr);
@@ -1668,7 +1670,7 @@ void McuSupportTest::test_createThirdPartyPackage()
 void McuSupportTest::test_legacy_createCypressProgrammer3rdPartyPackage()
 {
     EXPECT_CALL(*settingsMockPtr, getPath(Key{cypressProgrammerSetting}, _, _))
-        .Times(2)
+        .Times(Between(2,3))
         .WillRepeatedly(Return(FilePath::fromUserInput(defaultToolPath)));
 
     McuPackagePtr thirdPartyPackage{Legacy::createCypressProgrammerPackage(settingsMockPtr)};
@@ -1692,7 +1694,7 @@ void McuSupportTest::test_createJLink3rdPartyPackage()
         .WillOnce(Return(FilePath::fromUserInput(jlinkPath)));
 
     EXPECT_CALL(*settingsMockPtr, getPath(Key{jlinkSetting}, QSettings::UserScope, _))
-        .Times(testing::AtMost(1))
+        .Times(testing::AtMost(2))
         .WillOnce(Return(FilePath::fromUserInput(jlinkPath)));
 
     auto [targets, packages] = targetFactory.createTargets(targetDescription, sdkPackagePtr);
diff --git a/src/plugins/mercurial/Mercurial.json.in b/src/plugins/mercurial/Mercurial.json.in
index 5c897570e5f..bcd6da7610a 100644
--- a/src/plugins/mercurial/Mercurial.json.in
+++ b/src/plugins/mercurial/Mercurial.json.in
@@ -13,7 +13,11 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Version Control",
-    "Description" : "Mercurial integration.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Access the Mercurial source control management tool.",
+    "LongDescription" : [
+        "You also need:",
+            "- Mercurial"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp
index 6140706d001..d73d7655738 100644
--- a/src/plugins/mercurial/mercurialclient.cpp
+++ b/src/plugins/mercurial/mercurialclient.cpp
@@ -347,8 +347,9 @@ void MercurialClient::revertAll(const FilePath &workingDir, const QString &revis
 
 bool MercurialClient::isVcsDirectory(const FilePath &filePath) const
 {
-    return filePath.isDir()
-            && !filePath.fileName().compare(Constants::MERCURIALREPO, HostOsInfo::fileNameCaseSensitivity());
+    return !filePath.fileName()
+                .compare(Constants::MERCURIALREPO, HostOsInfo::fileNameCaseSensitivity())
+           && filePath.isDir();
 }
 
 void MercurialClient::view(const FilePath &source, const QString &id,
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index f87d181da41..6d7a1ef7302 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -669,7 +669,7 @@ bool MercurialPluginPrivate::managesFile(const FilePath &workingDirectory, const
 
 bool MercurialPluginPrivate::isConfigured() const
 {
-    const FilePath binary = settings().binaryPath();
+    const FilePath binary = settings().binaryPath.effectiveBinary();
     if (binary.isEmpty())
         return false;
     QFileInfo fi = binary.toFileInfo();
@@ -734,11 +734,9 @@ VcsCommand *MercurialPluginPrivate::createInitialCheckoutCommand(const QString &
                                                                  const QString &localName,
                                                                  const QStringList &extraArgs)
 {
-    QStringList args;
-    args << QLatin1String("clone") << extraArgs << url << localName;
     auto command = VcsBaseClient::createVcsCommand(this, baseDirectory,
                    mercurialClient().processEnvironment(baseDirectory));
-    command->addJob({settings().binaryPath(), args}, -1);
+    command->addJob({settings().binaryPath(), {"clone", extraArgs, url, localName}}, -1);
     return command;
 }
 
@@ -755,11 +753,11 @@ bool MercurialPluginPrivate::sccManaged(const QString &filename)
 
 void MercurialPluginPrivate::changed(const QVariant &v)
 {
-    switch (v.type()) {
-    case QVariant::String:
+    switch (v.typeId()) {
+    case QMetaType::QString:
         emit repositoryChanged(FilePath::fromVariant(v));
         break;
-    case QVariant::StringList:
+    case QMetaType::QStringList:
         emit filesChanged(v.toStringList());
         break;
     default:
diff --git a/src/plugins/mercurial/mercurialsettings.cpp b/src/plugins/mercurial/mercurialsettings.cpp
index 05c96672f90..79423ab7746 100644
--- a/src/plugins/mercurial/mercurialsettings.cpp
+++ b/src/plugins/mercurial/mercurialsettings.cpp
@@ -30,7 +30,7 @@ MercurialSettings::MercurialSettings()
     binaryPath.setExpectedKind(PathChooser::ExistingCommand);
     binaryPath.setDefaultValue(Constants::MERCURIALDEFAULT);
     binaryPath.setDisplayName(Tr::tr("Mercurial Command"));
-    binaryPath.setHistoryCompleter("Bazaar.Command.History");
+    binaryPath.setHistoryCompleter("Mercurial.Command.History");
     binaryPath.setLabelText(Tr::tr("Command:"));
 
     userName.setDisplayStyle(StringAspect::LineEditDisplay);
diff --git a/src/plugins/mesonprojectmanager/MesonProjectManager.json.in b/src/plugins/mesonprojectmanager/MesonProjectManager.json.in
index 169ac45e628..cd293ce4d75 100644
--- a/src/plugins/mesonprojectmanager/MesonProjectManager.json.in
+++ b/src/plugins/mesonprojectmanager/MesonProjectManager.json.in
@@ -15,7 +15,13 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Build Systems",
-    "Description" : "Meson support.",
-    "Url" : "http://www.mesonbuild.com",
+    "Description" : "Generate build systems with Meson.",
+    "LongDescription" : [
+        "Generate build systems with Meson using Ninja as the main backend.",
+        "You also need:",
+            "- Meson",
+            "- Ninja"
+    ],
+    "Url" : "https://www.mesonbuild.com",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/mesonprojectmanager/buildoptionsmodel.cpp b/src/plugins/mesonprojectmanager/buildoptionsmodel.cpp
index 1f8e7acd9ba..f8db40b7498 100644
--- a/src/plugins/mesonprojectmanager/buildoptionsmodel.cpp
+++ b/src/plugins/mesonprojectmanager/buildoptionsmodel.cpp
@@ -118,25 +118,25 @@ bool BuidOptionsModel::hasChanges() const
 
 QWidget *BuildOptionDelegate::makeWidget(QWidget *parent, const QVariant &data)
 {
-    auto type = data.userType();
+    const int type = data.typeId();
     switch (type) {
-    case QVariant::Int: {
+    case QMetaType::Int: {
         auto w = new QSpinBox{parent};
         w->setValue(data.toInt());
         return w;
     }
-    case QVariant::Bool: {
+    case QMetaType::Bool: {
         auto w = new QComboBox{parent};
         w->addItems({"false", "true"});
         w->setCurrentIndex(data.toBool());
         return w;
     }
-    case QVariant::StringList: {
+    case QMetaType::QStringList: {
         auto w = new ArrayOptionLineEdit{parent};
         w->setPlainText(data.toStringList().join(" "));
         return w;
     }
-    case QVariant::String: {
+    case QMetaType::QString: {
         auto w = new QLineEdit{parent};
         w->setText(data.toString());
         return w;
diff --git a/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp
index 38d525502cd..090f48257f9 100644
--- a/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp
+++ b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp
@@ -64,7 +64,7 @@ static FilePath shadowBuildDirectory(const FilePath &projectFilePath,
 
     const QString projectName = projectFilePath.parentDir().fileName();
     return MesonBuildConfiguration::buildDirectoryFromTemplate(
-        Project::projectDirectory(projectFilePath), projectFilePath,
+        projectFilePath.absolutePath(), projectFilePath,
         projectName, k, bcName, buildType, "meson");
 }
 
@@ -191,7 +191,7 @@ public:
         Column {
             noMargin,
             Form {
-                 Tr::tr("Parameters:"), parametersLineEdit, br,
+                Tr::tr("Parameters:"), parametersLineEdit, br,
                 buildCfg->buildDirectoryAspect(), br
             },
             optionsFilterLineEdit,
diff --git a/src/plugins/mesonprojectmanager/mesonoutputparser.cpp b/src/plugins/mesonprojectmanager/mesonoutputparser.cpp
index 9ba777f0753..241f05a9160 100644
--- a/src/plugins/mesonprojectmanager/mesonoutputparser.cpp
+++ b/src/plugins/mesonprojectmanager/mesonoutputparser.cpp
@@ -56,7 +56,7 @@ inline Utils::OutputLineParser::LinkSpecs MesonOutputParser::addTask(
                                                  fileName,
                                                  match.captured(lineNumberCapIndex).toInt());
     addTask(task);
-    addLinkSpecForAbsoluteFilePath(linkSpecs, task.file, task.line, match, 1);
+    addLinkSpecForAbsoluteFilePath(linkSpecs, task.file, task.line, task.column, match, 1);
 #else
     Q_UNUSED(type);
     Q_UNUSED(line);
diff --git a/src/plugins/mesonprojectmanager/toolkitaspectwidget.h b/src/plugins/mesonprojectmanager/toolkitaspectwidget.h
index 252e351ff71..594e1ceec15 100644
--- a/src/plugins/mesonprojectmanager/toolkitaspectwidget.h
+++ b/src/plugins/mesonprojectmanager/toolkitaspectwidget.h
@@ -36,7 +36,7 @@ private:
 
     void makeReadOnly() override { m_toolsComboBox->setEnabled(false); }
 
-    void addToLayoutImpl(Layouting::LayoutItem &parent) override
+    void addToLayoutImpl(Layouting::Layout &parent) override
     {
         addMutableAction(m_toolsComboBox);
         parent.addItem(m_toolsComboBox);
@@ -49,11 +49,7 @@ private:
                 return MesonToolKitAspect::mesonToolId(m_kit);
             return NinjaToolKitAspect::ninjaToolId(m_kit);
         }();
-        if (id.isValid())
-            m_toolsComboBox->setCurrentIndex(indexOf(id));
-        else {
-            setToDefault();
-        }
+        m_toolsComboBox->setCurrentIndex(indexOf(id));
     }
 
     QComboBox *m_toolsComboBox;
diff --git a/src/plugins/modeleditor/ModelEditor.json.in b/src/plugins/modeleditor/ModelEditor.json.in
index 6237bce22f1..80680306753 100644
--- a/src/plugins/modeleditor/ModelEditor.json.in
+++ b/src/plugins/modeleditor/ModelEditor.json.in
@@ -13,8 +13,11 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Modeling",
-    "Description" : "Graphical modeling with structured diagrams.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Create Universal Modeling Language (UML) style models.",
+    "LongDescription" : [
+        "Create structured and behavioral diagrams that offer different views to your system. However, the editor uses a variant of UML and has only a subset of properties for specifying the appearance of model elements."
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
 
     "Mimetypes" : [
diff --git a/src/plugins/modeleditor/actionhandler.cpp b/src/plugins/modeleditor/actionhandler.cpp
index 47599413aac..00ed184b8be 100644
--- a/src/plugins/modeleditor/actionhandler.cpp
+++ b/src/plugins/modeleditor/actionhandler.cpp
@@ -35,6 +35,7 @@ public:
     QAction *deleteAction = nullptr;
     QAction *selectAllAction = nullptr;
     QAction *openParentDiagramAction = nullptr;
+    QAction *toggleViewFilterAction = nullptr;
     QAction *synchronizeBrowserAction = nullptr;
     QAction *exportDiagramAction = nullptr;
     QAction *exportSelectedElementsAction = nullptr;
@@ -95,6 +96,11 @@ QAction *ActionHandler::openParentDiagramAction() const
     return d->openParentDiagramAction;
 }
 
+QAction *ActionHandler::toggleViewFilterAction() const
+{
+    return d->toggleViewFilterAction;
+}
+
 QAction *ActionHandler::synchronizeBrowserAction() const
 {
     return d->synchronizeBrowserAction;
@@ -162,6 +168,15 @@ void ActionHandler::createActions()
                     QKeySequence(), QIcon(":/modelinglib/48x48/class.png"));
     registerCommand(Constants::ACTION_ADD_CANVAS_DIAGRAM, nullptr, Core::Context(), Tr::tr("Add Canvas Diagram"),
                     QKeySequence(), QIcon(":/modelinglib/48x48/canvas-diagram.png"));
+    d->toggleViewFilterAction
+        = registerCommand(
+              Constants::ACTION_TOGGLE_VIEWFILTER,
+              &ModelEditor::toggleModelTreeFilter,
+              Core::Context(),
+              Tr::tr("Toggle View and Filter Settings"),
+              QKeySequence(Tr::tr("Ctrl+Shift+L")),
+              Utils::Icons::EYE_OPEN_TOOLBAR.icon())->action();
+    d->toggleViewFilterAction->setCheckable(true);
     d->synchronizeBrowserAction
         = registerCommand(
               Constants::ACTION_SYNC_BROWSER,
diff --git a/src/plugins/modeleditor/actionhandler.h b/src/plugins/modeleditor/actionhandler.h
index 82b7c5321ad..337fa237366 100644
--- a/src/plugins/modeleditor/actionhandler.h
+++ b/src/plugins/modeleditor/actionhandler.h
@@ -43,6 +43,7 @@ public:
     QAction *deleteAction() const;
     QAction *selectAllAction() const;
     QAction *openParentDiagramAction() const;
+    QAction *toggleViewFilterAction() const;
     QAction *synchronizeBrowserAction() const;
     QAction *exportDiagramAction() const;
     QAction *exportSelectedElementsAction() const;
diff --git a/src/plugins/modeleditor/componentviewcontroller.cpp b/src/plugins/modeleditor/componentviewcontroller.cpp
index 684d104fd9f..cb98ca21edd 100644
--- a/src/plugins/modeleditor/componentviewcontroller.cpp
+++ b/src/plugins/modeleditor/componentviewcontroller.cpp
@@ -31,6 +31,7 @@
 
 using namespace ProjectExplorer;
 using namespace Utils;
+using Utils::FilePath;
 
 namespace ModelEditor {
 namespace Internal {
@@ -52,9 +53,9 @@ private:
 
 void FindComponentFromFilePath::setFilePath(const QString &filePath)
 {
-    m_elementName = qmt::NameController::convertFileNameToElementName(filePath);
+    m_elementName = qmt::NameController::convertFileNameToElementName(FilePath::fromString(filePath));
     QFileInfo fileInfo(filePath);
-    m_elementsPath = qmt::NameController::buildElementsPath(fileInfo.path(), false);
+    m_elementsPath = qmt::NameController::buildElementsPath(FilePath::fromString(fileInfo.path()), false);
 }
 
 void FindComponentFromFilePath::visitMComponent(qmt::MComponent *component)
@@ -154,7 +155,7 @@ void UpdateIncludeDependenciesVisitor::visitMComponent(qmt::MComponent *componen
         if (document) {
             const QList<CPlusPlus::Document::Include> includes = document->resolvedIncludes();
             for (const CPlusPlus::Document::Include &include : includes) {
-                Utils::FilePath includeFilePath = include.resolvedFileName();
+                FilePath includeFilePath = include.resolvedFileName();
                 // replace proxy header with real one
                 CPlusPlus::Document::Ptr includeDocument = snapshot.document(includeFilePath);
                 if (includeDocument) {
@@ -218,10 +219,10 @@ void UpdateIncludeDependenciesVisitor::collectElementPaths(const ProjectExplorer
                                                            QMultiHash<QString, Node> *filePathsMap)
 {
     folderNode->forEachFileNode([&](FileNode *fileNode) {
-        QString elementName = qmt::NameController::convertFileNameToElementName(fileNode->filePath().toString());
+        QString elementName = qmt::NameController::convertFileNameToElementName(fileNode->filePath());
         QFileInfo fileInfo = fileNode->filePath().toFileInfo();
         QString nodePath = fileInfo.path();
-        QStringList elementsPath = qmt::NameController::buildElementsPath(nodePath, false);
+        QStringList elementsPath = qmt::NameController::buildElementsPath(FilePath::fromString(nodePath), false);
         filePathsMap->insert(elementName, Node(fileNode->filePath().toString(), elementsPath));
     });
     folderNode->forEachFolderNode([&](FolderNode *subNode) {
@@ -309,7 +310,7 @@ void ComponentViewController::doCreateComponentModel(const QString &filePath, qm
 {
     for (const QString &fileName : QDir(filePath).entryList(QDir::Files)) {
         QString file = filePath + "/" + fileName;
-        QString componentName = qmt::NameController::convertFileNameToElementName(file);
+        QString componentName = qmt::NameController::convertFileNameToElementName(FilePath::fromString(file));
         qmt::MComponent *component = nullptr;
         bool isSource = false;
         CppEditor::ProjectFile::Kind kind = CppEditor::ProjectFile::classify(file);
@@ -341,7 +342,7 @@ void ComponentViewController::doCreateComponentModel(const QString &filePath, qm
         }
         if (component) {
             QStringList relativeElements = qmt::NameController::buildElementsPath(
-                        d->pxnodeUtilities->calcRelativePath(file, anchorFolder), false);
+                FilePath::fromString(d->pxnodeUtilities->calcRelativePath(file, anchorFolder)), false);
             if (d->pxnodeUtilities->findSameObject(relativeElements, component)) {
                 delete component;
             } else {
diff --git a/src/plugins/modeleditor/elementtasks.cpp b/src/plugins/modeleditor/elementtasks.cpp
index 3cc271214fe..62e5b9bad72 100644
--- a/src/plugins/modeleditor/elementtasks.cpp
+++ b/src/plugins/modeleditor/elementtasks.cpp
@@ -11,6 +11,9 @@
 
 #include "qmt/diagram/delement.h"
 #include "qmt/diagram/dpackage.h"
+#include "qmt/diagram_controller/dselection.h"
+#include "qmt/diagram_scene/diagramscenemodel.h"
+#include "qmt/diagram_ui/diagramsmanager.h"
 #include "qmt/document_controller/documentcontroller.h"
 #include "qmt/infrastructure/contextmenuaction.h"
 #include "qmt/model/melement.h"
@@ -19,6 +22,7 @@
 #include "qmt/model/mcanvasdiagram.h"
 #include "qmt/model/mpackage.h"
 #include "qmt/model_controller/modelcontroller.h"
+#include "qmt/model_widgets_ui/addrelatedelementsdialog.h"
 #include "qmt/tasks/finddiagramvisitor.h"
 #include "qmt/project_controller/projectcontroller.h"
 #include "qmt/project/project.h"
@@ -28,12 +32,15 @@
 #include <cppeditor/indexitem.h>
 #include <cppeditor/searchsymbols.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
 
 #include <QMenu>
+#include <QMessageBox>
 
 using namespace Core;
 using namespace CppEditor;
+using Utils::FilePath;
 
 namespace ModelEditor {
 namespace Internal {
@@ -42,12 +49,14 @@ class ElementTasks::ElementTasksPrivate {
 public:
     qmt::DocumentController *documentController = nullptr;
     ComponentViewController *componentViewController = nullptr;
+    QScopedPointer<qmt::AddRelatedElementsDialog> addRelatedElementsDialog;
 };
 
 ElementTasks::ElementTasks(QObject *parent)
     : QObject(parent),
       d(new ElementTasksPrivate)
 {
+    d->addRelatedElementsDialog.reset(new qmt::AddRelatedElementsDialog(Core::ICore::dialogParent()));
 }
 
 ElementTasks::~ElementTasks()
@@ -58,6 +67,7 @@ ElementTasks::~ElementTasks()
 void ElementTasks::setDocumentController(qmt::DocumentController *documentController)
 {
     d->documentController = documentController;
+    d->addRelatedElementsDialog->setDiagramSceneController(documentController->diagramSceneController());
 }
 
 void ElementTasks::setComponentViewController(ComponentViewController *componentViewController)
@@ -392,9 +402,77 @@ void ElementTasks::createAndOpenDiagram(const qmt::DElement *element, const qmt:
     createAndOpenDiagram(melement);
 }
 
+FilePath ElementTasks::linkedFile(const qmt::MObject *mobject) const
+{
+    FilePath filepath = mobject->linkedFileName();
+    if (!filepath.isEmpty()) {
+        FilePath projectName = d->documentController->projectController()->project()->fileName();
+        filepath = projectName.absolutePath().resolvePath(filepath).canonicalPath();
+    }
+    return filepath;
+}
+
+bool ElementTasks::hasLinkedFile(const qmt::MElement *element) const
+{
+    if (auto mobject = dynamic_cast<const qmt::MObject *>(element)) {
+        FilePath filepath = linkedFile(mobject);
+        if (!filepath.isEmpty())
+            return filepath.exists();
+    }
+    return false;
+}
+
+bool ElementTasks::hasLinkedFile(const qmt::DElement *element, const qmt::MDiagram *diagram) const
+{
+    Q_UNUSED(diagram)
+
+    qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid());
+    if (!melement)
+        return false;
+    return hasLinkedFile(melement);
+}
+
+void ElementTasks::openLinkedFile(const qmt::MElement *element)
+{
+    if (auto mobject = dynamic_cast<const qmt::MObject *>(element)) {
+        FilePath filepath = linkedFile(mobject);
+        if (!filepath.isEmpty()) {
+            if (filepath.exists()) {
+                Core::EditorFactories list = Core::IEditorFactory::preferredEditorFactories(filepath);
+                if (list.empty() || (list.count() <= 1 && list.at(0)->id() == "Core.BinaryEditor")) {
+                    // intentionally ignore return code
+                    (void) Core::EditorManager::openExternalEditor(filepath, "CorePlugin.OpenWithSystemEditor");
+                } else {
+                    // intentionally ignore return code
+                    (void) Core::EditorManager::openEditor(filepath);
+                }
+            } else {
+                QMessageBox::critical(
+                    Core::ICore::dialogParent(),
+                    Tr::tr("Opening File"),
+                    Tr::tr("File \"%1\" does not exist.").arg(filepath.toUserOutput()));
+            }
+        }
+    }
+}
+
+void ElementTasks::openLinkedFile(const qmt::DElement *element, const qmt::MDiagram *diagram)
+{
+    Q_UNUSED(diagram)
+
+    qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid());
+    if (!melement)
+        return;
+    openLinkedFile(melement);
+}
+
 bool ElementTasks::extendContextMenu(const qmt::DElement *delement, const qmt::MDiagram *, QMenu *menu)
 {
     bool extended = false;
+    if (dynamic_cast<const qmt::DObject *>(delement)) {
+        menu->addAction(new qmt::ContextMenuAction(Tr::tr("Add Related Elements..."), "addRelatedElementsDialog", menu));
+        extended = true;
+    }
     if (dynamic_cast<const qmt::DPackage *>(delement)) {
         menu->addAction(new qmt::ContextMenuAction(Tr::tr("Update Include Dependencies"), "updateIncludeDependencies", menu));
         extended = true;
@@ -402,9 +480,14 @@ bool ElementTasks::extendContextMenu(const qmt::DElement *delement, const qmt::M
     return extended;
 }
 
-bool ElementTasks::handleContextMenuAction(const qmt::DElement *element, const qmt::MDiagram *, const QString &id)
+bool ElementTasks::handleContextMenuAction(qmt::DElement *element, qmt::MDiagram *diagram, const QString &id)
 {
-    if (id == "updateIncludeDependencies") {
+    if (id == "addRelatedElementsDialog") {
+        qmt::DSelection selection = d->documentController->diagramsManager()->diagramSceneModel(diagram)->selectedElements();
+        d->addRelatedElementsDialog->setElements(selection, diagram);
+        d->addRelatedElementsDialog->open();
+        return true;
+    } else if (id == "updateIncludeDependencies") {
         qmt::MPackage *mpackage = d->documentController->modelController()->findElement<qmt::MPackage>(element->modelUid());
         if (mpackage)
             d->componentViewController->updateIncludeDependencies(mpackage);
diff --git a/src/plugins/modeleditor/elementtasks.h b/src/plugins/modeleditor/elementtasks.h
index b99512d65f4..2eb2d3a272f 100644
--- a/src/plugins/modeleditor/elementtasks.h
+++ b/src/plugins/modeleditor/elementtasks.h
@@ -6,7 +6,12 @@
 #include <QObject>
 #include "qmt/tasks/ielementtasks.h"
 
-namespace qmt { class DocumentController; }
+#include <utils/filepath.h>
+
+namespace qmt {
+class DocumentController;
+class MObject;
+}
 
 namespace ModelEditor {
 namespace Internal {
@@ -66,10 +71,17 @@ public:
     void createAndOpenDiagram(const qmt::MElement *element) override;
     void createAndOpenDiagram(const qmt::DElement *element, const qmt::MDiagram *diagram) override;
 
-    bool extendContextMenu(const qmt::DElement *delement, const qmt::MDiagram *, QMenu *menu) override;
-    bool handleContextMenuAction(const qmt::DElement *element, const qmt::MDiagram *, const QString &id) override;
+    bool hasLinkedFile(const qmt::MElement *element) const override;
+    bool hasLinkedFile(const qmt::DElement *element, const qmt::MDiagram *diagram) const override;
+    void openLinkedFile(const qmt::MElement *element) override;
+    void openLinkedFile(const qmt::DElement *element, const qmt::MDiagram *diagram) override;
+
+    bool extendContextMenu(const qmt::DElement *delement, const qmt::MDiagram *diagram, QMenu *menu) override;
+    bool handleContextMenuAction(qmt::DElement *element, qmt::MDiagram *diagram, const QString &id) override;
 
 private:
+    Utils::FilePath linkedFile(const qmt::MObject *mobject) const;
+
     ElementTasksPrivate *d;
 };
 
diff --git a/src/plugins/modeleditor/extdocumentcontroller.cpp b/src/plugins/modeleditor/extdocumentcontroller.cpp
index 46df6f7472e..f62d1c173bb 100644
--- a/src/plugins/modeleditor/extdocumentcontroller.cpp
+++ b/src/plugins/modeleditor/extdocumentcontroller.cpp
@@ -9,7 +9,7 @@
 #include "qmt/project_controller/projectcontroller.h"
 #include "qmt/tasks/diagramscenecontroller.h"
 
-#include <QFileInfo>
+using Utils::FilePath;
 
 namespace ModelEditor {
 namespace Internal {
@@ -51,10 +51,9 @@ PxNodeController *ExtDocumentController::pxNodeController() const
     return d->pxNodeController;
 }
 
-void ExtDocumentController::onProjectFileNameChanged(const QString &fileName)
+void ExtDocumentController::onProjectFileNameChanged(const FilePath &fileName)
 {
-    QFileInfo fileInfo(fileName);
-    d->pxNodeController->setAnchorFolder(fileInfo.path());
+    d->pxNodeController->setAnchorFolder(fileName.path());
 }
 
 } // namespace Internal
diff --git a/src/plugins/modeleditor/extdocumentcontroller.h b/src/plugins/modeleditor/extdocumentcontroller.h
index 8a0f2a28ec3..0fc50aca178 100644
--- a/src/plugins/modeleditor/extdocumentcontroller.h
+++ b/src/plugins/modeleditor/extdocumentcontroller.h
@@ -5,6 +5,8 @@
 
 #include "qmt/document_controller/documentcontroller.h"
 
+#include <utils/filepath.h>
+
 namespace ModelEditor {
 namespace Internal {
 
@@ -25,7 +27,7 @@ public:
     PxNodeController *pxNodeController() const;
 
 private:
-    void onProjectFileNameChanged(const QString &fileName);
+    void onProjectFileNameChanged(const Utils::FilePath &fileName);
 
 private:
     ExtDocumentControllerPrivate *d;
diff --git a/src/plugins/modeleditor/extpropertiesmview.cpp b/src/plugins/modeleditor/extpropertiesmview.cpp
index b57d1bc2a96..27fcca34f34 100644
--- a/src/plugins/modeleditor/extpropertiesmview.cpp
+++ b/src/plugins/modeleditor/extpropertiesmview.cpp
@@ -6,18 +6,62 @@
 #include "modeleditortr.h"
 
 #include "qmt/model/mpackage.h"
+#include "qmt/diagram/dobject.h"
 #include "qmt/project/project.h"
 #include "qmt/project_controller/projectcontroller.h"
 
+#include <coreplugin/icore.h>
+#include <utils/fileutils.h>
 #include <utils/pathchooser.h>
 
 #include <QLabel>
 #include <QFileInfo>
 #include <QDir>
+#include <QMessageBox>
+#include <QMimeDatabase>
+#include <QImageReader>
+
+using Utils::FilePath;
 
 namespace ModelEditor {
 namespace Internal {
 
+static QString imageNameFilterString()
+{
+    static QString result;
+    if (result.isEmpty()) {
+        QMimeDatabase mimeDatabase;
+        const QString separator = QStringLiteral(";;");
+        const auto mimeTypes = QImageReader::supportedMimeTypes();
+        for (const QByteArray &mimeType : mimeTypes) {
+            const QString filter = mimeDatabase.mimeTypeForName(QLatin1String(mimeType))
+                                       .filterString();
+            if (!filter.isEmpty()) {
+                if (mimeType == QByteArrayLiteral("image/png")) {
+                    if (!result.isEmpty())
+                        result.prepend(separator);
+                    result.prepend(filter);
+                } else {
+                    if (!result.isEmpty())
+                        result.append(separator);
+                    result.append(filter);
+                }
+            }
+        }
+    }
+    return result;
+}
+
+/// Constructs an absolute FilePath from \a relativePath which
+/// is interpreted as being relative to \a anchor.
+FilePath absoluteFromRelativePath(const Utils::FilePath &relativePath,
+                                         const Utils::FilePath &anchor)
+{
+    QDir anchorDir = QFileInfo(anchor.path()).absoluteDir();
+    QString absoluteFilePath = QFileInfo(anchorDir, relativePath.path()).canonicalFilePath();
+    return Utils::FilePath::fromString(absoluteFilePath);
+}
+
 ExtPropertiesMView::ExtPropertiesMView(qmt::PropertiesView *view)
     : qmt::PropertiesView::MView(view)
 {
@@ -41,19 +85,19 @@ void ExtPropertiesMView::visitMPackage(const qmt::MPackage *package)
             m_configPath = new Utils::PathChooser(m_topWidget);
             m_configPath->setPromptDialogTitle(Tr::tr("Select Custom Configuration Folder"));
             m_configPath->setExpectedKind(Utils::PathChooser::ExistingDirectory);
-            m_configPath->setInitialBrowsePathBackup(
-                Utils::FilePath::fromString(project->fileName()).absolutePath());
+            m_configPath->setInitialBrowsePathBackup(project->fileName().absolutePath());
             addRow(Tr::tr("Config path:"), m_configPath, "configpath");
             connect(m_configPath, &Utils::PathChooser::textChanged,
-                    this, &ExtPropertiesMView::onConfigPathChanged);
+                    this, &ExtPropertiesMView::onConfigPathChanged,
+                    Qt::QueuedConnection);
         }
         if (!m_configPath->hasFocus()) {
             if (project->configPath().isEmpty()) {
                 m_configPath->setFilePath({});
             } else {
                 // make path absolute (may be relative to current project's directory)
-                QDir projectDir = QFileInfo(project->fileName()).absoluteDir();
-                m_configPath->setPath(QFileInfo(projectDir, project->configPath()).canonicalFilePath());
+                auto projectDir = project->fileName().absolutePath();
+                m_configPath->setPath(projectDir.resolvePath(project->configPath()).toUserOutput());
             }
         }
         if (!m_configPathInfo) {
@@ -63,23 +107,89 @@ void ExtPropertiesMView::visitMPackage(const qmt::MPackage *package)
     }
 }
 
-void ExtPropertiesMView::onConfigPathChanged()
+void ExtPropertiesMView::visitMObjectBehind(const qmt::MObject *object)
+{
+    qmt::Project *project = m_projectController->project();
+    QList<qmt::MObject *> selection = filter<qmt::MObject>(m_modelElements);
+    bool isSingleSelection = selection.size() == 1;
+    if (!m_filelinkPathChooser) {
+        m_filelinkPathChooser = new Utils::PathChooser(m_topWidget);
+        m_filelinkPathChooser->setPromptDialogTitle((Tr::tr("Select File Target")));
+        m_filelinkPathChooser->setExpectedKind(Utils::PathChooser::File);
+        m_filelinkPathChooser->setInitialBrowsePathBackup(project->fileName().absolutePath());
+        addRow(Tr::tr("Linked file:"), m_filelinkPathChooser, "filelink");
+        connect(m_filelinkPathChooser, &Utils::PathChooser::textChanged,
+                this, &ExtPropertiesMView::onFileLinkPathChanged,
+                Qt::QueuedConnection);
+    }
+    if (isSingleSelection) {
+        if (!m_filelinkPathChooser->hasFocus()) {
+            Utils::FilePath path = object->linkedFileName();
+            if (path.isEmpty()) {
+                m_filelinkPathChooser->setPath(QString());
+            } else {
+                Utils::FilePath relativePath = path;
+                Utils::FilePath projectPath = project->fileName();
+                QString filePath = absoluteFromRelativePath(relativePath, projectPath).toFSPathString();
+                m_filelinkPathChooser->setPath(filePath);
+            }
+        }
+    } else {
+        m_filelinkPathChooser->setPath(QString());
+    }
+    if (m_filelinkPathChooser->isEnabled() != isSingleSelection)
+        m_filelinkPathChooser->setEnabled(isSingleSelection);
+}
+
+void ExtPropertiesMView::visitDObjectBefore(const qmt::DObject *object)
+{
+    qmt::Project *project = m_projectController->project();
+    QList<qmt::DObject *> selection = filter<qmt::DObject>(m_diagramElements);
+    bool isSingleSelection = selection.size() == 1;
+    if (!m_imagePathChooser) {
+        m_imagePathChooser = new Utils::PathChooser(m_topWidget);
+        m_imagePathChooser->setPromptDialogTitle(Tr::tr("Select Image File"));
+        m_imagePathChooser->setExpectedKind(Utils::PathChooser::File);
+        m_imagePathChooser->setPromptDialogFilter(imageNameFilterString());
+        m_imagePathChooser->setInitialBrowsePathBackup(project->fileName().absolutePath());
+        addRow(Tr::tr("Image:"), m_imagePathChooser, "imagepath");
+        connect(m_imagePathChooser, &Utils::PathChooser::textChanged,
+                this, &ExtPropertiesMView::onImagePathChanged,
+                Qt::QueuedConnection);
+    }
+    if (isSingleSelection) {
+        if (!m_imagePathChooser->hasFocus()) {
+            Utils::FilePath path = object->imagePath();
+            if (path.isEmpty()) {
+                m_imagePathChooser->setPath(QString());
+            } else {
+                Utils::FilePath relativePath = path;
+                QString filePath = absoluteFromRelativePath(relativePath, project->fileName()).toFSPathString();
+                m_imagePathChooser->setPath(filePath);
+            }
+        }
+    } else {
+        m_imagePathChooser->setPath(QString());
+    }
+    if (m_imagePathChooser->isEnabled() != isSingleSelection)
+        m_imagePathChooser->setEnabled(isSingleSelection);
+}
+
+void ExtPropertiesMView::onConfigPathChanged(const QString &path)
 {
-    const Utils::FilePath path = m_configPath->rawFilePath();
     bool modified = false;
     qmt::Project *project = m_projectController->project();
     if (path.isEmpty()) {
         if (!project->configPath().isEmpty()) {
-            project->setConfigPath(QString());
+            project->setConfigPath({ });
             m_projectController->setModified();
             modified = true;
         }
     } else {
         // make path relative to current project's directory
-        QFileInfo absConfigPath = path.toFileInfo();
-        absConfigPath.makeAbsolute();
-        QDir projectDir = QFileInfo(project->fileName()).dir();
-        QString configPath = projectDir.relativeFilePath(absConfigPath.filePath());
+        Utils::FilePath absConfigPath = Utils::FilePath::fromString(path).absoluteFilePath();
+        Utils::FilePath projectDir = project->fileName().absolutePath();
+        Utils::FilePath configPath = absConfigPath.relativePathFrom(projectDir);
         if (configPath != project->configPath()) {
             project->setConfigPath(configPath);
             m_projectController->setModified();
@@ -90,5 +200,71 @@ void ExtPropertiesMView::onConfigPathChanged()
         m_configPathInfo->setText(Tr::tr("<font color=red>Model file must be reloaded.</font>"));
 }
 
+void ExtPropertiesMView::onFileLinkPathChanged(const QString &path)
+{
+    qmt::Project *project = m_projectController->project();
+    if (path.isEmpty()) {
+        assignModelElement<qmt::MObject, Utils::FilePath>(
+            m_modelElements,
+            SelectionSingle,
+            {},
+            &qmt::MObject::linkedFileName,
+            &qmt::MObject::setLinkedFileName);
+    } else {
+        // make path relative to current project's directory
+        Utils::FilePath filePath = Utils::FilePath::fromString(path);
+        Utils::FilePath projectPath = project->fileName().absolutePath();
+        Utils::FilePath relativeFilePath = filePath.relativePathFrom(projectPath);
+        if (!relativeFilePath.isEmpty()) {
+            assignModelElement<qmt::MObject, Utils::FilePath>(
+                m_modelElements,
+                SelectionSingle,
+                relativeFilePath,
+                &qmt::MObject::linkedFileName,
+                &qmt::MObject::setLinkedFileName);
+        }
+    }
+}
+
+void ExtPropertiesMView::onImagePathChanged(const QString &path)
+{
+    qmt::Project *project = m_projectController->project();
+    if (path.isEmpty()) {
+        assignModelElement<qmt::DObject, Utils::FilePath>(
+            m_diagramElements,
+            SelectionSingle,
+            {},
+            &qmt::DObject::imagePath,
+            &qmt::DObject::setImagePath);
+        assignModelElement<qmt::DObject, QImage>(m_diagramElements, SelectionSingle, QImage(),
+                                                 &qmt::DObject::image, &qmt::DObject::setImage);
+    } else {
+        // make path relative to current project's directory
+        Utils::FilePath filePath = Utils::FilePath::fromString(path);
+        Utils::FilePath projectPath = project->fileName().absolutePath();
+        Utils::FilePath relativeFilePath = filePath.relativePathFrom(projectPath);
+        if (!relativeFilePath.isEmpty()
+            && isValueChanged<qmt::DObject, Utils::FilePath>(
+                m_diagramElements, SelectionSingle, relativeFilePath, &qmt::DObject::imagePath)) {
+            QImage image;
+            if (image.load(path)) {
+                assignModelElement<qmt::DObject, Utils::FilePath>(
+                    m_diagramElements,
+                    SelectionSingle,
+                    relativeFilePath,
+                    &qmt::DObject::imagePath,
+                    &qmt::DObject::setImagePath);
+                assignModelElement<qmt::DObject, QImage>(m_diagramElements, SelectionSingle, image,
+                                                         &qmt::DObject::image, &qmt::DObject::setImage);
+            } else {
+                QMessageBox::critical(
+                    Core::ICore::dialogParent(),
+                    Tr::tr("Selecting Image"),
+                    Tr::tr("Unable to read image file \"%1\".").arg(path));
+            }
+        }
+    }
+}
+
 } // namespace Interal
 } // namespace ModelEditor
diff --git a/src/plugins/modeleditor/extpropertiesmview.h b/src/plugins/modeleditor/extpropertiesmview.h
index 19e061d78f4..d0c9d76bcb2 100644
--- a/src/plugins/modeleditor/extpropertiesmview.h
+++ b/src/plugins/modeleditor/extpropertiesmview.h
@@ -24,13 +24,21 @@ public:
 
     void visitMPackage(const qmt::MPackage *package) override;
 
+protected:
+    void visitMObjectBehind(const qmt::MObject *object) override;
+    void visitDObjectBefore(const qmt::DObject *object) override;
+
 private:
-    void onConfigPathChanged();
+    void onConfigPathChanged(const QString &path);
+    void onFileLinkPathChanged(const QString &path);
+    void onImagePathChanged(const QString &path);
 
 private:
     qmt::ProjectController *m_projectController = nullptr;
+    Utils::PathChooser *m_filelinkPathChooser = nullptr;
     Utils::PathChooser *m_configPath = nullptr;
     QLabel *m_configPathInfo = nullptr;
+    Utils::PathChooser *m_imagePathChooser = nullptr;
 };
 
 } // namespace Interal
diff --git a/src/plugins/modeleditor/jsextension.cpp b/src/plugins/modeleditor/jsextension.cpp
index cfe31ddea7d..455814a49f5 100644
--- a/src/plugins/modeleditor/jsextension.cpp
+++ b/src/plugins/modeleditor/jsextension.cpp
@@ -5,7 +5,9 @@
 
 #include <qmt/controller/namecontroller.h>
 
-QString ModelEditor::Internal::JsExtension::fileNameToElementName(const QString &file)
+using Utils::FilePath;
+
+QString ModelEditor::Internal::JsExtension::fileNameToElementName(const FilePath &file)
 {
     return qmt::NameController::convertFileNameToElementName(file);
 }
diff --git a/src/plugins/modeleditor/jsextension.h b/src/plugins/modeleditor/jsextension.h
index 1cc9c262f29..d9f3484919c 100644
--- a/src/plugins/modeleditor/jsextension.h
+++ b/src/plugins/modeleditor/jsextension.h
@@ -5,6 +5,8 @@
 
 #include <QObject>
 
+#include <utils/filepath.h>
+
 namespace ModelEditor {
 namespace Internal {
 
@@ -15,7 +17,7 @@ class JsExtension : public QObject
 public:
     JsExtension() {}
 
-    Q_INVOKABLE QString fileNameToElementName(const QString &file);
+    Q_INVOKABLE QString fileNameToElementName(const Utils::FilePath &file);
     Q_INVOKABLE QString elementNameToFileName(const QString &element);
 };
 
diff --git a/src/plugins/modeleditor/modeldocument.cpp b/src/plugins/modeleditor/modeldocument.cpp
index a1c271539c6..00630341f98 100644
--- a/src/plugins/modeleditor/modeldocument.cpp
+++ b/src/plugins/modeleditor/modeldocument.cpp
@@ -19,8 +19,7 @@
 #include <utils/id.h>
 #include <utils/fileutils.h>
 
-#include <QFileInfo>
-#include <QDir>
+using Utils::FilePath;
 
 namespace ModelEditor {
 namespace Internal {
@@ -46,23 +45,23 @@ ModelDocument::~ModelDocument()
 }
 
 Core::IDocument::OpenResult ModelDocument::open(QString *errorString,
-                                                const Utils::FilePath &filePath,
-                                                const Utils::FilePath &realFilePath)
+                                                const FilePath &filePath,
+                                                const FilePath &realFilePath)
 {
     Q_UNUSED(filePath)
 
-    OpenResult result = load(errorString, realFilePath.toString());
+    OpenResult result = load(errorString, realFilePath);
     return result;
 }
 
-bool ModelDocument::saveImpl(QString *errorString, const Utils::FilePath &filePath, bool autoSave)
+bool ModelDocument::saveImpl(QString *errorString, const FilePath &filePath, bool autoSave)
 {
     if (!d->documentController) {
         *errorString = Tr::tr("No model loaded. Cannot save.");
         return false;
     }
 
-    d->documentController->projectController()->setFileName(filePath.toString());
+    d->documentController->projectController()->setFileName(filePath);
     try {
         d->documentController->projectController()->save();
     } catch (const qmt::Exception &ex) {
@@ -73,7 +72,7 @@ bool ModelDocument::saveImpl(QString *errorString, const Utils::FilePath &filePa
     if (autoSave) {
         d->documentController->projectController()->setModified();
     } else {
-        setFilePath(Utils::FilePath::fromString(d->documentController->projectController()->project()->fileName()));
+        setFilePath(d->documentController->projectController()->project()->fileName());
         emit changed();
     }
 
@@ -102,12 +101,13 @@ bool ModelDocument::reload(QString *errorString, Core::IDocument::ReloadFlag fla
     if (flag == FlagIgnore)
         return true;
     try {
-        d->documentController->loadProject(filePath().toString());
+        d->documentController->loadProject(filePath());
     } catch (const qmt::FileNotFoundException &ex) {
         *errorString = ex.errorMessage();
         return false;
     } catch (const qmt::Exception &ex) {
-        *errorString = Tr::tr("Could not open \"%1\" for reading: %2.").arg(filePath().toString()).arg(ex.errorMessage());
+        *errorString = Tr::tr("Could not open \"%1\" for reading: %2.")
+                           .arg(filePath().toUserOutput(), ex.errorMessage());
         return false;
     }
     emit contentSet();
@@ -119,25 +119,25 @@ ExtDocumentController *ModelDocument::documentController() const
     return d->documentController;
 }
 
-Core::IDocument::OpenResult ModelDocument::load(QString *errorString, const QString &fileName)
+Core::IDocument::OpenResult ModelDocument::load(QString *errorString, const FilePath &fileName)
 {
     d->documentController = ModelEditorPlugin::modelsManager()->createModel(this);
     connect(d->documentController, &qmt::DocumentController::changed, this, &IDocument::changed);
 
     try {
         d->documentController->loadProject(fileName);
-        setFilePath(Utils::FilePath::fromString(d->documentController->projectController()->project()->fileName()));
+        setFilePath(d->documentController->projectController()->project()->fileName());
     } catch (const qmt::FileNotFoundException &ex) {
         *errorString = ex.errorMessage();
         return OpenResult::ReadError;
     } catch (const qmt::Exception &ex) {
-        *errorString = Tr::tr("Could not open \"%1\" for reading: %2.").arg(fileName).arg(ex.errorMessage());
+        *errorString = Tr::tr("Could not open \"%1\" for reading: %2.").arg(fileName.toUserOutput(), ex.errorMessage());
         return OpenResult::CannotHandle;
     }
 
-    QString configPath = d->documentController->projectController()->project()->configPath();
+    FilePath configPath = d->documentController->projectController()->project()->configPath();
     if (!configPath.isEmpty()) {
-        QString canonicalPath = QFileInfo(QDir(QFileInfo(fileName).path()).filePath(configPath)).canonicalFilePath();
+        FilePath canonicalPath =fileName.absolutePath().resolvePath(configPath);
         if (!canonicalPath.isEmpty()) {
             // TODO error output on reading definition files
             d->documentController->configController()->readStereotypeDefinitions(canonicalPath);
diff --git a/src/plugins/modeleditor/modeldocument.h b/src/plugins/modeleditor/modeldocument.h
index e606420805b..6b2037e007d 100644
--- a/src/plugins/modeleditor/modeldocument.h
+++ b/src/plugins/modeleditor/modeldocument.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <coreplugin/idocument.h>
+#include <utils/filepath.h>
 
 namespace qmt { class Uid; }
 
@@ -36,7 +37,7 @@ public:
 
     ExtDocumentController *documentController() const;
 
-    OpenResult load(QString *errorString, const QString &fileName);
+    OpenResult load(QString *errorString, const Utils::FilePath &fileName);
 
 protected:
     bool saveImpl(QString *errorString, const Utils::FilePath &filePath, bool autoSave) override;
diff --git a/src/plugins/modeleditor/modeleditor.cpp b/src/plugins/modeleditor/modeleditor.cpp
index f17a35e4342..dcf2c5b5185 100644
--- a/src/plugins/modeleditor/modeleditor.cpp
+++ b/src/plugins/modeleditor/modeleditor.cpp
@@ -36,6 +36,7 @@
 #include "qmt/model_controller/mselection.h"
 #include "qmt/model_ui/treemodel.h"
 #include "qmt/model_ui/treemodelmanager.h"
+#include "qmt/model_widgets_ui/modeltreefilter.h"
 #include "qmt/model_widgets_ui/modeltreeview.h"
 #include "qmt/model_widgets_ui/propertiesview.h"
 #include "qmt/stereotype/shapepaintvisitor.h"
@@ -61,7 +62,6 @@
 #include <QAction>
 #include <QActionGroup>
 #include <QComboBox>
-#include <QDir>
 #include <QEvent>
 #include <QFileDialog>
 #include <QFileInfo>
@@ -110,6 +110,10 @@ public:
     EditorDiagramView *diagramView = nullptr;
     QLabel *noDiagramLabel = nullptr;
     DiagramsViewManager *diagramsViewManager = nullptr;
+    QWidget *rightPanel = nullptr;
+    QVBoxLayout *rightPanelLayout = nullptr;
+    QScrollArea *viewFilterScrollArea = nullptr;
+    qmt::ModelTreeFilter *viewFilterWidget = nullptr;
     MiniSplitter *rightHorizSplitter = nullptr;
     qmt::ModelTreeView *modelTreeView = nullptr;
     qmt::TreeModelManager *modelTreeViewServant = nullptr;
@@ -122,6 +126,7 @@ public:
     QAction *syncBrowserWithDiagramAction = nullptr;
     QAction *syncDiagramWithBrowserAction = nullptr;
     QAction *syncEachOtherAction = nullptr;
+    int formerViewFilterHeight = 0;
 };
 
 ModelEditor::ModelEditor(UiController *uiController, ActionHandler *actionHandler)
@@ -254,7 +259,22 @@ void ModelEditor::init()
     d->leftGroupLayout->addWidget(frame, 0);
     d->leftGroupLayout->addWidget(d->diagramStack, 1);
 
-    d->rightHorizSplitter = new MiniSplitter(d->rightSplitter);
+    d->rightPanel = new QWidget(d->rightSplitter);
+    d->rightPanelLayout = new QVBoxLayout(d->rightPanel);
+    d->rightPanelLayout->setContentsMargins(0, 0, 0, 0);
+    d->rightPanelLayout->setSpacing(0);
+
+    d->viewFilterScrollArea = new QScrollArea(d->rightPanel);
+    d->viewFilterScrollArea->setFrameShape(QFrame::NoFrame);
+    d->viewFilterScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+    d->viewFilterScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+    d->viewFilterScrollArea->setWidgetResizable(true);
+    d->viewFilterScrollArea->setVisible(false);
+
+    d->viewFilterWidget = new qmt::ModelTreeFilter(d->viewFilterScrollArea);
+    d->viewFilterScrollArea->setWidget(d->viewFilterWidget);
+
+    d->rightHorizSplitter = new MiniSplitter(d->rightPanel);
     d->rightHorizSplitter->setOrientation(Qt::Vertical);
     connect(d->rightHorizSplitter, &QSplitter::splitterMoved,
             this, &ModelEditor::onRightHorizSplitterMoved);
@@ -263,6 +283,10 @@ void ModelEditor::init()
 
     d->modelTreeView = new qmt::ModelTreeView(d->rightHorizSplitter);
     d->modelTreeView->setFrameShape(QFrame::NoFrame);
+    connect(d->viewFilterWidget, &qmt::ModelTreeFilter::viewDataChanged,
+            d->modelTreeView, &qmt::ModelTreeView::setModelTreeViewData);
+    connect(d->viewFilterWidget, &qmt::ModelTreeFilter::filterDataChanged,
+            d->modelTreeView, &qmt::ModelTreeView::setModelTreeFilterData);
 
     d->modelTreeViewServant = new qmt::TreeModelManager(this);
     d->modelTreeViewServant->setModelTreeView(d->modelTreeView);
@@ -278,8 +302,11 @@ void ModelEditor::init()
     d->rightHorizSplitter->setStretchFactor(0, 2); // magic stretch factors for equal sizing
     d->rightHorizSplitter->setStretchFactor(1, 3);
 
+    d->rightPanelLayout->addWidget(d->viewFilterScrollArea, 0);
+    d->rightPanelLayout->addWidget(d->rightHorizSplitter, 1);
+
     d->rightSplitter->insertWidget(0, d->leftGroup);
-    d->rightSplitter->insertWidget(1, d->rightHorizSplitter);
+    d->rightSplitter->insertWidget(1, d->rightPanel);
     d->rightSplitter->setStretchFactor(0, 1);
     d->rightSplitter->setStretchFactor(1, 0);
 
@@ -328,6 +355,11 @@ void ModelEditor::init()
                                                         d->toolbar));
     toolbarLayout->addSpacing(20);
 
+    auto toggleViewFilterButton
+        = Command::toolButtonWithAppendedShortcut(d->actionHandler->toggleViewFilterAction(),
+                                                  Constants::ACTION_TOGGLE_VIEWFILTER);
+    toolbarLayout->addWidget(toggleViewFilterButton);
+
     auto syncToggleButton
         = Command::toolButtonWithAppendedShortcut(d->actionHandler->synchronizeBrowserAction(),
                                                   Constants::ACTION_SYNC_BROWSER);
@@ -583,7 +615,7 @@ void ModelEditor::exportToImage(bool selectedElements)
         QString fileName = FileUtils::getSaveFilePath(
                     nullptr,
                     selectedElements ? Tr::tr("Export Selected Elements") : Tr::tr("Export Diagram"),
-                    FilePath::fromString(d->lastExportDirPath), filter).toString();
+                    FilePath::fromString(d->lastExportDirPath), filter).toFSPathString();
         if (!fileName.isEmpty()) {
             qmt::DocumentController *documentController = d->document->documentController();
             qmt::DiagramSceneModel *sceneModel = documentController->diagramsManager()->diagramSceneModel(diagram);
@@ -668,6 +700,16 @@ void ModelEditor::resetZoom()
     showZoomIndicator();
 }
 
+void ModelEditor::showModelTreeFilter(bool visible)
+{
+    d->viewFilterScrollArea->setVisible(visible);
+}
+
+void ModelEditor::toggleModelTreeFilter()
+{
+    d->viewFilterScrollArea->setVisible(!d->viewFilterScrollArea->isVisible());
+}
+
 qmt::MPackage *ModelEditor::guessSelectedPackage() const
 {
     qmt::MPackage *package = nullptr;
@@ -959,7 +1001,7 @@ void ModelEditor::onTreeViewDoubleClicked(const QModelIndex &index)
     QModelIndex treeModelIndex = d->modelTreeView->mapToSourceModelIndex(index);
     qmt::MElement *melement = documentController->treeModel()->element(treeModelIndex);
     // double click on package is already used for toggeling tree
-    if (melement && !dynamic_cast<qmt::MPackage *>(melement))
+    if (melement && !d->modelTreeView->model()->hasChildren(index))
         documentController->elementTasks()->openElement(melement);
 }
 
@@ -1108,8 +1150,13 @@ void ModelEditor::initToolbars()
                 if (!tool.m_stereotype.isEmpty() && stereotypeIconElement != qmt::StereotypeIcon::ElementAny) {
                     const qmt::Style *style = documentController->styleController()->adaptStyle(styleEngineElementType);
                     icon = stereotypeController->createIcon(
-                                stereotypeIconElement, {tool.m_stereotype},
-                                QString(), style, QSize(128, 128), QMarginsF(6.0, 4.0, 6.0, 8.0), 8.0);
+                        stereotypeIconElement,
+                        {tool.m_stereotype},
+                        {},
+                        style,
+                        QSize(128, 128),
+                        QMarginsF(6.0, 4.0, 6.0, 8.0),
+                        8.0);
                     if (!icon.isNull()) {
                         QString stereotypeIconId = stereotypeController->findStereotypeIconId(
                                     stereotypeIconElement, {tool.m_stereotype});
diff --git a/src/plugins/modeleditor/modeleditor.h b/src/plugins/modeleditor/modeleditor.h
index 639cd348b08..a477033c4b5 100644
--- a/src/plugins/modeleditor/modeleditor.h
+++ b/src/plugins/modeleditor/modeleditor.h
@@ -69,6 +69,8 @@ public:
     void zoomInAtPos(const QPoint &pos);
     void zoomOutAtPos(const QPoint &pos);
     void resetZoom();
+    void showModelTreeFilter(bool visible = true);
+    void toggleModelTreeFilter();
 
     qmt::MPackage *guessSelectedPackage() const;
 
diff --git a/src/plugins/modeleditor/modeleditor_constants.h b/src/plugins/modeleditor/modeleditor_constants.h
index c7731810613..d35bce258ae 100644
--- a/src/plugins/modeleditor/modeleditor_constants.h
+++ b/src/plugins/modeleditor/modeleditor_constants.h
@@ -16,6 +16,7 @@ const char ACTION_ADD_PACKAGE[] = "ModelEditor.Action.AddPackage";
 const char ACTION_ADD_COMPONENT[] = "ModelEditor.Action.AddComponent";
 const char ACTION_ADD_CLASS[] = "ModelEditor.Action.AddClass";
 const char ACTION_ADD_CANVAS_DIAGRAM[] = "ModelEditor.Action.AddCanvasDiagram";
+const char ACTION_TOGGLE_VIEWFILTER[] = "ModelEditor.Action.ToggleViewFilter";
 const char ACTION_SYNC_BROWSER[] = "ModelEditor.Action.SynchronizeBrowser";
 
 const char EXPLORER_GROUP_MODELING[] = "ModelEditor.ProjectFolder.Group.Modeling";
diff --git a/src/plugins/modeleditor/modelindexer.cpp b/src/plugins/modeleditor/modelindexer.cpp
index 163d0d60b53..a6de1c4008c 100644
--- a/src/plugins/modeleditor/modelindexer.cpp
+++ b/src/plugins/modeleditor/modelindexer.cpp
@@ -36,6 +36,8 @@
 #include <QPointer>
 
 using namespace ProjectExplorer;
+using Utils::FilePath;
+using Utils::FilePaths;
 
 namespace ModelEditor {
 namespace Internal {
@@ -275,7 +277,7 @@ void ModelIndexer::IndexerThread::onFilesQueued()
             qmt::ProjectSerializer projectSerializer;
             qmt::Project project;
             try {
-                projectSerializer.load(queuedFile.file(), &project);
+                projectSerializer.load(FilePath::fromString(queuedFile.file()), &project);
             } catch (const qmt::Exception &e) {
                 qWarning() << e.errorMessage();
                 return;
@@ -375,13 +377,13 @@ void ModelIndexer::scanProject(ProjectExplorer::Project *project)
         return;
 
     // TODO harmonize following code with findFirstModel()?
-    const Utils::FilePaths files = project->files(ProjectExplorer::Project::SourceFiles);
+    const FilePaths files = project->files(ProjectExplorer::Project::SourceFiles);
     QQueue<QueuedFile> filesQueue;
     QSet<QueuedFile> filesSet;
 
     const Utils::MimeType modelMimeType = Utils::mimeTypeForName(Constants::MIME_TYPE_MODEL);
     if (modelMimeType.isValid()) {
-        for (const Utils::FilePath &file : files) {
+        for (const FilePath &file : files) {
             if (modelMimeType.suffixes().contains(file.completeSuffix())) {
                 QueuedFile queuedFile(file.toString(), project, file.lastModified());
                 filesQueue.append(queuedFile);
@@ -466,10 +468,10 @@ QString ModelIndexer::findFirstModel(ProjectExplorer::FolderNode *folderNode,
 
 void ModelIndexer::forgetProject(ProjectExplorer::Project *project)
 {
-    const Utils::FilePaths files = project->files(ProjectExplorer::Project::SourceFiles);
+    const FilePaths files = project->files(ProjectExplorer::Project::SourceFiles);
 
     QMutexLocker locker(&d->indexerMutex);
-    for (const Utils::FilePath &file : files) {
+    for (const FilePath &file : files) {
         const QString fileString = file.toString();
         // remove file from queue
         QueuedFile queuedFile(fileString, project);
diff --git a/src/plugins/modeleditor/modelsmanager.cpp b/src/plugins/modeleditor/modelsmanager.cpp
index 787c5556fda..02c481fa5dd 100644
--- a/src/plugins/modeleditor/modelsmanager.cpp
+++ b/src/plugins/modeleditor/modelsmanager.cpp
@@ -38,11 +38,11 @@
 #include <projectexplorer/projecttree.h>
 #include <utils/fileutils.h>
 
-#include <QFileInfo>
-#include <QDir>
 #include <QTimer>
 #include <QAction>
 
+using Utils::FilePath;
+
 namespace ModelEditor {
 namespace Internal {
 
@@ -121,7 +121,7 @@ ExtDocumentController *ModelsManager::createModel(ModelDocument *modelDocument)
     auto documentController = new ExtDocumentController(this);
     // TODO error output on reading definition files
     documentController->configController()->readStereotypeDefinitions(
-        Core::ICore::resourcePath("modeleditor").toString());
+        Core::ICore::resourcePath("modeleditor"));
 
     d->managedModels.append(ManagedModel(documentController, modelDocument));
     return documentController;
@@ -238,7 +238,7 @@ void ModelsManager::onOpenDiagramFromProjectExplorer()
 
 void ModelsManager::onOpenDefaultModel(const qmt::Uid &modelUid)
 {
-    const auto modelFile = Utils::FilePath::fromString(d->modelIndexer->findModel(modelUid));
+    const FilePath modelFile = FilePath::fromString(d->modelIndexer->findModel(modelUid));
     if (!modelFile.isEmpty())
         Core::EditorManager::openEditor(modelFile);
 }
diff --git a/src/plugins/modeleditor/openelementvisitor.cpp b/src/plugins/modeleditor/openelementvisitor.cpp
index 60866f63aee..4fbc6105716 100644
--- a/src/plugins/modeleditor/openelementvisitor.cpp
+++ b/src/plugins/modeleditor/openelementvisitor.cpp
@@ -132,7 +132,8 @@ void OpenModelElementVisitor::visitMElement(const qmt::MElement *element)
 
 void OpenModelElementVisitor::visitMObject(const qmt::MObject *object)
 {
-    Q_UNUSED(object)
+    if (m_elementTasks->hasLinkedFile(object))
+        m_elementTasks->openLinkedFile(object);
 }
 
 void OpenModelElementVisitor::visitMPackage(const qmt::MPackage *package)
@@ -145,17 +146,26 @@ void OpenModelElementVisitor::visitMPackage(const qmt::MPackage *package)
 
 void OpenModelElementVisitor::visitMClass(const qmt::MClass *klass)
 {
-    m_elementTasks->openClassDefinition(klass);
+    if (m_elementTasks->hasClassDefinition(klass))
+        m_elementTasks->openClassDefinition(klass);
+    else
+        visitMObject(klass);
 }
 
 void OpenModelElementVisitor::visitMComponent(const qmt::MComponent *component)
 {
-    m_elementTasks->openSourceFile(component);
+    if (m_elementTasks->hasSourceFile(component))
+        m_elementTasks->openSourceFile(component);
+    else
+        visitMObject(component);
 }
 
 void OpenModelElementVisitor::visitMDiagram(const qmt::MDiagram *diagram)
 {
-    m_elementTasks->openDiagram(diagram);
+    if (m_elementTasks->hasDiagram(diagram))
+        m_elementTasks->openDiagram(diagram);
+    else
+        visitMObject(diagram);
 }
 
 void OpenModelElementVisitor::visitMCanvasDiagram(const qmt::MCanvasDiagram *diagram)
diff --git a/src/plugins/modeleditor/pxnodecontroller.cpp b/src/plugins/modeleditor/pxnodecontroller.cpp
index e015e7a2400..50bbf901e6d 100644
--- a/src/plugins/modeleditor/pxnodecontroller.cpp
+++ b/src/plugins/modeleditor/pxnodecontroller.cpp
@@ -14,6 +14,7 @@
 #include "qmt/model/mclass.h"
 #include "qmt/model/mcomponent.h"
 #include "qmt/model/mdiagram.h"
+#include "qmt/model/mitem.h"
 #include "qmt/model/mcanvasdiagram.h"
 #include "qmt/controller/namecontroller.h"
 #include "qmt/controller/undocontroller.h"
@@ -29,7 +30,7 @@
 #include <QMenu>
 #include <QQueue>
 
-using namespace Utils;
+using Utils::FilePath;
 
 namespace ModelEditor {
 namespace Internal {
@@ -45,7 +46,10 @@ public:
         TYPE_ADD_PACKAGE_AND_DIAGRAM,
         TYPE_ADD_PACKAGE_MODEL,
         TYPE_ADD_COMPONENT_MODEL,
-        TYPE_ADD_CLASS_MODEL
+        TYPE_ADD_CLASS_MODEL,
+        TYPE_ADD_PACKAGE_LINK,
+        TYPE_ADD_DIAGRAM_LINK,
+        TYPE_ADD_DOCUMENT_LINK,
     };
 
 public:
@@ -58,6 +62,17 @@ public:
     {
     }
 
+    MenuAction(const QString &text, const QString &elementName, Type type, const QString &stereotype,
+               const QString &filePath, QObject *parent)
+        : QAction(text, parent),
+          elementName(elementName),
+          type(type),
+          index(-1),
+          stereotype(stereotype),
+          filePath(filePath)
+    {
+    }
+
     MenuAction(const QString &text, const QString &elementName, Type type, QObject *parent)
         : QAction(text, parent),
           elementName(elementName),
@@ -70,7 +85,8 @@ public:
     int type;
     int index;
     QString className;
-    QString packageStereotype;
+    QString stereotype;
+    QString filePath;
 };
 
 class PxNodeController::PxNodeControllerPrivate
@@ -130,7 +146,7 @@ void PxNodeController::addFileSystemEntry(const QString &filePath, int line, int
 {
     QMT_ASSERT(diagram, return);
 
-    QString elementName = qmt::NameController::convertFileNameToElementName(filePath);
+    QString elementName = qmt::NameController::convertFileNameToElementName(FilePath::fromString(filePath));
 
     QFileInfo fileInfo(filePath);
     if (fileInfo.exists() && fileInfo.isFile()) {
@@ -151,6 +167,14 @@ void PxNodeController::addFileSystemEntry(const QString &filePath, int line, int
                 ++index;
             }
         }
+        menu->addSeparator();
+        QString fileName = fileInfo.fileName();
+        menu->addAction(new MenuAction(Tr::tr("Add Package Link to %1").arg(fileName), fileName,
+                                       MenuAction::TYPE_ADD_PACKAGE_LINK, "package", filePath, menu));
+        menu->addAction(new MenuAction(Tr::tr("Add Diagram Link to %1").arg(fileName), fileName,
+                                       MenuAction::TYPE_ADD_DIAGRAM_LINK, "diagram", filePath, menu));
+        menu->addAction(new MenuAction(Tr::tr("Add Document Link to %1").arg(fileName), fileName,
+                                       MenuAction::TYPE_ADD_DOCUMENT_LINK, "document", filePath, menu));
         connect(menu, &QMenu::aboutToHide, menu, &QMenu::deleteLater);
         connect(menu, &QMenu::triggered, this, [this, filePath, topMostElementAtPos, pos, diagram](
                                                    QAction *action) {
@@ -160,21 +184,13 @@ void PxNodeController::addFileSystemEntry(const QString &filePath, int line, int
         });
         menu->popup(QCursor::pos());
     } else if (fileInfo.exists() && fileInfo.isDir()) {
-        // ignore line and column
-        QString stereotype;
         auto menu = new QMenu;
-        auto action = new MenuAction(Tr::tr("Add Package %1").arg(elementName), elementName,
-                                     MenuAction::TYPE_ADD_PACKAGE, menu);
-        action->packageStereotype = stereotype;
-        menu->addAction(action);
-        action = new MenuAction(Tr::tr("Add Package and Diagram %1").arg(elementName), elementName,
-                                MenuAction::TYPE_ADD_PACKAGE_AND_DIAGRAM, menu);
-        action->packageStereotype = stereotype;
-        menu->addAction(action);
-        action = new MenuAction(Tr::tr("Add Component Model"), elementName,
-                                MenuAction::TYPE_ADD_COMPONENT_MODEL, menu);
-        action->packageStereotype = stereotype;
-        menu->addAction(action);
+        menu->addAction(new MenuAction(Tr::tr("Add Package %1").arg(elementName), elementName,
+                                       MenuAction::TYPE_ADD_PACKAGE, menu));
+        menu->addAction(new MenuAction(Tr::tr("Add Package and Diagram %1").arg(elementName), elementName,
+                                       MenuAction::TYPE_ADD_PACKAGE_AND_DIAGRAM, menu));
+        menu->addAction(new MenuAction(Tr::tr("Add Component Model"), elementName,
+                                       MenuAction::TYPE_ADD_COMPONENT_MODEL, menu));
         connect(menu, &QMenu::aboutToHide, menu, &QMenu::deleteLater);
         connect(menu, &QMenu::triggered, this, [this, filePath, topMostElementAtPos, pos, diagram](
                                                    QAction *action) {
@@ -196,7 +212,7 @@ qmt::MDiagram *PxNodeController::findDiagramForExplorerNode(const ProjectExplore
         return nullptr;
 
     QStringList relativeElements = qmt::NameController::buildElementsPath(
-                d->pxnodeUtilities->calcRelativePath(node, d->anchorFolder), false);
+        FilePath::fromString(d->pxnodeUtilities->calcRelativePath(node, d->anchorFolder)), false);
 
     QQueue<qmt::MPackage *> roots;
     roots.append(d->diagramSceneController->modelController()->rootPackage());
@@ -261,6 +277,7 @@ void PxNodeController::onMenuActionTriggered(PxNodeController::MenuAction *actio
 {
     qmt::MObject *newObject = nullptr;
     qmt::MDiagram *newDiagramInObject = nullptr;
+    bool dropInCurrentDiagram = false;
 
     switch (action->type) {
     case MenuAction::TYPE_ADD_COMPONENT:
@@ -286,8 +303,8 @@ void PxNodeController::onMenuActionTriggered(PxNodeController::MenuAction *actio
             auto package = new qmt::MPackage();
             package->setFlags(qmt::MElement::ReverseEngineered);
             package->setName(action->elementName);
-            if (!action->packageStereotype.isEmpty())
-                package->setStereotypes({action->packageStereotype});
+            if (!action->stereotype.isEmpty())
+                package->setStereotypes({action->stereotype});
             newObject = package;
             if (action->type == MenuAction::TYPE_ADD_PACKAGE_AND_DIAGRAM) {
                 auto diagram = new qmt::MCanvasDiagram();
@@ -301,11 +318,11 @@ void PxNodeController::onMenuActionTriggered(PxNodeController::MenuAction *actio
         auto package = new qmt::MPackage();
         package->setFlags(qmt::MElement::ReverseEngineered);
         package->setName(action->elementName);
-        if (!action->packageStereotype.isEmpty())
-            package->setStereotypes({action->packageStereotype});
+        if (!action->stereotype.isEmpty())
+            package->setStereotypes({action->stereotype});
         d->diagramSceneController->modelController()->undoController()->beginMergeSequence(Tr::tr("Create Component Model"));
         QStringList relativeElements = qmt::NameController::buildElementsPath(
-                    d->pxnodeUtilities->calcRelativePath(filePath, d->anchorFolder), true);
+            FilePath::fromString(d->pxnodeUtilities->calcRelativePath(filePath, d->anchorFolder)), true);
         if (qmt::MObject *existingObject = d->pxnodeUtilities->findSameObject(relativeElements, package)) {
             delete package;
             package = dynamic_cast<qmt::MPackage *>(existingObject);
@@ -321,34 +338,55 @@ void PxNodeController::onMenuActionTriggered(PxNodeController::MenuAction *actio
         d->diagramSceneController->modelController()->undoController()->endMergeSequence();
         break;
     }
+    case MenuAction::TYPE_ADD_PACKAGE_LINK:
+    case MenuAction::TYPE_ADD_DIAGRAM_LINK:
+    case MenuAction::TYPE_ADD_DOCUMENT_LINK:
+    {
+        auto item = new qmt::MItem();
+        item->setName(action->elementName);
+        item->setVariety(action->stereotype);
+        item->setVarietyEditable(false);
+        FilePath filePath = FilePath::fromString(action->filePath);
+        item->setLinkedFileName(filePath.relativePathFrom(FilePath::fromString(d->anchorFolder)));
+        newObject = item;
+        dropInCurrentDiagram = true;
+        break;
+    }
     }
 
     if (newObject) {
         d->diagramSceneController->modelController()->undoController()->beginMergeSequence(Tr::tr("Drop Node"));
-        qmt::MObject *parentForDiagram = nullptr;
-        QStringList relativeElements = qmt::NameController::buildElementsPath(
-                    d->pxnodeUtilities->calcRelativePath(filePath, d->anchorFolder),
-                    dynamic_cast<qmt::MPackage *>(newObject) != nullptr);
-        if (qmt::MObject *existingObject = d->pxnodeUtilities->findSameObject(relativeElements, newObject)) {
-            delete newObject;
-            newObject = nullptr;
-            d->diagramSceneController->addExistingModelElement(existingObject->uid(), pos, diagram);
-            parentForDiagram = existingObject;
+        if (dropInCurrentDiagram) {
+            auto *parentPackage = dynamic_cast<qmt::MPackage *>(diagram->owner());
+            if (parentPackage)
+                d->diagramSceneController->dropNewModelElement(newObject, parentPackage, pos, diagram);
         } else {
-            qmt::MPackage *requestedRootPackage = d->diagramSceneController->findSuitableParentPackage(topMostElementAtPos, diagram);
-            qmt::MPackage *bestParentPackage = d->pxnodeUtilities->createBestMatchingPackagePath(requestedRootPackage, relativeElements);
-            d->diagramSceneController->dropNewModelElement(newObject, bestParentPackage, pos, diagram);
-            parentForDiagram = newObject;
-        }
+            qmt::MObject *parentForDiagram = nullptr;
+            QStringList relativeElements = qmt::NameController::buildElementsPath(
+                FilePath::fromString(
+                    d->pxnodeUtilities->calcRelativePath(filePath, d->anchorFolder)),
+                dynamic_cast<qmt::MPackage *>(newObject) != nullptr);
+            if (qmt::MObject *existingObject = d->pxnodeUtilities->findSameObject(relativeElements, newObject)) {
+                delete newObject;
+                newObject = nullptr;
+                d->diagramSceneController->addExistingModelElement(existingObject->uid(), pos, diagram);
+                parentForDiagram = existingObject;
+            } else {
+                qmt::MPackage *requestedRootPackage = d->diagramSceneController->findSuitableParentPackage(topMostElementAtPos, diagram);
+                qmt::MPackage *bestParentPackage = d->pxnodeUtilities->createBestMatchingPackagePath(requestedRootPackage, relativeElements);
+                d->diagramSceneController->dropNewModelElement(newObject, bestParentPackage, pos, diagram);
+                parentForDiagram = newObject;
+            }
 
-        // if requested and not existing then create new diagram in package
-        if (newDiagramInObject) {
-            auto package = dynamic_cast<qmt::MPackage *>(parentForDiagram);
-            QMT_ASSERT(package, return);
-            if (d->diagramSceneController->findDiagramBySearchId(package, newDiagramInObject->name()))
-                delete newDiagramInObject;
-            else
-                d->diagramSceneController->modelController()->addObject(package, newDiagramInObject);
+            // if requested and not existing then create new diagram in package
+            if (newDiagramInObject) {
+                auto package = dynamic_cast<qmt::MPackage *>(parentForDiagram);
+                QMT_ASSERT(package, return);
+                if (d->diagramSceneController->findDiagramBySearchId(package, newDiagramInObject->name()))
+                    delete newDiagramInObject;
+                else
+                    d->diagramSceneController->modelController()->addObject(package, newDiagramInObject);
+            }
         }
         d->diagramSceneController->modelController()->undoController()->endMergeSequence();
     }
diff --git a/src/plugins/modeleditor/pxnodeutilities.cpp b/src/plugins/modeleditor/pxnodeutilities.cpp
index c9e58d5052e..5b8b27c8307 100644
--- a/src/plugins/modeleditor/pxnodeutilities.cpp
+++ b/src/plugins/modeleditor/pxnodeutilities.cpp
@@ -20,6 +20,8 @@
 
 #include <typeinfo>
 
+using Utils::FilePath;
+
 namespace ModelEditor {
 namespace Internal {
 
@@ -51,7 +53,8 @@ QString PxNodeUtilities::calcRelativePath(const ProjectExplorer::Node *node,
             ? node->filePath().toFileInfo().path()
             : node->filePath().toString();
 
-    return qmt::NameController::calcRelativePath(nodePath, anchorFolder);
+    return qmt::NameController::calcRelativePath(FilePath::fromString(nodePath),
+                                                 FilePath::fromString(anchorFolder)).toString();
 }
 
 QString PxNodeUtilities::calcRelativePath(const QString &filePath, const QString &anchorFolder)
@@ -63,7 +66,8 @@ QString PxNodeUtilities::calcRelativePath(const QString &filePath, const QString
         path = fileInfo.path();
     else
         path = filePath;
-    return qmt::NameController::calcRelativePath(path, anchorFolder);
+    return qmt::NameController::calcRelativePath(FilePath::fromString(path),
+                                                 FilePath::fromString(anchorFolder)).toString();
 }
 
 qmt::MPackage *PxNodeUtilities::createBestMatchingPackagePath(
@@ -218,7 +222,7 @@ bool PxNodeUtilities::isProxyHeader(const QString &file) const
 {
     CPlusPlus::Snapshot snapshot = CppEditor::CppModelManager::snapshot();
 
-    CPlusPlus::Document::Ptr document = snapshot.document(Utils::FilePath::fromString(file));
+    CPlusPlus::Document::Ptr document = snapshot.document(FilePath::fromString(file));
     if (document) {
         QList<CPlusPlus::Document::Include> includes = document->resolvedIncludes();
         if (includes.count() != 1)
diff --git a/src/plugins/nim/Nim.json.in b/src/plugins/nim/Nim.json.in
index 622e460a0b8..ea53307e0de 100644
--- a/src/plugins/nim/Nim.json.in
+++ b/src/plugins/nim/Nim.json.in
@@ -13,8 +13,12 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Other Languages",
-    "Description" : "Plugin for supporting the Nim programming language.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Develop applications using the Nim programming language.",
+    "LongDescription" : [
+        "You also need:",
+            "- Nimble packaging manager"
+    ],
+    "Url" : "https://www.qt.io",
     "Experimental" : true,
     ${IDE_PLUGIN_DEPENDENCIES},
 
diff --git a/src/plugins/nim/editor/nimeditorfactory.cpp b/src/plugins/nim/editor/nimeditorfactory.cpp
index ac8aa6c9329..edd7bcea069 100644
--- a/src/plugins/nim/editor/nimeditorfactory.cpp
+++ b/src/plugins/nim/editor/nimeditorfactory.cpp
@@ -11,7 +11,6 @@
 
 #include <coreplugin/coreplugintr.h>
 #include <texteditor/textdocument.h>
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorconstants.h>
 
 using namespace TextEditor;
@@ -26,10 +25,10 @@ NimEditorFactory::NimEditorFactory()
     addMimeType(QLatin1String(Nim::Constants::C_NIM_MIMETYPE));
     addMimeType(QLatin1String(Nim::Constants::C_NIM_SCRIPT_MIMETYPE));
 
-    setEditorActionHandlers(TextEditorActionHandler::Format
-                            | TextEditorActionHandler::UnCommentSelection
-                            | TextEditorActionHandler::UnCollapseAll
-                            | TextEditorActionHandler::FollowSymbolUnderCursor);
+    setOptionalActionMask(OptionalActions::Format
+                            | OptionalActions::UnCommentSelection
+                            | OptionalActions::UnCollapseAll
+                            | OptionalActions::FollowSymbolUnderCursor);
     setEditorWidgetCreator([]{
         return new NimTextEditorWidget();
     });
diff --git a/src/plugins/nim/project/nimbuildsystem.cpp b/src/plugins/nim/project/nimbuildsystem.cpp
index ef7d6c47320..373a263ba27 100644
--- a/src/plugins/nim/project/nimbuildsystem.cpp
+++ b/src/plugins/nim/project/nimbuildsystem.cpp
@@ -25,14 +25,6 @@ const char EXCLUDED_FILES_KEY[] = "ExcludedFiles";
 NimProjectScanner::NimProjectScanner(Project *project)
     : m_project(project)
 {
-    m_scanner.setFilter([this](const Utils::MimeType &, const FilePath &fp) {
-        const QString path = fp.toString();
-        return excludedFiles().contains(path)
-                || path.endsWith(".nimproject")
-                || path.contains(".nimproject.user")
-                || path.contains(".nimble.user");
-    });
-
     connect(&m_directoryWatcher, &FileSystemWatcher::directoryChanged,
             this, &NimProjectScanner::directoryChanged);
     connect(&m_directoryWatcher, &FileSystemWatcher::fileChanged,
@@ -91,6 +83,13 @@ void NimProjectScanner::saveSettings()
 
 void NimProjectScanner::startScan()
 {
+    m_scanner.setFilter(
+        [excludedFiles = excludedFiles()](const Utils::MimeType &, const FilePath &fp) {
+            const QString path = fp.toString();
+            return excludedFiles.contains(path) || path.endsWith(".nimproject")
+                   || path.contains(".nimproject.user") || path.contains(".nimble.user");
+        });
+
     m_scanner.asyncScanForFiles(m_project->projectDirectory());
 }
 
diff --git a/src/plugins/nim/project/nimoutputtaskparser.cpp b/src/plugins/nim/project/nimoutputtaskparser.cpp
index 31fc1e8e77a..1fde71d3c21 100644
--- a/src/plugins/nim/project/nimoutputtaskparser.cpp
+++ b/src/plugins/nim/project/nimoutputtaskparser.cpp
@@ -39,7 +39,7 @@ NimParser::Result NimParser::handleLine(const QString &lne, OutputFormat)
     const CompileTask t(type, message, absoluteFilePath(FilePath::fromUserInput(filename)),
                         lineNumber);
     LinkSpecs linkSpecs;
-    addLinkSpecForAbsoluteFilePath(linkSpecs, t.file, t.line, match, 1);
+    addLinkSpecForAbsoluteFilePath(linkSpecs, t.file, t.line, t.column, match, 1);
     scheduleTask(t, 1);
     return {Status::Done, linkSpecs};
 }
diff --git a/src/plugins/nim/project/nimtoolchain.cpp b/src/plugins/nim/project/nimtoolchain.cpp
index 80036592644..701883de0c0 100644
--- a/src/plugins/nim/project/nimtoolchain.cpp
+++ b/src/plugins/nim/project/nimtoolchain.cpp
@@ -141,7 +141,7 @@ public:
 
         // Connect
         connect(m_compilerCommand, &PathChooser::validChanged, this, [this] {
-            const FilePath path = m_compilerCommand->rawFilePath();
+            const FilePath path = m_compilerCommand->unexpandedFilePath();
             auto tc = static_cast<NimToolchain *>(toolchain());
             QTC_ASSERT(tc, return);
             tc->setCompilerCommand(path);
diff --git a/src/plugins/nim/settings/nimsettings.cpp b/src/plugins/nim/settings/nimsettings.cpp
index 9df9acd73bf..ce5f406f5be 100644
--- a/src/plugins/nim/settings/nimsettings.cpp
+++ b/src/plugins/nim/settings/nimsettings.cpp
@@ -30,7 +30,7 @@ NimSettings::NimSettings()
         using namespace Layouting;
         return Column {
             Group {
-                title("Nimsuggest"),
+                title(QString("Nimsuggest")),
                 Column { nimSuggestPath }
             },
             st
diff --git a/src/plugins/perforce/Perforce.json.in b/src/plugins/perforce/Perforce.json.in
index 8a8e1e5099a..69e8f8e5e3e 100644
--- a/src/plugins/perforce/Perforce.json.in
+++ b/src/plugins/perforce/Perforce.json.in
@@ -14,8 +14,12 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Version Control",
-    "Description" : "Perforce integration.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Access the Perforce software configuration management system.",
+    "LongDescription" : [
+        "You also need:",
+            "- Perforce"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
 
     "Mimetypes" : [
diff --git a/src/plugins/perforce/perforcechecker.cpp b/src/plugins/perforce/perforcechecker.cpp
index cf63d9e6913..9eb66ef45c0 100644
--- a/src/plugins/perforce/perforcechecker.cpp
+++ b/src/plugins/perforce/perforcechecker.cpp
@@ -52,8 +52,7 @@ void PerforceChecker::resetOverrideCursor()
 }
 
 void PerforceChecker::start(const FilePath &binary, const FilePath &workingDirectory,
-                            const QStringList &basicArgs,
-                            int timeoutMS)
+                            const QStringList &basicArgs, int timeoutMS)
 {
     if (isRunning()) {
         emitFailed(QLatin1String("Internal error: process still running"));
@@ -64,13 +63,10 @@ void PerforceChecker::start(const FilePath &binary, const FilePath &workingDirec
         return;
     }
     m_binary = binary;
-    QStringList args = basicArgs;
-    args << QLatin1String("client") << QLatin1String("-o");
-
     if (!workingDirectory.isEmpty())
         m_process.setWorkingDirectory(workingDirectory);
 
-    m_process.setCommand({m_binary, args});
+    m_process.setCommand({m_binary, {basicArgs, "client", "-o"}});
     m_process.start();
     // Timeout handling
     m_timeOutMS = timeoutMS;
diff --git a/src/plugins/perforce/perforcesettings.cpp b/src/plugins/perforce/perforcesettings.cpp
index 6f7691c054f..65b00a19dc4 100644
--- a/src/plugins/perforce/perforcesettings.cpp
+++ b/src/plugins/perforce/perforcesettings.cpp
@@ -125,7 +125,7 @@ PerforceSettings::PerforceSettings()
 
         Group environment {
             title(Tr::tr("Environment Variables")),
-            customEnv.groupChecker(),
+            groupChecker(customEnv.groupChecker()),
             Row { p4Port, p4Client, p4User }
         };
 
diff --git a/src/plugins/perfprofiler/PerfProfiler.json.in b/src/plugins/perfprofiler/PerfProfiler.json.in
index c3a439b1a56..6af65d17bdb 100644
--- a/src/plugins/perfprofiler/PerfProfiler.json.in
+++ b/src/plugins/perfprofiler/PerfProfiler.json.in
@@ -13,7 +13,12 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Code Analyzer",
-    "Description" : "Perf Profiler Plugin.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Analyze the CPU and memory usage of an application.",
+    "LongDescription" : [
+        "Works on embedded devices and, to a limited extent, on Linux desktop platforms.",
+        "You also need:",
+            "- Perf tool (bundled with the Linux kernel)"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/perfprofiler/perfdatareader.cpp b/src/plugins/perfprofiler/perfdatareader.cpp
index f5b3c15b10a..5c690e8d276 100644
--- a/src/plugins/perfprofiler/perfdatareader.cpp
+++ b/src/plugins/perfprofiler/perfdatareader.cpp
@@ -287,7 +287,7 @@ void PerfDataReader::collectArguments(CommandLine *cmd, const QString &exe, cons
                      .arg(qt->pluginPath().nativePath())
                      .arg(qt->hostBinPath().nativePath())
                      .arg(qt->qmlPath().nativePath())
-                     .arg(cmd->executable().osType() == OsTypeWindows ? u';' : u':'));
+                     .arg(cmd->executable().pathListSeparator()));
     }
 
     if (auto toolChain = ToolchainKitAspect::cxxToolchain(kit)) {
diff --git a/src/plugins/perfprofiler/perfprofiler.qbs b/src/plugins/perfprofiler/perfprofiler.qbs
index fe97d521f93..2c9ddab3616 100644
--- a/src/plugins/perfprofiler/perfprofiler.qbs
+++ b/src/plugins/perfprofiler/perfprofiler.qbs
@@ -62,6 +62,7 @@ QtcPlugin {
         "perfprofiler.qrc",
     ]
 
+    Qt.core.resourceFileBaseName: "PerfProfilerQml" // avoid conflicting qrc file
     Group {
         name: "Qml Files"
         Qt.core.resourcePrefix: "qt/qml/QtCreator/PerfProfiler/"
diff --git a/src/plugins/perfprofiler/perfprofilerflamegraphview.cpp b/src/plugins/perfprofiler/perfprofilerflamegraphview.cpp
index 076c9778882..2d0c4515894 100644
--- a/src/plugins/perfprofiler/perfprofilerflamegraphview.cpp
+++ b/src/plugins/perfprofiler/perfprofilerflamegraphview.cpp
@@ -28,7 +28,7 @@ PerfProfilerFlameGraphView::PerfProfilerFlameGraphView(QWidget *parent)
     rootContext()->setContextProperty(QStringLiteral("flameGraphModel"), m_model);
     setSource(QUrl(QStringLiteral(
                        "qrc:/qt/qml/QtCreator/PerfProfiler/PerfProfilerFlameGraphView.qml")));
-    setClearColor(Utils::creatorTheme()->color(Utils::Theme::Timeline_BackgroundColor1));
+    setClearColor(Utils::creatorColor(Utils::Theme::Timeline_BackgroundColor1));
 
     setResizeMode(QQuickWidget::SizeRootObjectToView);
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
diff --git a/src/plugins/perfprofiler/perfprofilerruncontrol.cpp b/src/plugins/perfprofiler/perfprofilerruncontrol.cpp
index 4c51b82b3f3..a0927260c14 100644
--- a/src/plugins/perfprofiler/perfprofilerruncontrol.cpp
+++ b/src/plugins/perfprofiler/perfprofilerruncontrol.cpp
@@ -183,15 +183,21 @@ public:
                 &PerfProfilerTool::onRunControlFinished);
 
         PerfDataReader *reader = m_perfParserWorker->reader();
+        Process *perfProcess = nullptr;
         if (auto prw = qobject_cast<LocalPerfRecordWorker *>(m_perfRecordWorker)) {
             // That's the local case.
-            Process *recorder = prw->recorder();
-            connect(recorder, &Process::readyReadStandardError, this, [this, recorder] {
-                appendMessage(QString::fromLocal8Bit(recorder->readAllRawStandardError()),
+            perfProcess = prw->recorder();
+        } else {
+            perfProcess = runControl()->property("PerfProcess").value<Process *>();
+        }
+
+        if (perfProcess) {
+            connect(perfProcess, &Process::readyReadStandardError, this, [this, perfProcess] {
+                appendMessage(QString::fromLocal8Bit(perfProcess->readAllRawStandardError()),
                               StdErrFormat);
             });
-            connect(recorder, &Process::readyReadStandardOutput, this, [this, reader, recorder] {
-                if (!reader->feedParser(recorder->readAllRawStandardOutput()))
+            connect(perfProcess, &Process::readyReadStandardOutput, this, [this, reader, perfProcess] {
+                if (!reader->feedParser(perfProcess->readAllRawStandardOutput()))
                     reportFailure(Tr::tr("Failed to transfer Perf data to perfparser."));
             });
         }
diff --git a/src/plugins/perfprofiler/perftimelinemodel.cpp b/src/plugins/perfprofiler/perftimelinemodel.cpp
index fac136024b2..904a73fe434 100644
--- a/src/plugins/perfprofiler/perftimelinemodel.cpp
+++ b/src/plugins/perfprofiler/perftimelinemodel.cpp
@@ -86,12 +86,12 @@ QVariantList PerfTimelineModel::labels() const
 
 QString prettyPrintTraceData(const QVariant &data)
 {
-    switch (data.type()) {
-    case QVariant::ULongLong:
+    switch (data.typeId()) {
+    case QMetaType::ULongLong:
         return QString::fromLatin1("0x%1").arg(data.toULongLong(), 16, 16, QLatin1Char('0'));
-    case QVariant::UInt:
+    case QMetaType::UInt:
         return QString::fromLatin1("0x%1").arg(data.toUInt(), 8, 16, QLatin1Char('0'));
-    case QVariant::List: {
+    case QMetaType::QVariantList: {
         QStringList ret;
         for (const QVariant &item : data.toList())
             ret.append(prettyPrintTraceData(item));
diff --git a/src/plugins/perfprofiler/perftimelineresourcesrenderpass.cpp b/src/plugins/perfprofiler/perftimelineresourcesrenderpass.cpp
index 8930573f328..8ccada8f4bb 100644
--- a/src/plugins/perfprofiler/perftimelineresourcesrenderpass.cpp
+++ b/src/plugins/perfprofiler/perftimelineresourcesrenderpass.cpp
@@ -210,7 +210,7 @@ ResourcesRenderPassState::ResourcesRenderPassState() :
     node = new QSGNode;
     node->setFlag(QSGNode::OwnedByParent, false);
     m_expandedRows.append(node);
-    m_material.setColor(Utils::creatorTheme()->color(Utils::Theme::Timeline_HighlightColor));
+    m_material.setColor(Utils::creatorColor(Utils::Theme::Timeline_HighlightColor));
 
     // Disable blending
     m_material.setFlag(QSGMaterial::Blending, false);
diff --git a/src/plugins/perfprofiler/perftracepointdialog.cpp b/src/plugins/perfprofiler/perftracepointdialog.cpp
index d726aa7d867..66a6208c1e8 100644
--- a/src/plugins/perfprofiler/perftracepointdialog.cpp
+++ b/src/plugins/perfprofiler/perftracepointdialog.cpp
@@ -101,7 +101,7 @@ void PerfTracePointDialog::runScript()
     if (elevate != QLatin1String(ELEVATE_METHOD_NA))
         m_process->setCommand({m_device->filePath(elevate), {"sh"}});
     else
-        m_process->setCommand({m_device->filePath("sh"), {}});
+        m_process->setCommand(CommandLine{m_device->filePath("sh")});
 
     connect(m_process.get(), &Process::done, this, &PerfTracePointDialog::handleProcessDone);
     m_process->start();
diff --git a/src/plugins/plugins.qbs b/src/plugins/plugins.qbs
index 4b7af74a302..7293d34d683 100644
--- a/src/plugins/plugins.qbs
+++ b/src/plugins/plugins.qbs
@@ -5,6 +5,7 @@ Project {
 
     references: [
         "android/android.qbs",
+        "appstatisticsmonitor/appstatisticsmonitor.qbs",
         "autotest/autotest.qbs",
         "autotoolsprojectmanager/autotoolsprojectmanager.qbs",
         "axivion/axivion.qbs",
@@ -52,6 +53,8 @@ Project {
         "incredibuild/incredibuild.qbs",
         "ios/ios.qbs",
         "languageclient/languageclient.qbs",
+        "languageclient/lualanguageclient/lualanguageclient.qbs",
+        "lua/lua.qbs",
         "macros/macros.qbs",
         "marketplace/marketplace.qbs",
         "mcusupport/mcusupport.qbs",
@@ -72,6 +75,7 @@ Project {
         "qnx/qnx.qbs",
         "qmakeprojectmanager/qmakeprojectmanager.qbs",
         "qmldesignerbase/qmldesignerbase.qbs",
+        "qtapplicationmanager/qtapplicationmanager.qbs",
         "qtsupport/qtsupport.qbs",
         "remotelinux/remotelinux.qbs",
         "resourceeditor/resourceeditor.qbs",
@@ -92,6 +96,5 @@ Project {
         "vcsbase/vcsbase.qbs",
         "webassembly/webassembly.qbs",
         "welcome/welcome.qbs",
-        "qtapplicationmanager/qtapplicationmanager.qbs",
     ].concat(project.additionalPlugins)
 }
diff --git a/src/plugins/projectexplorer/CMakeLists.txt b/src/plugins/projectexplorer/CMakeLists.txt
index b449aababf4..0c62d2177a1 100644
--- a/src/plugins/projectexplorer/CMakeLists.txt
+++ b/src/plugins/projectexplorer/CMakeLists.txt
@@ -179,6 +179,7 @@ add_qtc_plugin(ProjectExplorer
     vcsannotatetaskhandler.cpp vcsannotatetaskhandler.h
     waitforstopdialog.cpp waitforstopdialog.h
     windebuginterface.cpp windebuginterface.h
+    workspaceproject.h workspaceproject.cpp
     xcodebuildparser.cpp xcodebuildparser.h
 )
 
diff --git a/src/plugins/projectexplorer/ProjectExplorer.json.in b/src/plugins/projectexplorer/ProjectExplorer.json.in
index b5f30d4242c..9cb6aac8a18 100644
--- a/src/plugins/projectexplorer/ProjectExplorer.json.in
+++ b/src/plugins/projectexplorer/ProjectExplorer.json.in
@@ -14,7 +14,7 @@
     ],
     "Category" : "Core",
     "Description" : "ProjectExplorer framework that can be extended with different kind of project types.",
-    "Url" : "http://www.qt.io",
+    "Url" : "https://www.qt.io",
     "Arguments" : [
         {
             "Name" : "-customwizard-verbose",
@@ -37,6 +37,13 @@
         "        <glob pattern='*.tasks'/>",
         "        <glob pattern='*.tasks.txt'/>",
         "    </mime-type>",
+
+        "    <mime-type type='text/x-workspace-project'>",
+        "        <sub-class-of type='application/json'/>",
+        "        <comment>Workspace Qt Creator Project file</comment>",
+        "        <glob pattern='project.json' weight='100'/>",
+        "    </mime-type>",
+
         "</mime-info>"
     ]
 }
diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp
index 5cfb66e8114..f9c23573848 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.cpp
+++ b/src/plugins/projectexplorer/abstractprocessstep.cpp
@@ -189,18 +189,18 @@ bool AbstractProcessStep::setupProcess(Process &process)
     process.setEnvironment(envWithPwd);
     process.setCommand({d->m_param.effectiveCommand(), d->m_param.effectiveArguments(),
                         CommandLine::Raw});
-    if (d->m_lowPriority && ProjectExplorerPlugin::projectExplorerSettings().lowBuildPriority)
+    if (d->m_lowPriority && projectExplorerSettings().lowBuildPriority)
         process.setLowPriority();
 
     process.setStdOutCodec(buildEnvironment().hasKey("VSLANG")
                                ? QTextCodec::codecForName("UTF-8") : QTextCodec::codecForLocale());
     process.setStdErrCodec(QTextCodec::codecForLocale());
 
-    process.setStdOutLineCallback([this](const QString &s){
+    process.setStdOutCallback([this](const QString &s){
         emit addOutput(s, OutputFormat::Stdout, DontAppendNewline);
     });
 
-    process.setStdErrLineCallback([this](const QString &s){
+    process.setStdErrCallback([this](const QString &s){
         emit addOutput(s, OutputFormat::Stderr, DontAppendNewline);
     });
 
diff --git a/src/plugins/projectexplorer/allprojectsfind.cpp b/src/plugins/projectexplorer/allprojectsfind.cpp
index c2cee55e309..b20ebe3dc5e 100644
--- a/src/plugins/projectexplorer/allprojectsfind.cpp
+++ b/src/plugins/projectexplorer/allprojectsfind.cpp
@@ -55,7 +55,7 @@ FileContainer AllProjectsFind::filesForProjects(const QStringList &nameFilters,
                                                 const QStringList &exclusionFilters,
                                                 const QList<Project *> &projects)
 {
-    std::function<FilePaths(const FilePaths &)> filterFiles
+    const FilterFilesFunction filterFiles
         = Utils::filterFilesFunction(nameFilters, exclusionFilters);
     const QMap<FilePath, QTextCodec *> openEditorEncodings
         = TextDocument::openedTextDocumentEncodings();
@@ -113,16 +113,22 @@ QWidget *AllProjectsFind::createConfigWidget()
     return m_configWidget;
 }
 
-void AllProjectsFind::writeSettings(QtcSettings *settings)
+const char kDefaultInclusion[] = "*";
+const char kDefaultExclusion[] = "";
+
+Store AllProjectsFind::save() const
 {
-    settings->beginGroup("AllProjectsFind");
-    writeCommonSettings(settings);
-    settings->endGroup();
+    Store s;
+    writeCommonSettings(s, kDefaultInclusion, kDefaultExclusion);
+    return s;
 }
 
-void AllProjectsFind::readSettings(QtcSettings *settings)
+void AllProjectsFind::restore(const Utils::Store &s)
 {
-    settings->beginGroup("AllProjectsFind");
-    readCommonSettings(settings, "*", "");
-    settings->endGroup();
+    readCommonSettings(s, kDefaultInclusion, kDefaultExclusion);
+}
+
+QByteArray AllProjectsFind::settingsKey() const
+{
+    return "AllProjectsFind";
 }
diff --git a/src/plugins/projectexplorer/allprojectsfind.h b/src/plugins/projectexplorer/allprojectsfind.h
index 02dfc2a27ae..4b43f1ed4be 100644
--- a/src/plugins/projectexplorer/allprojectsfind.h
+++ b/src/plugins/projectexplorer/allprojectsfind.h
@@ -26,8 +26,12 @@ public:
     bool isEnabled() const override;
 
     QWidget *createConfigWidget() override;
-    void writeSettings(Utils::QtcSettings *settings) override;
-    void readSettings(Utils::QtcSettings *settings) override;
+
+    Utils::Store save() const override;
+    void restore(const Utils::Store &s) override;
+
+    // deprecated
+    QByteArray settingsKey() const override;
 
 protected:
     static Utils::FileContainer filesForProjects(const QStringList &nameFilters,
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp
index 806628668f2..3d489460247 100644
--- a/src/plugins/projectexplorer/appoutputpane.cpp
+++ b/src/plugins/projectexplorer/appoutputpane.cpp
@@ -429,6 +429,8 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc)
     ow->setWindowIcon(Icons::WINDOW.icon());
     ow->setWordWrapEnabled(m_settings.wrapOutput);
     ow->setMaxCharCount(m_settings.maxCharCount);
+    //: file name suggested for saving application output, %1 = run configuration display name
+    ow->setOutputFileNameHint(Tr::tr("application-output-%1.txt").arg(rc->displayName()));
 
     auto updateFontSettings = [ow] {
         ow->setBaseFont(TextEditor::TextEditorSettings::fontSettings().font());
@@ -659,10 +661,10 @@ void AppOutputPane::closeTab(int tabIndex, CloseTabMode closeTabMode)
 
 bool AppOutputPane::optionallyPromptToStop(RunControl *runControl)
 {
-    ProjectExplorerSettings settings = ProjectExplorerPlugin::projectExplorerSettings();
-    if (!runControl->promptToStop(&settings.prompToStopRunControl))
+    bool promptToStop = projectExplorerSettings().prompToStopRunControl;
+    if (!runControl->promptToStop(&promptToStop))
         return false;
-    ProjectExplorerPlugin::setProjectExplorerSettings(settings);
+    setPromptToStopSettings(promptToStop);
     return true;
 }
 
diff --git a/src/plugins/projectexplorer/buildaspects.cpp b/src/plugins/projectexplorer/buildaspects.cpp
index 0f9c025fce2..82c38c92bc8 100644
--- a/src/plugins/projectexplorer/buildaspects.cpp
+++ b/src/plugins/projectexplorer/buildaspects.cpp
@@ -123,7 +123,7 @@ void BuildDirectoryAspect::fromMap(const Store &map)
     }
 }
 
-void BuildDirectoryAspect::addToLayout(Layouting::LayoutItem &parent)
+void BuildDirectoryAspect::addToLayout(Layouting::Layout &parent)
 {
     FilePathAspect::addToLayout(parent);
     d->genericProblemSpacer = new QLabel;
@@ -190,15 +190,15 @@ QString BuildDirectoryAspect::updateProblemLabelsHelper(const QString &value)
 
     QString genericProblem;
     QString genericProblemLabelString;
-    if (ProjectExplorerPlugin::projectExplorerSettings().warnAgainstNonAsciiBuildDir) {
+    if (projectExplorerSettings().warnAgainstNonAsciiBuildDir) {
         const auto isInvalid = [](QChar c) { return c.isSpace() || !isascii(c.toLatin1()); };
         if (const auto invalidChar = Utils::findOr(value, std::nullopt, isInvalid)) {
             genericProblem = Tr::tr(
                                  "Build directory contains potentially problematic character \"%1\".")
                                  .arg(*invalidChar);
             genericProblemLabelString
-                = genericProblem
-                  + Tr::tr(" This warning can be suppressed <a href=\"dummy\">here</a>.");
+                = genericProblem + " "
+                  + Tr::tr("This warning can be suppressed <a href=\"dummy\">here</a>.");
         }
     }
 
diff --git a/src/plugins/projectexplorer/buildaspects.h b/src/plugins/projectexplorer/buildaspects.h
index f19cc393858..73d02b193d2 100644
--- a/src/plugins/projectexplorer/buildaspects.h
+++ b/src/plugins/projectexplorer/buildaspects.h
@@ -23,7 +23,7 @@ public:
     bool isShadowBuild() const;
     void setProblem(const QString &description);
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     static Utils::FilePath fixupDir(const Utils::FilePath &dir);
 
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index 2c475f2ad7b..6cc025d8770 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -194,7 +194,6 @@ BuildConfiguration::BuildConfiguration(Target *target, Utils::Id id)
 
     d->m_buildDirectoryAspect.setBaseFileName(target->project()->projectDirectory());
     d->m_buildDirectoryAspect.setEnvironment(environment());
-    d->m_buildDirectoryAspect.setMacroExpanderProvider([this] { return macroExpander(); });
     connect(&d->m_buildDirectoryAspect, &StringAspect::changed,
             this, &BuildConfiguration::emitBuildDirectoryChanged);
     connect(this, &BuildConfiguration::environmentChanged, this, [this] {
@@ -326,13 +325,13 @@ NamedWidget *BuildConfiguration::createConfigWidget()
     }
 
     Layouting::Form form;
+    form.setNoMargins();
     for (BaseAspect *aspect : aspects()) {
         if (aspect->isVisible()) {
             form.addItem(aspect);
-            form.addItem(Layouting::br);
+            form.flush();
         }
     }
-    form.addItem(Layouting::noMargin);
     form.attachTo(widget);
 
     return named;
@@ -633,16 +632,8 @@ FilePath BuildConfiguration::buildDirectoryFromTemplate(const FilePath &projectD
 
     auto buildDevice = BuildDeviceKitAspect::device(kit);
 
-    if (buildDir.isAbsolutePath()) {
-        bool isReachable = buildDevice->ensureReachable(buildDir);
-        if (!isReachable)
-            return {};
+    if (buildDir.isAbsolutePath())
         return buildDevice->rootPath().withNewMappedPath(buildDir);
-    }
-
-    bool isReachable = buildDevice->ensureReachable(projectDir);
-    if (!isReachable)
-        return {};
 
     const FilePath baseDir = buildDevice->rootPath().withNewMappedPath(projectDir);
     return baseDir.resolvePath(buildDir);
@@ -664,12 +655,57 @@ BuildConfigurationFactory::~BuildConfigurationFactory()
     g_buildConfigurationFactories.removeOne(this);
 }
 
+static Tasks defaultIssueReporter(
+    Kit *kit, const Utils::FilePath &projectDir, const Utils::FilePath &buildDirectory)
+{
+    auto buildDevice = BuildDeviceKitAspect::device(kit);
+    if (!buildDevice) {
+        return {Task(
+            Task::Error,
+            Tr::tr("No build device is set for the kit \"%1\".").arg(kit->displayName()),
+            {},
+            0,
+            ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)};
+    }
+
+    auto canMountHintFor = [&buildDevice](const FilePath &path) {
+        if (buildDevice->canMount(path))
+            return Tr::tr("You can try mounting the folder in your device settings.");
+        return QString{};
+    };
+
+    if (!buildDevice->ensureReachable(projectDir)) {
+        return {Task(
+            Task::Error,
+            Tr::tr("The build device \"%1\" cannot reach the project directory.")
+                    .arg(buildDevice->displayName())
+                + " " + canMountHintFor(projectDir),
+            {},
+            0,
+            ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)};
+    }
+
+    if (!buildDirectory.isEmpty() && !buildDevice->ensureReachable(buildDirectory)) {
+        return {Task(
+            Task::Error,
+            Tr::tr("The build device \"%1\" cannot reach the build directory.")
+                    .arg(buildDevice->displayName())
+                + " " + canMountHintFor(buildDirectory),
+            {},
+            0,
+            ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)};
+    }
+
+    return {};
+};
+
 const Tasks BuildConfigurationFactory::reportIssues(Kit *kit, const FilePath &projectPath,
                                                     const FilePath &buildDir) const
 {
+    Tasks issues = defaultIssueReporter(kit, projectPath, buildDir);
     if (m_issueReporter)
-        return m_issueReporter(kit, projectPath, buildDir);
-    return {};
+        issues += m_issueReporter(kit, projectPath, buildDir);
+    return issues;
 }
 
 const QList<BuildInfo> BuildConfigurationFactory::allAvailableBuilds(const Target *parent) const
diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h
index 0b38b3b3a82..362c2605486 100644
--- a/src/plugins/projectexplorer/buildconfiguration.h
+++ b/src/plugins/projectexplorer/buildconfiguration.h
@@ -155,8 +155,8 @@ public:
     static BuildConfigurationFactory *find(const Kit *k, const Utils::FilePath &projectPath);
     static BuildConfigurationFactory *find(Target *parent);
 
-    using IssueReporter
-        = std::function<Tasks(Kit *, const Utils::FilePath &, const Utils::FilePath &)>;
+    using IssueReporter = std::function<
+        Tasks(Kit *, const Utils::FilePath &projectDir, const Utils::FilePath &buildDirectory)>;
     void setIssueReporter(const IssueReporter &issueReporter);
     const Tasks reportIssues(ProjectExplorer::Kit *kit,
                              const Utils::FilePath &projectPath,
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index 1a32d340f2c..b65aa609f41 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -209,10 +209,10 @@ static int queue(const QList<Project *> &projects, const QList<Id> &stepIds,
     if (!ProjectExplorerPlugin::saveModifiedFiles())
         return -1;
 
-    const ProjectExplorerSettings &settings = ProjectExplorerPlugin::projectExplorerSettings();
-    if (settings.stopBeforeBuild != StopBeforeBuild::None
+    const StopBeforeBuild stopBeforeBuild = projectExplorerSettings().stopBeforeBuild;
+    if (stopBeforeBuild != StopBeforeBuild::None
             && stepIds.contains(Constants::BUILDSTEPS_BUILD)) {
-        StopBeforeBuild stopCondition = settings.stopBeforeBuild;
+        StopBeforeBuild stopCondition = stopBeforeBuild;
         if (stopCondition == StopBeforeBuild::SameApp && !forRunConfig)
             stopCondition = StopBeforeBuild::SameBuildDir;
         const auto isStoppableRc = [&projects, stopCondition, configSelection, forRunConfig,
@@ -258,7 +258,7 @@ static int queue(const QList<Project *> &projects, const QList<Id> &stepIds,
 
         if (!toStop.isEmpty()) {
             bool stopThem = true;
-            if (settings.prompToStopRunControl) {
+            if (projectExplorerSettings().prompToStopRunControl) {
                 QStringList names = Utils::transform(toStop, &RunControl::displayName);
                 if (QMessageBox::question(ICore::dialogParent(),
                         Tr::tr("Stop Applications"),
@@ -516,7 +516,7 @@ void BuildManager::rebuildProjects(const QList<Project *> &projects,
 void BuildManager::deployProjects(const QList<Project *> &projects)
 {
     QList<Id> steps;
-    if (ProjectExplorerPlugin::projectExplorerSettings().buildBeforeDeploy != BuildBeforeRunMode::Off)
+    if (projectExplorerSettings().buildBeforeDeploy != BuildBeforeRunMode::Off)
         steps << Id(Constants::BUILDSTEPS_BUILD);
     steps << Id(Constants::BUILDSTEPS_DEPLOY);
     queue(projects, steps, ConfigSelection::Active);
@@ -525,10 +525,9 @@ void BuildManager::deployProjects(const QList<Project *> &projects)
 BuildForRunConfigStatus BuildManager::potentiallyBuildForRunConfig(RunConfiguration *rc)
 {
     QList<Id> stepIds;
-    const ProjectExplorerSettings &settings = ProjectExplorerPlugin::projectExplorerSettings();
-    if (settings.deployBeforeRun) {
+    if (projectExplorerSettings().deployBeforeRun) {
         if (!isBuilding()) {
-            switch (settings.buildBeforeDeploy) {
+            switch (projectExplorerSettings().buildBeforeDeploy) {
             case BuildBeforeRunMode::AppOnly:
                 if (rc->target()->activeBuildConfiguration())
                     rc->target()->activeBuildConfiguration()->restrictNextBuild(rc);
@@ -721,8 +720,7 @@ void BuildManager::startBuildQueue()
     };
 
     const GroupItem abortPolicy
-        = ProjectExplorerPlugin::projectExplorerSettings().abortBuildAllOnError
-              ? stopOnError : continueOnError;
+        = projectExplorerSettings().abortBuildAllOnError ? stopOnError : continueOnError;
 
     QList<GroupItem> topLevel { abortPolicy, ParserAwaiterTask(onAwaiterSetup) };
     Project *lastProject = nullptr;
@@ -856,7 +854,7 @@ bool BuildManager::buildQueueAppend(const QList<BuildItem> &items, const QString
 {
     if (!d->m_taskTreeRunner.isRunning()) {
         d->m_outputWindow->clearContents();
-        if (ProjectExplorerPlugin::projectExplorerSettings().clearIssuesOnRebuild) {
+        if (projectExplorerSettings().clearIssuesOnRebuild) {
             TaskHub::clearTasks(Constants::TASK_CATEGORY_COMPILE);
             TaskHub::clearTasks(Constants::TASK_CATEGORY_BUILDSYSTEM);
             TaskHub::clearTasks(Constants::TASK_CATEGORY_DEPLOYMENT);
diff --git a/src/plugins/projectexplorer/buildpropertiessettings.cpp b/src/plugins/projectexplorer/buildpropertiessettings.cpp
index 5b60e6c9c13..d5eb9bfc3aa 100644
--- a/src/plugins/projectexplorer/buildpropertiessettings.cpp
+++ b/src/plugins/projectexplorer/buildpropertiessettings.cpp
@@ -54,7 +54,11 @@ BuildPropertiesSettings::BuildPropertiesSettings()
     buildDirectoryTemplate.setSettingsKey("Directories/BuildDirectory.TemplateV2");
     buildDirectoryTemplate.setDefaultValue(defaultBuildDirectoryTemplate());
     buildDirectoryTemplate.setLabelText(Tr::tr("Default build directory:"));
-    buildDirectoryTemplate.setUseGlobalMacroExpander();
+    buildDirectoryTemplate.setToolTip(
+        Tr::tr("Template used to construct the default build directory.<br><br>"
+               "The default value can be set using the environment variable "
+               "<tt>%1</tt>.")
+            .arg(Constants::QTC_DEFAULT_BUILD_DIRECTORY_TEMPLATE));
     buildDirectoryTemplate.setUseResetButton();
 
     separateDebugInfo.setSettingsKey("ProjectExplorer/Settings/SeparateDebugInfo");
diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp
index 70c58eedeec..19eb143d245 100644
--- a/src/plugins/projectexplorer/buildstep.cpp
+++ b/src/plugins/projectexplorer/buildstep.cpp
@@ -85,6 +85,9 @@ BuildStep::BuildStep(BuildStepList *bsl, Id id)
     : ProjectConfiguration(bsl->target(), id)
     , m_stepList(bsl)
 {
+    if (auto bc = buildConfiguration())
+        setMacroExpander(bc->macroExpander());
+
     connect(this, &ProjectConfiguration::displayNameChanged, this, &BuildStep::updateSummary);
 }
 
@@ -113,17 +116,15 @@ QWidget *BuildStep::doCreateConfigWidget()
 QWidget *BuildStep::createConfigWidget()
 {
     Layouting::Form form;
+    form.setNoMargins();
     for (BaseAspect *aspect : std::as_const(*this)) {
-        if (aspect->isVisible())
-            form.addItems({aspect, Layouting::br()});
+        if (aspect->isVisible()) {
+            form.addItem(aspect);
+            form.flush();
+        }
     }
-    form.addItem(Layouting::noMargin);
-    auto widget = form.emerge();
 
-    if (m_addMacroExpander)
-        VariableChooser::addSupportForChildWidgets(widget, macroExpander());
-
-    return widget;
+    return form.emerge();
 }
 
 void BuildStep::fromMap(const Store &map)
@@ -194,13 +195,6 @@ BuildConfiguration::BuildType BuildStep::buildType() const
     return BuildConfiguration::Unknown;
 }
 
-MacroExpander *BuildStep::macroExpander() const
-{
-    if (auto bc = buildConfiguration())
-        return bc->macroExpander();
-    return globalMacroExpander();
-}
-
 QString BuildStep::fallbackWorkingDirectory() const
 {
     if (buildConfiguration())
diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h
index ed07d763e7a..4fd01f0eb33 100644
--- a/src/plugins/projectexplorer/buildstep.h
+++ b/src/plugins/projectexplorer/buildstep.h
@@ -52,7 +52,6 @@ public:
 
     BuildSystem *buildSystem() const;
     BuildConfiguration::BuildType buildType() const;
-    Utils::MacroExpander *macroExpander() const;
 
     enum class OutputFormat {
         Stdout, Stderr, // These are for forwarded output from external tools
@@ -99,7 +98,6 @@ protected:
     void setWidgetExpandedByDefault(bool widgetExpandedByDefault);
     void setImmutable(bool immutable) { m_immutable = immutable; }
     void setSummaryUpdater(const std::function<QString()> &summaryUpdater);
-    void addMacroExpander() { m_addMacroExpander = true; }
     void setSummaryText(const QString &summaryText);
 
     DeployConfiguration *deployConfiguration() const;
@@ -119,7 +117,6 @@ private:
     bool m_enabled = true;
     bool m_immutable = false;
     bool m_widgetExpandedByDefault = true;
-    bool m_addMacroExpander = false;
     std::optional<bool> m_wasExpanded;
     std::function<QString()> m_summaryUpdater;
 
diff --git a/src/plugins/projectexplorer/buildtargetinfo.h b/src/plugins/projectexplorer/buildtargetinfo.h
index 4ba1c4de5b4..c99dec64308 100644
--- a/src/plugins/projectexplorer/buildtargetinfo.h
+++ b/src/plugins/projectexplorer/buildtargetinfo.h
@@ -5,12 +5,15 @@
 
 #include "projectexplorer_export.h"
 
+#include "runconfiguration.h"
+
 #include <utils/environment.h>
 #include <utils/filepath.h>
 
 #include <QList>
 
 namespace ProjectExplorer {
+class Launcher;
 
 class PROJECTEXPLORER_EXPORT BuildTargetInfo
 {
@@ -19,6 +22,7 @@ public:
     QString displayName;
     QString displayNameUniquifier;
 
+    QList<Launcher> launchers;
     Utils::FilePath targetFilePath;
     Utils::FilePath projectFilePath;
     Utils::FilePath workingDirectory;
diff --git a/src/plugins/projectexplorer/clangparser.cpp b/src/plugins/projectexplorer/clangparser.cpp
index 28679f0ed58..05bcc3e0aa2 100644
--- a/src/plugins/projectexplorer/clangparser.cpp
+++ b/src/plugins/projectexplorer/clangparser.cpp
@@ -65,7 +65,7 @@ OutputLineParser::Result ClangParser::handleLine(const QString &line, OutputForm
         const int lineNo = match.captured(3).toInt();
         const int column = 0;
         LinkSpecs linkSpecs;
-        addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, lineNo, match, 2);
+        addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, lineNo, column, match, 2);
         createOrAmendTask(Task::Unknown, lne.trimmed(), lne, false,
                           filePath, lineNo, column, linkSpecs);
         return {Status::InProgress, linkSpecs};
@@ -84,7 +84,7 @@ OutputLineParser::Result ClangParser::handleLine(const QString &line, OutputForm
 
         const FilePath filePath = absoluteFilePath(FilePath::fromUserInput(match.captured(1)));
         LinkSpecs linkSpecs;
-        addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, lineNo, match, 1);
+        addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, lineNo, column, match, 1);
         createOrAmendTask(taskType(match.captured(8)), match.captured(9), lne, false,
                           filePath, lineNo, column, linkSpecs);
         return {Status::InProgress, linkSpecs};
@@ -235,7 +235,7 @@ void ProjectExplorerTest::testClangOutputParser_data()
                                    68, 10,
                                    QVector<QTextLayout::FormatRange>()
                                        << formatRange(34, 0)
-                                       << formatRange(34, 28, "olpfile:///usr/include/c++/4.6/utility::68::-1")
+                                       << formatRange(34, 28, "olpfile:///usr/include/c++/4.6/utility::68::10")
                                        << formatRange(62, 93)))
                 << QString();
 
@@ -255,7 +255,7 @@ void ProjectExplorerTest::testClangOutputParser_data()
                                    567, 51,
                                    QVector<QTextLayout::FormatRange>()
                                        << formatRange(74, 0)
-                                       << formatRange(74, 64, "olpfile:///home/code/src/creator/src/plugins/coreplugin/manhattanstyle.cpp::567::-1")
+                                       << formatRange(74, 64, "olpfile:///home/code/src/creator/src/plugins/coreplugin/manhattanstyle.cpp::567::51")
                                        << formatRange(138, 202)))
                 << QString();
 
diff --git a/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp b/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp
index 0153a6a1958..67e1f4820be 100644
--- a/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp
@@ -19,6 +19,7 @@
 
 #include <QComboBox>
 #include <QLabel>
+#include <QLayout>
 #include <QStackedWidget>
 
 using namespace TextEditor;
diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp
index 8d2b12983bd..c5255d127f5 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.cpp
+++ b/src/plugins/projectexplorer/compileoutputwindow.cpp
@@ -61,6 +61,8 @@ CompileOutputWindow::CompileOutputWindow(QAction *cancelBuildAction) :
     m_outputWindow->setReadOnly(true);
     m_outputWindow->setUndoRedoEnabled(false);
     m_outputWindow->setMaxCharCount(Core::Constants::DEFAULT_MAX_CHAR_COUNT);
+    //: file name suggested for saving compile output
+    m_outputWindow->setOutputFileNameHint(Tr::tr("compile-output.txt"));
 
     Utils::ProxyAction *cancelBuildProxyButton =
             Utils::ProxyAction::proxyActionWithIcon(cancelBuildAction,
diff --git a/src/plugins/projectexplorer/copystep.cpp b/src/plugins/projectexplorer/copystep.cpp
index be6c9bb730f..812fcb31348 100644
--- a/src/plugins/projectexplorer/copystep.cpp
+++ b/src/plugins/projectexplorer/copystep.cpp
@@ -28,15 +28,13 @@ public:
 
         m_targetAspect.setSettingsKey(TARGET_KEY);
         m_targetAspect.setLabelText(Tr::tr("Target:"));
-
-        addMacroExpander();
     }
 
 protected:
     bool init() final
     {
-        m_source = m_sourceAspect();
-        m_target = m_targetAspect();
+        m_source = m_sourceAspect.expandedValue();
+        m_target = m_targetAspect.expandedValue();
         return m_source.exists();
     }
 
diff --git a/src/plugins/projectexplorer/currentprojectfind.cpp b/src/plugins/projectexplorer/currentprojectfind.cpp
index 76439d93b74..5ec53f3dd2c 100644
--- a/src/plugins/projectexplorer/currentprojectfind.cpp
+++ b/src/plugins/projectexplorer/currentprojectfind.cpp
@@ -29,8 +29,11 @@ private:
 
     bool isEnabled() const final;
 
-    void writeSettings(Utils::QtcSettings *settings) final;
-    void readSettings(Utils::QtcSettings *settings) final;
+    Utils::Store save() const final;
+    void restore(const Utils::Store &s) final;
+
+    // deprecated
+    QByteArray settingsKey() const final;
 
     QString label() const final;
 
@@ -115,18 +118,24 @@ void CurrentProjectFind::setupSearch(Core::SearchResult *search)
     });
 }
 
-void CurrentProjectFind::writeSettings(QtcSettings *settings)
+const char kDefaultInclusion[] = "*";
+const char kDefaultExclusion[] = "";
+
+Store CurrentProjectFind::save() const
 {
-    settings->beginGroup("CurrentProjectFind");
-    writeCommonSettings(settings);
-    settings->endGroup();
+    Store s;
+    writeCommonSettings(s, kDefaultInclusion, kDefaultExclusion);
+    return s;
 }
 
-void CurrentProjectFind::readSettings(QtcSettings *settings)
+void CurrentProjectFind::restore(const Store &s)
 {
-    settings->beginGroup("CurrentProjectFind");
-    readCommonSettings(settings, "*", "");
-    settings->endGroup();
+    readCommonSettings(s, kDefaultInclusion, kDefaultExclusion);
+}
+
+QByteArray CurrentProjectFind::settingsKey() const
+{
+    return "CurrentProjectFind";
 }
 
 void setupCurrentProjectFind()
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
index 8639bc00cee..12bc39a7c4d 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
@@ -49,21 +49,6 @@ bool CustomExecutableRunConfiguration::isEnabled(Id) const
     return true;
 }
 
-ProcessRunData CustomExecutableRunConfiguration::runnable() const
-{
-    ProcessRunData r;
-    r.command = commandLine();
-    r.environment = environment.environment();
-    r.workingDirectory = workingDir();
-
-    if (!r.command.isEmpty()) {
-        const FilePath expanded = macroExpander()->expand(r.command.executable());
-        r.command.setExecutable(expanded);
-    }
-
-    return r;
-}
-
 QString CustomExecutableRunConfiguration::defaultDisplayName() const
 {
     if (executable().isEmpty())
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.h b/src/plugins/projectexplorer/customexecutablerunconfiguration.h
index ced9892c016..3b9e8996b8a 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.h
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.h
@@ -20,7 +20,6 @@ public:
     QString defaultDisplayName() const;
 
 private:
-    Utils::ProcessRunData runnable() const override;
     bool isEnabled(Utils::Id) const override;
     Tasks checkForIssues() const override;
 
diff --git a/src/plugins/projectexplorer/customparser.cpp b/src/plugins/projectexplorer/customparser.cpp
index e10595af78a..0e2a360af11 100644
--- a/src/plugins/projectexplorer/customparser.cpp
+++ b/src/plugins/projectexplorer/customparser.cpp
@@ -237,7 +237,7 @@ OutputLineParser::Result CustomParser::hasMatch(
     const int lineNumber = match.captured(expression.lineNumberCap()).toInt();
     const QString message = match.captured(expression.messageCap());
     LinkSpecs linkSpecs;
-    addLinkSpecForAbsoluteFilePath(linkSpecs, fileName, lineNumber, match,
+    addLinkSpecForAbsoluteFilePath(linkSpecs, fileName, lineNumber, -1, match,
                                    expression.fileNameCap());
     scheduleTask(CompileTask(taskType, message, fileName, lineNumber), 1);
     return {Status::Done, linkSpecs};
diff --git a/src/plugins/projectexplorer/customparserconfigdialog.cpp b/src/plugins/projectexplorer/customparserconfigdialog.cpp
index cbfd1adfbc7..3793c0de6c2 100644
--- a/src/plugins/projectexplorer/customparserconfigdialog.cpp
+++ b/src/plugins/projectexplorer/customparserconfigdialog.cpp
@@ -406,8 +406,8 @@ bool CustomParserConfigDialog::checkPattern(QLineEdit *pattern, const QString &o
 
     QPalette palette;
     palette.setColor(QPalette::Text,
-                     Utils::creatorTheme()->color(rx.isValid() ? Utils::Theme::TextColorNormal
-                                                               : Utils::Theme::TextColorError));
+                     Utils::creatorColor(rx.isValid() ? Utils::Theme::TextColorNormal
+                                                      : Utils::Theme::TextColorError));
     pattern->setPalette(palette);
     pattern->setToolTip(rx.isValid() ? QString() : rx.errorString());
 
@@ -415,7 +415,7 @@ bool CustomParserConfigDialog::checkPattern(QLineEdit *pattern, const QString &o
         *match = rx.match(outputText);
     if (rx.pattern().isEmpty() || !rx.isValid() || !match->hasMatch()) {
         *errorMessage = QString::fromLatin1("<font color=\"%1\">%2 ").arg(
-                    Utils::creatorTheme()->color(Utils::Theme::TextColorError).name(),
+                    Utils::creatorColor(Utils::Theme::TextColorError).name(),
                     Tr::tr("Not applicable:"));
         if (rx.pattern().isEmpty())
             *errorMessage += Tr::tr("Pattern is empty.");
diff --git a/src/plugins/projectexplorer/desktoprunconfiguration.cpp b/src/plugins/projectexplorer/desktoprunconfiguration.cpp
index a8d3284e9be..02f31c13452 100644
--- a/src/plugins/projectexplorer/desktoprunconfiguration.cpp
+++ b/src/plugins/projectexplorer/desktoprunconfiguration.cpp
@@ -70,6 +70,7 @@ private:
     FilePath executableToRun(const BuildTargetInfo &targetInfo) const;
 
     const Kind m_kind;
+    LauncherAspect launcher{this};
     EnvironmentAspect environment{this};
     ExecutableAspect executable{this};
     ArgumentsAspect arguments{this};
@@ -90,6 +91,8 @@ void DesktopRunConfiguration::updateTargetInformation()
     auto terminalAspect = aspect<TerminalAspect>();
     terminalAspect->setUseTerminalHint(bti.targetFilePath.needsDevice() ? false : bti.usesTerminal);
     terminalAspect->setEnabled(!bti.targetFilePath.needsDevice());
+    auto launcherAspect = aspect<LauncherAspect>();
+    launcherAspect->setVisible(false);
 
     if (m_kind == Qmake) {
 
@@ -121,6 +124,12 @@ void DesktopRunConfiguration::updateTargetInformation()
 
     } else if (m_kind == CMake) {
 
+        if (bti.launchers.size() > 0) {
+            launcherAspect->setVisible(true);
+            // Use start program by default, if defined (see toBuildTarget() for details)
+            launcherAspect->setDefaultLauncher(bti.launchers.last());
+            launcherAspect->updateLaunchers(bti.launchers);
+        }
         aspect<ExecutableAspect>()->setExecutable(bti.targetFilePath);
         aspect<WorkingDirectoryAspect>()->setDefaultWorkingDirectory(bti.workingDirectory);
         emit aspect<EnvironmentAspect>()->environmentChanged();
diff --git a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
index 2dae1a9b685..b9558f17f1b 100644
--- a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
+++ b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
@@ -6,7 +6,6 @@
 #include "../projectexplorerconstants.h"
 #include "../projectexplorertr.h"
 #include "desktopprocesssignaloperation.h"
-#include "processlist.h"
 
 #include <coreplugin/fileutils.h>
 
@@ -21,7 +20,6 @@
 #include <utils/url.h>
 
 #include <QCoreApplication>
-#include <QDateTime>
 
 #ifdef Q_OS_WIN
 #include <cstring>
@@ -65,7 +63,7 @@ DesktopDevice::DesktopDevice()
         Process process;
         process.setTerminalMode(TerminalMode::Detached);
         process.setEnvironment(realEnv);
-        process.setCommand({*shell, {}});
+        process.setCommand(CommandLine{*shell});
         process.setWorkingDirectory(path);
         process.start();
 
diff --git a/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.cpp b/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.cpp
index 70412124462..773f4d3bca5 100644
--- a/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.cpp
+++ b/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.cpp
@@ -102,90 +102,20 @@ void DesktopProcessSignalOperation::killProcessSilently(qint64 pid)
 void DesktopProcessSignalOperation::interruptProcessSilently(qint64 pid)
 {
 #ifdef Q_OS_WIN
-    enum SpecialInterrupt { NoSpecialInterrupt, Win32Interrupt, Win64Interrupt };
-
-    bool is64BitSystem = is64BitWindowsSystem();
-    SpecialInterrupt si = NoSpecialInterrupt;
-    if (is64BitSystem)
-        si = is64BitWindowsBinary(m_debuggerCommand) ? Win64Interrupt : Win32Interrupt;
-    /*
-    Windows 64 bit has a 32 bit subsystem (WOW64) which makes it possible to run a
-    32 bit application inside a 64 bit environment.
-    When GDB is used DebugBreakProcess must be called from the same system (32/64 bit) running
-    the inferior. If CDB is used we could in theory break wow64 processes,
-    but the break is actually a wow64 breakpoint. CDB is configured to ignore these
-    breakpoints, because they also appear on module loading.
-    Therefore we need helper executables (win(32/64)interrupt.exe) on Windows 64 bit calling
-    DebugBreakProcess from the correct system.
-
-    DebugBreak matrix for windows
-
-    Api = UseDebugBreakApi
-    Win64 = UseWin64InterruptHelper
-    Win32 = UseWin32InterruptHelper
-    N/A = This configuration is not possible
-
-          | Windows 32bit   | Windows 64bit
-          | QtCreator 32bit | QtCreator 32bit                   | QtCreator 64bit
-          | Inferior 32bit  | Inferior 32bit  | Inferior 64bit  | Inferior 32bit  | Inferior 64bit
-----------|-----------------|-----------------|-----------------|-----------------|----------------
-CDB 32bit | Api             | Api             | N/A             | Win32           | N/A
-    64bit | N/A             | Win64           | Win64           | Api             | Api
-----------|-----------------|-----------------|-----------------|-----------------|----------------
-GDB 32bit | Api             | Api             | N/A             | Win32           | N/A
-    64bit | N/A             | N/A             | Win64           | N/A             | Api
-----------|-----------------|-----------------|-----------------|-----------------|----------------
-
-    */
     HANDLE inferior = NULL;
-    do {
-        const DWORD rights = PROCESS_QUERY_INFORMATION|PROCESS_SET_INFORMATION
-                |PROCESS_VM_OPERATION|PROCESS_VM_WRITE|PROCESS_VM_READ
-                |PROCESS_DUP_HANDLE|PROCESS_TERMINATE|PROCESS_CREATE_THREAD|PROCESS_SUSPEND_RESUME;
-        inferior = OpenProcess(rights, FALSE, pid);
-        if (inferior == NULL) {
-            appendMsgCannotInterrupt(pid, Tr::tr("Cannot open process: %1")
-                                     + winErrorMessage(GetLastError()));
-            break;
-        }
-        bool creatorIs64Bit = is64BitWindowsBinary(
-            FilePath::fromUserInput(QCoreApplication::applicationFilePath()));
-        if (!is64BitSystem
-                || si == NoSpecialInterrupt
-                || (si == Win64Interrupt && creatorIs64Bit)
-                || (si == Win32Interrupt && !creatorIs64Bit)) {
-            if (!DebugBreakProcess(inferior)) {
-                appendMsgCannotInterrupt(pid, Tr::tr("DebugBreakProcess failed:")
-                                          + QLatin1Char(' ') + winErrorMessage(GetLastError()));
-            }
-        } else if (si == Win32Interrupt || si == Win64Interrupt) {
-            QString executable = QCoreApplication::applicationDirPath();
-            executable += si == Win32Interrupt
-                    ? QLatin1String("/win32interrupt.exe")
-                    : QLatin1String("/win64interrupt.exe");
-            if (!QFileInfo::exists(executable)) {
-                appendMsgCannotInterrupt(pid,
-                                         Tr::tr("%1 does not exist. If you built %2 "
-                                                "yourself, check out https://code.qt.io/cgit/"
-                                                "qt-creator/binary-artifacts.git/.")
-                                             .arg(QDir::toNativeSeparators(executable),
-                                                  QGuiApplication::applicationDisplayName()));
-            }
-            switch (QProcess::execute(executable, QStringList(QString::number(pid)))) {
-            case -2:
-                appendMsgCannotInterrupt(pid, Tr::tr(
-                            "Cannot start %1. Check src\\tools\\win64interrupt\\win64interrupt.c "
-                            "for more information.").arg(QDir::toNativeSeparators(executable)));
-                break;
-            case 0:
-                break;
-            default:
-                appendMsgCannotInterrupt(pid, QDir::toNativeSeparators(executable)
-                                         + QLatin1Char(' ') + Tr::tr("could not break the process."));
-                break;
-            }
-        }
-    } while (false);
+    const DWORD rights = PROCESS_QUERY_INFORMATION | PROCESS_SET_INFORMATION | PROCESS_VM_OPERATION
+                         | PROCESS_VM_WRITE | PROCESS_VM_READ | PROCESS_DUP_HANDLE
+                         | PROCESS_TERMINATE | PROCESS_CREATE_THREAD | PROCESS_SUSPEND_RESUME;
+    inferior = OpenProcess(rights, FALSE, pid);
+    if (inferior == NULL) {
+        appendMsgCannotInterrupt(
+            pid, Tr::tr("Cannot open process: %1") + winErrorMessage(GetLastError()));
+    } else if (!DebugBreakProcess(inferior)) {
+        appendMsgCannotInterrupt(
+            pid,
+            Tr::tr("DebugBreakProcess failed:") + QLatin1Char(' ')
+                + winErrorMessage(GetLastError()));
+    }
     if (inferior != NULL)
         CloseHandle(inferior);
 #else
diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp
index dfcfc83a1be..59ead38b9f3 100644
--- a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp
@@ -23,6 +23,7 @@
 #include <utils/qtcassert.h>
 
 #include <QComboBox>
+#include <QFormLayout>
 #include <QGroupBox>
 #include <QLabel>
 #include <QLineEdit>
@@ -91,7 +92,7 @@ private:
     QPushButton *m_defaultDeviceButton;
     QVBoxLayout *m_buttonsLayout;
     QWidget *m_deviceNameEditWidget;
-    QFormLayout *m_generalFormLayout;
+    QLayout *m_generalFormLayout;
 };
 
 DeviceSettingsWidget::DeviceSettingsWidget()
@@ -156,7 +157,7 @@ DeviceSettingsWidget::DeviceSettingsWidget()
     }.attachTo(scrollAreaWidget);
 
     // Just a placeholder for the device name edit widget.
-    m_deviceNameEditWidget = new QWidget();
+    m_deviceNameEditWidget = new QWidget;
 
     // clang-format off
     Form {
@@ -338,11 +339,12 @@ void DeviceSettingsWidget::currentDeviceChanged(int index)
         return;
     }
 
-    Layouting::Column item{Layouting::noMargin()};
+    Layouting::Column item{Layouting::noMargin};
     device->settings()->displayName.addToLayout(item);
     QWidget *newEdit = item.emerge();
-    m_generalFormLayout->replaceWidget(m_deviceNameEditWidget, newEdit);
-
+    QLayoutItem *oldItem = m_generalFormLayout->replaceWidget(m_deviceNameEditWidget, newEdit);
+    QTC_CHECK(oldItem);
+    delete oldItem;
     delete m_deviceNameEditWidget;
     m_deviceNameEditWidget = newEdit;
 
diff --git a/src/plugins/projectexplorer/devicesupport/devicetestdialog.cpp b/src/plugins/projectexplorer/devicesupport/devicetestdialog.cpp
index 0277fc827a0..4e522f24a0d 100644
--- a/src/plugins/projectexplorer/devicesupport/devicetestdialog.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicetestdialog.cpp
@@ -95,10 +95,8 @@ void DeviceTestDialog::handleTestFinished(DeviceTester::TestResult result)
 
 void DeviceTestDialog::addText(const QString &text, Utils::Theme::Color color, bool bold)
 {
-    Utils::Theme *theme = Utils::creatorTheme();
-
     QTextCharFormat format = d->textEdit->currentCharFormat();
-    format.setForeground(QBrush(theme->color(color)));
+    format.setForeground(QBrush(creatorColor(color)));
     QFont font = format.font();
     font.setBold(bold);
     format.setFont(font);
diff --git a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp
index 920d7f69c55..714d311a1ef 100644
--- a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp
+++ b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp
@@ -7,6 +7,8 @@
 #include "sshparameters.h"
 #include "../projectexplorertr.h"
 
+#include <remotelinux/remotelinux_constants.h>
+
 #include <utils/port.h>
 #include <utils/portlist.h>
 #include <utils/qtcprocess.h>
@@ -179,7 +181,10 @@ public:
     void start() final
     {
         m_channel.setScheme(urlTcpScheme());
-        m_channel.setHost(device()->toolControlChannel(IDevice::ControlChannelHint()).host());
+        if (device()->extraData(RemoteLinux::Constants::SshForwardDebugServerPort).toBool())
+            m_channel.setHost("localhost");
+        else
+            m_channel.setHost(device()->toolControlChannel(IDevice::ControlChannelHint()).host());
         if (m_portGatherer)
             m_channel.setPort(m_portGatherer->findEndPoint().port());
         reportStarted();
diff --git a/src/plugins/projectexplorer/devicesupport/filetransfer.h b/src/plugins/projectexplorer/devicesupport/filetransfer.h
index 7ad6a5c5bc3..2d84351d55c 100644
--- a/src/plugins/projectexplorer/devicesupport/filetransfer.h
+++ b/src/plugins/projectexplorer/devicesupport/filetransfer.h
@@ -37,6 +37,7 @@ public:
     Utils::ProcessResultData resultData() const;
 
     static QString transferMethodName(FileTransferMethod method);
+    QString transferMethodName() const { return transferMethodName(transferMethod()); }
 
 signals:
     void progress(const QString &progressMessage);
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp
index 7c621775b15..90eca216fa7 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.cpp
+++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp
@@ -139,6 +139,7 @@ public:
     IDevice::MachineType machineType = IDevice::Hardware;
     OsType osType = OsTypeOther;
     DeviceFileAccess *fileAccess = nullptr;
+    std::function<DeviceFileAccess *()> fileAccessFactory;
     int version = 0; // This is used by devices that have been added by the SDK.
 
     Utils::SynchronizedValue<SshParameters> sshParameters;
@@ -251,6 +252,9 @@ bool IDevice::isAnyUnixDevice() const
 
 DeviceFileAccess *IDevice::fileAccess() const
 {
+    if (d->fileAccessFactory)
+        return d->fileAccessFactory();
+
     return d->fileAccess;
 }
 
@@ -341,6 +345,11 @@ void IDevice::setFileAccess(DeviceFileAccess *fileAccess)
     d->fileAccess = fileAccess;
 }
 
+void IDevice::setFileAccess(std::function<Utils::DeviceFileAccess *()> fileAccessFactory)
+{
+    d->fileAccessFactory = fileAccessFactory;
+}
+
 IDevice::DeviceInfo IDevice::deviceInformation() const
 {
     const QString key = Tr::tr("Device");
@@ -442,6 +451,11 @@ DeviceTester *IDevice::createDeviceTester() const
     return nullptr;
 }
 
+bool IDevice::canMount(const Utils::FilePath &) const
+{
+    return false;
+}
+
 OsType IDevice::osType() const
 {
     return d->osType;
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h
index 6434b5b6dde..490906bf901 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.h
+++ b/src/plugins/projectexplorer/devicesupport/idevice.h
@@ -151,6 +151,8 @@ public:
     virtual bool hasDeviceTester() const { return false; }
     virtual DeviceTester *createDeviceTester() const;
 
+    virtual bool canMount(const Utils::FilePath &filePath) const;
+
     virtual DeviceProcessSignalOperation::Ptr signalOperation() const;
 
     enum DeviceState { DeviceReadyToUse, DeviceConnected, DeviceDisconnected, DeviceStateUnknown };
@@ -239,6 +241,7 @@ protected:
     void setDisplayType(const QString &type);
     void setOsType(Utils::OsType osType);
     void setFileAccess(Utils::DeviceFileAccess *fileAccess);
+    void setFileAccess(std::function<Utils::DeviceFileAccess *()> fileAccessFactory);
 
 private:
     IDevice(const IDevice &) = delete;
diff --git a/src/plugins/projectexplorer/devicesupport/sshparameters.cpp b/src/plugins/projectexplorer/devicesupport/sshparameters.cpp
index 2b2ebdabc00..c266055003c 100644
--- a/src/plugins/projectexplorer/devicesupport/sshparameters.cpp
+++ b/src/plugins/projectexplorer/devicesupport/sshparameters.cpp
@@ -75,12 +75,11 @@ QStringList SshParameters::connectionOptions(const FilePath &binary) const
     return args;
 }
 
-bool SshParameters::setupSshEnvironment(Process *process)
+void SshParameters::setupSshEnvironment(Process *process)
 {
     Environment env = process->controlEnvironment();
     if (!env.hasChanges())
         env = Environment::systemEnvironment();
-    const bool hasDisplay = env.hasKey("DISPLAY") && (env.value("DISPLAY") != QString(":0"));
     if (SshSettings::askpassFilePath().exists()) {
         env.set("SSH_ASKPASS", SshSettings::askpassFilePath().toUserOutput());
         env.set("SSH_ASKPASS_REQUIRE", "force");
@@ -93,7 +92,6 @@ bool SshParameters::setupSshEnvironment(Process *process)
 
     // Otherwise, ssh will ignore SSH_ASKPASS and read from /dev/tty directly.
     process->setDisableUnixTerminal();
-    return hasDisplay;
 }
 
 bool operator==(const SshParameters &p1, const SshParameters &p2)
diff --git a/src/plugins/projectexplorer/devicesupport/sshparameters.h b/src/plugins/projectexplorer/devicesupport/sshparameters.h
index 5a5f32da268..da57f2c5aa2 100644
--- a/src/plugins/projectexplorer/devicesupport/sshparameters.h
+++ b/src/plugins/projectexplorer/devicesupport/sshparameters.h
@@ -46,7 +46,7 @@ public:
     AuthenticationType authenticationType = AuthenticationTypeAll;
     SshHostKeyCheckingMode hostKeyCheckingMode = SshHostKeyCheckingAllowNoMatch;
 
-    static bool setupSshEnvironment(Utils::Process *process);
+    static void setupSshEnvironment(Utils::Process *process);
 
     friend PROJECTEXPLORER_EXPORT bool operator==(const SshParameters &p1, const SshParameters &p2);
     friend bool operator!=(const SshParameters &p1, const SshParameters &p2) { return !(p1 == p2); }
diff --git a/src/plugins/projectexplorer/environmentaspect.cpp b/src/plugins/projectexplorer/environmentaspect.cpp
index af4d8449d1c..43107b6141d 100644
--- a/src/plugins/projectexplorer/environmentaspect.cpp
+++ b/src/plugins/projectexplorer/environmentaspect.cpp
@@ -31,9 +31,7 @@ EnvironmentAspect::EnvironmentAspect(AspectContainer *container)
     setConfigWidgetCreator([this] { return new EnvironmentAspectWidget(this); });
     addDataExtractor(this, &EnvironmentAspect::environment, &Data::environment);
     if (qobject_cast<RunConfiguration *>(container)) {
-        addModifier([](Environment &env) {
-            env.modify(ProjectExplorerPlugin::projectExplorerSettings().appEnvChanges);
-        });
+        addModifier([](Environment &env) { env.modify(projectExplorerSettings().appEnvChanges); });
         connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::settingsChanged,
                 this, &EnvironmentAspect::environmentChanged);
     }
@@ -71,7 +69,7 @@ void EnvironmentAspect::setUserEnvironmentChanges(const Utils::EnvironmentItems
 Utils::Environment EnvironmentAspect::environment() const
 {
     Environment env = modifiedBaseEnvironment();
-    env.modify(m_userChanges);
+    env.modify(userEnvironmentChanges());
     return env;
 }
 
@@ -167,4 +165,9 @@ Environment EnvironmentAspect::BaseEnvironment::unmodifiedBaseEnvironment() cons
     return getter ? getter() : Environment();
 }
 
+Utils::EnvironmentItems EnvironmentAspect::userEnvironmentChanges() const
+{
+    emit userChangesUpdateRequested();
+    return m_userChanges;
+}
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/environmentaspect.h b/src/plugins/projectexplorer/environmentaspect.h
index 26dd43f6a41..86d7d345008 100644
--- a/src/plugins/projectexplorer/environmentaspect.h
+++ b/src/plugins/projectexplorer/environmentaspect.h
@@ -32,7 +32,7 @@ public:
     int baseEnvironmentBase() const;
     void setBaseEnvironmentBase(int base);
 
-    Utils::EnvironmentItems userEnvironmentChanges() const { return m_userChanges; }
+    Utils::EnvironmentItems userEnvironmentChanges() const;
     void setUserEnvironmentChanges(const Utils::EnvironmentItems &diff);
 
     int addSupportedBaseEnvironment(const QString &displayName,
@@ -68,6 +68,7 @@ signals:
     void baseEnvironmentChanged();
     void userEnvironmentChangesChanged(const Utils::EnvironmentItems &diff);
     void environmentChanged();
+    void userChangesUpdateRequested() const;
 
 protected:
     void fromMap(const Utils::Store &map) override;
diff --git a/src/plugins/projectexplorer/environmentaspectwidget.cpp b/src/plugins/projectexplorer/environmentaspectwidget.cpp
index d47b4e82cc3..148b4415658 100644
--- a/src/plugins/projectexplorer/environmentaspectwidget.cpp
+++ b/src/plugins/projectexplorer/environmentaspectwidget.cpp
@@ -26,6 +26,10 @@ EnvironmentAspectWidget::EnvironmentAspectWidget(EnvironmentAspect *aspect)
 {
     QTC_CHECK(m_aspect);
 
+    connect(m_aspect, &EnvironmentAspect::userChangesUpdateRequested, this, [this] {
+        m_environmentWidget->forceUpdateCheck();
+    });
+
     setContentsMargins(0, 0, 0, 0);
     auto topLayout = new QVBoxLayout(this);
     topLayout->setContentsMargins(0, 0, 0, 25);
diff --git a/src/plugins/projectexplorer/environmentwidget.cpp b/src/plugins/projectexplorer/environmentwidget.cpp
index a34f8bc256e..6ef817d2797 100644
--- a/src/plugins/projectexplorer/environmentwidget.cpp
+++ b/src/plugins/projectexplorer/environmentwidget.cpp
@@ -197,10 +197,7 @@ EnvironmentWidget::EnvironmentWidget(QWidget *parent, Type type, QWidget *additi
 
     auto horizontalLayout = new QHBoxLayout();
     horizontalLayout->setContentsMargins(0, 0, 0, 0);
-    auto tree = new Utils::TreeView(this);
-    connect(tree, &QAbstractItemView::activated,
-            tree, [tree](const QModelIndex &idx) { tree->edit(idx); });
-    d->m_environmentView = tree;
+    d->m_environmentView = new Utils::TreeView(this);
     d->m_environmentView->setModel(d->m_model);
     d->m_environmentView->setMinimumHeight(400);
     d->m_environmentView->setRootIsDecorated(false);
@@ -240,6 +237,7 @@ EnvironmentWidget::EnvironmentWidget(QWidget *parent, Type type, QWidget *additi
     buttonLayout->addWidget(d->m_toggleButton);
     connect(d->m_toggleButton, &QPushButton::clicked, this, [this] {
         d->m_model->toggleVariable(d->m_environmentView->currentIndex());
+        d->m_editor.setEnvironmentItems(d->m_model->userChanges());
         updateButtons();
     });
 
@@ -335,6 +333,7 @@ void EnvironmentWidget::setBaseEnvironmentText(const QString &text)
 
 Utils::EnvironmentItems EnvironmentWidget::userChanges() const
 {
+    forceUpdateCheck();
     return d->m_model->userChanges();
 }
 
@@ -355,6 +354,11 @@ void EnvironmentWidget::expand()
     d->m_detailsContainer->setState(Utils::DetailsWidget::Expanded);
 }
 
+void EnvironmentWidget::forceUpdateCheck() const
+{
+    d->m_editor.forceUpdateCheck();
+}
+
 void EnvironmentWidget::updateSummaryText()
 {
     // The summary is redundant with the text edit, so we hide it on expansion.
@@ -363,7 +367,10 @@ void EnvironmentWidget::updateSummaryText()
         return;
     }
 
-    Utils::EnvironmentItems list = d->m_model->userChanges();
+    Utils::EnvironmentItems list
+            = Utils::filtered(d->m_model->userChanges(), [](const EnvironmentItem &it) {
+        return it.operation != Utils::EnvironmentItem::Comment;
+    });
     Utils::EnvironmentItem::sort(&list);
 
     QString text;
@@ -387,6 +394,8 @@ void EnvironmentWidget::updateSummaryText()
             case Utils::EnvironmentItem::SetDisabled:
                 text.append(Tr::tr("Set <a href=\"%1\"><b>%1</b></a> to <b>%2</b> [disabled]").arg(item.name.toHtmlEscaped(), item.value.toHtmlEscaped()));
                 break;
+            case Utils::EnvironmentItem::Comment:
+                break;
             }
         }
     }
diff --git a/src/plugins/projectexplorer/environmentwidget.h b/src/plugins/projectexplorer/environmentwidget.h
index b1a26b036b3..f204ae978f0 100644
--- a/src/plugins/projectexplorer/environmentwidget.h
+++ b/src/plugins/projectexplorer/environmentwidget.h
@@ -38,6 +38,8 @@ public:
 
     void expand();
 
+    void forceUpdateCheck() const;
+
 signals:
     void userChangesChanged();
     void detailsVisibleChanged(bool visible);
diff --git a/src/plugins/projectexplorer/extracompiler.cpp b/src/plugins/projectexplorer/extracompiler.cpp
index 0d281297339..b7568d4275c 100644
--- a/src/plugins/projectexplorer/extracompiler.cpp
+++ b/src/plugins/projectexplorer/extracompiler.cpp
@@ -11,8 +11,6 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/idocument.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <solutions/tasking/tasktreerunner.h>
 
 #include <utils/async.h>
@@ -301,8 +299,7 @@ void ExtraCompiler::setContent(const FilePath &file, const QByteArray &contents)
     }
 }
 
-ExtraCompilerFactory::ExtraCompilerFactory(QObject *parent)
-    : QObject(parent)
+ExtraCompilerFactory::ExtraCompilerFactory()
 {
     factories->append(this);
 }
@@ -327,7 +324,6 @@ GroupItem ProcessExtraCompiler::taskItemImpl(const ContentProvider &provider)
     const auto onSetup = [this, provider](Async<FileNameToContentsHash> &async) {
         async.setThreadPool(extraCompilerThreadPool());
         // The passed synchronizer has cancelOnWait set to true by default.
-        async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
         async.setConcurrentCallData(&ProcessExtraCompiler::runInThread, this, command(),
                                     workingDirectory(), arguments(), provider, buildEnvironment());
     };
@@ -383,7 +379,7 @@ void ProcessExtraCompiler::runInThread(QPromise<FileNameToContentsHash> &promise
     process.setEnvironment(env);
     if (!workDir.isEmpty())
         process.setWorkingDirectory(workDir);
-    process.setCommand({ cmd, args });
+    process.setCommand({cmd, args});
     process.setWriteData(sourceContents);
     process.start();
     if (!process.waitForStarted())
diff --git a/src/plugins/projectexplorer/extracompiler.h b/src/plugins/projectexplorer/extracompiler.h
index 82bd9070f25..a8045d25b1e 100644
--- a/src/plugins/projectexplorer/extracompiler.h
+++ b/src/plugins/projectexplorer/extracompiler.h
@@ -108,12 +108,11 @@ private:
                      const Utils::Environment &env);
 };
 
-class PROJECTEXPLORER_EXPORT ExtraCompilerFactory : public QObject
+class PROJECTEXPLORER_EXPORT ExtraCompilerFactory
 {
-    Q_OBJECT
 public:
-    explicit ExtraCompilerFactory(QObject *parent = nullptr);
-    ~ExtraCompilerFactory() override;
+    ExtraCompilerFactory();
+    virtual ~ExtraCompilerFactory();
 
     virtual FileType sourceType() const = 0;
     virtual QString sourceTag() const = 0;
diff --git a/src/plugins/projectexplorer/filesinallprojectsfind.cpp b/src/plugins/projectexplorer/filesinallprojectsfind.cpp
index f3554f18a9e..62ac4e48392 100644
--- a/src/plugins/projectexplorer/filesinallprojectsfind.cpp
+++ b/src/plugins/projectexplorer/filesinallprojectsfind.cpp
@@ -29,22 +29,25 @@ QString FilesInAllProjectsFind::displayName() const
 }
 
 const char kSettingsKey[] = "FilesInAllProjectDirectories";
+const char kDefaultInclusion[]
+    = "CMakeLists.txt,*.cmake,*.pro,*.pri,*.qbs,*.cpp,*.h,*.mm,*.qml,*.md,*.txt,*.qdoc";
+const char kDefaultExclusion[] = "*/.git/*,*/.cvs/*,*/.svn/*,*.autosave,*/build/*";
 
-void FilesInAllProjectsFind::writeSettings(QtcSettings *settings)
+Store FilesInAllProjectsFind::save() const
 {
-    settings->beginGroup(kSettingsKey);
-    writeCommonSettings(settings);
-    settings->endGroup();
+    Store s;
+    writeCommonSettings(s, kDefaultInclusion, kDefaultExclusion);
+    return s;
 }
 
-void FilesInAllProjectsFind::readSettings(QtcSettings *settings)
+void FilesInAllProjectsFind::restore(const Utils::Store &s)
 {
-    settings->beginGroup(kSettingsKey);
-    readCommonSettings(
-        settings,
-        "CMakeLists.txt,*.cmake,*.pro,*.pri,*.qbs,*.cpp,*.h,*.mm,*.qml,*.md,*.txt,*.qdoc",
-        "*/.git/*,*/.cvs/*,*/.svn/*,*.autosave");
-    settings->endGroup();
+    readCommonSettings(s, kDefaultInclusion, kDefaultExclusion);
+}
+
+QByteArray FilesInAllProjectsFind::settingsKey() const
+{
+    return kSettingsKey;
 }
 
 FileContainerProvider FilesInAllProjectsFind::fileContainerProvider() const
diff --git a/src/plugins/projectexplorer/filesinallprojectsfind.h b/src/plugins/projectexplorer/filesinallprojectsfind.h
index f96d2a6df9a..39d8e2c0ed6 100644
--- a/src/plugins/projectexplorer/filesinallprojectsfind.h
+++ b/src/plugins/projectexplorer/filesinallprojectsfind.h
@@ -16,8 +16,11 @@ public:
     QString id() const override;
     QString displayName() const override;
 
-    void writeSettings(Utils::QtcSettings *settings) override;
-    void readSettings(Utils::QtcSettings *settings) override;
+    Utils::Store save() const override;
+    void restore(const Utils::Store &s) override;
+
+    // deprecated
+    QByteArray settingsKey() const override;
 
 protected:
     TextEditor::FileContainerProvider fileContainerProvider() const override;
diff --git a/src/plugins/projectexplorer/gccparser.cpp b/src/plugins/projectexplorer/gccparser.cpp
index 4d21d4b8d91..3a43e8ebe99 100644
--- a/src/plugins/projectexplorer/gccparser.cpp
+++ b/src/plugins/projectexplorer/gccparser.cpp
@@ -8,37 +8,123 @@
 
 #include <utils/qtcassert.h>
 
-#include <numeric>
+#include <QLoggingCategory>
+
+#include <optional>
 
 using namespace Utils;
 
 namespace ProjectExplorer {
 
-// opt. drive letter + filename: (2 brackets)
-static const char FILE_PATTERN[] = "(<command[ -]line>|([A-Za-z]:)?[^:]+):";
+static Q_LOGGING_CATEGORY(gccParserLog, "qtc.gccparser", QtWarningMsg)
+
+static const QString &filePattern()
+{
+    static const QString pattern = [] {
+        const QString pseudoFile = "<command[ -]line>";
+        const QString driveSpec = "[A-Za-z]:";
+        const QString realFile = QString::fromLatin1("(?:%1)?[^:]+").arg(driveSpec);
+        return QString::fromLatin1("(?<file>%1|%2):").arg(pseudoFile, realFile);
+    }();
+    return pattern;
+}
+
 static const char COMMAND_PATTERN[] = "^(.*?[\\\\/])?([a-z0-9]+-[a-z0-9]+-[a-z0-9]+-)?(gcc|g\\+\\+)(-[0-9.]+)?(\\.exe)?: ";
 
+namespace {
+class MainRegEx
+{
+public:
+    struct Data {
+        QString rawFilePath;
+        QString description;
+        Task::TaskType type = Task::Unknown;
+        int line = -1;
+        int column = -1;
+        int fileOffset = -1;
+    };
+
+    static std::optional<Data> parse(const QString &line)
+    {
+        qCDebug(gccParserLog) << "checking regex" << theRegEx().pattern();
+        const QRegularExpressionMatch match = theRegEx().match(line);
+        if (!match.hasMatch())
+            return {};
+
+        // Quick plausability test: If there's no slashes or dots, it's probably not a file.
+        const QString possibleFile = match.captured("file");
+        if (!possibleFile.contains('/') && !possibleFile.contains("'\\")
+            && !possibleFile.contains('.')) {
+            return {};
+        }
+
+        // Defer to the LdParser for some file types
+        if (possibleFile.endsWith(".o") || possibleFile.endsWith(".a")
+            || possibleFile.endsWith("dll") || possibleFile.contains(".so")
+            || possibleFile.endsWith("ld") || possibleFile.endsWith("ranlib")) {
+            return {};
+        }
+
+        Data data;
+        data.rawFilePath = possibleFile;
+        data.fileOffset = match.capturedStart("file");
+        data.line = match.captured("line").toInt();
+        data.column = match.captured("column").toInt();
+        data.description = match.captured("description");
+        if (match.captured("type") == QLatin1String("warning")) {
+            data.type = Task::Warning;
+        } else if (match.captured("type") == QLatin1String("error") ||
+                   data.description.startsWith(QLatin1String("undefined reference to")) ||
+                   data.description.startsWith(QLatin1String("multiple definition of"))) {
+            data.type = Task::Error;
+        }
+
+        // Prepend "#warning" or "#error" if that triggered the match on (warning|error)
+        // We want those to show how the warning was triggered
+        if (match.captured("fullTypeString").startsWith(QLatin1Char('#')))
+            data.description.prepend(match.captured("fullTypeString"));
+
+        return data;
+    }
+
+private:
+    static const QRegularExpression &theRegEx()
+    {
+        static const QRegularExpression re = [] {
+            const QRegularExpression re(constructPattern());
+            QTC_CHECK(re.isValid());
+            return re;
+        }();
+        return re;
+    }
+
+    static QString constructPattern()
+    {
+        const QString type = "(?<type>warning|error|note)";
+        const QString typePrefix = "(?:fatal |#)";
+        const QString fullTypeString
+            = QString::fromLatin1("(?<fullTypeString>%1?%2:?\\s)").arg(typePrefix, type);
+        const QString optionalLineAndColumn = "(?:(?:(?<line>\\d+)(?::(?<column>\\d+))?):)?";
+        const QString binaryLocation = "\\(.*\\)"; // E.g. "(.text+0x40)"
+        const QString fullLocation = QString::fromLatin1("%1(?:%2|%3)")
+                                         .arg(filePattern(), optionalLineAndColumn, binaryLocation);
+        const QString description = "(?<description>[^\\s].+)";
+
+        return QString::fromLatin1("^%1\\s+%2?%3$").arg(fullLocation, fullTypeString, description);
+    }
+};
+} // namespace
+
 GccParser::GccParser()
 {
     setObjectName(QLatin1String("GCCParser"));
-    m_regExp.setPattern(QLatin1Char('^') + QLatin1String(FILE_PATTERN)
-                        + QLatin1String("(?:(?:(\\d+):(?:(\\d+):)?)|\\(.*\\):)\\s+((fatal |#)?(warning|error|note):?\\s)?([^\\s].+)$"));
-    QTC_CHECK(m_regExp.isValid());
 
-    m_regExpScope.setPattern(QLatin1Char('^') + FILE_PATTERN
-                                    + "(?:(\\d+):)?(\\d+:)?\\s+((?:In .*(?:function|constructor) .*|At global scope|At top level):)$");
-    QTC_CHECK(m_regExpScope.isValid());
-
-    m_regExpIncluded.setPattern(QString::fromLatin1("\\bfrom\\s") + QLatin1String(FILE_PATTERN)
+    m_regExpIncluded.setPattern(QString::fromLatin1("\\bfrom\\s") + filePattern()
                                 + QLatin1String("(\\d+)(:\\d+)?[,:]?$"));
     QTC_CHECK(m_regExpIncluded.isValid());
 
-    m_regExpInlined.setPattern(QString::fromLatin1("\\binlined from\\s.* at ")
-                               + FILE_PATTERN + "(\\d+)(:\\d+)?[,:]?$");
-    QTC_CHECK(m_regExpInlined.isValid());
-
     m_regExpCc1plus.setPattern(QLatin1Char('^') + "cc1plus.*(error|warning): ((?:"
-                               + FILE_PATTERN + " No such file or directory)?.*)");
+                               + filePattern() + " No such file or directory)?.*)");
     QTC_CHECK(m_regExpCc1plus.isValid());
 
     // optional path with trailing slash
@@ -60,82 +146,36 @@ QList<OutputLineParser *> GccParser::gccParserSuite()
     return {new GccParser, new Internal::LldParser, new LdParser};
 }
 
-void GccParser::createOrAmendTask(
-        Task::TaskType type,
-        const QString &description,
-        const QString &originalLine,
-        bool forceAmend,
-        const FilePath &file,
-        int line,
-        int column,
-        const LinkSpecs &linkSpecs
-        )
+void GccParser::gccCreateOrAmendTask(
+    Task::TaskType type,
+    const QString &description,
+    const QString &originalLine,
+    bool forceAmend,
+    const Utils::FilePath &file,
+    int line,
+    int column,
+    const LinkSpecs &linkSpecs)
 {
-    const bool amend = !m_currentTask.isNull() && (forceAmend || isContinuation(originalLine));
-    if (!amend) {
-        flush();
-        m_currentTask = CompileTask(type, description, file, line, column);
-        m_currentTask.details.append(originalLine);
-        m_linkSpecs = linkSpecs;
-        m_lines = 1;
-        return;
-    }
-
-    LinkSpecs adaptedLinkSpecs = linkSpecs;
-    const int offset = std::accumulate(m_currentTask.details.cbegin(), m_currentTask.details.cend(),
-            0, [](int total, const QString &line) { return total + line.length() + 1;});
-    for (LinkSpec &ls : adaptedLinkSpecs)
-        ls.startPos += offset;
-    m_linkSpecs << adaptedLinkSpecs;
-    m_currentTask.details.append(originalLine);
-
-    // Check whether the new line is more relevant than the previous ones.
-    if ((m_currentTask.type != Task::Error && type == Task::Error)
-            || (m_currentTask.type == Task::Unknown && type != Task::Unknown)) {
-        m_currentTask.type = type;
-        m_currentTask.summary = description;
-        if (!file.isEmpty() && !m_requiredFromHereFound) {
-            m_currentTask.setFile(file);
-            m_currentTask.line = line;
-            m_currentTask.column = column;
-        }
-    }
+    createOrAmendTask(type, description, originalLine, forceAmend, file, line, column, linkSpecs);
 
     // If a "required from here" line is present, it is almost always the cause of the problem,
     // so that's where we should go when the issue is double-clicked.
     if ((originalLine.endsWith("required from here") || originalLine.endsWith("requested here")
-         || originalLine.endsWith("note: here")) && !file.isEmpty() && line > 0) {
-        m_requiredFromHereFound = true;
-        m_currentTask.setFile(file);
-        m_currentTask.line = line;
-        m_currentTask.column = column;
+         || originalLine.endsWith("note: here"))
+        && !file.isEmpty() && line > 0) {
+        fixTargetLink();
+        currentTask().setFile(file);
+        currentTask().line = line;
+        currentTask().column = column;
     }
-
-    ++m_lines;
-}
-
-void GccParser::flush()
-{
-    if (m_currentTask.isNull())
-        return;
-
-    // If there is only one line of details, then it is the line that we generated
-    // the summary from. Remove it, because it does not add any information.
-    if (m_currentTask.details.count() == 1)
-        m_currentTask.details.clear();
-
-    setDetailsFormat(m_currentTask, m_linkSpecs);
-    Task t = m_currentTask;
-    m_currentTask.clear();
-    m_linkSpecs.clear();
-    scheduleTask(t, m_lines, 1);
-    m_lines = 0;
-    m_requiredFromHereFound = false;
 }
 
 OutputLineParser::Result GccParser::handleLine(const QString &line, OutputFormat type)
 {
+    qCDebug(gccParserLog) << "incoming line" << line;
+
     if (type == StdOutFormat) {
+        qCDebug(gccParserLog) << "not parsing stdout";
         flush();
         return Status::NotHandled;
     }
@@ -143,109 +183,95 @@ OutputLineParser::Result GccParser::handleLine(const QString &line, OutputFormat
     const QString lne = rightTrimmed(line);
 
     // Blacklist some lines to not handle them:
-    if (lne.startsWith(QLatin1String("TeamBuilder ")) ||
-        lne.startsWith(QLatin1String("distcc["))) {
+    if (lne.startsWith(QLatin1String("TeamBuilder "))
+        || lne.startsWith(QLatin1String("distcc["))
+        || lne.contains("undefined reference")
+        || lne.contains("undefined symbol")
+        || lne.contains("duplicate symbol")
+        || lne.contains("multiple definition")
+        || lne.contains("ar: creating")) {
         return Status::NotHandled;
     }
 
     // Handle misc issues:
     if (lne.startsWith(QLatin1String("ERROR:")) || lne == QLatin1String("* cpp failed")) {
-        createOrAmendTask(Task::Error, lne, lne);
+        gccCreateOrAmendTask(Task::Error, lne, lne);
         return Status::InProgress;
     }
 
+    qCDebug(gccParserLog) << "checking regex" << m_regExpGccNames.pattern();
     QRegularExpressionMatch match = m_regExpGccNames.match(lne);
     if (match.hasMatch()) {
         QString description = lne.mid(match.capturedLength());
         Task::TaskType type = Task::Error;
         if (description.startsWith(QLatin1String("warning: "))) {
             type = Task::Warning;
-            description = description.mid(9);
+            description = description.mid(8);
         } else if (description.startsWith(QLatin1String("fatal: ")))  {
-            description = description.mid(7);
+            description = description.mid(6);
         }
-        createOrAmendTask(type, description, lne);
+        gccCreateOrAmendTask(type, description, lne);
         return Status::InProgress;
     }
 
+    qCDebug(gccParserLog) << "checking regex" << m_regExpIncluded.pattern();
     match = m_regExpIncluded.match(lne);
-    if (!match.hasMatch())
-        match = m_regExpInlined.match(lne);
     if (match.hasMatch()) {
-        const FilePath filePath = absoluteFilePath(FilePath::fromUserInput(match.captured(1)));
-        const int lineNo = match.captured(3).toInt();
-        const int column = match.captured(4).toInt();
+        const FilePath filePath = absoluteFilePath(FilePath::fromUserInput(match.captured("file")));
+        const int lineNo = match.captured(2).toInt();
+        const int column = match.captured(3).toInt();
         LinkSpecs linkSpecs;
-        addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, lineNo, match, 1);
-        createOrAmendTask(Task::Unknown, lne.trimmed(), lne, false, filePath, lineNo, column, linkSpecs);
+        addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, lineNo, column, match, "file");
+        gccCreateOrAmendTask(
+            Task::Unknown, lne.trimmed(), lne, false, filePath, lineNo, column, linkSpecs);
         return {Status::InProgress, linkSpecs};
     }
 
+    qCDebug(gccParserLog) << "checking regex" << m_regExpCc1plus.pattern();
     match = m_regExpCc1plus.match(lne);
     if (match.hasMatch()) {
         const Task::TaskType type = match.captured(1) == "error" ? Task::Error : Task::Warning;
         const FilePath filePath = absoluteFilePath(FilePath::fromUserInput(match.captured(3)));
         LinkSpecs linkSpecs;
         if (!filePath.isEmpty())
-            addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, -1, match, 3);
-        createOrAmendTask(type, match.captured(2), lne, false, filePath, -1, 0, linkSpecs);
-        flush();
+            addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, -1, -1, match, 3);
+        gccCreateOrAmendTask(type, match.captured(2), lne, false, filePath, -1, 0, linkSpecs);
         return {Status::Done, linkSpecs};
     }
 
-    match = m_regExp.match(lne);
-    if (match.hasMatch()) {
-        int lineno = match.captured(3).toInt();
-        int column = match.captured(4).toInt();
-        Task::TaskType type = Task::Unknown;
-        QString description = match.captured(8);
-        if (match.captured(7) == QLatin1String("warning"))
-            type = Task::Warning;
-        else if (match.captured(7) == QLatin1String("error") ||
-                 description.startsWith(QLatin1String("undefined reference to")) ||
-                 description.startsWith(QLatin1String("multiple definition of")))
-            type = Task::Error;
-        // Prepend "#warning" or "#error" if that triggered the match on (warning|error)
-        // We want those to show how the warning was triggered
-        if (match.captured(5).startsWith(QLatin1Char('#')))
-            description = match.captured(5) + description;
-
-        const FilePath filePath = absoluteFilePath(FilePath::fromUserInput(match.captured(1)));
+    if (const auto data = MainRegEx::parse(lne)) {
+        const FilePath filePath = absoluteFilePath(FilePath::fromUserInput(data->rawFilePath));
         LinkSpecs linkSpecs;
-        addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, lineno, match, 1);
-        createOrAmendTask(type, description, lne, false, filePath, lineno, column, linkSpecs);
+        addLinkSpecForAbsoluteFilePath(
+            linkSpecs,
+            filePath,
+            data->line,
+            data->column,
+            data->fileOffset,
+            data->rawFilePath.size());
+        gccCreateOrAmendTask(
+            data->type, data->description, lne, false, filePath, data->line, data->column, linkSpecs);
         return {Status::InProgress, linkSpecs};
     }
 
-    match = m_regExpScope.match(lne);
-    if (match.hasMatch()) {
-        const int lineno = match.captured(3).toInt();
-        const int column = match.captured(4).toInt();
-        const QString description = match.captured(5);
-        const FilePath filePath = absoluteFilePath(FilePath::fromUserInput(match.captured(1)));
-        LinkSpecs linkSpecs;
-        addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, lineno, match, 1);
-        createOrAmendTask(Task::Unknown, description, lne, false, filePath, lineno, column, linkSpecs);
-        return {Status::InProgress, linkSpecs};
-    }
-
-    if ((lne.startsWith(' ') && !m_currentTask.isNull()) || isContinuation(lne)) {
-        createOrAmendTask(Task::Unknown, lne, lne, true);
+    if ((lne.startsWith(' ') && !currentTask().isNull()) || isContinuation(lne)) {
+        gccCreateOrAmendTask(Task::Unknown, lne, lne, true);
         return Status::InProgress;
     }
 
+    qCDebug(gccParserLog) << "no match";
     flush();
     return Status::NotHandled;
 }
 
 bool GccParser::isContinuation(const QString &newLine) const
 {
-    return !m_currentTask.isNull()
-            && (m_currentTask.details.last().endsWith(':')
-                || m_currentTask.details.last().endsWith(',')
-                || m_currentTask.details.last().contains(" required from ")
-                || newLine.contains("within this context")
-                || newLine.contains("note:"));
+    return !currentTask().isNull()
+           && (currentTask().details.last().endsWith(':')
+               || currentTask().details.last().endsWith(',')
+               || currentTask().details.last().contains(" required from ")
+               || newLine.contains("within this context")
+               || newLine.contains("note:"));
 }
 
 } // ProjectExplorer
@@ -322,9 +348,9 @@ void ProjectExplorerTest::testGccOutputParsers_data()
                                9, 0,
                                QVector<QTextLayout::FormatRange>()
                                    << formatRange(46, 0)
-                                   << formatRange(46, 29, "olpfile:///temp/test/untitled8/main.cpp::0::-1")
+                                   << formatRange(46, 29, "olpfile:///temp/test/untitled8/main.cpp::0::0")
                                    << formatRange(75, 39)
-                                   << formatRange(114, 29, "olpfile:///temp/test/untitled8/main.cpp::9::-1")
+                                   << formatRange(114, 29, "olpfile:///temp/test/untitled8/main.cpp::9::0")
                                    << formatRange(143, 56))
                 << CompileTask(Task::Error,
                                "(Each undeclared identifier is reported only once for each function it appears in.)",
@@ -410,8 +436,7 @@ void ProjectExplorerTest::testGccOutputParsers_data()
                                FilePath::fromUserInput("C:\\temp\\test\\untitled8/main.cpp"),
                                8, 0,
                                formatRanges)
-                << CompileTask(Task::Error,
-                               "collect2: ld returned 1 exit status"))
+                << CompileTask(Task::Error, "collect2: ld returned 1 exit status"))
             << QString();
 
     formatRanges.clear();
@@ -436,8 +461,7 @@ void ProjectExplorerTest::testGccOutputParsers_data()
                                FilePath::fromUserInput("C:\\temp\\test\\untitled8/main.cpp"),
                                -1, 0,
                                formatRanges)
-                << CompileTask(Task::Error,
-                               "collect2: ld returned 1 exit status"))
+                << CompileTask(Task::Error, "collect2: ld returned 1 exit status"))
             << QString();
 
     QTest::newRow("linker: dll format not recognized")
@@ -495,9 +519,9 @@ void ProjectExplorerTest::testGccOutputParsers_data()
                                264, 0,
                                QVector<QTextLayout::FormatRange>()
                                    << formatRange(45, 0)
-                                   << formatRange(45, 68, "olpfile:///home/code/src/creator/src/plugins/projectexplorer/gnumakeparser.cpp::0::-1")
+                                   << formatRange(45, 68, "olpfile:///home/code/src/creator/src/plugins/projectexplorer/gnumakeparser.cpp::0::0")
                                    << formatRange(113, 106)
-                                   << formatRange(219, 68, "olpfile:///home/code/src/creator/src/plugins/projectexplorer/gnumakeparser.cpp::264::-1")
+                                   << formatRange(219, 68, "olpfile:///home/code/src/creator/src/plugins/projectexplorer/gnumakeparser.cpp::264::0")
                                    << formatRange(287, 57))
                 << CompileTask(Task::Error,
                                "expected ';' before ':' token",
@@ -564,9 +588,9 @@ void ProjectExplorerTest::testGccOutputParsers_data()
                                 194, 0,
                                 QVector<QTextLayout::FormatRange>()
                                     << formatRange(50, 0)
-                                    << formatRange(50, 67, "olpfile:///Qt/4.6.2-Symbian/s60sdk/epoc32/include/stdapis/stlport/stl/_tree.c::0::-1")
+                                    << formatRange(50, 67, "olpfile:///Qt/4.6.2-Symbian/s60sdk/epoc32/include/stdapis/stlport/stl/_tree.c::0::0")
                                     << formatRange(117, 216)
-                                    << formatRange(333, 67, "olpfile:///Qt/4.6.2-Symbian/s60sdk/epoc32/include/stdapis/stlport/stl/_tree.c::194::-1")
+                                    << formatRange(333, 67, "olpfile:///Qt/4.6.2-Symbian/s60sdk/epoc32/include/stdapis/stlport/stl/_tree.c::194::0")
                                     << formatRange(400, 64)))
             << QString();
 
@@ -803,9 +827,9 @@ void ProjectExplorerTest::testGccOutputParsers_data()
                       1134, 26,
                       QVector<QTextLayout::FormatRange>()
                           << formatRange(26, 22)
-                          << formatRange(48, 39, "olpfile:///Symbian/SDK/EPOC32/INCLUDE/GCCE/GCCE.h::15::-1")
+                          << formatRange(48, 39, "olpfile:///Symbian/SDK/EPOC32/INCLUDE/GCCE/GCCE.h::15::0")
                           << formatRange(87, 46)
-                          << formatRange(133, 50, "olpfile:///Symbian/SDK/epoc32/include/variant/Symbian_OS.hrh::1134::-1")
+                          << formatRange(133, 50, "olpfile:///Symbian/SDK/epoc32/include/variant/Symbian_OS.hrh::1134::26")
                           << formatRange(183, 44))}
             << QString();
 
@@ -910,7 +934,7 @@ void ProjectExplorerTest::testGccOutputParsers_data()
                    14, 25,
                    QVector<QTextLayout::FormatRange>()
                        << formatRange(41, 22)
-                       << formatRange(63, 67, "olpfile:///home/code/src/creator/src/libs/extensionsystem/pluginerrorview.cpp::31::-1")
+                       << formatRange(63, 67, "olpfile:///home/code/src/creator/src/libs/extensionsystem/pluginerrorview.cpp::31::0")
                        << formatRange(130, 146))}
             << QString();
 
@@ -934,11 +958,11 @@ void ProjectExplorerTest::testGccOutputParsers_data()
                    597, 5,
                    QVector<QTextLayout::FormatRange>()
                        << formatRange(43, 22)
-                       << formatRange(65, 31, "olpfile:///usr/include/qt4/QtCore/QString::1::-1")
+                       << formatRange(65, 31, "olpfile:///usr/include/qt4/QtCore/QString::1::0")
                        << formatRange(96, 40)
-                       << formatRange(136, 33, "olpfile:///usr/include/qt4/QtCore/qstring.h::0::-1")
+                       << formatRange(136, 33, "olpfile:///usr/include/qt4/QtCore/qstring.h::0::0")
                        << formatRange(169, 28)
-                       << formatRange(197, 33, "olpfile:///usr/include/qt4/QtCore/qstring.h::597::-1")
+                       << formatRange(197, 33, "olpfile:///usr/include/qt4/QtCore/qstring.h::597::5")
                        << formatRange(230, 99))}
             << QString();
 
@@ -960,7 +984,7 @@ void ProjectExplorerTest::testGccOutputParsers_data()
                                    << formatRange(31, 28)
                                    << formatRange(59, 23, "olpfile:///home/user/test/foo.cpp::2::-1")
                                    << formatRange(82, 34))
-                << CompileTask(Task::Unknown,
+                << CompileTask(Task::Error,
                                "first defined here",
                                FilePath::fromUserInput("/home/user/test/bar.cpp"),
                                4)
@@ -978,7 +1002,7 @@ void ProjectExplorerTest::testGccOutputParsers_data()
                 << CompileTask(Task::Error,
                                "multiple definition of `foo'",
                                FilePath::fromUserInput("foo.o"), -1)
-                << CompileTask(Task::Unknown,
+                << CompileTask(Task::Error,
                                "first defined here",
                                FilePath::fromUserInput("bar.o"), -1)
                 << CompileTask(Task::Error,
@@ -993,10 +1017,11 @@ void ProjectExplorerTest::testGccOutputParsers_data()
             << OutputParserTester::STDERR
             << QString() << QString()
             << Tasks({CompileTask(Task::Error,
-                                     "Undefined symbols for architecture x86_64:\n"
-                                  "  \"SvgLayoutTest()\", referenced from:\n"
-                                  "      _main in main.cpp.o",
-                                  "main.cpp.o")})
+                              "Undefined symbols for architecture x86_64:\n"
+                              "Undefined symbols for architecture x86_64:\n"
+                              "  \"SvgLayoutTest()\", referenced from:\n"
+                              "      _main in main.cpp.o",
+                              "main.cpp.o")})
             << QString();
 
     QTest::newRow("ld: undefined member function reference")
@@ -1213,17 +1238,17 @@ void ProjectExplorerTest::testGccOutputParsers_data()
                                  273, 25,
                                  QVector<QTextLayout::FormatRange>()
                                      << formatRange(140, 22)
-                                     << formatRange(162, 32, "olpfile:///usr/include/qt/QtCore/qlocale.h::43::-1")
+                                     << formatRange(162, 32, "olpfile:///usr/include/qt/QtCore/qlocale.h::43::0")
                                      << formatRange(194, 27)
-                                     << formatRange(221, 36, "olpfile:///usr/include/qt/QtCore/qtextstream.h::46::-1")
+                                     << formatRange(221, 36, "olpfile:///usr/include/qt/QtCore/qtextstream.h::46::0")
                                      << formatRange(257, 27)
-                                     << formatRange(284, 38, "olpfile:///qtc/src/shared/proparser/proitems.cpp::31::-1")
+                                     << formatRange(284, 38, "olpfile:///qtc/src/shared/proparser/proitems.cpp::31::0")
                                      << formatRange(322, 5)
-                                     << formatRange(327, 33, "olpfile:///usr/include/qt/QtCore/qvariant.h::0::-1")
+                                     << formatRange(327, 33, "olpfile:///usr/include/qt/QtCore/qvariant.h::0::0")
                                      << formatRange(360, 51)
-                                     << formatRange(411, 33, "olpfile:///usr/include/qt/QtCore/qvariant.h::273::-1")
+                                     << formatRange(411, 33, "olpfile:///usr/include/qt/QtCore/qvariant.h::273::25")
                                      << formatRange(444, 229)
-                                     << formatRange(673, 33, "olpfile:///usr/include/qt/QtCore/qvariant.h::399::-1")
+                                     << formatRange(673, 33, "olpfile:///usr/include/qt/QtCore/qvariant.h::399::16")
                                      << formatRange(706, 221)),
                      compileTask(Task::Error,
                                  "no match for ‘operator+’ (operand types are ‘boxed_value<double>’ and ‘boxed_value<double>’)\n"
@@ -1435,6 +1460,37 @@ void ProjectExplorerTest::testGccOutputParsers_data()
             << Tasks{CompileTask(Task::Error, "blubb", "/home/tim/path/to/sources/and/more.h",
                                  15, 22)}
             << QString();
+
+    QTest::newRow("no line number")
+        << QString::fromUtf8("In file included from /data/dev/creator/src/libs/utils/aspects.cpp:12:\n"
+                             "/data/dev/creator/src/libs/utils/layoutbuilder.h: In instantiation of ‘Layouting::BuilderItem<X, XInterface>::I::I(const Inner&) [with Inner = Utils::BaseAspect; X = Layouting::Row; XInterface = Layouting::LayoutInterface]’:\n"
+                             "/data/dev/creator/src/libs/utils/aspects.cpp:3454:13:   required from here\n"
+                             "/data/dev/creator/src/libs/utils/layoutbuilder.h:79:51: error: use of deleted function ‘Utils::BaseAspect::BaseAspect(const Utils::BaseAspect&)’\n"
+                             "   79 |             apply = [p](XInterface *x) { doit_nest(x, p); };\n"
+                             "      |                                          ~~~~~~~~^~~~~")
+        << OutputParserTester::STDERR
+        << QString() << QString()
+        << (Tasks{compileTask(
+               Task::Error,
+               "use of deleted function ‘Utils::BaseAspect::BaseAspect(const Utils::BaseAspect&)’\n"
+               "In file included from /data/dev/creator/src/libs/utils/aspects.cpp:12:\n"
+               "/data/dev/creator/src/libs/utils/layoutbuilder.h: In instantiation of ‘Layouting::BuilderItem<X, XInterface>::I::I(const Inner&) [with Inner = Utils::BaseAspect; X = Layouting::Row; XInterface = Layouting::LayoutInterface]’:\n"
+               "/data/dev/creator/src/libs/utils/aspects.cpp:3454:13:   required from here\n"
+               "/data/dev/creator/src/libs/utils/layoutbuilder.h:79:51: error: use of deleted function ‘Utils::BaseAspect::BaseAspect(const Utils::BaseAspect&)’\n"
+               "   79 |             apply = [p](XInterface *x) { doit_nest(x, p); };\n"
+               "      |                                          ~~~~~~~~^~~~~",
+               FilePath::fromUserInput("/data/dev/creator/src/libs/utils/aspects.cpp"), 3454, 13,
+               QVector<QTextLayout::FormatRange>{
+                   formatRange(82, 22),
+                   formatRange(104, 44, "olpfile:///data/dev/creator/src/libs/utils/aspects.cpp::12::0"),
+                   formatRange(148, 5),
+                   formatRange(153, 48, "olpfile:///data/dev/creator/src/libs/utils/layoutbuilder.h::0::0"),
+                   formatRange(201, 177),
+                   formatRange(378, 44, "olpfile:///data/dev/creator/src/libs/utils/aspects.cpp::3454::13"),
+                   formatRange(422, 31),
+                   formatRange(453, 48, "olpfile:///data/dev/creator/src/libs/utils/layoutbuilder.h::79::51"),
+                   formatRange(501, 228)})})
+        << QString();
 }
 
 void ProjectExplorerTest::testGccOutputParsers()
diff --git a/src/plugins/projectexplorer/gccparser.h b/src/plugins/projectexplorer/gccparser.h
index f4fe67f1f3f..1c8431c412a 100644
--- a/src/plugins/projectexplorer/gccparser.h
+++ b/src/plugins/projectexplorer/gccparser.h
@@ -11,7 +11,7 @@
 
 namespace ProjectExplorer {
 
-class PROJECTEXPLORER_EXPORT GccParser : public ProjectExplorer::OutputTaskParser
+class PROJECTEXPLORER_EXPORT GccParser : public OutputTaskParser
 {
     Q_OBJECT
 
@@ -23,34 +23,24 @@ public:
     static QList<OutputLineParser *> gccParserSuite();
 
 protected:
-    void createOrAmendTask(
-            Task::TaskType type,
-            const QString &description,
-            const QString &originalLine,
-            bool forceAmend = false,
-            const Utils::FilePath &file = {},
-            int line = -1,
-            int column = 0,
-            const LinkSpecs &linkSpecs = {}
-            );
-    void flush() override;
+    void gccCreateOrAmendTask(
+        Task::TaskType type,
+        const QString &description,
+        const QString &originalLine,
+        bool forceAmend = false,
+        const Utils::FilePath &file = {},
+        int line = -1,
+        int column = 0,
+        const LinkSpecs &linkSpecs = {});
 
 private:
     Result handleLine(const QString &line, Utils::OutputFormat type) override;
 
-    bool isContinuation(const QString &newLine) const;
+    bool isContinuation(const QString &newLine) const override;
 
-    QRegularExpression m_regExp;
-    QRegularExpression m_regExpScope;
     QRegularExpression m_regExpIncluded;
-    QRegularExpression m_regExpInlined;
     QRegularExpression m_regExpGccNames;
     QRegularExpression m_regExpCc1plus;
-
-    Task m_currentTask;
-    LinkSpecs m_linkSpecs;
-    int m_lines = 0;
-    bool m_requiredFromHereFound = false;
 };
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index 28792276a61..fe42673a443 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -857,8 +857,11 @@ QStringList GccToolchain::suggestedMkspecList() const
         return {QString("linux-icc-%1").arg(targetAbi().wordWidth())};
 
     if (m_subType == MinGW) {
-        if (HostOsInfo::isWindowsHost())
+        if (HostOsInfo::isWindowsHost()) {
+            if (compilerCommand().fileName().contains("clang"))
+                return {"win32-clang-g++"};
             return {"win32-g++"};
+        }
         if (HostOsInfo::isLinuxHost()) {
             if (version().startsWith("4.6."))
                 return {"win32-g++-4.6-cross", "unsupported/win32-g++-4.6-cross"};
diff --git a/src/plugins/projectexplorer/gnumakeparser.cpp b/src/plugins/projectexplorer/gnumakeparser.cpp
index d31ce499700..015d030d180 100644
--- a/src/plugins/projectexplorer/gnumakeparser.cpp
+++ b/src/plugins/projectexplorer/gnumakeparser.cpp
@@ -103,7 +103,7 @@ OutputLineParser::Result GnuMakeParser::handleLine(const QString &line, OutputFo
         if (!m_suppressIssues) {
             const FilePath file = absoluteFilePath(FilePath::fromUserInput(match.captured(1)));
             const int lineNo = match.captured(4).toInt();
-            addLinkSpecForAbsoluteFilePath(linkSpecs, file, lineNo, match, 1);
+            addLinkSpecForAbsoluteFilePath(linkSpecs, file, lineNo, -1, match, 1);
             emitTask(BuildSystemTask(res.type, res.description, file, lineNo));
         }
         return {Status::Done, linkSpecs};
diff --git a/src/plugins/projectexplorer/images/build_hammer_mask.png b/src/plugins/projectexplorer/images/build_hammer_mask.png
new file mode 100644
index 00000000000..e75c3e15cff
Binary files /dev/null and b/src/plugins/projectexplorer/images/build_hammer_mask.png differ
diff --git a/src/plugins/projectexplorer/images/build_hammer_mask@2x.png b/src/plugins/projectexplorer/images/build_hammer_mask@2x.png
new file mode 100644
index 00000000000..78beee25a8b
Binary files /dev/null and b/src/plugins/projectexplorer/images/build_hammer_mask@2x.png differ
diff --git a/src/plugins/projectexplorer/images/build_hammerhandle_mask.png b/src/plugins/projectexplorer/images/build_hammerhandle_mask.png
deleted file mode 100644
index 15e318ac4ab..00000000000
Binary files a/src/plugins/projectexplorer/images/build_hammerhandle_mask.png and /dev/null differ
diff --git a/src/plugins/projectexplorer/images/build_hammerhandle_mask@2x.png b/src/plugins/projectexplorer/images/build_hammerhandle_mask@2x.png
deleted file mode 100644
index 8b2525dbf4e..00000000000
Binary files a/src/plugins/projectexplorer/images/build_hammerhandle_mask@2x.png and /dev/null differ
diff --git a/src/plugins/projectexplorer/images/build_hammerhead_mask.png b/src/plugins/projectexplorer/images/build_hammerhead_mask.png
deleted file mode 100644
index 98f11810b3c..00000000000
Binary files a/src/plugins/projectexplorer/images/build_hammerhead_mask.png and /dev/null differ
diff --git a/src/plugins/projectexplorer/images/build_hammerhead_mask@2x.png b/src/plugins/projectexplorer/images/build_hammerhead_mask@2x.png
deleted file mode 100644
index ec7ecd42b0f..00000000000
Binary files a/src/plugins/projectexplorer/images/build_hammerhead_mask@2x.png and /dev/null differ
diff --git a/src/plugins/projectexplorer/images/cancelbuild_overlay.png b/src/plugins/projectexplorer/images/cancelbuild_overlay.png
index a88ffbeb53c..d28c0682315 100644
Binary files a/src/plugins/projectexplorer/images/cancelbuild_overlay.png and b/src/plugins/projectexplorer/images/cancelbuild_overlay.png differ
diff --git a/src/plugins/projectexplorer/images/cancelbuild_overlay@2x.png b/src/plugins/projectexplorer/images/cancelbuild_overlay@2x.png
index ccc8be0eb99..8f10bf0af1b 100644
Binary files a/src/plugins/projectexplorer/images/cancelbuild_overlay@2x.png and b/src/plugins/projectexplorer/images/cancelbuild_overlay@2x.png differ
diff --git a/src/plugins/projectexplorer/images/debugger_beetle_mask.png b/src/plugins/projectexplorer/images/debugger_beetle_mask.png
index 816aacc3398..9d84f59a1ea 100644
Binary files a/src/plugins/projectexplorer/images/debugger_beetle_mask.png and b/src/plugins/projectexplorer/images/debugger_beetle_mask.png differ
diff --git a/src/plugins/projectexplorer/images/debugger_beetle_mask@2x.png b/src/plugins/projectexplorer/images/debugger_beetle_mask@2x.png
index c240532d29e..cb870c0b6c9 100644
Binary files a/src/plugins/projectexplorer/images/debugger_beetle_mask@2x.png and b/src/plugins/projectexplorer/images/debugger_beetle_mask@2x.png differ
diff --git a/src/plugins/projectexplorer/images/mode_project_mask.png b/src/plugins/projectexplorer/images/mode_project_mask.png
index 6e6092b7ad4..00ad8d56ef3 100644
Binary files a/src/plugins/projectexplorer/images/mode_project_mask.png and b/src/plugins/projectexplorer/images/mode_project_mask.png differ
diff --git a/src/plugins/projectexplorer/images/mode_project_mask@2x.png b/src/plugins/projectexplorer/images/mode_project_mask@2x.png
index 3538453911b..30a39506c44 100644
Binary files a/src/plugins/projectexplorer/images/mode_project_mask@2x.png and b/src/plugins/projectexplorer/images/mode_project_mask@2x.png differ
diff --git a/src/plugins/projectexplorer/images/run_mask.png b/src/plugins/projectexplorer/images/run_mask.png
index d08de1ad5f0..37d3802f388 100644
Binary files a/src/plugins/projectexplorer/images/run_mask.png and b/src/plugins/projectexplorer/images/run_mask.png differ
diff --git a/src/plugins/projectexplorer/images/run_mask@2x.png b/src/plugins/projectexplorer/images/run_mask@2x.png
index 72af48223ed..0be2cd1b3ad 100644
Binary files a/src/plugins/projectexplorer/images/run_mask@2x.png and b/src/plugins/projectexplorer/images/run_mask@2x.png differ
diff --git a/src/plugins/projectexplorer/ioutputparser.cpp b/src/plugins/projectexplorer/ioutputparser.cpp
index 5c646d0bcca..65fd3bea2b9 100644
--- a/src/plugins/projectexplorer/ioutputparser.cpp
+++ b/src/plugins/projectexplorer/ioutputparser.cpp
@@ -14,6 +14,7 @@
 
 #include <QPlainTextEdit>
 
+#include <numeric>
 
 /*!
     \class ProjectExplorer::OutputTaskParser
@@ -57,6 +58,10 @@ class OutputTaskParser::Private
 {
 public:
     QList<TaskInfo> scheduledTasks;
+    Task currentTask;
+    LinkSpecs linkSpecs;
+    int lineCount = 0;
+    bool targetLinkFixed = false;
 };
 
 OutputTaskParser::OutputTaskParser() : d(new Private) { }
@@ -95,6 +100,11 @@ void OutputTaskParser::setDetailsFormat(Task &task, const LinkSpecs &linkSpecs)
     }
 }
 
+void OutputTaskParser::fixTargetLink()
+{
+    d->targetLinkFixed = true;
+}
+
 void OutputTaskParser::runPostPrintActions(QPlainTextEdit *edit)
 {
     int offset = 0;
@@ -110,4 +120,91 @@ void OutputTaskParser::runPostPrintActions(QPlainTextEdit *edit)
     d->scheduledTasks.clear();
 }
 
+void OutputTaskParser::createOrAmendTask(
+    Task::TaskType type,
+    const QString &description,
+    const QString &originalLine,
+    bool forceAmend,
+    const Utils::FilePath &file,
+    int line,
+    int column,
+    const LinkSpecs &linkSpecs)
+{
+    const bool amend = !d->currentTask.isNull() && (forceAmend || isContinuation(originalLine));
+    if (!amend) {
+        flush();
+        d->currentTask = CompileTask(type, description, file, line, column);
+        d->currentTask.details.append(originalLine);
+        d->linkSpecs = linkSpecs;
+        d->lineCount = 1;
+        return;
+    }
+
+    LinkSpecs adaptedLinkSpecs = linkSpecs;
+    const int offset = std::accumulate(
+        d->currentTask.details.cbegin(),
+        d->currentTask.details.cend(),
+        0,
+        [](int total, const QString &line) { return total + line.length() + 1; });
+    for (LinkSpec &ls : adaptedLinkSpecs)
+        ls.startPos += offset;
+    d->linkSpecs << adaptedLinkSpecs;
+    d->currentTask.details.append(originalLine);
+
+    // Check whether the new line is more relevant than the previous ones.
+    if ((d->currentTask.type != Task::Error && type == Task::Error)
+        || (d->currentTask.type == Task::Unknown && type != Task::Unknown)) {
+        d->currentTask.type = type;
+        d->currentTask.summary = description;
+        if (!file.isEmpty() && !d->targetLinkFixed) {
+            d->currentTask.setFile(file);
+            d->currentTask.line = line;
+            d->currentTask.column = column;
+        }
+    }
+
+    ++d->lineCount;
+}
+
+void OutputTaskParser::setCurrentTask(const Task &task)
+{
+    flush();
+    d->currentTask = task;
+    d->lineCount = 1;
+}
+
+Task &OutputTaskParser::currentTask()
+{
+    return d->currentTask;
+}
+
+const Task &OutputTaskParser::currentTask() const
+{
+    return d->currentTask;
+}
+
+bool OutputTaskParser::isContinuation(const QString &line) const
+{
+    Q_UNUSED(line)
+    return false;
+}
+
+void OutputTaskParser::flush()
+{
+    if (d->currentTask.isNull())
+        return;
+
+    // If there is only one line of details, then it is the line that we generated
+    // the summary from. Remove it, because it does not add any information.
+    if (d->currentTask.details.count() == 1)
+        d->currentTask.details.clear();
+
+    setDetailsFormat(d->currentTask, d->linkSpecs);
+    Task t = d->currentTask;
+    d->currentTask.clear();
+    d->linkSpecs.clear();
+    scheduleTask(t, d->lineCount, 1);
+    d->lineCount = 0;
+    d->targetLinkFixed = false;
+}
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/ioutputparser.h b/src/plugins/projectexplorer/ioutputparser.h
index d15257bf6fe..de2ee9ebfca 100644
--- a/src/plugins/projectexplorer/ioutputparser.h
+++ b/src/plugins/projectexplorer/ioutputparser.h
@@ -8,8 +8,6 @@
 
 #include <utils/outputformatter.h>
 
-#include <functional>
-
 namespace ProjectExplorer {
 class Task;
 
@@ -31,10 +29,28 @@ public:
     const QList<TaskInfo> taskInfo() const;
 
 protected:
+    void flush() override;
+
     void scheduleTask(const Task &task, int outputLines, int skippedLines = 0);
     void setDetailsFormat(Task &task, const LinkSpecs &linkSpecs = {});
+    void fixTargetLink();
+    void createOrAmendTask(
+        Task::TaskType type,
+        const QString &description,
+        const QString &originalLine,
+        bool forceAmend = false,
+        const Utils::FilePath &file = {},
+        int line = -1,
+        int column = 0,
+        const LinkSpecs &linkSpecs = {});
+    void setCurrentTask(const Task &task);
+
+    Task &currentTask();
+    const Task &currentTask() const;
 
 private:
+    virtual bool isContinuation(const QString &line) const;
+
     void runPostPrintActions(QPlainTextEdit *edit) override;
 
     class Private;
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
index 49a0ed89571..9c55d5345c4 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
@@ -166,7 +166,7 @@ QVariant JsonFieldPage::Field::toSettings() const
 
 JsonFieldPage::Field *JsonFieldPage::Field::parse(const QVariant &input, QString *errorMessage)
 {
-    if (input.typeId() != QVariant::Map) {
+    if (input.typeId() != QMetaType::QVariantMap) {
         *errorMessage = Tr::tr("Field is not an object.");
         return nullptr;
     }
@@ -409,7 +409,7 @@ QDebug &operator<<(QDebug &debug, const JsonFieldPage::Field &field)
 
 bool LabelField::parseData(const QVariant &data, QString *errorMessage)
 {
-    if (data.typeId() != QVariant::Map) {
+    if (data.typeId() != QMetaType::QVariantMap) {
         *errorMessage = Tr::tr("Label (\"%1\") data is not an object.").arg(name());
         return false;
     }
@@ -447,7 +447,7 @@ bool SpacerField::parseData(const QVariant &data, QString *errorMessage)
     if (data.isNull())
         return true;
 
-    if (data.typeId() != QVariant::Map) {
+    if (data.typeId() != QMetaType::QVariantMap) {
         *errorMessage = Tr::tr("Spacer (\"%1\") data is not an object.").arg(name());
         return false;
     }
@@ -492,7 +492,7 @@ bool LineEditField::parseData(const QVariant &data, QString *errorMessage)
     if (data.isNull())
         return true;
 
-    if (data.typeId() != QVariant::Map) {
+    if (data.typeId() != QMetaType::QVariantMap) {
         *errorMessage = Tr::tr("LineEdit (\"%1\") data is not an object.").arg(name());
         return false;
     }
@@ -689,7 +689,7 @@ bool TextEditField::parseData(const QVariant &data, QString *errorMessage)
     if (data.isNull())
         return true;
 
-    if (data.typeId() != QVariant::Map) {
+    if (data.typeId() != QMetaType::QVariantMap) {
         *errorMessage = Tr::tr("TextEdit (\"%1\") data is not an object.")
                 .arg(name());
         return false;
@@ -772,7 +772,7 @@ bool PathChooserField::parseData(const QVariant &data, QString *errorMessage)
     if (data.isNull())
         return true;
 
-    if (data.typeId() != QVariant::Map) {
+    if (data.typeId() != QMetaType::QVariantMap) {
         *errorMessage = Tr::tr("PathChooser data is not an object.");
         return false;
     }
@@ -877,7 +877,7 @@ bool CheckBoxField::parseData(const QVariant &data, QString *errorMessage)
     if (data.isNull())
         return true;
 
-    if (data.typeId() != QVariant::Map) {
+    if (data.typeId() != QMetaType::QVariantMap) {
         *errorMessage = Tr::tr("CheckBox (\"%1\") data is not an object.").arg(name());
         return false;
     }
@@ -966,12 +966,12 @@ QVariant CheckBoxField::toSettings() const
 
 std::unique_ptr<QStandardItem> createStandardItemFromListItem(const QVariant &item, QString *errorMessage)
 {
-    if (item.typeId() == QVariant::List) {
+    if (item.typeId() == QMetaType::QVariantList) {
         *errorMessage = Tr::tr("No JSON lists allowed inside List items.");
         return {};
     }
     auto standardItem = std::make_unique<QStandardItem>();
-    if (item.typeId() == QVariant::Map) {
+    if (item.typeId() == QMetaType::QVariantMap) {
         QVariantMap tmp = item.toMap();
         const QString key = JsonWizardFactory::localizedString(consumeValue(tmp, "trKey", QString()).toString());
         const QVariant value = consumeValue(tmp, "value", key);
@@ -1001,7 +1001,7 @@ ListField::~ListField() = default;
 
 bool ListField::parseData(const QVariant &data, QString *errorMessage)
 {
-    if (data.typeId() != QVariant::Map) {
+    if (data.typeId() != QMetaType::QVariantMap) {
         *errorMessage = Tr::tr("%1 (\"%2\") data is not an object.").arg(type(), name());
         return false;
     }
@@ -1027,7 +1027,7 @@ bool ListField::parseData(const QVariant &data, QString *errorMessage)
         *errorMessage = Tr::tr("%1 (\"%2\") \"items\" missing.").arg(type(), name());
         return false;
     }
-    if (value.typeId() != QVariant::List) {
+    if (value.typeId() != QMetaType::QVariantList) {
         *errorMessage = Tr::tr("%1 (\"%2\") \"items\" is not a JSON list.").arg(type(), name());
         return false;
     }
@@ -1315,7 +1315,7 @@ JsonFieldPage::JsonFieldPage(MacroExpander *expander, QWidget *parent) :
     vLayout->addLayout(m_formLayout);
     m_errorLabel->setVisible(false);
     QPalette palette = m_errorLabel->palette();
-    palette.setColor(QPalette::WindowText, creatorTheme()->color(Theme::TextColorError));
+    palette.setColor(QPalette::WindowText, creatorColor(Theme::TextColorError));
     m_errorLabel->setPalette(palette);
     vLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding));
     vLayout->addWidget(m_errorLabel);
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp
index 930d8d22f4f..6e76633dafb 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp
@@ -124,7 +124,7 @@ QVector<JsonKitsPage::ConditionalFeature> JsonKitsPage::parseFeatures(const QVar
 
     if (data.isNull())
         return result;
-    if (data.type() != QVariant::List) {
+    if (data.typeId() != QMetaType::QVariantList) {
         if (errorMessage)
             *errorMessage = Tr::tr("Feature list is set and not of type list.");
         return result;
@@ -132,9 +132,9 @@ QVector<JsonKitsPage::ConditionalFeature> JsonKitsPage::parseFeatures(const QVar
 
     const QList<QVariant> elements = data.toList();
     for (const QVariant &element : elements) {
-        if (element.type() == QVariant::String) {
+        if (element.typeId() == QMetaType::QString) {
             result.append({ element.toString(), QVariant(true) });
-        } else if (element.type() == QVariant::Map) {
+        } else if (element.typeId() == QMetaType::QVariantMap) {
             const QVariantMap obj = element.toMap();
             const QString feature = obj.value(QLatin1String(KEY_FEATURE)).toString();
             if (feature.isEmpty()) {
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
index ec55e3218fd..8db6d46cac9 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
@@ -62,12 +62,12 @@ static IWizardFactory::WizardKind wizardKind(JsonWizard *wiz)
 // --------------------------------------------------------------------
 
 JsonSummaryPage::JsonSummaryPage(QWidget *parent) :
-    Internal::ProjectWizardPage(parent),
+    ProjectWizardPage(parent),
     m_wizard(nullptr)
 {
-    connect(this, &Internal::ProjectWizardPage::projectNodeChanged,
+    connect(this, &ProjectWizardPage::projectNodeChanged,
             this, &JsonSummaryPage::summarySettingsHaveChanged);
-    connect(this, &Internal::ProjectWizardPage::versionControlChanged,
+    connect(this, &ProjectWizardPage::versionControlChanged,
             this, &JsonSummaryPage::summarySettingsHaveChanged);
 }
 
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.h b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.h
index 95a971376df..c1b4578799e 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.h
+++ b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.h
@@ -14,7 +14,7 @@ class FolderNode;
 class Node;
 
 // Documentation inside.
-class JsonSummaryPage : public Internal::ProjectWizardPage
+class JsonSummaryPage : public ProjectWizardPage
 {
     Q_OBJECT
 
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
index 83b8b81bef6..3d846604ba5 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
@@ -219,14 +219,14 @@ QString JsonWizard::stringValue(const QString &n) const
     if (!v.isValid())
         return {};
 
-    if (v.typeId() == QVariant::String) {
+    if (v.typeId() == QMetaType::QString) {
         QString tmp = m_expander.expand(v.toString());
         if (tmp.isEmpty())
             tmp = QString::fromLatin1(""); // Make sure isNull() is *not* true.
         return tmp;
     }
 
-    if (v.typeId() == QVariant::StringList)
+    if (v.typeId() == QMetaType::QStringList)
         return stringListToArrayString(v.toStringList(), &m_expander);
 
     return v.toString();
@@ -277,7 +277,7 @@ QVariant JsonWizard::value(const QString &n) const
 
 bool JsonWizard::boolFromVariant(const QVariant &v, MacroExpander *expander)
 {
-    if (v.typeId() == QVariant::String) {
+    if (v.typeId() == QMetaType::QString) {
         const QString tmp = expander->expand(v.toString());
         return !(tmp.isEmpty() || tmp == QLatin1String("false"));
     }
@@ -419,7 +419,7 @@ void JsonWizard::handleError(const QString &message)
 
 QString JsonWizard::stringify(const QVariant &v) const
 {
-    if (v.typeId() == QVariant::StringList)
+    if (v.typeId() == QMetaType::QStringList)
         return stringListToArrayString(v.toStringList(), &m_expander);
     return Wizard::stringify(v);
 }
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
index 7f8ff6baf54..6da06b0616a 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
@@ -16,6 +16,7 @@
 #include <coreplugin/messagemanager.h>
 
 #include <extensionsystem/pluginmanager.h>
+#include <extensionsystem/pluginspec.h>
 
 #include <utils/algorithm.h>
 #include <utils/environment.h>
@@ -28,6 +29,7 @@
 #include <QDebug>
 #include <QDir>
 #include <QJSEngine>
+#include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonParseError>
@@ -35,6 +37,7 @@
 #include <QUuid>
 
 using namespace Utils;
+using namespace ExtensionSystem;
 
 namespace ProjectExplorer {
 
@@ -144,7 +147,7 @@ static JsonWizardFactory::Generator parseGenerator(const QVariant &value, QStrin
 {
     JsonWizardFactory::Generator gen;
 
-    if (value.typeId() != QVariant::Map) {
+    if (value.typeId() != QMetaType::QVariantMap) {
         *errorMessage = Tr::tr("Generator is not a object.");
         return gen;
     }
@@ -214,8 +217,10 @@ QVariantMap JsonWizardFactory::loadDefaultValues(const QString &fileName)
         FilePath dir = FilePath::fromString(path.toString());
         if (!dir.exists()) {
             if (verbose())
-                verboseLog.append(Tr::tr("Path \"%1\" does not exist when checking Json wizard search paths.\n")
-                                  .arg(path.toUserOutput()));
+                verboseLog.append(
+                    Tr::tr("Path \"%1\" does not exist when checking JSON wizard search paths.")
+                        .arg(path.toUserOutput())
+                    + "\n");
             continue;
         }
 
@@ -225,9 +230,11 @@ QVariantMap JsonWizardFactory::loadDefaultValues(const QString &fileName)
         while (!dirs.isEmpty()) {
             const FilePath current = dirs.takeFirst();
             if (verbose())
-                verboseLog.append(Tr::tr("Checking \"%1\" for %2.\n")
-                                  .arg(QDir::toNativeSeparators(current.absolutePath().toString()))
-                                  .arg(fileName));
+                verboseLog.append(
+                    Tr::tr("Checking \"%1\" for %2.")
+                        .arg(QDir::toNativeSeparators(current.absolutePath().toString()))
+                        .arg(fileName)
+                    + "\n");
             if (current.pathAppended(fileName).exists()) {
                 QFile configFile(current.pathAppended(fileName).toString());
                 configFile.open(QIODevice::ReadOnly);
@@ -247,10 +254,13 @@ QVariantMap JsonWizardFactory::loadDefaultValues(const QString &fileName)
                             ++column;
                         }
                     }
-                    verboseLog.append(Tr::tr("* Failed to parse \"%1\":%2:%3: %4\n")
-                                      .arg(configFile.fileName())
-                                      .arg(line).arg(column)
-                                      .arg(error.errorString()));
+                    verboseLog.append(
+                        Tr::tr("* Failed to parse \"%1\":%2:%3: %4")
+                            .arg(configFile.fileName())
+                            .arg(line)
+                            .arg(column)
+                            .arg(error.errorString())
+                        + "\n");
                     continue;
                 }
 
@@ -261,7 +271,7 @@ QVariantMap JsonWizardFactory::loadDefaultValues(const QString &fileName)
                 }
 
                 if (verbose())
-                    verboseLog.append(Tr::tr("* Configuration found and parsed.\n"));
+                    verboseLog.append(Tr::tr("* Configuration found and parsed.") + "\n");
 
                 return json.object().toVariantMap();
             }
@@ -271,7 +281,7 @@ QVariantMap JsonWizardFactory::loadDefaultValues(const QString &fileName)
                 dirs.swap(subDirs);
                 dirs.append(subDirs);
             } else if (verbose()) {
-                verboseLog.append(Tr::tr("JsonWizard: \"%1\" not found\n").arg(fileName));
+                verboseLog.append(Tr::tr("JsonWizard: \"%1\" not found.").arg(fileName) + "\n");
             }
         }
     }
@@ -298,8 +308,8 @@ QVariant JsonWizardFactory::getDataValue(const QLatin1String &key, const QVarian
 {
     QVariant retVal = {};
 
-    if ((valueSet.contains(key) && valueSet.value(key).typeId() == QVariant::Map) ||
-        (defaultValueSet.contains(key) && defaultValueSet.value(key).typeId() == QVariant::Map)) {
+    if ((valueSet.contains(key) && valueSet.value(key).typeId() == QMetaType::QVariantMap) ||
+        (defaultValueSet.contains(key) && defaultValueSet.value(key).typeId() == QMetaType::QVariantMap)) {
         retVal = mergeDataValueMaps(valueSet.value(key), defaultValueSet.value(key));
     } else {
         QVariant defaultValue = defaultValueSet.value(key, notExistValue);
@@ -325,7 +335,7 @@ std::pair<int, QStringList> JsonWizardFactory::screenSizeInfoFromPage(const QStr
         return {};
 
     const QVariant data = it->data;
-    if (data.typeId() != QVariant::List)
+    if (data.typeId() != QMetaType::QVariantList)
         return {};
 
     const QVariant screenFactorField = Utils::findOrDefault(data.toList(),
@@ -334,11 +344,11 @@ std::pair<int, QStringList> JsonWizardFactory::screenSizeInfoFromPage(const QStr
                                                                 return "ScreenFactor" == m["name"];
                                                             });
 
-    if (screenFactorField.typeId() != QVariant::Map)
+    if (screenFactorField.typeId() != QMetaType::QVariantMap)
         return {};
 
     const QVariant screenFactorData = screenFactorField.toMap()["data"];
-    if (screenFactorData.typeId() != QVariant::Map)
+    if (screenFactorData.typeId() != QMetaType::QVariantMap)
         return {};
 
     const QVariantMap screenFactorDataMap = screenFactorData.toMap();
@@ -366,7 +376,7 @@ JsonWizardFactory::Page JsonWizardFactory::parsePage(const QVariant &value, QStr
 {
     JsonWizardFactory::Page p;
 
-    if (value.typeId() != QVariant::Map) {
+    if (value.typeId() != QMetaType::QVariantMap) {
         *errorMessage = Tr::tr("Page is not an object.");
         return p;
     }
@@ -413,9 +423,9 @@ JsonWizardFactory::Page JsonWizardFactory::parsePage(const QVariant &value, QStr
 
     if (specifiedSubData.isNull())
         subData = defaultSubData;
-    else if (specifiedSubData.typeId() == QVariant::Map)
+    else if (specifiedSubData.typeId() == QMetaType::QVariantMap)
         subData = mergeDataValueMaps(specifiedSubData.toMap(), defaultSubData.toMap());
-    else if (specifiedSubData.typeId() == QVariant::List)
+    else if (specifiedSubData.typeId() == QMetaType::QVariantList)
         subData = specifiedSubData;
 
     if (!factory->validateData(typeId, subData, errorMessage))
@@ -448,8 +458,10 @@ QList<Core::IWizardFactory *> JsonWizardFactory::createWizardFactories()
 
         if (!path.exists()) {
             if (verbose())
-                verboseLog.append(Tr::tr("Path \"%1\" does not exist when checking Json wizard search paths.\n")
-                                  .arg(path.toUserOutput()));
+                verboseLog.append(
+                    Tr::tr("Path \"%1\" does not exist when checking JSON wizard search paths.")
+                        .arg(path.toUserOutput())
+                    + "\n");
             continue;
         }
 
@@ -475,27 +487,31 @@ QList<Core::IWizardFactory *> JsonWizardFactory::createWizardFactories()
                         ++column;
                     }
                 }
-                verboseLog.append(Tr::tr("* Failed to parse \"%1\":%2:%3: %4\n")
-                                  .arg(currentFile.fileName())
-                                  .arg(line).arg(column)
-                                  .arg(error.errorString()));
+                verboseLog.append(
+                    Tr::tr("* Failed to parse \"%1\":%2:%3: %4")
+                        .arg(currentFile.fileName())
+                        .arg(line)
+                        .arg(column)
+                        .arg(error.errorString())
+                    + "\n");
                 continue;
             }
 
             if (!json.isObject()) {
-                verboseLog.append(Tr::tr("* Did not find a JSON object in \"%1\".\n")
-                                  .arg(currentFile.fileName()));
+                verboseLog.append(
+                    Tr::tr("* Did not find a JSON object in \"%1\".").arg(currentFile.fileName())
+                    + "\n");
                 continue;
             }
 
             if (verbose())
-                verboseLog.append(Tr::tr("* Configuration found and parsed.\n"));
+                verboseLog.append(Tr::tr("* Configuration found and parsed.") + "\n");
 
             QVariantMap data = json.object().toVariantMap();
 
             int version = data.value(QLatin1String(VERSION_KEY), 0).toInt();
             if (version < 1 || version > 1) {
-                verboseLog.append(Tr::tr("* Version %1 not supported.\n").arg(version));
+                verboseLog.append(Tr::tr("* Version %1 not supported.").arg(version) + "\n");
                 continue;
             }
 
@@ -504,7 +520,7 @@ QList<Core::IWizardFactory *> JsonWizardFactory::createWizardFactories()
                                                              currentFile.parentDir(),
                                                              &errorMessage);
             if (!factory) {
-                verboseLog.append(Tr::tr("* Failed to create: %1\n").arg(errorMessage));
+                verboseLog.append(Tr::tr("* Failed to create: %1").arg(errorMessage) + "\n");
                 continue;
             }
 
@@ -551,32 +567,57 @@ static QStringList environmentTemplatesPaths()
     return paths;
 }
 
+static bool s_searchPathsInitialized = false;
+Q_GLOBAL_STATIC(FilePath, s_installedWizardsPath, {Core::ICore::resourcePath(WIZARD_PATH)})
+Q_GLOBAL_STATIC(FilePaths, s_additionalWizardPaths)
+
 FilePaths &JsonWizardFactory::searchPaths()
 {
     static FilePaths m_searchPaths;
-    static bool searchPathsInitialized = false;
-    if (!searchPathsInitialized) {
-        searchPathsInitialized = true;
-        m_searchPaths = {Core::ICore::userResourcePath(WIZARD_PATH),
-                         Core::ICore::resourcePath(WIZARD_PATH)};
+    if (!s_searchPathsInitialized) {
+        s_searchPathsInitialized = true;
+        m_searchPaths = {Core::ICore::userResourcePath(WIZARD_PATH), *s_installedWizardsPath};
         for (const QString &environmentTemplateDirName : environmentTemplatesPaths())
             m_searchPaths << FilePath::fromString(environmentTemplateDirName);
         m_searchPaths << Utils::transform(
             Core::ICore::settings()->value("Wizards/SearchPaths").toStringList(),
             [](const QString &s) { return FilePath::fromUserInput(s); });
+        // add paths from enabled plugin meta data
+        for (PluginSpec *plugin : PluginManager::plugins()) {
+            if (plugin->state() == PluginSpec::Running) {
+                const auto base = plugin->location();
+                const auto values = plugin->metaData().value("JsonWizardPaths").toArray();
+                for (const QJsonValue &v : values) {
+                    const auto path = FilePath::fromString(v.toString());
+                    if (!path.isEmpty() && !path.needsDevice()) {
+                        m_searchPaths << base.resolvePath(path);
+                    }
+                }
+            }
+        }
+        m_searchPaths += *s_additionalWizardPaths;
     }
 
     return m_searchPaths;
 }
 
-void JsonWizardFactory::addWizardPath(const FilePath &path)
+void JsonWizardFactory::resetSearchPaths()
 {
-    searchPaths().append(path);
+    s_searchPathsInitialized = false;
 }
 
-void JsonWizardFactory::clearWizardPaths()
+void JsonWizardFactory::addWizardPath(const FilePath &path)
 {
-    searchPaths().clear();
+    s_additionalWizardPaths->append(path);
+}
+
+/*!
+    \internal
+*/
+void JsonWizardFactory::setInstalledWizardsPath(const Utils::FilePath &path)
+{
+    *s_installedWizardsPath = path;
+    resetSearchPaths();
 }
 
 void JsonWizardFactory::setVerbose(int level)
@@ -620,6 +661,7 @@ Wizard *JsonWizardFactory::runWizardImpl(const FilePath &path, QWidget *parent,
 
     wizard->setValue(QStringLiteral("Features"), Id::toStringList(availableFeatures(platform)));
     wizard->setValue(QStringLiteral("Plugins"), Id::toStringList(pluginFeatures()));
+    wizard->setValue(QStringLiteral("SupportedProjectTypes"), Id::toStringList(supportedProjectTypes()));
 
     // Add data to wizard:
     for (auto i = variables.constBegin(); i != variables.constEnd(); ++i)
@@ -706,9 +748,9 @@ QList<QVariant> JsonWizardFactory::objectOrList(const QVariant &data, QString *e
     QList<QVariant> result;
     if (data.isNull())
         *errorMessage = Tr::tr("key not found.");
-    else if (data.typeId() == QVariant::Map)
+    else if (data.typeId() == QMetaType::QVariantMap)
         result.append(data);
-    else if (data.typeId() == QVariant::List)
+    else if (data.typeId() == QMetaType::QVariantList)
         result = data.toList();
     else
         *errorMessage = Tr::tr("Expected an object or a list.");
@@ -719,7 +761,7 @@ QString JsonWizardFactory::localizedString(const QVariant &value)
 {
     if (value.isNull())
         return {};
-    if (value.typeId() == QVariant::Map) {
+    if (value.typeId() == QMetaType::QVariantMap) {
         QVariantMap tmp = value.toMap();
         const QString locale = languageSetting().toLower();
         QStringList locales;
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h
index 412787827f6..30e69ee5c89 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h
@@ -27,7 +27,6 @@ class PROJECTEXPLORER_EXPORT JsonWizardFactory : public Core::IWizardFactory
 public:
     // Add search paths for wizard.json files. All subdirs are going to be checked.
     static void addWizardPath(const Utils::FilePath &path);
-    static void clearWizardPaths();
 
     // actual interface of the wizard factory:
     class Generator {
@@ -58,6 +57,9 @@ public:
 
     virtual std::pair<int, QStringList> screenSizeInfoFromPage(const QString &pageType) const;
 
+    // internal
+    static void setInstalledWizardsPath(const Utils::FilePath &path);
+
 private:
     Utils::Wizard *runWizardImpl(const Utils::FilePath &path, QWidget *parent, Utils::Id platform,
                                  const QVariantMap &variables, bool showWizard = true) override;
@@ -69,6 +71,7 @@ private:
                                                   const Utils::FilePath &baseDir,
                                                   QString *errorMessage);
     static Utils::FilePaths &searchPaths();
+    static void resetSearchPaths();
 
     static void setVerbose(int level);
     static int verbose();
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp
index c7409fbc467..c6f6900d045 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp
@@ -79,7 +79,7 @@ bool JsonWizardFileGenerator::setup(const QVariant &data, QString *errorMessage)
         return false;
 
     for (const QVariant &d : list) {
-        if (d.type() != QVariant::Map) {
+        if (d.typeId() != QMetaType::QVariantMap) {
             *errorMessage = Tr::tr("Files data list entry is not an object.");
             return false;
         }
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp
index 02f26d8401d..45b2a4aa780 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp
@@ -114,7 +114,7 @@ WizardPage *FilePageFactory::create(JsonWizard *wizard, Id typeId, const QVarian
 bool FilePageFactory::validateData(Id typeId, const QVariant &data, QString *errorMessage)
 {
     QTC_ASSERT(canCreate(typeId), return false);
-    if (!data.isNull() && (data.typeId() != QVariant::Map || !data.toMap().isEmpty())) {
+    if (!data.isNull() && (data.typeId() != QMetaType::QVariantMap || !data.toMap().isEmpty())) {
         *errorMessage = Tr::tr("\"data\" for a \"File\" page needs to be unset or an empty object.");
         return false;
     }
@@ -174,7 +174,7 @@ bool KitsPageFactory::validateData(Id typeId, const QVariant &data, QString *err
 {
     QTC_ASSERT(canCreate(typeId), return false);
 
-    if (data.isNull() || data.typeId() != QVariant::Map) {
+    if (data.isNull() || data.typeId() != QMetaType::QVariantMap) {
         *errorMessage = Tr::tr("\"data\" must be a JSON object for \"Kits\" pages.");
         return false;
     }
@@ -242,7 +242,7 @@ bool ProjectPageFactory::validateData(Id typeId, const QVariant &data, QString *
     Q_UNUSED(errorMessage)
 
     QTC_ASSERT(canCreate(typeId), return false);
-    if (!data.isNull() && data.typeId() != QVariant::Map) {
+    if (!data.isNull() && data.typeId() != QMetaType::QVariantMap) {
         *errorMessage = Tr::tr("\"data\" must be empty or a JSON object for \"Project\" pages.");
         return false;
     }
@@ -297,7 +297,7 @@ WizardPage *SummaryPageFactory::create(JsonWizard *wizard, Id typeId, const QVar
 bool SummaryPageFactory::validateData(Id typeId, const QVariant &data, QString *errorMessage)
 {
     QTC_ASSERT(canCreate(typeId), return false);
-    if (!data.isNull() && (data.typeId() != QVariant::Map)) {
+    if (!data.isNull() && (data.typeId() != QMetaType::QVariantMap)) {
         *errorMessage = Tr::tr("\"data\" for a \"Summary\" page can be unset or needs to be an object.");
         return false;
     }
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp
index a7b2b9b6eec..9122ccc5eee 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp
@@ -46,7 +46,7 @@ bool JsonWizardScannerGenerator::setup(const QVariant &data, QString *errorMessa
     if (data.isNull())
         return true;
 
-    if (data.type() != QVariant::Map) {
+    if (data.typeId() != QMetaType::QVariantMap) {
         *errorMessage = Tr::tr("Key is not an object.");
         return false;
     }
diff --git a/src/plugins/projectexplorer/jsonwizard/wizarddebug.h b/src/plugins/projectexplorer/jsonwizard/wizarddebug.h
index 63f8891670c..6878407d9a0 100644
--- a/src/plugins/projectexplorer/jsonwizard/wizarddebug.h
+++ b/src/plugins/projectexplorer/jsonwizard/wizarddebug.h
@@ -26,10 +26,10 @@ inline QDebug &operator<<(QDebug &dbg, const QVariant &var)
     case QMetaType::QStringList:
         dbg << var.toList();
         break;
-    case QVariant::List:
+    case QMetaType::QVariantList:
         dbg << var.toList();
         break;
-    case QVariant::Map:
+    case QMetaType::QVariantMap:
         dbg << var.toMap();
         break;
     default: {
diff --git a/src/plugins/projectexplorer/kitaspects.cpp b/src/plugins/projectexplorer/kitaspects.cpp
index 0eef454d284..35193cf6e90 100644
--- a/src/plugins/projectexplorer/kitaspects.cpp
+++ b/src/plugins/projectexplorer/kitaspects.cpp
@@ -61,7 +61,7 @@ public:
 private:
     void makeReadOnly() override { m_chooser->setReadOnly(true); }
 
-    void addToLayoutImpl(Layouting::LayoutItem &builder) override
+    void addToLayoutImpl(Layouting::Layout &builder) override
     {
         addMutableAction(m_chooser);
         builder.addItem(Layouting::Span(2, m_chooser));
@@ -238,7 +238,7 @@ public:
     }
 
 private:
-    void addToLayoutImpl(Layouting::LayoutItem &builder) override
+    void addToLayoutImpl(Layouting::Layout &builder) override
     {
         addMutableAction(m_mainWidget);
         builder.addItem(m_mainWidget);
@@ -739,7 +739,7 @@ public:
     ~DeviceTypeKitAspectImpl() override { delete m_comboBox; }
 
 private:
-    void addToLayoutImpl(Layouting::LayoutItem &builder) override
+    void addToLayoutImpl(Layouting::Layout &builder) override
     {
         addMutableAction(m_comboBox);
         builder.addItem(m_comboBox);
@@ -889,7 +889,7 @@ public:
     }
 
 private:
-    void addToLayoutImpl(Layouting::LayoutItem &builder) override
+    void addToLayoutImpl(Layouting::Layout &builder) override
     {
         addMutableAction(m_comboBox);
         builder.addItem(m_comboBox);
@@ -1170,7 +1170,7 @@ public:
     }
 
 private:
-    void addToLayoutImpl(Layouting::LayoutItem &builder) override
+    void addToLayoutImpl(Layouting::Layout &builder) override
     {
         addMutableAction(m_comboBox);
         builder.addItem(m_comboBox);
@@ -1433,7 +1433,7 @@ public:
     }
 
 private:
-    void addToLayoutImpl(Layouting::LayoutItem &builder) override
+    void addToLayoutImpl(Layouting::Layout &builder) override
     {
         addMutableAction(m_mainWidget);
         builder.addItem(m_mainWidget);
@@ -1539,7 +1539,7 @@ Tasks EnvironmentKitAspectFactory::validate(const Kit *k) const
     QTC_ASSERT(k, return result);
 
     const QVariant variant = k->value(EnvironmentKitAspect::id());
-    if (!variant.isNull() && !variant.canConvert(QVariant::List))
+    if (!variant.isNull() && !variant.canConvert(QMetaType(QMetaType::QVariantList)))
         result << BuildSystemTask(Task::Error, Tr::tr("The environment setting value is invalid."));
 
     return result;
@@ -1550,7 +1550,7 @@ void EnvironmentKitAspectFactory::fix(Kit *k)
     QTC_ASSERT(k, return);
 
     const QVariant variant = k->value(EnvironmentKitAspect::id());
-    if (!variant.isNull() && !variant.canConvert(QVariant::List)) {
+    if (!variant.isNull() && !variant.canConvert(QMetaType(QMetaType::QVariantList))) {
         qWarning("Kit \"%s\" has a wrong environment value set.", qPrintable(k->displayName()));
         EnvironmentKitAspect::setEnvironmentChanges(k, EnvironmentItems());
     }
diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index 9406d746d91..154ce46f4bc 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -798,7 +798,7 @@ void KitAspect::makeStickySubWidgetsReadOnly()
     makeReadOnly();
 }
 
-void KitAspect::addToLayout(Layouting::LayoutItem &parentItem)
+void KitAspect::addToLayout(Layouting::Layout &parentItem)
 {
     auto label = createSubWidget<QLabel>(m_factory->displayName() + ':');
     label->setToolTip(m_factory->description());
diff --git a/src/plugins/projectexplorer/kitmanager.h b/src/plugins/projectexplorer/kitmanager.h
index 44c6223d79b..4068aea15d5 100644
--- a/src/plugins/projectexplorer/kitmanager.h
+++ b/src/plugins/projectexplorer/kitmanager.h
@@ -110,7 +110,7 @@ public:
 
     virtual void refresh() = 0;
 
-    void addToLayout(Layouting::LayoutItem &parentItem) override;
+    void addToLayout(Layouting::Layout &parentItem) override;
 
     static QString msgManage();
 
@@ -124,7 +124,7 @@ public:
 
 protected:
     virtual void makeReadOnly() {}
-    virtual void addToLayoutImpl(Layouting::LayoutItem &parentItem) = 0;
+    virtual void addToLayoutImpl(Layouting::Layout &parentItem) = 0;
     virtual Utils::Id settingsPageItemToPreselect() const { return {}; }
 
     Kit *m_kit;
diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
index 2c142dec886..ab884a9d7fc 100644
--- a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
+++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
@@ -200,7 +200,7 @@ QString KitManagerConfigWidget::validityMessage() const
     return m_modifiedKit->toHtml(tmp);
 }
 
-void KitManagerConfigWidget::addAspectToWorkingCopy(Layouting::LayoutItem &parent, KitAspectFactory *factory)
+void KitManagerConfigWidget::addAspectToWorkingCopy(Layouting::Layout &parent, KitAspectFactory *factory)
 {
     QTC_ASSERT(factory, return);
     KitAspect *aspect = factory->createKitAspect(workingCopy());
diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.h b/src/plugins/projectexplorer/kitmanagerconfigwidget.h
index 1a499f7dabf..8564ccbcc90 100644
--- a/src/plugins/projectexplorer/kitmanagerconfigwidget.h
+++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.h
@@ -36,7 +36,7 @@ public:
     void discard();
     bool isDirty() const;
     QString validityMessage() const;
-    void addAspectToWorkingCopy(Layouting::LayoutItem &parent, KitAspectFactory *factory);
+    void addAspectToWorkingCopy(Layouting::Layout &parent, KitAspectFactory *factory);
     void makeStickySubWidgetsReadOnly();
 
     Kit *workingCopy() const;
diff --git a/src/plugins/projectexplorer/ldparser.cpp b/src/plugins/projectexplorer/ldparser.cpp
index 82b3c3d335a..95bb4e84959 100644
--- a/src/plugins/projectexplorer/ldparser.cpp
+++ b/src/plugins/projectexplorer/ldparser.cpp
@@ -39,45 +39,49 @@ Utils::OutputLineParser::Result LdParser::handleLine(const QString &line, Utils:
         return Status::NotHandled;
 
     QString lne = rightTrimmed(line);
-    if (!lne.isEmpty() && !lne.at(0).isSpace() && !m_incompleteTask.isNull()) {
-        flush();
-        return Status::NotHandled;
-    }
-
     if (lne.startsWith(QLatin1String("TeamBuilder "))
             || lne.startsWith(QLatin1String("distcc["))
             || lne.contains(QLatin1String("ar: creating "))) {
         return Status::NotHandled;
     }
 
+    const auto getStatus = [&lne] { return lne.endsWith(':') ? Status::InProgress : Status::Done; };
+
     // ld on macOS
-    if (lne.startsWith("Undefined symbols for architecture") && lne.endsWith(":")) {
-        m_incompleteTask = CompileTask(Task::Error, lne);
+    if (lne.startsWith("Undefined symbols for architecture") && getStatus() == Status::InProgress) {
+        createOrAmendTask(Task::Error, lne, line);
         return Status::InProgress;
     }
-    if (!m_incompleteTask.isNull() && lne.startsWith("  ")) {
-        m_incompleteTask.details.append(lne);
+
+    if (!currentTask().isNull() && isContinuation(line)) {
         static const QRegularExpression locRegExp("    (?<symbol>\\S+) in (?<file>\\S+)");
         const QRegularExpressionMatch match = locRegExp.match(lne);
         LinkSpecs linkSpecs;
+        Utils::FilePath filePath;
+        bool handle = false;
         if (match.hasMatch()) {
-            m_incompleteTask.setFile(absoluteFilePath(Utils::FilePath::fromString(
-                                                          match.captured("file"))));
-            addLinkSpecForAbsoluteFilePath(linkSpecs, m_incompleteTask.file, 0, match, "file");
+            handle = true;
+            filePath = absoluteFilePath(Utils::FilePath::fromString(match.captured("file")));
+            addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, -1, -1, match, "file");
+            currentTask().setFile(filePath);
+        } else {
+            handle = !lne.isEmpty() && lne.at(0).isSpace();
+        }
+        if (handle) {
+            createOrAmendTask(Task::Unknown, {}, line, true, filePath);
+            return {Status::InProgress, linkSpecs};
         }
-        return {Status::InProgress, linkSpecs};
     }
 
     if (lne.startsWith("collect2:") || lne.startsWith("collect2.exe:")) {
-        scheduleTask(CompileTask(Task::Error, lne /* description */), 1);
-        return Status::Done;
+        createOrAmendTask(Task::Error, lne, line);
+        return getStatus();
     }
 
     QRegularExpressionMatch match = m_ranlib.match(lne);
     if (match.hasMatch()) {
-        QString description = match.captured(2);
-        scheduleTask(CompileTask(Task::Warning, description), 1);
-        return Status::Done;
+        createOrAmendTask(Task::Warning, match.captured(2), line);
+        return getStatus();
     }
 
     match = m_regExpGccNames.match(lne);
@@ -90,8 +94,8 @@ Utils::OutputLineParser::Result LdParser::handleLine(const QString &line, Utils:
         } else if (description.startsWith(QLatin1String("fatal: ")))  {
             description = description.mid(7);
         }
-        scheduleTask(CompileTask(type, description), 1);
-        return Status::Done;
+        createOrAmendTask(type, description, line);
+        return getStatus();
     }
 
     match = m_regExpLinker.match(lne);
@@ -100,50 +104,47 @@ Utils::OutputLineParser::Result LdParser::handleLine(const QString &line, Utils:
         int lineno = match.captured(7).toInt(&ok);
         if (!ok)
             lineno = -1;
-        Utils::FilePath filename
+        Utils::FilePath filePath
                 = absoluteFilePath(Utils::FilePath::fromUserInput(match.captured(1)));
         int capIndex = 1;
         const QString sourceFileName = match.captured(4);
         if (!sourceFileName.isEmpty()
             && !sourceFileName.startsWith(QLatin1String("(.text"))
             && !sourceFileName.startsWith(QLatin1String("(.data"))) {
-            filename = absoluteFilePath(Utils::FilePath::fromUserInput(sourceFileName));
+            filePath = absoluteFilePath(Utils::FilePath::fromUserInput(sourceFileName));
             capIndex = 4;
         }
         QString description = match.captured(8).trimmed();
-        Task::TaskType type = Task::Error;
-        if (description.startsWith(QLatin1String("first defined here")) ||
-            description.startsWith(QLatin1String("note:"), Qt::CaseInsensitive)) {
-            type = Task::Unknown;
-        } else if (description.startsWith(QLatin1String("warning: "), Qt::CaseInsensitive)) {
-            type = Task::Warning;
-            description = description.mid(9);
-        }
         static const QStringList keywords{
             "File format not recognized",
             "undefined reference",
+            "multiple definition",
             "first defined here",
             "feupdateenv is not implemented and will always fail", // yes, this is quite special ...
         };
         const auto descriptionContainsKeyword = [&description](const QString &keyword) {
             return description.contains(keyword);
         };
-        if (Utils::anyOf(keywords, descriptionContainsKeyword)) {
+        Task::TaskType type = Task::Unknown;
+        const bool hasKeyword = Utils::anyOf(keywords, descriptionContainsKeyword);
+        if (description.startsWith(QLatin1String("warning: "), Qt::CaseInsensitive)) {
+            type = Task::Warning;
+            description = description.mid(9);
+        } else if (hasKeyword) {
+            type = Task::Error;
+        }
+        if (hasKeyword || filePath.fileName().endsWith(".o")) {
             LinkSpecs linkSpecs;
-            addLinkSpecForAbsoluteFilePath(linkSpecs, filename, lineno, match, capIndex);
-            scheduleTask(CompileTask(type, description, filename, lineno), 1);
-            return {Status::Done, linkSpecs};
+            addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, lineno, -1, match, capIndex);
+            createOrAmendTask(type, description, line, false, filePath, lineno, 0, linkSpecs);
+            return {getStatus(), linkSpecs};
         }
     }
 
     return Status::NotHandled;
 }
 
-void LdParser::flush()
+bool LdParser::isContinuation(const QString &line) const
 {
-    if (m_incompleteTask.isNull())
-        return;
-    const Task t = m_incompleteTask;
-    m_incompleteTask.clear();
-    scheduleTask(t, 1);
+    return currentTask().details.last().endsWith(':') || (!line.isEmpty() && line.at(0).isSpace());
 }
diff --git a/src/plugins/projectexplorer/ldparser.h b/src/plugins/projectexplorer/ldparser.h
index 918f50b36c3..d8c23747898 100644
--- a/src/plugins/projectexplorer/ldparser.h
+++ b/src/plugins/projectexplorer/ldparser.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include "ioutputparser.h"
-#include "task.h"
 
 #include <QRegularExpression>
 
@@ -18,13 +17,11 @@ public:
     LdParser();
 private:
     Result handleLine(const QString &line, Utils::OutputFormat type) override;
-    void flush() override;
+    bool isContinuation(const QString &line) const override;
 
     QRegularExpression m_ranlib;
     QRegularExpression m_regExpLinker;
     QRegularExpression m_regExpGccNames;
-
-    Task m_incompleteTask;
 };
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/linuxiccparser.cpp b/src/plugins/projectexplorer/linuxiccparser.cpp
index 62e151846e7..6e625b240a5 100644
--- a/src/plugins/projectexplorer/linuxiccparser.cpp
+++ b/src/plugins/projectexplorer/linuxiccparser.cpp
@@ -12,8 +12,7 @@ using namespace Utils;
 
 namespace ProjectExplorer {
 
-LinuxIccParser::LinuxIccParser() :
-    m_temporary(Task())
+LinuxIccParser::LinuxIccParser()
 {
     setObjectName(QLatin1String("LinuxIccParser"));
     // main.cpp(53): error #308: function \"AClass::privatefunc\" (declared at line 4 of \"main.h\") is inaccessible
@@ -51,7 +50,6 @@ OutputLineParser::Result LinuxIccParser::handleLine(const QString &line, OutputF
     if (m_expectFirstLine) {
         const QRegularExpressionMatch match = m_firstLine.match(line);
         if (match.hasMatch()) {
-            // Clear out old task
             Task::TaskType type = Task::Unknown;
             QString category = match.captured(4);
             if (category == QLatin1String("error"))
@@ -61,10 +59,8 @@ OutputLineParser::Result LinuxIccParser::handleLine(const QString &line, OutputF
             const FilePath filePath = absoluteFilePath(FilePath::fromUserInput(match.captured(1)));
             const int lineNo = match.captured(2).toInt();
             LinkSpecs linkSpecs;
-            addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, lineNo, match, 1);
-            m_temporary = CompileTask(type, match.captured(6).trimmed(), filePath, lineNo);
-
-            m_lines = 1;
+            addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, lineNo, -1, match, 1);
+            createOrAmendTask(type, match.captured(6).trimmed(), line, false, filePath, lineNo);
             m_expectFirstLine = false;
             return Status::InProgress;
         }
@@ -75,17 +71,14 @@ OutputLineParser::Result LinuxIccParser::handleLine(const QString &line, OutputF
     }
     if (!m_expectFirstLine && line.trimmed().isEmpty()) { // last Line
         m_expectFirstLine = true;
-        scheduleTask(m_temporary, m_lines);
-        m_temporary = Task();
+        flush();
         return Status::Done;
     }
     const QRegularExpressionMatch match = m_continuationLines.match(line);
     if (!m_expectFirstLine && match.hasMatch()) {
-        m_temporary.details.append(match.captured(1).trimmed());
-        ++m_lines;
+        createOrAmendTask(Task::Unknown, {}, line, true);
         return Status::InProgress;
     }
-    QTC_CHECK(m_temporary.isNull());
     return Status::NotHandled;
 }
 
@@ -99,17 +92,6 @@ QList<OutputLineParser *> LinuxIccParser::iccParserSuite()
     return {new LinuxIccParser, new Internal::LldParser, new LdParser};
 }
 
-void LinuxIccParser::flush()
-{
-    if (m_temporary.isNull())
-        return;
-
-    setDetailsFormat(m_temporary);
-    Task t = m_temporary;
-    m_temporary.clear();
-    scheduleTask(t, m_lines, 1);
-}
-
 } // ProjectExplorer
 
 #ifdef WITH_TESTS
@@ -155,8 +137,10 @@ void ProjectExplorerTest::testLinuxIccOutputParsers_data()
             << QString() << QString::fromLatin1("\n")
             << (Tasks()
                 << CompileTask(Task::Error,
-                               "identifier \"f\" is undefined\nf(0);",
-                               FilePath::fromUserInput(QLatin1String("main.cpp")), 13))
+                           "identifier \"f\" is undefined\n"
+                           "main.cpp(13): error: identifier \"f\" is undefined\n"
+                           "      f(0);",
+                           FilePath::fromUserInput(QLatin1String("main.cpp")), 13))
             << QString();
 
     // same, with PCH remark
@@ -170,8 +154,10 @@ void ProjectExplorerTest::testLinuxIccOutputParsers_data()
             << QString() << QString::fromLatin1("\n")
             << (Tasks()
                 << CompileTask(Task::Error,
-                               "identifier \"f\" is undefined\nf(0);",
-                               FilePath::fromUserInput("main.cpp"), 13))
+                           "identifier \"f\" is undefined\n"
+                           "main.cpp(13): error: identifier \"f\" is undefined\n"
+                           "      f(0);",
+                           FilePath::fromUserInput("main.cpp"), 13))
             << QString();
 
 
@@ -184,8 +170,10 @@ void ProjectExplorerTest::testLinuxIccOutputParsers_data()
             << QString() << QString::fromLatin1("\n")
             << (Tasks()
                 << CompileTask(Task::Error,
-                               "function \"AClass::privatefunc\" (declared at line 4 of \"main.h\") is inaccessible\nb.privatefunc();",
-                               FilePath::fromUserInput("main.cpp"), 53))
+                           "function \"AClass::privatefunc\" (declared at line 4 of \"main.h\") is inaccessible\n"
+                           "main.cpp(53): error #308: function \"AClass::privatefunc\" (declared at line 4 of \"main.h\") is inaccessible\n"
+                           "      b.privatefunc();",
+                           FilePath::fromUserInput("main.cpp"), 53))
             << QString();
 
     QTest::newRow("simple warning")
@@ -197,8 +185,10 @@ void ProjectExplorerTest::testLinuxIccOutputParsers_data()
             << QString() << QString::fromLatin1("\n")
             << (Tasks()
                 << CompileTask(Task::Warning,
-                               "use of \"=\" where \"==\" may have been intended\nwhile (a = true)",
-                               FilePath::fromUserInput("main.cpp"), 41))
+                           "use of \"=\" where \"==\" may have been intended\n"
+                           "main.cpp(41): warning #187: use of \"=\" where \"==\" may have been intended\n"
+                           "      while (a = true)",
+                           FilePath::fromUserInput("main.cpp"), 41))
             << QString();
 }
 
diff --git a/src/plugins/projectexplorer/linuxiccparser.h b/src/plugins/projectexplorer/linuxiccparser.h
index 24b40f9c06e..a17ffef84c9 100644
--- a/src/plugins/projectexplorer/linuxiccparser.h
+++ b/src/plugins/projectexplorer/linuxiccparser.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include "ioutputparser.h"
-#include "task.h"
 
 #include <QRegularExpression>
 
@@ -23,7 +22,6 @@ public:
 
 private:
     Result handleLine(const QString &line, Utils::OutputFormat type) override;
-    void flush() override;
 
     QRegularExpression m_firstLine;
     QRegularExpression m_continuationLines;
@@ -31,8 +29,6 @@ private:
     QRegularExpression m_pchInfoLine;
 
     bool m_expectFirstLine = true;
-    Task m_temporary;
-    int m_lines = 0;
 };
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/lldparser.cpp b/src/plugins/projectexplorer/lldparser.cpp
index 3bb4079b766..0bc36ff845e 100644
--- a/src/plugins/projectexplorer/lldparser.cpp
+++ b/src/plugins/projectexplorer/lldparser.cpp
@@ -46,7 +46,7 @@ Utils::OutputLineParser::Result LldParser::handleLine(const QString &line, Utils
         const auto file = absoluteFilePath(Utils::FilePath::fromUserInput(
                 trimmedLine.mid(filePathOffset, filePathLen).trimmed()));
         LinkSpecs linkSpecs;
-        addLinkSpecForAbsoluteFilePath(linkSpecs, file, lineNo, filePathOffset, filePathLen);
+        addLinkSpecForAbsoluteFilePath(linkSpecs, file, lineNo, -1, filePathOffset, filePathLen);
         scheduleTask(CompileTask(Task::Unknown, trimmedLine.mid(4).trimmed(),
                                  file, lineNo), 1);
         return {Status::Done, linkSpecs};
diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp
index 730215d81c8..7bf7a1f6df4 100644
--- a/src/plugins/projectexplorer/makestep.cpp
+++ b/src/plugins/projectexplorer/makestep.cpp
@@ -313,7 +313,7 @@ QWidget *MakeStep::createConfigWidget()
     if (m_disablingForSubDirsSupported)
         builder.addRow({m_disabledForSubdirsAspect});
     builder.addRow({m_buildTargetsAspect});
-    builder.addItem(Layouting::noMargin);
+    builder.setNoMargins();
 
     auto widget = builder.emerge();
 
diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
index bbf2b8be1dd..a33cd3e247e 100644
--- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp
+++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
@@ -434,7 +434,7 @@ void TargetSelectorDelegate::paint(QPainter *painter,
     painter->save();
     painter->setClipping(false);
 
-    QColor textColor = creatorTheme()->color(Theme::MiniProjectTargetSelectorTextColor);
+    QColor textColor = creatorColor(Theme::MiniProjectTargetSelectorTextColor);
     if (option.state & QStyle::State_Selected) {
         QColor color;
         if (m_view->hasFocus()) {
@@ -494,7 +494,7 @@ SelectorView::SelectorView(QWidget *parent) : TreeView(parent)
     setSelectionBehavior(SelectRows);
     setAttribute(Qt::WA_MacShowFocusRect, false);
     setHeaderHidden(true);
-    const QColor bgColor = creatorTheme()->color(Theme::MiniProjectTargetSelectorBackgroundColor);
+    const QColor bgColor = creatorColor(Theme::MiniProjectTargetSelectorBackgroundColor);
     const QString bgColorName = creatorTheme()->flag(Theme::FlatToolBars)
             ? bgColor.lighter(120).name() : bgColor.name();
     setStyleSheet(QString::fromLatin1("QAbstractItemView { background: %1; border-style: none; }").arg(bgColorName));
@@ -552,7 +552,7 @@ int SelectorView::padding()
 /////////
 // KitAreaWidget
 /////////
-void doLayout(KitAspect *aspect, Layouting::LayoutItem &builder)
+void doLayout(KitAspect *aspect, Layouting::Layout &builder)
 {
     aspect->addToLayout(builder);
 }
@@ -586,7 +586,8 @@ public:
             if (k && k->isMutable(factory->id())) {
                 KitAspect *aspect = factory->createKitAspect(k);
                 m_kitAspects << aspect;
-                grid.addItems({aspect, Layouting::br});
+                grid.addItem(aspect);
+                grid.flush();
             }
         }
         m_gridWidget = grid.emerge();
@@ -1537,7 +1538,7 @@ void MiniProjectTargetSelector::paintEvent(QPaintEvent *)
 {
     QPainter painter(this);
     painter.fillRect(rect(), StyleHelper::baseColor());
-    painter.setPen(creatorTheme()->color(Theme::MiniProjectTargetSelectorBorderColor));
+    painter.setPen(creatorColor(Theme::MiniProjectTargetSelectorBorderColor));
     // draw border on top and right
     QRectF borderRect = QRectF(rect()).adjusted(0.5, 0.5, -0.5, -0.5);
     painter.drawLine(borderRect.topLeft(), borderRect.topRight());
diff --git a/src/plugins/projectexplorer/msvcparser.cpp b/src/plugins/projectexplorer/msvcparser.cpp
index 4a53ce958f4..17710cb13c3 100644
--- a/src/plugins/projectexplorer/msvcparser.cpp
+++ b/src/plugins/projectexplorer/msvcparser.cpp
@@ -94,36 +94,28 @@ OutputLineParser::Result MsvcParser::handleLine(const QString &line, OutputForma
     if (type == OutputFormat::StdOutFormat) {
         QRegularExpressionMatch match = m_additionalInfoRegExp.match(line);
         if (line.startsWith("        ") && !match.hasMatch()) {
-            if (m_lastTask.isNull())
+            if (currentTask().isNull())
                 return Status::NotHandled;
-
-            m_lastTask.details.append(rightTrimmed(line));
-            ++m_lines;
+            createOrAmendTask(Task::Unknown, {}, line, true);
             return Status::InProgress;
         }
 
         const Result res = processCompileLine(line);
         if (res.status != Status::NotHandled)
             return res;
-        const Task t = handleNmakeJomMessage(line);
-        if (!t.isNull()) {
-            flush();
-            m_lastTask = t;
-            m_lines = 1;
+        if (const Task t = handleNmakeJomMessage(line); !t.isNull()) {
+            setCurrentTask(t);
             return Status::InProgress;
         }
         if (match.hasMatch()) {
-            QString description = match.captured(1)
-                    + match.captured(4).trimmed();
+            QString description = match.captured(1) + match.captured(4).trimmed();
             if (!match.captured(1).isEmpty())
                 description.chop(1); // Remove trailing quote
             const FilePath filePath = absoluteFilePath(FilePath::fromUserInput(match.captured(2)));
             const int lineNo = match.captured(3).toInt();
             LinkSpecs linkSpecs;
-            addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, lineNo, match, 2);
-            m_lastTask = CompileTask(Task::Unknown, description, filePath, lineNo);
-            m_lastTask.details << line;
-            m_lines = 1;
+            addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, lineNo, -1, match, 2);
+            createOrAmendTask(Task::Unknown, description, line, false, filePath, lineNo, 0, linkSpecs);
             return {Status::InProgress, linkSpecs};
         }
         return Status::NotHandled;
@@ -132,63 +124,46 @@ OutputLineParser::Result MsvcParser::handleLine(const QString &line, OutputForma
     const Result res = processCompileLine(line);
     if (res.status != Status::NotHandled)
         return res;
+
     // Jom outputs errors to stderr
-    const Task t = handleNmakeJomMessage(line);
-    if (!t.isNull()) {
-        flush();
-        m_lastTask = t;
-        m_lines = 1;
+    if (const Task t = handleNmakeJomMessage(line); !t.isNull()) {
+        setCurrentTask(t);
         return Status::InProgress;
     }
+
     return Status::NotHandled;
 }
 
+bool MsvcParser::isContinuation(const QString &line) const
+{
+    return line.contains("note: ");
+}
+
 MsvcParser::Result MsvcParser::processCompileLine(const QString &line)
 {
     QRegularExpressionMatch match = m_compileRegExp.match(line);
     if (match.hasMatch()) {
         QPair<FilePath, int> position = parseFileName(match.captured(1));
         const FilePath filePath = absoluteFilePath(position.first);
-        LinkSpecs lineLinkSpecs;
-        addLinkSpecForAbsoluteFilePath(lineLinkSpecs, filePath, position.second, match, 1);
-        LinkSpecs detailsLinkSpecs = lineLinkSpecs;
-        if (!m_lastTask.isNull() && line.contains("note: ")) {
-            const int offset = std::accumulate(m_lastTask.details.cbegin(),
-                    m_lastTask.details.cend(), 0,
-                    [](int total, const QString &line) { return total + line.length() + 1;});
-            for (LinkSpec &ls : detailsLinkSpecs)
-                ls.startPos += offset;
-            ++m_lines;
-        } else {
-            flush();
-            m_lastTask = CompileTask(taskType(match.captured(2)),
-                                     match.captured(3) + match.captured(4).trimmed(), // description
-                                     filePath, position.second);
-            m_lines = 1;
-        }
-        m_linkSpecs << detailsLinkSpecs;
-        m_lastTask.details.append(line);
-        return {Status::InProgress, lineLinkSpecs};
+        LinkSpecs linkSpecs;
+        addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, position.second, -1, match, 1);
+        const QString &description = match.captured(3) + match.captured(4).trimmed();
+        createOrAmendTask(
+            taskType(match.captured(2)),
+            description,
+            line,
+            false,
+            filePath,
+            position.second,
+            0,
+            linkSpecs);
+        return {Status::InProgress, linkSpecs};
     }
 
     flush();
     return Status::NotHandled;
 }
 
-void MsvcParser::flush()
-{
-    if (m_lastTask.isNull())
-        return;
-
-    if (m_lastTask.details.count() == 1)
-        m_lastTask.details.clear();
-    setDetailsFormat(m_lastTask, m_linkSpecs);
-    Task t = m_lastTask;
-    m_lastTask.clear();
-    m_linkSpecs.clear();
-    scheduleTask(t, m_lines, 1);
-}
-
 // --------------------------------------------------------------------------
 // ClangClParser: The compiler errors look similar to MSVC, except that the
 // column number is also given and there are no 4digit CXXXX error numbers.
@@ -219,11 +194,8 @@ static inline bool isClangCodeMarker(const QString &trimmedLine)
 OutputLineParser::Result ClangClParser::handleLine(const QString &line, OutputFormat type)
 {
     if (type == StdOutFormat) {
-        const Task t = handleNmakeJomMessage(line);
-        if (!t.isNull()) {
-            flush();
-            m_lastTask = t;
-            m_linkedLines = 1;
+        if (const Task t = handleNmakeJomMessage(line); !t.isNull()) {
+            setCurrentTask(t);
             flush();
             return Status::Done;
         }
@@ -231,11 +203,8 @@ OutputLineParser::Result ClangClParser::handleLine(const QString &line, OutputFo
     }
     const QString lne = rightTrimmed(line); // Strip \n.
 
-    const Task t = handleNmakeJomMessage(lne);
-    if (!t.isNull()) {
-        flush();
-        m_lastTask = t;
-        m_linkedLines = 1;
+    if (const Task t = handleNmakeJomMessage(lne); !t.isNull()) {
+        setCurrentTask(t);
         flush();
         return Status::Done;
     }
@@ -256,36 +225,28 @@ OutputLineParser::Result ClangClParser::handleLine(const QString &line, OutputFo
     if (match.hasMatch()) {
         flush();
         const QPair<FilePath, int> position = parseFileName(match.captured(1));
-        m_lastTask = CompileTask(taskType(match.captured(2)), match.captured(3).trimmed(),
-                                 absoluteFilePath(position.first), position.second);
-        m_linkedLines = 1;
+        const FilePath file = absoluteFilePath(position.first);
+        const int lineNo = position.second;
         LinkSpecs linkSpecs;
-        addLinkSpecForAbsoluteFilePath(linkSpecs, m_lastTask.file, m_lastTask.line, match, 1);
+        addLinkSpecForAbsoluteFilePath(linkSpecs, file, lineNo, -1, match, 1);
+        createOrAmendTask(
+            taskType(match.captured(2)), match.captured(3).trimmed(), line, false, file, lineNo);
         return {Status::InProgress, linkSpecs};
     }
 
-    if (!m_lastTask.isNull()) {
+    if (!currentTask().isNull()) {
         const QString trimmed = lne.trimmed();
         if (isClangCodeMarker(trimmed)) {
             flush();
             return Status::Done;
         }
-        m_lastTask.details.append(trimmed);
-        ++m_linkedLines;
+        createOrAmendTask(Task::Unknown, {}, line, true);
         return Status::InProgress;
     }
 
     return Status::NotHandled;
 }
 
-void ClangClParser::flush()
-{
-    if (!m_lastTask.isNull()) {
-        scheduleTask(m_lastTask, m_linkedLines, 1);
-        m_lastTask.clear();
-    }
-}
-
 // Unit tests:
 
 #ifdef WITH_TESTS
@@ -619,32 +580,23 @@ void ProjectExplorerTest::testClangClOutputParsers_data()
     QTest::addColumn<Tasks >("tasks");
     QTest::addColumn<QString>("outputLines");
 
-    const QString warning1 = "private field 'm_version' is not used [-Wunused-private-field]\n"
-                             "const int m_version; //! majorVersion<<8 + minorVersion\n";
-    const QString warning2 = "unused variable 'formatTextPlainC' [-Wunused-const-variable]\n"
-                             "static const char formatTextPlainC[] = \"text/plain\";\n";
-    const QString warning3 = "unused variable 'formatTextHtmlC' [-Wunused-const-variable]\n"
-                             "static const char formatTextHtmlC[] = \"text/html\";\n";
-    const QString error1 = "unknown type name 'errr'\n"
-                           "  errr\n";
-    const QString expectedError1 = "unknown type name 'errr'\n"
-                                   "errr"; // Line 2 trimmed.
-    const QString error2 =
-            "expected unqualified-id\n"
-            "void *QWindowsGdiNativeInterface::nativeResourceForBackingStore(const QByteArray &resource, QBackingStore *bs)\n";
-
     const QString clangClCompilerLog =
             "In file included from .\\qwindowseglcontext.cpp:40:\n"
-            "./qwindowseglcontext.h(282,15) :  warning: "  + warning1 +
+            "./qwindowseglcontext.h(282,15) :  warning: private field 'm_version' is not used [-Wunused-private-field]\n"
+            "const int m_version; //! majorVersion<<8 + minorVersion\n"
             "5 warnings generated.\n"
-            ".\\qwindowsclipboard.cpp(60,19) :  warning: " + warning2 +
+            ".\\qwindowsclipboard.cpp(60,19) :  warning: unused variable 'formatTextPlainC' [-Wunused-const-variable]\n"
+            "static const char formatTextPlainC[] = \"text/plain\";\n"
             "                  ^\n"
-            ".\\qwindowsclipboard.cpp(61,19) :  warning: " + warning3 +
+            ".\\qwindowsclipboard.cpp(61,19) :  warning: unused variable 'formatTextHtmlC' [-Wunused-const-variable]\n"
+            "static const char formatTextHtmlC[] = \"text/html\";\n"
             "                  ^\n"
             "2 warnings generated.\n"
-            ".\\qwindowsgdinativeinterface.cpp(48,3) :  error: " + error1 +
+            ".\\qwindowsgdinativeinterface.cpp(48,3) :  error: unknown type name 'errr'\n"
+            "  errr\n"
             "  ^\n"
-            ".\\qwindowsgdinativeinterface.cpp(51,1) :  error: " + error2 +
+            ".\\qwindowsgdinativeinterface.cpp(51,1) :  error: expected unqualified-id\n"
+            "void *QWindowsGdiNativeInterface::nativeResourceForBackingStore(const QByteArray &resource, QBackingStore *bs)\n"
             "^\n"
             "2 errors generated.\n";
 
@@ -660,16 +612,31 @@ void ProjectExplorerTest::testClangClOutputParsers_data()
             << OutputParserTester::STDERR
             << "" << expectedStderr
             << (Tasks()
-                << CompileTask(Task::Warning, warning1.trimmed(),
-                               FilePath::fromUserInput("./qwindowseglcontext.h"), 282)
-                << CompileTask(Task::Warning, warning2.trimmed(),
-                               FilePath::fromUserInput(".\\qwindowsclipboard.cpp"), 60)
-                << CompileTask(Task::Warning, warning3.trimmed(),
-                               FilePath::fromUserInput(".\\qwindowsclipboard.cpp"), 61)
-                << CompileTask(Task::Error, expectedError1,
-                               FilePath::fromUserInput(".\\qwindowsgdinativeinterface.cpp"), 48)
-                << CompileTask(Task::Error, error2.trimmed(),
-                               FilePath::fromUserInput(".\\qwindowsgdinativeinterface.cpp"), 51))
+                << CompileTask(Task::Warning,
+                           "private field 'm_version' is not used [-Wunused-private-field]\n"
+                           "./qwindowseglcontext.h(282,15) :  warning: private field 'm_version' is not used [-Wunused-private-field]\n"
+                           "const int m_version; //! majorVersion<<8 + minorVersion",
+                           FilePath::fromUserInput("./qwindowseglcontext.h"), 282)
+                << CompileTask(Task::Warning,
+                           "unused variable 'formatTextPlainC' [-Wunused-const-variable]\n"
+                           ".\\qwindowsclipboard.cpp(60,19) :  warning: unused variable 'formatTextPlainC' [-Wunused-const-variable]\n"
+                           "static const char formatTextPlainC[] = \"text/plain\";",
+                           FilePath::fromUserInput(".\\qwindowsclipboard.cpp"), 60)
+                << CompileTask(Task::Warning,
+                           "unused variable 'formatTextHtmlC' [-Wunused-const-variable]\n"
+                           ".\\qwindowsclipboard.cpp(61,19) :  warning: unused variable 'formatTextHtmlC' [-Wunused-const-variable]\n"
+                           "static const char formatTextHtmlC[] = \"text/html\";",
+                           FilePath::fromUserInput(".\\qwindowsclipboard.cpp"), 61)
+                << CompileTask(Task::Error,
+                           "unknown type name 'errr'\n"
+                           ".\\qwindowsgdinativeinterface.cpp(48,3) :  error: unknown type name 'errr'\n"
+                           "  errr",
+                           FilePath::fromUserInput(".\\qwindowsgdinativeinterface.cpp"), 48)
+                << CompileTask(Task::Error,
+                           "expected unqualified-id\n"
+                           ".\\qwindowsgdinativeinterface.cpp(51,1) :  error: expected unqualified-id\n"
+                           "void *QWindowsGdiNativeInterface::nativeResourceForBackingStore(const QByteArray &resource, QBackingStore *bs)",
+                           FilePath::fromUserInput(".\\qwindowsgdinativeinterface.cpp"), 51))
             << "";
 
     QTest::newRow("other error")
@@ -688,9 +655,12 @@ void ProjectExplorerTest::testClangClOutputParsers_data()
                "/FoC:\\MyData\\Project_home\\cpp\build-TestForError-msvc_2017_clang-Debug\\Debug_msvc_201_47eca974c876c8b3\\TestForError.b6dd39ae\\3a52ce780950d4d9\\main.cpp.obj "
                "C:\\MyData\\Project_home\\cpp\\TestForError\\main.cpp /TP\n"
                "              ;\n"
-            << Tasks{CompileTask(Task::Error, "expected ';' after return statement\nreturn 0",
-                                 FilePath::fromUserInput("C:\\MyData\\Project_home\\cpp\\TestForError\\main.cpp"),
-                                 3)}
+            << Tasks{CompileTask(Task::Error,
+                             "expected ';' after return statement\n"
+                             "C:\\MyData\\Project_home\\cpp\\TestForError\\main.cpp(3,10): error: expected ';' after return statement\n"
+                             "return 0",
+                             FilePath::fromUserInput("C:\\MyData\\Project_home\\cpp\\TestForError\\main.cpp"),
+                             3)}
             << "";
 }
 
diff --git a/src/plugins/projectexplorer/msvcparser.h b/src/plugins/projectexplorer/msvcparser.h
index 8655ca929c3..eef1d5603b5 100644
--- a/src/plugins/projectexplorer/msvcparser.h
+++ b/src/plugins/projectexplorer/msvcparser.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include "ioutputparser.h"
-#include "task.h"
 
 #include <QRegularExpression>
 #include <QString>
@@ -22,16 +21,12 @@ public:
 
 private:
     Result handleLine(const QString &line, Utils::OutputFormat type) override;
-    void flush() override;
+    bool isContinuation(const QString &line) const override;
 
     Result processCompileLine(const QString &line);
 
     QRegularExpression m_compileRegExp;
     QRegularExpression m_additionalInfoRegExp;
-
-    Task m_lastTask;
-    LinkSpecs m_linkSpecs;
-    int m_lines = 0;
 };
 
 class PROJECTEXPLORER_EXPORT ClangClParser :  public ProjectExplorer::OutputTaskParser
@@ -43,11 +38,8 @@ public:
 
 private:
     Result handleLine(const QString &line, Utils::OutputFormat type) override;
-    void flush() override;
 
     const QRegularExpression m_compileRegExp;
-    Task m_lastTask;
-    int m_linkedLines = 0;
 };
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index 65c4432febb..9dad5e8eb67 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -17,6 +17,7 @@
 
 #include <utils/algorithm.h>
 #include <utils/async.h>
+#include <utils/datafromprocess.h>
 #include <utils/environment.h>
 #include <utils/hostosinfo.h>
 #include <utils/pathchooser.h>
@@ -42,8 +43,6 @@
 #include <QFormLayout>
 #include <QLabel>
 
-#include <utility>
-
 using namespace Utils;
 
 using namespace std::chrono_literals;
@@ -125,19 +124,19 @@ static QString platformName(MsvcToolchain::Platform t)
 static bool hostPrefersPlatform(MsvcToolchain::Platform platform)
 {
     switch (HostOsInfo::hostArchitecture()) {
-    case HostOsInfo::HostArchitectureAMD64:
+    case Utils::OsArchAMD64:
         return platform == MsvcToolchain::amd64 || platform == MsvcToolchain::amd64_arm
                || platform == MsvcToolchain::amd64_x86 || platform == MsvcToolchain::amd64_arm64;
-    case HostOsInfo::HostArchitectureX86:
+    case Utils::OsArchX86:
         return platform == MsvcToolchain::x86 || platform == MsvcToolchain::x86_amd64
                || platform == MsvcToolchain::x86_ia64 || platform == MsvcToolchain::x86_arm
                || platform == MsvcToolchain::x86_arm64;
-    case HostOsInfo::HostArchitectureArm:
+    case Utils::OsArchArm:
         return platform == MsvcToolchain::arm;
-    case HostOsInfo::HostArchitectureArm64:
+    case Utils::OsArchArm64:
         return platform == MsvcToolchain::arm64
                || platform == MsvcToolchain::arm64_x86 || platform == MsvcToolchain::arm64_amd64;
-    case HostOsInfo::HostArchitectureItanium:
+    case Utils::OsArchItanium:
         return platform == MsvcToolchain::ia64;
     default:
         return false;
@@ -152,12 +151,12 @@ static bool hostSupportsPlatform(MsvcToolchain::Platform platform)
     switch (HostOsInfo::hostArchitecture()) {
     // The x86 host toolchains are not the preferred toolchains on amd64 but they are still
     // supported by that host
-    case HostOsInfo::HostArchitectureAMD64:
+    case Utils::OsArchAMD64:
         return platform == MsvcToolchain::x86 || platform == MsvcToolchain::x86_amd64
                || platform == MsvcToolchain::x86_ia64 || platform == MsvcToolchain::x86_arm
                || platform == MsvcToolchain::x86_arm64;
     // The Arm64 host can run the cross-compilers via emulation of x86 and amd64
-    case HostOsInfo::HostArchitectureArm64:
+    case Utils::OsArchArm64:
         return platform == MsvcToolchain::x86_arm || platform == MsvcToolchain::x86_arm64
                || platform == MsvcToolchain::amd64_arm || platform == MsvcToolchain::amd64_arm64
                || platform == MsvcToolchain::x86 || platform == MsvcToolchain::x86_amd64
@@ -1152,7 +1151,7 @@ static QString wrappedMakeCommand(const QString &command)
 
 FilePath MsvcToolchain::makeCommand(const Environment &environment) const
 {
-    bool useJom = ProjectExplorerPlugin::projectExplorerSettings().useJom;
+    const bool useJom = projectExplorerSettings().useJom;
     const QString jom("jom.exe");
     const QString nmake("nmake.exe");
     Utils::FilePath tmp;
@@ -1229,8 +1228,7 @@ MsvcToolchain::Platform MsvcToolchain::platform() const
     QStringList args = m_varsBatArg.split(' ');
     if (const MsvcPlatform *entry = platformEntryFromName(args.value(0)))
         return entry->platform;
-    return Utils::HostOsInfo::hostArchitecture() == Utils::HostOsInfo::HostArchitectureAMD64 ? amd64
-                                                                                             : x86;
+    return Utils::HostOsInfo::hostArchitecture() == Utils::OsArchAMD64 ? amd64 : x86;
 }
 
 // --------------------------------------------------------------------------
@@ -1309,8 +1307,7 @@ public:
                 m_varsBatPathCombo->addItem(nativeVcVars);
             }
         }
-        const bool isAmd64
-            = Utils::HostOsInfo::hostArchitecture() == Utils::HostOsInfo::HostArchitectureAMD64;
+        const bool isAmd64 = Utils::HostOsInfo::hostArchitecture() == Utils::OsArchAMD64;
         // TODO: Add missing values to MsvcToolChain::Platform
         m_varsBatArchCombo->addItem(Tr::tr("<empty>"), isAmd64 ? MsvcToolchain::amd64 : MsvcToolchain::x86);
         m_varsBatArchCombo->addItem("x86", MsvcToolchain::x86);
@@ -1580,7 +1577,6 @@ private:
     FilePath m_filePath;
     QVersionNumber m_version;
     Abi m_defaultAbi;
-    static inline QHash<FilePath, std::pair<ClangClInfo, QDateTime>> m_cache;
 };
 
 static const MsvcToolchain *selectMsvcToolChain(const QString &displayedVarsBat,
@@ -1797,11 +1793,7 @@ Macros ClangClToolchain::msvcPredefinedMacros(const QStringList &cxxflags,
     Process cpp;
     cpp.setEnvironment(env);
     cpp.setWorkingDirectory(Utils::TemporaryDirectory::masterDirectoryFilePath());
-
-    QStringList arguments = cxxflags;
-    arguments.append(gccPredefinedMacrosOptions(language()));
-    arguments.append("-");
-    cpp.setCommand({compilerCommand(), arguments});
+    cpp.setCommand({compilerCommand(), {cxxflags, gccPredefinedMacrosOptions(language()), "-"}});
     cpp.runBlocking();
     if (cpp.result() != ProcessResult::FinishedWithSuccess) {
         // Show the warning but still parse the output.
@@ -2280,18 +2272,8 @@ ClangClInfo ClangClInfo::getInfo(const FilePath &filePath)
 {
     QTC_ASSERT(!filePath.isEmpty(), return {});
 
-    auto &entry = m_cache[filePath];
-    ClangClInfo &info = entry.first;
-    const QDateTime lastModified = filePath.lastModified();
-    if (entry.second == lastModified)
-        return info;
-
-    entry.second = lastModified;
-    Process clangClProcess;
-    clangClProcess.setCommand({filePath, {"--version"}});
-    clangClProcess.runBlocking();
-    if (clangClProcess.result() == ProcessResult::FinishedWithSuccess) {
-        const QString stdOut = clangClProcess.cleanedStdOut();
+    static const auto parser = [](const QString &stdOut) {
+        ClangClInfo info;
         const QRegularExpressionMatch versionMatch
             = QRegularExpression("clang version (\\d+(\\.\\d+)+)").match(stdOut);
         if (versionMatch.hasMatch())
@@ -2314,9 +2296,10 @@ ClangClInfo ClangClInfo::getInfo(const FilePath &filePath)
                                         detectedAbi.wordWidth());
             }
         }
-    }
-    m_cache.insert(filePath, entry);
-    return info;
+        return info;
+    };
+    const auto info = DataFromProcess<ClangClInfo>::getData({{filePath, {"--version"}}, parser});
+    return info ? *info : ClangClInfo();
 }
 
 } // namespace ProjectExplorer::Internal
diff --git a/src/plugins/projectexplorer/processparameters.cpp b/src/plugins/projectexplorer/processparameters.cpp
index a60f1059475..82d391fc589 100644
--- a/src/plugins/projectexplorer/processparameters.cpp
+++ b/src/plugins/projectexplorer/processparameters.cpp
@@ -158,7 +158,7 @@ static QString invalidCommandMessage(const QString &displayName)
     return QString("<b>%1:</b> <font color='%3'>%2</font>")
                     .arg(displayName,
                          ::Utils::Tr::tr("Invalid command"),
-                         creatorTheme()->color(Theme::TextColorError).name());
+                         creatorColor(Theme::TextColorError).name());
 }
 
 QString ProcessParameters::summary(const QString &displayName) const
diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp
index 782eadf91df..18547fcb015 100644
--- a/src/plugins/projectexplorer/processstep.cpp
+++ b/src/plugins/projectexplorer/processstep.cpp
@@ -60,8 +60,6 @@ public:
             setupProcessParameters(&param);
             return param.summary(display);
         });
-
-        addMacroExpander();
     }
 
 private:
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index 1bb1629ef79..a46f5d5eefc 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -793,20 +793,7 @@ void Project::toMap(Store &map) const
 
 FilePath Project::projectDirectory() const
 {
-    return projectDirectory(projectFilePath());
-}
-
-/*!
-    Returns the directory that contains the file \a top.
-
-    This includes the absolute path.
-*/
-
-FilePath Project::projectDirectory(const FilePath &top)
-{
-    if (top.isEmpty())
-        return {};
-    return top.absolutePath();
+    return projectFilePath().absolutePath();
 }
 
 void Project::changeRootProjectDirectory()
@@ -1265,6 +1252,14 @@ void Project::addVariablesToMacroExpander(const QByteArray &prefix,
                                             return project->projectFilePath();
                                         return {};
                                     });
+    expander->registerVariable(fullPrefix + "ProjectDirectory",
+                               //: %1 is something like "Active project"
+                               ::PE::Tr::tr("%1: Full path to Project Directory.").arg(descriptor),
+                               [projectGetter]() -> QString {
+                                   if (const Project *const project = projectGetter())
+                                       return project->projectDirectory().toUserOutput();
+                                   return {};
+                               });
     expander->registerVariable(fullPrefix + "Kit:Name",
                                //: %1 is something like "Active project"
                                ::PE::Tr::tr("%1: The name of the active kit.").arg(descriptor),
diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h
index 06508a18fe1..ec6c341bb2f 100644
--- a/src/plugins/projectexplorer/project.h
+++ b/src/plugins/projectexplorer/project.h
@@ -68,9 +68,8 @@ public:
 
     BuildSystem *createBuildSystem(Target *target) const;
 
-    Utils::FilePath projectFilePath() const;
-    Utils::FilePath projectDirectory() const;
-    static Utils::FilePath projectDirectory(const Utils::FilePath &top);
+    virtual Utils::FilePath projectFilePath() const;
+    virtual Utils::FilePath projectDirectory() const;
 
     // This does not affect nodes, only the root path.
     void changeRootProjectDirectory();
diff --git a/src/plugins/projectexplorer/projectconfiguration.cpp b/src/plugins/projectexplorer/projectconfiguration.cpp
index 33285507453..423ed95479e 100644
--- a/src/plugins/projectexplorer/projectconfiguration.cpp
+++ b/src/plugins/projectexplorer/projectconfiguration.cpp
@@ -6,6 +6,7 @@
 #include "target.h"
 
 #include <utils/algorithm.h>
+#include <utils/macroexpander.h>
 #include <utils/qtcassert.h>
 
 using namespace ProjectExplorer;
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 21741dc1cfb..8838a37645b 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -80,6 +80,7 @@
 #include "toolchainmanager.h"
 #include "toolchainoptionspage.h"
 #include "vcsannotatetaskhandler.h"
+#include "workspaceproject.h"
 
 #ifdef Q_OS_WIN
 #include "windebuginterface.h"
@@ -128,6 +129,7 @@
 
 #include <utils/action.h>
 #include <utils/algorithm.h>
+#include <utils/async.h>
 #include <utils/fileutils.h>
 #include <utils/macroexpander.h>
 #include <utils/mimeutils.h>
@@ -196,6 +198,7 @@ const int  P_MODE_SESSION         = 85;
 
 // Actions
 const char LOAD[]                 = "ProjectExplorer.Load";
+const char LOADWORKSPACE[]        = "ProjectExplorer.LoadWorkspace";
 const char UNLOAD[]               = "ProjectExplorer.Unload";
 const char UNLOADCM[]             = "ProjectExplorer.UnloadCM";
 const char UNLOADOTHERSCM[]       = "ProjectExplorer.UnloadOthersCM";
@@ -262,27 +265,7 @@ const char PROJECT_OPEN_LOCATIONS_CONTEXT_MENU[]  = "Project.P.OpenLocation.CtxM
 
 const char RECENTPROJECTS_FILE_NAMES_KEY[] = "ProjectExplorer/RecentProjects/FileNames";
 const char RECENTPROJECTS_DISPLAY_NAMES_KEY[] = "ProjectExplorer/RecentProjects/DisplayNames";
-const char BUILD_BEFORE_DEPLOY_SETTINGS_KEY[] = "ProjectExplorer/Settings/BuildBeforeDeploy";
-const char DEPLOY_BEFORE_RUN_SETTINGS_KEY[] = "ProjectExplorer/Settings/DeployBeforeRun";
-const char SAVE_BEFORE_BUILD_SETTINGS_KEY[] = "ProjectExplorer/Settings/SaveBeforeBuild";
-const char USE_JOM_SETTINGS_KEY[] = "ProjectExplorer/Settings/UseJom";
-const char ADD_LIBRARY_PATHS_TO_RUN_ENV_SETTINGS_KEY[] =
-        "ProjectExplorer/Settings/AddLibraryPathsToRunEnv";
-const char PROMPT_TO_STOP_RUN_CONTROL_SETTINGS_KEY[] =
-        "ProjectExplorer/Settings/PromptToStopRunControl";
-const char AUTO_CREATE_RUN_CONFIGS_SETTINGS_KEY[] =
-        "ProjectExplorer/Settings/AutomaticallyCreateRunConfigurations";
-const char ENVIRONMENT_ID_SETTINGS_KEY[] = "ProjectExplorer/Settings/EnvironmentId";
-const char STOP_BEFORE_BUILD_SETTINGS_KEY[] = "ProjectExplorer/Settings/StopBeforeBuild";
-const char TERMINAL_MODE_SETTINGS_KEY[] = "ProjectExplorer/Settings/TerminalMode";
-const char CLOSE_FILES_WITH_PROJECT_SETTINGS_KEY[]
-    = "ProjectExplorer/Settings/CloseFilesWithProject";
-const char CLEAR_ISSUES_ON_REBUILD_SETTINGS_KEY[] = "ProjectExplorer/Settings/ClearIssuesOnRebuild";
-const char ABORT_BUILD_ALL_ON_ERROR_SETTINGS_KEY[]
-    = "ProjectExplorer/Settings/AbortBuildAllOnError";
-const char LOW_BUILD_PRIORITY_SETTINGS_KEY[] = "ProjectExplorer/Settings/LowBuildPriority";
-const char WARN_AGAINST_NON_ASCII_BUILD_DIR_SETTINGS_KEY[] = "ProjectExplorer/Settings/WarnAgainstNonAsciiBuildDir";
-const char APP_ENV_CHANGES_SETTINGS_KEY[] = "ProjectExplorer/Settings/AppEnvChanges";
+const char RECENTPROJECTS_EXISTENCE_KEY[] = "ProjectExplorer/RecentProjects/Existence";
 
 const char CUSTOM_PARSER_COUNT_KEY[] = "ProjectExplorer/Settings/CustomParserCount";
 const char CUSTOM_PARSER_PREFIX_KEY[] = "ProjectExplorer/Settings/CustomParser";
@@ -498,6 +481,7 @@ public:
     void buildQueueFinished(bool success);
 
     void loadAction();
+    void openWorkspaceAction();
     void handleUnloadProject();
     void unloadProjectContextMenu();
     void unloadOtherProjectsContextMenu();
@@ -524,6 +508,7 @@ public:
     void setStartupProject(Project *project);
     bool closeAllFilesInProject(const Project *project);
 
+    void checkRecentProjectsAsync();
     void updateRecentProjectMenu();
     void clearRecentProjects();
     void openRecentProject(const FilePath &filePath);
@@ -561,6 +546,7 @@ public:
 
     QAction *m_newAction;
     QAction *m_loadAction;
+    QAction *m_loadWorkspaceAction;
     Action *m_unloadAction;
     Action *m_unloadActionContextMenu;
     Action *m_unloadOthersActionContextMenu;
@@ -634,13 +620,14 @@ public:
 
     QHash<QString, std::function<Project *(const FilePath &)>> m_projectCreators;
     RecentProjectsEntries m_recentProjects; // pair of filename, displayname
+    QFuture<RecentProjectsEntry> m_recentProjectsFuture;
+    QThreadPool m_recentProjectsPool;
     static const int m_maxRecentProjects = 25;
 
     FilePath m_lastOpenDirectory;
     QPointer<RunConfiguration> m_defaultRunConfiguration;
     QPointer<RunConfiguration> m_delayedRunConfiguration;
     MiniProjectTargetSelector * m_targetSelector;
-    ProjectExplorerSettings m_projectExplorerSettings;
     QList<CustomParserSettings> m_customParsers;
     bool m_shouldHaveRunConfiguration = false;
     Id m_runMode = Constants::NO_RUN_MODE;
@@ -700,7 +687,6 @@ public:
     ProjectFileWizardExtension m_projectFileWizardExtension;
 
     // Settings pages
-    ProjectExplorerSettingsPage m_projectExplorerSettingsPage;
     AppOutputSettingsPage m_appOutputSettingsPage;
     DeviceSettingsPage m_deviceSettingsPage;
     SshSettingsPage m_sshSettingsPage;
@@ -795,6 +781,25 @@ ProjectExplorerPlugin *ProjectExplorerPlugin::instance()
     return m_instance;
 }
 
+static void restoreRecentProjects(QtcSettings *s)
+{
+    const QStringList filePaths = s->value(Constants::RECENTPROJECTS_FILE_NAMES_KEY).toStringList();
+    const QStringList displayNames
+        = s->value(Constants::RECENTPROJECTS_DISPLAY_NAMES_KEY).toStringList();
+    // filename -> bool:
+    const QHash<QString, QVariant> existence
+        = s->value(Constants::RECENTPROJECTS_EXISTENCE_KEY).toHash();
+    if (QTC_GUARD(filePaths.size() == displayNames.size())) {
+        for (int i = 0; i < filePaths.size(); ++i) {
+            const bool exists = existence.value(filePaths.at(i), true).toBool();
+            dd->m_recentProjects.append(
+                {FilePath::fromUserInput(filePaths.at(i)), displayNames.at(i), exists});
+        }
+    }
+    dd->updateRecentProjectMenu();
+    dd->checkRecentProjectsAsync();
+}
+
 bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *error)
 {
     Q_UNUSED(error)
@@ -811,6 +816,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
 
     setupProjectTreeWidgetFactory();
 
+    setupProjectExplorerSettings();
+
     dd = new ProjectExplorerPluginPrivate;
 
     setupDesktopRunConfigurations();
@@ -825,6 +832,11 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     setupJsonWizardPages();
     setupJsonWizardFileGenerator();
     setupJsonWizardScannerGenerator();
+    // new plugins might add new paths via the plugin spec
+    connect(
+        PluginManager::instance(),
+        &PluginManager::pluginsChanged,
+        &JsonWizardFactory::resetSearchPaths);
 
     dd->extendFolderNavigationWidgetFactory();
 
@@ -1092,6 +1104,12 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
         cmd->setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Shift+O")));
     msessionContextMenu->addAction(cmd, Constants::G_SESSION_FILES);
 
+    // load workspace action
+    dd->m_loadWorkspaceAction = new QAction(Tr::tr("Open Workspace..."), this);
+    cmd = ActionManager::registerAction(dd->m_loadWorkspaceAction, Constants::LOADWORKSPACE);
+    mfile->addAction(cmd, Core::Constants::G_FILE_OPEN);
+    msessionContextMenu->addAction(cmd, Constants::G_SESSION_FILES);
+
     // Default open action
     dd->m_openFileAction = new QAction(Tr::tr("Open File"), this);
     cmd = ActionManager::registerAction(dd->m_openFileAction, Constants::OPENFILE,
@@ -1159,9 +1177,12 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
         ActionManager::createMenu(Constants::M_RECENTPROJECTS);
     mrecent->menu()->setTitle(Tr::tr("Recent P&rojects"));
     mrecent->setOnAllDisabledBehavior(ActionContainer::Show);
-    mfile->addMenu(mrecent, Core::Constants::G_FILE_OPEN);
-    connect(mfile->menu(), &QMenu::aboutToShow,
-            dd, &ProjectExplorerPluginPrivate::updateRecentProjectMenu);
+    mfile->addMenu(mrecent, Core::Constants::G_FILE_RECENT);
+    connect(
+        m_instance,
+        &ProjectExplorerPlugin::recentProjectsChanged,
+        dd,
+        &ProjectExplorerPluginPrivate::updateRecentProjectMenu);
 
     // unload action
     dd->m_unloadAction = new Action(Tr::tr("Close Project"), Tr::tr("Close Pro&ject \"%1\""),
@@ -1624,85 +1645,12 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
             dd, &ProjectExplorerPluginPrivate::savePersistentSettings);
     connect(qApp, &QApplication::applicationStateChanged, this, [](Qt::ApplicationState state) {
         if (!PluginManager::isShuttingDown() && state == Qt::ApplicationActive)
-            dd->updateWelcomePage();
+            dd->checkRecentProjectsAsync();
     });
 
     QtcSettings *s = ICore::settings();
-    const QStringList fileNames = s->value(Constants::RECENTPROJECTS_FILE_NAMES_KEY).toStringList();
-    const QStringList displayNames = s->value(Constants::RECENTPROJECTS_DISPLAY_NAMES_KEY)
-                                         .toStringList();
-    if (fileNames.size() == displayNames.size()) {
-        for (int i = 0; i < fileNames.size(); ++i) {
-            dd->m_recentProjects.append({FilePath::fromUserInput(fileNames.at(i)), displayNames.at(i)});
-        }
-    }
 
-    const QVariant buildBeforeDeploy = s->value(Constants::BUILD_BEFORE_DEPLOY_SETTINGS_KEY);
-    const QString buildBeforeDeployString = buildBeforeDeploy.toString();
-    if (buildBeforeDeployString == "true") { // backward compatibility with QtC < 4.12
-        dd->m_projectExplorerSettings.buildBeforeDeploy = BuildBeforeRunMode::WholeProject;
-    } else if (buildBeforeDeployString == "false") {
-        dd->m_projectExplorerSettings.buildBeforeDeploy = BuildBeforeRunMode::Off;
-    } else if (buildBeforeDeploy.isValid()) {
-        dd->m_projectExplorerSettings.buildBeforeDeploy
-                = static_cast<BuildBeforeRunMode>(buildBeforeDeploy.toInt());
-    }
-
-    static const ProjectExplorerSettings defaultSettings;
-
-    dd->m_projectExplorerSettings.deployBeforeRun
-        = s->value(Constants::DEPLOY_BEFORE_RUN_SETTINGS_KEY, defaultSettings.deployBeforeRun)
-              .toBool();
-    dd->m_projectExplorerSettings.saveBeforeBuild
-        = s->value(Constants::SAVE_BEFORE_BUILD_SETTINGS_KEY, defaultSettings.saveBeforeBuild)
-              .toBool();
-    dd->m_projectExplorerSettings.useJom
-        = s->value(Constants::USE_JOM_SETTINGS_KEY, defaultSettings.useJom).toBool();
-    dd->m_projectExplorerSettings.addLibraryPathsToRunEnv
-        = s->value(Constants::ADD_LIBRARY_PATHS_TO_RUN_ENV_SETTINGS_KEY,
-                   defaultSettings.addLibraryPathsToRunEnv)
-              .toBool();
-    dd->m_projectExplorerSettings.prompToStopRunControl
-        = s->value(Constants::PROMPT_TO_STOP_RUN_CONTROL_SETTINGS_KEY,
-                   defaultSettings.prompToStopRunControl)
-              .toBool();
-    dd->m_projectExplorerSettings.automaticallyCreateRunConfigurations
-        = s->value(Constants::AUTO_CREATE_RUN_CONFIGS_SETTINGS_KEY,
-                   defaultSettings.automaticallyCreateRunConfigurations)
-              .toBool();
-    dd->m_projectExplorerSettings.environmentId =
-            QUuid(s->value(Constants::ENVIRONMENT_ID_SETTINGS_KEY).toByteArray());
-    if (dd->m_projectExplorerSettings.environmentId.isNull())
-        dd->m_projectExplorerSettings.environmentId = QUuid::createUuid();
-    int tmp = s->value(Constants::STOP_BEFORE_BUILD_SETTINGS_KEY,
-                       int(defaultSettings.stopBeforeBuild))
-                  .toInt();
-    if (tmp < 0 || tmp > int(StopBeforeBuild::SameApp))
-        tmp = int(defaultSettings.stopBeforeBuild);
-    dd->m_projectExplorerSettings.stopBeforeBuild = StopBeforeBuild(tmp);
-    dd->m_projectExplorerSettings.terminalMode = static_cast<TerminalMode>(
-        s->value(Constants::TERMINAL_MODE_SETTINGS_KEY, int(defaultSettings.terminalMode)).toInt());
-    dd->m_projectExplorerSettings.closeSourceFilesWithProject
-        = s->value(Constants::CLOSE_FILES_WITH_PROJECT_SETTINGS_KEY,
-                   defaultSettings.closeSourceFilesWithProject)
-              .toBool();
-    dd->m_projectExplorerSettings.clearIssuesOnRebuild
-        = s->value(Constants::CLEAR_ISSUES_ON_REBUILD_SETTINGS_KEY,
-                   defaultSettings.clearIssuesOnRebuild)
-              .toBool();
-    dd->m_projectExplorerSettings.abortBuildAllOnError
-        = s->value(Constants::ABORT_BUILD_ALL_ON_ERROR_SETTINGS_KEY,
-                   defaultSettings.abortBuildAllOnError)
-              .toBool();
-    dd->m_projectExplorerSettings.lowBuildPriority
-        = s->value(Constants::LOW_BUILD_PRIORITY_SETTINGS_KEY, defaultSettings.lowBuildPriority)
-              .toBool();
-    dd->m_projectExplorerSettings.warnAgainstNonAsciiBuildDir
-        = s->value(Constants::WARN_AGAINST_NON_ASCII_BUILD_DIR_SETTINGS_KEY,
-                   defaultSettings.warnAgainstNonAsciiBuildDir)
-              .toBool();
-    dd->m_projectExplorerSettings.appEnvChanges = EnvironmentItem::fromStringList(
-        s->value(Constants::APP_ENV_CHANGES_SETTINGS_KEY).toStringList());
+    restoreRecentProjects(s);
 
     const int customParserCount = s->value(Constants::CUSTOM_PARSER_COUNT_KEY).toInt();
     for (int i = 0; i < customParserCount; ++i) {
@@ -1722,6 +1670,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
             dd, &ProjectExplorerPlugin::openNewProjectDialog);
     connect(dd->m_loadAction, &QAction::triggered,
             dd, &ProjectExplorerPluginPrivate::loadAction);
+    connect(dd->m_loadWorkspaceAction, &QAction::triggered,
+            dd, &ProjectExplorerPluginPrivate::openWorkspaceAction);
     connect(dd->m_buildProjectOnlyAction, &QAction::triggered, dd, [] {
         BuildManager::buildProjectWithoutDependencies(ProjectManager::startupProject());
     });
@@ -1950,10 +1900,11 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
 
     DeviceManager::instance()->addDevice(IDevice::Ptr(new DesktopDevice));
 
+    setupWorkspaceProject(this);
+
 #ifdef WITH_TESTS
     addTestCreator(&createSanitizerOutputParserTest);
 #endif
-
     return true;
 }
 
@@ -1983,6 +1934,30 @@ void ProjectExplorerPluginPrivate::loadAction()
     updateActions();
 }
 
+void ProjectExplorerPluginPrivate::openWorkspaceAction()
+{
+    FilePath dir = dd->m_lastOpenDirectory;
+
+    // for your special convenience, we preselect a pro file if it is
+    // the current file
+    if (const IDocument *document = EditorManager::currentDocument()) {
+        const FilePath fn = document->filePath();
+        const bool isProject = dd->m_profileMimeTypes.contains(document->mimeType());
+        dir = isProject ? fn : fn.absolutePath();
+    }
+
+    FilePath filePath = Utils::FileUtils::getExistingDirectory(
+        ICore::dialogParent(), Tr::tr("Open Workspace"), dir);
+    if (filePath.isEmpty())
+        return;
+
+    OpenProjectResult result = ProjectExplorerPlugin::openProject(filePath);
+    if (!result)
+        ProjectExplorerPlugin::showOpenProjectError(result);
+
+    updateActions();
+}
+
 void ProjectExplorerPluginPrivate::unloadProjectContextMenu()
 {
     if (Project *p = ProjectTree::currentProject())
@@ -2136,7 +2111,7 @@ void ProjectExplorerPlugin::extensionsInitialized()
 
 bool ProjectExplorerPlugin::delayedInitialize()
 {
-    NANOTRACE_SCOPE("ProjectExplorer", "ProjectExplorerPlugin::restoreKits");
+    NANOTRACE_SCOPE("ProjectExplorer", "ProjectExplorerPlugin::delayedInitialize");
     ExtraAbi::load(); // Load this before Toolchains!
     ToolchainManager::restoreToolchains();
     KitManager::restoreKits();
@@ -2145,7 +2120,7 @@ bool ProjectExplorerPlugin::delayedInitialize()
 
 void ProjectExplorerPluginPrivate::updateRunWithoutDeployMenu()
 {
-    m_runWithoutDeployAction->setVisible(m_projectExplorerSettings.deployBeforeRun);
+    m_runWithoutDeployAction->setVisible(projectExplorerSettings().deployBeforeRun);
 }
 
 IPlugin::ShutdownFlag ProjectExplorerPlugin::aboutToShutdown()
@@ -2203,6 +2178,35 @@ bool ProjectExplorerPluginPrivate::closeAllFilesInProject(const Project *project
     return EditorManager::closeDocuments(openFiles);
 }
 
+void ProjectExplorerPluginPrivate::checkRecentProjectsAsync()
+{
+    m_recentProjectsFuture.cancel();
+
+    m_recentProjectsFuture
+        = QtConcurrent::mapped(&m_recentProjectsPool, m_recentProjects, [](RecentProjectsEntry p) {
+              // check if project is available, but avoid querying devices
+              p.exists = p.filePath.needsDevice() || p.filePath.exists();
+              return p;
+          });
+    Utils::futureSynchronizer()->addFuture(m_recentProjectsFuture);
+
+    onResultReady(m_recentProjectsFuture, this, [this](const RecentProjectsEntry &p) {
+        auto it = std::find_if(
+            m_recentProjects.begin(), m_recentProjects.end(), [&p](const RecentProjectsEntry &e) {
+                return p.filePath == e.filePath;
+            });
+        // nothing to do if it no longer is in the recent projects, or if the state already was
+        // correct
+        if (it == m_recentProjects.end())
+            return;
+        if (it->exists == p.exists)
+            return;
+
+        *it = p;
+        emit m_instance->recentProjectsChanged();
+    });
+}
+
 void ProjectExplorerPluginPrivate::savePersistentSettings()
 {
     if (PluginManager::isShuttingDown())
@@ -2216,66 +2220,21 @@ void ProjectExplorerPluginPrivate::savePersistentSettings()
     QtcSettings *s = ICore::settings();
     s->remove("ProjectExplorer/RecentProjects/Files");
 
-    QStringList fileNames;
+    QStringList filePaths;
     QStringList displayNames;
+    QHash<QString, QVariant> existence;
     RecentProjectsEntries::const_iterator it, end;
     end = dd->m_recentProjects.constEnd();
     for (it = dd->m_recentProjects.constBegin(); it != end; ++it) {
-        fileNames << (*it).first.toUserOutput();
-        displayNames << (*it).second;
+        const QString filePath = it->filePath.toUserOutput();
+        filePaths << filePath;
+        displayNames << it->displayName;
+        existence.insert(filePath, it->exists);
     }
 
-    s->setValueWithDefault(Constants::RECENTPROJECTS_FILE_NAMES_KEY, fileNames);
+    s->setValueWithDefault(Constants::RECENTPROJECTS_FILE_NAMES_KEY, filePaths);
     s->setValueWithDefault(Constants::RECENTPROJECTS_DISPLAY_NAMES_KEY, displayNames);
-
-    static const ProjectExplorerSettings defaultSettings;
-
-    s->setValueWithDefault(Constants::BUILD_BEFORE_DEPLOY_SETTINGS_KEY,
-                           int(dd->m_projectExplorerSettings.buildBeforeDeploy),
-                           int(defaultSettings.buildBeforeDeploy));
-    s->setValueWithDefault(Constants::DEPLOY_BEFORE_RUN_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.deployBeforeRun,
-                           defaultSettings.deployBeforeRun);
-    s->setValueWithDefault(Constants::SAVE_BEFORE_BUILD_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.saveBeforeBuild,
-                           defaultSettings.saveBeforeBuild);
-    s->setValueWithDefault(Constants::USE_JOM_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.useJom,
-                           defaultSettings.useJom);
-    s->setValueWithDefault(Constants::ADD_LIBRARY_PATHS_TO_RUN_ENV_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.addLibraryPathsToRunEnv,
-                           defaultSettings.addLibraryPathsToRunEnv);
-    s->setValueWithDefault(Constants::PROMPT_TO_STOP_RUN_CONTROL_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.prompToStopRunControl,
-                           defaultSettings.prompToStopRunControl);
-    s->setValueWithDefault(Constants::TERMINAL_MODE_SETTINGS_KEY,
-                           int(dd->m_projectExplorerSettings.terminalMode),
-                           int(defaultSettings.terminalMode));
-    s->setValueWithDefault(Constants::CLOSE_FILES_WITH_PROJECT_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.closeSourceFilesWithProject,
-                           defaultSettings.closeSourceFilesWithProject);
-    s->setValueWithDefault(Constants::CLEAR_ISSUES_ON_REBUILD_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.clearIssuesOnRebuild,
-                           defaultSettings.clearIssuesOnRebuild);
-    s->setValueWithDefault(Constants::ABORT_BUILD_ALL_ON_ERROR_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.abortBuildAllOnError,
-                           defaultSettings.abortBuildAllOnError);
-    s->setValueWithDefault(Constants::LOW_BUILD_PRIORITY_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.lowBuildPriority,
-                           defaultSettings.lowBuildPriority);
-    s->setValueWithDefault(Constants::WARN_AGAINST_NON_ASCII_BUILD_DIR_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.warnAgainstNonAsciiBuildDir,
-                           defaultSettings.warnAgainstNonAsciiBuildDir);
-    s->setValueWithDefault(Constants::AUTO_CREATE_RUN_CONFIGS_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.automaticallyCreateRunConfigurations,
-                           defaultSettings.automaticallyCreateRunConfigurations);
-    s->setValueWithDefault(Constants::ENVIRONMENT_ID_SETTINGS_KEY,
-                           dd->m_projectExplorerSettings.environmentId.toByteArray());
-    s->setValueWithDefault(Constants::STOP_BEFORE_BUILD_SETTINGS_KEY,
-                           int(dd->m_projectExplorerSettings.stopBeforeBuild),
-                           int(defaultSettings.stopBeforeBuild));
-    s->setValueWithDefault(Constants::APP_ENV_CHANGES_SETTINGS_KEY,
-                           EnvironmentItem::toStringList(dd->m_projectExplorerSettings.appEnvChanges));
+    s->setValueWithDefault(Constants::RECENTPROJECTS_EXISTENCE_KEY, existence);
 
     buildPropertiesSettings().writeSettings(); // FIXME: Should not be needed.
 
@@ -2362,10 +2321,7 @@ OpenProjectResult ProjectExplorerPlugin::openProjects(const FilePaths &filePaths
 
         MimeType mt = Utils::mimeTypeForFile(filePath);
         if (ProjectManager::canOpenProjectForMimeType(mt)) {
-            if (!filePath.isFile()) {
-                appendError(errorString,
-                            Tr::tr("Failed opening project \"%1\": Project is not a file.").arg(filePath.toUserOutput()));
-            } else if (Project *pro = ProjectManager::openProject(mt, filePath)) {
+            if (Project *pro = ProjectManager::openProject(mt, filePath)) {
                 QString restoreError;
                 Project::RestoreResult restoreResult = pro->restoreSettings(&restoreError);
                 if (restoreResult == Project::RestoreResult::Ok) {
@@ -2501,12 +2457,20 @@ QList<std::pair<FilePath, FilePath>> ProjectExplorerPlugin::renameFiles(
 }
 
 #ifdef WITH_TESTS
-bool ProjectExplorerPlugin::renameFile(const Utils::FilePath &source, const Utils::FilePath &target)
+bool ProjectExplorerPlugin::renameFile(const Utils::FilePath &source, const Utils::FilePath &target,
+                                       Project *project)
 {
-    const bool success = Core::FileUtils::renameFile(source, target, HandleIncludeGuards::Yes);
-    if (success)
-        emit ProjectExplorerPlugin::instance()->filesRenamed({std::make_pair(source, target)});
-    return success;
+    if (!project) {
+        const bool success = Core::FileUtils::renameFile(source, target, HandleIncludeGuards::Yes);
+        if (success)
+            emit ProjectExplorerPlugin::instance()->filesRenamed({std::make_pair(source, target)});
+        return success;
+    }
+    Node * const sourceNode = const_cast<Node *>(project->nodeForFilePath(source));
+    if (!sourceNode)
+        return false;
+    return !renameFiles({std::make_pair(sourceNode, target)}).isEmpty();
+
 }
 #endif // WITH_TESTS
 
@@ -2527,6 +2491,12 @@ void ProjectExplorerPluginPrivate::startRunControl(RunControl *runControl)
     ++m_activeRunControlCount;
     runControl->initiateStart();
     doUpdateRunActions();
+    connect(runControl, &RunControl::started, m_instance, [runControl] {
+        emit m_instance->runControlStarted(runControl);
+    });
+    connect(runControl, &RunControl::stopped, m_instance, [runControl] {
+        emit m_instance->runControlStoped(runControl);
+    });
 }
 
 void ProjectExplorerPluginPrivate::showOutputPaneForRunControl(RunControl *runControl)
@@ -2588,10 +2558,7 @@ void ProjectExplorerPluginPrivate::buildQueueFinished(bool success)
 
 RecentProjectsEntries ProjectExplorerPluginPrivate::recentProjects() const
 {
-    return Utils::filtered(dd->m_recentProjects, [](const RecentProjectsEntry &p) {
-        // check if project is available, but avoid querying devices
-        return p.first.needsDevice() || p.first.isFile();
-    });
+    return filtered(m_recentProjects, &RecentProjectsEntry::exists);
 }
 
 void ProjectExplorerPluginPrivate::updateActions()
@@ -2723,7 +2690,7 @@ bool ProjectExplorerPlugin::saveModifiedFiles()
 {
     QList<IDocument *> documentsToSave = DocumentManager::modifiedDocuments();
     if (!documentsToSave.isEmpty()) {
-        if (dd->m_projectExplorerSettings.saveBeforeBuild) {
+        if (projectExplorerSettings().saveBeforeBuild) {
             bool cancelled = false;
             DocumentManager::saveModifiedDocumentsSilently(documentsToSave, &cancelled);
             if (cancelled)
@@ -2738,7 +2705,7 @@ bool ProjectExplorerPlugin::saveModifiedFiles()
             }
 
             if (alwaysSave)
-                dd->m_projectExplorerSettings.saveBeforeBuild = true;
+                setSaveBeforeBuildSettings(true);
         }
     }
     return true;
@@ -3054,7 +3021,7 @@ void ProjectExplorerPluginPrivate::updateDeployActions()
                               && !BuildManager::isBuilding(currentProject)
                               && hasDeploySettings(currentProject);
 
-    if (m_projectExplorerSettings.buildBeforeDeploy != BuildBeforeRunMode::Off) {
+    if (projectExplorerSettings().buildBeforeDeploy != BuildBeforeRunMode::Off) {
         if (hasBuildSettings(project)
                 && !buildSettingsEnabled(project).first)
             enableDeployActions = false;
@@ -3072,7 +3039,7 @@ void ProjectExplorerPluginPrivate::updateDeployActions()
     m_deployProjectOnlyAction->setEnabled(enableDeployActions);
 
     bool enableDeploySessionAction = true;
-    if (m_projectExplorerSettings.buildBeforeDeploy != BuildBeforeRunMode::Off) {
+    if (projectExplorerSettings().buildBeforeDeploy != BuildBeforeRunMode::Off) {
         auto hasDisabledBuildConfiguration = [](Project *project) {
             return project && project->activeTarget()
                     && project->activeTarget()->activeBuildConfiguration()
@@ -3116,8 +3083,8 @@ expected_str<void> ProjectExplorerPlugin::canRunStartupProject(Utils::Id runMode
     if (!activeRC->isEnabled(runMode))
         return make_unexpected(activeRC->disabledReason(runMode));
 
-    if (dd->m_projectExplorerSettings.buildBeforeDeploy != BuildBeforeRunMode::Off
-            && dd->m_projectExplorerSettings.deployBeforeRun
+    if (projectExplorerSettings().buildBeforeDeploy != BuildBeforeRunMode::Off
+            && projectExplorerSettings().deployBeforeRun
             && !BuildManager::isBuilding(project)
             && hasBuildSettings(project)) {
         QPair<bool, QString> buildState = dd->buildSettingsEnabled(project);
@@ -3155,16 +3122,13 @@ void ProjectExplorerPluginPrivate::addToRecentProjects(const FilePath &filePath,
     if (filePath.isEmpty())
         return;
 
-    RecentProjectsEntries::iterator it;
-    for (it = m_recentProjects.begin(); it != m_recentProjects.end();)
-        if ((*it).first == filePath)
-            it = m_recentProjects.erase(it);
-        else
-            ++it;
-
-    if (m_recentProjects.count() > m_maxRecentProjects)
+    Utils::erase(m_recentProjects, [filePath](const RecentProjectsEntry &e) {
+        return e.filePath == filePath;
+    });
+    if (m_recentProjects.size() >= m_maxRecentProjects)
         m_recentProjects.removeLast();
-    m_recentProjects.push_front({filePath, displayName});
+    m_recentProjects.push_front({filePath, displayName, true});
+    checkRecentProjectsAsync();
     m_lastOpenDirectory = filePath.absolutePath();
     emit m_instance->recentProjectsChanged();
 }
@@ -3191,7 +3155,7 @@ void ProjectExplorerPluginPrivate::updateRecentProjectMenu()
     const RecentProjectsEntries projects = recentProjects();
     //projects (ignore sessions, they used to be in this list)
     for (const RecentProjectsEntry &item : projects) {
-        const FilePath &filePath = item.first;
+        const FilePath &filePath = item.filePath;
         if (filePath.endsWith(QLatin1String(".qws")))
             continue;
 
@@ -3216,13 +3180,12 @@ void ProjectExplorerPluginPrivate::updateRecentProjectMenu()
         connect(action, &QAction::triggered,
                 this, &ProjectExplorerPluginPrivate::clearRecentProjects);
     }
-    emit m_instance->recentProjectsChanged();
 }
 
 void ProjectExplorerPluginPrivate::clearRecentProjects()
 {
     m_recentProjects.clear();
-    updateWelcomePage();
+    emit m_instance->recentProjectsChanged();
 }
 
 void ProjectExplorerPluginPrivate::openRecentProject(const FilePath &filePath)
@@ -3238,8 +3201,10 @@ void ProjectExplorerPluginPrivate::removeFromRecentProjects(const FilePath &file
 {
     QTC_ASSERT(!filePath.isEmpty(), return);
     QTC_CHECK(Utils::eraseOne(m_recentProjects, [filePath](const RecentProjectsEntry &entry) {
-        return entry.first == filePath;
+        return entry.filePath == filePath;
     }));
+    checkRecentProjectsAsync();
+    emit m_instance->recentProjectsChanged();
 }
 
 void ProjectExplorerPluginPrivate::invalidateProject(Project *project)
@@ -3687,7 +3652,7 @@ void ProjectExplorerPluginPrivate::openTerminalHere(const EnvironmentGetter &env
     }
 
     if (buildDevice->rootPath().needsDevice())
-        Terminal::Hooks::instance().openTerminal({CommandLine{*shell, {}}, workingDir, environment});
+        Terminal::Hooks::instance().openTerminal({CommandLine{*shell}, workingDir, environment});
     else
         Terminal::Hooks::instance().openTerminal({workingDir, environment});
 }
@@ -3727,8 +3692,8 @@ void ProjectExplorerPluginPrivate::openTerminalHereWithRunEnv()
     }
 
     if (device->rootPath().needsDevice()) {
-        Terminal::Hooks::instance().openTerminal(
-            {CommandLine{*shell, {}}, workingDir, runnable.environment});
+        Terminal::Hooks::instance().openTerminal({CommandLine{*shell}, workingDir,
+                                                  runnable.environment});
     } else {
         Terminal::Hooks::instance().openTerminal({workingDir, runnable.environment});
     }
@@ -3912,7 +3877,7 @@ ProjectExplorerPlugin::renameFile(Node *node, const QString &newFileName)
 
     const FilePath newFilePath = FilePath::fromString(newFileName);
 
-    if (oldFilePath == newFilePath)
+    if (oldFilePath.equalsCaseSensitive(newFilePath))
         return {};
 
     const HandleIncludeGuards handleGuards = canTryToRenameIncludeGuards(node);
@@ -3968,21 +3933,6 @@ void ProjectExplorerPluginPrivate::handleSetStartupProject()
     setStartupProject(ProjectTree::currentProject());
 }
 
-void ProjectExplorerPlugin::setProjectExplorerSettings(const ProjectExplorerSettings &pes)
-{
-    QTC_ASSERT(dd->m_projectExplorerSettings.environmentId == pes.environmentId, return);
-
-    if (dd->m_projectExplorerSettings == pes)
-        return;
-    dd->m_projectExplorerSettings = pes;
-    emit m_instance->settingsChanged();
-}
-
-const ProjectExplorerSettings &ProjectExplorerPlugin::projectExplorerSettings()
-{
-    return dd->m_projectExplorerSettings;
-}
-
 void ProjectExplorerPlugin::setAppOutputSettings(const AppOutputSettings &settings)
 {
     dd->m_outputPane.setSettings(settings);
diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h
index ffb5d1bcd3c..3c932f759e8 100644
--- a/src/plugins/projectexplorer/projectexplorer.h
+++ b/src/plugins/projectexplorer/projectexplorer.h
@@ -29,7 +29,6 @@ class CustomParserSettings;
 class FolderNode;
 class Node;
 class Project;
-class ProjectExplorerSettings;
 class RunControl;
 class RunConfiguration;
 
@@ -38,7 +37,14 @@ class AppOutputSettings;
 class MiniProjectTargetSelector;
 }
 
-using RecentProjectsEntry = QPair<Utils::FilePath, QString>;
+class RecentProjectsEntry
+{
+public:
+    Utils::FilePath filePath;
+    QString displayName;
+    bool exists = true;
+};
+
 using RecentProjectsEntries = QList<RecentProjectsEntry>;
 
 class PROJECTEXPLORER_EXPORT OpenProjectResult
@@ -110,9 +116,6 @@ public:
     bool delayedInitialize() override;
     ShutdownFlag aboutToShutdown() override;
 
-    static void setProjectExplorerSettings(const ProjectExplorerSettings &pes);
-    static const ProjectExplorerSettings &projectExplorerSettings();
-
     static void setAppOutputSettings(const Internal::AppOutputSettings &settings);
     static const Internal::AppOutputSettings &appOutputSettings();
 
@@ -128,7 +131,8 @@ public:
     renameFiles(const QList<std::pair<Node *, Utils::FilePath>> &nodesAndNewFilePaths);
 
 #ifdef WITH_TESTS
-    static bool renameFile(const Utils::FilePath &source, const Utils::FilePath &target);
+    static bool renameFile(const Utils::FilePath &source, const Utils::FilePath &target,
+                           Project *project = nullptr);
 #endif
 
     static QStringList projectFilePatterns();
@@ -178,6 +182,8 @@ signals:
     void customParsersChanged();
 
     void runActionsUpdated();
+    void runControlStarted(ProjectExplorer::RunControl *runControl);
+    void runControlStoped(ProjectExplorer::RunControl *runControl);
 
     void filesRenamed(const QList<std::pair<Utils::FilePath, Utils::FilePath>> &oldAndNewPaths);
 
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index feab87da1ba..bce24dc1361 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -154,6 +154,7 @@ QtcPlugin {
             "vcsannotatetaskhandler.cpp", "vcsannotatetaskhandler.h",
             "waitforstopdialog.cpp", "waitforstopdialog.h",
             "windebuginterface.cpp", "windebuginterface.h",
+            "workspaceproject.cpp", "workspaceproject.h",
             "xcodebuildparser.cpp", "xcodebuildparser.h"
         ]
     }
diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc
index 0926397f423..248fe4e591b 100644
--- a/src/plugins/projectexplorer/projectexplorer.qrc
+++ b/src/plugins/projectexplorer/projectexplorer.qrc
@@ -26,10 +26,8 @@
         <file>images/devicestatusindicator@2x.png</file>
         <file>images/build.png</file>
         <file>images/build@2x.png</file>
-        <file>images/build_hammerhandle_mask.png</file>
-        <file>images/build_hammerhandle_mask@2x.png</file>
-        <file>images/build_hammerhead_mask.png</file>
-        <file>images/build_hammerhead_mask@2x.png</file>
+        <file>images/build_hammer_mask.png</file>
+        <file>images/build_hammer_mask@2x.png</file>
         <file>images/targetpanel_bottom.png</file>
         <file>images/window.png</file>
         <file>images/buildstepdisable.png</file>
diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h
index ca0fe5c9e09..8a053c243d8 100644
--- a/src/plugins/projectexplorer/projectexplorerconstants.h
+++ b/src/plugins/projectexplorer/projectexplorerconstants.h
@@ -88,6 +88,7 @@ const char BUILD_AND_RUN_SETTINGS_CATEGORY[]  = "K.BuildAndRun";
 
 // Build and Run page
 const char BUILD_AND_RUN_SETTINGS_PAGE_ID[] = "A.ProjectExplorer.BuildAndRunOptions";
+const char SHOW_ALL_KITS_SETTINGS_KEY[] = "ProjectExplorer/Settings/ShowAllKits";
 
 // Device settings page
 const char DEVICE_SETTINGS_CATEGORY[] = "AM.Devices";
@@ -170,6 +171,7 @@ const char NORMAL_RUN_MODE[]="RunConfiguration.NormalRunMode";
 const char DEBUG_RUN_MODE[]="RunConfiguration.DebugRunMode";
 const char DAP_CMAKE_DEBUG_RUN_MODE[]="RunConfiguration.CmakeDebugRunMode";
 const char DAP_GDB_DEBUG_RUN_MODE[]="RunConfiguration.DapGdbDebugRunMode";
+const char DAP_LLDB_DEBUG_RUN_MODE[]="RunConfiguration.DapLldbDebugRunMode";
 const char DAP_PY_DEBUG_RUN_MODE[]="RunConfiguration.DapPyDebugRunMode";
 const char QML_PROFILER_RUN_MODE[]="RunConfiguration.QmlProfilerRunMode";
 const char QML_PROFILER_RUNNER[]="RunConfiguration.QmlProfilerRunner";
diff --git a/src/plugins/projectexplorer/projectexplorericons.cpp b/src/plugins/projectexplorer/projectexplorericons.cpp
index 2a61f5bb2f8..0d4440b4aee 100644
--- a/src/plugins/projectexplorer/projectexplorericons.cpp
+++ b/src/plugins/projectexplorer/projectexplorericons.cpp
@@ -10,14 +10,12 @@ namespace Icons {
 
 const Icon BUILD(":/projectexplorer/images/build.png");
 const Icon BUILD_FLAT({
-        {":/projectexplorer/images/build_hammerhandle_mask.png", Theme::IconsBuildHammerHandleColor},
-        {":/projectexplorer/images/build_hammerhead_mask.png", Theme::IconsBuildHammerHeadColor}});
+        {":/projectexplorer/images/build_hammer_mask.png", Theme::IconsBaseColor}});
 const Icon BUILD_SMALL({
         {":/projectexplorer/images/buildhammerhandle.png", Theme::IconsBuildHammerHandleColor},
         {":/projectexplorer/images/buildhammerhead.png", Theme::IconsBuildHammerHeadColor}}, Icon::Tint);
 const Icon CANCELBUILD_FLAT({
-        {":/projectexplorer/images/build_hammerhandle_mask.png", Theme::IconsDisabledColor},
-        {":/projectexplorer/images/build_hammerhead_mask.png", Theme::IconsDisabledColor},
+        {":/projectexplorer/images/build_hammer_mask.png", Theme::IconsBaseColor},
         {":/projectexplorer/images/cancelbuild_overlay.png", Theme::IconsStopToolBarColor}},
         Icon::Tint | Icon::PunchEdges);
 const Icon REBUILD({
diff --git a/src/plugins/projectexplorer/projectexplorersettings.cpp b/src/plugins/projectexplorer/projectexplorersettings.cpp
index b99a38d461d..a45872eeff3 100644
--- a/src/plugins/projectexplorer/projectexplorersettings.cpp
+++ b/src/plugins/projectexplorer/projectexplorersettings.cpp
@@ -9,7 +9,9 @@
 #include "projectexplorertr.h"
 
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/dialogs/ioptionspage.h>
 #include <coreplugin/documentmanager.h>
+#include <coreplugin/icore.h>
 
 #include <utils/environmentdialog.h>
 #include <utils/layoutbuilder.h>
@@ -23,14 +25,229 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QRadioButton>
+#include <QSpinBox>
 
 using namespace Core;
 using namespace Utils;
 
-namespace ProjectExplorer::Internal {
+namespace ProjectExplorer {
+namespace Internal {
+
+namespace Constants {
+const char REAPER_TIMEOUT_SETTINGS_KEY[] = "ProjectExplorer/Settings/ReaperTimeout";
+const char BUILD_BEFORE_DEPLOY_SETTINGS_KEY[] = "ProjectExplorer/Settings/BuildBeforeDeploy";
+const char DEPLOY_BEFORE_RUN_SETTINGS_KEY[] = "ProjectExplorer/Settings/DeployBeforeRun";
+const char SAVE_BEFORE_BUILD_SETTINGS_KEY[] = "ProjectExplorer/Settings/SaveBeforeBuild";
+const char USE_JOM_SETTINGS_KEY[] = "ProjectExplorer/Settings/UseJom";
+const char ADD_LIBRARY_PATHS_TO_RUN_ENV_SETTINGS_KEY[] =
+        "ProjectExplorer/Settings/AddLibraryPathsToRunEnv";
+const char PROMPT_TO_STOP_RUN_CONTROL_SETTINGS_KEY[] =
+        "ProjectExplorer/Settings/PromptToStopRunControl";
+const char AUTO_CREATE_RUN_CONFIGS_SETTINGS_KEY[] =
+        "ProjectExplorer/Settings/AutomaticallyCreateRunConfigurations";
+const char ENVIRONMENT_ID_SETTINGS_KEY[] = "ProjectExplorer/Settings/EnvironmentId";
+const char STOP_BEFORE_BUILD_SETTINGS_KEY[] = "ProjectExplorer/Settings/StopBeforeBuild";
+const char TERMINAL_MODE_SETTINGS_KEY[] = "ProjectExplorer/Settings/TerminalMode";
+const char CLOSE_FILES_WITH_PROJECT_SETTINGS_KEY[]
+    = "ProjectExplorer/Settings/CloseFilesWithProject";
+const char CLEAR_ISSUES_ON_REBUILD_SETTINGS_KEY[] = "ProjectExplorer/Settings/ClearIssuesOnRebuild";
+const char ABORT_BUILD_ALL_ON_ERROR_SETTINGS_KEY[]
+    = "ProjectExplorer/Settings/AbortBuildAllOnError";
+const char LOW_BUILD_PRIORITY_SETTINGS_KEY[] = "ProjectExplorer/Settings/LowBuildPriority";
+const char APP_ENV_CHANGES_SETTINGS_KEY[] = "ProjectExplorer/Settings/AppEnvChanges";
+const char WARN_AGAINST_NON_ASCII_BUILD_DIR_SETTINGS_KEY[]
+    = "ProjectExplorer/Settings/WarnAgainstNonAsciiBuildDir";
+
+} // Constants
 
 enum { UseCurrentDirectory, UseProjectDirectory };
 
+void saveProjectExplorerSettings();
+
+static bool operator==(const ProjectExplorerSettings &p1, const ProjectExplorerSettings &p2)
+{
+    return p1.buildBeforeDeploy == p2.buildBeforeDeploy
+            && p1.reaperTimeoutInSeconds == p2.reaperTimeoutInSeconds
+            && p1.deployBeforeRun == p2.deployBeforeRun
+            && p1.saveBeforeBuild == p2.saveBeforeBuild
+            && p1.useJom == p2.useJom
+            && p1.prompToStopRunControl == p2.prompToStopRunControl
+            && p1.automaticallyCreateRunConfigurations == p2.automaticallyCreateRunConfigurations
+            && p1.addLibraryPathsToRunEnv == p2.addLibraryPathsToRunEnv
+            && p1.environmentId == p2.environmentId
+            && p1.stopBeforeBuild == p2.stopBeforeBuild
+            && p1.terminalMode == p2.terminalMode
+            && p1.closeSourceFilesWithProject == p2.closeSourceFilesWithProject
+            && p1.clearIssuesOnRebuild == p2.clearIssuesOnRebuild
+            && p1.abortBuildAllOnError == p2.abortBuildAllOnError
+            && p1.appEnvChanges == p2.appEnvChanges
+            && p1.lowBuildPriority == p2.lowBuildPriority
+            && p1.warnAgainstNonAsciiBuildDir == p2.warnAgainstNonAsciiBuildDir
+            && p1.showAllKits == p2.showAllKits;
+}
+
+ProjectExplorerSettings &mutableProjectExplorerSettings()
+{
+    static ProjectExplorerSettings theProjectExplorerSettings;
+    return theProjectExplorerSettings;
+}
+
+void setPromptToStopSettings(bool promptToStop)
+{
+    mutableProjectExplorerSettings().prompToStopRunControl = promptToStop;
+    saveProjectExplorerSettings();
+    emit ProjectExplorerPlugin::instance()->settingsChanged();
+}
+
+void setSaveBeforeBuildSettings(bool saveBeforeBuild)
+{
+    mutableProjectExplorerSettings().saveBeforeBuild = saveBeforeBuild;
+    saveProjectExplorerSettings();
+}
+
+static void loadProjectExplorerSettings()
+{
+    QtcSettings *s = ICore::settings();
+
+    const QVariant buildBeforeDeploy = s->value(Constants::BUILD_BEFORE_DEPLOY_SETTINGS_KEY);
+    const QString buildBeforeDeployString = buildBeforeDeploy.toString();
+    ProjectExplorerSettings &settings = mutableProjectExplorerSettings();
+    if (buildBeforeDeployString == "true") { // backward compatibility with QtC < 4.12
+        settings.buildBeforeDeploy = BuildBeforeRunMode::WholeProject;
+    } else if (buildBeforeDeployString == "false") {
+        settings.buildBeforeDeploy = BuildBeforeRunMode::Off;
+    } else if (buildBeforeDeploy.isValid()) {
+        settings.buildBeforeDeploy
+                = static_cast<BuildBeforeRunMode>(buildBeforeDeploy.toInt());
+    }
+
+    static const ProjectExplorerSettings defaultSettings;
+
+    settings.reaperTimeoutInSeconds
+        = s->value(Constants::REAPER_TIMEOUT_SETTINGS_KEY, defaultSettings.reaperTimeoutInSeconds)
+              .toInt();
+    settings.deployBeforeRun
+        = s->value(Constants::DEPLOY_BEFORE_RUN_SETTINGS_KEY, defaultSettings.deployBeforeRun)
+              .toBool();
+    settings.saveBeforeBuild
+        = s->value(Constants::SAVE_BEFORE_BUILD_SETTINGS_KEY, defaultSettings.saveBeforeBuild)
+              .toBool();
+    settings.useJom
+        = s->value(Constants::USE_JOM_SETTINGS_KEY, defaultSettings.useJom).toBool();
+    settings.addLibraryPathsToRunEnv
+        = s->value(Constants::ADD_LIBRARY_PATHS_TO_RUN_ENV_SETTINGS_KEY,
+                   defaultSettings.addLibraryPathsToRunEnv)
+              .toBool();
+    settings.prompToStopRunControl
+        = s->value(Constants::PROMPT_TO_STOP_RUN_CONTROL_SETTINGS_KEY,
+                   defaultSettings.prompToStopRunControl)
+              .toBool();
+    settings.automaticallyCreateRunConfigurations
+        = s->value(Constants::AUTO_CREATE_RUN_CONFIGS_SETTINGS_KEY,
+                   defaultSettings.automaticallyCreateRunConfigurations)
+              .toBool();
+    settings.environmentId =
+            QUuid(s->value(Constants::ENVIRONMENT_ID_SETTINGS_KEY).toByteArray());
+    if (settings.environmentId.isNull()) {
+        settings.environmentId = QUuid::createUuid();
+        s->setValue(Constants::ENVIRONMENT_ID_SETTINGS_KEY, settings.environmentId.toByteArray());
+    }
+    int tmp = s->value(Constants::STOP_BEFORE_BUILD_SETTINGS_KEY,
+                       int(defaultSettings.stopBeforeBuild))
+                  .toInt();
+    if (tmp < 0 || tmp > int(StopBeforeBuild::SameApp))
+        tmp = int(defaultSettings.stopBeforeBuild);
+    settings.stopBeforeBuild = StopBeforeBuild(tmp);
+    settings.terminalMode = static_cast<TerminalMode>(
+        s->value(Constants::TERMINAL_MODE_SETTINGS_KEY, int(defaultSettings.terminalMode)).toInt());
+    settings.closeSourceFilesWithProject
+        = s->value(Constants::CLOSE_FILES_WITH_PROJECT_SETTINGS_KEY,
+                   defaultSettings.closeSourceFilesWithProject)
+              .toBool();
+    settings.clearIssuesOnRebuild
+        = s->value(Constants::CLEAR_ISSUES_ON_REBUILD_SETTINGS_KEY,
+                   defaultSettings.clearIssuesOnRebuild)
+              .toBool();
+    settings.abortBuildAllOnError
+        = s->value(Constants::ABORT_BUILD_ALL_ON_ERROR_SETTINGS_KEY,
+                   defaultSettings.abortBuildAllOnError)
+              .toBool();
+    settings.lowBuildPriority
+        = s->value(Constants::LOW_BUILD_PRIORITY_SETTINGS_KEY, defaultSettings.lowBuildPriority)
+              .toBool();
+    settings.warnAgainstNonAsciiBuildDir
+        = s->value(Constants::WARN_AGAINST_NON_ASCII_BUILD_DIR_SETTINGS_KEY,
+                   defaultSettings.warnAgainstNonAsciiBuildDir)
+              .toBool();
+    settings.appEnvChanges = EnvironmentItem::fromStringList(
+        s->value(Constants::APP_ENV_CHANGES_SETTINGS_KEY).toStringList());
+    settings.showAllKits
+        = s->value(ProjectExplorer::Constants::SHOW_ALL_KITS_SETTINGS_KEY, defaultSettings.showAllKits)
+              .toBool();
+}
+
+void saveProjectExplorerSettings()
+{
+    QtcSettings *s = ICore::settings();
+    static const ProjectExplorerSettings defaultSettings;
+
+    const ProjectExplorerSettings &settings = projectExplorerSettings();
+    s->setValueWithDefault(
+        Constants::REAPER_TIMEOUT_SETTINGS_KEY,
+        settings.reaperTimeoutInSeconds,
+        defaultSettings.reaperTimeoutInSeconds);
+    s->setValueWithDefault(Constants::BUILD_BEFORE_DEPLOY_SETTINGS_KEY,
+                           int(settings.buildBeforeDeploy),
+                           int(defaultSettings.buildBeforeDeploy));
+    s->setValueWithDefault(Constants::DEPLOY_BEFORE_RUN_SETTINGS_KEY,
+                           settings.deployBeforeRun,
+                           defaultSettings.deployBeforeRun);
+    s->setValueWithDefault(Constants::SAVE_BEFORE_BUILD_SETTINGS_KEY,
+                           settings.saveBeforeBuild,
+                           defaultSettings.saveBeforeBuild);
+    s->setValueWithDefault(Constants::USE_JOM_SETTINGS_KEY,
+                           settings.useJom,
+                           defaultSettings.useJom);
+    s->setValueWithDefault(Constants::ADD_LIBRARY_PATHS_TO_RUN_ENV_SETTINGS_KEY,
+                           settings.addLibraryPathsToRunEnv,
+                           defaultSettings.addLibraryPathsToRunEnv);
+    s->setValueWithDefault(Constants::PROMPT_TO_STOP_RUN_CONTROL_SETTINGS_KEY,
+                           settings.prompToStopRunControl,
+                           defaultSettings.prompToStopRunControl);
+    s->setValueWithDefault(Constants::TERMINAL_MODE_SETTINGS_KEY,
+                           int(settings.terminalMode),
+                           int(defaultSettings.terminalMode));
+    s->setValueWithDefault(Constants::CLOSE_FILES_WITH_PROJECT_SETTINGS_KEY,
+                           settings.closeSourceFilesWithProject,
+                           defaultSettings.closeSourceFilesWithProject);
+    s->setValueWithDefault(Constants::CLEAR_ISSUES_ON_REBUILD_SETTINGS_KEY,
+                           settings.clearIssuesOnRebuild,
+                           defaultSettings.clearIssuesOnRebuild);
+    s->setValueWithDefault(Constants::ABORT_BUILD_ALL_ON_ERROR_SETTINGS_KEY,
+                           settings.abortBuildAllOnError,
+                           defaultSettings.abortBuildAllOnError);
+    s->setValueWithDefault(Constants::LOW_BUILD_PRIORITY_SETTINGS_KEY,
+                           settings.lowBuildPriority,
+                           defaultSettings.lowBuildPriority);
+    s->setValueWithDefault(Constants::WARN_AGAINST_NON_ASCII_BUILD_DIR_SETTINGS_KEY,
+                           settings.warnAgainstNonAsciiBuildDir,
+                           defaultSettings.warnAgainstNonAsciiBuildDir);
+    s->setValueWithDefault(Constants::AUTO_CREATE_RUN_CONFIGS_SETTINGS_KEY,
+                           settings.automaticallyCreateRunConfigurations,
+                           defaultSettings.automaticallyCreateRunConfigurations);
+    s->setValueWithDefault(Constants::ENVIRONMENT_ID_SETTINGS_KEY,
+                           settings.environmentId.toByteArray());
+    s->setValueWithDefault(Constants::STOP_BEFORE_BUILD_SETTINGS_KEY,
+                           int(settings.stopBeforeBuild),
+                           int(defaultSettings.stopBeforeBuild));
+    s->setValueWithDefault(Constants::APP_ENV_CHANGES_SETTINGS_KEY,
+                           EnvironmentItem::toStringList(settings.appEnvChanges));
+    s->setValueWithDefault(
+        ProjectExplorer::Constants::SHOW_ALL_KITS_SETTINGS_KEY,
+        settings.showAllKits,
+        defaultSettings.showAllKits);
+}
+
 class ProjectExplorerSettingsWidget : public IOptionsPageWidget
 {
 public:
@@ -47,7 +264,15 @@ public:
 
     void apply() final
     {
-        ProjectExplorerPlugin::setProjectExplorerSettings(settings());
+        ProjectExplorerSettings newSettings = settings();
+        QTC_CHECK(projectExplorerSettings().environmentId == newSettings.environmentId);
+
+        if (!(projectExplorerSettings() == newSettings)) {
+            mutableProjectExplorerSettings() = newSettings;
+            saveProjectExplorerSettings();
+            emit ProjectExplorerPlugin::instance()->settingsChanged();
+        }
+
         DocumentManager::setProjectsDirectory(projectsDirectory());
         DocumentManager::setUseProjectsDirectory(useProjectsDirectory());
     }
@@ -56,7 +281,6 @@ private:
     void slotDirectoryButtonGroupChanged();
     void updateAppEnvChangesLabel();
 
-    mutable ProjectExplorerSettings m_settings;
     Utils::EnvironmentItems m_appEnvChanges;
     QRadioButton *m_currentDirectoryRadioButton;
     QRadioButton *m_directoryRadioButton;
@@ -75,6 +299,8 @@ private:
     QComboBox *m_stopBeforeBuildComboBox;
     QComboBox *m_terminalModeComboBox;
     QCheckBox *m_jomCheckbox;
+    QCheckBox *m_showAllKitsCheckBox;
+    QSpinBox *m_reaperTimeoutSpinBox;
     Utils::ElidingLabel *m_appEnvLabel;
 
     QButtonGroup *m_directoryButtonGroup;
@@ -82,6 +308,14 @@ private:
 
 ProjectExplorerSettingsWidget::ProjectExplorerSettingsWidget()
 {
+    m_reaperTimeoutSpinBox = new QSpinBox;
+    m_reaperTimeoutSpinBox->setMinimum(1);
+    //: Suffix for "seconds"
+    m_reaperTimeoutSpinBox->setSuffix(Tr::tr("s"));
+    m_reaperTimeoutSpinBox->setToolTip(
+        Tr::tr("The amount of seconds to wait between a \"soft kill\" and a \"hard kill\" of a "
+               "running application."));
+
     m_currentDirectoryRadioButton = new QRadioButton(Tr::tr("Current directory"));
     m_directoryRadioButton = new QRadioButton(Tr::tr("Directory"));
     m_projectsDirectoryPathChooser = new PathChooser;
@@ -134,6 +368,11 @@ ProjectExplorerSettingsWidget::ProjectExplorerSettingsWidget()
                                "Disable it if you experience problems with your builds.");
     jomLabel->setWordWrap(true);
 
+    m_showAllKitsCheckBox = new QCheckBox(
+        Tr::tr("Show all kits in \"Build & Run\" in \"Projects\" mode"));
+    m_showAllKitsCheckBox->setToolTip(
+        Tr::tr("Show also inactive kits in \"Build & Run\" in \"Projects\" mode."));
+
     const QString appEnvToolTip = Tr::tr("Environment changes to apply to run configurations, "
                                          "but not build configurations.");
     const auto appEnvDescriptionLabel = new QLabel(Tr::tr("Application environment:"));
@@ -180,11 +419,14 @@ ProjectExplorerSettingsWidget::ProjectExplorerSettingsWidget()
                 m_abortBuildAllOnErrorCheckBox,
                 m_lowBuildPriorityCheckBox,
                 m_warnAgainstNonAsciiBuildDirCheckBox,
+                m_showAllKitsCheckBox,
                 Form {
                     appEnvDescriptionLabel, Row{m_appEnvLabel, appEnvButton, st}, br,
                     Tr::tr("Build before deploying:"), m_buildBeforeDeployComboBox, br,
                     Tr::tr("Stop applications before building:"), m_stopBeforeBuildComboBox, br,
                     Tr::tr("Default for \"Run in terminal\":"), m_terminalModeComboBox, br,
+                    Tr::tr("Time to wait before force-stopping applications:"),
+                    m_reaperTimeoutSpinBox, st, br,
                 },
                 m_jomCheckbox,
                 jomLabel,
@@ -204,7 +446,7 @@ ProjectExplorerSettingsWidget::ProjectExplorerSettingsWidget()
     connect(m_directoryButtonGroup, &QButtonGroup::buttonClicked,
             this, &ProjectExplorerSettingsWidget::slotDirectoryButtonGroupChanged);
 
-    setSettings(ProjectExplorerPlugin::projectExplorerSettings());
+    setSettings(projectExplorerSettings());
     setProjectsDirectory(DocumentManager::projectsDirectory());
     setUseProjectsDirectory(DocumentManager::useProjectsDirectory());
     updateAppEnvChangesLabel();
@@ -212,46 +454,51 @@ ProjectExplorerSettingsWidget::ProjectExplorerSettingsWidget()
 
 ProjectExplorerSettings ProjectExplorerSettingsWidget::settings() const
 {
-    m_settings.buildBeforeDeploy = static_cast<BuildBeforeRunMode>(
-                m_buildBeforeDeployComboBox->currentData().toInt());
-    m_settings.deployBeforeRun = m_deployProjectBeforeRunCheckBox->isChecked();
-    m_settings.saveBeforeBuild = m_saveAllFilesCheckBox->isChecked();
-    m_settings.useJom = m_jomCheckbox->isChecked();
-    m_settings.addLibraryPathsToRunEnv = m_addLibraryPathsToRunEnvCheckBox->isChecked();
-    m_settings.prompToStopRunControl = m_promptToStopRunControlCheckBox->isChecked();
-    m_settings.automaticallyCreateRunConfigurations = m_automaticallyCreateRunConfiguration->isChecked();
-    m_settings.stopBeforeBuild = static_cast<StopBeforeBuild>(
-                m_stopBeforeBuildComboBox->currentData().toInt());
-    m_settings.terminalMode = static_cast<ProjectExplorer::TerminalMode>(m_terminalModeComboBox->currentIndex());
-    m_settings.closeSourceFilesWithProject = m_closeSourceFilesCheckBox->isChecked();
-    m_settings.clearIssuesOnRebuild = m_clearIssuesCheckBox->isChecked();
-    m_settings.abortBuildAllOnError = m_abortBuildAllOnErrorCheckBox->isChecked();
-    m_settings.lowBuildPriority = m_lowBuildPriorityCheckBox->isChecked();
-    m_settings.warnAgainstNonAsciiBuildDir = m_warnAgainstNonAsciiBuildDirCheckBox->isChecked();
-    m_settings.appEnvChanges = m_appEnvChanges;
-    return m_settings;
+    ProjectExplorerSettings s;
+    s.reaperTimeoutInSeconds = m_reaperTimeoutSpinBox->value();
+    s.buildBeforeDeploy = static_cast<BuildBeforeRunMode>(
+       m_buildBeforeDeployComboBox->currentData().toInt());
+    s.deployBeforeRun = m_deployProjectBeforeRunCheckBox->isChecked();
+    s.saveBeforeBuild = m_saveAllFilesCheckBox->isChecked();
+    s.useJom = m_jomCheckbox->isChecked();
+    s.addLibraryPathsToRunEnv = m_addLibraryPathsToRunEnvCheckBox->isChecked();
+    s.prompToStopRunControl = m_promptToStopRunControlCheckBox->isChecked();
+    s.automaticallyCreateRunConfigurations = m_automaticallyCreateRunConfiguration->isChecked();
+    s.stopBeforeBuild = static_cast<StopBeforeBuild>(
+       m_stopBeforeBuildComboBox->currentData().toInt());
+    s.terminalMode = static_cast<ProjectExplorer::TerminalMode>(m_terminalModeComboBox->currentIndex());
+    s.closeSourceFilesWithProject = m_closeSourceFilesCheckBox->isChecked();
+    s.clearIssuesOnRebuild = m_clearIssuesCheckBox->isChecked();
+    s.abortBuildAllOnError = m_abortBuildAllOnErrorCheckBox->isChecked();
+    s.lowBuildPriority = m_lowBuildPriorityCheckBox->isChecked();
+    s.warnAgainstNonAsciiBuildDir = m_warnAgainstNonAsciiBuildDirCheckBox->isChecked();
+    s.appEnvChanges = m_appEnvChanges;
+    s.showAllKits = m_showAllKitsCheckBox->isChecked();
+    s.environmentId = projectExplorerSettings().environmentId;
+    return s;
 }
 
-void ProjectExplorerSettingsWidget::setSettings(const ProjectExplorerSettings  &pes)
+void ProjectExplorerSettingsWidget::setSettings(const ProjectExplorerSettings  &s)
 {
-    m_settings = pes;
-    m_appEnvChanges = pes.appEnvChanges;
+    m_reaperTimeoutSpinBox->setValue(s.reaperTimeoutInSeconds);
+    m_appEnvChanges = s.appEnvChanges;
     m_buildBeforeDeployComboBox->setCurrentIndex(
-                m_buildBeforeDeployComboBox->findData(int(m_settings.buildBeforeDeploy)));
-    m_deployProjectBeforeRunCheckBox->setChecked(m_settings.deployBeforeRun);
-    m_saveAllFilesCheckBox->setChecked(m_settings.saveBeforeBuild);
-    m_jomCheckbox->setChecked(m_settings.useJom);
-    m_addLibraryPathsToRunEnvCheckBox->setChecked(m_settings.addLibraryPathsToRunEnv);
-    m_promptToStopRunControlCheckBox->setChecked(m_settings.prompToStopRunControl);
-    m_automaticallyCreateRunConfiguration->setChecked(m_settings.automaticallyCreateRunConfigurations);
+                m_buildBeforeDeployComboBox->findData(int(s.buildBeforeDeploy)));
+    m_deployProjectBeforeRunCheckBox->setChecked(s.deployBeforeRun);
+    m_saveAllFilesCheckBox->setChecked(s.saveBeforeBuild);
+    m_jomCheckbox->setChecked(s.useJom);
+    m_addLibraryPathsToRunEnvCheckBox->setChecked(s.addLibraryPathsToRunEnv);
+    m_promptToStopRunControlCheckBox->setChecked(s.prompToStopRunControl);
+    m_automaticallyCreateRunConfiguration->setChecked(s.automaticallyCreateRunConfigurations);
     m_stopBeforeBuildComboBox->setCurrentIndex(
-                m_stopBeforeBuildComboBox->findData(int(m_settings.stopBeforeBuild)));
-    m_terminalModeComboBox->setCurrentIndex(static_cast<int>(m_settings.terminalMode));
-    m_closeSourceFilesCheckBox->setChecked(m_settings.closeSourceFilesWithProject);
-    m_clearIssuesCheckBox->setChecked(m_settings.clearIssuesOnRebuild);
-    m_abortBuildAllOnErrorCheckBox->setChecked(m_settings.abortBuildAllOnError);
-    m_lowBuildPriorityCheckBox->setChecked(m_settings.lowBuildPriority);
-    m_warnAgainstNonAsciiBuildDirCheckBox->setChecked(m_settings.warnAgainstNonAsciiBuildDir);
+                m_stopBeforeBuildComboBox->findData(int(s.stopBeforeBuild)));
+    m_terminalModeComboBox->setCurrentIndex(static_cast<int>(s.terminalMode));
+    m_closeSourceFilesCheckBox->setChecked(s.closeSourceFilesWithProject);
+    m_clearIssuesCheckBox->setChecked(s.clearIssuesOnRebuild);
+    m_abortBuildAllOnErrorCheckBox->setChecked(s.abortBuildAllOnError);
+    m_lowBuildPriorityCheckBox->setChecked(s.lowBuildPriority);
+    m_warnAgainstNonAsciiBuildDirCheckBox->setChecked(s.warnAgainstNonAsciiBuildDir);
+    m_showAllKitsCheckBox->setChecked(s.showAllKits);
 }
 
 FilePath ProjectExplorerSettingsWidget::projectsDirectory() const
@@ -292,14 +539,39 @@ void ProjectExplorerSettingsWidget::updateAppEnvChangesLabel()
 
 // ProjectExplorerSettingsPage
 
-ProjectExplorerSettingsPage::ProjectExplorerSettingsPage()
+class ProjectExplorerSettingsPage final : public IOptionsPage
 {
-    setId(Constants::BUILD_AND_RUN_SETTINGS_PAGE_ID);
-    setDisplayName(Tr::tr("General"));
-    setCategory(Constants::BUILD_AND_RUN_SETTINGS_CATEGORY);
-    setDisplayCategory(Tr::tr("Build & Run"));
-    setCategoryIconPath(":/projectexplorer/images/settingscategory_buildrun.png");
-    setWidgetCreator([] { return new ProjectExplorerSettingsWidget; });
+public:
+    ProjectExplorerSettingsPage()
+    {
+        setId(ProjectExplorer::Constants::BUILD_AND_RUN_SETTINGS_PAGE_ID);
+        setDisplayName(Tr::tr("General"));
+        setCategory(ProjectExplorer::Constants::BUILD_AND_RUN_SETTINGS_CATEGORY);
+        setDisplayCategory(Tr::tr("Build & Run"));
+        setCategoryIconPath(":/projectexplorer/images/settingscategory_buildrun.png");
+        setWidgetCreator([] { return new ProjectExplorerSettingsWidget; });
+    }
+};
+
+void setupProjectExplorerSettings()
+{
+    static ProjectExplorerSettingsPage theProjectExplorerSettingsPage;
+
+    loadProjectExplorerSettings();
 }
 
-} // ProjectExplorer::Internal
+
+} // Internal
+
+const ProjectExplorerSettings &projectExplorerSettings()
+{
+    return Internal::mutableProjectExplorerSettings();
+}
+
+ProjectExplorerSettings &mutableProjectExplorerSettings()
+{
+    return Internal::mutableProjectExplorerSettings();
+}
+
+} // ProjectExplorer
+
diff --git a/src/plugins/projectexplorer/projectexplorersettings.h b/src/plugins/projectexplorer/projectexplorersettings.h
index dbec8ea2aef..3a30548d60d 100644
--- a/src/plugins/projectexplorer/projectexplorersettings.h
+++ b/src/plugins/projectexplorer/projectexplorersettings.h
@@ -3,8 +3,9 @@
 
 #pragma once
 
+#include "projectexplorer_export.h"
+
 #include <coreplugin/coreconstants.h>
-#include <coreplugin/dialogs/ioptionspage.h>
 
 #include <utils/environment.h>
 #include <utils/hostosinfo.h>
@@ -20,27 +21,8 @@ enum class StopBeforeBuild { None, SameProject, All, SameBuildDir, SameApp };
 class ProjectExplorerSettings
 {
 public:
-    friend bool operator==(const ProjectExplorerSettings &p1, const ProjectExplorerSettings &p2)
-    {
-        return p1.buildBeforeDeploy == p2.buildBeforeDeploy
-                && p1.deployBeforeRun == p2.deployBeforeRun
-                && p1.saveBeforeBuild == p2.saveBeforeBuild
-                && p1.useJom == p2.useJom
-                && p1.prompToStopRunControl == p2.prompToStopRunControl
-                && p1.automaticallyCreateRunConfigurations == p2.automaticallyCreateRunConfigurations
-                && p1.addLibraryPathsToRunEnv == p2.addLibraryPathsToRunEnv
-                && p1.environmentId == p2.environmentId
-                && p1.stopBeforeBuild == p2.stopBeforeBuild
-                && p1.terminalMode == p2.terminalMode
-                && p1.closeSourceFilesWithProject == p2.closeSourceFilesWithProject
-                && p1.clearIssuesOnRebuild == p2.clearIssuesOnRebuild
-                && p1.abortBuildAllOnError == p2.abortBuildAllOnError
-                && p1.appEnvChanges == p2.appEnvChanges
-                && p1.warnAgainstNonAsciiBuildDir == p2.warnAgainstNonAsciiBuildDir
-                && p1.lowBuildPriority == p2.lowBuildPriority;
-    }
-
     BuildBeforeRunMode buildBeforeDeploy = BuildBeforeRunMode::WholeProject;
+    int reaperTimeoutInSeconds = 1;
     bool deployBeforeRun = true;
     bool saveBeforeBuild = false;
     bool useJom = true;
@@ -52,6 +34,7 @@ public:
     bool abortBuildAllOnError = true;
     bool lowBuildPriority = false;
     bool warnAgainstNonAsciiBuildDir = true;
+    bool showAllKits = true;
     StopBeforeBuild stopBeforeBuild = Utils::HostOsInfo::isWindowsHost()
                                           ? StopBeforeBuild::SameProject
                                           : StopBeforeBuild::None;
@@ -64,8 +47,14 @@ public:
     QUuid environmentId;
 };
 
+PROJECTEXPLORER_EXPORT const ProjectExplorerSettings &projectExplorerSettings();
+ProjectExplorerSettings &mutableProjectExplorerSettings();
+
 namespace Internal {
 
+void setPromptToStopSettings(bool promptToStop); // FIXME: Remove.
+void setSaveBeforeBuildSettings(bool saveBeforeBuild); // FIXME: Remove.
+
 enum class AppOutputPaneMode { FlashOnOutput, PopupOnOutput, PopupOnFirstOutput };
 
 class AppOutputSettings
@@ -79,11 +68,7 @@ public:
     int maxCharCount = Core::Constants::DEFAULT_MAX_CHAR_COUNT;
 };
 
-class ProjectExplorerSettingsPage : public Core::IOptionsPage
-{
-public:
-    ProjectExplorerSettingsPage();
-};
+void setupProjectExplorerSettings();
 
 } // namespace Internal
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp
index 76554563921..74a767cc989 100644
--- a/src/plugins/projectexplorer/projectfilewizardextension.cpp
+++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp
@@ -49,7 +49,7 @@ using namespace Utils;
         managed) and do 'add' if the VCS supports it.
     \endlist
 
-    \sa ProjectExplorer::Internal::ProjectWizardPage
+    \sa ProjectExplorer::ProjectWizardPage
 */
 
 enum { debugExtension = 0 };
diff --git a/src/plugins/projectexplorer/projectmanager.cpp b/src/plugins/projectexplorer/projectmanager.cpp
index e0cb5e2ca52..9da6ce358ed 100644
--- a/src/plugins/projectexplorer/projectmanager.cpp
+++ b/src/plugins/projectexplorer/projectmanager.cpp
@@ -502,16 +502,30 @@ Project *ProjectManager::projectForFile(const FilePath &fileName)
             [&fileName](const Project *p) { return p->isKnownFile(fileName); })) {
         return project;
     }
-    return Utils::findOrDefault(ProjectManager::projects(),
-                                [&fileName](const Project *p) {
-        for (const Target * const target : p->targets()) {
-            for (const BuildConfiguration * const bc : target->buildConfigurations()) {
-                if (fileName.isChildOf(bc->buildDirectory()))
-                    return false;
+    return Utils::findOrDefault(ProjectManager::projects(), [&fileName](const Project *p) {
+        return isInProjectSourceDir(fileName, *p);
+    });
+}
+
+bool ProjectManager::isInProjectSourceDir(const Utils::FilePath &filePath, const Project &project)
+{
+    for (const Target * const target : project.targets()) {
+        for (const BuildConfiguration * const bc : target->buildConfigurations()) {
+            if (filePath.isChildOf(bc->buildDirectory()))
+                return false;
+            if (const FilePath canonicalBuildDir = bc->buildDirectory().canonicalPath();
+                canonicalBuildDir != bc->buildDirectory() && filePath.isChildOf(canonicalBuildDir)) {
+                return false;
             }
         }
-        return fileName.isChildOf(p->projectDirectory());
-    });
+    }
+    if (filePath.isChildOf(project.projectDirectory()))
+        return true;
+    if (const FilePath canonicalRoot = project.projectDirectory().canonicalPath();
+        canonicalRoot != project.projectDirectory()) {
+        return filePath.isChildOf(canonicalRoot);
+    }
+    return false;
 }
 
 Project *ProjectManager::projectWithProjectFilePath(const FilePath &filePath)
diff --git a/src/plugins/projectexplorer/projectmanager.h b/src/plugins/projectexplorer/projectmanager.h
index 27913a00cd0..16ad8972813 100644
--- a/src/plugins/projectexplorer/projectmanager.h
+++ b/src/plugins/projectexplorer/projectmanager.h
@@ -77,6 +77,7 @@ public:
     static QList<Project *> projectOrder(const Project *project = nullptr);
 
     static Project *projectForFile(const Utils::FilePath &fileName);
+    static bool isInProjectSourceDir(const Utils::FilePath &filePath, const Project &project);
     static Project *projectWithProjectFilePath(const Utils::FilePath &filePath);
 
     static Utils::FilePaths projectsForSessionName(const QString &session);
diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp
index d84df808eec..b7be5e1546b 100644
--- a/src/plugins/projectexplorer/projectmodels.cpp
+++ b/src/plugins/projectexplorer/projectmodels.cpp
@@ -242,7 +242,7 @@ QVariant FlatModel::data(const QModelIndex &index, int role) const
     }
     case Qt::ForegroundRole:
         return node->isEnabled() ? QVariant()
-                                 : Utils::creatorTheme()->color(Utils::Theme::TextColorDisabled);
+                                 : Utils::creatorColor(Utils::Theme::TextColorDisabled);
     case Project::FilePathRole:
         return node->filePath().toString();
     case Project::isParsingRole:
@@ -284,14 +284,16 @@ bool FlatModel::setData(const QModelIndex &index, const QVariant &value, int rol
     QTC_ASSERT(node, return false);
 
     std::vector<std::tuple<Node *, FilePath, FilePath>> toRename;
-    const Utils::FilePath orgFilePath = node->filePath();
-    const Utils::FilePath newFilePath = orgFilePath.parentDir().pathAppended(value.toString());
+    const FilePath orgFilePath = node->filePath();
+    const FilePath newFilePath = orgFilePath.parentDir().pathAppended(value.toString());
+    const FilePath valuePath = FilePath::fromString(value.toString());
     const QFileInfo orgFileInfo = orgFilePath.toFileInfo();
     toRename.emplace_back(std::make_tuple(node, orgFilePath, newFilePath));
 
     // The base name of the file was changed. Go look for other files with the same base name
     // and offer to rename them as well.
-    if (orgFilePath != newFilePath && orgFilePath.suffix() == newFilePath.suffix()) {
+    if (!orgFilePath.equalsCaseSensitive(newFilePath)
+        && orgFilePath.suffix() == newFilePath.suffix()) {
         const QList<Node *> candidateNodes = ProjectTree::siblingsWithSameBaseName(node);
         if (!candidateNodes.isEmpty()) {
             QStringList fileNames = transform<QStringList>(candidateNodes, [](const Node *n) {
@@ -308,12 +310,13 @@ bool FlatModel::setData(const QModelIndex &index, const QVariant &value, int rol
             case QMessageBox::Yes:
                 for (Node * const n : candidateNodes) {
                     QString targetFilePath = orgFileInfo.absolutePath() + '/'
-                                             + newFilePath.completeBaseName();
+                                             + valuePath.parentDir().path() + '/'
+                                             + valuePath.completeBaseName();
                     const QString suffix = n->filePath().suffix();
                     if (!suffix.isEmpty())
                         targetFilePath.append('.').append(suffix);
                     toRename.emplace_back(std::make_tuple(n, n->filePath(),
-                                                          FilePath::fromString(targetFilePath)));
+                                                          FilePath::fromString(targetFilePath).cleanPath()));
                 }
                 break;
             case QMessageBox::Cancel:
@@ -679,6 +682,8 @@ bool FlatModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int r
               return n->parentProjectNode() != sourceProjectNode; })) {
         return true;
     }
+    FolderNode * const sourceFolderNode = fileNodes.first()->parentFolderNode();
+    const bool sourceNodeIsSubDir = sourceFolderNode != sourceProjectNode;
     Node *targetNode = nodeForIndex(index(row, column, parent));
     if (!targetNode)
         targetNode = nodeForIndex(parent);
@@ -687,20 +692,22 @@ bool FlatModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int r
     if (!targetProjectNode)
         targetProjectNode = targetNode->parentProjectNode();
     QTC_ASSERT(targetProjectNode, return true);
-    if (sourceProjectNode == targetProjectNode)
+    const bool targetNodeIsSubDir = targetNode != targetProjectNode && targetNode->asFolderNode();
+    if (sourceProjectNode == targetProjectNode && !targetNodeIsSubDir && !sourceNodeIsSubDir)
         return true;
 
     // Node weirdness: Sometimes the "file path" is a directory, sometimes it's a file...
-    const auto dirForProjectNode = [](const ProjectNode *pNode) {
-        const FilePath dir = pNode->filePath();
+    const auto dirForFolderNode = [](const FolderNode *node) {
+        const FilePath dir = node->filePath();
         if (dir.isDir())
             return dir;
         return FilePath::fromString(dir.toFileInfo().path());
     };
-    FilePath targetDir = dirForProjectNode(targetProjectNode);
+    FilePath targetDir = dirForFolderNode(targetNodeIsSubDir ? targetNode->asFolderNode()
+                                                             : targetProjectNode);
 
     // Ask the user what to do now: Copy or add? With or without file transfer?
-    DropFileDialog dlg(targetDir == dirForProjectNode(sourceProjectNode) ? FilePath() : targetDir);
+    DropFileDialog dlg(targetDir == dirForFolderNode(sourceFolderNode) ? FilePath() : targetDir);
     if (dlg.exec() != QDialog::Accepted)
         return true;
     if (!dlg.targetDir().isEmpty())
@@ -798,6 +805,10 @@ bool FlatModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int r
             if (vcsAddPossible && !targetVcs.vcs->vcsAdd(targetFile))
                 failedVcsOp << targetFile;
         }
+        QList<std::pair<FilePath, FilePath>> renameList;
+        for (int i = 0; i < filesToAdd.size(); ++i)
+            renameList.emplaceBack(filesToRemove.at(i), filesToAdd.at(i));
+        emit ProjectExplorerPlugin::instance()->filesRenamed(renameList);
         const RemovedFilesFromProject result
                 = sourceProjectNode->removeFiles(filesToRemove, &failedRemoveFromProject);
         if (result == RemovedFilesFromProject::Wildcard)
diff --git a/src/plugins/projectexplorer/projectnodeshelper.h b/src/plugins/projectexplorer/projectnodeshelper.h
deleted file mode 100644
index bcb5454fd89..00000000000
--- a/src/plugins/projectexplorer/projectnodeshelper.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include "projectnodes.h"
-
-#include <coreplugin/iversioncontrol.h>
-#include <coreplugin/vcsmanager.h>
-
-#include <utils/algorithm.h>
-#include <utils/filepath.h>
-
-#include <QPromise>
-
-namespace ProjectExplorer {
-
-template<typename Result>
-QList<FileNode *> scanForFiles(QPromise<Result> &promise, const Utils::FilePath &directory,
-                               const std::function<FileNode *(const Utils::FilePath &)> factory);
-
-namespace Internal {
-
-template<typename Result>
-QList<FileNode *> scanForFilesRecursively(
-    QPromise<Result> &promise,
-    double progressStart,
-    double progressRange,
-    const Utils::FilePath &directory,
-    const std::function<FileNode *(const Utils::FilePath &)> factory,
-    QSet<QString> &visited,
-    const QList<Core::IVersionControl *> &versionControls)
-{
-    QList<FileNode *> result;
-
-    const QDir baseDir = QDir(directory.toString());
-
-    // Do not follow directory loops:
-    const int visitedCount = visited.count();
-    visited.insert(baseDir.canonicalPath());
-    if (visitedCount == visited.count())
-        return result;
-
-    const QFileInfoList entries = baseDir.entryInfoList(QStringList(),
-                                                        QDir::AllEntries | QDir::NoDotAndDotDot);
-    double progress = 0;
-    const double progressIncrement = progressRange / static_cast<double>(entries.count());
-    int lastIntProgress = 0;
-    for (const QFileInfo &entry : entries) {
-        if (promise.isCanceled())
-            return result;
-
-        const Utils::FilePath entryName = Utils::FilePath::fromString(entry.absoluteFilePath());
-        if (!Utils::contains(versionControls, [&entryName](const Core::IVersionControl *vc) {
-                return vc->isVcsFileOrDirectory(entryName);
-            })) {
-            if (entry.isDir())
-                result.append(scanForFilesRecursively(promise,
-                                                      progress,
-                                                      progressIncrement,
-                                                      entryName,
-                                                      factory,
-                                                      visited,
-                                                      versionControls));
-            else if (FileNode *node = factory(entryName))
-                result.append(node);
-        }
-        progress += progressIncrement;
-        const int intProgress = std::min(static_cast<int>(progressStart + progress),
-                                         promise.future().progressMaximum());
-        if (lastIntProgress < intProgress) {
-            promise.setProgressValue(intProgress);
-            lastIntProgress = intProgress;
-        }
-    }
-    promise.setProgressValue(std::min(static_cast<int>(progressStart + progressRange),
-                                      promise.future().progressMaximum()));
-    return result;
-}
-} // namespace Internal
-
-template<typename Result>
-QList<FileNode *> scanForFiles(QPromise<Result> &promise, const Utils::FilePath &directory,
-                               const std::function<FileNode *(const Utils::FilePath &)> factory)
-{
-    QSet<QString> visited;
-    promise.setProgressRange(0, 1000000);
-    return Internal::scanForFilesRecursively(promise,
-                                             0.0,
-                                             1000000.0,
-                                             directory,
-                                             factory,
-                                             visited,
-                                             Core::VcsManager::versionControls());
-}
-
-} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp
index 774a8bb1604..8858d2252ce 100644
--- a/src/plugins/projectexplorer/projecttreewidget.cpp
+++ b/src/plugins/projectexplorer/projecttreewidget.cpp
@@ -76,7 +76,7 @@ public:
         const bool useUnavailableMarker = index.data(Project::UseUnavailableMarkerRole).toBool();
         if (useUnavailableMarker) {
             QStyleOptionViewItem opt = option;
-            opt.palette.setColor(QPalette::Text, creatorTheme()->color(Theme::TextColorDisabled));
+            opt.palette.setColor(QPalette::Text, creatorColor(Theme::TextColorDisabled));
             QStyledItemDelegate::paint(painter, opt, index);
             static const QPixmap pixmap
                 = QApplication::style()->standardIcon(QStyle::SP_BrowserStop).pixmap(10);
@@ -308,11 +308,11 @@ ProjectTreeWidget::~ProjectTreeWidget()
 int ProjectTreeWidget::expandedCount(Node *node)
 {
     if (m_projectTreeWidgets.isEmpty())
-        return 0;
+        return INT_MAX;
     FlatModel *model = m_projectTreeWidgets.first()->m_model;
     QModelIndex index = model->indexForNode(node);
     if (!index.isValid())
-        return 0;
+        return INT_MAX;
 
     int count = 0;
     for (ProjectTreeWidget *tree : std::as_const(m_projectTreeWidgets)) {
diff --git a/src/plugins/projectexplorer/projectwelcomepage.cpp b/src/plugins/projectexplorer/projectwelcomepage.cpp
index 4928ae826e0..a0eca157995 100644
--- a/src/plugins/projectexplorer/projectwelcomepage.cpp
+++ b/src/plugins/projectexplorer/projectwelcomepage.cpp
@@ -105,12 +105,12 @@ QVariant ProjectModel::data(const QModelIndex &index, int role) const
     RecentProjectsEntry data = m_projects.at(index.row());
     switch (role) {
     case Qt::DisplayRole:
-        return data.second;
+        return data.displayName;
     case Qt::ToolTipRole:
     case FilePathRole:
-        return data.first.toVariant();
+        return data.filePath.toVariant();
     case PrettyFilePathRole:
-        return data.first.withTildeHomePath(); // FIXME: FilePath::displayName() ?
+        return data.filePath.withTildeHomePath(); // FIXME: FilePath::displayName() ?
     case ShortcutRole: {
         const Id projectBase = PROJECT_BASE_ID;
         if (Command *cmd = ActionManager::command(projectBase.withSuffix(index.row() + 1)))
@@ -219,11 +219,6 @@ void ProjectWelcomePage::createActions()
 
 ///////////////////
 
-static QColor themeColor(Theme::Color role)
-{
-    return Utils::creatorTheme()->color(role);
-}
-
 static QPixmap pixmap(const QString &id, const Theme::Color color)
 {
     const QString fileName = QString(":/welcome/images/%1.png").arg(id);
@@ -232,8 +227,8 @@ static QPixmap pixmap(const QString &id, const Theme::Color color)
 
 static void drawBackgroundRect(QPainter *painter, const QRectF &rect, bool hovered)
 {
-    const QColor fill(themeColor(hovered ? cardHoverBackground : cardDefaultBackground));
-    const QPen pen(themeColor(hovered ? cardHoverStroke : cardDefaultStroke));
+    const QColor fill(creatorColor(hovered ? cardHoverBackground : cardDefaultBackground));
+    const QPen pen(creatorColor(hovered ? cardHoverStroke : cardDefaultStroke));
 
     const qreal rounding = s(defaultCardBackgroundRounding * 1000) / 1000.0;
     const qreal saneRounding = rounding <= 2 ? 0 : rounding;
@@ -369,7 +364,7 @@ public:
                                                                    : bgR.height()));
 
         const QSize iconS = icon().deviceIndependentSize().toSize();
-        static const QPixmap arrow = Icon({{FilePath::fromString(":/core/images/expandarrow"),
+        static const QPixmap arrow = Icon({{FilePath::fromString(":/core/images/expandarrow.png"),
                                             Theme::Token_Text_Muted}}, Icon::Tint).pixmap();
         const QSize arrowS = arrow.deviceIndependentSize().toSize();
         const bool arrowVisible = hovered || expanded;
@@ -514,7 +509,7 @@ public:
                                           .contains(mousePos) && !isDisabled;
                 if (isActive) {
                     WelcomePageHelpers::drawCardBackground(painter, actionR, Qt::transparent,
-                                                           themeColor(Theme::Token_Text_Muted));
+                                                           creatorColor(Theme::Token_Text_Muted));
                     m_activeActionRects[i] = actionR;
                 }
                 painter->setFont(actionFont);
@@ -524,7 +519,7 @@ public:
                 xx += actionR.width();
                 if (i < actions.count() - 1) {
                     const QRect dividerR(xx + s(HGapXs), yy, actionSepWidth, buttonHeight);
-                    painter->fillRect(dividerR, themeColor(Theme::Token_Text_Muted));
+                    painter->fillRect(dividerR, creatorColor(Theme::Token_Text_Muted));
                 }
                 xx += gapWidth;
             }
@@ -789,7 +784,7 @@ public:
 
         auto sessions = new QWidget;
         {
-            auto sessionsLabel = new Label(Tr::tr("Sessions"), Label::Primary);
+            auto sessionsLabel = new Core::Label(Tr::tr("Sessions"), Core::Label::Primary);
             auto manageSessionsButton = new Button(Tr::tr("Manage..."), Button::MediumSecondary);
             auto sessionsList = new TreeView(this, "Sessions");
             sessionsList->setModel(projectWelcomePage->m_sessionModel);
@@ -804,11 +799,11 @@ public:
                     sessionsLabel,
                     st,
                     manageSessionsButton,
-                    customMargin({HPaddingS, 0, sessionScrollBarGap, 0}),
+                    customMargins(HPaddingS, 0, sessionScrollBarGap, 0),
                 },
                 sessionsList,
                 spacing(ExPaddingGapL),
-                customMargin({ExVPaddingGapXl, ExVPaddingGapXl, 0, 0}),
+                customMargins(ExVPaddingGapXl, ExVPaddingGapXl, 0, 0),
             }.attachTo(sessions);
             connect(manageSessionsButton, &Button::clicked,
                     this, &SessionManager::showSessionManager);
@@ -816,7 +811,7 @@ public:
 
         auto projects = new QWidget;
         {
-            auto projectsLabel = new Label(Tr::tr("Projects"), Label::Primary);
+            auto projectsLabel = new Core::Label(Tr::tr("Projects"), Core::Label::Primary);
             auto projectsList = new TreeView(this, "Recent Projects");
             projectsList->setUniformRowHeights(true);
             projectsList->setModel(projectWelcomePage->m_projectModel);
@@ -828,11 +823,11 @@ public:
             Column {
                 Row {
                     projectsLabel,
-                    customMargin({HPaddingS, 0, 0, 0}),
+                    customMargins(HPaddingS, 0, 0, 0),
                 },
                 projectsList,
                 spacing(ExPaddingGapL),
-                customMargin({ExVPaddingGapXl - sessionScrollBarGap, ExVPaddingGapXl, 0, 0}),
+                customMargins(ExVPaddingGapXl - sessionScrollBarGap, ExVPaddingGapXl, 0, 0),
             }.attachTo(projects);
         }
 
@@ -840,7 +835,7 @@ public:
             sessions,
             projects,
             spacing(0),
-            noMargin(),
+            noMargin,
         }.attachTo(this);
     }
 
diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp
index 1c2f04a04c5..c3214b64984 100644
--- a/src/plugins/projectexplorer/projectwindow.cpp
+++ b/src/plugins/projectexplorer/projectwindow.cpp
@@ -1061,7 +1061,7 @@ void SelectorDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
     if (TreeItem *item = model->itemForIndex(index)) {
         switch (item->level()) {
         case 2: {
-            QColor col = creatorTheme()->color(Theme::TextColorNormal);
+            QColor col = creatorColor(Theme::TextColorNormal);
             opt.palette.setColor(QPalette::Text, col);
             opt.font = StyleHelper::uiFont(StyleHelper::UiElementH4);
             break;
diff --git a/src/plugins/projectexplorer/projectwindow.h b/src/plugins/projectexplorer/projectwindow.h
index ed88f4403e6..692cc5a287e 100644
--- a/src/plugins/projectexplorer/projectwindow.h
+++ b/src/plugins/projectexplorer/projectwindow.h
@@ -30,7 +30,8 @@ enum {
     ItemUpdatedFromBelowRole,     // A subitem got updated, re-expansion is necessary.
     ActiveItemRole,               // The index of the currently selected item in the tree view
     KitIdRole,                    // The kit id in case the item is associated with a kit.
-    PanelWidgetRole               // This item's widget to be shown as central widget.
+    PanelWidgetRole,              // This item's widget to be shown as central widget.
+    IsShowMoreRole                // This item is a "show more" item.
 };
 
 class ProjectWindowPrivate;
diff --git a/src/plugins/projectexplorer/projectwizardpage.cpp b/src/plugins/projectexplorer/projectwizardpage.cpp
index d3f60faeaeb..c71d762aaae 100644
--- a/src/plugins/projectexplorer/projectwizardpage.cpp
+++ b/src/plugins/projectexplorer/projectwizardpage.cpp
@@ -32,7 +32,7 @@
 #include <QTextStream>
 
 /*!
-    \class ProjectExplorer::Internal::ProjectWizardPage
+    \class ProjectExplorer::ProjectWizardPage
 
     \brief The ProjectWizardPage class provides a wizard page showing projects
     and version control to add new files to.
@@ -261,6 +261,8 @@ static AddNewTree *buildAddFilesTree(FolderNode *root, const FilePaths &files,
     return new AddNewTree(root, children, root->displayName());
 }
 
+} // namespace Internal
+
 // --------------------------------------------------------------------
 // ProjectWizardPage:
 // --------------------------------------------------------------------
@@ -302,7 +304,7 @@ ProjectWizardPage::ProjectWizardPage(QWidget *parent)
     setProperty(SHORT_TITLE_PROPERTY, Tr::tr("Summary"));
 
     connect(VcsManager::instance(), &VcsManager::configurationChanged,
-            this, &ProjectExplorer::Internal::ProjectWizardPage::initializeVersionControls);
+            this, &ProjectExplorer::ProjectWizardPage::initializeVersionControls);
 
     m_projectComboBox->setModel(&m_model);
 }
@@ -333,14 +335,14 @@ bool ProjectWizardPage::expandTree(const QModelIndex &root)
         m_projectComboBox->view()->collapse(root);
 
     // if we are a high priority node, our *parent* needs to be expanded
-    auto tree = static_cast<AddNewTree *>(root.internalPointer());
+    auto tree = static_cast<Internal::AddNewTree *>(root.internalPointer());
     if (tree && tree->priority() >= 100)
         expand = true;
 
     return expand;
 }
 
-void ProjectWizardPage::setBestNode(AddNewTree *tree)
+void ProjectWizardPage::setBestNode(Internal::AddNewTree *tree)
 {
     QModelIndex index = tree ? m_model.indexForItem(tree) : QModelIndex();
     m_projectComboBox->setCurrentIndex(index);
@@ -375,7 +377,7 @@ void ProjectWizardPage::initializeVersionControls()
     m_addToVersionControlComboBox->disconnect();
     QList<IVersionControl *> versionControls = VcsManager::versionControls();
     if (versionControls.isEmpty())
-        hideVersionControlUiElements();
+        setVersionControlUiElementsVisible(false);
 
     IVersionControl *currentSelection = nullptr;
     int currentIdx = versionControlIndex() - 1;
@@ -458,29 +460,29 @@ void ProjectWizardPage::initializeProjectTree(Node *context, const FilePaths &pa
                                               ProjectAction action)
 {
     m_projectComboBox->disconnect();
-    BestNodeSelector selector(m_commonDirectory, paths);
+    Internal::BestNodeSelector selector(m_commonDirectory, paths);
 
     TreeItem *root = m_model.rootItem();
     root->removeChildren();
     for (Project *project : ProjectManager::projects()) {
         if (ProjectNode *pn = project->rootProjectNode()) {
             if (kind == IWizardFactory::ProjectWizard) {
-                if (AddNewTree *child = buildAddProjectTree(pn, paths.first(), context, &selector))
+                if (Internal::AddNewTree *child = buildAddProjectTree(pn, paths.first(), context, &selector))
                     root->appendChild(child);
             } else {
-                if (AddNewTree *child = buildAddFilesTree(pn, paths, context, &selector))
+                if (Internal::AddNewTree *child = buildAddFilesTree(pn, paths, context, &selector))
                     root->appendChild(child);
             }
         }
     }
     root->sortChildren([](const TreeItem *ti1, const TreeItem *ti2) {
-        return compareNodes(static_cast<const AddNewTree *>(ti1)->node(),
-                            static_cast<const AddNewTree *>(ti2)->node());
+        return Internal::compareNodes(static_cast<const Internal::AddNewTree *>(ti1)->node(),
+                            static_cast<const Internal::AddNewTree *>(ti2)->node());
     });
     root->prependChild(createNoneNode(&selector));
 
     // Set combobox to context node if that appears in the tree:
-    auto predicate = [context](TreeItem *ti) { return static_cast<AddNewTree*>(ti)->node() == context; };
+    auto predicate = [context](TreeItem *ti) { return static_cast<Internal::AddNewTree*>(ti)->node() == context; };
     TreeItem *contextItem = root->findAnyChild(predicate);
     if (contextItem)
         m_projectComboBox->setCurrentIndex(m_model.indexForItem(contextItem));
@@ -587,11 +589,11 @@ void ProjectWizardPage::manageVcs()
     ICore::showOptionsDialog(VcsBase::Constants::VCS_COMMON_SETTINGS_ID, this);
 }
 
-void ProjectWizardPage::hideVersionControlUiElements()
+void ProjectWizardPage::setVersionControlUiElementsVisible(bool visible)
 {
-    m_addToVersionControlLabel->hide();
-    m_vcsManageButton->hide();
-    m_addToVersionControlComboBox->hide();
+    m_addToVersionControlLabel->setVisible(visible);
+    m_vcsManageButton->setVisible(visible);
+    m_addToVersionControlComboBox->setVisible(visible);
 }
 
 void ProjectWizardPage::setProjectUiVisible(bool visible)
@@ -600,5 +602,4 @@ void ProjectWizardPage::setProjectUiVisible(bool visible)
     m_projectComboBox->setVisible(visible);
 }
 
-} // namespace Internal
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/projectwizardpage.h b/src/plugins/projectexplorer/projectwizardpage.h
index 90d17dee60d..835547e2619 100644
--- a/src/plugins/projectexplorer/projectwizardpage.h
+++ b/src/plugins/projectexplorer/projectwizardpage.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include "projectexplorer_export.h"
 #include "projectnodes.h"
 
 #include <coreplugin/generatedfile.h>
@@ -25,9 +26,10 @@ namespace ProjectExplorer {
 namespace Internal {
 
 class AddNewTree;
+}
 
 // Documentation inside.
-class ProjectWizardPage : public Utils::WizardPage
+class PROJECTEXPLORER_EXPORT ProjectWizardPage : public Utils::WizardPage
 {
     Q_OBJECT
 
@@ -59,10 +61,12 @@ signals:
     void projectNodeChanged();
     void versionControlChanged(int);
 
+protected:
+    void setVersionControlUiElementsVisible(bool visible);
+
 private:
     void projectChanged(int);
     void manageVcs();
-    void hideVersionControlUiElements();
 
     void setAdditionalInfo(const QString &text);
     void setAddingSubProject(bool addingSubProject);
@@ -87,5 +91,4 @@ private:
     QLabel *m_filesLabel;
 };
 
-} // namespace Internal
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/rawprojectpart.cpp b/src/plugins/projectexplorer/rawprojectpart.cpp
index 3f525ea095a..9bb69c5e846 100644
--- a/src/plugins/projectexplorer/rawprojectpart.cpp
+++ b/src/plugins/projectexplorer/rawprojectpart.cpp
@@ -178,6 +178,12 @@ ToolchainInfo::ToolchainInfo(const Toolchain *toolChain,
     }
 }
 
+static CppSettingsRetriever g_cppSettingsRetriever;
+void provideCppSettingsRetriever(const CppSettingsRetriever &retriever)
+{
+    g_cppSettingsRetriever = retriever;
+}
+
 ProjectUpdateInfo::ProjectUpdateInfo(Project *project,
                                      const KitInfo &kitInfo,
                                      const Utils::Environment &env,
@@ -188,6 +194,8 @@ ProjectUpdateInfo::ProjectUpdateInfo(Project *project,
     , cToolchainInfo(ToolchainInfo(kitInfo.cToolchain, kitInfo.sysRootPath, env))
     , cxxToolchainInfo(ToolchainInfo(kitInfo.cxxToolchain, kitInfo.sysRootPath, env))
 {
+    if (g_cppSettingsRetriever)
+        cppSettings = g_cppSettingsRetriever(project);
     if (project) {
         projectName = project->displayName();
         projectFilePath = project->projectFilePath();
diff --git a/src/plugins/projectexplorer/rawprojectpart.h b/src/plugins/projectexplorer/rawprojectpart.h
index 75503170da4..7ebe5eed1d7 100644
--- a/src/plugins/projectexplorer/rawprojectpart.h
+++ b/src/plugins/projectexplorer/rawprojectpart.h
@@ -14,6 +14,7 @@
 #include <utils/cpplanguage_details.h>
 #include <utils/environment.h>
 #include <utils/fileutils.h>
+#include <utils/store.h>
 
 #include <QPointer>
 
@@ -170,9 +171,13 @@ public:
     Utils::FilePath buildRoot;
     RawProjectParts rawProjectParts;
     RppGenerator rppGenerator;
+    Utils::Store cppSettings;
 
     ToolchainInfo cToolchainInfo;
     ToolchainInfo cxxToolchainInfo;
 };
 
+using CppSettingsRetriever = std::function<Utils::Store(const Project *)>;
+void PROJECTEXPLORER_EXPORT provideCppSettingsRetriever(const CppSettingsRetriever &retriever);
+
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index be59ad0eaa6..3c78b37cc44 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -71,7 +71,7 @@ void GlobalOrProjectAspect::setProjectSettings(AspectContainer *settings)
 void GlobalOrProjectAspect::setGlobalSettings(AspectContainer *settings)
 {
     m_globalSettings = settings;
-    m_projectSettings->setAutoApply(false);
+    m_globalSettings->setAutoApply(false);
 }
 
 void GlobalOrProjectAspect::setUsingGlobalSettings(bool value)
@@ -173,6 +173,9 @@ RunConfiguration::RunConfiguration(Target *target, Utils::Id id)
 
 
     m_commandLineGetter = [this] {
+        Launcher launcher;
+        if (const auto launcherAspect = aspect<LauncherAspect>())
+            launcher = launcherAspect->currentLauncher();
         FilePath executable;
         if (const auto executableAspect = aspect<ExecutableAspect>())
             executable = executableAspect->executable();
@@ -180,7 +183,14 @@ RunConfiguration::RunConfiguration(Target *target, Utils::Id id)
         if (const auto argumentsAspect = aspect<ArgumentsAspect>())
             arguments = argumentsAspect->arguments();
 
-        return CommandLine{executable, arguments, CommandLine::Raw};
+        if (launcher.command.isEmpty())
+            return CommandLine{executable, arguments, CommandLine::Raw};
+
+        CommandLine launcherCommand(launcher.command, launcher.arguments);
+        launcherCommand.addArg(executable.toString());
+        launcherCommand.addArgs(arguments, CommandLine::Raw);
+
+        return launcherCommand;
     };
 }
 
@@ -201,13 +211,13 @@ bool RunConfiguration::isEnabled(Utils::Id) const
 QWidget *RunConfiguration::createConfigurationWidget()
 {
     Layouting::Form form;
+    form.setNoMargins();
     for (BaseAspect *aspect : std::as_const(*this)) {
         if (aspect->isVisible()) {
             form.addItem(aspect);
-            form.addItem(Layouting::br);
+            form.flush();
         }
     }
-    form.addItem(Layouting::noMargin);
     auto widget = form.emerge();
 
     VariableChooser::addSupportForChildWidgets(widget, &m_expander);
@@ -425,6 +435,13 @@ ProcessRunData RunConfiguration::runnable() const
         r.environment = environmentAspect->environment();
     if (m_runnableModifier)
         m_runnableModifier(r);
+
+    // TODO: Do expansion in commandLine()?
+    if (!r.command.isEmpty()) {
+        const FilePath expanded = macroExpander()->expand(r.command.executable());
+        r.command.setExecutable(expanded);
+    }
+
     return r;
 }
 
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index 2054a840c14..b49ad3e7d77 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -28,6 +28,51 @@ class RunConfigurationFactory;
 class RunConfiguration;
 class RunConfigurationCreationInfo;
 class Target;
+class BuildTargetInfo;
+
+/**
+ * Contains start program entries that are retrieved
+ * from the cmake file api
+ */
+class LauncherInfo
+{
+public:
+    QString type;
+    Utils::FilePath command;
+    QStringList arguments;
+};
+
+/**
+ * Contains a start program entry that is displayed in the run configuration interface.
+ *
+ * This follows the design for the use of "Test Launcher", the
+ * Wrappers for running executables on the host system and "Emulator",
+ * wrappers for cross-compiled applications, which are supported for
+ * example by the cmake build system.
+ */
+class PROJECTEXPLORER_EXPORT Launcher
+{
+public:
+    Launcher() = default;
+
+    /// Create a single launcher from the \p launcherInfo parameter, which can be of type "Test launcher" or "Emulator"
+    Launcher(const LauncherInfo &launcherInfo,  const Utils::FilePath &sourceDirectory);
+
+    /// Create a combined launcher from the passed info parameters, with \p testLauncherInfo
+    /// as first and \p emulatorLauncherInfo appended
+    Launcher(const LauncherInfo &testLauncherInfo, const LauncherInfo &emulatorlauncherInfo, const Utils::FilePath &sourceDirectory);
+
+    bool operator==(const Launcher &other) const
+    {
+        return id == other.id && displayName == other.displayName && command == other.command
+               && arguments == other.arguments;
+    }
+
+    QString id;
+    QString displayName;
+    Utils::FilePath command;
+    QStringList arguments;
+};
 
 /**
  * An interface to facilitate switching between hunks of
diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp
index 7b6c7f4f5d3..6f49b61c0e8 100644
--- a/src/plugins/projectexplorer/runconfigurationaspects.cpp
+++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp
@@ -63,13 +63,13 @@ TerminalAspect::TerminalAspect(AspectContainer *container)
 /*!
     \reimp
 */
-void TerminalAspect::addToLayout(LayoutItem &parent)
+void TerminalAspect::addToLayout(Layout &parent)
 {
     QTC_CHECK(!m_checkBox);
     m_checkBox = createSubWidget<QCheckBox>(Tr::tr("Run in terminal"));
     m_checkBox->setChecked(m_useTerminal);
     m_checkBox->setEnabled(isEnabled());
-    parent.addItems({empty(), m_checkBox.data()});
+    parent.addItems({empty, m_checkBox.data()});
     connect(m_checkBox.data(), &QAbstractButton::clicked, this, [this] {
         m_userSet = true;
         m_useTerminal = m_checkBox->isChecked();
@@ -107,7 +107,7 @@ void TerminalAspect::calculateUseTerminal()
     if (m_userSet)
         return;
     bool useTerminal;
-    switch (ProjectExplorerPlugin::projectExplorerSettings().terminalMode) {
+    switch (projectExplorerSettings().terminalMode) {
     case TerminalMode::On: useTerminal = true; break;
     case TerminalMode::Off: useTerminal = false; break;
     default: useTerminal = m_useTerminalHint;
@@ -174,7 +174,7 @@ void WorkingDirectoryAspect::setEnvironment(EnvironmentAspect *envAspect)
 /*!
     \reimp
 */
-void WorkingDirectoryAspect::addToLayout(LayoutItem &builder)
+void WorkingDirectoryAspect::addToLayout(Layout &builder)
 {
     QTC_CHECK(!m_chooser);
     m_chooser = new PathChooser;
@@ -186,7 +186,7 @@ void WorkingDirectoryAspect::addToLayout(LayoutItem &builder)
     m_chooser->setBaseDirectory(m_defaultWorkingDirectory);
     m_chooser->setFilePath(m_workingDirectory.isEmpty() ? m_defaultWorkingDirectory : m_workingDirectory);
     connect(m_chooser.data(), &PathChooser::textChanged, this, [this] {
-        m_workingDirectory = m_chooser->rawFilePath();
+        m_workingDirectory = m_chooser->unexpandedFilePath();
         m_resetButton->setEnabled(m_workingDirectory != m_defaultWorkingDirectory);
     });
 
@@ -203,6 +203,9 @@ void WorkingDirectoryAspect::addToLayout(LayoutItem &builder)
         m_chooser->setEnvironment(m_envAspect->environment());
     }
 
+    m_chooser->setReadOnly(isReadOnly());
+    m_resetButton->setEnabled(!isReadOnly());
+
     builder.addItems({Tr::tr("Working directory:"), m_chooser.data(), m_resetButton.data()});
 }
 
@@ -401,7 +404,7 @@ void ArgumentsAspect::fromMap(const Store &map)
 {
     QVariant args = map.value(settingsKey());
     // Until 3.7 a QStringList was stored for Remote Linux
-    if (args.typeId() == QVariant::StringList)
+    if (args.typeId() == QMetaType::QStringList)
         m_arguments = ProcessArgs::joinArgs(args.toStringList(), OsTypeLinux);
     else
         m_arguments = args.toString();
@@ -437,6 +440,7 @@ QWidget *ArgumentsAspect::setupChooser()
                     this, [this] { setArguments(m_multiLineChooser->toPlainText()); });
         }
         m_multiLineChooser->setPlainText(m_arguments);
+        m_multiLineChooser->setReadOnly(isReadOnly());
         return m_multiLineChooser.data();
     }
     if (!m_chooser) {
@@ -445,13 +449,15 @@ QWidget *ArgumentsAspect::setupChooser()
         connect(m_chooser.data(), &QLineEdit::textChanged, this, &ArgumentsAspect::setArguments);
     }
     m_chooser->setText(m_arguments);
+    m_chooser->setReadOnly(isReadOnly());
+
     return m_chooser.data();
 }
 
 /*!
     \reimp
 */
-void ArgumentsAspect::addToLayout(LayoutItem &builder)
+void ArgumentsAspect::addToLayout(Layout &builder)
 {
     QTC_CHECK(!m_chooser && !m_multiLineChooser && !m_multiLineButton);
 
@@ -597,6 +603,7 @@ void ExecutableAspect::setEnvironment(const Environment &env)
 
 void ExecutableAspect::setReadOnly(bool readOnly)
 {
+    BaseAspect::setReadOnly(readOnly);
     m_executable.setReadOnly(readOnly);
 }
 
@@ -643,11 +650,13 @@ FilePath ExecutableAspect::executable() const
 /*!
     \reimp
 */
-void ExecutableAspect::addToLayout(LayoutItem &builder)
+void ExecutableAspect::addToLayout(Layout &builder)
 {
     builder.addItem(m_executable);
-    if (m_alternativeExecutable)
-        builder.addItems({br, m_alternativeExecutable});
+    if (m_alternativeExecutable) {
+        builder.flush();
+        builder.addItem(m_alternativeExecutable);
+    }
 }
 
 /*!
@@ -737,7 +746,7 @@ UseLibraryPathsAspect::UseLibraryPathsAspect(AspectContainer *container)
         setLabel(Tr::tr("Add build library search path to LD_LIBRARY_PATH"),
                  LabelPlacement::AtCheckBox);
     }
-    setValue(ProjectExplorerPlugin::projectExplorerSettings().addLibraryPathsToRunEnv);
+    setValue(projectExplorerSettings().addLibraryPathsToRunEnv);
 }
 
 
@@ -788,6 +797,156 @@ Interpreter::Interpreter(const QString &_id,
     , autoDetected(_autoDetected)
 {}
 
+static QString launcherType2UiString(const QString &type)
+{
+    if (type == "test")
+        return Tr::tr("Test");
+    else if (type == "emulator")
+        return Tr::tr("Emulator");
+    return QString();
+}
+
+Launcher::Launcher(const LauncherInfo &launcherInfo, const FilePath &sourceDirectory)
+    : id(launcherInfo.type)
+    , arguments(launcherInfo.arguments)
+{
+    if (launcherInfo.type != "unused") {
+        command = launcherInfo.command;
+        if (command.isRelativePath())
+            command = sourceDirectory.resolvePath(command);
+        displayName = QString("%1 (%2)").arg(launcherType2UiString(launcherInfo.type),
+                                      CommandLine(command, arguments).displayName());
+    }
+}
+
+Launcher::Launcher(const LauncherInfo &testLauncherInfo, const LauncherInfo &emulatorLauncherInfo, const Utils::FilePath &sourceDirectory)
+    : id(testLauncherInfo.type + " + " + emulatorLauncherInfo.type)
+    , command(testLauncherInfo.command)
+    , arguments(testLauncherInfo.arguments)
+{
+    if (command.isRelativePath())
+        command = sourceDirectory.resolvePath(command);
+    FilePath command1 = emulatorLauncherInfo.command;
+    if (command1.isRelativePath())
+        command1 = sourceDirectory.resolvePath(command1);
+    arguments.append(command1.toString());
+    arguments.append(emulatorLauncherInfo.arguments);
+    displayName = QString("%1 + %2 (%3)").arg(launcherType2UiString(testLauncherInfo.type),
+                                       launcherType2UiString(emulatorLauncherInfo.type),
+                                       CommandLine(command, arguments).displayName());
+}
+
+/*!
+\class ProjectExplorer::LauncherAspect
+\inmodule QtCreator
+
+\brief With the LauncherAspect class, a user can specify a launcher program for
+use with executable files for which a launcher program is optionally available.
+*/
+
+LauncherAspect::LauncherAspect(AspectContainer *container)
+    : BaseAspect(container)
+{
+    addDataExtractor(this, &LauncherAspect::currentLauncher, &Data::launcher);
+}
+
+Launcher LauncherAspect::currentLauncher() const
+{
+    return Utils::findOrDefault(m_launchers, Utils::equal(&Launcher::id, m_currentId));
+}
+
+void LauncherAspect::updateLaunchers(const QList<Launcher> &launchers)
+{
+    if (m_launchers == launchers)
+        return;
+    m_launchers = launchers;
+    if (m_comboBox)
+        updateComboBox();
+}
+
+void LauncherAspect::setDefaultLauncher(const Launcher &launcher)
+{
+    if (m_defaultId == launcher.id)
+        return;
+    m_defaultId = launcher.id;
+    if (m_currentId.isEmpty())
+        setCurrentLauncher(launcher);
+}
+
+void LauncherAspect::setCurrentLauncher(const Launcher &launcher)
+{
+    if (m_comboBox) {
+        const int index = m_launchers.indexOf(launcher);
+        if (index < 0 || index >= m_comboBox->count())
+            return;
+        m_comboBox->setCurrentIndex(index);
+    } else {
+        setCurrentLauncherId(launcher.id);
+    }
+}
+
+void LauncherAspect::fromMap(const Store &map)
+{
+    setCurrentLauncherId(map.value(settingsKey(), m_defaultId).toString());
+}
+
+void LauncherAspect::toMap(Store &map) const
+{
+    if (m_currentId != m_defaultId)
+        saveToMap(map, m_currentId, QString(), settingsKey());
+}
+
+void LauncherAspect::addToLayout(Layout &builder)
+{
+    if (QTC_GUARD(m_comboBox.isNull()))
+        m_comboBox = new QComboBox;
+
+    updateComboBox();
+    connect(m_comboBox, &QComboBox::currentIndexChanged,
+            this, &LauncherAspect::updateCurrentLauncher);
+
+    builder.addItems({Tr::tr("Launcher:"), m_comboBox.data()});
+}
+
+void LauncherAspect::setCurrentLauncherId(const QString &id)
+{
+    if (id == m_currentId)
+        return;
+    m_currentId = id;
+    emit changed();
+}
+
+void LauncherAspect::updateCurrentLauncher()
+{
+    const int index = m_comboBox->currentIndex();
+    if (index < 0)
+        return;
+    QTC_ASSERT(index < m_launchers.size(), return);
+    m_comboBox->setToolTip(m_launchers[index].command.toUserOutput());
+    setCurrentLauncherId(m_launchers[index].id);
+}
+
+void LauncherAspect::updateComboBox()
+{
+    int currentIndex = -1;
+    int defaultIndex = -1;
+    m_comboBox->clear();
+    for (const Launcher &launcher : std::as_const(m_launchers)) {
+        int index = m_comboBox->count();
+        m_comboBox->addItem(launcher.displayName);
+        m_comboBox->setItemData(index, launcher.command.toUserOutput(), Qt::ToolTipRole);
+        if (launcher.id == m_currentId)
+            currentIndex = index;
+        if (launcher.id == m_defaultId)
+            defaultIndex = index;
+    }
+    if (currentIndex >= 0)
+        m_comboBox->setCurrentIndex(currentIndex);
+    else if (defaultIndex >= 0)
+        m_comboBox->setCurrentIndex(defaultIndex);
+    updateCurrentLauncher();
+}
+
 /*!
     \class ProjectExplorer::X11ForwardingAspect
     \inmodule QtCreator
diff --git a/src/plugins/projectexplorer/runconfigurationaspects.h b/src/plugins/projectexplorer/runconfigurationaspects.h
index d02236a6598..69b55c9974b 100644
--- a/src/plugins/projectexplorer/runconfigurationaspects.h
+++ b/src/plugins/projectexplorer/runconfigurationaspects.h
@@ -29,7 +29,7 @@ class PROJECTEXPLORER_EXPORT TerminalAspect : public Utils::BaseAspect
 public:
     explicit TerminalAspect(Utils::AspectContainer *container = nullptr);
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     bool useTerminal() const;
     void setUseTerminalHint(bool useTerminal);
@@ -61,7 +61,7 @@ class PROJECTEXPLORER_EXPORT WorkingDirectoryAspect : public Utils::BaseAspect
 public:
     explicit WorkingDirectoryAspect(Utils::AspectContainer *container = nullptr);
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     Utils::FilePath operator()() const { return workingDirectory(); }
     Utils::FilePath workingDirectory() const;
@@ -93,7 +93,7 @@ class PROJECTEXPLORER_EXPORT ArgumentsAspect : public Utils::BaseAspect
 public:
     explicit ArgumentsAspect(Utils::AspectContainer *container = nullptr);
 
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     QString operator()() const { return arguments(); }
     QString arguments() const;
@@ -171,7 +171,7 @@ public:
     void setDeviceSelector(Target *target, ExecutionDeviceSelector selector);
     void setSettingsKey(const Utils::Key &key);
     void makeOverridable(const Utils::Key &overridingKey, const Utils::Key &useOverridableKey);
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
     void setLabelText(const QString &labelText);
     void setPlaceHolderText(const QString &placeHolderText);
     void setHistoryCompleter(const Utils::Key &historyCompleterKey);
@@ -227,6 +227,36 @@ public:
     QString detectionSource;
 };
 
+class PROJECTEXPLORER_EXPORT LauncherAspect : public Utils::BaseAspect
+{
+    Q_OBJECT
+
+public:
+    LauncherAspect(Utils::AspectContainer *container = nullptr);
+
+    Launcher currentLauncher() const;
+    void updateLaunchers(const QList<Launcher> &launchers);
+    void setDefaultLauncher(const Launcher &launcher);
+    void setCurrentLauncher(const Launcher &launcher);
+    void setSettingsDialogId(Utils::Id id) { m_settingsDialogId = id; }
+
+    void fromMap(const Utils::Store &) override;
+    void toMap(Utils::Store &) const override;
+    void addToLayout(Layouting::Layout &parent) override;
+
+    struct Data : Utils::BaseAspect::Data { Launcher launcher; };
+
+private:
+    void setCurrentLauncherId(const QString &id);
+    void updateCurrentLauncher();
+    void updateComboBox();
+    QList<Launcher> m_launchers;
+    QPointer<QComboBox> m_comboBox;
+    QString m_defaultId;
+    QString m_currentId;
+    Utils::Id m_settingsDialogId;
+};
+
 class PROJECTEXPLORER_EXPORT MainScriptAspect : public Utils::FilePathAspect
 {
     Q_OBJECT
diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp
index 37ed40f3c20..5eac3498bcf 100644
--- a/src/plugins/projectexplorer/runcontrol.cpp
+++ b/src/plugins/projectexplorer/runcontrol.cpp
@@ -418,7 +418,7 @@ void RunControl::setDevice(const IDevice::ConstPtr &device)
     QTC_CHECK(!d->device);
     d->device = device;
 #ifdef WITH_JOURNALD
-    if (!device.isNull() && device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) {
+    if (device && device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) {
         JournaldWatcher::instance()->subscribe(this, [this](const JournaldWatcher::LogEntry &entry) {
 
             if (entry.value("_MACHINE_ID") != JournaldWatcher::instance()->machineId())
@@ -500,7 +500,7 @@ RunWorker *RunControl::createWorker(Id workerId)
 {
     const Id deviceType = DeviceTypeKitAspect::deviceTypeId(d->kit);
     for (RunWorkerFactory *factory : std::as_const(g_runWorkerFactories)) {
-        if (factory->canCreate(workerId, deviceType, QString()))
+        if (factory->canCreate(workerId, deviceType, d->runConfigId.toString()))
             return factory->create(this);
     }
     return nullptr;
@@ -852,7 +852,7 @@ void RunControlPrivate::showError(const QString &msg)
 void RunControl::setupFormatter(OutputFormatter *formatter) const
 {
     QList<Utils::OutputLineParser *> parsers = createOutputParsers(target());
-    if (const auto customParsersAspect = aspect<CustomParsersAspect>()) {
+    if (const auto customParsersAspect = aspectData<CustomParsersAspect>()) {
         for (const Id id : std::as_const(customParsersAspect->parsers)) {
             if (auto parser = createCustomParserFromId(id))
                 parsers << parser;
@@ -969,12 +969,12 @@ const MacroExpander *RunControl::macroExpander() const
     return d->macroExpander;
 }
 
-const BaseAspect::Data *RunControl::aspect(Id instanceId) const
+const BaseAspect::Data *RunControl::aspectData(Id instanceId) const
 {
     return d->aspectData.aspect(instanceId);
 }
 
-const BaseAspect::Data *RunControl::aspect(BaseAspect::Data::ClassId classId) const
+const BaseAspect::Data *RunControl::aspectData(BaseAspect::Data::ClassId classId) const
 {
     return d->aspectData.aspect(classId);
 }
@@ -1264,6 +1264,7 @@ public:
 
     bool m_stopReported = false;
     bool m_stopForced = false;
+    bool m_suppressDefaultStdOutHandling = false;
 
     void forwardStarted();
     void forwardDone();
@@ -1319,11 +1320,12 @@ void SimpleTargetRunnerPrivate::stop()
     m_resultData.m_exitStatus = QProcess::CrashExit;
 
     const bool isLocal = !m_command.executable().needsDevice();
+    const auto totalTimeout = 2 * m_process.reaperTimeout();
     if (isLocal) {
         if (!isRunning())
             return;
         m_process.stop();
-        m_process.waitForFinished();
+        m_process.waitForFinished(totalTimeout);
         QTimer::singleShot(100, this, [this] { forwardDone(); });
     } else {
         if (m_stopRequested)
@@ -1333,8 +1335,7 @@ void SimpleTargetRunnerPrivate::stop()
         switch (m_state) {
         case Run:
             m_process.stop();
-            using namespace std::chrono_literals;
-            if (!m_process.waitForFinished(2s)) { // TODO: it may freeze on some devices
+            if (!m_process.waitForFinished(totalTimeout)) {
                 q->appendMessage(Tr::tr("Remote process did not finish in time. "
                                         "Connectivity lost?"), ErrorMessageFormat);
                 m_process.close();
@@ -1372,6 +1373,9 @@ void SimpleTargetRunnerPrivate::handleDone()
 
 void SimpleTargetRunnerPrivate::handleStandardOutput()
 {
+    if (m_suppressDefaultStdOutHandling)
+        return;
+
     const QByteArray data = m_process.readAllRawStandardOutput();
     const QString msg = m_outputCodec->toUnicode(
                 data.constData(), data.length(), &m_outputCodecState);
@@ -1380,6 +1384,9 @@ void SimpleTargetRunnerPrivate::handleStandardOutput()
 
 void SimpleTargetRunnerPrivate::handleStandardError()
 {
+    if (m_suppressDefaultStdOutHandling)
+        return;
+
     const QByteArray data = m_process.readAllRawStandardError();
     const QString msg = m_outputCodec->toUnicode(
                 data.constData(), data.length(), &m_errorCodecState);
@@ -1437,6 +1444,7 @@ void SimpleTargetRunnerPrivate::start()
     else
         m_outputCodec = QTextCodec::codecForName("utf8");
 
+    m_process.setForceDefaultErrorModeOnWindows(true);
     m_process.start();
 }
 
@@ -1502,17 +1510,19 @@ void SimpleTargetRunner::start()
         d->m_startModifier();
 
     bool useTerminal = false;
-    if (auto terminalAspect = runControl()->aspect<TerminalAspect>())
+    if (auto terminalAspect = runControl()->aspectData<TerminalAspect>())
         useTerminal = terminalAspect->useTerminal;
 
     bool runAsRoot = false;
-    if (auto runAsRootAspect = runControl()->aspect<RunAsRootAspect>())
+    if (auto runAsRootAspect = runControl()->aspectData<RunAsRootAspect>())
         runAsRoot = runAsRootAspect->value;
 
     d->m_stopForced = false;
     d->m_stopReported = false;
     d->disconnect(this);
     d->m_process.setTerminalMode(useTerminal ? Utils::TerminalMode::Run : Utils::TerminalMode::Off);
+    d->m_process.setReaperTimeout(
+        std::chrono::seconds(projectExplorerSettings().reaperTimeoutInSeconds));
     d->m_runAsRoot = runAsRoot;
 
     const QString msg = Tr::tr("Starting %1...").arg(d->m_command.displayName());
@@ -1571,6 +1581,16 @@ void SimpleTargetRunner::setProcessMode(Utils::ProcessMode processMode)
     d->m_process.setProcessMode(processMode);
 }
 
+Process *SimpleTargetRunner::process() const
+{
+    return &d->m_process;
+}
+
+void SimpleTargetRunner::suppressDefaultStdOutHandling()
+{
+    d->m_suppressDefaultStdOutHandling = true;
+}
+
 void SimpleTargetRunner::forceRunOnHost()
 {
     const FilePath executable = d->m_command.executable();
@@ -1580,6 +1600,11 @@ void SimpleTargetRunner::forceRunOnHost()
     }
 }
 
+void SimpleTargetRunner::addExtraData(const QString &key, const QVariant &value)
+{
+    d->m_extraData[key] = value;
+}
+
 // RunWorkerPrivate
 
 RunWorkerPrivate::RunWorkerPrivate(RunWorker *runWorker, RunControl *runControl)
diff --git a/src/plugins/projectexplorer/runcontrol.h b/src/plugins/projectexplorer/runcontrol.h
index d969ca47c5f..94288664361 100644
--- a/src/plugins/projectexplorer/runcontrol.h
+++ b/src/plugins/projectexplorer/runcontrol.h
@@ -27,6 +27,7 @@ class Icon;
 class MacroExpander;
 class OutputLineParser;
 class ProcessRunData;
+class Process;
 } // Utils
 
 namespace ProjectExplorer {
@@ -186,10 +187,10 @@ public:
     Kit *kit() const;
     const Utils::MacroExpander *macroExpander() const;
 
-    const Utils::BaseAspect::Data *aspect(Utils::Id instanceId) const;
-    const Utils::BaseAspect::Data *aspect(Utils::BaseAspect::Data::ClassId classId) const;
-    template <typename T> const typename T::Data *aspect() const {
-        return dynamic_cast<const typename T::Data *>(aspect(&T::staticMetaObject));
+    const Utils::BaseAspect::Data *aspectData(Utils::Id instanceId) const;
+    const Utils::BaseAspect::Data *aspectData(Utils::BaseAspect::Data::ClassId classId) const;
+    template <typename T> const typename T::Data *aspectData() const {
+        return dynamic_cast<const typename T::Data *>(aspectData(&T::staticMetaObject));
     }
 
     QString buildKey() const;
@@ -271,8 +272,11 @@ protected:
     void setEnvironment(const Utils::Environment &environment);
     void setWorkingDirectory(const Utils::FilePath &workingDirectory);
     void setProcessMode(Utils::ProcessMode processMode);
+    Utils::Process *process() const;
 
+    void suppressDefaultStdOutHandling();
     void forceRunOnHost();
+    void addExtraData(const QString &key, const QVariant &value);
 
 private:
     void start() final;
diff --git a/src/plugins/projectexplorer/sanitizerparser.cpp b/src/plugins/projectexplorer/sanitizerparser.cpp
index 8da13d5d37b..546de844485 100644
--- a/src/plugins/projectexplorer/sanitizerparser.cpp
+++ b/src/plugins/projectexplorer/sanitizerparser.cpp
@@ -93,7 +93,8 @@ OutputLineParser::Result SanitizerParser::handleContinuation(const QString &line
                 m_task.file = file;
                 m_task.line = summaryMatch.captured("line").toInt();
                 m_task.column = summaryMatch.captured("column").toInt();
-                addLinkSpecForAbsoluteFilePath(linkSpecs, file, m_task.line, summaryMatch, "file");
+                addLinkSpecForAbsoluteFilePath(
+                    linkSpecs, file, m_task.line, m_task.column, summaryMatch, "file");
                 addLinkSpecs(linkSpecs);
             }
         } else {
@@ -107,7 +108,7 @@ OutputLineParser::Result SanitizerParser::handleContinuation(const QString &line
         const FilePath file = absoluteFilePath(FilePath::fromUserInput(fileMatch.captured("file")));
         if (fileExists(file)) {
             addLinkSpecForAbsoluteFilePath(linkSpecs, file, fileMatch.captured("line").toInt(),
-                                           fileMatch, "file");
+                                           fileMatch.captured("column").toInt(), fileMatch, "file");
             addLinkSpecs(linkSpecs);
         }
     }
diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp
index b4d8a776f89..cae9a01d02a 100644
--- a/src/plugins/projectexplorer/target.cpp
+++ b/src/plugins/projectexplorer/target.cpp
@@ -722,7 +722,7 @@ void Target::updateDefaultRunConfigurations()
     configuredCount -= toRemove.count();
 
     bool removeExistingUnconfigured = false;
-    if (ProjectExplorerPlugin::projectExplorerSettings().automaticallyCreateRunConfigurations) {
+    if (projectExplorerSettings().automaticallyCreateRunConfigurations) {
         // Create new "automatic" RCs and put them into newConfigured/newUnconfigured
         for (const RunConfigurationCreationInfo &item : creators) {
             if (item.creationMode == RunConfigurationCreationInfo::ManualCreationOnly)
diff --git a/src/plugins/projectexplorer/targetsettingspanel.cpp b/src/plugins/projectexplorer/targetsettingspanel.cpp
index 5e593a5e65b..bfcb274ac1a 100644
--- a/src/plugins/projectexplorer/targetsettingspanel.cpp
+++ b/src/plugins/projectexplorer/targetsettingspanel.cpp
@@ -10,7 +10,10 @@
 #include "kitmanager.h"
 #include "panelswidget.h"
 #include "project.h"
+#include "projectexplorer.h"
+#include "projectexplorerconstants.h"
 #include "projectexplorericons.h"
+#include "projectexplorersettings.h"
 #include "projectexplorertr.h"
 #include "projectimporter.h"
 #include "projectmanager.h"
@@ -167,6 +170,19 @@ public:
 
     void ensureWidget();
     void rebuildContents();
+    void ensureShowMoreItem();
+
+    void setShowAllKits(bool showAllKits)
+    {
+        QtcSettings *settings = Core::ICore::settings();
+        settings->setValue(ProjectExplorer::Constants::SHOW_ALL_KITS_SETTINGS_KEY, showAllKits);
+        mutableProjectExplorerSettings().showAllKits = showAllKits;
+        rebuildContents();
+    }
+    bool showAllKits() const
+    {
+        return projectExplorerSettings().showAllKits;
+    }
 
     TargetGroupItem *q;
     QString m_displayName;
@@ -178,6 +194,46 @@ public:
     TargetSetupPageWrapper *m_targetSetupPageWrapper = nullptr;
 };
 
+class ShowMoreItem : public TreeItem
+{
+public:
+    ShowMoreItem(TargetGroupItemPrivate *p)
+        : m_p(p)
+    {}
+
+    QVariant data(int column, int role) const override
+    {
+        Q_UNUSED(column)
+        if (role == Qt::DisplayRole) {
+            return !m_p->showAllKits() ? Tr::tr("Show All Kits") : Tr::tr("Hide Inactive Kits");
+        }
+
+        if (role == IsShowMoreRole)
+            return true;
+
+        return {};
+    }
+
+    bool setData(int column, const QVariant &data, int role) override
+    {
+        Q_UNUSED(column)
+        Q_UNUSED(data)
+        if (role == ItemActivatedDirectlyRole) {
+            m_p->setShowAllKits(!m_p->showAllKits());
+            return true;
+        }
+        return false;
+    }
+
+    Qt::ItemFlags flags(int) const override
+    {
+        return Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsSelectable;
+    }
+
+private:
+    TargetGroupItemPrivate *m_p;
+};
+
 void TargetGroupItemPrivate::ensureWidget()
 {
     if (!m_noKitLabel) {
@@ -270,7 +326,7 @@ public:
 
         case Qt::ForegroundRole: {
             if (!isEnabled())
-                return Utils::creatorTheme()->color(Theme::TextColorDisabled);
+                return Utils::creatorColor(Theme::TextColorDisabled);
             break;
         }
 
@@ -665,6 +721,10 @@ TargetGroupItemPrivate::TargetGroupItemPrivate(TargetGroupItem *q, Project *proj
             this, &TargetGroupItemPrivate::handleRemovedKit);
     connect(KitManager::instance(), &KitManager::kitUpdated,
             this, &TargetGroupItemPrivate::handleUpdatedKit);
+    connect(KitManager::instance(), &KitManager::kitsChanged,
+            this, &TargetGroupItemPrivate::rebuildContents);
+    connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::settingsChanged,
+            this, &TargetGroupItemPrivate::rebuildContents);
 
     rebuildContents();
 }
@@ -759,22 +819,44 @@ void TargetItem::updateSubItems()
     }
 }
 
+void TargetGroupItemPrivate::ensureShowMoreItem()
+{
+    if (q->findAnyChild([](TreeItem *item) { return item->data(0, IsShowMoreRole).toBool(); }))
+        return;
+
+    q->appendChild(new ShowMoreItem(this));
+}
+
 void TargetGroupItemPrivate::rebuildContents()
 {
+    QGuiApplication::setOverrideCursor(Qt::WaitCursor);
+    const auto sortedKits = KitManager::sortedKits();
+    bool isAnyKitNotEnabled = std::any_of(sortedKits.begin(), sortedKits.end(), [this](Kit *kit) {
+        return kit && m_project->target(kit->id()) != nullptr;
+    });
     q->removeChildren();
 
-    for (Kit *kit : KitManager::sortedKits())
-        q->appendChild(new TargetItem(m_project, kit->id(), m_project->projectIssues(kit)));
+    for (Kit *kit : sortedKits) {
+        if (!isAnyKitNotEnabled || showAllKits() || m_project->target(kit->id()) != nullptr)
+            q->appendChild(new TargetItem(m_project, kit->id(), m_project->projectIssues(kit)));
+    }
 
-    if (q->parent())
-        q->parent()->setData(0, QVariant::fromValue(static_cast<TreeItem *>(q)),
-                             ItemUpdatedFromBelowRole);
+    if (isAnyKitNotEnabled)
+        ensureShowMoreItem();
+
+    if (q->parent()) {
+        q->parent()
+            ->setData(0, QVariant::fromValue(static_cast<TreeItem *>(q)), ItemUpdatedFromBelowRole);
+    }
+
+    QGuiApplication::restoreOverrideCursor();
 }
 
 void TargetGroupItemPrivate::handleTargetAdded(Target *target)
 {
     if (TargetItem *item = q->targetItem(target))
         item->updateSubItems();
+    ensureShowMoreItem();
     q->update();
 }
 
@@ -782,6 +864,7 @@ void TargetGroupItemPrivate::handleTargetRemoved(Target *target)
 {
     if (TargetItem *item = q->targetItem(target))
         item->updateSubItems();
+    ensureShowMoreItem();
     q->parent()->setData(0, QVariant::fromValue(static_cast<TreeItem *>(q)),
                          ItemDeactivatedFromBelowRole);
 }
@@ -790,6 +873,7 @@ void TargetGroupItemPrivate::handleTargetChanged(Target *target)
 {
     if (TargetItem *item = q->targetItem(target))
         item->updateSubItems();
+    ensureShowMoreItem();
     q->setData(0, QVariant(), ItemActivatedFromBelowRole);
 }
 
diff --git a/src/plugins/projectexplorer/treescanner.cpp b/src/plugins/projectexplorer/treescanner.cpp
index 1eefc3baf42..4411184c923 100644
--- a/src/plugins/projectexplorer/treescanner.cpp
+++ b/src/plugins/projectexplorer/treescanner.cpp
@@ -3,15 +3,17 @@
 
 #include "treescanner.h"
 
-#include "projectnodeshelper.h"
 #include "projecttree.h"
 
 #include <coreplugin/iversioncontrol.h>
 #include <coreplugin/vcsmanager.h>
 
-#include <utils/async.h>
-#include <utils/qtcassert.h>
+#include <solutions/tasking/tasktreerunner.h>
+
 #include <utils/algorithm.h>
+#include <utils/async.h>
+#include <utils/hostosinfo.h>
+#include <utils/qtcassert.h>
 
 #include <memory>
 
@@ -43,9 +45,10 @@ bool TreeScanner::asyncScanForFiles(const Utils::FilePath &directory)
         return false;
 
     m_scanFuture = Utils::asyncRun(
-        [directory, filter = m_filter, factory = m_factory] (Promise &promise) {
-        TreeScanner::scanForFiles(promise, directory, filter, factory);
-    });
+        [directory, filter = m_filter, dirFilter = m_dirFilter, factory = m_factory](
+            Promise &promise) {
+            TreeScanner::scanForFiles(promise, directory, filter, dirFilter, factory);
+        });
     m_futureWatcher.setFuture(m_scanFuture);
 
     return true;
@@ -57,6 +60,12 @@ void TreeScanner::setFilter(TreeScanner::FileFilter filter)
         m_filter = filter;
 }
 
+void TreeScanner::setDirFilter(QDir::Filters dirFilter)
+{
+    if (isFinished())
+        m_dirFilter = dirFilter;
+}
+
 void TreeScanner::setTypeFactory(TreeScanner::FileTypeFactory factory)
 {
     if (isFinished())
@@ -139,24 +148,127 @@ static std::unique_ptr<FolderNode> createFolderNode(const Utils::FilePath &direc
     return fileSystemNode;
 }
 
-void TreeScanner::scanForFiles(Promise &promise, const Utils::FilePath& directory,
-                               const FileFilter &filter, const FileTypeFactory &factory)
+struct DirectoryScanResult
 {
-    QList<FileNode *> nodes = ProjectExplorer::scanForFiles(promise, directory,
-                           [&filter, &factory](const Utils::FilePath &fn) -> FileNode * {
-        const Utils::MimeType mimeType = Utils::mimeTypeForFile(fn);
+    QList<FileNode *> nodes;
+    Utils::FilePaths subDirectories;
+};
 
-        // Skip some files during scan.
-        if (filter && filter(mimeType, fn))
-            return nullptr;
+static DirectoryScanResult scanForFilesImpl(
+    const QFuture<void> &future,
+    const Utils::FilePath &directory,
+    QDir::Filters filter,
+    const std::function<FileNode *(const Utils::FilePath &)> &factory,
+    const QList<Core::IVersionControl *> &versionControls)
+{
+    DirectoryScanResult result;
 
-        // Type detection
-        FileType type = FileType::Unknown;
-        if (factory)
-            type = factory(mimeType, fn);
+    const Utils::FilePaths entries = directory.dirEntries(filter);
+    for (const Utils::FilePath &entry : entries) {
+        if (future.isCanceled())
+            return result;
 
-        return new FileNode(fn, type);
-    });
+        if (Utils::anyOf(versionControls, [entry](const Core::IVersionControl *vc) {
+                return vc->isVcsFileOrDirectory(entry);
+            })) {
+            continue;
+        }
+
+        if (entry.isDir())
+            result.subDirectories.append(entry);
+        else if (FileNode *node = factory(entry))
+            result.nodes.append(node);
+    }
+    return result;
+}
+
+static QList<FileNode *> scanForFilesHelper(
+    TreeScanner::Promise &promise,
+    const Utils::FilePath &directory,
+    QDir::Filters filter,
+    const std::function<FileNode *(const Utils::FilePath &)> &factory)
+{
+    const QFuture<void> future(promise.future());
+
+    const int progressRange = 1000000;
+    const QList<Core::IVersionControl *> &versionControls = Core::VcsManager::versionControls();
+    promise.setProgressRange(0, progressRange);
+
+    QSet<Utils::FilePath> visited;
+    const DirectoryScanResult result = scanForFilesImpl(future, directory, filter, factory, versionControls);
+    QList<FileNode *> fileNodes = result.nodes;
+    const int progressIncrement = int(
+        progressRange / static_cast<double>(fileNodes.count() + result.subDirectories.count()));
+    promise.setProgressValue(int(fileNodes.count() * progressIncrement));
+    QList<QPair<Utils::FilePath, int>> subDirectories;
+    auto addSubDirectories = [&](const Utils::FilePaths &subdirs, int progressIncrement) {
+        for (const Utils::FilePath &subdir : subdirs) {
+            if (Utils::insert(visited, subdir.canonicalPath()))
+                subDirectories.append(qMakePair(subdir, progressIncrement));
+            else
+                promise.setProgressValue(future.progressValue() + progressIncrement);
+        }
+    };
+    addSubDirectories(result.subDirectories, progressIncrement);
+
+    while (!subDirectories.isEmpty()) {
+        using namespace Tasking;
+        const LoopList iterator(subDirectories);
+        subDirectories.clear();
+
+        auto onSetup = [&, iterator](Utils::Async<DirectoryScanResult> &task) {
+            task.setConcurrentCallData(
+                scanForFilesImpl, future, iterator->first, filter, factory, versionControls);
+        };
+
+        auto onDone = [&, iterator](const Utils::Async<DirectoryScanResult> &task) {
+            const int progressRange = iterator->second;
+            const DirectoryScanResult result = task.result();
+            fileNodes.append(result.nodes);
+            const qsizetype subDirCount = result.subDirectories.count();
+            if (subDirCount == 0) {
+                promise.setProgressValue(future.progressValue() + progressRange);
+            } else {
+                const qsizetype fileCount = result.nodes.count();
+                const int increment = int(
+                    progressRange / static_cast<double>(fileCount + subDirCount));
+                promise.setProgressValue(future.progressValue() + increment * fileCount);
+                addSubDirectories(result.subDirectories, increment);
+            }
+        };
+
+        const Group group{
+            Utils::HostOsInfo::isLinuxHost() ? parallelLimit(2) : parallelIdealThreadCountLimit,
+            iterator,
+            Utils::AsyncTask<DirectoryScanResult>(onSetup, onDone)
+        };
+        TaskTree::runBlocking(group);
+    }
+    return fileNodes;
+}
+
+void TreeScanner::scanForFiles(
+    Promise &promise,
+    const Utils::FilePath &directory,
+    const FileFilter &filter,
+    QDir::Filters dirFilter,
+    const FileTypeFactory &factory)
+{
+    QList<FileNode *> nodes = scanForFilesHelper(
+        promise, directory, dirFilter, [&filter, &factory](const Utils::FilePath &fn) -> FileNode * {
+            const Utils::MimeType mimeType = Utils::mimeTypesForFileName(fn.path()).value(0);
+
+            // Skip some files during scan.
+            if (filter && filter(mimeType, fn))
+                return nullptr;
+
+            // Type detection
+            FileType type = FileType::Unknown;
+            if (factory)
+                type = factory(mimeType, fn);
+
+            return new FileNode(fn, type);
+        });
 
     Utils::sort(nodes, ProjectExplorer::Node::sortByPath);
 
diff --git a/src/plugins/projectexplorer/treescanner.h b/src/plugins/projectexplorer/treescanner.h
index f8d019121b9..bc4dbe0b069 100644
--- a/src/plugins/projectexplorer/treescanner.h
+++ b/src/plugins/projectexplorer/treescanner.h
@@ -45,6 +45,9 @@ public:
     // Setup filter for ignored files
     void setFilter(FileFilter filter);
 
+    // Setup dir filters for scanned folders
+    void setDirFilter(QDir::Filters dirFilter);
+
     // Setup factory for file types
     void setTypeFactory(FileTypeFactory factory);
 
@@ -69,11 +72,15 @@ signals:
     void finished();
 
 private:
-    static void scanForFiles(Promise &fi, const Utils::FilePath &directory,
-                             const FileFilter &filter, const FileTypeFactory &factory);
+    static void scanForFiles(Promise &fi,
+        const Utils::FilePath &directory,
+        const FileFilter &filter,
+        QDir::Filters dirFilter,
+        const FileTypeFactory &factory);
 
 private:
     FileFilter m_filter;
+    QDir::Filters m_dirFilter = QDir::AllEntries | QDir::NoDotAndDotDot;
     FileTypeFactory m_factory;
 
     FutureWatcher m_futureWatcher;
diff --git a/src/plugins/projectexplorer/userfileaccessor.cpp b/src/plugins/projectexplorer/userfileaccessor.cpp
index a370d80ff69..d5929353774 100644
--- a/src/plugins/projectexplorer/userfileaccessor.cpp
+++ b/src/plugins/projectexplorer/userfileaccessor.cpp
@@ -300,7 +300,7 @@ UserFileAccessor::UserFileAccessor(Project *project)
     secondary->setReadOnly();
     setSecondaryAccessor(std::move(secondary));
 
-    setSettingsId(ProjectExplorerPlugin::projectExplorerSettings().environmentId.toByteArray());
+    setSettingsId(projectExplorerSettings().environmentId.toByteArray());
 
     // Register Upgraders:
     addVersionUpgrader(std::make_unique<UserFileVersion14Upgrader>());
@@ -453,7 +453,7 @@ Store UserFileVersion14Upgrader::upgrade(const Store &map)
 {
     Store result;
     for (auto it = map.cbegin(), end = map.cend(); it != end; ++it) {
-        if (it.value().typeId() == QVariant::Map)
+        if (it.value().typeId() == QMetaType::QVariantMap)
             result.insert(it.key(), variantFromStore(upgrade(storeFromVariant(it.value()))));
         else if (it.key() == "AutotoolsProjectManager.AutotoolsBuildConfiguration.BuildDirectory"
                  || it.key() == "CMakeProjectManager.CMakeBuildConfiguration.BuildDirectory"
@@ -709,13 +709,13 @@ Store UserFileVersion17Upgrader::upgrade(const Store &map)
 QVariant UserFileVersion17Upgrader::process(const QVariant &entry)
 {
     switch (entry.typeId()) {
-    case QVariant::List: {
+    case QMetaType::QVariantList: {
         QVariantList result;
         for (const QVariant &item : entry.toList())
             result.append(process(item));
         return result;
     }
-    case QVariant::Map: {
+    case QMetaType::QVariantMap: {
         Store result = storeFromVariant(entry);
         for (Store::iterator i = result.begin(), end = result.end(); i != end; ++i) {
             QVariant &v = i.value();
@@ -737,9 +737,9 @@ Store UserFileVersion18Upgrader::upgrade(const Store &map)
 QVariant UserFileVersion18Upgrader::process(const QVariant &entry)
 {
     switch (entry.typeId()) {
-    case QVariant::List:
+    case QMetaType::QVariantList:
         return Utils::transform(entry.toList(), &UserFileVersion18Upgrader::process);
-    case QVariant::Map: {
+    case QMetaType::QVariantMap: {
         Store map = storeFromVariant(entry);
         Store result;
         for (auto it = map.cbegin(), end = map.cend(); it != end; ++it) {
@@ -793,10 +793,10 @@ QVariant UserFileVersion19Upgrader::process(const QVariant &entry, const KeyList
     static const KeyList dyldKeys = {"Qbs.RunConfiguration.UseDyldImageSuffix",
                                      "QmakeProjectManager.QmakeRunConfiguration.UseDyldImageSuffix"};
     switch (entry.typeId()) {
-    case QVariant::List:
+    case QMetaType::QVariantList:
         return Utils::transform(entry.toList(),
                                 std::bind(&UserFileVersion19Upgrader::process, std::placeholders::_1, path));
-    case QVariant::Map: {
+    case QMetaType::QVariantMap: {
         Store map = storeFromVariant(entry);
         Store result;
         for (auto it = map.cbegin(), end = map.cend(); it != end; ++it) {
@@ -836,9 +836,9 @@ Store UserFileVersion20Upgrader::upgrade(const Store &map)
 QVariant UserFileVersion20Upgrader::process(const QVariant &entry)
 {
     switch (entry.typeId()) {
-    case QVariant::List:
+    case QMetaType::QVariantList:
         return Utils::transform(entry.toList(), &UserFileVersion20Upgrader::process);
-    case QVariant::Map: {
+    case QMetaType::QVariantMap: {
         Store map = storeFromVariant(entry);
         Store result;
         for (auto it = map.cbegin(), end = map.cend(); it != end; ++it) {
@@ -865,9 +865,9 @@ Store UserFileVersion21Upgrader::upgrade(const Store &map)
 QVariant UserFileVersion21Upgrader::process(const QVariant &entry)
 {
     switch (entry.typeId()) {
-    case QVariant::List:
+    case QMetaType::QVariantList:
         return Utils::transform(entry.toList(), &UserFileVersion21Upgrader::process);
-    case QVariant::Map: {
+    case QMetaType::QVariantMap: {
         Store entryMap = storeFromVariant(entry);
         if (entryMap.value("ProjectExplorer.ProjectConfiguration.Id").toString()
                 == "DeployToGenericLinux") {
@@ -990,7 +990,7 @@ void ProjectExplorerTest::testUserFileAccessor_prepareToWriteSettings()
 
     QCOMPARE(result.count(), data.count() + 3);
     QCOMPARE(result.value("EnvironmentId").toByteArray(),
-             ProjectExplorerPlugin::projectExplorerSettings().environmentId.toByteArray());
+             projectExplorerSettings().environmentId.toByteArray());
     QCOMPARE(result.value("UserStickyKeys"), QVariant(QStringList({"shared1"})));
     QCOMPARE(result.value("Version").toInt(), accessor.currentVersion());
     QCOMPARE(result.value("ProjectExplorer.Project.Updater.FileVersion").toInt(), accessor.currentVersion());
@@ -1013,7 +1013,7 @@ void ProjectExplorerTest::testUserFileAccessor_mergeSettings()
 
     Store data;
     data.insert("Version", accessor.currentVersion());
-    data.insert("EnvironmentId", ProjectExplorerPlugin::projectExplorerSettings().environmentId.toByteArray());
+    data.insert("EnvironmentId", projectExplorerSettings().environmentId.toByteArray());
     data.insert("UserStickyKeys", QStringList({"shared1"}));
     data.insert("shared1", "bar1");
     data.insert("unique1", 1234);
@@ -1025,7 +1025,7 @@ void ProjectExplorerTest::testUserFileAccessor_mergeSettings()
     QCOMPARE(result.data.count(), data.count() + 1);
     // mergeSettings does not run updateSettings, so no OriginalVersion will be set
     QCOMPARE(result.data.value("EnvironmentId").toByteArray(),
-             ProjectExplorerPlugin::projectExplorerSettings().environmentId.toByteArray()); // unchanged
+             projectExplorerSettings().environmentId.toByteArray()); // unchanged
     QCOMPARE(result.data.value("UserStickyKeys"), QVariant(QStringList({"shared1"}))); // unchanged
     QCOMPARE(result.data.value("Version").toInt(), accessor.currentVersion()); // forced
     QCOMPARE(result.data.value("shared1"), data.value("shared1")); // from data
@@ -1066,7 +1066,7 @@ void ProjectExplorerTest::testUserFileAccessor_mergeSettingsEmptyShared()
     Store data;
     data.insert("Version", accessor.currentVersion());
     data.insert("OriginalVersion", accessor.currentVersion());
-    data.insert("EnvironmentId", ProjectExplorerPlugin::projectExplorerSettings().environmentId.toByteArray());
+    data.insert("EnvironmentId", projectExplorerSettings().environmentId.toByteArray());
     data.insert("UserStickyKeys", QStringList({"shared1"}));
     data.insert("shared1", "bar1");
     data.insert("unique1", 1234);
diff --git a/src/plugins/projectexplorer/workspaceproject.cpp b/src/plugins/projectexplorer/workspaceproject.cpp
new file mode 100644
index 00000000000..ab90393c9e9
--- /dev/null
+++ b/src/plugins/projectexplorer/workspaceproject.cpp
@@ -0,0 +1,372 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "workspaceproject.h"
+
+#include "buildsystem.h"
+#include "projectexplorer.h"
+#include "projectexplorerconstants.h"
+#include "projectexplorertr.h"
+#include "projectmanager.h"
+#include "projecttree.h"
+#include "runconfiguration.h"
+#include "runconfigurationaspects.h"
+#include "runcontrol.h"
+#include "target.h"
+#include "treescanner.h"
+
+#include <coreplugin/actionmanager/actionmanager.h>
+
+#include <utils/algorithm.h>
+#include <utils/stringutils.h>
+
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+
+const QLatin1StringView FOLDER_MIMETYPE{"inode/directory"};
+const QLatin1StringView WORKSPACE_MIMETYPE{"text/x-workspace-project"};
+const QLatin1StringView WORKSPACE_PROJECT_ID{"ProjectExplorer.WorkspaceProject"};
+const QLatin1StringView WORKSPACE_PROJECT_RUNCONFIG_ID{"WorkspaceProject.RunConfiguration:"};
+
+const QLatin1StringView PROJECT_NAME_KEY{"project.name"};
+const QLatin1StringView FILES_EXCLUDE_KEY{"files.exclude"};
+const QLatin1StringView EXCLUDE_ACTION_ID{"ProjectExplorer.ExcludeFromWorkspace"};
+const QLatin1StringView RESCAN_ACTION_ID{"ProjectExplorer.RescanWorkspace"};
+
+using namespace Utils;
+using namespace Core;
+
+namespace ProjectExplorer {
+
+const expected_str<QJsonObject> projectDefinition(const Project *project)
+{
+    if (auto fileContents = project->projectFilePath().fileContents())
+        return QJsonDocument::fromJson(*fileContents).object();
+    return {};
+}
+
+static bool checkEnabled(FolderNode *fn)
+{
+    if (fn->findChildFileNode([](FileNode *fn) { return fn->isEnabled(); }))
+        return true;
+
+    if (fn->findChildFolderNode([](FolderNode *fn) { return checkEnabled(fn); }))
+        return true;
+
+    fn->setEnabled(false);
+    return false;
+}
+
+class WorkspaceBuildSystem : public BuildSystem
+{
+public:
+    WorkspaceBuildSystem(Target *t)
+        :BuildSystem(t)
+    {
+        connect(&m_scanner, &TreeScanner::finished, this, [this] {
+            auto root = std::make_unique<ProjectNode>(projectDirectory());
+            root->setDisplayName(target()->project()->displayName());
+            std::vector<std::unique_ptr<FileNode>> nodePtrs
+                = Utils::transform<std::vector>(m_scanner.release().allFiles, [this](FileNode *fn) {
+                      fn->setEnabled(!Utils::anyOf(
+                          m_filters, [path = fn->path().path()](const QRegularExpression &filter) {
+                              return filter.match(path).hasMatch();
+                          }));
+                      return std::unique_ptr<FileNode>(fn);
+                  });
+            root->addNestedNodes(std::move(nodePtrs));
+            root->forEachFolderNode(&checkEnabled);
+            setRootProjectNode(std::move(root));
+
+            m_parseGuard.markAsSuccess();
+            m_parseGuard = {};
+
+            emitBuildSystemUpdated();
+        });
+        m_scanner.setDirFilter(QDir::AllEntries | QDir::NoDotAndDotDot | QDir::Hidden);
+
+        connect(target()->project(),
+                &Project::projectFileIsDirty,
+                this,
+                &BuildSystem::requestDelayedParse);
+
+        requestDelayedParse();
+    }
+
+    void triggerParsing() final
+    {
+        m_filters.clear();
+        FilePath projectPath = project()->projectDirectory();
+
+        const QJsonObject json = projectDefinition(project()).value_or(QJsonObject());
+        const QJsonValue projectNameValue = json.value(PROJECT_NAME_KEY);
+        if (projectNameValue.isString())
+            project()->setDisplayName(projectNameValue.toString());
+        const QJsonArray excludesJson = json.value(FILES_EXCLUDE_KEY).toArray();
+        for (const QJsonValue &excludeJson : excludesJson) {
+            if (excludeJson.isString()) {
+                FilePath absolute = projectPath.pathAppended(excludeJson.toString());
+                if (absolute.isDir())
+                    absolute = absolute.pathAppended("*");
+                m_filters << QRegularExpression(
+                    Utils::wildcardToRegularExpression(absolute.path()),
+                    QRegularExpression::CaseInsensitiveOption);
+            }
+        }
+
+        QList<BuildTargetInfo> targetInfos;
+
+        const QJsonArray targets = json.value("targets").toArray();
+        int i = 0;
+        for (const QJsonValue &target : targets) {
+            i++;
+            QTC_ASSERT(target.isObject(), continue);
+            const QJsonObject targetObject = target.toObject();
+
+            QJsonArray args = targetObject["arguments"].toArray();
+            QStringList arguments = Utils::transform<QStringList>(args, [](const QJsonValue &arg) {
+                return arg.toString();
+            });
+            FilePath workingDirectory = FilePath::fromUserInput(
+                targetObject["workingDirectory"].toString());
+
+            if (!workingDirectory.isDir())
+                workingDirectory = FilePath::currentWorkingPath();
+
+            const QString name = targetObject["name"].toString();
+            const FilePath executable = FilePath::fromUserInput(
+                targetObject["executable"].toString());
+
+            if (name.isEmpty() || executable.isEmpty())
+                continue;
+
+            BuildTargetInfo bti;
+            bti.buildKey = name + QString::number(i);
+            bti.displayName = name;
+            bti.displayNameUniquifier = QString(" (%1)").arg(i);
+            bti.targetFilePath = executable;
+            bti.projectFilePath = projectPath;
+            bti.workingDirectory = workingDirectory;
+            bti.additionalData = QVariantMap{{"arguments", arguments}};
+
+            targetInfos << bti;
+        }
+
+        setApplicationTargets(targetInfos);
+
+        m_parseGuard = guardParsingRun();
+        m_scanner.asyncScanForFiles(target()->project()->projectDirectory());
+    }
+
+    QString name() const final { return QLatin1String("Workspace"); }
+
+private:
+    QList<QRegularExpression> m_filters;
+    ParseGuard m_parseGuard;
+    TreeScanner m_scanner;
+};
+
+class WorkspaceRunConfiguration : public RunConfiguration
+{
+public:
+    WorkspaceRunConfiguration(Target *target, Id id)
+        : RunConfiguration(target, id)
+    {
+        hint.setText(
+            Tr::tr("You can edit this configuration inside the .qtcreator/project.json file."));
+
+        const BuildTargetInfo bti = buildTargetInfo();
+        executable.setLabelText(Tr::tr("Executable:"));
+        executable.setReadOnly(true);
+        executable.setValue(bti.targetFilePath);
+
+        auto argumentsAsString = [this]() {
+            return CommandLine{
+                "", buildTargetInfo().additionalData.toMap()["arguments"].toStringList()}
+                .arguments();
+        };
+
+        arguments.setLabelText(Tr::tr("Arguments:"));
+        arguments.setReadOnly(true);
+        arguments.setMacroExpander(macroExpander());
+        arguments.setArguments(argumentsAsString());
+
+        workingDirectory.setLabelText(Tr::tr("Working directory:"));
+        workingDirectory.setReadOnly(true);
+        workingDirectory.setDefaultWorkingDirectory(bti.workingDirectory);
+
+        setCommandLineGetter([this] {
+            const BuildTargetInfo bti = buildTargetInfo();
+            CommandLine cmdLine{
+                macroExpander()->expand(bti.targetFilePath),
+                Utils::transform(
+                    bti.additionalData.toMap()["arguments"].toStringList(),
+                    [this](const QString &arg) { return macroExpander()->expand(arg); })};
+
+            return cmdLine;
+        });
+
+        setUpdater([this, argumentsAsString] {
+            const BuildTargetInfo bti = buildTargetInfo();
+            executable.setValue(bti.targetFilePath);
+            arguments.setArguments(argumentsAsString());
+            workingDirectory.setDefaultWorkingDirectory(bti.workingDirectory);
+        });
+
+        connect(target, &Target::buildSystemUpdated, this, &RunConfiguration::update);
+    }
+
+    TextDisplay hint{this};
+    FilePathAspect executable{this};
+    ArgumentsAspect arguments{this};
+    WorkingDirectoryAspect workingDirectory{this};
+};
+
+class WorkspaceProjectRunConfigurationFactory : public RunConfigurationFactory
+{
+public:
+    WorkspaceProjectRunConfigurationFactory()
+    {
+        registerRunConfiguration<WorkspaceRunConfiguration>(
+            Id::fromString(WORKSPACE_PROJECT_RUNCONFIG_ID));
+        addSupportedProjectType(Id::fromString(WORKSPACE_PROJECT_ID));
+    }
+};
+
+class WorkspaceProjectRunWorkerFactory : public RunWorkerFactory
+{
+public:
+    WorkspaceProjectRunWorkerFactory()
+    {
+        setProduct<SimpleTargetRunner>();
+        addSupportedRunMode(Constants::NORMAL_RUN_MODE);
+        addSupportedRunConfig(Id::fromString(WORKSPACE_PROJECT_RUNCONFIG_ID));
+    }
+};
+
+class WorkspaceProject : public Project
+{
+    Q_OBJECT
+public:
+    WorkspaceProject(const FilePath file)
+    : Project(FOLDER_MIMETYPE, file.isDir() ? file / ".qtcreator" / "project.json" : file)
+    {
+        QTC_CHECK(projectFilePath().absolutePath().ensureWritableDir());
+        if (!projectFilePath().exists() && QTC_GUARD(projectFilePath().ensureExistingFile())) {
+            QJsonObject projectJson;
+            projectJson.insert("$schema", "https://download.qt.io/official_releases/qtcreator/latest/installer_source/jsonschemas/project.json");
+            projectJson.insert(FILES_EXCLUDE_KEY, QJsonArray{QJsonValue(".qtcreator/project.json.user")});
+            projectFilePath().writeFileContents(QJsonDocument(projectJson).toJson());
+        }
+
+        setId(Id::fromString(WORKSPACE_PROJECT_ID));
+        setDisplayName(projectDirectory().fileName());
+        setBuildSystemCreator([](Target *t) { return new WorkspaceBuildSystem(t); });
+    }
+
+    FilePath projectDirectory() const override
+    {
+        return Project::projectDirectory().parentDir();
+    }
+
+    void saveProjectDefinition(const QJsonObject &json)
+    {
+        Utils::FileSaver saver(projectFilePath());
+        saver.write(QJsonDocument(json).toJson());
+        saver.finalize();
+    }
+
+    void excludePath(const FilePath &path)
+    {
+        QTC_ASSERT(projectFilePath().exists(), return);
+        if (expected_str<QJsonObject> json = projectDefinition(this)) {
+            QJsonArray excludes = (*json)[FILES_EXCLUDE_KEY].toArray();
+            const QString relative = path.relativePathFrom(projectDirectory()).path();
+            if (excludes.contains(relative))
+                return;
+            excludes << relative;
+            json->insert(FILES_EXCLUDE_KEY, excludes);
+            saveProjectDefinition(*json);
+        }
+    }
+
+    void excludeNode(Node *node)
+    {
+        node->setEnabled(false);
+        if (auto fileNode = node->asFileNode()) {
+            excludePath(fileNode->path());
+        } else if (auto folderNode = node->asFolderNode()) {
+            folderNode->forEachNode([](Node *node) { node->setEnabled(false); });
+            excludePath(folderNode->path());
+        }
+    }
+};
+
+void setupWorkspaceProject(QObject *guard)
+{
+    ProjectManager::registerProjectType<WorkspaceProject>(FOLDER_MIMETYPE);
+    ProjectManager::registerProjectType<WorkspaceProject>(WORKSPACE_MIMETYPE);
+
+    QAction *excludeAction = nullptr;
+    ActionBuilder(guard, Id::fromString(EXCLUDE_ACTION_ID))
+        .setContext(Id::fromString(WORKSPACE_PROJECT_ID))
+        .setText(Tr::tr("Exclude from Project"))
+        .addToContainer(Constants::M_FOLDERCONTEXT, Constants::G_FOLDER_OTHER)
+        .addToContainer(Constants::M_FILECONTEXT, Constants::G_FILE_OTHER)
+        .bindContextAction(&excludeAction)
+        .setCommandAttribute(Command::CA_Hide)
+        .addOnTriggered(guard, [] {
+            Node *node = ProjectTree::currentNode();
+            QTC_ASSERT(node, return);
+            const auto project = qobject_cast<WorkspaceProject *>(node->getProject());
+            QTC_ASSERT(project, return);
+            project->excludeNode(node);
+        });
+
+    QAction *rescanAction = nullptr;
+    ActionBuilder(guard, Id::fromString(RESCAN_ACTION_ID))
+        .setContext(Id::fromString(WORKSPACE_PROJECT_ID))
+        .setText(Tr::tr("Rescan Workspace"))
+        .addToContainer(Constants::M_PROJECTCONTEXT, Constants::G_PROJECT_REBUILD)
+        .bindContextAction(&rescanAction)
+        .setCommandAttribute(Command::CA_Hide)
+        .addOnTriggered(guard, [] {
+            Node *node = ProjectTree::currentNode();
+            QTC_ASSERT(node, return);
+            const auto project = qobject_cast<WorkspaceProject *>(node->getProject());
+            QTC_ASSERT(project, return);
+            if (auto target = project->activeTarget()) {
+                if (target->buildSystem())
+                    target->buildSystem()->triggerParsing();
+            }
+        });
+
+    QObject::connect(
+        ProjectTree::instance(),
+        &ProjectTree::aboutToShowContextMenu,
+        ProjectExplorerPlugin::instance(),
+        [excludeAction, rescanAction](Node *node) {
+            const bool visible = node && qobject_cast<WorkspaceProject *>(node->getProject());
+            excludeAction->setVisible(visible);
+            rescanAction->setVisible(visible);
+            if (visible) {
+                excludeAction->setEnabled(node->isEnabled());
+                bool enableRescan = false;
+                if (Project *project = node->getProject()) {
+                    if (Target *target = project->activeTarget()) {
+                        if (BuildSystem *buildSystem = target->buildSystem())
+                            enableRescan = !buildSystem->isParsing();
+                    }
+                }
+                rescanAction->setEnabled(enableRescan);
+            }
+        });
+
+    static WorkspaceProjectRunConfigurationFactory theRunConfigurationFactory;
+    static WorkspaceProjectRunWorkerFactory theRunWorkerFactory;
+}
+
+} // namespace ProjectExplorer
+
+#include "workspaceproject.moc"
diff --git a/src/plugins/projectexplorer/workspaceproject.h b/src/plugins/projectexplorer/workspaceproject.h
new file mode 100644
index 00000000000..3fe26a8c8e6
--- /dev/null
+++ b/src/plugins/projectexplorer/workspaceproject.h
@@ -0,0 +1,16 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <qglobal.h>
+
+QT_BEGIN_NAMESPACE
+class QObject;
+QT_END_NAMESPACE
+
+namespace ProjectExplorer {
+
+void setupWorkspaceProject(QObject *guard);
+
+} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/xcodebuildparser.cpp b/src/plugins/projectexplorer/xcodebuildparser.cpp
index 8a2d3e2962a..2037614e043 100644
--- a/src/plugins/projectexplorer/xcodebuildparser.cpp
+++ b/src/plugins/projectexplorer/xcodebuildparser.cpp
@@ -57,7 +57,8 @@ OutputLineParser::Result XcodebuildParser::handleLine(const QString &line, Outpu
                                  absoluteFilePath(FilePath::fromString(
                                      lne.left(filePathEndPos))));
                 LinkSpecs linkSpecs;
-                addLinkSpecForAbsoluteFilePath(linkSpecs, task.file, task.line, 0, filePathEndPos);
+                addLinkSpecForAbsoluteFilePath(linkSpecs, task.file, task.line, task.column, 0,
+                                               filePathEndPos);
                 scheduleTask(task, 1);
                 return {Status::Done, linkSpecs};
             }
diff --git a/src/plugins/python/Python.json.in b/src/plugins/python/Python.json.in
index 5dfb4c6d49e..11432e74cca 100644
--- a/src/plugins/python/Python.json.in
+++ b/src/plugins/python/Python.json.in
@@ -13,8 +13,13 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Other Languages",
-    "Description" : "Plugin for supporting the Python language.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Develop applications using the Qt bindings for the Python programming language.",
+    "LongDescription" : [
+        "You also need:",
+            "- Qt for Python",
+            "- Tools for Python development"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
 
     "Mimetypes" : [
diff --git a/src/plugins/python/pipsupport.cpp b/src/plugins/python/pipsupport.cpp
index 8723ca75109..d7a2dbd645b 100644
--- a/src/plugins/python/pipsupport.cpp
+++ b/src/plugins/python/pipsupport.cpp
@@ -66,12 +66,10 @@ void PipInstallTask::run()
         emit finished(false);
         return;
     }
-    const QString taskTitle = Tr::tr("Install Python Packages");
-    Core::ProgressManager::addTask(m_future.future(), taskTitle, pipInstallTaskId);
     QStringList arguments = {"-m", "pip", "install"};
-    if (!m_requirementsFile.isEmpty())
+    if (!m_requirementsFile.isEmpty()) {
         arguments << "-r" << m_requirementsFile.toString();
-    else {
+    } else {
         for (const PipPackage &package : m_packages) {
             QString pipPackage = package.packageName;
             if (!package.version.isEmpty())
@@ -87,10 +85,27 @@ void PipInstallTask::run()
         arguments << "--user"; // add --user to global pythons, but skip it for venv pythons
     }
 
+    if (m_upgrade)
+        arguments << "--upgrade";
+
+    QString operation;
+    if (!m_requirementsFile.isEmpty()) {
+        operation = m_upgrade ? Tr::tr("Update Requirements") : Tr::tr("Install Requirements");
+    } else if (m_packages.count() == 1) {
+        //: %1 = package name
+        operation = m_upgrade ? Tr::tr("Update %1")
+                              //: %1 = package name
+                              : Tr::tr("Install %1");
+        operation = operation.arg(m_packages.first().displayName);
+    } else {
+        operation = m_upgrade ? Tr::tr("Update Packages") : Tr::tr("Install Packages");
+    }
+
     m_process.setCommand({m_python, arguments});
-    m_process.setTerminalMode(TerminalMode::Run);
+    m_process.setTerminalMode(m_silent ? TerminalMode::Off : TerminalMode::Run);
     m_process.start();
 
+    Core::ProgressManager::addTask(m_future.future(), operation, pipInstallTaskId);
     Core::MessageManager::writeSilently(
         Tr::tr("Running \"%1\" to install %2.")
             .arg(m_process.commandLine().toUserOutput(), packagesDisplayName()));
@@ -143,6 +158,16 @@ QString PipInstallTask::packagesDisplayName() const
                : m_requirementsFile.toUserOutput();
 }
 
+void PipInstallTask::setUpgrade(bool upgrade)
+{
+    m_upgrade = upgrade;
+}
+
+void PipInstallTask::setSilent(bool silent)
+{
+    m_silent = silent;
+}
+
 void PipPackageInfo::parseField(const QString &field, const QStringList &data)
 {
     if (field.isEmpty())
diff --git a/src/plugins/python/pipsupport.h b/src/plugins/python/pipsupport.h
index da217282eb9..35e6e765aac 100644
--- a/src/plugins/python/pipsupport.h
+++ b/src/plugins/python/pipsupport.h
@@ -68,6 +68,8 @@ public:
     void addPackage(const PipPackage &package);
     void setPackages(const QList<PipPackage> &packages);
     void setTargetPath(const Utils::FilePath &targetPath);
+    void setUpgrade(bool upgrade);
+    void setSilent(bool silent);
     void run();
 
 signals:
@@ -86,6 +88,8 @@ private:
     Utils::FilePath m_requirementsFile;
     Utils::FilePath m_targetPath;
     Utils::Process m_process;
+    bool m_upgrade = false;
+    bool m_silent = false;
     QFutureInterface<void> m_future;
     QFutureWatcher<void> m_watcher;
     QTimer m_killTimer;
diff --git a/src/plugins/python/pyside.cpp b/src/plugins/python/pyside.cpp
index 79ffb8b9518..7010e099ffa 100644
--- a/src/plugins/python/pyside.cpp
+++ b/src/plugins/python/pyside.cpp
@@ -4,9 +4,13 @@
 #include "pyside.h"
 
 #include "pipsupport.h"
+#include "pythonbuildconfiguration.h"
+#include "pythonconstants.h"
+#include "pythonproject.h"
 #include "pythontr.h"
 #include "pythonutils.h"
 
+#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
 
 #include <projectexplorer/runconfigurationaspects.h>
@@ -19,8 +23,9 @@
 #include <utils/algorithm.h>
 #include <utils/async.h>
 #include <utils/infobar.h>
-#include <utils/qtcprocess.h>
+#include <utils/mimeconstants.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 
 #include <QBoxLayout>
 #include <QComboBox>
@@ -39,13 +44,13 @@ void PySideInstaller::checkPySideInstallation(const FilePath &python,
                                               TextEditor::TextDocument *document)
 {
     document->infoBar()->removeInfo(installPySideInfoBarId);
-    if (QPointer<QFutureWatcher<bool>> watcher = pySideInstaller().m_futureWatchers.value(document))
+    if (QPointer<QFutureWatcher<bool>> watcher = m_futureWatchers.value(document))
         watcher->cancel();
     if (!python.exists())
         return;
-    const QString pySide = importedPySide(document->plainText());
+    const QString pySide = usedPySide(document->plainText(), document->mimeType());
     if (pySide == "PySide2" || pySide == "PySide6")
-        pySideInstaller().runPySideChecker(python, pySide, document);
+        runPySideChecker(python, pySide, document);
 }
 
 bool PySideInstaller::missingPySideInstallation(const FilePath &pythonPath,
@@ -65,15 +70,25 @@ bool PySideInstaller::missingPySideInstallation(const FilePath &pythonPath,
     return missing;
 }
 
-QString PySideInstaller::importedPySide(const QString &text)
+QString PySideInstaller::usedPySide(const QString &text, const QString &mimeType)
 {
-    static QRegularExpression importScanner("^\\s*(import|from)\\s+(PySide\\d)",
-                                            QRegularExpression::MultilineOption);
-    const QRegularExpressionMatch match = importScanner.match(text);
-    return match.captured(2);
+    using namespace Python::Constants;
+    if (mimeType == C_PY_MIMETYPE || mimeType == C_PY3_MIMETYPE || mimeType == C_PY_GUI_MIMETYPE) {
+        static QRegularExpression
+            scanner("^\\s*(import|from)\\s+(PySide\\d)", QRegularExpression::MultilineOption);
+        const QRegularExpressionMatch match = scanner.match(text);
+        return match.captured(2);
+    }
+    if (mimeType == Utils::Constants::QML_MIMETYPE)
+        return QStringLiteral("PySide6"); // Good enough for now.
+    return {};
 }
 
-PySideInstaller::PySideInstaller() = default;
+PySideInstaller::PySideInstaller()
+{
+    connect(Core::EditorManager::instance(), &Core::EditorManager::documentOpened,
+            this, &PySideInstaller::handleDocumentOpened);
+}
 
 void PySideInstaller::installPyside(const FilePath &python,
                                     const QString &pySide,
@@ -191,6 +206,30 @@ void PySideInstaller::handlePySideMissing(const FilePath &python,
     document->infoBar()->addInfo(info);
 }
 
+void PySideInstaller::handleDocumentOpened(Core::IDocument *document)
+{
+    if (document->mimeType() != Utils::Constants::QML_MIMETYPE)
+        return;
+
+    TextEditor::TextDocument *textDocument = qobject_cast<TextEditor::TextDocument *>(document);
+    if (!textDocument)
+        return;
+    PythonProject *project = pythonProjectForFile(textDocument->filePath());
+    if (!project)
+        return;
+    Target *target = project->activeTarget();
+    if (!target)
+        return;
+    BuildConfiguration *buildConfig = target->activeBuildConfiguration();
+    if (!buildConfig)
+        return;
+    auto *pythonBuildConfig = qobject_cast<PythonBuildConfiguration *>(buildConfig);
+    if (!pythonBuildConfig)
+        return;
+
+    PySideInstaller::instance().checkPySideInstallation(pythonBuildConfig->python(), textDocument);
+}
+
 void PySideInstaller::runPySideChecker(const FilePath &python,
                                        const QString &pySide,
                                        TextEditor::TextDocument *document)
@@ -217,7 +256,7 @@ void PySideInstaller::runPySideChecker(const FilePath &python,
     m_futureWatchers[document] = watcher;
 }
 
-PySideInstaller &pySideInstaller()
+PySideInstaller &PySideInstaller::instance()
 {
     static PySideInstaller thePySideInstaller;
     return thePySideInstaller;
diff --git a/src/plugins/python/pyside.h b/src/plugins/python/pyside.h
index 237b812d3c6..3df882acf1b 100644
--- a/src/plugins/python/pyside.h
+++ b/src/plugins/python/pyside.h
@@ -10,6 +10,7 @@
 #include <QPointer>
 #include <QTextDocument>
 
+namespace Core { class IDocument; }
 namespace TextEditor { class TextDocument; }
 namespace ProjectExplorer { class RunConfiguration; }
 
@@ -27,32 +28,30 @@ class PySideInstaller : public QObject
     Q_OBJECT
 
 public:
-    static void checkPySideInstallation(const Utils::FilePath &python,
-                                        TextEditor::TextDocument *document);
+    void checkPySideInstallation(const Utils::FilePath &python, TextEditor::TextDocument *document);
+    static PySideInstaller &instance();
 
 signals:
     void pySideInstalled(const Utils::FilePath &python, const QString &pySide);
 
 private:
     PySideInstaller();
-    friend PySideInstaller &pySideInstaller();
 
     void installPyside(const Utils::FilePath &python,
                        const QString &pySide, TextEditor::TextDocument *document);
     void handlePySideMissing(const Utils::FilePath &python,
                              const QString &pySide,
                              TextEditor::TextDocument *document);
+    void handleDocumentOpened(Core::IDocument *document);
 
     void runPySideChecker(const Utils::FilePath &python,
                           const QString &pySide,
                           TextEditor::TextDocument *document);
     static bool missingPySideInstallation(const Utils::FilePath &python, const QString &pySide);
-    static QString importedPySide(const QString &text);
+    static QString usedPySide(const QString &text, const QString &mimeType);
 
     QHash<Utils::FilePath, QList<TextEditor::TextDocument *>> m_infoBarEntries;
     QHash<TextEditor::TextDocument *, QPointer<QFutureWatcher<bool>>> m_futureWatchers;
 };
 
-PySideInstaller &pySideInstaller();
-
 } // Python::Internal
diff --git a/src/plugins/python/pythonbuildconfiguration.cpp b/src/plugins/python/pythonbuildconfiguration.cpp
index d13e8cbc6ae..a64020083a0 100644
--- a/src/plugins/python/pythonbuildconfiguration.cpp
+++ b/src/plugins/python/pythonbuildconfiguration.cpp
@@ -30,13 +30,12 @@
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/target.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/algorithm.h>
 #include <utils/commandline.h>
 #include <utils/detailswidget.h>
 #include <utils/futuresynchronizer.h>
 #include <utils/layoutbuilder.h>
+#include <utils/mimeconstants.h>
 #include <utils/qtcprocess.h>
 
 using namespace ProjectExplorer;
@@ -109,7 +108,7 @@ void PySideBuildStep::checkForPySide(const FilePath &python, const QString &pySi
     });
     const auto future = Pip::instance(python)->info(package);
     m_watcher->setFuture(future);
-    ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(future);
+    Utils::futureSynchronizer()->addFuture(future);
 }
 
 void PySideBuildStep::handlePySidePackageInfo(const PipPackageInfo &pySideInfo,
@@ -265,7 +264,7 @@ PythonBuildConfiguration::PythonBuildConfiguration(Target *target, const Id &id)
 
     updateCacheAndEmitEnvironmentChanged();
 
-    connect(&pySideInstaller(),
+    connect(&PySideInstaller::instance(),
             &PySideInstaller::pySideInstalled,
             this,
             &PythonBuildConfiguration::handlePythonUpdated);
@@ -273,13 +272,7 @@ PythonBuildConfiguration::PythonBuildConfiguration(Target *target, const Id &id)
     auto update = [this] {
         if (isActive()) {
             m_buildSystem->emitBuildSystemUpdated();
-            const FilePaths files = project()->files(Project::AllFiles);
-            for (const FilePath &file : files) {
-                if (auto doc = qobject_cast<PythonDocument *>(
-                        Core::DocumentModel::documentForFilePath(file))) {
-                    doc->updatePython(m_python);
-                }
-            }
+            updateDocuments();
         }
     };
     connect(target, &Target::activeBuildConfigurationChanged, this, update);
@@ -338,16 +331,23 @@ void PythonBuildConfiguration::updatePython(const FilePath &python)
     m_python = python;
     if (auto buildStep = buildSteps()->firstOfType<PySideBuildStep>())
         buildStep->checkForPySide(python);
+    updateDocuments();
+    m_buildSystem->requestParse();
+}
+
+void PythonBuildConfiguration::updateDocuments()
+{
     if (isActive()) {
         const FilePaths files = project()->files(Project::AllFiles);
         for (const FilePath &file : files) {
-            if (auto doc = qobject_cast<PythonDocument *>(
-                    Core::DocumentModel::documentForFilePath(file))) {
-                doc->updatePython(m_python);
+            if (auto doc = TextEditor::TextDocument::textDocumentForFilePath(file)) {
+                if (auto pyDoc = qobject_cast<PythonDocument *>(doc))
+                    pyDoc->updatePython(m_python);
+                else if (doc->mimeType() == Utils::Constants::QML_MIMETYPE)
+                    PySideInstaller::instance().checkPySideInstallation(m_python, doc);
             }
         }
     }
-    m_buildSystem->requestParse();
 }
 
 void PythonBuildConfiguration::handlePythonUpdated(const FilePath &python)
diff --git a/src/plugins/python/pythonbuildconfiguration.h b/src/plugins/python/pythonbuildconfiguration.h
index 61b87b4c670..9696722d0bc 100644
--- a/src/plugins/python/pythonbuildconfiguration.h
+++ b/src/plugins/python/pythonbuildconfiguration.h
@@ -64,6 +64,7 @@ private:
     void initialize(const ProjectExplorer::BuildInfo &info);
     void updateInterpreter(const std::optional<ProjectExplorer::Interpreter> &python);
     void updatePython(const Utils::FilePath &python);
+    void updateDocuments();
     void handlePythonUpdated(const Utils::FilePath &python);
 
     Utils::FilePath m_python;
diff --git a/src/plugins/python/pythoneditor.cpp b/src/plugins/python/pythoneditor.cpp
index ddd30f2acf5..64ad03052d7 100644
--- a/src/plugins/python/pythoneditor.cpp
+++ b/src/plugins/python/pythoneditor.cpp
@@ -27,7 +27,6 @@
 #include <projectexplorer/target.h>
 
 #include <texteditor/texteditor.h>
-#include <texteditor/texteditoractionhandler.h>
 
 #include <utils/stylehelper.h>
 
@@ -304,7 +303,7 @@ void PythonDocument::updateCurrentPython()
 void PythonDocument::updatePython(const FilePath &python)
 {
     openDocumentWithPython(python, this);
-    PySideInstaller::checkPySideInstallation(python, this);
+    PySideInstaller::instance().checkPySideInstallation(python, this);
     emit pythonUpdated(python);
 }
 
@@ -317,10 +316,10 @@ public:
         setDisplayName(::Core::Tr::tr(Constants::C_EDITOR_DISPLAY_NAME));
         addMimeType(Constants::C_PY_MIMETYPE);
 
-        setEditorActionHandlers(TextEditorActionHandler::Format
-                                | TextEditorActionHandler::UnCommentSelection
-                                | TextEditorActionHandler::UnCollapseAll
-                                | TextEditorActionHandler::FollowSymbolUnderCursor);
+        setOptionalActionMask(OptionalActions::Format
+                                | OptionalActions::UnCommentSelection
+                                | OptionalActions::UnCollapseAll
+                                | OptionalActions::FollowSymbolUnderCursor);
 
         setDocumentCreator([]() { return new PythonDocument; });
         setEditorWidgetCreator([]() { return new PythonEditorWidget; });
diff --git a/src/plugins/python/pythonkitaspect.cpp b/src/plugins/python/pythonkitaspect.cpp
index 0be12cead0a..1b0004fd78b 100644
--- a/src/plugins/python/pythonkitaspect.cpp
+++ b/src/plugins/python/pythonkitaspect.cpp
@@ -73,7 +73,7 @@ public:
     }
 
 protected:
-    void addToLayoutImpl(Layouting::LayoutItem &parent) override
+    void addToLayoutImpl(Layouting::Layout &parent) override
     {
         addMutableAction(m_comboBox);
         parent.addItem(m_comboBox);
diff --git a/src/plugins/python/pythonlanguageclient.cpp b/src/plugins/python/pythonlanguageclient.cpp
index 86cebde0e94..3c05b8f87ed 100644
--- a/src/plugins/python/pythonlanguageclient.cpp
+++ b/src/plugins/python/pythonlanguageclient.cpp
@@ -46,14 +46,17 @@ using namespace Utils;
 namespace Python::Internal {
 
 static constexpr char installPylsInfoBarId[] = "Python::InstallPyls";
+static constexpr char updatePylsInfoBarId[] = "Python::updatePyls";
+static constexpr char alwaysUpdateKey[] = "Python/AlwaysUpdatePyls";
 
 class PythonLanguageServerState
 {
 public:
     enum {
-        CanNotBeInstalled,
-        CanBeInstalled,
-        AlreadyInstalled
+        NotInstallable,
+        Installable,
+        Updatable,
+        Installed
     } state;
     FilePath pylsModulePath;
 };
@@ -79,18 +82,40 @@ static PythonLanguageServerState checkPythonLanguageServer(const FilePath &pytho
     using namespace LanguageClient;
     auto lspPath = pyLspPath(python);
     if (lspPath.isEmpty())
-        return {PythonLanguageServerState::CanNotBeInstalled, FilePath()};
-
-    if (lspPath.pathAppended("bin").pathAppended("pylsp").withExecutableSuffix().exists())
-        return {PythonLanguageServerState::AlreadyInstalled, lspPath};
+        return {PythonLanguageServerState::NotInstallable, FilePath()};
 
     Process pythonProcess;
     pythonProcess.setCommand({python, {"-m", "pip", "-V"}});
     using namespace std::chrono_literals;
     pythonProcess.runBlocking(2s);
-    if (pythonProcess.allOutput().startsWith("pip "))
-        return {PythonLanguageServerState::CanBeInstalled, lspPath};
-    return {PythonLanguageServerState::CanNotBeInstalled, FilePath()};
+    bool pipAvailable = pythonProcess.allOutput().startsWith("pip ");
+
+    if (lspPath.pathAppended("bin").pathAppended("pylsp").withExecutableSuffix().exists()) {
+        if (pipAvailable) {
+            Process pythonProcess;
+            Environment env = pythonProcess.environment();
+            env.set("PYTHONPATH", lspPath.toUserOutput());
+            pythonProcess.setEnvironment(env);
+            pythonProcess.setCommand({python, {"-m", "pip", "list", "--outdated", "--format=json"}});
+            pythonProcess.runBlocking(20s);
+            QString output = pythonProcess.allOutput();
+
+            // Only the first line contains the json data. Following lines might contain warnings.
+            if (int index = output.indexOf('\n'); index >= 0)
+                output.truncate(index);
+
+            const QJsonDocument doc = QJsonDocument::fromJson(output.toUtf8());
+            for (const QJsonValue &value : doc.array()) {
+                if (value.toObject().value("name") == "python-lsp-server")
+                    return {PythonLanguageServerState::Updatable, lspPath};
+            }
+        }
+        return {PythonLanguageServerState::Installed, lspPath};
+    }
+
+    if (pipAvailable)
+        return {PythonLanguageServerState::Installable, lspPath};
+    return {PythonLanguageServerState::NotInstallable, FilePath()};
 }
 
 
@@ -126,7 +151,7 @@ PyLSClient *clientForPython(const FilePath &python)
     if (auto client = pythonClients()[python])
         return client;
     auto interface = new PyLSInterface;
-    interface->setCommandLine(CommandLine(python, {"-m", "pylsp"}));
+    interface->setCommandLine({python, {"-m", "pylsp"}});
     auto client = new PyLSClient(interface);
     client->setName(Tr::tr("Python Language Server (%1)").arg(python.toUserOutput()));
     client->setActivateDocumentAutomatically(true);
@@ -256,23 +281,25 @@ class PyLSConfigureAssistant : public QObject
 public:
     PyLSConfigureAssistant();
 
-    void handlePyLSState(const Utils::FilePath &python,
+    void handlePyLSState(const FilePath &python,
                          const PythonLanguageServerState &state,
                          TextEditor::TextDocument *document);
     void resetEditorInfoBar(TextEditor::TextDocument *document);
-    void installPythonLanguageServer(const Utils::FilePath &python,
+    void installPythonLanguageServer(const FilePath &python,
                                      QPointer<TextEditor::TextDocument> document,
-                                     const Utils::FilePath &pylsPath);
+                                     const FilePath &pylsPath, bool silent, bool upgrade);
     void openDocument(const FilePath &python, TextEditor::TextDocument *document);
 
-    QHash<Utils::FilePath, QList<TextEditor::TextDocument *>> m_infoBarEntries;
+    QHash<FilePath, QList<TextEditor::TextDocument *>> m_infoBarEntries;
     QHash<TextEditor::TextDocument *, QPointer<QFutureWatcher<PythonLanguageServerState>>>
         m_runningChecks;
 };
 
 void PyLSConfigureAssistant::installPythonLanguageServer(const FilePath &python,
                                                          QPointer<TextEditor::TextDocument> document,
-                                                         const FilePath &pylsPath)
+                                                         const FilePath &pylsPath,
+                                                         bool silent,
+                                                         bool upgrade)
 {
     document->infoBar()->removeInfo(installPylsInfoBarId);
 
@@ -299,6 +326,8 @@ void PyLSConfigureAssistant::installPythonLanguageServer(const FilePath &python,
 
     install->setTargetPath(pylsPath);
     install->setPackages({PipPackage{"python-lsp-server[all]", "Python Language Server"}});
+    install->setUpgrade(upgrade);
+    install->setSilent(silent);
     install->run();
 }
 
@@ -342,24 +371,55 @@ void PyLSConfigureAssistant::handlePyLSState(const FilePath &python,
                                              const PythonLanguageServerState &state,
                                              TextEditor::TextDocument *document)
 {
-    if (state.state == PythonLanguageServerState::CanNotBeInstalled)
+    if (state.state == PythonLanguageServerState::NotInstallable)
         return;
 
-    Utils::InfoBar *infoBar = document->infoBar();
-    if (state.state == PythonLanguageServerState::CanBeInstalled
+    InfoBar *infoBar = document->infoBar();
+    if (state.state == PythonLanguageServerState::Installable
         && infoBar->canInfoBeAdded(installPylsInfoBarId)) {
         auto message = Tr::tr("Install Python language server (PyLS) for %1 (%2). "
                               "The language server provides Python specific completion and annotation.")
                            .arg(pythonName(python), python.toUserOutput());
-        Utils::InfoBarEntry info(installPylsInfoBarId,
-                                 message,
-                                 Utils::InfoBarEntry::GlobalSuppression::Enabled);
+        InfoBarEntry info(installPylsInfoBarId, message, InfoBarEntry::GlobalSuppression::Enabled);
         info.addCustomButton(Tr::tr("Install"), [this, python, document, state] {
-            installPythonLanguageServer(python, document, state.pylsModulePath);
+            installPythonLanguageServer(python, document, state.pylsModulePath, false, false);
         });
         infoBar->addInfo(info);
         m_infoBarEntries[python] << document;
-    } else if (state.state == PythonLanguageServerState::AlreadyInstalled) {
+    } else if (state.state == PythonLanguageServerState::Updatable) {
+        if (infoBar->canInfoBeAdded(updatePylsInfoBarId)) {
+            auto message = Tr::tr("Update Python language server (PyLS) for %1 (%2).")
+                               .arg(pythonName(python), python.toUserOutput());
+            InfoBarEntry info(updatePylsInfoBarId, message);
+            info.addCustomButton(Tr::tr("Always Update"), [this, python, document, state] {
+                document->infoBar()->removeInfo(updatePylsInfoBarId);
+                Core::ICore::settings()->setValue(alwaysUpdateKey, true);
+                InfoBar::globallySuppressInfo(updatePylsInfoBarId);
+                installPythonLanguageServer(python, document, state.pylsModulePath, false, true);
+            });
+            info.addCustomButton(Tr::tr("Update"), [this, python, document, state] {
+                document->infoBar()->removeInfo(updatePylsInfoBarId);
+                installPythonLanguageServer(python, document, state.pylsModulePath, false, true);
+            });
+            info.addCustomButton(Tr::tr("Never"), [document, python] {
+                document->infoBar()->removeInfo(updatePylsInfoBarId);
+                InfoBar::globallySuppressInfo(updatePylsInfoBarId);
+                if (auto client = clientForPython(python))
+                    LanguageClientManager::openDocumentWithClient(document, client);
+            });
+            info.setCancelButtonInfo([python, document]{
+                if (auto client = clientForPython(python))
+                    LanguageClientManager::openDocumentWithClient(document, client);
+            });
+            infoBar->addInfo(info);
+
+            m_infoBarEntries[python] << document;
+        } else if (Core::ICore::settings()->value(alwaysUpdateKey, false).toBool()) {
+            installPythonLanguageServer(python, document, state.pylsModulePath, true, true);
+        } else if (auto client = clientForPython(python)) {
+            LanguageClientManager::openDocumentWithClient(document, client);
+        }
+    } else if (state.state == PythonLanguageServerState::Installed) {
         if (auto client = clientForPython(python))
             LanguageClientManager::openDocumentWithClient(document, client);
     }
diff --git a/src/plugins/python/pythonproject.cpp b/src/plugins/python/pythonproject.cpp
index db0831005f1..ed81e8cc8bb 100644
--- a/src/plugins/python/pythonproject.cpp
+++ b/src/plugins/python/pythonproject.cpp
@@ -33,9 +33,8 @@ Tasks PythonProject::projectIssues(const Kit *k) const
 {
     if (PythonKitAspect::python(k))
         return {};
-    return {
-        BuildSystemTask{Task::Error,
-                        Tr::tr("No Python interpreter set for kit \"%1\"").arg(k->displayName())}};
+    return {BuildSystemTask{
+        Task::Error, Tr::tr("No Python interpreter set for kit \"%1\".").arg(k->displayName())}};
 }
 
 PythonProjectNode::PythonProjectNode(const FilePath &path)
diff --git a/src/plugins/python/pythonrunconfiguration.cpp b/src/plugins/python/pythonrunconfiguration.cpp
index d01f4bc9bb7..e4ec5a9e845 100644
--- a/src/plugins/python/pythonrunconfiguration.cpp
+++ b/src/plugins/python/pythonrunconfiguration.cpp
@@ -3,14 +3,8 @@
 
 #include "pythonrunconfiguration.h"
 
-#include "pyside.h"
-#include "pythonbuildconfiguration.h"
 #include "pythonconstants.h"
-#include "pythoneditor.h"
-#include "pythonkitaspect.h"
-#include "pythonlanguageclient.h"
 #include "pythonproject.h"
-#include "pythonsettings.h"
 #include "pythontr.h"
 
 #include <coreplugin/editormanager/editormanager.h>
@@ -18,31 +12,16 @@
 
 #include <debugger/debuggerruncontrol.h>
 
-#include <extensionsystem/pluginmanager.h>
-
-#include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/buildsystem.h>
-#include <projectexplorer/devicesupport/idevice.h>
-#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/runconfigurationaspects.h>
 #include <projectexplorer/runcontrol.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/taskhub.h>
 
-#include <texteditor/textdocument.h>
-
 #include <utils/aspects.h>
 #include <utils/fileutils.h>
-#include <utils/futuresynchronizer.h>
-#include <utils/layoutbuilder.h>
 #include <utils/outputformatter.h>
-#include <utils/qtcassert.h>
-#include <utils/theme/theme.h>
-
-#include <QComboBox>
-#include <QPlainTextEdit>
-#include <QPushButton>
 
 using namespace ProjectExplorer;
 using namespace Utils;
diff --git a/src/plugins/python/pythonsettings.cpp b/src/plugins/python/pythonsettings.cpp
index cad296ae5de..bfc411c6c2f 100644
--- a/src/plugins/python/pythonsettings.cpp
+++ b/src/plugins/python/pythonsettings.cpp
@@ -751,11 +751,9 @@ PythonSettings::PythonSettings()
     initFromSettings(Core::ICore::settings());
 
     const auto onRegistrySetup = [](Async<QList<Interpreter>> &task) {
-        task.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
         task.setConcurrentCallData(pythonsFromRegistry);
     };
     const auto onPathSetup = [](Async<QList<Interpreter>> &task) {
-        task.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
         task.setConcurrentCallData(pythonsFromPath);
     };
     const auto onTaskDone = [](const Async<QList<Interpreter>> &task) {
diff --git a/src/plugins/python/pythonutils.cpp b/src/plugins/python/pythonutils.cpp
index bf97831cad9..87156e3b9cc 100644
--- a/src/plugins/python/pythonutils.cpp
+++ b/src/plugins/python/pythonutils.cpp
@@ -121,11 +121,9 @@ void openPythonRepl(QObject *parent, const FilePath &file, ReplType type)
         return file.absolutePath();
     };
 
-    const auto args = QStringList{"-i"} + replImportArgs(file, type);
     const FilePath pythonCommand = detectPython(file);
-
     Process process;
-    process.setCommand({pythonCommand, args});
+    process.setCommand({pythonCommand, {"-i", replImportArgs(file, type)}});
     process.setWorkingDirectory(workingDir(file));
     process.setTerminalMode(TerminalMode::Detached);
     process.start();
@@ -158,11 +156,11 @@ QString pythonName(const FilePath &pythonPath)
     return name;
 }
 
-PythonProject *pythonProjectForFile(const FilePath &pythonFile)
+PythonProject *pythonProjectForFile(const FilePath &file)
 {
     for (Project *project : ProjectManager::projects()) {
         if (auto pythonProject = qobject_cast<PythonProject *>(project)) {
-            if (pythonProject->isKnownFile(pythonFile))
+            if (pythonProject->isKnownFile(file))
                 return pythonProject;
         }
     }
@@ -201,7 +199,7 @@ static bool isUsableHelper(QHash<FilePath, bool> *cache, const QString &keyStrin
     if (it == cache->end()) {
         const Key key = keyFromString(keyString);
         Process process;
-        process.setCommand({python, QStringList{"-m", commandArg, "-h"}});
+        process.setCommand({python, {"-m", commandArg, "-h"}});
         process.runBlocking();
         const bool usable = process.result() == ProcessResult::FinishedWithSuccess;
         it = cache->insert(python, usable);
diff --git a/src/plugins/qbsprojectmanager/QbsProjectManager.json.in b/src/plugins/qbsprojectmanager/QbsProjectManager.json.in
index 263722d28da..3d5f3a07ba5 100644
--- a/src/plugins/qbsprojectmanager/QbsProjectManager.json.in
+++ b/src/plugins/qbsprojectmanager/QbsProjectManager.json.in
@@ -13,7 +13,10 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Build Systems",
-    "Description" : "QBS support.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Build applications with Qbs.",
+    "LongDescription" : [
+        "Generate a build graph from a high-level project description (like with qmake or CMake) and execute the commands in the low-level build graph (like with make)."
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/qbsprojectmanager/customqbspropertiesdialog.cpp b/src/plugins/qbsprojectmanager/customqbspropertiesdialog.cpp
index 78e0634bc5f..13e6e09dd31 100644
--- a/src/plugins/qbsprojectmanager/customqbspropertiesdialog.cpp
+++ b/src/plugins/qbsprojectmanager/customqbspropertiesdialog.cpp
@@ -50,7 +50,7 @@ CustomQbsPropertiesDialog::CustomQbsPropertiesDialog(const QVariantMap &properti
             Column {
                 PushButton {
                     text(Tr::tr("&Add")),
-                    onClicked([this] { addProperty(); } ),
+                    onClicked([this] { addProperty(); }, this),
                 },
                 m_removeButton,
                 st
diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
index 6cf4cc7e31b..2bea6158d77 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
@@ -44,8 +44,7 @@ static FilePath defaultBuildDirectory(const FilePath &projectFilePath, const Kit
 {
     const QString projectName = projectFilePath.completeBaseName();
     return BuildConfiguration::buildDirectoryFromTemplate(
-                Project::projectDirectory(projectFilePath),
-                projectFilePath, projectName, k, bcName, buildType, "qbs");
+        projectFilePath.absolutePath(), projectFilePath, projectName, k, bcName, buildType, "qbs");
 }
 
 // ---------------------------------------------------------------------------
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
index 71cc48aaf8b..c079f007b16 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
@@ -60,7 +60,7 @@ ArchitecturesAspect::ArchitecturesAspect(AspectContainer *container)
     setAllValues(m_abisToArchMap.keys());
 }
 
-void ArchitecturesAspect::addToLayout(Layouting::LayoutItem &parent)
+void ArchitecturesAspect::addToLayout(Layouting::Layout &parent)
 {
     MultiSelectionAspect::addToLayout(parent);
     const auto changeHandler = [this] {
@@ -610,7 +610,7 @@ void QbsBuildStepConfigWidget::changeUseDefaultInstallDir(bool useDefault)
     if (useDefault)
         config.remove(Constants::QBS_INSTALL_ROOT_KEY);
     else
-        config.insert(Constants::QBS_INSTALL_ROOT_KEY, installDirChooser->rawFilePath().toString());
+        config.insert(Constants::QBS_INSTALL_ROOT_KEY, installDirChooser->unexpandedFilePath().toString());
     m_qbsStep->setQbsConfiguration(config);
 }
 
@@ -620,7 +620,7 @@ void QbsBuildStepConfigWidget::changeInstallDir()
         return;
     const GuardLocker locker(m_ignoreChanges);
     Store config = m_qbsStep->qbsConfiguration(QbsBuildStep::PreserveVariables);
-    config.insert(Constants::QBS_INSTALL_ROOT_KEY, installDirChooser->rawFilePath().toString());
+    config.insert(Constants::QBS_INSTALL_ROOT_KEY, installDirChooser->unexpandedFilePath().toString());
     m_qbsStep->setQbsConfiguration(config);
 }
 
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.h b/src/plugins/qbsprojectmanager/qbsbuildstep.h
index 4815a96a857..37ed2181878 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.h
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.h
@@ -20,7 +20,7 @@ public:
     ArchitecturesAspect(Utils::AspectContainer *container = nullptr);
 
     void setKit(const ProjectExplorer::Kit *kit) { m_kit = kit; }
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
     QStringList selectedArchitectures() const;
     void setSelectedArchitectures(const QStringList& architectures);
     bool isManagedByTarget() const { return m_isManagedByTarget; }
diff --git a/src/plugins/qbsprojectmanager/qbseditor.cpp b/src/plugins/qbsprojectmanager/qbseditor.cpp
index 08f6e0a8725..592c74a8cb4 100644
--- a/src/plugins/qbsprojectmanager/qbseditor.cpp
+++ b/src/plugins/qbsprojectmanager/qbseditor.cpp
@@ -149,7 +149,7 @@ IAssistProposal *MergedCompletionAssistProcessor::perform()
         });
         m_qbsProcessor->start(std::make_unique<AssistInterface>(m_interface->cursor(),
                                                                 m_interface->filePath(),
-                                                                ExplicitlyInvoked));
+                                                                m_interface->reason()));
     } else {
         m_qbsProposal = nullptr;
     }
@@ -162,7 +162,7 @@ IAssistProposal *MergedCompletionAssistProcessor::perform()
     return m_qmlProcessor->start(
         std::make_unique<QmlJSCompletionAssistInterface>(qmlJsIface->cursor(),
                                                          qmlJsIface->filePath(),
-                                                         ExplicitlyInvoked,
+                                                         m_interface->reason(),
                                                          qmlJsIface->semanticInfo()));
 }
 
diff --git a/src/plugins/qbsprojectmanager/qbskitaspect.cpp b/src/plugins/qbsprojectmanager/qbskitaspect.cpp
index 647f44f02c7..adc35c2f3f9 100644
--- a/src/plugins/qbsprojectmanager/qbskitaspect.cpp
+++ b/src/plugins/qbsprojectmanager/qbskitaspect.cpp
@@ -34,7 +34,7 @@ private:
     void makeReadOnly() override { m_changeButton->setEnabled(false); }
     void refresh() override { m_contentLabel->setText(QbsKitAspect::representation(kit())); }
 
-    void addToLayoutImpl(Layouting::LayoutItem &parent) override
+    void addToLayoutImpl(Layouting::Layout &parent) override
     {
         addMutableAction(m_contentLabel);
         parent.addItem(m_contentLabel);
diff --git a/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp b/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp
index 3cfd68d5ce9..4968d3d2163 100644
--- a/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp
@@ -4,9 +4,6 @@
 #include "qbsprofilemanager.h"
 
 #include "defaultpropertyprovider.h"
-#include "qbsproject.h"
-#include "qbsprojectmanagerconstants.h"
-#include "qbsprojectmanagerplugin.h"
 #include "qbsprojectmanagertr.h"
 #include "qbssettings.h"
 
@@ -60,7 +57,7 @@ QString toJSLiteral(const QVariant &val)
 {
     if (!val.isValid())
         return QString("undefined");
-    if (val.typeId() == QVariant::List || val.typeId() == QVariant::StringList) {
+    if (val.typeId() == QMetaType::QVariantList || val.typeId() == QMetaType::QStringList) {
         QString res;
         const auto list = val.toList();
         for (const QVariant &child : list) {
@@ -71,7 +68,7 @@ QString toJSLiteral(const QVariant &val)
         res.append(']');
         return res;
     }
-    if (val.typeId() == QVariant::Map) {
+    if (val.typeId() == QMetaType::QVariantMap) {
         const QVariantMap &vm = val.toMap();
         QString str("{");
         for (auto it = vm.begin(); it != vm.end(); ++it) {
@@ -82,9 +79,9 @@ QString toJSLiteral(const QVariant &val)
         str += '}';
         return str;
     }
-    if (val.typeId() == QVariant::Bool)
+    if (val.typeId() == QMetaType::Bool)
         return toJSLiteral(val.toBool());
-    if (val.canConvert(QVariant::String))
+    if (val.canConvert(QMetaType(QMetaType::QString)))
         return toJSLiteral(val.toString());
     return QString::fromLatin1("Unconvertible type %1").arg(QLatin1String(val.typeName()));
 }
diff --git a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp
index fb048f94751..34bc379db2a 100644
--- a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp
@@ -133,11 +133,11 @@ QbsProfilesSettingsWidget::QbsProfilesSettingsWidget()
             Column {
                 PushButton {
                     text(Tr::tr("E&xpand All")),
-                    onClicked([this] { m_propertiesView->expandAll(); }),
+                    onClicked([this] { m_propertiesView->expandAll(); }, this),
                 },
                 PushButton {
                     text(Tr::tr("&Collapse All")),
-                    onClicked([this] { m_propertiesView->collapseAll(); }),
+                    onClicked([this] { m_propertiesView->collapseAll(); }, this),
                 },
                 st,
             },
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index 74b64e2a5cc..2d2c27a2a83 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -798,6 +798,8 @@ static void getExpandedCompilerFlags(QStringList &cFlags, QStringList &cxxFlags,
             cxxFlags << "/std:c++20";
         else if (cxxLanguageVersion.contains("c++17"))
             cxxFlags << "/std:c++17";
+    } else {
+        cFlags = cxxFlags = commonFlags;
     }
 }
 
diff --git a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp b/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
index 71e25aa4058..4e31b8d765c 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
@@ -74,8 +74,13 @@ static FilePath buildDir(const FilePath &projectFilePath, const Kit *k)
 {
     const QString projectName = projectFilePath.completeBaseName();
     return BuildConfiguration::buildDirectoryFromTemplate(
-                Project::projectDirectory(projectFilePath),
-                projectFilePath, projectName, k, QString(), BuildConfiguration::Unknown, "qbs");
+        projectFilePath.absolutePath(),
+        projectFilePath,
+        projectName,
+        k,
+        QString(),
+        BuildConfiguration::Unknown,
+        "qbs");
 }
 
 static bool hasBuildGraph(const FilePath &dir)
diff --git a/src/plugins/qbsprojectmanager/qbssession.cpp b/src/plugins/qbsprojectmanager/qbssession.cpp
index b2801acfa26..193d0396051 100644
--- a/src/plugins/qbsprojectmanager/qbssession.cpp
+++ b/src/plugins/qbsprojectmanager/qbssession.cpp
@@ -135,12 +135,14 @@ public:
     QbsLanguageClient *languageClient = nullptr;
     PacketReader *packetReader = nullptr;
     QJsonObject currentRequest;
+    QList<QJsonObject> queuedFileUpdateRequests;
     QJsonObject projectData;
     QEventLoop eventLoop;
     QJsonObject reply;
     QHash<QString, QStringList> generatedFilesForSources;
     std::optional<Error> lastError;
     State state = State::Inactive;
+    bool fileUpdatePossible = true;
 };
 
 QbsSession::QbsSession(QbsBuildSystem *buildSystem) : QObject(buildSystem), d(new Private)
@@ -465,6 +467,8 @@ void QbsSession::handlePacket(const QJsonObject &packet)
     } else if (type == "project-resolved") {
         setProjectDataFromReply(packet, true);
         emit projectResolved(getErrorInfo(packet));
+        d->fileUpdatePossible = true;
+        sendNextPendingFileUpdateRequest();
     } else if (type == "project-built") {
         setProjectDataFromReply(packet, false);
         emit projectBuilt(getErrorInfo(packet));
@@ -586,17 +590,21 @@ FileChangeResult QbsSession::updateFileList(const char *action, const QStringLis
 {
     if (d->state != State::Active)
         return FileChangeResult(files, Tr::tr("The qbs session is not in a valid state."));
-    sendRequestNow(QJsonObject{
+    const QJsonObject fileUpdateRequest{
         {"type", QLatin1String(action)},
         {"files", QJsonArray::fromStringList(files)},
         {"product", product},
-        {"group", group}
-    });
+        {"group", group}};
+    if (d->fileUpdatePossible)
+        sendFileUpdateRequest(fileUpdateRequest);
+    else
+        d->queuedFileUpdateRequests << fileUpdateRequest;
     return FileChangeResult(QStringList());
 }
 
 void QbsSession::handleFileListUpdated(const QJsonObject &reply)
 {
+    QTC_CHECK(!d->fileUpdatePossible);
     setProjectDataFromReply(reply, false);
     const QStringList failedFiles = arrayToStringList(reply.value("failed-files"));
     if (!failedFiles.isEmpty()) {
@@ -604,10 +612,24 @@ void QbsSession::handleFileListUpdated(const QJsonObject &reply)
             Tr::tr("Failed to update files in Qbs project: %1.\n"
                "The affected files are: \n\t%2")
                 .arg(getErrorInfo(reply).toString(), failedFiles.join("\n\t")));
+        d->fileUpdatePossible = true;
+        sendNextPendingFileUpdateRequest();
     }
     emit fileListUpdated();
 }
 
+void QbsSession::sendNextPendingFileUpdateRequest()
+{
+    if (!d->queuedFileUpdateRequests.isEmpty())
+        sendFileUpdateRequest(d->queuedFileUpdateRequests.takeFirst());
+}
+
+void QbsSession::sendFileUpdateRequest(const QJsonObject &request)
+{
+    d->fileUpdatePossible = false;
+    sendRequestNow(request);
+}
+
 ErrorInfoItem::ErrorInfoItem(const QJsonObject &data)
 {
     description = data.value("description").toString();
diff --git a/src/plugins/qbsprojectmanager/qbssession.h b/src/plugins/qbsprojectmanager/qbssession.h
index 670388a5bbb..88c008dc16e 100644
--- a/src/plugins/qbsprojectmanager/qbssession.h
+++ b/src/plugins/qbsprojectmanager/qbssession.h
@@ -173,6 +173,8 @@ private:
     FileChangeResult updateFileList(const char *action, const QStringList &files,
                                     const QString &product, const QString &group);
     void handleFileListUpdated(const QJsonObject &reply);
+    void sendNextPendingFileUpdateRequest();
+    void sendFileUpdateRequest(const QJsonObject &request);
 
     class Private;
     Private * const d;
diff --git a/src/plugins/qmakeprojectmanager/QmakeProjectManager.json.in b/src/plugins/qmakeprojectmanager/QmakeProjectManager.json.in
index a080d69dece..c3815d405a5 100644
--- a/src/plugins/qmakeprojectmanager/QmakeProjectManager.json.in
+++ b/src/plugins/qmakeprojectmanager/QmakeProjectManager.json.in
@@ -13,8 +13,11 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Build Systems",
-    "Description" : "Provides project type for Qt/QMake .pro files and tools.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Build applications with qmake.",
+    "LongDescription" : [
+        "Use .pro project configuration files and tools that automate the generation of Makefiles."
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
 
     "Mimetypes" : [
diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.cpp
index d8d742267c1..49ff339f45a 100644
--- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.cpp
+++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.cpp
@@ -28,8 +28,8 @@ CustomWidgetWizardDialog::CustomWidgetWizardDialog(const Core::BaseFileWizardFac
     setWindowIcon(icon);
     setWindowTitle(templateName);
 
-    setIntroDescription(Tr::tr("This wizard generates a Qt Designer Custom Widget "
-                               "or a Qt Designer Custom Widget Collection project."));
+    setIntroDescription(Tr::tr("This wizard generates a Qt Widgets Designer Custom Widget "
+                               "or a Qt Widgets Designer Custom Widget Collection project."));
 
     if (!parameters.extraValues().contains(QLatin1String(ProjectExplorer::Constants::PROJECT_KIT_IDS)))
         addTargetSetupPage();
diff --git a/src/plugins/qmakeprojectmanager/profileeditor.cpp b/src/plugins/qmakeprojectmanager/profileeditor.cpp
index c510e139012..8b86a58b4ba 100644
--- a/src/plugins/qmakeprojectmanager/profileeditor.cpp
+++ b/src/plugins/qmakeprojectmanager/profileeditor.cpp
@@ -19,7 +19,6 @@
 #include <projectexplorer/target.h>
 
 #include <texteditor/textdocument.h>
-#include <texteditor/texteditoractionhandler.h>
 
 #include <utils/fsengine/fileiconprovider.h>
 #include <utils/mimeconstants.h>
@@ -273,8 +272,8 @@ ProFileEditorFactory::ProFileEditorFactory()
     setCompletionAssistProvider(completionAssistProvider);
 
     setCommentDefinition(CommentDefinition::HashStyle);
-    setEditorActionHandlers(TextEditorActionHandler::UnCommentSelection
-                | TextEditorActionHandler::JumpToFileUnderCursor);
+    setOptionalActionMask(OptionalActions::UnCommentSelection
+                | OptionalActions::JumpToFileUnderCursor);
 
     addHoverHandler(new ProFileHoverHandler);
     setSyntaxHighlighterCreator([]() { return new ProFileHighlighter; });
diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
index 541e848c1f5..44cceab6c1b 100644
--- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
@@ -73,7 +73,7 @@ FilePath QmakeBuildConfiguration::shadowBuildDirectory(const FilePath &proFilePa
         return {};
 
     const QString projectName = proFilePath.completeBaseName();
-    return buildDirectoryFromTemplate(Project::projectDirectory(proFilePath), proFilePath,
+    return buildDirectoryFromTemplate(proFilePath.absolutePath(), proFilePath,
                                       projectName, k, suffix, buildType, "qmake");
 }
 
diff --git a/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp b/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp
index d8e1e416483..c29c8da43b5 100644
--- a/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakekitaspect.cpp
@@ -39,7 +39,7 @@ public:
     ~QmakeKitAspectImpl() override { delete m_lineEdit; }
 
 private:
-    void addToLayoutImpl(Layouting::LayoutItem &parent) override
+    void addToLayoutImpl(Layouting::Layout &parent) override
     {
         addMutableAction(m_lineEdit);
         parent.addItem(m_lineEdit);
diff --git a/src/plugins/qmakeprojectmanager/qmakeparser.cpp b/src/plugins/qmakeprojectmanager/qmakeparser.cpp
index 57051ba5a20..0b0bdc5af08 100644
--- a/src/plugins/qmakeprojectmanager/qmakeparser.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeparser.cpp
@@ -46,7 +46,7 @@ OutputLineParser::Result QMakeParser::handleLine(const QString &line, OutputForm
         BuildSystemTask t(type, description, absoluteFilePath(FilePath::fromUserInput(fileName)),
                           match.captured(2).toInt() /* line */);
         LinkSpecs linkSpecs;
-        addLinkSpecForAbsoluteFilePath(linkSpecs, t.file, t.line, fileNameOffset,
+        addLinkSpecForAbsoluteFilePath(linkSpecs, t.file, t.line, t.column, fileNameOffset,
                                        fileName.length());
         scheduleTask(t, 1);
         return {Status::Done, linkSpecs};
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
index 9dd3fa079b2..c2f2d2c6e22 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
@@ -36,7 +36,6 @@
 #include <projectexplorer/projectexplorericons.h>
 
 #include <texteditor/texteditor.h>
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorconstants.h>
 
 #include <utils/action.h>
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp
index e012499b540..65b79a7238a 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp
@@ -188,7 +188,7 @@ bool QMakeStep::init()
     else
         workingDirectory = qmakeBc->buildDirectory();
 
-    m_qmakeCommand = CommandLine{qtVersion->qmakeFilePath(), allArguments(qtVersion), CommandLine::Raw};
+    m_qmakeCommand = {qtVersion->qmakeFilePath(), allArguments(qtVersion), CommandLine::Raw};
     m_runMakeQmake = (qtVersion->qtVersion() >= QVersionNumber(5, 0 ,0));
 
     // The Makefile is used by qmake and make on the build device, from that
@@ -216,7 +216,7 @@ bool QMakeStep::init()
                            OutputFormat::ErrorMessage);
             return false;
         }
-        m_makeCommand = CommandLine{make, makeArguments(makeFile.path()), CommandLine::Raw};
+        m_makeCommand = {make, makeArguments(makeFile.path()), CommandLine::Raw};
     } else {
         m_makeCommand = {};
     }
@@ -428,7 +428,7 @@ QWidget *QMakeStep::createConfigWidget()
     builder.addRow({userArguments});
     builder.addRow({effectiveCall});
     builder.addRow({abisLabel, abisListWidget});
-    builder.addItem(Layouting::noMargin);
+    builder.setNoMargins();
     auto widget = builder.emerge();
 
     qmakeBuildConfigChanged();
diff --git a/src/plugins/qmldesigner/QmlDesigner.json.in b/src/plugins/qmldesigner/QmlDesigner.json.in
index 4b5682f4857..e96f2f85139 100644
--- a/src/plugins/qmldesigner/QmlDesigner.json.in
+++ b/src/plugins/qmldesigner/QmlDesigner.json.in
@@ -15,7 +15,7 @@
     "Category" : "Qt Quick",
     "Description" : "Visual Designer for QML files.",
     "Deprecated" : true,
-    "Url" : "http://www.qt.io",
+    "Url" : "https://www.qt.io",
     "Arguments" : [
         {
             "Name" : "-capture-puppet-stream",
diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp
index a4509c38a67..cee25240cfc 100644
--- a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp
+++ b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp
@@ -143,7 +143,7 @@ AssetExportDialog::AssetExportDialog(const FilePath &exportPath,
         m_exportAssetsCheck,
         m_perComponentExportCheck,
         st,
-        noMargin(),
+        noMargin,
     }.attachTo(optionsWidget);
 
     Column {
diff --git a/src/plugins/qmldesigner/components/bindingeditor/bindingeditorwidget.cpp b/src/plugins/qmldesigner/components/bindingeditor/bindingeditorwidget.cpp
index ff2361aa36c..b067dc8d46f 100644
--- a/src/plugins/qmldesigner/components/bindingeditor/bindingeditorwidget.cpp
+++ b/src/plugins/qmldesigner/components/bindingeditor/bindingeditorwidget.cpp
@@ -147,7 +147,6 @@ BindingEditorFactory::BindingEditorFactory()
 {
     setId(BINDINGEDITOR_CONTEXT_ID);
     setDisplayName(::Core::Tr::tr("Binding Editor"));
-    setEditorActionHandlers(0);
     addMimeType(BINDINGEDITOR_CONTEXT_ID);
     addMimeType(Utils::Constants::QML_MIMETYPE);
     addMimeType(Utils::Constants::QMLTYPES_MIMETYPE);
diff --git a/src/plugins/qmldesigner/components/componentcore/designericons.cpp b/src/plugins/qmldesigner/components/componentcore/designericons.cpp
index 31e7b45fcdb..13f72764e8a 100644
--- a/src/plugins/qmldesigner/components/componentcore/designericons.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/designericons.cpp
@@ -223,16 +223,8 @@ struct JsonMap<QMap<Key, Value>>
     {
         QJsonObject output;
 
-        #if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
                 for (const auto &[key, val] : map.asKeyValueRange())
                     output[DesignerIconEnums<Key>::toString(key)] = JsonMap<Value>::json(val);
-        #else
-                const auto mapKeys = map.keys();
-                for (const Key &key : mapKeys) {
-                    const Value &val = map.value(key);
-                    output[DesignerIconEnums<Key>::toString(key)] = JsonMap<Value>::json(val);
-                }
-        #endif
 
         return output;
     }
@@ -397,15 +389,9 @@ void DesignerIcons::loadIconSettings(const QString &fileName)
                 QJsonObject areaPackObject = areaPack.toObject();
                 singleAreaMap = JsonMap<IconsMap>::value(areaPackObject, {});
 
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
                 for (const auto &mapItem : singleAreaMap.asKeyValueRange()) {
                     const IconId &id = mapItem.first;
                     const AreaMap &areaMap = mapItem.second;
-#else
-                const auto mapKeys = singleAreaMap.keys();
-                for (const IconId &id : mapKeys) {
-                    const AreaMap &areaMap = singleAreaMap.value(id);
-#endif
                     if (d->icons.contains(id)) {
                         AreaMap &oldAreaMap = d->icons[id];
                         for (const auto &areaMapItem : areaMap.asKeyValueRange())
diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
index 69e24237358..32aadd7fba3 100644
--- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
@@ -1708,7 +1708,7 @@ void editIn3dView(const SelectionContext &selectionContext)
 
 bool isEffectComposerActivated()
 {
-    const QVector<ExtensionSystem::PluginSpec *> specs = ExtensionSystem::PluginManager::plugins();
+    const ExtensionSystem::PluginSpecs specs = ExtensionSystem::PluginManager::plugins();
     return std::find_if(specs.begin(), specs.end(),
                         [](ExtensionSystem::PluginSpec *spec) {
                             return spec->name() == "EffectComposer" && spec->isEffectivelyEnabled();
diff --git a/src/plugins/qmldesigner/components/componentcore/propertycomponentgenerator.cpp b/src/plugins/qmldesigner/components/componentcore/propertycomponentgenerator.cpp
index 15bd7f1d6da..58326dc77a3 100644
--- a/src/plugins/qmldesigner/components/componentcore/propertycomponentgenerator.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/propertycomponentgenerator.cpp
@@ -37,7 +37,7 @@ Type getProperty(const QmlJS::SimpleReaderNode *node, const QString &name)
 {
     if (auto property = node->property(name)) {
         const auto &value = property.value;
-        if (value.type() == QVariant::List) {
+        if (value.typeId() == QMetaType::QVariantList) {
             auto list = value.toList();
             if (list.size())
                 return list.front().value<Type>();
diff --git a/src/plugins/qmldesigner/components/edit3d/bakelightsconnectionmanager.cpp b/src/plugins/qmldesigner/components/edit3d/bakelightsconnectionmanager.cpp
index e8faa42833d..92caab65edd 100644
--- a/src/plugins/qmldesigner/components/edit3d/bakelightsconnectionmanager.cpp
+++ b/src/plugins/qmldesigner/components/edit3d/bakelightsconnectionmanager.cpp
@@ -27,7 +27,7 @@ void BakeLightsConnectionManager::setFinishedCallback(Callback callback)
 void BakeLightsConnectionManager::dispatchCommand(const QVariant &command,
                                                   ConnectionManagerInterface::Connection &)
 {
-    static const int commandType = QMetaType::type("PuppetToCreatorCommand");
+    static const int commandType = QMetaType::fromName("PuppetToCreatorCommand").id();
 
     if (command.typeId() == commandType) {
         auto cmd = command.value<PuppetToCreatorCommand>();
diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
index 89d22e8e85c..ff142048032 100644
--- a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
+++ b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
@@ -426,7 +426,7 @@ void Edit3DWidget::showOnboardingLabel()
                    " in the"
                    " <b>Assets</b>"
                    " view.");
-            text = labelText.arg(Utils::creatorTheme()->color(Utils::Theme::TextColorLink).name());
+            text = labelText.arg(Utils::creatorColor(Utils::Theme::TextColorLink).name());
         } else {
             text = tr("3D view is not supported in Qt5 projects.");
         }
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorannotationicon.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorannotationicon.cpp
index 35a48a6b6dd..dd239dd9664 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorannotationicon.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorannotationicon.cpp
@@ -302,9 +302,9 @@ QGraphicsItem *FormEditorAnnotationIcon::createCommentBubble(QRectF rect, const
                                                              const QString &author, const QString &text,
                                                              const QString &date, QGraphicsItem *parent)
 {
-    static QColor textColor = Utils::creatorTheme()->color(Utils::Theme::DStextColor);
-    static QColor backgroundColor = Utils::creatorTheme()->color(Utils::Theme::QmlDesigner_BackgroundColorDarker);
-    static QColor frameColor = Utils::creatorTheme()->color(Utils::Theme::QmlDesigner_BackgroundColor);
+    static QColor textColor = Utils::creatorColor(Utils::Theme::DStextColor);
+    static QColor backgroundColor = Utils::creatorColor(Utils::Theme::QmlDesigner_BackgroundColorDarker);
+    static QColor frameColor = Utils::creatorColor(Utils::Theme::QmlDesigner_BackgroundColor);
     QFont font;
     font.setBold(true);
 
@@ -405,9 +405,9 @@ QGraphicsItem *FormEditorAnnotationIcon::createCommentBubble(QRectF rect, const
 
 QGraphicsItem *FormEditorAnnotationIcon::createTitleBubble(const QRectF &rect, const QString &text, QGraphicsItem *parent)
 {
-    static QColor textColor = Utils::creatorTheme()->color(Utils::Theme::DStextColor);
-    static QColor backgroundColor = Utils::creatorTheme()->color(Utils::Theme::QmlDesigner_BackgroundColorDarker);
-    static QColor frameColor = Utils::creatorTheme()->color(Utils::Theme::QmlDesigner_BackgroundColor);
+    static QColor textColor = Utils::creatorColor(Utils::Theme::DStextColor);
+    static QColor backgroundColor = Utils::creatorColor(Utils::Theme::QmlDesigner_BackgroundColorDarker);
+    static QColor frameColor = Utils::creatorColor(Utils::Theme::QmlDesigner_BackgroundColor);
     QFont font;
     font.setBold(true);
 
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp
index 9549ce9dd46..d835274a97c 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp
@@ -3,7 +3,6 @@
 
 #include "formeditorgraphicsview.h"
 #include "backgroundaction.h"
-#include "formeditoritem.h"
 #include "formeditorwidget.h"
 #include "navigation2d.h"
 
@@ -76,11 +75,11 @@ bool FormEditorGraphicsView::eventFilter(QObject *watched, QEvent *event)
             auto mouseEvent = static_cast<QMouseEvent *>(event);
             if (!m_panningStartPosition.isNull()) {
                 horizontalScrollBar()->setValue(horizontalScrollBar()->value() -
-                    (mouseEvent->x() - m_panningStartPosition.x()));
+                    (mouseEvent->position().x() - m_panningStartPosition.x()));
                 verticalScrollBar()->setValue(verticalScrollBar()->value() -
-                    (mouseEvent->y() - m_panningStartPosition.y()));
+                    (mouseEvent->position().y() - m_panningStartPosition.y()));
             }
-            m_panningStartPosition = mouseEvent->pos();
+            m_panningStartPosition = mouseEvent->position();
             event->accept();
             return true;
         }
@@ -215,7 +214,7 @@ void FormEditorGraphicsView::drawBackground(QPainter *painter, const QRectF &rec
         painter->fillRect(rectangle.intersected(rootItemRect()), backgroundBrush());
     }
 
-    QPen pen(Utils::creatorTheme()->color(Utils::Theme::QmlDesigner_FormEditorSelectionColor));
+    QPen pen(Utils::creatorColor(Utils::Theme::QmlDesigner_FormEditorSelectionColor));
 
     pen.setStyle(Qt::DotLine);
     pen.setWidth(1);
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.h b/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.h
index 60e02582cd1..e1e61a8f1e2 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.h
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.h
@@ -46,7 +46,7 @@ private:
     void stopPanning(QEvent *event);
 
     Panning m_isPanning = Panning::NotStarted;
-    QPoint m_panningStartPosition;
+    QPointF m_panningStartPosition;
     QRectF m_rootItemRect;
     QImage m_backgroundImage;
 };
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
index 12da85e2c4e..b3df6b8fe72 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
@@ -48,23 +48,19 @@ void drawIcon(QPainter *painter,
               int iconSize,
               const QColor &penColor)
 {
-    static QFontDatabase a;
-
     const QString fontName = "qtds_propertyIconFont.ttf";
 
-    Q_ASSERT(a.hasFamily(fontName));
+    QTC_ASSERT(QFontDatabase::hasFamily(fontName), return);
 
-    if (a.hasFamily(fontName)) {
-        QFont font(fontName);
-        font.setPixelSize(fontSize);
+    QFont font(fontName);
+    font.setPixelSize(fontSize);
 
-        painter->save();
-        painter->setPen(penColor);
-        painter->setFont(font);
-        painter->drawText(QRectF(x, y, iconSize, iconSize), iconSymbol);
+    painter->save();
+    painter->setPen(penColor);
+    painter->setFont(font);
+    painter->drawText(QRectF(x, y, iconSize, iconSize), iconSymbol);
 
-        painter->restore();
-    }
+    painter->restore();
 }
 
 FormEditorScene *FormEditorItem::scene() const {
@@ -309,7 +305,7 @@ void FormEditorItem::paintBoundingRect(QPainter *painter) const
     pen.setJoinStyle(Qt::MiterJoin);
 
     const QColor frameColor(0xaa, 0xaa, 0xaa);
-    static const QColor selectionColor = Utils::creatorTheme()->color(
+    static const QColor selectionColor = Utils::creatorColor(
         Utils::Theme::QmlDesigner_FormEditorSelectionColor);
 
     if (scene()->showBoundingRects()) {
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditortoolbutton.cpp b/src/plugins/qmldesigner/components/formeditor/formeditortoolbutton.cpp
index 555d0d90e35..f3aa96ada41 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditortoolbutton.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditortoolbutton.cpp
@@ -42,7 +42,7 @@ void FormEditorToolButton::paint(QPainter *painter, const QStyleOptionGraphicsIt
     QRectF adjustedRect(size().width() - toolButtonSize, size().height() - toolButtonSize, toolButtonSize, toolButtonSize);
     painter->setPen(Qt::NoPen);
 
-    static QColor selectionColor = Utils::creatorTheme()->color(Utils::Theme::QmlDesigner_FormEditorSelectionColor);
+    static QColor selectionColor = Utils::creatorColor(Utils::Theme::QmlDesigner_FormEditorSelectionColor);
 
     if (m_state == Hovered)
         painter->setBrush(selectionColor.lighter(110));
diff --git a/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp b/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp
index 0f5b5f44385..45d26f831ea 100644
--- a/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp
@@ -78,7 +78,7 @@ void SelectionIndicator::setItems(const QList<FormEditorItem*> &itemList)
 {
     clear();
 
-    static QColor selectionColor = Utils::creatorTheme()->color(Utils::Theme::QmlDesigner_FormEditorSelectionColor);
+    static QColor selectionColor = Utils::creatorColor(Utils::Theme::QmlDesigner_FormEditorSelectionColor);
 
     for (FormEditorItem *item : itemList) {
         if (!item->qmlItemNode().isValid())
@@ -119,7 +119,7 @@ void SelectionIndicator::setItems(const QList<FormEditorItem*> &itemList)
             m_annotationItem = nullptr;
         }
 
-        static QColor textColor = Utils::creatorTheme()->color(Utils::Theme::QmlDesigner_FormEditorForegroundColor);
+        static QColor textColor = Utils::creatorColor(Utils::Theme::QmlDesigner_FormEditorForegroundColor);
 
         textItem->setDefaultTextColor(textColor);
         QPolygonF labelPolygon = boundingRectInLayerItemSpaceForItem(selectedItem, m_layerItem.data());
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
index 67a6e3ecfa9..f40e3d92c11 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
@@ -141,7 +141,7 @@ ItemLibraryAssetImportDialog::ItemLibraryAssetImportDialog(
                 "QPushButton#advancedSettingsButton {background-color: transparent}");
     ui->advancedSettingsButton->setStyleSheet(
                 QString("QPushButton { border: none; color :%1 }").arg(
-                    Utils::creatorTheme()->color(Utils::Theme::QmlDesigner_HighlightColor).name()));
+                    Utils::creatorColor(Utils::Theme::QmlDesigner_HighlightColor).name()));
 
     QStringList importPaths;
     auto doc = QmlDesignerPlugin::instance()->currentDesignDocument();
diff --git a/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditormodel.cpp b/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditormodel.cpp
index b6009edc774..f97b6f74acc 100644
--- a/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditormodel.cpp
+++ b/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditormodel.cpp
@@ -29,10 +29,10 @@ public:
 
     QVariant maybeConvertToNumber(const QVariant &value)
     {
-        if (value.typeId() == QVariant::Bool)
+        if (value.typeId() == QMetaType::Bool)
             return value;
 
-        if (value.typeId() == QVariant::String) {
+        if (value.typeId() == QMetaType::QString) {
             const QString text = value.toString();
             if (text == "true")
                 return QVariant(true);
diff --git a/src/plugins/qmldesigner/components/materialeditor/materialeditorcontextobject.cpp b/src/plugins/qmldesigner/components/materialeditor/materialeditorcontextobject.cpp
index 664006fb7a5..f583498db78 100644
--- a/src/plugins/qmldesigner/components/materialeditor/materialeditorcontextobject.cpp
+++ b/src/plugins/qmldesigner/components/materialeditor/materialeditorcontextobject.cpp
@@ -46,9 +46,9 @@ QString MaterialEditorContextObject::convertColorToString(const QVariant &color)
 {
     QString colorString;
     QColor theColor;
-    if (color.canConvert(QVariant::Color)) {
+    if (color.canConvert(QMetaType(QMetaType::QColor))) {
         theColor = color.value<QColor>();
-    } else if (color.canConvert(QVariant::Vector3D)) {
+    } else if (color.canConvert(QMetaType(QMetaType::QVector3D))) {
         auto vec = color.value<QVector3D>();
         theColor = QColor::fromRgbF(vec.x(), vec.y(), vec.z());
     }
diff --git a/src/plugins/qmldesigner/components/navigator/iconcheckboxitemdelegate.cpp b/src/plugins/qmldesigner/components/navigator/iconcheckboxitemdelegate.cpp
index 5b36bee7f97..09cf5945e82 100644
--- a/src/plugins/qmldesigner/components/navigator/iconcheckboxitemdelegate.cpp
+++ b/src/plugins/qmldesigner/components/navigator/iconcheckboxitemdelegate.cpp
@@ -79,15 +79,12 @@ void IconCheckboxItemDelegate::paint(QPainter *painter,
     if (rowIsPropertyRole(modelIndex.model(), modelIndex) || getModelNode(modelIndex).isRootNode())
         return; // Do not paint icons for property rows or root node
 
-    QWindow *window = dynamic_cast<QWidget*>(painter->device())->window()->windowHandle();
-    QTC_ASSERT(window, return);
-
     const QSize iconSize(16, 16);
     QPoint iconPosition(styleOption.rect.left() + (styleOption.rect.width() - iconSize.width()) / 2,
                         styleOption.rect.top() + 2 + delegateMargin);
 
     const QIcon::State state = isChecked(modelIndex) ? QIcon::State::On : QIcon::State::Off;
-    const QPixmap iconPixmap = m_icon.pixmap(window, iconSize, mode, state);
+    const QPixmap iconPixmap = m_icon.pixmap(iconSize, painter->device()->devicePixelRatio(), mode, state);
 
     // Shift the lock icon (last column) slightly to the left due to vertical scrollbar width
     if (modelIndex.column() == NavigatorTreeModel::ColumnType::Lock)
diff --git a/src/plugins/qmldesigner/components/navigator/navigatorsearchwidget.cpp b/src/plugins/qmldesigner/components/navigator/navigatorsearchwidget.cpp
index 24d4377ef29..e7fe0ebb775 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorsearchwidget.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatorsearchwidget.cpp
@@ -97,10 +97,10 @@ void LineEdit::paintEvent(QPaintEvent *event)
         QPalette p(palette());
         p.setColor(QPalette::Active,
                    QPalette::PlaceholderText,
-                   Utils::creatorTheme()->color(Utils::Theme::DSplaceholderTextColor));
+                   Utils::creatorColor(Utils::Theme::DSplaceholderTextColor));
         p.setColor(QPalette::Inactive,
                    QPalette::PlaceholderText,
-                   Utils::creatorTheme()->color(Utils::Theme::DSplaceholderTextColor));
+                   Utils::creatorColor(Utils::Theme::DSplaceholderTextColor));
         setPalette(p);
     }
     QLineEdit::paintEvent(event);
diff --git a/src/plugins/qmldesigner/components/navigator/previewtooltip.cpp b/src/plugins/qmldesigner/components/navigator/previewtooltip.cpp
index f8edc6d608c..1def3cf1198 100644
--- a/src/plugins/qmldesigner/components/navigator/previewtooltip.cpp
+++ b/src/plugins/qmldesigner/components/navigator/previewtooltip.cpp
@@ -21,7 +21,8 @@ PreviewToolTip::PreviewToolTip(QWidget *parent)
     m_ui->idLabel->setElideMode(Qt::ElideLeft);
     m_ui->typeLabel->setElideMode(Qt::ElideLeft);
     m_ui->infoLabel->setElideMode(Qt::ElideLeft);
-    setStyleSheet(QString("QWidget { background-color: %1 }").arg(Utils::creatorTheme()->color(Utils::Theme::BackgroundColorNormal).name()));
+    setStyleSheet(QString("QWidget { background-color: %1 }")
+                  .arg(Utils::creatorColor(Utils::Theme::BackgroundColorNormal).name()));
     m_ui->imageLabel->setStyleSheet("background-color: rgba(0, 0, 0, 0)");
 
     static QPixmap checkers;
diff --git a/src/plugins/qmldesigner/components/previewtooltip/previewimagetooltip.cpp b/src/plugins/qmldesigner/components/previewtooltip/previewimagetooltip.cpp
index 248a9ec4292..4034254420b 100644
--- a/src/plugins/qmldesigner/components/previewtooltip/previewimagetooltip.cpp
+++ b/src/plugins/qmldesigner/components/previewtooltip/previewimagetooltip.cpp
@@ -20,7 +20,8 @@ PreviewImageTooltip::PreviewImageTooltip(QWidget *parent)
     m_ui->nameLabel->setElideMode(Qt::ElideLeft);
     m_ui->pathLabel->setElideMode(Qt::ElideLeft);
     m_ui->infoLabel->setElideMode(Qt::ElideLeft);
-    setStyleSheet(QString("QWidget { background-color: %1 }").arg(Utils::creatorTheme()->color(Utils::Theme::BackgroundColorNormal).name()));
+    setStyleSheet(QString("QWidget { background-color: %1 }")
+                  .arg(Utils::creatorColor(Utils::Theme::BackgroundColorNormal).name()));
 }
 
 PreviewImageTooltip::~PreviewImageTooltip() = default;
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
index 4eacc575baa..4df1109173f 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
@@ -88,9 +88,9 @@ QString PropertyEditorContextObject::convertColorToString(const QVariant &color)
 {
     QString colorString;
     QColor theColor;
-    if (color.canConvert(QVariant::Color)) {
+    if (color.canConvert(QMetaType(QMetaType::QColor))) {
         theColor = color.value<QColor>();
-    } else if (color.canConvert(QVariant::Vector3D)) {
+    } else if (color.canConvert(QMetaType(QMetaType::QVector3D))) {
         auto vec = color.value<QVector3D>();
         theColor = QColor::fromRgbF(vec.x(), vec.y(), vec.z());
     }
@@ -586,8 +586,7 @@ int PropertyEditorContextObject::devicePixelRatio()
 
 QStringList PropertyEditorContextObject::styleNamesForFamily(const QString &family)
 {
-    const QFontDatabase dataBase;
-    return dataBase.styles(family);
+    return QFontDatabase::styles(family);
 }
 
 QStringList PropertyEditorContextObject::allStatesForId(const QString &id)
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
index 91eb87e339f..d79804d200e 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
@@ -60,10 +60,10 @@ static bool cleverColorCompare(const QVariant &value1, const QVariant &value2)
         return c1.name() == c2.name() && c1.alpha() == c2.alpha();
     }
 
-    if (value1.typeId() == QVariant::String && value2.typeId() == QVariant::Color)
+    if (value1.typeId() == QMetaType::QString && value2.typeId() == QVariant::Color)
         return cleverColorCompare(QVariant(QColor(value1.toString())), value2);
 
-    if (value1.typeId() == QVariant::Color && value2.typeId() == QVariant::String)
+    if (value1.typeId() == QVariant::Color && value2.typeId() == QMetaType::QString)
         return cleverColorCompare(value1, QVariant(QColor(value2.toString())));
 
     return false;
diff --git a/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp b/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp
index 8a9ed00c400..940b121b9ed 100644
--- a/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp
+++ b/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp
@@ -532,7 +532,7 @@ void RichTextEditor::setupFontActions()
         w->setCurrentIndex(w->findText(m_textEdit->currentCharFormat().font().family()));
         connect(w, &QComboBox::textActivated, [this](const QString &f) {
             QTextCharFormat fmt;
-            fmt.setFontFamily(f);
+            fmt.setFontFamilies({f});
             mergeFormatOnWordOrSelection(fmt);
         });
     });
diff --git a/src/plugins/qmldesigner/components/texteditor/texteditorstatusbar.cpp b/src/plugins/qmldesigner/components/texteditor/texteditorstatusbar.cpp
index a8981ff2f05..3f6f6769fbb 100644
--- a/src/plugins/qmldesigner/components/texteditor/texteditorstatusbar.cpp
+++ b/src/plugins/qmldesigner/components/texteditor/texteditorstatusbar.cpp
@@ -15,7 +15,8 @@ TextEditorStatusBar::TextEditorStatusBar(QWidget *parent) : QToolBar(parent), m_
     addWidget(m_label);
 
     /* We have to set another .css, since the central widget has already a style sheet */
-    m_label->setStyleSheet(QString("QLabel { color :%1 }").arg(Utils::creatorTheme()->color(Utils::Theme::TextColorError).name()));
+    m_label->setStyleSheet(QString("QLabel { color :%1 }")
+                           .arg(Utils::creatorColor(Utils::Theme::TextColorError).name()));
 }
 
 void TextEditorStatusBar::clearText()
diff --git a/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp b/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp
index 97ef6c4b689..127780f9181 100644
--- a/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp
+++ b/src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp
@@ -265,7 +265,7 @@ void TextEditorWidget::dragEnterEvent(QDragEnterEvent *dragEnterEvent)
 
 void TextEditorWidget::dragMoveEvent(QDragMoveEvent *dragMoveEvent)
 {
-    QTextCursor cursor = m_textEditor->editorWidget()->cursorForPosition(dragMoveEvent->pos());
+    QTextCursor cursor = m_textEditor->editorWidget()->cursorForPosition(dragMoveEvent->position().toPoint());
     const int cursorPosition = cursor.position();
     RewriterView *rewriterView = m_textEditorView->model()->rewriterView();
 
@@ -279,7 +279,7 @@ void TextEditorWidget::dragMoveEvent(QDragMoveEvent *dragMoveEvent)
 
 void TextEditorWidget::dropEvent(QDropEvent *dropEvent)
 {
-    QTextCursor cursor = m_textEditor->editorWidget()->cursorForPosition(dropEvent->pos());
+    QTextCursor cursor = m_textEditor->editorWidget()->cursorForPosition(dropEvent->position().toPoint());
     const int cursorPosition = cursor.position();
     RewriterView *rewriterView = m_textEditorView->model()->rewriterView();
 
diff --git a/src/plugins/qmldesigner/components/texttool/textedititemwidget.cpp b/src/plugins/qmldesigner/components/texttool/textedititemwidget.cpp
index 2861344d750..dc57cf30c89 100644
--- a/src/plugins/qmldesigner/components/texttool/textedititemwidget.cpp
+++ b/src/plugins/qmldesigner/components/texttool/textedititemwidget.cpp
@@ -42,7 +42,7 @@ QLineEdit* TextEditItemWidget::lineEdit() const
         m_lineEdit = std::make_unique<QLineEdit>();
         m_lineEdit->setAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
         QPalette palette = m_lineEdit->palette();
-        static QColor selectionColor = Utils::creatorTheme()->color(Utils::Theme::QmlDesigner_FormEditorSelectionColor);
+        static QColor selectionColor = Utils::creatorColor(Utils::Theme::QmlDesigner_FormEditorSelectionColor);
         palette.setColor(QPalette::Highlight, selectionColor);
         palette.setColor(QPalette::HighlightedText, Qt::white);
         palette.setColor(QPalette::Base, Qt::white);
@@ -57,7 +57,7 @@ QTextEdit* TextEditItemWidget::textEdit() const
     if (!m_textEdit) {
         m_textEdit = std::make_unique<QTextEdit>();
         QPalette palette = m_textEdit->palette();
-        static QColor selectionColor = Utils::creatorTheme()->color(Utils::Theme::QmlDesigner_FormEditorSelectionColor);
+        static QColor selectionColor = Utils::creatorColor(Utils::Theme::QmlDesigner_FormEditorSelectionColor);
         palette.setColor(QPalette::Highlight, selectionColor);
         palette.setColor(QPalette::HighlightedText, Qt::white);
         palette.setColor(QPalette::Base, Qt::white);
diff --git a/src/plugins/qmldesigner/components/textureeditor/textureeditorcontextobject.cpp b/src/plugins/qmldesigner/components/textureeditor/textureeditorcontextobject.cpp
index 73e784846bb..30f276a48db 100644
--- a/src/plugins/qmldesigner/components/textureeditor/textureeditorcontextobject.cpp
+++ b/src/plugins/qmldesigner/components/textureeditor/textureeditorcontextobject.cpp
@@ -47,9 +47,9 @@ QString TextureEditorContextObject::convertColorToString(const QVariant &color)
 {
     QString colorString;
     QColor theColor;
-    if (color.canConvert(QVariant::Color)) {
+    if (color.canConvert(QMetaType(QMetaType::QColor))) {
         theColor = color.value<QColor>();
-    } else if (color.canConvert(QVariant::Vector3D)) {
+    } else if (color.canConvert(QMetaType(QMetaType::QVector3D))) {
         auto vec = color.value<QVector3D>();
         theColor = QColor::fromRgbF(vec.x(), vec.y(), vec.z());
     }
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineanimationform.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineanimationform.cpp
index e65c05c39fe..56e22dab1b9 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelineanimationform.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelineanimationform.cpp
@@ -97,10 +97,10 @@ TimelineAnimationForm::TimelineAnimationForm(QWidget *parent)
     using namespace Layouting;
     Grid {
         Span(4, mainL), br,
-        empty(), br,
+        empty, br,
         idL, Span(2, m_idLineEdit), Span(2, Row{ runningL, m_running }), br,
-        empty(), startFrameL, m_startFrame, endFrameL, m_endFrame, durationL, m_duration, br,
-        empty(), continuousL, m_continuous, loopsL, m_loops, pingPongL, m_pingPong, str, br,
+        empty, startFrameL, m_startFrame, endFrameL, m_endFrame, durationL, m_duration, br,
+        empty, continuousL, m_continuous, loopsL, m_loops, pingPongL, m_pingPong, str, br,
         tr("Transition to state:"), transitionToStateL, m_transitionToState, br,
     }.attachTo(this);
 
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineform.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineform.cpp
index 08915b65771..2d1e70cd770 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelineform.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelineform.cpp
@@ -78,8 +78,8 @@ TimelineForm::TimelineForm(QWidget *parent)
     Grid {
         Span(2, mainL), br,
         idL, m_idLineEdit, br,
-        empty(), Row { startFrameL, m_startFrame, st(), endFrameL, m_endFrame }, str, br,
-        empty(), Row { m_expressionBinding, m_animation, st() }, br,
+        empty, Row { startFrameL, m_startFrame, st, endFrameL, m_endFrame }, str, br,
+        empty, Row { m_expressionBinding, m_animation, st }, br,
         expressionBindingL, m_expressionBindingLineEdit, br,
     }.attachTo(this);
 
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinepropertyitem.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinepropertyitem.cpp
index 762bd85c8b4..04cc8ebebc6 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelinepropertyitem.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelinepropertyitem.cpp
@@ -107,14 +107,14 @@ static void editValue(const ModelNode &frameNode, const std::pair<qreal, qreal>
         int userType = value.typeId();
         QVariant newValue = dialog->value();
 
-        if (newValue.canConvert(userType)) {
+        if (newValue.canConvert(QMetaType(userType))) {
             QVariant newValueConverted = newValue;
-            bool converted = newValueConverted.convert(userType);
+            bool converted = newValueConverted.convert(QMetaType(userType));
 
             if (!converted) {
                 // convert() fails for int to double, so we try this combination
                 newValueConverted = newValue;
-                converted = newValueConverted.convert(QMetaType::Double);
+                converted = newValueConverted.convert(QMetaType(QMetaType::Double));
             }
 
             if (converted)
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinesettingsmodel.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinesettingsmodel.cpp
index 39c1f01ce6d..9b85599ead6 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelinesettingsmodel.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelinesettingsmodel.cpp
@@ -68,7 +68,7 @@ TimelineEditorDelegate::TimelineEditorDelegate(QWidget *parent)
     if (factory == nullptr) {
         factory = new QItemEditorFactory;
         QItemEditorCreatorBase *creator = new QItemEditorCreator<QComboBox>("currentText");
-        factory->registerEditor(QVariant::String, creator);
+        factory->registerEditor(QMetaType::QString, creator);
     }
 
     setItemEditorFactory(factory);
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp
index 591926d3f5c..592cf0dff93 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp
@@ -221,10 +221,10 @@ TimelineWidget::TimelineWidget(TimelineView *view)
 
     {
         QPalette timelinePalette;
-        timelinePalette.setColor(QPalette::Text, Utils::creatorTheme()->color(
+        timelinePalette.setColor(QPalette::Text, Utils::creatorColor(
                                      Utils::Theme::DStextColor));
         timelinePalette.setColor(QPalette::WindowText, timelinePalette.color(QPalette::Text));
-        timelinePalette.setColor(QPalette::Window, Utils::creatorTheme()->color(
+        timelinePalette.setColor(QPalette::Window, Utils::creatorColor(
                                      Utils::Theme::QmlDesigner_BackgroundColorDarkAlternate));
 
         onboardingTopLabel->setPalette(timelinePalette);
diff --git a/src/plugins/qmldesigner/designercore/imagecache/imagecacheconnectionmanager.cpp b/src/plugins/qmldesigner/designercore/imagecache/imagecacheconnectionmanager.cpp
index 20728b445e4..f8a41b620bb 100644
--- a/src/plugins/qmldesigner/designercore/imagecache/imagecacheconnectionmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/imagecache/imagecacheconnectionmanager.cpp
@@ -45,7 +45,7 @@ bool ImageCacheConnectionManager::waitForCapturedData()
 void ImageCacheConnectionManager::dispatchCommand(const QVariant &command,
                                                   ConnectionManagerInterface::Connection &)
 {
-    static const int capturedDataCommandType = QMetaType::type("CapturedDataCommand");
+    static const int capturedDataCommandType = QMetaType::fromName("CapturedDataCommand").id();
 
     if (command.typeId() == capturedDataCommandType) {
         m_captureCallback(command.value<CapturedDataCommand>().image);
diff --git a/src/plugins/qmldesigner/designercore/instances/baseconnectionmanager.cpp b/src/plugins/qmldesigner/designercore/instances/baseconnectionmanager.cpp
index 713a61abf3d..0c64bba23c0 100644
--- a/src/plugins/qmldesigner/designercore/instances/baseconnectionmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/baseconnectionmanager.cpp
@@ -107,8 +107,8 @@ void BaseConnectionManager::readDataStream(Connection &connection)
         connection.blockSize = 0;
 
 #ifdef NANOTRACE_DESIGNSTUDIO_ENABLED
-        if (command.typeId() != QMetaType::type("PuppetAliveCommand")) {
-            if (command.typeId() == QMetaType::type("SyncNanotraceCommand")) {
+        if (command.typeId() != QMetaType::fromName("PuppetAliveCommand").id()) {
+            if (command.typeId() == QMetaType::fromName("SyncNanotraceCommand").id()) {
                 SyncNanotraceCommand cmd = command.value<SyncNanotraceCommand>();
                 NANOTRACE_INSTANT_ARGS("Sync", "readCommand",
                     {"name", cmd.name().toStdString()},
diff --git a/src/plugins/qmldesigner/designercore/instances/interactiveconnectionmanager.cpp b/src/plugins/qmldesigner/designercore/instances/interactiveconnectionmanager.cpp
index cd36cac76da..07ae483d9a1 100644
--- a/src/plugins/qmldesigner/designercore/instances/interactiveconnectionmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/interactiveconnectionmanager.cpp
@@ -68,7 +68,7 @@ void InteractiveConnectionManager::showCannotConnectToPuppetWarningAndSwitchToEd
 
 void InteractiveConnectionManager::dispatchCommand(const QVariant &command, Connection &connection)
 {
-    static const int puppetAliveCommandType = QMetaType::type("PuppetAliveCommand");
+    static const int puppetAliveCommandType = QMetaType::fromName("PuppetAliveCommand").id();
 
     if (command.typeId() == puppetAliveCommandType) {
         puppetAlive(connection);
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
index a519531d3cc..ab8cca8e16c 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
@@ -93,18 +93,18 @@ void NodeInstanceServerProxy::dispatchCommand(const QVariant &command)
 {
     NANOTRACE_SCOPE_ARGS("Update", "dispatchCommand", {"name", command.typeName()});
 
-    static const int informationChangedCommandType = QMetaType::type("InformationChangedCommand");
-    static const int valuesChangedCommandType = QMetaType::type("ValuesChangedCommand");
-    static const int valuesModifiedCommandType = QMetaType::type("ValuesModifiedCommand");
-    static const int pixmapChangedCommandType = QMetaType::type("PixmapChangedCommand");
-    static const int childrenChangedCommandType = QMetaType::type("ChildrenChangedCommand");
-    static const int statePreviewImageChangedCommandType = QMetaType::type("StatePreviewImageChangedCommand");
-    static const int componentCompletedCommandType = QMetaType::type("ComponentCompletedCommand");
-    static const int tokenCommandType = QMetaType::type("TokenCommand");
-    static const int debugOutputCommandType = QMetaType::type("DebugOutputCommand");
-    static const int changeSelectionCommandType = QMetaType::type("ChangeSelectionCommand");
-    static const int puppetToCreatorCommandType = QMetaType::type("PuppetToCreatorCommand");
-    static const int SyncNanotraceCommandType = QMetaType::type("SyncNanotraceCommand");
+    static const int informationChangedCommandType = QMetaType::fromName("InformationChangedCommand").id();
+    static const int valuesChangedCommandType = QMetaType::fromName("ValuesChangedCommand").id();
+    static const int valuesModifiedCommandType = QMetaType::fromName("ValuesModifiedCommand").id();
+    static const int pixmapChangedCommandType = QMetaType::fromName("PixmapChangedCommand").id();
+    static const int childrenChangedCommandType = QMetaType::fromName("ChildrenChangedCommand").id();
+    static const int statePreviewImageChangedCommandType = QMetaType::fromName("StatePreviewImageChangedCommand").id();
+    static const int componentCompletedCommandType = QMetaType::fromName("ComponentCompletedCommand").id();
+    static const int tokenCommandType = QMetaType::fromName("TokenCommand").id();
+    static const int debugOutputCommandType = QMetaType::fromName("DebugOutputCommand").id();
+    static const int changeSelectionCommandType = QMetaType::fromName("ChangeSelectionCommand").id();
+    static const int puppetToCreatorCommandType = QMetaType::fromName("PuppetToCreatorCommand").id();
+    static const int SyncNanotraceCommandType = QMetaType::fromName("SyncNanotraceCommand").id();
 
     qCInfo(instanceViewBenchmark) << "dispatching command" << command.typeId() << command.typeName();
     if (command.typeId() == informationChangedCommandType) {
@@ -173,7 +173,7 @@ QString NodeInstanceServerProxy::qrcMappingString() const
 void NodeInstanceServerProxy::writeCommand(const QVariant &command)
 {
 #ifdef NANOTRACE_DESIGNSTUDIO_ENABLED
-    if (command.typeId() == QMetaType::type("SyncNanotraceCommand")) {
+    if (command.typeId() == QMetaType::fromName("SyncNanotraceCommand").id()) {
         SyncNanotraceCommand cmd = command.value<SyncNanotraceCommand>();
         NANOTRACE_INSTANT_ARGS("Sync", "writeCommand",
             {"name", cmd.name().toStdString()},
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
index d157346978f..ed85cb5e1da 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
@@ -1889,7 +1889,7 @@ QVariant NodeInstanceView::modelNodePreviewImageDataToVariant(const ModelNodePre
         placeHolder = {150, 150};
         // Placeholder has transparency, but we don't want to show the checkerboard, so
         // paint in the correct background color
-        placeHolder.fill(Utils::creatorTheme()->color(Utils::Theme::BackgroundColorNormal));
+        placeHolder.fill(Utils::creatorColor(Utils::Theme::BackgroundColorNormal));
         QPainter painter(&placeHolder);
         painter.drawPixmap(0, 0, 150, 150, placeHolderSrc);
     }
diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
index af61ef65735..0addc6884d2 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
@@ -272,7 +272,7 @@ inline QString deEscape(const QString &value)
 
 inline QVariant deEscapeVariant(const QVariant &value)
 {
-    if (value.typeId() == QVariant::String)
+    if (value.typeId() == QMetaType::QString)
         return deEscape(value.toString());
     return value;
 }
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
index 559c917feff..61d78e96a7f 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
@@ -4491,7 +4491,7 @@ QVariant PropertyMetaInfo::castedValue(const QVariant &value) const
             return variant;
         } else if (typeId == QVariant::UserType && typeName == "var") {
             return variant;
-        } else if (variant.typeId() == QVariant::List) {
+        } else if (variant.typeId() == QMetaType::QVariantList) {
             // TODO: check the contents of the list
             return variant;
         } else if (typeName == "var" || typeName == "variant") {
diff --git a/src/plugins/qmldesigner/designercore/metainfo/propertycontainer.cpp b/src/plugins/qmldesigner/designercore/metainfo/propertycontainer.cpp
index cd7cebbb73a..8eaa7947deb 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/propertycontainer.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/propertycontainer.cpp
@@ -41,7 +41,7 @@ PropertyName PropertyContainer::name() const
 
 QVariant PropertyContainer::value() const
 {
-    if (m_value.typeId() == QVariant::String)
+    if (m_value.typeId() == QMetaType::QString)
         m_value = PropertyParser::read(m_type, m_value.toString());
     return m_value;
 }
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/typeannotationreader.cpp b/src/plugins/qmldesigner/designercore/projectstorage/typeannotationreader.cpp
index 88f43dd33ab..71eba949662 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/typeannotationreader.cpp
+++ b/src/plugins/qmldesigner/designercore/projectstorage/typeannotationreader.cpp
@@ -312,7 +312,7 @@ QString deEscape(const QString &value)
 
 QVariant deEscapeVariant(const QVariant &value)
 {
-    if (value.typeId() == QVariant::String)
+    if (value.typeId() == QMetaType::QString)
         return deEscape(value.toString());
     return value;
 }
@@ -467,9 +467,9 @@ using json = nlohmann::json;
     out = json::array({});
     out.push_back(property.name);
     out.push_back(property.type);
-    if (property.value.type() == QVariant::String)
+    if (property.value.typeId() == QMetaType::QString)
         out.push_back(Utils::PathString{property.value.toString()});
-    else if (property.value.type() == QVariant::Int || property.value.type() == QVariant::LongLong)
+    else if (property.value.typeId() == QMetaType::Int || property.value.typeId() == QMetaType::LongLong)
         out.push_back(property.value.toLongLong());
     else
         out.push_back(property.value.toDouble());
diff --git a/src/plugins/qmldesigner/designercore/rewriter/propertyparser.cpp b/src/plugins/qmldesigner/designercore/rewriter/propertyparser.cpp
index 788530c291a..f1199425d30 100644
--- a/src/plugins/qmldesigner/designercore/rewriter/propertyparser.cpp
+++ b/src/plugins/qmldesigner/designercore/rewriter/propertyparser.cpp
@@ -201,7 +201,7 @@ QVariant read(const QString &typeStr, const QString &str, const MetaInfo &)
 
 QVariant read(const QString &typeStr, const QString &str)
 {
-    int type = QMetaType::type(typeStr.toUtf8().constData());
+    int type = QMetaType::fromName(typeStr.toUtf8()).id();
     if (type == 0) {
         if (typeStr != "binding"_L1 && typeStr != "enum"_L1) {
             qWarning() << "Type " << typeStr
@@ -266,19 +266,18 @@ QVariant read(int variantType, const QString &str)
         value = vector3DFromString(str, &conversionOk);
         break;
     default: {
-        if (variantType == QMetaType::type("Enumeration")) {
+        if (variantType == QMetaType::fromName("Enumeration").id()) {
             value = QVariant::fromValue<Enumeration>(enumerationFromString(str, &conversionOk));
         } else {
             value = QVariant(str);
-            value.convert(static_cast<QVariant::Type>(variantType));
+            value.convert(QMetaType(variantType));
         }
         break;
         }
     }
 
     if (!conversionOk) {
-        qWarning() << "Could not convert" << str
-                   << "to" << QMetaType::typeName(variantType);
+        qWarning() << "Could not convert" << str << "to" << QMetaType(variantType).name();
         value = QVariant(str);
     }
 
diff --git a/src/plugins/qmldesigner/designercore/rewriter/rewriterview.cpp b/src/plugins/qmldesigner/designercore/rewriter/rewriterview.cpp
index 21d032acdb8..6565208385c 100644
--- a/src/plugins/qmldesigner/designercore/rewriter/rewriterview.cpp
+++ b/src/plugins/qmldesigner/designercore/rewriter/rewriterview.cpp
@@ -604,7 +604,7 @@ QString RewriterView::auxiliaryDataAsQML() const
                 hasAuxData = true;
                 QString strValue = value.toString();
 
-                auto metaType = static_cast<QMetaType::Type>(value.type());
+                const int metaType = value.typeId();
 
                 if (metaType == QMetaType::QString || metaType == QMetaType::QColor) {
                     strValue.replace("\\"_L1, "\\\\"_L1);
diff --git a/src/plugins/qmldesigner/designercore/rewriter/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/rewriter/texttomodelmerger.cpp
index 9ef4eb76fe9..b91434d78d2 100644
--- a/src/plugins/qmldesigner/designercore/rewriter/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/rewriter/texttomodelmerger.cpp
@@ -242,23 +242,23 @@ bool isLiteralValue(AST::UiScriptBinding *script)
 int propertyType(const QString &typeName)
 {
     if (typeName == u"bool")
-        return QMetaType::type("bool");
+        return QMetaType::fromName("bool").id();
     else if (typeName == u"color")
-        return QMetaType::type("QColor");
+        return QMetaType::fromName("QColor").id();
     else if (typeName == u"date")
-        return QMetaType::type("QDate");
+        return QMetaType::fromName("QDate").id();
     else if (typeName == u"int")
-        return QMetaType::type("int");
+        return QMetaType::fromName("int").id();
     else if (typeName == u"real")
-        return QMetaType::type("double");
+        return QMetaType::fromName("double").id();
     else if (typeName == u"double")
-        return QMetaType::type("double");
+        return QMetaType::fromName("double").id();
     else if (typeName == u"string")
-        return QMetaType::type("QString");
+        return QMetaType::fromName("QString").id();
     else if (typeName == u"url")
-        return QMetaType::type("QUrl");
+        return QMetaType::fromName("QUrl").id();
     else if (typeName == u"var" || typeName == u"variant")
-        return QMetaType::type("QVariant");
+        return QMetaType::fromName("QVariant").id();
     else
         return -1;
 }
@@ -272,7 +272,7 @@ QVariant convertDynamicPropertyValueToVariant(const QString &astValue,
         return QString();
 
     const int type = propertyType(astType);
-    if (type == QMetaType::type("QVariant")) {
+    if (type == QMetaType::fromName("QVariant").id()) {
         if (cleanedValue.isNull()) // Explicitly isNull, NOT isEmpty!
             return QVariant(static_cast<QVariant::Type>(type));
         else
@@ -1579,7 +1579,7 @@ void TextToModelMerger::syncVariantProperty(AbstractProperty &modelProperty,
                                             const TypeName &astType,
                                             DifferenceHandler &differenceHandler)
 {
-    if (astValue.canConvert(QMetaType::QString))
+    if (astValue.canConvert(QMetaType(QMetaType::QString)))
         populateQrcMapping(astValue.toString());
 
     if (modelProperty.isVariantProperty()) {
diff --git a/src/plugins/qmldesigner/documentwarningwidget.cpp b/src/plugins/qmldesigner/documentwarningwidget.cpp
index e1b8346a66b..a1cc12d8254 100644
--- a/src/plugins/qmldesigner/documentwarningwidget.cpp
+++ b/src/plugins/qmldesigner/documentwarningwidget.cpp
@@ -149,8 +149,8 @@ bool DocumentWarningWidget::eventFilter(QObject *object, QEvent *event)
 
 void DocumentWarningWidget::showEvent(QShowEvent *event)
 {
-    const QColor backgroundColor = Utils::creatorTheme()->color(Utils::Theme::DScontrolBackground);
-    const QColor outlineColor = Utils::creatorTheme()->color(Utils::Theme::DScontrolOutline);
+    const QColor backgroundColor = Utils::creatorColor(Utils::Theme::DScontrolBackground);
+    const QColor outlineColor = Utils::creatorColor(Utils::Theme::DScontrolOutline);
     QPalette pal = palette();
     pal.setColor(QPalette::ToolTipBase, backgroundColor);
     pal.setColor(QPalette::ToolTipText, outlineColor);
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index ca2b5cd46f3..6b396ebc725 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -613,12 +613,14 @@ void QmlDesignerPlugin::enforceDelayedInitialize()
         return;
 
     // adding default path to item library plugins
-    const QString postfix = Utils::HostOsInfo::isMacHost() ? QString("/QmlDesigner")
-                                                           : QString("/qmldesigner");
-    const QStringList pluginPaths = Utils::transform(ExtensionSystem::PluginManager::pluginPaths(),
-                                                     [postfix](const QString &p) {
-                                                         return QString(p + postfix);
-                                                     });
+    const QString postfix = Utils::HostOsInfo::isMacHost()
+                                ? QString("QmlDesigner")
+                                : QString("qmldesigner");
+    const QStringList pluginPaths =
+        Utils::transform(ExtensionSystem::PluginManager::pluginPaths(),
+                         [postfix](const Utils::FilePath &p) {
+                           return (p / postfix).toFSPathString();
+                         });
 
 #ifndef QDS_USE_PROJECTSTORAGE
     MetaInfo::initializeGlobal(pluginPaths, d->externalDependencies);
diff --git a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp b/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp
index d5036c939cd..34cd4338ac0 100644
--- a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp
+++ b/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp
@@ -165,7 +165,7 @@ void QmlPreviewWidgetPlugin::setLanguageLocale(const QString &locale)
 
 QObject *QmlPreviewWidgetPlugin::getPreviewPlugin()
 {
-    const QVector<ExtensionSystem::PluginSpec *> &specs = ExtensionSystem::PluginManager::plugins();
+    const ExtensionSystem::PluginSpecs &specs = ExtensionSystem::PluginManager::plugins();
     const auto pluginIt = std::find_if(specs.cbegin(), specs.cend(),
                                  [](const ExtensionSystem::PluginSpec *p) {
         return p->name() == "QmlPreview";
diff --git a/src/plugins/qmldesigner/shortcutmanager.cpp b/src/plugins/qmldesigner/shortcutmanager.cpp
index 79642c15f5e..661ff3f271f 100644
--- a/src/plugins/qmldesigner/shortcutmanager.cpp
+++ b/src/plugins/qmldesigner/shortcutmanager.cpp
@@ -144,7 +144,8 @@ void ShortCutManager::registerActions(const Core::Context &qmlDesignerMainContex
     Core::ActionContainer *exportMenu = Core::ActionManager::actionContainer(
         QmlProjectManager::Constants::EXPORT_MENU);
 
-    exportMenu->addAction(command, QmlProjectManager::Constants::G_EXPORT_CONVERT);
+    if (exportMenu)
+        exportMenu->addAction(command, QmlProjectManager::Constants::G_EXPORT_CONVERT);
 
     //Close Editor
     Core::ActionManager::registerAction(&m_closeCurrentEditorAction, Core::Constants::CLOSE, qmlDesignerMainContext);
diff --git a/src/plugins/qmldesignerbase/QmlDesignerBase.json.in b/src/plugins/qmldesignerbase/QmlDesignerBase.json.in
index e6b49dcb2a7..c41ed6bc7ba 100644
--- a/src/plugins/qmldesignerbase/QmlDesignerBase.json.in
+++ b/src/plugins/qmldesignerbase/QmlDesignerBase.json.in
@@ -14,7 +14,7 @@
     ],
     "Category" : "Qt Quick",
     "Description" : "Provides support code for the qml designer and co..",
-    "Url" : "http://www.qt.io",
+    "Url" : "https://www.qt.io",
     "Arguments" : [
         {
             "Name" : "-qml-lite-designer",
diff --git a/src/plugins/qmldesignerbase/studio/studiostyle.cpp b/src/plugins/qmldesignerbase/studio/studiostyle.cpp
index d1891ca88db..8bb92ccc88c 100644
--- a/src/plugins/qmldesignerbase/studio/studiostyle.cpp
+++ b/src/plugins/qmldesignerbase/studio/studiostyle.cpp
@@ -29,7 +29,7 @@ inline QColor studioTextColor(bool enabled,
                        : Theme::DStextColor)
                     : Theme::DStextColorDisabled;
 
-    return creatorTheme()->color(themePenColorId);
+    return creatorColor(themePenColorId);
 }
 
 inline QColor studioButtonBgColor(bool enabled,
@@ -51,7 +51,7 @@ inline QColor studioButtonBgColor(bool enabled,
                  )
             : Theme::DScontrolBackgroundDisabled;
 
-    return creatorTheme()->color(themePenColorId);
+    return creatorColor(themePenColorId);
 }
 
 inline QColor studioButtonOutlineColor(bool enabled,
@@ -67,7 +67,7 @@ inline QColor studioButtonOutlineColor(bool enabled,
                : Theme::DScontrolOutline)
             : Theme::DScontrolOutlineDisabled;
 
-    return creatorTheme()->color(themePenColorId);
+    return creatorColor(themePenColorId);
 }
 
 inline bool anyParentsFocused(const QWidget *widget)
@@ -187,7 +187,7 @@ void StudioStyle::drawPrimitive(
     case PE_FrameMenu:
     case PE_PanelMenu:
         if (isQmlEditorMenu(widget))
-            painter->fillRect(option->rect, creatorTheme()->color(Theme::DSsubPanelBackground));
+            painter->fillRect(option->rect, creatorColor(Theme::DSsubPanelBackground));
         else
             Super::drawPrimitive(element, option, painter, widget);
         break;
@@ -241,7 +241,7 @@ void StudioStyle::drawPrimitive(
         }
 
         // The separator color is currently the same as toolbar bg
-        painter->fillRect(colorRect, creatorTheme()->color(Theme::DStoolbarBackground));
+        painter->fillRect(colorRect, creatorColor(Theme::DStoolbarBackground));
     } break;
 
     default: {
@@ -282,7 +282,7 @@ void StudioStyle::drawControl(
             QStyleOptionMenuItem item = *mbi;
 
             if (isActive) {
-                painter->fillRect(item.rect, creatorTheme()->color(Theme::DSinteraction));
+                painter->fillRect(item.rect, creatorColor(Theme::DSinteraction));
             }
             forwardX += startMargin;
 
@@ -294,7 +294,7 @@ void StudioStyle::drawControl(
                                       item.rect.right() - additionalMargin,
                                       commonHeight);
 
-                painter->setPen(creatorTheme()->color(Theme::DSstateSeparatorColor));
+                painter->setPen(creatorColor(Theme::DSstateSeparatorColor));
                 painter->drawLine(separatorLine);
                 item.text.clear();
                 painter->restore();
@@ -458,7 +458,7 @@ void StudioStyle::drawComplexControl(
                           : Theme::DSpopupBackground // Idle
                     : Theme::DSpopupBackground; // Disabled
 
-            QColor frameColor = creatorTheme()->color(themeframeColor);
+            QColor frameColor = creatorColor(themeframeColor);
 
             if ((option->subControls & SC_SliderGroove) && groove.isValid()) {
                 Theme::Color themeBgPlusColor = enabled
@@ -494,9 +494,9 @@ void StudioStyle::drawComplexControl(
 
                 painter->save();
                 painter->setPen(Qt::NoPen);
-                painter->setBrush(creatorTheme()->color(themeBgPlusColor));
+                painter->setBrush(creatorColor(themeBgPlusColor));
                 painter->drawRoundedRect(plusRect, borderRadius, borderRadius);
-                painter->setBrush(creatorTheme()->color(themeBgMinusColor));
+                painter->setBrush(creatorColor(themeBgMinusColor));
                 painter->drawRoundedRect(minusRect, borderRadius, borderRadius);
                 painter->restore();
             }
@@ -509,7 +509,7 @@ void StudioStyle::drawComplexControl(
                         : Theme::DScontrolBackgroundDisabled;
 
                 painter->setBrush(Qt::NoBrush);
-                painter->setPen(creatorTheme()->color(tickPen));
+                painter->setPen(creatorColor(tickPen));
                 int tickSize = proxy()->pixelMetric(PM_SliderTickmarkOffset, option, widget);
                 int available = proxy()->pixelMetric(PM_SliderSpaceAvailable, slider, widget);
                 int interval = slider->tickInterval;
@@ -577,7 +577,7 @@ void StudioStyle::drawComplexControl(
                 int halfSliderThickness = horizontal
                         ? handle.width() / 2
                         : handle.height() / 2;
-                painter->setBrush(creatorTheme()->color(handleColor));
+                painter->setBrush(creatorColor(handleColor));
                 painter->setPen(Qt::NoPen);
                 painter->drawRoundedRect(handle,
                                         halfSliderThickness,
@@ -733,7 +733,7 @@ void StudioStyle::drawComplexControl(
             bool enabled = scrollBar->state & QStyle::State_Enabled;
             bool hovered = enabled && scrollBar->state & QStyle::State_MouseOver;
 
-            QColor buttonColor = creatorTheme()->color(hovered ? Theme::DSscrollBarHandle
+            QColor buttonColor = creatorColor(hovered ? Theme::DSscrollBarHandle
                                                                : Theme::DSscrollBarHandle_idle);
             QColor gradientStartColor = buttonColor.lighter(118);
             QColor gradientStopColor = buttonColor;
@@ -753,12 +753,12 @@ void StudioStyle::drawComplexControl(
                 painter->save();
                 painter->setPen(Qt::NoPen);
                 if (hasTransientStyle) {
-                    QColor brushColor(creatorTheme()->color(Theme::DSscrollBarTrack));
+                    QColor brushColor(creatorColor(Theme::DSscrollBarTrack));
                     brushColor.setAlpha(0.3 * 255);
                     painter->setBrush(QBrush(brushColor));
                     painter->drawRoundedRect(scrollBarGroove, 4, 4);
                 } else {
-                    painter->setBrush(QBrush(creatorTheme()->color(Theme::DSscrollBarTrack)));
+                    painter->setBrush(QBrush(creatorColor(Theme::DSscrollBarTrack)));
                     painter->drawRect(rect);
                 }
                 painter->restore();
@@ -973,15 +973,6 @@ QRect StudioStyle::subControlRect(
         SubControl subControl,
         const QWidget *widget) const
 {
-#if QT_VERSION < QT_VERSION_CHECK(6, 2, 5)
-    // Workaround for QTBUG-101581, can be removed when building with Qt 6.2.5 or higher
-    if (control == CC_ScrollBar) {
-        const auto scrollbar = qstyleoption_cast<const QStyleOptionSlider *>(option);
-        if (scrollbar && qint64(scrollbar->maximum) - scrollbar->minimum > INT_MAX)
-            return QRect(); // breaks the scrollbar, but avoids the crash
-    }
-#endif
-
     switch (control) {
     case CC_Slider: {
         if (const auto slider = qstyleoption_cast<const QStyleOptionSlider *>(option)) {
diff --git a/src/plugins/qmldesignerbase/studio/studiostyle_p.cpp b/src/plugins/qmldesignerbase/studio/studiostyle_p.cpp
index c1e1dece05f..adfd08c6ef5 100644
--- a/src/plugins/qmldesignerbase/studio/studiostyle_p.cpp
+++ b/src/plugins/qmldesignerbase/studio/studiostyle_p.cpp
@@ -31,7 +31,7 @@ inline QColor studioTextColor(bool enabled, bool active, bool checked)
                                                      : Theme::DStextColor)
                                            : Theme::DStextColorDisabled;
 
-    return creatorTheme()->color(themePenColorId);
+    return creatorColor(themePenColorId);
 }
 }; // namespace
 
@@ -39,7 +39,7 @@ StudioStylePrivate::StudioStylePrivate(StudioStyle *q)
     : QObject(q)
     , q(q)
 {
-    auto color = [](Theme::Color c) { return creatorTheme()->color(c); };
+    auto color = [](Theme::Color c) { return creatorColor(c); };
 
     {
         stdPalette.setColorGroup(QPalette::Disabled,                        // group
diff --git a/src/plugins/qmldesignerlite/CMakeLists.txt b/src/plugins/qmldesignerlite/CMakeLists.txt
index 95c1035b09b..67e007ae65a 100644
--- a/src/plugins/qmldesignerlite/CMakeLists.txt
+++ b/src/plugins/qmldesignerlite/CMakeLists.txt
@@ -10,6 +10,7 @@ add_feature_info("Treat warnings as errors in QmlDesigner" ${ENABLE_COMPILE_WARN
 
 add_qtc_plugin(QmlDesignerLite
   PLUGIN_DEPENDS QmlDesigner
+  CONDITION TARGET QmlDesigner
   SOURCES
     qmldesignerliteplugin.cpp qmldesignerliteplugin.h
 )
diff --git a/src/plugins/qmldesignerlite/QmlDesignerLite.json.in b/src/plugins/qmldesignerlite/QmlDesignerLite.json.in
index 75410dfd586..0a40a22f77f 100644
--- a/src/plugins/qmldesignerlite/QmlDesignerLite.json.in
+++ b/src/plugins/qmldesignerlite/QmlDesignerLite.json.in
@@ -13,9 +13,9 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Qt Quick",
-    "Description" : "Qml Designer Lite",
+    "Description" : "Qml Designer Lite.",
     "LongDescription": "Qml Designer Lite is a lightweight version of Qt Design Studio, providing a subset of the features of the full Qt Design Studio.",
-    "Url" : "http://www.qt.io",
+    "Url" : "https://www.qt.io",
     "Experimental": true,
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/qmljseditor/QmlJSEditor.json.in b/src/plugins/qmljseditor/QmlJSEditor.json.in
index c05d4efa808..d57c9cda3da 100644
--- a/src/plugins/qmljseditor/QmlJSEditor.json.in
+++ b/src/plugins/qmljseditor/QmlJSEditor.json.in
@@ -13,7 +13,8 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Qt Quick",
-    "Description" : "Editor for QML and JavaScript.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Edit QML and JavaScript files.",
+    "LongDescription" : [],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
index 134baa58274..ce6473b9880 100644
--- a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
+++ b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
@@ -187,10 +187,7 @@ public:
         for (const QString &property : std::as_const(result))
             replacement += property + QLatin1String(": ") + propertyReader.readAstValue(property) + QLatin1Char('\n');
 
-        Utils::ChangeSet changes;
-        changes.replace(start, end, replacement);
-        currentFile->setChangeSet(changes);
-        currentFile->apply();
+        currentFile->apply(ChangeSet::makeReplace(start, end, replacement));
 
         Core::IVersionControl *versionControl = Core::VcsManager::findVersionControlForDirectory(
             path);
diff --git a/src/plugins/qmljseditor/qmljseditingsettingspage.cpp b/src/plugins/qmljseditor/qmljseditingsettingspage.cpp
index 11c7985fd1c..c0e16b12887 100644
--- a/src/plugins/qmljseditor/qmljseditingsettingspage.cpp
+++ b/src/plugins/qmljseditor/qmljseditingsettingspage.cpp
@@ -21,6 +21,7 @@
 
 #include <QCheckBox>
 #include <QComboBox>
+#include <QGroupBox>
 #include <QLabel>
 #include <QLineEdit>
 #include <QMenu>
@@ -34,7 +35,9 @@ const char QML_CONTEXTPANEPIN_KEY[] = "QmlJSEditor.ContextPanePinned";
 const char FOLD_AUX_DATA[] = "QmlJSEditor.FoldAuxData";
 const char USE_QMLLS[] = "QmlJSEditor.UseQmlls";
 const char USE_LATEST_QMLLS[] = "QmlJSEditor.UseLatestQmlls";
+const char IGNORE_MINIMUM_QMLLS_VERSION[] = "QmlJSEditor.IgnoreMinimumQmllsVersion";
 const char DISABLE_BUILTIN_CODEMODEL[] = "QmlJSEditor.DisableBuiltinCodemodel";
+const char GENERATE_QMLLS_INI_FILES[] = "QmlJSEditor.GenerateQmllsIniFiles";
 const char UIQML_OPEN_MODE[] = "QmlJSEditor.openUiQmlMode";
 const char FORMAT_COMMAND[] = "QmlJSEditor.formatCommand";
 const char FORMAT_COMMAND_OPTIONS[] = "QmlJSEditor.formatCommandOptions";
@@ -103,10 +106,14 @@ void QmlJsEditingSettings::fromSettings(QtcSettings *settings)
         = settings->value(AUTO_FORMAT_ONLY_CURRENT_PROJECT, QVariant(false)).toBool();
     m_foldAuxData = settings->value(FOLD_AUX_DATA, QVariant(true)).toBool();
     m_uiQmlOpenMode = settings->value(UIQML_OPEN_MODE, "").toString();
-    m_qmllsSettings.useQmlls = settings->value(USE_QMLLS, QVariant(false)).toBool();
+    m_qmllsSettings.useQmlls = settings->value(USE_QMLLS, QVariant(true)).toBool();
     m_qmllsSettings.useLatestQmlls = settings->value(USE_LATEST_QMLLS, QVariant(false)).toBool();
+    m_qmllsSettings.ignoreMinimumQmllsVersion
+        = settings->value(IGNORE_MINIMUM_QMLLS_VERSION, QVariant(false)).toBool();
     m_qmllsSettings.disableBuiltinCodemodel
         = settings->value(DISABLE_BUILTIN_CODEMODEL, QVariant(false)).toBool();
+    m_qmllsSettings.generateQmllsIniFiles
+        = settings->value(GENERATE_QMLLS_INI_FILES, QVariant(false)).toBool();
     m_formatCommand = settings->value(FORMAT_COMMAND, {}).toString();
     m_formatCommandOptions = settings->value(FORMAT_COMMAND_OPTIONS, {}).toString();
     m_useCustomFormatCommand = settings->value(CUSTOM_COMMAND, QVariant(false)).toBool();
@@ -134,7 +141,9 @@ void QmlJsEditingSettings::toSettings(QtcSettings *settings) const
     settings->setValue(UIQML_OPEN_MODE, m_uiQmlOpenMode);
     settings->setValue(USE_QMLLS, m_qmllsSettings.useQmlls);
     settings->setValue(USE_LATEST_QMLLS, m_qmllsSettings.useLatestQmlls);
+    settings->setValue(IGNORE_MINIMUM_QMLLS_VERSION, m_qmllsSettings.ignoreMinimumQmllsVersion);
     settings->setValue(DISABLE_BUILTIN_CODEMODEL, m_qmllsSettings.disableBuiltinCodemodel);
+    settings->setValue(GENERATE_QMLLS_INI_FILES, m_qmllsSettings.generateQmllsIniFiles);
     settings->setValueWithDefault(FORMAT_COMMAND, m_formatCommand, {});
     settings->setValueWithDefault(FORMAT_COMMAND_OPTIONS, m_formatCommandOptions, {});
     settings->setValueWithDefault(CUSTOM_COMMAND, m_useCustomFormatCommand, false);
@@ -392,19 +401,33 @@ public:
         uiQmlOpenComboBox->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
         uiQmlOpenComboBox->setSizeAdjustPolicy(QComboBox::QComboBox::AdjustToContents);
 
-        useQmlls = new QCheckBox(Tr::tr("Enable QML Language Server (EXPERIMENTAL!)"));
+        useQmlls = new QCheckBox(Tr::tr("Turn on"));
         useQmlls->setChecked(s.qmllsSettings().useQmlls);
+
+        ignoreMinimumQmllsVersion = new QCheckBox(
+            Tr::tr("Allow versions below Qt %1")
+                .arg(QmllsSettings::mininumQmllsVersion.toString()));
+        ignoreMinimumQmllsVersion->setChecked(s.qmllsSettings().ignoreMinimumQmllsVersion);
+        ignoreMinimumQmllsVersion->setEnabled(s.qmllsSettings().useQmlls);
+
         disableBuiltInCodemodel = new QCheckBox(
-            Tr::tr("Use QML Language Server advanced features (renaming, find usages and co.) "
-                   "(EXPERIMENTAL!)"));
+            Tr::tr("Use advanced features (renaming, find usages, and so on) "
+                   "(experimental)"));
         disableBuiltInCodemodel->setChecked(s.qmllsSettings().disableBuiltinCodemodel);
         disableBuiltInCodemodel->setEnabled(s.qmllsSettings().useQmlls);
-        useLatestQmlls = new QCheckBox(Tr::tr("Use QML Language Server from latest Qt version"));
+        useLatestQmlls = new QCheckBox(Tr::tr("Use from latest Qt version"));
         useLatestQmlls->setChecked(s.qmllsSettings().useLatestQmlls);
         useLatestQmlls->setEnabled(s.qmllsSettings().useQmlls);
+
+        generateQmllsIniFiles = new QCheckBox(
+            Tr::tr("Create .qmlls.ini files for new projects"));
+        generateQmllsIniFiles->setChecked(s.qmllsSettings().generateQmllsIniFiles);
+        generateQmllsIniFiles->setEnabled(s.qmllsSettings().useQmlls);
         QObject::connect(useQmlls, &QCheckBox::stateChanged, this, [this](int checked) {
             useLatestQmlls->setEnabled(checked != Qt::Unchecked);
             disableBuiltInCodemodel->setEnabled(checked != Qt::Unchecked);
+            generateQmllsIniFiles->setEnabled(checked != Qt::Unchecked);
+            ignoreMinimumQmllsVersion->setEnabled(checked != Qt::Unchecked);
         });
 
         useCustomAnalyzer = new QCheckBox(Tr::tr("Use customized static analyzer"));
@@ -457,7 +480,7 @@ public:
             },
             Group{
                 title(Tr::tr("QML Language Server")),
-                Column{useQmlls, disableBuiltInCodemodel , useLatestQmlls},
+                Column{useQmlls, ignoreMinimumQmllsVersion, disableBuiltInCodemodel, useLatestQmlls, generateQmllsIniFiles},
             },
             Group {
                 title(Tr::tr("Static Analyzer")),
@@ -503,6 +526,8 @@ public:
         s.qmllsSettings().useQmlls = useQmlls->isChecked();
         s.qmllsSettings().disableBuiltinCodemodel = disableBuiltInCodemodel->isChecked();
         s.qmllsSettings().useLatestQmlls = useLatestQmlls->isChecked();
+        s.qmllsSettings().ignoreMinimumQmllsVersion = ignoreMinimumQmllsVersion->isChecked();
+        s.qmllsSettings().generateQmllsIniFiles = generateQmllsIniFiles->isChecked();
         s.setUseCustomAnalyzer(useCustomAnalyzer->isChecked());
         QSet<int> disabled;
         QSet<int> disabledForNonQuickUi;
@@ -560,7 +585,9 @@ private:
     QCheckBox *foldAuxData;
     QCheckBox *useQmlls;
     QCheckBox *useLatestQmlls;
+    QCheckBox *ignoreMinimumQmllsVersion;
     QCheckBox *disableBuiltInCodemodel;
+    QCheckBox *generateQmllsIniFiles;
     QComboBox *uiQmlOpenComboBox;
     QCheckBox *useCustomAnalyzer;
     QTreeView *analyzerMessagesView;
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index 79d24891c78..11dc5cf9ae8 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -52,7 +52,6 @@
 #include <texteditor/codeassist/genericproposalmodel.h>
 #include <texteditor/colorpreviewhoverhandler.h>
 #include <texteditor/snippets/snippetprovider.h>
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/textmark.h>
 
 #include <utils/algorithm.h>
@@ -268,6 +267,8 @@ bool QmlJSEditorWidget::isOutlineCursorChangesBlocked()
 
 void QmlJSEditorWidget::jumpToOutlineElement(int /*index*/)
 {
+    if (!m_outlineCombo)
+        return;
     QModelIndex index = m_outlineCombo->view()->currentIndex();
     SourceLocation location = m_qmlJsEditorDocument->outlineModel()->sourceLocation(index);
 
@@ -286,6 +287,8 @@ void QmlJSEditorWidget::jumpToOutlineElement(int /*index*/)
 
 void QmlJSEditorWidget::updateOutlineIndexNow()
 {
+    if (!m_outlineCombo)
+        return;
     if (!m_qmlJsEditorDocument->outlineModel()->document())
         return;
 
@@ -571,8 +574,19 @@ void QmlJSEditorWidget::createToolBar()
 
     connect(this, &QmlJSEditorWidget::cursorPositionChanged,
             &m_updateOutlineIndexTimer, QOverload<>::of(&QTimer::start));
+    connect(this, &QmlJSEditorWidget::toolbarOutlineChanged,
+            this, &QmlJSEditorWidget::updateOutline);
 
-    insertExtraToolBarWidget(TextEditorWidget::Left, m_outlineCombo);
+    setToolbarOutline(m_outlineCombo);
+}
+
+void QmlJSEditorWidget::updateOutline(QWidget *newOutline)
+{
+    if (!newOutline) {
+        createToolBar();
+    } else if (newOutline != m_outlineCombo){
+        m_outlineCombo = nullptr;
+    }
 }
 
 class CodeModelInspector : public MemberProcessor
@@ -1169,12 +1183,12 @@ QmlJSEditorFactory::QmlJSEditorFactory(Utils::Id _id)
     addHoverHandler(new ColorPreviewHoverHandler);
     setCompletionAssistProvider(new QmlJSCompletionAssistProvider);
 
-    setEditorActionHandlers(TextEditorActionHandler::Format
-                            | TextEditorActionHandler::UnCommentSelection
-                            | TextEditorActionHandler::UnCollapseAll
-                            | TextEditorActionHandler::FollowSymbolUnderCursor
-                            | TextEditorActionHandler::RenameSymbol
-                            | TextEditorActionHandler::FindUsage);
+    setOptionalActionMask(OptionalActions::Format
+                            | OptionalActions::UnCommentSelection
+                            | OptionalActions::UnCollapseAll
+                            | OptionalActions::FollowSymbolUnderCursor
+                            | OptionalActions::RenameSymbol
+                            | OptionalActions::FindUsage);
 }
 
 static void decorateEditor(TextEditorWidget *editor)
diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h
index d5279fe78e7..0929fa552a4 100644
--- a/src/plugins/qmljseditor/qmljseditor.h
+++ b/src/plugins/qmljseditor/qmljseditor.h
@@ -79,6 +79,7 @@ protected:
     void scrollContentsBy(int dx, int dy) override;
     void applyFontSettings() override;
     void createToolBar();
+    void updateOutline(QWidget *newOutline);
     void findLinkAt(const QTextCursor &cursor,
                     const Utils::LinkHandler &processLinkCallback,
                     bool resolveTarget = true,
diff --git a/src/plugins/qmljseditor/qmljseditordocument.cpp b/src/plugins/qmljseditor/qmljseditordocument.cpp
index cef1aefcd2b..44c45f56dd3 100644
--- a/src/plugins/qmljseditor/qmljseditordocument.cpp
+++ b/src/plugins/qmljseditor/qmljseditordocument.cpp
@@ -728,10 +728,11 @@ void QmlJSEditorDocumentPrivate::setSourcesWithCapabilities(
         setSemanticWarningSource(QmllsStatus::Source::Qmlls);
     else
         setSemanticWarningSource(QmllsStatus::Source::EmbeddedCodeModel);
-    if (cap.semanticTokensProvider())
-        setSemanticHighlightSource(QmllsStatus::Source::Qmlls);
-    else
-        setSemanticHighlightSource(QmllsStatus::Source::EmbeddedCodeModel);
+    // TODO: uncomment when qmlls semantic tokens reach a stable state
+    // if (cap.semanticTokensProvider())
+    //     setSemanticHighlightSource(QmllsStatus::Source::Qmlls);
+    // else
+    setSemanticHighlightSource(QmllsStatus::Source::EmbeddedCodeModel);
 }
 
 static Utils::FilePath qmllsForFile(const Utils::FilePath &file,
@@ -745,6 +746,11 @@ static Utils::FilePath qmllsForFile(const Utils::FilePath &file,
     if (settings.useLatestQmlls)
         return settingsManager->latestQmlls();
     QmlJS::ModelManagerInterface::ProjectInfo pInfo = modelManager->projectInfoForPath(file);
+
+    if (!settings.ignoreMinimumQmllsVersion
+        && QVersionNumber::fromString(pInfo.qtVersionString) < settings.mininumQmllsVersion) {
+        return {};
+    }
     return pInfo.qmllsPath;
 }
 
@@ -762,7 +768,7 @@ void QmlJSEditorDocumentPrivate::settingsChanged()
         qCDebug(qmllsLog) << "disabling qmlls for" << q->filePath();
         if (LanguageClient::Client *client = lspClientManager->clientForDocument(q)) {
             qCDebug(qmllsLog) << "deactivating " << q->filePath() << "in qmlls" << newQmlls;
-            client->deactivateDocument(q);
+            lspClientManager->openDocumentWithClient(q, nullptr);
         } else
             qCWarning(qmllsLog) << "Could not find client to disable for document " << q->filePath()
                                 << " in LanguageClient::LanguageClientManager";
diff --git a/src/plugins/qmljseditor/qmljsfindreferences.cpp b/src/plugins/qmljseditor/qmljsfindreferences.cpp
index 3f5d53d60f5..8934865783d 100644
--- a/src/plugins/qmljseditor/qmljsfindreferences.cpp
+++ b/src/plugins/qmljseditor/qmljsfindreferences.cpp
@@ -599,6 +599,17 @@ protected:
         return true;
     }
 
+    bool visit(UiEnumDeclaration *node) override
+    {
+        if (containsOffset(node->identifierToken)) {
+            _name = node->name.toString();
+            _scope = _doc->bind()->findQmlObject(_objectNode);
+            _targetValue = _scopeChain->context()->lookupType(_doc.data(), QStringList(_name));
+            return false;
+        }
+        return true;
+    }
+
     bool visit(FunctionDeclaration *node) override
     {
         return visit(static_cast<FunctionExpression *>(node));
diff --git a/src/plugins/qmljseditor/qmljshighlighter.cpp b/src/plugins/qmljseditor/qmljshighlighter.cpp
index 4fd1da274ee..8000baf57f8 100644
--- a/src/plugins/qmljseditor/qmljshighlighter.cpp
+++ b/src/plugins/qmljseditor/qmljshighlighter.cpp
@@ -108,10 +108,6 @@ void QmlJSHighlighter::highlightBlock(const QString &text)
                             break;
                         }
                     }
-                    if (QStringView(text).mid(token.offset, token.length) == QLatin1String("enum")) {
-                        setFormat(token.offset, token.length, formatForCategory(C_KEYWORD));
-                        break;
-                    }
                 } else if (index > 0 && maybeQmlBuiltinType(spell)) {
                     const Token &previousToken = tokens.at(index - 1);
                     if (previousToken.is(Token::Identifier)
diff --git a/src/plugins/qmljseditor/qmljshoverhandler.cpp b/src/plugins/qmljseditor/qmljshoverhandler.cpp
index 188d49fabb2..650592ff485 100644
--- a/src/plugins/qmljseditor/qmljshoverhandler.cpp
+++ b/src/plugins/qmljseditor/qmljshoverhandler.cpp
@@ -7,6 +7,7 @@
 #include "qmljseditordocument.h"
 #include "qmljseditortr.h"
 #include "qmljshoverhandler.h"
+#include "qmljseditingsettingspage.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/ieditor.h>
@@ -373,6 +374,12 @@ void QmlJSHoverHandler::reset()
 
 void QmlJSHoverHandler::operateTooltip(TextEditorWidget *editorWidget, const QPoint &point)
 {
+    // disable hoverhandling in case qmlls is enabled
+    if (QmlJsEditingSettings::get().qmllsSettings().useQmlls) {
+        BaseHoverHandler::operateTooltip(editorWidget, point);
+        return;
+    }
+
     if (toolTip().isEmpty())
         Utils::ToolTip::hide();
     else if (m_colorTip.isValid())
diff --git a/src/plugins/qmljseditor/qmljsquickfixes.cpp b/src/plugins/qmljseditor/qmljsquickfixes.cpp
index 126361451e2..5bb077e8147 100644
--- a/src/plugins/qmljseditor/qmljsquickfixes.cpp
+++ b/src/plugins/qmljseditor/qmljsquickfixes.cpp
@@ -70,8 +70,7 @@ public:
         changes.insert(currentFile->startOf(_objectInitializer->rbraceToken),
                        QLatin1String("\n"));
 
-        currentFile->setChangeSet(changes);
-        currentFile->apply();
+        currentFile->apply(changes);
     }
 };
 
@@ -117,11 +116,9 @@ public:
                         const QmlJSRefactoringChanges &,
                         const QString &) override
     {
-        Utils::ChangeSet changes;
-        const int insertLoc = _message.location.begin() - _message.location.startColumn + 1;
-        changes.insert(insertLoc, QString::fromLatin1("// %1\n").arg(_message.suppressionString()));
-        currentFile->setChangeSet(changes);
-        currentFile->apply();
+        currentFile->apply(Utils::ChangeSet::makeInsert(
+            _message.location.begin() - _message.location.startColumn + 1,
+            QString::fromLatin1("// %1\n").arg(_message.suppressionString())));
     }
 };
 
diff --git a/src/plugins/qmljseditor/qmljssemantichighlighter.cpp b/src/plugins/qmljseditor/qmljssemantichighlighter.cpp
index c414684df7a..31574997138 100644
--- a/src/plugins/qmljseditor/qmljssemantichighlighter.cpp
+++ b/src/plugins/qmljseditor/qmljssemantichighlighter.cpp
@@ -348,6 +348,13 @@ protected:
         return visit(static_cast<FunctionExpression *>(ast));
     }
 
+    bool visit(UiEnumMemberList *ast) override
+    {
+        for (auto it = ast; it; it = it->next)
+            addUse(it->memberToken, SemanticHighlighter::FieldType);
+        return true;
+    }
+
     bool visit(PatternElement *ast) override
     {
         if (ast->isVariableDeclaration())
@@ -361,6 +368,47 @@ protected:
         return false;
     }
 
+    bool visit(FieldMemberExpression *ast) override
+    {
+        if (ast->name.isEmpty() || ast->name.first().isLower())
+            return true;
+        // we only support IdentifierExpression.FieldMemberExpression (enum)
+        const FieldMemberExpression *right = ast;
+        if (const IdentifierExpression *idExp = cast<IdentifierExpression *>(ast->base)) {
+            const ObjectValue *scope = nullptr;
+            const Value *value = m_scopeChain.lookup(idExp->name.toString(), &scope);
+            if (auto aov = value->asAstObjectValue()) {
+                const ObjectValue *inObject = nullptr;
+                const Value *enumValue = aov->lookupMember(right->name.toString(),
+                                                           m_scopeChain.context(), &inObject);
+                if (enumValue && enumValue->asNumberValue()) // can we do better?
+                    addUse(right->identifierToken, SemanticHighlighter::FieldType);
+            }
+            return true;
+        }
+        // or IdentifierExpression.FieldMemberExpression.FieldMemberExpression (enum)
+        const FieldMemberExpression *it = cast<FieldMemberExpression *>(ast->base);
+        if (!it)
+            return true;
+        const IdentifierExpression *idExp = cast<IdentifierExpression *>(it->base);
+        if (!idExp)
+            return true;
+        const ObjectValue *scope = nullptr;
+        const Value *value = m_scopeChain.lookup(idExp->name.toString(), &scope);
+        const ASTObjectValue *aoValue= value->asAstObjectValue();
+        if (!aoValue)
+            return true;
+        if (auto maybeEnum = aoValue->lookupMember(it->name.toString(), m_scopeChain.context())) {
+            if (const UiEnumValue *enumObject = maybeEnum->asUiEnumValue()) {
+                addUse(it->identifierToken, SemanticHighlighter::QmlTypeType);
+                if (enumObject->keys().contains(right->name))
+                    addUse(right->identifierToken, SemanticHighlighter::FieldType);
+            }
+        }
+
+        return true;
+    }
+
     bool visit(StringLiteral *ast) override
     {
         if (ast->value.isEmpty())
@@ -569,7 +617,7 @@ void SemanticHighlighter::applyResults(int from, int to)
 
     if (m_enableHighlighting)
         TextEditor::SemanticHighlighter::incrementalApplyExtraAdditionalFormats(
-            m_document->syntaxHighlighterRunner(), m_watcher.future(), from, to, m_extraFormats);
+            m_document->syntaxHighlighter(), m_watcher.future(), from, to, m_extraFormats);
 }
 
 void SemanticHighlighter::finished()
@@ -584,7 +632,7 @@ void SemanticHighlighter::finished()
 
     if (m_enableHighlighting)
         TextEditor::SemanticHighlighter::clearExtraAdditionalFormatsUntilEnd(
-            m_document->syntaxHighlighterRunner(), m_watcher.future());
+            m_document->syntaxHighlighter(), m_watcher.future());
 }
 
 void SemanticHighlighter::run(QPromise<Use> &promise,
diff --git a/src/plugins/qmljseditor/qmljswrapinloader.cpp b/src/plugins/qmljseditor/qmljswrapinloader.cpp
index bf5fd44d4a7..5f6b474ad62 100644
--- a/src/plugins/qmljseditor/qmljswrapinloader.cpp
+++ b/src/plugins/qmljseditor/qmljswrapinloader.cpp
@@ -146,8 +146,7 @@ public:
                                                       "    id: %2\n"
                                                       "    sourceComponent: %1\n"
                                                       "}\n").arg(componentId, loaderId));
-        currentFile->setChangeSet(changes);
-        currentFile->apply();
+        currentFile->apply(changes);
     }
 };
 
diff --git a/src/plugins/qmljseditor/qmllsclient.cpp b/src/plugins/qmljseditor/qmllsclient.cpp
index 6ec46774f30..9fe50a5af7e 100644
--- a/src/plugins/qmljseditor/qmllsclient.cpp
+++ b/src/plugins/qmljseditor/qmllsclient.cpp
@@ -66,6 +66,10 @@ QmllsClient *QmllsClient::clientForQmlls(const FilePath &qmlls)
 QmllsClient::QmllsClient(StdIOClientInterface *interface)
     : Client(interface)
 {
+    LanguageServerProtocol::Unregistration unregister;
+    unregister.setMethod("textDocument/semanticTokens");
+    unregister.setId({});
+    dynamicCapabilities().unregisterCapability({unregister});
 }
 
 QmllsClient::~QmllsClient()
diff --git a/src/plugins/qmljseditor/qmllssettings.cpp b/src/plugins/qmljseditor/qmllssettings.cpp
index 15cb8908afb..8ca9936957f 100644
--- a/src/plugins/qmljseditor/qmllssettings.cpp
+++ b/src/plugins/qmljseditor/qmllssettings.cpp
@@ -33,9 +33,12 @@ static FilePath evaluateLatestQmlls()
     QVersionNumber latestVersion;
     FilePath latestQmakeFilePath;
     int latestUniqueId = std::numeric_limits<int>::min();
+    const QmllsSettings qmllsSettings = QmllsSettingsManager::instance()->lastSettings();
     for (QtVersion *v : versions) {
         // check if we find qmlls
         QVersionNumber vNow = v->qtVersion();
+        if (!qmllsSettings.ignoreMinimumQmllsVersion && vNow < qmllsSettings.mininumQmllsVersion)
+            continue;
         FilePath qmllsNow = QmlJS::ModelManagerInterface::qmllsForBinPath(v->hostBinPath(), vNow);
         if (!qmllsNow.isExecutableFile())
             continue;
diff --git a/src/plugins/qmljseditor/qmllssettings.h b/src/plugins/qmljseditor/qmllssettings.h
index 32890d3762a..ad11a541c52 100644
--- a/src/plugins/qmljseditor/qmllssettings.h
+++ b/src/plugins/qmljseditor/qmllssettings.h
@@ -5,6 +5,7 @@
 
 #include "qmljseditor_global.h"
 
+#include <QtCore/qversionnumber.h>
 #include <utils/filepath.h>
 #include <QMutex>
 #include <QObject>
@@ -13,14 +14,19 @@ namespace QmlJSEditor {
 
 struct QmllsSettings
 {
+    static const inline QVersionNumber mininumQmllsVersion = QVersionNumber(6,8);
     bool useQmlls = true;
     bool useLatestQmlls = false;
+    bool ignoreMinimumQmllsVersion = false;
     bool disableBuiltinCodemodel = false;
+    bool generateQmllsIniFiles = false;
 
     friend bool operator==(const QmllsSettings &s1, const QmllsSettings &s2)
     {
         return s1.useQmlls == s2.useQmlls && s1.useLatestQmlls == s2.useLatestQmlls
-               && s1.disableBuiltinCodemodel == s2.disableBuiltinCodemodel;
+               && s1.disableBuiltinCodemodel == s2.disableBuiltinCodemodel
+               && s1.generateQmllsIniFiles == s2.generateQmllsIniFiles
+               && s1.ignoreMinimumQmllsVersion == s2.ignoreMinimumQmllsVersion;
     }
     friend bool operator!=(const QmllsSettings &s1, const QmllsSettings &s2) { return !(s1 == s2); }
 };
diff --git a/src/plugins/qmljseditor/qmloutlinemodel.cpp b/src/plugins/qmljseditor/qmloutlinemodel.cpp
index 015e8a41eb1..9f156807742 100644
--- a/src/plugins/qmljseditor/qmloutlinemodel.cpp
+++ b/src/plugins/qmljseditor/qmloutlinemodel.cpp
@@ -233,6 +233,19 @@ private:
         m_model->leavePublicMember();
     }
 
+    bool visit(AST::UiEnumDeclaration *enumDecl) override
+    {
+        QModelIndex index = m_model->enterEnumDeclaration(enumDecl);
+        m_nodeToIndex.insert(enumDecl, index);
+
+        return true;
+    }
+
+    void endVisit(AST::UiEnumDeclaration *) override
+    {
+        m_model->leavePublicMember();
+    }
+
     bool visit(AST::FunctionDeclaration *functionDeclaration) override
     {
         QModelIndex index = m_model->enterFunctionDeclaration(functionDeclaration);
@@ -576,6 +589,33 @@ void QmlOutlineModel::leavePublicMember()
     leaveNode();
 }
 
+QModelIndex QmlOutlineModel::enterEnumDeclaration(AST::UiEnumDeclaration *enumDecl)
+{
+    QMap<int, QVariant> objectData;
+    if (!enumDecl->name.isEmpty())
+        objectData.insert(Qt::DisplayRole, enumDecl->name.toString());
+    objectData.insert(ItemTypeRole, ElementBindingType);
+
+    QmlOutlineItem *item = enterNode(objectData, enumDecl, nullptr, Icons::enumMemberIcon());
+
+    for (auto member = enumDecl->members; member; member = member->next) {
+        QMap<int, QVariant> memberData;
+        if (!member->member.isEmpty())
+            memberData.insert(Qt::DisplayRole, member->member.toString());
+        memberData.insert(ItemTypeRole, ElementBindingType);
+        memberData.insert(AnnotationRole, QString::number(member->value));
+        enterNode(memberData, member, nullptr, Icons::publicMemberIcon());
+        leaveNode();
+    }
+
+    return item->index();
+}
+
+void QmlOutlineModel::leaveEnumDeclaration()
+{
+    leaveNode();
+}
+
 static QString functionDisplayName(QStringView name, AST::FormalParameterList *formals)
 {
     QString display;
@@ -857,10 +897,8 @@ void QmlOutlineModel::reparentNodes(QmlOutlineItem *targetItem, int row, QList<Q
         changedRanges << range;
     }
 
-    QmlJSRefactoringChanges refactoring(ModelManagerInterface::instance(), m_semanticInfo.snapshot);
-    TextEditor::RefactoringFilePtr file = refactoring.file(m_semanticInfo.document->fileName());
-    file->setChangeSet(changeSet);
-    file->apply();
+    QmlJSRefactoringChanges(ModelManagerInterface::instance(), m_semanticInfo.snapshot)
+        .file(m_semanticInfo.document->fileName())->apply(changeSet);
 }
 
 void QmlOutlineModel::moveObjectMember(AST::Node *toMove,
diff --git a/src/plugins/qmljseditor/qmloutlinemodel.h b/src/plugins/qmljseditor/qmloutlinemodel.h
index 886d1986e59..bacb041714d 100644
--- a/src/plugins/qmljseditor/qmloutlinemodel.h
+++ b/src/plugins/qmljseditor/qmloutlinemodel.h
@@ -91,6 +91,9 @@ private:
     QModelIndex enterPublicMember(QmlJS::AST::UiPublicMember *publicMember);
     void leavePublicMember();
 
+    QModelIndex enterEnumDeclaration(QmlJS::AST::UiEnumDeclaration *enumDecl);
+    void leaveEnumDeclaration();
+
     QModelIndex enterFunctionDeclaration(QmlJS::AST::FunctionDeclaration *functionDeclaration);
     void leaveFunctionDeclaration();
 
diff --git a/src/plugins/qmljstools/QmlJSTools.json.in b/src/plugins/qmljstools/QmlJSTools.json.in
index 0edfb8a7bf4..9e80e06c795 100644
--- a/src/plugins/qmljstools/QmlJSTools.json.in
+++ b/src/plugins/qmljstools/QmlJSTools.json.in
@@ -14,7 +14,7 @@
     ],
     "Category" : "Qt Quick",
     "Description" : "Tools for analyzing Qml/JS code.",
-    "Url" : "http://www.qt.io",
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
 
     "Mimetypes" : [
diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.cpp b/src/plugins/qmljstools/qmljsfunctionfilter.cpp
index 0453d11b9c1..c6f8dfa4fd0 100644
--- a/src/plugins/qmljstools/qmljsfunctionfilter.cpp
+++ b/src/plugins/qmljstools/qmljsfunctionfilter.cpp
@@ -5,8 +5,6 @@
 #include "qmljslocatordata.h"
 #include "qmljstoolstr.h"
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/algorithm.h>
 #include <utils/async.h>
 
@@ -81,7 +79,6 @@ LocatorMatcherTasks QmlJSFunctionsFilter::matchers()
     Storage<LocatorStorage> storage;
 
     const auto onSetup = [storage, entries = m_data->entries()](Async<void> &async) {
-        async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
         async.setConcurrentCallData(matches, *storage, entries);
     };
 
diff --git a/src/plugins/qmlpreview/QmlPreview.json.in b/src/plugins/qmlpreview/QmlPreview.json.in
index d053c4040ba..1c95dd8b8f8 100644
--- a/src/plugins/qmlpreview/QmlPreview.json.in
+++ b/src/plugins/qmlpreview/QmlPreview.json.in
@@ -13,7 +13,8 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Qt Quick",
-    "Description" : "Qml Preview Plugin.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Preview QML files and Qt Quick applications.",
+    "LongDescription" : [],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp
index 17881d00bdc..83598125e74 100644
--- a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp
+++ b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp
@@ -206,7 +206,7 @@ public:
         setStartModifier([this, runControl, serverUrl] {
             CommandLine cmd = commandLine();
 
-            if (const auto aspect = runControl->aspect<QmlProjectManager::QmlMainFileAspect>()) {
+            if (const auto aspect = runControl->aspectData<QmlProjectManager::QmlMainFileAspect>()) {
                 const auto qmlBuildSystem = qobject_cast<QmlProjectManager::QmlBuildSystem *>(
                     runControl->target()->buildSystem());
                 QTC_ASSERT(qmlBuildSystem, return);
diff --git a/src/plugins/qmlpreview/tests/qmlpreviewplugin_test.cpp b/src/plugins/qmlpreview/tests/qmlpreviewplugin_test.cpp
index d041afbffd7..0b005d538f7 100644
--- a/src/plugins/qmlpreview/tests/qmlpreviewplugin_test.cpp
+++ b/src/plugins/qmlpreview/tests/qmlpreviewplugin_test.cpp
@@ -29,7 +29,7 @@ private slots:
 
 static ExtensionSystem::IPlugin *getPlugin()
 {
-    const QVector<ExtensionSystem::PluginSpec *> plugins = ExtensionSystem::PluginManager::plugins();
+    const ExtensionSystem::PluginSpecs plugins = ExtensionSystem::PluginManager::plugins();
     auto it = std::find_if(plugins.begin(), plugins.end(), [](ExtensionSystem::PluginSpec *spec) {
         return spec->name() == "QmlPreview";
     });
diff --git a/src/plugins/qmlprofiler/QmlProfiler.json.in b/src/plugins/qmlprofiler/QmlProfiler.json.in
index 45fdb6e8fff..a7bb7c1357a 100644
--- a/src/plugins/qmlprofiler/QmlProfiler.json.in
+++ b/src/plugins/qmlprofiler/QmlProfiler.json.in
@@ -13,7 +13,10 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Qt Quick",
-    "Description" : "Qml Profiler Plugin.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Profile Qt Quick applications.",
+    "LongDescription" : [
+        "Find causes for typical performance problems, such as slowness and unresponsive, stuttering user interfaces."
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/qmlprofiler/flamegraphview.cpp b/src/plugins/qmlprofiler/flamegraphview.cpp
index ad26f2156ad..eae418fa25e 100644
--- a/src/plugins/qmlprofiler/flamegraphview.cpp
+++ b/src/plugins/qmlprofiler/flamegraphview.cpp
@@ -31,7 +31,7 @@ FlameGraphView::FlameGraphView(QmlProfilerModelManager *manager, QWidget *parent
     m_content->rootContext()->setContextProperty(QStringLiteral("flameGraphModel"), m_model);
     m_content->setSource(QUrl(QStringLiteral(
                                   "qrc:/qt/qml/QtCreator/QmlProfiler/QmlProfilerFlameGraphView.qml")));
-    m_content->setClearColor(Utils::creatorTheme()->color(Utils::Theme::Timeline_BackgroundColor1));
+    m_content->setClearColor(Utils::creatorColor(Utils::Theme::Timeline_BackgroundColor1));
 
     m_content->setResizeMode(QQuickWidget::SizeRootObjectToView);
     m_content->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
diff --git a/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp b/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp
index 406ece2860d..7cea73b2543 100644
--- a/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp
@@ -285,7 +285,7 @@ BindingLoopMaterialShader::BindingLoopMaterialShader()
 
 static QColor bindingLoopsColor()
 {
-    return Utils::creatorTheme()->color(Utils::Theme::Timeline_HighlightColor);
+    return Utils::creatorColor(Utils::Theme::Timeline_HighlightColor);
 }
 
 bool BindingLoopMaterialShader::updateUniformData(RenderState &state, QSGMaterial *, QSGMaterial *)
@@ -309,11 +309,7 @@ bool BindingLoopMaterialShader::updateUniformData(RenderState &state, QSGMateria
 BindingLoopMaterial::BindingLoopMaterial()
 {
     setFlag(QSGMaterial::Blending, false);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
     setFlag(QSGMaterial::NoBatching, true);
-#else
-    setFlag(QSGMaterial::CustomCompileStep, true);
-#endif // >= Qt 6.3
 }
 
 QSGMaterialType *BindingLoopMaterial::type() const
diff --git a/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp b/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp
index 4d3a73d4dc2..1d202a64a65 100644
--- a/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp
@@ -201,7 +201,7 @@ QVariant QmlProfilerStatisticsModel::dataForMainEntry(const QModelIndex &index,
     case TypeIdRole:
         return s_mainEntryTypeId;
     case Qt::ForegroundRole:
-        return Utils::creatorTheme()->color(Utils::Theme::Timeline_TextColor);
+        return Utils::creatorColor(Utils::Theme::Timeline_TextColor);
     case SortRole:
         switch (index.column()) {
         case MainTimeInPercent:
@@ -279,8 +279,8 @@ QVariant QmlProfilerStatisticsModel::data(const QModelIndex &index, int role) co
         }
     case Qt::ForegroundRole:
         return (stats.recursive > 0 || m_notes.contains(typeIndex))
-                ? Utils::creatorTheme()->color(Utils::Theme::Timeline_HighlightColor)
-                : Utils::creatorTheme()->color(Utils::Theme::Timeline_TextColor);
+                ? Utils::creatorColor(Utils::Theme::Timeline_HighlightColor)
+                : Utils::creatorColor(Utils::Theme::Timeline_TextColor);
     case SortRole:
         switch (index.column()) {
         case MainLocation:
@@ -547,7 +547,7 @@ QVariant QmlProfilerStatisticsRelativesModel::dataForMainEntry(qint64 totalDurat
     case TypeIdRole:
         return QmlProfilerStatisticsModel::s_mainEntryTypeId;
     case Qt::ForegroundRole:
-        return Utils::creatorTheme()->color(Utils::Theme::Timeline_TextColor);
+        return Utils::creatorColor(Utils::Theme::Timeline_TextColor);
     case SortRole:
         if (column == RelativeTotalTime)
             return totalDuration;
@@ -598,8 +598,8 @@ QVariant QmlProfilerStatisticsRelativesModel::data(const QModelIndex &index, int
         return stats.isRecursive ? Tr::tr("called recursively") : QString();
     case Qt::ForegroundRole:
         return stats.isRecursive
-                ? Utils::creatorTheme()->color(Utils::Theme::Timeline_HighlightColor)
-                : Utils::creatorTheme()->color(Utils::Theme::Timeline_TextColor);
+                ? Utils::creatorColor(Utils::Theme::Timeline_HighlightColor)
+                : Utils::creatorColor(Utils::Theme::Timeline_TextColor);
     case SortRole:
         switch (index.column()) {
         case RelativeLocation:
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index aa2397a18a4..753d7ea0145 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -353,7 +353,7 @@ void QmlProfilerTool::finalizeRunControl(QmlProfilerRunner *runWorker)
 {
     d->m_toolBusy = true;
     auto runControl = runWorker->runControl();
-    if (auto aspect = runControl->aspect<QmlProfilerRunConfigurationAspect>()) {
+    if (auto aspect = runControl->aspectData<QmlProfilerRunConfigurationAspect>()) {
         if (auto settings = static_cast<const QmlProfilerSettings *>(aspect->currentSettings)) {
             d->m_profilerConnections->setFlushInterval(settings->flushEnabled() ?
                                                            settings->flushInterval() : 0);
diff --git a/src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.cpp b/src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.cpp
index 7799c960289..a417775dbf6 100644
--- a/src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.cpp
+++ b/src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.cpp
@@ -43,7 +43,7 @@ void LocalQmlProfilerRunnerTest::testRunner()
     serverUrl.setPath("invalid");
 
     runControl = new RunControl(ProjectExplorer::Constants::QML_PROFILER_RUN_MODE);
-    runControl->setCommandLine({"\\-/|\\-/", {}});
+    runControl->setCommandLine(CommandLine{"\\-/|\\-/"});
 
     profiler = new LocalQmlProfilerSupport(runControl, serverUrl);
 
@@ -109,7 +109,7 @@ void LocalQmlProfilerRunnerTest::testRunner()
     serverUrl.clear();
     serverUrl = Utils::urlFromLocalHostAndFreePort();
     runControl = new RunControl(ProjectExplorer::Constants::QML_PROFILER_RUN_MODE);
-    runControl->setCommandLine({app, {}});
+    runControl->setCommandLine(CommandLine{app});
     profiler = new LocalQmlProfilerSupport(runControl, serverUrl);
     connectRunner();
     runControl->initiateStart();
diff --git a/src/plugins/qmlprojectmanager/QmlProjectManager.json.in b/src/plugins/qmlprojectmanager/QmlProjectManager.json.in
index 5df33015f48..9146e1dcfae 100644
--- a/src/plugins/qmlprojectmanager/QmlProjectManager.json.in
+++ b/src/plugins/qmlprojectmanager/QmlProjectManager.json.in
@@ -13,8 +13,8 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Qt Quick",
-    "Description" : "Qt Quick support",
-    "Url" : "http://www.qt.io",
+    "Description" : "Qt Quick support.",
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
 
     "Mimetypes" : [
diff --git a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
index 2e95eb69a98..6fa944f0753 100644
--- a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
+++ b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
@@ -6,8 +6,9 @@
 #include "../qmlprojectconstants.h"
 #include "../qmlprojectmanagertr.h"
 #include "../qmlproject.h"
+#include "projectitem/qmlprojectitem.h"
+#include "projectnode/qmlprojectnodes.h"
 
-#include <QtCore5Compat/qtextcodec.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
 
 #include <coreplugin/actionmanager/actioncontainer.h>
@@ -30,11 +31,8 @@
 #include <projectexplorer/kitaspects.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/target.h>
-
 #include <projectexplorer/projectmanager.h>
-#include <projectitem/qmlprojectitem.h>
-#include <projectnode/qmlprojectnodes.h>
+#include <projectexplorer/target.h>
 
 #include <utils/algorithm.h>
 #include <utils/filepath.h>
@@ -44,6 +42,7 @@
 #include <texteditor/textdocument.h>
 
 #include <QAction>
+#include <QtCore5Compat/qtextcodec.h>
 
 using namespace ProjectExplorer;
 namespace QmlProjectManager {
diff --git a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp
index 7a35d9f15e2..19f2f194717 100644
--- a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp
+++ b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp
@@ -49,6 +49,10 @@ QmlMainFileAspect::QmlMainFileAspect(AspectContainer *container)
             this, &QmlMainFileAspect::changeCurrentFile);
     connect(EditorManager::instance(), &EditorManager::currentDocumentStateChanged,
             this, [this] { changeCurrentFile(); });
+    connect(ProjectExplorerPlugin::instance(),
+            &ProjectExplorerPlugin::fileListChanged,
+            this,
+            &QmlMainFileAspect::updateFileComboBox);
 }
 
 QmlMainFileAspect::~QmlMainFileAspect()
@@ -56,16 +60,13 @@ QmlMainFileAspect::~QmlMainFileAspect()
     delete m_fileListCombo;
 }
 
-void QmlMainFileAspect::addToLayout(Layouting::LayoutItem &parent)
+void QmlMainFileAspect::addToLayout(Layouting::Layout &parent)
 {
     QTC_ASSERT(!m_fileListCombo, delete m_fileListCombo);
     m_fileListCombo = new QComboBox;
     m_fileListCombo->setModel(&m_fileListModel);
 
     updateFileComboBox();
-
-    connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::fileListChanged,
-            this, &QmlMainFileAspect::updateFileComboBox);
     connect(m_fileListCombo, &QComboBox::activated, this, &QmlMainFileAspect::setMainScript);
 
     parent.addItems({Tr::tr("Main QML file:"), m_fileListCombo.data()});
@@ -93,7 +94,7 @@ void QmlMainFileAspect::updateFileComboBox()
     const FilePath projectDir = m_target->project()->projectDirectory();
 
     if (mainScriptSource() == FileInProjectFile) {
-        const FilePath mainScriptInFilePath = projectDir.relativeChildPath(mainScript());
+        const FilePath mainScriptInFilePath = mainScript().relativePathFrom(projectDir);
         m_fileListModel.clear();
         m_fileListModel.appendRow(new QStandardItem(mainScriptInFilePath.toString()));
         if (m_fileListCombo)
diff --git a/src/plugins/qmlprojectmanager/qmlmainfileaspect.h b/src/plugins/qmlprojectmanager/qmlmainfileaspect.h
index 4a64055b6c4..fd875dde79c 100644
--- a/src/plugins/qmlprojectmanager/qmlmainfileaspect.h
+++ b/src/plugins/qmlprojectmanager/qmlmainfileaspect.h
@@ -42,7 +42,7 @@ public:
         Utils::FilePath currentFile;
     };
 
-    void addToLayout(Layouting::LayoutItem &parent) final;
+    void addToLayout(Layouting::Layout &parent) final;
     void toMap(Utils::Store &map) const final;
     void fromMap(const Utils::Store &map) final;
 
diff --git a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp
index 1b3238a425b..e6028e1d7d5 100644
--- a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp
+++ b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp
@@ -21,7 +21,7 @@ namespace QmlProjectManager {
 
 static bool isMultilanguagePresent()
 {
-    const QVector<ExtensionSystem::PluginSpec *> &specs = ExtensionSystem::PluginManager::plugins();
+    const ExtensionSystem::PluginSpecs &specs = ExtensionSystem::PluginManager::plugins();
     return std::find_if(specs.cbegin(), specs.cend(),
                         [](ExtensionSystem::PluginSpec *spec) {
                             return spec->name() == "MultiLanguage";
@@ -41,7 +41,7 @@ static FilePath getMultilanguageDatabaseFilePath(ProjectExplorer::Target *target
 
 static QObject *getPreviewPlugin()
 {
-    const QVector<ExtensionSystem::PluginSpec *> &specs = ExtensionSystem::PluginManager::plugins();
+    const ExtensionSystem::PluginSpecs &specs = ExtensionSystem::PluginManager::plugins();
     const auto pluginIt = std::find_if(specs.cbegin(), specs.cend(),
                                  [](const ExtensionSystem::PluginSpec *p) {
                                      return p->name() == "QmlPreview";
@@ -69,7 +69,7 @@ QmlMultiLanguageAspect::QmlMultiLanguageAspect(AspectContainer *container)
 
     connect(this, &BoolAspect::changed, this, [this] {
         for (RunControl *runControl : ProjectExplorerPlugin::allRunControls()) {
-            if (auto aspect = runControl->aspect<QmlMultiLanguageAspect>()) {
+            if (auto aspect = runControl->aspectData<QmlMultiLanguageAspect>()) {
                 if (auto origin = aspect->origin; origin == this)
                     runControl->initiateStop();
             }
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
index 9cd1bae9c67..1bc61c3b825 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
@@ -100,11 +100,6 @@ static void clearAlwaysOpenWithMode()
     ICore::settings()->remove(QmlProjectManager::Constants::ALWAYS_OPEN_UI_MODE);
 }
 
-class QmlProjectPluginPrivate
-{
-public:
-};
-
 void openQDS(const FilePath &fileName)
 {
     const FilePath qdsPath = qdsInstallationEntry();
@@ -229,6 +224,26 @@ static QmlBuildSystem *qmlBuildSystemforFileNode(const FileNode *fileNode)
     return nullptr;
 }
 
+class ExternalDesignStudioFactory : public Core::IEditorFactory
+{
+public:
+    ExternalDesignStudioFactory()
+    {
+        setId("Qt.QtDesignStudio");
+        setDisplayName(Tr::tr("Qt Design Studio"));
+        setMimeTypes({Utils::Constants::QMLUI_MIMETYPE});
+        setEditorStarter([](const FilePath &filePath, [[maybe_unused]] QString *errorMessage) {
+            openInQDSWithProject(filePath);
+            return true;
+        });
+    }
+};
+
+void setupExternalDesignStudio()
+{
+    static ExternalDesignStudioFactory theExternalDesignStudioFactory;
+}
+
 class QmlProjectPlugin final : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
@@ -274,6 +289,7 @@ private:
 void QmlProjectPlugin::initialize()
 {
     setupQmlProjectRunConfiguration();
+    setupExternalDesignStudio();
 
     if (!qmlDesignerEnabled()) {
         m_landingPage = new QdsLandingPage();
diff --git a/src/plugins/qnx/Qnx.json.in b/src/plugins/qnx/Qnx.json.in
index 0340d3b7dc1..526505401e0 100644
--- a/src/plugins/qnx/Qnx.json.in
+++ b/src/plugins/qnx/Qnx.json.in
@@ -13,7 +13,13 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Device Support",
-    "Description" : "Adds support for QNX to Qt Creator.",
-    "Url" : "http://www.blackberry.com",
+    "Description" : "Develop for QNX Neutrino devices.",
+    "LongDescription" : [
+        "Connect devices with USB or over a network to run, debug, and analyze applications built for them.",
+        "You also need:",
+            "- Qt for QNX",
+            "- QNX Software Development Platform (SDP)"
+    ],
+    "Url" : "https://www.blackberry.com",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/qnx/slog2inforunner.cpp b/src/plugins/qnx/slog2inforunner.cpp
index 999b73b82fe..b7ed28ffd21 100644
--- a/src/plugins/qnx/slog2inforunner.cpp
+++ b/src/plugins/qnx/slog2inforunner.cpp
@@ -22,7 +22,7 @@ Slog2InfoRunner::Slog2InfoRunner(RunControl *runControl)
     : RunWorker(runControl)
 {
     setId("Slog2InfoRunner");
-    m_applicationId = runControl->aspect<ExecutableAspect>()->executable.fileName();
+    m_applicationId = runControl->aspectData<ExecutableAspect>()->executable.fileName();
 
     // See QTCREATORBUG-10712 for details.
     // We need to limit length of ApplicationId to 63 otherwise it would not match one in slog2info.
@@ -35,7 +35,7 @@ void Slog2InfoRunner::start()
     QTC_CHECK(!m_taskTreeRunner.isRunning());
 
     const auto onTestSetup = [this](Process &process) {
-        process.setCommand({device()->filePath("slog2info"), {}});
+        process.setCommand(CommandLine{device()->filePath("slog2info")});
     };
     const auto onTestDone = [this](DoneWith result) {
         if (result == DoneWith::Success) {
diff --git a/src/plugins/qtapplicationmanager/CMakeLists.txt b/src/plugins/qtapplicationmanager/CMakeLists.txt
index a49279eba10..6241cb1de36 100644
--- a/src/plugins/qtapplicationmanager/CMakeLists.txt
+++ b/src/plugins/qtapplicationmanager/CMakeLists.txt
@@ -4,6 +4,7 @@ add_qtc_plugin(QtApplicationManagerIntegration
   PLUGIN_DEPENDS
     Core Debugger ProjectExplorer
     QtSupport RemoteLinux
+  PLUGIN_CLASS AppManagerPlugin
   DEPENDS Qt::Network Qt::Widgets ExtensionSystem Utils yaml-cpp
   SOURCES
     appmanagerconstants.h
diff --git a/src/plugins/qtapplicationmanager/QtApplicationManagerIntegration.json.in b/src/plugins/qtapplicationmanager/QtApplicationManagerIntegration.json.in
index 75e2ddeaf2e..e07a2e40744 100644
--- a/src/plugins/qtapplicationmanager/QtApplicationManagerIntegration.json.in
+++ b/src/plugins/qtapplicationmanager/QtApplicationManagerIntegration.json.in
@@ -15,8 +15,12 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Device Support",
-    "Description" : "Support for QtApplicationManager on a variety of different target platforms.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Run applications in Qt Application Manager.",
+    "LongDescription" : [
+        "You also need:",
+            "- Qt Application Manager"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
 
     "Mimetypes" : [
diff --git a/src/plugins/qtapplicationmanager/appmanagerplugin.cpp b/src/plugins/qtapplicationmanager/appmanagerplugin.cpp
index f100f53b344..3afd7705b4d 100644
--- a/src/plugins/qtapplicationmanager/appmanagerplugin.cpp
+++ b/src/plugins/qtapplicationmanager/appmanagerplugin.cpp
@@ -36,6 +36,7 @@ class AppManagerPlugin final : public ExtensionSystem::IPlugin
         setupAppManagerRunWorker();
         setupAppManagerDebugWorker();
         setupAppManagerQmlToolingWorker();
+        setupAppManagerPerfProfilerWorker();
     }
 };
 
diff --git a/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp b/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp
index 96c8d77e4b2..ac4b0c26c12 100644
--- a/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp
+++ b/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp
@@ -15,6 +15,8 @@
 #include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggerkitaspect.h>
 
+#include <perfprofiler/perfprofilerconstants.h>
+
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildsystem.h>
 #include <projectexplorer/buildtargetinfo.h>
@@ -53,12 +55,12 @@ public:
         });
 
         setStartModifier([this, runControl] {
-            FilePath controller = runControl->aspect<AppManagerControllerAspect>()->filePath;
-            QString appId = runControl->aspect<AppManagerIdAspect>()->value;
-            QString instanceId = runControl->aspect<AppManagerInstanceIdAspect>()->value;
-            QString documentUrl = runControl->aspect<AppManagerDocumentUrlAspect>()->value;
+            FilePath controller = runControl->aspectData<AppManagerControllerAspect>()->filePath;
+            QString appId = runControl->aspectData<AppManagerIdAspect>()->value;
+            QString instanceId = runControl->aspectData<AppManagerInstanceIdAspect>()->value;
+            QString documentUrl = runControl->aspectData<AppManagerDocumentUrlAspect>()->value;
             QStringList envVars;
-            if (auto envAspect = runControl->aspect<EnvironmentAspect>())
+            if (auto envAspect = runControl->aspectData<EnvironmentAspect>())
                 envVars = envAspect->environment.toStringList();
 
             // Always use the default environment to start the appman-controller in
@@ -99,15 +101,10 @@ public:
         setId(AppManager::Constants::DEBUG_LAUNCHER_ID);
         setEssential(true);
 
-        connect(&m_launcher, &Process::started, this, &RunWorker::reportStarted);
-        connect(&m_launcher, &Process::done, this, &RunWorker::reportStopped);
-
-        connect(&m_launcher, &Process::readyReadStandardOutput, this, [this] {
-            appendMessage(m_launcher.readAllStandardOutput(), StdOutFormat);
-        });
-        connect(&m_launcher, &Process::readyReadStandardError, this, [this] {
-            appendMessage(m_launcher.readAllStandardError(), StdErrFormat);
-        });
+        if (usePerf) {
+            suppressDefaultStdOutHandling();
+            runControl->setProperty("PerfProcess", QVariant::fromValue(process()));
+        }
 
         m_portsGatherer = new Debugger::DebugServerPortsGatherer(runControl);
         m_portsGatherer->setUseGdbServer(useGdbServer || usePerf);
@@ -115,15 +112,14 @@ public:
         addStartDependency(m_portsGatherer);
 
         setStartModifier([this, runControl] {
-            FilePath controller = runControl->aspect<AppManagerControllerAspect>()->filePath;
-            QString appId = runControl->aspect<AppManagerIdAspect>()->value;
-            QString instanceId = runControl->aspect<AppManagerInstanceIdAspect>()->value;
-            QString documentUrl = runControl->aspect<AppManagerDocumentUrlAspect>()->value;
+            FilePath controller = runControl->aspectData<AppManagerControllerAspect>()->filePath;
+            QString appId = runControl->aspectData<AppManagerIdAspect>()->value;
+            QString instanceId = runControl->aspectData<AppManagerInstanceIdAspect>()->value;
+            QString documentUrl = runControl->aspectData<AppManagerDocumentUrlAspect>()->value;
             QStringList envVars;
-            if (auto envAspect = runControl->aspect<EnvironmentAspect>())
+            if (auto envAspect = runControl->aspectData<EnvironmentAspect>())
                 envVars = envAspect->environment.toStringList();
 
-//            const int perfPort = m_portsGatherer->gdbServer().port();
             const int gdbServerPort = m_portsGatherer->gdbServer().port();
             const int qmlServerPort = m_portsGatherer->qmlServer().port();
 
@@ -147,14 +143,10 @@ public:
                 }
                 cmd.addArg(debugArgs.join(' '));
             }
-            //FIXME UNTESTED CODE
             if (m_usePerf) {
-                Store settingsData = runControl->settingsData("Analyzer.Perf.Settings");
-                QVariant perfRecordArgs = settingsData.value("Analyzer.Perf.RecordArguments");
-                QString args =  Utils::transform(perfRecordArgs.toStringList(), [](QString arg) {
-                                   return arg.replace(',', ",,");
-                               }).join(',');
-                cmd.addArg(QString("perf record %1 -o - --").arg(args));
+                const Store perfArgs = runControl->settingsData(PerfProfiler::Constants::PerfSettingsId);
+                const QString recordArgs = perfArgs[PerfProfiler::Constants::PerfRecordArgsId].toString();
+                cmd.addArg(QString("perf record %1 -o - --").arg(recordArgs));
             }
 
             cmd.addArg("-eio");
@@ -185,7 +177,6 @@ private:
     bool m_useGdbServer;
     bool m_useQmlServer;
     QmlDebug::QmlDebugServicesPreset m_qmlServices;
-    Process m_launcher;
 };
 
 
@@ -300,6 +291,25 @@ private:
     RunWorker *m_worker = nullptr;
 };
 
+// AppManagerDevicePerfProfilerSupport
+
+class AppManagerPerfProfilerSupport final : public RunWorker
+{
+public:
+    explicit AppManagerPerfProfilerSupport(RunControl *runControl)
+        : RunWorker(runControl)
+    {
+        setId("AppManagerPerfProfilerSupport");
+
+        m_profilee = new AppManInferiorRunner(runControl, true, false, false,
+                                              QmlDebug::NoQmlDebugServices);
+        addStartDependency(m_profilee);
+        addStopDependency(m_profilee);
+    }
+
+private:
+    AppManInferiorRunner *m_profilee = nullptr;
+};
 
 // Factories
 
@@ -338,6 +348,17 @@ public:
     }
 };
 
+class AppManagerPerfProfilerWorkerFactory final : public RunWorkerFactory
+{
+public:
+    AppManagerPerfProfilerWorkerFactory()
+    {
+        setProduct<AppManagerPerfProfilerSupport>();
+        addSupportedRunMode("PerfRecorder");
+        addSupportedRunConfig(Constants::RUNANDDEBUGCONFIGURATION_ID);
+    }
+};
+
 void setupAppManagerRunWorker()
 {
     static AppManagerRunWorkerFactory theAppManagerRunWorkerFactory;
@@ -353,4 +374,9 @@ void setupAppManagerQmlToolingWorker()
     static AppManagerQmlToolingWorkerFactory theAppManagerQmlToolingWorkerFactory;
 }
 
+void setupAppManagerPerfProfilerWorker()
+{
+    static AppManagerPerfProfilerWorkerFactory theAppManagerPerfProfilerWorkerFactory;
+}
+
 } // AppManager::Internal
diff --git a/src/plugins/qtapplicationmanager/appmanagerruncontrol.h b/src/plugins/qtapplicationmanager/appmanagerruncontrol.h
index b98f462c291..3530d4d10b4 100644
--- a/src/plugins/qtapplicationmanager/appmanagerruncontrol.h
+++ b/src/plugins/qtapplicationmanager/appmanagerruncontrol.h
@@ -10,5 +10,6 @@ namespace AppManager::Internal {
 void setupAppManagerRunWorker();
 void setupAppManagerDebugWorker();
 void setupAppManagerQmlToolingWorker();
+void setupAppManagerPerfProfilerWorker();
 
 } // AppManager::Internal
diff --git a/src/plugins/qtsupport/QtSupport.json.in b/src/plugins/qtsupport/QtSupport.json.in
index 0a39a762ce1..af3bed662a1 100644
--- a/src/plugins/qtsupport/QtSupport.json.in
+++ b/src/plugins/qtsupport/QtSupport.json.in
@@ -14,7 +14,7 @@
     ],
     "Category" : "Build Systems",
     "Description" : "Provides support code for build systems.",
-    "Url" : "http://www.qt.io",
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
 
     "Mimetypes" : [
diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp
index bb424077855..bd73137b00d 100644
--- a/src/plugins/qtsupport/exampleslistmodel.cpp
+++ b/src/plugins/qtsupport/exampleslistmodel.cpp
@@ -28,12 +28,14 @@
 #include <utils/stylehelper.h>
 
 #include <QLoggingCategory>
-#include <algorithm>
-#include <memory>
 
 using namespace Core;
 using namespace Utils;
 
+const int kQtVersionIdRole = Qt::UserRole;
+const int kExtraSetIndexRole = Qt::UserRole + 1;
+const int kVersionRole = Qt::UserRole + 2;
+
 namespace QtSupport {
 namespace Internal {
 
@@ -112,43 +114,62 @@ ExampleSetModel::ExampleSetModel()
             &ExampleSetModel::helpManagerInitialized);
 }
 
-void ExampleSetModel::recreateModel(const QtVersions &qtVersions)
+void ExampleSetModel::recreateModel(const QtVersions &qtVersionsIn)
 {
     beginResetModel();
     clear();
 
     QHash<FilePath, int> extraManifestDirs;
-    for (int i = 0; i < m_extraExampleSets.size(); ++i)  {
+    for (int i = 0; i < m_extraExampleSets.size(); ++i)
+        extraManifestDirs.insert(FilePath::fromUserInput(m_extraExampleSets.at(i).manifestPath), i);
+
+    // Sanitize away qt versions that have already been added through extra sets.
+    // This way we do not have entries for Qt/Android, Qt/Desktop, Qt/MinGW etc pp,
+    // but only the one "QtX X.Y.Z" entry that is registered as an example set by the installer.
+    const QtVersions qtVersions
+        = Utils::filtered(qtVersionsIn, [this, &extraManifestDirs](QtVersion *v) {
+              if (extraManifestDirs.contains(v->docsPath())) {
+                  m_extraExampleSets[extraManifestDirs.value(v->docsPath())].qtVersion
+                      = v->qtVersion();
+                  qCDebug(log) << "Not showing Qt version because manifest path is already added "
+                                  "through InstalledExamples settings:"
+                               << v->displayName();
+                  return false;
+              }
+              return true;
+          });
+
+    QList<QStandardItem *> items;
+    for (int i = 0; i < m_extraExampleSets.size(); ++i) {
         const ExtraExampleSet &set = m_extraExampleSets.at(i);
         auto newItem = new QStandardItem();
         newItem->setData(set.displayName, Qt::DisplayRole);
-        newItem->setData(set.displayName, Qt::UserRole + 1);
-        newItem->setData(QVariant(), Qt::UserRole + 2);
-        newItem->setData(i, Qt::UserRole + 3);
-        appendRow(newItem);
-
-        extraManifestDirs.insert(FilePath::fromUserInput(set.manifestPath), i);
+        newItem->setData(QVariant(), kQtVersionIdRole);
+        newItem->setData(i, kExtraSetIndexRole);
+        newItem->setData(QVariant::fromValue(set.qtVersion), kVersionRole);
+        items.append(newItem);
     }
-
-    for (QtVersion *version : qtVersions) {
-        // Sanitize away qt versions that have already been added through extra sets.
-        // This way we do not have entries for Qt/Android, Qt/Desktop, Qt/MinGW etc pp,
-        // but only the one "QtX X.Y.Z" entry that is registered as an example set by the installer.
-        if (extraManifestDirs.contains(version->docsPath())) {
-            m_extraExampleSets[extraManifestDirs.value(version->docsPath())].qtVersion
-                = version->qtVersion();
-            qCDebug(log) << "Not showing Qt version because manifest path is already added "
-                            "through InstalledExamples settings:"
-                         << version->displayName();
-            continue;
-        }
+    items += Utils::transform(qtVersions, [](QtVersion *v) {
         auto newItem = new QStandardItem();
-        newItem->setData(version->displayName(), Qt::DisplayRole);
-        newItem->setData(version->displayName(), Qt::UserRole + 1);
-        newItem->setData(version->uniqueId(), Qt::UserRole + 2);
-        newItem->setData(QVariant(), Qt::UserRole + 3);
-        appendRow(newItem);
-    }
+        newItem->setData(v->displayName(), Qt::DisplayRole);
+        newItem->setData(v->uniqueId(), kQtVersionIdRole);
+        newItem->setData(QVariant(), kExtraSetIndexRole);
+        newItem->setData(QVariant::fromValue(v->qtVersion()), kVersionRole);
+        return newItem;
+    });
+
+    // Sort by Qt version, example sets not associated to Qt last
+    Utils::sort(items, [](QStandardItem *a, QStandardItem *b) {
+        const QVersionNumber versionB = b->data(kVersionRole).value<QVersionNumber>();
+        const QVersionNumber versionA = a->data(kVersionRole).value<QVersionNumber>();
+        if (versionA != versionB)
+            return versionA < versionB;
+        return a->data(Qt::DisplayRole).toString() < b->data(Qt::DisplayRole).toString();
+    });
+
+    for (QStandardItem *item : std::as_const(items))
+        appendRow(item);
+
     endResetModel();
 }
 
@@ -179,7 +200,7 @@ QVariant ExampleSetModel::getDisplayName(int i) const
 {
     if (i < 0 || i >= rowCount())
         return QVariant();
-    return data(index(i, 0), Qt::UserRole + 1);
+    return data(index(i, 0), Qt::DisplayRole);
 }
 
 // id is either the Qt version uniqueId, or the display name of the extra example set
@@ -188,7 +209,7 @@ QVariant ExampleSetModel::getId(int i) const
     if (i < 0 || i >= rowCount())
         return QVariant();
     QModelIndex modelIndex = index(i, 0);
-    QVariant variant = data(modelIndex, Qt::UserRole + 2);
+    QVariant variant = data(modelIndex, kQtVersionIdRole);
     if (variant.isValid()) // set from qt version
         return variant;
     return getDisplayName(i);
@@ -199,7 +220,7 @@ ExampleSetModel::ExampleSetType ExampleSetModel::getType(int i) const
     if (i < 0 || i >= rowCount())
         return InvalidExampleSet;
     QModelIndex modelIndex = index(i, 0);
-    QVariant variant = data(modelIndex, Qt::UserRole + 2); /*Qt version uniqueId*/
+    QVariant variant = data(modelIndex, kQtVersionIdRole); /*Qt version uniqueId*/
     if (variant.isValid())
         return QtExampleSet;
     return ExtraExampleSetType;
@@ -209,7 +230,7 @@ int ExampleSetModel::getQtId(int i) const
 {
     QTC_ASSERT(i >= 0, return -1);
     QModelIndex modelIndex = index(i, 0);
-    QVariant variant = data(modelIndex, Qt::UserRole + 2);
+    QVariant variant = data(modelIndex, kQtVersionIdRole);
     QTC_ASSERT(variant.isValid(), return -1);
     QTC_ASSERT(variant.canConvert<int>(), return -1);
     return variant.toInt();
@@ -224,7 +245,7 @@ int ExampleSetModel::getExtraExampleSetIndex(int i) const
 {
     QTC_ASSERT(i >= 0, return -1);
     QModelIndex modelIndex = index(i, 0);
-    QVariant variant = data(modelIndex, Qt::UserRole + 3);
+    QVariant variant = data(modelIndex, kExtraSetIndexRole);
     QTC_ASSERT(variant.isValid(), return -1);
     QTC_ASSERT(variant.canConvert<int>(), return -1);
     return variant.toInt();
diff --git a/src/plugins/qtsupport/externaleditors.cpp b/src/plugins/qtsupport/externaleditors.cpp
index 4009025b8dc..47200a6aeb3 100644
--- a/src/plugins/qtsupport/externaleditors.cpp
+++ b/src/plugins/qtsupport/externaleditors.cpp
@@ -118,12 +118,6 @@ static QString locateBinary(const QString &path, const QString &binary)
     return {};
 }
 
-static QString msgStartFailed(const QString &binary, QStringList arguments)
-{
-    arguments.push_front(binary);
-    return Tr::tr("Unable to start \"%1\"").arg(arguments.join(QLatin1Char(' ')));
-}
-
 static QString designerBinary(const QtSupport::QtVersion *qtVersion)
 {
     if (qtVersion)
@@ -227,12 +221,11 @@ static bool startEditorProcess(const LaunchData &data, QString *errorMessage)
 {
     if (debug)
         qDebug() << Q_FUNC_INFO << '\n' << data.binary << data.arguments << data.workingDirectory;
-    qint64 pid = 0;
-    if (!Process::startDetached({FilePath::fromString(data.binary), data.arguments}, data.workingDirectory, &pid)) {
-        *errorMessage = msgStartFailed(data.binary, data.arguments);
-        return false;
-    }
-    return true;
+    const CommandLine cmd{FilePath::fromString(data.binary), data.arguments};
+    if (Process::startDetached(cmd, data.workingDirectory))
+        return true;
+    *errorMessage = Tr::tr("Unable to start \"%1\".").arg(cmd.toUserOutput());
+    return false;
 }
 
 // ExternalDesignerEditorFactory with Designer Tcp remote control.
@@ -263,7 +256,7 @@ public:
     explicit ExternalDesignerFactory(QObject *guard)
     {
         setId("Qt.Designer");
-        setDisplayName(::Core::Tr::tr("Qt Designer"));
+        setDisplayName(::Core::Tr::tr("Qt Widgets Designer"));
         setMimeTypes({Utils::Constants::FORM_MIMETYPE});
 
         setEditorStarter([guard](const FilePath &filePath, QString *errorMessage) {
@@ -276,7 +269,7 @@ public:
             if (HostOsInfo::isMacHost())
                 return startEditorProcess(data, errorMessage);
 
-            /* Qt Designer on the remaining platforms: Uses Designer's own
+            /* Qt Widgets Designer on the remaining platforms: Uses Designer's own
             * Tcp-based communication mechanism to ensure all files are opened
             * in one instance (per version). */
 
@@ -288,7 +281,8 @@ public:
                     qDebug() << Q_FUNC_INFO << "\nWriting to socket:" << data.binary << filePath;
                 QTcpSocket *socket = it.value();
                 if (!socket->write(filePath.toString().toUtf8() + '\n')) {
-                    *errorMessage = Tr::tr("Qt Designer is not responding (%1).").arg(socket->errorString());
+                    *errorMessage = Tr::tr("Qt Widgets Designer is not responding (%1).")
+                                        .arg(socket->errorString());
                     return false;
                 }
                 return true;
diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp
index f02a433fbe7..1240c9bbd33 100644
--- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp
+++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp
@@ -279,7 +279,7 @@ public:
 
         using namespace Layouting;
         Row titleRow {
-            customMargin({0, 0, ExVPaddingGapXl, 0}),
+            customMargins(0, 0, ExVPaddingGapXl, 0),
             spacing(ExVPaddingGapXl),
         };
 
@@ -317,7 +317,7 @@ public:
             titleRow,
             gridView,
             spacing(ExVPaddingGapXl),
-            customMargin({ExVPaddingGapXl, ExVPaddingGapXl, 0, 0}),
+            customMargins(ExVPaddingGapXl, ExVPaddingGapXl, 0, 0),
         }.attachTo(this);
 
         connect(&m_exampleDelegate, &ExampleDelegate::tagClicked,
diff --git a/src/plugins/qtsupport/qtbuildaspects.cpp b/src/plugins/qtsupport/qtbuildaspects.cpp
index 2f6ee192206..2f7d966ba6f 100644
--- a/src/plugins/qtsupport/qtbuildaspects.cpp
+++ b/src/plugins/qtsupport/qtbuildaspects.cpp
@@ -30,12 +30,12 @@ QmlDebuggingAspect::QmlDebuggingAspect(AspectContainer *container)
     setValue(buildPropertiesSettings().qmlDebugging());
 }
 
-void QmlDebuggingAspect::addToLayout(Layouting::LayoutItem &parent)
+void QmlDebuggingAspect::addToLayout(Layouting::Layout &parent)
 {
     SelectionAspect::addToLayout(parent);
     const auto warningLabel = createSubWidget<InfoLabel>(QString(), InfoLabel::Warning);
     warningLabel->setElideMode(Qt::ElideNone);
-    parent.addRow({{}, warningLabel});
+    parent.addRow({Layouting::empty, warningLabel});
     const auto changeHandler = [this, warningLabel] {
         QString warningText;
         QTC_ASSERT(m_buildConfig, return);
@@ -78,13 +78,13 @@ void QtQuickCompilerAspect::setBuildConfiguration(const BuildConfiguration *buil
     m_buildConfig = buildConfig;
 }
 
-void QtQuickCompilerAspect::addToLayout(Layouting::LayoutItem &parent)
+void QtQuickCompilerAspect::addToLayout(Layouting::Layout &parent)
 {
     SelectionAspect::addToLayout(parent);
     const auto warningLabel = createSubWidget<InfoLabel>(QString(), InfoLabel::Warning);
     warningLabel->setElideMode(Qt::ElideNone);
     warningLabel->setVisible(false);
-    parent.addRow({{}, warningLabel});
+    parent.addRow({Layouting::empty, warningLabel});
     const auto changeHandler = [this, warningLabel] {
         QString warningText;
         QTC_ASSERT(m_buildConfig, return);
diff --git a/src/plugins/qtsupport/qtbuildaspects.h b/src/plugins/qtsupport/qtbuildaspects.h
index 873daf000d2..e112e6a60bb 100644
--- a/src/plugins/qtsupport/qtbuildaspects.h
+++ b/src/plugins/qtsupport/qtbuildaspects.h
@@ -21,7 +21,7 @@ public:
     void setBuildConfiguration(const ProjectExplorer::BuildConfiguration *newBuildConfig);
 
 private:
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     const ProjectExplorer::BuildConfiguration *m_buildConfig = nullptr;
 };
@@ -36,7 +36,7 @@ public:
     void setBuildConfiguration(const ProjectExplorer::BuildConfiguration *newBuildConfig);
 
 private:
-    void addToLayout(Layouting::LayoutItem &parent) override;
+    void addToLayout(Layouting::Layout &parent) override;
 
     const ProjectExplorer::BuildConfiguration *m_buildConfig = nullptr;
 };
diff --git a/src/plugins/qtsupport/qtcreator_tutorials.xml b/src/plugins/qtsupport/qtcreator_tutorials.xml
index af657454432..b17b0def6a0 100644
--- a/src/plugins/qtsupport/qtcreator_tutorials.xml
+++ b/src/plugins/qtsupport/qtcreator_tutorials.xml
@@ -16,14 +16,14 @@
     </tutorial>
     <tutorial imageUrl=":qtsupport/images/icons/tutorialicon.png" difficulty="" docUrl="qthelp://org.qt-project.qtcreator/doc/creator-writing-program.html" projectPath="" name="Creating a Qt Widget-Based Application">
       <description><![CDATA[Using Qt Creator to create a small Qt application, Text Finder.]]></description>
-      <tags>qt creator,qt designer,widgets,c++,text,help</tags>
+      <tags>qt creator,qt widgets designer,widgets,c++,text,help</tags>
       <meta>
         <entry name="category">Help</entry>
       </meta>
     </tutorial>
     <tutorial imageUrl=":qtsupport/images/icons/tutorialicon.png" difficulty="" docUrl="qthelp://org.qt-project.qtdoc/qtwidgets/qtwidgets-tutorials-notepad-example.html" projectPath="" name="Getting Started Programming with Qt Widgets">
       <description><![CDATA[Developing Qt applications using C++ and the Qt Widgets module.]]></description>
-      <tags>qt,qt creator,qt designer,widgets,c++,help</tags>
+      <tags>qt,qt creator,qt widgets designer,widgets,c++,help</tags>
       <meta>
         <entry name="category">Help</entry>
       </meta>
@@ -66,7 +66,7 @@
     </tutorial>
     <tutorial imageUrl=":qtsupport/images/icons/youtubeLnVjI0I7cKs.webp" difficulty="" projectPath="" name="Qt Creator - Design and Edit Modes" isVideo="true" videoUrl="https://www.youtube.com/watch?v=LnVjI0I7cKs" videoLength="4:34">
       <description><![CDATA[Developing a Qt Widgets application.]]></description>
-      <tags>qt creator,learning,qt designer,coding,2023</tags>
+      <tags>qt creator,learning,qt widgets designer,coding,2023</tags>
       <meta>
         <entry name="category">Learning</entry>
       </meta>
@@ -276,9 +276,9 @@
         <entry name="category">Talk</entry>
       </meta>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/youtubeB0X5FOev9Lw.webp" difficulty="" projectPath="" name="Qt Designer tutorial: Integrate custom widgets" isVideo="true" videoUrl="https://youtu.be/B0X5FOev9Lw" videoLength="27:07">
-      <description><![CDATA[Integrating custom widgets into Qt Designer.]]></description>
-      <tags>qt designer,widgets,ui,talk,2019</tags>
+    <tutorial imageUrl=":qtsupport/images/icons/youtubeB0X5FOev9Lw.webp" difficulty="" projectPath="" name="Qt Widgets Designer tutorial: Integrate custom widgets" isVideo="true" videoUrl="https://youtu.be/B0X5FOev9Lw" videoLength="27:07">
+      <description><![CDATA[Integrating custom widgets into Qt Widgets Designer.]]></description>
+      <tags>qt widgets designer,widgets,ui,talk,2019</tags>
       <meta>
         <entry name="category">Talk</entry>
       </meta>
diff --git a/src/plugins/qtsupport/qtkitaspect.cpp b/src/plugins/qtsupport/qtkitaspect.cpp
index 8059c1059a3..1608b31b845 100644
--- a/src/plugins/qtsupport/qtkitaspect.cpp
+++ b/src/plugins/qtsupport/qtkitaspect.cpp
@@ -62,7 +62,7 @@ public:
 private:
     void makeReadOnly() final { m_combo->setEnabled(false); }
 
-    void addToLayoutImpl(Layouting::LayoutItem &parent) override
+    void addToLayoutImpl(Layouting::Layout &parent) override
     {
         addMutableAction(m_combo);
         parent.addItem(m_combo);
@@ -364,7 +364,7 @@ int QtKitAspect::qtVersionId(const Kit *k)
 
     int id = -1;
     QVariant data = k->value(QtKitAspect::id(), -1);
-    if (data.typeId() == QVariant::Int) {
+    if (data.typeId() == QMetaType::Int) {
         bool ok;
         id = data.toInt(&ok);
         if (!ok)
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp
index 7b08db2351a..3be1bc2570b 100644
--- a/src/plugins/qtsupport/qtoptionspage.cpp
+++ b/src/plugins/qtsupport/qtoptionspage.cpp
@@ -1036,7 +1036,7 @@ void QtSettingsPageWidget::linkWithQt()
     dialog.exec();
     if (dialog.result() == QDialog::Accepted) {
         const std::optional<FilePath> settingsDir = settingsDirForQtDir(pathInput->baseDirectory(),
-                                                                        pathInput->rawFilePath());
+                                                                        pathInput->unexpandedFilePath());
         if (QTC_GUARD(settingsDir)) {
             const QString settingsFilePath = settingsFile(ICore::resourcePath().toString());
             QSettings settings(settingsFilePath, QSettings::IniFormat);
diff --git a/src/plugins/qtsupport/qtparser.cpp b/src/plugins/qtsupport/qtparser.cpp
index 387af762a3b..93fd16d90a5 100644
--- a/src/plugins/qtsupport/qtparser.cpp
+++ b/src/plugins/qtsupport/qtparser.cpp
@@ -45,7 +45,7 @@ Utils::OutputLineParser::Result QtParser::handleLine(const QString &line, Utils:
         LinkSpecs linkSpecs;
         const Utils::FilePath file
                 = absoluteFilePath(Utils::FilePath::fromUserInput(match.captured("file")));
-        addLinkSpecForAbsoluteFilePath(linkSpecs, file, lineno, match, "file");
+        addLinkSpecForAbsoluteFilePath(linkSpecs, file, lineno, -1, match, "file");
         CompileTask task(type, match.captured("description").trimmed(), file, lineno);
         task.column = match.captured("column").toInt();
         scheduleTask(task, 1);
@@ -62,7 +62,7 @@ Utils::OutputLineParser::Result QtParser::handleLine(const QString &line, Utils:
             message.prepend(": ").prepend(fileName);
         } else if (fileName.endsWith(".ui")) {
             filePath = absoluteFilePath(Utils::FilePath::fromUserInput(fileName));
-            addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, -1, match, "file");
+            addLinkSpecForAbsoluteFilePath(linkSpecs, filePath, -1, -1, match, "file");
         } else {
             isUicMessage = false;
         }
@@ -79,7 +79,7 @@ Utils::OutputLineParser::Result QtParser::handleLine(const QString &line, Utils:
         LinkSpecs linkSpecs;
         const Utils::FilePath file
                 = absoluteFilePath(Utils::FilePath::fromUserInput(match.captured("file")));
-        addLinkSpecForAbsoluteFilePath(linkSpecs, file, 0, match, "file");
+        addLinkSpecForAbsoluteFilePath(linkSpecs, file, -1, -1, match, "file");
         CompileTask task(type, match.captured("description"), file);
         scheduleTask(task, 1);
         return {Status::Done, linkSpecs};
@@ -95,7 +95,7 @@ Utils::OutputLineParser::Result QtParser::handleLine(const QString &line, Utils:
         if (!ok)
             lineno = -1;
         LinkSpecs linkSpecs;
-        addLinkSpecForAbsoluteFilePath(linkSpecs, file, lineno, match, "file");
+        addLinkSpecForAbsoluteFilePath(linkSpecs, file, lineno, -1, match, "file");
         CompileTask task(type, match.captured("description"), file, lineno,
                          match.captured("column").toInt());
         scheduleTask(task, 1);
diff --git a/src/plugins/qtsupport/qttestparser.cpp b/src/plugins/qtsupport/qttestparser.cpp
index 93030f20e68..a19929b7544 100644
--- a/src/plugins/qtsupport/qttestparser.cpp
+++ b/src/plugins/qtsupport/qttestparser.cpp
@@ -44,8 +44,8 @@ OutputLineParser::Result QtTestParser::handleLine(const QString &line, OutputFor
         m_currentTask.file = absoluteFilePath(FilePath::fromString(
                     QDir::fromNativeSeparators(match.captured("file"))));
         m_currentTask.line = match.captured("line").toInt();
-        addLinkSpecForAbsoluteFilePath(linkSpecs, m_currentTask.file, m_currentTask.line, match,
-                                       "file");
+        addLinkSpecForAbsoluteFilePath(
+            linkSpecs, m_currentTask.file, m_currentTask.line, m_currentTask.column, match, "file");
         emitCurrentTask();
         return {Status::Done, linkSpecs};
     }
diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp
index c269eca3cc5..2a309b67b2a 100644
--- a/src/plugins/qtsupport/qtversionmanager.cpp
+++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -230,7 +230,7 @@ bool QtVersionManagerImpl::restoreQtVersions()
         if (!key.view().startsWith(keyPrefix))
             continue;
         bool ok;
-        int count = key.toByteArray().mid(keyPrefix.count()).toInt(&ok);
+        int count = key.toByteArray().mid(keyPrefix.size()).toInt(&ok);
         if (!ok || count < 0)
             continue;
 
@@ -304,7 +304,7 @@ void QtVersionManagerImpl::updateFromInstaller(bool emitSignal)
         if (!key.view().startsWith(keyPrefix))
             continue;
         bool ok;
-        int count = key.toByteArray().mid(keyPrefix.count()).toInt(&ok);
+        int count = key.toByteArray().mid(keyPrefix.size()).toInt(&ok);
         if (!ok || count < 0)
             continue;
 
diff --git a/src/plugins/qtsupport/translationwizardpage.cpp b/src/plugins/qtsupport/translationwizardpage.cpp
index bde480edd09..214996792f1 100644
--- a/src/plugins/qtsupport/translationwizardpage.cpp
+++ b/src/plugins/qtsupport/translationwizardpage.cpp
@@ -76,7 +76,7 @@ TranslationWizardPage::TranslationWizardPage(const QString &enabledExpr, bool si
     auto localeStrings = transform<QList<LocalePair>>(allLocales,
                 [](const QLocale &l) {
                     const QString displayName = QLocale::languageToString(l.language()).append(" (")
-                            .append(QLocale::countryToString(l.country())).append(')');
+                            .append(QLocale::territoryToString(l.territory())).append(')');
                     const QString tsFileBaseName = l.name();
                     return qMakePair(displayName, tsFileBaseName);
                 });
diff --git a/src/plugins/remotelinux/RemoteLinux.json.in b/src/plugins/remotelinux/RemoteLinux.json.in
index 2345b5acab3..944cf8057d3 100644
--- a/src/plugins/remotelinux/RemoteLinux.json.in
+++ b/src/plugins/remotelinux/RemoteLinux.json.in
@@ -13,7 +13,12 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Device Support",
-    "Description" : "Support for deployment to and execution on a remote Linux host.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Develop applications for embedded Linux devices.",
+    "LongDescription" : [
+        "Connect devices with USB or over a network to run, debug, and analyze applications built for them.",
+        "You also need:",
+            "- A toolchain for embedded development"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/remotelinux/customcommanddeploystep.cpp b/src/plugins/remotelinux/customcommanddeploystep.cpp
index 97826fde5e9..2850e59f0cf 100644
--- a/src/plugins/remotelinux/customcommanddeploystep.cpp
+++ b/src/plugins/remotelinux/customcommanddeploystep.cpp
@@ -31,8 +31,6 @@ public:
         commandLine.setHistoryCompleter("RemoteLinuxCustomCommandDeploymentStep.History");
 
         setInternalInitializer([this] { return isDeploymentPossible(); });
-
-        addMacroExpander();
     }
 
     expected_str<void> isDeploymentPossible() const final;
diff --git a/src/plugins/remotelinux/filesystemaccess_test.cpp b/src/plugins/remotelinux/filesystemaccess_test.cpp
index 0f2e5bd9379..b9e77f79e93 100644
--- a/src/plugins/remotelinux/filesystemaccess_test.cpp
+++ b/src/plugins/remotelinux/filesystemaccess_test.cpp
@@ -188,7 +188,7 @@ void FileSystemAccessTest::testWorkingDirectory()
     const FilePath dir = baseFilePath() / "testdir with space and 'various' \"quotes\" here";
     QVERIFY(dir.ensureWritableDir());
     Process proc;
-    proc.setCommand({"pwd", {}});
+    proc.setCommand(CommandLine{"pwd"});
     proc.setWorkingDirectory(dir);
     proc.start();
     QVERIFY(proc.waitForFinished());
diff --git a/src/plugins/remotelinux/genericdeploystep.cpp b/src/plugins/remotelinux/genericdeploystep.cpp
index 3d1f0e5e3ab..cba80697f08 100644
--- a/src/plugins/remotelinux/genericdeploystep.cpp
+++ b/src/plugins/remotelinux/genericdeploystep.cpp
@@ -101,7 +101,7 @@ GroupItem GenericDeployStep::mkdirTask(const Storage<FilesToTransfer> &storage)
         const int numResults = async.future().resultCount();
         if (numResults == 0) {
             addErrorMessage(
-                Tr::tr("Unknown error occurred while trying to create remote directories") + '\n');
+                Tr::tr("Unknown error occurred while trying to create remote directories.") + '\n');
             return;
         }
 
@@ -176,12 +176,16 @@ GroupItem GenericDeployStep::transferTask(const Storage<FilesToTransfer> &storag
     const auto onError = [this](const FileTransfer &transfer) {
         const ProcessResultData result = transfer.resultData();
         if (result.m_error == QProcess::FailedToStart) {
-            addErrorMessage(Tr::tr("rsync failed to start: %1").arg(result.m_errorString));
+            addErrorMessage(Tr::tr("%1 failed to start: %2")
+                                .arg(transfer.transferMethodName(), result.m_errorString));
         } else if (result.m_exitStatus == QProcess::CrashExit) {
-            addErrorMessage(Tr::tr("rsync crashed."));
+            addErrorMessage(Tr::tr("%1 crashed.").arg(transfer.transferMethodName()));
         } else if (result.m_exitCode != 0) {
-            addErrorMessage(Tr::tr("rsync failed with exit code %1.").arg(result.m_exitCode)
-                            + "\n" + result.m_errorString);
+            addErrorMessage(
+                Tr::tr("%1 failed with exit code %2.")
+                    .arg(transfer.transferMethodName())
+                    .arg(result.m_exitCode)
+                + "\n" + result.m_errorString);
         }
     };
     return FileTransferTask(onSetup, onError, CallDoneIf::Error);
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
index 8afafabdeda..f89767de0a3 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
@@ -105,6 +105,13 @@ GenericLinuxDeviceConfigurationWidget::GenericLinuxDeviceConfigurationWidget(
     auto sshPortLabel = new QLabel(Tr::tr("&SSH port:"));
     sshPortLabel->setBuddy(m_sshPortSpinBox);
 
+    m_useSshPortForwardingForDebugging = new QCheckBox;
+    m_useSshPortForwardingForDebugging->setText(Tr::tr("Use SSH port forwarding for debugging"));
+    m_useSshPortForwardingForDebugging
+        ->setToolTip(Tr::tr("Enable debugging on remote targes which cannot expose gdbserver ports.\n"
+                            "The ssh tunneling is used to map the remote gdbserver port to localhost.\n"
+                            "The local and remote ports are determined automatically."));
+
     using namespace Layouting;
 
     Form {
@@ -117,7 +124,8 @@ GenericLinuxDeviceConfigurationWidget::GenericLinuxDeviceConfigurationWidget(
         Tr::tr("GDB server executable:"), m_gdbServerLineEdit, br,
         Tr::tr("QML runtime executable:"), m_qmlRuntimeLineEdit, br,
         QString(), m_sourceProfileCheckBox, br,
-        Tr::tr("Access via:"), m_linkDeviceComboBox
+        QString(), m_useSshPortForwardingForDebugging, br,
+        Tr::tr("Access via:"), m_linkDeviceComboBox, br,
     }.attachTo(this);
 
     connect(m_hostLineEdit, &QLineEdit::editingFinished,
@@ -152,6 +160,8 @@ GenericLinuxDeviceConfigurationWidget::GenericLinuxDeviceConfigurationWidget(
             this, &GenericLinuxDeviceConfigurationWidget::sourceProfileCheckingChanged);
     connect(m_linkDeviceComboBox, &QComboBox::currentIndexChanged,
             this, &GenericLinuxDeviceConfigurationWidget::linkDeviceChanged);
+    connect(m_useSshPortForwardingForDebugging, &QCheckBox::toggled,
+            this, &GenericLinuxDeviceConfigurationWidget::sshPortForwardingForDebugging);
 
     initGui();
 }
@@ -253,6 +263,11 @@ void GenericLinuxDeviceConfigurationWidget::linkDeviceChanged(int index)
     device()->setExtraData(Constants::LinkDevice, deviceId);
 }
 
+void GenericLinuxDeviceConfigurationWidget::sshPortForwardingForDebugging(bool on)
+{
+    device()->setExtraData(Constants::SshForwardDebugServerPort, on);
+}
+
 void GenericLinuxDeviceConfigurationWidget::updateDeviceFromUi()
 {
     hostNameEditingFinished();
@@ -266,6 +281,7 @@ void GenericLinuxDeviceConfigurationWidget::updateDeviceFromUi()
     timeoutEditingFinished();
     sourceProfileCheckingChanged(m_sourceProfileCheckBox->isChecked());
     linkDeviceChanged(m_linkDeviceComboBox->currentIndex());
+    sshPortForwardingForDebugging(m_useSshPortForwardingForDebugging->isChecked());
     qmlRuntimeEditingFinished();
 }
 
@@ -331,6 +347,7 @@ void GenericLinuxDeviceConfigurationWidget::initGui()
         sshParams.authenticationType == SshParameters::AuthenticationTypeSpecificKey);
     m_gdbServerLineEdit->setFilePath(device()->debugServerPath());
     m_qmlRuntimeLineEdit->setFilePath(device()->qmlRunCommand());
+    m_useSshPortForwardingForDebugging->setChecked(device()->extraData(Constants::SshForwardDebugServerPort).toBool());
 
     updatePortsWarningLabel();
 }
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h
index aba251b969e..cc007ec6efa 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h
@@ -45,6 +45,7 @@ private:
     void hostKeyCheckingChanged(bool doCheck);
     void sourceProfileCheckingChanged(bool doCheck);
     void linkDeviceChanged(int index);
+    void sshPortForwardingForDebugging(bool on);
 
     void updateDeviceFromUi() override;
     void updatePortsWarningLabel();
@@ -66,6 +67,7 @@ private:
     Utils::PathChooser *m_qmlRuntimeLineEdit;
     QCheckBox *m_sourceProfileCheckBox;
     QComboBox *m_linkDeviceComboBox;
+    QCheckBox *m_useSshPortForwardingForDebugging;
 };
 
 } // RemoteLinux::Internal
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index d49ab25e96b..c4b21a1f413 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -23,7 +23,10 @@
 #include <projectexplorer/devicesupport/sshsettings.h>
 #include <projectexplorer/projectexplorerconstants.h>
 
+#include <solutions/tasking/tasktreerunner.h>
+
 #include <utils/algorithm.h>
+#include <utils/async.h>
 #include <utils/devicefileaccess.h>
 #include <utils/deviceshell.h>
 #include <utils/environment.h>
@@ -31,11 +34,12 @@
 #include <utils/infobar.h>
 #include <utils/port.h>
 #include <utils/portlist.h>
-#include <utils/qtcprocess.h>
 #include <utils/processinfo.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/stringutils.h>
 #include <utils/temporaryfile.h>
+#include <utils/threadutils.h>
 
 #include <QApplication>
 #include <QDateTime>
@@ -54,6 +58,8 @@ using namespace Utils;
 
 namespace RemoteLinux {
 
+const char DisconnectedKey[] = "Disconnected";
+
 const QByteArray s_pidMarker = "__qtc";
 
 static Q_LOGGING_CATEGORY(linuxDeviceLog, "qtc.remotelinux.device", QtWarningMsg);
@@ -360,9 +366,13 @@ Environment LinuxDevicePrivate::getEnvironment()
     if (m_environmentCache.has_value())
         return m_environmentCache.value();
 
+    if (m_disconnected)
+        return {};
+
     Process getEnvProc;
-    getEnvProc.setCommand({q->filePath("env"), {}});
-    getEnvProc.runBlocking();
+    getEnvProc.setCommand(CommandLine{q->filePath("env")});
+    using namespace std::chrono;
+    getEnvProc.runBlocking(5s);
 
     const QString remoteOutput = getEnvProc.cleanedStdOut();
     m_environmentCache = Environment(remoteOutput.split('\n', Qt::SkipEmptyParts), q->osType());
@@ -466,12 +476,10 @@ qint64 SshProcessInterface::processId() const
 ProcessResult SshProcessInterface::runInShell(const CommandLine &command, const QByteArray &data)
 {
     Process process;
-    CommandLine cmd = {d->m_device->filePath("/bin/sh"), {"-c"}};
     QString tmp;
     ProcessArgs::addArg(&tmp, command.executable().path());
     ProcessArgs::addArgs(&tmp, command.arguments());
-    cmd.addArg(tmp);
-    process.setCommand(cmd);
+    process.setCommand({d->m_device->filePath("/bin/sh"), {"-c", tmp}});
     process.setWriteData(data);
     using namespace std::chrono_literals;
     process.runBlocking(2s);
@@ -520,7 +528,7 @@ void SshProcessInterface::handleSendControlSignal(ControlSignal controlSignal)
     QTC_ASSERT(pid, return); // TODO: try sending a signal based on process name
     const QString args = QString::fromLatin1("-%1 -%2")
             .arg(controlSignalToInt(controlSignal)).arg(pid);
-    const CommandLine command = { "kill", args, CommandLine::Raw };
+    const CommandLine command{"kill", args, CommandLine::Raw};
 
     // Killing by using the pid as process group didn't work
     // Fallback to killing the pid directly
@@ -528,7 +536,7 @@ void SshProcessInterface::handleSendControlSignal(ControlSignal controlSignal)
     if (runInShell(command, {}) != ProcessResult::FinishedWithSuccess) {
         const QString args = QString::fromLatin1("-%1 %2")
                                  .arg(controlSignalToInt(controlSignal)).arg(pid);
-        const CommandLine command = { "kill" , args, CommandLine::Raw };
+        const CommandLine command{"kill" , args, CommandLine::Raw};
         runInShell(command, {});
     }
 }
@@ -666,6 +674,12 @@ void SshProcessInterfacePrivate::start()
             cmd.addCommandLineAsSingleArg(inner);
         }
 
+        const auto forwardPort = q->m_setup.m_extraData.value(Constants::SshForwardPort).toString();
+        if (!forwardPort.isEmpty()) {
+            cmd.addArg("-L");
+            cmd.addArg(QString("%1:localhost:%1").arg(forwardPort));
+        }
+
         m_process.setProcessImpl(q->m_setup.m_processImpl);
         m_process.setProcessMode(q->m_setup.m_processMode);
         m_process.setTerminalMode(q->m_setup.m_terminalMode);
@@ -680,11 +694,12 @@ void SshProcessInterfacePrivate::start()
         return;
     }
 
-    m_useConnectionSharing = SshSettings::connectionSharingEnabled();
+    m_useConnectionSharing = SshSettings::connectionSharingEnabled() && !q->m_setup.m_extraData.value(Constants::DisableSharing).toBool();
 
     // TODO: Do we really need it for master process?
     m_sshParameters.x11DisplayName
             = q->m_setup.m_extraData.value("Ssh.X11ForwardToDisplay").toString();
+
     if (m_useConnectionSharing) {
         m_connecting = true;
         m_connectionHandle.reset(new SshConnectionHandle(m_device));
@@ -695,6 +710,14 @@ void SshProcessInterfacePrivate::start()
                 this, &SshProcessInterfacePrivate::handleDisconnected);
         auto linuxDevice = std::dynamic_pointer_cast<const LinuxDevice>(m_device);
         QTC_ASSERT(linuxDevice, handleDone(); return);
+        if (linuxDevice->isDisconnected()) {
+            emit q->done(
+                {-1,
+                 QProcess::CrashExit,
+                 QProcess::FailedToStart,
+                 Tr::tr("Device \"%1\" is disconnected.").arg(linuxDevice->displayName())});
+            return;
+        }
         linuxDevice->connectionAccess()
             ->attachToSharedConnection(m_connectionHandle.get(), m_sshParameters);
     } else {
@@ -769,6 +792,12 @@ CommandLine SshProcessInterfacePrivate::fullLocalCommandLine() const
 
     cmd.addArg("-q");
 
+    const auto forwardPort = q->m_setup.m_extraData.value(Constants::SshForwardPort).toString();
+    if (!forwardPort.isEmpty()) {
+        cmd.addArg("-L");
+        cmd.addArg(QString("%1:localhost:%1").arg(forwardPort));
+    }
+
     cmd.addArgs(m_sshParameters.connectionOptions(sshBinary));
     if (!m_socketFilePath.isEmpty())
         cmd.addArgs({"-o", "ControlPath=" + m_socketFilePath});
@@ -1022,7 +1051,7 @@ LinuxDevice::LinuxDevice()
         // specify the shell executable.
         const QString shell = env.hasChanges() ? env.value_or("SHELL", "/bin/sh") : QString();
 
-        proc->setCommand({filePath(shell), {}});
+        proc->setCommand(CommandLine{filePath(shell)});
         proc->setTerminalMode(TerminalMode::Run);
         proc->setEnvironment(env);
         proc->setWorkingDirectory(workingDir);
@@ -1047,6 +1076,19 @@ LinuxDevice::LinuxDevice()
                      }});
 }
 
+void LinuxDevice::fromMap(const Utils::Store &map)
+{
+    IDevice::fromMap(map);
+    d->m_disconnected = map.value(DisconnectedKey, false).toBool();
+}
+
+Store LinuxDevice::toMap() const
+{
+    Store map = IDevice::toMap();
+    map.insert(DisconnectedKey, d->m_disconnected);
+    return map;
+}
+
 void LinuxDevice::_setOsType(Utils::OsType osType)
 {
     qCDebug(linuxDeviceLog) << "Setting OS type to" << osType << "for" << displayName();
@@ -1175,8 +1217,10 @@ void LinuxDevicePrivate::checkOsType()
 // Call me with shell mutex locked
 bool LinuxDevicePrivate::setupShell(const SshParameters &sshParameters, bool announce)
 {
-    if (m_handler->isRunning(sshParameters))
+    if (m_handler->isRunning(sshParameters)) {
+        setDisconnected(false);
         return true;
+    }
 
     invalidateEnvironmentCache();
 
@@ -1216,25 +1260,20 @@ RunResult LinuxDevicePrivate::runInShell(const CommandLine &cmd, const QByteArra
 
 void LinuxDevicePrivate::announceConnectionAttempt()
 {
-    const auto announce = [id = announceId(), name = q->displayName()] {
-        Core::ICore::infoBar()->addInfo(
-            InfoBarEntry(id,
-                         Tr::tr("Establishing initial connection to device \"%1\". "
-                                "This might take a moment.")
-                             .arg(name)));
+    const QString message = Tr::tr("Establishing initial connection to device \"%1\". "
+                                   "This might take a moment.").arg(q->displayName());
+    qCDebug(linuxDeviceLog) << message;
+    if (isMainThread()) {
+        Core::ICore::infoBar()->addInfo(InfoBarEntry(announceId(), message));
         QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
         QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents); // Yes, twice.
-    };
-    if (QThread::currentThread() == qApp->thread())
-        announce();
-    else
-        QMetaObject::invokeMethod(Core::ICore::infoBar(), announce, Qt::BlockingQueuedConnection);
+    }
 }
 
 void LinuxDevicePrivate::unannounceConnectionAttempt()
 {
-    QMetaObject::invokeMethod(Core::ICore::infoBar(),
-                              [id = announceId()] { Core::ICore::infoBar()->removeInfo(id); });
+    if (isMainThread())
+        Core::ICore::infoBar()->removeInfo(announceId());
 }
 
 bool LinuxDevicePrivate::checkDisconnectedWithWarning()
@@ -1298,7 +1337,7 @@ static FilePaths dirsToCreate(const FilesToTransfer &files)
 
 static QByteArray transferCommand(bool link)
 {
-    return link ? "ln -s" : "put";
+    return link ? "ln -s" : "put -R";
 }
 
 class SshTransferInterface : public FileTransferInterface
@@ -1470,7 +1509,7 @@ private:
             if (file.m_targetPermissions == FilePermissions::ForceExecutable)
                 batchData += "chmod 1775 " + target + '\n';
         }
-        process().setCommand({sftpBinary, fullConnectionOptions() << "-b" << "-" << host()});
+        process().setCommand({sftpBinary, {fullConnectionOptions(), "-b", "-", host()}});
         process().setWriteData(batchData);
         process().start();
     }
@@ -1519,7 +1558,7 @@ private:
             const auto batchIt = m_batches.begin();
             for (auto filesIt = batchIt->cbegin(); filesIt != batchIt->cend(); ++filesIt) {
                 const FileToTransfer fixedFile = fixLocalFileOnWindows(*filesIt, options);
-                options << fixedLocalPath(fixedFile.m_source);
+                options << fixedFile.m_source.path();
             }
             options << fixedRemotePath(batchIt.key(), userAtHost());
             m_batches.erase(batchIt);
@@ -1549,11 +1588,6 @@ private:
         return fixedFile;
     }
 
-    QString fixedLocalPath(const FilePath &file) const
-    {
-        return file.isDir() && file.path().back() != '/' ? file.path() + '/' : file.path();
-    }
-
     QString fixedRemotePath(const FilePath &file, const QString &remoteHost) const
     {
         return remoteHost + ':' + file.path();
@@ -1562,8 +1596,28 @@ private:
     QHash<FilePath, FilesToTransfer> m_batches;
 };
 
+static void createDir(QPromise<expected_str<void>> &promise, const FilePath &pathToCreate)
+{
+    const expected_str<void> result = pathToCreate.ensureWritableDir();
+    promise.addResult(result);
+
+    if (!result)
+        promise.future().cancel();
+};
+
+static void copyFile(QPromise<expected_str<void>> &promise, const FileToTransfer &file)
+{
+    const expected_str<void> result = file.m_source.copyFile(file.m_target);
+    promise.addResult(result);
+
+    if (!result)
+        promise.future().cancel();
+};
+
 class GenericTransferImpl : public FileTransferInterface
 {
+    Tasking::TaskTreeRunner m_taskTree;
+
 public:
     GenericTransferImpl(const FileTransferSetupData &setup)
         : FileTransferInterface(setup)
@@ -1572,56 +1626,77 @@ public:
 private:
     void start() final
     {
-        m_fileCount = m_setup.m_files.size();
-        m_currentIndex = 0;
-        m_checkedDirectories.clear();
-        nextFile();
-    }
+        using namespace Tasking;
 
-    void nextFile()
-    {
-        ProcessResultData result;
-        if (m_currentIndex >= m_fileCount) {
-            emit done(result);
-            return;
-        }
+        const QSet<FilePath> allParentDirs
+            = Utils::transform<QSet>(m_setup.m_files, [](const FileToTransfer &f) {
+                  return f.m_target.parentDir();
+              });
 
-        const FileToTransfer &file = m_setup.m_files.at(m_currentIndex);
-        const FilePath &source = file.m_source;
-        const FilePath &target = file.m_target;
-        ++m_currentIndex;
+        const LoopList iteratorParentDirs(QList(allParentDirs.cbegin(), allParentDirs.cend()));
 
-        const FilePath targetDir = target.parentDir();
-        if (!m_checkedDirectories.contains(targetDir)) {
-            emit progress(Tr::tr("Creating directory: %1\n").arg(targetDir.toUserOutput()));
-            if (!targetDir.ensureWritableDir()) {
-                result.m_errorString = Tr::tr("Failed.");
-                result.m_exitCode = -1; // Random pick
-                emit done(result);
-                return;
+        const auto onCreateDirSetup = [iteratorParentDirs](Async<expected_str<void>> &async) {
+            async.setConcurrentCallData(createDir, *iteratorParentDirs);
+        };
+
+        const auto onCreateDirDone = [this,
+                                      iteratorParentDirs](const Async<expected_str<void>> &async) {
+            const expected_str<void> result = async.result();
+            if (result)
+                emit progress(
+                    Tr::tr("Created directory: \"%1\".\n").arg(iteratorParentDirs->toUserOutput()));
+            else
+                emit progress(result.error());
+        };
+
+        const LoopList iterator(m_setup.m_files);
+        const Storage<int> counterStorage;
+
+        const auto onCopySetup = [iterator](Async<expected_str<void>> &async) {
+            async.setConcurrentCallData(copyFile, *iterator);
+        };
+
+        const auto onCopyDone = [this, iterator, counterStorage](
+                                    const Async<expected_str<void>> &async) {
+            const expected_str<void> result = async.result();
+            int &counter = *counterStorage;
+            ++counter;
+
+            if (result) {
+                //: %1/%2 = progress in the form 4/15, %3 and %4 = source and target file paths
+                emit progress(Tr::tr("Copied %1/%2: \"%3\" -> \"%4\".\n")
+                                  .arg(counter)
+                                  .arg(m_setup.m_files.size())
+                                  .arg(iterator->m_source.toUserOutput())
+                                  .arg(iterator->m_target.toUserOutput()));
+            } else {
+                emit progress(result.error() + "\n");
             }
-            m_checkedDirectories.insert(targetDir);
-        }
+        };
 
-        emit progress(Tr::tr("Copying %1/%2: %3 -> %4\n")
-                          .arg(m_currentIndex)
-                          .arg(m_fileCount)
-                          .arg(source.toUserOutput(), target.toUserOutput()));
-        expected_str<void> copyResult = source.copyFile(target);
-        if (!copyResult) {
-            result.m_errorString = Tr::tr("Failed: %1").arg(copyResult.error());
-            result.m_exitCode = -1; // Random pick
-            emit done(result);
-            return;
-        }
+        const Group group{
+            Group{
+                parallelIdealThreadCountLimit,
+                iteratorParentDirs,
+                AsyncTask<expected_str<void>>(onCreateDirSetup, onCreateDirDone),
+            },
+            Group{
+                parallelLimit(2),
+                iterator,
+                counterStorage,
+                AsyncTask<expected_str<void>>(onCopySetup, onCopyDone),
+            },
+        };
 
-        // FIXME: Use asyncCopyFile instead
-        QMetaObject::invokeMethod(this, &GenericTransferImpl::nextFile, Qt::QueuedConnection);
+        m_taskTree.start(group, {}, [this](DoneWith result) {
+            ProcessResultData resultData;
+            if (result != DoneWith::Success) {
+                resultData.m_exitCode = -1;
+                resultData.m_errorString = Tr::tr("Failed to deploy files.");
+            }
+            emit done(resultData);
+        });
     }
-
-    int m_currentIndex = 0;
-    int m_fileCount = 0;
-    QSet<FilePath> m_checkedDirectories;
 };
 
 FileTransferInterface *LinuxDevice::createFileTransferInterface(
diff --git a/src/plugins/remotelinux/linuxdevice.h b/src/plugins/remotelinux/linuxdevice.h
index 06e0da3f2a8..48c22c52619 100644
--- a/src/plugins/remotelinux/linuxdevice.h
+++ b/src/plugins/remotelinux/linuxdevice.h
@@ -55,6 +55,9 @@ public:
 protected:
     LinuxDevice();
 
+    void fromMap(const Utils::Store &map) override;
+    Utils::Store toMap() const override;
+
     void _setOsType(Utils::OsType osType);
 
     class LinuxDevicePrivate *d;
diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp
index aa79244c736..f2900a22158 100644
--- a/src/plugins/remotelinux/linuxdevicetester.cpp
+++ b/src/plugins/remotelinux/linuxdevicetester.cpp
@@ -7,8 +7,6 @@
 #include "remotelinuxtr.h"
 #include "utils/async.h"
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <projectexplorer/devicesupport/deviceusedportsgatherer.h>
 #include <projectexplorer/devicesupport/filetransfer.h>
 #include <projectexplorer/projectexplorerconstants.h>
@@ -16,9 +14,10 @@
 #include <solutions/tasking/tasktreerunner.h>
 
 #include <utils/algorithm.h>
-#include <utils/qtcprocess.h>
+#include <utils/async.h>
 #include <utils/processinterface.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/stringutils.h>
 
 using namespace ProjectExplorer;
@@ -28,11 +27,6 @@ using namespace Utils;
 namespace RemoteLinux {
 namespace Internal {
 
-struct TransferStorage
-{
-    bool useGenericCopy = false;
-};
-
 class GenericLinuxDeviceTesterPrivate
 {
 public:
@@ -44,8 +38,7 @@ public:
     GroupItem echoTask(const QString &contents) const;
     GroupItem unameTask() const;
     GroupItem gathererTask() const;
-    GroupItem transferTask(FileTransferMethod method,
-                           const Storage<TransferStorage> &storage) const;
+    GroupItem transferTask(FileTransferMethod method) const;
     GroupItem transferTasks() const;
     GroupItem commandTasks() const;
 
@@ -101,13 +94,12 @@ GroupItem GenericLinuxDeviceTesterPrivate::connectionTask() const
     const auto onSetup = [this](Async<bool> &task) {
         emit q->progressMessage(Tr::tr("Connecting to device..."));
         task.setConcurrentCallData([device = m_device] { return device->tryToConnect(); });
-        task.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
     };
     const auto onDone = [this](const Async<bool> &task) {
         const bool success = task.isResultAvailable() && task.result();
         if (success) {
             // TODO: For master: move the '\n' outside of Tr().
-            emit q->progressMessage(Tr::tr("Connected. Now doing extended checks.\n"));
+            emit q->progressMessage(Tr::tr("Connected. Now doing extended checks.") + "\n");
         } else {
             emit q->errorMessage(
                 Tr::tr("Basic connectivity test failed, device is considered unusable.") + '\n');
@@ -194,8 +186,7 @@ GroupItem GenericLinuxDeviceTesterPrivate::gathererTask() const
     };
 }
 
-GroupItem GenericLinuxDeviceTesterPrivate::transferTask(FileTransferMethod method,
-                                           const Storage<TransferStorage> &storage) const
+GroupItem GenericLinuxDeviceTesterPrivate::transferTask(FileTransferMethod method) const
 {
     const auto onSetup = [this, method](FileTransfer &transfer) {
         emit q->progressMessage(Tr::tr("Checking whether \"%1\" works...")
@@ -203,7 +194,7 @@ GroupItem GenericLinuxDeviceTesterPrivate::transferTask(FileTransferMethod metho
         transfer.setTransferMethod(method);
         transfer.setTestDevice(m_device);
     };
-    const auto onDone = [this, method, storage](const FileTransfer &transfer, DoneWith result) {
+    const auto onDone = [this, method](const FileTransfer &transfer, DoneWith result) {
         const QString methodName = FileTransfer::transferMethodName(method);
         if (result == DoneWith::Success) {
             emit q->progressMessage(Tr::tr("\"%1\" is functional.\n").arg(methodName));
@@ -211,8 +202,6 @@ GroupItem GenericLinuxDeviceTesterPrivate::transferTask(FileTransferMethod metho
                 m_device->setExtraData(Constants::SUPPORTS_RSYNC, true);
             else if (method == FileTransferMethod::Sftp)
                 m_device->setExtraData(Constants::SUPPORTS_SFTP, true);
-            else
-                storage->useGenericCopy = true;
             return;
         }
         const ProcessResultData resultData = transfer.resultData();
@@ -253,13 +242,11 @@ GroupItem GenericLinuxDeviceTesterPrivate::transferTask(FileTransferMethod metho
 
 GroupItem GenericLinuxDeviceTesterPrivate::transferTasks() const
 {
-    Storage<TransferStorage> storage;
     return Group {
         continueOnSuccess,
-        storage,
-        transferTask(FileTransferMethod::GenericCopy, storage),
-        transferTask(FileTransferMethod::Sftp, storage),
-        transferTask(FileTransferMethod::Rsync, storage),
+        transferTask(FileTransferMethod::GenericCopy),
+        transferTask(FileTransferMethod::Sftp),
+        transferTask(FileTransferMethod::Rsync),
         onGroupDone([this] {
             emit q->errorMessage(Tr::tr("Deployment to this device will not work out of the box.")
                                  + "\n");
diff --git a/src/plugins/remotelinux/makeinstallstep.cpp b/src/plugins/remotelinux/makeinstallstep.cpp
index 38edbb6791e..8b678bea961 100644
--- a/src/plugins/remotelinux/makeinstallstep.cpp
+++ b/src/plugins/remotelinux/makeinstallstep.cpp
@@ -245,7 +245,7 @@ void MakeInstallStep::updateArgsFromAspect()
 
 void MakeInstallStep::updateFullCommandLine()
 {
-    CommandLine cmd{makeExecutable(), userArguments(), CommandLine::Raw};
+    const CommandLine cmd{makeExecutable(), userArguments(), CommandLine::Raw};
     m_fullCommand.setValue(cmd.toUserOutput());
 }
 
diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.cpp b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
index d3ade682cb2..b0da7f2b1d0 100644
--- a/src/plugins/remotelinux/publickeydeploymentdialog.cpp
+++ b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
@@ -112,7 +112,7 @@ PublicKeyDeploymentDialog::~PublicKeyDeploymentDialog()
 void PublicKeyDeploymentDialog::handleDeploymentDone(bool succeeded, const QString &errorMessage)
 {
     QString buttonText = succeeded ? Tr::tr("Deployment finished successfully.") : errorMessage;
-    const QString textColor = creatorTheme()->color(
+    const QString textColor = creatorColor(
                 succeeded ? Theme::TextColorNormal : Theme::TextColorError).name();
     setLabelText(QString::fromLatin1("<font color=\"%1\">%2</font>")
             .arg(textColor, buttonText.replace("\n", "<br/>")));
diff --git a/src/plugins/remotelinux/remotelinux_constants.h b/src/plugins/remotelinux/remotelinux_constants.h
index 90e34826469..a562164dfdc 100644
--- a/src/plugins/remotelinux/remotelinux_constants.h
+++ b/src/plugins/remotelinux/remotelinux_constants.h
@@ -21,6 +21,9 @@ const char KillAppStepId[] = "RemoteLinux.KillAppStep";
 
 const char SourceProfile[] = "RemoteLinux.SourceProfile";
 const char LinkDevice[] = "RemoteLinux.LinkDevice";
+const char SshForwardDebugServerPort[] = "RemoteLinux.SshForwardDebugServerPort";
+const char SshForwardPort[] = "RemoteLinux.SshForwardPort";
+const char DisableSharing[] = "RemoteLinux.DisableSharing";
 
 const char RunConfigId[] = "RemoteLinuxRunConfiguration:";
 const char CustomRunConfigId[] = "RemoteLinux.CustomRunConfig";
diff --git a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp
index 95e68a64854..9eaa1471d22 100644
--- a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp
+++ b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp
@@ -5,6 +5,7 @@
 
 #include "remotelinuxtr.h"
 
+#include <projectexplorer/projectexplorersettings.h>
 #include <utils/commandline.h>
 #include <utils/fileutils.h>
 #include <utils/qtcprocess.h>
@@ -50,8 +51,10 @@ static QString signalProcessGroupByNameCommandLine(const QString &filePath, int
 
 QString RemoteLinuxSignalOperation::killProcessByNameCommandLine(const QString &filePath) const
 {
-    return QString::fromLatin1("%1; %2").arg(signalProcessGroupByNameCommandLine(filePath, 15),
-                                             signalProcessGroupByNameCommandLine(filePath, 9));
+    return QString::fromLatin1("%1; sleep %2; %3")
+        .arg(signalProcessGroupByNameCommandLine(filePath, 15))
+        .arg(projectExplorerSettings().reaperTimeoutInSeconds)
+        .arg(signalProcessGroupByNameCommandLine(filePath, 9));
 }
 
 QString RemoteLinuxSignalOperation::interruptProcessByNameCommandLine(const QString &filePath) const
diff --git a/src/plugins/remotelinux/sshdevicewizard.cpp b/src/plugins/remotelinux/sshdevicewizard.cpp
index d73e146957e..2cf001cd175 100644
--- a/src/plugins/remotelinux/sshdevicewizard.cpp
+++ b/src/plugins/remotelinux/sshdevicewizard.cpp
@@ -19,6 +19,7 @@
 #include <utils/utilsicons.h>
 
 #include <QLabel>
+#include <QLayout>
 #include <QPushButton>
 #include <QSpinBox>
 
diff --git a/src/plugins/remotelinux/sshkeycreationdialog.cpp b/src/plugins/remotelinux/sshkeycreationdialog.cpp
index 03c6f7a543f..a94a56cf61e 100644
--- a/src/plugins/remotelinux/sshkeycreationdialog.cpp
+++ b/src/plugins/remotelinux/sshkeycreationdialog.cpp
@@ -110,11 +110,11 @@ void SshKeyCreationDialog::generateKeys()
     const QString keyTypeString = QLatin1String(m_rsa->isChecked() ? "rsa": "ecdsa");
     QApplication::setOverrideCursor(Qt::BusyCursor);
     Process keygen;
-    const QStringList args{"-t", keyTypeString, "-b", m_comboBox->currentText(),
-                "-N", QString(), "-f", privateKeyFilePath().path()};
-    QString errorMsg;
-    keygen.setCommand({SshSettings::keygenFilePath(), args});
+    keygen.setCommand({SshSettings::keygenFilePath(),
+        {"-t", keyTypeString, "-b", m_comboBox->currentText(), "-N", QString(), "-f",
+         privateKeyFilePath().path()}});
     keygen.start();
+    QString errorMsg;
     if (!keygen.waitForFinished())
         errorMsg = keygen.errorString();
     else if (keygen.exitCode() != 0)
diff --git a/src/plugins/resourceeditor/ResourceEditor.json.in b/src/plugins/resourceeditor/ResourceEditor.json.in
index be3ace268a7..d5cf9f55958 100644
--- a/src/plugins/resourceeditor/ResourceEditor.json.in
+++ b/src/plugins/resourceeditor/ResourceEditor.json.in
@@ -13,8 +13,11 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Qt Creator",
-    "Description" : "Editor for qrc files.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Edit Qt Resource System (.qrc) files.",
+    "LongDescription" : [
+        "Store files in the application's executable with the platform-independent Qt Resource System."
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
 
     "Mimetypes" : [
diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
index 38ee38fedf6..bfc68e89d13 100644
--- a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
+++ b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
@@ -795,7 +795,7 @@ QVariant ResourceModel::data(const QModelIndex &index, int role) const
             // File node
             Q_ASSERT(file);
             if (!file->exists())
-                result = Utils::creatorTheme()->color(Utils::Theme::TextColorError);
+                result = Utils::creatorColor(Utils::Theme::TextColorError);
         }
         break;
     default:
diff --git a/src/plugins/saferenderer/SafeRenderer.json.in b/src/plugins/saferenderer/SafeRenderer.json.in
index ae60bb3f020..0823bad8d8d 100644
--- a/src/plugins/saferenderer/SafeRenderer.json.in
+++ b/src/plugins/saferenderer/SafeRenderer.json.in
@@ -14,7 +14,15 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Device Support",
-    "Description" : "Helper plugin for Qt Safe Renderer projects.",
+    "Description" : "Render safety-critical items in functional safety systems.",
+    "LongDescription" : [
+        "Qt Safe Renderer separates the safety-critical rendering from the other parts of the system, so it can render safety-critical UI elements even if there are failures in the main UI. Therefore, you can use Qt in a system requiring certification without changing the Qt libraries.",
+        "You also need:",
+            "- Qt Safe Renderer",
+            "- A Qt version supported by the Qt Safe Renderer"
+    ],
     "Url" : "https://www.qt.io",
-    ${IDE_PLUGIN_DEPENDENCIES}
+    ${IDE_PLUGIN_DEPENDENCIES},
+
+    "JsonWizardPaths" : [":/saferenderer/wizards/"]
 }
diff --git a/src/plugins/saferenderer/saferenderer.cpp b/src/plugins/saferenderer/saferenderer.cpp
index 115b7c8728b..d87ba118e18 100644
--- a/src/plugins/saferenderer/saferenderer.cpp
+++ b/src/plugins/saferenderer/saferenderer.cpp
@@ -20,9 +20,6 @@ bool SafeRendererPlugin::initialize(const QStringList &arguments, QString *error
     Q_UNUSED(arguments)
     Q_UNUSED(errorString)
 
-    // Add Qt Creator project wizard path
-    ProjectExplorer::JsonWizardFactory::addWizardPath(":/saferenderer/wizards/");
-
     return true;
 }
 
diff --git a/src/plugins/screenrecorder/ScreenRecorder.json.in b/src/plugins/screenrecorder/ScreenRecorder.json.in
index 671147ff0dc..e4e2deb214b 100644
--- a/src/plugins/screenrecorder/ScreenRecorder.json.in
+++ b/src/plugins/screenrecorder/ScreenRecorder.json.in
@@ -14,7 +14,8 @@
     ],
     "DisabledByDefault" : true,
     "SoftLoadable" : true,
-    "Description" : "Screen recording.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Record screens.",
+    "LongDescription" : [],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/screenrecorder/cropandtrim.cpp b/src/plugins/screenrecorder/cropandtrim.cpp
index 4f65469e62b..14f4c7fb4ad 100644
--- a/src/plugins/screenrecorder/cropandtrim.cpp
+++ b/src/plugins/screenrecorder/cropandtrim.cpp
@@ -324,7 +324,7 @@ CropWidget::CropWidget(QWidget *parent)
             saveImageButton,
             copyImageToClipboardButton,
         },
-        noMargin(),
+        noMargin,
     }.attachTo(this);
 
     connect(m_xSpinBox, &QSpinBox::valueChanged, this, &CropWidget::onSpinBoxChanged);
@@ -526,19 +526,19 @@ TrimWidget::TrimWidget(const ClipInfo &clip, QWidget *parent)
 
     using namespace Layouting;
     Column {
-        Row { m_frameSlider, m_currentTime, "/", m_clipDuration },
+        Row { m_frameSlider, m_currentTime, QString("/"), m_clipDuration },
         Group {
             title(Tr::tr("Trimming")),
             Row {
                 m_trimStart.button, m_trimStart.timeLabel,
                 Space(20),
                 m_trimEnd.button, m_trimEnd.timeLabel,
-                Stretch(), Space(20),
+                st, Space(20),
                 Tr::tr("Range:"), m_trimRange,
                 m_trimResetButton,
             },
         },
-        noMargin(),
+        noMargin,
     }.attachTo(this);
 
     connect(m_frameSlider, &QSlider::valueChanged, this, [this] {
@@ -652,7 +652,7 @@ CropAndTrimDialog::CropAndTrimDialog(const ClipInfo &clip, QWidget *parent)
     using namespace Layouting;
     Column {
         Group {
-            title("Cropping"),
+            title(Tr::tr("Cropping")),
             Column { m_cropWidget },
         },
         Space(16),
@@ -698,7 +698,7 @@ void CropAndTrimDialog::startFrameFetch()
     if (m_nextFetchFrame == -1)
         return;
 
-    const CommandLine cl = {
+    const CommandLine cl{
         Internal::settings().ffmpegTool(),
         {
             "-v", "error",
@@ -760,7 +760,7 @@ CropAndTrimWidget::CropAndTrimWidget(QWidget *parent)
     Row {
         m_button,
         m_cropSizeWarningIcon,
-        noMargin(), spacing(0),
+        noMargin, spacing(0),
     }.attachTo(this);
 
     connect(m_button, &QPushButton::clicked, this, [this] {
diff --git a/src/plugins/screenrecorder/export.cpp b/src/plugins/screenrecorder/export.cpp
index 15f38993adc..00daed94a88 100644
--- a/src/plugins/screenrecorder/export.cpp
+++ b/src/plugins/screenrecorder/export.cpp
@@ -144,7 +144,7 @@ ExportWidget::ExportWidget(QWidget *parent)
     exportButton->setText(Tr::tr("Export..."));
 
     using namespace Layouting;
-    Row { st, new StyledSeparator, exportButton, noMargin(), spacing(0) }.attachTo(this);
+    Row { st, new StyledSeparator, exportButton, noMargin, spacing(0) }.attachTo(this);
 
     connect(exportButton, &QToolButton::clicked, this, [this] {
         FilePathAspect &lastDir = Internal::settings().exportLastDirectory;
diff --git a/src/plugins/screenrecorder/ffmpegutils.cpp b/src/plugins/screenrecorder/ffmpegutils.cpp
index fa0a6f45ae7..9f1abb8ec80 100644
--- a/src/plugins/screenrecorder/ffmpegutils.cpp
+++ b/src/plugins/screenrecorder/ffmpegutils.cpp
@@ -152,7 +152,7 @@ static QVersionNumber parseVersionNumber(const QByteArray &toolOutput)
 QVersionNumber toolVersion()
 {
     Process proc;
-    const CommandLine cl = {
+    const CommandLine cl{
         Internal::settings().ffprobeTool(),
         {
             "-v", "quiet",
@@ -201,7 +201,7 @@ static ClipInfo parseClipInfo(const QByteArray &toolOutput)
 ClipInfo clipInfo(const FilePath &path)
 {
     Process proc;
-    const CommandLine cl = {
+    const CommandLine cl{
         Internal::settings().ffprobeTool(),
         {
             "-v", "quiet",
diff --git a/src/plugins/screenrecorder/record.cpp b/src/plugins/screenrecorder/record.cpp
index aba61ed2eba..70e1d5e2758 100644
--- a/src/plugins/screenrecorder/record.cpp
+++ b/src/plugins/screenrecorder/record.cpp
@@ -21,6 +21,7 @@
 #include <QAction>
 #include <QDialogButtonBox>
 #include <QGuiApplication>
+#include <QLayout>
 #include <QLoggingCategory>
 #include <QMessageBox>
 #include <QScreen>
@@ -224,7 +225,7 @@ RecordWidget::RecordWidget(const FilePath &recordFile, QWidget *parent)
         st,
         progressLabel,
         Space(6),
-        noMargin(), spacing(0),
+        noMargin, spacing(0),
     }.attachTo(this);
 
     connect(settingsButton, &QToolButton::clicked, this, [this] {
diff --git a/src/plugins/screenrecorder/screenrecorderplugin.cpp b/src/plugins/screenrecorder/screenrecorderplugin.cpp
index a816a276bcf..d7f93066e69 100644
--- a/src/plugins/screenrecorder/screenrecorderplugin.cpp
+++ b/src/plugins/screenrecorder/screenrecorderplugin.cpp
@@ -29,6 +29,7 @@
 #include <coreplugin/icore.h>
 
 #include <QDialog>
+#include <QLayout>
 
 using namespace Utils;
 using namespace Core;
@@ -56,7 +57,7 @@ public:
         Column {
             m_recordWidget,
             Row { m_cropAndTrimStatusWidget, m_exportWidget },
-            noMargin(), spacing(0),
+            noMargin, spacing(0),
         }.attachTo(this);
 
         auto setLowerRowEndabled = [this] (bool enabled) {
@@ -86,6 +87,7 @@ public:
         });
 
         m_spinner = new SpinnerSolution::Spinner(SpinnerSolution::SpinnerSize::Medium, this);
+        m_spinner->setColor(creatorColor(Theme::IconsBaseColor));
         m_spinner->hide();
 
         layout()->setSizeConstraint(QLayout::SetFixedSize);
diff --git a/src/plugins/scxmleditor/ScxmlEditor.json.in b/src/plugins/scxmleditor/ScxmlEditor.json.in
index 3b4351f78b1..56093750dd8 100644
--- a/src/plugins/scxmleditor/ScxmlEditor.json.in
+++ b/src/plugins/scxmleditor/ScxmlEditor.json.in
@@ -13,8 +13,11 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Modeling",
-    "Description" : "Visual Editor for SCXML (State Chart XML) files.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Create SCXML (State Chart XML) files.",
+    "LongDescription" : [
+        "Visualize how a system reacts to events. State charts define the states that the system can be in, and how the system can move from one state to another."
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
 
     "Mimetypes" : [
diff --git a/src/plugins/scxmleditor/common/graphicsview.cpp b/src/plugins/scxmleditor/common/graphicsview.cpp
index cfb45caf135..cd8bfd4bd17 100644
--- a/src/plugins/scxmleditor/common/graphicsview.cpp
+++ b/src/plugins/scxmleditor/common/graphicsview.cpp
@@ -175,8 +175,8 @@ void GraphicsView::dragMoveEvent(QDragMoveEvent *event)
 
         ScxmlTag *targetTag = nullptr;
 
-        QList<QGraphicsItem*> parentItems = items(event->pos());
-        QPointF sceneP = mapToScene(event->pos());
+        QList<QGraphicsItem*> parentItems = items(event->position().toPoint());
+        QPointF sceneP = mapToScene(event->position().toPoint());
         for (int i = 0; i < parentItems.count(); ++i) {
             auto item = static_cast<BaseItem*>(parentItems[i]);
             if (item && item->type() >= TransitionType && item->containsScenePoint(sceneP)) {
@@ -206,9 +206,9 @@ void GraphicsView::dropEvent(QDropEvent *event)
         int shapeIndex = event->mimeData()->data("shapeIndex").toInt();
 
         ScxmlTag *targetTag = nullptr;
-        QPointF targetPos = mapToScene(event->pos());
+        QPointF targetPos = mapToScene(event->position().toPoint());
 
-        QList<QGraphicsItem*> parentItems = items(event->pos());
+        QList<QGraphicsItem*> parentItems = items(event->position().toPoint());
         for (int i = 0; i < parentItems.count(); ++i) {
             auto item = static_cast<const BaseItem*>(parentItems[i]);
             if (item && item->type() >= StateType) {
diff --git a/src/plugins/scxmleditor/common/shapestoolbox.cpp b/src/plugins/scxmleditor/common/shapestoolbox.cpp
index 82def88379a..3fa15c562b7 100644
--- a/src/plugins/scxmleditor/common/shapestoolbox.cpp
+++ b/src/plugins/scxmleditor/common/shapestoolbox.cpp
@@ -33,7 +33,7 @@ ShapesToolbox::ShapesToolbox(QWidget *parent)
     Column {
         spacing(0),
         scrollArea,
-        noMargin,
+        noMargin
     }.attachTo(this);
 }
 
diff --git a/src/plugins/scxmleditor/common/stateview.cpp b/src/plugins/scxmleditor/common/stateview.cpp
index 517f53bd3ec..c31dd4f8507 100644
--- a/src/plugins/scxmleditor/common/stateview.cpp
+++ b/src/plugins/scxmleditor/common/stateview.cpp
@@ -33,7 +33,7 @@ StateView::StateView(StateItem *state, QWidget *parent)
 
     using namespace Layouting;
     Row {
-        PushButton{ text("Back"), onClicked([this] { closeView(); }, this) },
+        PushButton{ text(QString("Back")), onClicked([this] { closeView(); }, this) },
         stateNameLabel,
         noMargin
     }.attachTo(titleBar);
diff --git a/src/plugins/scxmleditor/plugin_interface/scattributeitemdelegate.cpp b/src/plugins/scxmleditor/plugin_interface/scattributeitemdelegate.cpp
index fa735e5d687..0121ddf191a 100644
--- a/src/plugins/scxmleditor/plugin_interface/scattributeitemdelegate.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/scattributeitemdelegate.cpp
@@ -19,12 +19,12 @@ QWidget *SCAttributeItemDelegate::createEditor(QWidget *parent, const QStyleOpti
     Q_UNUSED(option)
 
     switch (index.data(DataTypeRole).toInt()) {
-    case QVariant::StringList: {
+    case QMetaType::QStringList: {
         auto combo = new QComboBox(parent);
         combo->setFocusPolicy(Qt::StrongFocus);
         return combo;
     }
-    case QVariant::String: {
+    case QMetaType::QString: {
         if (index.column() == 0) {
             auto edit = new QLineEdit(parent);
             edit->setFocusPolicy(Qt::StrongFocus);
@@ -52,7 +52,7 @@ void SCAttributeItemDelegate::updateEditorGeometry(QWidget *editor, const QStyle
 void SCAttributeItemDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
 {
     switch (index.data(DataTypeRole).toInt()) {
-    case QVariant::StringList: {
+    case QMetaType::QStringList: {
         auto combo = qobject_cast<QComboBox*>(editor);
         if (combo) {
             combo->clear();
diff --git a/src/plugins/scxmleditor/plugin_interface/scattributeitemmodel.cpp b/src/plugins/scxmleditor/plugin_interface/scattributeitemmodel.cpp
index 454af2930f1..c759bcca73e 100644
--- a/src/plugins/scxmleditor/plugin_interface/scattributeitemmodel.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/scattributeitemmodel.cpp
@@ -84,7 +84,7 @@ QVariant SCAttributeItemModel::data(const QModelIndex &index, int role) const
             }
         } else {
             if (bEditable) {
-                if (m_tag->tagType() > MetadataItem && m_tag->info()->attributes[index.row()].datatype == QVariant::StringList)
+                if (m_tag->tagType() > MetadataItem && m_tag->info()->attributes[index.row()].datatype == QMetaType::QStringList)
                     return QString::fromLatin1(m_tag->info()->attributes[index.row()].value).split(";");
                 else
                     return m_tag->attribute(index.row());
@@ -100,11 +100,11 @@ QVariant SCAttributeItemModel::data(const QModelIndex &index, int role) const
             break;
     case DataTypeRole: {
         if (m_tag->tagType() == Metadata || m_tag->tagType() == MetadataItem)
-            return (int)QVariant::String;
+            return (int)QMetaType::QString;
         else if (index.column() == 1 && m_tag->info()->n_attributes > 0)
             return m_tag->info()->attributes[index.row()].datatype;
         else
-            return QVariant::Invalid;
+            return {};
     }
     case DataRole: {
         if (m_tag->info()->n_attributes > 0)
diff --git a/src/plugins/scxmleditor/plugin_interface/scxmltypes.h b/src/plugins/scxmleditor/plugin_interface/scxmltypes.h
index 62fe00528ab..0224fb8cb29 100644
--- a/src/plugins/scxmleditor/plugin_interface/scxmltypes.h
+++ b/src/plugins/scxmleditor/plugin_interface/scxmltypes.h
@@ -65,119 +65,119 @@ struct scxmltag_type_t
 
 // Define tag-attributes
 const scxmltag_attribute_t scxml_scxml_attributes[] = {
-    {"initial", nullptr, false, false, QVariant::String},
-    {"name", nullptr, false, true, QVariant::String},
-    {"xmlns", "http://www.w3.org/2005/07/scxml", true, false, QVariant::String},
-    {"version", "1.0", true, false, QVariant::String},
-    {"datamodel", nullptr, false, true, QVariant::String},
-    {"binding", "early;late", false, true, QVariant::StringList}
+    {"initial", nullptr, false, false, QMetaType::QString},
+    {"name", nullptr, false, true, QMetaType::QString},
+    {"xmlns", "http://www.w3.org/2005/07/scxml", true, false, QMetaType::QString},
+    {"version", "1.0", true, false, QMetaType::QString},
+    {"datamodel", nullptr, false, true, QMetaType::QString},
+    {"binding", "early;late", false, true, QMetaType::QStringList}
 };
 
 const scxmltag_attribute_t scxml_state_attributes[] = {
-    {"id", nullptr, false, true, QVariant::String},
-    {"initial", nullptr, false, false, QVariant::String}
+    {"id", nullptr, false, true, QMetaType::QString},
+    {"initial", nullptr, false, false, QMetaType::QString}
 };
 
 const scxmltag_attribute_t scxml_parallel_attributes[] = {
-    {"id", nullptr, false, true, QVariant::String}
+    {"id", nullptr, false, true, QMetaType::QString}
 };
 
 const scxmltag_attribute_t scxml_transition_attributes[] = {
-    {"event", nullptr, false, true, QVariant::String},
-    {"cond", nullptr, false, true, QVariant::String},
-    {"target", nullptr, false, true, QVariant::String},
-    {"type", "internal;external", false, true, QVariant::StringList}
+    {"event", nullptr, false, true, QMetaType::QString},
+    {"cond", nullptr, false, true, QMetaType::QString},
+    {"target", nullptr, false, true, QMetaType::QString},
+    {"type", "internal;external", false, true, QMetaType::QStringList}
 };
 
 const scxmltag_attribute_t scxml_initialtransition_attributes[] = {
-    {"target", nullptr, false, false, QVariant::String}
+    {"target", nullptr, false, false, QMetaType::QString}
 };
 
 const scxmltag_attribute_t scxml_final_attributes[] = {
-    {"id", nullptr, false, true, QVariant::String}
+    {"id", nullptr, false, true, QMetaType::QString}
 };
 
 const scxmltag_attribute_t scxml_history_attributes[] = {
-    {"id", nullptr, false, true, QVariant::String},
-    {"type", "shallow;deep", false, true, QVariant::StringList}
+    {"id", nullptr, false, true, QMetaType::QString},
+    {"type", "shallow;deep", false, true, QMetaType::QStringList}
 };
 
 const scxmltag_attribute_t scxml_raise_attributes[] = {
-    {"event", nullptr, true, true, QVariant::String}
+    {"event", nullptr, true, true, QMetaType::QString}
 };
 
 const scxmltag_attribute_t scxml_if_attributes[] = {
-    {"cond", nullptr, true, true, QVariant::String},
+    {"cond", nullptr, true, true, QMetaType::QString},
 };
 
 const scxmltag_attribute_t scxml_elseif_attributes[] = {
-    {"cond", nullptr, true, true, QVariant::String}
+    {"cond", nullptr, true, true, QMetaType::QString}
 };
 
 const scxmltag_attribute_t scxml_foreach_attributes[] = {
-    {"array", nullptr, true, true, QVariant::String},
-    {"item", nullptr, true, true, QVariant::String},
-    {"index", nullptr, false, true, QVariant::String}
+    {"array", nullptr, true, true, QMetaType::QString},
+    {"item", nullptr, true, true, QMetaType::QString},
+    {"index", nullptr, false, true, QMetaType::QString}
 };
 
 const scxmltag_attribute_t scxml_log_attributes[] = {
-    {"label", "", false, true, QVariant::String},
-    {"expr", nullptr, false, true, QVariant::String}
+    {"label", "", false, true, QMetaType::QString},
+    {"expr", nullptr, false, true, QMetaType::QString}
 };
 
 const scxmltag_attribute_t scxml_data_attributes[] = {
-    {"id", nullptr, true, true, QVariant::String},
-    {"src", nullptr, false, true, QVariant::String},
-    {"expr", nullptr, false, true, QVariant::String}
+    {"id", nullptr, true, true, QMetaType::QString},
+    {"src", nullptr, false, true, QMetaType::QString},
+    {"expr", nullptr, false, true, QMetaType::QString}
 };
 
 const scxmltag_attribute_t scxml_assign_attributes[] = {
-    {"location", nullptr, true, true, QVariant::String},
-    {"expr", nullptr, false, true, QVariant::String}
+    {"location", nullptr, true, true, QMetaType::QString},
+    {"expr", nullptr, false, true, QMetaType::QString}
 };
 
 const scxmltag_attribute_t scxml_content_attributes[] = {
-    {"expr", nullptr, false, true, QVariant::String}
+    {"expr", nullptr, false, true, QMetaType::QString}
 };
 
 const scxmltag_attribute_t scxml_param_attributes[] = {
-    {"name", nullptr, true, true, QVariant::String},
-    {"expr", nullptr, false, true, QVariant::String},
-    {"location", nullptr, false, true, QVariant::String}
+    {"name", nullptr, true, true, QMetaType::QString},
+    {"expr", nullptr, false, true, QMetaType::QString},
+    {"location", nullptr, false, true, QMetaType::QString}
 };
 
 const scxmltag_attribute_t scxml_script_attributes[] = {
-    {"src", nullptr, false, true, QVariant::String}
+    {"src", nullptr, false, true, QMetaType::QString}
 };
 
 const scxmltag_attribute_t scxml_send_attributes[] = {
-    {"event", nullptr, false, true, QVariant::String},
-    {"eventexpr", nullptr, false, true, QVariant::String},
-    {"target", nullptr, false, true, QVariant::String},
-    {"targetexpr", nullptr, false, true, QVariant::String},
-    {"type", nullptr, false, true, QVariant::String},
-    {"typeexpr", nullptr, false, true, QVariant::String},
-    {"id", nullptr, false, true, QVariant::String},
-    {"idlocation", nullptr, false, true, QVariant::String},
-    {"delay", nullptr, false, true, QVariant::String},
-    {"delayexpr", nullptr, false, true, QVariant::String},
-    {"namelist", nullptr, false, true, QVariant::String}
+    {"event", nullptr, false, true, QMetaType::QString},
+    {"eventexpr", nullptr, false, true, QMetaType::QString},
+    {"target", nullptr, false, true, QMetaType::QString},
+    {"targetexpr", nullptr, false, true, QMetaType::QString},
+    {"type", nullptr, false, true, QMetaType::QString},
+    {"typeexpr", nullptr, false, true, QMetaType::QString},
+    {"id", nullptr, false, true, QMetaType::QString},
+    {"idlocation", nullptr, false, true, QMetaType::QString},
+    {"delay", nullptr, false, true, QMetaType::QString},
+    {"delayexpr", nullptr, false, true, QMetaType::QString},
+    {"namelist", nullptr, false, true, QMetaType::QString}
 };
 
 const scxmltag_attribute_t scxml_cancel_attributes[] = {
-    {"sendid", nullptr, false, true, QVariant::String},
-    {"sendidexpr", nullptr, false, true, QVariant::String}
+    {"sendid", nullptr, false, true, QMetaType::QString},
+    {"sendidexpr", nullptr, false, true, QMetaType::QString}
 };
 
 const scxmltag_attribute_t scxml_invoke_attributes[] = {
-    {"type", nullptr, false, true, QVariant::String},
-    {"typeexpr", nullptr, false, true, QVariant::String},
-    {"src", nullptr, false, true, QVariant::String},
-    {"srcexpr", nullptr, false, true, QVariant::String},
-    {"id", nullptr, false, true, QVariant::String},
-    {"idlocation", nullptr, false, true, QVariant::String},
-    {"namelist", nullptr, false, true, QVariant::String},
-    {"autoforward", ";true;false", false, true, QVariant::StringList}
+    {"type", nullptr, false, true, QMetaType::QString},
+    {"typeexpr", nullptr, false, true, QMetaType::QString},
+    {"src", nullptr, false, true, QMetaType::QString},
+    {"srcexpr", nullptr, false, true, QMetaType::QString},
+    {"id", nullptr, false, true, QMetaType::QString},
+    {"idlocation", nullptr, false, true, QMetaType::QString},
+    {"namelist", nullptr, false, true, QMetaType::QString},
+    {"autoforward", ";true;false", false, true, QMetaType::QStringList}
 };
 
 const scxmltag_type_t scxml_unknown = {
diff --git a/src/plugins/scxmleditor/plugin_interface/tagtextitem.cpp b/src/plugins/scxmleditor/plugin_interface/tagtextitem.cpp
index 1613d59927f..791a704db1e 100644
--- a/src/plugins/scxmleditor/plugin_interface/tagtextitem.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/tagtextitem.cpp
@@ -7,6 +7,7 @@
 #include <QGraphicsSceneHoverEvent>
 #include <QLabel>
 #include <QPainter>
+#include <QTextDocument>
 
 using namespace ScxmlEditor::PluginInterface;
 
@@ -17,7 +18,10 @@ TagTextItem::TagTextItem(QGraphicsItem *parent)
     setFlag(ItemIsFocusable, true);
     setFlag(ItemIsSelectable, true);
     m_textItem = new TextItem(this);
-    connect(m_textItem, &TextItem::textChanged, this, [this] { emit textChanged(); });
+    connect(m_textItem, &TextItem::textChanged, this, [this] {
+        m_textItem->setTextWidth(m_maxWidth);
+        emit textChanged();
+    });
     connect(m_textItem, &TextItem::textReady,
             this, [this](const QString &text) { emit textReady(text); });
     connect(m_textItem, &TextItem::selected, this, [this](bool sel) { emit selected(sel); });
@@ -115,3 +119,12 @@ QPointF TagTextItem::movePoint() const
 {
     return m_movePoint;
 }
+
+void TagTextItem::setTextMaxWidth(qreal width)
+{
+    m_maxWidth = width;
+    QTextOption opt = m_textItem->document()->defaultTextOption();
+    opt.setWrapMode(QTextOption::WordWrap);
+    m_textItem->document()->setDefaultTextOption(opt);
+    m_textItem->setTextWidth(m_maxWidth);
+}
diff --git a/src/plugins/scxmleditor/plugin_interface/tagtextitem.h b/src/plugins/scxmleditor/plugin_interface/tagtextitem.h
index 3c0a13b935f..4ffcdbb9426 100644
--- a/src/plugins/scxmleditor/plugin_interface/tagtextitem.h
+++ b/src/plugins/scxmleditor/plugin_interface/tagtextitem.h
@@ -34,6 +34,7 @@ public:
 
     void resetMovePoint(const QPointF &p = QPointF(0, 0));
     QPointF movePoint() const;
+    void setTextMaxWidth(qreal width);
 
 protected:
     void hoverEnterEvent(QGraphicsSceneHoverEvent *e) override;
@@ -54,6 +55,7 @@ private:
     QPointF m_movePoint;
     QPointF m_startPos;
     TextItem *m_textItem;
+    qreal m_maxWidth;
 };
 
 } // namespace PluginInterface
diff --git a/src/plugins/scxmleditor/plugin_interface/transitionitem.cpp b/src/plugins/scxmleditor/plugin_interface/transitionitem.cpp
index 63f35a1fd2c..20c4ff6e204 100644
--- a/src/plugins/scxmleditor/plugin_interface/transitionitem.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/transitionitem.cpp
@@ -28,6 +28,26 @@ using namespace ScxmlEditor::PluginInterface;
 
 const qreal SELECTION_DISTANCE = 10;
 
+static QString wrapText(const QString &text)
+{
+    QString wrappedText = "[" + text.trimmed() + "]";
+    return wrappedText;
+
+}
+
+static QString unwrapText(const QString &text)
+{
+    QString unwrappedText = text.trimmed();
+
+    if (unwrappedText.startsWith("["))
+        unwrappedText = unwrappedText.mid(1);
+
+    if (unwrappedText.endsWith("]"))
+        unwrappedText.chop(1);
+
+    return unwrappedText;
+}
+
 TransitionItem::TransitionItem(BaseItem *parent)
     : BaseItem(parent)
     , m_startTargetFactor(0.5, 0.5)
@@ -53,6 +73,15 @@ TransitionItem::TransitionItem(BaseItem *parent)
     connect(m_eventTagItem, &TagTextItem::textReady, this, &TransitionItem::textHasChanged);
     connect(m_eventTagItem, &TagTextItem::movePointChanged, this, &TransitionItem::textItemPositionChanged);
 
+    m_condTagItem = new TagTextItem(this);
+    connect(m_condTagItem, &TagTextItem::selected, this, [this](bool sel) { setItemSelected(sel); });
+    connect(m_condTagItem, &TagTextItem::textReady, this, [this](const QString &text) {
+        setTagValue("cond", unwrapText(text));
+        updateEventName();
+    });
+    connect(m_condTagItem, &TagTextItem::movePointChanged,
+            this, &TransitionItem::textItemPositionChanged);
+
     checkWarningItems();
 }
 
@@ -80,8 +109,10 @@ void TransitionItem::setTag(ScxmlTag *tag)
 {
     BaseItem::setTag(tag);
     if (tag) {
-        if (tag->tagType() == InitialTransition)
+        if (tag->tagType() == InitialTransition) {
             m_eventTagItem->setVisible(false);
+            m_condTagItem->setVisible(false);
+        }
     }
 }
 
@@ -96,12 +127,22 @@ void TransitionItem::textItemPositionChanged()
     }
     setEditorInfo(Constants::C_SCXML_EDITORINFO_MOVEPOINT, data);
 
+    QPointF p2 = m_condTagItem->movePoint();
+    QString data2;
+    if (p2.toPoint() != QPoint(0, 0)) {
+        Serializer s;
+        s.append(p2);
+        data2 = s.data();
+    }
+    setEditorInfo(Constants::C_SCXML_EDITORINFO_MOVEPOINT_COND, data2);
+
     updateComponents();
 }
 
 void TransitionItem::textHasChanged(const QString &text)
 {
     setTagValue("event", text);
+    updateComponents();
 }
 
 void TransitionItem::createGrabbers()
@@ -876,13 +917,18 @@ void TransitionItem::updateComponents()
     QLineF nameLine(m_cornerPoints[ind], m_cornerPoints[ind + 1]);
     if (m_targetType <= InternalNoTarget) {
         m_eventTagItem->setPos(m_cornerPoints[1].x() + 6, m_cornerPoints[1].y() - m_eventTagItem->boundingRect().height() / 3);
+        m_condTagItem->setPos(m_cornerPoints[1].x() + 6, m_cornerPoints[1].y() + m_condTagItem->boundingRect().height() / 3);
     } else {
-        const qreal w2 = m_eventTagItem->boundingRect().width() / 2;
-        QPointF startPos = nameLine.pointAt(0.5);
-        QLineF targetLine(startPos, startPos + QPointF(SELECTION_DISTANCE, SELECTION_DISTANCE));
-        targetLine.setAngle(nameLine.angle() + 90);
+        const qreal widthEventItem = m_eventTagItem->boundingRect().width() / 2;
+        m_eventTagItem->setPos(
+            nameLine.pointAt(0.5)
+            + QPointF(-widthEventItem, -m_eventTagItem->boundingRect().height() / 1.5));
+
+        const qreal width = qMax(nameLine.length(), m_eventTagItem->boundingRect().width());
+        m_condTagItem->setTextMaxWidth(width);
+        const qreal widthCondItem = m_condTagItem->boundingRect().width() / 2;
+        m_condTagItem->setPos(nameLine.pointAt(0.5) + QPointF(-widthCondItem, 2));
 
-        m_eventTagItem->setPos(targetLine.p2() + m_eventTagItem->movePoint() - QPointF(w2, m_eventTagItem->boundingRect().height() / 2));
     }
 
     if (m_warningItem)
@@ -944,6 +990,7 @@ void TransitionItem::updateEditorInfo(bool allChilds)
 
     const QColor fontColor = editorInfo(Constants::C_SCXML_EDITORINFO_FONTCOLOR);
     m_eventTagItem->setDefaultTextColor(fontColor.isValid() ? fontColor : Qt::black);
+    m_condTagItem->setDefaultTextColor(fontColor.isValid() ? fontColor : Qt::black);
 
     const QColor stateColor = editorInfo(Constants::C_SCXML_EDITORINFO_STATECOLOR);
     m_pen.setColor(stateColor.isValid() ? stateColor : qRgb(0x12, 0x12, 0x12));
@@ -1026,6 +1073,7 @@ void TransitionItem::readUISpecifiedProperties(const ScxmlTag *tag)
             }
 
             m_eventTagItem->resetMovePoint(loadPoint(Constants::C_SCXML_EDITORINFO_MOVEPOINT));
+            m_condTagItem->resetMovePoint(loadPoint(Constants::C_SCXML_EDITORINFO_MOVEPOINT_COND));
 
             if (m_lineSelected)
                 createGrabbers();
@@ -1048,6 +1096,7 @@ void TransitionItem::finalizeCreation()
 void TransitionItem::checkVisibility(double scaleFactor)
 {
     m_eventTagItem->setVisible(scaleFactor > 0.5);
+    m_condTagItem->setVisible(scaleFactor > 0.5);
 }
 
 bool TransitionItem::containsScenePoint(const QPointF &p) const
@@ -1092,6 +1141,8 @@ void TransitionItem::findEndItem()
 void TransitionItem::updateEventName()
 {
     m_eventTagItem->setText(tagValue("event"));
+    m_condTagItem->setText(wrapText(tagValue("cond")));
+    updateComponents();
 }
 
 void TransitionItem::storeGeometry(bool block)
@@ -1123,6 +1174,11 @@ void TransitionItem::storeMovePoint(bool block)
         setEditorInfo(Constants::C_SCXML_EDITORINFO_MOVEPOINT, QString(), block);
     else
         savePoint(m_eventTagItem->movePoint(), Constants::C_SCXML_EDITORINFO_MOVEPOINT);
+
+    if (m_condTagItem->movePoint().toPoint() == QPoint(0, 0))
+        setEditorInfo(Constants::C_SCXML_EDITORINFO_MOVEPOINT_COND, QString(), block);
+    else
+        savePoint(m_condTagItem->movePoint(), Constants::C_SCXML_EDITORINFO_MOVEPOINT_COND);
 }
 
 void TransitionItem::storeTargetFactors(bool block)
@@ -1176,6 +1232,7 @@ void TransitionItem::updateTargetType()
 
     if (type <= InternalNoTarget) {
         m_eventTagItem->resetMovePoint();
+        m_condTagItem->resetMovePoint();
         m_arrowSize = 6;
         // Remove extra points
         while (m_cornerPoints.count() > 2)
@@ -1187,8 +1244,10 @@ void TransitionItem::updateTargetType()
         setEditorInfo(Constants::C_SCXML_EDITORINFO_GEOMETRY, QString(), true);
         setEditorInfo(Constants::C_SCXML_EDITORINFO_LOCALGEOMETRY, QString(), true);
         setEditorInfo(Constants::C_SCXML_EDITORINFO_MOVEPOINT, QString(), true);
+        setEditorInfo(Constants::C_SCXML_EDITORINFO_MOVEPOINT_COND, QString(), true);
         setEditorInfo(Constants::C_SCXML_EDITORINFO_STARTTARGETFACTORS, QString(), true);
         setEditorInfo(Constants::C_SCXML_EDITORINFO_ENDTARGETFACTORS, QString(), true);
+        updateComponents();
     } else {
         m_arrowSize = 10;
     }
@@ -1244,10 +1303,10 @@ void TransitionItem::updateZValue()
 
 qreal TransitionItem::textWidth() const
 {
-    return m_eventTagItem->boundingRect().width();
+    return m_eventTagItem->boundingRect().width() + m_condTagItem->boundingRect().width();
 }
 
 QRectF TransitionItem::wholeBoundingRect() const
 {
-    return boundingRect().united(m_eventTagItem->sceneBoundingRect());
+    return boundingRect().united(m_eventTagItem->sceneBoundingRect().united(m_condTagItem->sceneBoundingRect()));
 }
diff --git a/src/plugins/scxmleditor/plugin_interface/transitionitem.h b/src/plugins/scxmleditor/plugin_interface/transitionitem.h
index 6eb256d6d83..13a3a3cf2da 100644
--- a/src/plugins/scxmleditor/plugin_interface/transitionitem.h
+++ b/src/plugins/scxmleditor/plugin_interface/transitionitem.h
@@ -143,6 +143,7 @@ private:
     bool m_lineSelected = false;
 
     TagTextItem *m_eventTagItem;
+    TagTextItem *m_condTagItem;
     TransitionWarningItem *m_warningItem = nullptr;
     TransitionTargetType m_targetType = ExternalTarget;
     bool m_movingFirstPoint = false;
diff --git a/src/plugins/scxmleditor/scxmleditorconstants.h b/src/plugins/scxmleditor/scxmleditorconstants.h
index 13b9fe2fc54..5fd6e53f075 100644
--- a/src/plugins/scxmleditor/scxmleditorconstants.h
+++ b/src/plugins/scxmleditor/scxmleditorconstants.h
@@ -28,6 +28,7 @@ const char C_SCXML_EDITORINFO_GEOMETRY[] = "geometry";
 const char C_SCXML_EDITORINFO_SCENEGEOMETRY[] = "scenegeometry";
 const char C_SCXML_EDITORINFO_LOCALGEOMETRY[] = "localGeometry";
 const char C_SCXML_EDITORINFO_MOVEPOINT[] = "movePoint";
+const char C_SCXML_EDITORINFO_MOVEPOINT_COND[] = "movePointCond";
 const char C_SCXML_EDITORINFO_STARTTARGETFACTORS[] = "startTargetFactors";
 const char C_SCXML_EDITORINFO_ENDTARGETFACTORS[] = "endTargetFactors";
 const char C_SCXML_EDITORINFO_FONTCOLOR[] = "fontColor";
diff --git a/src/plugins/serialterminal/SerialTerminal.json.in b/src/plugins/serialterminal/SerialTerminal.json.in
index 78ac127ab4d..ae295ebbcf1 100644
--- a/src/plugins/serialterminal/SerialTerminal.json.in
+++ b/src/plugins/serialterminal/SerialTerminal.json.in
@@ -14,7 +14,7 @@
                   "",
                   "Alternatively, this plugin 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 plugin. 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."
     ],
-    "Description" : "Serial Port Terminal",
-    "Url" : "http://www.qt.io",
+    "Description" : "Serial Port Terminal.",
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/silversearcher/SilverSearcher.json.in b/src/plugins/silversearcher/SilverSearcher.json.in
index bfaf5536359..b4283f1996b 100644
--- a/src/plugins/silversearcher/SilverSearcher.json.in
+++ b/src/plugins/silversearcher/SilverSearcher.json.in
@@ -13,7 +13,12 @@
                   "",
                   "Alternatively, this plugin 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 plugin. 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."
     ],
-    "Description" : "Adds possibility to use SilverSearcher tool as an alternative mechanism of 'find in files'",
-    "Url" : "http://www.qt.io",
+    "Description" : "Search with Silver Searcher.",
+    "LongDescription" : [
+        "Use the Silver Searcher tool to find in files.",
+        "You also need:",
+            "- Silver Searcher"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/silversearcher/findinfilessilversearcher.cpp b/src/plugins/silversearcher/findinfilessilversearcher.cpp
index cb290e046d8..57a2683428c 100644
--- a/src/plugins/silversearcher/findinfilessilversearcher.cpp
+++ b/src/plugins/silversearcher/findinfilessilversearcher.cpp
@@ -128,14 +128,15 @@ public:
     QString toolTip() const final { return {}; }
     QWidget *widget() const final { return m_widget; }
 
-    void readSettings(QtcSettings *settings) final
+    void readSettings(const Store &s) final
     {
-        m_searchOptionsLineEdit->setText(settings->value(s_searchOptionsString).toString());
+        m_searchOptionsLineEdit->setText(s.value(s_searchOptionsString).toString());
     }
 
-    void writeSettings(QtcSettings *settings) const final
+    void writeSettings(Store &s) const final
     {
-        settings->setValue(s_searchOptionsString, m_searchOptionsLineEdit->text());
+        if (!m_searchOptionsLineEdit->text().isEmpty())
+            s.insert(s_searchOptionsString, m_searchOptionsLineEdit->text());
     }
 
     SearchExecutor searchExecutor() const final
diff --git a/src/plugins/squish/Squish.json.in b/src/plugins/squish/Squish.json.in
index 64e4397aeb3..3428ea2191e 100644
--- a/src/plugins/squish/Squish.json.in
+++ b/src/plugins/squish/Squish.json.in
@@ -13,8 +13,13 @@
 "",
 "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."
 ],
-"Description" : "Squish plugin. Provides integration of Squish.",
-"Url" : "http://www.qt.io",
+"Description" : "Test applications with the Squish automated GUI testing framework.",
+"LongDescription" : [
+    "Map AUTs (application under test) and run Squish test suites and cases.",
+    "You also need:",
+        "- Access to a Squish server"
+],
+"Url" : "https://www.qt.io",
 ${IDE_PLUGIN_DEPENDENCIES},
 
 "Mimetypes" : [
@@ -26,5 +31,6 @@ ${IDE_PLUGIN_DEPENDENCIES},
     "        <glob pattern='objects.map'/>",
     "    </mime-type>",
     "</mime-info>"
-]
+],
+"JsonWizardPaths" : [":/squish/wizard/"]
 }
diff --git a/src/plugins/squish/squishoutputpane.cpp b/src/plugins/squish/squishoutputpane.cpp
index adb73b6b7e1..7db24f4eefa 100644
--- a/src/plugins/squish/squishoutputpane.cpp
+++ b/src/plugins/squish/squishoutputpane.cpp
@@ -44,8 +44,8 @@ SquishOutputPane::SquishOutputPane()
     m_outputWidget->setLayout(outputLayout);
 
     QPalette pal;
-    pal.setColor(QPalette::Window, Utils::creatorTheme()->color(Utils::Theme::InfoBarBackground));
-    pal.setColor(QPalette::WindowText, Utils::creatorTheme()->color(Utils::Theme::InfoBarText));
+    pal.setColor(QPalette::Window, Utils::creatorColor(Utils::Theme::InfoBarBackground));
+    pal.setColor(QPalette::WindowText, Utils::creatorColor(Utils::Theme::InfoBarText));
 
     m_summaryWidget = new QFrame;
     m_summaryWidget->setPalette(pal);
diff --git a/src/plugins/squish/squishperspective.cpp b/src/plugins/squish/squishperspective.cpp
index 1b762c71a41..4eb63cbb7eb 100644
--- a/src/plugins/squish/squishperspective.cpp
+++ b/src/plugins/squish/squishperspective.cpp
@@ -57,9 +57,9 @@ static QIcon iconForType(IconType type)
 
 static QString customStyleSheet(bool extended)
 {
-    static const QString red = Utils::creatorTheme()->color(
+    static const QString red = Utils::creatorColor(
                 Utils::Theme::ProgressBarColorError).name();
-    static const QString green = Utils::creatorTheme()->color(
+    static const QString green = Utils::creatorColor(
                 Utils::Theme::ProgressBarColorFinished).name();
     if (!extended)
         return "QProgressBar {text-align:left; border:0px}";
diff --git a/src/plugins/squish/squishplugin.cpp b/src/plugins/squish/squishplugin.cpp
index 6608625c0b2..4cc72fde73b 100644
--- a/src/plugins/squish/squishplugin.cpp
+++ b/src/plugins/squish/squishplugin.cpp
@@ -68,8 +68,6 @@ private:
                 SquishServerSettingsDialog dialog;
                 dialog.exec();
             });
-
-        ProjectExplorer::JsonWizardFactory::addWizardPath(":/squish/wizard/");
     }
 
     bool initializeGlobalScripts()
diff --git a/src/plugins/squish/squishserverprocess.cpp b/src/plugins/squish/squishserverprocess.cpp
index 9e4b9741433..3af7bf308a6 100644
--- a/src/plugins/squish/squishserverprocess.cpp
+++ b/src/plugins/squish/squishserverprocess.cpp
@@ -26,9 +26,8 @@ void SquishServerProcess::stop()
 {
     if (m_process.state() != QProcess::NotRunning && m_serverPort > 0) {
         Utils::Process serverKiller;
-        QStringList args;
-        args << "--stop" << "--port" << QString::number(m_serverPort);
-        serverKiller.setCommand({m_process.commandLine().executable(), args});
+        serverKiller.setCommand({m_process.commandLine().executable(),
+                                 {"--stop", "--port", QString::number(m_serverPort)}});
         serverKiller.setEnvironment(m_process.environment());
         serverKiller.start();
         if (!serverKiller.waitForFinished()) {
diff --git a/src/plugins/squish/squishsettings.cpp b/src/plugins/squish/squishsettings.cpp
index a8e0518a3de..1b8c799eda1 100644
--- a/src/plugins/squish/squishsettings.cpp
+++ b/src/plugins/squish/squishsettings.cpp
@@ -387,10 +387,10 @@ SquishServerSettingsWidget::SquishServerSettingsWidget(QWidget *parent)
     using namespace Layouting;
     Form grid {
         &m_applicationsView, br,
-        &m_serverSettings.autTimeout, br,
-        &m_serverSettings.responseTimeout, br,
-        &m_serverSettings.postMortemWaitTime, br,
-        &m_serverSettings.animatedCursor, br,
+        m_serverSettings.autTimeout, br,
+        m_serverSettings.responseTimeout, br,
+        m_serverSettings.postMortemWaitTime, br,
+        m_serverSettings.animatedCursor, br,
     };
     Column buttonCol {
         add,
diff --git a/src/plugins/squish/squishtools.cpp b/src/plugins/squish/squishtools.cpp
index f6ef2e67e07..68dabd6449f 100644
--- a/src/plugins/squish/squishtools.cpp
+++ b/src/plugins/squish/squishtools.cpp
@@ -554,8 +554,8 @@ void SquishTools::startSquishServer(Request request)
             m_perspective.updateStatus(Tr::tr("Running test case"));
     }
 
-    const QStringList arguments = serverArgumentsFromSettings();
-    m_serverProcess.start({toolsSettings.serverPath, arguments}, squishEnvironment());
+    m_serverProcess.start({toolsSettings.serverPath, serverArgumentsFromSettings()},
+                          squishEnvironment());
 }
 
 void SquishTools::stopSquishServer()
@@ -569,13 +569,10 @@ void SquishTools::startSquishRunner()
     if (!isValidToStartRunner() || !setupRunnerPath())
         return;
 
-    const QStringList args = runnerArgumentsFromSettings();
-
     if (m_request == RecordTestRequested)
         m_closeRunnerOnEndRecord = true;
 
-    Utils::CommandLine cmdLine = {toolsSettings.runnerPath, args};
-    setupAndStartSquishRunnerProcess(cmdLine);
+    setupAndStartSquishRunnerProcess({toolsSettings.runnerPath, runnerArgumentsFromSettings()});
 }
 
 void SquishTools::setupAndStartRecorder()
@@ -604,7 +601,7 @@ void SquishTools::setupAndStartRecorder()
 
     m_secondaryRunner = new SquishRunnerProcess(this);
     m_secondaryRunner->setupProcess(SquishRunnerProcess::Record);
-    const CommandLine cmd = {toolsSettings.runnerPath, args};
+    const CommandLine cmd{toolsSettings.runnerPath, args};
     connect(m_secondaryRunner, &SquishRunnerProcess::recorderDone,
             this, &SquishTools::onRecorderFinished);
     qCDebug(LOG) << "Recorder starting:" << cmd.toUserOutput();
@@ -629,7 +626,7 @@ void SquishTools::setupAndStartInspector()
 
     m_secondaryRunner = new SquishRunnerProcess(this);
     m_secondaryRunner->setupProcess(SquishRunnerProcess::Inspect);
-    const CommandLine cmd = {toolsSettings.runnerPath, args};
+    const CommandLine cmd{toolsSettings.runnerPath, args};
     connect(m_secondaryRunner, &SquishRunnerProcess::logOutputReceived,
             this, &SquishTools::logOutputReceived);
     connect(m_secondaryRunner, &SquishRunnerProcess::objectPicked,
@@ -676,8 +673,8 @@ void SquishTools::executeRunnerQuery()
     if (!isValidToStartRunner() || !setupRunnerPath())
         return;
 
-    QStringList arguments = { "--port", QString::number(m_serverProcess.port()) };
-    Utils::CommandLine cmdLine = {toolsSettings.runnerPath, arguments};
+    CommandLine cmdLine{toolsSettings.runnerPath,
+                        {"--port", QString::number(m_serverProcess.port())}};
     switch (m_query) {
     case ServerInfo:
         cmdLine.addArg("--info");
@@ -690,7 +687,7 @@ void SquishTools::executeRunnerQuery()
     case SetGlobalScriptDirs:
         cmdLine.addArg("--config");
         cmdLine.addArg("setGlobalScriptDirs");
-        cmdLine.addArgs(m_queryParameter, Utils::CommandLine::Raw);
+        cmdLine.addArgs(m_queryParameter, CommandLine::Raw);
         break;
     default:
         QTC_ASSERT(false, return);
@@ -1106,10 +1103,9 @@ void SquishTools::interruptRunner()
 {
     qCDebug(LOG) << "Interrupting runner";
     QTC_ASSERT(m_primaryRunner, return);
-    qint64 processId = m_primaryRunner->processId();
-    const CommandLine cmd(toolsSettings.processComPath, {QString::number(processId), "break"});
+    const qint64 processId = m_primaryRunner->processId();
     Process process;
-    process.setCommand(cmd);
+    process.setCommand({toolsSettings.processComPath, {QString::number(processId), "break"}});
     process.start();
     process.waitForFinished();
 }
@@ -1122,10 +1118,9 @@ void SquishTools::terminateRunner()
     m_perspective.updateStatus(Tr::tr("User stop initiated."));
     // should we terminate the AUT instead of the runner?!?
     QTC_ASSERT(m_primaryRunner, return);
-    qint64 processId = m_primaryRunner->processId();
-    const CommandLine cmd(toolsSettings.processComPath, {QString::number(processId), "terminate"});
+    const qint64 processId = m_primaryRunner->processId();
     Process process;
-    process.setCommand(cmd);
+    process.setCommand({toolsSettings.processComPath, {QString::number(processId), "terminate"}});
     process.start();
     process.waitForFinished();
 }
@@ -1263,7 +1258,7 @@ bool SquishTools::setupRunnerPath()
     return true;
 }
 
-void SquishTools::setupAndStartSquishRunnerProcess(const Utils::CommandLine &cmdLine)
+void SquishTools::setupAndStartSquishRunnerProcess(const CommandLine &cmdLine)
 {
     QTC_ASSERT(m_primaryRunner, return);
     // avoid crashes on fast re-usage of Process
diff --git a/src/plugins/squish/squishwizardpages.cpp b/src/plugins/squish/squishwizardpages.cpp
index 0ee6dab6b2c..707421c4134 100644
--- a/src/plugins/squish/squishwizardpages.cpp
+++ b/src/plugins/squish/squishwizardpages.cpp
@@ -319,7 +319,7 @@ bool SquishFileGenerator::setup(const QVariant &data, QString *errorMessage)
     if (data.isNull())
         return false;
 
-    if (data.typeId() != QVariant::Map) {
+    if (data.typeId() != QMetaType::QVariantMap) {
         *errorMessage = Tr::tr("Key is not an object.");
         return false;
     }
diff --git a/src/plugins/squish/testresult.cpp b/src/plugins/squish/testresult.cpp
index 7e229d50e05..38b9ca1d9a3 100644
--- a/src/plugins/squish/testresult.cpp
+++ b/src/plugins/squish/testresult.cpp
@@ -46,29 +46,27 @@ QString TestResult::typeToString(Result::Type type)
 
 QColor TestResult::colorForType(Result::Type type)
 {
-    Utils::Theme *creatorTheme = Utils::creatorTheme();
-
     switch (type) {
     case Result::Start:
     case Result::Log:
     case Result::Detail:
     case Result::End:
-        return creatorTheme->color(Utils::Theme::OutputPanes_StdOutTextColor);
+        return creatorColor(Utils::Theme::OutputPanes_StdOutTextColor);
     case Result::Pass:
-        return creatorTheme->color(Utils::Theme::OutputPanes_TestPassTextColor);
+        return creatorColor(Utils::Theme::OutputPanes_TestPassTextColor);
     case Result::Fail:
     case Result::Error:
-        return creatorTheme->color(Utils::Theme::OutputPanes_TestFailTextColor);
+        return creatorColor(Utils::Theme::OutputPanes_TestFailTextColor);
     case Result::ExpectedFail:
-        return creatorTheme->color(Utils::Theme::OutputPanes_TestXFailTextColor);
+        return creatorColor(Utils::Theme::OutputPanes_TestXFailTextColor);
     case Result::UnexpectedPass:
-        return creatorTheme->color(Utils::Theme::OutputPanes_TestXPassTextColor);
+        return creatorColor(Utils::Theme::OutputPanes_TestXPassTextColor);
     case Result::Warn:
-        return creatorTheme->color(Utils::Theme::OutputPanes_TestWarnTextColor);
+        return creatorColor(Utils::Theme::OutputPanes_TestWarnTextColor);
     case Result::Fatal:
-        return creatorTheme->color(Utils::Theme::OutputPanes_TestFatalTextColor);
+        return creatorColor(Utils::Theme::OutputPanes_TestFatalTextColor);
     }
-    return creatorTheme->color(Utils::Theme::OutputPanes_StdOutTextColor);
+    return creatorColor(Utils::Theme::OutputPanes_StdOutTextColor);
 }
 
 } // namespace Internal
diff --git a/src/plugins/studiowelcome/StudioWelcome.json.in b/src/plugins/studiowelcome/StudioWelcome.json.in
index 9ee3c251721..5ab72606cf6 100644
--- a/src/plugins/studiowelcome/StudioWelcome.json.in
+++ b/src/plugins/studiowelcome/StudioWelcome.json.in
@@ -14,6 +14,6 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Description" : "Qt Design Studio Welcome Page.",
-    "Url" : "http://www.qt.io",
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
index 5cbc0b673cb..a2094a0d423 100644
--- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp
+++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
@@ -483,20 +483,20 @@ QVariant ProjectModel::data(const QModelIndex &index, int role) const
             ProjectExplorer::ProjectExplorerPlugin::recentProjects().at(index.row());
     switch (role) {
     case Qt::DisplayRole:
-        return data.second;
+        return data.displayName;
         break;
     case FilePathRole:
-        return data.first.toVariant();
+        return data.filePath.toVariant();
     case PrettyFilePathRole:
-        return data.first.absolutePath().withTildeHomePath();
+        return data.filePath.absolutePath().withTildeHomePath();
     case PreviewUrl:
-        return QVariant(QStringLiteral("image://project_preview/") +
-                        QmlProjectManager::ProjectFileContentTools::appQmlFile(
-                            data.first));
+        return QVariant(
+            QStringLiteral("image://project_preview/")
+            + QmlProjectManager::ProjectFileContentTools::appQmlFile(data.filePath));
     case TagData:
-        return tags(data.first);
+        return tags(data.filePath);
     case Description:
-        return description(data.first);
+        return description(data.filePath);
     default:
         return QVariant();
     }
@@ -609,8 +609,7 @@ void StudioWelcomePlugin::extensionsInitialized()
 
     // Enable QDS new project dialog and QDS wizards
     if (Core::ICore::isQtDesignStudio()) {
-        ProjectExplorer::JsonWizardFactory::clearWizardPaths();
-        ProjectExplorer::JsonWizardFactory::addWizardPath(
+        ProjectExplorer::JsonWizardFactory::setInstalledWizardsPath(
             Core::ICore::resourcePath("qmldesigner/studio_templates"));
 
         Core::ICore::setNewDialogFactory([](QWidget *parent) { return new QdsNewDialog(parent); });
diff --git a/src/plugins/subversion/Subversion.json.in b/src/plugins/subversion/Subversion.json.in
index 604ba2648a9..2ee61c0a1dc 100644
--- a/src/plugins/subversion/Subversion.json.in
+++ b/src/plugins/subversion/Subversion.json.in
@@ -13,8 +13,12 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Version Control",
-    "Description" : "Subversion integration.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Access the Subversion version control system.",
+    "LongDescription" : [
+        "You also need:",
+            "- Subversion"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
 
     "Mimetypes" : [
diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp
index e69809143d3..1dfb19ed860 100644
--- a/src/plugins/subversion/subversionclient.cpp
+++ b/src/plugins/subversion/subversionclient.cpp
@@ -115,6 +115,7 @@ CommandLine &operator<<(Utils::CommandLine &command, SubversionClient::AddAuthOp
 
 QString SubversionClient::synchronousTopic(const FilePath &repository) const
 {
+    // TODO: Looks unused
     QStringList args;
 
     QString svnVersionBinary = vcsBinary(repository).toString();
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index b28224a8667..2339893fcd4 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -477,9 +477,9 @@ SubversionPluginPrivate::SubversionPluginPrivate()
 bool SubversionPluginPrivate::isVcsDirectory(const FilePath &fileName) const
 {
     const QString baseName = fileName.fileName();
-    return fileName.isDir() && contains(m_svnDirectories, [baseName](const QString &s) {
+    return contains(m_svnDirectories, [baseName](const QString &s) {
         return !baseName.compare(s, HostOsInfo::fileNameCaseSensitivity());
-    });
+    }) && fileName.isDir();
 }
 
 bool SubversionPluginPrivate::activateCommit()
@@ -1067,7 +1067,7 @@ bool SubversionPluginPrivate::isVcsFileOrDirectory(const FilePath &filePath) con
 
 bool SubversionPluginPrivate::isConfigured() const
 {
-    const FilePath binary = settings().binaryPath();
+    const FilePath binary = settings().binaryPath.effectiveBinary();
     if (binary.isEmpty())
         return false;
     QFileInfo fi = binary.toFileInfo();
diff --git a/src/plugins/subversion/subversionsettings.cpp b/src/plugins/subversion/subversionsettings.cpp
index 284472938ff..1bea22072cc 100644
--- a/src/plugins/subversion/subversionsettings.cpp
+++ b/src/plugins/subversion/subversionsettings.cpp
@@ -76,7 +76,7 @@ SubversionSettings::SubversionSettings()
 
             Group {
                 title(Tr::tr("Authentication")),
-                useAuthentication.groupChecker(),
+                groupChecker(useAuthentication.groupChecker()),
                 Form {
                     userName, br,
                     password,
diff --git a/src/plugins/terminal/Terminal.json.in b/src/plugins/terminal/Terminal.json.in
index 8c631dd6519..f196317fc9c 100644
--- a/src/plugins/terminal/Terminal.json.in
+++ b/src/plugins/terminal/Terminal.json.in
@@ -12,7 +12,10 @@
                   "",
                   "Alternatively, this plugin 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 plugin. 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."
     ],
-    "Description" : "Terminal window.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Open a terminal as an output view.",
+    "LongDescription" : [
+        "Instead of using an external terminal."
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/terminal/shellintegration.cpp b/src/plugins/terminal/shellintegration.cpp
index 5dfd450e68c..1303f922884 100644
--- a/src/plugins/terminal/shellintegration.cpp
+++ b/src/plugins/terminal/shellintegration.cpp
@@ -133,7 +133,7 @@ void ShellIntegration::onOsc(int cmd, std::string_view str, bool initial, bool f
         qCDebug(integrationLog) << "OSC 133:" << data;
     } else if (cmd == 633 && command.length() == 1) {
         if (command[0] == 'E') {
-            CommandLine cmdLine = CommandLine::fromUserInput(data.toString());
+            const CommandLine cmdLine = CommandLine::fromUserInput(data.toString());
             emit commandChanged(cmdLine);
         } else if (command[0] == 'D') {
             emit commandChanged({});
@@ -174,12 +174,10 @@ void ShellIntegration::prepareProcess(Utils::Process &process)
             m_tempDir.filePath(filesToCopy.bash.rcFile.fileName()));
         rcPath.copyFile(tmpRc);
 
-        CommandLine newCmd = {cmd.executable(), {"--init-file", tmpRc.nativePath()}};
-
         if (cmd.arguments() == "-l")
             env.set("VSCODE_SHELL_LOGIN", "1");
 
-        cmd = newCmd;
+        cmd = {cmd.executable(), {"--init-file", tmpRc.nativePath()}};
     } else if (cmd.executable().baseName() == "zsh") {
         for (const FileToCopy &file : filesToCopy.zsh.files) {
             const auto copyResult = file.source.copyFile(
diff --git a/src/plugins/terminal/shellmodel.cpp b/src/plugins/terminal/shellmodel.cpp
index 4368efee973..dd45515b09b 100644
--- a/src/plugins/terminal/shellmodel.cpp
+++ b/src/plugins/terminal/shellmodel.cpp
@@ -168,7 +168,7 @@ QList<ShellModelItem> ShellModel::remote() const
     ProjectExplorer::DeviceManager::instance()->forEachDevice(
         [&result](const std::shared_ptr<const ProjectExplorer::IDevice> &device) {
             if (device->type() != ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE)
-                result << ShellModelItem{device->displayName(), {{device->rootPath(), {}}}};
+                result << ShellModelItem{device->displayName(), {CommandLine{device->rootPath()}}};
         });
 
     return result;
diff --git a/src/plugins/terminal/terminalpane.cpp b/src/plugins/terminal/terminalpane.cpp
index 16486387134..8b6699ef77e 100644
--- a/src/plugins/terminal/terminalpane.cpp
+++ b/src/plugins/terminal/terminalpane.cpp
@@ -115,7 +115,7 @@ void TerminalPane::openTerminal(const OpenTerminalParameters &parameters)
         if (!shell.isExecutableFile())
             parametersCopy.workingDirectory.reset();
         else
-            parametersCopy.shellCommand = CommandLine{shell, {}};
+            parametersCopy.shellCommand = CommandLine{shell};
     }
 
     const auto terminalWidget = new TerminalWidget(&m_tabWidget, parametersCopy);
diff --git a/src/plugins/terminal/terminalsettings.cpp b/src/plugins/terminal/terminalsettings.cpp
index 62e0c209c12..4e754dc7dd1 100644
--- a/src/plugins/terminal/terminalsettings.cpp
+++ b/src/plugins/terminal/terminalsettings.cpp
@@ -527,37 +527,35 @@ TerminalSettings::TerminalSettings()
     enableMouseTracking.setToolTip(Tr::tr("Enables mouse tracking in the terminal."));
     enableMouseTracking.setDefaultValue(true);
 
-    Theme *theme = Utils::creatorTheme();
+    setupColor(this, foregroundColor, "Foreground", creatorColor(Theme::TerminalForeground));
+    setupColor(this, backgroundColor, "Background", creatorColor(Theme::TerminalBackground));
+    setupColor(this, selectionColor, "Selection", creatorColor(Theme::TerminalSelection));
 
-    setupColor(this, foregroundColor, "Foreground", theme->color(Theme::TerminalForeground));
-    setupColor(this, backgroundColor, "Background", theme->color(Theme::TerminalBackground));
-    setupColor(this, selectionColor, "Selection", theme->color(Theme::TerminalSelection));
+    setupColor(this, findMatchColor, "Find matches", creatorColor(Theme::TerminalFindMatch));
 
-    setupColor(this, findMatchColor, "Find matches", theme->color(Theme::TerminalFindMatch));
+    setupColor(this, colors[0], "0", creatorColor(Theme::TerminalAnsi0), "black");
+    setupColor(this, colors[8], "8", creatorColor(Theme::TerminalAnsi8), "bright black");
 
-    setupColor(this, colors[0], "0", theme->color(Theme::TerminalAnsi0), "black");
-    setupColor(this, colors[8], "8", theme->color(Theme::TerminalAnsi8), "bright black");
+    setupColor(this, colors[1], "1", creatorColor(Theme::TerminalAnsi1), "red");
+    setupColor(this, colors[9], "9", creatorColor(Theme::TerminalAnsi9), "bright red");
 
-    setupColor(this, colors[1], "1", theme->color(Theme::TerminalAnsi1), "red");
-    setupColor(this, colors[9], "9", theme->color(Theme::TerminalAnsi9), "bright red");
+    setupColor(this, colors[2], "2", creatorColor(Theme::TerminalAnsi2), "green");
+    setupColor(this, colors[10], "10", creatorColor(Theme::TerminalAnsi10), "bright green");
 
-    setupColor(this, colors[2], "2", theme->color(Theme::TerminalAnsi2), "green");
-    setupColor(this, colors[10], "10", theme->color(Theme::TerminalAnsi10), "bright green");
+    setupColor(this, colors[3], "3", creatorColor(Theme::TerminalAnsi3), "yellow");
+    setupColor(this, colors[11], "11", creatorColor(Theme::TerminalAnsi11), "bright yellow");
 
-    setupColor(this, colors[3], "3", theme->color(Theme::TerminalAnsi3), "yellow");
-    setupColor(this, colors[11], "11", theme->color(Theme::TerminalAnsi11), "bright yellow");
+    setupColor(this, colors[4], "4", creatorColor(Theme::TerminalAnsi4), "blue");
+    setupColor(this, colors[12], "12", creatorColor(Theme::TerminalAnsi12), "bright blue");
 
-    setupColor(this, colors[4], "4", theme->color(Theme::TerminalAnsi4), "blue");
-    setupColor(this, colors[12], "12", theme->color(Theme::TerminalAnsi12), "bright blue");
+    setupColor(this, colors[5], "5", creatorColor(Theme::TerminalAnsi5), "magenta");
+    setupColor(this, colors[13], "13", creatorColor(Theme::TerminalAnsi13), "bright magenta");
 
-    setupColor(this, colors[5], "5", theme->color(Theme::TerminalAnsi5), "magenta");
-    setupColor(this, colors[13], "13", theme->color(Theme::TerminalAnsi13), "bright magenta");
+    setupColor(this, colors[6], "6", creatorColor(Theme::TerminalAnsi6), "cyan");
+    setupColor(this, colors[14], "14", creatorColor(Theme::TerminalAnsi14), "bright cyan");
 
-    setupColor(this, colors[6], "6", theme->color(Theme::TerminalAnsi6), "cyan");
-    setupColor(this, colors[14], "14", theme->color(Theme::TerminalAnsi14), "bright cyan");
-
-    setupColor(this, colors[7], "7", theme->color(Theme::TerminalAnsi7), "white");
-    setupColor(this, colors[15], "15", theme->color(Theme::TerminalAnsi15), "bright white");
+    setupColor(this, colors[7], "7", creatorColor(Theme::TerminalAnsi7), "white");
+    setupColor(this, colors[15], "15", creatorColor(Theme::TerminalAnsi15), "bright white");
 
     setLayouter([this] {
         using namespace Layouting;
diff --git a/src/plugins/terminal/terminalwidget.cpp b/src/plugins/terminal/terminalwidget.cpp
index c7bdab9b2a8..c6c97ae9bde 100644
--- a/src/plugins/terminal/terminalwidget.cpp
+++ b/src/plugins/terminal/terminalwidget.cpp
@@ -83,7 +83,7 @@ void TerminalWidget::setupPty()
 {
     m_process = std::make_unique<Process>();
 
-    CommandLine shellCommand = m_openParameters.shellCommand.value_or(
+    const CommandLine shellCommand = m_openParameters.shellCommand.value_or(
         CommandLine{settings().shell(), settings().shellArguments(), CommandLine::Raw});
 
     if (shellCommand.executable().isRootPath()) {
@@ -160,7 +160,7 @@ void TerminalWidget::setupPty()
         const int exitCode = QTC_GUARD(m_process) ? m_process->exitCode() : -1;
         if (m_process) {
             if (exitCode != 0) {
-                errorMessage = Tr::tr("Terminal process exited with code %1").arg(exitCode);
+                errorMessage = Tr::tr("Terminal process exited with code %1.").arg(exitCode);
 
                 if (!m_process->errorString().isEmpty())
                     errorMessage += QString(" (%1)").arg(m_process->errorString());
@@ -187,7 +187,7 @@ void TerminalWidget::setupPty()
 
                 writeToTerminal(msg, true);
             } else {
-                QString exitMsg = Tr::tr("Process exited with code: %1").arg(exitCode);
+                QString exitMsg = Tr::tr("Process exited with code: %1.").arg(exitCode);
                 QByteArray msg = QString("\r\n%1").arg(exitMsg).toUtf8();
                 writeToTerminal(msg, true);
             }
diff --git a/src/plugins/texteditor/CMakeLists.txt b/src/plugins/texteditor/CMakeLists.txt
index 886b98390ce..22abf9d8a1e 100644
--- a/src/plugins/texteditor/CMakeLists.txt
+++ b/src/plugins/texteditor/CMakeLists.txt
@@ -92,11 +92,9 @@ add_qtc_plugin(TextEditor
     snippets/snippetparser.cpp snippets/snippetparser.h
     snippets/snippetprovider.cpp snippets/snippetprovider.h
     snippets/snippetscollection.cpp snippets/snippetscollection.h
-    snippets/snippetssettings.cpp snippets/snippetssettings.h
     snippets/snippetssettingspage.cpp snippets/snippetssettingspage.h
     storagesettings.cpp storagesettings.h
     syntaxhighlighter.cpp syntaxhighlighter.h
-    syntaxhighlighterrunner.cpp syntaxhighlighterrunner.h
     tabsettings.cpp tabsettings.h
     tabsettingswidget.cpp tabsettingswidget.h
     textdocument.cpp textdocument.h
@@ -105,7 +103,6 @@ add_qtc_plugin(TextEditor
     texteditor.qrc
     texteditor_global.h
     texteditortr.h
-    texteditoractionhandler.cpp texteditoractionhandler.h
     texteditorconstants.cpp texteditorconstants.h
     texteditoroverlay.cpp texteditoroverlay.h
     texteditorplugin.cpp
@@ -113,6 +110,7 @@ add_qtc_plugin(TextEditor
     textindenter.cpp textindenter.h
     textmark.cpp textmark.h
     textstyles.h
+    typehierarchy.cpp typehierarchy.h
     typingsettings.cpp typingsettings.h
 )
 
diff --git a/src/plugins/texteditor/TextEditor.json.in b/src/plugins/texteditor/TextEditor.json.in
index f2b6fbbcf58..42e32325edd 100644
--- a/src/plugins/texteditor/TextEditor.json.in
+++ b/src/plugins/texteditor/TextEditor.json.in
@@ -14,7 +14,7 @@
     ],
     "Category" : "Core",
     "Description" : "Text editor framework and the implementation of the basic text editor.",
-    "Url" : "http://www.qt.io",
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
     "Mimetypes" : [
         "<?xml version='1.0'?>",
diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp
index ce6d2f4999f..d18a75531b3 100644
--- a/src/plugins/texteditor/basefilefind.cpp
+++ b/src/plugins/texteditor/basefilefind.cpp
@@ -139,8 +139,8 @@ public:
     QString title() const override { return Tr::tr("Internal"); }
     QString toolTip() const override { return {}; }
     QWidget *widget() const override { return m_widget; }
-    void readSettings(QtcSettings * /*settings*/) override {}
-    void writeSettings(QtcSettings * /*settings*/) const override {}
+    void readSettings(const Store &) override {}
+    void writeSettings(Store &) const override {}
     SearchExecutor searchExecutor() const override
     {
         return [](const FileFindParameters &parameters) {
@@ -442,47 +442,57 @@ FilePath BaseFileFind::searchDir() const
     return d->m_searchDir;
 }
 
-void BaseFileFind::writeCommonSettings(QtcSettings *settings)
+void BaseFileFind::writeCommonSettings(
+    Store &s, const QString &defaultFilter, const QString &defaultExclusionFilter) const
 {
     const auto fromNativeSeparators = [](const QStringList &files) -> QStringList {
         return Utils::transform(files, &QDir::fromNativeSeparators);
     };
 
-    settings->setValue("filters", fromNativeSeparators(d->m_filterStrings.stringList()));
-    if (d->m_filterCombo)
-        settings->setValue("currentFilter",
-                           QDir::fromNativeSeparators(d->m_filterCombo->currentText()));
-    settings->setValue("exclusionFilters", fromNativeSeparators(d->m_exclusionStrings.stringList()));
-    if (d->m_exclusionCombo)
-        settings->setValue("currentExclusionFilter",
-                           QDir::fromNativeSeparators(d->m_exclusionCombo->currentText()));
+    const QStringList filterStrings = fromNativeSeparators(d->m_filterStrings.stringList());
+    if (filterStrings.size() != 1 || filterStrings.first() != defaultFilter)
+        s.insert("filters", filterStrings);
+    const QString currentFilter = d->m_filterCombo
+                                      ? QDir::fromNativeSeparators(d->m_filterCombo->currentText())
+                                      : d->m_filterSetting;
+    if (currentFilter != defaultFilter)
+        s.insert("currentFilter", currentFilter);
+    const QStringList exclusionFilters = fromNativeSeparators(d->m_exclusionStrings.stringList());
+    if (exclusionFilters.size() != 1 || exclusionFilters.first() != defaultExclusionFilter)
+        s.insert("exclusionFilters", exclusionFilters);
+    const QString currentExclusionFilter = d->m_exclusionCombo ? QDir::fromNativeSeparators(
+                                               d->m_exclusionCombo->currentText())
+                                                               : d->m_exclusionSetting;
+    if (currentExclusionFilter != defaultExclusionFilter)
+        s.insert("currentExclusionFilter", currentExclusionFilter);
 
     for (const SearchEngine *searchEngine : std::as_const(d->m_searchEngines))
-        searchEngine->writeSettings(settings);
-    settings->setValue("currentSearchEngineIndex", d->m_currentSearchEngineIndex);
+        searchEngine->writeSettings(s);
+    if (d->m_currentSearchEngineIndex != 0)
+        s.insert("currentSearchEngineIndex", d->m_currentSearchEngineIndex);
 }
 
-void BaseFileFind::readCommonSettings(QtcSettings *settings, const QString &defaultFilter,
-                                      const QString &defaultExclusionFilter)
+void BaseFileFind::readCommonSettings(
+    const Store &s, const QString &defaultFilter, const QString &defaultExclusionFilter)
 {
     const auto toNativeSeparators = [](const QStringList &files) -> QStringList {
         return Utils::transform(files, &QDir::toNativeSeparators);
     };
 
-    const QStringList filterSetting = settings->value("filters").toStringList();
+    const QStringList filterSetting = s.value("filters").toStringList();
     const QStringList filters = filterSetting.isEmpty() ? QStringList(defaultFilter)
                                                         : filterSetting;
-    const QVariant currentFilter = settings->value("currentFilter");
+    const QVariant currentFilter = s.value("currentFilter");
     d->m_filterSetting = currentFilter.isValid() ? currentFilter.toString()
                                                  : filters.first();
     d->m_filterStrings.setStringList(toNativeSeparators(filters));
     if (d->m_filterCombo)
         syncComboWithSettings(d->m_filterCombo, d->m_filterSetting);
 
-    QStringList exclusionFilters = settings->value("exclusionFilters").toStringList();
+    QStringList exclusionFilters = s.value("exclusionFilters").toStringList();
     if (!exclusionFilters.contains(defaultExclusionFilter))
         exclusionFilters << defaultExclusionFilter;
-    const QVariant currentExclusionFilter = settings->value("currentExclusionFilter");
+    const QVariant currentExclusionFilter = s.value("currentExclusionFilter");
     d->m_exclusionSetting = currentExclusionFilter.isValid() ? currentExclusionFilter.toString()
                                                           : exclusionFilters.first();
     d->m_exclusionStrings.setStringList(toNativeSeparators(exclusionFilters));
@@ -490,8 +500,8 @@ void BaseFileFind::readCommonSettings(QtcSettings *settings, const QString &defa
         syncComboWithSettings(d->m_exclusionCombo, d->m_exclusionSetting);
 
     for (SearchEngine* searchEngine : std::as_const(d->m_searchEngines))
-        searchEngine->readSettings(settings);
-    const int currentSearchEngineIndex = settings->value("currentSearchEngineIndex", 0).toInt();
+        searchEngine->readSettings(s);
+    const int currentSearchEngineIndex = s.value("currentSearchEngineIndex", 0).toInt();
     syncSearchEngineCombo(currentSearchEngineIndex);
 }
 
@@ -594,8 +604,7 @@ FilePaths BaseFileFind::replaceAll(const QString &text, const SearchResultItems
                                            item.mainRange().end.column + 1);
             changeSet.replace(start, end, replacement);
         }
-        file->setChangeSet(changeSet);
-        file->apply();
+        file->apply(changeSet);
     }
 
     return changes.keys();
diff --git a/src/plugins/texteditor/basefilefind.h b/src/plugins/texteditor/basefilefind.h
index 47adae4b866..de4286c31b6 100644
--- a/src/plugins/texteditor/basefilefind.h
+++ b/src/plugins/texteditor/basefilefind.h
@@ -69,8 +69,8 @@ public:
     virtual QString title() const = 0;
     virtual QString toolTip() const = 0; // add %1 placeholder where the find flags should be put
     virtual QWidget *widget() const = 0;
-    virtual void readSettings(Utils::QtcSettings *settings) = 0;
-    virtual void writeSettings(Utils::QtcSettings *settings) const = 0;
+    virtual void readSettings(const Utils::Store &s) = 0;
+    virtual void writeSettings(Utils::Store &settings) const = 0;
     virtual SearchExecutor searchExecutor() const = 0;
     virtual EditorOpener editorOpener() const { return {}; }
     bool isEnabled() const;
@@ -108,8 +108,10 @@ protected:
     virtual QString toolTip() const = 0; // see Core::SearchResultWindow::startNewSearch,
                                          // add %1 placeholder where the find flags should be put
 
-    void writeCommonSettings(Utils::QtcSettings *settings);
-    void readCommonSettings(Utils::QtcSettings *settings, const QString &defaultFilter, const QString &defaultExclusionFilter);
+    void writeCommonSettings(
+        Utils::Store &s, const QString &defaultFilter, const QString &defaultExclusionFilter) const;
+    void readCommonSettings(
+        const Utils::Store &s, const QString &defaultFilter, const QString &defaultExclusionFilter);
     QList<QPair<QWidget *, QWidget *>> createPatternWidgets();
     QStringList fileNameFilters() const;
     QStringList fileExclusionFilters() const;
diff --git a/src/plugins/texteditor/bookmarkmanager.cpp b/src/plugins/texteditor/bookmarkmanager.cpp
index 6dcb4de6cc5..625eca0c251 100644
--- a/src/plugins/texteditor/bookmarkmanager.cpp
+++ b/src/plugins/texteditor/bookmarkmanager.cpp
@@ -218,7 +218,6 @@ BookmarkView::BookmarkView()
     setDragEnabled(true);
     setDragDropMode(QAbstractItemView::DragDrop);
 
-    connect(this, &QAbstractItemView::doubleClicked, this, &BookmarkView::gotoBookmark);
     connect(this, &QAbstractItemView::activated, this, &BookmarkView::gotoBookmark);
 }
 
@@ -876,6 +875,7 @@ void BookmarkManager::edit()
     auto layout = new QFormLayout(&dlg);
     auto noteEdit = new QLineEdit(b->note());
     noteEdit->setMinimumWidth(300);
+    noteEdit->setFocus();
     auto lineNumberSpinbox = new QSpinBox;
     lineNumberSpinbox->setRange(1, INT_MAX);
     lineNumberSpinbox->setValue(b->lineNumber());
diff --git a/src/plugins/texteditor/colorpreviewhoverhandler.cpp b/src/plugins/texteditor/colorpreviewhoverhandler.cpp
index 62c7e1e5b48..fd014e0ad4a 100644
--- a/src/plugins/texteditor/colorpreviewhoverhandler.cpp
+++ b/src/plugins/texteditor/colorpreviewhoverhandler.cpp
@@ -33,7 +33,12 @@ static QString extractColorString(const QString &s, int pos)
         QChar c = s[firstPos];
         if (c == QLatin1Char('#'))
             break;
-
+        // color from string literal, i.e "red", 'red';
+        // strip leading and trailing quotes
+        if (c == QLatin1Char('\"') || c == QLatin1Char('\'')) {
+            firstPos += 1;
+            break;
+        }
         if (c == QLatin1Char(':')
                 && (firstPos > 3)
                 && (s.mid(firstPos-3, 4) == QLatin1String("Qt::"))) {
@@ -51,6 +56,8 @@ static QString extractColorString(const QString &s, int pos)
         return QString();
 
     int lastPos = firstPos + 1;
+    if (lastPos >= s.length())
+        return QString();
     do {
         QChar c = s[lastPos];
         if (!(c.isLetterOrNumber() || c == QLatin1Char(':')))
@@ -106,7 +113,7 @@ static QColor checkColorText(const QString &str)
         return fromEnumString(colorStr);
     }
 
-    return QColor();
+    return QColor::fromString(str);
 }
 
 // looks backwards through a string for the opening brace of a function
diff --git a/src/plugins/texteditor/commentssettings.cpp b/src/plugins/texteditor/commentssettings.cpp
index bc6f76cb4bd..d3171a94d68 100644
--- a/src/plugins/texteditor/commentssettings.cpp
+++ b/src/plugins/texteditor/commentssettings.cpp
@@ -106,7 +106,7 @@ CommentsSettingsWidget::CommentsSettingsWidget(const CommentsSettings::Data &set
     const auto commandPrefixLabel = new QLabel(Tr::tr("Doxygen command prefix:"));
     const QString commandPrefixToolTip = Tr::tr(R"(Doxygen allows "@" and "\" to start commands.
 By default, "@" is used if the surrounding comment starts with "/**" or "///", and "\" is used
-if the comment starts with "/*!" or "//!)");
+if the comment starts with "/*!" or "//!".)");
     commandPrefixLabel->setToolTip(commandPrefixToolTip);
     d->m_commandPrefixComboBox.setToolTip(commandPrefixToolTip);
     d->m_commandPrefixComboBox.addItem(Tr::tr("Automatic"));
diff --git a/src/plugins/texteditor/completionsettingspage.cpp b/src/plugins/texteditor/completionsettingspage.cpp
index aba86467143..03f45404c6b 100644
--- a/src/plugins/texteditor/completionsettingspage.cpp
+++ b/src/plugins/texteditor/completionsettingspage.cpp
@@ -214,7 +214,7 @@ CompletionSettingsPageWidget::CompletionSettingsPageWidget(CompletionSettingsPag
             }
         },
         Group {
-            title(Tr::tr("&Automatically insert matching characters")),
+            title(Tr::tr("&Automatically Insert Matching Characters")),
             Row {
                 Column {
                     m_insertBrackets,
diff --git a/src/plugins/texteditor/displaysettingspage.cpp b/src/plugins/texteditor/displaysettingspage.cpp
index b5435ed5e91..fe914b27ce9 100644
--- a/src/plugins/texteditor/displaysettingspage.cpp
+++ b/src/plugins/texteditor/displaysettingspage.cpp
@@ -108,7 +108,7 @@ public:
         rightAligned->setChecked(true);
         betweenLines = new QRadioButton(Tr::tr("Between lines"));
 
-        displayAnnotations = new QGroupBox(Tr::tr("Line annotations")),
+        displayAnnotations = new QGroupBox(Tr::tr("Line Annotations")),
         displayAnnotations->setCheckable(true);
 
         using namespace Layouting;
diff --git a/src/plugins/texteditor/findincurrentfile.cpp b/src/plugins/texteditor/findincurrentfile.cpp
index 7d3ad849972..45121f72d84 100644
--- a/src/plugins/texteditor/findincurrentfile.cpp
+++ b/src/plugins/texteditor/findincurrentfile.cpp
@@ -27,8 +27,8 @@ private:
     QString id() const final;
     QString displayName() const final;
     bool isEnabled() const final;
-    void writeSettings(Utils::QtcSettings *settings) final;
-    void readSettings(Utils::QtcSettings *settings) final;
+    Utils::Store save() const final;
+    void restore(const Utils::Store &s) final;
 
     QString label() const final;
     QString toolTip() const final;
@@ -37,6 +37,9 @@ private:
     void handleFileChange(Core::IEditor *editor);
 
     QPointer<Core::IDocument> m_currentDocument;
+
+    // deprecated
+    QByteArray settingsKey() const final;
 };
 
 FindInCurrentFile::FindInCurrentFile()
@@ -97,18 +100,24 @@ void FindInCurrentFile::handleFileChange(Core::IEditor *editor)
     }
 }
 
-void FindInCurrentFile::writeSettings(QtcSettings *settings)
+const char kDefaultInclusion[] = "*";
+const char kDefaultExclusion[] = "";
+
+Store FindInCurrentFile::save() const
 {
-    settings->beginGroup("FindInCurrentFile");
-    writeCommonSettings(settings);
-    settings->endGroup();
+    Store s;
+    writeCommonSettings(s, kDefaultInclusion, kDefaultExclusion);
+    return s;
 }
 
-void FindInCurrentFile::readSettings(QtcSettings *settings)
+void FindInCurrentFile::restore(const Store &s)
 {
-    settings->beginGroup("FindInCurrentFile");
-    readCommonSettings(settings, "*", "");
-    settings->endGroup();
+    readCommonSettings(s, kDefaultInclusion, kDefaultExclusion);
+}
+
+QByteArray FindInCurrentFile::settingsKey() const
+{
+    return "FindInCurrentFile";
 }
 
 void setupFindInCurrentFile()
diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp
index 955316954b5..9dc68cd6532 100644
--- a/src/plugins/texteditor/findinfiles.cpp
+++ b/src/plugins/texteditor/findinfiles.cpp
@@ -188,18 +188,24 @@ QWidget *FindInFiles::createConfigWidget()
     return m_configWidget;
 }
 
-void FindInFiles::writeSettings(QtcSettings *settings)
+const char kDefaultInclusion[] = "*.cpp,*.h";
+const char kDefaultExclusion[] = "*/.git/*,*/.cvs/*,*/.svn/*,*.autosave,*/build/*";
+
+Store FindInFiles::save() const
 {
-    settings->beginGroup("FindInFiles");
-    writeCommonSettings(settings);
-    settings->endGroup();
+    Store s;
+    writeCommonSettings(s, kDefaultInclusion, kDefaultExclusion);
+    return s;
 }
 
-void FindInFiles::readSettings(QtcSettings *settings)
+void FindInFiles::restore(const Utils::Store &s)
 {
-    settings->beginGroup("FindInFiles");
-    readCommonSettings(settings, "*.cpp,*.h", "*/.git/*,*/.cvs/*,*/.svn/*,*.autosave");
-    settings->endGroup();
+    readCommonSettings(s, kDefaultInclusion, kDefaultExclusion);
+}
+
+QByteArray FindInFiles::settingsKey() const
+{
+    return "FindInFiles";
 }
 
 void FindInFiles::setBaseDirectory(const FilePath &directory)
diff --git a/src/plugins/texteditor/findinfiles.h b/src/plugins/texteditor/findinfiles.h
index c7803a16ed4..b3bd7b7095b 100644
--- a/src/plugins/texteditor/findinfiles.h
+++ b/src/plugins/texteditor/findinfiles.h
@@ -30,8 +30,8 @@ public:
     QString id() const override;
     QString displayName() const override;
     QWidget *createConfigWidget() override;
-    void writeSettings(Utils::QtcSettings *settings) override;
-    void readSettings(Utils::QtcSettings *settings) override;
+    Utils::Store save() const override;
+    void restore(const Utils::Store &s) override;
     bool isValid() const override;
 
     void setDirectory(const Utils::FilePath &directory);
@@ -39,6 +39,9 @@ public:
     static void findOnFileSystem(const QString &path);
     static FindInFiles *instance();
 
+    // deprecated
+    QByteArray settingsKey() const override;
+
 protected:
     QString label() const override;
     QString toolTip() const override;
diff --git a/src/plugins/texteditor/findinopenfiles.cpp b/src/plugins/texteditor/findinopenfiles.cpp
index dcd505cbe1f..deeb66e9f5f 100644
--- a/src/plugins/texteditor/findinopenfiles.cpp
+++ b/src/plugins/texteditor/findinopenfiles.cpp
@@ -25,14 +25,17 @@ private:
     QString id() const final;
     QString displayName() const final;
     bool isEnabled() const final;
-    void writeSettings(Utils::QtcSettings *settings) final;
-    void readSettings(Utils::QtcSettings *settings) final;
+    Utils::Store save() const final;
+    void restore(const Utils::Store &s) final;
 
     QString label() const final;
     QString toolTip() const final;
 
     FileContainerProvider fileContainerProvider() const final;
     void updateEnabledState() { emit enabledChanged(isEnabled()); }
+
+    // deprecated
+    QByteArray settingsKey() const final;
 };
 
 FindInOpenFiles::FindInOpenFiles()
@@ -90,21 +93,25 @@ bool FindInOpenFiles::isEnabled() const
     return Core::DocumentModel::entryCount() > 0;
 }
 
-void FindInOpenFiles::writeSettings(QtcSettings *settings)
+const char kDefaultInclusion[] = "*";
+const char kDefaultExclusion[] = "";
+
+Store FindInOpenFiles::save() const
 {
-    settings->beginGroup("FindInOpenFiles");
-    writeCommonSettings(settings);
-    settings->endGroup();
+    Store s;
+    writeCommonSettings(s, kDefaultInclusion, kDefaultExclusion);
+    return s;
 }
 
-void FindInOpenFiles::readSettings(QtcSettings *settings)
+void FindInOpenFiles::restore(const Store &s)
 {
-    settings->beginGroup("FindInOpenFiles");
-    readCommonSettings(settings, "*", "");
-    settings->endGroup();
+    readCommonSettings(s, kDefaultInclusion, kDefaultExclusion);
 }
 
-
+QByteArray FindInOpenFiles::settingsKey() const
+{
+    return "FindInOpenFiles";
+}
 
 void setupFindInOpenFiles()
 {
diff --git a/src/plugins/texteditor/fontsettings.cpp b/src/plugins/texteditor/fontsettings.cpp
index e74a37c0d37..3cb58fd1282 100644
--- a/src/plugins/texteditor/fontsettings.cpp
+++ b/src/plugins/texteditor/fontsettings.cpp
@@ -156,7 +156,7 @@ QTextCharFormat FontSettings::toTextCharFormat(TextStyle category) const
     QTextCharFormat tf;
 
     if (category == C_TEXT) {
-        tf.setFontFamily(m_family);
+        tf.setFontFamilies({m_family});
         tf.setFontPointSize(m_fontSize * m_fontZoom / 100.);
         tf.setFontStyleStrategy(m_antialias ? QFont::PreferAntialias : QFont::NoAntialias);
     }
@@ -491,8 +491,7 @@ static QString defaultFontFamily()
         return QLatin1String("Menlo");
 
     const QString sourceCodePro(g_sourceCodePro);
-    const QFontDatabase dataBase;
-    if (dataBase.hasFamily(sourceCodePro))
+    if (QFontDatabase::hasFamily(sourceCodePro))
         return sourceCodePro;
 
     if (Utils::HostOsInfo::isAnyUnixHost())
diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp
index bdd899b7e04..f528496dcf0 100644
--- a/src/plugins/texteditor/fontsettingspage.cpp
+++ b/src/plugins/texteditor/fontsettingspage.cpp
@@ -458,15 +458,14 @@ void FontSettingsPageWidget::updateFontZoom(const FontSettings &fontSettings)
 
 QList<int> FontSettingsPageWidget::pointSizesForSelectedFont() const
 {
-    QFontDatabase db;
     const QString familyName = m_fontComboBox->currentFont().family();
-    QList<int> sizeLst = db.pointSizes(familyName);
+    QList<int> sizeLst = QFontDatabase::pointSizes(familyName);
     if (!sizeLst.isEmpty())
         return sizeLst;
 
-    QStringList styles = db.styles(familyName);
+    QStringList styles = QFontDatabase::styles(familyName);
     if (!styles.isEmpty())
-        sizeLst = db.pointSizes(familyName, styles.first());
+        sizeLst = QFontDatabase::pointSizes(familyName, styles.first());
     if (sizeLst.isEmpty())
         sizeLst = QFontDatabase::standardSizes();
 
diff --git a/src/plugins/texteditor/formattexteditor.cpp b/src/plugins/texteditor/formattexteditor.cpp
index 8a0fac2cd4d..4bd358e3e39 100644
--- a/src/plugins/texteditor/formattexteditor.cpp
+++ b/src/plugins/texteditor/formattexteditor.cpp
@@ -12,8 +12,10 @@
 
 #include <utils/async.h>
 #include <utils/differ.h>
+#include <utils/expected.h>
 #include <utils/qtcprocess.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/temporarydirectory.h>
 #include <utils/textutils.h>
 
@@ -27,6 +29,17 @@ using namespace std::chrono_literals;
 
 namespace TextEditor {
 
+struct FormatInput
+{
+    Utils::FilePath filePath;
+    QString sourceData;
+    TextEditor::Command command;
+    int startPos = -1;
+    int endPos = 0;
+};
+
+using FormatOutput = expected_str<QString>;
+
 void formatCurrentFile(const Command &command, int startPos, int endPos)
 {
     if (TextEditorWidget *editor = TextEditorWidget::currentTextEditorWidget())
@@ -40,89 +53,80 @@ static QString sourceData(TextEditorWidget *editor, int startPos, int endPos)
             : Utils::Text::textAt(editor->textCursor(), startPos, (endPos - startPos));
 }
 
-static FormatTask format(FormatTask task)
+static FormatOutput format(const FormatInput &input)
 {
-    task.error.clear();
-    task.formattedData.clear();
-
-    const FilePath executable = task.command.executable();
+    const FilePath executable = input.command.executable();
     if (executable.isEmpty())
-        return task;
+        return {};
 
-    switch (task.command.processing()) {
+    switch (input.command.processing()) {
     case Command::FileProcessing: {
         // Save text to temporary file
         Utils::TempFileSaver sourceFile(Utils::TemporaryDirectory::masterDirectoryPath()
-                                        + "/qtc_beautifier_XXXXXXXX."
-                                        + task.filePath.suffix());
+                                        + "/qtc_beautifier_XXXXXXXX." + input.filePath.suffix());
         sourceFile.setAutoRemove(true);
-        sourceFile.write(task.sourceData.toUtf8());
+        sourceFile.write(input.sourceData.toUtf8());
         if (!sourceFile.finalize()) {
-            task.error = Tr::tr("Cannot create temporary file \"%1\": %2.")
-                    .arg(sourceFile.filePath().toUserOutput(), sourceFile.errorString());
-            return task;
+            return Utils::make_unexpected(Tr::tr("Cannot create temporary file \"%1\": %2.")
+                         .arg(sourceFile.filePath().toUserOutput(), sourceFile.errorString()));
         }
 
         // Format temporary file
-        QStringList options = task.command.options();
+        QStringList options = input.command.options();
         options.replaceInStrings(QLatin1String("%file"), sourceFile.filePath().toString());
         Process process;
         process.setCommand({executable, options});
         process.runBlocking(5s);
         if (process.result() != ProcessResult::FinishedWithSuccess) {
-            task.error = Tr::tr("Failed to format: %1.").arg(process.exitMessage());
-            return task;
+            return Utils::make_unexpected(Tr::tr("Failed to format: %1.")
+                                             .arg(process.exitMessage()));
         }
         const QString output = process.cleanedStdErr();
         if (!output.isEmpty())
-            task.error = executable.toUserOutput() + ": " + output;
+            return Utils::make_unexpected(executable.toUserOutput() + ": " + output);
 
         // Read text back
         Utils::FileReader reader;
         if (!reader.fetch(sourceFile.filePath(), QIODevice::Text)) {
-            task.error = Tr::tr("Cannot read file \"%1\": %2.")
-                    .arg(sourceFile.filePath().toUserOutput(), reader.errorString());
-            return task;
+            return Utils::make_unexpected(Tr::tr("Cannot read file \"%1\": %2.")
+                         .arg(sourceFile.filePath().toUserOutput(), reader.errorString()));
         }
-        task.formattedData = QString::fromUtf8(reader.data());
+        return QString::fromUtf8(reader.data());
     }
-    return task;
 
     case Command::PipeProcessing: {
         Process process;
-        QStringList options = task.command.options();
-        options.replaceInStrings("%filename", task.filePath.fileName());
-        options.replaceInStrings("%file", task.filePath.toString());
+        QStringList options = input.command.options();
+        options.replaceInStrings("%filename", input.filePath.fileName());
+        options.replaceInStrings("%file", input.filePath.toString());
         process.setCommand({executable, options});
-        process.setWriteData(task.sourceData.toUtf8());
+        process.setWriteData(input.sourceData.toUtf8());
         process.start();
         if (!process.waitForFinished(5s)) {
-            task.error = Tr::tr("Cannot call %1 or some other error occurred. Timeout "
-                                                   "reached while formatting file %2.")
-                    .arg(executable.toUserOutput(), task.filePath.displayName());
-            return task;
+            return Utils::make_unexpected(Tr::tr("Cannot call %1 or some other error occurred. "
+                                                 "Timeout reached while formatting file %2.")
+                    .arg(executable.toUserOutput(), input.filePath.displayName()));
         }
         const QString errorText = process.readAllStandardError();
         if (!errorText.isEmpty()) {
-            task.error = QString("%1: %2").arg(executable.toUserOutput(), errorText);
-            return task;
+            return Utils::make_unexpected(QString("%1: %2").arg(executable.toUserOutput(),
+                                                                errorText));
         }
 
-        task.formattedData = process.readAllStandardOutput();
+        QString formattedData = process.readAllStandardOutput();
 
-        if (task.command.pipeAddsNewline() && task.formattedData.endsWith('\n')) {
-            task.formattedData.chop(1);
-            if (task.formattedData.endsWith('\r'))
-                task.formattedData.chop(1);
+        if (input.command.pipeAddsNewline() && formattedData.endsWith('\n')) {
+            formattedData.chop(1);
+            if (formattedData.endsWith('\r'))
+                formattedData.chop(1);
         }
-        if (task.command.returnsCRLF())
-            task.formattedData.replace("\r\n", "\n");
+        if (input.command.returnsCRLF())
+            formattedData.replace("\r\n", "\n");
 
-        return task;
+        return formattedData;
     }
     }
-
-    return task;
+    return {};
 }
 
 /**
@@ -256,31 +260,26 @@ static void showError(const QString &error)
  * Checks the state of @a task and if the formatting was successful calls updateEditorText() with
  * the respective members of @a task.
  */
-static void checkAndApplyTask(const FormatTask &task)
+static void checkAndApplyTask(const QPointer<QPlainTextEdit> &textEditor, const FormatInput &input,
+                              const FormatOutput &output)
 {
-    if (!task.error.isEmpty()) {
-        showError(task.error);
+    if (!output.has_value()) {
+        showError(output.error());
         return;
     }
 
-    if (task.formattedData.isEmpty()) {
-        showError(Tr::tr("Could not format file %1.").arg(
-                      task.filePath.displayName()));
+    if (output->isEmpty()) {
+        showError(Tr::tr("Could not format file %1.").arg(input.filePath.displayName()));
         return;
     }
 
-    QPlainTextEdit *textEditor = task.editor;
     if (!textEditor) {
-        showError(Tr::tr("File %1 was closed.").arg(
-                      task.filePath.displayName()));
+        showError(Tr::tr("File %1 was closed.").arg(input.filePath.displayName()));
         return;
     }
 
-    const QString formattedData = (task.startPos < 0)
-            ? task.formattedData
-            : QString(textEditor->toPlainText()).replace(
-                  task.startPos, (task.endPos - task.startPos), task.formattedData);
-
+    const QString formattedData = (input.startPos < 0) ? *output
+        : textEditor->toPlainText().replace(input.startPos, (input.endPos - input.startPos), *output);
     updateEditorText(textEditor, formattedData);
 }
 
@@ -298,8 +297,8 @@ void formatEditor(TextEditorWidget *editor, const Command &command, int startPos
     const QString sd = sourceData(editor, startPos, endPos);
     if (sd.isEmpty())
         return;
-    checkAndApplyTask(format(FormatTask(editor, editor->textDocument()->filePath(), sd,
-                                        command, startPos, endPos)));
+    const FormatInput input{editor->textDocument()->filePath(), sd, command, startPos, endPos};
+    checkAndApplyTask(editor, input, format(input));
 }
 
 /**
@@ -313,18 +312,20 @@ void formatEditorAsync(TextEditorWidget *editor, const Command &command, int sta
     if (sd.isEmpty())
         return;
 
-    auto watcher = new QFutureWatcher<FormatTask>;
+    auto watcher = new QFutureWatcher<FormatOutput>;
     const TextDocument *doc = editor->textDocument();
-    QObject::connect(doc, &TextDocument::contentsChanged, watcher, &QFutureWatcher<FormatTask>::cancel);
-    QObject::connect(watcher, &QFutureWatcherBase::finished, [watcher] {
+    const FormatInput input{doc->filePath(), sd, command, startPos, endPos};
+    QObject::connect(doc, &TextDocument::contentsChanged, watcher,
+                     &QFutureWatcher<FormatOutput>::cancel);
+    QObject::connect(watcher, &QFutureWatcherBase::finished, watcher,
+                     [watcher, editor = QPointer<QPlainTextEdit>(editor), input] {
         if (watcher->isCanceled())
             showError(Tr::tr("File was modified."));
         else
-            checkAndApplyTask(watcher->result());
+            checkAndApplyTask(editor, input, watcher->result());
         watcher->deleteLater();
     });
-    watcher->setFuture(Utils::asyncRun(&format, FormatTask(editor, doc->filePath(), sd,
-                                                           command, startPos, endPos)));
+    watcher->setFuture(Utils::asyncRun(&format, input));
 }
 
 } // namespace TextEditor
diff --git a/src/plugins/texteditor/formattexteditor.h b/src/plugins/texteditor/formattexteditor.h
index e1c58cdf94f..929763ecba8 100644
--- a/src/plugins/texteditor/formattexteditor.h
+++ b/src/plugins/texteditor/formattexteditor.h
@@ -10,35 +10,11 @@
 #include <utils/filepath.h>
 
 #include <QPlainTextEdit>
-#include <QPointer>
 
 namespace TextEditor {
 
 class TextEditorWidget;
 
-class TEXTEDITOR_EXPORT FormatTask
-{
-public:
-    FormatTask(QPlainTextEdit *_editor, const Utils::FilePath &_filePath, const QString &_sourceData,
-               const Command &_command, int _startPos = -1, int _endPos = 0) :
-        editor(_editor),
-        filePath(_filePath),
-        sourceData(_sourceData),
-        command(_command),
-        startPos(_startPos),
-        endPos(_endPos)
-    {}
-
-    QPointer<QPlainTextEdit> editor;
-    Utils::FilePath filePath;
-    QString sourceData;
-    TextEditor::Command command;
-    int startPos = -1;
-    int endPos = 0;
-    QString formattedData;
-    QString error;
-};
-
 TEXTEDITOR_EXPORT void formatCurrentFile(const TextEditor::Command &command, int startPos = -1, int endPos = 0);
 TEXTEDITOR_EXPORT void formatEditor(TextEditorWidget *editor, const TextEditor::Command &command,
                   int startPos = -1, int endPos = 0);
diff --git a/src/plugins/texteditor/highlighter_test.cpp b/src/plugins/texteditor/highlighter_test.cpp
index d50c560e23a..2cbd2b75d57 100644
--- a/src/plugins/texteditor/highlighter_test.cpp
+++ b/src/plugins/texteditor/highlighter_test.cpp
@@ -1,11 +1,10 @@
 // Copyright (C) 2023 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "syntaxhighlighterrunner.h"
-
 #include "highlighter_test.h"
 
 #include "fontsettings.h"
+#include "syntaxhighlighter.h"
 #include "textdocument.h"
 #include "texteditor.h"
 #include "texteditorsettings.h"
@@ -61,7 +60,7 @@ void GenerigHighlighterTests::initTestCase()
     m_editor->editorWidget()->configureGenericHighlighter(
         Utils::mimeTypeForName(Utils::Constants::JSON_MIMETYPE));
     QVERIFY(m_editor);
-    m_editor->textDocument()->syntaxHighlighterRunner()->rehighlight();
+    m_editor->textDocument()->syntaxHighlighter()->rehighlight();
 }
 
 using FormatRanges = QList<QTextLayout::FormatRange>;
@@ -214,7 +213,7 @@ void GenerigHighlighterTests::testPreeditText()
     block.layout()->setPreeditArea(7, "uaf");
     c.endEditBlock();
 
-    m_editor->textDocument()->syntaxHighlighterRunner()->rehighlight();
+    m_editor->textDocument()->syntaxHighlighter()->rehighlight();
 
     const FormatRanges formatRanges = {{0, 4, toFormat(C_VISUAL_WHITESPACE)},
                                        {4, 3, toFormat(C_TYPE)},
diff --git a/src/plugins/texteditor/highlighterhelper.cpp b/src/plugins/texteditor/highlighterhelper.cpp
index 6aa98439c05..e25b935f8ac 100644
--- a/src/plugins/texteditor/highlighterhelper.cpp
+++ b/src/plugins/texteditor/highlighterhelper.cpp
@@ -9,7 +9,6 @@
 #include "texteditor.h"
 #include "texteditorsettings.h"
 #include "texteditortr.h"
-#include "syntaxhighlighterrunner.h"
 
 #include <coreplugin/editormanager/documentmodel.h>
 #include <coreplugin/icore.h>
@@ -210,8 +209,8 @@ void reload()
     highlightRepository()->reload();
     for (auto editor : Core::DocumentModel::editorsForOpenedDocuments()) {
         if (auto textEditor = qobject_cast<BaseTextEditor *>(editor)) {
-            if (auto highlighterRunner = textEditor->textDocument()->syntaxHighlighterRunner();
-                highlighterRunner && highlighterRunner->useGenericHighlighter()) {
+            if (auto highlighter = textEditor->textDocument()->syntaxHighlighter();
+                highlighter && qobject_cast<SyntaxHighlighter*>(highlighter)) {
                 textEditor->editorWidget()->configureGenericHighlighter();
             }
         }
diff --git a/src/plugins/texteditor/jsoneditor.cpp b/src/plugins/texteditor/jsoneditor.cpp
index d06f215c688..7081394f9be 100644
--- a/src/plugins/texteditor/jsoneditor.cpp
+++ b/src/plugins/texteditor/jsoneditor.cpp
@@ -6,7 +6,6 @@
 #include "autocompleter.h"
 #include "textdocument.h"
 #include "texteditor.h"
-#include "texteditoractionhandler.h"
 #include "texteditortr.h"
 #include "textindenter.h"
 
@@ -164,7 +163,7 @@ public:
         setDocumentCreator([] { return new TextDocument(JSON_EDITOR_ID); });
         setAutoCompleterCreator([] { return new JsonAutoCompleter; });
         setIndenterCreator([](QTextDocument *doc) { return new JsonIndenter(doc); });
-        setEditorActionHandlers(TextEditorActionHandler::Format);
+        setOptionalActionMask(OptionalActions::Format);
         setUseGenericHighlighter(true);
     }
 };
diff --git a/src/plugins/texteditor/markdowneditor.cpp b/src/plugins/texteditor/markdowneditor.cpp
index dbfdcda2b42..93b580a935e 100644
--- a/src/plugins/texteditor/markdowneditor.cpp
+++ b/src/plugins/texteditor/markdowneditor.cpp
@@ -16,8 +16,6 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/minisplitter.h>
 
-#include <texteditor/texteditoractionhandler.h>
-
 #include <utils/action.h>
 #include <utils/ranges.h>
 #include <utils/qtcsettings.h>
@@ -73,7 +71,7 @@ class MarkdownEditor : public IEditor
 {
     Q_OBJECT
 public:
-    MarkdownEditor(const TextEditor::TextEditorActionHandler *actionHandler)
+    MarkdownEditor()
         : m_document(new TextDocument(MARKDOWNVIEWER_ID))
     {
         m_document->setMimeType(MARKDOWNVIEWER_MIME_TYPE);
@@ -108,10 +106,25 @@ public:
 
         // editor
         m_textEditorWidget = new MarkdownEditorWidget;
-        m_textEditorWidget->setOptionalActions(actionHandler->optionalActions());
+        m_textEditorWidget->setOptionalActions(OptionalActions::FollowSymbolUnderCursor);
         m_textEditorWidget->setTextDocument(m_document);
         m_textEditorWidget->setupGenericHighlighter();
         m_textEditorWidget->setMarksVisible(false);
+        QObject::connect(
+            m_textEditorWidget,
+            &TextEditorWidget::saveCurrentStateForNavigationHistory,
+            this,
+            &MarkdownEditor::saveCurrentStateForNavigationHistory);
+        QObject::connect(
+            m_textEditorWidget,
+            &TextEditorWidget::addSavedStateToNavigationHistory,
+            this,
+            &MarkdownEditor::addSavedStateToNavigationHistory);
+        QObject::connect(
+            m_textEditorWidget,
+            &TextEditorWidget::addCurrentStateToNavigationHistory,
+            this,
+            &MarkdownEditor::addCurrentStateToNavigationHistory);
         auto context = new IContext(this);
         context->setWidget(m_textEditorWidget);
         context->setContext(Context(MARKDOWNVIEWER_TEXT_CONTEXT));
@@ -478,6 +491,18 @@ private:
         }
     }
 
+    void saveCurrentStateForNavigationHistory() { m_savedNavigationState = saveState(); }
+
+    void addSavedStateToNavigationHistory()
+    {
+        EditorManager::addCurrentPositionToNavigationHistory(m_savedNavigationState);
+    }
+
+    void addCurrentStateToNavigationHistory()
+    {
+        EditorManager::addCurrentPositionToNavigationHistory();
+    }
+
 private:
     QTimer m_previewTimer;
     bool m_performDelayedUpdate = false;
@@ -493,6 +518,7 @@ private:
     QAction *m_togglePreviewVisibleAction;
     QAction *m_swapViewsAction;
     std::optional<QPoint> m_previewRestoreScrollPosition;
+    QByteArray m_savedNavigationState;
 };
 
 class MarkdownEditorFactory final : public IEditorFactory
@@ -501,7 +527,6 @@ public:
     MarkdownEditorFactory();
 
 private:
-    TextEditorActionHandler m_actionHandler;
     Action m_emphasisAction;
     Action m_strongAction;
     Action m_inlineCodeAction;
@@ -512,17 +537,11 @@ private:
 };
 
 MarkdownEditorFactory::MarkdownEditorFactory()
-    : m_actionHandler(MARKDOWNVIEWER_ID,
-                      MARKDOWNVIEWER_TEXT_CONTEXT,
-                      TextEditor::TextEditorActionHandler::FollowSymbolUnderCursor,
-                      [](IEditor *editor) {
-                          return static_cast<MarkdownEditor *>(editor)->textEditorWidget();
-                      })
 {
     setId(MARKDOWNVIEWER_ID);
     setDisplayName(::Core::Tr::tr("Markdown Editor"));
     addMimeType(MARKDOWNVIEWER_MIME_TYPE);
-    setEditorCreator([this] { return new MarkdownEditor{&m_actionHandler}; });
+    setEditorCreator([] { return new MarkdownEditor; });
 
     const auto textContext = Context(MARKDOWNVIEWER_TEXT_CONTEXT);
     const auto context = Context(MARKDOWNVIEWER_ID);
diff --git a/src/plugins/texteditor/plaintexteditorfactory.cpp b/src/plugins/texteditor/plaintexteditorfactory.cpp
index fbaf430284d..ef989ee6216 100644
--- a/src/plugins/texteditor/plaintexteditorfactory.cpp
+++ b/src/plugins/texteditor/plaintexteditorfactory.cpp
@@ -5,7 +5,6 @@
 #include "basehoverhandler.h"
 #include "textdocument.h"
 #include "texteditor.h"
-#include "texteditoractionhandler.h"
 #include "texteditorconstants.h"
 
 #include <coreplugin/coreconstants.h>
@@ -40,9 +39,9 @@ public:
         setEditorWidgetCreator([]() { return new PlainTextEditorWidget; });
         setUseGenericHighlighter(true);
 
-        setEditorActionHandlers(TextEditorActionHandler::Format |
-                                TextEditorActionHandler::UnCommentSelection |
-                                TextEditorActionHandler::UnCollapseAll);
+        setOptionalActionMask(
+                    OptionalActions::Format | OptionalActions::UnCommentSelection
+                    | OptionalActions::UnCollapseAll);
     }
 };
 
diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp
index ebd487cc370..c8688f2fba5 100644
--- a/src/plugins/texteditor/refactoringchanges.cpp
+++ b/src/plugins/texteditor/refactoringchanges.cpp
@@ -214,6 +214,9 @@ void RefactoringFile::setOpenEditor(bool activate, int pos)
 
 bool RefactoringFile::apply()
 {
+    if (m_changes.isEmpty())
+        return true;
+
     // test file permissions
     if (!m_filePath.isWritableFile()) {
         ReadOnlyFilesDialog roDialog(m_filePath, ICore::dialogParent());
@@ -287,6 +290,12 @@ bool RefactoringFile::apply()
     return result;
 }
 
+bool RefactoringFile::apply(const Utils::ChangeSet &changeSet)
+{
+    setChangeSet(changeSet);
+    return apply();
+}
+
 void RefactoringFile::setupFormattingRanges(const QList<ChangeSet::EditOp> &replaceList)
 {
     QTextDocument * const doc = m_editor ? m_editor->document() : m_document;
@@ -359,7 +368,7 @@ void RefactoringFile::doFormatting()
     Utils::sort(m_formattingCursors, [](const auto &tc1, const auto &tc2) {
         return tc1.first.selectionStart() < tc2.first.selectionStart();
     });
-    static const QString clangFormatLineRemovalBlocker("// QTC_TEMP");
+    static const QString clangFormatLineRemovalBlocker("");
     for (auto &[formattingCursor, _] : m_formattingCursors) {
         const QTextBlock firstBlock = document->findBlock(formattingCursor.selectionStart());
         const QTextBlock lastBlock = document->findBlock(formattingCursor.selectionEnd());
diff --git a/src/plugins/texteditor/refactoringchanges.h b/src/plugins/texteditor/refactoringchanges.h
index 913c731df27..3e043c4f6be 100644
--- a/src/plugins/texteditor/refactoringchanges.h
+++ b/src/plugins/texteditor/refactoringchanges.h
@@ -60,6 +60,7 @@ public:
     void setChangeSet(const Utils::ChangeSet &changeSet);
     void setOpenEditor(bool activate = false, int pos = -1);
     bool apply();
+    bool apply(const Utils::ChangeSet &changeSet);
     bool create(const QString &contents, bool reindent, bool openInEditor);
 
 protected:
diff --git a/src/plugins/texteditor/semantichighlighter.cpp b/src/plugins/texteditor/semantichighlighter.cpp
index 9cee346d8b0..0c385d2e4b5 100644
--- a/src/plugins/texteditor/semantichighlighter.cpp
+++ b/src/plugins/texteditor/semantichighlighter.cpp
@@ -5,7 +5,6 @@
 
 #include "syntaxhighlighter.h"
 #include "texteditorsettings.h"
-#include "syntaxhighlighterrunner.h"
 
 #include <utils/qtcassert.h>
 
@@ -75,7 +74,7 @@ const Ranges rangesForResult(
 }
 
 void SemanticHighlighter::incrementalApplyExtraAdditionalFormats(
-    SyntaxHighlighterRunner *highlighter,
+    SyntaxHighlighter *highlighter,
     const QFuture<HighlightingResult> &future,
     int from,
     int to,
@@ -114,21 +113,17 @@ void SemanticHighlighter::incrementalApplyExtraAdditionalFormats(
             formatRanges[range.block].append(range.formatRange);
     }
 
-    QList<int> clearBlockNumberVector;
-    QMap<int, QList<QTextLayout::FormatRange>> blockNumberMap;
     for (auto &[block, ranges] : formatRanges) {
         while (currentBlock < block) {
-            clearBlockNumberVector.append(currentBlock.blockNumber());
+            highlighter->clearExtraFormats(currentBlock);
             currentBlock = currentBlock.next();
         }
-        blockNumberMap[block.blockNumber()] = ranges;
+        highlighter->setExtraFormats(block, std::move(ranges));
         currentBlock = block.next();
     }
-    highlighter->clearExtraFormats(clearBlockNumberVector);
-    highlighter->setExtraFormats(blockNumberMap);
 }
 
-void SemanticHighlighter::setExtraAdditionalFormats(SyntaxHighlighterRunner *highlighter,
+void SemanticHighlighter::setExtraAdditionalFormats(SyntaxHighlighter *highlighter,
                                                     const QList<HighlightingResult> &results,
                                                     const QHash<int, QTextCharFormat> &kindToFormat)
 {
@@ -139,19 +134,19 @@ void SemanticHighlighter::setExtraAdditionalFormats(SyntaxHighlighterRunner *hig
     QTextDocument *doc = highlighter->document();
     QTC_ASSERT(doc, return );
 
-    QMap<int, QList<QTextLayout::FormatRange>> blockNumberMap;
+    std::map<QTextBlock, QVector<QTextLayout::FormatRange>> formatRanges;
 
-    for (const HighlightingResult &result : results) {
-        const Ranges ranges = rangesForResult(result, doc, kindToFormat);
-        for (const Range &range : ranges)
-            blockNumberMap[range.block.blockNumber()].append(range.formatRange);
+    for (auto result : results) {
+        for (const Range &range : rangesForResult(result, doc, kindToFormat))
+            formatRanges[range.block].append(range.formatRange);
     }
 
-    highlighter->setExtraFormats(blockNumberMap);
+    for (auto &[block, ranges] : formatRanges)
+        highlighter->setExtraFormats(block, std::move(ranges));
 }
 
 void SemanticHighlighter::clearExtraAdditionalFormatsUntilEnd(
-    SyntaxHighlighterRunner *highlighter, const QFuture<HighlightingResult> &future)
+    SyntaxHighlighter *highlighter, const QFuture<HighlightingResult> &future)
 {
     const QTextDocument * const doc = highlighter->document();
     QTextBlock firstBlockToClear = doc->begin();
@@ -168,7 +163,6 @@ void SemanticHighlighter::clearExtraAdditionalFormatsUntilEnd(
 
     QList<int> clearBlockNumberVector;
     for (QTextBlock b = firstBlockToClear; b.isValid(); b = b.next())
-        clearBlockNumberVector.append(b.blockNumber());
+        highlighter->clearExtraFormats(b);
 
-    highlighter->clearExtraFormats(clearBlockNumberVector);
 }
diff --git a/src/plugins/texteditor/semantichighlighter.h b/src/plugins/texteditor/semantichighlighter.h
index ad1d854b834..f8ae30a0eda 100644
--- a/src/plugins/texteditor/semantichighlighter.h
+++ b/src/plugins/texteditor/semantichighlighter.h
@@ -21,7 +21,6 @@ QT_END_NAMESPACE
 namespace TextEditor {
 
 class SyntaxHighlighter;
-class SyntaxHighlighterRunner;
 
 class TEXTEDITOR_EXPORT HighlightingResult
 {
@@ -74,7 +73,7 @@ using Splitter = std::function<const QList<std::pair<HighlightingResult, QTextBl
 // the (to-1).line result.
 // Requires that results of the Future are ordered by line.
 void TEXTEDITOR_EXPORT
-incrementalApplyExtraAdditionalFormats(SyntaxHighlighterRunner *highlighter,
+incrementalApplyExtraAdditionalFormats(SyntaxHighlighter *highlighter,
                                        const QFuture<HighlightingResult> &future,
                                        int from,
                                        int to,
@@ -85,7 +84,7 @@ incrementalApplyExtraAdditionalFormats(SyntaxHighlighterRunner *highlighter,
 // indicated by Result::kind and kindToFormat to the correct location using
 // SyntaxHighlighter::setExtraFormats. In contrast to
 // incrementalApplyExtraAdditionalFormats the results do not have to be ordered by line.
-void TEXTEDITOR_EXPORT setExtraAdditionalFormats(SyntaxHighlighterRunner *highlighter,
+void TEXTEDITOR_EXPORT setExtraAdditionalFormats(SyntaxHighlighter *highlighter,
                                                  const HighlightingResults &results,
                                                  const QHash<int, QTextCharFormat> &kindToFormat);
 
@@ -93,7 +92,7 @@ void TEXTEDITOR_EXPORT setExtraAdditionalFormats(SyntaxHighlighterRunner *highli
 // until the end of the document.
 // Requires that results of the Future are ordered by line.
 void TEXTEDITOR_EXPORT clearExtraAdditionalFormatsUntilEnd(
-    SyntaxHighlighterRunner *highlighter, const QFuture<HighlightingResult> &future);
+    SyntaxHighlighter *highlighter, const QFuture<HighlightingResult> &future);
 
 } // namespace SemanticHighlighter
 } // namespace TextEditor
diff --git a/src/plugins/texteditor/snippets/snippetssettings.cpp b/src/plugins/texteditor/snippets/snippetssettings.cpp
deleted file mode 100644
index cce25bc7109..00000000000
--- a/src/plugins/texteditor/snippets/snippetssettings.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "snippetssettings.h"
-
-#include <utils/qtcsettings.h>
-
-using namespace Utils;
-
-namespace TextEditor {
-
-const char kGroupPostfix[] = "SnippetsSettings";
-const char kLastUsedSnippetGroup[] = "LastUsedSnippetGroup";
-
-void SnippetsSettings::toSettings(const Key &category, QtcSettings *s) const
-{
-    const Key group = category + kGroupPostfix;
-    s->beginGroup(group);
-    s->setValue(kLastUsedSnippetGroup, m_lastUsedSnippetGroup);
-    s->endGroup();
-}
-
-void SnippetsSettings::fromSettings(const Key &category, QtcSettings *s)
-{
-    const Key group = category + kGroupPostfix;
-    s->beginGroup(group);
-    m_lastUsedSnippetGroup = s->value(kLastUsedSnippetGroup, QString()).toString();
-    s->endGroup();
-}
-
-void SnippetsSettings::setLastUsedSnippetGroup(const QString &lastUsed)
-{
-    m_lastUsedSnippetGroup = lastUsed;
-}
-
-const QString &SnippetsSettings::lastUsedSnippetGroup() const
-{
-    return m_lastUsedSnippetGroup;
-}
-
-bool SnippetsSettings::equals(const SnippetsSettings &snippetsSettings) const
-{
-    return m_lastUsedSnippetGroup == snippetsSettings.m_lastUsedSnippetGroup;
-}
-
-} // TextEditor
diff --git a/src/plugins/texteditor/snippets/snippetssettings.h b/src/plugins/texteditor/snippets/snippetssettings.h
deleted file mode 100644
index 732d51f6716..00000000000
--- a/src/plugins/texteditor/snippets/snippetssettings.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <QString>
-
-namespace Utils {
-class Key;
-class QtcSettings;
-} // Utils
-
-namespace TextEditor {
-
-class SnippetsSettings
-{
-public:
-    SnippetsSettings() = default;
-
-    void toSettings(const Utils::Key &category, Utils::QtcSettings *s) const;
-    void fromSettings(const Utils::Key &category, Utils::QtcSettings *s);
-
-    void setLastUsedSnippetGroup(const QString &lastUsed);
-    const QString &lastUsedSnippetGroup() const;
-
-    bool equals(const SnippetsSettings &snippetsSettings) const;
-
-    friend bool operator==(const SnippetsSettings &a, const SnippetsSettings &b)
-    { return a.equals(b); }
-    friend bool operator!=(const SnippetsSettings &a, const SnippetsSettings &b)
-    { return !a.equals(b); }
-
-private:
-    QString m_lastUsedSnippetGroup;
-};
-
-} // TextEditor
diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.cpp b/src/plugins/texteditor/snippets/snippetssettingspage.cpp
index 51deff5ad1f..546d532bbf3 100644
--- a/src/plugins/texteditor/snippets/snippetssettingspage.cpp
+++ b/src/plugins/texteditor/snippets/snippetssettingspage.cpp
@@ -7,7 +7,6 @@
 #include "snippetprovider.h"
 #include "snippet.h"
 #include "snippetscollection.h"
-#include "snippetssettings.h"
 #include "../fontsettings.h"
 #include "../textdocument.h"
 #include "../texteditorconstants.h"
@@ -39,6 +38,8 @@ using namespace Utils;
 
 namespace TextEditor::Internal {
 
+const char kLastUsedSnippetGroup[] = "TextSnippetsSettings/LastUsedSnippetGroup";
+
 // SnippetsTableModel
 
 class SnippetsTableModel : public QAbstractTableModel
@@ -244,8 +245,6 @@ void SnippetsTableModel::replaceSnippet(const Snippet &snippet, const QModelInde
     }
 }
 
-// SnippetsSettingsWidget
-
 class SnippetsSettingsWidget : public Core::IOptionsPageWidget
 {
 public:
@@ -275,10 +274,9 @@ private:
     bool settingsChanged() const;
     void writeSettings();
 
-    const Key m_settingsPrefix{"Text"};
     SnippetsTableModel m_model;
     bool m_snippetsCollectionChanged = false;
-    SnippetsSettings m_settings;
+    QString m_lastUsedSnippetGroup;
 
     QStackedWidget *m_snippetsEditorStack;
     QComboBox *m_groupCombo;
@@ -407,9 +405,8 @@ void SnippetsSettingsWidget::loadSettings()
     if (m_groupCombo->count() == 0)
         return;
 
-    m_settings.fromSettings(m_settingsPrefix, Core::ICore::settings());
-    const QString &lastGroupName = m_settings.lastUsedSnippetGroup();
-    const int index = m_groupCombo->findText(lastGroupName);
+    m_lastUsedSnippetGroup = Core::ICore::settings()->value(kLastUsedSnippetGroup, QString()).toString();
+    const int index = m_groupCombo->findText(m_lastUsedSnippetGroup);
     if (index != -1)
         m_groupCombo->setCurrentIndex(index);
     else
@@ -421,15 +418,13 @@ void SnippetsSettingsWidget::writeSettings()
     if (m_groupCombo->count() == 0)
         return;
 
-    m_settings.setLastUsedSnippetGroup(m_groupCombo->currentText());
-    m_settings.toSettings(m_settingsPrefix, Core::ICore::settings());
+    m_lastUsedSnippetGroup = m_groupCombo->currentText();
+    Core::ICore::settings()->setValue(kLastUsedSnippetGroup, m_lastUsedSnippetGroup);
 }
 
 bool SnippetsSettingsWidget::settingsChanged() const
 {
-    if (m_settings.lastUsedSnippetGroup() != m_groupCombo->currentText())
-        return true;
-    return false;
+    return m_lastUsedSnippetGroup != m_groupCombo->currentText();
 }
 
 void SnippetsSettingsWidget::loadSnippetGroup(int index)
diff --git a/src/plugins/texteditor/syntaxhighlighter.cpp b/src/plugins/texteditor/syntaxhighlighter.cpp
index f7db190852d..0162cdeeff0 100644
--- a/src/plugins/texteditor/syntaxhighlighter.cpp
+++ b/src/plugins/texteditor/syntaxhighlighter.cpp
@@ -25,8 +25,6 @@ enum HighlighterTypeProperty
 
 class SyntaxHighlighterPrivate
 {
-    SyntaxHighlighter *q_ptr = nullptr;
-    Q_DECLARE_PUBLIC(SyntaxHighlighter)
 public:
     SyntaxHighlighterPrivate() = default;
 
@@ -37,8 +35,10 @@ public:
 
     QPointer<QTextDocument> doc;
 
+    void updateFormats(int from, int charsRemoved, int charsAdded);
     void reformatBlocks(int from, int charsRemoved, int charsAdded);
-    void reformatBlock(const QTextBlock &block, int from, int charsRemoved, int charsAdded);
+    void reformatBlocks();
+    void reformatBlock(const QTextBlock &block);
 
     inline void rehighlight(QTextCursor &cursor, QTextCursor::MoveOperation operation) {
         inReformatBlocks = true;
@@ -48,7 +48,7 @@ public:
         inReformatBlocks = false;
     }
 
-    void applyFormatChanges(int from, int charsRemoved, int charsAdded);
+    void applyFormatChanges();
     void updateFormats(const FontSettings &fontSettings);
 
     FontSettings fontSettings;
@@ -61,6 +61,11 @@ public:
     QList<std::pair<int,TextStyle>> formatCategories;
     QTextCharFormat whitespaceFormat;
     QString mimeType;
+    bool syntaxInfoUpToDate = false;
+    int highlightStartBlock = 0;
+    int highlightEndBlock = 0;
+    QSet<int> forceRehighlightBlocks;
+    SyntaxHighlighter *q;
 };
 
 static bool adjustRange(QTextLayout::FormatRange &range, int from, int charsDelta)
@@ -77,31 +82,30 @@ static bool adjustRange(QTextLayout::FormatRange &range, int from, int charsDelt
 
 void SyntaxHighlighter::delayedRehighlight()
 {
-    Q_D(SyntaxHighlighter);
     if (!d->rehighlightPending)
         return;
     d->rehighlightPending = false;
 
-    if (document()->isEmpty())
-        return;
-
     rehighlight();
 }
 
+void SyntaxHighlighter::continueRehighlight()
+{
+    d->reformatBlocks();
+}
+
 #ifdef WITH_TESTS
 SyntaxHighlighter::SyntaxHighlighter(QTextDocument *parent, const FontSettings &fontsettings)
-    : QObject(parent), d_ptr(new SyntaxHighlighterPrivate(fontsettings))
+    : QObject(parent), d(new SyntaxHighlighterPrivate(fontsettings))
 {
-    d_ptr->q_ptr = this;
+    d->q = this;
     if (parent)
         setDocument(parent);
 }
 #endif
 
-void SyntaxHighlighterPrivate::applyFormatChanges(int from, int charsRemoved, int charsAdded)
+void SyntaxHighlighterPrivate::applyFormatChanges()
 {
-    bool formatsChanged = false;
-
     QTextLayout *layout = currentBlock.layout();
 
     QList<QTextLayout::FormatRange> ranges;
@@ -111,12 +115,6 @@ void SyntaxHighlighterPrivate::applyFormatChanges(int from, int charsRemoved, in
               return range.format.property(SyntaxHighlight).toBool();
           });
 
-    if (currentBlock.contains(from)) {
-        const int charsDelta = charsAdded - charsRemoved;
-        for (QTextLayout::FormatRange &range : ranges)
-            formatsChanged |= adjustRange(range, from - currentBlock.position(), charsDelta);
-    }
-
     QTextCharFormat emptyFormat;
 
     QTextLayout::FormatRange r;
@@ -157,7 +155,7 @@ void SyntaxHighlighterPrivate::applyFormatChanges(int from, int charsRemoved, in
         newRanges << r;
     }
 
-    formatsChanged = formatsChanged || (newRanges.size() != oldRanges.size());
+    bool formatsChanged = (newRanges.size() != oldRanges.size());
 
     for (int i = 0; !formatsChanged && i < newRanges.size(); ++i) {
         const QTextLayout::FormatRange &o = oldRanges.at(i);
@@ -174,85 +172,103 @@ void SyntaxHighlighterPrivate::applyFormatChanges(int from, int charsRemoved, in
 
 void SyntaxHighlighter::reformatBlocks(int from, int charsRemoved, int charsAdded)
 {
-    Q_D(SyntaxHighlighter);
     if (!d->inReformatBlocks)
         d->reformatBlocks(from, charsRemoved, charsAdded);
 }
 
+void SyntaxHighlighterPrivate::updateFormats(int from, int charsRemoved, int charsAdded)
+{
+    bool formatsChanged = false;
+
+    const QTextBlock block = doc->findBlock(from);
+    QTextLayout *layout = block.layout();
+
+    QList<QTextLayout::FormatRange> ranges = layout->formats();
+
+    const int charsDelta = charsAdded - charsRemoved;
+    for (QTextLayout::FormatRange &range : ranges)
+        formatsChanged |= adjustRange(range, from - block.position(), charsDelta);
+
+    if (formatsChanged) {
+        layout->setFormats(ranges);
+        doc->markContentsDirty(block.position(), block.length());
+    }
+}
+
 void SyntaxHighlighterPrivate::reformatBlocks(int from, int charsRemoved, int charsAdded)
 {
-    Q_Q(SyntaxHighlighter);
-    foldValidator.reset();
-
-    rehighlightPending = false;
+    updateFormats(from, charsRemoved, charsAdded);
 
     QTextBlock block = doc->findBlock(from);
+    if (block.isValid() && block.blockNumber() < highlightStartBlock)
+        highlightStartBlock = block.blockNumber();
+    block = doc->findBlock(from + charsAdded + (charsRemoved > 0 ? 1 : 0));
     if (!block.isValid())
-        return;
+        highlightEndBlock = doc->blockCount() - 1;
+    else if (block.blockNumber() > highlightEndBlock)
+        highlightEndBlock = block.blockNumber();
 
-    int endPosition;
-    QTextBlock lastBlock = doc->findBlock(from + charsAdded + (charsRemoved > 0 ? 1 : 0));
-    if (lastBlock.isValid())
-        endPosition = lastBlock.position() + lastBlock.length();
-    else
-        endPosition = doc->lastBlock().position() + doc->lastBlock().length();
+    reformatBlocks();
+}
+
+void SyntaxHighlighterPrivate::reformatBlocks()
+{
+    QElapsedTimer et;
+    et.start();
+
+    syntaxInfoUpToDate = false;
+    rehighlightPending = false;
+
+    foldValidator.reset();
 
     bool forceHighlightOfNextBlock = false;
+    QTextBlock block = doc->findBlockByNumber(highlightStartBlock);
+    QTC_ASSERT(block.isValid(), block = doc->firstBlock());
+    QTextBlock endBlock = doc->findBlockByNumber(highlightEndBlock);
+    QTC_ASSERT(endBlock.isValid(), endBlock = doc->lastBlock());
 
-    QList<SyntaxHighlighter::Result> vecRes;
-
-    SyntaxHighlighter::Result resStart;
-    resStart.m_state = SyntaxHighlighter::State::Start;
-    vecRes << resStart;
-
-    while (block.isValid() && (block.position() < endPosition || forceHighlightOfNextBlock)) {
-        if (QThread::currentThread()->isInterruptionRequested() || q->isInterrupted()) {
-            inReformatBlocks = false;
-            emit q->resultsReady({});
-            return;
-        }
+    while (block.isValid()) {
+        if (et.elapsed() > 20)
+            break;
 
         const int stateBeforeHighlight = block.userState();
 
-        reformatBlock(block, from, charsRemoved, charsAdded);
-
-        forceHighlightOfNextBlock = (block.userState() != stateBeforeHighlight);
-
-        SyntaxHighlighter::Result res;
-        res.m_formatRanges = block.layout()->formats();
-        res.fillByBlock(block);
-        vecRes << res;
-
-        // Sending data to the text editor in chunks of 200 blocks is a sensible approach.
-        // This helps avoid UI slowdowns when applying formatting to the text.
-        if (vecRes.size() >= 200) {
-            emit q->resultsReady(vecRes);
-            vecRes.clear();
+        if (forceHighlightOfNextBlock || forceRehighlightBlocks.contains(block.blockNumber())
+                || block.blockNumber() <= highlightEndBlock) {
+            reformatBlock(block);
+            forceRehighlightBlocks.remove(block.blockNumber());
+            forceHighlightOfNextBlock = (block.userState() != stateBeforeHighlight);
         }
+        highlightStartBlock = block.blockNumber();
 
+        if (block == endBlock && !forceHighlightOfNextBlock)
+            break;
         block = block.next();
     }
 
     formatChanges.clear();
-
     foldValidator.finalize();
-    SyntaxHighlighter::Result res;
-    res.m_state = SyntaxHighlighter::State::Done;
-    vecRes << res;
-    emit q->resultsReady(vecRes);
+
+    if (endBlock.isValid() && block.isValid() && block.blockNumber() < endBlock.blockNumber()) {
+        QMetaObject::invokeMethod(q, &SyntaxHighlighter::continueRehighlight, Qt::QueuedConnection);
+        if (forceHighlightOfNextBlock)
+            forceRehighlightBlocks << block.blockNumber();
+    } else {
+        highlightEndBlock = 0;
+        syntaxInfoUpToDate = true;
+        emit q->finished();
+    }
 }
 
-void SyntaxHighlighterPrivate::reformatBlock(const QTextBlock &block, int from, int charsRemoved, int charsAdded)
+void SyntaxHighlighterPrivate::reformatBlock(const QTextBlock &block)
 {
-    Q_Q(SyntaxHighlighter);
-
-    Q_ASSERT_X(!currentBlock.isValid(), "SyntaxHighlighter::reformatBlock()", "reFormatBlock() called recursively");
+    QTC_ASSERT(!currentBlock.isValid(), return);
 
     currentBlock = block;
 
     formatChanges.fill(QTextCharFormat(), block.length() - 1);
     q->highlightBlock(block.text());
-    applyFormatChanges(from, charsRemoved, charsAdded);
+    applyFormatChanges();
 
     foldValidator.process(currentBlock);
 
@@ -293,9 +309,9 @@ void SyntaxHighlighterPrivate::reformatBlock(const QTextBlock &block, int from,
     Constructs a SyntaxHighlighter with the given \a parent.
 */
 SyntaxHighlighter::SyntaxHighlighter(QObject *parent)
-    : QObject(parent), d_ptr(new SyntaxHighlighterPrivate)
+    : QObject(parent), d(new SyntaxHighlighterPrivate)
 {
-    d_ptr->q_ptr = this;
+    d->q = this;
 }
 
 /*!
@@ -304,9 +320,9 @@ SyntaxHighlighter::SyntaxHighlighter(QObject *parent)
     SyntaxHighlighter.
 */
 SyntaxHighlighter::SyntaxHighlighter(QTextDocument *parent)
-    : QObject(parent), d_ptr(new SyntaxHighlighterPrivate)
+    : QObject(parent), d(new SyntaxHighlighterPrivate)
 {
-    d_ptr->q_ptr = this;
+    d->q = this;
     if (parent)
         setDocument(parent);
 }
@@ -317,9 +333,9 @@ SyntaxHighlighter::SyntaxHighlighter(QTextDocument *parent)
     the SyntaxHighlighter.
 */
 SyntaxHighlighter::SyntaxHighlighter(QTextEdit *parent)
-    : QObject(parent), d_ptr(new SyntaxHighlighterPrivate)
+    : QObject(parent), d(new SyntaxHighlighterPrivate)
 {
-    d_ptr->q_ptr = this;
+    d->q = this;
     if (parent)
         setDocument(parent->document());
 }
@@ -338,7 +354,6 @@ SyntaxHighlighter::~SyntaxHighlighter()
 */
 void SyntaxHighlighter::setDocument(QTextDocument *doc)
 {
-    Q_D(SyntaxHighlighter);
     if (d->doc == doc)
         return;
 
@@ -356,10 +371,7 @@ void SyntaxHighlighter::setDocument(QTextDocument *doc)
     documentChanged(oldDoc, d->doc);
     if (d->doc) {
         connect(d->doc, &QTextDocument::contentsChange, this, &SyntaxHighlighter::reformatBlocks);
-        d->rehighlightPending = true;
-        QMetaObject::invokeMethod(this,
-                                  &SyntaxHighlighter::delayedRehighlight,
-                                  Qt::QueuedConnection);
+        scheduleRehighlight();
         d->foldValidator.setup(qobject_cast<TextDocumentLayout *>(doc->documentLayout()));
     }
 }
@@ -370,19 +382,16 @@ void SyntaxHighlighter::setDocument(QTextDocument *doc)
 */
 QTextDocument *SyntaxHighlighter::document() const
 {
-    Q_D(const SyntaxHighlighter);
     return d->doc;
 }
 
 void SyntaxHighlighter::setMimeType(const QString &mimeType)
 {
-    Q_D(SyntaxHighlighter);
     d->mimeType = mimeType;
 }
 
 QString SyntaxHighlighter::mimeType() const
 {
-    Q_D(const SyntaxHighlighter);
     return d->mimeType;
 }
 
@@ -395,7 +404,6 @@ QString SyntaxHighlighter::mimeType() const
 */
 void SyntaxHighlighter::rehighlight()
 {
-    Q_D(SyntaxHighlighter);
     if (!d->doc)
         return;
 
@@ -403,6 +411,17 @@ void SyntaxHighlighter::rehighlight()
     d->rehighlight(cursor, QTextCursor::End);
 }
 
+void SyntaxHighlighter::scheduleRehighlight()
+{
+    if (d->rehighlightPending)
+        return;
+    d->rehighlightPending = true;
+    d->syntaxInfoUpToDate = false;
+    QMetaObject::invokeMethod(this,
+                              &SyntaxHighlighter::delayedRehighlight,
+                              Qt::QueuedConnection);
+}
+
 /*!
     \since 4.6
 
@@ -412,7 +431,6 @@ void SyntaxHighlighter::rehighlight()
 */
 void SyntaxHighlighter::rehighlightBlock(const QTextBlock &block)
 {
-    Q_D(SyntaxHighlighter);
     if (!d->doc || !block.isValid() || block.document() != d->doc)
         return;
 
@@ -486,7 +504,6 @@ void SyntaxHighlighter::rehighlightBlock(const QTextBlock &block)
 */
 void SyntaxHighlighter::setFormat(int start, int count, const QTextCharFormat &format)
 {
-    Q_D(SyntaxHighlighter);
     if (start < 0 || start >= d->formatChanges.count())
         return;
 
@@ -533,7 +550,6 @@ void SyntaxHighlighter::setFormat(int start, int count, const QFont &font)
 
 void SyntaxHighlighter::formatSpaces(const QString &text, int start, int count)
 {
-    Q_D(const SyntaxHighlighter);
     int offset = start;
     const int end = std::min(start + count, int(text.length()));
     while (offset < end) {
@@ -585,10 +601,7 @@ void SyntaxHighlighter::setFormatWithSpaces(const QString &text, int start, int
 */
 QTextCharFormat SyntaxHighlighter::format(int pos) const
 {
-    Q_D(const SyntaxHighlighter);
-    if (pos < 0 || pos >= d->formatChanges.count())
-        return QTextCharFormat();
-    return d->formatChanges.at(pos);
+    return d->formatChanges.value(pos);
 }
 
 /*!
@@ -600,7 +613,6 @@ QTextCharFormat SyntaxHighlighter::format(int pos) const
 */
 int SyntaxHighlighter::previousBlockState() const
 {
-    Q_D(const SyntaxHighlighter);
     if (!d->currentBlock.isValid())
         return -1;
 
@@ -617,7 +629,6 @@ int SyntaxHighlighter::previousBlockState() const
 */
 int SyntaxHighlighter::currentBlockState() const
 {
-    Q_D(const SyntaxHighlighter);
     if (!d->currentBlock.isValid())
         return -1;
 
@@ -631,7 +642,6 @@ int SyntaxHighlighter::currentBlockState() const
 */
 void SyntaxHighlighter::setCurrentBlockState(int newState)
 {
-    Q_D(SyntaxHighlighter);
     if (!d->currentBlock.isValid())
         return;
 
@@ -674,7 +684,6 @@ void SyntaxHighlighter::setCurrentBlockState(int newState)
 */
 void SyntaxHighlighter::setCurrentBlockUserData(QTextBlockUserData *data)
 {
-    Q_D(SyntaxHighlighter);
     if (!d->currentBlock.isValid())
         return;
 
@@ -689,7 +698,6 @@ void SyntaxHighlighter::setCurrentBlockUserData(QTextBlockUserData *data)
 */
 QTextBlockUserData *SyntaxHighlighter::currentBlockUserData() const
 {
-    Q_D(const SyntaxHighlighter);
     if (!d->currentBlock.isValid())
         return nullptr;
 
@@ -703,7 +711,6 @@ QTextBlockUserData *SyntaxHighlighter::currentBlockUserData() const
 */
 QTextBlock SyntaxHighlighter::currentBlock() const
 {
-    Q_D(const SyntaxHighlighter);
     return d->currentBlock;
 }
 
@@ -715,8 +722,6 @@ static bool byStartOfRange(const QTextLayout::FormatRange &range, const QTextLay
 void SyntaxHighlighter::setExtraFormats(const QTextBlock &block,
                                         const QList<QTextLayout::FormatRange> &formats)
 {
-    Q_D(SyntaxHighlighter);
-
     QList<QTextLayout::FormatRange> formatsCopy = formats;
 
     const int blockLength = block.length();
@@ -766,20 +771,17 @@ void SyntaxHighlighter::setExtraFormats(const QTextBlock &block,
     d->inReformatBlocks = true;
     block.layout()->setFormats(formatsToApply);
 
-    SyntaxHighlighter::Result res;
-    res.m_formatRanges = block.layout()->formats();
-    res.fillByBlock(block);
-    res.m_state = SyntaxHighlighter::State::Extras;
-    emit resultsReady({std::move(res)});
-
     document()->markContentsDirty(block.position(), blockLength - 1);
     d->inReformatBlocks = wasInReformatBlocks;
 }
 
+bool SyntaxHighlighter::syntaxHighlighterUpToDate() const
+{
+    return d->syntaxInfoUpToDate;
+}
+
 void SyntaxHighlighter::clearExtraFormats(const QTextBlock &block)
 {
-    Q_D(SyntaxHighlighter);
-
     const int blockLength = block.length();
     if (block.layout() == nullptr || blockLength == 0)
         return;
@@ -793,12 +795,6 @@ void SyntaxHighlighter::clearExtraFormats(const QTextBlock &block)
     d->inReformatBlocks = true;
     block.layout()->setFormats(formatsToApply);
 
-    SyntaxHighlighter::Result res;
-    res.m_formatRanges = block.layout()->formats();
-    res.fillByBlock(block);
-    res.m_state = SyntaxHighlighter::State::Extras;
-    emit resultsReady({std::move(res)});
-
     document()->markContentsDirty(block.position(), blockLength - 1);
     d->inReformatBlocks = wasInReformatBlocks;
 }
@@ -848,13 +844,11 @@ QList<QColor> SyntaxHighlighter::generateColors(int n, const QColor &background)
 
 void SyntaxHighlighter::setFontSettings(const FontSettings &fontSettings)
 {
-    Q_D(SyntaxHighlighter);
     d->updateFormats(fontSettings);
 }
 
 FontSettings SyntaxHighlighter::fontSettings() const
 {
-    Q_D(const SyntaxHighlighter);
     return d->fontSettings;
 }
 
@@ -897,7 +891,6 @@ void SyntaxHighlighter::setTextFormatCategories(int count,
 */
 void SyntaxHighlighter::setTextFormatCategories(const QList<std::pair<int, TextStyle>> &categories)
 {
-    Q_D(SyntaxHighlighter);
     d->formatCategories = categories;
     const int maxCategory = Utils::maxElementOr(categories, {-1, C_TEXT}).first;
     d->formats = QList<QTextCharFormat>(maxCategory + 1);
@@ -906,7 +899,6 @@ void SyntaxHighlighter::setTextFormatCategories(const QList<std::pair<int, TextS
 
 QTextCharFormat SyntaxHighlighter::formatForCategory(int category) const
 {
-    Q_D(const SyntaxHighlighter);
     QTC_ASSERT(d->formats.size() > category, return QTextCharFormat());
 
     return d->formats.at(category);
@@ -914,7 +906,6 @@ QTextCharFormat SyntaxHighlighter::formatForCategory(int category) const
 
 QTextCharFormat SyntaxHighlighter::whitespacified(const QTextCharFormat &fmt)
 {
-    Q_D(SyntaxHighlighter);
     QTextCharFormat format = d->whitespaceFormat;
     format.setBackground(fmt.background());
     return format;
diff --git a/src/plugins/texteditor/syntaxhighlighter.h b/src/plugins/texteditor/syntaxhighlighter.h
index 13d595d82f4..39bb084465c 100644
--- a/src/plugins/texteditor/syntaxhighlighter.h
+++ b/src/plugins/texteditor/syntaxhighlighter.h
@@ -32,7 +32,6 @@ class SyntaxHighlighterPrivate;
 class TEXTEDITOR_EXPORT SyntaxHighlighter : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(SyntaxHighlighter)
 public:
     SyntaxHighlighter(QObject *parent = nullptr);
     SyntaxHighlighter(QTextDocument *parent);
@@ -51,79 +50,16 @@ public:
     virtual void setFontSettings(const TextEditor::FontSettings &fontSettings);
     TextEditor::FontSettings fontSettings() const;
 
-    enum State {
-        Start,
-        InProgress,
-        Done,
-        Extras
-    };
-
-    struct Result
-    {
-        void fillByBlock(const QTextBlock &block)
-        {
-            m_blockNumber = block.blockNumber();
-            m_userState = block.userState();
-
-            TextBlockUserData *userDate = TextDocumentLayout::textUserData(block);
-            if (!userDate)
-                return;
-
-            m_hasBlockUserData = true;
-            m_foldingIndent = userDate->foldingIndent();
-            m_ifdefedOut = userDate->ifdefedOut();
-            m_foldingStartIncluded = userDate->foldingStartIncluded();
-            m_foldingEndIncluded = userDate->foldingEndIncluded();
-            m_parentheses = userDate->parentheses();
-            m_expectedRawStringSuffix = userDate->expectedRawStringSuffix();
-        }
-
-        void copyToBlock(QTextBlock &block) const
-        {
-            block.setUserState(m_userState);
-
-            if (!m_hasBlockUserData)
-                return;
-
-            TextBlockUserData *data = TextDocumentLayout::userData(block);
-            data->setExpectedRawStringSuffix(m_expectedRawStringSuffix);
-            data->setFoldingIndent(m_foldingIndent);
-            data->setFoldingStartIncluded(m_foldingStartIncluded);
-            data->setFoldingEndIncluded(m_foldingEndIncluded);
-
-            if (m_ifdefedOut)
-                data->setIfdefedOut();
-            else
-                data->clearIfdefedOut();
-
-            data->setParentheses(m_parentheses);
-        }
-
-        int m_blockNumber;
-        bool m_hasBlockUserData = false;
-
-        int m_foldingIndent : 16;
-        uint m_ifdefedOut : 1;
-        uint m_foldingStartIncluded : 1;
-        uint m_foldingEndIncluded : 1;
-
-        Parentheses m_parentheses;
-        QByteArray m_expectedRawStringSuffix;
-        int m_userState = -1;
-        QList<QTextLayout::FormatRange> m_formatRanges;
-
-        State m_state = InProgress;
-    };
-
-    void setInterrupted(bool interrupted) { m_interrupted = interrupted; }
-    bool isInterrupted() { return m_interrupted; }
     void setExtraFormats(const QTextBlock &block, const QList<QTextLayout::FormatRange> &formats);
     virtual void setLanguageFeaturesFlags(unsigned int /*flags*/) {}; // needed for CppHighlighting
     virtual void setEnabled(bool /*enabled*/) {}; // needed for DiffAndLogHighlighter
     virtual void setDefinitionName(const QString & /*definitionName*/) {} // needed for Highlighter
 
+    bool syntaxHighlighterUpToDate() const;
+
 public slots:
     virtual void rehighlight();
+    virtual void scheduleRehighlight();
     void rehighlightBlock(const QTextBlock &block);
     void clearExtraFormats(const QTextBlock &block);
     void reformatBlocks(int from, int charsRemoved, int charsAdded);
@@ -158,18 +94,18 @@ protected:
 
     QTextBlock currentBlock() const;
 
-protected:
     virtual void documentChanged(QTextDocument * /*oldDoc*/, QTextDocument * /*newDoc*/) {};
 
 signals:
-    void resultsReady(const QList<Result> &result);
+    void finished();
 
 private:
     void setTextFormatCategories(const QList<std::pair<int, TextStyle>> &categories);
     void delayedRehighlight();
+    void continueRehighlight();
 
-    QScopedPointer<SyntaxHighlighterPrivate> d_ptr;
-    std::atomic<bool> m_interrupted = false;
+    friend class SyntaxHighlighterPrivate;
+    std::unique_ptr<SyntaxHighlighterPrivate> d;
 
 #ifdef WITH_TESTS
     friend class tst_highlighter;
diff --git a/src/plugins/texteditor/syntaxhighlighterrunner.cpp b/src/plugins/texteditor/syntaxhighlighterrunner.cpp
deleted file mode 100644
index 874f8254abf..00000000000
--- a/src/plugins/texteditor/syntaxhighlighterrunner.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-// Copyright (C) 2023 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "syntaxhighlighterrunner.h"
-
-#include "fontsettings.h"
-#include "textdocumentlayout.h"
-#include "texteditorsettings.h"
-#include "highlighter.h"
-
-#include <utils/algorithm.h>
-#include <utils/textutils.h>
-
-#include <QMetaObject>
-#include <QTextCursor>
-#include <QTextDocument>
-#include <QThread>
-
-namespace TextEditor {
-
-struct BlockPreeditData {
-    int position;
-    QString text;
-};
-
-class SyntaxHighlighterRunnerPrivate : public QObject
-{
-    Q_OBJECT
-public:
-    SyntaxHighlighterRunnerPrivate(SyntaxHighlighter *highlighter,
-                                   QTextDocument *document,
-                                   bool async)
-        : m_highlighter(highlighter)
-    {
-        if (async) {
-            m_document = new QTextDocument(this);
-            m_document->setDocumentLayout(new TextDocumentLayout(m_document));
-        } else {
-            m_document = document;
-        }
-
-        m_highlighter->setParent(m_document);
-        m_highlighter->setDocument(m_document);
-
-        connect(m_highlighter,
-                &SyntaxHighlighter::resultsReady,
-                this,
-                &SyntaxHighlighterRunnerPrivate::resultsReady);
-    }
-
-    void changeDocument(int from,
-                        int charsRemoved,
-                        const QString textAdded,
-                        const QMap<int, BlockPreeditData> &blocksPreedit)
-    {
-        QTextCursor cursor(m_document);
-        cursor.setPosition(qMin(m_document->characterCount() - 1, from + charsRemoved));
-        cursor.setPosition(from, QTextCursor::KeepAnchor);
-        cursor.insertText(textAdded);
-
-        for (auto it = blocksPreedit.cbegin(); it != blocksPreedit.cend(); ++it) {
-            const QTextBlock block = m_document->findBlockByNumber(it.key());
-            block.layout()->setPreeditArea(it.value().position, it.value().text);
-        }
-    }
-
-    void setExtraFormats(const QMap<int, QList<QTextLayout::FormatRange>> &formatMap)
-    {
-        QTC_ASSERT(m_highlighter, return);
-        for (auto it = formatMap.cbegin(); it != formatMap.cend(); ++it)
-            m_highlighter->setExtraFormats(m_document->findBlockByNumber(it.key()), it.value());
-    }
-
-    void clearExtraFormats(const QList<int> &blockNumbers)
-    {
-        QTC_ASSERT(m_highlighter, return);
-        for (auto it = blockNumbers.cbegin(); it != blockNumbers.cend(); ++it)
-            m_highlighter->clearExtraFormats(m_document->findBlockByNumber(*it));
-    }
-
-    void clearAllExtraFormats()
-    {
-        QTC_ASSERT(m_highlighter, return);
-        m_highlighter->clearAllExtraFormats();
-    }
-
-    void setFontSettings(const TextEditor::FontSettings &fontSettings)
-    {
-        QTC_ASSERT(m_highlighter, return);
-        m_highlighter->setFontSettings(fontSettings);
-    }
-
-    void setDefinitionName(const QString &name)
-    {
-        QTC_ASSERT(m_highlighter, return);
-        m_highlighter->setDefinitionName(name);
-    }
-
-    void setLanguageFeaturesFlags(unsigned int flags)
-    {
-        QTC_ASSERT(m_highlighter, return);
-        m_highlighter->setLanguageFeaturesFlags(flags);
-    }
-
-    void setEnabled(bool enabled)
-    {
-        QTC_ASSERT(m_highlighter, return);
-        m_highlighter->setEnabled(enabled);
-    }
-
-    void rehighlight()
-    {
-        QTC_ASSERT(m_highlighter, return);
-        m_highlighter->rehighlight();
-    }
-
-    void reformatBlocks(int from, int charsRemoved, int charsAdded)
-    {
-        QTC_ASSERT(m_highlighter, return);
-        m_highlighter->reformatBlocks(from, charsRemoved, charsAdded);
-    }
-
-    void setInterrupted(bool interrupted)
-    {
-        QTC_ASSERT(m_highlighter, return);
-        m_highlighter->setInterrupted(interrupted);
-    }
-
-    QPointer<SyntaxHighlighter> m_highlighter = nullptr;
-    QTextDocument *m_document = nullptr;
-
-signals:
-    void resultsReady(const QList<SyntaxHighlighter::Result> &result);
-
-};
-
-void SyntaxHighlighterRunner::HighlightingStatus::notInterrupted(int from,
-                                                                 int charsRemoved,
-                                                                 int charsAdded)
-{
-    m_from = from;
-    m_addedChars = charsAdded;
-    m_removedChars = charsRemoved;
-    m_current = from;
-    m_newFrom = from + m_addedChars;
-    m_interruptionRequested = false;
-}
-
-void SyntaxHighlighterRunner::HighlightingStatus::interrupted(int from,
-                                                              int charsRemoved,
-                                                              int charsAdded)
-{
-    m_newFrom = std::min(m_newFrom, from);
-    m_newFrom = std::min(m_current, m_newFrom);
-    m_removedChars += charsRemoved;
-    m_addedChars += charsAdded;
-    m_interruptionRequested = true;
-}
-
-void SyntaxHighlighterRunner::HighlightingStatus::applyNewFrom()
-{
-    m_from = m_newFrom;
-    m_current = m_newFrom;
-    m_interruptionRequested = false;
-}
-
-SyntaxHighlighterRunner::SyntaxHighlighterRunner(SyntaxHighlighter *highlighter,
-                                                 QTextDocument *document,
-                                                 bool async)
-    : d(new SyntaxHighlighterRunnerPrivate(highlighter, document, async))
-    , m_document(document)
-{
-    m_useGenericHighlighter = qobject_cast<Highlighter *>(d->m_highlighter);
-
-    if (async) {
-        m_thread.emplace();
-        d->moveToThread(&*m_thread);
-        connect(&*m_thread, &QThread::finished, d, &QObject::deleteLater);
-        m_thread->start();
-
-        connect(d,
-                &SyntaxHighlighterRunnerPrivate::resultsReady,
-                this,
-                &SyntaxHighlighterRunner::applyFormatRanges);
-
-        changeDocument(0, 0, m_document->characterCount());
-        connect(m_document,
-                &QTextDocument::contentsChange,
-                this,
-                &SyntaxHighlighterRunner::changeDocument);
-
-        m_foldValidator.setup(qobject_cast<TextDocumentLayout *>(document->documentLayout()));
-    } else {
-        connect(d,
-                &SyntaxHighlighterRunnerPrivate::resultsReady,
-                this,
-                [this](const QList<SyntaxHighlighter::Result> &result) {
-                    if (result.size() == 1
-                        && result.at(0).m_state == SyntaxHighlighter::State::Extras)
-                        return;
-
-                    auto done = std::find_if(result.cbegin(),
-                                             result.cend(),
-                                             [](const SyntaxHighlighter::Result &res) {
-                                                 return res.m_state
-                                                        == SyntaxHighlighter::State::Done;
-                                             });
-                    if (done != result.cend()) {
-                        m_syntaxInfoUpdated = SyntaxHighlighter::State::Done;
-                        emit highlightingFinished();
-                        return;
-                    }
-                    m_syntaxInfoUpdated = SyntaxHighlighter::State::InProgress;
-                });
-    }
-}
-
-SyntaxHighlighterRunner::~SyntaxHighlighterRunner()
-{
-    if (m_thread) {
-        m_thread->requestInterruption();
-        m_thread->quit();
-        m_thread->wait();
-    } else {
-        delete d;
-    }
-}
-
-void SyntaxHighlighterRunner::applyFormatRanges(const QList<SyntaxHighlighter::Result> &results)
-{
-    if (m_document == nullptr)
-        return;
-
-    if (m_highlightingStatus.m_interruptionRequested) {
-        d->setInterrupted(false);
-        m_highlightingStatus.applyNewFrom();
-        reformatBlocks(m_highlightingStatus.m_newFrom,
-                       m_highlightingStatus.m_removedChars,
-                       m_highlightingStatus.m_addedChars);
-        return;
-    }
-
-    auto processResult = [this](SyntaxHighlighter::Result result, QTextBlock docBlock) {
-        if (!docBlock.isValid())
-            return;
-
-        result.copyToBlock(docBlock);
-        m_highlightingStatus.m_current = docBlock.position() + docBlock.length() - 1;
-
-        if (result.m_formatRanges != docBlock.layout()->formats()) {
-            docBlock.layout()->setFormats(result.m_formatRanges);
-            m_document->markContentsDirty(docBlock.position(), docBlock.length());
-        }
-    };
-
-    if (results.size() == 1 && results.at(0).m_state == SyntaxHighlighter::State::Extras) {
-        QTextBlock docBlock = m_document->findBlockByNumber(results.at(0).m_blockNumber);
-        processResult(results.at(0), docBlock);
-        return;
-    }
-
-    for (const SyntaxHighlighter::Result &result : results) {
-        m_syntaxInfoUpdated = result.m_state;
-        if (m_syntaxInfoUpdated == SyntaxHighlighter::State::Start) {
-            m_foldValidator.reset();
-            continue;
-        }
-        if (m_syntaxInfoUpdated == SyntaxHighlighter::State::Done) {
-            m_foldValidator.finalize();
-            emit highlightingFinished();
-            return;
-        }
-
-        QTextBlock docBlock = m_document->findBlockByNumber(result.m_blockNumber);
-        processResult(result, docBlock);
-        m_foldValidator.process(docBlock);
-    }
-}
-
-void SyntaxHighlighterRunner::changeDocument(int from, int charsRemoved, int charsAdded)
-{
-    QTC_ASSERT(m_document, return);
-    SyntaxHighlighter::State prevSyntaxInfoUpdated = m_syntaxInfoUpdated;
-    m_syntaxInfoUpdated = SyntaxHighlighter::State::InProgress;
-
-    QMap<int, BlockPreeditData> blocksPreedit;
-    QTextBlock block = m_document->findBlock(from);
-    const QTextBlock endBlock = m_document->findBlock(from + charsAdded);
-    while (block.isValid() && block != endBlock) {
-        if (QTextLayout *layout = block.layout()) {
-            if (const int pos = layout->preeditAreaPosition(); pos != -1)
-                blocksPreedit[block.blockNumber()] = {pos, layout->preeditAreaText()};
-        }
-        block = block.next();
-    }
-    const QString text = Utils::Text::textAt(QTextCursor(m_document), from, charsAdded);
-    QMetaObject::invokeMethod(d, [this, from, charsRemoved, text, blocksPreedit] {
-        d->changeDocument(from, charsRemoved, text, blocksPreedit);
-    });
-
-    if (prevSyntaxInfoUpdated == SyntaxHighlighter::State::InProgress) {
-        m_highlightingStatus.interrupted(from, charsRemoved, charsAdded);
-        d->setInterrupted(true);
-    } else {
-        m_highlightingStatus.notInterrupted(from, charsRemoved, charsAdded);
-        d->setInterrupted(false);
-    }
-}
-
-bool SyntaxHighlighterRunner::useGenericHighlighter() const
-{
-    return m_useGenericHighlighter;
-}
-
-void SyntaxHighlighterRunner::setExtraFormats(
-    const QMap<int, QList<QTextLayout::FormatRange>> &formatMap)
-{
-    QMetaObject::invokeMethod(d, [this, formatMap] { d->setExtraFormats(formatMap); });
-}
-
-void SyntaxHighlighterRunner::clearExtraFormats(const QList<int> &blockNumbers)
-{
-    QMetaObject::invokeMethod(d, [this, blockNumbers] { d->clearExtraFormats(blockNumbers); });
-}
-
-void SyntaxHighlighterRunner::clearAllExtraFormats()
-{
-    QMetaObject::invokeMethod(d, [this] { d->clearAllExtraFormats(); });
-}
-
-void SyntaxHighlighterRunner::setFontSettings(const TextEditor::FontSettings &fontSettings)
-{
-    QMetaObject::invokeMethod(d, [this, fontSettings] { d->setFontSettings(fontSettings); });
-    rehighlight();
-}
-
-void SyntaxHighlighterRunner::setLanguageFeaturesFlags(unsigned int flags)
-{
-    QMetaObject::invokeMethod(d, [this, flags] { d->setLanguageFeaturesFlags(flags); });
-}
-
-void SyntaxHighlighterRunner::setEnabled(bool enabled)
-{
-    QMetaObject::invokeMethod(d, [this, enabled] { d->setEnabled(enabled); });
-}
-
-void SyntaxHighlighterRunner::rehighlight()
-{
-    if (m_syntaxInfoUpdated == SyntaxHighlighter::State::InProgress) {
-        m_highlightingStatus.interrupted(0, 0, m_document->characterCount());
-        d->setInterrupted(true);
-    } else {
-        m_highlightingStatus.notInterrupted(0, 0, m_document->characterCount());
-        d->setInterrupted(false);
-        QMetaObject::invokeMethod(d, [this] { d->rehighlight(); });
-    }
-}
-
-
-void SyntaxHighlighterRunner::reformatBlocks(int from, int charsRemoved, int charsAdded)
-{
-    QMetaObject::invokeMethod(
-        d,
-        [this, from, charsRemoved, charsAdded] {
-            d->reformatBlocks(from, charsRemoved, charsAdded);
-        });
-}
-
-QString SyntaxHighlighterRunner::definitionName()
-{
-    return m_definitionName;
-}
-
-void SyntaxHighlighterRunner::setDefinitionName(const QString &name)
-{
-    if (name.isEmpty())
-        return;
-
-    m_definitionName = name;
-    QMetaObject::invokeMethod(d, [this, name] { d->setDefinitionName(name); });
-}
-
-} // namespace TextEditor
-
-#include "syntaxhighlighterrunner.moc"
diff --git a/src/plugins/texteditor/syntaxhighlighterrunner.h b/src/plugins/texteditor/syntaxhighlighterrunner.h
deleted file mode 100644
index 16b7c1535c8..00000000000
--- a/src/plugins/texteditor/syntaxhighlighterrunner.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (C) 2023 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <texteditor/fontsettings.h>
-#include <texteditor/syntaxhighlighter.h>
-#include <texteditor/texteditorsettings.h>
-
-#include <QObject>
-#include <QPointer>
-
-QT_BEGIN_NAMESPACE
-class QTextDocument;
-QT_END_NAMESPACE
-
-namespace TextEditor {
-
-class SyntaxHighlighterRunnerPrivate;
-
-class TEXTEDITOR_EXPORT SyntaxHighlighterRunner : public QObject
-{
-    Q_OBJECT
-public:
-    using SyntaxHighlighterCreator = std::function<SyntaxHighlighter *()>;
-
-    SyntaxHighlighterRunner(SyntaxHighlighter *highlighter, QTextDocument *document, bool async);
-    virtual ~SyntaxHighlighterRunner();
-
-    void setExtraFormats(const QMap<int, QList<QTextLayout::FormatRange>> &formats);
-    void clearExtraFormats(const QList<int> &blockNumbers);
-    void clearAllExtraFormats();
-    void setFontSettings(const TextEditor::FontSettings &fontSettings);
-    void setLanguageFeaturesFlags(unsigned int flags);
-    void setEnabled(bool enabled);
-    void rehighlight();
-    void reformatBlocks(int from, int charsRemoved, int charsAdded);
-
-    QString definitionName();
-    void setDefinitionName(const QString &name);
-
-    QTextDocument *document() const { return m_document; }
-    bool useGenericHighlighter() const;
-
-    bool syntaxInfoUpdated() const { return m_syntaxInfoUpdated == SyntaxHighlighter::State::Done; }
-
-signals:
-    void highlightingFinished();
-
-private:
-    void applyFormatRanges(const QList<SyntaxHighlighter::Result> &results);
-    void changeDocument(int from, int charsRemoved, int charsAdded);
-
-    SyntaxHighlighterRunnerPrivate *d;
-    QPointer<QTextDocument> m_document = nullptr;
-    SyntaxHighlighter::State m_syntaxInfoUpdated = SyntaxHighlighter::State::Done;
-
-    struct HighlightingStatus
-    {
-        int m_from = 0;
-        int m_addedChars = 0;
-        int m_current = 0;
-        int m_removedChars = 0;
-        int m_newFrom = 0;
-        bool m_interruptionRequested = false;
-
-        void notInterrupted(int from, int charsRemoved, int charsAdded);
-        void interrupted(int from, int charsRemoved, int charsAdded);
-        void applyNewFrom();
-    } m_highlightingStatus;
-
-    bool m_useGenericHighlighter = false;
-    QString m_definitionName;
-    std::optional<QThread> m_thread;
-    TextDocumentLayout::FoldValidator m_foldValidator;
-};
-
-} // namespace TextEditor
-
diff --git a/src/plugins/texteditor/textdocument.cpp b/src/plugins/texteditor/textdocument.cpp
index 2636ad46e23..7fcfe5c86c2 100644
--- a/src/plugins/texteditor/textdocument.cpp
+++ b/src/plugins/texteditor/textdocument.cpp
@@ -10,10 +10,10 @@
 #include "tabsettings.h"
 #include "textdocumentlayout.h"
 #include "texteditor.h"
+#include "texteditorsettings.h"
 #include "texteditortr.h"
 #include "textindenter.h"
 #include "typingsettings.h"
-#include "syntaxhighlighterrunner.h"
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/diffservice.h>
@@ -64,8 +64,6 @@ public:
 
     ~TextDocumentPrivate()
     {
-        if (m_highlighterRunner)
-            m_highlighterRunner->deleteLater();
     }
 
     MultiTextCursor indentOrUnindent(const MultiTextCursor &cursor, bool doIndent, const TabSettings &tabSettings);
@@ -101,7 +99,7 @@ public:
     TextMarks m_marksCache; // Marks not owned
     Utils::Guard m_modificationChangedGuard;
 
-    SyntaxHighlighterRunner *m_highlighterRunner = nullptr;
+    SyntaxHighlighter *m_highlighter = nullptr;
 };
 
 MultiTextCursor TextDocumentPrivate::indentOrUnindent(const MultiTextCursor &cursors,
@@ -462,8 +460,8 @@ void TextDocument::applyFontSettings()
         block = block.next();
     }
     updateLayout();
-    if (d->m_highlighterRunner)
-        d->m_highlighterRunner->setFontSettings(d->m_fontSettings);
+    if (d->m_highlighter)
+        d->m_highlighter->setFontSettings(d->m_fontSettings);
 }
 
 const FontSettings &TextDocument::fontSettings() const
@@ -524,15 +522,21 @@ bool TextDocument::applyChangeSet(const ChangeSet &changeSet)
 {
     if (changeSet.isEmpty())
         return true;
-    PlainRefactoringFileFactory changes;
-    const RefactoringFilePtr file = changes.file(filePath());
-    file->setChangeSet(changeSet);
-    return file->apply();
+    return PlainRefactoringFileFactory().file(filePath())->apply(changeSet);
 }
 
 // the blocks list must be sorted
 void TextDocument::setIfdefedOutBlocks(const QList<BlockRange> &blocks)
 {
+    if (syntaxHighlighter() && !syntaxHighlighter()->syntaxHighlighterUpToDate()) {
+        connect(syntaxHighlighter(),
+                &SyntaxHighlighter::finished,
+                this,
+                [this, blocks] { setIfdefedOutBlocks(blocks); },
+                Qt::SingleShotConnection);
+        return;
+    }
+
     QTextDocument *doc = document();
     auto documentLayout = qobject_cast<TextDocumentLayout*>(doc->documentLayout());
     QTC_ASSERT(documentLayout, return);
@@ -635,11 +639,6 @@ QTextDocument *TextDocument::document() const
     return &d->m_document;
 }
 
-SyntaxHighlighterRunner *TextDocument::syntaxHighlighterRunner() const
-{
-    return d->m_highlighterRunner;
-}
-
 /*!
  * Saves the document to the file specified by \a fileName. If errors occur,
  * \a errorString contains their cause.
@@ -911,26 +910,19 @@ bool TextDocument::reload(QString *errorString, ReloadFlag flag, ChangeType type
     return reload(errorString);
 }
 
-void TextDocument::resetSyntaxHighlighter(const std::function<SyntaxHighlighter *()> &creator,
-                                          bool threaded)
+void TextDocument::resetSyntaxHighlighter(const std::function<SyntaxHighlighter *()> &creator)
 {
-    delete d->m_highlighterRunner;
-
-    static const std::optional<bool> envValue = []() -> std::optional<bool> {
-        const QString key("QTC_USE_THREADED_HIGHLIGHTER");
-        if (qtcEnvironmentVariableIsSet(key)) {
-            const QString value = qtcEnvironmentVariable(key).toUpper();
-            return value != "FALSE" && value != "0";
-        }
-        return {};
-    }();
-
     SyntaxHighlighter *highlighter = creator();
+    highlighter->setParent(this);
+    highlighter->setDocument(this->document());
     highlighter->setFontSettings(TextEditorSettings::fontSettings());
     highlighter->setMimeType(mimeType());
-    d->m_highlighterRunner = new SyntaxHighlighterRunner(highlighter,
-                                                         document(),
-                                                         envValue.value_or(threaded));
+    d->m_highlighter = highlighter;
+}
+
+SyntaxHighlighter *TextDocument::syntaxHighlighter() const
+{
+    return d->m_highlighter;
 }
 
 void TextDocument::cleanWhitespace(const QTextCursor &cursor)
diff --git a/src/plugins/texteditor/textdocument.h b/src/plugins/texteditor/textdocument.h
index 5879d9e9ec2..b3bf77e5442 100644
--- a/src/plugins/texteditor/textdocument.h
+++ b/src/plugins/texteditor/textdocument.h
@@ -34,7 +34,6 @@ class FontSettings;
 class IAssistProvider;
 class StorageSettings;
 class SyntaxHighlighter;
-class SyntaxHighlighterRunner;
 class TabSettings;
 class TextDocumentPrivate;
 class TextMark;
@@ -127,8 +126,8 @@ public:
     QTextDocument *document() const;
 
     using SyntaxHighLighterCreator = std::function<SyntaxHighlighter *()>;
-    void resetSyntaxHighlighter(const SyntaxHighLighterCreator &creator, bool threaded = false);
-    SyntaxHighlighterRunner *syntaxHighlighterRunner() const;
+    void resetSyntaxHighlighter(const SyntaxHighLighterCreator &creator);
+    SyntaxHighlighter *syntaxHighlighter() const;
 
     bool reload(QString *errorString, QTextCodec *codec);
     void cleanWhitespace(const QTextCursor &cursor);
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index bc4e605296c..33ec2ed7e42 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -21,6 +21,7 @@
 #include "highlighterhelper.h"
 #include "highlightersettings.h"
 #include "icodestylepreferences.h"
+#include "linenumberfilter.h"
 #include "marginsettings.h"
 #include "refactoroverlay.h"
 #include "snippets/snippetoverlay.h"
@@ -28,13 +29,12 @@
 #include "tabsettings.h"
 #include "textdocument.h"
 #include "textdocumentlayout.h"
-#include "texteditoractionhandler.h"
 #include "texteditorconstants.h"
 #include "texteditoroverlay.h"
 #include "texteditorsettings.h"
 #include "texteditortr.h"
+#include "typehierarchy.h"
 #include "typingsettings.h"
-#include "syntaxhighlighterrunner.h"
 
 #include <aggregation/aggregate.h>
 
@@ -46,7 +46,9 @@
 #include <coreplugin/find/basetextfind.h>
 #include <coreplugin/find/highlightscrollbarcontroller.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/locator/locatormanager.h>
 #include <coreplugin/manhattanstyle.h>
+#include <coreplugin/navigationwidget.h>
 
 #include <utils/algorithm.h>
 #include <utils/async.h>
@@ -352,6 +354,7 @@ public:
     BaseTextEditorPrivate() = default;
 
     TextEditorFactoryPrivate *m_origin = nullptr;
+    QByteArray m_savedNavigationState;
 };
 
 class HoverHandlerRunner
@@ -739,6 +742,14 @@ public:
     void openTypeUnderCursor(bool openInNextSplit);
     qreal charWidth() const;
 
+    // actions
+    void registerActions();
+    void updateActions();
+    void updateOptionalActions();
+    void updateRedoAction();
+    void updateUndoAction();
+    void updateCopyAction(bool on);
+
 public:
     TextEditorWidget *q;
     QWidget *m_toolBarWidget = nullptr;
@@ -754,7 +765,7 @@ public:
     QToolButton *m_fileLineEnding = nullptr;
     QAction *m_fileLineEndingAction = nullptr;
 
-    uint m_optionalActionMask = TextEditorActionHandler::None;
+    uint m_optionalActionMask = OptionalActions::None;
     bool m_contentsChanged = false;
     bool m_lastCursorChangeWasInteresting = false;
     std::shared_ptr<void> m_suggestionBlocker;
@@ -762,7 +773,6 @@ public:
     QSharedPointer<TextDocument> m_document;
     QList<QMetaObject::Connection> m_documentConnections;
     QByteArray m_tempState;
-    QByteArray m_tempNavigationState;
 
     bool m_parenthesesMatchingEnabled = false;
     QTimer m_parenthesesMatchingTimer;
@@ -928,6 +938,30 @@ public:
     void updateSuggestion();
     void clearCurrentSuggestion();
     QTextBlock m_suggestionBlock;
+
+    Context m_editorContext;
+    QAction *m_undoAction = nullptr;
+    QAction *m_redoAction = nullptr;
+    QAction *m_copyAction = nullptr;
+    QAction *m_copyHtmlAction = nullptr;
+    QAction *m_cutAction = nullptr;
+    QAction *m_autoIndentAction = nullptr;
+    QAction *m_autoFormatAction = nullptr;
+    QAction *m_visualizeWhitespaceAction = nullptr;
+    QAction *m_textWrappingAction = nullptr;
+    QAction *m_unCommentSelectionAction = nullptr;
+    QAction *m_unfoldAllAction = nullptr;
+    QAction *m_followSymbolAction = nullptr;
+    QAction *m_followSymbolInNextSplitAction = nullptr;
+    QAction *m_followToTypeAction = nullptr;
+    QAction *m_followToTypeInNextSplitAction = nullptr;
+    QAction *m_findUsageAction = nullptr;
+    QAction *m_openCallHierarchyAction = nullptr;
+    QAction *m_openTypeHierarchyAction = nullptr;
+    QAction *m_renameSymbolAction = nullptr;
+    QAction *m_jumpToFileAction = nullptr;
+    QAction *m_jumpToFileInNextSplitAction = nullptr;
+    QList<QAction *> m_modifyingActions;
 };
 
 class TextEditorWidgetFind : public BaseTextFind
@@ -986,6 +1020,8 @@ void TextEditorWidgetFind::selectAll(const QString &txt, FindFlags findFlags)
         if (future.resultCount() <= 0)
             return;
         const SearchResultItems &results = future.result();
+        if (results.isEmpty())
+            return;
         const auto cursorForResult = [this](const SearchResultItem &item) {
             return selectRange(m_editor->document(), item.mainRange());
         };
@@ -1032,6 +1068,7 @@ TextEditorWidgetPrivate::TextEditorWidgetPrivate(TextEditorWidget *parent)
     , m_codeAssistant(parent)
     , m_hoverHandlerRunner(parent, m_hoverHandlers)
     , m_autoCompleter(new AutoCompleter)
+    , m_editorContext(Id::fromString(QUuid::createUuid().toString()))
 {
     m_selectionHighlightOverlay->show();
     auto aggregate = new Aggregation::Aggregate;
@@ -1096,6 +1133,15 @@ TextEditorWidgetPrivate::TextEditorWidgetPrivate(TextEditorWidget *parent)
     connect(q, &QPlainTextEdit::selectionChanged,
             this, &TextEditorWidgetPrivate::slotSelectionChanged);
 
+    connect(q, &QPlainTextEdit::undoAvailable,
+            this, &TextEditorWidgetPrivate::updateUndoAction);
+
+    connect(q, &QPlainTextEdit::redoAvailable,
+            this, &TextEditorWidgetPrivate::updateRedoAction);
+
+    connect(q, &QPlainTextEdit::copyAvailable,
+            this, &TextEditorWidgetPrivate::updateCopyAction);
+
     m_parenthesesMatchingTimer.setSingleShot(true);
     m_parenthesesMatchingTimer.setInterval(50);
     connect(&m_parenthesesMatchingTimer, &QTimer::timeout,
@@ -1142,6 +1188,14 @@ TextEditorWidgetPrivate::TextEditorWidgetPrivate(TextEditorWidget *parent)
             q, &TextEditorWidget::setCompletionSettings);
     connect(settings, &TextEditorSettings::extraEncodingSettingsChanged,
             q, &TextEditorWidget::setExtraEncodingSettings);
+
+    auto context = new Core::IContext(this);
+    context->setWidget(q);
+    context->setContext(m_editorContext);
+    Core::ICore::addContextObject(context);
+
+    registerActions();
+    updateActions();
 }
 
 TextEditorWidgetPrivate::~TextEditorWidgetPrivate()
@@ -1878,6 +1932,12 @@ void TextEditorWidget::setVisualIndentOffset(int offset)
     d->m_visualIndentOffset = qMax(0, offset);
 }
 
+void TextEditorWidget::updateUndoRedoActions()
+{
+    d->updateUndoAction();
+    d->updateRedoAction();
+}
+
 void TextEditorWidgetPrivate::updateCannotDecodeInfo()
 {
     q->setReadOnly(m_document->hasDecodingError());
@@ -1929,8 +1989,8 @@ void TextEditorWidgetPrivate::foldLicenseHeader()
             QStringList commentMarker;
             QStringList docMarker;
             HighlighterHelper::Definition def;
-            if (SyntaxHighlighterRunner *highlighter = q->textDocument()->syntaxHighlighterRunner())
-                def = HighlighterHelper::definitionForName(highlighter->definitionName());
+            if (auto highlighter = qobject_cast<Highlighter *>(q->textDocument()->syntaxHighlighter()))
+                def = highlighter->definition();
 
             if (def.isValid()) {
                 for (const QString &marker :
@@ -2529,6 +2589,16 @@ void TextEditorWidget::redo()
     QPlainTextEdit::redo();
 }
 
+bool TextEditorWidget::isUndoAvailable() const
+{
+    return document()->isUndoAvailable();
+}
+
+bool TextEditorWidget::isRedoAvailable() const
+{
+    return document()->isRedoAvailable();
+}
+
 void TextEditorWidget::openLinkUnderCursor()
 {
     d->openLinkUnderCursor(alwaysOpenLinksInNextSplit());
@@ -3019,15 +3089,21 @@ void TextEditorWidget::keyPressEvent(QKeyEvent *e)
 
     if (ro || !isPrintableText(eventText)) {
         QTextCursor::MoveOperation blockSelectionOperation = QTextCursor::NoMove;
-        if (e->modifiers() == (Qt::AltModifier | Qt::ShiftModifier) && !Utils::HostOsInfo::isMacHost()) {
-            if (MultiTextCursor::multiCursorAddEvent(e, QKeySequence::MoveToNextLine))
+        if (e->modifiers() == (Qt::AltModifier | Qt::ShiftModifier)
+            && !Utils::HostOsInfo::isMacHost()) {
+            if (MultiTextCursor::multiCursorEvent(
+                           e, QKeySequence::MoveToNextLine, Qt::ShiftModifier)) {
                 blockSelectionOperation = QTextCursor::Down;
-            else if (MultiTextCursor::multiCursorAddEvent(e, QKeySequence::MoveToPreviousLine))
+            } else if (MultiTextCursor::multiCursorEvent(
+                           e, QKeySequence::MoveToPreviousLine, Qt::ShiftModifier)) {
                 blockSelectionOperation = QTextCursor::Up;
-            else if (MultiTextCursor::multiCursorAddEvent(e, QKeySequence::MoveToNextChar))
+            } else if (MultiTextCursor::multiCursorEvent(
+                           e, QKeySequence::MoveToNextChar, Qt::ShiftModifier)) {
                 blockSelectionOperation = QTextCursor::NextCharacter;
-            else if (MultiTextCursor::multiCursorAddEvent(e, QKeySequence::MoveToPreviousChar))
+            } else if (MultiTextCursor::multiCursorEvent(
+                           e, QKeySequence::MoveToPreviousChar, Qt::ShiftModifier)) {
                 blockSelectionOperation = QTextCursor::PreviousCharacter;
+            }
         }
 
         if (blockSelectionOperation != QTextCursor::NoMove) {
@@ -3488,10 +3564,10 @@ QByteArray TextEditorWidget::saveState() const
 
 bool TextEditorWidget::singleShotAfterHighlightingDone(std::function<void()> &&f)
 {
-    if (d->m_document->syntaxHighlighterRunner()
-        && !d->m_document->syntaxHighlighterRunner()->syntaxInfoUpdated()) {
-        connect(d->m_document->syntaxHighlighterRunner(),
-                &SyntaxHighlighterRunner::highlightingFinished,
+    if (d->m_document->syntaxHighlighter()
+        && !d->m_document->syntaxHighlighter()->syntaxHighlighterUpToDate()) {
+        connect(d->m_document->syntaxHighlighter(),
+                &SyntaxHighlighter::finished,
                 this,
                 [f = std::move(f)] { f(); }, Qt::SingleShotConnection);
         return true;
@@ -3735,10 +3811,11 @@ void TextEditorWidgetPrivate::configureGenericHighlighter(
 
     const QString definitionFilesPath
         = TextEditorSettings::highlighterSettings().definitionFilesPath().toString();
-    m_document->resetSyntaxHighlighter([definitionFilesPath] {
-        return new Highlighter(definitionFilesPath);
+    m_document->resetSyntaxHighlighter([definitionFilesPath, definition] {
+        auto highlighter = new Highlighter(definitionFilesPath);
+        highlighter->setDefinition(definition);
+        return highlighter;
     });
-    m_document->syntaxHighlighterRunner()->setDefinitionName(definition.name());
 
     m_document->setFontSettings(TextEditorSettings::fontSettings());
 }
@@ -3763,8 +3840,8 @@ void TextEditorWidgetPrivate::setupFromDefinition(const KSyntaxHighlighting::Def
 
 KSyntaxHighlighting::Definition TextEditorWidgetPrivate::currentDefinition()
 {
-    if (SyntaxHighlighterRunner *highlighter = m_document->syntaxHighlighterRunner())
-        return HighlighterHelper::definitionForName(highlighter->definitionName());
+    if (auto *highlighter = qobject_cast<Highlighter *>(m_document->syntaxHighlighter()))
+        return highlighter->definition();
     return {};
 }
 
@@ -3804,6 +3881,533 @@ qreal TextEditorWidgetPrivate::charWidth() const
     return QFontMetricsF(q->font()).horizontalAdvance(QLatin1Char('x'));
 }
 
+void TextEditorWidgetPrivate::registerActions()
+{
+    using namespace Core::Constants;
+    using namespace TextEditor::Constants;
+
+    ActionBuilder(this, Constants::COMPLETE_THIS)
+        .setContext(m_editorContext)
+        .addOnTriggered(this, [this] { q->invokeAssist(Completion); });
+
+    ActionBuilder(this, Constants::FUNCTION_HINT)
+        .setContext(m_editorContext)
+        .addOnTriggered(this, [this] { q->invokeAssist(FunctionHint); });
+
+    ActionBuilder(this, Constants::QUICKFIX_THIS)
+        .setContext(m_editorContext)
+        .addOnTriggered(this, [this] { q->invokeAssist(QuickFix); });
+
+    ActionBuilder(this, Constants::SHOWCONTEXTMENU)
+        .setContext(m_editorContext)
+        .addOnTriggered(this, [this] { q->showContextMenu(); });
+
+    m_undoAction = ActionBuilder(this, UNDO)
+                       .setContext(m_editorContext)
+                       .addOnTriggered([this] { q->undo(); })
+                       .setScriptable(true)
+                       .contextAction();
+    m_redoAction = ActionBuilder(this, REDO)
+                       .setContext(m_editorContext)
+                       .addOnTriggered([this] { q->redo(); })
+                       .setScriptable(true)
+                       .contextAction();
+    m_copyAction = ActionBuilder(this, COPY)
+                       .setContext(m_editorContext)
+                       .addOnTriggered([this] { q->copy(); })
+                       .setScriptable(true)
+                       .contextAction();
+    m_cutAction = ActionBuilder(this, CUT)
+                      .setContext(m_editorContext)
+                      .addOnTriggered([this] { q->cut(); })
+                      .setScriptable(true)
+                      .contextAction();
+    m_modifyingActions << ActionBuilder(this, PASTE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->paste(); })
+                              .setScriptable(true)
+                              .contextAction();
+    ActionBuilder(this, SELECTALL)
+        .setContext(m_editorContext)
+        .setScriptable(true)
+        .addOnTriggered([this] { q->selectAll(); });
+    ActionBuilder(this, GOTO).setContext(m_editorContext).addOnTriggered([] {
+        LocatorManager::showFilter(lineNumberFilter());
+    });
+    ActionBuilder(this, PRINT)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->print(ICore::printer()); })
+        .contextAction();
+    m_modifyingActions << ActionBuilder(this, DELETE_LINE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->deleteLine(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, DELETE_END_OF_LINE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->deleteEndOfLine(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, DELETE_END_OF_WORD)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->deleteEndOfWord(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, DELETE_END_OF_WORD_CAMEL_CASE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->deleteEndOfWordCamelCase(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, DELETE_START_OF_LINE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->deleteStartOfLine(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, DELETE_START_OF_WORD)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->deleteStartOfWord(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, DELETE_START_OF_WORD_CAMEL_CASE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->deleteStartOfWordCamelCase(); })
+                              .setScriptable(true)
+                              .contextAction();
+    ActionBuilder(this, GOTO_BLOCK_START_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoBlockStartWithSelection(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_BLOCK_END_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoBlockEndWithSelection(); })
+        .setScriptable(true);
+    m_modifyingActions << ActionBuilder(this, MOVE_LINE_UP)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->moveLineUp(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, MOVE_LINE_DOWN)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->moveLineDown(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, COPY_LINE_UP)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->copyLineUp(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, COPY_LINE_DOWN)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->copyLineDown(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, JOIN_LINES)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->joinLines(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, INSERT_LINE_ABOVE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->insertLineAbove(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, INSERT_LINE_BELOW)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->insertLineBelow(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, SWITCH_UTF8BOM)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->switchUtf8bom(); })
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, INDENT)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->indent(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, UNINDENT)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->unindent(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_followSymbolAction = ActionBuilder(this, FOLLOW_SYMBOL_UNDER_CURSOR)
+                               .setContext(m_editorContext)
+                               .addOnTriggered([this] { q->openLinkUnderCursor(); })
+                               .contextAction();
+    m_followSymbolInNextSplitAction = ActionBuilder(this, FOLLOW_SYMBOL_UNDER_CURSOR_IN_NEXT_SPLIT)
+                                          .setContext(m_editorContext)
+                                          .addOnTriggered(
+                                              [this] { q->openLinkUnderCursorInNextSplit(); })
+                                          .contextAction();
+    m_followToTypeAction = ActionBuilder(this, FOLLOW_SYMBOL_TO_TYPE)
+                               .setContext(m_editorContext)
+                               .addOnTriggered([this] { q->openTypeUnderCursor(); })
+                               .contextAction();
+    m_followToTypeInNextSplitAction = ActionBuilder(this, FOLLOW_SYMBOL_TO_TYPE_IN_NEXT_SPLIT)
+                                          .setContext(m_editorContext)
+                                          .addOnTriggered(
+                                              [this] { q->openTypeUnderCursorInNextSplit(); })
+                                          .contextAction();
+    m_findUsageAction = ActionBuilder(this, FIND_USAGES)
+                            .setContext(m_editorContext)
+                            .addOnTriggered([this] { q->findUsages(); })
+                            .contextAction();
+    m_renameSymbolAction = ActionBuilder(this, RENAME_SYMBOL)
+                               .setContext(m_editorContext)
+                               .addOnTriggered([this] { q->renameSymbolUnderCursor(); })
+                               .contextAction();
+    m_jumpToFileAction = ActionBuilder(this, JUMP_TO_FILE_UNDER_CURSOR)
+                             .setContext(m_editorContext)
+                             .addOnTriggered([this] { q->openLinkUnderCursor(); })
+                             .contextAction();
+    m_jumpToFileInNextSplitAction = ActionBuilder(this, JUMP_TO_FILE_UNDER_CURSOR_IN_NEXT_SPLIT)
+                                        .setContext(m_editorContext)
+                                        .addOnTriggered(
+                                            [this] { q->openLinkUnderCursorInNextSplit(); })
+                                        .contextAction();
+    m_openCallHierarchyAction = ActionBuilder(this, OPEN_CALL_HIERARCHY)
+                                    .setContext(m_editorContext)
+                                    .addOnTriggered([this] { q->openCallHierarchy(); })
+                                    .setScriptable(true)
+                                    .contextAction();
+    m_openTypeHierarchyAction = ActionBuilder(this, OPEN_TYPE_HIERARCHY)
+                                    .setContext(m_editorContext)
+                                    .addOnTriggered([] {
+                                        updateTypeHierarchy(NavigationWidget::activateSubWidget(
+                                            Constants::TYPE_HIERARCHY_FACTORY_ID, Side::Left));
+                                    })
+                                    .setScriptable(true)
+                                    .contextAction();
+    ActionBuilder(this, VIEW_PAGE_UP)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->viewPageUp(); })
+        .setScriptable(true);
+    ActionBuilder(this, VIEW_PAGE_DOWN)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->viewPageDown(); })
+        .setScriptable(true);
+    ActionBuilder(this, VIEW_LINE_UP)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->viewLineUp(); })
+        .setScriptable(true);
+    ActionBuilder(this, VIEW_LINE_DOWN)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->viewLineDown(); })
+        .setScriptable(true);
+
+    ActionBuilder(this, SELECT_ENCODING).setContext(m_editorContext).addOnTriggered([this] {
+        q->selectEncoding();
+    });
+    m_modifyingActions << ActionBuilder(this, CIRCULAR_PASTE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->circularPaste(); })
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, NO_FORMAT_PASTE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->pasteWithoutFormat(); })
+                              .setScriptable(true)
+                              .contextAction();
+
+    m_autoIndentAction = ActionBuilder(this, AUTO_INDENT_SELECTION)
+                             .setContext(m_editorContext)
+                             .addOnTriggered([this] { q->autoIndent(); })
+                             .setScriptable(true)
+                             .contextAction();
+    m_autoFormatAction = ActionBuilder(this, AUTO_FORMAT_SELECTION)
+                             .setContext(m_editorContext)
+                             .addOnTriggered([this] { q->autoFormat(); })
+                             .setScriptable(true)
+                             .contextAction();
+    m_modifyingActions << ActionBuilder(this, REWRAP_PARAGRAPH)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->rewrapParagraph(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_visualizeWhitespaceAction = ActionBuilder(this, VISUALIZE_WHITESPACE)
+                                      .setContext(m_editorContext)
+                                      .setCheckable(true)
+                                      .addOnToggled(
+                                          this,
+                                          [this](bool checked) {
+                                              DisplaySettings ds = q->displaySettings();
+                                              ds.m_visualizeWhitespace = checked;
+                                              q->setDisplaySettings(ds);
+                                          })
+                                      .contextAction();
+    m_modifyingActions << ActionBuilder(this, CLEAN_WHITESPACE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->cleanWhitespace(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_textWrappingAction = ActionBuilder(this, TEXT_WRAPPING)
+                               .setContext(m_editorContext)
+                               .setCheckable(true)
+                               .addOnToggled(
+                                   this,
+                                   [this](bool checked) {
+                                       DisplaySettings ds = q->displaySettings();
+                                       ds.m_textWrapping = checked;
+                                       q->setDisplaySettings(ds);
+                                   })
+                               .contextAction();
+    m_unCommentSelectionAction = ActionBuilder(this, UN_COMMENT_SELECTION)
+                                     .setContext(m_editorContext)
+                                     .addOnTriggered([this] { q->unCommentSelection(); })
+                                     .setScriptable(true)
+                                     .contextAction();
+    m_modifyingActions << ActionBuilder(this, CUT_LINE)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->cutLine(); })
+                              .setScriptable(true)
+                              .contextAction();
+    ActionBuilder(this, COPY_LINE)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->copyLine(); })
+        .setScriptable(true);
+    m_copyHtmlAction = ActionBuilder(this, COPY_WITH_HTML)
+                           .setContext(m_editorContext)
+                           .addOnTriggered([this] { q->copyWithHtml(); })
+                           .setScriptable(true)
+                           .contextAction();
+    ActionBuilder(this, ADD_CURSORS_TO_LINE_ENDS)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->addCursorsToLineEnds(); })
+        .setScriptable(true);
+    ActionBuilder(this, ADD_SELECT_NEXT_FIND_MATCH)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->addSelectionNextFindMatch(); })
+        .setScriptable(true);
+    m_modifyingActions << ActionBuilder(this, DUPLICATE_SELECTION)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->duplicateSelection(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, DUPLICATE_SELECTION_AND_COMMENT)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->duplicateSelectionAndComment(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, UPPERCASE_SELECTION)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->uppercaseSelection(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, LOWERCASE_SELECTION)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->lowercaseSelection(); })
+                              .setScriptable(true)
+                              .contextAction();
+    m_modifyingActions << ActionBuilder(this, SORT_LINES)
+                              .setContext(m_editorContext)
+                              .addOnTriggered([this] { q->sortLines(); })
+                              .setScriptable(true)
+                              .contextAction();
+    ActionBuilder(this, FOLD)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->foldCurrentBlock(); })
+        .setScriptable(true);
+    ActionBuilder(this, UNFOLD)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->unfoldCurrentBlock(); })
+        .setScriptable(true);
+    m_unfoldAllAction = ActionBuilder(this, UNFOLD_ALL)
+                            .setContext(m_editorContext)
+                            .addOnTriggered([this] { q->unfoldAll(); })
+                            .setScriptable(true)
+                            .contextAction();
+    ActionBuilder(this, INCREASE_FONT_SIZE).setContext(m_editorContext).addOnTriggered([this] {
+        q->increaseFontZoom();
+    });
+    ActionBuilder(this, DECREASE_FONT_SIZE).setContext(m_editorContext).addOnTriggered([this] {
+        q->decreaseFontZoom();
+    });
+    ActionBuilder(this, RESET_FONT_SIZE).setContext(m_editorContext).addOnTriggered([this] {
+        q->zoomReset();
+    });
+    ActionBuilder(this, GOTO_BLOCK_START)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoBlockStart(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_BLOCK_END)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoBlockEnd(); })
+        .setScriptable(true);
+    ActionBuilder(this, SELECT_BLOCK_UP)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->selectBlockUp(); })
+        .setScriptable(true);
+    ActionBuilder(this, SELECT_BLOCK_DOWN)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->selectBlockDown(); })
+        .setScriptable(true);
+    ActionBuilder(this, SELECT_WORD_UNDER_CURSOR)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->selectWordUnderCursor(); })
+        .setScriptable(true);
+
+    ActionBuilder(this, GOTO_DOCUMENT_START)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoDocumentStart(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_DOCUMENT_END)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoDocumentEnd(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_LINE_START)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoLineStart(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_LINE_END)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoLineEnd(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_NEXT_LINE)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoNextLine(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_PREVIOUS_LINE)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoPreviousLine(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_PREVIOUS_CHARACTER)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoPreviousCharacter(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_NEXT_CHARACTER)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoNextCharacter(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_PREVIOUS_WORD)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoPreviousWord(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_NEXT_WORD)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoNextWord(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_PREVIOUS_WORD_CAMEL_CASE)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoPreviousWordCamelCase(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_NEXT_WORD_CAMEL_CASE)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoNextWordCamelCase(); })
+        .setScriptable(true);
+
+    ActionBuilder(this, GOTO_LINE_START_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoLineStartWithSelection(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_LINE_END_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoLineEndWithSelection(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_NEXT_LINE_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoNextLineWithSelection(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_PREVIOUS_LINE_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoPreviousLineWithSelection(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_PREVIOUS_CHARACTER_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoPreviousCharacterWithSelection(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_NEXT_CHARACTER_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoNextCharacterWithSelection(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_PREVIOUS_WORD_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoPreviousWordWithSelection(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_NEXT_WORD_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoNextWordWithSelection(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_PREVIOUS_WORD_CAMEL_CASE_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoPreviousWordCamelCaseWithSelection(); })
+        .setScriptable(true);
+    ActionBuilder(this, GOTO_NEXT_WORD_CAMEL_CASE_WITH_SELECTION)
+        .setContext(m_editorContext)
+        .addOnTriggered([this] { q->gotoNextWordCamelCaseWithSelection(); })
+        .setScriptable(true);
+
+    // Collect additional modifying actions so we can check for them inside a readonly file
+    // and disable them
+    m_modifyingActions << m_autoIndentAction;
+    m_modifyingActions << m_autoFormatAction;
+    m_modifyingActions << m_unCommentSelectionAction;
+
+    updateOptionalActions();
+}
+
+void TextEditorWidgetPrivate::updateActions()
+{
+    bool isWritable = !q->isReadOnly();
+    for (QAction *a : std::as_const(m_modifyingActions))
+        a->setEnabled(isWritable);
+    m_unCommentSelectionAction->setEnabled((m_optionalActionMask & OptionalActions::UnCommentSelection) && isWritable);
+    m_visualizeWhitespaceAction->setEnabled(q);
+    if (TextEditorSettings::fontSettings().relativeLineSpacing() == 100) {
+        m_textWrappingAction->setEnabled(q);
+    } else {
+        m_textWrappingAction->setEnabled(false);
+        m_textWrappingAction->setChecked(false);
+    }
+    m_visualizeWhitespaceAction->setChecked(m_displaySettings.m_visualizeWhitespace);
+    m_textWrappingAction->setChecked(m_displaySettings.m_textWrapping);
+
+    updateRedoAction();
+    updateUndoAction();
+    updateCopyAction(q->textCursor().hasSelection());
+
+    updateOptionalActions();
+}
+
+void TextEditorWidgetPrivate::updateOptionalActions()
+{
+    using namespace OptionalActions;
+    m_followSymbolAction->setEnabled(m_optionalActionMask & FollowSymbolUnderCursor);
+    m_followSymbolInNextSplitAction->setEnabled(m_optionalActionMask & FollowSymbolUnderCursor);
+    m_followToTypeAction->setEnabled(m_optionalActionMask & FollowTypeUnderCursor);
+    m_followToTypeInNextSplitAction->setEnabled(m_optionalActionMask & FollowTypeUnderCursor);
+    m_findUsageAction->setEnabled(m_optionalActionMask & FindUsage);
+    m_jumpToFileAction->setEnabled(m_optionalActionMask & JumpToFileUnderCursor);
+    m_jumpToFileInNextSplitAction->setEnabled(m_optionalActionMask & JumpToFileUnderCursor);
+    m_unfoldAllAction->setEnabled(m_optionalActionMask & UnCollapseAll);
+    m_renameSymbolAction->setEnabled(m_optionalActionMask & RenameSymbol);
+    m_openCallHierarchyAction->setEnabled(m_optionalActionMask & CallHierarchy);
+    m_openTypeHierarchyAction->setEnabled(m_optionalActionMask & TypeHierarchy);
+
+    bool formatEnabled = (m_optionalActionMask & OptionalActions::Format)
+                         && !q->isReadOnly();
+    m_autoIndentAction->setEnabled(formatEnabled);
+    m_autoFormatAction->setEnabled(formatEnabled);
+}
+
+void TextEditorWidgetPrivate::updateRedoAction()
+{
+    m_redoAction->setEnabled(q->isRedoAvailable());
+}
+
+void TextEditorWidgetPrivate::updateUndoAction()
+{
+    m_undoAction->setEnabled(q->isUndoAvailable());
+}
+
+void TextEditorWidgetPrivate::updateCopyAction(bool hasCopyableText)
+{
+    if (m_cutAction)
+        m_cutAction->setEnabled(hasCopyableText && !q->isReadOnly());
+    if (m_copyAction)
+        m_copyAction->setEnabled(hasCopyableText);
+    if (m_copyHtmlAction)
+        m_copyHtmlAction->setEnabled(hasCopyableText);
+}
+
 bool TextEditorWidget::codeFoldingVisible() const
 {
     return d->m_codeFoldingVisible;
@@ -5121,7 +5725,8 @@ void TextEditorWidgetPrivate::setupBlockLayout(const PaintEventData &data,
     blockData.layout = data.block.layout();
 
     QTextOption option = blockData.layout->textOption();
-    if (data.suppressSyntaxInIfdefedOutBlock && TextDocumentLayout::ifdefedOut(data.block)) {
+    if (data.suppressSyntaxInIfdefedOutBlock
+            && TextDocumentLayout::ifdefedOut(data.block)) {
         option.setFlags(option.flags() | QTextOption::SuppressColors);
         painter.setPen(data.ifdefedOutFormat.foreground().color());
     } else {
@@ -5740,8 +6345,8 @@ void TextEditorWidgetPrivate::paintCodeFolding(QPainter &painter,
     TextBlockUserData *nextBlockUserData = TextDocumentLayout::textUserData(nextBlock);
 
     bool drawBox = nextBlockUserData
-            && TextDocumentLayout::foldingIndent(data.block) < nextBlockUserData->foldingIndent();
-
+            && TextDocumentLayout::foldingIndent(data.block)
+            < nextBlockUserData->foldingIndent();
 
     const int blockNumber = data.block.blockNumber();
     bool active = blockNumber == extraAreaHighlightFoldBlockNumber;
@@ -5897,7 +6502,7 @@ void TextEditorWidgetPrivate::slotUpdateRequest(const QRect &r, int dy)
 void TextEditorWidgetPrivate::saveCurrentCursorPositionForNavigation()
 {
     m_lastCursorChangeWasInteresting = true;
-    m_tempNavigationState = q->saveState();
+    emit q->saveCurrentStateForNavigationHistory();
 }
 
 void TextEditorWidgetPrivate::updateCurrentLineHighlight()
@@ -5953,8 +6558,7 @@ void TextEditorWidget::slotCursorPositionChanged()
             << "indent:" << BaseTextDocumentLayout::userData(textCursor().block())->foldingIndent();
 #endif
     if (!d->m_contentsChanged && d->m_lastCursorChangeWasInteresting) {
-        if (EditorManager::currentEditor() && EditorManager::currentEditor()->widget() == this)
-            EditorManager::addCurrentPositionToNavigationHistory(d->m_tempNavigationState);
+        emit addSavedStateToNavigationHistory();
         d->m_lastCursorChangeWasInteresting = false;
     } else if (d->m_contentsChanged) {
         d->saveCurrentCursorPositionForNavigation();
@@ -6260,7 +6864,6 @@ void TextEditorWidget::mouseReleaseEvent(QMouseEvent *e)
 {
     const Qt::MouseButton button = e->button();
     if (d->m_linkPressed && d->isMouseNavigationEvent(e) && button == Qt::LeftButton) {
-        EditorManager::addCurrentPositionToNavigationHistory();
         bool inNextSplit = ((e->modifiers() & Qt::AltModifier) && !alwaysOpenLinksInNextSplit())
                 || (alwaysOpenLinksInNextSplit() && !(e->modifiers() & Qt::AltModifier));
 
@@ -6807,6 +7410,25 @@ void TextEditorWidgetPrivate::handleBackspaceKey()
     QTC_ASSERT(!q->multiTextCursor().hasSelection(), return);
     MultiTextCursor cursor = m_cursors;
     cursor.beginEditBlock();
+
+    const TabSettings tabSettings = m_document->tabSettings();
+    const TypingSettings &typingSettings = m_document->typingSettings();
+
+    auto behavior = typingSettings.m_smartBackspaceBehavior;
+    if (cursor.hasMultipleCursors()) {
+        if (behavior == TypingSettings::BackspaceFollowsPreviousIndents) {
+            behavior = TypingSettings::BackspaceNeverIndents;
+        } else if (behavior == TypingSettings::BackspaceUnindents) {
+            for (QTextCursor &c : cursor) {
+                if (c.positionInBlock() == 0
+                    || c.positionInBlock() > TabSettings::firstNonSpace(c.block().text())) {
+                    behavior = TypingSettings::BackspaceNeverIndents;
+                    break;
+                }
+            }
+        }
+    }
+
     for (QTextCursor &c : cursor) {
         const int pos = c.position();
         if (!pos)
@@ -6819,9 +7441,6 @@ void TextEditorWidgetPrivate::handleBackspaceKey()
             cursorWithinSnippet = snippetCheckCursor(snippetCursor);
         }
 
-        const TabSettings tabSettings = m_document->tabSettings();
-        const TypingSettings &typingSettings = m_document->typingSettings();
-
         if (typingSettings.m_autoIndent && !m_autoCompleteHighlightPos.isEmpty()
             && (m_autoCompleteHighlightPos.last() == c) && m_removeAutoCompletedText
             && m_autoCompleter->autoBackspace(c)) {
@@ -6829,12 +7448,12 @@ void TextEditorWidgetPrivate::handleBackspaceKey()
         }
 
         bool handled = false;
-        if (typingSettings.m_smartBackspaceBehavior == TypingSettings::BackspaceNeverIndents) {
+        if (behavior == TypingSettings::BackspaceNeverIndents) {
             if (cursorWithinSnippet)
                 c.beginEditBlock();
             c.deletePreviousChar();
             handled = true;
-        } else if (typingSettings.m_smartBackspaceBehavior
+        } else if (behavior
                    == TypingSettings::BackspaceFollowsPreviousIndents) {
             QTextBlock currentBlock = c.block();
             int positionInBlock = pos - currentBlock.position();
@@ -6869,7 +7488,7 @@ void TextEditorWidgetPrivate::handleBackspaceKey()
                     }
                 }
             }
-        } else if (typingSettings.m_smartBackspaceBehavior == TypingSettings::BackspaceUnindents) {
+        } else if (behavior == TypingSettings::BackspaceUnindents) {
             if (c.positionInBlock() == 0
                 || c.positionInBlock() > TabSettings::firstNonSpace(c.block().text())) {
                 if (cursorWithinSnippet)
@@ -6982,13 +7601,13 @@ bool TextEditorWidget::openLink(const Utils::Link &link, bool inNextSplit)
 #endif
 
     QString url = link.targetFilePath.toString();
-    if (url.startsWith(u"https://"_qs) || url.startsWith(u"http://"_qs)) {
+    if (url.startsWith(u"https://") || url.startsWith(u"http://")) {
         QDesktopServices::openUrl(url);
         return true;
     }
 
     if (!inNextSplit && textDocument()->filePath() == link.targetFilePath) {
-        EditorManager::addCurrentPositionToNavigationHistory();
+        emit addCurrentStateToNavigationHistory();
         gotoLine(link.targetLine, link.targetColumn, true, true);
         setFocus();
         return true;
@@ -7021,11 +7640,12 @@ void TextEditorWidgetPrivate::requestUpdateLink(QMouseEvent *e)
         return;
 
     // Check that the mouse was actually on the text somewhere
-    bool onText = q->cursorRect(cursor).right() >= e->x();
+    const int posX = e->position().x();
+    bool onText = q->cursorRect(cursor).right() >= posX;
     if (!onText) {
         QTextCursor nextPos = cursor;
         nextPos.movePosition(QTextCursor::Right);
-        onText = q->cursorRect(nextPos).right() >= e->x();
+        onText = q->cursorRect(nextPos).right() >= posX;
     }
 
     if (onText) {
@@ -8096,6 +8716,7 @@ void TextEditorWidgetPrivate::applyFontSettingsDelayed()
     m_fontSettingsNeedsApply = true;
     if (q->isVisible())
         q->triggerPendingUpdates();
+    updateActions();
 }
 
 void TextEditorWidgetPrivate::markRemoved(TextMark *mark)
@@ -8177,7 +8798,7 @@ void TextEditorWidget::setDisplaySettings(const DisplaySettings &ds)
     optionFlags.setFlag(QTextOption::AddSpaceForLineAndParagraphSeparators);
     optionFlags.setFlag(QTextOption::ShowTabsAndSpaces, ds.m_visualizeWhitespace);
     if (optionFlags != currentOptionFlags) {
-        if (SyntaxHighlighterRunner *highlighter = textDocument()->syntaxHighlighterRunner())
+        if (SyntaxHighlighter *highlighter = textDocument()->syntaxHighlighter())
             highlighter->rehighlight();
         QTextOption option = document()->defaultTextOption();
         option.setFlags(optionFlags);
@@ -8331,6 +8952,7 @@ void TextEditorWidget::setReadOnly(bool b)
     emit readOnlyChanged();
     if (b)
         setTextInteractionFlags(textInteractionFlags() | Qt::TextSelectableByKeyboard);
+    d->updateActions();
 }
 
 void TextEditorWidget::cut()
@@ -8456,7 +9078,7 @@ QMimeData *TextEditorWidget::createMimeDataFromSelection(bool withHtml) const
                     } else {
                         const int startPosition = current.position() - selectionStart
                                                   - removedCount;
-                        int endPosition = startPosition + current.text().count();
+                        int endPosition = startPosition + current.text().size();
                         if (current != last)
                             endPosition++;
                         removedCount += endPosition - startPosition;
@@ -8635,7 +9257,7 @@ void TextEditorWidget::dragLeaveEvent(QDragLeaveEvent *)
 void TextEditorWidget::dragMoveEvent(QDragMoveEvent *e)
 {
     const QRect rect = cursorRect(d->m_dndCursor);
-    d->m_dndCursor = cursorForPosition(e->pos());
+    d->m_dndCursor = cursorForPosition(e->position().toPoint());
     if (!rect.isNull())
         viewport()->update(rect);
     viewport()->update(cursorRect(d->m_dndCursor));
@@ -8653,7 +9275,7 @@ void TextEditorWidget::dropEvent(QDropEvent *e)
     // Update multi text cursor before inserting data
     MultiTextCursor cursor = multiTextCursor();
     cursor.beginEditBlock();
-    const QTextCursor eventCursor = cursorForPosition(e->pos());
+    const QTextCursor eventCursor = cursorForPosition(e->position().toPoint());
     if (e->dropAction() == Qt::MoveAction && e->source() == viewport())
         cursor.removeSelectedText();
     cursor.setCursors({eventCursor});
@@ -8728,31 +9350,36 @@ void TextEditorWidget::setupFallBackEditor(Id id)
 
 void TextEditorWidget::appendStandardContextMenuActions(QMenu *menu)
 {
-    if (optionalActions() & TextEditorActionHandler::FollowSymbolUnderCursor) {
+    if (optionalActions() & OptionalActions::FollowSymbolUnderCursor) {
         const auto action = ActionManager::command(Constants::FOLLOW_SYMBOL_UNDER_CURSOR)->action();
         if (!menu->actions().contains(action))
             menu->addAction(action);
     }
-    if (optionalActions() & TextEditorActionHandler::FollowTypeUnderCursor) {
+    if (optionalActions() & OptionalActions::FollowTypeUnderCursor) {
         const auto action = ActionManager::command(Constants::FOLLOW_SYMBOL_TO_TYPE)->action();
         if (!menu->actions().contains(action))
             menu->addAction(action);
     }
-    if (optionalActions() & TextEditorActionHandler::FindUsage) {
+    if (optionalActions() & OptionalActions::FindUsage) {
         const auto action = ActionManager::command(Constants::FIND_USAGES)->action();
         if (!menu->actions().contains(action))
             menu->addAction(action);
     }
-    if (optionalActions() & TextEditorActionHandler::RenameSymbol) {
+    if (optionalActions() & OptionalActions::RenameSymbol) {
         const auto action = ActionManager::command(Constants::RENAME_SYMBOL)->action();
         if (!menu->actions().contains(action))
             menu->addAction(action);
     }
-    if (optionalActions() & TextEditorActionHandler::CallHierarchy) {
+    if (optionalActions() & OptionalActions::CallHierarchy) {
         const auto action = ActionManager::command(Constants::OPEN_CALL_HIERARCHY)->action();
         if (!menu->actions().contains(action))
             menu->addAction(action);
     }
+    if (optionalActions() & OptionalActions::TypeHierarchy) {
+        const auto action = ActionManager::command(Constants::OPEN_TYPE_HIERARCHY)->action();
+        if (!menu->actions().contains(action))
+            menu->addAction(action);
+    }
 
     menu->addSeparator();
     appendMenuActionsFromContext(menu, Constants::M_STANDARDCONTEXTMENU);
@@ -8780,7 +9407,7 @@ void TextEditorWidget::setOptionalActions(uint optionalActionMask)
     if (d->m_optionalActionMask == optionalActionMask)
         return;
     d->m_optionalActionMask = optionalActionMask;
-    emit optionalActionMaskChanged();
+    d->updateOptionalActions();
 }
 
 void TextEditorWidget::addOptionalActions( uint optionalActionMask)
@@ -8997,6 +9624,23 @@ void BaseTextEditor::select(int toPos)
     editorWidget()->setTextCursor(tc);
 }
 
+void BaseTextEditor::saveCurrentStateForNavigationHistory()
+{
+    d->m_savedNavigationState = saveState();
+}
+
+void BaseTextEditor::addSavedStateToNavigationHistory()
+{
+    if (EditorManager::currentEditor() == this)
+        EditorManager::addCurrentPositionToNavigationHistory(d->m_savedNavigationState);
+}
+
+void BaseTextEditor::addCurrentStateToNavigationHistory()
+{
+    if (EditorManager::currentEditor() == this)
+        EditorManager::addCurrentPositionToNavigationHistory();
+}
+
 void TextEditorWidgetPrivate::updateCursorPosition()
 {
     m_contextHelpItem = HelpItem();
@@ -9480,7 +10124,7 @@ public:
     CommentDefinition m_commentDefinition;
     QList<BaseHoverHandler *> m_hoverHandlers; // owned
     std::unique_ptr<CompletionAssistProvider> m_completionAssistProvider; // owned
-    std::unique_ptr<TextEditorActionHandler> m_textEditorActionHandler;
+    int m_optionalActionMask = 0;
     bool m_useGenericHighlighter = false;
     bool m_duplicatedSupported = true;
     bool m_codeFoldingSupported = false;
@@ -9553,9 +10197,9 @@ void TextEditorFactory::setAutoCompleterCreator(const AutoCompleterCreator &crea
     d->m_autoCompleterCreator = creator;
 }
 
-void TextEditorFactory::setEditorActionHandlers(uint optionalActions)
+void TextEditorFactory::setOptionalActionMask(int optionalActions)
 {
-    d->m_textEditorActionHandler.reset(new TextEditorActionHandler(id(), id(), optionalActions));
+    d->m_optionalActionMask = optionalActions;
 }
 
 void TextEditorFactory::addHoverHandler(BaseHoverHandler *handler)
@@ -9601,8 +10245,7 @@ BaseTextEditor *TextEditorFactoryPrivate::createEditorHelper(const TextDocumentP
     textEditorWidget->setMarksVisible(m_marksVisible);
     textEditorWidget->setParenthesesMatchingEnabled(m_paranthesesMatchinEnabled);
     textEditorWidget->setCodeFoldingSupported(m_codeFoldingSupported);
-    if (m_textEditorActionHandler)
-        textEditorWidget->setOptionalActions(m_textEditorActionHandler->optionalActions());
+    textEditorWidget->setOptionalActions(m_optionalActionMask);
 
     BaseTextEditor *editor = m_editorCreator();
     editor->setDuplicateSupported(m_duplicatedSupported);
@@ -9629,6 +10272,21 @@ BaseTextEditor *TextEditorFactoryPrivate::createEditorHelper(const TextDocumentP
                      [editor](EditorManager::OpenEditorFlags flags) {
                          EditorManager::activateEditor(editor, flags);
                      });
+    QObject::connect(
+        textEditorWidget,
+        &TextEditorWidget::saveCurrentStateForNavigationHistory,
+        editor,
+        &BaseTextEditor::saveCurrentStateForNavigationHistory);
+    QObject::connect(
+        textEditorWidget,
+        &TextEditorWidget::addSavedStateToNavigationHistory,
+        editor,
+        &BaseTextEditor::addSavedStateToNavigationHistory);
+    QObject::connect(
+        textEditorWidget,
+        &TextEditorWidget::addCurrentStateToNavigationHistory,
+        editor,
+        &BaseTextEditor::addCurrentStateToNavigationHistory);
 
     if (m_useGenericHighlighter)
         textEditorWidget->setupGenericHighlighter();
diff --git a/src/plugins/texteditor/texteditor.h b/src/plugins/texteditor/texteditor.h
index 9f2a6f3b9c4..7fc56e87337 100644
--- a/src/plugins/texteditor/texteditor.h
+++ b/src/plugins/texteditor/texteditor.h
@@ -85,6 +85,22 @@ enum TextMarkRequestKind
     TaskMarkRequest
 };
 
+namespace OptionalActions {
+enum Mask {
+    None = 0,
+    Format = 1,
+    UnCommentSelection = 2,
+    UnCollapseAll = 4,
+    FollowSymbolUnderCursor = 8,
+    FollowTypeUnderCursor = 16,
+    JumpToFileUnderCursor = 32,
+    RenameSymbol = 64,
+    FindUsage = 128,
+    CallHierarchy = 256,
+    TypeHierarchy = 512,
+};
+} // namespace OptionalActions
+
 class TEXTEDITOR_EXPORT BaseTextEditor : public Core::IEditor
 {
     Q_OBJECT
@@ -153,6 +169,11 @@ public:
 private:
     friend class TextEditorFactory;
     friend class Internal::TextEditorFactoryPrivate;
+
+    void saveCurrentStateForNavigationHistory();
+    void addSavedStateToNavigationHistory();
+    void addCurrentStateToNavigationHistory();
+
     Internal::BaseTextEditorPrivate *d;
 };
 
@@ -441,6 +462,9 @@ public:
     virtual void undo();
     virtual void redo();
 
+    virtual bool isUndoAvailable() const;
+    virtual bool isRedoAvailable() const;
+
     void openLinkUnderCursor();
     void openLinkUnderCursorInNextSplit();
     void openTypeUnderCursor();
@@ -511,9 +535,13 @@ signals:
     void requestUsages(const QTextCursor &cursor);
     void requestRename(const QTextCursor &cursor);
     void requestCallHierarchy(const QTextCursor &cursor);
-    void optionalActionMaskChanged();
     void toolbarOutlineChanged(QWidget *newOutline);
 
+    // used by the IEditor
+    void saveCurrentStateForNavigationHistory();
+    void addSavedStateToNavigationHistory();
+    void addCurrentStateToNavigationHistory();
+
 protected:
     QTextBlock blockForVisibleRow(int row) const;
     QTextBlock blockForVerticalOffset(int offset) const;
@@ -569,6 +597,8 @@ protected:
 
     void setVisualIndentOffset(int offset);
 
+    void updateUndoRedoActions();
+
 public:
     QString selectedText() const;
 
@@ -689,7 +719,7 @@ public:
     void setSyntaxHighlighterCreator(const SyntaxHighLighterCreator &creator);
     void setUseGenericHighlighter(bool enabled);
     void setAutoCompleterCreator(const AutoCompleterCreator &creator);
-    void setEditorActionHandlers(uint optionalActions);
+    void setOptionalActionMask(int optionalActions);
 
     void addHoverHandler(BaseHoverHandler *handler);
     void setCompletionAssistProvider(CompletionAssistProvider *provider);
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index 821d9a4a479..ccb298a5aa8 100644
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/src/plugins/texteditor/texteditor.qbs
@@ -124,8 +124,6 @@ QtcPlugin {
         "storagesettings.h",
         "syntaxhighlighter.cpp",
         "syntaxhighlighter.h",
-        "syntaxhighlighterrunner.cpp",
-        "syntaxhighlighterrunner.h",
         "tabsettings.cpp",
         "tabsettings.h",
         "tabsettingswidget.cpp",
@@ -137,9 +135,8 @@ QtcPlugin {
         "texteditor.cpp",
         "texteditor.h",
         "texteditor.qrc",
-        "texteditor_global.h", "texteditortr.h",
-        "texteditoractionhandler.cpp",
-        "texteditoractionhandler.h",
+        "texteditor_global.h",
+        "texteditortr.h",
         "texteditorconstants.cpp",
         "texteditorconstants.h",
         "texteditoroverlay.cpp",
@@ -152,6 +149,8 @@ QtcPlugin {
         "textmark.cpp",
         "textmark.h",
         "textstyles.h",
+        "typehierarchy.cpp",
+        "typehierarchy.h",
         "typingsettings.cpp",
         "typingsettings.h",
     ]
@@ -223,8 +222,6 @@ QtcPlugin {
             "snippetprovider.h",
             "snippetscollection.cpp",
             "snippetscollection.h",
-            "snippetssettings.cpp",
-            "snippetssettings.h",
             "snippetssettingspage.cpp",
             "snippetssettingspage.h",
         ]
diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp
deleted file mode 100644
index 240e8498ed1..00000000000
--- a/src/plugins/texteditor/texteditoractionhandler.cpp
+++ /dev/null
@@ -1,656 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "texteditoractionhandler.h"
-
-#include "texteditor.h"
-#include "displaysettings.h"
-#include "fontsettings.h"
-#include "linenumberfilter.h"
-#include "texteditortr.h"
-#include "texteditorsettings.h"
-
-#include <aggregation/aggregate.h>
-
-#include <coreplugin/locator/locatormanager.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/actioncontainer.h>
-#include <coreplugin/actionmanager/command.h>
-
-#include <utils/hostosinfo.h>
-#include <utils/qtcassert.h>
-
-#include <QDebug>
-#include <QAction>
-
-#include <functional>
-
-using namespace Core;
-
-namespace TextEditor {
-namespace Internal {
-
-class TextEditorActionHandlerPrivate : public QObject
-{
-public:
-    TextEditorActionHandlerPrivate(Utils::Id editorId, Utils::Id contextId, uint optionalActions);
-
-    QAction *registerActionHelper(Utils::Id id,
-                                  bool scriptable,
-                                  const QString &title,
-                                  const QKeySequence &keySequence,
-                                  Utils::Id menueGroup,
-                                  ActionContainer *container,
-                                  std::function<void(bool)> slot)
-    {
-        auto result = new QAction(title, this);
-        Command *command
-            = ActionManager::registerAction(result, id, Context(m_contextId), scriptable);
-        if (!keySequence.isEmpty())
-            command->setDefaultKeySequence(keySequence);
-
-        if (container && menueGroup.isValid())
-            container->addAction(command, menueGroup);
-
-        connect(result, &QAction::triggered, slot);
-        return result;
-    }
-
-    QAction *registerAction(Utils::Id id,
-                            std::function<void(TextEditorWidget *)> slot,
-                            bool scriptable = false,
-                            const QString &title = QString(),
-                            const QKeySequence &keySequence = QKeySequence(),
-                            Utils::Id menueGroup = Utils::Id(),
-                            ActionContainer *container = nullptr)
-    {
-        return registerActionHelper(id,
-                                    scriptable,
-                                    title,
-                                    keySequence,
-                                    menueGroup,
-                                    container,
-                                    [this, slot, id](bool) {
-                                        if (m_currentEditorWidget)
-                                            slot(m_currentEditorWidget);
-                                        else if (m_unhandledCallback)
-                                            m_unhandledCallback(id, m_currentEditor);
-                                    });
-    }
-
-    QAction *registerBoolAction(Utils::Id id,
-                                std::function<void(TextEditorWidget *, bool)> slot,
-                                bool scriptable = false,
-                                const QString &title = QString(),
-                                const QKeySequence &keySequence = QKeySequence(),
-                                Utils::Id menueGroup = Utils::Id(),
-                                ActionContainer *container = nullptr)
-    {
-        return registerActionHelper(id, scriptable, title, keySequence, menueGroup, container,
-            [this, slot](bool on) { if (m_currentEditorWidget) slot(m_currentEditorWidget, on); });
-    }
-
-    QAction *registerIntAction(Utils::Id id,
-                               std::function<void(TextEditorWidget *, int)> slot,
-                               bool scriptable = false,
-                               const QString &title = QString(),
-                               const QKeySequence &keySequence = QKeySequence(),
-                               Utils::Id menueGroup = Utils::Id(),
-                               ActionContainer *container = nullptr)
-    {
-        return registerActionHelper(id, scriptable, title, keySequence, menueGroup, container,
-            [this, slot](bool on) { if (m_currentEditorWidget) slot(m_currentEditorWidget, on); });
-    }
-
-    void createActions();
-
-    void updateActions();
-    void updateOptionalActions();
-    void updateRedoAction(bool on);
-    void updateUndoAction(bool on);
-    void updateCopyAction(bool on);
-
-    void updateCurrentEditor(IEditor *editor);
-
-    void setCanUndoCallback(const TextEditorActionHandler::Predicate &callback);
-    void setCanRedoCallback(const TextEditorActionHandler::Predicate &callback);
-
-public:
-    TextEditorActionHandler::TextEditorWidgetResolver m_findTextWidget;
-    QAction *m_undoAction = nullptr;
-    QAction *m_redoAction = nullptr;
-    QAction *m_copyAction = nullptr;
-    QAction *m_copyHtmlAction = nullptr;
-    QAction *m_cutAction = nullptr;
-    QAction *m_autoIndentAction = nullptr;
-    QAction *m_autoFormatAction = nullptr;
-    QAction *m_visualizeWhitespaceAction = nullptr;
-    QAction *m_textWrappingAction = nullptr;
-    QAction *m_unCommentSelectionAction = nullptr;
-    QAction *m_unfoldAllAction = nullptr;
-    QAction *m_followSymbolAction = nullptr;
-    QAction *m_followSymbolInNextSplitAction = nullptr;
-    QAction *m_followToTypeAction = nullptr;
-    QAction *m_followToTypeInNextSplitAction = nullptr;
-    QAction *m_findUsageAction = nullptr;
-    QAction *m_openCallHierarchyAction = nullptr;
-    QAction *m_renameSymbolAction = nullptr;
-    QAction *m_jumpToFileAction = nullptr;
-    QAction *m_jumpToFileInNextSplitAction = nullptr;
-    QList<QAction *> m_modifyingActions;
-
-    uint m_optionalActions = TextEditorActionHandler::None;
-    QPointer<TextEditorWidget> m_currentEditorWidget;
-    QPointer<IEditor> m_currentEditor;
-    Utils::Id m_editorId;
-    Utils::Id m_contextId;
-
-    TextEditorActionHandler::Predicate m_canUndoCallback;
-    TextEditorActionHandler::Predicate m_canRedoCallback;
-
-    TextEditorActionHandler::UnhandledCallback m_unhandledCallback;
-};
-
-TextEditorActionHandlerPrivate::TextEditorActionHandlerPrivate
-    (Utils::Id editorId, Utils::Id contextId, uint optionalActions)
-  : m_optionalActions(optionalActions)
-  , m_editorId(editorId)
-  , m_contextId(contextId)
-{
-    createActions();
-    connect(EditorManager::instance(),
-            &EditorManager::currentEditorChanged,
-            this,
-            &TextEditorActionHandlerPrivate::updateCurrentEditor);
-    connect(TextEditorSettings::instance(), &TextEditorSettings::fontSettingsChanged,
-        this, &TextEditorActionHandlerPrivate::updateActions);
-}
-
-void TextEditorActionHandlerPrivate::createActions()
-{
-    using namespace Core::Constants;
-    using namespace TextEditor::Constants;
-
-    m_undoAction = registerAction(UNDO,
-            [] (TextEditorWidget *w) { w->undo(); }, true, Tr::tr("&Undo"));
-    m_redoAction = registerAction(REDO,
-            [] (TextEditorWidget *w) { w->redo(); }, true, Tr::tr("&Redo"));
-    m_copyAction = registerAction(COPY,
-            [] (TextEditorWidget *w) { w->copy(); }, true);
-    m_cutAction = registerAction(CUT,
-            [] (TextEditorWidget *w) { w->cut(); }, true);
-    m_modifyingActions << registerAction(PASTE,
-            [] (TextEditorWidget *w) { w->paste(); }, true);
-    registerAction(SELECTALL,
-            [] (TextEditorWidget *w) { w->selectAll(); }, true);
-    registerAction(GOTO, [](TextEditorWidget *) {
-        LocatorManager::showFilter(lineNumberFilter());
-    });
-    m_modifyingActions << registerAction(PRINT, [](TextEditorWidget *widget) {
-        widget->print(ICore::printer());
-    });
-    m_modifyingActions << registerAction(DELETE_LINE,
-            [] (TextEditorWidget *w) { w->deleteLine(); }, true, Tr::tr("Delete &Line"));
-    m_modifyingActions << registerAction(DELETE_END_OF_LINE,
-            [] (TextEditorWidget *w) { w->deleteEndOfLine(); }, true, Tr::tr("Delete Line from Cursor On"));
-    m_modifyingActions << registerAction(DELETE_END_OF_WORD,
-            [] (TextEditorWidget *w) { w->deleteEndOfWord(); }, true, Tr::tr("Delete Word from Cursor On"));
-    m_modifyingActions << registerAction(DELETE_END_OF_WORD_CAMEL_CASE,
-            [] (TextEditorWidget *w) { w->deleteEndOfWordCamelCase(); }, true, Tr::tr("Delete Word Camel Case from Cursor On"));
-    m_modifyingActions << registerAction(
-        DELETE_START_OF_LINE,
-        [](TextEditorWidget *w) { w->deleteStartOfLine(); },
-        true,
-        Tr::tr("Delete Line up to Cursor"),
-        Core::useMacShortcuts ? QKeySequence(Tr::tr("Ctrl+Backspace")) : QKeySequence());
-    m_modifyingActions << registerAction(DELETE_START_OF_WORD,
-            [] (TextEditorWidget *w) { w->deleteStartOfWord(); }, true, Tr::tr("Delete Word up to Cursor"));
-    m_modifyingActions << registerAction(DELETE_START_OF_WORD_CAMEL_CASE,
-            [] (TextEditorWidget *w) { w->deleteStartOfWordCamelCase(); }, true, Tr::tr("Delete Word Camel Case up to Cursor"));
-    registerAction(GOTO_BLOCK_START_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoBlockStartWithSelection(); }, true, Tr::tr("Go to Block Start with Selection"),
-            QKeySequence(Tr::tr("Ctrl+{")));
-    registerAction(GOTO_BLOCK_END_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoBlockEndWithSelection(); }, true, Tr::tr("Go to Block End with Selection"),
-            QKeySequence(Tr::tr("Ctrl+}")));
-    m_modifyingActions << registerAction(MOVE_LINE_UP,
-            [] (TextEditorWidget *w) { w->moveLineUp(); }, true, Tr::tr("Move Line Up"),
-            QKeySequence(Tr::tr("Ctrl+Shift+Up")));
-    m_modifyingActions << registerAction(MOVE_LINE_DOWN,
-            [] (TextEditorWidget *w) { w->moveLineDown(); }, true, Tr::tr("Move Line Down"),
-            QKeySequence(Tr::tr("Ctrl+Shift+Down")));
-    m_modifyingActions << registerAction(COPY_LINE_UP,
-            [] (TextEditorWidget *w) { w->copyLineUp(); }, true, Tr::tr("Copy Line Up"),
-            QKeySequence(Tr::tr("Ctrl+Alt+Up")));
-    m_modifyingActions << registerAction(COPY_LINE_DOWN,
-            [] (TextEditorWidget *w) { w->copyLineDown(); }, true, Tr::tr("Copy Line Down"),
-            QKeySequence(Tr::tr("Ctrl+Alt+Down")));
-    m_modifyingActions << registerAction(JOIN_LINES,
-            [] (TextEditorWidget *w) { w->joinLines(); }, true, Tr::tr("Join Lines"),
-            QKeySequence(Tr::tr("Ctrl+J")));
-    m_modifyingActions << registerAction(INSERT_LINE_ABOVE,
-            [] (TextEditorWidget *w) { w->insertLineAbove(); }, true, Tr::tr("Insert Line Above Current Line"),
-            QKeySequence(Tr::tr("Ctrl+Shift+Return")));
-    m_modifyingActions << registerAction(INSERT_LINE_BELOW,
-            [] (TextEditorWidget *w) { w->insertLineBelow(); }, true, Tr::tr("Insert Line Below Current Line"),
-            QKeySequence(Tr::tr("Ctrl+Return")));
-    m_modifyingActions << registerAction(SWITCH_UTF8BOM,
-            [] (TextEditorWidget *w) { w->switchUtf8bom(); }, true, Tr::tr("Toggle UTF-8 BOM"));
-    m_modifyingActions << registerAction(INDENT,
-            [] (TextEditorWidget *w) { w->indent(); }, true, Tr::tr("Indent"));
-    m_modifyingActions << registerAction(UNINDENT,
-            [] (TextEditorWidget *w) { w->unindent(); }, true, Tr::tr("Unindent"));
-    m_followSymbolAction = registerAction(FOLLOW_SYMBOL_UNDER_CURSOR,
-            [] (TextEditorWidget *w) { w->openLinkUnderCursor(); }, true, Tr::tr("Follow Symbol Under Cursor"),
-            QKeySequence(Qt::Key_F2));
-    m_followSymbolInNextSplitAction = registerAction(FOLLOW_SYMBOL_UNDER_CURSOR_IN_NEXT_SPLIT,
-            [] (TextEditorWidget *w) { w->openLinkUnderCursorInNextSplit(); }, true, Tr::tr("Follow Symbol Under Cursor in Next Split"),
-            QKeySequence(Utils::HostOsInfo::isMacHost() ? Tr::tr("Meta+E, F2") : Tr::tr("Ctrl+E, F2")));
-    m_followToTypeAction = registerAction(FOLLOW_SYMBOL_TO_TYPE,
-            [] (TextEditorWidget *w) { w->openTypeUnderCursor(); }, true, Tr::tr("Follow Type Under Cursor"),
-            QKeySequence(Tr::tr("Ctrl+Shift+F2")));
-    m_followToTypeInNextSplitAction = registerAction(FOLLOW_SYMBOL_TO_TYPE_IN_NEXT_SPLIT,
-            [] (TextEditorWidget *w) { w->openTypeUnderCursorInNextSplit(); }, true, Tr::tr("Follow Type Under Cursor in Next Split"),
-            QKeySequence(Utils::HostOsInfo::isMacHost() ? Tr::tr("Meta+E, Shift+F2") : Tr::tr("Ctrl+E, Ctrl+Shift+F2")));
-    m_findUsageAction = registerAction(FIND_USAGES,
-            [] (TextEditorWidget *w) { w->findUsages(); }, true, Tr::tr("Find References to Symbol Under Cursor"),
-            QKeySequence(Tr::tr("Ctrl+Shift+U")));
-    m_renameSymbolAction = registerAction(RENAME_SYMBOL,
-            [] (TextEditorWidget *w) { w->renameSymbolUnderCursor(); }, true, Tr::tr("Rename Symbol Under Cursor"),
-            QKeySequence(Tr::tr("Ctrl+Shift+R")));
-    m_jumpToFileAction = registerAction(JUMP_TO_FILE_UNDER_CURSOR,
-            [] (TextEditorWidget *w) { w->openLinkUnderCursor(); }, true, Tr::tr("Jump to File Under Cursor"),
-            QKeySequence(Qt::Key_F2));
-    m_jumpToFileInNextSplitAction = registerAction(JUMP_TO_FILE_UNDER_CURSOR_IN_NEXT_SPLIT,
-            [] (TextEditorWidget *w) { w->openLinkUnderCursorInNextSplit(); }, true, Tr::tr("Jump to File Under Cursor in Next Split"),
-            QKeySequence(Utils::HostOsInfo::isMacHost() ? Tr::tr("Meta+E, F2") : Tr::tr("Ctrl+E, F2")).toString());
-    m_openCallHierarchyAction = registerAction(OPEN_CALL_HIERARCHY,
-            [] (TextEditorWidget *w) { w->openCallHierarchy(); }, true, Tr::tr("Open Call Hierarchy"));
-
-    registerAction(VIEW_PAGE_UP,
-            [] (TextEditorWidget *w) { w->viewPageUp(); }, true, Tr::tr("Move the View a Page Up and Keep the Cursor Position"),
-            QKeySequence(Tr::tr("Ctrl+PgUp")));
-    registerAction(VIEW_PAGE_DOWN,
-            [] (TextEditorWidget *w) { w->viewPageDown(); }, true, Tr::tr("Move the View a Page Down and Keep the Cursor Position"),
-            QKeySequence(Tr::tr("Ctrl+PgDown")));
-    registerAction(VIEW_LINE_UP,
-            [] (TextEditorWidget *w) { w->viewLineUp(); }, true, Tr::tr("Move the View a Line Up and Keep the Cursor Position"),
-            QKeySequence(Tr::tr("Ctrl+Up")));
-    registerAction(VIEW_LINE_DOWN,
-            [] (TextEditorWidget *w) { w->viewLineDown(); }, true, Tr::tr("Move the View a Line Down and Keep the Cursor Position"),
-            QKeySequence(Tr::tr("Ctrl+Down")));
-
-    // register "Edit" Menu Actions
-    ActionContainer *editMenu = ActionManager::actionContainer(M_EDIT);
-    registerAction(SELECT_ENCODING,
-            [] (TextEditorWidget *w) { w->selectEncoding(); }, false, Tr::tr("Select Encoding..."),
-            QKeySequence(), G_EDIT_OTHER, editMenu);
-    m_modifyingActions << registerAction(CIRCULAR_PASTE,
-        [] (TextEditorWidget *w) { w->circularPaste(); }, false, Tr::tr("Paste from Clipboard History"),
-        QKeySequence(Tr::tr("Ctrl+Shift+V")), G_EDIT_COPYPASTE, editMenu);
-    m_modifyingActions << registerAction(NO_FORMAT_PASTE,
-        [] (TextEditorWidget *w) { w->pasteWithoutFormat(); }, false, Tr::tr("Paste Without Formatting"),
-        QKeySequence(Core::useMacShortcuts ? Tr::tr("Ctrl+Alt+Shift+V") : QString()), G_EDIT_COPYPASTE, editMenu);
-
-    // register "Edit -> Advanced" Menu Actions
-    ActionContainer *advancedEditMenu = ActionManager::actionContainer(M_EDIT_ADVANCED);
-    m_autoIndentAction = registerAction(AUTO_INDENT_SELECTION,
-            [] (TextEditorWidget *w) { w->autoIndent(); }, true, Tr::tr("Auto-&indent Selection"),
-            QKeySequence(Tr::tr("Ctrl+I")),
-            G_EDIT_FORMAT, advancedEditMenu);
-    m_autoFormatAction = registerAction(AUTO_FORMAT_SELECTION,
-            [] (TextEditorWidget *w) { w->autoFormat(); }, true, Tr::tr("Auto-&format Selection"),
-            QKeySequence(Tr::tr("Ctrl+;")),
-            G_EDIT_FORMAT, advancedEditMenu);
-    m_modifyingActions << registerAction(REWRAP_PARAGRAPH,
-            [] (TextEditorWidget *w) { w->rewrapParagraph(); }, true, Tr::tr("&Rewrap Paragraph"),
-            QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+E, R") : Tr::tr("Ctrl+E, R")),
-            G_EDIT_FORMAT, advancedEditMenu);
-    m_visualizeWhitespaceAction = registerBoolAction(VISUALIZE_WHITESPACE,
-            [] (TextEditorWidget *widget, bool checked) {
-                if (widget) {
-                     DisplaySettings ds = widget->displaySettings();
-                     ds.m_visualizeWhitespace = checked;
-                     widget->setDisplaySettings(ds);
-                }
-            },
-            false, Tr::tr("&Visualize Whitespace"),
-            QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+E, Meta+V") : Tr::tr("Ctrl+E, Ctrl+V")),
-            G_EDIT_FORMAT, advancedEditMenu);
-    m_visualizeWhitespaceAction->setCheckable(true);
-    m_modifyingActions << registerAction(CLEAN_WHITESPACE,
-            [] (TextEditorWidget *w) { w->cleanWhitespace(); }, true, Tr::tr("Clean Whitespace"),
-            QKeySequence(),
-            G_EDIT_FORMAT, advancedEditMenu);
-    m_textWrappingAction = registerBoolAction(TEXT_WRAPPING,
-            [] (TextEditorWidget *widget, bool checked) {
-                if (widget) {
-                    DisplaySettings ds = widget->displaySettings();
-                    ds.m_textWrapping = checked;
-                    widget->setDisplaySettings(ds);
-                }
-            },
-            false, Tr::tr("Enable Text &Wrapping"),
-            QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+E, Meta+W") : Tr::tr("Ctrl+E, Ctrl+W")),
-            G_EDIT_FORMAT, advancedEditMenu);
-    m_textWrappingAction->setCheckable(true);
-    m_unCommentSelectionAction = registerAction(UN_COMMENT_SELECTION,
-            [] (TextEditorWidget *w) { w->unCommentSelection(); }, true, Tr::tr("Toggle Comment &Selection"),
-            QKeySequence(Tr::tr("Ctrl+/")),
-            G_EDIT_FORMAT, advancedEditMenu);
-    m_modifyingActions << registerAction(CUT_LINE,
-            [] (TextEditorWidget *w) { w->cutLine(); }, true, Tr::tr("Cut &Line"),
-            QKeySequence(Tr::tr("Shift+Del")),
-            G_EDIT_TEXT, advancedEditMenu);
-    registerAction(COPY_LINE,
-            [] (TextEditorWidget *w) { w->copyLine(); }, false, Tr::tr("Copy &Line"),
-            QKeySequence(Tr::tr("Ctrl+Ins")),
-            G_EDIT_TEXT, advancedEditMenu);
-    m_copyHtmlAction = registerAction(COPY_WITH_HTML,
-            [] (TextEditorWidget *w) { w->copyWithHtml(); }, true, Tr::tr("Copy With Highlighting"),
-            QKeySequence(), G_EDIT_TEXT, advancedEditMenu);
-
-    registerAction(ADD_CURSORS_TO_LINE_ENDS,
-            [] (TextEditorWidget *w) { w->addCursorsToLineEnds(); }, false, Tr::tr("Create Cursors at Selected Line Ends"),
-            QKeySequence(Tr::tr("Alt+Shift+I")),
-            G_EDIT_TEXT, advancedEditMenu);
-    registerAction(ADD_SELECT_NEXT_FIND_MATCH,
-            [] (TextEditorWidget *w) { w->addSelectionNextFindMatch(); }, false, Tr::tr("Add Next Occurrence to Selection"),
-            QKeySequence(Tr::tr("Ctrl+D")),
-            G_EDIT_TEXT, advancedEditMenu);
-    m_modifyingActions << registerAction(DUPLICATE_SELECTION,
-            [] (TextEditorWidget *w) { w->duplicateSelection(); }, false, Tr::tr("&Duplicate Selection"),
-            QKeySequence(),
-            G_EDIT_TEXT, advancedEditMenu);
-    m_modifyingActions << registerAction(DUPLICATE_SELECTION_AND_COMMENT,
-            [] (TextEditorWidget *w) { w->duplicateSelectionAndComment(); }, false, Tr::tr("&Duplicate Selection and Comment"),
-            QKeySequence(),
-            G_EDIT_TEXT, advancedEditMenu);
-    m_modifyingActions << registerAction(UPPERCASE_SELECTION,
-            [] (TextEditorWidget *w) { w->uppercaseSelection(); }, true, Tr::tr("Uppercase Selection"),
-            QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+Shift+U") : Tr::tr("Alt+Shift+U")),
-            G_EDIT_TEXT, advancedEditMenu);
-    m_modifyingActions << registerAction(LOWERCASE_SELECTION,
-            [] (TextEditorWidget *w) { w->lowercaseSelection(); }, true, Tr::tr("Lowercase Selection"),
-            QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+U") : Tr::tr("Alt+U")),
-            G_EDIT_TEXT, advancedEditMenu);
-    m_modifyingActions << registerAction(SORT_LINES,
-        [] (TextEditorWidget *w) { w->sortLines(); }, false, Tr::tr("&Sort Lines"),
-            QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+Shift+S") : Tr::tr("Alt+Shift+S")),
-            G_EDIT_TEXT, advancedEditMenu);
-    registerAction(FOLD,
-            [] (TextEditorWidget *w) { w->foldCurrentBlock(); }, true, Tr::tr("Fold"),
-            QKeySequence(Tr::tr("Ctrl+<")),
-            G_EDIT_COLLAPSING, advancedEditMenu);
-    registerAction(UNFOLD,
-            [] (TextEditorWidget *w) { w->unfoldCurrentBlock(); }, true, Tr::tr("Unfold"),
-            QKeySequence(Tr::tr("Ctrl+>")),
-            G_EDIT_COLLAPSING, advancedEditMenu);
-    m_unfoldAllAction = registerAction(UNFOLD_ALL,
-            [] (TextEditorWidget *w) { w->unfoldAll(); }, true, Tr::tr("Toggle &Fold All"),
-            QKeySequence(),
-            G_EDIT_COLLAPSING, advancedEditMenu);
-    registerAction(INCREASE_FONT_SIZE,
-            [] (TextEditorWidget *w) { w->increaseFontZoom(); }, false, Tr::tr("Increase Font Size"),
-            QKeySequence(Tr::tr("Ctrl++")),
-            G_EDIT_FONT, advancedEditMenu);
-    registerAction(DECREASE_FONT_SIZE,
-            [] (TextEditorWidget *w) { w->decreaseFontZoom(); }, false, Tr::tr("Decrease Font Size"),
-            QKeySequence(Tr::tr("Ctrl+-")),
-            G_EDIT_FONT, advancedEditMenu);
-    registerAction(RESET_FONT_SIZE,
-            [] (TextEditorWidget *w) { w->zoomReset(); }, false, Tr::tr("Reset Font Size"),
-            QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+0") : Tr::tr("Ctrl+0")),
-            G_EDIT_FONT, advancedEditMenu);
-    registerAction(GOTO_BLOCK_START,
-            [] (TextEditorWidget *w) { w->gotoBlockStart(); }, true, Tr::tr("Go to Block Start"),
-            QKeySequence(Tr::tr("Ctrl+[")),
-            G_EDIT_BLOCKS, advancedEditMenu);
-    registerAction(GOTO_BLOCK_END,
-            [] (TextEditorWidget *w) { w->gotoBlockEnd(); }, true, Tr::tr("Go to Block End"),
-            QKeySequence(Tr::tr("Ctrl+]")),
-            G_EDIT_BLOCKS, advancedEditMenu);
-    registerAction(SELECT_BLOCK_UP,
-            [] (TextEditorWidget *w) { w->selectBlockUp(); }, true, Tr::tr("Select Block Up"),
-            QKeySequence(Tr::tr("Ctrl+U")),
-            G_EDIT_BLOCKS, advancedEditMenu);
-    registerAction(SELECT_BLOCK_DOWN,
-            [] (TextEditorWidget *w) { w->selectBlockDown(); }, true, Tr::tr("Select Block Down"),
-            QKeySequence(Tr::tr("Ctrl+Shift+Alt+U")),
-            G_EDIT_BLOCKS, advancedEditMenu);
-    registerAction(SELECT_WORD_UNDER_CURSOR,
-            [] (TextEditorWidget *w) { w->selectWordUnderCursor(); }, true,
-            Tr::tr("Select Word Under Cursor"));
-
-    // register GOTO Actions
-    registerAction(GOTO_DOCUMENT_START,
-            [] (TextEditorWidget *w) { w->gotoDocumentStart(); }, true, Tr::tr("Go to Document Start"));
-    registerAction(GOTO_DOCUMENT_END,
-            [] (TextEditorWidget *w) { w->gotoDocumentEnd(); }, true, Tr::tr("Go to Document End"));
-    registerAction(GOTO_LINE_START,
-            [] (TextEditorWidget *w) { w->gotoLineStart(); }, true, Tr::tr("Go to Line Start"));
-    registerAction(GOTO_LINE_END,
-            [] (TextEditorWidget *w) { w->gotoLineEnd(); }, true, Tr::tr("Go to Line End"));
-    registerAction(GOTO_NEXT_LINE,
-            [] (TextEditorWidget *w) { w->gotoNextLine(); }, true, Tr::tr("Go to Next Line"));
-    registerAction(GOTO_PREVIOUS_LINE,
-            [] (TextEditorWidget *w) { w->gotoPreviousLine(); }, true, Tr::tr("Go to Previous Line"));
-    registerAction(GOTO_PREVIOUS_CHARACTER,
-            [] (TextEditorWidget *w) { w->gotoPreviousCharacter(); }, true, Tr::tr("Go to Previous Character"));
-    registerAction(GOTO_NEXT_CHARACTER,
-            [] (TextEditorWidget *w) { w->gotoNextCharacter(); }, true, Tr::tr("Go to Next Character"));
-    registerAction(GOTO_PREVIOUS_WORD,
-            [] (TextEditorWidget *w) { w->gotoPreviousWord(); }, true, Tr::tr("Go to Previous Word"));
-    registerAction(GOTO_NEXT_WORD,
-            [] (TextEditorWidget *w) { w->gotoNextWord(); }, true, Tr::tr("Go to Next Word"));
-    registerAction(GOTO_PREVIOUS_WORD_CAMEL_CASE,
-            [] (TextEditorWidget *w) { w->gotoPreviousWordCamelCase(); }, false, Tr::tr("Go to Previous Word Camel Case"));
-    registerAction(GOTO_NEXT_WORD_CAMEL_CASE,
-            [] (TextEditorWidget *w) { w->gotoNextWordCamelCase(); }, false, Tr::tr("Go to Next Word Camel Case"));
-
-    // register GOTO actions with selection
-    registerAction(GOTO_LINE_START_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoLineStartWithSelection(); }, true, Tr::tr("Go to Line Start with Selection"));
-    registerAction(GOTO_LINE_END_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoLineEndWithSelection(); }, true, Tr::tr("Go to Line End with Selection"));
-    registerAction(GOTO_NEXT_LINE_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoNextLineWithSelection(); }, true, Tr::tr("Go to Next Line with Selection"));
-    registerAction(GOTO_PREVIOUS_LINE_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoPreviousLineWithSelection(); }, true, Tr::tr("Go to Previous Line with Selection"));
-    registerAction(GOTO_PREVIOUS_CHARACTER_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoPreviousCharacterWithSelection(); }, true, Tr::tr("Go to Previous Character with Selection"));
-    registerAction(GOTO_NEXT_CHARACTER_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoNextCharacterWithSelection(); }, true, Tr::tr("Go to Next Character with Selection"));
-    registerAction(GOTO_PREVIOUS_WORD_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoPreviousWordWithSelection(); }, true, Tr::tr("Go to Previous Word with Selection"));
-    registerAction(GOTO_NEXT_WORD_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoNextWordWithSelection(); }, true, Tr::tr("Go to Next Word with Selection"));
-    registerAction(GOTO_PREVIOUS_WORD_CAMEL_CASE_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoPreviousWordCamelCaseWithSelection(); }, false, Tr::tr("Go to Previous Word Camel Case with Selection"));
-    registerAction(GOTO_NEXT_WORD_CAMEL_CASE_WITH_SELECTION,
-            [] (TextEditorWidget *w) { w->gotoNextWordCamelCaseWithSelection(); }, false, Tr::tr("Go to Next Word Camel Case with Selection"));
-
-    // Collect additional modifying actions so we can check for them inside a readonly file
-    // and disable them
-    m_modifyingActions << m_autoIndentAction;
-    m_modifyingActions << m_autoFormatAction;
-    m_modifyingActions << m_unCommentSelectionAction;
-
-    updateOptionalActions();
-}
-
-void TextEditorActionHandlerPrivate::updateActions()
-{
-    bool isWritable = m_currentEditorWidget && !m_currentEditorWidget->isReadOnly();
-    for (QAction *a : std::as_const(m_modifyingActions))
-        a->setEnabled(isWritable);
-    m_unCommentSelectionAction->setEnabled((m_optionalActions & TextEditorActionHandler::UnCommentSelection) && isWritable);
-    m_visualizeWhitespaceAction->setEnabled(m_currentEditorWidget);
-    if (TextEditorSettings::fontSettings().relativeLineSpacing() == 100) {
-        m_textWrappingAction->setEnabled(m_currentEditorWidget);
-    } else {
-        m_textWrappingAction->setEnabled(false);
-        m_textWrappingAction->setChecked(false);
-    }
-    if (m_currentEditorWidget) {
-        m_visualizeWhitespaceAction->setChecked(
-                    m_currentEditorWidget->displaySettings().m_visualizeWhitespace);
-        m_textWrappingAction->setChecked(m_currentEditorWidget->displaySettings().m_textWrapping);
-    }
-
-    bool canRedo = false;
-    bool canUndo = false;
-    bool canCopy = false;
-
-    if (m_currentEditor && m_currentEditor->document()
-        && m_currentEditor->document()->id() == m_editorId) {
-        canRedo = m_canRedoCallback ? m_canRedoCallback(m_currentEditor) : false;
-        canUndo = m_canUndoCallback ? m_canUndoCallback(m_currentEditor) : false;
-
-        if (m_currentEditorWidget) {
-            canRedo = m_canRedoCallback ? canRedo
-                                        : m_currentEditorWidget->document()->isRedoAvailable();
-            canUndo = m_canUndoCallback ? canUndo
-                                        : m_currentEditorWidget->document()->isUndoAvailable();
-            canCopy = m_currentEditorWidget->textCursor().hasSelection();
-        }
-    }
-
-    updateRedoAction(canRedo);
-    updateUndoAction(canUndo);
-    updateCopyAction(canCopy);
-
-    updateOptionalActions();
-}
-
-void TextEditorActionHandlerPrivate::updateOptionalActions()
-{
-    const uint optionalActions = m_currentEditorWidget ? m_currentEditorWidget->optionalActions()
-                                                       : m_optionalActions;
-    m_followSymbolAction->setEnabled(
-        optionalActions & TextEditorActionHandler::FollowSymbolUnderCursor);
-    m_followSymbolInNextSplitAction->setEnabled(
-        optionalActions & TextEditorActionHandler::FollowSymbolUnderCursor);
-    m_followToTypeAction->setEnabled(
-        optionalActions & TextEditorActionHandler::FollowTypeUnderCursor);
-    m_followToTypeInNextSplitAction->setEnabled(
-        optionalActions & TextEditorActionHandler::FollowTypeUnderCursor);
-    m_findUsageAction->setEnabled(
-        optionalActions & TextEditorActionHandler::FindUsage);
-    m_jumpToFileAction->setEnabled(
-        optionalActions & TextEditorActionHandler::JumpToFileUnderCursor);
-    m_jumpToFileInNextSplitAction->setEnabled(
-        optionalActions & TextEditorActionHandler::JumpToFileUnderCursor);
-    m_unfoldAllAction->setEnabled(
-        optionalActions & TextEditorActionHandler::UnCollapseAll);
-    m_renameSymbolAction->setEnabled(
-        optionalActions & TextEditorActionHandler::RenameSymbol);
-    m_openCallHierarchyAction->setEnabled(
-        optionalActions & TextEditorActionHandler::CallHierarchy);
-
-    bool formatEnabled = (optionalActions & TextEditorActionHandler::Format)
-                         && m_currentEditorWidget && !m_currentEditorWidget->isReadOnly();
-    m_autoIndentAction->setEnabled(formatEnabled);
-    m_autoFormatAction->setEnabled(formatEnabled);
-}
-
-void TextEditorActionHandlerPrivate::updateRedoAction(bool on)
-{
-    m_redoAction->setEnabled(on);
-}
-
-void TextEditorActionHandlerPrivate::updateUndoAction(bool on)
-{
-    m_undoAction->setEnabled(on);
-}
-
-void TextEditorActionHandlerPrivate::updateCopyAction(bool hasCopyableText)
-{
-    if (m_cutAction)
-        m_cutAction->setEnabled(hasCopyableText && m_currentEditorWidget
-                                && !m_currentEditorWidget->isReadOnly());
-    if (m_copyAction)
-        m_copyAction->setEnabled(hasCopyableText);
-    if (m_copyHtmlAction)
-        m_copyHtmlAction->setEnabled(hasCopyableText);
-}
-
-void TextEditorActionHandlerPrivate::updateCurrentEditor(IEditor *editor)
-{
-    if (m_currentEditorWidget)
-        m_currentEditorWidget->disconnect(this);
-    m_currentEditorWidget = nullptr;
-
-    m_currentEditor = editor;
-
-    if (editor && editor->document()->id() == m_editorId) {
-        m_currentEditorWidget = m_findTextWidget(editor);
-        if (m_currentEditorWidget) {
-            connect(m_currentEditorWidget, &QPlainTextEdit::undoAvailable,
-                    this, &TextEditorActionHandlerPrivate::updateUndoAction);
-            connect(m_currentEditorWidget, &QPlainTextEdit::redoAvailable,
-                    this, &TextEditorActionHandlerPrivate::updateRedoAction);
-            connect(m_currentEditorWidget, &QPlainTextEdit::copyAvailable,
-                    this, &TextEditorActionHandlerPrivate::updateCopyAction);
-            connect(m_currentEditorWidget, &TextEditorWidget::readOnlyChanged,
-                    this, &TextEditorActionHandlerPrivate::updateActions);
-            connect(m_currentEditorWidget, &TextEditorWidget::optionalActionMaskChanged,
-                    this, &TextEditorActionHandlerPrivate::updateOptionalActions);
-        }
-    }
-    updateActions();
-}
-
-} // namespace Internal
-
-TextEditorActionHandler::TextEditorActionHandler(Utils::Id editorId,
-                                                 Utils::Id contextId,
-                                                 uint optionalActions,
-                                                 const TextEditorWidgetResolver &resolver)
-    : d(new Internal::TextEditorActionHandlerPrivate(editorId, contextId, optionalActions))
-{
-    if (resolver)
-        d->m_findTextWidget = resolver;
-    else
-        d->m_findTextWidget = TextEditorWidget::fromEditor;
-}
-
-uint TextEditorActionHandler::optionalActions() const
-{
-    return d->m_optionalActions;
-}
-
-TextEditorActionHandler::~TextEditorActionHandler()
-{
-    delete d;
-}
-
-void TextEditorActionHandler::updateCurrentEditor()
-{
-    d->updateCurrentEditor(EditorManager::currentEditor());
-}
-
-void TextEditorActionHandler::updateActions()
-{
-    d->updateActions();
-}
-
-void TextEditorActionHandler::setCanUndoCallback(const Predicate &callback)
-{
-    d->m_canUndoCallback = callback;
-}
-
-void TextEditorActionHandler::setCanRedoCallback(const Predicate &callback)
-{
-    d->m_canRedoCallback = callback;
-}
-
-void TextEditorActionHandler::setUnhandledCallback(const UnhandledCallback &callback)
-{
-    d->m_unhandledCallback = callback;
-}
-
-} // namespace TextEditor
diff --git a/src/plugins/texteditor/texteditoractionhandler.h b/src/plugins/texteditor/texteditoractionhandler.h
deleted file mode 100644
index 344a4a553e1..00000000000
--- a/src/plugins/texteditor/texteditoractionhandler.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include "texteditor_global.h"
-
-#include <utils/id.h>
-
-#include <QObject>
-
-#include <functional>
-
-namespace Core {
-class IEditor;
-}
-
-namespace TextEditor {
-class TextEditorWidget;
-
-namespace Internal { class TextEditorActionHandlerPrivate; }
-
-// Redirects slots from global actions to the respective editor.
-
-class TEXTEDITOR_EXPORT TextEditorActionHandler final
-{
-    TextEditorActionHandler(const TextEditorActionHandler &) = delete;
-    TextEditorActionHandler &operator=(const TextEditorActionHandler &) = delete;
-
-public:
-    enum OptionalActionsMask {
-        None = 0,
-        Format = 1,
-        UnCommentSelection = 2,
-        UnCollapseAll = 4,
-        FollowSymbolUnderCursor = 8,
-        FollowTypeUnderCursor = 16,
-        JumpToFileUnderCursor = 32,
-        RenameSymbol = 64,
-        FindUsage = 128,
-        CallHierarchy = 256
-    };
-    using TextEditorWidgetResolver = std::function<TextEditorWidget *(Core::IEditor *)>;
-
-    TextEditorActionHandler(Utils::Id editorId,
-                            Utils::Id contextId,
-                            uint optionalActions = None,
-                            const TextEditorWidgetResolver &resolver = {});
-
-    uint optionalActions() const;
-    ~TextEditorActionHandler();
-
-    void updateCurrentEditor();
-    void updateActions();
-
-    using Predicate = std::function<bool(Core::IEditor *editor)>;
-
-    void setCanUndoCallback(const Predicate &callback);
-    void setCanRedoCallback(const Predicate &callback);
-
-    using UnhandledCallback = std::function<void(Utils::Id commandId, Core::IEditor *editor)>;
-    void setUnhandledCallback(const UnhandledCallback &callback);
-
-private:
-    Internal::TextEditorActionHandlerPrivate *d;
-};
-
-} // namespace TextEditor
diff --git a/src/plugins/texteditor/texteditorconstants.h b/src/plugins/texteditor/texteditorconstants.h
index e2115261882..2597deb6bba 100644
--- a/src/plugins/texteditor/texteditorconstants.h
+++ b/src/plugins/texteditor/texteditorconstants.h
@@ -212,6 +212,8 @@ const char FIND_USAGES[] = "TextEditor.FindUsages";
 // moved from CppEditor to TextEditor avoid breaking the setting by using the old key
 const char RENAME_SYMBOL[] = "CppEditor.RenameSymbolUnderCursor";
 const char OPEN_CALL_HIERARCHY[] = "TextEditor.OpenCallHierarchy";
+const char OPEN_TYPE_HIERARCHY[] = "TextEditor.OpenTypeHierarchy";
+const char TYPE_HIERARCHY_FACTORY_ID[] = "TextEditor.TypeHierarchy";
 const char JUMP_TO_FILE_UNDER_CURSOR[] = "TextEditor.JumpToFileUnderCursor";
 const char JUMP_TO_FILE_UNDER_CURSOR_IN_NEXT_SPLIT[] = "TextEditor.JumpToFileUnderCursorInNextSplit";
 
diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp
index 04f11bcbb0b..c774fed0438 100644
--- a/src/plugins/texteditor/texteditorplugin.cpp
+++ b/src/plugins/texteditor/texteditorplugin.cpp
@@ -26,6 +26,7 @@
 #include "texteditorsettings.h"
 #include "texteditortr.h"
 #include "textmark.h"
+#include "typehierarchy.h"
 #include "typingsettings.h"
 
 #ifdef WITH_TESTS
@@ -84,6 +85,7 @@ public:
     void updateCurrentSelection(const QString &text);
 
     void createStandardContextMenu();
+    void createEditorCommands();
 };
 
 void TextEditorPlugin::initialize()
@@ -105,6 +107,7 @@ void TextEditorPlugin::initialize()
 
     setupTextMarkRegistry(this);
     setupOutlineFactory();
+    setupTypeHierarchyFactory();
     setupLineNumberFilter(); // Goto line functionality for quick open
 
     setupPlainTextEditor();
@@ -120,58 +123,12 @@ void TextEditorPlugin::initialize()
     setupMarkdownEditor();
     setupJsonEditor();
 
-    Context context(TextEditor::Constants::C_TEXTEDITOR);
-
-    // Add shortcut for invoking automatic completion
-    Command *command = nullptr;
-    ActionBuilder(this, Constants::COMPLETE_THIS)
-        .setText(Tr::tr("Trigger Completion"))
-        .setContext(context)
-        .bindCommand(&command)
-        .setDefaultKeySequence(Tr::tr("Meta+Space"), Tr::tr("Ctrl+Space"))
-        .addOnTriggered(this, [] {
-            if (BaseTextEditor *editor = BaseTextEditor::currentTextEditor())
-                editor->editorWidget()->invokeAssist(Completion);
-        });
-
-    connect(command, &Command::keySequenceChanged, [command] {
-        FancyLineEdit::setCompletionShortcut(command->keySequence());
-    });
-    FancyLineEdit::setCompletionShortcut(command->keySequence());
-
-    // Add shortcut for invoking function hint completion
-    ActionBuilder(this, Constants::FUNCTION_HINT)
-        .setText(Tr::tr("Display Function Hint"))
-        .setContext(context)
-        .setDefaultKeySequence(Tr::tr("Meta+Shift+D"), Tr::tr("Ctrl+Shift+D"))
-        .addOnTriggered(this, [] {
-            if (BaseTextEditor *editor = BaseTextEditor::currentTextEditor())
-                editor->editorWidget()->invokeAssist(FunctionHint);
-        });
-
-    // Add shortcut for invoking quick fix options
-    ActionBuilder(this, Constants::QUICKFIX_THIS)
-        .setText(Tr::tr("Trigger Refactoring Action"))
-        .setContext(context)
-        .setDefaultKeySequence(Tr::tr("Alt+Return"))
-        .addOnTriggered(this, [] {
-            if (BaseTextEditor *editor = BaseTextEditor::currentTextEditor())
-                editor->editorWidget()->invokeAssist(QuickFix);
-        });
-
-    ActionBuilder(this, Constants::SHOWCONTEXTMENU)
-        .setText(Tr::tr("Show Context Menu"))
-        .setContext(context)
-        .addOnTriggered(this, [] {
-            if (BaseTextEditor *editor = BaseTextEditor::currentTextEditor())
-                editor->editorWidget()->showContextMenu();
-        });
-
     // Add text snippet provider.
     SnippetProvider::registerGroup(Constants::TEXT_SNIPPET_GROUP_ID,
                                     Tr::tr("Text", "SnippetProvider"));
 
     createStandardContextMenu();
+    createEditorCommands();
 
 #ifdef WITH_TESTS
     addTestCreator(createCodeAssistTests);
@@ -347,6 +304,283 @@ void TextEditorPlugin::createStandardContextMenu()
     add(Constants::SWITCH_UTF8BOM, Constants::G_BOM);
 }
 
+class TextActionBuilder : public ActionBuilder
+{
+public:
+    TextActionBuilder(QObject *contextActionParent, const Utils::Id actionId)
+        : ActionBuilder(contextActionParent, actionId)
+    {
+        setContext(Context(Constants::C_TEXTEDITOR));
+    }
+};
+
+void TextEditorPlugin::createEditorCommands()
+{
+    using namespace Core::Constants;
+    // Add shortcut for invoking automatic completion
+    Command *command = nullptr;
+    TextActionBuilder(this, Constants::COMPLETE_THIS)
+        .setText(Tr::tr("Trigger Completion"))
+        .bindCommand(&command)
+        .setDefaultKeySequence(Tr::tr("Meta+Space"), Tr::tr("Ctrl+Space"));
+
+    connect(command, &Command::keySequenceChanged, [command] {
+        FancyLineEdit::setCompletionShortcut(command->keySequence());
+    });
+    FancyLineEdit::setCompletionShortcut(command->keySequence());
+
+    // Add shortcut for invoking function hint completion
+    TextActionBuilder(this, Constants::FUNCTION_HINT)
+        .setText(Tr::tr("Display Function Hint"))
+        .setDefaultKeySequence(Tr::tr("Meta+Shift+D"), Tr::tr("Ctrl+Shift+D"));
+
+    // Add shortcut for invoking quick fix options
+    TextActionBuilder(this, Constants::QUICKFIX_THIS)
+        .setText(Tr::tr("Trigger Refactoring Action"))
+        .setDefaultKeySequence(Tr::tr("Alt+Return"));
+
+    TextActionBuilder(this, Constants::SHOWCONTEXTMENU)
+        .setText(Tr::tr("Show Context Menu"));
+
+    TextActionBuilder(this, DELETE_LINE).setText(Tr::tr("Delete &Line"));
+    TextActionBuilder(this, DELETE_END_OF_LINE).setText(Tr::tr("Delete Line from Cursor On"));
+    TextActionBuilder(this, DELETE_END_OF_WORD).setText(Tr::tr("Delete Word from Cursor On"));
+    TextActionBuilder(this, DELETE_END_OF_WORD_CAMEL_CASE)
+        .setText(Tr::tr("Delete Word Camel Case from Cursor On"));
+    TextActionBuilder(this, DELETE_START_OF_LINE)
+        .setText(Tr::tr("Delete Line up to Cursor"))
+        .setDefaultKeySequence(Tr::tr("Ctrl+Backspace"), {});
+    TextActionBuilder(this, DELETE_START_OF_WORD).setText(Tr::tr("Delete Word up to Cursor"));
+    TextActionBuilder(this, DELETE_START_OF_WORD_CAMEL_CASE)
+        .setText(Tr::tr("Delete Word Camel Case up to Cursor"));
+    TextActionBuilder(this, GOTO_BLOCK_START_WITH_SELECTION)
+        .setText(Tr::tr("Go to Block Start with Selection"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+{")));
+    TextActionBuilder(this, GOTO_BLOCK_END_WITH_SELECTION)
+        .setText(Tr::tr("Go to Block End with Selection"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+}")));
+    TextActionBuilder(this, MOVE_LINE_UP)
+        .setText(Tr::tr("Move Line Up"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Shift+Up")));
+    TextActionBuilder(this, MOVE_LINE_DOWN)
+        .setText(Tr::tr("Move Line Down"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Shift+Down")));
+    TextActionBuilder(this, COPY_LINE_UP)
+        .setText(Tr::tr("Copy Line Up"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Alt+Up")));
+    TextActionBuilder(this, COPY_LINE_DOWN)
+        .setText(Tr::tr("Copy Line Down"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Alt+Down")));
+    TextActionBuilder(this, JOIN_LINES)
+        .setText(Tr::tr("Join Lines"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+J")));
+    TextActionBuilder(this, INSERT_LINE_ABOVE)
+        .setText(Tr::tr("Insert Line Above Current Line"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Shift+Return")));
+    TextActionBuilder(this, INSERT_LINE_BELOW)
+        .setText(Tr::tr("Insert Line Below Current Line"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Return")));
+    TextActionBuilder(this, SWITCH_UTF8BOM).setText(Tr::tr("Toggle UTF-8 BOM"));
+    TextActionBuilder(this, INDENT).setText(Tr::tr("Indent"));
+    TextActionBuilder(this, UNINDENT).setText(Tr::tr("Unindent"));
+    TextActionBuilder(this, FOLLOW_SYMBOL_UNDER_CURSOR)
+        .setText(Tr::tr("Follow Symbol Under Cursor"))
+        .setDefaultKeySequence(QKeySequence(Qt::Key_F2));
+    TextActionBuilder(this, FOLLOW_SYMBOL_UNDER_CURSOR_IN_NEXT_SPLIT)
+        .setText(Tr::tr("Follow Symbol Under Cursor in Next Split"))
+        .setDefaultKeySequence(Tr::tr("Meta+E, F2"), Tr::tr("Ctrl+E, F2"));
+    TextActionBuilder(this, FOLLOW_SYMBOL_TO_TYPE)
+        .setText(Tr::tr("Follow Type Under Cursor"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Shift+F2")));
+    TextActionBuilder(this, FOLLOW_SYMBOL_TO_TYPE_IN_NEXT_SPLIT)
+        .setText(Tr::tr("Follow Type Under Cursor in Next Split"))
+        .setDefaultKeySequence(Tr::tr("Meta+E, Shift+F2"), Tr::tr("Ctrl+E, Ctrl+Shift+F2"));
+    TextActionBuilder(this, FIND_USAGES)
+        .setText(Tr::tr("Find References to Symbol Under Cursor"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Shift+U")));
+    TextActionBuilder(this, RENAME_SYMBOL)
+        .setText(Tr::tr("Rename Symbol Under Cursor"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Shift+R")));
+    TextActionBuilder(this, JUMP_TO_FILE_UNDER_CURSOR)
+        .setText(Tr::tr("Jump to File Under Cursor"))
+        .setDefaultKeySequence(QKeySequence(Qt::Key_F2));
+    TextActionBuilder(this, JUMP_TO_FILE_UNDER_CURSOR_IN_NEXT_SPLIT)
+        .setText(Tr::tr("Jump to File Under Cursor in Next Split"))
+        .setDefaultKeySequence(Tr::tr("Meta+E, F2"), Tr::tr("Ctrl+E, F2"));
+    TextActionBuilder(this, OPEN_CALL_HIERARCHY).setText(Tr::tr("Open Call Hierarchy"));
+    TextActionBuilder(this, OPEN_TYPE_HIERARCHY)
+        .setText(Tr::tr("Open Type Hierarchy"))
+        .setDefaultKeySequence(Tr::tr("Meta+Shift+T"), Tr::tr("Ctrl+Shift+T"));
+    TextActionBuilder(this, VIEW_PAGE_UP)
+        .setText(Tr::tr("Move the View a Page Up and Keep the Cursor Position"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+PgUp")));
+    TextActionBuilder(this, VIEW_PAGE_DOWN)
+        .setText(Tr::tr("Move the View a Page Down and Keep the Cursor Position"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+PgDown")));
+    TextActionBuilder(this, VIEW_LINE_UP)
+        .setText(Tr::tr("Move the View a Line Up and Keep the Cursor Position"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Up")));
+    TextActionBuilder(this, VIEW_LINE_DOWN)
+        .setText(Tr::tr("Move the View a Line Down and Keep the Cursor Position"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Down")));
+
+    ActionManager::actionContainer(M_EDIT);
+    TextActionBuilder(this, SELECT_ENCODING)
+        .setText(Tr::tr("Select Encoding..."))
+        .addToContainer(M_EDIT, G_EDIT_OTHER);
+    TextActionBuilder(this, CIRCULAR_PASTE)
+        .setText(Tr::tr("Paste from Clipboard History"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Shift+V")))
+        .addToContainer(M_EDIT, G_EDIT_COPYPASTE);
+    TextActionBuilder(this, NO_FORMAT_PASTE)
+        .setText(Tr::tr("Paste Without Formatting"))
+        .setDefaultKeySequence(Tr::tr("Ctrl+Alt+Shift+V"), QString())
+        .addToContainer(M_EDIT, G_EDIT_COPYPASTE);
+
+    ActionManager::actionContainer(M_EDIT_ADVANCED);
+    TextActionBuilder(this, AUTO_INDENT_SELECTION)
+        .setText(Tr::tr("Auto-&indent Selection"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+I")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FORMAT);
+    TextActionBuilder(this, AUTO_FORMAT_SELECTION)
+        .setText(Tr::tr("Auto-&format Selection"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+;")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FORMAT);
+    TextActionBuilder(this, REWRAP_PARAGRAPH)
+        .setText(Tr::tr("&Rewrap Paragraph"))
+        .setDefaultKeySequence(Tr::tr("Meta+E, R"), Tr::tr("Ctrl+E, R"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FORMAT);
+    TextActionBuilder(this, VISUALIZE_WHITESPACE)
+        .setText(Tr::tr("&Visualize Whitespace"))
+        .setDefaultKeySequence(Tr::tr("Meta+E, Meta+V"), Tr::tr("Ctrl+E, Ctrl+V"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FORMAT)
+        .setCheckable(true);
+    TextActionBuilder(this, CLEAN_WHITESPACE)
+        .setText(Tr::tr("Clean Whitespace"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FORMAT);
+    TextActionBuilder(this, TEXT_WRAPPING)
+        .setText(Tr::tr("Enable Text &Wrapping"))
+        .setDefaultKeySequence(Tr::tr("Meta+E, Meta+W"), Tr::tr("Ctrl+E, Ctrl+W"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FORMAT)
+        .setCheckable(true);
+    TextActionBuilder(this, UN_COMMENT_SELECTION)
+        .setText(Tr::tr("Toggle Comment &Selection"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+/")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FORMAT);
+    TextActionBuilder(this, CUT_LINE)
+        .setText(Tr::tr("Cut &Line"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Shift+Del")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_TEXT);
+    TextActionBuilder(this, COPY_LINE)
+        .setText(Tr::tr("Copy &Line"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Ins")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_TEXT);
+    TextActionBuilder(this, COPY_WITH_HTML)
+        .setText(Tr::tr("Copy With Highlighting"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_TEXT);
+    TextActionBuilder(this, ADD_CURSORS_TO_LINE_ENDS)
+        .setText(Tr::tr("Create Cursors at Selected Line Ends"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Alt+Shift+I")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_TEXT);
+    TextActionBuilder(this, ADD_SELECT_NEXT_FIND_MATCH)
+        .setText(Tr::tr("Add Next Occurrence to Selection"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+D")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_TEXT);
+    TextActionBuilder(this, DUPLICATE_SELECTION)
+        .setText(Tr::tr("&Duplicate Selection"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_TEXT);
+    TextActionBuilder(this, DUPLICATE_SELECTION_AND_COMMENT)
+        .setText(Tr::tr("&Duplicate Selection and Comment"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_TEXT);
+    TextActionBuilder(this, UPPERCASE_SELECTION)
+        .setText(Tr::tr("Uppercase Selection"))
+        .setDefaultKeySequence(Tr::tr("Meta+Shift+U"), Tr::tr("Alt+Shift+U"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_TEXT);
+    TextActionBuilder(this, LOWERCASE_SELECTION)
+        .setText(Tr::tr("Lowercase Selection"))
+        .setDefaultKeySequence(Tr::tr("Meta+U"), Tr::tr("Alt+U"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_TEXT);
+    TextActionBuilder(this, SORT_LINES)
+        .setText(Tr::tr("Sort Lines"))
+        .setDefaultKeySequence(Tr::tr("Meta+Shift+S"), Tr::tr("Alt+Shift+S"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_TEXT);
+    TextActionBuilder(this, FOLD)
+        .setText(Tr::tr("Fold"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+<")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_COLLAPSING);
+    TextActionBuilder(this, UNFOLD)
+        .setText(Tr::tr("Unfold"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+>")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_COLLAPSING);
+    TextActionBuilder(this, UNFOLD_ALL)
+        .setText(Tr::tr("Toggle &Fold All"))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_COLLAPSING);
+    TextActionBuilder(this, INCREASE_FONT_SIZE)
+        .setText(Tr::tr("Increase Font Size"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl++")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FONT);
+    TextActionBuilder(this, DECREASE_FONT_SIZE)
+        .setText(Tr::tr("Decrease Font Size"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+-")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FONT);
+    TextActionBuilder(this, RESET_FONT_SIZE)
+        .setText(Tr::tr("Reset Font Size"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+0")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_FONT);
+    TextActionBuilder(this, GOTO_BLOCK_START)
+        .setText(Tr::tr("Go to Block Start"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+[")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_BLOCKS);
+    TextActionBuilder(this, GOTO_BLOCK_END)
+        .setText(Tr::tr("Go to Block End"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+]")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_BLOCKS);
+    TextActionBuilder(this, SELECT_BLOCK_UP)
+        .setText(Tr::tr("Select Block Up"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+U")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_BLOCKS);
+    TextActionBuilder(this, SELECT_BLOCK_DOWN)
+        .setText(Tr::tr("Select Block Down"))
+        .setDefaultKeySequence(QKeySequence(Tr::tr("Ctrl+Shift+Alt+U")))
+        .addToContainer(M_EDIT_ADVANCED, G_EDIT_BLOCKS);
+    TextActionBuilder(this, SELECT_WORD_UNDER_CURSOR).setText(Tr::tr("Select Word Under Cursor"));
+
+    TextActionBuilder(this, GOTO_DOCUMENT_START).setText(Tr::tr("Go to Document Start"));
+    TextActionBuilder(this, GOTO_DOCUMENT_END).setText(Tr::tr("Go to Document End"));
+    TextActionBuilder(this, GOTO_LINE_START).setText(Tr::tr("Go to Line Start"));
+    TextActionBuilder(this, GOTO_LINE_END).setText(Tr::tr("Go to Line End"));
+    TextActionBuilder(this, GOTO_NEXT_LINE).setText(Tr::tr("Go to Next Line"));
+    TextActionBuilder(this, GOTO_PREVIOUS_LINE).setText(Tr::tr("Go to Previous Line"));
+    TextActionBuilder(this, GOTO_PREVIOUS_CHARACTER).setText(Tr::tr("Go to Previous Character"));
+    TextActionBuilder(this, GOTO_NEXT_CHARACTER).setText(Tr::tr("Go to Next Character"));
+    TextActionBuilder(this, GOTO_PREVIOUS_WORD).setText(Tr::tr("Go to Previous Word"));
+    TextActionBuilder(this, GOTO_NEXT_WORD).setText(Tr::tr("Go to Next Word"));
+    TextActionBuilder(this, GOTO_PREVIOUS_WORD_CAMEL_CASE)
+        .setText(Tr::tr("Go to Previous Word (Camel Case)"));
+    TextActionBuilder(this, GOTO_NEXT_WORD_CAMEL_CASE).setText(Tr::tr("Go to Next Word (Camel Case)"));
+
+    TextActionBuilder(this, GOTO_LINE_START_WITH_SELECTION)
+        .setText(Tr::tr("Go to Line Start with Selection"));
+    TextActionBuilder(this, GOTO_LINE_END_WITH_SELECTION)
+        .setText(Tr::tr("Go to Line End with Selection"));
+    TextActionBuilder(this, GOTO_NEXT_LINE_WITH_SELECTION)
+        .setText(Tr::tr("Go to Next Line with Selection"));
+    TextActionBuilder(this, GOTO_PREVIOUS_LINE_WITH_SELECTION)
+        .setText(Tr::tr("Go to Previous Line with Selection"));
+    TextActionBuilder(this, GOTO_PREVIOUS_CHARACTER_WITH_SELECTION)
+        .setText(Tr::tr("Go to Previous Character with Selection"));
+    TextActionBuilder(this, GOTO_NEXT_CHARACTER_WITH_SELECTION)
+        .setText(Tr::tr("Go to Next Character with Selection"));
+    TextActionBuilder(this, GOTO_PREVIOUS_WORD_WITH_SELECTION)
+        .setText(Tr::tr("Go to Previous Word with Selection"));
+    TextActionBuilder(this, GOTO_NEXT_WORD_WITH_SELECTION)
+        .setText(Tr::tr("Go to Next Word with Selection"));
+    TextActionBuilder(this, GOTO_PREVIOUS_WORD_CAMEL_CASE_WITH_SELECTION)
+        .setText(Tr::tr("Go to Previous Word (Camel Case) with Selection"));
+    TextActionBuilder(this, GOTO_NEXT_WORD_CAMEL_CASE_WITH_SELECTION)
+        .setText(Tr::tr("Go to Next Word (Camel Case) with Selection"));
+}
+
 } // namespace TextEditor::Internal
 
 #include "texteditorplugin.moc"
diff --git a/src/plugins/texteditor/textmark.cpp b/src/plugins/texteditor/textmark.cpp
index 1739cf61b9e..459d0ca27c1 100644
--- a/src/plugins/texteditor/textmark.cpp
+++ b/src/plugins/texteditor/textmark.cpp
@@ -371,7 +371,7 @@ bool TextMark::addToolTipContent(QLayout *target) const
 QColor TextMark::annotationColor() const
 {
     if (m_color.has_value())
-        return Utils::creatorTheme()->color(*m_color).toHsl();
+        return Utils::creatorColor(*m_color).toHsl();
     return {};
 }
 
diff --git a/src/plugins/texteditor/typehierarchy.cpp b/src/plugins/texteditor/typehierarchy.cpp
new file mode 100644
index 00000000000..53924a2b9d6
--- /dev/null
+++ b/src/plugins/texteditor/typehierarchy.cpp
@@ -0,0 +1,136 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "typehierarchy.h"
+
+#include "texteditorconstants.h"
+#include "texteditortr.h"
+
+#include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/editormanager/ieditor.h>
+#include <coreplugin/inavigationwidgetfactory.h>
+
+#include <utils/utilsicons.h>
+
+#include <QLabel>
+#include <QPalette>
+#include <QStackedWidget>
+#include <QToolButton>
+
+using namespace Utils;
+
+namespace TextEditor {
+namespace Internal {
+
+static QList<TypeHierarchyWidgetFactory *> g_widgetFactories;
+
+class TypeHierarchyFactory : public Core::INavigationWidgetFactory
+{
+public:
+    TypeHierarchyFactory()
+    {
+        setDisplayName(Tr::tr("Type Hierarchy"));
+        setPriority(649);
+        setId(Constants::TYPE_HIERARCHY_FACTORY_ID);
+    }
+
+private:
+    Core::NavigationView createWidget() override;
+};
+
+class TypeHierarchyWidgetStack : public QStackedWidget
+{
+    Q_OBJECT
+
+public:
+    TypeHierarchyWidgetStack();
+
+    void reload();
+};
+
+static TypeHierarchyFactory &typeHierarchyFactory()
+{
+    static TypeHierarchyFactory theFactory;
+    return theFactory;
+}
+
+void setupTypeHierarchyFactory()
+{
+    (void) typeHierarchyFactory();
+}
+
+TypeHierarchyWidgetStack::TypeHierarchyWidgetStack()
+{
+    QLabel *label = new QLabel(Tr::tr("No type hierarchy available"), this);
+    label->setAlignment(Qt::AlignCenter);
+
+    label->setAutoFillBackground(true);
+    label->setBackgroundRole(QPalette::Base);
+
+    addWidget(label);
+    reload();
+}
+
+void TypeHierarchyWidgetStack::reload()
+{
+    const auto editor = Core::EditorManager::currentEditor();
+    TypeHierarchyWidget *newWidget = nullptr;
+
+    if (editor) {
+        for (TypeHierarchyWidgetFactory * const widgetFactory : std::as_const(g_widgetFactories)) {
+            if ((newWidget = widgetFactory->createWidget(editor)))
+                break;
+        }
+    }
+
+    QWidget * const current = currentWidget();
+    if (current) {
+        removeWidget(current);
+        current->deleteLater();
+    }
+    if (newWidget) {
+        addWidget(newWidget);
+        setCurrentWidget(newWidget);
+        setFocusProxy(newWidget);
+        newWidget->reload();
+    }
+}
+
+Core::NavigationView TypeHierarchyFactory::createWidget()
+{
+    const auto placeholder = new TypeHierarchyWidgetStack;
+    const auto reloadButton = new QToolButton;
+    reloadButton->setIcon(Icons::RELOAD_TOOLBAR.icon());
+    reloadButton->setToolTip(Tr::tr("Reloads the type hierarchy for the symbol under the cursor."));
+    connect(reloadButton, &QToolButton::clicked, placeholder, &TypeHierarchyWidgetStack::reload);
+    return {placeholder, {reloadButton}};
+}
+
+void updateTypeHierarchy(QWidget *widget)
+{
+    if (const auto w = qobject_cast<TypeHierarchyWidgetStack *>(widget))
+        w->reload();
+}
+
+} // namespace Internal
+
+TypeHierarchyWidgetFactory::TypeHierarchyWidgetFactory()
+{
+    Internal::g_widgetFactories.append(this);
+}
+
+TypeHierarchyWidgetFactory::~TypeHierarchyWidgetFactory()
+{
+    Internal::g_widgetFactories.removeOne(this);
+}
+
+void openTypeHierarchy()
+{
+    if (const auto action = Core::ActionManager::command(Constants::OPEN_TYPE_HIERARCHY)->action())
+        action->trigger();
+}
+
+} // namespace TextEditor
+
+#include <typehierarchy.moc>
diff --git a/src/plugins/texteditor/typehierarchy.h b/src/plugins/texteditor/typehierarchy.h
new file mode 100644
index 00000000000..ee7c1fa1a7b
--- /dev/null
+++ b/src/plugins/texteditor/typehierarchy.h
@@ -0,0 +1,39 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <texteditor/texteditor_global.h>
+
+#include <QWidget>
+
+namespace Core { class IEditor; }
+
+namespace TextEditor {
+namespace Internal {
+void setupTypeHierarchyFactory();
+void updateTypeHierarchy(QWidget *widget);
+}
+
+class TEXTEDITOR_EXPORT TypeHierarchyWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    virtual void reload() = 0;
+};
+
+class TEXTEDITOR_EXPORT TypeHierarchyWidgetFactory : public QObject
+{
+    Q_OBJECT
+
+public:
+    virtual TypeHierarchyWidget *createWidget(Core::IEditor *editor) = 0;
+
+protected:
+    TypeHierarchyWidgetFactory();
+    ~TypeHierarchyWidgetFactory() override;
+};
+
+TEXTEDITOR_EXPORT void openTypeHierarchy();
+
+} // namespace TextEditor
diff --git a/src/plugins/todo/Todo.json.in b/src/plugins/todo/Todo.json.in
index 2b6227492e8..7974af12893 100644
--- a/src/plugins/todo/Todo.json.in
+++ b/src/plugins/todo/Todo.json.in
@@ -13,7 +13,10 @@
                   "",
                   "Alternatively, this plugin 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 plugin. 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."
     ],
-    "Description" : "Adds pane that lists all TODO, FIXME, etc. entries in comments.",
-    "Url" : "http://www.qt.io",
+    "Description" : "List keywords from files.",
+    "LongDescription" : [
+        "List the BUG, FIXME, NOTE, TODO, and WARNING keywords from the current file, from all project files, or from a subproject."
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/todo/keyword.cpp b/src/plugins/todo/keyword.cpp
index 8a505b1239b..a178bb92e1d 100644
--- a/src/plugins/todo/keyword.cpp
+++ b/src/plugins/todo/keyword.cpp
@@ -8,7 +8,7 @@
 namespace Todo {
 namespace Internal {
 
-Keyword::Keyword() : color(Utils::creatorTheme()->color(Utils::Theme::TextColorNormal))
+Keyword::Keyword() : color(Utils::creatorColor(Utils::Theme::TextColorNormal))
 {
 }
 
diff --git a/src/plugins/todo/settings.cpp b/src/plugins/todo/settings.cpp
index 68f6a3d7092..dc534f98c88 100644
--- a/src/plugins/todo/settings.cpp
+++ b/src/plugins/todo/settings.cpp
@@ -99,7 +99,6 @@ void Settings::load()
 void Settings::setDefault()
 {
     scanningScope = ScanningScopeCurrentFile;
-    Utils::Theme *theme = Utils::creatorTheme();
 
     keywords.clear();
 
@@ -107,32 +106,32 @@ void Settings::setDefault()
 
     keyword.name = "TODO";
     keyword.iconType = IconType::Todo;
-    keyword.color = theme->color(Utils::Theme::OutputPanes_NormalMessageTextColor);
+    keyword.color = creatorColor(Utils::Theme::OutputPanes_NormalMessageTextColor);
     keywords.append(keyword);
 
     keyword.name = R"(\todo)";
     keyword.iconType = IconType::Todo;
-    keyword.color = theme->color(Utils::Theme::OutputPanes_NormalMessageTextColor);
+    keyword.color = creatorColor(Utils::Theme::OutputPanes_NormalMessageTextColor);
     keywords.append(keyword);
 
     keyword.name = "NOTE";
     keyword.iconType = IconType::Info;
-    keyword.color = theme->color(Utils::Theme::OutputPanes_NormalMessageTextColor);
+    keyword.color = creatorColor(Utils::Theme::OutputPanes_NormalMessageTextColor);
     keywords.append(keyword);
 
     keyword.name = "FIXME";
     keyword.iconType = IconType::Error;
-    keyword.color = theme->color(Utils::Theme::OutputPanes_ErrorMessageTextColor);
+    keyword.color = creatorColor(Utils::Theme::OutputPanes_ErrorMessageTextColor);
     keywords.append(keyword);
 
     keyword.name = "BUG";
     keyword.iconType = IconType::Bug;
-    keyword.color = theme->color(Utils::Theme::OutputPanes_ErrorMessageTextColor);
+    keyword.color = creatorColor(Utils::Theme::OutputPanes_ErrorMessageTextColor);
     keywords.append(keyword);
 
     keyword.name = "WARNING";
     keyword.iconType = IconType::Warning;
-    keyword.color = theme->color(Utils::Theme::OutputPanes_WarningMessageTextColor);
+    keyword.color = creatorColor(Utils::Theme::OutputPanes_WarningMessageTextColor);
     keywords.append(keyword);
 
     keywordsEdited = false;
@@ -212,7 +211,7 @@ OptionsDialog::OptionsDialog()
             }
         },
         Group {
-            title(Tr::tr("Scanning scope")),
+            title(Tr::tr("Scanning Scope")),
             Column {
                 m_scanInProjectRadioButton,
                 m_scanInCurrentFileRadioButton,
diff --git a/src/plugins/updateinfo/UpdateInfo.json.in b/src/plugins/updateinfo/UpdateInfo.json.in
index b7f15e449ba..33c8ad4d94e 100644
--- a/src/plugins/updateinfo/UpdateInfo.json.in
+++ b/src/plugins/updateinfo/UpdateInfo.json.in
@@ -13,7 +13,8 @@
                   "",
                   "Alternatively, this plugin 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 plugin. 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."
     ],
-    "Description" : "Displays Update-Infos for Qt Installer Framework-based Updaters.",
-    "Url" : "http://www.qt.io",
+    "Description" : "View information from Qt Installer Framework-based updaters.",
+    "LongDescription" : [],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/valgrind/Valgrind.json.in b/src/plugins/valgrind/Valgrind.json.in
index 1f270b12184..6d1dd059bf9 100644
--- a/src/plugins/valgrind/Valgrind.json.in
+++ b/src/plugins/valgrind/Valgrind.json.in
@@ -13,7 +13,12 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Code Analyzer",
-    "Description" : "Valgrind Plugin.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Analyze code with Valgrind's Tool Suite.",
+    "LongDescription" : [
+        "Detect problems in memory management with Memcheck and find cache misses in the code with Callgrind.",
+        "You also need:",
+            "- Valgrind's Tool Suite"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp
index 9cf1d6475d0..57f62a0c4b3 100644
--- a/src/plugins/valgrind/valgrindengine.cpp
+++ b/src/plugins/valgrind/valgrindengine.cpp
@@ -73,7 +73,7 @@ void ValgrindToolRunner::start()
     m_runner.setValgrindCommand(valgrind);
     m_runner.setDebuggee(runControl()->runnable());
 
-    if (auto aspect = runControl()->aspect<TerminalAspect>())
+    if (auto aspect = runControl()->aspectData<TerminalAspect>())
         m_runner.setUseTerminal(aspect->useTerminal);
 
     if (!m_runner.start()) {
diff --git a/src/plugins/valgrind/valgrindmemcheckparsertest.cpp b/src/plugins/valgrind/valgrindmemcheckparsertest.cpp
index 44cac3712c6..90d1f27ca0d 100644
--- a/src/plugins/valgrind/valgrindmemcheckparsertest.cpp
+++ b/src/plugins/valgrind/valgrindmemcheckparsertest.cpp
@@ -187,9 +187,9 @@ void ValgrindMemcheckParserTest::initTest(const QString &testfile, const QString
     QVERIFY2(fileInfo.isExecutable(), qPrintable(fakeValgrind));
     QVERIFY2(!fileInfo.isDir(), qPrintable(fakeValgrind));
 
-    const QStringList args = {QString("--xml-socket=127.0.0.1:%1").arg(m_server->serverPort()),
-                              "-i", testfile};
-    m_process->setCommand({FilePath::fromString(fakeValgrind), args + otherArgs});
+    m_process->setCommand({FilePath::fromString(fakeValgrind),
+                           {QString("--xml-socket=127.0.0.1:%1").arg(m_server->serverPort()),
+                            "-i", testfile, otherArgs}});
     m_process->start();
 
     using namespace std::chrono_literals;
@@ -545,7 +545,7 @@ void ValgrindMemcheckParserTest::testRealValgrind()
     debuggee.command.setExecutable(FilePath::fromString(executable));
     debuggee.environment = sysEnv;
     ValgrindProcess runner;
-    runner.setValgrindCommand({"valgrind", {}});
+    runner.setValgrindCommand(CommandLine{"valgrind"});
     runner.setDebuggee(debuggee);
     RunnerDumper dumper(&runner);
     runner.runBlocking();
diff --git a/src/plugins/valgrind/valgrindsettings.cpp b/src/plugins/valgrind/valgrindsettings.cpp
index b520f328921..0a92f391d3b 100644
--- a/src/plugins/valgrind/valgrindsettings.cpp
+++ b/src/plugins/valgrind/valgrindsettings.cpp
@@ -116,7 +116,7 @@ SuppressionAspect::~SuppressionAspect()
     delete d;
 }
 
-void SuppressionAspect::addToLayout(Layouting::LayoutItem &parent)
+void SuppressionAspect::addToLayout(Layouting::Layout &parent)
 {
     QTC_CHECK(!d->addEntry);
     QTC_CHECK(!d->removeEntry);
@@ -392,19 +392,8 @@ ValgrindSettings::ValgrindSettings(bool global)
         // clang-format on
     });
 
-    if (global) {
+    if (global)
         readSettings();
-    } else {
-        // FIXME: Is this needed?
-        connect(this, &AspectContainer::fromMapFinished, [this] {
-            // FIXME: Update project page e.g. on "Restore Global", aspects
-            // there are 'autoapply', and Aspect::cancel() is normally part of
-            // the 'manual apply' machinery.
-            setAutoApply(false);
-            cancel();
-            setAutoApply(true);
-        });
-    }
 }
 
 ValgrindSettings &globalSettings()
diff --git a/src/plugins/valgrind/valgrindsettings.h b/src/plugins/valgrind/valgrindsettings.h
index 93866bae862..43a2b94592b 100644
--- a/src/plugins/valgrind/valgrindsettings.h
+++ b/src/plugins/valgrind/valgrindsettings.h
@@ -20,7 +20,7 @@ public:
     SuppressionAspect(Utils::AspectContainer *container, bool global);
     ~SuppressionAspect() final;
 
-    void addToLayout(Layouting::LayoutItem &parent) final;
+    void addToLayout(Layouting::Layout &parent) final;
 
     void fromMap(const Utils::Store &map) final;
     void toMap(Utils::Store &map) const final;
diff --git a/src/plugins/valgrind/valgrindtestrunnertest.cpp b/src/plugins/valgrind/valgrindtestrunnertest.cpp
index 7d53efca33d..863265f8d04 100644
--- a/src/plugins/valgrind/valgrindtestrunnertest.cpp
+++ b/src/plugins/valgrind/valgrindtestrunnertest.cpp
@@ -93,11 +93,8 @@ QString ValgrindTestRunnerTest::runTestBinary(const QString &binary, const QStri
     debuggee.command.setExecutable(Utils::FilePath::fromString(binPath));
     debuggee.environment = Utils::Environment::systemEnvironment();
 
-    CommandLine valgrind{"valgrind", {"--num-callers=50", "--track-origins=yes"}};
-    valgrind.addArgs(vArgs);
-
     m_runner->setLocalServerAddress(QHostAddress::LocalHost);
-    m_runner->setValgrindCommand(valgrind);
+    m_runner->setValgrindCommand({"valgrind", {"--num-callers=50", "--track-origins=yes", vArgs}});
     m_runner->setDebuggee(debuggee);
     m_runner->runBlocking();
     return binPath;
diff --git a/src/plugins/valgrind/xmlprotocol/parser.cpp b/src/plugins/valgrind/xmlprotocol/parser.cpp
index 2bab91fa710..550a021a87c 100644
--- a/src/plugins/valgrind/xmlprotocol/parser.cpp
+++ b/src/plugins/valgrind/xmlprotocol/parser.cpp
@@ -10,8 +10,6 @@
 #include "suppression.h"
 #include "../valgrindtr.h"
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/async.h>
 #include <utils/expected.h>
 #include <utils/futuresynchronizer.h>
@@ -684,7 +682,7 @@ public:
         if (!m_watcher)
             return;
         m_thread->cancel();
-        ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(m_watcher->future());
+        Utils::futureSynchronizer()->addFuture(m_watcher->future());
     }
 
     void start()
diff --git a/src/plugins/vcpkg/Vcpkg.json.in b/src/plugins/vcpkg/Vcpkg.json.in
index 09fcaf06a70..9efd5bf023e 100644
--- a/src/plugins/vcpkg/Vcpkg.json.in
+++ b/src/plugins/vcpkg/Vcpkg.json.in
@@ -14,8 +14,9 @@
     ],
     "Experimental" : true,
     "SoftLoadable" : true,
-    "Description" : "vcpkg integration.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Get and manage libraries from the vcpkg package manager.",
+    "LongDescription" : [],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES},
 
     "Mimetypes" : [
@@ -27,5 +28,6 @@
         "        <glob pattern='vcpkg.json' weight='71'/>",
         "    </mime-type>",
         "</mime-info>"
-    ]
+    ],
+    "JsonWizardPaths" : [":/vcpkg/wizards/"]
 }
diff --git a/src/plugins/vcpkg/vcpkgplugin.cpp b/src/plugins/vcpkg/vcpkgplugin.cpp
index cc3abc097da..a8498026536 100644
--- a/src/plugins/vcpkg/vcpkgplugin.cpp
+++ b/src/plugins/vcpkg/vcpkgplugin.cpp
@@ -21,8 +21,6 @@ class VcpkgPlugin final : public ExtensionSystem::IPlugin
 public:
     void initialize() final
     {
-        ProjectExplorer::JsonWizardFactory::addWizardPath(":/vcpkg/wizards/");
-
         setupVcpkgManifestEditor();
 
 #ifdef WITH_TESTS
diff --git a/src/plugins/vcsbase/VcsBase.json.in b/src/plugins/vcsbase/VcsBase.json.in
index 87e343ff45f..d764c2f3ab7 100644
--- a/src/plugins/vcsbase/VcsBase.json.in
+++ b/src/plugins/vcsbase/VcsBase.json.in
@@ -13,7 +13,11 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Version Control",
-    "Description" : "Version Control System Base Plugin.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Provides the technical basis for version control system (VCS) extensions.",
+    "LongDescription" : [
+        "You also need:",
+            "- An extension for a VCS tool, such as Git, and the tool"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/vcsbase/baseannotationhighlighter.cpp b/src/plugins/vcsbase/baseannotationhighlighter.cpp
index e3dce5ba266..0809d2c5237 100644
--- a/src/plugins/vcsbase/baseannotationhighlighter.cpp
+++ b/src/plugins/vcsbase/baseannotationhighlighter.cpp
@@ -4,6 +4,7 @@
 #include "baseannotationhighlighter.h"
 
 #include <texteditor/fontsettings.h>
+#include <texteditor/syntaxhighlighter.h>
 #include <texteditor/texteditorsettings.h>
 
 #include <utils/algorithm.h>
@@ -163,7 +164,7 @@ void BaseAnnotationHighlighter::rehighlight()
         return;
 
     setChangeNumbers(changes);
-    TextEditor::SyntaxHighlighter::rehighlight();
+    SyntaxHighlighter::rehighlight();
 }
 
 } // namespace VcsBase
diff --git a/src/plugins/vcsbase/commonvcssettings.cpp b/src/plugins/vcsbase/commonvcssettings.cpp
index 6c6db16c3ef..9bc924c1d4c 100644
--- a/src/plugins/vcsbase/commonvcssettings.cpp
+++ b/src/plugins/vcsbase/commonvcssettings.cpp
@@ -92,9 +92,9 @@ CommonVcsSettings::CommonVcsSettings()
                 empty,
                 PushButton {
                     text(Tr::tr("Reset VCS Cache")),
-                    tooltip(Tr::tr("Reset information about which "
-                                   "version control system handles which directory.")),
-                    onClicked(&VcsManager::clearVersionControlCache)
+                    Layouting::toolTip(Tr::tr("Reset information about which "
+                                              "version control system handles which directory.")),
+                    onClicked(&VcsManager::clearVersionControlCache, this)
                 }
             }
         };
diff --git a/src/plugins/vcsbase/submiteditorwidget.cpp b/src/plugins/vcsbase/submiteditorwidget.cpp
index b8f3d2a151d..73d83586568 100644
--- a/src/plugins/vcsbase/submiteditorwidget.cpp
+++ b/src/plugins/vcsbase/submiteditorwidget.cpp
@@ -585,8 +585,7 @@ void SubmitEditorWidget::verifyDescription()
     }
 
     auto fontColor = [](Utils::Theme::Color color) {
-        return QString("<font color=\"%1\">")
-                .arg(Utils::creatorTheme()->color(color).name());
+        return QString("<font color=\"%1\">").arg(Utils::creatorColor(color).name());
     };
     const QString hint = fontColor(Utils::Theme::OutputPanes_TestWarnTextColor);
     const QString warning = fontColor(Utils::Theme::TextColorError);
diff --git a/src/plugins/vcsbase/submitfilemodel.cpp b/src/plugins/vcsbase/submitfilemodel.cpp
index 02a9b6e359e..a07538076da 100644
--- a/src/plugins/vcsbase/submitfilemodel.cpp
+++ b/src/plugins/vcsbase/submitfilemodel.cpp
@@ -45,7 +45,7 @@ static QBrush fileStatusTextForeground(SubmitFileModel::FileStatusHint statusHin
         statusTextColor = Theme::VcsBase_FileUnmerged_TextColor;
         break;
     }
-    return QBrush(Utils::creatorTheme()->color(statusTextColor));
+    return QBrush(Utils::creatorColor(statusTextColor));
 }
 
 static QList<QStandardItem *> createFileRow(const FilePath &repositoryRoot,
diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp
index 6a36d628bd9..1ce9e6d5a86 100644
--- a/src/plugins/vcsbase/vcsbaseclient.cpp
+++ b/src/plugins/vcsbase/vcsbaseclient.cpp
@@ -125,7 +125,7 @@ QStringList VcsBaseClientImpl::splitLines(const QString &s)
 QString VcsBaseClientImpl::stripLastNewline(const QString &in)
 {
     if (in.endsWith('\n'))
-        return in.left(in.count() - 1);
+        return in.left(in.size() - 1);
     return in;
 }
 
diff --git a/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp b/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp
index 4ba6baba34e..8ab4a7946ff 100644
--- a/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp
+++ b/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp
@@ -3,11 +3,8 @@
 
 #include "vcsbasediffeditorcontroller.h"
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/async.h>
 #include <utils/environment.h>
-#include <utils/futuresynchronizer.h>
 #include <utils/qtcprocess.h>
 
 using namespace DiffEditor;
@@ -41,7 +38,6 @@ VcsBaseDiffEditorController::~VcsBaseDiffEditorController()
 GroupItem VcsBaseDiffEditorController::postProcessTask(const Storage<QString> &inputStorage)
 {
     const auto onSetup = [inputStorage](Async<QList<FileData>> &async) {
-        async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer());
         async.setConcurrentCallData(&DiffUtils::readPatchWithPromise, *inputStorage);
     };
     const auto onDone = [this](const Async<QList<FileData>> &async, DoneWith result) {
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index 38bb004a2d6..7efdd7d20f5 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -27,10 +27,9 @@
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectmanager.h>
 
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/textdocumentlayout.h>
-#include <texteditor/syntaxhighlighterrunner.h>
+#include <texteditor/syntaxhighlighter.h>
 
 #include <utils/algorithm.h>
 #include <utils/progressindicator.h>
@@ -436,7 +435,7 @@ bool UrlTextCursorHandler::findContentsUnderCursor(const QTextCursor &cursor)
 
 void UrlTextCursorHandler::highlightCurrentContents()
 {
-    const QColor linkColor = creatorTheme()->color(Theme::TextColorLink);
+    const QColor linkColor = creatorColor(Theme::TextColorLink);
     QTextEdit::ExtraSelection sel;
     sel.cursor = currentCursor();
     sel.cursor.setPosition(currentCursor().position()
@@ -821,7 +820,7 @@ void VcsBaseEditorWidget::setFileLogAnnotateEnabled(bool e)
 
 void VcsBaseEditorWidget::setHighlightingEnabled(bool e)
 {
-    textDocument()->syntaxHighlighterRunner()->setEnabled(e);
+    textDocument()->syntaxHighlighter()->setEnabled(e);
 }
 
 FilePath VcsBaseEditorWidget::workingDirectory() const
@@ -1102,7 +1101,7 @@ void VcsBaseEditorWidget::slotActivateAnnotation()
 
     disconnect(this, &QPlainTextEdit::textChanged, this, &VcsBaseEditorWidget::slotActivateAnnotation);
 
-    if (SyntaxHighlighterRunner *ah = textDocument()->syntaxHighlighterRunner()) {
+    if (SyntaxHighlighter *ah = textDocument()->syntaxHighlighter()) {
         ah->rehighlight();
     } else {
         BaseAnnotationHighlighterCreator creator = annotationHighlighterCreator();
@@ -1639,7 +1638,7 @@ IEditor *VcsBaseEditor::locateEditorByTag(const QString &tag)
     const QList<IDocument *> documents = DocumentModel::openedDocuments();
     for (IDocument *document : documents) {
         const QVariant tagPropertyValue = document->property(tagPropertyC);
-        if (tagPropertyValue.type() == QVariant::String && tagPropertyValue.toString() == tag)
+        if (tagPropertyValue.typeId() == QMetaType::QString && tagPropertyValue.toString() == tag)
             return DocumentModel::editorsForDocument(document).constFirst();
     }
     return nullptr;
@@ -1661,7 +1660,7 @@ VcsEditorFactory::VcsEditorFactory(const VcsBaseEditorParameters &parameters)
     if (parameters.mimeType != DiffEditor::Constants::DIFF_EDITOR_MIMETYPE)
         addMimeType(parameters.mimeType);
 
-    setEditorActionHandlers(TextEditorActionHandler::None);
+    setOptionalActionMask(OptionalActions::None);
     setDuplicatedSupported(false);
 
     setDocumentCreator([parameters] {
diff --git a/src/plugins/vcsbase/vcsbaseeditorconfig.cpp b/src/plugins/vcsbase/vcsbaseeditorconfig.cpp
index fdf8542ab32..d629c0f88c2 100644
--- a/src/plugins/vcsbase/vcsbaseeditorconfig.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditorconfig.cpp
@@ -267,13 +267,6 @@ void VcsBaseEditorConfig::executeCommand()
     emit commandExecutionRequested();
 }
 
-VcsBaseEditorConfig::OptionMapping::OptionMapping(const QString &option, QObject *obj) :
-    object(obj)
-{
-    if (!option.isEmpty())
-        options << option;
-}
-
 VcsBaseEditorConfig::OptionMapping::OptionMapping(const QStringList &optionList, QObject *obj) :
     options(optionList),
     object(obj)
diff --git a/src/plugins/vcsbase/vcsbaseeditorconfig.h b/src/plugins/vcsbase/vcsbaseeditorconfig.h
index 5a0878b05b5..3879b002ac1 100644
--- a/src/plugins/vcsbase/vcsbaseeditorconfig.h
+++ b/src/plugins/vcsbase/vcsbaseeditorconfig.h
@@ -78,7 +78,6 @@ protected:
     {
     public:
         OptionMapping() = default;
-        OptionMapping(const QString &option, QObject *obj);
         OptionMapping(const QStringList &optionList, QObject *obj);
         QStringList options;
         QObject *object = nullptr;
diff --git a/src/plugins/vcsbase/vcsoutputwindow.cpp b/src/plugins/vcsbase/vcsoutputwindow.cpp
index 747b409b5d1..3ada77fb200 100644
--- a/src/plugins/vcsbase/vcsoutputwindow.cpp
+++ b/src/plugins/vcsbase/vcsoutputwindow.cpp
@@ -79,7 +79,7 @@ public:
                      const FilePath &repository);
 
 protected:
-    void contextMenuEvent(QContextMenuEvent *event) override;
+    void adaptContextMenu(QMenu *menu, const QPoint &pos) override;
     void handleLink(const QPoint &pos) override;
 
 private:
@@ -138,15 +138,15 @@ QString OutputWindowPlainTextEdit::identifierUnderCursor(const QPoint &widgetPos
     return endPos > startPos ? block.mid(startPos, endPos - startPos) : QString();
 }
 
-void OutputWindowPlainTextEdit::contextMenuEvent(QContextMenuEvent *event)
+void OutputWindowPlainTextEdit::adaptContextMenu(QMenu *menu, const QPoint &pos)
 {
-    const QString href = anchorAt(event->pos());
-    QMenu *menu = href.isEmpty() ? createStandardContextMenu(event->pos()) : new QMenu;
-    menu->setAttribute(Qt::WA_DeleteOnClose);
+    const QString href = anchorAt(pos);
+    if (!href.isEmpty())
+        menu->clear();
 
     // Add 'open file'
     FilePath repo;
-    const QString token = identifierUnderCursor(event->pos(), &repo);
+    const QString token = identifierUnderCursor(pos, &repo);
     if (!repo.isEmpty() && !href.isEmpty())
         m_parser->fillLinkContextMenu(menu, repo, href);
     QAction *openAction = nullptr;
@@ -157,26 +157,9 @@ void OutputWindowPlainTextEdit::contextMenuEvent(QContextMenuEvent *event)
         if (repo.isFile())  {
             menu->addSeparator();
             openAction = menu->addAction(Tr::tr("Open \"%1\"").arg(repo.nativePath()));
-            openAction->setData(repo.absoluteFilePath().toVariant());
-        }
-    }
-    QAction *clearAction = nullptr;
-    if (href.isEmpty()) {
-        // Add 'clear'
-        menu->addSeparator();
-        clearAction = menu->addAction(Tr::tr("Clear"));
-    }
-
-    // Run
-    QAction *action = menu->exec(event->globalPos());
-    if (action) {
-        if (action == clearAction) {
-            clear();
-            return;
-        }
-        if (action == openAction) {
-            const auto fileName = FilePath::fromVariant(action->data());
-            EditorManager::openEditor(fileName);
+            connect(openAction, &QAction::triggered, this, [fp = repo.absoluteFilePath()] {
+                EditorManager::openEditor(fp);
+            });
         }
     }
 }
diff --git a/src/plugins/vcsbase/wizard/vcscommandpage.cpp b/src/plugins/vcsbase/wizard/vcscommandpage.cpp
index c24cdfce0eb..caabb20cf29 100644
--- a/src/plugins/vcsbase/wizard/vcscommandpage.cpp
+++ b/src/plugins/vcsbase/wizard/vcscommandpage.cpp
@@ -72,9 +72,9 @@ WizardPage *VcsCommandPageFactory::create(JsonWizard *wizard, Id typeId, const Q
     QStringList args;
     const QVariant argsVar = tmp.value(QLatin1String(VCSCOMMAND_EXTRA_ARGS));
     if (!argsVar.isNull()) {
-        if (argsVar.type() == QVariant::String) {
+        if (argsVar.typeId() == QMetaType::QString) {
             args << argsVar.toString();
-        } else if (argsVar.type() == QVariant::List) {
+        } else if (argsVar.typeId() == QMetaType::QVariantList) {
             args = Utils::transform(argsVar.toList(), &QVariant::toString);
         } else {
             return nullptr;
@@ -101,7 +101,7 @@ WizardPage *VcsCommandPageFactory::create(JsonWizard *wizard, Id typeId, const Q
         const QVariant &jobArgVar = job.value(QLatin1String(JOB_ARGUMENTS));
         QStringList jobArgs;
         if (!jobArgVar.isNull()) {
-            if (jobArgVar.type() == QVariant::List)
+            if (jobArgVar.typeId() == QMetaType::QVariantList)
                 jobArgs = Utils::transform(jobArgVar.toList(), &QVariant::toString);
             else
                 jobArgs << jobArgVar.toString();
@@ -127,7 +127,7 @@ bool VcsCommandPageFactory::validateData(Id typeId, const QVariant &data, QStrin
     QTC_ASSERT(canCreate(typeId), return false);
 
     QString em;
-    if (data.type() != QVariant::Map)
+    if (data.typeId() != QMetaType::QVariantMap)
         em = Tr::tr("\"data\" is no JSON object in \"VcsCommand\" page.");
 
     if (em.isEmpty()) {
@@ -161,13 +161,13 @@ bool VcsCommandPageFactory::validateData(Id typeId, const QVariant &data, QStrin
         }
 
         const QVariant extra = tmp.value(QLatin1String(VCSCOMMAND_EXTRA_ARGS));
-        if (!extra.isNull() && extra.type() != QVariant::String && extra.type() != QVariant::List) {
+        if (!extra.isNull() && extra.typeId() != QMetaType::QString && extra.typeId() != QMetaType::QVariantList) {
             em = Tr::tr("\"%1\" in \"data\" section of \"VcsCommand\" page has unexpected type (unset, String or List).")
                     .arg(QLatin1String(VCSCOMMAND_EXTRA_ARGS));
         }
 
         const QVariant jobs = tmp.value(QLatin1String(VCSCOMMAND_JOBS));
-        if (!jobs.isNull() && extra.type() != QVariant::List) {
+        if (!jobs.isNull() && extra.typeId() != QMetaType::QVariantList) {
             em = Tr::tr("\"%1\" in \"data\" section of \"VcsCommand\" page has unexpected type (unset or List).")
                     .arg(QLatin1String(VCSCOMMAND_JOBS));
         }
@@ -178,7 +178,7 @@ bool VcsCommandPageFactory::validateData(Id typeId, const QVariant &data, QStrin
                 em = Tr::tr("Job in \"VcsCommand\" page is empty.");
                 break;
             }
-            if (j.type() != QVariant::Map) {
+            if (j.typeId() != QMetaType::QVariantMap) {
                 em = Tr::tr("Job in \"VcsCommand\" page is not an object.");
                 break;
             }
@@ -383,11 +383,11 @@ void VcsCommandPage::finished(bool success)
     if (success) {
         m_state = Succeeded;
         message = Tr::tr("Succeeded.");
-        palette.setColor(QPalette::WindowText, creatorTheme()->color(Theme::TextColorNormal).name());
+        palette.setColor(QPalette::WindowText, creatorColor(Theme::TextColorNormal).name());
     } else {
         m_state = Failed;
         message = Tr::tr("Failed.");
-        palette.setColor(QPalette::WindowText, creatorTheme()->color(Theme::TextColorError).name());
+        palette.setColor(QPalette::WindowText, creatorColor(Theme::TextColorError).name());
     }
 
     m_statusLabel->setText(message);
diff --git a/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp b/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp
index 2de42975635..0a591be6959 100644
--- a/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp
+++ b/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp
@@ -56,7 +56,7 @@ bool VcsConfigurationPageFactory::validateData(Id typeId, const QVariant &data,
 {
     QTC_ASSERT(canCreate(typeId), return false);
 
-    if (data.isNull() || data.type() != QVariant::Map) {
+    if (data.isNull() || data.typeId() != QMetaType::QVariantMap) {
         //: Do not translate "VcsConfiguration", because it is the id of a page.
         *errorMessage = ProjectExplorer::Tr::tr("\"data\" must be a JSON object for \"VcsConfiguration\" pages.");
         return false;
diff --git a/src/plugins/webassembly/WebAssembly.json.in b/src/plugins/webassembly/WebAssembly.json.in
index f860568cee9..d72f8512e7a 100644
--- a/src/plugins/webassembly/WebAssembly.json.in
+++ b/src/plugins/webassembly/WebAssembly.json.in
@@ -15,7 +15,12 @@
                   "Alternatively, this plugin 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 plugin. 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."
     ],
     "Category" : "Device Support",
-    "Description" : "Helper for WebAssembly projects.",
-    "Url" : "http://www.qt.io",
+    "Description" : "Integrate Qt applications into web browsers.",
+    "LongDescription" : [
+        "WebAssembly is a binary format that allows sand-boxed executable code in web pages.",
+        "You also need:",
+            "- Qt for WebAssembly"
+    ],
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/webassembly/webassemblyrunconfiguration.cpp b/src/plugins/webassembly/webassemblyrunconfiguration.cpp
index 25ca3740343..697808e70ea 100644
--- a/src/plugins/webassembly/webassemblyrunconfiguration.cpp
+++ b/src/plugins/webassembly/webassemblyrunconfiguration.cpp
@@ -131,7 +131,7 @@ public:
         addDataExtractor(this, &WebBrowserSelectionAspect::currentBrowser, &Data::currentBrowser);
     }
 
-    void addToLayout(Layouting::LayoutItem &parent) override
+    void addToLayout(Layouting::Layout &parent) override
     {
         QTC_CHECK(!m_webBrowserComboBox);
         m_webBrowserComboBox = new QComboBox;
@@ -210,7 +210,7 @@ public:
 
         setStartModifier([this, runControl, portsGatherer] {
             const QString browserId =
-                    runControl->aspect<WebBrowserSelectionAspect>()->currentBrowser;
+                    runControl->aspectData<WebBrowserSelectionAspect>()->currentBrowser;
             setCommandLine(emrunCommand(runControl->target(),
                                         runControl->buildKey(),
                                         browserId,
diff --git a/src/plugins/webassembly/webassemblysettings.cpp b/src/plugins/webassembly/webassemblysettings.cpp
index d09919a05bb..74e4f65b842 100644
--- a/src/plugins/webassembly/webassemblysettings.cpp
+++ b/src/plugins/webassembly/webassemblysettings.cpp
@@ -21,6 +21,7 @@
 #include <utils/pathchooser.h>
 #include <utils/utilsicons.h>
 
+#include <QGroupBox>
 #include <QTextBrowser>
 #include <QTimer>
 
diff --git a/src/plugins/welcome/Welcome.json.in b/src/plugins/welcome/Welcome.json.in
index 40f7e1ee3ff..4dc8529e662 100644
--- a/src/plugins/welcome/Welcome.json.in
+++ b/src/plugins/welcome/Welcome.json.in
@@ -20,6 +20,6 @@
             "Description" : "Do not ask for taking a UI tour on startup"
         }
     ],
-    "Url" : "http://www.qt.io",
+    "Url" : "https://www.qt.io",
     ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/plugins/welcome/images/mode_welcome_mask.png b/src/plugins/welcome/images/mode_welcome_mask.png
index 696af0c5499..bd53ad1ae29 100644
Binary files a/src/plugins/welcome/images/mode_welcome_mask.png and b/src/plugins/welcome/images/mode_welcome_mask.png differ
diff --git a/src/plugins/welcome/images/mode_welcome_mask@2x.png b/src/plugins/welcome/images/mode_welcome_mask@2x.png
index 060ada0cf54..09810189365 100644
Binary files a/src/plugins/welcome/images/mode_welcome_mask@2x.png and b/src/plugins/welcome/images/mode_welcome_mask@2x.png differ
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index 069fe1e2630..432ce59cb96 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -162,10 +162,10 @@ public:
                 welcomeLabel,
                 st,
                 spacing(ExVPaddingGapXl),
-                customMargin({HPaddingM, VPaddingM, HPaddingM, VPaddingM}),
+                customMargins(HPaddingM, VPaddingM, HPaddingM, VPaddingM),
             },
             createRule(Qt::Horizontal),
-            noMargin(), spacing(0),
+            noMargin, spacing(0),
         }.attachTo(this);
     }
 };
@@ -188,13 +188,13 @@ public:
 
         Column mainColumn {
             spacing(0),
-            customMargin({ExVPaddingGapXl, 0, ExVPaddingGapXl, 0}),
+            customMargins(ExVPaddingGapXl, 0, ExVPaddingGapXl, 0),
         };
 
         m_essentials = new QWidget;
         Column essentials {
             spacing(0),
-            noMargin(),
+            noMargin,
         };
 
         {
@@ -205,7 +205,7 @@ public:
                 newButton,
                 openButton,
                 spacing(ExPaddingGapL),
-                customMargin({0, ExVPaddingGapXl, 0, ExVPaddingGapXl}),
+                customMargins(0, ExVPaddingGapXl, 0, ExVPaddingGapXl),
             };
 
             essentials.addItem(projectButtons);
@@ -232,13 +232,13 @@ public:
         mainColumn.addItem(st);
 
         {
-            auto label = new Label(Tr::tr("Explore more"), Label::Secondary);
+            auto label = new Core::Label(Tr::tr("Explore more"), Core::Label::Secondary);
             label->setContentsMargins(HPaddingXxs, 0, 0, 0); // Is indented in Figma design
 
             Column linksLayout {
                 label,
                 spacing(VGapS),
-                customMargin({0, VGapL, 0, ExVPaddingGapXl}),
+                customMargins(0, VGapL, 0, ExVPaddingGapXl),
             };
 
             const struct {
@@ -275,7 +275,7 @@ public:
         Row {
             mainColumn,
             createRule(Qt::Vertical),
-            noMargin(), spacing(0),
+            noMargin, spacing(0),
         }.attachTo(mainWidget);
 
         setWidget(mainWidget);
@@ -342,7 +342,7 @@ WelcomeMode::WelcomeMode()
             m_sideArea,
             m_pageStack,
         },
-        noMargin(),
+        noMargin,
         spacing(0),
     }.attachTo(m_modeWidget);
 
diff --git a/src/shared/qbs b/src/shared/qbs
index 1ee1e51fa98..0336494de6c 160000
--- a/src/shared/qbs
+++ b/src/shared/qbs
@@ -1 +1 @@
-Subproject commit 1ee1e51fa98f89ae4ee977f6074d070f5788c633
+Subproject commit 0336494de6c4e394b7354ca78dcb2192f01f9fc6
diff --git a/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp b/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp
index e38889f5ea5..8f7d256d0af 100644
--- a/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp
+++ b/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp
@@ -426,7 +426,7 @@ static Document::Ptr parse(const QString &fileName, const QByteArray &source,
         if (verbose)
             std::cout << "Parsing as " << qPrintable(parseModeToString(parseMode)) << "...";
 
-        Document::Ptr doc = Document::create(Utils::FilePath::fromString(fileName));
+        Document::Ptr doc = Document::create(Utils::FilePath::fromUserInput(fileName));
         doc->control()->setDiagnosticClient(errorHandler);
         doc->setUtf8Source(source);
         const bool parsed = doc->parse(parseMode);
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index 7d78434c75a..552680dd884 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -1975,6 +1975,48 @@
            id="path4127-25-8" />
       </g>
     </g>
+    <g
+       id="src/plugins/lua/wizards/plugin/icon">
+      <use
+         transform="translate(360,60)"
+         style="display:inline"
+         x="0"
+         y="0"
+         xlink:href="#backgroundRect_60_60"
+         id="use2673"
+         width="100%"
+         height="100%" />
+      <use
+         style="display:inline"
+         x="0"
+         y="0"
+         xlink:href="#wizardicons_puzzlepiece"
+         id="use2675"
+         width="100%"
+         height="100%"
+         transform="translate(60,60)" />
+      <g
+         id="g9737">
+        <circle
+           style="fill:#999999;stroke:#000000"
+           id="path9543-7"
+           cx="393.5"
+           cy="232.5"
+           r="5" />
+        <circle
+           style="fill:#999999;stroke:#000000"
+           id="path6651"
+           cx="377.5"
+           cy="248.5"
+           r="15" />
+        <circle
+           style="fill:#ffffff"
+           id="path9543"
+           cx="383"
+           cy="243"
+           r="5" />
+      </g>
+    </g>
     <g
        id="share/qtcreator/templates/wizards/projects/vcs/mercurial/icon">
       <use
@@ -3772,10 +3814,24 @@
          height="100%" />
       <path
          id="path6795"
-         d="m 16,423.5 v 11 M 26,418 16,423.5 6,418 m 0,11.5 10,5.5 10,-5.5 v -11 L 16,413 6,418.5 Z"
+         d="m 16,422.5 v 12 M 27,418 16,422.5 5,418 m 0,12.5 11,4.5 11,-4.5 v -13 L 16,413 5,417.5 Z"
          style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round"
          sodipodi:nodetypes="cccccccccccc" />
     </g>
+    <g
+       id="src/plugins/extensionmanager/images/packbig">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#backgroundRect_32_28"
+         id="use16"
+         style="display:inline"
+         transform="matrix(0.97058824,0,0,1,-39.794118,403)" />
+      <path
+         id="path13"
+         d="m 16.5,456.16667 v 16 M 30.5,450 16.5,456.16667 2.5,450 m 0,16.66666 14,6.16667 14,-6.16667 v -17.33333 l -14,-5.83333 -14,5.83333 z"
+         style="fill:none;stroke:#000000;stroke-width:3;stroke-linejoin:round" />
+    </g>
     <g
        id="src/plugins/extensionmanager/images/extensionsmall">
       <use
@@ -3787,15 +3843,48 @@
          width="100%"
          height="100%" />
       <path
-         id="path4530"
-         style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round"
-         d="M 49.5,422 H 56 Z M 38,424 h 5.5 z m 11.5,2 H 56 Z"
-         sodipodi:nodetypes="ccccccccc" />
+         id="path6795-3"
+         style="display:inline;fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-linecap:round"
+         d="m 48,422.5 v 4 m 0,4 v 4 M 59,418 c 0,0 -1.6471,0.674 -3.6667,1.5 M 51.6667,421 C 49.6472,421.826 48,422.5 48,422.5 c 0,0 -1.6471,-0.674 -3.6667,-1.5 m -3.6666,-1.5 C 38.6472,418.674 37,418 37,418 m 7.3333,15.5 C 46.3528,434.326 48,435 48,435 m 11,-17.5 c 0,0 -1.6471,-0.674 -3.6667,-1.5 m -3.6666,-1.5 C 49.6472,413.674 48,413 48,413 c 0,0 -1.6471,0.674 -3.6667,1.5 M 40.6667,416 C 38.6472,416.826 37,417.5 37,417.5 v 4.333 m 0,4.334 v 4.333 c 0,0 1.6471,0.674 3.6667,1.5" />
       <path
-         style="fill:#000000;fill-opacity:1"
-         d="m 50,420 h -3.5 c -1.5,0 -4,0.5 -4,4 0,3.5 2.5,4 4,4 H 50 c 1.5,0 2,-1 2,-1.5 v -5 C 52,421 51.5,420 50,420 Z"
-         id="path4682"
-         sodipodi:nodetypes="cczccccc" />
+         style="fill:#000000;stroke:#000000;stroke-width:2;stroke-linejoin:round"
+         d="M 59,421.75 V 430.5 l -8,3.25 V 425 Z"
+         id="path32048"
+         sodipodi:nodetypes="ccccc" />
+    </g>
+    <g
+       id="src/plugins/extensionmanager/images/extensionbig">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#backgroundRect_32_28"
+         id="use13"
+         style="display:inline"
+         transform="matrix(0.97058824,0,0,1,-5.794118,403)" />
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round"
+         d="M 55.454565,470.65463 64.5,466.667 v -11.17266 l -9,3.95638 z"
+         id="path19"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         id="path14"
+         style="fill:none;stroke:#000000;stroke-width:3;stroke-linejoin:round;stroke-linecap:round"
+         d="m 50.5,456.167 v 5.333 m 0,5.333 v 5.334 m 14,-22.167 -4.6667,2.056 m -4.6666,2.055 -4.6667,2.056 -4.6667,-2.056 M 41.1667,452.056 36.5,450 m 4.6667,-2.611 -4.6667,1.944 v 5.778 m 0,5.778 v 5.778 l 4.6667,2.055 m 4.6666,2.056 4.6667,2.055 m 14,-23.5 -4.6667,-1.944 M 55.1667,445.444 50.5,443.5 l -4.6667,1.944" />
+    </g>
+    <g
+       id="src/plugins/extensionmanager/images/download">
+      <rect
+         y="408"
+         x="65"
+         height="16"
+         width="16"
+         id="use15-0-0"
+         style="display:inline;fill:#ffffff" />
+      <path
+         id="path7"
+         style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round"
+         d="m 67,422 h 12 m -6,-3.5 V 410 m -3,5.5 3,3 3.03461,-3"
+         sodipodi:nodetypes="ccccccc" />
     </g>
     <g
        id="src/libs/utils/images/eyeoverlay">
@@ -4852,35 +4941,22 @@
          width="16"
          height="16"
          id="rect4959-4" />
-      <g
-         id="g6659"
-         transform="translate(2,0.625)">
-        <path
-           id="asdfasdfasdf"
-           inkscape:connector-curvature="0"
-           d="m 466.5,575.875 c -1.2497,0 -1.25,1.125 -1.25,1.5 h 2.5 c 0,-0.375 -3e-4,-1.5 -1.25,-1.5 z"
-           sodipodi:nodetypes="zccz" />
-        <path
-           id="sdfgdsfgsdfg"
-           inkscape:connector-curvature="0"
-           d="m 463.27023,577.37502 -0.15225,1 h 1.36286 l -0.24267,0.99998 H 463 v 1 h 1.23817 l 0.27709,1.00002 h -1.39728 l 0.15225,1 h 1.13211 l 0.88226,-0.5 L 466,582.375 v -4.5 h -0.75 v -0.5 z"
-           sodipodi:nodetypes="ccccccccccccccccc" />
-        <use
-           height="100%"
-           width="100%"
-           transform="matrix(-1,0,0,1,933,0)"
-           id="use6516"
-           xlink:href="#sdfgdsfgsdfg"
-           y="0"
-           x="0" />
-      </g>
+      <path
+         id="path49154"
+         style="fill:none;stroke:#000000;stroke-linecap:round;stroke-linejoin:round"
+         d="m 467.5,575.5 0.3,1 m 1.7,-1 -0.3,1 m 2.3,1 H 470 m 1.5,2 h -1 m 1,3 v -1 H 470 m -4.5,1 v -1 h 1.5 m -1.5,-2 h 1.5 m -1.5,-2 h 1.5" />
       <rect
-         style="opacity:1;fill:#808080;fill-opacity:1"
-         id="rect4816"
-         width="1"
-         height="4.5"
-         x="468"
-         y="578.5" />
+         style="fill:#000000;stroke:none"
+         id="rect50185"
+         width="5"
+         height="7"
+         x="466"
+         y="576"
+         ry="2.5" />
+      <path
+         id="path49710"
+         style="fill:none;stroke:#ffffff;stroke-linecap:round"
+         d="m 468,580.5 c 1,0 1,0 1,0 m -1,-2 c 1,0 1,0 1,0" />
     </g>
     <g
        id="src/plugins/projectexplorer/images/analyzer_overlay_small"
@@ -8652,9 +8728,9 @@
          height="100%"
          style="stroke-width:0.88039" />
       <path
-         inkscape:connector-curvature="0"
-         d="m 62,59 h 5 v 5 h -5 z m -7,0 h 5 v 5 h -5 z m -7,0 h 5 v 5 h -5 z m 14,-7 h 5 v 5 h -5 z m -7,0 h 5 v 5 h -5 z m -7,0 h 5 v 5 h -5 z m 14,-7 h 5 v 5 h -5 z m -7,0 h 5 v 5 h -5 z m -7,0 h 5 v 5 h -5 z"
-         id="rect5371-8" />
+         id="path4"
+         style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round"
+         d="m 55,64 v -7 h 6 v 7 M 50,52.5 V 64 H 66 V 52.5 l -8,-6 z" />
     </g>
     <g
        transform="translate(-55,264)"
@@ -8670,10 +8746,23 @@
          width="100%"
          height="100%" />
       <path
-         id="path5381-3"
-         d="m 98,45 v 19 h 19 V 45 Z m 4,9 h 9 v 1 h -9 z m 9,5 h -9 v -1 h 9 z m 2,-2 h -11 v -1 h 11 z m 0,-4 h -11 v -1 h 11 z m 0,-2 h -11 v -1 h 11 z"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccccccccccc" />
+         id="path43573"
+         style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round"
+         d="m 100,63 h 16 m -16,-4 h 12 m -12,-4 h 16 m -16,-4 h 12 m -12,-4 h 16" />
+    </g>
+    <g
+       id="mode_design_pen">
+      <rect
+         style="fill:#ffffff"
+         id="rect17"
+         width="13"
+         height="21"
+         x="83"
+         y="280" />
+      <path
+         id="path47960"
+         style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
+         d="M 91,290.5 A 1.5,1.5 0 0 1 89.5,292 1.5,1.5 0 0 1 88,290.5 1.5,1.5 0 0 1 89.5,289 1.5,1.5 0 0 1 91,290.5 Z M 89.5,281 v 8 m -3.5,6 c 7,0 7,0 7,0 m -4.5,-14 h 2 l 4,10 -1.5,4 1.5,3 h -10 l 1.5,-3 -1.5,-4 z" />
     </g>
     <g
        transform="translate(-69,264)"
@@ -8688,14 +8777,12 @@
          id="use5913-0"
          width="100%"
          height="100%" />
-      <g
-         transform="translate(-5,-6)"
-         id="g5387-8">
-        <path
-           id="polygon5391-6"
-           d="m 167.909,58.778 -3.535,-3.536 -10.96,10.96 -1.414,4.95 4.949,-1.414 z m -2.4715,-4.589696 3.18214,-3.180343 3.5338,3.535793 -3.18215,3.180343 z"
-           inkscape:connector-curvature="0" />
-      </g>
+      <use
+         x="0"
+         y="0"
+         xlink:href="#mode_design_pen"
+         id="use18"
+         transform="rotate(-135,75.244119,159.91674)" />
     </g>
     <g
        transform="translate(-83,264)"
@@ -8711,14 +8798,28 @@
          width="100%"
          height="100%" />
       <g
-         transform="translate(-4.5,-7)"
-         id="big_beetle">
+         id="g73594"
+         style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round">
         <path
-           d="m 212,52 c -1.275,0 -3.30877,1.17695 -3.88477,2.75195 L 212,56.9375 215.88477,54.75195 C 215.30877,53.17595 213.275,52 212,52 Z m -4.67578,3.68359 -1.98633,1.76563 -1.39648,-1.39453 c -0.194,-0.194 -0.51304,-0.194 -0.70703,0 -0.194,0.194 -0.194,0.51303 0,0.70703 l 1.6875,1.6875 L 204.03516,62 H 202.5 c -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 h 1.48828 l 1.19141,3.8125 -1.62696,1.62695 c -0.194,0.194 -0.194,0.51303 0,0.70703 0.194,0.194 0.51304,0.194 0.70704,0 l 1.375,-1.375 3.55273,2.36719 2.3125,0.58594 V 58 Z m 9.35156,0 L 212.5,58 v 12.72461 l 2.3125,-0.58594 3.55078,-2.36719 1.375,1.375 c 0.194,0.194 0.51303,0.194 0.70703,0 0.194,-0.194 0.194,-0.51303 0,-0.70703 l -1.625,-1.625 L 220.01172,63 H 221.5 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 h -1.53516 l -0.88672,-3.55078 1.6875,-1.6875 c 0.19401,-0.194 0.194,-0.51303 0,-0.70703 -0.19399,-0.194 -0.51303,-0.194 -0.70703,0 l -1.39648,1.39453 z"
-           id="path5403-3"
-           inkscape:connector-curvature="0" />
+           id="path72820"
+           d="m 207,58 h 2 m 6,4 v -2 h -2 m -12,2 v -2 h 2 m 12,-4 h -1.5 m 1.5,-4 h -2 m -6,2 h 2 m -8,2 h 1.5 M 201,52 h 2 m 8,-5 -1,2 m -5,-2 1,2" />
+        <rect
+           id="rect72844"
+           width="10"
+           height="14"
+           x="203"
+           y="49"
+           ry="5" />
       </g>
     </g>
+    <g
+       id="mode_project_wrench">
+      <path
+         style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round"
+         d="m 159,277 v 5.5 l 0.5,0.5 h 3 l 0.5,-0.5 V 277 c 0.5,0 4.0272,1.45336 4,5.5 -0.0269,3.99991 -4,5.5 -4,5.5 v 9 c 0,1.5 -1,2 -2,2 -1,0 -2,-0.5 -2,-2 v -9 c 0,0 -3.99599,-1.5 -4,-5.5 -0.004,-4.12282 3.5,-5.5 4,-5.5 z"
+         id="path8"
+         sodipodi:nodetypes="ccccccscssscsc" />
+    </g>
     <g
        transform="translate(-97,264)"
        style="display:inline"
@@ -8732,10 +8833,12 @@
          id="use5913-0-8-3"
          width="100%"
          height="100%" />
-      <path
-         id="path5439-0"
-         d="m 265.554,54.885 c 1.51,-1.511 1.955,-3.68 1.34,-5.583 l -2.754,2.754 c -0.584,0.583 -1.538,0.583 -2.121,0 l -1.414,-1.415 c -0.584,-0.583 -0.584,-1.538 0,-2.121 l 2.754,-2.754 c -1.903,-0.614 -4.073,-0.17 -5.583,1.34 -1.647,1.647 -2.025,4.081 -1.145,6.095 l -8.048,8.047 c -0.777,0.778 -0.777,2.051 0,2.829 0.777,0.777 2.051,0.777 2.828,0 l 8.048,-8.048 c 2.015,0.882 4.447,0.503 6.095,-1.144 z"
-         inkscape:connector-curvature="0" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#mode_project_wrench"
+         id="use17"
+         transform="rotate(45,489.04885,287.88225)" />
     </g>
     <g
        transform="translate(-162,264)"
@@ -8750,10 +8853,23 @@
          id="use5913-0-8-7"
          width="100%"
          height="100%" />
+      <circle
+         style="fill:none;stroke:#000000;stroke-width:2"
+         id="path95674"
+         cx="359"
+         cy="55"
+         r="9" />
+      <circle
+         style="fill:#000000"
+         id="path96108"
+         cx="359"
+         cy="59"
+         r="1" />
       <path
-         id="big_helpquestionmark"
-         d="m 359,45 c -5.522,0 -10,4.478 -10,10 0,5.522 4.478,10 10,10 5.522,0 10,-4.478 10,-10 0,-5.522 -4.478,-10 -10,-10 z m 1.136,16.182 c -0.274,0.269 -0.604,0.402 -0.989,0.402 -0.187,0 -0.364,-0.035 -0.533,-0.105 -0.169,-0.07 -0.318,-0.163 -0.446,-0.28 -0.129,-0.117 -0.23,-0.257 -0.307,-0.42 -0.076,-0.163 -0.113,-0.338 -0.113,-0.525 0,-0.373 0.137,-0.694 0.411,-0.962 0.273,-0.268 0.603,-0.402 0.988,-0.402 0.374,0 0.7,0.128 0.98,0.385 0.28,0.257 0.42,0.572 0.42,0.945 0,0.372 -0.138,0.693 -0.411,0.962 z m 2.738,-7.98 c -0.104,0.292 -0.245,0.56 -0.42,0.805 -0.175,0.245 -0.376,0.479 -0.604,0.7 -0.228,0.222 -0.47,0.455 -0.727,0.7 -0.163,0.151 -0.303,0.286 -0.42,0.402 -0.116,0.117 -0.213,0.236 -0.288,0.359 -0.076,0.122 -0.132,0.262 -0.167,0.42 -0.034,0.157 -0.052,0.347 -0.052,0.569 v 0.665 h -2.101 V 56.86 c 0,-0.256 0.015,-0.475 0.044,-0.656 0.029,-0.181 0.081,-0.344 0.157,-0.49 0.076,-0.146 0.175,-0.286 0.298,-0.42 0.122,-0.134 0.271,-0.295 0.446,-0.481 l 1.348,-1.365 c 0.291,-0.292 0.438,-0.67 0.438,-1.137 0,-0.455 -0.149,-0.825 -0.446,-1.111 -0.298,-0.286 -0.674,-0.429 -1.129,-0.429 -0.49,0 -0.893,0.166 -1.208,0.499 -0.314,0.333 -0.495,0.738 -0.542,1.216 l -2.24,-0.175 c 0.07,-0.56 0.216,-1.059 0.438,-1.496 0.222,-0.438 0.511,-0.808 0.866,-1.111 0.355,-0.303 0.768,-0.534 1.234,-0.691 0.466,-0.158 0.979,-0.236 1.54,-0.236 0.524,0 1.012,0.076 1.461,0.228 0.449,0.152 0.84,0.371 1.172,0.656 0.333,0.286 0.593,0.642 0.779,1.067 0.186,0.426 0.28,0.913 0.28,1.461 10e-4,0.382 -0.052,0.721 -0.157,1.013 z"
-         inkscape:connector-curvature="0" />
+         style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round"
+         d="m 356.7,52.44 c 0.57,-2 3.6,-2.35 4.33,-0.36 0.72,2 -1.54,2.2 -2.18,4.2"
+         id="path97127"
+         sodipodi:nodetypes="czc" />
     </g>
     <g
        id="src/plugins/extensionmanager/images/mode_extensionmanager_mask">
@@ -8810,11 +8926,10 @@
          id="use5913-0-8-1"
          width="100%"
          height="100%" />
-      <polygon
-         style="fill:#000000"
-         points="603,50 621,61 603,72 "
-         id="polygon5749-6"
-         transform="translate(0,-4)" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round"
+         d="M 606,49.5 620.5,58 606,66.5 Z"
+         id="path4716" />
     </g>
     <g
        transform="translate(-708,297)"
@@ -8829,27 +8944,18 @@
          id="use5913-0-8-1-3"
          width="100%"
          height="100%" />
-      <g
-         id="big_bug"
-         transform="translate(-5,-1.000238)">
-        <path
-           d="m 769.50001,58.836563 c -0.65839,0 -1.70859,0.724548 -2.00602,1.694142 l 2.00602,1.345458 2.006,-1.345458 c -0.29742,-0.97021 -1.34763,-1.694142 -2.006,-1.694142 z"
-           id="path4874"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="cccccccccccccccc"
-           d="m 767.12627,61.068318 c -0.25633,0.152637 -0.64848,0.411162 -1.25704,1.062795 l -1.53472,-1.238122 -0.75352,0.91144 1.76081,1.340958 C 765.1929,63.665163 764.94085,64.148012 764.875,65 H 763 v 1 h 1.875 c 0.13153,0.564121 0.25703,1.128242 0.58926,1.692363 l -1.66595,1.498516 0.73938,0.89637 1.61151,-1.446886 c 1.00647,0.777187 1.78541,1.06964 2.8508,1.139875 v -7.354264 z"
-           id="path4872"
-           inkscape:connector-curvature="0" />
-        <use
-           x="0"
-           y="0"
-           xlink:href="#path4872"
-           id="use4876"
-           transform="matrix(-1,0,0,1,1539,0)"
-           width="100%"
-           height="100%" />
-      </g>
+      <path
+         id="path11137"
+         style="fill:none;stroke:#000000;stroke-linecap:round;stroke-linejoin:round"
+         d="m 764.5,57.5 0.5,1 m 2.5,-1 -0.5,1 m 1.5,2 h 1 m -1,2 h 1 m -1.5,2 h 1.5 v 1 m -7,0 v -1 h 1.5 m -1.5,-2 h 1 m -1,-2 h 1 m 2,2 h 1 m -1,-2 h 1" />
+      <rect
+         style="fill:none;stroke:#000000"
+         id="rect8062"
+         width="5"
+         height="7"
+         x="763.5"
+         y="58.5"
+         ry="2.5" />
     </g>
     <g
        id="src/plugins/projectexplorer/images/cancelbuild_overlay"
@@ -8864,15 +8970,13 @@
          x="0"
          style="display:inline"
          transform="translate(703,3)" />
-      <use
-         style="display:inline"
-         x="0"
-         y="0"
-         xlink:href="#src/libs/utils/images/stop_small"
-         id="use1533"
-         transform="translate(379,-513)"
-         width="100%"
-         height="100%" />
+      <rect
+         id="rect2664"
+         height="8"
+         width="8"
+         y="61"
+         x="762"
+         ry="1" />
     </g>
     <g
        id="src/plugins/debugger/images/debugger_interrupt_mask"
@@ -8888,19 +8992,20 @@
          width="100%"
          height="100%" />
       <rect
-         style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect4608-0"
-         width="7"
-         height="18"
-         x="753"
-         y="48" />
-      <rect
-         style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect4610-6"
-         width="7"
-         height="18"
-         x="763"
-         y="48" />
+         style="fill:#ffffff;stroke:#000000;stroke-width:4;stroke-linejoin:round;paint-order:stroke markers fill"
+         id="biginterruptbar"
+         width="2"
+         height="11"
+         x="757"
+         y="52" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#biginterruptbar"
+         id="use19924"
+         transform="translate(8)"
+         width="100%"
+         height="100%" />
     </g>
     <g
        id="src/plugins/debugger/images/debugger_continue_1_mask"
@@ -8915,13 +9020,15 @@
          id="use5913-0-8-1-30"
          width="100%"
          height="100%" />
-      <rect
-         style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect4608-0-4"
-         width="7"
-         height="18"
-         x="752"
-         y="48" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#biginterruptbar"
+         id="use19944"
+         style="display:inline"
+         width="100%"
+         height="100%"
+         transform="translate(-1)" />
     </g>
     <g
        id="src/plugins/debugger/images/debugger_continue_2_mask"
@@ -8937,16 +9044,39 @@
          width="100%"
          height="100%" />
       <path
-         style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 764,48 9,9 -9,9 z"
-         id="rect4610-6-2-5"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
+         style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round"
+         d="m 765,51 6,6 -6,7 z"
+         id="path34590" />
+    </g>
+    <g
+       id="build_hammer"
+       transform="translate(-667,327)">
+      <rect
+         style="fill:#ffffff"
+         id="rect11"
+         width="20"
+         height="22"
+         x="854"
+         y="47" />
+      <rect
+         style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round"
+         id="rect8"
+         width="4"
+         height="15"
+         x="862"
+         y="53"
+         ry="1"
+         rx="1" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:2"
+         d="m 870,48 h -8.5 c -2,0 -4,3 -5,5 H 870 Z"
+         id="path11"
+         sodipodi:nodetypes="csccc" />
     </g>
     <g
        transform="translate(-664,297)"
        style="display:inline"
-       id="src/plugins/projectexplorer/images/build_hammerhandle_mask">
+       id="src/plugins/projectexplorer/images/build_hammer_mask">
       <use
          transform="translate(803,3)"
          style="display:inline"
@@ -8956,43 +9086,12 @@
          id="use5913-0-8-1-89"
          width="100%"
          height="100%" />
-      <g
-         style="fill:#030303;fill-opacity:1"
-         id="build-5"
-         transform="translate(-1,-3)">
-        <rect
-           style="fill:#030303;fill-opacity:1;stroke-width:0.99999"
-           x="649.42847"
-           y="-573.14081"
-           transform="rotate(45)"
-           width="2.9999712"
-           height="19.999807"
-           id="rect5755-4" />
-      </g>
-    </g>
-    <g
-       transform="translate(-628,297)"
-       style="display:inline"
-       id="src/plugins/projectexplorer/images/build_hammerhead_mask">
       <use
-         transform="translate(803,3)"
-         style="display:inline"
          x="0"
          y="0"
-         xlink:href="#backgroundRect_32_28"
-         id="use5913-0-8-1-5"
-         width="100%"
-         height="100%" />
-      <g
-         style="fill:#030303;fill-opacity:1"
-         id="build-5-2"
-         transform="translate(-1,-3)">
-        <polygon
-           style="fill:#030303;fill-opacity:1"
-           points="870.148,60.606 859.542,50 866.613,50 873.684,57.071 "
-           id="polygon5757-3-4"
-           transform="translate(0,-1)" />
-      </g>
+         xlink:href="#build_hammer"
+         id="use20"
+         transform="rotate(45,922.51682,1023.5188)" />
     </g>
     <g
        transform="translate(-247.5,256)"
@@ -10518,12 +10617,12 @@
          width="100%"
          height="100%" />
       <rect
-         style="fill:#000000"
-         id="rect4608-0-6"
-         width="17"
-         height="18"
-         x="753"
-         y="48" />
+         style="fill:#ffffff;stroke:#000000;stroke-width:4;stroke-linejoin:round;paint-order:markers stroke fill"
+         id="rect38197"
+         width="10"
+         height="10"
+         x="757"
+         y="53" />
     </g>
   </g>
   <g
diff --git a/src/tools/iostool/iosdevicemanager.cpp b/src/tools/iostool/iosdevicemanager.cpp
index d492e6f78dc..3f523807857 100644
--- a/src/tools/iostool/iosdevicemanager.cpp
+++ b/src/tools/iostool/iosdevicemanager.cpp
@@ -1662,6 +1662,7 @@ void DevInfoSession::deviceCallbackReturned()
     const QString osVersionKey = "osVersion";
     const QString cpuArchitectureKey = "cpuArchitecture";
     const QString uniqueDeviceId = "uniqueDeviceId";
+    const QString productType = "productType";
     bool failure = !device;
     if (!failure) {
         failure = !connectDevice();
@@ -1669,6 +1670,7 @@ void DevInfoSession::deviceCallbackReturned()
             res[deviceConnectedKey] = QLatin1String("YES");
             res[deviceNameKey] = getStringValue(device, nullptr, CFSTR("DeviceName"));
             res[uniqueDeviceId] = getStringValue(device, nullptr, CFSTR("UniqueDeviceID"));
+            res[productType] = getStringValue(device, nullptr, CFSTR("ProductType"));
             const QString productVersion = getStringValue(device, nullptr, CFSTR("ProductVersion"));
             res[developerStatusKey] = getStringValue(device,
                                                      CFSTR("com.apple.xcode.developerdomain"),
diff --git a/src/tools/iostool/relayserver.cpp b/src/tools/iostool/relayserver.cpp
index 571a338b26f..0ea1be33ce9 100644
--- a/src/tools/iostool/relayserver.cpp
+++ b/src/tools/iostool/relayserver.cpp
@@ -33,11 +33,7 @@ void Relayer::setClientSocket(QTcpSocket *clientSocket)
     QTC_CHECK(!m_clientSocket);
     m_clientSocket = clientSocket;
     if (m_clientSocket) {
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
-        const auto errorOccurred = QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error);
-#else
         const auto errorOccurred = &QAbstractSocket::errorOccurred;
-#endif
         connect(m_clientSocket, errorOccurred, this, &Relayer::handleClientHasError);
         connect(m_clientSocket, &QAbstractSocket::disconnected,
                 this, [this](){server()->removeRelayConnection(this);});
diff --git a/src/tools/processlauncher/launchersockethandler.cpp b/src/tools/processlauncher/launchersockethandler.cpp
index d7f576e434b..53ef9171295 100644
--- a/src/tools/processlauncher/launchersockethandler.cpp
+++ b/src/tools/processlauncher/launchersockethandler.cpp
@@ -181,7 +181,8 @@ void LauncherSocketHandler::handleStartPacket()
     process->setStandardInputFile(packet.standardInputFile);
     ProcessStartHandler *handler = process->processStartHandler();
     handler->setWindowsSpecificStartupFlags(packet.belowNormalPriority,
-                                            packet.createConsoleOnWindows);
+                                            packet.createConsoleOnWindows,
+                                            packet.forceDefaultErrorMode);
     handler->setProcessMode(packet.processMode);
     handler->setWriteData(packet.writeData);
     handler->setNativeArguments(packet.nativeArguments);
diff --git a/src/tools/qml2puppet/instances/nodeinstanceclientproxy.cpp b/src/tools/qml2puppet/instances/nodeinstanceclientproxy.cpp
index a7ab2bf8737..47a5bfedaab 100644
--- a/src/tools/qml2puppet/instances/nodeinstanceclientproxy.cpp
+++ b/src/tools/qml2puppet/instances/nodeinstanceclientproxy.cpp
@@ -131,17 +131,17 @@ void NodeInstanceClientProxy::initializeCapturedStream(const QString &fileName)
 
 bool compareCommands(const QVariant &command, const QVariant &controlCommand)
 {
-    static const int informationChangedCommandType = QMetaType::type("InformationChangedCommand");
-    static const int valuesChangedCommandType = QMetaType::type("ValuesChangedCommand");
-    static const int valuesModifiedCommandType = QMetaType::type("ValuesModifiedCommand");
-    static const int pixmapChangedCommandType = QMetaType::type("PixmapChangedCommand");
-    static const int childrenChangedCommandType = QMetaType::type("ChildrenChangedCommand");
-    static const int statePreviewImageChangedCommandType = QMetaType::type("StatePreviewImageChangedCommand");
-    static const int componentCompletedCommandType = QMetaType::type("ComponentCompletedCommand");
-    static const int synchronizeCommandType = QMetaType::type("SynchronizeCommand");
-    static const int tokenCommandType = QMetaType::type("TokenCommand");
-    static const int debugOutputCommandType = QMetaType::type("DebugOutputCommand");
-    static const int changeSelectionCommandType = QMetaType::type("ChangeSelectionCommand");
+    static const int informationChangedCommandType = QMetaType::fromName("InformationChangedCommand").id();
+    static const int valuesChangedCommandType = QMetaType::fromName("ValuesChangedCommand").id();
+    static const int valuesModifiedCommandType = QMetaType::fromName("ValuesModifiedCommand").id();
+    static const int pixmapChangedCommandType = QMetaType::fromName("PixmapChangedCommand").id();
+    static const int childrenChangedCommandType = QMetaType::fromName("ChildrenChangedCommand").id();
+    static const int statePreviewImageChangedCommandType = QMetaType::fromName("StatePreviewImageChangedCommand").id();
+    static const int componentCompletedCommandType = QMetaType::fromName("ComponentCompletedCommand").id();
+    static const int synchronizeCommandType = QMetaType::fromName("SynchronizeCommand").id();
+    static const int tokenCommandType = QMetaType::fromName("TokenCommand").id();
+    static const int debugOutputCommandType = QMetaType::fromName("DebugOutputCommand").id();
+    static const int changeSelectionCommandType = QMetaType::fromName("ChangeSelectionCommand").id();
 
     if (command.typeId() == controlCommand.typeId()) {
         if (command.typeId() == informationChangedCommandType)
@@ -186,8 +186,8 @@ void NodeInstanceClientProxy::writeCommand(const QVariant &command)
         }
     } else if (m_outputIoDevice) {
 #ifdef NANOTRACE_DESIGNSTUDIO_ENABLED
-        if (command.typeId() != QMetaType::type("PuppetAliveCommand")) {
-            if (command.typeId() == QMetaType::type("SyncNanotraceCommand")) {
+        if (command.typeId() != QMetaType::fromName("PuppetAliveCommand").id()) {
+            if (command.typeId() == QMetaType::fromName("SyncNanotraceCommand").id()) {
                 SyncNanotraceCommand cmd = command.value<SyncNanotraceCommand>();
                 NANOTRACE_INSTANT_ARGS("Sync", "writeCommand",
                     {"name", cmd.name().toStdString()},
@@ -391,8 +391,8 @@ void NodeInstanceClientProxy::readDataStream()
 
         QVariant command = readCommandFromIOStream(m_inputIoDevice, &readCommandCounter, &blockSize);
 #ifdef NANOTRACE_DESIGNSTUDIO_ENABLED
-        if (command.typeId() != QMetaType::type("EndNanotraceCommand")) {
-            if (command.typeId() == QMetaType::type("SyncNanotraceCommand")) {
+        if (command.typeId() != QMetaType::fromName("EndNanotraceCommand").id()) {
+            if (command.typeId() == QMetaType::fromName("SyncNanotraceCommand").id()) {
                 SyncNanotraceCommand cmd = command.value<SyncNanotraceCommand>();
                 NANOTRACE_INSTANT_ARGS("Sync", "readCommand",
                     {"name", cmd.name().toStdString()},
@@ -541,34 +541,34 @@ void NodeInstanceClientProxy::dispatchCommand(const QVariant &command)
 {
     NANOTRACE_SCOPE_ARGS("Update", "dispatchCommand", {"name", command.typeName()});
 
-    static const int createInstancesCommandType = QMetaType::type("CreateInstancesCommand");
-    static const int update3dViewStateCommand = QMetaType::type("Update3dViewStateCommand");
-    static const int changeFileUrlCommandType = QMetaType::type("ChangeFileUrlCommand");
-    static const int createSceneCommandType = QMetaType::type("CreateSceneCommand");
-    static const int clearSceneCommandType = QMetaType::type("ClearSceneCommand");
-    static const int removeInstancesCommandType = QMetaType::type("RemoveInstancesCommand");
-    static const int removePropertiesCommandType = QMetaType::type("RemovePropertiesCommand");
-    static const int changeBindingsCommandType = QMetaType::type("ChangeBindingsCommand");
-    static const int changeValuesCommandType = QMetaType::type("ChangeValuesCommand");
-    static const int changeAuxiliaryCommandType = QMetaType::type("ChangeAuxiliaryCommand");
-    static const int reparentInstancesCommandType = QMetaType::type("ReparentInstancesCommand");
-    static const int changeIdsCommandType = QMetaType::type("ChangeIdsCommand");
-    static const int changeStateCommandType = QMetaType::type("ChangeStateCommand");
-    static const int completeComponentCommandType = QMetaType::type("CompleteComponentCommand");
-    static const int synchronizeCommandType = QMetaType::type("SynchronizeCommand");
-    static const int changeNodeSourceCommandType = QMetaType::type("ChangeNodeSourceCommand");
-    static const int removeSharedMemoryCommandType = QMetaType::type("RemoveSharedMemoryCommand");
-    static const int tokenCommandType = QMetaType::type("TokenCommand");
-    static const int endPuppetCommandType = QMetaType::type("EndPuppetCommand");
-    static const int changeSelectionCommandType = QMetaType::type("ChangeSelectionCommand");
-    static const int inputEventCommandType = QMetaType::type("InputEventCommand");
-    static const int view3DActionCommandType = QMetaType::type("View3DActionCommand");
-    static const int requestModelNodePreviewImageCommandType = QMetaType::type("RequestModelNodePreviewImageCommand");
-    static const int changeLanguageCommand = QMetaType::type("ChangeLanguageCommand");
-    static const int changePreviewImageSizeCommand = QMetaType::type(
-        "ChangePreviewImageSizeCommand");
-    static const int startNanotraceCommandType = QMetaType::type("StartNanotraceCommand");
-    static const int endNanotraceCommandType = QMetaType::type("EndNanotraceCommand");
+    static const int createInstancesCommandType = QMetaType::fromName("CreateInstancesCommand").id();
+    static const int update3dViewStateCommand = QMetaType::fromName("Update3dViewStateCommand").id();
+    static const int changeFileUrlCommandType = QMetaType::fromName("ChangeFileUrlCommand").id();
+    static const int createSceneCommandType = QMetaType::fromName("CreateSceneCommand").id();
+    static const int clearSceneCommandType = QMetaType::fromName("ClearSceneCommand").id();
+    static const int removeInstancesCommandType = QMetaType::fromName("RemoveInstancesCommand").id();
+    static const int removePropertiesCommandType = QMetaType::fromName("RemovePropertiesCommand").id();
+    static const int changeBindingsCommandType = QMetaType::fromName("ChangeBindingsCommand").id();
+    static const int changeValuesCommandType = QMetaType::fromName("ChangeValuesCommand").id();
+    static const int changeAuxiliaryCommandType = QMetaType::fromName("ChangeAuxiliaryCommand").id();
+    static const int reparentInstancesCommandType = QMetaType::fromName("ReparentInstancesCommand").id();
+    static const int changeIdsCommandType = QMetaType::fromName("ChangeIdsCommand").id();
+    static const int changeStateCommandType = QMetaType::fromName("ChangeStateCommand").id();
+    static const int completeComponentCommandType = QMetaType::fromName("CompleteComponentCommand").id();
+    static const int synchronizeCommandType = QMetaType::fromName("SynchronizeCommand").id();
+    static const int changeNodeSourceCommandType = QMetaType::fromName("ChangeNodeSourceCommand").id();
+    static const int removeSharedMemoryCommandType = QMetaType::fromName("RemoveSharedMemoryCommand").id();
+    static const int tokenCommandType = QMetaType::fromName("TokenCommand").id();
+    static const int endPuppetCommandType = QMetaType::fromName("EndPuppetCommand").id();
+    static const int changeSelectionCommandType = QMetaType::fromName("ChangeSelectionCommand").id();
+    static const int inputEventCommandType = QMetaType::fromName("InputEventCommand").id();
+    static const int view3DActionCommandType = QMetaType::fromName("View3DActionCommand").id();
+    static const int requestModelNodePreviewImageCommandType = QMetaType::fromName("RequestModelNodePreviewImageCommand").id();
+    static const int changeLanguageCommand = QMetaType::fromName("ChangeLanguageCommand").id();
+    static const int changePreviewImageSizeCommand = QMetaType::fromName(
+        "ChangePreviewImageSizeCommand").id();
+    static const int startNanotraceCommandType = QMetaType::fromName("StartNanotraceCommand").id();
+    static const int endNanotraceCommandType = QMetaType::fromName("EndNanotraceCommand").id();
 
     const int commandType = command.typeId();
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp
index 460a6b6c954..69e791f0dd9 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp
@@ -378,7 +378,7 @@ void ObjectNodeInstance::reparent(const ObjectNodeInstance::Pointer &oldParentIn
 QVariant ObjectNodeInstance::convertSpecialCharacter(const QVariant& value) const
 {
     QVariant specialCharacterConvertedValue = value;
-    if (value.typeId() == QVariant::String) {
+    if (value.typeId() == QMetaType::QString) {
         QString string = value.toString();
         string.replace(QLatin1String("\\n"), QLatin1String("\n"));
         string.replace(QLatin1String("\\t"), QLatin1String("\t"));
@@ -476,7 +476,7 @@ void ObjectNodeInstance::setPropertyVariant(const PropertyName &name, const QVar
 
 
     QVariant oldValue = property.read();
-    if (oldValue.typeId() == QVariant::Url) {
+    if (oldValue.typeId() == QMetaType::QUrl) {
         QUrl url = oldValue.toUrl();
         QString path = url.toLocalFile();
         if (QFileInfo::exists(path) && nodeInstanceServer() && !path.isEmpty())
@@ -493,7 +493,7 @@ void ObjectNodeInstance::setPropertyVariant(const PropertyName &name, const QVar
         qDebug() << "ObjectNodeInstance.setPropertyVariant: Cannot be written: " << object() << name << adjustedValue;
 
     QVariant newValue = property.read();
-    if (newValue.typeId() == QVariant::Url) {
+    if (newValue.typeId() == QMetaType::QUrl) {
         QUrl url = newValue.toUrl();
         QString path = url.toLocalFile();
         if (QFileInfo::exists(path) && nodeInstanceServer() && !path.isEmpty())
@@ -583,7 +583,7 @@ void ObjectNodeInstance::refreshProperty(const PropertyName &name)
     else
         property.write(resetValue(name));
 
-    if (oldValue.typeId() == QVariant::Url) {
+    if (oldValue.typeId() == QMetaType::QUrl) {
         QByteArray key = oldValue.toUrl().toEncoded(QUrl::UrlFormattingOption(0x100));
         QString pixmapKey = QString::fromUtf8(key.constData(), key.size());
         QPixmapCache::remove(pixmapKey);
@@ -628,7 +628,7 @@ QVariant ObjectNodeInstance::property(const PropertyName &name) const
         return QVariant::fromValue<Enumeration>(Enumeration(me.scope(), me.valueToKey(value.toInt())));
     }
 
-    if (property.propertyType() == QVariant::Url) {
+    if (property.propertyType() == QMetaType::QUrl) {
         QUrl url = property.read().toUrl();
         if (url.isEmpty())
             return QVariant();
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5import3dnodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5import3dnodeinstanceserver.cpp
index 978fcbe8f65..c6875b71d10 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5import3dnodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5import3dnodeinstanceserver.cpp
@@ -22,6 +22,7 @@
 #ifdef QUICK3D_MODULE
 #include <private/qquick3dnode_p.h>
 #include <private/qquick3dviewport_p.h>
+#include <private/qquick3dcamera_p.h>
 #include <private/qquick3dperspectivecamera_p.h>
 #endif
 
@@ -248,9 +249,9 @@ void Qt5Import3dNodeInstanceServer::collectItemChangesAndSendChangeCommands()
 
     if (!inFunction) {
         inFunction = true;
-
+#ifdef QUICK3D_MODULE
         QQuickDesignerSupport::polishItems(quickWindow());
-
+#endif
         render();
 
         inFunction = false;
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5import3dnodeinstanceserver.h b/src/tools/qml2puppet/qml2puppet/instances/qt5import3dnodeinstanceserver.h
index 539d33f27e9..ceebd9cfa3f 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5import3dnodeinstanceserver.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5import3dnodeinstanceserver.h
@@ -3,6 +3,9 @@
 
 #pragma once
 
+#ifdef QUICK3D_MODULE
+#include "generalhelper.h"
+#endif
 #include "qt5nodeinstanceserver.h"
 
 #ifdef QUICK3D_MODULE
diff --git a/src/tools/qml2puppet/qmlprivategate/qmlprivategate.cpp b/src/tools/qml2puppet/qmlprivategate/qmlprivategate.cpp
index 096ac362441..6897a23973b 100644
--- a/src/tools/qml2puppet/qmlprivategate/qmlprivategate.cpp
+++ b/src/tools/qml2puppet/qmlprivategate/qmlprivategate.cpp
@@ -604,7 +604,7 @@ static QString qmlDesignerRCPath()
 
 QVariant fixResourcePaths(const QVariant &value)
 {
-    if (value.typeId() == QVariant::Url) {
+    if (value.typeId() == QMetaType::QUrl) {
         const QUrl url = value.toUrl();
         if (url.scheme() == QLatin1String("qrc")) {
             const QString path = QLatin1String("qrc:") +  url.path();
@@ -625,7 +625,7 @@ QVariant fixResourcePaths(const QVariant &value)
             }
         }
     }
-    if (value.typeId() == QVariant::String) {
+    if (value.typeId() == QMetaType::QString) {
         const QString str = value.toString();
         if (str.contains(QLatin1String("qrc:"))) {
             if (!qmlDesignerRCPath().isEmpty()) {
diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp
index 037cf3c5e5c..0028c5e63c7 100644
--- a/src/tools/sdktool/addkitoperation.cpp
+++ b/src/tools/sdktool/addkitoperation.cpp
@@ -190,7 +190,7 @@ bool AddKitOperation::setArguments(const QStringList &args)
             ++i; // skip next;
 
             const QString tmp = current.mid(2);
-            const QString tmp2 = tmp.mid(0, tmp.count() - 9 /* toolchain */);
+            const QString tmp2 = tmp.mid(0, tmp.size() - 9 /* toolchain */);
             const QString lang = tmp2.isEmpty() ? QString("Cxx") : tmp2;
 
             if (next.isEmpty()) {
diff --git a/tests/auto/android/tst_avdmanageroutputparser.cpp b/tests/auto/android/tst_avdmanageroutputparser.cpp
index a41022ec5d9..e65a2bb15a4 100644
--- a/tests/auto/android/tst_avdmanageroutputparser.cpp
+++ b/tests/auto/android/tst_avdmanageroutputparser.cpp
@@ -80,10 +80,9 @@ void tst_AvdManagerOutputParser::parse()
     QFETCH(AndroidDeviceInfoList, output);
     QFETCH(Utils::FilePaths, errorPaths);
 
-    Utils::FilePaths avdErrorPaths;
-    const auto result = parseAvdList(input, &avdErrorPaths);
-    QCOMPARE(result, output);
-    QCOMPARE(avdErrorPaths, errorPaths);
+    const auto result = parseAvdList(input);
+    QCOMPARE(result.avdList, output);
+    QCOMPARE(result.errorPaths, errorPaths);
 }
 
 QTEST_GUILESS_MAIN(tst_AvdManagerOutputParser)
diff --git a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
index 82b5cba5b19..12c3c528526 100644
--- a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
+++ b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
@@ -107,6 +107,9 @@ private Q_SLOTS:
     void shiftWithinInitializer();
     void lambdaWithReturnType();
     void structuredBinding();
+    void subscriptOperatorInFunctionCall();
+    void statementMacros();
+    void tryCatchClause();
 };
 
 struct Line {
@@ -2199,6 +2202,75 @@ void tst_CodeFormatter::structuredBinding()
     checkIndent(data);
 }
 
+void tst_CodeFormatter::subscriptOperatorInFunctionCall()
+{
+    QList<Line> data;
+    data << Line("int main() {")
+         << Line("    func(array[0],")
+         << Line("    ~    0);")
+         << Line("    func(array[i],")
+         << Line("    ~    i);")
+         << Line("}")
+        ;
+    checkIndent(data);
+}
+
+void tst_CodeFormatter::statementMacros()
+{
+    QList<Line> data;
+    data << Line("MY_MACRO")
+         << Line("template<int n = 0>")
+         << Line("~       class C;");
+    checkIndent(data);
+
+    data.clear();
+    CppCodeStyleSettings settings;
+    settings.statementMacros << "MY_MACRO";
+    data << Line("MY_MACRO")
+         << Line("template<int n = 0>")
+         << Line("class C;");
+    checkIndent(data, settings);
+}
+
+void tst_CodeFormatter::tryCatchClause()
+{
+    CppCodeStyleSettings settings;
+    settings.indentFunctionBody = true;
+    settings.indentFunctionBraces = false;
+    settings.indentBlockBody = false;
+    settings.indentBlockBraces = true;
+    QList<Line> data;
+    data << Line("int main()")
+         << Line("{")
+         << Line("    try")
+         << Line("        {")
+         << Line("        throw;")
+         << Line("        }")
+         << Line("    catch (const E &e)")
+         << Line("        {")
+         << Line("        handle(e);")
+         << Line("        }")
+         << Line("    catch (...)")
+         << Line("        {")
+         << Line("        handle();")
+         << Line("        }")
+         << Line("}");
+    checkIndent(data, settings);
+
+    data.clear();
+    data << Line("int main()")
+         << Line("{")
+         << Line("    try {")
+         << Line("        throw;")
+         << Line("    } catch (const E &e) {")
+         << Line("        handle(e);")
+         << Line("    } catch (...) {")
+         << Line("        handle();")
+         << Line("    }")
+         << Line("}");
+    checkIndent(data);
+}
+
 QTEST_GUILESS_MAIN(tst_CodeFormatter)
 
 #include "tst_codeformatter.moc"
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index 55ae944ef69..473c08f3b2c 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -1171,6 +1171,7 @@ private:
     bool m_isQnxGdb = false;
     bool m_useGLibCxxDebug = false;
     int m_totalDumpTime = 0;
+    int m_totalInnerTime = 0;
 };
 
 void tst_Dumpers::initTestCase()
@@ -1199,7 +1200,28 @@ void tst_Dumpers::initTestCase()
     if (qEnvironmentVariableIntValue("QTC_USE_CMAKE_FOR_TEST"))
         m_buildSystem = BuildSystem::CMake;
 
+    QProcess qmake;
+    qmake.start(m_qmakeBinary, {"--version"});
+    QVERIFY(qmake.waitForFinished());
+    QByteArray output = qmake.readAllStandardOutput();
+    QByteArray error = qmake.readAllStandardError();
+    int pos0 = output.indexOf("Qt version");
+    if (pos0 == -1) {
+        qCDebug(lcDumpers).noquote() << "Output: " << output;
+        qCDebug(lcDumpers).noquote() << "Error: " << error;
+        QVERIFY(false);
+    }
+    pos0 += 11;
+    int pos1 = output.indexOf('.', pos0 + 1);
+    int major = output.mid(pos0, pos1++ - pos0).toInt();
+    int pos2 = output.indexOf('.', pos1 + 1);
+    int minor = output.mid(pos1, pos2++ - pos1).toInt();
+    int pos3 = output.indexOf(' ', pos2 + 1);
+    int patch = output.mid(pos2, pos3++ - pos2).toInt();
+    m_qtVersion = 0x10000 * major + 0x100 * minor + patch;
+
     qCDebug(lcDumpers) << "QMake              : " << m_qmakeBinary;
+    qCDebug(lcDumpers) << "Qt Version         : " << m_qtVersion;
     qCDebug(lcDumpers) << "Use CMake          : " << (m_buildSystem == BuildSystem::CMake) << int(m_buildSystem);
 
     m_useGLibCxxDebug = qgetenv("QTC_USE_GLIBCXXDEBUG_FOR_TEST").toInt();
@@ -1343,7 +1365,9 @@ void tst_Dumpers::cleanup()
 
 void tst_Dumpers::cleanupTestCase()
 {
-    qCDebug(lcDumpers) << "Dumpers total: " << QTime::fromMSecsSinceStartOfDay(m_totalDumpTime);
+    qCDebug(lcDumpers) << QTime::fromMSecsSinceStartOfDay(m_totalDumpTime);
+    qCDebug(lcDumpers, "TotalOuter: %5d", m_totalDumpTime);
+    qCDebug(lcDumpers, "TotalInner: %5d", m_totalInnerTime);
 }
 
 void tst_Dumpers::dumper()
@@ -1378,27 +1402,6 @@ void tst_Dumpers::dumper()
     QByteArray error;
 
     if (data.neededQtVersion.isRestricted) {
-        QProcess qmake;
-        qmake.setWorkingDirectory(t->buildPath);
-        qmake.start(m_qmakeBinary, {"--version"});
-        QVERIFY(qmake.waitForFinished());
-        output = qmake.readAllStandardOutput();
-        error = qmake.readAllStandardError();
-        int pos0 = output.indexOf("Qt version");
-        if (pos0 == -1) {
-            qCDebug(lcDumpers).noquote() << "Output: " << output;
-            qCDebug(lcDumpers).noquote() << "Error: " << error;
-            QVERIFY(false);
-        }
-        pos0 += 11;
-        int pos1 = output.indexOf('.', pos0 + 1);
-        int major = output.mid(pos0, pos1++ - pos0).toInt();
-        int pos2 = output.indexOf('.', pos1 + 1);
-        int minor = output.mid(pos1, pos2++ - pos1).toInt();
-        int pos3 = output.indexOf(' ', pos2 + 1);
-        int patch = output.mid(pos2, pos3++ - pos2).toInt();
-        m_qtVersion = 0x10000 * major + 0x100 * minor + patch;
-
         if (data.neededQtVersion.min > m_qtVersion)
             MSKIP_SINGLE(QByteArray("Need minimum Qt version "
                 + QByteArray::number(data.neededQtVersion.min, 16)));
@@ -1790,6 +1793,7 @@ void tst_Dumpers::dumper()
                 "python theDumper.fetchVariables({" + dumperOptions +
                     "'token':2,'fancy':1,'forcens':1,"
                     "'autoderef':1,'dyntype':1,'passexceptions':1,"
+                    "'qtversion':" + QString::number(m_qtVersion) + ",'qtnamespace':'',"
                     "'testing':1,'qobjectnames':1,"
                     "'expanded':{" + expandedq + "}})\n";
 
@@ -1813,6 +1817,7 @@ void tst_Dumpers::dumper()
                 "'token':2,'fancy':1,'forcens':1,"
                 "'autoderef':1,'dyntype':1,'passexceptions':0,"
                 "'testing':1,'qobjectnames':1,"
+                "'qtversion':" + QString::number(m_qtVersion) + ",'qtnamespace':'',"
                 "'expanded':{" + expandedq + "}})\n"
                 "q\n";
     } else if (m_debuggerEngine == LldbEngine) {
@@ -1837,6 +1842,7 @@ void tst_Dumpers::dumper()
                     "'fancy':1,'forcens':1,"
                     "'autoderef':1,'dyntype':1,'passexceptions':1,"
                     "'testing':1,'qobjectnames':1,"
+                    "'qtversion':" + QString::number(m_qtVersion) + ",'qtnamespace':'',"
                     "'expanded':{" + expandedq + "}})\n"
                "quit\n";
 
@@ -1859,7 +1865,10 @@ void tst_Dumpers::dumper()
     dumperTimer.start();
     debugger.write(cmds.toLocal8Bit());
     QVERIFY(debugger.waitForFinished());
-    m_totalDumpTime += dumperTimer.elapsed();
+    const int elapsed = dumperTimer.elapsed();
+    //< QTime::fromMSecsSinceStartOfDay(elapsed);
+    qCDebug(lcDumpers, "CaseOuter: %5d", elapsed);
+    m_totalDumpTime += elapsed;
     output = debugger.readAllStandardOutput();
     QByteArray fullOutput = output;
     //qCDebug(lcDumpers) << "stdout: " << output;
@@ -1890,6 +1899,9 @@ void tst_Dumpers::dumper()
 
         actual.fromStringMultiple(QString::fromLocal8Bit(contents));
         context.nameSpace = actual["qtnamespace"].data();
+        int runtime = actual["runtime"].data().toFloat() * 1000;
+        qCDebug(lcDumpers, "CaseInner: %5d", runtime);
+        m_totalInnerTime += runtime;
         actual = actual["data"];
         //qCDebug(lcDumpers) << "FOUND NS: " << context.nameSpace;
 
@@ -1913,7 +1925,13 @@ void tst_Dumpers::dumper()
         if (context.nameSpace == "::")
             context.nameSpace.clear();
         contents.replace("\\\"", "\"");
-        actual.fromString(QString::fromLocal8Bit(contents));
+        actual.fromStringMultiple(QString::fromLocal8Bit(contents));
+        int runtime = actual["runtime"].data().toFloat() * 1000;
+        qCDebug(lcDumpers, "CaseInner: %5d", runtime);
+        m_totalInnerTime += runtime;
+        actual = actual["data"];
+        //qCDebug(lcDumpers).noquote() << "\nACTUAL: " << actual.toString() << "\nXYYY";
+
     } else {
         QByteArray localsAnswerStart("<qtcreatorcdbext>|R|42|");
         QByteArray locals("|script|");
@@ -1931,6 +1949,9 @@ void tst_Dumpers::dumper()
         } while (localsBeginPos != -1);
         actual.fromString(QString::fromLocal8Bit(contents));
         context.nameSpace = actual["result"]["qtnamespace"].data();
+        int runtime = actual["result"]["runtime"].data().toFloat() * 1000;
+        qCDebug(lcDumpers, "CaseInner: %5d", runtime);
+        m_totalInnerTime += runtime;
         actual = actual["result"]["data"];
     }
 
@@ -1967,8 +1988,8 @@ void tst_Dumpers::dumper()
 
     auto test = [&](const Check &check, bool *removeIt, bool single) {
         if (!check.matches(m_debuggerEngine, m_debuggerVersion, context)) {
-            if (single)
-                qCDebug(lcDumpers) << "SKIPPING NON-MATCHING TEST " << check;
+            //if (single)
+            //    qCDebug(lcDumpers) << "SKIPPING NON-MATCHING TEST " << check;
             return true; // we have not failed
         }
 
@@ -2071,22 +2092,24 @@ void tst_Dumpers::dumper()
         }
     }
 
+    int pos1 = 0;
+    int pos2 = -1;
+    while (true) {
+        pos1 = fullOutput.indexOf("bridgemessage={msg=", pos2 + 1);
+        if (pos1 == -1)
+            break;
+        pos1 += 20;
+        pos2 = fullOutput.indexOf("\"}", pos1 + 1);
+        if (pos2 == -1)
+            break;
+        qCDebug(lcDumpers) << "MSG: " << fullOutput.mid(pos1, pos2 - pos1);
+    }
+
     if (ok) {
         m_keepTemp = false;
     } else {
         local.forAllChildren([](WatchItem *item) { qCDebug(lcDumpers) << item->internalName(); });
 
-        int pos1 = 0, pos2 = -1;
-        while (true) {
-            pos1 = fullOutput.indexOf("bridgemessage={msg=", pos2 + 1);
-            if (pos1 == -1)
-                break;
-            pos1 += 20;
-            pos2 = fullOutput.indexOf("\"}", pos1 + 1);
-            if (pos2 == -1)
-                break;
-            qCDebug(lcDumpers) << "MSG: " << fullOutput.mid(pos1, pos2 - pos1 - 1);
-        }
         qCDebug(lcDumpers).noquote() << "CONTENTS     : " << contents;
         qCDebug(lcDumpers).noquote() << "FULL OUTPUT  : " << fullOutput.data();
         qCDebug(lcDumpers) << "Qt VERSION   : " << QString::number(context.qtVersion, 16);
@@ -4374,7 +4397,7 @@ void tst_Dumpers::dumper_data()
                + NetworkProfile()
 
                + Check("ha", ValuePattern(".*127.0.0.1.*"), "@QHostAddress")
-               + Check("ha.a", "2130706433", TypeDef("unsigned int", "@quint32"))
+               + Check("ha.a", "2130706433", "@quint32")
                + Check("ha.ipString", ValuePattern(".*127.0.0.1.*"), "@QString")
                     % QtVersion(0, 0x50800)
                //+ Check("ha.protocol", "@QAbstractSocket::IPv4Protocol (0)",
@@ -4383,7 +4406,7 @@ void tst_Dumpers::dumper_data()
                //        "@QAbstractSocket::NetworkLayerProtocol") % LldbEngine
                + Check("ha.scopeId", "\"\"", "@QString")
                + Check("ha1", ValuePattern(".*127.0.0.1.*"), "@QHostAddress")
-               + Check("ha1.a", "2130706433", TypeDef("unsigned int", "@quint32"))
+               + Check("ha1.a", "2130706433", "@quint32")
                + Check("ha1.ipString", "\"127.0.0.1\"", "@QString")
                     % QtVersion(0, 0x50800)
                //+ Check("ha1.protocol", "@QAbstractSocket::IPv4Protocol (0)",
@@ -6226,15 +6249,19 @@ void tst_Dumpers::dumper_data()
     QTest::newRow("Bitfields")
             << Data("",
 
-                    "enum E { V1, V2 };"
+                    "typedef int gint;\n"
+                    "typedef unsigned int guint;\n"
+                    "enum E { V1, V2 };\n"
                     "struct S\n"
                     "{\n"
-                    "    S() : front(13), x(2), y(3), z(39), e(V2), c(1), b(0), f(5),"
+                    "    S() : front(13), x(2), y(3), z(39), t1(1), t2(1), e(V2), c(1), b(0), f(5),"
                     "          g(46), h(47), d(6), i(7) {}\n"
                     "    unsigned int front;\n"
                     "    unsigned int x : 3;\n"
                     "    unsigned int y : 4;\n"
                     "    unsigned int z : 18;\n"
+                    "    gint t1 : 2;\n"
+                    "    guint t2 : 2;\n"
                     "    E e : 3;\n"
                     "    bool c : 1;\n"
                     "    bool b;\n"
@@ -6257,7 +6284,7 @@ void tst_Dumpers::dumper_data()
                + Check("s.x", "2", "unsigned int : 3") % NoCdbEngine
                + Check("s.y", "3", "unsigned int : 4") % NoCdbEngine
                + Check("s.z", "39", "unsigned int : 18") % NoCdbEngine
-               + Check("s.e", "V2 (1)", "E : 3") % GdbEngine
+               // + Check("s.e", "V2 (1)", "E : 3") % GdbEngine    FIXME
                + Check("s.g", "46", "char : 7") % GdbEngine
                + Check("s.h", "47", "char") % GdbEngine
                + Check("s.x", "2", "unsigned int") % CdbEngine
@@ -6267,7 +6294,7 @@ void tst_Dumpers::dumper_data()
                + Check("s.e", "V2 (1)", TypePattern("main::[a-zA-Z0-9_]*::E")) % CdbEngine
 
                // checks for the "Expressions" view, GDB-only for now
-               + Watcher("watch.1", "s;s.b;s.c;s.f;s.d;s.i;s.x;s.y;s.z;s.e;s.g;s.h;s.front")
+               + Watcher("watch.1", "s;s.b;s.c;s.f;s.d;s.i;s.x;s.y;s.z;s.e;s.g;s.h;s.front;s.t1;s.t2")
                + Check("watch.1.0", "s", "", "S") % GdbEngine
                + Check("watch.1.1", "s.b", "0", "bool")  % GdbEngine
                + Check("watch.1.2", "s.c", "1", "bool") % GdbEngine
@@ -6280,7 +6307,9 @@ void tst_Dumpers::dumper_data()
                + Check("watch.1.9", "s.e", "V2 (1)", "E") % GdbEngine
                + Check("watch.1.10", "s.g", "46", "char") % GdbEngine
                + Check("watch.1.11", "s.h", "47", "char") % GdbEngine
-               + Check("watch.1.12", "s.front", "13", "unsigned int") % GdbEngine;
+               + Check("watch.1.12", "s.front", "13", "unsigned int") % GdbEngine
+               + Check("watch.1.13", "s.t1", "1", "gint") % GdbEngine
+               + Check("watch.1.14", "s.t2", "1", "guint") % GdbEngine;
 
 
     QTest::newRow("Bitfield2")
@@ -7348,11 +7377,21 @@ void tst_Dumpers::dumper_data()
                     "Base *b = &d;\n",
 
                     "&d, &b")
-
                + Check("b.@1.a", "a", "21", "int")
                + Check("b.b", "b", "42", "int");
 
 
+    // https://bugreports.qt.io/browse/QTCREATORBUG-18450
+    QTest::newRow("Bug18450")
+            << Data("using quint128 = __uint128_t;\n",
+
+                    "quint128 x = 42;\n",
+
+                    "&x")
+
+                + NoCdbEngine
+                + Check("x", "42", "quint128");
+
 
     // https://bugreports.qt.io/browse/QTCREATORBUG-17823
     QTest::newRow("Bug17823")
@@ -7557,25 +7596,24 @@ void tst_Dumpers::dumper_data()
                             {"tt.@2.@1.v", "45", "int"}})
 
                 + Check("dd.@1.@1.a", "1", "int") // B::a
-                // C::a - fails with command line LLDB 3.8/360.x
-                + Check("dd.@2.@1.a", "1", "int") % NoLldbEngine // C::a
+                + Check("dd.@2.@1.a", "1", "int")
                 + Check("dd.@1.b", "2", "int")
                 + Check("dd.@2.c", "3", "int")
                 + Check("dd.d", "4", "int")
 
                 + Check("dp.@1.@1.a", "1", "int") // B::a
-                + Check("dp.@2.@1.a", "1", "int") % NoLldbEngine // C::a
+                + Check("dp.@2.@1.a", "1", "int")
                 + Check("dp.@1.b", "2", "int")
                 + Check("dp.@2.c", "3", "int")
                 + Check("dp.d", "4", "int")
 
                 + Check("dr.@1.@1.a", "1", "int") // B::a
-                + Check("dr.@2.@1.a", "1", "int") % NoLldbEngine // C::a
+                + Check("dr.@2.@1.a", "1", "int")
                 + Check("dr.@1.b", "2", "int")
                 + Check("dr.@2.c", "3", "int")
                 + Check("dr.d", "4", "int")
 
-                + Check("array.0.val", "44", "int") % NoLldbEngine;
+                + Check("array.0.val", "44", "int");
 
 
     QTest::newRow("Gdb13393")
@@ -7615,8 +7653,7 @@ void tst_Dumpers::dumper_data()
 
                    "&d, &s, &ptrConst, &ref, &refConst, &ptrToPtr, &sharedPtr")
 
-               + GdbEngine
-               + GdbVersion(70500)
+               + NoCdbEngine
                + BoostProfile()
 
                + Check("d", "", "Derived")
@@ -8323,11 +8360,13 @@ void tst_Dumpers::dumper_data()
 
 
     QTest::newRow("Sql")
-            << Data("#include <QSqlField>\n"
+            << Data("#include <QCoreApplication>\n"
+                    "#include <QSqlField>\n"
                     "#include <QSqlDatabase>\n"
                     "#include <QSqlQuery>\n"
                     "#include <QSqlRecord>\n",
 
+                    "QCoreApplication app(argc, argv);\n"
                     "QSqlDatabase db = QSqlDatabase::addDatabase(\"QSQLITE\");\n"
                     "db.setDatabaseName(\":memory:\");\n"
                     "Q_ASSERT(db.open());\n"
diff --git a/tests/auto/environment/tst_environment.cpp b/tests/auto/environment/tst_environment.cpp
index 3cf9c127a22..58ee3a72a51 100644
--- a/tests/auto/environment/tst_environment.cpp
+++ b/tests/auto/environment/tst_environment.cpp
@@ -1,6 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
+#include <utils/algorithm.h>
 #include <utils/environment.h>
 
 #include <QtTest>
@@ -263,10 +264,18 @@ void tst_Environment::incrementalChanges()
 {
     const Environment origEnv({{"VAR1", "VALUE1"}, {"VAR2", "VALUE2"}, {"PATH", "/usr/bin"}});
     const EnvironmentItems changes({
+        {"VAR1", QString(), EnvironmentItem::Comment},
         {"VAR1", QString(), EnvironmentItem::Unset},
         {"VAR2", "VALUE2", EnvironmentItem::SetDisabled},
+        {"PATH+=/bin", QString(), EnvironmentItem::Comment},
         {"PATH", "/usr/local/bin", EnvironmentItem::Append},
-        {"PATH", "/tmp", EnvironmentItem::Prepend}});
+        {"PATH", "/tmp", EnvironmentItem::Prepend},
+        {"PATH=/opt/bin", QString(), EnvironmentItem::Comment}});
+
+    const QStringList changesStringList = EnvironmentItem::toStringList(changes);
+    const int comments = Utils::count(changesStringList,
+                                      [](const QString &line) { return line.startsWith("##"); });
+    QCOMPARE(comments, 3);
 
     // Check values after change application.
     Environment newEnv = origEnv;
@@ -290,7 +299,7 @@ void tst_Environment::incrementalChanges()
     QCOMPARE(newEnv2, origEnv);
 
     // Check conversion round-trips.
-    QCOMPARE(EnvironmentItem::fromStringList(EnvironmentItem::toStringList(changes)), changes);
+    QCOMPARE(EnvironmentItem::fromStringList(changesStringList), changes);
     QCOMPARE(EnvironmentItem::fromStringList(EnvironmentItem::toStringList(diff)), diff);
     QCOMPARE(EnvironmentItem::fromStringList(EnvironmentItem::toStringList(reverseDiff)), reverseDiff);
     QCOMPARE(EnvironmentItem::itemsFromVariantList(EnvironmentItem::toVariantList(changes)), changes);
@@ -368,9 +377,12 @@ void tst_Environment::pathChanges()
     else
         environment.appendOrSet(variable, value);
 
-    qDebug() << "Actual  :" << environment.toStringList();
-    qDebug() << "Expected:" << expected.toStringList();
-    QCOMPARE(environment, expected);
+    const bool envEqualsExpected = environment == expected;
+    if (!envEqualsExpected) {
+        qDebug() << "Actual  :" << environment.toStringList();
+        qDebug() << "Expected:" << expected.toStringList();
+    }
+    QVERIFY(envEqualsExpected);
 }
 
 void tst_Environment::find_data()
diff --git a/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp b/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp
index e57e71c533e..35ed6078139 100644
--- a/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp
+++ b/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp
@@ -47,9 +47,9 @@ class MyClass11 : public MyClass1
     Q_OBJECT
 };
 
-static QString pluginFolder(const QLatin1String &folder)
+static Utils::FilePath pluginFolder(const QLatin1String &folder)
 {
-    return QLatin1String(PLUGINMANAGER_TESTS_DIR) + QLatin1String("/") + folder;
+    return Utils::FilePath::fromUserInput(QLatin1String(PLUGINMANAGER_TESTS_DIR)) / folder;
 }
 
 void tst_PluginManager::init()
@@ -138,9 +138,9 @@ void tst_PluginManager::getObject()
 
 void tst_PluginManager::circularPlugins()
 {
-    PluginManager::setPluginPaths(QStringList() << pluginFolder(QLatin1String("circularplugins")));
+    PluginManager::setPluginPaths({pluginFolder(QLatin1String("circularplugins"))});
     PluginManager::loadPlugins();
-    const QVector<PluginSpec *> plugins = PluginManager::plugins();
+    const PluginSpecs plugins = PluginManager::plugins();
     QCOMPARE(plugins.count(), 3);
     for (PluginSpec *spec : plugins) {
         if (spec->name() == "plugin1") {
@@ -160,11 +160,11 @@ void tst_PluginManager::circularPlugins()
 
 void tst_PluginManager::correctPlugins1()
 {
-    PluginManager::setPluginPaths(QStringList() << pluginFolder(QLatin1String("correctplugins1")));
+    PluginManager::setPluginPaths({pluginFolder(QLatin1String("correctplugins1"))});
     PluginManager::loadPlugins();
     bool specError = false;
     bool runError = false;
-    const QVector<PluginSpec *> plugins = PluginManager::plugins();
+    const PluginSpecs plugins = PluginManager::plugins();
     for (PluginSpec *spec : plugins) {
         if (spec->hasError()) {
             qDebug() << spec->filePath();
diff --git a/tests/auto/extensionsystem/pluginspec/CMakeLists.txt b/tests/auto/extensionsystem/pluginspec/CMakeLists.txt
index ad91750f287..efb94786d0d 100644
--- a/tests/auto/extensionsystem/pluginspec/CMakeLists.txt
+++ b/tests/auto/extensionsystem/pluginspec/CMakeLists.txt
@@ -5,7 +5,7 @@ add_qtc_test(tst_pluginspec
     PLUGIN_DIR="${CMAKE_CURRENT_BINARY_DIR}"
     PLUGINSPEC_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
     DLL_INFIX="$<$<CONFIG:Debug>:d>"
-  DEPENDS ExtensionSystem
+  DEPENDS ExtensionSystem Utils
   SOURCES
     tst_pluginspec.cpp
 )
diff --git a/tests/auto/extensionsystem/pluginspec/test.qbs b/tests/auto/extensionsystem/pluginspec/test.qbs
index b8196f93e67..56748fde126 100644
--- a/tests/auto/extensionsystem/pluginspec/test.qbs
+++ b/tests/auto/extensionsystem/pluginspec/test.qbs
@@ -4,6 +4,8 @@ QtcAutotest {
     name: "ExtensionSystem pluginspec autotest"
     Depends { name: "Aggregation" }
     Depends { name: "ExtensionSystem" }
+    Depends { name: "Utils" }
+
     Group {
         name: "Sources"
         files: "tst_pluginspec.cpp"
diff --git a/tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong2.json b/tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong2.json
index 2fd9df4d5d9..63a7fc5c551 100644
--- a/tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong2.json
+++ b/tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong2.json
@@ -11,6 +11,7 @@
             "end of terms"
         ],
         "Description" : [
+            "This spec is broken because no name is set.",
             "This plugin is just a test.",
             "    it demonstrates the great use of the plugin spec."
         ],
diff --git a/tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong3.json b/tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong3.json
index 0b053f60140..7c43ef41d26 100644
--- a/tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong3.json
+++ b/tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong3.json
@@ -11,6 +11,7 @@
             "end of terms"
         ],
         "Description" : [
+            "This spec is wrong because no version is set.",
             "This plugin is just a test.",
             "    it demonstrates the great use of the plugin spec."
         ],
diff --git a/tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong4.json b/tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong4.json
index c3a0d26922e..c8e1dd53d9f 100644
--- a/tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong4.json
+++ b/tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong4.json
@@ -12,6 +12,7 @@
             "end of terms"
         ],
         "Description" : [
+            "This spec is wrong because the first dependency has no name.",
             "This plugin is just a test.",
             "    it demonstrates the great use of the plugin spec."
         ],
diff --git a/tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong5.json b/tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong5.json
index bdb095b3420..680ec4002ac 100644
--- a/tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong5.json
+++ b/tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong5.json
@@ -12,6 +12,7 @@
             "end of terms"
         ],
         "Description" : [
+            "This spec is wrong because the first dependencies version is invalid.",
             "This plugin is just a test.",
             "    it demonstrates the great use of the plugin spec."
         ],
diff --git a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
index 762142b95ee..ed8476a0b09 100644
--- a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
+++ b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
@@ -1,10 +1,9 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include <extensionsystem/pluginspec.h>
-#include <extensionsystem/pluginspec_p.h>
-#include <extensionsystem/pluginmanager_p.h>
 #include <extensionsystem/pluginmanager.h>
+#include <extensionsystem/pluginmanager_p.h>
+#include <extensionsystem/pluginspec.h>
 
 #include <QJsonDocument>
 #include <QJsonObject>
@@ -15,6 +14,8 @@
 
 using namespace ExtensionSystem;
 
+static const Utils::FilePath PLUGIN_DIR_PATH = Utils::FilePath::fromUserInput(PLUGIN_DIR);
+
 static QJsonObject metaData(const QString &fileName)
 {
     QFile f(fileName);
@@ -85,238 +86,253 @@ void tst_PluginSpec::cleanupTestCase()
 
 void tst_PluginSpec::read()
 {
-    Internal::PluginSpecPrivate spec(0);
-    QCOMPARE(spec.state, PluginSpec::Invalid);
+    CppPluginSpec spec;
+    QCOMPARE(spec.state(), PluginSpec::Invalid);
     QVERIFY(spec.readMetaData(metaData("testspecs/spec1.json")));
-    QVERIFY(!spec.hasError);
-    QVERIFY(spec.errorString.isEmpty());
-    QCOMPARE(spec.name, QString("test"));
-    QCOMPARE(spec.version, QString("1.0.1"));
-    QCOMPARE(spec.compatVersion, QString("1.0.0"));
-    QCOMPARE(spec.required, false);
-    QCOMPARE(spec.experimental, false);
-    QCOMPARE(spec.enabledBySettings, true);
-    QCOMPARE(spec.vendor, QString("The Qt Company Ltd"));
-    QCOMPARE(spec.copyright, QString("(C) 2015 The Qt Company Ltd"));
-    QCOMPARE(spec.license, QString("This is a default license bla\nblubbblubb\nend of terms"));
-    QCOMPARE(spec.description, QString("This plugin is just a test."));
+    QVERIFY(!spec.hasError());
+    QVERIFY(spec.errorString().isEmpty());
+    QCOMPARE(spec.name(), QString("test"));
+    QCOMPARE(spec.version(), QString("1.0.1"));
+    QCOMPARE(spec.compatVersion(), QString("1.0.0"));
+    QCOMPARE(spec.isRequired(), false);
+    QCOMPARE(spec.isExperimental(), false);
+    QCOMPARE(spec.isEnabledBySettings(), true);
+    QCOMPARE(spec.vendor(), QString("The Qt Company Ltd"));
+    QCOMPARE(spec.copyright(), QString("(C) 2015 The Qt Company Ltd"));
+    QCOMPARE(spec.license(), QString("This is a default license bla\nblubbblubb\nend of terms"));
+    QCOMPARE(spec.description(), QString("This plugin is just a test."));
     QCOMPARE(
-        spec.longDescription,
+        spec.longDescription(),
         QString(
             "This plugin is just a test.\n    it demonstrates the great use of the plugin spec."));
-    QCOMPARE(spec.url, QString("http://www.qt.io"));
+    QCOMPARE(spec.url(), QString("http://www.qt.io"));
     PluginDependency dep1;
     dep1.name = QString("SomeOtherPlugin");
     dep1.version = QString("2.3.0_2");
     PluginDependency dep2;
     dep2.name = QString("EvenOther");
     dep2.version = QString("1.0.0");
-    QCOMPARE(spec.dependencies, QVector<PluginDependency>() << dep1 << dep2);
+    QCOMPARE(spec.dependencies(), QVector<PluginDependency>() << dep1 << dep2);
 
     // test missing compatVersion behavior
     // and 'required' attribute
     QVERIFY(spec.readMetaData(metaData("testspecs/spec2.json")));
-    QCOMPARE(spec.version, QString("3.1.4_10"));
-    QCOMPARE(spec.compatVersion, QString("3.1.4_10"));
-    QCOMPARE(spec.required, true);
+    QCOMPARE(spec.version(), QString("3.1.4_10"));
+    QCOMPARE(spec.compatVersion(), QString("3.1.4_10"));
+    QCOMPARE(spec.isRequired(), true);
 }
 
 void tst_PluginSpec::readError()
 {
-    Internal::PluginSpecPrivate spec(0);
-    QCOMPARE(spec.state, PluginSpec::Invalid);
+    CppPluginSpec spec;
+    QCOMPARE(spec.state(), PluginSpec::Invalid);
     QVERIFY(!spec.readMetaData(metaData("non-existing-file.json")));
-    QCOMPARE(spec.state, PluginSpec::Invalid);
-    QVERIFY(!spec.hasError);
-    QVERIFY(spec.errorString.isEmpty());
+    QCOMPARE(spec.state(), PluginSpec::Invalid);
+    QVERIFY(!spec.hasError());
+    QVERIFY(spec.errorString().isEmpty());
     QVERIFY(spec.readMetaData(metaData("testspecs/spec_wrong2.json")));
-    QCOMPARE(spec.state, PluginSpec::Invalid);
-    QVERIFY(spec.hasError);
-    QVERIFY(!spec.errorString.isEmpty());
+    QCOMPARE(spec.state(), PluginSpec::Invalid);
+    QVERIFY(spec.hasError());
+    QVERIFY(!spec.errorString().isEmpty());
     QVERIFY(spec.readMetaData(metaData("testspecs/spec_wrong3.json")));
-    QCOMPARE(spec.state, PluginSpec::Invalid);
-    QVERIFY(spec.hasError);
-    QVERIFY(!spec.errorString.isEmpty());
+    QCOMPARE(spec.state(), PluginSpec::Invalid);
+    QVERIFY(spec.hasError());
+    QVERIFY(!spec.errorString().isEmpty());
     QVERIFY(spec.readMetaData(metaData("testspecs/spec_wrong4.json")));
-    QCOMPARE(spec.state, PluginSpec::Invalid);
-    QVERIFY(spec.hasError);
-    QVERIFY(!spec.errorString.isEmpty());
+    QCOMPARE(spec.state(), PluginSpec::Invalid);
+    QVERIFY(spec.hasError());
+    QVERIFY(!spec.errorString().isEmpty());
     QVERIFY(spec.readMetaData(metaData("testspecs/spec_wrong5.json")));
-    QCOMPARE(spec.state, PluginSpec::Invalid);
-    QVERIFY(spec.hasError);
-    QVERIFY(!spec.errorString.isEmpty());
+    QCOMPARE(spec.state(), PluginSpec::Invalid);
+    QVERIFY(spec.hasError());
+    QVERIFY(!spec.errorString().isEmpty());
 }
 
 void tst_PluginSpec::isValidVersion()
 {
-    QVERIFY(Internal::PluginSpecPrivate::isValidVersion("2"));
-    QVERIFY(Internal::PluginSpecPrivate::isValidVersion("53"));
-    QVERIFY(Internal::PluginSpecPrivate::isValidVersion("52_1"));
-    QVERIFY(Internal::PluginSpecPrivate::isValidVersion("3.12"));
-    QVERIFY(Internal::PluginSpecPrivate::isValidVersion("31.1_12"));
-    QVERIFY(Internal::PluginSpecPrivate::isValidVersion("31.1.0"));
-    QVERIFY(Internal::PluginSpecPrivate::isValidVersion("1.0.2_1"));
+    QVERIFY(PluginSpec::isValidVersion("2"));
+    QVERIFY(PluginSpec::isValidVersion("53"));
+    QVERIFY(PluginSpec::isValidVersion("52_1"));
+    QVERIFY(PluginSpec::isValidVersion("3.12"));
+    QVERIFY(PluginSpec::isValidVersion("31.1_12"));
+    QVERIFY(PluginSpec::isValidVersion("31.1.0"));
+    QVERIFY(PluginSpec::isValidVersion("1.0.2_1"));
 
-    QVERIFY(!Internal::PluginSpecPrivate::isValidVersion(""));
-    QVERIFY(!Internal::PluginSpecPrivate::isValidVersion("1..0"));
-    QVERIFY(!Internal::PluginSpecPrivate::isValidVersion("1.0_"));
-    QVERIFY(!Internal::PluginSpecPrivate::isValidVersion("1.0.0.0"));
+    QVERIFY(!PluginSpec::isValidVersion(""));
+    QVERIFY(!PluginSpec::isValidVersion("1..0"));
+    QVERIFY(!PluginSpec::isValidVersion("1.0_"));
+    QVERIFY(!PluginSpec::isValidVersion("1.0.0.0"));
 }
 
 void tst_PluginSpec::versionCompare()
 {
-    QVERIFY(Internal::PluginSpecPrivate::versionCompare("3", "3") == 0);
-    QVERIFY(Internal::PluginSpecPrivate::versionCompare("3.0.0", "3") == 0);
-    QVERIFY(Internal::PluginSpecPrivate::versionCompare("3.0", "3") == 0);
-    QVERIFY(Internal::PluginSpecPrivate::versionCompare("3.0.0_1", "3_1") == 0);
-    QVERIFY(Internal::PluginSpecPrivate::versionCompare("3.0_21", "3_21") == 0);
+    QVERIFY(PluginSpec::versionCompare("3", "3") == 0);
+    QVERIFY(PluginSpec::versionCompare("3.0.0", "3") == 0);
+    QVERIFY(PluginSpec::versionCompare("3.0", "3") == 0);
+    QVERIFY(PluginSpec::versionCompare("3.0.0_1", "3_1") == 0);
+    QVERIFY(PluginSpec::versionCompare("3.0_21", "3_21") == 0);
 
-    QVERIFY(Internal::PluginSpecPrivate::versionCompare("3", "1") > 0);
-    QVERIFY(Internal::PluginSpecPrivate::versionCompare("3", "1.0_12") > 0);
-    QVERIFY(Internal::PluginSpecPrivate::versionCompare("3_1", "3") > 0);
-    QVERIFY(Internal::PluginSpecPrivate::versionCompare("3.1.0_23", "3.1") > 0);
-    QVERIFY(Internal::PluginSpecPrivate::versionCompare("3.1_23", "3.1_12") > 0);
+    QVERIFY(PluginSpec::versionCompare("3", "1") > 0);
+    QVERIFY(PluginSpec::versionCompare("3", "1.0_12") > 0);
+    QVERIFY(PluginSpec::versionCompare("3_1", "3") > 0);
+    QVERIFY(PluginSpec::versionCompare("3.1.0_23", "3.1") > 0);
+    QVERIFY(PluginSpec::versionCompare("3.1_23", "3.1_12") > 0);
 
-    QVERIFY(Internal::PluginSpecPrivate::versionCompare("1", "3") < 0);
-    QVERIFY(Internal::PluginSpecPrivate::versionCompare("1.0_12", "3") < 0);
-    QVERIFY(Internal::PluginSpecPrivate::versionCompare("3", "3_1") < 0);
-    QVERIFY(Internal::PluginSpecPrivate::versionCompare("3.1", "3.1.0_23") < 0);
-    QVERIFY(Internal::PluginSpecPrivate::versionCompare("3.1_12", "3.1_23") < 0);
+    QVERIFY(PluginSpec::versionCompare("1", "3") < 0);
+    QVERIFY(PluginSpec::versionCompare("1.0_12", "3") < 0);
+    QVERIFY(PluginSpec::versionCompare("3", "3_1") < 0);
+    QVERIFY(PluginSpec::versionCompare("3.1", "3.1.0_23") < 0);
+    QVERIFY(PluginSpec::versionCompare("3.1_12", "3.1_23") < 0);
 }
 
 void tst_PluginSpec::provides()
 {
-    Internal::PluginSpecPrivate spec(0);
+    CppPluginSpec spec;
     QVERIFY(spec.readMetaData(metaData("testspecs/simplespec.json")));
-    QVERIFY(!spec.provides("SomeOtherPlugin", "2.2.3_9"));
-    QVERIFY(!spec.provides("MyPlugin", "2.2.3_10"));
-    QVERIFY(!spec.provides("MyPlugin", "2.2.4"));
-    QVERIFY(!spec.provides("MyPlugin", "2.3.11_1"));
-    QVERIFY(!spec.provides("MyPlugin", "2.3"));
-    QVERIFY(!spec.provides("MyPlugin", "3.0"));
-    QVERIFY(!spec.provides("MyPlugin", "1.9.9_99"));
-    QVERIFY(!spec.provides("MyPlugin", "1.9"));
-    QVERIFY(!spec.provides("MyPlugin", "0.9"));
-    QVERIFY(!spec.provides("MyPlugin", "1"));
 
-    QVERIFY(spec.provides("myplugin", "2.2.3_9"));
-    QVERIFY(spec.provides("MyPlugin", "2.2.3_9"));
-    QVERIFY(spec.provides("MyPlugin", "2.2.3_8"));
-    QVERIFY(spec.provides("MyPlugin", "2.2.3"));
-    QVERIFY(spec.provides("MyPlugin", "2.2.2"));
-    QVERIFY(spec.provides("MyPlugin", "2.1.2_10"));
-    QVERIFY(spec.provides("MyPlugin", "2.0_10"));
-    QVERIFY(spec.provides("MyPlugin", "2"));
+    QVERIFY(!spec.provides(&spec, {"SomeOtherPlugin", "2.2.3_9"}));
+    QVERIFY(!spec.provides(&spec, {"MyPlugin", "2.2.3_10"}));
+    QVERIFY(!spec.provides(&spec, {"MyPlugin", "2.2.4"}));
+    QVERIFY(!spec.provides(&spec, {"MyPlugin", "2.3.11_1"}));
+    QVERIFY(!spec.provides(&spec, {"MyPlugin", "2.3"}));
+    QVERIFY(!spec.provides(&spec, {"MyPlugin", "3.0"}));
+    QVERIFY(!spec.provides(&spec, {"MyPlugin", "1.9.9_99"}));
+    QVERIFY(!spec.provides(&spec, {"MyPlugin", "1.9"}));
+    QVERIFY(!spec.provides(&spec, {"MyPlugin", "0.9"}));
+    QVERIFY(!spec.provides(&spec, {"MyPlugin", "1"}));
+
+    QVERIFY(spec.provides(&spec, {"myplugin", "2.2.3_9"}));
+    QVERIFY(spec.provides(&spec, {"MyPlugin", "2.2.3_9"}));
+    QVERIFY(spec.provides(&spec, {"MyPlugin", "2.2.3_8"}));
+    QVERIFY(spec.provides(&spec, {"MyPlugin", "2.2.3"}));
+    QVERIFY(spec.provides(&spec, {"MyPlugin", "2.2.2"}));
+    QVERIFY(spec.provides(&spec, {"MyPlugin", "2.1.2_10"}));
+    QVERIFY(spec.provides(&spec, {"MyPlugin", "2.0_10"}));
+    QVERIFY(spec.provides(&spec, {"MyPlugin", "2"}));
 }
 
 void tst_PluginSpec::experimental()
 {
-    Internal::PluginSpecPrivate spec(0);
+    CppPluginSpec spec;
     QVERIFY(spec.readMetaData(metaData("testspecs/simplespec_experimental.json")));
-    QCOMPARE(spec.experimental, true);
-    QCOMPARE(spec.enabledBySettings, false);
+
+    QCOMPARE(spec.isExperimental(), true);
+    QCOMPARE(spec.isEnabledBySettings(), false);
 }
 
 void tst_PluginSpec::locationAndPath()
 {
-    Internal::PluginSpecPrivate spec(0);
-    QVERIFY(spec.read(QLatin1String(PLUGIN_DIR) + QLatin1String("/testplugin/") + libraryName(QLatin1String("test"))));
-    QCOMPARE(spec.location, QString(QLatin1String(PLUGIN_DIR) + QLatin1String("/testplugin")));
-    QCOMPARE(spec.filePath, QString(QLatin1String(PLUGIN_DIR) + QLatin1String("/testplugin/") + libraryName(QLatin1String("test"))));
+    Utils::expected_str<PluginSpec *> ps = readCppPluginSpec(
+        PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test")));
+    QVERIFY(ps);
+    CppPluginSpec *spec = static_cast<CppPluginSpec *>(ps.value());
+    QCOMPARE(spec->location(), PLUGIN_DIR_PATH / "testplugin");
+    QCOMPARE(spec->filePath(), PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test")));
 }
 
 void tst_PluginSpec::resolveDependencies()
 {
-    QVector<PluginSpec *> specs;
-    PluginSpec *spec1 = Internal::PluginManagerPrivate::createSpec();
+    PluginSpecs specs;
+    PluginSpec *spec1 = new CppPluginSpec();
     specs.append(spec1);
-    Internal::PluginSpecPrivate *spec1Priv = Internal::PluginManagerPrivate::privateSpec(spec1);
-    spec1Priv->readMetaData(metaData("testdependencies/spec1.json"));
-    spec1Priv->state = PluginSpec::Read; // fake read state for plugin resolving
+    spec1->readMetaData(metaData("testdependencies/spec1.json"));
+    spec1->setState(PluginSpec::Read); // fake read state for plugin resolving
 
-    PluginSpec *spec2 = Internal::PluginManagerPrivate::createSpec();
+    PluginSpec *spec2 = new CppPluginSpec();
     specs.append(spec2);
-    Internal::PluginSpecPrivate *spec2Priv = Internal::PluginManagerPrivate::privateSpec(spec2);
-    spec2Priv->readMetaData(metaData("testdependencies/spec2.json"));
-    spec2Priv->state = PluginSpec::Read; // fake read state for plugin resolving
+    spec2->readMetaData(metaData("testdependencies/spec2.json"));
+    spec2->setState(PluginSpec::Read); // fake read state for plugin resolving
 
-    PluginSpec *spec3 = Internal::PluginManagerPrivate::createSpec();
+    PluginSpec *spec3 = new CppPluginSpec();
     specs.append(spec3);
-    Internal::PluginSpecPrivate *spec3Priv = Internal::PluginManagerPrivate::privateSpec(spec3);
-    spec3Priv->readMetaData(metaData("testdependencies/spec3.json"));
-    spec3Priv->state = PluginSpec::Read; // fake read state for plugin resolving
+    spec3->readMetaData(metaData("testdependencies/spec3.json"));
+    spec3->setState(PluginSpec::Read); // fake read state for plugin resolving
 
-    PluginSpec *spec4 = Internal::PluginManagerPrivate::createSpec();
+    PluginSpec *spec4 = new CppPluginSpec();
     specs.append(spec4);
-    Internal::PluginSpecPrivate *spec4Priv = Internal::PluginManagerPrivate::privateSpec(spec4);
-    spec4Priv->readMetaData(metaData("testdependencies/spec4.json"));
-    spec4Priv->state = PluginSpec::Read; // fake read state for plugin resolving
+    spec4->readMetaData(metaData("testdependencies/spec4.json"));
+    spec4->setState(PluginSpec::Read); // fake read state for plugin resolving
 
-    PluginSpec *spec5 = Internal::PluginManagerPrivate::createSpec();
+    PluginSpec *spec5 = new CppPluginSpec();
     specs.append(spec5);
-    Internal::PluginSpecPrivate *spec5Priv = Internal::PluginManagerPrivate::privateSpec(spec5);
-    spec5Priv->readMetaData(metaData("testdependencies/spec5.json"));
-    spec5Priv->state = PluginSpec::Read; // fake read state for plugin resolving
+    spec5->readMetaData(metaData("testdependencies/spec5.json"));
+    spec5->setState(PluginSpec::Read); // fake read state for plugin resolving
 
-    QVERIFY(spec1Priv->resolveDependencies(specs));
-    QCOMPARE(spec1Priv->dependencySpecs.size(), 2);
-    QVERIFY(!spec1Priv->dependencySpecs.key(spec2).name.isEmpty());
-    QVERIFY(!spec1Priv->dependencySpecs.key(spec3).name.isEmpty());
-    QCOMPARE(spec1Priv->state, PluginSpec::Resolved);
-    QVERIFY(!spec4Priv->resolveDependencies(specs));
-    QVERIFY(spec4Priv->hasError);
-    QCOMPARE(spec4Priv->state, PluginSpec::Read);
+    QVERIFY(spec1->resolveDependencies(specs));
+    QCOMPARE(spec1->dependencySpecs().size(), 2);
+    QVERIFY(!spec1->dependencySpecs().key(spec2).name.isEmpty());
+    QVERIFY(!spec1->dependencySpecs().key(spec3).name.isEmpty());
+    QCOMPARE(spec1->state(), PluginSpec::Resolved);
+    QVERIFY(!spec4->resolveDependencies(specs));
+    QVERIFY(spec4->hasError());
+    QCOMPARE(spec4->state(), PluginSpec::Read);
 }
 
 void tst_PluginSpec::loadLibrary()
 {
-    PluginSpec *ps = Internal::PluginManagerPrivate::createSpec();
-    Internal::PluginSpecPrivate *spec = Internal::PluginManagerPrivate::privateSpec(ps);
-    QVERIFY(spec->read(QLatin1String(PLUGIN_DIR) + QLatin1String("/testplugin/") + libraryName(QLatin1String("test"))));
-    QVERIFY(spec->resolveDependencies(QVector<PluginSpec *>()));
-    QVERIFY2(spec->loadLibrary(), qPrintable(spec->errorString));
-    QVERIFY(spec->plugin != 0);
-    QVERIFY(QLatin1String(spec->plugin->metaObject()->className()) == QLatin1String("MyPlugin::MyPluginImpl"));
-    QCOMPARE(spec->state, PluginSpec::Loaded);
-    QVERIFY(!spec->hasError);
-    QCOMPARE(spec->plugin, ps->plugin());
-    delete ps;
+    Utils::expected_str<PluginSpec *> ps = readCppPluginSpec(
+        PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test")));
+
+    QVERIFY(ps);
+    CppPluginSpec *spec = static_cast<CppPluginSpec *>(ps.value());
+
+    QVERIFY(spec->resolveDependencies({}));
+    QVERIFY2(spec->loadLibrary(), qPrintable(spec->errorString()));
+    QVERIFY(spec->plugin() != 0);
+    QVERIFY(QLatin1String(spec->plugin()->metaObject()->className())
+            == QLatin1String("MyPlugin::MyPluginImpl"));
+    QCOMPARE(spec->state(), PluginSpec::Loaded);
+    QVERIFY(!spec->hasError());
+
+    delete *ps;
 }
 
 void tst_PluginSpec::initializePlugin()
 {
-    Internal::PluginSpecPrivate spec(0);
-    QVERIFY(spec.read(QLatin1String(PLUGIN_DIR) + QLatin1String("/testplugin/") + libraryName(QLatin1String("test"))));
-    QVERIFY(spec.resolveDependencies(QVector<PluginSpec *>()));
-    QVERIFY2(spec.loadLibrary(), qPrintable(spec.errorString));
+    Utils::expected_str<PluginSpec *> ps = readCppPluginSpec(
+        PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test")));
+    QVERIFY(ps);
+    CppPluginSpec *spec = static_cast<CppPluginSpec *>(ps.value());
+    QVERIFY(spec->resolveDependencies({}));
+    QVERIFY2(spec->loadLibrary(), qPrintable(spec->errorString()));
     bool isInitialized;
-    QMetaObject::invokeMethod(spec.plugin, "isInitialized",
-                              Qt::DirectConnection, Q_RETURN_ARG(bool, isInitialized));
+    QMetaObject::invokeMethod(spec->plugin(),
+                              "isInitialized",
+                              Qt::DirectConnection,
+                              Q_RETURN_ARG(bool, isInitialized));
     QVERIFY(!isInitialized);
-    QVERIFY(spec.initializePlugin());
-    QCOMPARE(spec.state, PluginSpec::Initialized);
-    QVERIFY(!spec.hasError);
-    QMetaObject::invokeMethod(spec.plugin, "isInitialized",
-                              Qt::DirectConnection, Q_RETURN_ARG(bool, isInitialized));
+    QVERIFY(spec->initializePlugin());
+    QCOMPARE(spec->state(), PluginSpec::Initialized);
+    QVERIFY(!spec->hasError());
+    QMetaObject::invokeMethod(spec->plugin(),
+                              "isInitialized",
+                              Qt::DirectConnection,
+                              Q_RETURN_ARG(bool, isInitialized));
     QVERIFY(isInitialized);
 }
 
 void tst_PluginSpec::initializeExtensions()
 {
-    Internal::PluginSpecPrivate spec(0);
-    QVERIFY(spec.read(QLatin1String(PLUGIN_DIR) + QLatin1String("/testplugin/") + libraryName(QLatin1String("test"))));
-    QVERIFY(spec.resolveDependencies(QVector<PluginSpec *>()));
-    QVERIFY2(spec.loadLibrary(), qPrintable(spec.errorString));
+    Utils::expected_str<PluginSpec *> ps = readCppPluginSpec(
+        PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test")));
+    QVERIFY(ps);
+    CppPluginSpec *spec = static_cast<CppPluginSpec *>(ps.value());
+    QVERIFY(spec->resolveDependencies({}));
+    QVERIFY2(spec->loadLibrary(), qPrintable(spec->errorString()));
     bool isExtensionsInitialized;
-    QVERIFY(spec.initializePlugin());
-    QMetaObject::invokeMethod(spec.plugin, "isExtensionsInitialized",
-                              Qt::DirectConnection, Q_RETURN_ARG(bool, isExtensionsInitialized));
+    QVERIFY(spec->initializePlugin());
+    QMetaObject::invokeMethod(spec->plugin(),
+                              "isExtensionsInitialized",
+                              Qt::DirectConnection,
+                              Q_RETURN_ARG(bool, isExtensionsInitialized));
     QVERIFY(!isExtensionsInitialized);
-    QVERIFY(spec.initializeExtensions());
-    QCOMPARE(spec.state, PluginSpec::Running);
-    QVERIFY(!spec.hasError);
-    QMetaObject::invokeMethod(spec.plugin, "isExtensionsInitialized",
-                              Qt::DirectConnection, Q_RETURN_ARG(bool, isExtensionsInitialized));
+    QVERIFY(spec->initializeExtensions());
+    QCOMPARE(spec->state(), PluginSpec::Running);
+    QVERIFY(!spec->hasError());
+    QMetaObject::invokeMethod(spec->plugin(),
+                              "isExtensionsInitialized",
+                              Qt::DirectConnection,
+                              Q_RETURN_ARG(bool, isExtensionsInitialized));
     QVERIFY(isExtensionsInitialized);
 }
 
diff --git a/tests/auto/ios/devicectlutils/tst_devicectlutils.cpp b/tests/auto/ios/devicectlutils/tst_devicectlutils.cpp
index f75497f68a3..8924c58a867 100644
--- a/tests/auto/ios/devicectlutils/tst_devicectlutils.cpp
+++ b/tests/auto/ios/devicectlutils/tst_devicectlutils.cpp
@@ -287,6 +287,7 @@ void tst_Devicectlutils::parseDeviceInfo_data()
                                    {"deviceConnected", "YES"},
                                    {"deviceName", "Some iOS device"},
                                    {"osVersion", "17.3 (21D50)"},
+                                   {"productType", "iPad11,2"},
                                    {"uniqueDeviceId", "00000000-0000000000000000"}});
     QTest::addRow("unhandled device")
         << data << QString("000000000000000000000001")
diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
index 2e88690f322..d37b639cd0c 100644
--- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
+++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
@@ -699,17 +699,17 @@ void tst_TestCore::testRewriterDynamicProperties()
     QCOMPARE(rootModelNode.properties().count(), 18);
     QVERIFY(rootModelNode.hasVariantProperty("i"));
     QCOMPARE(rootModelNode.variantProperty("i").dynamicTypeName(), QmlDesigner::TypeName("int"));
-    QCOMPARE(rootModelNode.variantProperty("i").value().type(), QVariant::Int);
+    QCOMPARE(rootModelNode.variantProperty("i").value().typeId(), QMetaType::Int);
     QCOMPARE(testRewriterView1->rootModelNode().variantProperty("i").value().toInt(), 0);
 
     QVERIFY(rootModelNode.hasVariantProperty("ii"));
     QCOMPARE(rootModelNode.variantProperty("ii").dynamicTypeName(), QmlDesigner::TypeName("int"));
-    QCOMPARE(rootModelNode.variantProperty("ii").value().type(), QVariant::Int);
+    QCOMPARE(rootModelNode.variantProperty("ii").value().typeId(), QMetaType::Int);
     QCOMPARE(testRewriterView1->rootModelNode().variantProperty("ii").value().toInt(), 1);
 
     QVERIFY(rootModelNode.hasVariantProperty("b"));
     QCOMPARE(rootModelNode.variantProperty("b").dynamicTypeName(), QmlDesigner::TypeName("bool"));
-    QCOMPARE(rootModelNode.variantProperty("b").value().type(), QVariant::Bool);
+    QCOMPARE(rootModelNode.variantProperty("b").value().typeId(), QMetaType::Bool);
     QCOMPARE(testRewriterView1->rootModelNode().variantProperty("b").value().toBool(), false);
 
     QVERIFY(rootModelNode.hasVariantProperty("bb"));
@@ -717,7 +717,7 @@ void tst_TestCore::testRewriterDynamicProperties()
 
     QVERIFY(rootModelNode.hasVariantProperty("d"));
     QCOMPARE(rootModelNode.variantProperty("d").dynamicTypeName(), QmlDesigner::TypeName("double"));
-    QCOMPARE(rootModelNode.variantProperty("d").value().type(), QVariant::Double);
+    QCOMPARE(rootModelNode.variantProperty("d").value().typeId(), QMetaType::Double);
     QCOMPARE(testRewriterView1->rootModelNode().variantProperty("d").value().toDouble(), 0.0);
 
     QVERIFY(rootModelNode.hasVariantProperty("dd"));
@@ -725,7 +725,7 @@ void tst_TestCore::testRewriterDynamicProperties()
 
     QVERIFY(rootModelNode.hasVariantProperty("r"));
     QCOMPARE(rootModelNode.variantProperty("r").dynamicTypeName(), QmlDesigner::TypeName("real"));
-    QCOMPARE(rootModelNode.variantProperty("r").value().type(), QVariant::Double);
+    QCOMPARE(rootModelNode.variantProperty("r").value().typeId(), QMetaType::Double);
     QCOMPARE(testRewriterView1->rootModelNode().variantProperty("r").value().toDouble(), 0.0);
 
     QVERIFY(rootModelNode.hasVariantProperty("rr"));
@@ -733,7 +733,7 @@ void tst_TestCore::testRewriterDynamicProperties()
 
     QVERIFY(rootModelNode.hasVariantProperty("s"));
     QCOMPARE(rootModelNode.variantProperty("s").dynamicTypeName(), QmlDesigner::TypeName("string"));
-    QCOMPARE(rootModelNode.variantProperty("s").value().type(), QVariant::String);
+    QCOMPARE(rootModelNode.variantProperty("s").value().typeId(), QMetaType::QString);
     QCOMPARE(testRewriterView1->rootModelNode().variantProperty("s").value().toString(), QString());
 
     QVERIFY(rootModelNode.hasVariantProperty("ss"));
@@ -741,7 +741,7 @@ void tst_TestCore::testRewriterDynamicProperties()
 
     QVERIFY(rootModelNode.hasVariantProperty("u"));
     QCOMPARE(rootModelNode.variantProperty("u").dynamicTypeName(), QmlDesigner::TypeName("url"));
-    QCOMPARE(rootModelNode.variantProperty("u").value().type(), QVariant::Url);
+    QCOMPARE(rootModelNode.variantProperty("u").value().typeId(), QMetaType::QUrl);
     QCOMPARE(testRewriterView1->rootModelNode().variantProperty("u").value().toUrl(), QUrl());
 
     QVERIFY(rootModelNode.hasVariantProperty("uu"));
@@ -749,7 +749,7 @@ void tst_TestCore::testRewriterDynamicProperties()
 
     QVERIFY(rootModelNode.hasVariantProperty("c"));
     QCOMPARE(rootModelNode.variantProperty("c").dynamicTypeName(), QmlDesigner::TypeName("color"));
-    QCOMPARE(rootModelNode.variantProperty("c").value().type(), QVariant::Color);
+    QCOMPARE(rootModelNode.variantProperty("c").value().typeId(), QMetaType::QColor);
     QCOMPARE(testRewriterView1->rootModelNode().variantProperty("c").value().value<QColor>(), QColor());
 
     QVERIFY(rootModelNode.hasVariantProperty("cc"));
@@ -757,7 +757,7 @@ void tst_TestCore::testRewriterDynamicProperties()
 
     QVERIFY(rootModelNode.hasVariantProperty("t"));
     QCOMPARE(rootModelNode.variantProperty("t").dynamicTypeName(), QmlDesigner::TypeName("date"));
-    QCOMPARE(rootModelNode.variantProperty("t").value().type(), QVariant::Date);
+    QCOMPARE(rootModelNode.variantProperty("t").value().typeId(), QMetaType::QDate);
     QCOMPARE(testRewriterView1->rootModelNode().variantProperty("t").value().value<QDate>(), QDate());
 
     QVERIFY(rootModelNode.hasVariantProperty("tt"));
@@ -765,8 +765,8 @@ void tst_TestCore::testRewriterDynamicProperties()
 
     QVERIFY(rootModelNode.hasVariantProperty("v"));
     QCOMPARE(rootModelNode.variantProperty("v").dynamicTypeName(), QmlDesigner::TypeName("variant"));
-    const int type = rootModelNode.variantProperty("v").value().type();
-    QCOMPARE(type, QMetaType::type("QVariant"));
+    const int type = rootModelNode.variantProperty("v").value().typeId();
+    QCOMPARE(type, QMetaType::fromName("QVariant").id());
 
     QVERIFY(rootModelNode.hasVariantProperty("vv"));
     const QString inThere = testRewriterView1->rootModelNode().variantProperty("vv").value().value<QString>();
@@ -3873,8 +3873,8 @@ void tst_TestCore::testRewriterPreserveType()
     QCOMPARE(rootNode.type(), QmlDesigner::TypeName("QtQuick.Rectangle"));
 
     ModelNode textNode = rootNode.directSubModelNodes().first();
-    QCOMPARE(QVariant::Bool, textNode.variantProperty("font.bold").value().type());
-    QCOMPARE(QVariant::Double, textNode.variantProperty("font.pointSize").value().type());
+    QCOMPARE(QMetaType::Bool, textNode.variantProperty("font.bold").value().typeId());
+    QCOMPARE(QMetaType::Double, textNode.variantProperty("font.pointSize").value().typeId());
     textNode.variantProperty("font.bold").setValue(QVariant(false));
     textNode.variantProperty("font.bold").setValue(QVariant(true));
     textNode.variantProperty("font.pointSize").setValue(QVariant(13.0));
@@ -3884,8 +3884,8 @@ void tst_TestCore::testRewriterPreserveType()
     newTextNode.variantProperty("font.bold").setValue(QVariant(true));
     newTextNode.variantProperty("font.pointSize").setValue(QVariant(13.0));
 
-    QCOMPARE(QVariant::Bool, newTextNode.variantProperty("font.bold").value().type());
-    QCOMPARE(QVariant::Double, newTextNode.variantProperty("font.pointSize").value().type());
+    QCOMPARE(QMetaType::Bool, newTextNode.variantProperty("font.bold").value().typeId());
+    QCOMPARE(QMetaType::Double, newTextNode.variantProperty("font.pointSize").value().typeId());
 }
 
 void tst_TestCore::testRewriterForArrayMagic()
@@ -6958,9 +6958,9 @@ void tst_TestCore::testModelPropertyValueTypes()
     ModelNode rootModelNode(testRewriterView1->rootModelNode());
     QVERIFY(rootModelNode.isValid());
 
-    QCOMPARE(rootModelNode.variantProperty("width").value().type(), QVariant::Double);
-    QCOMPARE(rootModelNode.variantProperty("radius").value().type(), QVariant::Double);
-    QCOMPARE(rootModelNode.variantProperty("color").value().type(), QVariant::Color);
+    QCOMPARE(rootModelNode.variantProperty("width").value().typeId(), QMetaType::Double);
+    QCOMPARE(rootModelNode.variantProperty("radius").value().typeId(), QMetaType::Double);
+    QCOMPARE(rootModelNode.variantProperty("color").value().typeId(), QMetaType::QColor);
 }
 
 void tst_TestCore::testModelNodeInHierarchy()
@@ -8964,18 +8964,18 @@ void tst_TestCore::loadGradient()
         QCOMPARE(pOne.id(), QString("pOne"));
         QCOMPARE(pOne.directSubModelNodes().size(), 0);
         QCOMPARE(pOne.propertyNames().size(), 2);
-        QCOMPARE(pOne.variantProperty("position").value().type(), QVariant::Double);
+        QCOMPARE(pOne.variantProperty("position").value().typeId(), QMetaType::Double);
         QCOMPARE(pOne.variantProperty("position").value().toDouble(), 0.0);
-        QCOMPARE(pOne.variantProperty("color").value().type(), QVariant::Color);
+        QCOMPARE(pOne.variantProperty("color").value().typeId(), QMetaType::QColor);
         QCOMPARE(pOne.variantProperty("color").value().value<QColor>(), QColor("lightsteelblue"));
 
         QCOMPARE(pTwo.type(), QmlDesigner::TypeName("QtQuick.GradientStop"));
         QCOMPARE(pTwo.id(), QString("pTwo"));
         QCOMPARE(pTwo.directSubModelNodes().size(), 0);
         QCOMPARE(pTwo.propertyNames().size(), 2);
-        QCOMPARE(pTwo.variantProperty("position").value().type(), QVariant::Double);
+        QCOMPARE(pTwo.variantProperty("position").value().typeId(), QMetaType::Double);
         QCOMPARE(pTwo.variantProperty("position").value().toDouble(), 1.0);
-        QCOMPARE(pTwo.variantProperty("color").value().type(), QVariant::Color);
+        QCOMPARE(pTwo.variantProperty("color").value().typeId(), QMetaType::QColor);
         QCOMPARE(pTwo.variantProperty("color").value().value<QColor>(), QColor("blue"));
     }
 
@@ -9004,18 +9004,18 @@ void tst_TestCore::loadGradient()
         QCOMPARE(nOne.id(), QString("nOne"));
         QCOMPARE(nOne.directSubModelNodes().size(), 0);
         QCOMPARE(nOne.propertyNames().size(), 2);
-        QCOMPARE(nOne.variantProperty("position").value().type(), QVariant::Double);
+        QCOMPARE(nOne.variantProperty("position").value().typeId(), QMetaType::Double);
         QCOMPARE(nOne.variantProperty("position").value().toDouble(), 0.0);
-        QCOMPARE(nOne.variantProperty("color").value().type(), QVariant::Color);
+        QCOMPARE(nOne.variantProperty("color").value().typeId(), QMetaType::QColor);
         QCOMPARE(nOne.variantProperty("color").value().value<QColor>(), QColor("blue"));
 
         QCOMPARE(nTwo.type(), QmlDesigner::TypeName("QtQuick.GradientStop"));
         QCOMPARE(nTwo.id(), QString("nTwo"));
         QCOMPARE(nTwo.directSubModelNodes().size(), 0);
         QCOMPARE(nTwo.propertyNames().size(), 2);
-        QCOMPARE(nTwo.variantProperty("position").value().type(), QVariant::Double);
+        QCOMPARE(nTwo.variantProperty("position").value().typeId(), QMetaType::Double);
         QCOMPARE(nTwo.variantProperty("position").value().toDouble(), 1.0);
-        QCOMPARE(nTwo.variantProperty("color").value().type(), QVariant::Color);
+        QCOMPARE(nTwo.variantProperty("color").value().typeId(), QMetaType::QColor);
         QCOMPARE(nTwo.variantProperty("color").value().value<QColor>(), QColor("lightsteelblue"));
     }
 }
diff --git a/tests/auto/qml/qmldesigner/testconnectionmanager.cpp b/tests/auto/qml/qmldesigner/testconnectionmanager.cpp
index 9341d39a454..78a0417b82f 100644
--- a/tests/auto/qml/qmldesigner/testconnectionmanager.cpp
+++ b/tests/auto/qml/qmldesigner/testconnectionmanager.cpp
@@ -38,7 +38,7 @@ void TestConnectionManager::writeCommand(const QVariant &command)
 
 void TestConnectionManager::dispatchCommand(const QVariant &command, Connection &connection)
 {
-    static const int synchronizeCommandType = QMetaType::type("SynchronizeCommand");
+    static const int synchronizeCommandType = QMetaType::fromName("SynchronizeCommand").id();
 
     if (command.typeId() == synchronizeCommandType) {
         SynchronizeCommand synchronizeCommand = command.value<SynchronizeCommand>();
diff --git a/tests/auto/solutions/tasking/tst_tasking.cpp b/tests/auto/solutions/tasking/tst_tasking.cpp
index ee1972c0616..261f0cc5c73 100644
--- a/tests/auto/solutions/tasking/tst_tasking.cpp
+++ b/tests/auto/solutions/tasking/tst_tasking.cpp
@@ -117,6 +117,8 @@ private slots:
     void storageIO();
     void storageOperators();
     void storageDestructor();
+    void storageZeroInitialization();
+    void nestedBrokenStorage();
     void restart();
     void destructorOfTaskEmittingDone();
 };
@@ -710,6 +712,60 @@ void tst_Tasking::testTree_data()
         QTest::newRow("ErrorAndFinishAllAndError") << errorData(WorkflowPolicy::FinishAllAndError);
     }
 
+    {
+        // These tests ensure that tweaking the done result in group's done handler takes priority
+        // over the group's workflow policy. In this case the group's workflow policy is ignored.
+        const auto setupGroup = [=](DoneResult doneResult, WorkflowPolicy policy) {
+            return Group {
+                storage,
+                Group {
+                    workflowPolicy(policy),
+                    onGroupDone([doneResult] { return doneResult; })
+                },
+                groupDone(0)
+            };
+        };
+
+        const auto doneData = [storage, setupGroup](WorkflowPolicy policy) {
+            return TestData{storage, setupGroup(DoneResult::Success, policy),
+                            Log{{0, Handler::GroupSuccess}}, 0, DoneWith::Success, 0};
+        };
+        const auto errorData = [storage, setupGroup](WorkflowPolicy policy) {
+            return TestData{storage, setupGroup(DoneResult::Error, policy),
+                            Log{{0, Handler::GroupError}}, 0, DoneWith::Error, 0};
+        };
+
+        QTest::newRow("GroupDoneTweakSuccessWithStopOnError")
+            << doneData(WorkflowPolicy::StopOnError);
+        QTest::newRow("GroupDoneTweakSuccessWithContinueOnError")
+            << doneData(WorkflowPolicy::ContinueOnError);
+        QTest::newRow("GroupDoneTweakSuccessWithStopOnSuccess")
+            << doneData(WorkflowPolicy::StopOnSuccess);
+        QTest::newRow("GroupDoneTweakSuccessWithContinueOnSuccess")
+            << doneData(WorkflowPolicy::ContinueOnSuccess);
+        QTest::newRow("GroupDoneTweakSuccessWithStopOnSuccessOrError")
+            << doneData(WorkflowPolicy::StopOnSuccessOrError);
+        QTest::newRow("GroupDoneTweakSuccessWithFinishAllAndSuccess")
+            << doneData(WorkflowPolicy::FinishAllAndSuccess);
+        QTest::newRow("GroupDoneTweakSuccessWithFinishAllAndError")
+            << doneData(WorkflowPolicy::FinishAllAndError);
+
+        QTest::newRow("GroupDoneTweakErrorWithStopOnError")
+            << errorData(WorkflowPolicy::StopOnError);
+        QTest::newRow("GroupDoneTweakErrorWithContinueOnError")
+            << errorData(WorkflowPolicy::ContinueOnError);
+        QTest::newRow("GroupDoneTweakErrorWithStopOnSuccess")
+            << errorData(WorkflowPolicy::StopOnSuccess);
+        QTest::newRow("GroupDoneTweakErrorWithContinueOnSuccess")
+            << errorData(WorkflowPolicy::ContinueOnSuccess);
+        QTest::newRow("GroupDoneTweakErrorWithStopOnSuccessOrError")
+            << errorData(WorkflowPolicy::StopOnSuccessOrError);
+        QTest::newRow("GroupDoneTweakErrorWithFinishAllAndSuccess")
+            << errorData(WorkflowPolicy::FinishAllAndSuccess);
+        QTest::newRow("GroupDoneTweakErrorWithFinishAllAndError")
+            << errorData(WorkflowPolicy::FinishAllAndError);
+    }
+
     {
         const Group root {
             storage,
@@ -3083,11 +3139,84 @@ void tst_Tasking::testTree_data()
                         logErrorLong, 1, DoneWith::Error, 1};
     }
 
+    {
+        // This tests ensures the task done handlers are invoked in a different order
+        // than the corresponding setup handlers.
+
+        const QList<milliseconds> tasks { 1000000ms, 0ms };
+        const LoopList iterator(tasks);
+
+        const auto onSetup = [storage, iterator](TaskObject &taskObject) {
+            taskObject = *iterator;
+            storage->m_log.append({iterator.iteration(), Handler::Setup});
+        };
+
+        const auto onDone = [storage, iterator](DoneWith result) {
+            const Handler handler = result == DoneWith::Cancel ? Handler::Canceled : Handler::Error;
+            storage->m_log.append({iterator.iteration(), handler});
+            return DoneResult::Error;
+        };
+
+        const Group root {
+            storage,
+            parallel,
+            iterator,
+            TestTask(onSetup, onDone)
+        };
+
+        const Log log {
+            {0, Handler::Setup},
+            {1, Handler::Setup},
+            {1, Handler::Error},
+            {0, Handler::Canceled}
+        };
+
+        QTest::newRow("ParallelDisorder") << TestData{storage, root, log, 2, DoneWith::Error, 1};
+    }
+
+    {
+        // This tests ensures the task done handler or onGroupDone accepts the DoneResult as an
+        // argument.
+
+        const Group groupSuccess {
+            storage,
+            Group {
+                onGroupDone(DoneResult::Success)
+            },
+            groupDone(0)
+        };
+        const Group groupError {
+            storage,
+            Group {
+                onGroupDone(DoneResult::Error)
+            },
+            groupDone(0)
+        };
+        const Group taskSuccess {
+            storage,
+            TestTask({}, DoneResult::Success),
+            groupDone(0)
+        };
+        const Group taskError {
+            storage,
+            TestTask({}, DoneResult::Error),
+            groupDone(0)
+        };
+
+        QTest::newRow("DoneResultGroupSuccess")
+            << TestData{storage, groupSuccess, {{0, Handler::GroupSuccess}}, 0, DoneWith::Success, 0};
+        QTest::newRow("DoneResultGroupError")
+            << TestData{storage, groupError, {{0, Handler::GroupError}}, 0, DoneWith::Error, 0};
+        QTest::newRow("DoneResultTaskSuccess")
+            << TestData{storage, taskSuccess, {{0, Handler::GroupSuccess}}, 1, DoneWith::Success, 1};
+        QTest::newRow("DoneResultTaskError")
+            << TestData{storage, taskError, {{0, Handler::GroupError}}, 1, DoneWith::Error, 1};
+    }
+
     // This test checks if storage shadowing works OK.
     QTest::newRow("StorageShadowing") << storageShadowingData();
 }
 
-
 static QtMessageHandler s_oldMessageHandler = nullptr;
 static QStringList s_messages;
 
@@ -3380,7 +3509,7 @@ void tst_Tasking::storageDestructor()
     };
     QCOMPARE(CustomStorage::instanceCount(), 0);
     {
-        Storage<CustomStorage> storage;
+        const Storage<CustomStorage> storage;
         const auto setupSleepingTask = [](TaskObject &taskObject) {
             taskObject = 1000ms;
         };
@@ -3401,6 +3530,70 @@ void tst_Tasking::storageDestructor()
     QVERIFY(!doneCalled);
 }
 
+// This test ensures that the storage data is zero-initialized.
+void tst_Tasking::storageZeroInitialization()
+{
+    const Storage<int> storage;
+    std::optional<int> defaultValue;
+
+    const auto onSetup = [storage, &defaultValue] { defaultValue = *storage; };
+
+    TaskTree taskTree({ storage, onGroupSetup(onSetup) });
+    taskTree.runBlocking();
+
+    QVERIFY(defaultValue);
+    QCOMPARE(defaultValue, 0);
+}
+
+// This test ensures that when a missing storage object inside the nested task tree is accessed
+// directly from the outer task tree's handler, containing the same storage object, then we
+// detect this misconfigured recipe, issue a warning, and return nullptr for the storage
+// being accessed (instead of returning parent's task tree's storage instance).
+// This test should also trigger a runtime assert that we are accessing the nullptr storage.
+void tst_Tasking::nestedBrokenStorage()
+{
+    int *outerStorage = nullptr;
+    int *innerStorage1 = nullptr;
+    int *innerStorage2 = nullptr;
+    const Storage<int> storage;
+
+    const auto onOuterSync = [storage, &outerStorage, &innerStorage1, &innerStorage2] {
+        outerStorage = &*storage;
+
+        const auto onInnerSync1 = [storage, &innerStorage1] {
+            innerStorage1 = &*storage; // Triggers the runtime assert on purpose.
+        };
+        const auto onInnerSync2 = [storage, &innerStorage2] {
+            innerStorage2 = &*storage; // Storage is accessible in currently running tree - all OK.
+        };
+
+        const Group innerRecipe {
+            Group {
+                // Broken subrecipe, the storage wasn't placed inside the recipe.
+                // storage,
+                Sync(onInnerSync1)
+            },
+            Group {
+                storage, // Subrecipe OK, another instance for the nested storage will be created.
+                Sync(onInnerSync2)
+            }
+        };
+
+        TaskTree::runBlocking(innerRecipe);
+    };
+
+    const Group outerRecipe {
+        storage,
+        Sync(onOuterSync)
+    };
+
+    TaskTree::runBlocking(outerRecipe);
+    QVERIFY(outerStorage != nullptr);
+    QCOMPARE(innerStorage1, nullptr);
+    QVERIFY(innerStorage2 != nullptr);
+    QVERIFY(innerStorage2 != outerStorage);
+}
+
 void tst_Tasking::restart()
 {
     TaskTree taskTree({TestTask([](TaskObject &taskObject) { taskObject = 1000ms; })});
diff --git a/tests/auto/texteditor/highlighter/tst_highlighter.cpp b/tests/auto/texteditor/highlighter/tst_highlighter.cpp
index 9044065a019..e0806382982 100644
--- a/tests/auto/texteditor/highlighter/tst_highlighter.cpp
+++ b/tests/auto/texteditor/highlighter/tst_highlighter.cpp
@@ -7,7 +7,6 @@
 
 #include <texteditor/semantichighlighter.h>
 #include <texteditor/syntaxhighlighter.h>
-#include <texteditor/syntaxhighlighterrunner.h>
 #include <texteditor/texteditorsettings.h>
 
 #include <QObject>
@@ -32,7 +31,7 @@ private slots:
 
 private:
     QTextDocument *doc = nullptr;
-    SyntaxHighlighterRunner *highlighterRunner = nullptr;
+    SyntaxHighlighter *highlighter = nullptr;
     FontSettings fontsettings;
     QHash<int, QTextCharFormat> formatHash;
     QTextCharFormat whitespaceFormat;
@@ -58,8 +57,7 @@ Last)";
 
     doc = new QTextDocument();
     doc->setPlainText(text);
-    auto highlighter = new SyntaxHighlighter(doc, fontsettings);
-    highlighterRunner = new SyntaxHighlighterRunner(highlighter, doc, false);
+    highlighter = new SyntaxHighlighter(doc, fontsettings);
 }
 
 static const HighlightingResults &highlightingResults()
@@ -77,7 +75,7 @@ void tst_highlighter::test_setExtraAdditionalFormats()
 {
     QCOMPARE(doc->blockCount(), 4);
 
-    SemanticHighlighter::setExtraAdditionalFormats(highlighterRunner, highlightingResults(), formatHash);
+    SemanticHighlighter::setExtraAdditionalFormats(highlighter, highlightingResults(), formatHash);
 
     for (auto block = doc->firstBlock(); block.isValid(); block = block.next()) {
         QVERIFY(block.blockNumber() < 4);
@@ -140,17 +138,17 @@ void tst_highlighter::test_clearExtraFormats()
 {
     QCOMPARE(doc->blockCount(), 4);
 
-    SemanticHighlighter::setExtraAdditionalFormats(highlighterRunner, highlightingResults(), formatHash);
+    SemanticHighlighter::setExtraAdditionalFormats(highlighter, highlightingResults(), formatHash);
 
     QTextBlock firstBlock = doc->findBlockByNumber(0);
     QTextBlock spacesLineBlock = doc->findBlockByNumber(1);
     QTextBlock emptyLineBlock = doc->findBlockByNumber(2);
     QTextBlock lastBlock = doc->findBlockByNumber(3);
 
-    highlighterRunner->clearExtraFormats({emptyLineBlock.blockNumber()});
+    highlighter->clearExtraFormats(emptyLineBlock);
     QVERIFY(emptyLineBlock.layout()->formats().isEmpty());
 
-    highlighterRunner->clearExtraFormats({spacesLineBlock.blockNumber()});
+    highlighter->clearExtraFormats(spacesLineBlock);
 
     auto formats = spacesLineBlock.layout()->formats();
     // the spaces are not extra formats and should remain when clearing extra formats
@@ -185,7 +183,7 @@ void tst_highlighter::test_clearExtraFormats()
     QCOMPARE(formats.at(1).start, 0);
     QCOMPARE(formats.at(1).length, 5);
 
-    highlighterRunner->clearAllExtraFormats();
+    highlighter->clearAllExtraFormats();
 
     QVERIFY(firstBlock.layout()->formats().isEmpty());
     QVERIFY(emptyLineBlock.layout()->formats().isEmpty());
@@ -221,7 +219,7 @@ void tst_highlighter::test_incrementalApplyAdditionalFormats()
 
     QFutureInterface<HighlightingResult> fiOld;
     fiOld.reportResults(highlightingResults());
-    SemanticHighlighter::incrementalApplyExtraAdditionalFormats(highlighterRunner,
+    SemanticHighlighter::incrementalApplyExtraAdditionalFormats(highlighter,
                                                                 fiOld.future(),
                                                                 2,
                                                                 0,
@@ -229,7 +227,7 @@ void tst_highlighter::test_incrementalApplyAdditionalFormats()
     auto formats = firstBlock.layout()->formats();
     QVERIFY(formats.isEmpty());
 
-    SemanticHighlighter::incrementalApplyExtraAdditionalFormats(highlighterRunner,
+    SemanticHighlighter::incrementalApplyExtraAdditionalFormats(highlighter,
                                                                 fiOld.future(),
                                                                 0,
                                                                 2,
@@ -254,7 +252,7 @@ void tst_highlighter::test_incrementalApplyAdditionalFormats()
     QCOMPARE(formats.at(1).start, 11);
     QCOMPARE(formats.at(1).length, 1);
 
-    SemanticHighlighter::incrementalApplyExtraAdditionalFormats(highlighterRunner,
+    SemanticHighlighter::incrementalApplyExtraAdditionalFormats(highlighter,
                                                                 fiOld.future(),
                                                                 3,
                                                                 6,
@@ -280,7 +278,7 @@ void tst_highlighter::test_incrementalApplyAdditionalFormats()
 
     QFutureInterface<HighlightingResult> fiNew;
     fiNew.reportResults(newResults);
-    SemanticHighlighter::incrementalApplyExtraAdditionalFormats(highlighterRunner,
+    SemanticHighlighter::incrementalApplyExtraAdditionalFormats(highlighter,
                                                                 fiNew.future(),
                                                                 0,
                                                                 3,
@@ -294,7 +292,7 @@ void tst_highlighter::test_incrementalApplyAdditionalFormats()
     QCOMPARE(formats.at(0).start, 0);
     QCOMPARE(formats.at(0).length, 1);
 
-    SemanticHighlighter::incrementalApplyExtraAdditionalFormats(highlighterRunner,
+    SemanticHighlighter::incrementalApplyExtraAdditionalFormats(highlighter,
                                                                 fiNew.future(),
                                                                 3,
                                                                 4,
@@ -305,14 +303,14 @@ void tst_highlighter::test_incrementalApplyAdditionalFormats()
     QVERIFY(formats.isEmpty());
 
     // QTCREATORBUG-29218
-    highlighterRunner->clearAllExtraFormats();
+    highlighter->clearAllExtraFormats();
     const HighlightingResults bug29218Results{HighlightingResult(1, 1, 2, 0),
                                               HighlightingResult(1, 3, 2, 1)};
     QFutureInterface<HighlightingResult> fi29218;
     fi29218.reportResults(bug29218Results);
     formats = firstBlock.layout()->formats();
     QVERIFY(formats.isEmpty());
-    SemanticHighlighter::incrementalApplyExtraAdditionalFormats(highlighterRunner,
+    SemanticHighlighter::incrementalApplyExtraAdditionalFormats(highlighter,
                                                                 fi29218.future(),
                                                                 0,
                                                                 1,
@@ -323,7 +321,7 @@ void tst_highlighter::test_incrementalApplyAdditionalFormats()
     QCOMPARE(formats.at(0).format.fontOverline(), false);
     QCOMPARE(formats.at(0).start, 0);
     QCOMPARE(formats.at(0).length, 2);
-    SemanticHighlighter::incrementalApplyExtraAdditionalFormats(highlighterRunner,
+    SemanticHighlighter::incrementalApplyExtraAdditionalFormats(highlighter,
                                                                 fi29218.future(),
                                                                 1,
                                                                 2,
@@ -347,7 +345,7 @@ void tst_highlighter::test_preeditText()
     QTextBlock firstBlock = doc->findBlockByNumber(0);
     firstBlock.layout()->setPreeditArea(2, "uaf");
 
-    SemanticHighlighter::setExtraAdditionalFormats(highlighterRunner, highlightingResults(), formatHash);
+    SemanticHighlighter::setExtraAdditionalFormats(highlighter, highlightingResults(), formatHash);
 
     auto formats = firstBlock.layout()->formats();
     QCOMPARE(formats.size(), 2);
@@ -366,7 +364,7 @@ void tst_highlighter::cleanup()
 {
     delete doc;
     doc = nullptr;
-    highlighterRunner = nullptr;
+    highlighter = nullptr;
 }
 
 } // namespace TextEditor
diff --git a/tests/auto/utils/async/tst_async.cpp b/tests/auto/utils/async/tst_async.cpp
index e25a443cce1..1c3f7a19f2d 100644
--- a/tests/auto/utils/async/tst_async.cpp
+++ b/tests/auto/utils/async/tst_async.cpp
@@ -392,8 +392,7 @@ public:
 
 void tst_Async::onResultReady()
 {
-// TODO: Re-enable when QTBUG-119169 is fixed.
-#if 0
+#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
     { // lambda
         QObject context;
         QFuture<QString> f = Utils::asyncRun([](QPromise<QString> &fi) {
diff --git a/tests/auto/utils/commandline/tst_commandline.cpp b/tests/auto/utils/commandline/tst_commandline.cpp
index d884e47c8d6..aca984adf54 100644
--- a/tests/auto/utils/commandline/tst_commandline.cpp
+++ b/tests/auto/utils/commandline/tst_commandline.cpp
@@ -125,6 +125,31 @@ private slots:
         QCOMPARE(actual, expected);
     }
 
+    void testConstructor_data()
+    {
+        QTest::addColumn<CommandLine>("command");
+        QTest::addColumn<FilePath>("executable");
+        QTest::addColumn<QStringList>("arguments");
+
+        const FilePath filePath("some_path");
+        const QString arg("-arg");
+        const QStringList args{"-a", "-b", "-c"};
+
+        QTest::newRow("mixed-strings") << CommandLine{filePath, {"-A", arg, args}}
+                                       << filePath << (QStringList{"-A"} << arg << args);
+    }
+
+    void testConstructor()
+    {
+        QFETCH(CommandLine, command);
+        QFETCH(FilePath, executable);
+        QFETCH(QStringList, arguments);
+
+        QCOMPARE(command.executable(), executable);
+        QCOMPARE(command.arguments(), arguments.join(' '));
+        QCOMPARE(command.splitArguments(), arguments);
+    }
+
     void testFromUserInput_data()
     {
         QTest::addColumn<QString>("input");
diff --git a/tests/auto/utils/deviceshell/tst_deviceshell.cpp b/tests/auto/utils/deviceshell/tst_deviceshell.cpp
index f94d0dc5b40..75150add83b 100644
--- a/tests/auto/utils/deviceshell/tst_deviceshell.cpp
+++ b/tests/auto/utils/deviceshell/tst_deviceshell.cpp
@@ -111,7 +111,7 @@ private slots:
                 const FilePath executable = Environment::systemEnvironment()
                                                 .searchInPath(shell, {"/usr/local/bin"});
                 if (executable.exists())
-                    m_availableShells.append({executable, {}});
+                    m_availableShells.append(CommandLine{executable});
             }
         }
 
@@ -210,7 +210,7 @@ private slots:
 
         QRandomGenerator generator;
 
-        const RunResult result = shell.runInShell({"cat", {}}, testData.toUtf8());
+        const RunResult result = shell.runInShell(CommandLine{"cat"}, testData.toUtf8());
         QCOMPARE(result.exitCode, 0);
         const QString resultAsUtf8 = QString::fromUtf8(result.stdOut);
         QCOMPARE(resultAsUtf8.size(), testData.size());
@@ -236,7 +236,7 @@ private slots:
         TestShell shell(cmdLine);
         QCOMPARE(shell.state(), DeviceShell::State::Succeeded);
 
-        const RunResult result = shell.runInShell({"cat", {}}, m_asciiTestData);
+        const RunResult result = shell.runInShell(CommandLine{"cat"}, m_asciiTestData);
         QCOMPARE(result.stdOut, m_asciiTestData);
     }
 
@@ -259,7 +259,7 @@ private slots:
         TestShell shell(cmdLine);
         QCOMPARE(shell.state(), DeviceShell::State::Succeeded);
 
-        const RunResult result = shell.runInShell({"cat", {}}, m_asciiTestData);
+        const RunResult result = shell.runInShell(CommandLine{"cat"}, m_asciiTestData);
         QCOMPARE(result.stdOut, m_asciiTestData);
         QVERIFY(result.stdErr.isEmpty());
 
diff --git a/tests/auto/utils/persistentsettings/tst_persistentsettings.cpp b/tests/auto/utils/persistentsettings/tst_persistentsettings.cpp
index e2fde299096..9890545a7ef 100644
--- a/tests/auto/utils/persistentsettings/tst_persistentsettings.cpp
+++ b/tests/auto/utils/persistentsettings/tst_persistentsettings.cpp
@@ -61,18 +61,18 @@ void PersistentSettingsTest::tst_readwrite()
         auto found = restored.find(it.key());
         QVERIFY(found != restoredEnd);
         QVERIFY(found.value().isValid());
-        if (it.value().type() == QVariant::List) {
+        if (it.value().typeId() == QMetaType::QVariantList) {
             const QVariantList origList = it.value().toList();
             const QVariantList foundList = found.value().toList();
 
             QCOMPARE(foundList.size(), origList.size());
             for (int i = 0, vEnd = foundList.size(); i < vEnd; ++i) {
-                if (foundList.at(i).type() == QVariant::Rect)
+                if (foundList.at(i).typeId() == QMetaType::QRect)
                     qDebug() << foundList.at(i).toRect() << origList.at(i).toRect();
                 QCOMPARE(foundList.at(i), origList.at(i));
             }
         }
-        if (it.value().type() == QVariant::Rect)
+        if (it.value().typeId() == QMetaType::QRect)
             qDebug() << found.value().toRect() << "vs" << it.value().toRect();
         QCOMPARE(found.value(), it.value());
     }
diff --git a/tests/auto/utils/process/processtestapp/processtestapp.cpp b/tests/auto/utils/process/processtestapp/processtestapp.cpp
index 0148d1e2613..b85cdabedec 100644
--- a/tests/auto/utils/process/processtestapp/processtestapp.cpp
+++ b/tests/auto/utils/process/processtestapp/processtestapp.cpp
@@ -84,7 +84,7 @@ void SubProcessConfig::setupSubProcess(Process *subProcess) const
     subProcess->setEnvironment(m_environment);
     const FilePath filePath = FilePath::fromString(s_pathToProcessTestApp
                             + QLatin1String("/processtestapp")).withExecutableSuffix();
-    subProcess->setCommand(CommandLine(filePath, {}));
+    subProcess->setCommand(CommandLine{filePath});
 }
 
 void SubProcessConfig::setupSubProcess(QProcess *subProcess) const
diff --git a/tests/auto/utils/process/tst_process.cpp b/tests/auto/utils/process/tst_process.cpp
index cd9f8715152..a1e92edfe28 100644
--- a/tests/auto/utils/process/tst_process.cpp
+++ b/tests/auto/utils/process/tst_process.cpp
@@ -114,7 +114,7 @@ private slots:
         QCOMPARE(qproc.exitCode(), 0);
 
         Process proc;
-        proc.setCommand({envPath, {}});
+        proc.setCommand(CommandLine{envPath});
         proc.runBlocking();
         QCOMPARE(proc.exitCode(), 0);
         const QByteArray output = proc.rawStdOut() + proc.rawStdErr();
@@ -1138,8 +1138,7 @@ void tst_Process::notRunningAfterStartingNonExistingProgram()
     QFETCH(ProcessSignalType, signalType);
 
     Process process;
-    process.setCommand({ FilePath::fromString(
-              "there_is_a_big_chance_that_executable_with_that_name_does_not_exists"), {} });
+    process.setCommand(CommandLine{"there_is_a_big_chance_that_executable_with_that_name_does_not_exists"});
 
     int doneCount = 0;
     QObject::connect(&process, &Process::done, [&process, &doneCount]() {
@@ -1556,7 +1555,7 @@ void tst_Process::stdinToShell()
         QSKIP("Skipping env test on Windows");
 
     Process proc;
-    proc.setCommand({"sh", {}});
+    proc.setCommand(CommandLine{"sh"});
     proc.setWriteData("echo hallo");
     proc.runBlocking();
 
@@ -1595,8 +1594,8 @@ void tst_Process::eventLoopMode()
 
     {
         Process process;
-        process.setCommand({FilePath::fromString(
-                "there_is_a_big_chance_that_executable_with_that_name_does_not_exists"), {} });
+        process.setCommand(
+            CommandLine{"there_is_a_big_chance_that_executable_with_that_name_does_not_exists"});
         process.setProcessImpl(processImpl);
         process.runBlocking(10s, eventLoopMode);
         QCOMPARE(process.result(), ProcessResult::StartFailed);
diff --git a/tests/cppmodelmanager/testdata_optionalindexing/lib1.cpp b/tests/cppmodelmanager/testdata_optionalindexing/lib1.cpp
new file mode 100644
index 00000000000..c6d43676a09
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_optionalindexing/lib1.cpp
@@ -0,0 +1 @@
+void foo1() {}
diff --git a/tests/cppmodelmanager/testdata_optionalindexing/lib1.pro b/tests/cppmodelmanager/testdata_optionalindexing/lib1.pro
new file mode 100644
index 00000000000..93241765c5d
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_optionalindexing/lib1.pro
@@ -0,0 +1,3 @@
+TEMPLATE=lib
+
+SOURCES=lib1.cpp
diff --git a/tests/cppmodelmanager/testdata_optionalindexing/lib2.cpp b/tests/cppmodelmanager/testdata_optionalindexing/lib2.cpp
new file mode 100644
index 00000000000..a5b73164ec7
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_optionalindexing/lib2.cpp
@@ -0,0 +1 @@
+void foo2() {}
diff --git a/tests/cppmodelmanager/testdata_optionalindexing/lib2.pro b/tests/cppmodelmanager/testdata_optionalindexing/lib2.pro
new file mode 100644
index 00000000000..fc480dbf7cc
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_optionalindexing/lib2.pro
@@ -0,0 +1,3 @@
+TEMPLATE=lib
+
+SOURCES=lib2.cpp
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/tests/cppmodelmanager/testdata_renameheaders/header.h
similarity index 100%
rename from src/plugins/coreplugin/mainwindow.cpp
rename to tests/cppmodelmanager/testdata_renameheaders/header.h
diff --git a/tests/cppmodelmanager/testdata_renameheaders/main.cpp b/tests/cppmodelmanager/testdata_renameheaders/main.cpp
new file mode 100644
index 00000000000..629f20001ff
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_renameheaders/main.cpp
@@ -0,0 +1,5 @@
+#include "header.h"
+#include "subdir1/header1.h"
+#include <header2.h>
+
+int main() {}
diff --git a/tests/cppmodelmanager/testdata_renameheaders/subdir1/file1.cpp b/tests/cppmodelmanager/testdata_renameheaders/subdir1/file1.cpp
new file mode 100644
index 00000000000..e22ce8100c9
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_renameheaders/subdir1/file1.cpp
@@ -0,0 +1,3 @@
+#include "header1.h"
+#include "../header.h"
+#include "../subdir2/header2.h"
diff --git a/tests/cppmodelmanager/testdata_renameheaders/subdir1/header1.h b/tests/cppmodelmanager/testdata_renameheaders/subdir1/header1.h
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/cppmodelmanager/testdata_renameheaders/subdir2/file2.cpp b/tests/cppmodelmanager/testdata_renameheaders/subdir2/file2.cpp
new file mode 100644
index 00000000000..8c83d5ef036
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_renameheaders/subdir2/file2.cpp
@@ -0,0 +1,3 @@
+#include "header2.h"
+#include "../header.h"
+#include "../subdir1/header1.h"
diff --git a/tests/cppmodelmanager/testdata_renameheaders/subdir2/header2.h b/tests/cppmodelmanager/testdata_renameheaders/subdir2/header2.h
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/cppmodelmanager/testdata_renameheaders/testdata_renameheaders.pro b/tests/cppmodelmanager/testdata_renameheaders/testdata_renameheaders.pro
new file mode 100644
index 00000000000..f5f09586fff
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_renameheaders/testdata_renameheaders.pro
@@ -0,0 +1,7 @@
+TEMPLATE = app
+TARGET = testdata_renameheaders
+INCLUDEPATH += subdir2
+CONFIG += no_include_pwd
+
+HEADERS = header.h subdir1/header1.h subdir2/header2.h
+SOURCES = main.cpp subdir1/file1.cpp subdir2/file2.cpp
diff --git a/tests/manual/deviceshell/tst_deviceshell.cpp b/tests/manual/deviceshell/tst_deviceshell.cpp
index 96638763f8e..88f95fd7115 100644
--- a/tests/manual/deviceshell/tst_deviceshell.cpp
+++ b/tests/manual/deviceshell/tst_deviceshell.cpp
@@ -33,19 +33,17 @@ public:
             const FilePath shExecutable = Environment::systemEnvironment()
                                                 .searchInPath("sh", {"/usr/local/bin"});
 
-            if (dockerExecutable.exists()) {
+            if (dockerExecutable.exists())
                 cmd = {dockerExecutable, {"run", "-i", "--rm","alpine"}};
-            } else if (dashExecutable.exists()) {
-                cmd = {dashExecutable, {}};
-            } else if (bashExecutable.exists()) {
-                cmd = {bashExecutable, {}};
-            } else if (shExecutable.exists()) {
-                cmd = {shExecutable, {}};
-            }
+            else if (dashExecutable.exists())
+                cmd = CommandLine{dashExecutable};
+            else if (bashExecutable.exists())
+                cmd = CommandLine{bashExecutable};
+            else if (shExecutable.exists())
+                cmd = CommandLine{shExecutable};
 
-            if (cmd.isEmpty()) {
+            if (cmd.isEmpty())
                 return cmd;
-            }
 
             qDebug() << "Using shell cmd:" << cmd;
         }
@@ -97,7 +95,7 @@ class tst_DeviceShell : public QObject
         t.start();
 
         const auto cat = [&shell](const QByteArray &data) {
-            return shell.runInShell({"cat", {}}, data).stdOut;
+            return shell.runInShell(CommandLine{"cat"}, data).stdOut;
         };
         const QList<QByteArray> results = QtConcurrent::blockingMapped(testArray, cat);
         QCOMPARE(results, testArray);
@@ -164,7 +162,7 @@ private slots:
         TestShell shell;
         QCOMPARE(shell.state(), DeviceShell::State::Succeeded);
 
-        const RunResult r = shell.runInShell({"cat", {}}, utf8string.toUtf8());
+        const RunResult r = shell.runInShell(CommandLine{"cat"}, utf8string.toUtf8());
         const QString output = QString::fromUtf8(r.stdOut);
         QCOMPARE(output, utf8string);
     }
diff --git a/tests/manual/layoutbuilder/v2/CMakeLists.txt b/tests/manual/layoutbuilder/v2/CMakeLists.txt
new file mode 100644
index 00000000000..f0d59c37681
--- /dev/null
+++ b/tests/manual/layoutbuilder/v2/CMakeLists.txt
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.5)
+
+project(lb LANGUAGES CXX)
+
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+add_executable(lb lb.h lb.cpp main.cpp)
+
+target_link_libraries(lb PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
diff --git a/tests/manual/layoutbuilder/v2/lb.cpp b/tests/manual/layoutbuilder/v2/lb.cpp
new file mode 100644
index 00000000000..de8f674177d
--- /dev/null
+++ b/tests/manual/layoutbuilder/v2/lb.cpp
@@ -0,0 +1,972 @@
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "lb.h"
+
+#include <QDebug>
+#include <QFormLayout>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QLabel>
+#include <QPushButton>
+#include <QSpacerItem>
+#include <QSpinBox>
+#include <QSplitter>
+#include <QStackedLayout>
+#include <QStackedWidget>
+#include <QStyle>
+#include <QTabWidget>
+#include <QTextEdit>
+#include <QToolBar>
+
+namespace Layouting {
+
+// That's cut down qtcassert.{c,h} to avoid the dependency.
+#define QTC_STRINGIFY_HELPER(x) #x
+#define QTC_STRINGIFY(x) QTC_STRINGIFY_HELPER(x)
+#define QTC_STRING(cond) qDebug("SOFT ASSERT: \"%s\" in %s: %s", cond,  __FILE__, QTC_STRINGIFY(__LINE__))
+#define QTC_ASSERT(cond, action) if (Q_LIKELY(cond)) {} else { QTC_STRING(#cond); action; } do {} while (0)
+#define QTC_CHECK(cond) if (cond) {} else { QTC_STRING(#cond); } do {} while (0)
+
+template <typename X>
+X::Implementation *access(const X *x)
+{
+    return static_cast<X::Implementation *>(x->ptr);
+}
+
+template <typename X>
+void apply(X *x, std::initializer_list<typename X::I> ps)
+{
+    for (auto && p : ps)
+        p.apply(x);
+}
+
+// FlowLayout
+
+class FlowLayout : public QLayout
+{
+public:
+    explicit FlowLayout(QWidget *parent, int margin = -1, int hSpacing = -1, int vSpacing = -1)
+        : QLayout(parent), m_hSpace(hSpacing), m_vSpace(vSpacing)
+    {
+        setContentsMargins(margin, margin, margin, margin);
+    }
+
+    FlowLayout(int margin = -1, int hSpacing = -1, int vSpacing = -1)
+        : m_hSpace(hSpacing), m_vSpace(vSpacing)
+    {
+        setContentsMargins(margin, margin, margin, margin);
+    }
+
+    ~FlowLayout() override
+    {
+        QLayoutItem *item;
+        while ((item = takeAt(0)))
+            delete item;
+    }
+
+    void addItem(QLayoutItem *item) override { itemList.append(item); }
+
+    int horizontalSpacing() const
+    {
+        if (m_hSpace >= 0)
+            return m_hSpace;
+        else
+            return smartSpacing(QStyle::PM_LayoutHorizontalSpacing);
+    }
+
+    int verticalSpacing() const
+    {
+        if (m_vSpace >= 0)
+            return m_vSpace;
+        else
+            return smartSpacing(QStyle::PM_LayoutVerticalSpacing);
+    }
+
+    Qt::Orientations expandingDirections() const override
+    {
+        return {};
+    }
+
+    bool hasHeightForWidth() const override { return true; }
+
+    int heightForWidth(int width) const override
+    {
+        int height = doLayout(QRect(0, 0, width, 0), true);
+        return height;
+    }
+
+    int count() const override { return itemList.size(); }
+
+    QLayoutItem *itemAt(int index) const override
+    {
+        return itemList.value(index);
+    }
+
+    QSize minimumSize() const override
+    {
+        QSize size;
+        for (QLayoutItem *item : itemList)
+            size = size.expandedTo(item->minimumSize());
+
+        int left, top, right, bottom;
+        getContentsMargins(&left, &top, &right, &bottom);
+        size += QSize(left + right, top + bottom);
+        return size;
+    }
+
+    void setGeometry(const QRect &rect) override
+    {
+        QLayout::setGeometry(rect);
+        doLayout(rect, false);
+    }
+
+    QSize sizeHint() const override
+    {
+        return minimumSize();
+    }
+
+    QLayoutItem *takeAt(int index) override
+    {
+        if (index >= 0 && index < itemList.size())
+            return itemList.takeAt(index);
+        else
+            return nullptr;
+    }
+
+private:
+    int doLayout(const QRect &rect, bool testOnly) const
+    {
+        int left, top, right, bottom;
+        getContentsMargins(&left, &top, &right, &bottom);
+        QRect effectiveRect = rect.adjusted(+left, +top, -right, -bottom);
+        int x = effectiveRect.x();
+        int y = effectiveRect.y();
+        int lineHeight = 0;
+
+        for (QLayoutItem *item : itemList) {
+            QWidget *wid = item->widget();
+            int spaceX = horizontalSpacing();
+            if (spaceX == -1)
+                spaceX = wid->style()->layoutSpacing(
+                            QSizePolicy::PushButton, QSizePolicy::PushButton, Qt::Horizontal);
+            int spaceY = verticalSpacing();
+            if (spaceY == -1)
+                spaceY = wid->style()->layoutSpacing(
+                            QSizePolicy::PushButton, QSizePolicy::PushButton, Qt::Vertical);
+            int nextX = x + item->sizeHint().width() + spaceX;
+            if (nextX - spaceX > effectiveRect.right() && lineHeight > 0) {
+                x = effectiveRect.x();
+                y = y + lineHeight + spaceY;
+                nextX = x + item->sizeHint().width() + spaceX;
+                lineHeight = 0;
+            }
+
+            if (!testOnly)
+                item->setGeometry(QRect(QPoint(x, y), item->sizeHint()));
+
+            x = nextX;
+            lineHeight = qMax(lineHeight, item->sizeHint().height());
+        }
+        return y + lineHeight - rect.y() + bottom;
+    }
+
+    int smartSpacing(QStyle::PixelMetric pm) const
+    {
+        QObject *parent = this->parent();
+        if (!parent) {
+            return -1;
+        } else if (parent->isWidgetType()) {
+            auto pw = static_cast<QWidget *>(parent);
+            return pw->style()->pixelMetric(pm, nullptr, pw);
+        } else {
+            return static_cast<QLayout *>(parent)->spacing();
+        }
+    }
+
+    QList<QLayoutItem *> itemList;
+    int m_hSpace;
+    int m_vSpace;
+};
+
+/*!
+    \namespace Layouting
+    \inmodule QtCreator
+
+    \brief The Layouting namespace contains classes and functions to conveniently
+    create layouts in code.
+
+    Classes in the namespace help to create create QLayout or QWidget derived class,
+    instances should be used locally within a function and never stored.
+
+    \sa Layouting::Widget, Layouting::Layout
+*/
+
+
+/*!
+    \class Layouting::Layout
+    \inmodule QtCreator
+
+    The Layout class is a base class for more specific builder
+    classes to create QLayout derived objects.
+ */
+
+/*!
+    \class Layouting::Widget
+    \inmodule QtCreator
+
+    The Widget class is a base class for more specific builder
+    classes to create QWidget derived objects.
+*/
+
+/*!
+    \class Layouting::LayoutItem
+    \inmodule QtCreator
+
+    The LayoutItem class is used for intermediate results
+    while creating layouts with a concept of rows and spans, such
+    as Form and Grid.
+*/
+
+Layout::LayoutItem::LayoutItem() = default;
+
+Layout::LayoutItem::~LayoutItem() = default;
+
+Layout::LayoutItem::LayoutItem(const LayoutModifier &inner)
+{
+    ownerModifier = inner;
+}
+
+/*!
+    \fn  template <class T> LayoutItem(const T &t)
+    \internal
+
+    Constructs a layout item proxy for \a t.
+
+    T could be
+    \list
+    \li  \c {QString}
+    \li  \c {QWidget *}
+    \li  \c {QLayout *}
+    \endlist
+*/
+
+// Object
+
+Object::Object(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+static QWidget *widgetForItem(QLayoutItem *item)
+{
+    if (QWidget *w = item->widget())
+        return w;
+    if (item->spacerItem())
+        return nullptr;
+    if (QLayout *l = item->layout()) {
+        for (int i = 0, n = l->count(); i < n; ++i) {
+            if (QWidget *w = widgetForItem(l->itemAt(i)))
+                return w;
+        }
+    }
+    return nullptr;
+}
+
+static QLabel *createLabel(const QString &text)
+{
+    auto label = new QLabel(text);
+    label->setTextInteractionFlags(Qt::TextSelectableByMouse);
+    return label;
+}
+
+using LayoutItem = Layout::LayoutItem;
+
+static void addItemToBoxLayout(QBoxLayout *layout, const LayoutItem &item)
+{
+    if (QWidget *w = item.widget) {
+        layout->addWidget(w);
+    } else if (QLayout *l = item.layout) {
+        layout->addLayout(l);
+    } else if (item.stretch != -1) {
+        layout->addStretch(item.stretch);
+    } else if (!item.text.isEmpty()) {
+        layout->addWidget(createLabel(item.text));
+    } else if (item.empty) {
+        // Nothing to do, but no reason to warn, either.
+    } else {
+        QTC_CHECK(false);
+    }
+}
+
+static void addItemToFlowLayout(FlowLayout *layout, const LayoutItem &item)
+{
+    if (QWidget *w = item.widget) {
+        layout->addWidget(w);
+    } else if (QLayout *l = item.layout) {
+        layout->addItem(l);
+//    } else if (item.stretch != -1) {
+//        layout->addStretch(item.stretch);
+    } else if (item.empty) {
+        // Nothing to do, but no reason to warn, either
+    } else if (!item.text.isEmpty()) {
+        layout->addWidget(createLabel(item.text));
+    } else {
+        QTC_CHECK(false);
+    }
+}
+
+/*!
+    \class Layouting::Space
+    \inmodule QtCreator
+
+    \brief The Space class represents some empty space in a layout.
+ */
+
+/*!
+    \class Layouting::Stretch
+    \inmodule QtCreator
+
+    \brief The Stretch class represents some stretch in a layout.
+ */
+
+
+// Layout
+
+void Layout::span(int cols, int rows)
+{
+    QTC_ASSERT(!pendingItems.empty(), return);
+    pendingItems.back().spanCols = cols;
+    pendingItems.back().spanRows = rows;
+}
+
+void Layout::noMargin()
+{
+    customMargin({});
+}
+
+void Layout::normalMargin()
+{
+    customMargin({9, 9, 9, 9});
+}
+
+void Layout::customMargin(const QMargins &margin)
+{
+    access(this)->setContentsMargins(margin);
+}
+
+/*!
+    Attaches the constructed layout to the provided QWidget \a w.
+
+    This operation can only be performed once per LayoutBuilder instance.
+ */
+void Layout::attachTo(QWidget *widget)
+{
+    flush();
+    widget->setLayout(access(this));
+}
+
+/*!
+    Adds the layout item \a item as sub items.
+ */
+void Layout::addItem(I item)
+{
+    item.apply(this);
+}
+
+void Layout::addItemHelper(const LayoutItem &item)
+{
+    if (QBoxLayout *lt = asBox())
+        addItemToBoxLayout(lt, item);
+    else if (FlowLayout *lt = asFlow())
+        addItemToFlowLayout(lt, item);
+    else
+        pendingItems.push_back(item);
+}
+
+/*!
+    Adds the layout items \a items as sub items.
+ */
+void Layout::addItems(std::initializer_list<I> items)
+{
+    for (const I &item : items)
+        item.apply(this);
+}
+
+/*!
+    Starts a new row containing \a items. The row can be further extended by
+    other items using \c addItem() or \c addItems().
+
+    \sa addItem(), addItems()
+ */
+
+void Layout::addRow(std::initializer_list<I> items)
+{
+    for (const I &item : items)
+        item.apply(this);
+    flush();
+}
+
+void Layout::setSpacing(int spacing)
+{
+    access(this)->setSpacing(spacing);
+}
+
+void Layout::setColumnStretch(int column, int stretch)
+{
+    if (auto grid = qobject_cast<QGridLayout *>(access(this))) {
+        grid->setColumnStretch(column, stretch);
+    } else {
+        QTC_CHECK(false);
+    }
+}
+
+void addToWidget(Widget *widget, const Layout &layout)
+{
+    layout.flush_();
+    access(widget)->setLayout(access(&layout));
+}
+
+void addToLayout(Layout *layout, const Widget &inner)
+{
+    LayoutItem item;
+    item.widget = access(&inner);
+    layout->addItemHelper(item);
+}
+
+void addToLayout(Layout *layout, QWidget *inner)
+{
+    LayoutItem item;
+    item.widget = inner;
+    layout->addItemHelper(item);
+}
+
+void addToLayout(Layout *layout, QLayout *inner)
+{
+    LayoutItem item;
+    item.layout = inner;
+    layout->addItemHelper(item);
+}
+
+void addToLayout(Layout *layout, const Layout &inner)
+{
+    inner.flush_();
+    LayoutItem item;
+    item.layout = access(&inner);
+    layout->addItemHelper(item);
+}
+
+void addToLayout(Layout *layout, const LayoutModifier &inner)
+{
+    inner(layout);
+}
+
+void addToLayout(Layout *layout, const QString &inner)
+{
+    LayoutItem item;
+    item.text = inner;
+    layout->addItemHelper(item);
+}
+
+void empty(Layout *iface)
+{
+    LayoutItem item;
+    item.empty = true;
+    iface->addItemHelper(item);
+}
+
+void hr(Layout *layout)
+{
+    layout->addItemHelper(createHr());
+}
+
+void br(Layout *iface)
+{
+    iface->flush();
+}
+
+void st(Layout *iface)
+{
+    LayoutItem item;
+    item.stretch = 1;
+    iface->addItemHelper(item);
+}
+
+void noMargin(Layout *iface)
+{
+    iface->noMargin();
+}
+
+void normalMargin(Layout *iface)
+{
+    iface->normalMargin();
+}
+
+QFormLayout *Layout::asForm()
+{
+    return qobject_cast<QFormLayout *>(access(this));
+}
+
+QGridLayout *Layout::asGrid()
+{
+    return qobject_cast<QGridLayout *>(access(this));
+}
+
+QBoxLayout *Layout::asBox()
+{
+    return qobject_cast<QBoxLayout *>(access(this));
+}
+
+FlowLayout *Layout::asFlow()
+{
+    return dynamic_cast<FlowLayout *>(access(this));
+}
+
+void Layout::flush()
+{
+    if (pendingItems.empty())
+        return;
+
+    if (QGridLayout *lt = asGrid()) {
+        for (const LayoutItem &item : std::as_const(pendingItems)) {
+            Qt::Alignment a;
+            if (currentGridColumn == 0 && useFormAlignment) {
+                // if (auto widget = builder.stack.at(builder.stack.size() - 2).widget) {
+                //     a = widget->style()->styleHint(QStyle::SH_FormLayoutLabelAlignment);
+            }
+            if (item.widget)
+                lt->addWidget(item.widget, currentGridRow, currentGridColumn, item.spanRows, item.spanCols, a);
+            else if (item.layout)
+                lt->addLayout(item.layout, currentGridRow, currentGridColumn, item.spanRows, item.spanCols, a);
+            else if (!item.text.isEmpty())
+                lt->addWidget(createLabel(item.text), currentGridRow, currentGridColumn, item.spanRows, item.spanCols, a);
+            currentGridColumn += item.spanCols;
+            // Intentionally not used, use 'br'/'empty' for vertical progress.
+            // currentGridRow += item.spanRows;
+        }
+        ++currentGridRow;
+        currentGridColumn = 0;
+        pendingItems.clear();
+        return;
+    }
+
+    if (QFormLayout *fl = asForm()) {
+        if (pendingItems.size() > 2) {
+            auto hbox = new QHBoxLayout;
+            hbox->setContentsMargins(0, 0, 0, 0);
+            for (size_t i = 1; i < pendingItems.size(); ++i)
+                addItemToBoxLayout(hbox, pendingItems.at(i));
+            while (pendingItems.size() > 1)
+                pendingItems.pop_back();
+            pendingItems.push_back(hbox);
+        }
+
+        if (pendingItems.size() == 1) { // Only one item given, so this spans both columns.
+            const LayoutItem &f0 = pendingItems.at(0);
+            if (auto layout = f0.layout)
+                fl->addRow(layout);
+            else if (auto widget = f0.widget)
+                fl->addRow(widget);
+        } else if (pendingItems.size() == 2) { // Normal case, both columns used.
+            LayoutItem &f1 = pendingItems[1];
+            const LayoutItem &f0 = pendingItems.at(0);
+            if (!f1.widget && !f1.layout && !f1.text.isEmpty())
+                f1.widget = createLabel(f1.text);
+
+            // QFormLayout accepts only widgets or text in the first column.
+            // FIXME: Should we be more generous?
+            if (f0.widget) {
+                if (f1.layout)
+                    fl->addRow(f0.widget, f1.layout);
+                else if (f1.widget)
+                    fl->addRow(f0.widget, f1.widget);
+            } else  {
+                if (f1.layout)
+                    fl->addRow(createLabel(f0.text), f1.layout);
+                else if (f1.widget)
+                    fl->addRow(createLabel(f0.text), f1.widget);
+            }
+        } else {
+            QTC_CHECK(false);
+        }
+
+        // Set up label as buddy if possible.
+        const int lastRow = fl->rowCount() - 1;
+        QLayoutItem *l = fl->itemAt(lastRow, QFormLayout::LabelRole);
+        QLayoutItem *f = fl->itemAt(lastRow, QFormLayout::FieldRole);
+        if (l && f) {
+            if (QLabel *label = qobject_cast<QLabel *>(l->widget())) {
+                if (QWidget *widget = widgetForItem(f))
+                    label->setBuddy(widget);
+            }
+        }
+
+        pendingItems.clear();
+        return;
+    }
+
+    QTC_CHECK(false); // The other layouts shouldn't use flush()
+}
+
+void Layout::flush_() const
+{
+    const_cast<Layout *>(this)->flush();
+}
+
+void withFormAlignment(Layout *iface)
+{
+    iface->useFormAlignment = true;
+}
+
+// Flow
+
+Flow::Flow(std::initializer_list<I> ps)
+{
+    ptr = new FlowLayout;
+    apply(this, ps);
+    flush();
+}
+
+// Row & Column
+
+Row::Row(std::initializer_list<I> ps)
+{
+    ptr = new QHBoxLayout;
+    apply(this, ps);
+    flush();
+}
+
+Column::Column(std::initializer_list<I> ps)
+{
+    ptr = new QVBoxLayout;
+    apply(this, ps);
+    flush();
+}
+
+// Grid
+
+Grid::Grid()
+{
+    ptr = new QGridLayout;
+}
+
+Grid::Grid(std::initializer_list<I> ps)
+{
+    ptr = new QGridLayout;
+    apply(this, ps);
+    flush();
+}
+
+// Form
+
+Form::Form()
+{
+    ptr = new QFormLayout;
+}
+
+Form::Form(std::initializer_list<I> ps)
+{
+    auto lt = new QFormLayout;
+    ptr = lt;
+    lt->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
+    apply(this, ps);
+    flush();
+}
+
+void Layout::fieldGrowthPolicy(int policy)
+{
+    if (auto lt = asForm())
+        lt->setFieldGrowthPolicy(QFormLayout::FieldGrowthPolicy(policy));
+}
+
+QWidget *Layout::emerge() const
+{
+    const_cast<Layout *>(this)->flush();
+    QWidget *widget = new QWidget;
+    widget->setLayout(access(this));
+    return widget;
+}
+
+// "Widgets"
+
+Widget::Widget(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+void Widget::resize(int w, int h)
+{
+    access(this)->resize(w, h);
+}
+
+void Widget::setLayout(const Layout &layout)
+{
+    access(this)->setLayout(access(&layout));
+}
+
+void Widget::setWindowTitle(const QString &title)
+{
+    access(this)->setWindowTitle(title);
+}
+
+void Widget::setToolTip(const QString &title)
+{
+    access(this)->setToolTip(title);
+}
+
+void Widget::show()
+{
+    access(this)->show();
+}
+
+void Widget::noMargin(int)
+{
+    customMargin({});
+}
+
+void Widget::normalMargin(int)
+{
+    customMargin({9, 9, 9, 9});
+}
+
+void Widget::customMargin(const QMargins &margin)
+{
+    access(this)->setContentsMargins(margin);
+}
+
+QWidget *Widget::emerge() const
+{
+    return access(this);
+}
+
+// Label
+
+Label::Label(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+Label::Label(const QString &text)
+{
+    ptr = new Implementation;
+    setText(text);
+}
+
+void Label::setText(const QString &text)
+{
+    access(this)->setText(text);
+}
+
+// Group
+
+Group::Group(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+void Group::setTitle(const QString &title)
+{
+    access(this)->setTitle(title);
+    access(this)->setObjectName(title);
+}
+
+void Group::setGroupChecker(const std::function<void (QObject *)> &checker)
+{
+    checker(access(this));
+}
+
+// SpinBox
+
+SpinBox::SpinBox(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+void SpinBox::setValue(int val)
+{
+    access(this)->setValue(val);
+}
+
+void SpinBox::onTextChanged(const std::function<void (QString)> &func)
+{
+    QObject::connect(access(this), &QSpinBox::textChanged, func);
+}
+
+// TextEdit
+
+TextEdit::TextEdit(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+void TextEdit::setText(const QString &text)
+{
+    access(this)->setText(text);
+}
+
+// PushButton
+
+PushButton::PushButton(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+void PushButton::setText(const QString &text)
+{
+    access(this)->setText(text);
+}
+
+void PushButton::onClicked(const std::function<void ()> &func, QObject *guard)
+{
+    QObject::connect(access(this), &QAbstractButton::clicked, guard, func);
+}
+
+// Stack
+
+// We use a QStackedWidget instead of a QStackedLayout here because the latter will call
+// "setVisible()" when a child is added, which can lead to the widget being spawned as a
+// top-level widget. This can lead to the focus shifting away from the main application.
+Stack::Stack(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+void addToStack(Stack *stack, const Widget &inner)
+{
+    access(stack)->addWidget(inner.emerge());
+}
+
+void addToStack(Stack *stack, const Layout &inner)
+{
+    inner.flush_();
+    access(stack)->addWidget(inner.emerge());
+}
+
+void addToStack(Stack *stack, QWidget *inner)
+{
+    access(stack)->addWidget(inner);
+}
+
+// Splitter
+
+Splitter::Splitter(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    access(this)->setOrientation(Qt::Vertical);
+    apply(this, ps);
+}
+
+void addToSplitter(Splitter *splitter, QWidget *inner)
+{
+    access(splitter)->addWidget(inner);
+}
+
+void addToSplitter(Splitter *splitter, const Widget &inner)
+{
+    access(splitter)->addWidget(inner.emerge());
+}
+
+void addToSplitter(Splitter *splitter, const Layout &inner)
+{
+    inner.flush_();
+    access(splitter)->addWidget(inner.emerge());
+}
+
+// ToolBar
+
+ToolBar::ToolBar(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+    access(this)->setOrientation(Qt::Horizontal);
+}
+
+// TabWidget
+
+TabWidget::TabWidget(std::initializer_list<I> ps)
+{
+    ptr = new Implementation;
+    apply(this, ps);
+}
+
+Tab::Tab(const QString &tabName, const Layout &inner)
+    : tabName(tabName), inner(inner)
+{}
+
+void addToTabWidget(TabWidget *tabWidget, const Tab &tab)
+{
+    access(tabWidget)->addTab(tab.inner.emerge(), tab.tabName);
+}
+
+// Special If
+
+If::If(bool condition,
+   const std::initializer_list<Layout::I> ifcase,
+   const std::initializer_list<Layout::I> thencase)
+    : used(condition ? ifcase : thencase)
+{}
+
+void addToLayout(Layout *layout, const If &inner)
+{
+    for (const Layout::I &item : inner.used)
+        item.apply(layout);
+}
+
+// Specials
+
+QWidget *createHr(QWidget *parent)
+{
+    auto frame = new QFrame(parent);
+    frame->setFrameShape(QFrame::HLine);
+    frame->setFrameShadow(QFrame::Sunken);
+    return frame;
+}
+
+Span::Span(int n, const Layout::I &item)
+    : item(item), spanCols(n)
+{}
+
+void addToLayout(Layout *layout, const Span &inner)
+{
+    LayoutItem item;
+    layout->addItem(inner.item);
+    QTC_ASSERT(!layout->pendingItems.empty(), return);
+    layout->pendingItems.back().spanCols = inner.spanCols;
+    layout->pendingItems.back().spanRows = inner.spanRows;
+}
+
+LayoutModifier spacing(int space)
+{
+    return [space](Layout *iface) { iface->setSpacing(space); };
+}
+
+void addToLayout(Layout *layout, const Space &inner)
+{
+    if (auto lt = layout->asBox())
+        lt->addSpacing(inner.space);
+}
+
+void addToLayout(Layout *layout, const Stretch &inner)
+{
+    if (auto lt = layout->asBox())
+        lt->addStretch(inner.stretch);
+}
+
+// void createItem(LayoutItem *item, QWidget *t)
+// {
+//     if (auto l = qobject_cast<QLabel *>(t))
+//         l->setTextInteractionFlags(l->textInteractionFlags() | Qt::TextSelectableByMouse);
+
+//     item->onAdd = [t](LayoutBuilder &builder) { doAddWidget(builder, t); };
+// }
+
+
+} // Layouting
diff --git a/tests/manual/layoutbuilder/v2/lb.h b/tests/manual/layoutbuilder/v2/lb.h
new file mode 100644
index 00000000000..99c87af564b
--- /dev/null
+++ b/tests/manual/layoutbuilder/v2/lb.h
@@ -0,0 +1,553 @@
+// Copyright (C) 2023 André Pönitz
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+#pragma once
+
+#include <QMargins>
+#include <QString>
+
+#include <functional>
+#include <initializer_list>
+
+#if defined(UTILS_LIBRARY)
+#  define QTCREATOR_UTILS_EXPORT Q_DECL_EXPORT
+#elif defined(UTILS_STATIC_LIBRARY)
+#  define QTCREATOR_UTILS_EXPORT
+#else
+#  define QTCREATOR_UTILS_EXPORT Q_DECL_IMPORT
+#endif
+
+QT_BEGIN_NAMESPACE
+class QBoxLayout;
+class QFormLayout;
+class QGridLayout;
+class QGroupBox;
+class QHBoxLayout;
+class QLabel;
+class QLayout;
+class QMargins;
+class QObject;
+class QPushButton;
+class QSpinBox;
+class QSplitter;
+class QStackedWidget;
+class QTabWidget;
+class QTextEdit;
+class QToolBar;
+class QVBoxLayout;
+class QWidget;
+QT_END_NAMESPACE
+
+namespace Layouting {
+
+class NestId {};
+
+template <typename T1, typename T2>
+class IdAndArg
+{
+public:
+    IdAndArg(const T1 &id, const T2 &arg) : id(id), arg(arg) {}
+    const T1 id;
+    const T2 arg; // FIXME: Could be const &, but this would currently break bindTo().
+};
+
+// The main dispatcher
+
+void doit(auto x, auto id, auto p);
+
+template <typename X> class BuilderItem
+{
+public:
+    // Nested child object
+    template <typename Inner>
+    BuilderItem(Inner && p)
+    {
+        apply = [&p](X *x) { doit(x, NestId{}, std::forward<Inner>(p)); };
+    }
+
+    // Property setter
+    template <typename Id, typename Arg>
+    BuilderItem(IdAndArg<Id, Arg> && idarg)
+    {
+        apply = [&idarg](X *x) { doit(x, idarg.id, idarg.arg); };
+    }
+
+    std::function<void(X *)> apply;
+};
+
+
+//////////////////////////////////////////////
+
+//
+// Basic
+//
+
+class QTCREATOR_UTILS_EXPORT Thing
+{
+public:
+    void *ptr; // The product.
+};
+
+class QTCREATOR_UTILS_EXPORT Object : public Thing
+{
+public:
+    using Implementation = QObject;
+    using I = BuilderItem<Object>;
+
+    Object() = default;
+    Object(std::initializer_list<I> ps);
+};
+
+//
+// Layouts
+//
+
+class FlowLayout;
+class Layout;
+using LayoutModifier = std::function<void(Layout *)>;
+// using LayoutModifier = void(*)(Layout *);
+
+class QTCREATOR_UTILS_EXPORT Layout : public Object
+{
+public:
+    using Implementation = QLayout;
+    using I = BuilderItem<Layout>;
+
+    Layout() = default;
+    Layout(Implementation *w) { ptr = w; }
+
+    class LayoutItem
+    {
+    public:
+        ~LayoutItem();
+        LayoutItem();
+        LayoutItem(QLayout *l) : layout(l) {}
+        LayoutItem(QWidget *w) : widget(w) {}
+        LayoutItem(const QString &t) : text(t) {}
+        LayoutItem(const LayoutModifier &inner);
+
+        QString text;
+        QLayout *layout = nullptr;
+        QWidget *widget = nullptr;
+        int stretch = -1;
+        int spanCols = 1;
+        int spanRows = 1;
+        bool empty = false;
+        LayoutModifier ownerModifier;
+        //Qt::Alignment align = {};
+    };
+
+    void span(int cols, int rows);
+    void noMargin();
+    void normalMargin();
+    void customMargin(const QMargins &margin);
+    void setColumnStretch(int cols, int rows);
+    void setSpacing(int space);
+
+    void attachTo(QWidget *);
+    void addItemHelper(const LayoutItem &item);
+    void addItem(I item);
+    void addItems(std::initializer_list<I> items);
+    void addRow(std::initializer_list<I> items);
+
+    void flush();
+    void flush_() const;
+    void fieldGrowthPolicy(int policy);
+
+    QWidget *emerge() const;
+
+    QFormLayout *asForm();
+    QGridLayout *asGrid();
+    QBoxLayout *asBox();
+    FlowLayout *asFlow();
+
+    // Grid-only
+    int currentGridColumn = 0;
+    int currentGridRow = 0;
+    //Qt::Alignment align = {};
+    bool useFormAlignment = false;
+
+    std::vector<LayoutItem> pendingItems;
+};
+
+class QTCREATOR_UTILS_EXPORT Column : public Layout
+{
+public:
+    using Implementation = QVBoxLayout;
+    using I = BuilderItem<Column>;
+
+    Column(std::initializer_list<I> ps);
+};
+
+class QTCREATOR_UTILS_EXPORT Row : public Layout
+{
+public:
+    using Implementation = QHBoxLayout;
+    using I = BuilderItem<Row>;
+
+    Row(std::initializer_list<I> ps);
+};
+
+class QTCREATOR_UTILS_EXPORT Form : public Layout
+{
+public:
+    using Implementation = QFormLayout;
+    using I = BuilderItem<Form>;
+
+    Form();
+    Form(std::initializer_list<I> ps);
+};
+
+class QTCREATOR_UTILS_EXPORT Grid : public Layout
+{
+public:
+    using Implementation = QGridLayout;
+    using I = BuilderItem<Grid>;
+
+    Grid();
+    Grid(std::initializer_list<I> ps);
+};
+
+class QTCREATOR_UTILS_EXPORT Flow : public Layout
+{
+public:
+    Flow(std::initializer_list<I> ps);
+};
+
+class QTCREATOR_UTILS_EXPORT Stretch
+{
+public:
+    explicit Stretch(int stretch) : stretch(stretch) {}
+
+    int stretch;
+};
+
+class QTCREATOR_UTILS_EXPORT Space
+{
+public:
+    explicit Space(int space) : space(space) {}
+
+    int space;
+};
+
+class QTCREATOR_UTILS_EXPORT Span
+{
+public:
+    Span(int n, const Layout::I &item);
+
+    Layout::I item;
+    int spanCols = 1;
+    int spanRows = 1;
+};
+
+//
+// Widgets
+//
+
+class QTCREATOR_UTILS_EXPORT Widget : public Object
+{
+public:
+    using Implementation = QWidget;
+    using I = BuilderItem<Widget>;
+
+    Widget() = default;
+    Widget(std::initializer_list<I> ps);
+    Widget(Implementation *w) { ptr = w; }
+
+    QWidget *emerge() const;
+
+    void show();
+    void resize(int, int);
+    void setLayout(const Layout &layout);
+    void setWindowTitle(const QString &);
+    void setToolTip(const QString &);
+    void noMargin(int = 0);
+    void normalMargin(int = 0);
+    void customMargin(const QMargins &margin);
+};
+
+class QTCREATOR_UTILS_EXPORT Label : public Widget
+{
+public:
+    using Implementation = QLabel;
+    using I = BuilderItem<Label>;
+
+    Label(std::initializer_list<I> ps);
+    Label(const QString &text);
+
+    void setText(const QString &);
+};
+
+class QTCREATOR_UTILS_EXPORT Group : public Widget
+{
+public:
+    using Implementation = QGroupBox;
+    using I = BuilderItem<Group>;
+
+    Group(std::initializer_list<I> ps);
+
+    void setTitle(const QString &);
+    void setGroupChecker(const std::function<void(QObject *)> &);
+};
+
+class QTCREATOR_UTILS_EXPORT SpinBox : public Widget
+{
+public:
+    using Implementation = QSpinBox;
+    using I = BuilderItem<SpinBox>;
+
+    SpinBox(std::initializer_list<I> ps);
+
+    void setValue(int);
+    void onTextChanged(const std::function<void(QString)> &);
+};
+
+class QTCREATOR_UTILS_EXPORT PushButton : public Widget
+{
+public:
+    using Implementation = QPushButton;
+    using I = BuilderItem<PushButton>;
+
+    PushButton(std::initializer_list<I> ps);
+
+    void setText(const QString &);
+    void onClicked(const std::function<void()> &, QObject *guard);
+};
+
+class QTCREATOR_UTILS_EXPORT TextEdit : public Widget
+{
+public:
+    using Implementation = QTextEdit;
+    using I = BuilderItem<TextEdit>;
+    using Id = Implementation *;
+
+    TextEdit(std::initializer_list<I> ps);
+
+    void setText(const QString &);
+};
+
+class QTCREATOR_UTILS_EXPORT Splitter : public Widget
+{
+public:
+    using Implementation = QSplitter;
+    using I = BuilderItem<Splitter>;
+
+    Splitter(std::initializer_list<I> items);
+};
+
+class QTCREATOR_UTILS_EXPORT Stack : public Widget
+{
+public:
+    using Implementation = QStackedWidget;
+    using I = BuilderItem<Stack>;
+
+    Stack() : Stack({}) {}
+    Stack(std::initializer_list<I> items);
+};
+
+class QTCREATOR_UTILS_EXPORT Tab : public Widget
+{
+public:
+    using Implementation = QWidget;
+
+    Tab(const QString &tabName, const Layout &inner);
+
+    const QString tabName;
+    const Layout inner;
+};
+
+class QTCREATOR_UTILS_EXPORT TabWidget : public Widget
+{
+public:
+    using Implementation = QTabWidget;
+    using I = BuilderItem<TabWidget>;
+
+    TabWidget(std::initializer_list<I> items);
+};
+
+class QTCREATOR_UTILS_EXPORT ToolBar : public Widget
+{
+public:
+    using Implementation = QToolBar;
+    using I = Layouting::BuilderItem<ToolBar>;
+
+    ToolBar(std::initializer_list<I> items);
+};
+
+// Special
+
+class QTCREATOR_UTILS_EXPORT If
+{
+public:
+    If(bool condition,
+       const std::initializer_list<Layout::I> ifcase,
+       const std::initializer_list<Layout::I> thencase = {});
+
+    const std::initializer_list<Layout::I> used;
+};
+
+//
+// Dispatchers
+//
+
+// We need one 'Id' (and a corresponding function wrapping arguments into a
+// tuple marked by this id) per 'name' of "backend" setter member function,
+// i.e. one 'text' is sufficient for QLabel::setText, QLineEdit::setText.
+// The name of the Id does not have to match the backend names as it
+// is mapped per-backend-type in the respective setter implementation
+// but we assume that it generally makes sense to stay close to the
+// wrapped API name-wise.
+
+// These are free functions overloaded on the type of builder object
+// and setter id. The function implementations are independent, but
+// the base expectation is that they will forwards to the backend
+// type's setter.
+
+// Special dispatchers
+
+
+class BindToId {};
+
+template <typename T>
+auto bindTo(T **p)
+{
+    return IdAndArg{BindToId{}, p};
+}
+
+template <typename Interface>
+void doit(Interface *x, BindToId, auto p)
+{
+    *p = static_cast<Interface::Implementation *>(x->ptr);
+}
+
+class IdId {};
+auto id(auto p) { return IdAndArg{IdId{}, p}; }
+
+template <typename Interface>
+void doit(Interface *x, IdId, auto p)
+{
+    *p = static_cast<Interface::Implementation *>(x->ptr);
+}
+
+// Setter dispatchers
+
+class SizeId {};
+auto size(auto w, auto h) { return IdAndArg{SizeId{}, std::pair{w, h}}; }
+void doit(auto x, SizeId, auto p) { x->resize(p.first, p.second); }
+
+class TextId {};
+auto text(auto p) { return IdAndArg{TextId{}, p}; }
+void doit(auto x, TextId, auto p) { x->setText(p); }
+
+class TitleId {};
+auto title(auto p) { return IdAndArg{TitleId{}, p}; }
+void doit(auto x, TitleId, auto p) { x->setTitle(p); }
+
+class GroupCheckerId {};
+auto groupChecker(auto p) { return IdAndArg{GroupCheckerId{}, p}; }
+void doit(auto x, GroupCheckerId, auto p) { x->setGroupChecker(p); }
+
+class ToolTipId {};
+auto toolTip(auto p) { return IdAndArg{ToolTipId{}, p}; }
+void doit(auto x, ToolTipId, auto p) { x->setToolTip(p); }
+
+class WindowTitleId {};
+auto windowTitle(auto p) { return IdAndArg{WindowTitleId{}, p}; }
+void doit(auto x, WindowTitleId, auto p) { x->setWindowTitle(p); }
+
+class OnTextChangedId {};
+auto onTextChanged(auto p) { return IdAndArg{OnTextChangedId{}, p}; }
+void doit(auto x, OnTextChangedId, auto p) { x->onTextChanged(p); }
+
+class OnClickedId {};
+auto onClicked(auto p, auto guard) { return IdAndArg{OnClickedId{}, std::pair{p, guard}}; }
+void doit(auto x, OnClickedId, auto p) { x->onClicked(p.first, p.second); }
+
+class CustomMarginId {};
+inline auto customMargin(const QMargins &p) { return IdAndArg{CustomMarginId{}, p}; }
+void doit(auto x, CustomMarginId, auto p) { x->customMargin(p); }
+
+class FieldGrowthPolicyId {};
+inline auto fieldGrowthPolicy(auto p) { return IdAndArg{FieldGrowthPolicyId{}, p}; }
+void doit(auto x, FieldGrowthPolicyId, auto p) { x->fieldGrowthPolicy(p); }
+
+class ColumnStretchId {};
+inline auto columnStretch(int column, int stretch) { return IdAndArg{ColumnStretchId{}, std::pair{column, stretch}}; }
+void doit(auto x, ColumnStretchId, auto p) { x->setColumnStretch(p.first, p.second); }
+
+// Nesting dispatchers
+
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const Layout &inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const Widget &inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, QWidget *inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, QLayout *inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const LayoutModifier &inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const QString &inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const Space &inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const Stretch &inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const If &inner);
+QTCREATOR_UTILS_EXPORT void addToLayout(Layout *layout, const Span &inner);
+// ... can be added to anywhere later to support "user types"
+
+QTCREATOR_UTILS_EXPORT void addToWidget(Widget *widget, const Layout &layout);
+
+QTCREATOR_UTILS_EXPORT void addToTabWidget(TabWidget *tabWidget, const Tab &inner);
+
+QTCREATOR_UTILS_EXPORT void addToSplitter(Splitter *splitter, QWidget *inner);
+QTCREATOR_UTILS_EXPORT void addToSplitter(Splitter *splitter, const Widget &inner);
+QTCREATOR_UTILS_EXPORT void addToSplitter(Splitter *splitter, const Layout &inner);
+
+QTCREATOR_UTILS_EXPORT void addToStack(Stack *stack, QWidget *inner);
+QTCREATOR_UTILS_EXPORT void addToStack(Stack *stack, const Widget &inner);
+QTCREATOR_UTILS_EXPORT void addToStack(Stack *stack, const Layout &inner);
+
+template <class Inner>
+void doit_nested(Layout *outer, Inner && inner)
+{
+    addToLayout(outer, std::forward<Inner>(inner));
+}
+
+void doit_nested(Widget *outer, auto inner)
+{
+    addToWidget(outer, inner);
+}
+
+void doit_nested(TabWidget *outer, auto inner)
+{
+    addToTabWidget(outer, inner);
+}
+
+void doit_nested(Stack *outer, auto inner)
+{
+    addToStack(outer, inner);
+}
+
+void doit_nested(Splitter *outer, auto inner)
+{
+    addToSplitter(outer, inner);
+}
+
+template <class Inner>
+void doit(auto outer, NestId, Inner && inner)
+{
+    doit_nested(outer, std::forward<Inner>(inner));
+}
+
+// Special layout items
+
+QTCREATOR_UTILS_EXPORT void empty(Layout *);
+QTCREATOR_UTILS_EXPORT void br(Layout *);
+QTCREATOR_UTILS_EXPORT void st(Layout *);
+QTCREATOR_UTILS_EXPORT void noMargin(Layout *);
+QTCREATOR_UTILS_EXPORT void normalMargin(Layout *);
+QTCREATOR_UTILS_EXPORT void withFormAlignment(Layout *);
+QTCREATOR_UTILS_EXPORT void hr(Layout *);
+
+QTCREATOR_UTILS_EXPORT LayoutModifier spacing(int space);
+
+// Convenience
+
+QTCREATOR_UTILS_EXPORT QWidget *createHr(QWidget *parent = nullptr);
+
+} // Layouting
diff --git a/tests/manual/layoutbuilder/v2/main.cpp b/tests/manual/layoutbuilder/v2/main.cpp
new file mode 100644
index 00000000000..702d467016d
--- /dev/null
+++ b/tests/manual/layoutbuilder/v2/main.cpp
@@ -0,0 +1,79 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "lb.h"
+
+#include <QApplication>
+#include <QWidget>
+#include <QLabel>
+#include <QGroupBox>
+#include <QTextEdit>
+
+using namespace Layouting;
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    TextEdit::Id textId;
+
+    QWidget *w = nullptr;
+    QGroupBox *g = nullptr;
+    QLabel *l = nullptr;
+
+    Group {
+        bindTo(&w),  // Works, as GroupInterface derives from WidgetInterface
+        // bindTo(&l),  // Does (intentionally) not work, GroupInterface does not derive from LabelInterface
+        bindTo(&g),
+        size(300, 200),
+        title("HHHHHHH"),
+        Form {
+            "Hallo",
+            Group {
+                title("Title"),
+                Column {
+                    Label {
+                        text("World")
+                    },
+                    TextEdit {
+                        id(&textId),
+                        text("Och noe")
+                    }
+                }
+            },
+            br,
+            "Col",
+            Column {
+                Row { "1", "2", "3" },
+                Row { "3", "4", "6" }
+            },
+            br,
+            "Grid",
+            Grid {
+                Span { 2, QString("1111111") }, "3", br,
+                "3", "4", "6", br,
+                "4", empty, "6", br,
+                hr, "4", "6"
+            },
+            br,
+            Column {
+                Label {
+                    text("Hi"),
+                    size(30, 20)
+                },
+                Row {
+                    SpinBox {
+                        onTextChanged([&](const QString &text) { textId->setText(text); })
+                    },
+                    st,
+                    PushButton {
+                        text("Quit"),
+                        onClicked(QApplication::quit, nullptr)
+                    }
+                }
+            }
+        }
+    }.show();
+
+    return app.exec();
+}
diff --git a/tests/manual/otherfiles/dummy_taskfile.tasks b/tests/manual/otherfiles/dummy_taskfile.tasks
new file mode 100644
index 00000000000..1317a0e4c19
--- /dev/null
+++ b/tests/manual/otherfiles/dummy_taskfile.tasks
@@ -0,0 +1,65 @@
+ba/Z6xF/M0IIRI2d5pvaSyknCSyOAissFvJYsntwrQ.h	4762	other	unused
+/iQTQFzlxBsJGnfJbt5rCA8YH4oe7rqvyW3hCrWO84QN.cpp	4104	error	dummy information
+/2Sm4hfyhGRG8TAXhYv874ysHRuEuabzjz1/gdng7MHZIhyp2S.h	9442	other	syntax error
+/Oc2S9dMhbZDZymQChSiiv3Brqqp1FzSUUfnxhFHAvnwk3rSbMd.cpp	282	warn	missing information
+/igZwSBi65YI9RZCkYucjgnA0nFzyhwQHsR5zIHbCFBz69oSo.h	2266	error	missing information
+/Z6hIBPwiXv3lxn2WggqDP62WLthQxPdQmzjSHd.cpp	9289	error	unknown error
+sdef/rpx9V404NdbmV/9Ph7jXqAsK7wsB31y6Tx9KIBG.h	8316	other	missing information
+/tRdL//67g/paZsnLpdGN4J6q6/RdBYYVXSpP1djxfg3w.cpp	4717	error	not found
+/EdL/stJAk2wbrL1V21xUSbfX3OVV5hWDz0O9r6fYsV93yU.h	1894	warn	unknown error
+/aAokPAGz8zR6AiBN19mndJRs7w84oQlxUFkBSYrn.cpp	1102	other	syntax error
+/6uwjGfQ2o/j5/SEUbs57xxqxIMSl14deuLY7km5oLBc.h	9359	warn	unused
+/nBQ8eQ63Sb4HZc5lE2yvWZwck6OSx9zwT9hpzL.cpp	2969	warn	syntax error
+sdf/SqzyeibvrCAHNelVI715AtjFC83Q4feZpepvCMr78Kb8.h	3691	error	unknown error
+/xhlVpBsiOkm0ZmH01wXXk0QHImeJbcCOF7/M4f.cpp	1038	other	unused
+/8gvIBNXwX3l224T/4l75YAzmOvMcyHW/plILha7.h	2525	warn	unused
+/uu46Fvj6IwAptMDDaN23HzoyBQ61Ls917LOoWMZfhLX.cpp	4573	other	dummy information
+/rJcO7WZR2fGNYO3pTvnyXOFELxAfsuSCffRb/aMfm5.h	5148	warn	missing information
+/Srj2krdE/UPV1OYlZSYOu6w10kgzBscAfqw//9776pSGa8L76.cpp	4690	warn	dummy information
+/VlJRNSuHVpjFqCQVVWPf7R4gOSoRuGPxtGpO/xjuLceiHf.h	9683	error	syntax error
+sdf/Q/YgTtEdgAj9PzbPyBF604wEZSYXrciun69ut57e.cpp	8272	error	not found
+/rapyyxw6cXoUd9XHWCx4V4IwO9g0LlVyXFmh5sXJk8xvuZCq.h	4329	warn	syntax error
+/TVizFLbV7VZVeX56p3Mc2olEeNWSEIpI9iZaBhmgm/.cpp	692	error	not found
+sdf/Yaoc6iF24WOdamUb5j2/SDfeBoW5U92nig/6XkpE3pyEX9m.h	8336	warn	syntax error
+/rnUQ3Ew7J8yWckFBbfMg8qAMuEMgTIv0UryeYMw.cpp	8612	error	unused
+/6AJYrSTsALywqx8TinQxxsfu7Qu19xgb4Shm3uxUVmOC.h	3948	warn	dummy information
+/owg0bC1TF0ImRR7acppvAJhdBT6cUadw8696pOVgpx2oa40.cpp	4850	error	not found
+//LbsNqHaAIdYRDMwBKr7nmZ1b4njJTb1h1WSl60F.h	4893	warn	missing information
+/ivHIukAf5HoFD6cxs34JkKnHrlrxD73WRi7UvfzBQt.cpp	7724	warn	dummy information
+/Tivy85ab71MZu5bta8ordtMzAa38Y8LAZcs61eJLHNXP.h	7556	error	unused
+sdf/RZEHytd0Kmq5VUCoLqNAhAI3hlZlxltDTDdWU3WV2yuktyfg.cpp	6721	error	dummy information
+/ENk8j0noHhsZbTlqRJ46cDhjZ7PHDhfa7te8n1OsXgVO.h	5374	error	missing information
+/edEInJsvjm3dqakU9oyYMT7Nybmet4L6olT/dedWLDltWEjz.cpp	9621	other	missing information
+/q1MlgSvwv8Ikq4Bjcqa0X9OY/q1GRQ5ARhejOOZKu15XDVb7/M.h	1068	error	dummy information
+/EvcJN3d5iiIP4H2TLC6ssHeQoTUf/HHC1/gq8m.cpp	7062	warn	dummy information
+sdfxc/XISMZsHJSJNL1jKTYE1ZyJK9ekBnx4WpyrVdNjmRasxm.h	8513	error	unknown error
+/uJWF20pUZPpedDMfGNz0cCCwIymTW1JtxK5ut4fHScwq.cpp	1234	error	syntax error
+/kgQCRBmcKWNd966rPIz4IPfekDqxjQm1eAZ7/Y3Vl8.h	476	error	unknown error
+/I3aGZ2vLcuMjmcUI40eB4XTwsYQ34sSIgcj28SRPVRyu8.cpp	2175	error	dummy information
+/q3M0KxZi3Umo2CWe9EzDqMo4LcNVeQhrnV2Yu7zR.h	3969	error	syntax error
+/tcVCRlsoFo61oIMMwP8seWKpKfC8KskferbtgI.cpp	10	warn	not found
+sdf/wQSRjPZZJwzREWemLQ96RisR0x2HKpVvZTohxwWRVevBIrtN2.h	5836	error	unknown error
+/cgMEkzRs9dJfJZvejXqppDjyhbT8gs6/Q07mSJPOQD.cpp	3882	error	unknown error
+/CBipJCtJq5JHOtz5njHmH6eM5dvPjRQ3KO0PDXUIghI3rO6pm.h	3818	error	not found
+/ucFWsPMwDK3d8OuKH2d5kfrHTsz2Nlw8wZV4MfNzm.cpp	1303	error	missing information
+/eiWeH306mDV9AZKSqRV/h2OhJlmXuvPUuLrmUoDfvK.h	887	warn	dummy information
+/nSaLMeLNeFgWkppVcacpGzQbnwDgnHy43/P0zDb6y/4PWkIyKq.cpp	7644	error	unknown error
+/BF1mxdQbpB7spT8uj/XPjkxRyKJXO53v0RDs3c.h	4909	other	unknown error
+/HLpMI/AdAabKQJgZ3CfoZ3IkUH8d2AKak6WME/Ff2.cpp	92	error	dummy information
+/rM2GH8fkUddRFYRc4ZAxoNmZVnccOQ13sRTAMp.h	2487	error	dummy information
+/pQ4QD264U3z1H1odOUGSuDpvq9FIMlonytSsNpUnVkBMTl.cpp	835	error	syntax error
+/olSx6ZAKh7x43uFC6TeSqfdRsnNHozb1Oa8jgHuAx.h	8006	error	unknown error
+/36QcXAGehPbcSpreu8Dps1jTYaGLhYokbga3Ez.cpp	1219	warn	missing information
+/kLtmnkB88UvQNB2tNpQkEIRBPk2w9VQY4XKWwkcNsGYN.h	9212	warn	dummy information
+/HdhlYekmcIsnI4752ng8bT/sJEzpP/rbqrOLJ47.cpp	2818	warn	syntax error
+/nSQVu9In4/D3Mo2JQfjLuMzz49ZC1K/OQkO0t6Vibrl.h	6785	error	missing information
+/uOyhgr9Y5cvev6HeW9GAiy2g6QMDzUBABLNb5KIHLaJiKHsUXu.cpp	5833	warn	syntax error
+/vej4BOeRTak5ILrWzxPhYLXCx7akC8LXkVKwbJyok4r80tstgr.h	1863	other	syntax error
+/jGz0VyhokwjE4mmQSMpPoKK5teActVfmL2CGupQT39.cpp	175	warn	unknown error
+/PCcGDSa7h208wlJz1wa81nREtA/Kx/ZAMraQQ9QYTg.h	7977	other	unused
+/OaEQzW35Ng2yeSqs41f6ji/RWSnx71G4BlmlWX.cpp	3650	warn	not found
+/1e6Ric7K9WElXkBE6ymSMPXtFuu86QbI8mYAEy63c1Asp/hO.h	3725	error	unknown error
+/qaPzTGefWpHBNGX3XWne5zBkkLCBiMi3mm9x2cIU9l9szD.cpp	1338	warn	syntax error
+/YAPg7LHxjrOeBJ4CZBVkoXR6lKI7jrSV5bD7kfXOAf8mzM.h	3389	error	unused
+/IMjUnSaqSsKs5xCzhDcrgk1saAcr2wKnJZ3tyxI6VbSeX.cpp	2404	other	unknown error
+/5rQ9UzSyJFvYZhyI9sItDZHnBrANcz84rtDfDfJh.h	7293	warn	not found
diff --git a/tests/manual/pluginview/plugindialog.cpp b/tests/manual/pluginview/plugindialog.cpp
index d1ed1d906d7..24232540d9a 100644
--- a/tests/manual/pluginview/plugindialog.cpp
+++ b/tests/manual/pluginview/plugindialog.cpp
@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
     QObject::connect(&app, &QCoreApplication::aboutToQuit,
                      &manager, &ExtensionSystem::PluginManager::shutdown);
     PluginDialog dialog;
-    manager.setPluginPaths(QStringList() << app.applicationDirPath() + "/plugins");
+    manager.setPluginPaths({FilePath::fromUserInput(app.applicationDirPath()) / "plugins"});
     manager.loadPlugins();
     dialog.show();
     app.exec();
diff --git a/tests/manual/spinner/main.cpp b/tests/manual/spinner/main.cpp
index ac98284fb8e..6aab09f0c74 100644
--- a/tests/manual/spinner/main.cpp
+++ b/tests/manual/spinner/main.cpp
@@ -50,6 +50,20 @@ QGroupBox *createGroupBox(SpinnerSize size, QWidget *widget)
     return groupBox;
 }
 
+QGroupBox *createColorsGroupBox()
+{
+    QGroupBox *groupBox = new QGroupBox("Spinner::setColor(const QColor &color)");
+    auto layout = new QHBoxLayout(groupBox);
+    for (auto color : {Qt::red, Qt::darkGreen, Qt::blue, Qt::darkYellow}) {
+        auto widget = new QWidget;
+        widget->setFixedSize(30, 30);
+        auto spinner = new Spinner(SpinnerSize::Medium, widget);
+        spinner->setColor(color);
+        layout->addWidget(widget);
+    }
+    return groupBox;
+}
+
 static QWidget *hr()
 {
     auto frame = new QFrame;
@@ -91,6 +105,8 @@ int main(int argc, char *argv[])
     QGroupBox *largeGroupBox = createGroupBox(SpinnerSize::Large, largeWidget);
     mainLayout->addWidget(largeGroupBox);
 
+    mainLayout->addWidget(createColorsGroupBox());
+
     mainWidget.show();
 
     return app.exec();
diff --git a/tests/manual/subdirfilecontainer/tst_subdirfilecontainer.cpp b/tests/manual/subdirfilecontainer/tst_subdirfilecontainer.cpp
index 89993b6a2b6..31abdca256d 100644
--- a/tests/manual/subdirfilecontainer/tst_subdirfilecontainer.cpp
+++ b/tests/manual/subdirfilecontainer/tst_subdirfilecontainer.cpp
@@ -155,7 +155,7 @@ private slots:
             tasks.append(AsyncTask<void>(onCopySetup(parentDir.filePath(sourceDirName),
                                                      parentDir.filePath(destDirName))));
         }
-        QVERIFY(TaskTree::runBlocking(tasks));
+        QCOMPARE(TaskTree::runBlocking(tasks), DoneWith::Success);
     }
 
     void cleanupTestCase()
@@ -177,7 +177,7 @@ private slots:
         for (int i = 0; i < s_topLevelSubDirsCount; ++i)
             tasks.append(AsyncTask<void>(onSetup(parentDir.filePath(dirName(i)))));
 
-        QVERIFY(TaskTree::runBlocking(tasks));
+        QCOMPARE(TaskTree::runBlocking(tasks), DoneWith::Success);
 
         m_tempDir.reset();
         Singleton::deleteAll();
@@ -247,12 +247,7 @@ private slots:
             QDirIterator it(m_tempDir->path(), s_filters, QDirIterator::Subdirectories
                                                               | QDirIterator::FollowSymlinks);
             while (it.hasNext()) {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
                 const QFileInfo fi = it.nextFileInfo();
-#else
-                it.next();
-                const QFileInfo fi = it.fileInfo();
-#endif
                 if (fi.isDir()) {
                     ++dirsCount;
                 } else {
diff --git a/tests/manual/tasking/dataexchange/recipe.cpp b/tests/manual/tasking/dataexchange/recipe.cpp
index 445f246bbad..cb472eafd42 100644
--- a/tests/manual/tasking/dataexchange/recipe.cpp
+++ b/tests/manual/tasking/dataexchange/recipe.cpp
@@ -76,7 +76,7 @@ Group recipe(const Storage<ExternalData> &externalStorage)
         ConcurrentCallTask<QImage>(onReadSetup, onReadDone),
         Group {
             repeater,
-            parallelLimit(QThread::idealThreadCount() - 1),
+            parallelIdealThreadCountLimit,
             ConcurrentCallTask<QImage>(onScaleSetup, onScaleDone)
         }
     };
diff --git a/tests/manual/tasking/trafficlight/recipe.cpp b/tests/manual/tasking/trafficlight/recipe.cpp
index 6e08874ab64..abc70715364 100644
--- a/tests/manual/tasking/trafficlight/recipe.cpp
+++ b/tests/manual/tasking/trafficlight/recipe.cpp
@@ -21,7 +21,7 @@ Group recipe(GlueInterface *iface)
                 [iface](Barrier &barrier) {
                     QObject::connect(iface, &GlueInterface::smashed, &barrier, &Barrier::advance);
                 },
-                [] { return DoneResult::Error; }),
+                DoneResult::Error),
             Forever {
                 TimeoutTask( // "red" state
                     [iface](milliseconds &timeout) {
@@ -56,7 +56,7 @@ Group recipe(GlueInterface *iface)
                 [iface](Barrier &barrier) {
                     QObject::connect(iface, &GlueInterface::repaired, &barrier, &Barrier::advance);
                 },
-                [] { return DoneResult::Error; }),
+                DoneResult::Error),
             Forever {
                 TimeoutTask( // "blinking" state
                     [iface](milliseconds &timeout) {
diff --git a/tests/manual/widgets/layoutbuilder/tst_manual_widgets_layoutbuilder.cpp b/tests/manual/widgets/layoutbuilder/tst_manual_widgets_layoutbuilder.cpp
index 343c500c287..772b32ac04a 100644
--- a/tests/manual/widgets/layoutbuilder/tst_manual_widgets_layoutbuilder.cpp
+++ b/tests/manual/widgets/layoutbuilder/tst_manual_widgets_layoutbuilder.cpp
@@ -24,9 +24,9 @@ int main(int argc, char *argv[])
     };
 
     Row {
-        PushButton { text("-"), onClicked(minusClick) },
+        PushButton { text("-"), onClicked(minusClick, qApp) },
         lineEdit,
-        PushButton { text("+"), onClicked(plusClick) },
+        PushButton { text("+"), onClicked(plusClick, qApp) },
         Group {
             title("Splitter in Group"),
             Column {
@@ -52,8 +52,8 @@ int main(int argc, char *argv[])
 
     Splitter {
         windowTitle("Splitter with sub layouts"),
-        Column {"First Widget"},
-        Row {"Second Widget"},
+        Column { QString("First Widget") },
+        Row { QString("Second Widget") },
     }.emerge()->show();
 
     return app.exec();
diff --git a/tests/manual/widgets/uifonts/tst_manual_widgets_uifonts.cpp b/tests/manual/widgets/uifonts/tst_manual_widgets_uifonts.cpp
index 4d324ec2652..ecbf4b274b8 100644
--- a/tests/manual/widgets/uifonts/tst_manual_widgets_uifonts.cpp
+++ b/tests/manual/widgets/uifonts/tst_manual_widgets_uifonts.cpp
@@ -29,6 +29,8 @@ int main(int argc, char *argv[])
         { StyleHelper::UiElementBody2, "Body-02" },
         { StyleHelper::UiElementButtonMedium, "Button Medium" },
         { StyleHelper::UiElementButtonSmall, "Button Small" },
+        { StyleHelper::UiElementLabelMedium, "Label Medium" },
+        { StyleHelper::UiElementLabelSmall, "Label Small" },
         { StyleHelper::UiElementCaptionStrong, "Caption strong" },
         { StyleHelper::UiElementCaption, "Caption" },
         { StyleHelper::UiElementIconStandard, "Icon Standard" },
@@ -67,18 +69,20 @@ int main(int argc, char *argv[])
     }
     html.append("</table></body></html>");
 
-    Column {
-        windowTitle("Utils::StyleHelper::uiFont"),
-        Group {
-            title("As QFont in QLabel"),
-            fontLabels,
-        },
-        Group {
-            title("As inline CSS in HTML elements"),
-            Row { html },
-        },
-        st,
-    }.emerge()->show();
+    Widget {
+        windowTitle(QString("Utils::StyleHelper::uiFont")),
+        Column {
+            Group {
+                title(QString("As QFont in QLabel")),
+                fontLabels,
+            },
+            Group {
+                title(QString("As inline CSS in HTML elements")),
+                Row { html },
+            },
+            st,
+        }
+    }.show();
 
     return app.exec();
 }
diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py
index 4611a0cefe1..3451da354ff 100644
--- a/tests/system/shared/classes.py
+++ b/tests/system/shared/classes.py
@@ -56,7 +56,7 @@ class ProjectSettings:
 
 # this class defines some constants for the views of the creator's MainWindow
 class ViewConstants:
-    WELCOME, EDIT, DESIGN, DEBUG, PROJECTS, HELP = range(6)
+    WELCOME, EDIT, DESIGN, DEBUG, PROJECTS, EXTENSIONS, HELP = range(7)
     FIRST_AVAILABLE = 0
     # always adjust the following to the highest value of the available ViewConstants when adding new
     LAST_AVAILABLE = HELP
diff --git a/tests/system/shared/debugger.py b/tests/system/shared/debugger.py
index 5ee31dec201..17f357881b2 100644
--- a/tests/system/shared/debugger.py
+++ b/tests/system/shared/debugger.py
@@ -126,7 +126,7 @@ def doSimpleDebugging(currentKit, currentConfigName, expectedBPOrder=[], enableQ
         expectedLabelTexts.append("Running\.")
     switchViewTo(ViewConstants.PROJECTS)
     switchToBuildOrRunSettingsFor(currentKit, ProjectSettings.RUN)
-    selectFromCombo(":EnableQMLDebugger_ComboBox", "Enabled" if enableQml else "Disabled")
+    selectFromCombo(":EnableQMLDebugger_ComboBox", "Enable" if enableQml else "Disable")
     switchViewTo(ViewConstants.EDIT)
     if not __startDebugger__(currentKit, currentConfigName):
         return False
diff --git a/tests/system/shared/project_explorer.py b/tests/system/shared/project_explorer.py
index 447b8057d5b..f74e3a107e8 100644
--- a/tests/system/shared/project_explorer.py
+++ b/tests/system/shared/project_explorer.py
@@ -24,6 +24,9 @@ def iterateConfiguredKits():
     kitIndices = dumpIndices(treeView.model(), waitForObject(bAndRIndex))
     configuredKitNames = map(lambda t: str(t.data(0)),
                              filter(__kitIsActivated__, kitIndices))
+    # Remove hide/show entries which are in tree but not kits
+    configuredKitNames = filter(lambda n: n != "Hide Inactive Kits" and n != "Show All Kits",
+                                configuredKitNames)
     return map(Targets.getIdForTargetName, configuredKitNames)
 
 
diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py
index 623287563a3..221e4eeada5 100644
--- a/tests/system/shared/utils.py
+++ b/tests/system/shared/utils.py
@@ -265,7 +265,6 @@ def selectFromFileDialog(fileName, waitForFile=False, ignoreFinalSnooze=False):
 def addHelpDocumentation(which):
     invokeMenuItem("Edit", "Preferences...")
     mouseClick(waitForObjectItem(":Options_QListView", "Help"))
-    waitForObject("{container=':Options.qt_tabwidget_tabbar_QTabBar' type='TabItem' text='Documentation'}")
     clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "Documentation")
     # get rid of all docs already registered
     listWidget = waitForObject("{type='QListView' name='docsListView' visible='1'}")
@@ -293,7 +292,6 @@ def addCurrentCreatorDocumentation():
         return
     invokeMenuItem("Edit", "Preferences...")
     mouseClick(waitForObjectItem(":Options_QListView", "Help"))
-    waitForObject("{container=':Options.qt_tabwidget_tabbar_QTabBar' type='TabItem' text='Documentation'}")
     clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "Documentation")
     clickButton(waitForObject("{type='QPushButton' name='addButton' visible='1' text='Add...'}"))
     selectFromFileDialog(docPath)
@@ -472,13 +470,6 @@ def setFixedHelpViewer(helpViewer):
     selectFromCombo(":Startup.contextHelpComboBox_QComboBox", mode)
     clickButton(waitForObject(":Options.OK_QPushButton"))
 
-def removePackagingDirectory(projectPath):
-    qtcPackaging = os.path.join(projectPath, "qtc_packaging")
-    if os.path.exists(qtcPackaging):
-        test.log("Removing old packaging directory '%s'" % qtcPackaging)
-        deleteDirIfExists(qtcPackaging)
-    else:
-        test.log("Couldn't remove packaging directory '%s' - did not exist." % qtcPackaging)
 
 # returns the indices from a QAbstractItemModel
 def dumpIndices(model, parent=None, column=0):
@@ -547,6 +538,7 @@ def clickOnTab(tabBarStr, tabText, timeout=5000):
         test.log("Using workaround for Mac and Windows.")
         setWindowState(tabBar, WindowState.Normal)
         tabBar = waitForObject(tabBarStr, 2000)
+    waitForObject("{container='%s' type='TabItem' text='%s'}" % (tabBarStr, tabText))
     clickTab(tabBar, tabText)
     waitFor("str(tabBar.tabText(tabBar.currentIndex)) == '%s'" % tabText, timeout)
 
@@ -638,3 +630,13 @@ class GitClone:
 
     def __exit__(self, exc_type, exc_value, traceback):
         deleteDirIfExists(self.localPath)
+
+
+def setReloadBehavior(to):
+    # QC 14 changed the default, so change the preferences
+    invokeMenuItem("Edit", "Preferences...")
+    mouseClick(waitForObjectItem(":Options_QListView", "Environment"))
+    clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "System")
+    selectFromCombo("{type='QComboBox' unnamed='1' leftWidget={type='QLabel' "
+                    "text='When files are externally modified:'}}", to)
+    clickButton(":Options.OK_QPushButton")
diff --git a/tests/system/suite_HELP/tst_HELP02/test.py b/tests/system/suite_HELP/tst_HELP02/test.py
index b6246e4f05e..66ac3c0ea7b 100644
--- a/tests/system/suite_HELP/tst_HELP02/test.py
+++ b/tests/system/suite_HELP/tst_HELP02/test.py
@@ -37,7 +37,7 @@ def getQtCreatorVersionFromFile():
 
 def checkQtCreatorHelpVersion(expectedVersion):
     def rightStart(x):
-        return x.startswith('Qt Creator Manual')
+        return x.startswith('Qt Creator Documentation')
 
     switchViewTo(ViewConstants.HELP)
     try:
@@ -45,7 +45,7 @@ def checkQtCreatorHelpVersion(expectedVersion):
         waitFor("any(map(rightStart, dumpItems(helpContentWidget.model())))", 10000)
         items = dumpItems(helpContentWidget.model())
         test.compare(next(iter(filter(rightStart, items))),
-                     'Qt Creator Manual %s' % expectedVersion,
+                     'Qt Creator Documentation %s' % expectedVersion,
                      'Verifying whether manual uses expected version.')
     except:
         t, v = sys.exc_info()[:2]
diff --git a/tests/system/suite_HELP/tst_HELP06/test.py b/tests/system/suite_HELP/tst_HELP06/test.py
index 0cdcbb653af..1c32e467d23 100644
--- a/tests/system/suite_HELP/tst_HELP06/test.py
+++ b/tests/system/suite_HELP/tst_HELP06/test.py
@@ -17,7 +17,7 @@ def invokeContextMenuItemOnBookmarkFolder(view, item, menuItem):
                                    "window=':Add Bookmark_BookmarkDialog'}", menuItem))
 
 def textForQtVersion(text):
-    suffix = "Qt Creator Manual"
+    suffix = "Qt Creator Documentation"
     if text != suffix:
         text += " | " + suffix
     return text
@@ -28,15 +28,14 @@ def main():
         return
     # goto help mode and click on topic
     switchViewTo(ViewConstants.HELP)
-    manualQModelIndex = getQModelIndexStr("text?='Qt Creator Manual *'",
+    manualQModelIndex = getQModelIndexStr("text?='Qt Creator Documentation *'",
                                           ":Qt Creator_QHelpContentWidget")
     manualQMIObj = waitForObject(manualQModelIndex)
     doubleClick(manualQMIObj, 5, 5, 0, Qt.LeftButton)
     if not waitFor("not manualQMIObj.collapsed", 2000):
         test.warning("It takes more than two seconds to expand the help content tree.")
-    devQModelIndex = getQModelIndexStr("text='Developing with Qt Creator'", manualQModelIndex)
-    doubleClick(devQModelIndex)
-    gettingStartedQModelIndex = getQModelIndexStr("text='Getting Started'", devQModelIndex)
+
+    gettingStartedQModelIndex = getQModelIndexStr("text='Getting Started'", manualQModelIndex)
     doubleClick(gettingStartedQModelIndex)
     pageTitle = "Configuring Qt Creator"
     mouseClick(waitForObject(getQModelIndexStr("text='%s'" % pageTitle,
@@ -80,7 +79,7 @@ def main():
     configQModelIndex = getQModelIndexStr("text?='%s'" % textForQtVersion("%s*" % pageTitle),
                                           folder2QModelIndex)
     newFolderQModelIndex = getQModelIndexStr("text='New Folder'", sampleQModelIndex)
-    manualQModelIndex = getQModelIndexStr("text='%s'" % textForQtVersion("Qt Creator Manual"),
+    manualQModelIndex = getQModelIndexStr("text='%s'" % textForQtVersion("Qt Creator Documentation"),
                                              newFolderQModelIndex)
     test.verify(checkIfObjectExists(sampleQModelIndex, verboseOnFail = True) and
                 checkIfObjectExists(folder1QModelIndex, verboseOnFail = True) and
@@ -99,7 +98,7 @@ def main():
     type(waitForObject(":Qt Creator_Bookmarks_TreeView"), "<Right>")
     type(waitForObject(":Qt Creator_Bookmarks_TreeView"), "<Down>")
     type(waitForObject(":Qt Creator_Bookmarks_TreeView"), "<Return>")
-    test.verify(textForQtVersion("Qt Creator Manual") in getHelpTitle(),
+    test.verify(textForQtVersion("Qt Creator Documentation") in getHelpTitle(),
                 "Verifying if second bookmark is opened")
     # delete previously created directory
     clickButton(waitForObject(":Qt Creator.Add Bookmark_QToolButton"))
diff --git a/tests/system/suite_WELP/tst_WELP01/test.py b/tests/system/suite_WELP/tst_WELP01/test.py
index 8385c33fa96..89ee6dbd1e3 100644
--- a/tests/system/suite_WELP/tst_WELP01/test.py
+++ b/tests/system/suite_WELP/tst_WELP01/test.py
@@ -75,7 +75,7 @@ def main():
     wsButton = getWelcomeScreenSideBarButton(getStarted)
     if test.verify(object.exists(wsButton),
                    "Verifying: Qt Creator displays Welcome Page with '%s' button." % getStarted):
-        if clickItemVerifyHelpCombo(wsButton, "Getting Started | Qt Creator Manual",
+        if clickItemVerifyHelpCombo(wsButton, "Getting Started \| Qt Creator Documentation",
                                     "Verifying: Help with Creator Documentation is being opened."):
 
             textUrls = {'Online Community':'https://forum.qt.io',
@@ -92,7 +92,7 @@ def main():
     wsButton = getWelcomeScreenSideBarButton(getStarted)
     if object.exists(wsButton):
         mouseClick(wsButton)
-        qcManualQModelIndexStr = getQModelIndexStr("text~='Qt Creator Manual [0-9.]+'",
+        qcManualQModelIndexStr = getQModelIndexStr("text~='Qt Creator Documentation [0-9.]+'",
                                                    ":Qt Creator_QHelpContentWidget")
         if str(waitForObject(":Qt Creator_HelpSelector_QComboBox").currentText) == "(Untitled)":
             mouseClick(qcManualQModelIndexStr)
diff --git a/tests/system/suite_WELP/tst_WELP03/test.py b/tests/system/suite_WELP/tst_WELP03/test.py
index 50f7b503cc7..8d4fa29a9bb 100644
--- a/tests/system/suite_WELP/tst_WELP03/test.py
+++ b/tests/system/suite_WELP/tst_WELP03/test.py
@@ -83,8 +83,6 @@ def main():
     proFiles = [os.path.join(p, "opengl", "2dpainting", "2dpainting.pro")
                 for p in QtPath.getPaths(QtPath.EXAMPLES)]
     cleanUpUserFiles(proFiles)
-    for p in proFiles:
-        removePackagingDirectory(os.path.dirname(p))
 
     example = openExample(examplesLineEdit, "2d painting", "2D Painting.*", "2D Painting Example")
     if example is not None:
@@ -96,17 +94,12 @@ def main():
         waitFor("navTree.model().rowCount(navTree.rootIndex()) == 0", 2000)
         test.verify(not checkIfObjectItemExists(":Qt Creator_Utils::NavigationTreeView", "2dpainting"),
                     "Verifying: The first example is closed.")
-    # clean up created packaging directories
-    for p in proFiles:
-        removePackagingDirectory(os.path.dirname(p))
 
     # go to "Welcome" page and choose another example
     switchViewTo(ViewConstants.WELCOME)
     proFiles = [os.path.join(p, "widgets", "itemviews", "addressbook", "addressbook.pro")
                 for p in QtPath.getPaths(QtPath.EXAMPLES)]
     cleanUpUserFiles(proFiles)
-    for p in proFiles:
-        removePackagingDirectory(os.path.dirname(p))
     examplesLineEdit = waitForObject(search %(expect[1][0], expect[1][1]))
     example = openExample(examplesLineEdit, "address book", "(0000 )?Address Book.*",
                           "Address Book Example", 3)
@@ -122,8 +115,5 @@ def main():
         waitFor("navTree.model().rowCount(navTree.rootIndex()) == 0", 2000)
         test.verify(not checkIfObjectItemExists(":Qt Creator_Utils::NavigationTreeView", "addressbook"),
                     "Verifying: The second example is closed.")
-    # clean up created packaging directories
-    for p in proFiles:
-        removePackagingDirectory(os.path.dirname(p))
     # exit Qt Creator
     invokeMenuItem("File", "Exit")
diff --git a/tests/system/suite_debugger/tst_debug_empty_main/test.py b/tests/system/suite_debugger/tst_debug_empty_main/test.py
index d62f76cdebf..2d166d2a876 100644
--- a/tests/system/suite_debugger/tst_debug_empty_main/test.py
+++ b/tests/system/suite_debugger/tst_debug_empty_main/test.py
@@ -91,6 +91,9 @@ def performDebugging(projectName):
         invokeMenuItem("Debug", "Enable or Disable Breakpoint")
         clickButton(waitForObject(":*Qt Creator.Start Debugging_Core::Internal::FancyToolButton"))
         handleDebuggerWarnings(config, isMsvc)
-        clickButton(waitForObject(":*Qt Creator.Continue_Core::Internal::FancyToolButton"))
+        continueButtonStr = ":*Qt Creator.Continue_Core::Internal::FancyToolButton"
+        if test.verify(waitFor(lambda: object.exists(continueButtonStr), 20000),
+                       "Did the debugger stop at the breakpoint as expected?"):
+            clickButton(waitForObject(continueButtonStr, 1000))
         __handleAppOutputWaitForDebuggerFinish__()
         removeOldBreakpoints()
diff --git a/tests/system/suite_debugger/tst_qml_js_console/test.py b/tests/system/suite_debugger/tst_qml_js_console/test.py
index 4760296cf69..a64a24ad770 100644
--- a/tests/system/suite_debugger/tst_qml_js_console/test.py
+++ b/tests/system/suite_debugger/tst_qml_js_console/test.py
@@ -114,7 +114,7 @@ def main():
         # make sure QML Debugging is enabled
         switchViewTo(ViewConstants.PROJECTS)
         switchToBuildOrRunSettingsFor(Targets.getDefaultKit(), ProjectSettings.RUN)
-        selectFromCombo(":EnableQMLDebugger_ComboBox", "Enabled")
+        selectFromCombo(":EnableQMLDebugger_ComboBox", "Enable")
         switchViewTo(ViewConstants.EDIT)
         # start debugging
         clickButton(fancyDebugButton)
diff --git a/tests/system/suite_debugger/tst_qml_locals/test.py b/tests/system/suite_debugger/tst_qml_locals/test.py
index 37ecb515cc6..80c04167e13 100644
--- a/tests/system/suite_debugger/tst_qml_locals/test.py
+++ b/tests/system/suite_debugger/tst_qml_locals/test.py
@@ -35,7 +35,7 @@ def main():
         return
     switchViewTo(ViewConstants.PROJECTS)
     switchToBuildOrRunSettingsFor(Targets.getDefaultKit(), ProjectSettings.RUN)
-    selectFromCombo(":EnableQMLDebugger_ComboBox", "Enabled")
+    selectFromCombo(":EnableQMLDebugger_ComboBox", "Enable")
     switchViewTo(ViewConstants.EDIT)
     clickButton(fancyDebugButton)
     locAndExprTV = waitForObject(":Locals and Expressions_Debugger::Internal::WatchTreeView")
diff --git a/tests/system/suite_editors/tst_clean_whitespaces/test.py b/tests/system/suite_editors/tst_clean_whitespaces/test.py
index 7803027f869..1f5eb7a255e 100644
--- a/tests/system/suite_editors/tst_clean_whitespaces/test.py
+++ b/tests/system/suite_editors/tst_clean_whitespaces/test.py
@@ -111,8 +111,6 @@ def isIgnoredFile(fileName, ignoredFiles):
 def ignoredFilesFromSettings():
     invokeMenuItem("Edit", "Preferences...")
     mouseClick(waitForObjectItem(":Options_QListView", "Text Editor"))
-    waitForObject("{container=':Options.qt_tabwidget_tabbar_QTabBar' type='TabItem' "
-                  "text='Behavior'}")
     clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "Behavior")
     cleanWhiteSpaceCB = "{type='QCheckBox' text='Skip clean whitespace for file types:'}"
     ensureChecked(cleanWhiteSpaceCB)
diff --git a/tests/system/suite_editors/tst_delete_externally/test.py b/tests/system/suite_editors/tst_delete_externally/test.py
index e36377cb56b..31583877c74 100644
--- a/tests/system/suite_editors/tst_delete_externally/test.py
+++ b/tests/system/suite_editors/tst_delete_externally/test.py
@@ -10,6 +10,9 @@ def main():
     startQC()
     if not startedWithoutPluginError():
         return
+
+    setReloadBehavior("Always Ask")
+
     for currentFile in files:
         test.log("Opening file %s" % currentFile)
         invokeMenuItem("File", "Open File or Project...")
diff --git a/tests/system/suite_editors/tst_edit_externally/test.py b/tests/system/suite_editors/tst_edit_externally/test.py
index e04ab19670a..13cd68127f1 100644
--- a/tests/system/suite_editors/tst_edit_externally/test.py
+++ b/tests/system/suite_editors/tst_edit_externally/test.py
@@ -23,6 +23,8 @@ def main():
     if not startedWithoutPluginError():
         return
 
+    setReloadBehavior("Always Ask")
+
     mBox = ("{text?='The file * has been changed on disk. Do you want to reload it?' "
             "type='QMessageBox' unnamed='1' visible='1'}")
     popupText = ("<p>The file <i>%s</i> has been changed on disk. Do you want to reload it?</p>"
diff --git a/tests/system/suite_editors/tst_generic_highlighter/test.py b/tests/system/suite_editors/tst_generic_highlighter/test.py
index ea6c7aee406..13dda9badac 100644
--- a/tests/system/suite_editors/tst_generic_highlighter/test.py
+++ b/tests/system/suite_editors/tst_generic_highlighter/test.py
@@ -32,8 +32,6 @@ def getOrModifyFilePatternsFor(mimeType, filter='', toBePresent=None):
     result = []
     invokeMenuItem("Edit", "Preferences...")
     mouseClick(waitForObjectItem(":Options_QListView", "Environment"))
-    waitForObject("{container=':Options.qt_tabwidget_tabbar_QTabBar' type='TabItem' "
-                  "text='MIME Types'}")
     clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "MIME Types")
     replaceEditorContent(waitForObject("{name='filterLineEdit' type='Utils::FancyLineEdit' "
                                        "visible='1'}"), filter)
@@ -95,8 +93,6 @@ def addHighlighterDefinition(*languages):
     test.log("Updating highlighter definitions...")
     invokeMenuItem("Edit", "Preferences...")
     mouseClick(waitForObjectItem(":Options_QListView", "Text Editor"))
-    waitForObject("{container=':Options.qt_tabwidget_tabbar_QTabBar' type='TabItem' "
-                  "text='Generic Highlighter'}")
     clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "Generic Highlighter")
 
     test.log("Trying to download definitions...")
diff --git a/tests/system/suite_general/tst_installed_languages/test.py b/tests/system/suite_general/tst_installed_languages/test.py
index 75a60e8fd06..e48abed67f9 100644
--- a/tests/system/suite_general/tst_installed_languages/test.py
+++ b/tests/system/suite_general/tst_installed_languages/test.py
@@ -32,6 +32,5 @@ def main():
         except:
             test.fail("Creator seems to be missing %s translation" % languageName)
             sendEvent("QCloseEvent", ":Qt Creator_Core::Internal::MainWindow")
-        waitForCleanShutdown()
         __removeTestingDir__()
         copySettingsToTmpDir()
diff --git a/tests/system/suite_general/tst_remove_kits/test.py b/tests/system/suite_general/tst_remove_kits/test.py
index 365f4b217f9..652390e0107 100644
--- a/tests/system/suite_general/tst_remove_kits/test.py
+++ b/tests/system/suite_general/tst_remove_kits/test.py
@@ -8,7 +8,9 @@ def verifyProjectsMode(expectedKits):
     bAndRIndex = getQModelIndexStr("text='Build & Run'",
                                    ":Projects.ProjectNavigationTreeView")
     foundKits = dumpItems(treeView.model(), waitForObject(bAndRIndex))
-    relevantKits = list(filter(lambda x: 'Python' not in x,foundKits)) # ignore Python kits
+    # ignore Python kits and non-kit item
+    excludes = ('Python', 'Hide Inactive Kits', 'Show All Kits')
+    relevantKits = list(filter(lambda x: all(ex not in x for ex in excludes), foundKits))
     test.compare(len(relevantKits), len(expectedKits), "Verify number of listed kits.")
     test.compare(set(relevantKits), set(expectedKits), "Verify if expected kits are listed.")
     hasKits = len(expectedKits) > 0
diff --git a/tests/tools/qml-ast2dot/CMakeLists.txt b/tests/tools/qml-ast2dot/CMakeLists.txt
index ba4acfb9dc4..69ecc371f92 100644
--- a/tests/tools/qml-ast2dot/CMakeLists.txt
+++ b/tests/tools/qml-ast2dot/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_qtc_executable(qml_ast2dot
   BUILD_DEFAULT OFF
-  DEPENDS Qt::Core Qt::Gui QmlJS
+  DEPENDS Qt::Core Qt::Gui QmlJS Utils
   SOURCES main.cpp
 )
 
diff --git a/tests/tools/qml-ast2dot/main.cpp b/tests/tools/qml-ast2dot/main.cpp
index eed9c8604a4..8b3508e99ef 100644
--- a/tests/tools/qml-ast2dot/main.cpp
+++ b/tests/tools/qml-ast2dot/main.cpp
@@ -7,6 +7,8 @@
 #include <qmljs/qmljsdocument.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
 
+#include <utils/filepath.h>
+
 #include <QFile>
 #include <QList>
 #include <QCoreApplication>
@@ -307,7 +309,8 @@ int main(int argc, char *argv[])
         const QByteArray source = file.readAll();
         file.close();
 
-        Document::MutablePtr doc = Document::create(fileName, ModelManagerInterface::guessLanguageOfFile(fileName));
+        const Utils::FilePath filePath = Utils::FilePath::fromUserInput(fileName);
+        Document::MutablePtr doc = Document::create(filePath, ModelManagerInterface::guessLanguageOfFile(filePath));
         doc->setSource(QString::fromUtf8(source));
         doc->parse();
 
diff --git a/tests/tools/qml-ast2dot/qml-ast2dot.qbs b/tests/tools/qml-ast2dot/qml-ast2dot.qbs
index 2fbf3676c99..1b067995add 100644
--- a/tests/tools/qml-ast2dot/qml-ast2dot.qbs
+++ b/tests/tools/qml-ast2dot/qml-ast2dot.qbs
@@ -2,6 +2,7 @@ import qbs.FileInfo
 
 CppApplication {
     Depends { name: "QmlJS" }
+    Depends { name: "Utils" }
     Depends { name: "Qt.gui" }
 
     cpp.cxxLanguageVersion: "c++17"
diff --git a/tests/unit/tests/unittests/componentcore/propertycomponentgenerator-test.cpp b/tests/unit/tests/unittests/componentcore/propertycomponentgenerator-test.cpp
index 154883cecb2..72788bbd83e 100644
--- a/tests/unit/tests/unittests/componentcore/propertycomponentgenerator-test.cpp
+++ b/tests/unit/tests/unittests/componentcore/propertycomponentgenerator-test.cpp
@@ -75,7 +75,7 @@ protected:
     {
         if (auto property = node->property(name)) {
             const auto &value = property.value;
-            if (value.type() == QVariant::List) {
+            if (value.typeId() == QMetaType::QVariantList) {
                 auto list = value.toList();
                 if (list.size())
                     return list.front().value<Type>();
diff --git a/tests/unit/tests/unittests/listmodeleditor/listmodeleditor-test.cpp b/tests/unit/tests/unittests/listmodeleditor/listmodeleditor-test.cpp
index 29f7ba8a2d6..e866ad81c7f 100644
--- a/tests/unit/tests/unittests/listmodeleditor/listmodeleditor-test.cpp
+++ b/tests/unit/tests/unittests/listmodeleditor/listmodeleditor-test.cpp
@@ -511,7 +511,7 @@ TEST_F(ListModelEditor, convert_string_float_to_float)
     model.setValue(1, 1, "25.5");
 
     ASSERT_THAT(element2.variantProperty("name").value().value<double>(), 25.5);
-    ASSERT_THAT(element2.variantProperty("name").value().type(), QVariant::Double);
+    ASSERT_THAT(element2.variantProperty("name").value().typeId(), QMetaType::Double);
 }
 
 TEST_F(ListModelEditor, convert_string_integer_to_double)
@@ -521,7 +521,7 @@ TEST_F(ListModelEditor, convert_string_integer_to_double)
     model.setValue(1, 1, "25");
 
     ASSERT_THAT(element2.variantProperty("name").value().value<double>(), 25);
-    ASSERT_THAT(element2.variantProperty("name").value().type(), QVariant::Double);
+    ASSERT_THAT(element2.variantProperty("name").value().typeId(), QMetaType::Double);
 }
 
 TEST_F(ListModelEditor, dont_convert_string_to_number)
@@ -531,7 +531,7 @@ TEST_F(ListModelEditor, dont_convert_string_to_number)
     model.setValue(1, 1, "hello");
 
     ASSERT_THAT(element2.variantProperty("name").value().value<QString>(), u"hello");
-    ASSERT_THAT(element2.variantProperty("name").value().type(), QVariant::String);
+    ASSERT_THAT(element2.variantProperty("name").value().typeId(), QMetaType::QString);
 }
 
 TEST_F(ListModelEditor, empty_strings_removes_property)
@@ -558,7 +558,7 @@ TEST_F(ListModelEditor, dispay_value_is_changed_to_double)
 
     model.setValue(1, 1, "25.5");
 
-    ASSERT_THAT(displayValues()[1][1].type(), QVariant::Double);
+    ASSERT_THAT(displayValues()[1][1].typeId(), QMetaType::Double);
 }
 
 TEST_F(ListModelEditor, string_dispay_value_is_not_changed)
@@ -567,7 +567,7 @@ TEST_F(ListModelEditor, string_dispay_value_is_not_changed)
 
     model.setValue(1, 1, "25.5a");
 
-    ASSERT_THAT(displayValues()[1][1].type(), QVariant::String);
+    ASSERT_THAT(displayValues()[1][1].typeId(), QMetaType::QString);
 }
 
 TEST_F(ListModelEditor, set_invalid_to_dark_yellow_background_color)